Merge "Restoring the contents of aosp after"

2064 files changed, 3951 insertions, 320785 deletions

diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/CertRuntimeException.java b/bcpkix/src/main/java/org/bouncycastle/cert/CertRuntimeException.java
deleted file mode 100644
index 5384148..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/CertRuntimeException.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package org.bouncycastle.cert;
-
-public class CertRuntimeException
-    extends RuntimeException
-{
-    private Throwable cause;
-
-    public CertRuntimeException(String msg, Throwable cause)
-    {
-        super(msg);
-
-        this.cause = cause;
-    }
-
-    public Throwable getCause()
-    {
-        return cause;
-    }
-}
\ No newline at end of file
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/X509ContentVerifierProviderBuilder.java b/bcpkix/src/main/java/org/bouncycastle/cert/X509ContentVerifierProviderBuilder.java
deleted file mode 100644
index af3bd09..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/X509ContentVerifierProviderBuilder.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package org.bouncycastle.cert;
-
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.bouncycastle.operator.ContentVerifierProvider;
-import org.bouncycastle.operator.OperatorCreationException;
-
-public interface X509ContentVerifierProviderBuilder
-{
-    ContentVerifierProvider build(SubjectPublicKeyInfo validatingKeyInfo)
-        throws OperatorCreationException;
-
-    ContentVerifierProvider build(X509CertificateHolder validatingKeyInfo)
-        throws OperatorCreationException;
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/X509ExtensionUtils.java b/bcpkix/src/main/java/org/bouncycastle/cert/X509ExtensionUtils.java
deleted file mode 100644
index aa37138..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/X509ExtensionUtils.java
+++ /dev/null
@@ -1,132 +0,0 @@
-package org.bouncycastle.cert;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.math.BigInteger;
-
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.x509.AuthorityKeyIdentifier;
-import org.bouncycastle.asn1.x509.Extension;
-import org.bouncycastle.asn1.x509.GeneralName;
-import org.bouncycastle.asn1.x509.GeneralNames;
-import org.bouncycastle.asn1.x509.SubjectKeyIdentifier;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.bouncycastle.operator.DigestCalculator;
-
-/**
- * General utility class for creating calculated extensions using the standard methods.
- * <p>
- * <b>Note:</b> This class is not thread safe!
- * </p>
- */
-public class X509ExtensionUtils
-{
-    private DigestCalculator calculator;
-
-    public X509ExtensionUtils(DigestCalculator calculator)
-    {
-        this.calculator = calculator;
-    }
-
-    public AuthorityKeyIdentifier createAuthorityKeyIdentifier(
-        X509CertificateHolder certHolder)
-    {
-        if (certHolder.getVersionNumber() != 3)
-        {
-            GeneralName genName = new GeneralName(certHolder.getIssuer());
-            SubjectPublicKeyInfo info = certHolder.getSubjectPublicKeyInfo();
-
-            return new AuthorityKeyIdentifier(
-                           calculateIdentifier(info), new GeneralNames(genName), certHolder.getSerialNumber());
-        }
-        else
-        {
-            GeneralName             genName = new GeneralName(certHolder.getIssuer());
-            Extension ext = certHolder.getExtension(Extension.subjectKeyIdentifier);
-
-            if (ext != null)
-            {
-                ASN1OctetString str = ASN1OctetString.getInstance(ext.getParsedValue());
-
-                return new AuthorityKeyIdentifier(
-                                str.getOctets(), new GeneralNames(genName), certHolder.getSerialNumber());
-            }
-            else
-            {
-                SubjectPublicKeyInfo info = certHolder.getSubjectPublicKeyInfo();
-
-                return new AuthorityKeyIdentifier(
-                        calculateIdentifier(info), new GeneralNames(genName), certHolder.getSerialNumber());
-            }
-        }
-    }
-
-    public AuthorityKeyIdentifier createAuthorityKeyIdentifier(SubjectPublicKeyInfo publicKeyInfo)
-    {
-        return new AuthorityKeyIdentifier(calculateIdentifier(publicKeyInfo));
-    }
-
-    public AuthorityKeyIdentifier createAuthorityKeyIdentifier(SubjectPublicKeyInfo publicKeyInfo, GeneralNames generalNames, BigInteger serial)
-    {
-        return new AuthorityKeyIdentifier(calculateIdentifier(publicKeyInfo), generalNames, serial);
-    }
-
-    /**
-     * Return a RFC 3280 type 1 key identifier. As in:
-     * <pre>
-     * (1) The keyIdentifier is composed of the 160-bit SHA-1 hash of the
-     * value of the BIT STRING subjectPublicKey (excluding the tag,
-     * length, and number of unused bits).
-     * </pre>
-     * @param publicKeyInfo the key info object containing the subjectPublicKey field.
-     * @return the key identifier.
-     */
-    public SubjectKeyIdentifier createSubjectKeyIdentifier(
-        SubjectPublicKeyInfo publicKeyInfo)
-    {
-        return new SubjectKeyIdentifier(calculateIdentifier(publicKeyInfo));
-    }
-
-    /**
-     * Return a RFC 3280 type 2 key identifier. As in:
-     * <pre>
-     * (2) The keyIdentifier is composed of a four bit type field with
-     * the value 0100 followed by the least significant 60 bits of the
-     * SHA-1 hash of the value of the BIT STRING subjectPublicKey.
-     * </pre>
-     * @param publicKeyInfo the key info object containing the subjectPublicKey field.
-     * @return the key identifier.
-     */
-    public SubjectKeyIdentifier createTruncatedSubjectKeyIdentifier(SubjectPublicKeyInfo publicKeyInfo)
-    {
-        byte[] digest = calculateIdentifier(publicKeyInfo);
-        byte[] id = new byte[8];
-
-        System.arraycopy(digest, digest.length - 8, id, 0, id.length);
-
-        id[0] &= 0x0f;
-        id[0] |= 0x40;
-
-        return new SubjectKeyIdentifier(id);
-    }
-
-    private byte[] calculateIdentifier(SubjectPublicKeyInfo publicKeyInfo)
-    {
-        byte[] bytes = publicKeyInfo.getPublicKeyData().getBytes();
-
-        OutputStream cOut = calculator.getOutputStream();
-
-        try
-        {
-            cOut.write(bytes);
-
-            cOut.close();
-        }
-        catch (IOException e)
-        {   // it's hard to imagine this happening, but yes it does!
-            throw new CertRuntimeException("unable to calculate identifier: " + e.getMessage(), e);
-        }
-
-        return calculator.getDigest();
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/X509v1CertificateBuilder.java b/bcpkix/src/main/java/org/bouncycastle/cert/X509v1CertificateBuilder.java
deleted file mode 100644
index 3652ba9..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/X509v1CertificateBuilder.java
+++ /dev/null
@@ -1,101 +0,0 @@
-package org.bouncycastle.cert;
-
-import java.math.BigInteger;
-import java.util.Date;
-import java.util.Locale;
-
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.x500.X500Name;
-import org.bouncycastle.asn1.x509.ExtensionsGenerator;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.bouncycastle.asn1.x509.Time;
-import org.bouncycastle.asn1.x509.V1TBSCertificateGenerator;
-import org.bouncycastle.asn1.x509.V3TBSCertificateGenerator;
-import org.bouncycastle.operator.ContentSigner;
-
-
-/**
- * class to produce an X.509 Version 1 certificate.
- */
-public class X509v1CertificateBuilder
-{
-    private V1TBSCertificateGenerator   tbsGen;
-
-    /**
-     * Create a builder for a version 1 certificate.
-     *
-     * @param issuer the certificate issuer
-     * @param serial the certificate serial number
-     * @param notBefore the date before which the certificate is not valid
-     * @param notAfter the date after which the certificate is not valid
-     * @param subject the certificate subject
-     * @param publicKeyInfo the info structure for the public key to be associated with this certificate.
-     */
-    public X509v1CertificateBuilder(X500Name issuer, BigInteger serial, Date notBefore, Date notAfter, X500Name subject, SubjectPublicKeyInfo publicKeyInfo)
-    {
-        this(issuer, serial, new Time(notBefore), new Time(notAfter), subject, publicKeyInfo);
-    }
-
-   /**
-    * Create a builder for a version 1 certificate. You may need to use this constructor if the default locale
-    * doesn't use a Gregorian calender so that the Time produced is compatible with other ASN.1 implementations.
-    *
-    * @param issuer the certificate issuer
-    * @param serial the certificate serial number
-    * @param notBefore the date before which the certificate is not valid
-    * @param notAfter the date after which the certificate is not valid
-    * @param dateLocale locale to be used for date interpretation.
-    * @param subject the certificate subject
-    * @param publicKeyInfo the info structure for the public key to be associated with this certificate.
-    */
-   public X509v1CertificateBuilder(X500Name issuer, BigInteger serial, Date notBefore, Date notAfter, Locale dateLocale, X500Name subject, SubjectPublicKeyInfo publicKeyInfo)
-   {
-       this(issuer, serial, new Time(notBefore, dateLocale), new Time(notAfter, dateLocale), subject, publicKeyInfo);
-   }
-
-   /**
-    * Create a builder for a version 1 certificate.
-    *
-    * @param issuer the certificate issuer
-    * @param serial the certificate serial number
-    * @param notBefore the Time before which the certificate is not valid
-    * @param notAfter the Time after which the certificate is not valid
-    * @param subject the certificate subject
-    * @param publicKeyInfo the info structure for the public key to be associated with this certificate.
-    */
-   public X509v1CertificateBuilder(X500Name issuer, BigInteger serial, Time notBefore, Time notAfter, X500Name subject, SubjectPublicKeyInfo publicKeyInfo)
-   {
-       if (issuer == null)
-       {
-           throw new IllegalArgumentException("issuer must not be null");
-       }
-
-       if (publicKeyInfo == null)
-       {
-           throw new IllegalArgumentException("publicKeyInfo must not be null");
-       }
-
-       tbsGen = new V1TBSCertificateGenerator();
-       tbsGen.setSerialNumber(new ASN1Integer(serial));
-       tbsGen.setIssuer(issuer);
-       tbsGen.setStartDate(notBefore);
-       tbsGen.setEndDate(notAfter);
-       tbsGen.setSubject(subject);
-       tbsGen.setSubjectPublicKeyInfo(publicKeyInfo);
-   }
-
-    /**
-     * Generate an X509 certificate, based on the current issuer and subject
-     * using the passed in signer.
-     *
-     * @param signer the content signer to be used to generate the signature validating the certificate.
-     * @return a holder containing the resulting signed certificate.
-     */
-    public X509CertificateHolder build(
-        ContentSigner signer)
-    {
-        tbsGen.setSignature(signer.getAlgorithmIdentifier());
-
-        return CertUtils.generateFullCert(signer, tbsGen.generateTBSCertificate());
-    }
-}
\ No newline at end of file
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/X509v2AttributeCertificateBuilder.java b/bcpkix/src/main/java/org/bouncycastle/cert/X509v2AttributeCertificateBuilder.java
deleted file mode 100644
index 4cd10a3..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/X509v2AttributeCertificateBuilder.java
+++ /dev/null
@@ -1,162 +0,0 @@
-package org.bouncycastle.cert;
-
-import java.math.BigInteger;
-import java.util.Date;
-import java.util.Locale;
-
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1GeneralizedTime;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.DERSet;
-import org.bouncycastle.asn1.x509.AttCertIssuer;
-import org.bouncycastle.asn1.x509.Attribute;
-import org.bouncycastle.asn1.x509.ExtensionsGenerator;
-import org.bouncycastle.asn1.x509.V2AttributeCertificateInfoGenerator;
-import org.bouncycastle.operator.ContentSigner;
-
-/**
- * class to produce an X.509 Version 2 AttributeCertificate.
- */
-public class X509v2AttributeCertificateBuilder
-{
-    private V2AttributeCertificateInfoGenerator   acInfoGen;
-    private ExtensionsGenerator extGenerator;
-
-    /**
-     * Base constructor.
-     *
-     * @param holder holder certificate details
-     * @param issuer issuer of this attribute certificate.
-     * @param serialNumber serial number of this attribute certificate.
-     * @param notBefore the date before which the certificate is not valid.
-     * @param notAfter the date after which the certificate is not valid.
-     */
-    public X509v2AttributeCertificateBuilder(AttributeCertificateHolder holder, AttributeCertificateIssuer  issuer, BigInteger serialNumber, Date notBefore, Date notAfter)
-    {
-        acInfoGen = new V2AttributeCertificateInfoGenerator();
-        extGenerator = new ExtensionsGenerator();
-
-        acInfoGen.setHolder(holder.holder);
-        acInfoGen.setIssuer(AttCertIssuer.getInstance(issuer.form));
-        acInfoGen.setSerialNumber(new ASN1Integer(serialNumber));
-        acInfoGen.setStartDate(new ASN1GeneralizedTime(notBefore));
-        acInfoGen.setEndDate(new ASN1GeneralizedTime(notAfter));
-    }
-
-    /**
-     * Base constructor with locale for interpreting dates. You may need to use this constructor if the default locale
-     * doesn't use a Gregorian calender so that the GeneralizedTime produced is compatible with other ASN.1 implementations.
-     *
-     * @param holder holder certificate details
-     * @param issuer issuer of this attribute certificate.
-     * @param serialNumber serial number of this attribute certificate.
-     * @param notBefore the date before which the certificate is not valid.
-     * @param notAfter the date after which the certificate is not valid.
-     * @param dateLocale locale to be used for date interpretation.
-     */
-    public X509v2AttributeCertificateBuilder(AttributeCertificateHolder holder, AttributeCertificateIssuer  issuer, BigInteger serialNumber, Date notBefore, Date notAfter, Locale dateLocale)
-    {
-        acInfoGen = new V2AttributeCertificateInfoGenerator();
-        extGenerator = new ExtensionsGenerator();
-
-        acInfoGen.setHolder(holder.holder);
-        acInfoGen.setIssuer(AttCertIssuer.getInstance(issuer.form));
-        acInfoGen.setSerialNumber(new ASN1Integer(serialNumber));
-        acInfoGen.setStartDate(new ASN1GeneralizedTime(notBefore, dateLocale));
-        acInfoGen.setEndDate(new ASN1GeneralizedTime(notAfter, dateLocale));
-    }
-
-    /**
-     * Add an attribute to the certification request we are building.
-     *
-     * @param attrType the OID giving the type of the attribute.
-     * @param attrValue the ASN.1 structure that forms the value of the attribute.
-     * @return this builder object.
-     */
-    public X509v2AttributeCertificateBuilder addAttribute(ASN1ObjectIdentifier attrType, ASN1Encodable attrValue)
-    {
-        acInfoGen.addAttribute(new Attribute(attrType, new DERSet(attrValue)));
-
-        return this;
-    }
-
-    /**
-     * Add an attribute with multiple values to the certification request we are building.
-     *
-     * @param attrType the OID giving the type of the attribute.
-     * @param attrValues an array of ASN.1 structures that form the value of the attribute.
-     * @return this builder object.
-     */
-    public X509v2AttributeCertificateBuilder addAttribute(ASN1ObjectIdentifier attrType, ASN1Encodable[] attrValues)
-    {
-        acInfoGen.addAttribute(new Attribute(attrType, new DERSet(attrValues)));
-
-        return this;
-    }
-
-    public void setIssuerUniqueId(
-        boolean[] iui)
-    {
-        acInfoGen.setIssuerUniqueID(CertUtils.booleanToBitString(iui));
-    }
-
-    /**
-     * Add a given extension field for the standard extensions tag
-     *
-     * @param oid the OID defining the extension type.
-     * @param isCritical true if the extension is critical, false otherwise.
-     * @param value the ASN.1 structure that forms the extension's value.
-     * @return this builder object.
-     */
-    public X509v2AttributeCertificateBuilder addExtension(
-        ASN1ObjectIdentifier oid,
-        boolean isCritical,
-        ASN1Encodable value)
-        throws CertIOException
-    {
-        CertUtils.addExtension(extGenerator, oid, isCritical, value);
-
-        return this;
-    }
-
-    /**
-     * Add a given extension field for the standard extensions tag (tag 3) using a byte encoding of the
-     * extension value.
-     *
-     * @param oid the OID defining the extension type.
-     * @param isCritical true if the extension is critical, false otherwise.
-     * @param encodedValue a byte array representing the encoding of the extension value.
-     * @return this builder object.
-     */
-    public X509v2AttributeCertificateBuilder addExtension(
-        ASN1ObjectIdentifier oid,
-        boolean isCritical,
-        byte[] encodedValue)
-        throws CertIOException
-    {
-        extGenerator.addExtension(oid, isCritical, encodedValue);
-
-        return this;
-    }
-
-   /**
-     * Generate an X509 certificate, based on the current issuer and subject
-     * using the passed in signer.
-     *
-     * @param signer the content signer to be used to generate the signature validating the certificate.
-     * @return a holder containing the resulting signed certificate.
-     */
-    public X509AttributeCertificateHolder build(
-        ContentSigner signer)
-    {
-        acInfoGen.setSignature(signer.getAlgorithmIdentifier());
-
-        if (!extGenerator.isEmpty())
-        {
-            acInfoGen.setExtensions(extGenerator.generate());
-        }
-
-        return CertUtils.generateFullAttrCert(signer, acInfoGen.generateAttributeCertificateInfo());
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/X509v2CRLBuilder.java b/bcpkix/src/main/java/org/bouncycastle/cert/X509v2CRLBuilder.java
deleted file mode 100644
index 896f55b..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/X509v2CRLBuilder.java
+++ /dev/null
@@ -1,266 +0,0 @@
-package org.bouncycastle.cert;
-
-import java.math.BigInteger;
-import java.util.Date;
-import java.util.Enumeration;
-import java.util.Locale;
-
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1GeneralizedTime;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.x500.X500Name;
-import org.bouncycastle.asn1.x509.Extensions;
-import org.bouncycastle.asn1.x509.ExtensionsGenerator;
-import org.bouncycastle.asn1.x509.TBSCertList;
-import org.bouncycastle.asn1.x509.Time;
-import org.bouncycastle.asn1.x509.V2TBSCertListGenerator;
-import org.bouncycastle.asn1.x509.X509Extensions;
-import org.bouncycastle.operator.ContentSigner;
-
-/**
- * class to produce an X.509 Version 2 CRL.
- */
-public class X509v2CRLBuilder
-{
-    private V2TBSCertListGenerator      tbsGen;
-    private ExtensionsGenerator         extGenerator;
-
-    /**
-     * Basic constructor.
-     *
-     * @param issuer the issuer this CRL is associated with.
-     * @param thisUpdate  the date of this update.
-     */
-    public X509v2CRLBuilder(
-        X500Name issuer,
-        Date     thisUpdate)
-    {
-        tbsGen = new V2TBSCertListGenerator();
-        extGenerator = new ExtensionsGenerator();
-
-        tbsGen.setIssuer(issuer);
-        tbsGen.setThisUpdate(new Time(thisUpdate));
-    }
-
-    /**
-     * Basic constructor with Locale. You may need to use this constructor if the default locale
-     * doesn't use a Gregorian calender so that the Time produced is compatible with other ASN.1 implementations.
-     *
-     * @param issuer the issuer this CRL is associated with.
-     * @param thisUpdate  the date of this update.
-     * @param dateLocale locale to be used for date interpretation.
-     */
-    public X509v2CRLBuilder(
-        X500Name issuer,
-        Date     thisUpdate,
-        Locale   dateLocale)
-    {
-        tbsGen = new V2TBSCertListGenerator();
-        extGenerator = new ExtensionsGenerator();
-
-        tbsGen.setIssuer(issuer);
-        tbsGen.setThisUpdate(new Time(thisUpdate, dateLocale));
-    }
-
-    /**
-     * Basic constructor.
-     *
-     * @param issuer the issuer this CRL is associated with.
-     * @param thisUpdate  the Time of this update.
-     */
-    public X509v2CRLBuilder(
-        X500Name issuer,
-        Time     thisUpdate)
-    {
-        tbsGen = new V2TBSCertListGenerator();
-        extGenerator = new ExtensionsGenerator();
-
-        tbsGen.setIssuer(issuer);
-        tbsGen.setThisUpdate(thisUpdate);
-    }
-
-    /**
-     * Set the date by which the next CRL will become available.
-     *
-     * @param date  date of next CRL update.
-     * @return the current builder.
-     */
-    public X509v2CRLBuilder setNextUpdate(
-        Date    date)
-    {
-        return this.setNextUpdate(new Time(date));
-    }
-
-    /**
-     * Set the date by which the next CRL will become available.
-     *
-     * @param date  date of next CRL update.
-     * @param dateLocale locale to be used for date interpretation.
-     * @return the current builder.
-     */
-    public X509v2CRLBuilder setNextUpdate(
-        Date    date,
-        Locale  dateLocale)
-    {
-        return this.setNextUpdate(new Time(date, dateLocale));
-    }
-
-    /**
-     * Set the date by which the next CRL will become available.
-     *
-     * @param date  date of next CRL update.
-     * @return the current builder.
-     */
-    public X509v2CRLBuilder setNextUpdate(
-        Time    date)
-    {
-        tbsGen.setNextUpdate(date);
-
-        return this;
-    }
-
-    /**
-     * Add a CRL entry with the just reasonCode extension.
-     *
-     * @param userCertificateSerial serial number of revoked certificate.
-     * @param revocationDate date of certificate revocation.
-     * @param reason the reason code, as indicated in CRLReason, i.e CRLReason.keyCompromise, or 0 if not to be used.
-     * @return the current builder.
-     */
-    public X509v2CRLBuilder addCRLEntry(BigInteger userCertificateSerial, Date revocationDate, int reason)
-    {
-        tbsGen.addCRLEntry(new ASN1Integer(userCertificateSerial), new Time(revocationDate), reason);
-
-        return this;
-    }
-
-    /**
-     * Add a CRL entry with an invalidityDate extension as well as a reasonCode extension. This is used
-     * where the date of revocation might be after issues with the certificate may have occurred.
-     *
-     * @param userCertificateSerial serial number of revoked certificate.
-     * @param revocationDate date of certificate revocation.
-     * @param reason the reason code, as indicated in CRLReason, i.e CRLReason.keyCompromise, or 0 if not to be used.
-     * @param invalidityDate the date on which the private key for the certificate became compromised or the certificate otherwise became invalid.
-     * @return the current builder.
-     */
-    public X509v2CRLBuilder addCRLEntry(BigInteger userCertificateSerial, Date revocationDate, int reason, Date invalidityDate)
-    {
-        tbsGen.addCRLEntry(new ASN1Integer(userCertificateSerial), new Time(revocationDate), reason, new ASN1GeneralizedTime(invalidityDate));
-
-        return this;
-    }
-   
-    /**
-     * Add a CRL entry with extensions.
-     *
-     * @param userCertificateSerial serial number of revoked certificate.
-     * @param revocationDate date of certificate revocation.
-     * @param extensions extension set to be associated with this CRLEntry.
-     * @return the current builder.
-     * @deprecated use method taking Extensions
-     */
-    public X509v2CRLBuilder addCRLEntry(BigInteger userCertificateSerial, Date revocationDate, X509Extensions extensions)
-    {
-        tbsGen.addCRLEntry(new ASN1Integer(userCertificateSerial), new Time(revocationDate), Extensions.getInstance(extensions));
-
-        return this;
-    }
-
-    /**
-     * Add a CRL entry with extensions.
-     *
-     * @param userCertificateSerial serial number of revoked certificate.
-     * @param revocationDate date of certificate revocation.
-     * @param extensions extension set to be associated with this CRLEntry.
-     * @return the current builder.
-     */
-    public X509v2CRLBuilder addCRLEntry(BigInteger userCertificateSerial, Date revocationDate, Extensions extensions)
-    {
-        tbsGen.addCRLEntry(new ASN1Integer(userCertificateSerial), new Time(revocationDate), extensions);
-
-        return this;
-    }
-
-    /**
-     * Add the CRLEntry objects contained in a previous CRL.
-     * 
-     * @param other the X509CRLHolder to source the other entries from.
-     * @return the current builder.
-     */
-    public X509v2CRLBuilder addCRL(X509CRLHolder other)
-    {
-        TBSCertList revocations = other.toASN1Structure().getTBSCertList();
-
-        if (revocations != null)
-        {
-            for (Enumeration en = revocations.getRevokedCertificateEnumeration(); en.hasMoreElements();)
-            {
-                tbsGen.addCRLEntry(ASN1Sequence.getInstance(((ASN1Encodable)en.nextElement()).toASN1Primitive()));
-            }
-        }
-
-        return this;
-    }
-
-    /**
-     * Add a given extension field for the standard extensions tag (tag 3)
-     *
-     * @param oid the OID defining the extension type.
-     * @param isCritical true if the extension is critical, false otherwise.
-     * @param value the ASN.1 structure that forms the extension's value.
-     * @return this builder object.
-     */
-    public X509v2CRLBuilder addExtension(
-        ASN1ObjectIdentifier oid,
-        boolean isCritical,
-        ASN1Encodable value)
-        throws CertIOException
-    {
-        CertUtils.addExtension(extGenerator, oid, isCritical, value);
-
-        return this;
-    }
-
-    /**
-     * Add a given extension field for the standard extensions tag (tag 3) using a byte encoding of the
-     * extension value.
-     *
-     * @param oid the OID defining the extension type.
-     * @param isCritical true if the extension is critical, false otherwise.
-     * @param encodedValue a byte array representing the encoding of the extension value.
-     * @return this builder object.
-     */
-    public X509v2CRLBuilder addExtension(
-        ASN1ObjectIdentifier oid,
-        boolean isCritical,
-        byte[] encodedValue)
-        throws CertIOException
-    {
-        extGenerator.addExtension(oid, isCritical, encodedValue);
-
-        return this;
-    }
-
-    /**
-     * Generate an X.509 CRL, based on the current issuer and subject
-     * using the passed in signer.
-     *
-     * @param signer the content signer to be used to generate the signature validating the certificate.
-     * @return a holder containing the resulting signed certificate.
-     */
-    public X509CRLHolder build(
-        ContentSigner signer)
-    {
-        tbsGen.setSignature(signer.getAlgorithmIdentifier());
-
-        if (!extGenerator.isEmpty())
-        {
-            tbsGen.setExtensions(extGenerator.generate());
-        }
-
-        return CertUtils.generateFullCRL(signer, tbsGen.generateTBSCertList());
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/X509v3CertificateBuilder.java b/bcpkix/src/main/java/org/bouncycastle/cert/X509v3CertificateBuilder.java
deleted file mode 100644
index 22905b9..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/X509v3CertificateBuilder.java
+++ /dev/null
@@ -1,195 +0,0 @@
-package org.bouncycastle.cert;
-
-import java.math.BigInteger;
-import java.util.Date;
-import java.util.Locale;
-
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.x500.X500Name;
-import org.bouncycastle.asn1.x509.Certificate;
-import org.bouncycastle.asn1.x509.Extension;
-import org.bouncycastle.asn1.x509.ExtensionsGenerator;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.bouncycastle.asn1.x509.Time;
-import org.bouncycastle.asn1.x509.V3TBSCertificateGenerator;
-import org.bouncycastle.operator.ContentSigner;
-
-
-/**
- * class to produce an X.509 Version 3 certificate.
- */
-public class X509v3CertificateBuilder
-{
-    private V3TBSCertificateGenerator   tbsGen;
-    private ExtensionsGenerator extGenerator;
-
-    /**
-     * Create a builder for a version 3 certificate.
-     *
-     * @param issuer the certificate issuer
-     * @param serial the certificate serial number
-     * @param notBefore the date before which the certificate is not valid
-     * @param notAfter the date after which the certificate is not valid
-     * @param subject the certificate subject
-     * @param publicKeyInfo the info structure for the public key to be associated with this certificate.
-     */
-    public X509v3CertificateBuilder(X500Name issuer, BigInteger serial, Date notBefore, Date notAfter, X500Name subject, SubjectPublicKeyInfo publicKeyInfo)
-    {
-        this(issuer, serial, new Time(notBefore), new Time(notAfter), subject, publicKeyInfo);
-    }
-
-    /**
-     * Create a builder for a version 3 certificate. You may need to use this constructor if the default locale
-     * doesn't use a Gregorian calender so that the Time produced is compatible with other ASN.1 implementations.
-     *
-     * @param issuer the certificate issuer
-     * @param serial the certificate serial number
-     * @param notBefore the date before which the certificate is not valid
-     * @param notAfter the date after which the certificate is not valid
-     * @param dateLocale locale to be used for date interpretation.
-     * @param subject the certificate subject
-     * @param publicKeyInfo the info structure for the public key to be associated with this certificate.
-     */
-    public X509v3CertificateBuilder(X500Name issuer, BigInteger serial, Date notBefore, Date notAfter, Locale dateLocale, X500Name subject, SubjectPublicKeyInfo publicKeyInfo)
-    {
-        this(issuer, serial, new Time(notBefore, dateLocale), new Time(notAfter, dateLocale), subject, publicKeyInfo);
-    }
-
-    /**
-     * Create a builder for a version 3 certificate.
-     *
-     * @param issuer the certificate issuer
-     * @param serial the certificate serial number
-     * @param notBefore the Time before which the certificate is not valid
-     * @param notAfter the Time after which the certificate is not valid
-     * @param subject the certificate subject
-     * @param publicKeyInfo the info structure for the public key to be associated with this certificate.
-     */
-    public X509v3CertificateBuilder(X500Name issuer, BigInteger serial, Time notBefore, Time notAfter, X500Name subject, SubjectPublicKeyInfo publicKeyInfo)
-    {
-        tbsGen = new V3TBSCertificateGenerator();
-        tbsGen.setSerialNumber(new ASN1Integer(serial));
-        tbsGen.setIssuer(issuer);
-        tbsGen.setStartDate(notBefore);
-        tbsGen.setEndDate(notAfter);
-        tbsGen.setSubject(subject);
-        tbsGen.setSubjectPublicKeyInfo(publicKeyInfo);
-
-        extGenerator = new ExtensionsGenerator();
-    }
-
-    /**
-     * Set the subjectUniqueID - note: it is very rare that it is correct to do this.
-     *
-     * @param uniqueID a boolean array representing the bits making up the subjectUniqueID.
-     * @return this builder object.
-     */
-    public X509v3CertificateBuilder setSubjectUniqueID(boolean[] uniqueID)
-    {
-        tbsGen.setSubjectUniqueID(CertUtils.booleanToBitString(uniqueID));
-
-        return this;
-    }
-
-    /**
-     * Set the issuerUniqueID - note: it is very rare that it is correct to do this.
-     *
-     * @param uniqueID a boolean array representing the bits making up the issuerUniqueID.
-     * @return this builder object.
-     */
-    public X509v3CertificateBuilder setIssuerUniqueID(boolean[] uniqueID)
-    {
-        tbsGen.setIssuerUniqueID(CertUtils.booleanToBitString(uniqueID));
-
-        return this;
-    }
-
-    /**
-     * Add a given extension field for the standard extensions tag (tag 3)
-     *
-     * @param oid the OID defining the extension type.
-     * @param isCritical true if the extension is critical, false otherwise.
-     * @param value the ASN.1 structure that forms the extension's value.
-     * @return this builder object.
-     */
-    public X509v3CertificateBuilder addExtension(
-        ASN1ObjectIdentifier oid,
-        boolean isCritical,
-        ASN1Encodable value)
-        throws CertIOException
-    {
-        CertUtils.addExtension(extGenerator, oid, isCritical, value);
-
-        return this;
-    }
-
-    /**
-     * Add a given extension field for the standard extensions tag (tag 3) using a byte encoding of the
-     * extension value.
-     *
-     * @param oid the OID defining the extension type.
-     * @param isCritical true if the extension is critical, false otherwise.
-     * @param encodedValue a byte array representing the encoding of the extension value.
-     * @return this builder object.
-     */
-    public X509v3CertificateBuilder addExtension(
-        ASN1ObjectIdentifier oid,
-        boolean isCritical,
-        byte[] encodedValue)
-        throws CertIOException
-    {
-        extGenerator.addExtension(oid, isCritical, encodedValue);
-
-        return this;
-    }
-
-    /**
-     * Add a given extension field for the standard extensions tag (tag 3)
-     * copying the extension value from another certificate.
-     *
-     * @param oid the OID defining the extension type.
-     * @param isCritical true if the copied extension is to be marked as critical, false otherwise.
-     * @param certHolder the holder for the certificate that the extension is to be copied from.
-     * @return this builder object.
-     */
-    public X509v3CertificateBuilder copyAndAddExtension(
-        ASN1ObjectIdentifier oid,
-        boolean isCritical,
-        X509CertificateHolder certHolder)
-    {
-        Certificate cert = certHolder.toASN1Structure();
-
-        Extension extension = cert.getTBSCertificate().getExtensions().getExtension(oid);
-
-        if (extension == null)
-        {
-            throw new NullPointerException("extension " + oid + " not present");
-        }
-
-        extGenerator.addExtension(oid, isCritical, extension.getExtnValue().getOctets());
-
-        return this;
-    }
-
-    /**
-     * Generate an X.509 certificate, based on the current issuer and subject
-     * using the passed in signer.
-     *
-     * @param signer the content signer to be used to generate the signature validating the certificate.
-     * @return a holder containing the resulting signed certificate.
-     */
-    public X509CertificateHolder build(
-        ContentSigner signer)
-    {
-        tbsGen.setSignature(signer.getAlgorithmIdentifier());
-
-        if (!extGenerator.isEmpty())
-        {
-            tbsGen.setExtensions(extGenerator.generate());
-        }
-
-        return CertUtils.generateFullCert(signer, tbsGen.generateTBSCertificate());
-    }
-}
\ No newline at end of file
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/bc/BcX509ExtensionUtils.java b/bcpkix/src/main/java/org/bouncycastle/cert/bc/BcX509ExtensionUtils.java
deleted file mode 100644
index c5a0953..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/bc/BcX509ExtensionUtils.java
+++ /dev/null
@@ -1,91 +0,0 @@
-package org.bouncycastle.cert.bc;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-
-import org.bouncycastle.asn1.oiw.OIWObjectIdentifiers;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.asn1.x509.AuthorityKeyIdentifier;
-import org.bouncycastle.asn1.x509.SubjectKeyIdentifier;
-import org.bouncycastle.cert.X509ExtensionUtils;
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.digests.SHA1Digest;
-import org.bouncycastle.crypto.params.AsymmetricKeyParameter;
-import org.bouncycastle.crypto.util.SubjectPublicKeyInfoFactory;
-import org.bouncycastle.operator.DigestCalculator;
-
-public class BcX509ExtensionUtils
-    extends X509ExtensionUtils
-{
-    /**
-     * Create a utility class pre-configured with a SHA-1 digest calculator based on the
-     * BC implementation.
-     */
-    public BcX509ExtensionUtils()
-    {
-        super(new SHA1DigestCalculator());
-    }
-
-    public BcX509ExtensionUtils(DigestCalculator calculator)
-    {
-        super(calculator);
-    }
-
-    public AuthorityKeyIdentifier createAuthorityKeyIdentifier(
-        AsymmetricKeyParameter publicKey)
-        throws IOException
-    {
-        return super.createAuthorityKeyIdentifier(SubjectPublicKeyInfoFactory.createSubjectPublicKeyInfo(publicKey));
-    }
-
-    /**
-     * Return a RFC 3280 type 1 key identifier. As in:
-     * <pre>
-     * (1) The keyIdentifier is composed of the 160-bit SHA-1 hash of the
-     * value of the BIT STRING subjectPublicKey (excluding the tag,
-     * length, and number of unused bits).
-     * </pre>
-     * @param publicKey the key object containing the key identifier is to be based on.
-     * @return the key identifier.
-     */
-    public SubjectKeyIdentifier createSubjectKeyIdentifier(
-        AsymmetricKeyParameter publicKey)
-        throws IOException
-    {
-        return super.createSubjectKeyIdentifier(SubjectPublicKeyInfoFactory.createSubjectPublicKeyInfo(publicKey));
-    }
-
-    private static class SHA1DigestCalculator
-        implements DigestCalculator
-    {
-        private ByteArrayOutputStream bOut = new ByteArrayOutputStream();
-
-        public AlgorithmIdentifier getAlgorithmIdentifier()
-        {
-            return new AlgorithmIdentifier(OIWObjectIdentifiers.idSHA1);
-        }
-
-        public OutputStream getOutputStream()
-        {
-            return bOut;
-        }
-
-        public byte[] getDigest()
-        {
-            byte[] bytes = bOut.toByteArray();
-
-            bOut.reset();
-
-            Digest sha1 = new SHA1Digest();
-
-            sha1.update(bytes, 0, bytes.length);
-
-            byte[] digest = new byte[sha1.getDigestSize()];
-
-            sha1.doFinal(digest, 0);
-
-            return digest;
-        }
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/bc/BcX509v1CertificateBuilder.java b/bcpkix/src/main/java/org/bouncycastle/cert/bc/BcX509v1CertificateBuilder.java
deleted file mode 100644
index 5120030..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/bc/BcX509v1CertificateBuilder.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package org.bouncycastle.cert.bc;
-
-import java.io.IOException;
-import java.math.BigInteger;
-import java.util.Date;
-
-import org.bouncycastle.asn1.x500.X500Name;
-import org.bouncycastle.cert.X509v1CertificateBuilder;
-import org.bouncycastle.crypto.params.AsymmetricKeyParameter;
-import org.bouncycastle.crypto.util.SubjectPublicKeyInfoFactory;
-
-/**
- * JCA helper class to allow BC lightweight objects to be used in the construction of a Version 1 certificate.
- */
-public class BcX509v1CertificateBuilder
-    extends X509v1CertificateBuilder
-{
-    /**
-     * Initialise the builder using an AsymmetricKeyParameter.
-     *
-     * @param issuer X500Name representing the issuer of this certificate.
-     * @param serial the serial number for the certificate.
-     * @param notBefore date before which the certificate is not valid.
-     * @param notAfter date after which the certificate is not valid.
-     * @param subject X500Name representing the subject of this certificate.
-     * @param publicKey the public key to be associated with the certificate.
-     */
-    public BcX509v1CertificateBuilder(X500Name issuer, BigInteger serial, Date notBefore, Date notAfter, X500Name subject, AsymmetricKeyParameter publicKey)
-        throws IOException
-    {
-        super(issuer, serial, notBefore, notAfter, subject, SubjectPublicKeyInfoFactory.createSubjectPublicKeyInfo(publicKey));
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/bc/BcX509v3CertificateBuilder.java b/bcpkix/src/main/java/org/bouncycastle/cert/bc/BcX509v3CertificateBuilder.java
deleted file mode 100644
index e85fce1..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/bc/BcX509v3CertificateBuilder.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package org.bouncycastle.cert.bc;
-
-import java.io.IOException;
-import java.math.BigInteger;
-import java.util.Date;
-
-import org.bouncycastle.asn1.x500.X500Name;
-import org.bouncycastle.cert.X509CertificateHolder;
-import org.bouncycastle.cert.X509v3CertificateBuilder;
-import org.bouncycastle.crypto.params.AsymmetricKeyParameter;
-import org.bouncycastle.crypto.util.SubjectPublicKeyInfoFactory;
-
-/**
- * JCA helper class to allow BC lightweight objects to be used in the construction of a Version 3 certificate.
- */
-public class BcX509v3CertificateBuilder
-    extends X509v3CertificateBuilder
-{
-    /**
-     * Initialise the builder using a PublicKey.
-     *
-     * @param issuer X500Name representing the issuer of this certificate.
-     * @param serial the serial number for the certificate.
-     * @param notBefore date before which the certificate is not valid.
-     * @param notAfter date after which the certificate is not valid.
-     * @param subject X500Name representing the subject of this certificate.
-     * @param publicKey the public key to be associated with the certificate.
-     */
-    public BcX509v3CertificateBuilder(X500Name issuer, BigInteger serial, Date notBefore, Date notAfter, X500Name subject, AsymmetricKeyParameter publicKey)
-        throws IOException
-    {
-        super(issuer, serial, notBefore, notAfter, subject, SubjectPublicKeyInfoFactory.createSubjectPublicKeyInfo(publicKey));
-    }
-
-    /**
-     * Initialise the builder using the subject from the passed in issuerCert as the issuer, as well as
-     * passing through and converting the other objects provided.
-     *
-     * @param issuerCert holder for certificate who's subject is the issuer of the certificate we are building.
-     * @param serial the serial number for the certificate.
-     * @param notBefore date before which the certificate is not valid.
-     * @param notAfter date after which the certificate is not valid.
-     * @param subject principal representing the subject of this certificate.
-     * @param publicKey the public key to be associated with the certificate.
-     */
-    public BcX509v3CertificateBuilder(X509CertificateHolder issuerCert, BigInteger serial, Date notBefore, Date notAfter, X500Name subject, AsymmetricKeyParameter publicKey)
-        throws IOException
-    {
-        super(issuerCert.getSubject(), serial, notBefore, notAfter, subject, SubjectPublicKeyInfoFactory.createSubjectPublicKeyInfo(publicKey));
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/cmp/CMPException.java b/bcpkix/src/main/java/org/bouncycastle/cert/cmp/CMPException.java
deleted file mode 100644
index 2a1cc86..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/cmp/CMPException.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.bouncycastle.cert.cmp;
-
-public class CMPException
-    extends Exception
-{
-    private Throwable cause;
-
-    public CMPException(String msg, Throwable cause)
-    {
-        super(msg);
-
-        this.cause = cause;
-    }
-
-    public CMPException(String msg)
-    {
-        super(msg);
-    }
-
-    public Throwable getCause()
-    {
-        return cause;
-    }
-}
\ No newline at end of file
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/cmp/CMPRuntimeException.java b/bcpkix/src/main/java/org/bouncycastle/cert/cmp/CMPRuntimeException.java
deleted file mode 100644
index 35b2d3f..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/cmp/CMPRuntimeException.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package org.bouncycastle.cert.cmp;
-
-public class CMPRuntimeException
-    extends RuntimeException
-{
-    private Throwable cause;
-
-    public CMPRuntimeException(String msg, Throwable cause)
-    {
-        super(msg);
-
-        this.cause = cause;
-    }
-
-    public Throwable getCause()
-    {
-        return cause;
-    }
-}
\ No newline at end of file
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/cmp/CMPUtil.java b/bcpkix/src/main/java/org/bouncycastle/cert/cmp/CMPUtil.java
deleted file mode 100644
index cc2ef04..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/cmp/CMPUtil.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package org.bouncycastle.cert.cmp;
-
-import java.io.IOException;
-import java.io.OutputStream;
-
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.DEROutputStream;
-
-class CMPUtil
-{
-    static void derEncodeToStream(ASN1Encodable obj, OutputStream stream)
-    {
-        DEROutputStream dOut = new DEROutputStream(stream);
-
-        try
-        {
-            dOut.writeObject(obj);
-
-            dOut.close();
-        }
-        catch (IOException e)
-        {
-            throw new CMPRuntimeException("unable to DER encode object: " + e.getMessage(), e);
-        }
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/cmp/CertificateConfirmationContent.java b/bcpkix/src/main/java/org/bouncycastle/cert/cmp/CertificateConfirmationContent.java
deleted file mode 100644
index d1a2e64..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/cmp/CertificateConfirmationContent.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package org.bouncycastle.cert.cmp;
-
-import org.bouncycastle.asn1.cmp.CertConfirmContent;
-import org.bouncycastle.asn1.cmp.CertStatus;
-import org.bouncycastle.operator.DefaultDigestAlgorithmIdentifierFinder;
-import org.bouncycastle.operator.DigestAlgorithmIdentifierFinder;
-
-public class CertificateConfirmationContent
-{
-    private DigestAlgorithmIdentifierFinder digestAlgFinder;
-    private CertConfirmContent content;
-
-    public CertificateConfirmationContent(CertConfirmContent content)
-    {
-        this(content, new DefaultDigestAlgorithmIdentifierFinder());
-    }
-
-    public CertificateConfirmationContent(CertConfirmContent content, DigestAlgorithmIdentifierFinder digestAlgFinder)
-    {
-        this.digestAlgFinder = digestAlgFinder;
-        this.content = content;
-    }
-
-    public CertConfirmContent toASN1Structure()
-    {
-        return content;
-    }
-
-    public CertificateStatus[] getStatusMessages()
-    {
-        CertStatus[] statusArray = content.toCertStatusArray();
-        CertificateStatus[] ret = new CertificateStatus[statusArray.length];
-
-        for (int i = 0; i != ret.length; i++)
-        {
-            ret[i] = new CertificateStatus(digestAlgFinder, statusArray[i]);
-        }
-
-        return ret;
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/cmp/CertificateConfirmationContentBuilder.java b/bcpkix/src/main/java/org/bouncycastle/cert/cmp/CertificateConfirmationContentBuilder.java
deleted file mode 100644
index 578ae14..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/cmp/CertificateConfirmationContentBuilder.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package org.bouncycastle.cert.cmp;
-
-import java.math.BigInteger;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.cmp.CertConfirmContent;
-import org.bouncycastle.asn1.cmp.CertStatus;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.cert.X509CertificateHolder;
-import org.bouncycastle.operator.DefaultDigestAlgorithmIdentifierFinder;
-import org.bouncycastle.operator.DigestAlgorithmIdentifierFinder;
-import org.bouncycastle.operator.DigestCalculator;
-import org.bouncycastle.operator.DigestCalculatorProvider;
-import org.bouncycastle.operator.OperatorCreationException;
-
-public class CertificateConfirmationContentBuilder
-{
-    private DigestAlgorithmIdentifierFinder digestAlgFinder;
-    private List acceptedCerts = new ArrayList();
-    private List acceptedReqIds = new ArrayList();
-
-    public CertificateConfirmationContentBuilder()
-    {
-        this(new DefaultDigestAlgorithmIdentifierFinder());
-    }
-
-    public CertificateConfirmationContentBuilder(DigestAlgorithmIdentifierFinder digestAlgFinder)
-    {
-        this.digestAlgFinder = digestAlgFinder;
-    }
-    
-    public CertificateConfirmationContentBuilder addAcceptedCertificate(X509CertificateHolder certHolder, BigInteger certReqID)
-    {
-        acceptedCerts.add(certHolder);
-        acceptedReqIds.add(certReqID);
-
-        return this;
-    }
-
-    public CertificateConfirmationContent build(DigestCalculatorProvider digesterProvider)
-        throws CMPException
-    {
-        ASN1EncodableVector v = new ASN1EncodableVector();
-
-        for (int i = 0; i != acceptedCerts.size(); i++)
-        {
-            X509CertificateHolder certHolder = (X509CertificateHolder)acceptedCerts.get(i);
-            BigInteger reqID = (BigInteger)acceptedReqIds.get(i);
-
-            AlgorithmIdentifier digAlg = digestAlgFinder.find(certHolder.toASN1Structure().getSignatureAlgorithm());
-            if (digAlg == null)
-            {
-                throw new CMPException("cannot find algorithm for digest from signature");
-            }
-
-            DigestCalculator digester;
-
-            try
-            {
-                digester = digesterProvider.get(digAlg);
-            }
-            catch (OperatorCreationException e)
-            {
-                throw new CMPException("unable to create digest: " + e.getMessage(), e);
-            }
-
-            CMPUtil.derEncodeToStream(certHolder.toASN1Structure(), digester.getOutputStream());
-
-            v.add(new CertStatus(digester.getDigest(), reqID));
-        }
-
-        return new CertificateConfirmationContent(CertConfirmContent.getInstance(new DERSequence(v)), digestAlgFinder);
-    }
-
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/cmp/CertificateStatus.java b/bcpkix/src/main/java/org/bouncycastle/cert/cmp/CertificateStatus.java
deleted file mode 100644
index 50df835..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/cmp/CertificateStatus.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package org.bouncycastle.cert.cmp;
-
-import java.math.BigInteger;
-
-import org.bouncycastle.asn1.cmp.CertStatus;
-import org.bouncycastle.asn1.cmp.PKIStatusInfo;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.cert.X509CertificateHolder;
-import org.bouncycastle.operator.DigestAlgorithmIdentifierFinder;
-import org.bouncycastle.operator.DigestCalculator;
-import org.bouncycastle.operator.DigestCalculatorProvider;
-import org.bouncycastle.operator.OperatorCreationException;
-import org.bouncycastle.util.Arrays;
-
-public class CertificateStatus
-{
-    private DigestAlgorithmIdentifierFinder digestAlgFinder;    
-    private CertStatus certStatus;
-
-    CertificateStatus(DigestAlgorithmIdentifierFinder digestAlgFinder, CertStatus certStatus)
-    {
-        this.digestAlgFinder = digestAlgFinder;
-        this.certStatus = certStatus;
-    }
-
-    public PKIStatusInfo getStatusInfo()
-    {
-        return certStatus.getStatusInfo();
-    }
-
-    public BigInteger getCertRequestID()
-    {
-        return certStatus.getCertReqId().getValue();
-    }
-
-    public boolean isVerified(X509CertificateHolder certHolder, DigestCalculatorProvider digesterProvider)
-        throws CMPException
-    {
-        AlgorithmIdentifier digAlg = digestAlgFinder.find(certHolder.toASN1Structure().getSignatureAlgorithm());
-        if (digAlg == null)
-        {
-            throw new CMPException("cannot find algorithm for digest from signature");
-        }
-
-        DigestCalculator digester;
-
-        try
-        {
-            digester = digesterProvider.get(digAlg);
-        }
-        catch (OperatorCreationException e)
-        {
-            throw new CMPException("unable to create digester: " + e.getMessage(), e);
-        }
-
-        CMPUtil.derEncodeToStream(certHolder.toASN1Structure(), digester.getOutputStream());
-
-        return Arrays.areEqual(certStatus.getCertHash().getOctets(), digester.getDigest());
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/cmp/GeneralPKIMessage.java b/bcpkix/src/main/java/org/bouncycastle/cert/cmp/GeneralPKIMessage.java
deleted file mode 100644
index a928623..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/cmp/GeneralPKIMessage.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package org.bouncycastle.cert.cmp;
-
-import java.io.IOException;
-
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.cmp.PKIBody;
-import org.bouncycastle.asn1.cmp.PKIHeader;
-import org.bouncycastle.asn1.cmp.PKIMessage;
-import org.bouncycastle.cert.CertIOException;
-
-/**
- * General wrapper for a generic PKIMessage
- */
-public class GeneralPKIMessage
-{
-    private final PKIMessage pkiMessage;
-
-    private static PKIMessage parseBytes(byte[] encoding)
-        throws IOException
-    {
-        try
-        {
-            return PKIMessage.getInstance(ASN1Primitive.fromByteArray(encoding));
-        }
-        catch (ClassCastException e)
-        {
-            throw new CertIOException("malformed data: " + e.getMessage(), e);
-        }
-        catch (IllegalArgumentException e)
-        {
-            throw new CertIOException("malformed data: " + e.getMessage(), e);
-        }
-    }
-
-    /**
-     * Create a PKIMessage from the passed in bytes.
-     *
-     * @param encoding BER/DER encoding of the PKIMessage
-     * @throws IOException in the event of corrupted data, or an incorrect structure.
-     */
-    public GeneralPKIMessage(byte[] encoding)
-        throws IOException
-    {
-        this(parseBytes(encoding));
-    }
-
-    /**
-     * Wrap a PKIMessage ASN.1 structure.
-     *
-     * @param pkiMessage base PKI message.
-     */
-    public GeneralPKIMessage(PKIMessage pkiMessage)
-    {
-        this.pkiMessage = pkiMessage;
-    }
-
-    public PKIHeader getHeader()
-    {
-        return pkiMessage.getHeader();
-    }
-
-    public PKIBody getBody()
-    {
-        return pkiMessage.getBody();
-    }
-
-    /**
-     * Return true if this message has protection bits on it. A return value of true
-     * indicates the message can be used to construct a ProtectedPKIMessage.
-     *
-     * @return true if message has protection, false otherwise.
-     */
-    public boolean hasProtection()
-    {
-        return pkiMessage.getHeader().getProtectionAlg() != null;
-    }
-
-    public PKIMessage toASN1Structure()
-    {
-        return pkiMessage;
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/cmp/ProtectedPKIMessage.java b/bcpkix/src/main/java/org/bouncycastle/cert/cmp/ProtectedPKIMessage.java
deleted file mode 100644
index 2749d90..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/cmp/ProtectedPKIMessage.java
+++ /dev/null
@@ -1,198 +0,0 @@
-package org.bouncycastle.cert.cmp;
-
-import java.io.IOException;
-import java.io.OutputStream;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Encoding;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.cmp.CMPCertificate;
-import org.bouncycastle.asn1.cmp.CMPObjectIdentifiers;
-import org.bouncycastle.asn1.cmp.PBMParameter;
-import org.bouncycastle.asn1.cmp.PKIBody;
-import org.bouncycastle.asn1.cmp.PKIHeader;
-import org.bouncycastle.asn1.cmp.PKIMessage;
-import org.bouncycastle.cert.X509CertificateHolder;
-import org.bouncycastle.cert.crmf.PKMACBuilder;
-import org.bouncycastle.operator.ContentVerifier;
-import org.bouncycastle.operator.ContentVerifierProvider;
-import org.bouncycastle.operator.MacCalculator;
-import org.bouncycastle.util.Arrays;
-
-/**
- * Wrapper for a PKIMessage with protection attached to it.
- */
-public class ProtectedPKIMessage
-{
-    private PKIMessage pkiMessage;
-
-    /**
-     * Base constructor.
-     *
-     * @param pkiMessage a GeneralPKIMessage with
-     */
-    public ProtectedPKIMessage(GeneralPKIMessage pkiMessage)
-    {
-        if (!pkiMessage.hasProtection())
-        {
-            throw new IllegalArgumentException("PKIMessage not protected");
-        }
-        
-        this.pkiMessage = pkiMessage.toASN1Structure();
-    }
-
-    ProtectedPKIMessage(PKIMessage pkiMessage)
-    {
-        if (pkiMessage.getHeader().getProtectionAlg() == null)
-        {
-            throw new IllegalArgumentException("PKIMessage not protected");
-        }
-
-        this.pkiMessage = pkiMessage;
-    }
-
-    /**
-     * Return the message header.
-     *
-     * @return the message's PKIHeader structure.
-     */
-    public PKIHeader getHeader()
-    {
-        return pkiMessage.getHeader();
-    }
-
-    /**
-     * Return the message body.
-     *
-     * @return the message's PKIBody structure.
-     */
-    public PKIBody getBody()
-    {
-        return pkiMessage.getBody();
-    }
-
-    /**
-     * Return the underlying ASN.1 structure contained in this object.
-     *
-     * @return a PKIMessage structure.
-     */
-    public PKIMessage toASN1Structure()
-    {
-        return pkiMessage;
-    }
-
-    /**
-     * Determine whether the message is protected by a password based MAC. Use verify(PKMACBuilder, char[])
-     * to verify the message if this method returns true.
-     *
-     * @return true if protection MAC PBE based, false otherwise.
-     */
-    public boolean hasPasswordBasedMacProtection()
-    {
-        return pkiMessage.getHeader().getProtectionAlg().getAlgorithm().equals(CMPObjectIdentifiers.passwordBasedMac);
-    }
-
-    /**
-     * Return the extra certificates associated with this message.
-     *
-     * @return an array of extra certificates, zero length if none present.
-     */
-    public X509CertificateHolder[] getCertificates()
-    {
-        CMPCertificate[] certs = pkiMessage.getExtraCerts();
-
-        if (certs == null)
-        {
-            return new X509CertificateHolder[0];
-        }
-
-        X509CertificateHolder[] res = new X509CertificateHolder[certs.length];
-        for (int i = 0; i != certs.length; i++)
-        {
-            res[i] = new X509CertificateHolder(certs[i].getX509v3PKCert());
-        }
-
-        return res;
-    }
-
-    /**
-     * Verify a message with a public key based signature attached.
-     *
-     * @param verifierProvider a provider of signature verifiers.
-     * @return true if the provider is able to create a verifier that validates
-     * the signature, false otherwise.
-     * @throws CMPException if an exception is thrown trying to verify the signature.
-     */
-    public boolean verify(ContentVerifierProvider verifierProvider)
-        throws CMPException
-    {
-        ContentVerifier verifier;
-        try
-        {
-            verifier = verifierProvider.get(pkiMessage.getHeader().getProtectionAlg());
-
-            return verifySignature(pkiMessage.getProtection().getBytes(), verifier);
-        }
-        catch (Exception e)
-        {
-            throw new CMPException("unable to verify signature: " + e.getMessage(), e);
-        }
-    }
-
-    /**
-     * Verify a message with password based MAC protection.
-     *
-     * @param pkMacBuilder MAC builder that can be used to construct the appropriate MacCalculator
-     * @param password the MAC password
-     * @return true if the passed in password and MAC builder verify the message, false otherwise.
-     * @throws CMPException if algorithm not MAC based, or an exception is thrown verifying the MAC.
-     */
-    public boolean verify(PKMACBuilder pkMacBuilder, char[] password)
-        throws CMPException
-    {
-        if (!CMPObjectIdentifiers.passwordBasedMac.equals(pkiMessage.getHeader().getProtectionAlg().getAlgorithm()))
-        {
-            throw new CMPException("protection algorithm not mac based");
-        }
-
-        try
-        {
-            pkMacBuilder.setParameters(PBMParameter.getInstance(pkiMessage.getHeader().getProtectionAlg().getParameters()));
-            MacCalculator calculator = pkMacBuilder.build(password);
-
-            OutputStream macOut = calculator.getOutputStream();
-
-            ASN1EncodableVector v = new ASN1EncodableVector();
-
-            v.add(pkiMessage.getHeader());
-            v.add(pkiMessage.getBody());
-
-            macOut.write(new DERSequence(v).getEncoded(ASN1Encoding.DER));
-
-            macOut.close();
-
-            return Arrays.areEqual(calculator.getMac(), pkiMessage.getProtection().getBytes());
-        }
-        catch (Exception e)
-        {
-            throw new CMPException("unable to verify MAC: " + e.getMessage(), e);
-        }
-    }
-
-    private boolean verifySignature(byte[] signature, ContentVerifier verifier)
-        throws IOException
-    {
-        ASN1EncodableVector v = new ASN1EncodableVector();
-
-        v.add(pkiMessage.getHeader());
-        v.add(pkiMessage.getBody());
-
-        OutputStream sOut = verifier.getOutputStream();
-
-        sOut.write(new DERSequence(v).getEncoded(ASN1Encoding.DER));
-
-        sOut.close();
-
-        return verifier.verify(signature);
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/cmp/ProtectedPKIMessageBuilder.java b/bcpkix/src/main/java/org/bouncycastle/cert/cmp/ProtectedPKIMessageBuilder.java
deleted file mode 100644
index 2919156..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/cmp/ProtectedPKIMessageBuilder.java
+++ /dev/null
@@ -1,306 +0,0 @@
-package org.bouncycastle.cert.cmp;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Encoding;
-import org.bouncycastle.asn1.ASN1GeneralizedTime;
-import org.bouncycastle.asn1.DERBitString;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.cmp.CMPCertificate;
-import org.bouncycastle.asn1.cmp.InfoTypeAndValue;
-import org.bouncycastle.asn1.cmp.PKIBody;
-import org.bouncycastle.asn1.cmp.PKIFreeText;
-import org.bouncycastle.asn1.cmp.PKIHeader;
-import org.bouncycastle.asn1.cmp.PKIHeaderBuilder;
-import org.bouncycastle.asn1.cmp.PKIMessage;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.asn1.x509.GeneralName;
-import org.bouncycastle.cert.X509CertificateHolder;
-import org.bouncycastle.operator.ContentSigner;
-import org.bouncycastle.operator.MacCalculator;
-
-/**
- * Builder for creating a protected PKI message.
- */
-public class ProtectedPKIMessageBuilder
-{
-    private PKIHeaderBuilder hdrBuilder;
-    private PKIBody body;
-    private List generalInfos = new ArrayList();
-    private List extraCerts = new ArrayList();
-
-    /**
-     * Commence a message with the header version CMP_2000.
-     *
-     * @param sender message sender.
-     * @param recipient intended recipient.
-     */
-    public ProtectedPKIMessageBuilder(GeneralName sender, GeneralName recipient)
-    {
-        this(PKIHeader.CMP_2000, sender, recipient);
-    }
-
-    /**
-     * Commence a message with a specific header type.
-     *
-     * @param pvno  the version CMP_1999 or CMP_2000.
-     * @param sender message sender.
-     * @param recipient intended recipient.
-     */
-    public ProtectedPKIMessageBuilder(int pvno, GeneralName sender, GeneralName recipient)
-    {
-        hdrBuilder = new PKIHeaderBuilder(pvno, sender, recipient);
-    }
-
-    /**
-     * Set the identifier for the transaction the new message will belong to.
-     *
-     * @param tid  the transaction ID.
-     * @return the current builder instance.
-     */
-    public ProtectedPKIMessageBuilder setTransactionID(byte[] tid)
-    {
-        hdrBuilder.setTransactionID(tid);
-
-        return this;
-    }
-
-    /**
-     * Include a human-readable message in the new message.
-     *
-     * @param freeText the contents of the human readable message,
-     * @return the current builder instance.
-     */
-    public ProtectedPKIMessageBuilder setFreeText(PKIFreeText freeText)
-    {
-        hdrBuilder.setFreeText(freeText);
-
-        return this;
-    }
-
-    /**
-     * Add a generalInfo data record to the header of the new message.
-     *
-     * @param genInfo the generalInfo data to be added.
-     * @return the current builder instance.
-     */
-    public ProtectedPKIMessageBuilder addGeneralInfo(InfoTypeAndValue genInfo)
-    {
-        generalInfos.add(genInfo);
-
-        return this;
-    }
-
-    /**
-     * Set the creation time for the new message.
-     *
-     * @param time the message creation time.
-     * @return the current builder instance.
-     */
-    public ProtectedPKIMessageBuilder setMessageTime(Date time)
-    {
-        hdrBuilder.setMessageTime(new ASN1GeneralizedTime(time));
-
-        return this;
-    }
-
-    /**
-     * Set the recipient key identifier for the key to be used to verify the new message.
-     *
-     * @param kid a key identifier.
-     * @return the current builder instance.
-     */
-    public ProtectedPKIMessageBuilder setRecipKID(byte[] kid)
-    {
-        hdrBuilder.setRecipKID(kid);
-
-        return this;
-    }
-
-    /**
-     * Set the recipient nonce field on the new message.
-     *
-     * @param nonce a NONCE, typically copied from the sender nonce of the previous message.
-     * @return the current builder instance.
-     */
-    public ProtectedPKIMessageBuilder setRecipNonce(byte[] nonce)
-    {
-        hdrBuilder.setRecipNonce(nonce);
-
-        return this;
-    }
-
-    /**
-     * Set the sender key identifier for the key used to protect the new message.
-     *
-     * @param kid a key identifier.
-     * @return the current builder instance.
-     */
-    public ProtectedPKIMessageBuilder setSenderKID(byte[] kid)
-    {
-        hdrBuilder.setSenderKID(kid);
-
-        return this;
-    }
-
-    /**
-     * Set the sender nonce field on the new message.
-     *
-     * @param nonce a NONCE, typically 128 bits of random data.
-     * @return the current builder instance.
-     */
-    public ProtectedPKIMessageBuilder setSenderNonce(byte[] nonce)
-    {
-        hdrBuilder.setSenderNonce(nonce);
-
-        return this;
-    }
-
-    /**
-     * Set the body for the new message
-     *
-     * @param body the message body.
-     * @return the current builder instance.
-     */
-    public ProtectedPKIMessageBuilder setBody(PKIBody body)
-    {
-        this.body = body;
-
-        return this;
-    }
-
-    /**
-     * Add an "extra certificate" to the message.
-     *
-     * @param extraCert the extra certificate to add.
-     * @return the current builder instance.
-     */
-    public ProtectedPKIMessageBuilder addCMPCertificate(X509CertificateHolder extraCert)
-    {
-        extraCerts.add(extraCert);
-
-        return this;
-    }
-
-    /**
-     * Build a protected PKI message which has MAC based integrity protection.
-     *
-     * @param macCalculator MAC calculator.
-     * @return the resulting protected PKI message.
-     * @throws CMPException if the protection MAC cannot be calculated.
-     */
-    public ProtectedPKIMessage build(MacCalculator macCalculator)
-        throws CMPException
-    {
-        finaliseHeader(macCalculator.getAlgorithmIdentifier());
-
-        PKIHeader header = hdrBuilder.build();
-
-        try
-        {
-            DERBitString protection = new DERBitString(calculateMac(macCalculator, header, body));
-
-            return finaliseMessage(header, protection);
-        }
-        catch (IOException e)
-        {
-            throw new CMPException("unable to encode MAC input: " + e.getMessage(), e);
-        }
-    }
-
-    /**
-     * Build a protected PKI message which has MAC based integrity protection.
-     *
-     * @param signer the ContentSigner to be used to calculate the signature.
-     * @return the resulting protected PKI message.
-     * @throws CMPException if the protection signature cannot be calculated.
-     */
-    public ProtectedPKIMessage build(ContentSigner signer)
-        throws CMPException
-    {
-        finaliseHeader(signer.getAlgorithmIdentifier());
-
-        PKIHeader header = hdrBuilder.build();
-        
-        try
-        {
-            DERBitString protection = new DERBitString(calculateSignature(signer, header, body));
-
-            return finaliseMessage(header, protection);
-        }
-        catch (IOException e)
-        {
-            throw new CMPException("unable to encode signature input: " + e.getMessage(), e);
-        }
-    }
-
-    private void finaliseHeader(AlgorithmIdentifier algorithmIdentifier)
-    {
-        hdrBuilder.setProtectionAlg(algorithmIdentifier);
-
-        if (!generalInfos.isEmpty())
-        {
-            InfoTypeAndValue[] genInfos = new InfoTypeAndValue[generalInfos.size()];
-
-            hdrBuilder.setGeneralInfo((InfoTypeAndValue[])generalInfos.toArray(genInfos));
-        }
-    }
-
-    private ProtectedPKIMessage finaliseMessage(PKIHeader header, DERBitString protection)
-    {
-        if (!extraCerts.isEmpty())
-        {
-            CMPCertificate[] cmpCerts = new CMPCertificate[extraCerts.size()];
-
-            for (int i = 0; i != cmpCerts.length; i++)
-            {
-                cmpCerts[i] = new CMPCertificate(((X509CertificateHolder)extraCerts.get(i)).toASN1Structure());
-            }
-
-            return new ProtectedPKIMessage(new PKIMessage(header, body, protection, cmpCerts));
-        }
-        else
-        {
-            return new ProtectedPKIMessage(new PKIMessage(header, body, protection));
-        }
-    }
-
-    private byte[] calculateSignature(ContentSigner signer, PKIHeader header, PKIBody body)
-        throws IOException
-    {
-        ASN1EncodableVector v = new ASN1EncodableVector();
-
-        v.add(header);
-        v.add(body);
-
-        OutputStream sOut = signer.getOutputStream();
-
-        sOut.write(new DERSequence(v).getEncoded(ASN1Encoding.DER));
-
-        sOut.close();
-
-        return signer.getSignature();
-    }
-
-    private byte[] calculateMac(MacCalculator macCalculator, PKIHeader header, PKIBody body)
-        throws IOException
-    {
-        ASN1EncodableVector v = new ASN1EncodableVector();
-
-        v.add(header);
-        v.add(body);
-
-        OutputStream sOut = macCalculator.getOutputStream();
-
-        sOut.write(new DERSequence(v).getEncoded(ASN1Encoding.DER));
-
-        sOut.close();
-
-        return macCalculator.getMac();
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/cmp/RevocationDetails.java b/bcpkix/src/main/java/org/bouncycastle/cert/cmp/RevocationDetails.java
deleted file mode 100644
index f382c69..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/cmp/RevocationDetails.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package org.bouncycastle.cert.cmp;
-
-import java.math.BigInteger;
-
-import org.bouncycastle.asn1.cmp.RevDetails;
-import org.bouncycastle.asn1.x500.X500Name;
-
-public class RevocationDetails
-{
-    private RevDetails revDetails;
-
-    public RevocationDetails(RevDetails revDetails)
-    {
-        this.revDetails = revDetails;
-    }
-
-    public X500Name getSubject()
-    {
-        return revDetails.getCertDetails().getSubject();
-    }
-
-    public X500Name getIssuer()
-    {
-        return revDetails.getCertDetails().getIssuer();
-    }
-
-    public BigInteger getSerialNumber()
-    {
-        return revDetails.getCertDetails().getSerialNumber().getValue();
-    }
-
-    public RevDetails toASN1Structure()
-    {
-        return revDetails;
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/cmp/RevocationDetailsBuilder.java b/bcpkix/src/main/java/org/bouncycastle/cert/cmp/RevocationDetailsBuilder.java
deleted file mode 100644
index e662d28..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/cmp/RevocationDetailsBuilder.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package org.bouncycastle.cert.cmp;
-
-import java.math.BigInteger;
-
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.cmp.RevDetails;
-import org.bouncycastle.asn1.crmf.CertTemplateBuilder;
-import org.bouncycastle.asn1.x500.X500Name;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-
-public class RevocationDetailsBuilder
-{
-    private CertTemplateBuilder templateBuilder = new CertTemplateBuilder();
-    
-    public RevocationDetailsBuilder setPublicKey(SubjectPublicKeyInfo publicKey)
-    {
-        if (publicKey != null)
-        {
-            templateBuilder.setPublicKey(publicKey);
-        }
-
-        return this;
-    }
-
-    public RevocationDetailsBuilder setIssuer(X500Name issuer)
-    {
-        if (issuer != null)
-        {
-            templateBuilder.setIssuer(issuer);
-        }
-
-        return this;
-    }
-
-    public RevocationDetailsBuilder setSerialNumber(BigInteger serialNumber)
-    {
-        if (serialNumber != null)
-        {
-            templateBuilder.setSerialNumber(new ASN1Integer(serialNumber));
-        }
-
-        return this;
-    }
-
-    public RevocationDetailsBuilder setSubject(X500Name subject)
-    {
-        if (subject != null)
-        {
-            templateBuilder.setSubject(subject);
-        }
-
-        return this;
-    }
-
-    public RevocationDetails build()
-    {
-        return new RevocationDetails(new RevDetails(templateBuilder.build()));
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/cmp/package.html b/bcpkix/src/main/java/org/bouncycastle/cert/cmp/package.html
deleted file mode 100644
index a58af18..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/cmp/package.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-        "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<body bgcolor="#ffffff">
-Basic support package for handling and creating CMP (RFC 4210) certificate management messages.
-</body>
-</html>
\ No newline at end of file
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/cmp/test/AllTests.java b/bcpkix/src/main/java/org/bouncycastle/cert/cmp/test/AllTests.java
deleted file mode 100644
index 2763083..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/cmp/test/AllTests.java
+++ /dev/null
@@ -1,317 +0,0 @@
-package org.bouncycastle.cert.cmp.test;
-
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.math.BigInteger;
-import java.security.GeneralSecurityException;
-import java.security.KeyPair;
-import java.security.KeyPairGenerator;
-import java.security.PrivateKey;
-import java.security.PublicKey;
-import java.security.Security;
-import java.security.cert.X509Certificate;
-import java.util.Date;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.cmp.CertConfirmContent;
-import org.bouncycastle.asn1.cmp.CertRepMessage;
-import org.bouncycastle.asn1.cmp.PKIBody;
-import org.bouncycastle.asn1.cmp.PKIMessage;
-import org.bouncycastle.asn1.crmf.CertReqMessages;
-import org.bouncycastle.asn1.crmf.CertReqMsg;
-import org.bouncycastle.asn1.crmf.ProofOfPossession;
-import org.bouncycastle.asn1.crmf.SubsequentMessage;
-import org.bouncycastle.asn1.x500.X500Name;
-import org.bouncycastle.asn1.x509.GeneralName;
-import org.bouncycastle.cert.CertException;
-import org.bouncycastle.cert.X509CertificateHolder;
-import org.bouncycastle.cert.X509v3CertificateBuilder;
-import org.bouncycastle.cert.cmp.CertificateConfirmationContent;
-import org.bouncycastle.cert.cmp.CertificateConfirmationContentBuilder;
-import org.bouncycastle.cert.cmp.CertificateStatus;
-import org.bouncycastle.cert.cmp.GeneralPKIMessage;
-import org.bouncycastle.cert.cmp.ProtectedPKIMessage;
-import org.bouncycastle.cert.cmp.ProtectedPKIMessageBuilder;
-import org.bouncycastle.cert.crmf.CertificateRequestMessage;
-import org.bouncycastle.cert.crmf.CertificateRequestMessageBuilder;
-import org.bouncycastle.cert.crmf.PKMACBuilder;
-import org.bouncycastle.cert.crmf.jcajce.JcaCertificateRequestMessageBuilder;
-import org.bouncycastle.cert.crmf.jcajce.JcePKMACValuesCalculator;
-import org.bouncycastle.cert.jcajce.JcaX509CertificateConverter;
-import org.bouncycastle.cert.jcajce.JcaX509v3CertificateBuilder;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.operator.ContentSigner;
-import org.bouncycastle.operator.ContentVerifierProvider;
-import org.bouncycastle.operator.OperatorCreationException;
-import org.bouncycastle.operator.jcajce.JcaContentSignerBuilder;
-import org.bouncycastle.operator.jcajce.JcaContentVerifierProviderBuilder;
-import org.bouncycastle.operator.jcajce.JcaDigestCalculatorProviderBuilder;
-import org.bouncycastle.util.io.Streams;
-
-public class AllTests
-    extends TestCase
-{
-    private static final byte[] TEST_DATA = "Hello world!".getBytes();
-    private static final String BC = BouncyCastleProvider.PROVIDER_NAME;
-    private static final String TEST_DATA_HOME = "bc.test.data.home";
-
-    /*
-     *
-     *  INFRASTRUCTURE
-     *
-     */
-
-    public AllTests(String name)
-    {
-        super(name);
-    }
-
-    public static void main(String args[])
-    {
-        junit.textui.TestRunner.run(AllTests.class);
-    }
-
-    public static Test suite()
-    {
-        return new TestSuite(AllTests.class);
-    }
-
-    public void setUp()
-    {
-        Security.addProvider(new BouncyCastleProvider());
-    }
-
-    public void tearDown()
-    {
-
-    }
-
-    public void testProtectedMessage()
-        throws Exception
-    {
-        KeyPairGenerator kGen = KeyPairGenerator.getInstance("RSA", BC);
-
-        kGen.initialize(512);
-
-        KeyPair kp = kGen.generateKeyPair();
-        X509CertificateHolder cert = makeV3Certificate(kp, "CN=Test", kp, "CN=Test");
-
-        GeneralName sender = new GeneralName(new X500Name("CN=Sender"));
-        GeneralName recipient = new GeneralName(new X500Name("CN=Recip"));
-
-        ContentSigner signer = new JcaContentSignerBuilder("MD5WithRSAEncryption").setProvider(BC).build(kp.getPrivate());
-        ProtectedPKIMessage message = new ProtectedPKIMessageBuilder(sender, recipient)
-                                                  .setBody(new PKIBody(PKIBody.TYPE_INIT_REP, CertRepMessage.getInstance(new DERSequence(new DERSequence()))))
-                                                  .addCMPCertificate(cert)
-                                                  .build(signer);
-
-        X509Certificate jcaCert = new JcaX509CertificateConverter().setProvider(BC).getCertificate(message.getCertificates()[0]);
-        ContentVerifierProvider verifierProvider = new JcaContentVerifierProviderBuilder().setProvider(BC).build(jcaCert.getPublicKey());
-
-        assertTrue(message.verify(verifierProvider));
-
-        assertEquals(sender, message.getHeader().getSender());
-        assertEquals(recipient, message.getHeader().getRecipient());
-    }
-
-    public void testMacProtectedMessage()
-        throws Exception
-    {
-        KeyPairGenerator kGen = KeyPairGenerator.getInstance("RSA", BC);
-
-        kGen.initialize(512);
-
-        KeyPair kp = kGen.generateKeyPair();
-        X509CertificateHolder cert = makeV3Certificate(kp, "CN=Test", kp, "CN=Test");
-
-        GeneralName sender = new GeneralName(new X500Name("CN=Sender"));
-        GeneralName recipient = new GeneralName(new X500Name("CN=Recip"));
-
-        ProtectedPKIMessage message = new ProtectedPKIMessageBuilder(sender, recipient)
-                                                  .setBody(new PKIBody(PKIBody.TYPE_INIT_REP, CertRepMessage.getInstance(new DERSequence(new DERSequence()))))
-                                                  .addCMPCertificate(cert)
-                                                  .build(new PKMACBuilder(new JcePKMACValuesCalculator().setProvider(BC)).build("secret".toCharArray()));
-
-        PKMACBuilder pkMacBuilder = new PKMACBuilder(new JcePKMACValuesCalculator().setProvider(BC));
-
-        assertTrue(message.verify(pkMacBuilder, "secret".toCharArray()));
-
-        assertEquals(sender, message.getHeader().getSender());
-        assertEquals(recipient, message.getHeader().getRecipient());
-    }
-
-    public void testConfirmationMessage()
-        throws Exception
-    {
-        KeyPairGenerator kGen = KeyPairGenerator.getInstance("RSA", BC);
-
-        kGen.initialize(512);
-
-        KeyPair kp = kGen.generateKeyPair();
-        X509CertificateHolder cert = makeV3Certificate(kp, "CN=Test", kp, "CN=Test");
-
-        GeneralName sender = new GeneralName(new X500Name("CN=Sender"));
-        GeneralName recipient = new GeneralName(new X500Name("CN=Recip"));
-
-        CertificateConfirmationContent content = new CertificateConfirmationContentBuilder()
-                             .addAcceptedCertificate(cert, BigInteger.valueOf(1))
-                             .build(new JcaDigestCalculatorProviderBuilder().build());
-
-        ContentSigner signer = new JcaContentSignerBuilder("MD5WithRSAEncryption").setProvider(BC).build(kp.getPrivate());
-        ProtectedPKIMessage message = new ProtectedPKIMessageBuilder(sender, recipient)
-                                                  .setBody(new PKIBody(PKIBody.TYPE_CERT_CONFIRM, content.toASN1Structure()))
-                                                  .addCMPCertificate(cert)
-                                                  .build(signer);
-
-        X509Certificate jcaCert = new JcaX509CertificateConverter().setProvider(BC).getCertificate(message.getCertificates()[0]);
-        ContentVerifierProvider verifierProvider = new JcaContentVerifierProviderBuilder().setProvider(BC).build(jcaCert.getPublicKey());
-
-        assertTrue(message.verify(verifierProvider));
-
-        assertEquals(sender, message.getHeader().getSender());
-        assertEquals(recipient, message.getHeader().getRecipient());
-
-        content = new CertificateConfirmationContent(CertConfirmContent.getInstance(message.getBody().getContent()));
-
-        CertificateStatus[] statusList = content.getStatusMessages();
-
-        assertEquals(1, statusList.length);
-        assertTrue(statusList[0].isVerified(cert, new JcaDigestCalculatorProviderBuilder().setProvider(BC).build()));
-    }
-
-    public void testSampleCr()
-        throws Exception
-    {
-        PKIMessage msg = loadMessage("sample_cr.der");
-        ProtectedPKIMessage procMsg = new ProtectedPKIMessage(new GeneralPKIMessage(msg));
-
-        assertTrue(procMsg.verify(new PKMACBuilder(new JcePKMACValuesCalculator().setProvider(BC)), "TopSecret1234".toCharArray()));
-    }
-
-    public void testSubsequentMessage()
-        throws Exception
-    {
-        KeyPairGenerator kGen = KeyPairGenerator.getInstance("RSA", BC);
-
-        kGen.initialize(512);
-
-        KeyPair kp = kGen.generateKeyPair();
-        X509CertificateHolder cert = makeV3Certificate(kp, "CN=Test", kp, "CN=Test");
-
-        ContentSigner signer = new JcaContentSignerBuilder("SHA256withRSA").setProvider(BC).build(
-                    kp.getPrivate());
-
-        GeneralName user = new GeneralName(new X500Name("CN=Test"));
-
-        CertificateRequestMessageBuilder builder = new JcaCertificateRequestMessageBuilder(
-                    BigInteger.valueOf(1)).setPublicKey(kp.getPublic()).setProofOfPossessionSubsequentMessage(
-                    SubsequentMessage.encrCert);
-
-                ProtectedPKIMessage certRequestMsg = new ProtectedPKIMessageBuilder(user,
-                    user).setTransactionID(new byte[] { 1, 2, 3, 4, 5 }).setBody(
-                    new PKIBody(PKIBody.TYPE_KEY_UPDATE_REQ, new CertReqMessages(builder.build().toASN1Structure()))).addCMPCertificate(
-                    cert).build(signer);
-
-        ProtectedPKIMessage msg = new ProtectedPKIMessage(new GeneralPKIMessage(certRequestMsg.toASN1Structure().getEncoded()));
-
-        CertReqMessages reqMsgs = CertReqMessages.getInstance(msg.getBody().getContent());
-
-        CertReqMsg reqMsg = reqMsgs.toCertReqMsgArray()[0];
-
-        assertEquals(ProofOfPossession.TYPE_KEY_ENCIPHERMENT, reqMsg.getPopo().getType());
-    }
-
-    public void testNotBeforeNotAfter()
-        throws Exception
-    {
-        KeyPairGenerator kGen = KeyPairGenerator.getInstance("RSA", BC);
-
-        kGen.initialize(512);
-
-        KeyPair kp = kGen.generateKeyPair();
-
-        doNotBeforeNotAfterTest(kp, new Date(0L), new Date(60000L));
-        doNotBeforeNotAfterTest(kp, null, new Date(60000L));
-        doNotBeforeNotAfterTest(kp, new Date(0L), null);
-    }
-
-    private void doNotBeforeNotAfterTest(KeyPair kp, Date notBefore, Date notAfter)
-        throws Exception
-    {
-        CertificateRequestMessageBuilder builder = new JcaCertificateRequestMessageBuilder(
-                    BigInteger.valueOf(1)).setPublicKey(kp.getPublic()).setProofOfPossessionSubsequentMessage(
-                    SubsequentMessage.encrCert);
-
-        builder.setValidity(notBefore, notAfter);
-
-        CertificateRequestMessage message = builder.build();
-
-        if (notBefore != null)
-        {
-            assertEquals(notBefore.getTime(), message.getCertTemplate().getValidity().getNotBefore().getDate().getTime());
-        }
-        else
-        {
-            assertNull(message.getCertTemplate().getValidity().getNotBefore());
-        }
-
-        if (notAfter != null)
-        {
-            assertEquals(notAfter.getTime(), message.getCertTemplate().getValidity().getNotAfter().getDate().getTime());
-        }
-        else
-        {
-            assertNull(message.getCertTemplate().getValidity().getNotAfter());
-        }
-    }
-
-    private static X509CertificateHolder makeV3Certificate(KeyPair subKP, String _subDN, KeyPair issKP, String _issDN)
-        throws GeneralSecurityException, IOException, OperatorCreationException, CertException
-    {
-
-        PublicKey subPub  = subKP.getPublic();
-        PrivateKey issPriv = issKP.getPrivate();
-        PublicKey  issPub  = issKP.getPublic();
-
-        X509v3CertificateBuilder v1CertGen = new JcaX509v3CertificateBuilder(
-            new X500Name(_issDN),
-            BigInteger.valueOf(System.currentTimeMillis()),
-            new Date(System.currentTimeMillis()),
-            new Date(System.currentTimeMillis() + (1000L * 60 * 60 * 24 * 100)),
-            new X500Name(_subDN),
-            subPub);
-
-        ContentSigner signer = new JcaContentSignerBuilder("SHA1WithRSA").setProvider(BC).build(issPriv);
-
-        X509CertificateHolder certHolder = v1CertGen.build(signer);
-
-        ContentVerifierProvider verifier = new JcaContentVerifierProviderBuilder().setProvider(BC).build(issPub);
-
-        assertTrue(certHolder.isSignatureValid(verifier));
-
-        return certHolder;
-    }
-
-    private static PKIMessage loadMessage(String name)
-    {
-        String dataHome = System.getProperty(TEST_DATA_HOME);
-
-        if (dataHome == null)
-        {
-            throw new IllegalStateException(TEST_DATA_HOME + " property not set");
-        }
-
-        try
-        {
-            return PKIMessage.getInstance(ASN1Primitive.fromByteArray(Streams.readAll(new FileInputStream(dataHome + "/cmp/" + name))));
-        }
-        catch (IOException e)
-        {
-            throw new RuntimeException(e.toString());
-        }
-    }
-}
\ No newline at end of file
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/crmf/AuthenticatorControl.java b/bcpkix/src/main/java/org/bouncycastle/cert/crmf/AuthenticatorControl.java
deleted file mode 100644
index 3cb7f47..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/crmf/AuthenticatorControl.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package org.bouncycastle.cert.crmf;
-
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.DERUTF8String;
-import org.bouncycastle.asn1.crmf.CRMFObjectIdentifiers;
-
-/**
- * Carrier for an authenticator control.
- */
-public class AuthenticatorControl
-    implements Control
-{
-    private static final ASN1ObjectIdentifier type = CRMFObjectIdentifiers.id_regCtrl_authenticator;
-
-    private final DERUTF8String token;
-
-    /**
-     * Basic constructor - build from a UTF-8 string representing the token.
-     *
-     * @param token UTF-8 string representing the token.
-     */
-    public AuthenticatorControl(DERUTF8String token)
-    {
-        this.token = token;
-    }
-
-    /**
-     * Basic constructor - build from a string representing the token.
-     *
-     * @param token string representing the token.
-     */
-    public AuthenticatorControl(String token)
-    {
-        this.token = new DERUTF8String(token);
-    }
-
-    /**
-     * Return the type of this control.
-     *
-     * @return CRMFObjectIdentifiers.id_regCtrl_authenticator
-     */
-    public ASN1ObjectIdentifier getType()
-    {
-        return type;
-    }
-
-    /**
-     * Return the token associated with this control (a UTF8String).
-     *
-     * @return a UTF8String.
-     */
-    public ASN1Encodable getValue()
-    {
-        return token;
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/crmf/CRMFException.java b/bcpkix/src/main/java/org/bouncycastle/cert/crmf/CRMFException.java
deleted file mode 100644
index 8ea6ecd..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/crmf/CRMFException.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package org.bouncycastle.cert.crmf;
-
-public class CRMFException
-    extends Exception
-{
-    private Throwable cause;
-
-    public CRMFException(String msg, Throwable cause)
-    {
-        super(msg);
-
-        this.cause = cause;
-    }
-
-    public Throwable getCause()
-    {
-        return cause;
-    }
-}
\ No newline at end of file
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/crmf/CRMFRuntimeException.java b/bcpkix/src/main/java/org/bouncycastle/cert/crmf/CRMFRuntimeException.java
deleted file mode 100644
index 89d6a53..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/crmf/CRMFRuntimeException.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package org.bouncycastle.cert.crmf;
-
-public class CRMFRuntimeException
-    extends RuntimeException
-{
-    private Throwable cause;
-
-    public CRMFRuntimeException(String msg, Throwable cause)
-    {
-        super(msg);
-
-        this.cause = cause;
-    }
-
-    public Throwable getCause()
-    {
-        return cause;
-    }
-}
\ No newline at end of file
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/crmf/CRMFUtil.java b/bcpkix/src/main/java/org/bouncycastle/cert/crmf/CRMFUtil.java
deleted file mode 100644
index f314a95..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/crmf/CRMFUtil.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package org.bouncycastle.cert.crmf;
-
-import java.io.IOException;
-import java.io.OutputStream;
-
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.DEROutputStream;
-import org.bouncycastle.asn1.x509.ExtensionsGenerator;
-import org.bouncycastle.cert.CertIOException;
-
-class CRMFUtil
-{
-    static void derEncodeToStream(ASN1Encodable obj, OutputStream stream)
-    {
-        DEROutputStream dOut = new DEROutputStream(stream);
-
-        try
-        {
-            dOut.writeObject(obj);
-
-            dOut.close();
-        }
-        catch (IOException e)
-        {
-            throw new CRMFRuntimeException("unable to DER encode object: " + e.getMessage(), e);
-        }
-    }
-
-    static void addExtension(ExtensionsGenerator extGenerator, ASN1ObjectIdentifier oid, boolean isCritical, ASN1Encodable value)
-        throws CertIOException
-    {
-        try
-        {
-            extGenerator.addExtension(oid, isCritical, value);
-        }
-        catch (IOException e)
-        {
-            throw new CertIOException("cannot encode extension: " + e.getMessage(), e);
-        }
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/crmf/CertificateRequestMessage.java b/bcpkix/src/main/java/org/bouncycastle/cert/crmf/CertificateRequestMessage.java
deleted file mode 100644
index b07b1d6..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/crmf/CertificateRequestMessage.java
+++ /dev/null
@@ -1,311 +0,0 @@
-package org.bouncycastle.cert.crmf;
-
-import java.io.IOException;
-
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.DERUTF8String;
-import org.bouncycastle.asn1.crmf.AttributeTypeAndValue;
-import org.bouncycastle.asn1.crmf.CRMFObjectIdentifiers;
-import org.bouncycastle.asn1.crmf.CertReqMsg;
-import org.bouncycastle.asn1.crmf.CertTemplate;
-import org.bouncycastle.asn1.crmf.Controls;
-import org.bouncycastle.asn1.crmf.PKIArchiveOptions;
-import org.bouncycastle.asn1.crmf.PKMACValue;
-import org.bouncycastle.asn1.crmf.POPOSigningKey;
-import org.bouncycastle.asn1.crmf.ProofOfPossession;
-import org.bouncycastle.cert.CertIOException;
-import org.bouncycastle.operator.ContentVerifier;
-import org.bouncycastle.operator.ContentVerifierProvider;
-import org.bouncycastle.operator.OperatorCreationException;
-import org.bouncycastle.util.Encodable;
-
-/**
- * Carrier for a CRMF CertReqMsg.
- */
-public class CertificateRequestMessage
-    implements Encodable
-{
-    public static final int popRaVerified = ProofOfPossession.TYPE_RA_VERIFIED;
-    public static final int popSigningKey = ProofOfPossession.TYPE_SIGNING_KEY;
-    public static final int popKeyEncipherment = ProofOfPossession.TYPE_KEY_ENCIPHERMENT;
-    public static final int popKeyAgreement = ProofOfPossession.TYPE_KEY_AGREEMENT;
-
-    private final CertReqMsg certReqMsg;
-    private final Controls controls;
-
-    private static CertReqMsg parseBytes(byte[] encoding)
-        throws IOException
-    {
-        try
-        {
-            return CertReqMsg.getInstance(ASN1Primitive.fromByteArray(encoding));
-        }
-        catch (ClassCastException e)
-        {
-            throw new CertIOException("malformed data: " + e.getMessage(), e);
-        }
-        catch (IllegalArgumentException e)
-        {
-            throw new CertIOException("malformed data: " + e.getMessage(), e);
-        }
-    }
-
-    /**
-     * Create a CertificateRequestMessage from the passed in bytes.
-     *
-     * @param certReqMsg BER/DER encoding of the CertReqMsg structure.
-     * @throws IOException in the event of corrupted data, or an incorrect structure.
-     */
-    public CertificateRequestMessage(byte[] certReqMsg)
-        throws IOException
-    {
-        this(parseBytes(certReqMsg));
-    }
-
-    public CertificateRequestMessage(CertReqMsg certReqMsg)
-    {
-        this.certReqMsg = certReqMsg;
-        this.controls = certReqMsg.getCertReq().getControls();
-    }
-
-    /**
-     * Return the underlying ASN.1 object defining this CertificateRequestMessage object.
-     *
-     * @return a CertReqMsg.
-     */
-    public CertReqMsg toASN1Structure()
-    {
-        return certReqMsg;
-    }
-
-    /**
-     * Return the certificate template contained in this message.
-     *
-     * @return  a CertTemplate structure.
-     */
-    public CertTemplate getCertTemplate()
-    {
-        return this.certReqMsg.getCertReq().getCertTemplate();
-    }
-
-    /**
-     * Return whether or not this request has control values associated with it.
-     *
-     * @return true if there are control values present, false otherwise.
-     */
-    public boolean hasControls()
-    {
-        return controls != null;
-    }
-
-    /**
-     * Return whether or not this request has a specific type of control value.
-     *
-     * @param type the type OID for the control value we are checking for.
-     * @return true if a control value of type is present, false otherwise.
-     */
-    public boolean hasControl(ASN1ObjectIdentifier type)
-    {
-        return findControl(type) != null;
-    }
-
-    /**
-     * Return a control value of the specified type.
-     *
-     * @param type the type OID for the control value we are checking for.
-     * @return the control value if present, null otherwise.
-     */
-    public Control getControl(ASN1ObjectIdentifier type)
-    {
-        AttributeTypeAndValue found = findControl(type);
-
-        if (found != null)
-        {
-            if (found.getType().equals(CRMFObjectIdentifiers.id_regCtrl_pkiArchiveOptions))
-            {
-                return new PKIArchiveControl(PKIArchiveOptions.getInstance(found.getValue()));
-            }
-            if (found.getType().equals(CRMFObjectIdentifiers.id_regCtrl_regToken))
-            {
-                return new RegTokenControl(DERUTF8String.getInstance(found.getValue()));
-            }
-            if (found.getType().equals(CRMFObjectIdentifiers.id_regCtrl_authenticator))
-            {
-                return new AuthenticatorControl(DERUTF8String.getInstance(found.getValue()));
-            }
-        }
-
-        return null;
-    }
-
-    private AttributeTypeAndValue findControl(ASN1ObjectIdentifier type)
-    {
-        if (controls == null)
-        {
-            return null;
-        }
-
-        AttributeTypeAndValue[] tAndVs = controls.toAttributeTypeAndValueArray();
-        AttributeTypeAndValue found = null;
-
-        for (int i = 0; i != tAndVs.length; i++)
-        {
-            if (tAndVs[i].getType().equals(type))
-            {
-                found = tAndVs[i];
-                break;
-            }
-        }
-
-        return found;
-    }
-
-    /**
-     * Return whether or not this request message has a proof-of-possession field in it.
-     *
-     * @return true if proof-of-possession is present, false otherwise.
-     */
-    public boolean hasProofOfPossession()
-    {
-        return this.certReqMsg.getPopo() != null;
-    }
-
-    /**
-     * Return the type of the proof-of-possession this request message provides.
-     *
-     * @return one of: popRaVerified, popSigningKey, popKeyEncipherment, popKeyAgreement
-     */
-    public int getProofOfPossessionType()
-    {
-        return this.certReqMsg.getPopo().getType();
-    }
-
-    /**
-     * Return whether or not the proof-of-possession (POP) is of the type popSigningKey and
-     * it has a public key MAC associated with it.
-     *
-     * @return true if POP is popSigningKey and a PKMAC is present, false otherwise.
-     */
-    public boolean hasSigningKeyProofOfPossessionWithPKMAC()
-    {
-        ProofOfPossession pop = certReqMsg.getPopo();
-
-        if (pop.getType() == popSigningKey)
-        {
-            POPOSigningKey popoSign = POPOSigningKey.getInstance(pop.getObject());
-
-            return popoSign.getPoposkInput().getPublicKeyMAC() != null;
-        }
-
-        return false;
-    }
-
-    /**
-     * Return whether or not a signing key proof-of-possession (POP) is valid.
-     *
-     * @param verifierProvider a provider that can produce content verifiers for the signature contained in this POP.
-     * @return true if the POP is valid, false otherwise.
-     * @throws CRMFException if there is a problem in verification or content verifier creation.
-     * @throws IllegalStateException if POP not appropriate.
-     */
-    public boolean isValidSigningKeyPOP(ContentVerifierProvider verifierProvider)
-        throws CRMFException, IllegalStateException
-    {
-        ProofOfPossession pop = certReqMsg.getPopo();
-
-        if (pop.getType() == popSigningKey)
-        {
-            POPOSigningKey popoSign = POPOSigningKey.getInstance(pop.getObject());
-
-            if (popoSign.getPoposkInput() != null && popoSign.getPoposkInput().getPublicKeyMAC() != null)
-            {
-                throw new IllegalStateException("verification requires password check");
-            }
-
-            return verifySignature(verifierProvider, popoSign);
-        }
-        else
-        {
-            throw new IllegalStateException("not Signing Key type of proof of possession");
-        }
-    }
-
-    /**
-     * Return whether or not a signing key proof-of-possession (POP), with an associated PKMAC, is valid.
-     *
-     * @param verifierProvider a provider that can produce content verifiers for the signature contained in this POP.
-     * @param macBuilder a suitable PKMACBuilder to create the MAC verifier.
-     * @param password the password used to key the MAC calculation.
-     * @return true if the POP is valid, false otherwise.
-     * @throws CRMFException if there is a problem in verification or content verifier creation.
-     * @throws IllegalStateException if POP not appropriate.
-     */
-    public boolean isValidSigningKeyPOP(ContentVerifierProvider verifierProvider, PKMACBuilder macBuilder, char[] password)
-        throws CRMFException, IllegalStateException
-    {
-        ProofOfPossession pop = certReqMsg.getPopo();
-
-        if (pop.getType() == popSigningKey)
-        {
-            POPOSigningKey popoSign = POPOSigningKey.getInstance(pop.getObject());
-
-            if (popoSign.getPoposkInput() == null || popoSign.getPoposkInput().getSender() != null)
-            {
-                throw new IllegalStateException("no PKMAC present in proof of possession");
-            }
-
-            PKMACValue pkMAC = popoSign.getPoposkInput().getPublicKeyMAC();
-            PKMACValueVerifier macVerifier = new PKMACValueVerifier(macBuilder);
-
-            if (macVerifier.isValid(pkMAC, password, this.getCertTemplate().getPublicKey()))
-            {
-                return verifySignature(verifierProvider, popoSign);
-            }
-
-            return false;
-        }
-        else
-        {
-            throw new IllegalStateException("not Signing Key type of proof of possession");
-        }
-    }
-
-    private boolean verifySignature(ContentVerifierProvider verifierProvider, POPOSigningKey popoSign)
-        throws CRMFException
-    {
-        ContentVerifier verifier;
-
-        try
-        {
-            verifier = verifierProvider.get(popoSign.getAlgorithmIdentifier());
-        }
-        catch (OperatorCreationException e)
-        {
-            throw new CRMFException("unable to create verifier: " + e.getMessage(), e);
-        }
-
-        if (popoSign.getPoposkInput() != null)
-        {
-            CRMFUtil.derEncodeToStream(popoSign.getPoposkInput(), verifier.getOutputStream());
-        }
-        else
-        {
-            CRMFUtil.derEncodeToStream(certReqMsg.getCertReq(), verifier.getOutputStream());
-        }
-
-        return verifier.verify(popoSign.getSignature().getBytes());
-    }
-
-    /**
-     * Return the ASN.1 encoding of the certReqMsg we wrap.
-     *
-     * @return a byte array containing the binary encoding of the certReqMsg.
-     * @throws IOException if there is an exception creating the encoding.
-     */
-    public byte[] getEncoded()
-        throws IOException
-    {
-        return certReqMsg.getEncoded();
-    }
-}
\ No newline at end of file
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/crmf/CertificateRequestMessageBuilder.java b/bcpkix/src/main/java/org/bouncycastle/cert/crmf/CertificateRequestMessageBuilder.java
deleted file mode 100644
index aa48235..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/crmf/CertificateRequestMessageBuilder.java
+++ /dev/null
@@ -1,279 +0,0 @@
-package org.bouncycastle.cert.crmf;
-
-import java.math.BigInteger;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.List;
-
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1Null;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.DERNull;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.crmf.AttributeTypeAndValue;
-import org.bouncycastle.asn1.crmf.CertReqMsg;
-import org.bouncycastle.asn1.crmf.CertRequest;
-import org.bouncycastle.asn1.crmf.CertTemplate;
-import org.bouncycastle.asn1.crmf.CertTemplateBuilder;
-import org.bouncycastle.asn1.crmf.OptionalValidity;
-import org.bouncycastle.asn1.crmf.POPOPrivKey;
-import org.bouncycastle.asn1.crmf.ProofOfPossession;
-import org.bouncycastle.asn1.crmf.SubsequentMessage;
-import org.bouncycastle.asn1.x500.X500Name;
-import org.bouncycastle.asn1.x509.ExtensionsGenerator;
-import org.bouncycastle.asn1.x509.GeneralName;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.bouncycastle.asn1.x509.Time;
-import org.bouncycastle.cert.CertIOException;
-import org.bouncycastle.operator.ContentSigner;
-
-public class CertificateRequestMessageBuilder
-{
-    private final BigInteger certReqId;
-
-    private ExtensionsGenerator extGenerator;
-    private CertTemplateBuilder templateBuilder;
-    private List controls;
-    private ContentSigner popSigner;
-    private PKMACBuilder pkmacBuilder;
-    private char[] password;
-    private GeneralName sender;
-    private POPOPrivKey popoPrivKey;
-    private ASN1Null popRaVerified;
-
-    public CertificateRequestMessageBuilder(BigInteger certReqId)
-    {
-        this.certReqId = certReqId;
-
-        this.extGenerator = new ExtensionsGenerator();
-        this.templateBuilder = new CertTemplateBuilder();
-        this.controls = new ArrayList();
-    }
-
-    public CertificateRequestMessageBuilder setPublicKey(SubjectPublicKeyInfo publicKey)
-    {
-        if (publicKey != null)
-        {
-            templateBuilder.setPublicKey(publicKey);
-        }
-
-        return this;
-    }
-
-    public CertificateRequestMessageBuilder setIssuer(X500Name issuer)
-    {
-        if (issuer != null)
-        {
-            templateBuilder.setIssuer(issuer);
-        }
-
-        return this;
-    }
-
-    public CertificateRequestMessageBuilder setSubject(X500Name subject)
-    {
-        if (subject != null)
-        {
-            templateBuilder.setSubject(subject);
-        }
-
-        return this;
-    }
-
-    public CertificateRequestMessageBuilder setSerialNumber(BigInteger serialNumber)
-    {
-        if (serialNumber != null)
-        {
-            templateBuilder.setSerialNumber(new ASN1Integer(serialNumber));
-        }
-
-        return this;
-    }
-
-    /**
-     * Request a validity period for the certificate. Either, but not both, of the date parameters may be null.
-     *
-     * @param notBeforeDate not before date for certificate requested.
-     * @param notAfterDate not after date for the certificate requested.
-     *
-     * @return the current builder.
-     */
-    public CertificateRequestMessageBuilder setValidity(Date notBeforeDate, Date notAfterDate)
-    {
-        templateBuilder.setValidity(new OptionalValidity(createTime(notBeforeDate), createTime(notAfterDate)));
-
-        return this;
-    }
-
-    private Time createTime(Date date)
-    {
-        if (date != null)
-        {
-            return new Time(date);
-        }
-
-        return null;
-    }
-
-    public CertificateRequestMessageBuilder addExtension(
-        ASN1ObjectIdentifier oid,
-        boolean              critical,
-        ASN1Encodable        value)
-        throws CertIOException
-    {
-        CRMFUtil.addExtension(extGenerator, oid, critical, value);
-
-        return this;
-    }
-
-    public CertificateRequestMessageBuilder addExtension(
-        ASN1ObjectIdentifier oid,
-        boolean              critical,
-        byte[]               value)
-    {
-        extGenerator.addExtension(oid, critical, value);
-
-        return this;
-    }
-
-    public CertificateRequestMessageBuilder addControl(Control control)
-    {
-        controls.add(control);
-
-        return this;
-    }
-
-    public CertificateRequestMessageBuilder setProofOfPossessionSigningKeySigner(ContentSigner popSigner)
-    {
-        if (popoPrivKey != null || popRaVerified != null)
-        {
-            throw new IllegalStateException("only one proof of possession allowed");
-        }
-
-        this.popSigner = popSigner;
-
-        return this;
-    }
-
-    public CertificateRequestMessageBuilder setProofOfPossessionSubsequentMessage(SubsequentMessage msg)
-    {
-        if (popSigner != null || popRaVerified != null)
-        {
-            throw new IllegalStateException("only one proof of possession allowed");
-        }
-
-        this.popoPrivKey = new POPOPrivKey(msg);
-
-        return this;
-    }
-
-    public CertificateRequestMessageBuilder setProofOfPossessionRaVerified()
-    {
-        if (popSigner != null || popoPrivKey != null)
-        {
-            throw new IllegalStateException("only one proof of possession allowed");
-        }
-
-        this.popRaVerified = DERNull.INSTANCE;
-
-        return this;
-    }
-
-    public CertificateRequestMessageBuilder setAuthInfoPKMAC(PKMACBuilder pkmacBuilder, char[] password)
-    {
-        this.pkmacBuilder = pkmacBuilder;
-        this.password = password;
-
-        return this;
-    }
-
-    public CertificateRequestMessageBuilder setAuthInfoSender(X500Name sender)
-    {
-        return setAuthInfoSender(new GeneralName(sender));
-    }
-
-    public CertificateRequestMessageBuilder setAuthInfoSender(GeneralName sender)
-    {
-        this.sender = sender;
-
-        return this;
-    }
-
-    public CertificateRequestMessage build()
-        throws CRMFException
-    {
-        ASN1EncodableVector v = new ASN1EncodableVector();
-
-        v.add(new ASN1Integer(certReqId));
-
-        if (!extGenerator.isEmpty())
-        {
-            templateBuilder.setExtensions(extGenerator.generate());
-        }
-
-        v.add(templateBuilder.build());
-
-        if (!controls.isEmpty())
-        {
-            ASN1EncodableVector controlV = new ASN1EncodableVector();
-
-            for (Iterator it = controls.iterator(); it.hasNext();)
-            {
-                Control control = (Control)it.next();
-
-                controlV.add(new AttributeTypeAndValue(control.getType(), control.getValue()));
-            }
-
-            v.add(new DERSequence(controlV));
-        }
-
-        CertRequest request = CertRequest.getInstance(new DERSequence(v));
-
-        v = new ASN1EncodableVector();
-
-        v.add(request);
-
-        if (popSigner != null)
-        {
-            CertTemplate template = request.getCertTemplate();
-
-            if (template.getSubject() == null || template.getPublicKey() == null)
-            {
-                SubjectPublicKeyInfo pubKeyInfo = request.getCertTemplate().getPublicKey();
-                ProofOfPossessionSigningKeyBuilder builder = new ProofOfPossessionSigningKeyBuilder(pubKeyInfo);
-
-                if (sender != null)
-                {
-                    builder.setSender(sender);
-                }
-                else
-                {
-                    PKMACValueGenerator pkmacGenerator = new PKMACValueGenerator(pkmacBuilder);
-
-                    builder.setPublicKeyMac(pkmacGenerator, password);
-                }
-
-                v.add(new ProofOfPossession(builder.build(popSigner)));
-            }
-            else
-            {
-                ProofOfPossessionSigningKeyBuilder builder = new ProofOfPossessionSigningKeyBuilder(request);
-
-                v.add(new ProofOfPossession(builder.build(popSigner)));
-            }
-        }
-        else if (popoPrivKey != null)
-        {
-            v.add(new ProofOfPossession(ProofOfPossession.TYPE_KEY_ENCIPHERMENT, popoPrivKey));
-        }
-        else if (popRaVerified != null)
-        {
-            v.add(new ProofOfPossession());
-        }
-
-        return new CertificateRequestMessage(CertReqMsg.getInstance(new DERSequence(v)));
-    }
-}
\ No newline at end of file
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/crmf/Control.java b/bcpkix/src/main/java/org/bouncycastle/cert/crmf/Control.java
deleted file mode 100644
index f86f8a0..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/crmf/Control.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.bouncycastle.cert.crmf;
-
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-
-/**
- * Generic interface for a CertificateRequestMessage control value.
- */
-public interface Control
-{
-    /**
-     * Return the type of this control.
-     *
-     * @return an ASN1ObjectIdentifier representing the type.
-     */
-    ASN1ObjectIdentifier getType();
-
-    /**
-     * Return the value contained in this control object.
-     *
-     * @return the value of the control.
-     */
-    ASN1Encodable getValue();
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/crmf/EncryptedValueBuilder.java b/bcpkix/src/main/java/org/bouncycastle/cert/crmf/EncryptedValueBuilder.java
deleted file mode 100644
index 55187b5..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/crmf/EncryptedValueBuilder.java
+++ /dev/null
@@ -1,133 +0,0 @@
-package org.bouncycastle.cert.crmf;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.DERBitString;
-import org.bouncycastle.asn1.crmf.EncryptedValue;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.cert.X509CertificateHolder;
-import org.bouncycastle.operator.KeyWrapper;
-import org.bouncycastle.operator.OperatorException;
-import org.bouncycastle.operator.OutputEncryptor;
-import org.bouncycastle.util.Strings;
-
-/**
- * Builder for EncryptedValue structures.
- */
-public class EncryptedValueBuilder
-{
-    private KeyWrapper wrapper;
-    private OutputEncryptor encryptor;
-    private EncryptedValuePadder padder;
-
-    /**
-     * Create a builder that makes EncryptedValue structures.
-     *
-     * @param wrapper a wrapper for key used to encrypt the actual data contained in the EncryptedValue.
-     * @param encryptor  an output encryptor to encrypt the actual data contained in the EncryptedValue. 
-     */
-    public EncryptedValueBuilder(KeyWrapper wrapper, OutputEncryptor encryptor)
-    {
-        this(wrapper, encryptor, null);
-    }
-
-    /**
-     * Create a builder that makes EncryptedValue structures with fixed length blocks padded using the passed in padder.
-     *
-     * @param wrapper a wrapper for key used to encrypt the actual data contained in the EncryptedValue.
-     * @param encryptor  an output encryptor to encrypt the actual data contained in the EncryptedValue.
-     * @param padder a padder to ensure that the EncryptedValue created will always be a constant length.
-     */
-    public EncryptedValueBuilder(KeyWrapper wrapper, OutputEncryptor encryptor, EncryptedValuePadder padder)
-    {
-        this.wrapper = wrapper;
-        this.encryptor = encryptor;
-        this.padder = padder;
-    }
-
-    /**
-     * Build an EncryptedValue structure containing the passed in pass phrase.
-     *
-     * @param revocationPassphrase  a revocation pass phrase.
-     * @return an EncryptedValue containing the encrypted pass phrase.
-     * @throws CRMFException on a failure to encrypt the data, or wrap the symmetric key for this value.
-     */
-    public EncryptedValue build(char[] revocationPassphrase)
-        throws CRMFException
-    {
-        return encryptData(padData(Strings.toUTF8ByteArray(revocationPassphrase)));
-    }
-
-    /**
-     * Build an EncryptedValue structure containing the certificate contained in
-     * the passed in holder.
-     *
-     * @param holder  a holder containing a certificate.
-     * @return an EncryptedValue containing the encrypted certificate.
-     * @throws CRMFException on a failure to encrypt the data, or wrap the symmetric key for this value.
-     */
-    public EncryptedValue build(X509CertificateHolder holder)
-        throws CRMFException
-    {
-        try
-        {
-            return encryptData(padData(holder.getEncoded()));
-        }
-        catch (IOException e)
-        {
-            throw new CRMFException("cannot encode certificate: " + e.getMessage(), e);
-        }
-    }
-
-    private EncryptedValue encryptData(byte[] data)
-       throws CRMFException
-    {
-        ByteArrayOutputStream bOut = new ByteArrayOutputStream();
-
-        OutputStream eOut = encryptor.getOutputStream(bOut);
-
-        try
-        {
-            eOut.write(data);
-
-            eOut.close();
-        }
-        catch (IOException e)
-        {
-            throw new CRMFException("cannot process data: " + e.getMessage(), e);
-        }
-
-        AlgorithmIdentifier intendedAlg = null;
-        AlgorithmIdentifier symmAlg = encryptor.getAlgorithmIdentifier();
-        DERBitString encSymmKey;
-
-        try
-        {
-            wrapper.generateWrappedKey(encryptor.getKey());
-            encSymmKey = new DERBitString(wrapper.generateWrappedKey(encryptor.getKey()));
-        }
-        catch (OperatorException e)
-        {
-            throw new CRMFException("cannot wrap key: " + e.getMessage(), e);
-        }
-
-        AlgorithmIdentifier keyAlg = wrapper.getAlgorithmIdentifier();
-        ASN1OctetString valueHint = null;
-        DERBitString encValue = new DERBitString(bOut.toByteArray());
-
-        return new EncryptedValue(intendedAlg, symmAlg, encSymmKey, keyAlg, valueHint, encValue);
-    }
-
-    private byte[] padData(byte[] data)
-    {
-        if (padder != null)
-        {
-            return padder.getPaddedData(data);
-        }
-
-        return data;
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/crmf/EncryptedValuePadder.java b/bcpkix/src/main/java/org/bouncycastle/cert/crmf/EncryptedValuePadder.java
deleted file mode 100644
index 41ca866..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/crmf/EncryptedValuePadder.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.bouncycastle.cert.crmf;
-
-/**
- * An encrypted value padder is used to make sure that prior to a value been
- * encrypted the data is padded to a standard length.
- */
-public interface EncryptedValuePadder
-{
-    /**
-     * Return a byte array of padded data.
-     *
-     * @param data the data to be padded.
-     * @return a padded byte array containing data.
-     */
-    byte[] getPaddedData(byte[] data);
-
-    /**
-     * Return a byte array of with padding removed.
-     *
-     * @param paddedData the data to be padded.
-     * @return an array containing the original unpadded data.
-     */
-    byte[] getUnpaddedData(byte[] paddedData);
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/crmf/EncryptedValueParser.java b/bcpkix/src/main/java/org/bouncycastle/cert/crmf/EncryptedValueParser.java
deleted file mode 100644
index 6c0aa87..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/crmf/EncryptedValueParser.java
+++ /dev/null
@@ -1,103 +0,0 @@
-package org.bouncycastle.cert.crmf;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.bouncycastle.asn1.crmf.EncryptedValue;
-import org.bouncycastle.asn1.x509.Certificate;
-import org.bouncycastle.cert.X509CertificateHolder;
-import org.bouncycastle.operator.InputDecryptor;
-import org.bouncycastle.util.Strings;
-import org.bouncycastle.util.io.Streams;
-
-/**
- * Parser for EncryptedValue structures.
- */
-public class EncryptedValueParser
-{
-    private EncryptedValue value;
-    private EncryptedValuePadder padder;
-
-    /**
-     * Basic constructor - create a parser to read the passed in value.
-     *
-     * @param value the value to be parsed.
-     */
-    public EncryptedValueParser(EncryptedValue value)
-    {
-        this.value = value;
-    }
-
-    /**
-     * Create a parser to read the passed in value, assuming the padder was
-     * applied to the data prior to encryption.
-     *
-     * @param value  the value to be parsed.
-     * @param padder the padder to be used to remove padding from the decrypted value..
-     */
-    public EncryptedValueParser(EncryptedValue value, EncryptedValuePadder padder)
-    {
-        this.value = value;
-        this.padder = padder;
-    }
-
-    private byte[] decryptValue(ValueDecryptorGenerator decGen)
-        throws CRMFException
-    {
-        if (value.getIntendedAlg() != null)
-        {
-            throw new UnsupportedOperationException();
-        }
-        if (value.getValueHint() != null)
-        {
-            throw new UnsupportedOperationException();
-        }
-
-        InputDecryptor decryptor = decGen.getValueDecryptor(value.getKeyAlg(),
-            value.getSymmAlg(), value.getEncSymmKey().getBytes());
-        InputStream dataIn = decryptor.getInputStream(new ByteArrayInputStream(
-            value.getEncValue().getBytes()));
-        try
-        {
-            byte[] data = Streams.readAll(dataIn);
-
-            if (padder != null)
-            {
-                return padder.getUnpaddedData(data);
-            }
-            
-            return data;
-        }
-        catch (IOException e)
-        {
-            throw new CRMFException("Cannot parse decrypted data: " + e.getMessage(), e);
-        }
-    }
-
-    /**
-     * Read a X.509 certificate.
-     *
-     * @param decGen the decryptor generator to decrypt the encrypted value.
-     * @return an X509CertificateHolder containing the certificate read.
-     * @throws CRMFException if the decrypted data cannot be parsed, or a decryptor cannot be generated.
-     */
-    public X509CertificateHolder readCertificateHolder(ValueDecryptorGenerator decGen)
-        throws CRMFException
-    {
-        return new X509CertificateHolder(Certificate.getInstance(decryptValue(decGen)));
-    }
-
-    /**
-     * Read a pass phrase.
-     *
-     * @param decGen the decryptor generator to decrypt the encrypted value.
-     * @return a pass phrase as recovered from the encrypted value.
-     * @throws CRMFException if the decrypted data cannot be parsed, or a decryptor cannot be generated.
-     */
-    public char[] readPassphrase(ValueDecryptorGenerator decGen)
-        throws CRMFException
-    {
-        return Strings.fromUTF8ByteArray(decryptValue(decGen)).toCharArray();
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/crmf/PKIArchiveControl.java b/bcpkix/src/main/java/org/bouncycastle/cert/crmf/PKIArchiveControl.java
deleted file mode 100644
index 7bc9957..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/crmf/PKIArchiveControl.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package org.bouncycastle.cert.crmf;
-
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.cms.CMSObjectIdentifiers;
-import org.bouncycastle.asn1.cms.ContentInfo;
-import org.bouncycastle.asn1.cms.EnvelopedData;
-import org.bouncycastle.asn1.crmf.CRMFObjectIdentifiers;
-import org.bouncycastle.asn1.crmf.EncryptedKey;
-import org.bouncycastle.asn1.crmf.PKIArchiveOptions;
-import org.bouncycastle.cms.CMSEnvelopedData;
-import org.bouncycastle.cms.CMSException;
-
-/**
- * Carrier for a PKIArchiveOptions structure.
- */
-public class PKIArchiveControl
-    implements Control
-{
-    public static final int encryptedPrivKey = PKIArchiveOptions.encryptedPrivKey;
-    public static final int keyGenParameters = PKIArchiveOptions.keyGenParameters;
-    public static final int archiveRemGenPrivKey = PKIArchiveOptions.archiveRemGenPrivKey;
-
-    private static final ASN1ObjectIdentifier type = CRMFObjectIdentifiers.id_regCtrl_pkiArchiveOptions;
-
-    private final PKIArchiveOptions pkiArchiveOptions;
-
-    /**
-     * Basic constructor - build from an PKIArchiveOptions structure.
-     *
-     * @param pkiArchiveOptions  the ASN.1 structure that will underlie this control.
-     */
-    public PKIArchiveControl(PKIArchiveOptions pkiArchiveOptions)
-    {
-        this.pkiArchiveOptions = pkiArchiveOptions;
-    }
-
-    /**
-     * Return the type of this control.
-     *
-     * @return CRMFObjectIdentifiers.id_regCtrl_pkiArchiveOptions
-     */
-    public ASN1ObjectIdentifier getType()
-    {
-        return type;
-    }
-
-    /**
-     * Return the underlying ASN.1 object.
-     *
-     * @return a PKIArchiveOptions structure.
-     */
-    public ASN1Encodable getValue()
-    {
-        return pkiArchiveOptions;
-    }
-
-    /**
-     * Return the archive control type, one of: encryptedPrivKey,keyGenParameters,or archiveRemGenPrivKey.
-     *
-     * @return the archive control type.
-     */
-    public int getArchiveType()
-    {
-        return pkiArchiveOptions.getType();
-    }
-
-    /**
-     * Return whether this control contains enveloped data.
-     *
-     * @return true if the control contains enveloped data, false otherwise.
-     */
-    public boolean isEnvelopedData()
-    {
-        EncryptedKey encKey = EncryptedKey.getInstance(pkiArchiveOptions.getValue());
-
-        return !encKey.isEncryptedValue();
-    }
-
-    /**
-     * Return the enveloped data structure contained in this control.
-     *
-     * @return a CMSEnvelopedData object.
-     */
-    public CMSEnvelopedData getEnvelopedData()
-        throws CRMFException
-    {
-        try
-        {
-            EncryptedKey encKey = EncryptedKey.getInstance(pkiArchiveOptions.getValue());
-            EnvelopedData data = EnvelopedData.getInstance(encKey.getValue());
-
-            return new CMSEnvelopedData(new ContentInfo(CMSObjectIdentifiers.envelopedData, data));
-        }
-        catch (CMSException e)
-        {
-            throw new CRMFException("CMS parsing error: " + e.getMessage(), e.getCause());
-        }
-        catch (Exception e)
-        {
-            throw new CRMFException("CRMF parsing error: " + e.getMessage(), e);
-        }
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/crmf/PKIArchiveControlBuilder.java b/bcpkix/src/main/java/org/bouncycastle/cert/crmf/PKIArchiveControlBuilder.java
deleted file mode 100644
index 9edf75c..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/crmf/PKIArchiveControlBuilder.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package org.bouncycastle.cert.crmf;
-
-import java.io.IOException;
-
-import org.bouncycastle.asn1.cms.EnvelopedData;
-import org.bouncycastle.asn1.crmf.CRMFObjectIdentifiers;
-import org.bouncycastle.asn1.crmf.EncKeyWithID;
-import org.bouncycastle.asn1.crmf.EncryptedKey;
-import org.bouncycastle.asn1.crmf.PKIArchiveOptions;
-import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
-import org.bouncycastle.asn1.x509.GeneralName;
-import org.bouncycastle.cms.CMSEnvelopedData;
-import org.bouncycastle.cms.CMSEnvelopedDataGenerator;
-import org.bouncycastle.cms.CMSException;
-import org.bouncycastle.cms.CMSProcessableByteArray;
-import org.bouncycastle.cms.RecipientInfoGenerator;
-import org.bouncycastle.operator.OutputEncryptor;
-
-/**
- * Builder for a PKIArchiveControl structure.
- */
-public class PKIArchiveControlBuilder
-{
-    private CMSEnvelopedDataGenerator envGen;
-    private CMSProcessableByteArray keyContent;
-
-    /**
-     * Basic constructor - specify the contents of the PKIArchiveControl structure.
-     *
-     * @param privateKeyInfo the private key to be archived.
-     * @param generalName the general name to be associated with the private key.
-     */
-    public PKIArchiveControlBuilder(PrivateKeyInfo privateKeyInfo, GeneralName generalName)
-    {
-        EncKeyWithID encKeyWithID = new EncKeyWithID(privateKeyInfo, generalName);
-
-        try
-        {
-            this.keyContent = new CMSProcessableByteArray(CRMFObjectIdentifiers.id_ct_encKeyWithID, encKeyWithID.getEncoded());
-        }
-        catch (IOException e)
-        {
-            throw new IllegalStateException("unable to encode key and general name info");
-        }
-
-        this.envGen = new CMSEnvelopedDataGenerator();
-    }
-
-    /**
-     * Add a recipient generator to this control.
-     *
-     * @param recipientGen recipient generator created for a specific recipient.
-     * @return this builder object.
-     */
-    public PKIArchiveControlBuilder addRecipientGenerator(RecipientInfoGenerator recipientGen)
-    {
-        envGen.addRecipientInfoGenerator(recipientGen);
-
-        return this;
-    }
-
-    /**
-     * Build the PKIArchiveControl using the passed in encryptor to encrypt its contents.
-     *
-     * @param contentEncryptor a suitable content encryptor.
-     * @return a PKIArchiveControl object.
-     * @throws CMSException in the event the build fails.
-     */
-    public PKIArchiveControl build(OutputEncryptor contentEncryptor)
-        throws CMSException
-    {
-        CMSEnvelopedData envContent = envGen.generate(keyContent, contentEncryptor);
-
-        EnvelopedData envD = EnvelopedData.getInstance(envContent.toASN1Structure().getContent());
-
-        return new PKIArchiveControl(new PKIArchiveOptions(new EncryptedKey(envD)));
-    }
-}
\ No newline at end of file
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/crmf/PKMACBuilder.java b/bcpkix/src/main/java/org/bouncycastle/cert/crmf/PKMACBuilder.java
deleted file mode 100644
index abbdaed..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/crmf/PKMACBuilder.java
+++ /dev/null
@@ -1,199 +0,0 @@
-package org.bouncycastle.cert.crmf;
-
-import java.io.ByteArrayOutputStream;
-import java.io.OutputStream;
-import java.security.SecureRandom;
-
-import org.bouncycastle.asn1.DERNull;
-import org.bouncycastle.asn1.cmp.CMPObjectIdentifiers;
-import org.bouncycastle.asn1.cmp.PBMParameter;
-import org.bouncycastle.asn1.iana.IANAObjectIdentifiers;
-import org.bouncycastle.asn1.oiw.OIWObjectIdentifiers;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.operator.GenericKey;
-import org.bouncycastle.operator.MacCalculator;
-import org.bouncycastle.operator.RuntimeOperatorException;
-import org.bouncycastle.util.Strings;
-
-public class PKMACBuilder
-{
-    private AlgorithmIdentifier owf;
-    private int iterationCount;
-    private AlgorithmIdentifier mac;
-    private int saltLength = 20;
-    private SecureRandom random;
-    private PKMACValuesCalculator calculator;
-    private PBMParameter parameters;
-    private int maxIterations;
-
-    public PKMACBuilder(PKMACValuesCalculator calculator)
-    {
-        this(new AlgorithmIdentifier(OIWObjectIdentifiers.idSHA1), 1000, new AlgorithmIdentifier(IANAObjectIdentifiers.hmacSHA1, DERNull.INSTANCE), calculator);
-    }
-
-    /**
-     * Create a PKMAC builder enforcing a ceiling on the maximum iteration count.
-     *
-     * @param calculator     supporting calculator
-     * @param maxIterations  max allowable value for iteration count.
-     */
-    public PKMACBuilder(PKMACValuesCalculator calculator, int maxIterations)
-    {
-        this.maxIterations = maxIterations;
-        this.calculator = calculator;
-    }
-
-    private PKMACBuilder(AlgorithmIdentifier hashAlgorithm, int iterationCount, AlgorithmIdentifier macAlgorithm, PKMACValuesCalculator calculator)
-    {
-        this.owf = hashAlgorithm;
-        this.iterationCount = iterationCount;
-        this.mac = macAlgorithm;
-        this.calculator = calculator;
-    }
-
-    /**
-     * Set the salt length in octets.
-     *
-     * @param saltLength length in octets of the salt to be generated.
-     * @return the generator
-     */
-    public PKMACBuilder setSaltLength(int saltLength)
-    {
-        if (saltLength < 8)
-        {
-            throw new IllegalArgumentException("salt length must be at least 8 bytes");
-        }
-
-        this.saltLength = saltLength;
-
-        return this;
-    }
-
-    public PKMACBuilder setIterationCount(int iterationCount)
-    {
-        if (iterationCount < 100)
-        {
-            throw new IllegalArgumentException("iteration count must be at least 100");
-        }
-        checkIterationCountCeiling(iterationCount);
-
-        this.iterationCount = iterationCount;
-
-        return this;
-    }
-
-    public PKMACBuilder setSecureRandom(SecureRandom random)
-    {
-        this.random = random;
-
-        return this;
-    }
-
-    public PKMACBuilder setParameters(PBMParameter parameters)
-    {
-        checkIterationCountCeiling(parameters.getIterationCount().getValue().intValue());
-
-        this.parameters = parameters;
-
-        return this;
-    }
-
-    public MacCalculator build(char[] password)
-        throws CRMFException
-    {
-        if (parameters != null)
-        {
-            return genCalculator(parameters, password);
-        }
-        else
-        {
-            byte[] salt = new byte[saltLength];
-
-            if (random == null)
-            {
-                this.random = new SecureRandom();
-            }
-
-            random.nextBytes(salt);
-
-            return genCalculator(new PBMParameter(salt, owf, iterationCount, mac), password);
-        }
-    }
-
-    private void checkIterationCountCeiling(int iterationCount)
-    {
-        if (maxIterations > 0 && iterationCount > maxIterations)
-        {
-            throw new IllegalArgumentException("iteration count exceeds limit (" + iterationCount + " > " + maxIterations + ")");
-        }
-    }
-
-    private MacCalculator genCalculator(final PBMParameter params, char[] password)
-        throws CRMFException
-    {
-        // From RFC 4211
-        //
-        //   1.  Generate a random salt value S
-        //
-        //   2.  Append the salt to the pw.  K = pw || salt.
-        //
-        //   3.  Hash the value of K.  K = HASH(K)
-        //
-        //   4.  Iter = Iter - 1.  If Iter is greater than zero.  Goto step 3.
-        //
-        //   5.  Compute an HMAC as documented in [HMAC].
-        //
-        //       MAC = HASH( K XOR opad, HASH( K XOR ipad, data) )
-        //
-        //       Where opad and ipad are defined in [HMAC].
-        byte[] pw = Strings.toUTF8ByteArray(password);
-        byte[] salt = params.getSalt().getOctets();
-        byte[] K = new byte[pw.length + salt.length];
-
-        System.arraycopy(pw, 0, K, 0, pw.length);
-        System.arraycopy(salt, 0, K, pw.length, salt.length);
-
-        calculator.setup(params.getOwf(), params.getMac());
-
-        int iter = params.getIterationCount().getValue().intValue();
-        do
-        {
-            K = calculator.calculateDigest(K);
-        }
-        while (--iter > 0);
-
-        final byte[] key = K;
-
-        return new MacCalculator()
-        {
-            ByteArrayOutputStream bOut = new ByteArrayOutputStream();
-
-            public AlgorithmIdentifier getAlgorithmIdentifier()
-            {
-                return new AlgorithmIdentifier(CMPObjectIdentifiers.passwordBasedMac, params);
-            }
-
-            public GenericKey getKey()
-            {
-                return new GenericKey(getAlgorithmIdentifier(), key);
-            }
-
-            public OutputStream getOutputStream()
-            {
-                return bOut;
-            }
-
-            public byte[] getMac()
-            {
-                try
-                {
-                    return calculator.calculateMac(key, bOut.toByteArray());
-                }
-                catch (CRMFException e)
-                {
-                    throw new RuntimeOperatorException("exception calculating mac: " + e.getMessage(), e);
-                }
-            }
-        };
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/crmf/PKMACValueGenerator.java b/bcpkix/src/main/java/org/bouncycastle/cert/crmf/PKMACValueGenerator.java
deleted file mode 100644
index 2457687..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/crmf/PKMACValueGenerator.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package org.bouncycastle.cert.crmf;
-
-import java.io.IOException;
-import java.io.OutputStream;
-
-import org.bouncycastle.asn1.ASN1Encoding;
-import org.bouncycastle.asn1.DERBitString;
-import org.bouncycastle.asn1.crmf.PKMACValue;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.bouncycastle.operator.MacCalculator;
-
-class PKMACValueGenerator
-{
-    private PKMACBuilder builder;
-
-    public PKMACValueGenerator(PKMACBuilder builder)
-    {
-        this.builder = builder;
-    }
-
-    public PKMACValue generate(char[] password, SubjectPublicKeyInfo keyInfo)
-        throws CRMFException
-    {
-        MacCalculator calculator = builder.build(password);
-
-        OutputStream macOut = calculator.getOutputStream();
-
-        try
-        {
-            macOut.write(keyInfo.getEncoded(ASN1Encoding.DER));
-
-            macOut.close();
-        }
-        catch (IOException e)
-        {
-            throw new CRMFException("exception encoding mac input: " + e.getMessage(), e);
-        }
-
-        return new PKMACValue(calculator.getAlgorithmIdentifier(), new DERBitString(calculator.getMac()));
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/crmf/PKMACValueVerifier.java b/bcpkix/src/main/java/org/bouncycastle/cert/crmf/PKMACValueVerifier.java
deleted file mode 100644
index 1d8c369..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/crmf/PKMACValueVerifier.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package org.bouncycastle.cert.crmf;
-
-import java.io.IOException;
-import java.io.OutputStream;
-
-import org.bouncycastle.asn1.ASN1Encoding;
-import org.bouncycastle.asn1.cmp.PBMParameter;
-import org.bouncycastle.asn1.crmf.PKMACValue;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.bouncycastle.operator.MacCalculator;
-import org.bouncycastle.util.Arrays;
-
-class PKMACValueVerifier
-{
-    private final PKMACBuilder builder;
-
-    public PKMACValueVerifier(PKMACBuilder builder)
-    {
-        this.builder = builder;
-    }
-
-    public boolean isValid(PKMACValue value, char[] password, SubjectPublicKeyInfo keyInfo)
-        throws CRMFException
-    {
-        builder.setParameters(PBMParameter.getInstance(value.getAlgId().getParameters()));
-        MacCalculator calculator = builder.build(password);
-
-        OutputStream macOut = calculator.getOutputStream();
-
-        try
-        {
-            macOut.write(keyInfo.getEncoded(ASN1Encoding.DER));
-
-            macOut.close();
-        }
-        catch (IOException e)
-        {
-            throw new CRMFException("exception encoding mac input: " + e.getMessage(), e);
-        }
-
-        return Arrays.areEqual(calculator.getMac(), value.getValue().getBytes());
-    }
-}
\ No newline at end of file
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/crmf/PKMACValuesCalculator.java b/bcpkix/src/main/java/org/bouncycastle/cert/crmf/PKMACValuesCalculator.java
deleted file mode 100644
index 2813b6c..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/crmf/PKMACValuesCalculator.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package org.bouncycastle.cert.crmf;
-
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-
-public interface PKMACValuesCalculator
-{
-    void setup(AlgorithmIdentifier digestAlg, AlgorithmIdentifier macAlg)
-        throws CRMFException;
-
-    byte[] calculateDigest(byte[] data)
-        throws CRMFException;
-
-    byte[] calculateMac(byte[] pwd, byte[] data)
-        throws CRMFException;
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/crmf/ProofOfPossessionSigningKeyBuilder.java b/bcpkix/src/main/java/org/bouncycastle/cert/crmf/ProofOfPossessionSigningKeyBuilder.java
deleted file mode 100644
index 7297980..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/crmf/ProofOfPossessionSigningKeyBuilder.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package org.bouncycastle.cert.crmf;
-
-import org.bouncycastle.asn1.DERBitString;
-import org.bouncycastle.asn1.crmf.CertRequest;
-import org.bouncycastle.asn1.crmf.PKMACValue;
-import org.bouncycastle.asn1.crmf.POPOSigningKey;
-import org.bouncycastle.asn1.crmf.POPOSigningKeyInput;
-import org.bouncycastle.asn1.x509.GeneralName;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.bouncycastle.operator.ContentSigner;
-
-public class ProofOfPossessionSigningKeyBuilder
-{
-    private CertRequest certRequest;
-    private SubjectPublicKeyInfo pubKeyInfo;
-    private GeneralName name;
-    private PKMACValue publicKeyMAC;
-
-    public ProofOfPossessionSigningKeyBuilder(CertRequest certRequest)
-    {
-        this.certRequest = certRequest;
-    }
-
-
-    public ProofOfPossessionSigningKeyBuilder(SubjectPublicKeyInfo pubKeyInfo)
-    {
-        this.pubKeyInfo = pubKeyInfo;
-    }
-
-    public ProofOfPossessionSigningKeyBuilder setSender(GeneralName name)
-    {
-        this.name = name;
-
-        return this;
-    }
-
-    public ProofOfPossessionSigningKeyBuilder setPublicKeyMac(PKMACValueGenerator generator, char[] password)
-        throws CRMFException
-    {
-        this.publicKeyMAC = generator.generate(password, pubKeyInfo);
-
-        return this;
-    }
-
-    public POPOSigningKey build(ContentSigner signer)
-    {
-        if (name != null && publicKeyMAC != null)
-        {
-            throw new IllegalStateException("name and publicKeyMAC cannot both be set.");
-        }
-
-        POPOSigningKeyInput popo;
-
-        if (certRequest != null)
-        {
-            popo = null;
-
-            CRMFUtil.derEncodeToStream(certRequest, signer.getOutputStream());
-        }
-        else if (name != null)
-        {
-            popo = new POPOSigningKeyInput(name, pubKeyInfo);
-
-            CRMFUtil.derEncodeToStream(popo, signer.getOutputStream());
-        }
-        else
-        {
-            popo = new POPOSigningKeyInput(publicKeyMAC, pubKeyInfo);
-
-            CRMFUtil.derEncodeToStream(popo, signer.getOutputStream());
-        }
-
-        return new POPOSigningKey(popo, signer.getAlgorithmIdentifier(), new DERBitString(signer.getSignature()));
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/crmf/RegTokenControl.java b/bcpkix/src/main/java/org/bouncycastle/cert/crmf/RegTokenControl.java
deleted file mode 100644
index 81af172..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/crmf/RegTokenControl.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package org.bouncycastle.cert.crmf;
-
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.DERUTF8String;
-import org.bouncycastle.asn1.crmf.CRMFObjectIdentifiers;
-
-/**
- * Carrier for a registration token control.
- */
-public class RegTokenControl
-    implements Control
-{
-    private static final ASN1ObjectIdentifier type = CRMFObjectIdentifiers.id_regCtrl_regToken;
-
-    private final DERUTF8String token;
-
-    /**
-     * Basic constructor - build from a UTF-8 string representing the token.
-     *
-     * @param token UTF-8 string representing the token.
-     */
-    public RegTokenControl(DERUTF8String token)
-    {
-        this.token = token;
-    }
-
-    /**
-     * Basic constructor - build from a string representing the token.
-     *
-     * @param token string representing the token.
-     */
-    public RegTokenControl(String token)
-    {
-        this.token = new DERUTF8String(token);
-    }
-
-    /**
-     * Return the type of this control.
-     *
-     * @return CRMFObjectIdentifiers.id_regCtrl_regToken
-     */
-    public ASN1ObjectIdentifier getType()
-    {
-        return type;
-    }
-
-    /**
-     * Return the token associated with this control (a UTF8String).
-     *
-     * @return a UTF8String.
-     */
-    public ASN1Encodable getValue()
-    {
-        return token;
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/crmf/ValueDecryptorGenerator.java b/bcpkix/src/main/java/org/bouncycastle/cert/crmf/ValueDecryptorGenerator.java
deleted file mode 100644
index 7125f56..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/crmf/ValueDecryptorGenerator.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package org.bouncycastle.cert.crmf;
-
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.operator.InputDecryptor;
-
-public interface ValueDecryptorGenerator
-{
-    InputDecryptor getValueDecryptor(AlgorithmIdentifier keyAlg, AlgorithmIdentifier symmAlg, byte[] encKey)
-        throws CRMFException;
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/crmf/bc/BcFixedLengthMGF1Padder.java b/bcpkix/src/main/java/org/bouncycastle/cert/crmf/bc/BcFixedLengthMGF1Padder.java
deleted file mode 100644
index 9fa53d6..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/crmf/bc/BcFixedLengthMGF1Padder.java
+++ /dev/null
@@ -1,121 +0,0 @@
-package org.bouncycastle.cert.crmf.bc;
-
-import java.security.SecureRandom;
-
-import org.bouncycastle.cert.crmf.EncryptedValuePadder;
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.digests.SHA1Digest;
-import org.bouncycastle.crypto.generators.MGF1BytesGenerator;
-import org.bouncycastle.crypto.params.MGFParameters;
-
-/**
- * An encrypted value padder that uses MGF1 as the basis of the padding.
- */
-public class BcFixedLengthMGF1Padder
-    implements EncryptedValuePadder
-{
-    private int length;
-    private SecureRandom random;
-    private Digest dig = new SHA1Digest();
-
-    /**
-     * Create a padder to so that padded output will always be at least
-     * length bytes long.
-     *
-     * @param length fixed length for padded output.
-     */
-    public BcFixedLengthMGF1Padder(int length)
-    {
-        this(length, null);
-    }
-
-    /**
-     * Create a padder to so that padded output will always be at least
-     * length bytes long, using the passed in source of randomness to
-     * provide the random material for the padder.
-     *
-     * @param length fixed length for padded output.
-     * @param random a source of randomness.
-     */
-    public BcFixedLengthMGF1Padder(int length, SecureRandom random)
-    {
-        this.length = length;
-        this.random = random;
-    }
-
-    public byte[] getPaddedData(byte[] data)
-    {
-        byte[] bytes = new byte[length];
-        byte[] seed = new byte[dig.getDigestSize()];
-        byte[] mask = new byte[length - dig.getDigestSize()];
-
-        if (random == null)
-        {
-            random = new SecureRandom();
-        }
-
-        random.nextBytes(seed);
-
-        MGF1BytesGenerator maskGen = new MGF1BytesGenerator(dig);
-
-        maskGen.init(new MGFParameters(seed));
-
-        maskGen.generateBytes(mask, 0, mask.length);
-
-        System.arraycopy(seed, 0, bytes, 0, seed.length);
-        System.arraycopy(data, 0, bytes, seed.length, data.length);
-
-        for (int i = seed.length + data.length + 1; i != bytes.length; i++)
-        {
-            bytes[i] = (byte)(1 + random.nextInt(255));
-        }
-
-        for (int i = 0; i != mask.length; i++)
-        {
-            bytes[i + seed.length] ^= mask[i];
-        }
-
-        return bytes;
-    }
-
-    public byte[] getUnpaddedData(byte[] paddedData)
-    {
-        byte[] seed = new byte[dig.getDigestSize()];
-        byte[] mask = new byte[length - dig.getDigestSize()];
-
-        System.arraycopy(paddedData, 0, seed, 0, seed.length);
-
-        MGF1BytesGenerator maskGen = new MGF1BytesGenerator(dig);
-
-        maskGen.init(new MGFParameters(seed));
-
-        maskGen.generateBytes(mask, 0, mask.length);
-
-        for (int i = 0; i != mask.length; i++)
-        {
-            paddedData[i + seed.length] ^= mask[i];
-        }
-
-        int end = 0;
-
-        for (int i = paddedData.length - 1; i != seed.length; i--)
-        {
-            if (paddedData[i] == 0)
-            {
-                end = i;
-                break;
-            }
-        }
-
-        if (end == 0)
-        {
-            throw new IllegalStateException("bad padding in encoding");
-        }
-
-        byte[] data = new byte[end - seed.length];
-
-        System.arraycopy(paddedData, seed.length, data, 0, data.length);
-
-        return data;
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/crmf/jcajce/CRMFHelper.java b/bcpkix/src/main/java/org/bouncycastle/cert/crmf/jcajce/CRMFHelper.java
deleted file mode 100644
index 4878615..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/crmf/jcajce/CRMFHelper.java
+++ /dev/null
@@ -1,450 +0,0 @@
-package org.bouncycastle.cert.crmf.jcajce;
-
-import java.io.IOException;
-import java.security.AlgorithmParameterGenerator;
-import java.security.AlgorithmParameters;
-import java.security.GeneralSecurityException;
-import java.security.InvalidAlgorithmParameterException;
-import java.security.InvalidKeyException;
-import java.security.Key;
-import java.security.KeyFactory;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-import java.security.NoSuchProviderException;
-import java.security.PublicKey;
-import java.security.SecureRandom;
-import java.security.spec.InvalidParameterSpecException;
-import java.security.spec.X509EncodedKeySpec;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.crypto.Cipher;
-import javax.crypto.KeyGenerator;
-import javax.crypto.Mac;
-import javax.crypto.NoSuchPaddingException;
-import javax.crypto.SecretKey;
-import javax.crypto.spec.IvParameterSpec;
-import javax.crypto.spec.RC2ParameterSpec;
-
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1Null;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.DERNull;
-import org.bouncycastle.asn1.iana.IANAObjectIdentifiers;
-import org.bouncycastle.asn1.nist.NISTObjectIdentifiers;
-import org.bouncycastle.asn1.oiw.OIWObjectIdentifiers;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.bouncycastle.asn1.x9.X9ObjectIdentifiers;
-import org.bouncycastle.cert.crmf.CRMFException;
-import org.bouncycastle.cms.CMSAlgorithm;
-import org.bouncycastle.jcajce.util.JcaJceHelper;
-import org.bouncycastle.jcajce.util.JcaJceUtils;
-
-class CRMFHelper
-{
-    protected static final Map BASE_CIPHER_NAMES = new HashMap();
-    protected static final Map CIPHER_ALG_NAMES = new HashMap();
-    protected static final Map DIGEST_ALG_NAMES = new HashMap();
-    protected static final Map KEY_ALG_NAMES = new HashMap();
-    protected static final Map MAC_ALG_NAMES = new HashMap();
-
-    static
-    {
-        BASE_CIPHER_NAMES.put(PKCSObjectIdentifiers.des_EDE3_CBC,  "DESEDE");
-        BASE_CIPHER_NAMES.put(NISTObjectIdentifiers.id_aes128_CBC,  "AES");
-        BASE_CIPHER_NAMES.put(NISTObjectIdentifiers.id_aes192_CBC,  "AES");
-        BASE_CIPHER_NAMES.put(NISTObjectIdentifiers.id_aes256_CBC,  "AES");
-        
-        CIPHER_ALG_NAMES.put(CMSAlgorithm.DES_EDE3_CBC,  "DESEDE/CBC/PKCS5Padding");
-        CIPHER_ALG_NAMES.put(CMSAlgorithm.AES128_CBC,  "AES/CBC/PKCS5Padding");
-        CIPHER_ALG_NAMES.put(CMSAlgorithm.AES192_CBC,  "AES/CBC/PKCS5Padding");
-        CIPHER_ALG_NAMES.put(CMSAlgorithm.AES256_CBC,  "AES/CBC/PKCS5Padding");
-        CIPHER_ALG_NAMES.put(new ASN1ObjectIdentifier(PKCSObjectIdentifiers.rsaEncryption.getId()), "RSA/ECB/PKCS1Padding");
-        
-        DIGEST_ALG_NAMES.put(OIWObjectIdentifiers.idSHA1, "SHA1");
-        DIGEST_ALG_NAMES.put(NISTObjectIdentifiers.id_sha224, "SHA224");
-        DIGEST_ALG_NAMES.put(NISTObjectIdentifiers.id_sha256, "SHA256");
-        DIGEST_ALG_NAMES.put(NISTObjectIdentifiers.id_sha384, "SHA384");
-        DIGEST_ALG_NAMES.put(NISTObjectIdentifiers.id_sha512, "SHA512");
-
-        MAC_ALG_NAMES.put(IANAObjectIdentifiers.hmacSHA1, "HMACSHA1");
-        MAC_ALG_NAMES.put(PKCSObjectIdentifiers.id_hmacWithSHA1, "HMACSHA1");
-        MAC_ALG_NAMES.put(PKCSObjectIdentifiers.id_hmacWithSHA224, "HMACSHA224");
-        MAC_ALG_NAMES.put(PKCSObjectIdentifiers.id_hmacWithSHA256, "HMACSHA256");
-        MAC_ALG_NAMES.put(PKCSObjectIdentifiers.id_hmacWithSHA384, "HMACSHA384");
-        MAC_ALG_NAMES.put(PKCSObjectIdentifiers.id_hmacWithSHA512, "HMACSHA512");
-
-        KEY_ALG_NAMES.put(PKCSObjectIdentifiers.rsaEncryption, "RSA");
-        KEY_ALG_NAMES.put(X9ObjectIdentifiers.id_dsa, "DSA");
-    }
-
-    private JcaJceHelper helper;
-
-    CRMFHelper(JcaJceHelper helper)
-    {
-        this.helper = helper;
-    }
-
-    PublicKey toPublicKey(SubjectPublicKeyInfo subjectPublicKeyInfo)
-        throws CRMFException
-    {
-        try
-        {
-            X509EncodedKeySpec xspec = new X509EncodedKeySpec(subjectPublicKeyInfo.getEncoded());
-            AlgorithmIdentifier keyAlg = subjectPublicKeyInfo.getAlgorithm();
-
-            return createKeyFactory(keyAlg.getAlgorithm()).generatePublic(xspec);
-        }
-        catch (Exception e)
-        {
-            throw new CRMFException("invalid key: " + e.getMessage(), e);
-        }
-    }
-
-    Cipher createCipher(ASN1ObjectIdentifier algorithm)
-        throws CRMFException
-    {
-        try
-        {
-            String cipherName = (String)CIPHER_ALG_NAMES.get(algorithm);
-
-            if (cipherName != null)
-            {
-                try
-                {
-                    // this is reversed as the Sun policy files now allow unlimited strength RSA
-                    return helper.createCipher(cipherName);
-                }
-                catch (NoSuchAlgorithmException e)
-                {
-                    // Ignore
-                }
-            }
-            return helper.createCipher(algorithm.getId());
-        }
-        catch (GeneralSecurityException e)
-        {
-            throw new CRMFException("cannot create cipher: " + e.getMessage(), e);
-        }
-    }
-    
-    public KeyGenerator createKeyGenerator(ASN1ObjectIdentifier algorithm)
-        throws CRMFException
-    {
-        try
-        {
-            String cipherName = (String)BASE_CIPHER_NAMES.get(algorithm);
-
-            if (cipherName != null)
-            {
-                try
-                {
-                    // this is reversed as the Sun policy files now allow unlimited strength RSA
-                    return helper.createKeyGenerator(cipherName);
-                }
-                catch (NoSuchAlgorithmException e)
-                {
-                    // Ignore
-                }
-            }
-            return helper.createKeyGenerator(algorithm.getId());
-        }
-        catch (GeneralSecurityException e)
-        {
-            throw new CRMFException("cannot create key generator: " + e.getMessage(), e);
-        }
-    }
-
-
-
-    Cipher createContentCipher(final Key sKey, final AlgorithmIdentifier encryptionAlgID)
-        throws CRMFException
-    {
-        return (Cipher)execute(new JCECallback()
-        {
-            public Object doInJCE()
-                throws CRMFException, InvalidAlgorithmParameterException,
-                InvalidKeyException, InvalidParameterSpecException, NoSuchAlgorithmException,
-                NoSuchPaddingException, NoSuchProviderException
-            {
-                Cipher cipher = createCipher(encryptionAlgID.getAlgorithm());
-                ASN1Primitive sParams = (ASN1Primitive)encryptionAlgID.getParameters();
-                ASN1ObjectIdentifier encAlg = encryptionAlgID.getAlgorithm();
-
-                if (sParams != null && !(sParams instanceof ASN1Null))
-                {
-                    try
-                    {
-                        AlgorithmParameters params = createAlgorithmParameters(encryptionAlgID.getAlgorithm());
-
-                        try
-                        {
-                            JcaJceUtils.loadParameters(params, sParams);
-                        }
-                        catch (IOException e)
-                        {
-                            throw new CRMFException("error decoding algorithm parameters.", e);
-                        }
-
-                        cipher.init(Cipher.DECRYPT_MODE, sKey, params);
-                    }
-                    catch (NoSuchAlgorithmException e)
-                    {
-                        if (encAlg.equals(CMSAlgorithm.DES_EDE3_CBC)
-                            || encAlg.equals(CMSAlgorithm.IDEA_CBC)
-                            || encAlg.equals(CMSAlgorithm.AES128_CBC)
-                            || encAlg.equals(CMSAlgorithm.AES192_CBC)
-                            || encAlg.equals(CMSAlgorithm.AES256_CBC))
-                        {
-                            cipher.init(Cipher.DECRYPT_MODE, sKey, new IvParameterSpec(
-                                ASN1OctetString.getInstance(sParams).getOctets()));
-                        }
-                        else
-                        {
-                            throw e;
-                        }
-                    }
-                }
-                else
-                {
-                    if (encAlg.equals(CMSAlgorithm.DES_EDE3_CBC)
-                        || encAlg.equals(CMSAlgorithm.IDEA_CBC)
-                        || encAlg.equals(CMSAlgorithm.CAST5_CBC))
-                    {
-                        cipher.init(Cipher.DECRYPT_MODE, sKey, new IvParameterSpec(new byte[8]));
-                    }
-                    else
-                    {
-                        cipher.init(Cipher.DECRYPT_MODE, sKey);
-                    }
-                }
-
-                return cipher;
-            }
-        });
-    }
-    
-    AlgorithmParameters createAlgorithmParameters(ASN1ObjectIdentifier algorithm)
-        throws NoSuchAlgorithmException, NoSuchProviderException
-    {
-        String algorithmName = (String)BASE_CIPHER_NAMES.get(algorithm);
-
-        if (algorithmName != null)
-        {
-            try
-            {
-                // this is reversed as the Sun policy files now allow unlimited strength RSA
-                return helper.createAlgorithmParameters(algorithmName);
-            }
-            catch (NoSuchAlgorithmException e)
-            {
-                // Ignore
-            }
-        }
-        return helper.createAlgorithmParameters(algorithm.getId());
-    }
-    
-    KeyFactory createKeyFactory(ASN1ObjectIdentifier algorithm)
-        throws CRMFException
-    {
-        try
-        {
-            String algName = (String)KEY_ALG_NAMES.get(algorithm);
-
-            if (algName != null)
-            {
-                try
-                {
-                    // this is reversed as the Sun policy files now allow unlimited strength RSA
-                    return helper.createKeyFactory(algName);
-                }
-                catch (NoSuchAlgorithmException e)
-                {
-                    // Ignore
-                }
-            }
-            return helper.createKeyFactory(algorithm.getId());
-        }
-        catch (GeneralSecurityException e)
-        {
-            throw new CRMFException("cannot create cipher: " + e.getMessage(), e);
-        }
-    }
-
-    MessageDigest createDigest(ASN1ObjectIdentifier algorithm)
-        throws CRMFException
-    {
-        try
-        {
-            String digestName = (String)DIGEST_ALG_NAMES.get(algorithm);
-
-            if (digestName != null)
-            {
-                try
-                {
-                    // this is reversed as the Sun policy files now allow unlimited strength RSA
-                    return helper.createDigest(digestName);
-                }
-                catch (NoSuchAlgorithmException e)
-                {
-                    // Ignore
-                }
-            }
-            return helper.createDigest(algorithm.getId());
-        }
-        catch (GeneralSecurityException e)
-        {
-            throw new CRMFException("cannot create cipher: " + e.getMessage(), e);
-        }
-    }
-
-    Mac createMac(ASN1ObjectIdentifier algorithm)
-        throws CRMFException
-    {
-        try
-        {
-            String macName = (String)MAC_ALG_NAMES.get(algorithm);
-
-            if (macName != null)
-            {
-                try
-                {
-                    // this is reversed as the Sun policy files now allow unlimited strength RSA
-                    return helper.createMac(macName);
-                }
-                catch (NoSuchAlgorithmException e)
-                {
-                    // Ignore
-                }
-            }
-            return helper.createMac(algorithm.getId());
-        }
-        catch (GeneralSecurityException e)
-        {
-            throw new CRMFException("cannot create mac: " + e.getMessage(), e);
-        }
-    }
-
-    AlgorithmParameterGenerator createAlgorithmParameterGenerator(ASN1ObjectIdentifier algorithm)
-        throws GeneralSecurityException
-    {
-        String algorithmName = (String)BASE_CIPHER_NAMES.get(algorithm);
-
-        if (algorithmName != null)
-        {
-            try
-            {
-                // this is reversed as the Sun policy files now allow unlimited strength RSA
-                return helper.createAlgorithmParameterGenerator(algorithmName);
-            }
-            catch (NoSuchAlgorithmException e)
-            {
-                // Ignore
-            }
-        }
-        return helper.createAlgorithmParameterGenerator(algorithm.getId());
-    }
-
-    AlgorithmParameters generateParameters(ASN1ObjectIdentifier encryptionOID, SecretKey encKey, SecureRandom rand)
-        throws CRMFException
-    {
-        try
-        {
-            AlgorithmParameterGenerator pGen = createAlgorithmParameterGenerator(encryptionOID);
-
-            if (encryptionOID.equals(CMSAlgorithm.RC2_CBC))
-            {
-                byte[]  iv = new byte[8];
-
-                rand.nextBytes(iv);
-
-                try
-                {
-                    pGen.init(new RC2ParameterSpec(encKey.getEncoded().length * 8, iv), rand);
-                }
-                catch (InvalidAlgorithmParameterException e)
-                {
-                    throw new CRMFException("parameters generation error: " + e, e);
-                }
-            }
-
-            return pGen.generateParameters();
-        }
-        catch (NoSuchAlgorithmException e)
-        {
-            return null;
-        }
-        catch (GeneralSecurityException e)
-        {
-            throw new CRMFException("exception creating algorithm parameter generator: " + e, e);
-        }
-    }
-
-    AlgorithmIdentifier getAlgorithmIdentifier(ASN1ObjectIdentifier encryptionOID, AlgorithmParameters params)
-        throws CRMFException
-    {
-        ASN1Encodable asn1Params;
-        if (params != null)
-        {
-            try
-            {
-                asn1Params = JcaJceUtils.extractParameters(params);
-            }
-            catch (IOException e)
-            {
-                throw new CRMFException("cannot encode parameters: " + e.getMessage(), e);
-            }
-        }
-        else
-        {
-            asn1Params = DERNull.INSTANCE;
-        }
-
-        return new AlgorithmIdentifier(
-            encryptionOID,
-            asn1Params);
-    }
-    
-    static Object execute(JCECallback callback) throws CRMFException
-    {
-        try
-        {
-            return callback.doInJCE();
-        }
-        catch (NoSuchAlgorithmException e)
-        {
-            throw new CRMFException("can't find algorithm.", e);
-        }
-        catch (InvalidKeyException e)
-        {
-            throw new CRMFException("key invalid in message.", e);
-        }
-        catch (NoSuchProviderException e)
-        {
-            throw new CRMFException("can't find provider.", e);
-        }
-        catch (NoSuchPaddingException e)
-        {
-            throw new CRMFException("required padding not supported.", e);
-        }
-        catch (InvalidAlgorithmParameterException e)
-        {
-            throw new CRMFException("algorithm parameters invalid.", e);
-        }
-        catch (InvalidParameterSpecException e)
-        {
-            throw new CRMFException("MAC algorithm parameter spec invalid.", e);
-        }
-    }
-    
-    static interface JCECallback
-    {
-        Object doInJCE()
-            throws CRMFException, InvalidAlgorithmParameterException, InvalidKeyException, InvalidParameterSpecException,
-            NoSuchAlgorithmException, NoSuchPaddingException, NoSuchProviderException;
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/crmf/jcajce/JcaCertificateRequestMessage.java b/bcpkix/src/main/java/org/bouncycastle/cert/crmf/jcajce/JcaCertificateRequestMessage.java
deleted file mode 100644
index 7f33d17..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/crmf/jcajce/JcaCertificateRequestMessage.java
+++ /dev/null
@@ -1,84 +0,0 @@
-package org.bouncycastle.cert.crmf.jcajce;
-
-import java.io.IOException;
-import java.security.Provider;
-import java.security.PublicKey;
-
-import javax.security.auth.x500.X500Principal;
-
-import org.bouncycastle.asn1.ASN1Encoding;
-import org.bouncycastle.asn1.crmf.CertReqMsg;
-import org.bouncycastle.asn1.x500.X500Name;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.bouncycastle.cert.crmf.CRMFException;
-import org.bouncycastle.cert.crmf.CertificateRequestMessage;
-import org.bouncycastle.jcajce.util.DefaultJcaJceHelper;
-import org.bouncycastle.jcajce.util.NamedJcaJceHelper;
-import org.bouncycastle.jcajce.util.ProviderJcaJceHelper;
-
-public class JcaCertificateRequestMessage
-    extends CertificateRequestMessage
-{
-    private CRMFHelper helper = new CRMFHelper(new DefaultJcaJceHelper());
-
-    public JcaCertificateRequestMessage(byte[] certReqMsg)
-    {
-        this(CertReqMsg.getInstance(certReqMsg));
-    }
-
-    public JcaCertificateRequestMessage(CertificateRequestMessage certReqMsg)
-    {
-        this(certReqMsg.toASN1Structure());
-    }
-
-    public JcaCertificateRequestMessage(CertReqMsg certReqMsg)
-    {
-        super(certReqMsg);
-    }
-
-    public JcaCertificateRequestMessage setProvider(String providerName)
-    {
-        this.helper = new CRMFHelper(new NamedJcaJceHelper(providerName));
-
-        return this;
-    }
-
-    public JcaCertificateRequestMessage setProvider(Provider provider)
-    {
-        this.helper = new CRMFHelper(new ProviderJcaJceHelper(provider));
-
-        return this;
-    }
-
-    public X500Principal getSubjectX500Principal()
-    {
-        X500Name subject = this.getCertTemplate().getSubject();
-
-        if (subject != null)
-        {
-            try
-            {
-                return new X500Principal(subject.getEncoded(ASN1Encoding.DER));
-            }
-            catch (IOException e)
-            {
-                throw new IllegalStateException("unable to construct DER encoding of name: " + e.getMessage());
-            }
-        }
-
-        return null;
-    }
-
-    public PublicKey getPublicKey()
-        throws CRMFException
-    {
-        SubjectPublicKeyInfo subjectPublicKeyInfo = getCertTemplate().getPublicKey();
-
-        if (subjectPublicKeyInfo != null)
-        {
-            return helper.toPublicKey(subjectPublicKeyInfo);
-        }
-
-        return null;
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/crmf/jcajce/JcaCertificateRequestMessageBuilder.java b/bcpkix/src/main/java/org/bouncycastle/cert/crmf/jcajce/JcaCertificateRequestMessageBuilder.java
deleted file mode 100644
index 63eea67..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/crmf/jcajce/JcaCertificateRequestMessageBuilder.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package org.bouncycastle.cert.crmf.jcajce;
-
-import java.math.BigInteger;
-import java.security.PublicKey;
-
-import javax.security.auth.x500.X500Principal;
-
-import org.bouncycastle.asn1.x500.X500Name;
-import org.bouncycastle.asn1.x509.GeneralName;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.bouncycastle.cert.crmf.CertificateRequestMessageBuilder;
-
-public class JcaCertificateRequestMessageBuilder
-    extends CertificateRequestMessageBuilder
-{
-    public JcaCertificateRequestMessageBuilder(BigInteger certReqId)
-    {
-        super(certReqId);
-    }
-
-    public JcaCertificateRequestMessageBuilder setIssuer(X500Principal issuer)
-    {
-        if (issuer != null)
-        {
-            setIssuer(X500Name.getInstance(issuer.getEncoded()));
-        }
-
-        return this;
-    }
-
-    public JcaCertificateRequestMessageBuilder setSubject(X500Principal subject)
-    {
-        if (subject != null)
-        {
-            setSubject(X500Name.getInstance(subject.getEncoded()));
-        }
-
-        return this;
-    }
-
-    public JcaCertificateRequestMessageBuilder setAuthInfoSender(X500Principal sender)
-    {
-        if (sender != null)
-        {
-            setAuthInfoSender(new GeneralName(X500Name.getInstance(sender.getEncoded())));
-        }
-
-        return this;
-    }
-
-    public JcaCertificateRequestMessageBuilder setPublicKey(PublicKey publicKey)
-    {
-        setPublicKey(SubjectPublicKeyInfo.getInstance(publicKey.getEncoded()));
-
-        return this;
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/crmf/jcajce/JcaEncryptedValueBuilder.java b/bcpkix/src/main/java/org/bouncycastle/cert/crmf/jcajce/JcaEncryptedValueBuilder.java
deleted file mode 100644
index 91d22a0..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/crmf/jcajce/JcaEncryptedValueBuilder.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package org.bouncycastle.cert.crmf.jcajce;
-
-import java.security.cert.CertificateEncodingException;
-import java.security.cert.X509Certificate;
-
-import org.bouncycastle.asn1.crmf.EncryptedValue;
-import org.bouncycastle.cert.crmf.CRMFException;
-import org.bouncycastle.cert.crmf.EncryptedValueBuilder;
-import org.bouncycastle.cert.jcajce.JcaX509CertificateHolder;
-import org.bouncycastle.operator.KeyWrapper;
-import org.bouncycastle.operator.OutputEncryptor;
-
-public class JcaEncryptedValueBuilder
-    extends EncryptedValueBuilder
-{
-    public JcaEncryptedValueBuilder(KeyWrapper wrapper, OutputEncryptor encryptor)
-    {
-        super(wrapper, encryptor);
-    }
-
-    public EncryptedValue build(X509Certificate certificate)
-        throws CertificateEncodingException, CRMFException
-    {
-        return build(new JcaX509CertificateHolder(certificate));
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/crmf/jcajce/JcaPKIArchiveControlBuilder.java b/bcpkix/src/main/java/org/bouncycastle/cert/crmf/jcajce/JcaPKIArchiveControlBuilder.java
deleted file mode 100644
index ab89241..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/crmf/jcajce/JcaPKIArchiveControlBuilder.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package org.bouncycastle.cert.crmf.jcajce;
-
-import java.security.PrivateKey;
-
-import javax.security.auth.x500.X500Principal;
-
-import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
-import org.bouncycastle.asn1.x500.X500Name;
-import org.bouncycastle.asn1.x509.GeneralName;
-import org.bouncycastle.cert.crmf.PKIArchiveControlBuilder;
-
-public class JcaPKIArchiveControlBuilder
-    extends PKIArchiveControlBuilder
-{
-    public JcaPKIArchiveControlBuilder(PrivateKey privateKey, X500Name name)
-    {
-        this(privateKey, new GeneralName(name));
-    }
-
-    public JcaPKIArchiveControlBuilder(PrivateKey privateKey, X500Principal name)
-    {
-        this(privateKey, X500Name.getInstance(name.getEncoded()));
-    }
-
-    public JcaPKIArchiveControlBuilder(PrivateKey privateKey, GeneralName generalName)
-    {
-        super(PrivateKeyInfo.getInstance(privateKey.getEncoded()), generalName);
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/crmf/jcajce/JceAsymmetricValueDecryptorGenerator.java b/bcpkix/src/main/java/org/bouncycastle/cert/crmf/jcajce/JceAsymmetricValueDecryptorGenerator.java
deleted file mode 100644
index ff1158e..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/crmf/jcajce/JceAsymmetricValueDecryptorGenerator.java
+++ /dev/null
@@ -1,120 +0,0 @@
-package org.bouncycastle.cert.crmf.jcajce;
-
-import java.io.InputStream;
-import java.security.GeneralSecurityException;
-import java.security.InvalidKeyException;
-import java.security.Key;
-import java.security.PrivateKey;
-import java.security.Provider;
-import java.security.ProviderException;
-
-import javax.crypto.BadPaddingException;
-import javax.crypto.Cipher;
-import javax.crypto.CipherInputStream;
-import javax.crypto.IllegalBlockSizeException;
-import javax.crypto.spec.SecretKeySpec;
-
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.cert.crmf.CRMFException;
-import org.bouncycastle.cert.crmf.ValueDecryptorGenerator;
-import org.bouncycastle.jcajce.util.DefaultJcaJceHelper;
-import org.bouncycastle.jcajce.util.NamedJcaJceHelper;
-import org.bouncycastle.jcajce.util.ProviderJcaJceHelper;
-import org.bouncycastle.operator.InputDecryptor;
-
-public class JceAsymmetricValueDecryptorGenerator
-    implements ValueDecryptorGenerator
-{
-    private PrivateKey recipientKey;
-    private CRMFHelper helper = new CRMFHelper(new DefaultJcaJceHelper());
-
-    public JceAsymmetricValueDecryptorGenerator(PrivateKey recipientKey)
-    {
-        this.recipientKey = recipientKey;
-    }
-
-    public JceAsymmetricValueDecryptorGenerator setProvider(Provider provider)
-    {
-        this.helper = new CRMFHelper(new ProviderJcaJceHelper(provider));
-
-        return this;
-    }
-
-    public JceAsymmetricValueDecryptorGenerator setProvider(String providerName)
-    {
-        this.helper = new CRMFHelper(new NamedJcaJceHelper(providerName));
-
-        return this;
-    }
-
-    private Key extractSecretKey(AlgorithmIdentifier keyEncryptionAlgorithm, AlgorithmIdentifier contentEncryptionAlgorithm, byte[] encryptedContentEncryptionKey)
-        throws CRMFException
-    {
-        try
-        {
-            Key sKey = null;
-
-            Cipher keyCipher = helper.createCipher(keyEncryptionAlgorithm.getAlgorithm());
-
-            try
-            {
-                keyCipher.init(Cipher.UNWRAP_MODE, recipientKey);
-                sKey = keyCipher.unwrap(encryptedContentEncryptionKey, contentEncryptionAlgorithm.getAlgorithm().getId(), Cipher.SECRET_KEY);
-            }
-            catch (GeneralSecurityException e)
-            {
-            }
-            catch (IllegalStateException e)
-            {
-            }
-            catch (UnsupportedOperationException e)
-            {
-            }
-            catch (ProviderException e)
-            {
-            }
-
-            // some providers do not support UNWRAP (this appears to be only for asymmetric algorithms)
-            if (sKey == null)
-            {
-                keyCipher.init(Cipher.DECRYPT_MODE, recipientKey);
-                sKey = new SecretKeySpec(keyCipher.doFinal(encryptedContentEncryptionKey), contentEncryptionAlgorithm.getAlgorithm().getId());
-            }
-
-            return sKey;
-        }
-        catch (InvalidKeyException e)
-        {
-            throw new CRMFException("key invalid in message.", e);
-        }
-        catch (IllegalBlockSizeException e)
-        {
-            throw new CRMFException("illegal blocksize in message.", e);
-        }
-        catch (BadPaddingException e)
-        {
-            throw new CRMFException("bad padding in message.", e);
-        }
-    }
-
-    public InputDecryptor getValueDecryptor(AlgorithmIdentifier keyEncryptionAlgorithm, final AlgorithmIdentifier contentEncryptionAlgorithm, byte[] encryptedContentEncryptionKey)
-        throws CRMFException
-    {
-        Key secretKey = extractSecretKey(keyEncryptionAlgorithm, contentEncryptionAlgorithm, encryptedContentEncryptionKey);
-
-        final Cipher dataCipher = helper.createContentCipher(secretKey, contentEncryptionAlgorithm);
-
-        return new InputDecryptor()
-        {
-            public AlgorithmIdentifier getAlgorithmIdentifier()
-            {
-                return contentEncryptionAlgorithm;
-            }
-
-            public InputStream getInputStream(InputStream dataIn)
-            {
-                return new CipherInputStream(dataIn, dataCipher);
-            }
-        };
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/crmf/jcajce/JceCRMFEncryptorBuilder.java b/bcpkix/src/main/java/org/bouncycastle/cert/crmf/jcajce/JceCRMFEncryptorBuilder.java
deleted file mode 100644
index 701d36e..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/crmf/jcajce/JceCRMFEncryptorBuilder.java
+++ /dev/null
@@ -1,136 +0,0 @@
-package org.bouncycastle.cert.crmf.jcajce;
-
-import java.io.OutputStream;
-import java.security.AlgorithmParameters;
-import java.security.GeneralSecurityException;
-import java.security.Provider;
-import java.security.SecureRandom;
-
-import javax.crypto.Cipher;
-import javax.crypto.CipherOutputStream;
-import javax.crypto.KeyGenerator;
-import javax.crypto.SecretKey;
-
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.cert.crmf.CRMFException;
-import org.bouncycastle.jcajce.util.DefaultJcaJceHelper;
-import org.bouncycastle.jcajce.util.NamedJcaJceHelper;
-import org.bouncycastle.jcajce.util.ProviderJcaJceHelper;
-import org.bouncycastle.operator.GenericKey;
-import org.bouncycastle.operator.OutputEncryptor;
-import org.bouncycastle.operator.jcajce.JceGenericKey;
-
-public class JceCRMFEncryptorBuilder
-{
-    private final ASN1ObjectIdentifier encryptionOID;
-    private final int                  keySize;
-
-    private CRMFHelper helper = new CRMFHelper(new DefaultJcaJceHelper());
-    private SecureRandom random;
-
-    public JceCRMFEncryptorBuilder(ASN1ObjectIdentifier encryptionOID)
-    {
-        this(encryptionOID, -1);
-    }
-
-    public JceCRMFEncryptorBuilder(ASN1ObjectIdentifier encryptionOID, int keySize)
-    {
-        this.encryptionOID = encryptionOID;
-        this.keySize = keySize;
-    }
-
-    public JceCRMFEncryptorBuilder setProvider(Provider provider)
-    {
-        this.helper = new CRMFHelper(new ProviderJcaJceHelper(provider));
-
-        return this;
-    }
-
-    public JceCRMFEncryptorBuilder setProvider(String providerName)
-    {
-        this.helper = new CRMFHelper(new NamedJcaJceHelper(providerName));
-
-        return this;
-    }
-
-    public JceCRMFEncryptorBuilder setSecureRandom(SecureRandom random)
-    {
-        this.random = random;
-
-        return this;
-    }
-
-    public OutputEncryptor build()
-        throws CRMFException
-    {
-        return new CRMFOutputEncryptor(encryptionOID, keySize, random);
-    }
-
-    private class CRMFOutputEncryptor
-        implements OutputEncryptor
-    {
-        private SecretKey encKey;
-        private AlgorithmIdentifier algorithmIdentifier;
-        private Cipher cipher;
-
-        CRMFOutputEncryptor(ASN1ObjectIdentifier encryptionOID, int keySize, SecureRandom random)
-            throws CRMFException
-        {
-            KeyGenerator keyGen = helper.createKeyGenerator(encryptionOID);
-
-            if (random == null)
-            {
-                random = new SecureRandom();
-            }
-
-            if (keySize < 0)
-            {
-                keyGen.init(random);
-            }
-            else
-            {
-                keyGen.init(keySize, random);
-            }
-
-            cipher = helper.createCipher(encryptionOID);
-            encKey = keyGen.generateKey();
-            AlgorithmParameters params = helper.generateParameters(encryptionOID, encKey, random);
-
-            try
-            {
-                cipher.init(Cipher.ENCRYPT_MODE, encKey, params, random);
-            }
-            catch (GeneralSecurityException e)
-            {
-                throw new CRMFException("unable to initialize cipher: " + e.getMessage(), e);
-            }
-
-            //
-            // If params are null we try and second guess on them as some providers don't provide
-            // algorithm parameter generation explicity but instead generate them under the hood.
-            //
-            if (params == null)
-            {
-                params = cipher.getParameters();
-            }
-
-            algorithmIdentifier = helper.getAlgorithmIdentifier(encryptionOID, params);
-        }
-
-        public AlgorithmIdentifier getAlgorithmIdentifier()
-        {
-            return algorithmIdentifier;
-        }
-
-        public OutputStream getOutputStream(OutputStream dOut)
-        {
-            return new CipherOutputStream(dOut, cipher);
-        }
-
-        public GenericKey getKey()
-        {
-            return new JceGenericKey(algorithmIdentifier, encKey);
-        }
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/crmf/jcajce/JcePKMACValuesCalculator.java b/bcpkix/src/main/java/org/bouncycastle/cert/crmf/jcajce/JcePKMACValuesCalculator.java
deleted file mode 100644
index 30423db..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/crmf/jcajce/JcePKMACValuesCalculator.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package org.bouncycastle.cert.crmf.jcajce;
-
-import java.security.GeneralSecurityException;
-import java.security.MessageDigest;
-import java.security.Provider;
-
-import javax.crypto.Mac;
-import javax.crypto.spec.SecretKeySpec;
-
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.cert.crmf.CRMFException;
-import org.bouncycastle.cert.crmf.PKMACValuesCalculator;
-import org.bouncycastle.jcajce.util.DefaultJcaJceHelper;
-import org.bouncycastle.jcajce.util.NamedJcaJceHelper;
-import org.bouncycastle.jcajce.util.ProviderJcaJceHelper;
-
-public class JcePKMACValuesCalculator
-    implements PKMACValuesCalculator
-{
-    private MessageDigest digest;
-    private Mac           mac;
-    private CRMFHelper    helper;
-
-    public JcePKMACValuesCalculator()
-    {
-        this.helper = new CRMFHelper(new DefaultJcaJceHelper());
-    }
-
-    public JcePKMACValuesCalculator setProvider(Provider provider)
-    {
-        this.helper = new CRMFHelper(new ProviderJcaJceHelper(provider));
-
-        return this;
-    }
-
-    public JcePKMACValuesCalculator setProvider(String providerName)
-    {
-        this.helper = new CRMFHelper(new NamedJcaJceHelper(providerName));
-
-        return this;
-    }
-
-    public void setup(AlgorithmIdentifier digAlg, AlgorithmIdentifier macAlg)
-        throws CRMFException
-    {
-        digest = helper.createDigest(digAlg.getAlgorithm());
-        mac = helper.createMac(macAlg.getAlgorithm());
-    }
-
-    public byte[] calculateDigest(byte[] data)
-    {
-        return digest.digest(data);
-    }
-
-    public byte[] calculateMac(byte[] pwd, byte[] data)
-        throws CRMFException
-    {
-        try
-        {
-            mac.init(new SecretKeySpec(pwd, mac.getAlgorithm()));
-
-            return mac.doFinal(data);
-        }
-        catch (GeneralSecurityException e)
-        {
-            throw new CRMFException("failure in setup: " + e.getMessage(), e);
-        }
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/crmf/jcajce/package.html b/bcpkix/src/main/java/org/bouncycastle/cert/crmf/jcajce/package.html
deleted file mode 100644
index e9bc53f..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/crmf/jcajce/package.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-        "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<body bgcolor="#ffffff">
-JCA extensions to the CRMF online certificate request package.
-</body>
-</html>
\ No newline at end of file
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/crmf/package.html b/bcpkix/src/main/java/org/bouncycastle/cert/crmf/package.html
deleted file mode 100644
index 521fc44..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/crmf/package.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-        "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<body bgcolor="#ffffff">
-Basic support package for handling and creating CRMF (RFC 4211) certificate request messages.
-</body>
-</html>
\ No newline at end of file
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/crmf/test/AllTests.java b/bcpkix/src/main/java/org/bouncycastle/cert/crmf/test/AllTests.java
deleted file mode 100644
index 712210e..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/crmf/test/AllTests.java
+++ /dev/null
@@ -1,384 +0,0 @@
-package org.bouncycastle.cert.crmf.test;
-
-import java.io.IOException;
-import java.math.BigInteger;
-import java.security.GeneralSecurityException;
-import java.security.KeyPair;
-import java.security.KeyPairGenerator;
-import java.security.PrivateKey;
-import java.security.PublicKey;
-import java.security.SecureRandom;
-import java.security.Security;
-import java.security.cert.X509Certificate;
-import java.security.interfaces.RSAPublicKey;
-import java.util.Date;
-
-import javax.security.auth.x500.X500Principal;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.crmf.CRMFObjectIdentifiers;
-import org.bouncycastle.asn1.crmf.EncKeyWithID;
-import org.bouncycastle.asn1.crmf.EncryptedValue;
-import org.bouncycastle.asn1.x500.X500Name;
-import org.bouncycastle.asn1.x509.GeneralName;
-import org.bouncycastle.cert.X509CertificateHolder;
-import org.bouncycastle.cert.X509v1CertificateBuilder;
-import org.bouncycastle.cert.crmf.EncryptedValueBuilder;
-import org.bouncycastle.cert.crmf.EncryptedValuePadder;
-import org.bouncycastle.cert.crmf.EncryptedValueParser;
-import org.bouncycastle.cert.crmf.PKIArchiveControl;
-import org.bouncycastle.cert.crmf.PKMACBuilder;
-import org.bouncycastle.cert.crmf.ValueDecryptorGenerator;
-import org.bouncycastle.cert.crmf.bc.BcFixedLengthMGF1Padder;
-import org.bouncycastle.cert.crmf.jcajce.JcaCertificateRequestMessage;
-import org.bouncycastle.cert.crmf.jcajce.JcaCertificateRequestMessageBuilder;
-import org.bouncycastle.cert.crmf.jcajce.JcaEncryptedValueBuilder;
-import org.bouncycastle.cert.crmf.jcajce.JcaPKIArchiveControlBuilder;
-import org.bouncycastle.cert.crmf.jcajce.JceAsymmetricValueDecryptorGenerator;
-import org.bouncycastle.cert.crmf.jcajce.JceCRMFEncryptorBuilder;
-import org.bouncycastle.cert.crmf.jcajce.JcePKMACValuesCalculator;
-import org.bouncycastle.cert.jcajce.JcaX509CertificateConverter;
-import org.bouncycastle.cert.jcajce.JcaX509v1CertificateBuilder;
-import org.bouncycastle.cms.CMSAlgorithm;
-import org.bouncycastle.cms.CMSEnvelopedDataGenerator;
-import org.bouncycastle.cms.RecipientId;
-import org.bouncycastle.cms.RecipientInformation;
-import org.bouncycastle.cms.RecipientInformationStore;
-import org.bouncycastle.cms.jcajce.JceCMSContentEncryptorBuilder;
-import org.bouncycastle.cms.jcajce.JceKeyTransEnvelopedRecipient;
-import org.bouncycastle.cms.jcajce.JceKeyTransRecipientId;
-import org.bouncycastle.cms.jcajce.JceKeyTransRecipientInfoGenerator;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.operator.OperatorCreationException;
-import org.bouncycastle.operator.jcajce.JcaContentSignerBuilder;
-import org.bouncycastle.operator.jcajce.JcaContentVerifierProviderBuilder;
-import org.bouncycastle.operator.jcajce.JceAsymmetricKeyWrapper;
-import org.bouncycastle.util.Arrays;
-
-public class AllTests
-    extends TestCase
-{
-    private static final byte[] TEST_DATA = "Hello world!".getBytes();
-    private static final String BC = BouncyCastleProvider.PROVIDER_NAME;
-    private static final String PASSPHRASE = "hello world";
-
-    /*
-     *
-     *  INFRASTRUCTURE
-     *
-     */
-
-    public AllTests(String name)
-    {
-        super(name);
-    }
-
-    public static void main(String args[])
-    {
-        junit.textui.TestRunner.run(AllTests.class);
-    }
-
-    public static Test suite()
-    {
-        return new TestSuite(AllTests.class);
-    }
-
-    public void setUp()
-    {
-        Security.addProvider(new BouncyCastleProvider());
-    }
-
-    public void tearDown()
-    {
-
-    }
-
-    public void testBasicMessageWithArchiveControl()
-        throws Exception
-    {
-        KeyPairGenerator kGen = KeyPairGenerator.getInstance("RSA", BC);
-
-        kGen.initialize(512);
-
-        KeyPair kp = kGen.generateKeyPair();
-        X509Certificate cert = makeV1Certificate(kp, "CN=Test", kp, "CN=Test");
-
-        JcaCertificateRequestMessageBuilder certReqBuild = new JcaCertificateRequestMessageBuilder(BigInteger.ONE);
-
-        certReqBuild.setSubject(new X500Principal("CN=Test"))
-                    .setPublicKey(kp.getPublic());
-
-        certReqBuild.addControl(new JcaPKIArchiveControlBuilder(kp.getPrivate(), new X500Principal("CN=Test"))
-                                      .addRecipientGenerator(new JceKeyTransRecipientInfoGenerator(cert).setProvider(BC))
-                                      .build(new JceCMSContentEncryptorBuilder(new ASN1ObjectIdentifier(CMSEnvelopedDataGenerator.AES128_CBC)).setProvider(BC).build()));
-
-        JcaCertificateRequestMessage certReqMsg = new JcaCertificateRequestMessage(certReqBuild.build());
-
-        assertEquals(new X500Principal("CN=Test"), certReqMsg.getSubjectX500Principal());
-        assertEquals(kp.getPublic(), certReqMsg.getPublicKey());
-
-        PKIArchiveControl archiveControl = (PKIArchiveControl)certReqMsg.getControl(CRMFObjectIdentifiers.id_regCtrl_pkiArchiveOptions);
-
-        assertEquals(PKIArchiveControl.encryptedPrivKey, archiveControl.getArchiveType());
-
-        assertTrue(archiveControl.isEnvelopedData());
-
-        RecipientInformationStore recips = archiveControl.getEnvelopedData().getRecipientInfos();
-
-        RecipientId recipientId = new JceKeyTransRecipientId(cert);
-
-        RecipientInformation recipientInformation = recips.get(recipientId);
-
-        assertNotNull(recipientInformation);
-
-        EncKeyWithID encKeyWithID = EncKeyWithID.getInstance(recipientInformation.getContent(new JceKeyTransEnvelopedRecipient(kp.getPrivate()).setProvider(BC)));
-
-        assertTrue(encKeyWithID.hasIdentifier());
-        assertFalse(encKeyWithID.isIdentifierUTF8String());
-
-        assertEquals(new GeneralName(X500Name.getInstance(new X500Principal("CN=Test").getEncoded())), encKeyWithID.getIdentifier());
-        assertTrue(Arrays.areEqual(kp.getPrivate().getEncoded(), encKeyWithID.getPrivateKey().getEncoded()));
-    }
-
-    public void testProofOfPossessionWithoutSender()
-        throws Exception
-    {
-        KeyPairGenerator kGen = KeyPairGenerator.getInstance("RSA", BC);
-
-        kGen.initialize(512);
-
-        KeyPair kp = kGen.generateKeyPair();
-        X509Certificate cert = makeV1Certificate(kp, "CN=Test", kp, "CN=Test");
-
-        JcaCertificateRequestMessageBuilder certReqBuild = new JcaCertificateRequestMessageBuilder(BigInteger.ONE);
-
-        certReqBuild.setPublicKey(kp.getPublic())
-                    .setAuthInfoPKMAC(new PKMACBuilder(new JcePKMACValuesCalculator()), "fred".toCharArray())
-                    .setProofOfPossessionSigningKeySigner(new JcaContentSignerBuilder("SHA1withRSA").setProvider(BC).build(kp.getPrivate()));
-
-        certReqBuild.addControl(new JcaPKIArchiveControlBuilder(kp.getPrivate(), new X500Principal("CN=test"))
-                                      .addRecipientGenerator(new JceKeyTransRecipientInfoGenerator(cert).setProvider(BC))
-                                      .build(new JceCMSContentEncryptorBuilder(new ASN1ObjectIdentifier(CMSEnvelopedDataGenerator.AES128_CBC)).setProvider(BC).build()));
-
-        JcaCertificateRequestMessage certReqMsg = new JcaCertificateRequestMessage(certReqBuild.build().getEncoded());
-
-        // check that internal check on popo signing is working okay
-        try
-        {
-            certReqMsg.isValidSigningKeyPOP(new JcaContentVerifierProviderBuilder().setProvider(BC).build(kp.getPublic()));
-            fail("IllegalStateException not thrown");
-        }
-        catch (IllegalStateException e)
-        {
-            // ignore
-        }
-
-        assertTrue(certReqMsg.isValidSigningKeyPOP(new JcaContentVerifierProviderBuilder().setProvider(BC).build(kp.getPublic()), new PKMACBuilder(new JcePKMACValuesCalculator().setProvider(BC)), "fred".toCharArray()));
-
-        assertEquals(kp.getPublic(), certReqMsg.getPublicKey());
-    }
-
-    public void testProofOfPossessionWithSender()
-        throws Exception
-    {
-        KeyPairGenerator kGen = KeyPairGenerator.getInstance("RSA", BC);
-
-        kGen.initialize(512);
-
-        KeyPair kp = kGen.generateKeyPair();
-        X509Certificate cert = makeV1Certificate(kp, "CN=Test", kp, "CN=Test");
-
-        JcaCertificateRequestMessageBuilder certReqBuild = new JcaCertificateRequestMessageBuilder(BigInteger.ONE);
-
-        certReqBuild.setPublicKey(kp.getPublic())
-                    .setAuthInfoSender(new X500Principal("CN=Test"))
-                    .setProofOfPossessionSigningKeySigner(new JcaContentSignerBuilder("SHA1withRSA").setProvider(BC).build(kp.getPrivate()));
-
-        certReqBuild.addControl(new JcaPKIArchiveControlBuilder(kp.getPrivate(), new X500Principal("CN=test"))
-                                      .addRecipientGenerator(new JceKeyTransRecipientInfoGenerator(cert).setProvider(BC))
-                                      .build(new JceCMSContentEncryptorBuilder(new ASN1ObjectIdentifier(CMSEnvelopedDataGenerator.AES128_CBC)).setProvider(BC).build()));
-
-        JcaCertificateRequestMessage certReqMsg = new JcaCertificateRequestMessage(certReqBuild.build().getEncoded());
-
-        // check that internal check on popo signing is working okay
-        try
-        {
-            certReqMsg.isValidSigningKeyPOP(new JcaContentVerifierProviderBuilder().setProvider(BC).build(kp.getPublic()), new PKMACBuilder(new JcePKMACValuesCalculator().setProvider(BC)), "fred".toCharArray());
-
-            fail("IllegalStateException not thrown");
-        }
-        catch (IllegalStateException e)
-        {
-            // ignore
-        }
-
-
-        assertTrue(certReqMsg.isValidSigningKeyPOP(new JcaContentVerifierProviderBuilder().setProvider(BC).build(kp.getPublic())));
-
-        assertEquals(kp.getPublic(), certReqMsg.getPublicKey());
-    }
-
-    public void testProofOfPossessionWithTemplate()
-        throws Exception
-    {
-        KeyPairGenerator kGen = KeyPairGenerator.getInstance("RSA", BC);
-
-        kGen.initialize(512);
-
-        KeyPair kp = kGen.generateKeyPair();
-        X509Certificate cert = makeV1Certificate(kp, "CN=Test", kp, "CN=Test");
-
-        JcaCertificateRequestMessageBuilder certReqBuild = new JcaCertificateRequestMessageBuilder(BigInteger.ONE);
-
-        certReqBuild.setPublicKey(kp.getPublic())
-                    .setSubject(new X500Principal("CN=Test"))
-                    .setAuthInfoSender(new X500Principal("CN=Test"))
-                    .setProofOfPossessionSigningKeySigner(new JcaContentSignerBuilder("SHA1withRSA").setProvider(BC).build(kp.getPrivate()));
-
-        certReqBuild.addControl(new JcaPKIArchiveControlBuilder(kp.getPrivate(), new X500Principal("CN=test"))
-                                      .addRecipientGenerator(new JceKeyTransRecipientInfoGenerator(cert).setProvider(BC))
-                                      .build(new JceCMSContentEncryptorBuilder(new ASN1ObjectIdentifier(CMSEnvelopedDataGenerator.AES128_CBC)).setProvider(BC).build()));
-
-        JcaCertificateRequestMessage certReqMsg = new JcaCertificateRequestMessage(certReqBuild.build().getEncoded());
-
-        assertTrue(certReqMsg.isValidSigningKeyPOP(new JcaContentVerifierProviderBuilder().setProvider(BC).build(kp.getPublic())));
-
-        assertEquals(kp.getPublic(), certReqMsg.getPublicKey());
-    }
-
-    public void testEncryptedValue()
-        throws Exception
-    {
-        KeyPairGenerator kGen = KeyPairGenerator.getInstance("RSA", BC);
-
-        kGen.initialize(512);
-
-        KeyPair kp = kGen.generateKeyPair();
-        X509Certificate cert = makeV1Certificate(kp, "CN=Test", kp, "CN=Test");
-
-        JcaEncryptedValueBuilder build = new JcaEncryptedValueBuilder(new JceAsymmetricKeyWrapper(cert.getPublicKey()).setProvider(BC), new JceCRMFEncryptorBuilder(CMSAlgorithm.AES128_CBC).setProvider(BC).build());
-        EncryptedValue value = build.build(cert);
-        ValueDecryptorGenerator decGen = new JceAsymmetricValueDecryptorGenerator(kp.getPrivate()).setProvider(BC);
-
-        // try direct
-        encryptedValueParserTest(value, decGen, cert);
-
-        // try indirect
-        encryptedValueParserTest(EncryptedValue.getInstance(value.getEncoded()), decGen, cert);
-    }
-
-    private void encryptedValueParserTest(EncryptedValue value, ValueDecryptorGenerator decGen, X509Certificate cert)
-        throws Exception
-    {
-        EncryptedValueParser  parser = new EncryptedValueParser(value);
-
-        X509CertificateHolder holder = parser.readCertificateHolder(decGen);
-
-        assertTrue(Arrays.areEqual(cert.getEncoded(), holder.getEncoded()));
-    }
-
-    public void testEncryptedValuePassphrase()
-        throws Exception
-    {
-        char[] passphrase = PASSPHRASE.toCharArray();
-        KeyPairGenerator kGen = KeyPairGenerator.getInstance("RSA", BC);
-
-        kGen.initialize(512);
-
-        KeyPair kp = kGen.generateKeyPair();
-        X509Certificate cert = makeV1Certificate(kp, "CN=Test", kp, "CN=Test");
-
-        EncryptedValueBuilder build = new EncryptedValueBuilder(new JceAsymmetricKeyWrapper(cert.getPublicKey()).setProvider(BC), new JceCRMFEncryptorBuilder(CMSAlgorithm.AES128_CBC).setProvider(BC).build());
-        EncryptedValue value = build.build(passphrase);
-        ValueDecryptorGenerator decGen = new JceAsymmetricValueDecryptorGenerator(kp.getPrivate()).setProvider(BC);
-
-        // try direct
-        encryptedValuePassphraseParserTest(value, null, decGen, cert);
-
-        // try indirect
-        encryptedValuePassphraseParserTest(EncryptedValue.getInstance(value.getEncoded()), null, decGen, cert);
-    }
-
-    public void testEncryptedValuePassphraseWithPadding()
-        throws Exception
-    {
-        char[] passphrase = PASSPHRASE.toCharArray();
-        KeyPairGenerator kGen = KeyPairGenerator.getInstance("RSA", BC);
-
-        kGen.initialize(512);
-
-        KeyPair kp = kGen.generateKeyPair();
-        X509Certificate cert = makeV1Certificate(kp, "CN=Test", kp, "CN=Test");
-
-        BcFixedLengthMGF1Padder mgf1Padder = new BcFixedLengthMGF1Padder(200, new SecureRandom());
-        EncryptedValueBuilder build = new EncryptedValueBuilder(new JceAsymmetricKeyWrapper(cert.getPublicKey()).setProvider(BC), new JceCRMFEncryptorBuilder(CMSAlgorithm.AES128_CBC).setProvider(BC).build(), mgf1Padder);
-        EncryptedValue value = build.build(passphrase);
-        ValueDecryptorGenerator decGen = new JceAsymmetricValueDecryptorGenerator(kp.getPrivate()).setProvider(BC);
-
-        // try direct
-        encryptedValuePassphraseParserTest(value, mgf1Padder, decGen, cert);
-
-        // try indirect
-        encryptedValuePassphraseParserTest(EncryptedValue.getInstance(value.getEncoded()), mgf1Padder, decGen, cert);
-    }
-
-    private void encryptedValuePassphraseParserTest(EncryptedValue value, EncryptedValuePadder padder, ValueDecryptorGenerator decGen, X509Certificate cert)
-        throws Exception
-    {
-        EncryptedValueParser  parser = new EncryptedValueParser(value, padder);
-
-        assertTrue(Arrays.areEqual(PASSPHRASE.toCharArray(), parser.readPassphrase(decGen)));
-    }
-
-    private static X509Certificate makeV1Certificate(KeyPair subKP, String _subDN, KeyPair issKP, String _issDN)
-        throws GeneralSecurityException, IOException, OperatorCreationException
-    {
-
-        PublicKey subPub  = subKP.getPublic();
-        PrivateKey issPriv = issKP.getPrivate();
-        PublicKey  issPub  = issKP.getPublic();
-
-        X509v1CertificateBuilder v1CertGen = new JcaX509v1CertificateBuilder(
-            new X500Name(_issDN),
-            BigInteger.valueOf(System.currentTimeMillis()),
-            new Date(System.currentTimeMillis()),
-            new Date(System.currentTimeMillis() + (1000L * 60 * 60 * 24 * 100)),
-            new X500Name(_subDN),
-            subPub);
-
-        JcaContentSignerBuilder signerBuilder = null;
-
-        if (issPub instanceof RSAPublicKey)
-        {
-            signerBuilder = new JcaContentSignerBuilder("SHA1WithRSA");
-        }
-        else if (issPub.getAlgorithm().equals("DSA"))
-        {
-            signerBuilder = new JcaContentSignerBuilder("SHA1withDSA");
-        }
-        else if (issPub.getAlgorithm().equals("ECDSA"))
-        {
-            signerBuilder = new JcaContentSignerBuilder("SHA1withECDSA");
-        }
-        else if (issPub.getAlgorithm().equals("ECGOST3410"))
-        {
-            signerBuilder = new JcaContentSignerBuilder("GOST3411withECGOST3410");
-        }
-        else
-        {
-            signerBuilder = new JcaContentSignerBuilder("GOST3411WithGOST3410");
-        }
-
-        signerBuilder.setProvider(BC);
-
-        X509Certificate _cert = new JcaX509CertificateConverter().setProvider(BC).getCertificate(v1CertGen.build(signerBuilder.build(issPriv)));
-
-        _cert.checkValidity(new Date());
-        _cert.verify(issPub);
-
-        return _cert;
-    }
-}
\ No newline at end of file
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/dane/DANECertificateFetcher.java b/bcpkix/src/main/java/org/bouncycastle/cert/dane/DANECertificateFetcher.java
deleted file mode 100644
index 7395cdc..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/dane/DANECertificateFetcher.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package org.bouncycastle.cert.dane;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-
-import org.bouncycastle.operator.DigestCalculator;
-
-/**
- * A single shot fetcher for a certificate which will only request the specific DNS record if the
- * DANEEntryFetcher used on construction supports it.
- */
-public class DANECertificateFetcher
-{
-    private final DANEEntryFetcherFactory fetcherFactory;
-    private final DANEEntrySelectorFactory selectorFactory;
-
-    /**
-     * Base constructor.
-     *
-     * @param fetcherFactory the fetcher to use for resolving requests.
-     * @param digestCalculator the digest calculator to use for calculating sub-domains.
-     */
-    public DANECertificateFetcher(DANEEntryFetcherFactory fetcherFactory, DigestCalculator digestCalculator)
-    {
-        this.fetcherFactory = fetcherFactory;
-        this.selectorFactory= new DANEEntrySelectorFactory(digestCalculator);
-    }
-
-    /**
-     * Fetch the certificates associated with the passed in email address if any exists.
-     *
-     * @param emailAddress the email address of interest.
-     * @return a list of X509CertificateHolder objects, or an empty list if none present.
-     * @throws DANEException in case of an underlying DNS or record parsing problem.
-     */
-    public List fetch(String emailAddress)
-        throws DANEException
-    {
-        DANEEntrySelector daneSelector = selectorFactory.createSelector(emailAddress);
-
-        List matches = fetcherFactory.build(daneSelector.getDomainName()).getEntries();
-        List certs = new ArrayList(matches.size());
-
-        for (Iterator it = matches.iterator(); it.hasNext();)
-        {
-            DANEEntry next = (DANEEntry)it.next();
-            if (daneSelector.match(next))
-            {
-                certs.add(next.getCertificate());
-            }
-        }
-
-        return Collections.unmodifiableList(certs);
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/dane/DANEEntry.java b/bcpkix/src/main/java/org/bouncycastle/cert/dane/DANEEntry.java
deleted file mode 100644
index 28b39ff..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/dane/DANEEntry.java
+++ /dev/null
@@ -1,83 +0,0 @@
-package org.bouncycastle.cert.dane;
-
-import java.io.IOException;
-
-import org.bouncycastle.cert.X509CertificateHolder;
-import org.bouncycastle.util.Arrays;
-
-/**
- * Carrier class for a DANE entry.
- */
-public class DANEEntry
-{
-    static final int CERT_USAGE = 0;
-    static final int SELECTOR = 1;
-    static final int MATCHING_TYPE = 2;
-
-    private final String domainName;
-    private final byte[] flags;
-    private final X509CertificateHolder certHolder;
-
-    DANEEntry(String domainName, byte[] flags, X509CertificateHolder certHolder)
-    {
-        this.flags = flags;
-        this.domainName = domainName;
-        this.certHolder = certHolder;
-    }
-
-    public DANEEntry(String domainName, byte[] data)
-        throws IOException
-    {
-        this(domainName, Arrays.copyOfRange(data, 0, 3), new X509CertificateHolder(Arrays.copyOfRange(data, 3, data.length)));
-    }
-
-    public byte[] getFlags()
-    {
-        return Arrays.clone(flags);
-    }
-
-    /**
-     * Return the certificate associated with this entry.
-     *
-     * @return the entry's certificate.
-     */
-    public X509CertificateHolder getCertificate()
-    {
-        return certHolder;
-    }
-
-    public String getDomainName()
-    {
-        return domainName;
-    }
-
-    /**
-     * Return the full data string as it would appear in the DNS record - flags + encoding
-     *
-     * @return byte array representing the full data string.
-     * @throws IOException if there is an issue encoding the certificate inside this entry.
-     */
-    public byte[] getRDATA()
-        throws IOException
-    {
-        byte[] certEnc = certHolder.getEncoded();
-        byte[] data = new byte[flags.length + certEnc.length];
-
-        System.arraycopy(flags, 0, data, 0, flags.length);
-        System.arraycopy(certEnc, 0, data, flags.length, certEnc.length);
-
-        return data;
-    }
-
-    /**
-     * Return true if the byte string has the correct flag bytes to indicate a certificate entry.
-     *
-     * @param data the byte string of interest.
-     * @return true if flags indicate a valid certificate, false otherwise.
-     */
-    public static boolean isValidCertificate(byte[] data)
-    {
-        // TODO: perhaps validate ASN.1 data as well...
-        return (data[CERT_USAGE] == 3 && data[SELECTOR] == 0 && data[MATCHING_TYPE] == 0);
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/dane/DANEEntryFactory.java b/bcpkix/src/main/java/org/bouncycastle/cert/dane/DANEEntryFactory.java
deleted file mode 100644
index 8246594..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/dane/DANEEntryFactory.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package org.bouncycastle.cert.dane;
-
-import org.bouncycastle.cert.X509CertificateHolder;
-import org.bouncycastle.operator.DigestCalculator;
-
-/**
- * Factory class for creating DANEEntry objects.
- */
-public class DANEEntryFactory
-{
-    private final DANEEntrySelectorFactory selectorFactory;
-
-    /**
-     * Base constructor.
-     *
-     * @param digestCalculator a calculator for the message digest to filter email addresses currently SHA-224.
-     */
-    public DANEEntryFactory(DigestCalculator digestCalculator)
-    {
-        this.selectorFactory = new DANEEntrySelectorFactory(digestCalculator);
-    }
-
-    /**
-     * Return a DANEEntry for the passed in email address and certificate.
-     *
-     * @param emailAddress the emails address of interest.
-     * @param certificate the certificate to be associated with the email address.
-     * @throws DANEException in case of issue generating a matching name.
-     */
-    public DANEEntry createEntry(String emailAddress, X509CertificateHolder certificate)
-        throws DANEException
-    {
-        DANEEntrySelector entrySelector = selectorFactory.createSelector(emailAddress);
-        byte[] flags = new byte[3];
-
-        flags[DANEEntry.CERT_USAGE] = 3;
-        flags[DANEEntry.SELECTOR] = 0;
-        flags[DANEEntry.MATCHING_TYPE] = 0;
-
-        return new DANEEntry(entrySelector.getDomainName(), flags, certificate);
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/dane/DANEEntryFetcher.java b/bcpkix/src/main/java/org/bouncycastle/cert/dane/DANEEntryFetcher.java
deleted file mode 100644
index 66dde4a..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/dane/DANEEntryFetcher.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package org.bouncycastle.cert.dane;
-
-import java.util.List;
-
-public interface DANEEntryFetcher
-{
-    List getEntries() throws DANEException;
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/dane/DANEEntryFetcherFactory.java b/bcpkix/src/main/java/org/bouncycastle/cert/dane/DANEEntryFetcherFactory.java
deleted file mode 100644
index 507775b..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/dane/DANEEntryFetcherFactory.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package org.bouncycastle.cert.dane;
-
-/**
- * Factories for DANEEntryFetcher objects should implement this.
- * <p>
- * Note: the fetcher should be able to manage both requests of the form
- * <pre>
- *     fetcher.build("test.org");
- * </pre>
- * and
- * <pre>
- *     91d23d115b68072e7a38afeb7e295bd6392a19f25f8328b4ecae4778._smimecert.test.org
- * </pre>
- * In the case of the later ideally just returning a list containing the single entry.
- * </p>
- */
-public interface DANEEntryFetcherFactory
-{
-    /**
-     * Build an entry fetcher for the specified domain name.
-     *
-     * @param domainName the domain name of interest.
-     * @return a resolver for fetching entry's associated with domainName.
-     */
-    DANEEntryFetcher build(String domainName);
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/dane/DANEEntrySelector.java b/bcpkix/src/main/java/org/bouncycastle/cert/dane/DANEEntrySelector.java
deleted file mode 100644
index 4e96291..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/dane/DANEEntrySelector.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package org.bouncycastle.cert.dane;
-
-import org.bouncycastle.util.Selector;
-
-public class DANEEntrySelector
-    implements Selector
-{
-    private final String domainName;
-
-    DANEEntrySelector(String domainName)
-    {
-        this.domainName = domainName;
-    }
-
-    public boolean match(Object obj)
-    {
-        DANEEntry dEntry = (DANEEntry)obj;
-
-        return dEntry.getDomainName().equals(domainName);
-    }
-
-    public Object clone()
-    {
-        return this;
-    }
-
-    public String getDomainName()
-    {
-        return domainName;
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/dane/DANEEntrySelectorFactory.java b/bcpkix/src/main/java/org/bouncycastle/cert/dane/DANEEntrySelectorFactory.java
deleted file mode 100644
index 267e8d8..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/dane/DANEEntrySelectorFactory.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package org.bouncycastle.cert.dane;
-
-import java.io.IOException;
-import java.io.OutputStream;
-
-import org.bouncycastle.operator.DigestCalculator;
-import org.bouncycastle.util.Strings;
-import org.bouncycastle.util.encoders.Hex;
-
-/**
- * Factory for creating selector objects to use with the DANECertificateStore.
- */
-public class DANEEntrySelectorFactory
-{
-    private final DigestCalculator digestCalculator;
-
-    /**
-     * Base constructor.
-     *
-     * @param digestCalculator a calculator for the message digest to filter email addresses currently SHA-224.
-     */
-    public DANEEntrySelectorFactory(DigestCalculator digestCalculator)
-    {
-        this.digestCalculator = digestCalculator;
-    }
-
-    /**
-     * Create a selector for the passed in email address.
-     * @param emailAddress the emails address of interest.
-     * @throws DANEException in case of issue generating a matching name.
-     */
-    public DANEEntrySelector createSelector(String emailAddress)
-        throws DANEException
-    {
-        final byte[] enc = Strings.toUTF8ByteArray(emailAddress.substring(0, emailAddress.indexOf('@')));
-
-        try
-        {
-            OutputStream cOut = digestCalculator.getOutputStream();
-
-            cOut.write(enc);
-
-            cOut.close();
-        }
-        catch (IOException e)
-        {
-            throw new DANEException("Unable to calculate digest string: " + e.getMessage(), e);
-        }
-
-        byte[] hash = digestCalculator.getDigest();
-
-        final String domainName = Strings.fromByteArray(Hex.encode(hash)) + "._smimecert." + emailAddress.substring(emailAddress.indexOf('@') + 1);
-
-        return new DANEEntrySelector(domainName);
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/dane/DANEEntryStore.java b/bcpkix/src/main/java/org/bouncycastle/cert/dane/DANEEntryStore.java
deleted file mode 100644
index 0d29c80..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/dane/DANEEntryStore.java
+++ /dev/null
@@ -1,87 +0,0 @@
-package org.bouncycastle.cert.dane;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.bouncycastle.util.CollectionStore;
-import org.bouncycastle.util.Selector;
-import org.bouncycastle.util.Store;
-import org.bouncycastle.util.StoreException;
-
-/**
- * Class storing DANEEntry objects.
- */
-public class DANEEntryStore
-    implements Store
-{
-    private final Map entries;
-
-    DANEEntryStore(List entries)
-    {
-        Map entryMap = new HashMap();
-
-         for (Iterator it = entries.iterator(); it.hasNext();)
-         {
-             DANEEntry entry = (DANEEntry)it.next();
-
-             entryMap.put(entry.getDomainName(), entry);
-         }
-
-        this.entries = Collections.unmodifiableMap(entryMap);
-    }
-
-    /**
-     * Return a collection of entries matching the passed in selector.
-     *
-     * @param selector the selector to validate entries against.
-     * @return a possibly empty collection of matched entries.
-     * @throws StoreException in case of an underlying issue.
-     */
-    public Collection getMatches(Selector selector)
-        throws StoreException
-    {
-        if (selector == null)
-        {
-            return entries.values();
-        }
-
-        List results = new ArrayList();
-
-        for (Iterator it = entries.values().iterator(); it.hasNext();)
-        {
-            Object next = it.next();
-            if (selector.match(next))
-            {
-                results.add(next);
-            }
-        }
-
-        return Collections.unmodifiableList(results);
-    }
-
-    /**
-     * Return a Store of X509CertificateHolder objects representing all the certificates associated with
-     * entries in the store.
-     *
-     * @return a Store of X509CertificateHolder.
-     */
-    public Store toCertificateStore()
-    {
-        Collection col = this.getMatches(null);
-        List certColl = new ArrayList(col.size());
-
-        for (Iterator it = col.iterator(); it.hasNext();)
-        {
-            DANEEntry entry = (DANEEntry)it.next();
-
-            certColl.add(entry.getCertificate());
-        }
-
-        return new CollectionStore(certColl);
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/dane/DANEEntryStoreBuilder.java b/bcpkix/src/main/java/org/bouncycastle/cert/dane/DANEEntryStoreBuilder.java
deleted file mode 100644
index 82bcb48..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/dane/DANEEntryStoreBuilder.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package org.bouncycastle.cert.dane;
-
-/**
- * Builder for the DANECertificateStore.
- */
-public class DANEEntryStoreBuilder
-{
-    private final DANEEntryFetcherFactory daneEntryFetcher;
-
-    public DANEEntryStoreBuilder(DANEEntryFetcherFactory daneEntryFetcher)
-    {
-        this.daneEntryFetcher = daneEntryFetcher;
-    }
-
-    /**
-     * Build a DANECertificateStore from the provided domainName details.
-     *
-     * @param domainName the domain name to look up the _smimecert entries in.
-     * @return a Store of DANEEntry representing the _smimecert entries containing certificates.
-     * @throws DANEException in the case of a DNS issue or encoding issue with a DNS record.
-     */
-    public DANEEntryStore build(String domainName)
-        throws DANEException
-    {
-        return new DANEEntryStore(daneEntryFetcher.build(domainName).getEntries());
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/dane/DANEException.java b/bcpkix/src/main/java/org/bouncycastle/cert/dane/DANEException.java
deleted file mode 100644
index 7871fd7..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/dane/DANEException.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package org.bouncycastle.cert.dane;
-
-/**
- * General checked Exception thrown in the DANE package.
- */
-public class DANEException
-    extends Exception
-{
-    private Throwable cause;
-
-    public DANEException(String msg, Throwable cause)
-    {
-        super(msg);
-
-        this.cause = cause;
-    }
-
-    public DANEException(String msg)
-    {
-        super(msg);
-    }
-
-    public Throwable getCause()
-    {
-        return cause;
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/dane/fetcher/JndiDANEFetcherFactory.java b/bcpkix/src/main/java/org/bouncycastle/cert/dane/fetcher/JndiDANEFetcherFactory.java
deleted file mode 100644
index 74e0820..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/dane/fetcher/JndiDANEFetcherFactory.java
+++ /dev/null
@@ -1,172 +0,0 @@
-package org.bouncycastle.cert.dane.fetcher;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.naming.Binding;
-import javax.naming.Context;
-import javax.naming.NamingEnumeration;
-import javax.naming.NamingException;
-import javax.naming.directory.Attribute;
-import javax.naming.directory.Attributes;
-import javax.naming.directory.DirContext;
-import javax.naming.directory.InitialDirContext;
-
-import org.bouncycastle.cert.dane.DANEEntry;
-import org.bouncycastle.cert.dane.DANEEntryFetcher;
-import org.bouncycastle.cert.dane.DANEEntryFetcherFactory;
-import org.bouncycastle.cert.dane.DANEException;
-
-/**
- * A DANE entry fetcher implemented using JNDI.
- */
-public class JndiDANEFetcherFactory
-    implements DANEEntryFetcherFactory
-{
-    private static final String DANE_TYPE = "65500";
-
-    private List dnsServerList = new ArrayList();
-    private boolean isAuthoritative;
-
-    /**
-     * Specify the dnsServer to use.
-     *
-     * @param dnsServer IP address/name of the dns server
-     * @return the current factory.
-     */
-    public JndiDANEFetcherFactory usingDNSServer(String dnsServer)
-    {
-        this.dnsServerList.add(dnsServer);
-
-        return this;
-    }
-
-    /**
-     * Specify requests must be authoritative.
-     *
-     * @param isAuthoritative true if requests must be authoritative, false otherwise.
-     * @return the current factory..
-     */
-    public JndiDANEFetcherFactory setAuthoritative(boolean isAuthoritative)
-    {
-        this.isAuthoritative = isAuthoritative;
-
-        return this;
-    }
-
-    /**
-     * Build an entry fetcher for the specified domain name.
-     *
-     * @param domainName the domain name of interest.
-     * @return a resolver for fetching entry's associated with domainName.
-     */
-    public DANEEntryFetcher build(final String domainName)
-    {
-        final Hashtable env = new Hashtable();
-
-        env.put(Context.INITIAL_CONTEXT_FACTORY, "com.sun.jndi.dns.DnsContextFactory");
-        env.put(Context.AUTHORITATIVE, isAuthoritative ? "true" : "false"); // JDK compatibility
-
-        if (dnsServerList.size() > 0)
-        {
-            StringBuffer dnsServers = new StringBuffer();
-
-            for (Iterator it = dnsServerList.iterator(); it.hasNext(); )
-            {
-                if (dnsServers.length() > 0)
-                {
-                    dnsServers.append(" ");
-                }
-                dnsServers.append("dns://" + it.next());
-            }
-
-            env.put(Context.PROVIDER_URL, dnsServers.toString());
-        }
-
-        return new DANEEntryFetcher()
-        {
-            public List getEntries()
-                throws DANEException
-            {
-                List entries = new ArrayList();
-
-                try
-                {
-                    DirContext ctx = new InitialDirContext(env);
-
-                    NamingEnumeration bindings;
-                    if (domainName.indexOf("_smimecert.") > 0)
-                    {
-                        bindings = ctx.listBindings(domainName);
-
-                        // need to use fully qualified domain name if using named DNS server.
-                        Attributes attrs = ctx.getAttributes(domainName, new String[]{DANE_TYPE});
-                        Attribute smimeAttr = attrs.get(DANE_TYPE);
-
-                        if (smimeAttr != null)
-                        {
-                            byte[] data = (byte[])attrs.get(DANE_TYPE).get();
-
-                            if (DANEEntry.isValidCertificate(data))
-                            {
-                                try
-                                {
-                                    entries.add(new DANEEntry(domainName, data));
-                                }
-                                catch (IOException e)
-                                {
-                                    throw new DANEException("Exception parsing entry: " + e.getMessage(), e);
-                                }
-                            }
-                        }
-                    }
-                    else
-                    {
-                        bindings = ctx.listBindings("_smimecert." + domainName);
-
-                        while (bindings.hasMore())
-                        {
-                            Binding b = (Binding)bindings.next();
-
-                            DirContext sc = (DirContext)b.getObject();
-
-                            String name = sc.getNameInNamespace().substring(1, sc.getNameInNamespace().length() - 1);
-
-                            // need to use fully qualified domain name if using named DNS server.
-                            Attributes attrs = ctx.getAttributes(name, new String[]{DANE_TYPE});
-                            Attribute smimeAttr = attrs.get(DANE_TYPE);
-
-                            if (smimeAttr != null)
-                            {
-                                byte[] data = (byte[])attrs.get(DANE_TYPE).get();
-
-                                if (DANEEntry.isValidCertificate(data))
-                                {
-                                    try
-                                    {
-                                        String fullName = sc.getNameInNamespace();
-
-                                        entries.add(new DANEEntry(fullName.substring(1, fullName.length() - 1), data));
-                                    }
-                                    catch (IOException e)
-                                    {
-                                        throw new DANEException("Exception parsing entry: " + e.getMessage(), e);
-                                    }
-                                }
-                            }
-                        }
-                    }
-                    ;
-                    return entries;
-                }
-                catch (NamingException e)
-                {
-                    throw new DANEException("Exception dealing with DNS: " + e.getMessage(), e);
-                }
-            }
-        };
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/jcajce/CertHelper.java b/bcpkix/src/main/java/org/bouncycastle/cert/jcajce/CertHelper.java
deleted file mode 100644
index dee6996..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/jcajce/CertHelper.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.bouncycastle.cert.jcajce;
-
-import java.security.NoSuchProviderException;
-import java.security.cert.CertificateException;
-import java.security.cert.CertificateFactory;
-
-abstract class CertHelper
-{
-    public CertificateFactory getCertificateFactory(String type)
-        throws NoSuchProviderException, CertificateException
-    {
-        return createCertificateFactory(type);
-    }
-
-    protected abstract CertificateFactory createCertificateFactory(String type)
-        throws CertificateException, NoSuchProviderException;
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/jcajce/DefaultCertHelper.java b/bcpkix/src/main/java/org/bouncycastle/cert/jcajce/DefaultCertHelper.java
deleted file mode 100644
index 3966b49..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/jcajce/DefaultCertHelper.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package org.bouncycastle.cert.jcajce;
-
-import java.security.cert.CertificateException;
-import java.security.cert.CertificateFactory;
-
-class DefaultCertHelper
-    extends CertHelper
-{
-    protected CertificateFactory createCertificateFactory(String type)
-        throws CertificateException
-    {
-        return CertificateFactory.getInstance(type);
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/jcajce/JcaAttrCertStore.java b/bcpkix/src/main/java/org/bouncycastle/cert/jcajce/JcaAttrCertStore.java
deleted file mode 100644
index b857d96..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/jcajce/JcaAttrCertStore.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package org.bouncycastle.cert.jcajce;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-
-import org.bouncycastle.util.CollectionStore;
-import org.bouncycastle.x509.X509AttributeCertificate;
-
-/**
- * Class for storing Attribute Certificates for later lookup.
- * <p>
- * The class will convert X509AttributeCertificate objects into X509AttributeCertificateHolder objects.
- * </p>
- */
-public class JcaAttrCertStore
-    extends CollectionStore
-{
-    /**
-     * Basic constructor.
-     *
-     * @param collection - initial contents for the store, this is copied.
-     */
-    public JcaAttrCertStore(Collection collection)
-        throws IOException
-    {
-        super(convertCerts(collection));
-    }
-
-    public JcaAttrCertStore(X509AttributeCertificate attrCert)
-        throws IOException
-    {
-        this(Collections.singletonList(attrCert));
-    }
-
-    private static Collection convertCerts(Collection collection)
-        throws IOException
-    {
-        List list = new ArrayList(collection.size());
-
-        for (Iterator it = collection.iterator(); it.hasNext();)
-        {
-            Object o = it.next();
-
-            if (o instanceof X509AttributeCertificate)
-            {
-                X509AttributeCertificate cert = (X509AttributeCertificate)o;
-
-                list.add(new JcaX509AttributeCertificateHolder(cert));
-            }
-            else
-            {
-                list.add(o);
-            }
-        }
-
-        return list;
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/jcajce/JcaAttributeCertificateIssuer.java b/bcpkix/src/main/java/org/bouncycastle/cert/jcajce/JcaAttributeCertificateIssuer.java
deleted file mode 100644
index f5bfa68..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/jcajce/JcaAttributeCertificateIssuer.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package org.bouncycastle.cert.jcajce;
-
-import java.security.cert.X509Certificate;
-
-import javax.security.auth.x500.X500Principal;
-
-import org.bouncycastle.asn1.x500.X500Name;
-import org.bouncycastle.cert.AttributeCertificateIssuer;
-
-public class JcaAttributeCertificateIssuer
-    extends AttributeCertificateIssuer
-{
-    /**
-     * Base constructor.
-     *
-     * @param issuerCert certificate for the issuer of the attribute certificate.
-     */
-    public JcaAttributeCertificateIssuer(X509Certificate issuerCert)
-    {
-        this(issuerCert.getIssuerX500Principal());
-    }
-
-    /**
-     * Base constructor.
-     *
-     * @param issuerDN X.500 DN for the issuer of the attribute certificate.
-     */
-    public JcaAttributeCertificateIssuer(X500Principal issuerDN)
-    {
-        super(X500Name.getInstance(issuerDN.getEncoded()));
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/jcajce/JcaCRLStore.java b/bcpkix/src/main/java/org/bouncycastle/cert/jcajce/JcaCRLStore.java
deleted file mode 100644
index 2e8209e..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/jcajce/JcaCRLStore.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package org.bouncycastle.cert.jcajce;
-
-import java.io.IOException;
-import java.security.cert.CRLException;
-import java.security.cert.X509CRL;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
-import org.bouncycastle.cert.X509CRLHolder;
-import org.bouncycastle.util.CollectionStore;
-
-/**
- * Class for storing CRLs for later lookup.
- * <p>
- * The class will convert X509CRL objects into X509CRLHolder objects.
- * </p>
- */
-public class JcaCRLStore
-    extends CollectionStore
-{
-    /**
-     * Basic constructor.
-     *
-     * @param collection - initial contents for the store, this is copied.
-     */
-    public JcaCRLStore(Collection collection)
-        throws CRLException
-    {
-        super(convertCRLs(collection));
-    }
-
-    private static Collection convertCRLs(Collection collection)
-        throws CRLException
-    {
-        List list = new ArrayList(collection.size());
-
-        for (Iterator it = collection.iterator(); it.hasNext();)
-        {
-            Object crl = it.next();
-
-            if (crl instanceof X509CRL)
-            {
-                try
-                {
-                    list.add(new X509CRLHolder(((X509CRL)crl).getEncoded()));
-                }
-                catch (IOException e)
-                {
-                    throw new CRLException("cannot read encoding: " + e.getMessage());
-                    
-                }
-            }
-            else
-            {
-                list.add((X509CRLHolder)crl);
-            }
-        }
-
-        return list;
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/jcajce/JcaCertStoreBuilder.java b/bcpkix/src/main/java/org/bouncycastle/cert/jcajce/JcaCertStoreBuilder.java
deleted file mode 100644
index 3051a45..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/jcajce/JcaCertStoreBuilder.java
+++ /dev/null
@@ -1,148 +0,0 @@
-package org.bouncycastle.cert.jcajce;
-
-import java.security.GeneralSecurityException;
-import java.security.Provider;
-import java.security.cert.CRLException;
-import java.security.cert.CertStore;
-import java.security.cert.CertificateException;
-import java.security.cert.CollectionCertStoreParameters;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.bouncycastle.cert.X509CRLHolder;
-import org.bouncycastle.cert.X509CertificateHolder;
-import org.bouncycastle.util.Store;
-
-/**
- * Builder to create a CertStore from certificate and CRL stores.
- */
-public class JcaCertStoreBuilder
-{
-    private List certs = new ArrayList();
-    private List crls = new ArrayList();
-    private Object provider;
-    private JcaX509CertificateConverter certificateConverter = new JcaX509CertificateConverter();
-    private JcaX509CRLConverter crlConverter = new JcaX509CRLConverter();
-    private String type = "Collection";
-
-    /**
-     *  Add a store full of X509CertificateHolder objects.
-     *
-     * @param certStore a store of X509CertificateHolder objects.
-     */
-    public JcaCertStoreBuilder addCertificates(Store certStore)
-    {
-        certs.addAll(certStore.getMatches(null));
-
-        return this;
-    }
-
-    /**
-     * Add a single certificate.
-     *
-     * @param cert  the X509 certificate holder containing the certificate.
-     */
-    public JcaCertStoreBuilder addCertificate(X509CertificateHolder cert)
-    {
-        certs.add(cert);
-
-        return this;
-    }
-
-    /**
-     * Add a store full of X509CRLHolder objects.
-     * @param crlStore  a store of X509CRLHolder objects.
-     */
-    public JcaCertStoreBuilder addCRLs(Store crlStore)
-    {
-        crls.addAll(crlStore.getMatches(null));
-
-        return this;
-    }
-
-    /**
-     * Add a single CRL.
-     *
-     * @param crl  the X509 CRL holder containing the CRL.
-     */
-    public JcaCertStoreBuilder addCRL(X509CRLHolder crl)
-    {
-        crls.add(crl);
-
-        return this;
-    }
-
-    public JcaCertStoreBuilder setProvider(String providerName)
-    {
-        certificateConverter.setProvider(providerName);
-        crlConverter.setProvider(providerName);
-        this.provider = providerName;
-
-        return this;
-    }
-
-    public JcaCertStoreBuilder setProvider(Provider provider)
-    {
-        certificateConverter.setProvider(provider);
-        crlConverter.setProvider(provider);
-        this.provider = provider;
-
-        return this;
-    }
-
-    /**
-     * Set the type of the CertStore generated. By default it is "Collection".
-     *
-     * @param type type of CertStore passed to CertStore.getInstance().
-     * @return the current builder.
-     */
-    public JcaCertStoreBuilder setType(String type)
-    {
-        this.type = type;
-
-        return this;
-    }
-
-    /**
-     * Build the CertStore from the current inputs.
-     *
-     * @return  a CertStore.
-     * @throws GeneralSecurityException
-     */
-    public CertStore build()
-        throws GeneralSecurityException
-    {
-        CollectionCertStoreParameters params = convertHolders(certificateConverter, crlConverter);
-
-        if (provider instanceof String)
-        {
-            return CertStore.getInstance(type, params, (String)provider);
-        }
-
-        if (provider instanceof Provider)
-        {
-            return CertStore.getInstance(type, params, (Provider)provider);
-        }
-
-        return CertStore.getInstance(type, params);
-    }
-
-    private CollectionCertStoreParameters convertHolders(JcaX509CertificateConverter certificateConverter, JcaX509CRLConverter crlConverter)
-        throws CertificateException, CRLException
-    {
-        List jcaObjs = new ArrayList(certs.size() + crls.size());
-
-        for (Iterator it = certs.iterator(); it.hasNext();)
-        {
-            jcaObjs.add(certificateConverter.getCertificate((X509CertificateHolder)it.next()));
-        }
-
-        for (Iterator it = crls.iterator(); it.hasNext();)
-        {
-            jcaObjs.add(crlConverter.getCRL((X509CRLHolder)it.next()));
-        }
-
-        return new CollectionCertStoreParameters(jcaObjs);
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/jcajce/JcaX500NameUtil.java b/bcpkix/src/main/java/org/bouncycastle/cert/jcajce/JcaX500NameUtil.java
deleted file mode 100644
index 2b64340..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/jcajce/JcaX500NameUtil.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package org.bouncycastle.cert.jcajce;
-
-import java.security.cert.X509Certificate;
-
-import org.bouncycastle.asn1.x500.X500Name;
-import org.bouncycastle.asn1.x500.X500NameStyle;
-
-public class JcaX500NameUtil
-{
-    public static X500Name getIssuer(X509Certificate certificate)
-    {
-        return X500Name.getInstance(certificate.getIssuerX500Principal().getEncoded());
-    }
-
-    public static X500Name getSubject(X509Certificate certificate)
-    {
-        return X500Name.getInstance(certificate.getSubjectX500Principal().getEncoded());
-    }
-
-    public static X500Name getIssuer(X500NameStyle style, X509Certificate certificate)
-    {
-        return X500Name.getInstance(style, certificate.getIssuerX500Principal().getEncoded());
-    }
-
-    public static X500Name getSubject(X500NameStyle style, X509Certificate certificate)
-    {
-        return X500Name.getInstance(style, certificate.getSubjectX500Principal().getEncoded());
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/jcajce/JcaX509AttributeCertificateHolder.java b/bcpkix/src/main/java/org/bouncycastle/cert/jcajce/JcaX509AttributeCertificateHolder.java
deleted file mode 100644
index 1ceafce..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/jcajce/JcaX509AttributeCertificateHolder.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package org.bouncycastle.cert.jcajce;
-
-import java.io.IOException;
-
-import org.bouncycastle.asn1.x509.AttributeCertificate;
-import org.bouncycastle.cert.X509AttributeCertificateHolder;
-import org.bouncycastle.x509.X509AttributeCertificate;
-
-/**
- * JCA helper class for converting an old style X509AttributeCertificate into a X509AttributeCertificateHolder object.
- */
-public class JcaX509AttributeCertificateHolder
-    extends X509AttributeCertificateHolder
-{
-    /**
-     * Base constructor.
-     *
-     * @param cert AttributeCertificate to be used a the source for the holder creation.
-     * @throws IOException if there is a problem extracting the attribute certificate information.
-     */
-    public JcaX509AttributeCertificateHolder(X509AttributeCertificate cert)
-        throws IOException
-    {
-        super(AttributeCertificate.getInstance(cert.getEncoded()));
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/jcajce/JcaX509CRLConverter.java b/bcpkix/src/main/java/org/bouncycastle/cert/jcajce/JcaX509CRLConverter.java
deleted file mode 100644
index ae06334..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/jcajce/JcaX509CRLConverter.java
+++ /dev/null
@@ -1,103 +0,0 @@
-package org.bouncycastle.cert.jcajce;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.security.NoSuchProviderException;
-import java.security.Provider;
-import java.security.cert.CRLException;
-import java.security.cert.CertificateException;
-import java.security.cert.CertificateFactory;
-import java.security.cert.X509CRL;
-
-import org.bouncycastle.cert.X509CRLHolder;
-
-/**
- * Class for converting an X509CRLHolder into a corresponding X509CRL object tied to a
- * particular JCA provider.
- */
-public class JcaX509CRLConverter
-{
-    private CertHelper helper = new DefaultCertHelper();
-
-    /**
-     * Base constructor, configure with the default provider.
-     */
-    public JcaX509CRLConverter()
-    {
-        this.helper = new DefaultCertHelper();
-    }
-
-    /**
-     * Set the provider to use from a Provider object.
-     *
-     * @param provider the provider to use.
-     * @return the converter instance.
-     */
-    public JcaX509CRLConverter setProvider(Provider provider)
-    {
-        this.helper = new ProviderCertHelper(provider);
-
-        return this;
-    }
-
-    /**
-     * Set the provider to use by name.
-     *
-     * @param providerName name of the provider to use.
-     * @return the converter instance.
-     */
-    public JcaX509CRLConverter setProvider(String providerName)
-    {
-        this.helper = new NamedCertHelper(providerName);
-
-        return this;
-    }
-
-    /**
-     * Use the configured converter to produce a X509CRL object from a X509CRLHolder object.
-     *
-     * @param crlHolder  the holder to be converted
-     * @return a X509CRL object
-     * @throws CRLException if the conversion is unable to be made.
-     */
-    public X509CRL getCRL(X509CRLHolder crlHolder)
-        throws CRLException
-    {
-        try
-        {
-            CertificateFactory cFact = helper.getCertificateFactory("X.509");
-
-            return (X509CRL)cFact.generateCRL(new ByteArrayInputStream(crlHolder.getEncoded()));
-        }
-        catch (IOException e)
-        {
-            throw new ExCRLException("exception parsing certificate: " + e.getMessage(), e);
-        }
-        catch (NoSuchProviderException e)
-        {
-            throw new ExCRLException("cannot find required provider:" + e.getMessage(), e);
-        }
-        catch (CertificateException e)
-        {
-            throw new ExCRLException("cannot create factory: " + e.getMessage(), e);
-        }
-    }
-
-    private class ExCRLException
-        extends CRLException
-    {
-        private Throwable cause;
-
-        public ExCRLException(String msg, Throwable cause)
-        {
-            super(msg);
-
-            this.cause = cause;
-        }
-
-        public Throwable getCause()
-        {
-            return cause;
-        }
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/jcajce/JcaX509CRLHolder.java b/bcpkix/src/main/java/org/bouncycastle/cert/jcajce/JcaX509CRLHolder.java
deleted file mode 100644
index 43665c0..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/jcajce/JcaX509CRLHolder.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package org.bouncycastle.cert.jcajce;
-
-import java.security.cert.CRLException;
-import java.security.cert.X509CRL;
-
-import org.bouncycastle.asn1.x509.CertificateList;
-import org.bouncycastle.cert.X509CRLHolder;
-
-/**
- * JCA helper class for converting an X509CRL into a X509CRLHolder object.
- */
-public class JcaX509CRLHolder
-    extends X509CRLHolder
-{
-    /**
-     * Base constructor.
-     *
-     * @param crl CRL to be used a the source for the holder creation.
-     * @throws CRLException if there is a problem extracting the CRL information.
-     */
-    public JcaX509CRLHolder(X509CRL crl)
-        throws CRLException
-    {
-        super(CertificateList.getInstance(crl.getEncoded()));
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/jcajce/JcaX509CertificateConverter.java b/bcpkix/src/main/java/org/bouncycastle/cert/jcajce/JcaX509CertificateConverter.java
deleted file mode 100644
index 39e63aa..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/jcajce/JcaX509CertificateConverter.java
+++ /dev/null
@@ -1,116 +0,0 @@
-package org.bouncycastle.cert.jcajce;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.security.NoSuchProviderException;
-import java.security.Provider;
-import java.security.cert.CertificateException;
-import java.security.cert.CertificateFactory;
-import java.security.cert.CertificateParsingException;
-import java.security.cert.X509Certificate;
-
-import org.bouncycastle.cert.X509CertificateHolder;
-
-/**
- * Converter for producing X509Certificate objects tied to a specific provider from X509CertificateHolder objects.
- */
-public class JcaX509CertificateConverter
-{
-    private CertHelper helper = new DefaultCertHelper();
-
-    /**
-     * Base constructor, configure with the default provider.
-     */
-    public JcaX509CertificateConverter()
-    {
-        this.helper = new DefaultCertHelper();
-    }
-
-    /**
-     * Set the provider to use from a Provider object.
-     *
-     * @param provider the provider to use.
-     * @return the converter instance.
-     */
-    public JcaX509CertificateConverter setProvider(Provider provider)
-    {
-        this.helper = new ProviderCertHelper(provider);
-
-        return this;
-    }
-
-    /**
-     * Set the provider to use by name.
-     *
-     * @param providerName name of the provider to use.
-     * @return the converter instance.
-     */
-    public JcaX509CertificateConverter setProvider(String providerName)
-    {
-        this.helper = new NamedCertHelper(providerName);
-
-        return this;
-    }
-
-    /**
-     * Use the configured converter to produce a X509Certificate object from a X509CertificateHolder object.
-     *
-     * @param certHolder  the holder to be converted
-     * @return a X509Certificate object
-     * @throws CertificateException if the conversion is unable to be made.
-     */
-    public X509Certificate getCertificate(X509CertificateHolder certHolder)
-        throws CertificateException
-    {
-        try
-        {
-            CertificateFactory cFact = helper.getCertificateFactory("X.509");
-
-            return (X509Certificate)cFact.generateCertificate(new ByteArrayInputStream(certHolder.getEncoded()));
-        }
-        catch (IOException e)
-        {
-            throw new ExCertificateParsingException("exception parsing certificate: " + e.getMessage(), e);
-        }
-        catch (NoSuchProviderException e)
-        {
-            throw new ExCertificateException("cannot find required provider:" + e.getMessage(), e);
-        }
-    }
-
-    private class ExCertificateParsingException
-        extends CertificateParsingException
-    {
-        private Throwable cause;
-
-        public ExCertificateParsingException(String msg, Throwable cause)
-        {
-            super(msg);
-
-            this.cause = cause;
-        }
-
-        public Throwable getCause()
-        {
-            return cause;
-        }
-    }
-    
-    private class ExCertificateException
-        extends CertificateException
-    {
-        private Throwable cause;
-
-        public ExCertificateException(String msg, Throwable cause)
-        {
-            super(msg);
-
-            this.cause = cause;
-        }
-
-        public Throwable getCause()
-        {
-            return cause;
-        }
-    }
-}
\ No newline at end of file
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/jcajce/JcaX509ContentVerifierProviderBuilder.java b/bcpkix/src/main/java/org/bouncycastle/cert/jcajce/JcaX509ContentVerifierProviderBuilder.java
deleted file mode 100644
index 5f4c530..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/jcajce/JcaX509ContentVerifierProviderBuilder.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package org.bouncycastle.cert.jcajce;
-
-import java.security.Provider;
-import java.security.cert.CertificateException;
-
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.bouncycastle.cert.X509CertificateHolder;
-import org.bouncycastle.cert.X509ContentVerifierProviderBuilder;
-import org.bouncycastle.operator.ContentVerifierProvider;
-import org.bouncycastle.operator.OperatorCreationException;
-import org.bouncycastle.operator.jcajce.JcaContentVerifierProviderBuilder;
-
-public class JcaX509ContentVerifierProviderBuilder
-    implements X509ContentVerifierProviderBuilder
-{
-    private JcaContentVerifierProviderBuilder builder = new JcaContentVerifierProviderBuilder();
-
-    public JcaX509ContentVerifierProviderBuilder setProvider(Provider provider)
-    {
-        this.builder.setProvider(provider);
-
-        return this;
-    }
-
-    public JcaX509ContentVerifierProviderBuilder setProvider(String providerName)
-    {
-        this.builder.setProvider(providerName);
-
-        return this;
-    }
-
-    public ContentVerifierProvider build(SubjectPublicKeyInfo validatingKeyInfo)
-        throws OperatorCreationException
-    {
-        return builder.build(validatingKeyInfo);
-    }
-
-    public ContentVerifierProvider build(X509CertificateHolder validatingKeyInfo)
-        throws OperatorCreationException
-    {
-        try
-        {
-            return builder.build(validatingKeyInfo);
-        }
-        catch (CertificateException e)
-        {
-            throw new OperatorCreationException("Unable to process certificate: " + e.getMessage(), e);
-        }
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/jcajce/JcaX509ExtensionUtils.java b/bcpkix/src/main/java/org/bouncycastle/cert/jcajce/JcaX509ExtensionUtils.java
deleted file mode 100644
index 162c94f..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/jcajce/JcaX509ExtensionUtils.java
+++ /dev/null
@@ -1,145 +0,0 @@
-package org.bouncycastle.cert.jcajce;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.math.BigInteger;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-import java.security.PublicKey;
-import java.security.cert.CertificateEncodingException;
-import java.security.cert.X509Certificate;
-
-import javax.security.auth.x500.X500Principal;
-
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.oiw.OIWObjectIdentifiers;
-import org.bouncycastle.asn1.x500.X500Name;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.asn1.x509.AuthorityKeyIdentifier;
-import org.bouncycastle.asn1.x509.GeneralName;
-import org.bouncycastle.asn1.x509.GeneralNames;
-import org.bouncycastle.asn1.x509.SubjectKeyIdentifier;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.bouncycastle.cert.X509ExtensionUtils;
-import org.bouncycastle.operator.DigestCalculator;
-
-public class JcaX509ExtensionUtils
-    extends X509ExtensionUtils
-{
-    /**
-     * Create a utility class pre-configured with a SHA-1 digest calculator based on the
-     * default implementation.
-     *
-     * @throws NoSuchAlgorithmException
-     */
-    public JcaX509ExtensionUtils()
-        throws NoSuchAlgorithmException
-    {
-        super(new SHA1DigestCalculator(MessageDigest.getInstance("SHA1")));
-    }
-
-    public JcaX509ExtensionUtils(DigestCalculator calculator)
-    {
-        super(calculator);
-    }
-
-    public AuthorityKeyIdentifier createAuthorityKeyIdentifier(
-        X509Certificate cert)
-        throws CertificateEncodingException
-    {
-        return super.createAuthorityKeyIdentifier(new JcaX509CertificateHolder(cert));
-    }
-
-    public AuthorityKeyIdentifier createAuthorityKeyIdentifier(
-        PublicKey pubKey)
-    {
-        return super.createAuthorityKeyIdentifier(SubjectPublicKeyInfo.getInstance(pubKey.getEncoded()));
-    }
-
-    public AuthorityKeyIdentifier createAuthorityKeyIdentifier(PublicKey pubKey, X500Principal name, BigInteger serial)
-    {
-        return super.createAuthorityKeyIdentifier(SubjectPublicKeyInfo.getInstance(pubKey.getEncoded()), new GeneralNames(new GeneralName(X500Name.getInstance(name.getEncoded()))), serial);
-    }
-
-    public AuthorityKeyIdentifier createAuthorityKeyIdentifier(PublicKey pubKey, GeneralNames generalNames, BigInteger serial)
-    {
-        return super.createAuthorityKeyIdentifier(SubjectPublicKeyInfo.getInstance(pubKey.getEncoded()), generalNames, serial);
-    }
-
-    /**
-     * Return a RFC 3280 type 1 key identifier. As in:
-     * <pre>
-     * (1) The keyIdentifier is composed of the 160-bit SHA-1 hash of the
-     * value of the BIT STRING subjectPublicKey (excluding the tag,
-     * length, and number of unused bits).
-     * </pre>
-     * @param publicKey the key object containing the key identifier is to be based on.
-     * @return the key identifier.
-     */
-    public SubjectKeyIdentifier createSubjectKeyIdentifier(
-        PublicKey publicKey)
-    {
-        return super.createSubjectKeyIdentifier(SubjectPublicKeyInfo.getInstance(publicKey.getEncoded()));
-    }
-
-    /**
-     * Return a RFC 3280 type 2 key identifier. As in:
-     * <pre>
-     * (2) The keyIdentifier is composed of a four bit type field with
-     * the value 0100 followed by the least significant 60 bits of the
-     * SHA-1 hash of the value of the BIT STRING subjectPublicKey.
-     * </pre>
-     * @param publicKey the key object of interest.
-     * @return the key identifier.
-     */
-    public SubjectKeyIdentifier createTruncatedSubjectKeyIdentifier(PublicKey publicKey)
-    {
-       return super.createSubjectKeyIdentifier(SubjectPublicKeyInfo.getInstance(publicKey.getEncoded()));
-    }
-
-    /**
-     * Return the ASN.1 object contained in a byte[] returned by a getExtensionValue() call.
-     *
-     * @param encExtValue DER encoded OCTET STRING containing the DER encoded extension object.
-     * @return an ASN.1 object
-     * @throws java.io.IOException on a parsing error.
-     */
-    public static ASN1Primitive parseExtensionValue(byte[] encExtValue)
-        throws IOException
-    {
-        return ASN1Primitive.fromByteArray(ASN1OctetString.getInstance(encExtValue).getOctets());
-    }
-
-    private static class SHA1DigestCalculator
-        implements DigestCalculator
-    {
-        private ByteArrayOutputStream bOut = new ByteArrayOutputStream();
-        private MessageDigest digest;
-
-        public SHA1DigestCalculator(MessageDigest digest)
-        {
-            this.digest = digest;
-        }
-
-        public AlgorithmIdentifier getAlgorithmIdentifier()
-        {
-            return new AlgorithmIdentifier(OIWObjectIdentifiers.idSHA1);
-        }
-
-        public OutputStream getOutputStream()
-        {
-            return bOut;
-        }
-
-        public byte[] getDigest()
-        {
-            byte[] bytes = digest.digest(bOut.toByteArray());
-
-            bOut.reset();
-
-            return bytes;
-        }
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/jcajce/JcaX509v1CertificateBuilder.java b/bcpkix/src/main/java/org/bouncycastle/cert/jcajce/JcaX509v1CertificateBuilder.java
deleted file mode 100644
index e453fc7..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/jcajce/JcaX509v1CertificateBuilder.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package org.bouncycastle.cert.jcajce;
-
-import java.math.BigInteger;
-import java.security.PublicKey;
-import java.util.Date;
-
-import javax.security.auth.x500.X500Principal;
-
-import org.bouncycastle.asn1.x500.X500Name;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.bouncycastle.cert.X509v1CertificateBuilder;
-
-/**
- * JCA helper class to allow JCA objects to be used in the construction of a Version 1 certificate.
- */
-public class JcaX509v1CertificateBuilder
-    extends X509v1CertificateBuilder
-{
-    /**
-     * Initialise the builder using a PublicKey.
-     *
-     * @param issuer X500Name representing the issuer of this certificate.
-     * @param serial the serial number for the certificate.
-     * @param notBefore date before which the certificate is not valid.
-     * @param notAfter date after which the certificate is not valid.
-     * @param subject X500Name representing the subject of this certificate.
-     * @param publicKey the public key to be associated with the certificate.
-     */
-    public JcaX509v1CertificateBuilder(X500Name issuer, BigInteger serial, Date notBefore, Date notAfter, X500Name subject, PublicKey publicKey)
-    {
-        super(issuer, serial, notBefore, notAfter, subject, SubjectPublicKeyInfo.getInstance(publicKey.getEncoded()));
-    }
-
-    /**
-     * Initialise the builder using X500Principal objects and a PublicKey.
-     *
-     * @param issuer principal representing the issuer of this certificate.
-     * @param serial the serial number for the certificate.
-     * @param notBefore date before which the certificate is not valid.
-     * @param notAfter date after which the certificate is not valid.
-     * @param subject principal representing the subject of this certificate.
-     * @param publicKey the public key to be associated with the certificate.
-     */
-    public JcaX509v1CertificateBuilder(X500Principal issuer, BigInteger serial, Date notBefore, Date notAfter, X500Principal subject, PublicKey publicKey)
-    {
-        super(X500Name.getInstance(issuer.getEncoded()), serial, notBefore, notAfter, X500Name.getInstance(subject.getEncoded()), SubjectPublicKeyInfo.getInstance(publicKey.getEncoded()));
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/jcajce/JcaX509v2CRLBuilder.java b/bcpkix/src/main/java/org/bouncycastle/cert/jcajce/JcaX509v2CRLBuilder.java
deleted file mode 100644
index 43c3918..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/jcajce/JcaX509v2CRLBuilder.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package org.bouncycastle.cert.jcajce;
-
-import java.security.cert.X509Certificate;
-import java.util.Date;
-
-import javax.security.auth.x500.X500Principal;
-
-import org.bouncycastle.asn1.x500.X500Name;
-import org.bouncycastle.cert.X509v2CRLBuilder;
-
-public class JcaX509v2CRLBuilder
-    extends X509v2CRLBuilder
-{
-    public JcaX509v2CRLBuilder(X500Principal issuer, Date now)
-    {
-        super(X500Name.getInstance(issuer.getEncoded()), now);
-    }
-
-    public JcaX509v2CRLBuilder(X509Certificate issuerCert, Date now)
-    {
-        this(issuerCert.getSubjectX500Principal(), now);
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/jcajce/JcaX509v3CertificateBuilder.java b/bcpkix/src/main/java/org/bouncycastle/cert/jcajce/JcaX509v3CertificateBuilder.java
deleted file mode 100644
index ae33009..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/jcajce/JcaX509v3CertificateBuilder.java
+++ /dev/null
@@ -1,119 +0,0 @@
-package org.bouncycastle.cert.jcajce;
-
-import java.math.BigInteger;
-import java.security.PublicKey;
-import java.security.cert.CertificateEncodingException;
-import java.security.cert.X509Certificate;
-import java.util.Date;
-
-import javax.security.auth.x500.X500Principal;
-
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.x500.X500Name;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.bouncycastle.asn1.x509.Time;
-import org.bouncycastle.cert.X509v3CertificateBuilder;
-
-/**
- * JCA helper class to allow JCA objects to be used in the construction of a Version 3 certificate.
- */
-public class JcaX509v3CertificateBuilder
-    extends X509v3CertificateBuilder
-{
-    /**
-     * Initialise the builder using a PublicKey.
-     *
-     * @param issuer X500Name representing the issuer of this certificate.
-     * @param serial the serial number for the certificate.
-     * @param notBefore date before which the certificate is not valid.
-     * @param notAfter date after which the certificate is not valid.
-     * @param subject X500Name representing the subject of this certificate.
-     * @param publicKey the public key to be associated with the certificate.
-     */
-    public JcaX509v3CertificateBuilder(X500Name issuer, BigInteger serial, Date notBefore, Date notAfter, X500Name subject, PublicKey publicKey)
-    {
-        super(issuer, serial, notBefore, notAfter, subject, SubjectPublicKeyInfo.getInstance(publicKey.getEncoded()));
-    }
-
-    /**
-     * Initialise the builder using a PublicKey.
-     *
-     * @param issuer X500Name representing the issuer of this certificate.
-     * @param serial the serial number for the certificate.
-     * @param notBefore Time before which the certificate is not valid.
-     * @param notAfter Time after which the certificate is not valid.
-     * @param subject X500Name representing the subject of this certificate.
-     * @param publicKey the public key to be associated with the certificate.
-     */
-    public JcaX509v3CertificateBuilder(X500Name issuer, BigInteger serial, Time notBefore, Time notAfter, X500Name subject, PublicKey publicKey)
-    {
-        super(issuer, serial, notBefore, notAfter, subject, SubjectPublicKeyInfo.getInstance(publicKey.getEncoded()));
-    }
-
-    /**
-     * Initialise the builder using X500Principal objects and a PublicKey.
-     *
-     * @param issuer principal representing the issuer of this certificate.
-     * @param serial the serial number for the certificate.
-     * @param notBefore date before which the certificate is not valid.
-     * @param notAfter date after which the certificate is not valid.
-     * @param subject principal representing the subject of this certificate.
-     * @param publicKey the public key to be associated with the certificate.
-     */
-    public JcaX509v3CertificateBuilder(X500Principal issuer, BigInteger serial, Date notBefore, Date notAfter, X500Principal subject, PublicKey publicKey)
-    {
-        super(X500Name.getInstance(issuer.getEncoded()), serial, notBefore, notAfter, X500Name.getInstance(subject.getEncoded()), SubjectPublicKeyInfo.getInstance(publicKey.getEncoded()));
-    }
-
-    /**
-     * Initialise the builder using the subject from the passed in issuerCert as the issuer, as well as
-     * passing through and converting the other objects provided.
-     *
-     * @param issuerCert certificate who's subject is the issuer of the certificate we are building.
-     * @param serial the serial number for the certificate.
-     * @param notBefore date before which the certificate is not valid.
-     * @param notAfter date after which the certificate is not valid.
-     * @param subject principal representing the subject of this certificate.
-     * @param publicKey the public key to be associated with the certificate.
-     */
-    public JcaX509v3CertificateBuilder(X509Certificate issuerCert, BigInteger serial, Date notBefore, Date notAfter, X500Principal subject, PublicKey publicKey)
-    {
-        this(issuerCert.getSubjectX500Principal(), serial, notBefore, notAfter, subject, publicKey);
-    }
-
-    /**
-     * Initialise the builder using the subject from the passed in issuerCert as the issuer, as well as
-     * passing through and converting the other objects provided.
-     *
-     * @param issuerCert certificate who's subject is the issuer of the certificate we are building.
-     * @param serial the serial number for the certificate.
-     * @param notBefore date before which the certificate is not valid.
-     * @param notAfter date after which the certificate is not valid.
-     * @param subject principal representing the subject of this certificate.
-     * @param publicKey the public key to be associated with the certificate.
-     */
-    public JcaX509v3CertificateBuilder(X509Certificate issuerCert, BigInteger serial, Date notBefore, Date notAfter, X500Name subject, PublicKey publicKey)
-    {
-        this(X500Name.getInstance(issuerCert.getSubjectX500Principal().getEncoded()), serial, notBefore, notAfter, subject, publicKey);
-    }
-
-    /**
-     * Add a given extension field for the standard extensions tag (tag 3)
-     * copying the extension value from another certificate.
-     *
-     * @param oid the type of the extension to be copied.
-     * @param critical true if the extension is to be marked critical, false otherwise.
-     * @param certificate the source of the extension to be copied.
-     * @return the builder instance.
-     */
-    public JcaX509v3CertificateBuilder copyAndAddExtension(
-        ASN1ObjectIdentifier oid,
-        boolean critical,
-        X509Certificate certificate)
-        throws CertificateEncodingException
-    {
-        this.copyAndAddExtension(oid, critical, new JcaX509CertificateHolder(certificate));
-
-        return this;
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/jcajce/NamedCertHelper.java b/bcpkix/src/main/java/org/bouncycastle/cert/jcajce/NamedCertHelper.java
deleted file mode 100644
index 5cd2feb..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/jcajce/NamedCertHelper.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package org.bouncycastle.cert.jcajce;
-
-import java.security.NoSuchProviderException;
-import java.security.cert.CertificateException;
-import java.security.cert.CertificateFactory;
-
-class NamedCertHelper
-    extends CertHelper
-{
-    private final String providerName;
-
-    NamedCertHelper(String providerName)
-    {
-        this.providerName = providerName;
-    }
-
-    protected CertificateFactory createCertificateFactory(String type)
-        throws CertificateException, NoSuchProviderException
-    {
-        return CertificateFactory.getInstance(type, providerName);
-    }
-}
\ No newline at end of file
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/jcajce/ProviderCertHelper.java b/bcpkix/src/main/java/org/bouncycastle/cert/jcajce/ProviderCertHelper.java
deleted file mode 100644
index 15c9e72..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/jcajce/ProviderCertHelper.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package org.bouncycastle.cert.jcajce;
-
-import java.security.Provider;
-import java.security.cert.CertificateException;
-import java.security.cert.CertificateFactory;
-
-class ProviderCertHelper
-    extends CertHelper
-{
-    private final Provider provider;
-
-    ProviderCertHelper(Provider provider)
-    {
-        this.provider = provider;
-    }
-
-    protected CertificateFactory createCertificateFactory(String type)
-        throws CertificateException
-    {
-        return CertificateFactory.getInstance(type, provider);
-    }
-}
\ No newline at end of file
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/jcajce/package.html b/bcpkix/src/main/java/org/bouncycastle/cert/jcajce/package.html
deleted file mode 100644
index cc15e01..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/jcajce/package.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-        "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<body bgcolor="#ffffff">
-JCA extensions to the certificate building and processing package.
-</body>
-</html>
\ No newline at end of file
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/ocsp/BasicOCSPResp.java b/bcpkix/src/main/java/org/bouncycastle/cert/ocsp/BasicOCSPResp.java
deleted file mode 100644
index 7a03870..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/ocsp/BasicOCSPResp.java
+++ /dev/null
@@ -1,225 +0,0 @@
-package org.bouncycastle.cert.ocsp;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.Date;
-import java.util.List;
-import java.util.Set;
-
-import org.bouncycastle.asn1.ASN1Encoding;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.ocsp.BasicOCSPResponse;
-import org.bouncycastle.asn1.ocsp.ResponseData;
-import org.bouncycastle.asn1.ocsp.SingleResponse;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.asn1.x509.Certificate;
-import org.bouncycastle.asn1.x509.Extension;
-import org.bouncycastle.asn1.x509.Extensions;
-import org.bouncycastle.cert.X509CertificateHolder;
-import org.bouncycastle.operator.ContentVerifier;
-import org.bouncycastle.operator.ContentVerifierProvider;
-import org.bouncycastle.util.Encodable;
-
-/**
- * <pre>
- * BasicOCSPResponse       ::= SEQUENCE {
- *    tbsResponseData      ResponseData,
- *    signatureAlgorithm   AlgorithmIdentifier,
- *    signature            BIT STRING,
- *    certs                [0] EXPLICIT SEQUENCE OF Certificate OPTIONAL }
- * </pre>
- */
-public class BasicOCSPResp
-    implements Encodable
-{
-    private BasicOCSPResponse   resp;
-    private ResponseData        data;
-    private Extensions extensions;
-
-    public BasicOCSPResp(
-        BasicOCSPResponse   resp)
-    {
-        this.resp = resp;
-        this.data = resp.getTbsResponseData();
-        this.extensions = Extensions.getInstance(resp.getTbsResponseData().getResponseExtensions());
-    }
-
-    /**
-     * Return the DER encoding of the tbsResponseData field.
-     * @return DER encoding of tbsResponseData
-     */
-    public byte[] getTBSResponseData()
-    {
-        try
-        {
-            return resp.getTbsResponseData().getEncoded(ASN1Encoding.DER);
-        }
-        catch (IOException e)
-        {
-            return null;
-        }
-    }
-
-    /**
-     * Return the algorithm identifier describing the signature used in the response.
-     *
-     * @return an AlgorithmIdentifier
-     */
-    public AlgorithmIdentifier getSignatureAlgorithmID()
-    {
-        return resp.getSignatureAlgorithm();
-    }
-
-    public int getVersion()
-    {
-        return data.getVersion().getValue().intValue() + 1;
-    }
-
-    public RespID getResponderId()
-    {
-        return new RespID(data.getResponderID());
-    }
-
-    public Date getProducedAt()
-    {
-        return OCSPUtils.extractDate(data.getProducedAt());
-    }
-
-    public SingleResp[] getResponses()
-    {
-        ASN1Sequence    s = data.getResponses();
-        SingleResp[]    rs = new SingleResp[s.size()];
-
-        for (int i = 0; i != rs.length; i++)
-        {
-            rs[i] = new SingleResp(SingleResponse.getInstance(s.getObjectAt(i)));
-        }
-
-        return rs;
-    }
-
-    public boolean hasExtensions()
-   {
-       return extensions != null;
-   }
-
-   public Extension getExtension(ASN1ObjectIdentifier oid)
-   {
-       if (extensions != null)
-       {
-           return extensions.getExtension(oid);
-       }
-
-       return null;
-   }
-
-   public List getExtensionOIDs()
-   {
-       return OCSPUtils.getExtensionOIDs(extensions);
-   }
-
-   public Set getCriticalExtensionOIDs()
-   {
-       return OCSPUtils.getCriticalExtensionOIDs(extensions);
-   }
-
-   public Set getNonCriticalExtensionOIDs()
-   {
-       return OCSPUtils.getNonCriticalExtensionOIDs(extensions);
-   }
-
-
-    public ASN1ObjectIdentifier getSignatureAlgOID()
-    {
-        return resp.getSignatureAlgorithm().getAlgorithm();
-    }
-
-    public byte[] getSignature()
-    {
-        return resp.getSignature().getBytes();
-    }
-
-    public X509CertificateHolder[] getCerts()
-    {
-        //
-        // load the certificates if we have any
-        //
-        if (resp.getCerts() != null)
-        {
-            ASN1Sequence s = resp.getCerts();
-
-            if (s != null)
-            {
-                X509CertificateHolder[] certs = new X509CertificateHolder[s.size()];
-
-                for (int i = 0; i != certs.length; i++)
-                {
-                    certs[i] = new X509CertificateHolder(Certificate.getInstance(s.getObjectAt(i)));
-                }
-
-                return certs;
-            }
-
-            return OCSPUtils.EMPTY_CERTS;
-        }
-        else
-        {
-            return OCSPUtils.EMPTY_CERTS;
-        }
-    }
-
-    /**
-     * verify the signature against the tbsResponseData object we contain.
-     */
-    public boolean isSignatureValid(
-        ContentVerifierProvider verifierProvider)
-        throws OCSPException
-    {
-        try
-        {
-            ContentVerifier verifier = verifierProvider.get(resp.getSignatureAlgorithm());
-            OutputStream vOut = verifier.getOutputStream();
-
-            vOut.write(resp.getTbsResponseData().getEncoded(ASN1Encoding.DER));
-            vOut.close();
-
-            return verifier.verify(this.getSignature());
-        }
-        catch (Exception e)
-        {
-            throw new OCSPException("exception processing sig: " + e, e);
-        }
-    }
-
-    /**
-     * return the ASN.1 encoded representation of this object.
-     */
-    public byte[] getEncoded()
-        throws IOException
-    {
-        return resp.getEncoded();
-    }
-    
-    public boolean equals(Object o)
-    {
-        if (o == this)
-        {
-            return true;
-        }
-        
-        if (!(o instanceof BasicOCSPResp))
-        {
-            return false;
-        }
-        
-        BasicOCSPResp r = (BasicOCSPResp)o;
-        
-        return resp.equals(r.resp);
-    }
-    
-    public int hashCode()
-    {
-        return resp.hashCode();
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/ocsp/BasicOCSPRespBuilder.java b/bcpkix/src/main/java/org/bouncycastle/cert/ocsp/BasicOCSPRespBuilder.java
deleted file mode 100644
index d06dcfc..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/ocsp/BasicOCSPRespBuilder.java
+++ /dev/null
@@ -1,264 +0,0 @@
-package org.bouncycastle.cert.ocsp;
-
-import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.List;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Encoding;
-import org.bouncycastle.asn1.ASN1GeneralizedTime;
-import org.bouncycastle.asn1.DERBitString;
-import org.bouncycastle.asn1.DERGeneralizedTime;
-import org.bouncycastle.asn1.DERNull;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.ocsp.BasicOCSPResponse;
-import org.bouncycastle.asn1.ocsp.CertStatus;
-import org.bouncycastle.asn1.ocsp.ResponseData;
-import org.bouncycastle.asn1.ocsp.RevokedInfo;
-import org.bouncycastle.asn1.ocsp.SingleResponse;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.asn1.x509.CRLReason;
-import org.bouncycastle.asn1.x509.Extensions;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.bouncycastle.cert.X509CertificateHolder;
-import org.bouncycastle.operator.ContentSigner;
-import org.bouncycastle.operator.DigestCalculator;
-
-/**
- * Generator for basic OCSP response objects.
- */
-public class BasicOCSPRespBuilder
-{
-    private List            list = new ArrayList();
-    private Extensions  responseExtensions = null;
-    private RespID          responderID;
-
-    private class ResponseObject
-    {
-        CertificateID         certId;
-        CertStatus            certStatus;
-        ASN1GeneralizedTime   thisUpdate;
-        ASN1GeneralizedTime   nextUpdate;
-        Extensions        extensions;
-
-        public ResponseObject(
-            CertificateID     certId,
-            CertificateStatus certStatus,
-            Date              thisUpdate,
-            Date              nextUpdate,
-            Extensions    extensions)
-        {
-            this.certId = certId;
-
-            if (certStatus == null)
-            {
-                this.certStatus = new CertStatus();
-            }
-            else if (certStatus instanceof UnknownStatus)
-            {
-                this.certStatus = new CertStatus(2, DERNull.INSTANCE);
-            }
-            else
-            {
-                RevokedStatus rs = (RevokedStatus)certStatus;
-
-                if (rs.hasRevocationReason())
-                {
-                    this.certStatus = new CertStatus(
-                                            new RevokedInfo(new ASN1GeneralizedTime(rs.getRevocationTime()), CRLReason.lookup(rs.getRevocationReason())));
-                }
-                else
-                {
-                    this.certStatus = new CertStatus(
-                                            new RevokedInfo(new ASN1GeneralizedTime(rs.getRevocationTime()), null));
-                }
-            }
-
-            this.thisUpdate = new DERGeneralizedTime(thisUpdate);
-
-            if (nextUpdate != null)
-            {
-                this.nextUpdate = new DERGeneralizedTime(nextUpdate);
-            }
-            else
-            {
-                this.nextUpdate = null;
-            }
-
-            this.extensions = extensions;
-        }
-
-        public SingleResponse toResponse()
-            throws Exception
-        {
-            return new SingleResponse(certId.toASN1Object(), certStatus, thisUpdate, nextUpdate, extensions);
-        }
-    }
-
-    /**
-     * basic constructor
-     */
-    public BasicOCSPRespBuilder(
-        RespID  responderID)
-    {
-        this.responderID = responderID;
-    }
-
-    /**
-     * construct with the responderID to be the SHA-1 keyHash of the passed in public key.
-     *
-     * @param key the key info of the responder public key.
-     * @param digCalc  a SHA-1 digest calculator
-     */
-    public BasicOCSPRespBuilder(
-        SubjectPublicKeyInfo key,
-        DigestCalculator     digCalc)
-        throws OCSPException
-    {
-        this.responderID = new RespID(key, digCalc);
-    }
-
-    /**
-     * Add a response for a particular Certificate ID.
-     * 
-     * @param certID certificate ID details
-     * @param certStatus status of the certificate - null if okay
-     */
-    public BasicOCSPRespBuilder addResponse(
-        CertificateID       certID,
-        CertificateStatus   certStatus)
-    {
-        list.add(new ResponseObject(certID, certStatus, new Date(), null, null));
-
-        return this;
-    }
-
-    /**
-     * Add a response for a particular Certificate ID.
-     * 
-     * @param certID certificate ID details
-     * @param certStatus status of the certificate - null if okay
-     * @param singleExtensions optional extensions
-     */
-    public BasicOCSPRespBuilder addResponse(
-        CertificateID       certID,
-        CertificateStatus   certStatus,
-        Extensions      singleExtensions)
-    {
-        list.add(new ResponseObject(certID, certStatus, new Date(), null, singleExtensions));
-
-        return this;
-    }
-    
-    /**
-     * Add a response for a particular Certificate ID.
-     * 
-     * @param certID certificate ID details
-     * @param nextUpdate date when next update should be requested
-     * @param certStatus status of the certificate - null if okay
-     * @param singleExtensions optional extensions
-     */
-    public BasicOCSPRespBuilder addResponse(
-        CertificateID       certID,
-        CertificateStatus   certStatus,
-        Date                nextUpdate,
-        Extensions      singleExtensions)
-    {
-        list.add(new ResponseObject(certID, certStatus, new Date(), nextUpdate, singleExtensions));
-
-        return this;
-    }
-    
-    /**
-     * Add a response for a particular Certificate ID.
-     * 
-     * @param certID certificate ID details
-     * @param thisUpdate date this response was valid on
-     * @param nextUpdate date when next update should be requested
-     * @param certStatus status of the certificate - null if okay
-     * @param singleExtensions optional extensions
-     */
-    public BasicOCSPRespBuilder addResponse(
-        CertificateID       certID,
-        CertificateStatus   certStatus,
-        Date                thisUpdate,
-        Date                nextUpdate,
-        Extensions      singleExtensions)
-    {
-        list.add(new ResponseObject(certID, certStatus, thisUpdate, nextUpdate, singleExtensions));
-
-        return this;
-    }
-    
-    /**
-     * Set the extensions for the response.
-     * 
-     * @param responseExtensions the extension object to carry.
-     */
-    public BasicOCSPRespBuilder setResponseExtensions(
-        Extensions  responseExtensions)
-    {
-        this.responseExtensions = responseExtensions;
-
-        return this;
-    }
-
-    public BasicOCSPResp build(
-        ContentSigner signer,
-        X509CertificateHolder[]   chain,
-        Date                producedAt)
-        throws OCSPException
-    {
-        Iterator    it = list.iterator();
-
-        ASN1EncodableVector responses = new ASN1EncodableVector();
-
-        while (it.hasNext())
-        {
-            try
-            {
-                responses.add(((ResponseObject)it.next()).toResponse());
-            }
-            catch (Exception e)
-            {
-                throw new OCSPException("exception creating Request", e);
-            }
-        }
-
-        ResponseData  tbsResp = new ResponseData(responderID.toASN1Object(), new ASN1GeneralizedTime(producedAt), new DERSequence(responses), responseExtensions);
-        DERBitString    bitSig;
-
-        try
-        {
-            OutputStream sigOut = signer.getOutputStream();
-
-            sigOut.write(tbsResp.getEncoded(ASN1Encoding.DER));
-            sigOut.close();
-
-            bitSig = new DERBitString(signer.getSignature());
-        }
-        catch (Exception e)
-        {
-            throw new OCSPException("exception processing TBSRequest: " + e.getMessage(), e);
-        }
-
-        AlgorithmIdentifier sigAlgId = signer.getAlgorithmIdentifier();
-
-        DERSequence chainSeq = null;
-        if (chain != null && chain.length > 0)
-        {
-            ASN1EncodableVector v = new ASN1EncodableVector();
-
-            for (int i = 0; i != chain.length; i++)
-            {
-                v.add(chain[i].toASN1Structure());
-            }
-
-            chainSeq = new DERSequence(v);
-        }
-
-        return new BasicOCSPResp(new BasicOCSPResponse(tbsResp, sigAlgId, bitSig, chainSeq));
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/ocsp/CertificateID.java b/bcpkix/src/main/java/org/bouncycastle/cert/ocsp/CertificateID.java
deleted file mode 100644
index c6b09ad..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/ocsp/CertificateID.java
+++ /dev/null
@@ -1,156 +0,0 @@
-package org.bouncycastle.cert.ocsp;
-
-import java.io.OutputStream;
-import java.math.BigInteger;
-
-import org.bouncycastle.asn1.ASN1Encoding;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.DERNull;
-import org.bouncycastle.asn1.DEROctetString;
-import org.bouncycastle.asn1.ocsp.CertID;
-import org.bouncycastle.asn1.oiw.OIWObjectIdentifiers;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.bouncycastle.cert.X509CertificateHolder;
-import org.bouncycastle.operator.DigestCalculator;
-import org.bouncycastle.operator.DigestCalculatorProvider;
-import org.bouncycastle.operator.OperatorCreationException;
-
-public class CertificateID
-{
-    public static final AlgorithmIdentifier HASH_SHA1 = new AlgorithmIdentifier(OIWObjectIdentifiers.idSHA1, DERNull.INSTANCE);
-
-    private final CertID id;
-
-    public CertificateID(
-        CertID id)
-    {
-        if (id == null)
-        {
-            throw new IllegalArgumentException("'id' cannot be null");
-        }
-        this.id = id;
-    }
-
-    /**
-     * create from an issuer certificate and the serial number of the
-     * certificate it signed.
-     *
-     * @param issuerCert issuing certificate
-     * @param number serial number
-     *
-     * @exception OCSPException if any problems occur creating the id fields.
-     */
-    public CertificateID(
-        DigestCalculator digestCalculator, X509CertificateHolder issuerCert,
-        BigInteger number)
-        throws OCSPException
-    {
-        this.id = createCertID(digestCalculator, issuerCert, new ASN1Integer(number));
-    }
-
-    public ASN1ObjectIdentifier getHashAlgOID()
-    {
-        return id.getHashAlgorithm().getAlgorithm();
-    }
-
-    public byte[] getIssuerNameHash()
-    {
-        return id.getIssuerNameHash().getOctets();
-    }
-
-    public byte[] getIssuerKeyHash()
-    {
-        return id.getIssuerKeyHash().getOctets();
-    }
-
-    /**
-     * return the serial number for the certificate associated
-     * with this request.
-     */
-    public BigInteger getSerialNumber()
-    {
-        return id.getSerialNumber().getValue();
-    }
-
-    public boolean matchesIssuer(X509CertificateHolder issuerCert, DigestCalculatorProvider digCalcProvider)
-        throws OCSPException
-    {
-        try
-        {
-            return createCertID(digCalcProvider.get(id.getHashAlgorithm()), issuerCert, id.getSerialNumber()).equals(id);
-        }
-        catch (OperatorCreationException e)
-        {
-            throw new OCSPException("unable to create digest calculator: " + e.getMessage(), e);
-        }
-    }
-
-    public CertID toASN1Object()
-    {
-        return id;
-    }
-
-    public boolean equals(
-        Object  o)
-    {
-        if (!(o instanceof CertificateID))
-        {
-            return false;
-        }
-
-        CertificateID obj = (CertificateID)o;
-
-        return id.toASN1Primitive().equals(obj.id.toASN1Primitive());
-    }
-
-    public int hashCode()
-    {
-        return id.toASN1Primitive().hashCode();
-    }
-
-    /**
-     * Create a new CertificateID for a new serial number derived from a previous one
-     * calculated for the same CA certificate.
-     *
-     * @param original the previously calculated CertificateID for the CA.
-     * @param newSerialNumber the serial number for the new certificate of interest.
-     *
-     * @return a new CertificateID for newSerialNumber
-     */
-    public static CertificateID deriveCertificateID(CertificateID original, BigInteger newSerialNumber)
-    {
-        return new CertificateID(new CertID(original.id.getHashAlgorithm(), original.id.getIssuerNameHash(), original.id.getIssuerKeyHash(), new ASN1Integer(newSerialNumber)));
-    }
-
-    private static CertID createCertID(DigestCalculator digCalc, X509CertificateHolder issuerCert, ASN1Integer serialNumber)
-        throws OCSPException
-    {
-        try
-        {
-            OutputStream dgOut = digCalc.getOutputStream();
-
-            dgOut.write(issuerCert.toASN1Structure().getSubject().getEncoded(ASN1Encoding.DER));
-            dgOut.close();
-
-            ASN1OctetString issuerNameHash = new DEROctetString(digCalc.getDigest());
-
-            SubjectPublicKeyInfo info = issuerCert.getSubjectPublicKeyInfo();
-
-            dgOut = digCalc.getOutputStream();
-
-            dgOut.write(info.getPublicKeyData().getBytes());
-            dgOut.close();
-
-            ASN1OctetString issuerKeyHash = new DEROctetString(digCalc.getDigest());
-
-            return new CertID(digCalc.getAlgorithmIdentifier(), issuerNameHash, issuerKeyHash, serialNumber);
-        }
-        catch (Exception e)
-        {
-            throw new OCSPException("problem creating ID: " + e, e);
-        }
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/ocsp/CertificateStatus.java b/bcpkix/src/main/java/org/bouncycastle/cert/ocsp/CertificateStatus.java
deleted file mode 100644
index 3aa117d..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/ocsp/CertificateStatus.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package org.bouncycastle.cert.ocsp;
-
-public interface CertificateStatus
-{
-    public static final CertificateStatus GOOD = null;
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/ocsp/OCSPException.java b/bcpkix/src/main/java/org/bouncycastle/cert/ocsp/OCSPException.java
deleted file mode 100644
index 6489788..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/ocsp/OCSPException.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package org.bouncycastle.cert.ocsp;
-
-public class OCSPException
-    extends Exception
-{
-    private Throwable   cause;
-
-    public OCSPException(
-        String name)
-    {
-        super(name);
-    }
-
-    public OCSPException(
-        String name,
-        Throwable cause)
-    {
-        super(name);
-
-        this.cause = cause;
-    }
-
-    public Throwable getCause()
-    {
-        return cause;
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/ocsp/OCSPReq.java b/bcpkix/src/main/java/org/bouncycastle/cert/ocsp/OCSPReq.java
deleted file mode 100644
index 2706c40..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/ocsp/OCSPReq.java
+++ /dev/null
@@ -1,259 +0,0 @@
-package org.bouncycastle.cert.ocsp;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.List;
-import java.util.Set;
-
-import org.bouncycastle.asn1.ASN1Encoding;
-import org.bouncycastle.asn1.ASN1Exception;
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1OutputStream;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.ocsp.OCSPRequest;
-import org.bouncycastle.asn1.ocsp.Request;
-import org.bouncycastle.asn1.x509.Certificate;
-import org.bouncycastle.asn1.x509.Extension;
-import org.bouncycastle.asn1.x509.Extensions;
-import org.bouncycastle.asn1.x509.GeneralName;
-import org.bouncycastle.cert.CertIOException;
-import org.bouncycastle.cert.X509CertificateHolder;
-import org.bouncycastle.operator.ContentVerifier;
-import org.bouncycastle.operator.ContentVerifierProvider;
-
-/**
- * <pre>
- * OCSPRequest     ::=     SEQUENCE {
- *       tbsRequest                  TBSRequest,
- *       optionalSignature   [0]     EXPLICIT Signature OPTIONAL }
- *
- *   TBSRequest      ::=     SEQUENCE {
- *       version             [0]     EXPLICIT Version DEFAULT v1,
- *       requestorName       [1]     EXPLICIT GeneralName OPTIONAL,
- *       requestList                 SEQUENCE OF Request,
- *       requestExtensions   [2]     EXPLICIT Extensions OPTIONAL }
- *
- *   Signature       ::=     SEQUENCE {
- *       signatureAlgorithm      AlgorithmIdentifier,
- *       signature               BIT STRING,
- *       certs               [0] EXPLICIT SEQUENCE OF Certificate OPTIONAL}
- *
- *   Version         ::=             INTEGER  {  v1(0) }
- *
- *   Request         ::=     SEQUENCE {
- *       reqCert                     CertID,
- *       singleRequestExtensions     [0] EXPLICIT Extensions OPTIONAL }
- *
- *   CertID          ::=     SEQUENCE {
- *       hashAlgorithm       AlgorithmIdentifier,
- *       issuerNameHash      OCTET STRING, -- Hash of Issuer's DN
- *       issuerKeyHash       OCTET STRING, -- Hash of Issuers public key
- *       serialNumber        CertificateSerialNumber }
- * </pre>
- */
-public class OCSPReq
-{
-    private static final X509CertificateHolder[] EMPTY_CERTS = new X509CertificateHolder[0];
-
-    private OCSPRequest    req;
-    private Extensions extensions;
-
-    public OCSPReq(
-        OCSPRequest req)
-    {
-        this.req = req;
-        this.extensions = req.getTbsRequest().getRequestExtensions();
-    }
-    
-    public OCSPReq(
-        byte[]          req)
-        throws IOException
-    {
-        this(new ASN1InputStream(req));
-    }
-
-    private OCSPReq(
-        ASN1InputStream aIn)
-        throws IOException
-    {
-        try
-        {
-            this.req = OCSPRequest.getInstance(aIn.readObject());
-            if (req == null)
-            {
-                throw new CertIOException("malformed request: no request data found");
-            }
-            this.extensions = req.getTbsRequest().getRequestExtensions();
-        }
-        catch (IllegalArgumentException e)
-        {
-            throw new CertIOException("malformed request: " + e.getMessage(), e);
-        }
-        catch (ClassCastException e)
-        {
-            throw new CertIOException("malformed request: " + e.getMessage(), e);
-        }
-        catch (ASN1Exception e)
-        {
-            throw new CertIOException("malformed request: " + e.getMessage(), e);
-        }
-    }
-
-    public int getVersionNumber()
-    {
-        return req.getTbsRequest().getVersion().getValue().intValue() + 1;
-    }
-
-    public GeneralName getRequestorName()
-    {
-        return GeneralName.getInstance(req.getTbsRequest().getRequestorName());
-    }
-
-    public Req[] getRequestList()
-    {
-        ASN1Sequence    seq = req.getTbsRequest().getRequestList();
-        Req[]           requests = new Req[seq.size()];
-
-        for (int i = 0; i != requests.length; i++)
-        {
-            requests[i] = new Req(Request.getInstance(seq.getObjectAt(i)));
-        }
-
-        return requests;
-    }
-
-    public boolean hasExtensions()
-    {
-        return extensions != null;
-    }
-
-    public Extension getExtension(ASN1ObjectIdentifier oid)
-    {
-        if (extensions != null)
-        {
-            return extensions.getExtension(oid);
-        }
-
-        return null;
-    }
-
-    public List getExtensionOIDs()
-    {
-        return OCSPUtils.getExtensionOIDs(extensions);
-    }
-
-    public Set getCriticalExtensionOIDs()
-    {
-        return OCSPUtils.getCriticalExtensionOIDs(extensions);
-    }
-
-    public Set getNonCriticalExtensionOIDs()
-    {
-        return OCSPUtils.getNonCriticalExtensionOIDs(extensions);
-    }
-
-    /**
-     * return the object identifier representing the signature algorithm
-     */
-    public ASN1ObjectIdentifier getSignatureAlgOID()
-    {
-        if (!this.isSigned())
-        {
-            return null;
-        }
-
-        return req.getOptionalSignature().getSignatureAlgorithm().getAlgorithm();
-    }
-
-    public byte[] getSignature()
-    {
-        if (!this.isSigned())
-        {
-            return null;
-        }
-
-        return req.getOptionalSignature().getSignature().getBytes();
-    }
-
-    public X509CertificateHolder[] getCerts()
-    {
-        //
-        // load the certificates if we have any
-        //
-        if (req.getOptionalSignature() != null)
-        {
-            ASN1Sequence s = req.getOptionalSignature().getCerts();
-
-            if (s != null)
-            {
-                X509CertificateHolder[] certs = new X509CertificateHolder[s.size()];
-
-                for (int i = 0; i != certs.length; i++)
-                {
-                    certs[i] = new X509CertificateHolder(Certificate.getInstance(s.getObjectAt(i)));
-                }
-
-                return certs;
-            }
-
-            return EMPTY_CERTS;
-        }
-        else
-        {
-            return EMPTY_CERTS;
-        }
-    }
-    
-    /**
-     * Return whether or not this request is signed.
-     * 
-     * @return true if signed false otherwise.
-     */
-    public boolean isSigned()
-    {
-        return req.getOptionalSignature() != null;
-    }
-
-    /**
-     * verify the signature against the TBSRequest object we contain.
-     */
-    public boolean isSignatureValid(
-        ContentVerifierProvider verifierProvider)
-        throws OCSPException
-    {
-        if (!this.isSigned())
-        {
-            throw new OCSPException("attempt to verify signature on unsigned object");
-        }
-
-        try
-        {
-            ContentVerifier verifier = verifierProvider.get(req.getOptionalSignature().getSignatureAlgorithm());
-            OutputStream sOut = verifier.getOutputStream();
-
-            sOut.write(req.getTbsRequest().getEncoded(ASN1Encoding.DER));
-
-            return verifier.verify(this.getSignature());
-        }
-        catch (Exception e)
-        {
-            throw new OCSPException("exception processing signature: " + e, e);
-        }
-    }
-
-    /**
-     * return the ASN.1 encoded representation of this object.
-     */
-    public byte[] getEncoded()
-        throws IOException
-    {
-        ByteArrayOutputStream   bOut = new ByteArrayOutputStream();
-        ASN1OutputStream        aOut = new ASN1OutputStream(bOut);
-
-        aOut.writeObject(req);
-
-        return bOut.toByteArray();
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/ocsp/OCSPReqBuilder.java b/bcpkix/src/main/java/org/bouncycastle/cert/ocsp/OCSPReqBuilder.java
deleted file mode 100644
index e7e8e0f..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/ocsp/OCSPReqBuilder.java
+++ /dev/null
@@ -1,199 +0,0 @@
-package org.bouncycastle.cert.ocsp;
-
-import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Encoding;
-import org.bouncycastle.asn1.DERBitString;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.ocsp.OCSPRequest;
-import org.bouncycastle.asn1.ocsp.Request;
-import org.bouncycastle.asn1.ocsp.Signature;
-import org.bouncycastle.asn1.ocsp.TBSRequest;
-import org.bouncycastle.asn1.x500.X500Name;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.asn1.x509.Extensions;
-import org.bouncycastle.asn1.x509.GeneralName;
-import org.bouncycastle.cert.X509CertificateHolder;
-import org.bouncycastle.operator.ContentSigner;
-
-public class OCSPReqBuilder
-{
-    private List            list = new ArrayList();
-    private GeneralName     requestorName = null;
-    private Extensions  requestExtensions = null;
-    
-    private class RequestObject
-    {
-        CertificateID   certId;
-        Extensions  extensions;
-
-        public RequestObject(
-            CertificateID   certId,
-            Extensions  extensions)
-        {
-            this.certId = certId;
-            this.extensions = extensions;
-        }
-
-        public Request toRequest()
-            throws Exception
-        {
-            return new Request(certId.toASN1Object(), extensions);
-        }
-    }
-
-    /**
-     * Add a request for the given CertificateID.
-     * 
-     * @param certId certificate ID of interest
-     */
-    public OCSPReqBuilder addRequest(
-        CertificateID   certId)
-    {
-        list.add(new RequestObject(certId, null));
-
-        return this;
-    }
-
-    /**
-     * Add a request with extensions
-     * 
-     * @param certId certificate ID of interest
-     * @param singleRequestExtensions the extensions to attach to the request
-     */
-    public OCSPReqBuilder addRequest(
-        CertificateID   certId,
-        Extensions singleRequestExtensions)
-    {
-        list.add(new RequestObject(certId, singleRequestExtensions));
-
-        return this;
-    }
-
-    /**
-     * Set the requestor name to the passed in X500Principal
-     * 
-     * @param requestorName a X500Principal representing the requestor name.
-     */
-    public OCSPReqBuilder setRequestorName(
-        X500Name requestorName)
-    {
-        this.requestorName = new GeneralName(GeneralName.directoryName, requestorName);
-
-        return this;
-    }
-
-    public OCSPReqBuilder setRequestorName(
-        GeneralName         requestorName)
-    {
-        this.requestorName = requestorName;
-
-        return this;
-    }
-    
-    public OCSPReqBuilder setRequestExtensions(
-        Extensions      requestExtensions)
-    {
-        this.requestExtensions = requestExtensions;
-
-        return this;
-    }
-
-    private OCSPReq generateRequest(
-        ContentSigner           contentSigner,
-        X509CertificateHolder[] chain)
-        throws OCSPException
-    {
-        Iterator    it = list.iterator();
-
-        ASN1EncodableVector requests = new ASN1EncodableVector();
-
-        while (it.hasNext())
-        {
-            try
-            {
-                requests.add(((RequestObject)it.next()).toRequest());
-            }
-            catch (Exception e)
-            {
-                throw new OCSPException("exception creating Request", e);
-            }
-        }
-
-        TBSRequest  tbsReq = new TBSRequest(requestorName, new DERSequence(requests), requestExtensions);
-
-        Signature               signature = null;
-
-        if (contentSigner != null)
-        {
-            if (requestorName == null)
-            {
-                throw new OCSPException("requestorName must be specified if request is signed.");
-            }
-
-            try
-            {
-                OutputStream sOut = contentSigner.getOutputStream();
-
-                sOut.write(tbsReq.getEncoded(ASN1Encoding.DER));
-
-                sOut.close();
-            }
-            catch (Exception e)
-            {
-                throw new OCSPException("exception processing TBSRequest: " + e, e);
-            }
-
-            DERBitString    bitSig = new DERBitString(contentSigner.getSignature());
-
-            AlgorithmIdentifier sigAlgId = contentSigner.getAlgorithmIdentifier();
-
-            if (chain != null && chain.length > 0)
-            {
-                ASN1EncodableVector v = new ASN1EncodableVector();
-
-                for (int i = 0; i != chain.length; i++)
-                {
-                    v.add(chain[i].toASN1Structure());
-                }
-
-                signature = new Signature(sigAlgId, bitSig, new DERSequence(v));
-            }
-            else
-            {
-                signature = new Signature(sigAlgId, bitSig);
-            }
-        }
-
-        return new OCSPReq(new OCSPRequest(tbsReq, signature));
-    }
-    
-    /**
-     * Generate an unsigned request
-     * 
-     * @return the OCSPReq
-     * @throws org.bouncycastle.ocsp.OCSPException
-     */
-    public OCSPReq build()
-        throws OCSPException
-    {
-        return generateRequest(null, null);
-    }
-
-    public OCSPReq build(
-        ContentSigner             signer,
-        X509CertificateHolder[]   chain)
-        throws OCSPException, IllegalArgumentException
-    {
-        if (signer == null)
-        {
-            throw new IllegalArgumentException("no signer specified");
-        }
-
-        return generateRequest(signer, chain);
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/ocsp/OCSPResp.java b/bcpkix/src/main/java/org/bouncycastle/cert/ocsp/OCSPResp.java
deleted file mode 100644
index ed3918a..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/ocsp/OCSPResp.java
+++ /dev/null
@@ -1,141 +0,0 @@
-package org.bouncycastle.cert.ocsp;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.bouncycastle.asn1.ASN1Exception;
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ocsp.BasicOCSPResponse;
-import org.bouncycastle.asn1.ocsp.OCSPObjectIdentifiers;
-import org.bouncycastle.asn1.ocsp.OCSPResponse;
-import org.bouncycastle.asn1.ocsp.ResponseBytes;
-import org.bouncycastle.cert.CertIOException;
-
-public class OCSPResp
-{
-    public static final int SUCCESSFUL = 0;  // Response has valid confirmations
-    public static final int MALFORMED_REQUEST = 1;  // Illegal confirmation request
-    public static final int INTERNAL_ERROR = 2;  // Internal error in issuer
-    public static final int TRY_LATER = 3;  // Try again later
-    // (4) is not used
-    public static final int SIG_REQUIRED = 5;  // Must sign the request
-    public static final int UNAUTHORIZED = 6;  // Request unauthorized
-
-    private OCSPResponse    resp;
-
-    public OCSPResp(
-        OCSPResponse    resp)
-    {
-        this.resp = resp;
-    }
-
-    public OCSPResp(
-        byte[]          resp)
-        throws IOException
-    {
-        this(new ByteArrayInputStream(resp));
-    }
-
-    public OCSPResp(
-        InputStream resp)
-        throws IOException
-    {
-        this(new ASN1InputStream(resp));
-    }
-
-    private OCSPResp(
-        ASN1InputStream aIn)
-        throws IOException
-    {
-        try
-        {
-            this.resp = OCSPResponse.getInstance(aIn.readObject());
-        }
-        catch (IllegalArgumentException e)
-        {
-            throw new CertIOException("malformed response: " + e.getMessage(), e);
-        }
-        catch (ClassCastException e)
-        {
-            throw new CertIOException("malformed response: " + e.getMessage(), e);
-        }
-        catch (ASN1Exception e)
-        {
-            throw new CertIOException("malformed response: " + e.getMessage(), e);
-        }
-
-        if (resp == null)
-        {
-            throw new CertIOException("malformed response: no response data found");
-        }
-    }
-
-    public int getStatus()
-    {
-        return this.resp.getResponseStatus().getValue().intValue();
-    }
-
-    public Object getResponseObject()
-        throws OCSPException
-    {
-        ResponseBytes   rb = this.resp.getResponseBytes();
-
-        if (rb == null)
-        {
-            return null;
-        }
-
-        if (rb.getResponseType().equals(OCSPObjectIdentifiers.id_pkix_ocsp_basic))
-        {
-            try
-            {
-                ASN1Primitive obj = ASN1Primitive.fromByteArray(rb.getResponse().getOctets());
-                return new BasicOCSPResp(BasicOCSPResponse.getInstance(obj));
-            }
-            catch (Exception e)
-            {
-                throw new OCSPException("problem decoding object: " + e, e);
-            }
-        }
-
-        return rb.getResponse();
-    }
-
-    /**
-     * return the ASN.1 encoded representation of this object.
-     */
-    public byte[] getEncoded()
-        throws IOException
-    {
-        return resp.getEncoded();
-    }
-    
-    public boolean equals(Object o)
-    {
-        if (o == this)
-        {
-            return true;
-        }
-        
-        if (!(o instanceof OCSPResp))
-        {
-            return false;
-        }
-        
-        OCSPResp r = (OCSPResp)o;
-        
-        return resp.equals(r.resp);
-    }
-    
-    public int hashCode()
-    {
-        return resp.hashCode();
-    }
-
-    public OCSPResponse toASN1Structure()
-    {
-        return resp;
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/ocsp/OCSPRespBuilder.java b/bcpkix/src/main/java/org/bouncycastle/cert/ocsp/OCSPRespBuilder.java
deleted file mode 100644
index c372ebf..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/ocsp/OCSPRespBuilder.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package org.bouncycastle.cert.ocsp;
-
-import java.io.IOException;
-
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.DEROctetString;
-import org.bouncycastle.asn1.ocsp.OCSPObjectIdentifiers;
-import org.bouncycastle.asn1.ocsp.OCSPResponse;
-import org.bouncycastle.asn1.ocsp.OCSPResponseStatus;
-import org.bouncycastle.asn1.ocsp.ResponseBytes;
-
-/**
- * base generator for an OCSP response - at the moment this only supports the
- * generation of responses containing BasicOCSP responses.
- */
-public class OCSPRespBuilder
-{
-    public static final int SUCCESSFUL = 0;  // Response has valid confirmations
-    public static final int MALFORMED_REQUEST = 1;  // Illegal confirmation request
-    public static final int INTERNAL_ERROR = 2;  // Internal error in issuer
-    public static final int TRY_LATER = 3;  // Try again later
-    // (4) is not used
-    public static final int SIG_REQUIRED = 5;  // Must sign the request
-    public static final int UNAUTHORIZED = 6;  // Request unauthorized
-
-    public OCSPResp build(
-        int status,
-        Object response)
-        throws OCSPException
-    {
-        if (response == null)
-        {
-            return new OCSPResp(new OCSPResponse(new OCSPResponseStatus(status), null));
-        }
-
-        if (response instanceof BasicOCSPResp)
-        {
-            BasicOCSPResp r = (BasicOCSPResp)response;
-            ASN1OctetString octs;
-
-            try
-            {
-                octs = new DEROctetString(r.getEncoded());
-            }
-            catch (IOException e)
-            {
-                throw new OCSPException("can't encode object.", e);
-            }
-
-            ResponseBytes rb = new ResponseBytes(
-                OCSPObjectIdentifiers.id_pkix_ocsp_basic, octs);
-
-            return new OCSPResp(new OCSPResponse(
-                new OCSPResponseStatus(status), rb));
-        }
-
-        throw new OCSPException("unknown response object");
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/ocsp/OCSPUtils.java b/bcpkix/src/main/java/org/bouncycastle/cert/ocsp/OCSPUtils.java
deleted file mode 100644
index a84f409..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/ocsp/OCSPUtils.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package org.bouncycastle.cert.ocsp;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.bouncycastle.asn1.ASN1GeneralizedTime;
-import org.bouncycastle.asn1.x509.Extensions;
-import org.bouncycastle.cert.X509CertificateHolder;
-
-class OCSPUtils
-{
-    static final X509CertificateHolder[] EMPTY_CERTS = new X509CertificateHolder[0];
-
-    static Set EMPTY_SET = Collections.unmodifiableSet(new HashSet());
-    static List EMPTY_LIST = Collections.unmodifiableList(new ArrayList());
-
-    static Date extractDate(ASN1GeneralizedTime time)
-    {
-        try
-        {
-            return time.getDate();
-        }
-        catch (Exception e)
-        {
-            throw new IllegalStateException("exception processing GeneralizedTime: " + e.getMessage());
-        }
-    }
-
-    static Set getCriticalExtensionOIDs(Extensions extensions)
-    {
-        if (extensions == null)
-        {
-            return EMPTY_SET;
-        }
-
-        return Collections.unmodifiableSet(new HashSet(Arrays.asList(extensions.getCriticalExtensionOIDs())));
-    }
-
-    static Set getNonCriticalExtensionOIDs(Extensions extensions)
-    {
-        if (extensions == null)
-        {
-            return EMPTY_SET;
-        }
-
-        // TODO: should probably produce a set that imposes correct ordering
-        return Collections.unmodifiableSet(new HashSet(Arrays.asList(extensions.getNonCriticalExtensionOIDs())));
-    }
-
-    static List getExtensionOIDs(Extensions extensions)
-    {
-        if (extensions == null)
-        {
-            return EMPTY_LIST;
-        }
-
-        return Collections.unmodifiableList(Arrays.asList(extensions.getExtensionOIDs()));
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/ocsp/Req.java b/bcpkix/src/main/java/org/bouncycastle/cert/ocsp/Req.java
deleted file mode 100644
index 6df083c..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/ocsp/Req.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package org.bouncycastle.cert.ocsp;
-
-import org.bouncycastle.asn1.ocsp.Request;
-import org.bouncycastle.asn1.x509.Extensions;
-
-public class Req
-{
-    private Request req;
-
-    public Req(
-        Request req)
-    {
-        this.req = req;
-    }
-
-    public CertificateID getCertID()
-    {
-        return new CertificateID(req.getReqCert());
-    }
-
-    public Extensions getSingleRequestExtensions()
-    {
-        return req.getSingleRequestExtensions();
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/ocsp/RespData.java b/bcpkix/src/main/java/org/bouncycastle/cert/ocsp/RespData.java
deleted file mode 100644
index 6960fa8..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/ocsp/RespData.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package org.bouncycastle.cert.ocsp;
-
-import java.util.Date;
-
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.ocsp.ResponseData;
-import org.bouncycastle.asn1.ocsp.SingleResponse;
-import org.bouncycastle.asn1.x509.Extensions;
-
-public class RespData
-{
-    private ResponseData    data;
-
-    public RespData(
-        ResponseData    data)
-    {
-        this.data = data;
-    }
-
-    public int getVersion()
-    {
-        return data.getVersion().getValue().intValue() + 1;
-    }
-
-    public RespID getResponderId()
-    {
-        return new RespID(data.getResponderID());
-    }
-
-    public Date getProducedAt()
-    {
-        return OCSPUtils.extractDate(data.getProducedAt());
-    }
-
-    public SingleResp[] getResponses()
-    {
-        ASN1Sequence    s = data.getResponses();
-        SingleResp[]    rs = new SingleResp[s.size()];
-
-        for (int i = 0; i != rs.length; i++)
-        {
-            rs[i] = new SingleResp(SingleResponse.getInstance(s.getObjectAt(i)));
-        }
-
-        return rs;
-    }
-
-    public Extensions getResponseExtensions()
-    {
-        return data.getResponseExtensions();
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/ocsp/RespID.java b/bcpkix/src/main/java/org/bouncycastle/cert/ocsp/RespID.java
deleted file mode 100644
index 4322ab5..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/ocsp/RespID.java
+++ /dev/null
@@ -1,89 +0,0 @@
-package org.bouncycastle.cert.ocsp;
-
-import java.io.OutputStream;
-
-import org.bouncycastle.asn1.DERNull;
-import org.bouncycastle.asn1.DEROctetString;
-import org.bouncycastle.asn1.ocsp.ResponderID;
-import org.bouncycastle.asn1.oiw.OIWObjectIdentifiers;
-import org.bouncycastle.asn1.x500.X500Name;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.bouncycastle.operator.DigestCalculator;
-
-/**
- * Carrier for a ResponderID.
- */
-public class RespID
-{
-    public static final AlgorithmIdentifier HASH_SHA1 = new AlgorithmIdentifier(OIWObjectIdentifiers.idSHA1, DERNull.INSTANCE);
-
-    ResponderID id;
-
-    public RespID(
-        ResponderID id)
-    {
-        this.id = id;
-    }
-
-    public RespID(
-        X500Name name)
-    {
-        this.id = new ResponderID(name);
-    }
-
-    /**
-     * Calculate a RespID based on the public key of the responder.
-     *
-     * @param subjectPublicKeyInfo the info structure for the responder public key.
-     * @param digCalc a SHA-1 digest calculator.
-     * @throws OCSPException on exception creating ID.
-     */
-    public RespID(
-        SubjectPublicKeyInfo     subjectPublicKeyInfo,
-        DigestCalculator         digCalc)
-        throws OCSPException
-    {
-        try
-        {
-            if (!digCalc.getAlgorithmIdentifier().equals(HASH_SHA1))
-            {
-                throw new IllegalArgumentException("only SHA-1 can be used with RespID");
-            }
-
-            OutputStream     digOut = digCalc.getOutputStream();
-
-            digOut.write(subjectPublicKeyInfo.getPublicKeyData().getBytes());
-            digOut.close();
-
-            this.id = new ResponderID(new DEROctetString(digCalc.getDigest()));
-        }
-        catch (Exception e)
-        {
-            throw new OCSPException("problem creating ID: " + e, e);
-        }
-    }
-
-    public ResponderID toASN1Object()
-    {
-        return id;
-    }
-
-    public boolean equals(
-        Object  o)
-    {
-        if (!(o instanceof RespID))
-        {
-            return false;
-        }
-
-        RespID obj = (RespID)o;
-
-        return id.equals(obj.id);
-    }
-
-    public int hashCode()
-    {
-        return id.hashCode();
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/ocsp/RevokedStatus.java b/bcpkix/src/main/java/org/bouncycastle/cert/ocsp/RevokedStatus.java
deleted file mode 100644
index d349f07..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/ocsp/RevokedStatus.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package org.bouncycastle.cert.ocsp;
-
-import java.util.Date;
-
-import org.bouncycastle.asn1.ASN1GeneralizedTime;
-import org.bouncycastle.asn1.ocsp.RevokedInfo;
-import org.bouncycastle.asn1.x509.CRLReason;
-
-/**
- * wrapper for the RevokedInfo object
- */
-public class RevokedStatus
-    implements CertificateStatus
-{
-    RevokedInfo info;
-
-    public RevokedStatus(
-        RevokedInfo info)
-    {
-        this.info = info;
-    }
-    
-    public RevokedStatus(
-        Date        revocationDate,
-        int         reason)
-    {
-        this.info = new RevokedInfo(new ASN1GeneralizedTime(revocationDate), CRLReason.lookup(reason));
-    }
-
-    public Date getRevocationTime()
-    {
-        return OCSPUtils.extractDate(info.getRevocationTime());
-    }
-
-    public boolean hasRevocationReason()
-    {
-        return (info.getRevocationReason() != null);
-    }
-
-    /**
-     * return the revocation reason. Note: this field is optional, test for it
-     * with hasRevocationReason() first.
-     * @return the revocation reason value.
-     * @exception IllegalStateException if a reason is asked for and none is avaliable
-     */
-    public int getRevocationReason()
-    {
-        if (info.getRevocationReason() == null)
-        {
-            throw new IllegalStateException("attempt to get a reason where none is available");
-        }
-
-        return info.getRevocationReason().getValue().intValue();
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/ocsp/SingleResp.java b/bcpkix/src/main/java/org/bouncycastle/cert/ocsp/SingleResp.java
deleted file mode 100644
index ece7ea2..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/ocsp/SingleResp.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package org.bouncycastle.cert.ocsp;
-
-import java.util.Date;
-import java.util.List;
-import java.util.Set;
-
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ocsp.CertStatus;
-import org.bouncycastle.asn1.ocsp.RevokedInfo;
-import org.bouncycastle.asn1.ocsp.SingleResponse;
-import org.bouncycastle.asn1.x509.Extension;
-import org.bouncycastle.asn1.x509.Extensions;
-
-public class SingleResp
-{
-    private SingleResponse  resp;
-    private Extensions extensions;
-
-    public SingleResp(
-        SingleResponse  resp)
-    {
-        this.resp = resp;
-        this.extensions = resp.getSingleExtensions();
-    }
-
-    public CertificateID getCertID()
-    {
-        return new CertificateID(resp.getCertID());
-    }
-
-    /**
-     * Return the status object for the response - null indicates good.
-     * 
-     * @return the status object for the response, null if it is good.
-     */
-    public CertificateStatus getCertStatus()
-    {
-        CertStatus  s = resp.getCertStatus();
-
-        if (s.getTagNo() == 0)
-        {
-            return null;            // good
-        }
-        else if (s.getTagNo() == 1)
-        {
-            return new RevokedStatus(RevokedInfo.getInstance(s.getStatus()));
-        }
-
-        return new UnknownStatus();
-    }
-
-    public Date getThisUpdate()
-    {
-        return OCSPUtils.extractDate(resp.getThisUpdate());
-    }
-
-    /**
-     * return the NextUpdate value - note: this is an optional field so may
-     * be returned as null.
-     *
-     * @return nextUpdate, or null if not present.
-     */
-    public Date getNextUpdate()
-    {
-        if (resp.getNextUpdate() == null)
-        {
-            return null;
-        }
-
-        return OCSPUtils.extractDate(resp.getNextUpdate());
-    }
-
-    public boolean hasExtensions()
-    {
-        return extensions != null;
-    }
-
-    public Extension getExtension(ASN1ObjectIdentifier oid)
-    {
-        if (extensions != null)
-        {
-            return extensions.getExtension(oid);
-        }
-
-        return null;
-    }
-
-    public List getExtensionOIDs()
-    {
-        return OCSPUtils.getExtensionOIDs(extensions);
-    }
-
-    public Set getCriticalExtensionOIDs()
-    {
-        return OCSPUtils.getCriticalExtensionOIDs(extensions);
-    }
-
-    public Set getNonCriticalExtensionOIDs()
-    {
-        return OCSPUtils.getNonCriticalExtensionOIDs(extensions);
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/ocsp/UnknownStatus.java b/bcpkix/src/main/java/org/bouncycastle/cert/ocsp/UnknownStatus.java
deleted file mode 100644
index 8d60e2b..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/ocsp/UnknownStatus.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.bouncycastle.cert.ocsp;
-
-/**
- * wrapper for the UnknownInfo object
- */
-public class UnknownStatus
-    implements CertificateStatus
-{
-    public UnknownStatus()
-    {
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/ocsp/jcajce/JcaBasicOCSPRespBuilder.java b/bcpkix/src/main/java/org/bouncycastle/cert/ocsp/jcajce/JcaBasicOCSPRespBuilder.java
deleted file mode 100644
index 94bf52f..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/ocsp/jcajce/JcaBasicOCSPRespBuilder.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package org.bouncycastle.cert.ocsp.jcajce;
-
-import java.security.PublicKey;
-
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.bouncycastle.cert.ocsp.BasicOCSPRespBuilder;
-import org.bouncycastle.cert.ocsp.OCSPException;
-import org.bouncycastle.operator.DigestCalculator;
-
-public class JcaBasicOCSPRespBuilder
-    extends BasicOCSPRespBuilder
-{
-    public JcaBasicOCSPRespBuilder(PublicKey key, DigestCalculator digCalc)
-        throws OCSPException
-    {
-        super(SubjectPublicKeyInfo.getInstance(key.getEncoded()), digCalc);
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/ocsp/jcajce/JcaCertificateID.java b/bcpkix/src/main/java/org/bouncycastle/cert/ocsp/jcajce/JcaCertificateID.java
deleted file mode 100644
index 446b38b..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/ocsp/jcajce/JcaCertificateID.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package org.bouncycastle.cert.ocsp.jcajce;
-
-import java.math.BigInteger;
-import java.security.cert.CertificateEncodingException;
-import java.security.cert.X509Certificate;
-
-import org.bouncycastle.cert.jcajce.JcaX509CertificateHolder;
-import org.bouncycastle.cert.ocsp.CertificateID;
-import org.bouncycastle.cert.ocsp.OCSPException;
-import org.bouncycastle.operator.DigestCalculator;
-
-public class JcaCertificateID
-    extends CertificateID
-{
-    public JcaCertificateID(DigestCalculator digestCalculator, X509Certificate issuerCert, BigInteger number)
-        throws OCSPException, CertificateEncodingException
-    {
-        super(digestCalculator, new JcaX509CertificateHolder(issuerCert), number);
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/ocsp/jcajce/JcaRespID.java b/bcpkix/src/main/java/org/bouncycastle/cert/ocsp/jcajce/JcaRespID.java
deleted file mode 100644
index 8bc9edb..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/ocsp/jcajce/JcaRespID.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package org.bouncycastle.cert.ocsp.jcajce;
-
-import java.security.PublicKey;
-
-import javax.security.auth.x500.X500Principal;
-
-import org.bouncycastle.asn1.x500.X500Name;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.bouncycastle.cert.ocsp.OCSPException;
-import org.bouncycastle.cert.ocsp.RespID;
-import org.bouncycastle.operator.DigestCalculator;
-
-public class JcaRespID
-    extends RespID
-{
-    public JcaRespID(X500Principal name)
-    {
-        super(X500Name.getInstance(name.getEncoded()));
-    }
-
-    public JcaRespID(PublicKey pubKey, DigestCalculator digCalc)
-        throws OCSPException
-    {
-        super(SubjectPublicKeyInfo.getInstance(pubKey.getEncoded()), digCalc);
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/ocsp/jcajce/package.html b/bcpkix/src/main/java/org/bouncycastle/cert/ocsp/jcajce/package.html
deleted file mode 100644
index cfe87f2..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/ocsp/jcajce/package.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-        "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<body bgcolor="#ffffff">
-JCA extensions to the OCSP online certificate status package.
-</body>
-</html>
\ No newline at end of file
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/ocsp/package.html b/bcpkix/src/main/java/org/bouncycastle/cert/ocsp/package.html
deleted file mode 100644
index 234cb32..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/ocsp/package.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-        "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<body bgcolor="#ffffff">
-Basic support package for handling and creating OCSP (RFC 2560) online certificate status requests.
-</body>
-</html>
\ No newline at end of file
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/ocsp/test/AllTests.java b/bcpkix/src/main/java/org/bouncycastle/cert/ocsp/test/AllTests.java
deleted file mode 100644
index 1f720de..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/ocsp/test/AllTests.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package org.bouncycastle.cert.ocsp.test;
-
-import java.security.Security;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.util.test.SimpleTestResult;
-
-public class AllTests
-    extends TestCase
-{
-    public void testOCSP()
-    {   
-        Security.addProvider(new BouncyCastleProvider());
-        
-        org.bouncycastle.util.test.Test[] tests = new org.bouncycastle.util.test.Test[] { new OCSPTest() };
-        
-        for (int i = 0; i != tests.length; i++)
-        {
-            SimpleTestResult  result = (SimpleTestResult)tests[i].perform();
-            
-            if (!result.isSuccessful())
-            {
-                fail(result.toString());
-            }
-        }
-    }
-    
-    public static void main (String[] args)
-    {
-        junit.textui.TestRunner.run(suite());
-    }
-    
-    public static Test suite()
-    {
-        TestSuite suite = new TestSuite("OCSP Tests");
-        
-        suite.addTestSuite(AllTests.class);
-        
-        return suite;
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/ocsp/test/OCSPTest.java b/bcpkix/src/main/java/org/bouncycastle/cert/ocsp/test/OCSPTest.java
deleted file mode 100644
index 5c57c7f..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/ocsp/test/OCSPTest.java
+++ /dev/null
@@ -1,972 +0,0 @@
-package org.bouncycastle.cert.ocsp.test;
-
-import java.io.IOException;
-import java.math.BigInteger;
-import java.security.KeyPair;
-import java.security.Security;
-import java.util.Date;
-import java.util.Random;
-import java.util.Set;
-import java.util.Vector;
-
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1Exception;
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.DEROctetString;
-import org.bouncycastle.asn1.ocsp.OCSPObjectIdentifiers;
-import org.bouncycastle.asn1.x509.Extension;
-import org.bouncycastle.asn1.x509.ExtensionsGenerator;
-import org.bouncycastle.asn1.x509.GeneralName;
-import org.bouncycastle.asn1.x509.X509Name;
-import org.bouncycastle.cert.CertIOException;
-import org.bouncycastle.cert.X509CertificateHolder;
-import org.bouncycastle.cert.jcajce.JcaX509CertificateHolder;
-import org.bouncycastle.cert.ocsp.BasicOCSPResp;
-import org.bouncycastle.cert.ocsp.BasicOCSPRespBuilder;
-import org.bouncycastle.cert.ocsp.CertificateID;
-import org.bouncycastle.cert.ocsp.CertificateStatus;
-import org.bouncycastle.cert.ocsp.OCSPReq;
-import org.bouncycastle.cert.ocsp.OCSPReqBuilder;
-import org.bouncycastle.cert.ocsp.OCSPResp;
-import org.bouncycastle.cert.ocsp.OCSPRespBuilder;
-import org.bouncycastle.cert.ocsp.Req;
-import org.bouncycastle.cert.ocsp.RespID;
-import org.bouncycastle.cert.ocsp.SingleResp;
-import org.bouncycastle.cert.ocsp.jcajce.JcaBasicOCSPRespBuilder;
-import org.bouncycastle.jce.X509Principal;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.operator.DigestCalculatorProvider;
-import org.bouncycastle.operator.jcajce.JcaContentSignerBuilder;
-import org.bouncycastle.operator.jcajce.JcaContentVerifierProviderBuilder;
-import org.bouncycastle.operator.jcajce.JcaDigestCalculatorProviderBuilder;
-import org.bouncycastle.util.encoders.Base64;
-import org.bouncycastle.util.test.SimpleTest;
-
-public class OCSPTest
-    extends SimpleTest
-{
-    byte[] testResp1 = Base64.decode(
-        "MIIFnAoBAKCCBZUwggWRBgkrBgEFBQcwAQEEggWCMIIFfjCCARehgZ8wgZwx"
-            + "CzAJBgNVBAYTAklOMRcwFQYDVQQIEw5BbmRocmEgcHJhZGVzaDESMBAGA1UE"
-            + "BxMJSHlkZXJhYmFkMQwwCgYDVQQKEwNUQ1MxDDAKBgNVBAsTA0FUQzEeMBwG"
-            + "A1UEAxMVVENTLUNBIE9DU1AgUmVzcG9uZGVyMSQwIgYJKoZIhvcNAQkBFhVv"
-            + "Y3NwQHRjcy1jYS50Y3MuY28uaW4YDzIwMDMwNDAyMTIzNDU4WjBiMGAwOjAJ"
-            + "BgUrDgMCGgUABBRs07IuoCWNmcEl1oHwIak1BPnX8QQUtGyl/iL9WJ1VxjxF"
-            + "j0hAwJ/s1AcCAQKhERgPMjAwMjA4MjkwNzA5MjZaGA8yMDAzMDQwMjEyMzQ1"
-            + "OFowDQYJKoZIhvcNAQEFBQADgYEAfbN0TCRFKdhsmvOdUoiJ+qvygGBzDxD/"
-            + "VWhXYA+16AphHLIWNABR3CgHB3zWtdy2j7DJmQ/R7qKj7dUhWLSqclAiPgFt"
-            + "QQ1YvSJAYfEIdyHkxv4NP0LSogxrumANcDyC9yt/W9yHjD2ICPBIqCsZLuLk"
-            + "OHYi5DlwWe9Zm9VFwCGgggPMMIIDyDCCA8QwggKsoAMCAQICAQYwDQYJKoZI"
-            + "hvcNAQEFBQAwgZQxFDASBgNVBAMTC1RDUy1DQSBPQ1NQMSYwJAYJKoZIhvcN"
-            + "AQkBFhd0Y3MtY2FAdGNzLWNhLnRjcy5jby5pbjEMMAoGA1UEChMDVENTMQww"
-            + "CgYDVQQLEwNBVEMxEjAQBgNVBAcTCUh5ZGVyYWJhZDEXMBUGA1UECBMOQW5k"
-            + "aHJhIHByYWRlc2gxCzAJBgNVBAYTAklOMB4XDTAyMDgyOTA3MTE0M1oXDTAz"
-            + "MDgyOTA3MTE0M1owgZwxCzAJBgNVBAYTAklOMRcwFQYDVQQIEw5BbmRocmEg"
-            + "cHJhZGVzaDESMBAGA1UEBxMJSHlkZXJhYmFkMQwwCgYDVQQKEwNUQ1MxDDAK"
-            + "BgNVBAsTA0FUQzEeMBwGA1UEAxMVVENTLUNBIE9DU1AgUmVzcG9uZGVyMSQw"
-            + "IgYJKoZIhvcNAQkBFhVvY3NwQHRjcy1jYS50Y3MuY28uaW4wgZ8wDQYJKoZI"
-            + "hvcNAQEBBQADgY0AMIGJAoGBAM+XWW4caMRv46D7L6Bv8iwtKgmQu0SAybmF"
-            + "RJiz12qXzdvTLt8C75OdgmUomxp0+gW/4XlTPUqOMQWv463aZRv9Ust4f8MH"
-            + "EJh4ekP/NS9+d8vEO3P40ntQkmSMcFmtA9E1koUtQ3MSJlcs441JjbgUaVnm"
-            + "jDmmniQnZY4bU3tVAgMBAAGjgZowgZcwDAYDVR0TAQH/BAIwADALBgNVHQ8E"
-            + "BAMCB4AwEwYDVR0lBAwwCgYIKwYBBQUHAwkwNgYIKwYBBQUHAQEEKjAoMCYG"
-            + "CCsGAQUFBzABhhpodHRwOi8vMTcyLjE5LjQwLjExMDo3NzAwLzAtBgNVHR8E"
-            + "JjAkMCKgIKAehhxodHRwOi8vMTcyLjE5LjQwLjExMC9jcmwuY3JsMA0GCSqG"
-            + "SIb3DQEBBQUAA4IBAQB6FovM3B4VDDZ15o12gnADZsIk9fTAczLlcrmXLNN4"
-            + "PgmqgnwF0Ymj3bD5SavDOXxbA65AZJ7rBNAguLUo+xVkgxmoBH7R2sBxjTCc"
-            + "r07NEadxM3HQkt0aX5XYEl8eRoifwqYAI9h0ziZfTNes8elNfb3DoPPjqq6V"
-            + "mMg0f0iMS4W8LjNPorjRB+kIosa1deAGPhq0eJ8yr0/s2QR2/WFD5P4aXc8I"
-            + "KWleklnIImS3zqiPrq6tl2Bm8DZj7vXlTOwmraSQxUwzCKwYob1yGvNOUQTq"
-            + "pG6jxn7jgDawHU1+WjWQe4Q34/pWeGLysxTraMa+Ug9kPe+jy/qRX2xwvKBZ");
-
-    byte[] testResp2 = Base64.decode(
-        "MIII1QoBAKCCCM4wggjKBgkrBgEFBQcwAQEEggi7MIIItzCBjqADAgEAoSMw"
-            + "ITEfMB0GA1UEAxMWT0NTUCBjZXJ0LVFBLUNMSUVOVC04NxgPMjAwMzA1MTky"
-            + "MDI2MzBaMFEwTzA6MAkGBSsOAwIaBQAEFJniwiUuyrhKIEF2TjVdVdCAOw0z"
-            + "BBR2olPKrPOJUVyGZ7BXOC4L2BmAqgIBL4AAGA8yMDAzMDUxOTIwMjYzMFow"
-            + "DQYJKoZIhvcNAQEEBQADggEBALImFU3kUtpNVf4tIFKg/1sDHvGpk5Pk0uhH"
-            + "TiNp6vdPfWjOgPkVXskx9nOTabVOBE8RusgwEcK1xeBXSHODb6mnjt9pkfv3"
-            + "ZdbFLFvH/PYjOb6zQOgdIOXhquCs5XbcaSFCX63hqnSaEqvc9w9ctmQwds5X"
-            + "tCuyCB1fWu/ie8xfuXR5XZKTBf5c6dO82qFE65gTYbGOxJBYiRieIPW1XutZ"
-            + "A76qla4m+WdxubV6SPG8PVbzmAseqjsJRn4jkSKOGenqSOqbPbZn9oBsU0Ku"
-            + "hul3pwsNJvcBvw2qxnWybqSzV+n4OvYXk+xFmtTjw8H9ChV3FYYDs8NuUAKf"
-            + "jw1IjWegggcOMIIHCjCCAzMwggIboAMCAQICAQIwDQYJKoZIhvcNAQEEBQAw"
-            + "bzELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAk1BMRAwDgYDVQQHEwdXYWx0aGFt"
-            + "MRYwFAYDVQQKEw1Gb3J1bSBTeXN0ZW1zMQswCQYDVQQLEwJRQTEcMBoGA1UE"
-            + "AxMTQ2VydGlmaWNhdGUgTWFuYWdlcjAeFw0wMzAzMjEwNTAwMDBaFw0yNTAz"
-            + "MjEwNTAwMDBaMCExHzAdBgNVBAMTFk9DU1AgY2VydC1RQS1DTElFTlQtODcw"
-            + "ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDVuxRCZgJAYAftYuRy"
-            + "9axdtsHrkIJyVVRorLCTWOoLmx2tlrGqKbHOGKmvqEPEpeCDYQk+0WIlWMuM"
-            + "2pgiYAolwqSFBwCjkjQN3fCIHXiby0JBgCCLoe7wa0pZffE+8XZH0JdSjoT3"
-            + "2OYD19wWZeY2VB0JWJFWYAnIL+R5Eg7LwJ5QZSdvghnOWKTv60m/O1rC0see"
-            + "9lbPO+3jRuaDyCUKYy/YIKBYC9rtC4hS47jg70dTfmE2nccjn7rFCPBrVr4M"
-            + "5szqdRzwu3riL9W+IE99LTKXOH/24JX0S4woeGXMS6me7SyZE6x7P2tYkNXM"
-            + "OfXk28b3SJF75K7vX6T6ecWjAgMBAAGjKDAmMBMGA1UdJQQMMAoGCCsGAQUF"
-            + "BwMJMA8GCSsGAQUFBzABBQQCBQAwDQYJKoZIhvcNAQEEBQADggEBAKNSn7pp"
-            + "UEC1VTN/Iqk8Sc2cAYM7KSmeB++tuyes1iXY4xSQaEgOxRa5AvPAKnXKSzfY"
-            + "vqi9WLdzdkpTo4AzlHl5nqU/NCUv3yOKI9lECVMgMxLAvZgMALS5YXNZsqrs"
-            + "hP3ASPQU99+5CiBGGYa0PzWLstXLa6SvQYoHG2M8Bb2lHwgYKsyrUawcfc/s"
-            + "jE3jFJeyCyNwzH0eDJUVvW1/I3AhLNWcPaT9/VfyIWu5qqZU+ukV/yQXrKiB"
-            + "glY8v4QDRD4aWQlOuiV2r9sDRldOPJe2QSFDBe4NtBbynQ+MRvF2oQs/ocu+"
-            + "OAHX7uiskg9GU+9cdCWPwJf9cP/Zem6MemgwggPPMIICt6ADAgECAgEBMA0G"
-            + "CSqGSIb3DQEBBQUAMG8xCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJNQTEQMA4G"
-            + "A1UEBxMHV2FsdGhhbTEWMBQGA1UEChMNRm9ydW0gU3lzdGVtczELMAkGA1UE"
-            + "CxMCUUExHDAaBgNVBAMTE0NlcnRpZmljYXRlIE1hbmFnZXIwHhcNMDMwMzIx"
-            + "MDUwMDAwWhcNMjUwMzIxMDUwMDAwWjBvMQswCQYDVQQGEwJVUzELMAkGA1UE"
-            + "CBMCTUExEDAOBgNVBAcTB1dhbHRoYW0xFjAUBgNVBAoTDUZvcnVtIFN5c3Rl"
-            + "bXMxCzAJBgNVBAsTAlFBMRwwGgYDVQQDExNDZXJ0aWZpY2F0ZSBNYW5hZ2Vy"
-            + "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4VeU+48VBjI0mGRt"
-            + "9qlD+WAhx3vv4KCOD5f3HWLj8D2DcoszVTVDqtRK+HS1eSpO/xWumyXhjV55"
-            + "FhG2eYi4e0clv0WyswWkGLqo7IxYn3ZhVmw04ohdTjdhVv8oS+96MUqPmvVW"
-            + "+MkVRyqm75HdgWhKRr/lEpDNm+RJe85xMCipkyesJG58p5tRmAZAAyRs3jYw"
-            + "5YIFwDOnt6PCme7ui4xdas2zolqOlynMuq0ctDrUPKGLlR4mVBzgAVPeatcu"
-            + "ivEQdB3rR6UN4+nv2jx9kmQNNb95R1M3J9xHfOWX176UWFOZHJwVq8eBGF9N"
-            + "pav4ZGBAyqagW7HMlo7Hw0FzUwIDAQABo3YwdDARBglghkgBhvhCAQEEBAMC"
-            + "AJcwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQU64zBxl1yKES8tjU3/rBA"
-            + "NaeBpjkwHwYDVR0jBBgwFoAU64zBxl1yKES8tjU3/rBANaeBpjkwDgYDVR0P"
-            + "AQH/BAQDAgGGMA0GCSqGSIb3DQEBBQUAA4IBAQAzHnf+Z+UgxDVOpCu0DHF+"
-            + "qYZf8IaUQxLhUD7wjwnt3lJ0QV1z4oyc6Vs9J5xa8Mvf7u1WMmOxvN8r8Kb0"
-            + "k8DlFszLd0Qwr+NVu5NQO4Vn01UAzCtH4oX2bgrVzotqDnzZ4TcIr11EX3Nb"
-            + "tO8yWWl+xWIuxKoAO8a0Rh97TyYfAj4++GIm43b2zIvRXEWAytjz7rXUMwRC"
-            + "1ipRQwSA9gyw2y0s8emV/VwJQXsTe9xtDqlEC67b90V/BgL/jxck5E8yrY9Z"
-            + "gNxlOgcqscObisAkB5I6GV+dfa+BmZrhSJ/bvFMUrnFzjLFvZp/9qiK11r5K"
-            + "A5oyOoNv0w+8bbtMNEc1");
-
-    /**
-     * extra version number encoding.
-     */
-    private static byte[] irregReq = Base64.decode(
-          "MIIQpTBUoAMCAQAwTTBLMEkwCQYFKw4DAhoFAAQUIcFvFFVjPem15pKox4cfcnzF"
-        + "Kf4EFJf8OQzmVmyJ/hc4EhitQbXcqAzDAhB9ePsP19SuP6CsAgFwQuEAoIIQSzCC"
-        + "EEcwDQYJKoZIhvcNAQEFBQADgYEAlq/Tjl8OtFM8Tib1JYTiaPy9vFDr8UZhqXJI"
-        + "FyrdgtUyyDt0EcrgnBGacAeRZzF5sokIC6DjXweU7EItGqrpw/RaCUPUWFpPxR6y"
-        + "HjuzrLmICocTI9MH7dRUXm0qpxoY987sx1PtWB4pSR99ixBtq3OPNdsI0uJ+Qkei"
-        + "LbEZyvWggg+wMIIPrDCCA5owggKCoAMCAQICEEAxXx/eFe7gm/NX7AkcS68wDQYJ"
-        + "KoZIhvcNAQEFBQAwgZoxCzAJBgNVBAYTAlNFMTMwMQYDVQQKDCpMw6Ruc2bDtnJz"
-        + "w6RrcmluZ2FyIEJhbmsgQWt0aWVib2xhZyAocHVibCkxFTATBgNVBAUTDDExMTEx"
-        + "MTExMTExMTE/MD0GA1UEAww2TMOkbnNmw7Zyc8Oka3JpbmdhciBCYW5rIFB1cmNo"
-        + "YXNlciBDQTEgZm9yIEJhbmtJRCBURVNUMB4XDTA4MTAwNjIyMDAwMFoXDTEwMTAx"
-        + "MDIxNTk1OVowgZExCzAJBgNVBAYTAlNFMTMwMQYDVQQKDCpMw6Ruc2bDtnJzw6Rr"
-        + "cmluZ2FyIEJhbmsgQWt0aWVib2xhZyAocHVibCkxFTATBgNVBAUTDDExMTExMTEx"
-        + "MTExMTE2MDQGA1UEAwwtTMOkbnNmw7Zyc8Oka3JpbmdhciBCYW5rIE9DU1AgZm9y"
-        + "IEJhbmtJRCBURVNUMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC5e/h6aL2m"
-        + "DVpWeu5e5p1Ps9kbvuuGeAp9zJDYLbZz7uzT67X+s59HaViroD2+2my/gg7rX7tK"
-        + "H9VXpJad1W9O19SjfNyxgeAMwVMkrbb4IlrQwu0v/Ub8JPxSWwZZXYiODq5abeXA"
-        + "abMYIHxSaSkhrsUj1dpSAohHLJRlq707swIDAQABo2cwZTAfBgNVHSMEGDAWgBTR"
-        + "vcp2QyNdNGZ+q7TjKSrrHZqxmDATBgNVHSAEDDAKMAgGBiqFcDwBBjAOBgNVHQ8B"
-        + "Af8EBAMCBkAwHQYDVR0OBBYEFF/3557FEvkA8iiPv2XcBclxKnTdMA0GCSqGSIb3"
-        + "DQEBBQUAA4IBAQAOxRvHO89XJ0v83BZdPFzEBA4B2Tqc1oABUn13S6fAkcGWvOmG"
-        + "eY61MK16aMnLPNDadZrAqJc6PEtVY57uaywE9acwv9XpHO0bcS94tLwvZZJ2KBt0"
-        + "Oq96gaI6gnJViUjyWjm+qBZvod0QPOLGv6wUPoiNcCpSid/COTjKpLYpCJj3ZWUV"
-        + "nsTRWSRVXsdY/xI0gs/A8/c5P1PuTxoi99RTmcruoFxvV4MmhWyX7IGqG4OAtLdo"
-        + "yefz/90FPGOrmqY9OgEb+gNuTM26YDvSs1dfarPl89d8jjwxHgNbZjh2VHFqKolJ"
-        + "8TB8ZS5aNvhHPumOOE47y95rTBxrxSmGvKb8MIIENDCCAxygAwIBAgIRAJAFaeOw"
-        + "7XbxH/DN/Vvhjx8wDQYJKoZIhvcNAQEFBQAwgZUxCzAJBgNVBAYTAlNFMTMwMQYD"
-        + "VQQKDCpMw6Ruc2bDtnJzw6RrcmluZ2FyIEJhbmsgQWt0aWVib2xhZyAocHVibCkx"
-        + "FTATBgNVBAUTDDExMTExMTExMTExMTE6MDgGA1UEAwwxTMOkbnNmw7Zyc8Oka3Jp"
-        + "bmdhciBCYW5rIFJvb3QgQ0ExIGZvciBCYW5rSUQgVEVTVDAeFw0wNzEwMDExMjAw"
-        + "MzdaFw0yOTA3MDExMjAwMzdaMIGaMQswCQYDVQQGEwJTRTEzMDEGA1UECgwqTMOk"
-        + "bnNmw7Zyc8Oka3JpbmdhciBCYW5rIEFrdGllYm9sYWcgKHB1YmwpMRUwEwYDVQQF"
-        + "EwwxMTExMTExMTExMTExPzA9BgNVBAMMNkzDpG5zZsO2cnPDpGtyaW5nYXIgQmFu"
-        + "ayBQdXJjaGFzZXIgQ0ExIGZvciBCYW5rSUQgVEVTVDCCASIwDQYJKoZIhvcNAQEB"
-        + "BQADggEPADCCAQoCggEBAMK5WbYojYRX1ZKrbxJBgbd4x503LfMWgr67sVD5L0NY"
-        + "1RPhZVFJRKJWvawE5/eXJ4oNQwc831h2jiOgINXuKyGXqdAVGBcpFwIxTfzxwT4l"
-        + "fvztr8pE6wk7mLLwKUvIjbM3EF1IL3zUI3UU/U5ioyGmcb/o4GGN71kMmvV/vrkU"
-        + "02/s7xicXNxYej4ExLiCkS5+j/+3sR47Uq5cL9e8Yg7t5/6FyLGQjKoS8HU/abYN"
-        + "4kpx/oyrxzrXMhnMVDiI8QX9NYGJwI8KZ/LU6GDq/NnZ3gG5v4l4UU1GhgUbrk4I"
-        + "AZPDu99zvwCtkdj9lJN0eDv8jdyEPZ6g1qPBE0pCNqcCAwEAAaN4MHYwDwYDVR0T"
-        + "AQH/BAUwAwEB/zATBgNVHSAEDDAKMAgGBiqFcDwBBjAOBgNVHQ8BAf8EBAMCAQYw"
-        + "HwYDVR0jBBgwFoAUnkjp1bkQUOrkRiLgxpxwAe2GQFYwHQYDVR0OBBYEFNG9ynZD"
-        + "I100Zn6rtOMpKusdmrGYMA0GCSqGSIb3DQEBBQUAA4IBAQAPVSC4HEd+yCtSgL0j"
-        + "NI19U2hJeP28lAD7OA37bcLP7eNrvfU/2tuqY7rEn1m44fUbifewdgR8x2DzhM0m"
-        + "fJcA5Z12PYUb85L9z8ewGQdyHLNlMpKSTP+0lebSc/obFbteC4jjuvux60y5KVOp"
-        + "osXbGw2qyrS6uhZJrTDP1B+bYg/XBttG+i7Qzx0S5Tq//VU9OfAQZWpvejadKAk9"
-        + "WCcXq6zALiJcxsUwOHZRvvHDxkHuf5eZpPvm1gaqa+G9CtV+oysZMU1eTRasBHsB"
-        + "NRWYfOSXggsyqRHfIAVieB4VSsB8WhZYm8UgYoLhAQfSJ5Xq5cwBOHkVj33MxAyP"
-        + "c7Y5MIID/zCCAuegAwIBAgIRAOXEoBcV4gV3Z92gk5AuRgwwDQYJKoZIhvcNAQEF"
-        + "BQAwZjEkMCIGA1UECgwbRmluYW5zaWVsbCBJRC1UZWtuaWsgQklEIEFCMR8wHQYD"
-        + "VQQLDBZCYW5rSUQgTWVtYmVyIEJhbmtzIENBMR0wGwYDVQQDDBRCYW5rSUQgUm9v"
-        + "dCBDQSBURVNUMjAeFw0wNzEwMDExMTQ1NDlaFw0yOTA4MDExMTU4MjVaMIGVMQsw"
-        + "CQYDVQQGEwJTRTEzMDEGA1UECgwqTMOkbnNmw7Zyc8Oka3JpbmdhciBCYW5rIEFr"
-        + "dGllYm9sYWcgKHB1YmwpMRUwEwYDVQQFEwwxMTExMTExMTExMTExOjA4BgNVBAMM"
-        + "MUzDpG5zZsO2cnPDpGtyaW5nYXIgQmFuayBSb290IENBMSBmb3IgQmFua0lEIFRF"
-        + "U1QwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDBzn7IXIpyOGCCTuzL"
-        + "DKE/T+pFRTgFh3QgKtifZ4zxdvB2Sd5+90vUEGcGExUhzpgb9gOUrT1eE0XhdiUR"
-        + "YuYYpJI/nzPQWTsRtEaql7NHBPKnEauoA9oAhCT4pE5gLlqpTfkB8nAsRTI2XqpI"
-        + "hQ7vTvnTRx20xog21NIbz1GztV8H1kBH2eDvRX7cXGiugp6CXV/le9cB+/4TBNUN"
-        + "Xqupt79dM49KCoDuYr72W7Hv4BSWw3IInEN2m8T2X6UBpBGkCiGwLQy/+KOmYRK7"
-        + "1PSFC0rXDwOJ0HJ/8fHwx6vLMxHAQ6s/9vOW10MjgjSQlbVqH/4Pa+TlpWumSV4E"
-        + "l0z9AgMBAAGjeDB2MA8GA1UdEwEB/wQFMAMBAf8wEwYDVR0gBAwwCjAIBgYqhXA8"
-        + "AQYwDgYDVR0PAQH/BAQDAgEGMB8GA1UdIwQYMBaAFJuTMPljHcYdrRO9sEi1amb4"
-        + "tE3VMB0GA1UdDgQWBBSeSOnVuRBQ6uRGIuDGnHAB7YZAVjANBgkqhkiG9w0BAQUF"
-        + "AAOCAQEArnW/9n+G+84JOgv1Wn4tsBBS7QgJp1rdCoiNrZPx2du/7Wz3wQVNKBjL"
-        + "eMCyLjg0OVHuq4hpCv9MZpUqdcUW8gpp4dLDAAd1uE7xqVuG8g4Ir5qocxbZHQew"
-        + "fnqSJJDlEZgDeZIzod92OO+htv0MWqKWbr3Mo2Hqhn+t0+UVWsW4k44e7rUw3xQq"
-        + "r2VdMJv/C68BXUgqh3pplUDjWyXfreiACTT0q3HT6v6WaihKCa2WY9Kd1IkDcLHb"
-        + "TZk8FqMmGn72SgJw3H5Dvu7AiZijjNAUulMnMpxBEKyFTU2xRBlZZVcp50VJ2F7+"
-        + "siisxbcYOAX4GztLMlcyq921Ov/ipDCCA88wggK3oAMCAQICEQCmaX+5+m5bF5us"
-        + "CtyMq41SMA0GCSqGSIb3DQEBBQUAMGYxJDAiBgNVBAoMG0ZpbmFuc2llbGwgSUQt"
-        + "VGVrbmlrIEJJRCBBQjEfMB0GA1UECwwWQmFua0lEIE1lbWJlciBCYW5rcyBDQTEd"
-        + "MBsGA1UEAwwUQmFua0lEIFJvb3QgQ0EgVEVTVDIwHhcNMDQwODEzMDcyMDEwWhcN"
-        + "MjkwODEyMTIwMjQ2WjBmMSQwIgYDVQQKDBtGaW5hbnNpZWxsIElELVRla25payBC"
-        + "SUQgQUIxHzAdBgNVBAsMFkJhbmtJRCBNZW1iZXIgQmFua3MgQ0ExHTAbBgNVBAMM"
-        + "FEJhbmtJRCBSb290IENBIFRFU1QyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB"
-        + "CgKCAQEA25D0f1gipbACk4Bg3t6ODUlCWOU0TWeTkzAHR7IRB5T++yvsVosedMMW"
-        + "6KYYTbPONeJSt5kydX+wZi9nVNdlhkNULLbDKWfRY7x+B9MR1Q0Kq/e4VR0uRsak"
-        + "Bv5iwEYZ7cSR63HfBaPTqQsGobq+wtGH5JeTBrmCt4A3kN1UWgX32Dv/I3m7v8bK"
-        + "iwh4cnvAD9PIOtq6pOmAkSvLvp8jCy3qFLe9KAxm8M/ZAmnxYaRV8DVEg57FGoG6"
-        + "oiG3Ixx8PSVVdzpFY4kuUFLi4ueMPwjnXFiBhhWJJeOtFG3Lc2aW3zvcDbD/MsDm"
-        + "rSZNTmtbOOou8xuMKjlNY9PU5MHIaQIDAQABo3gwdjAPBgNVHRMBAf8EBTADAQH/"
-        + "MBMGA1UdIAQMMAowCAYGKoVwPAEGMA4GA1UdDwEB/wQEAwIBBjAfBgNVHSMEGDAW"
-        + "gBSbkzD5Yx3GHa0TvbBItWpm+LRN1TAdBgNVHQ4EFgQUm5Mw+WMdxh2tE72wSLVq"
-        + "Zvi0TdUwDQYJKoZIhvcNAQEFBQADggEBAIQ4ZBHWssA38pfNzH5A+H3SXpAlI8Jc"
-        + "LuoMVOIwwbfd1Up0xopCs+Ay41v8FZtcTMFqCVTih2nzVusTgnFBPMPJ2cnTlRue"
-        + "kAtVRNsiWn2/Ool/OXoYf5YnpgYu8t9jLCBCoDS5YJg714r9V9hCwfey8TCWBU80"
-        + "vL7EIfjK13nUxf8d49GzZlFMNqGDMjfMp1FYrHBGLZBr8br/G/7em1Cprw7iR8cw"
-        + "pddz+QXXFIrIz5Y9D/x1RrwoLibPw0kMrSwI2G4aCvoBySfbD6cpnJf6YHRctdSb"
-        + "755zhdBW7XWTl6ReUVuEt0hTFms4F60kFAi5hIbDRSN1Slv5yP2b0EA=");
-
-    private static byte[] invalidResp = Base64.decode(
-        "MIIGggoAoIIGfDCCBngGCSsGAQUFBzABAQSCBmkwggZlMIHeoTQwMjELMAkG"
-      + "A1UEBhMCVVMxDTALBgNVBAoMBGlXYXkxFDASBgNVBAMMC2lXYXkgT3BlbkNB"
-      + "GA8yMDEyMDEyMzIxMjkxMVowbjBsMEQwCQYFKw4DAhoFAAQUPA5ymcOyHyZJ"
-      + "d7DAidsEh79Uh6QEFMHnDLGSc/VElMBzr5f0+LQnpN2YAgsA5xIzv2Ln0dAa"
-      + "94IAGA8yMDEyMDEyMzIxMjkxMVqgERgPMjAxMjAxMjMyMTM0MTFaoSUwIzAh"
-      + "BgkrBgEFBQcwAQIEFCHEdgCz5w64KgppPIetaRzxewinMA0GCSqGSIb3DQEB"
-      + "CwUAA4IBAQBsW8cXR4eOLgclY/uRodjso/5xkHIAiJy+DpgqELRrnzKe87HO"
-      + "Km7DCicz1nwsPJskK14xtIw1rfQ8nzgztriComAUVc/pxJ9wQWGZI3d2dNbW"
-      + "AmecKb/mG0QrJrt3U5D0+CFTUq5u7NOs1jZRe+df9TDLBr0vIA6a0I6K9M9F"
-      + "ZOPWU/j5KVjoi0/kv4wnxRzQ2zc4Z3b5gm9T0MXMH5bST3z4yhOs/NRezNTA"
-      + "fBQvimS60d4fybH0pXcVYUH81y5fm9rCpuwQ6rMt2vi0ZKrfyVom4OIAr/gh"
-      + "Doj8Yh/LdtI1RvFkAL3pvzs06cfg3qM38b9Uh9w93w4/Hguw14eroIIEbDCC"
-      + "BGgwggRkMIIDTKADAgECAgEBMA0GCSqGSIb3DQEBCwUAMDIxCzAJBgNVBAYT"
-      + "AlVTMQ0wCwYDVQQKDARpV2F5MRQwEgYDVQQDDAtpV2F5IE9wZW5DQTAeFw0x"
-      + "MjAxMjAxNTIyMjFaFw0zMjAxMTUxNTIyMjFaMDIxCzAJBgNVBAYTAlVTMQ0w"
-      + "CwYDVQQKDARpV2F5MRQwEgYDVQQDDAtpV2F5IE9wZW5DQTCCASIwDQYJKoZI"
-      + "hvcNAQEBBQADggEPADCCAQoCggEBALOnLWYPvGNLxodQQ16tqCKflpEQF2OA"
-      + "0inZbIeUVxOgph5Qf562XV1Mtbv5Agv+z4/LSLbwuo28NTkhSlEEwf1k9vL9"
-      + "/wFvpPZ4ecpqXOS6LJ6khmMh53IwK/QpG8CeF9UxTZskjQzD9XgnNGYd2BIj"
-      + "qVbzU5qWhsPYPRrsAaE2jS6My5+xfiw46/Xj26VZQ/PR/rVURsc40fpCE30y"
-      + "TyORQeeZfjb/LxXH3e/3wjya04MBACv+uX89n5YXG7OH6zTriMAOn/aiXPfE"
-      + "E8g834RKvVS7ruELWG/IcZDC+Eoy2qtgG7y1rFlXd3H/6rny+Xd+BZrt0WP/"
-      + "hfezklVw3asCAwEAAaOCAYMwggF/MA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0P"
-      + "BAQDAgEGMB0GA1UdDgQWBBTB5wyxknP1RJTAc6+X9Pi0J6TdmDAfBgNVHSME"
-      + "GDAWgBTB5wyxknP1RJTAc6+X9Pi0J6TdmDAjBgNVHREEHDAagRhzdXBwb3J0"
-      + "QGl3YXlzb2Z0d2FyZS5jb20wIwYDVR0SBBwwGoEYc3VwcG9ydEBpd2F5c29m"
-      + "dHdhcmUuY29tMIGYBggrBgEFBQcBAQSBizCBiDA5BggrBgEFBQcwAoYtaHR0"
-      + "cDovL2l3NTRjZW50LXZtMi9wa2kvcHViL2NhY2VydC9jYWNlcnQuY3J0MCUG"
-      + "CCsGAQUFBzABhhlodHRwOi8vaXc1NGNlbnQtdm0yOjI1NjAvMCQGCCsGAQUF"
-      + "BzAMhhhodHRwOi8vaXc1NGNlbnQtdm0yOjgzMC8wOgYDVR0fBDMwMTAvoC2g"
-      + "K4YpaHR0cDovL2l3NTRjZW50LXZtMi9wa2kvcHViL2NybC9jYWNybC5jcmww"
-      + "DQYJKoZIhvcNAQELBQADggEBAE9wBjQ1c+HAO2gIzT+J5Gqgrcu/m7t4hnHN"
-      + "m5eyIfwXD1T6wOhovFmzPTaO9BSNsi4G5R7yZxOHeLN4PIY2kwFIbSkg7mwe"
-      + "5aGp2RPIuK/MtzMZT6pq8uMGhzyHGsqtdkz7p26/G0anU2u59eimcvISdwNE"
-      + "QXOIp/KNUC+Vx+Pmfw8PuFYDNacZ6YXp5qKoEjyUoBhNicmVINTNfDu0CQhu"
-      + "pDr2UmDMDT2cdmTSRC0rcTe3BNzWqtsXNmIBFL1oB7B0PZbmFm8Bgvk1azxa"
-      + "ClrcOKZWKOWa14XJy/DJk6nlOiq5W2AglUt8JVOpa5oVdiNRIT2WoGnpqVV9"
-      + "tUeoWog=");
-
-    private static final String BC = "BC";
-
-    public String getName()
-    {
-        return "OCSP";
-    }
-
-    private void testECDSA()
-        throws Exception
-    {
-        String signDN = "O=Bouncy Castle, C=AU";
-        KeyPair signKP = OCSPTestUtil.makeECKeyPair();
-        X509CertificateHolder testCert = new JcaX509CertificateHolder(OCSPTestUtil.makeECDSACertificate(signKP, signDN, signKP, signDN));
-        DigestCalculatorProvider digCalcProv = new JcaDigestCalculatorProviderBuilder().setProvider(BC).build();
-
-        String origDN = "CN=Eric H. Echidna, E=eric@bouncycastle.org, O=Bouncy Castle, C=AU";
-        GeneralName origName = new GeneralName(new X509Name(origDN));
-
-        //
-        // general id value for our test issuer cert and a serial number.
-        //
-        CertificateID id = new CertificateID(digCalcProv.get(CertificateID.HASH_SHA1), testCert, BigInteger.valueOf(1));
-
-        //
-        // basic request generation
-        //
-        OCSPReqBuilder gen = new OCSPReqBuilder();
-        gen.addRequest(id);
-
-        OCSPReq req = gen.build();
-
-        if (req.isSigned())
-        {
-            fail("signed but shouldn't be");
-        }
-
-        X509CertificateHolder[] certs = req.getCerts();
-
-        if (certs.length != 0)
-        {
-            fail("0 certs expected, but not found");
-        }
-
-        Req[] requests = req.getRequestList();
-
-        if (!requests[0].getCertID().equals(id))
-        {
-            fail("Failed isFor test");
-        }
-
-        //
-        // request generation with signing
-        //
-        X509CertificateHolder[] chain = new X509CertificateHolder[1];
-
-        gen = new OCSPReqBuilder();
-
-        gen.setRequestorName(new GeneralName(GeneralName.directoryName, new X509Principal("CN=fred")));
-
-        gen.addRequest(
-            new CertificateID(digCalcProv.get(CertificateID.HASH_SHA1), testCert, BigInteger.valueOf(1)));
-
-        chain[0] = testCert;
-
-        req = gen.build(new JcaContentSignerBuilder("SHA1withECDSA").setProvider(BC).build( signKP.getPrivate()), chain);
-
-        if (!req.isSigned())
-        {
-            fail("not signed but should be");
-        }
-
-        if (!req.isSignatureValid(new JcaContentVerifierProviderBuilder().setProvider(BC).build(signKP.getPublic())))
-        {
-            fail("signature failed to verify");
-        }
-
-        requests = req.getRequestList();
-
-        if (!requests[0].getCertID().equals(id))
-        {
-            fail("Failed isFor test");
-        }
-
-        certs = req.getCerts();
-
-        if (certs == null)
-        {
-            fail("null certs found");
-        }
-
-        if (certs.length != 1 || !certs[0].equals(testCert))
-        {
-            fail("incorrect certs found in request");
-        }
-
-        //
-        // encoding test
-        //
-        byte[] reqEnc = req.getEncoded();
-
-        OCSPReq newReq = new OCSPReq(reqEnc);
-
-        if (!newReq.isSignatureValid(new JcaContentVerifierProviderBuilder().setProvider(BC).build(signKP.getPublic())))
-        {
-            fail("newReq signature failed to verify");
-        }
-
-        //
-        // request generation with signing and nonce
-        //
-        chain = new X509CertificateHolder[1];
-
-        gen = new OCSPReqBuilder();
-
-        Vector oids = new Vector();
-        Vector values = new Vector();
-        byte[] sampleNonce = new byte[16];
-        Random rand = new Random();
-
-        rand.nextBytes(sampleNonce);
-
-        gen.setRequestorName(new GeneralName(GeneralName.directoryName, new X509Principal("CN=fred")));
-
-        ExtensionsGenerator extGen = new ExtensionsGenerator();
-
-        extGen.addExtension(OCSPObjectIdentifiers.id_pkix_ocsp_nonce, false, new DEROctetString(sampleNonce));
-
-        gen.setRequestExtensions(extGen.generate());
-
-        gen.addRequest(
-            new CertificateID(digCalcProv.get(CertificateID.HASH_SHA1), testCert, BigInteger.valueOf(1)));
-
-        chain[0] = testCert;
-
-        req = gen.build(new JcaContentSignerBuilder("SHA1withECDSA").setProvider(BC).build(signKP.getPrivate()), chain);
-
-        if (!req.isSigned())
-        {
-            fail("not signed but should be");
-        }
-
-        if (!req.isSignatureValid(new JcaContentVerifierProviderBuilder().setProvider(BC).build(signKP.getPublic())))
-        {
-            fail("signature failed to verify");
-        }
-
-        //
-        // extension check.
-        //
-        Set extOids = req.getCriticalExtensionOIDs();
-
-        if (extOids.size() != 0)
-        {
-            fail("wrong number of critical extensions in OCSP request.");
-        }
-
-        extOids = req.getNonCriticalExtensionOIDs();
-
-        if (extOids.size() != 1)
-        {
-            fail("wrong number of non-critical extensions in OCSP request.");
-        }
-
-        Extension extValue = req.getExtension(OCSPObjectIdentifiers.id_pkix_ocsp_nonce);
-
-        ASN1Encodable extObj = extValue.getParsedValue();
-
-        if (!(extObj instanceof ASN1OctetString))
-        {
-            fail("wrong extension type found.");
-        }
-
-        if (!areEqual(((ASN1OctetString)extObj).getOctets(), sampleNonce))
-        {
-            fail("wrong extension value found.");
-        }
-
-        //
-        // request list check
-        //
-        requests = req.getRequestList();
-
-        if (!requests[0].getCertID().equals(id))
-        {
-            fail("Failed isFor test");
-        }
-
-        //
-        // response generation
-        //
-        BasicOCSPRespBuilder respGen = new JcaBasicOCSPRespBuilder(signKP.getPublic(), digCalcProv.get(RespID.HASH_SHA1));
-
-        respGen.addResponse(id, CertificateStatus.GOOD);
-
-        BasicOCSPResp resp = respGen.build(new JcaContentSignerBuilder("SHA1withECDSA").setProvider(BC).build(signKP.getPrivate()), chain, new Date());
-    }
-
-    private void testRSA()
-        throws Exception
-    {
-        String signDN = "O=Bouncy Castle, C=AU";
-        KeyPair signKP = OCSPTestUtil.makeKeyPair();
-        X509CertificateHolder testCert = new JcaX509CertificateHolder(OCSPTestUtil.makeCertificate(signKP, signDN, signKP, signDN));
-        DigestCalculatorProvider digCalcProv = new JcaDigestCalculatorProviderBuilder().setProvider(BC).build();
-
-        String origDN = "CN=Eric H. Echidna, E=eric@bouncycastle.org, O=Bouncy Castle, C=AU";
-        GeneralName origName = new GeneralName(new X509Name(origDN));
-
-        //
-        // general id value for our test issuer cert and a serial number.
-        //
-        CertificateID id = new CertificateID(digCalcProv.get(CertificateID.HASH_SHA1), testCert, BigInteger.valueOf(1));
-
-        //
-        // basic request generation
-        //
-        OCSPReqBuilder gen = new OCSPReqBuilder();
-
-        gen.addRequest(
-            new CertificateID(digCalcProv.get(CertificateID.HASH_SHA1), testCert, BigInteger.valueOf(1)));
-
-        OCSPReq req = gen.build();
-
-        if (req.isSigned())
-        {
-            fail("signed but shouldn't be");
-        }
-
-        X509CertificateHolder[] certs = req.getCerts();
-
-        if (certs.length != 0)
-        {
-            fail("0 certs expected, but not found");
-        }
-
-        Req[] requests = req.getRequestList();
-
-        if (!requests[0].getCertID().equals(id))
-        {
-            fail("Failed isFor test");
-        }
-
-        //
-        // request generation with signing
-        //
-        X509CertificateHolder[] chain = new X509CertificateHolder[1];
-
-        gen = new OCSPReqBuilder();
-
-        gen.setRequestorName(new GeneralName(GeneralName.directoryName, new X509Principal("CN=fred")));
-
-        gen.addRequest(
-            new CertificateID(digCalcProv.get(CertificateID.HASH_SHA1), testCert, BigInteger.valueOf(1)));
-
-        chain[0] = testCert;
-
-        req = gen.build(new JcaContentSignerBuilder("SHA1withRSA").setProvider(BC).build(signKP.getPrivate()), chain);
-
-        if (!req.isSigned())
-        {
-            fail("not signed but should be");
-        }
-
-        if (!req.isSignatureValid(new JcaContentVerifierProviderBuilder().setProvider(BC).build(signKP.getPublic())))
-        {
-            fail("signature failed to verify");
-        }
-
-        requests = req.getRequestList();
-
-        if (!requests[0].getCertID().equals(id))
-        {
-            fail("Failed isFor test");
-        }
-
-        certs = req.getCerts();
-
-        if (certs == null)
-        {
-            fail("null certs found");
-        }
-
-        if (certs.length != 1 || !certs[0].equals(testCert))
-        {
-            fail("incorrect certs found in request");
-        }
-
-        //
-        // encoding test
-        //
-        byte[] reqEnc = req.getEncoded();
-
-        OCSPReq newReq = new OCSPReq(reqEnc);
-
-        if (!newReq.isSignatureValid(new JcaContentVerifierProviderBuilder().setProvider(BC).build(signKP.getPublic())))
-        {
-            fail("newReq signature failed to verify");
-        }
-
-        //
-        // request generation with signing and nonce
-        //
-        chain = new X509CertificateHolder[1];
-
-        gen = new OCSPReqBuilder();
-
-        byte[] sampleNonce = new byte[16];
-        Random rand = new Random();
-
-        rand.nextBytes(sampleNonce);
-
-        gen.setRequestorName(new GeneralName(GeneralName.directoryName, new X509Principal("CN=fred")));
-
-        ExtensionsGenerator extGen = new ExtensionsGenerator();
-
-        extGen.addExtension(OCSPObjectIdentifiers.id_pkix_ocsp_nonce, false, new DEROctetString(sampleNonce));
-
-        gen.setRequestExtensions(extGen.generate());
-
-        gen.addRequest(
-            new CertificateID(digCalcProv.get(CertificateID.HASH_SHA1), testCert, BigInteger.valueOf(1)));
-
-        chain[0] = testCert;
-
-        req = gen.build(new JcaContentSignerBuilder("SHA1withRSA").setProvider(BC).build(signKP.getPrivate()), chain);
-
-        if (!req.isSigned())
-        {
-            fail("not signed but should be");
-        }
-
-        if (!req.isSignatureValid(new JcaContentVerifierProviderBuilder().setProvider(BC).build(signKP.getPublic())))
-        {
-            fail("signature failed to verify");
-        }
-
-        //
-        // extension check.
-        //
-        Set extOids = req.getCriticalExtensionOIDs();
-
-        if (extOids.size() != 0)
-        {
-            fail("wrong number of critical extensions in OCSP request.");
-        }
-
-        extOids = req.getNonCriticalExtensionOIDs();
-
-        if (extOids.size() != 1)
-        {
-            fail("wrong number of non-critical extensions in OCSP request.");
-        }
-
-        Extension ext = req.getExtension(OCSPObjectIdentifiers.id_pkix_ocsp_nonce);
-
-        ASN1Encodable extObj = ext.getParsedValue();
-
-        if (!(extObj instanceof ASN1OctetString))
-        {
-            fail("wrong extension type found.");
-        }
-
-        if (!areEqual(((ASN1OctetString)extObj).getOctets(), sampleNonce))
-        {
-            fail("wrong extension value found.");
-        }
-
-        //
-        // request list check
-        //
-        requests = req.getRequestList();
-
-        if (!requests[0].getCertID().equals(id))
-        {
-            fail("Failed isFor test");
-        }
-
-        //
-        // response generation
-        //
-        BasicOCSPRespBuilder respGen = new JcaBasicOCSPRespBuilder(signKP.getPublic(), digCalcProv.get(RespID.HASH_SHA1));
-
-        respGen.addResponse(id, CertificateStatus.GOOD);
-
-        BasicOCSPResp resp = respGen.build(new JcaContentSignerBuilder("SHA1withRSA").setProvider(BC).build(signKP.getPrivate()), chain, new Date());
-        OCSPRespBuilder rGen = new OCSPRespBuilder();
-
-        byte[] enc = rGen.build(OCSPRespBuilder.SUCCESSFUL, resp).getEncoded();
-    }
-
-    private void testIrregularVersionReq()
-        throws Exception
-    {
-        OCSPReq ocspRequest = new OCSPReq(irregReq);
-        X509CertificateHolder cert = ocspRequest.getCerts()[0];
-        if (!ocspRequest.isSignatureValid(new JcaContentVerifierProviderBuilder().setProvider(BC).build(cert)))
-        {
-            fail("extra version encoding test failed");
-        }
-    }
-
-    public void testInvalidResp()
-        throws Exception
-    {
-        try
-        {
-            OCSPResp response = new OCSPResp(invalidResp);
-        }
-        catch (CertIOException e)
-        {
-            if (e.getCause() instanceof ASN1Exception)
-            {
-                Throwable c = ((ASN1Exception)e.getCause()).getCause();
-
-                if (!c.getMessage().equals("ENUMERATED has zero length"))
-                {
-                    fail("parsing failed, but for wrong reason: " + c.getMessage());
-                }
-            }
-            else
-            {
-                fail("parsing failed, but for wrong reason: " + e.getMessage());
-            }
-        }
-
-
-    }
-
-    public void performTest()
-        throws Exception
-    {
-        String signDN = "O=Bouncy Castle, C=AU";
-        KeyPair signKP = OCSPTestUtil.makeKeyPair();
-        X509CertificateHolder testCert = new JcaX509CertificateHolder(OCSPTestUtil.makeCertificate(signKP, signDN, signKP, signDN));
-
-        String origDN = "CN=Eric H. Echidna, E=eric@bouncycastle.org, O=Bouncy Castle, C=AU";
-        GeneralName origName = new GeneralName(new X509Name(origDN));
-        DigestCalculatorProvider digCalcProv = new JcaDigestCalculatorProviderBuilder().setProvider(BC).build();
-
-        //
-        // general id value for our test issuer cert and a serial number.
-        //
-        CertificateID id = new CertificateID(digCalcProv.get(CertificateID.HASH_SHA1), testCert, BigInteger.valueOf(1));
-
-        //
-        // basic request generation
-        //
-        OCSPReqBuilder gen = new OCSPReqBuilder();
-
-        gen.addRequest(
-            new CertificateID(digCalcProv.get(CertificateID.HASH_SHA1), testCert, BigInteger.valueOf(1)));
-
-        OCSPReq req = gen.build();
-
-        if (req.isSigned())
-        {
-            fail("signed but shouldn't be");
-        }
-
-        X509CertificateHolder[] certs = req.getCerts();
-
-        if (certs.length != 0)
-        {
-            fail("0 certs expected, but not found");
-        }
-
-        Req[] requests = req.getRequestList();
-
-        if (!requests[0].getCertID().equals(id))
-        {
-            fail("Failed isFor test");
-        }
-
-        //
-        // request generation with signing
-        //
-        X509CertificateHolder[] chain = new X509CertificateHolder[1];
-
-        gen = new OCSPReqBuilder();
-
-        gen.setRequestorName(new GeneralName(GeneralName.directoryName, new X509Principal("CN=fred")));
-
-        gen.addRequest(
-            new CertificateID(digCalcProv.get(CertificateID.HASH_SHA1), testCert, BigInteger.valueOf(1)));
-
-        chain[0] = testCert;
-
-        req = gen.build(new JcaContentSignerBuilder("SHA1withRSA").setProvider(BC).build(signKP.getPrivate()), chain);
-
-        if (!req.isSigned())
-        {
-            fail("not signed but should be");
-        }
-
-        if (!req.isSignatureValid(new JcaContentVerifierProviderBuilder().setProvider(BC).build(signKP.getPublic())))
-        {
-            fail("signature failed to verify");
-        }
-
-        requests = req.getRequestList();
-
-        if (!requests[0].getCertID().equals(id))
-        {
-            fail("Failed isFor test");
-        }
-
-        certs = req.getCerts();
-
-        if (certs == null)
-        {
-            fail("null certs found");
-        }
-
-        if (certs.length != 1 || !certs[0].equals(testCert))
-        {
-            fail("incorrect certs found in request");
-        }
-
-        //
-        // encoding test
-        //
-        byte[] reqEnc = req.getEncoded();
-
-        OCSPReq newReq = new OCSPReq(reqEnc);
-
-        if (!newReq.isSignatureValid(new JcaContentVerifierProviderBuilder().setProvider(BC).build(signKP.getPublic())))
-        {
-            fail("newReq signature failed to verify");
-        }
-
-        //
-        // request generation with signing and nonce
-        //
-        chain = new X509CertificateHolder[1];
-
-        gen = new OCSPReqBuilder();
-
-        Vector oids = new Vector();
-        Vector values = new Vector();
-        byte[] sampleNonce = new byte[16];
-        Random rand = new Random();
-
-        rand.nextBytes(sampleNonce);
-
-        gen.setRequestorName(new GeneralName(GeneralName.directoryName, new X509Principal("CN=fred")));
-
-        ExtensionsGenerator extGen = new ExtensionsGenerator();
-
-        extGen.addExtension(OCSPObjectIdentifiers.id_pkix_ocsp_nonce, false, new DEROctetString(sampleNonce));
-
-        gen.setRequestExtensions(extGen.generate());
-
-        gen.addRequest(
-            new CertificateID(digCalcProv.get(CertificateID.HASH_SHA1), testCert, BigInteger.valueOf(1)));
-
-        chain[0] = testCert;
-
-        req = gen.build(new JcaContentSignerBuilder("SHA1withRSA").setProvider(BC).build(signKP.getPrivate()), chain);
-
-        if (!req.isSigned())
-        {
-            fail("not signed but should be");
-        }
-
-        if (!req.isSignatureValid(new JcaContentVerifierProviderBuilder().setProvider(BC).build(signKP.getPublic())))
-        {
-            fail("signature failed to verify");
-        }
-
-        //
-        // extension check.
-        //
-        Set extOids = req.getCriticalExtensionOIDs();
-
-        if (extOids.size() != 0)
-        {
-            fail("wrong number of critical extensions in OCSP request.");
-        }
-
-        extOids = req.getNonCriticalExtensionOIDs();
-
-        if (extOids.size() != 1)
-        {
-            fail("wrong number of non-critical extensions in OCSP request.");
-        }
-
-        Extension ext = req.getExtension(OCSPObjectIdentifiers.id_pkix_ocsp_nonce);
-
-        ASN1Encodable extObj = ext.getParsedValue();
-
-        if (!(extObj instanceof ASN1OctetString))
-        {
-            fail("wrong extension type found.");
-        }
-
-        if (!areEqual(((ASN1OctetString)extObj).getOctets(), sampleNonce))
-        {
-            fail("wrong extension value found.");
-        }
-
-        //
-        // request list check
-        //
-        requests = req.getRequestList();
-
-        if (!requests[0].getCertID().equals(id))
-        {
-            fail("Failed isFor test");
-        }
-
-        //
-        // response parsing - test 1
-        //
-        OCSPResp response = new OCSPResp(testResp1);
-
-        if (response.getStatus() != 0)
-        {
-            fail("response status not zero.");
-        }
-
-        BasicOCSPResp brep = (BasicOCSPResp)response.getResponseObject();
-        chain = brep.getCerts();
-
-        if (!brep.isSignatureValid(new JcaContentVerifierProviderBuilder().setProvider(BC).build(chain[0])))
-        {
-            fail("response 1 failed to verify.");
-        }
-
-        //
-        // test 2
-        //
-        SingleResp[] singleResp = brep.getResponses();
-
-        response = new OCSPResp(testResp2);
-
-        if (response.getStatus() != 0)
-        {
-            fail("response status not zero.");
-        }
-
-        brep = (BasicOCSPResp)response.getResponseObject();
-        chain = brep.getCerts();
-        
-        if (!brep.isSignatureValid(new JcaContentVerifierProviderBuilder().setProvider(BC).build(chain[0])))
-        {
-            fail("response 2 failed to verify.");
-        }
-
-        singleResp = brep.getResponses();
-
-        //
-        // simple response generation
-        //
-        OCSPRespBuilder respGen = new OCSPRespBuilder();
-        OCSPResp resp = respGen.build(OCSPRespBuilder.SUCCESSFUL, response.getResponseObject());
-
-        if (!resp.getResponseObject().equals(response.getResponseObject()))
-        {
-            fail("response fails to match");
-        }
-
-        testECDSA();
-        testRSA();
-        testIrregularVersionReq();
-        testInvalidResp();
-
-        //
-        // Empty data test
-        //
-        try
-        {
-            response = new OCSPResp(new byte[0]);
-            fail("no exception thrown");
-        }
-        catch (IOException e)
-        {
-             if (!e.getMessage().equals("malformed response: no response data found"))
-             {
-                 fail("wrong exception");
-             }
-        }
-
-        try
-        {
-            req = new OCSPReq(new byte[0]);
-            fail("no exception thrown");
-        }
-        catch (IOException e)
-        {
-             if (!e.getMessage().equals("malformed request: no request data found"))
-             {
-                 fail("wrong exception");
-             }
-        }
-    }
-
-    public static void main(
-        String[] args)
-    {
-        Security.addProvider(new BouncyCastleProvider());
-
-        runTest(new OCSPTest());
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/ocsp/test/OCSPTestUtil.java b/bcpkix/src/main/java/org/bouncycastle/cert/ocsp/test/OCSPTestUtil.java
deleted file mode 100644
index cab31e7..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/ocsp/test/OCSPTestUtil.java
+++ /dev/null
@@ -1,177 +0,0 @@
-package org.bouncycastle.cert.ocsp.test;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.math.BigInteger;
-import java.security.KeyPair;
-import java.security.KeyPairGenerator;
-import java.security.PrivateKey;
-import java.security.PublicKey;
-import java.security.SecureRandom;
-import java.security.cert.X509Certificate;
-import java.util.Date;
-
-import javax.crypto.KeyGenerator;
-
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.x509.AuthorityKeyIdentifier;
-import org.bouncycastle.asn1.x509.BasicConstraints;
-import org.bouncycastle.asn1.x509.SubjectKeyIdentifier;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.bouncycastle.asn1.x509.X509Extensions;
-import org.bouncycastle.asn1.x509.X509Name;
-import org.bouncycastle.cert.bc.BcX509ExtensionUtils;
-import org.bouncycastle.x509.X509V3CertificateGenerator;
-
-public class OCSPTestUtil
-{
-    
-    public static SecureRandom     rand;
-    public static KeyPairGenerator kpg, eckpg;
-    public static KeyGenerator     desede128kg;
-    public static KeyGenerator     desede192kg;
-    public static KeyGenerator     rc240kg;
-    public static KeyGenerator     rc264kg;
-    public static KeyGenerator     rc2128kg;
-    public static BigInteger       serialNumber;
-    
-    public static final boolean DEBUG = true;
-    
-    static
-    {
-        try
-        {
-            rand = new SecureRandom();
-
-            kpg  = KeyPairGenerator.getInstance("RSA", "BC");
-            kpg.initialize(1024, rand);
-
-            serialNumber = new BigInteger("1");
-
-            eckpg = KeyPairGenerator.getInstance("ECDSA", "BC");
-            eckpg.initialize(192, rand);
-        }
-        catch(Exception ex)
-        {
-            throw new RuntimeException(ex.toString());
-        }
-    }
-    
-    public static KeyPair makeKeyPair()
-    {
-        return kpg.generateKeyPair();
-    }
-
-    public static KeyPair makeECKeyPair()
-    {
-        return eckpg.generateKeyPair();
-    }
-
-    public static X509Certificate makeCertificate(KeyPair _subKP,
-            String _subDN, KeyPair _issKP, String _issDN)
-            throws Exception
-    {
-
-        return makeCertificate(_subKP, _subDN, _issKP, _issDN, false);
-    }
-
-    public static X509Certificate makeECDSACertificate(KeyPair _subKP,
-            String _subDN, KeyPair _issKP, String _issDN)
-            throws Exception
-    {
-
-        return makeECDSACertificate(_subKP, _subDN, _issKP, _issDN, false);
-    }
-
-    public static X509Certificate makeCACertificate(KeyPair _subKP,
-            String _subDN, KeyPair _issKP, String _issDN)
-            throws Exception
-    {
-
-        return makeCertificate(_subKP, _subDN, _issKP, _issDN, true);
-    }
-
-    public static X509Certificate makeCertificate(KeyPair _subKP,
-            String _subDN, KeyPair _issKP, String _issDN, boolean _ca)
-            throws Exception
-    {
-        return makeCertificate(_subKP,_subDN, _issKP, _issDN, "MD5withRSA", _ca);
-    }
-
-    public static X509Certificate makeECDSACertificate(KeyPair _subKP,
-            String _subDN, KeyPair _issKP, String _issDN, boolean _ca)
-            throws Exception
-    {
-        return makeCertificate(_subKP,_subDN, _issKP, _issDN, "SHA1WithECDSA", _ca);
-    }
-
-    public static X509Certificate makeCertificate(KeyPair _subKP,
-            String _subDN, KeyPair _issKP, String _issDN, String algorithm, boolean _ca)
-            throws Exception
-    {
-
-        PublicKey _subPub = _subKP.getPublic();
-        PrivateKey _issPriv = _issKP.getPrivate();
-        PublicKey _issPub = _issKP.getPublic();
-
-        X509V3CertificateGenerator _v3CertGen = new X509V3CertificateGenerator();
-
-        _v3CertGen.reset();
-        _v3CertGen.setSerialNumber(allocateSerialNumber());
-        _v3CertGen.setIssuerDN(new X509Name(_issDN));
-        _v3CertGen.setNotBefore(new Date(System.currentTimeMillis()));
-        _v3CertGen.setNotAfter(new Date(System.currentTimeMillis()
-                + (1000L * 60 * 60 * 24 * 100)));
-        _v3CertGen.setSubjectDN(new X509Name(_subDN));
-        _v3CertGen.setPublicKey(_subPub);
-        _v3CertGen.setSignatureAlgorithm(algorithm);
-
-        _v3CertGen.addExtension(X509Extensions.SubjectKeyIdentifier, false,
-                createSubjectKeyId(_subPub));
-
-        _v3CertGen.addExtension(X509Extensions.AuthorityKeyIdentifier, false,
-                createAuthorityKeyId(_issPub));
-
-        _v3CertGen.addExtension(X509Extensions.BasicConstraints, false,
-                new BasicConstraints(_ca));
-
-        X509Certificate _cert = _v3CertGen.generate(_issPriv);
-
-        _cert.checkValidity(new Date());
-        _cert.verify(_issPub);
-
-        return _cert;
-    }
-
-    /*
-     * 
-     * INTERNAL METHODS
-     * 
-     */
-
-    private static AuthorityKeyIdentifier createAuthorityKeyId(PublicKey _pubKey)
-            throws IOException
-    {
-
-        ByteArrayInputStream _bais = new ByteArrayInputStream(_pubKey
-                .getEncoded());
-        SubjectPublicKeyInfo _info = new SubjectPublicKeyInfo(
-                (ASN1Sequence)new ASN1InputStream(_bais).readObject());
-
-        return new AuthorityKeyIdentifier(_info);
-    }
-
-    private static SubjectKeyIdentifier createSubjectKeyId(PublicKey _pubKey)
-            throws IOException
-    {
-        return new BcX509ExtensionUtils().createSubjectKeyIdentifier(SubjectPublicKeyInfo.getInstance(_pubKey.getEncoded()));
-    }
-
-    private static BigInteger allocateSerialNumber()
-    {
-        BigInteger _tmp = serialNumber;
-        serialNumber = serialNumber.add(BigInteger.valueOf(1));
-        return _tmp;
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/package.html b/bcpkix/src/main/java/org/bouncycastle/cert/package.html
deleted file mode 100644
index 1b2a305..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body bgcolor="#ffffff">
-Basic support package for handling and creating X.509 certificates, CRLs, and attribute certificates.
-</body>
-</html>
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/path/CertPath.java b/bcpkix/src/main/java/org/bouncycastle/cert/path/CertPath.java
deleted file mode 100644
index f91b3a8..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/path/CertPath.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package org.bouncycastle.cert.path;
-
-import org.bouncycastle.cert.X509CertificateHolder;
-
-public class CertPath
-{
-    private final X509CertificateHolder[] certificates;
-
-    public CertPath(X509CertificateHolder[] certificates)
-    {
-        this.certificates = copyArray(certificates);
-    }
-
-    public X509CertificateHolder[] getCertificates()
-    {
-        return copyArray(certificates);
-    }
-
-    public CertPathValidationResult validate(CertPathValidation[] ruleSet)
-    {
-        CertPathValidationContext context = new CertPathValidationContext(CertPathUtils.getCriticalExtensionsOIDs(certificates));
-
-        for (int i = 0; i != ruleSet.length; i++)
-        {
-            for (int j = certificates.length - 1; j >= 0; j--)
-            {
-                try
-                {
-                    context.setIsEndEntity(j == 0);
-                    ruleSet[i].validate(context, certificates[j]);
-                }
-                catch (CertPathValidationException e)
-                {   // TODO: introduce object to hold (i and e)
-                    return new CertPathValidationResult(context, j, i, e);
-                }
-            }
-        }
-
-        return new CertPathValidationResult(context);
-    }
-
-    public CertPathValidationResult evaluate(CertPathValidation[] ruleSet)
-    {
-        CertPathValidationContext context = new CertPathValidationContext(CertPathUtils.getCriticalExtensionsOIDs(certificates));
-
-        CertPathValidationResultBuilder builder = new CertPathValidationResultBuilder();
-
-        for (int i = 0; i != ruleSet.length; i++)
-        {
-            for (int j = certificates.length - 1; j >= 0; j--)
-            {
-                try
-                {
-                    context.setIsEndEntity(j == 0);
-                    ruleSet[i].validate(context, certificates[j]);
-                }
-                catch (CertPathValidationException e)
-                {
-                   builder.addException(e);
-                }
-            }
-        }
-
-        return builder.build();
-    }
-
-    private X509CertificateHolder[] copyArray(X509CertificateHolder[] array)
-    {
-        X509CertificateHolder[] rv = new X509CertificateHolder[array.length];
-
-        System.arraycopy(array, 0, rv, 0, rv.length);
-
-        return rv;
-    }
-
-    public int length()
-    {
-        return certificates.length;
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/path/CertPathUtils.java b/bcpkix/src/main/java/org/bouncycastle/cert/path/CertPathUtils.java
deleted file mode 100644
index 4811a3d..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/path/CertPathUtils.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package org.bouncycastle.cert.path;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import org.bouncycastle.cert.X509CertificateHolder;
-
-class CertPathUtils
-{
-    static Set getCriticalExtensionsOIDs(X509CertificateHolder[] certificates)
-    {
-        Set criticalExtensions = new HashSet();
-
-        for (int i = 0; i != certificates.length; i++)
-        {
-            criticalExtensions.addAll(certificates[i].getCriticalExtensionOIDs());
-        }
-
-        return criticalExtensions;
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/path/CertPathValidation.java b/bcpkix/src/main/java/org/bouncycastle/cert/path/CertPathValidation.java
deleted file mode 100644
index 2704fe6..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/path/CertPathValidation.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package org.bouncycastle.cert.path;
-
-import org.bouncycastle.cert.X509CertificateHolder;
-import org.bouncycastle.util.Memoable;
-
-public interface CertPathValidation
-    extends Memoable
-{
-    public void validate(CertPathValidationContext context, X509CertificateHolder certificate)
-        throws CertPathValidationException;
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/path/CertPathValidationContext.java b/bcpkix/src/main/java/org/bouncycastle/cert/path/CertPathValidationContext.java
deleted file mode 100644
index 6a4b0ec..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/path/CertPathValidationContext.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package org.bouncycastle.cert.path;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.util.Memoable;
-
-public class CertPathValidationContext
-    implements Memoable
-{
-    private Set criticalExtensions;
-
-    private Set handledExtensions = new HashSet();
-    private boolean endEntity;
-    private int index;
-
-    public CertPathValidationContext(Set criticalExtensionsOIDs)
-    {
-        this.criticalExtensions = criticalExtensionsOIDs;
-    }
-
-    public void addHandledExtension(ASN1ObjectIdentifier extensionIdentifier)
-    {
-        this.handledExtensions.add(extensionIdentifier);
-    }
-
-    public void setIsEndEntity(boolean isEndEntity)
-    {
-        this.endEntity = isEndEntity;
-    }
-
-    public Set getUnhandledCriticalExtensionOIDs()
-    {
-        Set rv = new HashSet(criticalExtensions);
-
-        rv.removeAll(handledExtensions);
-
-        return rv;
-    }
-
-    /**
-     * Returns true if the current certificate is the end-entity certificate.
-     *
-     * @return if current cert end-entity, false otherwise.
-     */
-    public boolean isEndEntity()
-    {
-        return endEntity;
-    }
-
-    public Memoable copy()
-    {
-        return null;  //To change body of implemented methods use File | Settings | File Templates.
-    }
-
-    public void reset(Memoable other)
-    {
-        //To change body of implemented methods use File | Settings | File Templates.
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/path/CertPathValidationException.java b/bcpkix/src/main/java/org/bouncycastle/cert/path/CertPathValidationException.java
deleted file mode 100644
index 958f2d0..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/path/CertPathValidationException.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.bouncycastle.cert.path;
-
-public class CertPathValidationException
-    extends Exception
-{
-    private final Exception cause;
-
-    public CertPathValidationException(String msg)
-    {
-        this(msg, null);
-    }
-
-    public CertPathValidationException(String msg, Exception cause)
-    {
-        super(msg);
-
-        this.cause = cause;
-    }
-
-    public Throwable getCause()
-    {
-        return cause;
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/path/CertPathValidationResult.java b/bcpkix/src/main/java/org/bouncycastle/cert/path/CertPathValidationResult.java
deleted file mode 100644
index facefb4..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/path/CertPathValidationResult.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package org.bouncycastle.cert.path;
-
-import java.util.Collections;
-import java.util.Set;
-
-public class CertPathValidationResult
-{
-    private final boolean isValid;
-    private final CertPathValidationException cause;
-    private final Set unhandledCriticalExtensionOIDs;
-
-    private int[] certIndexes;
-
-    public CertPathValidationResult(CertPathValidationContext context)
-    {
-        this.unhandledCriticalExtensionOIDs = Collections.unmodifiableSet(context.getUnhandledCriticalExtensionOIDs());
-        this.isValid = this.unhandledCriticalExtensionOIDs.isEmpty();
-        cause = null;
-    }
-
-    public CertPathValidationResult(CertPathValidationContext context, int certIndex, int ruleIndex, CertPathValidationException cause)
-    {
-        this.unhandledCriticalExtensionOIDs = Collections.unmodifiableSet(context.getUnhandledCriticalExtensionOIDs());
-        this.isValid = false;
-        this.cause = cause;
-    }
-
-    public CertPathValidationResult(CertPathValidationContext context, int[] certIndexes, int[] ruleIndexes, CertPathValidationException[] cause)
-    {
-        // TODO
-        this.unhandledCriticalExtensionOIDs = Collections.unmodifiableSet(context.getUnhandledCriticalExtensionOIDs());
-        this.isValid = false;
-        this.cause = cause[0];
-        this.certIndexes = certIndexes;
-    }
-
-    public boolean isValid()
-    {
-        return isValid;
-    }
-
-    public Exception getCause()
-    {
-        if (cause != null)
-        {
-            return cause;
-        }
-
-        if (!unhandledCriticalExtensionOIDs.isEmpty())
-        {
-            return new CertPathValidationException("Unhandled Critical Extensions");
-        }
-
-        return null;
-    }
-
-    public Set getUnhandledCriticalExtensionOIDs()
-    {
-        return unhandledCriticalExtensionOIDs;
-    }
-
-    public boolean isDetailed()
-    {
-        return this.certIndexes != null;
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/path/CertPathValidationResultBuilder.java b/bcpkix/src/main/java/org/bouncycastle/cert/path/CertPathValidationResultBuilder.java
deleted file mode 100644
index 9e81339..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/path/CertPathValidationResultBuilder.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package org.bouncycastle.cert.path;
-
-class CertPathValidationResultBuilder
-{
-    public CertPathValidationResult build()
-    {
-        return new CertPathValidationResult(null, 0, 0, null);
-    }
-
-    public void addException(CertPathValidationException exception)
-    {
-        //To change body of created methods use File | Settings | File Templates.
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/path/test/CertPathTest.java b/bcpkix/src/main/java/org/bouncycastle/cert/path/test/CertPathTest.java
deleted file mode 100644
index 3b8e23e..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/path/test/CertPathTest.java
+++ /dev/null
@@ -1,369 +0,0 @@
-package org.bouncycastle.cert.path.test;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.ObjectOutputStream;
-import java.security.InvalidKeyException;
-import java.security.NoSuchAlgorithmException;
-import java.security.NoSuchProviderException;
-import java.security.PublicKey;
-import java.security.Security;
-import java.security.SignatureException;
-import java.security.cert.CertPath;
-import java.security.cert.CertPathBuilder;
-import java.security.cert.CertPathBuilderException;
-import java.security.cert.CertPathBuilderResult;
-import java.security.cert.CertStore;
-import java.security.cert.Certificate;
-import java.security.cert.CertificateEncodingException;
-import java.security.cert.CertificateException;
-import java.security.cert.CertificateFactory;
-import java.security.cert.CollectionCertStoreParameters;
-import java.security.cert.PKIXBuilderParameters;
-import java.security.cert.TrustAnchor;
-import java.security.cert.X509CertSelector;
-import java.security.cert.X509Certificate;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-import java.util.Vector;
-
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.util.encoders.Base64;
-import org.bouncycastle.util.test.SimpleTest;
-
-public class CertPathTest
-    extends SimpleTest
-{
-    public static byte[] rootCertBin = Base64.decode(
-        "MIIBqzCCARQCAQEwDQYJKoZIhvcNAQEFBQAwHjEcMBoGA1UEAxMTVGVzdCBDQSBDZXJ0aWZpY2F0ZTAeFw0wODA5MDQwNDQ1MDhaFw0wODA5MTEwNDQ1MDhaMB4xHDAaBgNVBAMTE1Rlc3QgQ0EgQ2VydGlmaWNhdGUwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMRLUjhPe4YUdLo6EcjKcWUOG7CydFTH53Pr1lWjOkbmszYDpkhCTT9LOsI+disk18nkBxSl8DAHTqV+VxtuTPt64iyi10YxyDeep+DwZG/f8cVQv97U3hA9cLurZ2CofkMLGr6JpSGCMZ9FcstcTdHB4lbErIJ54YqfF4pNOs4/AgMBAAEwDQYJKoZIhvcNAQEFBQADgYEAgyrTEFY7ALpeY59jL6xFOLpuPqoBOWrUWv6O+zy5BCU0qiX71r3BpigtxRj+DYcfLIM9FNERDoHu3TthD3nwYWUBtFX8N0QUJIdJabxqAMhLjSC744koiFpCYse5Ye3ZvEdFwDzgAQsJTp5eFGgTZPkPzcdhkFJ2p9+OWs+cb24=");
-
-
-    static byte[] interCertBin = Base64.decode(
-        "MIICSzCCAbSgAwIBAgIBATANBgkqhkiG9w0BAQUFADAeMRwwGgYDVQQDExNUZXN0IENBIENlcnRpZmljYXRlMB4XDTA4MDkwNDA0NDUwOFoXDTA4MDkxMTA0NDUwOFowKDEmMCQGA1UEAxMdVGVzdCBJbnRlcm1lZGlhdGUgQ2VydGlmaWNhdGUwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAISS9OOZ2wxzdWny9aVvk4Joq+dwSJ+oqvHUxX3PflZyuiLiCBUOUE4q59dGKdtNX5fIfwyK3cpV0e73Y/0fwfM3m9rOWFrCKOhfeswNTes0w/2PqPVVDDsF/nj7NApuqXwioeQlgTL251RDF4sVoxXqAU7lRkcqwZt3mwqS4KTJAgMBAAGjgY4wgYswRgYDVR0jBD8wPYAUhv8BOT27EB9JaCccJD4YASPP5XWhIqQgMB4xHDAaBgNVBAMTE1Rlc3QgQ0EgQ2VydGlmaWNhdGWCAQEwHQYDVR0OBBYEFL/IwAGOkHzaQyPZegy79CwM5oTFMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYDVR0PAQH/BAQDAgGGMA0GCSqGSIb3DQEBBQUAA4GBAE4TRgUz4sUvZyVdZxqV+XyNRnqXAeLOOqFGYv2D96tQrS+zjd0elVlT6lFrtchZdOmmX7R6/H/tjMWMcTBICZyRYrvK8cCAmDOI+EIdq5p6lj2Oq6Pbw/wruojAqNrpaR6IkwNpWtdOSSupv4IJL+YU9q2YFTh4R1j3tOkPoFGr");
-
-    static byte[] finalCertBin = Base64.decode(
-        "MIICRjCCAa+gAwIBAgIBATANBgkqhkiG9w0BAQUFADAoMSYwJAYDVQQDEx1UZXN0IEludGVybWVkaWF0ZSBDZXJ0aWZpY2F0ZTAeFw0wODA5MDQwNDQ1MDhaFw0wODA5MTEwNDQ1MDhaMB8xHTAbBgNVBAMTFFRlc3QgRW5kIENlcnRpZmljYXRlMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQChpUeo0tPYywWKiLlbWKNJBcCpSaLSlaZ+4+yer1AxI5yJIVHP6SAlBghlbD5Qne5ImnN/15cz1xwYAiul6vGKJkVPlFEe2Mr+g/J/WJPQQPsjbZ1G+vxbAwXEDA4KaQrnpjRZFq+CdKHwOjuPLYS/MYQNgdIvDVEQcTbPQ8GaiQIDAQABo4GIMIGFMEYGA1UdIwQ/MD2AFL/IwAGOkHzaQyPZegy79CwM5oTFoSKkIDAeMRwwGgYDVQQDExNUZXN0IENBIENlcnRpZmljYXRlggEBMB0GA1UdDgQWBBSVkw+VpqBf3zsLc/9GdkK9TzHPwDAMBgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIFoDANBgkqhkiG9w0BAQUFAAOBgQBLv/0bVDjzTs/y1vN3FUiZNknEbzupIZduTuXJjqv/vBX+LDPjUfu/+iOCXOSKoRn6nlOWhwB1z6taG2usQkFG8InMkRcPREi2uVgFdhJ/1C3dAWhsdlubjdL926bftXvxnx/koDzyrePW5U96RlOQM2qLvbaky2Giz6hrc3Wl+w==");
-    public static byte[] rootCrlBin = Base64.decode(
-        "MIIBYjCBzAIBATANBgkqhkiG9w0BAQsFADAeMRwwGgYDVQQDExNUZXN0IENBIENlcnRpZmljYXRlFw0wODA5MDQwNDQ1MDhaFw0wODA5MDQwNzMxNDhaMCIwIAIBAhcNMDgwOTA0MDQ0NTA4WjAMMAoGA1UdFQQDCgEJoFYwVDBGBgNVHSMEPzA9gBSG/wE5PbsQH0loJxwkPhgBI8/ldaEipCAwHjEcMBoGA1UEAxMTVGVzdCBDQSBDZXJ0aWZpY2F0ZYIBATAKBgNVHRQEAwIBATANBgkqhkiG9w0BAQsFAAOBgQCAbaFCo0BNG4AktVf6jjBLeawP1u0ELYkOCEGvYZE0mBpQ+OvFg7subZ6r3lRIj030nUli28sPFtu5ZQMBNcpE4nS1ziF44RfT3Lp5UgHx9x17Krz781iEyV+7zU8YxYMY9wULD+DCuK294kGKIssVNbmTYXZatBNoXQN5CLIocA==");
-    static byte[] interCrlBin = Base64.decode(
-        "MIIBbDCB1gIBATANBgkqhkiG9w0BAQsFADAoMSYwJAYDVQQDEx1UZXN0IEludGVybWVkaWF0ZSBDZXJ0aWZpY2F0ZRcNMDgwOTA0MDQ0NTA4WhcNMDgwOTA0MDczMTQ4WjAiMCACAQIXDTA4MDkwNDA0NDUwOFowDDAKBgNVHRUEAwoBCaBWMFQwRgYDVR0jBD8wPYAUv8jAAY6QfNpDI9l6DLv0LAzmhMWhIqQgMB4xHDAaBgNVBAMTE1Rlc3QgQ0EgQ2VydGlmaWNhdGWCAQEwCgYDVR0UBAMCAQEwDQYJKoZIhvcNAQELBQADgYEAEVCr5TKs5yguGgLH+dBzmSPoeSIWJFLsgWwJEit/iUDJH3dgYmaczOcGxIDtbYYHLWIHM+P2YRyQz3MEkCXEgm/cx4y7leAmux5l+xQWgmxFPz+197vaphPeCZo+B7V1CWtm518gcq4mrs9ovfgNqgyFj7KGjcBpWdJE32KMt50=");
-
-    /*
-     * certpath with a circular reference
-     */
-    static byte[] certA = Base64.decode(
-        "MIIC6jCCAlOgAwIBAgIBBTANBgkqhkiG9w0BAQUFADCBjTEPMA0GA1UEAxMGSW50"
-      + "ZXIzMQswCQYDVQQGEwJDSDEPMA0GA1UEBxMGWnVyaWNoMQswCQYDVQQIEwJaSDEX"
-      + "MBUGA1UEChMOUHJpdmFzcGhlcmUgQUcxEDAOBgNVBAsTB1Rlc3RpbmcxJDAiBgkq"
-      + "hkiG9w0BCQEWFWFybWluQHByaXZhc3BoZXJlLmNvbTAeFw0wNzA0MDIwODQ2NTda"
-      + "Fw0xNzAzMzAwODQ0MDBaMIGlMScwJQYDVQQDHh4AQQByAG0AaQBuACAASADkAGIA"
-      + "ZQByAGwAaQBuAGcxCzAJBgNVBAYTAkNIMQ8wDQYDVQQHEwZadXJpY2gxCzAJBgNV"
-      + "BAgTAlpIMRcwFQYDVQQKEw5Qcml2YXNwaGVyZSBBRzEQMA4GA1UECxMHVGVzdGlu"
-      + "ZzEkMCIGCSqGSIb3DQEJARYVYXJtaW5AcHJpdmFzcGhlcmUuY29tMIGfMA0GCSqG"
-      + "SIb3DQEBAQUAA4GNADCBiQKBgQCfHfyVs5dbxG35H/Thd29qR4NZU88taCu/OWA1"
-      + "GdACI02lXWYpmLWiDgnU0ULP+GG8OnVp1IES9fz2zcrXKQ19xZzsen/To3h5sNte"
-      + "cJpS00XMM24q/jDwy5NvkBP9YIfFKQ1E/0hFHXcqwlw+b/y/v6YGsZCU2h6QDzc4"
-      + "5m0+BwIDAQABo0AwPjAMBgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIE8DAeBglg"
-      + "hkgBhvhCAQ0EERYPeGNhIGNlcnRpZmljYXRlMA0GCSqGSIb3DQEBBQUAA4GBAJEu"
-      + "KiSfIwsY7SfobMLrv2v/BtLhGLi4RnmjiwzBhuv5rn4rRfBpq1ppmqQMJ2pmA67v"
-      + "UWCY+mNwuyjHyivpCCyJGsZ9d5H09g2vqxzkDBMz7X9VNMZYFH8j/R3/Cfvqks31"
-      + "z0OFslJkeKLa1I0P/dfVHsRKNkLRT3Ws5LKksErQ");
-
-    static byte[] certB = Base64.decode(
-        "MIICtTCCAh6gAwIBAgIBBDANBgkqhkiG9w0BAQQFADCBjTEPMA0GA1UEAxMGSW50"
-      + "ZXIyMQswCQYDVQQGEwJDSDEPMA0GA1UEBxMGWnVyaWNoMQswCQYDVQQIEwJaSDEX"
-      + "MBUGA1UEChMOUHJpdmFzcGhlcmUgQUcxEDAOBgNVBAsTB1Rlc3RpbmcxJDAiBgkq"
-      + "hkiG9w0BCQEWFWFybWluQHByaXZhc3BoZXJlLmNvbTAeFw0wNzA0MDIwODQ2Mzha"
-      + "Fw0xNzAzMzAwODQ0MDBaMIGNMQ8wDQYDVQQDEwZJbnRlcjMxCzAJBgNVBAYTAkNI"
-      + "MQ8wDQYDVQQHEwZadXJpY2gxCzAJBgNVBAgTAlpIMRcwFQYDVQQKEw5Qcml2YXNw"
-      + "aGVyZSBBRzEQMA4GA1UECxMHVGVzdGluZzEkMCIGCSqGSIb3DQEJARYVYXJtaW5A"
-      + "cHJpdmFzcGhlcmUuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCxCXIB"
-      + "QRnmVvl2h7Q+0SsRxDLnyM1dJG9jMa+UCCmHy0k/ZHs5VirSbjEJSjkQ9BGeh9SC"
-      + "7JwbMpXO7UE+gcVc2RnWUY+MA+fWIeTV4KtkYA8WPu8wVGCXbN8wwh/StOocszxb"
-      + "g+iLvGeh8CYSRqg6QN3S/02etH3o8H4e7Z0PZwIDAQABoyMwITAPBgNVHRMBAf8E"
-      + "BTADAQH/MA4GA1UdDwEB/wQEAwIB9jANBgkqhkiG9w0BAQQFAAOBgQCtWdirSsmt"
-      + "+CBBCNn6ZnbU3QqQfiiQIomjenNEHESJgaS/+PvPE5i3xWFXsunTHLW321/Km16I"
-      + "7+ZvT8Su1cqHg79NAT8QB0yke1saKSy2C0Pic4HwrNqVBWFNSxMU0hQzpx/ZXDbZ"
-      + "DqIXAp5EfyRYBy2ul+jm6Rot6aFgzuopKg==");
-
-    static byte[] certC = Base64.decode(
-        "MIICtTCCAh6gAwIBAgIBAjANBgkqhkiG9w0BAQQFADCBjTEPMA0GA1UEAxMGSW50"
-      + "ZXIxMQswCQYDVQQGEwJDSDEPMA0GA1UEBxMGWnVyaWNoMQswCQYDVQQIEwJaSDEX"
-      + "MBUGA1UEChMOUHJpdmFzcGhlcmUgQUcxEDAOBgNVBAsTB1Rlc3RpbmcxJDAiBgkq"
-      + "hkiG9w0BCQEWFWFybWluQHByaXZhc3BoZXJlLmNvbTAeFw0wNzA0MDIwODQ0Mzla"
-      + "Fw0xNzAzMzAwODQ0MDBaMIGNMQ8wDQYDVQQDEwZJbnRlcjIxCzAJBgNVBAYTAkNI"
-      + "MQ8wDQYDVQQHEwZadXJpY2gxCzAJBgNVBAgTAlpIMRcwFQYDVQQKEw5Qcml2YXNw"
-      + "aGVyZSBBRzEQMA4GA1UECxMHVGVzdGluZzEkMCIGCSqGSIb3DQEJARYVYXJtaW5A"
-      + "cHJpdmFzcGhlcmUuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQD0rLr6"
-      + "f2/ONeJzTb0q9M/NNX+MnAFMSqiQGVBkT76u5nOH4KLkpHXkzI82JI7GuQMzoT3a"
-      + "+RP1hO6FneO92ms2soC6xiOFb4EC69Dfhh87Nww5O35JxVF0bzmbmIAWd6P/7zGh"
-      + "nd2S4tKkaZcubps+C0j9Fgi0hipVicAOUVVoDQIDAQABoyMwITAPBgNVHRMBAf8E"
-      + "BTADAQH/MA4GA1UdDwEB/wQEAwIB9jANBgkqhkiG9w0BAQQFAAOBgQCLPvc1IMA4"
-      + "YP+PmnEldyUoRWRnvPWjBGeu0WheBP7fdcnGBf93Nmc5j68ZN+eTZ5VMuZ99YdvH"
-      + "CXGNX6oodONLU//LlFKdLl5xjLAS5X9p1RbOEGytnalqeiEpjk4+C/7rIBG1kllO"
-      + "dItmI6LlEMV09Hkpg6ZRAUmRkb8KrM4X7A==");
-
-    static byte[] certD = Base64.decode(
-        "MIICtTCCAh6gAwIBAgIBBjANBgkqhkiG9w0BAQQFADCBjTEPMA0GA1UEAxMGSW50"
-      + "ZXIzMQswCQYDVQQGEwJDSDEPMA0GA1UEBxMGWnVyaWNoMQswCQYDVQQIEwJaSDEX"
-      + "MBUGA1UEChMOUHJpdmFzcGhlcmUgQUcxEDAOBgNVBAsTB1Rlc3RpbmcxJDAiBgkq"
-      + "hkiG9w0BCQEWFWFybWluQHByaXZhc3BoZXJlLmNvbTAeFw0wNzA0MDIwODQ5NTNa"
-      + "Fw0xNzAzMzAwODQ0MDBaMIGNMQ8wDQYDVQQDEwZJbnRlcjExCzAJBgNVBAYTAkNI"
-      + "MQ8wDQYDVQQHEwZadXJpY2gxCzAJBgNVBAgTAlpIMRcwFQYDVQQKEw5Qcml2YXNw"
-      + "aGVyZSBBRzEQMA4GA1UECxMHVGVzdGluZzEkMCIGCSqGSIb3DQEJARYVYXJtaW5A"
-      + "cHJpdmFzcGhlcmUuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCae3TP"
-      + "jIVKeASqvNabaiUHAMGUgFxB7L0yUsIj39azLcLtUj4S7XkDf7SMGtYV0JY1XNaQ"
-      + "sHJAsnJivDZc50oiYvqDYfgFZx5+AsN5l5X5rjRzs/OX+Jo+k1OgsIyu6+mf9Kfb"
-      + "5IdWOVB2EcOg4f9tPjLM8CIj9Pp7RbKLyqUUgwIDAQABoyMwITAPBgNVHRMBAf8E"
-      + "BTADAQH/MA4GA1UdDwEB/wQEAwIB9jANBgkqhkiG9w0BAQQFAAOBgQCgr9kUdWUT"
-      + "Lt9UcztSzR3pnHRsyvS0E/z850OKQKS5/VxLEalpFvhj+3EcZ7Y6mFxaaS2B7vXg"
-      + "2YWyqV1PRb6iF7/u9EXkpSTKGrJahwANirCa3V/HTUuPdCE2GITlnWI8h3eVA+xQ"
-      + "D4LF0PXHOkXbwmhXRSb10lW1bSGkUxE9jg==");
-
-    private void testExceptions()
-        throws Exception
-    {
-        byte[] enc = { (byte)0, (byte)2, (byte)3, (byte)4, (byte)5 };
-        MyCertPath mc = new MyCertPath(enc);
-        ByteArrayOutputStream os = new ByteArrayOutputStream();
-        ByteArrayInputStream is;
-        byte[] arr;
-
-        ObjectOutputStream oOut = new ObjectOutputStream(os);
-        oOut.writeObject(mc);
-        oOut.flush();
-        oOut.close();
-
-        try
-        {
-            CertificateFactory cFac = CertificateFactory.getInstance("X.509",
-                    "BC");
-            arr = os.toByteArray();
-            is = new ByteArrayInputStream(arr);
-            cFac.generateCertPath(is);
-        }
-        catch (CertificateException e)
-        {
-            // ignore okay
-        }
-
-        CertificateFactory cf = CertificateFactory.getInstance("X.509");
-        List certCol = new ArrayList();
-
-        certCol.add(cf.generateCertificate(new ByteArrayInputStream(certA)));
-        certCol.add(cf.generateCertificate(new ByteArrayInputStream(certB)));
-        certCol.add(cf.generateCertificate(new ByteArrayInputStream(certC)));
-        certCol.add(cf.generateCertificate(new ByteArrayInputStream(certD)));
-
-        CertPathBuilder pathBuilder = CertPathBuilder.getInstance("PKIX", "BC");
-        X509CertSelector select = new X509CertSelector();
-        select.setSubject(((X509Certificate)certCol.get(0)).getSubjectX500Principal().getEncoded());
-
-        Set trustanchors = new HashSet();
-        trustanchors.add(new TrustAnchor((X509Certificate)cf.generateCertificate(new ByteArrayInputStream(rootCertBin)), null));
-
-        CertStore certStore = CertStore.getInstance("Collection", new CollectionCertStoreParameters(certCol));
-
-        PKIXBuilderParameters params = new PKIXBuilderParameters(trustanchors, select);
-        params.addCertStore(certStore);
-
-        try
-        {
-            CertPathBuilderResult result = pathBuilder.build(params);
-            CertPath path = result.getCertPath();
-            fail("found cert path in circular set");
-        }
-        catch (CertPathBuilderException e) 
-        {
-            // expected
-        }
-    }
-    
-    public void performTest()
-        throws Exception
-    {
-        CertificateFactory cf = CertificateFactory.getInstance("X.509", "BC");
-
-        X509Certificate rootCert = (X509Certificate)cf.generateCertificate(new ByteArrayInputStream(rootCertBin));
-        X509Certificate interCert = (X509Certificate)cf.generateCertificate(new ByteArrayInputStream(interCertBin));
-        X509Certificate finalCert = (X509Certificate)cf.generateCertificate(new ByteArrayInputStream(finalCertBin));
-
-            //Testing CertPath generation from List
-        List list = new ArrayList();
-        list.add(interCert);
-        CertPath certPath1 = cf.generateCertPath(list);
-
-            //Testing CertPath encoding as PkiPath
-        byte[] encoded = certPath1.getEncoded("PkiPath");
-
-            //Testing CertPath generation from InputStream
-        ByteArrayInputStream inStream = new ByteArrayInputStream(encoded);
-        CertPath certPath2 = cf.generateCertPath(inStream, "PkiPath");
-
-            //Comparing both CertPathes
-        if (!certPath2.equals(certPath1))
-        {
-            fail("CertPath differ after encoding and decoding.");
-        }
-
-        encoded = certPath1.getEncoded("PKCS7");
-
-            //Testing CertPath generation from InputStream
-        inStream = new ByteArrayInputStream(encoded);
-        certPath2 = cf.generateCertPath(inStream, "PKCS7");
-
-            //Comparing both CertPathes
-        if (!certPath2.equals(certPath1))
-        {
-            fail("CertPath differ after encoding and decoding.");
-        }
-
-        encoded = certPath1.getEncoded("PEM");
-
-            //Testing CertPath generation from InputStream
-        inStream = new ByteArrayInputStream(encoded);
-        certPath2 = cf.generateCertPath(inStream, "PEM");
-
-            //Comparing both CertPathes
-        if (!certPath2.equals(certPath1))
-        {
-            fail("CertPath differ after encoding and decoding.");
-        }
-
-        //
-        // empty list test
-        //
-        list = new ArrayList();
-
-        CertPath certPath = CertificateFactory.getInstance("X.509","BC").generateCertPath(list);
-        if (certPath.getCertificates().size() != 0)
-        {
-            fail("list wrong size.");
-        }
-
-        //
-        // exception tests
-        //
-        testExceptions();
-    }
-
-    public String getName()
-    {
-        return "CertPath";
-    }
-
-    public static void main(
-        String[] args)
-    {
-        Security.addProvider(new BouncyCastleProvider());
-
-        runTest(new CertPathTest());
-    }
-
-    private static class MyCertificate extends Certificate
-    {
-        private final byte[] encoding;
-
-        public MyCertificate(String type, byte[] encoding)
-        {
-            super(type);
-            // don't copy to allow null parameter in test
-            this.encoding = encoding;
-        }
-
-        public byte[] getEncoded() throws CertificateEncodingException
-        {
-            // do copy to force NPE in test
-            return (byte[])encoding.clone();
-        }
-
-        public void verify(PublicKey key) throws CertificateException,
-                NoSuchAlgorithmException, InvalidKeyException,
-                NoSuchProviderException, SignatureException
-        {
-        }
-
-        public void verify(PublicKey key, String sigProvider)
-                throws CertificateException, NoSuchAlgorithmException,
-                InvalidKeyException, NoSuchProviderException,
-                SignatureException
-        {
-        }
-
-        public String toString()
-        {
-            return "[My test Certificate, type: " + getType() + "]";
-        }
-
-        public PublicKey getPublicKey()
-        {
-            return new PublicKey()
-            {
-                public String getAlgorithm()
-                {
-                    return "TEST";
-                }
-
-                public byte[] getEncoded()
-                {
-                    return new byte[] { (byte)1, (byte)2, (byte)3 };
-                }
-
-                public String getFormat()
-                {
-                    return "TEST_FORMAT";
-                }
-            };
-        }
-    }
-
-    private static class MyCertPath extends CertPath
-    {
-        private final Vector certificates;
-
-        private final Vector encodingNames;
-
-        private final byte[] encoding;
-
-        public MyCertPath(byte[] encoding)
-        {
-            super("MyEncoding");
-            this.encoding = encoding;
-            certificates = new Vector();
-            certificates.add(new MyCertificate("MyEncoding", encoding));
-            encodingNames = new Vector();
-            encodingNames.add("MyEncoding");
-        }
-
-        public List getCertificates()
-        {
-            return Collections.unmodifiableList(certificates);
-        }
-
-        public byte[] getEncoded() throws CertificateEncodingException
-        {
-            return (byte[])encoding.clone();
-        }
-
-        public byte[] getEncoded(String encoding)
-                throws CertificateEncodingException
-        {
-            if (getType().equals(encoding))
-            {
-                return (byte[])this.encoding.clone();
-            }
-            throw new CertificateEncodingException("Encoding not supported: "
-                    + encoding);
-        }
-
-        public Iterator getEncodings()
-        {
-            return Collections.unmodifiableCollection(encodingNames).iterator();
-        }
-    }
-}
-
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/path/test/CertPathValidationTest.java b/bcpkix/src/main/java/org/bouncycastle/cert/path/test/CertPathValidationTest.java
deleted file mode 100644
index a99cb1c..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/path/test/CertPathValidationTest.java
+++ /dev/null
@@ -1,403 +0,0 @@
-package org.bouncycastle.cert.path.test;
-
-import java.security.Security;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.bouncycastle.asn1.x509.Extension;
-import org.bouncycastle.cert.X509CRLHolder;
-import org.bouncycastle.cert.X509CertificateHolder;
-import org.bouncycastle.cert.X509ContentVerifierProviderBuilder;
-import org.bouncycastle.cert.jcajce.JcaX509ContentVerifierProviderBuilder;
-import org.bouncycastle.cert.path.CertPath;
-import org.bouncycastle.cert.path.CertPathValidation;
-import org.bouncycastle.cert.path.CertPathValidationResult;
-import org.bouncycastle.cert.path.validations.BasicConstraintsValidation;
-import org.bouncycastle.cert.path.validations.CRLValidation;
-import org.bouncycastle.cert.path.validations.KeyUsageValidation;
-import org.bouncycastle.cert.path.validations.ParentCertIssuedValidation;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.util.CollectionStore;
-import org.bouncycastle.util.Store;
-import org.bouncycastle.util.encoders.Base64;
-import org.bouncycastle.util.test.SimpleTest;
-
-public class CertPathValidationTest
-    extends SimpleTest
-{
-    private byte[] AC_PR = Base64.decode(
-           "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tDQpNSUlFU1RDQ0F6R2dBd0lC"
-        + "QWdJQkJUQU5CZ2txaGtpRzl3MEJBUVVGQURDQnRERUxNQWtHQTFVRUJoTUNR"
-        + "bEl4DQpFekFSQmdOVkJBb1RDa2xEVUMxQ2NtRnphV3d4UFRBN0JnTlZCQXNU"
-        + "TkVsdWMzUnBkSFYwYnlCT1lXTnBiMjVoDQpiQ0JrWlNCVVpXTnViMnh2WjJs"
-        + "aElHUmhJRWx1Wm05eWJXRmpZVzhnTFNCSlZFa3hFVEFQQmdOVkJBY1RDRUp5"
-        + "DQpZWE5wYkdsaE1Rc3dDUVlEVlFRSUV3SkVSakV4TUM4R0ExVUVBeE1vUVhW"
-        + "MGIzSnBaR0ZrWlNCRFpYSjBhV1pwDQpZMkZrYjNKaElGSmhhWG9nUW5KaGMy"
-        + "bHNaV2x5WVRBZUZ3MHdNakEwTURReE9UTTVNREJhRncwd05UQTBNRFF5DQpN"
-        + "elU1TURCYU1HRXhDekFKQmdOVkJBWVRBa0pTTVJNd0VRWURWUVFLRXdwSlEx"
-        + "QXRRbkpoYzJsc01UMHdPd1lEDQpWUVFERXpSQmRYUnZjbWxrWVdSbElFTmxj"
-        + "blJwWm1sallXUnZjbUVnWkdFZ1VISmxjMmxrWlc1amFXRWdaR0VnDQpVbVZ3"
-        + "ZFdKc2FXTmhNSUlCSWpBTkJna3Foa2lHOXcwQkFRRUZBQU9DQVE4QU1JSUJD"
-        + "Z0tDQVFFQXMwc0t5NGsrDQp6b016aldyMTQxeTVYQ045UGJMZERFQXN2cjZ4"
-        + "Z0NCN1l5bEhIQ1NBYmpGR3dOQ0R5NlVxN1h0VjZ6UHdIMXpGDQpFWENlS3Jm"
-        + "UUl5YXBXSEZ4V1VKajBMblFrY1RZM1FOR1huK0JuVk9EVTZDV3M1c3NoZktH"
-        + "RXZyVlQ1Z214V1NmDQp4OFlsdDgzY1dwUE1QZzg3VDlCaHVIbHQzazh2M2Ev"
-        + "NmRPbmF2dytOYTAyZExBaDBlNzZqcCtQUS9LK0pHZlBuDQphQjVVWURrZkd0"
-        + "em5uTTNBV01tY3VJK0o0ek5OMDZaa3ZnbDFsdEo2UU1qcnZEUFlSak9ndDlT"
-        + "cklpY1NmbEo4DQptVDdHWGRRaXJnQUNXc3g1QURBSklRK253TU1vNHlyTUtx"
-        + "SlFhNFFDMHhhT0QvdkdVcG9SaDQzT0FTZFp3c3YvDQpPWFlybmVJeVAwVCs4"
-        + "UUlEQVFBQm80RzNNSUcwTUQwR0ExVWRId1EyTURRd01xQXdvQzZHTEdoMGRI"
-        + "QTZMeTloDQpZM0poYVhvdWFXTndZbkpoYzJsc0xtZHZkaTVpY2k5TVExSmhZ"
-        + "M0poYVhvdVkzSnNNQklHQTFVZElBUUxNQWt3DQpCd1lGWUV3QkFRRXdIUVlE"
-        + "VlIwT0JCWUVGREpUVFlKNE9TWVB5T09KZkVMZXhDaHppK2hiTUI4R0ExVWRJ"
-        + "d1FZDQpNQmFBRklyNjhWZUVFUk0xa0VMNlYwbFVhUTJreFBBM01BNEdBMVVk"
-        + "RHdFQi93UUVBd0lCQmpBUEJnTlZIUk1CDQpBZjhFQlRBREFRSC9NQTBHQ1Nx"
-        + "R1NJYjNEUUVCQlFVQUE0SUJBUUJRUFNoZ1lidnFjaWV2SDVVb3ZMeXhkbkYr"
-        + "DQpFcjlOeXF1SWNkMnZ3Y0N1SnpKMkQ3WDBUcWhHQ0JmUEpVVkdBVWorS0NP"
-        + "SDFCVkgva1l1OUhsVHB1MGtKWFBwDQpBQlZkb2hJUERqRHhkbjhXcFFSL0Yr"
-        + "ejFDaWtVcldIMDR4eTd1N1p6UUpLSlBuR0loY1FpOElyRm1PYkllMEc3DQpY"
-        + "WTZPTjdPRUZxY21KTFFHWWdtRzFXMklXcytQd1JwWTdENGhLVEFoVjFSNkVv"
-        + "amE1L3BPcmVDL09kZXlQWmVxDQo1SUZTOUZZZk02U0Npd2hrK3l2Q1FHbVo0"
-        + "YzE5SjM0ZjVFYkRrK1NQR2tEK25EQ0E3L3VMUWNUMlJURE14SzBaDQpuZlo2"
-        + "Nm1Sc0ZjcXRGaWdScjVFcmtKZDdoUVV6eHNOV0VrNzJEVUFIcVgvNlNjeWtt"
-        + "SkR2V0plSUpqZlcNCi0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0NCg==");
-
-    private byte[] AC_RAIZ_ICPBRASIL = Base64.decode(
-          "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tDQpNSUlFdURDQ0E2Q2dBd0lC"
-        + "QWdJQkJEQU5CZ2txaGtpRzl3MEJBUVVGQURDQnRERUxNQWtHQTFVRUJoTUNR"
-        + "bEl4DQpFekFSQmdOVkJBb1RDa2xEVUMxQ2NtRnphV3d4UFRBN0JnTlZCQXNU"
-        + "TkVsdWMzUnBkSFYwYnlCT1lXTnBiMjVoDQpiQ0JrWlNCVVpXTnViMnh2WjJs"
-        + "aElHUmhJRWx1Wm05eWJXRmpZVzhnTFNCSlZFa3hFVEFQQmdOVkJBY1RDRUp5"
-        + "DQpZWE5wYkdsaE1Rc3dDUVlEVlFRSUV3SkVSakV4TUM4R0ExVUVBeE1vUVhW"
-        + "MGIzSnBaR0ZrWlNCRFpYSjBhV1pwDQpZMkZrYjNKaElGSmhhWG9nUW5KaGMy"
-        + "bHNaV2x5WVRBZUZ3MHdNVEV4TXpBeE1qVTRNREJhRncweE1URXhNekF5DQpN"
-        + "elU1TURCYU1JRzBNUXN3Q1FZRFZRUUdFd0pDVWpFVE1CRUdBMVVFQ2hNS1NV"
-        + "TlFMVUp5WVhOcGJERTlNRHNHDQpBMVVFQ3hNMFNXNXpkR2wwZFhSdklFNWhZ"
-        + "Mmx2Ym1Gc0lHUmxJRlJsWTI1dmJHOW5hV0VnWkdFZ1NXNW1iM0p0DQpZV05o"
-        + "YnlBdElFbFVTVEVSTUE4R0ExVUVCeE1JUW5KaGMybHNhV0V4Q3pBSkJnTlZC"
-        + "QWdUQWtSR01URXdMd1lEDQpWUVFERXloQmRYUnZjbWxrWVdSbElFTmxjblJw"
-        + "Wm1sallXUnZjbUVnVW1GcGVpQkNjbUZ6YVd4bGFYSmhNSUlCDQpJakFOQmdr"
-        + "cWhraUc5dzBCQVFFRkFBT0NBUThBTUlJQkNnS0NBUUVBd1BNdWR3WC9odm0r"
-        + "VWgyYi9sUUFjSFZBDQppc2FtYUxrV2Rrd1A5L1MvdE9LSWdSckw2T3krWklH"
-        + "bE9VZGQ2dVl0azlNYS8zcFVwZ2NmTkFqMHZZbTVnc3lqDQpRbzllbXNjK3g2"
-        + "bTRWV3drOWlxTVpTQ0s1RVFrQXEvVXQ0bjdLdUxFMStnZGZ0d2RJZ3hmVXNQ"
-        + "dDRDeU5yWTUwDQpRVjU3S00yVVQ4eDVycm16RWpyN1RJQ0dwU1VBbDJnVnFl"
-        + "NnhhaWkrYm1ZUjFRcm1XYUJTQUc1OUxya3Jqcll0DQpiUmhGYm9VRGUxREsr"
-        + "NlQ4czVMNms4Yzhva3BiSHBhOXZlTXp0RFZDOXNQSjYwTVdYaDZhblZLbzFV"
-        + "Y0xjYlVSDQp5RWVOdlpuZVZSS0FBVTZvdXdkakR2d2xzYUt5ZEZLd2VkMFRv"
-        + "UTQ3Ym1VS2djbSt3VjNlVFJrMzZVT25Ud0lEDQpBUUFCbzRIU01JSFBNRTRH"
-        + "QTFVZElBUkhNRVV3UXdZRllFd0JBUUF3T2pBNEJnZ3JCZ0VGQlFjQ0FSWXNh"
-        + "SFIwDQpjRG92TDJGamNtRnBlaTVwWTNCaWNtRnphV3d1WjI5MkxtSnlMMFJR"
-        + "UTJGamNtRnBlaTV3WkdZd1BRWURWUjBmDQpCRFl3TkRBeW9EQ2dMb1lzYUhS"
-        + "MGNEb3ZMMkZqY21GcGVpNXBZM0JpY21GemFXd3VaMjkyTG1KeUwweERVbUZq"
-        + "DQpjbUZwZWk1amNtd3dIUVlEVlIwT0JCWUVGSXI2OFZlRUVSTTFrRUw2VjBs"
-        + "VWFRMmt4UEEzTUE4R0ExVWRFd0VCDQovd1FGTUFNQkFmOHdEZ1lEVlIwUEFR"
-        + "SC9CQVFEQWdFR01BMEdDU3FHU0liM0RRRUJCUVVBQTRJQkFRQVpBNWMxDQpV"
-        + "L2hnSWg2T2NnTEFmaUpnRldwdm1EWldxbFYzMC9iSEZwajhpQm9iSlNtNXVE"
-        + "cHQ3VGlyWWgxVXhlM2ZRYUdsDQpZakplKzl6ZCtpelBSYkJxWFBWUUEzNEVY"
-        + "Y3drNHFwV3VmMWhIcmlXZmRyeDhBY3FTcXI2Q3VRRndTcjc1Rm9zDQpTemx3"
-        + "REFEYTcwbVQ3d1pqQW1RaG5aeDJ4SjZ3ZldsVDlWUWZTLy9KWWVJYzdGdWUy"
-        + "Sk5MZDAwVU9TTU1haUsvDQp0NzllbktOSEVBMmZ1cEgzdkVpZ2Y1RWg0YlZB"
-        + "TjVWb2hyVG02TVk1M3g3WFFaWnIxTUU3YTU1bEZFblNlVDB1DQptbE9BalIy"
-        + "bUFidlNNNVg1b1NaTnJtZXRkenlUajJmbENNOENDN01MYWIwa2tkbmdSSWxV"
-        + "QkdIRjEvUzVubVBiDQpLKzlBNDZzZDMzb3FLOG44DQotLS0tLUVORCBDRVJU"
-        + "SUZJQ0FURS0tLS0tDQo=");
-
-    private byte[] schefer = Base64.decode(
-          "MIIEnDCCBAWgAwIBAgICIPAwDQYJKoZIhvcNAQEEBQAwgcAxCzAJBgNVBAYT"
-        + "AkRFMQ8wDQYDVQQIEwZIRVNTRU4xGDAWBgNVBAcTDzY1MDA4IFdpZXNiYWRl"
-        + "bjEaMBgGA1UEChMRU0NIVUZBIEhPTERJTkcgQUcxGjAYBgNVBAsTEVNDSFVG"
-        + "QSBIT0xESU5HIEFHMSIwIAYDVQQDExlJbnRlcm5ldCBCZW51dHplciBTZXJ2"
-        + "aWNlMSowKAYJKoZIhvcNAQkBFht6ZXJ0aWZpa2F0QHNjaHVmYS1vbmxpbmUu"
-        + "ZGUwHhcNMDQwMzMwMTEwODAzWhcNMDUwMzMwMTEwODAzWjCBnTELMAkGA1UE"
-        + "BhMCREUxCjAIBgNVBAcTASAxIzAhBgNVBAoTGlNIUyBJbmZvcm1hdGlvbnNz"
-        + "eXN0ZW1lIEFHMRwwGgYDVQQLExM2MDAvMDU5NDktNjAwLzA1OTQ5MRgwFgYD"
-        + "VQQDEw9TY2hldHRlciBTdGVmYW4xJTAjBgkqhkiG9w0BCQEWFlN0ZWZhbi5T"
-        + "Y2hldHRlckBzaHMuZGUwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAJD0"
-        + "95Bi76fkAMjJNTGPDiLPHmZXNsmakngDeS0juzKMeJA+TjXFouhYh6QyE4Bl"
-        + "Nf18fT4mInlgLefwf4t6meIWbiseeTo7VQdM+YrbXERMx2uHsRcgZMsiMYHM"
-        + "kVfYMK3SMJ4nhCmZxrBkoTRed4gXzVA1AA8YjjTqMyyjvt4TAgMBAAGjggHE"
-        + "MIIBwDAJBgNVHRMEAjAAMBEGCWCGSAGG+EIBAQQEAwIEsDALBgNVHQ8EBAMC"
-        + "BNAwOQYJYIZIAYb4QgENBCwWKlplcnRpZmlrYXQgbnVyIGZ1ZXIgU0NIVUZB"
-        + "LU9ubGluZSBndWVsdGlnLjAdBgNVHQ4EFgQUXReirhBfg0Yhf6MsBWoo/nPa"
-        + "hGwwge0GA1UdIwSB5TCB4oAUf2UyCaBV9JUeG9lS1Yo6OFBUdEKhgcakgcMw"
-        + "gcAxCzAJBgNVBAYTAkRFMQ8wDQYDVQQIEwZIRVNTRU4xGDAWBgNVBAcTDzY1"
-        + "MDA4IFdpZXNiYWRlbjEaMBgGA1UEChMRU0NIVUZBIEhPTERJTkcgQUcxGjAY"
-        + "BgNVBAsTEVNDSFVGQSBIT0xESU5HIEFHMSIwIAYDVQQDExlJbnRlcm5ldCBC"
-        + "ZW51dHplciBTZXJ2aWNlMSowKAYJKoZIhvcNAQkBFht6ZXJ0aWZpa2F0QHNj"
-        + "aHVmYS1vbmxpbmUuZGWCAQAwIQYDVR0RBBowGIEWU3RlZmFuLlNjaGV0dGVy"
-        + "QHNocy5kZTAmBgNVHRIEHzAdgRt6ZXJ0aWZpa2F0QHNjaHVmYS1vbmxpbmUu"
-        + "ZGUwDQYJKoZIhvcNAQEEBQADgYEAWzZtN9XQ9uyrFXqSy3hViYwV751+XZr0"
-        + "YH5IFhIS+9ixNAu8orP3bxqTaMhpwoU7T/oSsyGGSkb3fhzclgUADbA2lrOI"
-        + "GkeB/m+FArTwRbwpqhCNTwZywOp0eDosgPjCX1t53BB/m/2EYkRiYdDGsot0"
-        + "kQPOVGSjQSQ4+/D+TM8=");
-
-    // circular dependency certificates
-    private static final byte[] circCA = Base64.decode(
-        "MIIDTzCCAjegAwIBAgIDARAAMA0GCSqGSIb3DQEBBQUAMDkxCzAJBgNVBAYT"
-      + "AkZSMRAwDgYDVQQKEwdHSVAtQ1BTMRgwFgYDVQQLEw9HSVAtQ1BTIEFOT05Z"
-      + "TUUwHhcNMDQxMDExMDAwMDAxWhcNMTQxMjMxMjM1OTU5WjA5MQswCQYDVQQG"
-      + "EwJGUjEQMA4GA1UEChMHR0lQLUNQUzEYMBYGA1UECxMPR0lQLUNQUyBBTk9O"
-      + "WU1FMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3WyWDwcM58aU"
-      + "hPX4ueI1mwETt3WdQtMfIdRiCXeBrjCkYCc7nIgCmGbnfTzXSplHRgKColWh"
-      + "q/Z+1rHYayje1gjAEU2+4/r1P2pnBmPgquDuguktCIbDtCcGZu0ylyKeHh37"
-      + "aeIKzkcmRSLRzvGf/eO3RdFksrvaPaSjqCVfGRXVDKK2uftE8rIFJE+bCqow"
-      + "6+WiaAaDDiJaSJPuu5hC1NA5jw0/BFodlCuAvl1GJ8A+TICkYWcSpKS9bkSC"
-      + "0i8xdGbSSk94shA1PdDvRdFMfFys8g4aupBXV8yqqEAUkBYmOtZSJckc3W4y"
-      + "2Gx53y7vY07Xh63mcgtJs2T82WJICwIDAQABo2AwXjAdBgNVHQ4EFgQU8c/P"
-      + "NNJaL0srd9SwHwgtvwPB/3cwDgYDVR0PAQH/BAQDAgIEMBkGA1UdIAQSMBAw"
-      + "DgYMKoF6AUcDBwgAAAABMBIGA1UdEwEB/wQIMAYBAf8CAQEwDQYJKoZIhvcN"
-      + "AQEFBQADggEBAHRjYDPJKlfUzID0YzajZpgR/i2ngJrJqYeaWCmwzBgNUPad"
-      + "uBKSGHmPVg21sfULMSnirnR+e90i/D0EVzLwQzcbjPDD/85rp9QDCeMxqqPe"
-      + "9ZCHGs2BpE/HOQMP0QfQ3/Kpk7SvOH/ZcpIf6+uE6lLBQYAGs5cxvtTGOzZk"
-      + "jCVFG+TrAnF4V5sNkn3maCWiYLmyqcnxtKEFSONy2bYqqudx/dBBlRrDbRfZ"
-      + "9XsCBdiXAHY1hFHldbfDs8rslmkXJi3fJC028HZYB6oiBX/JE7BbMk7bRnUf"
-      + "HSpP7Sjxeso2SY7Yit+hQDVAlqTDGmh6kLt/hQMpsOMry4vgBL6XHKw=");
-
-    private static final byte[] circCRLCA = Base64.decode(
-       "MIIDXDCCAkSgAwIBAgIDASAAMA0GCSqGSIb3DQEBBQUAMDkxCzAJBgNVBAYT"
-     + "AkZSMRAwDgYDVQQKEwdHSVAtQ1BTMRgwFgYDVQQLEw9HSVAtQ1BTIEFOT05Z"
-     + "TUUwHhcNMDQxMDExMDAwMDAxWhcNMTQxMjMxMjM1OTU5WjA5MQswCQYDVQQG"
-     + "EwJGUjEQMA4GA1UEChMHR0lQLUNQUzEYMBYGA1UECxMPR0lQLUNQUyBBTk9O"
-     + "WU1FMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwfEcFK0g7Kfo"
-     + "o5f2IBF7VEd/AG+RVGSds0Yg+u2kNYu4k04HR/+tOdBQtJvyr4W5jrQKsC5X"
-     + "skeFWMyWaFKzAjZDWB52HWp/kiMivGcxnYDuYf5piukSC+d2+vL8YaAphDzV"
-     + "HPnxEKqoM/J66uUussDTqfcL3JC/Bc7kBwn4srrsZOsamMWTQQtEqVQxNN7A"
-     + "ROSRsdiTt3hMOKditc9/NBNmjZWxgc7Twr/SaZ8CfN5wf2wuOl23knWL0QsJ"
-     + "0lSMBSBTzTcfAke4/jIT7d4nVMp3t7dsna8rt56pFK4wpRFGuCt+1P5gi51x"
-     + "xVSdI+JoNXv6zGO4o8YVaRpC5rQeGQIDAQABo20wazAfBgNVHSMEGDAWgBTx"
-     + "z8800lovSyt31LAfCC2/A8H/dzAdBgNVHQ4EFgQUGa3SbBrJx/wa2MQwhWPl"
-     + "dwLw1+IwDgYDVR0PAQH/BAQDAgECMBkGA1UdIAQSMBAwDgYMKoF6AUcDBwgA"
-     + "AAABMA0GCSqGSIb3DQEBBQUAA4IBAQAPDpYe2WPYnXTLsXSIUREBNMLmg+/7"
-     + "4Yhq9uOm5Hb5LVkDuHoEHGfmpXXEvucx5Ehu69hw+F4YSrd9wPjOiG8G6GXi"
-     + "RcrK8nE8XDvvV+E1HpJ7NKN4fSAoSb+0gliiq3aF15bvXP8nfespdd/x1xWQ"
-     + "mpYCx/mJeuqONQv2/D/7hfRKYoDBaAkWGodenPFPVs6FxwnEuH2R+KWCUdA9"
-     + "L04v8JBeL3kZiALkU7+DCCm7A0imUAgeeArbAbfIPu6eDygm+XndZ9qi7o4O"
-     + "AntPxrqbeXFIbDrQ4GV1kpxnW+XpSGDd96SWKe715gxkkDBppR5IKYJwRb6O"
-     + "1TRQIf2F+muQ");
-
-    private static final byte[] circCRL = Base64.decode(
-        "MIIB1DCBvQIBATANBgkqhkiG9w0BAQUFADA5MQswCQYDVQQGEwJGUjEQMA4G"
-      + "A1UEChMHR0lQLUNQUzEYMBYGA1UECxMPR0lQLUNQUyBBTk9OWU1FFw0xMDAx"
-      + "MDcwMzAwMTVaFw0xMDAxMTMwMzAwMTVaMACgTjBMMB8GA1UdIwQYMBaAFBmt"
-      + "0mwaycf8GtjEMIVj5XcC8NfiMAsGA1UdFAQEAgILgzAcBgNVHRIEFTATgRFh"
-      + "Yy1naXBAZ2lwLWNwcy5mcjANBgkqhkiG9w0BAQUFAAOCAQEAtF1DdFl1MQvf"
-      + "vNkbrCPuppNYcHen4+za/ZDepKuwHsH/OpKuaDJc4LndRgd5IwzfpCHkQGzt"
-      + "shK50bakN8oaYJgthKIOIJzR+fn6NMjftfR2a27Hdk2o3eQXRHQ360qMbpSy"
-      + "qPb3WfuBhxO2/DlLChJP+OxZIHtT/rNYgE0tlIv7swYi81Gq+DafzaZ9+A5t"
-      + "I0L2Gp/NUDsp5dF6PllAGiXQzl27qkcu+r50w+u0gul3nobXgbwPcMSYuWUz"
-      + "1lhA+uDn/EUWV4RSiJciCGSS10WCkFh1/YPo++mV15KDB0m+8chscrSu/bAl"
-      + "B19LxL/pCX3qr5iLE9ss3olVImyFZg==");
-
-//    private void checkCircProcessing()
-//        throws Exception
-//    {
-//        CertificateFactory cf = CertificateFactory.getInstance("X.509", "BC");
-//
-//        X509Certificate caCert = (X509Certificate)cf.generateCertificate(new ByteArrayInputStream(circCA));
-//        X509Certificate crlCaCert = (X509Certificate)cf.generateCertificate(new ByteArrayInputStream(circCRLCA));
-//        X509CRL crl = (X509CRL)cf.generateCRL(new ByteArrayInputStream(circCRL));
-//
-//        List list = new ArrayList();
-//
-//        list.add(caCert);
-//        list.add(crlCaCert);
-//        list.add(crl);
-//
-//        CertStoreParameters ccsp = new CollectionCertStoreParameters(list);
-//        CertStore store = CertStore.getInstance("Collection", ccsp);
-//
-//        Calendar validDate = Calendar.getInstance();
-//        validDate.set(2010,0,8,2,21,10);
-//
-//            //validating path
-//        List certchain = new ArrayList();
-//
-//        certchain.add(crlCaCert);
-//        CertPath cp = CertificateFactory.getInstance("X.509","BC").generateCertPath(certchain);
-//
-//        Set trust = new HashSet();
-//        trust.add(new TrustAnchor(caCert, null));
-//
-//        CertPathValidator cpv = CertPathValidator.getInstance("PKIX","BC");
-//        //PKIXParameters param = new PKIXParameters(trust);
-//
-//        PKIXBuilderParameters param = new PKIXBuilderParameters(trust, null);
-//        X509CertSelector certSelector = new X509CertSelector();
-//        certSelector.setCertificate(crlCaCert);
-//        param.setTargetCertConstraints(certSelector);
-//        param.addCertStore(store);
-//        param.setRevocationEnabled(true);
-//        param.setDate(validDate.getTime());
-//
-//        PKIXCertPathValidatorResult result = (PKIXCertPathValidatorResult)cpv.validate(cp, param);
-//    }
-
-    public void performTest()
-        throws Exception
-    {
-            // initialise CertStore
-        X509CertificateHolder rootCert = new X509CertificateHolder(CertPathTest.rootCertBin);
-        X509CertificateHolder interCert = new X509CertificateHolder(CertPathTest.interCertBin);
-        X509CertificateHolder finalCert = new X509CertificateHolder(CertPathTest.finalCertBin);
-        X509CRLHolder rootCrl = new X509CRLHolder(CertPathTest.rootCrlBin);
-        X509CRLHolder interCrl =  new X509CRLHolder(CertPathTest.interCrlBin);
-
-        CertPath path = new CertPath(new X509CertificateHolder[] { finalCert, interCert });
-        X509ContentVerifierProviderBuilder verifier = new JcaX509ContentVerifierProviderBuilder().setProvider(BouncyCastleProvider.PROVIDER_NAME);
-
-        CertPathValidationResult result = path.validate(new CertPathValidation[]{new ParentCertIssuedValidation(verifier), new BasicConstraintsValidation(), new KeyUsageValidation()});
-
-        if (!result.isValid())
-        {
-            fail("basic validation (1) not working");
-        }
-
-        List crlList = new ArrayList();
-
-        crlList.add(rootCrl);
-        crlList.add(interCrl);
-
-        Store crls = new CollectionStore(crlList);
-
-        result = path.validate(new CertPathValidation[]{new ParentCertIssuedValidation(verifier), new BasicConstraintsValidation(), new KeyUsageValidation(), new CRLValidation(rootCert.getSubject(), crls)});
-
-        if (!result.isValid())
-        {
-            fail("basic validation (2) not working");
-        }
-
-        result = path.validate(new CertPathValidation[]{new ParentCertIssuedValidation(verifier), new KeyUsageValidation(), new CRLValidation(rootCert.getSubject(), crls)});
-
-        if (result.isValid() || result.getUnhandledCriticalExtensionOIDs().size() != 1
-            || !result.getUnhandledCriticalExtensionOIDs().contains(Extension.basicConstraints))
-        {
-            fail("basic validation (3) not working");
-        }
-
-        result = path.validate(new CertPathValidation[]{new ParentCertIssuedValidation(verifier), new CRLValidation(rootCert.getSubject(), crls)});
-
-        if (result.isValid() || result.getUnhandledCriticalExtensionOIDs().size() != 2
-            || !result.getUnhandledCriticalExtensionOIDs().contains(Extension.basicConstraints)
-            || !result.getUnhandledCriticalExtensionOIDs().contains(Extension.keyUsage))
-        {
-            fail("basic validation (4) not working");
-        }
-
-        path = new CertPath(new X509CertificateHolder[] { interCert, finalCert });
-
-        result = path.validate(new CertPathValidation[]{new ParentCertIssuedValidation(verifier)});
-
-        if (result.isValid())
-        {
-            fail("incorrect path validated!!");
-        }
-
-
-
-//        List list = new ArrayList();
-//        list.add(rootCert);
-//        list.add(interCert);
-//        list.add(finalCert);
-//        list.add(rootCrl);
-//        list.add(interCrl);
-//        CollectionCertStoreParameters ccsp = new CollectionCertStoreParameters(list);
-//        CertStore store = CertStore.getInstance("Collection", ccsp, "BC");
-//        Calendar validDate = Calendar.getInstance();
-//        validDate.set(2008,8,4,14,49,10);
-//            //validating path
-//        List certchain = new ArrayList();
-//        certchain.add(finalCert);
-//        certchain.add(interCert);
-//        CertPath cp = CertificateFactory.getInstance("X.509","BC").generateCertPath(certchain);
-//        Set trust = new HashSet();
-//        trust.add(new TrustAnchor(rootCert, null));
-//
-//        CertPathValidator cpv = CertPathValidator.getInstance("PKIX","BC");
-//        PKIXParameters param = new PKIXParameters(trust);
-//        param.addCertStore(store);
-//        param.setDate(validDate.getTime());
-//        MyChecker checker = new MyChecker();
-//        param.addCertPathChecker(checker);
-//
-//        PKIXCertPathValidatorResult result =
-//            (PKIXCertPathValidatorResult) cpv.validate(cp, param);
-//        PolicyNode policyTree = result.getPolicyTree();
-//        PublicKey subjectPublicKey = result.getPublicKey();
-//
-//        if (checker.getCount() != 2)
-//        {
-//            fail("checker not evaluated for each certificate");
-//        }
-//
-//        if (!subjectPublicKey.equals(finalCert.getPublicKey()))
-//        {
-//            fail("wrong public key returned");
-//        }
-//
-//        //
-//        // invalid path containing a valid one test
-//        //
-//        try
-//        {
-//                // initialise CertStore
-//            rootCert = (X509Certificate)cf.generateCertificate(new ByteArrayInputStream(AC_RAIZ_ICPBRASIL));
-//            interCert = (X509Certificate)cf.generateCertificate(new ByteArrayInputStream(AC_PR));
-//            finalCert = (X509Certificate)cf.generateCertificate(new ByteArrayInputStream(schefer));
-//
-//            list = new ArrayList();
-//            list.add(rootCert);
-//            list.add(interCert);
-//            list.add(finalCert);
-//
-//            ccsp = new CollectionCertStoreParameters(list);
-//            store = CertStore.getInstance("Collection", ccsp);
-//            validDate = Calendar.getInstance();
-//            validDate.set(2004,2,21,2,21,10);
-//
-//                //validating path
-//            certchain = new ArrayList();
-//            certchain.add(finalCert);
-//            certchain.add(interCert);
-//            cp = CertificateFactory.getInstance("X.509","BC").generateCertPath(certchain);
-//            trust = new HashSet();
-//            trust.add(new TrustAnchor(rootCert, null));
-//
-//            cpv = CertPathValidator.getInstance("PKIX","BC");
-//            param = new PKIXParameters(trust);
-//            param.addCertStore(store);
-//            param.setRevocationEnabled(false);
-//            param.setDate(validDate.getTime());
-//
-//            result =(PKIXCertPathValidatorResult) cpv.validate(cp, param);
-//            policyTree = result.getPolicyTree();
-//            subjectPublicKey = result.getPublicKey();
-//
-//            fail("Invalid path validated");
-//        }
-//        catch (Exception e)
-//        {
-//            if (!(e instanceof CertPathValidatorException
-//                && e.getMessage().startsWith("Could not validate certificate signature.")))
-//            {
-//                fail("unexpected exception", e);
-//            }
-//        }
-//
-//        checkCircProcessing();
-    }
-
-    public String getName()
-    {
-        return "CertPathValidator";
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        Security.addProvider(new BouncyCastleProvider());
-
-        runTest(new CertPathValidationTest());
-    }
-}
-
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/path/validations/BasicConstraintsValidation.java b/bcpkix/src/main/java/org/bouncycastle/cert/path/validations/BasicConstraintsValidation.java
deleted file mode 100644
index db4f852..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/path/validations/BasicConstraintsValidation.java
+++ /dev/null
@@ -1,103 +0,0 @@
-package org.bouncycastle.cert.path.validations;
-
-import java.math.BigInteger;
-
-import org.bouncycastle.asn1.x509.BasicConstraints;
-import org.bouncycastle.asn1.x509.Extension;
-import org.bouncycastle.cert.X509CertificateHolder;
-import org.bouncycastle.cert.path.CertPathValidation;
-import org.bouncycastle.cert.path.CertPathValidationContext;
-import org.bouncycastle.cert.path.CertPathValidationException;
-import org.bouncycastle.util.Memoable;
-
-public class BasicConstraintsValidation
-    implements CertPathValidation
-{
-    private boolean          isMandatory;
-    private BasicConstraints bc;
-    private int              maxPathLength;
-
-    public BasicConstraintsValidation()
-    {
-        this(true);
-    }
-
-    public BasicConstraintsValidation(boolean isMandatory)
-    {
-        this.isMandatory = isMandatory;
-    }
-
-    public void validate(CertPathValidationContext context, X509CertificateHolder certificate)
-        throws CertPathValidationException
-    {
-        if (maxPathLength < 0)
-        {
-            throw new CertPathValidationException("BasicConstraints path length exceeded");
-        }
-
-        context.addHandledExtension(Extension.basicConstraints);
-
-        BasicConstraints certBC = BasicConstraints.fromExtensions(certificate.getExtensions());
-
-        if (certBC != null)
-        {
-            if (bc != null)
-            {
-                if (certBC.isCA())
-                {
-                    BigInteger pathLengthConstraint = certBC.getPathLenConstraint();
-
-                    if (pathLengthConstraint != null)
-                    {
-                        int plc = pathLengthConstraint.intValue();
-
-                        if (plc < maxPathLength)
-                        {
-                            maxPathLength = plc;
-                            bc = certBC;
-                        }
-                    }
-                }
-            }
-            else
-            {
-                bc = certBC;
-                if (certBC.isCA())
-                {
-                    maxPathLength = certBC.getPathLenConstraint().intValue();
-                }
-            }
-        }
-        else
-        {
-            if (bc != null)
-            {
-                maxPathLength--;
-            }
-        }
-
-        if (isMandatory && bc == null)
-        {
-            throw new CertPathValidationException("BasicConstraints not present in path");
-        }
-    }
-
-    public Memoable copy()
-    {
-        BasicConstraintsValidation v = new BasicConstraintsValidation(isMandatory);
-
-        v.bc = this.bc;
-        v.maxPathLength = this.maxPathLength;
-
-        return v;
-    }
-
-    public void reset(Memoable other)
-    {
-        BasicConstraintsValidation v = (BasicConstraintsValidation)other;
-
-        this.isMandatory = v.isMandatory;
-        this.bc = v.bc;
-        this.maxPathLength = v.maxPathLength;
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/path/validations/CRLValidation.java b/bcpkix/src/main/java/org/bouncycastle/cert/path/validations/CRLValidation.java
deleted file mode 100644
index c44b7c0..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/path/validations/CRLValidation.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package org.bouncycastle.cert.path.validations;
-
-import java.util.Collection;
-import java.util.Iterator;
-
-import org.bouncycastle.asn1.x500.X500Name;
-import org.bouncycastle.cert.X509CRLHolder;
-import org.bouncycastle.cert.X509CertificateHolder;
-import org.bouncycastle.cert.path.CertPathValidation;
-import org.bouncycastle.cert.path.CertPathValidationContext;
-import org.bouncycastle.cert.path.CertPathValidationException;
-import org.bouncycastle.util.Memoable;
-import org.bouncycastle.util.Selector;
-import org.bouncycastle.util.Store;
-
-public class CRLValidation
-    implements CertPathValidation
-{
-    private Store crls;
-    private X500Name workingIssuerName;
-
-    public CRLValidation(X500Name trustAnchorName, Store crls)
-    {
-        this.workingIssuerName = trustAnchorName;
-        this.crls = crls;
-    }
-
-    public void validate(CertPathValidationContext context, X509CertificateHolder certificate)
-        throws CertPathValidationException
-    {
-        // TODO: add handling of delta CRLs
-        Collection matches = crls.getMatches(new Selector()
-        {
-            public boolean match(Object obj)
-            {
-                X509CRLHolder crl = (X509CRLHolder)obj;
-
-                return (crl.getIssuer().equals(workingIssuerName));
-            }
-
-            public Object clone()
-            {
-                return this;
-            }
-        });
-
-        if (matches.isEmpty())
-        {
-            throw new CertPathValidationException("CRL for " + workingIssuerName + " not found");
-        }
-
-        for (Iterator it = matches.iterator(); it.hasNext();)
-        {
-            X509CRLHolder crl = (X509CRLHolder)it.next();
-
-            // TODO: not quite right!
-            if (crl.getRevokedCertificate(certificate.getSerialNumber()) != null)
-            {
-                throw new CertPathValidationException("Certificate revoked");
-            }
-        }
-
-        this.workingIssuerName = certificate.getSubject();
-    }
-
-    public Memoable copy()
-    {
-        return new CRLValidation(workingIssuerName, crls);
-    }
-
-    public void reset(Memoable other)
-    {
-        CRLValidation v = (CRLValidation)other;
-
-        this.workingIssuerName = v.workingIssuerName;
-        this.crls = v.crls;
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/path/validations/CertificatePoliciesValidation.java b/bcpkix/src/main/java/org/bouncycastle/cert/path/validations/CertificatePoliciesValidation.java
deleted file mode 100644
index ebaf989..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/path/validations/CertificatePoliciesValidation.java
+++ /dev/null
@@ -1,146 +0,0 @@
-package org.bouncycastle.cert.path.validations;
-
-import java.math.BigInteger;
-
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.x509.Extension;
-import org.bouncycastle.asn1.x509.PolicyConstraints;
-import org.bouncycastle.cert.X509CertificateHolder;
-import org.bouncycastle.cert.path.CertPathValidation;
-import org.bouncycastle.cert.path.CertPathValidationContext;
-import org.bouncycastle.cert.path.CertPathValidationException;
-import org.bouncycastle.util.Memoable;
-
-public class CertificatePoliciesValidation
-    implements CertPathValidation
-{
-    private int              explicitPolicy;
-    private int              policyMapping;
-    private int              inhibitAnyPolicy;
-
-    CertificatePoliciesValidation(int pathLength)
-    {
-        this(pathLength, false, false, false);
-    }
-
-    CertificatePoliciesValidation(int pathLength, boolean isExplicitPolicyRequired, boolean isAnyPolicyInhibited, boolean isPolicyMappingInhibited)
-    {
-        //
-        // (d)
-        //
-
-        if (isExplicitPolicyRequired)
-        {
-            explicitPolicy = 0;
-        }
-        else
-        {
-            explicitPolicy = pathLength + 1;
-        }
-
-        //
-        // (e)
-        //
-        if (isAnyPolicyInhibited)
-        {
-            inhibitAnyPolicy = 0;
-        }
-        else
-        {
-            inhibitAnyPolicy = pathLength + 1;
-        }
-
-        //
-        // (f)
-        //
-        if (isPolicyMappingInhibited)
-        {
-            policyMapping = 0;
-        }
-        else
-        {
-            policyMapping = pathLength + 1;
-        }
-    }
-
-    public void validate(CertPathValidationContext context, X509CertificateHolder certificate)
-        throws CertPathValidationException
-    {
-        context.addHandledExtension(Extension.policyConstraints);
-        context.addHandledExtension(Extension.inhibitAnyPolicy);
-
-        if (!context.isEndEntity())
-        {
-            if (!ValidationUtils.isSelfIssued(certificate))
-            {
-                 //
-                // H (1), (2), (3)
-                //
-                explicitPolicy = countDown(explicitPolicy);
-                policyMapping = countDown(policyMapping);
-                inhibitAnyPolicy = countDown(inhibitAnyPolicy);
-
-                //
-                // I (1), (2)
-                //
-                PolicyConstraints policyConstraints = PolicyConstraints.fromExtensions(certificate.getExtensions());
-
-                if (policyConstraints != null)
-                {
-                    BigInteger requireExplicitPolicyMapping = policyConstraints.getRequireExplicitPolicyMapping();
-                    if (requireExplicitPolicyMapping != null)
-                    {
-                        if (requireExplicitPolicyMapping.intValue() < explicitPolicy)
-                        {
-                            explicitPolicy = requireExplicitPolicyMapping.intValue();
-                        }
-                    }
-
-                    BigInteger inhibitPolicyMapping = policyConstraints.getInhibitPolicyMapping();
-                    if (inhibitPolicyMapping != null)
-                    {
-                        if (inhibitPolicyMapping.intValue() < policyMapping)
-                        {
-                            policyMapping = inhibitPolicyMapping.intValue();
-                        }
-                    }
-                }
-
-                //
-                // J
-                //
-                Extension ext = certificate.getExtension(Extension.inhibitAnyPolicy);
-
-                if (ext != null)
-                {
-                    int extValue = ASN1Integer.getInstance(ext.getParsedValue()).getValue().intValue();
-
-                    if (extValue < inhibitAnyPolicy)
-                    {
-                        inhibitAnyPolicy = extValue;
-                    }
-                }
-            }
-        }
-    }
-
-    private int countDown(int policyCounter)
-    {
-        if (policyCounter != 0)
-        {
-            return policyCounter - 1;
-        }
-
-        return 0;
-    }
-
-    public Memoable copy()
-    {
-        return new CertificatePoliciesValidation(0);    // TODO:
-    }
-
-    public void reset(Memoable other)
-    {
-        CertificatePoliciesValidation v = (CertificatePoliciesValidation)other;      // TODO:
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/path/validations/CertificatePoliciesValidationBuilder.java b/bcpkix/src/main/java/org/bouncycastle/cert/path/validations/CertificatePoliciesValidationBuilder.java
deleted file mode 100644
index 74b622e..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/path/validations/CertificatePoliciesValidationBuilder.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package org.bouncycastle.cert.path.validations;
-
-import org.bouncycastle.cert.path.CertPath;
-
-public class CertificatePoliciesValidationBuilder
-{
-    private boolean isExplicitPolicyRequired;
-    private boolean isAnyPolicyInhibited;
-    private boolean isPolicyMappingInhibited;
-
-    public void setAnyPolicyInhibited(boolean anyPolicyInhibited)
-    {
-        isAnyPolicyInhibited = anyPolicyInhibited;
-    }
-
-    public void setExplicitPolicyRequired(boolean explicitPolicyRequired)
-    {
-        isExplicitPolicyRequired = explicitPolicyRequired;
-    }
-
-    public void setPolicyMappingInhibited(boolean policyMappingInhibited)
-    {
-        isPolicyMappingInhibited = policyMappingInhibited;
-    }
-
-    public CertificatePoliciesValidation build(int pathLen)
-    {
-        return new CertificatePoliciesValidation(pathLen, isExplicitPolicyRequired, isAnyPolicyInhibited, isPolicyMappingInhibited);
-    }
-
-    public CertificatePoliciesValidation build(CertPath path)
-    {
-        return build(path.length());
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/path/validations/KeyUsageValidation.java b/bcpkix/src/main/java/org/bouncycastle/cert/path/validations/KeyUsageValidation.java
deleted file mode 100644
index 5d9adc8..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/path/validations/KeyUsageValidation.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package org.bouncycastle.cert.path.validations;
-
-import org.bouncycastle.asn1.x509.Extension;
-import org.bouncycastle.asn1.x509.KeyUsage;
-import org.bouncycastle.cert.X509CertificateHolder;
-import org.bouncycastle.cert.path.CertPathValidation;
-import org.bouncycastle.cert.path.CertPathValidationContext;
-import org.bouncycastle.cert.path.CertPathValidationException;
-import org.bouncycastle.util.Memoable;
-
-public class KeyUsageValidation
-    implements CertPathValidation
-{
-    private boolean          isMandatory;
-
-    public KeyUsageValidation()
-    {
-        this(true);
-    }
-
-    public KeyUsageValidation(boolean isMandatory)
-    {
-        this.isMandatory = isMandatory;
-    }
-
-    public void validate(CertPathValidationContext context, X509CertificateHolder certificate)
-        throws CertPathValidationException
-    {
-        context.addHandledExtension(Extension.keyUsage);
-
-        if (!context.isEndEntity())
-        {
-            KeyUsage usage = KeyUsage.fromExtensions(certificate.getExtensions());
-
-            if (usage != null)
-            {
-                if (!usage.hasUsages(KeyUsage.keyCertSign))
-                {
-                    throw new CertPathValidationException("Issuer certificate KeyUsage extension does not permit key signing");
-                }
-            }
-            else
-            {
-                if (isMandatory)
-                {
-                    throw new CertPathValidationException("KeyUsage extension not present in CA certificate");
-                }
-            }
-        }
-    }
-
-    public Memoable copy()
-    {
-        return new KeyUsageValidation(isMandatory);
-    }
-
-    public void reset(Memoable other)
-    {
-        KeyUsageValidation v = (KeyUsageValidation)other;
-
-        this.isMandatory = v.isMandatory;
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/path/validations/ParentCertIssuedValidation.java b/bcpkix/src/main/java/org/bouncycastle/cert/path/validations/ParentCertIssuedValidation.java
deleted file mode 100644
index a21ad1c..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/path/validations/ParentCertIssuedValidation.java
+++ /dev/null
@@ -1,127 +0,0 @@
-package org.bouncycastle.cert.path.validations;
-
-import java.io.IOException;
-
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1Null;
-import org.bouncycastle.asn1.x500.X500Name;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.bouncycastle.cert.CertException;
-import org.bouncycastle.cert.X509CertificateHolder;
-import org.bouncycastle.cert.X509ContentVerifierProviderBuilder;
-import org.bouncycastle.cert.path.CertPathValidation;
-import org.bouncycastle.cert.path.CertPathValidationContext;
-import org.bouncycastle.cert.path.CertPathValidationException;
-import org.bouncycastle.operator.OperatorCreationException;
-import org.bouncycastle.util.Memoable;
-
-public class ParentCertIssuedValidation
-    implements CertPathValidation
-{
-    private X509ContentVerifierProviderBuilder contentVerifierProvider;
-
-    private X500Name workingIssuerName;
-    private SubjectPublicKeyInfo workingPublicKey;
-    private AlgorithmIdentifier workingAlgId;
-
-    public ParentCertIssuedValidation(X509ContentVerifierProviderBuilder contentVerifierProvider)
-    {
-        this.contentVerifierProvider = contentVerifierProvider;
-    }
-
-    public void validate(CertPathValidationContext context, X509CertificateHolder certificate)
-        throws CertPathValidationException
-    {
-        if (workingIssuerName != null)
-        {
-           if (!workingIssuerName.equals(certificate.getIssuer()))
-           {
-               throw new CertPathValidationException("Certificate issue does not match parent");
-           }
-        }
-
-        if (workingPublicKey != null)
-        {
-            try
-            {
-                SubjectPublicKeyInfo validatingKeyInfo;
-
-                if (workingPublicKey.getAlgorithm().equals(workingAlgId))
-                {
-                    validatingKeyInfo = workingPublicKey;
-                }
-                else
-                {
-                    validatingKeyInfo = new SubjectPublicKeyInfo(workingAlgId, workingPublicKey.parsePublicKey());
-                }
-
-                if (!certificate.isSignatureValid(contentVerifierProvider.build(validatingKeyInfo)))
-                {
-                    throw new CertPathValidationException("Certificate signature not for public key in parent");
-                }
-            }
-            catch (OperatorCreationException e)
-            {
-                throw new CertPathValidationException("Unable to create verifier: " + e.getMessage(), e);
-            }
-            catch (CertException e)
-            {
-                throw new CertPathValidationException("Unable to validate signature: " + e.getMessage(), e);
-            }
-            catch (IOException e)
-            {
-                throw new CertPathValidationException("Unable to build public key: " + e.getMessage(), e);
-            }
-        }
-
-        workingIssuerName = certificate.getSubject();
-        workingPublicKey = certificate.getSubjectPublicKeyInfo();
-
-        if (workingAlgId != null)
-        {
-            // check for inherited parameters
-            if (workingPublicKey.getAlgorithm().getAlgorithm().equals(workingAlgId.getAlgorithm()))
-            {
-                if (!isNull(workingPublicKey.getAlgorithm().getParameters()))
-                {
-                    workingAlgId = workingPublicKey.getAlgorithm();
-                }
-            }
-            else
-            {
-                workingAlgId = workingPublicKey.getAlgorithm();
-            }
-        }
-        else
-        {
-            workingAlgId = workingPublicKey.getAlgorithm();
-        }
-    }
-
-    private boolean isNull(ASN1Encodable obj)
-    {
-        return obj == null || obj instanceof ASN1Null;
-    }
-
-    public Memoable copy()
-    {
-        ParentCertIssuedValidation v = new ParentCertIssuedValidation(contentVerifierProvider);
-
-        v.workingAlgId = this.workingAlgId;
-        v.workingIssuerName = this.workingIssuerName;
-        v.workingPublicKey = this.workingPublicKey;
-
-        return v;
-    }
-
-    public void reset(Memoable other)
-    {
-        ParentCertIssuedValidation v = (ParentCertIssuedValidation)other;
-
-        this.contentVerifierProvider = v.contentVerifierProvider;
-        this.workingAlgId = v.workingAlgId;
-        this.workingIssuerName = v.workingIssuerName;
-        this.workingPublicKey = v.workingPublicKey;
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/path/validations/ValidationUtils.java b/bcpkix/src/main/java/org/bouncycastle/cert/path/validations/ValidationUtils.java
deleted file mode 100644
index 2a58706..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/path/validations/ValidationUtils.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package org.bouncycastle.cert.path.validations;
-
-import org.bouncycastle.cert.X509CertificateHolder;
-
-class ValidationUtils
-{
-    static boolean isSelfIssued(X509CertificateHolder cert)
-    {
-        return cert.getSubject().equals(cert.getIssuer());
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/selector/X509AttributeCertificateHolderSelector.java b/bcpkix/src/main/java/org/bouncycastle/cert/selector/X509AttributeCertificateHolderSelector.java
deleted file mode 100644
index c325fba..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/selector/X509AttributeCertificateHolderSelector.java
+++ /dev/null
@@ -1,268 +0,0 @@
-package org.bouncycastle.cert.selector;
-
-import java.math.BigInteger;
-import java.util.Collection;
-import java.util.Date;
-
-import org.bouncycastle.asn1.x509.Extension;
-import org.bouncycastle.asn1.x509.GeneralName;
-import org.bouncycastle.asn1.x509.Target;
-import org.bouncycastle.asn1.x509.TargetInformation;
-import org.bouncycastle.asn1.x509.Targets;
-import org.bouncycastle.cert.AttributeCertificateHolder;
-import org.bouncycastle.cert.AttributeCertificateIssuer;
-import org.bouncycastle.cert.X509AttributeCertificateHolder;
-import org.bouncycastle.util.Selector;
-
-/**
- * This class is an <code>Selector</code> like implementation to select
- * attribute certificates from a given set of criteria.
- */
-public class X509AttributeCertificateHolderSelector
-    implements Selector
-{
-
-    // TODO: name constraints???
-
-    private final AttributeCertificateHolder holder;
-
-    private final AttributeCertificateIssuer issuer;
-
-    private final BigInteger serialNumber;
-
-    private final Date attributeCertificateValid;
-
-    private final X509AttributeCertificateHolder attributeCert;
-
-    private final Collection targetNames;
-
-    private final Collection targetGroups;
-
-    X509AttributeCertificateHolderSelector(
-        AttributeCertificateHolder holder,
-        AttributeCertificateIssuer issuer,
-        BigInteger serialNumber,
-        Date attributeCertificateValid,
-        X509AttributeCertificateHolder attributeCert,
-        Collection targetNames,
-        Collection targetGroups)
-    {
-        this.holder = holder;
-        this.issuer = issuer;
-        this.serialNumber = serialNumber;
-        this.attributeCertificateValid = attributeCertificateValid;
-        this.attributeCert = attributeCert;
-        this.targetNames = targetNames;
-        this.targetGroups = targetGroups;
-    }
-
-    /**
-     * Decides if the given attribute certificate should be selected.
-     *
-     * @param obj The X509AttributeCertificateHolder which should be checked.
-     * @return <code>true</code> if the attribute certificate is a match
-     *         <code>false</code> otherwise.
-     */
-    public boolean match(Object obj)
-    {
-        if (!(obj instanceof X509AttributeCertificateHolder))
-        {
-            return false;
-        }
-
-        X509AttributeCertificateHolder attrCert = (X509AttributeCertificateHolder)obj;
-
-        if (this.attributeCert != null)
-        {
-            if (!this.attributeCert.equals(attrCert))
-            {
-                return false;
-            }
-        }
-        if (serialNumber != null)
-        {
-            if (!attrCert.getSerialNumber().equals(serialNumber))
-            {
-                return false;
-            }
-        }
-        if (holder != null)
-        {
-            if (!attrCert.getHolder().equals(holder))
-            {
-                return false;
-            }
-        }
-        if (issuer != null)
-        {
-            if (!attrCert.getIssuer().equals(issuer))
-            {
-                return false;
-            }
-        }
-
-        if (attributeCertificateValid != null)
-        {
-            if (!attrCert.isValidOn(attributeCertificateValid))
-            {
-                return false;
-            }
-        }
-        if (!targetNames.isEmpty() || !targetGroups.isEmpty())
-        {
-            Extension targetInfoExt = attrCert.getExtension(Extension.targetInformation);
-            if (targetInfoExt != null)
-            {
-                TargetInformation targetinfo;
-                try
-                {
-                    targetinfo = TargetInformation.getInstance(targetInfoExt.getParsedValue());
-                }
-                catch (IllegalArgumentException e)
-                {
-                    return false;
-                }
-                Targets[] targetss = targetinfo.getTargetsObjects();
-                if (!targetNames.isEmpty())
-                {
-                    boolean found = false;
-
-                    for (int i=0; i<targetss.length; i++)
-                    {
-                        Targets t = targetss[i];
-                        Target[] targets = t.getTargets();
-                        for (int j=0; j<targets.length; j++)
-                        {
-                            if (targetNames.contains(GeneralName.getInstance(targets[j]
-                                                       .getTargetName())))
-                            {
-                                found = true;
-                                break;
-                            }
-                        }
-                    }
-                    if (!found)
-                    {
-                        return false;
-                    }
-                }
-                if (!targetGroups.isEmpty())
-                {
-                    boolean found = false;
-
-                    for (int i=0; i<targetss.length; i++)
-                    {
-                        Targets t = targetss[i];
-                        Target[] targets = t.getTargets();
-                        for (int j=0; j<targets.length; j++)
-                        {
-                            if (targetGroups.contains(GeneralName.getInstance(targets[j]
-                                                        .getTargetGroup())))
-                            {
-                                found = true;
-                                break;
-                            }
-                        }
-                    }
-                    if (!found)
-                    {
-                        return false;
-                    }
-                }
-            }
-        }
-        return true;
-    }
-
-    /**
-     * Returns a clone of this object.
-     *
-     * @return the clone.
-     */
-    public Object clone()
-    {
-        X509AttributeCertificateHolderSelector sel = new X509AttributeCertificateHolderSelector(
-            holder, issuer, serialNumber, attributeCertificateValid, attributeCert, targetNames, targetGroups);
-
-        return sel;
-    }
-
-    /**
-     * Returns the attribute certificate holder which must be matched.
-     *
-     * @return Returns an X509AttributeCertificateHolder
-     */
-    public X509AttributeCertificateHolder getAttributeCert()
-    {
-        return attributeCert;
-    }
-
-    /**
-     * Get the criteria for the validity.
-     *
-     * @return Returns the attributeCertificateValid.
-     */
-    public Date getAttributeCertificateValid()
-    {
-        if (attributeCertificateValid != null)
-        {
-            return new Date(attributeCertificateValid.getTime());
-        }
-
-        return null;
-    }
-
-    /**
-     * Gets the holder.
-     *
-     * @return Returns the holder.
-     */
-    public AttributeCertificateHolder getHolder()
-    {
-        return holder;
-    }
-
-    /**
-     * Returns the issuer criterion.
-     *
-     * @return Returns the issuer.
-     */
-    public AttributeCertificateIssuer getIssuer()
-    {
-        return issuer;
-    }
-
-    /**
-     * Gets the serial number the attribute certificate must have.
-     *
-     * @return Returns the serialNumber.
-     */
-    public BigInteger getSerialNumber()
-    {
-        return serialNumber;
-    }
-
-    /**
-     * Gets the target names. The collection consists of GeneralName objects.
-     * <p>
-     * The returned collection is immutable.
-     *
-     * @return The collection of target names
-     */
-    public Collection getTargetNames()
-    {
-        return targetNames;
-    }
-
-    /**
-     * Gets the target groups. The collection consists of GeneralName objects.
-     * <p>
-     * The returned collection is immutable.
-     *
-     * @return The collection of target groups.
-     */
-    public Collection getTargetGroups()
-    {
-        return targetGroups;
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/selector/X509AttributeCertificateHolderSelectorBuilder.java b/bcpkix/src/main/java/org/bouncycastle/cert/selector/X509AttributeCertificateHolderSelectorBuilder.java
deleted file mode 100644
index f970734..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/selector/X509AttributeCertificateHolderSelectorBuilder.java
+++ /dev/null
@@ -1,194 +0,0 @@
-package org.bouncycastle.cert.selector;
-
-import java.io.IOException;
-import java.math.BigInteger;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Set;
-
-import org.bouncycastle.asn1.x509.GeneralName;
-import org.bouncycastle.cert.AttributeCertificateHolder;
-import org.bouncycastle.cert.AttributeCertificateIssuer;
-import org.bouncycastle.cert.X509AttributeCertificateHolder;
-
-/**
- * This class builds selectors according to the set criteria.
- */
-public class X509AttributeCertificateHolderSelectorBuilder
-{
-
-    // TODO: name constraints???
-
-    private AttributeCertificateHolder holder;
-
-    private AttributeCertificateIssuer issuer;
-
-    private BigInteger serialNumber;
-
-    private Date attributeCertificateValid;
-
-    private X509AttributeCertificateHolder attributeCert;
-
-    private Collection targetNames = new HashSet();
-
-    private Collection targetGroups = new HashSet();
-
-    public X509AttributeCertificateHolderSelectorBuilder()
-    {
-    }
-
-    /**
-     * Set the attribute certificate to be matched. If <code>null</code> is
-     * given any will do.
-     *
-     * @param attributeCert The attribute certificate holder to set.
-     */
-    public void setAttributeCert(X509AttributeCertificateHolder attributeCert)
-    {
-        this.attributeCert = attributeCert;
-    }
-
-    /**
-     * Set the time, when the certificate must be valid. If <code>null</code>
-     * is given any will do.
-     *
-     * @param attributeCertificateValid The attribute certificate validation
-     *            time to set.
-     */
-    public void setAttributeCertificateValid(Date attributeCertificateValid)
-    {
-        if (attributeCertificateValid != null)
-        {
-            this.attributeCertificateValid = new Date(attributeCertificateValid
-                .getTime());
-        }
-        else
-        {
-            this.attributeCertificateValid = null;
-        }
-    }
-
-    /**
-     * Sets the holder. If <code>null</code> is given any will do.
-     *
-     * @param holder The holder to set.
-     */
-    public void setHolder(AttributeCertificateHolder holder)
-    {
-        this.holder = holder;
-    }
-
-    /**
-     * Sets the issuer the attribute certificate must have. If <code>null</code>
-     * is given any will do.
-     *
-     * @param issuer The issuer to set.
-     */
-    public void setIssuer(AttributeCertificateIssuer issuer)
-    {
-        this.issuer = issuer;
-    }
-
-    /**
-     * Sets the serial number the attribute certificate must have. If
-     * <code>null</code> is given any will do.
-     *
-     * @param serialNumber The serialNumber to set.
-     */
-    public void setSerialNumber(BigInteger serialNumber)
-    {
-        this.serialNumber = serialNumber;
-    }
-
-    /**
-     * Adds a target name criterion for the attribute certificate to the target
-     * information extension criteria. The <code>X509AttributeCertificateHolder</code>
-     * must contain at least one of the specified target names.
-     * <p>
-     * Each attribute certificate may contain a target information extension
-     * limiting the servers where this attribute certificate can be used. If
-     * this extension is not present, the attribute certificate is not targeted
-     * and may be accepted by any server.
-     *
-     * @param name The name as a GeneralName (not <code>null</code>)
-     */
-    public void addTargetName(GeneralName name)
-    {
-        targetNames.add(name);
-    }
-
-    /**
-     * Adds a collection with target names criteria. If <code>null</code> is
-     * given any will do.
-     * <p>
-     * The collection consists of either GeneralName objects or byte[] arrays representing
-     * DER encoded GeneralName structures.
-     *
-     * @param names A collection of target names.
-     * @throws java.io.IOException if a parsing error occurs.
-     * @see #addTargetName(org.bouncycastle.asn1.x509.GeneralName)
-     */
-    public void setTargetNames(Collection names) throws IOException
-    {
-        targetNames = extractGeneralNames(names);
-    }
-
-    /**
-     * Adds a target group criterion for the attribute certificate to the target
-     * information extension criteria. The <code>X509AttributeCertificateHolder</code>
-     * must contain at least one of the specified target groups.
-     * <p>
-     * Each attribute certificate may contain a target information extension
-     * limiting the servers where this attribute certificate can be used. If
-     * this extension is not present, the attribute certificate is not targeted
-     * and may be accepted by any server.
-     *
-     * @param group The group as GeneralName form (not <code>null</code>)
-     */
-    public void addTargetGroup(GeneralName group)
-    {
-        targetGroups.add(group);
-    }
-
-    /**
-     * Adds a collection with target groups criteria. If <code>null</code> is
-     * given any will do.
-     * <p>
-     * The collection consists of <code>GeneralName</code> objects or <code>byte[]</code representing DER
-     * encoded GeneralNames.
-     *
-     * @param names A collection of target groups.
-     * @throws java.io.IOException if a parsing error occurs.
-     * @see #addTargetGroup(org.bouncycastle.asn1.x509.GeneralName)
-     */
-    public void setTargetGroups(Collection names) throws IOException
-    {
-        targetGroups = extractGeneralNames(names);
-    }
-
-    private Set extractGeneralNames(Collection names)
-        throws IOException
-    {
-        if (names == null || names.isEmpty())
-        {
-            return new HashSet();
-        }
-        Set temp = new HashSet();
-        for (Iterator it = names.iterator(); it.hasNext();)
-        {
-            temp.add(GeneralName.getInstance(it.next()));
-        }
-        return temp;
-    }
-
-    public X509AttributeCertificateHolderSelector build()
-    {
-        X509AttributeCertificateHolderSelector sel = new X509AttributeCertificateHolderSelector(
-            holder, issuer, serialNumber, attributeCertificateValid, attributeCert, Collections.unmodifiableCollection(new HashSet(targetNames)), Collections.unmodifiableCollection(new HashSet(targetGroups)));
-
-        return sel;
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/selector/jcajce/JcaSelectorConverter.java b/bcpkix/src/main/java/org/bouncycastle/cert/selector/jcajce/JcaSelectorConverter.java
deleted file mode 100644
index 13e9e6b..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/selector/jcajce/JcaSelectorConverter.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package org.bouncycastle.cert.selector.jcajce;
-
-import java.io.IOException;
-import java.security.cert.X509CertSelector;
-
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.x500.X500Name;
-import org.bouncycastle.cert.selector.X509CertificateHolderSelector;
-
-public class JcaSelectorConverter
-{
-    public JcaSelectorConverter()
-    {
-
-    }
-
-    public X509CertificateHolderSelector getCertificateHolderSelector(X509CertSelector certSelector)
-    {
-        try
-        {
-            if (certSelector.getSubjectKeyIdentifier() != null)
-            {
-                return new X509CertificateHolderSelector(X500Name.getInstance(certSelector.getIssuerAsBytes()), certSelector.getSerialNumber(), ASN1OctetString.getInstance(certSelector.getSubjectKeyIdentifier()).getOctets());
-            }
-            else
-            {
-                return new X509CertificateHolderSelector(X500Name.getInstance(certSelector.getIssuerAsBytes()), certSelector.getSerialNumber());
-            }
-        }
-        catch (IOException e)
-        {
-            throw new IllegalArgumentException("unable to convert issuer: " + e.getMessage());
-        }
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/selector/jcajce/JcaX509CertSelectorConverter.java b/bcpkix/src/main/java/org/bouncycastle/cert/selector/jcajce/JcaX509CertSelectorConverter.java
deleted file mode 100644
index 22a3537..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/selector/jcajce/JcaX509CertSelectorConverter.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package org.bouncycastle.cert.selector.jcajce;
-
-import java.io.IOException;
-import java.math.BigInteger;
-import java.security.cert.X509CertSelector;
-
-import org.bouncycastle.asn1.DEROctetString;
-import org.bouncycastle.asn1.x500.X500Name;
-import org.bouncycastle.cert.selector.X509CertificateHolderSelector;
-
-public class JcaX509CertSelectorConverter
-{
-    public JcaX509CertSelectorConverter()
-    {
-    }
-
-    protected X509CertSelector doConversion(X500Name issuer, BigInteger serialNumber, byte[] subjectKeyIdentifier)
-    {
-        X509CertSelector selector = new X509CertSelector();
-
-        if (issuer != null)
-        {
-            try
-            {
-                selector.setIssuer(issuer.getEncoded());
-            }
-            catch (IOException e)
-            {
-                throw new IllegalArgumentException("unable to convert issuer: " + e.getMessage());
-            }
-        }
-
-        if (serialNumber != null)
-        {
-            selector.setSerialNumber(serialNumber);
-        }
-
-        if (subjectKeyIdentifier != null)
-        {
-            try
-            {
-                selector.setSubjectKeyIdentifier(new DEROctetString(subjectKeyIdentifier).getEncoded());
-            }
-            catch (IOException e)
-            {
-                throw new IllegalArgumentException("unable to convert issuer: " + e.getMessage());
-            }
-        }
-
-        return selector;
-    }
-
-    public X509CertSelector getCertSelector(X509CertificateHolderSelector holderSelector)
-    {
-        return doConversion(holderSelector.getIssuer(), holderSelector.getSerialNumber(), holderSelector.getSubjectKeyIdentifier());
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/selector/jcajce/JcaX509CertificateHolderSelector.java b/bcpkix/src/main/java/org/bouncycastle/cert/selector/jcajce/JcaX509CertificateHolderSelector.java
deleted file mode 100644
index b1c2b49..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/selector/jcajce/JcaX509CertificateHolderSelector.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package org.bouncycastle.cert.selector.jcajce;
-
-import java.math.BigInteger;
-import java.security.cert.X509Certificate;
-
-import javax.security.auth.x500.X500Principal;
-
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.x500.X500Name;
-import org.bouncycastle.asn1.x509.Extension;
-import org.bouncycastle.cert.selector.X509CertificateHolderSelector;
-
-public class JcaX509CertificateHolderSelector
-    extends X509CertificateHolderSelector
-{
-    /**
-     * Construct a signer identifier based on the issuer, serial number and subject key identifier (if present) of the passed in
-     * certificate.
-     *
-     * @param certificate certificate providing the issue and serial number and subject key identifier.
-     */
-    public JcaX509CertificateHolderSelector(X509Certificate certificate)
-    {
-        super(convertPrincipal(certificate.getIssuerX500Principal()), certificate.getSerialNumber(), getSubjectKeyId(certificate));
-    }
-
-    /**
-     * Construct a signer identifier based on the provided issuer and serial number..
-     *
-     * @param issuer the issuer to use.
-     * @param serialNumber  the serial number to use.
-     */
-    public JcaX509CertificateHolderSelector(X500Principal issuer, BigInteger serialNumber)
-    {
-        super(convertPrincipal(issuer), serialNumber);
-    }
-
-    /**
-     * Construct a signer identifier based on the provided issuer, serial number, and subjectKeyId..
-     *
-     * @param issuer the issuer to use.
-     * @param serialNumber  the serial number to use.
-     * @param subjectKeyId the subject key ID to use.
-     */
-    public JcaX509CertificateHolderSelector(X500Principal issuer, BigInteger serialNumber, byte[] subjectKeyId)
-    {
-        super(convertPrincipal(issuer), serialNumber, subjectKeyId);
-    }
-
-    private static X500Name convertPrincipal(X500Principal issuer)
-    {
-        if (issuer == null)
-        {
-            return null;
-        }
-        return X500Name.getInstance(issuer.getEncoded());
-    }
-
-    private static byte[] getSubjectKeyId(X509Certificate cert)
-    {
-        byte[] ext = cert.getExtensionValue(Extension.subjectKeyIdentifier.getId());
-
-        if (ext != null)
-        {
-            return ASN1OctetString.getInstance(ASN1OctetString.getInstance(ext).getOctets()).getOctets();
-        }
-        else
-        {
-            return null;
-        }
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/selector/package.html b/bcpkix/src/main/java/org/bouncycastle/cert/selector/package.html
deleted file mode 100644
index c5c4211..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/selector/package.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-        "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<body bgcolor="#ffffff">
-Specialised Selector classes for certificates, CRLs, and attribute certificates.
-</body>
-</html>
\ No newline at end of file
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/test/AllTests.java b/bcpkix/src/main/java/org/bouncycastle/cert/test/AllTests.java
deleted file mode 100644
index a580686..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/test/AllTests.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package org.bouncycastle.cert.test;
-
-import java.security.Security;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.util.test.SimpleTestResult;
-
-public class AllTests
-    extends TestCase
-{
-    public void testSimpleTests()
-    {
-        org.bouncycastle.util.test.Test[] tests = new org.bouncycastle.util.test.Test[] { new CertTest(), new DANETest(), new PKCS10Test(), new AttrCertSelectorTest(), new AttrCertTest(), new X509ExtensionUtilsTest(), new CertPathLoopTest() };
-
-        for (int i = 0; i != tests.length; i++)
-        {
-            SimpleTestResult  result = (SimpleTestResult)tests[i].perform();
-
-            if (!result.isSuccessful())
-            {
-                if (result.getException() != null)
-                {
-                    result.getException().printStackTrace();
-                }
-                fail(result.toString());
-            }
-        }
-    }
-
-    public static void main (String[] args)
-    {
-        junit.textui.TestRunner.run(suite());
-    }
-
-    public static Test suite()
-    {
-        TestSuite suite = new TestSuite("Cert Tests");
-
-        if (Security.getProvider("BC") == null)
-        {
-            Security.addProvider(new BouncyCastleProvider());
-        }
-
-        suite.addTestSuite(AllTests.class);
-        suite.addTestSuite(BcAttrCertSelectorTest.class);
-        suite.addTestSuite(BcAttrCertSelectorTest.class);
-        suite.addTestSuite(BcAttrCertTest.class);
-        suite.addTestSuite(BcCertTest.class);
-        suite.addTestSuite(BcPKCS10Test.class);
-        suite.addTest(ConverterTest.suite());
-
-        return suite;
-    }
-}
\ No newline at end of file
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/test/AttrCertSelectorTest.java b/bcpkix/src/main/java/org/bouncycastle/cert/test/AttrCertSelectorTest.java
deleted file mode 100644
index 3fe3694..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/test/AttrCertSelectorTest.java
+++ /dev/null
@@ -1,243 +0,0 @@
-package org.bouncycastle.cert.test;
-
-import java.io.ByteArrayInputStream;
-import java.math.BigInteger;
-import java.security.KeyFactory;
-import java.security.PrivateKey;
-import java.security.Security;
-import java.security.cert.CertificateFactory;
-import java.security.cert.X509Certificate;
-import java.security.spec.RSAPrivateCrtKeySpec;
-import java.util.Date;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.x500.X500Name;
-import org.bouncycastle.asn1.x509.GeneralName;
-import org.bouncycastle.asn1.x509.Target;
-import org.bouncycastle.asn1.x509.TargetInformation;
-import org.bouncycastle.asn1.x509.X509Extension;
-import org.bouncycastle.cert.AttributeCertificateHolder;
-import org.bouncycastle.cert.AttributeCertificateIssuer;
-import org.bouncycastle.cert.X509AttributeCertificateHolder;
-import org.bouncycastle.cert.X509CertificateHolder;
-import org.bouncycastle.cert.X509v2AttributeCertificateBuilder;
-import org.bouncycastle.cert.jcajce.JcaX509CertificateHolder;
-import org.bouncycastle.cert.selector.X509AttributeCertificateHolderSelectorBuilder;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.operator.ContentSigner;
-import org.bouncycastle.operator.jcajce.JcaContentSignerBuilder;
-import org.bouncycastle.util.encoders.Base64;
-import org.bouncycastle.util.test.SimpleTest;
-import org.bouncycastle.util.test.Test;
-import org.bouncycastle.util.test.TestResult;
-
-public class AttrCertSelectorTest
-    extends SimpleTest
-{
-    private static final String BC = BouncyCastleProvider.PROVIDER_NAME;
-
-    static final RSAPrivateCrtKeySpec RSA_PRIVATE_KEY_SPEC = new RSAPrivateCrtKeySpec(
-        new BigInteger(
-            "b4a7e46170574f16a97082b22be58b6a2a629798419be12872a4bdba626cfae9900f76abfb12139dce5de56564fab2b6543165a040c606887420e33d91ed7ed7",
-            16),
-        new BigInteger("11", 16),
-        new BigInteger(
-            "9f66f6b05410cd503b2709e88115d55daced94d1a34d4e32bf824d0dde6028ae79c5f07b580f5dce240d7111f7ddb130a7945cd7d957d1920994da389f490c89",
-            16), new BigInteger(
-            "c0a0758cdf14256f78d4708c86becdead1b50ad4ad6c5c703e2168fbf37884cb",
-            16), new BigInteger(
-            "f01734d7960ea60070f1b06f2bb81bfac48ff192ae18451d5e56c734a5aab8a5",
-            16), new BigInteger(
-            "b54bb9edff22051d9ee60f9351a48591b6500a319429c069a3e335a1d6171391",
-            16), new BigInteger(
-            "d3d83daf2a0cecd3367ae6f8ae1aeb82e9ac2f816c6fc483533d8297dd7884cd",
-            16), new BigInteger(
-            "b8f52fc6f38593dabb661d3f50f8897f8106eee68b1bce78a95b132b4e5b5d19",
-            16));
-
-    static final byte[] holderCert = Base64
-        .decode("MIIGjTCCBXWgAwIBAgICAPswDQYJKoZIhvcNAQEEBQAwaTEdMBsGCSqGSIb3DQEJ"
-            + "ARYOaXJtaGVscEB2dC5lZHUxLjAsBgNVBAMTJVZpcmdpbmlhIFRlY2ggQ2VydGlm"
-            + "aWNhdGlvbiBBdXRob3JpdHkxCzAJBgNVBAoTAnZ0MQswCQYDVQQGEwJVUzAeFw0w"
-            + "MzAxMzExMzUyMTRaFw0wNDAxMzExMzUyMTRaMIGDMRswGQYJKoZIhvcNAQkBFgxz"
-            + "c2hhaEB2dC5lZHUxGzAZBgNVBAMTElN1bWl0IFNoYWggKHNzaGFoKTEbMBkGA1UE"
-            + "CxMSVmlyZ2luaWEgVGVjaCBVc2VyMRAwDgYDVQQLEwdDbGFzcyAxMQswCQYDVQQK"
-            + "EwJ2dDELMAkGA1UEBhMCVVMwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAPDc"
-            + "scgSKmsEp0VegFkuitD5j5PUkDuzLjlfaYONt2SN8WeqU4j2qtlCnsipa128cyKS"
-            + "JzYe9duUdNxquh5BPIkMkHBw4jHoQA33tk0J/sydWdN74/AHPpPieK5GHwhU7GTG"
-            + "rCCS1PJRxjXqse79ExAlul+gjQwHeldAC+d4A6oZAgMBAAGjggOmMIIDojAMBgNV"
-            + "HRMBAf8EAjAAMBEGCWCGSAGG+EIBAQQEAwIFoDAOBgNVHQ8BAf8EBAMCA/gwHQYD"
-            + "VR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMEMB0GA1UdDgQWBBRUIoWAzlXbzBYE"
-            + "yVTjQFWyMMKo1jCBkwYDVR0jBIGLMIGIgBTgc3Fm+TGqKDhen+oKfbl+xVbj2KFt"
-            + "pGswaTEdMBsGCSqGSIb3DQEJARYOaXJtaGVscEB2dC5lZHUxLjAsBgNVBAMTJVZp"
-            + "cmdpbmlhIFRlY2ggQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxCzAJBgNVBAoTAnZ0"
-            + "MQswCQYDVQQGEwJVU4IBADCBiwYJYIZIAYb4QgENBH4WfFZpcmdpbmlhIFRlY2gg"
-            + "Q2VydGlmaWNhdGlvbiBBdXRob3JpdHkgZGlnaXRhbCBjZXJ0aWZpY2F0ZXMgYXJl"
-            + "IHN1YmplY3QgdG8gcG9saWNpZXMgbG9jYXRlZCBhdCBodHRwOi8vd3d3LnBraS52"
-            + "dC5lZHUvY2EvY3BzLy4wFwYDVR0RBBAwDoEMc3NoYWhAdnQuZWR1MBkGA1UdEgQS"
-            + "MBCBDmlybWhlbHBAdnQuZWR1MEMGCCsGAQUFBwEBBDcwNTAzBggrBgEFBQcwAoYn"
-            + "aHR0cDovL2JveDE3Ny5jYy52dC5lZHUvY2EvaXNzdWVycy5odG1sMEQGA1UdHwQ9"
-            + "MDswOaA3oDWGM2h0dHA6Ly9ib3gxNzcuY2MudnQuZWR1L2h0ZG9jcy1wdWJsaWMv"
-            + "Y3JsL2NhY3JsLmNybDBUBgNVHSAETTBLMA0GCysGAQQBtGgFAQEBMDoGCysGAQQB"
-            + "tGgFAQEBMCswKQYIKwYBBQUHAgEWHWh0dHA6Ly93d3cucGtpLnZ0LmVkdS9jYS9j"
-            + "cHMvMD8GCWCGSAGG+EIBBAQyFjBodHRwOi8vYm94MTc3LmNjLnZ0LmVkdS9jZ2kt"
-            + "cHVibGljL2NoZWNrX3Jldl9jYT8wPAYJYIZIAYb4QgEDBC8WLWh0dHA6Ly9ib3gx"
-            + "NzcuY2MudnQuZWR1L2NnaS1wdWJsaWMvY2hlY2tfcmV2PzBLBglghkgBhvhCAQcE"
-            + "PhY8aHR0cHM6Ly9ib3gxNzcuY2MudnQuZWR1L35PcGVuQ0E4LjAxMDYzMC9jZ2kt"
-            + "cHVibGljL3JlbmV3YWw/MCwGCWCGSAGG+EIBCAQfFh1odHRwOi8vd3d3LnBraS52"
-            + "dC5lZHUvY2EvY3BzLzANBgkqhkiG9w0BAQQFAAOCAQEAHJ2ls9yjpZVcu5DqiE67"
-            + "r7BfkdMnm7IOj2v8cd4EAlPp6OPBmjwDMwvKRBb/P733kLBqFNWXWKTpT008R0KB"
-            + "8kehbx4h0UPz9vp31zhGv169+5iReQUUQSIwTGNWGLzrT8kPdvxiSAvdAJxcbRBm"
-            + "KzDic5I8PoGe48kSCkPpT1oNmnivmcu5j1SMvlx0IS2BkFMksr0OHiAW1elSnE/N"
-            + "RuX2k73b3FucwVxB3NRo3vgoHPCTnh9r4qItAHdxFlF+pPtbw2oHESKRfMRfOIHz"
-            + "CLQWSIa6Tvg4NIV3RRJ0sbCObesyg08lymalQMdkXwtRn5eGE00SHWwEUjSXP2gR"
-            + "3g==");
-
-    public String getName()
-    {
-        return "AttrCertSelector";
-    }
-
-    private X509AttributeCertificateHolder createAttrCert() throws Exception
-    {
-        CertificateFactory fact = CertificateFactory.getInstance("X.509", "BC");
-        X509Certificate iCert = (X509Certificate) fact
-            .generateCertificate(new ByteArrayInputStream(holderCert));
-        X509CertificateHolder iCertHolder = new JcaX509CertificateHolder(iCert);
-        //
-        // a sample key pair.
-        //
-        // RSAPublicKeySpec pubKeySpec = new RSAPublicKeySpec(
-        // new BigInteger(
-        // "b4a7e46170574f16a97082b22be58b6a2a629798419be12872a4bdba626cfae9900f76abfb12139dce5de56564fab2b6543165a040c606887420e33d91ed7ed7",
-        // 16), new BigInteger("11", 16));
-
-        //
-        // set up the keys
-        //
-        PrivateKey privKey;
-
-        KeyFactory kFact = KeyFactory.getInstance("RSA", "BC");
-
-        privKey = kFact.generatePrivate(RSA_PRIVATE_KEY_SPEC);
-
-        X509v2AttributeCertificateBuilder gen = new X509v2AttributeCertificateBuilder(
-                new AttributeCertificateHolder(iCertHolder.getSubject()),
-                new AttributeCertificateIssuer(new X500Name("cn=test")),
-                BigInteger.valueOf(1),
-                new Date(System.currentTimeMillis() - 50000),
-                new Date(System.currentTimeMillis() + 50000));
-
-        // the actual attributes
-        GeneralName roleName = new GeneralName(GeneralName.rfc822Name,
-            "DAU123456789@test.com");
-        ASN1EncodableVector roleSyntax = new ASN1EncodableVector();
-        roleSyntax.add(roleName);
-
-        // roleSyntax OID: 2.5.24.72
-        gen.addAttribute(new ASN1ObjectIdentifier("2.5.24.72"), new DERSequence(roleSyntax));
-
-
-        ContentSigner sigGen = new JcaContentSignerBuilder("SHA1WithRSAEncryption").setProvider(BC).build(privKey);
-
-        Target targetName = new Target(Target.targetName, new GeneralName(GeneralName.dNSName,
-            "www.test.com"));
-
-        Target targetGroup = new Target(Target.targetGroup, new GeneralName(
-            GeneralName.directoryName, "o=Test, ou=Test"));
-        Target[] targets = new Target[2];
-        targets[0] = targetName;
-        targets[1] = targetGroup;
-        TargetInformation targetInformation = new TargetInformation(targets);
-
-        gen.addExtension(X509Extension.targetInformation, true, targetInformation);
-
-        return gen.build(sigGen);
-    }
-
-    public void testSelector() throws Exception
-    {
-        X509AttributeCertificateHolder aCert = createAttrCert();
-        X509AttributeCertificateHolderSelectorBuilder sel = new X509AttributeCertificateHolderSelectorBuilder();
-        sel.setAttributeCert(aCert);
-        boolean match = sel.build().match(aCert);
-        if (!match)
-        {
-            fail("Selector does not match attribute certificate.");
-        }
-        sel.setAttributeCert(null);
-        match = sel.build().match(aCert);
-        if (!match)
-        {
-            fail("Selector does not match attribute certificate.");
-        }
-        sel.setHolder(aCert.getHolder());
-        match = sel.build().match(aCert);
-        if (!match)
-        {
-            fail("Selector does not match attribute certificate holder.");
-        }
-        sel.setHolder(null);
-        sel.setIssuer(aCert.getIssuer());
-        match = sel.build().match(aCert);
-        if (!match)
-        {
-            fail("Selector does not match attribute certificate issuer.");
-        }
-        sel.setIssuer(null);
-
-        CertificateFactory fact = CertificateFactory.getInstance("X.509", "BC");
-        X509CertificateHolder iCert = new JcaX509CertificateHolder((X509Certificate) fact
-            .generateCertificate(new ByteArrayInputStream(holderCert)));
-        match = aCert.getHolder().match(iCert);
-        if (!match)
-        {
-            fail("Issuer holder does not match signing certificate of attribute certificate.");
-        }
-
-        sel.setSerialNumber(aCert.getSerialNumber());
-        match = sel.build().match(aCert);
-        if (!match)
-        {
-            fail("Selector does not match attribute certificate serial number.");
-        }
-
-        sel.setAttributeCertificateValid(new Date());
-        match = sel.build().match(aCert);
-        if (!match)
-        {
-            fail("Selector does not match attribute certificate time.");
-        }
-
-        sel.addTargetName(new GeneralName(2, "www.test.com"));
-        match = sel.build().match(aCert);
-        if (!match)
-        {
-            fail("Selector does not match attribute certificate target name.");
-        }
-        sel.setTargetNames(null);
-        sel.addTargetGroup(new GeneralName(4, "o=Test, ou=Test"));
-        match = sel.build().match(aCert);
-        if (!match)
-        {
-            fail("Selector does not match attribute certificate target group.");
-        }
-        sel.setTargetGroups(null);
-    }
-
-    public void performTest() throws Exception
-    {
-        Security.addProvider(new BouncyCastleProvider());
-        testSelector();
-    }
-
-    public static void main(String[] args)
-    {
-        Test test = new AttrCertSelectorTest();
-        TestResult result = test.perform();
-        System.out.println(result);
-    }
-}
-
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/test/AttrCertTest.java b/bcpkix/src/main/java/org/bouncycastle/cert/test/AttrCertTest.java
deleted file mode 100644
index 4c32ded..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/test/AttrCertTest.java
+++ /dev/null
@@ -1,667 +0,0 @@
-package org.bouncycastle.cert.test;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.math.BigInteger;
-import java.security.KeyFactory;
-import java.security.PrivateKey;
-import java.security.PublicKey;
-import java.security.Security;
-import java.security.cert.CertificateFactory;
-import java.security.cert.X509Certificate;
-import java.security.spec.RSAPrivateCrtKeySpec;
-import java.security.spec.RSAPublicKeySpec;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Date;
-import java.util.List;
-import java.util.Set;
-
-import javax.security.auth.x500.X500Principal;
-
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1String;
-import org.bouncycastle.asn1.DEROctetString;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.x500.X500Name;
-import org.bouncycastle.asn1.x509.Attribute;
-import org.bouncycastle.asn1.x509.Extension;
-import org.bouncycastle.asn1.x509.GeneralName;
-import org.bouncycastle.asn1.x509.GeneralNames;
-import org.bouncycastle.cert.AttributeCertificateHolder;
-import org.bouncycastle.cert.AttributeCertificateIssuer;
-import org.bouncycastle.cert.X509AttributeCertificateHolder;
-import org.bouncycastle.cert.X509v2AttributeCertificateBuilder;
-import org.bouncycastle.cert.jcajce.JcaCertStore;
-import org.bouncycastle.cert.jcajce.JcaX509CertificateHolder;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.operator.ContentSigner;
-import org.bouncycastle.operator.jcajce.JcaContentSignerBuilder;
-import org.bouncycastle.operator.jcajce.JcaContentVerifierProviderBuilder;
-import org.bouncycastle.util.Store;
-import org.bouncycastle.util.encoders.Base64;
-import org.bouncycastle.util.test.SimpleTest;
-
-public class AttrCertTest
-    extends SimpleTest
-{
-    private static final String BC = BouncyCastleProvider.PROVIDER_NAME;
-
-    private static final RSAPrivateCrtKeySpec RSA_PRIVATE_KEY_SPEC = new RSAPrivateCrtKeySpec(
-                new BigInteger("b4a7e46170574f16a97082b22be58b6a2a629798419be12872a4bdba626cfae9900f76abfb12139dce5de56564fab2b6543165a040c606887420e33d91ed7ed7", 16),
-                new BigInteger("11", 16),
-                new BigInteger("9f66f6b05410cd503b2709e88115d55daced94d1a34d4e32bf824d0dde6028ae79c5f07b580f5dce240d7111f7ddb130a7945cd7d957d1920994da389f490c89", 16),
-                new BigInteger("c0a0758cdf14256f78d4708c86becdead1b50ad4ad6c5c703e2168fbf37884cb", 16),
-                new BigInteger("f01734d7960ea60070f1b06f2bb81bfac48ff192ae18451d5e56c734a5aab8a5", 16),
-                new BigInteger("b54bb9edff22051d9ee60f9351a48591b6500a319429c069a3e335a1d6171391", 16),
-                new BigInteger("d3d83daf2a0cecd3367ae6f8ae1aeb82e9ac2f816c6fc483533d8297dd7884cd", 16),
-                new BigInteger("b8f52fc6f38593dabb661d3f50f8897f8106eee68b1bce78a95b132b4e5b5d19", 16));
-
-    public static byte[]  attrCert = Base64.decode(
-            "MIIHQDCCBqkCAQEwgZChgY2kgYowgYcxHDAaBgkqhkiG9w0BCQEWDW1sb3JjaEB2"
-          + "dC5lZHUxHjAcBgNVBAMTFU1hcmt1cyBMb3JjaCAobWxvcmNoKTEbMBkGA1UECxMS"
-          + "VmlyZ2luaWEgVGVjaCBVc2VyMRAwDgYDVQQLEwdDbGFzcyAyMQswCQYDVQQKEwJ2"
-          + "dDELMAkGA1UEBhMCVVMwgYmkgYYwgYMxGzAZBgkqhkiG9w0BCQEWDHNzaGFoQHZ0"
-          + "LmVkdTEbMBkGA1UEAxMSU3VtaXQgU2hhaCAoc3NoYWgpMRswGQYDVQQLExJWaXJn"
-          + "aW5pYSBUZWNoIFVzZXIxEDAOBgNVBAsTB0NsYXNzIDExCzAJBgNVBAoTAnZ0MQsw"
-          + "CQYDVQQGEwJVUzANBgkqhkiG9w0BAQQFAAIBBTAiGA8yMDAzMDcxODE2MDgwMloY"
-          + "DzIwMDMwNzI1MTYwODAyWjCCBU0wggVJBgorBgEEAbRoCAEBMYIFORaCBTU8UnVs"
-          + "ZSBSdWxlSWQ9IkZpbGUtUHJpdmlsZWdlLVJ1bGUiIEVmZmVjdD0iUGVybWl0Ij4K"
-          + "IDxUYXJnZXQ+CiAgPFN1YmplY3RzPgogICA8U3ViamVjdD4KICAgIDxTdWJqZWN0"
-          + "TWF0Y2ggTWF0Y2hJZD0idXJuOm9hc2lzOm5hbWVzOnRjOnhhY21sOjEuMDpmdW5j"
-          + "dGlvbjpzdHJpbmctZXF1YWwiPgogICAgIDxBdHRyaWJ1dGVWYWx1ZSBEYXRhVHlw"
-          + "ZT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS9YTUxTY2hlbWEjc3RyaW5nIj4KICAg"
-          + "ICAgIENOPU1hcmt1cyBMb3JjaDwvQXR0cmlidXRlVmFsdWU+CiAgICAgPFN1Ympl"
-          + "Y3RBdHRyaWJ1dGVEZXNpZ25hdG9yIEF0dHJpYnV0ZUlkPSJ1cm46b2FzaXM6bmFt"
-          + "ZXM6dGM6eGFjbWw6MS4wOnN1YmplY3Q6c3ViamVjdC1pZCIgRGF0YVR5cGU9Imh0"
-          + "dHA6Ly93d3cudzMub3JnLzIwMDEvWE1MU2NoZW1hI3N0cmluZyIgLz4gCiAgICA8"
-          + "L1N1YmplY3RNYXRjaD4KICAgPC9TdWJqZWN0PgogIDwvU3ViamVjdHM+CiAgPFJl"
-          + "c291cmNlcz4KICAgPFJlc291cmNlPgogICAgPFJlc291cmNlTWF0Y2ggTWF0Y2hJ"
-          + "ZD0idXJuOm9hc2lzOm5hbWVzOnRjOnhhY21sOjEuMDpmdW5jdGlvbjpzdHJpbmct"
-          + "ZXF1YWwiPgogICAgIDxBdHRyaWJ1dGVWYWx1ZSBEYXRhVHlwZT0iaHR0cDovL3d3"
-          + "dy53My5vcmcvMjAwMS9YTUxTY2hlbWEjYW55VVJJIj4KICAgICAgaHR0cDovL3p1"
-          + "bmkuY3MudnQuZWR1PC9BdHRyaWJ1dGVWYWx1ZT4KICAgICA8UmVzb3VyY2VBdHRy"
-          + "aWJ1dGVEZXNpZ25hdG9yIEF0dHJpYnV0ZUlkPSJ1cm46b2FzaXM6bmFtZXM6dGM6"
-          + "eGFjbWw6MS4wOnJlc291cmNlOnJlc291cmNlLWlkIiBEYXRhVHlwZT0iaHR0cDov"
-          + "L3d3dy53My5vcmcvMjAwMS9YTUxTY2hlbWEjYW55VVJJIiAvPiAKICAgIDwvUmVz"
-          + "b3VyY2VNYXRjaD4KICAgPC9SZXNvdXJjZT4KICA8L1Jlc291cmNlcz4KICA8QWN0"
-          + "aW9ucz4KICAgPEFjdGlvbj4KICAgIDxBY3Rpb25NYXRjaCBNYXRjaElkPSJ1cm46"
-          + "b2FzaXM6bmFtZXM6dGM6eGFjbWw6MS4wOmZ1bmN0aW9uOnN0cmluZy1lcXVhbCI+"
-          + "CiAgICAgPEF0dHJpYnV0ZVZhbHVlIERhdGFUeXBlPSJodHRwOi8vd3d3LnczLm9y"
-          + "Zy8yMDAxL1hNTFNjaGVtYSNzdHJpbmciPgpEZWxlZ2F0ZSBBY2Nlc3MgICAgIDwv"
-          + "QXR0cmlidXRlVmFsdWU+CgkgIDxBY3Rpb25BdHRyaWJ1dGVEZXNpZ25hdG9yIEF0"
-          + "dHJpYnV0ZUlkPSJ1cm46b2FzaXM6bmFtZXM6dGM6eGFjbWw6MS4wOmFjdGlvbjph"
-          + "Y3Rpb24taWQiIERhdGFUeXBlPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxL1hNTFNj"
-          + "aGVtYSNzdHJpbmciIC8+IAogICAgPC9BY3Rpb25NYXRjaD4KICAgPC9BY3Rpb24+"
-          + "CiAgPC9BY3Rpb25zPgogPC9UYXJnZXQ+CjwvUnVsZT4KMA0GCSqGSIb3DQEBBAUA"
-          + "A4GBAGiJSM48XsY90HlYxGmGVSmNR6ZW2As+bot3KAfiCIkUIOAqhcphBS23egTr"
-          + "6asYwy151HshbPNYz+Cgeqs45KkVzh7bL/0e1r8sDVIaaGIkjHK3CqBABnfSayr3"
-          + "Rd1yBoDdEv8Qb+3eEPH6ab9021AsLEnJ6LWTmybbOpMNZ3tv");
-
-    byte[]  signCert = Base64.decode(
-            "MIIGjTCCBXWgAwIBAgICAPswDQYJKoZIhvcNAQEEBQAwaTEdMBsGCSqGSIb3DQEJ"
-          + "ARYOaXJtaGVscEB2dC5lZHUxLjAsBgNVBAMTJVZpcmdpbmlhIFRlY2ggQ2VydGlm"
-          + "aWNhdGlvbiBBdXRob3JpdHkxCzAJBgNVBAoTAnZ0MQswCQYDVQQGEwJVUzAeFw0w"
-          + "MzAxMzExMzUyMTRaFw0wNDAxMzExMzUyMTRaMIGDMRswGQYJKoZIhvcNAQkBFgxz"
-          + "c2hhaEB2dC5lZHUxGzAZBgNVBAMTElN1bWl0IFNoYWggKHNzaGFoKTEbMBkGA1UE"
-          + "CxMSVmlyZ2luaWEgVGVjaCBVc2VyMRAwDgYDVQQLEwdDbGFzcyAxMQswCQYDVQQK"
-          + "EwJ2dDELMAkGA1UEBhMCVVMwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAPDc"
-          + "scgSKmsEp0VegFkuitD5j5PUkDuzLjlfaYONt2SN8WeqU4j2qtlCnsipa128cyKS"
-          + "JzYe9duUdNxquh5BPIkMkHBw4jHoQA33tk0J/sydWdN74/AHPpPieK5GHwhU7GTG"
-          + "rCCS1PJRxjXqse79ExAlul+gjQwHeldAC+d4A6oZAgMBAAGjggOmMIIDojAMBgNV"
-          + "HRMBAf8EAjAAMBEGCWCGSAGG+EIBAQQEAwIFoDAOBgNVHQ8BAf8EBAMCA/gwHQYD"
-          + "VR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMEMB0GA1UdDgQWBBRUIoWAzlXbzBYE"
-          + "yVTjQFWyMMKo1jCBkwYDVR0jBIGLMIGIgBTgc3Fm+TGqKDhen+oKfbl+xVbj2KFt"
-          + "pGswaTEdMBsGCSqGSIb3DQEJARYOaXJtaGVscEB2dC5lZHUxLjAsBgNVBAMTJVZp"
-          + "cmdpbmlhIFRlY2ggQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxCzAJBgNVBAoTAnZ0"
-          + "MQswCQYDVQQGEwJVU4IBADCBiwYJYIZIAYb4QgENBH4WfFZpcmdpbmlhIFRlY2gg"
-          + "Q2VydGlmaWNhdGlvbiBBdXRob3JpdHkgZGlnaXRhbCBjZXJ0aWZpY2F0ZXMgYXJl"
-          + "IHN1YmplY3QgdG8gcG9saWNpZXMgbG9jYXRlZCBhdCBodHRwOi8vd3d3LnBraS52"
-          + "dC5lZHUvY2EvY3BzLy4wFwYDVR0RBBAwDoEMc3NoYWhAdnQuZWR1MBkGA1UdEgQS"
-          + "MBCBDmlybWhlbHBAdnQuZWR1MEMGCCsGAQUFBwEBBDcwNTAzBggrBgEFBQcwAoYn"
-          + "aHR0cDovL2JveDE3Ny5jYy52dC5lZHUvY2EvaXNzdWVycy5odG1sMEQGA1UdHwQ9"
-          + "MDswOaA3oDWGM2h0dHA6Ly9ib3gxNzcuY2MudnQuZWR1L2h0ZG9jcy1wdWJsaWMv"
-          + "Y3JsL2NhY3JsLmNybDBUBgNVHSAETTBLMA0GCysGAQQBtGgFAQEBMDoGCysGAQQB"
-          + "tGgFAQEBMCswKQYIKwYBBQUHAgEWHWh0dHA6Ly93d3cucGtpLnZ0LmVkdS9jYS9j"
-          + "cHMvMD8GCWCGSAGG+EIBBAQyFjBodHRwOi8vYm94MTc3LmNjLnZ0LmVkdS9jZ2kt"
-          + "cHVibGljL2NoZWNrX3Jldl9jYT8wPAYJYIZIAYb4QgEDBC8WLWh0dHA6Ly9ib3gx"
-          + "NzcuY2MudnQuZWR1L2NnaS1wdWJsaWMvY2hlY2tfcmV2PzBLBglghkgBhvhCAQcE"
-          + "PhY8aHR0cHM6Ly9ib3gxNzcuY2MudnQuZWR1L35PcGVuQ0E4LjAxMDYzMC9jZ2kt"
-          + "cHVibGljL3JlbmV3YWw/MCwGCWCGSAGG+EIBCAQfFh1odHRwOi8vd3d3LnBraS52"
-          + "dC5lZHUvY2EvY3BzLzANBgkqhkiG9w0BAQQFAAOCAQEAHJ2ls9yjpZVcu5DqiE67"
-          + "r7BfkdMnm7IOj2v8cd4EAlPp6OPBmjwDMwvKRBb/P733kLBqFNWXWKTpT008R0KB"
-          + "8kehbx4h0UPz9vp31zhGv169+5iReQUUQSIwTGNWGLzrT8kPdvxiSAvdAJxcbRBm"
-          + "KzDic5I8PoGe48kSCkPpT1oNmnivmcu5j1SMvlx0IS2BkFMksr0OHiAW1elSnE/N"
-          + "RuX2k73b3FucwVxB3NRo3vgoHPCTnh9r4qItAHdxFlF+pPtbw2oHESKRfMRfOIHz"
-          + "CLQWSIa6Tvg4NIV3RRJ0sbCObesyg08lymalQMdkXwtRn5eGE00SHWwEUjSXP2gR"
-          + "3g==");
-
-    static byte[] certWithBaseCertificateID = Base64.decode(
-            "MIIBqzCCARQCAQEwSKBGMD6kPDA6MQswCQYDVQQGEwJJVDEOMAwGA1UEChMFVU5JVE4xDDAKBgNV"
-          + "BAsTA0RJVDENMAsGA1UEAxMEcm9vdAIEAVMVjqB6MHikdjB0MQswCQYDVQQGEwJBVTEoMCYGA1UE"
-          + "ChMfVGhlIExlZ2lvbiBvZiB0aGUgQm91bmN5IENhc3RsZTEjMCEGA1UECxMaQm91bmN5IFByaW1h"
-          + "cnkgQ2VydGlmaWNhdGUxFjAUBgNVBAMTDUJvdW5jeSBDYXN0bGUwDQYJKoZIhvcNAQEFBQACBQKW"
-          + "RhnHMCIYDzIwMDUxMjEyMTIwMDQyWhgPMjAwNTEyMTkxMjAxMzJaMA8wDQYDVRhIMQaBBGVWSVAw"
-          + "DQYJKoZIhvcNAQEFBQADgYEAUAVin9StDaA+InxtXq/av6rUQLI9p1X6louBcj4kYJnxRvTrHpsr"
-          + "N3+i9Uq/uk5lRdAqmPFvcmSbuE3TRAsjrXON5uFiBBKZ1AouLqcr8nHbwcdwjJ9TyUNO9I4hfpSH"
-          + "UHHXMtBKgp4MOkhhX8xTGyWg3hp23d3GaUeg/IYlXBI=");
-    
-    byte[] holderCertWithBaseCertificateID = Base64.decode(
-            "MIIBwDCCASmgAwIBAgIEAVMVjjANBgkqhkiG9w0BAQUFADA6MQswCQYDVQQGEwJJVDEOMAwGA1UE"
-          + "ChMFVU5JVE4xDDAKBgNVBAsTA0RJVDENMAsGA1UEAxMEcm9vdDAeFw0wNTExMTExMjAxMzJaFw0w"
-          + "NjA2MTYxMjAxMzJaMD4xCzAJBgNVBAYTAklUMQ4wDAYDVQQKEwVVTklUTjEMMAoGA1UECxMDRElU"
-          + "MREwDwYDVQQDEwhMdWNhQm9yejBaMA0GCSqGSIb3DQEBAQUAA0kAMEYCQQC0p+RhcFdPFqlwgrIr"
-          + "5YtqKmKXmEGb4ShypL26Ymz66ZAPdqv7EhOdzl3lZWT6srZUMWWgQMYGiHQg4z2R7X7XAgERoxUw"
-          + "EzARBglghkgBhvhCAQEEBAMCBDAwDQYJKoZIhvcNAQEFBQADgYEAsX50VPQQCWmHvPq9y9DeCpmS"
-          + "4szcpFAhpZyn6gYRwY9CRZVtmZKH8713XhkGDWcIEMcG0u3oTz3tdKgPU5uyIPrDEWr6w8ClUj4x"
-          + "5aVz5c2223+dVY7KES//JSB2bE/KCIchN3kAioQ4K8O3e0OL6oDVjsqKGw5bfahgKuSIk/Q=");
-
-    
-    public String getName()
-    {
-        return "AttrCertTest";
-    }
-
-    private void testCertWithBaseCertificateID()
-        throws Exception
-    {
-        X509AttributeCertificateHolder attrCert = new X509AttributeCertificateHolder(certWithBaseCertificateID);
-        CertificateFactory       fact = CertificateFactory.getInstance("X.509", "BC");   
-        X509Certificate          cert = (X509Certificate)fact.generateCertificate(new ByteArrayInputStream(holderCertWithBaseCertificateID));
-        
-        AttributeCertificateHolder holder = attrCert.getHolder();
-        
-        if (holder.getEntityNames() != null)
-        {
-            fail("entity names set when none expected");
-        }
-        
-        if (!holder.getSerialNumber().equals(cert.getSerialNumber()))
-        {
-            fail("holder serial number doesn't match");
-        }
-
-        if (!holder.getIssuer()[0].equals(X500Name.getInstance(cert.getIssuerX500Principal().getEncoded())))
-        {
-            fail("holder issuer doesn't match");
-        }
-        
-        if (!holder.match(new JcaX509CertificateHolder(cert)))
-        {
-            fail("holder not matching holder certificate");
-        }
-
-        if (!holder.equals(holder.clone()))
-        {
-            fail("holder clone test failed");
-        }
-
-        if (!attrCert.getIssuer().equals(attrCert.getIssuer().clone()))
-        {
-            fail("issuer clone test failed");
-        }
-        
-        //equalityAndHashCodeTest(attrCert, certWithBaseCertificateID);
-    }
-
-    private void equalityAndHashCodeTest(X509AttributeCertificateHolder attrCert, byte[] encoding)
-        throws IOException
-    {
-        if (!attrCert.equals(attrCert))
-        {
-            fail("same certificate not equal");
-        }
-
-        if (!attrCert.getHolder().equals(attrCert.getHolder()))
-        {
-            fail("same holder not equal");
-        }
-
-        if (!attrCert.getIssuer().equals(attrCert.getIssuer()))
-        {
-            fail("same issuer not equal");
-        }
-
-        if (attrCert.getHolder().equals(attrCert.getIssuer()))
-        {
-            fail("wrong holder equal");
-        }
-
-        if (attrCert.getIssuer().equals(attrCert.getHolder()))
-        {
-            fail("wrong issuer equal");
-        }
-
-        X509AttributeCertificateHolder attrCert2 = new X509AttributeCertificateHolder(encoding);
-
-        if (attrCert2.getHolder().hashCode() != attrCert.getHolder().hashCode())
-        {
-            fail("holder hashCode test failed");
-        }
-
-        if (!attrCert2.getHolder().equals(attrCert.getHolder()))
-        {
-            fail("holder equals test failed");
-        }
-
-        if (attrCert2.getIssuer().hashCode() != attrCert.getIssuer().hashCode())
-        {
-            fail("issuer hashCode test failed");
-        }
-
-        if (!attrCert2.getIssuer().equals(attrCert.getIssuer()))
-        {
-            fail("issuer equals test failed");
-        }
-    }
-
-    private void testGenerateWithCert()
-        throws Exception
-    {
-        CertificateFactory          fact = CertificateFactory.getInstance("X.509","BC");
-        X509Certificate             iCert = (X509Certificate)fact.generateCertificate(new ByteArrayInputStream(signCert));
-        
-        //
-        // a sample key pair.
-        //
-        RSAPublicKeySpec pubKeySpec = new RSAPublicKeySpec(
-            new BigInteger("b4a7e46170574f16a97082b22be58b6a2a629798419be12872a4bdba626cfae9900f76abfb12139dce5de56564fab2b6543165a040c606887420e33d91ed7ed7", 16),
-            new BigInteger("11", 16));
-
-        //
-        // set up the keys
-        //
-        PrivateKey          privKey;
-        PublicKey           pubKey;
-
-        KeyFactory  kFact = KeyFactory.getInstance("RSA", "BC");
-
-        privKey = kFact.generatePrivate(RSA_PRIVATE_KEY_SPEC);
-        pubKey = kFact.generatePublic(pubKeySpec);
-        
-        X509v2AttributeCertificateBuilder gen = new X509v2AttributeCertificateBuilder(
-            new AttributeCertificateHolder(new JcaX509CertificateHolder(iCert)),
-            new AttributeCertificateIssuer(new X500Name("cn=test")),
-            BigInteger.ONE,
-            new Date(System.currentTimeMillis() - 50000),
-            new Date(System.currentTimeMillis() + 50000));
-
-        // the actual attributes
-        GeneralName roleName = new GeneralName(GeneralName.rfc822Name, "DAU123456789");
-        ASN1EncodableVector roleSyntax = new ASN1EncodableVector();
-        roleSyntax.add(roleName);
-
-        // roleSyntax OID: 2.5.24.72;
-
-        gen.addAttribute(new ASN1ObjectIdentifier("2.5.24.72"), new DERSequence(roleSyntax));
-
-        ContentSigner sigGen = new JcaContentSignerBuilder("SHA1WithRSAEncryption").setProvider(BC).build(privKey);
-
-        X509AttributeCertificateHolder aCert = gen.build(sigGen);
-        
-        if (!aCert.isValidOn(new Date()))
-        {
-            fail("certificate invalid");
-        }
-        
-        if (!aCert.isSignatureValid(new JcaContentVerifierProviderBuilder().setProvider(BC).build(pubKey)))
-        {
-            fail("certificate signature not valid");
-        }
-        
-        AttributeCertificateHolder holder = aCert.getHolder();
-        
-        if (holder.getEntityNames() != null)
-        {
-            fail("entity names set when none expected");
-        }
-        
-        if (!holder.getSerialNumber().equals(iCert.getSerialNumber()))
-        {
-            fail("holder serial number doesn't match");
-        }
-
-        if (!holder.getIssuer()[0].equals(X500Name.getInstance(iCert.getIssuerX500Principal().getEncoded())))
-        {
-            fail("holder issuer doesn't match");
-        }
-        
-        if (!holder.match(new JcaX509CertificateHolder(iCert)))
-        {
-            fail("generated holder not matching holder certificate");
-        }
-        
-        Attribute[] attrs = aCert.getAttributes(new ASN1ObjectIdentifier("2.5.24.72"));
-        
-        if (attrs == null)
-        {
-            fail("attributes related to 2.5.24.72 not found");
-        }
-        
-        Attribute attr = attrs[0];
-        
-        if (!attr.getAttrType().getId().equals("2.5.24.72"))
-        {
-            fail("attribute oid mismatch");
-        }
-        
-        ASN1Encodable[] values = attr.getAttrValues().toArray();
-        
-        GeneralName role = GeneralNames.getInstance(values[0]).getNames()[0];
-        
-        if (role.getTagNo() != GeneralName.rfc822Name)
-        {
-            fail("wrong general name type found in role");
-        }
-        
-        if (!((ASN1String)role.getName()).getString().equals("DAU123456789"))
-        {
-            fail("wrong general name value found in role");
-        }
-        
-        X509Certificate             sCert = (X509Certificate)fact.generateCertificate(new ByteArrayInputStream(holderCertWithBaseCertificateID));
-        
-        if (holder.match(new JcaX509CertificateHolder(sCert)))
-        {
-            fail("generated holder matching wrong certificate");
-        }
-
-        equalityAndHashCodeTest(aCert, aCert.getEncoded());
-    }
-    
-    private void testGenerateWithPrincipal()
-        throws Exception
-    {
-        CertificateFactory          fact = CertificateFactory.getInstance("X.509","BC");
-        X509Certificate             iCert = (X509Certificate)fact.generateCertificate(new ByteArrayInputStream(signCert));
-        
-        //
-        // a sample key pair.
-        //
-        RSAPublicKeySpec pubKeySpec = new RSAPublicKeySpec(
-            new BigInteger("b4a7e46170574f16a97082b22be58b6a2a629798419be12872a4bdba626cfae9900f76abfb12139dce5de56564fab2b6543165a040c606887420e33d91ed7ed7", 16),
-            new BigInteger("11", 16));
-    
-        //
-        // set up the keys
-        //
-        PrivateKey          privKey;
-        PublicKey           pubKey;
-    
-        KeyFactory  kFact = KeyFactory.getInstance("RSA", "BC");
-    
-        privKey = kFact.generatePrivate(RSA_PRIVATE_KEY_SPEC);
-        pubKey = kFact.generatePublic(pubKeySpec);
-        
-        X509v2AttributeCertificateBuilder gen = new X509v2AttributeCertificateBuilder(
-            new AttributeCertificateHolder(new JcaX509CertificateHolder(iCert).getSubject()),
-            new AttributeCertificateIssuer(new X500Name("cn=test")),
-            BigInteger.ONE,
-            new Date(System.currentTimeMillis() - 50000),
-            new Date(System.currentTimeMillis() + 50000));
-        
-        // the actual attributes
-        GeneralName roleName = new GeneralName(GeneralName.rfc822Name, "DAU123456789");
-        ASN1EncodableVector roleSyntax = new ASN1EncodableVector();
-        roleSyntax.add(roleName);
-    
-        // roleSyntax OID: 2.5.24.72
-    
-        gen.addAttribute(new ASN1ObjectIdentifier("2.5.24.72"), new DERSequence(roleSyntax));
-
-        ContentSigner sigGen = new JcaContentSignerBuilder("SHA1WithRSAEncryption").setProvider(BC).build(privKey);
-
-        X509AttributeCertificateHolder aCert = gen.build(sigGen);
-        
-        if (!aCert.isValidOn(new Date()))
-        {
-            fail("certificate invalid");
-        }
-        
-        if (!aCert.isSignatureValid(new JcaContentVerifierProviderBuilder().setProvider(BC).build(pubKey)))
-        {
-            fail("certificate signature not valid");
-        }
-        
-        AttributeCertificateHolder holder = aCert.getHolder();
-        
-        if (holder.getEntityNames() == null)
-        {
-            fail("entity names not set when expected");
-        }
-        
-        if (holder.getSerialNumber() != null)
-        {
-            fail("holder serial number found when none expected");
-        }
-    
-        if (holder.getIssuer() != null)
-        {
-            fail("holder issuer found when none expected");
-        }
-        
-        if (!holder.match(new JcaX509CertificateHolder(iCert)))
-        {
-            fail("generated holder not matching holder certificate");
-        }
-        
-        X509Certificate             sCert = (X509Certificate)fact.generateCertificate(new ByteArrayInputStream(holderCertWithBaseCertificateID));
-        
-        if (holder.match(sCert))
-        {
-            fail("principal generated holder matching wrong certificate");
-        }
-
-        equalityAndHashCodeTest(aCert, aCert.getEncoded());
-    }
-    
-    public void performTest()
-        throws Exception
-    {
-        X509AttributeCertificateHolder    aCert = new X509AttributeCertificateHolder(attrCert);
-        CertificateFactory          fact = CertificateFactory.getInstance("X.509","BC");
-        X509Certificate             sCert = (X509Certificate)fact.generateCertificate(new ByteArrayInputStream(signCert));
-        
-        if (!aCert.isSignatureValid(new JcaContentVerifierProviderBuilder().setProvider(BC).build(sCert)))
-        {
-            fail("certificate signature not valid");
-        }
-
-        //
-        // search test
-        //
-        
-        List      list = new ArrayList();
-        
-        list.add(sCert);
-
-        Store store = new JcaCertStore(list);
-        
-        Collection certs = store.getMatches(aCert.getIssuer());
-        if (certs.size() != 1 || !certs.contains(new JcaX509CertificateHolder(sCert)))
-        {
-            fail("sCert not found by issuer");
-        }
-        
-        Attribute[] attrs = aCert.getAttributes(new ASN1ObjectIdentifier("1.3.6.1.4.1.6760.8.1.1"));
-        if (attrs == null || attrs.length != 1)
-        {
-            fail("attribute not found");
-        }
-
-        //
-        // reencode test
-        //
-        aCert = new X509AttributeCertificateHolder(aCert.getEncoded());
-        
-        if (!aCert.isSignatureValid(new JcaContentVerifierProviderBuilder().setProvider(BC).build(sCert)))
-        {
-            fail("certificate signature not valid");
-        }
-
-        X509AttributeCertificateHolder saCert = new X509AttributeCertificateHolder(aCert.getEncoded());
-        
-        if (!aCert.getNotAfter().equals(saCert.getNotAfter()))
-        {
-            fail("failed date comparison");
-        }
-        
-        // base generator test
-        
-        //
-        // a sample key pair.
-        //
-        RSAPublicKeySpec pubKeySpec = new RSAPublicKeySpec(
-            new BigInteger("b4a7e46170574f16a97082b22be58b6a2a629798419be12872a4bdba626cfae9900f76abfb12139dce5de56564fab2b6543165a040c606887420e33d91ed7ed7", 16),
-            new BigInteger("11", 16));
-
-        RSAPrivateCrtKeySpec privKeySpec = RSA_PRIVATE_KEY_SPEC;
-
-        //
-        // set up the keys
-        //
-        PrivateKey          privKey;
-        PublicKey           pubKey;
-
-        KeyFactory  kFact = KeyFactory.getInstance("RSA", "BC");
-
-        privKey = kFact.generatePrivate(privKeySpec);
-        pubKey = kFact.generatePublic(pubKeySpec);
-        
-        X509v2AttributeCertificateBuilder gen = new X509v2AttributeCertificateBuilder(
-            aCert.getHolder(),
-            aCert.getIssuer(),
-            aCert.getSerialNumber(),
-            new Date(System.currentTimeMillis() - 50000),
-            new Date(System.currentTimeMillis() + 50000));
-
-        gen.addAttribute(attrs[0].getAttrType(), attrs[0].getAttributeValues());
-
-        ContentSigner sigGen = new JcaContentSignerBuilder("SHA1WithRSAEncryption").setProvider(BC).build(privKey);
-
-        aCert = gen.build(sigGen);
-        
-        if (!aCert.isValidOn(new Date()))
-        {
-            fail("certificate not valid");
-        }
-        
-        if (!aCert.isSignatureValid(new JcaContentVerifierProviderBuilder().setProvider(BC).build(pubKey)))
-        {
-            fail("signature not valid");
-        }
-        
-        // as the issuer is the same this should still work (even though it is not
-        // technically correct
-        
-        certs = store.getMatches(aCert.getIssuer());
-        if (certs.size() != 1 || !certs.contains(new JcaX509CertificateHolder(sCert)))
-        {
-            fail("sCert not found by issuer");
-        }
-        
-        attrs = aCert.getAttributes(new ASN1ObjectIdentifier("1.3.6.1.4.1.6760.8.1.1"));
-        if (attrs == null || attrs.length != 1)
-        {
-            fail("attribute not found");
-        }
-        
-        //
-        // reencode test
-        //
-        aCert = new X509AttributeCertificateHolder(aCert.getEncoded());
-        
-        if (!aCert.isSignatureValid(new JcaContentVerifierProviderBuilder().setProvider(BC).build(pubKey)))
-        {
-            fail("signature not valid");
-        }
-        
-        AttributeCertificateIssuer  issuer = aCert.getIssuer();
-        
-        X500Name[] principals = issuer.getNames();
-        
-        //
-        // test holder
-        //
-        AttributeCertificateHolder holder = aCert.getHolder();
-        
-        if (holder.getEntityNames() == null)
-        {
-            fail("entity names not set");
-        }
-        
-        if (holder.getSerialNumber() != null)
-        {
-            fail("holder serial number set when none expected");
-        }
-
-        if (holder.getIssuer() != null)
-        {
-            fail("holder issuer set when none expected");
-        }
-        
-        principals = holder.getEntityNames();
-
-        X500Principal principal0 = new X500Principal(principals[0].getEncoded());
-        if (!principal0.toString().equals("C=US, O=vt, OU=Class 2, OU=Virginia Tech User, CN=Markus Lorch (mlorch), EMAILADDRESS=mlorch@vt.edu"))
-        {
-            fail("principal[0] for entity names don't match");
-        }
-
-        //
-        // extension test
-        //
-        
-        if (aCert.hasExtensions())
-        {
-            fail("hasExtensions true with no extensions");
-        }
-        
-        gen.addExtension(new ASN1ObjectIdentifier("1.1"), true, new DEROctetString(new byte[10]));
-        
-        gen.addExtension(new ASN1ObjectIdentifier("2.2"), false, new DEROctetString(new byte[20]));
-        
-        aCert = gen.build(new JcaContentSignerBuilder("SHA1withRSA").setProvider(BC).build(privKey));
-        
-        Set exts = aCert.getCriticalExtensionOIDs();
-        
-        if (exts.size() != 1 || !exts.contains(new ASN1ObjectIdentifier("1.1")))
-        {               System.err.println(exts);
-            fail("critical extension test failed");
-        }
-
-        exts = aCert.getNonCriticalExtensionOIDs();
-        
-        if (exts.size() != 1 || !exts.contains(new ASN1ObjectIdentifier("2.2")))
-        {
-            fail("non-critical extension test failed");
-        }
-        
-        if (aCert.getCriticalExtensionOIDs().isEmpty())
-        {
-            fail("critical extensions not found");
-        }
-        
-        Extension ext = aCert.getExtension(new ASN1ObjectIdentifier("1.1"));
-        ASN1Encodable extValue = ext.getParsedValue();
-        
-        if (!extValue.equals(new DEROctetString(new byte[10])))
-        {
-            fail("wrong extension value found for 1.1");
-        }
-        
-        testCertWithBaseCertificateID();
-        testGenerateWithCert();
-        testGenerateWithPrincipal();
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        Security.addProvider(new BouncyCastleProvider());
-
-        runTest(new AttrCertTest());
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/test/BcAttrCertSelectorTest.java b/bcpkix/src/main/java/org/bouncycastle/cert/test/BcAttrCertSelectorTest.java
deleted file mode 100644
index 8be11c5..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/test/BcAttrCertSelectorTest.java
+++ /dev/null
@@ -1,212 +0,0 @@
-package org.bouncycastle.cert.test;
-
-import java.math.BigInteger;
-import java.util.Date;
-
-import junit.framework.TestCase;
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.x500.X500Name;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.asn1.x509.Extension;
-import org.bouncycastle.asn1.x509.GeneralName;
-import org.bouncycastle.asn1.x509.Target;
-import org.bouncycastle.asn1.x509.TargetInformation;
-import org.bouncycastle.cert.AttributeCertificateHolder;
-import org.bouncycastle.cert.AttributeCertificateIssuer;
-import org.bouncycastle.cert.X509AttributeCertificateHolder;
-import org.bouncycastle.cert.X509CertificateHolder;
-import org.bouncycastle.cert.X509v2AttributeCertificateBuilder;
-import org.bouncycastle.cert.selector.X509AttributeCertificateHolderSelectorBuilder;
-import org.bouncycastle.crypto.params.RSAPrivateCrtKeyParameters;
-import org.bouncycastle.operator.ContentSigner;
-import org.bouncycastle.operator.DefaultDigestAlgorithmIdentifierFinder;
-import org.bouncycastle.operator.DefaultSignatureAlgorithmIdentifierFinder;
-import org.bouncycastle.operator.bc.BcRSAContentSignerBuilder;
-import org.bouncycastle.util.encoders.Base64;
-
-public class BcAttrCertSelectorTest
-    extends TestCase
-{
-    DefaultSignatureAlgorithmIdentifierFinder sigAlgFinder = new DefaultSignatureAlgorithmIdentifierFinder();
-    DefaultDigestAlgorithmIdentifierFinder digAlgFinder = new DefaultDigestAlgorithmIdentifierFinder();
-
-    static final RSAPrivateCrtKeyParameters RSA_PRIVATE_KEY_SPEC = new RSAPrivateCrtKeyParameters(
-        new BigInteger(
-            "b4a7e46170574f16a97082b22be58b6a2a629798419be12872a4bdba626cfae9900f76abfb12139dce5de56564fab2b6543165a040c606887420e33d91ed7ed7",
-            16),
-        new BigInteger("11", 16),
-        new BigInteger(
-            "9f66f6b05410cd503b2709e88115d55daced94d1a34d4e32bf824d0dde6028ae79c5f07b580f5dce240d7111f7ddb130a7945cd7d957d1920994da389f490c89",
-            16), new BigInteger(
-            "c0a0758cdf14256f78d4708c86becdead1b50ad4ad6c5c703e2168fbf37884cb",
-            16), new BigInteger(
-            "f01734d7960ea60070f1b06f2bb81bfac48ff192ae18451d5e56c734a5aab8a5",
-            16), new BigInteger(
-            "b54bb9edff22051d9ee60f9351a48591b6500a319429c069a3e335a1d6171391",
-            16), new BigInteger(
-            "d3d83daf2a0cecd3367ae6f8ae1aeb82e9ac2f816c6fc483533d8297dd7884cd",
-            16), new BigInteger(
-            "b8f52fc6f38593dabb661d3f50f8897f8106eee68b1bce78a95b132b4e5b5d19",
-            16));
-
-    static final byte[] holderCert = Base64
-        .decode("MIIGjTCCBXWgAwIBAgICAPswDQYJKoZIhvcNAQEEBQAwaTEdMBsGCSqGSIb3DQEJ"
-            + "ARYOaXJtaGVscEB2dC5lZHUxLjAsBgNVBAMTJVZpcmdpbmlhIFRlY2ggQ2VydGlm"
-            + "aWNhdGlvbiBBdXRob3JpdHkxCzAJBgNVBAoTAnZ0MQswCQYDVQQGEwJVUzAeFw0w"
-            + "MzAxMzExMzUyMTRaFw0wNDAxMzExMzUyMTRaMIGDMRswGQYJKoZIhvcNAQkBFgxz"
-            + "c2hhaEB2dC5lZHUxGzAZBgNVBAMTElN1bWl0IFNoYWggKHNzaGFoKTEbMBkGA1UE"
-            + "CxMSVmlyZ2luaWEgVGVjaCBVc2VyMRAwDgYDVQQLEwdDbGFzcyAxMQswCQYDVQQK"
-            + "EwJ2dDELMAkGA1UEBhMCVVMwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAPDc"
-            + "scgSKmsEp0VegFkuitD5j5PUkDuzLjlfaYONt2SN8WeqU4j2qtlCnsipa128cyKS"
-            + "JzYe9duUdNxquh5BPIkMkHBw4jHoQA33tk0J/sydWdN74/AHPpPieK5GHwhU7GTG"
-            + "rCCS1PJRxjXqse79ExAlul+gjQwHeldAC+d4A6oZAgMBAAGjggOmMIIDojAMBgNV"
-            + "HRMBAf8EAjAAMBEGCWCGSAGG+EIBAQQEAwIFoDAOBgNVHQ8BAf8EBAMCA/gwHQYD"
-            + "VR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMEMB0GA1UdDgQWBBRUIoWAzlXbzBYE"
-            + "yVTjQFWyMMKo1jCBkwYDVR0jBIGLMIGIgBTgc3Fm+TGqKDhen+oKfbl+xVbj2KFt"
-            + "pGswaTEdMBsGCSqGSIb3DQEJARYOaXJtaGVscEB2dC5lZHUxLjAsBgNVBAMTJVZp"
-            + "cmdpbmlhIFRlY2ggQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxCzAJBgNVBAoTAnZ0"
-            + "MQswCQYDVQQGEwJVU4IBADCBiwYJYIZIAYb4QgENBH4WfFZpcmdpbmlhIFRlY2gg"
-            + "Q2VydGlmaWNhdGlvbiBBdXRob3JpdHkgZGlnaXRhbCBjZXJ0aWZpY2F0ZXMgYXJl"
-            + "IHN1YmplY3QgdG8gcG9saWNpZXMgbG9jYXRlZCBhdCBodHRwOi8vd3d3LnBraS52"
-            + "dC5lZHUvY2EvY3BzLy4wFwYDVR0RBBAwDoEMc3NoYWhAdnQuZWR1MBkGA1UdEgQS"
-            + "MBCBDmlybWhlbHBAdnQuZWR1MEMGCCsGAQUFBwEBBDcwNTAzBggrBgEFBQcwAoYn"
-            + "aHR0cDovL2JveDE3Ny5jYy52dC5lZHUvY2EvaXNzdWVycy5odG1sMEQGA1UdHwQ9"
-            + "MDswOaA3oDWGM2h0dHA6Ly9ib3gxNzcuY2MudnQuZWR1L2h0ZG9jcy1wdWJsaWMv"
-            + "Y3JsL2NhY3JsLmNybDBUBgNVHSAETTBLMA0GCysGAQQBtGgFAQEBMDoGCysGAQQB"
-            + "tGgFAQEBMCswKQYIKwYBBQUHAgEWHWh0dHA6Ly93d3cucGtpLnZ0LmVkdS9jYS9j"
-            + "cHMvMD8GCWCGSAGG+EIBBAQyFjBodHRwOi8vYm94MTc3LmNjLnZ0LmVkdS9jZ2kt"
-            + "cHVibGljL2NoZWNrX3Jldl9jYT8wPAYJYIZIAYb4QgEDBC8WLWh0dHA6Ly9ib3gx"
-            + "NzcuY2MudnQuZWR1L2NnaS1wdWJsaWMvY2hlY2tfcmV2PzBLBglghkgBhvhCAQcE"
-            + "PhY8aHR0cHM6Ly9ib3gxNzcuY2MudnQuZWR1L35PcGVuQ0E4LjAxMDYzMC9jZ2kt"
-            + "cHVibGljL3JlbmV3YWw/MCwGCWCGSAGG+EIBCAQfFh1odHRwOi8vd3d3LnBraS52"
-            + "dC5lZHUvY2EvY3BzLzANBgkqhkiG9w0BAQQFAAOCAQEAHJ2ls9yjpZVcu5DqiE67"
-            + "r7BfkdMnm7IOj2v8cd4EAlPp6OPBmjwDMwvKRBb/P733kLBqFNWXWKTpT008R0KB"
-            + "8kehbx4h0UPz9vp31zhGv169+5iReQUUQSIwTGNWGLzrT8kPdvxiSAvdAJxcbRBm"
-            + "KzDic5I8PoGe48kSCkPpT1oNmnivmcu5j1SMvlx0IS2BkFMksr0OHiAW1elSnE/N"
-            + "RuX2k73b3FucwVxB3NRo3vgoHPCTnh9r4qItAHdxFlF+pPtbw2oHESKRfMRfOIHz"
-            + "CLQWSIa6Tvg4NIV3RRJ0sbCObesyg08lymalQMdkXwtRn5eGE00SHWwEUjSXP2gR"
-            + "3g==");
-
-    public String getName()
-    {
-        return "AttrCertSelector";
-    }
-
-    private X509AttributeCertificateHolder createAttrCert() throws Exception
-    {
-        X509CertificateHolder iCertHolder = new X509CertificateHolder(holderCert);
-        //
-        // a sample key pair.
-        //
-        // RSAPublicKeySpec pubKeySpec = new RSAPublicKeySpec(
-        // new BigInteger(
-        // "b4a7e46170574f16a97082b22be58b6a2a629798419be12872a4bdba626cfae9900f76abfb12139dce5de56564fab2b6543165a040c606887420e33d91ed7ed7",
-        // 16), new BigInteger("11", 16));
-
-        X509v2AttributeCertificateBuilder gen = new X509v2AttributeCertificateBuilder(
-                new AttributeCertificateHolder(iCertHolder.getSubject()),
-                new AttributeCertificateIssuer(new X500Name("cn=test")),
-                BigInteger.ONE,
-                new Date(System.currentTimeMillis() - 50000),
-                new Date(System.currentTimeMillis() + 50000));
-
-        // the actual attributes
-        GeneralName roleName = new GeneralName(GeneralName.rfc822Name,
-            "DAU123456789@test.com");
-        ASN1EncodableVector roleSyntax = new ASN1EncodableVector();
-        roleSyntax.add(roleName);
-
-        // roleSyntax OID: 2.5.24.72
-        gen.addAttribute(new ASN1ObjectIdentifier("2.5.24.72"), new DERSequence(roleSyntax));
-
-
-        AlgorithmIdentifier sigAlg = sigAlgFinder.find("SHA1withRSA");
-        AlgorithmIdentifier digAlg = digAlgFinder.find(sigAlg);
-
-        ContentSigner sigGen = new BcRSAContentSignerBuilder(sigAlg, digAlg).build(RSA_PRIVATE_KEY_SPEC);
-        Target targetName = new Target(Target.targetName, new GeneralName(GeneralName.dNSName,
-            "www.test.com"));
-
-        Target targetGroup = new Target(Target.targetGroup, new GeneralName(
-            GeneralName.directoryName, "o=Test, ou=Test"));
-        Target[] targets = new Target[2];
-        targets[0] = targetName;
-        targets[1] = targetGroup;
-        TargetInformation targetInformation = new TargetInformation(targets);
-
-        gen.addExtension(Extension.targetInformation, true, targetInformation);
-
-        return gen.build(sigGen);
-    }
-
-    public void testSelector() throws Exception
-    {
-        X509AttributeCertificateHolder aCert = createAttrCert();
-        X509AttributeCertificateHolderSelectorBuilder sel = new X509AttributeCertificateHolderSelectorBuilder();
-        sel.setAttributeCert(aCert);
-        boolean match = sel.build().match(aCert);
-        if (!match)
-        {
-            fail("Selector does not match attribute certificate.");
-        }
-        sel.setAttributeCert(null);
-        match = sel.build().match(aCert);
-        if (!match)
-        {
-            fail("Selector does not match attribute certificate.");
-        }
-        sel.setHolder(aCert.getHolder());
-        match = sel.build().match(aCert);
-        if (!match)
-        {
-            fail("Selector does not match attribute certificate holder.");
-        }
-        sel.setHolder(null);
-        sel.setIssuer(aCert.getIssuer());
-        match = sel.build().match(aCert);
-        if (!match)
-        {
-            fail("Selector does not match attribute certificate issuer.");
-        }
-        sel.setIssuer(null);
-
-        X509CertificateHolder iCert = new X509CertificateHolder(holderCert);
-        match = aCert.getHolder().match(iCert);
-        if (!match)
-        {
-            fail("Issuer holder does not match signing certificate of attribute certificate.");
-        }
-
-        sel.setSerialNumber(aCert.getSerialNumber());
-        match = sel.build().match(aCert);
-        if (!match)
-        {
-            fail("Selector does not match attribute certificate serial number.");
-        }
-
-        sel.setAttributeCertificateValid(new Date());
-        match = sel.build().match(aCert);
-        if (!match)
-        {
-            fail("Selector does not match attribute certificate time.");
-        }
-
-        sel.addTargetName(new GeneralName(2, "www.test.com"));
-        match = sel.build().match(aCert);
-        if (!match)
-        {
-            fail("Selector does not match attribute certificate target name.");
-        }
-        sel.setTargetNames(null);
-        sel.addTargetGroup(new GeneralName(4, "o=Test, ou=Test"));
-        match = sel.build().match(aCert);
-        if (!match)
-        {
-            fail("Selector does not match attribute certificate target group.");
-        }
-        sel.setTargetGroups(null);
-    }
-}
-
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/test/BcAttrCertTest.java b/bcpkix/src/main/java/org/bouncycastle/cert/test/BcAttrCertTest.java
deleted file mode 100644
index 520920a..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/test/BcAttrCertTest.java
+++ /dev/null
@@ -1,636 +0,0 @@
-package org.bouncycastle.cert.test;
-
-
-import java.io.IOException;
-import java.math.BigInteger;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Date;
-import java.util.List;
-import java.util.Set;
-
-import junit.framework.TestCase;
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1String;
-import org.bouncycastle.asn1.DEROctetString;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.x500.X500Name;
-import org.bouncycastle.asn1.x500.style.RFC4519Style;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.asn1.x509.Attribute;
-import org.bouncycastle.asn1.x509.Extension;
-import org.bouncycastle.asn1.x509.GeneralName;
-import org.bouncycastle.asn1.x509.GeneralNames;
-import org.bouncycastle.cert.AttributeCertificateHolder;
-import org.bouncycastle.cert.AttributeCertificateIssuer;
-import org.bouncycastle.cert.X509AttributeCertificateHolder;
-import org.bouncycastle.cert.X509CertificateHolder;
-import org.bouncycastle.cert.X509v2AttributeCertificateBuilder;
-import org.bouncycastle.crypto.params.AsymmetricKeyParameter;
-import org.bouncycastle.crypto.params.RSAKeyParameters;
-import org.bouncycastle.crypto.params.RSAPrivateCrtKeyParameters;
-import org.bouncycastle.operator.ContentSigner;
-import org.bouncycastle.operator.DefaultDigestAlgorithmIdentifierFinder;
-import org.bouncycastle.operator.DefaultSignatureAlgorithmIdentifierFinder;
-import org.bouncycastle.operator.bc.BcRSAContentSignerBuilder;
-import org.bouncycastle.operator.bc.BcRSAContentVerifierProviderBuilder;
-import org.bouncycastle.util.CollectionStore;
-import org.bouncycastle.util.Store;
-import org.bouncycastle.util.encoders.Base64;
-
-public class BcAttrCertTest
-    extends TestCase
-{
-    DefaultSignatureAlgorithmIdentifierFinder sigAlgFinder = new DefaultSignatureAlgorithmIdentifierFinder();
-    DefaultDigestAlgorithmIdentifierFinder digAlgFinder = new DefaultDigestAlgorithmIdentifierFinder();
-
-    private static final AsymmetricKeyParameter RSA_PRIVATE_KEY_SPEC = new RSAPrivateCrtKeyParameters(
-                new BigInteger("b4a7e46170574f16a97082b22be58b6a2a629798419be12872a4bdba626cfae9900f76abfb12139dce5de56564fab2b6543165a040c606887420e33d91ed7ed7", 16),
-                new BigInteger("11", 16),
-                new BigInteger("9f66f6b05410cd503b2709e88115d55daced94d1a34d4e32bf824d0dde6028ae79c5f07b580f5dce240d7111f7ddb130a7945cd7d957d1920994da389f490c89", 16),
-                new BigInteger("c0a0758cdf14256f78d4708c86becdead1b50ad4ad6c5c703e2168fbf37884cb", 16),
-                new BigInteger("f01734d7960ea60070f1b06f2bb81bfac48ff192ae18451d5e56c734a5aab8a5", 16),
-                new BigInteger("b54bb9edff22051d9ee60f9351a48591b6500a319429c069a3e335a1d6171391", 16),
-                new BigInteger("d3d83daf2a0cecd3367ae6f8ae1aeb82e9ac2f816c6fc483533d8297dd7884cd", 16),
-                new BigInteger("b8f52fc6f38593dabb661d3f50f8897f8106eee68b1bce78a95b132b4e5b5d19", 16));
-
-    public static byte[]  attrCert = Base64.decode(
-        "MIIHQDCCBqkCAQEwgZChgY2kgYowgYcxHDAaBgkqhkiG9w0BCQEWDW1sb3JjaEB2"
-            + "dC5lZHUxHjAcBgNVBAMTFU1hcmt1cyBMb3JjaCAobWxvcmNoKTEbMBkGA1UECxMS"
-            + "VmlyZ2luaWEgVGVjaCBVc2VyMRAwDgYDVQQLEwdDbGFzcyAyMQswCQYDVQQKEwJ2"
-            + "dDELMAkGA1UEBhMCVVMwgYmkgYYwgYMxGzAZBgkqhkiG9w0BCQEWDHNzaGFoQHZ0"
-            + "LmVkdTEbMBkGA1UEAxMSU3VtaXQgU2hhaCAoc3NoYWgpMRswGQYDVQQLExJWaXJn"
-            + "aW5pYSBUZWNoIFVzZXIxEDAOBgNVBAsTB0NsYXNzIDExCzAJBgNVBAoTAnZ0MQsw"
-            + "CQYDVQQGEwJVUzANBgkqhkiG9w0BAQQFAAIBBTAiGA8yMDAzMDcxODE2MDgwMloY"
-            + "DzIwMDMwNzI1MTYwODAyWjCCBU0wggVJBgorBgEEAbRoCAEBMYIFORaCBTU8UnVs"
-            + "ZSBSdWxlSWQ9IkZpbGUtUHJpdmlsZWdlLVJ1bGUiIEVmZmVjdD0iUGVybWl0Ij4K"
-            + "IDxUYXJnZXQ+CiAgPFN1YmplY3RzPgogICA8U3ViamVjdD4KICAgIDxTdWJqZWN0"
-            + "TWF0Y2ggTWF0Y2hJZD0idXJuOm9hc2lzOm5hbWVzOnRjOnhhY21sOjEuMDpmdW5j"
-            + "dGlvbjpzdHJpbmctZXF1YWwiPgogICAgIDxBdHRyaWJ1dGVWYWx1ZSBEYXRhVHlw"
-            + "ZT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS9YTUxTY2hlbWEjc3RyaW5nIj4KICAg"
-            + "ICAgIENOPU1hcmt1cyBMb3JjaDwvQXR0cmlidXRlVmFsdWU+CiAgICAgPFN1Ympl"
-            + "Y3RBdHRyaWJ1dGVEZXNpZ25hdG9yIEF0dHJpYnV0ZUlkPSJ1cm46b2FzaXM6bmFt"
-            + "ZXM6dGM6eGFjbWw6MS4wOnN1YmplY3Q6c3ViamVjdC1pZCIgRGF0YVR5cGU9Imh0"
-            + "dHA6Ly93d3cudzMub3JnLzIwMDEvWE1MU2NoZW1hI3N0cmluZyIgLz4gCiAgICA8"
-            + "L1N1YmplY3RNYXRjaD4KICAgPC9TdWJqZWN0PgogIDwvU3ViamVjdHM+CiAgPFJl"
-            + "c291cmNlcz4KICAgPFJlc291cmNlPgogICAgPFJlc291cmNlTWF0Y2ggTWF0Y2hJ"
-            + "ZD0idXJuOm9hc2lzOm5hbWVzOnRjOnhhY21sOjEuMDpmdW5jdGlvbjpzdHJpbmct"
-            + "ZXF1YWwiPgogICAgIDxBdHRyaWJ1dGVWYWx1ZSBEYXRhVHlwZT0iaHR0cDovL3d3"
-            + "dy53My5vcmcvMjAwMS9YTUxTY2hlbWEjYW55VVJJIj4KICAgICAgaHR0cDovL3p1"
-            + "bmkuY3MudnQuZWR1PC9BdHRyaWJ1dGVWYWx1ZT4KICAgICA8UmVzb3VyY2VBdHRy"
-            + "aWJ1dGVEZXNpZ25hdG9yIEF0dHJpYnV0ZUlkPSJ1cm46b2FzaXM6bmFtZXM6dGM6"
-            + "eGFjbWw6MS4wOnJlc291cmNlOnJlc291cmNlLWlkIiBEYXRhVHlwZT0iaHR0cDov"
-            + "L3d3dy53My5vcmcvMjAwMS9YTUxTY2hlbWEjYW55VVJJIiAvPiAKICAgIDwvUmVz"
-            + "b3VyY2VNYXRjaD4KICAgPC9SZXNvdXJjZT4KICA8L1Jlc291cmNlcz4KICA8QWN0"
-            + "aW9ucz4KICAgPEFjdGlvbj4KICAgIDxBY3Rpb25NYXRjaCBNYXRjaElkPSJ1cm46"
-            + "b2FzaXM6bmFtZXM6dGM6eGFjbWw6MS4wOmZ1bmN0aW9uOnN0cmluZy1lcXVhbCI+"
-            + "CiAgICAgPEF0dHJpYnV0ZVZhbHVlIERhdGFUeXBlPSJodHRwOi8vd3d3LnczLm9y"
-            + "Zy8yMDAxL1hNTFNjaGVtYSNzdHJpbmciPgpEZWxlZ2F0ZSBBY2Nlc3MgICAgIDwv"
-            + "QXR0cmlidXRlVmFsdWU+CgkgIDxBY3Rpb25BdHRyaWJ1dGVEZXNpZ25hdG9yIEF0"
-            + "dHJpYnV0ZUlkPSJ1cm46b2FzaXM6bmFtZXM6dGM6eGFjbWw6MS4wOmFjdGlvbjph"
-            + "Y3Rpb24taWQiIERhdGFUeXBlPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxL1hNTFNj"
-            + "aGVtYSNzdHJpbmciIC8+IAogICAgPC9BY3Rpb25NYXRjaD4KICAgPC9BY3Rpb24+"
-            + "CiAgPC9BY3Rpb25zPgogPC9UYXJnZXQ+CjwvUnVsZT4KMA0GCSqGSIb3DQEBBAUA"
-            + "A4GBAGiJSM48XsY90HlYxGmGVSmNR6ZW2As+bot3KAfiCIkUIOAqhcphBS23egTr"
-            + "6asYwy151HshbPNYz+Cgeqs45KkVzh7bL/0e1r8sDVIaaGIkjHK3CqBABnfSayr3"
-            + "Rd1yBoDdEv8Qb+3eEPH6ab9021AsLEnJ6LWTmybbOpMNZ3tv");
-
-    byte[]  signCert = Base64.decode(
-            "MIIGjTCCBXWgAwIBAgICAPswDQYJKoZIhvcNAQEEBQAwaTEdMBsGCSqGSIb3DQEJ"
-          + "ARYOaXJtaGVscEB2dC5lZHUxLjAsBgNVBAMTJVZpcmdpbmlhIFRlY2ggQ2VydGlm"
-          + "aWNhdGlvbiBBdXRob3JpdHkxCzAJBgNVBAoTAnZ0MQswCQYDVQQGEwJVUzAeFw0w"
-          + "MzAxMzExMzUyMTRaFw0wNDAxMzExMzUyMTRaMIGDMRswGQYJKoZIhvcNAQkBFgxz"
-          + "c2hhaEB2dC5lZHUxGzAZBgNVBAMTElN1bWl0IFNoYWggKHNzaGFoKTEbMBkGA1UE"
-          + "CxMSVmlyZ2luaWEgVGVjaCBVc2VyMRAwDgYDVQQLEwdDbGFzcyAxMQswCQYDVQQK"
-          + "EwJ2dDELMAkGA1UEBhMCVVMwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAPDc"
-          + "scgSKmsEp0VegFkuitD5j5PUkDuzLjlfaYONt2SN8WeqU4j2qtlCnsipa128cyKS"
-          + "JzYe9duUdNxquh5BPIkMkHBw4jHoQA33tk0J/sydWdN74/AHPpPieK5GHwhU7GTG"
-          + "rCCS1PJRxjXqse79ExAlul+gjQwHeldAC+d4A6oZAgMBAAGjggOmMIIDojAMBgNV"
-          + "HRMBAf8EAjAAMBEGCWCGSAGG+EIBAQQEAwIFoDAOBgNVHQ8BAf8EBAMCA/gwHQYD"
-          + "VR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMEMB0GA1UdDgQWBBRUIoWAzlXbzBYE"
-          + "yVTjQFWyMMKo1jCBkwYDVR0jBIGLMIGIgBTgc3Fm+TGqKDhen+oKfbl+xVbj2KFt"
-          + "pGswaTEdMBsGCSqGSIb3DQEJARYOaXJtaGVscEB2dC5lZHUxLjAsBgNVBAMTJVZp"
-          + "cmdpbmlhIFRlY2ggQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxCzAJBgNVBAoTAnZ0"
-          + "MQswCQYDVQQGEwJVU4IBADCBiwYJYIZIAYb4QgENBH4WfFZpcmdpbmlhIFRlY2gg"
-          + "Q2VydGlmaWNhdGlvbiBBdXRob3JpdHkgZGlnaXRhbCBjZXJ0aWZpY2F0ZXMgYXJl"
-          + "IHN1YmplY3QgdG8gcG9saWNpZXMgbG9jYXRlZCBhdCBodHRwOi8vd3d3LnBraS52"
-          + "dC5lZHUvY2EvY3BzLy4wFwYDVR0RBBAwDoEMc3NoYWhAdnQuZWR1MBkGA1UdEgQS"
-          + "MBCBDmlybWhlbHBAdnQuZWR1MEMGCCsGAQUFBwEBBDcwNTAzBggrBgEFBQcwAoYn"
-          + "aHR0cDovL2JveDE3Ny5jYy52dC5lZHUvY2EvaXNzdWVycy5odG1sMEQGA1UdHwQ9"
-          + "MDswOaA3oDWGM2h0dHA6Ly9ib3gxNzcuY2MudnQuZWR1L2h0ZG9jcy1wdWJsaWMv"
-          + "Y3JsL2NhY3JsLmNybDBUBgNVHSAETTBLMA0GCysGAQQBtGgFAQEBMDoGCysGAQQB"
-          + "tGgFAQEBMCswKQYIKwYBBQUHAgEWHWh0dHA6Ly93d3cucGtpLnZ0LmVkdS9jYS9j"
-          + "cHMvMD8GCWCGSAGG+EIBBAQyFjBodHRwOi8vYm94MTc3LmNjLnZ0LmVkdS9jZ2kt"
-          + "cHVibGljL2NoZWNrX3Jldl9jYT8wPAYJYIZIAYb4QgEDBC8WLWh0dHA6Ly9ib3gx"
-          + "NzcuY2MudnQuZWR1L2NnaS1wdWJsaWMvY2hlY2tfcmV2PzBLBglghkgBhvhCAQcE"
-          + "PhY8aHR0cHM6Ly9ib3gxNzcuY2MudnQuZWR1L35PcGVuQ0E4LjAxMDYzMC9jZ2kt"
-          + "cHVibGljL3JlbmV3YWw/MCwGCWCGSAGG+EIBCAQfFh1odHRwOi8vd3d3LnBraS52"
-          + "dC5lZHUvY2EvY3BzLzANBgkqhkiG9w0BAQQFAAOCAQEAHJ2ls9yjpZVcu5DqiE67"
-          + "r7BfkdMnm7IOj2v8cd4EAlPp6OPBmjwDMwvKRBb/P733kLBqFNWXWKTpT008R0KB"
-          + "8kehbx4h0UPz9vp31zhGv169+5iReQUUQSIwTGNWGLzrT8kPdvxiSAvdAJxcbRBm"
-          + "KzDic5I8PoGe48kSCkPpT1oNmnivmcu5j1SMvlx0IS2BkFMksr0OHiAW1elSnE/N"
-          + "RuX2k73b3FucwVxB3NRo3vgoHPCTnh9r4qItAHdxFlF+pPtbw2oHESKRfMRfOIHz"
-          + "CLQWSIa6Tvg4NIV3RRJ0sbCObesyg08lymalQMdkXwtRn5eGE00SHWwEUjSXP2gR"
-          + "3g==");
-
-    static byte[] certWithBaseCertificateID = Base64.decode(
-            "MIIBqzCCARQCAQEwSKBGMD6kPDA6MQswCQYDVQQGEwJJVDEOMAwGA1UEChMFVU5JVE4xDDAKBgNV"
-          + "BAsTA0RJVDENMAsGA1UEAxMEcm9vdAIEAVMVjqB6MHikdjB0MQswCQYDVQQGEwJBVTEoMCYGA1UE"
-          + "ChMfVGhlIExlZ2lvbiBvZiB0aGUgQm91bmN5IENhc3RsZTEjMCEGA1UECxMaQm91bmN5IFByaW1h"
-          + "cnkgQ2VydGlmaWNhdGUxFjAUBgNVBAMTDUJvdW5jeSBDYXN0bGUwDQYJKoZIhvcNAQEFBQACBQKW"
-          + "RhnHMCIYDzIwMDUxMjEyMTIwMDQyWhgPMjAwNTEyMTkxMjAxMzJaMA8wDQYDVRhIMQaBBGVWSVAw"
-          + "DQYJKoZIhvcNAQEFBQADgYEAUAVin9StDaA+InxtXq/av6rUQLI9p1X6louBcj4kYJnxRvTrHpsr"
-          + "N3+i9Uq/uk5lRdAqmPFvcmSbuE3TRAsjrXON5uFiBBKZ1AouLqcr8nHbwcdwjJ9TyUNO9I4hfpSH"
-          + "UHHXMtBKgp4MOkhhX8xTGyWg3hp23d3GaUeg/IYlXBI=");
-    
-    byte[] holderCertWithBaseCertificateID = Base64.decode(
-            "MIIBwDCCASmgAwIBAgIEAVMVjjANBgkqhkiG9w0BAQUFADA6MQswCQYDVQQGEwJJVDEOMAwGA1UE"
-          + "ChMFVU5JVE4xDDAKBgNVBAsTA0RJVDENMAsGA1UEAxMEcm9vdDAeFw0wNTExMTExMjAxMzJaFw0w"
-          + "NjA2MTYxMjAxMzJaMD4xCzAJBgNVBAYTAklUMQ4wDAYDVQQKEwVVTklUTjEMMAoGA1UECxMDRElU"
-          + "MREwDwYDVQQDEwhMdWNhQm9yejBaMA0GCSqGSIb3DQEBAQUAA0kAMEYCQQC0p+RhcFdPFqlwgrIr"
-          + "5YtqKmKXmEGb4ShypL26Ymz66ZAPdqv7EhOdzl3lZWT6srZUMWWgQMYGiHQg4z2R7X7XAgERoxUw"
-          + "EzARBglghkgBhvhCAQEEBAMCBDAwDQYJKoZIhvcNAQEFBQADgYEAsX50VPQQCWmHvPq9y9DeCpmS"
-          + "4szcpFAhpZyn6gYRwY9CRZVtmZKH8713XhkGDWcIEMcG0u3oTz3tdKgPU5uyIPrDEWr6w8ClUj4x"
-          + "5aVz5c2223+dVY7KES//JSB2bE/KCIchN3kAioQ4K8O3e0OL6oDVjsqKGw5bfahgKuSIk/Q=");
-
-    
-    public String getName()
-    {
-        return "AttrCertTest";
-    }
-
-    public void testCertWithBaseCertificateID()
-        throws Exception
-    {
-        X509AttributeCertificateHolder attrCert = new X509AttributeCertificateHolder(certWithBaseCertificateID);
-        X509CertificateHolder cert = new X509CertificateHolder(holderCertWithBaseCertificateID);
-        
-        AttributeCertificateHolder holder = attrCert.getHolder();
-        
-        if (holder.getEntityNames() != null)
-        {
-            fail("entity names set when none expected");
-        }
-        
-        if (!holder.getSerialNumber().equals(cert.getSerialNumber()))
-        {
-            fail("holder serial number doesn't match");
-        }
-
-        if (!holder.getIssuer()[0].equals(cert.getIssuer()))
-        {
-            fail("holder issuer doesn't match");
-        }
-        
-        if (!holder.match(cert))
-        {
-            fail("holder not matching holder certificate");
-        }
-
-        if (!holder.equals(holder.clone()))
-        {
-            fail("holder clone test failed");
-        }
-
-        if (!attrCert.getIssuer().equals(attrCert.getIssuer().clone()))
-        {
-            fail("issuer clone test failed");
-        }
-        
-        //equalityAndHashCodeTest(attrCert, certWithBaseCertificateID);
-    }
-
-    private void equalityAndHashCodeTest(X509AttributeCertificateHolder attrCert, byte[] encoding)
-        throws IOException
-    {
-        if (!attrCert.equals(attrCert))
-        {
-            fail("same certificate not equal");
-        }
-
-        if (!attrCert.getHolder().equals(attrCert.getHolder()))
-        {
-            fail("same holder not equal");
-        }
-
-        if (!attrCert.getIssuer().equals(attrCert.getIssuer()))
-        {
-            fail("same issuer not equal");
-        }
-
-        if (attrCert.getHolder().equals(attrCert.getIssuer()))
-        {
-            fail("wrong holder equal");
-        }
-
-        if (attrCert.getIssuer().equals(attrCert.getHolder()))
-        {
-            fail("wrong issuer equal");
-        }
-
-        X509AttributeCertificateHolder attrCert2 = new X509AttributeCertificateHolder(encoding);
-
-        if (attrCert2.getHolder().hashCode() != attrCert.getHolder().hashCode())
-        {
-            fail("holder hashCode test failed");
-        }
-
-        if (!attrCert2.getHolder().equals(attrCert.getHolder()))
-        {
-            fail("holder equals test failed");
-        }
-
-        if (attrCert2.getIssuer().hashCode() != attrCert.getIssuer().hashCode())
-        {
-            fail("issuer hashCode test failed");
-        }
-
-        if (!attrCert2.getIssuer().equals(attrCert.getIssuer()))
-        {
-            fail("issuer equals test failed");
-        }
-    }
-
-    public void testGenerateWithCert()
-        throws Exception
-    {
-        X509CertificateHolder       iCert = new X509CertificateHolder(signCert);
-        
-        //
-        // a sample key pair.
-        //
-        AsymmetricKeyParameter pubKey = new RSAKeyParameters(
-            false,
-            new BigInteger("b4a7e46170574f16a97082b22be58b6a2a629798419be12872a4bdba626cfae9900f76abfb12139dce5de56564fab2b6543165a040c606887420e33d91ed7ed7", 16),
-            new BigInteger("11", 16));
-
-        //
-        // set up the keys
-        //
-        AsymmetricKeyParameter          privKey = RSA_PRIVATE_KEY_SPEC;
-
-        X509v2AttributeCertificateBuilder gen = new X509v2AttributeCertificateBuilder(
-            new AttributeCertificateHolder(iCert),
-            new AttributeCertificateIssuer(new X500Name("cn=test")),
-            BigInteger.ONE,
-            new Date(System.currentTimeMillis() - 50000),
-            new Date(System.currentTimeMillis() + 50000));
-
-        // the actual attributes
-        GeneralName roleName = new GeneralName(GeneralName.rfc822Name, "DAU123456789");
-        ASN1EncodableVector roleSyntax = new ASN1EncodableVector();
-        roleSyntax.add(roleName);
-
-        // roleSyntax OID: 2.5.24.72;
-
-        gen.addAttribute(new ASN1ObjectIdentifier("2.5.24.72"), new DERSequence(roleSyntax));
-
-        AlgorithmIdentifier sigAlg = sigAlgFinder.find("SHA1withRSA");
-        AlgorithmIdentifier digAlg = digAlgFinder.find(sigAlg);
-
-        ContentSigner sigGen = new BcRSAContentSignerBuilder(sigAlg, digAlg).build(privKey);
-
-        X509AttributeCertificateHolder aCert = gen.build(sigGen);
-        
-        if (!aCert.isValidOn(new Date()))
-        {
-            fail("certificate invalid");
-        }
-        
-        if (!aCert.isSignatureValid(new BcRSAContentVerifierProviderBuilder(digAlgFinder).build(pubKey)))
-        {
-            fail("certificate signature not valid");
-        }
-        
-        AttributeCertificateHolder holder = aCert.getHolder();
-        
-        if (holder.getEntityNames() != null)
-        {
-            fail("entity names set when none expected");
-        }
-        
-        if (!holder.getSerialNumber().equals(iCert.getSerialNumber()))
-        {
-            fail("holder serial number doesn't match");
-        }
-
-        if (!holder.getIssuer()[0].equals(iCert.getIssuer()))
-        {
-            fail("holder issuer doesn't match");
-        }
-        
-        if (!holder.match(iCert))
-        {
-            fail("generated holder not matching holder certificate");
-        }
-        
-        Attribute[] attrs = aCert.getAttributes(new ASN1ObjectIdentifier("2.5.24.72"));
-        
-        if (attrs == null)
-        {
-            fail("attributes related to 2.5.24.72 not found");
-        }
-        
-        Attribute attr = attrs[0];
-        
-        if (!attr.getAttrType().getId().equals("2.5.24.72"))
-        {
-            fail("attribute oid mismatch");
-        }
-        
-        ASN1Encodable[] values = attr.getAttrValues().toArray();
-        
-        GeneralName role = GeneralNames.getInstance(values[0]).getNames()[0];
-        
-        if (role.getTagNo() != GeneralName.rfc822Name)
-        {
-            fail("wrong general name type found in role");
-        }
-        
-        if (!((ASN1String)role.getName()).getString().equals("DAU123456789"))
-        {
-            fail("wrong general name value found in role");
-        }
-        
-        X509CertificateHolder             sCert = new X509CertificateHolder(holderCertWithBaseCertificateID);
-        
-        if (holder.match(sCert))
-        {
-            fail("generated holder matching wrong certificate");
-        }
-
-        equalityAndHashCodeTest(aCert, aCert.getEncoded());
-    }
-    
-    public void testGenerateWithPrincipal()
-        throws Exception
-    {
-        X509CertificateHolder iCert = new X509CertificateHolder(signCert);
-        
-        //
-        // a sample key pair.
-        //
-        RSAKeyParameters pubKey = new RSAKeyParameters(
-            false,
-            new BigInteger("b4a7e46170574f16a97082b22be58b6a2a629798419be12872a4bdba626cfae9900f76abfb12139dce5de56564fab2b6543165a040c606887420e33d91ed7ed7", 16),
-            new BigInteger("11", 16));
-    
-        //
-        // set up the keys
-        //
-        AsymmetricKeyParameter          privKey = RSA_PRIVATE_KEY_SPEC;
-
-        X509v2AttributeCertificateBuilder gen = new X509v2AttributeCertificateBuilder(
-            new AttributeCertificateHolder(iCert.getSubject()),
-            new AttributeCertificateIssuer(new X500Name("cn=test")),
-            BigInteger.ONE,
-            new Date(System.currentTimeMillis() - 50000),
-            new Date(System.currentTimeMillis() + 50000));
-        
-        // the actual attributes
-        GeneralName roleName = new GeneralName(GeneralName.rfc822Name, "DAU123456789");
-        ASN1EncodableVector roleSyntax = new ASN1EncodableVector();
-        roleSyntax.add(roleName);
-    
-        // roleSyntax OID: 2.5.24.72
-    
-        gen.addAttribute(new ASN1ObjectIdentifier("2.5.24.72"), new DERSequence(roleSyntax));
-
-        AlgorithmIdentifier sigAlg = sigAlgFinder.find("SHA1withRSA");
-        AlgorithmIdentifier digAlg = digAlgFinder.find(sigAlg);
-
-        ContentSigner sigGen = new BcRSAContentSignerBuilder(sigAlg, digAlg).build(privKey);
-        X509AttributeCertificateHolder aCert = gen.build(sigGen);
-        
-        if (!aCert.isValidOn(new Date()))
-        {
-            fail("certificate invalid");
-        }
-        
-        if (!aCert.isSignatureValid(new BcRSAContentVerifierProviderBuilder(digAlgFinder).build(pubKey)))
-        {
-            fail("certificate signature not valid");
-        }
-        
-        AttributeCertificateHolder holder = aCert.getHolder();
-        
-        if (holder.getEntityNames() == null)
-        {
-            fail("entity names not set when expected");
-        }
-        
-        if (holder.getSerialNumber() != null)
-        {
-            fail("holder serial number found when none expected");
-        }
-    
-        if (holder.getIssuer() != null)
-        {
-            fail("holder issuer found when none expected");
-        }
-        
-        if (!holder.match(iCert))
-        {
-            fail("generated holder not matching holder certificate");
-        }
-        
-        X509CertificateHolder            sCert = new X509CertificateHolder(holderCertWithBaseCertificateID);
-        
-        if (holder.match(sCert))
-        {
-            fail("principal generated holder matching wrong certificate");
-        }
-
-        equalityAndHashCodeTest(aCert, aCert.getEncoded());
-    }
-    
-    public void testFully()
-        throws Exception
-    {
-        X509AttributeCertificateHolder    aCert = new X509AttributeCertificateHolder(attrCert);
-        X509CertificateHolder             sCert = new X509CertificateHolder(signCert);
-        
-        if (!aCert.isSignatureValid(new BcRSAContentVerifierProviderBuilder(digAlgFinder).build(sCert)))
-        {
-            fail("certificate signature not valid");
-        }
-
-        //
-        // search test
-        //
-        
-        List list = new ArrayList();
-        
-        list.add(sCert);
-
-        Store store = new CollectionStore(list);
-        
-        Collection certs = store.getMatches(aCert.getIssuer());
-        if (certs.size() != 1 || !certs.contains(sCert))
-        {
-            fail("sCert not found by issuer");
-        }
-        
-        Attribute[] attrs = aCert.getAttributes(new ASN1ObjectIdentifier("1.3.6.1.4.1.6760.8.1.1"));
-        if (attrs == null || attrs.length != 1)
-        {
-            fail("attribute not found");
-        }
-
-        //
-        // reencode test
-        //
-        aCert = new X509AttributeCertificateHolder(aCert.getEncoded());
-        
-        if (!aCert.isSignatureValid(new BcRSAContentVerifierProviderBuilder(digAlgFinder).build(sCert)))
-        {
-            fail("certificate signature not valid");
-        }
-
-        X509AttributeCertificateHolder saCert = new X509AttributeCertificateHolder(aCert.getEncoded());
-        
-        if (!aCert.getNotAfter().equals(saCert.getNotAfter()))
-        {
-            fail("failed date comparison");
-        }
-        
-        // base generator test
-        
-        //
-        // a sample key pair.
-        //
-        AsymmetricKeyParameter pubKey = new RSAKeyParameters(
-            false,
-            new BigInteger("b4a7e46170574f16a97082b22be58b6a2a629798419be12872a4bdba626cfae9900f76abfb12139dce5de56564fab2b6543165a040c606887420e33d91ed7ed7", 16),
-            new BigInteger("11", 16));
-
-        AsymmetricKeyParameter privKey = RSA_PRIVATE_KEY_SPEC;
-
-        X509v2AttributeCertificateBuilder gen = new X509v2AttributeCertificateBuilder(
-            aCert.getHolder(),
-            aCert.getIssuer(),
-            aCert.getSerialNumber(),
-            new Date(System.currentTimeMillis() - 50000),
-            new Date(System.currentTimeMillis() + 50000));
-
-        gen.addAttribute(attrs[0].getAttrType(), attrs[0].getAttributeValues());
-
-        AlgorithmIdentifier sigAlg = sigAlgFinder.find("SHA1withRSA");
-        AlgorithmIdentifier digAlg = digAlgFinder.find(sigAlg);
-
-        ContentSigner sigGen = new BcRSAContentSignerBuilder(sigAlg, digAlg).build(privKey);
-        aCert = gen.build(sigGen);
-        
-        if (!aCert.isValidOn(new Date()))
-        {
-            fail("certificate not valid");
-        }
-        
-        if (!aCert.isSignatureValid(new BcRSAContentVerifierProviderBuilder(digAlgFinder).build(pubKey)))
-        {
-            fail("signature not valid");
-        }
-        
-        // as the issuer is the same this should still work (even though it is not
-        // technically correct
-        
-        certs = store.getMatches(aCert.getIssuer());
-        if (certs.size() != 1 || !certs.contains(sCert))
-        {
-            fail("sCert not found by issuer");
-        }
-        
-        attrs = aCert.getAttributes(new ASN1ObjectIdentifier("1.3.6.1.4.1.6760.8.1.1"));
-        if (attrs == null || attrs.length != 1)
-        {
-            fail("attribute not found");
-        }
-        
-        //
-        // reencode test
-        //
-        aCert = new X509AttributeCertificateHolder(aCert.getEncoded());
-        
-        if (!aCert.isSignatureValid(new BcRSAContentVerifierProviderBuilder(digAlgFinder).build(pubKey)))
-        {
-            fail("signature not valid");
-        }
-        
-        AttributeCertificateIssuer  issuer = aCert.getIssuer();
-        
-        X500Name[] principals = issuer.getNames();
-        
-        //
-        // test holder
-        //
-        AttributeCertificateHolder holder = aCert.getHolder();
-        
-        if (holder.getEntityNames() == null)
-        {
-            fail("entity names not set");
-        }
-        
-        if (holder.getSerialNumber() != null)
-        {
-            fail("holder serial number set when none expected");
-        }
-
-        if (holder.getIssuer() != null)
-        {
-            fail("holder issuer set when none expected");
-        }
-        
-        principals = holder.getEntityNames();
-
-        X500Name principal0 = new X500Name(RFC4519Style.INSTANCE, principals[0]);
-        if (!principal0.toString().equals("c=US,o=vt,ou=Class 2,ou=Virginia Tech User,cn=Markus Lorch (mlorch),1.2.840.113549.1.9.1=mlorch@vt.edu"))
-        {
-            System.err.println(principal0.toString());
-            fail("principal[0] for entity names don't match");
-        }
-
-        //
-        // extension test
-        //
-        
-        if (aCert.hasExtensions())
-        {
-            fail("hasExtensions true with no extensions");
-        }
-        
-        gen.addExtension(new ASN1ObjectIdentifier("1.1"), true, new DEROctetString(new byte[10]));
-        
-        gen.addExtension(new ASN1ObjectIdentifier("2.2"), false, new DEROctetString(new byte[20]));
-        
-        aCert = gen.build(sigGen);
-        
-        Set exts = aCert.getCriticalExtensionOIDs();
-        
-        if (exts.size() != 1 || !exts.contains(new ASN1ObjectIdentifier("1.1")))
-        {
-            fail("critical extension test failed");
-        }
-
-        exts = aCert.getNonCriticalExtensionOIDs();
-        
-        if (exts.size() != 1 || !exts.contains(new ASN1ObjectIdentifier("2.2")))
-        {
-            fail("non-critical extension test failed");
-        }
-        
-        if (aCert.getCriticalExtensionOIDs().isEmpty())
-        {
-            fail("critical extensions not found");
-        }
-        
-        Extension ext = aCert.getExtension(new ASN1ObjectIdentifier("1.1"));
-        ASN1Encodable extValue = ext.getParsedValue();
-        
-        if (!extValue.equals(new DEROctetString(new byte[10])))
-        {
-            fail("wrong extension value found for 1.1");
-        }
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/test/BcCertTest.java b/bcpkix/src/main/java/org/bouncycastle/cert/test/BcCertTest.java
deleted file mode 100644
index fd55138..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/test/BcCertTest.java
+++ /dev/null
@@ -1,1434 +0,0 @@
-package org.bouncycastle.cert.test;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.math.BigInteger;
-import java.security.SecureRandom;
-import java.security.cert.CRL;
-import java.security.cert.CertificateException;
-import java.security.cert.CertificateFactory;
-import java.security.cert.X509CRL;
-import java.security.cert.X509Certificate;
-import java.util.Collection;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import junit.framework.TestCase;
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Enumerated;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.DERBitString;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.asn1.x500.X500Name;
-import org.bouncycastle.asn1.x500.X500NameBuilder;
-import org.bouncycastle.asn1.x500.style.RFC4519Style;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.asn1.x509.AuthorityKeyIdentifier;
-import org.bouncycastle.asn1.x509.CRLReason;
-import org.bouncycastle.asn1.x509.Certificate;
-import org.bouncycastle.asn1.x509.Extension;
-import org.bouncycastle.asn1.x509.Extensions;
-import org.bouncycastle.asn1.x509.ExtensionsGenerator;
-import org.bouncycastle.asn1.x509.GeneralName;
-import org.bouncycastle.asn1.x509.GeneralNames;
-import org.bouncycastle.asn1.x509.KeyPurposeId;
-import org.bouncycastle.asn1.x509.KeyUsage;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.bouncycastle.cert.CertException;
-import org.bouncycastle.cert.X509CRLEntryHolder;
-import org.bouncycastle.cert.X509CRLHolder;
-import org.bouncycastle.cert.X509CertificateHolder;
-import org.bouncycastle.cert.X509v1CertificateBuilder;
-import org.bouncycastle.cert.X509v2CRLBuilder;
-import org.bouncycastle.cert.X509v3CertificateBuilder;
-import org.bouncycastle.cert.bc.BcX509ExtensionUtils;
-import org.bouncycastle.cert.bc.BcX509v1CertificateBuilder;
-import org.bouncycastle.cert.bc.BcX509v3CertificateBuilder;
-import org.bouncycastle.cert.jcajce.JcaX509CertificateConverter;
-import org.bouncycastle.crypto.AsymmetricCipherKeyPair;
-import org.bouncycastle.crypto.AsymmetricCipherKeyPairGenerator;
-import org.bouncycastle.crypto.generators.DSAKeyPairGenerator;
-import org.bouncycastle.crypto.generators.DSAParametersGenerator;
-import org.bouncycastle.crypto.generators.RSAKeyPairGenerator;
-import org.bouncycastle.crypto.params.AsymmetricKeyParameter;
-import org.bouncycastle.crypto.params.DSAKeyGenerationParameters;
-import org.bouncycastle.crypto.params.DSAParameters;
-import org.bouncycastle.crypto.params.RSAKeyGenerationParameters;
-import org.bouncycastle.crypto.params.RSAKeyParameters;
-import org.bouncycastle.crypto.params.RSAPrivateCrtKeyParameters;
-import org.bouncycastle.crypto.util.SubjectPublicKeyInfoFactory;
-import org.bouncycastle.operator.ContentSigner;
-import org.bouncycastle.operator.ContentVerifierProvider;
-import org.bouncycastle.operator.DefaultDigestAlgorithmIdentifierFinder;
-import org.bouncycastle.operator.DefaultSignatureAlgorithmIdentifierFinder;
-import org.bouncycastle.operator.OperatorCreationException;
-import org.bouncycastle.operator.bc.BcDSAContentSignerBuilder;
-import org.bouncycastle.operator.bc.BcDSAContentVerifierProviderBuilder;
-import org.bouncycastle.operator.bc.BcRSAContentSignerBuilder;
-import org.bouncycastle.operator.bc.BcRSAContentVerifierProviderBuilder;
-import org.bouncycastle.util.encoders.Base64;
-
-public class BcCertTest
-    extends TestCase
-{
-    DefaultSignatureAlgorithmIdentifierFinder sigAlgFinder = new DefaultSignatureAlgorithmIdentifierFinder();
-    DefaultDigestAlgorithmIdentifierFinder digAlgFinder = new DefaultDigestAlgorithmIdentifierFinder();
-
-    //
-    // server.crt
-    //
-    byte[]  cert1 = Base64.decode(
-        "MIIDXjCCAsegAwIBAgIBBzANBgkqhkiG9w0BAQQFADCBtzELMAkGA1UEBhMCQVUx"
-            + "ETAPBgNVBAgTCFZpY3RvcmlhMRgwFgYDVQQHEw9Tb3V0aCBNZWxib3VybmUxGjAY"
-            + "BgNVBAoTEUNvbm5lY3QgNCBQdHkgTHRkMR4wHAYDVQQLExVDZXJ0aWZpY2F0ZSBB"
-            + "dXRob3JpdHkxFTATBgNVBAMTDENvbm5lY3QgNCBDQTEoMCYGCSqGSIb3DQEJARYZ"
-            + "d2VibWFzdGVyQGNvbm5lY3Q0LmNvbS5hdTAeFw0wMDA2MDIwNzU2MjFaFw0wMTA2"
-            + "MDIwNzU2MjFaMIG4MQswCQYDVQQGEwJBVTERMA8GA1UECBMIVmljdG9yaWExGDAW"
-            + "BgNVBAcTD1NvdXRoIE1lbGJvdXJuZTEaMBgGA1UEChMRQ29ubmVjdCA0IFB0eSBM"
-            + "dGQxFzAVBgNVBAsTDldlYnNlcnZlciBUZWFtMR0wGwYDVQQDExR3d3cyLmNvbm5l"
-            + "Y3Q0LmNvbS5hdTEoMCYGCSqGSIb3DQEJARYZd2VibWFzdGVyQGNvbm5lY3Q0LmNv"
-            + "bS5hdTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEArvDxclKAhyv7Q/Wmr2re"
-            + "Gw4XL9Cnh9e+6VgWy2AWNy/MVeXdlxzd7QAuc1eOWQkGQEiLPy5XQtTY+sBUJ3AO"
-            + "Rvd2fEVJIcjf29ey7bYua9J/vz5MG2KYo9/WCHIwqD9mmG9g0xLcfwq/s8ZJBswE"
-            + "7sb85VU+h94PTvsWOsWuKaECAwEAAaN3MHUwJAYDVR0RBB0wG4EZd2VibWFzdGVy"
-            + "QGNvbm5lY3Q0LmNvbS5hdTA6BglghkgBhvhCAQ0ELRYrbW9kX3NzbCBnZW5lcmF0"
-            + "ZWQgY3VzdG9tIHNlcnZlciBjZXJ0aWZpY2F0ZTARBglghkgBhvhCAQEEBAMCBkAw"
-            + "DQYJKoZIhvcNAQEEBQADgYEAotccfKpwSsIxM1Hae8DR7M/Rw8dg/RqOWx45HNVL"
-            + "iBS4/3N/TO195yeQKbfmzbAA2jbPVvIvGgTxPgO1MP4ZgvgRhasaa0qCJCkWvpM4"
-            + "yQf33vOiYQbpv4rTwzU8AmRlBG45WdjyNIigGV+oRc61aKCTnLq7zB8N3z1TF/bF"
-            + "5/8=");
-
-    //
-    // ca.crt
-    //
-    byte[]  cert2 = Base64.decode(
-           "MIIDbDCCAtWgAwIBAgIBADANBgkqhkiG9w0BAQQFADCBtzELMAkGA1UEBhMCQVUx"
-         + "ETAPBgNVBAgTCFZpY3RvcmlhMRgwFgYDVQQHEw9Tb3V0aCBNZWxib3VybmUxGjAY"
-         + "BgNVBAoTEUNvbm5lY3QgNCBQdHkgTHRkMR4wHAYDVQQLExVDZXJ0aWZpY2F0ZSBB"
-         + "dXRob3JpdHkxFTATBgNVBAMTDENvbm5lY3QgNCBDQTEoMCYGCSqGSIb3DQEJARYZ"
-         + "d2VibWFzdGVyQGNvbm5lY3Q0LmNvbS5hdTAeFw0wMDA2MDIwNzU1MzNaFw0wMTA2"
-         + "MDIwNzU1MzNaMIG3MQswCQYDVQQGEwJBVTERMA8GA1UECBMIVmljdG9yaWExGDAW"
-         + "BgNVBAcTD1NvdXRoIE1lbGJvdXJuZTEaMBgGA1UEChMRQ29ubmVjdCA0IFB0eSBM"
-         + "dGQxHjAcBgNVBAsTFUNlcnRpZmljYXRlIEF1dGhvcml0eTEVMBMGA1UEAxMMQ29u"
-         + "bmVjdCA0IENBMSgwJgYJKoZIhvcNAQkBFhl3ZWJtYXN0ZXJAY29ubmVjdDQuY29t"
-         + "LmF1MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDgs5ptNG6Qv1ZpCDuUNGmv"
-         + "rhjqMDPd3ri8JzZNRiiFlBA4e6/ReaO1U8ASewDeQMH6i9R6degFdQRLngbuJP0s"
-         + "xcEE+SksEWNvygfzLwV9J/q+TQDyJYK52utb++lS0b48A1KPLwEsyL6kOAgelbur"
-         + "ukwxowprKUIV7Knf1ajetQIDAQABo4GFMIGCMCQGA1UdEQQdMBuBGXdlYm1hc3Rl"
-         + "ckBjb25uZWN0NC5jb20uYXUwDwYDVR0TBAgwBgEB/wIBADA2BglghkgBhvhCAQ0E"
-         + "KRYnbW9kX3NzbCBnZW5lcmF0ZWQgY3VzdG9tIENBIGNlcnRpZmljYXRlMBEGCWCG"
-         + "SAGG+EIBAQQEAwICBDANBgkqhkiG9w0BAQQFAAOBgQCsGvfdghH8pPhlwm1r3pQk"
-         + "msnLAVIBb01EhbXm2861iXZfWqGQjrGAaA0ZpXNk9oo110yxoqEoSJSzniZa7Xtz"
-         + "soTwNUpE0SLHvWf/SlKdFWlzXA+vOZbzEv4UmjeelekTm7lc01EEa5QRVzOxHFtQ"
-         + "DhkaJ8VqOMajkQFma2r9iA==");
-
-    //
-    // testx509.pem
-    //
-    byte[]  cert3 = Base64.decode(
-           "MIIBWzCCAQYCARgwDQYJKoZIhvcNAQEEBQAwODELMAkGA1UEBhMCQVUxDDAKBgNV"
-         + "BAgTA1FMRDEbMBkGA1UEAxMSU1NMZWF5L3JzYSB0ZXN0IENBMB4XDTk1MDYxOTIz"
-         + "MzMxMloXDTk1MDcxNzIzMzMxMlowOjELMAkGA1UEBhMCQVUxDDAKBgNVBAgTA1FM"
-         + "RDEdMBsGA1UEAxMUU1NMZWF5L3JzYSB0ZXN0IGNlcnQwXDANBgkqhkiG9w0BAQEF"
-         + "AANLADBIAkEAqtt6qS5GTxVxGZYWa0/4u+IwHf7p2LNZbcPBp9/OfIcYAXBQn8hO"
-         + "/Re1uwLKXdCjIoaGs4DLdG88rkzfyK5dPQIDAQABMAwGCCqGSIb3DQIFBQADQQAE"
-         + "Wc7EcF8po2/ZO6kNCwK/ICH6DobgLekA5lSLr5EvuioZniZp5lFzAw4+YzPQ7XKJ"
-         + "zl9HYIMxATFyqSiD9jsx");
-
-    //
-    // v3-cert1.pem
-    //
-    byte[]  cert4 = Base64.decode(
-           "MIICjTCCAfigAwIBAgIEMaYgRzALBgkqhkiG9w0BAQQwRTELMAkGA1UEBhMCVVMx"
-         + "NjA0BgNVBAoTLU5hdGlvbmFsIEFlcm9uYXV0aWNzIGFuZCBTcGFjZSBBZG1pbmlz"
-         + "dHJhdGlvbjAmFxE5NjA1MjgxMzQ5MDUrMDgwMBcROTgwNTI4MTM0OTA1KzA4MDAw"
-         + "ZzELMAkGA1UEBhMCVVMxNjA0BgNVBAoTLU5hdGlvbmFsIEFlcm9uYXV0aWNzIGFu"
-         + "ZCBTcGFjZSBBZG1pbmlzdHJhdGlvbjEgMAkGA1UEBRMCMTYwEwYDVQQDEwxTdGV2"
-         + "ZSBTY2hvY2gwWDALBgkqhkiG9w0BAQEDSQAwRgJBALrAwyYdgxmzNP/ts0Uyf6Bp"
-         + "miJYktU/w4NG67ULaN4B5CnEz7k57s9o3YY3LecETgQ5iQHmkwlYDTL2fTgVfw0C"
-         + "AQOjgaswgagwZAYDVR0ZAQH/BFowWDBWMFQxCzAJBgNVBAYTAlVTMTYwNAYDVQQK"
-         + "Ey1OYXRpb25hbCBBZXJvbmF1dGljcyBhbmQgU3BhY2UgQWRtaW5pc3RyYXRpb24x"
-         + "DTALBgNVBAMTBENSTDEwFwYDVR0BAQH/BA0wC4AJODMyOTcwODEwMBgGA1UdAgQR"
-         + "MA8ECTgzMjk3MDgyM4ACBSAwDQYDVR0KBAYwBAMCBkAwCwYJKoZIhvcNAQEEA4GB"
-         + "AH2y1VCEw/A4zaXzSYZJTTUi3uawbbFiS2yxHvgf28+8Js0OHXk1H1w2d6qOHH21"
-         + "X82tZXd/0JtG0g1T9usFFBDvYK8O0ebgz/P5ELJnBL2+atObEuJy1ZZ0pBDWINR3"
-         + "WkDNLCGiTkCKp0F5EWIrVDwh54NNevkCQRZita+z4IBO");
-
-    //
-    // v3-cert2.pem
-    //
-    byte[]  cert5 = Base64.decode(
-           "MIICiTCCAfKgAwIBAgIEMeZfHzANBgkqhkiG9w0BAQQFADB9MQswCQYDVQQGEwJD"
-         + "YTEPMA0GA1UEBxMGTmVwZWFuMR4wHAYDVQQLExVObyBMaWFiaWxpdHkgQWNjZXB0"
-         + "ZWQxHzAdBgNVBAoTFkZvciBEZW1vIFB1cnBvc2VzIE9ubHkxHDAaBgNVBAMTE0Vu"
-         + "dHJ1c3QgRGVtbyBXZWIgQ0EwHhcNOTYwNzEyMTQyMDE1WhcNOTYxMDEyMTQyMDE1"
-         + "WjB0MSQwIgYJKoZIhvcNAQkBExVjb29rZUBpc3NsLmF0bC5ocC5jb20xCzAJBgNV"
-         + "BAYTAlVTMScwJQYDVQQLEx5IZXdsZXR0IFBhY2thcmQgQ29tcGFueSAoSVNTTCkx"
-         + "FjAUBgNVBAMTDVBhdWwgQS4gQ29va2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEA"
-         + "6ceSq9a9AU6g+zBwaL/yVmW1/9EE8s5you1mgjHnj0wAILuoB3L6rm6jmFRy7QZT"
-         + "G43IhVZdDua4e+5/n1ZslwIDAQABo2MwYTARBglghkgBhvhCAQEEBAMCB4AwTAYJ"
-         + "YIZIAYb4QgENBD8WPVRoaXMgY2VydGlmaWNhdGUgaXMgb25seSBpbnRlbmRlZCBm"
-         + "b3IgZGVtb25zdHJhdGlvbiBwdXJwb3Nlcy4wDQYJKoZIhvcNAQEEBQADgYEAi8qc"
-         + "F3zfFqy1sV8NhjwLVwOKuSfhR/Z8mbIEUeSTlnH3QbYt3HWZQ+vXI8mvtZoBc2Fz"
-         + "lexKeIkAZXCesqGbs6z6nCt16P6tmdfbZF3I3AWzLquPcOXjPf4HgstkyvVBn0Ap"
-         + "jAFN418KF/Cx4qyHB4cjdvLrRjjQLnb2+ibo7QU=");
-
-    //
-    // pem encoded pkcs7
-    //
-    byte[]  cert6 = Base64.decode(
-          "MIAGCSqGSIb3DQEHAqCAMIACAQExCzAJBgUrDgMCGgUAMIAGCSqGSIb3DQEHAQAAoIIJbzCCAj0w"
-        + "ggGmAhEAzbp/VvDf5LxU/iKss3KqVTANBgkqhkiG9w0BAQIFADBfMQswCQYDVQQGEwJVUzEXMBUG"
-        + "A1UEChMOVmVyaVNpZ24sIEluYy4xNzA1BgNVBAsTLkNsYXNzIDEgUHVibGljIFByaW1hcnkgQ2Vy"
-        + "dGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNOTYwMTI5MDAwMDAwWhcNMjgwODAxMjM1OTU5WjBfMQsw"
-        + "CQYDVQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xNzA1BgNVBAsTLkNsYXNzIDEgUHVi"
-        + "bGljIFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwgZ8wDQYJKoZIhvcNAQEBBQADgY0A"
-        + "MIGJAoGBAOUZv22jVmEtmUhx9mfeuY3rt56GgAqRDvo4Ja9GiILlc6igmyRdDR/MZW4MsNBWhBiH"
-        + "mgabEKFz37RYOWtuwfYV1aioP6oSBo0xrH+wNNePNGeICc0UEeJORVZpH3gCgNrcR5EpuzbJY1zF"
-        + "4Ncth3uhtzKwezC6Ki8xqu6jZ9rbAgMBAAEwDQYJKoZIhvcNAQECBQADgYEATD+4i8Zo3+5DMw5d"
-        + "6abLB4RNejP/khv0Nq3YlSI2aBFsfELM85wuxAc/FLAPT/+Qknb54rxK6Y/NoIAK98Up8YIiXbix"
-        + "3YEjo3slFUYweRb46gVLlH8dwhzI47f0EEA8E8NfH1PoSOSGtHuhNbB7Jbq4046rPzidADQAmPPR"
-        + "cZQwggMuMIICl6ADAgECAhEA0nYujRQMPX2yqCVdr+4NdTANBgkqhkiG9w0BAQIFADBfMQswCQYD"
-        + "VQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xNzA1BgNVBAsTLkNsYXNzIDEgUHVibGlj"
-        + "IFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNOTgwNTEyMDAwMDAwWhcNMDgwNTEy"
-        + "MjM1OTU5WjCBzDEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRy"
-        + "dXN0IE5ldHdvcmsxRjBEBgNVBAsTPXd3dy52ZXJpc2lnbi5jb20vcmVwb3NpdG9yeS9SUEEgSW5j"
-        + "b3JwLiBCeSBSZWYuLExJQUIuTFREKGMpOTgxSDBGBgNVBAMTP1ZlcmlTaWduIENsYXNzIDEgQ0Eg"
-        + "SW5kaXZpZHVhbCBTdWJzY3JpYmVyLVBlcnNvbmEgTm90IFZhbGlkYXRlZDCBnzANBgkqhkiG9w0B"
-        + "AQEFAAOBjQAwgYkCgYEAu1pEigQWu1X9A3qKLZRPFXg2uA1Ksm+cVL+86HcqnbnwaLuV2TFBcHqB"
-        + "S7lIE1YtxwjhhEKrwKKSq0RcqkLwgg4C6S/7wju7vsknCl22sDZCM7VuVIhPh0q/Gdr5FegPh7Yc"
-        + "48zGmo5/aiSS4/zgZbqnsX7vyds3ashKyAkG5JkCAwEAAaN8MHowEQYJYIZIAYb4QgEBBAQDAgEG"
-        + "MEcGA1UdIARAMD4wPAYLYIZIAYb4RQEHAQEwLTArBggrBgEFBQcCARYfd3d3LnZlcmlzaWduLmNv"
-        + "bS9yZXBvc2l0b3J5L1JQQTAPBgNVHRMECDAGAQH/AgEAMAsGA1UdDwQEAwIBBjANBgkqhkiG9w0B"
-        + "AQIFAAOBgQCIuDc73dqUNwCtqp/hgQFxHpJqbS/28Z3TymQ43BuYDAeGW4UVag+5SYWklfEXfWe0"
-        + "fy0s3ZpCnsM+tI6q5QsG3vJWKvozx74Z11NMw73I4xe1pElCY+zCphcPXVgaSTyQXFWjZSAA/Rgg"
-        + "5V+CprGoksVYasGNAzzrw80FopCubjCCA/gwggNhoAMCAQICEBbbn/1G1zppD6KsP01bwywwDQYJ"
-        + "KoZIhvcNAQEEBQAwgcwxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJpU2ln"
-        + "biBUcnVzdCBOZXR3b3JrMUYwRAYDVQQLEz13d3cudmVyaXNpZ24uY29tL3JlcG9zaXRvcnkvUlBB"
-        + "IEluY29ycC4gQnkgUmVmLixMSUFCLkxURChjKTk4MUgwRgYDVQQDEz9WZXJpU2lnbiBDbGFzcyAx"
-        + "IENBIEluZGl2aWR1YWwgU3Vic2NyaWJlci1QZXJzb25hIE5vdCBWYWxpZGF0ZWQwHhcNMDAxMDAy"
-        + "MDAwMDAwWhcNMDAxMjAxMjM1OTU5WjCCAQcxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYD"
-        + "VQQLExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMUYwRAYDVQQLEz13d3cudmVyaXNpZ24uY29tL3Jl"
-        + "cG9zaXRvcnkvUlBBIEluY29ycC4gYnkgUmVmLixMSUFCLkxURChjKTk4MR4wHAYDVQQLExVQZXJz"
-        + "b25hIE5vdCBWYWxpZGF0ZWQxJzAlBgNVBAsTHkRpZ2l0YWwgSUQgQ2xhc3MgMSAtIE1pY3Jvc29m"
-        + "dDETMBEGA1UEAxQKRGF2aWQgUnlhbjElMCMGCSqGSIb3DQEJARYWZGF2aWRAbGl2ZW1lZGlhLmNv"
-        + "bS5hdTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAqxBsdeNmSvFqhMNwhQgNzM8mdjX9eSXb"
-        + "DawpHtQHjmh0AKJSa3IwUY0VIsyZHuXWktO/CgaMBVPt6OVf/n0R2sQigMP6Y+PhEiS0vCJBL9aK"
-        + "0+pOo2qXrjVBmq+XuCyPTnc+BOSrU26tJsX0P9BYorwySiEGxGanBNATdVL4NdUCAwEAAaOBnDCB"
-        + "mTAJBgNVHRMEAjAAMEQGA1UdIAQ9MDswOQYLYIZIAYb4RQEHAQgwKjAoBggrBgEFBQcCARYcaHR0"
-        + "cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYTARBglghkgBhvhCAQEEBAMCB4AwMwYDVR0fBCwwKjAo"
-        + "oCagJIYiaHR0cDovL2NybC52ZXJpc2lnbi5jb20vY2xhc3MxLmNybDANBgkqhkiG9w0BAQQFAAOB"
-        + "gQBC8yIIdVGpFTf8/YiL14cMzcmL0nIRm4kGR3U59z7UtcXlfNXXJ8MyaeI/BnXwG/gD5OKYqW6R"
-        + "yca9vZOxf1uoTBl82gInk865ED3Tej6msCqFzZffnSUQvOIeqLxxDlqYRQ6PmW2nAnZeyjcnbI5Y"
-        + "syQSM2fmo7n6qJFP+GbFezGCAkUwggJBAgEBMIHhMIHMMRcwFQYDVQQKEw5WZXJpU2lnbiwgSW5j"
-        + "LjEfMB0GA1UECxMWVmVyaVNpZ24gVHJ1c3QgTmV0d29yazFGMEQGA1UECxM9d3d3LnZlcmlzaWdu"
-        + "LmNvbS9yZXBvc2l0b3J5L1JQQSBJbmNvcnAuIEJ5IFJlZi4sTElBQi5MVEQoYyk5ODFIMEYGA1UE"
-        + "AxM/VmVyaVNpZ24gQ2xhc3MgMSBDQSBJbmRpdmlkdWFsIFN1YnNjcmliZXItUGVyc29uYSBOb3Qg"
-        + "VmFsaWRhdGVkAhAW25/9Rtc6aQ+irD9NW8MsMAkGBSsOAwIaBQCggbowGAYJKoZIhvcNAQkDMQsG"
-        + "CSqGSIb3DQEHATAcBgkqhkiG9w0BCQUxDxcNMDAxMDAyMTczNTE4WjAjBgkqhkiG9w0BCQQxFgQU"
-        + "gZjSaBEY2oxGvlQUIMnxSXhivK8wWwYJKoZIhvcNAQkPMU4wTDAKBggqhkiG9w0DBzAOBggqhkiG"
-        + "9w0DAgICAIAwDQYIKoZIhvcNAwICAUAwBwYFKw4DAgcwDQYIKoZIhvcNAwICASgwBwYFKw4DAh0w"
-        + "DQYJKoZIhvcNAQEBBQAEgYAzk+PU91/ZFfoiuKOECjxEh9fDYE2jfDCheBIgh5gdcCo+sS1WQs8O"
-        + "HreQ9Nop/JdJv1DQMBK6weNBBDoP0EEkRm1XCC144XhXZC82jBZohYmi2WvDbbC//YN58kRMYMyy"
-        + "srrfn4Z9I+6kTriGXkrpGk9Q0LSGjmG2BIsqiF0dvwAAAAAAAA==");
-
-    //
-    // dsaWithSHA1 cert
-    //
-    byte[]  cert7 = Base64.decode(
-          "MIIEXAYJKoZIhvcNAQcCoIIETTCCBEkCAQExCzAJBgUrDgMCGgUAMAsGCSqG"
-        + "SIb3DQEHAaCCAsMwggK/MIIB4AIBADCBpwYFKw4DAhswgZ0CQQEkJRHP+mN7"
-        + "d8miwTMN55CUSmo3TO8WGCxgY61TX5k+7NU4XPf1TULjw3GobwaJX13kquPh"
-        + "fVXk+gVy46n4Iw3hAhUBSe/QF4BUj+pJOF9ROBM4u+FEWA8CQQD4mSJbrABj"
-        + "TUWrlnAte8pS22Tq4/FPO7jHSqjijUHfXKTrHL1OEqV3SVWcFy5j/cqBgX/z"
-        + "m8Q12PFp/PjOhh+nMA4xDDAKBgNVBAMTA0lEMzAeFw05NzEwMDEwMDAwMDBa"
-        + "Fw0zODAxMDEwMDAwMDBaMA4xDDAKBgNVBAMTA0lEMzCB8DCBpwYFKw4DAhsw"
-        + "gZ0CQQEkJRHP+mN7d8miwTMN55CUSmo3TO8WGCxgY61TX5k+7NU4XPf1TULj"
-        + "w3GobwaJX13kquPhfVXk+gVy46n4Iw3hAhUBSe/QF4BUj+pJOF9ROBM4u+FE"
-        + "WA8CQQD4mSJbrABjTUWrlnAte8pS22Tq4/FPO7jHSqjijUHfXKTrHL1OEqV3"
-        + "SVWcFy5j/cqBgX/zm8Q12PFp/PjOhh+nA0QAAkEAkYkXLYMtGVGWj9OnzjPn"
-        + "sB9sefSRPrVegZJCZbpW+Iv0/1RP1u04pHG9vtRpIQLjzUiWvLMU9EKQTThc"
-        + "eNMmWDCBpwYFKw4DAhswgZ0CQQEkJRHP+mN7d8miwTMN55CUSmo3TO8WGCxg"
-        + "Y61TX5k+7NU4XPf1TULjw3GobwaJX13kquPhfVXk+gVy46n4Iw3hAhUBSe/Q"
-        + "F4BUj+pJOF9ROBM4u+FEWA8CQQD4mSJbrABjTUWrlnAte8pS22Tq4/FPO7jH"
-        + "SqjijUHfXKTrHL1OEqV3SVWcFy5j/cqBgX/zm8Q12PFp/PjOhh+nAy8AMCwC"
-        + "FBY3dBSdeprGcqpr6wr3xbG+6WW+AhRMm/facKJNxkT3iKgJbp7R8Xd3QTGC"
-        + "AWEwggFdAgEBMBMwDjEMMAoGA1UEAxMDSUQzAgEAMAkGBSsOAwIaBQCgXTAY"
-        + "BgkqhkiG9w0BCQMxCwYJKoZIhvcNAQcBMBwGCSqGSIb3DQEJBTEPFw0wMjA1"
-        + "MjQyMzEzMDdaMCMGCSqGSIb3DQEJBDEWBBS4WMsoJhf7CVbZYCFcjoTRzPkJ"
-        + "xjCBpwYFKw4DAhswgZ0CQQEkJRHP+mN7d8miwTMN55CUSmo3TO8WGCxgY61T"
-        + "X5k+7NU4XPf1TULjw3GobwaJX13kquPhfVXk+gVy46n4Iw3hAhUBSe/QF4BU"
-        + "j+pJOF9ROBM4u+FEWA8CQQD4mSJbrABjTUWrlnAte8pS22Tq4/FPO7jHSqji"
-        + "jUHfXKTrHL1OEqV3SVWcFy5j/cqBgX/zm8Q12PFp/PjOhh+nBC8wLQIVALID"
-        + "dt+MHwawrDrwsO1Z6sXBaaJsAhRaKssrpevmLkbygKPV07XiAKBG02Zvb2Jh"
-        + "cg==");
-
-    //
-    // testcrl.pem
-    //
-    byte[]  crl1 = Base64.decode(
-        "MIICjTCCAfowDQYJKoZIhvcNAQECBQAwXzELMAkGA1UEBhMCVVMxIDAeBgNVBAoT"
-        + "F1JTQSBEYXRhIFNlY3VyaXR5LCBJbmMuMS4wLAYDVQQLEyVTZWN1cmUgU2VydmVy"
-        + "IENlcnRpZmljYXRpb24gQXV0aG9yaXR5Fw05NTA1MDIwMjEyMjZaFw05NTA2MDEw"
-        + "MDAxNDlaMIIBaDAWAgUCQQAABBcNOTUwMjAxMTcyNDI2WjAWAgUCQQAACRcNOTUw"
-        + "MjEwMDIxNjM5WjAWAgUCQQAADxcNOTUwMjI0MDAxMjQ5WjAWAgUCQQAADBcNOTUw"
-        + "MjI1MDA0NjQ0WjAWAgUCQQAAGxcNOTUwMzEzMTg0MDQ5WjAWAgUCQQAAFhcNOTUw"
-        + "MzE1MTkxNjU0WjAWAgUCQQAAGhcNOTUwMzE1MTk0MDQxWjAWAgUCQQAAHxcNOTUw"
-        + "MzI0MTk0NDMzWjAWAgUCcgAABRcNOTUwMzI5MjAwNzExWjAWAgUCcgAAERcNOTUw"
-        + "MzMwMDIzNDI2WjAWAgUCQQAAIBcNOTUwNDA3MDExMzIxWjAWAgUCcgAAHhcNOTUw"
-        + "NDA4MDAwMjU5WjAWAgUCcgAAQRcNOTUwNDI4MTcxNzI0WjAWAgUCcgAAOBcNOTUw"
-        + "NDI4MTcyNzIxWjAWAgUCcgAATBcNOTUwNTAyMDIxMjI2WjANBgkqhkiG9w0BAQIF"
-        + "AAN+AHqOEJXSDejYy0UwxxrH/9+N2z5xu/if0J6qQmK92W0hW158wpJg+ovV3+wQ"
-        + "wvIEPRL2rocL0tKfAsVq1IawSJzSNgxG0lrcla3MrJBnZ4GaZDu4FutZh72MR3Gt"
-        + "JaAL3iTJHJD55kK2D/VoyY1djlsPuNh6AEgdVwFAyp0v");
-
-    //
-    // ecdsa cert with extra octet string.
-    //
-    byte[]  oldEcdsa = Base64.decode(
-          "MIICljCCAkCgAwIBAgIBATALBgcqhkjOPQQBBQAwgY8xCzAJBgNVBAYTAkFVMSgwJ"
-        + "gYDVQQKEx9UaGUgTGVnaW9uIG9mIHRoZSBCb3VuY3kgQ2FzdGxlMRIwEAYDVQQHEw"
-        + "lNZWxib3VybmUxETAPBgNVBAgTCFZpY3RvcmlhMS8wLQYJKoZIhvcNAQkBFiBmZWV"
-        + "kYmFjay1jcnlwdG9AYm91bmN5Y2FzdGxlLm9yZzAeFw0wMTEyMDcwMTAwMDRaFw0w"
-        + "MTEyMDcwMTAxNDRaMIGPMQswCQYDVQQGEwJBVTEoMCYGA1UEChMfVGhlIExlZ2lvb"
-        + "iBvZiB0aGUgQm91bmN5IENhc3RsZTESMBAGA1UEBxMJTWVsYm91cm5lMREwDwYDVQ"
-        + "QIEwhWaWN0b3JpYTEvMC0GCSqGSIb3DQEJARYgZmVlZGJhY2stY3J5cHRvQGJvdW5"
-        + "jeWNhc3RsZS5vcmcwgeQwgb0GByqGSM49AgEwgbECAQEwKQYHKoZIzj0BAQIef///"
-        + "////////////f///////gAAAAAAAf///////MEAEHn///////////////3///////"
-        + "4AAAAAAAH///////AQeawFsO9zxiUHQ1lSSFHXKcanbL7J9HTd5YYXClCwKBB8CD/"
-        + "qWPNyogWzMM7hkK+35BcPTWFc9Pyf7vTs8uaqvAh5///////////////9///+eXpq"
-        + "fXZBx+9FSJoiQnQsDIgAEHwJbbcU7xholSP+w9nFHLebJUhqdLSU05lq/y9X+DHAw"
-        + "CwYHKoZIzj0EAQUAA0MAMEACHnz6t4UNoVROp74ma4XNDjjGcjaqiIWPZLK8Bdw3G"
-        + "QIeLZ4j3a6ividZl344UH+UPUE7xJxlYGuy7ejTsqRR");
-
-    byte[]  keyUsage = Base64.decode(
-          "MIIE7TCCBFagAwIBAgIEOAOR7jANBgkqhkiG9w0BAQQFADCByTELMAkGA1UE"
-        + "BhMCVVMxFDASBgNVBAoTC0VudHJ1c3QubmV0MUgwRgYDVQQLFD93d3cuZW50"
-        + "cnVzdC5uZXQvQ2xpZW50X0NBX0luZm8vQ1BTIGluY29ycC4gYnkgcmVmLiBs"
-        + "aW1pdHMgbGlhYi4xJTAjBgNVBAsTHChjKSAxOTk5IEVudHJ1c3QubmV0IExp"
-        + "bWl0ZWQxMzAxBgNVBAMTKkVudHJ1c3QubmV0IENsaWVudCBDZXJ0aWZpY2F0"
-        + "aW9uIEF1dGhvcml0eTAeFw05OTEwMTIxOTI0MzBaFw0xOTEwMTIxOTU0MzBa"
-        + "MIHJMQswCQYDVQQGEwJVUzEUMBIGA1UEChMLRW50cnVzdC5uZXQxSDBGBgNV"
-        + "BAsUP3d3dy5lbnRydXN0Lm5ldC9DbGllbnRfQ0FfSW5mby9DUFMgaW5jb3Jw"
-        + "LiBieSByZWYuIGxpbWl0cyBsaWFiLjElMCMGA1UECxMcKGMpIDE5OTkgRW50"
-        + "cnVzdC5uZXQgTGltaXRlZDEzMDEGA1UEAxMqRW50cnVzdC5uZXQgQ2xpZW50"
-        + "IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIGdMA0GCSqGSIb3DQEBAQUAA4GL"
-        + "ADCBhwKBgQDIOpleMRffrCdvkHvkGf9FozTC28GoT/Bo6oT9n3V5z8GKUZSv"
-        + "x1cDR2SerYIbWtp/N3hHuzeYEpbOxhN979IMMFGpOZ5V+Pux5zDeg7K6PvHV"
-        + "iTs7hbqqdCz+PzFur5GVbgbUB01LLFZHGARS2g4Qk79jkJvh34zmAqTmT173"
-        + "iwIBA6OCAeAwggHcMBEGCWCGSAGG+EIBAQQEAwIABzCCASIGA1UdHwSCARkw"
-        + "ggEVMIHkoIHhoIHepIHbMIHYMQswCQYDVQQGEwJVUzEUMBIGA1UEChMLRW50"
-        + "cnVzdC5uZXQxSDBGBgNVBAsUP3d3dy5lbnRydXN0Lm5ldC9DbGllbnRfQ0Ff"
-        + "SW5mby9DUFMgaW5jb3JwLiBieSByZWYuIGxpbWl0cyBsaWFiLjElMCMGA1UE"
-        + "CxMcKGMpIDE5OTkgRW50cnVzdC5uZXQgTGltaXRlZDEzMDEGA1UEAxMqRW50"
-        + "cnVzdC5uZXQgQ2xpZW50IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MQ0wCwYD"
-        + "VQQDEwRDUkwxMCygKqAohiZodHRwOi8vd3d3LmVudHJ1c3QubmV0L0NSTC9D"
-        + "bGllbnQxLmNybDArBgNVHRAEJDAigA8xOTk5MTAxMjE5MjQzMFqBDzIwMTkx"
-        + "MDEyMTkyNDMwWjALBgNVHQ8EBAMCAQYwHwYDVR0jBBgwFoAUxPucKXuXzUyW"
-        + "/O5bs8qZdIuV6kwwHQYDVR0OBBYEFMT7nCl7l81MlvzuW7PKmXSLlepMMAwG"
-        + "A1UdEwQFMAMBAf8wGQYJKoZIhvZ9B0EABAwwChsEVjQuMAMCBJAwDQYJKoZI"
-        + "hvcNAQEEBQADgYEAP66K8ddmAwWePvrqHEa7pFuPeJoSSJn59DXeDDYHAmsQ"
-        + "OokUgZwxpnyyQbJq5wcBoUv5nyU7lsqZwz6hURzzwy5E97BnRqqS5TvaHBkU"
-        + "ODDV4qIxJS7x7EU47fgGWANzYrAQMY9Av2TgXD7FTx/aEkP/TOYGJqibGapE"
-        + "PHayXOw=");
-
-    byte[] nameCert = Base64.decode(
-            "MIIEFjCCA3+gAwIBAgIEdS8BozANBgkqhkiG9w0BAQUFADBKMQswCQYDVQQGEwJE"+
-            "RTERMA8GA1UEChQIREFURVYgZUcxKDAMBgcCggYBCgcUEwExMBgGA1UEAxQRQ0Eg"+
-            "REFURVYgRDAzIDE6UE4wIhgPMjAwMTA1MTAxMDIyNDhaGA8yMDA0MDUwOTEwMjI0"+
-            "OFowgYQxCzAJBgNVBAYTAkRFMQ8wDQYDVQQIFAZCYXllcm4xEjAQBgNVBAcUCU7I"+
-            "dXJuYmVyZzERMA8GA1UEChQIREFURVYgZUcxHTAbBgNVBAUTFDAwMDAwMDAwMDA4"+
-            "OTU3NDM2MDAxMR4wHAYDVQQDFBVEaWV0bWFyIFNlbmdlbmxlaXRuZXIwgaEwDQYJ"+
-            "KoZIhvcNAQEBBQADgY8AMIGLAoGBAJLI/LJLKaHoMk8fBECW/od8u5erZi6jI8Ug"+
-            "C0a/LZyQUO/R20vWJs6GrClQtXB+AtfiBSnyZOSYzOdfDI8yEKPEv8qSuUPpOHps"+
-            "uNCFdLZF1vavVYGEEWs2+y+uuPmg8q1oPRyRmUZ+x9HrDvCXJraaDfTEd9olmB/Z"+
-            "AuC/PqpjAgUAwAAAAaOCAcYwggHCMAwGA1UdEwEB/wQCMAAwDwYDVR0PAQH/BAUD"+
-            "AwdAADAxBgNVHSAEKjAoMCYGBSskCAEBMB0wGwYIKwYBBQUHAgEWD3d3dy56cy5k"+
-            "YXRldi5kZTApBgNVHREEIjAggR5kaWV0bWFyLnNlbmdlbmxlaXRuZXJAZGF0ZXYu"+
-            "ZGUwgYQGA1UdIwR9MHuhc6RxMG8xCzAJBgNVBAYTAkRFMT0wOwYDVQQKFDRSZWd1"+
-            "bGllcnVuZ3NiZWjIb3JkZSBmyHVyIFRlbGVrb21tdW5pa2F0aW9uIHVuZCBQb3N0"+
-            "MSEwDAYHAoIGAQoHFBMBMTARBgNVBAMUCjVSLUNBIDE6UE6CBACm8LkwDgYHAoIG"+
-            "AQoMAAQDAQEAMEcGA1UdHwRAMD4wPKAUoBKGEHd3dy5jcmwuZGF0ZXYuZGWiJKQi"+
-            "MCAxCzAJBgNVBAYTAkRFMREwDwYDVQQKFAhEQVRFViBlRzAWBgUrJAgDBAQNMAsT"+
-            "A0VVUgIBBQIBATAdBgNVHQ4EFgQUfv6xFP0xk7027folhy+ziZvBJiwwLAYIKwYB"+
-            "BQUHAQEEIDAeMBwGCCsGAQUFBzABhhB3d3cuZGlyLmRhdGV2LmRlMA0GCSqGSIb3"+
-            "DQEBBQUAA4GBAEOVX6uQxbgtKzdgbTi6YLffMftFr2mmNwch7qzpM5gxcynzgVkg"+
-            "pnQcDNlm5AIbS6pO8jTCLfCd5TZ5biQksBErqmesIl3QD+VqtB+RNghxectZ3VEs"+
-            "nCUtcE7tJ8O14qwCb3TxS9dvIUFiVi4DjbxX46TdcTbTaK8/qr6AIf+l");
-
-    byte[] probSelfSignedCert = Base64.decode(
-              "MIICxTCCAi6gAwIBAgIQAQAAAAAAAAAAAAAAAAAAATANBgkqhkiG9w0BAQUFADBF"
-            + "MScwJQYDVQQKEx4gRElSRUNUSU9OIEdFTkVSQUxFIERFUyBJTVBPVFMxGjAYBgNV"
-            + "BAMTESBBQyBNSU5FRkkgQiBURVNUMB4XDTA0MDUwNzEyMDAwMFoXDTE0MDUwNzEy"
-            + "MDAwMFowRTEnMCUGA1UEChMeIERJUkVDVElPTiBHRU5FUkFMRSBERVMgSU1QT1RT"
-            + "MRowGAYDVQQDExEgQUMgTUlORUZJIEIgVEVTVDCBnzANBgkqhkiG9w0BAQEFAAOB"
-            + "jQAwgYkCgYEAveoCUOAukZdcFCs2qJk76vSqEX0ZFzHqQ6faBPZWjwkgUNwZ6m6m"
-            + "qWvvyq1cuxhoDvpfC6NXILETawYc6MNwwxsOtVVIjuXlcF17NMejljJafbPximEt"
-            + "DQ4LcQeSp4K7FyFlIAMLyt3BQ77emGzU5fjFTvHSUNb3jblx0sV28c0CAwEAAaOB"
-            + "tTCBsjAfBgNVHSMEGDAWgBSEJ4bLbvEQY8cYMAFKPFD1/fFXlzAdBgNVHQ4EFgQU"
-            + "hCeGy27xEGPHGDABSjxQ9f3xV5cwDgYDVR0PAQH/BAQDAgEGMBEGCWCGSAGG+EIB"
-            + "AQQEAwIBBjA8BgNVHR8ENTAzMDGgL6AthitodHRwOi8vYWRvbmlzLnBrNy5jZXJ0"
-            + "cGx1cy5uZXQvZGdpLXRlc3QuY3JsMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcN"
-            + "AQEFBQADgYEAmToHJWjd3+4zknfsP09H6uMbolHNGG0zTS2lrLKpzcmkQfjhQpT9"
-            + "LUTBvfs1jdjo9fGmQLvOG+Sm51Rbjglb8bcikVI5gLbclOlvqLkm77otjl4U4Z2/"
-            + "Y0vP14Aov3Sn3k+17EfReYUZI4liuB95ncobC4e8ZM++LjQcIM0s+Vs=");
-
-
-    byte[] gost34102001base = Base64.decode(
-              "MIIB1DCCAYECEEjpVKXP6Wn1yVz3VeeDQa8wCgYGKoUDAgIDBQAwbTEfMB0G"
-            + "A1UEAwwWR29zdFIzNDEwLTIwMDEgZXhhbXBsZTESMBAGA1UECgwJQ3J5cHRv"
-            + "UHJvMQswCQYDVQQGEwJSVTEpMCcGCSqGSIb3DQEJARYaR29zdFIzNDEwLTIw"
-            + "MDFAZXhhbXBsZS5jb20wHhcNMDUwMjAzMTUxNjQ2WhcNMTUwMjAzMTUxNjQ2"
-            + "WjBtMR8wHQYDVQQDDBZHb3N0UjM0MTAtMjAwMSBleGFtcGxlMRIwEAYDVQQK"
-            + "DAlDcnlwdG9Qcm8xCzAJBgNVBAYTAlJVMSkwJwYJKoZIhvcNAQkBFhpHb3N0"
-            + "UjM0MTAtMjAwMUBleGFtcGxlLmNvbTBjMBwGBiqFAwICEzASBgcqhQMCAiQA"
-            + "BgcqhQMCAh4BA0MABECElWh1YAIaQHUIzROMMYks/eUFA3pDXPRtKw/nTzJ+"
-            + "V4/rzBa5lYgD0Jp8ha4P5I3qprt+VsfLsN8PZrzK6hpgMAoGBiqFAwICAwUA"
-            + "A0EAHw5dw/aw/OiNvHyOE65kvyo4Hp0sfz3csM6UUkp10VO247ofNJK3tsLb"
-            + "HOLjUaqzefrlGb11WpHYrvWFg+FcLA==");
-
-    private final byte[] emptyDNCert = Base64.decode(
-              "MIICfTCCAeagAwIBAgIBajANBgkqhkiG9w0BAQQFADB8MQswCQYDVQQGEwJVUzEMMAoGA1UEChMD"
-            + "Q0RXMQkwBwYDVQQLEwAxCTAHBgNVBAcTADEJMAcGA1UECBMAMRowGAYDVQQDExFUZW1wbGFyIFRl"
-            + "c3QgMTAyNDEiMCAGCSqGSIb3DQEJARYTdGVtcGxhcnRlc3RAY2R3LmNvbTAeFw0wNjA1MjIwNTAw"
-            + "MDBaFw0xMDA1MjIwNTAwMDBaMHwxCzAJBgNVBAYTAlVTMQwwCgYDVQQKEwNDRFcxCTAHBgNVBAsT"
-            + "ADEJMAcGA1UEBxMAMQkwBwYDVQQIEwAxGjAYBgNVBAMTEVRlbXBsYXIgVGVzdCAxMDI0MSIwIAYJ"
-            + "KoZIhvcNAQkBFhN0ZW1wbGFydGVzdEBjZHcuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKB"
-            + "gQDH3aJpJBfM+A3d84j5YcU6zEQaQ76u5xO9NSBmHjZykKS2kCcUqPpvVOPDA5WgV22dtKPh+lYV"
-            + "iUp7wyCVwAKibq8HIbihHceFqMKzjwC639rMoDJ7bi/yzQWz1Zg+075a4FGPlUKn7Yfu89wKkjdW"
-            + "wDpRPXc/agqBnrx5pJTXzQIDAQABow8wDTALBgNVHQ8EBAMCALEwDQYJKoZIhvcNAQEEBQADgYEA"
-            + "RRsRsjse3i2/KClFVd6YLZ+7K1BE0WxFyY2bbytkwQJSxvv3vLSuweFUbhNxutb68wl/yW4GLy4b"
-            + "1QdyswNxrNDXTuu5ILKhRDDuWeocz83aG2KGtr3JlFyr3biWGEyn5WUOE6tbONoQDJ0oPYgI6CAc"
-            + "EHdUp0lioOCt6UOw7Cs=");
-
-    private AsymmetricKeyParameter dudPublicKey = new AsymmetricKeyParameter(true)
-    {
-        public String getAlgorithm()
-        {
-            return null;
-        }
-
-        public String getFormat()
-        {
-            return null;
-        }
-
-        public byte[] getEncoded()
-        {
-            return null;
-        }
-
-    };
-
-    public String getName()
-    {
-        return "CertTest";
-    }
-
-    public void checkCertificate(
-        int     id,
-        byte[]  bytes)
-    {
-        try
-        {
-            X509CertificateHolder certHldr = new X509CertificateHolder(bytes);
-
-            SubjectPublicKeyInfo k = certHldr.getSubjectPublicKeyInfo();
-            // System.out.println(cert);
-        }
-        catch (Exception e)
-        {
-            fail(e.toString());
-        }
-    }
-            /*
-    public void checkNameCertificate(
-        int     id,
-        byte[]  bytes)
-    {
-        ByteArrayInputStream    bIn;
-        String                  dump = "";
-
-        try
-        {
-            bIn = new ByteArrayInputStream(bytes);
-
-            CertificateFactory  fact = CertificateFactory.getInstance("X.509", "LKBX-BC");
-
-            X509Certificate cert = (X509Certificate)fact.generateCertificate(bIn);
-
-            AsymmetricKeyParameter    k = cert.getAsymmetricKeyParameter();
-            if (!cert.getIssuerDN().toString().equals("C=DE,O=DATEV eG,0.2.262.1.10.7.20=1+CN=CA DATEV D03 1:PN"))
-            {
-                fail(id + " failed - name test.");
-            }
-            // System.out.println(cert);
-        }
-        catch (Exception e)
-        {
-            fail(dump + System.getProperty("line.separator") + getName() + ": "+ id + " failed - exception " + e.toString(), e);
-        }
-
-    }
-     */
-    public void checkKeyUsage(
-        int     id,
-        byte[]  bytes)
-        throws IOException
-    {
-
-            X509CertificateHolder certHld = new X509CertificateHolder(bytes);
-
-            if ((DERBitString.getInstance(certHld.getExtension(Extension.keyUsage).getParsedValue()).getBytes()[0] & 0x01) != 0)
-            {
-                fail("error generating cert - key usage wrong.");
-            }
-
-
-    }
-
-
-    public void checkSelfSignedCertificate(
-        int     id,
-        byte[]  bytes)
-        throws OperatorCreationException, IOException, CertException
-    {
-
-            X509CertificateHolder certHolder = new X509CertificateHolder(bytes);
-
-            assertTrue(certHolder.isSignatureValid(new BcRSAContentVerifierProviderBuilder(digAlgFinder).build(certHolder)));
-
-
-    }
-
-    /**
-     * we generate a self signed certificate for the sake of testing - RSA
-     */
-    public void checkCreation1()
-        throws Exception
-    {
-        //
-        // a sample key pair.
-        //
-        AsymmetricKeyParameter pubKey = new RSAKeyParameters(
-            false,
-            new BigInteger("b4a7e46170574f16a97082b22be58b6a2a629798419be12872a4bdba626cfae9900f76abfb12139dce5de56564fab2b6543165a040c606887420e33d91ed7ed7", 16),
-            new BigInteger("11", 16));
-
-        AsymmetricKeyParameter privKey = new RSAPrivateCrtKeyParameters(
-            new BigInteger("b4a7e46170574f16a97082b22be58b6a2a629798419be12872a4bdba626cfae9900f76abfb12139dce5de56564fab2b6543165a040c606887420e33d91ed7ed7", 16),
-            new BigInteger("11", 16),
-            new BigInteger("9f66f6b05410cd503b2709e88115d55daced94d1a34d4e32bf824d0dde6028ae79c5f07b580f5dce240d7111f7ddb130a7945cd7d957d1920994da389f490c89", 16),
-            new BigInteger("c0a0758cdf14256f78d4708c86becdead1b50ad4ad6c5c703e2168fbf37884cb", 16),
-            new BigInteger("f01734d7960ea60070f1b06f2bb81bfac48ff192ae18451d5e56c734a5aab8a5", 16),
-            new BigInteger("b54bb9edff22051d9ee60f9351a48591b6500a319429c069a3e335a1d6171391", 16),
-            new BigInteger("d3d83daf2a0cecd3367ae6f8ae1aeb82e9ac2f816c6fc483533d8297dd7884cd", 16),
-            new BigInteger("b8f52fc6f38593dabb661d3f50f8897f8106eee68b1bce78a95b132b4e5b5d19", 16));
-
-        //
-        // distinguished name table.
-        //
-        X500NameBuilder builder = new X500NameBuilder(RFC4519Style.INSTANCE);
-
-        builder.addRDN(RFC4519Style.c, "AU");
-        builder.addRDN(RFC4519Style.o, "The Legion of the Bouncy Castle");
-        builder.addRDN(RFC4519Style.l, "Melbourne");
-        builder.addRDN(RFC4519Style.st, "Victoria");
-        builder.addRDN(PKCSObjectIdentifiers.pkcs_9_at_emailAddress, "feedback-crypto@bouncycastle.org");
-
-        //
-        // extensions
-        //
-
-        //
-        // create the certificate - version 3 - without extensions
-        //
-        AlgorithmIdentifier sigAlg = sigAlgFinder.find("SHA256WithRSAEncryption");
-        ContentSigner sigGen = new BcRSAContentSignerBuilder(sigAlg, digAlgFinder.find(sigAlg)).build(privKey);
-        X509v3CertificateBuilder certGen = new BcX509v3CertificateBuilder(builder.build(), BigInteger.valueOf(1), new Date(System.currentTimeMillis() - 50000), new Date(System.currentTimeMillis() + 50000),builder.build(), pubKey);
-
-        X509CertificateHolder certH = certGen.build(sigGen);
-
-        assertTrue(certH.isValidOn(new Date()));
-
-        ContentVerifierProvider contentVerifierProvider = new BcRSAContentVerifierProviderBuilder(new DefaultDigestAlgorithmIdentifierFinder()).build(pubKey);
-
-        assertTrue(certH.isSignatureValid(contentVerifierProvider));
-
-        X509Certificate cert = new JcaX509CertificateConverter().getCertificate(certH);
-        Set dummySet = cert.getNonCriticalExtensionOIDs();
-        if (dummySet != null)
-        {
-            fail("non-critical oid set should be null");
-        }
-        dummySet = cert.getCriticalExtensionOIDs();
-        if (dummySet != null)
-        {
-            fail("critical oid set should be null");
-        }
-
-        //
-        // create the certificate - version 3 - with extensions
-        //
-        sigGen = new BcRSAContentSignerBuilder(sigAlgFinder.find("MD5WithRSA"), digAlgFinder.find(sigAlgFinder.find("MD5withRSA"))).build(privKey);
-        certGen = new BcX509v3CertificateBuilder(builder.build(), BigInteger.valueOf(1)
-            , new Date(System.currentTimeMillis() - 50000)
-            , new Date(System.currentTimeMillis() + 50000)
-            , builder.build()
-            , pubKey)
-            .addExtension(new ASN1ObjectIdentifier("2.5.29.15"), true,
-                new KeyUsage(KeyUsage.encipherOnly))
-            .addExtension(new ASN1ObjectIdentifier("2.5.29.37"), true,
-                new DERSequence(KeyPurposeId.anyExtendedKeyUsage))
-            .addExtension(new ASN1ObjectIdentifier("2.5.29.17"), true,
-                new GeneralNames(new GeneralName(GeneralName.rfc822Name, "test@test.test")));
-
-        X509CertificateHolder certHolder = certGen.build(sigGen);
-
-        assertTrue(certHolder.isValidOn(new Date()));
-
-        contentVerifierProvider = new BcRSAContentVerifierProviderBuilder(digAlgFinder).build(pubKey);
-        if (!certHolder.isSignatureValid(contentVerifierProvider))
-        {
-            fail("signature test failed");
-        }
-
-        ByteArrayInputStream   bIn = new ByteArrayInputStream(certHolder.getEncoded());
-        CertificateFactory     certFact = CertificateFactory.getInstance("X.509");
-
-        cert = (X509Certificate)certFact.generateCertificate(bIn);
-
-        if (!cert.getKeyUsage()[7])
-        {
-            fail("error generating cert - key usage wrong.");
-        }
-
-        List l = cert.getExtendedKeyUsage();
-        if (!l.get(0).equals(KeyPurposeId.anyExtendedKeyUsage.getId()))
-        {
-            fail("failed extended key usage test");
-        }
-
-        Collection c = cert.getSubjectAlternativeNames();
-        Iterator   it = c.iterator();
-        while (it.hasNext())
-        {
-            List    gn = (List)it.next();
-            if (!gn.get(1).equals("test@test.test"))
-            {
-                fail("failed subject alternative names test");
-            }
-        }
-
-        // System.out.println(cert);
-
-        //
-        // create the certificate - version 1
-        //
-        sigGen = new BcRSAContentSignerBuilder(sigAlgFinder.find("MD5WithRSA"), digAlgFinder.find(sigAlgFinder.find("MD5withRSA"))).build(privKey);
-        X509v1CertificateBuilder certGen1 = new BcX509v1CertificateBuilder(builder.build(), BigInteger.valueOf(1), new Date(System.currentTimeMillis() - 50000),new Date(System.currentTimeMillis() + 50000),builder.build(),pubKey);
-
-        cert = new JcaX509CertificateConverter().getCertificate(certGen1.build(sigGen));
-
-        assertTrue(certHolder.isValidOn(new Date()));
-
-        contentVerifierProvider = new BcRSAContentVerifierProviderBuilder(new DefaultDigestAlgorithmIdentifierFinder()).build(pubKey);
-
-        assertTrue(certHolder.isSignatureValid(contentVerifierProvider));
-
-        bIn = new ByteArrayInputStream(cert.getEncoded());
-        certFact = CertificateFactory.getInstance("X.509");
-
-        cert = (X509Certificate)certFact.generateCertificate(bIn);
-
-        // System.out.println(cert);
-        if (!cert.getIssuerDN().equals(cert.getSubjectDN()))
-        {
-            fail("name comparison fails");
-        }
-
-//
-        // a lightweight key pair.
-        //
-        RSAKeyParameters lwPubKey = new RSAKeyParameters(
-            false,
-            new BigInteger("b4a7e46170574f16a97082b22be58b6a2a629798419be12872a4bdba626cfae9900f76abfb12139dce5de56564fab2b6543165a040c606887420e33d91ed7ed7", 16),
-            new BigInteger("11", 16));
-
-        RSAPrivateCrtKeyParameters lwPrivKey = new RSAPrivateCrtKeyParameters(
-            new BigInteger("b4a7e46170574f16a97082b22be58b6a2a629798419be12872a4bdba626cfae9900f76abfb12139dce5de56564fab2b6543165a040c606887420e33d91ed7ed7", 16),
-            new BigInteger("11", 16),
-            new BigInteger("9f66f6b05410cd503b2709e88115d55daced94d1a34d4e32bf824d0dde6028ae79c5f07b580f5dce240d7111f7ddb130a7945cd7d957d1920994da389f490c89", 16),
-            new BigInteger("c0a0758cdf14256f78d4708c86becdead1b50ad4ad6c5c703e2168fbf37884cb", 16),
-            new BigInteger("f01734d7960ea60070f1b06f2bb81bfac48ff192ae18451d5e56c734a5aab8a5", 16),
-            new BigInteger("b54bb9edff22051d9ee60f9351a48591b6500a319429c069a3e335a1d6171391", 16),
-            new BigInteger("d3d83daf2a0cecd3367ae6f8ae1aeb82e9ac2f816c6fc483533d8297dd7884cd", 16),
-            new BigInteger("b8f52fc6f38593dabb661d3f50f8897f8106eee68b1bce78a95b132b4e5b5d19", 16));
-
-        //
-        // distinguished name table.
-        //
-        builder = new X500NameBuilder(RFC4519Style.INSTANCE);
-
-        builder.addRDN(RFC4519Style.c, "AU");
-        builder.addRDN(RFC4519Style.o, "The Legion of the Bouncy Castle");
-        builder.addRDN(RFC4519Style.l, "Melbourne");
-        builder.addRDN(RFC4519Style.st, "Victoria");
-        builder.addRDN(PKCSObjectIdentifiers.pkcs_9_at_emailAddress, "feedback-crypto@bouncycastle.org");
-
-        //
-        // extensions
-        //
-
-        //
-        // create the certificate - version 3 - without extensions
-        //
-        AlgorithmIdentifier sigAlgId = new DefaultSignatureAlgorithmIdentifierFinder().find("SHA256WithRSAEncryption");
-        AlgorithmIdentifier digAlgId = new DefaultDigestAlgorithmIdentifierFinder().find(sigAlgId);
-
-        sigGen = new BcRSAContentSignerBuilder(sigAlgId, digAlgId).build(lwPrivKey);
-        SubjectPublicKeyInfo pubInfo = SubjectPublicKeyInfoFactory.createSubjectPublicKeyInfo(lwPubKey);
-        certGen = new X509v3CertificateBuilder(builder.build(), BigInteger.valueOf(1), new Date(System.currentTimeMillis() - 50000), new Date(System.currentTimeMillis() + 50000), builder.build(), pubInfo);
-
-        certHolder = certGen.build(sigGen);
-
-        assertTrue(certHolder.isValidOn(new Date()));
-
-        contentVerifierProvider = new BcRSAContentVerifierProviderBuilder(new DefaultDigestAlgorithmIdentifierFinder()).build(lwPubKey);
-
-        assertTrue(certHolder.isSignatureValid(contentVerifierProvider));
-
-        if (!certHolder.isSignatureValid(contentVerifierProvider))
-        {
-            fail("lw sig verification failed");
-        }
-    }
-
-    /**
-     * we generate a self signed certificate for the sake of testing - DSA
-     */
-    public void checkCreation2()
-        throws Exception
-    {
-        //
-        // set up the keys
-        //
-        AsymmetricKeyParameter          privKey;
-        AsymmetricKeyParameter          pubKey;
-
-        AsymmetricCipherKeyPairGenerator kpg = new DSAKeyPairGenerator();
-        BigInteger              r = new BigInteger("68076202252361894315274692543577577550894681403");
-        BigInteger              s = new BigInteger("1089214853334067536215539335472893651470583479365");
-        DSAParametersGenerator pGen = new DSAParametersGenerator();
-
-        pGen.init(512, 80, new SecureRandom());
-
-        DSAParameters params = pGen.generateParameters();
-        DSAKeyGenerationParameters genParam = new DSAKeyGenerationParameters(new SecureRandom(), params);
-
-        kpg.init(genParam);
-
-        AsymmetricCipherKeyPair pair = kpg.generateKeyPair();
-
-        privKey = (AsymmetricKeyParameter)pair.getPrivate();
-        pubKey = (AsymmetricKeyParameter)pair.getPublic();
-
-        //
-        // distinguished name table.
-        //
-        X500NameBuilder builder = createStdBuilder();
-
-        //
-        // extensions
-        //
-
-        //
-        // create the certificate - version 3
-        //
-        AlgorithmIdentifier sigAlgId = sigAlgFinder.find("SHA1withDSA");
-        AlgorithmIdentifier digAlgId = digAlgFinder.find(sigAlgId);
-
-        ContentSigner sigGen = new BcDSAContentSignerBuilder(sigAlgId, digAlgId).build(privKey);
-        X509v3CertificateBuilder  certGen = new BcX509v3CertificateBuilder(builder.build(),BigInteger.valueOf(1),new Date(System.currentTimeMillis() - 50000),new Date(System.currentTimeMillis() + 50000),builder.build(),pubKey);
-
-
-        X509CertificateHolder cert = certGen.build(sigGen);
-
-        assertTrue(cert.isValidOn(new Date()));
-
-        assertTrue(cert.isSignatureValid(new BcDSAContentVerifierProviderBuilder(digAlgFinder).build(pubKey)));
-
-
-        //
-        // create the certificate - version 1
-        //
-        sigAlgId = sigAlgFinder.find("SHA1withDSA");
-        digAlgId = digAlgFinder.find(sigAlgId);
-
-        sigGen = new BcDSAContentSignerBuilder(sigAlgId, digAlgId).build(privKey);
-        X509v1CertificateBuilder  certGen1 = new BcX509v1CertificateBuilder(builder.build(),BigInteger.valueOf(1),new Date(System.currentTimeMillis() - 50000),new Date(System.currentTimeMillis() + 50000),builder.build(),pubKey);
-
-        cert = certGen1.build(sigGen);
-
-        assertTrue(cert.isValidOn(new Date()));
-
-        assertTrue(cert.isSignatureValid(new BcDSAContentVerifierProviderBuilder(digAlgFinder).build(pubKey)));
-
-        ByteArrayInputStream bIn = new ByteArrayInputStream(cert.getEncoded());
-        CertificateFactory fact = CertificateFactory.getInstance("X.509");
-
-        X509Certificate x509cert = (X509Certificate)fact.generateCertificate(bIn);
-
-            //System.out.println(cert);
-    }
-
-    private X500NameBuilder createStdBuilder()
-    {
-        X500NameBuilder builder = new X500NameBuilder(RFC4519Style.INSTANCE);
-
-        builder.addRDN(RFC4519Style.c, "AU");
-        builder.addRDN(RFC4519Style.o, "The Legion of the Bouncy Castle");
-        builder.addRDN(RFC4519Style.l, "Melbourne");
-        builder.addRDN(RFC4519Style.st, "Victoria");
-        builder.addRDN(PKCSObjectIdentifiers.pkcs_9_at_emailAddress, "feedback-crypto@bouncycastle.org");
-
-        return builder;
-    }
-
-    private void checkCRL(
-        int     id,
-        byte[]  bytes)
-    {
-        String                  dump = "";
-
-        try
-        {
-            X509CRLHolder crlHolder = new X509CRLHolder(bytes);
-
-        }
-        catch (Exception e)
-        {
-            fail(dump + System.getProperty("line.separator") + getName() + ": "+ id + " failed - exception " + e.toString());
-        }
-
-    }
-
-    public void checkCRLCreation1()
-        throws Exception
-    {
-        AsymmetricCipherKeyPairGenerator kpg = new RSAKeyPairGenerator();
-        RSAKeyGenerationParameters genParam = new RSAKeyGenerationParameters(
-                                            BigInteger.valueOf(0x1001), new SecureRandom(), 1024, 25);
-
-        kpg.init(genParam);
-
-        AsymmetricCipherKeyPair pair = kpg.generateKeyPair();
-        Date                 now = new Date();
-
-        X509v2CRLBuilder     crlGen = new X509v2CRLBuilder(new X500Name("CN=Test CA"), now);
-
-        BcX509ExtensionUtils extFact = new BcX509ExtensionUtils(new SHA1DigestCalculator());
-
-        crlGen.setNextUpdate(new Date(now.getTime() + 100000));
-
-        crlGen.addCRLEntry(BigInteger.ONE, now, CRLReason.privilegeWithdrawn);
-
-        crlGen.addExtension(Extension.authorityKeyIdentifier, false, extFact.createAuthorityKeyIdentifier(pair.getPublic()));
-
-        AlgorithmIdentifier sigAlg = sigAlgFinder.find("SHA256withRSAEncryption");
-        AlgorithmIdentifier digAlg = digAlgFinder.find(sigAlg);
-
-        X509CRLHolder crl = crlGen.build(new BcRSAContentSignerBuilder(sigAlg, digAlg).build(pair.getPrivate()));
-
-        if (!crl.getIssuer().equals(new X500Name("CN=Test CA")))
-        {
-            fail("failed CRL issuer test");
-        }
-
-        Extension authExt = crl.getExtension(Extension.authorityKeyIdentifier);
-
-        if (authExt == null)
-        {
-            fail("failed to find CRL extension");
-        }
-
-        AuthorityKeyIdentifier authId = AuthorityKeyIdentifier.getInstance(authExt.getParsedValue());
-
-        X509CRLEntryHolder entry = crl.getRevokedCertificate(BigInteger.ONE);
-
-        if (entry == null)
-        {
-            fail("failed to find CRL entry");
-        }
-
-        if (!entry.getSerialNumber().equals(BigInteger.ONE))
-        {
-            fail("CRL cert serial number does not match");
-        }
-
-        if (!entry.hasExtensions())
-        {
-            fail("CRL entry extension not found");
-        }
-
-        Extension ext = entry.getExtension(Extension.reasonCode);
-
-        if (ext != null)
-        {
-            ASN1Enumerated reasonCode = ASN1Enumerated.getInstance(ext.getParsedValue());
-
-            if (reasonCode.getValue().intValue() != CRLReason.privilegeWithdrawn)
-            {
-                fail("CRL entry reasonCode wrong");
-            }
-        }
-        else
-        {
-            fail("CRL entry reasonCode not found");
-        }
-    }
-
-    public void checkCRLCreation2()
-        throws Exception
-    {
-        AsymmetricCipherKeyPairGenerator kpg = new RSAKeyPairGenerator();
-        RSAKeyGenerationParameters genParam = new RSAKeyGenerationParameters(
-                                            BigInteger.valueOf(0x1001), new SecureRandom(), 1024, 25);
-
-        kpg.init(genParam);
-
-        AsymmetricCipherKeyPair pair = kpg.generateKeyPair();
-        Date                 now = new Date();
-
-        X509v2CRLBuilder     crlGen = new X509v2CRLBuilder(new X500Name("CN=Test CA"), now);
-
-        crlGen.setNextUpdate(new Date(now.getTime() + 100000));
-
-        ExtensionsGenerator extGen = new ExtensionsGenerator();
-
-        CRLReason crlReason = CRLReason.lookup(CRLReason.privilegeWithdrawn);
-
-        extGen.addExtension(Extension.reasonCode, false, crlReason);
-
-        BcX509ExtensionUtils extFact = new BcX509ExtensionUtils(new SHA1DigestCalculator());
-
-        crlGen.addCRLEntry(BigInteger.ONE, now, extGen.generate());
-
-        crlGen.addExtension(Extension.authorityKeyIdentifier, false, extFact.createAuthorityKeyIdentifier((AsymmetricKeyParameter)pair.getPublic()));
-
-        AlgorithmIdentifier sigAlg = sigAlgFinder.find("SHA256withRSAEncryption");
-        AlgorithmIdentifier digAlg = digAlgFinder.find(sigAlg);
-
-        X509CRLHolder crlHolder = crlGen.build(new BcRSAContentSignerBuilder(sigAlg, digAlg).build((AsymmetricKeyParameter)pair.getPrivate()));
-
-        if (!crlHolder.getIssuer().equals(new X500Name("CN=Test CA")))
-        {
-            fail("failed CRL issuer test");
-        }
-
-        Extension authExt = crlHolder.getExtension(Extension.authorityKeyIdentifier);
-
-        if (authExt == null)
-        {
-            fail("failed to find CRL extension");
-        }
-
-        AuthorityKeyIdentifier authId = AuthorityKeyIdentifier.getInstance(authExt.getParsedValue());
-
-        X509CRLEntryHolder entry = crlHolder.getRevokedCertificate(BigInteger.ONE);
-
-        if (entry == null)
-        {
-            fail("failed to find CRL entry");
-        }
-
-        if (!entry.getSerialNumber().equals(BigInteger.ONE))
-        {
-            fail("CRL cert serial number does not match");
-        }
-
-        if (!entry.hasExtensions())
-        {
-            fail("CRL entry extension not found");
-        }
-
-        Extension ext = entry.getExtension(Extension.reasonCode);
-
-        if (ext != null)
-        {
-            ASN1Enumerated   reasonCode = ASN1Enumerated.getInstance(ext.getParsedValue());
-
-            if (reasonCode.getValue().intValue() != CRLReason.privilegeWithdrawn)
-            {
-                fail("CRL entry reasonCode wrong");
-            }
-        }
-        else
-        {
-            fail("CRL entry reasonCode not found");
-        }
-    }
-
-    public void checkCRLCreation3()
-        throws Exception
-    {
-        AsymmetricCipherKeyPairGenerator kpg = new RSAKeyPairGenerator();
-        RSAKeyGenerationParameters genParam = new RSAKeyGenerationParameters(
-                                            BigInteger.valueOf(0x1001), new SecureRandom(), 1024, 25);
-
-        kpg.init(genParam);
-
-        AsymmetricCipherKeyPair pair = kpg.generateKeyPair();
-        Date                 now = new Date();
-        X509v2CRLBuilder     crlGen = new X509v2CRLBuilder(new X500Name("CN=Test CA"), now);
-
-        crlGen.setNextUpdate(new Date(now.getTime() + 100000));
-
-        ExtensionsGenerator extGen = new ExtensionsGenerator();
-
-        CRLReason crlReason = CRLReason.lookup(CRLReason.privilegeWithdrawn);
-
-        extGen.addExtension(Extension.reasonCode, false, crlReason);
-
-        BcX509ExtensionUtils extFact = new BcX509ExtensionUtils(new SHA1DigestCalculator());
-
-        Extensions entryExtensions = extGen.generate();
-
-        crlGen.addCRLEntry(BigInteger.ONE, now, entryExtensions);
-
-        crlGen.addExtension(Extension.authorityKeyIdentifier, false, extFact.createAuthorityKeyIdentifier((AsymmetricKeyParameter)pair.getPublic()));
-
-        AlgorithmIdentifier sigAlg = sigAlgFinder.find("SHA256withRSAEncryption");
-        AlgorithmIdentifier digAlg = digAlgFinder.find(sigAlg);
-
-        X509CRLHolder crlHolder = crlGen.build(new BcRSAContentSignerBuilder(sigAlg, digAlg).build((AsymmetricKeyParameter)pair.getPrivate()));
-
-        if (!crlHolder.getIssuer().equals(new X500Name("CN=Test CA")))
-        {
-            fail("failed CRL issuer test");
-        }
-
-        Extension authExt = crlHolder.getExtension(Extension.authorityKeyIdentifier);
-
-        if (authExt == null)
-        {
-            fail("failed to find CRL extension");
-        }
-
-        AuthorityKeyIdentifier authId = AuthorityKeyIdentifier.getInstance(authExt.getParsedValue());
-
-        X509CRLEntryHolder entry = crlHolder.getRevokedCertificate(BigInteger.ONE);
-
-        if (entry == null)
-        {
-            fail("failed to find CRL entry");
-        }
-
-        if (!entry.getSerialNumber().equals(BigInteger.ONE))
-        {
-            fail("CRL cert serial number does not match");
-        }
-
-        if (!entry.hasExtensions())
-        {
-            fail("CRL entry extension not found");
-        }
-
-        Extension  ext = entry.getExtension(Extension.reasonCode);
-
-        if (ext != null)
-        {
-            ASN1Enumerated   reasonCode = ASN1Enumerated.getInstance(ext.getParsedValue());
-
-            if (reasonCode.getValue().intValue() != CRLReason.privilegeWithdrawn)
-            {
-                fail("CRL entry reasonCode wrong");
-            }
-        }
-        else
-        {
-            fail("CRL entry reasonCode not found");
-        }
-
-        //
-        // check loading of existing CRL
-        //
-        now = new Date();
-        crlGen = new X509v2CRLBuilder(new X500Name("CN=Test CA"), now);
-
-        crlGen.setNextUpdate(new Date(now.getTime() + 100000));
-
-        crlGen.addCRL(crlHolder);
-
-        crlGen.addCRLEntry(BigInteger.valueOf(2), now, entryExtensions);
-
-        crlGen.addExtension(Extension.authorityKeyIdentifier, false, extFact.createAuthorityKeyIdentifier(pair.getPublic()));
-
-        crlHolder = crlGen.build(new BcRSAContentSignerBuilder(sigAlg, digAlg).build(pair.getPrivate()));
-
-        int     count = 0;
-        boolean oneFound = false;
-        boolean twoFound = false;
-
-        Iterator it = crlHolder.getRevokedCertificates().iterator();
-        while (it.hasNext())
-        {
-            X509CRLEntryHolder crlEnt = (X509CRLEntryHolder)it.next();
-
-            if (crlEnt.getSerialNumber().intValue() == 1)
-            {
-                oneFound = true;
-                Extension extn = crlEnt.getExtension(Extension.reasonCode);
-
-                if (extn != null)
-                {
-                    ASN1Enumerated reasonCode = ASN1Enumerated.getInstance(extn.getParsedValue());
-
-                    if (reasonCode.getValue().intValue() != CRLReason.privilegeWithdrawn)
-                    {
-                        fail("CRL entry reasonCode wrong on recheck");
-                    }
-                }
-                else
-                {
-                    fail("CRL entry reasonCode not found on recheck");
-                }
-            }
-            else if (crlEnt.getSerialNumber().intValue() == 2)
-            {
-                twoFound = true;
-            }
-
-            count++;
-        }
-
-        if (count != 2)
-        {
-            fail("wrong number of CRLs found, got: " + count);
-        }
-
-        if (!oneFound || !twoFound)
-        {
-            fail("wrong CRLs found in copied list");
-        }
-
-        //
-        // check factory read back
-        //
-        CertificateFactory cFact = CertificateFactory.getInstance("X.509");
-
-        X509CRL readCrl = (X509CRL)cFact.generateCRL(new ByteArrayInputStream(crlHolder.getEncoded()));
-
-        if (readCrl == null)
-        {
-            fail("crl not returned!");
-        }
-
-        Collection col = cFact.generateCRLs(new ByteArrayInputStream(crlHolder.getEncoded()));
-
-        if (col.size() != 1)
-        {
-            fail("wrong number of CRLs found in collection");
-        }
-    }
-
-    public void checkCreation5()
-        throws Exception
-    {
-        //
-        // a sample key pair.
-        //
-        AsymmetricKeyParameter pubKey = new RSAKeyParameters(
-            false,
-            new BigInteger("b4a7e46170574f16a97082b22be58b6a2a629798419be12872a4bdba626cfae9900f76abfb12139dce5de56564fab2b6543165a040c606887420e33d91ed7ed7", 16),
-            new BigInteger("11", 16));
-
-        AsymmetricKeyParameter privKey = new RSAPrivateCrtKeyParameters(
-            new BigInteger("b4a7e46170574f16a97082b22be58b6a2a629798419be12872a4bdba626cfae9900f76abfb12139dce5de56564fab2b6543165a040c606887420e33d91ed7ed7", 16),
-            new BigInteger("11", 16),
-            new BigInteger("9f66f6b05410cd503b2709e88115d55daced94d1a34d4e32bf824d0dde6028ae79c5f07b580f5dce240d7111f7ddb130a7945cd7d957d1920994da389f490c89", 16),
-            new BigInteger("c0a0758cdf14256f78d4708c86becdead1b50ad4ad6c5c703e2168fbf37884cb", 16),
-            new BigInteger("f01734d7960ea60070f1b06f2bb81bfac48ff192ae18451d5e56c734a5aab8a5", 16),
-            new BigInteger("b54bb9edff22051d9ee60f9351a48591b6500a319429c069a3e335a1d6171391", 16),
-            new BigInteger("d3d83daf2a0cecd3367ae6f8ae1aeb82e9ac2f816c6fc483533d8297dd7884cd", 16),
-            new BigInteger("b8f52fc6f38593dabb661d3f50f8897f8106eee68b1bce78a95b132b4e5b5d19", 16));
-
-        //
-        // set up the keys
-        //
-        SecureRandom        rand = new SecureRandom();
-
-        //
-        // distinguished name table.
-        //
-        X500NameBuilder builder = createStdBuilder();
-
-        //
-        // create base certificate - version 3
-        //
-        AlgorithmIdentifier sigAlg = sigAlgFinder.find("MD5WithRSA");
-        AlgorithmIdentifier digAlg = digAlgFinder.find(sigAlg);
-
-        ContentSigner sigGen = new BcRSAContentSignerBuilder(sigAlg, digAlg).build(privKey);
-        ASN1ObjectIdentifier extOid = new ASN1ObjectIdentifier("2.5.29.37");
-        X509v3CertificateBuilder certGen = new BcX509v3CertificateBuilder(builder.build(),BigInteger.valueOf(1),new Date(System.currentTimeMillis() - 50000),new Date(System.currentTimeMillis() + 50000),builder.build(),pubKey)
-            .addExtension(new ASN1ObjectIdentifier("2.5.29.15"), true,
-            new KeyUsage(KeyUsage.encipherOnly))
-            .addExtension(extOid, true,
-            new DERSequence(KeyPurposeId.anyExtendedKeyUsage))
-            .addExtension(new ASN1ObjectIdentifier("2.5.29.17"), true,
-            new GeneralNames(new GeneralName(GeneralName.rfc822Name, "test@test.test")));
-
-        X509CertificateHolder baseCert = certGen.build(sigGen);
-
-        //
-        // copy certificate
-        //
-
-        certGen = new BcX509v3CertificateBuilder(builder.build(),BigInteger.valueOf(1),new Date(System.currentTimeMillis() - 50000),new Date(System.currentTimeMillis() + 50000),builder.build(),pubKey)
-            .copyAndAddExtension(new ASN1ObjectIdentifier("2.5.29.15"), true, baseCert)
-            .copyAndAddExtension(extOid, false, baseCert);
-
-        X509CertificateHolder cert = certGen.build(sigGen);
-
-        assertTrue(cert.isValidOn(new Date()));
-
-        assertTrue(cert.isSignatureValid(new BcRSAContentVerifierProviderBuilder(digAlgFinder).build(pubKey)));
-
-        if (!baseCert.getExtension(new ASN1ObjectIdentifier("2.5.29.15")).equals(cert.getExtension(new ASN1ObjectIdentifier("2.5.29.15"))))
-        {
-            fail("2.5.29.15 differs");
-        }
-
-        assertTrue(baseCert.getExtension(extOid).getExtnId().equals(cert.getExtension(extOid).getExtnId()));
-        assertFalse(baseCert.getExtension(extOid).isCritical() == cert.getExtension(extOid).isCritical());
-        if (!baseCert.getExtension(extOid).getParsedValue().equals(cert.getExtension(extOid).getParsedValue()))
-        {
-            fail("2.5.29.37 differs");
-        }
-
-        //
-        // exception test
-        //
-
-        try
-        {
-            certGen.copyAndAddExtension(new ASN1ObjectIdentifier("2.5.99.99"), true, baseCert);
-
-            fail("exception not thrown on dud extension copy");
-        }
-        catch (NullPointerException e)
-        {
-            // expected
-        }
-
-//        try
-//        {
-//            certGen.setPublicKey(dudPublicKey);
-//
-//            certGen.generate(privKey, BC);
-//
-//            fail("key without encoding not detected in v3");
-//        }
-//        catch (IllegalArgumentException e)
-//        {
-//            // expected
-//        }
-
-    }
-
-    public void testForgedSignature()
-        throws Exception
-    {
-        String cert = "MIIBsDCCAVoCAQYwDQYJKoZIhvcNAQEFBQAwYzELMAkGA1UEBhMCQVUxEzARBgNV"
-                    + "BAgTClF1ZWVuc2xhbmQxGjAYBgNVBAoTEUNyeXB0U29mdCBQdHkgTHRkMSMwIQYD"
-                    + "VQQDExpTZXJ2ZXIgdGVzdCBjZXJ0ICg1MTIgYml0KTAeFw0wNjA5MTEyMzU4NTVa"
-                    + "Fw0wNjEwMTEyMzU4NTVaMGMxCzAJBgNVBAYTAkFVMRMwEQYDVQQIEwpRdWVlbnNs"
-                    + "YW5kMRowGAYDVQQKExFDcnlwdFNvZnQgUHR5IEx0ZDEjMCEGA1UEAxMaU2VydmVy"
-                    + "IHRlc3QgY2VydCAoNTEyIGJpdCkwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAn7PD"
-                    + "hCeV/xIxUg8V70YRxK2A5jZbD92A12GN4PxyRQk0/lVmRUNMaJdq/qigpd9feP/u"
-                    + "12S4PwTLb/8q/v657QIDAQABMA0GCSqGSIb3DQEBBQUAA0EAbynCRIlUQgaqyNgU"
-                    + "DF6P14yRKUtX8akOP2TwStaSiVf/akYqfLFm3UGka5XbPj4rifrZ0/sOoZEEBvHQ"
-                    + "e20sRA==";
-
-        X509CertificateHolder hldr = new X509CertificateHolder(Base64.decode(cert));
-
-        assertFalse(hldr.isSignatureValid(new BcRSAContentVerifierProviderBuilder(digAlgFinder).build(hldr)));
-    }
-
-    private void pemTest()
-        throws Exception
-    {
-        CertificateFactory cf = CertificateFactory.getInstance("X.509", "BC");
-
-        X509Certificate cert = readPEMCert(cf, PEMData.CERTIFICATE_1);
-        if (cert == null)
-        {
-            fail("PEM cert not read");
-        }
-        cert = readPEMCert(cf, "-----BEGIN CERTIFICATE-----" + PEMData.CERTIFICATE_2);
-        if (cert == null)
-        {
-            fail("PEM cert with extraneous header not read");
-        }
-        CRL crl = cf.generateCRL(new ByteArrayInputStream(PEMData.CRL_1.getBytes("US-ASCII")));
-        if (crl == null)
-        {
-            fail("PEM crl not read");
-        }
-        Collection col = cf.generateCertificates(new ByteArrayInputStream(PEMData.CERTIFICATE_2.getBytes("US-ASCII")));
-        if (col.size() != 1 || !col.contains(cert))
-        {
-            fail("PEM cert collection not right");
-        }
-        col = cf.generateCRLs(new ByteArrayInputStream(PEMData.CRL_2.getBytes("US-ASCII")));
-        if (col.size() != 1 || !col.contains(crl))
-        {
-            fail("PEM crl collection not right");
-        }
-    }
-
-    private static X509Certificate readPEMCert(CertificateFactory cf, String pemData)
-        throws CertificateException, UnsupportedEncodingException
-    {
-        return (X509Certificate)cf.generateCertificate(new ByteArrayInputStream(pemData.getBytes("US-ASCII")));
-    }
-
-    private void createPSSCert(String algorithm)
-        throws Exception
-    {
-        AsymmetricCipherKeyPair pair = generateLongFixedKeys();
-
-        AsymmetricKeyParameter privKey = (AsymmetricKeyParameter)pair.getPrivate();
-        AsymmetricKeyParameter pubKey = (AsymmetricKeyParameter)pair.getPublic();
-
-        //
-        // distinguished name table.
-        //
-
-        X500NameBuilder builder = createStdBuilder();
-
-        //
-        // create base certificate - version 3
-        //
-        BcX509ExtensionUtils extFact = new BcX509ExtensionUtils(new SHA1DigestCalculator());
-
-        AlgorithmIdentifier sigAlgId = sigAlgFinder.find(algorithm);
-        AlgorithmIdentifier digAlgId = digAlgFinder.find(sigAlgId);
-
-        ContentSigner sigGen = new BcRSAContentSignerBuilder(sigAlgId, digAlgId).build(privKey);
-        BcX509v3CertificateBuilder  certGen = new BcX509v3CertificateBuilder(builder.build(),BigInteger.valueOf(1),
-        new Date(System.currentTimeMillis() - 50000),new Date(System.currentTimeMillis() + 50000),builder.build(),pubKey);
-
-        certGen.addExtension(new ASN1ObjectIdentifier("2.5.29.15"), true,
-            new KeyUsage(KeyUsage.encipherOnly));
-        certGen.addExtension(new ASN1ObjectIdentifier("2.5.29.37"), true,
-            new DERSequence(KeyPurposeId.anyExtendedKeyUsage));
-        certGen.addExtension(new ASN1ObjectIdentifier("2.5.29.17"), true,
-            new GeneralNames(new GeneralName(GeneralName.rfc822Name, "test@test.test")));
-
-        certGen.addExtension(Extension.authorityKeyIdentifier, true, extFact.createAuthorityKeyIdentifier(pubKey));
-
-        X509CertificateHolder baseCert = certGen.build(sigGen);
-
-        assertTrue(baseCert.isSignatureValid(new BcRSAContentVerifierProviderBuilder(digAlgFinder).build(pubKey)));
-    }
-
-    private AsymmetricCipherKeyPair generateLongFixedKeys()
-    {
-        RSAKeyParameters pubKeySpec = new RSAKeyParameters(
-            false,
-            new BigInteger("a56e4a0e701017589a5187dc7ea841d156f2ec0e36ad52a44dfeb1e61f7ad991d8c51056ffedb162b4c0f283a12a88a394dff526ab7291cbb307ceabfce0b1dfd5cd9508096d5b2b8b6df5d671ef6377c0921cb23c270a70e2598e6ff89d19f105acc2d3f0cb35f29280e1386b6f64c4ef22e1e1f20d0ce8cffb2249bd9a2137",16),
-            new BigInteger("010001",16));
-
-        RSAKeyParameters privKeySpec = new RSAPrivateCrtKeyParameters(
-            new BigInteger("a56e4a0e701017589a5187dc7ea841d156f2ec0e36ad52a44dfeb1e61f7ad991d8c51056ffedb162b4c0f283a12a88a394dff526ab7291cbb307ceabfce0b1dfd5cd9508096d5b2b8b6df5d671ef6377c0921cb23c270a70e2598e6ff89d19f105acc2d3f0cb35f29280e1386b6f64c4ef22e1e1f20d0ce8cffb2249bd9a2137",16),
-            new BigInteger("010001",16),
-            new BigInteger("33a5042a90b27d4f5451ca9bbbd0b44771a101af884340aef9885f2a4bbe92e894a724ac3c568c8f97853ad07c0266c8c6a3ca0929f1e8f11231884429fc4d9ae55fee896a10ce707c3ed7e734e44727a39574501a532683109c2abacaba283c31b4bd2f53c3ee37e352cee34f9e503bd80c0622ad79c6dcee883547c6a3b325",16),
-            new BigInteger("e7e8942720a877517273a356053ea2a1bc0c94aa72d55c6e86296b2dfc967948c0a72cbccca7eacb35706e09a1df55a1535bd9b3cc34160b3b6dcd3eda8e6443",16),
-            new BigInteger("b69dca1cf7d4d7ec81e75b90fcca874abcde123fd2700180aa90479b6e48de8d67ed24f9f19d85ba275874f542cd20dc723e6963364a1f9425452b269a6799fd",16),
-            new BigInteger("28fa13938655be1f8a159cbaca5a72ea190c30089e19cd274a556f36c4f6e19f554b34c077790427bbdd8dd3ede2448328f385d81b30e8e43b2fffa027861979",16),
-            new BigInteger("1a8b38f398fa712049898d7fb79ee0a77668791299cdfa09efc0e507acb21ed74301ef5bfd48be455eaeb6e1678255827580a8e4e8e14151d1510a82a3f2e729",16),
-            new BigInteger("27156aba4126d24a81f3a528cbfb27f56886f840a9f6e86e17a44b94fe9319584b8e22fdde1e5a2e3bd8aa5ba8d8584194eb2190acf832b847f13a3d24a79f4d",16));
-
-        return new AsymmetricCipherKeyPair(pubKeySpec, privKeySpec);
-    }
-
-    public void testNullDerNullCert()
-        throws Exception
-    {
-        AsymmetricCipherKeyPair pair = generateLongFixedKeys();
-        AsymmetricKeyParameter pubKey = (AsymmetricKeyParameter)pair.getPublic();
-        AsymmetricKeyParameter privKey = (AsymmetricKeyParameter)pair.getPrivate();
-
-        DefaultSignatureAlgorithmIdentifierFinder sigAlgFinder = new DefaultSignatureAlgorithmIdentifierFinder();
-        DefaultDigestAlgorithmIdentifierFinder digAlgFinder = new DefaultDigestAlgorithmIdentifierFinder();
-
-        AlgorithmIdentifier sigAlgId = sigAlgFinder.find("MD5withRSA");
-        AlgorithmIdentifier digAlgId = digAlgFinder.find(sigAlgId);
-
-        ContentSigner sigGen = new BcRSAContentSignerBuilder(sigAlgId, digAlgId).build(privKey);
-        BcX509v3CertificateBuilder  certGen = new BcX509v3CertificateBuilder(new X500Name("CN=Test"),BigInteger.valueOf(1),new Date(System.currentTimeMillis() - 50000),new Date(System.currentTimeMillis() + 50000),new X500Name("CN=Test"),pubKey);
-        X509CertificateHolder cert = certGen.build(sigGen);
-
-        Certificate struct = Certificate.getInstance(cert.getEncoded());
-
-        ASN1Object tbsCertificate = struct.getTBSCertificate();
-        AlgorithmIdentifier sig = struct.getSignatureAlgorithm();
-
-        ASN1EncodableVector v = new ASN1EncodableVector();
-
-        v.add(tbsCertificate);
-        v.add(new AlgorithmIdentifier(sig.getAlgorithm()));
-        v.add(struct.getSignature());
-
-        // verify
-        ByteArrayInputStream    bIn;
-        String                  dump = "";
-
-        bIn = new ByteArrayInputStream(new DERSequence(v).getEncoded());
-
-        cert = new X509CertificateHolder(new DERSequence(v).getEncoded());
-
-        assertTrue(cert.isSignatureValid(new BcRSAContentVerifierProviderBuilder(digAlgFinder).build(pubKey)));
-    }
-
-    public void testCertificates()
-        throws Exception
-    {
-        checkCertificate(1, cert1);
-        checkCertificate(2, cert2);
-        checkCertificate(3, cert3);
-        checkCertificate(4, cert4);
-        checkCertificate(5, cert5);
-        //checkCertificate(7, cert7);
-
-        checkKeyUsage(8, keyUsage);
-
-        checkSelfSignedCertificate(11, probSelfSignedCert);
-
-        checkCRL(1, crl1);
-
-        checkCreation1();
-        checkCreation2();
-        checkCreation5();
-
-        createPSSCert("SHA1withRSAandMGF1");
-        createPSSCert("SHA224withRSAandMGF1");
-        createPSSCert("SHA256withRSAandMGF1");
-        createPSSCert("SHA384withRSAandMGF1");
-
-        checkCRLCreation1();
-        checkCRLCreation2();
-        checkCRLCreation3();
-
-        pemTest();
-
-        checkCertificate(18, emptyDNCert);
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/test/BcPKCS10Test.java b/bcpkix/src/main/java/org/bouncycastle/cert/test/BcPKCS10Test.java
deleted file mode 100644
index 01a8dd5..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/test/BcPKCS10Test.java
+++ /dev/null
@@ -1,230 +0,0 @@
-package org.bouncycastle.cert.test;
-
-import java.math.BigInteger;
-import java.security.SecureRandom;
-
-import junit.framework.TestCase;
-import org.bouncycastle.asn1.pkcs.Attribute;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.asn1.x500.X500Name;
-import org.bouncycastle.asn1.x500.X500NameBuilder;
-import org.bouncycastle.asn1.x500.style.RFC4519Style;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.asn1.x509.BasicConstraints;
-import org.bouncycastle.asn1.x509.Extension;
-import org.bouncycastle.asn1.x509.ExtensionsGenerator;
-import org.bouncycastle.asn1.x509.KeyUsage;
-import org.bouncycastle.asn1.x509.SubjectKeyIdentifier;
-import org.bouncycastle.cert.bc.BcX509ExtensionUtils;
-import org.bouncycastle.crypto.AsymmetricCipherKeyPair;
-import org.bouncycastle.crypto.AsymmetricCipherKeyPairGenerator;
-import org.bouncycastle.crypto.generators.RSAKeyPairGenerator;
-import org.bouncycastle.crypto.params.AsymmetricKeyParameter;
-import org.bouncycastle.crypto.params.RSAKeyGenerationParameters;
-import org.bouncycastle.crypto.params.RSAKeyParameters;
-import org.bouncycastle.crypto.params.RSAPrivateCrtKeyParameters;
-import org.bouncycastle.operator.DefaultDigestAlgorithmIdentifierFinder;
-import org.bouncycastle.operator.DefaultSignatureAlgorithmIdentifierFinder;
-import org.bouncycastle.operator.bc.BcContentSignerBuilder;
-import org.bouncycastle.operator.bc.BcRSAContentSignerBuilder;
-import org.bouncycastle.operator.bc.BcRSAContentVerifierProviderBuilder;
-import org.bouncycastle.pkcs.PKCS10CertificationRequest;
-import org.bouncycastle.pkcs.PKCS10CertificationRequestBuilder;
-import org.bouncycastle.pkcs.bc.BcPKCS10CertificationRequest;
-import org.bouncycastle.pkcs.bc.BcPKCS10CertificationRequestBuilder;
-import org.bouncycastle.util.Arrays;
-
-public class BcPKCS10Test
-    extends TestCase
-{
-    public String getName()
-    {
-        return "PKCS10CertRequest";
-    }
-
-    private void generationTest(int keySize, String keyName, String sigName)
-        throws Exception
-    {
-        AsymmetricCipherKeyPairGenerator kpg = new RSAKeyPairGenerator();
-        RSAKeyGenerationParameters genParam = new RSAKeyGenerationParameters(
-                                            BigInteger.valueOf(0x1001), new SecureRandom(), keySize, 25);
-
-        kpg.init(genParam);
-
-        AsymmetricCipherKeyPair kp = kpg.generateKeyPair();
-
-
-        X500NameBuilder x500NameBld = new X500NameBuilder(RFC4519Style.INSTANCE);
-
-        x500NameBld.addRDN(RFC4519Style.c, "AU");
-        x500NameBld.addRDN(RFC4519Style.o, "The Legion of the Bouncy Castle");
-        x500NameBld.addRDN(RFC4519Style.l, "Melbourne");
-        x500NameBld.addRDN(RFC4519Style.st, "Victoria");
-        x500NameBld.addRDN(PKCSObjectIdentifiers.pkcs_9_at_emailAddress, "feedback-crypto@bouncycastle.org");
-
-        X500Name subject = x500NameBld.build();
-
-        PKCS10CertificationRequestBuilder requestBuilder = new BcPKCS10CertificationRequestBuilder(subject, kp.getPublic());
-
-        DefaultSignatureAlgorithmIdentifierFinder sigAlgFinder = new DefaultSignatureAlgorithmIdentifierFinder();
-        DefaultDigestAlgorithmIdentifierFinder digAlgFinder = new DefaultDigestAlgorithmIdentifierFinder();
-
-        AlgorithmIdentifier sigAlgId = sigAlgFinder.find("SHA1withRSA");
-
-        AlgorithmIdentifier digAlgId = digAlgFinder.find(sigAlgId);
-
-        BcContentSignerBuilder contentSignerBuilder = new BcRSAContentSignerBuilder(sigAlgId, digAlgId);
-
-        PKCS10CertificationRequest req1 = requestBuilder.build(contentSignerBuilder.build(kp.getPrivate()));
-
-        BcPKCS10CertificationRequest req2 = new BcPKCS10CertificationRequest(req1.getEncoded());
-
-        if (!req2.isSignatureValid(new BcRSAContentVerifierProviderBuilder(digAlgFinder).build(kp.getPublic())))
-        {
-            fail(sigName + ": Failed verify check.");
-        }
-
-        if (!Arrays.areEqual(req2.getSubjectPublicKeyInfo().getEncoded(), req1.getSubjectPublicKeyInfo().getEncoded()))
-        {
-            fail(keyName + ": Failed public key check.");
-        }
-    }
-
-    private void createPSSTest(String algorithm)
-        throws Exception
-    {
-        AsymmetricKeyParameter pubKey = new RSAKeyParameters(
-            false,
-            new BigInteger("a56e4a0e701017589a5187dc7ea841d156f2ec0e36ad52a44dfeb1e61f7ad991d8c51056ffedb162b4c0f283a12a88a394dff526ab7291cbb307ceabfce0b1dfd5cd9508096d5b2b8b6df5d671ef6377c0921cb23c270a70e2598e6ff89d19f105acc2d3f0cb35f29280e1386b6f64c4ef22e1e1f20d0ce8cffb2249bd9a2137",16),
-            new BigInteger("010001",16));
-
-        AsymmetricKeyParameter privKey = new RSAPrivateCrtKeyParameters(
-            new BigInteger("a56e4a0e701017589a5187dc7ea841d156f2ec0e36ad52a44dfeb1e61f7ad991d8c51056ffedb162b4c0f283a12a88a394dff526ab7291cbb307ceabfce0b1dfd5cd9508096d5b2b8b6df5d671ef6377c0921cb23c270a70e2598e6ff89d19f105acc2d3f0cb35f29280e1386b6f64c4ef22e1e1f20d0ce8cffb2249bd9a2137",16),
-            new BigInteger("010001",16),
-            new BigInteger("33a5042a90b27d4f5451ca9bbbd0b44771a101af884340aef9885f2a4bbe92e894a724ac3c568c8f97853ad07c0266c8c6a3ca0929f1e8f11231884429fc4d9ae55fee896a10ce707c3ed7e734e44727a39574501a532683109c2abacaba283c31b4bd2f53c3ee37e352cee34f9e503bd80c0622ad79c6dcee883547c6a3b325",16),
-            new BigInteger("e7e8942720a877517273a356053ea2a1bc0c94aa72d55c6e86296b2dfc967948c0a72cbccca7eacb35706e09a1df55a1535bd9b3cc34160b3b6dcd3eda8e6443",16),
-            new BigInteger("b69dca1cf7d4d7ec81e75b90fcca874abcde123fd2700180aa90479b6e48de8d67ed24f9f19d85ba275874f542cd20dc723e6963364a1f9425452b269a6799fd",16),
-            new BigInteger("28fa13938655be1f8a159cbaca5a72ea190c30089e19cd274a556f36c4f6e19f554b34c077790427bbdd8dd3ede2448328f385d81b30e8e43b2fffa027861979",16),
-            new BigInteger("1a8b38f398fa712049898d7fb79ee0a77668791299cdfa09efc0e507acb21ed74301ef5bfd48be455eaeb6e1678255827580a8e4e8e14151d1510a82a3f2e729",16),
-            new BigInteger("27156aba4126d24a81f3a528cbfb27f56886f840a9f6e86e17a44b94fe9319584b8e22fdde1e5a2e3bd8aa5ba8d8584194eb2190acf832b847f13a3d24a79f4d",16));
-
-        DefaultSignatureAlgorithmIdentifierFinder sigAlgFinder = new DefaultSignatureAlgorithmIdentifierFinder();
-        DefaultDigestAlgorithmIdentifierFinder digAlgFinder = new DefaultDigestAlgorithmIdentifierFinder();
-
-        AlgorithmIdentifier sigAlgId = sigAlgFinder.find(algorithm);
-        AlgorithmIdentifier digAlgId = digAlgFinder.find(sigAlgId);
-        BcContentSignerBuilder contentSignerBuilder = new BcRSAContentSignerBuilder(sigAlgId, digAlgId);
-
-        PKCS10CertificationRequest req = new BcPKCS10CertificationRequestBuilder(new X500Name("CN=XXX"), pubKey).build(contentSignerBuilder.build(privKey));
-        if (!req.isSignatureValid(new BcRSAContentVerifierProviderBuilder(digAlgFinder).build(pubKey)))
-        {
-            fail("Failed verify check PSS.");
-        }
-
-        BcPKCS10CertificationRequest bcReq = new BcPKCS10CertificationRequest(req.getEncoded());
-        if (!bcReq.isSignatureValid(new BcRSAContentVerifierProviderBuilder(digAlgFinder).build(bcReq.getPublicKey())))
-        {
-            fail("Failed verify check PSS encoded.");
-        }
-
-        if (!bcReq.getSignatureAlgorithm().getAlgorithm().equals(PKCSObjectIdentifiers.id_RSASSA_PSS))
-        {
-            fail("PSS oid incorrect.");
-        }
-
-        if (bcReq.getSignatureAlgorithm().getParameters() == null)
-        {
-            fail("PSS parameters incorrect.");
-        }
-    }
-
-     // previous code found to cause a NullPointerException
-    private void nullPointerTest()
-        throws Exception
-    {
-        AsymmetricCipherKeyPairGenerator kpg = new RSAKeyPairGenerator();
-        RSAKeyGenerationParameters genParam = new RSAKeyGenerationParameters(
-                                            BigInteger.valueOf(0x1001), new SecureRandom(), 1024, 25);
-
-        kpg.init(genParam);
-
-        AsymmetricCipherKeyPair kp = kpg.generateKeyPair();
-        ExtensionsGenerator extGen = new ExtensionsGenerator();
-
-        extGen.addExtension(Extension.basicConstraints, true, new BasicConstraints(true));
-        extGen.addExtension(Extension.keyUsage, true, new KeyUsage(KeyUsage.keyCertSign | KeyUsage.cRLSign));
-
-        BcX509ExtensionUtils extUtils = new BcX509ExtensionUtils(new SHA1DigestCalculator());
-
-        SubjectKeyIdentifier subjectKeyIdentifier = extUtils.createSubjectKeyIdentifier(kp.getPublic());
-
-        extGen.addExtension(Extension.subjectKeyIdentifier, false, subjectKeyIdentifier);
-
-        DefaultSignatureAlgorithmIdentifierFinder sigAlgFinder = new DefaultSignatureAlgorithmIdentifierFinder();
-        DefaultDigestAlgorithmIdentifierFinder digAlgFinder = new DefaultDigestAlgorithmIdentifierFinder();
-
-        AlgorithmIdentifier sigAlgId = sigAlgFinder.find("SHA1withRSA");
-
-        AlgorithmIdentifier digAlgId = digAlgFinder.find(sigAlgId);
-
-        BcContentSignerBuilder contentSignerBuilder = new BcRSAContentSignerBuilder(sigAlgId, digAlgId);
-
-        PKCS10CertificationRequest p1 = new BcPKCS10CertificationRequestBuilder(
-            new X500Name("cn=csr"), kp.getPublic())
-            .addAttribute(PKCSObjectIdentifiers.pkcs_9_at_extensionRequest, extGen.generate())
-            .build(contentSignerBuilder.build(kp.getPrivate()));
-        PKCS10CertificationRequest p2 = new BcPKCS10CertificationRequestBuilder(
-            new X500Name("cn=csr"), kp.getPublic())
-            .addAttribute(PKCSObjectIdentifiers.pkcs_9_at_extensionRequest, extGen.generate())
-            .build(contentSignerBuilder.build(kp.getPrivate()));
-
-        if (!p1.equals(p2))
-        {
-            fail("cert request comparison failed");
-        }
-
-        Attribute[] attr1 = p1.getAttributes();
-        Attribute[] attr2 = p1.getAttributes();
-
-        checkAttrs(1, attr1, attr2);
-
-        attr1 = p1.getAttributes(PKCSObjectIdentifiers.pkcs_9_at_extensionRequest);
-        attr2 = p1.getAttributes(PKCSObjectIdentifiers.pkcs_9_at_extensionRequest);
-
-        checkAttrs(1, attr1, attr2);
-    }
-
-    private void checkAttrs(int expectedLength, Attribute[] attr1, Attribute[] attr2)
-    {
-        if (expectedLength != attr1.length)
-        {
-            fail("expected length mismatch");
-        }
-
-        if (attr1.length != attr2.length)
-        {
-            fail("atrribute length mismatch");
-        }
-
-        for (int i = 0; i != attr1.length; i++)
-        {
-            if (!attr1[i].equals(attr2[i]))
-            {
-                fail("atrribute mismatch");
-            }
-        }
-    }
-
-    public void testPKCS10()
-        throws Exception
-    {
-        generationTest(512, "RSA", "SHA1withRSA");
-
-        createPSSTest("SHA1withRSAandMGF1");
-        createPSSTest("SHA224withRSAandMGF1");
-        createPSSTest("SHA256withRSAandMGF1");
-        createPSSTest("SHA384withRSAandMGF1");
-
-        nullPointerTest();
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/test/CertPathLoopTest.java b/bcpkix/src/main/java/org/bouncycastle/cert/test/CertPathLoopTest.java
deleted file mode 100644
index 09e921c..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/test/CertPathLoopTest.java
+++ /dev/null
@@ -1,308 +0,0 @@
-package org.bouncycastle.cert.test;

-

-import java.io.ByteArrayInputStream;

-import java.math.BigInteger;

-import java.security.InvalidAlgorithmParameterException;

-import java.security.KeyPair;

-import java.security.KeyPairGenerator;

-import java.security.NoSuchAlgorithmException;

-import java.security.PublicKey;

-import java.security.Security;

-import java.security.cert.CertPathBuilder;

-import java.security.cert.CertPathBuilderException;

-import java.security.cert.CertPathBuilderResult;

-import java.security.cert.CertStore;

-import java.security.cert.CertStoreParameters;

-import java.security.cert.CollectionCertStoreParameters;

-import java.security.cert.PKIXBuilderParameters;

-import java.security.cert.TrustAnchor;

-import java.security.cert.X509CRL;

-import java.security.cert.X509CertSelector;

-import java.security.cert.X509Certificate;

-import java.util.ArrayList;

-import java.util.Collection;

-import java.util.Collections;

-import java.util.Date;

-import java.util.GregorianCalendar;

-import java.util.HashSet;

-import java.util.List;

-import java.util.Set;

-

-import org.bouncycastle.asn1.ASN1InputStream;

-import org.bouncycastle.asn1.ASN1Sequence;

-import org.bouncycastle.asn1.x500.X500Name;

-import org.bouncycastle.asn1.x509.BasicConstraints;

-import org.bouncycastle.asn1.x509.Extension;

-import org.bouncycastle.asn1.x509.KeyUsage;

-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;

-import org.bouncycastle.cert.X509CRLHolder;

-import org.bouncycastle.cert.X509CertificateHolder;

-import org.bouncycastle.cert.X509v2CRLBuilder;

-import org.bouncycastle.cert.X509v3CertificateBuilder;

-import org.bouncycastle.cert.jcajce.JcaX509CRLConverter;

-import org.bouncycastle.cert.jcajce.JcaX509CertificateConverter;

-import org.bouncycastle.jce.provider.BouncyCastleProvider;

-import org.bouncycastle.operator.ContentSigner;

-import org.bouncycastle.operator.jcajce.JcaContentSignerBuilder;

-import org.bouncycastle.util.test.SimpleTest;

-

-

-/**

- * BC bug test case.

- */

-public class CertPathLoopTest

-    extends SimpleTest

-{

-    /**

-     * List of trust anchors

-     */

-    private static Set<TrustAnchor> taSet;

-    /**

-     * List of certificates and CRLs

-     */

-    private static List<Object> otherList;

-

-    /**

-     * Asks the user about the configuration he want's to test

-     *

-     * @param caA

-     * @param caB

-     */

-    private static void checkUseDistinctCAs(CA caA, CA caB)

-    {

-        //Standard configuration : everything in caA

-        taSet = new HashSet<TrustAnchor>();

-        taSet.add(caA.ta);

-        otherList = new ArrayList<Object>();

-        otherList.add(caA.acCertCrl);

-        otherList.add(caA.crl);

-        //User specified configuration : parts of caB

-

-        taSet.add(caB.ta);

-        otherList.add(caB.acCertCrl);

-        otherList.add(caB.crl);

-    }

-

-    /**

-     * Creates a collection cert store

-     */

-    static CertStore getStore(Collection col)

-        throws InvalidAlgorithmParameterException, NoSuchAlgorithmException

-    {

-        CertStoreParameters csp = new CollectionCertStoreParameters(col);

-        return CertStore.getInstance("Collection", csp);

-    }

-

-    public String getName()

-    {

-        return "CertPath Loop Test";

-    }

-

-    public void performTest()

-        throws Exception

-    {

-              //Add the provider

-        Security.addProvider(new BouncyCastleProvider());

-        //Generate two Cert authorities

-        CA caA = new CA();

-        CA caB = new CA();

-        //Ask the user the conf he want's to test

-        checkUseDistinctCAs(caA, caB);

-

-        //Let's create a target cert under caA

-        X509CertSelector target = new X509CertSelector();

-        target.setCertificate(caA.makeNewCert());

-        //create control parameters

-        PKIXBuilderParameters params = new PKIXBuilderParameters(taSet, target);

-        params.addCertStore(getStore(Collections.singleton(target.getCertificate())));

-        params.addCertStore(getStore(otherList));

-        //enable revocation check

-        params.setRevocationEnabled(true);

-

-        //Lets Build the path

-        try

-        {

-            CertPathBuilderResult cpbr = CertPathBuilder.getInstance("PKIX", "BC").build(params);

-

-            fail("invalid path build");

-        }

-        catch (CertPathBuilderException e)

-        {

-            if (!e.getCause().getMessage().equals("CertPath for CRL signer failed to validate."))

-            {

-                fail("Exception thrown, but wrong one", e.getCause());

-            }

-        }

-    }

-

-    /**

-     * Class simulating a certification authority

-     */

-    private static class CA

-    {

-        /**

-         * key pair generator

-         */

-        final static KeyPairGenerator kpg;

-

-        static

-        {

-            try

-            {

-                kpg = KeyPairGenerator.getInstance("RSA");

-                //Key size doesn't matter, smaller == Faster

-                kpg.initialize(512);

-            }

-            catch (NoSuchAlgorithmException e)

-            {

-                throw new RuntimeException(e);

-            }

-        }

-

-        /**

-         * KeyPair signing certificates

-         */

-        private KeyPair caCertKp;

-        /**

-         * KeyPair signing CRLs

-         */

-        private KeyPair caCrlKp;

-        TrustAnchor ta;

-        /**

-         * Subject of this CA

-         */

-        X500Name acSubject;

-        /**

-         * Certificate signing certificates

-         */

-        X509Certificate acCertAc;

-        /**

-         * Certificate signing CRLs

-         */

-        X509Certificate acCertCrl;

-        /**

-         * the CRL

-         */

-        X509CRL crl;

-        /**

-         * Signers

-         */

-        private ContentSigner caCrlSigner, caCertSigner;

-        /**

-         * Serial number counter

-         */

-        private int counter = 1;

-

-        /**

-         * Constructor

-         */

-        public CA()

-            throws Exception

-        {

-            //Init both keypairs

-            caCertKp = kpg.generateKeyPair();

-            caCrlKp = kpg.generateKeyPair();

-            //subject

-            acSubject = new X500Name("CN=AC_0");

-            //validity

-            GregorianCalendar gc = new GregorianCalendar();

-            Date notBefore = gc.getTime();

-            gc.add(GregorianCalendar.DAY_OF_YEAR, 1);

-            Date notAfter = gc.getTime();

-            //first signer

-            caCertSigner = new JcaContentSignerBuilder("SHA1withRSA").build(caCertKp.getPrivate());

-            //top level : issuer is self

-            X500Name issuer = acSubject;

-            //reserved for future use (another test case)

-            ContentSigner thisAcSigner = caCertSigner;

-            //reserved for future use (another test case)

-            //First certificate: Certificate authority (BasicConstraints=true) but not CRLSigner

-            X509CertificateHolder certH = new X509v3CertificateBuilder(

-                issuer, BigInteger.valueOf(counter++), notBefore, notAfter, acSubject, getPublicKeyInfo(caCertKp.getPublic()))

-                .addExtension(Extension.basicConstraints, true, new BasicConstraints(true))

-                .addExtension(Extension.keyUsage, true, new KeyUsage(KeyUsage.keyCertSign))

-                .build(thisAcSigner);

-            //lets convert to X509Certificate

-            acCertAc = convert(certH);

-            //and build a trust Anchor

-            ta = new TrustAnchor(acCertAc, null);

-

-            //Second signer

-            caCrlSigner = new JcaContentSignerBuilder("SHA1withRSA").build(caCrlKp.getPrivate());

-            //second certificate: CRLSigner but not Certificate authority (BasicConstraints=false)

-            certH = new X509v3CertificateBuilder(

-                issuer, BigInteger.valueOf(counter++), notBefore, notAfter, acSubject, getPublicKeyInfo(caCrlKp.getPublic()))

-                .addExtension(Extension.basicConstraints, false, new BasicConstraints(false))

-                .addExtension(Extension.keyUsage, true, new KeyUsage(KeyUsage.cRLSign))

-                .build(thisAcSigner);

-            //lets convert to X509Certificate

-            acCertCrl = convert(certH);

-            //And create the CRL

-            X509CRLHolder crlH = new X509v2CRLBuilder(acSubject, notBefore).setNextUpdate(notAfter).build(caCrlSigner);

-            //lets convert to X509CRL

-            crl = convert(crlH);

-        }

-

-        /**

-         * Creates a child certificate

-         */

-        public X509Certificate makeNewCert()

-            throws Exception

-        {

-            //private key doesn't matter for the test

-            PublicKey publicKey = kpg.generateKeyPair().getPublic();

-            //Validity

-            GregorianCalendar gc = new GregorianCalendar();

-            Date notBefore = gc.getTime();

-            gc.add(GregorianCalendar.DAY_OF_YEAR, 1);

-            Date notAfter = gc.getTime();

-            //serial

-            BigInteger certSerial = BigInteger.valueOf(counter++);

-            //Distinct name based on the serial

-            X500Name subject = new X500Name("CN=EU_" + certSerial.toString());

-            //End user certificate, not allowed to do anything

-            X509CertificateHolder enUserCertH = new X509v3CertificateBuilder(

-                acSubject, certSerial, notBefore, notAfter, subject, getPublicKeyInfo(publicKey))

-                .addExtension(Extension.basicConstraints, false, new BasicConstraints(false))

-                .addExtension(Extension.keyUsage, true, new KeyUsage(0))

-                .build(caCertSigner);

-

-            //lets convert to X509Certificate

-            return convert(enUserCertH);

-        }

-

-

-        /**

-         * convert to X509Certificate

-         */

-        static X509Certificate convert(X509CertificateHolder h)

-            throws Exception

-        {

-            return new JcaX509CertificateConverter().getCertificate(h);

-        }

-

-        /**

-         * convert to X509CRL

-         */

-        static X509CRL convert(X509CRLHolder h)

-            throws Exception

-        {

-            return new JcaX509CRLConverter().getCRL(h);

-        }

-

-        /**

-         * convert to SubjectPublicKeyInfo

-         */

-        static SubjectPublicKeyInfo getPublicKeyInfo(PublicKey k)

-            throws Exception

-        {

-            return new SubjectPublicKeyInfo((ASN1Sequence)new ASN1InputStream(

-                new ByteArrayInputStream(k.getEncoded())).readObject());

-        }

-    }

-

-    public static void main(String[] args)

-    {

-        runTest(new CertPathLoopTest());

-    }

-}

diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/test/CertTest.java b/bcpkix/src/main/java/org/bouncycastle/cert/test/CertTest.java
deleted file mode 100644
index 30dec30..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/test/CertTest.java
+++ /dev/null
@@ -1,2995 +0,0 @@
-package org.bouncycastle.cert.test;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.math.BigInteger;
-import java.security.KeyFactory;
-import java.security.KeyPair;
-import java.security.KeyPairGenerator;
-import java.security.KeyStore;
-import java.security.NoSuchAlgorithmException;
-import java.security.NoSuchProviderException;
-import java.security.PrivateKey;
-import java.security.PublicKey;
-import java.security.SecureRandom;
-import java.security.Security;
-import java.security.Signature;
-import java.security.cert.CRL;
-import java.security.cert.Certificate;
-import java.security.cert.CertificateException;
-import java.security.cert.CertificateFactory;
-import java.security.cert.X509CRL;
-import java.security.cert.X509CRLEntry;
-import java.security.cert.X509Certificate;
-import java.security.spec.InvalidKeySpecException;
-import java.security.spec.RSAPrivateCrtKeySpec;
-import java.security.spec.RSAPublicKeySpec;
-import java.util.Collection;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-import java.util.Vector;
-
-import javax.security.auth.x500.X500Principal;
-
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Enumerated;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.DERNull;
-import org.bouncycastle.asn1.DEROctetString;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.asn1.pkcs.RSAPublicKey;
-import org.bouncycastle.asn1.x500.X500Name;
-import org.bouncycastle.asn1.x500.X500NameBuilder;
-import org.bouncycastle.asn1.x500.style.BCStyle;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.asn1.x509.AuthorityKeyIdentifier;
-import org.bouncycastle.asn1.x509.CRLReason;
-import org.bouncycastle.asn1.x509.Extension;
-import org.bouncycastle.asn1.x509.ExtensionsGenerator;
-import org.bouncycastle.asn1.x509.GeneralName;
-import org.bouncycastle.asn1.x509.GeneralNames;
-import org.bouncycastle.asn1.x509.IssuingDistributionPoint;
-import org.bouncycastle.asn1.x509.KeyPurposeId;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.bouncycastle.asn1.x509.X509CertificateStructure;
-import org.bouncycastle.asn1.x509.X509Extension;
-import org.bouncycastle.asn1.x509.X509Extensions;
-import org.bouncycastle.asn1.x9.X9ObjectIdentifiers;
-import org.bouncycastle.cert.X509CRLEntryHolder;
-import org.bouncycastle.cert.X509CRLHolder;
-import org.bouncycastle.cert.X509CertificateHolder;
-import org.bouncycastle.cert.X509v1CertificateBuilder;
-import org.bouncycastle.cert.X509v2CRLBuilder;
-import org.bouncycastle.cert.X509v3CertificateBuilder;
-import org.bouncycastle.cert.jcajce.JcaX509CRLConverter;
-import org.bouncycastle.cert.jcajce.JcaX509CRLHolder;
-import org.bouncycastle.cert.jcajce.JcaX509CertificateConverter;
-import org.bouncycastle.cert.jcajce.JcaX509CertificateHolder;
-import org.bouncycastle.cert.jcajce.JcaX509v1CertificateBuilder;
-import org.bouncycastle.cert.jcajce.JcaX509v2CRLBuilder;
-import org.bouncycastle.cert.jcajce.JcaX509v3CertificateBuilder;
-import org.bouncycastle.crypto.params.RSAKeyParameters;
-import org.bouncycastle.crypto.params.RSAPrivateCrtKeyParameters;
-import org.bouncycastle.jce.X509KeyUsage;
-import org.bouncycastle.jce.X509Principal;
-import org.bouncycastle.jce.interfaces.ECPointEncoder;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.jce.spec.ECParameterSpec;
-import org.bouncycastle.jce.spec.ECPrivateKeySpec;
-import org.bouncycastle.jce.spec.ECPublicKeySpec;
-import org.bouncycastle.jce.spec.GOST3410ParameterSpec;
-import org.bouncycastle.math.ec.ECCurve;
-import org.bouncycastle.operator.ContentSigner;
-import org.bouncycastle.operator.ContentVerifierProvider;
-import org.bouncycastle.operator.DefaultDigestAlgorithmIdentifierFinder;
-import org.bouncycastle.operator.DefaultSignatureAlgorithmIdentifierFinder;
-import org.bouncycastle.operator.bc.BcRSAContentSignerBuilder;
-import org.bouncycastle.operator.bc.BcRSAContentVerifierProviderBuilder;
-import org.bouncycastle.operator.jcajce.JcaContentSignerBuilder;
-import org.bouncycastle.operator.jcajce.JcaContentVerifierProviderBuilder;
-import org.bouncycastle.util.encoders.Base64;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-import org.bouncycastle.x509.extension.AuthorityKeyIdentifierStructure;
-import org.bouncycastle.x509.extension.X509ExtensionUtil;
-
-public class CertTest
-    extends SimpleTest
-{
-    private static final String BC = org.bouncycastle.jce.provider.BouncyCastleProvider.PROVIDER_NAME;
-
-    // test CA
-    byte[] testCAp12 = Base64.decode(
-        "MIACAQMwgAYJKoZIhvcNAQcBoIAkgASCA+gwgDCABgkqhkiG9w0BBwGggCSA"
-      + "BIID6DCCCFIwggL/BgsqhkiG9w0BDAoBAqCCArIwggKuMCgGCiqGSIb3DQEM"
-      + "AQMwGgQUjWJR94N+oDQ1XlXO/kUSwu3UOL0CAgQABIICgFjzMa65mpNKYQRA"
-      + "+avbnOjYZ7JkTA5XY7CBcOVwNySY6/ye5Ms6VYl7mCgqzzdDQhT02Th8wXMr"
-      + "fibaC5E/tJRfdWt1zYr9NTLxLG6iCNPXJGGV6aXznv+UFTnzbzGGIAf0zpYf"
-      + "DOOUMusnBeJO2GVETk6DyjtVqx0sLAJKDZQadpao4K5mr5t4bz7zGoykoKNN"
-      + "TRH1tcrb6FYIPy5cf9vAHbyEB6pBdRjFQMYt50fpQGdQ8az9vvf6fLgQe20x"
-      + "e9PtDeqVU+5xNHeWauyVWIjp5penVkptAMYBr5qqNHfg1WuP2V1BO4SI/VWQ"
-      + "+EBKzlOjbH84KDVPDtOQGtmGYmZElxvfpz+S5rHajfzgIKQDT6Y4PTKPtMuF"
-      + "3OYcrVb7EKhTv1lXEQcNrR2+Apa4r2SZnTBq+1JeAGMNzwsMbAEcolljNiVs"
-      + "Lbvxng/WYTBb7+v8EjhthVdyMIY9KoKLXWMtfadEchRPqHGcEJDJ0BlwaVcn"
-      + "UQrexG/UILyVCaKc8yZOI9plAquDx2bGHi6FI4LdToAllX6gX2GncTeuCSuo"
-      + "o0//DBO3Hj7Pj5sGPZsSqzVQ1kH90/jResUN3vm09WtXKo8TELmmjA1yMqXe"
-      + "1r0mP6uN+yvjF1djC9SjovIh/jOG2RiqRy7bGtPRRchgIJCJlC1UoWygJpD6"
-      + "5dlzKMnQLikJ5BhsCIx2F96rmQXXKd7pIwCH7tiKHefQrszHpYO7QvBhwLsk"
-      + "y1bUnakLrgF3wdgwGGxbmuE9mNRVh3piVLGtVw6pH/9jOjmJ6JPbZ8idOpl5"
-      + "fEXOc81CFHTwv/U4oTfjKej4PTCZr58tYO6DdhA5XoEGNmjv4rgZJH1m6iUx"
-      + "OjATBgkqhkiG9w0BCRQxBh4EAGMAYTAjBgkqhkiG9w0BCRUxFgQUKBwy0CF7"
-      + "51A+BhNFCrsws2AG0nYwggVLBgsqhkiG9w0BDAoBAqCCBPowggT2MCgGCiqG"
-      + "SIb3DQEMAQMwGgQUf9t4IA/TP6OsH4GCiDg1BsRCqTwCAgQABIIEyHjGPJZg"
-      + "zhkF93/jM4WTnQUgWOR3PlTmhUSKjyMCLUBSrICocLVsz316NHPT3lqr0Lu2"
-      + "eKXlE5GRDp/c8RToTzMvEDdwi2PHP8sStrGJa1ruNRpOMnVAj8gnyd5KcyYJ"
-      + "3j+Iv/56hzPFXsZMg8gtbPphRxb3xHEZj/xYXYfUhfdElezrBIID6LcWRZS2"
-      + "MuuVddZToLOIdVWSTDZLscR6BIID6Ok+m+VC82JjvLNK4pZqO7Re9s/KAxV9"
-      + "f3wfJ7C7kmr8ar4Mlp9jYfO11lCcBEL86sM93JypgayWp53NN2nYQjnQDafR"
-      + "NrtlthQuR36ir2DEuSp4ySqsSXX/nD3AVOvrpbN88RUIK8Yx36tRaBOBL8tv"
-      + "9aKDfgpWKK4NHxA7V3QkHCAVqLpUZlIvVqEcvjNpzn6ydDQLGk7x5itNlWdn"
-      + "Kq/LfgMlXrTY/kKC4k7xogFS/FRIR10NP3lU+vAEa5T299QZv7c7n2OSVg6K"
-      + "xEXwjYNhfsLP3PlaCppouc2xsq/zSvymZPWsVztuoMwEfVeTtoSEUU8cqOiw"
-      + "Q1NpGtvrO1R28uRdelAVcrIu0qBAbdB5xb+xMfMhVhk7iuSZsYzKJVjK1CNK"
-      + "4w+zNqfkZQQOdh1Qj1t5u/22HDTSzZKTot4brIywo6lxboFE0IDJwU8y62vF"
-      + "4PEBPJDeXBuzbqurQhMS19J8h9wjw2quPAJ0E8dPR5B/1qPAuWYs1i2z2AtL"
-      + "FwNU2B+u53EpI4kM/+Wh3wPZ7lxlXcooUc3+5tZdBqcN+s1A2JU5fkMu05/J"
-      + "FSMG89+L5cwygPZssQ0uQFMqIpbbJp2IF76DYvVOdMnnWMgmw4n9sTcLb7Tf"
-      + "GZAQEr3OLtXHxTAX6WnQ1rdDMiMGTvx4Kj1JrtENPI8Y7m6bhIfSuwUk4v3j"
-      + "/DlPmCzGKsZHfjUvaqiZ/Kg+V4gdOMiIlhUwrR3jbxrX1xXNJ+RjwQzC0wX8"
-      + "C8kGF4hK/DUil20EVZNmrTgqsBBqKLMKDNM7rGhyadlG1eg55rJL07ROmXfY"
-      + "PbMtgPQBVVGcvM58jsW8NlCF5XUBNVSOfNSePUOOccPMTCt4VqRZobciIn7i"
-      + "G6lGby6sS8KMRxmnviLWNVWqWyxjFhuv3S8zVplFmzJR7oXk8bcGW9QV93yN"
-      + "fceR9ZVQdEITPTqVE3r2sgrzgFYZAJ+tMzDfkL4NcSBnivfCS1APRttG1RHJ"
-      + "6nxjpf1Ya6CGkM17BdAeEtdXqBb/0B9n0hgPA8EIe5hfL+cGRx4aO8HldCMb"
-      + "YQUFIOFmuj4xn83eFSlh2zllSVaVj0epIqtcXWWefVpjZKlOgoivrTy9JSGp"
-      + "fbsDw/xZMPGYHehbtm60alZK/t4yrfyGLkeWq7FjK31WfIgx9KAEQM4G1cPx"
-      + "dX6Jj0YdoWKrJh7GdqoCSdrwtR5NkG8ecuYPm9P+UUFg+nbcqR7zWVv0MulQ"
-      + "X4LQoKN8iOXZYZDmKbgLYdh4BY8bqVELaHFZ3rU33EUoATO+43IQXHq5qyB5"
-      + "xJVvT6AEggPo0DNHyUyRNMHoT3feYuDiQszN/4N5qVLZL6UeBIGGwmAQq7CK"
-      + "2A2P67/7bjze+LZcvXgoBmkKPn9hVembyEPwow6wGVhrGDWiEvdNE/Tp3n6D"
-      + "NqLIOhnWfTnsinWNXIlqxa6V/jE+MBcGCSqGSIb3DQEJFDEKHggAcgBvAG8A"
-      + "dDAjBgkqhkiG9w0BCRUxFgQUioImRvGskdQCWPVdgD2wKGBiE/0AAAAAAAAw"
-      + "gAYJKoZIhvcNAQcGoIAwgAIBADCABgkqhkiG9w0BBwEwKAYKKoZIhvcNAQwB"
-      + "BjAaBBTOsaVE8IK7OpXHzfobYSfBfnKvTwICBACggASCCLirl2JOsxIiKwDT"
-      + "/iW4D7qRq4W2mdXiLuH8RTJzfARcWtfWRrszakA6Fi0WAsslor3EYMgBpNtJ"
-      + "yctpSfAO2ToEWNlzqRNffiy1UvxC7Pxo9coaDBfsD9hi253dxsCS+fkGlywA"
-      + "eSlHJ2JEhDz7Y7CO6i95LzvZTzz7075UZvSP5FcVjNlKyfDMVVN3tPXl5/Ej"
-      + "4l/rakdyg72d/ajx/VaG5S81Oy2sjTdG+j6G7aMgpAx7dkgiNr65f9rLU7M9"
-      + "sm24II3RZzfUcjHHSZUvwtXIJSBnHkYft7GqzCFHnikLapFh9ObMdc4qTQQA"
-      + "H7Upo0WD/rxgdKN0Bdj9BLZHm1Ixca6rBVOecg80t/kFXipwBihMUmPbHlWB"
-      + "UGjX1kDRyfvqlcDDWr7elGenqNX1qTYCGi41ChLC9igaQRP48NI3aqgx0bu4"
-      + "P2G19T+/E7UZrCc8VIlKUEGRNKSqVtC7IlqyoLdPms9TXzrYJkklB0m23VXI"
-      + "PyJ5MmmRFXOAtLXwqnLGNLYcafbS2F4MPOjkclWgEtOHKmJctBRI14eMlpN2"
-      + "gBMTYxVkOG7ehUtMbWnjTvivqRxsYPmRCC+m7wiHQodtm2fgJtfwhpRSmLu1"
-      + "/KHohc6ESh62ACsn8nfBthsbzuDxV0fsCgbUDomjWpGs+nBgZFYGAkE1z2Ao"
-      + "Xd7CvA3PZJ5HFtyJrEu8VAbCtU5ZLjXzbALiJ7BqJdzigqsxeieabsR+GCKz"
-      + "Drwk1RltTIZnP3EeQbD+mGPa2BjchseaaLNMVDngkc91Zdg2j18dfIabG4AS"
-      + "CvfM4DfwPdwD2UT48V8608u5OWc7O2sIcxVWv1IrbEFLSKchTPPnfKmdDji3"
-      + "LEoD6t1VPYfn0Ch/NEANOLdncsOUDzQCWscA3+6pkfH8ZaCxfyUU/SHGYKkW"
-      + "7twRpR9ka3Wr7rjMjmT0c24YNIUx9ZDt7iquCAdyRHHc13JQ+IWaoqo1z3b8"
-      + "tz6AIfm1dWgcMlzEAc80Jg/SdASCA+g2sROpkVxAyhOY/EIp1Fm+PSIPQ5dE"
-      + "r5wV7ne2gr40Zuxs5Mrra9Jm79hrErhe4nepA6/DkcHqVDW5sqDwSgLuwVui"
-      + "I2yjBt4xBShc6jUxKTRN43cMlZa4rKaEF636gBMUZHDD+zTRE5rtHKFggvwc"
-      + "LiitHXI+Fg9mH/h0cQRDYebc02bQikxKagfeUxm0DbEFH172VV+4L69MP6SY"
-      + "eyMyRyBXNvLBKDVI5klORE7ZMJGCf2pi3vQr+tSM3W51QmK3HuL+tcish4QW"
-      + "WOxVimmczo7tT/JPwSWcklTV4uvnAVLEfptl66Bu9I2/Kn3yPWElAoQvHjMD"
-      + "O47+CVcuhgX5OXt0Sy8OX09j733FG4XFImnBneae6FrxNoi3tMRyHaIwBjIo"
-      + "8VvqhWjPIJKytMT2/42TpsuD4Pj64m77sIx0rAjmU7s0kG4YdkgeSi+1R4X7"
-      + "hkEFVJe3fId7/sItU2BMHkQGBDELAP7gJFzqTLDuSoiVNJ6kB6vkC+VQ7nmn"
-      + "0xyzrOTNcrSBGc2dCXEI6eYi8/2K9y7ZS9dOEUi8SHfc4WNT4EJ8Qsvn61EW"
-      + "jM8Ye5av/t3iE8NGtiMbbsIorEweL8y88vEMkgqZ7MpLbb2iiAv8Zm16GWAv"
-      + "GRD7rUJfi/3dcXiskUCOg5rIRcn2ImVehqKAPArLbLAx7NJ6UZmB+99N3DpH"
-      + "Jk81BkWPwQF8UlPdwjQh7qJUHTjEYAQI2wmL2jttToq59g3xbrLVUM/5X2Xy"
-      + "Fy619lDydw0TZiGq8zA39lwT92WpziDeV5/vuj2gpcFs3f0cUSJlPsw7Y0mE"
-      + "D/uPk7Arn/iP1oZboM9my/H3tm3rOP5xYxkXI/kVsNucTMLwd4WWdtKk3DLg"
-      + "Ms1tcEdAUQ/ZJ938OJf1uzSixDhlMVedweIJMw72V9VpWUf+QC+SHOvGpdSz"
-      + "2a7mU340J0rsQp7HnS71XWPjtxVCN0Mva+gnF+VTEnamQFEETrEydaqFYQEh"
-      + "im5qr32YOiQiwdrIXJ+p9bNxAbaDBmBI/1bdDU9ffr+AGrxxgjvYGiUQk0d/"
-      + "SDvxlE+S9EZlTWirRatglklVndYdkzJDte7ZJSgjlXkbTgy++QW/xRQ0Ya3o"
-      + "ouQepoTkJ2b48ELe4KCKKTOfR0fTzd0578hSdpYuOCylYBZeuLIo6JH3VeoV"
-      + "dggXMYHtYPuj+ABN3utwP/5s5LZ553sMkI/0bJq8ytE/+BFh1rTbRksAuT6B"
-      + "d98lpDAXjyM1HcKD78YiXotdSISU+pYkIbyn4UG8SKzV9mCxAed1cgjE1BWW"
-      + "DUB+xwlFMQTFpj8fhhYYMcwUF8tmv22Snemkaq3pjJKPBIIB7/jK7pfLMSSS"
-      + "5ojMvWzu9mTegbl9v2K73XqZ/N4LZ5BqxnMdCBM4cCbA2LMwX8WAVlKper6X"
-      + "zdTxRf4SWuzzlOXIyhWaH1g9Yp3PkaWh/BpPne/DXZmfyrTCPWGlbu1oqdKq"
-      + "CgORN9B0+biTWiqgozvtbnCkK+LXqRYbghsWNlOhpm5NykUl7T2xRswYK8gz"
-      + "5vq/xCY5hq+TvgZOT0Fzx426nbNqyGmdjbCpPf2t4s5o3C48WhNSg3vSSJes"
-      + "RVJ4dV1TfXkytIKk/gzLafJfS+AcLeE48MyCOohhLFHdYC9f+lrk51xEANTc"
-      + "xpn26JO1sO7iha8iccRmMYwi6tgDRVKFp6X5VVHXy8hXzxEbWWFL/GkUIjyD"
-      + "hm0KXaarhP9Iah+/j6CI6eVLIhyMsA5itsYX+bJ0I8KmVkXelbwX7tcwSUAs"
-      + "0Wq8oiV8Mi+DawkhTWE2etz07uMseR71jHEr7KE6WXo+SO995Xyop74fLtje"
-      + "GLZroH91GWF4rDZvTJg9l8319oqF0DJ7bTukl3CJqVS3sVNrRIF33vRsmqWL"
-      + "BaaZ1Q8Bt04L19Ka2HsEYLMfTLPGO7HSb9baHezRCQTnVoABm+8iZEXj3Od9"
-      + "ga9TnxFa5KhXerqUscjdXPauElDwmqGhCgAAAAAAAAAAAAAAAAAAAAAAADA9"
-      + "MCEwCQYFKw4DAhoFAAQUWT4N9h+ObRftdP8+GldXCQRf9JoEFDjO/tjAH7We"
-      + "HLhcYQcQ1R+RucctAgIEAAAA");
-
-    //
-    // server.crt
-    //
-    byte[]  cert1 = Base64.decode(
-           "MIIDXjCCAsegAwIBAgIBBzANBgkqhkiG9w0BAQQFADCBtzELMAkGA1UEBhMCQVUx"
-         + "ETAPBgNVBAgTCFZpY3RvcmlhMRgwFgYDVQQHEw9Tb3V0aCBNZWxib3VybmUxGjAY"
-         + "BgNVBAoTEUNvbm5lY3QgNCBQdHkgTHRkMR4wHAYDVQQLExVDZXJ0aWZpY2F0ZSBB"
-         + "dXRob3JpdHkxFTATBgNVBAMTDENvbm5lY3QgNCBDQTEoMCYGCSqGSIb3DQEJARYZ"
-         + "d2VibWFzdGVyQGNvbm5lY3Q0LmNvbS5hdTAeFw0wMDA2MDIwNzU2MjFaFw0wMTA2"
-         + "MDIwNzU2MjFaMIG4MQswCQYDVQQGEwJBVTERMA8GA1UECBMIVmljdG9yaWExGDAW"
-         + "BgNVBAcTD1NvdXRoIE1lbGJvdXJuZTEaMBgGA1UEChMRQ29ubmVjdCA0IFB0eSBM"
-         + "dGQxFzAVBgNVBAsTDldlYnNlcnZlciBUZWFtMR0wGwYDVQQDExR3d3cyLmNvbm5l"
-         + "Y3Q0LmNvbS5hdTEoMCYGCSqGSIb3DQEJARYZd2VibWFzdGVyQGNvbm5lY3Q0LmNv"
-         + "bS5hdTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEArvDxclKAhyv7Q/Wmr2re"
-         + "Gw4XL9Cnh9e+6VgWy2AWNy/MVeXdlxzd7QAuc1eOWQkGQEiLPy5XQtTY+sBUJ3AO"
-         + "Rvd2fEVJIcjf29ey7bYua9J/vz5MG2KYo9/WCHIwqD9mmG9g0xLcfwq/s8ZJBswE"
-         + "7sb85VU+h94PTvsWOsWuKaECAwEAAaN3MHUwJAYDVR0RBB0wG4EZd2VibWFzdGVy"
-         + "QGNvbm5lY3Q0LmNvbS5hdTA6BglghkgBhvhCAQ0ELRYrbW9kX3NzbCBnZW5lcmF0"
-         + "ZWQgY3VzdG9tIHNlcnZlciBjZXJ0aWZpY2F0ZTARBglghkgBhvhCAQEEBAMCBkAw"
-         + "DQYJKoZIhvcNAQEEBQADgYEAotccfKpwSsIxM1Hae8DR7M/Rw8dg/RqOWx45HNVL"
-         + "iBS4/3N/TO195yeQKbfmzbAA2jbPVvIvGgTxPgO1MP4ZgvgRhasaa0qCJCkWvpM4"
-         + "yQf33vOiYQbpv4rTwzU8AmRlBG45WdjyNIigGV+oRc61aKCTnLq7zB8N3z1TF/bF"
-         + "5/8=");
-
-    //
-    // ca.crt
-    //
-    byte[]  cert2 = Base64.decode(
-           "MIIDbDCCAtWgAwIBAgIBADANBgkqhkiG9w0BAQQFADCBtzELMAkGA1UEBhMCQVUx"
-         + "ETAPBgNVBAgTCFZpY3RvcmlhMRgwFgYDVQQHEw9Tb3V0aCBNZWxib3VybmUxGjAY"
-         + "BgNVBAoTEUNvbm5lY3QgNCBQdHkgTHRkMR4wHAYDVQQLExVDZXJ0aWZpY2F0ZSBB"
-         + "dXRob3JpdHkxFTATBgNVBAMTDENvbm5lY3QgNCBDQTEoMCYGCSqGSIb3DQEJARYZ"
-         + "d2VibWFzdGVyQGNvbm5lY3Q0LmNvbS5hdTAeFw0wMDA2MDIwNzU1MzNaFw0wMTA2"
-         + "MDIwNzU1MzNaMIG3MQswCQYDVQQGEwJBVTERMA8GA1UECBMIVmljdG9yaWExGDAW"
-         + "BgNVBAcTD1NvdXRoIE1lbGJvdXJuZTEaMBgGA1UEChMRQ29ubmVjdCA0IFB0eSBM"
-         + "dGQxHjAcBgNVBAsTFUNlcnRpZmljYXRlIEF1dGhvcml0eTEVMBMGA1UEAxMMQ29u"
-         + "bmVjdCA0IENBMSgwJgYJKoZIhvcNAQkBFhl3ZWJtYXN0ZXJAY29ubmVjdDQuY29t"
-         + "LmF1MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDgs5ptNG6Qv1ZpCDuUNGmv"
-         + "rhjqMDPd3ri8JzZNRiiFlBA4e6/ReaO1U8ASewDeQMH6i9R6degFdQRLngbuJP0s"
-         + "xcEE+SksEWNvygfzLwV9J/q+TQDyJYK52utb++lS0b48A1KPLwEsyL6kOAgelbur"
-         + "ukwxowprKUIV7Knf1ajetQIDAQABo4GFMIGCMCQGA1UdEQQdMBuBGXdlYm1hc3Rl"
-         + "ckBjb25uZWN0NC5jb20uYXUwDwYDVR0TBAgwBgEB/wIBADA2BglghkgBhvhCAQ0E"
-         + "KRYnbW9kX3NzbCBnZW5lcmF0ZWQgY3VzdG9tIENBIGNlcnRpZmljYXRlMBEGCWCG"
-         + "SAGG+EIBAQQEAwICBDANBgkqhkiG9w0BAQQFAAOBgQCsGvfdghH8pPhlwm1r3pQk"
-         + "msnLAVIBb01EhbXm2861iXZfWqGQjrGAaA0ZpXNk9oo110yxoqEoSJSzniZa7Xtz"
-         + "soTwNUpE0SLHvWf/SlKdFWlzXA+vOZbzEv4UmjeelekTm7lc01EEa5QRVzOxHFtQ"
-         + "DhkaJ8VqOMajkQFma2r9iA==");
-
-    //
-    // testx509.pem
-    //
-    byte[]  cert3 = Base64.decode(
-           "MIIBWzCCAQYCARgwDQYJKoZIhvcNAQEEBQAwODELMAkGA1UEBhMCQVUxDDAKBgNV"
-         + "BAgTA1FMRDEbMBkGA1UEAxMSU1NMZWF5L3JzYSB0ZXN0IENBMB4XDTk1MDYxOTIz"
-         + "MzMxMloXDTk1MDcxNzIzMzMxMlowOjELMAkGA1UEBhMCQVUxDDAKBgNVBAgTA1FM"
-         + "RDEdMBsGA1UEAxMUU1NMZWF5L3JzYSB0ZXN0IGNlcnQwXDANBgkqhkiG9w0BAQEF"
-         + "AANLADBIAkEAqtt6qS5GTxVxGZYWa0/4u+IwHf7p2LNZbcPBp9/OfIcYAXBQn8hO"
-         + "/Re1uwLKXdCjIoaGs4DLdG88rkzfyK5dPQIDAQABMAwGCCqGSIb3DQIFBQADQQAE"
-         + "Wc7EcF8po2/ZO6kNCwK/ICH6DobgLekA5lSLr5EvuioZniZp5lFzAw4+YzPQ7XKJ"
-         + "zl9HYIMxATFyqSiD9jsx");
-
-    //
-    // v3-cert1.pem
-    //
-    byte[]  cert4 = Base64.decode(
-           "MIICjTCCAfigAwIBAgIEMaYgRzALBgkqhkiG9w0BAQQwRTELMAkGA1UEBhMCVVMx"
-         + "NjA0BgNVBAoTLU5hdGlvbmFsIEFlcm9uYXV0aWNzIGFuZCBTcGFjZSBBZG1pbmlz"
-         + "dHJhdGlvbjAmFxE5NjA1MjgxMzQ5MDUrMDgwMBcROTgwNTI4MTM0OTA1KzA4MDAw"
-         + "ZzELMAkGA1UEBhMCVVMxNjA0BgNVBAoTLU5hdGlvbmFsIEFlcm9uYXV0aWNzIGFu"
-         + "ZCBTcGFjZSBBZG1pbmlzdHJhdGlvbjEgMAkGA1UEBRMCMTYwEwYDVQQDEwxTdGV2"
-         + "ZSBTY2hvY2gwWDALBgkqhkiG9w0BAQEDSQAwRgJBALrAwyYdgxmzNP/ts0Uyf6Bp"
-         + "miJYktU/w4NG67ULaN4B5CnEz7k57s9o3YY3LecETgQ5iQHmkwlYDTL2fTgVfw0C"
-         + "AQOjgaswgagwZAYDVR0ZAQH/BFowWDBWMFQxCzAJBgNVBAYTAlVTMTYwNAYDVQQK"
-         + "Ey1OYXRpb25hbCBBZXJvbmF1dGljcyBhbmQgU3BhY2UgQWRtaW5pc3RyYXRpb24x"
-         + "DTALBgNVBAMTBENSTDEwFwYDVR0BAQH/BA0wC4AJODMyOTcwODEwMBgGA1UdAgQR"
-         + "MA8ECTgzMjk3MDgyM4ACBSAwDQYDVR0KBAYwBAMCBkAwCwYJKoZIhvcNAQEEA4GB"
-         + "AH2y1VCEw/A4zaXzSYZJTTUi3uawbbFiS2yxHvgf28+8Js0OHXk1H1w2d6qOHH21"
-         + "X82tZXd/0JtG0g1T9usFFBDvYK8O0ebgz/P5ELJnBL2+atObEuJy1ZZ0pBDWINR3"
-         + "WkDNLCGiTkCKp0F5EWIrVDwh54NNevkCQRZita+z4IBO");
-
-    //
-    // v3-cert2.pem
-    //
-    byte[]  cert5 = Base64.decode(
-           "MIICiTCCAfKgAwIBAgIEMeZfHzANBgkqhkiG9w0BAQQFADB9MQswCQYDVQQGEwJD"
-         + "YTEPMA0GA1UEBxMGTmVwZWFuMR4wHAYDVQQLExVObyBMaWFiaWxpdHkgQWNjZXB0"
-         + "ZWQxHzAdBgNVBAoTFkZvciBEZW1vIFB1cnBvc2VzIE9ubHkxHDAaBgNVBAMTE0Vu"
-         + "dHJ1c3QgRGVtbyBXZWIgQ0EwHhcNOTYwNzEyMTQyMDE1WhcNOTYxMDEyMTQyMDE1"
-         + "WjB0MSQwIgYJKoZIhvcNAQkBExVjb29rZUBpc3NsLmF0bC5ocC5jb20xCzAJBgNV"
-         + "BAYTAlVTMScwJQYDVQQLEx5IZXdsZXR0IFBhY2thcmQgQ29tcGFueSAoSVNTTCkx"
-         + "FjAUBgNVBAMTDVBhdWwgQS4gQ29va2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEA"
-         + "6ceSq9a9AU6g+zBwaL/yVmW1/9EE8s5you1mgjHnj0wAILuoB3L6rm6jmFRy7QZT"
-         + "G43IhVZdDua4e+5/n1ZslwIDAQABo2MwYTARBglghkgBhvhCAQEEBAMCB4AwTAYJ"
-         + "YIZIAYb4QgENBD8WPVRoaXMgY2VydGlmaWNhdGUgaXMgb25seSBpbnRlbmRlZCBm"
-         + "b3IgZGVtb25zdHJhdGlvbiBwdXJwb3Nlcy4wDQYJKoZIhvcNAQEEBQADgYEAi8qc"
-         + "F3zfFqy1sV8NhjwLVwOKuSfhR/Z8mbIEUeSTlnH3QbYt3HWZQ+vXI8mvtZoBc2Fz"
-         + "lexKeIkAZXCesqGbs6z6nCt16P6tmdfbZF3I3AWzLquPcOXjPf4HgstkyvVBn0Ap"
-         + "jAFN418KF/Cx4qyHB4cjdvLrRjjQLnb2+ibo7QU=");
-
-    //
-    // pem encoded pkcs7
-    //
-    byte[]  cert6 = Base64.decode(
-          "MIAGCSqGSIb3DQEHAqCAMIACAQExCzAJBgUrDgMCGgUAMIAGCSqGSIb3DQEHAQAAoIIJbzCCAj0w"
-        + "ggGmAhEAzbp/VvDf5LxU/iKss3KqVTANBgkqhkiG9w0BAQIFADBfMQswCQYDVQQGEwJVUzEXMBUG"
-        + "A1UEChMOVmVyaVNpZ24sIEluYy4xNzA1BgNVBAsTLkNsYXNzIDEgUHVibGljIFByaW1hcnkgQ2Vy"
-        + "dGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNOTYwMTI5MDAwMDAwWhcNMjgwODAxMjM1OTU5WjBfMQsw"
-        + "CQYDVQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xNzA1BgNVBAsTLkNsYXNzIDEgUHVi"
-        + "bGljIFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwgZ8wDQYJKoZIhvcNAQEBBQADgY0A"
-        + "MIGJAoGBAOUZv22jVmEtmUhx9mfeuY3rt56GgAqRDvo4Ja9GiILlc6igmyRdDR/MZW4MsNBWhBiH"
-        + "mgabEKFz37RYOWtuwfYV1aioP6oSBo0xrH+wNNePNGeICc0UEeJORVZpH3gCgNrcR5EpuzbJY1zF"
-        + "4Ncth3uhtzKwezC6Ki8xqu6jZ9rbAgMBAAEwDQYJKoZIhvcNAQECBQADgYEATD+4i8Zo3+5DMw5d"
-        + "6abLB4RNejP/khv0Nq3YlSI2aBFsfELM85wuxAc/FLAPT/+Qknb54rxK6Y/NoIAK98Up8YIiXbix"
-        + "3YEjo3slFUYweRb46gVLlH8dwhzI47f0EEA8E8NfH1PoSOSGtHuhNbB7Jbq4046rPzidADQAmPPR"
-        + "cZQwggMuMIICl6ADAgECAhEA0nYujRQMPX2yqCVdr+4NdTANBgkqhkiG9w0BAQIFADBfMQswCQYD"
-        + "VQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xNzA1BgNVBAsTLkNsYXNzIDEgUHVibGlj"
-        + "IFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNOTgwNTEyMDAwMDAwWhcNMDgwNTEy"
-        + "MjM1OTU5WjCBzDEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRy"
-        + "dXN0IE5ldHdvcmsxRjBEBgNVBAsTPXd3dy52ZXJpc2lnbi5jb20vcmVwb3NpdG9yeS9SUEEgSW5j"
-        + "b3JwLiBCeSBSZWYuLExJQUIuTFREKGMpOTgxSDBGBgNVBAMTP1ZlcmlTaWduIENsYXNzIDEgQ0Eg"
-        + "SW5kaXZpZHVhbCBTdWJzY3JpYmVyLVBlcnNvbmEgTm90IFZhbGlkYXRlZDCBnzANBgkqhkiG9w0B"
-        + "AQEFAAOBjQAwgYkCgYEAu1pEigQWu1X9A3qKLZRPFXg2uA1Ksm+cVL+86HcqnbnwaLuV2TFBcHqB"
-        + "S7lIE1YtxwjhhEKrwKKSq0RcqkLwgg4C6S/7wju7vsknCl22sDZCM7VuVIhPh0q/Gdr5FegPh7Yc"
-        + "48zGmo5/aiSS4/zgZbqnsX7vyds3ashKyAkG5JkCAwEAAaN8MHowEQYJYIZIAYb4QgEBBAQDAgEG"
-        + "MEcGA1UdIARAMD4wPAYLYIZIAYb4RQEHAQEwLTArBggrBgEFBQcCARYfd3d3LnZlcmlzaWduLmNv"
-        + "bS9yZXBvc2l0b3J5L1JQQTAPBgNVHRMECDAGAQH/AgEAMAsGA1UdDwQEAwIBBjANBgkqhkiG9w0B"
-        + "AQIFAAOBgQCIuDc73dqUNwCtqp/hgQFxHpJqbS/28Z3TymQ43BuYDAeGW4UVag+5SYWklfEXfWe0"
-        + "fy0s3ZpCnsM+tI6q5QsG3vJWKvozx74Z11NMw73I4xe1pElCY+zCphcPXVgaSTyQXFWjZSAA/Rgg"
-        + "5V+CprGoksVYasGNAzzrw80FopCubjCCA/gwggNhoAMCAQICEBbbn/1G1zppD6KsP01bwywwDQYJ"
-        + "KoZIhvcNAQEEBQAwgcwxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJpU2ln"
-        + "biBUcnVzdCBOZXR3b3JrMUYwRAYDVQQLEz13d3cudmVyaXNpZ24uY29tL3JlcG9zaXRvcnkvUlBB"
-        + "IEluY29ycC4gQnkgUmVmLixMSUFCLkxURChjKTk4MUgwRgYDVQQDEz9WZXJpU2lnbiBDbGFzcyAx"
-        + "IENBIEluZGl2aWR1YWwgU3Vic2NyaWJlci1QZXJzb25hIE5vdCBWYWxpZGF0ZWQwHhcNMDAxMDAy"
-        + "MDAwMDAwWhcNMDAxMjAxMjM1OTU5WjCCAQcxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYD"
-        + "VQQLExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMUYwRAYDVQQLEz13d3cudmVyaXNpZ24uY29tL3Jl"
-        + "cG9zaXRvcnkvUlBBIEluY29ycC4gYnkgUmVmLixMSUFCLkxURChjKTk4MR4wHAYDVQQLExVQZXJz"
-        + "b25hIE5vdCBWYWxpZGF0ZWQxJzAlBgNVBAsTHkRpZ2l0YWwgSUQgQ2xhc3MgMSAtIE1pY3Jvc29m"
-        + "dDETMBEGA1UEAxQKRGF2aWQgUnlhbjElMCMGCSqGSIb3DQEJARYWZGF2aWRAbGl2ZW1lZGlhLmNv"
-        + "bS5hdTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAqxBsdeNmSvFqhMNwhQgNzM8mdjX9eSXb"
-        + "DawpHtQHjmh0AKJSa3IwUY0VIsyZHuXWktO/CgaMBVPt6OVf/n0R2sQigMP6Y+PhEiS0vCJBL9aK"
-        + "0+pOo2qXrjVBmq+XuCyPTnc+BOSrU26tJsX0P9BYorwySiEGxGanBNATdVL4NdUCAwEAAaOBnDCB"
-        + "mTAJBgNVHRMEAjAAMEQGA1UdIAQ9MDswOQYLYIZIAYb4RQEHAQgwKjAoBggrBgEFBQcCARYcaHR0"
-        + "cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYTARBglghkgBhvhCAQEEBAMCB4AwMwYDVR0fBCwwKjAo"
-        + "oCagJIYiaHR0cDovL2NybC52ZXJpc2lnbi5jb20vY2xhc3MxLmNybDANBgkqhkiG9w0BAQQFAAOB"
-        + "gQBC8yIIdVGpFTf8/YiL14cMzcmL0nIRm4kGR3U59z7UtcXlfNXXJ8MyaeI/BnXwG/gD5OKYqW6R"
-        + "yca9vZOxf1uoTBl82gInk865ED3Tej6msCqFzZffnSUQvOIeqLxxDlqYRQ6PmW2nAnZeyjcnbI5Y"
-        + "syQSM2fmo7n6qJFP+GbFezGCAkUwggJBAgEBMIHhMIHMMRcwFQYDVQQKEw5WZXJpU2lnbiwgSW5j"
-        + "LjEfMB0GA1UECxMWVmVyaVNpZ24gVHJ1c3QgTmV0d29yazFGMEQGA1UECxM9d3d3LnZlcmlzaWdu"
-        + "LmNvbS9yZXBvc2l0b3J5L1JQQSBJbmNvcnAuIEJ5IFJlZi4sTElBQi5MVEQoYyk5ODFIMEYGA1UE"
-        + "AxM/VmVyaVNpZ24gQ2xhc3MgMSBDQSBJbmRpdmlkdWFsIFN1YnNjcmliZXItUGVyc29uYSBOb3Qg"
-        + "VmFsaWRhdGVkAhAW25/9Rtc6aQ+irD9NW8MsMAkGBSsOAwIaBQCggbowGAYJKoZIhvcNAQkDMQsG"
-        + "CSqGSIb3DQEHATAcBgkqhkiG9w0BCQUxDxcNMDAxMDAyMTczNTE4WjAjBgkqhkiG9w0BCQQxFgQU"
-        + "gZjSaBEY2oxGvlQUIMnxSXhivK8wWwYJKoZIhvcNAQkPMU4wTDAKBggqhkiG9w0DBzAOBggqhkiG"
-        + "9w0DAgICAIAwDQYIKoZIhvcNAwICAUAwBwYFKw4DAgcwDQYIKoZIhvcNAwICASgwBwYFKw4DAh0w"
-        + "DQYJKoZIhvcNAQEBBQAEgYAzk+PU91/ZFfoiuKOECjxEh9fDYE2jfDCheBIgh5gdcCo+sS1WQs8O"
-        + "HreQ9Nop/JdJv1DQMBK6weNBBDoP0EEkRm1XCC144XhXZC82jBZohYmi2WvDbbC//YN58kRMYMyy"
-        + "srrfn4Z9I+6kTriGXkrpGk9Q0LSGjmG2BIsqiF0dvwAAAAAAAA==");
-
-    //
-    // dsaWithSHA1 cert
-    //
-    byte[]  cert7 = Base64.decode(
-          "MIIEXAYJKoZIhvcNAQcCoIIETTCCBEkCAQExCzAJBgUrDgMCGgUAMAsGCSqG"
-        + "SIb3DQEHAaCCAsMwggK/MIIB4AIBADCBpwYFKw4DAhswgZ0CQQEkJRHP+mN7"
-        + "d8miwTMN55CUSmo3TO8WGCxgY61TX5k+7NU4XPf1TULjw3GobwaJX13kquPh"
-        + "fVXk+gVy46n4Iw3hAhUBSe/QF4BUj+pJOF9ROBM4u+FEWA8CQQD4mSJbrABj"
-        + "TUWrlnAte8pS22Tq4/FPO7jHSqjijUHfXKTrHL1OEqV3SVWcFy5j/cqBgX/z"
-        + "m8Q12PFp/PjOhh+nMA4xDDAKBgNVBAMTA0lEMzAeFw05NzEwMDEwMDAwMDBa"
-        + "Fw0zODAxMDEwMDAwMDBaMA4xDDAKBgNVBAMTA0lEMzCB8DCBpwYFKw4DAhsw"
-        + "gZ0CQQEkJRHP+mN7d8miwTMN55CUSmo3TO8WGCxgY61TX5k+7NU4XPf1TULj"
-        + "w3GobwaJX13kquPhfVXk+gVy46n4Iw3hAhUBSe/QF4BUj+pJOF9ROBM4u+FE"
-        + "WA8CQQD4mSJbrABjTUWrlnAte8pS22Tq4/FPO7jHSqjijUHfXKTrHL1OEqV3"
-        + "SVWcFy5j/cqBgX/zm8Q12PFp/PjOhh+nA0QAAkEAkYkXLYMtGVGWj9OnzjPn"
-        + "sB9sefSRPrVegZJCZbpW+Iv0/1RP1u04pHG9vtRpIQLjzUiWvLMU9EKQTThc"
-        + "eNMmWDCBpwYFKw4DAhswgZ0CQQEkJRHP+mN7d8miwTMN55CUSmo3TO8WGCxg"
-        + "Y61TX5k+7NU4XPf1TULjw3GobwaJX13kquPhfVXk+gVy46n4Iw3hAhUBSe/Q"
-        + "F4BUj+pJOF9ROBM4u+FEWA8CQQD4mSJbrABjTUWrlnAte8pS22Tq4/FPO7jH"
-        + "SqjijUHfXKTrHL1OEqV3SVWcFy5j/cqBgX/zm8Q12PFp/PjOhh+nAy8AMCwC"
-        + "FBY3dBSdeprGcqpr6wr3xbG+6WW+AhRMm/facKJNxkT3iKgJbp7R8Xd3QTGC"
-        + "AWEwggFdAgEBMBMwDjEMMAoGA1UEAxMDSUQzAgEAMAkGBSsOAwIaBQCgXTAY"
-        + "BgkqhkiG9w0BCQMxCwYJKoZIhvcNAQcBMBwGCSqGSIb3DQEJBTEPFw0wMjA1"
-        + "MjQyMzEzMDdaMCMGCSqGSIb3DQEJBDEWBBS4WMsoJhf7CVbZYCFcjoTRzPkJ"
-        + "xjCBpwYFKw4DAhswgZ0CQQEkJRHP+mN7d8miwTMN55CUSmo3TO8WGCxgY61T"
-        + "X5k+7NU4XPf1TULjw3GobwaJX13kquPhfVXk+gVy46n4Iw3hAhUBSe/QF4BU"
-        + "j+pJOF9ROBM4u+FEWA8CQQD4mSJbrABjTUWrlnAte8pS22Tq4/FPO7jHSqji"
-        + "jUHfXKTrHL1OEqV3SVWcFy5j/cqBgX/zm8Q12PFp/PjOhh+nBC8wLQIVALID"
-        + "dt+MHwawrDrwsO1Z6sXBaaJsAhRaKssrpevmLkbygKPV07XiAKBG02Zvb2Jh"
-        + "cg==");
-
-    //
-    // testcrl.pem
-    //
-    byte[]  crl1 = Base64.decode(
-        "MIICjTCCAfowDQYJKoZIhvcNAQECBQAwXzELMAkGA1UEBhMCVVMxIDAeBgNVBAoT"
-        + "F1JTQSBEYXRhIFNlY3VyaXR5LCBJbmMuMS4wLAYDVQQLEyVTZWN1cmUgU2VydmVy"
-        + "IENlcnRpZmljYXRpb24gQXV0aG9yaXR5Fw05NTA1MDIwMjEyMjZaFw05NTA2MDEw"
-        + "MDAxNDlaMIIBaDAWAgUCQQAABBcNOTUwMjAxMTcyNDI2WjAWAgUCQQAACRcNOTUw"
-        + "MjEwMDIxNjM5WjAWAgUCQQAADxcNOTUwMjI0MDAxMjQ5WjAWAgUCQQAADBcNOTUw"
-        + "MjI1MDA0NjQ0WjAWAgUCQQAAGxcNOTUwMzEzMTg0MDQ5WjAWAgUCQQAAFhcNOTUw"
-        + "MzE1MTkxNjU0WjAWAgUCQQAAGhcNOTUwMzE1MTk0MDQxWjAWAgUCQQAAHxcNOTUw"
-        + "MzI0MTk0NDMzWjAWAgUCcgAABRcNOTUwMzI5MjAwNzExWjAWAgUCcgAAERcNOTUw"
-        + "MzMwMDIzNDI2WjAWAgUCQQAAIBcNOTUwNDA3MDExMzIxWjAWAgUCcgAAHhcNOTUw"
-        + "NDA4MDAwMjU5WjAWAgUCcgAAQRcNOTUwNDI4MTcxNzI0WjAWAgUCcgAAOBcNOTUw"
-        + "NDI4MTcyNzIxWjAWAgUCcgAATBcNOTUwNTAyMDIxMjI2WjANBgkqhkiG9w0BAQIF"
-        + "AAN+AHqOEJXSDejYy0UwxxrH/9+N2z5xu/if0J6qQmK92W0hW158wpJg+ovV3+wQ"
-        + "wvIEPRL2rocL0tKfAsVq1IawSJzSNgxG0lrcla3MrJBnZ4GaZDu4FutZh72MR3Gt"
-        + "JaAL3iTJHJD55kK2D/VoyY1djlsPuNh6AEgdVwFAyp0v");
-
-    //
-    // ecdsa cert with extra octet string.
-    //
-    byte[]  oldEcdsa = Base64.decode(
-          "MIICljCCAkCgAwIBAgIBATALBgcqhkjOPQQBBQAwgY8xCzAJBgNVBAYTAkFVMSgwJ"
-        + "gYDVQQKEx9UaGUgTGVnaW9uIG9mIHRoZSBCb3VuY3kgQ2FzdGxlMRIwEAYDVQQHEw"
-        + "lNZWxib3VybmUxETAPBgNVBAgTCFZpY3RvcmlhMS8wLQYJKoZIhvcNAQkBFiBmZWV"
-        + "kYmFjay1jcnlwdG9AYm91bmN5Y2FzdGxlLm9yZzAeFw0wMTEyMDcwMTAwMDRaFw0w"
-        + "MTEyMDcwMTAxNDRaMIGPMQswCQYDVQQGEwJBVTEoMCYGA1UEChMfVGhlIExlZ2lvb"
-        + "iBvZiB0aGUgQm91bmN5IENhc3RsZTESMBAGA1UEBxMJTWVsYm91cm5lMREwDwYDVQ"
-        + "QIEwhWaWN0b3JpYTEvMC0GCSqGSIb3DQEJARYgZmVlZGJhY2stY3J5cHRvQGJvdW5"
-        + "jeWNhc3RsZS5vcmcwgeQwgb0GByqGSM49AgEwgbECAQEwKQYHKoZIzj0BAQIef///"
-        + "////////////f///////gAAAAAAAf///////MEAEHn///////////////3///////"
-        + "4AAAAAAAH///////AQeawFsO9zxiUHQ1lSSFHXKcanbL7J9HTd5YYXClCwKBB8CD/"
-        + "qWPNyogWzMM7hkK+35BcPTWFc9Pyf7vTs8uaqvAh5///////////////9///+eXpq"
-        + "fXZBx+9FSJoiQnQsDIgAEHwJbbcU7xholSP+w9nFHLebJUhqdLSU05lq/y9X+DHAw"
-        + "CwYHKoZIzj0EAQUAA0MAMEACHnz6t4UNoVROp74ma4XNDjjGcjaqiIWPZLK8Bdw3G"
-        + "QIeLZ4j3a6ividZl344UH+UPUE7xJxlYGuy7ejTsqRR");
-
-    byte[]  uncompressedPtEC = Base64.decode(
-          "MIIDKzCCAsGgAwIBAgICA+kwCwYHKoZIzj0EAQUAMGYxCzAJBgNVBAYTAkpQ"
-        + "MRUwEwYDVQQKEwxuaXRlY2guYWMuanAxDjAMBgNVBAsTBWFpbGFiMQ8wDQYD"
-        + "VQQDEwZ0ZXN0Y2ExHzAdBgkqhkiG9w0BCQEWEHRlc3RjYUBsb2NhbGhvc3Qw"
-        + "HhcNMDExMDEzMTE1MzE3WhcNMjAxMjEyMTE1MzE3WjBmMQswCQYDVQQGEwJK"
-        + "UDEVMBMGA1UEChMMbml0ZWNoLmFjLmpwMQ4wDAYDVQQLEwVhaWxhYjEPMA0G"
-        + "A1UEAxMGdGVzdGNhMR8wHQYJKoZIhvcNAQkBFhB0ZXN0Y2FAbG9jYWxob3N0"
-        + "MIIBczCCARsGByqGSM49AgEwggEOAgEBMDMGByqGSM49AQECKEdYWnajFmnZ"
-        + "tzrukK2XWdle2v+GsD9l1ZiR6g7ozQDbhFH/bBiMDQcwVAQoJ5EQKrI54/CT"
-        + "xOQ2pMsd/fsXD+EX8YREd8bKHWiLz8lIVdD5cBNeVwQoMKSc6HfI7vKZp8Q2"
-        + "zWgIFOarx1GQoWJbMcSt188xsl30ncJuJT2OoARRBAqJ4fD+q6hbqgNSjTQ7"
-        + "htle1KO3eiaZgcJ8rrnyN8P+5A8+5K+H9aQ/NbBR4Gs7yto5PXIUZEUgodHA"
-        + "TZMSAcSq5ZYt4KbnSYaLY0TtH9CqAigEwZ+hglbT21B7ZTzYX2xj0x+qooJD"
-        + "hVTLtIPaYJK2HrMPxTw6/zfrAgEPA1IABAnvfFcFDgD/JicwBGn6vR3N8MIn"
-        + "mptZf/mnJ1y649uCF60zOgdwIyI7pVSxBFsJ7ohqXEHW0x7LrGVkdSEiipiH"
-        + "LYslqh3xrqbAgPbl93GUo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB"
-        + "/wQEAwIBxjAdBgNVHQ4EFgQUAEo62Xm9H6DcsE0zUDTza4BRG90wCwYHKoZI"
-        + "zj0EAQUAA1cAMFQCKAQsCHHSNOqfJXLgt3bg5+k49hIBGVr/bfG0B9JU3rNt"
-        + "Ycl9Y2zfRPUCKAK2ccOQXByAWfsasDu8zKHxkZv7LVDTFjAIffz3HaCQeVhD"
-        + "z+fauEg=");
-
-    byte[]  keyUsage = Base64.decode(
-          "MIIE7TCCBFagAwIBAgIEOAOR7jANBgkqhkiG9w0BAQQFADCByTELMAkGA1UE"
-        + "BhMCVVMxFDASBgNVBAoTC0VudHJ1c3QubmV0MUgwRgYDVQQLFD93d3cuZW50"
-        + "cnVzdC5uZXQvQ2xpZW50X0NBX0luZm8vQ1BTIGluY29ycC4gYnkgcmVmLiBs"
-        + "aW1pdHMgbGlhYi4xJTAjBgNVBAsTHChjKSAxOTk5IEVudHJ1c3QubmV0IExp"
-        + "bWl0ZWQxMzAxBgNVBAMTKkVudHJ1c3QubmV0IENsaWVudCBDZXJ0aWZpY2F0"
-        + "aW9uIEF1dGhvcml0eTAeFw05OTEwMTIxOTI0MzBaFw0xOTEwMTIxOTU0MzBa"
-        + "MIHJMQswCQYDVQQGEwJVUzEUMBIGA1UEChMLRW50cnVzdC5uZXQxSDBGBgNV"
-        + "BAsUP3d3dy5lbnRydXN0Lm5ldC9DbGllbnRfQ0FfSW5mby9DUFMgaW5jb3Jw"
-        + "LiBieSByZWYuIGxpbWl0cyBsaWFiLjElMCMGA1UECxMcKGMpIDE5OTkgRW50"
-        + "cnVzdC5uZXQgTGltaXRlZDEzMDEGA1UEAxMqRW50cnVzdC5uZXQgQ2xpZW50"
-        + "IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIGdMA0GCSqGSIb3DQEBAQUAA4GL"
-        + "ADCBhwKBgQDIOpleMRffrCdvkHvkGf9FozTC28GoT/Bo6oT9n3V5z8GKUZSv"
-        + "x1cDR2SerYIbWtp/N3hHuzeYEpbOxhN979IMMFGpOZ5V+Pux5zDeg7K6PvHV"
-        + "iTs7hbqqdCz+PzFur5GVbgbUB01LLFZHGARS2g4Qk79jkJvh34zmAqTmT173"
-        + "iwIBA6OCAeAwggHcMBEGCWCGSAGG+EIBAQQEAwIABzCCASIGA1UdHwSCARkw"
-        + "ggEVMIHkoIHhoIHepIHbMIHYMQswCQYDVQQGEwJVUzEUMBIGA1UEChMLRW50"
-        + "cnVzdC5uZXQxSDBGBgNVBAsUP3d3dy5lbnRydXN0Lm5ldC9DbGllbnRfQ0Ff"
-        + "SW5mby9DUFMgaW5jb3JwLiBieSByZWYuIGxpbWl0cyBsaWFiLjElMCMGA1UE"
-        + "CxMcKGMpIDE5OTkgRW50cnVzdC5uZXQgTGltaXRlZDEzMDEGA1UEAxMqRW50"
-        + "cnVzdC5uZXQgQ2xpZW50IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MQ0wCwYD"
-        + "VQQDEwRDUkwxMCygKqAohiZodHRwOi8vd3d3LmVudHJ1c3QubmV0L0NSTC9D"
-        + "bGllbnQxLmNybDArBgNVHRAEJDAigA8xOTk5MTAxMjE5MjQzMFqBDzIwMTkx"
-        + "MDEyMTkyNDMwWjALBgNVHQ8EBAMCAQYwHwYDVR0jBBgwFoAUxPucKXuXzUyW"
-        + "/O5bs8qZdIuV6kwwHQYDVR0OBBYEFMT7nCl7l81MlvzuW7PKmXSLlepMMAwG"
-        + "A1UdEwQFMAMBAf8wGQYJKoZIhvZ9B0EABAwwChsEVjQuMAMCBJAwDQYJKoZI"
-        + "hvcNAQEEBQADgYEAP66K8ddmAwWePvrqHEa7pFuPeJoSSJn59DXeDDYHAmsQ"
-        + "OokUgZwxpnyyQbJq5wcBoUv5nyU7lsqZwz6hURzzwy5E97BnRqqS5TvaHBkU"
-        + "ODDV4qIxJS7x7EU47fgGWANzYrAQMY9Av2TgXD7FTx/aEkP/TOYGJqibGapE"
-        + "PHayXOw=");
-
-    byte[] nameCert = Base64.decode(
-            "MIIEFjCCA3+gAwIBAgIEdS8BozANBgkqhkiG9w0BAQUFADBKMQswCQYDVQQGEwJE"+
-            "RTERMA8GA1UEChQIREFURVYgZUcxKDAMBgcCggYBCgcUEwExMBgGA1UEAxQRQ0Eg"+
-            "REFURVYgRDAzIDE6UE4wIhgPMjAwMTA1MTAxMDIyNDhaGA8yMDA0MDUwOTEwMjI0"+
-            "OFowgYQxCzAJBgNVBAYTAkRFMQ8wDQYDVQQIFAZCYXllcm4xEjAQBgNVBAcUCU7I"+
-            "dXJuYmVyZzERMA8GA1UEChQIREFURVYgZUcxHTAbBgNVBAUTFDAwMDAwMDAwMDA4"+
-            "OTU3NDM2MDAxMR4wHAYDVQQDFBVEaWV0bWFyIFNlbmdlbmxlaXRuZXIwgaEwDQYJ"+
-            "KoZIhvcNAQEBBQADgY8AMIGLAoGBAJLI/LJLKaHoMk8fBECW/od8u5erZi6jI8Ug"+
-            "C0a/LZyQUO/R20vWJs6GrClQtXB+AtfiBSnyZOSYzOdfDI8yEKPEv8qSuUPpOHps"+
-            "uNCFdLZF1vavVYGEEWs2+y+uuPmg8q1oPRyRmUZ+x9HrDvCXJraaDfTEd9olmB/Z"+
-            "AuC/PqpjAgUAwAAAAaOCAcYwggHCMAwGA1UdEwEB/wQCMAAwDwYDVR0PAQH/BAUD"+
-            "AwdAADAxBgNVHSAEKjAoMCYGBSskCAEBMB0wGwYIKwYBBQUHAgEWD3d3dy56cy5k"+
-            "YXRldi5kZTApBgNVHREEIjAggR5kaWV0bWFyLnNlbmdlbmxlaXRuZXJAZGF0ZXYu"+
-            "ZGUwgYQGA1UdIwR9MHuhc6RxMG8xCzAJBgNVBAYTAkRFMT0wOwYDVQQKFDRSZWd1"+
-            "bGllcnVuZ3NiZWjIb3JkZSBmyHVyIFRlbGVrb21tdW5pa2F0aW9uIHVuZCBQb3N0"+
-            "MSEwDAYHAoIGAQoHFBMBMTARBgNVBAMUCjVSLUNBIDE6UE6CBACm8LkwDgYHAoIG"+
-            "AQoMAAQDAQEAMEcGA1UdHwRAMD4wPKAUoBKGEHd3dy5jcmwuZGF0ZXYuZGWiJKQi"+
-            "MCAxCzAJBgNVBAYTAkRFMREwDwYDVQQKFAhEQVRFViBlRzAWBgUrJAgDBAQNMAsT"+
-            "A0VVUgIBBQIBATAdBgNVHQ4EFgQUfv6xFP0xk7027folhy+ziZvBJiwwLAYIKwYB"+
-            "BQUHAQEEIDAeMBwGCCsGAQUFBzABhhB3d3cuZGlyLmRhdGV2LmRlMA0GCSqGSIb3"+
-            "DQEBBQUAA4GBAEOVX6uQxbgtKzdgbTi6YLffMftFr2mmNwch7qzpM5gxcynzgVkg"+
-            "pnQcDNlm5AIbS6pO8jTCLfCd5TZ5biQksBErqmesIl3QD+VqtB+RNghxectZ3VEs"+
-            "nCUtcE7tJ8O14qwCb3TxS9dvIUFiVi4DjbxX46TdcTbTaK8/qr6AIf+l");
-
-    byte[] probSelfSignedCert = Base64.decode(
-              "MIICxTCCAi6gAwIBAgIQAQAAAAAAAAAAAAAAAAAAATANBgkqhkiG9w0BAQUFADBF"
-            + "MScwJQYDVQQKEx4gRElSRUNUSU9OIEdFTkVSQUxFIERFUyBJTVBPVFMxGjAYBgNV"
-            + "BAMTESBBQyBNSU5FRkkgQiBURVNUMB4XDTA0MDUwNzEyMDAwMFoXDTE0MDUwNzEy"
-            + "MDAwMFowRTEnMCUGA1UEChMeIERJUkVDVElPTiBHRU5FUkFMRSBERVMgSU1QT1RT"
-            + "MRowGAYDVQQDExEgQUMgTUlORUZJIEIgVEVTVDCBnzANBgkqhkiG9w0BAQEFAAOB"
-            + "jQAwgYkCgYEAveoCUOAukZdcFCs2qJk76vSqEX0ZFzHqQ6faBPZWjwkgUNwZ6m6m"
-            + "qWvvyq1cuxhoDvpfC6NXILETawYc6MNwwxsOtVVIjuXlcF17NMejljJafbPximEt"
-            + "DQ4LcQeSp4K7FyFlIAMLyt3BQ77emGzU5fjFTvHSUNb3jblx0sV28c0CAwEAAaOB"
-            + "tTCBsjAfBgNVHSMEGDAWgBSEJ4bLbvEQY8cYMAFKPFD1/fFXlzAdBgNVHQ4EFgQU"
-            + "hCeGy27xEGPHGDABSjxQ9f3xV5cwDgYDVR0PAQH/BAQDAgEGMBEGCWCGSAGG+EIB"
-            + "AQQEAwIBBjA8BgNVHR8ENTAzMDGgL6AthitodHRwOi8vYWRvbmlzLnBrNy5jZXJ0"
-            + "cGx1cy5uZXQvZGdpLXRlc3QuY3JsMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcN"
-            + "AQEFBQADgYEAmToHJWjd3+4zknfsP09H6uMbolHNGG0zTS2lrLKpzcmkQfjhQpT9"
-            + "LUTBvfs1jdjo9fGmQLvOG+Sm51Rbjglb8bcikVI5gLbclOlvqLkm77otjl4U4Z2/"
-            + "Y0vP14Aov3Sn3k+17EfReYUZI4liuB95ncobC4e8ZM++LjQcIM0s+Vs=");
-
-
-    byte[] gost34102001base = Base64.decode(
-              "MIIB1DCCAYECEEjpVKXP6Wn1yVz3VeeDQa8wCgYGKoUDAgIDBQAwbTEfMB0G"
-            + "A1UEAwwWR29zdFIzNDEwLTIwMDEgZXhhbXBsZTESMBAGA1UECgwJQ3J5cHRv"
-            + "UHJvMQswCQYDVQQGEwJSVTEpMCcGCSqGSIb3DQEJARYaR29zdFIzNDEwLTIw"
-            + "MDFAZXhhbXBsZS5jb20wHhcNMDUwMjAzMTUxNjQ2WhcNMTUwMjAzMTUxNjQ2"
-            + "WjBtMR8wHQYDVQQDDBZHb3N0UjM0MTAtMjAwMSBleGFtcGxlMRIwEAYDVQQK"
-            + "DAlDcnlwdG9Qcm8xCzAJBgNVBAYTAlJVMSkwJwYJKoZIhvcNAQkBFhpHb3N0"
-            + "UjM0MTAtMjAwMUBleGFtcGxlLmNvbTBjMBwGBiqFAwICEzASBgcqhQMCAiQA"
-            + "BgcqhQMCAh4BA0MABECElWh1YAIaQHUIzROMMYks/eUFA3pDXPRtKw/nTzJ+"
-            + "V4/rzBa5lYgD0Jp8ha4P5I3qprt+VsfLsN8PZrzK6hpgMAoGBiqFAwICAwUA"
-            + "A0EAHw5dw/aw/OiNvHyOE65kvyo4Hp0sfz3csM6UUkp10VO247ofNJK3tsLb"
-            + "HOLjUaqzefrlGb11WpHYrvWFg+FcLA==");
-
-    byte[] gost341094base = Base64.decode(
-              "MIICDzCCAbwCEBcxKsIb0ghYvAQeUjfQdFAwCgYGKoUDAgIEBQAwaTEdMBsG"
-            + "A1UEAwwUR29zdFIzNDEwLTk0IGV4YW1wbGUxEjAQBgNVBAoMCUNyeXB0b1By"
-            + "bzELMAkGA1UEBhMCUlUxJzAlBgkqhkiG9w0BCQEWGEdvc3RSMzQxMC05NEBl"
-            + "eGFtcGxlLmNvbTAeFw0wNTAyMDMxNTE2NTFaFw0xNTAyMDMxNTE2NTFaMGkx"
-            + "HTAbBgNVBAMMFEdvc3RSMzQxMC05NCBleGFtcGxlMRIwEAYDVQQKDAlDcnlw"
-            + "dG9Qcm8xCzAJBgNVBAYTAlJVMScwJQYJKoZIhvcNAQkBFhhHb3N0UjM0MTAt"
-            + "OTRAZXhhbXBsZS5jb20wgaUwHAYGKoUDAgIUMBIGByqFAwICIAIGByqFAwIC"
-            + "HgEDgYQABIGAu4Rm4XmeWzTYLIB/E6gZZnFX/oxUJSFHbzALJ3dGmMb7R1W+"
-            + "t7Lzk2w5tUI3JoTiDRCKJA4fDEJNKzsRK6i/ZjkyXJSLwaj+G2MS9gklh8x1"
-            + "G/TliYoJgmjTXHemD7aQEBON4z58nJHWrA0ILD54wbXCtrcaqCqLRYGTMjJ2"
-            + "+nswCgYGKoUDAgIEBQADQQBxKNhOmjgz/i5CEgLOyKyz9pFGkDcaymsWYQWV"
-            + "v7CZ0pTM8IzMzkUBW3GHsUjCFpanFZDfg2zuN+3kT+694n9B");
-
-    byte[] gost341094A = Base64.decode(
-            "MIICSDCCAfWgAwIBAgIBATAKBgYqhQMCAgQFADCBgTEXMBUGA1UEAxMOZGVmYXVsdDM0MTAtOTQx"
-            + "DTALBgNVBAoTBERpZ3QxDzANBgNVBAsTBkNyeXB0bzEOMAwGA1UEBxMFWS1vbGExDDAKBgNVBAgT"
-            + "A01FTDELMAkGA1UEBhMCcnUxGzAZBgkqhkiG9w0BCQEWDHRlc3RAdGVzdC5ydTAeFw0wNTAzMjkx"
-            + "MzExNTdaFw0wNjAzMjkxMzExNTdaMIGBMRcwFQYDVQQDEw5kZWZhdWx0MzQxMC05NDENMAsGA1UE"
-            + "ChMERGlndDEPMA0GA1UECxMGQ3J5cHRvMQ4wDAYDVQQHEwVZLW9sYTEMMAoGA1UECBMDTUVMMQsw"
-            + "CQYDVQQGEwJydTEbMBkGCSqGSIb3DQEJARYMdGVzdEB0ZXN0LnJ1MIGlMBwGBiqFAwICFDASBgcq"
-            + "hQMCAiACBgcqhQMCAh4BA4GEAASBgIQACDLEuxSdRDGgdZxHmy30g/DUYkRxO9Mi/uSHX5NjvZ31"
-            + "b7JMEMFqBtyhql1HC5xZfUwZ0aT3UnEFDfFjLP+Bf54gA+LPkQXw4SNNGOj+klnqgKlPvoqMGlwa"
-            + "+hLPKbS561WpvB2XSTgbV+pqqXR3j6j30STmybelEV3RdS2Now8wDTALBgNVHQ8EBAMCB4AwCgYG"
-            + "KoUDAgIEBQADQQBCFy7xWRXtNVXflKvDs0pBdBuPzjCMeZAXVxK8vUxsxxKu76d9CsvhgIFknFRi"
-            + "wWTPiZenvNoJ4R1uzeX+vREm");
-
-    byte[] gost341094B = Base64.decode(
-            "MIICSDCCAfWgAwIBAgIBATAKBgYqhQMCAgQFADCBgTEXMBUGA1UEAxMOcGFyYW0xLTM0MTAtOTQx"
-            +  "DTALBgNVBAoTBERpZ3QxDzANBgNVBAsTBkNyeXB0bzEOMAwGA1UEBxMFWS1PbGExDDAKBgNVBAgT"
-            +  "A01lbDELMAkGA1UEBhMCcnUxGzAZBgkqhkiG9w0BCQEWDHRlc3RAdGVzdC5ydTAeFw0wNTAzMjkx"
-            +  "MzEzNTZaFw0wNjAzMjkxMzEzNTZaMIGBMRcwFQYDVQQDEw5wYXJhbTEtMzQxMC05NDENMAsGA1UE"
-            +  "ChMERGlndDEPMA0GA1UECxMGQ3J5cHRvMQ4wDAYDVQQHEwVZLU9sYTEMMAoGA1UECBMDTWVsMQsw"
-            +  "CQYDVQQGEwJydTEbMBkGCSqGSIb3DQEJARYMdGVzdEB0ZXN0LnJ1MIGlMBwGBiqFAwICFDASBgcq"
-            +  "hQMCAiADBgcqhQMCAh4BA4GEAASBgEa+AAcZmijWs1M9x5Pn9efE8D9ztG1NMoIt0/hNZNqln3+j"
-            +  "lMZjyqPt+kTLIjtmvz9BRDmIDk6FZz+4LhG2OTL7yGpWfrMxMRr56nxomTN9aLWRqbyWmn3brz9Y"
-            +  "AUD3ifnwjjIuW7UM84JNlDTOdxx0XRUfLQIPMCXe9cO02Xskow8wDTALBgNVHQ8EBAMCB4AwCgYG"
-            +  "KoUDAgIEBQADQQBzFcnuYc/639OTW+L5Ecjw9KxGr+dwex7lsS9S1BUgKa3m1d5c+cqI0B2XUFi5"
-            +  "4iaHHJG0dCyjtQYLJr0OZjRw");
-
-    byte[] gost34102001A = Base64.decode(
-            "MIICCzCCAbigAwIBAgIBATAKBgYqhQMCAgMFADCBhDEaMBgGA1UEAxMRZGVmYXVsdC0zNDEwLTIw"
-            + "MDExDTALBgNVBAoTBERpZ3QxDzANBgNVBAsTBkNyeXB0bzEOMAwGA1UEBxMFWS1PbGExDDAKBgNV"
-            + "BAgTA01lbDELMAkGA1UEBhMCcnUxGzAZBgkqhkiG9w0BCQEWDHRlc3RAdGVzdC5ydTAeFw0wNTAz"
-            + "MjkxMzE4MzFaFw0wNjAzMjkxMzE4MzFaMIGEMRowGAYDVQQDExFkZWZhdWx0LTM0MTAtMjAwMTEN"
-            + "MAsGA1UEChMERGlndDEPMA0GA1UECxMGQ3J5cHRvMQ4wDAYDVQQHEwVZLU9sYTEMMAoGA1UECBMD"
-            + "TWVsMQswCQYDVQQGEwJydTEbMBkGCSqGSIb3DQEJARYMdGVzdEB0ZXN0LnJ1MGMwHAYGKoUDAgIT"
-            + "MBIGByqFAwICIwEGByqFAwICHgEDQwAEQG/4c+ZWb10IpeHfmR+vKcbpmSOClJioYmCVgnojw0Xn"
-            + "ned0KTg7TJreRUc+VX7vca4hLQaZ1o/TxVtfEApK/O6jDzANMAsGA1UdDwQEAwIHgDAKBgYqhQMC"
-            + "AgMFAANBAN8y2b6HuIdkD3aWujpfQbS1VIA/7hro4vLgDhjgVmev/PLzFB8oTh3gKhExpDo82IEs"
-            + "ZftGNsbbyp1NFg7zda0=");
-
-    byte[] gostCA1 = Base64.decode(
-            "MIIDNDCCAuGgAwIBAgIQZLcKDcWcQopF+jp4p9jylDAKBgYqhQMCAgQFADBm"
-            + "MQswCQYDVQQGEwJSVTEPMA0GA1UEBxMGTW9zY293MRcwFQYDVQQKEw5PT08g"
-            + "Q3J5cHRvLVBybzEUMBIGA1UECxMLRGV2ZWxvcG1lbnQxFzAVBgNVBAMTDkNQ"
-            + "IENTUCBUZXN0IENBMB4XDTAyMDYwOTE1NTIyM1oXDTA5MDYwOTE1NTkyOVow"
-            + "ZjELMAkGA1UEBhMCUlUxDzANBgNVBAcTBk1vc2NvdzEXMBUGA1UEChMOT09P"
-            + "IENyeXB0by1Qcm8xFDASBgNVBAsTC0RldmVsb3BtZW50MRcwFQYDVQQDEw5D"
-            + "UCBDU1AgVGVzdCBDQTCBpTAcBgYqhQMCAhQwEgYHKoUDAgIgAgYHKoUDAgIe"
-            + "AQOBhAAEgYAYglywKuz1nMc9UiBYOaulKy53jXnrqxZKbCCBSVaJ+aCKbsQm"
-            + "glhRFrw6Mwu8Cdeabo/ojmea7UDMZd0U2xhZFRti5EQ7OP6YpqD0alllo7za"
-            + "4dZNXdX+/ag6fOORSLFdMpVx5ganU0wHMPk67j+audnCPUj/plbeyccgcdcd"
-            + "WaOCASIwggEeMAsGA1UdDwQEAwIBxjAPBgNVHRMBAf8EBTADAQH/MB0GA1Ud"
-            + "DgQWBBTe840gTo4zt2twHilw3PD9wJaX0TCBygYDVR0fBIHCMIG/MDygOqA4"
-            + "hjYtaHR0cDovL2ZpZXdhbGwvQ2VydEVucm9sbC9DUCUyMENTUCUyMFRlc3Ql"
-            + "MjBDQSgzKS5jcmwwRKBCoECGPmh0dHA6Ly93d3cuY3J5cHRvcHJvLnJ1L0Nl"
-            + "cnRFbnJvbGwvQ1AlMjBDU1AlMjBUZXN0JTIwQ0EoMykuY3JsMDmgN6A1hjMt"
-            + "ZmlsZTovL1xcZmlld2FsbFxDZXJ0RW5yb2xsXENQIENTUCBUZXN0IENBKDMp"
-            + "LmNybC8wEgYJKwYBBAGCNxUBBAUCAwMAAzAKBgYqhQMCAgQFAANBAIJi7ni7"
-            + "9rwMR5rRGTFftt2k70GbqyUEfkZYOzrgdOoKiB4IIsIstyBX0/ne6GsL9Xan"
-            + "G2IN96RB7KrowEHeW+k=");
-
-    byte[] gostCA2 = Base64.decode(
-            "MIIC2DCCAoWgAwIBAgIQe9ZCugm42pRKNcHD8466zTAKBgYqhQMCAgMFADB+"
-            + "MRowGAYJKoZIhvcNAQkBFgtzYmFAZGlndC5ydTELMAkGA1UEBhMCUlUxDDAK"
-            + "BgNVBAgTA01FTDEUMBIGA1UEBxMLWW9zaGthci1PbGExDTALBgNVBAoTBERp"
-            + "Z3QxDzANBgNVBAsTBkNyeXB0bzEPMA0GA1UEAxMGc2JhLUNBMB4XDTA0MDgw"
-            + "MzEzMzE1OVoXDTE0MDgwMzEzNDAxMVowfjEaMBgGCSqGSIb3DQEJARYLc2Jh"
-            + "QGRpZ3QucnUxCzAJBgNVBAYTAlJVMQwwCgYDVQQIEwNNRUwxFDASBgNVBAcT"
-            + "C1lvc2hrYXItT2xhMQ0wCwYDVQQKEwREaWd0MQ8wDQYDVQQLEwZDcnlwdG8x"
-            + "DzANBgNVBAMTBnNiYS1DQTBjMBwGBiqFAwICEzASBgcqhQMCAiMBBgcqhQMC"
-            + "Ah4BA0MABEDMSy10CuOH+i8QKG2UWA4XmCt6+BFrNTZQtS6bOalyDY8Lz+G7"
-            + "HybyipE3PqdTB4OIKAAPsEEeZOCZd2UXGQm5o4HaMIHXMBMGCSsGAQQBgjcU"
-            + "AgQGHgQAQwBBMAsGA1UdDwQEAwIBhjAPBgNVHRMBAf8EBTADAQH/MB0GA1Ud"
-            + "DgQWBBRJJl3LcNMxkZI818STfoi3ng1xoDBxBgNVHR8EajBoMDGgL6Athito"
-            + "dHRwOi8vc2JhLmRpZ3QubG9jYWwvQ2VydEVucm9sbC9zYmEtQ0EuY3JsMDOg"
-            + "MaAvhi1maWxlOi8vXFxzYmEuZGlndC5sb2NhbFxDZXJ0RW5yb2xsXHNiYS1D"
-            + "QS5jcmwwEAYJKwYBBAGCNxUBBAMCAQAwCgYGKoUDAgIDBQADQQA+BRJHbc/p"
-            + "q8EYl6iJqXCuR+ozRmH7hPAP3c4KqYSC38TClCgBloLapx/3/WdatctFJW/L"
-            + "mcTovpq088927shE");
-
-    byte[] inDirectCrl = Base64.decode(
-            "MIIdXjCCHMcCAQEwDQYJKoZIhvcNAQEFBQAwdDELMAkGA1UEBhMCREUxHDAaBgNV"
-            +"BAoUE0RldXRzY2hlIFRlbGVrb20gQUcxFzAVBgNVBAsUDlQtVGVsZVNlYyBUZXN0"
-            +"MS4wDAYHAoIGAQoHFBMBMTAeBgNVBAMUF1QtVGVsZVNlYyBUZXN0IERJUiA4OlBO"
-            +"Fw0wNjA4MDQwODQ1MTRaFw0wNjA4MDQxNDQ1MTRaMIIbfzB+AgQvrj/pFw0wMzA3"
-            +"MjIwNTQxMjhaMGcwZQYDVR0dAQH/BFswWaRXMFUxCzAJBgNVBAYTAkRFMRwwGgYD"
-            +"VQQKFBNEZXV0c2NoZSBUZWxla29tIEFHMSgwDAYHAoIGAQoHFBMBMTAYBgNVBAMU"
-            +"EVNpZ0cgVGVzdCBDQSA0OlBOMH4CBC+uP+oXDTAzMDcyMjA1NDEyOFowZzBlBgNV"
-            +"HR0BAf8EWzBZpFcwVTELMAkGA1UEBhMCREUxHDAaBgNVBAoUE0RldXRzY2hlIFRl"
-            +"bGVrb20gQUcxKDAMBgcCggYBCgcUEwExMBgGA1UEAxQRU2lnRyBUZXN0IENBIDQ6"
-            +"UE4wfgIEL64/5xcNMDQwNDA1MTMxODE3WjBnMGUGA1UdHQEB/wRbMFmkVzBVMQsw"
-            +"CQYDVQQGEwJERTEcMBoGA1UEChQTRGV1dHNjaGUgVGVsZWtvbSBBRzEoMAwGBwKC"
-            +"BgEKBxQTATEwGAYDVQQDFBFTaWdHIFRlc3QgQ0EgNDpQTjB+AgQvrj/oFw0wNDA0"
-            +"MDUxMzE4MTdaMGcwZQYDVR0dAQH/BFswWaRXMFUxCzAJBgNVBAYTAkRFMRwwGgYD"
-            +"VQQKFBNEZXV0c2NoZSBUZWxla29tIEFHMSgwDAYHAoIGAQoHFBMBMTAYBgNVBAMU"
-            +"EVNpZ0cgVGVzdCBDQSA0OlBOMH4CBC+uP+UXDTAzMDExMzExMTgxMVowZzBlBgNV"
-            +"HR0BAf8EWzBZpFcwVTELMAkGA1UEBhMCREUxHDAaBgNVBAoUE0RldXRzY2hlIFRl"
-            +"bGVrb20gQUcxKDAMBgcCggYBCgcUEwExMBgGA1UEAxQRU2lnRyBUZXN0IENBIDQ6"
-            +"UE4wfgIEL64/5hcNMDMwMTEzMTExODExWjBnMGUGA1UdHQEB/wRbMFmkVzBVMQsw"
-            +"CQYDVQQGEwJERTEcMBoGA1UEChQTRGV1dHNjaGUgVGVsZWtvbSBBRzEoMAwGBwKC"
-            +"BgEKBxQTATEwGAYDVQQDFBFTaWdHIFRlc3QgQ0EgNDpQTjB+AgQvrj/jFw0wMzAx"
-            +"MTMxMTI2NTZaMGcwZQYDVR0dAQH/BFswWaRXMFUxCzAJBgNVBAYTAkRFMRwwGgYD"
-            +"VQQKFBNEZXV0c2NoZSBUZWxla29tIEFHMSgwDAYHAoIGAQoHFBMBMTAYBgNVBAMU"
-            +"EVNpZ0cgVGVzdCBDQSA0OlBOMH4CBC+uP+QXDTAzMDExMzExMjY1NlowZzBlBgNV"
-            +"HR0BAf8EWzBZpFcwVTELMAkGA1UEBhMCREUxHDAaBgNVBAoUE0RldXRzY2hlIFRl"
-            +"bGVrb20gQUcxKDAMBgcCggYBCgcUEwExMBgGA1UEAxQRU2lnRyBUZXN0IENBIDQ6"
-            +"UE4wfgIEL64/4hcNMDQwNzEzMDc1ODM4WjBnMGUGA1UdHQEB/wRbMFmkVzBVMQsw"
-            +"CQYDVQQGEwJERTEcMBoGA1UEChQTRGV1dHNjaGUgVGVsZWtvbSBBRzEoMAwGBwKC"
-            +"BgEKBxQTATEwGAYDVQQDFBFTaWdHIFRlc3QgQ0EgNDpQTjB+AgQvrj/eFw0wMzAy"
-            +"MTcwNjMzMjVaMGcwZQYDVR0dAQH/BFswWaRXMFUxCzAJBgNVBAYTAkRFMRwwGgYD"
-            +"VQQKFBNEZXV0c2NoZSBUZWxla29tIEFHMSgwDAYHAoIGAQoHFBMBMTAYBgNVBAMU"
-            +"EVNpZ0cgVGVzdCBDQSA0OlBOMH4CBC+uP98XDTAzMDIxNzA2MzMyNVowZzBlBgNV"
-            +"HR0BAf8EWzBZpFcwVTELMAkGA1UEBhMCREUxHDAaBgNVBAoUE0RldXRzY2hlIFRl"
-            +"bGVrb20gQUcxKDAMBgcCggYBCgcUEwExMBgGA1UEAxQRU2lnRyBUZXN0IENBIDQ6"
-            +"UE4wfgIEL64/0xcNMDMwMjE3MDYzMzI1WjBnMGUGA1UdHQEB/wRbMFmkVzBVMQsw"
-            +"CQYDVQQGEwJERTEcMBoGA1UEChQTRGV1dHNjaGUgVGVsZWtvbSBBRzEoMAwGBwKC"
-            +"BgEKBxQTATEwGAYDVQQDFBFTaWdHIFRlc3QgQ0EgNDpQTjB+AgQvrj/dFw0wMzAx"
-            +"MTMxMTI4MTRaMGcwZQYDVR0dAQH/BFswWaRXMFUxCzAJBgNVBAYTAkRFMRwwGgYD"
-            +"VQQKFBNEZXV0c2NoZSBUZWxla29tIEFHMSgwDAYHAoIGAQoHFBMBMTAYBgNVBAMU"
-            +"EVNpZ0cgVGVzdCBDQSA0OlBOMH4CBC+uP9cXDTAzMDExMzExMjcwN1owZzBlBgNV"
-            +"HR0BAf8EWzBZpFcwVTELMAkGA1UEBhMCREUxHDAaBgNVBAoUE0RldXRzY2hlIFRl"
-            +"bGVrb20gQUcxKDAMBgcCggYBCgcUEwExMBgGA1UEAxQRU2lnRyBUZXN0IENBIDQ6"
-            +"UE4wfgIEL64/2BcNMDMwMTEzMTEyNzA3WjBnMGUGA1UdHQEB/wRbMFmkVzBVMQsw"
-            +"CQYDVQQGEwJERTEcMBoGA1UEChQTRGV1dHNjaGUgVGVsZWtvbSBBRzEoMAwGBwKC"
-            +"BgEKBxQTATEwGAYDVQQDFBFTaWdHIFRlc3QgQ0EgNDpQTjB+AgQvrj/VFw0wMzA0"
-            +"MzAxMjI3NTNaMGcwZQYDVR0dAQH/BFswWaRXMFUxCzAJBgNVBAYTAkRFMRwwGgYD"
-            +"VQQKFBNEZXV0c2NoZSBUZWxla29tIEFHMSgwDAYHAoIGAQoHFBMBMTAYBgNVBAMU"
-            +"EVNpZ0cgVGVzdCBDQSA0OlBOMH4CBC+uP9YXDTAzMDQzMDEyMjc1M1owZzBlBgNV"
-            +"HR0BAf8EWzBZpFcwVTELMAkGA1UEBhMCREUxHDAaBgNVBAoUE0RldXRzY2hlIFRl"
-            +"bGVrb20gQUcxKDAMBgcCggYBCgcUEwExMBgGA1UEAxQRU2lnRyBUZXN0IENBIDQ6"
-            +"UE4wfgIEL64/xhcNMDMwMjEyMTM0NTQwWjBnMGUGA1UdHQEB/wRbMFmkVzBVMQsw"
-            +"CQYDVQQGEwJERTEcMBoGA1UEChQTRGV1dHNjaGUgVGVsZWtvbSBBRzEoMAwGBwKC"
-            +"BgEKBxQTATEwGAYDVQQDFBFUVEMgVGVzdCBDQSAxMTpQTjCBkAIEL64/xRcNMDMw"
-            +"MjEyMTM0NTQwWjB5MHcGA1UdHQEB/wRtMGukaTBnMQswCQYDVQQGEwJERTEcMBoG"
-            +"A1UEChQTRGV1dHNjaGUgVGVsZWtvbSBBRzEQMA4GA1UECxQHVGVsZVNlYzEoMAwG"
-            +"BwKCBgEKBxQTATEwGAYDVQQDFBFTaWdHIFRlc3QgQ0EgNTpQTjB+AgQvrj/CFw0w"
-            +"MzAyMTIxMzA5MTZaMGcwZQYDVR0dAQH/BFswWaRXMFUxCzAJBgNVBAYTAkRFMRww"
-            +"GgYDVQQKFBNEZXV0c2NoZSBUZWxla29tIEFHMSgwDAYHAoIGAQoHFBMBMTAYBgNV"
-            +"BAMUEVRUQyBUZXN0IENBIDExOlBOMIGQAgQvrj/BFw0wMzAyMTIxMzA4NDBaMHkw"
-            +"dwYDVR0dAQH/BG0wa6RpMGcxCzAJBgNVBAYTAkRFMRwwGgYDVQQKFBNEZXV0c2No"
-            +"ZSBUZWxla29tIEFHMRAwDgYDVQQLFAdUZWxlU2VjMSgwDAYHAoIGAQoHFBMBMTAY"
-            +"BgNVBAMUEVNpZ0cgVGVzdCBDQSA1OlBOMH4CBC+uP74XDTAzMDIxNzA2MzcyNVow"
-            +"ZzBlBgNVHR0BAf8EWzBZpFcwVTELMAkGA1UEBhMCREUxHDAaBgNVBAoUE0RldXRz"
-            +"Y2hlIFRlbGVrb20gQUcxKDAMBgcCggYBCgcUEwExMBgGA1UEAxQRVFRDIFRlc3Qg"
-            +"Q0EgMTE6UE4wgZACBC+uP70XDTAzMDIxNzA2MzcyNVoweTB3BgNVHR0BAf8EbTBr"
-            +"pGkwZzELMAkGA1UEBhMCREUxHDAaBgNVBAoUE0RldXRzY2hlIFRlbGVrb20gQUcx"
-            +"EDAOBgNVBAsUB1RlbGVTZWMxKDAMBgcCggYBCgcUEwExMBgGA1UEAxQRU2lnRyBU"
-            +"ZXN0IENBIDU6UE4wgZACBC+uP7AXDTAzMDIxMjEzMDg1OVoweTB3BgNVHR0BAf8E"
-            +"bTBrpGkwZzELMAkGA1UEBhMCREUxHDAaBgNVBAoUE0RldXRzY2hlIFRlbGVrb20g"
-            +"QUcxEDAOBgNVBAsUB1RlbGVTZWMxKDAMBgcCggYBCgcUEwExMBgGA1UEAxQRU2ln"
-            +"RyBUZXN0IENBIDU6UE4wgZACBC+uP68XDTAzMDIxNzA2MzcyNVoweTB3BgNVHR0B"
-            +"Af8EbTBrpGkwZzELMAkGA1UEBhMCREUxHDAaBgNVBAoUE0RldXRzY2hlIFRlbGVr"
-            +"b20gQUcxEDAOBgNVBAsUB1RlbGVTZWMxKDAMBgcCggYBCgcUEwExMBgGA1UEAxQR"
-            +"U2lnRyBUZXN0IENBIDU6UE4wfgIEL64/kxcNMDMwNDEwMDUyNjI4WjBnMGUGA1Ud"
-            +"HQEB/wRbMFmkVzBVMQswCQYDVQQGEwJERTEcMBoGA1UEChQTRGV1dHNjaGUgVGVs"
-            +"ZWtvbSBBRzEoMAwGBwKCBgEKBxQTATEwGAYDVQQDFBFUVEMgVGVzdCBDQSAxMTpQ"
-            +"TjCBkAIEL64/khcNMDMwNDEwMDUyNjI4WjB5MHcGA1UdHQEB/wRtMGukaTBnMQsw"
-            +"CQYDVQQGEwJERTEcMBoGA1UEChQTRGV1dHNjaGUgVGVsZWtvbSBBRzEQMA4GA1UE"
-            +"CxQHVGVsZVNlYzEoMAwGBwKCBgEKBxQTATEwGAYDVQQDFBFTaWdHIFRlc3QgQ0Eg"
-            +"NTpQTjB+AgQvrj8/Fw0wMzAyMjYxMTA0NDRaMGcwZQYDVR0dAQH/BFswWaRXMFUx"
-            +"CzAJBgNVBAYTAkRFMRwwGgYDVQQKFBNEZXV0c2NoZSBUZWxla29tIEFHMSgwDAYH"
-            +"AoIGAQoHFBMBMTAYBgNVBAMUEVRUQyBUZXN0IENBIDExOlBOMIGQAgQvrj8+Fw0w"
-            +"MzAyMjYxMTA0NDRaMHkwdwYDVR0dAQH/BG0wa6RpMGcxCzAJBgNVBAYTAkRFMRww"
-            +"GgYDVQQKFBNEZXV0c2NoZSBUZWxla29tIEFHMRAwDgYDVQQLFAdUZWxlU2VjMSgw"
-            +"DAYHAoIGAQoHFBMBMTAYBgNVBAMUEVNpZ0cgVGVzdCBDQSA1OlBOMH4CBC+uPs0X"
-            +"DTAzMDUyMDA1MjczNlowZzBlBgNVHR0BAf8EWzBZpFcwVTELMAkGA1UEBhMCREUx"
-            +"HDAaBgNVBAoUE0RldXRzY2hlIFRlbGVrb20gQUcxKDAMBgcCggYBCgcUEwExMBgG"
-            +"A1UEAxQRVFRDIFRlc3QgQ0EgMTE6UE4wgZACBC+uPswXDTAzMDUyMDA1MjczNlow"
-            +"eTB3BgNVHR0BAf8EbTBrpGkwZzELMAkGA1UEBhMCREUxHDAaBgNVBAoUE0RldXRz"
-            +"Y2hlIFRlbGVrb20gQUcxEDAOBgNVBAsUB1RlbGVTZWMxKDAMBgcCggYBCgcUEwEx"
-            +"MBgGA1UEAxQRU2lnRyBUZXN0IENBIDY6UE4wfgIEL64+PBcNMDMwNjE3MTAzNDE2"
-            +"WjBnMGUGA1UdHQEB/wRbMFmkVzBVMQswCQYDVQQGEwJERTEcMBoGA1UEChQTRGV1"
-            +"dHNjaGUgVGVsZWtvbSBBRzEoMAwGBwKCBgEKBxQTATEwGAYDVQQDFBFUVEMgVGVz"
-            +"dCBDQSAxMTpQTjCBkAIEL64+OxcNMDMwNjE3MTAzNDE2WjB5MHcGA1UdHQEB/wRt"
-            +"MGukaTBnMQswCQYDVQQGEwJERTEcMBoGA1UEChQTRGV1dHNjaGUgVGVsZWtvbSBB"
-            +"RzEQMA4GA1UECxQHVGVsZVNlYzEoMAwGBwKCBgEKBxQTATEwGAYDVQQDFBFTaWdH"
-            +"IFRlc3QgQ0EgNjpQTjCBkAIEL64+OhcNMDMwNjE3MTAzNDE2WjB5MHcGA1UdHQEB"
-            +"/wRtMGukaTBnMQswCQYDVQQGEwJERTEcMBoGA1UEChQTRGV1dHNjaGUgVGVsZWtv"
-            +"bSBBRzEQMA4GA1UECxQHVGVsZVNlYzEoMAwGBwKCBgEKBxQTATEwGAYDVQQDFBFT"
-            +"aWdHIFRlc3QgQ0EgNjpQTjB+AgQvrj45Fw0wMzA2MTcxMzAxMDBaMGcwZQYDVR0d"
-            +"AQH/BFswWaRXMFUxCzAJBgNVBAYTAkRFMRwwGgYDVQQKFBNEZXV0c2NoZSBUZWxl"
-            +"a29tIEFHMSgwDAYHAoIGAQoHFBMBMTAYBgNVBAMUEVRUQyBUZXN0IENBIDExOlBO"
-            +"MIGQAgQvrj44Fw0wMzA2MTcxMzAxMDBaMHkwdwYDVR0dAQH/BG0wa6RpMGcxCzAJ"
-            +"BgNVBAYTAkRFMRwwGgYDVQQKFBNEZXV0c2NoZSBUZWxla29tIEFHMRAwDgYDVQQL"
-            +"FAdUZWxlU2VjMSgwDAYHAoIGAQoHFBMBMTAYBgNVBAMUEVNpZ0cgVGVzdCBDQSA2"
-            +"OlBOMIGQAgQvrj43Fw0wMzA2MTcxMzAxMDBaMHkwdwYDVR0dAQH/BG0wa6RpMGcx"
-            +"CzAJBgNVBAYTAkRFMRwwGgYDVQQKFBNEZXV0c2NoZSBUZWxla29tIEFHMRAwDgYD"
-            +"VQQLFAdUZWxlU2VjMSgwDAYHAoIGAQoHFBMBMTAYBgNVBAMUEVNpZ0cgVGVzdCBD"
-            +"QSA2OlBOMIGQAgQvrj42Fw0wMzA2MTcxMzAxMDBaMHkwdwYDVR0dAQH/BG0wa6Rp"
-            +"MGcxCzAJBgNVBAYTAkRFMRwwGgYDVQQKFBNEZXV0c2NoZSBUZWxla29tIEFHMRAw"
-            +"DgYDVQQLFAdUZWxlU2VjMSgwDAYHAoIGAQoHFBMBMTAYBgNVBAMUEVNpZ0cgVGVz"
-            +"dCBDQSA2OlBOMIGQAgQvrj4zFw0wMzA2MTcxMDM3NDlaMHkwdwYDVR0dAQH/BG0w"
-            +"a6RpMGcxCzAJBgNVBAYTAkRFMRwwGgYDVQQKFBNEZXV0c2NoZSBUZWxla29tIEFH"
-            +"MRAwDgYDVQQLFAdUZWxlU2VjMSgwDAYHAoIGAQoHFBMBMTAYBgNVBAMUEVNpZ0cg"
-            +"VGVzdCBDQSA2OlBOMH4CBC+uPjEXDTAzMDYxNzEwNDI1OFowZzBlBgNVHR0BAf8E"
-            +"WzBZpFcwVTELMAkGA1UEBhMCREUxHDAaBgNVBAoUE0RldXRzY2hlIFRlbGVrb20g"
-            +"QUcxKDAMBgcCggYBCgcUEwExMBgGA1UEAxQRVFRDIFRlc3QgQ0EgMTE6UE4wgZAC"
-            +"BC+uPjAXDTAzMDYxNzEwNDI1OFoweTB3BgNVHR0BAf8EbTBrpGkwZzELMAkGA1UE"
-            +"BhMCREUxHDAaBgNVBAoUE0RldXRzY2hlIFRlbGVrb20gQUcxEDAOBgNVBAsUB1Rl"
-            +"bGVTZWMxKDAMBgcCggYBCgcUEwExMBgGA1UEAxQRU2lnRyBUZXN0IENBIDY6UE4w"
-            +"gZACBC+uPakXDTAzMTAyMjExMzIyNFoweTB3BgNVHR0BAf8EbTBrpGkwZzELMAkG"
-            +"A1UEBhMCREUxHDAaBgNVBAoUE0RldXRzY2hlIFRlbGVrb20gQUcxEDAOBgNVBAsU"
-            +"B1RlbGVTZWMxKDAMBgcCggYBCgcUEwExMBgGA1UEAxQRU2lnRyBUZXN0IENBIDY6"
-            +"UE4wgZACBC+uPLIXDTA1MDMxMTA2NDQyNFoweTB3BgNVHR0BAf8EbTBrpGkwZzEL"
-            +"MAkGA1UEBhMCREUxHDAaBgNVBAoUE0RldXRzY2hlIFRlbGVrb20gQUcxEDAOBgNV"
-            +"BAsUB1RlbGVTZWMxKDAMBgcCggYBCgcUEwExMBgGA1UEAxQRU2lnRyBUZXN0IENB"
-            +"IDY6UE4wgZACBC+uPKsXDTA0MDQwMjA3NTQ1M1oweTB3BgNVHR0BAf8EbTBrpGkw"
-            +"ZzELMAkGA1UEBhMCREUxHDAaBgNVBAoUE0RldXRzY2hlIFRlbGVrb20gQUcxEDAO"
-            +"BgNVBAsUB1RlbGVTZWMxKDAMBgcCggYBCgcUEwExMBgGA1UEAxQRU2lnRyBUZXN0"
-            +"IENBIDY6UE4wgZACBC+uOugXDTA1MDEyNzEyMDMyNFoweTB3BgNVHR0BAf8EbTBr"
-            +"pGkwZzELMAkGA1UEBhMCREUxHDAaBgNVBAoUE0RldXRzY2hlIFRlbGVrb20gQUcx"
-            +"EDAOBgNVBAsUB1RlbGVTZWMxKDAMBgcCggYBCgcUEwExMBgGA1UEAxQRU2lnRyBU"
-            +"ZXN0IENBIDY6UE4wgZACBC+uOr4XDTA1MDIxNjA3NTcxNloweTB3BgNVHR0BAf8E"
-            +"bTBrpGkwZzELMAkGA1UEBhMCREUxHDAaBgNVBAoUE0RldXRzY2hlIFRlbGVrb20g"
-            +"QUcxEDAOBgNVBAsUB1RlbGVTZWMxKDAMBgcCggYBCgcUEwExMBgGA1UEAxQRU2ln"
-            +"RyBUZXN0IENBIDY6UE4wgZACBC+uOqcXDTA1MDMxMDA1NTkzNVoweTB3BgNVHR0B"
-            +"Af8EbTBrpGkwZzELMAkGA1UEBhMCREUxHDAaBgNVBAoUE0RldXRzY2hlIFRlbGVr"
-            +"b20gQUcxEDAOBgNVBAsUB1RlbGVTZWMxKDAMBgcCggYBCgcUEwExMBgGA1UEAxQR"
-            +"U2lnRyBUZXN0IENBIDY6UE4wgZACBC+uOjwXDTA1MDUxMTEwNDk0NloweTB3BgNV"
-            +"HR0BAf8EbTBrpGkwZzELMAkGA1UEBhMCREUxHDAaBgNVBAoUE0RldXRzY2hlIFRl"
-            +"bGVrb20gQUcxEDAOBgNVBAsUB1RlbGVTZWMxKDAMBgcCggYBCgcUEwExMBgGA1UE"
-            +"AxQRU2lnRyBUZXN0IENBIDY6UE4wgaoCBC+sbdUXDTA1MTExMTEwMDMyMVowgZIw"
-            +"gY8GA1UdHQEB/wSBhDCBgaR/MH0xCzAJBgNVBAYTAkRFMRwwGgYDVQQKFBNEZXV0"
-            +"c2NoZSBUZWxla29tIEFHMR8wHQYDVQQLFBZQcm9kdWt0emVudHJ1bSBUZWxlU2Vj"
-            +"MS8wDAYHAoIGAQoHFBMBMTAfBgNVBAMUGFRlbGVTZWMgUEtTIFNpZ0cgQ0EgMTpQ"
-            +"TjCBlQIEL64uaBcNMDYwMTIzMTAyNTU1WjB+MHwGA1UdHQEB/wRyMHCkbjBsMQsw"
-            +"CQYDVQQGEwJERTEcMBoGA1UEChQTRGV1dHNjaGUgVGVsZWtvbSBBRzEWMBQGA1UE"
-            +"CxQNWmVudHJhbGUgQm9ubjEnMAwGBwKCBgEKBxQTATEwFwYDVQQDFBBUVEMgVGVz"
-            +"dCBDQSA5OlBOMIGVAgQvribHFw0wNjA4MDEwOTQ4NDRaMH4wfAYDVR0dAQH/BHIw"
-            +"cKRuMGwxCzAJBgNVBAYTAkRFMRwwGgYDVQQKFBNEZXV0c2NoZSBUZWxla29tIEFH"
-            +"MRYwFAYDVQQLFA1aZW50cmFsZSBCb25uMScwDAYHAoIGAQoHFBMBMTAXBgNVBAMU"
-            +"EFRUQyBUZXN0IENBIDk6UE6ggZswgZgwCwYDVR0UBAQCAhEMMB8GA1UdIwQYMBaA"
-            +"FANbyNumDI9545HwlCF26NuOJC45MA8GA1UdHAEB/wQFMAOEAf8wVwYDVR0SBFAw"
-            +"ToZMbGRhcDovL3Brc2xkYXAudHR0Yy5kZS9vdT1ULVRlbGVTZWMgVGVzdCBESVIg"
-            +"ODpQTixvPURldXRzY2hlIFRlbGVrb20gQUcsYz1kZTANBgkqhkiG9w0BAQUFAAOB"
-            +"gQBewL5gLFHpeOWO07Vk3Gg7pRDuAlvaovBH4coCyCWpk5jEhUfFSYEDuaQB7do4"
-            +"IlJmeTHvkI0PIZWJ7bwQ2PVdipPWDx0NVwS/Cz5jUKiS3BbAmZQZOueiKLFpQq3A"
-            +"b8aOHA7WHU4078/1lM+bgeu33Ln1CGykEbmSjA/oKPi/JA==");
-
-    byte[] directCRL = Base64.decode(
-            "MIIGXTCCBckCAQEwCgYGKyQDAwECBQAwdDELMAkGA1UEBhMCREUxHDAaBgNVBAoU"
-            +"E0RldXRzY2hlIFRlbGVrb20gQUcxFzAVBgNVBAsUDlQtVGVsZVNlYyBUZXN0MS4w"
-            +"DAYHAoIGAQoHFBMBMTAeBgNVBAMUF1QtVGVsZVNlYyBUZXN0IERJUiA4OlBOFw0w"
-            +"NjA4MDQwODQ1MTRaFw0wNjA4MDQxNDQ1MTRaMIIElTAVAgQvrj/pFw0wMzA3MjIw"
-            +"NTQxMjhaMBUCBC+uP+oXDTAzMDcyMjA1NDEyOFowFQIEL64/5xcNMDQwNDA1MTMx"
-            +"ODE3WjAVAgQvrj/oFw0wNDA0MDUxMzE4MTdaMBUCBC+uP+UXDTAzMDExMzExMTgx"
-            +"MVowFQIEL64/5hcNMDMwMTEzMTExODExWjAVAgQvrj/jFw0wMzAxMTMxMTI2NTZa"
-            +"MBUCBC+uP+QXDTAzMDExMzExMjY1NlowFQIEL64/4hcNMDQwNzEzMDc1ODM4WjAV"
-            +"AgQvrj/eFw0wMzAyMTcwNjMzMjVaMBUCBC+uP98XDTAzMDIxNzA2MzMyNVowFQIE"
-            +"L64/0xcNMDMwMjE3MDYzMzI1WjAVAgQvrj/dFw0wMzAxMTMxMTI4MTRaMBUCBC+u"
-            +"P9cXDTAzMDExMzExMjcwN1owFQIEL64/2BcNMDMwMTEzMTEyNzA3WjAVAgQvrj/V"
-            +"Fw0wMzA0MzAxMjI3NTNaMBUCBC+uP9YXDTAzMDQzMDEyMjc1M1owFQIEL64/xhcN"
-            +"MDMwMjEyMTM0NTQwWjAVAgQvrj/FFw0wMzAyMTIxMzQ1NDBaMBUCBC+uP8IXDTAz"
-            +"MDIxMjEzMDkxNlowFQIEL64/wRcNMDMwMjEyMTMwODQwWjAVAgQvrj++Fw0wMzAy"
-            +"MTcwNjM3MjVaMBUCBC+uP70XDTAzMDIxNzA2MzcyNVowFQIEL64/sBcNMDMwMjEy"
-            +"MTMwODU5WjAVAgQvrj+vFw0wMzAyMTcwNjM3MjVaMBUCBC+uP5MXDTAzMDQxMDA1"
-            +"MjYyOFowFQIEL64/khcNMDMwNDEwMDUyNjI4WjAVAgQvrj8/Fw0wMzAyMjYxMTA0"
-            +"NDRaMBUCBC+uPz4XDTAzMDIyNjExMDQ0NFowFQIEL64+zRcNMDMwNTIwMDUyNzM2"
-            +"WjAVAgQvrj7MFw0wMzA1MjAwNTI3MzZaMBUCBC+uPjwXDTAzMDYxNzEwMzQxNlow"
-            +"FQIEL64+OxcNMDMwNjE3MTAzNDE2WjAVAgQvrj46Fw0wMzA2MTcxMDM0MTZaMBUC"
-            +"BC+uPjkXDTAzMDYxNzEzMDEwMFowFQIEL64+OBcNMDMwNjE3MTMwMTAwWjAVAgQv"
-            +"rj43Fw0wMzA2MTcxMzAxMDBaMBUCBC+uPjYXDTAzMDYxNzEzMDEwMFowFQIEL64+"
-            +"MxcNMDMwNjE3MTAzNzQ5WjAVAgQvrj4xFw0wMzA2MTcxMDQyNThaMBUCBC+uPjAX"
-            +"DTAzMDYxNzEwNDI1OFowFQIEL649qRcNMDMxMDIyMTEzMjI0WjAVAgQvrjyyFw0w"
-            +"NTAzMTEwNjQ0MjRaMBUCBC+uPKsXDTA0MDQwMjA3NTQ1M1owFQIEL6466BcNMDUw"
-            +"MTI3MTIwMzI0WjAVAgQvrjq+Fw0wNTAyMTYwNzU3MTZaMBUCBC+uOqcXDTA1MDMx"
-            +"MDA1NTkzNVowFQIEL646PBcNMDUwNTExMTA0OTQ2WjAVAgQvrG3VFw0wNTExMTEx"
-            +"MDAzMjFaMBUCBC+uLmgXDTA2MDEyMzEwMjU1NVowFQIEL64mxxcNMDYwODAxMDk0"
-            +"ODQ0WqCBijCBhzALBgNVHRQEBAICEQwwHwYDVR0jBBgwFoAUA1vI26YMj3njkfCU"
-            +"IXbo244kLjkwVwYDVR0SBFAwToZMbGRhcDovL3Brc2xkYXAudHR0Yy5kZS9vdT1U"
-            +"LVRlbGVTZWMgVGVzdCBESVIgODpQTixvPURldXRzY2hlIFRlbGVrb20gQUcsYz1k"
-            +"ZTAKBgYrJAMDAQIFAAOBgQArj4eMlbAwuA2aS5O4UUUHQMKKdK/dtZi60+LJMiMY"
-            +"ojrMIf4+ZCkgm1Ca0Cd5T15MJxVHhh167Ehn/Hd48pdnAP6Dfz/6LeqkIHGWMHR+"
-            +"z6TXpwWB+P4BdUec1ztz04LypsznrHcLRa91ixg9TZCb1MrOG+InNhleRs1ImXk8"
-            +"MQ==");
-
-    private final byte[] pkcs7CrlProblem = Base64.decode(
-              "MIIwSAYJKoZIhvcNAQcCoIIwOTCCMDUCAQExCzAJBgUrDgMCGgUAMAsGCSqG"
-            + "SIb3DQEHAaCCEsAwggP4MIIC4KADAgECAgF1MA0GCSqGSIb3DQEBBQUAMEUx"
-            + "CzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMR4wHAYDVQQD"
-            + "ExVHZW9UcnVzdCBDQSBmb3IgQWRvYmUwHhcNMDQxMjAyMjEyNTM5WhcNMDYx"
-            + "MjMwMjEyNTM5WjBMMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMR2VvVHJ1c3Qg"
-            + "SW5jMSYwJAYDVQQDEx1HZW9UcnVzdCBBZG9iZSBPQ1NQIFJlc3BvbmRlcjCB"
-            + "nzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA4gnNYhtw7U6QeVXZODnGhHMj"
-            + "+OgZ0DB393rEk6a2q9kq129IA2e03yKBTfJfQR9aWKc2Qj90dsSqPjvTDHFG"
-            + "Qsagm2FQuhnA3fb1UWhPzeEIdm6bxDsnQ8nWqKqxnWZzELZbdp3I9bBLizIq"
-            + "obZovzt60LNMghn/unvvuhpeVSsCAwEAAaOCAW4wggFqMA4GA1UdDwEB/wQE"
-            + "AwIE8DCB5QYDVR0gAQH/BIHaMIHXMIHUBgkqhkiG9y8BAgEwgcYwgZAGCCsG"
-            + "AQUFBwICMIGDGoGAVGhpcyBjZXJ0aWZpY2F0ZSBoYXMgYmVlbiBpc3N1ZWQg"
-            + "aW4gYWNjb3JkYW5jZSB3aXRoIHRoZSBBY3JvYmF0IENyZWRlbnRpYWxzIENQ"
-            + "UyBsb2NhdGVkIGF0IGh0dHA6Ly93d3cuZ2VvdHJ1c3QuY29tL3Jlc291cmNl"
-            + "cy9jcHMwMQYIKwYBBQUHAgEWJWh0dHA6Ly93d3cuZ2VvdHJ1c3QuY29tL3Jl"
-            + "c291cmNlcy9jcHMwEwYDVR0lBAwwCgYIKwYBBQUHAwkwOgYDVR0fBDMwMTAv"
-            + "oC2gK4YpaHR0cDovL2NybC5nZW90cnVzdC5jb20vY3Jscy9hZG9iZWNhMS5j"
-            + "cmwwHwYDVR0jBBgwFoAUq4BZw2WDbR19E70Zw+wajw1HaqMwDQYJKoZIhvcN"
-            + "AQEFBQADggEBAENJf1BD7PX5ivuaawt90q1OGzXpIQL/ClzEeFVmOIxqPc1E"
-            + "TFRq92YuxG5b6+R+k+tGkmCwPLcY8ipg6ZcbJ/AirQhohzjlFuT6YAXsTfEj"
-            + "CqEZfWM2sS7crK2EYxCMmKE3xDfPclYtrAoz7qZvxfQj0TuxHSstHZv39wu2"
-            + "ZiG1BWiEcyDQyTgqTOXBoZmfJtshuAcXmTpgkrYSrS37zNlPTGh+pMYQ0yWD"
-            + "c8OQRJR4OY5ZXfdna01mjtJTOmj6/6XPoLPYTq2gQrc2BCeNJ4bEhLb7sFVB"
-            + "PbwPrpzTE/HRbQHDrzj0YimDxeOUV/UXctgvYwHNtEkcBLsOm/uytMYwggSh"
-            + "MIIDiaADAgECAgQ+HL0oMA0GCSqGSIb3DQEBBQUAMGkxCzAJBgNVBAYTAlVT"
-            + "MSMwIQYDVQQKExpBZG9iZSBTeXN0ZW1zIEluY29ycG9yYXRlZDEdMBsGA1UE"
-            + "CxMUQWRvYmUgVHJ1c3QgU2VydmljZXMxFjAUBgNVBAMTDUFkb2JlIFJvb3Qg"
-            + "Q0EwHhcNMDMwMTA4MjMzNzIzWhcNMjMwMTA5MDAwNzIzWjBpMQswCQYDVQQG"
-            + "EwJVUzEjMCEGA1UEChMaQWRvYmUgU3lzdGVtcyBJbmNvcnBvcmF0ZWQxHTAb"
-            + "BgNVBAsTFEFkb2JlIFRydXN0IFNlcnZpY2VzMRYwFAYDVQQDEw1BZG9iZSBS"
-            + "b290IENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzE9UhPen"
-            + "ouczU38/nBKIayyZR2d+Dx65rRSI+cMQ2B3w8NWfaQovWTWwzGypTJwVoJ/O"
-            + "IL+gz1Ti4CBmRT85hjh+nMSOByLGJPYBErA131XqaZCw24U3HuJOB7JCoWoT"
-            + "aaBm6oCREVkqmwh5WiBELcm9cziLPC/gQxtdswvwrzUaKf7vppLdgUydPVmO"
-            + "rTE8QH6bkTYG/OJcjdGNJtVcRc+vZT+xqtJilvSoOOq6YEL09BxKNRXO+E4i"
-            + "Vg+VGMX4lp+f+7C3eCXpgGu91grwxnSUnfMPUNuad85LcIMjjaDKeCBEXDxU"
-            + "ZPHqojAZn+pMBk0GeEtekt8i0slns3rSAQIDAQABo4IBTzCCAUswEQYJYIZI"
-            + "AYb4QgEBBAQDAgAHMIGOBgNVHR8EgYYwgYMwgYCgfqB8pHoweDELMAkGA1UE"
-            + "BhMCVVMxIzAhBgNVBAoTGkFkb2JlIFN5c3RlbXMgSW5jb3Jwb3JhdGVkMR0w"
-            + "GwYDVQQLExRBZG9iZSBUcnVzdCBTZXJ2aWNlczEWMBQGA1UEAxMNQWRvYmUg"
-            + "Um9vdCBDQTENMAsGA1UEAxMEQ1JMMTArBgNVHRAEJDAigA8yMDAzMDEwODIz"
-            + "MzcyM1qBDzIwMjMwMTA5MDAwNzIzWjALBgNVHQ8EBAMCAQYwHwYDVR0jBBgw"
-            + "FoAUgrc4SpOqmxDvgLvZVOLxD/uAnN4wHQYDVR0OBBYEFIK3OEqTqpsQ74C7"
-            + "2VTi8Q/7gJzeMAwGA1UdEwQFMAMBAf8wHQYJKoZIhvZ9B0EABBAwDhsIVjYu"
-            + "MDo0LjADAgSQMA0GCSqGSIb3DQEBBQUAA4IBAQAy2p9DdcH6b8lv26sdNjc+"
-            + "vGEZNrcCPB0jWZhsnu5NhedUyCAfp9S74r8Ad30ka3AvXME6dkm10+AjhCpx"
-            + "aiLzwScpmBX2NZDkBEzDjbyfYRzn/SSM0URDjBa6m02l1DUvvBHOvfdRN42f"
-            + "kOQU8Rg/vulZEjX5M5LznuDVa5pxm5lLyHHD4bFhCcTl+pHwQjo3fTT5cujN"
-            + "qmIcIenV9IIQ43sFti1oVgt+fpIsb01yggztVnSynbmrLSsdEF/bJ3Vwj/0d"
-            + "1+ICoHnlHOX/r2RAUS2em0fbQqV8H8KmSLDXvpJpTaT2KVfFeBEY3IdRyhOy"
-            + "Yp1PKzK9MaXB+lKrBYjIMIIEyzCCA7OgAwIBAgIEPhy9tTANBgkqhkiG9w0B"
-            + "AQUFADBpMQswCQYDVQQGEwJVUzEjMCEGA1UEChMaQWRvYmUgU3lzdGVtcyBJ"
-            + "bmNvcnBvcmF0ZWQxHTAbBgNVBAsTFEFkb2JlIFRydXN0IFNlcnZpY2VzMRYw"
-            + "FAYDVQQDEw1BZG9iZSBSb290IENBMB4XDTA0MDExNzAwMDMzOVoXDTE1MDEx"
-            + "NTA4MDAwMFowRTELMAkGA1UEBhMCVVMxFjAUBgNVBAoTDUdlb1RydXN0IElu"
-            + "Yy4xHjAcBgNVBAMTFUdlb1RydXN0IENBIGZvciBBZG9iZTCCASIwDQYJKoZI"
-            + "hvcNAQEBBQADggEPADCCAQoCggEBAKfld+BkeFrnOYW8r9L1WygTDlTdSfrO"
-            + "YvWS/Z6Ye5/l+HrBbOHqQCXBcSeCpz7kB2WdKMh1FOE4e9JlmICsHerBLdWk"
-            + "emU+/PDb69zh8E0cLoDfxukF6oVPXj6WSThdSG7H9aXFzRr6S3XGCuvgl+Qw"
-            + "DTLiLYW+ONF6DXwt3TQQtKReJjOJZk46ZZ0BvMStKyBaeB6DKZsmiIo89qso"
-            + "13VDZINH2w1KvXg0ygDizoNtbvgAPFymwnsINS1klfQlcvn0x0RJm9bYQXK3"
-            + "5GNZAgL3M7Lqrld0jMfIUaWvuHCLyivytRuzq1dJ7E8rmidjDEk/G+27pf13"
-            + "fNZ7vR7M+IkCAwEAAaOCAZ0wggGZMBIGA1UdEwEB/wQIMAYBAf8CAQEwUAYD"
-            + "VR0gBEkwRzBFBgkqhkiG9y8BAgEwODA2BggrBgEFBQcCARYqaHR0cHM6Ly93"
-            + "d3cuYWRvYmUuY29tL21pc2MvcGtpL2Nkc19jcC5odG1sMBQGA1UdJQQNMAsG"
-            + "CSqGSIb3LwEBBTCBsgYDVR0fBIGqMIGnMCKgIKAehhxodHRwOi8vY3JsLmFk"
-            + "b2JlLmNvbS9jZHMuY3JsMIGAoH6gfKR6MHgxCzAJBgNVBAYTAlVTMSMwIQYD"
-            + "VQQKExpBZG9iZSBTeXN0ZW1zIEluY29ycG9yYXRlZDEdMBsGA1UECxMUQWRv"
-            + "YmUgVHJ1c3QgU2VydmljZXMxFjAUBgNVBAMTDUFkb2JlIFJvb3QgQ0ExDTAL"
-            + "BgNVBAMTBENSTDEwCwYDVR0PBAQDAgEGMB8GA1UdIwQYMBaAFIK3OEqTqpsQ"
-            + "74C72VTi8Q/7gJzeMB0GA1UdDgQWBBSrgFnDZYNtHX0TvRnD7BqPDUdqozAZ"
-            + "BgkqhkiG9n0HQQAEDDAKGwRWNi4wAwIEkDANBgkqhkiG9w0BAQUFAAOCAQEA"
-            + "PzlZLqIAjrFeEWEs0uC29YyJhkXOE9mf3YSaFGsITF+Gl1j0pajTjyH4R35Q"
-            + "r3floW2q3HfNzTeZ90Jnr1DhVERD6zEMgJpCtJqVuk0sixuXJHghS/KicKf4"
-            + "YXJJPx9epuIRF1siBRnznnF90svmOJMXApc0jGnYn3nQfk4kaShSnDaYaeYR"
-            + "DJKcsiWhl6S5zfwS7Gg8hDeyckhMQKKWnlG1CQrwlSFisKCduoodwRtWgft8"
-            + "kx13iyKK3sbalm6vnVc+5nufS4vI+TwMXoV63NqYaSroafBWk0nL53zGXPEy"
-            + "+A69QhzEViJKn2Wgqt5gt++jMMNImbRObIqgfgF1VjCCBUwwggQ0oAMCAQIC"
-            + "AgGDMA0GCSqGSIb3DQEBBQUAMEUxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1H"
-            + "ZW9UcnVzdCBJbmMuMR4wHAYDVQQDExVHZW9UcnVzdCBDQSBmb3IgQWRvYmUw"
-            + "HhcNMDYwMzI0MTU0MjI5WhcNMDkwNDA2MTQ0MjI5WjBzMQswCQYDVQQGEwJV"
-            + "UzELMAkGA1UECBMCTUExETAPBgNVBAoTCEdlb1RydXN0MR0wGwYDVQQDExRN"
-            + "YXJrZXRpbmcgRGVwYXJ0bWVudDElMCMGCSqGSIb3DQEJARYWbWFya2V0aW5n"
-            + "QGdlb3RydXN0LmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB"
-            + "ANmvajTO4XJvAU2nVcLmXeCnAQX7RZt+7+ML3InmqQ3LCGo1weop09zV069/"
-            + "1x/Nmieol7laEzeXxd2ghjGzwfXafqQEqHn6+vBCvqdNPoSi63fSWhnuDVWp"
-            + "KVDOYgxOonrXl+Cc43lu4zRSq+Pi5phhrjDWcH74a3/rdljUt4c4GFezFXfa"
-            + "w2oTzWkxj2cTSn0Szhpr17+p66UNt8uknlhmu4q44Speqql2HwmCEnpLYJrK"
-            + "W3fOq5D4qdsvsLR2EABLhrBezamLI3iGV8cRHOUTsbTMhWhv/lKfHAyf4XjA"
-            + "z9orzvPN5jthhIfICOFq/nStTgakyL4Ln+nFAB/SMPkCAwEAAaOCAhYwggIS"
-            + "MA4GA1UdDwEB/wQEAwIF4DCB5QYDVR0gAQH/BIHaMIHXMIHUBgkqhkiG9y8B"
-            + "AgEwgcYwgZAGCCsGAQUFBwICMIGDGoGAVGhpcyBjZXJ0aWZpY2F0ZSBoYXMg"
-            + "YmVlbiBpc3N1ZWQgaW4gYWNjb3JkYW5jZSB3aXRoIHRoZSBBY3JvYmF0IENy"
-            + "ZWRlbnRpYWxzIENQUyBsb2NhdGVkIGF0IGh0dHA6Ly93d3cuZ2VvdHJ1c3Qu"
-            + "Y29tL3Jlc291cmNlcy9jcHMwMQYIKwYBBQUHAgEWJWh0dHA6Ly93d3cuZ2Vv"
-            + "dHJ1c3QuY29tL3Jlc291cmNlcy9jcHMwOgYDVR0fBDMwMTAvoC2gK4YpaHR0"
-            + "cDovL2NybC5nZW90cnVzdC5jb20vY3Jscy9hZG9iZWNhMS5jcmwwHwYDVR0j"
-            + "BBgwFoAUq4BZw2WDbR19E70Zw+wajw1HaqMwRAYIKwYBBQUHAQEEODA2MDQG"
-            + "CCsGAQUFBzABhihodHRwOi8vYWRvYmUtb2NzcC5nZW90cnVzdC5jb20vcmVz"
-            + "cG9uZGVyMBQGA1UdJQQNMAsGCSqGSIb3LwEBBTA8BgoqhkiG9y8BAQkBBC4w"
-            + "LAIBAYYnaHR0cDovL2Fkb2JlLXRpbWVzdGFtcC5nZW90cnVzdC5jb20vdHNh"
-            + "MBMGCiqGSIb3LwEBCQIEBTADAgEBMAwGA1UdEwQFMAMCAQAwDQYJKoZIhvcN"
-            + "AQEFBQADggEBAAOhy6QxOo+i3h877fvDvTa0plGD2bIqK7wMdNqbMDoSWied"
-            + "FIcgcBOIm2wLxOjZBAVj/3lDq59q2rnVeNnfXM0/N0MHI9TumHRjU7WNk9e4"
-            + "+JfJ4M+c3anrWOG3NE5cICDVgles+UHjXetHWql/LlP04+K2ZOLb6LE2xGnI"
-            + "YyLW9REzCYNAVF+/WkYdmyceHtaBZdbyVAJq0NAJPsfgY1pWcBo31Mr1fpX9"
-            + "WrXNTYDCqMyxMImJTmN3iI68tkXlNrhweQoArKFqBysiBkXzG/sGKYY6tWKU"
-            + "pzjLc3vIp/LrXC5zilROes8BSvwu1w9qQrJNcGwo7O4uijoNtyYil1Exgh1Q"
-            + "MIIdTAIBATBLMEUxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJ"
-            + "bmMuMR4wHAYDVQQDExVHZW9UcnVzdCBDQSBmb3IgQWRvYmUCAgGDMAkGBSsO"
-            + "AwIaBQCgggxMMBgGCSqGSIb3DQEJAzELBgkqhkiG9w0BBwEwIwYJKoZIhvcN"
-            + "AQkEMRYEFP4R6qIdpQJzWyzrqO8X1ZfJOgChMIIMCQYJKoZIhvcvAQEIMYIL"
-            + "+jCCC/agggZ5MIIGdTCCA6gwggKQMA0GCSqGSIb3DQEBBQUAMEUxCzAJBgNV"
-            + "BAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMR4wHAYDVQQDExVHZW9U"
-            + "cnVzdCBDQSBmb3IgQWRvYmUXDTA2MDQwNDE3NDAxMFoXDTA2MDQwNTE3NDAx"
-            + "MFowggIYMBMCAgC5Fw0wNTEwMTEyMDM2MzJaMBICAVsXDTA0MTEwNDE1MDk0"
-            + "MVowEwICALgXDTA1MTIxMjIyMzgzOFowEgIBWhcNMDQxMTA0MTUwOTMzWjAT"
-            + "AgIA5hcNMDUwODI3MDQwOTM4WjATAgIAtxcNMDYwMTE2MTc1NTEzWjATAgIA"
-            + "hhcNMDUxMjEyMjIzODU1WjATAgIAtRcNMDUwNzA2MTgzODQwWjATAgIA4BcN"
-            + "MDYwMzIwMDc0ODM0WjATAgIAgRcNMDUwODAyMjIzMTE1WjATAgIA3xcNMDUx"
-            + "MjEyMjIzNjUwWjASAgFKFw0wNDExMDQxNTA5MTZaMBICAUQXDTA0MTEwNDE1"
-            + "MDg1M1owEgIBQxcNMDQxMDAzMDEwMDQwWjASAgFsFw0wNDEyMDYxOTQ0MzFa"
-            + "MBMCAgEoFw0wNjAzMDkxMjA3MTJaMBMCAgEkFw0wNjAxMTYxNzU1MzRaMBIC"
-            + "AWcXDTA1MDMxODE3NTYxNFowEwICAVEXDTA2MDEzMTExMjcxMVowEgIBZBcN"
-            + "MDQxMTExMjI0ODQxWjATAgIA8RcNMDUwOTE2MTg0ODAxWjATAgIBThcNMDYw"
-            + "MjIxMjAxMDM2WjATAgIAwRcNMDUxMjEyMjIzODE2WjASAgFiFw0wNTAxMTAx"
-            + "NjE5MzRaMBICAWAXDTA1MDExMDE5MDAwNFowEwICAL4XDTA1MDUxNzE0NTYx"
-            + "MFowDQYJKoZIhvcNAQEFBQADggEBAEKhRMS3wVho1U3EvEQJZC8+JlUngmZQ"
-            + "A78KQbHPWNZWFlNvPuf/b0s7Lu16GfNHXh1QAW6Y5Hi1YtYZ3YOPyMd4Xugt"
-            + "gCdumbB6xtKsDyN5RvTht6ByXj+CYlYqsL7RX0izJZ6mJn4fjMkqzPKNOjb8"
-            + "kSn5T6rn93BjlATtCE8tPVOM8dnqGccRE0OV59+nDBXc90UMt5LdEbwaUOap"
-            + "snVB0oLcNm8d/HnlVH6RY5LnDjrT4vwfe/FApZtTecEWsllVUXDjSpwfcfD/"
-            + "476/lpGySB2otALqzImlA9R8Ok3hJ8dnF6hhQ5Oe6OJMnGYgdhkKbxsKkdib"
-            + "tTVl3qmH5QAwggLFMIIBrQIBATANBgkqhkiG9w0BAQUFADBpMQswCQYDVQQG"
-            + "EwJVUzEjMCEGA1UEChMaQWRvYmUgU3lzdGVtcyBJbmNvcnBvcmF0ZWQxHTAb"
-            + "BgNVBAsTFEFkb2JlIFRydXN0IFNlcnZpY2VzMRYwFAYDVQQDEw1BZG9iZSBS"
-            + "b290IENBFw0wNjAxMjcxODMzMzFaFw0wNzAxMjcwMDAwMDBaMIHeMCMCBD4c"
-            + "vUAXDTAzMDEyMTIzNDY1NlowDDAKBgNVHRUEAwoBBDAjAgQ+HL1BFw0wMzAx"
-            + "MjEyMzQ3MjJaMAwwCgYDVR0VBAMKAQQwIwIEPhy9YhcNMDMwMTIxMjM0NzQy"
-            + "WjAMMAoGA1UdFQQDCgEEMCMCBD4cvWEXDTA0MDExNzAxMDg0OFowDDAKBgNV"
-            + "HRUEAwoBBDAjAgQ+HL2qFw0wNDAxMTcwMTA5MDVaMAwwCgYDVR0VBAMKAQQw"
-            + "IwIEPhy9qBcNMDQwMTE3MDEzOTI5WjAMMAoGA1UdFQQDCgEEoC8wLTAKBgNV"
-            + "HRQEAwIBDzAfBgNVHSMEGDAWgBSCtzhKk6qbEO+Au9lU4vEP+4Cc3jANBgkq"
-            + "hkiG9w0BAQUFAAOCAQEAwtXF9042wG39icUlsotn5tpE3oCusLb/hBpEONhx"
-            + "OdfEQOq0w5hf/vqaxkcf71etA+KpbEUeSVaHMHRPhx/CmPrO9odE139dJdbt"
-            + "9iqbrC9iZokFK3h/es5kg73xujLKd7C/u5ngJ4mwBtvhMLjFjF2vJhPKHL4C"
-            + "IgMwdaUAhrcNzy16v+mw/VGJy3Fvc6oCESW1K9tvFW58qZSNXrMlsuidgunM"
-            + "hPKG+z0SXVyCqL7pnqKiaGddcgujYGOSY4S938oVcfZeZQEODtSYGlzldojX"
-            + "C1U1hCK5+tHAH0Ox/WqRBIol5VCZQwJftf44oG8oviYq52aaqSejXwmfT6zb"
-            + "76GCBXUwggVxMIIFbQoBAKCCBWYwggViBgkrBgEFBQcwAQEEggVTMIIFTzCB"
-            + "taIWBBS+8EpykfXdl4h3z7m/NZfdkAQQERgPMjAwNjA0MDQyMDIwMTVaMGUw"
-            + "YzA7MAkGBSsOAwIaBQAEFEb4BuZYkbjBjOjT6VeA/00fBvQaBBT3fTSQniOp"
-            + "BbHBSkz4xridlX0bsAICAYOAABgPMjAwNjA0MDQyMDIwMTVaoBEYDzIwMDYw"
-            + "NDA1MDgyMDE1WqEjMCEwHwYJKwYBBQUHMAECBBIEEFqooq/R2WltD7TposkT"
-            + "BhMwDQYJKoZIhvcNAQEFBQADgYEAMig6lty4b0JDsT/oanfQG5x6jVKPACpp"
-            + "1UA9SJ0apJJa7LeIdDFmu5C2S/CYiKZm4A4P9cAu0YzgLHxE4r6Op+HfVlAG"
-            + "6bzUe1P/hi1KCJ8r8wxOZAktQFPSzs85RAZwkHMfB0lP2e/h666Oye+Zf8VH"
-            + "RaE+/xZ7aswE89HXoumgggQAMIID/DCCA/gwggLgoAMCAQICAXUwDQYJKoZI"
-            + "hvcNAQEFBQAwRTELMAkGA1UEBhMCVVMxFjAUBgNVBAoTDUdlb1RydXN0IElu"
-            + "Yy4xHjAcBgNVBAMTFUdlb1RydXN0IENBIGZvciBBZG9iZTAeFw0wNDEyMDIy"
-            + "MTI1MzlaFw0wNjEyMzAyMTI1MzlaMEwxCzAJBgNVBAYTAlVTMRUwEwYDVQQK"
-            + "EwxHZW9UcnVzdCBJbmMxJjAkBgNVBAMTHUdlb1RydXN0IEFkb2JlIE9DU1Ag"
-            + "UmVzcG9uZGVyMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDiCc1iG3Dt"
-            + "TpB5Vdk4OcaEcyP46BnQMHf3esSTprar2SrXb0gDZ7TfIoFN8l9BH1pYpzZC"
-            + "P3R2xKo+O9MMcUZCxqCbYVC6GcDd9vVRaE/N4Qh2bpvEOydDydaoqrGdZnMQ"
-            + "tlt2ncj1sEuLMiqhtmi/O3rQs0yCGf+6e++6Gl5VKwIDAQABo4IBbjCCAWow"
-            + "DgYDVR0PAQH/BAQDAgTwMIHlBgNVHSABAf8EgdowgdcwgdQGCSqGSIb3LwEC"
-            + "ATCBxjCBkAYIKwYBBQUHAgIwgYMagYBUaGlzIGNlcnRpZmljYXRlIGhhcyBi"
-            + "ZWVuIGlzc3VlZCBpbiBhY2NvcmRhbmNlIHdpdGggdGhlIEFjcm9iYXQgQ3Jl"
-            + "ZGVudGlhbHMgQ1BTIGxvY2F0ZWQgYXQgaHR0cDovL3d3dy5nZW90cnVzdC5j"
-            + "b20vcmVzb3VyY2VzL2NwczAxBggrBgEFBQcCARYlaHR0cDovL3d3dy5nZW90"
-            + "cnVzdC5jb20vcmVzb3VyY2VzL2NwczATBgNVHSUEDDAKBggrBgEFBQcDCTA6"
-            + "BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLmdlb3RydXN0LmNvbS9jcmxz"
-            + "L2Fkb2JlY2ExLmNybDAfBgNVHSMEGDAWgBSrgFnDZYNtHX0TvRnD7BqPDUdq"
-            + "ozANBgkqhkiG9w0BAQUFAAOCAQEAQ0l/UEPs9fmK+5prC33SrU4bNekhAv8K"
-            + "XMR4VWY4jGo9zURMVGr3Zi7Eblvr5H6T60aSYLA8txjyKmDplxsn8CKtCGiH"
-            + "OOUW5PpgBexN8SMKoRl9YzaxLtysrYRjEIyYoTfEN89yVi2sCjPupm/F9CPR"
-            + "O7EdKy0dm/f3C7ZmIbUFaIRzINDJOCpM5cGhmZ8m2yG4BxeZOmCSthKtLfvM"
-            + "2U9MaH6kxhDTJYNzw5BElHg5jlld92drTWaO0lM6aPr/pc+gs9hOraBCtzYE"
-            + "J40nhsSEtvuwVUE9vA+unNMT8dFtAcOvOPRiKYPF45RX9Rdy2C9jAc20SRwE"
-            + "uw6b+7K0xjANBgkqhkiG9w0BAQEFAASCAQC7a4yICFGCEMPlJbydK5qLG3rV"
-            + "sip7Ojjz9TB4nLhC2DgsIHds8jjdq2zguInluH2nLaBCVS+qxDVlTjgbI2cB"
-            + "TaWS8nglC7nNjzkKAsa8vThA8FZUVXTW0pb74jNJJU2AA27bb4g+4WgunCrj"
-            + "fpYp+QjDyMmdrJVqRmt5eQN+dpVxMS9oq+NrhOSEhyIb4/rejgNg9wnVK1ms"
-            + "l5PxQ4x7kpm7+Ua41//owkJVWykRo4T1jo4eHEz1DolPykAaKie2VKH/sMqR"
-            + "Spjh4E5biKJLOV9fKivZWKAXByXfwUbbMsJvz4v/2yVHFy9xP+tqB5ZbRoDK"
-            + "k8PzUyCprozn+/22oYIPijCCD4YGCyqGSIb3DQEJEAIOMYIPdTCCD3EGCSqG"
-            + "SIb3DQEHAqCCD2Iwgg9eAgEDMQswCQYFKw4DAhoFADCB+gYLKoZIhvcNAQkQ"
-            + "AQSggeoEgecwgeQCAQEGAikCMCEwCQYFKw4DAhoFAAQUoT97qeCv3FXYaEcS"
-            + "gY8patCaCA8CAiMHGA8yMDA2MDQwNDIwMjA1N1owAwIBPAEB/wIIO0yRre3L"
-            + "8/6ggZCkgY0wgYoxCzAJBgNVBAYTAlVTMRYwFAYDVQQIEw1NYXNzYWNodXNl"
-            + "dHRzMRAwDgYDVQQHEwdOZWVkaGFtMRUwEwYDVQQKEwxHZW9UcnVzdCBJbmMx"
-            + "EzARBgNVBAsTClByb2R1Y3Rpb24xJTAjBgNVBAMTHGFkb2JlLXRpbWVzdGFt"
-            + "cC5nZW90cnVzdC5jb22gggzJMIIDUTCCAjmgAwIBAgICAI8wDQYJKoZIhvcN"
-            + "AQEFBQAwRTELMAkGA1UEBhMCVVMxFjAUBgNVBAoTDUdlb1RydXN0IEluYy4x"
-            + "HjAcBgNVBAMTFUdlb1RydXN0IENBIGZvciBBZG9iZTAeFw0wNTAxMTAwMTI5"
-            + "MTBaFw0xNTAxMTUwODAwMDBaMIGKMQswCQYDVQQGEwJVUzEWMBQGA1UECBMN"
-            + "TWFzc2FjaHVzZXR0czEQMA4GA1UEBxMHTmVlZGhhbTEVMBMGA1UEChMMR2Vv"
-            + "VHJ1c3QgSW5jMRMwEQYDVQQLEwpQcm9kdWN0aW9uMSUwIwYDVQQDExxhZG9i"
-            + "ZS10aW1lc3RhbXAuZ2VvdHJ1c3QuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GN"
-            + "ADCBiQKBgQDRbxJotLFPWQuuEDhKtOMaBUJepGxIvWxeahMbq1DVmqnk88+j"
-            + "w/5lfPICPzQZ1oHrcTLSAFM7Mrz3pyyQKQKMqUyiemzuG/77ESUNfBNSUfAF"
-            + "PdtHuDMU8Is8ABVnFk63L+wdlvvDIlKkE08+VTKCRdjmuBVltMpQ6QcLFQzm"
-            + "AQIDAQABo4GIMIGFMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwuZ2Vv"
-            + "dHJ1c3QuY29tL2NybHMvYWRvYmVjYTEuY3JsMB8GA1UdIwQYMBaAFKuAWcNl"
-            + "g20dfRO9GcPsGo8NR2qjMA4GA1UdDwEB/wQEAwIGwDAWBgNVHSUBAf8EDDAK"
-            + "BggrBgEFBQcDCDANBgkqhkiG9w0BAQUFAAOCAQEAmnyXjdtX+F79Nf0KggTd"
-            + "6YC2MQD9s09IeXTd8TP3rBmizfM+7f3icggeCGakNfPRmIUMLoa0VM5Kt37T"
-            + "2X0TqzBWusfbKx7HnX4v1t/G8NJJlT4SShSHv+8bjjU4lUoCmW2oEcC5vXwP"
-            + "R5JfjCyois16npgcO05ZBT+LLDXyeBijE6qWmwLDfEpLyILzVRmyU4IE7jvm"
-            + "rgb3GXwDUvd3yQXGRRHbPCh3nj9hBGbuzyt7GnlqnEie3wzIyMG2ET/wvTX5"
-            + "4BFXKNe7lDLvZj/MXvd3V7gMTSVW0kAszKao56LfrVTgp1VX3UBQYwmQqaoA"
-            + "UwFezih+jEvjW6cYJo/ErDCCBKEwggOJoAMCAQICBD4cvSgwDQYJKoZIhvcN"
-            + "AQEFBQAwaTELMAkGA1UEBhMCVVMxIzAhBgNVBAoTGkFkb2JlIFN5c3RlbXMg"
-            + "SW5jb3Jwb3JhdGVkMR0wGwYDVQQLExRBZG9iZSBUcnVzdCBTZXJ2aWNlczEW"
-            + "MBQGA1UEAxMNQWRvYmUgUm9vdCBDQTAeFw0wMzAxMDgyMzM3MjNaFw0yMzAx"
-            + "MDkwMDA3MjNaMGkxCzAJBgNVBAYTAlVTMSMwIQYDVQQKExpBZG9iZSBTeXN0"
-            + "ZW1zIEluY29ycG9yYXRlZDEdMBsGA1UECxMUQWRvYmUgVHJ1c3QgU2Vydmlj"
-            + "ZXMxFjAUBgNVBAMTDUFkb2JlIFJvb3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUA"
-            + "A4IBDwAwggEKAoIBAQDMT1SE96ei5zNTfz+cEohrLJlHZ34PHrmtFIj5wxDY"
-            + "HfDw1Z9pCi9ZNbDMbKlMnBWgn84gv6DPVOLgIGZFPzmGOH6cxI4HIsYk9gES"
-            + "sDXfVeppkLDbhTce4k4HskKhahNpoGbqgJERWSqbCHlaIEQtyb1zOIs8L+BD"
-            + "G12zC/CvNRop/u+mkt2BTJ09WY6tMTxAfpuRNgb84lyN0Y0m1VxFz69lP7Gq"
-            + "0mKW9Kg46rpgQvT0HEo1Fc74TiJWD5UYxfiWn5/7sLd4JemAa73WCvDGdJSd"
-            + "8w9Q25p3zktwgyONoMp4IERcPFRk8eqiMBmf6kwGTQZ4S16S3yLSyWezetIB"
-            + "AgMBAAGjggFPMIIBSzARBglghkgBhvhCAQEEBAMCAAcwgY4GA1UdHwSBhjCB"
-            + "gzCBgKB+oHykejB4MQswCQYDVQQGEwJVUzEjMCEGA1UEChMaQWRvYmUgU3lz"
-            + "dGVtcyBJbmNvcnBvcmF0ZWQxHTAbBgNVBAsTFEFkb2JlIFRydXN0IFNlcnZp"
-            + "Y2VzMRYwFAYDVQQDEw1BZG9iZSBSb290IENBMQ0wCwYDVQQDEwRDUkwxMCsG"
-            + "A1UdEAQkMCKADzIwMDMwMTA4MjMzNzIzWoEPMjAyMzAxMDkwMDA3MjNaMAsG"
-            + "A1UdDwQEAwIBBjAfBgNVHSMEGDAWgBSCtzhKk6qbEO+Au9lU4vEP+4Cc3jAd"
-            + "BgNVHQ4EFgQUgrc4SpOqmxDvgLvZVOLxD/uAnN4wDAYDVR0TBAUwAwEB/zAd"
-            + "BgkqhkiG9n0HQQAEEDAOGwhWNi4wOjQuMAMCBJAwDQYJKoZIhvcNAQEFBQAD"
-            + "ggEBADLan0N1wfpvyW/bqx02Nz68YRk2twI8HSNZmGye7k2F51TIIB+n1Lvi"
-            + "vwB3fSRrcC9cwTp2SbXT4COEKnFqIvPBJymYFfY1kOQETMONvJ9hHOf9JIzR"
-            + "REOMFrqbTaXUNS+8Ec6991E3jZ+Q5BTxGD++6VkSNfkzkvOe4NVrmnGbmUvI"
-            + "ccPhsWEJxOX6kfBCOjd9NPly6M2qYhwh6dX0ghDjewW2LWhWC35+kixvTXKC"
-            + "DO1WdLKduastKx0QX9sndXCP/R3X4gKgeeUc5f+vZEBRLZ6bR9tCpXwfwqZI"
-            + "sNe+kmlNpPYpV8V4ERjch1HKE7JinU8rMr0xpcH6UqsFiMgwggTLMIIDs6AD"
-            + "AgECAgQ+HL21MA0GCSqGSIb3DQEBBQUAMGkxCzAJBgNVBAYTAlVTMSMwIQYD"
-            + "VQQKExpBZG9iZSBTeXN0ZW1zIEluY29ycG9yYXRlZDEdMBsGA1UECxMUQWRv"
-            + "YmUgVHJ1c3QgU2VydmljZXMxFjAUBgNVBAMTDUFkb2JlIFJvb3QgQ0EwHhcN"
-            + "MDQwMTE3MDAwMzM5WhcNMTUwMTE1MDgwMDAwWjBFMQswCQYDVQQGEwJVUzEW"
-            + "MBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEeMBwGA1UEAxMVR2VvVHJ1c3QgQ0Eg"
-            + "Zm9yIEFkb2JlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAp+V3"
-            + "4GR4Wuc5hbyv0vVbKBMOVN1J+s5i9ZL9nph7n+X4esFs4epAJcFxJ4KnPuQH"
-            + "ZZ0oyHUU4Th70mWYgKwd6sEt1aR6ZT788Nvr3OHwTRwugN/G6QXqhU9ePpZJ"
-            + "OF1Ibsf1pcXNGvpLdcYK6+CX5DANMuIthb440XoNfC3dNBC0pF4mM4lmTjpl"
-            + "nQG8xK0rIFp4HoMpmyaIijz2qyjXdUNkg0fbDUq9eDTKAOLOg21u+AA8XKbC"
-            + "ewg1LWSV9CVy+fTHREmb1thBcrfkY1kCAvczsuquV3SMx8hRpa+4cIvKK/K1"
-            + "G7OrV0nsTyuaJ2MMST8b7bul/Xd81nu9Hsz4iQIDAQABo4IBnTCCAZkwEgYD"
-            + "VR0TAQH/BAgwBgEB/wIBATBQBgNVHSAESTBHMEUGCSqGSIb3LwECATA4MDYG"
-            + "CCsGAQUFBwIBFipodHRwczovL3d3dy5hZG9iZS5jb20vbWlzYy9wa2kvY2Rz"
-            + "X2NwLmh0bWwwFAYDVR0lBA0wCwYJKoZIhvcvAQEFMIGyBgNVHR8Egaowgacw"
-            + "IqAgoB6GHGh0dHA6Ly9jcmwuYWRvYmUuY29tL2Nkcy5jcmwwgYCgfqB8pHow"
-            + "eDELMAkGA1UEBhMCVVMxIzAhBgNVBAoTGkFkb2JlIFN5c3RlbXMgSW5jb3Jw"
-            + "b3JhdGVkMR0wGwYDVQQLExRBZG9iZSBUcnVzdCBTZXJ2aWNlczEWMBQGA1UE"
-            + "AxMNQWRvYmUgUm9vdCBDQTENMAsGA1UEAxMEQ1JMMTALBgNVHQ8EBAMCAQYw"
-            + "HwYDVR0jBBgwFoAUgrc4SpOqmxDvgLvZVOLxD/uAnN4wHQYDVR0OBBYEFKuA"
-            + "WcNlg20dfRO9GcPsGo8NR2qjMBkGCSqGSIb2fQdBAAQMMAobBFY2LjADAgSQ"
-            + "MA0GCSqGSIb3DQEBBQUAA4IBAQA/OVkuogCOsV4RYSzS4Lb1jImGRc4T2Z/d"
-            + "hJoUawhMX4aXWPSlqNOPIfhHflCvd+Whbarcd83NN5n3QmevUOFUREPrMQyA"
-            + "mkK0mpW6TSyLG5ckeCFL8qJwp/hhckk/H16m4hEXWyIFGfOecX3Sy+Y4kxcC"
-            + "lzSMadifedB+TiRpKFKcNphp5hEMkpyyJaGXpLnN/BLsaDyEN7JySExAopae"
-            + "UbUJCvCVIWKwoJ26ih3BG1aB+3yTHXeLIorextqWbq+dVz7me59Li8j5PAxe"
-            + "hXrc2phpKuhp8FaTScvnfMZc8TL4Dr1CHMRWIkqfZaCq3mC376Mww0iZtE5s"
-            + "iqB+AXVWMYIBgDCCAXwCAQEwSzBFMQswCQYDVQQGEwJVUzEWMBQGA1UEChMN"
-            + "R2VvVHJ1c3QgSW5jLjEeMBwGA1UEAxMVR2VvVHJ1c3QgQ0EgZm9yIEFkb2Jl"
-            + "AgIAjzAJBgUrDgMCGgUAoIGMMBoGCSqGSIb3DQEJAzENBgsqhkiG9w0BCRAB"
-            + "BDAcBgkqhkiG9w0BCQUxDxcNMDYwNDA0MjAyMDU3WjAjBgkqhkiG9w0BCQQx"
-            + "FgQUp7AnXBqoNcarvO7fMJut1og2U5AwKwYLKoZIhvcNAQkQAgwxHDAaMBgw"
-            + "FgQU1dH4eZTNhgxdiSABrat6zsPdth0wDQYJKoZIhvcNAQEBBQAEgYCinr/F"
-            + "rMiQz/MRm9ZD5YGcC0Qo2dRTPd0Aop8mZ4g1xAhKFLnp7lLsjCbkSDpVLDBh"
-            + "cnCk7CV+3FT5hlvt8OqZlR0CnkSnCswLFhrppiWle6cpxlwGqyAteC8uKtQu"
-            + "wjE5GtBKLcCOAzQYyyuNZZeB6oCZ+3mPhZ62FxrvvEGJCgAAAAAAAAAAAAAA"
-            + "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
-            + "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
-            + "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
-            + "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
-            + "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
-            + "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
-            + "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
-            + "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
-            + "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==");
-
-    private final byte[] emptyDNCert = Base64.decode(
-              "MIICfTCCAeagAwIBAgIBajANBgkqhkiG9w0BAQQFADB8MQswCQYDVQQGEwJVUzEMMAoGA1UEChMD"
-            + "Q0RXMQkwBwYDVQQLEwAxCTAHBgNVBAcTADEJMAcGA1UECBMAMRowGAYDVQQDExFUZW1wbGFyIFRl"
-            + "c3QgMTAyNDEiMCAGCSqGSIb3DQEJARYTdGVtcGxhcnRlc3RAY2R3LmNvbTAeFw0wNjA1MjIwNTAw"
-            + "MDBaFw0xMDA1MjIwNTAwMDBaMHwxCzAJBgNVBAYTAlVTMQwwCgYDVQQKEwNDRFcxCTAHBgNVBAsT"
-            + "ADEJMAcGA1UEBxMAMQkwBwYDVQQIEwAxGjAYBgNVBAMTEVRlbXBsYXIgVGVzdCAxMDI0MSIwIAYJ"
-            + "KoZIhvcNAQkBFhN0ZW1wbGFydGVzdEBjZHcuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKB"
-            + "gQDH3aJpJBfM+A3d84j5YcU6zEQaQ76u5xO9NSBmHjZykKS2kCcUqPpvVOPDA5WgV22dtKPh+lYV"
-            + "iUp7wyCVwAKibq8HIbihHceFqMKzjwC639rMoDJ7bi/yzQWz1Zg+075a4FGPlUKn7Yfu89wKkjdW"
-            + "wDpRPXc/agqBnrx5pJTXzQIDAQABow8wDTALBgNVHQ8EBAMCALEwDQYJKoZIhvcNAQEEBQADgYEA"
-            + "RRsRsjse3i2/KClFVd6YLZ+7K1BE0WxFyY2bbytkwQJSxvv3vLSuweFUbhNxutb68wl/yW4GLy4b"
-            + "1QdyswNxrNDXTuu5ILKhRDDuWeocz83aG2KGtr3JlFyr3biWGEyn5WUOE6tbONoQDJ0oPYgI6CAc"
-            + "EHdUp0lioOCt6UOw7Cs=");
-
-    private final byte[] gostRFC4491_94 = Base64.decode(
-        "MIICCzCCAboCECMO42BGlSTOxwvklBgufuswCAYGKoUDAgIEMGkxHTAbBgNVBAMM" +
-            "FEdvc3RSMzQxMC05NCBleGFtcGxlMRIwEAYDVQQKDAlDcnlwdG9Qcm8xCzAJBgNV" +
-            "BAYTAlJVMScwJQYJKoZIhvcNAQkBFhhHb3N0UjM0MTAtOTRAZXhhbXBsZS5jb20w" +
-            "HhcNMDUwODE2MTIzMjUwWhcNMTUwODE2MTIzMjUwWjBpMR0wGwYDVQQDDBRHb3N0" +
-            "UjM0MTAtOTQgZXhhbXBsZTESMBAGA1UECgwJQ3J5cHRvUHJvMQswCQYDVQQGEwJS" +
-            "VTEnMCUGCSqGSIb3DQEJARYYR29zdFIzNDEwLTk0QGV4YW1wbGUuY29tMIGlMBwG" +
-            "BiqFAwICFDASBgcqhQMCAiACBgcqhQMCAh4BA4GEAASBgLuEZuF5nls02CyAfxOo" +
-            "GWZxV/6MVCUhR28wCyd3RpjG+0dVvrey85NsObVCNyaE4g0QiiQOHwxCTSs7ESuo" +
-            "v2Y5MlyUi8Go/htjEvYJJYfMdRv05YmKCYJo01x3pg+2kBATjeM+fJyR1qwNCCw+" +
-            "eMG1wra3Gqgqi0WBkzIydvp7MAgGBiqFAwICBANBABHHCH4S3ALxAiMpR3aPRyqB" +
-            "g1DjB8zy5DEjiULIc+HeIveF81W9lOxGkZxnrFjXBSqnjLeFKgF1hffXOAP7zUM=");
-
-    private final byte[] gostRFC4491_2001 = Base64.decode(
-            "MIIB0DCCAX8CECv1xh7CEb0Xx9zUYma0LiEwCAYGKoUDAgIDMG0xHzAdBgNVBAMM" +
-            "Fkdvc3RSMzQxMC0yMDAxIGV4YW1wbGUxEjAQBgNVBAoMCUNyeXB0b1BybzELMAkG" +
-            "A1UEBhMCUlUxKTAnBgkqhkiG9w0BCQEWGkdvc3RSMzQxMC0yMDAxQGV4YW1wbGUu" +
-            "Y29tMB4XDTA1MDgxNjE0MTgyMFoXDTE1MDgxNjE0MTgyMFowbTEfMB0GA1UEAwwW" +
-            "R29zdFIzNDEwLTIwMDEgZXhhbXBsZTESMBAGA1UECgwJQ3J5cHRvUHJvMQswCQYD" +
-            "VQQGEwJSVTEpMCcGCSqGSIb3DQEJARYaR29zdFIzNDEwLTIwMDFAZXhhbXBsZS5j" +
-            "b20wYzAcBgYqhQMCAhMwEgYHKoUDAgIkAAYHKoUDAgIeAQNDAARAhJVodWACGkB1" +
-            "CM0TjDGJLP3lBQN6Q1z0bSsP508yfleP68wWuZWIA9CafIWuD+SN6qa7flbHy7Df" +
-            "D2a8yuoaYDAIBgYqhQMCAgMDQQA8L8kJRLcnqeyn1en7U23Sw6pkfEQu3u0xFkVP" +
-            "vFQ/3cHeF26NG+xxtZPz3TaTVXdoiYkXYiD02rEx1bUcM97i");
-
-    private PublicKey dudPublicKey = new PublicKey()
-    {
-        public String getAlgorithm()
-        {
-            return null;
-        }
-
-        public String getFormat()
-        {
-            return null;
-        }
-
-        public byte[] getEncoded()
-        {
-            return null;
-        }
-
-    };
-
-    public String getName()
-    {
-        return "CertTest";
-    }
-
-    public void checkCertificate(
-        int     id,
-        byte[]  bytes)
-    {
-        ByteArrayInputStream    bIn;
-        String                  dump = "";
-
-        try
-        {
-            bIn = new ByteArrayInputStream(bytes);
-
-            CertificateFactory  fact = CertificateFactory.getInstance("X.509", "BC");
-
-            Certificate cert = fact.generateCertificate(bIn);
-
-            PublicKey    k = cert.getPublicKey();
-            // System.out.println(cert);
-        }
-        catch (Exception e)
-        {
-            fail(dump + System.getProperty("line.separator") + getName() + ": "+ id + " failed - exception " + e.toString(), e);
-        }
-
-    }
-
-    public void checkNameCertificate(
-        int     id,
-        byte[]  bytes)
-    {
-        ByteArrayInputStream    bIn;
-        String                  dump = "";
-
-        try
-        {
-            bIn = new ByteArrayInputStream(bytes);
-
-            CertificateFactory  fact = CertificateFactory.getInstance("X.509", "BC");
-
-            X509Certificate cert = (X509Certificate)fact.generateCertificate(bIn);
-
-            PublicKey    k = cert.getPublicKey();
-            if (!cert.getIssuerDN().toString().equals("C=DE,O=DATEV eG,0.2.262.1.10.7.20=1+CN=CA DATEV D03 1:PN"))
-            {
-                fail(id + " failed - name test.");
-            }
-            // System.out.println(cert);
-        }
-        catch (Exception e)
-        {
-            fail(dump + System.getProperty("line.separator") + getName() + ": "+ id + " failed - exception " + e.toString(), e);
-        }
-
-    }
-
-    public void checkKeyUsage(
-        int     id,
-        byte[]  bytes)
-    {
-        ByteArrayInputStream    bIn;
-        String                  dump = "";
-
-        try
-        {
-            bIn = new ByteArrayInputStream(bytes);
-
-            CertificateFactory  fact = CertificateFactory.getInstance("X.509", "BC");
-
-            X509Certificate cert = (X509Certificate)fact.generateCertificate(bIn);
-
-            PublicKey    k = cert.getPublicKey();
-
-            if (cert.getKeyUsage()[7])
-            {
-                fail("error generating cert - key usage wrong.");
-            }
-
-            // System.out.println(cert);
-        }
-        catch (Exception e)
-        {
-            fail(dump + System.getProperty("line.separator") + getName() + ": "+ id + " failed - exception " + e.toString(), e);
-        }
-
-    }
-
-
-    public void checkSelfSignedCertificate(
-        int     id,
-        byte[]  bytes)
-    {
-        ByteArrayInputStream    bIn;
-        String                  dump = "";
-
-        try
-        {
-            bIn = new ByteArrayInputStream(bytes);
-
-            CertificateFactory  fact = CertificateFactory.getInstance("X.509", "BC");
-
-            Certificate cert = fact.generateCertificate(bIn);
-
-            PublicKey    k = cert.getPublicKey();
-
-            cert.verify(k);
-            // System.out.println(cert);
-        }
-        catch (Exception e)
-        {
-            fail(dump + System.getProperty("line.separator") + getName() + ": "+ id + " failed - exception " + e.toString(), e);
-        }
-
-    }
-
-
-    /**
-     * Test a generated certificate with the sun provider
-     */
-    private void sunProviderCheck(byte[] encoding)
-        throws CertificateException
-    {
-        CertificateFactory certFact = CertificateFactory.getInstance("X.509");
-
-        certFact.generateCertificate(new ByteArrayInputStream(encoding));
-    }
-
-    /**
-     * we generate a self signed certificate for the sake of testing - RSA
-     */
-    public void checkCreation1()
-        throws Exception
-    {
-        //
-        // a sample key pair.
-        //
-        RSAPublicKeySpec pubKeySpec = new RSAPublicKeySpec(
-            new BigInteger("b4a7e46170574f16a97082b22be58b6a2a629798419be12872a4bdba626cfae9900f76abfb12139dce5de56564fab2b6543165a040c606887420e33d91ed7ed7", 16),
-            new BigInteger("11", 16));
-
-        RSAPrivateCrtKeySpec privKeySpec = new RSAPrivateCrtKeySpec(
-            new BigInteger("b4a7e46170574f16a97082b22be58b6a2a629798419be12872a4bdba626cfae9900f76abfb12139dce5de56564fab2b6543165a040c606887420e33d91ed7ed7", 16),
-            new BigInteger("11", 16),
-            new BigInteger("9f66f6b05410cd503b2709e88115d55daced94d1a34d4e32bf824d0dde6028ae79c5f07b580f5dce240d7111f7ddb130a7945cd7d957d1920994da389f490c89", 16),
-            new BigInteger("c0a0758cdf14256f78d4708c86becdead1b50ad4ad6c5c703e2168fbf37884cb", 16),
-            new BigInteger("f01734d7960ea60070f1b06f2bb81bfac48ff192ae18451d5e56c734a5aab8a5", 16),
-            new BigInteger("b54bb9edff22051d9ee60f9351a48591b6500a319429c069a3e335a1d6171391", 16),
-            new BigInteger("d3d83daf2a0cecd3367ae6f8ae1aeb82e9ac2f816c6fc483533d8297dd7884cd", 16),
-            new BigInteger("b8f52fc6f38593dabb661d3f50f8897f8106eee68b1bce78a95b132b4e5b5d19", 16));
-
-        //
-        // set up the keys
-        //
-        PrivateKey          privKey;
-        PublicKey           pubKey;
-
-        KeyFactory  fact = KeyFactory.getInstance("RSA", "BC");
-
-        privKey = fact.generatePrivate(privKeySpec);
-        pubKey = fact.generatePublic(pubKeySpec);
-
-        //
-        // distinguished name table.
-        //
-        X500NameBuilder builder = new X500NameBuilder(BCStyle.INSTANCE);
-
-        builder.addRDN(BCStyle.C, "AU");
-        builder.addRDN(BCStyle.O, "The Legion of the Bouncy Castle");
-        builder.addRDN(BCStyle.L, "Melbourne");
-        builder.addRDN(BCStyle.ST, "Victoria");
-        builder.addRDN(BCStyle.E, "feedback-crypto@bouncycastle.org");
-
-        //
-        // extensions
-        //
-
-        //
-        // create the certificate - version 3 - without extensions
-        //
-        ContentSigner sigGen = new JcaContentSignerBuilder("SHA256WithRSAEncryption").setProvider(BC).build(privKey);
-        X509v3CertificateBuilder certGen = new JcaX509v3CertificateBuilder(builder.build(), BigInteger.valueOf(1), new Date(System.currentTimeMillis() - 50000), new Date(System.currentTimeMillis() + 50000),builder.build(), pubKey);
-
-        X509Certificate cert = new JcaX509CertificateConverter().setProvider(BC).getCertificate(certGen.build(sigGen));
-
-        cert.checkValidity(new Date());
-
-        cert.verify(pubKey);
-
-        cert.verify(cert.getPublicKey());
-
-        Set dummySet = cert.getNonCriticalExtensionOIDs();
-        if (dummySet != null)
-        {
-            fail("non-critical oid set should be null");
-        }
-        dummySet = cert.getCriticalExtensionOIDs();
-        if (dummySet != null)
-        {
-            fail("critical oid set should be null");
-        }
-
-        //
-        // create the certificate - version 3 - with extensions
-        //
-        sigGen = new JcaContentSignerBuilder("MD5WithRSAEncryption").setProvider(BC).build(privKey);
-        certGen = new JcaX509v3CertificateBuilder(builder.build(), BigInteger.valueOf(1)
-            , new Date(System.currentTimeMillis() - 50000)
-            , new Date(System.currentTimeMillis() + 50000)
-            , builder.build()
-            , pubKey)
-            .addExtension(new ASN1ObjectIdentifier("2.5.29.15"), true,
-                new X509KeyUsage(X509KeyUsage.encipherOnly))
-            .addExtension(new ASN1ObjectIdentifier("2.5.29.37"), true,
-                new DERSequence(KeyPurposeId.anyExtendedKeyUsage))
-            .addExtension(new ASN1ObjectIdentifier("2.5.29.17"), true,
-                new GeneralNames(new GeneralName[]
-                    {
-                        new GeneralName(GeneralName.rfc822Name, "test@test.test"),
-                        new GeneralName(GeneralName.dNSName, "dom.test.test")
-                    }));
-
-        X509CertificateHolder certHolder = certGen.build(sigGen);
-
-        cert = new JcaX509CertificateConverter().setProvider(BC).getCertificate(certHolder);
-
-        cert.checkValidity(new Date());
-
-        cert.verify(pubKey);
-        cert.verify(cert.getPublicKey());
-
-        ContentVerifierProvider contentVerifierProvider = new JcaContentVerifierProviderBuilder().setProvider(BC).build(pubKey);
-        if (!certHolder.isSignatureValid(contentVerifierProvider))
-        {
-            fail("signature test failed");
-        }
-
-        ByteArrayInputStream   bIn = new ByteArrayInputStream(cert.getEncoded());
-        CertificateFactory     certFact = CertificateFactory.getInstance("X.509", "BC");
-
-        cert = (X509Certificate)certFact.generateCertificate(bIn);
-
-        if (!cert.getKeyUsage()[7])
-        {
-            fail("error generating cert - key usage wrong.");
-        }
-
-        List l = cert.getExtendedKeyUsage();
-        if (!l.get(0).equals(KeyPurposeId.anyExtendedKeyUsage.getId()))
-        {
-            fail("failed extended key usage test");
-        }
-
-        Collection c = cert.getSubjectAlternativeNames();
-        Iterator   it = c.iterator();
-        while (it.hasNext())
-        {
-            List    gn = (List)it.next();
-            if (!gn.get(1).equals("test@test.test") && !gn.get(1).equals("dom.test.test"))
-            {
-                fail("failed subject alternative names test");
-            }
-        }
-
-        sunProviderCheck(certHolder.getEncoded());
-        sunProviderCheck(cert.getEncoded());
-
-        // System.out.println(cert);
-
-        //
-        // create the certificate - version 1
-        //
-        sigGen = new JcaContentSignerBuilder("MD5WithRSAEncryption").setProvider(BC).build(privKey);
-        X509v1CertificateBuilder certGen1 = new JcaX509v1CertificateBuilder(builder.build(), BigInteger.valueOf(1), new Date(System.currentTimeMillis() - 50000),new Date(System.currentTimeMillis() + 50000),builder.build(),pubKey);
-
-        cert = new JcaX509CertificateConverter().setProvider(BC).getCertificate(certGen1.build(sigGen));
-
-        cert.checkValidity(new Date());
-
-        cert.verify(pubKey);
-        cert.verify(cert.getPublicKey());
-
-        bIn = new ByteArrayInputStream(cert.getEncoded());
-        certFact = CertificateFactory.getInstance("X.509", "BC");
-
-        cert = (X509Certificate)certFact.generateCertificate(bIn);
-
-        // System.out.println(cert);
-        if (!cert.getIssuerDN().equals(cert.getSubjectDN()))
-        {
-            fail("name comparison fails");
-        }
-
-        sunProviderCheck(certHolder.getEncoded());
-        sunProviderCheck(cert.getEncoded());
-//
-        // a lightweight key pair.
-        //
-        RSAKeyParameters lwPubKey = new RSAKeyParameters(
-            false,
-            new BigInteger("b4a7e46170574f16a97082b22be58b6a2a629798419be12872a4bdba626cfae9900f76abfb12139dce5de56564fab2b6543165a040c606887420e33d91ed7ed7", 16),
-            new BigInteger("11", 16));
-
-        RSAPrivateCrtKeyParameters lwPrivKey = new RSAPrivateCrtKeyParameters(
-            new BigInteger("b4a7e46170574f16a97082b22be58b6a2a629798419be12872a4bdba626cfae9900f76abfb12139dce5de56564fab2b6543165a040c606887420e33d91ed7ed7", 16),
-            new BigInteger("11", 16),
-            new BigInteger("9f66f6b05410cd503b2709e88115d55daced94d1a34d4e32bf824d0dde6028ae79c5f07b580f5dce240d7111f7ddb130a7945cd7d957d1920994da389f490c89", 16),
-            new BigInteger("c0a0758cdf14256f78d4708c86becdead1b50ad4ad6c5c703e2168fbf37884cb", 16),
-            new BigInteger("f01734d7960ea60070f1b06f2bb81bfac48ff192ae18451d5e56c734a5aab8a5", 16),
-            new BigInteger("b54bb9edff22051d9ee60f9351a48591b6500a319429c069a3e335a1d6171391", 16),
-            new BigInteger("d3d83daf2a0cecd3367ae6f8ae1aeb82e9ac2f816c6fc483533d8297dd7884cd", 16),
-            new BigInteger("b8f52fc6f38593dabb661d3f50f8897f8106eee68b1bce78a95b132b4e5b5d19", 16));
-
-        //
-        // distinguished name table.
-        //
-        builder = new X500NameBuilder(BCStyle.INSTANCE);
-        
-        builder.addRDN(BCStyle.C, "AU");
-        builder.addRDN(BCStyle.O, "The Legion of the Bouncy Castle");
-        builder.addRDN(BCStyle.L, "Melbourne");
-        builder.addRDN(BCStyle.ST, "Victoria");
-        builder.addRDN(BCStyle.E, "feedback-crypto@bouncycastle.org");
-
-        //
-        // extensions
-        //
-
-        //
-        // create the certificate - version 3 - without extensions
-        //
-        AlgorithmIdentifier sigAlgId = new DefaultSignatureAlgorithmIdentifierFinder().find("SHA256WithRSAEncryption");
-        AlgorithmIdentifier digAlgId = new DefaultDigestAlgorithmIdentifierFinder().find(sigAlgId);
-
-        sigGen = new BcRSAContentSignerBuilder(sigAlgId, digAlgId).build(lwPrivKey);
-        SubjectPublicKeyInfo pubInfo = new SubjectPublicKeyInfo(new AlgorithmIdentifier(PKCSObjectIdentifiers.rsaEncryption, DERNull.INSTANCE), new RSAPublicKey(lwPubKey.getModulus(), lwPubKey.getExponent()));
-        certGen = new X509v3CertificateBuilder(builder.build(), BigInteger.valueOf(1), new Date(System.currentTimeMillis() - 50000), new Date(System.currentTimeMillis() + 50000), builder.build(), pubInfo);
-
-        certHolder = certGen.build(sigGen);
-
-        cert = new JcaX509CertificateConverter().setProvider(BC).getCertificate(certHolder);
-
-        cert.checkValidity(new Date());
-
-        cert.verify(pubKey);
-
-        contentVerifierProvider = new BcRSAContentVerifierProviderBuilder(new DefaultDigestAlgorithmIdentifierFinder()).build(lwPubKey);
-
-        if (!certHolder.isSignatureValid(contentVerifierProvider))
-        {
-            fail("lw sig verification failed");
-        }
-    }
-
-    /**
-     * we generate a self signed certificate for the sake of testing - DSA
-     */
-    public void checkCreation2()
-        throws Exception
-    {
-        //
-        // set up the keys
-        //
-        PrivateKey          privKey;
-        PublicKey           pubKey;
-
-        try
-        {
-            KeyPairGenerator    g = KeyPairGenerator.getInstance("DSA", "SUN");
-
-            g.initialize(512, new SecureRandom());
-
-            KeyPair p = g.generateKeyPair();
-
-            privKey = p.getPrivate();
-            pubKey = p.getPublic();
-        }
-        catch (Exception e)
-        {
-            fail("error setting up keys - " + e.toString());
-            return;
-        }
-
-        //
-        // distinguished name table.
-        //
-        X500NameBuilder builder = createStdBuilder();
-
-        //
-        // extensions
-        //
-
-        //
-        // create the certificate - version 3
-        //
-
-        ContentSigner sigGen = new JcaContentSignerBuilder("SHA1withDSA").setProvider(BC).build(privKey);
-        JcaX509v3CertificateBuilder  certGen = new JcaX509v3CertificateBuilder(builder.build(),BigInteger.valueOf(1),new Date(System.currentTimeMillis() - 50000),new Date(System.currentTimeMillis() + 50000),builder.build(),pubKey);
-
-
-            X509Certificate cert = new JcaX509CertificateConverter().setProvider(BC).getCertificate(certGen.build(sigGen));
-
-            cert.checkValidity(new Date());
-
-            cert.verify(pubKey);
-
-            ByteArrayInputStream    bIn = new ByteArrayInputStream(cert.getEncoded());
-            CertificateFactory      fact = CertificateFactory.getInstance("X.509", BC);
-
-            cert = (X509Certificate)fact.generateCertificate(bIn);
-
-            // System.out.println(cert);
-
-
-        //
-        // create the certificate - version 1
-        //
-        sigGen = new JcaContentSignerBuilder("SHA1withDSA").setProvider(BC).build(privKey);
-        JcaX509v1CertificateBuilder  certGen1 = new JcaX509v1CertificateBuilder(builder.build(),BigInteger.valueOf(1),new Date(System.currentTimeMillis() - 50000),new Date(System.currentTimeMillis() + 50000),builder.build(),pubKey);
-        
-            cert = new JcaX509CertificateConverter().setProvider(BC).getCertificate(certGen1.build(sigGen));
-
-            cert.checkValidity(new Date());
-
-            cert.verify(pubKey);
-
-            bIn = new ByteArrayInputStream(cert.getEncoded());
-            fact = CertificateFactory.getInstance("X.509", BC);
-
-            cert = (X509Certificate)fact.generateCertificate(bIn);
-
-            //System.out.println(cert);
-
-        //
-        // exception test
-        //
-        try
-        {
-            certGen1 = new JcaX509v1CertificateBuilder(builder.build(),BigInteger.valueOf(1),new Date(System.currentTimeMillis() - 50000),new Date(System.currentTimeMillis() + 50000),builder.build(),dudPublicKey);
-
-
-            fail("key without encoding not detected in v1");
-        }
-        catch (IllegalArgumentException e)
-        {
-            // expected
-        }
-    }
-
-    private X500NameBuilder createStdBuilder()
-    {
-        X500NameBuilder builder = new X500NameBuilder(BCStyle.INSTANCE);
-        
-        builder.addRDN(BCStyle.C, "AU");
-        builder.addRDN(BCStyle.O, "The Legion of the Bouncy Castle");
-        builder.addRDN(BCStyle.L, "Melbourne");
-        builder.addRDN(BCStyle.ST, "Victoria");
-        builder.addRDN(BCStyle.E, "feedback-crypto@bouncycastle.org");
-        
-        return builder;
-    }
-
-    /**
-     * we generate a self signed certificate for the sake of testing - ECDSA
-     */
-    public void checkCreation3()
-    {
-        ECCurve curve = new ECCurve.Fp(
-            new BigInteger("883423532389192164791648750360308885314476597252960362792450860609699839"), // q
-            new BigInteger("7fffffffffffffffffffffff7fffffffffff8000000000007ffffffffffc", 16), // a
-            new BigInteger("6b016c3bdcf18941d0d654921475ca71a9db2fb27d1d37796185c2942c0a", 16)); // b
-
-        ECParameterSpec spec = new ECParameterSpec(
-            curve,
-            curve.decodePoint(Hex.decode("020ffa963cdca8816ccc33b8642bedf905c3d358573d3f27fbbd3b3cb9aaaf")), // G
-            new BigInteger("883423532389192164791648750360308884807550341691627752275345424702807307")); // n
-
-
-        ECPrivateKeySpec privKeySpec = new ECPrivateKeySpec(
-            new BigInteger("876300101507107567501066130761671078357010671067781776716671676178726717"), // d
-            spec);
-
-        ECPublicKeySpec pubKeySpec = new ECPublicKeySpec(
-            curve.decodePoint(Hex.decode("025b6dc53bc61a2548ffb0f671472de6c9521a9d2d2534e65abfcbd5fe0c70")), // Q
-            spec);
-
-        //
-        // set up the keys
-        //
-        PrivateKey          privKey;
-        PublicKey           pubKey;
-
-        try
-        {
-            KeyFactory     fact = KeyFactory.getInstance("ECDSA", BC);
-
-            privKey = fact.generatePrivate(privKeySpec);
-            pubKey = fact.generatePublic(pubKeySpec);
-        }
-        catch (Exception e)
-        {
-            fail("error setting up keys - " + e.toString());
-            return;
-        }
-
-        //
-        // distinguished name table.
-        //
-        X500NameBuilder builder = createStdBuilder();
-
-
-        //
-        // toString test
-        //
-        X500Name p = builder.build();
-        String  s = p.toString();
-
-        if (!s.equals("C=AU,O=The Legion of the Bouncy Castle,L=Melbourne,ST=Victoria,E=feedback-crypto@bouncycastle.org"))
-        {
-            fail("ordered X509Principal test failed - s = " + s + ".");
-        }
-
-//        p = new X509Principal(attrs);
-//        s = p.toString();
-//
-//        //
-//        // we need two of these as the hash code for strings changed...
-//        //
-//        if (!s.equals("O=The Legion of the Bouncy Castle,E=feedback-crypto@bouncycastle.org,ST=Victoria,L=Melbourne,C=AU") && !s.equals("ST=Victoria,L=Melbourne,C=AU,E=feedback-crypto@bouncycastle.org,O=The Legion of the Bouncy Castle"))
-//        {
-//            fail("unordered X509Principal test failed.");
-//        }
-
-        //
-        // create the certificate - version 3
-        //
-                try
-        {
-        ContentSigner sigGen = new JcaContentSignerBuilder("SHA1withECDSA").setProvider(BC).build(privKey);
-        JcaX509v3CertificateBuilder  certGen = new JcaX509v3CertificateBuilder(builder.build(),BigInteger.valueOf(1),new Date(System.currentTimeMillis() - 50000),new Date(System.currentTimeMillis() + 50000),builder.build(),pubKey);
-
-            X509Certificate cert = new JcaX509CertificateConverter().setProvider(BC).getCertificate(certGen.build(sigGen));
-
-            cert.checkValidity(new Date());
-
-            cert.verify(pubKey);
-
-            ByteArrayInputStream    bIn = new ByteArrayInputStream(cert.getEncoded());
-            CertificateFactory      fact = CertificateFactory.getInstance("X.509", BC);
-
-            cert = (X509Certificate)fact.generateCertificate(bIn);
-
-            //
-            // try with point compression turned off
-            //
-            ((ECPointEncoder)pubKey).setPointFormat("UNCOMPRESSED");
-
-            certGen = new JcaX509v3CertificateBuilder(builder.build(),BigInteger.valueOf(1),new Date(System.currentTimeMillis() - 50000),new Date(System.currentTimeMillis() + 50000),builder.build(),pubKey);
-
-            cert = new JcaX509CertificateConverter().setProvider(BC).getCertificate(certGen.build(sigGen));
-
-            cert.checkValidity(new Date());
-
-            cert.verify(pubKey);
-
-            bIn = new ByteArrayInputStream(cert.getEncoded());
-            fact = CertificateFactory.getInstance("X.509", BC);
-
-            cert = (X509Certificate)fact.generateCertificate(bIn);
-            // System.out.println(cert);
-        }
-        catch (Exception e)
-        {
-            fail("error setting generating cert - " + e.toString());
-        }
-
-        X509Principal pr = new X509Principal("O=\"The Bouncy Castle, The Legion of\",E=feedback-crypto@bouncycastle.org,ST=Victoria,L=Melbourne,C=AU");
-
-        if (!pr.toString().equals("O=The Bouncy Castle\\, The Legion of,E=feedback-crypto@bouncycastle.org,ST=Victoria,L=Melbourne,C=AU"))
-        {
-            fail("string based X509Principal test failed.");
-        }
-
-        pr = new X509Principal("O=The Bouncy Castle\\, The Legion of,E=feedback-crypto@bouncycastle.org,ST=Victoria,L=Melbourne,C=AU");
-
-        if (!pr.toString().equals("O=The Bouncy Castle\\, The Legion of,E=feedback-crypto@bouncycastle.org,ST=Victoria,L=Melbourne,C=AU"))
-        {
-            fail("string based X509Principal test failed.");
-        }
-
-    }
-
-    /**
-     * we generate a self signed certificate for the sake of testing - SHA224withECDSA
-     */
-    private void createECCert(String algorithm, ASN1ObjectIdentifier algOid)
-        throws Exception
-    {
-        ECCurve.Fp curve = new ECCurve.Fp(
-            new BigInteger("6864797660130609714981900799081393217269435300143305409394463459185543183397656052122559640661454554977296311391480858037121987999716643812574028291115057151"), // q (or p)
-            new BigInteger("01FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFC", 16),   // a
-            new BigInteger("0051953EB9618E1C9A1F929A21A0B68540EEA2DA725B99B315F3B8B489918EF109E156193951EC7E937B1652C0BD3BB1BF073573DF883D2C34F1EF451FD46B503F00", 16));  // b
-
-        ECParameterSpec spec = new ECParameterSpec(
-            curve,
-            curve.decodePoint(Hex.decode("0200C6858E06B70404E9CD9E3ECB662395B4429C648139053FB521F828AF606B4D3DBAA14B5E77EFE75928FE1DC127A2FFA8DE3348B3C1856A429BF97E7E31C2E5BD66")), // G
-            new BigInteger("01FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFA51868783BF2F966B7FCC0148F709A5D03BB5C9B8899C47AEBB6FB71E91386409", 16)); // n
-
-        ECPrivateKeySpec privKeySpec = new ECPrivateKeySpec(
-            new BigInteger("5769183828869504557786041598510887460263120754767955773309066354712783118202294874205844512909370791582896372147797293913785865682804434049019366394746072023"), // d
-            spec);
-
-        ECPublicKeySpec pubKeySpec = new ECPublicKeySpec(
-            curve.decodePoint(Hex.decode("02006BFDD2C9278B63C92D6624F151C9D7A822CC75BD983B17D25D74C26740380022D3D8FAF304781E416175EADF4ED6E2B47142D2454A7AC7801DD803CF44A4D1F0AC")), // Q
-            spec);
-
-        //
-        // set up the keys
-        //
-        PrivateKey          privKey;
-        PublicKey           pubKey;
-
-        KeyFactory     fact = KeyFactory.getInstance("ECDSA", BC);
-
-        privKey = fact.generatePrivate(privKeySpec);
-        pubKey = fact.generatePublic(pubKeySpec);
-
-
-        //
-        // distinguished name table.
-        //
-        X500NameBuilder builder = createStdBuilder();
-
-        //
-        // create the certificate - version 3
-        //
-        ContentSigner sigGen = new JcaContentSignerBuilder(algorithm).setProvider(BC).build(privKey);
-        X509v3CertificateBuilder  certGen = new JcaX509v3CertificateBuilder(builder.build(),BigInteger.valueOf(1),new Date(System.currentTimeMillis() - 50000),new Date(System.currentTimeMillis() + 50000),builder.build(),pubKey);
-
-        X509Certificate cert = new JcaX509CertificateConverter().setProvider(BC).getCertificate(certGen.build(sigGen));
-
-        cert.checkValidity(new Date());
-
-        cert.verify(pubKey);
-
-        ByteArrayInputStream    bIn = new ByteArrayInputStream(cert.getEncoded());
-        CertificateFactory      certFact = CertificateFactory.getInstance("X.509", BC);
-
-        cert = (X509Certificate)certFact.generateCertificate(bIn);
-
-        //
-        // try with point compression turned off
-        //
-        ((ECPointEncoder)pubKey).setPointFormat("UNCOMPRESSED");
-
-        certGen = new JcaX509v3CertificateBuilder(builder.build(),BigInteger.valueOf(1),new Date(System.currentTimeMillis() - 50000),new Date(System.currentTimeMillis() + 50000),builder.build(),pubKey);
-
-        cert = new JcaX509CertificateConverter().setProvider(BC).getCertificate(certGen.build(sigGen));
-
-        cert.checkValidity(new Date());
-
-        cert.verify(pubKey);
-
-        bIn = new ByteArrayInputStream(cert.getEncoded());
-        certFact = CertificateFactory.getInstance("X.509", BC);
-
-        cert = (X509Certificate)certFact.generateCertificate(bIn);
-
-        if (!cert.getSigAlgOID().equals(algOid.toString()))
-        {
-            fail("ECDSA oid incorrect.");
-        }
- 
-        if (cert.getSigAlgParams() != null)
-        {
-            fail("sig parameters present");
-        }
-
-        Signature sig = Signature.getInstance(algorithm, BC);
-
-        sig.initVerify(pubKey);
-
-        sig.update(cert.getTBSCertificate());
-
-        if (!sig.verify(cert.getSignature()))
-        {
-            fail("EC certificate signature not mapped correctly.");
-        }
-        // System.out.println(cert);
-    }
-
-    private void checkCRL(
-        int     id,
-        byte[]  bytes)
-    {
-        ByteArrayInputStream    bIn;
-        String                  dump = "";
-
-        try
-        {
-            bIn = new ByteArrayInputStream(bytes);
-
-            CertificateFactory  fact = CertificateFactory.getInstance("X.509", BC);
-
-            CRL cert = fact.generateCRL(bIn);
-
-            // System.out.println(cert);
-        }
-        catch (Exception e)
-        {
-            fail(dump + System.getProperty("line.separator") + getName() + ": "+ id + " failed - exception " + e.toString(), e);
-        }
-
-    }
-
-    public void checkCRLCreation1()
-        throws Exception
-    {
-        KeyPairGenerator     kpGen = KeyPairGenerator.getInstance("RSA", BC);
-        Date                 now = new Date();
-        KeyPair              pair = kpGen.generateKeyPair();
-        X509v2CRLBuilder     crlGen = new X509v2CRLBuilder(new X500Name("CN=Test CA"), now);
-
-        crlGen.setNextUpdate(new Date(now.getTime() + 100000));
-
-        crlGen.addCRLEntry(BigInteger.ONE, now, CRLReason.privilegeWithdrawn);
-
-        crlGen.addExtension(X509Extensions.AuthorityKeyIdentifier, false, new AuthorityKeyIdentifierStructure(pair.getPublic()));
-
-        X509CRLHolder crl = crlGen.build(new JcaContentSignerBuilder("SHA256withRSAEncryption").setProvider(BC).build(pair.getPrivate()));
-
-        if (!crl.getIssuer().equals(new X500Name("CN=Test CA")))
-        {
-            fail("failed CRL issuer test");
-        }
-
-        Extension authExt = crl.getExtension(Extension.authorityKeyIdentifier);
-
-        if (authExt == null)
-        {
-            fail("failed to find CRL extension");
-        }
-
-        AuthorityKeyIdentifier authId = new AuthorityKeyIdentifierStructure(authExt);
-
-        X509CRLEntryHolder entry = crl.getRevokedCertificate(BigInteger.ONE);
-
-        if (entry == null)
-        {
-            fail("failed to find CRL entry");
-        }
-
-        if (!entry.getSerialNumber().equals(BigInteger.ONE))
-        {
-            fail("CRL cert serial number does not match");
-        }
-
-        if (!entry.hasExtensions())
-        {
-            fail("CRL entry extension not found");
-        }
-
-        Extension ext = entry.getExtension(X509Extension.reasonCode);
-
-        if (ext != null)
-        {
-            ASN1Enumerated   reasonCode = (ASN1Enumerated)ASN1Enumerated.getInstance(ext.getParsedValue());
-
-            if (reasonCode.getValue().intValue() != CRLReason.privilegeWithdrawn)
-            {
-                fail("CRL entry reasonCode wrong");
-            }
-        }
-        else
-        {
-            fail("CRL entry reasonCode not found");
-        }
-    }
-
-    public void checkCRLCreation2()
-        throws Exception
-    {
-        KeyPairGenerator     kpGen = KeyPairGenerator.getInstance("RSA", BC);
-
-        Date                 now = new Date();
-        KeyPair              pair = kpGen.generateKeyPair();
-        X509v2CRLBuilder     crlGen = new JcaX509v2CRLBuilder(new X500Principal("CN=Test CA"), now);
-
-        crlGen.setNextUpdate(new Date(now.getTime() + 100000));
-        
-        Vector extOids = new Vector();
-        Vector extValues = new Vector();
-
-        CRLReason crlReason = CRLReason.lookup(CRLReason.privilegeWithdrawn);
-
-        try
-        {
-            extOids.addElement(X509Extensions.ReasonCode);
-            extValues.addElement(new X509Extension(false, new DEROctetString(crlReason.getEncoded())));
-        }
-        catch (IOException e)
-        {
-            throw new IllegalArgumentException("error encoding reason: " + e);
-        }
-
-        X509Extensions entryExtensions = new X509Extensions(extOids, extValues);
-
-        crlGen.addCRLEntry(BigInteger.ONE, now, entryExtensions);
-
-        crlGen.addExtension(X509Extensions.AuthorityKeyIdentifier, false, new AuthorityKeyIdentifierStructure(pair.getPublic()));
-
-        X509CRLHolder crlHolder = crlGen.build(new JcaContentSignerBuilder("SHA256withRSAEncryption").setProvider(BC).build(pair.getPrivate()));
-
-        X509CRL crl = new JcaX509CRLConverter().setProvider(BC).getCRL(crlHolder);
-
-        if (!crl.getIssuerX500Principal().equals(new X500Principal("CN=Test CA")))
-        {
-            fail("failed CRL issuer test");
-        }
-
-        byte[] authExt = crl.getExtensionValue(X509Extensions.AuthorityKeyIdentifier.getId());
-
-        if (authExt == null)
-        {
-            fail("failed to find CRL extension");
-        }
-
-        AuthorityKeyIdentifier authId = new AuthorityKeyIdentifierStructure(authExt);
-
-        X509CRLEntry entry = crl.getRevokedCertificate(BigInteger.ONE);
-
-        if (entry == null)
-        {
-            fail("failed to find CRL entry");
-        }
-
-        if (!entry.getSerialNumber().equals(BigInteger.ONE))
-        {
-            fail("CRL cert serial number does not match");
-        }
-
-        if (!entry.hasExtensions())
-        {
-            fail("CRL entry extension not found");
-        }
-
-        byte[]  ext = entry.getExtensionValue(X509Extensions.ReasonCode.getId());
-
-        if (ext != null)
-        {
-            ASN1Enumerated   reasonCode = (ASN1Enumerated)X509ExtensionUtil.fromExtensionValue(ext);
-
-            if (reasonCode.getValue().intValue() != CRLReason.privilegeWithdrawn)
-            {
-                fail("CRL entry reasonCode wrong");
-            }
-        }
-        else
-        {
-            fail("CRL entry reasonCode not found");
-        }
-    }
-
-    public void checkCRLCreation3()
-        throws Exception
-    {
-        KeyPairGenerator     kpGen = KeyPairGenerator.getInstance("RSA", BC);
-        Date                 now = new Date();
-        KeyPair              pair = kpGen.generateKeyPair();
-        X509v2CRLBuilder     crlGen = new JcaX509v2CRLBuilder(new X500Principal("CN=Test CA"), now);
-
-        crlGen.setNextUpdate(new Date(now.getTime() + 100000));
-
-        Vector extOids = new Vector();
-        Vector extValues = new Vector();
-
-        CRLReason crlReason = CRLReason.lookup(CRLReason.privilegeWithdrawn);
-
-        try
-        {
-            extOids.addElement(X509Extensions.ReasonCode);
-            extValues.addElement(new X509Extension(false, new DEROctetString(crlReason.getEncoded())));
-        }
-        catch (IOException e)
-        {
-            throw new IllegalArgumentException("error encoding reason: " + e);
-        }
-
-        X509Extensions entryExtensions = new X509Extensions(extOids, extValues);
-
-        crlGen.addCRLEntry(BigInteger.ONE, now, entryExtensions);
-
-        crlGen.addExtension(X509Extensions.AuthorityKeyIdentifier, false, new AuthorityKeyIdentifierStructure(pair.getPublic()));
-
-        X509CRLHolder crlHolder = crlGen.build(new JcaContentSignerBuilder("SHA256withRSAEncryption").setProvider(BC).build(pair.getPrivate()));
-
-        X509CRL crl = new JcaX509CRLConverter().setProvider(BC).getCRL(crlHolder);
-
-        if (!crl.getIssuerX500Principal().equals(new X500Principal("CN=Test CA")))
-        {
-            fail("failed CRL issuer test");
-        }
-
-        byte[] authExt = crl.getExtensionValue(X509Extensions.AuthorityKeyIdentifier.getId());
-
-        if (authExt == null)
-        {
-            fail("failed to find CRL extension");
-        }
-
-        AuthorityKeyIdentifier authId = new AuthorityKeyIdentifierStructure(authExt);
-
-        X509CRLEntry entry = crl.getRevokedCertificate(BigInteger.ONE);
-
-        if (entry == null)
-        {
-            fail("failed to find CRL entry");
-        }
-
-        if (!entry.getSerialNumber().equals(BigInteger.ONE))
-        {
-            fail("CRL cert serial number does not match");
-        }
-
-        if (!entry.hasExtensions())
-        {
-            fail("CRL entry extension not found");
-        }
-
-        byte[]  ext = entry.getExtensionValue(X509Extensions.ReasonCode.getId());
-
-        if (ext != null)
-        {
-            ASN1Enumerated   reasonCode = (ASN1Enumerated)X509ExtensionUtil.fromExtensionValue(ext);
-
-            if (reasonCode.getValue().intValue() != CRLReason.privilegeWithdrawn)
-            {
-                fail("CRL entry reasonCode wrong");
-            }
-        }
-        else
-        {
-            fail("CRL entry reasonCode not found");
-        }
-
-        //
-        // check loading of existing CRL
-        //
-        now = new Date();
-        crlGen = new X509v2CRLBuilder(new X500Name("CN=Test CA"), now);
-
-        crlGen.setNextUpdate(new Date(now.getTime() + 100000));
-
-        crlGen.addCRL(new JcaX509CRLHolder(crl));
-
-        crlGen.addCRLEntry(BigInteger.valueOf(2), now, entryExtensions);
-
-        crlGen.addExtension(X509Extension.authorityKeyIdentifier, false, new AuthorityKeyIdentifierStructure(pair.getPublic()));
-
-        crlHolder = crlGen.build(new JcaContentSignerBuilder("SHA256withRSAEncryption").setProvider(BC).build(pair.getPrivate()));
-
-        int     count = 0;
-        boolean oneFound = false;
-        boolean twoFound = false;
-
-        Iterator it = crlHolder.getRevokedCertificates().iterator();
-        while (it.hasNext())
-        {
-            X509CRLEntryHolder crlEnt = (X509CRLEntryHolder)it.next();
-
-            if (crlEnt.getSerialNumber().intValue() == 1)
-            {
-                oneFound = true;
-                Extension  extn = crlEnt.getExtension(X509Extension.reasonCode);
-
-                if (extn != null)
-                {
-                    ASN1Enumerated reasonCode = (ASN1Enumerated)ASN1Enumerated.getInstance(extn.getParsedValue());
-
-                    if (reasonCode.getValue().intValue() != CRLReason.privilegeWithdrawn)
-                    {
-                        fail("CRL entry reasonCode wrong");
-                    }
-                }
-                else
-                {
-                    fail("CRL entry reasonCode not found");
-                }
-            }
-            else if (crlEnt.getSerialNumber().intValue() == 2)
-            {
-                twoFound = true;
-            }
-
-            count++;
-        }
-
-        if (count != 2)
-        {
-            fail("wrong number of CRLs found");
-        }
-
-        if (!oneFound || !twoFound)
-        {
-            fail("wrong CRLs found in copied list");
-        }
-
-        //
-        // check factory read back
-        //
-        CertificateFactory cFact = CertificateFactory.getInstance("X.509", BC);
-
-        X509CRL readCrl = (X509CRL)cFact.generateCRL(new ByteArrayInputStream(crlHolder.getEncoded()));
-
-        if (readCrl == null)
-        {
-            fail("crl not returned!");
-        }
-
-        Collection col = cFact.generateCRLs(new ByteArrayInputStream(crlHolder.getEncoded()));
-
-        if (col.size() != 1)
-        {
-            fail("wrong number of CRLs found in collection");
-        }
-    }
-
-    /**
-     * we generate a self signed certificate for the sake of testing - GOST3410
-     */
-    public void checkCreation4()
-        throws Exception
-    {
-        //
-        // set up the keys
-        //
-        PrivateKey          privKey;
-        PublicKey           pubKey;
-
-        KeyPairGenerator    g = KeyPairGenerator.getInstance("GOST3410", BC);
-        GOST3410ParameterSpec gost3410P = new GOST3410ParameterSpec("GostR3410-94-CryptoPro-A");
-
-        g.initialize(gost3410P, new SecureRandom());
-
-        KeyPair p = g.generateKeyPair();
-
-        privKey = p.getPrivate();
-        pubKey = p.getPublic();
-
-        //
-        // distinguished name table.
-        //
-        X500NameBuilder builder = createStdBuilder();
-
-        //
-        // extensions
-        //
-
-        //
-        // create the certificate - version 3
-        //
-        ContentSigner sigGen = new JcaContentSignerBuilder("GOST3411withGOST3410").setProvider(BC).build(privKey);
-        X509v3CertificateBuilder  certGen = new JcaX509v3CertificateBuilder(builder.build(),BigInteger.valueOf(1),new Date(System.currentTimeMillis() - 50000),new Date(System.currentTimeMillis() + 50000),builder.build(),pubKey);
-
-        X509Certificate cert = new JcaX509CertificateConverter().setProvider(BC).getCertificate(certGen.build(sigGen));
-
-        cert.checkValidity(new Date());
-
-        //
-        // check verifies in general
-        //
-        cert.verify(pubKey);
-
-        //
-        // check verifies with contained key
-        //
-        cert.verify(cert.getPublicKey());
-
-        ByteArrayInputStream    bIn = new ByteArrayInputStream(cert.getEncoded());
-        CertificateFactory      fact = CertificateFactory.getInstance("X.509", BC);
-
-        cert = (X509Certificate)fact.generateCertificate(bIn);
-
-        //System.out.println(cert);
-
-        //check getEncoded()
-        byte[]  bytes = cert.getEncoded();
-    }
-
-    public void checkCreation5()
-        throws Exception
-    {
-        //
-        // a sample key pair.
-        //
-        RSAPublicKeySpec pubKeySpec = new RSAPublicKeySpec(
-            new BigInteger("b4a7e46170574f16a97082b22be58b6a2a629798419be12872a4bdba626cfae9900f76abfb12139dce5de56564fab2b6543165a040c606887420e33d91ed7ed7", 16),
-            new BigInteger("11", 16));
-
-        RSAPrivateCrtKeySpec privKeySpec = new RSAPrivateCrtKeySpec(
-            new BigInteger("b4a7e46170574f16a97082b22be58b6a2a629798419be12872a4bdba626cfae9900f76abfb12139dce5de56564fab2b6543165a040c606887420e33d91ed7ed7", 16),
-            new BigInteger("11", 16),
-            new BigInteger("9f66f6b05410cd503b2709e88115d55daced94d1a34d4e32bf824d0dde6028ae79c5f07b580f5dce240d7111f7ddb130a7945cd7d957d1920994da389f490c89", 16),
-            new BigInteger("c0a0758cdf14256f78d4708c86becdead1b50ad4ad6c5c703e2168fbf37884cb", 16),
-            new BigInteger("f01734d7960ea60070f1b06f2bb81bfac48ff192ae18451d5e56c734a5aab8a5", 16),
-            new BigInteger("b54bb9edff22051d9ee60f9351a48591b6500a319429c069a3e335a1d6171391", 16),
-            new BigInteger("d3d83daf2a0cecd3367ae6f8ae1aeb82e9ac2f816c6fc483533d8297dd7884cd", 16),
-            new BigInteger("b8f52fc6f38593dabb661d3f50f8897f8106eee68b1bce78a95b132b4e5b5d19", 16));
-
-        //
-        // set up the keys
-        //
-        SecureRandom        rand = new SecureRandom();
-        PrivateKey          privKey;
-        PublicKey           pubKey;
-
-        KeyFactory  fact = KeyFactory.getInstance("RSA", BC);
-
-        privKey = fact.generatePrivate(privKeySpec);
-        pubKey = fact.generatePublic(pubKeySpec);
-
-        //
-        // distinguished name table.
-        //
-        Vector                      ord = new Vector();
-        Vector                      values = new Vector();
-
-        X500NameBuilder builder = createStdBuilder();
-
-        //
-        // create base certificate - version 3
-        //
-        ContentSigner sigGen = new JcaContentSignerBuilder("MD5WithRSAEncryption").setProvider(BC).build(privKey);
-        X509v3CertificateBuilder certGen = new JcaX509v3CertificateBuilder(builder.build(),BigInteger.valueOf(1),new Date(System.currentTimeMillis() - 50000),new Date(System.currentTimeMillis() + 50000),builder.build(),pubKey)
-            .addExtension(new ASN1ObjectIdentifier("2.5.29.15"), true,
-            new X509KeyUsage(X509KeyUsage.encipherOnly))
-            .addExtension(new ASN1ObjectIdentifier("2.5.29.37"), true,
-            new DERSequence(KeyPurposeId.anyExtendedKeyUsage))
-            .addExtension(new ASN1ObjectIdentifier("2.5.29.17"), true,
-            new GeneralNames(new GeneralName(GeneralName.rfc822Name, "test@test.test")));
-
-        X509Certificate baseCert = new JcaX509CertificateConverter().setProvider(BC).getCertificate(certGen.build(sigGen));
-
-        //
-        // copy certificate
-        //
-
-        certGen = new JcaX509v3CertificateBuilder(builder.build(),BigInteger.valueOf(1),new Date(System.currentTimeMillis() - 50000),new Date(System.currentTimeMillis() + 50000),builder.build(),pubKey)
-            .copyAndAddExtension(new ASN1ObjectIdentifier("2.5.29.15"), true, baseCert)
-            .copyAndAddExtension(new ASN1ObjectIdentifier("2.5.29.37"), false, baseCert);
-
-        X509Certificate cert = new JcaX509CertificateConverter().setProvider(BC).getCertificate(certGen.build(sigGen));
-
-        cert.checkValidity(new Date());
-
-        cert.verify(pubKey);
-
-        if (!areEqual(baseCert.getExtensionValue("2.5.29.15"), cert.getExtensionValue("2.5.29.15")))
-        {
-            fail("2.5.29.15 differs");
-        }
-
-        if (!areEqual(baseCert.getExtensionValue("2.5.29.37"), cert.getExtensionValue("2.5.29.37")))
-        {
-            fail("2.5.29.37 differs");
-        }
-
-        //
-        // exception test
-        //
-
-        try
-        {
-            certGen.copyAndAddExtension(new ASN1ObjectIdentifier("2.5.99.99"), true, new JcaX509CertificateHolder(baseCert));
-
-            fail("exception not thrown on dud extension copy");
-        }
-        catch (NullPointerException e)
-        {
-            // expected
-        }
-
-//        try
-//        {
-//            certGen.setPublicKey(dudPublicKey);
-//
-//            certGen.generate(privKey, BC);
-//
-//            fail("key without encoding not detected in v3");
-//        }
-//        catch (IllegalArgumentException e)
-//        {
-//            // expected
-//        }
-
-    }
-
-    private void testForgedSignature()
-        throws Exception
-    {
-        String cert = "MIIBsDCCAVoCAQYwDQYJKoZIhvcNAQEFBQAwYzELMAkGA1UEBhMCQVUxEzARBgNV"
-                    + "BAgTClF1ZWVuc2xhbmQxGjAYBgNVBAoTEUNyeXB0U29mdCBQdHkgTHRkMSMwIQYD"
-                    + "VQQDExpTZXJ2ZXIgdGVzdCBjZXJ0ICg1MTIgYml0KTAeFw0wNjA5MTEyMzU4NTVa"
-                    + "Fw0wNjEwMTEyMzU4NTVaMGMxCzAJBgNVBAYTAkFVMRMwEQYDVQQIEwpRdWVlbnNs"
-                    + "YW5kMRowGAYDVQQKExFDcnlwdFNvZnQgUHR5IEx0ZDEjMCEGA1UEAxMaU2VydmVy"
-                    + "IHRlc3QgY2VydCAoNTEyIGJpdCkwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAn7PD"
-                    + "hCeV/xIxUg8V70YRxK2A5jZbD92A12GN4PxyRQk0/lVmRUNMaJdq/qigpd9feP/u"
-                    + "12S4PwTLb/8q/v657QIDAQABMA0GCSqGSIb3DQEBBQUAA0EAbynCRIlUQgaqyNgU"
-                    + "DF6P14yRKUtX8akOP2TwStaSiVf/akYqfLFm3UGka5XbPj4rifrZ0/sOoZEEBvHQ"
-                    + "e20sRA==";
-
-        CertificateFactory certFact = CertificateFactory.getInstance("X.509", BC);
-
-        X509Certificate x509 = (X509Certificate)certFact.generateCertificate(new ByteArrayInputStream(Base64.decode(cert)));
-        try
-        {
-            x509.verify(x509.getPublicKey());
-
-            fail("forged RSA signature passed");
-        }
-        catch (Exception e)
-        {
-            // expected
-        }
-    }
-
-
-    private void pemTest()
-        throws Exception
-    {
-        CertificateFactory cf = CertificateFactory.getInstance("X.509", BC);
-
-        Certificate cert = readPEMCert(cf, PEMData.CERTIFICATE_1);
-        if (cert == null)
-        {
-            fail("PEM cert not read");
-        }
-        cert = readPEMCert(cf, "-----BEGIN CERTIFICATE-----" + PEMData.CERTIFICATE_2);
-        if (cert == null)
-        {
-            fail("PEM cert with extraneous header not read");
-        }
-        CRL crl = cf.generateCRL(new ByteArrayInputStream(PEMData.CRL_1.getBytes("US-ASCII")));
-        if (crl == null)
-        {
-            fail("PEM crl not read");
-        }
-        Collection col = cf.generateCertificates(new ByteArrayInputStream(PEMData.CERTIFICATE_2.getBytes("US-ASCII")));
-        if (col.size() != 1 || !col.contains(cert))
-        {
-            fail("PEM cert collection not right");
-        }
-        col = cf.generateCRLs(new ByteArrayInputStream(PEMData.CRL_2.getBytes("US-ASCII")));
-        if (col.size() != 1 || !col.contains(crl))
-        {
-            fail("PEM crl collection not right");
-        }
-    }
-
-    private static Certificate readPEMCert(CertificateFactory cf, String pemData)
-        throws CertificateException, UnsupportedEncodingException
-    {
-        return cf.generateCertificate(new ByteArrayInputStream(pemData.getBytes("US-ASCII")));
-    }
-
-    private void pkcs7Test()
-        throws Exception
-    {
-        /*
-        ASN1EncodableVector certs = new ASN1EncodableVector();
-
-        certs.add(new ASN1InputStream(CertPathTest.rootCertBin).readObject());
-        certs.add(new DERTaggedObject(false, 2, new ASN1InputStream(AttrCertTest.attrCert).readObject()));
-
-        ASN1EncodableVector crls = new ASN1EncodableVector();
-
-        crls.add(new ASN1InputStream(CertPathTest.rootCrlBin).readObject());
-        SignedData sigData = new SignedData(new DERSet(), new ContentInfo(CMSObjectIdentifiers.data, null), new DERSet(certs), new DERSet(crls), new DERSet());
-
-        ContentInfo info = new ContentInfo(CMSObjectIdentifiers.signedData, sigData);
-
-        CertificateFactory cf = CertificateFactory.getInstance("X.509", BC);
-
-        X509Certificate cert = (X509Certificate)cf.generateCertificate(new ByteArrayInputStream(info.getEncoded()));
-        if (cert == null || !areEqual(cert.getEncoded(), certs.get(0).getDERObject().getEncoded()))
-        {
-            fail("PKCS7 cert not read");
-        }
-        X509CRL crl = (X509CRL)cf.generateCRL(new ByteArrayInputStream(info.getEncoded()));
-        if (crl == null || !areEqual(crl.getEncoded(), crls.get(0).getDERObject().getEncoded()))
-        {
-            fail("PKCS7 crl not read");
-        }
-        Collection col = cf.generateCertificates(new ByteArrayInputStream(info.getEncoded()));
-        if (col.size() != 1 || !col.contains(cert))
-        {
-            fail("PKCS7 cert collection not right");
-        }
-        col = cf.generateCRLs(new ByteArrayInputStream(info.getEncoded()));
-        if (col.size() != 1 || !col.contains(crl))
-        {
-            fail("PKCS7 crl collection not right");
-        }
-
-        // data with no certificates or CRLs
-
-        sigData = new SignedData(new DERSet(), new ContentInfo(CMSObjectIdentifiers.data, null), new DERSet(), new DERSet(), new DERSet());
-
-        info = new ContentInfo(CMSObjectIdentifiers.signedData, sigData);
-
-        cert = (X509Certificate)cf.generateCertificate(new ByteArrayInputStream(info.getEncoded()));
-        if (cert != null)
-        {
-            fail("PKCS7 cert present");
-        }
-        crl = (X509CRL)cf.generateCRL(new ByteArrayInputStream(info.getEncoded()));
-        if (crl != null)
-        {
-            fail("PKCS7 crl present");
-        }
-
-        // data with absent certificates and CRLS
-
-        sigData = new SignedData(new DERSet(), new ContentInfo(CMSObjectIdentifiers.data, null), null, null, new DERSet());
-
-        info = new ContentInfo(CMSObjectIdentifiers.signedData, sigData);
-
-        cert = (X509Certificate)cf.generateCertificate(new ByteArrayInputStream(info.getEncoded()));
-        if (cert != null)
-        {
-            fail("PKCS7 cert present");
-        }
-        crl = (X509CRL)cf.generateCRL(new ByteArrayInputStream(info.getEncoded()));
-        if (crl != null)
-        {
-            fail("PKCS7 crl present");
-        }
-
-        //
-        // sample message
-        //
-        InputStream in = new ByteArrayInputStream(pkcs7CrlProblem);
-        Collection certCol = cf.generateCertificates(in);
-        Collection crlCol = cf.generateCRLs(in);
-
-        if (crlCol.size() != 0)
-        {
-            fail("wrong number of CRLs: " + crlCol.size());
-        }
-
-        if (certCol.size() != 4)
-        {
-            fail("wrong number of Certs: " + certCol.size());
-        }
-        */
-    }
-
-    private void createPSSCert(String algorithm)
-        throws Exception
-    {
-        KeyPair pair = generateLongFixedKeys();
-
-        PrivateKey privKey = pair.getPrivate();
-        PublicKey pubKey = pair.getPublic();
-
-        //
-        // distinguished name table.
-        //
-        
-        X500NameBuilder builder = createStdBuilder();
-
-        //
-        // create base certificate - version 3
-        //
-        ContentSigner sigGen = new JcaContentSignerBuilder(algorithm).setProvider(BC).build(privKey);
-        JcaX509v3CertificateBuilder  certGen = new JcaX509v3CertificateBuilder(builder.build(),BigInteger.valueOf(1),
-        new Date(System.currentTimeMillis() - 50000),new Date(System.currentTimeMillis() + 50000),builder.build(),pubKey);
-
-        certGen.addExtension(new ASN1ObjectIdentifier("2.5.29.15"), true,
-            new X509KeyUsage(X509KeyUsage.encipherOnly));
-        certGen.addExtension(new ASN1ObjectIdentifier("2.5.29.37"), true,
-            new DERSequence(KeyPurposeId.anyExtendedKeyUsage));
-        certGen.addExtension(new ASN1ObjectIdentifier("2.5.29.17"), true,
-            new GeneralNames(new GeneralName(GeneralName.rfc822Name, "test@test.test")));
-
-        X509Certificate baseCert = new JcaX509CertificateConverter().setProvider(BC).getCertificate(certGen.build(sigGen));
-
-        baseCert.verify(pubKey);
-    }
-
-    private KeyPair generateLongFixedKeys()
-        throws NoSuchAlgorithmException, NoSuchProviderException, InvalidKeySpecException
-    {
-        RSAPublicKeySpec pubKeySpec = new RSAPublicKeySpec(
-            new BigInteger("a56e4a0e701017589a5187dc7ea841d156f2ec0e36ad52a44dfeb1e61f7ad991d8c51056ffedb162b4c0f283a12a88a394dff526ab7291cbb307ceabfce0b1dfd5cd9508096d5b2b8b6df5d671ef6377c0921cb23c270a70e2598e6ff89d19f105acc2d3f0cb35f29280e1386b6f64c4ef22e1e1f20d0ce8cffb2249bd9a2137",16),
-            new BigInteger("010001",16));
-
-        RSAPrivateCrtKeySpec privKeySpec = new RSAPrivateCrtKeySpec(
-            new BigInteger("a56e4a0e701017589a5187dc7ea841d156f2ec0e36ad52a44dfeb1e61f7ad991d8c51056ffedb162b4c0f283a12a88a394dff526ab7291cbb307ceabfce0b1dfd5cd9508096d5b2b8b6df5d671ef6377c0921cb23c270a70e2598e6ff89d19f105acc2d3f0cb35f29280e1386b6f64c4ef22e1e1f20d0ce8cffb2249bd9a2137",16),
-            new BigInteger("010001",16),
-            new BigInteger("33a5042a90b27d4f5451ca9bbbd0b44771a101af884340aef9885f2a4bbe92e894a724ac3c568c8f97853ad07c0266c8c6a3ca0929f1e8f11231884429fc4d9ae55fee896a10ce707c3ed7e734e44727a39574501a532683109c2abacaba283c31b4bd2f53c3ee37e352cee34f9e503bd80c0622ad79c6dcee883547c6a3b325",16),
-            new BigInteger("e7e8942720a877517273a356053ea2a1bc0c94aa72d55c6e86296b2dfc967948c0a72cbccca7eacb35706e09a1df55a1535bd9b3cc34160b3b6dcd3eda8e6443",16),
-            new BigInteger("b69dca1cf7d4d7ec81e75b90fcca874abcde123fd2700180aa90479b6e48de8d67ed24f9f19d85ba275874f542cd20dc723e6963364a1f9425452b269a6799fd",16),
-            new BigInteger("28fa13938655be1f8a159cbaca5a72ea190c30089e19cd274a556f36c4f6e19f554b34c077790427bbdd8dd3ede2448328f385d81b30e8e43b2fffa027861979",16),
-            new BigInteger("1a8b38f398fa712049898d7fb79ee0a77668791299cdfa09efc0e507acb21ed74301ef5bfd48be455eaeb6e1678255827580a8e4e8e14151d1510a82a3f2e729",16),
-            new BigInteger("27156aba4126d24a81f3a528cbfb27f56886f840a9f6e86e17a44b94fe9319584b8e22fdde1e5a2e3bd8aa5ba8d8584194eb2190acf832b847f13a3d24a79f4d",16));
-
-        KeyFactory fact = KeyFactory.getInstance("RSA", BC);
-
-        return new KeyPair(fact.generatePublic(pubKeySpec), fact.generatePrivate(privKeySpec));
-    }
-
-    private void rfc4491Test()
-       throws Exception
-    {
-        CertificateFactory certFact = CertificateFactory.getInstance("X.509", BC);
-
-        X509Certificate x509 = (X509Certificate)certFact.generateCertificate(new ByteArrayInputStream(gostRFC4491_94));
-
-        x509.verify(x509.getPublicKey(), BC);
-
-        x509 = (X509Certificate)certFact.generateCertificate(new ByteArrayInputStream(gostRFC4491_2001));
-
-        x509.verify(x509.getPublicKey(), BC);
-    }
-
-    private void testNullDerNullCert()
-        throws Exception
-    {
-        KeyPair pair = generateLongFixedKeys();
-        PublicKey pubKey = pair.getPublic();
-        PrivateKey privKey = pair.getPrivate();
-
-        ContentSigner sigGen = new JcaContentSignerBuilder("MD5WithRSAEncryption").setProvider(BC).build(privKey);
-        JcaX509v3CertificateBuilder  certGen = new JcaX509v3CertificateBuilder(new X500Name("CN=Test"),BigInteger.valueOf(1),new Date(System.currentTimeMillis() - 50000),new Date(System.currentTimeMillis() + 50000),new X500Name("CN=Test"),pubKey);
-        X509Certificate cert = new JcaX509CertificateConverter().setProvider(BC).getCertificate(certGen.build(sigGen));
-
-        X509CertificateStructure struct = X509CertificateStructure.getInstance(ASN1Primitive.fromByteArray(cert.getEncoded()));
-
-        ASN1Encodable tbsCertificate = struct.getTBSCertificate();
-        AlgorithmIdentifier sig = struct.getSignatureAlgorithm();
-
-        ASN1EncodableVector v = new ASN1EncodableVector();
-
-        v.add(tbsCertificate);
-        v.add(new AlgorithmIdentifier(sig.getAlgorithm()));
-        v.add(struct.getSignature());
-
-        // verify
-        ByteArrayInputStream    bIn;
-        String                  dump = "";
-
-        try
-        {
-            bIn = new ByteArrayInputStream(new DERSequence(v).getEncoded());
-
-            CertificateFactory  fact = CertificateFactory.getInstance("X.509", BC);
-
-            cert = (X509Certificate)fact.generateCertificate(bIn);
-
-            cert.verify(cert.getPublicKey());
-        }
-        catch (Exception e)
-        {
-            fail(dump + System.getProperty("line.separator") + getName() + ": testNullDerNull failed - exception " + e.toString(), e);
-        }
-    }
-
-    private void testDirect()
-        throws Exception
-    {
-        KeyStore keyStore = KeyStore.getInstance("PKCS12", "BC");
-
-        ByteArrayInputStream input = new ByteArrayInputStream(testCAp12);
-
-        keyStore.load(input, "test".toCharArray());
-
-        X509Certificate certificate = (X509Certificate) keyStore.getCertificate("ca");
-        PrivateKey privateKey = (PrivateKey) keyStore.getKey("ca", null);
-
-        X500Name issuer = X500Name.getInstance(certificate.getIssuerX500Principal().getEncoded());
-
-        X509v2CRLBuilder builder = new X509v2CRLBuilder(issuer, new Date());
-
-        builder.addCRLEntry(certificate.getSerialNumber(), new Date(), CRLReason.cACompromise);
-
-        JcaContentSignerBuilder contentSignerBuilder = new JcaContentSignerBuilder("SHA256WithRSAEncryption");
-
-        contentSignerBuilder.setProvider("BC");
-
-        X509CRLHolder cRLHolder = builder.build(contentSignerBuilder.build(privateKey));
-
-        if (!cRLHolder.isSignatureValid(new JcaContentVerifierProviderBuilder().setProvider("BC").build(certificate)))
-        {
-            fail("CRL signature not valid");
-        }
-
-        X509CRLEntryHolder cRLEntryHolder = cRLHolder.getRevokedCertificate(certificate.getSerialNumber());
-
-        if (!cRLEntryHolder.getCertificateIssuer().equals(new GeneralNames(new GeneralName(cRLHolder.getIssuer()))))
-        {
-            fail("certificate issuer incorrect");
-        }
-
-        JcaX509CRLConverter converter = new JcaX509CRLConverter();
-
-        converter.setProvider("BC");
-
-        X509CRL crl = converter.getCRL(cRLHolder);
-
-        crl.verify(certificate.getPublicKey());
-
-        if (!crl.isRevoked(certificate))
-        {
-            fail("Certificate should be revoked");
-        }
-
-        // now encode the CRL and load the CRL with the JCE provider
-
-        CertificateFactory fac = CertificateFactory.getInstance("X.509");
-
-        X509CRL jceCRL = (X509CRL) fac.generateCRL(new ByteArrayInputStream(crl.getEncoded()));
-
-        jceCRL.verify(certificate.getPublicKey());
-
-        if (!jceCRL.isRevoked(certificate))
-        {
-            fail("This certificate should also be revoked");
-        }
-    }
-
-    private void testIndirect()
-        throws Exception
-    {
-        KeyStore keyStore = KeyStore.getInstance("PKCS12", "BC");
-
-        ByteArrayInputStream input = new ByteArrayInputStream(testCAp12);
-
-        keyStore.load(input, "test".toCharArray());
-
-        X509Certificate certificate = (X509Certificate) keyStore.getCertificate("ca");
-        PrivateKey privateKey = (PrivateKey) keyStore.getKey("ca", null);
-
-        X500Name crlIssuer = X500Name.getInstance(certificate.getSubjectX500Principal().getEncoded());
-        X500Name caName = X500Name.getInstance(certificate.getIssuerX500Principal().getEncoded());
-
-        X509v2CRLBuilder builder = new X509v2CRLBuilder(crlIssuer, new Date());
-
-        builder.addExtension(Extension.issuingDistributionPoint, true, new IssuingDistributionPoint(null, true, false));
-
-        ExtensionsGenerator extGen = new ExtensionsGenerator();
-
-        extGen.addExtension(Extension.reasonCode, false, CRLReason.lookup(CRLReason.cACompromise));
-        extGen.addExtension(Extension.certificateIssuer, true, new GeneralNames(new GeneralName(caName)));
-
-        builder.addCRLEntry(certificate.getSerialNumber(), new Date(), extGen.generate());
-
-        JcaContentSignerBuilder contentSignerBuilder = new JcaContentSignerBuilder("SHA256WithRSAEncryption");
-
-        contentSignerBuilder.setProvider("BC");
-
-        X509CRLHolder cRLHolder = builder.build(contentSignerBuilder.build(privateKey));
-
-        if (!cRLHolder.isSignatureValid(new JcaContentVerifierProviderBuilder().setProvider("BC").build(certificate)))
-        {
-            fail("CRL signature not valid");
-        }
-
-        X509CRLEntryHolder cRLEntryHolder = cRLHolder.getRevokedCertificate(certificate.getSerialNumber());
-
-        if (!cRLEntryHolder.getCertificateIssuer().equals(new GeneralNames(new GeneralName(X500Name.getInstance(certificate.getIssuerX500Principal().getEncoded())))))
-        {
-            fail("certificate issuer incorrect");
-        }
-
-        JcaX509CRLConverter converter = new JcaX509CRLConverter();
-
-        converter.setProvider("BC");
-
-        X509CRL crl = converter.getCRL(cRLHolder);
-
-        crl.verify(certificate.getPublicKey());
-
-        if (!crl.isRevoked(certificate))
-        {
-            fail("Certificate should be revoked");
-        }
-
-        // now encode the CRL and load the CRL with the JCE provider
-
-        CertificateFactory fac = CertificateFactory.getInstance("X.509");
-
-        X509CRL jceCRL = (X509CRL) fac.generateCRL(new ByteArrayInputStream(crl.getEncoded()));
-
-        jceCRL.verify(certificate.getPublicKey());
-
-        if (!jceCRL.isRevoked(certificate))
-        {
-            fail("This certificate should also be revoked");
-        }
-    }
-
-    private void testIndirect2()
-        throws Exception
-    {
-        KeyStore keyStore = KeyStore.getInstance("PKCS12", "BC");
-
-        ByteArrayInputStream input = new ByteArrayInputStream(testCAp12);
-
-        keyStore.load(input, "test".toCharArray());
-
-        X509Certificate certificate = (X509Certificate) keyStore.getCertificate("ca");
-        PrivateKey privateKey = (PrivateKey) keyStore.getKey("ca", null);
-
-        X500Name crlIssuer = X500Name.getInstance(certificate.getSubjectX500Principal().getEncoded());
-        X500Name caName = X500Name.getInstance(certificate.getIssuerX500Principal().getEncoded());
-
-        X509v2CRLBuilder builder = new X509v2CRLBuilder(crlIssuer, new Date());
-
-        builder.addExtension(Extension.issuingDistributionPoint, true, new IssuingDistributionPoint(null, true, false));
-
-        builder.addCRLEntry(BigInteger.valueOf(100), new Date(), CRLReason.cACompromise);
-        builder.addCRLEntry(BigInteger.valueOf(120), new Date(), CRLReason.cACompromise);
-
-        ExtensionsGenerator extGen = new ExtensionsGenerator();
-
-        extGen.addExtension(Extension.reasonCode, false, CRLReason.lookup(CRLReason.cACompromise));
-        extGen.addExtension(Extension.certificateIssuer, true, new GeneralNames(new GeneralName(caName)));
-
-        builder.addCRLEntry(certificate.getSerialNumber(), new Date(), extGen.generate());
-
-        builder.addCRLEntry(BigInteger.valueOf(130), new Date(), CRLReason.cACompromise);
-
-        JcaContentSignerBuilder contentSignerBuilder = new JcaContentSignerBuilder("SHA256WithRSAEncryption");
-
-        contentSignerBuilder.setProvider("BC");
-
-        X509CRLHolder cRLHolder = builder.build(contentSignerBuilder.build(privateKey));
-
-        if (!cRLHolder.isSignatureValid(new JcaContentVerifierProviderBuilder().setProvider("BC").build(certificate)))
-        {
-            fail("CRL signature not valid");
-        }
-
-        X509CRLEntryHolder cRLEntryHolder = cRLHolder.getRevokedCertificate(certificate.getSerialNumber());
-
-        if (!cRLEntryHolder.getCertificateIssuer().equals(new GeneralNames(new GeneralName(caName))))
-        {
-            fail("certificate issuer incorrect");
-        }
-
-        cRLEntryHolder = cRLHolder.getRevokedCertificate(BigInteger.valueOf(130));
-
-        if (!cRLEntryHolder.getCertificateIssuer().equals(new GeneralNames(new GeneralName(caName))))
-        {
-            fail("certificate issuer incorrect");
-        }
-
-        cRLEntryHolder = cRLHolder.getRevokedCertificate(BigInteger.valueOf(100));
-
-        if (!cRLEntryHolder.getCertificateIssuer().equals(new GeneralNames(new GeneralName(cRLHolder.getIssuer()))))
-        {
-            fail("certificate issuer incorrect");
-        }
-
-        JcaX509CRLConverter converter = new JcaX509CRLConverter();
-
-        converter.setProvider("BC");
-
-        X509CRL crl = converter.getCRL(cRLHolder);
-
-        crl.verify(certificate.getPublicKey());
-
-        X509CRLEntry crlEntry = crl.getRevokedCertificate(BigInteger.valueOf(100));
-
-        if (crlEntry.getCertificateIssuer() != null)
-        {
-            fail("JCA 1 certificate issuer incorrect");
-        }
-
-        crlEntry = crl.getRevokedCertificate(BigInteger.valueOf(130));
-        if (!crlEntry.getCertificateIssuer().equals(new X500Principal(caName.getEncoded())))
-        {
-            fail("JCA 2 certificate issuer incorrect");
-        }
-    }
-
-    // issuing distribution point must be set for an indirect CRL to be recognised
-    private void testMalformedIndirect()
-        throws Exception
-    {
-        KeyStore keyStore = KeyStore.getInstance("PKCS12", "BC");
-
-        ByteArrayInputStream input = new ByteArrayInputStream(testCAp12);
-
-        keyStore.load(input, "test".toCharArray());
-
-        X509Certificate certificate = (X509Certificate) keyStore.getCertificate("ca");
-        PrivateKey privateKey = (PrivateKey) keyStore.getKey("ca", null);
-
-        X500Name crlIssuer = X500Name.getInstance(certificate.getSubjectX500Principal().getEncoded());
-        X500Name caName = X500Name.getInstance(certificate.getIssuerX500Principal().getEncoded());
-
-        X509v2CRLBuilder builder = new X509v2CRLBuilder(crlIssuer, new Date());
-
-        ExtensionsGenerator extGen = new ExtensionsGenerator();
-
-        extGen.addExtension(Extension.reasonCode, false, CRLReason.lookup(CRLReason.cACompromise));
-        extGen.addExtension(Extension.certificateIssuer, true, new GeneralNames(new GeneralName(caName)));
-
-        builder.addCRLEntry(certificate.getSerialNumber(), new Date(), extGen.generate());
-
-        JcaContentSignerBuilder contentSignerBuilder = new JcaContentSignerBuilder("SHA256WithRSAEncryption");
-
-        contentSignerBuilder.setProvider("BC");
-
-        X509CRLHolder cRLHolder = builder.build(contentSignerBuilder.build(privateKey));
-
-        if (!cRLHolder.isSignatureValid(new JcaContentVerifierProviderBuilder().setProvider("BC").build(certificate)))
-        {
-            fail("CRL signature not valid");
-        }
-
-        X509CRLEntryHolder cRLEntryHolder = cRLHolder.getRevokedCertificate(certificate.getSerialNumber());
-
-        if (!cRLEntryHolder.getCertificateIssuer().equals(new GeneralNames(new GeneralName(cRLHolder.getIssuer()))))
-        {
-            fail("certificate issuer incorrect");
-        }
-
-        JcaX509CRLConverter converter = new JcaX509CRLConverter();
-
-        converter.setProvider("BC");
-
-        X509CRL crl = converter.getCRL(cRLHolder);
-
-        crl.verify(certificate.getPublicKey());
-
-        if (crl.isRevoked(certificate))
-        {
-            throw new Exception("Certificate should not be revoked");
-        }
-    }
-
-    public void performTest()
-        throws Exception
-    {
-        testDirect();
-        testIndirect();
-        testIndirect2();
-        testMalformedIndirect();
-
-        checkCertificate(1, cert1);
-        checkCertificate(2, cert2);
-        checkCertificate(3, cert3);
-        checkCertificate(4, cert4);
-        checkCertificate(5, cert5);
-        checkCertificate(6, oldEcdsa);
-        checkCertificate(7, cert7);
-
-        checkKeyUsage(8, keyUsage);
-        checkSelfSignedCertificate(9, uncompressedPtEC);
-        checkNameCertificate(10, nameCert);
-
-        checkSelfSignedCertificate(11, probSelfSignedCert);
-        checkSelfSignedCertificate(12, gostCA1);
-        checkSelfSignedCertificate(13, gostCA2);
-        checkSelfSignedCertificate(14, gost341094base);
-        checkSelfSignedCertificate(15, gost34102001base);
-        checkSelfSignedCertificate(16, gost341094A);
-        checkSelfSignedCertificate(17, gost341094B);
-        checkSelfSignedCertificate(17, gost34102001A);
-
-        checkCRL(1, crl1);
-
-        checkCreation1();
-        checkCreation2();
-        checkCreation3();
-        checkCreation4();
-        checkCreation5();
-
-        createECCert("SHA1withECDSA", X9ObjectIdentifiers.ecdsa_with_SHA1);
-        createECCert("SHA224withECDSA", X9ObjectIdentifiers.ecdsa_with_SHA224);
-        createECCert("SHA256withECDSA", X9ObjectIdentifiers.ecdsa_with_SHA256);
-        createECCert("SHA384withECDSA", X9ObjectIdentifiers.ecdsa_with_SHA384);
-        createECCert("SHA512withECDSA", X9ObjectIdentifiers.ecdsa_with_SHA512);
-
-        createPSSCert("SHA1withRSAandMGF1");
-        createPSSCert("SHA224withRSAandMGF1");
-        createPSSCert("SHA256withRSAandMGF1");
-        createPSSCert("SHA384withRSAandMGF1");
-
-        checkCRLCreation1();
-        checkCRLCreation2();
-        checkCRLCreation3();
-
-        pemTest();
-        pkcs7Test();
-        rfc4491Test();
-
-        testForgedSignature();
-
-        testNullDerNullCert();
-
-        checkCertificate(18, emptyDNCert);
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        Security.addProvider(new BouncyCastleProvider());
-
-        runTest(new CertTest());
-    }
-}
\ No newline at end of file
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/test/ConverterTest.java b/bcpkix/src/main/java/org/bouncycastle/cert/test/ConverterTest.java
deleted file mode 100644
index 6413b52..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/test/ConverterTest.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package org.bouncycastle.cert.test;
-
-import java.math.BigInteger;
-import java.security.cert.X509CertSelector;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import org.bouncycastle.asn1.DEROctetString;
-import org.bouncycastle.asn1.x500.X500Name;
-import org.bouncycastle.cert.selector.X509CertificateHolderSelector;
-import org.bouncycastle.cert.selector.jcajce.JcaSelectorConverter;
-import org.bouncycastle.cert.selector.jcajce.JcaX509CertSelectorConverter;
-import org.bouncycastle.util.Arrays;
-
-public class ConverterTest
-    extends TestCase
-{
-    public void testCertificateSelectorConversion()
-        throws Exception
-    {
-        JcaX509CertSelectorConverter converter = new JcaX509CertSelectorConverter();
-        JcaSelectorConverter toSelector = new JcaSelectorConverter();
-
-        X509CertificateHolderSelector sid1 = new X509CertificateHolderSelector(new X500Name("CN=Test"), BigInteger.valueOf(1), new byte[20]);
-
-        X509CertSelector conv = converter.getCertSelector(sid1);
-
-        assertTrue(conv.getIssuerAsString().equals("CN=Test"));
-        assertTrue(Arrays.areEqual(conv.getSubjectKeyIdentifier(), new DEROctetString(new byte[20]).getEncoded()));
-        assertEquals(conv.getSerialNumber(), sid1.getSerialNumber());
-
-        X509CertificateHolderSelector sid2 = toSelector.getCertificateHolderSelector(conv);
-
-        assertEquals(sid1, sid2);
-
-        sid1 = new X509CertificateHolderSelector(new X500Name("CN=Test"), BigInteger.valueOf(1));
-
-        conv = converter.getCertSelector(sid1);
-
-        assertTrue(conv.getIssuerAsString().equals("CN=Test"));
-        assertNull(conv.getSubjectKeyIdentifier());
-        assertEquals(conv.getSerialNumber(), sid1.getSerialNumber());
-
-        sid2 = toSelector.getCertificateHolderSelector(conv);
-
-        assertEquals(sid1, sid2);
-
-        sid1 = new X509CertificateHolderSelector(new byte[20]);
-
-        conv = converter.getCertSelector(sid1);
-
-        assertNull(conv.getIssuerAsString());
-        assertTrue(Arrays.areEqual(conv.getSubjectKeyIdentifier(), new DEROctetString(new byte[20]).getEncoded()));
-        assertNull(conv.getSerialNumber());
-
-        sid2 = toSelector.getCertificateHolderSelector(conv);
-
-        assertEquals(sid1, sid2);
-    }
-    
-    public static Test suite() 
-    {
-        return new TestSuite(ConverterTest.class);
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/test/DANETest.java b/bcpkix/src/main/java/org/bouncycastle/cert/test/DANETest.java
deleted file mode 100644
index 9395440..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/test/DANETest.java
+++ /dev/null
@@ -1,85 +0,0 @@
-package org.bouncycastle.cert.test;
-
-import java.io.IOException;
-import java.security.Security;
-
-import org.bouncycastle.cert.X509CertificateHolder;
-import org.bouncycastle.cert.dane.DANEEntry;
-import org.bouncycastle.cert.dane.DANEEntryFactory;
-import org.bouncycastle.cert.dane.DANEException;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.encoders.Base64;
-import org.bouncycastle.util.test.SimpleTest;
-
-public class DANETest
-    extends SimpleTest
-{
-    byte[]  randomCert = Base64.decode(
-            "MIIDbDCCAtWgAwIBAgIBADANBgkqhkiG9w0BAQQFADCBtzELMAkGA1UEBhMCQVUx"
-                + "ETAPBgNVBAgTCFZpY3RvcmlhMRgwFgYDVQQHEw9Tb3V0aCBNZWxib3VybmUxGjAY"
-                + "BgNVBAoTEUNvbm5lY3QgNCBQdHkgTHRkMR4wHAYDVQQLExVDZXJ0aWZpY2F0ZSBB"
-                + "dXRob3JpdHkxFTATBgNVBAMTDENvbm5lY3QgNCBDQTEoMCYGCSqGSIb3DQEJARYZ"
-                + "d2VibWFzdGVyQGNvbm5lY3Q0LmNvbS5hdTAeFw0wMDA2MDIwNzU1MzNaFw0wMTA2"
-                + "MDIwNzU1MzNaMIG3MQswCQYDVQQGEwJBVTERMA8GA1UECBMIVmljdG9yaWExGDAW"
-                + "BgNVBAcTD1NvdXRoIE1lbGJvdXJuZTEaMBgGA1UEChMRQ29ubmVjdCA0IFB0eSBM"
-                + "dGQxHjAcBgNVBAsTFUNlcnRpZmljYXRlIEF1dGhvcml0eTEVMBMGA1UEAxMMQ29u"
-                + "bmVjdCA0IENBMSgwJgYJKoZIhvcNAQkBFhl3ZWJtYXN0ZXJAY29ubmVjdDQuY29t"
-                + "LmF1MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDgs5ptNG6Qv1ZpCDuUNGmv"
-                + "rhjqMDPd3ri8JzZNRiiFlBA4e6/ReaO1U8ASewDeQMH6i9R6degFdQRLngbuJP0s"
-                + "xcEE+SksEWNvygfzLwV9J/q+TQDyJYK52utb++lS0b48A1KPLwEsyL6kOAgelbur"
-                + "ukwxowprKUIV7Knf1ajetQIDAQABo4GFMIGCMCQGA1UdEQQdMBuBGXdlYm1hc3Rl"
-                + "ckBjb25uZWN0NC5jb20uYXUwDwYDVR0TBAgwBgEB/wIBADA2BglghkgBhvhCAQ0E"
-                + "KRYnbW9kX3NzbCBnZW5lcmF0ZWQgY3VzdG9tIENBIGNlcnRpZmljYXRlMBEGCWCG"
-                + "SAGG+EIBAQQEAwICBDANBgkqhkiG9w0BAQQFAAOBgQCsGvfdghH8pPhlwm1r3pQk"
-                + "msnLAVIBb01EhbXm2861iXZfWqGQjrGAaA0ZpXNk9oo110yxoqEoSJSzniZa7Xtz"
-                + "soTwNUpE0SLHvWf/SlKdFWlzXA+vOZbzEv4UmjeelekTm7lc01EEa5QRVzOxHFtQ"
-                + "DhkaJ8VqOMajkQFma2r9iA==");
-
-    public String getName()
-    {
-        return "DANETest";
-    }
-
-    private void shouldCreateDANEEntry()
-        throws IOException, DANEException
-    {
-        DANEEntryFactory daneEntryFactory = new DANEEntryFactory(new SHA224DigestCalculator());
-
-        DANEEntry entry = daneEntryFactory.createEntry("test@test.com", new X509CertificateHolder(randomCert));
-
-        if (!DANEEntry.isValidCertificate(entry.getRDATA()))
-        {
-            fail("encoding error in RDATA");
-        }
-
-        if (!"90a3ed9e32b2aaf4c61c410eb925426119e1a9dc53d4286ade99a809._smimecert.test.com".equals(entry.getDomainName()))
-        {
-            fail("domain name associated with entry wrong");
-        }
-
-        byte[] rdata = entry.getRDATA();
-        byte[] certData = new byte[rdata.length - 3];
-
-        System.arraycopy(rdata, 3, certData, 0, certData.length);
-
-        if (!Arrays.areEqual(certData, randomCert))
-        {
-            fail("certificate encoding does not match");
-        }
-    }
-
-    public void performTest()
-        throws Exception
-    {
-         shouldCreateDANEEntry();
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        Security.addProvider(new BouncyCastleProvider());
-
-        runTest(new DANETest());
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/test/PEMData.java b/bcpkix/src/main/java/org/bouncycastle/cert/test/PEMData.java
deleted file mode 100644
index 6159f36..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/test/PEMData.java
+++ /dev/null
@@ -1,114 +0,0 @@
-package org.bouncycastle.cert.test;
-
-public class PEMData
-{
-    public static String CERTIFICATE_1 =
-       "-----BEGIN X509 CERTIFICATE-----\r"
-     + "MIIDXjCCAsegAwIBAgIBBzANBgkqhkiG9w0BAQQFADCBtzELMAkGA1UEBhMCQVUx\r"
-     + "ETAPBgNVBAgTCFZpY3RvcmlhMRgwFgYDVQQHEw9Tb3V0aCBNZWxib3VybmUxGjAY\r"
-     + "BgNVBAoTEUNvbm5lY3QgNCBQdHkgTHRkMR4wHAYDVQQLExVDZXJ0aWZpY2F0ZSBB\r"
-     + "dXRob3JpdHkxFTATBgNVBAMTDENvbm5lY3QgNCBDQTEoMCYGCSqGSIb3DQEJARYZ\r"
-     + "d2VibWFzdGVyQGNvbm5lY3Q0LmNvbS5hdTAeFw0wMDA2MDIwNzU2MjFaFw0wMTA2\r"
-     + "MDIwNzU2MjFaMIG4MQswCQYDVQQGEwJBVTERMA8GA1UECBMIVmljdG9yaWExGDAW\r"
-     + "BgNVBAcTD1NvdXRoIE1lbGJvdXJuZTEaMBgGA1UEChMRQ29ubmVjdCA0IFB0eSBM\r"
-     + "dGQxFzAVBgNVBAsTDldlYnNlcnZlciBUZWFtMR0wGwYDVQQDExR3d3cyLmNvbm5l\r"
-     + "Y3Q0LmNvbS5hdTEoMCYGCSqGSIb3DQEJARYZd2VibWFzdGVyQGNvbm5lY3Q0LmNv\r"
-     + "bS5hdTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEArvDxclKAhyv7Q/Wmr2re\r"
-     + "Gw4XL9Cnh9e+6VgWy2AWNy/MVeXdlxzd7QAuc1eOWQkGQEiLPy5XQtTY+sBUJ3AO\r"
-     + "Rvd2fEVJIcjf29ey7bYua9J/vz5MG2KYo9/WCHIwqD9mmG9g0xLcfwq/s8ZJBswE\r"
-     + "7sb85VU+h94PTvsWOsWuKaECAwEAAaN3MHUwJAYDVR0RBB0wG4EZd2VibWFzdGVy\r"
-     + "QGNvbm5lY3Q0LmNvbS5hdTA6BglghkgBhvhCAQ0ELRYrbW9kX3NzbCBnZW5lcmF0\r"
-     + "ZWQgY3VzdG9tIHNlcnZlciBjZXJ0aWZpY2F0ZTARBglghkgBhvhCAQEEBAMCBkAw\r"
-     + "DQYJKoZIhvcNAQEEBQADgYEAotccfKpwSsIxM1Hae8DR7M/Rw8dg/RqOWx45HNVL\r"
-     + "iBS4/3N/TO195yeQKbfmzbAA2jbPVvIvGgTxPgO1MP4ZgvgRhasaa0qCJCkWvpM4\r"
-     + "yQf33vOiYQbpv4rTwzU8AmRlBG45WdjyNIigGV+oRc61aKCTnLq7zB8N3z1TF/bF\r"
-     + "5/8=\r"
-     + "-----END X509 CERTIFICATE-----\r";
-
-    public static String CERTIFICATE_2 =
-       "-----BEGIN CERTIFICATE-----\n"
-     + "MIIDXjCCAsegAwIBAgIBBzANBgkqhkiG9w0BAQQFADCBtzELMAkGA1UEBhMCQVUx\n"
-     + "ETAPBgNVBAgTCFZpY3RvcmlhMRgwFgYDVQQHEw9Tb3V0aCBNZWxib3VybmUxGjAY\n"
-     + "BgNVBAoTEUNvbm5lY3QgNCBQdHkgTHRkMR4wHAYDVQQLExVDZXJ0aWZpY2F0ZSBB\n"
-     + "dXRob3JpdHkxFTATBgNVBAMTDENvbm5lY3QgNCBDQTEoMCYGCSqGSIb3DQEJARYZ\n"
-     + "d2VibWFzdGVyQGNvbm5lY3Q0LmNvbS5hdTAeFw0wMDA2MDIwNzU2MjFaFw0wMTA2\n"
-     + "MDIwNzU2MjFaMIG4MQswCQYDVQQGEwJBVTERMA8GA1UECBMIVmljdG9yaWExGDAW\n"
-     + "BgNVBAcTD1NvdXRoIE1lbGJvdXJuZTEaMBgGA1UEChMRQ29ubmVjdCA0IFB0eSBM\n"
-     + "dGQxFzAVBgNVBAsTDldlYnNlcnZlciBUZWFtMR0wGwYDVQQDExR3d3cyLmNvbm5l\n"
-     + "Y3Q0LmNvbS5hdTEoMCYGCSqGSIb3DQEJARYZd2VibWFzdGVyQGNvbm5lY3Q0LmNv\n"
-     + "bS5hdTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEArvDxclKAhyv7Q/Wmr2re\n"
-     + "Gw4XL9Cnh9e+6VgWy2AWNy/MVeXdlxzd7QAuc1eOWQkGQEiLPy5XQtTY+sBUJ3AO\n"
-     + "Rvd2fEVJIcjf29ey7bYua9J/vz5MG2KYo9/WCHIwqD9mmG9g0xLcfwq/s8ZJBswE\n"
-     + "7sb85VU+h94PTvsWOsWuKaECAwEAAaN3MHUwJAYDVR0RBB0wG4EZd2VibWFzdGVy\n"
-     + "QGNvbm5lY3Q0LmNvbS5hdTA6BglghkgBhvhCAQ0ELRYrbW9kX3NzbCBnZW5lcmF0\n"
-     + "ZWQgY3VzdG9tIHNlcnZlciBjZXJ0aWZpY2F0ZTARBglghkgBhvhCAQEEBAMCBkAw\n"
-     + "DQYJKoZIhvcNAQEEBQADgYEAotccfKpwSsIxM1Hae8DR7M/Rw8dg/RqOWx45HNVL\n"
-     + "iBS4/3N/TO195yeQKbfmzbAA2jbPVvIvGgTxPgO1MP4ZgvgRhasaa0qCJCkWvpM4\n"
-     + "yQf33vOiYQbpv4rTwzU8AmRlBG45WdjyNIigGV+oRc61aKCTnLq7zB8N3z1TF/bF\n"
-     + "5/8=\n"
-     + "-----END CERTIFICATE-----\n";
-
-    public static String CRL_1 =
-       "-----BEGIN X509 CRL-----\r\n"
-     + "MIICjTCCAfowDQYJKoZIhvcNAQECBQAwXzELMAkGA1UEBhMCVVMxIDAeBgNVBAoT\r\n"
-     + "F1JTQSBEYXRhIFNlY3VyaXR5LCBJbmMuMS4wLAYDVQQLEyVTZWN1cmUgU2VydmVy\r\n"
-     + "IENlcnRpZmljYXRpb24gQXV0aG9yaXR5Fw05NTA1MDIwMjEyMjZaFw05NTA2MDEw\r\n"
-     + "MDAxNDlaMIIBaDAWAgUCQQAABBcNOTUwMjAxMTcyNDI2WjAWAgUCQQAACRcNOTUw\r\n"
-     + "MjEwMDIxNjM5WjAWAgUCQQAADxcNOTUwMjI0MDAxMjQ5WjAWAgUCQQAADBcNOTUw\r\n"
-     + "MjI1MDA0NjQ0WjAWAgUCQQAAGxcNOTUwMzEzMTg0MDQ5WjAWAgUCQQAAFhcNOTUw\r\n"
-     + "MzE1MTkxNjU0WjAWAgUCQQAAGhcNOTUwMzE1MTk0MDQxWjAWAgUCQQAAHxcNOTUw\r\n"
-     + "MzI0MTk0NDMzWjAWAgUCcgAABRcNOTUwMzI5MjAwNzExWjAWAgUCcgAAERcNOTUw\r\n"
-     + "MzMwMDIzNDI2WjAWAgUCQQAAIBcNOTUwNDA3MDExMzIxWjAWAgUCcgAAHhcNOTUw\r\n"
-     + "NDA4MDAwMjU5WjAWAgUCcgAAQRcNOTUwNDI4MTcxNzI0WjAWAgUCcgAAOBcNOTUw\r\n"
-     + "NDI4MTcyNzIxWjAWAgUCcgAATBcNOTUwNTAyMDIxMjI2WjANBgkqhkiG9w0BAQIF\r\n"
-     + "AAN+AHqOEJXSDejYy0UwxxrH/9+N2z5xu/if0J6qQmK92W0hW158wpJg+ovV3+wQ\r\n"
-     + "wvIEPRL2rocL0tKfAsVq1IawSJzSNgxG0lrcla3MrJBnZ4GaZDu4FutZh72MR3Gt\r\n"
-     + "JaAL3iTJHJD55kK2D/VoyY1djlsPuNh6AEgdVwFAyp0v\r\n"
-     + "-----END X509 CRL-----\r\n";
-
-    public static String CRL_2 =
-       "-----BEGIN CRL-----\r\n"
-     + "MIICjTCCAfowDQYJKoZIhvcNAQECBQAwXzELMAkGA1UEBhMCVVMxIDAeBgNVBAoT\r\n"
-     + "F1JTQSBEYXRhIFNlY3VyaXR5LCBJbmMuMS4wLAYDVQQLEyVTZWN1cmUgU2VydmVy\r\n"
-     + "IENlcnRpZmljYXRpb24gQXV0aG9yaXR5Fw05NTA1MDIwMjEyMjZaFw05NTA2MDEw\r\n"
-     + "MDAxNDlaMIIBaDAWAgUCQQAABBcNOTUwMjAxMTcyNDI2WjAWAgUCQQAACRcNOTUw\r\n"
-     + "MjEwMDIxNjM5WjAWAgUCQQAADxcNOTUwMjI0MDAxMjQ5WjAWAgUCQQAADBcNOTUw\r\n"
-     + "MjI1MDA0NjQ0WjAWAgUCQQAAGxcNOTUwMzEzMTg0MDQ5WjAWAgUCQQAAFhcNOTUw\r\n"
-     + "MzE1MTkxNjU0WjAWAgUCQQAAGhcNOTUwMzE1MTk0MDQxWjAWAgUCQQAAHxcNOTUw\r\n"
-     + "MzI0MTk0NDMzWjAWAgUCcgAABRcNOTUwMzI5MjAwNzExWjAWAgUCcgAAERcNOTUw\r\n"
-     + "MzMwMDIzNDI2WjAWAgUCQQAAIBcNOTUwNDA3MDExMzIxWjAWAgUCcgAAHhcNOTUw\r\n"
-     + "NDA4MDAwMjU5WjAWAgUCcgAAQRcNOTUwNDI4MTcxNzI0WjAWAgUCcgAAOBcNOTUw\r\n"
-     + "NDI4MTcyNzIxWjAWAgUCcgAATBcNOTUwNTAyMDIxMjI2WjANBgkqhkiG9w0BAQIF\r\n"
-     + "AAN+AHqOEJXSDejYy0UwxxrH/9+N2z5xu/if0J6qQmK92W0hW158wpJg+ovV3+wQ\r\n"
-     + "wvIEPRL2rocL0tKfAsVq1IawSJzSNgxG0lrcla3MrJBnZ4GaZDu4FutZh72MR3Gt\r\n"
-     + "JaAL3iTJHJD55kK2D/VoyY1djlsPuNh6AEgdVwFAyp0v\r\n"
-     + "-----END CRL-----\r\n";
-
-    static String ATTRIBUTE_CERTIFICATE_1 =
-       "-----BEGIN X509 ATTRIBUTE CERTIFICATE-----\r\n"
-     + "MIIBuDCCASECAQEwZ6BlMGCkXjBcMQswCQYDVQQGEwJBVTEoMCYGA1UEChMfVGhl\r\n"
-     + "IExlZ2lvbiBvZiB0aGUgQm91bmN5IENhc3RsZTEjMCEGA1UECxMaQm91bmN5IFBy\r\n"
-     + "aW1hcnkgQ2VydGlmaWNhdGUCARSgYjBgpF4wXDELMAkGA1UEBhMCQVUxKDAmBgNV\r\n"
-     + "BAoTH1RoZSBMZWdpb24gb2YgdGhlIEJvdW5jeSBDYXN0bGUxIzAhBgNVBAsTGkJv\r\n"
-     + "dW5jeSBQcmltYXJ5IENlcnRpZmljYXRlMA0GCSqGSIb3DQEBBQUAAgEBMCIYDzIw\r\n"
-     + "MDUwNjEwMDI0MTMzWhgPMjAwNTA2MTAwMjQzMTNaMBkwFwYDVRhIMRAwDoEMREFV\r\n"
-     + "MTIzNDU2Nzg5MA0GCSqGSIb3DQEBBQUAA4GBALAYXT9zdxSR5zdPLAon1xIPehgI\r\n"
-     + "NZhjM7w0uu3OdzSV5sC31X1Kx9vi5RIWiM9VimRTwbQIod9POttD5QMXCwQb/fm7\r\n"
-     + "eiJqL2YBIXOeClB19VrQe8xQtMFbyuFpDiM7QdvIam9ShZZMEMGjv9QHI64M4b0G\r\n"
-     + "odUBlSsJwPPQjZSU\r\n"
-     + "-----END X509 ATTRIBUTE CERTIFICATE-----\r\n";
-
-    static String ATTRIBUTE_CERTIFICATE_2 =
-       "-----BEGIN ATTRIBUTE CERTIFICATE-----\r\n"
-     + "MIIBuDCCASECAQEwZ6BlMGCkXjBcMQswCQYDVQQGEwJBVTEoMCYGA1UEChMfVGhl\r\n"
-     + "IExlZ2lvbiBvZiB0aGUgQm91bmN5IENhc3RsZTEjMCEGA1UECxMaQm91bmN5IFBy\r\n"
-     + "aW1hcnkgQ2VydGlmaWNhdGUCARSgYjBgpF4wXDELMAkGA1UEBhMCQVUxKDAmBgNV\r\n"
-     + "BAoTH1RoZSBMZWdpb24gb2YgdGhlIEJvdW5jeSBDYXN0bGUxIzAhBgNVBAsTGkJv\r\n"
-     + "dW5jeSBQcmltYXJ5IENlcnRpZmljYXRlMA0GCSqGSIb3DQEBBQUAAgEBMCIYDzIw\r\n"
-     + "MDUwNjEwMDI0MTMzWhgPMjAwNTA2MTAwMjQzMTNaMBkwFwYDVRhIMRAwDoEMREFV\r\n"
-     + "MTIzNDU2Nzg5MA0GCSqGSIb3DQEBBQUAA4GBALAYXT9zdxSR5zdPLAon1xIPehgI\r\n"
-     + "NZhjM7w0uu3OdzSV5sC31X1Kx9vi5RIWiM9VimRTwbQIod9POttD5QMXCwQb/fm7\r\n"
-     + "eiJqL2YBIXOeClB19VrQe8xQtMFbyuFpDiM7QdvIam9ShZZMEMGjv9QHI64M4b0G\r\n"
-     + "odUBlSsJwPPQjZSU\r\n"
-     + "-----END ATTRIBUTE CERTIFICATE-----\r\n";
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/test/PKCS10Test.java b/bcpkix/src/main/java/org/bouncycastle/cert/test/PKCS10Test.java
deleted file mode 100644
index cd3e8af..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/test/PKCS10Test.java
+++ /dev/null
@@ -1,616 +0,0 @@
-package org.bouncycastle.cert.test;
-
-import java.math.BigInteger;
-import java.security.KeyFactory;
-import java.security.KeyPair;
-import java.security.KeyPairGenerator;
-import java.security.PrivateKey;
-import java.security.PublicKey;
-import java.security.SecureRandom;
-import java.security.Security;
-import java.security.Signature;
-import java.security.spec.RSAPrivateCrtKeySpec;
-import java.security.spec.RSAPublicKeySpec;
-
-import javax.security.auth.x500.X500Principal;
-
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.DEROctetString;
-import org.bouncycastle.asn1.cryptopro.CryptoProObjectIdentifiers;
-import org.bouncycastle.asn1.pkcs.Attribute;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.asn1.x500.X500Name;
-import org.bouncycastle.asn1.x500.X500NameBuilder;
-import org.bouncycastle.asn1.x500.style.BCStyle;
-import org.bouncycastle.asn1.x509.BasicConstraints;
-import org.bouncycastle.asn1.x509.Extension;
-import org.bouncycastle.asn1.x509.Extensions;
-import org.bouncycastle.asn1.x509.KeyUsage;
-import org.bouncycastle.asn1.x9.X9ObjectIdentifiers;
-import org.bouncycastle.cert.jcajce.JcaX509ExtensionUtils;
-import org.bouncycastle.jce.ECGOST3410NamedCurveTable;
-import org.bouncycastle.jce.ECNamedCurveTable;
-import org.bouncycastle.jce.interfaces.ECPointEncoder;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.jce.spec.ECNamedCurveParameterSpec;
-import org.bouncycastle.jce.spec.ECParameterSpec;
-import org.bouncycastle.jce.spec.ECPrivateKeySpec;
-import org.bouncycastle.jce.spec.ECPublicKeySpec;
-import org.bouncycastle.math.ec.ECCurve;
-import org.bouncycastle.operator.ContentSigner;
-import org.bouncycastle.operator.ContentVerifierProvider;
-import org.bouncycastle.operator.jcajce.JcaContentSignerBuilder;
-import org.bouncycastle.operator.jcajce.JcaContentVerifierProviderBuilder;
-import org.bouncycastle.pkcs.PKCS10CertificationRequest;
-import org.bouncycastle.pkcs.PKCS10CertificationRequestBuilder;
-import org.bouncycastle.pkcs.jcajce.JcaPKCS10CertificationRequest;
-import org.bouncycastle.pkcs.jcajce.JcaPKCS10CertificationRequestBuilder;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.encoders.Base64;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-
-/**
- **/
-public class PKCS10Test
-    extends SimpleTest
-{
-    private static final String BC = BouncyCastleProvider.PROVIDER_NAME;
-
-    private byte[] gost3410EC_A = Base64.decode(
-  "MIIBOzCB6wIBADB/MQ0wCwYDVQQDEwR0ZXN0MRUwEwYDVQQKEwxEZW1vcyBDbyBMdGQxHjAcBgNV"
- +"BAsTFUNyeXB0b2dyYXBoeSBkaXZpc2lvbjEPMA0GA1UEBxMGTW9zY293MQswCQYDVQQGEwJydTEZ"
- +"MBcGCSqGSIb3DQEJARYKc2RiQGRvbC5ydTBjMBwGBiqFAwICEzASBgcqhQMCAiMBBgcqhQMCAh4B"
- +"A0MABEBYx0P2D7YuuZo5HgdIAUKAXcLBDZ+4LYFgbKjrfStVfH59lc40BQ2FZ7M703hLpXK8GiBQ"
- +"GEYpKaAuQZnMIpByoAAwCAYGKoUDAgIDA0EAgXMcTrhdOY2Er2tHOSAgnMezqrYxocZTWhxmW5Rl"
- +"JY6lbXH5rndCn4swFzXU+YhgAsJv1wQBaoZEWRl5WV4/nA==");
-
-    private byte[] gost3410EC_B = Base64.decode(
-  "MIIBPTCB7QIBADCBgDENMAsGA1UEAxMEdGVzdDEWMBQGA1UEChMNRGVtb3MgQ28gTHRkLjEeMBwG"
- +"A1UECxMVQ3J5cHRvZ3JhcGh5IGRpdmlzaW9uMQ8wDQYDVQQHEwZNb3Njb3cxCzAJBgNVBAYTAnJ1"
- +"MRkwFwYJKoZIhvcNAQkBFgpzZGJAZG9sLnJ1MGMwHAYGKoUDAgITMBIGByqFAwICIwIGByqFAwIC"
- +"HgEDQwAEQI5SLoWT7dZVilbV9j5B/fyIDuDs6x4pjqNC2TtFYbpRHrk/Wc5g/mcHvD80tsm5o1C7"
- +"7cizNzkvAVUM4VT4Dz6gADAIBgYqhQMCAgMDQQAoT5TwJ8o+bSrxckymyo3diwG7ZbSytX4sRiKy"
- +"wXPWRS9LlBvPO2NqwpS2HUnxSU8rzfL9fJcybATf7Yt1OEVq");
-
-    private byte[] gost3410EC_C = Base64.decode(
-  "MIIBRDCB9AIBADCBhzEVMBMGA1UEAxMMdGVzdCByZXF1ZXN0MRUwEwYDVQQKEwxEZW1vcyBDbyBM"
- +"dGQxHjAcBgNVBAsTFUNyeXB0b2dyYXBoeSBkaXZpc2lvbjEPMA0GA1UEBxMGTW9zY293MQswCQYD"
- +"VQQGEwJydTEZMBcGCSqGSIb3DQEJARYKc2RiQGRvbC5ydTBjMBwGBiqFAwICEzASBgcqhQMCAiMD"
- +"BgcqhQMCAh4BA0MABEBcmGh7OmR4iqqj+ycYo1S1fS7r5PhisSQU2Ezuz8wmmmR2zeTZkdMYCOBa"
- +"UTMNms0msW3wuYDho7nTDNscHTB5oAAwCAYGKoUDAgIDA0EAVoOMbfyo1Un4Ss7WQrUjHJoiaYW8"
- +"Ime5LeGGU2iW3ieAv6es/FdMrwTKkqn5dhd3aL/itFg5oQbhyfXw5yw/QQ==");
-    
-    private byte[] gost3410EC_ExA = Base64.decode(
-     "MIIBOzCB6wIBADB/MQ0wCwYDVQQDEwR0ZXN0MRUwEwYDVQQKEwxEZW1vcyBDbyBMdGQxHjAcBgNV"
-   + "BAsTFUNyeXB0b2dyYXBoeSBkaXZpc2lvbjEPMA0GA1UEBxMGTW9zY293MQswCQYDVQQGEwJydTEZ"
-   + "MBcGCSqGSIb3DQEJARYKc2RiQGRvbC5ydTBjMBwGBiqFAwICEzASBgcqhQMCAiQABgcqhQMCAh4B"
-   + "A0MABEDkqNT/3f8NHj6EUiWnK4JbVZBh31bEpkwq9z3jf0u8ZndG56Vt+K1ZB6EpFxLT7hSIos0w"
-   + "weZ2YuTZ4w43OgodoAAwCAYGKoUDAgIDA0EASk/IUXWxoi6NtcUGVF23VRV1L3undB4sRZLp4Vho"
-   + "gQ7m3CMbZFfJ2cPu6QyarseXGYHmazoirH5lGjEo535c1g==");
-
-    private byte[] gost3410EC_ExB = Base64.decode(
-      "MIIBPTCB7QIBADCBgDENMAsGA1UEAxMEdGVzdDEWMBQGA1UEChMNRGVtb3MgQ28gTHRkLjEeMBwG"
-    + "A1UECxMVQ3J5cHRvZ3JhcGh5IGRpdmlzaW9uMQ8wDQYDVQQHEwZNb3Njb3cxCzAJBgNVBAYTAnJ1"
-    + "MRkwFwYJKoZIhvcNAQkBFgpzZGJAZG9sLnJ1MGMwHAYGKoUDAgITMBIGByqFAwICJAEGByqFAwIC"
-    + "HgEDQwAEQMBWYUKPy/1Kxad9ChAmgoSWSYOQxRnXo7KEGLU5RNSXA4qMUvArWzvhav+EYUfTbWLh"
-    + "09nELDyHt2XQcvgQHnSgADAIBgYqhQMCAgMDQQAdaNhgH/ElHp64mbMaEo1tPCg9Q22McxpH8rCz"
-    + "E0QBpF4H5mSSQVGI5OAXHToetnNuh7gHHSynyCupYDEHTbkZ");
-
-    public String getName()
-    {
-        return "PKCS10CertRequest";
-    }
-
-    private void generationTest(int keySize, String keyName, String sigName, String provider)
-        throws Exception
-    {
-        KeyPairGenerator kpg = KeyPairGenerator.getInstance(keyName, "BC");
-
-        kpg.initialize(keySize);
-
-        KeyPair kp = kpg.genKeyPair();
-
-
-        X500NameBuilder x500NameBld = new X500NameBuilder(BCStyle.INSTANCE);
-
-        x500NameBld.addRDN(BCStyle.C, "AU");
-        x500NameBld.addRDN(BCStyle.O, "The Legion of the Bouncy Castle");
-        x500NameBld.addRDN(BCStyle.L, "Melbourne");
-        x500NameBld.addRDN(BCStyle.ST, "Victoria");
-        x500NameBld.addRDN(BCStyle.EmailAddress, "feedback-crypto@bouncycastle.org");
-
-        X500Name    subject = x500NameBld.build();
-
-        PKCS10CertificationRequestBuilder requestBuilder = new JcaPKCS10CertificationRequestBuilder(subject, kp.getPublic());
-                            
-        PKCS10CertificationRequest req1 = requestBuilder.build(new JcaContentSignerBuilder(sigName).setProvider(provider).build(kp.getPrivate()));
-
-        JcaPKCS10CertificationRequest req2 = new JcaPKCS10CertificationRequest(req1.getEncoded()).setProvider(provider);
-
-        if (!req2.isSignatureValid(new JcaContentVerifierProviderBuilder().setProvider(provider).build(kp.getPublic())))
-        {
-            fail(sigName + ": Failed verify check.");
-        }
-
-        if (!Arrays.areEqual(req2.getPublicKey().getEncoded(), req1.getSubjectPublicKeyInfo().getEncoded()))
-        {
-            fail(keyName + ": Failed public key check.");
-        }
-    }
-
-    private void generationTestX500Principal(int keySize, String keyName, String sigName, String provider)
-        throws Exception
-    {
-        KeyPairGenerator kpg = KeyPairGenerator.getInstance(keyName, "BC");
-
-        kpg.initialize(keySize);
-
-        KeyPair kp = kpg.genKeyPair();
-
-
-        X500NameBuilder x500NameBld = new X500NameBuilder(BCStyle.INSTANCE);
-
-        x500NameBld.addRDN(BCStyle.C, "AU");
-        x500NameBld.addRDN(BCStyle.O, "The Legion of the Bouncy Castle");
-        x500NameBld.addRDN(BCStyle.L, "Melbourne");
-        x500NameBld.addRDN(BCStyle.ST, "Victoria");
-        x500NameBld.addRDN(BCStyle.EmailAddress, "feedback-crypto@bouncycastle.org");
-
-        X500Name    subject = x500NameBld.build();
-
-        PKCS10CertificationRequestBuilder requestBuilder = new JcaPKCS10CertificationRequestBuilder(new X500Principal(subject.getEncoded()), kp.getPublic());
-
-        PKCS10CertificationRequest req1 = requestBuilder.build(new JcaContentSignerBuilder(sigName).setProvider(provider).build(kp.getPrivate()));
-
-        JcaPKCS10CertificationRequest req2 = new JcaPKCS10CertificationRequest(req1.getEncoded()).setProvider(provider);
-
-        if (!req2.isSignatureValid(new JcaContentVerifierProviderBuilder().setProvider(provider).build(kp.getPublic())))
-        {
-            fail(sigName + ": Failed verify check.");
-        }
-
-        if (!Arrays.areEqual(req2.getPublicKey().getEncoded(), req1.getSubjectPublicKeyInfo().getEncoded()))
-        {
-            fail(keyName + ": Failed public key check.");
-        }
-
-        if (!Arrays.areEqual(req2.getSubject().getEncoded(), req1.getSubject().getEncoded()))
-        {
-            fail(keyName + ": Failed subject key check.");
-        }
-    }
-
-    /*
-     * we generate a self signed certificate for the sake of testing - SHA224withECDSA
-     */
-    private void createECRequest(String algorithm, ASN1ObjectIdentifier algOid, ASN1ObjectIdentifier curveOid)
-        throws Exception
-    {
-        ECNamedCurveParameterSpec spec = ECNamedCurveTable.getParameterSpec(curveOid.getId());
-        KeyPairGenerator ecGen = KeyPairGenerator.getInstance("ECDSA", "BC");
-
-        ecGen.initialize(spec);
-
-        //
-        // set up the keys
-        //
-        PrivateKey          privKey;
-        PublicKey           pubKey;
-
-        KeyPair pair = ecGen.generateKeyPair();
-
-        privKey = pair.getPrivate();
-        pubKey = pair.getPublic();
-
-        ContentSigner signer = new JcaContentSignerBuilder(algorithm).setProvider(BC).build(privKey);
-
-        PKCS10CertificationRequestBuilder reqBuilder = new JcaPKCS10CertificationRequestBuilder(new X500Name("CN=XXX"), pubKey);
-        PKCS10CertificationRequest req = reqBuilder.build(signer);
-
-        ContentVerifierProvider verifier = new JcaContentVerifierProviderBuilder().setProvider(BC).build(pubKey);
-
-        if (!req.isSignatureValid(verifier))
-        {
-            fail("Failed verify check EC.");
-        }
-
-        req = new PKCS10CertificationRequest(req.getEncoded());
-        if (!req.isSignatureValid(verifier))
-        {
-            fail("Failed verify check EC encoded.");
-        }
-        
-        //
-        // try with point compression turned off
-        //
-        ((ECPointEncoder)pubKey).setPointFormat("UNCOMPRESSED");
-
-        reqBuilder = new JcaPKCS10CertificationRequestBuilder(new X500Name("CN=XXX"), pubKey);
-        req = reqBuilder.build(signer);
-
-        if (!req.isSignatureValid(verifier))
-        {
-            fail("Failed verify check EC uncompressed.");
-        }
-        
-        req = new PKCS10CertificationRequest(req.getEncoded());
-        if (!req.isSignatureValid(verifier))
-        {
-            fail("Failed verify check EC uncompressed encoded.");
-        }
-        
-        if (!req.toASN1Structure().getSignatureAlgorithm().getAlgorithm().equals(algOid))
-        {
-            fail("ECDSA oid incorrect.");
-        }
-        
-        if (req.toASN1Structure().getSignatureAlgorithm().getParameters() != null)
-        {
-            fail("ECDSA parameters incorrect.");
-        }
-        
-        Signature sig = Signature.getInstance(algorithm, "BC");
-        
-        sig.initVerify(pubKey);
-        
-        sig.update(req.toASN1Structure().getCertificationRequestInfo().getEncoded());
-        
-        if (!sig.verify(req.toASN1Structure().getSignature().getBytes()))
-        {
-            fail("signature not mapped correctly.");
-        }
-    }
-
-    private void createECRequest(String algorithm, ASN1ObjectIdentifier algOid)
-        throws Exception
-    {
-        ECCurve.Fp curve = new ECCurve.Fp(
-            new BigInteger("6864797660130609714981900799081393217269435300143305409394463459185543183397656052122559640661454554977296311391480858037121987999716643812574028291115057151"), // q (or p)
-            new BigInteger("01FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFC", 16),   // a
-            new BigInteger("0051953EB9618E1C9A1F929A21A0B68540EEA2DA725B99B315F3B8B489918EF109E156193951EC7E937B1652C0BD3BB1BF073573DF883D2C34F1EF451FD46B503F00", 16));  // b
-
-        ECParameterSpec spec = new ECParameterSpec(
-            curve,
-            curve.decodePoint(Hex.decode("0200C6858E06B70404E9CD9E3ECB662395B4429C648139053FB521F828AF606B4D3DBAA14B5E77EFE75928FE1DC127A2FFA8DE3348B3C1856A429BF97E7E31C2E5BD66")), // G
-            new BigInteger("01FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFA51868783BF2F966B7FCC0148F709A5D03BB5C9B8899C47AEBB6FB71E91386409", 16)); // n
-
-        ECPrivateKeySpec privKeySpec = new ECPrivateKeySpec(
-            new BigInteger("5769183828869504557786041598510887460263120754767955773309066354712783118202294874205844512909370791582896372147797293913785865682804434049019366394746072023"), // d
-            spec);
-
-        ECPublicKeySpec pubKeySpec = new ECPublicKeySpec(
-            curve.decodePoint(Hex.decode("02006BFDD2C9278B63C92D6624F151C9D7A822CC75BD983B17D25D74C26740380022D3D8FAF304781E416175EADF4ED6E2B47142D2454A7AC7801DD803CF44A4D1F0AC")), // Q
-            spec);
-
-        //
-        // set up the keys
-        //
-        PrivateKey          privKey;
-        PublicKey           pubKey;
-
-        KeyFactory     fact = KeyFactory.getInstance("ECDSA", "BC");
-
-        privKey = fact.generatePrivate(privKeySpec);
-        pubKey = fact.generatePublic(pubKeySpec);
-
-        PKCS10CertificationRequest req = new JcaPKCS10CertificationRequestBuilder(
-                        new X500Name("CN=XXX"), pubKey).build(new JcaContentSignerBuilder(algorithm).setProvider(BC).build(privKey));
-        if (!req.isSignatureValid(new JcaContentVerifierProviderBuilder().setProvider(BC).build(pubKey)))
-        {
-            fail("Failed verify check EC.");
-        }
-
-        req = new PKCS10CertificationRequest(req.getEncoded());
-        if (!req.isSignatureValid(new JcaContentVerifierProviderBuilder().setProvider(BC).build(pubKey)))
-        {
-            fail("Failed verify check EC encoded.");
-        }
-
-        //
-        // try with point compression turned off
-        //
-        ((ECPointEncoder)pubKey).setPointFormat("UNCOMPRESSED");
-
-        req = new JcaPKCS10CertificationRequestBuilder(
-                        new X500Name("CN=XXX"), pubKey).build(new JcaContentSignerBuilder(algorithm).setProvider(BC).build(privKey));
-        if (!req.isSignatureValid(new JcaContentVerifierProviderBuilder().setProvider(BC).build(pubKey)))
-        {
-            fail("Failed verify check EC uncompressed.");
-        }
-
-        JcaPKCS10CertificationRequest jcaReq = new JcaPKCS10CertificationRequest(new PKCS10CertificationRequest(req.getEncoded()));
-        if (!jcaReq.isSignatureValid(new JcaContentVerifierProviderBuilder().setProvider(BC).build(jcaReq.getPublicKey())))
-        {
-            fail("Failed verify check EC uncompressed encoded.");
-        }
-
-        if (!jcaReq.getSignatureAlgorithm().getAlgorithm().equals(algOid))
-        {
-            fail("ECDSA oid incorrect.");
-        }
-
-        if (jcaReq.getSignatureAlgorithm().getParameters() != null)
-        {
-            fail("ECDSA parameters incorrect.");
-        }
-
-        Signature sig = Signature.getInstance(algorithm, BC);
-
-        sig.initVerify(pubKey);
-
-        sig.update(req.toASN1Structure().getCertificationRequestInfo().getEncoded());
-
-        if (!sig.verify(req.getSignature()))
-        {
-            fail("signature not mapped correctly.");
-        }
-    }
-
-    private void createECGOSTRequest()
-        throws Exception
-    {
-        String           algorithm = "GOST3411withECGOST3410";
-        KeyPairGenerator ecGostKpg = KeyPairGenerator.getInstance("ECGOST3410", "BC");
-
-        ecGostKpg.initialize(ECGOST3410NamedCurveTable.getParameterSpec("GostR3410-2001-CryptoPro-A"), new SecureRandom());
-
-        //
-        // set up the keys
-        //
-        KeyPair             pair = ecGostKpg.generateKeyPair();
-        PrivateKey          privKey = pair.getPrivate();
-        PublicKey           pubKey = pair.getPublic();
-
-        PKCS10CertificationRequest req = new JcaPKCS10CertificationRequestBuilder(
-                        new X500Name("CN=XXX"), pubKey).build(new JcaContentSignerBuilder(algorithm).setProvider(BC).build(privKey));
-        if (!req.isSignatureValid(new JcaContentVerifierProviderBuilder().setProvider(BC).build(pubKey)))
-        {
-            fail("Failed verify check EC.");
-        }
-
-        req = new PKCS10CertificationRequest(req.getEncoded());
-        if (!req.isSignatureValid(new JcaContentVerifierProviderBuilder().setProvider(BC).build(pubKey)))
-        {
-            fail("Failed verify check EC encoded.");
-        }
-
-        if (!req.getSignatureAlgorithm().getAlgorithm().equals(CryptoProObjectIdentifiers.gostR3411_94_with_gostR3410_2001))
-        {
-            fail("ECGOST oid incorrect.");
-        }
-
-        if (req.getSignatureAlgorithm().getParameters() != null)
-        {
-            fail("ECGOST parameters incorrect.");
-        }
-
-        Signature sig = Signature.getInstance(algorithm, "BC");
-
-        sig.initVerify(pubKey);
-
-        sig.update(req.toASN1Structure().getCertificationRequestInfo().getEncoded());
-
-        if (!sig.verify(req.getSignature()))
-        {
-            fail("signature not mapped correctly.");
-        }
-    }
-
-    private void createPSSTest(String algorithm)
-        throws Exception
-    {
-        RSAPublicKeySpec pubKeySpec = new RSAPublicKeySpec(
-            new BigInteger("a56e4a0e701017589a5187dc7ea841d156f2ec0e36ad52a44dfeb1e61f7ad991d8c51056ffedb162b4c0f283a12a88a394dff526ab7291cbb307ceabfce0b1dfd5cd9508096d5b2b8b6df5d671ef6377c0921cb23c270a70e2598e6ff89d19f105acc2d3f0cb35f29280e1386b6f64c4ef22e1e1f20d0ce8cffb2249bd9a2137",16),
-            new BigInteger("010001",16));
-
-        RSAPrivateCrtKeySpec privKeySpec = new RSAPrivateCrtKeySpec(
-            new BigInteger("a56e4a0e701017589a5187dc7ea841d156f2ec0e36ad52a44dfeb1e61f7ad991d8c51056ffedb162b4c0f283a12a88a394dff526ab7291cbb307ceabfce0b1dfd5cd9508096d5b2b8b6df5d671ef6377c0921cb23c270a70e2598e6ff89d19f105acc2d3f0cb35f29280e1386b6f64c4ef22e1e1f20d0ce8cffb2249bd9a2137",16),
-            new BigInteger("010001",16),
-            new BigInteger("33a5042a90b27d4f5451ca9bbbd0b44771a101af884340aef9885f2a4bbe92e894a724ac3c568c8f97853ad07c0266c8c6a3ca0929f1e8f11231884429fc4d9ae55fee896a10ce707c3ed7e734e44727a39574501a532683109c2abacaba283c31b4bd2f53c3ee37e352cee34f9e503bd80c0622ad79c6dcee883547c6a3b325",16),
-            new BigInteger("e7e8942720a877517273a356053ea2a1bc0c94aa72d55c6e86296b2dfc967948c0a72cbccca7eacb35706e09a1df55a1535bd9b3cc34160b3b6dcd3eda8e6443",16),
-            new BigInteger("b69dca1cf7d4d7ec81e75b90fcca874abcde123fd2700180aa90479b6e48de8d67ed24f9f19d85ba275874f542cd20dc723e6963364a1f9425452b269a6799fd",16),
-            new BigInteger("28fa13938655be1f8a159cbaca5a72ea190c30089e19cd274a556f36c4f6e19f554b34c077790427bbdd8dd3ede2448328f385d81b30e8e43b2fffa027861979",16),
-            new BigInteger("1a8b38f398fa712049898d7fb79ee0a77668791299cdfa09efc0e507acb21ed74301ef5bfd48be455eaeb6e1678255827580a8e4e8e14151d1510a82a3f2e729",16),
-            new BigInteger("27156aba4126d24a81f3a528cbfb27f56886f840a9f6e86e17a44b94fe9319584b8e22fdde1e5a2e3bd8aa5ba8d8584194eb2190acf832b847f13a3d24a79f4d",16));
-
-        KeyFactory  fact = KeyFactory.getInstance("RSA", "BC");
-
-        PrivateKey privKey = fact.generatePrivate(privKeySpec);
-        PublicKey pubKey = fact.generatePublic(pubKeySpec);
-
-        PKCS10CertificationRequest req = new JcaPKCS10CertificationRequestBuilder(
-                        new X500Name("CN=XXX"), pubKey).build(new JcaContentSignerBuilder(algorithm).setProvider(BC).build(privKey));
-        if (!req.isSignatureValid(new JcaContentVerifierProviderBuilder().setProvider(BC).build(pubKey)))
-        {
-            fail("Failed verify check PSS.");
-        }
-
-        JcaPKCS10CertificationRequest jcaReq = new JcaPKCS10CertificationRequest(req.getEncoded()).setProvider(BC);
-        if (!jcaReq.isSignatureValid(new JcaContentVerifierProviderBuilder().setProvider(BC).build(jcaReq.getPublicKey())))
-        {
-            fail("Failed verify check PSS encoded.");
-        }
-
-        if (!jcaReq.getSignatureAlgorithm().getAlgorithm().equals(PKCSObjectIdentifiers.id_RSASSA_PSS))
-        {
-            fail("PSS oid incorrect.");
-        }
-
-        if (jcaReq.getSignatureAlgorithm().getParameters() == null)
-        {
-            fail("PSS parameters incorrect.");
-        }
-
-        Signature sig = Signature.getInstance(algorithm, "BC");
-
-        sig.initVerify(pubKey);
-
-        sig.update(jcaReq.toASN1Structure().getCertificationRequestInfo().getEncoded());
-
-        if (!sig.verify(req.getSignature()))
-        {
-            fail("signature not mapped correctly.");
-        }
-    }
-
-     // previous code found to cause a NullPointerException
-    private void nullPointerTest()
-        throws Exception
-    {
-        KeyPairGenerator keyGen = KeyPairGenerator.getInstance("RSA", "BC");
-        keyGen.initialize(1024, new SecureRandom());
-        KeyPair pair = keyGen.generateKeyPair();
-        JcaX509ExtensionUtils extUtils = new JcaX509ExtensionUtils();
-
-        Extension[] ext = new Extension[] {
-            new Extension(Extension.basicConstraints, true, new DEROctetString(new BasicConstraints(true))),
-            new Extension(Extension.keyUsage, true, new DEROctetString(new KeyUsage(KeyUsage.keyCertSign | KeyUsage.cRLSign))),
-            new Extension(Extension.subjectKeyIdentifier, false, new DEROctetString(extUtils.createSubjectKeyIdentifier(pair.getPublic())))
-        };
-
-        PKCS10CertificationRequest p1 = new JcaPKCS10CertificationRequestBuilder(
-            new X500Name("cn=csr"),
-            pair.getPublic())
-            .addAttribute(PKCSObjectIdentifiers.pkcs_9_at_extensionRequest, new Extensions(ext))
-            .build(new JcaContentSignerBuilder("SHA1withRSA").setProvider(BC).build(pair.getPrivate()));
-        PKCS10CertificationRequest p2 = new JcaPKCS10CertificationRequestBuilder(
-            new X500Name("cn=csr"),
-            pair.getPublic())
-            .addAttribute(PKCSObjectIdentifiers.pkcs_9_at_extensionRequest, new Extensions(ext))
-            .build(new JcaContentSignerBuilder("SHA1withRSA").setProvider(BC).build(pair.getPrivate()));
-
-        if (!p1.equals(p2))
-        {
-            fail("cert request comparison failed");
-        }
-
-        Attribute[] attr1 = p1.getAttributes();
-        Attribute[] attr2 = p1.getAttributes();
-
-        checkAttrs(1, attr1, attr2);
-
-        attr1 = p1.getAttributes(PKCSObjectIdentifiers.pkcs_9_at_extensionRequest);
-        attr2 = p1.getAttributes(PKCSObjectIdentifiers.pkcs_9_at_extensionRequest);
-
-        checkAttrs(1, attr1, attr2);
-    }
-
-    private void checkAttrs(int expectedLength, Attribute[] attr1, Attribute[] attr2)
-    {
-        if (expectedLength != attr1.length)
-        {
-            fail("expected length mismatch");
-        }
-
-        if (attr1.length != attr2.length)
-        {
-            fail("atrribute length mismatch");
-        }
-
-        for (int i = 0; i != attr1.length; i++)
-        {
-            if (!attr1[i].equals(attr2[i]))
-            {
-                fail("atrribute mismatch");
-            }
-        }
-    }
-
-    public void performTest()
-        throws Exception
-    {
-        generationTest(512, "RSA", "SHA1withRSA", "BC");
-        generationTestX500Principal(512, "RSA", "SHA1withRSA", "BC");
-        generationTest(512, "GOST3410", "GOST3411withGOST3410", "BC");
-        
-        if (Security.getProvider("SunRsaSign") != null)
-        {
-            generationTest(512, "RSA", "SHA1withRSA", "SunRsaSign"); 
-        }
-        
-        // elliptic curve GOST A parameter set
-        JcaPKCS10CertificationRequest req = new JcaPKCS10CertificationRequest(gost3410EC_A).setProvider(BC);
-        if (!req.isSignatureValid(new JcaContentVerifierProviderBuilder().setProvider(BC).build(req.getPublicKey())))
-        {
-            fail("Failed verify check gost3410EC_A.");
-        }
-
-        // elliptic curve GOST B parameter set
-        req = new JcaPKCS10CertificationRequest(gost3410EC_B).setProvider(BC);
-        if (!req.isSignatureValid(new JcaContentVerifierProviderBuilder().setProvider(BC).build(req.getPublicKey())))
-        {
-            fail("Failed verify check gost3410EC_B.");
-        }
-
-        // elliptic curve GOST C parameter set
-        req = new JcaPKCS10CertificationRequest(gost3410EC_C).setProvider(BC);
-        if (!req.isSignatureValid(new JcaContentVerifierProviderBuilder().setProvider(BC).build(req.getPublicKey())))
-        {
-            fail("Failed verify check gost3410EC_C.");
-        }
-        
-        // elliptic curve GOST ExA parameter set
-        req = new JcaPKCS10CertificationRequest(gost3410EC_ExA).setProvider(BC);
-        if (!req.isSignatureValid(new JcaContentVerifierProviderBuilder().setProvider(BC).build(req.getPublicKey())))
-        {
-            fail("Failed verify check gost3410EC_ExA.");
-        }
-
-        // elliptic curve GOST ExB parameter set
-        req = new JcaPKCS10CertificationRequest(gost3410EC_ExB).setProvider(BC);
-        if (!req.isSignatureValid(new JcaContentVerifierProviderBuilder().setProvider(BC).build(req.getPublicKey())))
-        {
-            fail("Failed verify check gost3410EC_ExA.");
-        }
-
-        // elliptic curve openSSL
-        KeyPairGenerator g = KeyPairGenerator.getInstance("ECDSA", "BC");
-
-        ECCurve curve = new ECCurve.Fp(
-            new BigInteger("883423532389192164791648750360308885314476597252960362792450860609699839"), // q
-            new BigInteger("7fffffffffffffffffffffff7fffffffffff8000000000007ffffffffffc", 16), // a
-            new BigInteger("6b016c3bdcf18941d0d654921475ca71a9db2fb27d1d37796185c2942c0a", 16)); // b
-
-        ECParameterSpec ecSpec = new ECParameterSpec(
-            curve,
-            curve.decodePoint(Hex.decode("020ffa963cdca8816ccc33b8642bedf905c3d358573d3f27fbbd3b3cb9aaaf")), // G
-            new BigInteger("883423532389192164791648750360308884807550341691627752275345424702807307")); // n
-
-        g.initialize(ecSpec, new SecureRandom());
-
-        KeyPair kp = g.generateKeyPair();
-
-        req = new JcaPKCS10CertificationRequest(new JcaPKCS10CertificationRequestBuilder(
-               new X500Name("CN=XXX"), kp.getPublic()).build(new JcaContentSignerBuilder( "ECDSAWITHSHA1").setProvider(BC).build(kp.getPrivate())));
-        if (!req.isSignatureValid(new JcaContentVerifierProviderBuilder().setProvider(BC).build(req.getPublicKey())))
-        {
-            fail("Failed verify check EC.");
-        }
-        
-        createECRequest("SHA1withECDSA", X9ObjectIdentifiers.ecdsa_with_SHA1);
-        createECRequest("SHA224withECDSA", X9ObjectIdentifiers.ecdsa_with_SHA224);
-        createECRequest("SHA256withECDSA", X9ObjectIdentifiers.ecdsa_with_SHA256);
-        createECRequest("SHA384withECDSA", X9ObjectIdentifiers.ecdsa_with_SHA384);
-        createECRequest("SHA512withECDSA", X9ObjectIdentifiers.ecdsa_with_SHA512);
-
-        createECRequest("SHA1withECDSA", X9ObjectIdentifiers.ecdsa_with_SHA1, new ASN1ObjectIdentifier("1.3.132.0.34"));
-
-        createECGOSTRequest();
-
-        createPSSTest("SHA1withRSAandMGF1");
-        createPSSTest("SHA224withRSAandMGF1");
-        createPSSTest("SHA256withRSAandMGF1");
-        createPSSTest("SHA384withRSAandMGF1");
-
-        nullPointerTest();
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        Security.addProvider(new BouncyCastleProvider());
-
-        runTest(new PKCS10Test());
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/test/SHA1DigestCalculator.java b/bcpkix/src/main/java/org/bouncycastle/cert/test/SHA1DigestCalculator.java
deleted file mode 100644
index 4e8e7c1..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/test/SHA1DigestCalculator.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package org.bouncycastle.cert.test;
-
-import java.io.ByteArrayOutputStream;
-import java.io.OutputStream;
-
-import org.bouncycastle.asn1.oiw.OIWObjectIdentifiers;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.digests.SHA1Digest;
-import org.bouncycastle.operator.DigestCalculator;
-
-
-class SHA1DigestCalculator
-    implements DigestCalculator
-{
-    private ByteArrayOutputStream bOut = new ByteArrayOutputStream();
-
-    public AlgorithmIdentifier getAlgorithmIdentifier()
-    {
-        return new AlgorithmIdentifier(OIWObjectIdentifiers.idSHA1);
-    }
-
-    public OutputStream getOutputStream()
-    {
-        return bOut;
-    }
-
-    public byte[] getDigest()
-    {
-        byte[] bytes = bOut.toByteArray();
-
-        bOut.reset();
-
-        Digest sha1 = new SHA1Digest();
-
-        sha1.update(bytes, 0, bytes.length);
-
-        byte[] digest = new byte[sha1.getDigestSize()];
-
-        sha1.doFinal(digest, 0);
-
-        return digest;
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/test/SHA224DigestCalculator.java b/bcpkix/src/main/java/org/bouncycastle/cert/test/SHA224DigestCalculator.java
deleted file mode 100644
index f0de82e..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/test/SHA224DigestCalculator.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package org.bouncycastle.cert.test;
-
-import java.io.ByteArrayOutputStream;
-import java.io.OutputStream;
-
-import org.bouncycastle.asn1.nist.NISTObjectIdentifiers;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.digests.SHA224Digest;
-import org.bouncycastle.operator.DigestCalculator;
-
-
-class SHA224DigestCalculator
-    implements DigestCalculator
-{
-    private ByteArrayOutputStream bOut = new ByteArrayOutputStream();
-
-    public AlgorithmIdentifier getAlgorithmIdentifier()
-    {
-        return new AlgorithmIdentifier(NISTObjectIdentifiers.id_sha224);
-    }
-
-    public OutputStream getOutputStream()
-    {
-        return bOut;
-    }
-
-    public byte[] getDigest()
-    {
-        byte[] bytes = bOut.toByteArray();
-
-        bOut.reset();
-
-        Digest sha224 = new SHA224Digest();
-
-        sha224.update(bytes, 0, bytes.length);
-
-        byte[] digest = new byte[sha224.getDigestSize()];
-
-        sha224.doFinal(digest, 0);
-
-        return digest;
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cert/test/X509ExtensionUtilsTest.java b/bcpkix/src/main/java/org/bouncycastle/cert/test/X509ExtensionUtilsTest.java
deleted file mode 100644
index cd06082..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cert/test/X509ExtensionUtilsTest.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package org.bouncycastle.cert.test;
-
-import java.io.IOException;
-
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.x509.SubjectKeyIdentifier;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.bouncycastle.cert.X509ExtensionUtils;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.encoders.Base64;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-
-public class X509ExtensionUtilsTest
-    extends SimpleTest
-{
-    private static byte[] pubKeyInfo = Base64.decode(
-        "MFgwCwYJKoZIhvcNAQEBA0kAMEYCQQC6wMMmHYMZszT/7bNFMn+gaZoiWJLVP8ODRuu1C2jeAe" +
-        "QpxM+5Oe7PaN2GNy3nBE4EOYkB5pMJWA0y9n04FX8NAgED");
-
-    private static byte[] shaID = Hex.decode("d8128a06d6c2feb0865994a2936e7b75b836a021");
-    private static byte[] shaTruncID = Hex.decode("436e7b75b836a021");
-    private X509ExtensionUtils x509ExtensionUtils = new X509ExtensionUtils(new SHA1DigestCalculator());
-
-    public String getName()
-    {
-        return "X509ExtensionUtilsTest";
-    }
-
-    public void performTest()
-        throws IOException
-    {
-        SubjectPublicKeyInfo pubInfo = SubjectPublicKeyInfo.getInstance(ASN1Primitive.fromByteArray(pubKeyInfo));
-
-        SubjectKeyIdentifier ski = x509ExtensionUtils.createSubjectKeyIdentifier(pubInfo);
-
-        if (!Arrays.areEqual(shaID, ski.getKeyIdentifier()))
-        {
-            fail("SHA-1 ID does not match");
-        }
-
-        ski = x509ExtensionUtils.createTruncatedSubjectKeyIdentifier(pubInfo);
-
-        if (!Arrays.areEqual(shaTruncID, ski.getKeyIdentifier()))
-        {
-            fail("truncated SHA-1 ID does not match");
-        }
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        runTest(new X509ExtensionUtilsTest());
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cms/AuthAttributesProvider.java b/bcpkix/src/main/java/org/bouncycastle/cms/AuthAttributesProvider.java
deleted file mode 100644
index a17325b..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cms/AuthAttributesProvider.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package org.bouncycastle.cms;
-
-import org.bouncycastle.asn1.ASN1Set;
-
-interface AuthAttributesProvider
-{
-    ASN1Set getAuthAttributes();
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cms/CMSAlgorithm.java b/bcpkix/src/main/java/org/bouncycastle/cms/CMSAlgorithm.java
deleted file mode 100644
index a17fa2c..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cms/CMSAlgorithm.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package org.bouncycastle.cms;
-
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.cryptopro.CryptoProObjectIdentifiers;
-import org.bouncycastle.asn1.kisa.KISAObjectIdentifiers;
-import org.bouncycastle.asn1.nist.NISTObjectIdentifiers;
-import org.bouncycastle.asn1.ntt.NTTObjectIdentifiers;
-import org.bouncycastle.asn1.oiw.OIWObjectIdentifiers;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.asn1.teletrust.TeleTrusTObjectIdentifiers;
-import org.bouncycastle.asn1.x9.X9ObjectIdentifiers;
-
-public class CMSAlgorithm
-{
-    public static final ASN1ObjectIdentifier  DES_CBC         = OIWObjectIdentifiers.desCBC;
-    public static final ASN1ObjectIdentifier  DES_EDE3_CBC    = PKCSObjectIdentifiers.des_EDE3_CBC;
-    public static final ASN1ObjectIdentifier  RC2_CBC         = PKCSObjectIdentifiers.RC2_CBC;
-    public static final ASN1ObjectIdentifier  IDEA_CBC        = new ASN1ObjectIdentifier("1.3.6.1.4.1.188.7.1.1.2");
-    public static final ASN1ObjectIdentifier  CAST5_CBC       = new ASN1ObjectIdentifier("1.2.840.113533.7.66.10");
-
-    public static final ASN1ObjectIdentifier  AES128_CBC      = NISTObjectIdentifiers.id_aes128_CBC;
-    public static final ASN1ObjectIdentifier  AES192_CBC      = NISTObjectIdentifiers.id_aes192_CBC;
-    public static final ASN1ObjectIdentifier  AES256_CBC      = NISTObjectIdentifiers.id_aes256_CBC;
-    public static final ASN1ObjectIdentifier  AES128_CCM      = NISTObjectIdentifiers.id_aes128_CCM;
-    public static final ASN1ObjectIdentifier  AES192_CCM      = NISTObjectIdentifiers.id_aes192_CCM;
-    public static final ASN1ObjectIdentifier  AES256_CCM      = NISTObjectIdentifiers.id_aes256_CCM;
-    public static final ASN1ObjectIdentifier  AES128_GCM      = NISTObjectIdentifiers.id_aes128_GCM;
-    public static final ASN1ObjectIdentifier  AES192_GCM      = NISTObjectIdentifiers.id_aes192_GCM;
-    public static final ASN1ObjectIdentifier  AES256_GCM      = NISTObjectIdentifiers.id_aes256_GCM;
-
-    public static final ASN1ObjectIdentifier  CAMELLIA128_CBC = NTTObjectIdentifiers.id_camellia128_cbc;
-    public static final ASN1ObjectIdentifier  CAMELLIA192_CBC = NTTObjectIdentifiers.id_camellia192_cbc;
-    public static final ASN1ObjectIdentifier  CAMELLIA256_CBC = NTTObjectIdentifiers.id_camellia256_cbc;
-    public static final ASN1ObjectIdentifier  SEED_CBC        = KISAObjectIdentifiers.id_seedCBC;
-
-    public static final ASN1ObjectIdentifier  DES_EDE3_WRAP   = PKCSObjectIdentifiers.id_alg_CMS3DESwrap;
-    public static final ASN1ObjectIdentifier  AES128_WRAP     = NISTObjectIdentifiers.id_aes128_wrap;
-    public static final ASN1ObjectIdentifier  AES192_WRAP     = NISTObjectIdentifiers.id_aes192_wrap;
-    public static final ASN1ObjectIdentifier  AES256_WRAP     = NISTObjectIdentifiers.id_aes256_wrap;
-    public static final ASN1ObjectIdentifier  CAMELLIA128_WRAP = NTTObjectIdentifiers.id_camellia128_wrap;
-    public static final ASN1ObjectIdentifier  CAMELLIA192_WRAP = NTTObjectIdentifiers.id_camellia192_wrap;
-    public static final ASN1ObjectIdentifier  CAMELLIA256_WRAP = NTTObjectIdentifiers.id_camellia256_wrap;
-    public static final ASN1ObjectIdentifier  SEED_WRAP       = KISAObjectIdentifiers.id_npki_app_cmsSeed_wrap;
-
-    public static final ASN1ObjectIdentifier  ECDH_SHA1KDF    = X9ObjectIdentifiers.dhSinglePass_stdDH_sha1kdf_scheme;
-    public static final ASN1ObjectIdentifier  ECMQV_SHA1KDF   = X9ObjectIdentifiers.mqvSinglePass_sha1kdf_scheme;
-
-    public static final ASN1ObjectIdentifier  SHA1 = OIWObjectIdentifiers.idSHA1;
-    public static final ASN1ObjectIdentifier  SHA224 = NISTObjectIdentifiers.id_sha224;
-    public static final ASN1ObjectIdentifier  SHA256 = NISTObjectIdentifiers.id_sha256;
-    public static final ASN1ObjectIdentifier  SHA384 = NISTObjectIdentifiers.id_sha384;
-    public static final ASN1ObjectIdentifier  SHA512 = NISTObjectIdentifiers.id_sha512;
-    public static final ASN1ObjectIdentifier  MD5 = PKCSObjectIdentifiers.md5;
-    public static final ASN1ObjectIdentifier  GOST3411 = CryptoProObjectIdentifiers.gostR3411;
-    public static final ASN1ObjectIdentifier  RIPEMD128 = TeleTrusTObjectIdentifiers.ripemd128;
-    public static final ASN1ObjectIdentifier  RIPEMD160 = TeleTrusTObjectIdentifiers.ripemd160;
-    public static final ASN1ObjectIdentifier  RIPEMD256 = TeleTrusTObjectIdentifiers.ripemd256;
-
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cms/CMSAuthEnvelopedData.java b/bcpkix/src/main/java/org/bouncycastle/cms/CMSAuthEnvelopedData.java
deleted file mode 100644
index 010e12c..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cms/CMSAuthEnvelopedData.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package org.bouncycastle.cms;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.bouncycastle.asn1.ASN1Set;
-import org.bouncycastle.asn1.cms.AuthEnvelopedData;
-import org.bouncycastle.asn1.cms.ContentInfo;
-import org.bouncycastle.asn1.cms.EncryptedContentInfo;
-import org.bouncycastle.asn1.cms.OriginatorInfo;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-
-/**
- * containing class for an CMS AuthEnveloped Data object
- */
-class CMSAuthEnvelopedData
-{
-    RecipientInformationStore recipientInfoStore;
-    ContentInfo contentInfo;
-
-    private OriginatorInfo      originator;
-    private AlgorithmIdentifier authEncAlg;
-    private ASN1Set             authAttrs;
-    private byte[]              mac;
-    private ASN1Set             unauthAttrs;
-
-    public CMSAuthEnvelopedData(byte[] authEnvData) throws CMSException
-    {
-        this(CMSUtils.readContentInfo(authEnvData));
-    }
-
-    public CMSAuthEnvelopedData(InputStream authEnvData) throws CMSException
-    {
-        this(CMSUtils.readContentInfo(authEnvData));
-    }
-
-    public CMSAuthEnvelopedData(ContentInfo contentInfo) throws CMSException
-    {
-        this.contentInfo = contentInfo;
-
-        AuthEnvelopedData authEnvData = AuthEnvelopedData.getInstance(contentInfo.getContent());
-
-        this.originator = authEnvData.getOriginatorInfo();
-
-        //
-        // read the recipients
-        //
-        ASN1Set recipientInfos = authEnvData.getRecipientInfos();
-
-        //
-        // read the auth-encrypted content info
-        //
-        EncryptedContentInfo authEncInfo = authEnvData.getAuthEncryptedContentInfo();
-        this.authEncAlg = authEncInfo.getContentEncryptionAlgorithm();
-//        final CMSProcessable processable = new CMSProcessableByteArray(
-//            authEncInfo.getEncryptedContent().getOctets());
-        CMSSecureReadable secureReadable = new CMSSecureReadable()
-        {
-
-            public InputStream getInputStream()
-                throws IOException, CMSException
-            {
-                return null;
-            }
-        };
-
-        //
-        // build the RecipientInformationStore
-        //
-        this.recipientInfoStore = CMSEnvelopedHelper.buildRecipientInformationStore(
-            recipientInfos, this.authEncAlg, secureReadable);
-
-        // FIXME These need to be passed to the AEAD cipher as AAD (Additional Authenticated Data)
-        this.authAttrs = authEnvData.getAuthAttrs();
-        this.mac = authEnvData.getMac().getOctets();
-        this.unauthAttrs = authEnvData.getUnauthAttrs();
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cms/CMSAuthEnvelopedGenerator.java b/bcpkix/src/main/java/org/bouncycastle/cms/CMSAuthEnvelopedGenerator.java
deleted file mode 100644
index 9065857..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cms/CMSAuthEnvelopedGenerator.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package org.bouncycastle.cms;
-
-import org.bouncycastle.asn1.nist.NISTObjectIdentifiers;
-
-class CMSAuthEnvelopedGenerator
-{
-    public static final String AES128_CCM = NISTObjectIdentifiers.id_aes128_CCM.getId();
-    public static final String AES192_CCM = NISTObjectIdentifiers.id_aes192_CCM.getId();
-    public static final String AES256_CCM = NISTObjectIdentifiers.id_aes256_CCM.getId();
-    public static final String AES128_GCM = NISTObjectIdentifiers.id_aes128_GCM.getId();
-    public static final String AES192_GCM = NISTObjectIdentifiers.id_aes192_GCM.getId();
-    public static final String AES256_GCM = NISTObjectIdentifiers.id_aes256_GCM.getId();
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cms/CMSAuthenticatedData.java b/bcpkix/src/main/java/org/bouncycastle/cms/CMSAuthenticatedData.java
deleted file mode 100644
index f8c0874..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cms/CMSAuthenticatedData.java
+++ /dev/null
@@ -1,262 +0,0 @@
-package org.bouncycastle.cms;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.ASN1Set;
-import org.bouncycastle.asn1.cms.AttributeTable;
-import org.bouncycastle.asn1.cms.AuthenticatedData;
-import org.bouncycastle.asn1.cms.CMSAttributes;
-import org.bouncycastle.asn1.cms.ContentInfo;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.operator.DigestCalculatorProvider;
-import org.bouncycastle.operator.OperatorCreationException;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.Encodable;
-
-/**
- * containing class for an CMS Authenticated Data object
- */
-public class CMSAuthenticatedData
-    implements Encodable
-{
-    RecipientInformationStore   recipientInfoStore;
-    ContentInfo                 contentInfo;
-
-    private AlgorithmIdentifier macAlg;
-    private ASN1Set authAttrs;
-    private ASN1Set unauthAttrs;
-    private byte[] mac;
-    private OriginatorInformation originatorInfo;
-
-    public CMSAuthenticatedData(
-        byte[]    authData)
-        throws CMSException
-    {
-        this(CMSUtils.readContentInfo(authData));
-    }
-
-    public CMSAuthenticatedData(
-        byte[]    authData,
-        DigestCalculatorProvider digestCalculatorProvider)
-        throws CMSException
-    {
-        this(CMSUtils.readContentInfo(authData), digestCalculatorProvider);
-    }
-
-    public CMSAuthenticatedData(
-        InputStream    authData)
-        throws CMSException
-    {
-        this(CMSUtils.readContentInfo(authData));
-    }
-
-    public CMSAuthenticatedData(
-        InputStream    authData,
-        DigestCalculatorProvider digestCalculatorProvider)
-        throws CMSException
-    {
-        this(CMSUtils.readContentInfo(authData), digestCalculatorProvider);
-    }
-
-    public CMSAuthenticatedData(
-        ContentInfo contentInfo)
-        throws CMSException
-    {
-        this(contentInfo, null);
-    }
-
-    public CMSAuthenticatedData(
-        ContentInfo contentInfo,
-        DigestCalculatorProvider digestCalculatorProvider)
-        throws CMSException
-    {
-        this.contentInfo = contentInfo;
-
-        AuthenticatedData authData = AuthenticatedData.getInstance(contentInfo.getContent());
-
-        if (authData.getOriginatorInfo() != null)
-        {
-            this.originatorInfo = new OriginatorInformation(authData.getOriginatorInfo());
-        }
-
-        //
-        // read the recipients
-        //
-        ASN1Set recipientInfos = authData.getRecipientInfos();
-
-        this.macAlg = authData.getMacAlgorithm();
-
-
-        this.authAttrs = authData.getAuthAttrs();
-        this.mac = authData.getMac().getOctets();
-        this.unauthAttrs = authData.getUnauthAttrs();
-
-        //
-        // read the authenticated content info
-        //
-        ContentInfo encInfo = authData.getEncapsulatedContentInfo();
-        CMSReadable readable = new CMSProcessableByteArray(
-            ASN1OctetString.getInstance(encInfo.getContent()).getOctets());
-
-        //
-        // build the RecipientInformationStore
-        //
-        if (authAttrs != null)
-        {
-            if (digestCalculatorProvider == null)
-            {
-                throw new CMSException("a digest calculator provider is required if authenticated attributes are present");
-            }
-
-            try
-            {
-                CMSSecureReadable secureReadable = new CMSEnvelopedHelper.CMSDigestAuthenticatedSecureReadable(digestCalculatorProvider.get(authData.getDigestAlgorithm()), readable);
-
-                this.recipientInfoStore = CMSEnvelopedHelper.buildRecipientInformationStore(recipientInfos, this.macAlg, secureReadable, new AuthAttributesProvider()
-                {
-                    public ASN1Set getAuthAttributes()
-                    {
-                        return authAttrs;
-                    }
-                });
-            }
-            catch (OperatorCreationException e)
-            {
-                throw new CMSException("unable to create digest calculator: " + e.getMessage(), e);
-            }
-        }
-        else
-        {
-            CMSSecureReadable secureReadable = new CMSEnvelopedHelper.CMSAuthenticatedSecureReadable(this.macAlg, readable);
-
-            this.recipientInfoStore = CMSEnvelopedHelper.buildRecipientInformationStore(recipientInfos, this.macAlg, secureReadable);
-        }
-    }
-
-    /**
-     * Return the originator information associated with this message if present.
-     *
-     * @return OriginatorInformation, null if not present.
-     */
-    public OriginatorInformation getOriginatorInfo()
-    {
-        return originatorInfo;
-    }
-
-    public byte[] getMac()
-    {
-        return Arrays.clone(mac);
-    }
-
-    private byte[] encodeObj(
-        ASN1Encodable obj)
-        throws IOException
-    {
-        if (obj != null)
-        {
-            return obj.toASN1Primitive().getEncoded();
-        }
-
-        return null;
-    }
-
-    /**
-     * Return the MAC algorithm details for the MAC associated with the data in this object.
-     *
-     * @return AlgorithmIdentifier representing the MAC algorithm.
-     */
-    public AlgorithmIdentifier getMacAlgorithm()
-    {
-        return macAlg;
-    }
-
-    /**
-     * return the object identifier for the content MAC algorithm.
-     */
-    public String getMacAlgOID()
-    {
-        return macAlg.getAlgorithm().getId();
-    }
-
-    /**
-     * return the ASN.1 encoded MAC algorithm parameters, or null if
-     * there aren't any.
-     */
-    public byte[] getMacAlgParams()
-    {
-        try
-        {
-            return encodeObj(macAlg.getParameters());
-        }
-        catch (Exception e)
-        {
-            throw new RuntimeException("exception getting encryption parameters " + e);
-        }
-    }
-
-    /**
-     * return a store of the intended recipients for this message
-     */
-    public RecipientInformationStore getRecipientInfos()
-    {
-        return recipientInfoStore;
-    }
-
-    /**
-     * return the ContentInfo
-     */
-    public ContentInfo getContentInfo()
-    {
-        return contentInfo;
-    }
-
-    /**
-     * return a table of the digested attributes indexed by
-     * the OID of the attribute.
-     */
-    public AttributeTable getAuthAttrs()
-    {
-        if (authAttrs == null)
-        {
-            return null;
-        }
-
-        return new AttributeTable(authAttrs);
-    }
-
-    /**
-     * return a table of the undigested attributes indexed by
-     * the OID of the attribute.
-     */
-    public AttributeTable getUnauthAttrs()
-    {
-        if (unauthAttrs == null)
-        {
-            return null;
-        }
-
-        return new AttributeTable(unauthAttrs);
-    }
-
-    /**
-     * return the ASN.1 encoded representation of this object.
-     */
-    public byte[] getEncoded()
-        throws IOException
-    {
-        return contentInfo.getEncoded();
-    }
-
-    public byte[] getContentDigest()
-    {
-        if (authAttrs != null)
-        {
-            return ASN1OctetString.getInstance(getAuthAttrs().get(CMSAttributes.messageDigest).getAttrValues().getObjectAt(0)).getOctets();
-        }
-
-        return null;
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cms/CMSAuthenticatedDataGenerator.java b/bcpkix/src/main/java/org/bouncycastle/cms/CMSAuthenticatedDataGenerator.java
deleted file mode 100644
index 82f8294..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cms/CMSAuthenticatedDataGenerator.java
+++ /dev/null
@@ -1,181 +0,0 @@
-package org.bouncycastle.cms;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Encoding;
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.ASN1Set;
-import org.bouncycastle.asn1.BEROctetString;
-import org.bouncycastle.asn1.BERSet;
-import org.bouncycastle.asn1.DEROctetString;
-import org.bouncycastle.asn1.DERSet;
-import org.bouncycastle.asn1.cms.AuthenticatedData;
-import org.bouncycastle.asn1.cms.CMSObjectIdentifiers;
-import org.bouncycastle.asn1.cms.ContentInfo;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.operator.DigestCalculator;
-import org.bouncycastle.operator.DigestCalculatorProvider;
-import org.bouncycastle.operator.MacCalculator;
-import org.bouncycastle.operator.OperatorCreationException;
-import org.bouncycastle.util.io.TeeOutputStream;
-
-/**
- * General class for generating a CMS authenticated-data message.
- *
- * A simple example of usage.
- *
- * <pre>
- *      CMSAuthenticatedDataGenerator  fact = new CMSAuthenticatedDataGenerator();
- *
- *      adGen.addRecipientInfoGenerator(new JceKeyTransRecipientInfoGenerator(recipientCert).setProvider("BC"));
- *
- *      CMSAuthenticatedData         data = fact.generate(new CMSProcessableByteArray(data),
- *                              new JceCMSMacCalculatorBuilder(CMSAlgorithm.DES_EDE3_CBC).setProvider(BC).build()));
- * </pre>
- */
-public class CMSAuthenticatedDataGenerator
-    extends CMSAuthenticatedGenerator
-{
-    /**
-     * base constructor
-     */
-    public CMSAuthenticatedDataGenerator()
-    {
-    }
-
-    /**
-     * Generate an authenticated data object from the passed in typedData and MacCalculator.
-     *
-     * @param typedData the data to have a MAC attached.
-     * @param macCalculator the calculator of the MAC to be attached.
-     * @return the resulting CMSAuthenticatedData object.
-     * @throws CMSException on failure in encoding data or processing recipients.
-     */
-    public CMSAuthenticatedData generate(CMSTypedData typedData, MacCalculator macCalculator)
-        throws CMSException
-    {
-        return generate(typedData, macCalculator, null);
-    }
-
-    /**
-     * Generate an authenticated data object from the passed in typedData and MacCalculator.
-     *
-     * @param typedData the data to have a MAC attached.
-     * @param macCalculator the calculator of the MAC to be attached.
-     * @param digestCalculator calculator for computing digest of the encapsulated data.
-     * @return the resulting CMSAuthenticatedData object.
-     * @throws CMSException on failure in encoding data or processing recipients.    
-     */
-    public CMSAuthenticatedData generate(CMSTypedData typedData, MacCalculator macCalculator, final DigestCalculator digestCalculator)
-        throws CMSException
-    {
-        ASN1EncodableVector     recipientInfos = new ASN1EncodableVector();
-        ASN1OctetString         encContent;
-        ASN1OctetString         macResult;
-
-        for (Iterator it = recipientInfoGenerators.iterator(); it.hasNext();)
-        {
-            RecipientInfoGenerator recipient = (RecipientInfoGenerator)it.next();
-
-            recipientInfos.add(recipient.generate(macCalculator.getKey()));
-        }
-
-        AuthenticatedData authData;
-
-        if (digestCalculator != null)
-        {
-            try
-            {
-                ByteArrayOutputStream bOut = new ByteArrayOutputStream();
-                OutputStream out = new TeeOutputStream(digestCalculator.getOutputStream(), bOut);
-
-                typedData.write(out);
-
-                out.close();
-
-                encContent = new BEROctetString(bOut.toByteArray());
-            }
-            catch (IOException e)
-            {
-                throw new CMSException("unable to perform digest calculation: " + e.getMessage(), e);
-            }
-
-            Map parameters = getBaseParameters(typedData.getContentType(), digestCalculator.getAlgorithmIdentifier(), digestCalculator.getDigest());
-
-            if (authGen == null)
-            {
-                authGen = new DefaultAuthenticatedAttributeTableGenerator();
-            }
-            ASN1Set authed = new DERSet(authGen.getAttributes(Collections.unmodifiableMap(parameters)).toASN1EncodableVector());
-
-            try
-            {
-                OutputStream mOut = macCalculator.getOutputStream();
-
-                mOut.write(authed.getEncoded(ASN1Encoding.DER));
-
-                mOut.close();
-
-                macResult = new DEROctetString(macCalculator.getMac());
-            }
-            catch (IOException e)
-            {
-                throw new CMSException("exception decoding algorithm parameters.", e);
-            }
-            ASN1Set unauthed = (unauthGen != null) ? new BERSet(unauthGen.getAttributes(Collections.unmodifiableMap(parameters)).toASN1EncodableVector()) : null;
-
-            ContentInfo  eci = new ContentInfo(
-                            CMSObjectIdentifiers.data,
-                            encContent);
-
-            authData = new AuthenticatedData(originatorInfo, new DERSet(recipientInfos), macCalculator.getAlgorithmIdentifier(), digestCalculator.getAlgorithmIdentifier(), eci, authed, macResult, unauthed);
-        }
-        else
-        {
-            try
-            {
-                ByteArrayOutputStream   bOut = new ByteArrayOutputStream();
-                OutputStream mOut = new TeeOutputStream(bOut, macCalculator.getOutputStream());
-
-                typedData.write(mOut);
-
-                mOut.close();
-
-                encContent = new BEROctetString(bOut.toByteArray());
-
-                macResult = new DEROctetString(macCalculator.getMac());
-            }
-            catch (IOException e)
-            {
-                throw new CMSException("exception decoding algorithm parameters.", e);
-            }
-
-            ASN1Set unauthed = (unauthGen != null) ? new BERSet(unauthGen.getAttributes(new HashMap()).toASN1EncodableVector()) : null;
-
-            ContentInfo  eci = new ContentInfo(
-                            CMSObjectIdentifiers.data,
-                            encContent);
-
-            authData = new AuthenticatedData(originatorInfo, new DERSet(recipientInfos), macCalculator.getAlgorithmIdentifier(), null, eci, null, macResult, unauthed);
-        }
-
-        ContentInfo contentInfo = new ContentInfo(
-                CMSObjectIdentifiers.authenticatedData, authData);
-
-        return new CMSAuthenticatedData(contentInfo, new DigestCalculatorProvider()
-        {
-            public DigestCalculator get(AlgorithmIdentifier digestAlgorithmIdentifier)
-                throws OperatorCreationException
-            {
-                return digestCalculator;
-            }
-        });
-    }
-}
\ No newline at end of file
diff --git a/bcpkix/src/main/java/org/bouncycastle/cms/CMSAuthenticatedDataParser.java b/bcpkix/src/main/java/org/bouncycastle/cms/CMSAuthenticatedDataParser.java
deleted file mode 100644
index 11c90c6..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cms/CMSAuthenticatedDataParser.java
+++ /dev/null
@@ -1,348 +0,0 @@
-package org.bouncycastle.cms;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.ASN1OctetStringParser;
-import org.bouncycastle.asn1.ASN1SequenceParser;
-import org.bouncycastle.asn1.ASN1Set;
-import org.bouncycastle.asn1.ASN1SetParser;
-import org.bouncycastle.asn1.BERTags;
-import org.bouncycastle.asn1.DERSet;
-import org.bouncycastle.asn1.cms.AttributeTable;
-import org.bouncycastle.asn1.cms.AuthenticatedDataParser;
-import org.bouncycastle.asn1.cms.CMSAttributes;
-import org.bouncycastle.asn1.cms.ContentInfoParser;
-import org.bouncycastle.asn1.cms.OriginatorInfo;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.operator.DigestCalculatorProvider;
-import org.bouncycastle.operator.OperatorCreationException;
-import org.bouncycastle.util.Arrays;
-
-/**
- * Parsing class for an CMS Authenticated Data object from an input stream.
- * <p>
- * Note: that because we are in a streaming mode only one recipient can be tried and it is important
- * that the methods on the parser are called in the appropriate order.
- * </p>
- * <p>
- * Example of use - assuming the first recipient matches the private key we have.
- * <pre>
- *      CMSAuthenticatedDataParser     ad = new CMSAuthenticatedDataParser(inputStream);
- *
- *      RecipientInformationStore  recipients = ad.getRecipientInfos();
- *
- *      Collection  c = recipients.getRecipients();
- *      Iterator    it = c.iterator();
- *
- *      if (it.hasNext())
- *      {
- *          RecipientInformation   recipient = (RecipientInformation)it.next();
- *
- *          CMSTypedStream recData = recipient.getContentStream(new JceKeyTransAuthenticatedRecipient(privateKey).setProvider("BC"));
- *
- *          processDataStream(recData.getContentStream());
- *
- *          if (!Arrays.equals(ad.getMac(), recipient.getMac())
- *          {
- *              System.err.println("Data corrupted!!!!");
- *          }
- *      }
- *  </pre>
- *  Note: this class does not introduce buffering - if you are processing large files you should create
- *  the parser with:
- *  <pre>
- *          CMSAuthenticatedDataParser     ep = new CMSAuthenticatedDataParser(new BufferedInputStream(inputStream, bufSize));
- *  </pre>
- *  where bufSize is a suitably large buffer size.
- */
-public class CMSAuthenticatedDataParser
-    extends CMSContentInfoParser
-{
-    RecipientInformationStore recipientInfoStore;
-    AuthenticatedDataParser authData;
-
-    private AlgorithmIdentifier macAlg;
-    private byte[] mac;
-    private AttributeTable authAttrs;
-    private ASN1Set authAttrSet;
-    private AttributeTable unauthAttrs;
-
-    private boolean authAttrNotRead;
-    private boolean unauthAttrNotRead;
-    private OriginatorInformation originatorInfo;
-
-    public CMSAuthenticatedDataParser(
-        byte[] envelopedData)
-        throws CMSException, IOException
-    {
-        this(new ByteArrayInputStream(envelopedData));
-    }
-
-    public CMSAuthenticatedDataParser(
-        byte[] envelopedData,
-        DigestCalculatorProvider digestCalculatorProvider)
-        throws CMSException, IOException
-    {
-        this(new ByteArrayInputStream(envelopedData), digestCalculatorProvider);
-    }
-
-    public CMSAuthenticatedDataParser(
-        InputStream envelopedData)
-        throws CMSException, IOException
-    {
-        this(envelopedData, null);
-    }
-
-    public CMSAuthenticatedDataParser(
-        InputStream envelopedData,
-        DigestCalculatorProvider digestCalculatorProvider)
-        throws CMSException, IOException
-    {
-        super(envelopedData);
-
-        this.authAttrNotRead = true;
-        this.authData = new AuthenticatedDataParser((ASN1SequenceParser)_contentInfo.getContent(BERTags.SEQUENCE));
-
-        // TODO Validate version?
-        //ASN1Integer version = this.authData.getVersion();
-
-        OriginatorInfo info = authData.getOriginatorInfo();
-
-        if (info != null)
-        {
-            this.originatorInfo = new OriginatorInformation(info);
-        }
-        //
-        // read the recipients
-        //
-        ASN1Set recipientInfos = ASN1Set.getInstance(authData.getRecipientInfos().toASN1Primitive());
-
-        this.macAlg = authData.getMacAlgorithm();
-
-        //
-        // build the RecipientInformationStore
-        //
-        AlgorithmIdentifier digestAlgorithm = authData.getDigestAlgorithm();
-
-        if (digestAlgorithm != null)
-        {
-            if (digestCalculatorProvider == null)
-            {
-                throw new CMSException("a digest calculator provider is required if authenticated attributes are present");
-            }
-
-            //
-            // read the authenticated content info
-            //
-            ContentInfoParser data = authData.getEncapsulatedContentInfo();
-            CMSReadable readable = new CMSProcessableInputStream(
-                ((ASN1OctetStringParser)data.getContent(BERTags.OCTET_STRING)).getOctetStream());
-
-            try
-            {
-                CMSSecureReadable secureReadable = new CMSEnvelopedHelper.CMSDigestAuthenticatedSecureReadable(digestCalculatorProvider.get(digestAlgorithm), readable);
-
-                this.recipientInfoStore = CMSEnvelopedHelper.buildRecipientInformationStore(recipientInfos, this.macAlg, secureReadable, new AuthAttributesProvider()
-                {
-                    public ASN1Set getAuthAttributes()
-                    {
-                        try
-                        {
-                            return getAuthAttrSet();
-                        }
-                        catch (IOException e)
-                        {
-                            throw new IllegalStateException("can't parse authenticated attributes!");
-                        }
-                    }
-                });
-            }
-            catch (OperatorCreationException e)
-            {
-                throw new CMSException("unable to create digest calculator: " + e.getMessage(), e);
-            }
-        }
-        else
-        {
-            //
-            // read the authenticated content info
-            //
-            ContentInfoParser data = authData.getEncapsulatedContentInfo();
-            CMSReadable readable = new CMSProcessableInputStream(
-                ((ASN1OctetStringParser)data.getContent(BERTags.OCTET_STRING)).getOctetStream());
-
-            CMSSecureReadable secureReadable = new CMSEnvelopedHelper.CMSAuthenticatedSecureReadable(this.macAlg, readable);
-
-            this.recipientInfoStore = CMSEnvelopedHelper.buildRecipientInformationStore(recipientInfos, this.macAlg, secureReadable);
-        }
-
-
-    }
-
-    /**
-     * Return the originator information associated with this message if present.
-     *
-     * @return OriginatorInformation, null if not present.
-     */
-    public OriginatorInformation getOriginatorInfo()
-    {
-        return originatorInfo;
-    }
-
-    /**
-     * Return the MAC algorithm details for the MAC associated with the data in this object.
-     *
-     * @return AlgorithmIdentifier representing the MAC algorithm.
-     */
-    public AlgorithmIdentifier getMacAlgorithm()
-    {
-        return macAlg;
-    }
-
-    /**
-     * return the object identifier for the mac algorithm.
-     */
-    public String getMacAlgOID()
-    {
-        return macAlg.getAlgorithm().toString();
-    }
-
-    /**
-     * return the ASN.1 encoded encryption algorithm parameters, or null if
-     * there aren't any.
-     */
-    public byte[] getMacAlgParams()
-    {
-        try
-        {
-            return encodeObj(macAlg.getParameters());
-        }
-        catch (Exception e)
-        {
-            throw new RuntimeException("exception getting encryption parameters " + e);
-        }
-    }
-
-    /**
-     * return a store of the intended recipients for this message
-     */
-    public RecipientInformationStore getRecipientInfos()
-    {
-        return recipientInfoStore;
-    }
-
-    public byte[] getMac()
-        throws IOException
-    {
-        if (mac == null)
-        {
-            getAuthAttrs();
-            mac = authData.getMac().getOctets();
-        }
-        return Arrays.clone(mac);
-    }
-
-    private ASN1Set getAuthAttrSet()
-        throws IOException
-    {
-        if (authAttrs == null && authAttrNotRead)
-        {
-            ASN1SetParser set = authData.getAuthAttrs();
-
-            if (set != null)
-            {
-                authAttrSet = (ASN1Set)set.toASN1Primitive();
-            }
-
-            authAttrNotRead = false;
-        }
-
-        return authAttrSet;
-    }
-
-    /**
-     * return a table of the unauthenticated attributes indexed by
-     * the OID of the attribute.
-     * @exception java.io.IOException
-     */
-    public AttributeTable getAuthAttrs()
-        throws IOException
-    {
-        if (authAttrs == null && authAttrNotRead)
-        {
-            ASN1Set set = getAuthAttrSet();
-
-            if (set != null)
-            {
-                authAttrs = new AttributeTable(set);
-            }
-        }
-
-        return authAttrs;
-    }
-
-    /**
-     * return a table of the unauthenticated attributes indexed by
-     * the OID of the attribute.
-     * @exception java.io.IOException
-     */
-    public AttributeTable getUnauthAttrs()
-        throws IOException
-    {
-        if (unauthAttrs == null && unauthAttrNotRead)
-        {
-            ASN1SetParser set = authData.getUnauthAttrs();
-
-            unauthAttrNotRead = false;
-
-            if (set != null)
-            {
-                ASN1EncodableVector v = new ASN1EncodableVector();
-                ASN1Encodable o;
-
-                while ((o = set.readObject()) != null)
-                {
-                    ASN1SequenceParser seq = (ASN1SequenceParser)o;
-
-                    v.add(seq.toASN1Primitive());
-                }
-
-                unauthAttrs = new AttributeTable(new DERSet(v));
-            }
-        }
-
-        return unauthAttrs;
-    }
-
-    private byte[] encodeObj(
-        ASN1Encodable obj)
-        throws IOException
-    {
-        if (obj != null)
-        {
-            return obj.toASN1Primitive().getEncoded();
-        }
-
-        return null;
-    }
-
-    /**
-     * This will only be valid after the content has been read.
-     *
-     * @return the contents of the messageDigest attribute, if available. Null if not present.
-     */
-    public byte[] getContentDigest()
-    {
-        if (authAttrs != null)
-        {
-            return ASN1OctetString.getInstance(authAttrs.get(CMSAttributes.messageDigest).getAttrValues().getObjectAt(0)).getOctets();
-        }
-
-        return null;
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cms/CMSAuthenticatedDataStreamGenerator.java b/bcpkix/src/main/java/org/bouncycastle/cms/CMSAuthenticatedDataStreamGenerator.java
deleted file mode 100644
index f32666d..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cms/CMSAuthenticatedDataStreamGenerator.java
+++ /dev/null
@@ -1,310 +0,0 @@
-package org.bouncycastle.cms;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-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.DEROctetString;
-import org.bouncycastle.asn1.DERSet;
-import org.bouncycastle.asn1.DERTaggedObject;
-import org.bouncycastle.asn1.cms.AuthenticatedData;
-import org.bouncycastle.asn1.cms.CMSObjectIdentifiers;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.operator.DigestCalculator;
-import org.bouncycastle.operator.MacCalculator;
-import org.bouncycastle.util.io.TeeOutputStream;
-
-/**
- * General class for generating a CMS authenticated-data message stream.
- * <p>
- * A simple example of usage.
- * <pre>
- *      CMSAuthenticatedDataStreamGenerator edGen = new CMSAuthenticatedDataStreamGenerator();
- *
- *      edGen.addRecipientInfoGenerator(new JceKeyTransRecipientInfoGenerator(cert).setProvider("BC"));
- *
- *      ByteArrayOutputStream  bOut = new ByteArrayOutputStream();
- *
- *      OutputStream out = edGen.open(
- *                              bOut, new JceCMSMacCalculatorBuilder(CMSAlgorithm.DES_EDE3_CBC).setProvider("BC").build());*
- *      out.write(data);
- *
- *      out.close();
- * </pre>
- */
-public class CMSAuthenticatedDataStreamGenerator
-    extends CMSAuthenticatedGenerator
-{
-    // Currently not handled
-//    private Object              _originatorInfo = null;
-//    private Object              _unprotectedAttributes = null;
-    private int bufferSize;
-    private boolean berEncodeRecipientSet;
-    private MacCalculator macCalculator;
-
-    /**
-     * base constructor
-     */
-    public CMSAuthenticatedDataStreamGenerator()
-    {
-    }
-
-    /**
-     * Set the underlying string size for encapsulated data
-     *
-     * @param bufferSize length of octet strings to buffer the data.
-     */
-    public void setBufferSize(
-        int bufferSize)
-    {
-        this.bufferSize = bufferSize;
-    }
-
-    /**
-     * Use a BER Set to store the recipient information. By default recipients are
-     * stored in a DER encoding.
-     *
-     * @param useBerEncodingForRecipients true if a BER set should be used, false if DER.
-     */
-    public void setBEREncodeRecipients(
-        boolean useBerEncodingForRecipients)
-    {
-        berEncodeRecipientSet = useBerEncodingForRecipients;
-    }
-
-    /**
-     * generate an authenticated data structure with the encapsulated bytes marked as DATA.
-     *
-     * @param out the stream to store the authenticated structure in.
-     * @param macCalculator calculator for the MAC to be attached to the data.
-     */
-    public OutputStream open(
-        OutputStream    out,
-        MacCalculator   macCalculator)
-        throws CMSException
-    {
-        return open(CMSObjectIdentifiers.data, out, macCalculator);
-    }
-
-    public OutputStream open(
-        OutputStream    out,
-        MacCalculator   macCalculator,
-        DigestCalculator digestCalculator)
-        throws CMSException
-    {
-        return open(CMSObjectIdentifiers.data, out, macCalculator, digestCalculator);
-    }
-
-    /**
-     * generate an authenticated data structure with the encapsulated bytes marked as type dataType.
-     *
-     * @param dataType the type of the data been written to the object.
-     * @param out the stream to store the authenticated structure in.
-     * @param macCalculator calculator for the MAC to be attached to the data.
-     */
-    public OutputStream open(
-        ASN1ObjectIdentifier dataType,
-        OutputStream         out,
-        MacCalculator        macCalculator)
-        throws CMSException
-    {
-        return open(dataType, out, macCalculator, null);
-    }
-
-    /**
-     * generate an authenticated data structure with the encapsulated bytes marked as type dataType.
-     *
-     * @param dataType the type of the data been written to the object.
-     * @param out the stream to store the authenticated structure in.
-     * @param macCalculator calculator for the MAC to be attached to the data.
-     * @param digestCalculator calculator for computing digest of the encapsulated data.
-     */
-    public OutputStream open(
-        ASN1ObjectIdentifier dataType,
-        OutputStream         out,
-        MacCalculator        macCalculator,
-        DigestCalculator     digestCalculator)
-        throws CMSException
-    {
-        this.macCalculator = macCalculator;
-
-        try
-        {
-            ASN1EncodableVector recipientInfos = new ASN1EncodableVector();
-
-            for (Iterator it = recipientInfoGenerators.iterator(); it.hasNext();)
-            {
-                RecipientInfoGenerator recipient = (RecipientInfoGenerator)it.next();
-
-                recipientInfos.add(recipient.generate(macCalculator.getKey()));
-            }
-
-            //
-            // ContentInfo
-            //
-            BERSequenceGenerator cGen = new BERSequenceGenerator(out);
-
-            cGen.addObject(CMSObjectIdentifiers.authenticatedData);
-
-            //
-            // Authenticated Data
-            //
-            BERSequenceGenerator authGen = new BERSequenceGenerator(cGen.getRawOutputStream(), 0, true);
-
-            authGen.addObject(new ASN1Integer(AuthenticatedData.calculateVersion(originatorInfo)));
-
-            if (originatorInfo != null)
-            {
-                authGen.addObject(new DERTaggedObject(false, 0, originatorInfo));
-            }
-
-            if (berEncodeRecipientSet)
-            {
-                authGen.getRawOutputStream().write(new BERSet(recipientInfos).getEncoded());
-            }
-            else
-            {
-                authGen.getRawOutputStream().write(new DERSet(recipientInfos).getEncoded());
-            }
-
-            AlgorithmIdentifier macAlgId = macCalculator.getAlgorithmIdentifier();
-
-            authGen.getRawOutputStream().write(macAlgId.getEncoded());
-
-            if (digestCalculator != null)
-            {
-                authGen.addObject(new DERTaggedObject(false, 1, digestCalculator.getAlgorithmIdentifier()));
-            }
-            
-            BERSequenceGenerator eiGen = new BERSequenceGenerator(authGen.getRawOutputStream());
-
-            eiGen.addObject(dataType);
-
-            OutputStream octetStream = CMSUtils.createBEROctetOutputStream(
-                    eiGen.getRawOutputStream(), 0, false, bufferSize);
-
-            OutputStream mOut;
-
-            if (digestCalculator != null)
-            {
-                mOut = new TeeOutputStream(octetStream, digestCalculator.getOutputStream());
-            }
-            else
-            {
-                mOut = new TeeOutputStream(octetStream, macCalculator.getOutputStream());
-            }
-
-            return new CmsAuthenticatedDataOutputStream(macCalculator, digestCalculator, dataType, mOut, cGen, authGen, eiGen);
-        }
-        catch (IOException e)
-        {
-            throw new CMSException("exception decoding algorithm parameters.", e);
-        }
-    }
-
-    private class CmsAuthenticatedDataOutputStream
-        extends OutputStream
-    {
-        private OutputStream dataStream;
-        private BERSequenceGenerator cGen;
-        private BERSequenceGenerator envGen;
-        private BERSequenceGenerator eiGen;
-        private MacCalculator macCalculator;
-        private DigestCalculator digestCalculator;
-        private ASN1ObjectIdentifier contentType;
-
-        public CmsAuthenticatedDataOutputStream(
-            MacCalculator   macCalculator,
-            DigestCalculator digestCalculator,
-            ASN1ObjectIdentifier contentType,
-            OutputStream dataStream,
-            BERSequenceGenerator cGen,
-            BERSequenceGenerator envGen,
-            BERSequenceGenerator eiGen)
-        {
-            this.macCalculator = macCalculator;
-            this.digestCalculator = digestCalculator;
-            this.contentType = contentType;
-            this.dataStream = dataStream;
-            this.cGen = cGen;
-            this.envGen = envGen;
-            this.eiGen = eiGen;
-        }
-
-        public void write(
-            int b)
-            throws IOException
-        {
-            dataStream.write(b);
-        }
-
-        public void write(
-            byte[] bytes,
-            int    off,
-            int    len)
-            throws IOException
-        {
-            dataStream.write(bytes, off, len);
-        }
-
-        public void write(
-            byte[] bytes)
-            throws IOException
-        {
-            dataStream.write(bytes);
-        }
-
-        public void close()
-            throws IOException
-        {
-            dataStream.close();
-            eiGen.close();
-
-            Map parameters;
-
-            if (digestCalculator != null)
-            {
-                parameters = Collections.unmodifiableMap(getBaseParameters(contentType, digestCalculator.getAlgorithmIdentifier(), digestCalculator.getDigest()));
-
-                if (authGen == null)
-                {
-                    authGen = new DefaultAuthenticatedAttributeTableGenerator();
-                }
-                
-                ASN1Set authed = new DERSet(authGen.getAttributes(parameters).toASN1EncodableVector());
-
-                OutputStream mOut = macCalculator.getOutputStream();
-
-                mOut.write(authed.getEncoded(ASN1Encoding.DER));
-
-                mOut.close();
-
-                envGen.addObject(new DERTaggedObject(false, 2, authed));
-            }
-            else
-            {
-                parameters = Collections.unmodifiableMap(new HashMap());                
-            }
-
-            envGen.addObject(new DEROctetString(macCalculator.getMac()));
-
-            if (unauthGen != null)
-            {
-                envGen.addObject(new DERTaggedObject(false, 3, new BERSet(unauthGen.getAttributes(parameters).toASN1EncodableVector())));
-            }
-
-            envGen.close();
-            cGen.close();
-        }
-    }
-}
\ No newline at end of file
diff --git a/bcpkix/src/main/java/org/bouncycastle/cms/CMSAuthenticatedGenerator.java b/bcpkix/src/main/java/org/bouncycastle/cms/CMSAuthenticatedGenerator.java
deleted file mode 100644
index 6aadf1e..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cms/CMSAuthenticatedGenerator.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package org.bouncycastle.cms;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.util.Arrays;
-
-public class CMSAuthenticatedGenerator
-    extends CMSEnvelopedGenerator
-{
-    protected CMSAttributeTableGenerator authGen;
-    protected CMSAttributeTableGenerator unauthGen;
-
-    /**
-     * base constructor
-     */
-    public CMSAuthenticatedGenerator()
-    {
-    }
-
-    public void setAuthenticatedAttributeGenerator(CMSAttributeTableGenerator authGen)
-    {
-        this.authGen = authGen;
-    }
-
-    public void setUnauthenticatedAttributeGenerator(CMSAttributeTableGenerator unauthGen)
-    {
-        this.unauthGen = unauthGen;
-    }
-
-    protected Map getBaseParameters(ASN1ObjectIdentifier contentType, AlgorithmIdentifier digAlgId, byte[] hash)
-    {
-        Map param = new HashMap();
-        param.put(CMSAttributeTableGenerator.CONTENT_TYPE, contentType);
-        param.put(CMSAttributeTableGenerator.DIGEST_ALGORITHM_IDENTIFIER, digAlgId);
-        param.put(CMSAttributeTableGenerator.DIGEST,  Arrays.clone(hash));
-        return param;
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cms/CMSCompressedData.java b/bcpkix/src/main/java/org/bouncycastle/cms/CMSCompressedData.java
deleted file mode 100644
index e110de5..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cms/CMSCompressedData.java
+++ /dev/null
@@ -1,109 +0,0 @@
-package org.bouncycastle.cms;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.cms.CompressedData;
-import org.bouncycastle.asn1.cms.ContentInfo;
-import org.bouncycastle.operator.InputExpander;
-import org.bouncycastle.operator.InputExpanderProvider;
-import org.bouncycastle.util.Encodable;
-
-/**
- * containing class for an CMS Compressed Data object
- * <pre>
- *     CMSCompressedData cd = new CMSCompressedData(inputStream);
- *
- *     process(cd.getContent(new ZlibExpanderProvider()));
- * </pre>
- */
-public class CMSCompressedData
-    implements Encodable
-{
-    ContentInfo                 contentInfo;
-    CompressedData              comData;
-
-    public CMSCompressedData(
-        byte[]    compressedData) 
-        throws CMSException
-    {
-        this(CMSUtils.readContentInfo(compressedData));
-    }
-
-    public CMSCompressedData(
-        InputStream    compressedData) 
-        throws CMSException
-    {
-        this(CMSUtils.readContentInfo(compressedData));
-    }
-
-    public CMSCompressedData(
-        ContentInfo contentInfo)
-        throws CMSException
-    {
-        this.contentInfo = contentInfo;
-
-        try
-        {
-            this.comData = CompressedData.getInstance(contentInfo.getContent());
-        }
-        catch (ClassCastException e)
-        {
-            throw new CMSException("Malformed content.", e);
-        }
-        catch (IllegalArgumentException e)
-        {
-            throw new CMSException("Malformed content.", e);
-        }
-    }
-
-    public ASN1ObjectIdentifier getContentType()
-    {
-        return contentInfo.getContentType();
-    }
-
-    /**
-     * Return the uncompressed content.
-     *
-     * @param expanderProvider a provider of expander algorithm implementations.
-     * @return the uncompressed content
-     * @throws CMSException if there is an exception un-compressing the data.
-     */
-    public byte[] getContent(InputExpanderProvider expanderProvider)
-        throws CMSException
-    {
-        ContentInfo     content = comData.getEncapContentInfo();
-
-        ASN1OctetString bytes = (ASN1OctetString)content.getContent();
-        InputExpander   expander = expanderProvider.get(comData.getCompressionAlgorithmIdentifier());
-        InputStream     zIn = expander.getInputStream(bytes.getOctetStream());
-
-        try
-        {
-            return CMSUtils.streamToByteArray(zIn);
-        }
-        catch (IOException e)
-        {
-            throw new CMSException("exception reading compressed stream.", e);
-        }
-    }
-
-    /**
-     * return the ContentInfo
-     */
-    public ContentInfo toASN1Structure()
-    {
-        return contentInfo;
-    }
-    
-    /**
-     * return the ASN.1 encoded representation of this object.
-     */
-    public byte[] getEncoded()
-        throws IOException
-    {
-        return contentInfo.getEncoded();
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cms/CMSCompressedDataGenerator.java b/bcpkix/src/main/java/org/bouncycastle/cms/CMSCompressedDataGenerator.java
deleted file mode 100644
index d50391a..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cms/CMSCompressedDataGenerator.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package org.bouncycastle.cms;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.BEROctetString;
-import org.bouncycastle.asn1.cms.CMSObjectIdentifiers;
-import org.bouncycastle.asn1.cms.CompressedData;
-import org.bouncycastle.asn1.cms.ContentInfo;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.operator.OutputCompressor;
-
-/**
- * General class for generating a compressed CMS message.
- * <p>
- * A simple example of usage.
- * <p>
- * <pre>
- *      CMSCompressedDataGenerator  fact = new CMSCompressedDataGenerator();
- *
- *      CMSCompressedData           data = fact.generate(content, new ZlibCompressor());
- * </pre>
- */
-public class CMSCompressedDataGenerator
-{
-    public static final String  ZLIB    = "1.2.840.113549.1.9.16.3.8";
-
-    /**
-     * base constructor
-     */
-    public CMSCompressedDataGenerator()
-    {
-    }
-
-    /**
-     * generate an object that contains an CMS Compressed Data
-     */
-    public CMSCompressedData generate(
-        CMSTypedData content,
-        OutputCompressor compressor)
-        throws CMSException
-    {
-        AlgorithmIdentifier     comAlgId;
-        ASN1OctetString         comOcts;
-
-        try
-        {
-            ByteArrayOutputStream bOut = new ByteArrayOutputStream();
-            OutputStream zOut = compressor.getOutputStream(bOut);
-
-            content.write(zOut);
-
-            zOut.close();
-
-            comAlgId = compressor.getAlgorithmIdentifier();
-            comOcts = new BEROctetString(bOut.toByteArray());
-        }
-        catch (IOException e)
-        {
-            throw new CMSException("exception encoding data.", e);
-        }
-
-        ContentInfo     comContent = new ContentInfo(
-                                    content.getContentType(), comOcts);
-
-        ContentInfo     contentInfo = new ContentInfo(
-                                    CMSObjectIdentifiers.compressedData,
-                                    new CompressedData(comAlgId, comContent));
-
-        return new CMSCompressedData(contentInfo);
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cms/CMSCompressedDataParser.java b/bcpkix/src/main/java/org/bouncycastle/cms/CMSCompressedDataParser.java
deleted file mode 100644
index c3da87b..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cms/CMSCompressedDataParser.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package org.bouncycastle.cms;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.bouncycastle.asn1.ASN1OctetStringParser;
-import org.bouncycastle.asn1.ASN1SequenceParser;
-import org.bouncycastle.asn1.BERTags;
-import org.bouncycastle.asn1.cms.CompressedDataParser;
-import org.bouncycastle.asn1.cms.ContentInfoParser;
-import org.bouncycastle.operator.InputExpander;
-import org.bouncycastle.operator.InputExpanderProvider;
-
-/**
- * Class for reading a CMS Compressed Data stream.
- * <pre>
- *     CMSCompressedDataParser cp = new CMSCompressedDataParser(inputStream);
- *      
- *     process(cp.getContent(new ZlibExpanderProvider()).getContentStream());
- * </pre>
- *  Note: this class does not introduce buffering - if you are processing large files you should create
- *  the parser with:
- *  <pre>
- *      CMSCompressedDataParser     ep = new CMSCompressedDataParser(new BufferedInputStream(inputStream, bufSize));
- *  </pre>
- *  where bufSize is a suitably large buffer size.
- */
-public class CMSCompressedDataParser
-    extends CMSContentInfoParser
-{
-    public CMSCompressedDataParser(
-        byte[]    compressedData) 
-        throws CMSException
-    {
-        this(new ByteArrayInputStream(compressedData));
-    }
-
-    public CMSCompressedDataParser(
-        InputStream    compressedData) 
-        throws CMSException
-    {
-        super(compressedData);
-    }
-
-    /**
-     * Return a typed stream which will allow the reading of the compressed content in
-     * expanded form.
-     *
-     * @param expanderProvider a provider of expander algorithm implementations.
-     * @return a type stream which will yield the un-compressed content.
-     * @throws CMSException if there is an exception parsing the CompressedData object.
-     */
-    public CMSTypedStream  getContent(InputExpanderProvider expanderProvider)
-        throws CMSException
-    {
-        try
-        {
-            CompressedDataParser  comData = new CompressedDataParser((ASN1SequenceParser)_contentInfo.getContent(BERTags.SEQUENCE));
-            ContentInfoParser     content = comData.getEncapContentInfo();
-            InputExpander expander = expanderProvider.get(comData.getCompressionAlgorithmIdentifier());
-
-            ASN1OctetStringParser bytes = (ASN1OctetStringParser)content.getContent(BERTags.OCTET_STRING);
-
-            return new CMSTypedStream(content.getContentType().getId(), expander.getInputStream(bytes.getOctetStream()));
-        }
-        catch (IOException e)
-        {
-            throw new CMSException("IOException reading compressed content.", e);
-        }
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cms/CMSCompressedDataStreamGenerator.java b/bcpkix/src/main/java/org/bouncycastle/cms/CMSCompressedDataStreamGenerator.java
deleted file mode 100644
index 8a34eb0..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cms/CMSCompressedDataStreamGenerator.java
+++ /dev/null
@@ -1,165 +0,0 @@
-package org.bouncycastle.cms;
-
-import java.io.IOException;
-import java.io.OutputStream;
-
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.BERSequenceGenerator;
-import org.bouncycastle.asn1.cms.CMSObjectIdentifiers;
-import org.bouncycastle.operator.OutputCompressor;
-
-/**
- * General class for generating a compressed CMS message stream.
- * <p>
- * A simple example of usage.
- * </p>
- * <pre>
- *      CMSCompressedDataStreamGenerator gen = new CMSCompressedDataStreamGenerator();
- *      
- *      OutputStream cOut = gen.open(outputStream, new ZlibCompressor());
- *      
- *      cOut.write(data);
- *      
- *      cOut.close();
- * </pre>
- */
-public class CMSCompressedDataStreamGenerator
-{
-    public static final String  ZLIB    = "1.2.840.113549.1.9.16.3.8";
-
-    private int _bufferSize;
-    
-    /**
-     * base constructor
-     */
-    public CMSCompressedDataStreamGenerator()
-    {
-    }
-
-    /**
-     * Set the underlying string size for encapsulated data
-     *
-     * @param bufferSize length of octet strings to buffer the data.
-     */
-    public void setBufferSize(
-        int bufferSize)
-    {
-        _bufferSize = bufferSize;
-    }
-
-    /**
-     * Open a compressing output stream with the PKCS#7 content type OID of "data".
-     *
-     * @param out the stream to encode to.
-     * @param compressor the type of compressor to use.
-     * @return an output stream to write the data be compressed to.
-     * @throws IOException
-     */
-    public OutputStream open(
-        OutputStream out,
-        OutputCompressor compressor)
-        throws IOException
-    {
-        return open(CMSObjectIdentifiers.data, out, compressor);
-    }
-
-    /**
-     * Open a compressing output stream.
-     *
-     * @param contentOID the content type OID.
-     * @param out the stream to encode to.
-     * @param compressor the type of compressor to use.
-     * @return an output stream to write the data be compressed to.
-     * @throws IOException
-     */
-    public OutputStream open(
-        ASN1ObjectIdentifier contentOID,
-        OutputStream out,
-        OutputCompressor compressor)
-        throws IOException
-    {
-        BERSequenceGenerator sGen = new BERSequenceGenerator(out);
-
-        sGen.addObject(CMSObjectIdentifiers.compressedData);
-
-        //
-        // Compressed Data
-        //
-        BERSequenceGenerator cGen = new BERSequenceGenerator(sGen.getRawOutputStream(), 0, true);
-
-        cGen.addObject(new ASN1Integer(0));
-
-        //
-        // AlgorithmIdentifier
-        //
-        cGen.addObject(compressor.getAlgorithmIdentifier());
-
-        //
-        // Encapsulated ContentInfo
-        //
-        BERSequenceGenerator eiGen = new BERSequenceGenerator(cGen.getRawOutputStream());
-
-        eiGen.addObject(contentOID);
-
-        OutputStream octetStream = CMSUtils.createBEROctetOutputStream(
-            eiGen.getRawOutputStream(), 0, true, _bufferSize);
-
-        return new CmsCompressedOutputStream(
-            compressor.getOutputStream(octetStream), sGen, cGen, eiGen);
-    }
-
-    private class CmsCompressedOutputStream
-        extends OutputStream
-    {
-        private OutputStream _out;
-        private BERSequenceGenerator _sGen;
-        private BERSequenceGenerator _cGen;
-        private BERSequenceGenerator _eiGen;
-        
-        CmsCompressedOutputStream(
-            OutputStream out,
-            BERSequenceGenerator sGen,
-            BERSequenceGenerator cGen,
-            BERSequenceGenerator eiGen)
-        {
-            _out = out;
-            _sGen = sGen;
-            _cGen = cGen;
-            _eiGen = eiGen;
-        }
-        
-        public void write(
-            int b)
-            throws IOException
-        {
-            _out.write(b); 
-        }
-        
-        
-        public void write(
-            byte[] bytes,
-            int    off,
-            int    len)
-            throws IOException
-        {
-            _out.write(bytes, off, len);
-        }
-        
-        public void write(
-            byte[] bytes)
-            throws IOException
-        {
-            _out.write(bytes);
-        }
-        
-        public void close()
-            throws IOException
-        {
-            _out.close();
-            _eiGen.close();
-            _cGen.close();
-            _sGen.close();
-        }
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cms/CMSConfig.java b/bcpkix/src/main/java/org/bouncycastle/cms/CMSConfig.java
deleted file mode 100644
index fd6782d..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cms/CMSConfig.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package org.bouncycastle.cms;
-
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-
-public class CMSConfig
-{
-    /**
-     * Set the mapping for the encryption algorithm used in association with a SignedData generation
-     * or interpretation.
-     *
-     * @param oid object identifier to map.
-     * @param algorithmName algorithm name to use.
-     */
-    public static void setSigningEncryptionAlgorithmMapping(String oid, String algorithmName)
-    {
-        ASN1ObjectIdentifier id = new ASN1ObjectIdentifier(oid);
-
-        CMSSignedHelper.INSTANCE.setSigningEncryptionAlgorithmMapping(id, algorithmName);
-    }
-
-    /**
-     * Set the mapping for the digest algorithm to use in conjunction with a SignedData generation
-     * or interpretation.
-     *
-     * @param oid object identifier to map.
-     * @param algorithmName algorithm name to use.
-     */
-    public static void setSigningDigestAlgorithmMapping(String oid, String algorithmName)
-    {
-        ASN1ObjectIdentifier id = new ASN1ObjectIdentifier(oid);
-
-        CMSSignedHelper.INSTANCE.setSigningDigestAlgorithmMapping(id, algorithmName);
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cms/CMSContentInfoParser.java b/bcpkix/src/main/java/org/bouncycastle/cms/CMSContentInfoParser.java
deleted file mode 100644
index a8e5a8d..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cms/CMSContentInfoParser.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package org.bouncycastle.cms;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.bouncycastle.asn1.ASN1SequenceParser;
-import org.bouncycastle.asn1.ASN1StreamParser;
-import org.bouncycastle.asn1.cms.ContentInfoParser;
-
-public class CMSContentInfoParser
-{
-    protected ContentInfoParser _contentInfo;
-    protected InputStream       _data;
-
-    protected CMSContentInfoParser(
-        InputStream data)
-        throws CMSException
-    {
-        _data = data;
-        
-        try
-        {
-            ASN1StreamParser in = new ASN1StreamParser(data);
-    
-            _contentInfo = new ContentInfoParser((ASN1SequenceParser)in.readObject());
-        }
-        catch (IOException e)
-        {
-            throw new CMSException("IOException reading content.", e);
-        }
-        catch (ClassCastException e)
-        {
-            throw new CMSException("Unexpected object reading content.", e);
-        }
-    }
-    
-    /**
-     * Close the underlying data stream.
-     * @throws IOException if the close fails.
-     */
-    public void close() throws IOException
-    {
-        _data.close();
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cms/CMSDigestedData.java b/bcpkix/src/main/java/org/bouncycastle/cms/CMSDigestedData.java
deleted file mode 100644
index b33def6..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cms/CMSDigestedData.java
+++ /dev/null
@@ -1,138 +0,0 @@
-package org.bouncycastle.cms;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.cms.ContentInfo;
-import org.bouncycastle.asn1.cms.DigestedData;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.operator.DigestCalculator;
-import org.bouncycastle.operator.DigestCalculatorProvider;
-import org.bouncycastle.operator.OperatorCreationException;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.Encodable;
-
-/**
- * containing class for an CMS Digested Data object
- * <pre>
- *     CMSDigestedData cd = new CMSDigestedData(inputStream);
- *
- *
- *     process(cd.getContent());
- * </pre>
- */
-public class CMSDigestedData
-    implements Encodable
-{
-    private ContentInfo  contentInfo;
-    private DigestedData digestedData;
-
-    public CMSDigestedData(
-        byte[] compressedData)
-        throws CMSException
-    {
-        this(CMSUtils.readContentInfo(compressedData));
-    }
-
-    public CMSDigestedData(
-        InputStream compressedData)
-        throws CMSException
-    {
-        this(CMSUtils.readContentInfo(compressedData));
-    }
-
-    public CMSDigestedData(
-        ContentInfo contentInfo)
-        throws CMSException
-    {
-        this.contentInfo = contentInfo;
-
-        try
-        {
-            this.digestedData = DigestedData.getInstance(contentInfo.getContent());
-        }
-        catch (ClassCastException e)
-        {
-            throw new CMSException("Malformed content.", e);
-        }
-        catch (IllegalArgumentException e)
-        {
-            throw new CMSException("Malformed content.", e);
-        }
-    }
-
-    public ASN1ObjectIdentifier getContentType()
-    {
-        return contentInfo.getContentType();
-    }
-
-    public AlgorithmIdentifier getDigestAlgorithm()
-    {
-        return digestedData.getDigestAlgorithm();
-    }
-
-    /**
-     * Return the digested content
-     *
-     * @return the digested content
-     * @throws CMSException if there is an exception un-compressing the data.
-     */
-    public CMSProcessable getDigestedContent()
-        throws CMSException
-    {
-        ContentInfo     content = digestedData.getEncapContentInfo();
-
-        try
-        {
-            return new CMSProcessableByteArray(content.getContentType(), ((ASN1OctetString)content.getContent()).getOctets());
-        }
-        catch (Exception e)
-        {
-            throw new CMSException("exception reading digested stream.", e);
-        }
-    }
-
-    /**
-     * return the ContentInfo
-     */
-    public ContentInfo toASN1Structure()
-    {
-        return contentInfo;
-    }
-
-    /**
-     * return the ASN.1 encoded representation of this object.
-     */
-    public byte[] getEncoded()
-        throws IOException
-    {
-        return contentInfo.getEncoded();
-    }
-
-    public boolean verify(DigestCalculatorProvider calculatorProvider)
-        throws CMSException
-    {
-        try
-        {
-            ContentInfo     content = digestedData.getEncapContentInfo();
-            DigestCalculator calc = calculatorProvider.get(digestedData.getDigestAlgorithm());
-
-            OutputStream dOut = calc.getOutputStream();
-
-            dOut.write(((ASN1OctetString)content.getContent()).getOctets());
-
-            return Arrays.areEqual(digestedData.getDigest(), calc.getDigest());
-        }
-        catch (OperatorCreationException e)
-        {
-            throw new CMSException("unable to create digest calculator: " + e.getMessage(), e);
-        }
-        catch (IOException e)
-        {
-            throw new CMSException("unable process content: " + e.getMessage(), e);
-        }
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cms/CMSEncryptedData.java b/bcpkix/src/main/java/org/bouncycastle/cms/CMSEncryptedData.java
deleted file mode 100644
index f96e756..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cms/CMSEncryptedData.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package org.bouncycastle.cms;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-
-import org.bouncycastle.asn1.cms.ContentInfo;
-import org.bouncycastle.asn1.cms.EncryptedContentInfo;
-import org.bouncycastle.asn1.cms.EncryptedData;
-import org.bouncycastle.operator.InputDecryptor;
-import org.bouncycastle.operator.InputDecryptorProvider;
-
-public class CMSEncryptedData
-{
-    private ContentInfo contentInfo;
-    private EncryptedData encryptedData;
-
-    public CMSEncryptedData(ContentInfo contentInfo)
-    {
-        this.contentInfo = contentInfo;
-
-        this.encryptedData = EncryptedData.getInstance(contentInfo.getContent());
-    }
-
-    public byte[] getContent(InputDecryptorProvider inputDecryptorProvider)
-        throws CMSException
-    {
-        try
-        {
-            return CMSUtils.streamToByteArray(getContentStream(inputDecryptorProvider).getContentStream());
-        }
-        catch (IOException e)
-        {
-            throw new CMSException("unable to parse internal stream: " + e.getMessage(), e);
-        }
-    }
-
-    public CMSTypedStream getContentStream(InputDecryptorProvider inputDecryptorProvider)
-        throws CMSException
-    {
-        try
-        {
-            EncryptedContentInfo encContentInfo = encryptedData.getEncryptedContentInfo();
-            InputDecryptor decrytor = inputDecryptorProvider.get(encContentInfo.getContentEncryptionAlgorithm());
-
-            ByteArrayInputStream encIn = new ByteArrayInputStream(encContentInfo.getEncryptedContent().getOctets());
-
-            return new CMSTypedStream(encContentInfo.getContentType(), decrytor.getInputStream(encIn));
-        }
-        catch (Exception e)
-        {
-            throw new CMSException("unable to create stream: " + e.getMessage(), e);
-        }
-    }
-
-    /**
-     * return the ContentInfo
-     */
-    public ContentInfo toASN1Structure()
-    {
-        return contentInfo;
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cms/CMSEncryptedDataGenerator.java b/bcpkix/src/main/java/org/bouncycastle/cms/CMSEncryptedDataGenerator.java
deleted file mode 100644
index d12097e..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cms/CMSEncryptedDataGenerator.java
+++ /dev/null
@@ -1,109 +0,0 @@
-package org.bouncycastle.cms;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.HashMap;
-
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.ASN1Set;
-import org.bouncycastle.asn1.BEROctetString;
-import org.bouncycastle.asn1.BERSet;
-import org.bouncycastle.asn1.cms.AttributeTable;
-import org.bouncycastle.asn1.cms.CMSObjectIdentifiers;
-import org.bouncycastle.asn1.cms.ContentInfo;
-import org.bouncycastle.asn1.cms.EncryptedContentInfo;
-import org.bouncycastle.asn1.cms.EncryptedData;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.operator.OutputEncryptor;
-
-/**
- * General class for generating a CMS enveloped-data message.
- *
- * A simple example of usage.
- *
- * <pre>
- *       CMSTypedData msg     = new CMSProcessableByteArray("Hello World!".getBytes());
- *
- *       CMSEncryptedDataGenerator edGen = new CMSEnvelopedDataGenerator();
- *
- *       CMSEncryptedData ed = edGen.generate(
- *                                       msg,
- *                                       new JceCMSContentEncryptorBuilder(CMSAlgorithm.DES_EDE3_CBC)
- *                                              .setProvider("BC").build());
- *
- * </pre>
- */
-public class CMSEncryptedDataGenerator
-    extends CMSEncryptedGenerator
-{
-    /**
-     * base constructor
-     */
-    public CMSEncryptedDataGenerator()
-    {
-    }
-
-    private CMSEncryptedData doGenerate(
-        CMSTypedData content,
-        OutputEncryptor contentEncryptor)
-        throws CMSException
-    {
-        AlgorithmIdentifier     encAlgId;
-        ASN1OctetString         encContent;
-
-        ByteArrayOutputStream bOut = new ByteArrayOutputStream();
-
-        try
-        {
-            OutputStream cOut = contentEncryptor.getOutputStream(bOut);
-
-            content.write(cOut);
-
-            cOut.close();
-        }
-        catch (IOException e)
-        {
-            throw new CMSException("");
-        }
-
-        byte[] encryptedContent = bOut.toByteArray();
-
-        encAlgId = contentEncryptor.getAlgorithmIdentifier();
-
-        encContent = new BEROctetString(encryptedContent);
-
-        EncryptedContentInfo  eci = new EncryptedContentInfo(
-                        content.getContentType(),
-                        encAlgId,
-                        encContent);
-
-        ASN1Set unprotectedAttrSet = null;
-        if (unprotectedAttributeGenerator != null)
-        {
-            AttributeTable attrTable = unprotectedAttributeGenerator.getAttributes(new HashMap());
-
-            unprotectedAttrSet = new BERSet(attrTable.toASN1EncodableVector());
-        }
-
-        ContentInfo contentInfo = new ContentInfo(
-                CMSObjectIdentifiers.encryptedData,
-                new EncryptedData(eci, unprotectedAttrSet));
-
-        return new CMSEncryptedData(contentInfo);
-    }
-
-    /**
-     * generate an encrypted object that contains an CMS Encrypted Data structure.
-     *
-     * @param content the content to be encrypted
-     * @param contentEncryptor the symmetric key based encryptor to encrypt the content with.
-     */
-    public CMSEncryptedData generate(
-        CMSTypedData content,
-        OutputEncryptor contentEncryptor)
-        throws CMSException
-    {
-        return doGenerate(content, contentEncryptor);
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cms/CMSEncryptedGenerator.java b/bcpkix/src/main/java/org/bouncycastle/cms/CMSEncryptedGenerator.java
deleted file mode 100644
index eece680..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cms/CMSEncryptedGenerator.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package org.bouncycastle.cms;
-
-/**
- * General class for generating a CMS encrypted-data message.
- */
-public class CMSEncryptedGenerator
-{
-    protected CMSAttributeTableGenerator unprotectedAttributeGenerator = null;
-
-    /**
-     * base constructor
-     */
-    protected CMSEncryptedGenerator()
-    {
-    }
-
-    public void setUnprotectedAttributeGenerator(CMSAttributeTableGenerator unprotectedAttributeGenerator)
-    {
-        this.unprotectedAttributeGenerator = unprotectedAttributeGenerator;
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cms/CMSEnvelopedData.java b/bcpkix/src/main/java/org/bouncycastle/cms/CMSEnvelopedData.java
deleted file mode 100644
index d4541fb..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cms/CMSEnvelopedData.java
+++ /dev/null
@@ -1,208 +0,0 @@
-package org.bouncycastle.cms;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1Set;
-import org.bouncycastle.asn1.cms.AttributeTable;
-import org.bouncycastle.asn1.cms.ContentInfo;
-import org.bouncycastle.asn1.cms.EncryptedContentInfo;
-import org.bouncycastle.asn1.cms.EnvelopedData;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.util.Encodable;
-
-/**
- * containing class for an CMS Enveloped Data object
- * <p>
- * Example of use - assuming the first recipient matches the private key we have.
- * <pre>
- *      CMSEnvelopedData     ed = new CMSEnvelopedData(inputStream);
- *
- *      RecipientInformationStore  recipients = ed.getRecipientInfos();
- *
- *      Collection  c = recipients.getRecipients();
- *      Iterator    it = c.iterator();
- *
- *      if (it.hasNext())
- *      {
- *          RecipientInformation   recipient = (RecipientInformation)it.next();
- *
- *          byte[] recData = recipient.getContent(new JceKeyTransEnvelopedRecipient(privateKey).setProvider("BC"));
- *
- *          processData(recData);
- *      }
- *  </pre>
- */
-public class CMSEnvelopedData
-    implements Encodable
-{
-    RecipientInformationStore   recipientInfoStore;
-    ContentInfo                 contentInfo;
-
-    private AlgorithmIdentifier    encAlg;
-    private ASN1Set                unprotectedAttributes;
-    private OriginatorInformation  originatorInfo;
-
-    public CMSEnvelopedData(
-        byte[]    envelopedData)
-        throws CMSException
-    {
-        this(CMSUtils.readContentInfo(envelopedData));
-    }
-
-    public CMSEnvelopedData(
-        InputStream    envelopedData)
-        throws CMSException
-    {
-        this(CMSUtils.readContentInfo(envelopedData));
-    }
-
-    /**
-     * Construct a CMSEnvelopedData object from a content info object.
-     *
-     * @param contentInfo the contentInfo containing the CMS EnvelopedData object.
-     * @throws CMSException in the case where malformed content is encountered.
-     */
-    public CMSEnvelopedData(
-        ContentInfo contentInfo)
-        throws CMSException
-    {
-        this.contentInfo = contentInfo;
-
-        try
-        {
-            EnvelopedData  envData = EnvelopedData.getInstance(contentInfo.getContent());
-
-            if (envData.getOriginatorInfo() != null)
-            {
-                originatorInfo = new OriginatorInformation(envData.getOriginatorInfo());
-            }
-
-            //
-            // read the recipients
-            //
-            ASN1Set recipientInfos = envData.getRecipientInfos();
-
-            //
-            // read the encrypted content info
-            //
-            EncryptedContentInfo encInfo = envData.getEncryptedContentInfo();
-            this.encAlg = encInfo.getContentEncryptionAlgorithm();
-            CMSReadable readable = new CMSProcessableByteArray(encInfo.getEncryptedContent().getOctets());
-            CMSSecureReadable secureReadable = new CMSEnvelopedHelper.CMSEnvelopedSecureReadable(
-                this.encAlg, readable);
-
-            //
-            // build the RecipientInformationStore
-            //
-            this.recipientInfoStore = CMSEnvelopedHelper.buildRecipientInformationStore(
-                recipientInfos, this.encAlg, secureReadable);
-
-            this.unprotectedAttributes = envData.getUnprotectedAttrs();
-        }
-        catch (ClassCastException e)
-        {
-            throw new CMSException("Malformed content.", e);
-        }
-        catch (IllegalArgumentException e)
-        {
-            throw new CMSException("Malformed content.", e);
-        }
-    }
-
-    private byte[] encodeObj(
-        ASN1Encodable obj)
-        throws IOException
-    {
-        if (obj != null)
-        {
-            return obj.toASN1Primitive().getEncoded();
-        }
-
-        return null;
-    }
-
-    /**
-     * Return the originator information associated with this message if present.
-     *
-     * @return OriginatorInformation, null if not present.
-     */
-    public OriginatorInformation getOriginatorInfo()
-    {
-        return originatorInfo;
-    }
-
-    /**
-     * Return the content encryption algorithm details for the data in this object.
-     *
-     * @return AlgorithmIdentifier representing the content encryption algorithm.
-     */
-    public AlgorithmIdentifier getContentEncryptionAlgorithm()
-    {
-        return encAlg;
-    }
-
-    /**
-     * return the object identifier for the content encryption algorithm.
-     */
-    public String getEncryptionAlgOID()
-    {
-        return encAlg.getAlgorithm().getId();
-    }
-
-    /**
-     * return the ASN.1 encoded encryption algorithm parameters, or null if
-     * there aren't any.
-     */
-    public byte[] getEncryptionAlgParams()
-    {
-        try
-        {
-            return encodeObj(encAlg.getParameters());
-        }
-        catch (Exception e)
-        {
-            throw new RuntimeException("exception getting encryption parameters " + e);
-        }
-    }
-
-    /**
-     * return a store of the intended recipients for this message
-     */
-    public RecipientInformationStore getRecipientInfos()
-    {
-        return recipientInfoStore;
-    }
-
-    /**
-     * return the ContentInfo
-     */
-    public ContentInfo toASN1Structure()
-    {
-        return contentInfo;
-    }
-
-    /**
-     * return a table of the unprotected attributes indexed by
-     * the OID of the attribute.
-     */
-    public AttributeTable getUnprotectedAttributes()
-    {
-        if (unprotectedAttributes == null)
-        {
-            return null;
-        }
-
-        return new AttributeTable(unprotectedAttributes);
-    }
-
-    /**
-     * return the ASN.1 encoded representation of this object.
-     */
-    public byte[] getEncoded()
-        throws IOException
-    {
-        return contentInfo.getEncoded();
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cms/CMSEnvelopedDataGenerator.java b/bcpkix/src/main/java/org/bouncycastle/cms/CMSEnvelopedDataGenerator.java
deleted file mode 100644
index 0038f90..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cms/CMSEnvelopedDataGenerator.java
+++ /dev/null
@@ -1,131 +0,0 @@
-package org.bouncycastle.cms;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.HashMap;
-import java.util.Iterator;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.ASN1Set;
-import org.bouncycastle.asn1.BEROctetString;
-import org.bouncycastle.asn1.BERSet;
-import org.bouncycastle.asn1.DERSet;
-import org.bouncycastle.asn1.cms.AttributeTable;
-import org.bouncycastle.asn1.cms.CMSObjectIdentifiers;
-import org.bouncycastle.asn1.cms.ContentInfo;
-import org.bouncycastle.asn1.cms.EncryptedContentInfo;
-import org.bouncycastle.asn1.cms.EnvelopedData;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.operator.GenericKey;
-import org.bouncycastle.operator.OutputEncryptor;
-
-/**
- * General class for generating a CMS enveloped-data message.
- *
- * A simple example of usage.
- *
- * <pre>
- *       CMSTypedData msg     = new CMSProcessableByteArray("Hello World!".getBytes());
- *
- *       CMSEnvelopedDataGenerator edGen = new CMSEnvelopedDataGenerator();
- *
- *       edGen.addRecipientInfoGenerator(new JceKeyTransRecipientInfoGenerator(recipientCert).setProvider("BC"));
- *
- *       CMSEnvelopedData ed = edGen.generate(
- *                                       msg,
- *                                       new JceCMSContentEncryptorBuilder(CMSAlgorithm.DES_EDE3_CBC)
- *                                              .setProvider("BC").build());
- *
- * </pre>
- */
-public class CMSEnvelopedDataGenerator
-    extends CMSEnvelopedGenerator
-{
-    /**
-     * base constructor
-     */
-    public CMSEnvelopedDataGenerator()
-    {
-    }
-
-    private CMSEnvelopedData doGenerate(
-        CMSTypedData content,
-        OutputEncryptor contentEncryptor)
-        throws CMSException
-    {
-        if (!oldRecipientInfoGenerators.isEmpty())
-        {
-            throw new IllegalStateException("can only use addRecipientGenerator() with this method");
-        }
-
-        ASN1EncodableVector     recipientInfos = new ASN1EncodableVector();
-        AlgorithmIdentifier     encAlgId;
-        ASN1OctetString         encContent;
-
-        ByteArrayOutputStream bOut = new ByteArrayOutputStream();
-
-        try
-        {
-            OutputStream cOut = contentEncryptor.getOutputStream(bOut);
-
-            content.write(cOut);
-
-            cOut.close();
-        }
-        catch (IOException e)
-        {
-            throw new CMSException("");
-        }
-
-        byte[] encryptedContent = bOut.toByteArray();
-
-        encAlgId = contentEncryptor.getAlgorithmIdentifier();
-
-        encContent = new BEROctetString(encryptedContent);
-
-        GenericKey encKey = contentEncryptor.getKey();
-
-        for (Iterator it = recipientInfoGenerators.iterator(); it.hasNext();)
-        {
-            RecipientInfoGenerator recipient = (RecipientInfoGenerator)it.next();
-
-            recipientInfos.add(recipient.generate(encKey));
-        }
-
-        EncryptedContentInfo  eci = new EncryptedContentInfo(
-                        content.getContentType(),
-                        encAlgId,
-                        encContent);
-
-        ASN1Set unprotectedAttrSet = null;
-        if (unprotectedAttributeGenerator != null)
-        {
-            AttributeTable attrTable = unprotectedAttributeGenerator.getAttributes(new HashMap());
-
-            unprotectedAttrSet = new BERSet(attrTable.toASN1EncodableVector());
-        }
-
-        ContentInfo contentInfo = new ContentInfo(
-                CMSObjectIdentifiers.envelopedData,
-                new EnvelopedData(originatorInfo, new DERSet(recipientInfos), eci, unprotectedAttrSet));
-
-        return new CMSEnvelopedData(contentInfo);
-    }
-
-    /**
-     * generate an enveloped object that contains an CMS Enveloped Data
-     * object using the given provider.
-     *
-     * @param content the content to be encrypted
-     * @param contentEncryptor the symmetric key based encryptor to encrypt the content with.
-     */
-    public CMSEnvelopedData generate(
-        CMSTypedData content,
-        OutputEncryptor contentEncryptor)
-        throws CMSException
-    {
-        return doGenerate(content, contentEncryptor);
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cms/CMSEnvelopedDataParser.java b/bcpkix/src/main/java/org/bouncycastle/cms/CMSEnvelopedDataParser.java
deleted file mode 100644
index 67c9d91..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cms/CMSEnvelopedDataParser.java
+++ /dev/null
@@ -1,208 +0,0 @@
-package org.bouncycastle.cms;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1OctetStringParser;
-import org.bouncycastle.asn1.ASN1SequenceParser;
-import org.bouncycastle.asn1.ASN1Set;
-import org.bouncycastle.asn1.ASN1SetParser;
-import org.bouncycastle.asn1.BERTags;
-import org.bouncycastle.asn1.DERSet;
-import org.bouncycastle.asn1.cms.AttributeTable;
-import org.bouncycastle.asn1.cms.EncryptedContentInfoParser;
-import org.bouncycastle.asn1.cms.EnvelopedDataParser;
-import org.bouncycastle.asn1.cms.OriginatorInfo;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-
-/**
- * Parsing class for an CMS Enveloped Data object from an input stream.
- * <p>
- * Note: that because we are in a streaming mode only one recipient can be tried and it is important 
- * that the methods on the parser are called in the appropriate order.
- * </p>
- * <p>
- * Example of use - assuming the first recipient matches the private key we have.
- * <pre>
- *      CMSEnvelopedDataParser     ep = new CMSEnvelopedDataParser(inputStream);
- *
- *      RecipientInformationStore  recipients = ep.getRecipientInfos();
- *
- *      Collection  c = recipients.getRecipients();
- *      Iterator    it = c.iterator();
- *      
- *      if (it.hasNext())
- *      {
- *          RecipientInformation   recipient = (RecipientInformation)it.next();
- *
- *          CMSTypedStream recData = recipient.getContentStream(new JceKeyTransEnvelopedRecipient(privateKey).setProvider("BC"));
- *          
- *          processDataStream(recData.getContentStream());
- *      }
- *  </pre>
- *  Note: this class does not introduce buffering - if you are processing large files you should create
- *  the parser with:
- *  <pre>
- *          CMSEnvelopedDataParser     ep = new CMSEnvelopedDataParser(new BufferedInputStream(inputStream, bufSize));
- *  </pre>
- *  where bufSize is a suitably large buffer size.
- */
-public class CMSEnvelopedDataParser
-    extends CMSContentInfoParser
-{
-    RecipientInformationStore recipientInfoStore;
-    EnvelopedDataParser envelopedData;
-    
-    private AlgorithmIdentifier encAlg;
-    private AttributeTable unprotectedAttributes;
-    private boolean attrNotRead;
-    private OriginatorInformation  originatorInfo;
-
-    public CMSEnvelopedDataParser(
-        byte[]    envelopedData) 
-        throws CMSException, IOException
-    {
-        this(new ByteArrayInputStream(envelopedData));
-    }
-
-    public CMSEnvelopedDataParser(
-        InputStream    envelopedData) 
-        throws CMSException, IOException
-    {
-        super(envelopedData);
-
-        this.attrNotRead = true;
-        this.envelopedData = new EnvelopedDataParser((ASN1SequenceParser)_contentInfo.getContent(BERTags.SEQUENCE));
-
-        // TODO Validate version?
-        //ASN1Integer version = this._envelopedData.getVersion();
-
-        OriginatorInfo info = this.envelopedData.getOriginatorInfo();
-
-        if (info != null)
-        {
-            this.originatorInfo = new OriginatorInformation(info);
-        }
-
-        //
-        // read the recipients
-        //
-        ASN1Set recipientInfos = ASN1Set.getInstance(this.envelopedData.getRecipientInfos().toASN1Primitive());
-
-        //
-        // read the encrypted content info
-        //
-        EncryptedContentInfoParser encInfo = this.envelopedData.getEncryptedContentInfo();
-        this.encAlg = encInfo.getContentEncryptionAlgorithm();
-        CMSReadable readable = new CMSProcessableInputStream(
-            ((ASN1OctetStringParser)encInfo.getEncryptedContent(BERTags.OCTET_STRING)).getOctetStream());
-        CMSSecureReadable secureReadable = new CMSEnvelopedHelper.CMSEnvelopedSecureReadable(
-            this.encAlg, readable);
-
-        //
-        // build the RecipientInformationStore
-        //
-        this.recipientInfoStore = CMSEnvelopedHelper.buildRecipientInformationStore(
-            recipientInfos, this.encAlg, secureReadable);
-    }
-
-    /**
-     * return the object identifier for the content encryption algorithm.
-     */
-    public String getEncryptionAlgOID()
-    {
-        return encAlg.getAlgorithm().toString();
-    }
-
-    /**
-     * return the ASN.1 encoded encryption algorithm parameters, or null if
-     * there aren't any.
-     */
-    public byte[] getEncryptionAlgParams()
-    {
-        try
-        {
-            return encodeObj(encAlg.getParameters());
-        }
-        catch (Exception e)
-        {
-            throw new RuntimeException("exception getting encryption parameters " + e);
-        }
-    }
-
-    /**
-     * Return the content encryption algorithm details for the data in this object.
-     *
-     * @return AlgorithmIdentifier representing the content encryption algorithm.
-     */
-    public AlgorithmIdentifier getContentEncryptionAlgorithm()
-    {
-        return encAlg;
-    }
-
-    /**
-     * Return the originator information associated with this message if present.
-     *
-     * @return OriginatorInformation, null if not present.
-     */
-    public OriginatorInformation getOriginatorInfo()
-    {
-        return originatorInfo;
-    }
-
-    /**
-     * return a store of the intended recipients for this message
-     */
-    public RecipientInformationStore getRecipientInfos()
-    {
-        return recipientInfoStore;
-    }
-
-    /**
-     * return a table of the unprotected attributes indexed by
-     * the OID of the attribute.
-     * @exception IOException 
-     */
-    public AttributeTable getUnprotectedAttributes() 
-        throws IOException
-    {
-        if (unprotectedAttributes == null && attrNotRead)
-        {
-            ASN1SetParser             set = envelopedData.getUnprotectedAttrs();
-            
-            attrNotRead = false;
-            
-            if (set != null)
-            {
-                ASN1EncodableVector v = new ASN1EncodableVector();
-                ASN1Encodable        o;
-                
-                while ((o = set.readObject()) != null)
-                {
-                    ASN1SequenceParser    seq = (ASN1SequenceParser)o;
-                    
-                    v.add(seq.toASN1Primitive());
-                }
-                
-                unprotectedAttributes = new AttributeTable(new DERSet(v));
-            }
-        }
-
-        return unprotectedAttributes;
-    }
-
-    private byte[] encodeObj(
-        ASN1Encodable obj)
-        throws IOException
-    {
-        if (obj != null)
-        {
-            return obj.toASN1Primitive().getEncoded();
-        }
-
-        return null;
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cms/CMSEnvelopedDataStreamGenerator.java b/bcpkix/src/main/java/org/bouncycastle/cms/CMSEnvelopedDataStreamGenerator.java
deleted file mode 100644
index 92abca0..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cms/CMSEnvelopedDataStreamGenerator.java
+++ /dev/null
@@ -1,305 +0,0 @@
-package org.bouncycastle.cms;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.HashMap;
-import java.util.Iterator;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-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.DERSet;
-import org.bouncycastle.asn1.DERTaggedObject;
-import org.bouncycastle.asn1.cms.AttributeTable;
-import org.bouncycastle.asn1.cms.CMSObjectIdentifiers;
-import org.bouncycastle.asn1.cms.EnvelopedData;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.operator.GenericKey;
-import org.bouncycastle.operator.OutputEncryptor;
-
-/**
- * General class for generating a CMS enveloped-data message stream.
- * <p>
- * A simple example of usage.
- * <pre>
- *      CMSEnvelopedDataStreamGenerator edGen = new CMSEnvelopedDataStreamGenerator();
- *
- *      edGen.addRecipientInfoGenerator(new JceKeyTransRecipientInfoGenerator(recipientCert).setProvider("BC"));
- *
- *      ByteArrayOutputStream  bOut = new ByteArrayOutputStream();
- *      
- *      OutputStream out = edGen.open(
- *                              bOut, new JceCMSContentEncryptorBuilder(CMSAlgorithm.DES_EDE3_CBC)
- *                                              .setProvider("BC").build());
- *      out.write(data);
- *      
- *      out.close();
- * </pre>
- */
-public class CMSEnvelopedDataStreamGenerator
-    extends CMSEnvelopedGenerator
-{
-    private ASN1Set              _unprotectedAttributes = null;
-    private int                 _bufferSize;
-    private boolean             _berEncodeRecipientSet;
-
-    /**
-     * base constructor
-     */
-    public CMSEnvelopedDataStreamGenerator()
-    {
-    }
-
-    /**
-     * Set the underlying string size for encapsulated data
-     * 
-     * @param bufferSize length of octet strings to buffer the data.
-     */
-    public void setBufferSize(
-        int bufferSize)
-    {
-        _bufferSize = bufferSize;
-    }
-
-    /**
-     * Use a BER Set to store the recipient information
-     */
-    public void setBEREncodeRecipients(
-        boolean berEncodeRecipientSet)
-    {
-        _berEncodeRecipientSet = berEncodeRecipientSet;
-    }
-
-    private ASN1Integer getVersion()
-    {
-        if (originatorInfo != null || _unprotectedAttributes != null)
-        {
-            return new ASN1Integer(2);
-        }
-        else
-        {
-            return new ASN1Integer(0);
-        }
-    }
-
-    private OutputStream doOpen(
-        ASN1ObjectIdentifier dataType,
-        OutputStream         out,
-        OutputEncryptor      encryptor)
-        throws IOException, CMSException
-    {
-        ASN1EncodableVector recipientInfos = new ASN1EncodableVector();
-        GenericKey encKey = encryptor.getKey();
-        Iterator it = recipientInfoGenerators.iterator();
-
-        while (it.hasNext())
-        {
-            RecipientInfoGenerator recipient = (RecipientInfoGenerator)it.next();
-
-            recipientInfos.add(recipient.generate(encKey));
-        }
-
-        return open(dataType, out, recipientInfos, encryptor);
-    }
-
-    protected OutputStream open(
-        ASN1ObjectIdentifier dataType,
-        OutputStream         out,
-        ASN1EncodableVector  recipientInfos,
-        OutputEncryptor      encryptor)
-        throws IOException
-    {
-        //
-        // ContentInfo
-        //
-        BERSequenceGenerator cGen = new BERSequenceGenerator(out);
-
-        cGen.addObject(CMSObjectIdentifiers.envelopedData);
-
-        //
-        // Encrypted Data
-        //
-        BERSequenceGenerator envGen = new BERSequenceGenerator(cGen.getRawOutputStream(), 0, true);
-
-        envGen.addObject(getVersion());
-
-        if (originatorInfo != null)
-        {
-            envGen.addObject(new DERTaggedObject(false, 0, originatorInfo));
-        }
-
-        if (_berEncodeRecipientSet)
-        {
-            envGen.getRawOutputStream().write(new BERSet(recipientInfos).getEncoded());
-        }
-        else
-        {
-            envGen.getRawOutputStream().write(new DERSet(recipientInfos).getEncoded());
-        }
-
-        BERSequenceGenerator eiGen = new BERSequenceGenerator(envGen.getRawOutputStream());
-
-        eiGen.addObject(dataType);
-
-        AlgorithmIdentifier encAlgId = encryptor.getAlgorithmIdentifier();
-
-        eiGen.getRawOutputStream().write(encAlgId.getEncoded());
-
-        OutputStream octetStream = CMSUtils.createBEROctetOutputStream(
-            eiGen.getRawOutputStream(), 0, false, _bufferSize);
-
-        OutputStream cOut = encryptor.getOutputStream(octetStream);
-
-        return new CmsEnvelopedDataOutputStream(cOut, cGen, envGen, eiGen);
-    }
-
-    protected OutputStream open(
-        OutputStream        out,
-        ASN1EncodableVector recipientInfos,
-        OutputEncryptor     encryptor)
-        throws CMSException
-    {
-        try
-        {
-            //
-            // ContentInfo
-            //
-            BERSequenceGenerator cGen = new BERSequenceGenerator(out);
-
-            cGen.addObject(CMSObjectIdentifiers.envelopedData);
-
-            //
-            // Encrypted Data
-            //
-            BERSequenceGenerator envGen = new BERSequenceGenerator(cGen.getRawOutputStream(), 0, true);
-
-            ASN1Set recipients;
-            if (_berEncodeRecipientSet)
-            {
-                recipients = new BERSet(recipientInfos);
-            }
-            else
-            {
-                recipients = new DERSet(recipientInfos);
-            }
-
-            envGen.addObject(new ASN1Integer(EnvelopedData.calculateVersion(originatorInfo, recipients, _unprotectedAttributes)));
-
-            if (originatorInfo != null)
-            {
-                envGen.addObject(new DERTaggedObject(false, 0, originatorInfo));
-            }
-
-            envGen.getRawOutputStream().write(recipients.getEncoded());
-
-            BERSequenceGenerator eiGen = new BERSequenceGenerator(envGen.getRawOutputStream());
-
-            eiGen.addObject(CMSObjectIdentifiers.data);
-
-            AlgorithmIdentifier encAlgId = encryptor.getAlgorithmIdentifier();
-
-            eiGen.getRawOutputStream().write(encAlgId.getEncoded());
-
-            OutputStream octetStream = CMSUtils.createBEROctetOutputStream(
-                eiGen.getRawOutputStream(), 0, false, _bufferSize);
-
-            return new CmsEnvelopedDataOutputStream(encryptor.getOutputStream(octetStream), cGen, envGen, eiGen);
-        }
-        catch (IOException e)
-        {
-            throw new CMSException("exception decoding algorithm parameters.", e);
-        }
-    }
-
-    /**
-     * generate an enveloped object that contains an CMS Enveloped Data
-     * object using the given encryptor.
-     */
-    public OutputStream open(
-        OutputStream    out,
-        OutputEncryptor encryptor)
-        throws CMSException, IOException
-    {
-        return doOpen(new ASN1ObjectIdentifier(CMSObjectIdentifiers.data.getId()), out, encryptor);
-    }
-
-    /**
-     * generate an enveloped object that contains an CMS Enveloped Data
-     * object using the given encryptor and marking the data as being of the passed
-     * in type.
-     */
-    public OutputStream open(
-        ASN1ObjectIdentifier dataType,
-        OutputStream         out,
-        OutputEncryptor      encryptor)
-        throws CMSException, IOException
-    {
-        return doOpen(dataType, out, encryptor);
-    }
-
-    private class CmsEnvelopedDataOutputStream
-        extends OutputStream
-    {
-        private OutputStream   _out;
-        private BERSequenceGenerator _cGen;
-        private BERSequenceGenerator _envGen;
-        private BERSequenceGenerator _eiGen;
-    
-        public CmsEnvelopedDataOutputStream(
-            OutputStream   out,
-            BERSequenceGenerator cGen,
-            BERSequenceGenerator envGen,
-            BERSequenceGenerator eiGen)
-        {
-            _out = out;
-            _cGen = cGen;
-            _envGen = envGen;
-            _eiGen = eiGen;
-        }
-    
-        public void write(
-            int b)
-            throws IOException
-        {
-            _out.write(b);
-        }
-        
-        public void write(
-            byte[] bytes,
-            int    off,
-            int    len)
-            throws IOException
-        {
-            _out.write(bytes, off, len);
-        }
-        
-        public void write(
-            byte[] bytes)
-            throws IOException
-        {
-            _out.write(bytes);
-        }
-        
-        public void close()
-            throws IOException
-        {
-            _out.close();
-            _eiGen.close();
-
-            if (unprotectedAttributeGenerator != null)
-            {
-                AttributeTable attrTable = unprotectedAttributeGenerator.getAttributes(new HashMap());
-      
-                ASN1Set unprotectedAttrs = new BERSet(attrTable.toASN1EncodableVector());
-
-                _envGen.addObject(new DERTaggedObject(false, 1, unprotectedAttrs));
-            }
-    
-            _envGen.close();
-            _cGen.close();
-        }
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cms/CMSEnvelopedGenerator.java b/bcpkix/src/main/java/org/bouncycastle/cms/CMSEnvelopedGenerator.java
deleted file mode 100644
index 012b440..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cms/CMSEnvelopedGenerator.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package org.bouncycastle.cms;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.bouncycastle.asn1.cms.OriginatorInfo;
-import org.bouncycastle.asn1.kisa.KISAObjectIdentifiers;
-import org.bouncycastle.asn1.nist.NISTObjectIdentifiers;
-import org.bouncycastle.asn1.ntt.NTTObjectIdentifiers;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.asn1.x9.X9ObjectIdentifiers;
-
-/**
- * General class for generating a CMS enveloped-data message.
- */
-public class CMSEnvelopedGenerator
-{
-    public static final String  DES_EDE3_CBC    = PKCSObjectIdentifiers.des_EDE3_CBC.getId();
-    public static final String  RC2_CBC         = PKCSObjectIdentifiers.RC2_CBC.getId();
-    public static final String  IDEA_CBC        = "1.3.6.1.4.1.188.7.1.1.2";
-    public static final String  CAST5_CBC       = "1.2.840.113533.7.66.10";
-    public static final String  AES128_CBC      = NISTObjectIdentifiers.id_aes128_CBC.getId();
-    public static final String  AES192_CBC      = NISTObjectIdentifiers.id_aes192_CBC.getId();
-    public static final String  AES256_CBC      = NISTObjectIdentifiers.id_aes256_CBC.getId();
-    public static final String  CAMELLIA128_CBC = NTTObjectIdentifiers.id_camellia128_cbc.getId();
-    public static final String  CAMELLIA192_CBC = NTTObjectIdentifiers.id_camellia192_cbc.getId();
-    public static final String  CAMELLIA256_CBC = NTTObjectIdentifiers.id_camellia256_cbc.getId();
-    public static final String  SEED_CBC        = KISAObjectIdentifiers.id_seedCBC.getId();
-
-    public static final String  DES_EDE3_WRAP   = PKCSObjectIdentifiers.id_alg_CMS3DESwrap.getId();
-    public static final String  AES128_WRAP     = NISTObjectIdentifiers.id_aes128_wrap.getId();
-    public static final String  AES192_WRAP     = NISTObjectIdentifiers.id_aes192_wrap.getId();
-    public static final String  AES256_WRAP     = NISTObjectIdentifiers.id_aes256_wrap.getId();
-    public static final String  CAMELLIA128_WRAP = NTTObjectIdentifiers.id_camellia128_wrap.getId();
-    public static final String  CAMELLIA192_WRAP = NTTObjectIdentifiers.id_camellia192_wrap.getId();
-    public static final String  CAMELLIA256_WRAP = NTTObjectIdentifiers.id_camellia256_wrap.getId();
-    public static final String  SEED_WRAP       = KISAObjectIdentifiers.id_npki_app_cmsSeed_wrap.getId();
-
-    public static final String  ECDH_SHA1KDF    = X9ObjectIdentifiers.dhSinglePass_stdDH_sha1kdf_scheme.getId();
-    public static final String  ECMQV_SHA1KDF   = X9ObjectIdentifiers.mqvSinglePass_sha1kdf_scheme.getId();
-
-    final List oldRecipientInfoGenerators = new ArrayList();
-    final List recipientInfoGenerators = new ArrayList();
-
-    protected CMSAttributeTableGenerator unprotectedAttributeGenerator = null;
-
-    protected OriginatorInfo originatorInfo;
-
-    /**
-     * base constructor
-     */
-    public CMSEnvelopedGenerator()
-    {
-    }
-
-    public void setUnprotectedAttributeGenerator(CMSAttributeTableGenerator unprotectedAttributeGenerator)
-    {
-        this.unprotectedAttributeGenerator = unprotectedAttributeGenerator;
-    }
-
-    public void setOriginatorInfo(OriginatorInformation originatorInfo)
-    {
-        this.originatorInfo = originatorInfo.toASN1Structure();
-    }
-
-    /**
-     * Add a generator to produce the recipient info required.
-     * 
-     * @param recipientGenerator a generator of a recipient info object.
-     */
-    public void addRecipientInfoGenerator(RecipientInfoGenerator recipientGenerator)
-    {
-        recipientInfoGenerators.add(recipientGenerator);
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cms/CMSEnvelopedHelper.java b/bcpkix/src/main/java/org/bouncycastle/cms/CMSEnvelopedHelper.java
deleted file mode 100644
index 5b1bad4..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cms/CMSEnvelopedHelper.java
+++ /dev/null
@@ -1,154 +0,0 @@
-package org.bouncycastle.cms;
-
-import java.io.FilterInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1Set;
-import org.bouncycastle.asn1.cms.KEKRecipientInfo;
-import org.bouncycastle.asn1.cms.KeyAgreeRecipientInfo;
-import org.bouncycastle.asn1.cms.KeyTransRecipientInfo;
-import org.bouncycastle.asn1.cms.PasswordRecipientInfo;
-import org.bouncycastle.asn1.cms.RecipientInfo;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.operator.DigestCalculator;
-
-class CMSEnvelopedHelper
-{
-    static RecipientInformationStore buildRecipientInformationStore(
-        ASN1Set recipientInfos, AlgorithmIdentifier messageAlgorithm, CMSSecureReadable secureReadable)
-    {
-        return buildRecipientInformationStore(recipientInfos, messageAlgorithm, secureReadable, null);
-    }
-
-    static RecipientInformationStore buildRecipientInformationStore(
-        ASN1Set recipientInfos, AlgorithmIdentifier messageAlgorithm, CMSSecureReadable secureReadable, AuthAttributesProvider additionalData)
-    {
-        List infos = new ArrayList();
-        for (int i = 0; i != recipientInfos.size(); i++)
-        {
-            RecipientInfo info = RecipientInfo.getInstance(recipientInfos.getObjectAt(i));
-
-            readRecipientInfo(infos, info, messageAlgorithm, secureReadable, additionalData);
-        }
-        return new RecipientInformationStore(infos);
-    }
-
-    private static void readRecipientInfo(
-        List infos, RecipientInfo info, AlgorithmIdentifier messageAlgorithm, CMSSecureReadable secureReadable, AuthAttributesProvider additionalData)
-    {
-        ASN1Encodable recipInfo = info.getInfo();
-        if (recipInfo instanceof KeyTransRecipientInfo)
-        {
-            infos.add(new KeyTransRecipientInformation(
-                (KeyTransRecipientInfo)recipInfo, messageAlgorithm, secureReadable, additionalData));
-        }
-        else if (recipInfo instanceof KEKRecipientInfo)
-        {
-            infos.add(new KEKRecipientInformation(
-                (KEKRecipientInfo)recipInfo, messageAlgorithm, secureReadable, additionalData));
-        }
-        else if (recipInfo instanceof KeyAgreeRecipientInfo)
-        {
-            KeyAgreeRecipientInformation.readRecipientInfo(infos,
-                (KeyAgreeRecipientInfo)recipInfo, messageAlgorithm, secureReadable, additionalData);
-        }
-        else if (recipInfo instanceof PasswordRecipientInfo)
-        {
-            infos.add(new PasswordRecipientInformation(
-                (PasswordRecipientInfo)recipInfo, messageAlgorithm, secureReadable, additionalData));
-        }
-    }
-
-    static class CMSDigestAuthenticatedSecureReadable
-        implements CMSSecureReadable
-    {
-        private DigestCalculator digestCalculator;
-        private CMSReadable readable;
-
-        public CMSDigestAuthenticatedSecureReadable(DigestCalculator digestCalculator, CMSReadable readable)
-        {
-            this.digestCalculator = digestCalculator;
-            this.readable = readable;
-        }
-
-        public InputStream getInputStream()
-            throws IOException, CMSException
-        {
-            return new FilterInputStream(readable.getInputStream())
-            {
-                public int read()
-                    throws IOException
-                {
-                    int b = in.read();
-
-                    if (b >= 0)
-                    {
-                        digestCalculator.getOutputStream().write(b);
-                    }
-
-                    return b;
-                }
-
-                public int read(byte[] inBuf, int inOff, int inLen)
-                    throws IOException
-                {
-                    int n = in.read(inBuf, inOff, inLen);
-                    
-                    if (n >= 0)
-                    {
-                        digestCalculator.getOutputStream().write(inBuf, inOff, n);
-                    }
-
-                    return n;
-                }
-            };
-        }
-
-        public byte[] getDigest()
-        {
-            return digestCalculator.getDigest();
-        }
-    }
-
-    static class CMSAuthenticatedSecureReadable implements CMSSecureReadable
-    {
-        private AlgorithmIdentifier algorithm;
-        private CMSReadable readable;
-
-        CMSAuthenticatedSecureReadable(AlgorithmIdentifier algorithm, CMSReadable readable)
-        {
-            this.algorithm = algorithm;
-            this.readable = readable;
-        }
-
-        public InputStream getInputStream()
-            throws IOException, CMSException
-        {
-            return readable.getInputStream();
-        }
-
-    }
-
-    static class CMSEnvelopedSecureReadable implements CMSSecureReadable
-    {
-        private AlgorithmIdentifier algorithm;
-        private CMSReadable readable;
-
-        CMSEnvelopedSecureReadable(AlgorithmIdentifier algorithm, CMSReadable readable)
-        {
-            this.algorithm = algorithm;
-            this.readable = readable;
-        }
-
-        public InputStream getInputStream()
-            throws IOException, CMSException
-        {
-            return readable.getInputStream();
-        }
-
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cms/CMSProcessableFile.java b/bcpkix/src/main/java/org/bouncycastle/cms/CMSProcessableFile.java
deleted file mode 100644
index b1e4527..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cms/CMSProcessableFile.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package org.bouncycastle.cms;
-
-import java.io.BufferedInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.cms.CMSObjectIdentifiers;
-
-/**
- * a holding class for a file of data to be processed.
- */
-public class CMSProcessableFile
-    implements CMSTypedData, CMSReadable
-{
-    private static final int DEFAULT_BUF_SIZE = 32 * 1024;
-
-    private final ASN1ObjectIdentifier type;
-    private final File file;
-    private final byte[] buf;
-
-    public CMSProcessableFile(
-        File file)
-    {
-        this(file, DEFAULT_BUF_SIZE);
-    }
-    
-    public CMSProcessableFile(
-        File file,
-        int  bufSize)
-    {
-        this(new ASN1ObjectIdentifier(CMSObjectIdentifiers.data.getId()), file, bufSize);
-    }
-
-    public CMSProcessableFile(
-        ASN1ObjectIdentifier type,
-        File file,
-        int  bufSize)
-    {
-        this.type = type;
-        this.file = file;
-        buf = new byte[bufSize];
-    }
-
-    public InputStream getInputStream()
-        throws IOException, CMSException
-    {
-        return new BufferedInputStream(new FileInputStream(file), DEFAULT_BUF_SIZE);
-    }
-
-    public void write(OutputStream zOut)
-        throws IOException, CMSException
-    {
-        FileInputStream     fIn = new FileInputStream(file);
-        int                 len;
-        
-        while ((len = fIn.read(buf, 0, buf.length)) > 0)
-        {
-            zOut.write(buf, 0, len);
-        }
-        
-        fIn.close();
-    }
-
-    /**
-     * Return the file handle.
-     */
-    public Object getContent()
-    {
-        return file;
-    }
-
-    public ASN1ObjectIdentifier getContentType()
-    {
-        return type;
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cms/CMSProcessableInputStream.java b/bcpkix/src/main/java/org/bouncycastle/cms/CMSProcessableInputStream.java
deleted file mode 100644
index a73e232..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cms/CMSProcessableInputStream.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package org.bouncycastle.cms;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-import org.bouncycastle.util.io.Streams;
-
-class CMSProcessableInputStream implements CMSProcessable, CMSReadable
-{
-    private InputStream input;
-    private boolean used = false;
-
-    public CMSProcessableInputStream(
-        InputStream input)
-    {
-        this.input = input;
-    }
-
-    public InputStream getInputStream()
-    {
-        checkSingleUsage();
-
-        return input;
-    }
-
-    public void write(OutputStream zOut)
-        throws IOException, CMSException
-    {
-        checkSingleUsage();
-
-        Streams.pipeAll(input, zOut);
-        input.close();
-    }
-
-    public Object getContent()
-    {
-        return getInputStream();
-    }
-
-    private synchronized void checkSingleUsage()
-    {
-        if (used)
-        {
-            throw new IllegalStateException("CMSProcessableInputStream can only be used once");
-        }
-
-        used = true;
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cms/CMSSecureReadable.java b/bcpkix/src/main/java/org/bouncycastle/cms/CMSSecureReadable.java
deleted file mode 100644
index 620d123..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cms/CMSSecureReadable.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package org.bouncycastle.cms;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-interface CMSSecureReadable
-{
-    InputStream getInputStream()
-            throws IOException, CMSException;
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cms/CMSSignedData.java b/bcpkix/src/main/java/org/bouncycastle/cms/CMSSignedData.java
index d9223c3..5ef95ee 100644
--- a/bcpkix/src/main/java/org/bouncycastle/cms/CMSSignedData.java
+++ b/bcpkix/src/main/java/org/bouncycastle/cms/CMSSignedData.java
@@ -287,18 +287,20 @@ public class CMSSignedData
         return HELPER.getAttributeCertificates(signedData.getCertificates());
     }
 
-    /**
-     * Return any OtherRevocationInfo OtherRevInfo objects of the type indicated by otherRevocationInfoFormat in
-     * this SignedData structure.
-     *
-     * @param otherRevocationInfoFormat OID of the format type been looked for.
-     *
-     * @return a Store of ASN1Encodable objects representing any objects of otherRevocationInfoFormat found.
-     */
-    public Store getOtherRevocationInfo(ASN1ObjectIdentifier otherRevocationInfoFormat)
-    {
-        return HELPER.getOtherRevocationInfo(otherRevocationInfoFormat, signedData.getCRLs());
-    }
+    // BEGIN android-removed
+    // /**
+    //  * Return any OtherRevocationInfo OtherRevInfo objects of the type indicated by otherRevocationInfoFormat in
+    //  * this SignedData structure.
+    //  *
+    //  * @param otherRevocationInfoFormat OID of the format type been looked for.
+    //  *
+    //  * @return a Store of ASN1Encodable objects representing any objects of otherRevocationInfoFormat found.
+    //  */
+    // public Store getOtherRevocationInfo(ASN1ObjectIdentifier otherRevocationInfoFormat)
+    // {
+    //     return HELPER.getOtherRevocationInfo(otherRevocationInfoFormat, signedData.getCRLs());
+    // }
+    // END android-removed
 
     /**
      * Return the a string representation of the OID associated with the
@@ -333,90 +335,92 @@ public class CMSSignedData
         return contentInfo.getEncoded();
     }
 
-    /**
-     * Verify all the SignerInformation objects and their associated counter signatures attached
-     * to this CMS SignedData object.
-     *
-     * @param verifierProvider  a provider of SignerInformationVerifier objects.
-     * @return true if all verify, false otherwise.
-     * @throws CMSException  if an exception occurs during the verification process.
-     */
-    public boolean verifySignatures(SignerInformationVerifierProvider verifierProvider)
-        throws CMSException
-    {
-        return verifySignatures(verifierProvider, false);
-    }
-
-    /**
-     * Verify all the SignerInformation objects and optionally their associated counter signatures attached
-     * to this CMS SignedData object.
-     *
-     * @param verifierProvider  a provider of SignerInformationVerifier objects.
-     * @param ignoreCounterSignatures if true don't check counter signatures. If false check counter signatures as well.
-     * @return true if all verify, false otherwise.
-     * @throws CMSException  if an exception occurs during the verification process.
-     */
-    public boolean verifySignatures(SignerInformationVerifierProvider verifierProvider, boolean ignoreCounterSignatures)
-        throws CMSException
-    {
-        Collection signers = this.getSignerInfos().getSigners();
-
-        for (Iterator it = signers.iterator(); it.hasNext();)
-        {
-            SignerInformation signer = (SignerInformation)it.next();
-
-            try
-            {
-                SignerInformationVerifier verifier = verifierProvider.get(signer.getSID());
-
-                if (!signer.verify(verifier))
-                {
-                    return false;
-                }
-
-                if (!ignoreCounterSignatures)
-                {
-                    Collection counterSigners = signer.getCounterSignatures().getSigners();
-
-                    for  (Iterator cIt = counterSigners.iterator(); cIt.hasNext();)
-                    {
-                        if (!verifyCounterSignature((SignerInformation)cIt.next(), verifierProvider))
-                        {
-                            return false;
-                        }
-                    }
-                }
-            }
-            catch (OperatorCreationException e)
-            {
-                throw new CMSException("failure in verifier provider: " + e.getMessage(), e);
-            }
-        }
-
-        return true;
-    }
-
-    private boolean verifyCounterSignature(SignerInformation counterSigner, SignerInformationVerifierProvider verifierProvider)
-        throws OperatorCreationException, CMSException
-    {
-        SignerInformationVerifier counterVerifier = verifierProvider.get(counterSigner.getSID());
-
-        if (!counterSigner.verify(counterVerifier))
-        {
-            return false;
-        }
-
-        Collection counterSigners = counterSigner.getCounterSignatures().getSigners();
-        for  (Iterator cIt = counterSigners.iterator(); cIt.hasNext();)
-        {
-            if (!verifyCounterSignature((SignerInformation)cIt.next(), verifierProvider))
-            {
-                return false;
-            }
-        }
-
-        return true;
-    }
+    // BEGIN android-removed
+    // /**
+    //  * Verify all the SignerInformation objects and their associated counter signatures attached
+    //  * to this CMS SignedData object.
+    //  *
+    //  * @param verifierProvider  a provider of SignerInformationVerifier objects.
+    //  * @return true if all verify, false otherwise.
+    //  * @throws CMSException  if an exception occurs during the verification process.
+    //  */
+    // public boolean verifySignatures(SignerInformationVerifierProvider verifierProvider)
+    //     throws CMSException
+    // {
+    //     return verifySignatures(verifierProvider, false);
+    // }
+    // 
+    // /**
+    //  * Verify all the SignerInformation objects and optionally their associated counter signatures attached
+    //  * to this CMS SignedData object.
+    //  *
+    //  * @param verifierProvider  a provider of SignerInformationVerifier objects.
+    //  * @param ignoreCounterSignatures if true don't check counter signatures. If false check counter signatures as well.
+    //  * @return true if all verify, false otherwise.
+    //  * @throws CMSException  if an exception occurs during the verification process.
+    //  */
+    // public boolean verifySignatures(SignerInformationVerifierProvider verifierProvider, boolean ignoreCounterSignatures)
+    //     throws CMSException
+    // {
+    //     Collection signers = this.getSignerInfos().getSigners();
+    // 
+    //     for (Iterator it = signers.iterator(); it.hasNext();)
+    //     {
+    //         SignerInformation signer = (SignerInformation)it.next();
+    // 
+    //         try
+    //         {
+    //             SignerInformationVerifier verifier = verifierProvider.get(signer.getSID());
+    // 
+    //             if (!signer.verify(verifier))
+    //             {
+    //                 return false;
+    //             }
+    // 
+    //             if (!ignoreCounterSignatures)
+    //             {
+    //                 Collection counterSigners = signer.getCounterSignatures().getSigners();
+    // 
+    //                 for  (Iterator cIt = counterSigners.iterator(); cIt.hasNext();)
+    //                 {
+    //                     if (!verifyCounterSignature((SignerInformation)cIt.next(), verifierProvider))
+    //                     {
+    //                         return false;
+    //                     }
+    //                 }
+    //             }
+    //         }
+    //         catch (OperatorCreationException e)
+    //         {
+    //             throw new CMSException("failure in verifier provider: " + e.getMessage(), e);
+    //         }
+    //     }
+    // 
+    //     return true;
+    // }
+    // 
+    // private boolean verifyCounterSignature(SignerInformation counterSigner, SignerInformationVerifierProvider verifierProvider)
+    //     throws OperatorCreationException, CMSException
+    // {
+    //     SignerInformationVerifier counterVerifier = verifierProvider.get(counterSigner.getSID());
+    // 
+    //     if (!counterSigner.verify(counterVerifier))
+    //     {
+    //         return false;
+    //     }
+    // 
+    //     Collection counterSigners = counterSigner.getCounterSignatures().getSigners();
+    //     for  (Iterator cIt = counterSigners.iterator(); cIt.hasNext();)
+    //     {
+    //         if (!verifyCounterSignature((SignerInformation)cIt.next(), verifierProvider))
+    //         {
+    //             return false;
+    //         }
+    //     }
+    // 
+    //     return true;
+    // }
+    // END android-removed
 
     /**
      * Replace the SignerInformation store associated with this
diff --git a/bcpkix/src/main/java/org/bouncycastle/cms/CMSSignedDataParser.java b/bcpkix/src/main/java/org/bouncycastle/cms/CMSSignedDataParser.java
deleted file mode 100644
index 329f089..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cms/CMSSignedDataParser.java
+++ /dev/null
@@ -1,624 +0,0 @@
-package org.bouncycastle.cms;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Generator;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1OctetStringParser;
-import org.bouncycastle.asn1.ASN1SequenceParser;
-import org.bouncycastle.asn1.ASN1Set;
-import org.bouncycastle.asn1.ASN1SetParser;
-import org.bouncycastle.asn1.ASN1StreamParser;
-import org.bouncycastle.asn1.BERSequenceGenerator;
-import org.bouncycastle.asn1.BERSetParser;
-import org.bouncycastle.asn1.BERTaggedObject;
-import org.bouncycastle.asn1.BERTags;
-import org.bouncycastle.asn1.DERSet;
-import org.bouncycastle.asn1.DERTaggedObject;
-import org.bouncycastle.asn1.cms.CMSObjectIdentifiers;
-import org.bouncycastle.asn1.cms.ContentInfoParser;
-import org.bouncycastle.asn1.cms.SignedDataParser;
-import org.bouncycastle.asn1.cms.SignerInfo;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.operator.DigestCalculator;
-import org.bouncycastle.operator.DigestCalculatorProvider;
-import org.bouncycastle.operator.OperatorCreationException;
-import org.bouncycastle.util.Store;
-import org.bouncycastle.util.io.Streams;
-
-/**
- * Parsing class for an CMS Signed Data object from an input stream.
- * <p>
- * Note: that because we are in a streaming mode only one signer can be tried and it is important 
- * that the methods on the parser are called in the appropriate order.
- * </p>
- * <p>
- * A simple example of usage for an encapsulated signature.
- * </p>
- * <p>
- * Two notes: first, in the example below the validity of
- * the certificate isn't verified, just the fact that one of the certs 
- * matches the given signer, and, second, because we are in a streaming
- * mode the order of the operations is important.
- * </p>
- * <pre>
- *      CMSSignedDataParser     sp = new CMSSignedDataParser(new JcaDigestCalculatorProviderBuilder().setProvider("BC").build(), encapSigData);
- *
- *      sp.getSignedContent().drain();
- *
- *      Store                   certStore = sp.getCertificates();
- *      SignerInformationStore  signers = sp.getSignerInfos();
- *      
- *      Collection              c = signers.getSigners();
- *      Iterator                it = c.iterator();
- *
- *      while (it.hasNext())
- *      {
- *          SignerInformation   signer = (SignerInformation)it.next();
- *          Collection          certCollection = certStore.getMatches(signer.getSID());
- *
- *          Iterator        certIt = certCollection.iterator();
- *          X509CertificateHolder cert = (X509CertificateHolder)certIt.next();
- *
- *          System.out.println("verify returns: " + signer.verify(new JcaSimpleSignerInfoVerifierBuilder().setProvider("BC").build(cert)));
- *      }
- * </pre>
- *  Note also: this class does not introduce buffering - if you are processing large files you should create
- *  the parser with:
- *  <pre>
- *          CMSSignedDataParser     ep = new CMSSignedDataParser(new BufferedInputStream(encapSigData, bufSize));
- *  </pre>
- *  where bufSize is a suitably large buffer size.
- */
-public class CMSSignedDataParser
-    extends CMSContentInfoParser
-{
-    private static final CMSSignedHelper HELPER = CMSSignedHelper.INSTANCE;
-
-    private SignedDataParser        _signedData;
-    private ASN1ObjectIdentifier    _signedContentType;
-    private CMSTypedStream          _signedContent;
-    private Map                     digests;
-
-    private SignerInformationStore  _signerInfoStore;
-    private ASN1Set                 _certSet, _crlSet;
-    private boolean                 _isCertCrlParsed;
-
-    public CMSSignedDataParser(
-        DigestCalculatorProvider digestCalculatorProvider,
-        byte[]      sigBlock)
-        throws CMSException
-    {
-        this(digestCalculatorProvider, new ByteArrayInputStream(sigBlock));
-    }
-
-    public CMSSignedDataParser(
-        DigestCalculatorProvider digestCalculatorProvider,
-        CMSTypedStream  signedContent,
-        byte[]          sigBlock)
-        throws CMSException
-    {
-        this(digestCalculatorProvider, signedContent, new ByteArrayInputStream(sigBlock));
-    }
-
-    /**
-     * base constructor - with encapsulated content
-     */
-    public CMSSignedDataParser(
-        DigestCalculatorProvider digestCalculatorProvider,
-        InputStream sigData)
-        throws CMSException
-    {
-        this(digestCalculatorProvider, null, sigData);
-    }
-
-    /**
-     * base constructor
-     *
-     * @param digestCalculatorProvider for generating accumulating digests
-     * @param signedContent the content that was signed.
-     * @param sigData the signature object stream.
-     */
-    public CMSSignedDataParser(
-        DigestCalculatorProvider digestCalculatorProvider,
-        CMSTypedStream  signedContent,
-        InputStream     sigData)
-        throws CMSException
-    {
-        super(sigData);
-        
-        try
-        {
-            _signedContent = signedContent;
-            _signedData = SignedDataParser.getInstance(_contentInfo.getContent(BERTags.SEQUENCE));
-            digests = new HashMap();
-            
-            ASN1SetParser digAlgs = _signedData.getDigestAlgorithms();
-            ASN1Encodable  o;
-            
-            while ((o = digAlgs.readObject()) != null)
-            {
-                AlgorithmIdentifier algId = AlgorithmIdentifier.getInstance(o);
-                try
-                {
-                    DigestCalculator calculator = digestCalculatorProvider.get(algId);
-
-                    if (calculator != null)
-                    {
-                        this.digests.put(algId.getAlgorithm(), calculator);
-                    }
-                }
-                catch (OperatorCreationException e)
-                {
-                     //  ignore
-                }
-            }
-
-            //
-            // If the message is simply a certificate chain message getContent() may return null.
-            //
-            ContentInfoParser     cont = _signedData.getEncapContentInfo();
-            ASN1OctetStringParser octs = (ASN1OctetStringParser)
-                cont.getContent(BERTags.OCTET_STRING);
-
-            if (octs != null)
-            {
-                CMSTypedStream ctStr = new CMSTypedStream(
-                    cont.getContentType().getId(), octs.getOctetStream());
-
-                if (_signedContent == null)
-                {
-                    _signedContent = ctStr; 
-                }
-                else
-                {
-                    //
-                    // content passed in, need to read past empty encapsulated content info object if present
-                    //
-                    ctStr.drain();
-                }
-            }
-
-            if (signedContent == null)
-            {
-                _signedContentType = cont.getContentType();
-            }
-            else
-            {
-                _signedContentType = _signedContent.getContentType();
-            }
-        }
-        catch (IOException e)
-        {
-            throw new CMSException("io exception: " + e.getMessage(), e);
-        }
-    }
-
-    /**
-     * Return the version number for the SignedData object
-     *
-     * @return the version number
-     */
-    public int getVersion()
-    {
-        return _signedData.getVersion().getValue().intValue();
-    }
-
-    /**
-     * return the collection of signers that are associated with the
-     * signatures for the message.
-     * @throws CMSException 
-     */
-    public SignerInformationStore getSignerInfos() 
-        throws CMSException
-    {
-        if (_signerInfoStore == null)
-        {
-            populateCertCrlSets();
-            
-            List      signerInfos = new ArrayList();
-            Map       hashes = new HashMap();
-            
-            Iterator  it = digests.keySet().iterator();
-            while (it.hasNext())
-            {
-                Object digestKey = it.next();
-
-                hashes.put(digestKey, ((DigestCalculator)digests.get(digestKey)).getDigest());
-            }
-            
-            try
-            {
-                ASN1SetParser     s = _signedData.getSignerInfos();
-                ASN1Encodable      o;
-
-                while ((o = s.readObject()) != null)
-                {
-                    SignerInfo info = SignerInfo.getInstance(o.toASN1Primitive());
-
-                    byte[] hash = (byte[])hashes.get(info.getDigestAlgorithm().getAlgorithm());
-
-                    signerInfos.add(new SignerInformation(info, _signedContentType, null, hash));
-                }
-            }
-            catch (IOException e)
-            {
-                throw new CMSException("io exception: " + e.getMessage(), e);
-            }
-
-            _signerInfoStore = new SignerInformationStore(signerInfos);
-        }
-
-        return _signerInfoStore;
-    }
-
-    /**
-     * Return any X.509 certificate objects in this SignedData structure as a Store of X509CertificateHolder objects.
-     *
-     * @return a Store of X509CertificateHolder objects.
-     */
-    public Store getCertificates()
-        throws CMSException
-    {
-        populateCertCrlSets();
-
-        return HELPER.getCertificates(_certSet);
-    }
-
-    /**
-     * Return any X.509 CRL objects in this SignedData structure as a Store of X509CRLHolder objects.
-     *
-     * @return a Store of X509CRLHolder objects.
-     */
-    public Store getCRLs()
-        throws CMSException
-    {
-        populateCertCrlSets();
-
-        return HELPER.getCRLs(_crlSet);
-    }
-
-    /**
-     * Return any X.509 attribute certificate objects in this SignedData structure as a Store of X509AttributeCertificateHolder objects.
-     *
-     * @return a Store of X509AttributeCertificateHolder objects.
-     */
-    public Store getAttributeCertificates()
-        throws CMSException
-    {
-        populateCertCrlSets();
-
-        return HELPER.getAttributeCertificates(_certSet);
-    }
-
-    /**
-     * Return any OtherRevocationInfo OtherRevInfo objects of the type indicated by otherRevocationInfoFormat in
-     * this SignedData structure.
-     *
-     * @param otherRevocationInfoFormat OID of the format type been looked for.
-     *
-     * @return a Store of ASN1Encodable objects representing any objects of otherRevocationInfoFormat found.
-     */
-    public Store getOtherRevocationInfo(ASN1ObjectIdentifier otherRevocationInfoFormat)
-        throws CMSException
-    {
-        populateCertCrlSets();
-
-        return HELPER.getOtherRevocationInfo(otherRevocationInfoFormat, _crlSet);
-    }
-
-    private void populateCertCrlSets()
-        throws CMSException
-    {
-        if (_isCertCrlParsed)
-        {
-            return;
-        }
-
-        _isCertCrlParsed = true;
-
-        try
-        {
-            // care! Streaming - these must be done in exactly this order.
-            _certSet = getASN1Set(_signedData.getCertificates());
-            _crlSet = getASN1Set(_signedData.getCrls());
-        }
-        catch (IOException e)
-        {
-            throw new CMSException("problem parsing cert/crl sets", e);
-        }
-    }
-
-    /**
-     * Return the a string representation of the OID associated with the
-     * encapsulated content info structure carried in the signed data.
-     * 
-     * @return the OID for the content type.
-     */
-    public String getSignedContentTypeOID()
-    {
-        return _signedContentType.getId();
-    }
-
-    public CMSTypedStream getSignedContent()
-    {
-        if (_signedContent == null)
-        {
-            return null;
-        }
-
-        InputStream digStream = CMSUtils.attachDigestsToInputStream(
-            digests.values(), _signedContent.getContentStream());
-
-        return new CMSTypedStream(_signedContent.getContentType(), digStream);
-    }
-
-    /**
-     * Replace the signerinformation store associated with the passed
-     * in message contained in the stream original with the new one passed in.
-     * You would probably only want to do this if you wanted to change the unsigned
-     * attributes associated with a signer, or perhaps delete one.
-     * <p>
-     * The output stream is returned unclosed.
-     * </p>
-     * @param original the signed data stream to be used as a base.
-     * @param signerInformationStore the new signer information store to use.
-     * @param out the stream to write the new signed data object to.
-     * @return out.
-     */
-    public static OutputStream replaceSigners(
-        InputStream             original,
-        SignerInformationStore  signerInformationStore,
-        OutputStream            out)
-        throws CMSException, IOException
-    {
-        ASN1StreamParser in = new ASN1StreamParser(original);
-        ContentInfoParser contentInfo = new ContentInfoParser((ASN1SequenceParser)in.readObject());
-        SignedDataParser signedData = SignedDataParser.getInstance(contentInfo.getContent(BERTags.SEQUENCE));
-
-        BERSequenceGenerator sGen = new BERSequenceGenerator(out);
-
-        sGen.addObject(CMSObjectIdentifiers.signedData);
-
-        BERSequenceGenerator sigGen = new BERSequenceGenerator(sGen.getRawOutputStream(), 0, true);
-
-        // version number
-        sigGen.addObject(signedData.getVersion());
-
-        // digests
-        signedData.getDigestAlgorithms().toASN1Primitive();  // skip old ones
-
-        ASN1EncodableVector digestAlgs = new ASN1EncodableVector();
-
-        for (Iterator it = signerInformationStore.getSigners().iterator(); it.hasNext();)
-        {
-            SignerInformation signer = (SignerInformation)it.next();
-            digestAlgs.add(CMSSignedHelper.INSTANCE.fixAlgID(signer.getDigestAlgorithmID()));
-        }
-
-        sigGen.getRawOutputStream().write(new DERSet(digestAlgs).getEncoded());
-
-        // encap content info
-        ContentInfoParser encapContentInfo = signedData.getEncapContentInfo();
-
-        BERSequenceGenerator eiGen = new BERSequenceGenerator(sigGen.getRawOutputStream());
-
-        eiGen.addObject(encapContentInfo.getContentType());
-
-        pipeEncapsulatedOctetString(encapContentInfo, eiGen.getRawOutputStream());
-
-        eiGen.close();
-
-
-        writeSetToGeneratorTagged(sigGen, signedData.getCertificates(), 0);
-        writeSetToGeneratorTagged(sigGen, signedData.getCrls(), 1);
-
-
-        ASN1EncodableVector signerInfos = new ASN1EncodableVector();
-        for (Iterator it = signerInformationStore.getSigners().iterator(); it.hasNext();)
-        {
-            SignerInformation        signer = (SignerInformation)it.next();
-
-            signerInfos.add(signer.toASN1Structure());
-        }
-
-        sigGen.getRawOutputStream().write(new DERSet(signerInfos).getEncoded());
-
-        sigGen.close();
-
-        sGen.close();
-
-        return out;
-    }
-
-    /**
-     * Replace the certificate and CRL information associated with this
-     * CMSSignedData object with the new one passed in.
-     * <p>
-     * The output stream is returned unclosed.
-     * </p>
-     * @param original the signed data stream to be used as a base.
-     * @param certs new certificates to be used, if any.
-     * @param crls new CRLs to be used, if any.
-     * @param attrCerts new attribute certificates to be used, if any.
-     * @param out the stream to write the new signed data object to.
-     * @return out.
-     * @exception CMSException if there is an error processing the CertStore
-     */
-    public static OutputStream replaceCertificatesAndCRLs(
-        InputStream   original,
-        Store         certs,
-        Store         crls,
-        Store         attrCerts,
-        OutputStream  out)
-        throws CMSException, IOException
-    {
-        ASN1StreamParser in = new ASN1StreamParser(original);
-        ContentInfoParser contentInfo = new ContentInfoParser((ASN1SequenceParser)in.readObject());
-        SignedDataParser signedData = SignedDataParser.getInstance(contentInfo.getContent(BERTags.SEQUENCE));
-
-        BERSequenceGenerator sGen = new BERSequenceGenerator(out);
-
-        sGen.addObject(CMSObjectIdentifiers.signedData);
-
-        BERSequenceGenerator sigGen = new BERSequenceGenerator(sGen.getRawOutputStream(), 0, true);
-
-        // version number
-        sigGen.addObject(signedData.getVersion());
-
-        // digests
-        sigGen.getRawOutputStream().write(signedData.getDigestAlgorithms().toASN1Primitive().getEncoded());
-
-        // encap content info
-        ContentInfoParser encapContentInfo = signedData.getEncapContentInfo();
-
-        BERSequenceGenerator eiGen = new BERSequenceGenerator(sigGen.getRawOutputStream());
-
-        eiGen.addObject(encapContentInfo.getContentType());
-
-        pipeEncapsulatedOctetString(encapContentInfo, eiGen.getRawOutputStream());
-
-        eiGen.close();
-
-        //
-        // skip existing certs and CRLs
-        //
-        getASN1Set(signedData.getCertificates());
-        getASN1Set(signedData.getCrls());
-
-        //
-        // replace the certs and crls in the SignedData object
-        //
-        if (certs != null || attrCerts != null)
-        {
-            List certificates = new ArrayList();
-
-            if (certs != null)
-            {
-                certificates.addAll(CMSUtils.getCertificatesFromStore(certs));
-            }
-            if (attrCerts != null)
-            {
-                certificates.addAll(CMSUtils.getAttributeCertificatesFromStore(attrCerts));
-            }
-
-            ASN1Set asn1Certs = CMSUtils.createBerSetFromList(certificates);
-
-            if (asn1Certs.size() > 0)
-            {
-                sigGen.getRawOutputStream().write(new DERTaggedObject(false, 0, asn1Certs).getEncoded());
-            }
-        }
-
-        if (crls != null)
-        {
-            ASN1Set asn1Crls = CMSUtils.createBerSetFromList(CMSUtils.getCRLsFromStore(crls));
-
-            if (asn1Crls.size() > 0)
-            {
-                sigGen.getRawOutputStream().write(new DERTaggedObject(false, 1, asn1Crls).getEncoded());
-            }
-        }
-
-        sigGen.getRawOutputStream().write(signedData.getSignerInfos().toASN1Primitive().getEncoded());
-
-        sigGen.close();
-
-        sGen.close();
-
-        return out;
-    }
-
-    private static void writeSetToGeneratorTagged(
-        ASN1Generator asn1Gen,
-        ASN1SetParser asn1SetParser,
-        int           tagNo)
-        throws IOException
-    {
-        ASN1Set asn1Set = getASN1Set(asn1SetParser);
-
-        if (asn1Set != null)
-        {
-            if (asn1SetParser instanceof BERSetParser)
-            {
-                asn1Gen.getRawOutputStream().write(new BERTaggedObject(false, tagNo, asn1Set).getEncoded());
-            }
-            else
-            {
-                asn1Gen.getRawOutputStream().write(new DERTaggedObject(false, tagNo, asn1Set).getEncoded());
-            }
-        }
-    }
-
-    private static ASN1Set getASN1Set(
-        ASN1SetParser asn1SetParser)
-    {
-        return asn1SetParser == null
-            ?   null
-            :   ASN1Set.getInstance(asn1SetParser.toASN1Primitive());
-    }
-
-    private static void pipeEncapsulatedOctetString(ContentInfoParser encapContentInfo,
-        OutputStream rawOutputStream) throws IOException
-    {
-        ASN1OctetStringParser octs = (ASN1OctetStringParser)
-            encapContentInfo.getContent(BERTags.OCTET_STRING);
-
-        if (octs != null)
-        {
-            pipeOctetString(octs, rawOutputStream);
-        }
-
-//        BERTaggedObjectParser contentObject = (BERTaggedObjectParser)encapContentInfo.getContentObject();
-//        if (contentObject != null)
-//        {
-//            // Handle IndefiniteLengthInputStream safely
-//            InputStream input = ASN1StreamParser.getSafeRawInputStream(contentObject.getContentStream(true));
-//
-//            // TODO BerTaggedObjectGenerator?
-//            BEROutputStream berOut = new BEROutputStream(rawOutputStream);
-//            berOut.write(DERTags.CONSTRUCTED | DERTags.TAGGED | 0);
-//            berOut.write(0x80);
-//
-//            pipeRawOctetString(input, rawOutputStream);
-//
-//            berOut.write(0x00);
-//            berOut.write(0x00);
-//
-//            input.close();
-//        }
-    }
-
-    private static void pipeOctetString(
-        ASN1OctetStringParser octs,
-        OutputStream          output)
-        throws IOException
-    {
-        // TODO Allow specification of a specific fragment size?
-        OutputStream outOctets = CMSUtils.createBEROctetOutputStream(
-            output, 0, true, 0);
-        Streams.pipeAll(octs.getOctetStream(), outOctets);
-        outOctets.close();
-    }
-
-//    private static void pipeRawOctetString(
-//        InputStream     rawInput,
-//        OutputStream    rawOutput)
-//        throws IOException
-//    {
-//        InputStream tee = new TeeInputStream(rawInput, rawOutput);
-//        ASN1StreamParser sp = new ASN1StreamParser(tee);
-//        ASN1OctetStringParser octs = (ASN1OctetStringParser)sp.readObject();
-//        Streams.drain(octs.getOctetStream());
-//    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cms/CMSSignedDataStreamGenerator.java b/bcpkix/src/main/java/org/bouncycastle/cms/CMSSignedDataStreamGenerator.java
deleted file mode 100644
index 1e09b48..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cms/CMSSignedDataStreamGenerator.java
+++ /dev/null
@@ -1,486 +0,0 @@
-package org.bouncycastle.cms;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.Iterator;
-import java.util.List;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1Set;
-import org.bouncycastle.asn1.ASN1TaggedObject;
-import org.bouncycastle.asn1.BERSequenceGenerator;
-import org.bouncycastle.asn1.BERTaggedObject;
-import org.bouncycastle.asn1.DERSet;
-import org.bouncycastle.asn1.cms.CMSObjectIdentifiers;
-import org.bouncycastle.asn1.cms.SignerInfo;
-
-/**
- * General class for generating a pkcs7-signature message stream.
- * <p>
- * A simple example of usage.
- * </p>
- * <pre>
- *      X509Certificate signCert = ...
- *      certList.add(signCert);
- *
- *      Store           certs = new JcaCertStore(certList);
- *      ContentSigner sha1Signer = new JcaContentSignerBuilder("SHA1withRSA").setProvider("BC").build(signKP.getPrivate());
- *
- *      CMSSignedDataStreamGenerator gen = new CMSSignedDataStreamGenerator();
- *  
- *      gen.addSignerInfoGenerator(
- *                new JcaSignerInfoGeneratorBuilder(
- *                     new JcaDigestCalculatorProviderBuilder().setProvider("BC").build())
- *                     .build(sha1Signer, signCert));
- *
- *      gen.addCertificates(certs);
- *  
- *      OutputStream sigOut = gen.open(bOut);
- *  
- *      sigOut.write("Hello World!".getBytes());
- *      
- *      sigOut.close();
- * </pre>
- */
-public class CMSSignedDataStreamGenerator
-    extends CMSSignedGenerator
-{
-    private int  _bufferSize;
-
-    /**
-     * base constructor
-     */
-    public CMSSignedDataStreamGenerator()
-    {
-    }
-
-    /**
-     * Set the underlying string size for encapsulated data
-     * 
-     * @param bufferSize length of octet strings to buffer the data.
-     */
-    public void setBufferSize(
-        int bufferSize)
-    {
-        _bufferSize = bufferSize;
-    }
-
-    /**
-     * generate a signed object that for a CMS Signed Data
-     * object using the given provider.
-     */
-    public OutputStream open(
-        OutputStream out)
-        throws IOException
-    {
-        return open(out, false);
-    }
-
-    /**
-     * generate a signed object that for a CMS Signed Data
-     * object using the given provider - if encapsulate is true a copy
-     * of the message will be included in the signature with the
-     * default content type "data".
-     */
-    public OutputStream open(
-        OutputStream out,
-        boolean      encapsulate)
-        throws IOException
-    {
-        return open(CMSObjectIdentifiers.data, out, encapsulate);
-    }
-
-    /**
-     * generate a signed object that for a CMS Signed Data
-     * object using the given provider - if encapsulate is true a copy
-     * of the message will be included in the signature with the
-     * default content type "data". If dataOutputStream is non null the data
-     * being signed will be written to the stream as it is processed.
-     * @param out stream the CMS object is to be written to.
-     * @param encapsulate true if data should be encapsulated.
-     * @param dataOutputStream output stream to copy the data being signed to.
-     */
-    public OutputStream open(
-        OutputStream out,
-        boolean      encapsulate,
-        OutputStream dataOutputStream)
-        throws IOException
-    {
-        return open(CMSObjectIdentifiers.data, out, encapsulate, dataOutputStream);
-    }
-
-    /**
-     * generate a signed object that for a CMS Signed Data
-     * object using the given provider - if encapsulate is true a copy
-     * of the message will be included in the signature. The content type
-     * is set according to the OID represented by the string signedContentType.
-     */
-    public OutputStream open(
-        ASN1ObjectIdentifier eContentType,
-        OutputStream out,
-        boolean encapsulate)
-        throws IOException
-    {
-        return open(eContentType, out, encapsulate, null);
-    }
-
-    /**
-     * generate a signed object that for a CMS Signed Data
-     * object using the given provider - if encapsulate is true a copy
-     * of the message will be included in the signature. The content type
-     * is set according to the OID represented by the string signedContentType.
-     * @param eContentType OID for data to be signed.
-     * @param out stream the CMS object is to be written to.
-     * @param encapsulate true if data should be encapsulated.
-     * @param dataOutputStream output stream to copy the data being signed to.
-     */
-    public OutputStream open(
-        ASN1ObjectIdentifier eContentType,
-        OutputStream out,
-        boolean encapsulate,
-        OutputStream dataOutputStream)
-        throws IOException
-    {
-        // TODO
-//        if (_signerInfs.isEmpty())
-//        {
-//            /* RFC 3852 5.2
-//             * "In the degenerate case where there are no signers, the
-//             * EncapsulatedContentInfo value being "signed" is irrelevant.  In this
-//             * case, the content type within the EncapsulatedContentInfo value being
-//             * "signed" MUST be id-data (as defined in section 4), and the content
-//             * field of the EncapsulatedContentInfo value MUST be omitted."
-//             */
-//            if (encapsulate)
-//            {
-//                throw new IllegalArgumentException("no signers, encapsulate must be false");
-//            }
-//            if (!DATA.equals(eContentType))
-//            {
-//                throw new IllegalArgumentException("no signers, eContentType must be id-data");
-//            }
-//        }
-//
-//        if (!DATA.equals(eContentType))
-//        {
-//            /* RFC 3852 5.3
-//             * [The 'signedAttrs']...
-//             * field is optional, but it MUST be present if the content type of
-//             * the EncapsulatedContentInfo value being signed is not id-data.
-//             */
-//            // TODO signedAttrs must be present for all signers
-//        }
-
-        //
-        // ContentInfo
-        //
-        BERSequenceGenerator sGen = new BERSequenceGenerator(out);
-        
-        sGen.addObject(CMSObjectIdentifiers.signedData);
-        
-        //
-        // Signed Data
-        //
-        BERSequenceGenerator sigGen = new BERSequenceGenerator(sGen.getRawOutputStream(), 0, true);
-        
-        sigGen.addObject(calculateVersion(eContentType));
-        
-        ASN1EncodableVector  digestAlgs = new ASN1EncodableVector();
-        
-        //
-        // add the precalculated SignerInfo digest algorithms.
-        //
-        for (Iterator it = _signers.iterator(); it.hasNext();)
-        {
-            SignerInformation signer = (SignerInformation)it.next();
-            digestAlgs.add(CMSSignedHelper.INSTANCE.fixAlgID(signer.getDigestAlgorithmID()));
-        }
-        
-        //
-        // add the new digests
-        //
-
-        for (Iterator it = signerGens.iterator(); it.hasNext();)
-        {
-            SignerInfoGenerator signerGen = (SignerInfoGenerator)it.next();
-
-            digestAlgs.add(signerGen.getDigestAlgorithm());
-        }
-
-        sigGen.getRawOutputStream().write(new DERSet(digestAlgs).getEncoded());
-        
-        BERSequenceGenerator eiGen = new BERSequenceGenerator(sigGen.getRawOutputStream());
-        eiGen.addObject(eContentType);
-
-        // If encapsulating, add the data as an octet string in the sequence
-        OutputStream encapStream = encapsulate
-            ? CMSUtils.createBEROctetOutputStream(eiGen.getRawOutputStream(), 0, true, _bufferSize)
-            : null;
-
-        // Also send the data to 'dataOutputStream' if necessary
-        OutputStream contentStream = CMSUtils.getSafeTeeOutputStream(dataOutputStream, encapStream);
-
-        // Let all the signers see the data as it is written
-        OutputStream sigStream = CMSUtils.attachSignersToOutputStream(signerGens, contentStream);
-
-        return new CmsSignedDataOutputStream(sigStream, eContentType, sGen, sigGen, eiGen);
-    }
-
-    // RFC3852, section 5.1:
-    // IF ((certificates is present) AND
-    //    (any certificates with a type of other are present)) OR
-    //    ((crls is present) AND
-    //    (any crls with a type of other are present))
-    // THEN version MUST be 5
-    // ELSE
-    //    IF (certificates is present) AND
-    //       (any version 2 attribute certificates are present)
-    //    THEN version MUST be 4
-    //    ELSE
-    //       IF ((certificates is present) AND
-    //          (any version 1 attribute certificates are present)) OR
-    //          (any SignerInfo structures are version 3) OR
-    //          (encapContentInfo eContentType is other than id-data)
-    //       THEN version MUST be 3
-    //       ELSE version MUST be 1
-    //
-    private ASN1Integer calculateVersion(
-        ASN1ObjectIdentifier contentOid)
-    {
-        boolean otherCert = false;
-        boolean otherCrl = false;
-        boolean attrCertV1Found = false;
-        boolean attrCertV2Found = false;
-
-        if (certs != null)
-        {
-            for (Iterator it = certs.iterator(); it.hasNext();)
-            {
-                Object obj = it.next();
-                if (obj instanceof ASN1TaggedObject)
-                {
-                    ASN1TaggedObject tagged = (ASN1TaggedObject)obj;
-
-                    if (tagged.getTagNo() == 1)
-                    {
-                        attrCertV1Found = true;
-                    }
-                    else if (tagged.getTagNo() == 2)
-                    {
-                        attrCertV2Found = true;
-                    }
-                    else if (tagged.getTagNo() == 3)
-                    {
-                        otherCert = true;
-                    }
-                }
-            }
-        }
-
-        if (otherCert)
-        {
-            return new ASN1Integer(5);
-        }
-
-        if (crls != null)         // no need to check if otherCert is true
-        {
-            for (Iterator it = crls.iterator(); it.hasNext();)
-            {
-                Object obj = it.next();
-                if (obj instanceof ASN1TaggedObject)
-                {
-                    otherCrl = true;
-                }
-            }
-        }
-
-        if (otherCrl)
-        {
-            return new ASN1Integer(5);
-        }
-
-        if (attrCertV2Found)
-        {
-            return new ASN1Integer(4);
-        }
-
-        if (attrCertV1Found)
-        {
-            return new ASN1Integer(3);
-        }
-
-        if (checkForVersion3(_signers, signerGens))
-        {
-            return new ASN1Integer(3);
-        }
-
-        if (!CMSObjectIdentifiers.data.equals(contentOid))
-        {
-            return new ASN1Integer(3);
-        }
-
-        return new ASN1Integer(1);
-    }
-
-    private boolean checkForVersion3(List signerInfos, List signerInfoGens)
-    {
-        for (Iterator it = signerInfos.iterator(); it.hasNext();)
-        {
-            SignerInfo s = SignerInfo.getInstance(((SignerInformation)it.next()).toASN1Structure());
-
-            if (s.getVersion().getValue().intValue() == 3)
-            {
-                return true;
-            }
-        }
-
-        for (Iterator it = signerInfoGens.iterator(); it.hasNext();)
-        {
-            SignerInfoGenerator s = (SignerInfoGenerator)it.next();
-
-            if (s.getGeneratedVersion() == 3)
-            {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    private class CmsSignedDataOutputStream
-        extends OutputStream
-    {
-        private OutputStream         _out;
-        private ASN1ObjectIdentifier _contentOID;
-        private BERSequenceGenerator _sGen;
-        private BERSequenceGenerator _sigGen;
-        private BERSequenceGenerator _eiGen;
-
-        public CmsSignedDataOutputStream(
-            OutputStream         out,
-            ASN1ObjectIdentifier contentOID,
-            BERSequenceGenerator sGen,
-            BERSequenceGenerator sigGen,
-            BERSequenceGenerator eiGen)
-        {
-            _out = out;
-            _contentOID = contentOID;
-            _sGen = sGen;
-            _sigGen = sigGen;
-            _eiGen = eiGen;
-        }
-
-        public void write(
-            int b)
-            throws IOException
-        {
-            _out.write(b);
-        }
-        
-        public void write(
-            byte[] bytes,
-            int    off,
-            int    len)
-            throws IOException
-        {
-            _out.write(bytes, off, len);
-        }
-        
-        public void write(
-            byte[] bytes)
-            throws IOException
-        {
-            _out.write(bytes);
-        }
-        
-        public void close()
-            throws IOException
-        {
-            _out.close();
-            _eiGen.close();
-
-            digests.clear();    // clear the current preserved digest state
-
-            if (certs.size() != 0)
-            {
-                ASN1Set certSet = CMSUtils.createBerSetFromList(certs);
-
-                _sigGen.getRawOutputStream().write(new BERTaggedObject(false, 0, certSet).getEncoded());
-            }
-
-            if (crls.size() != 0)
-            {
-                ASN1Set crlSet = CMSUtils.createBerSetFromList(crls);
-
-                _sigGen.getRawOutputStream().write(new BERTaggedObject(false, 1, crlSet).getEncoded());
-            }
-
-            //
-            // collect all the SignerInfo objects
-            //
-            ASN1EncodableVector signerInfos = new ASN1EncodableVector();
-
-            //
-            // add the generated SignerInfo objects
-            //
-
-            for (Iterator it = signerGens.iterator(); it.hasNext();)
-            {
-                SignerInfoGenerator sigGen = (SignerInfoGenerator)it.next();
-
-
-                try
-                {
-                    signerInfos.add(sigGen.generate(_contentOID));
-
-                    byte[] calculatedDigest = sigGen.getCalculatedDigest();
-
-                    digests.put(sigGen.getDigestAlgorithm().getAlgorithm().getId(), calculatedDigest);
-                }
-                catch (CMSException e)
-                {
-                    throw new CMSStreamException("exception generating signers: " + e.getMessage(), e);
-                }
-            }
-
-            //
-            // add the precalculated SignerInfo objects
-            //
-            {
-                Iterator it = _signers.iterator();
-                while (it.hasNext())
-                {
-                    SignerInformation signer = (SignerInformation)it.next();
-
-                    // TODO Verify the content type and calculated digest match the precalculated SignerInfo
-//                    if (!signer.getContentType().equals(_contentOID))
-//                    {
-//                        // TODO The precalculated content type did not match - error?
-//                    }
-//                    
-//                    byte[] calculatedDigest = (byte[])_digests.get(signer.getDigestAlgOID());
-//                    if (calculatedDigest == null)
-//                    {
-//                        // TODO We can't confirm this digest because we didn't calculate it - error?
-//                    }
-//                    else
-//                    {
-//                        if (!Arrays.areEqual(signer.getContentDigest(), calculatedDigest))
-//                        {
-//                            // TODO The precalculated digest did not match - error?
-//                        }
-//                    }
-
-                    signerInfos.add(signer.toASN1Structure());
-                }
-            }
-            
-            _sigGen.getRawOutputStream().write(new DERSet(signerInfos).getEncoded());
-
-            _sigGen.close();
-            _sGen.close();
-        }
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cms/CMSSignedGenerator.java b/bcpkix/src/main/java/org/bouncycastle/cms/CMSSignedGenerator.java
index 9fe6779..f180c09 100644
--- a/bcpkix/src/main/java/org/bouncycastle/cms/CMSSignedGenerator.java
+++ b/bcpkix/src/main/java/org/bouncycastle/cms/CMSSignedGenerator.java
@@ -12,8 +12,10 @@ import org.bouncycastle.asn1.ASN1Encodable;
 import org.bouncycastle.asn1.ASN1ObjectIdentifier;
 import org.bouncycastle.asn1.DERTaggedObject;
 import org.bouncycastle.asn1.cms.CMSObjectIdentifiers;
-import org.bouncycastle.asn1.cms.OtherRevocationInfoFormat;
-import org.bouncycastle.asn1.cryptopro.CryptoProObjectIdentifiers;
+// BEGIN android-removed
+// import org.bouncycastle.asn1.cms.OtherRevocationInfoFormat;
+// import org.bouncycastle.asn1.cryptopro.CryptoProObjectIdentifiers;
+// END android-removed
 import org.bouncycastle.asn1.nist.NISTObjectIdentifiers;
 import org.bouncycastle.asn1.oiw.OIWObjectIdentifiers;
 import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
@@ -39,17 +41,21 @@ public class CMSSignedGenerator
     public static final String  DIGEST_SHA384 = NISTObjectIdentifiers.id_sha384.getId();
     public static final String  DIGEST_SHA512 = NISTObjectIdentifiers.id_sha512.getId();
     public static final String  DIGEST_MD5 = PKCSObjectIdentifiers.md5.getId();
-    public static final String  DIGEST_GOST3411 = CryptoProObjectIdentifiers.gostR3411.getId();
-    public static final String  DIGEST_RIPEMD128 = TeleTrusTObjectIdentifiers.ripemd128.getId();
-    public static final String  DIGEST_RIPEMD160 = TeleTrusTObjectIdentifiers.ripemd160.getId();
-    public static final String  DIGEST_RIPEMD256 = TeleTrusTObjectIdentifiers.ripemd256.getId();
+    // BEGIN android-removed
+    // public static final String  DIGEST_GOST3411 = CryptoProObjectIdentifiers.gostR3411.getId();
+    // public static final String  DIGEST_RIPEMD128 = TeleTrusTObjectIdentifiers.ripemd128.getId();
+    // public static final String  DIGEST_RIPEMD160 = TeleTrusTObjectIdentifiers.ripemd160.getId();
+    // public static final String  DIGEST_RIPEMD256 = TeleTrusTObjectIdentifiers.ripemd256.getId();
+    // END android-removed
 
     public static final String  ENCRYPTION_RSA = PKCSObjectIdentifiers.rsaEncryption.getId();
     public static final String  ENCRYPTION_DSA = X9ObjectIdentifiers.id_dsa_with_sha1.getId();
     public static final String  ENCRYPTION_ECDSA = X9ObjectIdentifiers.ecdsa_with_SHA1.getId();
     public static final String  ENCRYPTION_RSA_PSS = PKCSObjectIdentifiers.id_RSASSA_PSS.getId();
-    public static final String  ENCRYPTION_GOST3410 = CryptoProObjectIdentifiers.gostR3410_94.getId();
-    public static final String  ENCRYPTION_ECGOST3410 = CryptoProObjectIdentifiers.gostR3410_2001.getId();
+    // BEGIN android-removed
+    // public static final String  ENCRYPTION_GOST3410 = CryptoProObjectIdentifiers.gostR3410_94.getId();
+    // public static final String  ENCRYPTION_ECGOST3410 = CryptoProObjectIdentifiers.gostR3410_2001.getId();
+    // END android-removed
 
     private static final String  ENCRYPTION_ECDSA_WITH_SHA1 = X9ObjectIdentifiers.ecdsa_with_SHA1.getId();
     private static final String  ENCRYPTION_ECDSA_WITH_SHA224 = X9ObjectIdentifiers.ecdsa_with_SHA224.getId();
@@ -174,31 +180,33 @@ public class CMSSignedGenerator
         certs.addAll(CMSUtils.getAttributeCertificatesFromStore(attrStore));
     }
 
-    /**
-     * Add a single instance of otherRevocationData to the CRL set to be included with the generated SignedData message.
-     *
-     * @param otherRevocationInfoFormat the OID specifying the format of the otherRevocationInfo data.
-     * @param otherRevocationInfo the otherRevocationInfo ASN.1 structure.
-     */
-    public void addOtherRevocationInfo(
-        ASN1ObjectIdentifier   otherRevocationInfoFormat,
-        ASN1Encodable          otherRevocationInfo)
-    {
-        crls.add(new DERTaggedObject(false, 1, new OtherRevocationInfoFormat(otherRevocationInfoFormat, otherRevocationInfo)));
-    }
-
-    /**
-     * Add a Store of otherRevocationData to the CRL set to be included with the generated SignedData message.
-     *
-     * @param otherRevocationInfoFormat the OID specifying the format of the otherRevocationInfo data.
-     * @param otherRevocationInfos a Store of otherRevocationInfo data to add.
-     */
-    public void addOtherRevocationInfo(
-        ASN1ObjectIdentifier   otherRevocationInfoFormat,
-        Store                  otherRevocationInfos)
-    {
-        crls.addAll(CMSUtils.getOthersFromStore(otherRevocationInfoFormat, otherRevocationInfos));
-    }
+    // BEGIN android-removed
+    // /**
+    //  * Add a single instance of otherRevocationData to the CRL set to be included with the generated SignedData message.
+    //  *
+    //  * @param otherRevocationInfoFormat the OID specifying the format of the otherRevocationInfo data.
+    //  * @param otherRevocationInfo the otherRevocationInfo ASN.1 structure.
+    //  */
+    // public void addOtherRevocationInfo(
+    //     ASN1ObjectIdentifier   otherRevocationInfoFormat,
+    //     ASN1Encodable          otherRevocationInfo)
+    // {
+    //     crls.add(new DERTaggedObject(false, 1, new OtherRevocationInfoFormat(otherRevocationInfoFormat, otherRevocationInfo)));
+    // }
+    //
+    // /**
+    //  * Add a Store of otherRevocationData to the CRL set to be included with the generated SignedData message.
+    //  *
+    //  * @param otherRevocationInfoFormat the OID specifying the format of the otherRevocationInfo data.
+    //  * @param otherRevocationInfos a Store of otherRevocationInfo data to add.
+    //  */
+    // public void addOtherRevocationInfo(
+    //     ASN1ObjectIdentifier   otherRevocationInfoFormat,
+    //     Store                  otherRevocationInfos)
+    // {
+    //     crls.addAll(CMSUtils.getOthersFromStore(otherRevocationInfoFormat, otherRevocationInfos));
+    // }
+    // END android-removed
 
     /**
      * Add a store of pre-calculated signers to the generator.
diff --git a/bcpkix/src/main/java/org/bouncycastle/cms/CMSSignedHelper.java b/bcpkix/src/main/java/org/bouncycastle/cms/CMSSignedHelper.java
index 2f98e69..11a927c 100644
--- a/bcpkix/src/main/java/org/bouncycastle/cms/CMSSignedHelper.java
+++ b/bcpkix/src/main/java/org/bouncycastle/cms/CMSSignedHelper.java
@@ -13,8 +13,10 @@ import org.bouncycastle.asn1.ASN1Sequence;
 import org.bouncycastle.asn1.ASN1Set;
 import org.bouncycastle.asn1.ASN1TaggedObject;
 import org.bouncycastle.asn1.DERNull;
-import org.bouncycastle.asn1.cms.OtherRevocationInfoFormat;
-import org.bouncycastle.asn1.cryptopro.CryptoProObjectIdentifiers;
+// BEGIN android-removed
+// import org.bouncycastle.asn1.cms.OtherRevocationInfoFormat;
+// import org.bouncycastle.asn1.cryptopro.CryptoProObjectIdentifiers;
+// END android-removed
 import org.bouncycastle.asn1.eac.EACObjectIdentifiers;
 import org.bouncycastle.asn1.nist.NISTObjectIdentifiers;
 import org.bouncycastle.asn1.oiw.OIWObjectIdentifiers;
@@ -53,12 +55,16 @@ class CMSSignedHelper
         addEntries(NISTObjectIdentifiers.dsa_with_sha384, "SHA384", "DSA");
         addEntries(NISTObjectIdentifiers.dsa_with_sha512, "SHA512", "DSA");
         addEntries(OIWObjectIdentifiers.dsaWithSHA1, "SHA1", "DSA");
-        addEntries(OIWObjectIdentifiers.md4WithRSA, "MD4", "RSA");
-        addEntries(OIWObjectIdentifiers.md4WithRSAEncryption, "MD4", "RSA");
+        // BEGIN android-removed
+        // addEntries(OIWObjectIdentifiers.md4WithRSA, "MD4", "RSA");
+        // addEntries(OIWObjectIdentifiers.md4WithRSAEncryption, "MD4", "RSA");
+        // END android-removed
         addEntries(OIWObjectIdentifiers.md5WithRSA, "MD5", "RSA");
         addEntries(OIWObjectIdentifiers.sha1WithRSA, "SHA1", "RSA");
-        addEntries(PKCSObjectIdentifiers.md2WithRSAEncryption, "MD2", "RSA");
-        addEntries(PKCSObjectIdentifiers.md4WithRSAEncryption, "MD4", "RSA");
+        // BEGIN android-removed
+        // addEntries(PKCSObjectIdentifiers.md2WithRSAEncryption, "MD2", "RSA");
+        // addEntries(PKCSObjectIdentifiers.md4WithRSAEncryption, "MD4", "RSA");
+        // END android-removed
         addEntries(PKCSObjectIdentifiers.md5WithRSAEncryption, "MD5", "RSA");
         addEntries(PKCSObjectIdentifiers.sha1WithRSAEncryption, "SHA1", "RSA");
         addEntries(PKCSObjectIdentifiers.sha224WithRSAEncryption, "SHA224", "RSA");
@@ -85,27 +91,31 @@ class CMSSignedHelper
         encryptionAlgs.put(PKCSObjectIdentifiers.rsaEncryption.getId(), "RSA");
         encryptionAlgs.put(TeleTrusTObjectIdentifiers.teleTrusTRSAsignatureAlgorithm, "RSA");
         encryptionAlgs.put(X509ObjectIdentifiers.id_ea_rsa.getId(), "RSA");
-        encryptionAlgs.put(CMSSignedDataGenerator.ENCRYPTION_RSA_PSS, "RSAandMGF1");
-        encryptionAlgs.put(CryptoProObjectIdentifiers.gostR3410_94.getId(), "GOST3410");
-        encryptionAlgs.put(CryptoProObjectIdentifiers.gostR3410_2001.getId(), "ECGOST3410");
-        encryptionAlgs.put("1.3.6.1.4.1.5849.1.6.2", "ECGOST3410");
-        encryptionAlgs.put("1.3.6.1.4.1.5849.1.1.5", "GOST3410");
-        encryptionAlgs.put(CryptoProObjectIdentifiers.gostR3411_94_with_gostR3410_2001.getId(), "ECGOST3410");
-        encryptionAlgs.put(CryptoProObjectIdentifiers.gostR3411_94_with_gostR3410_94.getId(), "GOST3410");
-
-        digestAlgs.put(PKCSObjectIdentifiers.md2.getId(), "MD2");
-        digestAlgs.put(PKCSObjectIdentifiers.md4.getId(), "MD4");
+        // BEGIN android-removed
+        // encryptionAlgs.put(CMSSignedDataGenerator.ENCRYPTION_RSA_PSS, "RSAandMGF1");
+        // encryptionAlgs.put(CryptoProObjectIdentifiers.gostR3410_94.getId(), "GOST3410");
+        // encryptionAlgs.put(CryptoProObjectIdentifiers.gostR3410_2001.getId(), "ECGOST3410");
+        // encryptionAlgs.put("1.3.6.1.4.1.5849.1.6.2", "ECGOST3410");
+        // encryptionAlgs.put("1.3.6.1.4.1.5849.1.1.5", "GOST3410");
+        // encryptionAlgs.put(CryptoProObjectIdentifiers.gostR3411_94_with_gostR3410_2001.getId(), "ECGOST3410");
+        // encryptionAlgs.put(CryptoProObjectIdentifiers.gostR3411_94_with_gostR3410_94.getId(), "GOST3410");
+        //
+        // digestAlgs.put(PKCSObjectIdentifiers.md2.getId(), "MD2");
+        // digestAlgs.put(PKCSObjectIdentifiers.md4.getId(), "MD4");
+        // END android-removed
         digestAlgs.put(PKCSObjectIdentifiers.md5.getId(), "MD5");
         digestAlgs.put(OIWObjectIdentifiers.idSHA1.getId(), "SHA1");
         digestAlgs.put(NISTObjectIdentifiers.id_sha224.getId(), "SHA224");
         digestAlgs.put(NISTObjectIdentifiers.id_sha256.getId(), "SHA256");
         digestAlgs.put(NISTObjectIdentifiers.id_sha384.getId(), "SHA384");
         digestAlgs.put(NISTObjectIdentifiers.id_sha512.getId(), "SHA512");
-        digestAlgs.put(TeleTrusTObjectIdentifiers.ripemd128.getId(), "RIPEMD128");
-        digestAlgs.put(TeleTrusTObjectIdentifiers.ripemd160.getId(), "RIPEMD160");
-        digestAlgs.put(TeleTrusTObjectIdentifiers.ripemd256.getId(), "RIPEMD256");
-        digestAlgs.put(CryptoProObjectIdentifiers.gostR3411.getId(),  "GOST3411");
-        digestAlgs.put("1.3.6.1.4.1.5849.1.2.1",  "GOST3411");
+        // BEGIN android-removed
+        // digestAlgs.put(TeleTrusTObjectIdentifiers.ripemd128.getId(), "RIPEMD128");
+        // digestAlgs.put(TeleTrusTObjectIdentifiers.ripemd160.getId(), "RIPEMD160");
+        // digestAlgs.put(TeleTrusTObjectIdentifiers.ripemd256.getId(), "RIPEMD256");
+        // digestAlgs.put(CryptoProObjectIdentifiers.gostR3411.getId(),  "GOST3411");
+        // digestAlgs.put("1.3.6.1.4.1.5849.1.2.1",  "GOST3411");
+        // END android-removed
 
         digestAliases.put("SHA1", new String[] { "SHA-1" });
         digestAliases.put("SHA224", new String[] { "SHA-224" });
@@ -219,35 +229,35 @@ class CMSSignedHelper
         return new CollectionStore(new ArrayList());
     }
 
-    Store getOtherRevocationInfo(ASN1ObjectIdentifier otherRevocationInfoFormat, ASN1Set crlSet)
-    {
-        if (crlSet != null)
-        {
-            List    crlList = new ArrayList(crlSet.size());
-
-            for (Enumeration en = crlSet.getObjects(); en.hasMoreElements();)
-            {
-                ASN1Primitive obj = ((ASN1Encodable)en.nextElement()).toASN1Primitive();
-
-                if (obj instanceof ASN1TaggedObject)
-                {
-                    ASN1TaggedObject tObj = ASN1TaggedObject.getInstance(obj);
-
-                    if (tObj.getTagNo() == 1)
-                    {
-                        OtherRevocationInfoFormat other = OtherRevocationInfoFormat.getInstance(tObj, false);
-
-                        if (otherRevocationInfoFormat.equals(other.getInfoFormat()))
-                        {
-                            crlList.add(other.getInfo());
-                        }
-                    }
-                }
-            }
-
-            return new CollectionStore(crlList);
-        }
-
-        return new CollectionStore(new ArrayList());
-    }
+    // Store getOtherRevocationInfo(ASN1ObjectIdentifier otherRevocationInfoFormat, ASN1Set crlSet)
+    // {
+    //     if (crlSet != null)
+    //     {
+    //         List    crlList = new ArrayList(crlSet.size());
+    //
+    //         for (Enumeration en = crlSet.getObjects(); en.hasMoreElements();)
+    //         {
+    //             ASN1Primitive obj = ((ASN1Encodable)en.nextElement()).toASN1Primitive();
+    //
+    //             if (obj instanceof ASN1TaggedObject)
+    //             {
+    //                 ASN1TaggedObject tObj = ASN1TaggedObject.getInstance(obj);
+    //
+    //                 if (tObj.getTagNo() == 1)
+    //                 {
+    //                     OtherRevocationInfoFormat other = OtherRevocationInfoFormat.getInstance(tObj, false);
+    //
+    //                     if (otherRevocationInfoFormat.equals(other.getInfoFormat()))
+    //                     {
+    //                         crlList.add(other.getInfo());
+    //                     }
+    //                 }
+    //             }
+    //         }
+    //
+    //         return new CollectionStore(crlList);
+    //     }
+    //
+    //     return new CollectionStore(new ArrayList());
+    // }
 }
diff --git a/bcpkix/src/main/java/org/bouncycastle/cms/CMSStreamException.java b/bcpkix/src/main/java/org/bouncycastle/cms/CMSStreamException.java
deleted file mode 100644
index fff0048..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cms/CMSStreamException.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package org.bouncycastle.cms;
-
-import java.io.IOException;
-
-public class CMSStreamException
-    extends IOException
-{
-    private final Throwable underlying;
-
-    CMSStreamException(String msg)
-    {
-        super(msg);
-        this.underlying = null;
-    }
-
-    CMSStreamException(String msg, Throwable underlying)
-    {
-        super(msg);
-        this.underlying = underlying;
-    }
-
-    public Throwable getCause()
-    {
-        return underlying;
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cms/CMSTypedStream.java b/bcpkix/src/main/java/org/bouncycastle/cms/CMSTypedStream.java
deleted file mode 100644
index eda3bde..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cms/CMSTypedStream.java
+++ /dev/null
@@ -1,86 +0,0 @@
-package org.bouncycastle.cms;
-
-import java.io.BufferedInputStream;
-import java.io.FilterInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.util.io.Streams;
-
-public class CMSTypedStream
-{
-    private static final int BUF_SIZ = 32 * 1024;
-    
-    private final ASN1ObjectIdentifier      _oid;
-    private final InputStream _in;
-
-    public CMSTypedStream(
-        InputStream in)
-    {
-        this(PKCSObjectIdentifiers.data.getId(), in, BUF_SIZ);
-    }
-    
-    public CMSTypedStream(
-         String oid,
-         InputStream in)
-    {
-        this(new ASN1ObjectIdentifier(oid), in, BUF_SIZ);
-    }
-    
-    public CMSTypedStream(
-        String      oid,
-        InputStream in,
-        int         bufSize)
-    {
-        this(new ASN1ObjectIdentifier(oid), in, bufSize);
-    }
-
-    public CMSTypedStream(
-         ASN1ObjectIdentifier oid,
-         InputStream in)
-    {
-        this(oid, in, BUF_SIZ);
-    }
-
-    public CMSTypedStream(
-        ASN1ObjectIdentifier      oid,
-        InputStream in,
-        int         bufSize)
-    {
-        _oid = oid;
-        _in = new FullReaderStream(new BufferedInputStream(in, bufSize));
-    }
-
-    public ASN1ObjectIdentifier getContentType()
-    {
-        return _oid;
-    }
-    
-    public InputStream getContentStream()
-    {
-        return _in;
-    }
-
-    public void drain() 
-        throws IOException
-    {
-        Streams.drain(_in);
-        _in.close();
-    }
-
-    private static class FullReaderStream extends FilterInputStream
-    {
-        FullReaderStream(InputStream in)
-        {
-            super(in);
-        }
-
-        public int read(byte[] buf, int off, int len) throws IOException
-        {
-            int totalRead = Streams.readFully(super.in, buf, off, len);
-            return totalRead > 0 ? totalRead : -1;
-        }
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cms/CMSUtils.java b/bcpkix/src/main/java/org/bouncycastle/cms/CMSUtils.java
index 41f2c00..e5f7e9b 100644
--- a/bcpkix/src/main/java/org/bouncycastle/cms/CMSUtils.java
+++ b/bcpkix/src/main/java/org/bouncycastle/cms/CMSUtils.java
@@ -20,9 +20,11 @@ import org.bouncycastle.asn1.DERSet;
 import org.bouncycastle.asn1.DERTaggedObject;
 import org.bouncycastle.asn1.cms.CMSObjectIdentifiers;
 import org.bouncycastle.asn1.cms.ContentInfo;
-import org.bouncycastle.asn1.cms.OtherRevocationInfoFormat;
-import org.bouncycastle.asn1.ocsp.OCSPResponse;
-import org.bouncycastle.asn1.ocsp.OCSPResponseStatus;
+// BEGIN android-removed
+// import org.bouncycastle.asn1.cms.OtherRevocationInfoFormat;
+// import org.bouncycastle.asn1.ocsp.OCSPResponse;
+// import org.bouncycastle.asn1.ocsp.OCSPResponseStatus;
+// END android-removed
 import org.bouncycastle.cert.X509AttributeCertificateHolder;
 import org.bouncycastle.cert.X509CRLHolder;
 import org.bouncycastle.cert.X509CertificateHolder;
@@ -113,14 +115,16 @@ class CMSUtils
 
                     crls.add(c.toASN1Structure());
                 }
-                else if (rev instanceof OtherRevocationInfoFormat)
-                {
-                    OtherRevocationInfoFormat infoFormat = OtherRevocationInfoFormat.getInstance(rev);
-
-                    validateInfoFormat(infoFormat);
-
-                    crls.add(new DERTaggedObject(false, 1, infoFormat));
-                }
+                // BEGIN android-removed
+                // else if (rev instanceof OtherRevocationInfoFormat)
+                // {
+                //     OtherRevocationInfoFormat infoFormat = OtherRevocationInfoFormat.getInstance(rev);
+                //
+                //     validateInfoFormat(infoFormat);
+                //
+                //     crls.add(new DERTaggedObject(false, 1, infoFormat));
+                // }
+                // END android-removed
                 else if (rev instanceof ASN1TaggedObject)
                 {
                     crls.add(rev);
@@ -135,35 +139,36 @@ class CMSUtils
         }
     }
 
-    private static void validateInfoFormat(OtherRevocationInfoFormat infoFormat)
-    {
-        if (CMSObjectIdentifiers.id_ri_ocsp_response.equals(infoFormat.getInfoFormat()))
-        {
-            OCSPResponse resp = OCSPResponse.getInstance(infoFormat.getInfo());
-
-            if (resp.getResponseStatus().getValue().intValue() != OCSPResponseStatus.SUCCESSFUL)
-            {
-                throw new IllegalArgumentException("cannot add unsuccessful OCSP response to CMS SignedData");
-            }
-        }
-    }
-
-    static Collection getOthersFromStore(ASN1ObjectIdentifier otherRevocationInfoFormat, Store otherRevocationInfos)
-    {
-        List others = new ArrayList();
-
-        for (Iterator it = otherRevocationInfos.getMatches(null).iterator(); it.hasNext();)
-        {
-            ASN1Encodable info = (ASN1Encodable)it.next();
-            OtherRevocationInfoFormat infoFormat = new OtherRevocationInfoFormat(otherRevocationInfoFormat, info);
-
-            validateInfoFormat(infoFormat);
-
-            others.add(new DERTaggedObject(false, 1, infoFormat));
-        }
-
-        return others;
-    }
+    // BEGIN android-removed
+    // private static void validateInfoFormat(OtherRevocationInfoFormat infoFormat)
+    // {
+    //     if (CMSObjectIdentifiers.id_ri_ocsp_response.equals(infoFormat.getInfoFormat()))
+    //     {
+    //         OCSPResponse resp = OCSPResponse.getInstance(infoFormat.getInfo());
+    //
+    //         if (resp.getResponseStatus().getValue().intValue() != OCSPResponseStatus.SUCCESSFUL)
+    //         {
+    //             throw new IllegalArgumentException("cannot add unsuccessful OCSP response to CMS SignedData");
+    //         }
+    //     }
+    // }
+    //
+    // static Collection getOthersFromStore(ASN1ObjectIdentifier otherRevocationInfoFormat, Store otherRevocationInfos)
+    // {
+    //     List others = new ArrayList();
+    //
+    //     for (Iterator it = otherRevocationInfos.getMatches(null).iterator(); it.hasNext();)
+    //     {
+    //         ASN1Encodable info = (ASN1Encodable)it.next();
+    //         OtherRevocationInfoFormat infoFormat = new OtherRevocationInfoFormat(otherRevocationInfoFormat, info);
+    //         validateInfoFormat(infoFormat);
+    //
+    //         others.add(new DERTaggedObject(false, 1, infoFormat));
+    //     }
+    //
+    //     return others;
+    // }
+    // END android-removed
 
     static ASN1Set createBerSetFromList(List derObjects)
     {
diff --git a/bcpkix/src/main/java/org/bouncycastle/cms/DefaultAuthenticatedAttributeTableGenerator.java b/bcpkix/src/main/java/org/bouncycastle/cms/DefaultAuthenticatedAttributeTableGenerator.java
deleted file mode 100644
index fb37b4d..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cms/DefaultAuthenticatedAttributeTableGenerator.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package org.bouncycastle.cms;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Map;
-
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.DEROctetString;
-import org.bouncycastle.asn1.DERSet;
-import org.bouncycastle.asn1.cms.Attribute;
-import org.bouncycastle.asn1.cms.AttributeTable;
-import org.bouncycastle.asn1.cms.CMSAttributes;
-
-/**
- * Default authenticated attributes generator.
- */
-public class DefaultAuthenticatedAttributeTableGenerator
-    implements CMSAttributeTableGenerator
-{
-    private final Hashtable table;
-
-    /**
-     * Initialise to use all defaults
-     */
-    public DefaultAuthenticatedAttributeTableGenerator()
-    {
-        table = new Hashtable();
-    }
-
-    /**
-     * Initialise with some extra attributes or overrides.
-     *
-     * @param attributeTable initial attribute table to use.
-     */
-    public DefaultAuthenticatedAttributeTableGenerator(
-        AttributeTable attributeTable)
-    {
-        if (attributeTable != null)
-        {
-            table = attributeTable.toHashtable();
-        }
-        else
-        {
-            table = new Hashtable();
-        }
-    }
-
-    /**
-     * Create a standard attribute table from the passed in parameters - this will
-     * normally include contentType and messageDigest. If the constructor
-     * using an AttributeTable was used, entries in it for contentType and
-     * messageDigest will override the generated ones.
-     *
-     * @param parameters source parameters for table generation.
-     *
-     * @return a filled in Hashtable of attributes.
-     */
-    protected Hashtable createStandardAttributeTable(
-        Map parameters)
-    {
-        Hashtable std = new Hashtable();
-
-        for (Enumeration en = table.keys(); en.hasMoreElements();)
-        {
-            Object key = en.nextElement();
-
-            std.put(key, table.get(key));
-        }
-
-        if (!std.containsKey(CMSAttributes.contentType))
-        {
-            ASN1ObjectIdentifier contentType = ASN1ObjectIdentifier.getInstance(
-                parameters.get(CMSAttributeTableGenerator.CONTENT_TYPE));
-            Attribute attr = new Attribute(CMSAttributes.contentType,
-                new DERSet(contentType));
-            std.put(attr.getAttrType(), attr);
-        }
-
-        if (!std.containsKey(CMSAttributes.messageDigest))
-        {
-            byte[] messageDigest = (byte[])parameters.get(
-                CMSAttributeTableGenerator.DIGEST);
-            Attribute attr = new Attribute(CMSAttributes.messageDigest,
-                new DERSet(new DEROctetString(messageDigest)));
-            std.put(attr.getAttrType(), attr);
-        }
-
-        return std;
-    }
-
-    /**
-     * @param parameters source parameters
-     * @return the populated attribute table
-     */
-    public AttributeTable getAttributes(Map parameters)
-    {
-        return new AttributeTable(createStandardAttributeTable(parameters));
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cms/DefaultCMSSignatureAlgorithmNameGenerator.java b/bcpkix/src/main/java/org/bouncycastle/cms/DefaultCMSSignatureAlgorithmNameGenerator.java
index 7d82bb4..d454fa6 100644
--- a/bcpkix/src/main/java/org/bouncycastle/cms/DefaultCMSSignatureAlgorithmNameGenerator.java
+++ b/bcpkix/src/main/java/org/bouncycastle/cms/DefaultCMSSignatureAlgorithmNameGenerator.java
@@ -4,8 +4,10 @@ import java.util.HashMap;
 import java.util.Map;
 
 import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.bsi.BSIObjectIdentifiers;
-import org.bouncycastle.asn1.cryptopro.CryptoProObjectIdentifiers;
+// BEGIN android-removed
+// import org.bouncycastle.asn1.bsi.BSIObjectIdentifiers;
+// import org.bouncycastle.asn1.cryptopro.CryptoProObjectIdentifiers;
+// END android-removed
 import org.bouncycastle.asn1.eac.EACObjectIdentifiers;
 import org.bouncycastle.asn1.nist.NISTObjectIdentifiers;
 import org.bouncycastle.asn1.oiw.OIWObjectIdentifiers;
@@ -34,12 +36,16 @@ public class DefaultCMSSignatureAlgorithmNameGenerator
         addEntries(NISTObjectIdentifiers.dsa_with_sha384, "SHA384", "DSA");
         addEntries(NISTObjectIdentifiers.dsa_with_sha512, "SHA512", "DSA");
         addEntries(OIWObjectIdentifiers.dsaWithSHA1, "SHA1", "DSA");
-        addEntries(OIWObjectIdentifiers.md4WithRSA, "MD4", "RSA");
-        addEntries(OIWObjectIdentifiers.md4WithRSAEncryption, "MD4", "RSA");
+        // BEGIN android-removed
+        // addEntries(OIWObjectIdentifiers.md4WithRSA, "MD4", "RSA");
+        // addEntries(OIWObjectIdentifiers.md4WithRSAEncryption, "MD4", "RSA");
+        // END android-removed
         addEntries(OIWObjectIdentifiers.md5WithRSA, "MD5", "RSA");
         addEntries(OIWObjectIdentifiers.sha1WithRSA, "SHA1", "RSA");
-        addEntries(PKCSObjectIdentifiers.md2WithRSAEncryption, "MD2", "RSA");
-        addEntries(PKCSObjectIdentifiers.md4WithRSAEncryption, "MD4", "RSA");
+        // BEGIN android-removed
+        // addEntries(PKCSObjectIdentifiers.md2WithRSAEncryption, "MD2", "RSA");
+        // addEntries(PKCSObjectIdentifiers.md4WithRSAEncryption, "MD4", "RSA");
+        // END android-removed
         addEntries(PKCSObjectIdentifiers.md5WithRSAEncryption, "MD5", "RSA");
         addEntries(PKCSObjectIdentifiers.sha1WithRSAEncryption, "SHA1", "RSA");
         addEntries(PKCSObjectIdentifiers.sha224WithRSAEncryption, "SHA224", "RSA");
@@ -66,38 +72,44 @@ public class DefaultCMSSignatureAlgorithmNameGenerator
         addEntries(EACObjectIdentifiers.id_TA_RSA_v1_5_SHA_256, "SHA256", "RSA");
         addEntries(EACObjectIdentifiers.id_TA_RSA_PSS_SHA_1, "SHA1", "RSAandMGF1");
         addEntries(EACObjectIdentifiers.id_TA_RSA_PSS_SHA_256, "SHA256", "RSAandMGF1");
-        addEntries(BSIObjectIdentifiers.ecdsa_plain_SHA1, "SHA1", "PLAIN-ECDSA");
-        addEntries(BSIObjectIdentifiers.ecdsa_plain_SHA224, "SHA224", "PLAIN-ECDSA");
-        addEntries(BSIObjectIdentifiers.ecdsa_plain_SHA256, "SHA256", "PLAIN-ECDSA");
-        addEntries(BSIObjectIdentifiers.ecdsa_plain_SHA384, "SHA384", "PLAIN-ECDSA");
-        addEntries(BSIObjectIdentifiers.ecdsa_plain_SHA512, "SHA512", "PLAIN-ECDSA");
-        addEntries(BSIObjectIdentifiers.ecdsa_plain_RIPEMD160, "RIPEMD160", "PLAIN-ECDSA");
+        // BEGIN android-removed
+        // addEntries(BSIObjectIdentifiers.ecdsa_plain_SHA1, "SHA1", "PLAIN-ECDSA");
+        // addEntries(BSIObjectIdentifiers.ecdsa_plain_SHA224, "SHA224", "PLAIN-ECDSA");
+        // addEntries(BSIObjectIdentifiers.ecdsa_plain_SHA256, "SHA256", "PLAIN-ECDSA");
+        // addEntries(BSIObjectIdentifiers.ecdsa_plain_SHA384, "SHA384", "PLAIN-ECDSA");
+        // addEntries(BSIObjectIdentifiers.ecdsa_plain_SHA512, "SHA512", "PLAIN-ECDSA");
+        // addEntries(BSIObjectIdentifiers.ecdsa_plain_RIPEMD160, "RIPEMD160", "PLAIN-ECDSA");
+        // END android-removed
 
         encryptionAlgs.put(X9ObjectIdentifiers.id_dsa, "DSA");
         encryptionAlgs.put(PKCSObjectIdentifiers.rsaEncryption, "RSA");
         encryptionAlgs.put(TeleTrusTObjectIdentifiers.teleTrusTRSAsignatureAlgorithm, "RSA");
         encryptionAlgs.put(X509ObjectIdentifiers.id_ea_rsa, "RSA");
         encryptionAlgs.put(PKCSObjectIdentifiers.id_RSASSA_PSS, "RSAandMGF1");
-        encryptionAlgs.put(CryptoProObjectIdentifiers.gostR3410_94, "GOST3410");
-        encryptionAlgs.put(CryptoProObjectIdentifiers.gostR3410_2001, "ECGOST3410");
-        encryptionAlgs.put(new ASN1ObjectIdentifier("1.3.6.1.4.1.5849.1.6.2"), "ECGOST3410");
-        encryptionAlgs.put(new ASN1ObjectIdentifier("1.3.6.1.4.1.5849.1.1.5"), "GOST3410");
-        encryptionAlgs.put(CryptoProObjectIdentifiers.gostR3411_94_with_gostR3410_2001, "ECGOST3410");
-        encryptionAlgs.put(CryptoProObjectIdentifiers.gostR3411_94_with_gostR3410_94, "GOST3410");
-
-        digestAlgs.put(PKCSObjectIdentifiers.md2, "MD2");
-        digestAlgs.put(PKCSObjectIdentifiers.md4, "MD4");
+        // BEGIN android-removed
+        // encryptionAlgs.put(CryptoProObjectIdentifiers.gostR3410_94, "GOST3410");
+        // encryptionAlgs.put(CryptoProObjectIdentifiers.gostR3410_2001, "ECGOST3410");
+        // encryptionAlgs.put(new ASN1ObjectIdentifier("1.3.6.1.4.1.5849.1.6.2"), "ECGOST3410");
+        // encryptionAlgs.put(new ASN1ObjectIdentifier("1.3.6.1.4.1.5849.1.1.5"), "GOST3410");
+        // encryptionAlgs.put(CryptoProObjectIdentifiers.gostR3411_94_with_gostR3410_2001, "ECGOST3410");
+        // encryptionAlgs.put(CryptoProObjectIdentifiers.gostR3411_94_with_gostR3410_94, "GOST3410");
+        //
+        // digestAlgs.put(PKCSObjectIdentifiers.md2, "MD2");
+        // digestAlgs.put(PKCSObjectIdentifiers.md4, "MD4");
+        // END android-removed
         digestAlgs.put(PKCSObjectIdentifiers.md5, "MD5");
         digestAlgs.put(OIWObjectIdentifiers.idSHA1, "SHA1");
         digestAlgs.put(NISTObjectIdentifiers.id_sha224, "SHA224");
         digestAlgs.put(NISTObjectIdentifiers.id_sha256, "SHA256");
         digestAlgs.put(NISTObjectIdentifiers.id_sha384, "SHA384");
         digestAlgs.put(NISTObjectIdentifiers.id_sha512, "SHA512");
-        digestAlgs.put(TeleTrusTObjectIdentifiers.ripemd128, "RIPEMD128");
-        digestAlgs.put(TeleTrusTObjectIdentifiers.ripemd160, "RIPEMD160");
-        digestAlgs.put(TeleTrusTObjectIdentifiers.ripemd256, "RIPEMD256");
-        digestAlgs.put(CryptoProObjectIdentifiers.gostR3411,  "GOST3411");
-        digestAlgs.put(new ASN1ObjectIdentifier("1.3.6.1.4.1.5849.1.2.1"),  "GOST3411");
+        // BEGIN android-removed
+        // digestAlgs.put(TeleTrusTObjectIdentifiers.ripemd128, "RIPEMD128");
+        // digestAlgs.put(TeleTrusTObjectIdentifiers.ripemd160, "RIPEMD160");
+        // digestAlgs.put(TeleTrusTObjectIdentifiers.ripemd256, "RIPEMD256");
+        // digestAlgs.put(CryptoProObjectIdentifiers.gostR3411,  "GOST3411");
+        // digestAlgs.put(new ASN1ObjectIdentifier("1.3.6.1.4.1.5849.1.2.1"),  "GOST3411");
+        // END android-removed
     }
 
     /**
diff --git a/bcpkix/src/main/java/org/bouncycastle/cms/DefaultCMSSignatureEncryptionAlgorithmFinder.java b/bcpkix/src/main/java/org/bouncycastle/cms/DefaultCMSSignatureEncryptionAlgorithmFinder.java
index 7797f79..e8ebc83 100644
--- a/bcpkix/src/main/java/org/bouncycastle/cms/DefaultCMSSignatureEncryptionAlgorithmFinder.java
+++ b/bcpkix/src/main/java/org/bouncycastle/cms/DefaultCMSSignatureEncryptionAlgorithmFinder.java
@@ -16,21 +16,27 @@ public class DefaultCMSSignatureEncryptionAlgorithmFinder
 
     static
     {
-        RSA_PKCS1d5.add(PKCSObjectIdentifiers.md2WithRSAEncryption);
-        RSA_PKCS1d5.add(PKCSObjectIdentifiers.md4WithRSAEncryption);
+        // BEGIN android-removed
+        // RSA_PKCS1d5.add(PKCSObjectIdentifiers.md2WithRSAEncryption);
+        // RSA_PKCS1d5.add(PKCSObjectIdentifiers.md4WithRSAEncryption);
+        // END android-removed
         RSA_PKCS1d5.add(PKCSObjectIdentifiers.md5WithRSAEncryption);
         RSA_PKCS1d5.add(PKCSObjectIdentifiers.sha1WithRSAEncryption);
         RSA_PKCS1d5.add(PKCSObjectIdentifiers.sha224WithRSAEncryption);
         RSA_PKCS1d5.add(PKCSObjectIdentifiers.sha256WithRSAEncryption);
         RSA_PKCS1d5.add(PKCSObjectIdentifiers.sha384WithRSAEncryption);
         RSA_PKCS1d5.add(PKCSObjectIdentifiers.sha512WithRSAEncryption);
-        RSA_PKCS1d5.add(OIWObjectIdentifiers.md4WithRSAEncryption);
-        RSA_PKCS1d5.add(OIWObjectIdentifiers.md4WithRSA);
+        // BEGIN android-removed
+        // RSA_PKCS1d5.add(OIWObjectIdentifiers.md4WithRSAEncryption);
+        // RSA_PKCS1d5.add(OIWObjectIdentifiers.md4WithRSA);
+        // END android-removed
         RSA_PKCS1d5.add(OIWObjectIdentifiers.md5WithRSA);
         RSA_PKCS1d5.add(OIWObjectIdentifiers.sha1WithRSA);
-        RSA_PKCS1d5.add(TeleTrusTObjectIdentifiers.rsaSignatureWithripemd128);
-        RSA_PKCS1d5.add(TeleTrusTObjectIdentifiers.rsaSignatureWithripemd160);
-        RSA_PKCS1d5.add(TeleTrusTObjectIdentifiers.rsaSignatureWithripemd256);
+        // BEGIN android-removed
+        // RSA_PKCS1d5.add(TeleTrusTObjectIdentifiers.rsaSignatureWithripemd128);
+        // RSA_PKCS1d5.add(TeleTrusTObjectIdentifiers.rsaSignatureWithripemd160);
+        // RSA_PKCS1d5.add(TeleTrusTObjectIdentifiers.rsaSignatureWithripemd256);
+        // END android-removed
     }
 
     public AlgorithmIdentifier findEncryptionAlgorithm(AlgorithmIdentifier signatureAlgorithm)
diff --git a/bcpkix/src/main/java/org/bouncycastle/cms/KEKRecipient.java b/bcpkix/src/main/java/org/bouncycastle/cms/KEKRecipient.java
deleted file mode 100644
index b9679b3..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cms/KEKRecipient.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package org.bouncycastle.cms;
-
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-
-public interface KEKRecipient
-    extends Recipient
-{
-    RecipientOperator getRecipientOperator(AlgorithmIdentifier keyEncAlg, AlgorithmIdentifier contentEncryptionAlgorithm, byte[] encryptedContentKey)
-        throws CMSException;
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cms/KEKRecipientId.java b/bcpkix/src/main/java/org/bouncycastle/cms/KEKRecipientId.java
deleted file mode 100644
index daa6c7f..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cms/KEKRecipientId.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package org.bouncycastle.cms;
-
-import org.bouncycastle.util.Arrays;
-
-public class KEKRecipientId
-    extends RecipientId
-{
-    private byte[] keyIdentifier;
-
-    /**
-     * Construct a recipient ID with the key identifier of a KEK recipient.
-     *
-     * @param keyIdentifier a subjectKeyId
-     */
-    public KEKRecipientId(byte[] keyIdentifier)
-    {
-        super(kek);
-
-        this.keyIdentifier = keyIdentifier;
-    }
-
-    public int hashCode()
-    {
-        return Arrays.hashCode(keyIdentifier);
-    }
-
-    public boolean equals(
-        Object o)
-    {
-        if (!(o instanceof KEKRecipientId))
-        {
-            return false;
-        }
-
-        KEKRecipientId id = (KEKRecipientId)o;
-
-        return Arrays.areEqual(keyIdentifier, id.keyIdentifier);
-    }
-
-    public byte[] getKeyIdentifier()
-    {
-        return Arrays.clone(keyIdentifier);
-    }
-
-    public Object clone()
-    {
-        return new KEKRecipientId(keyIdentifier);
-    }
-
-    public boolean match(Object obj)
-    {
-        if (obj instanceof byte[])
-        {
-            return Arrays.areEqual(keyIdentifier, (byte[])obj);
-        }
-        else if (obj instanceof KEKRecipientInformation)
-        {
-            return ((KEKRecipientInformation)obj).getRID().equals(this);
-        }
-
-        return false;
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cms/KEKRecipientInfoGenerator.java b/bcpkix/src/main/java/org/bouncycastle/cms/KEKRecipientInfoGenerator.java
deleted file mode 100644
index e3bff3c..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cms/KEKRecipientInfoGenerator.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package org.bouncycastle.cms;
-
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.DEROctetString;
-import org.bouncycastle.asn1.cms.KEKIdentifier;
-import org.bouncycastle.asn1.cms.KEKRecipientInfo;
-import org.bouncycastle.asn1.cms.RecipientInfo;
-import org.bouncycastle.operator.GenericKey;
-import org.bouncycastle.operator.OperatorException;
-import org.bouncycastle.operator.SymmetricKeyWrapper;
-
-public abstract class KEKRecipientInfoGenerator
-    implements RecipientInfoGenerator
-{
-    private final KEKIdentifier kekIdentifier;
-
-    protected final SymmetricKeyWrapper wrapper;
-
-    protected KEKRecipientInfoGenerator(KEKIdentifier kekIdentifier, SymmetricKeyWrapper wrapper)
-    {
-        this.kekIdentifier = kekIdentifier;
-        this.wrapper = wrapper;
-    }
-
-    public final RecipientInfo generate(GenericKey contentEncryptionKey)
-        throws CMSException
-    {
-        try
-        {
-            ASN1OctetString encryptedKey = new DEROctetString(wrapper.generateWrappedKey(contentEncryptionKey));
-
-            return new RecipientInfo(new KEKRecipientInfo(kekIdentifier, wrapper.getAlgorithmIdentifier(), encryptedKey));
-        }
-        catch (OperatorException e)
-        {
-            throw new CMSException("exception wrapping content key: " + e.getMessage(), e);
-        }
-    }
-}
\ No newline at end of file
diff --git a/bcpkix/src/main/java/org/bouncycastle/cms/KEKRecipientInformation.java b/bcpkix/src/main/java/org/bouncycastle/cms/KEKRecipientInformation.java
deleted file mode 100644
index 62c6529..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cms/KEKRecipientInformation.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package org.bouncycastle.cms;
-
-import java.io.IOException;
-
-import org.bouncycastle.asn1.cms.KEKIdentifier;
-import org.bouncycastle.asn1.cms.KEKRecipientInfo;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-
-/**
- * the RecipientInfo class for a recipient who has been sent a message
- * encrypted using a secret key known to the other side.
- */
-public class KEKRecipientInformation
-    extends RecipientInformation
-{
-    private KEKRecipientInfo      info;
-
-    KEKRecipientInformation(
-        KEKRecipientInfo        info,
-        AlgorithmIdentifier     messageAlgorithm,
-        CMSSecureReadable       secureReadable,
-        AuthAttributesProvider  additionalData)
-    {
-        super(info.getKeyEncryptionAlgorithm(), messageAlgorithm, secureReadable, additionalData);
-
-        this.info = info;
-
-        KEKIdentifier kekId = info.getKekid();
-
-        this.rid = new KEKRecipientId(kekId.getKeyIdentifier().getOctets());
-    }
-
-    protected RecipientOperator getRecipientOperator(Recipient recipient)
-        throws CMSException, IOException
-    {
-        return ((KEKRecipient)recipient).getRecipientOperator(keyEncAlg, messageAlgorithm, info.getEncryptedKey().getOctets());
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cms/KeyAgreeRecipient.java b/bcpkix/src/main/java/org/bouncycastle/cms/KeyAgreeRecipient.java
deleted file mode 100644
index 08d8380..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cms/KeyAgreeRecipient.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package org.bouncycastle.cms;
-
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-
-public interface KeyAgreeRecipient
-    extends Recipient
-{
-    RecipientOperator getRecipientOperator(AlgorithmIdentifier keyEncAlg, AlgorithmIdentifier contentEncryptionAlgorithm, SubjectPublicKeyInfo senderPublicKey, ASN1OctetString userKeyingMaterial, byte[] encryptedContentKey)
-        throws CMSException;
-
-    AlgorithmIdentifier getPrivateKeyAlgorithmIdentifier();
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cms/KeyAgreeRecipientId.java b/bcpkix/src/main/java/org/bouncycastle/cms/KeyAgreeRecipientId.java
deleted file mode 100644
index c64c6ea..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cms/KeyAgreeRecipientId.java
+++ /dev/null
@@ -1,89 +0,0 @@
-package org.bouncycastle.cms;
-
-import java.math.BigInteger;
-
-import org.bouncycastle.asn1.x500.X500Name;
-import org.bouncycastle.cert.selector.X509CertificateHolderSelector;
-
-public class KeyAgreeRecipientId
-    extends RecipientId
-{
-    private X509CertificateHolderSelector baseSelector;
-
-    private KeyAgreeRecipientId(X509CertificateHolderSelector baseSelector)
-    {
-        super(keyAgree);
-
-        this.baseSelector = baseSelector;
-    }
-
-    /**
-     * Construct a key agree recipient ID with the value of a public key's subjectKeyId.
-     *
-     * @param subjectKeyId a subjectKeyId
-     */
-    public KeyAgreeRecipientId(byte[] subjectKeyId)
-    {
-        this(null, null, subjectKeyId);
-    }
-
-    /**
-     * Construct a key agree recipient ID based on the issuer and serial number of the recipient's associated
-     * certificate.
-     *
-     * @param issuer the issuer of the recipient's associated certificate.
-     * @param serialNumber the serial number of the recipient's associated certificate.
-     */
-    public KeyAgreeRecipientId(X500Name issuer, BigInteger serialNumber)
-    {
-        this(issuer, serialNumber, null);
-    }
-
-    public KeyAgreeRecipientId(X500Name issuer, BigInteger serialNumber, byte[] subjectKeyId)
-    {
-        this(new X509CertificateHolderSelector(issuer, serialNumber, subjectKeyId));
-    }
-
-    public BigInteger getSerialNumber()
-    {
-        return baseSelector.getSerialNumber();
-    }
-
-    public byte[] getSubjectKeyIdentifier()
-    {
-        return baseSelector.getSubjectKeyIdentifier();
-    }
-
-    public int hashCode()
-    {
-        return baseSelector.hashCode();
-    }
-
-    public boolean equals(
-        Object  o)
-    {
-        if (!(o instanceof KeyAgreeRecipientId))
-        {
-            return false;
-        }
-
-        KeyAgreeRecipientId id = (KeyAgreeRecipientId)o;
-
-        return this.baseSelector.equals(id.baseSelector);
-    }
-
-    public Object clone()
-    {
-        return new KeyAgreeRecipientId(baseSelector);
-    }
-
-    public boolean match(Object obj)
-    {
-        if (obj instanceof KeyAgreeRecipientInformation)
-        {
-            return ((KeyAgreeRecipientInformation)obj).getRID().equals(this);
-        }
-
-        return baseSelector.match(obj);
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cms/KeyAgreeRecipientInfoGenerator.java b/bcpkix/src/main/java/org/bouncycastle/cms/KeyAgreeRecipientInfoGenerator.java
deleted file mode 100644
index 85f5881..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cms/KeyAgreeRecipientInfoGenerator.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package org.bouncycastle.cms;
-
-import java.io.IOException;
-
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DERNull;
-import org.bouncycastle.asn1.DEROctetString;
-import org.bouncycastle.asn1.cms.KeyAgreeRecipientInfo;
-import org.bouncycastle.asn1.cms.OriginatorIdentifierOrKey;
-import org.bouncycastle.asn1.cms.OriginatorPublicKey;
-import org.bouncycastle.asn1.cms.RecipientInfo;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.bouncycastle.operator.GenericKey;
-
-public abstract class KeyAgreeRecipientInfoGenerator
-    implements RecipientInfoGenerator
-{
-    private ASN1ObjectIdentifier keyAgreementOID;
-    private ASN1ObjectIdentifier keyEncryptionOID;
-    private SubjectPublicKeyInfo originatorKeyInfo;
-
-    protected KeyAgreeRecipientInfoGenerator(ASN1ObjectIdentifier keyAgreementOID, SubjectPublicKeyInfo originatorKeyInfo, ASN1ObjectIdentifier keyEncryptionOID)
-    {
-        this.originatorKeyInfo = originatorKeyInfo;
-        this.keyAgreementOID = keyAgreementOID;
-        this.keyEncryptionOID = keyEncryptionOID;
-    }
-
-    public RecipientInfo generate(GenericKey contentEncryptionKey)
-        throws CMSException
-    {
-        OriginatorIdentifierOrKey originator = new OriginatorIdentifierOrKey(
-                createOriginatorPublicKey(originatorKeyInfo));
-
-        ASN1EncodableVector params = new ASN1EncodableVector();
-        params.add(keyEncryptionOID);
-        params.add(DERNull.INSTANCE);
-        AlgorithmIdentifier keyEncAlg = new AlgorithmIdentifier(keyEncryptionOID, DERNull.INSTANCE);
-        AlgorithmIdentifier keyAgreeAlg = new AlgorithmIdentifier(keyAgreementOID, keyEncAlg);
-
-        ASN1Sequence recipients = generateRecipientEncryptedKeys(keyAgreeAlg, keyEncAlg, contentEncryptionKey);
-        ASN1Encodable userKeyingMaterial = getUserKeyingMaterial(keyAgreeAlg);
-
-        if (userKeyingMaterial != null)
-        {
-            try
-            {
-                return new RecipientInfo(new KeyAgreeRecipientInfo(originator, new DEROctetString(userKeyingMaterial),
-                    keyAgreeAlg, recipients));
-            }
-            catch (IOException e)
-            {
-                throw new CMSException("unable to encode userKeyingMaterial: " + e.getMessage(), e);
-            }
-        }
-        else
-        {
-            return new RecipientInfo(new KeyAgreeRecipientInfo(originator, null,
-                keyAgreeAlg, recipients));
-        }
-    }
-
-    protected OriginatorPublicKey createOriginatorPublicKey(SubjectPublicKeyInfo originatorKeyInfo)
-    {
-        return new OriginatorPublicKey(
-            new AlgorithmIdentifier(originatorKeyInfo.getAlgorithm().getAlgorithm(), DERNull.INSTANCE),
-            originatorKeyInfo.getPublicKeyData().getBytes());
-    }
-
-    protected abstract ASN1Sequence generateRecipientEncryptedKeys(AlgorithmIdentifier keyAgreeAlgorithm, AlgorithmIdentifier keyEncAlgorithm, GenericKey contentEncryptionKey)
-        throws CMSException;
-
-    protected abstract ASN1Encodable getUserKeyingMaterial(AlgorithmIdentifier keyAgreeAlgorithm)
-        throws CMSException;
-
-}
\ No newline at end of file
diff --git a/bcpkix/src/main/java/org/bouncycastle/cms/KeyAgreeRecipientInformation.java b/bcpkix/src/main/java/org/bouncycastle/cms/KeyAgreeRecipientInformation.java
deleted file mode 100644
index 16c26bd..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cms/KeyAgreeRecipientInformation.java
+++ /dev/null
@@ -1,131 +0,0 @@
-package org.bouncycastle.cms;
-
-import java.io.IOException;
-import java.util.List;
-
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.cms.IssuerAndSerialNumber;
-import org.bouncycastle.asn1.cms.KeyAgreeRecipientIdentifier;
-import org.bouncycastle.asn1.cms.KeyAgreeRecipientInfo;
-import org.bouncycastle.asn1.cms.OriginatorIdentifierOrKey;
-import org.bouncycastle.asn1.cms.OriginatorPublicKey;
-import org.bouncycastle.asn1.cms.RecipientEncryptedKey;
-import org.bouncycastle.asn1.cms.RecipientKeyIdentifier;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.asn1.x509.SubjectKeyIdentifier;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-
-/**
- * the RecipientInfo class for a recipient who has been sent a message
- * encrypted using key agreement.
- */
-public class KeyAgreeRecipientInformation
-    extends RecipientInformation
-{
-    private KeyAgreeRecipientInfo info;
-    private ASN1OctetString       encryptedKey;
-
-    static void readRecipientInfo(List infos, KeyAgreeRecipientInfo info,
-        AlgorithmIdentifier messageAlgorithm, CMSSecureReadable secureReadable, AuthAttributesProvider additionalData)
-    {
-        ASN1Sequence s = info.getRecipientEncryptedKeys();
-
-        for (int i = 0; i < s.size(); ++i)
-        {
-            RecipientEncryptedKey id = RecipientEncryptedKey.getInstance(
-                s.getObjectAt(i));
-
-            RecipientId rid;
-
-            KeyAgreeRecipientIdentifier karid = id.getIdentifier();
-            IssuerAndSerialNumber iAndSN = karid.getIssuerAndSerialNumber();
-
-            if (iAndSN != null)
-            {
-                rid = new KeyAgreeRecipientId(iAndSN.getName(), iAndSN.getSerialNumber().getValue());
-            }
-            else
-            {
-                RecipientKeyIdentifier rKeyID = karid.getRKeyID();
-
-                // Note: 'date' and 'other' fields of RecipientKeyIdentifier appear to be only informational
-
-                rid = new KeyAgreeRecipientId(rKeyID.getSubjectKeyIdentifier().getOctets());
-            }
-
-            infos.add(new KeyAgreeRecipientInformation(info, rid, id.getEncryptedKey(), messageAlgorithm,
-                secureReadable, additionalData));
-        }
-    }
-
-    KeyAgreeRecipientInformation(
-        KeyAgreeRecipientInfo   info,
-        RecipientId             rid,
-        ASN1OctetString         encryptedKey,
-        AlgorithmIdentifier     messageAlgorithm,
-        CMSSecureReadable       secureReadable,
-        AuthAttributesProvider  additionalData)
-    {
-        super(info.getKeyEncryptionAlgorithm(), messageAlgorithm, secureReadable, additionalData);
-
-        this.info = info;
-        this.rid = rid;
-        this.encryptedKey = encryptedKey;
-    }
-
-    private SubjectPublicKeyInfo getSenderPublicKeyInfo(AlgorithmIdentifier recKeyAlgId,
-        OriginatorIdentifierOrKey originator)
-        throws CMSException, IOException
-    {
-        OriginatorPublicKey opk = originator.getOriginatorKey();
-        if (opk != null)
-        {
-            return getPublicKeyInfoFromOriginatorPublicKey(recKeyAlgId, opk);
-        }
-
-        OriginatorId origID;
-
-        IssuerAndSerialNumber iAndSN = originator.getIssuerAndSerialNumber();
-        if (iAndSN != null)
-        {
-            origID = new OriginatorId(iAndSN.getName(), iAndSN.getSerialNumber().getValue());
-        }
-        else
-        {
-            SubjectKeyIdentifier ski = originator.getSubjectKeyIdentifier();
-
-            origID = new OriginatorId(ski.getKeyIdentifier());
-        }
-
-        return getPublicKeyInfoFromOriginatorId(origID);
-    }
-
-    private SubjectPublicKeyInfo getPublicKeyInfoFromOriginatorPublicKey(AlgorithmIdentifier recKeyAlgId,
-            OriginatorPublicKey originatorPublicKey)
-    {
-        SubjectPublicKeyInfo pubInfo = new SubjectPublicKeyInfo(
-            recKeyAlgId,
-            originatorPublicKey.getPublicKey().getBytes());
-
-        return pubInfo;
-    }
-
-    private SubjectPublicKeyInfo getPublicKeyInfoFromOriginatorId(OriginatorId origID)
-            throws CMSException
-    {
-        // TODO Support all alternatives for OriginatorIdentifierOrKey
-        // see RFC 3852 6.2.2
-        throw new CMSException("No support for 'originator' as IssuerAndSerialNumber or SubjectKeyIdentifier");
-    }
-
-    protected RecipientOperator getRecipientOperator(Recipient recipient)
-        throws CMSException, IOException
-    {
-        KeyAgreeRecipient agreeRecipient = (KeyAgreeRecipient)recipient;
-                AlgorithmIdentifier    recKeyAlgId = agreeRecipient.getPrivateKeyAlgorithmIdentifier();
-
-        return ((KeyAgreeRecipient)recipient).getRecipientOperator(keyEncAlg, messageAlgorithm, getSenderPublicKeyInfo(recKeyAlgId,
-                        info.getOriginator()), info.getUserKeyingMaterial(), encryptedKey.getOctets());
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cms/KeyTransRecipient.java b/bcpkix/src/main/java/org/bouncycastle/cms/KeyTransRecipient.java
deleted file mode 100644
index b61fbbe..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cms/KeyTransRecipient.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package org.bouncycastle.cms;
-
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-
-public interface KeyTransRecipient
-    extends Recipient
-{
-    RecipientOperator getRecipientOperator(AlgorithmIdentifier keyEncAlg, AlgorithmIdentifier contentEncryptionAlgorithm, byte[] encryptedContentKey)
-        throws CMSException;
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cms/KeyTransRecipientId.java b/bcpkix/src/main/java/org/bouncycastle/cms/KeyTransRecipientId.java
deleted file mode 100644
index f850dcf..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cms/KeyTransRecipientId.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package org.bouncycastle.cms;
-
-import java.math.BigInteger;
-
-import org.bouncycastle.asn1.x500.X500Name;
-import org.bouncycastle.cert.selector.X509CertificateHolderSelector;
-
-public class KeyTransRecipientId
-    extends RecipientId
-{
-    private X509CertificateHolderSelector baseSelector;
-
-    private KeyTransRecipientId(X509CertificateHolderSelector baseSelector)
-    {
-        super(keyTrans);
-
-        this.baseSelector = baseSelector;
-    }
-
-    /**
-     * Construct a key trans recipient ID with the value of a public key's subjectKeyId.
-     *
-     * @param subjectKeyId a subjectKeyId
-     */
-    public KeyTransRecipientId(byte[] subjectKeyId)
-    {
-        this(null, null, subjectKeyId);
-    }
-
-    /**
-     * Construct a key trans recipient ID based on the issuer and serial number of the recipient's associated
-     * certificate.
-     *
-     * @param issuer the issuer of the recipient's associated certificate.
-     * @param serialNumber the serial number of the recipient's associated certificate.
-     */
-    public KeyTransRecipientId(X500Name issuer, BigInteger serialNumber)
-    {
-        this(issuer, serialNumber, null);
-    }
-
-    /**
-     * Construct a key trans recipient ID based on the issuer and serial number of the recipient's associated
-     * certificate.
-     *
-     * @param issuer the issuer of the recipient's associated certificate.
-     * @param serialNumber the serial number of the recipient's associated certificate.
-     * @param subjectKeyId the subject key identifier to use to match the recipients associated certificate.
-     */
-    public KeyTransRecipientId(X500Name issuer, BigInteger serialNumber, byte[] subjectKeyId)
-    {
-        this(new X509CertificateHolderSelector(issuer, serialNumber, subjectKeyId));
-    }
-
-    public X500Name getIssuer()
-    {
-        return baseSelector.getIssuer();
-    }
-
-    public BigInteger getSerialNumber()
-    {
-        return baseSelector.getSerialNumber();
-    }
-
-    public byte[] getSubjectKeyIdentifier()
-    {
-        return baseSelector.getSubjectKeyIdentifier();
-    }
-
-    public int hashCode()
-    {
-        return baseSelector.hashCode();
-    }
-
-    public boolean equals(
-        Object  o)
-    {
-        if (!(o instanceof KeyTransRecipientId))
-        {
-            return false;
-        }
-
-        KeyTransRecipientId id = (KeyTransRecipientId)o;
-
-        return this.baseSelector.equals(id.baseSelector);
-    }
-
-    public Object clone()
-    {
-        return new KeyTransRecipientId(this.baseSelector);
-    }
-
-    public boolean match(Object obj)
-    {
-        if (obj instanceof KeyTransRecipientInformation)
-        {
-            return ((KeyTransRecipientInformation)obj).getRID().equals(this);
-        }
-
-        return baseSelector.match(obj);
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cms/KeyTransRecipientInfoGenerator.java b/bcpkix/src/main/java/org/bouncycastle/cms/KeyTransRecipientInfoGenerator.java
deleted file mode 100644
index e576f03..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cms/KeyTransRecipientInfoGenerator.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package org.bouncycastle.cms;
-
-import org.bouncycastle.asn1.DEROctetString;
-import org.bouncycastle.asn1.cms.IssuerAndSerialNumber;
-import org.bouncycastle.asn1.cms.KeyTransRecipientInfo;
-import org.bouncycastle.asn1.cms.RecipientIdentifier;
-import org.bouncycastle.asn1.cms.RecipientInfo;
-import org.bouncycastle.operator.AsymmetricKeyWrapper;
-import org.bouncycastle.operator.GenericKey;
-import org.bouncycastle.operator.OperatorException;
-
-public abstract class KeyTransRecipientInfoGenerator
-    implements RecipientInfoGenerator
-{
-    protected final AsymmetricKeyWrapper wrapper;
-
-    private IssuerAndSerialNumber issuerAndSerial;
-    private byte[] subjectKeyIdentifier;
-
-    protected KeyTransRecipientInfoGenerator(IssuerAndSerialNumber issuerAndSerial, AsymmetricKeyWrapper wrapper)
-    {
-        this.issuerAndSerial = issuerAndSerial;
-        this.wrapper = wrapper;
-    }
-
-    protected KeyTransRecipientInfoGenerator(byte[] subjectKeyIdentifier, AsymmetricKeyWrapper wrapper)
-    {
-        this.subjectKeyIdentifier = subjectKeyIdentifier;
-        this.wrapper = wrapper;
-    }
-
-    public final RecipientInfo generate(GenericKey contentEncryptionKey)
-        throws CMSException
-    {
-        byte[] encryptedKeyBytes;
-        try
-        {
-            encryptedKeyBytes = wrapper.generateWrappedKey(contentEncryptionKey);
-        }
-        catch (OperatorException e)
-        {
-            throw new CMSException("exception wrapping content key: " + e.getMessage(), e);
-        }
-
-        RecipientIdentifier recipId;
-        if (issuerAndSerial != null)
-        {
-            recipId = new RecipientIdentifier(issuerAndSerial);
-        }
-        else
-        {
-            recipId = new RecipientIdentifier(new DEROctetString(subjectKeyIdentifier));
-        }
-
-        return new RecipientInfo(new KeyTransRecipientInfo(recipId, wrapper.getAlgorithmIdentifier(),
-            new DEROctetString(encryptedKeyBytes)));
-    }
-}
\ No newline at end of file
diff --git a/bcpkix/src/main/java/org/bouncycastle/cms/KeyTransRecipientInformation.java b/bcpkix/src/main/java/org/bouncycastle/cms/KeyTransRecipientInformation.java
deleted file mode 100644
index d59f4b3..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cms/KeyTransRecipientInformation.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package org.bouncycastle.cms;
-
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.cms.IssuerAndSerialNumber;
-import org.bouncycastle.asn1.cms.KeyTransRecipientInfo;
-import org.bouncycastle.asn1.cms.RecipientIdentifier;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-
-/**
- * the KeyTransRecipientInformation class for a recipient who has been sent a secret
- * key encrypted using their public key that needs to be used to
- * extract the message.
- */
-public class KeyTransRecipientInformation
-    extends RecipientInformation
-{
-    private KeyTransRecipientInfo info;
-
-    KeyTransRecipientInformation(
-        KeyTransRecipientInfo   info,
-        AlgorithmIdentifier     messageAlgorithm,
-        CMSSecureReadable       secureReadable,
-        AuthAttributesProvider  additionalData)
-    {
-        super(info.getKeyEncryptionAlgorithm(), messageAlgorithm, secureReadable, additionalData);
-
-        this.info = info;
-
-        RecipientIdentifier r = info.getRecipientIdentifier();
-
-        if (r.isTagged())
-        {
-            ASN1OctetString octs = ASN1OctetString.getInstance(r.getId());
-
-            rid = new KeyTransRecipientId(octs.getOctets());
-        }
-        else
-        {
-            IssuerAndSerialNumber   iAnds = IssuerAndSerialNumber.getInstance(r.getId());
-
-            rid = new KeyTransRecipientId(iAnds.getName(), iAnds.getSerialNumber().getValue());
-        }
-    }
-
-    protected RecipientOperator getRecipientOperator(Recipient recipient)
-        throws CMSException
-    {
-        return ((KeyTransRecipient)recipient).getRecipientOperator(keyEncAlg, messageAlgorithm, info.getEncryptedKey().getOctets());
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cms/OriginatorId.java b/bcpkix/src/main/java/org/bouncycastle/cms/OriginatorId.java
deleted file mode 100644
index ab38105..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cms/OriginatorId.java
+++ /dev/null
@@ -1,118 +0,0 @@
-package org.bouncycastle.cms;
-
-import java.math.BigInteger;
-
-import org.bouncycastle.asn1.x500.X500Name;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.Selector;
-
-/**
- * a basic index for an originator.
- */
-class OriginatorId
-    implements Selector
-{
-    private byte[] subjectKeyId;
-
-    private X500Name issuer;
-    private BigInteger serialNumber;
-
-    /**
-     * Construct a signer ID with the value of a public key's subjectKeyId.
-     *
-     * @param subjectKeyId a subjectKeyId
-     */
-    public OriginatorId(byte[] subjectKeyId)
-    {
-        setSubjectKeyID(subjectKeyId);
-    }
-
-    private void setSubjectKeyID(byte[] subjectKeyId)
-    {
-        this.subjectKeyId = subjectKeyId;
-    }
-
-    /**
-     * Construct a signer ID based on the issuer and serial number of the signer's associated
-     * certificate.
-     *
-     * @param issuer the issuer of the signer's associated certificate.
-     * @param serialNumber the serial number of the signer's associated certificate.
-     */
-    public OriginatorId(X500Name issuer, BigInteger serialNumber)
-    {
-        setIssuerAndSerial(issuer, serialNumber);
-    }
-
-    private void setIssuerAndSerial(X500Name issuer, BigInteger serialNumber)
-    {
-        this.issuer = issuer;
-        this.serialNumber = serialNumber;
-    }
-
-    /**
-     * Construct a signer ID based on the issuer and serial number of the signer's associated
-     * certificate.
-     *
-     * @param issuer the issuer of the signer's associated certificate.
-     * @param serialNumber the serial number of the signer's associated certificate.
-     * @param subjectKeyId the subject key identifier to use to match the signers associated certificate.
-     */
-    public OriginatorId(X500Name issuer, BigInteger serialNumber, byte[] subjectKeyId)
-    {
-        setIssuerAndSerial(issuer, serialNumber);
-        setSubjectKeyID(subjectKeyId);
-    }
-
-    public X500Name getIssuer()
-    {
-        return issuer;
-    }
-
-    public Object clone()
-    {
-        return new OriginatorId(this.issuer, this.serialNumber, this.subjectKeyId);
-    }
-
-    public int hashCode()
-    {
-        int code = Arrays.hashCode(subjectKeyId);
-
-        if (this.serialNumber != null)
-        {
-            code ^= this.serialNumber.hashCode();
-        }
-
-        if (this.issuer != null)
-        {
-            code ^= this.issuer.hashCode();
-        }
-
-        return code;
-    }
-
-    public boolean equals(
-        Object  o)
-    {
-        if (!(o instanceof OriginatorId))
-        {
-            return false;
-        }
-
-        OriginatorId id = (OriginatorId)o;
-
-        return Arrays.areEqual(subjectKeyId, id.subjectKeyId)
-            && equalsObj(this.serialNumber, id.serialNumber)
-            && equalsObj(this.issuer, id.issuer);
-    }
-
-    private boolean equalsObj(Object a, Object b)
-    {
-        return (a != null) ? a.equals(b) : b == null;
-    }
-
-    public boolean match(Object obj)
-    {
-        return false;
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cms/OriginatorInfoGenerator.java b/bcpkix/src/main/java/org/bouncycastle/cms/OriginatorInfoGenerator.java
deleted file mode 100644
index 8ea5a92..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cms/OriginatorInfoGenerator.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package org.bouncycastle.cms;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.bouncycastle.asn1.cms.OriginatorInfo;
-import org.bouncycastle.cert.X509CertificateHolder;
-import org.bouncycastle.util.Store;
-
-public class OriginatorInfoGenerator
-{
-    private final List origCerts;
-    private final List origCRLs;
-
-    public OriginatorInfoGenerator(X509CertificateHolder origCert)
-    {
-        this.origCerts = new ArrayList(1);
-        this.origCRLs = null;
-        origCerts.add(origCert.toASN1Structure());
-    }
-
-    public OriginatorInfoGenerator(Store origCerts)
-        throws CMSException
-    {
-        this(origCerts, null);
-    }
-
-    public OriginatorInfoGenerator(Store origCerts, Store origCRLs)
-        throws CMSException
-    {
-        this.origCerts = CMSUtils.getCertificatesFromStore(origCerts);
-
-        if (origCRLs != null)
-        {
-            this.origCRLs = CMSUtils.getCRLsFromStore(origCRLs);
-        }
-        else
-        {
-            this.origCRLs = null;
-        }
-    }
-
-    public OriginatorInformation generate()
-    {
-        if (origCRLs != null)
-        {
-            return new OriginatorInformation(new OriginatorInfo(CMSUtils.createDerSetFromList(origCerts), CMSUtils.createDerSetFromList(origCRLs)));
-        }
-        else
-        {
-            return new OriginatorInformation(new OriginatorInfo(CMSUtils.createDerSetFromList(origCerts), null));
-        }
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cms/OriginatorInformation.java b/bcpkix/src/main/java/org/bouncycastle/cms/OriginatorInformation.java
deleted file mode 100644
index 7e9379d..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cms/OriginatorInformation.java
+++ /dev/null
@@ -1,95 +0,0 @@
-package org.bouncycastle.cms;
-
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.List;
-
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.ASN1Set;
-import org.bouncycastle.asn1.cms.OriginatorInfo;
-import org.bouncycastle.asn1.x509.Certificate;
-import org.bouncycastle.asn1.x509.CertificateList;
-import org.bouncycastle.cert.X509CRLHolder;
-import org.bouncycastle.cert.X509CertificateHolder;
-import org.bouncycastle.util.CollectionStore;
-import org.bouncycastle.util.Store;
-
-public class OriginatorInformation
-{
-    private OriginatorInfo originatorInfo;
-
-    OriginatorInformation(OriginatorInfo originatorInfo)
-    {
-        this.originatorInfo = originatorInfo;
-    }
-
-    /**
-     * Return the certificates stored in the underlying OriginatorInfo object.
-     *
-     * @return a Store of X509CertificateHolder objects.
-     */
-    public Store getCertificates()
-    {
-        ASN1Set certSet = originatorInfo.getCertificates();
-
-        if (certSet != null)
-        {
-            List certList = new ArrayList(certSet.size());
-
-            for (Enumeration en = certSet.getObjects(); en.hasMoreElements();)
-            {
-                ASN1Primitive obj = ((ASN1Encodable)en.nextElement()).toASN1Primitive();
-
-                if (obj instanceof ASN1Sequence)
-                {
-                    certList.add(new X509CertificateHolder(Certificate.getInstance(obj)));
-                }
-            }
-
-            return new CollectionStore(certList);
-        }
-
-        return new CollectionStore(new ArrayList());
-    }
-
-    /**
-     * Return the CRLs stored in the underlying OriginatorInfo object.
-     *
-     * @return a Store of X509CRLHolder objects.
-     */
-    public Store getCRLs()
-    {
-        ASN1Set crlSet = originatorInfo.getCRLs();
-
-        if (crlSet != null)
-        {
-            List    crlList = new ArrayList(crlSet.size());
-
-            for (Enumeration en = crlSet.getObjects(); en.hasMoreElements();)
-            {
-                ASN1Primitive obj = ((ASN1Encodable)en.nextElement()).toASN1Primitive();
-
-                if (obj instanceof ASN1Sequence)
-                {
-                    crlList.add(new X509CRLHolder(CertificateList.getInstance(obj)));
-                }
-            }
-
-            return new CollectionStore(crlList);
-        }
-
-        return new CollectionStore(new ArrayList());
-    }
-
-    /**
-     * Return the underlying ASN.1 object defining this SignerInformation object.
-     *
-     * @return a OriginatorInfo.
-     */
-    public OriginatorInfo toASN1Structure()
-    {
-        return originatorInfo;
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cms/PasswordRecipientId.java b/bcpkix/src/main/java/org/bouncycastle/cms/PasswordRecipientId.java
deleted file mode 100644
index 95688d7..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cms/PasswordRecipientId.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package org.bouncycastle.cms;
-
-public class PasswordRecipientId
-    extends RecipientId
-{
-    /**
-     * Construct a recipient ID of the password type.
-     */
-    public PasswordRecipientId()
-    {
-        super(password);
-    }
-
-    public int hashCode()
-    {
-        return password;
-    }
-
-    public boolean equals(
-        Object o)
-    {
-        if (!(o instanceof PasswordRecipientId))
-        {
-            return false;
-        }
-
-        return true;
-    }
-
-    public Object clone()
-    {
-        return new PasswordRecipientId();
-    }
-
-    public boolean match(Object obj)
-    {
-        if (obj instanceof PasswordRecipientInformation)
-        {
-            return true;
-        }
-        
-        return false;
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cms/PasswordRecipientInfoGenerator.java b/bcpkix/src/main/java/org/bouncycastle/cms/PasswordRecipientInfoGenerator.java
deleted file mode 100644
index b570c3c..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cms/PasswordRecipientInfoGenerator.java
+++ /dev/null
@@ -1,122 +0,0 @@
-package org.bouncycastle.cms;
-
-import java.security.SecureRandom;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.DEROctetString;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.cms.PasswordRecipientInfo;
-import org.bouncycastle.asn1.cms.RecipientInfo;
-import org.bouncycastle.asn1.pkcs.PBKDF2Params;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.operator.GenericKey;
-
-public abstract class PasswordRecipientInfoGenerator
-    implements RecipientInfoGenerator
-{
-    private char[] password;
-    private AlgorithmIdentifier keyDerivationAlgorithm;
-    private ASN1ObjectIdentifier kekAlgorithm;
-    private SecureRandom random;
-    private int schemeID;
-    private int keySize;
-    private int blockSize;
-
-    protected PasswordRecipientInfoGenerator(ASN1ObjectIdentifier kekAlgorithm, char[] password)
-    {
-        this(kekAlgorithm, password, getKeySize(kekAlgorithm), ((Integer)PasswordRecipientInformation.BLOCKSIZES.get(kekAlgorithm)).intValue());
-    }
-
-    protected PasswordRecipientInfoGenerator(ASN1ObjectIdentifier kekAlgorithm, char[] password, int keySize, int blockSize)
-    {
-        this.password = password;
-        this.schemeID = PasswordRecipient.PKCS5_SCHEME2_UTF8;
-        this.kekAlgorithm = kekAlgorithm;
-        this.keySize = keySize;
-        this.blockSize = blockSize;
-    }
-
-    private static int getKeySize(ASN1ObjectIdentifier kekAlgorithm)
-    {
-        Integer size = (Integer)PasswordRecipientInformation.KEYSIZES.get(kekAlgorithm);
-
-        if (size == null)
-        {
-            throw new IllegalArgumentException("cannot find key size for algorithm: " +  kekAlgorithm);
-        }
-
-        return size.intValue();
-    }
-
-    public PasswordRecipientInfoGenerator setPasswordConversionScheme(int schemeID)
-    {
-        this.schemeID = schemeID;
-
-        return this;
-    }
-
-    public PasswordRecipientInfoGenerator setSaltAndIterationCount(byte[] salt, int iterationCount)
-    {
-        this.keyDerivationAlgorithm = new AlgorithmIdentifier(PKCSObjectIdentifiers.id_PBKDF2, new PBKDF2Params(salt, iterationCount));
-
-        return this;
-    }
-
-    public PasswordRecipientInfoGenerator setSecureRandom(SecureRandom random)
-    {
-        this.random = random;
-
-        return this;
-    }
-
-    public RecipientInfo generate(GenericKey contentEncryptionKey)
-        throws CMSException
-    {
-        byte[] iv = new byte[blockSize];     /// TODO: set IV size properly!
-
-        if (random == null)
-        {
-            random = new SecureRandom();
-        }
-        
-        random.nextBytes(iv);
-
-        if (keyDerivationAlgorithm == null)
-        {
-            byte[] salt = new byte[20];
-
-            random.nextBytes(salt);
-
-            keyDerivationAlgorithm = new AlgorithmIdentifier(PKCSObjectIdentifiers.id_PBKDF2, new PBKDF2Params(salt, 1024));
-        }
-
-        byte[] encodedPassword = CMSUtils.getPasswordBytes(schemeID, password);
-
-        byte[] derivedKey = calculateDerivedKey(encodedPassword, keyDerivationAlgorithm, keySize);
-
-        AlgorithmIdentifier kekAlgorithmId = new AlgorithmIdentifier(kekAlgorithm, new DEROctetString(iv));
-
-        byte[] encryptedKeyBytes = generateEncryptedBytes(kekAlgorithmId, derivedKey, contentEncryptionKey);
-
-        ASN1OctetString encryptedKey = new DEROctetString(encryptedKeyBytes);
-
-        ASN1EncodableVector v = new ASN1EncodableVector();
-        v.add(kekAlgorithm);
-        v.add(new DEROctetString(iv));
-
-        AlgorithmIdentifier keyEncryptionAlgorithm = new AlgorithmIdentifier(
-            PKCSObjectIdentifiers.id_alg_PWRI_KEK, new DERSequence(v));
-
-        return new RecipientInfo(new PasswordRecipientInfo(keyDerivationAlgorithm,
-            keyEncryptionAlgorithm, encryptedKey));
-    }
-
-    protected abstract byte[] calculateDerivedKey(byte[] encodedPassword, AlgorithmIdentifier derivationAlgorithm, int keySize)
-        throws CMSException;
-
-    protected abstract byte[] generateEncryptedBytes(AlgorithmIdentifier algorithm, byte[] derivedKey, GenericKey contentEncryptionKey)
-        throws CMSException;
-}
\ No newline at end of file
diff --git a/bcpkix/src/main/java/org/bouncycastle/cms/PasswordRecipientInformation.java b/bcpkix/src/main/java/org/bouncycastle/cms/PasswordRecipientInformation.java
deleted file mode 100644
index 2eef186..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cms/PasswordRecipientInformation.java
+++ /dev/null
@@ -1,116 +0,0 @@
-package org.bouncycastle.cms;
-
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.cms.PasswordRecipientInfo;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.util.Integers;
-
-/**
- * the RecipientInfo class for a recipient who has been sent a message
- * encrypted using a password.
- */
-public class PasswordRecipientInformation
-    extends RecipientInformation
-{
-    static Map KEYSIZES = new HashMap();
-    static Map BLOCKSIZES = new HashMap();
-
-    static
-    {
-        BLOCKSIZES.put(CMSAlgorithm.DES_EDE3_CBC, Integers.valueOf(8));
-        BLOCKSIZES.put(CMSAlgorithm.AES128_CBC, Integers.valueOf(16));
-        BLOCKSIZES.put(CMSAlgorithm.AES192_CBC, Integers.valueOf(16));
-        BLOCKSIZES.put(CMSAlgorithm.AES256_CBC, Integers.valueOf(16));
-
-        KEYSIZES.put(CMSAlgorithm.DES_EDE3_CBC, Integers.valueOf(192));
-        KEYSIZES.put(CMSAlgorithm.AES128_CBC, Integers.valueOf(128));
-        KEYSIZES.put(CMSAlgorithm.AES192_CBC, Integers.valueOf(192));
-        KEYSIZES.put(CMSAlgorithm.AES256_CBC, Integers.valueOf(256));
-    }
-
-    private PasswordRecipientInfo info;
-
-    PasswordRecipientInformation(
-        PasswordRecipientInfo   info,
-        AlgorithmIdentifier     messageAlgorithm,
-        CMSSecureReadable       secureReadable,
-        AuthAttributesProvider  additionalData)
-    {
-        super(info.getKeyEncryptionAlgorithm(), messageAlgorithm, secureReadable, additionalData);
-
-        this.info = info;
-        this.rid = new PasswordRecipientId();
-    }
-
-    /**
-     * return the object identifier for the key derivation algorithm, or null
-     * if there is none present.
-     *
-     * @return OID for key derivation algorithm, if present.
-     */
-    public String getKeyDerivationAlgOID()
-    {
-        if (info.getKeyDerivationAlgorithm() != null)
-        {
-            return info.getKeyDerivationAlgorithm().getAlgorithm().getId();
-        }
-
-        return null;
-    }
-
-    /**
-     * return the ASN.1 encoded key derivation algorithm parameters, or null if
-     * there aren't any.
-     * @return ASN.1 encoding of key derivation algorithm parameters.
-     */
-    public byte[] getKeyDerivationAlgParams()
-    {
-        try
-        {
-            if (info.getKeyDerivationAlgorithm() != null)
-            {
-                ASN1Encodable params = info.getKeyDerivationAlgorithm().getParameters();
-                if (params != null)
-                {
-                    return params.toASN1Primitive().getEncoded();
-                }
-            }
-
-            return null;
-        }
-        catch (Exception e)
-        {
-            throw new RuntimeException("exception getting encryption parameters " + e);
-        }
-    }
-
-    /**
-     * Return the key derivation algorithm details for the key in this recipient.
-     *
-     * @return AlgorithmIdentifier representing the key derivation algorithm.
-     */
-    public AlgorithmIdentifier getKeyDerivationAlgorithm()
-    {
-        return info.getKeyDerivationAlgorithm();
-    }
-
-    protected RecipientOperator getRecipientOperator(Recipient recipient)
-        throws CMSException, IOException
-    {
-        PasswordRecipient pbeRecipient = (PasswordRecipient)recipient;
-        AlgorithmIdentifier kekAlg = AlgorithmIdentifier.getInstance(info.getKeyEncryptionAlgorithm());
-        AlgorithmIdentifier kekAlgParams = AlgorithmIdentifier.getInstance(kekAlg.getParameters());
-
-        byte[] passwordBytes = CMSUtils.getPasswordBytes(pbeRecipient.getPasswordConversionScheme(), pbeRecipient.getPassword());
-
-        int keySize = ((Integer)KEYSIZES.get(kekAlgParams.getAlgorithm())).intValue();
-
-        byte[] derivedKey = pbeRecipient.calculateDerivedKey(passwordBytes, this.getKeyDerivationAlgorithm(), keySize);
-
-        return pbeRecipient.getRecipientOperator(kekAlgParams, messageAlgorithm, derivedKey, info.getEncryptedKey().getOctets());
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cms/RecipientId.java b/bcpkix/src/main/java/org/bouncycastle/cms/RecipientId.java
deleted file mode 100644
index fae5a10..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cms/RecipientId.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package org.bouncycastle.cms;
-
-import org.bouncycastle.util.Selector;
-
-public abstract class RecipientId
-    implements Selector
-{
-    public static final int keyTrans = 0;
-    public static final int kek = 1;
-    public static final int keyAgree = 2;
-    public static final int password = 3;
-
-    private final int type;
-
-    protected RecipientId(int type)
-    {
-        this.type = type;
-    }
-
-    /**
-     * Return the type code for this recipient ID.
-     *
-     * @return one of keyTrans, kek, keyAgree, password
-     */
-    public int getType()
-    {
-        return type;
-    }
-
-    public abstract Object clone();
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cms/RecipientInfoGenerator.java b/bcpkix/src/main/java/org/bouncycastle/cms/RecipientInfoGenerator.java
deleted file mode 100644
index 6ab41d3..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cms/RecipientInfoGenerator.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package org.bouncycastle.cms;
-
-import org.bouncycastle.asn1.cms.RecipientInfo;
-import org.bouncycastle.operator.GenericKey;
-
-public interface RecipientInfoGenerator
-{
-    RecipientInfo generate(GenericKey contentEncryptionKey)
-        throws CMSException;
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cms/RecipientInformation.java b/bcpkix/src/main/java/org/bouncycastle/cms/RecipientInformation.java
deleted file mode 100644
index 86f9fa3..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cms/RecipientInformation.java
+++ /dev/null
@@ -1,181 +0,0 @@
-package org.bouncycastle.cms;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1Encoding;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.util.io.Streams;
-
-public abstract class RecipientInformation
-{
-    protected RecipientId rid;
-    protected AlgorithmIdentifier   keyEncAlg;
-    protected AlgorithmIdentifier messageAlgorithm;
-    protected CMSSecureReadable     secureReadable;
-
-    private AuthAttributesProvider additionalData;
-
-    private byte[] resultMac;
-    private RecipientOperator     operator;
-
-    RecipientInformation(
-        AlgorithmIdentifier     keyEncAlg,
-        AlgorithmIdentifier     messageAlgorithm,
-        CMSSecureReadable       secureReadable,
-        AuthAttributesProvider  additionalData)
-    {
-        this.keyEncAlg = keyEncAlg;
-        this.messageAlgorithm = messageAlgorithm;
-        this.secureReadable = secureReadable;
-        this.additionalData = additionalData;
-    }
-
-    public RecipientId getRID()
-    {
-        return rid;
-    }
-
-    private byte[] encodeObj(
-        ASN1Encodable obj)
-        throws IOException
-    {
-        if (obj != null)
-        {
-            return obj.toASN1Primitive().getEncoded();
-        }
-
-        return null;
-    }
-
-    /**
-     * Return the key encryption algorithm details for the key in this recipient.
-     *
-     * @return AlgorithmIdentifier representing the key encryption algorithm.
-     */
-    public AlgorithmIdentifier getKeyEncryptionAlgorithm()
-    {
-        return keyEncAlg;
-    }
-
-    /**
-     * return the object identifier for the key encryption algorithm.
-     *
-     * @return OID for key encryption algorithm.
-     */
-    public String getKeyEncryptionAlgOID()
-    {
-        return keyEncAlg.getAlgorithm().getId();
-    }
-
-    /**
-     * return the ASN.1 encoded key encryption algorithm parameters, or null if
-     * there aren't any.
-     *
-     * @return ASN.1 encoding of key encryption algorithm parameters.
-     */
-    public byte[] getKeyEncryptionAlgParams()
-    {
-        try
-        {
-            return encodeObj(keyEncAlg.getParameters());
-        }
-        catch (Exception e)
-        {
-            throw new RuntimeException("exception getting encryption parameters " + e);
-        }
-    }
-
-    /**
-     * Return the content digest calculated during the read of the content if one has been generated. This will
-     * only happen if we are dealing with authenticated data and authenticated attributes are present.
-     *
-     * @return byte array containing the digest.
-     */
-    public byte[] getContentDigest()
-    {
-        if (secureReadable instanceof CMSEnvelopedHelper.CMSDigestAuthenticatedSecureReadable)
-        {
-            return ((CMSEnvelopedHelper.CMSDigestAuthenticatedSecureReadable)secureReadable).getDigest();
-        }
-
-        return null;
-    }
-
-    /**
-     * Return the MAC calculated for the recipient. Note: this call is only meaningful once all
-     * the content has been read.
-     *
-     * @return  byte array containing the mac.
-     */
-    public byte[] getMac()
-    {
-        if (resultMac == null)
-        {
-            if (operator.isMacBased())
-            {
-                if (additionalData != null)
-                {
-                    try
-                    {
-                        Streams.drain(operator.getInputStream(new ByteArrayInputStream(additionalData.getAuthAttributes().getEncoded(ASN1Encoding.DER))));
-                    }
-                    catch (IOException e)
-                    {
-                        throw new IllegalStateException("unable to drain input: " + e.getMessage());
-                    }
-                }
-                resultMac = operator.getMac();
-            }
-        }
-
-        return resultMac;
-    }
-
-    /**
-     * Return the decrypted/encapsulated content in the EnvelopedData after recovering the content
-     * encryption/MAC key using the passed in Recipient.
-     *
-     * @param recipient recipient object to use to recover content encryption key
-     * @return  the content inside the EnvelopedData this RecipientInformation is associated with.
-     * @throws CMSException if the content-encryption/MAC key cannot be recovered.
-     */
-    public byte[] getContent(
-        Recipient recipient)
-        throws CMSException
-    {
-        try
-        {
-            return CMSUtils.streamToByteArray(getContentStream(recipient).getContentStream());
-        }
-        catch (IOException e)
-        {
-            throw new CMSException("unable to parse internal stream: " + e.getMessage(), e);
-        }
-    }
-
-    /**
-     * Return a CMSTypedStream representing the content in the EnvelopedData after recovering the content
-     * encryption/MAC key using the passed in Recipient.
-     *
-     * @param recipient recipient object to use to recover content encryption key
-     * @return  the content inside the EnvelopedData this RecipientInformation is associated with.
-     * @throws CMSException if the content-encryption/MAC key cannot be recovered.
-     */
-    public CMSTypedStream getContentStream(Recipient recipient)
-        throws CMSException, IOException
-    {
-        operator = getRecipientOperator(recipient);
-
-        if (additionalData != null)
-        {
-            return new CMSTypedStream(secureReadable.getInputStream());
-        }
-
-        return new CMSTypedStream(operator.getInputStream(secureReadable.getInputStream()));
-    }
-
-    protected abstract RecipientOperator getRecipientOperator(Recipient recipient)
-        throws CMSException, IOException;
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cms/RecipientInformationStore.java b/bcpkix/src/main/java/org/bouncycastle/cms/RecipientInformationStore.java
deleted file mode 100644
index fdcd930..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cms/RecipientInformationStore.java
+++ /dev/null
@@ -1,143 +0,0 @@
-package org.bouncycastle.cms;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.bouncycastle.asn1.x500.X500Name;
-import org.bouncycastle.util.*;
-import org.bouncycastle.util.Iterable;
-
-public class RecipientInformationStore
-    implements Iterable<RecipientInformation>
-{
-    private final List all; //ArrayList[RecipientInformation]
-    private final Map table = new HashMap(); // HashMap[RecipientID, ArrayList[RecipientInformation]]
-
-    /**
-     * Create a store containing a single RecipientInformation object.
-     *
-     * @param recipientInformation the signer information to contain.
-     */
-    public RecipientInformationStore(
-        RecipientInformation  recipientInformation)
-    {
-        this.all = new ArrayList(1);
-        this.all.add(recipientInformation);
-
-        RecipientId sid = recipientInformation.getRID();
-
-        table.put(sid, all);
-    }
-
-    public RecipientInformationStore(
-        Collection<RecipientInformation> recipientInfos)
-    {
-        Iterator it = recipientInfos.iterator();
-
-        while (it.hasNext())
-        {
-            RecipientInformation recipientInformation = (RecipientInformation)it.next();
-            RecipientId rid = recipientInformation.getRID();
-
-            List list = (ArrayList)table.get(rid);
-            if (list == null)
-            {
-                list = new ArrayList(1);
-                table.put(rid, list);
-            }
-
-            list.add(recipientInformation);
-        }
-
-        this.all = new ArrayList(recipientInfos);
-    }
-
-    /**
-     * Return the first RecipientInformation object that matches the
-     * passed in selector. Null if there are no matches.
-     *
-     * @param selector to identify a recipient
-     * @return a single RecipientInformation object. Null if none matches.
-     */
-    public RecipientInformation get(
-        RecipientId selector)
-    {
-        Collection list = getRecipients(selector);
-
-        return list.size() == 0 ? null : (RecipientInformation)list.iterator().next();
-    }
-
-    /**
-     * Return the number of recipients in the collection.
-     *
-     * @return number of recipients identified.
-     */
-    public int size()
-    {
-        return all.size();
-    }
-
-    /**
-     * Return all recipients in the collection
-     *
-     * @return a collection of recipients.
-     */
-    public Collection<RecipientInformation> getRecipients()
-    {
-        return new ArrayList(all);
-    }
-
-    /**
-     * Return possible empty collection with recipients matching the passed in RecipientId
-     *
-     * @param selector a recipient id to select against.
-     * @return a collection of RecipientInformation objects.
-     */
-    public Collection<Recipient> getRecipients(
-        RecipientId selector)
-    {
-        if (selector instanceof KeyTransRecipientId)
-        {
-            KeyTransRecipientId keyTrans = (KeyTransRecipientId)selector;
-
-            X500Name issuer = keyTrans.getIssuer();
-            byte[] subjectKeyId = keyTrans.getSubjectKeyIdentifier();
-
-            if (issuer != null && subjectKeyId != null)
-            {
-                List results = new ArrayList();
-
-                Collection match1 = getRecipients(new KeyTransRecipientId(issuer, keyTrans.getSerialNumber()));
-                if (match1 != null)
-                {
-                    results.addAll(match1);
-                }
-
-                Collection match2 = getRecipients(new KeyTransRecipientId(subjectKeyId));
-                if (match2 != null)
-                {
-                    results.addAll(match2);
-                }
-
-                return results;
-            }
-        }
-
-        List list = (ArrayList)table.get(selector);
-
-        return list == null ? new ArrayList() : new ArrayList(list);
-    }
-
-
-    /**
-     * Support method for Iterable where available.
-     */
-    public Iterator<RecipientInformation> iterator()
-    {
-        return getRecipients().iterator();
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cms/SignerInformationVerifierProvider.java b/bcpkix/src/main/java/org/bouncycastle/cms/SignerInformationVerifierProvider.java
deleted file mode 100644
index 5568b0e..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cms/SignerInformationVerifierProvider.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.bouncycastle.cms;
-
-import org.bouncycastle.operator.OperatorCreationException;
-
-public interface SignerInformationVerifierProvider
-{
-    /**
-     * Return a SignerInformationVerifierProvider suitable for the passed in SID.
-     *
-     * @param sid the SignerId we are trying to match for.
-     * @return  a verifier if one is available, null otherwise.
-     * @throws OperatorCreationException if creation of the verifier fails when it should suceed.
-     */
-    public SignerInformationVerifier get(SignerId sid)
-          throws OperatorCreationException;
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cms/bc/BcCMSContentEncryptorBuilder.java b/bcpkix/src/main/java/org/bouncycastle/cms/bc/BcCMSContentEncryptorBuilder.java
deleted file mode 100644
index a12c66b..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cms/bc/BcCMSContentEncryptorBuilder.java
+++ /dev/null
@@ -1,124 +0,0 @@
-package org.bouncycastle.cms.bc;
-
-import java.io.OutputStream;
-import java.security.SecureRandom;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.cms.CMSAlgorithm;
-import org.bouncycastle.cms.CMSException;
-import org.bouncycastle.crypto.BufferedBlockCipher;
-import org.bouncycastle.crypto.CipherKeyGenerator;
-import org.bouncycastle.crypto.StreamCipher;
-import org.bouncycastle.crypto.io.CipherOutputStream;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.operator.GenericKey;
-import org.bouncycastle.operator.OutputEncryptor;
-import org.bouncycastle.util.Integers;
-
-public class BcCMSContentEncryptorBuilder
-{
-    private static Map keySizes = new HashMap();
-
-    static
-    {
-        keySizes.put(CMSAlgorithm.AES128_CBC, Integers.valueOf(128));
-        keySizes.put(CMSAlgorithm.AES192_CBC, Integers.valueOf(192));
-        keySizes.put(CMSAlgorithm.AES256_CBC, Integers.valueOf(256));
-
-        keySizes.put(CMSAlgorithm.CAMELLIA128_CBC, Integers.valueOf(128));
-        keySizes.put(CMSAlgorithm.CAMELLIA192_CBC, Integers.valueOf(192));
-        keySizes.put(CMSAlgorithm.CAMELLIA256_CBC, Integers.valueOf(256));
-    }
-
-    private static int getKeySize(ASN1ObjectIdentifier oid)
-    {
-        Integer size = (Integer)keySizes.get(oid);
-
-        if (size != null)
-        {
-            return size.intValue();
-        }
-
-        return -1;
-    }
-
-    private final ASN1ObjectIdentifier encryptionOID;
-    private final int                  keySize;
-
-    private EnvelopedDataHelper helper = new EnvelopedDataHelper();
-    private SecureRandom random;
-
-    public BcCMSContentEncryptorBuilder(ASN1ObjectIdentifier encryptionOID)
-    {
-        this(encryptionOID, getKeySize(encryptionOID));
-    }
-
-    public BcCMSContentEncryptorBuilder(ASN1ObjectIdentifier encryptionOID, int keySize)
-    {
-        this.encryptionOID = encryptionOID;
-        this.keySize = keySize;
-    }
-
-    public BcCMSContentEncryptorBuilder setSecureRandom(SecureRandom random)
-    {
-        this.random = random;
-
-        return this;
-    }
-
-    public OutputEncryptor build()
-        throws CMSException
-    {
-        return new CMSOutputEncryptor(encryptionOID, keySize, random);
-    }
-
-    private class CMSOutputEncryptor
-        implements OutputEncryptor
-    {
-        private KeyParameter encKey;
-        private AlgorithmIdentifier algorithmIdentifier;
-        private Object             cipher;
-
-        CMSOutputEncryptor(ASN1ObjectIdentifier encryptionOID, int keySize, SecureRandom random)
-            throws CMSException
-        {
-            if (random == null)
-            {
-                random = new SecureRandom();
-            }
-
-            CipherKeyGenerator keyGen = helper.createKeyGenerator(encryptionOID, random);
-
-            encKey = new KeyParameter(keyGen.generateKey());
-
-            algorithmIdentifier = helper.generateAlgorithmIdentifier(encryptionOID, encKey, random);
-
-            cipher = helper.createContentCipher(true, encKey, algorithmIdentifier);
-        }
-
-        public AlgorithmIdentifier getAlgorithmIdentifier()
-        {
-            return algorithmIdentifier;
-        }
-
-        public OutputStream getOutputStream(OutputStream dOut)
-        {
-            if (cipher instanceof BufferedBlockCipher)
-            {
-                return new CipherOutputStream(dOut, (BufferedBlockCipher)cipher);
-            }
-            else
-            {
-                return new CipherOutputStream(dOut, (StreamCipher)cipher);
-            }
-        }
-
-        public GenericKey getKey()
-        {
-            return new GenericKey(algorithmIdentifier, encKey.getKey());
-        }
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cms/bc/BcKEKEnvelopedRecipient.java b/bcpkix/src/main/java/org/bouncycastle/cms/bc/BcKEKEnvelopedRecipient.java
deleted file mode 100644
index 5641d82..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cms/bc/BcKEKEnvelopedRecipient.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package org.bouncycastle.cms.bc;
-
-import java.io.InputStream;
-
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.cms.CMSException;
-import org.bouncycastle.cms.RecipientOperator;
-import org.bouncycastle.crypto.BufferedBlockCipher;
-import org.bouncycastle.crypto.StreamCipher;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.operator.InputDecryptor;
-import org.bouncycastle.operator.bc.BcSymmetricKeyUnwrapper;
-
-public class BcKEKEnvelopedRecipient
-    extends BcKEKRecipient
-{
-    public BcKEKEnvelopedRecipient(BcSymmetricKeyUnwrapper unwrapper)
-    {
-        super(unwrapper);
-    }
-
-    public RecipientOperator getRecipientOperator(AlgorithmIdentifier keyEncryptionAlgorithm, final AlgorithmIdentifier contentEncryptionAlgorithm, byte[] encryptedContentEncryptionKey)
-        throws CMSException
-    {
-        KeyParameter secretKey = (KeyParameter)extractSecretKey(keyEncryptionAlgorithm, contentEncryptionAlgorithm, encryptedContentEncryptionKey);
-
-        final Object dataCipher = EnvelopedDataHelper.createContentCipher(false, secretKey, contentEncryptionAlgorithm);
-
-        return new RecipientOperator(new InputDecryptor()
-        {
-            public AlgorithmIdentifier getAlgorithmIdentifier()
-            {
-                return contentEncryptionAlgorithm;
-            }
-
-            public InputStream getInputStream(InputStream dataOut)
-            {
-                if (dataCipher instanceof BufferedBlockCipher)
-                {
-                    return new org.bouncycastle.crypto.io.CipherInputStream(dataOut, (BufferedBlockCipher)dataCipher);
-                }
-                else
-                {
-                    return new org.bouncycastle.crypto.io.CipherInputStream(dataOut, (StreamCipher)dataCipher);
-                }
-            }
-        });
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cms/bc/BcKEKRecipient.java b/bcpkix/src/main/java/org/bouncycastle/cms/bc/BcKEKRecipient.java
deleted file mode 100644
index a7d5eb7..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cms/bc/BcKEKRecipient.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package org.bouncycastle.cms.bc;
-
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.cms.CMSException;
-import org.bouncycastle.cms.KEKRecipient;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.operator.OperatorException;
-import org.bouncycastle.operator.SymmetricKeyUnwrapper;
-import org.bouncycastle.operator.bc.BcSymmetricKeyUnwrapper;
-
-public abstract class BcKEKRecipient
-    implements KEKRecipient
-{
-    private SymmetricKeyUnwrapper unwrapper;
-
-    public BcKEKRecipient(BcSymmetricKeyUnwrapper unwrapper)
-    {
-        this.unwrapper = unwrapper;
-    }
-
-    protected CipherParameters extractSecretKey(AlgorithmIdentifier keyEncryptionAlgorithm, AlgorithmIdentifier contentEncryptionAlgorithm, byte[] encryptedContentEncryptionKey)
-        throws CMSException
-    {
-        try
-        {
-            return CMSUtils.getBcKey(unwrapper.generateUnwrappedKey(contentEncryptionAlgorithm, encryptedContentEncryptionKey));
-        }
-        catch (OperatorException e)
-        {
-            throw new CMSException("exception unwrapping key: " + e.getMessage(), e);
-        }
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cms/bc/BcKEKRecipientInfoGenerator.java b/bcpkix/src/main/java/org/bouncycastle/cms/bc/BcKEKRecipientInfoGenerator.java
deleted file mode 100644
index 309ad64..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cms/bc/BcKEKRecipientInfoGenerator.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package org.bouncycastle.cms.bc;
-
-import org.bouncycastle.asn1.cms.KEKIdentifier;
-import org.bouncycastle.cms.KEKRecipientInfoGenerator;
-import org.bouncycastle.operator.bc.BcSymmetricKeyWrapper;
-
-public class BcKEKRecipientInfoGenerator
-    extends KEKRecipientInfoGenerator
-{
-    public BcKEKRecipientInfoGenerator(KEKIdentifier kekIdentifier, BcSymmetricKeyWrapper kekWrapper)
-    {
-        super(kekIdentifier, kekWrapper);
-    }
-
-    public BcKEKRecipientInfoGenerator(byte[] keyIdentifier, BcSymmetricKeyWrapper kekWrapper)
-    {
-        this(new KEKIdentifier(keyIdentifier, null, null), kekWrapper);
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cms/bc/BcKeyTransRecipient.java b/bcpkix/src/main/java/org/bouncycastle/cms/bc/BcKeyTransRecipient.java
deleted file mode 100644
index 8c69885..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cms/bc/BcKeyTransRecipient.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package org.bouncycastle.cms.bc;
-
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.cms.CMSException;
-import org.bouncycastle.cms.KeyTransRecipient;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.params.AsymmetricKeyParameter;
-import org.bouncycastle.operator.AsymmetricKeyUnwrapper;
-import org.bouncycastle.operator.OperatorException;
-import org.bouncycastle.operator.bc.BcRSAAsymmetricKeyUnwrapper;
-
-public abstract class BcKeyTransRecipient
-    implements KeyTransRecipient
-{
-    private AsymmetricKeyParameter recipientKey;
-
-    public BcKeyTransRecipient(AsymmetricKeyParameter recipientKey)
-    {
-        this.recipientKey = recipientKey;
-    }
-
-    protected CipherParameters extractSecretKey(AlgorithmIdentifier keyEncryptionAlgorithm, AlgorithmIdentifier encryptedKeyAlgorithm, byte[] encryptedEncryptionKey)
-        throws CMSException
-    {
-        AsymmetricKeyUnwrapper unwrapper = new BcRSAAsymmetricKeyUnwrapper(keyEncryptionAlgorithm, recipientKey);
-
-        try
-        {
-            return CMSUtils.getBcKey(unwrapper.generateUnwrappedKey(encryptedKeyAlgorithm, encryptedEncryptionKey));
-        }
-        catch (OperatorException e)
-        {
-            throw new CMSException("exception unwrapping key: " + e.getMessage(), e);
-        }
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cms/bc/BcKeyTransRecipientInfoGenerator.java b/bcpkix/src/main/java/org/bouncycastle/cms/bc/BcKeyTransRecipientInfoGenerator.java
deleted file mode 100644
index eebbbda..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cms/bc/BcKeyTransRecipientInfoGenerator.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package org.bouncycastle.cms.bc;
-
-import org.bouncycastle.asn1.cms.IssuerAndSerialNumber;
-import org.bouncycastle.cert.X509CertificateHolder;
-import org.bouncycastle.cms.KeyTransRecipientInfoGenerator;
-import org.bouncycastle.operator.bc.BcAsymmetricKeyWrapper;
-
-public abstract class BcKeyTransRecipientInfoGenerator
-    extends KeyTransRecipientInfoGenerator
-{
-    public BcKeyTransRecipientInfoGenerator(X509CertificateHolder recipientCert, BcAsymmetricKeyWrapper wrapper)
-    {
-        super(new IssuerAndSerialNumber(recipientCert.toASN1Structure()), wrapper);
-    }
-
-    public BcKeyTransRecipientInfoGenerator(byte[] subjectKeyIdentifier, BcAsymmetricKeyWrapper wrapper)
-    {
-        super(subjectKeyIdentifier, wrapper);
-    }
-}
\ No newline at end of file
diff --git a/bcpkix/src/main/java/org/bouncycastle/cms/bc/BcPasswordEnvelopedRecipient.java b/bcpkix/src/main/java/org/bouncycastle/cms/bc/BcPasswordEnvelopedRecipient.java
deleted file mode 100644
index d3d38cf..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cms/bc/BcPasswordEnvelopedRecipient.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package org.bouncycastle.cms.bc;
-
-import java.io.InputStream;
-
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.cms.CMSException;
-import org.bouncycastle.cms.RecipientOperator;
-import org.bouncycastle.crypto.BufferedBlockCipher;
-import org.bouncycastle.crypto.StreamCipher;
-import org.bouncycastle.crypto.io.CipherInputStream;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.operator.InputDecryptor;
-
-public class BcPasswordEnvelopedRecipient
-    extends BcPasswordRecipient
-{
-    public BcPasswordEnvelopedRecipient(char[] password)
-    {
-        super(password);
-    }
-
-    public RecipientOperator getRecipientOperator(AlgorithmIdentifier keyEncryptionAlgorithm, final AlgorithmIdentifier contentEncryptionAlgorithm, byte[] derivedKey, byte[] encryptedContentEncryptionKey)
-        throws CMSException
-    {
-        KeyParameter secretKey = extractSecretKey(keyEncryptionAlgorithm, contentEncryptionAlgorithm, derivedKey, encryptedContentEncryptionKey);
-
-        final Object dataCipher = EnvelopedDataHelper.createContentCipher(false, secretKey, contentEncryptionAlgorithm);
-
-        return new RecipientOperator(new InputDecryptor()
-        {
-            public AlgorithmIdentifier getAlgorithmIdentifier()
-            {
-                return contentEncryptionAlgorithm;
-            }
-
-            public InputStream getInputStream(InputStream dataOut)
-            {
-                if (dataCipher instanceof BufferedBlockCipher)
-                {
-                    return new CipherInputStream(dataOut, (BufferedBlockCipher)dataCipher);
-                }
-                else
-                {
-                    return new CipherInputStream(dataOut, (StreamCipher)dataCipher);
-                }
-            }
-        });
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cms/bc/BcPasswordRecipient.java b/bcpkix/src/main/java/org/bouncycastle/cms/bc/BcPasswordRecipient.java
deleted file mode 100644
index 50f9c6c..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cms/bc/BcPasswordRecipient.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package org.bouncycastle.cms.bc;
-
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.pkcs.PBKDF2Params;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.cms.CMSException;
-import org.bouncycastle.cms.PasswordRecipient;
-import org.bouncycastle.crypto.InvalidCipherTextException;
-import org.bouncycastle.crypto.Wrapper;
-import org.bouncycastle.crypto.generators.PKCS5S2ParametersGenerator;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.crypto.params.ParametersWithIV;
-
-/**
- * the RecipientInfo class for a recipient who has been sent a message
- * encrypted using a password.
- */
-public abstract class BcPasswordRecipient
-    implements PasswordRecipient
-{
-    private int schemeID = PasswordRecipient.PKCS5_SCHEME2_UTF8;
-    private char[] password;
-
-    BcPasswordRecipient(
-        char[] password)
-    {
-        this.password = password;
-    }
-
-    public BcPasswordRecipient setPasswordConversionScheme(int schemeID)
-    {
-        this.schemeID = schemeID;
-
-        return this;
-    }
-
-    protected KeyParameter extractSecretKey(AlgorithmIdentifier keyEncryptionAlgorithm, AlgorithmIdentifier contentEncryptionAlgorithm, byte[] derivedKey, byte[] encryptedContentEncryptionKey)
-        throws CMSException
-    {
-        Wrapper keyEncryptionCipher = EnvelopedDataHelper.createRFC3211Wrapper(keyEncryptionAlgorithm.getAlgorithm());
-
-        keyEncryptionCipher.init(false, new ParametersWithIV(new KeyParameter(derivedKey), ASN1OctetString.getInstance(keyEncryptionAlgorithm.getParameters()).getOctets()));
-
-        try
-        {
-            return new KeyParameter(keyEncryptionCipher.unwrap(encryptedContentEncryptionKey, 0, encryptedContentEncryptionKey.length));
-        }
-        catch (InvalidCipherTextException e)
-        {
-            throw new CMSException("unable to unwrap key: " + e.getMessage(), e);
-        }
-    }
-
-    public byte[] calculateDerivedKey(byte[] encodedPassword, AlgorithmIdentifier derivationAlgorithm, int keySize)
-        throws CMSException
-    {
-        PBKDF2Params params = PBKDF2Params.getInstance(derivationAlgorithm.getParameters());
-
-        PKCS5S2ParametersGenerator gen = new PKCS5S2ParametersGenerator();
-
-        gen.init(encodedPassword, params.getSalt(), params.getIterationCount().intValue());
-
-        return ((KeyParameter)gen.generateDerivedParameters(keySize)).getKey();
-    }
-
-    public int getPasswordConversionScheme()
-    {
-        return schemeID;
-    }
-
-    public char[] getPassword()
-    {
-        return password;
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cms/bc/BcPasswordRecipientInfoGenerator.java b/bcpkix/src/main/java/org/bouncycastle/cms/bc/BcPasswordRecipientInfoGenerator.java
deleted file mode 100644
index 6e1bfdb..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cms/bc/BcPasswordRecipientInfoGenerator.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package org.bouncycastle.cms.bc;
-
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.pkcs.PBKDF2Params;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.cms.CMSException;
-import org.bouncycastle.cms.PasswordRecipientInfoGenerator;
-import org.bouncycastle.crypto.Wrapper;
-import org.bouncycastle.crypto.generators.PKCS5S2ParametersGenerator;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.crypto.params.ParametersWithIV;
-import org.bouncycastle.operator.GenericKey;
-
-public class BcPasswordRecipientInfoGenerator
-    extends PasswordRecipientInfoGenerator
-{
-    public BcPasswordRecipientInfoGenerator(ASN1ObjectIdentifier kekAlgorithm, char[] password)
-    {
-        super(kekAlgorithm, password);
-    }
-
-    protected byte[] calculateDerivedKey(byte[] encodedPassword, AlgorithmIdentifier derivationAlgorithm, int keySize)
-        throws CMSException
-    {
-        PBKDF2Params params = PBKDF2Params.getInstance(derivationAlgorithm.getParameters());
-
-        PKCS5S2ParametersGenerator gen = new PKCS5S2ParametersGenerator();
-
-        gen.init(encodedPassword, params.getSalt(), params.getIterationCount().intValue());
-
-        return ((KeyParameter)gen.generateDerivedParameters(keySize)).getKey();
-    }
-
-    public byte[] generateEncryptedBytes(AlgorithmIdentifier keyEncryptionAlgorithm, byte[] derivedKey, GenericKey contentEncryptionKey)
-        throws CMSException
-    {
-        byte[] contentEncryptionKeySpec = ((KeyParameter)CMSUtils.getBcKey(contentEncryptionKey)).getKey();
-        Wrapper keyEncryptionCipher = EnvelopedDataHelper.createRFC3211Wrapper(keyEncryptionAlgorithm.getAlgorithm());
-
-        keyEncryptionCipher.init(true, new ParametersWithIV(new KeyParameter(derivedKey), ASN1OctetString.getInstance(keyEncryptionAlgorithm.getParameters()).getOctets()));
-
-        return keyEncryptionCipher.wrap(contentEncryptionKeySpec, 0, contentEncryptionKeySpec.length);
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cms/bc/BcRSAKeyTransEnvelopedRecipient.java b/bcpkix/src/main/java/org/bouncycastle/cms/bc/BcRSAKeyTransEnvelopedRecipient.java
deleted file mode 100644
index ed933fe..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cms/bc/BcRSAKeyTransEnvelopedRecipient.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package org.bouncycastle.cms.bc;
-
-import java.io.InputStream;
-
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.cms.CMSException;
-import org.bouncycastle.cms.RecipientOperator;
-import org.bouncycastle.crypto.BufferedBlockCipher;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.StreamCipher;
-import org.bouncycastle.crypto.io.CipherInputStream;
-import org.bouncycastle.crypto.params.AsymmetricKeyParameter;
-import org.bouncycastle.operator.InputDecryptor;
-
-public class BcRSAKeyTransEnvelopedRecipient
-    extends BcKeyTransRecipient
-{
-    public BcRSAKeyTransEnvelopedRecipient(AsymmetricKeyParameter key)
-    {
-        super(key);
-    }
-
-    public RecipientOperator getRecipientOperator(AlgorithmIdentifier keyEncryptionAlgorithm, final AlgorithmIdentifier contentEncryptionAlgorithm, byte[] encryptedContentEncryptionKey)
-        throws CMSException
-    {
-        CipherParameters secretKey = extractSecretKey(keyEncryptionAlgorithm, contentEncryptionAlgorithm, encryptedContentEncryptionKey);
-
-        final Object dataCipher = EnvelopedDataHelper.createContentCipher(false, secretKey, contentEncryptionAlgorithm);
-
-        return new RecipientOperator(new InputDecryptor()
-        {
-            public AlgorithmIdentifier getAlgorithmIdentifier()
-            {
-                return contentEncryptionAlgorithm;
-            }
-
-            public InputStream getInputStream(InputStream dataIn)
-            {
-                if (dataCipher instanceof BufferedBlockCipher)
-                {
-                    return new CipherInputStream(dataIn, (BufferedBlockCipher)dataCipher);
-                }
-                else
-                {
-                    return new CipherInputStream(dataIn, (StreamCipher)dataCipher);
-                }
-            }
-        });
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cms/bc/BcRSAKeyTransRecipientInfoGenerator.java b/bcpkix/src/main/java/org/bouncycastle/cms/bc/BcRSAKeyTransRecipientInfoGenerator.java
deleted file mode 100644
index b571b9a..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cms/bc/BcRSAKeyTransRecipientInfoGenerator.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package org.bouncycastle.cms.bc;
-
-import java.io.IOException;
-
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.cert.X509CertificateHolder;
-import org.bouncycastle.crypto.params.AsymmetricKeyParameter;
-import org.bouncycastle.operator.bc.BcRSAAsymmetricKeyWrapper;
-
-public class BcRSAKeyTransRecipientInfoGenerator
-    extends BcKeyTransRecipientInfoGenerator
-{
-    public BcRSAKeyTransRecipientInfoGenerator(byte[] subjectKeyIdentifier, AlgorithmIdentifier encAlgId, AsymmetricKeyParameter publicKey)
-    {
-        super(subjectKeyIdentifier, new BcRSAAsymmetricKeyWrapper(encAlgId, publicKey));
-    }
-
-    public BcRSAKeyTransRecipientInfoGenerator(X509CertificateHolder recipientCert)
-        throws IOException
-    {
-        super(recipientCert, new BcRSAAsymmetricKeyWrapper(recipientCert.getSubjectPublicKeyInfo().getAlgorithmId(), recipientCert.getSubjectPublicKeyInfo()));
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cms/bc/BcRSASignerInfoVerifierBuilder.java b/bcpkix/src/main/java/org/bouncycastle/cms/bc/BcRSASignerInfoVerifierBuilder.java
deleted file mode 100644
index 93abd65..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cms/bc/BcRSASignerInfoVerifierBuilder.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package org.bouncycastle.cms.bc;
-
-import org.bouncycastle.cert.X509CertificateHolder;
-import org.bouncycastle.cms.CMSSignatureAlgorithmNameGenerator;
-import org.bouncycastle.cms.SignerInformationVerifier;
-import org.bouncycastle.crypto.params.AsymmetricKeyParameter;
-import org.bouncycastle.operator.DigestAlgorithmIdentifierFinder;
-import org.bouncycastle.operator.DigestCalculatorProvider;
-import org.bouncycastle.operator.OperatorCreationException;
-import org.bouncycastle.operator.SignatureAlgorithmIdentifierFinder;
-import org.bouncycastle.operator.bc.BcRSAContentVerifierProviderBuilder;
-
-public class BcRSASignerInfoVerifierBuilder
-{
-    private BcRSAContentVerifierProviderBuilder contentVerifierProviderBuilder;
-    private DigestCalculatorProvider digestCalculatorProvider;
-    private CMSSignatureAlgorithmNameGenerator sigAlgNameGen;
-    private SignatureAlgorithmIdentifierFinder sigAlgIdFinder;
-
-    public BcRSASignerInfoVerifierBuilder(CMSSignatureAlgorithmNameGenerator sigAlgNameGen, SignatureAlgorithmIdentifierFinder sigAlgIdFinder, DigestAlgorithmIdentifierFinder digestAlgorithmFinder, DigestCalculatorProvider digestCalculatorProvider)
-    {
-        this.sigAlgNameGen = sigAlgNameGen;
-        this.sigAlgIdFinder = sigAlgIdFinder;
-        this.contentVerifierProviderBuilder = new BcRSAContentVerifierProviderBuilder(digestAlgorithmFinder);
-        this.digestCalculatorProvider = digestCalculatorProvider;
-    }
-
-    public SignerInformationVerifier build(X509CertificateHolder certHolder)
-        throws OperatorCreationException
-    {
-        return new SignerInformationVerifier(sigAlgNameGen, sigAlgIdFinder, contentVerifierProviderBuilder.build(certHolder), digestCalculatorProvider);
-    }
-
-    public SignerInformationVerifier build(AsymmetricKeyParameter pubKey)
-        throws OperatorCreationException
-    {
-        return new SignerInformationVerifier(sigAlgNameGen, sigAlgIdFinder, contentVerifierProviderBuilder.build(pubKey), digestCalculatorProvider);
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cms/bc/CMSUtils.java b/bcpkix/src/main/java/org/bouncycastle/cms/bc/CMSUtils.java
deleted file mode 100644
index 8beb36a..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cms/bc/CMSUtils.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package org.bouncycastle.cms.bc;
-
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.operator.GenericKey;
-
-class CMSUtils
-{
-    static CipherParameters getBcKey(GenericKey key)
-    {
-        if (key.getRepresentation() instanceof CipherParameters)
-        {
-            return (CipherParameters)key.getRepresentation();
-        }
-
-        if (key.getRepresentation() instanceof byte[])
-        {
-            return new KeyParameter((byte[])key.getRepresentation());
-        }
-
-        throw new IllegalArgumentException("unknown generic key type");
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cms/bc/EnvelopedDataHelper.java b/bcpkix/src/main/java/org/bouncycastle/cms/bc/EnvelopedDataHelper.java
deleted file mode 100644
index bb7c3cd..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cms/bc/EnvelopedDataHelper.java
+++ /dev/null
@@ -1,378 +0,0 @@
-package org.bouncycastle.cms.bc;
-
-import java.security.SecureRandom;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.bouncycastle.asn1.ASN1Null;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.DERNull;
-import org.bouncycastle.asn1.DEROctetString;
-import org.bouncycastle.asn1.kisa.KISAObjectIdentifiers;
-import org.bouncycastle.asn1.misc.CAST5CBCParameters;
-import org.bouncycastle.asn1.nist.NISTObjectIdentifiers;
-import org.bouncycastle.asn1.ntt.NTTObjectIdentifiers;
-import org.bouncycastle.asn1.oiw.OIWObjectIdentifiers;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.asn1.pkcs.RC2CBCParameter;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.cms.CMSAlgorithm;
-import org.bouncycastle.cms.CMSException;
-import org.bouncycastle.crypto.BlockCipher;
-import org.bouncycastle.crypto.BufferedBlockCipher;
-import org.bouncycastle.crypto.CipherKeyGenerator;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.KeyGenerationParameters;
-import org.bouncycastle.crypto.StreamCipher;
-import org.bouncycastle.crypto.Wrapper;
-import org.bouncycastle.crypto.engines.AESEngine;
-import org.bouncycastle.crypto.engines.DESEngine;
-import org.bouncycastle.crypto.engines.DESedeEngine;
-import org.bouncycastle.crypto.engines.RC2Engine;
-import org.bouncycastle.crypto.engines.RC4Engine;
-import org.bouncycastle.crypto.engines.RFC3211WrapEngine;
-import org.bouncycastle.crypto.generators.DESKeyGenerator;
-import org.bouncycastle.crypto.generators.DESedeKeyGenerator;
-import org.bouncycastle.crypto.modes.CBCBlockCipher;
-import org.bouncycastle.crypto.paddings.PKCS7Padding;
-import org.bouncycastle.crypto.paddings.PaddedBufferedBlockCipher;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.crypto.params.ParametersWithIV;
-import org.bouncycastle.crypto.params.RC2Parameters;
-
-class EnvelopedDataHelper
-{
-    protected static final Map BASE_CIPHER_NAMES = new HashMap();
-    protected static final Map CIPHER_ALG_NAMES = new HashMap();
-    protected static final Map MAC_ALG_NAMES = new HashMap();
-
-    static
-    {
-        BASE_CIPHER_NAMES.put(CMSAlgorithm.DES_EDE3_CBC, "DESEDE");
-        BASE_CIPHER_NAMES.put(CMSAlgorithm.AES128_CBC, "AES");
-        BASE_CIPHER_NAMES.put(CMSAlgorithm.AES192_CBC, "AES");
-        BASE_CIPHER_NAMES.put(CMSAlgorithm.AES256_CBC, "AES");
-
-        CIPHER_ALG_NAMES.put(CMSAlgorithm.DES_EDE3_CBC, "DESEDE/CBC/PKCS5Padding");
-        CIPHER_ALG_NAMES.put(CMSAlgorithm.AES128_CBC, "AES/CBC/PKCS5Padding");
-        CIPHER_ALG_NAMES.put(CMSAlgorithm.AES192_CBC, "AES/CBC/PKCS5Padding");
-        CIPHER_ALG_NAMES.put(CMSAlgorithm.AES256_CBC, "AES/CBC/PKCS5Padding");
-        CIPHER_ALG_NAMES.put(new ASN1ObjectIdentifier(PKCSObjectIdentifiers.rsaEncryption.getId()), "RSA/ECB/PKCS1Padding");
-        CIPHER_ALG_NAMES.put(CMSAlgorithm.CAST5_CBC, "CAST5/CBC/PKCS5Padding");
-        CIPHER_ALG_NAMES.put(CMSAlgorithm.CAMELLIA128_CBC, "Camellia/CBC/PKCS5Padding");
-        CIPHER_ALG_NAMES.put(CMSAlgorithm.CAMELLIA192_CBC, "Camellia/CBC/PKCS5Padding");
-        CIPHER_ALG_NAMES.put(CMSAlgorithm.CAMELLIA256_CBC, "Camellia/CBC/PKCS5Padding");
-        CIPHER_ALG_NAMES.put(CMSAlgorithm.SEED_CBC, "SEED/CBC/PKCS5Padding");
-
-        MAC_ALG_NAMES.put(CMSAlgorithm.DES_EDE3_CBC, "DESEDEMac");
-        MAC_ALG_NAMES.put(CMSAlgorithm.AES128_CBC, "AESMac");
-        MAC_ALG_NAMES.put(CMSAlgorithm.AES192_CBC, "AESMac");
-        MAC_ALG_NAMES.put(CMSAlgorithm.AES256_CBC, "AESMac");
-        MAC_ALG_NAMES.put(CMSAlgorithm.RC2_CBC, "RC2Mac");
-    }
-
-    private static final short[] rc2Table = {
-        0xbd, 0x56, 0xea, 0xf2, 0xa2, 0xf1, 0xac, 0x2a, 0xb0, 0x93, 0xd1, 0x9c, 0x1b, 0x33, 0xfd, 0xd0,
-        0x30, 0x04, 0xb6, 0xdc, 0x7d, 0xdf, 0x32, 0x4b, 0xf7, 0xcb, 0x45, 0x9b, 0x31, 0xbb, 0x21, 0x5a,
-        0x41, 0x9f, 0xe1, 0xd9, 0x4a, 0x4d, 0x9e, 0xda, 0xa0, 0x68, 0x2c, 0xc3, 0x27, 0x5f, 0x80, 0x36,
-        0x3e, 0xee, 0xfb, 0x95, 0x1a, 0xfe, 0xce, 0xa8, 0x34, 0xa9, 0x13, 0xf0, 0xa6, 0x3f, 0xd8, 0x0c,
-        0x78, 0x24, 0xaf, 0x23, 0x52, 0xc1, 0x67, 0x17, 0xf5, 0x66, 0x90, 0xe7, 0xe8, 0x07, 0xb8, 0x60,
-        0x48, 0xe6, 0x1e, 0x53, 0xf3, 0x92, 0xa4, 0x72, 0x8c, 0x08, 0x15, 0x6e, 0x86, 0x00, 0x84, 0xfa,
-        0xf4, 0x7f, 0x8a, 0x42, 0x19, 0xf6, 0xdb, 0xcd, 0x14, 0x8d, 0x50, 0x12, 0xba, 0x3c, 0x06, 0x4e,
-        0xec, 0xb3, 0x35, 0x11, 0xa1, 0x88, 0x8e, 0x2b, 0x94, 0x99, 0xb7, 0x71, 0x74, 0xd3, 0xe4, 0xbf,
-        0x3a, 0xde, 0x96, 0x0e, 0xbc, 0x0a, 0xed, 0x77, 0xfc, 0x37, 0x6b, 0x03, 0x79, 0x89, 0x62, 0xc6,
-        0xd7, 0xc0, 0xd2, 0x7c, 0x6a, 0x8b, 0x22, 0xa3, 0x5b, 0x05, 0x5d, 0x02, 0x75, 0xd5, 0x61, 0xe3,
-        0x18, 0x8f, 0x55, 0x51, 0xad, 0x1f, 0x0b, 0x5e, 0x85, 0xe5, 0xc2, 0x57, 0x63, 0xca, 0x3d, 0x6c,
-        0xb4, 0xc5, 0xcc, 0x70, 0xb2, 0x91, 0x59, 0x0d, 0x47, 0x20, 0xc8, 0x4f, 0x58, 0xe0, 0x01, 0xe2,
-        0x16, 0x38, 0xc4, 0x6f, 0x3b, 0x0f, 0x65, 0x46, 0xbe, 0x7e, 0x2d, 0x7b, 0x82, 0xf9, 0x40, 0xb5,
-        0x1d, 0x73, 0xf8, 0xeb, 0x26, 0xc7, 0x87, 0x97, 0x25, 0x54, 0xb1, 0x28, 0xaa, 0x98, 0x9d, 0xa5,
-        0x64, 0x6d, 0x7a, 0xd4, 0x10, 0x81, 0x44, 0xef, 0x49, 0xd6, 0xae, 0x2e, 0xdd, 0x76, 0x5c, 0x2f,
-        0xa7, 0x1c, 0xc9, 0x09, 0x69, 0x9a, 0x83, 0xcf, 0x29, 0x39, 0xb9, 0xe9, 0x4c, 0xff, 0x43, 0xab
-    };
-
-    private static final short[] rc2Ekb = {
-        0x5d, 0xbe, 0x9b, 0x8b, 0x11, 0x99, 0x6e, 0x4d, 0x59, 0xf3, 0x85, 0xa6, 0x3f, 0xb7, 0x83, 0xc5,
-        0xe4, 0x73, 0x6b, 0x3a, 0x68, 0x5a, 0xc0, 0x47, 0xa0, 0x64, 0x34, 0x0c, 0xf1, 0xd0, 0x52, 0xa5,
-        0xb9, 0x1e, 0x96, 0x43, 0x41, 0xd8, 0xd4, 0x2c, 0xdb, 0xf8, 0x07, 0x77, 0x2a, 0xca, 0xeb, 0xef,
-        0x10, 0x1c, 0x16, 0x0d, 0x38, 0x72, 0x2f, 0x89, 0xc1, 0xf9, 0x80, 0xc4, 0x6d, 0xae, 0x30, 0x3d,
-        0xce, 0x20, 0x63, 0xfe, 0xe6, 0x1a, 0xc7, 0xb8, 0x50, 0xe8, 0x24, 0x17, 0xfc, 0x25, 0x6f, 0xbb,
-        0x6a, 0xa3, 0x44, 0x53, 0xd9, 0xa2, 0x01, 0xab, 0xbc, 0xb6, 0x1f, 0x98, 0xee, 0x9a, 0xa7, 0x2d,
-        0x4f, 0x9e, 0x8e, 0xac, 0xe0, 0xc6, 0x49, 0x46, 0x29, 0xf4, 0x94, 0x8a, 0xaf, 0xe1, 0x5b, 0xc3,
-        0xb3, 0x7b, 0x57, 0xd1, 0x7c, 0x9c, 0xed, 0x87, 0x40, 0x8c, 0xe2, 0xcb, 0x93, 0x14, 0xc9, 0x61,
-        0x2e, 0xe5, 0xcc, 0xf6, 0x5e, 0xa8, 0x5c, 0xd6, 0x75, 0x8d, 0x62, 0x95, 0x58, 0x69, 0x76, 0xa1,
-        0x4a, 0xb5, 0x55, 0x09, 0x78, 0x33, 0x82, 0xd7, 0xdd, 0x79, 0xf5, 0x1b, 0x0b, 0xde, 0x26, 0x21,
-        0x28, 0x74, 0x04, 0x97, 0x56, 0xdf, 0x3c, 0xf0, 0x37, 0x39, 0xdc, 0xff, 0x06, 0xa4, 0xea, 0x42,
-        0x08, 0xda, 0xb4, 0x71, 0xb0, 0xcf, 0x12, 0x7a, 0x4e, 0xfa, 0x6c, 0x1d, 0x84, 0x00, 0xc8, 0x7f,
-        0x91, 0x45, 0xaa, 0x2b, 0xc2, 0xb1, 0x8f, 0xd5, 0xba, 0xf2, 0xad, 0x19, 0xb2, 0x67, 0x36, 0xf7,
-        0x0f, 0x0a, 0x92, 0x7d, 0xe3, 0x9d, 0xe9, 0x90, 0x3e, 0x23, 0x27, 0x66, 0x13, 0xec, 0x81, 0x15,
-        0xbd, 0x22, 0xbf, 0x9f, 0x7e, 0xa9, 0x51, 0x4b, 0x4c, 0xfb, 0x02, 0xd3, 0x70, 0x86, 0x31, 0xe7,
-        0x3b, 0x05, 0x03, 0x54, 0x60, 0x48, 0x65, 0x18, 0xd2, 0xcd, 0x5f, 0x32, 0x88, 0x0e, 0x35, 0xfd
-    };
-
-    EnvelopedDataHelper()
-    {
-    }
-
-    String getBaseCipherName(ASN1ObjectIdentifier algorithm)
-    {
-        String name = (String)BASE_CIPHER_NAMES.get(algorithm);
-
-        if (name == null)
-        {
-            return algorithm.getId();
-        }
-
-        return name;
-    }
-
-    static BufferedBlockCipher createCipher(ASN1ObjectIdentifier algorithm)
-        throws CMSException
-    {
-        BlockCipher cipher;
-
-        if (NISTObjectIdentifiers.id_aes128_CBC.equals(algorithm)
-            || NISTObjectIdentifiers.id_aes192_CBC.equals(algorithm)
-            || NISTObjectIdentifiers.id_aes256_CBC.equals(algorithm))
-        {
-            cipher = new CBCBlockCipher(new AESEngine());
-        }
-        else if (PKCSObjectIdentifiers.des_EDE3_CBC.equals(algorithm))
-        {
-            cipher = new CBCBlockCipher(new DESedeEngine());
-        }
-        else if (OIWObjectIdentifiers.desCBC.equals(algorithm))
-        {
-            cipher = new CBCBlockCipher(new DESEngine());
-        }
-        else if (PKCSObjectIdentifiers.RC2_CBC.equals(algorithm))
-        {
-            cipher = new CBCBlockCipher(new RC2Engine());
-        }
-        else
-        {
-            throw new CMSException("cannot recognise cipher: " + algorithm);
-        }
-
-        return new PaddedBufferedBlockCipher(cipher, new PKCS7Padding());
-    }
-
-    static Wrapper createRFC3211Wrapper(ASN1ObjectIdentifier algorithm)
-        throws CMSException
-    {
-        if (NISTObjectIdentifiers.id_aes128_CBC.equals(algorithm)
-            || NISTObjectIdentifiers.id_aes192_CBC.equals(algorithm)
-            || NISTObjectIdentifiers.id_aes256_CBC.equals(algorithm))
-        {
-            return new RFC3211WrapEngine(new AESEngine());
-        }
-        else if (PKCSObjectIdentifiers.des_EDE3_CBC.equals(algorithm))
-        {
-            return new RFC3211WrapEngine(new DESedeEngine());
-        }
-        else if (OIWObjectIdentifiers.desCBC.equals(algorithm))
-        {
-            return new RFC3211WrapEngine(new DESEngine());
-        }
-        else if (PKCSObjectIdentifiers.RC2_CBC.equals(algorithm))
-        {
-            return new RFC3211WrapEngine(new RC2Engine());
-        }
-        else
-        {
-            throw new CMSException("cannot recognise wrapper: " + algorithm);
-        }
-    }
-
-    static Object createContentCipher(boolean forEncryption, CipherParameters encKey, AlgorithmIdentifier encryptionAlgID)
-        throws CMSException
-    {
-        ASN1ObjectIdentifier encAlg = encryptionAlgID.getAlgorithm();
-
-        if (encAlg.equals(PKCSObjectIdentifiers.rc4))
-        {
-            StreamCipher cipher = new RC4Engine();
-
-            cipher.init(forEncryption, encKey);
-
-            return cipher;
-        }
-        else
-        {
-            BufferedBlockCipher cipher = createCipher(encryptionAlgID.getAlgorithm());
-            ASN1Primitive sParams = encryptionAlgID.getParameters().toASN1Primitive();
-
-            if (sParams != null && !(sParams instanceof ASN1Null))
-            {
-                if (encAlg.equals(CMSAlgorithm.DES_EDE3_CBC)
-                    || encAlg.equals(CMSAlgorithm.IDEA_CBC)
-                    || encAlg.equals(CMSAlgorithm.AES128_CBC)
-                    || encAlg.equals(CMSAlgorithm.AES192_CBC)
-                    || encAlg.equals(CMSAlgorithm.AES256_CBC)
-                    || encAlg.equals(CMSAlgorithm.CAMELLIA128_CBC)
-                    || encAlg.equals(CMSAlgorithm.CAMELLIA192_CBC)
-                    || encAlg.equals(CMSAlgorithm.CAMELLIA256_CBC)
-                    || encAlg.equals(CMSAlgorithm.SEED_CBC)
-                    || encAlg.equals(OIWObjectIdentifiers.desCBC))
-                {
-                    cipher.init(forEncryption, new ParametersWithIV(encKey,
-                        ASN1OctetString.getInstance(sParams).getOctets()));
-                }
-                else if (encAlg.equals(CMSAlgorithm.CAST5_CBC))
-                {
-                    CAST5CBCParameters cbcParams = CAST5CBCParameters.getInstance(sParams);
-
-                    cipher.init(forEncryption, new ParametersWithIV(encKey, cbcParams.getIV()));
-                }
-                else if (encAlg.equals(CMSAlgorithm.RC2_CBC))
-                {
-                    RC2CBCParameter cbcParams = RC2CBCParameter.getInstance(sParams);
-
-                    cipher.init(forEncryption, new ParametersWithIV(new RC2Parameters(((KeyParameter)encKey).getKey(), rc2Ekb[cbcParams.getRC2ParameterVersion().intValue()]), cbcParams.getIV()));
-                }
-                else
-                {
-                    throw new CMSException("cannot match parameters");
-                }
-            }
-            else
-            {
-                if (encAlg.equals(CMSAlgorithm.DES_EDE3_CBC)
-                    || encAlg.equals(CMSAlgorithm.IDEA_CBC)
-                    || encAlg.equals(CMSAlgorithm.CAST5_CBC))
-                {
-                    cipher.init(forEncryption, new ParametersWithIV(encKey, new byte[8]));
-                }
-                else
-                {
-                    cipher.init(forEncryption, encKey);
-                }
-            }
-
-            return cipher;
-        }
-    }
-
-    AlgorithmIdentifier generateAlgorithmIdentifier(ASN1ObjectIdentifier encryptionOID, CipherParameters encKey, SecureRandom random)
-        throws CMSException
-    {
-        if (encryptionOID.equals(CMSAlgorithm.AES128_CBC)
-                || encryptionOID.equals(CMSAlgorithm.AES192_CBC)
-                || encryptionOID.equals(CMSAlgorithm.AES256_CBC)
-                || encryptionOID.equals(CMSAlgorithm.CAMELLIA128_CBC)
-                || encryptionOID.equals(CMSAlgorithm.CAMELLIA192_CBC)
-                || encryptionOID.equals(CMSAlgorithm.CAMELLIA256_CBC)
-                || encryptionOID.equals(CMSAlgorithm.SEED_CBC))
-        {
-            byte[] iv = new byte[16];
-
-            random.nextBytes(iv);
-
-            return new AlgorithmIdentifier(encryptionOID, new DEROctetString(iv));
-        }
-        else if (encryptionOID.equals(CMSAlgorithm.DES_EDE3_CBC)
-                || encryptionOID.equals(CMSAlgorithm.IDEA_CBC)
-                || encryptionOID.equals(OIWObjectIdentifiers.desCBC))
-        {
-            byte[] iv = new byte[8];
-
-            random.nextBytes(iv);
-
-            return new AlgorithmIdentifier(encryptionOID, new DEROctetString(iv));
-        }
-        else if (encryptionOID.equals(CMSAlgorithm.CAST5_CBC))
-        {
-            byte[] iv = new byte[8];
-
-            random.nextBytes(iv);
-
-            CAST5CBCParameters cbcParams = new CAST5CBCParameters(iv, ((KeyParameter)encKey).getKey().length * 8);
-
-            return new AlgorithmIdentifier(encryptionOID, cbcParams);
-        }
-        else if (encryptionOID.equals(PKCSObjectIdentifiers.rc4))
-        {
-            return new AlgorithmIdentifier(encryptionOID, DERNull.INSTANCE);
-        }
-        else
-        {
-            throw new CMSException("unable to match algorithm");
-        }
-    }
-
-    CipherKeyGenerator createKeyGenerator(ASN1ObjectIdentifier algorithm, SecureRandom random)
-        throws CMSException
-    {
-        if (NISTObjectIdentifiers.id_aes128_CBC.equals(algorithm))
-        {
-            return createCipherKeyGenerator(random, 128);
-        }
-        else if (NISTObjectIdentifiers.id_aes192_CBC.equals(algorithm))
-        {
-            return createCipherKeyGenerator(random, 192);
-        }
-        else if (NISTObjectIdentifiers.id_aes256_CBC.equals(algorithm))
-        {
-            return createCipherKeyGenerator(random, 256);
-        }
-        else if (PKCSObjectIdentifiers.des_EDE3_CBC.equals(algorithm))
-        {
-            DESedeKeyGenerator keyGen = new DESedeKeyGenerator();
-
-            keyGen.init(new KeyGenerationParameters(random, 192));
-
-            return keyGen;
-        }
-        else if (NTTObjectIdentifiers.id_camellia128_cbc.equals(algorithm))
-        {
-            return createCipherKeyGenerator(random, 128);
-        }
-        else if (NTTObjectIdentifiers.id_camellia192_cbc.equals(algorithm))
-        {
-            return createCipherKeyGenerator(random, 192);
-        }
-        else if (NTTObjectIdentifiers.id_camellia256_cbc.equals(algorithm))
-        {
-            return createCipherKeyGenerator(random, 256);
-        }
-        else if (KISAObjectIdentifiers.id_seedCBC.equals(algorithm))
-        {
-            return createCipherKeyGenerator(random, 128);
-        }
-        else if (CMSAlgorithm.CAST5_CBC.equals(algorithm))
-        {
-            return createCipherKeyGenerator(random, 128);
-        }
-        else if (OIWObjectIdentifiers.desCBC.equals(algorithm))
-        {
-            DESKeyGenerator keyGen = new DESKeyGenerator();
-
-            keyGen.init(new KeyGenerationParameters(random, 64));
-
-            return keyGen;
-        }
-        else if (PKCSObjectIdentifiers.rc4.equals(algorithm))
-        {
-            return createCipherKeyGenerator(random, 128);
-        }
-//        else if (PKCSObjectIdentifiers.RC2_CBC.equals(algorithm))
-//        {
-//            cipher = new CBCBlockCipher(new RC2Engine());
-//        }
-        else
-        {
-            throw new CMSException("cannot recognise cipher: " + algorithm);
-        }
-
-    }
-
-    private CipherKeyGenerator createCipherKeyGenerator(SecureRandom random, int keySize)
-    {
-        CipherKeyGenerator keyGen = new CipherKeyGenerator();
-
-        keyGen.init(new KeyGenerationParameters(random, keySize));
-
-        return keyGen;
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cms/jcajce/CMSUtils.java b/bcpkix/src/main/java/org/bouncycastle/cms/jcajce/CMSUtils.java
deleted file mode 100644
index 1596cae..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cms/jcajce/CMSUtils.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package org.bouncycastle.cms.jcajce;
-
-import java.io.IOException;
-import java.security.AlgorithmParameters;
-import java.security.Provider;
-import java.security.cert.CertificateEncodingException;
-import java.security.cert.X509Certificate;
-
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.cms.IssuerAndSerialNumber;
-import org.bouncycastle.asn1.x509.Certificate;
-import org.bouncycastle.asn1.x509.Extension;
-import org.bouncycastle.asn1.x509.TBSCertificateStructure;
-import org.bouncycastle.cms.CMSException;
-import org.bouncycastle.jcajce.util.JcaJceUtils;
-
-class CMSUtils
-{
-    static TBSCertificateStructure getTBSCertificateStructure(
-        X509Certificate cert)
-        throws CertificateEncodingException
-    {
-            return TBSCertificateStructure.getInstance(cert.getTBSCertificate());
-    }
-
-    static IssuerAndSerialNumber getIssuerAndSerialNumber(X509Certificate cert)
-        throws CertificateEncodingException
-    {
-        Certificate certStruct = Certificate.getInstance(cert.getEncoded());
-
-        return new IssuerAndSerialNumber(certStruct.getIssuer(), cert.getSerialNumber());
-    }
-
-
-    static byte[] getSubjectKeyId(X509Certificate cert)
-    {
-        byte[] ext = cert.getExtensionValue(Extension.subjectKeyIdentifier.getId());
-
-        if (ext != null)
-        {
-            return ASN1OctetString.getInstance(ASN1OctetString.getInstance(ext).getOctets()).getOctets();
-        }
-        else
-        {
-            return null;
-        }
-    }
-
-    static EnvelopedDataHelper createContentHelper(Provider provider)
-    {
-        if (provider != null)
-        {
-            return new EnvelopedDataHelper(new ProviderJcaJceExtHelper(provider));
-        }
-        else
-        {
-            return new EnvelopedDataHelper(new DefaultJcaJceExtHelper());
-        }
-    }
-
-    static EnvelopedDataHelper createContentHelper(String providerName)
-    {
-        if (providerName != null)
-        {
-            return new EnvelopedDataHelper(new NamedJcaJceExtHelper(providerName));
-        }
-        else
-        {
-            return new EnvelopedDataHelper(new DefaultJcaJceExtHelper());
-        }
-    }
-
-    static ASN1Encodable extractParameters(AlgorithmParameters params)
-        throws CMSException
-    {
-        try
-        {
-            return JcaJceUtils.extractParameters(params);
-        }
-        catch (IOException e)
-        {
-            throw new CMSException("cannot extract parameters: " + e.getMessage(), e);
-        }
-    }
-
-    static void loadParameters(AlgorithmParameters params, ASN1Encodable sParams)
-        throws CMSException
-    {
-        try
-        {
-            JcaJceUtils.loadParameters(params, sParams);
-        }
-        catch (IOException e)
-        {
-            throw new CMSException("error encoding algorithm parameters.", e);
-        }
-    }
-}
\ No newline at end of file
diff --git a/bcpkix/src/main/java/org/bouncycastle/cms/jcajce/DefaultJcaJceExtHelper.java b/bcpkix/src/main/java/org/bouncycastle/cms/jcajce/DefaultJcaJceExtHelper.java
deleted file mode 100644
index c6cd825..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cms/jcajce/DefaultJcaJceExtHelper.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package org.bouncycastle.cms.jcajce;
-
-import java.security.PrivateKey;
-
-import javax.crypto.SecretKey;
-
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.jcajce.util.DefaultJcaJceHelper;
-import org.bouncycastle.operator.SymmetricKeyUnwrapper;
-import org.bouncycastle.operator.jcajce.JceAsymmetricKeyUnwrapper;
-import org.bouncycastle.operator.jcajce.JceSymmetricKeyUnwrapper;
-
-class DefaultJcaJceExtHelper
-    extends DefaultJcaJceHelper
-    implements JcaJceExtHelper
-{
-    public JceAsymmetricKeyUnwrapper createAsymmetricUnwrapper(AlgorithmIdentifier keyEncryptionAlgorithm, PrivateKey keyEncryptionKey)
-    {
-        return new JceAsymmetricKeyUnwrapper(keyEncryptionAlgorithm, keyEncryptionKey);
-    }
-
-    public SymmetricKeyUnwrapper createSymmetricUnwrapper(AlgorithmIdentifier keyEncryptionAlgorithm, SecretKey keyEncryptionKey)
-    {
-        return new JceSymmetricKeyUnwrapper(keyEncryptionAlgorithm, keyEncryptionKey);
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cms/jcajce/EnvelopedDataHelper.java b/bcpkix/src/main/java/org/bouncycastle/cms/jcajce/EnvelopedDataHelper.java
deleted file mode 100644
index b081051..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cms/jcajce/EnvelopedDataHelper.java
+++ /dev/null
@@ -1,668 +0,0 @@
-package org.bouncycastle.cms.jcajce;
-
-import java.security.AlgorithmParameterGenerator;
-import java.security.AlgorithmParameters;
-import java.security.GeneralSecurityException;
-import java.security.InvalidAlgorithmParameterException;
-import java.security.InvalidKeyException;
-import java.security.Key;
-import java.security.KeyFactory;
-import java.security.KeyPairGenerator;
-import java.security.NoSuchAlgorithmException;
-import java.security.NoSuchProviderException;
-import java.security.PrivateKey;
-import java.security.SecureRandom;
-import java.security.spec.AlgorithmParameterSpec;
-import java.security.spec.InvalidParameterSpecException;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.crypto.Cipher;
-import javax.crypto.KeyAgreement;
-import javax.crypto.KeyGenerator;
-import javax.crypto.Mac;
-import javax.crypto.NoSuchPaddingException;
-import javax.crypto.SecretKey;
-import javax.crypto.spec.IvParameterSpec;
-import javax.crypto.spec.RC2ParameterSpec;
-import javax.crypto.spec.SecretKeySpec;
-
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1Null;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.DERNull;
-import org.bouncycastle.asn1.DEROctetString;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.asn1.pkcs.RC2CBCParameter;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.cms.CMSAlgorithm;
-import org.bouncycastle.cms.CMSEnvelopedDataGenerator;
-import org.bouncycastle.cms.CMSException;
-import org.bouncycastle.operator.DefaultSecretKeySizeProvider;
-import org.bouncycastle.operator.GenericKey;
-import org.bouncycastle.operator.SecretKeySizeProvider;
-import org.bouncycastle.operator.SymmetricKeyUnwrapper;
-import org.bouncycastle.operator.jcajce.JceAsymmetricKeyUnwrapper;
-
-public class EnvelopedDataHelper
-{
-    protected static final SecretKeySizeProvider KEY_SIZE_PROVIDER = DefaultSecretKeySizeProvider.INSTANCE;
-
-    protected static final Map BASE_CIPHER_NAMES = new HashMap();
-    protected static final Map CIPHER_ALG_NAMES = new HashMap();
-    protected static final Map MAC_ALG_NAMES = new HashMap();
-
-    static
-    {
-        BASE_CIPHER_NAMES.put(CMSAlgorithm.DES_CBC,  "DES");
-        BASE_CIPHER_NAMES.put(CMSAlgorithm.DES_EDE3_CBC,  "DESEDE");
-        BASE_CIPHER_NAMES.put(CMSAlgorithm.AES128_CBC,  "AES");
-        BASE_CIPHER_NAMES.put(CMSAlgorithm.AES192_CBC,  "AES");
-        BASE_CIPHER_NAMES.put(CMSAlgorithm.AES256_CBC,  "AES");
-        BASE_CIPHER_NAMES.put(CMSAlgorithm.RC2_CBC,  "RC2");
-        BASE_CIPHER_NAMES.put(CMSAlgorithm.CAST5_CBC, "CAST5");
-        BASE_CIPHER_NAMES.put(CMSAlgorithm.CAMELLIA128_CBC, "Camellia");
-        BASE_CIPHER_NAMES.put(CMSAlgorithm.CAMELLIA192_CBC, "Camellia");
-        BASE_CIPHER_NAMES.put(CMSAlgorithm.CAMELLIA256_CBC, "Camellia");
-        BASE_CIPHER_NAMES.put(CMSAlgorithm.SEED_CBC, "SEED");
-        BASE_CIPHER_NAMES.put(PKCSObjectIdentifiers.rc4, "RC4");
-
-        CIPHER_ALG_NAMES.put(CMSAlgorithm.DES_CBC,  "DES/CBC/PKCS5Padding");
-        CIPHER_ALG_NAMES.put(CMSAlgorithm.RC2_CBC,  "RC2/CBC/PKCS5Padding");
-        CIPHER_ALG_NAMES.put(CMSAlgorithm.DES_EDE3_CBC,  "DESEDE/CBC/PKCS5Padding");
-        CIPHER_ALG_NAMES.put(CMSAlgorithm.AES128_CBC,  "AES/CBC/PKCS5Padding");
-        CIPHER_ALG_NAMES.put(CMSAlgorithm.AES192_CBC,  "AES/CBC/PKCS5Padding");
-        CIPHER_ALG_NAMES.put(CMSAlgorithm.AES256_CBC,  "AES/CBC/PKCS5Padding");
-        CIPHER_ALG_NAMES.put(PKCSObjectIdentifiers.rsaEncryption, "RSA/ECB/PKCS1Padding");
-        CIPHER_ALG_NAMES.put(CMSAlgorithm.CAST5_CBC, "CAST5/CBC/PKCS5Padding");
-        CIPHER_ALG_NAMES.put(CMSAlgorithm.CAMELLIA128_CBC, "Camellia/CBC/PKCS5Padding");
-        CIPHER_ALG_NAMES.put(CMSAlgorithm.CAMELLIA192_CBC, "Camellia/CBC/PKCS5Padding");
-        CIPHER_ALG_NAMES.put(CMSAlgorithm.CAMELLIA256_CBC, "Camellia/CBC/PKCS5Padding");
-        CIPHER_ALG_NAMES.put(CMSAlgorithm.SEED_CBC, "SEED/CBC/PKCS5Padding");
-        CIPHER_ALG_NAMES.put(PKCSObjectIdentifiers.rc4, "RC4");
-
-        MAC_ALG_NAMES.put(CMSAlgorithm.DES_EDE3_CBC,  "DESEDEMac");
-        MAC_ALG_NAMES.put(CMSAlgorithm.AES128_CBC,  "AESMac");
-        MAC_ALG_NAMES.put(CMSAlgorithm.AES192_CBC,  "AESMac");
-        MAC_ALG_NAMES.put(CMSAlgorithm.AES256_CBC,  "AESMac");
-        MAC_ALG_NAMES.put(CMSAlgorithm.RC2_CBC,  "RC2Mac");
-    }
-
-    private static final short[] rc2Table = {
-        0xbd, 0x56, 0xea, 0xf2, 0xa2, 0xf1, 0xac, 0x2a, 0xb0, 0x93, 0xd1, 0x9c, 0x1b, 0x33, 0xfd, 0xd0,
-        0x30, 0x04, 0xb6, 0xdc, 0x7d, 0xdf, 0x32, 0x4b, 0xf7, 0xcb, 0x45, 0x9b, 0x31, 0xbb, 0x21, 0x5a,
-        0x41, 0x9f, 0xe1, 0xd9, 0x4a, 0x4d, 0x9e, 0xda, 0xa0, 0x68, 0x2c, 0xc3, 0x27, 0x5f, 0x80, 0x36,
-        0x3e, 0xee, 0xfb, 0x95, 0x1a, 0xfe, 0xce, 0xa8, 0x34, 0xa9, 0x13, 0xf0, 0xa6, 0x3f, 0xd8, 0x0c,
-        0x78, 0x24, 0xaf, 0x23, 0x52, 0xc1, 0x67, 0x17, 0xf5, 0x66, 0x90, 0xe7, 0xe8, 0x07, 0xb8, 0x60,
-        0x48, 0xe6, 0x1e, 0x53, 0xf3, 0x92, 0xa4, 0x72, 0x8c, 0x08, 0x15, 0x6e, 0x86, 0x00, 0x84, 0xfa,
-        0xf4, 0x7f, 0x8a, 0x42, 0x19, 0xf6, 0xdb, 0xcd, 0x14, 0x8d, 0x50, 0x12, 0xba, 0x3c, 0x06, 0x4e,
-        0xec, 0xb3, 0x35, 0x11, 0xa1, 0x88, 0x8e, 0x2b, 0x94, 0x99, 0xb7, 0x71, 0x74, 0xd3, 0xe4, 0xbf,
-        0x3a, 0xde, 0x96, 0x0e, 0xbc, 0x0a, 0xed, 0x77, 0xfc, 0x37, 0x6b, 0x03, 0x79, 0x89, 0x62, 0xc6,
-        0xd7, 0xc0, 0xd2, 0x7c, 0x6a, 0x8b, 0x22, 0xa3, 0x5b, 0x05, 0x5d, 0x02, 0x75, 0xd5, 0x61, 0xe3,
-        0x18, 0x8f, 0x55, 0x51, 0xad, 0x1f, 0x0b, 0x5e, 0x85, 0xe5, 0xc2, 0x57, 0x63, 0xca, 0x3d, 0x6c,
-        0xb4, 0xc5, 0xcc, 0x70, 0xb2, 0x91, 0x59, 0x0d, 0x47, 0x20, 0xc8, 0x4f, 0x58, 0xe0, 0x01, 0xe2,
-        0x16, 0x38, 0xc4, 0x6f, 0x3b, 0x0f, 0x65, 0x46, 0xbe, 0x7e, 0x2d, 0x7b, 0x82, 0xf9, 0x40, 0xb5,
-        0x1d, 0x73, 0xf8, 0xeb, 0x26, 0xc7, 0x87, 0x97, 0x25, 0x54, 0xb1, 0x28, 0xaa, 0x98, 0x9d, 0xa5,
-        0x64, 0x6d, 0x7a, 0xd4, 0x10, 0x81, 0x44, 0xef, 0x49, 0xd6, 0xae, 0x2e, 0xdd, 0x76, 0x5c, 0x2f,
-        0xa7, 0x1c, 0xc9, 0x09, 0x69, 0x9a, 0x83, 0xcf, 0x29, 0x39, 0xb9, 0xe9, 0x4c, 0xff, 0x43, 0xab
-    };
-
-    private static final short[] rc2Ekb = {
-        0x5d, 0xbe, 0x9b, 0x8b, 0x11, 0x99, 0x6e, 0x4d, 0x59, 0xf3, 0x85, 0xa6, 0x3f, 0xb7, 0x83, 0xc5,
-        0xe4, 0x73, 0x6b, 0x3a, 0x68, 0x5a, 0xc0, 0x47, 0xa0, 0x64, 0x34, 0x0c, 0xf1, 0xd0, 0x52, 0xa5,
-        0xb9, 0x1e, 0x96, 0x43, 0x41, 0xd8, 0xd4, 0x2c, 0xdb, 0xf8, 0x07, 0x77, 0x2a, 0xca, 0xeb, 0xef,
-        0x10, 0x1c, 0x16, 0x0d, 0x38, 0x72, 0x2f, 0x89, 0xc1, 0xf9, 0x80, 0xc4, 0x6d, 0xae, 0x30, 0x3d,
-        0xce, 0x20, 0x63, 0xfe, 0xe6, 0x1a, 0xc7, 0xb8, 0x50, 0xe8, 0x24, 0x17, 0xfc, 0x25, 0x6f, 0xbb,
-        0x6a, 0xa3, 0x44, 0x53, 0xd9, 0xa2, 0x01, 0xab, 0xbc, 0xb6, 0x1f, 0x98, 0xee, 0x9a, 0xa7, 0x2d,
-        0x4f, 0x9e, 0x8e, 0xac, 0xe0, 0xc6, 0x49, 0x46, 0x29, 0xf4, 0x94, 0x8a, 0xaf, 0xe1, 0x5b, 0xc3,
-        0xb3, 0x7b, 0x57, 0xd1, 0x7c, 0x9c, 0xed, 0x87, 0x40, 0x8c, 0xe2, 0xcb, 0x93, 0x14, 0xc9, 0x61,
-        0x2e, 0xe5, 0xcc, 0xf6, 0x5e, 0xa8, 0x5c, 0xd6, 0x75, 0x8d, 0x62, 0x95, 0x58, 0x69, 0x76, 0xa1,
-        0x4a, 0xb5, 0x55, 0x09, 0x78, 0x33, 0x82, 0xd7, 0xdd, 0x79, 0xf5, 0x1b, 0x0b, 0xde, 0x26, 0x21,
-        0x28, 0x74, 0x04, 0x97, 0x56, 0xdf, 0x3c, 0xf0, 0x37, 0x39, 0xdc, 0xff, 0x06, 0xa4, 0xea, 0x42,
-        0x08, 0xda, 0xb4, 0x71, 0xb0, 0xcf, 0x12, 0x7a, 0x4e, 0xfa, 0x6c, 0x1d, 0x84, 0x00, 0xc8, 0x7f,
-        0x91, 0x45, 0xaa, 0x2b, 0xc2, 0xb1, 0x8f, 0xd5, 0xba, 0xf2, 0xad, 0x19, 0xb2, 0x67, 0x36, 0xf7,
-        0x0f, 0x0a, 0x92, 0x7d, 0xe3, 0x9d, 0xe9, 0x90, 0x3e, 0x23, 0x27, 0x66, 0x13, 0xec, 0x81, 0x15,
-        0xbd, 0x22, 0xbf, 0x9f, 0x7e, 0xa9, 0x51, 0x4b, 0x4c, 0xfb, 0x02, 0xd3, 0x70, 0x86, 0x31, 0xe7,
-        0x3b, 0x05, 0x03, 0x54, 0x60, 0x48, 0x65, 0x18, 0xd2, 0xcd, 0x5f, 0x32, 0x88, 0x0e, 0x35, 0xfd
-    };
-
-    private JcaJceExtHelper helper;
-
-    EnvelopedDataHelper(JcaJceExtHelper helper)
-    {
-        this.helper = helper;
-    }
-
-    String getBaseCipherName(ASN1ObjectIdentifier algorithm)
-    {
-        String name = (String)BASE_CIPHER_NAMES.get(algorithm);
-
-        if (name == null)
-        {
-            return algorithm.getId();
-        }
-
-        return name;
-    }
-
-    Key getJceKey(GenericKey key)
-    {
-        if (key.getRepresentation() instanceof Key)
-        {
-            return (Key)key.getRepresentation();
-        }
-
-        if (key.getRepresentation() instanceof byte[])
-        {
-            return new SecretKeySpec((byte[])key.getRepresentation(), "ENC");
-        }
-
-        throw new IllegalArgumentException("unknown generic key type");
-    }
-
-    public Key getJceKey(ASN1ObjectIdentifier algorithm, GenericKey key)
-    {
-        if (key.getRepresentation() instanceof Key)
-        {
-            return (Key)key.getRepresentation();
-        }
-
-        if (key.getRepresentation() instanceof byte[])
-        {
-            return new SecretKeySpec((byte[])key.getRepresentation(), getBaseCipherName(algorithm));
-        }
-
-        throw new IllegalArgumentException("unknown generic key type");
-    }
-
-    public void keySizeCheck(AlgorithmIdentifier keyAlgorithm, Key key)
-        throws CMSException
-    {
-        int expectedKeySize = EnvelopedDataHelper.KEY_SIZE_PROVIDER.getKeySize(keyAlgorithm);
-        if (expectedKeySize > 0)
-        {
-            byte[] keyEnc = null;
-
-            try
-            {
-                keyEnc = key.getEncoded();
-            }
-            catch (Exception e)
-            {
-                // ignore - we're using a HSM...
-            }
-
-            if (keyEnc != null)
-            {
-                if (keyEnc.length * 8 != expectedKeySize)
-                {
-                    throw new CMSException("Expected key size for algorithm OID not found in recipient.");
-                }
-            }
-        }
-    }
-
-    Cipher createCipher(ASN1ObjectIdentifier algorithm)
-        throws CMSException
-    {
-        try
-        {
-            String cipherName = (String)CIPHER_ALG_NAMES.get(algorithm);
-
-            if (cipherName != null)
-            {
-                try
-                {
-                    // this is reversed as the Sun policy files now allow unlimited strength RSA
-                    return helper.createCipher(cipherName);
-                }
-                catch (NoSuchAlgorithmException e)
-                {
-                    // Ignore
-                }
-            }
-            return helper.createCipher(algorithm.getId());
-        }
-        catch (GeneralSecurityException e)
-        {
-            throw new CMSException("cannot create cipher: " + e.getMessage(), e);
-        }
-    }
-
-    Mac createMac(ASN1ObjectIdentifier algorithm)
-        throws CMSException
-    {
-        try
-        {
-            String macName = (String)MAC_ALG_NAMES.get(algorithm);
-
-            if (macName != null)
-            {
-                try
-                {
-                    // this is reversed as the Sun policy files now allow unlimited strength RSA
-                    return helper.createMac(macName);
-                }
-                catch (NoSuchAlgorithmException e)
-                {
-                    // Ignore
-                }
-            }
-            return helper.createMac(algorithm.getId());
-        }
-        catch (GeneralSecurityException e)
-        {
-            throw new CMSException("cannot create mac: " + e.getMessage(), e);
-        }
-    }
-
-    Cipher createRFC3211Wrapper(ASN1ObjectIdentifier algorithm)
-        throws CMSException
-    {
-        String cipherName = (String)BASE_CIPHER_NAMES.get(algorithm);
-
-        if (cipherName == null)
-        {
-            throw new CMSException("no name for " + algorithm);
-        }
-
-        cipherName += "RFC3211Wrap";
-
-        try
-        {
-             return helper.createCipher(cipherName);
-        }
-        catch (GeneralSecurityException e)
-        {
-            throw new CMSException("cannot create cipher: " + e.getMessage(), e);
-        }
-    }
-
-    KeyAgreement createKeyAgreement(ASN1ObjectIdentifier algorithm)
-        throws CMSException
-    {
-        try
-        {
-            String agreementName = (String)BASE_CIPHER_NAMES.get(algorithm);
-
-            if (agreementName != null)
-            {
-                try
-                {
-                    // this is reversed as the Sun policy files now allow unlimited strength RSA
-                    return helper.createKeyAgreement(agreementName);
-                }
-                catch (NoSuchAlgorithmException e)
-                {
-                    // Ignore
-                }
-            }
-            return helper.createKeyAgreement(algorithm.getId());
-        }
-        catch (GeneralSecurityException e)
-        {
-            throw new CMSException("cannot create key pair generator: " + e.getMessage(), e);
-        }
-    }
-
-    AlgorithmParameterGenerator createAlgorithmParameterGenerator(ASN1ObjectIdentifier algorithm)
-        throws GeneralSecurityException
-    {
-        String algorithmName = (String)BASE_CIPHER_NAMES.get(algorithm);
-
-        if (algorithmName != null)
-        {
-            try
-            {
-                // this is reversed as the Sun policy files now allow unlimited strength RSA
-                return helper.createAlgorithmParameterGenerator(algorithmName);
-            }
-            catch (NoSuchAlgorithmException e)
-            {
-                // Ignore
-            }
-        }
-        return helper.createAlgorithmParameterGenerator(algorithm.getId());
-    }
-
-    public Cipher createContentCipher(final Key sKey, final AlgorithmIdentifier encryptionAlgID)
-        throws CMSException
-    {
-        return (Cipher)execute(new JCECallback()
-        {
-            public Object doInJCE()
-                throws CMSException, InvalidAlgorithmParameterException,
-                InvalidKeyException, InvalidParameterSpecException, NoSuchAlgorithmException,
-                NoSuchPaddingException, NoSuchProviderException
-            {
-                Cipher cipher = createCipher(encryptionAlgID.getAlgorithm());
-                ASN1Encodable sParams = encryptionAlgID.getParameters();
-                String encAlg = encryptionAlgID.getAlgorithm().getId();
-
-                if (sParams != null && !(sParams instanceof ASN1Null))
-                {
-                    try
-                    {
-                        AlgorithmParameters params = createAlgorithmParameters(encryptionAlgID.getAlgorithm());
-
-                        CMSUtils.loadParameters(params, sParams);
-
-                        cipher.init(Cipher.DECRYPT_MODE, sKey, params);
-                    }
-                    catch (NoSuchAlgorithmException e)
-                    {
-                        if (encAlg.equals(CMSAlgorithm.DES_CBC.getId())
-                            || encAlg.equals(CMSEnvelopedDataGenerator.DES_EDE3_CBC)
-                            || encAlg.equals(CMSEnvelopedDataGenerator.IDEA_CBC)
-                            || encAlg.equals(CMSEnvelopedDataGenerator.AES128_CBC)
-                            || encAlg.equals(CMSEnvelopedDataGenerator.AES192_CBC)
-                            || encAlg.equals(CMSEnvelopedDataGenerator.AES256_CBC))
-                        {
-                            cipher.init(Cipher.DECRYPT_MODE, sKey, new IvParameterSpec(
-                                ASN1OctetString.getInstance(sParams).getOctets()));
-                        }
-                        else
-                        {
-                            throw e;
-                        }
-                    }
-                }
-                else
-                {
-                    if (encAlg.equals(CMSAlgorithm.DES_CBC.getId())
-                        || encAlg.equals(CMSEnvelopedDataGenerator.DES_EDE3_CBC)
-                        || encAlg.equals(CMSEnvelopedDataGenerator.IDEA_CBC)
-                        || encAlg.equals(CMSEnvelopedDataGenerator.CAST5_CBC))
-                    {
-                        cipher.init(Cipher.DECRYPT_MODE, sKey, new IvParameterSpec(new byte[8]));
-                    }
-                    else
-                    {
-                        cipher.init(Cipher.DECRYPT_MODE, sKey);
-                    }
-                }
-
-                return cipher;
-            }
-        });
-    }
-
-    Mac createContentMac(final Key sKey, final AlgorithmIdentifier macAlgId)
-        throws CMSException
-    {
-        return (Mac)execute(new JCECallback()
-        {
-            public Object doInJCE()
-                throws CMSException, InvalidAlgorithmParameterException,
-                InvalidKeyException, InvalidParameterSpecException, NoSuchAlgorithmException,
-                NoSuchPaddingException, NoSuchProviderException
-            {
-                Mac mac = createMac(macAlgId.getAlgorithm());
-                ASN1Encodable sParams = macAlgId.getParameters();
-                String macAlg = macAlgId.getAlgorithm().getId();
-
-                if (sParams != null && !(sParams instanceof ASN1Null))
-                {
-                    try
-                    {
-                        AlgorithmParameters params = createAlgorithmParameters(macAlgId.getAlgorithm());
-
-                        CMSUtils.loadParameters(params, sParams);
-
-                        mac.init(sKey, params.getParameterSpec(IvParameterSpec.class));
-                    }
-                    catch (NoSuchAlgorithmException e)
-                    {
-                        throw e;
-                    }
-                }
-                else
-                {
-                    mac.init(sKey);
-                }
-
-                return mac;
-            }
-        });
-    }
-
-    AlgorithmParameters createAlgorithmParameters(ASN1ObjectIdentifier algorithm)
-        throws NoSuchAlgorithmException, NoSuchProviderException
-    {
-        String algorithmName = (String)BASE_CIPHER_NAMES.get(algorithm);
-
-        if (algorithmName != null)
-        {
-            try
-            {
-                // this is reversed as the Sun policy files now allow unlimited strength RSA
-                return helper.createAlgorithmParameters(algorithmName);
-            }
-            catch (NoSuchAlgorithmException e)
-            {
-                // Ignore
-            }
-        }
-        return helper.createAlgorithmParameters(algorithm.getId());
-    }
-
-
-    KeyPairGenerator createKeyPairGenerator(ASN1ObjectIdentifier algorithm)
-        throws CMSException
-    {
-        try
-        {
-            String cipherName = (String)BASE_CIPHER_NAMES.get(algorithm);
-
-            if (cipherName != null)
-            {
-                try
-                {
-                    // this is reversed as the Sun policy files now allow unlimited strength RSA
-                    return helper.createKeyPairGenerator(cipherName);
-                }
-                catch (NoSuchAlgorithmException e)
-                {
-                    // Ignore
-                }
-            }
-            return helper.createKeyPairGenerator(algorithm.getId());
-        }
-        catch (GeneralSecurityException e)
-        {
-            throw new CMSException("cannot create key pair generator: " + e.getMessage(), e);
-        }
-    }
-
-    public KeyGenerator createKeyGenerator(ASN1ObjectIdentifier algorithm)
-        throws CMSException
-    {
-        try
-        {
-            String cipherName = (String)BASE_CIPHER_NAMES.get(algorithm);
-
-            if (cipherName != null)
-            {
-                try
-                {
-                    // this is reversed as the Sun policy files now allow unlimited strength RSA
-                    return helper.createKeyGenerator(cipherName);
-                }
-                catch (NoSuchAlgorithmException e)
-                {
-                    // Ignore
-                }
-            }
-            return helper.createKeyGenerator(algorithm.getId());
-        }
-        catch (GeneralSecurityException e)
-        {
-            throw new CMSException("cannot create key generator: " + e.getMessage(), e);
-        }
-    }
-
-    AlgorithmParameters generateParameters(ASN1ObjectIdentifier encryptionOID, SecretKey encKey, SecureRandom rand)
-        throws CMSException
-    {
-        try
-        {
-            AlgorithmParameterGenerator pGen = createAlgorithmParameterGenerator(encryptionOID);
-
-            if (encryptionOID.equals(CMSAlgorithm.RC2_CBC))
-            {
-                byte[]  iv = new byte[8];
-
-                rand.nextBytes(iv);
-
-                try
-                {
-                    pGen.init(new RC2ParameterSpec(encKey.getEncoded().length * 8, iv), rand);
-                }
-                catch (InvalidAlgorithmParameterException e)
-                {
-                    throw new CMSException("parameters generation error: " + e, e);
-                }
-            }
-
-            return pGen.generateParameters();
-        }
-        catch (NoSuchAlgorithmException e)
-        {
-            return null;
-        }
-        catch (GeneralSecurityException e)
-        {
-            throw new CMSException("exception creating algorithm parameter generator: " + e, e);
-        }
-    }
-
-    AlgorithmIdentifier getAlgorithmIdentifier(ASN1ObjectIdentifier encryptionOID, AlgorithmParameters params)
-        throws CMSException
-    {
-        ASN1Encodable asn1Params;
-        if (params != null)
-        {
-            asn1Params = CMSUtils.extractParameters(params);
-        }
-        else
-        {
-            asn1Params = DERNull.INSTANCE;
-        }
-
-        return new AlgorithmIdentifier(
-            encryptionOID,
-            asn1Params);
-    }
-
-    static Object execute(JCECallback callback) throws CMSException
-    {
-        try
-        {
-            return callback.doInJCE();
-        }
-        catch (NoSuchAlgorithmException e)
-        {
-            throw new CMSException("can't find algorithm.", e);
-        }
-        catch (InvalidKeyException e)
-        {
-            throw new CMSException("key invalid in message.", e);
-        }
-        catch (NoSuchProviderException e)
-        {
-            throw new CMSException("can't find provider.", e);
-        }
-        catch (NoSuchPaddingException e)
-        {
-            throw new CMSException("required padding not supported.", e);
-        }
-        catch (InvalidAlgorithmParameterException e)
-        {
-            throw new CMSException("algorithm parameters invalid.", e);
-        }
-        catch (InvalidParameterSpecException e)
-        {
-            throw new CMSException("MAC algorithm parameter spec invalid.", e);
-        }
-    }
-
-    public KeyFactory createKeyFactory(ASN1ObjectIdentifier algorithm)
-        throws CMSException
-    {
-        try
-        {
-            String cipherName = (String)BASE_CIPHER_NAMES.get(algorithm);
-
-            if (cipherName != null)
-            {
-                try
-                {
-                    // this is reversed as the Sun policy files now allow unlimited strength RSA
-                    return helper.createKeyFactory(cipherName);
-                }
-                catch (NoSuchAlgorithmException e)
-                {
-                    // Ignore
-                }
-            }
-            return helper.createKeyFactory(algorithm.getId());
-        }
-        catch (GeneralSecurityException e)
-        {
-            throw new CMSException("cannot create key factory: " + e.getMessage(), e);
-        }
-    }
-
-    public JceAsymmetricKeyUnwrapper createAsymmetricUnwrapper(AlgorithmIdentifier keyEncryptionAlgorithm, PrivateKey keyEncryptionKey)
-    {
-        return helper.createAsymmetricUnwrapper(keyEncryptionAlgorithm, keyEncryptionKey);
-    }
-
-    public SymmetricKeyUnwrapper createSymmetricUnwrapper(AlgorithmIdentifier keyEncryptionAlgorithm, SecretKey keyEncryptionKey)
-    {
-        return helper.createSymmetricUnwrapper(keyEncryptionAlgorithm, keyEncryptionKey);
-    }
-
-    public AlgorithmIdentifier getAlgorithmIdentifier(ASN1ObjectIdentifier macOID, AlgorithmParameterSpec paramSpec)
-    {
-        if (paramSpec instanceof IvParameterSpec)
-        {
-            return new AlgorithmIdentifier(macOID, new DEROctetString(((IvParameterSpec)paramSpec).getIV()));
-        }
-
-        if (paramSpec instanceof RC2ParameterSpec)
-        {
-            RC2ParameterSpec rc2Spec = (RC2ParameterSpec)paramSpec;
-
-            int effKeyBits = ((RC2ParameterSpec)paramSpec).getEffectiveKeyBits();
-
-            if (effKeyBits != -1)
-            {
-                int parameterVersion;
-                            
-                if (effKeyBits < 256)
-                {
-                    parameterVersion = rc2Table[effKeyBits];
-                }
-                else
-                {
-                    parameterVersion = effKeyBits;
-                }
-
-                return new AlgorithmIdentifier(macOID, new RC2CBCParameter(parameterVersion, rc2Spec.getIV()));
-            }
-
-            return new AlgorithmIdentifier(macOID, new RC2CBCParameter(rc2Spec.getIV()));
-        }
-
-        throw new IllegalStateException("unknown parameter spec: " + paramSpec);
-    }
-
-    static interface JCECallback
-    {
-        Object doInJCE()
-            throws CMSException, InvalidAlgorithmParameterException, InvalidKeyException, InvalidParameterSpecException,
-            NoSuchAlgorithmException, NoSuchPaddingException, NoSuchProviderException;
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cms/jcajce/JcaJceExtHelper.java b/bcpkix/src/main/java/org/bouncycastle/cms/jcajce/JcaJceExtHelper.java
deleted file mode 100644
index 3eb54a1..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cms/jcajce/JcaJceExtHelper.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package org.bouncycastle.cms.jcajce;
-
-import java.security.PrivateKey;
-
-import javax.crypto.SecretKey;
-
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.jcajce.util.JcaJceHelper;
-import org.bouncycastle.operator.SymmetricKeyUnwrapper;
-import org.bouncycastle.operator.jcajce.JceAsymmetricKeyUnwrapper;
-
-public interface JcaJceExtHelper
-    extends JcaJceHelper
-{
-    JceAsymmetricKeyUnwrapper createAsymmetricUnwrapper(AlgorithmIdentifier keyEncryptionAlgorithm, PrivateKey keyEncryptionKey);
-
-    SymmetricKeyUnwrapper createSymmetricUnwrapper(AlgorithmIdentifier keyEncryptionAlgorithm, SecretKey keyEncryptionKey);
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cms/jcajce/JcaSelectorConverter.java b/bcpkix/src/main/java/org/bouncycastle/cms/jcajce/JcaSelectorConverter.java
deleted file mode 100644
index a26cbe7..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cms/jcajce/JcaSelectorConverter.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package org.bouncycastle.cms.jcajce;
-
-import java.io.IOException;
-import java.security.cert.X509CertSelector;
-
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.x500.X500Name;
-import org.bouncycastle.cms.KeyTransRecipientId;
-import org.bouncycastle.cms.SignerId;
-
-public class JcaSelectorConverter
-{
-    public JcaSelectorConverter()
-    {
-
-    }
-
-    public SignerId getSignerId(X509CertSelector certSelector)
-    {
-        try
-        {
-            if (certSelector.getSubjectKeyIdentifier() != null)
-            {
-                return new SignerId(X500Name.getInstance(certSelector.getIssuerAsBytes()), certSelector.getSerialNumber(), ASN1OctetString.getInstance(certSelector.getSubjectKeyIdentifier()).getOctets());
-            }
-            else
-            {
-                return new SignerId(X500Name.getInstance(certSelector.getIssuerAsBytes()), certSelector.getSerialNumber());
-            }
-        }
-        catch (IOException e)
-        {
-            throw new IllegalArgumentException("unable to convert issuer: " + e.getMessage());
-        }
-    }
-
-    public KeyTransRecipientId getKeyTransRecipientId(X509CertSelector certSelector)
-    {
-        try
-        {
-            if (certSelector.getSubjectKeyIdentifier() != null)
-            {
-                return new KeyTransRecipientId(X500Name.getInstance(certSelector.getIssuerAsBytes()), certSelector.getSerialNumber(), ASN1OctetString.getInstance(certSelector.getSubjectKeyIdentifier()).getOctets());
-            }
-            else
-            {
-                return new KeyTransRecipientId(X500Name.getInstance(certSelector.getIssuerAsBytes()), certSelector.getSerialNumber());
-            }
-        }
-        catch (IOException e)
-        {
-            throw new IllegalArgumentException("unable to convert issuer: " + e.getMessage());
-        }
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cms/jcajce/JcaSignerId.java b/bcpkix/src/main/java/org/bouncycastle/cms/jcajce/JcaSignerId.java
deleted file mode 100644
index 056f7c0..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cms/jcajce/JcaSignerId.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package org.bouncycastle.cms.jcajce;
-
-import java.math.BigInteger;
-import java.security.cert.X509Certificate;
-
-import javax.security.auth.x500.X500Principal;
-
-import org.bouncycastle.asn1.x500.X500Name;
-import org.bouncycastle.cms.SignerId;
-
-public class JcaSignerId
-    extends SignerId
-{
-    /**
-     * Construct a signer identifier based on the issuer, serial number and subject key identifier (if present) of the passed in
-     * certificate.
-     *
-     * @param certificate certificate providing the issue and serial number and subject key identifier.
-     */
-    public JcaSignerId(X509Certificate certificate)
-    {
-        super(convertPrincipal(certificate.getIssuerX500Principal()), certificate.getSerialNumber(), CMSUtils.getSubjectKeyId(certificate));
-    }
-
-    /**
-     * Construct a signer identifier based on the provided issuer and serial number..
-     *
-     * @param issuer the issuer to use.
-     * @param serialNumber  the serial number to use.
-     */
-    public JcaSignerId(X500Principal issuer, BigInteger serialNumber)
-    {
-        super(convertPrincipal(issuer), serialNumber);
-    }
-
-    /**
-     * Construct a signer identifier based on the provided issuer, serial number, and subjectKeyId..
-     *
-     * @param issuer the issuer to use.
-     * @param serialNumber  the serial number to use.
-     * @param subjectKeyId the subject key ID to use.
-     */
-    public JcaSignerId(X500Principal issuer, BigInteger serialNumber, byte[] subjectKeyId)
-    {
-        super(convertPrincipal(issuer), serialNumber, subjectKeyId);
-    }
-
-    private static X500Name convertPrincipal(X500Principal issuer)
-    {
-        if (issuer == null)
-        {
-            return null;
-        }
-        return X500Name.getInstance(issuer.getEncoded());
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cms/jcajce/JcaSimpleSignerInfoGeneratorBuilder.java b/bcpkix/src/main/java/org/bouncycastle/cms/jcajce/JcaSimpleSignerInfoGeneratorBuilder.java
deleted file mode 100644
index 0de417a..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cms/jcajce/JcaSimpleSignerInfoGeneratorBuilder.java
+++ /dev/null
@@ -1,202 +0,0 @@
-package org.bouncycastle.cms.jcajce;
-
-import java.security.PrivateKey;
-import java.security.Provider;
-import java.security.cert.CertificateEncodingException;
-import java.security.cert.X509Certificate;
-
-import org.bouncycastle.asn1.cms.AttributeTable;
-import org.bouncycastle.cert.jcajce.JcaX509CertificateHolder;
-import org.bouncycastle.cms.CMSAttributeTableGenerator;
-import org.bouncycastle.cms.DefaultSignedAttributeTableGenerator;
-import org.bouncycastle.cms.SignerInfoGenerator;
-import org.bouncycastle.cms.SignerInfoGeneratorBuilder;
-import org.bouncycastle.operator.ContentSigner;
-import org.bouncycastle.operator.DigestCalculatorProvider;
-import org.bouncycastle.operator.OperatorCreationException;
-import org.bouncycastle.operator.jcajce.JcaContentSignerBuilder;
-import org.bouncycastle.operator.jcajce.JcaDigestCalculatorProviderBuilder;
-
-/**
- * Use this class if you are using a provider that has all the facilities you
- * need.
- * <p>
- * For example:
- * <pre>
- *      CMSSignedDataGenerator gen = new CMSSignedDataGenerator();
- *      ContentSigner sha1Signer = new JcaContentSignerBuilder("SHA1withRSA").setProvider("BC").build(signKP.getPrivate());
- *
- *      gen.addSignerInfoGenerator(
- *                new JcaSignerInfoGeneratorBuilder(
- *                     new JcaDigestCalculatorProviderBuilder().setProvider("BC").build())
- *                     .build(sha1Signer, signCert));
- * </pre>
- * becomes:
- * <pre>
- *      CMSSignedDataGenerator gen = new CMSSignedDataGenerator();
- *
- *      gen.addSignerInfoGenerator(
- *                new JcaSimpleSignerInfoGeneratorBuilder()
- *                     .setProvider("BC")
- *                     .build("SHA1withRSA", signKP.getPrivate(), signCert));
- * </pre>
- */
-public class JcaSimpleSignerInfoGeneratorBuilder
-{
-    private Helper helper;
-
-    private boolean hasNoSignedAttributes;
-    private CMSAttributeTableGenerator signedGen;
-    private CMSAttributeTableGenerator unsignedGen;
-
-    public JcaSimpleSignerInfoGeneratorBuilder()
-        throws OperatorCreationException
-    {
-        this.helper = new Helper();
-    }
-
-    public JcaSimpleSignerInfoGeneratorBuilder setProvider(String providerName)
-        throws OperatorCreationException
-    {
-        this.helper = new NamedHelper(providerName);
-
-        return this;
-    }
-
-    public JcaSimpleSignerInfoGeneratorBuilder setProvider(Provider provider)
-        throws OperatorCreationException
-    {
-        this.helper = new ProviderHelper(provider);
-
-        return this;
-    }
-
-    /**
-     * If the passed in flag is true, the signer signature will be based on the data, not
-     * a collection of signed attributes, and no signed attributes will be included.
-     *
-     * @return the builder object
-     */
-    public JcaSimpleSignerInfoGeneratorBuilder setDirectSignature(boolean hasNoSignedAttributes)
-    {
-        this.hasNoSignedAttributes = hasNoSignedAttributes;
-
-        return this;
-    }
-
-    public JcaSimpleSignerInfoGeneratorBuilder setSignedAttributeGenerator(CMSAttributeTableGenerator signedGen)
-    {
-        this.signedGen = signedGen;
-
-        return this;
-    }
-
-    /**
-     * set up a DefaultSignedAttributeTableGenerator primed with the passed in AttributeTable.
-     *
-     * @param attrTable table of attributes for priming generator
-     * @return this.
-     */
-    public JcaSimpleSignerInfoGeneratorBuilder setSignedAttributeGenerator(AttributeTable attrTable)
-    {
-        this.signedGen = new DefaultSignedAttributeTableGenerator(attrTable);
-
-        return this;
-    }
-
-    public JcaSimpleSignerInfoGeneratorBuilder setUnsignedAttributeGenerator(CMSAttributeTableGenerator unsignedGen)
-    {
-        this.unsignedGen = unsignedGen;
-
-        return this;
-    }
-
-    public SignerInfoGenerator build(String algorithmName, PrivateKey privateKey, X509Certificate certificate)
-        throws OperatorCreationException, CertificateEncodingException
-    {
-        ContentSigner contentSigner = helper.createContentSigner(algorithmName, privateKey);
-
-        return configureAndBuild().build(contentSigner, new JcaX509CertificateHolder(certificate));
-    }
-
-    public SignerInfoGenerator build(String algorithmName, PrivateKey privateKey, byte[] keyIdentifier)
-        throws OperatorCreationException, CertificateEncodingException
-    {
-        ContentSigner contentSigner = helper.createContentSigner(algorithmName, privateKey);
-
-        return configureAndBuild().build(contentSigner, keyIdentifier);
-    }
-
-    private SignerInfoGeneratorBuilder configureAndBuild()
-        throws OperatorCreationException
-    {
-        SignerInfoGeneratorBuilder infoGeneratorBuilder = new SignerInfoGeneratorBuilder(helper.createDigestCalculatorProvider());
-
-        infoGeneratorBuilder.setDirectSignature(hasNoSignedAttributes);
-        infoGeneratorBuilder.setSignedAttributeGenerator(signedGen);
-        infoGeneratorBuilder.setUnsignedAttributeGenerator(unsignedGen);
-
-        return infoGeneratorBuilder;
-    }
-
-    private class Helper
-    {
-        ContentSigner createContentSigner(String algorithm, PrivateKey privateKey)
-            throws OperatorCreationException
-        {
-            return new JcaContentSignerBuilder(algorithm).build(privateKey);
-        }
-
-        DigestCalculatorProvider createDigestCalculatorProvider()
-            throws OperatorCreationException
-        {
-            return new JcaDigestCalculatorProviderBuilder().build();
-        }
-    }
-
-    private class NamedHelper
-        extends Helper
-    {
-        private final String providerName;
-
-        public NamedHelper(String providerName)
-        {
-            this.providerName = providerName;
-        }
-
-        ContentSigner createContentSigner(String algorithm, PrivateKey privateKey)
-            throws OperatorCreationException
-        {
-            return new JcaContentSignerBuilder(algorithm).setProvider(providerName).build(privateKey);
-        }
-
-        DigestCalculatorProvider createDigestCalculatorProvider()
-            throws OperatorCreationException
-        {
-            return new JcaDigestCalculatorProviderBuilder().setProvider(providerName).build();
-        }
-    }
-
-    private class ProviderHelper
-        extends Helper
-    {
-        private final Provider provider;
-
-        public ProviderHelper(Provider provider)
-        {
-            this.provider = provider;
-        }
-
-        ContentSigner createContentSigner(String algorithm, PrivateKey privateKey)
-            throws OperatorCreationException
-        {
-            return new JcaContentSignerBuilder(algorithm).setProvider(provider).build(privateKey);
-        }
-
-        DigestCalculatorProvider createDigestCalculatorProvider()
-            throws OperatorCreationException
-        {
-            return new JcaDigestCalculatorProviderBuilder().setProvider(provider).build();
-        }
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cms/jcajce/JcaX509CertSelectorConverter.java b/bcpkix/src/main/java/org/bouncycastle/cms/jcajce/JcaX509CertSelectorConverter.java
deleted file mode 100644
index 86f59f6..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cms/jcajce/JcaX509CertSelectorConverter.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.bouncycastle.cms.jcajce;
-
-import java.security.cert.X509CertSelector;
-
-import org.bouncycastle.cms.KeyTransRecipientId;
-import org.bouncycastle.cms.SignerId;
-
-public class JcaX509CertSelectorConverter
-    extends org.bouncycastle.cert.selector.jcajce.JcaX509CertSelectorConverter
-{
-    public JcaX509CertSelectorConverter()
-    {
-    }
-
-    public X509CertSelector getCertSelector(KeyTransRecipientId recipientId)
-    {
-        return doConversion(recipientId.getIssuer(), recipientId.getSerialNumber(), recipientId.getSubjectKeyIdentifier());
-    }
-
-    public X509CertSelector getCertSelector(SignerId signerId)
-    {
-        return doConversion(signerId.getIssuer(), signerId.getSerialNumber(), signerId.getSubjectKeyIdentifier());
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cms/jcajce/JceAlgorithmIdentifierConverter.java b/bcpkix/src/main/java/org/bouncycastle/cms/jcajce/JceAlgorithmIdentifierConverter.java
deleted file mode 100644
index 59928f4..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cms/jcajce/JceAlgorithmIdentifierConverter.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package org.bouncycastle.cms.jcajce;
-
-
-import java.security.AlgorithmParameters;
-import java.security.NoSuchAlgorithmException;
-import java.security.NoSuchProviderException;
-import java.security.Provider;
-import java.security.SecureRandom;
-
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.cms.CMSException;
-
-public class JceAlgorithmIdentifierConverter
-{
-    private EnvelopedDataHelper helper = new EnvelopedDataHelper(new DefaultJcaJceExtHelper());
-    private SecureRandom random;
-
-    public JceAlgorithmIdentifierConverter()
-    {
-    }
-
-    public JceAlgorithmIdentifierConverter setProvider(Provider provider)
-    {
-        this.helper = new EnvelopedDataHelper(new ProviderJcaJceExtHelper(provider));
-
-        return this;
-    }
-
-    public JceAlgorithmIdentifierConverter setProvider(String providerName)
-    {
-        this.helper = new EnvelopedDataHelper(new NamedJcaJceExtHelper(providerName));
-
-        return this;
-    }
-
-    public AlgorithmParameters getAlgorithmParameters(AlgorithmIdentifier algorithmIdentifier)
-        throws CMSException
-    {
-        ASN1Encodable parameters = algorithmIdentifier.getParameters();
-
-        if (parameters == null)
-        {
-            return null;
-        }
-
-        try
-        {
-            AlgorithmParameters params = helper.createAlgorithmParameters(algorithmIdentifier.getAlgorithm());
-
-            CMSUtils.loadParameters(params, algorithmIdentifier.getParameters());
-
-            return params;
-        }
-        catch (NoSuchAlgorithmException e)
-        {
-            throw new CMSException("can't find parameters for algorithm", e);
-        }
-        catch (NoSuchProviderException e)
-        {
-            throw new CMSException("can't find provider for algorithm", e);
-        }
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cms/jcajce/JceCMSContentEncryptorBuilder.java b/bcpkix/src/main/java/org/bouncycastle/cms/jcajce/JceCMSContentEncryptorBuilder.java
deleted file mode 100644
index 93d8b72..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cms/jcajce/JceCMSContentEncryptorBuilder.java
+++ /dev/null
@@ -1,160 +0,0 @@
-package org.bouncycastle.cms.jcajce;
-
-import java.io.OutputStream;
-import java.security.AlgorithmParameters;
-import java.security.GeneralSecurityException;
-import java.security.Provider;
-import java.security.SecureRandom;
-
-import javax.crypto.Cipher;
-import javax.crypto.CipherOutputStream;
-import javax.crypto.KeyGenerator;
-import javax.crypto.SecretKey;
-
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.cms.CMSException;
-import org.bouncycastle.operator.DefaultSecretKeySizeProvider;
-import org.bouncycastle.operator.GenericKey;
-import org.bouncycastle.operator.OutputEncryptor;
-import org.bouncycastle.operator.SecretKeySizeProvider;
-import org.bouncycastle.operator.jcajce.JceGenericKey;
-
-public class JceCMSContentEncryptorBuilder
-{
-    private static final SecretKeySizeProvider KEY_SIZE_PROVIDER = DefaultSecretKeySizeProvider.INSTANCE;
-
-
-    private final ASN1ObjectIdentifier encryptionOID;
-    private final int                  keySize;
-
-    private EnvelopedDataHelper helper = new EnvelopedDataHelper(new DefaultJcaJceExtHelper());
-    private SecureRandom random;
-
-    public JceCMSContentEncryptorBuilder(ASN1ObjectIdentifier encryptionOID)
-    {
-        this(encryptionOID, KEY_SIZE_PROVIDER.getKeySize(encryptionOID));
-    }
-
-    public JceCMSContentEncryptorBuilder(ASN1ObjectIdentifier encryptionOID, int keySize)
-    {
-        this.encryptionOID = encryptionOID;
-        this.keySize = keySize;
-
-        int fixedSize = KEY_SIZE_PROVIDER.getKeySize(encryptionOID);
-
-        if (encryptionOID.equals(PKCSObjectIdentifiers.des_EDE3_CBC))
-        {
-            if (keySize != 168 && keySize != fixedSize)
-            {
-                throw new IllegalArgumentException("incorrect keySize for encryptionOID passed to builder.");
-            }
-        }
-        else
-        {
-            if (fixedSize > 0 && fixedSize != keySize)
-            {
-                throw new IllegalArgumentException("incorrect keySize for encryptionOID passed to builder.");
-            }
-        }
-    }
-
-    public JceCMSContentEncryptorBuilder setProvider(Provider provider)
-    {
-        this.helper = new EnvelopedDataHelper(new ProviderJcaJceExtHelper(provider));
-
-        return this;
-    }
-
-    public JceCMSContentEncryptorBuilder setProvider(String providerName)
-    {
-        this.helper = new EnvelopedDataHelper(new NamedJcaJceExtHelper(providerName));
-
-        return this;
-    }
-
-    public JceCMSContentEncryptorBuilder setSecureRandom(SecureRandom random)
-    {
-        this.random = random;
-
-        return this;
-    }
-
-    public OutputEncryptor build()
-        throws CMSException
-    {
-        return new CMSOutputEncryptor(encryptionOID, keySize, random);
-    }
-
-    private class CMSOutputEncryptor
-        implements OutputEncryptor
-    {
-        private SecretKey encKey;
-        private AlgorithmIdentifier algorithmIdentifier;
-        private Cipher              cipher;
-
-        CMSOutputEncryptor(ASN1ObjectIdentifier encryptionOID, int keySize, SecureRandom random)
-            throws CMSException
-        {
-            KeyGenerator keyGen = helper.createKeyGenerator(encryptionOID);
-
-            if (random == null)
-            {
-                random = new SecureRandom();
-            }
-
-            if (keySize < 0)
-            {
-                keyGen.init(random);
-            }
-            else
-            {
-                if (encryptionOID.equals(PKCSObjectIdentifiers.des_EDE3_CBC) && keySize == 192)
-                {
-                    keySize = 168;
-                }
-                keyGen.init(keySize, random);
-            }
-
-            cipher = helper.createCipher(encryptionOID);
-            encKey = keyGen.generateKey();
-            AlgorithmParameters params = helper.generateParameters(encryptionOID, encKey, random);
-
-            try
-            {
-                cipher.init(Cipher.ENCRYPT_MODE, encKey, params, random);
-            }
-            catch (GeneralSecurityException e)
-            {
-                throw new CMSException("unable to initialize cipher: " + e.getMessage(), e);
-            }
-
-            //
-            // If params are null we try and second guess on them as some providers don't provide
-            // algorithm parameter generation explicity but instead generate them under the hood.
-            //
-            if (params == null)
-            {
-                params = cipher.getParameters();
-            }
-
-            algorithmIdentifier = helper.getAlgorithmIdentifier(encryptionOID, params);
-        }
-
-        public AlgorithmIdentifier getAlgorithmIdentifier()
-        {
-            return algorithmIdentifier;
-        }
-
-        public OutputStream getOutputStream(OutputStream dOut)
-        {
-            return new CipherOutputStream(dOut, cipher);
-        }
-
-        public GenericKey getKey()
-        {
-            return new JceGenericKey(algorithmIdentifier, encKey);
-        }
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cms/jcajce/JceCMSMacCalculatorBuilder.java b/bcpkix/src/main/java/org/bouncycastle/cms/jcajce/JceCMSMacCalculatorBuilder.java
deleted file mode 100644
index d6ba160..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cms/jcajce/JceCMSMacCalculatorBuilder.java
+++ /dev/null
@@ -1,155 +0,0 @@
-package org.bouncycastle.cms.jcajce;
-
-import java.io.OutputStream;
-import java.security.AlgorithmParameterGenerator;
-import java.security.AlgorithmParameters;
-import java.security.GeneralSecurityException;
-import java.security.Provider;
-import java.security.SecureRandom;
-import java.security.spec.AlgorithmParameterSpec;
-
-import javax.crypto.KeyGenerator;
-import javax.crypto.Mac;
-import javax.crypto.SecretKey;
-import javax.crypto.spec.IvParameterSpec;
-import javax.crypto.spec.RC2ParameterSpec;
-
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.cms.CMSException;
-import org.bouncycastle.jcajce.io.MacOutputStream;
-import org.bouncycastle.operator.GenericKey;
-import org.bouncycastle.operator.MacCalculator;
-import org.bouncycastle.operator.jcajce.JceGenericKey;
-
-public class JceCMSMacCalculatorBuilder
-{
-    private final ASN1ObjectIdentifier macOID;
-    private final int                  keySize;
-
-    private EnvelopedDataHelper helper = new EnvelopedDataHelper(new DefaultJcaJceExtHelper());
-    private SecureRandom random;
-
-    public JceCMSMacCalculatorBuilder(ASN1ObjectIdentifier macOID)
-    {
-        this(macOID, -1);
-    }
-
-    public JceCMSMacCalculatorBuilder(ASN1ObjectIdentifier macOID, int keySize)
-    {
-        this.macOID = macOID;
-        this.keySize = keySize;
-    }
-
-    public JceCMSMacCalculatorBuilder setProvider(Provider provider)
-    {
-        this.helper = new EnvelopedDataHelper(new ProviderJcaJceExtHelper(provider));
-
-        return this;
-    }
-
-    public JceCMSMacCalculatorBuilder setProvider(String providerName)
-    {
-        this.helper = new EnvelopedDataHelper(new NamedJcaJceExtHelper(providerName));
-
-        return this;
-    }
-
-    public JceCMSMacCalculatorBuilder setSecureRandom(SecureRandom random)
-    {
-        this.random = random;
-
-        return this;
-    }
-
-    public MacCalculator build()
-        throws CMSException
-    {
-        return new CMSMacCalculator(macOID, keySize, random);
-    }
-
-    private class CMSMacCalculator
-        implements MacCalculator
-    {
-        private SecretKey encKey;
-        private AlgorithmIdentifier algorithmIdentifier;
-        private Mac mac;
-        private SecureRandom random;
-
-        CMSMacCalculator(ASN1ObjectIdentifier macOID, int keySize, SecureRandom random)
-            throws CMSException
-        {
-            KeyGenerator keyGen = helper.createKeyGenerator(macOID);
-
-            if (random == null)
-            {
-                random = new SecureRandom();
-            }
-
-            this.random = random;
-
-            if (keySize < 0)
-            {
-                keyGen.init(random);
-            }
-            else
-            {
-                keyGen.init(keySize, random);
-            }
-
-            encKey = keyGen.generateKey();
-
-            AlgorithmParameterSpec paramSpec = generateParameterSpec(macOID, encKey);
-
-            algorithmIdentifier = helper.getAlgorithmIdentifier(macOID, paramSpec);
-            mac = helper.createContentMac(encKey, algorithmIdentifier);
-        }
-
-        public AlgorithmIdentifier getAlgorithmIdentifier()
-        {
-            return algorithmIdentifier;
-        }
-
-        public OutputStream getOutputStream()
-        {
-            return new MacOutputStream(mac);
-        }
-
-        public byte[] getMac()
-        {
-            return mac.doFinal();
-        }
-
-        public GenericKey getKey()
-        {
-            return new JceGenericKey(algorithmIdentifier, encKey);
-        }
-
-        protected AlgorithmParameterSpec generateParameterSpec(ASN1ObjectIdentifier macOID, SecretKey encKey)
-            throws CMSException
-        {
-            try
-            {
-                if (macOID.equals(PKCSObjectIdentifiers.RC2_CBC))
-                {
-                    byte[] iv = new byte[8];
-
-                    random.nextBytes(iv);
-
-                    return new RC2ParameterSpec(encKey.getEncoded().length * 8, iv);
-                }
-
-                AlgorithmParameterGenerator pGen = helper.createAlgorithmParameterGenerator(macOID);
-
-                AlgorithmParameters p = pGen.generateParameters();
-
-                return p.getParameterSpec(IvParameterSpec.class);
-            }
-            catch (GeneralSecurityException e)
-            {
-                return null;
-            }
-        }
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cms/jcajce/JceKEKAuthenticatedRecipient.java b/bcpkix/src/main/java/org/bouncycastle/cms/jcajce/JceKEKAuthenticatedRecipient.java
deleted file mode 100644
index eb73555..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cms/jcajce/JceKEKAuthenticatedRecipient.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package org.bouncycastle.cms.jcajce;
-
-import java.io.OutputStream;
-import java.security.Key;
-
-import javax.crypto.Mac;
-import javax.crypto.SecretKey;
-
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.cms.CMSException;
-import org.bouncycastle.cms.RecipientOperator;
-import org.bouncycastle.jcajce.io.MacOutputStream;
-import org.bouncycastle.operator.GenericKey;
-import org.bouncycastle.operator.MacCalculator;
-import org.bouncycastle.operator.jcajce.JceGenericKey;
-
-
-/**
- * the KeyTransRecipientInformation class for a recipient who has been sent a secret
- * key encrypted using their public key that needs to be used to
- * extract the message.
- */
-public class JceKEKAuthenticatedRecipient
-    extends JceKEKRecipient
-{
-    public JceKEKAuthenticatedRecipient(SecretKey recipientKey)
-    {
-        super(recipientKey);
-    }
-
-    public RecipientOperator getRecipientOperator(AlgorithmIdentifier keyEncryptionAlgorithm, final AlgorithmIdentifier contentMacAlgorithm, byte[] encryptedContentEncryptionKey)
-        throws CMSException
-    {
-        final Key secretKey = extractSecretKey(keyEncryptionAlgorithm, contentMacAlgorithm, encryptedContentEncryptionKey);
-
-        final Mac dataMac = contentHelper.createContentMac(secretKey, contentMacAlgorithm);
-
-        return new RecipientOperator(new MacCalculator()
-        {
-            public AlgorithmIdentifier getAlgorithmIdentifier()
-            {
-                return contentMacAlgorithm;
-            }
-
-            public GenericKey getKey()
-            {
-                return new JceGenericKey(contentMacAlgorithm, secretKey);
-            }
-
-            public OutputStream getOutputStream()
-            {
-                return new MacOutputStream(dataMac);
-            }
-
-            public byte[] getMac()
-            {
-                return dataMac.doFinal();
-            }
-        });
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cms/jcajce/JceKEKEnvelopedRecipient.java b/bcpkix/src/main/java/org/bouncycastle/cms/jcajce/JceKEKEnvelopedRecipient.java
deleted file mode 100644
index a729379..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cms/jcajce/JceKEKEnvelopedRecipient.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package org.bouncycastle.cms.jcajce;
-
-import java.io.InputStream;
-import java.security.Key;
-
-import javax.crypto.Cipher;
-import javax.crypto.CipherInputStream;
-import javax.crypto.SecretKey;
-
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.cms.CMSException;
-import org.bouncycastle.cms.RecipientOperator;
-import org.bouncycastle.operator.InputDecryptor;
-
-public class JceKEKEnvelopedRecipient
-    extends JceKEKRecipient
-{
-    public JceKEKEnvelopedRecipient(SecretKey recipientKey)
-    {
-        super(recipientKey);
-    }
-
-    public RecipientOperator getRecipientOperator(AlgorithmIdentifier keyEncryptionAlgorithm, final AlgorithmIdentifier contentEncryptionAlgorithm, byte[] encryptedContentEncryptionKey)
-        throws CMSException
-    {
-        Key secretKey = extractSecretKey(keyEncryptionAlgorithm, contentEncryptionAlgorithm, encryptedContentEncryptionKey);
-
-        final Cipher dataCipher = contentHelper.createContentCipher(secretKey, contentEncryptionAlgorithm);
-
-        return new RecipientOperator(new InputDecryptor()
-        {
-            public AlgorithmIdentifier getAlgorithmIdentifier()
-            {
-                return contentEncryptionAlgorithm;
-            }
-
-            public InputStream getInputStream(InputStream dataOut)
-            {
-                return new CipherInputStream(dataOut, dataCipher);
-            }
-        });
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cms/jcajce/JceKEKRecipient.java b/bcpkix/src/main/java/org/bouncycastle/cms/jcajce/JceKEKRecipient.java
deleted file mode 100644
index d0e4164..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cms/jcajce/JceKEKRecipient.java
+++ /dev/null
@@ -1,119 +0,0 @@
-package org.bouncycastle.cms.jcajce;
-
-import java.security.Key;
-import java.security.Provider;
-
-import javax.crypto.SecretKey;
-
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.cms.CMSException;
-import org.bouncycastle.cms.KEKRecipient;
-import org.bouncycastle.operator.OperatorException;
-import org.bouncycastle.operator.SymmetricKeyUnwrapper;
-
-public abstract class JceKEKRecipient
-    implements KEKRecipient
-{
-    private SecretKey recipientKey;
-
-    protected EnvelopedDataHelper helper = new EnvelopedDataHelper(new DefaultJcaJceExtHelper());
-    protected EnvelopedDataHelper contentHelper = helper;
-    protected boolean validateKeySize = false;
-
-    public JceKEKRecipient(SecretKey recipientKey)
-    {
-        this.recipientKey = recipientKey;
-    }
-
-    /**
-     * Set the provider to use for key recovery and content processing.
-     *
-     * @param provider provider to use.
-     * @return this recipient.
-     */
-    public JceKEKRecipient setProvider(Provider provider)
-    {
-        this.helper = new EnvelopedDataHelper(new ProviderJcaJceExtHelper(provider));
-        this.contentHelper = helper;
-
-        return this;
-    }
-
-    /**
-     * Set the provider to use for key recovery and content processing.
-     *
-     * @param providerName the name of the provider to use.
-     * @return this recipient.
-     */
-    public JceKEKRecipient setProvider(String providerName)
-    {
-        this.helper = new EnvelopedDataHelper(new NamedJcaJceExtHelper(providerName));
-        this.contentHelper = helper;
-
-        return this;
-    }
-
-    /**
-     * Set the provider to use for content processing.
-     *
-     * @param provider the provider to use.
-     * @return this recipient.
-     */
-    public JceKEKRecipient setContentProvider(Provider provider)
-    {
-        this.contentHelper = new EnvelopedDataHelper(new ProviderJcaJceExtHelper(provider));
-
-        return this;
-    }
-
-    /**
-     * Set the provider to use for content processing.
-     *
-     * @param providerName the name of the provider to use.
-     * @return this recipient.
-     */
-    public JceKEKRecipient setContentProvider(String providerName)
-    {
-        this.contentHelper = new EnvelopedDataHelper(new NamedJcaJceExtHelper(providerName));
-
-        return this;
-    }
-
-    /**
-     * Set validation of retrieved key sizes against the algorithm parameters for the encrypted key where possible - default is off.
-     * <p>
-     * This setting will not have any affect if the encryption algorithm in the recipient does not specify a particular key size, or
-     * if the unwrapper is a HSM and the byte encoding of the unwrapped secret key is not available.
-     * </p>
-     * @param doValidate true if unwrapped key's should be validated against the content encryption algorithm, false otherwise.
-     * @return this recipient.
-     */
-    public JceKEKRecipient setKeySizeValidation(boolean doValidate)
-    {
-        this.validateKeySize = doValidate;
-
-        return this;
-    }
-
-    protected Key extractSecretKey(AlgorithmIdentifier keyEncryptionAlgorithm, AlgorithmIdentifier encryptedKeyAlgorithm, byte[] encryptedContentEncryptionKey)
-        throws CMSException
-    {
-        SymmetricKeyUnwrapper unwrapper = helper.createSymmetricUnwrapper(keyEncryptionAlgorithm, recipientKey);
-
-        try
-        {
-            Key key =  helper.getJceKey(encryptedKeyAlgorithm.getAlgorithm(), unwrapper.generateUnwrappedKey(encryptedKeyAlgorithm, encryptedContentEncryptionKey));
-
-            if (validateKeySize)
-            {
-                helper.keySizeCheck(encryptedKeyAlgorithm, key);
-            }
-
-            return key;
-        }
-        catch (OperatorException e)
-        {
-            throw new CMSException("exception unwrapping key: " + e.getMessage(), e);
-        }
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cms/jcajce/JceKEKRecipientInfoGenerator.java b/bcpkix/src/main/java/org/bouncycastle/cms/jcajce/JceKEKRecipientInfoGenerator.java
deleted file mode 100644
index 15ec8ff..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cms/jcajce/JceKEKRecipientInfoGenerator.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package org.bouncycastle.cms.jcajce;
-
-import java.security.Provider;
-import java.security.SecureRandom;
-
-import javax.crypto.SecretKey;
-
-import org.bouncycastle.asn1.cms.KEKIdentifier;
-import org.bouncycastle.cms.KEKRecipientInfoGenerator;
-import org.bouncycastle.operator.jcajce.JceSymmetricKeyWrapper;
-
-public class JceKEKRecipientInfoGenerator
-    extends KEKRecipientInfoGenerator
-{
-    public JceKEKRecipientInfoGenerator(KEKIdentifier kekIdentifier, SecretKey keyEncryptionKey)
-    {
-        super(kekIdentifier, new JceSymmetricKeyWrapper(keyEncryptionKey));
-    }
-
-    public JceKEKRecipientInfoGenerator(byte[] keyIdentifier, SecretKey keyEncryptionKey)
-    {
-        this(new KEKIdentifier(keyIdentifier, null, null), keyEncryptionKey);
-    }
-
-    public JceKEKRecipientInfoGenerator setProvider(Provider provider)
-    {
-        ((JceSymmetricKeyWrapper)this.wrapper).setProvider(provider);
-
-        return this;
-    }
-
-    public JceKEKRecipientInfoGenerator setProvider(String providerName)
-    {
-        ((JceSymmetricKeyWrapper)this.wrapper).setProvider(providerName);
-
-        return this;
-    }
-
-    public JceKEKRecipientInfoGenerator setSecureRandom(SecureRandom random)
-    {
-        ((JceSymmetricKeyWrapper)this.wrapper).setSecureRandom(random);
-
-        return this;
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cms/jcajce/JceKeyAgreeAuthenticatedRecipient.java b/bcpkix/src/main/java/org/bouncycastle/cms/jcajce/JceKeyAgreeAuthenticatedRecipient.java
deleted file mode 100644
index d231f56..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cms/jcajce/JceKeyAgreeAuthenticatedRecipient.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package org.bouncycastle.cms.jcajce;
-
-import java.io.OutputStream;
-import java.security.Key;
-import java.security.PrivateKey;
-
-import javax.crypto.Mac;
-
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.bouncycastle.cms.CMSException;
-import org.bouncycastle.cms.RecipientOperator;
-import org.bouncycastle.jcajce.io.MacOutputStream;
-import org.bouncycastle.operator.GenericKey;
-import org.bouncycastle.operator.MacCalculator;
-import org.bouncycastle.operator.jcajce.JceGenericKey;
-
-public class JceKeyAgreeAuthenticatedRecipient
-    extends JceKeyAgreeRecipient
-{
-    public JceKeyAgreeAuthenticatedRecipient(PrivateKey recipientKey)
-    {
-        super(recipientKey);
-    }
-
-    public RecipientOperator getRecipientOperator(AlgorithmIdentifier keyEncryptionAlgorithm, final AlgorithmIdentifier contentMacAlgorithm, SubjectPublicKeyInfo senderPublicKey, ASN1OctetString userKeyingMaterial, byte[] encryptedContentKey)
-        throws CMSException
-    {
-        final Key secretKey = extractSecretKey(keyEncryptionAlgorithm, contentMacAlgorithm, senderPublicKey, userKeyingMaterial, encryptedContentKey);
-
-        final Mac dataMac = contentHelper.createContentMac(secretKey, contentMacAlgorithm);
-
-        return new RecipientOperator(new MacCalculator()
-        {
-            public AlgorithmIdentifier getAlgorithmIdentifier()
-            {
-                return contentMacAlgorithm;
-            }
-
-            public GenericKey getKey()
-            {
-                return new JceGenericKey(contentMacAlgorithm, secretKey);
-            }
-
-            public OutputStream getOutputStream()
-            {
-                return new MacOutputStream(dataMac);
-            }
-
-            public byte[] getMac()
-            {
-                return dataMac.doFinal();
-            }
-        });
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cms/jcajce/JceKeyAgreeEnvelopedRecipient.java b/bcpkix/src/main/java/org/bouncycastle/cms/jcajce/JceKeyAgreeEnvelopedRecipient.java
deleted file mode 100644
index fe647d7..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cms/jcajce/JceKeyAgreeEnvelopedRecipient.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package org.bouncycastle.cms.jcajce;
-
-import java.io.InputStream;
-import java.security.Key;
-import java.security.PrivateKey;
-
-import javax.crypto.Cipher;
-import javax.crypto.CipherInputStream;
-
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.bouncycastle.cms.CMSException;
-import org.bouncycastle.cms.RecipientOperator;
-import org.bouncycastle.operator.InputDecryptor;
-
-public class JceKeyAgreeEnvelopedRecipient
-    extends JceKeyAgreeRecipient
-{
-    public JceKeyAgreeEnvelopedRecipient(PrivateKey recipientKey)
-    {
-        super(recipientKey);
-    }
-
-    public RecipientOperator getRecipientOperator(AlgorithmIdentifier keyEncryptionAlgorithm, final AlgorithmIdentifier contentEncryptionAlgorithm, SubjectPublicKeyInfo senderPublicKey, ASN1OctetString userKeyingMaterial, byte[] encryptedContentKey)
-        throws CMSException
-    {
-        Key secretKey = extractSecretKey(keyEncryptionAlgorithm, contentEncryptionAlgorithm, senderPublicKey, userKeyingMaterial, encryptedContentKey);
-
-        final Cipher dataCipher = contentHelper.createContentCipher(secretKey, contentEncryptionAlgorithm);
-
-        return new RecipientOperator(new InputDecryptor()
-        {
-            public AlgorithmIdentifier getAlgorithmIdentifier()
-            {
-                return contentEncryptionAlgorithm;
-            }
-
-            public InputStream getInputStream(InputStream dataOut)
-            {
-                return new CipherInputStream(dataOut, dataCipher);
-            }
-        });
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cms/jcajce/JceKeyAgreeRecipient.java b/bcpkix/src/main/java/org/bouncycastle/cms/jcajce/JceKeyAgreeRecipient.java
deleted file mode 100644
index 8c41f91..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cms/jcajce/JceKeyAgreeRecipient.java
+++ /dev/null
@@ -1,184 +0,0 @@
-package org.bouncycastle.cms.jcajce;
-
-import java.io.IOException;
-import java.security.GeneralSecurityException;
-import java.security.InvalidKeyException;
-import java.security.Key;
-import java.security.KeyFactory;
-import java.security.NoSuchAlgorithmException;
-import java.security.PrivateKey;
-import java.security.Provider;
-import java.security.PublicKey;
-import java.security.spec.InvalidKeySpecException;
-import java.security.spec.X509EncodedKeySpec;
-
-import javax.crypto.Cipher;
-import javax.crypto.KeyAgreement;
-import javax.crypto.NoSuchPaddingException;
-import javax.crypto.SecretKey;
-
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.cms.ecc.MQVuserKeyingMaterial;
-import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.bouncycastle.cms.CMSEnvelopedGenerator;
-import org.bouncycastle.cms.CMSException;
-import org.bouncycastle.cms.KeyAgreeRecipient;
-import org.bouncycastle.jce.spec.MQVPrivateKeySpec;
-import org.bouncycastle.jce.spec.MQVPublicKeySpec;
-
-public abstract class JceKeyAgreeRecipient
-    implements KeyAgreeRecipient
-{
-    private PrivateKey recipientKey;
-    protected EnvelopedDataHelper helper = new EnvelopedDataHelper(new DefaultJcaJceExtHelper());
-    protected EnvelopedDataHelper contentHelper = helper;
-
-    public JceKeyAgreeRecipient(PrivateKey recipientKey)
-    {
-        this.recipientKey = recipientKey;
-    }
-
-    /**
-     * Set the provider to use for key recovery and content processing.
-     *
-     * @param provider provider to use.
-     * @return this recipient.
-     */
-    public JceKeyAgreeRecipient setProvider(Provider provider)
-    {
-        this.helper = new EnvelopedDataHelper(new ProviderJcaJceExtHelper(provider));
-        this.contentHelper = helper;
-
-        return this;
-    }
-
-    /**
-     * Set the provider to use for key recovery and content processing.
-     *
-     * @param providerName the name of the provider to use.
-     * @return this recipient.
-     */
-    public JceKeyAgreeRecipient setProvider(String providerName)
-    {
-        this.helper = new EnvelopedDataHelper(new NamedJcaJceExtHelper(providerName));
-        this.contentHelper = helper;
-
-        return this;
-    }
-
-    /**
-     * Set the provider to use for content processing.  If providerName is null a "no provider" search will be
-     *  used to satisfy getInstance calls.
-     *
-     * @param provider the provider to use.
-     * @return this recipient.
-     */
-    public JceKeyAgreeRecipient setContentProvider(Provider provider)
-    {
-        this.contentHelper = CMSUtils.createContentHelper(provider);
-
-        return this;
-    }
-
-    /**
-     * Set the provider to use for content processing. If providerName is null a "no provider" search will be
-     * used to satisfy getInstance calls.
-     *
-     * @param providerName the name of the provider to use.
-     * @return this recipient.
-     */
-    public JceKeyAgreeRecipient setContentProvider(String providerName)
-    {
-        this.contentHelper = CMSUtils.createContentHelper(providerName);
-
-        return this;
-    }
-
-    private SecretKey calculateAgreedWrapKey(AlgorithmIdentifier keyEncAlg, ASN1ObjectIdentifier wrapAlg,
-        PublicKey senderPublicKey, ASN1OctetString userKeyingMaterial, PrivateKey receiverPrivateKey)
-        throws CMSException, GeneralSecurityException, IOException
-    {
-        String agreeAlg = keyEncAlg.getAlgorithm().getId();
-
-        if (agreeAlg.equals(CMSEnvelopedGenerator.ECMQV_SHA1KDF))
-        {
-            byte[] ukmEncoding = userKeyingMaterial.getOctets();
-            MQVuserKeyingMaterial ukm = MQVuserKeyingMaterial.getInstance(
-                ASN1Primitive.fromByteArray(ukmEncoding));
-
-            SubjectPublicKeyInfo pubInfo = new SubjectPublicKeyInfo(
-                                                getPrivateKeyAlgorithmIdentifier(),
-                                                ukm.getEphemeralPublicKey().getPublicKey().getBytes());
-
-            X509EncodedKeySpec pubSpec = new X509EncodedKeySpec(pubInfo.getEncoded());
-            KeyFactory fact = helper.createKeyFactory(keyEncAlg.getAlgorithm());
-            PublicKey ephemeralKey = fact.generatePublic(pubSpec);
-
-            senderPublicKey = new MQVPublicKeySpec(senderPublicKey, ephemeralKey);
-            receiverPrivateKey = new MQVPrivateKeySpec(receiverPrivateKey, receiverPrivateKey);
-        }
-
-        KeyAgreement agreement = helper.createKeyAgreement(keyEncAlg.getAlgorithm());
-
-        agreement.init(receiverPrivateKey);
-        agreement.doPhase(senderPublicKey, true);
-
-        return agreement.generateSecret(wrapAlg.getId());
-    }
-
-    private Key unwrapSessionKey(ASN1ObjectIdentifier wrapAlg, SecretKey agreedKey, ASN1ObjectIdentifier contentEncryptionAlgorithm, byte[] encryptedContentEncryptionKey)
-        throws CMSException, InvalidKeyException, NoSuchAlgorithmException
-    {
-        Cipher keyCipher = helper.createCipher(wrapAlg);
-        keyCipher.init(Cipher.UNWRAP_MODE, agreedKey);
-        return keyCipher.unwrap(encryptedContentEncryptionKey, helper.getBaseCipherName(contentEncryptionAlgorithm), Cipher.SECRET_KEY);
-    }
-
-    protected Key extractSecretKey(AlgorithmIdentifier keyEncryptionAlgorithm, AlgorithmIdentifier contentEncryptionAlgorithm, SubjectPublicKeyInfo senderKey, ASN1OctetString userKeyingMaterial, byte[] encryptedContentEncryptionKey)
-        throws CMSException
-    {
-        try
-        {
-            ASN1ObjectIdentifier wrapAlg =
-                AlgorithmIdentifier.getInstance(keyEncryptionAlgorithm.getParameters()).getAlgorithm();
-
-            X509EncodedKeySpec pubSpec = new X509EncodedKeySpec(senderKey.getEncoded());
-            KeyFactory fact = helper.createKeyFactory(keyEncryptionAlgorithm.getAlgorithm());
-            PublicKey senderPublicKey = fact.generatePublic(pubSpec);
-
-            SecretKey agreedWrapKey = calculateAgreedWrapKey(keyEncryptionAlgorithm, wrapAlg,
-                senderPublicKey, userKeyingMaterial, recipientKey);
-
-            return unwrapSessionKey(wrapAlg, agreedWrapKey, contentEncryptionAlgorithm.getAlgorithm(), encryptedContentEncryptionKey);
-        }
-        catch (NoSuchAlgorithmException e)
-        {
-            throw new CMSException("can't find algorithm.", e);
-        }
-        catch (InvalidKeyException e)
-        {
-            throw new CMSException("key invalid in message.", e);
-        }
-        catch (InvalidKeySpecException e)
-        {
-            throw new CMSException("originator key spec invalid.", e);
-        }
-        catch (NoSuchPaddingException e)
-        {
-            throw new CMSException("required padding not supported.", e);
-        }
-        catch (Exception e)
-        {
-            throw new CMSException("originator key invalid.", e);
-        }
-    }
-
-    public AlgorithmIdentifier getPrivateKeyAlgorithmIdentifier()
-    {
-        return PrivateKeyInfo.getInstance(recipientKey.getEncoded()).getPrivateKeyAlgorithm();
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cms/jcajce/JceKeyAgreeRecipientId.java b/bcpkix/src/main/java/org/bouncycastle/cms/jcajce/JceKeyAgreeRecipientId.java
deleted file mode 100644
index 56911be..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cms/jcajce/JceKeyAgreeRecipientId.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package org.bouncycastle.cms.jcajce;
-
-import java.math.BigInteger;
-import java.security.cert.X509Certificate;
-
-import javax.security.auth.x500.X500Principal;
-
-import org.bouncycastle.asn1.x500.X500Name;
-import org.bouncycastle.cms.KeyAgreeRecipientId;
-
-public class JceKeyAgreeRecipientId
-    extends KeyAgreeRecipientId
-{
-    public JceKeyAgreeRecipientId(X509Certificate certificate)
-    {
-        this(certificate.getIssuerX500Principal(), certificate.getSerialNumber());
-    }
-
-    public JceKeyAgreeRecipientId(X500Principal issuer, BigInteger serialNumber)
-    {
-        super(X500Name.getInstance(issuer.getEncoded()), serialNumber);
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cms/jcajce/JceKeyAgreeRecipientInfoGenerator.java b/bcpkix/src/main/java/org/bouncycastle/cms/jcajce/JceKeyAgreeRecipientInfoGenerator.java
deleted file mode 100644
index 583ede2..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cms/jcajce/JceKeyAgreeRecipientInfoGenerator.java
+++ /dev/null
@@ -1,215 +0,0 @@
-package org.bouncycastle.cms.jcajce;
-
-import java.security.GeneralSecurityException;
-import java.security.InvalidAlgorithmParameterException;
-import java.security.KeyPair;
-import java.security.KeyPairGenerator;
-import java.security.PrivateKey;
-import java.security.Provider;
-import java.security.PublicKey;
-import java.security.SecureRandom;
-import java.security.cert.CertificateEncodingException;
-import java.security.cert.X509Certificate;
-import java.security.interfaces.ECPublicKey;
-import java.security.spec.ECParameterSpec;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.crypto.Cipher;
-import javax.crypto.KeyAgreement;
-import javax.crypto.SecretKey;
-
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DEROctetString;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.cms.KeyAgreeRecipientIdentifier;
-import org.bouncycastle.asn1.cms.RecipientEncryptedKey;
-import org.bouncycastle.asn1.cms.RecipientKeyIdentifier;
-import org.bouncycastle.asn1.cms.ecc.MQVuserKeyingMaterial;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.bouncycastle.cms.CMSAlgorithm;
-import org.bouncycastle.cms.CMSEnvelopedGenerator;
-import org.bouncycastle.cms.CMSException;
-import org.bouncycastle.cms.KeyAgreeRecipientInfoGenerator;
-import org.bouncycastle.jce.spec.MQVPrivateKeySpec;
-import org.bouncycastle.jce.spec.MQVPublicKeySpec;
-import org.bouncycastle.operator.GenericKey;
-
-public class JceKeyAgreeRecipientInfoGenerator
-    extends KeyAgreeRecipientInfoGenerator
-{
-    private List recipientIDs = new ArrayList();
-    private List recipientKeys = new ArrayList();
-    private PublicKey senderPublicKey;
-    private PrivateKey senderPrivateKey;
-
-    private EnvelopedDataHelper helper = new EnvelopedDataHelper(new DefaultJcaJceExtHelper());
-    private SecureRandom random;
-    private KeyPair ephemeralKP;
-
-    public JceKeyAgreeRecipientInfoGenerator(ASN1ObjectIdentifier keyAgreementOID, PrivateKey senderPrivateKey, PublicKey senderPublicKey, ASN1ObjectIdentifier keyEncryptionOID)
-    {
-        super(keyAgreementOID, SubjectPublicKeyInfo.getInstance(senderPublicKey.getEncoded()), keyEncryptionOID);
-
-        this.senderPublicKey = senderPublicKey;
-        this.senderPrivateKey = senderPrivateKey;
-    }
-
-    public JceKeyAgreeRecipientInfoGenerator setProvider(Provider provider)
-    {
-        this.helper = new EnvelopedDataHelper(new ProviderJcaJceExtHelper(provider));
-
-        return this;
-    }
-
-    public JceKeyAgreeRecipientInfoGenerator setProvider(String providerName)
-    {
-        this.helper = new EnvelopedDataHelper(new NamedJcaJceExtHelper(providerName));
-
-        return this;
-    }
-
-    public JceKeyAgreeRecipientInfoGenerator setSecureRandom(SecureRandom random)
-    {
-        this.random = random;
-
-        return this;
-    }
-
-    /**
-     * Add a recipient based on the passed in certificate's public key and its issuer and serial number.
-     * 
-     * @param recipientCert recipient's certificate
-     * @return the current instance.
-     * @throws CertificateEncodingException  if the necessary data cannot be extracted from the certificate.
-     */
-    public JceKeyAgreeRecipientInfoGenerator addRecipient(X509Certificate recipientCert)
-        throws CertificateEncodingException
-    {
-        recipientIDs.add(new KeyAgreeRecipientIdentifier(CMSUtils.getIssuerAndSerialNumber(recipientCert)));
-        recipientKeys.add(recipientCert.getPublicKey());
-
-        return this;
-    }
-
-    /**
-     * Add a recipient identified by the passed in subjectKeyID and the for the passed in public key.
-     *
-     * @param subjectKeyID identifier actual recipient will use to match the private key.
-     * @param publicKey the public key for encrypting the secret key.
-     * @return the current instance.
-     * @throws CertificateEncodingException
-     */
-    public JceKeyAgreeRecipientInfoGenerator addRecipient(byte[] subjectKeyID, PublicKey publicKey)
-        throws CertificateEncodingException
-    {
-        recipientIDs.add(new KeyAgreeRecipientIdentifier(new RecipientKeyIdentifier(subjectKeyID)));
-        recipientKeys.add(publicKey);
-
-        return this;
-    }
-
-    public ASN1Sequence generateRecipientEncryptedKeys(AlgorithmIdentifier keyAgreeAlgorithm, AlgorithmIdentifier keyEncryptionAlgorithm, GenericKey contentEncryptionKey)
-        throws CMSException
-    {
-        init(keyAgreeAlgorithm.getAlgorithm());
-
-        PrivateKey senderPrivateKey = this.senderPrivateKey;
-
-        ASN1ObjectIdentifier keyAgreementOID = keyAgreeAlgorithm.getAlgorithm();
-
-        if (keyAgreementOID.getId().equals(CMSEnvelopedGenerator.ECMQV_SHA1KDF))
-        {           
-            senderPrivateKey = new MQVPrivateKeySpec(
-                senderPrivateKey, ephemeralKP.getPrivate(), ephemeralKP.getPublic());
-        }
-
-        ASN1EncodableVector recipientEncryptedKeys = new ASN1EncodableVector();
-        for (int i = 0; i != recipientIDs.size(); i++)
-        {
-            PublicKey recipientPublicKey = (PublicKey)recipientKeys.get(i);
-            KeyAgreeRecipientIdentifier karId = (KeyAgreeRecipientIdentifier)recipientIDs.get(i);
-
-            if (keyAgreementOID.getId().equals(CMSEnvelopedGenerator.ECMQV_SHA1KDF))
-            {
-                recipientPublicKey = new MQVPublicKeySpec(recipientPublicKey, recipientPublicKey);
-            }
-
-            try
-            {
-                // Use key agreement to choose a wrap key for this recipient
-                KeyAgreement keyAgreement = helper.createKeyAgreement(keyAgreementOID);
-                keyAgreement.init(senderPrivateKey, random);
-                keyAgreement.doPhase(recipientPublicKey, true);
-                SecretKey keyEncryptionKey = keyAgreement.generateSecret(keyEncryptionAlgorithm.getAlgorithm().getId());
-
-                // Wrap the content encryption key with the agreement key
-                Cipher keyEncryptionCipher = helper.createCipher(keyEncryptionAlgorithm.getAlgorithm());
-
-                keyEncryptionCipher.init(Cipher.WRAP_MODE, keyEncryptionKey, random);
-
-                byte[] encryptedKeyBytes = keyEncryptionCipher.wrap(helper.getJceKey(contentEncryptionKey));
-
-                ASN1OctetString encryptedKey = new DEROctetString(encryptedKeyBytes);
-
-                recipientEncryptedKeys.add(new RecipientEncryptedKey(karId, encryptedKey));
-            }
-            catch (GeneralSecurityException e)
-            {
-                throw new CMSException("cannot perform agreement step: " + e.getMessage(), e);
-            }
-        }
-
-        return new DERSequence(recipientEncryptedKeys);
-    }
-
-    protected ASN1Encodable getUserKeyingMaterial(AlgorithmIdentifier keyAgreeAlg)
-        throws CMSException
-    {
-        init(keyAgreeAlg.getAlgorithm());
-
-        if (ephemeralKP != null)
-        {
-            return new MQVuserKeyingMaterial(
-                        createOriginatorPublicKey(SubjectPublicKeyInfo.getInstance(ephemeralKP.getPublic().getEncoded())), null);
-        }
-
-        return null;
-    }
-
-    private void init(ASN1ObjectIdentifier keyAgreementOID)
-        throws CMSException
-    {
-        if (random == null)
-        {
-            random = new SecureRandom();
-        }
-
-        if (keyAgreementOID.equals(CMSAlgorithm.ECMQV_SHA1KDF))
-        {
-            if (ephemeralKP == null)
-            {
-                try
-                {
-                    ECParameterSpec ecParamSpec = ((ECPublicKey)senderPublicKey).getParams();
-
-                    KeyPairGenerator ephemKPG = helper.createKeyPairGenerator(keyAgreementOID);
-
-                    ephemKPG.initialize(ecParamSpec, random);
-
-                    ephemeralKP = ephemKPG.generateKeyPair();
-                }
-                catch (InvalidAlgorithmParameterException e)
-                {
-                    throw new CMSException(
-                        "cannot determine MQV ephemeral key pair parameters from public key: " + e);
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/bcpkix/src/main/java/org/bouncycastle/cms/jcajce/JceKeyTransAuthenticatedRecipient.java b/bcpkix/src/main/java/org/bouncycastle/cms/jcajce/JceKeyTransAuthenticatedRecipient.java
deleted file mode 100644
index f15aadb..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cms/jcajce/JceKeyTransAuthenticatedRecipient.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package org.bouncycastle.cms.jcajce;
-
-import java.io.OutputStream;
-import java.security.Key;
-import java.security.PrivateKey;
-
-import javax.crypto.Mac;
-
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.cms.CMSException;
-import org.bouncycastle.cms.RecipientOperator;
-import org.bouncycastle.jcajce.io.MacOutputStream;
-import org.bouncycastle.operator.GenericKey;
-import org.bouncycastle.operator.MacCalculator;
-
-
-/**
- * the KeyTransRecipientInformation class for a recipient who has been sent a secret
- * key encrypted using their public key that needs to be used to
- * extract the message.
- */
-public class JceKeyTransAuthenticatedRecipient
-    extends JceKeyTransRecipient
-{
-    public JceKeyTransAuthenticatedRecipient(PrivateKey recipientKey)
-    {
-        super(recipientKey);
-    }
-
-    public RecipientOperator getRecipientOperator(AlgorithmIdentifier keyEncryptionAlgorithm, final AlgorithmIdentifier contentMacAlgorithm, byte[] encryptedContentEncryptionKey)
-        throws CMSException
-    {
-        final Key secretKey = extractSecretKey(keyEncryptionAlgorithm, contentMacAlgorithm, encryptedContentEncryptionKey);
-
-        final Mac dataMac = contentHelper.createContentMac(secretKey, contentMacAlgorithm);
-
-        return new RecipientOperator(new MacCalculator()
-        {
-            public AlgorithmIdentifier getAlgorithmIdentifier()
-            {
-                return contentMacAlgorithm;
-            }
-
-            public GenericKey getKey()
-            {
-                return new GenericKey(secretKey);
-            }
-
-            public OutputStream getOutputStream()
-            {
-                return new MacOutputStream(dataMac);
-            }
-
-            public byte[] getMac()
-            {
-                return dataMac.doFinal();
-            }
-        });
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cms/jcajce/JceKeyTransEnvelopedRecipient.java b/bcpkix/src/main/java/org/bouncycastle/cms/jcajce/JceKeyTransEnvelopedRecipient.java
deleted file mode 100644
index 1bc0188..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cms/jcajce/JceKeyTransEnvelopedRecipient.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package org.bouncycastle.cms.jcajce;
-
-import java.io.InputStream;
-import java.security.Key;
-import java.security.PrivateKey;
-
-import javax.crypto.Cipher;
-import javax.crypto.CipherInputStream;
-
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.cms.CMSException;
-import org.bouncycastle.cms.RecipientOperator;
-import org.bouncycastle.operator.InputDecryptor;
-
-public class JceKeyTransEnvelopedRecipient
-    extends JceKeyTransRecipient
-{
-    public JceKeyTransEnvelopedRecipient(PrivateKey recipientKey)
-    {
-        super(recipientKey);
-    }
-
-    public RecipientOperator getRecipientOperator(AlgorithmIdentifier keyEncryptionAlgorithm, final AlgorithmIdentifier contentEncryptionAlgorithm, byte[] encryptedContentEncryptionKey)
-        throws CMSException
-    {
-        Key secretKey = extractSecretKey(keyEncryptionAlgorithm, contentEncryptionAlgorithm, encryptedContentEncryptionKey);
-
-        final Cipher dataCipher = contentHelper.createContentCipher(secretKey, contentEncryptionAlgorithm);
-
-        return new RecipientOperator(new InputDecryptor()
-        {
-            public AlgorithmIdentifier getAlgorithmIdentifier()
-            {
-                return contentEncryptionAlgorithm;
-            }
-
-            public InputStream getInputStream(InputStream dataIn)
-            {
-                return new CipherInputStream(dataIn, dataCipher);
-            }
-        });
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cms/jcajce/JceKeyTransRecipient.java b/bcpkix/src/main/java/org/bouncycastle/cms/jcajce/JceKeyTransRecipient.java
deleted file mode 100644
index a457ede..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cms/jcajce/JceKeyTransRecipient.java
+++ /dev/null
@@ -1,156 +0,0 @@
-package org.bouncycastle.cms.jcajce;
-
-import java.security.Key;
-import java.security.PrivateKey;
-import java.security.Provider;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.cms.CMSException;
-import org.bouncycastle.cms.KeyTransRecipient;
-import org.bouncycastle.operator.OperatorException;
-import org.bouncycastle.operator.jcajce.JceAsymmetricKeyUnwrapper;
-
-public abstract class JceKeyTransRecipient
-    implements KeyTransRecipient
-{
-    private PrivateKey recipientKey;
-
-    protected EnvelopedDataHelper helper = new EnvelopedDataHelper(new DefaultJcaJceExtHelper());
-    protected EnvelopedDataHelper contentHelper = helper;
-    protected Map extraMappings = new HashMap();
-    protected boolean validateKeySize = false;
-
-    public JceKeyTransRecipient(PrivateKey recipientKey)
-    {
-        this.recipientKey = recipientKey;
-    }
-
-    /**
-     * Set the provider to use for key recovery and content processing.
-     *
-     * @param provider provider to use.
-     * @return this recipient.
-     */
-    public JceKeyTransRecipient setProvider(Provider provider)
-    {
-        this.helper = new EnvelopedDataHelper(new ProviderJcaJceExtHelper(provider));
-        this.contentHelper = helper;
-
-        return this;
-    }
-
-    /**
-     * Set the provider to use for key recovery and content processing.
-     *
-     * @param providerName the name of the provider to use.
-     * @return this recipient.
-     */
-    public JceKeyTransRecipient setProvider(String providerName)
-    {
-        this.helper = new EnvelopedDataHelper(new NamedJcaJceExtHelper(providerName));
-        this.contentHelper = helper;
-
-        return this;
-    }
-
-    /**
-     * Internally algorithm ids are converted into cipher names using a lookup table. For some providers
-     * the standard lookup table won't work. Use this method to establish a specific mapping from an
-     * algorithm identifier to a specific algorithm.
-     * <p>
-     *     For example:
-     * <pre>
-     *     unwrapper.setAlgorithmMapping(PKCSObjectIdentifiers.rsaEncryption, "RSA");
-     * </pre>
-     * </p>
-     * @param algorithm  OID of algorithm in recipient.
-     * @param algorithmName JCE algorithm name to use.
-     * @return the current Recipient.
-     */
-    public JceKeyTransRecipient setAlgorithmMapping(ASN1ObjectIdentifier algorithm, String algorithmName)
-    {
-        extraMappings.put(algorithm, algorithmName);
-
-        return this;
-    }
-
-    /**
-     * Set the provider to use for content processing.  If providerName is null a "no provider" search will be
-     * used to satisfy getInstance calls.
-     *
-     * @param provider the provider to use.
-     * @return this recipient.
-     */
-    public JceKeyTransRecipient setContentProvider(Provider provider)
-    {
-        this.contentHelper = CMSUtils.createContentHelper(provider);
-
-        return this;
-    }
-
-    /**
-     * Set the provider to use for content processing.  If providerName is null a "no provider" search will be
-     *  used to satisfy getInstance calls.
-     *
-     * @param providerName the name of the provider to use.
-     * @return this recipient.
-     */
-    public JceKeyTransRecipient setContentProvider(String providerName)
-    {
-        this.contentHelper = CMSUtils.createContentHelper(providerName);
-
-        return this;
-    }
-
-    /**
-     * Set validation of retrieved key sizes against the algorithm parameters for the encrypted key where possible - default is off.
-     * <p>
-     * This setting will not have any affect if the encryption algorithm in the recipient does not specify a particular key size, or
-     * if the unwrapper is a HSM and the byte encoding of the unwrapped secret key is not available.
-     * </p>
-     * @param doValidate true if unwrapped key's should be validated against the content encryption algorithm, false otherwise.
-     * @return this recipient.
-     */
-    public JceKeyTransRecipient setKeySizeValidation(boolean doValidate)
-    {
-        this.validateKeySize = doValidate;
-
-        return this;
-    }
-
-    protected Key extractSecretKey(AlgorithmIdentifier keyEncryptionAlgorithm, AlgorithmIdentifier encryptedKeyAlgorithm, byte[] encryptedEncryptionKey)
-        throws CMSException
-    {
-        JceAsymmetricKeyUnwrapper unwrapper = helper.createAsymmetricUnwrapper(keyEncryptionAlgorithm, recipientKey);
-
-        if (!extraMappings.isEmpty())
-        {
-            for (Iterator it = extraMappings.keySet().iterator(); it.hasNext();)
-            {
-                ASN1ObjectIdentifier algorithm = (ASN1ObjectIdentifier)it.next();
-
-                unwrapper.setAlgorithmMapping(algorithm, (String)extraMappings.get(algorithm));
-            }
-        }
-
-        try
-        {
-            Key key = helper.getJceKey(encryptedKeyAlgorithm.getAlgorithm(), unwrapper.generateUnwrappedKey(encryptedKeyAlgorithm, encryptedEncryptionKey));
-
-            if (validateKeySize)
-            {
-                helper.keySizeCheck(encryptedKeyAlgorithm, key);
-            }
-
-            return key;
-        }
-        catch (OperatorException e)
-        {
-            throw new CMSException("exception unwrapping key: " + e.getMessage(), e);
-        }
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cms/jcajce/JceKeyTransRecipientId.java b/bcpkix/src/main/java/org/bouncycastle/cms/jcajce/JceKeyTransRecipientId.java
deleted file mode 100644
index 8b44817..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cms/jcajce/JceKeyTransRecipientId.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package org.bouncycastle.cms.jcajce;
-
-import java.math.BigInteger;
-import java.security.cert.X509Certificate;
-
-import javax.security.auth.x500.X500Principal;
-
-import org.bouncycastle.asn1.x500.X500Name;
-import org.bouncycastle.cms.KeyTransRecipientId;
-
-public class JceKeyTransRecipientId
-    extends KeyTransRecipientId
-{
-    /**
-     * Construct a recipient id based on the issuer, serial number and subject key identifier (if present) of the passed in
-     * certificate.
-     *
-     * @param certificate certificate providing the issue and serial number and subject key identifier.
-     */
-    public JceKeyTransRecipientId(X509Certificate certificate)
-    {
-        super(convertPrincipal(certificate.getIssuerX500Principal()), certificate.getSerialNumber(), CMSUtils.getSubjectKeyId(certificate));
-    }
-
-    /**
-     * Construct a recipient id based on the provided issuer and serial number..
-     *
-     * @param issuer the issuer to use.
-     * @param serialNumber  the serial number to use.
-     */
-    public JceKeyTransRecipientId(X500Principal issuer, BigInteger serialNumber)
-    {
-        super(convertPrincipal(issuer), serialNumber);
-    }
-
-    /**
-     * Construct a recipient id based on the provided issuer, serial number, and subjectKeyId..
-     *
-     * @param issuer the issuer to use.
-     * @param serialNumber  the serial number to use.
-     * @param subjectKeyId the subject key ID to use.
-     */
-    public JceKeyTransRecipientId(X500Principal issuer, BigInteger serialNumber, byte[] subjectKeyId)
-    {
-        super(convertPrincipal(issuer), serialNumber, subjectKeyId);
-    }
-
-    private static X500Name convertPrincipal(X500Principal issuer)
-    {
-        if (issuer == null)
-        {
-            return null;
-        }
-
-        return X500Name.getInstance(issuer.getEncoded());
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cms/jcajce/JceKeyTransRecipientInfoGenerator.java b/bcpkix/src/main/java/org/bouncycastle/cms/jcajce/JceKeyTransRecipientInfoGenerator.java
deleted file mode 100644
index 60a2ff2..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cms/jcajce/JceKeyTransRecipientInfoGenerator.java
+++ /dev/null
@@ -1,87 +0,0 @@
-package org.bouncycastle.cms.jcajce;
-
-import java.security.Provider;
-import java.security.PublicKey;
-import java.security.cert.CertificateEncodingException;
-import java.security.cert.X509Certificate;
-
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.cms.IssuerAndSerialNumber;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.cert.jcajce.JcaX509CertificateHolder;
-import org.bouncycastle.cms.KeyTransRecipientInfoGenerator;
-import org.bouncycastle.operator.jcajce.JceAsymmetricKeyWrapper;
-
-public class JceKeyTransRecipientInfoGenerator
-    extends KeyTransRecipientInfoGenerator
-{
-    public JceKeyTransRecipientInfoGenerator(X509Certificate recipientCert)
-        throws CertificateEncodingException
-    {
-        super(new IssuerAndSerialNumber(new JcaX509CertificateHolder(recipientCert).toASN1Structure()), new JceAsymmetricKeyWrapper(recipientCert));
-    }
-
-    public JceKeyTransRecipientInfoGenerator(byte[] subjectKeyIdentifier, PublicKey publicKey)
-    {
-        super(subjectKeyIdentifier, new JceAsymmetricKeyWrapper(publicKey));
-    }
-
-    /**
-     * Create a generator overriding the algorithm type implied by the public key in the certificate passed in.
-     *
-     * @param recipientCert certificate carrying the public key.
-     * @param algorithmIdentifier the identifier and parameters for the encryption algorithm to be used.
-     */
-    public JceKeyTransRecipientInfoGenerator(X509Certificate recipientCert, AlgorithmIdentifier algorithmIdentifier)
-        throws CertificateEncodingException
-    {
-        super(new IssuerAndSerialNumber(new JcaX509CertificateHolder(recipientCert).toASN1Structure()), new JceAsymmetricKeyWrapper(algorithmIdentifier, recipientCert.getPublicKey()));
-    }
-
-    /**
-     * Create a generator overriding the algorithm type implied by the public key passed in.
-     *
-     * @param subjectKeyIdentifier  the subject key identifier value to associate with the public key.
-     * @param algorithmIdentifier  the identifier and parameters for the encryption algorithm to be used.
-     * @param publicKey the public key to use.
-     */
-    public JceKeyTransRecipientInfoGenerator(byte[] subjectKeyIdentifier, AlgorithmIdentifier algorithmIdentifier, PublicKey publicKey)
-    {
-        super(subjectKeyIdentifier, new JceAsymmetricKeyWrapper(algorithmIdentifier, publicKey));
-    }
-
-    public JceKeyTransRecipientInfoGenerator setProvider(String providerName)
-    {
-        ((JceAsymmetricKeyWrapper)this.wrapper).setProvider(providerName);
-
-        return this;
-    }
-
-    public JceKeyTransRecipientInfoGenerator setProvider(Provider provider)
-    {
-        ((JceAsymmetricKeyWrapper)this.wrapper).setProvider(provider);
-
-        return this;
-    }
-
-    /**
-     * Internally algorithm ids are converted into cipher names using a lookup table. For some providers
-     * the standard lookup table won't work. Use this method to establish a specific mapping from an
-     * algorithm identifier to a specific algorithm.
-     * <p>
-     *     For example:
-     * <pre>
-     *     unwrapper.setAlgorithmMapping(PKCSObjectIdentifiers.rsaEncryption, "RSA");
-     * </pre>
-     * </p>
-     * @param algorithm  OID of algorithm in recipient.
-     * @param algorithmName JCE algorithm name to use.
-     * @return the current RecipientInfoGenerator.
-     */
-    public JceKeyTransRecipientInfoGenerator setAlgorithmMapping(ASN1ObjectIdentifier algorithm, String algorithmName)
-    {
-        ((JceAsymmetricKeyWrapper)this.wrapper).setAlgorithmMapping(algorithm, algorithmName);
-
-        return this;
-    }
-}
\ No newline at end of file
diff --git a/bcpkix/src/main/java/org/bouncycastle/cms/jcajce/JcePasswordAuthenticatedRecipient.java b/bcpkix/src/main/java/org/bouncycastle/cms/jcajce/JcePasswordAuthenticatedRecipient.java
deleted file mode 100644
index ba873d2..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cms/jcajce/JcePasswordAuthenticatedRecipient.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package org.bouncycastle.cms.jcajce;
-
-import java.io.OutputStream;
-import java.security.Key;
-
-import javax.crypto.Mac;
-
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.cms.CMSException;
-import org.bouncycastle.cms.RecipientOperator;
-import org.bouncycastle.jcajce.io.MacOutputStream;
-import org.bouncycastle.operator.GenericKey;
-import org.bouncycastle.operator.MacCalculator;
-import org.bouncycastle.operator.jcajce.JceGenericKey;
-
-public class JcePasswordAuthenticatedRecipient
-    extends JcePasswordRecipient
-{
-    public JcePasswordAuthenticatedRecipient(char[] password)
-    {
-        super(password);
-    }
-
-    public RecipientOperator getRecipientOperator(AlgorithmIdentifier keyEncryptionAlgorithm, final AlgorithmIdentifier contentMacAlgorithm, byte[] derivedKey, byte[] encryptedContentEncryptionKey)
-        throws CMSException
-    {
-        final Key secretKey = extractSecretKey(keyEncryptionAlgorithm, contentMacAlgorithm, derivedKey, encryptedContentEncryptionKey);
-
-        final Mac dataMac = helper.createContentMac(secretKey, contentMacAlgorithm);
-
-        return new RecipientOperator(new MacCalculator()
-        {
-            public AlgorithmIdentifier getAlgorithmIdentifier()
-            {
-                return contentMacAlgorithm;
-            }
-
-            public GenericKey getKey()
-            {
-                return new JceGenericKey(contentMacAlgorithm, secretKey);
-            }
-
-            public OutputStream getOutputStream()
-            {
-                return new MacOutputStream(dataMac);
-            }
-
-            public byte[] getMac()
-            {
-                return dataMac.doFinal();
-            }
-        });
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cms/jcajce/JcePasswordEnvelopedRecipient.java b/bcpkix/src/main/java/org/bouncycastle/cms/jcajce/JcePasswordEnvelopedRecipient.java
deleted file mode 100644
index be741db..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cms/jcajce/JcePasswordEnvelopedRecipient.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package org.bouncycastle.cms.jcajce;
-
-import java.io.InputStream;
-import java.security.Key;
-
-import javax.crypto.Cipher;
-import javax.crypto.CipherInputStream;
-
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.cms.CMSException;
-import org.bouncycastle.cms.RecipientOperator;
-import org.bouncycastle.operator.InputDecryptor;
-
-public class JcePasswordEnvelopedRecipient
-    extends JcePasswordRecipient
-{
-    public JcePasswordEnvelopedRecipient(char[] password)
-    {
-        super(password);
-    }
-
-    public RecipientOperator getRecipientOperator(AlgorithmIdentifier keyEncryptionAlgorithm, final AlgorithmIdentifier contentEncryptionAlgorithm, byte[] derivedKey, byte[] encryptedContentEncryptionKey)
-        throws CMSException
-    {
-        Key secretKey = extractSecretKey(keyEncryptionAlgorithm, contentEncryptionAlgorithm, derivedKey, encryptedContentEncryptionKey);
-
-        final Cipher dataCipher = helper.createContentCipher(secretKey, contentEncryptionAlgorithm);
-
-        return new RecipientOperator(new InputDecryptor()
-        {
-            public AlgorithmIdentifier getAlgorithmIdentifier()
-            {
-                return contentEncryptionAlgorithm;
-            }
-
-            public InputStream getInputStream(InputStream dataOut)
-            {
-                return new CipherInputStream(dataOut, dataCipher);
-            }
-        });
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cms/jcajce/JcePasswordRecipient.java b/bcpkix/src/main/java/org/bouncycastle/cms/jcajce/JcePasswordRecipient.java
deleted file mode 100644
index 3c00b5e..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cms/jcajce/JcePasswordRecipient.java
+++ /dev/null
@@ -1,97 +0,0 @@
-package org.bouncycastle.cms.jcajce;
-
-import java.security.GeneralSecurityException;
-import java.security.Key;
-import java.security.Provider;
-
-import javax.crypto.Cipher;
-import javax.crypto.spec.IvParameterSpec;
-import javax.crypto.spec.SecretKeySpec;
-
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.pkcs.PBKDF2Params;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.cms.CMSException;
-import org.bouncycastle.cms.PasswordRecipient;
-import org.bouncycastle.crypto.generators.PKCS5S2ParametersGenerator;
-import org.bouncycastle.crypto.params.KeyParameter;
-
-/**
- * the RecipientInfo class for a recipient who has been sent a message
- * encrypted using a password.
- */
-public abstract class JcePasswordRecipient
-    implements PasswordRecipient
-{
-    private int schemeID = PasswordRecipient.PKCS5_SCHEME2_UTF8;
-    protected EnvelopedDataHelper helper = new EnvelopedDataHelper(new DefaultJcaJceExtHelper());
-    private char[] password;
-
-    JcePasswordRecipient(
-        char[] password)
-    {
-        this.password = password;
-    }
-
-    public JcePasswordRecipient setPasswordConversionScheme(int schemeID)
-    {
-        this.schemeID = schemeID;
-
-        return this;
-    }
-
-    public JcePasswordRecipient setProvider(Provider provider)
-    {
-        this.helper = new EnvelopedDataHelper(new ProviderJcaJceExtHelper(provider));
-
-        return this;
-    }
-
-    public JcePasswordRecipient setProvider(String providerName)
-    {
-        this.helper = new EnvelopedDataHelper(new NamedJcaJceExtHelper(providerName));
-
-        return this;
-    }
-
-    protected Key extractSecretKey(AlgorithmIdentifier keyEncryptionAlgorithm, AlgorithmIdentifier contentEncryptionAlgorithm, byte[] derivedKey, byte[] encryptedContentEncryptionKey)
-        throws CMSException
-    {
-        Cipher keyEncryptionCipher = helper.createRFC3211Wrapper(keyEncryptionAlgorithm.getAlgorithm());
-
-        try
-        {
-            IvParameterSpec ivSpec = new IvParameterSpec(ASN1OctetString.getInstance(keyEncryptionAlgorithm.getParameters()).getOctets());
-
-            keyEncryptionCipher.init(Cipher.UNWRAP_MODE, new SecretKeySpec(derivedKey, keyEncryptionCipher.getAlgorithm()), ivSpec);
-
-            return keyEncryptionCipher.unwrap(encryptedContentEncryptionKey, contentEncryptionAlgorithm.getAlgorithm().getId(), Cipher.SECRET_KEY);
-        }
-        catch (GeneralSecurityException e)
-        {
-            throw new CMSException("cannot process content encryption key: " + e.getMessage(), e);
-        }
-    }
-
-    public byte[] calculateDerivedKey(byte[] encodedPassword, AlgorithmIdentifier derivationAlgorithm, int keySize)
-        throws CMSException
-    {
-        PBKDF2Params params = PBKDF2Params.getInstance(derivationAlgorithm.getParameters());
-
-        PKCS5S2ParametersGenerator gen = new PKCS5S2ParametersGenerator();
-
-        gen.init(encodedPassword, params.getSalt(), params.getIterationCount().intValue());
-
-        return ((KeyParameter)gen.generateDerivedParameters(keySize)).getKey();
-    }
-
-    public int getPasswordConversionScheme()
-    {
-        return schemeID;
-    }
-
-    public char[] getPassword()
-    {
-        return password;
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cms/jcajce/JcePasswordRecipientInfoGenerator.java b/bcpkix/src/main/java/org/bouncycastle/cms/jcajce/JcePasswordRecipientInfoGenerator.java
deleted file mode 100644
index fefe016..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cms/jcajce/JcePasswordRecipientInfoGenerator.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package org.bouncycastle.cms.jcajce;
-
-import java.security.GeneralSecurityException;
-import java.security.Key;
-import java.security.Provider;
-
-import javax.crypto.Cipher;
-import javax.crypto.spec.IvParameterSpec;
-import javax.crypto.spec.SecretKeySpec;
-
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.pkcs.PBKDF2Params;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.cms.CMSException;
-import org.bouncycastle.cms.PasswordRecipientInfoGenerator;
-import org.bouncycastle.crypto.generators.PKCS5S2ParametersGenerator;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.operator.GenericKey;
-
-public class JcePasswordRecipientInfoGenerator
-    extends PasswordRecipientInfoGenerator
-{
-    private EnvelopedDataHelper helper = new EnvelopedDataHelper(new DefaultJcaJceExtHelper());
-
-    public JcePasswordRecipientInfoGenerator(ASN1ObjectIdentifier kekAlgorithm, char[] password)
-    {
-        super(kekAlgorithm, password);
-    }
-
-    public JcePasswordRecipientInfoGenerator setProvider(Provider provider)
-    {
-        this.helper = new EnvelopedDataHelper(new ProviderJcaJceExtHelper(provider));
-
-        return this;
-    }
-
-    public JcePasswordRecipientInfoGenerator setProvider(String providerName)
-    {
-        this.helper = new EnvelopedDataHelper(new NamedJcaJceExtHelper(providerName));
-
-        return this;
-    }
-
-    protected byte[] calculateDerivedKey(byte[] encodedPassword, AlgorithmIdentifier derivationAlgorithm, int keySize)
-        throws CMSException
-    {
-        PBKDF2Params params = PBKDF2Params.getInstance(derivationAlgorithm.getParameters());
-
-        PKCS5S2ParametersGenerator gen = new PKCS5S2ParametersGenerator();
-
-        gen.init(encodedPassword, params.getSalt(), params.getIterationCount().intValue());
-
-        return ((KeyParameter)gen.generateDerivedParameters(keySize)).getKey();
-    }
-
-    public byte[] generateEncryptedBytes(AlgorithmIdentifier keyEncryptionAlgorithm, byte[] derivedKey, GenericKey contentEncryptionKey)
-        throws CMSException
-    {
-        Key contentEncryptionKeySpec = helper.getJceKey(contentEncryptionKey);
-        Cipher keyEncryptionCipher = helper.createRFC3211Wrapper(keyEncryptionAlgorithm.getAlgorithm());
-
-        try
-        {
-            IvParameterSpec ivSpec = new IvParameterSpec(ASN1OctetString.getInstance(keyEncryptionAlgorithm.getParameters()).getOctets());
-
-            keyEncryptionCipher.init(Cipher.WRAP_MODE, new SecretKeySpec(derivedKey, keyEncryptionCipher.getAlgorithm()), ivSpec);
-
-            return keyEncryptionCipher.wrap(contentEncryptionKeySpec);
-        }
-        catch (GeneralSecurityException e)
-        {
-            throw new CMSException("cannot process content encryption key: " + e.getMessage(), e);
-        }
-    }
-}
\ No newline at end of file
diff --git a/bcpkix/src/main/java/org/bouncycastle/cms/jcajce/NamedJcaJceExtHelper.java b/bcpkix/src/main/java/org/bouncycastle/cms/jcajce/NamedJcaJceExtHelper.java
deleted file mode 100644
index fba72dc..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cms/jcajce/NamedJcaJceExtHelper.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package org.bouncycastle.cms.jcajce;
-
-import java.security.PrivateKey;
-
-import javax.crypto.SecretKey;
-
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.jcajce.util.NamedJcaJceHelper;
-import org.bouncycastle.operator.SymmetricKeyUnwrapper;
-import org.bouncycastle.operator.jcajce.JceAsymmetricKeyUnwrapper;
-import org.bouncycastle.operator.jcajce.JceSymmetricKeyUnwrapper;
-
-class NamedJcaJceExtHelper
-    extends NamedJcaJceHelper
-    implements JcaJceExtHelper
-{
-    public NamedJcaJceExtHelper(String providerName)
-    {
-        super(providerName);
-    }
-
-    public JceAsymmetricKeyUnwrapper createAsymmetricUnwrapper(AlgorithmIdentifier keyEncryptionAlgorithm, PrivateKey keyEncryptionKey)
-    {
-        return new JceAsymmetricKeyUnwrapper(keyEncryptionAlgorithm, keyEncryptionKey).setProvider(providerName);
-    }
-
-    public SymmetricKeyUnwrapper createSymmetricUnwrapper(AlgorithmIdentifier keyEncryptionAlgorithm, SecretKey keyEncryptionKey)
-    {
-        return new JceSymmetricKeyUnwrapper(keyEncryptionAlgorithm, keyEncryptionKey).setProvider(providerName);
-    }
-}
\ No newline at end of file
diff --git a/bcpkix/src/main/java/org/bouncycastle/cms/jcajce/ProviderJcaJceExtHelper.java b/bcpkix/src/main/java/org/bouncycastle/cms/jcajce/ProviderJcaJceExtHelper.java
deleted file mode 100644
index f6991a8..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cms/jcajce/ProviderJcaJceExtHelper.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package org.bouncycastle.cms.jcajce;
-
-import java.security.PrivateKey;
-import java.security.Provider;
-
-import javax.crypto.SecretKey;
-
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.jcajce.util.ProviderJcaJceHelper;
-import org.bouncycastle.operator.SymmetricKeyUnwrapper;
-import org.bouncycastle.operator.jcajce.JceAsymmetricKeyUnwrapper;
-import org.bouncycastle.operator.jcajce.JceSymmetricKeyUnwrapper;
-
-class ProviderJcaJceExtHelper
-    extends ProviderJcaJceHelper
-    implements JcaJceExtHelper
-{
-    public ProviderJcaJceExtHelper(Provider provider)
-    {
-        super(provider);
-    }
-
-    public JceAsymmetricKeyUnwrapper createAsymmetricUnwrapper(AlgorithmIdentifier keyEncryptionAlgorithm, PrivateKey keyEncryptionKey)
-    {
-        return new JceAsymmetricKeyUnwrapper(keyEncryptionAlgorithm, keyEncryptionKey).setProvider(provider);
-    }
-
-    public SymmetricKeyUnwrapper createSymmetricUnwrapper(AlgorithmIdentifier keyEncryptionAlgorithm, SecretKey keyEncryptionKey)
-    {
-        return new JceSymmetricKeyUnwrapper(keyEncryptionAlgorithm, keyEncryptionKey).setProvider(provider);
-    }
-}
\ No newline at end of file
diff --git a/bcpkix/src/main/java/org/bouncycastle/cms/jcajce/ZlibCompressor.java b/bcpkix/src/main/java/org/bouncycastle/cms/jcajce/ZlibCompressor.java
deleted file mode 100644
index 53da722..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cms/jcajce/ZlibCompressor.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.bouncycastle.cms.jcajce;
-
-import java.io.OutputStream;
-import java.util.zip.DeflaterOutputStream;
-
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.operator.OutputCompressor;
-
-public class ZlibCompressor
-    implements OutputCompressor
-{
-    private static final String  ZLIB    = "1.2.840.113549.1.9.16.3.8";
-
-    public AlgorithmIdentifier getAlgorithmIdentifier()
-    {
-        return new AlgorithmIdentifier(new ASN1ObjectIdentifier(ZLIB));
-    }
-
-    public OutputStream getOutputStream(OutputStream comOut)
-    {
-        return new DeflaterOutputStream(comOut);
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cms/jcajce/ZlibExpanderProvider.java b/bcpkix/src/main/java/org/bouncycastle/cms/jcajce/ZlibExpanderProvider.java
deleted file mode 100644
index 15729a7..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cms/jcajce/ZlibExpanderProvider.java
+++ /dev/null
@@ -1,116 +0,0 @@
-package org.bouncycastle.cms.jcajce;
-
-import java.io.FilterInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.zip.InflaterInputStream;
-
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.operator.InputExpander;
-import org.bouncycastle.operator.InputExpanderProvider;
-import org.bouncycastle.util.io.StreamOverflowException;
-
-public class ZlibExpanderProvider
-    implements InputExpanderProvider
-{
-    private final long limit;
-
-    /**
-     * Base constructor. Create an expander which will not limit the size of any objects expanded in the stream.
-     */
-    public ZlibExpanderProvider()
-    {
-        this.limit = -1;
-    }
-
-    /**
-     * Create a provider which caps the number of expanded bytes that can be produced when the
-     * compressed stream is parsed.
-     *
-     * @param limit max number of bytes allowed in an expanded stream.
-     */
-    public ZlibExpanderProvider(long limit)
-    {
-        this.limit = limit;
-    }
-
-    public InputExpander get(final AlgorithmIdentifier algorithm)
-    {
-        return new InputExpander()
-        {
-            public AlgorithmIdentifier getAlgorithmIdentifier()
-            {
-                return algorithm;
-            }
-
-            public InputStream getInputStream(InputStream comIn)
-            {
-                InputStream s = new InflaterInputStream(comIn);                
-                if (limit >= 0)
-                {
-                    s = new LimitedInputStream(s, limit);
-                }
-                return s;
-            }
-        };
-    }
-
-    private static class LimitedInputStream
-        extends FilterInputStream
-    {
-        private long remaining;
-
-        public LimitedInputStream(InputStream input, long limit)
-        {
-            super(input);
-
-            this.remaining = limit;
-        }
-
-        public int read()
-            throws IOException
-        {
-            // Only a single 'extra' byte will ever be read
-            if (remaining >= 0)
-            {
-                int b = super.in.read();
-                if (b < 0 || --remaining >= 0)
-                {
-                    return b;
-                }
-            }
-
-            throw new StreamOverflowException("expanded byte limit exceeded");
-        }
-
-        public int read(byte[] buf, int off, int len)
-            throws IOException
-        {
-            if (len < 1)
-            {
-                // This will give correct exceptions/returns for strange lengths
-                return super.read(buf, off, len);
-            }
-
-            if (remaining < 1)
-            {
-                // Will either return EOF or throw exception
-                read();
-                return -1;
-            }
-
-            /*
-             * Limit the underlying request to 'remaining' bytes. This ensures the
-             * caller will see the full 'limit' bytes before getting an exception.
-             * Also, only one extra byte will ever be read.
-             */
-            int actualLen = (remaining > len ? len : (int)remaining);
-            int numRead = super.in.read(buf, off, actualLen);
-            if (numRead > 0)
-            {
-                remaining -= numRead;
-            }
-            return numRead;
-        }
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cms/package.html b/bcpkix/src/main/java/org/bouncycastle/cms/package.html
deleted file mode 100644
index 644e862..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cms/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body bgcolor="#ffffff">
-A package for processing RFC 3852 Cryptographic Message Syntax (CMS) objects - also referred to as PKCS#7 (formerly RFC 2630, 3369). 
-</body>
-</html>
diff --git a/bcpkix/src/main/java/org/bouncycastle/cms/test/AllTests.java b/bcpkix/src/main/java/org/bouncycastle/cms/test/AllTests.java
deleted file mode 100644
index 9cc2b0e..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cms/test/AllTests.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package org.bouncycastle.cms.test;
-
-import javax.crypto.Cipher;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-public class AllTests 
-{
-    public static void main (String[] args) 
-        throws Exception
-    {
-        junit.textui.TestRunner.run(suite());
-    }
-    
-    public static Test suite() 
-        throws Exception
-    {   
-        TestSuite suite = new TestSuite("CMS tests");
-
-        suite.addTest(NewCompressedDataTest.suite());
-        suite.addTest(NewSignedDataTest.suite());
-        suite.addTest(NewEnvelopedDataTest.suite());
-        suite.addTest(NewAuthenticatedDataTest.suite());
-        suite.addTest(NewAuthenticatedDataStreamTest.suite());
-        suite.addTest(NewCompressedDataStreamTest.suite());
-        suite.addTest(NewSignedDataStreamTest.suite());
-        suite.addTest(NewEnvelopedDataStreamTest.suite());
-
-        suite.addTest(MiscDataStreamTest.suite());
-        suite.addTest(Rfc4134Test.suite());
-        suite.addTest(ConverterTest.suite());
-
-        suite.addTest(BcEnvelopedDataTest.suite());
-        suite.addTest(BcSignedDataTest.suite());
-
-        try
-        {
-            Cipher.getInstance("RSA", "SunJCE");
-
-            suite.addTest(SunProviderTest.suite());
-            suite.addTest(NullProviderTest.suite());
-        }
-        catch (Exception e)
-        {
-            // ignore
-        }
-
-        return suite;
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cms/test/BcEnvelopedDataTest.java b/bcpkix/src/main/java/org/bouncycastle/cms/test/BcEnvelopedDataTest.java
deleted file mode 100644
index 366e9cb..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cms/test/BcEnvelopedDataTest.java
+++ /dev/null
@@ -1,969 +0,0 @@
-package org.bouncycastle.cms.test;
-
-import java.io.IOException;
-import java.security.GeneralSecurityException;
-import java.security.Key;
-import java.security.KeyFactory;
-import java.security.KeyPair;
-import java.security.NoSuchAlgorithmException;
-import java.security.NoSuchProviderException;
-import java.security.PrivateKey;
-import java.security.Security;
-import java.security.cert.CertificateEncodingException;
-import java.security.cert.X509Certificate;
-import java.security.spec.PKCS8EncodedKeySpec;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Hashtable;
-import java.util.Iterator;
-
-import javax.crypto.SecretKey;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.DEROctetString;
-import org.bouncycastle.asn1.DERSet;
-import org.bouncycastle.asn1.DERUTF8String;
-import org.bouncycastle.asn1.cms.Attribute;
-import org.bouncycastle.asn1.cms.AttributeTable;
-import org.bouncycastle.asn1.nist.NISTObjectIdentifiers;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
-import org.bouncycastle.cert.jcajce.JcaX509CertificateHolder;
-import org.bouncycastle.cms.CMSAlgorithm;
-import org.bouncycastle.cms.CMSEnvelopedData;
-import org.bouncycastle.cms.CMSEnvelopedDataGenerator;
-import org.bouncycastle.cms.CMSException;
-import org.bouncycastle.cms.CMSProcessableByteArray;
-import org.bouncycastle.cms.KeyTransRecipientInformation;
-import org.bouncycastle.cms.PasswordRecipient;
-import org.bouncycastle.cms.PasswordRecipientInformation;
-import org.bouncycastle.cms.RecipientId;
-import org.bouncycastle.cms.RecipientInformation;
-import org.bouncycastle.cms.RecipientInformationStore;
-import org.bouncycastle.cms.SimpleAttributeTableGenerator;
-import org.bouncycastle.cms.bc.BcCMSContentEncryptorBuilder;
-import org.bouncycastle.cms.bc.BcKEKEnvelopedRecipient;
-import org.bouncycastle.cms.bc.BcKEKRecipientInfoGenerator;
-import org.bouncycastle.cms.bc.BcPasswordEnvelopedRecipient;
-import org.bouncycastle.cms.bc.BcPasswordRecipientInfoGenerator;
-import org.bouncycastle.cms.bc.BcRSAKeyTransEnvelopedRecipient;
-import org.bouncycastle.cms.bc.BcRSAKeyTransRecipientInfoGenerator;
-import org.bouncycastle.cms.jcajce.JceKeyAgreeEnvelopedRecipient;
-import org.bouncycastle.cms.jcajce.JceKeyAgreeRecipientId;
-import org.bouncycastle.cms.jcajce.JceKeyAgreeRecipientInfoGenerator;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.crypto.util.PrivateKeyFactory;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.operator.OutputEncryptor;
-import org.bouncycastle.operator.bc.BcAESSymmetricKeyUnwrapper;
-import org.bouncycastle.operator.bc.BcAESSymmetricKeyWrapper;
-import org.bouncycastle.operator.bc.BcSymmetricKeyUnwrapper;
-import org.bouncycastle.operator.bc.BcSymmetricKeyWrapper;
-import org.bouncycastle.util.encoders.Base64;
-import org.bouncycastle.util.encoders.Hex;
-
-public class BcEnvelopedDataTest
-    extends TestCase
-{
-    private static final String BC = BouncyCastleProvider.PROVIDER_NAME;
-
-    private static String _signDN;
-    private static KeyPair _signKP;
-    private static X509Certificate _signCert;
-
-    private static String _origDN;
-    private static KeyPair _origKP;
-    private static X509Certificate _origCert;
-
-    private static String _reciDN;
-    private static String _reciDN2;
-    private static KeyPair _reciKP;
-    private static X509Certificate _reciCert;
-
-    private static KeyPair _origEcKP;
-    private static KeyPair _reciEcKP;
-    private static X509Certificate _reciEcCert;
-    private static KeyPair _reciEcKP2;
-    private static X509Certificate _reciEcCert2;
-
-    private static boolean         _initialised = false;
-
-    private byte[] oldKEK = Base64.decode(
-                          "MIAGCSqGSIb3DQEHA6CAMIACAQIxQaI/MD0CAQQwBwQFAQIDBAUwDQYJYIZIAWUDBAEFBQAEI"
-                        + "Fi2eHTPM4bQSjP4DUeDzJZLpfemW2gF1SPq7ZPHJi1mMIAGCSqGSIb3DQEHATAUBggqhkiG9w"
-                        + "0DBwQImtdGyUdGGt6ggAQYk9X9z01YFBkU7IlS3wmsKpm/zpZClTceAAAAAAAAAAAAAA==");
-
-    private byte[] ecKeyAgreeMsgAES256 = Base64.decode(
-           "MIAGCSqGSIb3DQEHA6CAMIACAQIxgcShgcECAQOgQ6FBMAsGByqGSM49AgEF"
-         + "AAMyAAPdXlSTpub+qqno9hUGkUDl+S3/ABhPziIB5yGU4678tgOgU5CiKG9Z"
-         + "kfnabIJ3nZYwGgYJK4EFEIZIPwACMA0GCWCGSAFlAwQBLQUAMFswWTAtMCgx"
-         + "EzARBgNVBAMTCkFkbWluLU1EU0UxETAPBgNVBAoTCDRCQ1QtMklEAgEBBCi/"
-         + "rJRLbFwEVW6PcLLmojjW9lI/xGD7CfZzXrqXFw8iHaf3hTRau1gYMIAGCSqG"
-         + "SIb3DQEHATAdBglghkgBZQMEASoEEMtCnKKPwccmyrbgeSIlA3qggAQQDLw8"
-         + "pNJR97bPpj6baG99bQQQwhEDsoj5Xg1oOxojHVcYzAAAAAAAAAAAAAA=");
-
-    private byte[] ecKeyAgreeMsgAES128 = Base64.decode(
-           "MIAGCSqGSIb3DQEHA6CAMIACAQIxgbShgbECAQOgQ6FBMAsGByqGSM49AgEF"
-         + "AAMyAAL01JLEgKvKh5rbxI/hOxs/9WEezMIsAbUaZM4l5tn3CzXAN505nr5d"
-         + "LhrcurMK+tAwGgYJK4EFEIZIPwACMA0GCWCGSAFlAwQBBQUAMEswSTAtMCgx"
-         + "EzARBgNVBAMTCkFkbWluLU1EU0UxETAPBgNVBAoTCDRCQ1QtMklEAgEBBBhi"
-         + "FLjc5g6aqDT3f8LomljOwl1WTrplUT8wgAYJKoZIhvcNAQcBMB0GCWCGSAFl"
-         + "AwQBAgQQzXjms16Y69S/rB0EbHqRMaCABBAFmc/QdVW6LTKdEy97kaZzBBBa"
-         + "fQuviUS03NycpojELx0bAAAAAAAAAAAAAA==");
-
-    private byte[] ecKeyAgreeMsgDESEDE = Base64.decode(
-           "MIAGCSqGSIb3DQEHA6CAMIACAQIxgcahgcMCAQOgQ6FBMAsGByqGSM49AgEF"
-         + "AAMyAALIici6Nx1WN5f0ThH2A8ht9ovm0thpC5JK54t73E1RDzCifePaoQo0"
-         + "xd6sUqoyGaYwHAYJK4EFEIZIPwACMA8GCyqGSIb3DQEJEAMGBQAwWzBZMC0w"
-         + "KDETMBEGA1UEAxMKQWRtaW4tTURTRTERMA8GA1UEChMINEJDVC0ySUQCAQEE"
-         + "KJuqZQ1NB1vXrKPOnb4TCpYOsdm6GscWdwAAZlm2EHMp444j0s55J9wwgAYJ"
-         + "KoZIhvcNAQcBMBQGCCqGSIb3DQMHBAjwnsDMsafCrKCABBjyPvqFOVMKxxut"
-         + "VfTx4fQlNGJN8S2ATRgECMcTQ/dsmeViAAAAAAAAAAAAAA==");
-
-   private byte[] ecMQVKeyAgreeMsgAES128 = Base64.decode(
-          "MIAGCSqGSIb3DQEHA6CAMIACAQIxgf2hgfoCAQOgQ6FBMAsGByqGSM49AgEF"
-        + "AAMyAAPDKU+0H58tsjpoYmYCInMr/FayvCCkupebgsnpaGEB7qS9vzcNVUj6"
-        + "mrnmiC2grpmhRwRFMEMwQTALBgcqhkjOPQIBBQADMgACZpD13z9c7DzRWx6S"
-        + "0xdbq3S+EJ7vWO+YcHVjTD8NcQDcZcWASW899l1PkL936zsuMBoGCSuBBRCG"
-        + "SD8AEDANBglghkgBZQMEAQUFADBLMEkwLTAoMRMwEQYDVQQDEwpBZG1pbi1N"
-        + "RFNFMREwDwYDVQQKEwg0QkNULTJJRAIBAQQYFq58L71nyMK/70w3nc6zkkRy"
-        + "RL7DHmpZMIAGCSqGSIb3DQEHATAdBglghkgBZQMEAQIEEDzRUpreBsZXWHBe"
-        + "onxOtSmggAQQ7csAZXwT1lHUqoazoy8bhAQQq+9Zjj8iGdOWgyebbfj67QAA"
-        + "AAAAAAAAAAA=");
-
-
-    private byte[] ecKeyAgreeKey = Base64.decode(
-        "MIG2AgEAMBAGByqGSM49AgEGBSuBBAAiBIGeMIGbAgEBBDC8vp7xVTbKSgYVU5Wc"
-      + "hGkWbzaj+yUFETIWP1Dt7+WSpq3ikSPdl7PpHPqnPVZfoIWhZANiAgSYHTgxf+Dd"
-      + "Tt84dUvuSKkFy3RhjxJmjwIscK6zbEUzKhcPQG2GHzXhWK5x1kov0I74XpGhVkya"
-      + "ElH5K6SaOXiXAzcyNGggTOk4+ZFnz5Xl0pBje3zKxPhYu0SnCw7Pcqw=");
-
-    private byte[] bobPrivRsaEncrypt = Base64.decode(
-       "MIIChQIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAKnhZ5g/OdVf"
-     + "8qCTQV6meYmFyDVdmpFb+x0B2hlwJhcPvaUi0DWFbXqYZhRBXM+3twg7CcmR"
-     + "uBlpN235ZR572akzJKN/O7uvRgGGNjQyywcDWVL8hYsxBLjMGAgUSOZPHPtd"
-     + "YMTgXB9T039T2GkB8QX4enDRvoPGXzjPHCyqaqfrAgMBAAECgYBnzUhMmg2P"
-     + "mMIbZf8ig5xt8KYGHbztpwOIlPIcaw+LNd4Ogngwy+e6alatd8brUXlweQqg"
-     + "9P5F4Kmy9Bnah5jWMIR05PxZbMHGd9ypkdB8MKCixQheIXFD/A0HPfD6bRSe"
-     + "TmPwF1h5HEuYHD09sBvf+iU7o8AsmAX2EAnYh9sDGQJBANDDIsbeopkYdo+N"
-     + "vKZ11mY/1I1FUox29XLE6/BGmvE+XKpVC5va3Wtt+Pw7PAhDk7Vb/s7q/WiE"
-     + "I2Kv8zHCueUCQQDQUfweIrdb7bWOAcjXq/JY1PeClPNTqBlFy2bKKBlf4hAr"
-     + "84/sajB0+E0R9KfEILVHIdxJAfkKICnwJAiEYH2PAkA0umTJSChXdNdVUN5q"
-     + "SO8bKlocSHseIVnDYDubl6nA7xhmqU5iUjiEzuUJiEiUacUgFJlaV/4jbOSn"
-     + "I3vQgLeFAkEAni+zN5r7CwZdV+EJBqRd2ZCWBgVfJAZAcpw6iIWchw+dYhKI"
-     + "FmioNRobQ+g4wJhprwMKSDIETukPj3d9NDAlBwJAVxhn1grStavCunrnVNqc"
-     + "BU+B1O8BiR4yPWnLMcRSyFRVJQA7HCp8JlDV6abXd8vPFfXuC9WN7rOvTKF8"
-     + "Y0ZB9qANMAsGA1UdDzEEAwIAEA==");
-
-    private byte[] rfc4134ex5_1 = Base64.decode(
-          "MIIBHgYJKoZIhvcNAQcDoIIBDzCCAQsCAQAxgcAwgb0CAQAwJjASMRAwDgYD"
-        + "VQQDEwdDYXJsUlNBAhBGNGvHgABWvBHTbi7NXXHQMA0GCSqGSIb3DQEBAQUA"
-        + "BIGAC3EN5nGIiJi2lsGPcP2iJ97a4e8kbKQz36zg6Z2i0yx6zYC4mZ7mX7FB"
-        + "s3IWg+f6KgCLx3M1eCbWx8+MDFbbpXadCDgO8/nUkUNYeNxJtuzubGgzoyEd"
-        + "8Ch4H/dd9gdzTd+taTEgS0ipdSJuNnkVY4/M652jKKHRLFf02hosdR8wQwYJ"
-        + "KoZIhvcNAQcBMBQGCCqGSIb3DQMHBAgtaMXpRwZRNYAgDsiSf8Z9P43LrY4O"
-        + "xUk660cu1lXeCSFOSOpOJ7FuVyU=");
-
-    private byte[] rfc4134ex5_2 = Base64.decode(
-            "MIIBZQYJKoZIhvcNAQcDoIIBVjCCAVICAQIxggEAMIG9AgEAMCYwEjEQMA4G"
-         + "A1UEAxMHQ2FybFJTQQIQRjRrx4AAVrwR024uzV1x0DANBgkqhkiG9w0BAQEF"
-         + "AASBgJQmQojGi7Z4IP+CVypBmNFoCDoEp87khtgyff2N4SmqD3RxPx+8hbLQ"
-         + "t9i3YcMwcap+aiOkyqjMalT03VUC0XBOGv+HYI3HBZm/aFzxoq+YOXAWs5xl"
-         + "GerZwTOc9j6AYlK4qXvnztR5SQ8TBjlzytm4V7zg+TGrnGVNQBNw47Ewoj4C"
-         + "AQQwDQQLTWFpbExpc3RSQzIwEAYLKoZIhvcNAQkQAwcCAToEGHcUr5MSJ/g9"
-         + "HnJVHsQ6X56VcwYb+OfojTBJBgkqhkiG9w0BBwEwGgYIKoZIhvcNAwIwDgIC"
-         + "AKAECJwE0hkuKlWhgCBeKNXhojuej3org9Lt7n+wWxOhnky5V50vSpoYRfRR"
-         + "yw==");
-
-    public BcEnvelopedDataTest()
-    {
-    }
-
-    private static void init()
-        throws Exception
-    {
-        if (!_initialised)
-        {
-            _initialised = true;
-
-            if (Security.getProvider(BC) == null)
-            {
-                Security.addProvider(new BouncyCastleProvider());
-            }
-
-            _signDN   = "O=Bouncy Castle, C=AU";
-            _signKP   = CMSTestUtil.makeKeyPair();
-            _signCert = CMSTestUtil.makeCertificate(_signKP, _signDN, _signKP, _signDN);
-
-            _origDN   = "CN=Bob, OU=Sales, O=Bouncy Castle, C=AU";
-            _origKP   = CMSTestUtil.makeKeyPair();
-            _origCert = CMSTestUtil.makeCertificate(_origKP, _origDN, _signKP, _signDN);
-
-            _reciDN   = "CN=Doug, OU=Sales, O=Bouncy Castle, C=AU";
-            _reciDN2  = "CN=Fred, OU=Sales, O=Bouncy Castle, C=AU";
-            _reciKP   = CMSTestUtil.makeKeyPair();
-            _reciCert = CMSTestUtil.makeCertificate(_reciKP, _reciDN, _signKP, _signDN);
-
-            _origEcKP = CMSTestUtil.makeEcDsaKeyPair();
-            _reciEcKP = CMSTestUtil.makeEcDsaKeyPair();
-            _reciEcCert = CMSTestUtil.makeCertificate(_reciEcKP, _reciDN, _signKP, _signDN);
-            _reciEcKP2 = CMSTestUtil.makeEcDsaKeyPair();
-            _reciEcCert2 = CMSTestUtil.makeCertificate(_reciEcKP2, _reciDN2, _signKP, _signDN);
-        }
-    }
-
-    public static void main(
-        String args[])
-        throws Exception
-    {
-        junit.textui.TestRunner.run(BcEnvelopedDataTest.suite());
-    }
-
-    public static Test suite()
-        throws Exception
-    {
-        init();
-
-        return new CMSTestSetup(new TestSuite(BcEnvelopedDataTest.class));
-    }
-
-    public void testUnprotectedAttributes()
-        throws Exception
-    {
-        byte[]          data     = "WallaWallaWashington".getBytes();
-
-        CMSEnvelopedDataGenerator edGen = new CMSEnvelopedDataGenerator();
-
-        edGen.addRecipientInfoGenerator(new BcRSAKeyTransRecipientInfoGenerator(new JcaX509CertificateHolder(_reciCert)));
-
-        Hashtable attrs = new Hashtable();
-
-        attrs.put(PKCSObjectIdentifiers.id_aa_contentHint, new Attribute(PKCSObjectIdentifiers.id_aa_contentHint, new DERSet(new DERUTF8String("Hint"))));
-        attrs.put(PKCSObjectIdentifiers.id_aa_receiptRequest, new Attribute(PKCSObjectIdentifiers.id_aa_receiptRequest, new DERSet(new DERUTF8String("Request"))));
-
-        AttributeTable attrTable = new AttributeTable(attrs);
-
-        edGen.setUnprotectedAttributeGenerator(new SimpleAttributeTableGenerator(attrTable));
-
-        CMSEnvelopedData ed = edGen.generate(
-            new CMSProcessableByteArray(data),
-            new BcCMSContentEncryptorBuilder(CMSAlgorithm.DES_EDE3_CBC).build());
-
-        RecipientInformationStore  recipients = ed.getRecipientInfos();
-
-        assertEquals(ed.getEncryptionAlgOID(), CMSAlgorithm.DES_EDE3_CBC.getId());
-
-        attrTable = ed.getUnprotectedAttributes();
-
-        assertEquals(attrs.size(), 2);
-
-        assertEquals(new DERUTF8String("Hint"), attrTable.get(PKCSObjectIdentifiers.id_aa_contentHint).getAttrValues().getObjectAt(0));
-        assertEquals(new DERUTF8String("Request"), attrTable.get(PKCSObjectIdentifiers.id_aa_receiptRequest).getAttrValues().getObjectAt(0));
-                
-        Collection c = recipients.getRecipients();
-
-        assertEquals(1, c.size());
-
-        Iterator it = c.iterator();
-
-        while (it.hasNext())
-        {
-            RecipientInformation   recipient = (RecipientInformation)it.next();
-
-            assertEquals(recipient.getKeyEncryptionAlgOID(), PKCSObjectIdentifiers.rsaEncryption.getId());
-
-            byte[] recData = recipient.getContent(new BcRSAKeyTransEnvelopedRecipient(PrivateKeyFactory.createKey(_reciKP.getPrivate().getEncoded())));
-
-            assertEquals(true, Arrays.equals(data, recData));
-        }
-    }
-
-    public void testKeyTrans()
-        throws Exception
-    {
-        byte[]          data     = "WallaWallaWashington".getBytes();
-
-        CMSEnvelopedDataGenerator edGen = new CMSEnvelopedDataGenerator();
-
-        edGen.addRecipientInfoGenerator(new BcRSAKeyTransRecipientInfoGenerator(new JcaX509CertificateHolder(_reciCert)));
-
-        CMSEnvelopedData ed = edGen.generate(
-                                new CMSProcessableByteArray(data),
-                                new BcCMSContentEncryptorBuilder(CMSAlgorithm.DES_EDE3_CBC).build());
-
-        RecipientInformationStore  recipients = ed.getRecipientInfos();
-
-
-        assertEquals(ed.getEncryptionAlgOID(), CMSAlgorithm.DES_EDE3_CBC.getId());
-
-        Collection c = recipients.getRecipients();
-
-        assertEquals(1, c.size());
-
-        Iterator it = c.iterator();
-
-        while (it.hasNext())
-        {
-            RecipientInformation   recipient = (RecipientInformation)it.next();
-
-            assertEquals(recipient.getKeyEncryptionAlgOID(), PKCSObjectIdentifiers.rsaEncryption.getId());
-
-            byte[] recData = recipient.getContent(new BcRSAKeyTransEnvelopedRecipient(PrivateKeyFactory.createKey(PrivateKeyInfo.getInstance(_reciKP.getPrivate().getEncoded()))));
-
-            assertEquals(true, Arrays.equals(data, recData));
-        }
-    }
-
-    public void testKeyTransRC4()
-        throws Exception
-    {
-        byte[]          data     = "WallaWallaBouncyCastle".getBytes();
-
-        CMSEnvelopedDataGenerator edGen = new CMSEnvelopedDataGenerator();
-
-        edGen.addRecipientInfoGenerator(new BcRSAKeyTransRecipientInfoGenerator(new JcaX509CertificateHolder(_reciCert)));
-
-        CMSEnvelopedData ed = edGen.generate(
-                                new CMSProcessableByteArray(data),
-                                new BcCMSContentEncryptorBuilder(new ASN1ObjectIdentifier("1.2.840.113549.3.4")).build());
-
-        RecipientInformationStore  recipients = ed.getRecipientInfos();
-
-        assertEquals(ed.getEncryptionAlgOID(), new ASN1ObjectIdentifier("1.2.840.113549.3.4").getId());
-
-        Collection c = recipients.getRecipients();
-
-        assertEquals(1, c.size());
-
-        Iterator it = c.iterator();
-
-        while (it.hasNext())
-        {
-            RecipientInformation   recipient = (RecipientInformation)it.next();
-
-            byte[] recData = recipient.getContent(new BcRSAKeyTransEnvelopedRecipient(PrivateKeyFactory.createKey(PrivateKeyInfo.getInstance(_reciKP.getPrivate().getEncoded()))));
-
-            assertEquals(true, Arrays.equals(data, recData));
-        }
-    }
-
-    public void testKeyTrans128RC4()
-        throws Exception
-    {
-        byte[]          data     = "WallaWallaBouncyCastle".getBytes();
-
-        CMSEnvelopedDataGenerator edGen = new CMSEnvelopedDataGenerator();
-
-        edGen.addRecipientInfoGenerator(new BcRSAKeyTransRecipientInfoGenerator(new JcaX509CertificateHolder(_reciCert)));
-
-        CMSEnvelopedData ed = edGen.generate(
-                                new CMSProcessableByteArray(data),
-                                new BcCMSContentEncryptorBuilder(new ASN1ObjectIdentifier("1.2.840.113549.3.4"), 128).build());
-
-        RecipientInformationStore  recipients = ed.getRecipientInfos();
-
-        assertEquals(ed.getEncryptionAlgOID(), "1.2.840.113549.3.4");
-
-        Collection c = recipients.getRecipients();
-        Iterator it = c.iterator();
-
-        if (it.hasNext())
-        {
-            RecipientInformation   recipient = (RecipientInformation)it.next();
-
-            byte[] recData = recipient.getContent(new BcRSAKeyTransEnvelopedRecipient(PrivateKeyFactory.createKey(PrivateKeyInfo.getInstance(_reciKP.getPrivate().getEncoded()))));
-
-            assertEquals(true, Arrays.equals(data, recData));
-        }
-        else
-        {
-            fail("no recipient found");
-        }
-    }
-
-    public void testKeyTransLight128RC4()
-        throws Exception
-    {
-        byte[]          data     = "WallaWallaBouncyCastle".getBytes();
-
-        CMSEnvelopedDataGenerator edGen = new CMSEnvelopedDataGenerator();
-
-        edGen.addRecipientInfoGenerator(new BcRSAKeyTransRecipientInfoGenerator(new JcaX509CertificateHolder(_reciCert)));
-
-        CMSEnvelopedData ed = edGen.generate(
-                                new CMSProcessableByteArray(data),
-                                new BcCMSContentEncryptorBuilder(new ASN1ObjectIdentifier("1.2.840.113549.3.4"), 128).build());
-
-        RecipientInformationStore  recipients = ed.getRecipientInfos();
-
-        assertEquals(ed.getEncryptionAlgOID(), "1.2.840.113549.3.4");
-
-        Collection c = recipients.getRecipients();
-        Iterator it = c.iterator();
-
-        if (it.hasNext())
-        {
-            RecipientInformation   recipient = (RecipientInformation)it.next();
-
-            byte[] recData = recipient.getContent(new BcRSAKeyTransEnvelopedRecipient(PrivateKeyFactory.createKey(PrivateKeyInfo.getInstance(_reciKP.getPrivate().getEncoded()))));
-
-            assertEquals(true, Arrays.equals(data, recData));
-        }
-        else
-        {
-            fail("no recipient found");
-        }
-    }
-
-    public void testKeyTransODES()
-        throws Exception
-    {
-        byte[]          data     = "WallaWallaBouncyCastle".getBytes();
-
-        CMSEnvelopedDataGenerator edGen = new CMSEnvelopedDataGenerator();
-
-        edGen.addRecipientInfoGenerator(new BcRSAKeyTransRecipientInfoGenerator(new JcaX509CertificateHolder(_reciCert)));
-
-        CMSEnvelopedData ed = edGen.generate(
-            new CMSProcessableByteArray(data),
-            new BcCMSContentEncryptorBuilder(new ASN1ObjectIdentifier("1.3.14.3.2.7")).build());
-
-        RecipientInformationStore  recipients = ed.getRecipientInfos();
-
-        assertEquals(ed.getEncryptionAlgOID(), "1.3.14.3.2.7");
-
-        Collection c = recipients.getRecipients();
-        Iterator it = c.iterator();
-
-        if (it.hasNext())
-        {
-            RecipientInformation   recipient = (RecipientInformation)it.next();
-
-            byte[] recData = recipient.getContent(new BcRSAKeyTransEnvelopedRecipient(PrivateKeyFactory.createKey(PrivateKeyInfo.getInstance(_reciKP.getPrivate().getEncoded()))));
-
-            assertEquals(true, Arrays.equals(data, recData));
-        }
-        else
-        {
-            fail("no recipient found");
-        }
-    }
-
-    public void testKeyTransSmallAES()
-        throws Exception
-    {
-        byte[]          data     = new byte[] { 0, 1, 2, 3 };
-
-        CMSEnvelopedDataGenerator edGen = new CMSEnvelopedDataGenerator();
-
-        edGen.addRecipientInfoGenerator(new BcRSAKeyTransRecipientInfoGenerator(new JcaX509CertificateHolder(_reciCert)));
-
-        CMSEnvelopedData ed = edGen.generate(
-                              new CMSProcessableByteArray(data),
-                              new BcCMSContentEncryptorBuilder(CMSAlgorithm.AES128_CBC).build());
-
-        RecipientInformationStore  recipients = ed.getRecipientInfos();
-
-        assertEquals(ed.getEncryptionAlgOID(),
-                                   CMSAlgorithm.AES128_CBC.getId());
-
-        Collection c = recipients.getRecipients();
-        Iterator it = c.iterator();
-
-        if (it.hasNext())
-        {
-            RecipientInformation   recipient = (RecipientInformation)it.next();
-
-            byte[] recData = recipient.getContent(new BcRSAKeyTransEnvelopedRecipient(PrivateKeyFactory.createKey(PrivateKeyInfo.getInstance(_reciKP.getPrivate().getEncoded()))));
-            assertEquals(true, Arrays.equals(data, recData));
-        }
-        else
-        {
-            fail("no recipient found");
-        }
-    }
-
-    public void testKeyTransAES128()
-        throws Exception
-    {
-        tryKeyTrans(CMSAlgorithm.AES128_CBC, NISTObjectIdentifiers.id_aes128_CBC, 16, DEROctetString.class);
-    }
-
-    public void testKeyTransAES192()
-        throws Exception
-    {
-        tryKeyTrans(CMSAlgorithm.AES192_CBC, NISTObjectIdentifiers.id_aes192_CBC, 24, DEROctetString.class);
-    }
-
-    public void testKeyTransAES256()
-        throws Exception
-    {
-        tryKeyTrans(CMSAlgorithm.AES256_CBC, NISTObjectIdentifiers.id_aes256_CBC, 32, DEROctetString.class);
-    }
-
-    private void tryKeyTrans(ASN1ObjectIdentifier generatorOID, ASN1ObjectIdentifier checkOID, int keySize, Class asn1Params)
-        throws Exception
-    {
-        byte[]          data     = "WallaWallaWashington".getBytes();
-
-        CMSEnvelopedDataGenerator edGen = new CMSEnvelopedDataGenerator();
-
-        edGen.addRecipientInfoGenerator(new BcRSAKeyTransRecipientInfoGenerator(new JcaX509CertificateHolder(_reciCert)));
-
-        OutputEncryptor encryptor = new BcCMSContentEncryptorBuilder(generatorOID).build();
-        CMSEnvelopedData ed = edGen.generate(
-                                new CMSProcessableByteArray(data), encryptor);
-
-        RecipientInformationStore  recipients = ed.getRecipientInfos();
-
-        assertEquals(checkOID.getId(), ed.getEncryptionAlgOID());
-        assertEquals(keySize, ((byte[])encryptor.getKey().getRepresentation()).length);
-
-        if (asn1Params != null)
-        {
-            assertTrue(asn1Params.isAssignableFrom(ed.getContentEncryptionAlgorithm().getParameters().toASN1Primitive().getClass()));
-        }
-
-        Collection c = recipients.getRecipients();
-
-        assertEquals(1, c.size());
-
-        Iterator it = c.iterator();
-
-        if (!it.hasNext())
-        {
-            fail("no recipients found");
-        }
-
-        while (it.hasNext())
-        {
-            RecipientInformation   recipient = (RecipientInformation)it.next();
-
-            assertEquals(recipient.getKeyEncryptionAlgOID(), PKCSObjectIdentifiers.rsaEncryption.getId());
-
-            byte[] recData = recipient.getContent(new BcRSAKeyTransEnvelopedRecipient(PrivateKeyFactory.createKey(PrivateKeyInfo.getInstance(_reciKP.getPrivate().getEncoded()))));
-
-            assertEquals(true, Arrays.equals(data, recData));
-        }
-    }
-
-    public void testAES128KEK()
-        throws Exception
-    {
-        SecretKey key = CMSTestUtil.makeAESKey(128);
-
-        tryKekAlgorithm(new BcAESSymmetricKeyWrapper(new KeyParameter(key.getEncoded())), new BcAESSymmetricKeyUnwrapper(new KeyParameter(key.getEncoded())), NISTObjectIdentifiers.id_aes128_wrap);
-    }
-
-    public void testAES192KEK()
-        throws Exception
-    {
-        SecretKey key = CMSTestUtil.makeAESKey(192);
-
-        tryKekAlgorithm(new BcAESSymmetricKeyWrapper(new KeyParameter(key.getEncoded())), new BcAESSymmetricKeyUnwrapper(new KeyParameter(key.getEncoded())), NISTObjectIdentifiers.id_aes192_wrap);
-    }
-
-    public void testAES256KEK()
-        throws Exception
-    {
-        SecretKey key = CMSTestUtil.makeAESKey(256);
-
-        tryKekAlgorithm(new BcAESSymmetricKeyWrapper(new KeyParameter(key.getEncoded())), new BcAESSymmetricKeyUnwrapper(new KeyParameter(key.getEncoded())), NISTObjectIdentifiers.id_aes256_wrap);
-    }
-
-    private void tryKekAlgorithm(BcSymmetricKeyWrapper kekWrapper, BcSymmetricKeyUnwrapper kekUnwrapper, ASN1ObjectIdentifier algOid)
-        throws NoSuchAlgorithmException, NoSuchProviderException, CMSException
-    {
-        byte[]    data = "WallaWallaWashington".getBytes();
-        CMSEnvelopedDataGenerator edGen = new CMSEnvelopedDataGenerator();
-
-        byte[]  kekId = new byte[] { 1, 2, 3, 4, 5 };
-
-        edGen.addRecipientInfoGenerator(new BcKEKRecipientInfoGenerator(kekId, kekWrapper));
-
-        CMSEnvelopedData ed = edGen.generate(
-                                new CMSProcessableByteArray(data),
-                                new BcCMSContentEncryptorBuilder(CMSAlgorithm.DES_EDE3_CBC).build());
-
-        RecipientInformationStore recipients = ed.getRecipientInfos();
-
-        Collection c = recipients.getRecipients();
-        Iterator it = c.iterator();
-
-        assertEquals(ed.getEncryptionAlgOID(), CMSAlgorithm.DES_EDE3_CBC.getId());
-
-        if (it.hasNext())
-        {
-            RecipientInformation recipient = (RecipientInformation)it.next();
-
-            assertEquals(algOid.getId(), recipient.getKeyEncryptionAlgOID());
-
-            byte[] recData = recipient.getContent(new BcKEKEnvelopedRecipient(kekUnwrapper));
-
-            assertTrue(Arrays.equals(data, recData));
-        }
-        else
-        {
-            fail("no recipient found");
-        }
-    }
-
-    public void testECKeyAgree()
-        throws Exception
-    {
-        byte[] data = Hex.decode("504b492d4320434d5320456e76656c6f706564446174612053616d706c65");
-
-        CMSEnvelopedDataGenerator edGen = new CMSEnvelopedDataGenerator();
-
-        edGen.addRecipientInfoGenerator(new JceKeyAgreeRecipientInfoGenerator(CMSAlgorithm.ECDH_SHA1KDF,
-            _origEcKP.getPrivate(), _origEcKP.getPublic(),
-             CMSAlgorithm.AES128_WRAP).addRecipient(_reciEcCert).setProvider(BC));
-
-        CMSEnvelopedData ed = edGen.generate(
-            new CMSProcessableByteArray(data),
-            new BcCMSContentEncryptorBuilder(CMSAlgorithm.AES128_CBC).build());
-
-        assertEquals(ed.getEncryptionAlgOID(), CMSAlgorithm.AES128_CBC.getId());
-
-        RecipientInformationStore recipients = ed.getRecipientInfos();
-
-        confirmDataReceived(recipients, data, _reciEcCert, _reciEcKP.getPrivate(), BC);
-        confirmNumberRecipients(recipients, 1);
-    }
-
-    public void testECMQVKeyAgree()
-        throws Exception
-    {
-        byte[] data = Hex.decode("504b492d4320434d5320456e76656c6f706564446174612053616d706c65");
-
-        CMSEnvelopedDataGenerator edGen = new CMSEnvelopedDataGenerator();
-
-        edGen.addRecipientInfoGenerator(new JceKeyAgreeRecipientInfoGenerator(CMSAlgorithm.ECMQV_SHA1KDF,
-            _origEcKP.getPrivate(), _origEcKP.getPublic(),
-            CMSAlgorithm.AES128_WRAP).addRecipient(_reciEcCert).setProvider(BC));
-
-        CMSEnvelopedData ed = edGen.generate(
-            new CMSProcessableByteArray(data),
-            new BcCMSContentEncryptorBuilder(CMSAlgorithm.AES128_CBC).build());
-
-        assertEquals(ed.getEncryptionAlgOID(), CMSAlgorithm.AES128_CBC.getId());
-
-        RecipientInformationStore recipients = ed.getRecipientInfos();
-
-        confirmDataReceived(recipients, data, _reciEcCert, _reciEcKP.getPrivate(), BC);
-        confirmNumberRecipients(recipients, 1);
-    }
-
-    public void testECMQVKeyAgreeMultiple()
-        throws Exception
-    {
-        byte[] data = Hex.decode("504b492d4320434d5320456e76656c6f706564446174612053616d706c65");
-
-        CMSEnvelopedDataGenerator edGen = new CMSEnvelopedDataGenerator();
-
-        JceKeyAgreeRecipientInfoGenerator recipientGenerator = new JceKeyAgreeRecipientInfoGenerator(CMSAlgorithm.ECMQV_SHA1KDF,
-            _origEcKP.getPrivate(), _origEcKP.getPublic(), CMSAlgorithm.AES128_WRAP).setProvider(BC);
-
-        recipientGenerator.addRecipient(_reciEcCert);
-        recipientGenerator.addRecipient(_reciEcCert2);
-
-        edGen.addRecipientInfoGenerator(recipientGenerator);
-
-        CMSEnvelopedData ed = edGen.generate(
-            new CMSProcessableByteArray(data),
-            new BcCMSContentEncryptorBuilder(CMSAlgorithm.AES128_CBC).build());
-
-        assertEquals(ed.getEncryptionAlgOID(), CMSAlgorithm.AES128_CBC.getId());
-
-        RecipientInformationStore recipients = ed.getRecipientInfos();
-
-        confirmDataReceived(recipients, data, _reciEcCert, _reciEcKP.getPrivate(), BC);
-        confirmDataReceived(recipients, data, _reciEcCert2, _reciEcKP2.getPrivate(), BC);
-        confirmNumberRecipients(recipients, 2);
-    }
-
-    private static void confirmDataReceived(RecipientInformationStore recipients,
-        byte[] expectedData, X509Certificate reciCert, PrivateKey reciPrivKey, String provider)
-        throws CMSException, NoSuchProviderException, CertificateEncodingException, IOException
-    {
-        RecipientId rid = new JceKeyAgreeRecipientId(reciCert);
-
-        RecipientInformation recipient = recipients.get(rid);
-        assertNotNull(recipient);
-
-        byte[] actualData = recipient.getContent(new JceKeyAgreeEnvelopedRecipient(reciPrivKey).setProvider(provider));
-        assertEquals(true, Arrays.equals(expectedData, actualData));
-    }
-
-    private static void confirmNumberRecipients(RecipientInformationStore recipients, int count)
-    {
-        assertEquals(count, recipients.getRecipients().size());
-    }
-
-    public void testECKeyAgreeVectors()
-        throws Exception
-    {
-        PKCS8EncodedKeySpec privSpec = new PKCS8EncodedKeySpec(ecKeyAgreeKey);
-        KeyFactory fact = KeyFactory.getInstance("ECDH", BC);
-        PrivateKey privKey = fact.generatePrivate(privSpec);
-
-        verifyECKeyAgreeVectors(privKey, "2.16.840.1.101.3.4.1.42", ecKeyAgreeMsgAES256);
-        verifyECKeyAgreeVectors(privKey, "2.16.840.1.101.3.4.1.2", ecKeyAgreeMsgAES128);
-        verifyECKeyAgreeVectors(privKey, "1.2.840.113549.3.7", ecKeyAgreeMsgDESEDE);
-    }
-
-    public void testECMQVKeyAgreeVectors()
-        throws Exception
-    {
-        PKCS8EncodedKeySpec privSpec = new PKCS8EncodedKeySpec(ecKeyAgreeKey);
-        KeyFactory fact = KeyFactory.getInstance("ECDH", BC);
-        PrivateKey privKey = fact.generatePrivate(privSpec);
-
-        verifyECMQVKeyAgreeVectors(privKey, "2.16.840.1.101.3.4.1.2", ecMQVKeyAgreeMsgAES128);
-    }
-
-    public void testPasswordAES256()
-        throws Exception
-    {
-        passwordTest(CMSAlgorithm.AES256_CBC);
-        passwordUTF8Test(CMSAlgorithm.AES256_CBC);
-    }
-
-    public void testPasswordDESEDE()
-        throws Exception
-    {
-        passwordTest(CMSAlgorithm.DES_EDE3_CBC);
-        passwordUTF8Test(CMSAlgorithm.DES_EDE3_CBC);
-    }
-
-    public void testRFC4134ex5_1()
-        throws Exception
-    {
-        byte[] data = Hex.decode("5468697320697320736f6d652073616d706c6520636f6e74656e742e");
-
-        KeyFactory kFact = KeyFactory.getInstance("RSA", BC);
-        Key key = kFact.generatePrivate(new PKCS8EncodedKeySpec(bobPrivRsaEncrypt));
-
-        CMSEnvelopedData ed = new CMSEnvelopedData(rfc4134ex5_1);
-
-        RecipientInformationStore  recipients = ed.getRecipientInfos();
-
-        assertEquals("1.2.840.113549.3.7", ed.getEncryptionAlgOID());
-
-        Collection c = recipients.getRecipients();
-        Iterator it = c.iterator();
-
-        if (it.hasNext())
-        {
-            RecipientInformation   recipient = (RecipientInformation)it.next();
-
-            byte[] recData = recipient.getContent(new BcRSAKeyTransEnvelopedRecipient(PrivateKeyFactory.createKey(PrivateKeyInfo.getInstance(key.getEncoded()))));
-
-            assertEquals(true, Arrays.equals(data, recData));
-        }
-        else
-        {
-            fail("no recipient found");
-        }
-    }
-
-    public void testRFC4134ex5_2()
-        throws Exception
-    {
-        byte[] data = Hex.decode("5468697320697320736f6d652073616d706c6520636f6e74656e742e");
-
-        KeyFactory kFact = KeyFactory.getInstance("RSA", BC);
-        PrivateKey key = kFact.generatePrivate(new PKCS8EncodedKeySpec(bobPrivRsaEncrypt));
-
-        CMSEnvelopedData ed = new CMSEnvelopedData(rfc4134ex5_2);
-
-        RecipientInformationStore  recipients = ed.getRecipientInfos();
-
-        assertEquals("1.2.840.113549.3.2", ed.getEncryptionAlgOID());
-
-        Collection c = recipients.getRecipients();
-        Iterator it = c.iterator();
-
-        if (it.hasNext())
-        {
-            while (it.hasNext())
-            {
-                RecipientInformation   recipient = (RecipientInformation)it.next();
-                byte[] recData;
-
-                if (recipient instanceof KeyTransRecipientInformation)
-                {
-                    recData = recipient.getContent(new BcRSAKeyTransEnvelopedRecipient(PrivateKeyFactory.createKey(PrivateKeyInfo.getInstance(key.getEncoded()))));
-
-                    assertEquals(true, Arrays.equals(data, recData));
-                }
-            }
-        }
-        else
-        {
-            fail("no recipient found");
-        }
-    }
-
-    public void testOriginatorInfo()
-        throws Exception
-    {
-        CMSEnvelopedData env = new CMSEnvelopedData(CMSSampleMessages.originatorMessage);
-
-        RecipientInformationStore  recipients = env.getRecipientInfos();
-
-        assertEquals(CMSAlgorithm.DES_EDE3_CBC.getId(), env.getEncryptionAlgOID());
-    }
-
-    private void passwordTest(ASN1ObjectIdentifier algorithm)
-        throws Exception
-    {
-        byte[] data = Hex.decode("504b492d4320434d5320456e76656c6f706564446174612053616d706c65");
-
-        CMSEnvelopedDataGenerator edGen = new CMSEnvelopedDataGenerator();
-
-        edGen.addRecipientInfoGenerator(new BcPasswordRecipientInfoGenerator(algorithm, "password".toCharArray()).setPasswordConversionScheme(PasswordRecipient.PKCS5_SCHEME2).setSaltAndIterationCount(new byte[20], 5));
-
-        CMSEnvelopedData ed = edGen.generate(
-                              new CMSProcessableByteArray(data),
-                              new BcCMSContentEncryptorBuilder(CMSAlgorithm.AES128_CBC).build());
-
-        RecipientInformationStore  recipients = ed.getRecipientInfos();
-
-        assertEquals(ed.getEncryptionAlgOID(),
-                                   CMSAlgorithm.AES128_CBC.getId());
-
-        Collection c = recipients.getRecipients();
-        Iterator it = c.iterator();
-
-        if (it.hasNext())
-        {
-            PasswordRecipientInformation recipient = (PasswordRecipientInformation)it.next();
-
-            byte[] recData = recipient.getContent(new BcPasswordEnvelopedRecipient("password".toCharArray()).setPasswordConversionScheme(PasswordRecipient.PKCS5_SCHEME2));
-
-            assertEquals(true, Arrays.equals(data, recData));
-        }
-        else
-        {
-            fail("no recipient found");
-        }
-
-        //
-        // try algorithm parameters constructor
-        //
-        it = c.iterator();
-
-        RecipientInformation   recipient = (RecipientInformation)it.next();
-
-        byte[] recData = recipient.getContent(new BcPasswordEnvelopedRecipient("password".toCharArray()).setPasswordConversionScheme(PasswordRecipient.PKCS5_SCHEME2));
-        assertEquals(true, Arrays.equals(data, recData));
-    }
-
-    private void passwordUTF8Test(ASN1ObjectIdentifier algorithm)
-        throws Exception
-    {
-        byte[] data = Hex.decode("504b492d4320434d5320456e76656c6f706564446174612053616d706c65");
-
-        CMSEnvelopedDataGenerator edGen = new CMSEnvelopedDataGenerator();
-
-        edGen.addRecipientInfoGenerator(new BcPasswordRecipientInfoGenerator(algorithm, "abc\u5639\u563b".toCharArray()).setSaltAndIterationCount(new byte[20], 5));
-
-        CMSEnvelopedData ed = edGen.generate(
-                              new CMSProcessableByteArray(data),
-                              new BcCMSContentEncryptorBuilder(CMSAlgorithm.AES128_CBC).build());
-
-        RecipientInformationStore  recipients = ed.getRecipientInfos();
-
-        assertEquals(ed.getEncryptionAlgOID(),
-                                   CMSAlgorithm.AES128_CBC.getId());
-
-        Collection c = recipients.getRecipients();
-        Iterator it = c.iterator();
-
-        if (it.hasNext())
-        {
-            RecipientInformation   recipient = (RecipientInformation)it.next();
-
-            byte[] recData = recipient.getContent(new BcPasswordEnvelopedRecipient("abc\u5639\u563b".toCharArray()));
-            assertEquals(true, Arrays.equals(data, recData));
-        }
-        else
-        {
-            fail("no recipient found");
-        }
-
-        //
-        // try algorithm parameters constructor
-        //
-        it = c.iterator();
-
-        RecipientInformation   recipient = (RecipientInformation)it.next();
-
-        byte[] recData = recipient.getContent(new BcPasswordEnvelopedRecipient("abc\u5639\u563b".toCharArray()));
-        assertEquals(true, Arrays.equals(data, recData));
-    }
-
-    private void verifyECKeyAgreeVectors(PrivateKey privKey, String wrapAlg, byte[] message)
-        throws CMSException, GeneralSecurityException
-    {
-        byte[] data = Hex.decode("504b492d4320434d5320456e76656c6f706564446174612053616d706c65");
-
-        CMSEnvelopedData ed = new CMSEnvelopedData(message);
-
-        RecipientInformationStore  recipients = ed.getRecipientInfos();
-
-        Collection c = recipients.getRecipients();
-        Iterator it = c.iterator();
-
-        assertEquals(wrapAlg, ed.getEncryptionAlgOID());
-
-        if (it.hasNext())
-        {
-            RecipientInformation   recipient = (RecipientInformation)it.next();
-
-            assertEquals("1.3.133.16.840.63.0.2", recipient.getKeyEncryptionAlgOID());
-
-            byte[] recData = recipient.getContent(new JceKeyAgreeEnvelopedRecipient(privKey).setProvider(BC));
-
-            assertTrue(Arrays.equals(data, recData));
-        }
-        else
-        {
-            fail("no recipient found");
-        }
-    }
-
-    private void verifyECMQVKeyAgreeVectors(PrivateKey privKey, String wrapAlg, byte[] message)
-        throws CMSException, GeneralSecurityException
-    {
-        byte[] data = Hex.decode("504b492d4320434d5320456e76656c6f706564446174612053616d706c65");
-
-        CMSEnvelopedData ed = new CMSEnvelopedData(message);
-
-        RecipientInformationStore  recipients = ed.getRecipientInfos();
-
-        Collection c = recipients.getRecipients();
-        Iterator it = c.iterator();
-
-        assertEquals(wrapAlg, ed.getEncryptionAlgOID());
-
-        if (it.hasNext())
-        {
-            RecipientInformation   recipient = (RecipientInformation)it.next();
-
-            assertEquals("1.3.133.16.840.63.0.16", recipient.getKeyEncryptionAlgOID());
-
-            byte[] recData = recipient.getContent(new JceKeyAgreeEnvelopedRecipient(privKey).setProvider(BC));
-
-            assertTrue(Arrays.equals(data, recData));
-        }
-        else
-        {
-            fail("no recipient found");
-        }
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cms/test/BcSignedDataTest.java b/bcpkix/src/main/java/org/bouncycastle/cms/test/BcSignedDataTest.java
deleted file mode 100644
index 493e41d..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cms/test/BcSignedDataTest.java
+++ /dev/null
@@ -1,1848 +0,0 @@
-package org.bouncycastle.cms.test;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.security.KeyFactory;
-import java.security.KeyPair;
-import java.security.MessageDigest;
-import java.security.Security;
-import java.security.cert.X509CRL;
-import java.security.cert.X509Certificate;
-import java.security.spec.PKCS8EncodedKeySpec;
-import java.security.spec.X509EncodedKeySpec;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.DEROctetString;
-import org.bouncycastle.asn1.DERSet;
-import org.bouncycastle.asn1.cms.Attribute;
-import org.bouncycastle.asn1.cms.AttributeTable;
-import org.bouncycastle.asn1.cms.CMSAttributes;
-import org.bouncycastle.asn1.cms.ContentInfo;
-import org.bouncycastle.asn1.oiw.OIWObjectIdentifiers;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.cert.X509AttributeCertificateHolder;
-import org.bouncycastle.cert.X509CertificateHolder;
-import org.bouncycastle.cert.jcajce.JcaCRLStore;
-import org.bouncycastle.cert.jcajce.JcaCertStore;
-import org.bouncycastle.cert.jcajce.JcaX509CRLHolder;
-import org.bouncycastle.cert.jcajce.JcaX509CertificateConverter;
-import org.bouncycastle.cert.jcajce.JcaX509CertificateHolder;
-import org.bouncycastle.cms.CMSAbsentContent;
-import org.bouncycastle.cms.CMSAlgorithm;
-import org.bouncycastle.cms.CMSException;
-import org.bouncycastle.cms.CMSProcessableByteArray;
-import org.bouncycastle.cms.CMSSignedData;
-import org.bouncycastle.cms.CMSSignedDataGenerator;
-import org.bouncycastle.cms.CMSSignedDataParser;
-import org.bouncycastle.cms.CMSTypedData;
-import org.bouncycastle.cms.DefaultCMSSignatureAlgorithmNameGenerator;
-import org.bouncycastle.cms.DefaultSignedAttributeTableGenerator;
-import org.bouncycastle.cms.SignerId;
-import org.bouncycastle.cms.SignerInfoGeneratorBuilder;
-import org.bouncycastle.cms.SignerInformation;
-import org.bouncycastle.cms.SignerInformationStore;
-import org.bouncycastle.cms.bc.BcRSASignerInfoVerifierBuilder;
-import org.bouncycastle.cms.jcajce.JcaSignerInfoGeneratorBuilder;
-import org.bouncycastle.cms.jcajce.JcaSimpleSignerInfoGeneratorBuilder;
-import org.bouncycastle.cms.jcajce.JcaSimpleSignerInfoVerifierBuilder;
-import org.bouncycastle.crypto.digests.SHA1Digest;
-import org.bouncycastle.crypto.params.AsymmetricKeyParameter;
-import org.bouncycastle.crypto.signers.RSADigestSigner;
-import org.bouncycastle.crypto.util.PrivateKeyFactory;
-import org.bouncycastle.crypto.util.PublicKeyFactory;
-import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.operator.BufferingContentSigner;
-import org.bouncycastle.operator.ContentSigner;
-import org.bouncycastle.operator.DefaultDigestAlgorithmIdentifierFinder;
-import org.bouncycastle.operator.DefaultSignatureAlgorithmIdentifierFinder;
-import org.bouncycastle.operator.DigestCalculatorProvider;
-import org.bouncycastle.operator.bc.BcContentSignerBuilder;
-import org.bouncycastle.operator.bc.BcDigestCalculatorProvider;
-import org.bouncycastle.operator.bc.BcRSAContentSignerBuilder;
-import org.bouncycastle.operator.jcajce.JcaContentSignerBuilder;
-import org.bouncycastle.operator.jcajce.JcaDigestCalculatorProviderBuilder;
-import org.bouncycastle.util.CollectionStore;
-import org.bouncycastle.util.Store;
-import org.bouncycastle.util.encoders.Base64;
-import org.bouncycastle.util.io.Streams;
-
-public class BcSignedDataTest
-    extends TestCase
-{
-    private static final String BC = BouncyCastleProvider.PROVIDER_NAME;
-
-    boolean DEBUG = true;
-
-    private static String _origDN;
-    private static KeyPair _origKP;
-    private static X509Certificate _origCert;
-
-    private static String _signDN;
-    private static KeyPair _signKP;
-    private static X509Certificate _signCert;
-
-    private static KeyPair _signEcDsaKP;
-    private static X509Certificate _signEcDsaCert;
-
-    private static KeyPair _signEcGostKP;
-    private static X509Certificate _signEcGostCert;
-
-    private static KeyPair _signDsaKP;
-    private static X509Certificate _signDsaCert;
-
-    private static String _reciDN;
-    private static KeyPair _reciKP;
-    private static X509Certificate _reciCert;
-
-    private static X509CRL _signCrl;
-
-    private static boolean _initialised = false;
-
-    private byte[] disorderedMessage = Base64.decode(
-            "SU9fc3RkaW5fdXNlZABfX2xpYmNfc3RhcnRfbWFpbgBnZXRob3N0aWQAX19n"
-          + "bW9uX3M=");
-
-    private byte[] disorderedSet = Base64.decode(
-            "MIIYXQYJKoZIhvcNAQcCoIIYTjCCGEoCAQExCzAJBgUrDgMCGgUAMAsGCSqG"
-          + "SIb3DQEHAaCCFqswggJUMIIBwKADAgECAgMMg6wwCgYGKyQDAwECBQAwbzEL"
-          + "MAkGA1UEBhMCREUxPTA7BgNVBAoUNFJlZ3VsaWVydW5nc2JlaMhvcmRlIGbI"
-          + "dXIgVGVsZWtvbW11bmlrYXRpb24gdW5kIFBvc3QxITAMBgcCggYBCgcUEwEx"
-          + "MBEGA1UEAxQKNFItQ0EgMTpQTjAiGA8yMDAwMDMyMjA5NDM1MFoYDzIwMDQw"
-          + "MTIxMTYwNDUzWjBvMQswCQYDVQQGEwJERTE9MDsGA1UEChQ0UmVndWxpZXJ1"
-          + "bmdzYmVoyG9yZGUgZsh1ciBUZWxla29tbXVuaWthdGlvbiB1bmQgUG9zdDEh"
-          + "MAwGBwKCBgEKBxQTATEwEQYDVQQDFAo1Ui1DQSAxOlBOMIGhMA0GCSqGSIb3"
-          + "DQEBAQUAA4GPADCBiwKBgQCKHkFTJx8GmoqFTxEOxpK9XkC3NZ5dBEKiUv0I"
-          + "fe3QMqeGMoCUnyJxwW0k2/53duHxtv2yHSZpFKjrjvE/uGwdOMqBMTjMzkFg"
-          + "19e9JPv061wyADOucOIaNAgha/zFt9XUyrHF21knKCvDNExv2MYIAagkTKaj"
-          + "LMAw0bu1J0FadQIFAMAAAAEwCgYGKyQDAwECBQADgYEAgFauXpoTLh3Z3pT/"
-          + "3bhgrxO/2gKGZopWGSWSJPNwq/U3x2EuctOJurj+y2inTcJjespThflpN+7Q"
-          + "nvsUhXU+jL2MtPlObU0GmLvWbi47cBShJ7KElcZAaxgWMBzdRGqTOdtMv+ev"
-          + "2t4igGF/q71xf6J2c3pTLWr6P8s6tzLfOCMwggJDMIIBr6ADAgECAgQAuzyu"
-          + "MAoGBiskAwMBAgUAMG8xCzAJBgNVBAYTAkRFMT0wOwYDVQQKFDRSZWd1bGll"
-          + "cnVuZ3NiZWjIb3JkZSBmyHVyIFRlbGVrb21tdW5pa2F0aW9uIHVuZCBQb3N0"
-          + "MSEwDAYHAoIGAQoHFBMBMTARBgNVBAMUCjVSLUNBIDE6UE4wIhgPMjAwMTA4"
-          + "MjAwODA4MjBaGA8yMDA1MDgyMDA4MDgyMFowSzELMAkGA1UEBhMCREUxEjAQ"
-          + "BgNVBAoUCVNpZ250cnVzdDEoMAwGBwKCBgEKBxQTATEwGAYDVQQDFBFDQSBT"
-          + "SUdOVFJVU1QgMTpQTjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAhV12"
-          + "N2WhlR6f+3CXP57GrBM9la5Vnsu2b92zv5MZqQOPeEsYbZqDCFkYg1bSwsDE"
-          + "XsGVQqXdQNAGUaapr/EUVVN+hNZ07GcmC1sPeQECgUkxDYjGi4ihbvzxlahj"
-          + "L4nX+UTzJVBfJwXoIvJ+lMHOSpnOLIuEL3SRhBItvRECxN0CAwEAAaMSMBAw"
-          + "DgYDVR0PAQH/BAQDAgEGMAoGBiskAwMBAgUAA4GBACDc9Pc6X8sK1cerphiV"
-          + "LfFv4kpZb9ev4WPy/C6987Qw1SOTElhZAmxaJQBqmDHWlQ63wj1DEqswk7hG"
-          + "LrvQk/iX6KXIn8e64uit7kx6DHGRKNvNGofPjr1WelGeGW/T2ZJKgmPDjCkf"
-          + "sIKt2c3gwa2pDn4mmCz/DStUIqcPDbqLMIICVTCCAcGgAwIBAgIEAJ16STAK"
-          + "BgYrJAMDAQIFADBvMQswCQYDVQQGEwJERTE9MDsGA1UEChQ0UmVndWxpZXJ1"
-          + "bmdzYmVoyG9yZGUgZsh1ciBUZWxla29tbXVuaWthdGlvbiB1bmQgUG9zdDEh"
-          + "MAwGBwKCBgEKBxQTATEwEQYDVQQDFAo1Ui1DQSAxOlBOMCIYDzIwMDEwMjAx"
-          + "MTM0NDI1WhgPMjAwNTAzMjIwODU1NTFaMG8xCzAJBgNVBAYTAkRFMT0wOwYD"
-          + "VQQKFDRSZWd1bGllcnVuZ3NiZWjIb3JkZSBmyHVyIFRlbGVrb21tdW5pa2F0"
-          + "aW9uIHVuZCBQb3N0MSEwDAYHAoIGAQoHFBMBMTARBgNVBAMUCjZSLUNhIDE6"
-          + "UE4wgaEwDQYJKoZIhvcNAQEBBQADgY8AMIGLAoGBAIOiqxUkzVyqnvthihnl"
-          + "tsE5m1Xn5TZKeR/2MQPStc5hJ+V4yptEtIx+Fn5rOoqT5VEVWhcE35wdbPvg"
-          + "JyQFn5msmhPQT/6XSGOlrWRoFummXN9lQzAjCj1sgTcmoLCVQ5s5WpCAOXFw"
-          + "VWu16qndz3sPItn3jJ0F3Kh3w79NglvPAgUAwAAAATAKBgYrJAMDAQIFAAOB"
-          + "gQBpSRdnDb6AcNVaXSmGo6+kVPIBhot1LzJOGaPyDNpGXxd7LV4tMBF1U7gr"
-          + "4k1g9BO6YiMWvw9uiTZmn0CfV8+k4fWEuG/nmafRoGIuay2f+ILuT+C0rnp1"
-          + "4FgMsEhuVNJJAmb12QV0PZII+UneyhAneZuQQzVUkTcVgYxogxdSOzCCAlUw"
-          + "ggHBoAMCAQICBACdekowCgYGKyQDAwECBQAwbzELMAkGA1UEBhMCREUxPTA7"
-          + "BgNVBAoUNFJlZ3VsaWVydW5nc2JlaMhvcmRlIGbIdXIgVGVsZWtvbW11bmlr"
-          + "YXRpb24gdW5kIFBvc3QxITAMBgcCggYBCgcUEwExMBEGA1UEAxQKNlItQ2Eg"
-          + "MTpQTjAiGA8yMDAxMDIwMTEzNDcwN1oYDzIwMDUwMzIyMDg1NTUxWjBvMQsw"
-          + "CQYDVQQGEwJERTE9MDsGA1UEChQ0UmVndWxpZXJ1bmdzYmVoyG9yZGUgZsh1"
-          + "ciBUZWxla29tbXVuaWthdGlvbiB1bmQgUG9zdDEhMAwGBwKCBgEKBxQTATEw"
-          + "EQYDVQQDFAo1Ui1DQSAxOlBOMIGhMA0GCSqGSIb3DQEBAQUAA4GPADCBiwKB"
-          + "gQCKHkFTJx8GmoqFTxEOxpK9XkC3NZ5dBEKiUv0Ife3QMqeGMoCUnyJxwW0k"
-          + "2/53duHxtv2yHSZpFKjrjvE/uGwdOMqBMTjMzkFg19e9JPv061wyADOucOIa"
-          + "NAgha/zFt9XUyrHF21knKCvDNExv2MYIAagkTKajLMAw0bu1J0FadQIFAMAA"
-          + "AAEwCgYGKyQDAwECBQADgYEAV1yTi+2gyB7sUhn4PXmi/tmBxAfe5oBjDW8m"
-          + "gxtfudxKGZ6l/FUPNcrSc5oqBYxKWtLmf3XX87LcblYsch617jtNTkMzhx9e"
-          + "qxiD02ufcrxz2EVt0Akdqiz8mdVeqp3oLcNU/IttpSrcA91CAnoUXtDZYwb/"
-          + "gdQ4FI9l3+qo/0UwggJVMIIBwaADAgECAgQAxIymMAoGBiskAwMBAgUAMG8x"
-          + "CzAJBgNVBAYTAkRFMT0wOwYDVQQKFDRSZWd1bGllcnVuZ3NiZWjIb3JkZSBm"
-          + "yHVyIFRlbGVrb21tdW5pa2F0aW9uIHVuZCBQb3N0MSEwDAYHAoIGAQoHFBMB"
-          + "MTARBgNVBAMUCjZSLUNhIDE6UE4wIhgPMjAwMTEwMTUxMzMxNThaGA8yMDA1"
-          + "MDYwMTA5NTIxN1owbzELMAkGA1UEBhMCREUxPTA7BgNVBAoUNFJlZ3VsaWVy"
-          + "dW5nc2JlaMhvcmRlIGbIdXIgVGVsZWtvbW11bmlrYXRpb24gdW5kIFBvc3Qx"
-          + "ITAMBgcCggYBCgcUEwExMBEGA1UEAxQKN1ItQ0EgMTpQTjCBoTANBgkqhkiG"
-          + "9w0BAQEFAAOBjwAwgYsCgYEAiokD/j6lEP4FexF356OpU5teUpGGfUKjIrFX"
-          + "BHc79G0TUzgVxqMoN1PWnWktQvKo8ETaugxLkP9/zfX3aAQzDW4Zki6x6GDq"
-          + "fy09Agk+RJvhfbbIzRkV4sBBco0n73x7TfG/9NTgVr/96U+I+z/1j30aboM6"
-          + "9OkLEhjxAr0/GbsCBQDAAAABMAoGBiskAwMBAgUAA4GBAHWRqRixt+EuqHhR"
-          + "K1kIxKGZL2vZuakYV0R24Gv/0ZR52FE4ECr+I49o8FP1qiGSwnXB0SwjuH2S"
-          + "iGiSJi+iH/MeY85IHwW1P5e+bOMvEOFhZhQXQixOD7totIoFtdyaj1XGYRef"
-          + "0f2cPOjNJorXHGV8wuBk+/j++sxbd/Net3FtMIICVTCCAcGgAwIBAgIEAMSM"
-          + "pzAKBgYrJAMDAQIFADBvMQswCQYDVQQGEwJERTE9MDsGA1UEChQ0UmVndWxp"
-          + "ZXJ1bmdzYmVoyG9yZGUgZsh1ciBUZWxla29tbXVuaWthdGlvbiB1bmQgUG9z"
-          + "dDEhMAwGBwKCBgEKBxQTATEwEQYDVQQDFAo3Ui1DQSAxOlBOMCIYDzIwMDEx"
-          + "MDE1MTMzNDE0WhgPMjAwNTA2MDEwOTUyMTdaMG8xCzAJBgNVBAYTAkRFMT0w"
-          + "OwYDVQQKFDRSZWd1bGllcnVuZ3NiZWjIb3JkZSBmyHVyIFRlbGVrb21tdW5p"
-          + "a2F0aW9uIHVuZCBQb3N0MSEwDAYHAoIGAQoHFBMBMTARBgNVBAMUCjZSLUNh"
-          + "IDE6UE4wgaEwDQYJKoZIhvcNAQEBBQADgY8AMIGLAoGBAIOiqxUkzVyqnvth"
-          + "ihnltsE5m1Xn5TZKeR/2MQPStc5hJ+V4yptEtIx+Fn5rOoqT5VEVWhcE35wd"
-          + "bPvgJyQFn5msmhPQT/6XSGOlrWRoFummXN9lQzAjCj1sgTcmoLCVQ5s5WpCA"
-          + "OXFwVWu16qndz3sPItn3jJ0F3Kh3w79NglvPAgUAwAAAATAKBgYrJAMDAQIF"
-          + "AAOBgQBi5W96UVDoNIRkCncqr1LLG9vF9SGBIkvFpLDIIbcvp+CXhlvsdCJl"
-          + "0pt2QEPSDl4cmpOet+CxJTdTuMeBNXxhb7Dvualog69w/+K2JbPhZYxuVFZs"
-          + "Zh5BkPn2FnbNu3YbJhE60aIkikr72J4XZsI5DxpZCGh6xyV/YPRdKSljFjCC"
-          + "AlQwggHAoAMCAQICAwyDqzAKBgYrJAMDAQIFADBvMQswCQYDVQQGEwJERTE9"
-          + "MDsGA1UEChQ0UmVndWxpZXJ1bmdzYmVoyG9yZGUgZsh1ciBUZWxla29tbXVu"
-          + "aWthdGlvbiB1bmQgUG9zdDEhMAwGBwKCBgEKBxQTATEwEQYDVQQDFAo1Ui1D"
-          + "QSAxOlBOMCIYDzIwMDAwMzIyMDk0MTI3WhgPMjAwNDAxMjExNjA0NTNaMG8x"
-          + "CzAJBgNVBAYTAkRFMT0wOwYDVQQKFDRSZWd1bGllcnVuZ3NiZWjIb3JkZSBm"
-          + "yHVyIFRlbGVrb21tdW5pa2F0aW9uIHVuZCBQb3N0MSEwDAYHAoIGAQoHFBMB"
-          + "MTARBgNVBAMUCjRSLUNBIDE6UE4wgaEwDQYJKoZIhvcNAQEBBQADgY8AMIGL"
-          + "AoGBAI8x26tmrFJanlm100B7KGlRemCD1R93PwdnG7svRyf5ZxOsdGrDszNg"
-          + "xg6ouO8ZHQMT3NC2dH8TvO65Js+8bIyTm51azF6clEg0qeWNMKiiXbBXa+ph"
-          + "hTkGbXiLYvACZ6/MTJMJ1lcrjpRF7BXtYeYMcEF6znD4pxOqrtbf9z5hAgUA"
-          + "wAAAATAKBgYrJAMDAQIFAAOBgQB99BjSKlGPbMLQAgXlvA9jUsDNhpnVm3a1"
-          + "YkfxSqS/dbQlYkbOKvCxkPGA9NBxisBM8l1zFynVjJoy++aysRmcnLY/sHaz"
-          + "23BF2iU7WERy18H3lMBfYB6sXkfYiZtvQZcWaO48m73ZBySuiV3iXpb2wgs/"
-          + "Cs20iqroAWxwq/W/9jCCAlMwggG/oAMCAQICBDsFZ9UwCgYGKyQDAwECBQAw"
-          + "bzELMAkGA1UEBhMCREUxITAMBgcCggYBCgcUEwExMBEGA1UEAxQKNFItQ0Eg"
-          + "MTpQTjE9MDsGA1UEChQ0UmVndWxpZXJ1bmdzYmVoyG9yZGUgZsh1ciBUZWxl"
-          + "a29tbXVuaWthdGlvbiB1bmQgUG9zdDAiGA8xOTk5MDEyMTE3MzUzNFoYDzIw"
-          + "MDQwMTIxMTYwMDAyWjBvMQswCQYDVQQGEwJERTE9MDsGA1UEChQ0UmVndWxp"
-          + "ZXJ1bmdzYmVoyG9yZGUgZsh1ciBUZWxla29tbXVuaWthdGlvbiB1bmQgUG9z"
-          + "dDEhMAwGBwKCBgEKBxQTATEwEQYDVQQDFAozUi1DQSAxOlBOMIGfMA0GCSqG"
-          + "SIb3DQEBAQUAA4GNADCBiQKBgI4B557mbKQg/AqWBXNJhaT/6lwV93HUl4U8"
-          + "u35udLq2+u9phns1WZkdM3gDfEpL002PeLfHr1ID/96dDYf04lAXQfombils"
-          + "of1C1k32xOvxjlcrDOuPEMxz9/HDAQZA5MjmmYHAIulGI8Qg4Tc7ERRtg/hd"
-          + "0QX0/zoOeXoDSEOBAgTAAAABMAoGBiskAwMBAgUAA4GBAIyzwfT3keHI/n2P"
-          + "LrarRJv96mCohmDZNpUQdZTVjGu5VQjVJwk3hpagU0o/t/FkdzAjOdfEw8Ql"
-          + "3WXhfIbNLv1YafMm2eWSdeYbLcbB5yJ1od+SYyf9+tm7cwfDAcr22jNRBqx8"
-          + "wkWKtKDjWKkevaSdy99sAI8jebHtWz7jzydKMIID9TCCA16gAwIBAgICbMcw"
-          + "DQYJKoZIhvcNAQEFBQAwSzELMAkGA1UEBhMCREUxEjAQBgNVBAoUCVNpZ250"
-          + "cnVzdDEoMAwGBwKCBgEKBxQTATEwGAYDVQQDFBFDQSBTSUdOVFJVU1QgMTpQ"
-          + "TjAeFw0wNDA3MzAxMzAyNDZaFw0wNzA3MzAxMzAyNDZaMDwxETAPBgNVBAMM"
-          + "CFlhY29tOlBOMQ4wDAYDVQRBDAVZYWNvbTELMAkGA1UEBhMCREUxCjAIBgNV"
-          + "BAUTATEwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAIWzLlYLQApocXIp"
-          + "pgCCpkkOUVLgcLYKeOd6/bXAnI2dTHQqT2bv7qzfUnYvOqiNgYdF13pOYtKg"
-          + "XwXMTNFL4ZOI6GoBdNs9TQiZ7KEWnqnr2945HYx7UpgTBclbOK/wGHuCdcwO"
-          + "x7juZs1ZQPFG0Lv8RoiV9s6HP7POqh1sO0P/AgMBAAGjggH1MIIB8TCBnAYD"
-          + "VR0jBIGUMIGRgBQcZzNghfnXoXRm8h1+VITC5caNRqFzpHEwbzELMAkGA1UE"
-          + "BhMCREUxPTA7BgNVBAoUNFJlZ3VsaWVydW5nc2JlaMhvcmRlIGbIdXIgVGVs"
-          + "ZWtvbW11bmlrYXRpb24gdW5kIFBvc3QxITAMBgcCggYBCgcUEwExMBEGA1UE"
-          + "AxQKNVItQ0EgMTpQToIEALs8rjAdBgNVHQ4EFgQU2e5KAzkVuKaM9I5heXkz"
-          + "bcAIuR8wDgYDVR0PAQH/BAQDAgZAMBIGA1UdIAQLMAkwBwYFKyQIAQEwfwYD"
-          + "VR0fBHgwdjB0oCygKoYobGRhcDovL2Rpci5zaWdudHJ1c3QuZGUvbz1TaWdu"
-          + "dHJ1c3QsYz1kZaJEpEIwQDEdMBsGA1UEAxMUQ1JMU2lnblNpZ250cnVzdDE6"
-          + "UE4xEjAQBgNVBAoTCVNpZ250cnVzdDELMAkGA1UEBhMCREUwYgYIKwYBBQUH"
-          + "AQEEVjBUMFIGCCsGAQUFBzABhkZodHRwOi8vZGlyLnNpZ250cnVzdC5kZS9T"
-          + "aWdudHJ1c3QvT0NTUC9zZXJ2bGV0L2h0dHBHYXRld2F5LlBvc3RIYW5kbGVy"
-          + "MBgGCCsGAQUFBwEDBAwwCjAIBgYEAI5GAQEwDgYHAoIGAQoMAAQDAQH/MA0G"
-          + "CSqGSIb3DQEBBQUAA4GBAHn1m3GcoyD5GBkKUY/OdtD6Sj38LYqYCF+qDbJR"
-          + "6pqUBjY2wsvXepUppEler+stH8mwpDDSJXrJyuzf7xroDs4dkLl+Rs2x+2tg"
-          + "BjU+ABkBDMsym2WpwgA8LCdymmXmjdv9tULxY+ec2pjSEzql6nEZNEfrU8nt"
-          + "ZCSCavgqW4TtMYIBejCCAXYCAQEwUTBLMQswCQYDVQQGEwJERTESMBAGA1UE"
-          + "ChQJU2lnbnRydXN0MSgwDAYHAoIGAQoHFBMBMTAYBgNVBAMUEUNBIFNJR05U"
-          + "UlVTVCAxOlBOAgJsxzAJBgUrDgMCGgUAoIGAMBgGCSqGSIb3DQEJAzELBgkq"
-          + "hkiG9w0BBwEwIwYJKoZIhvcNAQkEMRYEFIYfhPoyfGzkLWWSSLjaHb4HQmaK"
-          + "MBwGCSqGSIb3DQEJBTEPFw0wNTAzMjQwNzM4MzVaMCEGBSskCAYFMRgWFi92"
-          + "YXIvZmlsZXMvdG1wXzEvdGVzdDEwDQYJKoZIhvcNAQEFBQAEgYA2IvA8lhVz"
-          + "VD5e/itUxbFboKxeKnqJ5n/KuO/uBCl1N14+7Z2vtw1sfkIG+bJdp3OY2Cmn"
-          + "mrQcwsN99Vjal4cXVj8t+DJzFG9tK9dSLvD3q9zT/GQ0kJXfimLVwCa4NaSf"
-          + "Qsu4xtG0Rav6bCcnzabAkKuNNvKtH8amSRzk870DBg==");
-
-    public static byte[] xtraCounterSig = Base64.decode(
-                 "MIIR/AYJKoZIhvcNAQcCoIIR7TCCEekCAQExCzAJBgUrDgMCGgUAMBoGCSqG"
-               + "SIb3DQEHAaANBAtIZWxsbyB3b3JsZKCCDnkwggTPMIIDt6ADAgECAgRDnYD3"
-               + "MA0GCSqGSIb3DQEBBQUAMFgxCzAJBgNVBAYTAklUMRowGAYDVQQKExFJbi5U"
-               + "ZS5TLkEuIFMucC5BLjEtMCsGA1UEAxMkSW4uVGUuUy5BLiAtIENlcnRpZmlj"
-               + "YXRpb24gQXV0aG9yaXR5MB4XDTA4MDkxMjExNDMxMloXDTEwMDkxMjExNDMx"
-               + "MlowgdgxCzAJBgNVBAYTAklUMSIwIAYDVQQKDBlJbnRlc2EgUy5wLkEuLzA1"
-               + "MjYyODkwMDE0MSowKAYDVQQLDCFCdXNpbmVzcyBDb2xsYWJvcmF0aW9uICYg"
-               + "U2VjdXJpdHkxHjAcBgNVBAMMFU1BU1NJTUlMSUFOTyBaSUNDQVJESTERMA8G"
-               + "A1UEBAwIWklDQ0FSREkxFTATBgNVBCoMDE1BU1NJTUlMSUFOTzEcMBoGA1UE"
-               + "BRMTSVQ6WkNDTVNNNzZIMTRMMjE5WTERMA8GA1UELhMIMDAwMDI1ODUwgaAw"
-               + "DQYJKoZIhvcNAQEBBQADgY4AMIGKAoGBALeJTjmyFgx1SIP6c2AuB/kuyHo5"
-               + "j/prKELTALsFDimre/Hxr3wOSet1TdQfFzU8Lu+EJqgfV9cV+cI1yeH1rZs7"
-               + "lei7L3tX/VR565IywnguX5xwvteASgWZr537Fkws50bvTEMyYOj1Tf3FZvZU"
-               + "z4n4OD39KI4mfR9i1eEVIxR3AgQAizpNo4IBoTCCAZ0wHQYDVR0RBBYwFIES"
-               + "emljY2FyZGlAaW50ZXNhLml0MC8GCCsGAQUFBwEDBCMwITAIBgYEAI5GAQEw"
-               + "CwYGBACORgEDAgEUMAgGBgQAjkYBBDBZBgNVHSAEUjBQME4GBgQAizABATBE"
-               + "MEIGCCsGAQUFBwIBFjZodHRwOi8vZS10cnVzdGNvbS5pbnRlc2EuaXQvY2Ff"
-               + "cHViYmxpY2EvQ1BTX0lOVEVTQS5odG0wDgYDVR0PAQH/BAQDAgZAMIGDBgNV"
-               + "HSMEfDB6gBQZCQOW0bjFWBt+EORuxPagEgkQqKFcpFowWDELMAkGA1UEBhMC"
-               + "SVQxGjAYBgNVBAoTEUluLlRlLlMuQS4gUy5wLkEuMS0wKwYDVQQDEyRJbi5U"
-               + "ZS5TLkEuIC0gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHmCBDzRARMwOwYDVR0f"
-               + "BDQwMjAwoC6gLIYqaHR0cDovL2UtdHJ1c3Rjb20uaW50ZXNhLml0L0NSTC9J"
-               + "TlRFU0EuY3JsMB0GA1UdDgQWBBTf5ItL8KmQh541Dxt7YxcWI1254TANBgkq"
-               + "hkiG9w0BAQUFAAOCAQEAgW+uL1CVWQepbC/wfCmR6PN37Sueb4xiKQj2mTD5"
-               + "UZ5KQjpivy/Hbuf0NrfKNiDEhAvoHSPC31ebGiKuTMFNyZPHfPEUnyYGSxea"
-               + "2w837aXJFr6utPNQGBRi89kH90sZDlXtOSrZI+AzJJn5QK3F9gjcayU2NZXQ"
-               + "MJgRwYmFyn2w4jtox+CwXPQ9E5XgxiMZ4WDL03cWVXDLX00EOJwnDDMUNTRI"
-               + "m9Zv+4SKTNlfFbi9UTBqWBySkDzAelsfB2U61oqc2h1xKmCtkGMmN9iZT+Qz"
-               + "ZC/vaaT+hLEBFGAH2gwFrYc4/jTBKyBYeU1vsAxsibIoTs1Apgl6MH75qPDL"
-               + "BzCCBM8wggO3oAMCAQICBEOdgPcwDQYJKoZIhvcNAQEFBQAwWDELMAkGA1UE"
-               + "BhMCSVQxGjAYBgNVBAoTEUluLlRlLlMuQS4gUy5wLkEuMS0wKwYDVQQDEyRJ"
-               + "bi5UZS5TLkEuIC0gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMDgwOTEy"
-               + "MTE0MzEyWhcNMTAwOTEyMTE0MzEyWjCB2DELMAkGA1UEBhMCSVQxIjAgBgNV"
-               + "BAoMGUludGVzYSBTLnAuQS4vMDUyNjI4OTAwMTQxKjAoBgNVBAsMIUJ1c2lu"
-               + "ZXNzIENvbGxhYm9yYXRpb24gJiBTZWN1cml0eTEeMBwGA1UEAwwVTUFTU0lN"
-               + "SUxJQU5PIFpJQ0NBUkRJMREwDwYDVQQEDAhaSUNDQVJESTEVMBMGA1UEKgwM"
-               + "TUFTU0lNSUxJQU5PMRwwGgYDVQQFExNJVDpaQ0NNU003NkgxNEwyMTlZMREw"
-               + "DwYDVQQuEwgwMDAwMjU4NTCBoDANBgkqhkiG9w0BAQEFAAOBjgAwgYoCgYEA"
-               + "t4lOObIWDHVIg/pzYC4H+S7IejmP+msoQtMAuwUOKat78fGvfA5J63VN1B8X"
-               + "NTwu74QmqB9X1xX5wjXJ4fWtmzuV6Lsve1f9VHnrkjLCeC5fnHC+14BKBZmv"
-               + "nfsWTCznRu9MQzJg6PVN/cVm9lTPifg4Pf0ojiZ9H2LV4RUjFHcCBACLOk2j"
-               + "ggGhMIIBnTAdBgNVHREEFjAUgRJ6aWNjYXJkaUBpbnRlc2EuaXQwLwYIKwYB"
-               + "BQUHAQMEIzAhMAgGBgQAjkYBATALBgYEAI5GAQMCARQwCAYGBACORgEEMFkG"
-               + "A1UdIARSMFAwTgYGBACLMAEBMEQwQgYIKwYBBQUHAgEWNmh0dHA6Ly9lLXRy"
-               + "dXN0Y29tLmludGVzYS5pdC9jYV9wdWJibGljYS9DUFNfSU5URVNBLmh0bTAO"
-               + "BgNVHQ8BAf8EBAMCBkAwgYMGA1UdIwR8MHqAFBkJA5bRuMVYG34Q5G7E9qAS"
-               + "CRCooVykWjBYMQswCQYDVQQGEwJJVDEaMBgGA1UEChMRSW4uVGUuUy5BLiBT"
-               + "LnAuQS4xLTArBgNVBAMTJEluLlRlLlMuQS4gLSBDZXJ0aWZpY2F0aW9uIEF1"
-               + "dGhvcml0eYIEPNEBEzA7BgNVHR8ENDAyMDCgLqAshipodHRwOi8vZS10cnVz"
-               + "dGNvbS5pbnRlc2EuaXQvQ1JML0lOVEVTQS5jcmwwHQYDVR0OBBYEFN/ki0vw"
-               + "qZCHnjUPG3tjFxYjXbnhMA0GCSqGSIb3DQEBBQUAA4IBAQCBb64vUJVZB6ls"
-               + "L/B8KZHo83ftK55vjGIpCPaZMPlRnkpCOmK/L8du5/Q2t8o2IMSEC+gdI8Lf"
-               + "V5saIq5MwU3Jk8d88RSfJgZLF5rbDzftpckWvq6081AYFGLz2Qf3SxkOVe05"
-               + "Ktkj4DMkmflArcX2CNxrJTY1ldAwmBHBiYXKfbDiO2jH4LBc9D0TleDGIxnh"
-               + "YMvTdxZVcMtfTQQ4nCcMMxQ1NEib1m/7hIpM2V8VuL1RMGpYHJKQPMB6Wx8H"
-               + "ZTrWipzaHXEqYK2QYyY32JlP5DNkL+9ppP6EsQEUYAfaDAWthzj+NMErIFh5"
-               + "TW+wDGyJsihOzUCmCXowfvmo8MsHMIIEzzCCA7egAwIBAgIEQ52A9zANBgkq"
-               + "hkiG9w0BAQUFADBYMQswCQYDVQQGEwJJVDEaMBgGA1UEChMRSW4uVGUuUy5B"
-               + "LiBTLnAuQS4xLTArBgNVBAMTJEluLlRlLlMuQS4gLSBDZXJ0aWZpY2F0aW9u"
-               + "IEF1dGhvcml0eTAeFw0wODA5MTIxMTQzMTJaFw0xMDA5MTIxMTQzMTJaMIHY"
-               + "MQswCQYDVQQGEwJJVDEiMCAGA1UECgwZSW50ZXNhIFMucC5BLi8wNTI2Mjg5"
-               + "MDAxNDEqMCgGA1UECwwhQnVzaW5lc3MgQ29sbGFib3JhdGlvbiAmIFNlY3Vy"
-               + "aXR5MR4wHAYDVQQDDBVNQVNTSU1JTElBTk8gWklDQ0FSREkxETAPBgNVBAQM"
-               + "CFpJQ0NBUkRJMRUwEwYDVQQqDAxNQVNTSU1JTElBTk8xHDAaBgNVBAUTE0lU"
-               + "OlpDQ01TTTc2SDE0TDIxOVkxETAPBgNVBC4TCDAwMDAyNTg1MIGgMA0GCSqG"
-               + "SIb3DQEBAQUAA4GOADCBigKBgQC3iU45shYMdUiD+nNgLgf5Lsh6OY/6ayhC"
-               + "0wC7BQ4pq3vx8a98DknrdU3UHxc1PC7vhCaoH1fXFfnCNcnh9a2bO5Xouy97"
-               + "V/1UeeuSMsJ4Ll+ccL7XgEoFma+d+xZMLOdG70xDMmDo9U39xWb2VM+J+Dg9"
-               + "/SiOJn0fYtXhFSMUdwIEAIs6TaOCAaEwggGdMB0GA1UdEQQWMBSBEnppY2Nh"
-               + "cmRpQGludGVzYS5pdDAvBggrBgEFBQcBAwQjMCEwCAYGBACORgEBMAsGBgQA"
-               + "jkYBAwIBFDAIBgYEAI5GAQQwWQYDVR0gBFIwUDBOBgYEAIswAQEwRDBCBggr"
-               + "BgEFBQcCARY2aHR0cDovL2UtdHJ1c3Rjb20uaW50ZXNhLml0L2NhX3B1YmJs"
-               + "aWNhL0NQU19JTlRFU0EuaHRtMA4GA1UdDwEB/wQEAwIGQDCBgwYDVR0jBHww"
-               + "eoAUGQkDltG4xVgbfhDkbsT2oBIJEKihXKRaMFgxCzAJBgNVBAYTAklUMRow"
-               + "GAYDVQQKExFJbi5UZS5TLkEuIFMucC5BLjEtMCsGA1UEAxMkSW4uVGUuUy5B"
-               + "LiAtIENlcnRpZmljYXRpb24gQXV0aG9yaXR5ggQ80QETMDsGA1UdHwQ0MDIw"
-               + "MKAuoCyGKmh0dHA6Ly9lLXRydXN0Y29tLmludGVzYS5pdC9DUkwvSU5URVNB"
-               + "LmNybDAdBgNVHQ4EFgQU3+SLS/CpkIeeNQ8be2MXFiNdueEwDQYJKoZIhvcN"
-               + "AQEFBQADggEBAIFvri9QlVkHqWwv8Hwpkejzd+0rnm+MYikI9pkw+VGeSkI6"
-               + "Yr8vx27n9Da3yjYgxIQL6B0jwt9XmxoirkzBTcmTx3zxFJ8mBksXmtsPN+2l"
-               + "yRa+rrTzUBgUYvPZB/dLGQ5V7Tkq2SPgMySZ+UCtxfYI3GslNjWV0DCYEcGJ"
-               + "hcp9sOI7aMfgsFz0PROV4MYjGeFgy9N3FlVwy19NBDicJwwzFDU0SJvWb/uE"
-               + "ikzZXxW4vVEwalgckpA8wHpbHwdlOtaKnNodcSpgrZBjJjfYmU/kM2Qv72mk"
-               + "/oSxARRgB9oMBa2HOP40wSsgWHlNb7AMbImyKE7NQKYJejB++ajwywcxggM8"
-               + "MIIDOAIBATBgMFgxCzAJBgNVBAYTAklUMRowGAYDVQQKExFJbi5UZS5TLkEu"
-               + "IFMucC5BLjEtMCsGA1UEAxMkSW4uVGUuUy5BLiAtIENlcnRpZmljYXRpb24g"
-               + "QXV0aG9yaXR5AgRDnYD3MAkGBSsOAwIaBQAwDQYJKoZIhvcNAQEBBQAEgYB+"
-               + "lH2cwLqc91mP8prvgSV+RRzk13dJdZvdoVjgQoFrPhBiZCNIEoHvIhMMA/sM"
-               + "X6euSRZk7EjD24FasCEGYyd0mJVLEy6TSPmuW+wWz/28w3a6IWXBGrbb/ild"
-               + "/CJMkPgLPGgOVD1WDwiNKwfasiQSFtySf5DPn3jFevdLeMmEY6GCAjIwggEV"
-               + "BgkqhkiG9w0BCQYxggEGMIIBAgIBATBgMFgxCzAJBgNVBAYTAklUMRowGAYD"
-               + "VQQKExFJbi5UZS5TLkEuIFMucC5BLjEtMCsGA1UEAxMkSW4uVGUuUy5BLiAt"
-               + "IENlcnRpZmljYXRpb24gQXV0aG9yaXR5AgRDnYD3MAkGBSsOAwIaBQAwDQYJ"
-               + "KoZIhvcNAQEBBQAEgYBHlOULfT5GDigIvxP0qZOy8VbpntmzaPF55VV4buKV"
-               + "35J+uHp98gXKp0LrHM69V5IRKuyuQzHHFBqsXxsRI9o6KoOfgliD9Xc+BeMg"
-               + "dKzQhBhBYoFREq8hQM0nSbqDNHYAQyNHMzUA/ZQUO5dlFuH8Dw3iDYAhNtfd"
-               + "PrlchKJthDCCARUGCSqGSIb3DQEJBjGCAQYwggECAgEBMGAwWDELMAkGA1UE"
-               + "BhMCSVQxGjAYBgNVBAoTEUluLlRlLlMuQS4gUy5wLkEuMS0wKwYDVQQDEyRJ"
-               + "bi5UZS5TLkEuIC0gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkCBEOdgPcwCQYF"
-               + "Kw4DAhoFADANBgkqhkiG9w0BAQEFAASBgEeU5Qt9PkYOKAi/E/Spk7LxVume"
-               + "2bNo8XnlVXhu4pXfkn64en3yBcqnQusczr1XkhEq7K5DMccUGqxfGxEj2joq"
-               + "g5+CWIP1dz4F4yB0rNCEGEFigVESryFAzSdJuoM0dgBDI0czNQD9lBQ7l2UW"
-               + "4fwPDeINgCE2190+uVyEom2E");
-
-    byte[] noSignedAttrSample2 = Base64.decode(
-          "MIIIlAYJKoZIhvcNAQcCoIIIhTCCCIECAQExCzAJBgUrDgMCGgUAMAsGCSqG"
-        + "SIb3DQEHAaCCB3UwggOtMIIDa6ADAgECAgEzMAsGByqGSM44BAMFADCBkDEL"
-        + "MAkGA1UEBhMCVVMxCzAJBgNVBAgTAkNBMRIwEAYDVQQHEwlQYWxvIEFsdG8x"
-        + "HTAbBgNVBAoTFFN1biBNaWNyb3N5c3RlbXMgSW5jMSMwIQYDVQQLExpKYXZh"
-        + "IFNvZnR3YXJlIENvZGUgU2lnbmluZzEcMBoGA1UEAxMTSkNFIENvZGUgU2ln"
-        + "bmluZyBDQTAeFw0wMTA1MjkxNjQ3MTFaFw0wNjA1MjgxNjQ3MTFaMG4xHTAb"
-        + "BgNVBAoTFFN1biBNaWNyb3N5c3RlbXMgSW5jMSMwIQYDVQQLExpKYXZhIFNv"
-        + "ZnR3YXJlIENvZGUgU2lnbmluZzEoMCYGA1UEAxMfVGhlIExlZ2lvbiBvZiB0"
-        + "aGUgQm91bmN5IENhc3RsZTCCAbcwggEsBgcqhkjOOAQBMIIBHwKBgQD9f1OB"
-        + "HXUSKVLfSpwu7OTn9hG3UjzvRADDHj+AtlEmaUVdQCJR+1k9jVj6v8X1ujD2"
-        + "y5tVbNeBO4AdNG/yZmC3a5lQpaSfn+gEexAiwk+7qdf+t8Yb+DtX58aophUP"
-        + "BPuD9tPFHsMCNVQTWhaRMvZ1864rYdcq7/IiAxmd0UgBxwIVAJdgUI8VIwvM"
-        + "spK5gqLrhAvwWBz1AoGBAPfhoIXWmz3ey7yrXDa4V7l5lK+7+jrqgvlXTAs9"
-        + "B4JnUVlXjrrUWU/mcQcQgYC0SRZxI+hMKBYTt88JMozIpuE8FnqLVHyNKOCj"
-        + "rh4rs6Z1kW6jfwv6ITVi8ftiegEkO8yk8b6oUZCJqIPf4VrlnwaSi2ZegHtV"
-        + "JWQBTDv+z0kqA4GEAAKBgBWry/FCAZ6miyy39+ftsa+h9lxoL+JtV0MJcUyQ"
-        + "E4VAhpAwWb8vyjba9AwOylYQTktHX5sAkFvjBiU0LOYDbFSTVZSHMRJgfjxB"
-        + "SHtICjOEvr1BJrrOrdzqdxcOUge5n7El124BCrv91x5Ol8UTwtiO9LrRXF/d"
-        + "SyK+RT5n1klRo3YwdDARBglghkgBhvhCAQEEBAMCAIcwDgYDVR0PAQH/BAQD"
-        + "AgHGMB0GA1UdDgQWBBQwMY4NRcco1AO3w1YsokfDLVseEjAPBgNVHRMBAf8E"
-        + "BTADAQH/MB8GA1UdIwQYMBaAFGXi9IbJ007wkU5Yomr12HhamsGmMAsGByqG"
-        + "SM44BAMFAAMvADAsAhRmigTu6QV0sTfEkVljgij/hhdVfAIUQZvMxAnIHc30"
-        + "y/u0C1T5UEG9glUwggPAMIIDfqADAgECAgEQMAsGByqGSM44BAMFADCBkDEL"
-        + "MAkGA1UEBhMCVVMxCzAJBgNVBAgTAkNBMRIwEAYDVQQHEwlQYWxvIEFsdG8x"
-        + "HTAbBgNVBAoTFFN1biBNaWNyb3N5c3RlbXMgSW5jMSMwIQYDVQQLExpKYXZh"
-        + "IFNvZnR3YXJlIENvZGUgU2lnbmluZzEcMBoGA1UEAxMTSkNFIENvZGUgU2ln"
-        + "bmluZyBDQTAeFw0wMTA0MjUwNzAwMDBaFw0yMDA0MjUwNzAwMDBaMIGQMQsw"
-        + "CQYDVQQGEwJVUzELMAkGA1UECBMCQ0ExEjAQBgNVBAcTCVBhbG8gQWx0bzEd"
-        + "MBsGA1UEChMUU3VuIE1pY3Jvc3lzdGVtcyBJbmMxIzAhBgNVBAsTGkphdmEg"
-        + "U29mdHdhcmUgQ29kZSBTaWduaW5nMRwwGgYDVQQDExNKQ0UgQ29kZSBTaWdu"
-        + "aW5nIENBMIIBtzCCASwGByqGSM44BAEwggEfAoGBAOuvNwQeylEeaV2w8o/2"
-        + "tUkfxqSZBdcpv3S3avUZ2B7kG/gKAZqY/3Cr4kpWhmxTs/zhyIGMMfDE87CL"
-        + "5nAG7PdpaNuDTHIpiSk2F1w7SgegIAIqRpdRHXDICBgLzgxum3b3BePn+9Nh"
-        + "eeFgmiSNBpWDPFEg4TDPOFeCphpyDc7TAhUAhCVF4bq5qWKreehbMLiJaxv/"
-        + "e3UCgYEAq8l0e3Tv7kK1alNNO92QBnJokQ8LpCl2LlU71a5NZVx+KjoEpmem"
-        + "0HGqpde34sFyDaTRqh6SVEwgAAmisAlBGTMAssNcrkL4sYvKfJbYEH83RFuq"
-        + "zHjI13J2N2tAmahVZvqoAx6LShECactMuCUGHKB30sms0j3pChD6dnC3+9wD"
-        + "gYQAAoGALQmYXKy4nMeZfu4gGSo0kPnXq6uu3WtylQ1m+O8nj0Sy7ShEx/6v"
-        + "sKYnbwBnRYJbB6hWVjvSKVFhXmk51y50dxLPGUr1LcjLcmHETm/6R0M/FLv6"
-        + "vBhmKMLZZot6LS/CYJJLFP5YPiF/aGK+bEhJ+aBLXoWdGRD5FUVRG3HU9wuj"
-        + "ZjBkMBEGCWCGSAGG+EIBAQQEAwIABzAPBgNVHRMBAf8EBTADAQH/MB8GA1Ud"
-        + "IwQYMBaAFGXi9IbJ007wkU5Yomr12HhamsGmMB0GA1UdDgQWBBRl4vSGydNO"
-        + "8JFOWKJq9dh4WprBpjALBgcqhkjOOAQDBQADLwAwLAIUKvfPPJdd+Xi2CNdB"
-        + "tNkNRUzktJwCFEXNdWkOIfod1rMpsun3Mx0z/fxJMYHoMIHlAgEBMIGWMIGQ"
-        + "MQswCQYDVQQGEwJVUzELMAkGA1UECBMCQ0ExEjAQBgNVBAcTCVBhbG8gQWx0"
-        + "bzEdMBsGA1UEChMUU3VuIE1pY3Jvc3lzdGVtcyBJbmMxIzAhBgNVBAsTGkph"
-        + "dmEgU29mdHdhcmUgQ29kZSBTaWduaW5nMRwwGgYDVQQDExNKQ0UgQ29kZSBT"
-        + "aWduaW5nIENBAgEzMAkGBSsOAwIaBQAwCwYHKoZIzjgEAQUABC8wLQIVAIGV"
-        + "khm+kbV4a/+EP45PHcq0hIViAhR4M9os6IrJnoEDS3Y3l7O6zrSosA==");
-
-    /*
-     *
-     *  INFRASTRUCTURE
-     *
-     */
-
-    public BcSignedDataTest(String name)
-    {
-        super(name);
-    }
-
-    public static void main(String args[])
-    {
-
-        junit.textui.TestRunner.run(BcSignedDataTest.class);
-    }
-
-    public static Test suite()
-        throws Exception
-    {
-        init();
-        
-        return new CMSTestSetup(new TestSuite(BcSignedDataTest.class));
-    }
-
-    private static void init()
-        throws Exception
-    {
-        if (!_initialised)
-        {
-            _initialised = true;
-
-            if (Security.getProvider(BC) == null)
-            {
-                Security.addProvider(new BouncyCastleProvider());
-            }
-
-            _origDN   = "O=Bouncy Castle, C=AU";
-            _origKP   = CMSTestUtil.makeKeyPair();  
-            _origCert = CMSTestUtil.makeCertificate(_origKP, _origDN, _origKP, _origDN);
-
-            _signDN   = "CN=Bob, OU=Sales, O=Bouncy Castle, C=AU";
-            _signKP   = CMSTestUtil.makeKeyPair();
-            _signCert = CMSTestUtil.makeCertificate(_signKP, _signDN, _origKP, _origDN);
-    
-            _signDsaKP   = CMSTestUtil.makeDsaKeyPair();
-            _signDsaCert = CMSTestUtil.makeCertificate(_signDsaKP, _signDN, _origKP, _origDN);
-
-            _signEcDsaKP   = CMSTestUtil.makeEcDsaKeyPair();
-            _signEcDsaCert = CMSTestUtil.makeCertificate(_signEcDsaKP, _signDN, _origKP, _origDN);
-
-            _reciDN   = "CN=Doug, OU=Sales, O=Bouncy Castle, C=AU";
-            _reciKP   = CMSTestUtil.makeKeyPair();
-            _reciCert = CMSTestUtil.makeCertificate(_reciKP, _reciDN, _signKP, _signDN);
-
-            _signCrl  = CMSTestUtil.makeCrl(_signKP);
-        }
-    }
-
-    private void verifyRSASignatures(CMSSignedData s, byte[] contentDigest)
-        throws Exception
-    {
-        Store                   certStore = s.getCertificates();
-        SignerInformationStore  signers = s.getSignerInfos();
-
-        Collection c = signers.getSigners();
-        Iterator it = c.iterator();
-
-        while (it.hasNext())
-        {
-            SignerInformation   signer = (SignerInformation)it.next();
-            Collection certCollection = certStore.getMatches(signer.getSID());
-
-            Iterator certIt = certCollection.iterator();
-            X509CertificateHolder cert = (X509CertificateHolder)certIt.next();
-
-            assertEquals(true, signer.verify(new BcRSASignerInfoVerifierBuilder(new DefaultCMSSignatureAlgorithmNameGenerator(), new DefaultSignatureAlgorithmIdentifierFinder(), new DefaultDigestAlgorithmIdentifierFinder(), new BcDigestCalculatorProvider()).build(cert)));
-
-            if (contentDigest != null)
-            {
-                assertTrue(MessageDigest.isEqual(contentDigest, signer.getContentDigest()));
-            }
-        }
-    }
-
-    private void verifySignatures(CMSSignedData s, byte[] contentDigest) 
-        throws Exception
-    {
-        Store                   certStore = s.getCertificates();
-        Store                   crlStore = s.getCRLs();
-        SignerInformationStore  signers = s.getSignerInfos();
-        
-        Collection c = signers.getSigners();
-        Iterator it = c.iterator();
-
-        while (it.hasNext())
-        {
-            SignerInformation   signer = (SignerInformation)it.next();
-            Collection certCollection = certStore.getMatches(signer.getSID());
-    
-            Iterator certIt = certCollection.iterator();
-            X509CertificateHolder cert = (X509CertificateHolder)certIt.next();
-
-            assertEquals(true, signer.verify(new JcaSimpleSignerInfoVerifierBuilder().setProvider(BC).build(cert)));
-            
-            if (contentDigest != null)
-            {
-                assertTrue(MessageDigest.isEqual(contentDigest, signer.getContentDigest()));
-            }
-        }
-
-        Collection certColl = certStore.getMatches(null);
-        Collection crlColl = crlStore.getMatches(null);
-
-        assertEquals(certColl.size(), s.getCertificates().getMatches(null).size());
-        assertEquals(crlColl.size(), s.getCRLs().getMatches(null).size());
-    }
-
-    private void verifySignatures(CMSSignedData s) 
-        throws Exception
-    {
-        verifySignatures(s, null);
-    }
-
-    public void testDetachedVerification()
-        throws Exception
-    {
-        byte[]              data = "Hello World!".getBytes();
-        List certList = new ArrayList();
-        CMSTypedData        msg = new CMSProcessableByteArray(data);
-
-        certList.add(_origCert);
-        certList.add(_signCert);
-
-        Store           certs = new JcaCertStore(certList);
-
-        CMSSignedDataGenerator gen = new CMSSignedDataGenerator();
-
-        DigestCalculatorProvider digProvider = new JcaDigestCalculatorProviderBuilder().setProvider(BC).build();
-        JcaSignerInfoGeneratorBuilder signerInfoGeneratorBuilder = new JcaSignerInfoGeneratorBuilder(digProvider);
-        ContentSigner sha1Signer = new JcaContentSignerBuilder("SHA1withRSA").setProvider(BC).build(_origKP.getPrivate());
-        ContentSigner md5Signer = new JcaContentSignerBuilder("MD5withRSA").setProvider(BC).build(_origKP.getPrivate());
-
-        gen.addSignerInfoGenerator(signerInfoGeneratorBuilder.build(sha1Signer, _origCert));
-        gen.addSignerInfoGenerator(signerInfoGeneratorBuilder.build(md5Signer, _origCert));
-
-        gen.addCertificates(certs);
-
-        CMSSignedData s = gen.generate(msg);
-
-        MessageDigest sha1 = MessageDigest.getInstance("SHA1", BC);
-        MessageDigest md5 = MessageDigest.getInstance("MD5", BC);
-        Map hashes = new HashMap();
-        byte[] sha1Hash = sha1.digest(data);
-        byte[] md5Hash = md5.digest(data);
-
-        hashes.put(CMSAlgorithm.SHA1, sha1Hash);
-        hashes.put(CMSAlgorithm.MD5, md5Hash);
-
-        s = new CMSSignedData(hashes, s.getEncoded());
-
-        verifySignatures(s, null);
-    }
-
-    public void testDetachedVerificationWithBufferingContentSigner()
-        throws Exception
-    {
-        byte[]              data = "Hello World!".getBytes();
-        List certList = new ArrayList();
-        CMSTypedData        msg = new CMSProcessableByteArray(data);
-
-        certList.add(_origCert);
-        certList.add(_signCert);
-
-        Store           certs = new JcaCertStore(certList);
-
-        CMSSignedDataGenerator gen = new CMSSignedDataGenerator();
-
-        DigestCalculatorProvider digProvider = new JcaDigestCalculatorProviderBuilder().setProvider(BC).build();
-        JcaSignerInfoGeneratorBuilder signerInfoGeneratorBuilder = new JcaSignerInfoGeneratorBuilder(digProvider);
-        ContentSigner sha1Signer = new JcaContentSignerBuilder("SHA1withRSA").setProvider(BC).build(_origKP.getPrivate());
-        ContentSigner md5Signer = new JcaContentSignerBuilder("MD5withRSA").setProvider(BC).build(_origKP.getPrivate());
-
-        gen.addSignerInfoGenerator(signerInfoGeneratorBuilder.build(new BufferingContentSigner(sha1Signer), _origCert));
-        gen.addSignerInfoGenerator(signerInfoGeneratorBuilder.build(new BufferingContentSigner(md5Signer), _origCert));
-
-        gen.addCertificates(certs);
-
-        CMSSignedData s = gen.generate(msg);
-
-        MessageDigest sha1 = MessageDigest.getInstance("SHA1", BC);
-        MessageDigest md5 = MessageDigest.getInstance("MD5", BC);
-        Map hashes = new HashMap();
-        byte[] sha1Hash = sha1.digest(data);
-        byte[] md5Hash = md5.digest(data);
-
-        hashes.put(CMSAlgorithm.SHA1, sha1Hash);
-        hashes.put(CMSAlgorithm.MD5, md5Hash);
-
-        s = new CMSSignedData(hashes, s.getEncoded());
-
-        verifySignatures(s, null);
-    }
-
-    public void testSHA1AndMD5WithRSAEncapsulatedRepeated()
-        throws Exception
-    {
-        List certList = new ArrayList();
-        CMSTypedData      msg = new CMSProcessableByteArray("Hello World!".getBytes());
-
-        certList.add(_origCert);
-        certList.add(_signCert);
-
-        Store           certs = new JcaCertStore(certList);
-
-        CMSSignedDataGenerator gen = new CMSSignedDataGenerator();
-
-        DigestCalculatorProvider digCalcProv = new JcaDigestCalculatorProviderBuilder().setProvider(BC).build();
-
-        gen.addSignerInfoGenerator(new JcaSignerInfoGeneratorBuilder(digCalcProv).build(new JcaContentSignerBuilder("SHA1withRSA").setProvider(BC).build(_origKP.getPrivate()), _origCert));
-
-        gen.addSignerInfoGenerator(new JcaSignerInfoGeneratorBuilder(digCalcProv).build(new JcaContentSignerBuilder("MD5withRSA").setProvider(BC).build(_origKP.getPrivate()), _origCert));
-        
-        gen.addCertificates(certs);
-
-        CMSSignedData s = gen.generate(msg, true);
-
-        ByteArrayInputStream bIn = new ByteArrayInputStream(s.getEncoded());
-        ASN1InputStream      aIn = new ASN1InputStream(bIn);
-        
-        s = new CMSSignedData(ContentInfo.getInstance(aIn.readObject()));
-
-        certs = s.getCertificates();
-
-        SignerInformationStore  signers = s.getSignerInfos();
-        
-        assertEquals(2, signers.size());
-        
-        Collection c = signers.getSigners();
-        Iterator it = c.iterator();
-        SignerId                sid = null;
-
-        while (it.hasNext())
-        {
-            SignerInformation   signer = (SignerInformation)it.next();
-            Collection certCollection = certs.getMatches(signer.getSID());
-
-            Iterator certIt = certCollection.iterator();
-            X509CertificateHolder cert = (X509CertificateHolder)certIt.next();
-
-            sid = signer.getSID();
-            
-            assertEquals(true, signer.verify(new JcaSimpleSignerInfoVerifierBuilder().setProvider(BC).build(cert)));
-
-            //
-            // check content digest
-            //
-
-            byte[] contentDigest = (byte[])gen.getGeneratedDigests().get(signer.getDigestAlgOID());
-
-            AttributeTable table = signer.getSignedAttributes();
-            Attribute hash = table.get(CMSAttributes.messageDigest);
-
-            assertTrue(MessageDigest.isEqual(contentDigest, ((ASN1OctetString)hash.getAttrValues().getObjectAt(0)).getOctets()));
-        }
-        
-        c = signers.getSigners(sid);
-        
-        assertEquals(2, c.size());
-
-
-        //
-        // try using existing signer
-        //
-        
-        gen = new CMSSignedDataGenerator();
-           
-        gen.addSigners(s.getSignerInfos());
-        
-        gen.addCertificates(s.getCertificates());
-           
-        s = gen.generate(msg, true);
-
-        bIn = new ByteArrayInputStream(s.getEncoded());
-        aIn = new ASN1InputStream(bIn);
-
-        s = new CMSSignedData(ContentInfo.getInstance(aIn.readObject()));
-
-        certs = s.getCertificates();
-
-        signers = s.getSignerInfos();
-        c = signers.getSigners();
-        it = c.iterator();
-
-        assertEquals(2, c.size());
-        
-        while (it.hasNext())
-        {
-            SignerInformation   signer = (SignerInformation)it.next();
-            Collection certCollection = certs.getMatches(signer.getSID());
-
-            Iterator certIt = certCollection.iterator();
-            X509CertificateHolder cert = (X509CertificateHolder)certIt.next();
-
-            assertEquals(true, signer.verify(new JcaSimpleSignerInfoVerifierBuilder().setProvider(BC).build(cert)));
-        }
-        
-        checkSignerStoreReplacement(s, signers);
-    }
-    
-    public void testSHA1WithRSANoAttributes()
-        throws Exception
-    {
-        List certList = new ArrayList();
-        CMSTypedData      msg = new CMSProcessableByteArray("Hello world!".getBytes());
-    
-        certList.add(_origCert);
-        certList.add(_signCert);
-    
-        Store           certs = new JcaCertStore(certList);
-    
-        CMSSignedDataGenerator gen = new CMSSignedDataGenerator();
-        ContentSigner sha1Signer = new JcaContentSignerBuilder("SHA1withRSA").setProvider(BC).build(_origKP.getPrivate());
-
-        JcaSignerInfoGeneratorBuilder builder = new JcaSignerInfoGeneratorBuilder(new JcaDigestCalculatorProviderBuilder().setProvider(BC).build());
-
-        builder.setDirectSignature(true);
-
-        gen.addSignerInfoGenerator(builder.build(sha1Signer, _origCert));
-    
-        gen.addCertificates(certs);
-    
-        CMSSignedData s = gen.generate(msg, false);
-    
-        //
-        // compute expected content digest
-        //
-        MessageDigest md = MessageDigest.getInstance("SHA1", BC);
-        
-        verifySignatures(s, md.digest("Hello world!".getBytes()));
-    }
-
-    public void testSHA1WithRSANoAttributesSimple()
-        throws Exception
-    {
-        List certList = new ArrayList();
-        CMSTypedData      msg = new CMSProcessableByteArray("Hello world!".getBytes());
-
-        certList.add(_origCert);
-        certList.add(_signCert);
-
-        Store           certs = new JcaCertStore(certList);
-
-        CMSSignedDataGenerator gen = new CMSSignedDataGenerator();
-        
-        JcaSimpleSignerInfoGeneratorBuilder builder = new JcaSimpleSignerInfoGeneratorBuilder().setProvider(BC).setDirectSignature(true);
-
-        gen.addSignerInfoGenerator(builder.build("SHA1withRSA", _origKP.getPrivate(), _origCert));
-
-        gen.addCertificates(certs);
-
-        CMSSignedData s = gen.generate(msg, false);
-
-        //
-        // compute expected content digest
-        //
-        MessageDigest md = MessageDigest.getInstance("SHA1", BC);
-
-        verifySignatures(s, md.digest("Hello world!".getBytes()));
-    }
-
-    public void testSHA1WithRSAViaConfig()
-        throws Exception
-    {
-        List certList = new ArrayList();
-        CMSTypedData      msg = new CMSProcessableByteArray("Hello world!".getBytes());
-
-        certList.add(_origCert);
-        certList.add(_signCert);
-
-        Store           certs = new JcaCertStore(certList);
-
-        // set some bogus mappings.
-        TestCMSSignatureAlgorithmNameGenerator sigAlgNameGen = new TestCMSSignatureAlgorithmNameGenerator();
-
-        sigAlgNameGen.setEncryptionAlgorithmMapping(PKCSObjectIdentifiers.rsaEncryption, "XXXX");
-        sigAlgNameGen.setDigestAlgorithmMapping(OIWObjectIdentifiers.idSHA1, "YYYY");
-
-        CMSSignedDataGenerator gen = new CMSSignedDataGenerator();
-
-        ContentSigner sha1Signer = new JcaContentSignerBuilder("SHA1withRSA").setProvider(BC).build(_origKP.getPrivate());
-
-        gen.addSignerInfoGenerator(new JcaSignerInfoGeneratorBuilder(new JcaDigestCalculatorProviderBuilder().setProvider(BC).build()).build(sha1Signer, _origCert));
-
-        gen.addCertificates(certs);
-
-        CMSSignedData s;
-
-        try
-        {
-            // try the bogus mappings
-            s = gen.generate(msg, false);
-        }
-        catch (CMSException e)
-        {
-            if (!e.getMessage().startsWith("no such algorithm: YYYYwithXXXX"))
-            {
-                throw e;
-            }
-        }
-        finally
-        {
-            // reset to the real ones
-            sigAlgNameGen.setEncryptionAlgorithmMapping(PKCSObjectIdentifiers.rsaEncryption, "RSA");
-            sigAlgNameGen.setDigestAlgorithmMapping(OIWObjectIdentifiers.idSHA1, "SHA1");
-        }
-
-        s = gen.generate(msg, false);
-
-        //
-        // compute expected content digest
-        //
-        MessageDigest md = MessageDigest.getInstance("SHA1", BC);
-
-        verifySignatures(s, md.digest("Hello world!".getBytes()));
-    }
-
-    public void testSHA1WithRSAAndAttributeTableSimple()
-        throws Exception
-    {
-        MessageDigest md = MessageDigest.getInstance("SHA1", BC);
-        List certList = new ArrayList();
-        CMSTypedData        msg = new CMSProcessableByteArray("Hello world!".getBytes());
-
-        certList.add(_origCert);
-        certList.add(_signCert);
-
-        Store           certs = new JcaCertStore(certList);
-
-        CMSSignedDataGenerator gen = new CMSSignedDataGenerator();
-
-        Attribute attr = new Attribute(CMSAttributes.messageDigest,
-                                       new DERSet(
-                                            new DEROctetString(
-                                                md.digest("Hello world!".getBytes()))));
-
-        ASN1EncodableVector v = new ASN1EncodableVector();
-
-        v.add(attr);
-
-        SignerInfoGeneratorBuilder builder = new SignerInfoGeneratorBuilder(new BcDigestCalculatorProvider()).setSignedAttributeGenerator(new DefaultSignedAttributeTableGenerator(new AttributeTable(v)));
-
-        AlgorithmIdentifier sha1withRSA = new DefaultSignatureAlgorithmIdentifierFinder().find("SHA1withRSA");
-        gen.addSignerInfoGenerator(builder.build(new BcRSAContentSignerBuilder(sha1withRSA, new DefaultDigestAlgorithmIdentifierFinder().find(sha1withRSA)).build(PrivateKeyFactory.createKey(_origKP.getPrivate().getEncoded())), new JcaX509CertificateHolder(_origCert)));
-
-        gen.addCertificates(certs);
-
-        CMSSignedData s = gen.generate(new CMSAbsentContent(), false);
-
-        //
-        // the signature is detached, so need to add msg before passing on
-        //
-        s = new CMSSignedData(msg, s.getEncoded());
-        //
-        // compute expected content digest
-        //
-
-        verifySignatures(s, md.digest("Hello world!".getBytes()));
-        verifyRSASignatures(s, md.digest("Hello world!".getBytes()));
-    }
-
-    public void testSHA1WithRSAAndAttributeTable()
-        throws Exception
-    {
-        MessageDigest md = MessageDigest.getInstance("SHA1", BC);
-        List certList = new ArrayList();
-        CMSTypedData        msg = new CMSProcessableByteArray("Hello world!".getBytes());
-
-        certList.add(_origCert);
-        certList.add(_signCert);
-
-        Store           certs = new JcaCertStore(certList);
-
-        CMSSignedDataGenerator gen = new CMSSignedDataGenerator();
-
-        Attribute attr = new Attribute(CMSAttributes.messageDigest,
-                                       new DERSet(
-                                            new DEROctetString(
-                                                md.digest("Hello world!".getBytes()))));
-
-        ASN1EncodableVector v = new ASN1EncodableVector();
-
-        v.add(attr);
-
-        JcaSignerInfoGeneratorBuilder builder = new JcaSignerInfoGeneratorBuilder(new JcaDigestCalculatorProviderBuilder().setProvider(BC).build());
-
-        builder.setSignedAttributeGenerator(new DefaultSignedAttributeTableGenerator(new AttributeTable(v)));
-        
-        ContentSigner sha1Signer = new JcaContentSignerBuilder("SHA1withRSA").setProvider(BC).build(_origKP.getPrivate());
-
-        gen.addSignerInfoGenerator(builder.build(sha1Signer, _origCert));
-
-        gen.addCertificates(certs);
-
-        CMSSignedData s = gen.generate(new CMSAbsentContent(), false);
-
-        //
-        // the signature is detached, so need to add msg before passing on
-        //
-        s = new CMSSignedData(msg, s.getEncoded());
-        //
-        // compute expected content digest
-        //
-
-        verifySignatures(s, md.digest("Hello world!".getBytes()));
-        verifyRSASignatures(s, md.digest("Hello world!".getBytes()));
-    }
-
-    public void testLwSHA1WithRSAAndAttributeTable()
-        throws Exception
-    {
-        MessageDigest md = MessageDigest.getInstance("SHA1", BC);
-        List certList = new ArrayList();
-        CMSTypedData        msg = new CMSProcessableByteArray("Hello world!".getBytes());
-
-        certList.add(_origCert);
-        certList.add(_signCert);
-
-        Store           certs = new JcaCertStore(certList);
-
-        CMSSignedDataGenerator gen = new CMSSignedDataGenerator();
-
-        Attribute attr = new Attribute(CMSAttributes.messageDigest,
-                                       new DERSet(
-                                            new DEROctetString(
-                                                md.digest("Hello world!".getBytes()))));
-
-        ASN1EncodableVector v = new ASN1EncodableVector();
-
-        v.add(attr);
-
-        AsymmetricKeyParameter privKey = PrivateKeyFactory.createKey(_origKP.getPrivate().getEncoded());
-        
-        AlgorithmIdentifier sigAlgId = new DefaultSignatureAlgorithmIdentifierFinder().find("SHA1withRSA");
-        AlgorithmIdentifier digAlgId = new DefaultDigestAlgorithmIdentifierFinder().find(sigAlgId);
-
-        BcContentSignerBuilder contentSignerBuilder = new BcRSAContentSignerBuilder(sigAlgId, digAlgId);
-
-        gen.addSignerInfoGenerator(
-            new SignerInfoGeneratorBuilder(new BcDigestCalculatorProvider())
-                .setSignedAttributeGenerator(new DefaultSignedAttributeTableGenerator(new AttributeTable(v)))
-                .build(contentSignerBuilder.build(privKey), new JcaX509CertificateHolder(_origCert)));
-
-        gen.addCertificates(certs);
-
-        CMSSignedData s = gen.generate(new CMSAbsentContent(), false);
-
-        //
-        // the signature is detached, so need to add msg before passing on
-        //
-        s = new CMSSignedData(msg, s.getEncoded());
-        //
-        // compute expected content digest
-        //
-
-        verifySignatures(s, md.digest("Hello world!".getBytes()));
-        verifyRSASignatures(s, md.digest("Hello world!".getBytes()));
-    }
-
-    public void testSHA1WithRSAEncapsulated()
-        throws Exception
-    {
-        encapsulatedTest(_signKP, _signCert, "SHA1withRSA");
-    }
-
-    public void testSHA1WithRSAEncapsulatedSubjectKeyID()
-        throws Exception
-    {
-        subjectKeyIDTest(_signKP, _signCert, "SHA1withRSA");
-    }
-
-    public void testSHA1WithRSAPSS()
-        throws Exception
-    {
-        rsaPSSTest("SHA1withRSAandMGF1");
-    }
-
-    public void testSHA224WithRSAPSS()
-        throws Exception
-    {
-        rsaPSSTest("SHA224withRSAandMGF1");
-    }
-
-    public void testSHA256WithRSAPSS()
-        throws Exception
-    {
-        rsaPSSTest("SHA256withRSAandMGF1");
-    }
-
-    public void testSHA384WithRSAPSS()
-        throws Exception
-    {
-        rsaPSSTest("SHA384withRSAandMGF1");
-    }
-
-    public void testSHA224WithRSAEncapsulated()
-        throws Exception
-    {
-        encapsulatedTest(_signKP, _signCert, "SHA224withRSA");
-    }
-    
-    public void testSHA256WithRSAEncapsulated()
-        throws Exception
-    {
-        encapsulatedTest(_signKP, _signCert, "SHA256withRSA");
-    }
-
-    public void testRIPEMD128WithRSAEncapsulated()
-        throws Exception
-    {
-        encapsulatedTest(_signKP, _signCert, "RIPEMD128withRSA");
-    }
-
-    public void testRIPEMD160WithRSAEncapsulated()
-        throws Exception
-    {
-        encapsulatedTest(_signKP, _signCert, "RIPEMD160withRSA");
-    }
-
-    public void testRIPEMD256WithRSAEncapsulated()
-        throws Exception
-    {
-        encapsulatedTest(_signKP, _signCert, "RIPEMD256withRSA");
-    }
-
-    public void testECDSAEncapsulated()
-        throws Exception
-    {
-        encapsulatedTest(_signEcDsaKP, _signEcDsaCert, "SHA1withECDSA");
-    }
-
-    public void testECDSAEncapsulatedSubjectKeyID()
-        throws Exception
-    {
-        subjectKeyIDTest(_signEcDsaKP, _signEcDsaCert, "SHA1withECDSA");
-    }
-
-    public void testECDSASHA224Encapsulated()
-        throws Exception
-    {
-        encapsulatedTest(_signEcDsaKP, _signEcDsaCert, "SHA224withECDSA");
-    }
-
-    public void testECDSASHA256Encapsulated()
-        throws Exception
-    {
-        encapsulatedTest(_signEcDsaKP, _signEcDsaCert, "SHA256withECDSA");
-    }
-
-    public void testECDSASHA384Encapsulated()
-        throws Exception
-    {
-        encapsulatedTest(_signEcDsaKP, _signEcDsaCert, "SHA384withECDSA");
-    }
-
-    public void testECDSASHA512Encapsulated()
-        throws Exception
-    {
-        encapsulatedTest(_signEcDsaKP, _signEcDsaCert, "SHA512withECDSA");
-    }
-
-    public void testECDSASHA512EncapsulatedWithKeyFactoryAsEC()
-        throws Exception
-    {
-        X509EncodedKeySpec pubSpec = new X509EncodedKeySpec(_signEcDsaKP.getPublic().getEncoded());
-        PKCS8EncodedKeySpec privSpec = new PKCS8EncodedKeySpec(_signEcDsaKP.getPrivate().getEncoded());
-        KeyFactory keyFact = KeyFactory.getInstance("EC", BC);
-        KeyPair kp = new KeyPair(keyFact.generatePublic(pubSpec), keyFact.generatePrivate(privSpec));
-        
-        encapsulatedTest(kp, _signEcDsaCert, "SHA512withECDSA");
-    }
-
-    public void testDSAEncapsulated()
-        throws Exception
-    {
-        encapsulatedTest(_signDsaKP, _signDsaCert, "SHA1withDSA");
-    }
-
-    public void testDSAEncapsulatedSubjectKeyID()
-        throws Exception
-    {
-        subjectKeyIDTest(_signDsaKP, _signDsaCert, "SHA1withDSA");
-    }
-
-    public void testSHA1WithRSACounterSignature()
-        throws Exception
-    {
-        List certList = new ArrayList();
-        List crlList = new ArrayList();
-        CMSTypedData        msg = new CMSProcessableByteArray("Hello World!".getBytes());
-
-        certList.add(_signCert);
-        certList.add(_origCert);
-
-        crlList.add(_signCrl);
-
-        Store           certStore = new JcaCertStore(certList);
-        Store           crlStore = new JcaCRLStore(crlList);
-
-        CMSSignedDataGenerator gen = new CMSSignedDataGenerator();
-
-        ContentSigner sha1Signer = new JcaContentSignerBuilder("SHA1withRSA").setProvider(BC).build(_signKP.getPrivate());
-
-        gen.addSignerInfoGenerator(new JcaSignerInfoGeneratorBuilder(new JcaDigestCalculatorProviderBuilder().setProvider(BC).build()).build(sha1Signer, _signCert));
-
-        gen.addCertificates(certStore);
-        gen.addCRLs(crlStore);
-        
-        CMSSignedData s = gen.generate(msg, true);
-        SignerInformation origSigner = (SignerInformation)s.getSignerInfos().getSigners().toArray()[0];
-        SignerInformationStore counterSigners1 = gen.generateCounterSigners(origSigner);
-        SignerInformationStore counterSigners2 = gen.generateCounterSigners(origSigner);
-
-        SignerInformation signer1 = SignerInformation.addCounterSigners(origSigner, counterSigners1);
-        SignerInformation signer2 = SignerInformation.addCounterSigners(signer1, counterSigners2);
-
-        SignerInformationStore cs = signer2.getCounterSignatures();
-        Collection csSigners = cs.getSigners();
-        assertEquals(2, csSigners.size());
-
-        Iterator it = csSigners.iterator();
-        while (it.hasNext())
-        {
-            SignerInformation   cSigner = (SignerInformation)it.next();
-            Collection certCollection = certStore.getMatches(cSigner.getSID());
-
-            Iterator certIt = certCollection.iterator();
-            X509CertificateHolder cert = (X509CertificateHolder)certIt.next();
-
-            assertTrue(cSigner.isCounterSignature());
-            assertNull(cSigner.getSignedAttributes().get(PKCSObjectIdentifiers.pkcs_9_at_contentType));
-            assertEquals(true, cSigner.verify(new JcaSimpleSignerInfoVerifierBuilder().setProvider(BC).build(cert)));
-        }
-    }
-
-    private void rsaPSSTest(String signatureAlgorithmName)
-        throws Exception
-    {
-        List certList = new ArrayList();
-        CMSTypedData      msg = new CMSProcessableByteArray("Hello world!".getBytes());
-
-        certList.add(_origCert);
-        certList.add(_signCert);
-
-        Store           certs = new JcaCertStore(certList);
-
-        CMSSignedDataGenerator gen = new CMSSignedDataGenerator();
-
-        ContentSigner contentSigner = new JcaContentSignerBuilder(signatureAlgorithmName).setProvider(BC).build(_origKP.getPrivate());
-
-        JcaSignerInfoGeneratorBuilder siBuilder = new JcaSignerInfoGeneratorBuilder(new JcaDigestCalculatorProviderBuilder().setProvider(BC).build());
-
-        siBuilder.setDirectSignature(true);
-
-        gen.addSignerInfoGenerator(siBuilder.build(contentSigner, _origCert));
-
-        gen.addCertificates(certs);
-
-        CMSSignedData s = gen.generate(msg, false);
-
-        //
-        // compute expected content digest
-        //
-        String digestName = signatureAlgorithmName.substring(0, signatureAlgorithmName.indexOf('w'));
-        MessageDigest md = MessageDigest.getInstance(digestName, BC);
-
-        verifySignatures(s, md.digest("Hello world!".getBytes()));
-    }
-
-    private void subjectKeyIDTest(
-        KeyPair signaturePair,
-        X509Certificate signatureCert,
-        String signatureAlgorithm)
-        throws Exception
-    {
-        List certList = new ArrayList();
-        List crlList = new ArrayList();
-        CMSTypedData      msg = new CMSProcessableByteArray("Hello World!".getBytes());
-
-        certList.add(signatureCert);
-        certList.add(_origCert);
-
-        crlList.add(_signCrl);
-
-        Store           certStore = new JcaCertStore(certList);
-        Store           crlStore = new JcaCRLStore(crlList);
-
-        CMSSignedDataGenerator gen = new CMSSignedDataGenerator();
-
-        ContentSigner contentSigner = new JcaContentSignerBuilder(signatureAlgorithm).setProvider(BC).build(signaturePair.getPrivate());
-
-        gen.addSignerInfoGenerator(new JcaSignerInfoGeneratorBuilder(new JcaDigestCalculatorProviderBuilder().setProvider(BC).build()).build(contentSigner, CMSTestUtil.createSubjectKeyId(signatureCert.getPublicKey()).getKeyIdentifier()));
-
-        gen.addCertificates(certStore);
-        gen.addCRLs(crlStore);
-
-        CMSSignedData s = gen.generate(msg, true);
-
-        assertEquals(3, s.getVersion());
-        
-        ByteArrayInputStream bIn = new ByteArrayInputStream(s.getEncoded());
-        ASN1InputStream      aIn = new ASN1InputStream(bIn);
-
-        s = new CMSSignedData(ContentInfo.getInstance(aIn.readObject()));
-
-        certStore = s.getCertificates();
-
-        SignerInformationStore  signers = s.getSignerInfos();
-        Collection c = signers.getSigners();
-        Iterator it = c.iterator();
-
-        while (it.hasNext())
-        {
-            SignerInformation   signer = (SignerInformation)it.next();
-            Collection certCollection = certStore.getMatches(signer.getSID());
-
-            Iterator certIt = certCollection.iterator();
-            X509CertificateHolder cert = (X509CertificateHolder)certIt.next();
-
-            assertEquals(true, signer.verify(new JcaSimpleSignerInfoVerifierBuilder().setProvider(BC).build(cert)));
-        }
-
-        //
-        // check for CRLs
-        //
-        Collection crls = crlStore.getMatches(null);
-
-        assertEquals(1, crls.size());
-
-        assertTrue(crls.contains(new JcaX509CRLHolder(_signCrl)));
-
-        //
-        // try using existing signer
-        //
-
-        gen = new CMSSignedDataGenerator();
-
-        gen.addSigners(s.getSignerInfos());
-
-        gen.addCertificates(s.getCertificates());
-
-        s = gen.generate(msg, true);
-
-        bIn = new ByteArrayInputStream(s.getEncoded());
-        aIn = new ASN1InputStream(bIn);
-
-        s = new CMSSignedData(ContentInfo.getInstance(aIn.readObject()));
-
-        certStore = s.getCertificates();
-
-        signers = s.getSignerInfos();
-        c = signers.getSigners();
-        it = c.iterator();
-
-        while (it.hasNext())
-        {
-            SignerInformation   signer = (SignerInformation)it.next();
-            Collection certCollection = certStore.getMatches(signer.getSID());
-
-            Iterator certIt = certCollection.iterator();
-            X509CertificateHolder cert = (X509CertificateHolder)certIt.next();
-
-            assertEquals(true, signer.verify(new JcaSimpleSignerInfoVerifierBuilder().setProvider(BC).build(cert)));
-        }
-
-        checkSignerStoreReplacement(s, signers);
-    }
-
-    private void encapsulatedTest(
-        KeyPair signaturePair,
-        X509Certificate signatureCert,
-        String signatureAlgorithm)
-        throws Exception
-    {
-        ConfigurableProvider provider = (ConfigurableProvider)Security.getProvider(BC);
-
-        if (!provider.hasAlgorithm("Signature", signatureAlgorithm))
-        {
-             return;
-        }
-
-        List certList = new ArrayList();
-        List crlList = new ArrayList();
-        CMSTypedData        msg = new CMSProcessableByteArray("Hello World!".getBytes());
-    
-        certList.add(signatureCert);
-        certList.add(_origCert);
-
-        crlList.add(_signCrl);
-
-        Store           certs = new JcaCertStore(certList);
-        Store           crlStore = new JcaCRLStore(crlList);
-
-        CMSSignedDataGenerator gen = new CMSSignedDataGenerator();
-
-        ContentSigner contentSigner = new JcaContentSignerBuilder(signatureAlgorithm).setProvider(BC).build(signaturePair.getPrivate());
-
-        gen.addSignerInfoGenerator(new JcaSignerInfoGeneratorBuilder(new JcaDigestCalculatorProviderBuilder().setProvider(BC).build()).build(contentSigner, signatureCert));
-
-        gen.addCertificates(certs);
-    
-        CMSSignedData s = gen.generate(msg, true);
-    
-        ByteArrayInputStream bIn = new ByteArrayInputStream(s.getEncoded());
-        ASN1InputStream      aIn = new ASN1InputStream(bIn);
-        
-        s = new CMSSignedData(ContentInfo.getInstance(aIn.readObject()));
-    
-        certs = s.getCertificates();
-    
-        SignerInformationStore  signers = s.getSignerInfos();
-        Collection c = signers.getSigners();
-        Iterator it = c.iterator();
-    
-        while (it.hasNext())
-        {
-            SignerInformation   signer = (SignerInformation)it.next();
-            Collection certCollection = certs.getMatches(signer.getSID());
-    
-            Iterator certIt = certCollection.iterator();
-            X509CertificateHolder cert = (X509CertificateHolder)certIt.next();
-    
-            assertEquals(true, signer.verify(new JcaSimpleSignerInfoVerifierBuilder().setProvider(BC).build(cert)));
-        }
-
-        //
-        // check for CRLs
-        //
-        Collection crls = crlStore.getMatches(null);
-
-        assertEquals(1, crls.size());
-
-        assertTrue(crls.contains(new JcaX509CRLHolder(_signCrl)));
-        
-        //
-        // try using existing signer
-        //
-        
-        gen = new CMSSignedDataGenerator();
-           
-        gen.addSigners(s.getSignerInfos());
-        
-        gen.addCertificates(s.getCertificates());
-           
-        s = gen.generate(msg, true);
-    
-        bIn = new ByteArrayInputStream(s.getEncoded());
-        aIn = new ASN1InputStream(bIn);
-    
-        s = new CMSSignedData(ContentInfo.getInstance(aIn.readObject()));
-    
-        certs = s.getCertificates();
-    
-        signers = s.getSignerInfos();
-        c = signers.getSigners();
-        it = c.iterator();
-    
-        while (it.hasNext())
-        {
-            SignerInformation   signer = (SignerInformation)it.next();
-            Collection certCollection = certs.getMatches(signer.getSID());
-    
-            Iterator certIt = certCollection.iterator();
-            X509CertificateHolder cert = (X509CertificateHolder)certIt.next();
-    
-            assertEquals(true, signer.verify(new JcaSimpleSignerInfoVerifierBuilder().setProvider(BC).build(cert)));
-        }
-        
-        checkSignerStoreReplacement(s, signers);
-    }
-
-    //
-    // signerInformation store replacement test.
-    //
-    private void checkSignerStoreReplacement(
-        CMSSignedData orig, 
-        SignerInformationStore signers) 
-        throws Exception
-    {
-        CMSSignedData s = CMSSignedData.replaceSigners(orig, signers);
-        
-        Store certs = s.getCertificates();
-        
-        signers = s.getSignerInfos();
-        Collection c = signers.getSigners();
-        Iterator it = c.iterator();
-    
-        while (it.hasNext())
-        {
-            SignerInformation   signer = (SignerInformation)it.next();
-            Collection certCollection = certs.getMatches(signer.getSID());
-    
-            Iterator certIt = certCollection.iterator();
-            X509CertificateHolder cert = (X509CertificateHolder)certIt.next();
-    
-            assertEquals(true, signer.verify(new JcaSimpleSignerInfoVerifierBuilder().setProvider(BC).build(cert)));
-        }
-    }
-    
-    public void testUnsortedAttributes()
-        throws Exception
-    {
-        CMSSignedData s = new CMSSignedData(new CMSProcessableByteArray(disorderedMessage), disorderedSet);
-
-        Store certs = s.getCertificates();
-
-        SignerInformationStore  signers = s.getSignerInfos();
-        Collection c = signers.getSigners();
-        Iterator it = c.iterator();
-
-        while (it.hasNext())
-        {
-            SignerInformation   signer = (SignerInformation)it.next();
-            Collection certCollection = certs.getMatches(signer.getSID());
-            Iterator certIt = certCollection.iterator();
-            X509CertificateHolder cert = (X509CertificateHolder)certIt.next();
-
-            assertEquals(false, signer.verify(new JcaSimpleSignerInfoVerifierBuilder().setProvider(BC).build(cert)));
-
-            RSADigestSigner sig = new RSADigestSigner(new SHA1Digest());
-
-            sig.init(false, PublicKeyFactory.createKey(cert.getSubjectPublicKeyInfo()));
-
-            byte[] encoded = signer.toASN1Structure().getAuthenticatedAttributes().getEncoded();
-            sig.update(encoded, 0, encoded.length);
-
-            assertEquals(true, sig.verifySignature(signer.getSignature()));
-        }
-    }
-    
-    public void testNullContentWithSigner()
-        throws Exception
-    {
-        List certList = new ArrayList();
-
-        certList.add(_origCert);
-        certList.add(_signCert);
-
-        Store           certs = new JcaCertStore(certList);
-
-        CMSSignedDataGenerator gen = new CMSSignedDataGenerator();
-
-        ContentSigner sha1Signer = new JcaContentSignerBuilder("SHA1withRSA").setProvider(BC).build(_origKP.getPrivate());
-
-        gen.addSignerInfoGenerator(new JcaSignerInfoGeneratorBuilder(new JcaDigestCalculatorProviderBuilder().setProvider(BC).build()).build(sha1Signer, _origCert));
-
-        gen.addCertificates(certs);
-
-        CMSSignedData s = gen.generate(new CMSAbsentContent(), false);
-
-        ByteArrayInputStream bIn = new ByteArrayInputStream(s.getEncoded());
-        ASN1InputStream      aIn = new ASN1InputStream(bIn);
-        
-        s = new CMSSignedData(ContentInfo.getInstance(aIn.readObject()));
-
-        verifySignatures(s);
-    }
-
-    public void testWithAttributeCertificate()
-        throws Exception
-    {
-        List certList = new ArrayList();
-        CMSTypedData        msg = new CMSProcessableByteArray("Hello World!".getBytes());
-
-
-        certList.add(_signDsaCert);
-
-        Store           certs = new JcaCertStore(certList);
-
-        CMSSignedDataGenerator gen = new CMSSignedDataGenerator();
-
-        JcaSignerInfoGeneratorBuilder builder = new JcaSignerInfoGeneratorBuilder(new JcaDigestCalculatorProviderBuilder().setProvider(BC).build());
-        ContentSigner sha1Signer = new JcaContentSignerBuilder("SHA1withRSA").setProvider(BC).build(_origKP.getPrivate());
-
-        gen.addSignerInfoGenerator(builder.build(sha1Signer, _origCert));
-
-        gen.addCertificates(certs);
-
-        X509AttributeCertificateHolder attrCert = new X509AttributeCertificateHolder(CMSTestUtil.getAttributeCertificate().getEncoded());
-        List attrList = new ArrayList();
-
-        attrList.add(new X509AttributeCertificateHolder(attrCert.getEncoded()));
-
-        Store store = new CollectionStore(attrList);
-
-        gen.addAttributeCertificates(store);
-
-        CMSSignedData sd = gen.generate(msg);
-
-        assertEquals(4, sd.getVersion());
-
-        store = sd.getAttributeCertificates();
-
-        Collection coll = store.getMatches(null);
-
-        assertEquals(1, coll.size());
-
-        assertTrue(coll.contains(new X509AttributeCertificateHolder(attrCert.getEncoded())));
-        
-        //
-        // create new certstore
-        //
-        certList = new ArrayList();
-        certList.add(_origCert);
-        certList.add(_signCert);
-
-        certs = new JcaCertStore(certList);
-
-
-        //
-        // replace certs
-        //
-        sd = CMSSignedData.replaceCertificatesAndCRLs(sd, certs, null, null);
-
-        verifySignatures(sd);
-    }
-
-    public void testCertStoreReplacement()
-        throws Exception
-    {
-        List certList = new ArrayList();
-        CMSTypedData msg = new CMSProcessableByteArray("Hello World!".getBytes());
-
-
-        certList.add(_signDsaCert);
-
-        Store certs = new JcaCertStore(certList);
-
-        CMSSignedDataGenerator gen = new CMSSignedDataGenerator();
-
-        ContentSigner sha1Signer = new JcaContentSignerBuilder("SHA1withRSA").setProvider(BC).build(_origKP.getPrivate());
-
-        gen.addSignerInfoGenerator(new JcaSignerInfoGeneratorBuilder(new JcaDigestCalculatorProviderBuilder().setProvider(BC).build()).build(sha1Signer, _origCert));
-
-        gen.addCertificates(certs);
-
-        CMSSignedData sd = gen.generate(msg);
-
-        //
-        // create new certstore
-        //
-        certList = new ArrayList();
-        certList.add(_origCert);
-        certList.add(_signCert);
-
-        certs = new JcaCertStore(certList);
-
-        //
-        // replace certs
-        //
-        sd = CMSSignedData.replaceCertificatesAndCRLs(sd, certs, null, null);
-
-        verifySignatures(sd);
-    }
-
-    public void testEncapsulatedCertStoreReplacement()
-        throws Exception
-    {
-        List certList = new ArrayList();
-        CMSTypedData        msg = new CMSProcessableByteArray("Hello World!".getBytes());
-
-
-        certList.add(_signDsaCert);
-
-        Store           certs = new JcaCertStore(certList);
-
-        CMSSignedDataGenerator gen = new CMSSignedDataGenerator();
-        ContentSigner sha1Signer = new JcaContentSignerBuilder("SHA1withRSA").setProvider(BC).build(_origKP.getPrivate());
-
-        gen.addSignerInfoGenerator(new JcaSignerInfoGeneratorBuilder(new JcaDigestCalculatorProviderBuilder().setProvider(BC).build()).build(sha1Signer, _origCert));
-
-        gen.addCertificates(certs);
-
-        CMSSignedData sd = gen.generate(msg, true);
-
-        //
-        // create new certstore
-        //
-        certList = new ArrayList();
-        certList.add(_origCert);
-        certList.add(_signCert);
-
-        certs = new JcaCertStore(certList);
-
-
-        //
-        // replace certs
-        //
-        sd = CMSSignedData.replaceCertificatesAndCRLs(sd, certs, null, null);
-
-        verifySignatures(sd);
-    }
-
-    public void testCertOrdering1()
-        throws Exception
-    {
-        List certList = new ArrayList();
-        CMSTypedData    msg = new CMSProcessableByteArray("Hello World!".getBytes());
-
-        certList.add(_origCert);
-        certList.add(_signCert);
-        certList.add(_signDsaCert);
-
-        Store      certs = new JcaCertStore(certList);
-
-        CMSSignedDataGenerator gen = new CMSSignedDataGenerator();
-
-        ContentSigner sha1Signer = new JcaContentSignerBuilder("SHA1withRSA").setProvider(BC).build(_origKP.getPrivate());
-
-        gen.addSignerInfoGenerator(new JcaSignerInfoGeneratorBuilder(new JcaDigestCalculatorProviderBuilder().setProvider(BC).build()).build(sha1Signer, _origCert));
-
-        gen.addCertificates(certs);
-
-        CMSSignedData sd = gen.generate(msg, true);
-
-        certs = sd.getCertificates();
-        Iterator it = certs.getMatches(null).iterator();
-
-        assertEquals(new JcaX509CertificateHolder(_origCert), it.next());
-        assertEquals(new JcaX509CertificateHolder(_signCert), it.next());
-        assertEquals(new JcaX509CertificateHolder(_signDsaCert), it.next());
-    }
-
-    public void testCertOrdering2()
-        throws Exception
-    {
-        List certList = new ArrayList();
-        CMSTypedData       msg = new CMSProcessableByteArray("Hello World!".getBytes());
-
-        certList.add(_signCert);
-        certList.add(_signDsaCert);
-        certList.add(_origCert);
-
-        Store           certs = new JcaCertStore(certList);
-
-        CMSSignedDataGenerator gen = new CMSSignedDataGenerator();
-
-        ContentSigner sha1Signer = new JcaContentSignerBuilder("SHA1withRSA").setProvider(BC).build(_origKP.getPrivate());
-
-        gen.addSignerInfoGenerator(new JcaSignerInfoGeneratorBuilder(new JcaDigestCalculatorProviderBuilder().setProvider(BC).build()).build(sha1Signer, _origCert));
-
-        gen.addCertificates(certs);
-
-        CMSSignedData sd = gen.generate(msg, true);
-
-        certs = sd.getCertificates();
-        Iterator it = certs.getMatches(null).iterator();
-
-        assertEquals(new JcaX509CertificateHolder(_signCert), it.next());
-        assertEquals(new JcaX509CertificateHolder(_signDsaCert), it.next());
-        assertEquals(new JcaX509CertificateHolder(_origCert), it.next());
-    }
-
-    public void testSignerStoreReplacement()
-        throws Exception
-    {
-        List certList = new ArrayList();
-        CMSTypedData        msg = new CMSProcessableByteArray("Hello World!".getBytes());
-
-        certList.add(_origCert);
-        certList.add(_signCert);
-
-        Store           certs = new JcaCertStore(certList);
-
-        CMSSignedDataGenerator gen = new CMSSignedDataGenerator();
-
-        ContentSigner sha1Signer = new JcaContentSignerBuilder("SHA1withRSA").setProvider(BC).build(_origKP.getPrivate());
-
-        gen.addSignerInfoGenerator(new JcaSignerInfoGeneratorBuilder(new JcaDigestCalculatorProviderBuilder().setProvider(BC).build()).build(sha1Signer, _origCert));
-
-        gen.addCertificates(certs);
-
-        CMSSignedData original = gen.generate(msg, true);
-
-        //
-        // create new Signer
-        //
-        gen = new CMSSignedDataGenerator();
-
-        ContentSigner sha224Signer = new JcaContentSignerBuilder("SHA224withRSA").setProvider(BC).build(_origKP.getPrivate());
-
-        gen.addSignerInfoGenerator(new JcaSignerInfoGeneratorBuilder(new JcaDigestCalculatorProviderBuilder().setProvider(BC).build()).build(sha224Signer, _origCert));
-
-        gen.addCertificates(certs);
-
-        CMSSignedData newSD = gen.generate(msg, true);
-
-        //
-        // replace signer
-        //
-        CMSSignedData sd = CMSSignedData.replaceSigners(original, newSD.getSignerInfos());
-
-        SignerInformation signer = (SignerInformation)sd.getSignerInfos().getSigners().iterator().next();
-
-        assertEquals(CMSAlgorithm.SHA224.getId(), signer.getDigestAlgOID());
-
-        // we use a parser here as it requires the digests to be correct in the digest set, if it
-        // isn't we'll get a NullPointerException
-        CMSSignedDataParser sp = new CMSSignedDataParser(new JcaDigestCalculatorProviderBuilder().setProvider(BC).build(), sd.getEncoded());
-
-        sp.getSignedContent().drain();
-
-        verifySignatures(sp);
-    }
-
-    public void testEncapsulatedSamples()
-        throws Exception
-    {
-        testSample("PSSSignDataSHA1Enc.sig");
-        testSample("PSSSignDataSHA256Enc.sig");
-        testSample("PSSSignDataSHA512Enc.sig");
-    }
-    
-    public void testSamples()
-        throws Exception
-    {
-        testSample("PSSSignData.data", "PSSSignDataSHA1.sig");
-        testSample("PSSSignData.data", "PSSSignDataSHA256.sig");
-        testSample("PSSSignData.data", "PSSSignDataSHA512.sig");
-    }
-
-    public void testCounterSig()
-        throws Exception
-    {
-        CMSSignedData sig = new CMSSignedData(getInput("counterSig.p7m"));
-
-        SignerInformationStore ss = sig.getSignerInfos();
-        Collection signers = ss.getSigners();
-
-        SignerInformationStore cs = ((SignerInformation)signers.iterator().next()).getCounterSignatures();
-        Collection csSigners = cs.getSigners();
-        assertEquals(1, csSigners.size());
-
-        Iterator it = csSigners.iterator();
-        while (it.hasNext())
-        {
-            SignerInformation   cSigner = (SignerInformation)it.next();
-            Collection certCollection = sig.getCertificates().getMatches(cSigner.getSID());
-
-            Iterator certIt = certCollection.iterator();
-            X509CertificateHolder cert = (X509CertificateHolder)certIt.next();
-
-            assertTrue(cSigner.isCounterSignature());
-            assertNull(cSigner.getSignedAttributes().get(PKCSObjectIdentifiers.pkcs_9_at_contentType));
-            assertEquals(true, cSigner.verify(new JcaSimpleSignerInfoVerifierBuilder().setProvider(BC).build(cert)));
-        }
-        
-        verifySignatures(sig);
-    }
-
-    private void testSample(String sigName)
-        throws Exception
-    {
-        CMSSignedData sig = new CMSSignedData(getInput(sigName));
-
-        verifySignatures(sig);
-    }
-
-    private void testSample(String messageName, String sigName)
-        throws Exception
-    {
-        CMSSignedData sig = new CMSSignedData(new CMSProcessableByteArray(getInput(messageName)), getInput(sigName));
-
-        verifySignatures(sig);
-    }
-
-    private byte[] getInput(String name)
-        throws IOException
-    {
-        return Streams.readAll(getClass().getResourceAsStream(name));
-    }
-
-    public void testForMultipleCounterSignatures()
-        throws Exception
-    {
-        CMSSignedData sd = new CMSSignedData(xtraCounterSig);
-
-        for (Iterator sI = sd.getSignerInfos().getSigners().iterator(); sI.hasNext();)
-        {
-            SignerInformation sigI = (SignerInformation)sI.next();
-
-            SignerInformationStore counter = sigI.getCounterSignatures();
-            List sigs = new ArrayList(counter.getSigners());
-
-            assertEquals(2, sigs.size());
-        }
-    }
-
-    private void verifySignatures(CMSSignedDataParser sp)
-        throws Exception
-    {
-        Store               certs = sp.getCertificates();
-        SignerInformationStore  signers = sp.getSignerInfos();
-
-        Collection c = signers.getSigners();
-        Iterator it = c.iterator();
-
-        while (it.hasNext())
-        {
-            SignerInformation   signer = (SignerInformation)it.next();
-            Collection certCollection = certs.getMatches(signer.getSID());
-
-            Iterator certIt = certCollection.iterator();
-            X509CertificateHolder cert = (X509CertificateHolder)certIt.next();
-
-            assertEquals(true, signer.verify(new JcaSimpleSignerInfoVerifierBuilder().setProvider(BC).build(cert)));
-        }
-    }
-
-    private class TestCMSSignatureAlgorithmNameGenerator
-        extends DefaultCMSSignatureAlgorithmNameGenerator
-    {
-        void setDigestAlgorithmMapping(ASN1ObjectIdentifier oid, String algName)
-        {
-            super.setSigningDigestAlgorithmMapping(oid, algName);
-        }
-
-        void setEncryptionAlgorithmMapping(ASN1ObjectIdentifier oid, String algName)
-        {
-            super.setSigningEncryptionAlgorithmMapping(oid, algName);
-        }
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cms/test/CMSSampleMessages.java b/bcpkix/src/main/java/org/bouncycastle/cms/test/CMSSampleMessages.java
deleted file mode 100644
index 20ae6ca..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cms/test/CMSSampleMessages.java
+++ /dev/null
@@ -1,147 +0,0 @@
-package org.bouncycastle.cms.test;
-
-import org.bouncycastle.util.encoders.Base64;
-
-public class CMSSampleMessages
-{
-  static byte[] originatorMessage = Base64.decode(
-            "MIIYGgYJKoZIhvcNAQcDoIIYCzCCGAcCAQKgggRJoIIERTCCBEEwggIpAgkA"
-          + "xS/+IvjTL8YwDQYJKoZIhvcNAQEFBQAwaTELMAkGA1UEBhMCVVMxGDAWBgNV"
-          + "BAoTD1UuUy4gR292ZXJubWVudDESMBAGA1UECxMJSFNQRDEyTGFiMQ8wDQYD"
-          + "VQQLEwZBZ2VudHMxGzAZBgNVBAMTEkhTUEQxMiBMYWIgQ0EgUm9vdDAeFw0w"
-          + "NzA1MTQxNzEzMzRaFw0wODA1MTMxNzEzMzRaMFwxCzAJBgNVBAYTAlVTMRgw"
-          + "FgYDVQQKEw9VLlMuIEdvdmVybm1lbnQxEjAQBgNVBAsTCUhTUEQxMkxhYjEP"
-          + "MA0GA1UECxMGQWdlbnRzMQ4wDAYDVQQDEwV1c2VyMTCCASIwDQYJKoZIhvcN"
-          + "AQEBBQADggEPADCCAQoCggEBALC54HvfpSE3yq/EkpNCkUEV6a6Df3q4k8EM"
-          + "dlg0nQSf2FgYh1GMiztw8SVjrF80l4+Hg5/FW2XN2kpVQBap/H5ziPYXenbi"
-          + "VLJHCF9LVyYDOS7xGfRtQ+ZhFUcECtaCLJsR7HIiFyKZWGg0c3bFZvFkdZqT"
-          + "8MMwjhcIVE1BptMqcGriqqMQAUKYmOguAOzMCTGAOxqBXYFmR68WtggVNMMc"
-          + "5qU6S/4OxeCmaNSPG5p7pA1o4Cnv4aJF1mAPedVPQpAS4Lu2K9nNhRkug0yd"
-          + "6nPaxgQudk5YxlreNOPKiAHApk9RhGVepGchJCFP2aIPu9tkIiSe3omezSZu"
-          + "Sy/3F5UCAwEAATANBgkqhkiG9w0BAQUFAAOCAgEAGDxqVI4aR4XNfbk2MtXF"
-          + "agNYZOswn85X84um9gG323qjYhroW0QDuy3CwtUwhH866mpnJyhJvKx3b8UE"
-          + "7pZInoNEz1UVn+wgJVXMmaG5mfp3X6z0xDAEaKmDMJXl66wlFGG1iveGgcEi"
-          + "oMkrxFJKvu/FXywzPvz2pXD9LQapogOQpVsvg/hed//wijDG94UBkhbHTZ53"
-          + "6ODKuHGmooO6bgqJxKcVyLwQAq/lXGtLqODK9BDicfUzuhLWA0si7Y1daehj"
-          + "fjgAqFGirqRtPDdk1jywoMJdDCQqocNqNGuu/+9ZoRNtY7XFbiN7h4s4KTkw"
-          + "YqCph8g+RZYJVZJDw/+qc5ymYZiufbImA08D7x7IzqX9eeuAqKCebkxcK0Dz"
-          + "eh/wT7Ff8csw0xqkkEbi5sTORogPexKGo9T1P4j/UbOyCHaIwFQVE67kYJqZ"
-          + "U3BB7mGNE/dKru7jC7Aadorpj7P/EQ8sfoq5wC9r3wfFB1f5znN9ZfXd3zSU"
-          + "Gxne2PGl3Ry4DhrhWGy/HqB+StPSkLPJL1RNtKkywtaJG1QBnrMnLNsV7T0R"
-          + "mIDn69NkDkc59LAuB7yxwBmhYA7c7cHckdX3bE7zgN6yYdiyLyXr+ZQl+3J8"
-          + "bBPN/IVSs5Wr1kK9RDrFX8MdP95LZxHlgMATwAqoEPe5r2tvvGBoajoIA2Tw"
-          + "71QxggGSMIIBjgIBADB2MGkxCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9VLlMu"
-          + "IEdvdmVybm1lbnQxEjAQBgNVBAsTCUhTUEQxMkxhYjEPMA0GA1UECxMGQWdl"
-          + "bnRzMRswGQYDVQQDExJIU1BEMTIgTGFiIENBIFJvb3QCCQDFL/4i+NMvyTAN"
-          + "BgkqhkiG9w0BAQEFAASCAQCGpoi8DBLf6I2fwqVp9MPA5M0QNRnC34AMoc7N"
-          + "/JGKM5dWcGNpN83yL9QmOfjgyxzwJ3L3e3hYdoXp9MNelzG5ssyyKw4NxRgM"
-          + "C1aRPWx1R1aKee/NAgvBjN3FyDN3Pl4ACz2EMrDMmilR0zmSJkDBVbGjxNzs"
-          + "ZPxtsBlHeLRky/K/ZrTy5jIheFcKt/0dNJiMsFh+677OlRhDihdLzYeV4RK1"
-          + "5Iy1j18ls5rJMYh1fmZOx9T6wvlpw84IjFHzUcIxIBg8t1cUkncXbg1r+rxm"
-          + "zIaalAKdYp58oMpjy9wV6E1mxgAM/lvE/jwiYP4/a6TsXTLDPNIxe9RZVdhA"
-          + "GCPvMIISHQYJKoZIhvcNAQcBMBQGCCqGSIb3DQMHBAgQBLQIaeQQMYCCEfgv"
-          + "FBzVKLnlRNCjs2JE/G8jBI8aduv6YQTYTt0ePh9JEHTmSi7ISbCDdAf5baKN"
-          + "mzVGQJj87Srz3YyEmUcozxscWnWgVWpUbx0GJkjz6LqyGLQ3VnqUDG80xnXo"
-          + "nQY5q4ko6avyMIDZ+zzI2fs9ChAlBjZ41Qb0FnwDPZBH3N43q+puVWesE4wj"
-          + "LGftt63T4k2D/qMdg7fVfHkAsXPJIxkvR4vUrGEvxTl9e24146wYgCXe+66T"
-          + "UcAMViNCMr8UiFQFQYSmuPcSTHgQHqEaBwYys6X+fe61yE16mUazs32yVH2v"
-          + "Cyf1mG4/GAaSmqR/BIU7y7trGd+g/KaT1Kp76e+Rys9G/oakoeIH3Hkgdhmc"
-          + "pFBPklIlgA57EocK5n84tFRv9n9cmsbOfy0EjEa6vU4ImMPZQS4iyhLCWD1u"
-          + "tQziu5FyHSb9COveUPuGY2iTrOWG34rHIagNndXi1OuAIGQrLjbntHmogqxb"
-          + "zkB+yojr+WBwY1efb8X+WQ2L+us9v31qNGA0wyfg4AC5FZur90rBxBq59UPz"
-          + "JAVRD6NP5FRPdxuvHclDoGBoiMr9NXO3Uv0tJuYADHlWMQnUGoPEL7UxzuPJ"
-          + "VAWuHpGiywzOcWMiFEiDSIZrv4RViIVIRhEtm2bO7Ta/AGTfvJcyb6ySexc1"
-          + "aR5TWYOjqv1NaGAVQ1vPyqazH+g17y5wnBRj2c3nSMwksn/nC60e4ax+/yaE"
-          + "Ls9Qou9a0L2IyQgDlvhBA4CcRGcHklhlzAovGBX2gWG31CK05doZhH7bRIrj"
-          + "8h1XOF2izffrfWb6LcDcZptw5BQWT5XeyoKD4eNZfJ4ww+dMw4+0MkXPZEn6"
-          + "Fqg+jam9ZioqXiw5Y6bdzxawefe6gvxeca3f53KDXEm4qFaVuDgyjNZhEmyB"
-          + "gmsWRKokQ5DDlj1PfVlO4g2Uee4zbvmr7Yx6tGnnxm6o5i/COwvvRSXp8Oj7"
-          + "Zej0ZA+1zenNRAGXwuTKrbQ9ZZYRi4LCXluuVmy8vocGm8bnuqulMyz5hsUi"
-          + "QMAl1knunhaT+/kQOLRwEdJUgfq8ME14XsTNiVq26W8n+9AsYHoFzJhFoCfe"
-          + "i2wngAs1MMnw1erfnhWibkFZDlG9/5OPBZ3ZzJfgMEdT5Fs+hJxrw7UqNMkb"
-          + "EoH+3HpzEXfcGqCL6RfdbS0hu85v1CrZv0veK8qI+rQnoqXp+xmBRiSCyWNR"
-          + "ITepXcJsi6vWYX0nvNNbBjTsFqi78BSVRpg/zOFRvw1gX1TtTXQLcEdalKgf"
-          + "tEo+An3f3GugB3CFw38IM4JwCB06vXTRQAoK4PM4uNYVXEgSPq4vg9UuHZ3n"
-          + "V5l96emGLK55N5FO6FvlHFft/7elEFglbnSzSQnzVyj36Z6P7x/Q3td5SY4J"
-          + "VAJWvR/X4Fe2G6ebIZdNSJef9UyuNPee0Fi1iJUL8L4qO61ijkjYdE3bBcGm"
-          + "61eWj8NgxtELVgRyXq1vNgMOFlVAwkf2ZNDgNRUM49UnIFTNKnTaeAVB9pW2"
-          + "DGrZER8LA8ABctAdElECceoMVRUG1uFdAicrEbBHcWJkTdjBPjumE4bE6HUm"
-          + "vbpNBC4wyoPS6CSvNut/re7I4wgZwho6C6GRUuwraxJZlS+jwEvC+F4Bzlf5"
-          + "aPygECgVaNmSGP1E/vyN2aF8CLo4NL/5o9GG8DWg9O5GdNSislr4r6ciEjCr"
-          + "0a6rk47QDn4rDQy8iu/YkZz9u8/GJCAinWQzAvV8byhZxc81CfKj9xYTclDX"
-          + "AB75blJvUQIP4U7gpWxLB/1sdN2V5f9jw+xTLSpoJ7r/tIeBygF6rFe402Sd"
-          + "840SLi8ZSufAVeHUoNNDYkA/c1b6k5FaxDtN22tYQi4y3Hs7k03mGhvvLC0l"
-          + "05fMmvtasFaW5Bupqw8E2a7wHSLmRAXrPvnrblSL/wajptKPJWDJ+oH/9d9k"
-          + "NkC4EFBpcMEfIDky4PoCtfKQBFa5LT1WDQGfcCnrC9SDfUfhfRLBOpoFmUaT"
-          + "O0xc0vI/jmDRsoBy9d42ebyGMg5uD6tTOIvszEirpMy5SYPPa64zhHcN+Pzs"
-          + "db+J6fthc3aVIoob9jdv/aRUH3gDwltSnaLUIc7CWcuHSCGyM/zQPiAzkw0z"
-          + "x6ii5fdKXsmnQn88E+YqiJTPH0fG+kkhokAGU76bQMn7fJyBeVHhF2hqSr/0"
-          + "4zCIjgq1Zb+d9sEuRZWF+/XsGl2gwk4vgHTwM+XfU7edQssUR6kyD6wkw7EU"
-          + "6HaRrflymAHTEvdAB+PaREQbyej7/2lY41qmA9df2I5Izb60NxmMFj9F4M4V"
-          + "bLJOVNX5fuc8vaIhPG82hIiqe05cnBfRhtmcUUb1WDHVH3klRkti+fHrnbAW"
-          + "TpWd5m6Wi3VssopaUozWgYVgW9M+Zr5ZUAN9H0Kb4CatxG5YFkD0MCZShGl/"
-          + "lSc1SUxho6YakBB+5HxCI853/sQ3RMgSrMk+8ftalM2+BrT+V9wMK2O+wM5W"
-          + "ujrAcM85sQ4OqSZfJ7MmKT8+pcIsRRocmlM/cxUf5hKXfXrmCR5mkf9jxF8B"
-          + "J1JOwhkD8zQP7sPUcOWEcT8ctOKPygtz6tWWQDW8ciiYULYyJA6ydGrrn6T+"
-          + "fQj8M2VsM1y4YK9dMfJUeaiP+m4BeoOjs0vqz6pBI6J3lrNz31DaNO6SApUL"
-          + "4cOx8EZMg498TG0zmQ87yVw4mGmL3JpWBZH89HiNEY5eJ0zEIS3lMaOADRMf"
-          + "kX8B5YHadeTuAEjXsGtFIlSf1xo45kwCxIfUcikdfu2rb+Bh251Im0oq/XTj"
-          + "XPeviXasfas6VsMHsmTrqynFdP8THnrmHLCoeAMvgpjirXfIdR7tULJcFJtr"
-          + "0lZLZfdZgbTsbn9GMQKwMkAAjJLfJq42usvzf4ShC7IRtvOEVAMrebaaK1YF"
-          + "rtV5z1WNo3VRFonakKj85nXLOAdCNe6T3zESebexJKFn8e/6+shp9IDIRmWr"
-          + "hiWut6KPFiSgAgfqpeIt9fuHiYeIK8DqISA7QUdAZrgPe8GlctvKkQLvjNW0"
-          + "srglx9CQuDqZC6C1BLaIs3sE//yLvEd06vDFjDa0WGKWjM/Uo29af/tlL1kC"
-          + "vDQtDPi8OPIebK8OwI2uNDZ+cnHhv3gZXCdbKkRZc1W+mrU7rUk1Fa0ViVmc"
-          + "zhVGX22fDXbIrs9zJ+sA+3Towrx2XmMZ+PDkVBxHFE2bk+GABM62BW9YZoX4"
-          + "R4U+n7E8Ec0sI8srcxEZYX8LWHh1XSU0yEHYjkIWDQUUSGpsbgqnjXJcnTdk"
-          + "KK5PLk4sthLYwT4o1Gg4lRpc4dn26bIQcpGdY5PEknItDt6IBSc6bYYYoQrl"
-          + "PIufY67haoc//d5y1LpCi5vc0wTcvbdoVepLrxVAn4MPsejbfIFJ01N0qKgv"
-          + "fGWVxmRGtGXHe3iNLsMrvSE2FkORSc4sgjC42hfxHTEVmhTnzOplxTsN/MzE"
-          + "S7ESv/c0rIen+zwXgtiFnTg1VPHcaT4z0DtLBMNjqYNoyDrIHUrWguFeV7/i"
-          + "RSP7SiztMmlfKhrxlQpaNNm/XvKa1OpKbVStHMgOdpMaaCp8WaX++wb9lG6V"
-          + "3PqBeVSCuFm1xq6KAERLUdF4XsdXNM/uUhYZX7cGIqRS3vSDJB1EfrZTpUY5"
-          + "xGllybE/P2gufnG5EMpC2FHx4iW4pWMkYhIpzKv1Tkxe3K6ISs4wEs4n/AtL"
-          + "hupMGZE9hDJ0LV0nRvRbY8YCRXoBaj6/qF1QED7CG4hx16yrkLAR7Th5rbH7"
-          + "GFEzNSq1HI0IssDIimD2ZN9Cf++uH6ZpP2JZeJ/gEqGi17ovtnuklx6dtu0l"
-          + "KL0pQjCyAoQFEFSaVJ1m4oOQJyb58lsG4gOPaPvOw1ruiJ2obt4228VR1pA8"
-          + "Vm9A41E4pk/vA+VFJ/tSmkB5s2gmBBVcA8mU8iIyzMmliTNHeg53EYAytF5M"
-          + "X2rA7Ct8ApqbrYSSBTUPC+MEBV7UajamWB6UaSUj575MhEnzm0xl/lFqU6ZF"
-          + "6w0rdey/KvTiotErOS1q8RcY2dcs9Mz8Dm/8IMBcGfny0i/KLtz0OUOLFg3P"
-          + "/VrPBt7f+YfDqLVc8AujhrxAH/hwYauJ+Q6HSVTSJI7aXB9xtdsijzMZCmnE"
-          + "1oKRBkACSWD9BGvS3hpv/VqaHWU4B2dnv2oyrIkdkgQu2OtlFxpcOkqwexIj"
-          + "ssxxOCmT6dpB8JNehjLDU8WXhtFJVFuR84V7KlyeG/s8TaZgCW6uLLVmpteE"
-          + "J15bnM9jRTW/FZiHwsjy9kVbvaAT+bbIjn5u7qdGsgAQHdeKy191ONvHIttZ"
-          + "l/qnvrygLImaTOcuMMzU/0ECNlk0QiU0YbfS/RGH2LtRzk8x3FLFVXRiNtrD"
-          + "uJuwzlP4RufuoZfJsi0rFOuxNFQ/cZEq1q7TCzqP+saRoSLFK1iRE/Ei06pS"
-          + "JH+cwHMxk3u7k4+HxF72uK9XHIgY6G6WfZTklH2w2VrsLLZLmJ9SO6Zpyt48"
-          + "KcwvEcxYoZxp1gfPYDCMHeb7oi/gRj9FjnBaNf2dW3a1RqVo5y0QeSfSH4k8"
-          + "YWX6k+Yh803ZmoIb//TEbfkbXe8XOIffbMSUuIozCQY/Rt9wAHesMWfgTuB5"
-          + "LSoa8R+mR5lIS/P1ANHdgNrh+XRFrNFeD0dCw6bdYWUXMVaZbCE8Z8pXQ0LO"
-          + "ItiPuI+w/izD/lXdKXWJJmN/bq2RJRo4WFEDe6sJH9G2Poe/T4xwTm4kX2uA"
-          + "IZkYy7bZcez8a0bFJzcsJxUbBPRq93J0fXzpvQsszbVZh94VSc9nkH4FnAxT"
-          + "Kk2bLcsXANJlw3cFO9jOygrXh6R2fyHX0E8WExb2Q7lG68wU1BJVupT8rZ0Y"
-          + "oRY6WBYG0LuZb+4VAQuI0/Are3BznsgkqudCjf+JUhu1Yefh2hblWuMPNEWb"
-          + "mOorerNiIzkrt5tjXyBj0g8w/pL//BIlkW5JerMtKTPMfZSroHw9wuAuqHqF"
-          + "2sMjsW/Lbr5b8SIdIgo3vrS6EM9MGkATfSZz4z+ZWG3EB6QqcMXCZ4N2/WWl"
-          + "EPKsIqY/509NZRzqOavcMXkOryRJ7GQpmotNbbalI6r6swRoEQ2IzK5XPCC1"
-          + "iv52YpcRaV9BDpNNByk4l3ddOiEc4dsOkHjaLNvj6Vo1pG/C1Z8VXRRY909D"
-          + "nH2+PfUL684WZ6kIPeLfqr7N3ZbNxZAVozVG+WXwBlLFT7L+axeGHOhHdH/g"
-          + "SVMSmWdRX4eNuofmpsU8f3A9aCnPGDxPnB4WKnAGw34TYZrtZ9mHcjYPsq1q"
-          + "zY6brfZD4T7tktjAlRL2PYZ15MfWVXVH1xoyjeWImTi0o4nyuy/M0HukDfwY"
-          + "l6nW77TMRiH54wdQqIZUxa32dNNhjcNslRlpOf6td3FbELqhTiaptRSuKjs9"
-          + "8evbDFK7rb7n6RSSzAwb3oU8pwr4dM8ArTVc0EqnvdSCs1tx46ckIK3AFgcd"
-          + "opmNq+Qa7qhN5Zgds3cLPIQiyDThhYGPaIgyn4j/dZb1Qwa2U7urijJrBqeS"
-          + "/kJ2rEXV9v+OX9yTYKypM05A2gOK/ESPbx24C/HmmGm/yBXBx3pABvKt41Dh"
-          + "b0syB4hYrsq0RriovGemBrNgy4tiJB5BDI9VpWFC/7LR0quFFOrxxm7YvH2h"
-          + "GkR0oUc/socA80WZx9TegdiBg9TVPbe0gZmoeQc6XLfscBol0QdZWSmLqFxf"
-          + "TFN7ksaVAUPXA9phBg/k51YmrwNvx4D/A1bBQRtQmq2N4R0j3uMkynubBEfb"
-          + "9qvQNXpdygouzKUyrN/w+7clilaq2P+R9i7rriZ1waHyjfvAdeBzQQ/pVmgh"
-          + "o8EiL/TZpIZ71sTYv28scY+V7yYgBA5S/Y4bdmvzSSoMoK8yH/LcBFJOZLQd"
-          + "YPt7uKWSwQN8iVDA6ZcsYoKuAUw3ziiRaf+GN58ihLB/y/sGmAmX2XwLsPSZ"
-          + "uQIF/gT8yXjxoyWDLXl3MUgfx+pGg5vBwAtk9a2elEQR9C3a8PPsOy3N9Jh3"
-          + "xY/A1gJ/rjuubwrb0Sd2LinzPg5uVuKR1jeMSCEebgoyBj8/t8HvknBqJkpl"
-          + "tjZ6AxGiQ8+v5jRBzYSyiTQfPMxWzdBKqUePdJcLPITf/XitegQnikgAN6bh"
-          + "kYMS2G9kXJH2CgDm9z3svmu/0Oz2XWEpVHlOjknghPlTaLRqgWoQbK5dkuiV"
-          + "k9HhGwwsgiR+");
-    
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cms/test/CMSTestSetup.java b/bcpkix/src/main/java/org/bouncycastle/cms/test/CMSTestSetup.java
deleted file mode 100644
index 5fca618..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cms/test/CMSTestSetup.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.bouncycastle.cms.test;
-
-import junit.extensions.TestSetup;
-import junit.framework.Test;
-
-import java.security.Security;
-
-class CMSTestSetup extends TestSetup
-{
-    public CMSTestSetup(Test test)
-    {
-        super(test);
-    }
-
-    protected void setUp()
-    {
-        Security.addProvider(new org.bouncycastle.jce.provider.BouncyCastleProvider());
-    }
-
-    protected void tearDown()
-    {
-        Security.removeProvider("BC");
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cms/test/CMSTestUtil.java b/bcpkix/src/main/java/org/bouncycastle/cms/test/CMSTestUtil.java
deleted file mode 100644
index 3a1517a..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cms/test/CMSTestUtil.java
+++ /dev/null
@@ -1,503 +0,0 @@
-package org.bouncycastle.cms.test;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.math.BigInteger;
-import java.security.GeneralSecurityException;
-import java.security.KeyPair;
-import java.security.KeyPairGenerator;
-import java.security.PrivateKey;
-import java.security.PublicKey;
-import java.security.SecureRandom;
-import java.security.cert.X509CRL;
-import java.security.cert.X509Certificate;
-import java.security.interfaces.RSAPublicKey;
-import java.security.spec.DSAParameterSpec;
-import java.util.Date;
-
-import javax.crypto.KeyGenerator;
-import javax.crypto.SecretKey;
-
-import org.bouncycastle.asn1.cryptopro.CryptoProObjectIdentifiers;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.asn1.pkcs.RSAESOAEPparams;
-import org.bouncycastle.asn1.x500.X500Name;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.asn1.x509.AuthorityKeyIdentifier;
-import org.bouncycastle.asn1.x509.BasicConstraints;
-import org.bouncycastle.asn1.x509.CRLReason;
-import org.bouncycastle.asn1.x509.Extension;
-import org.bouncycastle.asn1.x509.SubjectKeyIdentifier;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.bouncycastle.cert.X509AttributeCertificateHolder;
-import org.bouncycastle.cert.X509ExtensionUtils;
-import org.bouncycastle.cert.X509v1CertificateBuilder;
-import org.bouncycastle.cert.X509v2CRLBuilder;
-import org.bouncycastle.cert.X509v3CertificateBuilder;
-import org.bouncycastle.cert.jcajce.JcaX509CRLConverter;
-import org.bouncycastle.cert.jcajce.JcaX509CertificateConverter;
-import org.bouncycastle.cert.jcajce.JcaX509ExtensionUtils;
-import org.bouncycastle.cert.jcajce.JcaX509v1CertificateBuilder;
-import org.bouncycastle.cert.jcajce.JcaX509v3CertificateBuilder;
-import org.bouncycastle.jce.ECGOST3410NamedCurveTable;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.jce.spec.GOST3410ParameterSpec;
-import org.bouncycastle.operator.OperatorCreationException;
-import org.bouncycastle.operator.jcajce.JcaContentSignerBuilder;
-import org.bouncycastle.util.encoders.Base64;
-
-public class CMSTestUtil
-{
-    public static SecureRandom     rand;
-    public static KeyPairGenerator kpg;
-
-    public static KeyPairGenerator gostKpg;
-    public static KeyPairGenerator dsaKpg;
-    public static KeyPairGenerator ecGostKpg;
-    public static KeyPairGenerator ecDsaKpg;
-    public static KeyGenerator     aes192kg;
-    public static KeyGenerator     desede128kg;
-    public static KeyGenerator     desede192kg;
-    public static KeyGenerator     rc240kg;
-    public static KeyGenerator     rc264kg;
-    public static KeyGenerator     rc2128kg;
-    public static KeyGenerator     aesKg;
-    public static KeyGenerator     seedKg;
-    public static KeyGenerator     camelliaKg;
-    public static BigInteger       serialNumber;
-    
-    public static final boolean DEBUG = true;
-
-    private static byte[]  attrCert = Base64.decode(
-                "MIIHQDCCBqkCAQEwgZChgY2kgYowgYcxHDAaBgkqhkiG9w0BCQEWDW1sb3JjaEB2"
-              + "dC5lZHUxHjAcBgNVBAMTFU1hcmt1cyBMb3JjaCAobWxvcmNoKTEbMBkGA1UECxMS"
-              + "VmlyZ2luaWEgVGVjaCBVc2VyMRAwDgYDVQQLEwdDbGFzcyAyMQswCQYDVQQKEwJ2"
-              + "dDELMAkGA1UEBhMCVVMwgYmkgYYwgYMxGzAZBgkqhkiG9w0BCQEWDHNzaGFoQHZ0"
-              + "LmVkdTEbMBkGA1UEAxMSU3VtaXQgU2hhaCAoc3NoYWgpMRswGQYDVQQLExJWaXJn"
-              + "aW5pYSBUZWNoIFVzZXIxEDAOBgNVBAsTB0NsYXNzIDExCzAJBgNVBAoTAnZ0MQsw"
-              + "CQYDVQQGEwJVUzANBgkqhkiG9w0BAQQFAAIBBTAiGA8yMDAzMDcxODE2MDgwMloY"
-              + "DzIwMDMwNzI1MTYwODAyWjCCBU0wggVJBgorBgEEAbRoCAEBMYIFORaCBTU8UnVs"
-              + "ZSBSdWxlSWQ9IkZpbGUtUHJpdmlsZWdlLVJ1bGUiIEVmZmVjdD0iUGVybWl0Ij4K"
-              + "IDxUYXJnZXQ+CiAgPFN1YmplY3RzPgogICA8U3ViamVjdD4KICAgIDxTdWJqZWN0"
-              + "TWF0Y2ggTWF0Y2hJZD0idXJuOm9hc2lzOm5hbWVzOnRjOnhhY21sOjEuMDpmdW5j"
-              + "dGlvbjpzdHJpbmctZXF1YWwiPgogICAgIDxBdHRyaWJ1dGVWYWx1ZSBEYXRhVHlw"
-              + "ZT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS9YTUxTY2hlbWEjc3RyaW5nIj4KICAg"
-              + "ICAgIENOPU1hcmt1cyBMb3JjaDwvQXR0cmlidXRlVmFsdWU+CiAgICAgPFN1Ympl"
-              + "Y3RBdHRyaWJ1dGVEZXNpZ25hdG9yIEF0dHJpYnV0ZUlkPSJ1cm46b2FzaXM6bmFt"
-              + "ZXM6dGM6eGFjbWw6MS4wOnN1YmplY3Q6c3ViamVjdC1pZCIgRGF0YVR5cGU9Imh0"
-              + "dHA6Ly93d3cudzMub3JnLzIwMDEvWE1MU2NoZW1hI3N0cmluZyIgLz4gCiAgICA8"
-              + "L1N1YmplY3RNYXRjaD4KICAgPC9TdWJqZWN0PgogIDwvU3ViamVjdHM+CiAgPFJl"
-              + "c291cmNlcz4KICAgPFJlc291cmNlPgogICAgPFJlc291cmNlTWF0Y2ggTWF0Y2hJ"
-              + "ZD0idXJuOm9hc2lzOm5hbWVzOnRjOnhhY21sOjEuMDpmdW5jdGlvbjpzdHJpbmct"
-              + "ZXF1YWwiPgogICAgIDxBdHRyaWJ1dGVWYWx1ZSBEYXRhVHlwZT0iaHR0cDovL3d3"
-              + "dy53My5vcmcvMjAwMS9YTUxTY2hlbWEjYW55VVJJIj4KICAgICAgaHR0cDovL3p1"
-              + "bmkuY3MudnQuZWR1PC9BdHRyaWJ1dGVWYWx1ZT4KICAgICA8UmVzb3VyY2VBdHRy"
-              + "aWJ1dGVEZXNpZ25hdG9yIEF0dHJpYnV0ZUlkPSJ1cm46b2FzaXM6bmFtZXM6dGM6"
-              + "eGFjbWw6MS4wOnJlc291cmNlOnJlc291cmNlLWlkIiBEYXRhVHlwZT0iaHR0cDov"
-              + "L3d3dy53My5vcmcvMjAwMS9YTUxTY2hlbWEjYW55VVJJIiAvPiAKICAgIDwvUmVz"
-              + "b3VyY2VNYXRjaD4KICAgPC9SZXNvdXJjZT4KICA8L1Jlc291cmNlcz4KICA8QWN0"
-              + "aW9ucz4KICAgPEFjdGlvbj4KICAgIDxBY3Rpb25NYXRjaCBNYXRjaElkPSJ1cm46"
-              + "b2FzaXM6bmFtZXM6dGM6eGFjbWw6MS4wOmZ1bmN0aW9uOnN0cmluZy1lcXVhbCI+"
-              + "CiAgICAgPEF0dHJpYnV0ZVZhbHVlIERhdGFUeXBlPSJodHRwOi8vd3d3LnczLm9y"
-              + "Zy8yMDAxL1hNTFNjaGVtYSNzdHJpbmciPgpEZWxlZ2F0ZSBBY2Nlc3MgICAgIDwv"
-              + "QXR0cmlidXRlVmFsdWU+CgkgIDxBY3Rpb25BdHRyaWJ1dGVEZXNpZ25hdG9yIEF0"
-              + "dHJpYnV0ZUlkPSJ1cm46b2FzaXM6bmFtZXM6dGM6eGFjbWw6MS4wOmFjdGlvbjph"
-              + "Y3Rpb24taWQiIERhdGFUeXBlPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxL1hNTFNj"
-              + "aGVtYSNzdHJpbmciIC8+IAogICAgPC9BY3Rpb25NYXRjaD4KICAgPC9BY3Rpb24+"
-              + "CiAgPC9BY3Rpb25zPgogPC9UYXJnZXQ+CjwvUnVsZT4KMA0GCSqGSIb3DQEBBAUA"
-              + "A4GBAGiJSM48XsY90HlYxGmGVSmNR6ZW2As+bot3KAfiCIkUIOAqhcphBS23egTr"
-              + "6asYwy151HshbPNYz+Cgeqs45KkVzh7bL/0e1r8sDVIaaGIkjHK3CqBABnfSayr3"
-              + "Rd1yBoDdEv8Qb+3eEPH6ab9021AsLEnJ6LWTmybbOpMNZ3tv");
-    
-    static
-    {
-        try
-        {
-            java.security.Security.addProvider(new BouncyCastleProvider());
-
-            rand = new SecureRandom();
-
-            kpg  = KeyPairGenerator.getInstance("RSA", "BC");
-            kpg.initialize(1024, rand);
-
-            kpg  = KeyPairGenerator.getInstance("RSA", "BC");
-            kpg.initialize(1024, rand);
-
-            gostKpg  = KeyPairGenerator.getInstance("GOST3410", "BC");
-            GOST3410ParameterSpec gost3410P = new GOST3410ParameterSpec(CryptoProObjectIdentifiers.gostR3410_94_CryptoPro_A.getId());
-            
-            gostKpg.initialize(gost3410P, new SecureRandom());
-            
-            dsaKpg = KeyPairGenerator.getInstance("DSA", "BC");
-            DSAParameterSpec dsaSpec = new DSAParameterSpec(
-                        new BigInteger("7434410770759874867539421675728577177024889699586189000788950934679315164676852047058354758883833299702695428196962057871264685291775577130504050839126673"),
-                        new BigInteger("1138656671590261728308283492178581223478058193247"),
-                        new BigInteger("4182906737723181805517018315469082619513954319976782448649747742951189003482834321192692620856488639629011570381138542789803819092529658402611668375788410"));
-
-            dsaKpg.initialize(dsaSpec, new SecureRandom());
-
-            ecGostKpg = KeyPairGenerator.getInstance("ECGOST3410", "BC");
-            ecGostKpg.initialize(ECGOST3410NamedCurveTable.getParameterSpec("GostR3410-2001-CryptoPro-A"), new SecureRandom());
-
-            ecDsaKpg = KeyPairGenerator.getInstance("ECDSA", "BC");
-            ecDsaKpg.initialize(239, new SecureRandom());
-
-            aes192kg = KeyGenerator.getInstance("AES", "BC");
-            aes192kg.init(192, rand);
-
-            desede128kg = KeyGenerator.getInstance("DESEDE", "BC");
-            desede128kg.init(112, rand);
-
-            desede192kg = KeyGenerator.getInstance("DESEDE", "BC");
-            desede192kg.init(168, rand);
-
-            rc240kg = KeyGenerator.getInstance("RC2", "BC");
-            rc240kg.init(40, rand);
-            
-            rc264kg = KeyGenerator.getInstance("RC2", "BC");
-            rc264kg.init(64, rand);
-            
-            rc2128kg = KeyGenerator.getInstance("RC2", "BC");
-            rc2128kg.init(128, rand);
-
-            aesKg = KeyGenerator.getInstance("AES", "BC");
-
-            seedKg = KeyGenerator.getInstance("SEED", "BC");
-
-            camelliaKg = KeyGenerator.getInstance("Camellia", "BC");
-            
-            serialNumber = new BigInteger("1");
-        }
-        catch (Exception ex)
-        {
-            throw new RuntimeException(ex.toString());
-        }
-    }
-    
-    public static String dumpBase64(
-        byte[]  data)
-    {
-        StringBuffer    buf = new StringBuffer();
-        
-        data = Base64.encode(data);
-        
-        for (int i = 0; i < data.length; i += 64)
-        {
-            if (i + 64 < data.length)
-            {
-                buf.append(new String(data, i, 64));
-            }
-            else
-            {
-                buf.append(new String(data, i, data.length - i));
-            }
-            buf.append('\n');
-        }
-        
-        return buf.toString();
-    }
-
-    public static X509AttributeCertificateHolder getAttributeCertificate()
-        throws Exception
-    {
-        return  new X509AttributeCertificateHolder(CMSTestUtil.attrCert);
-    }
-
-    public static KeyPair makeKeyPair()
-    {
-        return kpg.generateKeyPair();
-    }
-
-    public static KeyPair makeGostKeyPair()
-    {
-        return gostKpg.generateKeyPair();
-    }
-
-    public static KeyPair makeDsaKeyPair()
-    {
-        return dsaKpg.generateKeyPair();
-    }
-    
-    public static KeyPair makeEcDsaKeyPair()
-    {
-        return ecDsaKpg.generateKeyPair();
-    }
-
-    public static KeyPair makeEcGostKeyPair()
-    {
-        return ecGostKpg.generateKeyPair();
-    }
-
-    public static SecretKey makeDesede128Key()
-    {
-        return desede128kg.generateKey();
-    }
-
-    public static SecretKey makeAES192Key()
-    {
-        return aes192kg.generateKey();
-    }
-
-    public static SecretKey makeDesede192Key()
-    {
-        return desede192kg.generateKey();
-    }
-
-    public static SecretKey makeRC240Key()
-    {
-        return rc240kg.generateKey();
-    }
-
-    public static SecretKey makeRC264Key()
-    {
-        return rc264kg.generateKey();
-    }
-
-    public static SecretKey makeRC2128Key()
-    {
-        return rc2128kg.generateKey();
-    }
-
-    public static SecretKey makeSEEDKey()
-    {
-        return seedKg.generateKey();
-    }
-
-    public static SecretKey makeAESKey(int keySize)
-    {
-        aesKg.init(keySize);
-        return aesKg.generateKey();
-    }
-
-    public static SecretKey makeCamelliaKey(int keySize)
-    {
-        camelliaKg.init(keySize);
-        return camelliaKg.generateKey();
-    }
-
-    public static X509Certificate makeCertificate(KeyPair _subKP,
-            String _subDN, KeyPair _issKP, String _issDN)
-        throws GeneralSecurityException, IOException, OperatorCreationException
-    {
-        return makeCertificate(_subKP, _subDN, _issKP, _issDN, false);
-    }
-
-    public static X509Certificate makeOaepCertificate(KeyPair _subKP,
-            String _subDN, KeyPair _issKP, String _issDN)
-        throws GeneralSecurityException, IOException, OperatorCreationException
-    {
-        return makeOaepCertificate(_subKP, _subDN, _issKP, _issDN, false);
-    }
-
-    public static X509Certificate makeCACertificate(KeyPair _subKP,
-            String _subDN, KeyPair _issKP, String _issDN)
-        throws GeneralSecurityException, IOException, OperatorCreationException
-    {
-        return makeCertificate(_subKP, _subDN, _issKP, _issDN, true);
-    }
-
-    public static X509Certificate makeV1Certificate(KeyPair subKP, String _subDN, KeyPair issKP, String _issDN)
-        throws GeneralSecurityException, IOException, OperatorCreationException
-    {
-
-        PublicKey  subPub  = subKP.getPublic();
-        PrivateKey issPriv = issKP.getPrivate();
-        PublicKey  issPub  = issKP.getPublic();
-
-        X509v1CertificateBuilder v1CertGen = new JcaX509v1CertificateBuilder(
-            new X500Name(_issDN),
-            allocateSerialNumber(),
-            new Date(System.currentTimeMillis()),
-            new Date(System.currentTimeMillis() + (1000L * 60 * 60 * 24 * 100)),
-            new X500Name(_subDN),
-            subPub);
-
-        JcaContentSignerBuilder contentSignerBuilder = makeContentSignerBuilder(issPub);
-
-        X509Certificate _cert = new JcaX509CertificateConverter().setProvider("BC").getCertificate(v1CertGen.build(contentSignerBuilder.build(issPriv)));
-
-        _cert.checkValidity(new Date());
-        _cert.verify(issPub);
-
-        return _cert;
-    }
-
-    public static X509Certificate makeCertificate(KeyPair subKP, String _subDN, KeyPair issKP, String _issDN, boolean _ca)
-        throws GeneralSecurityException, IOException, OperatorCreationException
-    {
-
-        PublicKey  subPub  = subKP.getPublic();
-        PrivateKey issPriv = issKP.getPrivate();
-        PublicKey  issPub  = issKP.getPublic();
-        
-        X509v3CertificateBuilder v3CertGen = new JcaX509v3CertificateBuilder(
-            new X500Name(_issDN),
-            allocateSerialNumber(),
-            new Date(System.currentTimeMillis()),
-            new Date(System.currentTimeMillis() + (1000L * 60 * 60 * 24 * 100)),
-            new X500Name(_subDN),
-            subPub);
-
-        JcaContentSignerBuilder contentSignerBuilder = makeContentSignerBuilder(issPub);
-
-        v3CertGen.addExtension(
-            Extension.subjectKeyIdentifier,
-            false,
-            createSubjectKeyId(subPub));
-
-        v3CertGen.addExtension(
-            Extension.authorityKeyIdentifier,
-            false,
-            createAuthorityKeyId(issPub));
-
-        v3CertGen.addExtension(
-            Extension.basicConstraints,
-            false,
-            new BasicConstraints(_ca));
-
-        X509Certificate _cert = new JcaX509CertificateConverter().setProvider("BC").getCertificate(v3CertGen.build(contentSignerBuilder.build(issPriv)));
-
-        _cert.checkValidity(new Date());
-        _cert.verify(issPub);
-
-        return _cert;
-    }
-
-    public static X509Certificate makeOaepCertificate(KeyPair subKP, String _subDN, KeyPair issKP, String _issDN, boolean _ca)
-        throws GeneralSecurityException, IOException, OperatorCreationException
-    {
-
-        SubjectPublicKeyInfo  subPub  = SubjectPublicKeyInfo.getInstance(subKP.getPublic().getEncoded());
-        PrivateKey issPriv = issKP.getPrivate();
-        PublicKey  issPub  = issKP.getPublic();
-
-        X509v3CertificateBuilder v3CertGen = new X509v3CertificateBuilder(
-            new X500Name(_issDN),
-            allocateSerialNumber(),
-            new Date(System.currentTimeMillis()),
-            new Date(System.currentTimeMillis() + (1000L * 60 * 60 * 24 * 100)),
-            new X500Name(_subDN),
-            new SubjectPublicKeyInfo(new AlgorithmIdentifier(PKCSObjectIdentifiers.id_RSAES_OAEP, new RSAESOAEPparams()), subPub.parsePublicKey()));
-
-        JcaContentSignerBuilder contentSignerBuilder = makeContentSignerBuilder(issPub);
-
-        v3CertGen.addExtension(
-            Extension.subjectKeyIdentifier,
-            false,
-            createSubjectKeyId(subPub));
-
-        v3CertGen.addExtension(
-            Extension.authorityKeyIdentifier,
-            false,
-            createAuthorityKeyId(issPub));
-
-        v3CertGen.addExtension(
-            Extension.basicConstraints,
-            false,
-            new BasicConstraints(_ca));
-
-        X509Certificate _cert = new JcaX509CertificateConverter().setProvider("BC").getCertificate(v3CertGen.build(contentSignerBuilder.build(issPriv)));
-
-        _cert.checkValidity(new Date());
-        _cert.verify(issPub);
-
-        return _cert;
-    }
-
-    private static JcaContentSignerBuilder makeContentSignerBuilder(PublicKey issPub)
-    {
-        JcaContentSignerBuilder contentSignerBuilder;
-        if (issPub instanceof RSAPublicKey)
-        {
-            contentSignerBuilder = new JcaContentSignerBuilder("SHA1WithRSA");
-        }
-        else if (issPub.getAlgorithm().equals("DSA"))
-        {
-            contentSignerBuilder = new JcaContentSignerBuilder("SHA1withDSA");
-        }
-        else if (issPub.getAlgorithm().equals("ECDSA"))
-        {
-            contentSignerBuilder = new JcaContentSignerBuilder("SHA1withECDSA");
-        }
-        else if (issPub.getAlgorithm().equals("ECGOST3410"))
-        {
-            contentSignerBuilder = new JcaContentSignerBuilder("GOST3411withECGOST3410");
-        }
-        else
-        {
-            contentSignerBuilder = new JcaContentSignerBuilder("GOST3411WithGOST3410");
-        }
-
-        contentSignerBuilder.setProvider(BouncyCastleProvider.PROVIDER_NAME);
-
-        return contentSignerBuilder;
-    }
-
-    public static X509CRL makeCrl(KeyPair pair)
-        throws Exception
-    {
-        Date                 now = new Date();
-        X509v2CRLBuilder crlGen = new X509v2CRLBuilder(new X500Name("CN=Test CA"), now);
-        JcaX509ExtensionUtils extensionUtils = new JcaX509ExtensionUtils();
-
-        crlGen.setNextUpdate(new Date(now.getTime() + 100000));
-
-        crlGen.addCRLEntry(BigInteger.ONE, now, CRLReason.privilegeWithdrawn);
-
-        crlGen.addExtension(Extension.authorityKeyIdentifier, false, extensionUtils.createAuthorityKeyIdentifier(pair.getPublic()));
-
-        return new JcaX509CRLConverter().setProvider("BC").getCRL(crlGen.build(new JcaContentSignerBuilder("SHA256WithRSAEncryption").setProvider("BC").build(pair.getPrivate())));
-    }
-
-    /*  
-     *  
-     *  INTERNAL METHODS
-     *  
-     */ 
-
-    private static final X509ExtensionUtils extUtils = new X509ExtensionUtils(new SHA1DigestCalculator());
-
-    private static AuthorityKeyIdentifier createAuthorityKeyId(
-        PublicKey _pubKey)
-        throws IOException
-    {
-        return extUtils.createAuthorityKeyIdentifier(SubjectPublicKeyInfo.getInstance(_pubKey.getEncoded()));
-    }
-
-    static SubjectKeyIdentifier createSubjectKeyId(
-        SubjectPublicKeyInfo _pubKey)
-        throws IOException
-    {
-        return extUtils.createSubjectKeyIdentifier(_pubKey);
-    }
-
-    static SubjectKeyIdentifier createSubjectKeyId(
-        PublicKey _pubKey)
-        throws IOException
-    {
-        return extUtils.createSubjectKeyIdentifier(SubjectPublicKeyInfo.getInstance(_pubKey.getEncoded()));
-    }
-
-    private static BigInteger allocateSerialNumber()
-    {
-        BigInteger _tmp = serialNumber;
-        serialNumber = serialNumber.add(BigInteger.ONE);
-        return _tmp;
-    }
-    
-    public static byte[] streamToByteArray(
-        InputStream in) 
-        throws IOException
-    {
-        ByteArrayOutputStream bOut = new ByteArrayOutputStream();
-        int ch;
-        
-        while ((ch = in.read()) >= 0)
-        {
-            bOut.write(ch);
-        }
-        
-        return bOut.toByteArray();
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cms/test/ConverterTest.java b/bcpkix/src/main/java/org/bouncycastle/cms/test/ConverterTest.java
deleted file mode 100644
index 534d0dd..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cms/test/ConverterTest.java
+++ /dev/null
@@ -1,111 +0,0 @@
-package org.bouncycastle.cms.test;
-
-import java.math.BigInteger;
-import java.security.cert.X509CertSelector;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import org.bouncycastle.asn1.DEROctetString;
-import org.bouncycastle.asn1.x500.X500Name;
-import org.bouncycastle.cms.KeyTransRecipientId;
-import org.bouncycastle.cms.SignerId;
-import org.bouncycastle.cms.jcajce.JcaSelectorConverter;
-import org.bouncycastle.cms.jcajce.JcaX509CertSelectorConverter;
-import org.bouncycastle.util.Arrays;
-
-public class ConverterTest
-    extends TestCase
-{
-    public void testSignerIdConversion()
-        throws Exception
-    {
-        JcaX509CertSelectorConverter converter = new JcaX509CertSelectorConverter();
-        JcaSelectorConverter toSelector = new JcaSelectorConverter();
-
-        SignerId sid1 = new SignerId(new X500Name("CN=Test"), BigInteger.valueOf(1), new byte[20]);
-
-        X509CertSelector conv = converter.getCertSelector(sid1);
-
-        assertTrue(conv.getIssuerAsString().equals("CN=Test"));
-        assertTrue(Arrays.areEqual(conv.getSubjectKeyIdentifier(), new DEROctetString(new byte[20]).getEncoded()));
-        assertEquals(conv.getSerialNumber(), sid1.getSerialNumber());
-
-        SignerId sid2 = toSelector.getSignerId(conv);
-
-        assertEquals(sid1, sid2);
-
-        sid1 = new SignerId(new X500Name("CN=Test"), BigInteger.valueOf(1));
-
-        conv = converter.getCertSelector(sid1);
-
-        assertTrue(conv.getIssuerAsString().equals("CN=Test"));
-        assertNull(conv.getSubjectKeyIdentifier());
-        assertEquals(conv.getSerialNumber(), sid1.getSerialNumber());
-
-        sid2 = toSelector.getSignerId(conv);
-
-        assertEquals(sid1, sid2);
-
-        sid1 = new SignerId(new byte[20]);
-
-        conv = converter.getCertSelector(sid1);
-
-        assertNull(conv.getIssuerAsString());
-        assertTrue(Arrays.areEqual(conv.getSubjectKeyIdentifier(), new DEROctetString(new byte[20]).getEncoded()));
-        assertNull(conv.getSerialNumber());
-
-        sid2 = toSelector.getSignerId(conv);
-
-        assertEquals(sid1, sid2);
-    }
-
-    public void testRecipientIdConversion()
-        throws Exception
-    {
-        JcaX509CertSelectorConverter converter = new JcaX509CertSelectorConverter();
-        JcaSelectorConverter toSelector = new JcaSelectorConverter();
-
-        KeyTransRecipientId ktid1 = new KeyTransRecipientId(new X500Name("CN=Test"), BigInteger.valueOf(1), new byte[20]);
-
-        X509CertSelector conv = converter.getCertSelector(ktid1);
-
-        assertTrue(conv.getIssuerAsString().equals("CN=Test"));
-        assertTrue(Arrays.areEqual(conv.getSubjectKeyIdentifier(), new DEROctetString(new byte[20]).getEncoded()));
-        assertEquals(conv.getSerialNumber(), ktid1.getSerialNumber());
-
-        KeyTransRecipientId ktid2 = toSelector.getKeyTransRecipientId(conv);
-
-        assertEquals(ktid1, ktid2);
-
-        ktid1 = new KeyTransRecipientId(new X500Name("CN=Test"), BigInteger.valueOf(1));
-
-        conv = converter.getCertSelector(ktid1);
-
-        assertTrue(conv.getIssuerAsString().equals("CN=Test"));
-        assertNull(conv.getSubjectKeyIdentifier());
-        assertEquals(conv.getSerialNumber(), ktid1.getSerialNumber());
-
-        ktid2 = toSelector.getKeyTransRecipientId(conv);
-
-        assertEquals(ktid1, ktid2);
-
-        ktid1 = new KeyTransRecipientId(new byte[20]);
-
-        conv = converter.getCertSelector(ktid1);
-
-        assertNull(conv.getIssuerAsString());
-        assertTrue(Arrays.areEqual(conv.getSubjectKeyIdentifier(), new DEROctetString(new byte[20]).getEncoded()));
-        assertNull(conv.getSerialNumber());
-
-        ktid2 = toSelector.getKeyTransRecipientId(conv);
-
-        assertEquals(ktid1, ktid2);
-    }
-
-    public static Test suite()
-        throws Exception
-    {
-        return new TestSuite(ConverterTest.class);
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cms/test/MiscDataStreamTest.java b/bcpkix/src/main/java/org/bouncycastle/cms/test/MiscDataStreamTest.java
deleted file mode 100644
index bc633dd..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cms/test/MiscDataStreamTest.java
+++ /dev/null
@@ -1,265 +0,0 @@
-package org.bouncycastle.cms.test;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.OutputStream;
-import java.security.KeyPair;
-import java.security.MessageDigest;
-import java.security.Security;
-import java.security.cert.X509CRL;
-import java.security.cert.X509Certificate;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import org.bouncycastle.cert.X509CertificateHolder;
-import org.bouncycastle.cert.jcajce.JcaCRLStore;
-import org.bouncycastle.cert.jcajce.JcaCertStore;
-import org.bouncycastle.cms.CMSCompressedDataStreamGenerator;
-import org.bouncycastle.cms.CMSDigestedData;
-import org.bouncycastle.cms.CMSSignedDataParser;
-import org.bouncycastle.cms.CMSSignedDataStreamGenerator;
-import org.bouncycastle.cms.CMSTypedStream;
-import org.bouncycastle.cms.SignerInformation;
-import org.bouncycastle.cms.SignerInformationStore;
-import org.bouncycastle.cms.jcajce.JcaSignerInfoVerifierBuilder;
-import org.bouncycastle.cms.jcajce.JcaSimpleSignerInfoGeneratorBuilder;
-import org.bouncycastle.cms.jcajce.JcaX509CertSelectorConverter;
-import org.bouncycastle.cms.jcajce.ZlibCompressor;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.operator.DigestCalculatorProvider;
-import org.bouncycastle.operator.OperatorCreationException;
-import org.bouncycastle.operator.jcajce.JcaDigestCalculatorProviderBuilder;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.Store;
-import org.bouncycastle.util.encoders.Base64;
-
-public class MiscDataStreamTest
-    extends TestCase
-{
-    private static final String BC = BouncyCastleProvider.PROVIDER_NAME;
-
-    private static byte[] data = Base64.decode(
-        "TUlNRS1WZXJzaW9uOiAxLjAKQ29udGVudC1UeXBlOiBhcHBsaWNhdGlvbi9v" +
-        "Y3RldC1zdHJlYW0KQ29udGVudC1UcmFuc2Zlci1FbmNvZGluZzogYmluYXJ5" +
-        "CkNvbnRlbnQtRGlzcG9zaXRpb246IGF0dGFjaG1lbnQ7IGZpbGVuYW1lPWRv" +
-        "Yy5iaW4KClRoaXMgaXMgYSB2ZXJ5IGh1Z2Ugc2VjcmV0LCBtYWRlIHdpdGgg" +
-        "b3BlbnNzbAoKCgo=");
-
-    private static byte[] digestedData = Base64.decode(
-        "MIIBGAYJKoZIhvcNAQcFoIIBCTCCAQUCAQAwCwYJYIZIAWUDBAIBMIHQBgkq"
-      + "hkiG9w0BBwGggcIEgb9NSU1FLVZlcnNpb246IDEuMApDb250ZW50LVR5cGU6"
-      + "IGFwcGxpY2F0aW9uL29jdGV0LXN0cmVhbQpDb250ZW50LVRyYW5zZmVyLUVu"
-      + "Y29kaW5nOiBiaW5hcnkKQ29udGVudC1EaXNwb3NpdGlvbjogYXR0YWNobWVu"
-      + "dDsgZmlsZW5hbWU9ZG9jLmJpbgoKVGhpcyBpcyBhIHZlcnkgaHVnZSBzZWNy"
-      + "ZXQsIG1hZGUgd2l0aCBvcGVuc3NsCgoKCgQgHLG72tSYW0LgcxOA474iwdCv"
-      + "KyhnaV4RloWTAvkq+do=");
-
-    private static final String TEST_MESSAGE = "Hello World!";
-    private static String          _signDN;
-    private static KeyPair         _signKP;
-    private static X509Certificate _signCert;
-
-    private static String          _origDN;
-    private static KeyPair         _origKP;
-    private static X509Certificate _origCert;
-
-    private static String          _reciDN;
-    private static KeyPair         _reciKP;
-    private static X509Certificate _reciCert;
-
-    private static KeyPair         _origDsaKP;
-    private static X509Certificate _origDsaCert;
-
-    private static X509CRL         _signCrl;
-    private static X509CRL         _origCrl;
-
-    private static boolean         _initialised = false;
-
-    private static final JcaX509CertSelectorConverter selectorConverter = new JcaX509CertSelectorConverter();
-
-    private static final DigestCalculatorProvider digCalcProv;
-
-    static
-    {
-        try
-        {
-            digCalcProv =  new JcaDigestCalculatorProviderBuilder().build();
-        }
-        catch (OperatorCreationException e)
-        {
-            throw new IllegalStateException("can't create default provider!!!");
-        }
-    }
-
-    public MiscDataStreamTest(String name)
-    {
-        super(name);
-    }
-
-    private static void init()
-        throws Exception
-    {
-        if (!_initialised)
-        {
-            _initialised = true;
-            Security.addProvider(new org.bouncycastle.jce.provider.BouncyCastleProvider());
-
-            _signDN   = "O=Bouncy Castle, C=AU";
-            _signKP   = CMSTestUtil.makeKeyPair();
-            _signCert = CMSTestUtil.makeCertificate(_signKP, _signDN, _signKP, _signDN);
-
-            _origDN   = "CN=Bob, OU=Sales, O=Bouncy Castle, C=AU";
-            _origKP   = CMSTestUtil.makeKeyPair();
-            _origCert = CMSTestUtil.makeCertificate(_origKP, _origDN, _signKP, _signDN);
-
-            _origDsaKP   = CMSTestUtil.makeDsaKeyPair();
-            _origDsaCert = CMSTestUtil.makeCertificate(_origDsaKP, _origDN, _signKP, _signDN);
-
-            _reciDN   = "CN=Doug, OU=Sales, O=Bouncy Castle, C=AU";
-            _reciKP   = CMSTestUtil.makeKeyPair();
-            _reciCert = CMSTestUtil.makeCertificate(_reciKP, _reciDN, _signKP, _signDN);
-
-            _signCrl  = CMSTestUtil.makeCrl(_signKP);
-            _origCrl  = CMSTestUtil.makeCrl(_origKP);
-        }
-    }
-
-    private void verifySignatures(CMSSignedDataParser sp, byte[] contentDigest)
-        throws Exception
-    {
-        Store                   certStore = sp.getCertificates();
-        SignerInformationStore  signers = sp.getSignerInfos();
-
-        Collection              c = signers.getSigners();
-        Iterator                it = c.iterator();
-
-        while (it.hasNext())
-        {
-            SignerInformation   signer = (SignerInformation)it.next();
-            Collection          certCollection = certStore.getMatches(signer.getSID());
-
-            Iterator        certIt = certCollection.iterator();
-            X509CertificateHolder cert = (X509CertificateHolder)certIt.next();
-
-            assertEquals(true, signer.verify(new JcaSignerInfoVerifierBuilder(digCalcProv).setProvider(BC).build(cert)));
-
-            if (contentDigest != null)
-            {
-                assertTrue(MessageDigest.isEqual(contentDigest, signer.getContentDigest()));
-            }
-        }
-    }
-
-    private void verifySignatures(CMSSignedDataParser sp)
-        throws Exception
-    {
-        verifySignatures(sp, null);
-    }
-
-    private void verifyEncodedData(ByteArrayOutputStream bOut)
-        throws Exception
-    {
-        CMSSignedDataParser sp;
-        sp = new CMSSignedDataParser(digCalcProv, bOut.toByteArray());
-
-        sp.getSignedContent().drain();
-
-        verifySignatures(sp);
-
-        sp.close();
-    }
-
-    private void checkSigParseable(byte[] sig)
-        throws Exception
-    {
-        CMSSignedDataParser sp = new CMSSignedDataParser(digCalcProv, sig);
-        sp.getVersion();
-        CMSTypedStream sc = sp.getSignedContent();
-        if (sc != null)
-        {
-            sc.drain();
-        }
-        sp.getCertificates();
-        sp.getSignerInfos();
-        sp.close();
-    }
-
-    public void testSHA1WithRSA()
-        throws Exception
-    {
-        List                  certList = new ArrayList();
-        List                  crlList = new ArrayList();
-        ByteArrayOutputStream bOut = new ByteArrayOutputStream();
-
-        certList.add(_origCert);
-        certList.add(_signCert);
-
-        crlList.add(_signCrl);
-        crlList.add(_origCrl);
-
-        CMSSignedDataStreamGenerator gen = new CMSSignedDataStreamGenerator();
-
-        gen.addSignerInfoGenerator(new JcaSimpleSignerInfoGeneratorBuilder().setProvider(BC).build("SHA1withRSA", _origKP.getPrivate(), _origCert));
-
-        gen.addCertificates(new JcaCertStore(certList));
-        gen.addCRLs(new JcaCRLStore(crlList));
-
-        OutputStream sigOut = gen.open(bOut);
-
-        CMSCompressedDataStreamGenerator cGen = new CMSCompressedDataStreamGenerator();
-
-        OutputStream cOut = cGen.open(sigOut, new ZlibCompressor());
-
-        cOut.write(TEST_MESSAGE.getBytes());
-
-        cOut.close();
-
-        sigOut.close();
-
-        checkSigParseable(bOut.toByteArray());
-
-        // generate compressed stream
-        ByteArrayOutputStream cDataOut = new ByteArrayOutputStream();
-        
-        cOut = cGen.open(cDataOut, new ZlibCompressor());
-
-        cOut.write(TEST_MESSAGE.getBytes());
-
-        cOut.close();
-
-        CMSSignedDataParser     sp = new CMSSignedDataParser(digCalcProv,
-                new CMSTypedStream(new ByteArrayInputStream(cDataOut.toByteArray())), bOut.toByteArray());
-
-        sp.getSignedContent().drain();
-
-        //
-        // compute expected content digest
-        //
-        MessageDigest md = MessageDigest.getInstance("SHA1", BC);
-
-        verifySignatures(sp, md.digest(cDataOut.toByteArray()));
-    }
-
-    public void testDigestedData()
-        throws Exception
-    {
-        CMSDigestedData digData = new CMSDigestedData(digestedData);
-
-        assertTrue(Arrays.areEqual(data, (byte[])digData.getDigestedContent().getContent()));
-
-        assertTrue(digData.verify(new JcaDigestCalculatorProviderBuilder().setProvider(BC).build()));
-    }
-
-    public static Test suite()
-        throws Exception
-    {
-        init();
-
-        return new CMSTestSetup(new TestSuite(MiscDataStreamTest.class));
-    }
-}
\ No newline at end of file
diff --git a/bcpkix/src/main/java/org/bouncycastle/cms/test/NewAuthenticatedDataStreamTest.java b/bcpkix/src/main/java/org/bouncycastle/cms/test/NewAuthenticatedDataStreamTest.java
deleted file mode 100644
index b260bcb..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cms/test/NewAuthenticatedDataStreamTest.java
+++ /dev/null
@@ -1,251 +0,0 @@
-package org.bouncycastle.cms.test;
-
-import java.io.ByteArrayOutputStream;
-import java.io.OutputStream;
-import java.security.KeyPair;
-import java.security.Security;
-import java.security.cert.X509Certificate;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Iterator;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.oiw.OIWObjectIdentifiers;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.cert.X509CertificateHolder;
-import org.bouncycastle.cms.CMSAlgorithm;
-import org.bouncycastle.cms.CMSAuthenticatedDataParser;
-import org.bouncycastle.cms.CMSAuthenticatedDataStreamGenerator;
-import org.bouncycastle.cms.OriginatorInfoGenerator;
-import org.bouncycastle.cms.RecipientInformation;
-import org.bouncycastle.cms.RecipientInformationStore;
-import org.bouncycastle.cms.jcajce.JceCMSMacCalculatorBuilder;
-import org.bouncycastle.cms.jcajce.JceKeyTransAuthenticatedRecipient;
-import org.bouncycastle.cms.jcajce.JceKeyTransRecipientInfoGenerator;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.operator.DigestCalculatorProvider;
-import org.bouncycastle.operator.jcajce.JcaDigestCalculatorProviderBuilder;
-
-public class NewAuthenticatedDataStreamTest
-    extends TestCase
-{
-    private static final String BC = BouncyCastleProvider.PROVIDER_NAME;
-
-    private static String          _signDN;
-    private static KeyPair _signKP;
-    private static X509Certificate _signCert;
-
-    private static String          _origDN;
-    private static KeyPair         _origKP;
-    private static X509Certificate _origCert;
-
-    private static String          _reciDN;
-    private static KeyPair         _reciKP;
-    private static X509Certificate _reciCert;
-
-    private static KeyPair         _origEcKP;
-    private static KeyPair         _reciEcKP;
-    private static X509Certificate _reciEcCert;
-
-    private static boolean         _initialised = false;
-
-    public boolean DEBUG = true;
-
-    private static void init()
-        throws Exception
-    {
-        if (!_initialised)
-        {
-            _initialised = true;
-            Security.addProvider(new org.bouncycastle.jce.provider.BouncyCastleProvider());
-
-            _signDN   = "O=Bouncy Castle, C=AU";
-            _signKP   = CMSTestUtil.makeKeyPair();
-            _signCert = CMSTestUtil.makeCertificate(_signKP, _signDN, _signKP, _signDN);
-
-            _origDN   = "CN=Bob, OU=Sales, O=Bouncy Castle, C=AU";
-            _origKP   = CMSTestUtil.makeKeyPair();
-            _origCert = CMSTestUtil.makeCertificate(_origKP, _origDN, _signKP, _signDN);
-
-            _reciDN   = "CN=Doug, OU=Sales, O=Bouncy Castle, C=AU";
-            _reciKP   = CMSTestUtil.makeKeyPair();
-            _reciCert = CMSTestUtil.makeCertificate(_reciKP, _reciDN, _signKP, _signDN);
-
-            _origEcKP = CMSTestUtil.makeEcDsaKeyPair();
-            _reciEcKP = CMSTestUtil.makeEcDsaKeyPair();
-            _reciEcCert = CMSTestUtil.makeCertificate(_reciEcKP, _reciDN, _signKP, _signDN);
-        }
-    }
-
-    public void setUp()
-        throws Exception
-    {
-        init();
-    }
-
-    public NewAuthenticatedDataStreamTest(String name)
-    {
-        super(name);
-    }
-
-    public static void main(String args[])
-    {
-        junit.textui.TestRunner.run(NewAuthenticatedDataStreamTest.class);
-    }
-
-    public static Test suite()
-        throws Exception
-    {
-        init();
-
-        return new CMSTestSetup(new TestSuite(NewAuthenticatedDataStreamTest.class));
-    }
-
-    public void testKeyTransDESede()
-        throws Exception
-    {
-        tryKeyTrans(CMSAlgorithm.DES_EDE3_CBC);
-    }
-
-    public void testKeyTransDESedeWithDigest()
-        throws Exception
-    {
-        tryKeyTransWithDigest(CMSAlgorithm.DES_EDE3_CBC);
-    }
-
-    public void testOriginatorInfo()
-        throws Exception
-    {
-        ASN1ObjectIdentifier macAlg = CMSAlgorithm.DES_EDE3_CBC;
-        byte[]          data     = "Eric H. Echidna".getBytes();
-
-        CMSAuthenticatedDataStreamGenerator adGen = new CMSAuthenticatedDataStreamGenerator();
-        ByteArrayOutputStream               bOut = new ByteArrayOutputStream();
-
-        X509CertificateHolder origCert = new X509CertificateHolder(_origCert.getEncoded());
-
-        adGen.setOriginatorInfo(new OriginatorInfoGenerator(origCert).generate());
-
-        adGen.addRecipientInfoGenerator(new JceKeyTransRecipientInfoGenerator(_reciCert).setProvider(BC));
-
-        OutputStream aOut = adGen.open(bOut, new JceCMSMacCalculatorBuilder(macAlg).setProvider(BC).build());
-
-        aOut.write(data);
-
-        aOut.close();
-
-        CMSAuthenticatedDataParser ad = new CMSAuthenticatedDataParser(bOut.toByteArray());
-
-        assertTrue(ad.getOriginatorInfo().getCertificates().getMatches(null).contains(origCert));
-
-        RecipientInformationStore recipients = ad.getRecipientInfos();
-
-        assertEquals(ad.getMacAlgOID(), macAlg.getId());
-
-        Collection c = recipients.getRecipients();
-
-        assertEquals(1, c.size());
-
-        Iterator it = c.iterator();
-
-        while (it.hasNext())
-        {
-            RecipientInformation recipient = (RecipientInformation)it.next();
-
-            assertEquals(recipient.getKeyEncryptionAlgOID(), PKCSObjectIdentifiers.rsaEncryption.getId());
-
-            byte[] recData = recipient.getContent(new JceKeyTransAuthenticatedRecipient(_reciKP.getPrivate()).setProvider(BC));
-
-            assertTrue(Arrays.equals(data, recData));
-            assertTrue(Arrays.equals(ad.getMac(), recipient.getMac()));
-        }
-    }
-
-    private void tryKeyTrans(ASN1ObjectIdentifier macAlg)
-        throws Exception
-    {
-        byte[]          data     = "Eric H. Echidna".getBytes();
-
-        CMSAuthenticatedDataStreamGenerator adGen = new CMSAuthenticatedDataStreamGenerator();
-        ByteArrayOutputStream               bOut = new ByteArrayOutputStream();
-
-        adGen.addRecipientInfoGenerator(new JceKeyTransRecipientInfoGenerator(_reciCert).setProvider(BC));
-        
-        OutputStream aOut = adGen.open(bOut, new JceCMSMacCalculatorBuilder(macAlg).setProvider(BC).build());
-
-        aOut.write(data);
-
-        aOut.close();
-
-        CMSAuthenticatedDataParser ad = new CMSAuthenticatedDataParser(bOut.toByteArray());
-
-        RecipientInformationStore recipients = ad.getRecipientInfos();
-
-        assertEquals(ad.getMacAlgOID(), macAlg.getId());
-
-        Collection c = recipients.getRecipients();
-
-        assertEquals(1, c.size());
-
-        Iterator it = c.iterator();
-
-        while (it.hasNext())
-        {
-            RecipientInformation recipient = (RecipientInformation)it.next();
-
-            assertEquals(recipient.getKeyEncryptionAlgOID(), PKCSObjectIdentifiers.rsaEncryption.getId());
-
-            byte[] recData = recipient.getContent(new JceKeyTransAuthenticatedRecipient(_reciKP.getPrivate()).setProvider(BC));
-
-            assertTrue(Arrays.equals(data, recData));
-            assertTrue(Arrays.equals(ad.getMac(), recipient.getMac()));
-        }
-    }
-
-    private void tryKeyTransWithDigest(ASN1ObjectIdentifier macAlg)
-        throws Exception
-    {
-        byte[]          data     = "Eric H. Echidna".getBytes();
-
-        CMSAuthenticatedDataStreamGenerator adGen = new CMSAuthenticatedDataStreamGenerator();
-        ByteArrayOutputStream               bOut = new ByteArrayOutputStream();
-        DigestCalculatorProvider            calcProvider = new JcaDigestCalculatorProviderBuilder().setProvider(BC).build();
-
-        adGen.addRecipientInfoGenerator(new JceKeyTransRecipientInfoGenerator(_reciCert).setProvider(BC));
-
-        OutputStream aOut = adGen.open(bOut, new JceCMSMacCalculatorBuilder(macAlg).setProvider(BC).build(), calcProvider.get(new AlgorithmIdentifier(OIWObjectIdentifiers.idSHA1)));
-
-        aOut.write(data);
-
-        aOut.close();
-
-        CMSAuthenticatedDataParser ad = new CMSAuthenticatedDataParser(bOut.toByteArray(), calcProvider);
-
-        RecipientInformationStore recipients = ad.getRecipientInfos();
-
-        assertEquals(ad.getMacAlgOID(), macAlg.getId());
-
-        Collection c = recipients.getRecipients();
-
-        assertEquals(1, c.size());
-
-        Iterator it = c.iterator();
-
-        while (it.hasNext())
-        {
-            RecipientInformation recipient = (RecipientInformation)it.next();
-
-            assertEquals(recipient.getKeyEncryptionAlgOID(), PKCSObjectIdentifiers.rsaEncryption.getId());
-
-            byte[] recData = recipient.getContent(new JceKeyTransAuthenticatedRecipient(_reciKP.getPrivate()).setProvider(BC));
-
-            assertTrue(Arrays.equals(data, recData));
-            assertTrue(Arrays.equals(ad.getMac(), recipient.getMac()));
-            assertTrue(Arrays.equals(ad.getContentDigest(), recipient.getContentDigest()));
-        }
-    }
-}
\ No newline at end of file
diff --git a/bcpkix/src/main/java/org/bouncycastle/cms/test/NewAuthenticatedDataTest.java b/bcpkix/src/main/java/org/bouncycastle/cms/test/NewAuthenticatedDataTest.java
deleted file mode 100644
index 8d788b5..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cms/test/NewAuthenticatedDataTest.java
+++ /dev/null
@@ -1,472 +0,0 @@
-package org.bouncycastle.cms.test;
-
-import java.security.KeyPair;
-import java.security.NoSuchAlgorithmException;
-import java.security.NoSuchProviderException;
-import java.security.Security;
-import java.security.cert.X509Certificate;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Iterator;
-
-import javax.crypto.SecretKey;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.oiw.OIWObjectIdentifiers;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.cert.X509CertificateHolder;
-import org.bouncycastle.cms.CMSAlgorithm;
-import org.bouncycastle.cms.CMSAuthenticatedData;
-import org.bouncycastle.cms.CMSAuthenticatedDataGenerator;
-import org.bouncycastle.cms.CMSException;
-import org.bouncycastle.cms.CMSProcessableByteArray;
-import org.bouncycastle.cms.OriginatorInfoGenerator;
-import org.bouncycastle.cms.PasswordRecipient;
-import org.bouncycastle.cms.PasswordRecipientInformation;
-import org.bouncycastle.cms.RecipientInformation;
-import org.bouncycastle.cms.RecipientInformationStore;
-import org.bouncycastle.cms.jcajce.JceCMSMacCalculatorBuilder;
-import org.bouncycastle.cms.jcajce.JceKEKAuthenticatedRecipient;
-import org.bouncycastle.cms.jcajce.JceKEKRecipientInfoGenerator;
-import org.bouncycastle.cms.jcajce.JceKeyAgreeAuthenticatedRecipient;
-import org.bouncycastle.cms.jcajce.JceKeyAgreeRecipientInfoGenerator;
-import org.bouncycastle.cms.jcajce.JceKeyTransAuthenticatedRecipient;
-import org.bouncycastle.cms.jcajce.JceKeyTransRecipientInfoGenerator;
-import org.bouncycastle.cms.jcajce.JcePasswordAuthenticatedRecipient;
-import org.bouncycastle.cms.jcajce.JcePasswordRecipientInfoGenerator;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.operator.DigestCalculatorProvider;
-import org.bouncycastle.operator.OperatorCreationException;
-import org.bouncycastle.operator.jcajce.JcaDigestCalculatorProviderBuilder;
-import org.bouncycastle.util.encoders.Hex;
-
-public class NewAuthenticatedDataTest
-    extends TestCase
-{
-    private static final String BC = BouncyCastleProvider.PROVIDER_NAME;
-
-    private static String          _signDN;
-    private static KeyPair _signKP;
-    private static X509Certificate _signCert;
-
-    private static String          _origDN;
-    private static KeyPair         _origKP;
-    private static X509Certificate _origCert;
-
-    private static String          _reciDN;
-    private static KeyPair         _reciKP;
-    private static X509Certificate _reciCert;
-
-    private static KeyPair         _origEcKP;
-    private static KeyPair         _reciEcKP;
-    private static X509Certificate _reciEcCert;
-
-    private static boolean         _initialised = false;
-
-    public boolean DEBUG = true;
-
-    private static void init()
-        throws Exception
-    {
-        if (!_initialised)
-        {
-            _initialised = true;
-            Security.addProvider(new org.bouncycastle.jce.provider.BouncyCastleProvider());
-
-            _signDN   = "O=Bouncy Castle, C=AU";
-            _signKP   = CMSTestUtil.makeKeyPair();
-            _signCert = CMSTestUtil.makeCertificate(_signKP, _signDN, _signKP, _signDN);
-
-            _origDN   = "CN=Bob, OU=Sales, O=Bouncy Castle, C=AU";
-            _origKP   = CMSTestUtil.makeKeyPair();
-            _origCert = CMSTestUtil.makeCertificate(_origKP, _origDN, _signKP, _signDN);
-
-            _reciDN   = "CN=Doug, OU=Sales, O=Bouncy Castle, C=AU";
-            _reciKP   = CMSTestUtil.makeKeyPair();
-            _reciCert = CMSTestUtil.makeCertificate(_reciKP, _reciDN, _signKP, _signDN);
-
-            _origEcKP = CMSTestUtil.makeEcDsaKeyPair();
-            _reciEcKP = CMSTestUtil.makeEcDsaKeyPair();
-            _reciEcCert = CMSTestUtil.makeCertificate(_reciEcKP, _reciDN, _signKP, _signDN);
-        }
-    }
-
-    public void setUp()
-        throws Exception
-    {
-        init();
-    }
-
-    public NewAuthenticatedDataTest(String name)
-    {
-        super(name);
-    }
-
-    public static void main(String args[])
-    {
-        junit.textui.TestRunner.run(NewAuthenticatedDataTest.class);
-    }
-
-    public static Test suite()
-        throws Exception
-    {
-        init();
-
-        return new CMSTestSetup(new TestSuite(NewAuthenticatedDataTest.class));
-    }
-
-    public void testKeyTransDESede()
-        throws Exception
-    {
-        tryKeyTrans(CMSAlgorithm.DES_EDE3_CBC);
-    }
-
-    public void testKeyTransDESedeWithDigest()
-        throws Exception
-    {
-        tryKeyTransWithDigest(CMSAlgorithm.DES_EDE3_CBC);
-    }
-
-    public void testKeyTransRC2()
-        throws Exception
-    {
-        tryKeyTrans(CMSAlgorithm.RC2_CBC);
-    }
-
-    public void testKEKDESede()
-        throws Exception
-    {
-        tryKekAlgorithm(CMSTestUtil.makeDesede192Key(), new ASN1ObjectIdentifier("1.2.840.113549.1.9.16.3.6"));
-    }
-
-    public void testKEKDESedeWithDigest()
-        throws Exception
-    {
-        tryKekAlgorithmWithDigest(CMSTestUtil.makeDesede192Key(), new ASN1ObjectIdentifier("1.2.840.113549.1.9.16.3.6"));
-    }
-
-    public void testPasswordAES256()
-        throws Exception
-    {
-        passwordTest(CMSAuthenticatedDataGenerator.AES256_CBC);
-    }
-
-    public void testECKeyAgree()
-        throws Exception
-    {
-        byte[] data = Hex.decode("504b492d4320434d5320456e76656c6f706564446174612053616d706c65");
-
-        CMSAuthenticatedDataGenerator adGen = new CMSAuthenticatedDataGenerator();
-
-        JceKeyAgreeRecipientInfoGenerator recipientGenerator = new JceKeyAgreeRecipientInfoGenerator(CMSAlgorithm.ECDH_SHA1KDF, _origEcKP.getPrivate(), _origEcKP.getPublic(), CMSAlgorithm.AES128_WRAP).setProvider(BC);
-
-        recipientGenerator.addRecipient(_reciEcCert);
-
-        adGen.addRecipientInfoGenerator(recipientGenerator);
-
-        CMSAuthenticatedData ad = adGen.generate(
-                              new CMSProcessableByteArray(data),
-                              new JceCMSMacCalculatorBuilder(CMSAlgorithm.DES_EDE3_CBC).setProvider(BC).build());
-
-        RecipientInformationStore  recipients = ad.getRecipientInfos();
-
-        assertEquals(ad.getMacAlgOID(),
-                CMSAuthenticatedDataGenerator.DES_EDE3_CBC);
-
-        Collection  c = recipients.getRecipients();
-        Iterator    it = c.iterator();
-
-        if (it.hasNext())
-        {
-            RecipientInformation   recipient = (RecipientInformation)it.next();
-
-            byte[] recData = recipient.getContent(new JceKeyAgreeAuthenticatedRecipient(_reciEcKP.getPrivate()).setProvider(BC));
-            assertTrue(Arrays.equals(data, recData));
-            assertTrue(Arrays.equals(ad.getMac(), recipient.getMac()));
-        }
-        else
-        {
-            fail("no recipient found");
-        }
-    }
-
-    public void testEncoding()
-        throws Exception
-    {
-        byte[]          data     = "Eric H. Echidna".getBytes();
-
-        CMSAuthenticatedDataGenerator adGen = new CMSAuthenticatedDataGenerator();
-
-        adGen.addRecipientInfoGenerator(new JceKeyTransRecipientInfoGenerator(_reciCert).setProvider(BC));
-
-        CMSAuthenticatedData ad = adGen.generate(
-                                new CMSProcessableByteArray(data),
-                                new JceCMSMacCalculatorBuilder(CMSAlgorithm.DES_EDE3_CBC).setProvider(BC).build());
-
-        ad = new CMSAuthenticatedData(ad.getEncoded());
-        
-        RecipientInformationStore recipients = ad.getRecipientInfos();
-
-        assertEquals(CMSAuthenticatedDataGenerator.DES_EDE3_CBC, ad.getMacAlgOID());
-
-        Collection c = recipients.getRecipients();
-
-        assertEquals(1, c.size());
-
-        Iterator it = c.iterator();
-
-        while (it.hasNext())
-        {
-            RecipientInformation recipient = (RecipientInformation)it.next();
-
-            assertEquals(recipient.getKeyEncryptionAlgOID(), PKCSObjectIdentifiers.rsaEncryption.getId());
-
-            byte[] recData = recipient.getContent(new JceKeyTransAuthenticatedRecipient(_reciKP.getPrivate()).setProvider(BC));
-
-            assertTrue(Arrays.equals(data, recData));
-            assertTrue(Arrays.equals(ad.getMac(), recipient.getMac()));
-        }
-    }
-
-    public void testOriginatorInfo()
-        throws Exception
-    {
-        byte[]               data = "Eric H. Echidna".getBytes();
-        ASN1ObjectIdentifier macAlg = CMSAlgorithm.DES_EDE3_CBC;
-
-        CMSAuthenticatedDataGenerator adGen = new CMSAuthenticatedDataGenerator();
-
-        X509CertificateHolder origCert = new X509CertificateHolder(_origCert.getEncoded());
-
-        adGen.setOriginatorInfo(new OriginatorInfoGenerator(origCert).generate());
-
-        adGen.addRecipientInfoGenerator(new JceKeyTransRecipientInfoGenerator(_reciCert).setProvider(BC));
-
-        CMSAuthenticatedData ad = adGen.generate(
-                                new CMSProcessableByteArray(data),
-                                new JceCMSMacCalculatorBuilder(macAlg).setProvider(BC).build());
-
-        assertTrue(ad.getOriginatorInfo().getCertificates().getMatches(null).contains(origCert));
-
-        RecipientInformationStore recipients = ad.getRecipientInfos();
-
-        assertEquals(ad.getMacAlgOID(), macAlg.getId());
-
-        Collection c = recipients.getRecipients();
-
-        assertEquals(1, c.size());
-
-        Iterator it = c.iterator();
-
-        while (it.hasNext())
-        {
-            RecipientInformation recipient = (RecipientInformation)it.next();
-
-            assertEquals(recipient.getKeyEncryptionAlgOID(), PKCSObjectIdentifiers.rsaEncryption.getId());
-
-            byte[] recData = recipient.getContent(new JceKeyTransAuthenticatedRecipient(_reciKP.getPrivate()).setProvider(BC));
-
-            assertTrue(Arrays.equals(data, recData));
-            assertTrue(Arrays.equals(ad.getMac(), recipient.getMac()));
-        }
-    }
-
-    private void tryKeyTrans(ASN1ObjectIdentifier macAlg)
-        throws Exception
-    {
-        byte[]          data     = "Eric H. Echidna".getBytes();
-
-        CMSAuthenticatedDataGenerator adGen = new CMSAuthenticatedDataGenerator();
-
-        adGen.addRecipientInfoGenerator(new JceKeyTransRecipientInfoGenerator(_reciCert).setProvider(BC));
-        
-        CMSAuthenticatedData ad = adGen.generate(
-                                new CMSProcessableByteArray(data),
-                                new JceCMSMacCalculatorBuilder(macAlg).setProvider(BC).build());
-
-        RecipientInformationStore recipients = ad.getRecipientInfos();
-
-        assertEquals(ad.getMacAlgOID(), macAlg.getId());
-
-        Collection c = recipients.getRecipients();
-
-        assertEquals(1, c.size());
-
-        Iterator it = c.iterator();
-
-        while (it.hasNext())
-        {
-            RecipientInformation recipient = (RecipientInformation)it.next();
-
-            assertEquals(recipient.getKeyEncryptionAlgOID(), PKCSObjectIdentifiers.rsaEncryption.getId());
-
-            byte[] recData = recipient.getContent(new JceKeyTransAuthenticatedRecipient(_reciKP.getPrivate()).setProvider(BC));
-
-            assertTrue(Arrays.equals(data, recData));
-            assertTrue(Arrays.equals(ad.getMac(), recipient.getMac()));
-        }
-    }
-
-    private void tryKeyTransWithDigest(ASN1ObjectIdentifier macAlg)
-        throws Exception
-    {
-        byte[]          data     = "Eric H. Echidna".getBytes();
-
-        CMSAuthenticatedDataGenerator adGen = new CMSAuthenticatedDataGenerator();
-        DigestCalculatorProvider calcProvider = new JcaDigestCalculatorProviderBuilder().setProvider(BC).build();
-
-        adGen.addRecipientInfoGenerator(new JceKeyTransRecipientInfoGenerator(_reciCert).setProvider(BC));
-
-        CMSAuthenticatedData ad = adGen.generate(
-                                new CMSProcessableByteArray(data),
-                                new JceCMSMacCalculatorBuilder(macAlg).setProvider(BC).build(),
-                                calcProvider.get(new AlgorithmIdentifier(OIWObjectIdentifiers.idSHA1)));
-
-        RecipientInformationStore recipients = ad.getRecipientInfos();
-
-        assertEquals(ad.getMacAlgOID(), macAlg.getId());
-
-        Collection c = recipients.getRecipients();
-
-        assertEquals(1, c.size());
-
-        Iterator it = c.iterator();
-
-        while (it.hasNext())
-        {
-            RecipientInformation recipient = (RecipientInformation)it.next();
-
-            assertEquals(recipient.getKeyEncryptionAlgOID(), PKCSObjectIdentifiers.rsaEncryption.getId());
-
-            byte[] recData = recipient.getContent(new JceKeyTransAuthenticatedRecipient(_reciKP.getPrivate()).setProvider(BC));
-
-            assertTrue(Arrays.equals(data, recData));
-            assertTrue(Arrays.equals(ad.getMac(), recipient.getMac()));
-            assertTrue(Arrays.equals(ad.getContentDigest(), recipient.getContentDigest()));
-        }
-    }
-
-    private void tryKekAlgorithm(SecretKey kek, ASN1ObjectIdentifier algOid)
-        throws NoSuchAlgorithmException, NoSuchProviderException, CMSException, OperatorCreationException
-    {
-        byte[]          data     = "Eric H. Echidna".getBytes();
-
-        CMSAuthenticatedDataGenerator adGen = new CMSAuthenticatedDataGenerator();
-       
-        byte[]  kekId = new byte[] { 1, 2, 3, 4, 5 };
-
-        adGen.addRecipientInfoGenerator(new JceKEKRecipientInfoGenerator(kekId, kek).setProvider(BC));
-
-        CMSAuthenticatedData ad = adGen.generate(
-                                new CMSProcessableByteArray(data),
-                                new JceCMSMacCalculatorBuilder(CMSAlgorithm.DES_EDE3_CBC).setProvider(BC).build());
-
-        RecipientInformationStore recipients = ad.getRecipientInfos();
-
-        Collection c = recipients.getRecipients();
-        Iterator it = c.iterator();
-
-        assertEquals(ad.getMacAlgOID(), CMSAuthenticatedDataGenerator.DES_EDE3_CBC);
-
-        if (it.hasNext())
-        {
-            RecipientInformation recipient = (RecipientInformation)it.next();
-
-            assertEquals(recipient.getKeyEncryptionAlgOID(), algOid.getId());
-
-            byte[] recData = recipient.getContent(new JceKEKAuthenticatedRecipient(kek).setProvider(BC));
-
-            assertTrue(Arrays.equals(data, recData));
-            assertTrue(Arrays.equals(ad.getMac(), recipient.getMac()));
-        }
-        else
-        {
-            fail("no recipient found");
-        }
-    }
-
-    private void tryKekAlgorithmWithDigest(SecretKey kek, ASN1ObjectIdentifier algOid)
-        throws NoSuchAlgorithmException, NoSuchProviderException, CMSException, OperatorCreationException
-    {
-            byte[]          data     = "Eric H. Echidna".getBytes();
-
-            CMSAuthenticatedDataGenerator adGen = new CMSAuthenticatedDataGenerator();
-            DigestCalculatorProvider calcProvider = new JcaDigestCalculatorProviderBuilder().setProvider(BC).build();
-
-            byte[]  kekId = new byte[] { 1, 2, 3, 4, 5 };
-
-            adGen.addRecipientInfoGenerator(new JceKEKRecipientInfoGenerator(kekId, kek).setProvider(BC));
-
-            CMSAuthenticatedData ad = adGen.generate(
-                                    new CMSProcessableByteArray(data),
-                                    new JceCMSMacCalculatorBuilder(CMSAlgorithm.DES_EDE3_CBC).setProvider(BC).build(),
-                                    calcProvider.get(new AlgorithmIdentifier(OIWObjectIdentifiers.idSHA1)));
-
-            RecipientInformationStore recipients = ad.getRecipientInfos();
-
-            Collection c = recipients.getRecipients();
-            Iterator it = c.iterator();
-
-            assertEquals(ad.getMacAlgOID(), CMSAuthenticatedDataGenerator.DES_EDE3_CBC);
-
-            if (it.hasNext())
-            {
-                RecipientInformation recipient = (RecipientInformation)it.next();
-
-                assertEquals(recipient.getKeyEncryptionAlgOID(), algOid.getId());
-
-                byte[] recData = recipient.getContent(new JceKEKAuthenticatedRecipient(kek).setProvider(BC));
-
-                assertTrue(Arrays.equals(data, recData));
-                assertTrue(Arrays.equals(ad.getMac(), recipient.getMac()));
-                assertTrue(Arrays.equals(ad.getContentDigest(), recipient.getContentDigest()));
-            }
-            else
-            {
-                fail("no recipient found");
-            }
-        }
-
-
-    private void passwordTest(String algorithm)
-        throws Exception
-    {
-        byte[] data = Hex.decode("504b492d4320434d5320456e76656c6f706564446174612053616d706c65");
-
-        CMSAuthenticatedDataGenerator adGen = new CMSAuthenticatedDataGenerator();
-
-        adGen.addRecipientInfoGenerator(new JcePasswordRecipientInfoGenerator(new ASN1ObjectIdentifier(algorithm), "password".toCharArray()).setProvider(BC).setSaltAndIterationCount(new byte[20], 5));
-
-        CMSAuthenticatedData ad = adGen.generate(
-                              new CMSProcessableByteArray(data),
-                              new JceCMSMacCalculatorBuilder(CMSAlgorithm.DES_EDE3_CBC).setProvider(BC).build());
-
-        RecipientInformationStore  recipients = ad.getRecipientInfos();
-
-        assertEquals(ad.getMacAlgOID(),
-                                   CMSAuthenticatedDataGenerator.DES_EDE3_CBC);
-
-        Collection  c = recipients.getRecipients();
-        Iterator    it = c.iterator();
-
-        if (it.hasNext())
-        {
-            PasswordRecipientInformation recipient = (PasswordRecipientInformation)it.next();
-
-            PasswordRecipient pbeRep = new JcePasswordAuthenticatedRecipient("password".toCharArray()).setProvider(BC);
-
-            byte[] recData = recipient.getContent(pbeRep);
-
-            assertTrue(Arrays.equals(data, recData));
-            assertTrue(Arrays.equals(ad.getMac(), recipient.getMac()));
-        }
-        else
-        {
-            fail("no recipient found");
-        }
-    }
-}
\ No newline at end of file
diff --git a/bcpkix/src/main/java/org/bouncycastle/cms/test/NewCompressedDataStreamTest.java b/bcpkix/src/main/java/org/bouncycastle/cms/test/NewCompressedDataStreamTest.java
deleted file mode 100644
index 3acc15d..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cms/test/NewCompressedDataStreamTest.java
+++ /dev/null
@@ -1,127 +0,0 @@
-package org.bouncycastle.cms.test;
-
-import java.io.ByteArrayOutputStream;
-import java.io.OutputStream;
-import java.util.Arrays;
-import java.util.Random;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import org.bouncycastle.cms.CMSCompressedDataParser;
-import org.bouncycastle.cms.CMSCompressedDataStreamGenerator;
-import org.bouncycastle.cms.jcajce.ZlibCompressor;
-import org.bouncycastle.cms.jcajce.ZlibExpanderProvider;
-import org.bouncycastle.util.encoders.Base64;
-
-public class NewCompressedDataStreamTest
-    extends TestCase
-{
-    public NewCompressedDataStreamTest(String name)
-    {
-        super(name);
-    }
-
-    public void testWorkingData()
-        throws Exception
-    {
-        byte[]  compData = Base64.decode(
-                  "MIAGCyqGSIb3DQEJEAEJoIAwgAIBADANBgsqhkiG9w0BCRADCDCABgkqhkiG9w0BBwGggCSABIIC"
-                + "Hnic7ZRdb9owFIbvK/k/5PqVYPFXGK12YYyboVFASSp1vQtZGiLRACZE49/XHoUW7S/0tXP8Efux"
-                + "fU5ivWnasml72XFb3gb5druui7ytN803M570nii7C5r8tfwR281hy/p/KSM3+jzH5s3+pbQ90xSb"
-                + "P3VT3QbLusnt8WPIuN5vN/vaA2+DulnXTXkXvNTr8j8ouZmkCmGI/UW+ZS/C8zP0bz2dz0zwLt+1"
-                + "UEk2M8mlaxjRMByAhZTj0RGYg4TvogiRASROsZgjpVcJCb1KV6QzQeDJ1XkoQ5Jm+C5PbOHZZGRi"
-                + "v+ORAcshOGeCcdFJyfgFxdtCdEcmOrbinc/+BBMzRThEYpwl+jEBpciSGWQkI0TSlREmD/eOHb2D"
-                + "SGLuESm/iKUFt1y4XHBO2a5oq0IKJKWLS9kUZTA7vC5LSxYmgVL46SIWxIfWBQd6AdrnjLmH94UT"
-                + "vGxVibLqRCtIpp4g2qpdtqK1LiOeolpVK5wVQ5P7+QjZAlrh0cePYTx/gNZuB9Vhndtgujl9T/tg"
-                + "W9ogK+3rnmg3YWygnTuF5GDS+Q/jIVLnCcYZFc6Kk/+c80wKwZjwdZIqDYWRH68MuBQSXLgXYXj2"
-                + "3CAaYOBNJMliTl0X7eV5DnoKIFSKYdj3cRpD/cK/JWTHJRe76MUXnfBW8m7Hd5zhQ4ri2NrVF/WL"
-                + "+kV1/3AGSlJ32bFPd2BsQD8uSzIx6lObkjdz95c0AAAAAAAAAAAAAAAA");
-
-        byte[]  uncompData = Base64.decode(
-                  "Q29udGVudC1UeXBlOiBhcHBsaWNhdGlvbi9FREktWDEyOyBuYW1lPUdyb3VwMi54MTINCkNvbnRl"
-                + "bnQtVHJhbnNmZXItRW5jb2Rpbmc6IGJpbmFyeQ0KQ29udGVudC1EaXNwb3NpdGlvbjogaW5saW5l"
-                + "OyBmaWxlbmFtZT1Hcm91cDIueDEyDQoNCklTQSowMCpzc3Nzc3Nzc3NzKjAwKnJycnJycnJycnIqW"
-                + "loqQ1lDTE9ORSAgICAgICAgKlpaKlBBUlRORVIgICAgICAgICo5NjEwMDcqMjAxMypVKjAwMjAwKj"
-                + "AwMDAwMDAwMSowKlQqKg1HUypQTypTMVMxUzFTMVMxUzFTMVMqUjFSMVIxUjFSMVIxUjFSKjk2MTA"
-                + "wNyoyMDEzKjAwMDAwMDAwNCpYKjAwMzA1MA1TVCo4NTAqMDAwMDQwMDAxDUJFRyowMCpCRSoyYSo0"
-                + "MzMyNDIzNHY1NTIzKjk2MTAwNyoyM3RjNHZ5MjR2MmgzdmgzdmgqWloqSUVMKjA5KlJFKjA5DUNVU"
-                + "ioxMSpUUk4qNTY1Nio2NSo1NjYqSU1GKjAwNio5NjEwMDcNUkVGKjZBKjQzM3IxYzNyMzRyMzRjMz"
-                + "MxMnFjdGdjNTQqUmVmZXJlbmNlIE51bWJlcg1QRVIqQUEqSGFucyBHdXR0ZW4qQ1AqMS4zMjIuMzI"
-                + "zLjQ0NDQqKioqKnJnZzRlZ3Y0dDQNVEFYKjR0Z3RidDR0cjR0cipHTCpnaGdoKioqKioqKioqRypD"
-                + "DUZPQipUUCpDQSpVU0EqMDIqRE9NKkNDKlJlZ3VsYXIgTG9jYXRpb25zIHBlciBUZXJtcw1DVFAqR"
-                + "EUqQzA0KjQ1MyoyNTAwMCpEOSpTRUwqMjMyMTQqMjM0MzI0MjM0MjMqRVMqNDIyNDM0MjMNU0FDKk"
-                + "EqQjAwMCpBRSozNTQ1KjM0NDIzMDANQ1VSKjExKjc2Nyo3NzY3KjY1DVBPMSoxMTEtYWFhKjEwMDA"
-                + "wMDAqQVMqOTAuMDAqQkQqQUsqMjM0MjM1djM1MzRxNmYzNTM0djQzNTM0NTN2cTNxMzIqKioqKioq"
-                + "KioqKkExKnl0cmgNUE8xKjExMS1hYWEqMTAwMDAwMCpBUyo5MC4wMCpCRCpBSyoyMzQyMzV2MzUzN"
-                + "HE2ZjM1MzR2NDM1MzQ1M3ZxM3EzMioqKioqKioqKioqQTEqeXRyaA1QTzEqMTExLWFhYSoxMDAwMD"
-                + "AwKkFTKjkwLjAwKkJEKkFLKjIzNDIzNXYzNTM0cTZmMzUzNHY0MzUzNDUzdnEzcTMyKioqKioqKio"
-                + "qKipBMSp5dHJoDVBPMSoxMTEtYWFhKjEwMDAwMDAqQVMqOTAuMDAqQkQqQUsqMjM0MjM1djM1MzRx"
-                + "NmYzNTM0djQzNTM0NTN2cTNxMzIqKioqKioqKioqKkExKnl0cmgNUE8xKjExMS1hYWEqMTAwMDAwM"
-                + "CpBUyo5MC4wMCpCRCpBSyoyMzQyMzV2MzUzNHE2ZjM1MzR2NDM1MzQ1M3ZxM3EzMioqKioqKioqKi"
-                + "oqQTEqeXRyaA1QTzEqMTExLWFhYSoxMDAwMDAwKkFTKjkwLjAwKkJEKkFLKjIzNDIzNXYzNTM0cTZ"
-                + "mMzUzNHY0MzUzNDUzdnEzcTMyKioqKioqKioqKipBMSp5dHJoDVBPMSoxMTEtYWFhKjEwMDAwMDAq"
-                + "QVMqOTAuMDAqQkQqQUsqMjM0MjM1djM1MzRxNmYzNTM0djQzNTM0NTN2cTNxMzIqKioqKioqKioqK"
-                + "kExKnl0cmgNUE8xKjExMS1hYWEqMTAwMDAwMCpBUyo5MC4wMCpCRCpBSyoyMzQyMzV2MzUzNHE2Zj"
-                + "M1MzR2NDM1MzQ1M3ZxM3EzMioqKioqKioqKioqQTEqeXRyaA1QTzEqMTExLWFhYSoxMDAwMDAwKkF"
-                + "TKjkwLjAwKkJEKkFLKjIzNDIzNXYzNTM0cTZmMzUzNHY0MzUzNDUzdnEzcTMyKioqKioqKioqKipB"
-                + "MSp5dHJoDVBPMSoxMTEtYWFhKjEwMDAwMDAqQVMqOTAuMDAqQkQqQUsqMjM0MjM1djM1MzRxNmYzN"
-                + "TM0djQzNTM0NTN2cTNxMzIqKioqKioqKioqKkExKnl0cmgNQ1RUKjENU0UqMjIqMDAwMDQwMDAxDU"
-                + "dFKjEqMDAwMDAwMDA0DUlFQSoxKjAwMDAwMDAwMQ0=");
-
-        CMSCompressedDataParser ed = new CMSCompressedDataParser(compData);
-
-        assertEquals(true, Arrays.equals(uncompData, CMSTestUtil.streamToByteArray(ed.getContent(new ZlibExpanderProvider()).getContentStream())));
-    }
-
-    public void testEach()
-        throws Exception
-    {
-        byte[]  testData = "Hello world!".getBytes();
-
-        CMSCompressedDataStreamGenerator gen = new CMSCompressedDataStreamGenerator();
-        ByteArrayOutputStream            bOut = new ByteArrayOutputStream();
-        
-        OutputStream cOut = gen.open(bOut, new ZlibCompressor());
-
-        cOut.write(testData);
-        
-        cOut.close();
-
-        CMSCompressedDataParser ed = new CMSCompressedDataParser(bOut.toByteArray());
-        
-        assertEquals(true, Arrays.equals(testData, CMSTestUtil.streamToByteArray(ed.getContent(new ZlibExpanderProvider()).getContentStream())));
-    }
-    
-    public void test1000()
-        throws Exception
-    {
-        byte[]  testData = new byte[10000];
-        Random  rand = new Random();
-        
-        rand.setSeed(0);
-
-        for (int i = 0; i != 10; i++)
-        {   
-            CMSCompressedDataStreamGenerator gen = new CMSCompressedDataStreamGenerator();
-            ByteArrayOutputStream            bOut = new ByteArrayOutputStream();
-            
-            OutputStream cOut = gen.open(bOut, new ZlibCompressor());
-
-            rand.nextBytes(testData);
-            
-            cOut.write(testData);
-            
-            cOut.close();
-
-            CMSCompressedDataParser ed = new CMSCompressedDataParser(bOut.toByteArray());
-            
-            assertEquals(true, Arrays.equals(testData, CMSTestUtil.streamToByteArray(ed.getContent(new ZlibExpanderProvider()).getContentStream())));
-        }
-    }
-    
-    public static Test suite()
-    {
-        return new TestSuite(NewCompressedDataStreamTest.class);
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cms/test/NewCompressedDataTest.java b/bcpkix/src/main/java/org/bouncycastle/cms/test/NewCompressedDataTest.java
deleted file mode 100644
index 9c888ce..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cms/test/NewCompressedDataTest.java
+++ /dev/null
@@ -1,151 +0,0 @@
-package org.bouncycastle.cms.test;
-
-import java.util.Arrays;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import org.bouncycastle.cms.CMSCompressedData;
-import org.bouncycastle.cms.CMSCompressedDataGenerator;
-import org.bouncycastle.cms.CMSException;
-import org.bouncycastle.cms.CMSProcessableByteArray;
-import org.bouncycastle.cms.jcajce.ZlibCompressor;
-import org.bouncycastle.cms.jcajce.ZlibExpanderProvider;
-import org.bouncycastle.util.encoders.Base64;
-import org.bouncycastle.util.io.StreamOverflowException;
-
-public class NewCompressedDataTest
-    extends TestCase
-{
-    private static final byte[] TEST_DATA = "Hello world!".getBytes();
-
-    /*
-     *
-     *  INFRASTRUCTURE
-     *
-     */
-
-    public NewCompressedDataTest(String name)
-    {
-        super(name);
-    }
-
-    public static void main(String args[])
-    {
-        junit.textui.TestRunner.run(NewCompressedDataTest.class);
-    }
-
-    public static Test suite()
-    {
-        return new CMSTestSetup(new TestSuite(NewCompressedDataTest.class));
-    }
-
-    public void setUp()
-    {
-
-    }
-
-    public void tearDown()
-    {
-
-    }
-
-    public void testWorkingData()
-        throws Exception
-    {
-        byte[] compData = Base64
-                .decode("MIAGCyqGSIb3DQEJEAEJoIAwgAIBADANBgsqhkiG9w0BCRADCDCABgkqhkiG9w0BBwGggCSABIIC"
-                        + "Hnic7ZRdb9owFIbvK/k/5PqVYPFXGK12YYyboVFASSp1vQtZGiLRACZE49/XHoUW7S/0tXP8Efux"
-                        + "fU5ivWnasml72XFb3gb5druui7ytN803M570nii7C5r8tfwR281hy/p/KSM3+jzH5s3+pbQ90xSb"
-                        + "P3VT3QbLusnt8WPIuN5vN/vaA2+DulnXTXkXvNTr8j8ouZmkCmGI/UW+ZS/C8zP0bz2dz0zwLt+1"
-                        + "UEk2M8mlaxjRMByAhZTj0RGYg4TvogiRASROsZgjpVcJCb1KV6QzQeDJ1XkoQ5Jm+C5PbOHZZGRi"
-                        + "v+ORAcshOGeCcdFJyfgFxdtCdEcmOrbinc/+BBMzRThEYpwl+jEBpciSGWQkI0TSlREmD/eOHb2D"
-                        + "SGLuESm/iKUFt1y4XHBO2a5oq0IKJKWLS9kUZTA7vC5LSxYmgVL46SIWxIfWBQd6AdrnjLmH94UT"
-                        + "vGxVibLqRCtIpp4g2qpdtqK1LiOeolpVK5wVQ5P7+QjZAlrh0cePYTx/gNZuB9Vhndtgujl9T/tg"
-                        + "W9ogK+3rnmg3YWygnTuF5GDS+Q/jIVLnCcYZFc6Kk/+c80wKwZjwdZIqDYWRH68MuBQSXLgXYXj2"
-                        + "3CAaYOBNJMliTl0X7eV5DnoKIFSKYdj3cRpD/cK/JWTHJRe76MUXnfBW8m7Hd5zhQ4ri2NrVF/WL"
-                        + "+kV1/3AGSlJ32bFPd2BsQD8uSzIx6lObkjdz95c0AAAAAAAAAAAAAAAA");
-
-        byte[] uncompData = Base64
-                .decode("Q29udGVudC1UeXBlOiBhcHBsaWNhdGlvbi9FREktWDEyOyBuYW1lPUdyb3VwMi54MTINCkNvbnRl"
-                        + "bnQtVHJhbnNmZXItRW5jb2Rpbmc6IGJpbmFyeQ0KQ29udGVudC1EaXNwb3NpdGlvbjogaW5saW5l"
-                        + "OyBmaWxlbmFtZT1Hcm91cDIueDEyDQoNCklTQSowMCpzc3Nzc3Nzc3NzKjAwKnJycnJycnJycnIqW"
-                        + "loqQ1lDTE9ORSAgICAgICAgKlpaKlBBUlRORVIgICAgICAgICo5NjEwMDcqMjAxMypVKjAwMjAwKj"
-                        + "AwMDAwMDAwMSowKlQqKg1HUypQTypTMVMxUzFTMVMxUzFTMVMqUjFSMVIxUjFSMVIxUjFSKjk2MTA"
-                        + "wNyoyMDEzKjAwMDAwMDAwNCpYKjAwMzA1MA1TVCo4NTAqMDAwMDQwMDAxDUJFRyowMCpCRSoyYSo0"
-                        + "MzMyNDIzNHY1NTIzKjk2MTAwNyoyM3RjNHZ5MjR2MmgzdmgzdmgqWloqSUVMKjA5KlJFKjA5DUNVU"
-                        + "ioxMSpUUk4qNTY1Nio2NSo1NjYqSU1GKjAwNio5NjEwMDcNUkVGKjZBKjQzM3IxYzNyMzRyMzRjMz"
-                        + "MxMnFjdGdjNTQqUmVmZXJlbmNlIE51bWJlcg1QRVIqQUEqSGFucyBHdXR0ZW4qQ1AqMS4zMjIuMzI"
-                        + "zLjQ0NDQqKioqKnJnZzRlZ3Y0dDQNVEFYKjR0Z3RidDR0cjR0cipHTCpnaGdoKioqKioqKioqRypD"
-                        + "DUZPQipUUCpDQSpVU0EqMDIqRE9NKkNDKlJlZ3VsYXIgTG9jYXRpb25zIHBlciBUZXJtcw1DVFAqR"
-                        + "EUqQzA0KjQ1MyoyNTAwMCpEOSpTRUwqMjMyMTQqMjM0MzI0MjM0MjMqRVMqNDIyNDM0MjMNU0FDKk"
-                        + "EqQjAwMCpBRSozNTQ1KjM0NDIzMDANQ1VSKjExKjc2Nyo3NzY3KjY1DVBPMSoxMTEtYWFhKjEwMDA"
-                        + "wMDAqQVMqOTAuMDAqQkQqQUsqMjM0MjM1djM1MzRxNmYzNTM0djQzNTM0NTN2cTNxMzIqKioqKioq"
-                        + "KioqKkExKnl0cmgNUE8xKjExMS1hYWEqMTAwMDAwMCpBUyo5MC4wMCpCRCpBSyoyMzQyMzV2MzUzN"
-                        + "HE2ZjM1MzR2NDM1MzQ1M3ZxM3EzMioqKioqKioqKioqQTEqeXRyaA1QTzEqMTExLWFhYSoxMDAwMD"
-                        + "AwKkFTKjkwLjAwKkJEKkFLKjIzNDIzNXYzNTM0cTZmMzUzNHY0MzUzNDUzdnEzcTMyKioqKioqKio"
-                        + "qKipBMSp5dHJoDVBPMSoxMTEtYWFhKjEwMDAwMDAqQVMqOTAuMDAqQkQqQUsqMjM0MjM1djM1MzRx"
-                        + "NmYzNTM0djQzNTM0NTN2cTNxMzIqKioqKioqKioqKkExKnl0cmgNUE8xKjExMS1hYWEqMTAwMDAwM"
-                        + "CpBUyo5MC4wMCpCRCpBSyoyMzQyMzV2MzUzNHE2ZjM1MzR2NDM1MzQ1M3ZxM3EzMioqKioqKioqKi"
-                        + "oqQTEqeXRyaA1QTzEqMTExLWFhYSoxMDAwMDAwKkFTKjkwLjAwKkJEKkFLKjIzNDIzNXYzNTM0cTZ"
-                        + "mMzUzNHY0MzUzNDUzdnEzcTMyKioqKioqKioqKipBMSp5dHJoDVBPMSoxMTEtYWFhKjEwMDAwMDAq"
-                        + "QVMqOTAuMDAqQkQqQUsqMjM0MjM1djM1MzRxNmYzNTM0djQzNTM0NTN2cTNxMzIqKioqKioqKioqK"
-                        + "kExKnl0cmgNUE8xKjExMS1hYWEqMTAwMDAwMCpBUyo5MC4wMCpCRCpBSyoyMzQyMzV2MzUzNHE2Zj"
-                        + "M1MzR2NDM1MzQ1M3ZxM3EzMioqKioqKioqKioqQTEqeXRyaA1QTzEqMTExLWFhYSoxMDAwMDAwKkF"
-                        + "TKjkwLjAwKkJEKkFLKjIzNDIzNXYzNTM0cTZmMzUzNHY0MzUzNDUzdnEzcTMyKioqKioqKioqKipB"
-                        + "MSp5dHJoDVBPMSoxMTEtYWFhKjEwMDAwMDAqQVMqOTAuMDAqQkQqQUsqMjM0MjM1djM1MzRxNmYzN"
-                        + "TM0djQzNTM0NTN2cTNxMzIqKioqKioqKioqKkExKnl0cmgNQ1RUKjENU0UqMjIqMDAwMDQwMDAxDUdFKjEqMDAwMDAwMDA0DUlFQSoxKjAwMDAwMDAwMQ0=");
-
-        CMSCompressedData ed = new CMSCompressedData(compData);
-
-        assertEquals(true, Arrays.equals(uncompData, ed.getContent(new ZlibExpanderProvider())));
-    }
-
-    public void testEach()
-        throws Exception
-    {
-        CMSCompressedData cd = getStdData();
-
-        assertEquals(true, Arrays.equals(TEST_DATA, cd.getContent(new ZlibExpanderProvider())));
-    }
-
-    public void testLimitUnder()
-        throws Exception
-    {
-        CMSCompressedData cd = getStdData();
-
-        try
-        {
-            cd.getContent(new ZlibExpanderProvider(TEST_DATA.length / 2));
-        }
-        catch (CMSException e)
-        {
-            assertEquals(true, e.getCause() instanceof StreamOverflowException);
-        }
-    }
-
-    public void testLimitOver()
-        throws Exception
-    {
-        CMSCompressedData cd = getStdData();
-
-        assertEquals(true, Arrays.equals(TEST_DATA, cd.getContent(new ZlibExpanderProvider(TEST_DATA.length * 2))));
-    }
-
-    public void testLimitEqual()
-        throws Exception
-    {
-        CMSCompressedData cd = getStdData();
-
-        assertEquals(true, Arrays.equals(TEST_DATA, cd.getContent(new ZlibExpanderProvider(TEST_DATA.length))));
-    }
-
-    private CMSCompressedData getStdData()
-        throws CMSException
-    {
-        CMSProcessableByteArray testData = new CMSProcessableByteArray(TEST_DATA);
-        CMSCompressedDataGenerator gen = new CMSCompressedDataGenerator();
-
-        return gen.generate(testData, new ZlibCompressor());
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cms/test/NewEnvelopedDataStreamTest.java b/bcpkix/src/main/java/org/bouncycastle/cms/test/NewEnvelopedDataStreamTest.java
deleted file mode 100644
index 7759677..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cms/test/NewEnvelopedDataStreamTest.java
+++ /dev/null
@@ -1,760 +0,0 @@
-package org.bouncycastle.cms.test;
-
-import java.io.BufferedOutputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.security.KeyFactory;
-import java.security.KeyPair;
-import java.security.PrivateKey;
-import java.security.Security;
-import java.security.cert.X509Certificate;
-import java.security.spec.PKCS8EncodedKeySpec;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Hashtable;
-import java.util.Iterator;
-
-import javax.crypto.SecretKey;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.DEROutputStream;
-import org.bouncycastle.asn1.DERSet;
-import org.bouncycastle.asn1.DERUTF8String;
-import org.bouncycastle.asn1.cms.Attribute;
-import org.bouncycastle.asn1.cms.AttributeTable;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.asn1.x500.X500Name;
-import org.bouncycastle.cert.X509CertificateHolder;
-import org.bouncycastle.cms.CMSAlgorithm;
-import org.bouncycastle.cms.CMSEnvelopedDataGenerator;
-import org.bouncycastle.cms.CMSEnvelopedDataParser;
-import org.bouncycastle.cms.CMSEnvelopedDataStreamGenerator;
-import org.bouncycastle.cms.CMSTypedStream;
-import org.bouncycastle.cms.KEKRecipientId;
-import org.bouncycastle.cms.OriginatorInfoGenerator;
-import org.bouncycastle.cms.OriginatorInformation;
-import org.bouncycastle.cms.RecipientId;
-import org.bouncycastle.cms.RecipientInformation;
-import org.bouncycastle.cms.RecipientInformationStore;
-import org.bouncycastle.cms.SimpleAttributeTableGenerator;
-import org.bouncycastle.cms.jcajce.JceCMSContentEncryptorBuilder;
-import org.bouncycastle.cms.jcajce.JceKEKEnvelopedRecipient;
-import org.bouncycastle.cms.jcajce.JceKEKRecipientInfoGenerator;
-import org.bouncycastle.cms.jcajce.JceKeyAgreeEnvelopedRecipient;
-import org.bouncycastle.cms.jcajce.JceKeyAgreeRecipientId;
-import org.bouncycastle.cms.jcajce.JceKeyAgreeRecipientInfoGenerator;
-import org.bouncycastle.cms.jcajce.JceKeyTransEnvelopedRecipient;
-import org.bouncycastle.cms.jcajce.JceKeyTransRecipientInfoGenerator;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.util.encoders.Base64;
-import org.bouncycastle.util.encoders.Hex;
-
-public class NewEnvelopedDataStreamTest
-    extends TestCase
-{
-    private static final String BC = BouncyCastleProvider.PROVIDER_NAME;
-
-    private static final int BUFFER_SIZE = 4000;
-    private static String          _signDN;
-    private static KeyPair         _signKP;
-    private static X509Certificate _signCert;
-
-    private static String          _origDN;
-    private static KeyPair         _origKP;
-    private static X509Certificate _origCert;
-
-    private static String          _reciDN;
-    private static KeyPair         _reciKP;
-    private static X509Certificate _reciCert;
-
-    private static KeyPair         _origEcKP;
-    private static KeyPair         _reciEcKP;
-    private static X509Certificate _reciEcCert;
-
-    private static boolean         _initialised = false;
-    
-    public NewEnvelopedDataStreamTest()
-    {
-    }
-
-    private static void init()
-        throws Exception
-    {
-        if (!_initialised)
-        {
-            _initialised = true;
-
-            _signDN   = "O=Bouncy Castle, C=AU";
-            _signKP   = CMSTestUtil.makeKeyPair();
-            _signCert = CMSTestUtil.makeCertificate(_signKP, _signDN, _signKP, _signDN);
-
-            _origDN   = "CN=Bob, OU=Sales, O=Bouncy Castle, C=AU";
-            _origKP   = CMSTestUtil.makeKeyPair();
-            _origCert = CMSTestUtil.makeCertificate(_origKP, _origDN, _signKP, _signDN);
-
-            _reciDN   = "CN=Doug, OU=Sales, O=Bouncy Castle, C=AU";
-            _reciKP   = CMSTestUtil.makeKeyPair();
-            _reciCert = CMSTestUtil.makeCertificate(_reciKP, _reciDN, _signKP, _signDN);
-
-            _origEcKP = CMSTestUtil.makeEcDsaKeyPair();
-            _reciEcKP = CMSTestUtil.makeEcDsaKeyPair();
-            _reciEcCert = CMSTestUtil.makeCertificate(_reciEcKP, _reciDN, _signKP, _signDN);
-        }
-    }
-
-    public void setUp()
-        throws Exception
-    {
-        init();
-    }
-
-    public void testWorkingData()
-        throws Exception
-    {
-        byte[]  keyData = Base64.decode(
-                  "MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAKrAz/SQKrcQ" +
-                  "nj9IxHIfKDbuXsMqUpI06s2gps6fp7RDNvtUDDMOciWGFhD45YSy8GO0mPx3" +
-                  "Nkc7vKBqX4TLcqLUz7kXGOHGOwiPZoNF+9jBMPNROe/B0My0PkWg9tuq+nxN" +
-                  "64oD47+JvDwrpNOS5wsYavXeAW8Anv9ZzHLU7KwZAgMBAAECgYA/fqdVt+5K" +
-                  "WKGfwr1Z+oAHvSf7xtchiw/tGtosZ24DOCNP3fcTXUHQ9kVqVkNyzt9ZFCT3" +
-                  "bJUAdBQ2SpfuV4DusVeQZVzcROKeA09nPkxBpTefWbSDQGhb+eZq9L8JDRSW" +
-                  "HyYqs+MBoUpLw7GKtZiJkZyY6CsYkAnQ+uYVWq/TIQJBAP5zafO4HUV/w4KD" +
-                  "VJi+ua+GYF1Sg1t/dYL1kXO9GP1p75YAmtm6LdnOCas7wj70/G1YlPGkOP0V" +
-                  "GFzeG5KAmAUCQQCryvKU9nwWA+kypcQT9Yr1P4vGS0APYoBThnZq7jEPc5Cm" +
-                  "ZI82yseSxSeea0+8KQbZ5mvh1p3qImDLEH/iNSQFAkAghS+tboKPN10NeSt+" +
-                  "uiGRRWNbiggv0YJ7Uldcq3ZeLQPp7/naiekCRUsHD4Qr97OrZf7jQ1HlRqTu" +
-                  "eZScjMLhAkBNUMZCQnhwFAyEzdPkQ7LpU1MdyEopYmRssuxijZao5JLqQAGw" +
-                  "YCzXokGFa7hz72b09F4DQurJL/WuDlvvu4jdAkEAxwT9lylvfSfEQw4/qQgZ" +
-                  "MFB26gqB6Gqs1pHIZCzdliKx5BO3VDeUGfXMI8yOkbXoWbYx5xPid/+N8R//" +
-                  "+sxLBw==");
-
-        byte[] envData = Base64.decode(
-                  "MIAGCSqGSIb3DQEHA6CAMIACAQAxgcQwgcECAQAwKjAlMRYwFAYDVQQKEw1C" +
-                  "b3VuY3kgQ2FzdGxlMQswCQYDVQQGEwJBVQIBHjANBgkqhkiG9w0BAQEFAASB" +
-                  "gDmnaDZ0vDJNlaUSYyEXsgbaUH+itNTjCOgv77QTX2ImXj+kTctM19PQF2I1" +
-                  "0/NL0fjakvCgBTHKmk13a7jqB6cX3bysenHNrglHsgNGgeXQ7ggAq5fV/JQQ" +
-                  "T7rSxEtuwpbuHQnoVUZahOHVKy/a0uLr9iIh1A3y+yZTZaG505ZJMIAGCSqG" +
-                  "SIb3DQEHATAdBglghkgBZQMEAQIEENmkYNbDXiZxJWtq82qIRZKggAQgkOGr" +
-                  "1JcTsADStez1eY4+rO4DtyBIyUYQ3pilnbirfPkAAAAAAAAAAAAA");
-
-
-        CMSEnvelopedDataParser     ep = new CMSEnvelopedDataParser(envData);
-
-        RecipientInformationStore  recipients = ep.getRecipientInfos();
-
-        assertEquals(ep.getEncryptionAlgOID(), CMSEnvelopedDataGenerator.AES128_CBC);
-
-        Collection  c = recipients.getRecipients();
-        Iterator    it = c.iterator();
-
-        PKCS8EncodedKeySpec keySpec = new PKCS8EncodedKeySpec(keyData);
-        KeyFactory          keyFact = KeyFactory.getInstance("RSA", BC);
-        PrivateKey          priKey = keyFact.generatePrivate(keySpec);
-        byte[]              data = Hex.decode("57616c6c6157616c6c6157617368696e67746f6e");
-
-        while (it.hasNext())
-        {
-            RecipientInformation   recipient = (RecipientInformation)it.next();
-
-            assertEquals(recipient.getKeyEncryptionAlgOID(), PKCSObjectIdentifiers.rsaEncryption.getId());
-
-            CMSTypedStream recData = recipient.getContentStream(new JceKeyTransEnvelopedRecipient(priKey).setProvider(BC));
-
-            assertEquals(true, Arrays.equals(data, CMSTestUtil.streamToByteArray(recData.getContentStream())));
-        }
-    }
-
-    private void verifyData(
-        ByteArrayOutputStream encodedStream,
-        String                expectedOid,
-        byte[]                expectedData)
-        throws Exception
-    {
-        CMSEnvelopedDataParser     ep = new CMSEnvelopedDataParser(encodedStream.toByteArray());
-        RecipientInformationStore  recipients = ep.getRecipientInfos();
-
-        assertEquals(ep.getEncryptionAlgOID(), expectedOid);
-
-        Collection  c = recipients.getRecipients();
-        Iterator    it = c.iterator();
-
-        while (it.hasNext())
-        {
-            RecipientInformation   recipient = (RecipientInformation)it.next();
-
-            assertEquals(recipient.getKeyEncryptionAlgOID(), PKCSObjectIdentifiers.rsaEncryption.getId());
-
-            CMSTypedStream recData = recipient.getContentStream(new JceKeyTransEnvelopedRecipient(_reciKP.getPrivate()).setProvider(BC));
-
-            assertEquals(true, Arrays.equals(expectedData, CMSTestUtil.streamToByteArray(recData.getContentStream())));
-        }
-    }
-
-    public void testUnprotectedAttributes()
-        throws Exception
-    {
-        byte[]          data     = "WallaWallaWashington".getBytes();
-
-        CMSEnvelopedDataStreamGenerator edGen = new CMSEnvelopedDataStreamGenerator();
-
-        edGen.addRecipientInfoGenerator(new JceKeyTransRecipientInfoGenerator(_reciCert).setProvider(BC));
-
-        Hashtable attrs = new Hashtable();
-
-        attrs.put(PKCSObjectIdentifiers.id_aa_contentHint, new Attribute(PKCSObjectIdentifiers.id_aa_contentHint, new DERSet(new DERUTF8String("Hint"))));
-        attrs.put(PKCSObjectIdentifiers.id_aa_receiptRequest, new Attribute(PKCSObjectIdentifiers.id_aa_receiptRequest, new DERSet(new DERUTF8String("Request"))));
-
-        AttributeTable attrTable = new AttributeTable(attrs);
-
-        edGen.setUnprotectedAttributeGenerator(new SimpleAttributeTableGenerator(attrTable));
-
-        ByteArrayOutputStream  bOut = new ByteArrayOutputStream();
-
-        OutputStream out = edGen.open(
-                                bOut, new JceCMSContentEncryptorBuilder(CMSAlgorithm.AES128_CBC).setProvider(BC).build());
-
-        out.write(data);
-
-        out.close();
-
-        CMSEnvelopedDataParser ed = new CMSEnvelopedDataParser(bOut.toByteArray());
-
-        RecipientInformationStore  recipients = ed.getRecipientInfos();
-
-        Collection  c = recipients.getRecipients();
-
-        assertEquals(1, c.size());
-
-        Iterator    it = c.iterator();
-
-        while (it.hasNext())
-        {
-            RecipientInformation   recipient = (RecipientInformation)it.next();
-
-            assertEquals(recipient.getKeyEncryptionAlgOID(), PKCSObjectIdentifiers.rsaEncryption.getId());
-
-            byte[] recData = recipient.getContent(new JceKeyTransEnvelopedRecipient(_reciKP.getPrivate()).setProvider(BC));
-
-            assertEquals(true, Arrays.equals(data, recData));
-        }
-
-        attrTable = ed.getUnprotectedAttributes();
-
-        assertEquals(attrs.size(), 2);
-
-        assertEquals(new DERUTF8String("Hint"), attrTable.get(PKCSObjectIdentifiers.id_aa_contentHint).getAttrValues().getObjectAt(0));
-        assertEquals(new DERUTF8String("Request"), attrTable.get(PKCSObjectIdentifiers.id_aa_receiptRequest).getAttrValues().getObjectAt(0));
-
-    }
-
-    public void testKeyTransAES128BufferedStream()
-        throws Exception
-    {
-        byte[] data = new byte[2000];
-
-        for (int i = 0; i != 2000; i++)
-        {
-            data[i] = (byte)(i & 0xff);
-        }
-
-        //
-        // unbuffered
-        //
-        CMSEnvelopedDataStreamGenerator edGen = new CMSEnvelopedDataStreamGenerator();
-
-        edGen.addRecipientInfoGenerator(new JceKeyTransRecipientInfoGenerator(_reciCert).setProvider(BC));
-
-        ByteArrayOutputStream  bOut = new ByteArrayOutputStream();
-
-        OutputStream out = edGen.open(
-                                bOut, new JceCMSContentEncryptorBuilder(CMSAlgorithm.AES128_CBC).setProvider(BC).build());
-
-        for (int i = 0; i != 2000; i++)
-        {
-            out.write(data[i]);
-        }
-
-        out.close();
-
-        verifyData(bOut, CMSEnvelopedDataGenerator.AES128_CBC, data);
-
-        int unbufferedLength = bOut.toByteArray().length;
-
-        //
-        // Using buffered output - should be == to unbuffered
-        //
-        edGen = new CMSEnvelopedDataStreamGenerator();
-
-        edGen.addRecipientInfoGenerator(new JceKeyTransRecipientInfoGenerator(_reciCert).setProvider(BC));
-
-        bOut = new ByteArrayOutputStream();
-
-        out = edGen.open(bOut, new JceCMSContentEncryptorBuilder(CMSAlgorithm.AES128_CBC).setProvider(BC).build());
-
-        BufferedOutputStream bfOut = new BufferedOutputStream(out, 300);
-
-        for (int i = 0; i != 2000; i++)
-        {
-            bfOut.write(data[i]);
-        }
-
-        bfOut.close();
-
-        verifyData(bOut, CMSEnvelopedDataGenerator.AES128_CBC, data);
-
-        assertTrue(bOut.toByteArray().length == unbufferedLength);
-    }
-
-    public void testKeyTransAES128Buffered()
-        throws Exception
-    {
-        byte[] data = new byte[2000];
-
-        for (int i = 0; i != 2000; i++)
-        {
-            data[i] = (byte)(i & 0xff);
-        }
-
-        //
-        // unbuffered
-        //
-        CMSEnvelopedDataStreamGenerator edGen = new CMSEnvelopedDataStreamGenerator();
-
-        edGen.addRecipientInfoGenerator(new JceKeyTransRecipientInfoGenerator(_reciCert).setProvider(BC));
-
-        ByteArrayOutputStream  bOut = new ByteArrayOutputStream();
-
-        OutputStream out = edGen.open(
-                                bOut, new JceCMSContentEncryptorBuilder(CMSAlgorithm.AES128_CBC).setProvider(BC).build());
-
-        for (int i = 0; i != 2000; i++)
-        {
-            out.write(data[i]);
-        }
-
-        out.close();
-
-        verifyData(bOut, CMSEnvelopedDataGenerator.AES128_CBC, data);
-
-        int unbufferedLength = bOut.toByteArray().length;
-
-        //
-        // buffered - less than default of 1000
-        //
-        edGen = new CMSEnvelopedDataStreamGenerator();
-
-        edGen.setBufferSize(300);
-
-        edGen.addRecipientInfoGenerator(new JceKeyTransRecipientInfoGenerator(_reciCert).setProvider(BC));
-
-        bOut = new ByteArrayOutputStream();
-
-        out = edGen.open(bOut, new JceCMSContentEncryptorBuilder(CMSAlgorithm.AES128_CBC).setProvider(BC).build());
-
-        for (int i = 0; i != 2000; i++)
-        {
-            out.write(data[i]);
-        }
-
-        out.close();
-
-        verifyData(bOut, CMSEnvelopedDataGenerator.AES128_CBC, data);
-
-        assertTrue(bOut.toByteArray().length > unbufferedLength);
-    }
-
-    public void testKeyTransAES128Der()
-        throws Exception
-    {
-        byte[] data = new byte[2000];
-
-        for (int i = 0; i != 2000; i++)
-        {
-            data[i] = (byte)(i & 0xff);
-        }
-
-        CMSEnvelopedDataStreamGenerator edGen = new CMSEnvelopedDataStreamGenerator();
-
-        edGen.addRecipientInfoGenerator(new JceKeyTransRecipientInfoGenerator(_reciCert).setProvider(BC));
-
-        ByteArrayOutputStream  bOut = new ByteArrayOutputStream();
-
-        OutputStream out = edGen.open(
-                                bOut, new JceCMSContentEncryptorBuilder(CMSAlgorithm.AES128_CBC).setProvider(BC).build());
-
-        for (int i = 0; i != 2000; i++)
-        {
-            out.write(data[i]);
-        }
-
-        out.close();
-
-        // convert to DER
-        ASN1InputStream aIn = new ASN1InputStream(bOut.toByteArray());
-
-        bOut.reset();
-
-        DEROutputStream dOut = new DEROutputStream(bOut);
-
-        dOut.writeObject(aIn.readObject());
-
-        verifyData(bOut, CMSEnvelopedDataGenerator.AES128_CBC, data);
-    }
-
-    public void testKeyTransAES128Throughput()
-        throws Exception
-    {
-        byte[] data = new byte[40001];
-
-        for (int i = 0; i != data.length; i++)
-        {
-            data[i] = (byte)(i & 0xff);
-        }
-
-        //
-        // buffered
-        //
-        CMSEnvelopedDataStreamGenerator edGen = new CMSEnvelopedDataStreamGenerator();
-
-        edGen.setBufferSize(BUFFER_SIZE);
-
-        edGen.addRecipientInfoGenerator(new JceKeyTransRecipientInfoGenerator(_reciCert).setProvider(BC));
-
-        ByteArrayOutputStream bOut = new ByteArrayOutputStream();
-
-        OutputStream out = edGen.open(bOut, new JceCMSContentEncryptorBuilder(CMSAlgorithm.AES128_CBC).setProvider(BC).build());
-
-        for (int i = 0; i != data.length; i++)
-        {
-            out.write(data[i]);
-        }
-
-        out.close();
-
-        CMSEnvelopedDataParser     ep = new CMSEnvelopedDataParser(bOut.toByteArray());
-        RecipientInformationStore  recipients = ep.getRecipientInfos();
-        Collection                 c = recipients.getRecipients();
-        Iterator                   it = c.iterator();
-
-        if (it.hasNext())
-        {
-            RecipientInformation   recipient = (RecipientInformation)it.next();
-
-            assertEquals(recipient.getKeyEncryptionAlgOID(), PKCSObjectIdentifiers.rsaEncryption.getId());
-
-            CMSTypedStream recData = recipient.getContentStream(new JceKeyTransEnvelopedRecipient(_reciKP.getPrivate()).setProvider(BC));
-
-            InputStream           dataStream = recData.getContentStream();
-            ByteArrayOutputStream dataOut = new ByteArrayOutputStream();
-            int                   len;
-            byte[]                buf = new byte[BUFFER_SIZE];
-            int                   count = 0;
-
-            while (count != 10 && (len = dataStream.read(buf)) > 0)
-            {
-                assertEquals(buf.length, len);
-
-                dataOut.write(buf);
-                count++;
-            }
-
-            len = dataStream.read(buf);
-            dataOut.write(buf, 0, len);
-
-            assertEquals(true, Arrays.equals(data, dataOut.toByteArray()));
-        }
-        else
-        {
-            fail("recipient not found.");
-        }
-    }
-
-    public void testKeyTransAES128AndOriginatorInfo()
-        throws Exception
-    {
-        byte[]          data     = "WallaWallaWashington".getBytes();
-
-        CMSEnvelopedDataStreamGenerator edGen = new CMSEnvelopedDataStreamGenerator();
-
-        X509CertificateHolder origCert = new X509CertificateHolder(_origCert.getEncoded());
-
-        edGen.setOriginatorInfo(new OriginatorInfoGenerator(origCert).generate());
-
-        edGen.addRecipientInfoGenerator(new JceKeyTransRecipientInfoGenerator(_reciCert).setProvider(BC));
-
-        ByteArrayOutputStream  bOut = new ByteArrayOutputStream();
-
-        OutputStream out = edGen.open(
-                                bOut, new JceCMSContentEncryptorBuilder(CMSAlgorithm.AES128_CBC).setProvider(BC).build());
-
-        out.write(data);
-
-        out.close();
-
-        CMSEnvelopedDataParser     ep = new CMSEnvelopedDataParser(bOut.toByteArray());
-
-        assertTrue(ep.getOriginatorInfo().getCertificates().getMatches(null).contains(origCert));
-
-        RecipientInformationStore  recipients = ep.getRecipientInfos();
-
-        assertEquals(ep.getEncryptionAlgOID(), CMSEnvelopedDataGenerator.AES128_CBC);
-
-        Collection  c = recipients.getRecipients();
-        Iterator    it = c.iterator();
-
-        while (it.hasNext())
-        {
-            RecipientInformation   recipient = (RecipientInformation)it.next();
-
-            assertEquals(recipient.getKeyEncryptionAlgOID(), PKCSObjectIdentifiers.rsaEncryption.getId());
-
-            CMSTypedStream recData = recipient.getContentStream(new JceKeyTransEnvelopedRecipient(_reciKP.getPrivate()).setProvider(BC));
-
-            assertEquals(true, Arrays.equals(data, CMSTestUtil.streamToByteArray(recData.getContentStream())));
-        }
-
-        ep.close();
-    }
-
-    public void testKeyTransAES128()
-        throws Exception
-    {
-        byte[]          data     = "WallaWallaWashington".getBytes();
-
-        CMSEnvelopedDataStreamGenerator edGen = new CMSEnvelopedDataStreamGenerator();
-
-        edGen.addRecipientInfoGenerator(new JceKeyTransRecipientInfoGenerator(_reciCert).setProvider(BC));
-
-        ByteArrayOutputStream  bOut = new ByteArrayOutputStream();
-
-        OutputStream out = edGen.open(
-                                bOut, new JceCMSContentEncryptorBuilder(CMSAlgorithm.AES128_CBC).setProvider(BC).build());
-
-        out.write(data);
-
-        out.close();
-
-        CMSEnvelopedDataParser     ep = new CMSEnvelopedDataParser(bOut.toByteArray());
-
-        RecipientInformationStore  recipients = ep.getRecipientInfos();
-
-        assertEquals(ep.getEncryptionAlgOID(), CMSEnvelopedDataGenerator.AES128_CBC);
-
-        Collection  c = recipients.getRecipients();
-        Iterator    it = c.iterator();
-
-        while (it.hasNext())
-        {
-            RecipientInformation   recipient = (RecipientInformation)it.next();
-
-            assertEquals(recipient.getKeyEncryptionAlgOID(), PKCSObjectIdentifiers.rsaEncryption.getId());
-
-            CMSTypedStream recData = recipient.getContentStream(new JceKeyTransEnvelopedRecipient(_reciKP.getPrivate()).setProvider(BC));
-
-            assertEquals(true, Arrays.equals(data, CMSTestUtil.streamToByteArray(recData.getContentStream())));
-        }
-
-        ep.close();
-    }
-
-    public void testKeyTransCAST5SunJCE()
-        throws Exception
-    {
-        if (Security.getProvider("SunJCE") == null)
-        {
-            return;
-        }
-
-        String version = System.getProperty("java.version");
-        if (version.startsWith("1.4") || version.startsWith("1.3"))
-        {
-            return;
-        }
-
-        byte[]          data     = "WallaWallaWashington".getBytes();
-
-        CMSEnvelopedDataStreamGenerator edGen = new CMSEnvelopedDataStreamGenerator();
-
-        edGen.addRecipientInfoGenerator(new JceKeyTransRecipientInfoGenerator(_reciCert).setProvider("SunJCE"));
-
-        ByteArrayOutputStream  bOut = new ByteArrayOutputStream();
-
-        OutputStream out = edGen.open(
-                                bOut, new JceCMSContentEncryptorBuilder(CMSAlgorithm.CAST5_CBC).setProvider(BC).build());
-
-        out.write(data);
-
-        out.close();
-
-        CMSEnvelopedDataParser     ep = new CMSEnvelopedDataParser(bOut.toByteArray());
-
-        RecipientInformationStore  recipients = ep.getRecipientInfos();
-
-        assertEquals(ep.getEncryptionAlgOID(), CMSEnvelopedDataGenerator.CAST5_CBC);
-
-        Collection  c = recipients.getRecipients();
-        Iterator    it = c.iterator();
-
-        while (it.hasNext())
-        {
-            RecipientInformation   recipient = (RecipientInformation)it.next();
-
-            assertEquals(recipient.getKeyEncryptionAlgOID(), PKCSObjectIdentifiers.rsaEncryption.getId());
-
-            CMSTypedStream recData = recipient.getContentStream(new JceKeyTransEnvelopedRecipient(_reciKP.getPrivate()).setProvider("SunJCE").setContentProvider(BC));
-
-            assertEquals(true, Arrays.equals(data, CMSTestUtil.streamToByteArray(recData.getContentStream())));
-        }
-
-        ep.close();
-    }
-
-    public void testAESKEK()
-        throws Exception
-    {
-        byte[]    data = "WallaWallaWashington".getBytes();
-        SecretKey kek  = CMSTestUtil.makeAES192Key();
-
-        CMSEnvelopedDataStreamGenerator edGen = new CMSEnvelopedDataStreamGenerator();
-
-        byte[]  kekId = new byte[] { 1, 2, 3, 4, 5 };
-
-        edGen.addRecipientInfoGenerator(new JceKEKRecipientInfoGenerator(kekId, kek).setProvider(BC));
-
-        ByteArrayOutputStream  bOut = new ByteArrayOutputStream();
-
-        OutputStream out = edGen.open(
-                                bOut,
-                                new JceCMSContentEncryptorBuilder(CMSAlgorithm.DES_EDE3_CBC).setProvider(BC).build());
-        out.write(data);
-
-        out.close();
-
-        CMSEnvelopedDataParser     ep = new CMSEnvelopedDataParser(bOut.toByteArray());
-
-        RecipientInformationStore  recipients = ep.getRecipientInfos();
-
-        assertEquals(ep.getEncryptionAlgOID(), CMSEnvelopedDataGenerator.DES_EDE3_CBC);
-
-        Collection  c = recipients.getRecipients();
-        Iterator    it = c.iterator();
-
-        while (it.hasNext())
-        {
-            RecipientInformation   recipient = (RecipientInformation)it.next();
-
-            assertEquals(recipient.getKeyEncryptionAlgOID(), "2.16.840.1.101.3.4.1.25");
-
-            CMSTypedStream recData = recipient.getContentStream(new JceKEKEnvelopedRecipient(kek).setProvider(BC));
-
-            assertEquals(true, Arrays.equals(data, CMSTestUtil.streamToByteArray(recData.getContentStream())));
-        }
-
-        ep.close();
-    }
-
-    public void testTwoAESKEK()
-        throws Exception
-    {
-        byte[]    data = "WallaWallaWashington".getBytes();
-        SecretKey kek1  = CMSTestUtil.makeAES192Key();
-        SecretKey kek2  = CMSTestUtil.makeAES192Key();
-
-        CMSEnvelopedDataStreamGenerator edGen = new CMSEnvelopedDataStreamGenerator();
-
-        byte[]  kekId1 = new byte[] { 1, 2, 3, 4, 5 };
-        byte[]  kekId2 = new byte[] { 5, 4, 3, 2, 1 };
-
-        edGen.addRecipientInfoGenerator(new JceKEKRecipientInfoGenerator(kekId1, kek1).setProvider(BC));
-        edGen.addRecipientInfoGenerator(new JceKEKRecipientInfoGenerator(kekId2, kek2).setProvider(BC));
-
-        ByteArrayOutputStream  bOut = new ByteArrayOutputStream();
-
-        OutputStream out = edGen.open(
-                                bOut,
-                                new JceCMSContentEncryptorBuilder(CMSAlgorithm.DES_EDE3_CBC).setProvider(BC).build());
-        out.write(data);
-
-        out.close();
-
-        CMSEnvelopedDataParser     ep = new CMSEnvelopedDataParser(bOut.toByteArray());
-
-        RecipientInformationStore  recipients = ep.getRecipientInfos();
-
-        assertEquals(ep.getEncryptionAlgOID(), CMSEnvelopedDataGenerator.DES_EDE3_CBC);
-
-        RecipientId                recSel = new KEKRecipientId(kekId2);
-
-        RecipientInformation       recipient = recipients.get(recSel);
-
-        assertEquals(recipient.getKeyEncryptionAlgOID(), "2.16.840.1.101.3.4.1.25");
-
-        CMSTypedStream recData = recipient.getContentStream(new JceKEKEnvelopedRecipient(kek2).setProvider(BC));
-
-        assertEquals(true, Arrays.equals(data, CMSTestUtil.streamToByteArray(recData.getContentStream())));
-
-        ep.close();
-    }
-
-    public void testECKeyAgree()
-        throws Exception
-    {
-        byte[] data = Hex.decode("504b492d4320434d5320456e76656c6f706564446174612053616d706c65");
-
-        CMSEnvelopedDataStreamGenerator edGen = new CMSEnvelopedDataStreamGenerator();
-
-        JceKeyAgreeRecipientInfoGenerator recipientGenerator = new JceKeyAgreeRecipientInfoGenerator(CMSAlgorithm.ECDH_SHA1KDF, _origEcKP.getPrivate(), _origEcKP.getPublic(), CMSAlgorithm.AES128_WRAP).setProvider(BC);
-
-        recipientGenerator.addRecipient(_reciEcCert);
-
-        edGen.addRecipientInfoGenerator(recipientGenerator);
-        
-        ByteArrayOutputStream  bOut = new ByteArrayOutputStream();
-
-        OutputStream out = edGen.open(
-                                bOut,
-                                new JceCMSContentEncryptorBuilder(CMSAlgorithm.AES128_CBC).setProvider(BC).build());
-        out.write(data);
-
-        out.close();
-
-        CMSEnvelopedDataParser     ep = new CMSEnvelopedDataParser(bOut.toByteArray());
-
-        RecipientInformationStore  recipients = ep.getRecipientInfos();
-
-        assertEquals(ep.getEncryptionAlgOID(), CMSEnvelopedDataGenerator.AES128_CBC);
-
-        RecipientId                recSel = new JceKeyAgreeRecipientId(_reciEcCert);
-
-        RecipientInformation       recipient = recipients.get(recSel);
-
-        CMSTypedStream recData = recipient.getContentStream(new JceKeyAgreeEnvelopedRecipient(_reciEcKP.getPrivate()).setProvider(BC));
-
-        assertEquals(true, Arrays.equals(data, CMSTestUtil.streamToByteArray(recData.getContentStream())));
-
-        ep.close();
-    }
-
-    public void testOriginatorInfo()
-        throws Exception
-    {
-        CMSEnvelopedDataParser env = new CMSEnvelopedDataParser(CMSSampleMessages.originatorMessage);
-
-        OriginatorInformation origInfo = env.getOriginatorInfo();
-
-        RecipientInformationStore  recipients = env.getRecipientInfos();
-
-        assertEquals(new X500Name("C=US,O=U.S. Government,OU=HSPD12Lab,OU=Agents,CN=user1"), ((X509CertificateHolder)origInfo.getCertificates().getMatches(null).iterator().next()).getSubject());
-        assertEquals(CMSEnvelopedDataGenerator.DES_EDE3_CBC, env.getEncryptionAlgOID());
-    }
-
-    public static Test suite()
-        throws Exception
-    {
-        return new CMSTestSetup(new TestSuite(NewEnvelopedDataStreamTest.class));
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cms/test/NewEnvelopedDataTest.java b/bcpkix/src/main/java/org/bouncycastle/cms/test/NewEnvelopedDataTest.java
deleted file mode 100644
index f5f47ad..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cms/test/NewEnvelopedDataTest.java
+++ /dev/null
@@ -1,1571 +0,0 @@
-package org.bouncycastle.cms.test;
-
-import java.io.IOException;
-import java.security.*;
-import java.security.cert.CertificateEncodingException;
-import java.security.cert.X509Certificate;
-import java.security.spec.MGF1ParameterSpec;
-import java.security.spec.PKCS8EncodedKeySpec;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Hashtable;
-import java.util.Iterator;
-
-import javax.crypto.SecretKey;
-import javax.crypto.spec.OAEPParameterSpec;
-import javax.crypto.spec.PSource;
-import javax.crypto.spec.SecretKeySpec;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DEROctetString;
-import org.bouncycastle.asn1.DERSet;
-import org.bouncycastle.asn1.DERUTF8String;
-import org.bouncycastle.asn1.cms.*;
-import org.bouncycastle.asn1.kisa.KISAObjectIdentifiers;
-import org.bouncycastle.asn1.nist.NISTObjectIdentifiers;
-import org.bouncycastle.asn1.ntt.NTTObjectIdentifiers;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.asn1.pkcs.RC2CBCParameter;
-import org.bouncycastle.asn1.x500.X500Name;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.asn1.x509.Extension;
-import org.bouncycastle.cert.X509CertificateHolder;
-import org.bouncycastle.cert.jcajce.JcaX509CertificateHolder;
-import org.bouncycastle.cms.CMSAlgorithm;
-import org.bouncycastle.cms.CMSEnvelopedData;
-import org.bouncycastle.cms.CMSEnvelopedDataGenerator;
-import org.bouncycastle.cms.CMSException;
-import org.bouncycastle.cms.CMSProcessableByteArray;
-import org.bouncycastle.cms.KeyTransRecipientInformation;
-import org.bouncycastle.cms.OriginatorInfoGenerator;
-import org.bouncycastle.cms.OriginatorInformation;
-import org.bouncycastle.cms.PasswordRecipient;
-import org.bouncycastle.cms.PasswordRecipientInformation;
-import org.bouncycastle.cms.RecipientId;
-import org.bouncycastle.cms.RecipientInformation;
-import org.bouncycastle.cms.RecipientInformationStore;
-import org.bouncycastle.cms.SimpleAttributeTableGenerator;
-import org.bouncycastle.cms.bc.BcCMSContentEncryptorBuilder;
-import org.bouncycastle.cms.bc.BcRSAKeyTransRecipientInfoGenerator;
-import org.bouncycastle.cms.jcajce.JceCMSContentEncryptorBuilder;
-import org.bouncycastle.cms.jcajce.JceKEKEnvelopedRecipient;
-import org.bouncycastle.cms.jcajce.JceKEKRecipientInfoGenerator;
-import org.bouncycastle.cms.jcajce.JceKeyAgreeEnvelopedRecipient;
-import org.bouncycastle.cms.jcajce.JceKeyAgreeRecipientId;
-import org.bouncycastle.cms.jcajce.JceKeyAgreeRecipientInfoGenerator;
-import org.bouncycastle.cms.jcajce.JceKeyTransEnvelopedRecipient;
-import org.bouncycastle.cms.jcajce.JceKeyTransRecipientId;
-import org.bouncycastle.cms.jcajce.JceKeyTransRecipientInfoGenerator;
-import org.bouncycastle.cms.jcajce.JcePasswordEnvelopedRecipient;
-import org.bouncycastle.cms.jcajce.JcePasswordRecipientInfoGenerator;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.operator.OutputEncryptor;
-import org.bouncycastle.operator.jcajce.JcaAlgorithmParametersConverter;
-import org.bouncycastle.util.encoders.Base64;
-import org.bouncycastle.util.encoders.Hex;
-
-public class NewEnvelopedDataTest
-    extends TestCase
-{
-    private static final String BC = BouncyCastleProvider.PROVIDER_NAME;
-    
-    private static String          _signDN;
-    private static KeyPair         _signKP;
-    private static X509Certificate _signCert;
-
-    private static String          _origDN;
-    private static KeyPair         _origKP;
-    private static X509Certificate _origCert;
-
-    private static String          _reciDN;
-    private static String          _reciDN2;
-    private static KeyPair         _reciKP;
-    private static KeyPair         _reciOaepKP;
-    private static X509Certificate _reciCert;
-    private static X509Certificate _reciCertOaep;
-
-    private static KeyPair         _origEcKP;
-    private static KeyPair         _reciEcKP;
-    private static X509Certificate _reciEcCert;
-    private static KeyPair         _reciEcKP2;
-    private static X509Certificate _reciEcCert2;
-
-    private static boolean         _initialised = false;
-
-    private byte[] oldKEK = Base64.decode(
-                          "MIAGCSqGSIb3DQEHA6CAMIACAQIxQaI/MD0CAQQwBwQFAQIDBAUwDQYJYIZIAWUDBAEFBQAEI"
-                        + "Fi2eHTPM4bQSjP4DUeDzJZLpfemW2gF1SPq7ZPHJi1mMIAGCSqGSIb3DQEHATAUBggqhkiG9w"
-                        + "0DBwQImtdGyUdGGt6ggAQYk9X9z01YFBkU7IlS3wmsKpm/zpZClTceAAAAAAAAAAAAAA==");
-
-    private byte[] ecKeyAgreeMsgAES256 = Base64.decode(
-           "MIAGCSqGSIb3DQEHA6CAMIACAQIxgcShgcECAQOgQ6FBMAsGByqGSM49AgEF"
-         + "AAMyAAPdXlSTpub+qqno9hUGkUDl+S3/ABhPziIB5yGU4678tgOgU5CiKG9Z"
-         + "kfnabIJ3nZYwGgYJK4EFEIZIPwACMA0GCWCGSAFlAwQBLQUAMFswWTAtMCgx"
-         + "EzARBgNVBAMTCkFkbWluLU1EU0UxETAPBgNVBAoTCDRCQ1QtMklEAgEBBCi/"
-         + "rJRLbFwEVW6PcLLmojjW9lI/xGD7CfZzXrqXFw8iHaf3hTRau1gYMIAGCSqG"
-         + "SIb3DQEHATAdBglghkgBZQMEASoEEMtCnKKPwccmyrbgeSIlA3qggAQQDLw8"
-         + "pNJR97bPpj6baG99bQQQwhEDsoj5Xg1oOxojHVcYzAAAAAAAAAAAAAA=");
-
-    private byte[] ecKeyAgreeMsgAES128 = Base64.decode(
-           "MIAGCSqGSIb3DQEHA6CAMIACAQIxgbShgbECAQOgQ6FBMAsGByqGSM49AgEF"
-         + "AAMyAAL01JLEgKvKh5rbxI/hOxs/9WEezMIsAbUaZM4l5tn3CzXAN505nr5d"
-         + "LhrcurMK+tAwGgYJK4EFEIZIPwACMA0GCWCGSAFlAwQBBQUAMEswSTAtMCgx"
-         + "EzARBgNVBAMTCkFkbWluLU1EU0UxETAPBgNVBAoTCDRCQ1QtMklEAgEBBBhi"
-         + "FLjc5g6aqDT3f8LomljOwl1WTrplUT8wgAYJKoZIhvcNAQcBMB0GCWCGSAFl"
-         + "AwQBAgQQzXjms16Y69S/rB0EbHqRMaCABBAFmc/QdVW6LTKdEy97kaZzBBBa"
-         + "fQuviUS03NycpojELx0bAAAAAAAAAAAAAA==");
-
-    private byte[] ecKeyAgreeMsgDESEDE = Base64.decode(
-           "MIAGCSqGSIb3DQEHA6CAMIACAQIxgcahgcMCAQOgQ6FBMAsGByqGSM49AgEF"
-         + "AAMyAALIici6Nx1WN5f0ThH2A8ht9ovm0thpC5JK54t73E1RDzCifePaoQo0"
-         + "xd6sUqoyGaYwHAYJK4EFEIZIPwACMA8GCyqGSIb3DQEJEAMGBQAwWzBZMC0w"
-         + "KDETMBEGA1UEAxMKQWRtaW4tTURTRTERMA8GA1UEChMINEJDVC0ySUQCAQEE"
-         + "KJuqZQ1NB1vXrKPOnb4TCpYOsdm6GscWdwAAZlm2EHMp444j0s55J9wwgAYJ"
-         + "KoZIhvcNAQcBMBQGCCqGSIb3DQMHBAjwnsDMsafCrKCABBjyPvqFOVMKxxut"
-         + "VfTx4fQlNGJN8S2ATRgECMcTQ/dsmeViAAAAAAAAAAAAAA==");
-
-   private byte[] ecMQVKeyAgreeMsgAES128 = Base64.decode(
-          "MIAGCSqGSIb3DQEHA6CAMIACAQIxgf2hgfoCAQOgQ6FBMAsGByqGSM49AgEF"
-        + "AAMyAAPDKU+0H58tsjpoYmYCInMr/FayvCCkupebgsnpaGEB7qS9vzcNVUj6"
-        + "mrnmiC2grpmhRwRFMEMwQTALBgcqhkjOPQIBBQADMgACZpD13z9c7DzRWx6S"
-        + "0xdbq3S+EJ7vWO+YcHVjTD8NcQDcZcWASW899l1PkL936zsuMBoGCSuBBRCG"
-        + "SD8AEDANBglghkgBZQMEAQUFADBLMEkwLTAoMRMwEQYDVQQDEwpBZG1pbi1N"
-        + "RFNFMREwDwYDVQQKEwg0QkNULTJJRAIBAQQYFq58L71nyMK/70w3nc6zkkRy"
-        + "RL7DHmpZMIAGCSqGSIb3DQEHATAdBglghkgBZQMEAQIEEDzRUpreBsZXWHBe"
-        + "onxOtSmggAQQ7csAZXwT1lHUqoazoy8bhAQQq+9Zjj8iGdOWgyebbfj67QAA"
-        + "AAAAAAAAAAA=");
-
-
-    private byte[] ecKeyAgreeKey = Base64.decode(
-        "MIG2AgEAMBAGByqGSM49AgEGBSuBBAAiBIGeMIGbAgEBBDC8vp7xVTbKSgYVU5Wc"
-      + "hGkWbzaj+yUFETIWP1Dt7+WSpq3ikSPdl7PpHPqnPVZfoIWhZANiAgSYHTgxf+Dd"
-      + "Tt84dUvuSKkFy3RhjxJmjwIscK6zbEUzKhcPQG2GHzXhWK5x1kov0I74XpGhVkya"
-      + "ElH5K6SaOXiXAzcyNGggTOk4+ZFnz5Xl0pBje3zKxPhYu0SnCw7Pcqw=");
-
-    private byte[] bobPrivRsaEncrypt = Base64.decode(
-       "MIIChQIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAKnhZ5g/OdVf"
-     + "8qCTQV6meYmFyDVdmpFb+x0B2hlwJhcPvaUi0DWFbXqYZhRBXM+3twg7CcmR"
-     + "uBlpN235ZR572akzJKN/O7uvRgGGNjQyywcDWVL8hYsxBLjMGAgUSOZPHPtd"
-     + "YMTgXB9T039T2GkB8QX4enDRvoPGXzjPHCyqaqfrAgMBAAECgYBnzUhMmg2P"
-     + "mMIbZf8ig5xt8KYGHbztpwOIlPIcaw+LNd4Ogngwy+e6alatd8brUXlweQqg"
-     + "9P5F4Kmy9Bnah5jWMIR05PxZbMHGd9ypkdB8MKCixQheIXFD/A0HPfD6bRSe"
-     + "TmPwF1h5HEuYHD09sBvf+iU7o8AsmAX2EAnYh9sDGQJBANDDIsbeopkYdo+N"
-     + "vKZ11mY/1I1FUox29XLE6/BGmvE+XKpVC5va3Wtt+Pw7PAhDk7Vb/s7q/WiE"
-     + "I2Kv8zHCueUCQQDQUfweIrdb7bWOAcjXq/JY1PeClPNTqBlFy2bKKBlf4hAr"
-     + "84/sajB0+E0R9KfEILVHIdxJAfkKICnwJAiEYH2PAkA0umTJSChXdNdVUN5q"
-     + "SO8bKlocSHseIVnDYDubl6nA7xhmqU5iUjiEzuUJiEiUacUgFJlaV/4jbOSn"
-     + "I3vQgLeFAkEAni+zN5r7CwZdV+EJBqRd2ZCWBgVfJAZAcpw6iIWchw+dYhKI"
-     + "FmioNRobQ+g4wJhprwMKSDIETukPj3d9NDAlBwJAVxhn1grStavCunrnVNqc"
-     + "BU+B1O8BiR4yPWnLMcRSyFRVJQA7HCp8JlDV6abXd8vPFfXuC9WN7rOvTKF8"
-     + "Y0ZB9qANMAsGA1UdDzEEAwIAEA==");
-
-    private byte[] rfc4134ex5_1 = Base64.decode(
-          "MIIBHgYJKoZIhvcNAQcDoIIBDzCCAQsCAQAxgcAwgb0CAQAwJjASMRAwDgYD"
-        + "VQQDEwdDYXJsUlNBAhBGNGvHgABWvBHTbi7NXXHQMA0GCSqGSIb3DQEBAQUA"
-        + "BIGAC3EN5nGIiJi2lsGPcP2iJ97a4e8kbKQz36zg6Z2i0yx6zYC4mZ7mX7FB"
-        + "s3IWg+f6KgCLx3M1eCbWx8+MDFbbpXadCDgO8/nUkUNYeNxJtuzubGgzoyEd"
-        + "8Ch4H/dd9gdzTd+taTEgS0ipdSJuNnkVY4/M652jKKHRLFf02hosdR8wQwYJ"
-        + "KoZIhvcNAQcBMBQGCCqGSIb3DQMHBAgtaMXpRwZRNYAgDsiSf8Z9P43LrY4O"
-        + "xUk660cu1lXeCSFOSOpOJ7FuVyU=");
-
-    private byte[] rfc4134ex5_2 = Base64.decode(
-            "MIIBZQYJKoZIhvcNAQcDoIIBVjCCAVICAQIxggEAMIG9AgEAMCYwEjEQMA4G"
-         + "A1UEAxMHQ2FybFJTQQIQRjRrx4AAVrwR024uzV1x0DANBgkqhkiG9w0BAQEF"
-         + "AASBgJQmQojGi7Z4IP+CVypBmNFoCDoEp87khtgyff2N4SmqD3RxPx+8hbLQ"
-         + "t9i3YcMwcap+aiOkyqjMalT03VUC0XBOGv+HYI3HBZm/aFzxoq+YOXAWs5xl"
-         + "GerZwTOc9j6AYlK4qXvnztR5SQ8TBjlzytm4V7zg+TGrnGVNQBNw47Ewoj4C"
-         + "AQQwDQQLTWFpbExpc3RSQzIwEAYLKoZIhvcNAQkQAwcCAToEGHcUr5MSJ/g9"
-         + "HnJVHsQ6X56VcwYb+OfojTBJBgkqhkiG9w0BBwEwGgYIKoZIhvcNAwIwDgIC"
-         + "AKAECJwE0hkuKlWhgCBeKNXhojuej3org9Lt7n+wWxOhnky5V50vSpoYRfRR"
-         + "yw==");
-
-    private byte[] tooShort3DES = Base64.decode(
-            "MIAGCSqGSIb3DQEHA6CAMIACAQAxgcQwgcECAQAwKjAlMRYwFAYDVQQKDA1C" +
-            "b3VuY3kgQ2FzdGxlMQswCQYDVQQGEwJBVQIBCjANBgkqhkiG9w0BAQEFAASB" +
-            "gJIM2QN0o6iv8Ux018pVCJ8js+ROV4t6+KoMwLJ4DzRKLU8XCAb9BS+crP+F" +
-            "ghNTxTpTX8TaxPrO4wV0USgVHu2SvFnxNaWZjBDVIyZI2HR4QkSTqFMhsUB2" +
-            "6CuZIWBZkhqQ6ruDfvn9UuBWVnfsBD4iryZ1idr713sDeVo5TyvTMIAGCSqG" +
-            "SIb3DQEHATAUBggqhkiG9w0DBwQIQq9e4+WB3CqggAQIwU4cOlmkWUcAAAAA" +
-            "AAAAAAAA");
-
-    private byte[] tooShort3DESKey = Base64.decode(
-            "MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAODZDCj0nQdV" +
-            "f0GGeFsPjjvPx1Vem0V6IkJ4SzazGKfddk0pX58ZDCnG+S+OPiXmPDqValiu" +
-            "9FtNy2/r9rrf/6qtcVQJkfSJv9E5Y7HgI98L/Y9lKxZWsfRqu/SlYO5zx0Dc" +
-            "2rzDvvZRtrtaq0uuHXWJlbWda2L9S65sv/Le/zvjAgMBAAECgYEAnn+iGMTG" +
-            "ZMMaH6Cg+t/uTa9cPougPMuplt2hd3+sY7izihUeONK5RkHiqmlE2gaAcnOd" +
-            "McKysiIWxGC73mPEnsOObPkaFlneVb5CtjTaTMdptuLNEQkwvtKhuW2HnMra" +
-            "4afEgFZdll3FyRpvW/CDooe4Bppjd4aGn/Sr/o9nOzECQQD4QKLwZssuclji" +
-            "nD/8gU1CqGMMnGNogTMpHm1269HUOE7r1y3MuapUqSWsVhpuEQ8P/Tko0haJ" +
-            "jeZn2eWTbZu/AkEA591snui8FMeGvkRgvyMFNvXZWDEjsh+N74XEL1lykTgZ" +
-            "FQJ+cmThnrdM/8yj1dKkdASYrk5kFJ4PVE6CzDI43QJAFS22eNncJZc9u/9m" +
-            "eg0x4SjqYk4JMQYsripZXlbZ7Mfs+7O8xYVlYZmYjC5ATPmJlmyc7r2VjKCd" +
-            "cmilbEFikwJBAMh7yf8BaBdjitubzjeW9VxXaa37F01eQWD5PfBfHFP6uJ1V" +
-            "AbayCfAtuHN6I7OwJih3DPmyqJC3NrQECs67IjUCQAb4TfVE/2G1s66SGnb4" +
-            "no34BspoV/i4f0uLhJap84bTHcF/ZRSXCmQOCRGdSvQkXHeNPI5Lus6lOHuU" +
-            "vUDbQC8=");
-
-    public NewEnvelopedDataTest()
-    {
-    }
-
-    private static void init()
-        throws Exception
-    {
-        if (!_initialised)
-        {
-            _initialised = true;
-            Security.addProvider(new org.bouncycastle.jce.provider.BouncyCastleProvider());
-
-            _signDN   = "O=Bouncy Castle, C=AU";
-            _signKP   = CMSTestUtil.makeKeyPair();
-            _signCert = CMSTestUtil.makeCertificate(_signKP, _signDN, _signKP, _signDN);
-
-            _origDN   = "CN=Bob, OU=Sales, O=Bouncy Castle, C=AU";
-            _origKP   = CMSTestUtil.makeKeyPair();
-            _origCert = CMSTestUtil.makeCertificate(_origKP, _origDN, _signKP, _signDN);
-
-            _reciDN   = "CN=Doug, OU=Sales, O=Bouncy Castle, C=AU";
-            _reciDN2  = "CN=Fred, OU=Sales, O=Bouncy Castle, C=AU";
-            _reciKP   = CMSTestUtil.makeKeyPair();
-            _reciCert = CMSTestUtil.makeCertificate(_reciKP, _reciDN, _signKP, _signDN);
-            _reciCertOaep = CMSTestUtil.makeOaepCertificate(_reciKP, _reciDN, _signKP, _signDN);
-
-            _origEcKP = CMSTestUtil.makeEcDsaKeyPair();
-            _reciEcKP = CMSTestUtil.makeEcDsaKeyPair();
-            _reciEcCert = CMSTestUtil.makeCertificate(_reciEcKP, _reciDN, _signKP, _signDN);
-            _reciEcKP2 = CMSTestUtil.makeEcDsaKeyPair();
-            _reciEcCert2 = CMSTestUtil.makeCertificate(_reciEcKP2, _reciDN2, _signKP, _signDN);
-        }
-    }
-
-    public static void main(
-        String args[])
-        throws Exception
-    {
-        junit.textui.TestRunner.run(NewEnvelopedDataTest.suite());
-    }
-
-    public static Test suite()
-        throws Exception
-    {
-        init();
-
-        return new CMSTestSetup(new TestSuite(NewEnvelopedDataTest.class));
-    }
-
-    public void testUnprotectedAttributes()
-        throws Exception
-    {
-        byte[]          data     = "WallaWallaWashington".getBytes();
-
-        CMSEnvelopedDataGenerator edGen = new CMSEnvelopedDataGenerator();
-
-        edGen.addRecipientInfoGenerator(new JceKeyTransRecipientInfoGenerator(_reciCert).setProvider(BC));
-
-        Hashtable attrs = new Hashtable();
-
-        attrs.put(PKCSObjectIdentifiers.id_aa_contentHint, new Attribute(PKCSObjectIdentifiers.id_aa_contentHint, new DERSet(new DERUTF8String("Hint"))));
-        attrs.put(PKCSObjectIdentifiers.id_aa_receiptRequest, new Attribute(PKCSObjectIdentifiers.id_aa_receiptRequest, new DERSet(new DERUTF8String("Request"))));
-
-        AttributeTable attrTable = new AttributeTable(attrs);
-
-        edGen.setUnprotectedAttributeGenerator(new SimpleAttributeTableGenerator(attrTable));
-
-        CMSEnvelopedData ed = edGen.generate(
-                                new CMSProcessableByteArray(data),
-                                new JceCMSContentEncryptorBuilder(CMSAlgorithm.DES_EDE3_CBC).setProvider(BC).build());
-
-        RecipientInformationStore  recipients = ed.getRecipientInfos();
-
-        assertEquals(ed.getEncryptionAlgOID(), CMSEnvelopedDataGenerator.DES_EDE3_CBC);
-
-        attrTable = ed.getUnprotectedAttributes();
-
-        assertEquals(attrs.size(), 2);
-
-        assertEquals(new DERUTF8String("Hint"), attrTable.get(PKCSObjectIdentifiers.id_aa_contentHint).getAttrValues().getObjectAt(0));
-        assertEquals(new DERUTF8String("Request"), attrTable.get(PKCSObjectIdentifiers.id_aa_receiptRequest).getAttrValues().getObjectAt(0));
-                
-        Collection  c = recipients.getRecipients();
-
-        assertEquals(1, c.size());
-
-        Iterator    it = c.iterator();
-
-        while (it.hasNext())
-        {
-            RecipientInformation   recipient = (RecipientInformation)it.next();
-
-            assertEquals(recipient.getKeyEncryptionAlgOID(), PKCSObjectIdentifiers.rsaEncryption.getId());
-
-            byte[] recData = recipient.getContent(new JceKeyTransEnvelopedRecipient(_reciKP.getPrivate()).setProvider(BC));
-
-            assertEquals(true, Arrays.equals(data, recData));
-        }
-    }
-
-    public void testKeyTrans()
-        throws Exception
-    {
-        byte[]          data     = "WallaWallaWashington".getBytes();
-
-        CMSEnvelopedDataGenerator edGen = new CMSEnvelopedDataGenerator();
-
-        edGen.addRecipientInfoGenerator(new JceKeyTransRecipientInfoGenerator(_reciCert).setProvider(BC));
-        edGen.addRecipientInfoGenerator(new JceKeyTransRecipientInfoGenerator(ASN1OctetString.getInstance(ASN1OctetString.getInstance(_reciCert.getExtensionValue(Extension.subjectKeyIdentifier.getId())).getOctets()).getOctets(), _reciCert.getPublicKey()).setProvider(BC));
-
-        CMSEnvelopedData ed = edGen.generate(
-                                new CMSProcessableByteArray(data),
-                                new JceCMSContentEncryptorBuilder(CMSAlgorithm.DES_EDE3_CBC).setProvider(BC).build());
-
-        RecipientInformationStore  recipients = ed.getRecipientInfos();
-
-
-        assertEquals(ed.getEncryptionAlgOID(), CMSEnvelopedDataGenerator.DES_EDE3_CBC);
-
-        Collection  c = recipients.getRecipients();
-
-        assertEquals(2, c.size());
-
-        Iterator    it = c.iterator();
-
-        while (it.hasNext())
-        {
-            RecipientInformation   recipient = (RecipientInformation)it.next();
-
-            assertEquals(recipient.getKeyEncryptionAlgOID(), PKCSObjectIdentifiers.rsaEncryption.getId());
-
-            byte[] recData = recipient.getContent(new JceKeyTransEnvelopedRecipient(_reciKP.getPrivate()).setProvider(BC));
-
-            assertEquals(true, Arrays.equals(data, recData));
-        }
-
-        RecipientId id = new JceKeyTransRecipientId(_reciCert);
-
-        Collection collection = recipients.getRecipients(id);
-        if (collection.size() != 2)
-        {
-            fail("recipients not matched using general recipient ID.");
-        }
-        assertTrue(collection.iterator().next() instanceof RecipientInformation);
-    }
-
-    public void testKeyTransOAEPDefault()
-        throws Exception
-    {
-        byte[]          data     = "WallaWallaWashington".getBytes();
-
-        CMSEnvelopedDataGenerator edGen = new CMSEnvelopedDataGenerator();
-        JcaAlgorithmParametersConverter  paramsConverter = new JcaAlgorithmParametersConverter();
-
-        edGen.addRecipientInfoGenerator(new JceKeyTransRecipientInfoGenerator(_reciCert, paramsConverter.getAlgorithmIdentifier(PKCSObjectIdentifiers.id_RSAES_OAEP, OAEPParameterSpec.DEFAULT)).setProvider(BC));
-        edGen.addRecipientInfoGenerator(new JceKeyTransRecipientInfoGenerator(ASN1OctetString.getInstance(ASN1OctetString.getInstance(_reciCert.getExtensionValue(Extension.subjectKeyIdentifier.getId())).getOctets()).getOctets(), paramsConverter.getAlgorithmIdentifier(PKCSObjectIdentifiers.id_RSAES_OAEP, OAEPParameterSpec.DEFAULT), _reciCert.getPublicKey()).setProvider(BC));
-
-        CMSEnvelopedData ed = edGen.generate(
-                                new CMSProcessableByteArray(data),
-                                new JceCMSContentEncryptorBuilder(CMSAlgorithm.DES_EDE3_CBC).setProvider(BC).build());
-
-        RecipientInformationStore  recipients = ed.getRecipientInfos();
-
-
-        assertEquals(ed.getEncryptionAlgOID(), CMSEnvelopedDataGenerator.DES_EDE3_CBC);
-
-        Collection  c = recipients.getRecipients();
-
-        assertEquals(2, c.size());
-
-        Iterator    it = c.iterator();
-
-        while (it.hasNext())
-        {
-            RecipientInformation   recipient = (RecipientInformation)it.next();
-
-            assertEquals(PKCSObjectIdentifiers.id_RSAES_OAEP, recipient.getKeyEncryptionAlgorithm().getAlgorithm());
-
-            byte[] recData = recipient.getContent(new JceKeyTransEnvelopedRecipient(_reciKP.getPrivate()).setProvider(BC));
-
-            assertEquals(true, Arrays.equals(data, recData));
-        }
-
-        RecipientId id = new JceKeyTransRecipientId(_reciCert);
-
-        Collection collection = recipients.getRecipients(id);
-        if (collection.size() != 2)
-        {
-            fail("recipients not matched using general recipient ID.");
-        }
-        assertTrue(collection.iterator().next() instanceof RecipientInformation);
-    }
-
-    public void testKeyTransOAEPSHA1()
-            throws Exception
-    {
-        doTestKeyTransOAEPDefaultNamed("SHA-1");
-    }
-
-    public void testKeyTransOAEPSHA224()
-            throws Exception
-    {
-        doTestKeyTransOAEPDefaultNamed("SHA-224");
-    }
-
-    public void testKeyTransOAEPSHA256()
-            throws Exception
-    {
-        doTestKeyTransOAEPDefaultNamed("SHA-256");
-    }
-
-    public void testKeyTransOAEPSHA1AndSHA256()
-            throws Exception
-    {
-        doTestKeyTransOAEPDefaultNamed("SHA-1", "SHA-256");
-    }
-
-    private void doTestKeyTransOAEPDefaultNamed(String digest)
-        throws Exception
-    {
-        doTestKeyTransOAEPDefaultNamed(digest, digest);
-    }
-
-    private void doTestKeyTransOAEPDefaultNamed(String digest, String mgfDigest)
-        throws Exception
-    {
-        byte[]          data     = "WallaWallaWashington".getBytes();
-
-        CMSEnvelopedDataGenerator edGen = new CMSEnvelopedDataGenerator();
-        JcaAlgorithmParametersConverter  paramsConverter = new JcaAlgorithmParametersConverter();
-
-        OAEPParameterSpec oaepSpec = new OAEPParameterSpec(digest, "MGF1", new MGF1ParameterSpec(mgfDigest), new PSource.PSpecified(new byte[]{1, 2, 3, 4, 5}));
-        AlgorithmIdentifier oaepAlgId = paramsConverter.getAlgorithmIdentifier(PKCSObjectIdentifiers.id_RSAES_OAEP, oaepSpec);
-
-        edGen.addRecipientInfoGenerator(new JceKeyTransRecipientInfoGenerator(_reciCert, oaepAlgId).setProvider(BC));
-        edGen.addRecipientInfoGenerator(new JceKeyTransRecipientInfoGenerator(ASN1OctetString.getInstance(ASN1OctetString.getInstance(_reciCert.getExtensionValue(Extension.subjectKeyIdentifier.getId())).getOctets()).getOctets(), oaepAlgId, _reciCert.getPublicKey()).setProvider(BC));
-
-        CMSEnvelopedData ed = edGen.generate(
-                                new CMSProcessableByteArray(data),
-                                new JceCMSContentEncryptorBuilder(CMSAlgorithm.DES_EDE3_CBC).setProvider(BC).build());
-
-        RecipientInformationStore  recipients = ed.getRecipientInfos();
-
-
-        assertEquals(ed.getEncryptionAlgOID(), CMSEnvelopedDataGenerator.DES_EDE3_CBC);
-
-        Collection  c = recipients.getRecipients();
-
-        assertEquals(2, c.size());
-
-        Iterator    it = c.iterator();
-
-        while (it.hasNext())
-        {
-            RecipientInformation   recipient = (RecipientInformation)it.next();
-
-            assertEquals(PKCSObjectIdentifiers.id_RSAES_OAEP, recipient.getKeyEncryptionAlgorithm().getAlgorithm());
-
-            byte[] recData = recipient.getContent(new JceKeyTransEnvelopedRecipient(_reciKP.getPrivate()).setProvider(BC));
-
-            assertEquals(true, Arrays.equals(data, recData));
-        }
-
-        RecipientId id = new JceKeyTransRecipientId(_reciCert);
-
-        Collection collection = recipients.getRecipients(id);
-        if (collection.size() != 2)
-        {
-            fail("recipients not matched using general recipient ID.");
-        }
-        assertTrue(collection.iterator().next() instanceof RecipientInformation);
-    }
-
-    public void testKeyTransOAEPInCert()
-         throws Exception
-     {
-         byte[]          data     = "WallaWallaWashington".getBytes();
-
-         CMSEnvelopedDataGenerator edGen = new CMSEnvelopedDataGenerator();
-
-         edGen.addRecipientInfoGenerator(new JceKeyTransRecipientInfoGenerator(_reciCertOaep).setProvider(BC));
-         edGen.addRecipientInfoGenerator(new JceKeyTransRecipientInfoGenerator(ASN1OctetString.getInstance(ASN1OctetString.getInstance(_reciCertOaep.getExtensionValue(Extension.subjectKeyIdentifier.getId())).getOctets()).getOctets(), _reciCertOaep.getPublicKey()).setProvider(BC));
-
-         CMSEnvelopedData ed = edGen.generate(
-                                 new CMSProcessableByteArray(data),
-                                 new JceCMSContentEncryptorBuilder(CMSAlgorithm.DES_EDE3_CBC).setProvider(BC).build());
-
-         RecipientInformationStore  recipients = ed.getRecipientInfos();
-
-
-         assertEquals(ed.getEncryptionAlgOID(), CMSEnvelopedDataGenerator.DES_EDE3_CBC);
-
-         Collection  c = recipients.getRecipients();
-
-         assertEquals(2, c.size());
-
-         Iterator    it = c.iterator();
-
-         while (it.hasNext())
-         {
-             RecipientInformation   recipient = (RecipientInformation)it.next();
-
-             assertEquals(PKCSObjectIdentifiers.id_RSAES_OAEP, recipient.getKeyEncryptionAlgorithm().getAlgorithm());
-
-             byte[] recData = recipient.getContent(new JceKeyTransEnvelopedRecipient(_reciKP.getPrivate()).setProvider(BC));
-
-             assertEquals(true, Arrays.equals(data, recData));
-         }
-
-         RecipientId id = new JceKeyTransRecipientId(_reciCertOaep);
-
-         Collection collection = recipients.getRecipients(id);
-         if (collection.size() != 2)
-         {
-             fail("recipients not matched using general recipient ID.");
-         }
-         assertTrue(collection.iterator().next() instanceof RecipientInformation);
-     }
-
-    public void testKeyTransWithAlgMapping()
-        throws Exception
-    {
-        byte[]          data     = "WallaWallaWashington".getBytes();
-
-        CMSEnvelopedDataGenerator edGen = new CMSEnvelopedDataGenerator();
-
-        edGen.addRecipientInfoGenerator(new JceKeyTransRecipientInfoGenerator(_reciCert).setAlgorithmMapping(PKCSObjectIdentifiers.rsaEncryption, "RSA/2/PKCS1Padding").setProvider(BC));
-
-        CMSEnvelopedData ed = edGen.generate(
-                                new CMSProcessableByteArray(data),
-                                new JceCMSContentEncryptorBuilder(CMSAlgorithm.DES_EDE3_CBC).setProvider(BC).build());
-
-        RecipientInformationStore  recipients = ed.getRecipientInfos();
-
-        assertEquals(ed.getEncryptionAlgOID(), CMSEnvelopedDataGenerator.DES_EDE3_CBC);
-
-        Collection  c = recipients.getRecipients();
-
-        assertEquals(1, c.size());
-
-        Iterator    it = c.iterator();
-
-        while (it.hasNext())
-        {
-            RecipientInformation   recipient = (RecipientInformation)it.next();
-
-            assertEquals(recipient.getKeyEncryptionAlgOID(), PKCSObjectIdentifiers.rsaEncryption.getId());
-
-            byte[] recData = recipient.getContent(new JceKeyTransEnvelopedRecipient(_reciKP.getPrivate()).setAlgorithmMapping(PKCSObjectIdentifiers.rsaEncryption, "RSA/2/PKCS1Padding").setProvider(BC));
-
-            assertEquals(true, Arrays.equals(data, recData));
-        }
-
-        RecipientId id = new JceKeyTransRecipientId(_reciCert);
-
-        Collection collection = recipients.getRecipients(id);
-        if (collection.size() != 1)
-        {
-            fail("recipients not matched using general recipient ID.");
-        }
-        assertTrue(collection.iterator().next() instanceof RecipientInformation);
-    }
-
-    public void testOriginatorInfoGeneration()
-        throws Exception
-    {
-        byte[]          data     = "WallaWallaWashington".getBytes();
-
-        CMSEnvelopedDataGenerator edGen = new CMSEnvelopedDataGenerator();
-
-        X509CertificateHolder origCert = new X509CertificateHolder(_origCert.getEncoded());
-
-        edGen.setOriginatorInfo(new OriginatorInfoGenerator(origCert).generate());
-
-        edGen.addRecipientInfoGenerator(new JceKeyTransRecipientInfoGenerator(_reciCert).setProvider(BC));
-        edGen.addRecipientInfoGenerator(new JceKeyTransRecipientInfoGenerator(ASN1OctetString.getInstance(ASN1OctetString.getInstance(_reciCert.getExtensionValue(Extension.subjectKeyIdentifier.getId())).getOctets()).getOctets(), _reciCert.getPublicKey()).setProvider(BC));
-
-        CMSEnvelopedData ed = edGen.generate(
-                                new CMSProcessableByteArray(data),
-                                new JceCMSContentEncryptorBuilder(CMSAlgorithm.DES_EDE3_CBC).setProvider(BC).build());
-
-        RecipientInformationStore  recipients = ed.getRecipientInfos();
-
-
-        assertEquals(ed.getEncryptionAlgOID(), CMSEnvelopedDataGenerator.DES_EDE3_CBC);
-
-        assertTrue(ed.getOriginatorInfo().getCertificates().getMatches(null).contains(origCert));
-
-        Collection  c = recipients.getRecipients();
-
-        assertEquals(2, c.size());
-
-        Iterator    it = c.iterator();
-
-        while (it.hasNext())
-        {
-            RecipientInformation   recipient = (RecipientInformation)it.next();
-
-            assertEquals(recipient.getKeyEncryptionAlgOID(), PKCSObjectIdentifiers.rsaEncryption.getId());
-
-            byte[] recData = recipient.getContent(new JceKeyTransEnvelopedRecipient(_reciKP.getPrivate()).setProvider(BC));
-
-            assertEquals(true, Arrays.equals(data, recData));
-        }
-
-        RecipientId id = new JceKeyTransRecipientId(_reciCert);
-
-        Collection collection = recipients.getRecipients(id);
-        if (collection.size() != 2)
-        {
-            fail("recipients not matched using general recipient ID.");
-        }
-        assertTrue(collection.iterator().next() instanceof RecipientInformation);
-    }
-
-    public void testKeyTransRC2bit40()
-        throws Exception
-    {
-        byte[]          data     = "WallaWallaBouncyCastle".getBytes();
-
-        CMSEnvelopedDataGenerator edGen = new CMSEnvelopedDataGenerator();
-
-        edGen.addRecipientInfoGenerator(new JceKeyTransRecipientInfoGenerator(_reciCert).setProvider(BC));
-
-        CMSEnvelopedData ed = edGen.generate(
-            new CMSProcessableByteArray(data),
-            new JceCMSContentEncryptorBuilder(CMSAlgorithm.RC2_CBC, 40).setProvider(BC).build());
-
-        RecipientInformationStore  recipients = ed.getRecipientInfos();
-
-        assertEquals(ed.getContentEncryptionAlgorithm().getAlgorithm(), CMSAlgorithm.RC2_CBC);
-
-        RC2CBCParameter rc2P = RC2CBCParameter.getInstance(ed.getContentEncryptionAlgorithm().getParameters());
-        assertEquals(160, rc2P.getRC2ParameterVersion().intValue());
-
-        Collection  c = recipients.getRecipients();
-
-        assertEquals(1, c.size());
-
-        Iterator    it = c.iterator();
-
-        while (it.hasNext())
-        {
-            RecipientInformation   recipient = (RecipientInformation)it.next();
-
-            byte[] recData = recipient.getContent(new JceKeyTransEnvelopedRecipient(_reciKP.getPrivate()).setProvider(BC));
-
-            assertEquals(true, Arrays.equals(data, recData));
-        }
-    }
-
-    public void testKeyTransRC4()
-        throws Exception
-    {
-        byte[]          data     = "WallaWallaBouncyCastle".getBytes();
-
-        CMSEnvelopedDataGenerator edGen = new CMSEnvelopedDataGenerator();
-
-        edGen.addRecipientInfoGenerator(new JceKeyTransRecipientInfoGenerator(_reciCert).setProvider(BC));
-
-        CMSEnvelopedData ed = edGen.generate(
-                                new CMSProcessableByteArray(data),
-                                new JceCMSContentEncryptorBuilder(new ASN1ObjectIdentifier("1.2.840.113549.3.4")).setProvider(BC).build());
-
-        RecipientInformationStore  recipients = ed.getRecipientInfos();
-
-        assertEquals(ed.getEncryptionAlgOID(), "1.2.840.113549.3.4");
-
-        Collection  c = recipients.getRecipients();
-
-        assertEquals(1, c.size());
-
-        Iterator    it = c.iterator();
-
-        while (it.hasNext())
-        {
-            RecipientInformation   recipient = (RecipientInformation)it.next();
-
-            byte[] recData = recipient.getContent(new JceKeyTransEnvelopedRecipient(_reciKP.getPrivate()).setProvider(BC));
-
-            assertEquals(true, Arrays.equals(data, recData));
-        }
-    }
-
-    public void testKeyTrans128RC4()
-        throws Exception
-    {
-        byte[]          data     = "WallaWallaBouncyCastle".getBytes();
-
-        CMSEnvelopedDataGenerator edGen = new CMSEnvelopedDataGenerator();
-
-        edGen.addRecipientInfoGenerator(new JceKeyTransRecipientInfoGenerator(_reciCert).setProvider(BC));
-
-        CMSEnvelopedData ed = edGen.generate(
-                                new CMSProcessableByteArray(data),
-                                new JceCMSContentEncryptorBuilder(new ASN1ObjectIdentifier("1.2.840.113549.3.4"), 128).setProvider(BC).build());
-
-        RecipientInformationStore  recipients = ed.getRecipientInfos();
-
-        assertEquals(ed.getEncryptionAlgOID(), "1.2.840.113549.3.4");
-
-        Collection  c = recipients.getRecipients();
-        Iterator    it = c.iterator();
-
-        if (it.hasNext())
-        {
-            RecipientInformation   recipient = (RecipientInformation)it.next();
-
-            byte[] recData = recipient.getContent(new JceKeyTransEnvelopedRecipient(_reciKP.getPrivate()).setProvider(BC));
-
-            assertEquals(true, Arrays.equals(data, recData));
-        }
-        else
-        {
-            fail("no recipient found");
-        }
-    }
-
-    public void testKeyTransLight128RC4()
-        throws Exception
-    {
-        byte[]          data     = "WallaWallaBouncyCastle".getBytes();
-
-        CMSEnvelopedDataGenerator edGen = new CMSEnvelopedDataGenerator();
-
-        edGen.addRecipientInfoGenerator(new BcRSAKeyTransRecipientInfoGenerator(new JcaX509CertificateHolder(_reciCert)));
-
-        CMSEnvelopedData ed = edGen.generate(
-                                new CMSProcessableByteArray(data),
-                                new JceCMSContentEncryptorBuilder(new ASN1ObjectIdentifier("1.2.840.113549.3.4"), 128).setProvider(BC).build());
-
-        RecipientInformationStore  recipients = ed.getRecipientInfos();
-
-        assertEquals(ed.getEncryptionAlgOID(), "1.2.840.113549.3.4");
-
-        Collection  c = recipients.getRecipients();
-        Iterator    it = c.iterator();
-
-        if (it.hasNext())
-        {
-            RecipientInformation   recipient = (RecipientInformation)it.next();
-
-            byte[] recData = recipient.getContent(new JceKeyTransEnvelopedRecipient(_reciKP.getPrivate()).setProvider(BC));
-
-            assertEquals(true, Arrays.equals(data, recData));
-        }
-        else
-        {
-            fail("no recipient found");
-        }
-    }
-
-    public void testKeyTransODES()
-        throws Exception
-    {
-        byte[]          data     = "WallaWallaBouncyCastle".getBytes();
-
-        CMSEnvelopedDataGenerator edGen = new CMSEnvelopedDataGenerator();
-
-        edGen.addRecipientInfoGenerator(new JceKeyTransRecipientInfoGenerator(_reciCert).setProvider(BC));
-
-        CMSEnvelopedData ed = edGen.generate(
-                                new CMSProcessableByteArray(data),
-                                new JceCMSContentEncryptorBuilder(new ASN1ObjectIdentifier("1.3.14.3.2.7")).setProvider(BC).build());
-
-        RecipientInformationStore  recipients = ed.getRecipientInfos();
-
-        assertEquals(ed.getEncryptionAlgOID(), "1.3.14.3.2.7");
-
-        Collection  c = recipients.getRecipients();
-        Iterator    it = c.iterator();
-
-        if (it.hasNext())
-        {
-            RecipientInformation   recipient = (RecipientInformation)it.next();
-
-            byte[] recData = recipient.getContent(new JceKeyTransEnvelopedRecipient(_reciKP.getPrivate()).setProvider(BC));
-
-            assertEquals(true, Arrays.equals(data, recData));
-        }
-        else
-        {
-            fail("no recipient found");
-        }
-    }
-
-    public void testKeyTransSmallAES()
-        throws Exception
-    {
-        byte[]          data     = new byte[] { 0, 1, 2, 3 };
-
-        CMSEnvelopedDataGenerator edGen = new CMSEnvelopedDataGenerator();
-
-        edGen.addRecipientInfoGenerator(new JceKeyTransRecipientInfoGenerator(_reciCert).setProvider(BC));
-
-        CMSEnvelopedData ed = edGen.generate(
-                              new CMSProcessableByteArray(data),
-                              new JceCMSContentEncryptorBuilder(CMSAlgorithm.AES128_CBC).setProvider(BC).build());
-
-        RecipientInformationStore  recipients = ed.getRecipientInfos();
-
-        assertEquals(ed.getEncryptionAlgOID(),
-                                   CMSEnvelopedDataGenerator.AES128_CBC);
-
-        Collection  c = recipients.getRecipients();
-        Iterator    it = c.iterator();
-
-        if (it.hasNext())
-        {
-            RecipientInformation   recipient = (RecipientInformation)it.next();
-
-            byte[] recData = recipient.getContent(new JceKeyTransEnvelopedRecipient(_reciKP.getPrivate()).setProvider(BC));
-            assertEquals(true, Arrays.equals(data, recData));
-        }
-        else
-        {
-            fail("no recipient found");
-        }
-    }
-
-    public void testKeyTransDESEDE3Short()
-        throws Exception
-    {
-        byte[]          data     = new byte[] { 0, 1, 2, 3 };
-        KeyFactory      kf = KeyFactory.getInstance("RSA", BC);
-        PrivateKey      kPriv = kf.generatePrivate(new PKCS8EncodedKeySpec(tooShort3DESKey));
-
-        CMSEnvelopedData ed = new CMSEnvelopedData(tooShort3DES);
-
-        RecipientInformationStore  recipients = ed.getRecipientInfos();
-
-        assertEquals(ed.getEncryptionAlgOID(), CMSEnvelopedDataGenerator.DES_EDE3_CBC);
-
-        Collection  c = recipients.getRecipients();
-        Iterator    it = c.iterator();
-
-        if (it.hasNext())
-        {
-            RecipientInformation   recipient = (RecipientInformation)it.next();
-            try
-            {
-                byte[] recData = recipient.getContent(new JceKeyTransEnvelopedRecipient(kPriv).setKeySizeValidation(true).setProvider(BC));
-                fail("invalid 3DES-EDE key not picked up");
-            }
-            catch (CMSException e)
-            {
-                assertEquals("Expected key size for algorithm OID not found in recipient.", e.getMessage());
-            }
-
-            byte[] recData = recipient.getContent(new JceKeyTransEnvelopedRecipient(kPriv).setKeySizeValidation(false).setProvider(BC));
-            assertEquals(true, Arrays.equals(data, recData));
-        }
-        else
-        {
-            fail("no recipient found");
-        }
-    }
-
-    public void testKeyTransDESEDE3Light()
-        throws Exception
-    {
-        byte[]          data     = new byte[] { 0, 1, 2, 3 };
-
-        CMSEnvelopedDataGenerator edGen = new CMSEnvelopedDataGenerator();
-
-        edGen.addRecipientInfoGenerator(new BcRSAKeyTransRecipientInfoGenerator(new JcaX509CertificateHolder(_reciCert)));
-
-        CMSEnvelopedData ed = edGen.generate(
-                              new CMSProcessableByteArray(data),
-                              new BcCMSContentEncryptorBuilder(CMSAlgorithm.DES_EDE3_CBC, 192).build());
-
-        RecipientInformationStore  recipients = ed.getRecipientInfos();
-
-        assertEquals(ed.getEncryptionAlgOID(), CMSEnvelopedDataGenerator.DES_EDE3_CBC);
-
-        Collection  c = recipients.getRecipients();
-        Iterator    it = c.iterator();
-
-        if (it.hasNext())
-        {
-            RecipientInformation   recipient = (RecipientInformation)it.next();
-
-            byte[] recData = recipient.getContent(new JceKeyTransEnvelopedRecipient(_reciKP.getPrivate()).setKeySizeValidation(true).setProvider(BC));
-            assertEquals(true, Arrays.equals(data, recData));
-        }
-        else
-        {
-            fail("no recipient found");
-        }
-    }
-
-    public void testKeyTransDES()
-         throws Exception
-     {
-         tryKeyTrans(CMSAlgorithm.DES_CBC, CMSAlgorithm.DES_CBC, 8, DEROctetString.class);
-     }
-
-   public void testKeyTransCAST5()
-        throws Exception
-    {
-        tryKeyTrans(CMSAlgorithm.CAST5_CBC, CMSAlgorithm.CAST5_CBC, 16, ASN1Sequence.class);
-    }
-
-    public void testKeyTransAES128()
-        throws Exception
-    {
-        tryKeyTrans(CMSAlgorithm.AES128_CBC, NISTObjectIdentifiers.id_aes128_CBC, 16, DEROctetString.class);
-    }
-
-    public void testKeyTransAES192()
-        throws Exception
-    {
-        tryKeyTrans(CMSAlgorithm.AES192_CBC, NISTObjectIdentifiers.id_aes192_CBC, 24, DEROctetString.class);
-    }
-
-    public void testKeyTransAES256()
-        throws Exception
-    {
-        tryKeyTrans(CMSAlgorithm.AES256_CBC, NISTObjectIdentifiers.id_aes256_CBC, 32, DEROctetString.class);
-    }
-
-    public void testKeyTransSEED()
-        throws Exception
-    {
-        tryKeyTrans(CMSAlgorithm.SEED_CBC, KISAObjectIdentifiers.id_seedCBC, 16, DEROctetString.class);
-    }
-
-    public void testKeyTransCamellia128()
-        throws Exception
-    {
-        tryKeyTrans(CMSAlgorithm.CAMELLIA128_CBC, NTTObjectIdentifiers.id_camellia128_cbc, 16, DEROctetString.class);
-    }
-
-    public void testKeyTransCamellia192()
-        throws Exception
-    {
-        tryKeyTrans(CMSAlgorithm.CAMELLIA192_CBC, NTTObjectIdentifiers.id_camellia192_cbc, 24, DEROctetString.class);
-    }
-
-    public void testKeyTransCamellia256()
-        throws Exception
-    {
-        tryKeyTrans(CMSAlgorithm.CAMELLIA256_CBC, NTTObjectIdentifiers.id_camellia256_cbc, 32, DEROctetString.class);
-    }
-
-    private void tryKeyTrans(ASN1ObjectIdentifier generatorOID, ASN1ObjectIdentifier checkOID, int keySize, Class asn1Params)
-        throws Exception
-    {
-        byte[]          data     = "WallaWallaWashington".getBytes();
-
-        CMSEnvelopedDataGenerator edGen = new CMSEnvelopedDataGenerator();
-
-        edGen.addRecipientInfoGenerator(new JceKeyTransRecipientInfoGenerator(_reciCert).setProvider(BC));
-
-        OutputEncryptor encryptor = new JceCMSContentEncryptorBuilder(generatorOID).setProvider(BC).build();
-        CMSEnvelopedData ed = edGen.generate(
-            new CMSProcessableByteArray(data),
-            encryptor);
-
-        RecipientInformationStore  recipients = ed.getRecipientInfos();
-
-        assertEquals(checkOID.getId(), ed.getEncryptionAlgOID());
-        assertEquals(keySize, ((byte[])encryptor.getKey().getRepresentation()).length);
-
-        if (asn1Params != null)
-        {
-            ASN1InputStream aIn = new ASN1InputStream(ed.getEncryptionAlgParams());
-
-            assertTrue(asn1Params.isAssignableFrom(aIn.readObject().getClass()));
-        }
-
-        Collection  c = recipients.getRecipients();
-
-        assertEquals(1, c.size());
-
-        Iterator    it = c.iterator();
-
-        if (!it.hasNext())
-        {
-            fail("no recipients found");
-        }
-
-        while (it.hasNext())
-        {
-            RecipientInformation   recipient = (RecipientInformation)it.next();
-
-            assertEquals(recipient.getKeyEncryptionAlgOID(), PKCSObjectIdentifiers.rsaEncryption.getId());
-
-            byte[] recData = recipient.getContent(new JceKeyTransEnvelopedRecipient(_reciKP.getPrivate()).setKeySizeValidation(true).setProvider(BC));
-
-            assertEquals(true, Arrays.equals(data, recData));
-        }
-    }
-
-    public void testErroneousKEK()
-        throws Exception
-    {
-        byte[]    data = "WallaWallaWashington".getBytes();
-        SecretKey kek  = new SecretKeySpec(new byte[] { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16 }, "AES");
-
-        CMSEnvelopedData ed = new CMSEnvelopedData(oldKEK);
-
-        RecipientInformationStore  recipients = ed.getRecipientInfos();
-
-        assertEquals(ed.getEncryptionAlgOID(), CMSEnvelopedDataGenerator.DES_EDE3_CBC);
-
-        Collection  c = recipients.getRecipients();
-        Iterator    it = c.iterator();
-
-        if (it.hasNext())
-        {
-            RecipientInformation   recipient = (RecipientInformation)it.next();
-
-            assertEquals(recipient.getKeyEncryptionAlgOID(), NISTObjectIdentifiers.id_aes128_wrap.getId());
-
-            byte[] recData = recipient.getContent(new JceKEKEnvelopedRecipient(kek).setProvider(BC));
-
-            assertEquals(true, Arrays.equals(data, recData));
-        }
-        else
-        {
-            fail("no recipient found");
-        }
-    }
-
-    public void testDESKEK()
-        throws Exception
-    {
-        tryKekAlgorithm(CMSTestUtil.makeDesede192Key(), new ASN1ObjectIdentifier("1.2.840.113549.1.9.16.3.6"));
-    }
-    public void testRC2128KEK()
-        throws Exception
-    {
-        tryKekAlgorithm(CMSTestUtil.makeRC2128Key(), new ASN1ObjectIdentifier("1.2.840.113549.1.9.16.3.7"));
-    }
-
-    public void testAES128KEK()
-        throws Exception
-    {
-        tryKekAlgorithm(CMSTestUtil.makeAESKey(128), NISTObjectIdentifiers.id_aes128_wrap);
-
-        tryKekAlgorithmAEAD(CMSTestUtil.makeAESKey(128), NISTObjectIdentifiers.id_aes128_wrap, CMSAlgorithm.AES128_GCM, NISTObjectIdentifiers.id_aes128_GCM);
-        tryKekAlgorithmAEAD(CMSTestUtil.makeAESKey(128), NISTObjectIdentifiers.id_aes128_wrap, CMSAlgorithm.AES192_GCM, NISTObjectIdentifiers.id_aes192_GCM);
-        tryKekAlgorithmAEAD(CMSTestUtil.makeAESKey(128), NISTObjectIdentifiers.id_aes128_wrap, CMSAlgorithm.AES256_GCM, NISTObjectIdentifiers.id_aes256_GCM);
-
-        tryKekAlgorithmAEAD(CMSTestUtil.makeAESKey(128), NISTObjectIdentifiers.id_aes128_wrap, CMSAlgorithm.AES128_CCM, NISTObjectIdentifiers.id_aes128_CCM);
-        tryKekAlgorithmAEAD(CMSTestUtil.makeAESKey(128), NISTObjectIdentifiers.id_aes128_wrap, CMSAlgorithm.AES192_CCM, NISTObjectIdentifiers.id_aes192_CCM);
-        tryKekAlgorithmAEAD(CMSTestUtil.makeAESKey(128), NISTObjectIdentifiers.id_aes128_wrap, CMSAlgorithm.AES256_CCM, NISTObjectIdentifiers.id_aes256_CCM);
-    }
-
-    public void testAES192KEK()
-        throws Exception
-    {
-        tryKekAlgorithm(CMSTestUtil.makeAESKey(192), NISTObjectIdentifiers.id_aes192_wrap);
-    }
-
-    public void testAES256KEK()
-        throws Exception
-    {
-        tryKekAlgorithm(CMSTestUtil.makeAESKey(256), NISTObjectIdentifiers.id_aes256_wrap);
-    }
-
-    public void testSEED128KEK()
-        throws Exception
-    {
-        tryKekAlgorithm(CMSTestUtil.makeSEEDKey(), KISAObjectIdentifiers.id_npki_app_cmsSeed_wrap);
-    }
-
-    public void testCamellia128KEK()
-        throws Exception
-    {
-        tryKekAlgorithm(CMSTestUtil.makeCamelliaKey(128), NTTObjectIdentifiers.id_camellia128_wrap);
-    }
-
-    public void testCamellia192KEK()
-        throws Exception
-    {
-        tryKekAlgorithm(CMSTestUtil.makeCamelliaKey(192), NTTObjectIdentifiers.id_camellia192_wrap);
-    }
-
-    public void testCamellia256KEK()
-        throws Exception
-    {
-        tryKekAlgorithm(CMSTestUtil.makeCamelliaKey(256), NTTObjectIdentifiers.id_camellia256_wrap);
-    }
-
-    private void tryKekAlgorithm(SecretKey kek, ASN1ObjectIdentifier algOid)
-        throws NoSuchAlgorithmException, NoSuchProviderException, CMSException
-    {
-        byte[]    data = "WallaWallaWashington".getBytes();
-        CMSEnvelopedDataGenerator edGen = new CMSEnvelopedDataGenerator();
-
-        byte[]  kekId = new byte[] { 1, 2, 3, 4, 5 };
-
-        edGen.addRecipientInfoGenerator(new JceKEKRecipientInfoGenerator(kekId, kek).setProvider(BC));
-
-        CMSEnvelopedData ed = edGen.generate(
-                                new CMSProcessableByteArray(data),
-                                new JceCMSContentEncryptorBuilder(CMSAlgorithm.DES_EDE3_CBC).setProvider(BC).build());
-
-        RecipientInformationStore recipients = ed.getRecipientInfos();
-
-        Collection c = recipients.getRecipients();
-        Iterator it = c.iterator();
-
-        assertEquals(ed.getEncryptionAlgOID(), CMSEnvelopedDataGenerator.DES_EDE3_CBC);
-
-        if (it.hasNext())
-        {
-            RecipientInformation recipient = (RecipientInformation)it.next();
-
-            assertEquals(algOid.getId(), recipient.getKeyEncryptionAlgOID());
-
-            byte[] recData = recipient.getContent(new JceKEKEnvelopedRecipient(kek).setKeySizeValidation(true).setProvider(BC));
-
-            assertTrue(Arrays.equals(data, recData));
-        }
-        else
-        {
-            fail("no recipient found");
-        }
-    }
-
-    private void tryKekAlgorithmAEAD(SecretKey kek, ASN1ObjectIdentifier algOid, ASN1ObjectIdentifier aeadAlgorithm, ASN1ObjectIdentifier baseOID)
-        throws NoSuchAlgorithmException, NoSuchProviderException, CMSException, IOException
-    {
-        byte[]    data = "WallaWallaWashington".getBytes();
-        CMSEnvelopedDataGenerator edGen = new CMSEnvelopedDataGenerator();
-
-        byte[]  kekId = new byte[] { 1, 2, 3, 4, 5 };
-
-        edGen.addRecipientInfoGenerator(new JceKEKRecipientInfoGenerator(kekId, kek).setProvider(BC));
-
-        CMSEnvelopedData ed = edGen.generate(
-                                new CMSProcessableByteArray(data),
-                                new JceCMSContentEncryptorBuilder(aeadAlgorithm).setProvider(BC).build());
-
-        RecipientInformationStore recipients = ed.getRecipientInfos();
-
-        Collection c = recipients.getRecipients();
-        Iterator it = c.iterator();
-
-        assertEquals(ed.getContentEncryptionAlgorithm().getAlgorithm(), baseOID);
-
-        if (it.hasNext())
-        {
-            RecipientInformation recipient = (RecipientInformation)it.next();
-
-            assertEquals(algOid.getId(), recipient.getKeyEncryptionAlgOID());
-
-            byte[] recData = recipient.getContent(new JceKEKEnvelopedRecipient(kek).setKeySizeValidation(true).setProvider(BC));
-
-            assertTrue(Arrays.equals(data, recData));
-        }
-        else
-        {
-            fail("no recipient found");
-        }
-
-        byte[] edData = ed.getEncoded();
-
-        ContentInfo   eContentInfo = ContentInfo.getInstance(edData);
-
-        EnvelopedData envD = EnvelopedData.getInstance(eContentInfo.getContent());
-
-        EncryptedContentInfo eInfo = envD.getEncryptedContentInfo();
-
-        eInfo.getEncryptedContent().getOctets()[10] ^= 0xff;
-
-        ed = new CMSEnvelopedData(new ContentInfo(eContentInfo.getContentType(), new EnvelopedData(envD.getOriginatorInfo(), envD.getRecipientInfos(), eInfo, envD.getUnprotectedAttrs())).getEncoded());
-
-        recipients = ed.getRecipientInfos();
-
-        c = recipients.getRecipients();
-        it = c.iterator();
-
-        if (it.hasNext())
-        {
-            RecipientInformation recipient = (RecipientInformation)it.next();
-
-            assertEquals(algOid.getId(), recipient.getKeyEncryptionAlgOID());
-
-            try
-            {
-                byte[] recData = recipient.getContent(new JceKEKEnvelopedRecipient(kek).setKeySizeValidation(true).setProvider(BC));
-
-                fail("MAC error not detected");
-            }
-            catch (CMSException e)
-            {
-                // expected
-            }
-        }
-        else
-        {
-            fail("no recipient found");
-        }
-    }
-
-    public void testECKeyAgree()
-        throws Exception
-    {
-        byte[] data = Hex.decode("504b492d4320434d5320456e76656c6f706564446174612053616d706c65");
-
-        CMSEnvelopedDataGenerator edGen = new CMSEnvelopedDataGenerator();
-
-        edGen.addRecipientInfoGenerator(new JceKeyAgreeRecipientInfoGenerator(CMSAlgorithm.ECDH_SHA1KDF,
-            _origEcKP.getPrivate(), _origEcKP.getPublic(),
-             CMSAlgorithm.AES128_WRAP).addRecipient(_reciEcCert).setProvider(BC));
-
-        CMSEnvelopedData ed = edGen.generate(
-            new CMSProcessableByteArray(data),
-            new JceCMSContentEncryptorBuilder(CMSAlgorithm.AES128_CBC).setProvider(BC).build());
-
-        assertEquals(ed.getEncryptionAlgOID(), CMSEnvelopedDataGenerator.AES128_CBC);
-
-        RecipientInformationStore recipients = ed.getRecipientInfos();
-
-        confirmDataReceived(recipients, data, _reciEcCert, _reciEcKP.getPrivate(), BC);
-        confirmNumberRecipients(recipients, 1);
-    }
-
-    public void testECMQVKeyAgree()
-        throws Exception
-    {
-        byte[] data = Hex.decode("504b492d4320434d5320456e76656c6f706564446174612053616d706c65");
-
-        CMSEnvelopedDataGenerator edGen = new CMSEnvelopedDataGenerator();
-
-        edGen.addRecipientInfoGenerator(new JceKeyAgreeRecipientInfoGenerator(CMSAlgorithm.ECMQV_SHA1KDF,
-            _origEcKP.getPrivate(), _origEcKP.getPublic(),
-            CMSAlgorithm.AES128_WRAP).addRecipient(_reciEcCert).setProvider(BC));
-
-        CMSEnvelopedData ed = edGen.generate(
-            new CMSProcessableByteArray(data),
-            new JceCMSContentEncryptorBuilder(CMSAlgorithm.AES128_CBC).setProvider(BC).build());
-
-        assertEquals(ed.getEncryptionAlgOID(), CMSEnvelopedDataGenerator.AES128_CBC);
-
-        RecipientInformationStore recipients = ed.getRecipientInfos();
-
-        confirmDataReceived(recipients, data, _reciEcCert, _reciEcKP.getPrivate(), BC);
-        confirmNumberRecipients(recipients, 1);
-    }
-
-    public void testECMQVKeyAgreeMultiple()
-        throws Exception
-    {
-        byte[] data = Hex.decode("504b492d4320434d5320456e76656c6f706564446174612053616d706c65");
-
-        CMSEnvelopedDataGenerator edGen = new CMSEnvelopedDataGenerator();
-
-        JceKeyAgreeRecipientInfoGenerator recipientGenerator = new JceKeyAgreeRecipientInfoGenerator(CMSAlgorithm.ECMQV_SHA1KDF,
-            _origEcKP.getPrivate(), _origEcKP.getPublic(), CMSAlgorithm.AES128_WRAP).setProvider(BC);
-
-        recipientGenerator.addRecipient(_reciEcCert);
-        recipientGenerator.addRecipient(_reciEcCert2);
-
-        edGen.addRecipientInfoGenerator(recipientGenerator);
-
-        CMSEnvelopedData ed = edGen.generate(
-            new CMSProcessableByteArray(data),
-            new JceCMSContentEncryptorBuilder(CMSAlgorithm.AES128_CBC).setProvider(BC).build());
-
-        assertEquals(ed.getEncryptionAlgOID(), CMSEnvelopedDataGenerator.AES128_CBC);
-
-        RecipientInformationStore recipients = ed.getRecipientInfos();
-
-        confirmDataReceived(recipients, data, _reciEcCert, _reciEcKP.getPrivate(), BC);
-        confirmDataReceived(recipients, data, _reciEcCert2, _reciEcKP2.getPrivate(), BC);
-        confirmNumberRecipients(recipients, 2);
-    }
-
-    private static void confirmDataReceived(RecipientInformationStore recipients,
-        byte[] expectedData, X509Certificate reciCert, PrivateKey reciPrivKey, String provider)
-        throws CMSException, NoSuchProviderException, CertificateEncodingException, IOException
-    {
-        RecipientId rid = new JceKeyAgreeRecipientId(reciCert);
-
-        RecipientInformation recipient = recipients.get(rid);
-        assertNotNull(recipient);
-
-        byte[] actualData = recipient.getContent(new JceKeyAgreeEnvelopedRecipient(reciPrivKey).setProvider(provider));
-        assertEquals(true, Arrays.equals(expectedData, actualData));
-    }
-
-    private static void confirmNumberRecipients(RecipientInformationStore recipients, int count)
-    {
-        assertEquals(count, recipients.getRecipients().size());
-    }
-
-    public void testECKeyAgreeVectors()
-        throws Exception
-    {
-        PKCS8EncodedKeySpec privSpec = new PKCS8EncodedKeySpec(ecKeyAgreeKey);
-        KeyFactory          fact = KeyFactory.getInstance("ECDH", BC);
-        PrivateKey          privKey = fact.generatePrivate(privSpec);
-
-        verifyECKeyAgreeVectors(privKey, "2.16.840.1.101.3.4.1.42", ecKeyAgreeMsgAES256);
-        verifyECKeyAgreeVectors(privKey, "2.16.840.1.101.3.4.1.2", ecKeyAgreeMsgAES128);
-        verifyECKeyAgreeVectors(privKey, "1.2.840.113549.3.7", ecKeyAgreeMsgDESEDE);
-    }
-
-    public void testECMQVKeyAgreeVectors()
-        throws Exception
-    {
-        PKCS8EncodedKeySpec privSpec = new PKCS8EncodedKeySpec(ecKeyAgreeKey);
-        KeyFactory          fact = KeyFactory.getInstance("ECDH", BC);
-        PrivateKey          privKey = fact.generatePrivate(privSpec);
-
-        verifyECMQVKeyAgreeVectors(privKey, "2.16.840.1.101.3.4.1.2", ecMQVKeyAgreeMsgAES128);
-    }
-
-    public void testPasswordAES256()
-        throws Exception
-    {
-        passwordTest(CMSEnvelopedDataGenerator.AES256_CBC);
-        passwordUTF8Test(CMSEnvelopedDataGenerator.AES256_CBC);
-    }
-
-    public void testPasswordDESEDE()
-        throws Exception
-    {
-        passwordTest(CMSEnvelopedDataGenerator.DES_EDE3_CBC);
-        passwordUTF8Test(CMSEnvelopedDataGenerator.DES_EDE3_CBC);
-    }
-
-    public void testRFC4134ex5_1()
-        throws Exception
-    {
-        byte[] data = Hex.decode("5468697320697320736f6d652073616d706c6520636f6e74656e742e");
-
-        KeyFactory kFact = KeyFactory.getInstance("RSA", BC);
-        Key key = kFact.generatePrivate(new PKCS8EncodedKeySpec(bobPrivRsaEncrypt));
-
-        CMSEnvelopedData ed = new CMSEnvelopedData(rfc4134ex5_1);
-
-        RecipientInformationStore  recipients = ed.getRecipientInfos();
-
-        assertEquals("1.2.840.113549.3.7", ed.getEncryptionAlgOID());
-
-        Collection  c = recipients.getRecipients();
-        Iterator    it = c.iterator();
-
-        if (it.hasNext())
-        {
-            RecipientInformation   recipient = (RecipientInformation)it.next();
-
-            byte[] recData = recipient.getContent(new JceKeyTransEnvelopedRecipient((PrivateKey)key).setProvider(BC));
-
-            assertEquals(true, Arrays.equals(data, recData));
-        }
-        else
-        {
-            fail("no recipient found");
-        }
-    }
-
-    public void testRFC4134ex5_2()
-        throws Exception
-    {
-        byte[] data = Hex.decode("5468697320697320736f6d652073616d706c6520636f6e74656e742e");
-
-        KeyFactory kFact = KeyFactory.getInstance("RSA", BC);
-        PrivateKey key = kFact.generatePrivate(new PKCS8EncodedKeySpec(bobPrivRsaEncrypt));
-
-        CMSEnvelopedData ed = new CMSEnvelopedData(rfc4134ex5_2);
-
-        RecipientInformationStore  recipients = ed.getRecipientInfos();
-
-        assertEquals("1.2.840.113549.3.2", ed.getEncryptionAlgOID());
-
-        Collection  c = recipients.getRecipients();
-        Iterator    it = c.iterator();
-
-        if (it.hasNext())
-        {
-            while (it.hasNext())
-            {
-                RecipientInformation   recipient = (RecipientInformation)it.next();
-                byte[] recData;
-
-                if (recipient instanceof KeyTransRecipientInformation)
-                {
-                    recData = recipient.getContent(new JceKeyTransEnvelopedRecipient(key).setProvider(BC));
-
-                    assertEquals(true, Arrays.equals(data, recData));
-                }
-            }
-        }
-        else
-        {
-            fail("no recipient found");
-        }
-    }
-
-    public void testOriginatorInfo()
-        throws Exception
-    {
-        CMSEnvelopedData env = new CMSEnvelopedData(CMSSampleMessages.originatorMessage);
-
-        RecipientInformationStore  recipients = env.getRecipientInfos();
-
-        OriginatorInformation origInfo = env.getOriginatorInfo();
-
-        assertEquals(new X500Name("C=US,O=U.S. Government,OU=HSPD12Lab,OU=Agents,CN=user1"), ((X509CertificateHolder)origInfo.getCertificates().getMatches(null).iterator().next()).getSubject());
-        assertEquals(CMSEnvelopedDataGenerator.DES_EDE3_CBC, env.getEncryptionAlgOID());
-    }
-
-    private void passwordTest(String algorithm)
-        throws Exception
-    {
-        byte[] data = Hex.decode("504b492d4320434d5320456e76656c6f706564446174612053616d706c65");
-
-        CMSEnvelopedDataGenerator edGen = new CMSEnvelopedDataGenerator();
-
-        edGen.addRecipientInfoGenerator(new JcePasswordRecipientInfoGenerator(new ASN1ObjectIdentifier(algorithm), "password".toCharArray()).setProvider(BC).setPasswordConversionScheme(PasswordRecipient.PKCS5_SCHEME2).setSaltAndIterationCount(new byte[20], 5));
-
-        CMSEnvelopedData ed = edGen.generate(
-                              new CMSProcessableByteArray(data),
-                              new JceCMSContentEncryptorBuilder(CMSAlgorithm.AES128_CBC).setProvider(BC).build());
-
-        RecipientInformationStore  recipients = ed.getRecipientInfos();
-
-        assertEquals(ed.getEncryptionAlgOID(),
-                                   CMSEnvelopedDataGenerator.AES128_CBC);
-
-        Collection  c = recipients.getRecipients();
-        Iterator    it = c.iterator();
-
-        if (it.hasNext())
-        {
-            PasswordRecipientInformation recipient = (PasswordRecipientInformation)it.next();
-
-            byte[] recData = recipient.getContent(new JcePasswordEnvelopedRecipient("password".toCharArray()).setPasswordConversionScheme(PasswordRecipient.PKCS5_SCHEME2).setProvider(BC));
-
-            assertEquals(true, Arrays.equals(data, recData));
-        }
-        else
-        {
-            fail("no recipient found");
-        }
-
-        //
-        // try algorithm parameters constructor
-        //
-        it = c.iterator();
-
-        RecipientInformation   recipient = (RecipientInformation)it.next();
-
-        byte[] recData = recipient.getContent(new JcePasswordEnvelopedRecipient("password".toCharArray()).setPasswordConversionScheme(PasswordRecipient.PKCS5_SCHEME2).setProvider(BC));
-        assertEquals(true, Arrays.equals(data, recData));
-    }
-
-    private void passwordUTF8Test(String algorithm)
-        throws Exception
-    {
-        byte[] data = Hex.decode("504b492d4320434d5320456e76656c6f706564446174612053616d706c65");
-
-        CMSEnvelopedDataGenerator edGen = new CMSEnvelopedDataGenerator();
-
-        edGen.addRecipientInfoGenerator(new JcePasswordRecipientInfoGenerator(new ASN1ObjectIdentifier(algorithm), "abc\u5639\u563b".toCharArray()).setProvider(BC).setSaltAndIterationCount(new byte[20], 5));
-
-        CMSEnvelopedData ed = edGen.generate(
-                              new CMSProcessableByteArray(data),
-                              new JceCMSContentEncryptorBuilder(CMSAlgorithm.AES128_CBC).setProvider(BC).build());
-
-        RecipientInformationStore  recipients = ed.getRecipientInfos();
-
-        assertEquals(ed.getEncryptionAlgOID(),
-                                   CMSEnvelopedDataGenerator.AES128_CBC);
-
-        Collection  c = recipients.getRecipients();
-        Iterator    it = c.iterator();
-
-        if (it.hasNext())
-        {
-            RecipientInformation   recipient = (RecipientInformation)it.next();
-
-            byte[] recData = recipient.getContent(new JcePasswordEnvelopedRecipient("abc\u5639\u563b".toCharArray()).setProvider(BC));
-            assertEquals(true, Arrays.equals(data, recData));
-        }
-        else
-        {
-            fail("no recipient found");
-        }
-
-        //
-        // try algorithm parameters constructor
-        //
-        it = c.iterator();
-
-        RecipientInformation   recipient = (RecipientInformation)it.next();
-
-        byte[] recData = recipient.getContent(new JcePasswordEnvelopedRecipient("abc\u5639\u563b".toCharArray()).setProvider(BC));
-        assertEquals(true, Arrays.equals(data, recData));
-    }
-
-    private void verifyECKeyAgreeVectors(PrivateKey privKey, String wrapAlg, byte[] message)
-        throws CMSException, GeneralSecurityException
-    {
-        byte[] data = Hex.decode("504b492d4320434d5320456e76656c6f706564446174612053616d706c65");
-
-        CMSEnvelopedData ed = new CMSEnvelopedData(message);
-
-        RecipientInformationStore  recipients = ed.getRecipientInfos();
-
-        Collection  c = recipients.getRecipients();
-        Iterator    it = c.iterator();
-
-        assertEquals(wrapAlg, ed.getEncryptionAlgOID());
-
-        if (it.hasNext())
-        {
-            RecipientInformation   recipient = (RecipientInformation)it.next();
-
-            assertEquals("1.3.133.16.840.63.0.2", recipient.getKeyEncryptionAlgOID());
-
-            byte[] recData = recipient.getContent(new JceKeyAgreeEnvelopedRecipient(privKey).setProvider(BC));
-
-            assertTrue(Arrays.equals(data, recData));
-        }
-        else
-        {
-            fail("no recipient found");
-        }
-    }
-
-    private void verifyECMQVKeyAgreeVectors(PrivateKey privKey, String wrapAlg, byte[] message)
-        throws CMSException, GeneralSecurityException
-    {
-        byte[] data = Hex.decode("504b492d4320434d5320456e76656c6f706564446174612053616d706c65");
-
-        CMSEnvelopedData ed = new CMSEnvelopedData(message);
-
-        RecipientInformationStore  recipients = ed.getRecipientInfos();
-
-        Collection  c = recipients.getRecipients();
-        Iterator    it = c.iterator();
-
-        assertEquals(wrapAlg, ed.getEncryptionAlgOID());
-
-        if (it.hasNext())
-        {
-            RecipientInformation   recipient = (RecipientInformation)it.next();
-
-            assertEquals("1.3.133.16.840.63.0.16", recipient.getKeyEncryptionAlgOID());
-
-            byte[] recData = recipient.getContent(new JceKeyAgreeEnvelopedRecipient(privKey).setProvider(BC));
-
-            assertTrue(Arrays.equals(data, recData));
-        }
-        else
-        {
-            fail("no recipient found");
-        }
-    }
-}
\ No newline at end of file
diff --git a/bcpkix/src/main/java/org/bouncycastle/cms/test/NewSignedDataStreamTest.java b/bcpkix/src/main/java/org/bouncycastle/cms/test/NewSignedDataStreamTest.java
deleted file mode 100644
index 8a92cae..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cms/test/NewSignedDataStreamTest.java
+++ /dev/null
@@ -1,1311 +0,0 @@
-package org.bouncycastle.cms.test;
-
-import java.io.BufferedOutputStream;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.OutputStream;
-import java.security.KeyPair;
-import java.security.MessageDigest;
-import java.security.Security;
-import java.security.cert.X509CRL;
-import java.security.cert.X509Certificate;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.DEROctetString;
-import org.bouncycastle.asn1.DERSet;
-import org.bouncycastle.asn1.cms.Attribute;
-import org.bouncycastle.asn1.cms.AttributeTable;
-import org.bouncycastle.asn1.cms.CMSAttributes;
-import org.bouncycastle.asn1.cms.CMSObjectIdentifiers;
-import org.bouncycastle.asn1.ocsp.OCSPResponse;
-import org.bouncycastle.cert.X509AttributeCertificateHolder;
-import org.bouncycastle.cert.X509CertificateHolder;
-import org.bouncycastle.cert.jcajce.JcaCRLStore;
-import org.bouncycastle.cert.jcajce.JcaCertStore;
-import org.bouncycastle.cert.jcajce.JcaX509CRLHolder;
-import org.bouncycastle.cert.jcajce.JcaX509CertificateHolder;
-import org.bouncycastle.cert.ocsp.OCSPResp;
-import org.bouncycastle.cms.CMSAlgorithm;
-import org.bouncycastle.cms.CMSAttributeTableGenerator;
-import org.bouncycastle.cms.CMSProcessableByteArray;
-import org.bouncycastle.cms.CMSSignedData;
-import org.bouncycastle.cms.CMSSignedDataGenerator;
-import org.bouncycastle.cms.CMSSignedDataParser;
-import org.bouncycastle.cms.CMSSignedDataStreamGenerator;
-import org.bouncycastle.cms.CMSTypedData;
-import org.bouncycastle.cms.CMSTypedStream;
-import org.bouncycastle.cms.DefaultSignedAttributeTableGenerator;
-import org.bouncycastle.cms.SignerInformation;
-import org.bouncycastle.cms.SignerInformationStore;
-import org.bouncycastle.cms.jcajce.JcaSignerInfoGeneratorBuilder;
-import org.bouncycastle.cms.jcajce.JcaSimpleSignerInfoGeneratorBuilder;
-import org.bouncycastle.cms.jcajce.JcaSimpleSignerInfoVerifierBuilder;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.operator.ContentSigner;
-import org.bouncycastle.operator.jcajce.JcaContentSignerBuilder;
-import org.bouncycastle.operator.jcajce.JcaDigestCalculatorProviderBuilder;
-import org.bouncycastle.util.CollectionStore;
-import org.bouncycastle.util.Store;
-import org.bouncycastle.util.encoders.Base64;
-
-public class NewSignedDataStreamTest
-    extends TestCase
-{
-
-    byte[] successResp = Base64.decode(
-          "MIIFnAoBAKCCBZUwggWRBgkrBgEFBQcwAQEEggWCMIIFfjCCARehgZ8wgZwx"
-        + "CzAJBgNVBAYTAklOMRcwFQYDVQQIEw5BbmRocmEgcHJhZGVzaDESMBAGA1UE"
-        + "BxMJSHlkZXJhYmFkMQwwCgYDVQQKEwNUQ1MxDDAKBgNVBAsTA0FUQzEeMBwG"
-        + "A1UEAxMVVENTLUNBIE9DU1AgUmVzcG9uZGVyMSQwIgYJKoZIhvcNAQkBFhVv"
-        + "Y3NwQHRjcy1jYS50Y3MuY28uaW4YDzIwMDMwNDAyMTIzNDU4WjBiMGAwOjAJ"
-        + "BgUrDgMCGgUABBRs07IuoCWNmcEl1oHwIak1BPnX8QQUtGyl/iL9WJ1VxjxF"
-        + "j0hAwJ/s1AcCAQKhERgPMjAwMjA4MjkwNzA5MjZaGA8yMDAzMDQwMjEyMzQ1"
-        + "OFowDQYJKoZIhvcNAQEFBQADgYEAfbN0TCRFKdhsmvOdUoiJ+qvygGBzDxD/"
-        + "VWhXYA+16AphHLIWNABR3CgHB3zWtdy2j7DJmQ/R7qKj7dUhWLSqclAiPgFt"
-        + "QQ1YvSJAYfEIdyHkxv4NP0LSogxrumANcDyC9yt/W9yHjD2ICPBIqCsZLuLk"
-        + "OHYi5DlwWe9Zm9VFwCGgggPMMIIDyDCCA8QwggKsoAMCAQICAQYwDQYJKoZI"
-        + "hvcNAQEFBQAwgZQxFDASBgNVBAMTC1RDUy1DQSBPQ1NQMSYwJAYJKoZIhvcN"
-        + "AQkBFhd0Y3MtY2FAdGNzLWNhLnRjcy5jby5pbjEMMAoGA1UEChMDVENTMQww"
-        + "CgYDVQQLEwNBVEMxEjAQBgNVBAcTCUh5ZGVyYWJhZDEXMBUGA1UECBMOQW5k"
-        + "aHJhIHByYWRlc2gxCzAJBgNVBAYTAklOMB4XDTAyMDgyOTA3MTE0M1oXDTAz"
-        + "MDgyOTA3MTE0M1owgZwxCzAJBgNVBAYTAklOMRcwFQYDVQQIEw5BbmRocmEg"
-        + "cHJhZGVzaDESMBAGA1UEBxMJSHlkZXJhYmFkMQwwCgYDVQQKEwNUQ1MxDDAK"
-        + "BgNVBAsTA0FUQzEeMBwGA1UEAxMVVENTLUNBIE9DU1AgUmVzcG9uZGVyMSQw"
-        + "IgYJKoZIhvcNAQkBFhVvY3NwQHRjcy1jYS50Y3MuY28uaW4wgZ8wDQYJKoZI"
-        + "hvcNAQEBBQADgY0AMIGJAoGBAM+XWW4caMRv46D7L6Bv8iwtKgmQu0SAybmF"
-        + "RJiz12qXzdvTLt8C75OdgmUomxp0+gW/4XlTPUqOMQWv463aZRv9Ust4f8MH"
-        + "EJh4ekP/NS9+d8vEO3P40ntQkmSMcFmtA9E1koUtQ3MSJlcs441JjbgUaVnm"
-        + "jDmmniQnZY4bU3tVAgMBAAGjgZowgZcwDAYDVR0TAQH/BAIwADALBgNVHQ8E"
-        + "BAMCB4AwEwYDVR0lBAwwCgYIKwYBBQUHAwkwNgYIKwYBBQUHAQEEKjAoMCYG"
-        + "CCsGAQUFBzABhhpodHRwOi8vMTcyLjE5LjQwLjExMDo3NzAwLzAtBgNVHR8E"
-        + "JjAkMCKgIKAehhxodHRwOi8vMTcyLjE5LjQwLjExMC9jcmwuY3JsMA0GCSqG"
-        + "SIb3DQEBBQUAA4IBAQB6FovM3B4VDDZ15o12gnADZsIk9fTAczLlcrmXLNN4"
-        + "PgmqgnwF0Ymj3bD5SavDOXxbA65AZJ7rBNAguLUo+xVkgxmoBH7R2sBxjTCc"
-        + "r07NEadxM3HQkt0aX5XYEl8eRoifwqYAI9h0ziZfTNes8elNfb3DoPPjqq6V"
-        + "mMg0f0iMS4W8LjNPorjRB+kIosa1deAGPhq0eJ8yr0/s2QR2/WFD5P4aXc8I"
-        + "KWleklnIImS3zqiPrq6tl2Bm8DZj7vXlTOwmraSQxUwzCKwYob1yGvNOUQTq"
-        + "pG6jxn7jgDawHU1+WjWQe4Q34/pWeGLysxTraMa+Ug9kPe+jy/qRX2xwvKBZ");
-
-    private static final String BC = BouncyCastleProvider.PROVIDER_NAME;
-
-    private static final String TEST_MESSAGE = "Hello World!";
-    private static String          _signDN;
-    private static KeyPair         _signKP;
-    private static X509Certificate _signCert;
-
-    private static String          _origDN;
-    private static KeyPair         _origKP;
-    private static X509Certificate _origCert;
-
-    private static String          _reciDN;
-    private static KeyPair         _reciKP;
-    private static X509Certificate _reciCert;
-
-    private static KeyPair         _origDsaKP;
-    private static X509Certificate _origDsaCert;
-
-    private static X509CRL         _signCrl;
-    private static X509CRL         _origCrl;
-
-    private static boolean         _initialised = false;
-
-    public NewSignedDataStreamTest(String name)
-    {
-        super(name);
-    }
-    
-    private static void init()
-        throws Exception
-    {
-        if (!_initialised)
-        {
-            _initialised = true;
-
-            if (Security.getProvider(BC) == null)
-            {
-                Security.addProvider(new BouncyCastleProvider());
-            }
-
-            _signDN   = "O=Bouncy Castle, C=AU";
-            _signKP   = CMSTestUtil.makeKeyPair();  
-            _signCert = CMSTestUtil.makeCertificate(_signKP, _signDN, _signKP, _signDN);
-    
-            _origDN   = "CN=Bob, OU=Sales, O=Bouncy Castle, C=AU";
-            _origKP   = CMSTestUtil.makeKeyPair();
-            _origCert = CMSTestUtil.makeCertificate(_origKP, _origDN, _signKP, _signDN);
-    
-            _origDsaKP   = CMSTestUtil.makeDsaKeyPair();
-            _origDsaCert = CMSTestUtil.makeCertificate(_origDsaKP, _origDN, _signKP, _signDN);
-            
-            _reciDN   = "CN=Doug, OU=Sales, O=Bouncy Castle, C=AU";
-            _reciKP   = CMSTestUtil.makeKeyPair();
-            _reciCert = CMSTestUtil.makeCertificate(_reciKP, _reciDN, _signKP, _signDN);
-
-            _signCrl  = CMSTestUtil.makeCrl(_signKP);
-            _origCrl  = CMSTestUtil.makeCrl(_origKP);
-        }
-    }
-    
-    private void verifySignatures(CMSSignedDataParser sp, byte[] contentDigest) 
-        throws Exception
-    {
-        Store               certStore = sp.getCertificates();
-        Store               crlStore = sp.getCRLs();
-        SignerInformationStore  signers = sp.getSignerInfos();
-        
-        Collection              c = signers.getSigners();
-        Iterator                it = c.iterator();
-    
-        while (it.hasNext())
-        {
-            SignerInformation   signer = (SignerInformation)it.next();
-            Collection          certCollection = certStore.getMatches(signer.getSID());
-    
-            Iterator        certIt = certCollection.iterator();
-            X509CertificateHolder cert = (X509CertificateHolder)certIt.next();
-    
-            assertEquals(true, signer.verify(new JcaSimpleSignerInfoVerifierBuilder().setProvider(BC).build(cert)));
-            
-            if (contentDigest != null)
-            {
-                assertTrue(MessageDigest.isEqual(contentDigest, signer.getContentDigest()));
-            }
-        }
-
-        assertEquals(certStore.getMatches(null).size(), sp.getCertificates().getMatches(null).size());
-        assertEquals(crlStore.getMatches(null).size(), sp.getCRLs().getMatches(null).size());
-    }
-    
-    private void verifySignatures(CMSSignedDataParser sp) 
-        throws Exception
-    {
-        verifySignatures(sp, null);
-    }
-
-    private void verifyEncodedData(ByteArrayOutputStream bOut)
-        throws Exception
-    {
-        CMSSignedDataParser sp;
-        sp = new CMSSignedDataParser(new JcaDigestCalculatorProviderBuilder().setProvider(BC).build(), bOut.toByteArray());
-    
-        sp.getSignedContent().drain();
-        
-        verifySignatures(sp);
-        
-        sp.close();
-    }
-
-    private void checkSigParseable(byte[] sig)
-        throws Exception
-    {
-        CMSSignedDataParser sp = new CMSSignedDataParser(new JcaDigestCalculatorProviderBuilder().setProvider(BC).build(), sig);
-        sp.getVersion();
-        CMSTypedStream sc = sp.getSignedContent();
-        if (sc != null)
-        {
-            sc.drain();
-        }
-        sp.getCertificates();
-        sp.getCRLs();
-        sp.getSignerInfos();
-        sp.close();
-    }
-
-//    public void testEarlyInvalidKeyException() throws Exception
-//    {
-//        try
-//        {
-//            CMSSignedDataStreamGenerator gen = new CMSSignedDataStreamGenerator();
-//            gen.addSigner( _origKP.getPrivate(), _origCert,
-//                "DSA", // DOESN'T MATCH KEY ALG
-//                CMSSignedDataStreamGenerator.DIGEST_SHA1, BC);
-//
-//            fail("Expected InvalidKeyException in addSigner");
-//        }
-//        catch (InvalidKeyException e)
-//        {
-//            // Ignore
-//        }
-//    }
-
-//    public void testEarlyNoSuchAlgorithmException() throws Exception
-//    {
-//        try
-//        {
-//            CMSSignedDataStreamGenerator gen = new CMSSignedDataStreamGenerator();
-//            gen.addSigner( _origKP.getPrivate(), _origCert,
-//                CMSSignedDataStreamGenerator.DIGEST_SHA1, // BAD OID!
-//                CMSSignedDataStreamGenerator.DIGEST_SHA1, BC);
-//
-//            fail("Expected NoSuchAlgorithmException in addSigner");
-//        }
-//        catch (NoSuchAlgorithmException e)
-//        {
-//            // Ignore
-//        }
-//    }
-
-    public void testSha1EncapsulatedSignature()
-        throws Exception
-    {
-        byte[]  encapSigData = Base64.decode(
-                  "MIAGCSqGSIb3DQEHAqCAMIACAQExCzAJBgUrDgMCGgUAMIAGCSqGSIb3DQEH"
-                + "AaCAJIAEDEhlbGxvIFdvcmxkIQAAAAAAAKCCBGIwggINMIIBdqADAgECAgEF"
-                + "MA0GCSqGSIb3DQEBBAUAMCUxFjAUBgNVBAoTDUJvdW5jeSBDYXN0bGUxCzAJ"
-                + "BgNVBAYTAkFVMB4XDTA1MDgwNzA2MjU1OVoXDTA1MTExNTA2MjU1OVowJTEW"
-                + "MBQGA1UEChMNQm91bmN5IENhc3RsZTELMAkGA1UEBhMCQVUwgZ8wDQYJKoZI"
-                + "hvcNAQEBBQADgY0AMIGJAoGBAI1fZGgH9wgC3QiK6yluH6DlLDkXkxYYL+Qf"
-                + "nVRszJVYl0LIxZdpb7WEbVpO8fwtEgFtoDsOdxyqh3dTBv+L7NVD/v46kdPt"
-                + "xVkSNHRbutJVY8Xn4/TC/CDngqtbpbniMO8n0GiB6vs94gBT20M34j96O2IF"
-                + "73feNHP+x8PkJ+dNAgMBAAGjTTBLMB0GA1UdDgQWBBQ3XUfEE6+D+t+LIJgK"
-                + "ESSUE58eyzAfBgNVHSMEGDAWgBQ3XUfEE6+D+t+LIJgKESSUE58eyzAJBgNV"
-                + "HRMEAjAAMA0GCSqGSIb3DQEBBAUAA4GBAFK3r1stYOeXYJOlOyNGDTWEhZ+a"
-                + "OYdFeFaS6c+InjotHuFLAy+QsS8PslE48zYNFEqYygGfLhZDLlSnJ/LAUTqF"
-                + "01vlp+Bgn/JYiJazwi5WiiOTf7Th6eNjHFKXS3hfSGPNPIOjvicAp3ce3ehs"
-                + "uK0MxgLAaxievzhFfJcGSUMDMIICTTCCAbagAwIBAgIBBzANBgkqhkiG9w0B"
-                + "AQQFADAlMRYwFAYDVQQKEw1Cb3VuY3kgQ2FzdGxlMQswCQYDVQQGEwJBVTAe"
-                + "Fw0wNTA4MDcwNjI1NTlaFw0wNTExMTUwNjI1NTlaMGUxGDAWBgNVBAMTD0Vy"
-                + "aWMgSC4gRWNoaWRuYTEkMCIGCSqGSIb3DQEJARYVZXJpY0Bib3VuY3ljYXN0"
-                + "bGUub3JnMRYwFAYDVQQKEw1Cb3VuY3kgQ2FzdGxlMQswCQYDVQQGEwJBVTCB"
-                + "nzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAgHCJyfwV6/V3kqSu2SOU2E/K"
-                + "I+N0XohCMUaxPLLNtNBZ3ijxwaV6JGFz7siTgZD/OGfzir/eZimkt+L1iXQn"
-                + "OAB+ZChivKvHtX+dFFC7Vq+E4Uy0Ftqc/wrGxE6DHb5BR0hprKH8wlDS8wSP"
-                + "zxovgk4nH0ffUZOoDSuUgjh3gG8CAwEAAaNNMEswHQYDVR0OBBYEFLfY/4EG"
-                + "mYrvJa7Cky+K9BJ7YmERMB8GA1UdIwQYMBaAFDddR8QTr4P634sgmAoRJJQT"
-                + "nx7LMAkGA1UdEwQCMAAwDQYJKoZIhvcNAQEEBQADgYEADIOmpMd6UHdMjkyc"
-                + "mIE1yiwfClCsGhCK9FigTg6U1G2FmkBwJIMWBlkeH15uvepsAncsgK+Cn3Zr"
-                + "dZMb022mwtTJDtcaOM+SNeuCnjdowZ4i71Hf68siPm6sMlZkhz49rA0Yidoo"
-                + "WuzYOO+dggzwDsMldSsvsDo/ARyCGOulDOAxggEvMIIBKwIBATAqMCUxFjAU"
-                + "BgNVBAoTDUJvdW5jeSBDYXN0bGUxCzAJBgNVBAYTAkFVAgEHMAkGBSsOAwIa"
-                + "BQCgXTAYBgkqhkiG9w0BCQMxCwYJKoZIhvcNAQcBMBwGCSqGSIb3DQEJBTEP"
-                + "Fw0wNTA4MDcwNjI1NTlaMCMGCSqGSIb3DQEJBDEWBBQu973mCM5UBOl9XwQv"
-                + "lfifHCMocTANBgkqhkiG9w0BAQEFAASBgGxnBl2qozYKLgZ0ygqSFgWcRGl1"
-                + "LgNuE587LtO+EKkgoc3aFqEdjXlAyP8K7naRsvWnFrsB6pUpnrgI9Z8ZSKv8"
-                + "98IlpsSSJ0jBlEb4gzzavwcBpYbr2ryOtDcF+kYmKIpScglyyoLzm+KPXOoT"
-                + "n7MsJMoKN3Kd2Vzh6s10PFgeAAAAAAAA");
-
-        CMSSignedDataParser     sp = new CMSSignedDataParser(new JcaDigestCalculatorProviderBuilder().setProvider(BC).build(), encapSigData);
-
-        sp.getSignedContent().drain();
-
-        verifySignatures(sp);
-    }
-    
-    public void testSHA1WithRSANoAttributes()
-        throws Exception
-    {
-        List         certList = new ArrayList();
-        CMSTypedData msg = new CMSProcessableByteArray(TEST_MESSAGE.getBytes());
-    
-        certList.add(_origCert);
-        certList.add(_signCert);
-    
-        Store certs = new JcaCertStore(certList);
-    
-        CMSSignedDataGenerator gen = new CMSSignedDataGenerator();
-
-        ContentSigner sha1Signer = new JcaContentSignerBuilder("SHA1withRSA").setProvider(BC).build(_origKP.getPrivate());
-
-        JcaSignerInfoGeneratorBuilder siBuilder = new JcaSignerInfoGeneratorBuilder(new JcaDigestCalculatorProviderBuilder().setProvider(BC).build());
-
-        siBuilder.setDirectSignature(true);
-
-        gen.addSignerInfoGenerator(siBuilder.build(sha1Signer, _origCert));
-    
-        gen.addCertificates(certs);
-    
-        CMSSignedData s = gen.generate(msg, false);
-
-        CMSSignedDataParser     sp = new CMSSignedDataParser(new JcaDigestCalculatorProviderBuilder().setProvider(BC).build(),
-                new CMSTypedStream(new ByteArrayInputStream(TEST_MESSAGE.getBytes())), s.getEncoded());
-        
-        sp.getSignedContent().drain();
-        
-        //
-        // compute expected content digest
-        //
-        MessageDigest md = MessageDigest.getInstance("SHA1", BC);
-        
-        verifySignatures(sp, md.digest(TEST_MESSAGE.getBytes()));
-    }
-    
-    public void testDSANoAttributes()
-        throws Exception
-    {
-        List                certList = new ArrayList();
-        CMSTypedData        msg = new CMSProcessableByteArray(TEST_MESSAGE.getBytes());
-    
-        certList.add(_origDsaCert);
-        certList.add(_signCert);
-    
-        JcaCertStore          certs = new JcaCertStore(certList);
-    
-        CMSSignedDataGenerator gen = new CMSSignedDataGenerator();
-
-        JcaSignerInfoGeneratorBuilder builder = new JcaSignerInfoGeneratorBuilder(new JcaDigestCalculatorProviderBuilder().setProvider(BC).build());
-
-        builder.setDirectSignature(true);
-
-        gen.addSignerInfoGenerator(builder.build(new JcaContentSignerBuilder("SHA1withDSA").setProvider(BC).build(_origDsaKP.getPrivate()), _origDsaCert));
-    
-        gen.addCertificates(certs);
-    
-        CMSSignedData s = gen.generate(msg);
-    
-        CMSSignedDataParser     sp = new CMSSignedDataParser(new JcaDigestCalculatorProviderBuilder().setProvider(BC).build(),
-                new CMSTypedStream(new ByteArrayInputStream(TEST_MESSAGE.getBytes())), s.getEncoded());
-        
-        sp.getSignedContent().drain();
-        
-        //
-        // compute expected content digest
-        //
-        MessageDigest md = MessageDigest.getInstance("SHA1", BC);
-        
-        verifySignatures(sp, md.digest(TEST_MESSAGE.getBytes()));
-    }
-    
-    public void testSHA1WithRSA()
-        throws Exception
-    {
-        List                  certList = new ArrayList();
-        List                  crlList = new ArrayList();
-        ByteArrayOutputStream bOut = new ByteArrayOutputStream();
-        
-        certList.add(_origCert);
-        certList.add(_signCert);
-
-        crlList.add(_signCrl);
-        crlList.add(_origCrl);
-
-        Store           certs = new JcaCertStore(certList);
-        Store           crls = new JcaCRLStore(crlList);
-
-        CMSSignedDataStreamGenerator gen = new CMSSignedDataStreamGenerator();
-
-        ContentSigner sha1Signer = new JcaContentSignerBuilder("SHA1withRSA").setProvider(BC).build(_origKP.getPrivate());
-
-        gen.addSignerInfoGenerator(new JcaSignerInfoGeneratorBuilder(new JcaDigestCalculatorProviderBuilder().setProvider(BC).build()).build(sha1Signer, _origCert));
-    
-        gen.addCertificates(certs);
-
-        gen.addCRLs(crls);
-
-        OutputStream sigOut = gen.open(bOut);
-    
-        sigOut.write(TEST_MESSAGE.getBytes());
-        
-        sigOut.close();
-
-        checkSigParseable(bOut.toByteArray());
-
-        CMSSignedDataParser     sp = new CMSSignedDataParser(new JcaDigestCalculatorProviderBuilder().setProvider(BC).build(),
-                new CMSTypedStream(new ByteArrayInputStream(TEST_MESSAGE.getBytes())), bOut.toByteArray());
-    
-        sp.getSignedContent().drain();
-        
-        //
-        // compute expected content digest
-        //
-        MessageDigest md = MessageDigest.getInstance("SHA1", BC);
-        
-        verifySignatures(sp, md.digest(TEST_MESSAGE.getBytes()));
-        
-        //
-        // try using existing signer
-        //
-        gen = new CMSSignedDataStreamGenerator();
-    
-        gen.addSigners(sp.getSignerInfos());
-        
-        gen.addCertificates(sp.getCertificates());
-        gen.addCRLs(sp.getCRLs());
-
-        bOut.reset();
-        
-        sigOut = gen.open(bOut, true);
-    
-        sigOut.write(TEST_MESSAGE.getBytes());
-        
-        sigOut.close();
-    
-        verifyEncodedData(bOut);
-
-        //
-        // look for the CRLs
-        //
-        Collection col = sp.getCRLs().getMatches(null);
-
-        assertEquals(2, col.size());
-        assertTrue(col.contains(new JcaX509CRLHolder(_signCrl)));
-        assertTrue(col.contains(new JcaX509CRLHolder(_origCrl)));
-    }
-
-    public void testSHA1WithRSAAndOtherRevocation()
-        throws Exception
-    {
-        List                  certList = new ArrayList();
-        CMSTypedData          msg = new CMSProcessableByteArray("Hello world!".getBytes());
-        ByteArrayOutputStream bOut = new ByteArrayOutputStream();
-
-        certList.add(_origCert);
-        certList.add(_signCert);
-
-        Store           certs = new JcaCertStore(certList);
-
-        CMSSignedDataStreamGenerator gen = new CMSSignedDataStreamGenerator();
-
-        ContentSigner sha1Signer = new JcaContentSignerBuilder("SHA1withRSA").setProvider(BC).build(_origKP.getPrivate());
-
-        gen.addSignerInfoGenerator(new JcaSignerInfoGeneratorBuilder(new JcaDigestCalculatorProviderBuilder().setProvider(BC).build()).build(sha1Signer, _origCert));
-
-        gen.addCertificates(certs);
-
-        List otherInfo = new ArrayList();
-        OCSPResp response = new OCSPResp(successResp);
-
-        otherInfo.add(response.toASN1Structure());
-
-        gen.addOtherRevocationInfo(CMSObjectIdentifiers.id_ri_ocsp_response, new CollectionStore(otherInfo));
-
-        OutputStream sigOut = gen.open(bOut, true);
-
-        sigOut.write(TEST_MESSAGE.getBytes());
-
-        sigOut.close();
-
-        CMSSignedDataParser     sp = new CMSSignedDataParser(new JcaDigestCalculatorProviderBuilder().setProvider(BC).build(), bOut.toByteArray());
-
-        CMSTypedStream stream = sp.getSignedContent();
-
-        assertEquals(CMSObjectIdentifiers.data, stream.getContentType());
-
-        stream.drain();
-
-        //
-        // check version
-        //
-        assertEquals(5, sp.getVersion());
-
-        //
-        // compute expected content digest
-        //
-        MessageDigest md = MessageDigest.getInstance("SHA1", BC);
-
-        verifySignatures(sp, md.digest(TEST_MESSAGE.getBytes()));
-
-        Store dataOtherInfo = sp.getOtherRevocationInfo(CMSObjectIdentifiers.id_ri_ocsp_response);
-
-        assertEquals(1, dataOtherInfo.getMatches(null).size());
-
-        OCSPResp dataResponse = new OCSPResp(OCSPResponse.getInstance(dataOtherInfo.getMatches(null).iterator().next()));
-
-        assertEquals(response, dataResponse);
-    }
-
-    public void testSHA1WithRSANonData()
-        throws Exception
-    {
-        List                  certList = new ArrayList();
-        List                  crlList = new ArrayList();
-        ByteArrayOutputStream bOut = new ByteArrayOutputStream();
-
-        certList.add(new JcaX509CertificateHolder(_origCert));
-        certList.add(new JcaX509CertificateHolder(_signCert));
-
-        crlList.add(new JcaX509CRLHolder(_signCrl));
-        crlList.add(new JcaX509CRLHolder(_origCrl));
-
-        Store           certs = new JcaCertStore(certList);
-        Store           crls = new JcaCRLStore(crlList);
-
-        CMSSignedDataStreamGenerator gen = new CMSSignedDataStreamGenerator();
-        ContentSigner sha1Signer = new JcaContentSignerBuilder("SHA1withRSA").setProvider(BC).build(_origKP.getPrivate());
-
-        gen.addSignerInfoGenerator(new JcaSignerInfoGeneratorBuilder(new JcaDigestCalculatorProviderBuilder().setProvider(BC).build()).build(sha1Signer, _origCert));
-
-        gen.addCertificates(certs);
-        gen.addCRLs(crls);
-
-        OutputStream sigOut = gen.open(new ASN1ObjectIdentifier("1.2.3.4"), bOut, true);
-
-        sigOut.write(TEST_MESSAGE.getBytes());
-
-        sigOut.close();
-
-        CMSSignedDataParser     sp = new CMSSignedDataParser(new JcaDigestCalculatorProviderBuilder().setProvider(BC).build(), bOut.toByteArray());
-
-        CMSTypedStream stream = sp.getSignedContent();
-
-        assertEquals(new ASN1ObjectIdentifier("1.2.3.4"), stream.getContentType());
-
-        stream.drain();
-
-        //
-        // compute expected content digest
-        //
-        MessageDigest md = MessageDigest.getInstance("SHA1", BC);
-
-        verifySignatures(sp, md.digest(TEST_MESSAGE.getBytes()));
-    }
-
-    public void testSHA1AndMD5WithRSA()
-        throws Exception
-    {
-        List                  certList = new ArrayList();
-        ByteArrayOutputStream bOut = new ByteArrayOutputStream();
-        
-        certList.add(_origCert);
-        certList.add(_signCert);
-    
-        Store           certs = new JcaCertStore(certList);
-    
-        CMSSignedDataStreamGenerator gen = new CMSSignedDataStreamGenerator();
-        JcaSignerInfoGeneratorBuilder signerInfoGeneratorBuilder = new JcaSignerInfoGeneratorBuilder(new JcaDigestCalculatorProviderBuilder().setProvider(BC).build());
-        ContentSigner sha1Signer = new JcaContentSignerBuilder("SHA1withRSA").setProvider(BC).build(_origKP.getPrivate());
-        ContentSigner md5Signer = new JcaContentSignerBuilder("MD5withRSA").setProvider(BC).build(_origKP.getPrivate());
-
-        gen.addSignerInfoGenerator(signerInfoGeneratorBuilder.build(sha1Signer, _origCert));
-
-        gen.addSignerInfoGenerator(signerInfoGeneratorBuilder.build(md5Signer, _origCert));
-        
-        gen.addCertificates(certs);
-    
-        OutputStream sigOut = gen.open(bOut);
-    
-        sigOut.write(TEST_MESSAGE.getBytes());
-        
-        sigOut.close();
-
-        checkSigParseable(bOut.toByteArray());
-
-        CMSSignedDataParser     sp = new CMSSignedDataParser(new JcaDigestCalculatorProviderBuilder().setProvider(BC).build(),
-                new CMSTypedStream(new ByteArrayInputStream(TEST_MESSAGE.getBytes())), bOut.toByteArray());
-    
-        sp.getSignedContent().drain();
-        
-        verifySignatures(sp);
-    }
-    
-    public void testSHA1WithRSAEncapsulatedBufferedStream()
-        throws Exception
-    {
-        List                  certList = new ArrayList();
-        ByteArrayOutputStream bOut = new ByteArrayOutputStream();
-        
-        certList.add(_origCert);
-        certList.add(_signCert);
-
-        Store           certs = new JcaCertStore(certList);
-
-        //
-        // find unbuffered length
-        //
-        CMSSignedDataStreamGenerator gen = new CMSSignedDataStreamGenerator();
-
-        ContentSigner sha1Signer = new JcaContentSignerBuilder("SHA1withRSA").setProvider(BC).build(_origKP.getPrivate());
-
-        gen.addSignerInfoGenerator(new JcaSignerInfoGeneratorBuilder(new JcaDigestCalculatorProviderBuilder().setProvider(BC).build()).build(sha1Signer, _origCert));
-
-        gen.addCertificates(certs);
-
-        OutputStream sigOut = gen.open(bOut, true);
-        
-        for (int i = 0; i != 2000; i++)
-        {
-            sigOut.write(i & 0xff);
-        }
-        
-        sigOut.close();
-        
-        CMSSignedDataParser     sp = new CMSSignedDataParser(new JcaDigestCalculatorProviderBuilder().setProvider(BC).build(), bOut.toByteArray());
-
-        sp.getSignedContent().drain();
-        
-        verifySignatures(sp);
-        
-        int unbufferedLength = bOut.toByteArray().length;
-        
-        //
-        // find buffered length with buffered stream - should be equal
-        //
-        bOut = new ByteArrayOutputStream();
-
-        gen = new CMSSignedDataStreamGenerator();
-
-        gen.addSignerInfoGenerator(new JcaSignerInfoGeneratorBuilder(new JcaDigestCalculatorProviderBuilder().setProvider(BC).build()).build(sha1Signer, _origCert));
-
-        gen.addCertificates(certs);
-
-        sigOut = gen.open(bOut, true);
-
-        BufferedOutputStream bfOut = new BufferedOutputStream(sigOut, 300);
-        
-        for (int i = 0; i != 2000; i++)
-        {
-            bfOut.write(i & 0xff);
-        }
-        
-        bfOut.close();
-        
-        verifyEncodedData(bOut);
-        
-        assertTrue(bOut.toByteArray().length == unbufferedLength);
-    }
-
-    public void testSHA1WithRSAEncapsulatedBuffered()
-        throws Exception
-    {
-        List                  certList = new ArrayList();
-        ByteArrayOutputStream bOut = new ByteArrayOutputStream();
-        
-        certList.add(_origCert);
-        certList.add(_signCert);
-    
-        Store           certs = new JcaCertStore(certList);
-    
-        //
-        // find unbuffered length
-        //
-        CMSSignedDataStreamGenerator gen = new CMSSignedDataStreamGenerator();
-
-        ContentSigner sha1Signer = new JcaContentSignerBuilder("SHA1withRSA").setProvider(BC).build(_origKP.getPrivate());
-
-        gen.addSignerInfoGenerator(new JcaSignerInfoGeneratorBuilder(new JcaDigestCalculatorProviderBuilder().setProvider(BC).build()).build(sha1Signer, _origCert));
-
-        gen.addCertificates(certs);
-    
-        OutputStream sigOut = gen.open(bOut, true);
-        
-        for (int i = 0; i != 2000; i++)
-        {
-            sigOut.write(i & 0xff);
-        }
-        
-        sigOut.close();
-        
-        CMSSignedDataParser     sp = new CMSSignedDataParser(new JcaDigestCalculatorProviderBuilder().setProvider(BC).build(), bOut.toByteArray());
-    
-        sp.getSignedContent().drain();
-        
-        verifySignatures(sp);
-        
-        int unbufferedLength = bOut.toByteArray().length;
-        
-        //
-        // find buffered length - buffer size less than default
-        //
-        bOut = new ByteArrayOutputStream();
-    
-        gen = new CMSSignedDataStreamGenerator();
-        
-        gen.setBufferSize(300);
-
-        gen.addSignerInfoGenerator(new JcaSignerInfoGeneratorBuilder(new JcaDigestCalculatorProviderBuilder().setProvider(BC).build()).build(sha1Signer, _origCert));
-
-        gen.addCertificates(certs);
-    
-        sigOut = gen.open(bOut, true);
-    
-        for (int i = 0; i != 2000; i++)
-        {
-            sigOut.write(i & 0xff);
-        }
-        
-        sigOut.close();
-        
-        verifyEncodedData(bOut);
-
-        assertTrue(bOut.toByteArray().length > unbufferedLength);
-    }
-    
-    public void testSHA1WithRSAEncapsulated()
-        throws Exception
-    {
-        List                  certList = new ArrayList();
-        ByteArrayOutputStream bOut = new ByteArrayOutputStream();
-        
-        certList.add(_origCert);
-        certList.add(_signCert);
-
-        Store           certs = new JcaCertStore(certList);
-
-        CMSSignedDataStreamGenerator gen = new CMSSignedDataStreamGenerator();
-
-        ContentSigner sha1Signer = new JcaContentSignerBuilder("SHA1withRSA").setProvider(BC).build(_origKP.getPrivate());
-
-        gen.addSignerInfoGenerator(new JcaSignerInfoGeneratorBuilder(new JcaDigestCalculatorProviderBuilder().setProvider(BC).build()).build(sha1Signer, _origCert));
-
-        gen.addCertificates(certs);
-
-        OutputStream sigOut = gen.open(bOut, true);
-
-        sigOut.write(TEST_MESSAGE.getBytes());
-        
-        sigOut.close();
-        
-        CMSSignedDataParser     sp = new CMSSignedDataParser(new JcaDigestCalculatorProviderBuilder().setProvider(BC).build(), bOut.toByteArray());
-
-        sp.getSignedContent().drain();
-        
-        verifySignatures(sp);
-        
-        byte[] contentDigest = (byte[])gen.getGeneratedDigests().get(CMSAlgorithm.SHA1.getId());
-
-        AttributeTable table = ((SignerInformation)sp.getSignerInfos().getSigners().iterator().next()).getSignedAttributes();
-        Attribute hash = table.get(CMSAttributes.messageDigest);
-
-        assertTrue(MessageDigest.isEqual(contentDigest, ((ASN1OctetString)hash.getAttrValues().getObjectAt(0)).getOctets()));
-
-        //
-        // try using existing signer
-        //
-        gen = new CMSSignedDataStreamGenerator();
-
-        gen.addSigners(sp.getSignerInfos());
-        
-        gen.addCertificates(sp.getCertificates());
-        
-        bOut.reset();
-        
-        sigOut = gen.open(bOut, true);
-
-        sigOut.write(TEST_MESSAGE.getBytes());
-        
-        sigOut.close();
-
-        CMSSignedData sd = new CMSSignedData(new CMSProcessableByteArray(TEST_MESSAGE.getBytes()), bOut.toByteArray());
-
-        assertEquals(1, sd.getSignerInfos().getSigners().size());
-
-        verifyEncodedData(bOut);
-    }
-
-    public void testSHA1WithRSAEncapsulatedSubjectKeyID()
-        throws Exception
-    {
-        List                  certList = new ArrayList();
-        ByteArrayOutputStream bOut = new ByteArrayOutputStream();
-
-        certList.add(_origCert);
-        certList.add(_signCert);
-
-        Store           certs = new JcaCertStore(certList);
-
-        CMSSignedDataStreamGenerator gen = new CMSSignedDataStreamGenerator();
-
-        ContentSigner sha1Signer = new JcaContentSignerBuilder("SHA1withRSA").setProvider(BC).build(_origKP.getPrivate());
-
-        gen.addSignerInfoGenerator(new JcaSignerInfoGeneratorBuilder(new JcaDigestCalculatorProviderBuilder().setProvider(BC).build()).build(sha1Signer, CMSTestUtil.createSubjectKeyId(_origCert.getPublicKey()).getKeyIdentifier()));
-        
-        gen.addCertificates(certs);
-
-        OutputStream sigOut = gen.open(bOut, true);
-
-        sigOut.write(TEST_MESSAGE.getBytes());
-
-        sigOut.close();
-
-        CMSSignedDataParser     sp = new CMSSignedDataParser(new JcaDigestCalculatorProviderBuilder().setProvider(BC).build(), bOut.toByteArray());
-
-        sp.getSignedContent().drain();
-
-        verifySignatures(sp);
-
-        byte[] contentDigest = (byte[])gen.getGeneratedDigests().get(CMSAlgorithm.SHA1.getId());
-
-        AttributeTable table = ((SignerInformation)sp.getSignerInfos().getSigners().iterator().next()).getSignedAttributes();
-        Attribute hash = table.get(CMSAttributes.messageDigest);
-
-        assertTrue(MessageDigest.isEqual(contentDigest, ((ASN1OctetString)hash.getAttrValues().getObjectAt(0)).getOctets()));
-
-        //
-        // try using existing signer
-        //
-        gen = new CMSSignedDataStreamGenerator();
-
-        gen.addSigners(sp.getSignerInfos());
-
-        gen.addCertificates(sp.getCertificates());
-
-        bOut.reset();
-
-        sigOut = gen.open(bOut, true);
-
-        sigOut.write(TEST_MESSAGE.getBytes());
-
-        sigOut.close();
-
-        CMSSignedData sd = new CMSSignedData(new CMSProcessableByteArray(TEST_MESSAGE.getBytes()), bOut.toByteArray());
-
-        assertEquals(1, sd.getSignerInfos().getSigners().size());
-
-        verifyEncodedData(bOut);
-    }
-
-    public void testAttributeGenerators()
-        throws Exception
-    {
-        final ASN1ObjectIdentifier dummyOid1 = new ASN1ObjectIdentifier("1.2.3");
-        final ASN1ObjectIdentifier dummyOid2 = new ASN1ObjectIdentifier("1.2.3.4");
-        List                      certList = new ArrayList();
-        ByteArrayOutputStream     bOut = new ByteArrayOutputStream();
-
-        certList.add(_origCert);
-        certList.add(_signCert);
-
-        JcaCertStore           certs = new JcaCertStore(certList);
-
-        CMSSignedDataStreamGenerator gen = new CMSSignedDataStreamGenerator();
-
-        CMSAttributeTableGenerator signedGen = new DefaultSignedAttributeTableGenerator()
-        {
-            public AttributeTable getAttributes(Map parameters)
-            {
-                Hashtable table = createStandardAttributeTable(parameters);
-
-                DEROctetString val = new DEROctetString((byte[])parameters.get(CMSAttributeTableGenerator.DIGEST));
-                Attribute attr = new Attribute(dummyOid1, new DERSet(val));
-
-                table.put(attr.getAttrType(), attr);
-
-                return new AttributeTable(table);
-            }
-        };
-
-        CMSAttributeTableGenerator unsignedGen = new CMSAttributeTableGenerator()
-        {
-            public AttributeTable getAttributes(Map parameters)
-            {
-                DEROctetString val = new DEROctetString((byte[])parameters.get(CMSAttributeTableGenerator.SIGNATURE));
-                Attribute attr = new Attribute(dummyOid2, new DERSet(val));
-
-                return new AttributeTable(new DERSet(attr));
-            }
-        };
-        ContentSigner sha1Signer = new JcaContentSignerBuilder("SHA1withRSA").setProvider(BC).build(_origKP.getPrivate());
-
-        JcaSignerInfoGeneratorBuilder siBuilder = new JcaSignerInfoGeneratorBuilder(new JcaDigestCalculatorProviderBuilder().setProvider(BC).build());
-
-        siBuilder.setSignedAttributeGenerator(signedGen).setUnsignedAttributeGenerator(unsignedGen);
-
-        gen.addSignerInfoGenerator(siBuilder.build(sha1Signer, _origCert));
-
-        gen.addCertificates(certs);
-
-        OutputStream sigOut = gen.open(bOut, true);
-
-        sigOut.write(TEST_MESSAGE.getBytes());
-
-        sigOut.close();
-
-        CMSSignedDataParser     sp = new CMSSignedDataParser(new JcaDigestCalculatorProviderBuilder().setProvider(BC).build(), bOut.toByteArray());
-
-        sp.getSignedContent().drain();
-
-        verifySignatures(sp);
-
-        //
-        // check attributes
-        //
-        SignerInformationStore  signers = sp.getSignerInfos();
-
-        Collection              c = signers.getSigners();
-        Iterator                it = c.iterator();
-
-        while (it.hasNext())
-        {
-            SignerInformation   signer = (SignerInformation)it.next();
-            checkAttribute(signer.getContentDigest(), signer.getSignedAttributes().get(dummyOid1));
-            checkAttribute(signer.getSignature(), signer.getUnsignedAttributes().get(dummyOid2));
-        }
-    }
-
-    private void checkAttribute(byte[] expected, Attribute attr)
-    {
-        DEROctetString      value = (DEROctetString)attr.getAttrValues().getObjectAt(0);
-
-        assertEquals(new DEROctetString(expected), value);
-    }
-
-    public void testWithAttributeCertificate()
-        throws Exception
-    {
-        List                  certList = new ArrayList();
-
-        certList.add(_signCert);
-
-        Store           certs = new JcaCertStore(certList);
-
-        CMSSignedDataStreamGenerator gen = new CMSSignedDataStreamGenerator();
-
-        ContentSigner sha1Signer = new JcaContentSignerBuilder("SHA1withRSA").setProvider(BC).build(_origKP.getPrivate());
-
-        gen.addSignerInfoGenerator(new JcaSignerInfoGeneratorBuilder(new JcaDigestCalculatorProviderBuilder().setProvider(BC).build()).build(sha1Signer, _origCert));
-
-        gen.addCertificates(certs);
-
-        X509AttributeCertificateHolder attrCert = CMSTestUtil.getAttributeCertificate();
-
-        Store store = new CollectionStore(Collections.singleton(attrCert));
-
-        gen.addAttributeCertificates(store);
-
-        ByteArrayOutputStream bOut = new ByteArrayOutputStream();
-
-        OutputStream sigOut = gen.open(bOut, true);
-
-        sigOut.write(TEST_MESSAGE.getBytes());
-
-        sigOut.close();
-
-        CMSSignedDataParser     sp = new CMSSignedDataParser(new JcaDigestCalculatorProviderBuilder().setProvider(BC).build(), bOut.toByteArray());
-
-        sp.getSignedContent().drain();
-
-        assertEquals(4, sp.getVersion());
-
-//        store = sp.getAttributeCertificates();
-//
-//        Collection coll = store.getMatches(null);
-//
-//        assertEquals(1, coll.size());
-//
-//        assertTrue(coll.contains(new JcaX509AttributeCertificateHolder(attrCert)));
-    }
-
-    public void testSignerStoreReplacement()
-        throws Exception
-    {
-        List                  certList = new ArrayList();
-        ByteArrayOutputStream bOut = new ByteArrayOutputStream();
-        byte[]                data = TEST_MESSAGE.getBytes();
-
-        certList.add(_origCert);
-        certList.add(_signCert);
-
-        Store           certs = new JcaCertStore(certList);
-
-        CMSSignedDataStreamGenerator gen = new CMSSignedDataStreamGenerator();
-
-        gen.addSignerInfoGenerator(new JcaSimpleSignerInfoGeneratorBuilder().setProvider(BC).build("SHA1withRSA", _origKP.getPrivate(), _origCert));
-
-        gen.addCertificates(certs);
-
-        OutputStream sigOut = gen.open(bOut, false);
-
-        sigOut.write(data);
-
-        sigOut.close();
-
-        checkSigParseable(bOut.toByteArray());
-
-        //
-        // create new Signer
-        //
-        ByteArrayInputStream  original = new ByteArrayInputStream(bOut.toByteArray());
-
-        bOut.reset();
-
-        gen = new CMSSignedDataStreamGenerator();
-
-        gen.addSignerInfoGenerator(new JcaSimpleSignerInfoGeneratorBuilder().setProvider(BC).build("SHA224withRSA", _origKP.getPrivate(), _origCert));
-
-        gen.addCertificates(certs);
-
-        sigOut = gen.open(bOut);
-
-        sigOut.write(data);
-
-        sigOut.close();
-
-        checkSigParseable(bOut.toByteArray());
-
-        CMSSignedData sd = new CMSSignedData(bOut.toByteArray());
-
-        //
-        // replace signer
-        //
-        ByteArrayOutputStream newOut = new ByteArrayOutputStream();
-
-        CMSSignedDataParser.replaceSigners(original, sd.getSignerInfos(), newOut);
-
-        sd = new CMSSignedData(new CMSProcessableByteArray(data), newOut.toByteArray());
-        SignerInformation signer = (SignerInformation)sd.getSignerInfos().getSigners().iterator().next();
-
-        assertEquals(signer.getDigestAlgOID(), CMSAlgorithm.SHA224.getId());
-
-        CMSSignedDataParser sp = new CMSSignedDataParser(new JcaDigestCalculatorProviderBuilder().setProvider(BC).build(), new CMSTypedStream(new ByteArrayInputStream(data)), newOut.toByteArray());
-
-        sp.getSignedContent().drain();
-
-        verifySignatures(sp);
-    }
-
-    public void testEncapsulatedSignerStoreReplacement()
-        throws Exception
-    {
-        List                  certList = new ArrayList();
-        ByteArrayOutputStream bOut = new ByteArrayOutputStream();
-
-        certList.add(_origCert);
-        certList.add(_signCert);
-
-        Store           certs = new JcaCertStore(certList);
-
-        CMSSignedDataStreamGenerator gen = new CMSSignedDataStreamGenerator();
-
-        gen.addSignerInfoGenerator(new JcaSimpleSignerInfoGeneratorBuilder().setProvider(BC).build("SHA1withRSA", _origKP.getPrivate(), _origCert));
-
-        gen.addCertificates(certs);
-
-        OutputStream sigOut = gen.open(bOut, true);
-
-        sigOut.write(TEST_MESSAGE.getBytes());
-
-        sigOut.close();
-
-        //
-        // create new Signer
-        //
-        ByteArrayInputStream  original = new ByteArrayInputStream(bOut.toByteArray());
-
-        bOut.reset();
-
-        gen = new CMSSignedDataStreamGenerator();
-
-        gen.addSignerInfoGenerator(new JcaSimpleSignerInfoGeneratorBuilder().setProvider(BC).build("SHA224withRSA", _origKP.getPrivate(), _origCert));
-
-        gen.addCertificates(certs);
-
-        sigOut = gen.open(bOut, true);
-
-        sigOut.write(TEST_MESSAGE.getBytes());
-
-        sigOut.close();
-
-        CMSSignedData sd = new CMSSignedData(bOut.toByteArray());
-
-        //
-        // replace signer
-        //
-        ByteArrayOutputStream newOut = new ByteArrayOutputStream();
-
-        CMSSignedDataParser.replaceSigners(original, sd.getSignerInfos(), newOut);
-
-        sd = new CMSSignedData(newOut.toByteArray());
-        SignerInformation signer = (SignerInformation)sd.getSignerInfos().getSigners().iterator().next();
-
-        assertEquals(signer.getDigestAlgOID(), CMSAlgorithm.SHA224.getId());
-
-        CMSSignedDataParser sp = new CMSSignedDataParser(new JcaDigestCalculatorProviderBuilder().setProvider(BC).build(), newOut.toByteArray());
-
-        sp.getSignedContent().drain();
-
-        verifySignatures(sp);
-    }
-
-    public void testCertStoreReplacement()
-        throws Exception
-    {
-        List                  certList = new ArrayList();
-        ByteArrayOutputStream bOut = new ByteArrayOutputStream();
-        byte[]                data = TEST_MESSAGE.getBytes();
-
-        certList.add(_origDsaCert);
-
-        JcaCertStore           certs = new JcaCertStore(certList);
-
-        CMSSignedDataStreamGenerator gen = new CMSSignedDataStreamGenerator();
-
-        JcaSignerInfoGeneratorBuilder builder = new JcaSignerInfoGeneratorBuilder(new JcaDigestCalculatorProviderBuilder().setProvider(BC).build());
-
-        gen.addSignerInfoGenerator(builder.build(new JcaContentSignerBuilder("SHA1withRSA").build(_origKP.getPrivate()), _origCert));
-
-        gen.addCertificates(certs);
-
-        OutputStream sigOut = gen.open(bOut);
-
-        sigOut.write(data);
-
-        sigOut.close();
-
-        checkSigParseable(bOut.toByteArray());
-
-        //
-        // create new certstore with the right certificates
-        //
-        certList = new ArrayList();
-        certList.add(_origCert);
-        certList.add(_signCert);
-
-        certs = new JcaCertStore(certList);
-
-
-        //
-        // replace certs
-        //
-        ByteArrayInputStream original = new ByteArrayInputStream(bOut.toByteArray());
-        ByteArrayOutputStream newOut = new ByteArrayOutputStream();
-
-        CMSSignedDataParser.replaceCertificatesAndCRLs(original, certs, null, null, newOut);
-
-        CMSSignedDataParser sp = new CMSSignedDataParser(new JcaDigestCalculatorProviderBuilder().setProvider(BC).build(), new CMSTypedStream(new ByteArrayInputStream(data)), newOut.toByteArray());
-
-        sp.getSignedContent().drain();
-
-        verifySignatures(sp);
-    }
-
-    public void testEncapsulatedCertStoreReplacement()
-        throws Exception
-    {
-        List                  certList = new ArrayList();
-        ByteArrayOutputStream bOut = new ByteArrayOutputStream();
-
-        certList.add(_origDsaCert);
-
-        Store           certs = new JcaCertStore(certList);
-
-        CMSSignedDataStreamGenerator gen = new CMSSignedDataStreamGenerator();
-
-        JcaSignerInfoGeneratorBuilder builder = new JcaSignerInfoGeneratorBuilder(new JcaDigestCalculatorProviderBuilder().setProvider(BC).build());
-
-        gen.addSignerInfoGenerator(builder.build(new JcaContentSignerBuilder("SHA1withRSA").build(_origKP.getPrivate()), _origCert));
-
-        gen.addCertificates(certs);
-
-        OutputStream sigOut = gen.open(bOut, true);
-
-        sigOut.write(TEST_MESSAGE.getBytes());
-
-        sigOut.close();
-
-        //
-        // create new certstore with the right certificates
-        //
-        certList = new ArrayList();
-        certList.add(_origCert);
-        certList.add(_signCert);
-
-        certs = new JcaCertStore(certList);
-
-        //
-        // replace certs
-        //
-        ByteArrayInputStream original = new ByteArrayInputStream(bOut.toByteArray());
-        ByteArrayOutputStream newOut = new ByteArrayOutputStream();
-
-        CMSSignedDataParser.replaceCertificatesAndCRLs(original, certs, null, null, newOut);
-
-        CMSSignedDataParser sp = new CMSSignedDataParser(new JcaDigestCalculatorProviderBuilder().setProvider(BC).build(), newOut.toByteArray());
-
-        sp.getSignedContent().drain();
-
-        verifySignatures(sp);
-    }
-
-    public void testCertOrdering1()
-        throws Exception
-    {
-        List                  certList = new ArrayList();
-        ByteArrayOutputStream bOut = new ByteArrayOutputStream();
-
-        certList.add(_origCert);
-        certList.add(_signCert);
-
-        Store           certs = new JcaCertStore(certList);
-
-        CMSSignedDataStreamGenerator gen = new CMSSignedDataStreamGenerator();
-
-        gen.addSignerInfoGenerator(new JcaSimpleSignerInfoGeneratorBuilder().setProvider(BC).build("SHA1withRSA", _origKP.getPrivate(), _origCert));
-
-        gen.addCertificates(certs);
-
-        OutputStream sigOut = gen.open(bOut, true);
-
-        sigOut.write(TEST_MESSAGE.getBytes());
-
-        sigOut.close();
-
-        CMSSignedDataParser sp = new CMSSignedDataParser(new JcaDigestCalculatorProviderBuilder().setProvider(BC).build(), bOut.toByteArray());
-
-        sp.getSignedContent().drain();
-        certs = sp.getCertificates();
-        Iterator it = certs.getMatches(null).iterator();
-
-        assertEquals(new JcaX509CertificateHolder(_origCert), it.next());
-        assertEquals(new JcaX509CertificateHolder(_signCert), it.next());
-    }
-
-    public void testCertOrdering2()
-        throws Exception
-    {
-        List                  certList = new ArrayList();
-        ByteArrayOutputStream bOut = new ByteArrayOutputStream();
-
-        certList.add(_signCert);
-        certList.add(_origCert);
-
-        Store           certs = new JcaCertStore(certList);
-
-        CMSSignedDataStreamGenerator gen = new CMSSignedDataStreamGenerator();
-
-        gen.addSignerInfoGenerator(new JcaSimpleSignerInfoGeneratorBuilder().setProvider(BC).build("SHA1withRSA", _origKP.getPrivate(), _origCert));
-
-        gen.addCertificates(certs);
-
-        OutputStream sigOut = gen.open(bOut, true);
-
-        sigOut.write(TEST_MESSAGE.getBytes());
-
-        sigOut.close();
-
-        CMSSignedDataParser sp = new CMSSignedDataParser(new JcaDigestCalculatorProviderBuilder().setProvider(BC).build(), bOut.toByteArray());
-
-        sp.getSignedContent().drain();
-        certs = sp.getCertificates();
-        Iterator it = certs.getMatches(null).iterator();
-
-        assertEquals(new JcaX509CertificateHolder(_signCert), it.next());
-        assertEquals(new JcaX509CertificateHolder(_origCert), it.next());
-    }
-
-    public void testCertsOnly()
-        throws Exception
-    {
-        List certList = new ArrayList();
-        certList.add(_origCert);
-        certList.add(_signCert);
-    
-        Store certs = new JcaCertStore(certList);
-
-        ByteArrayOutputStream bOut = new ByteArrayOutputStream();
-
-        CMSSignedDataStreamGenerator gen = new CMSSignedDataStreamGenerator();
-        gen.addCertificates(certs);
-
-        gen.open(bOut).close();
-
-        checkSigParseable(bOut.toByteArray());
-    }
-
-    public static Test suite()
-        throws Exception
-    {
-        init();
-        
-        return new CMSTestSetup(new TestSuite(NewSignedDataStreamTest.class));
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cms/test/NewSignedDataTest.java b/bcpkix/src/main/java/org/bouncycastle/cms/test/NewSignedDataTest.java
deleted file mode 100644
index 290449e..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cms/test/NewSignedDataTest.java
+++ /dev/null
@@ -1,2083 +0,0 @@
-package org.bouncycastle.cms.test;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.security.KeyFactory;
-import java.security.KeyPair;
-import java.security.MessageDigest;
-import java.security.Security;
-import java.security.Signature;
-import java.security.cert.X509CRL;
-import java.security.cert.X509Certificate;
-import java.security.spec.PKCS8EncodedKeySpec;
-import java.security.spec.X509EncodedKeySpec;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.DEROctetString;
-import org.bouncycastle.asn1.DERSet;
-import org.bouncycastle.asn1.cms.Attribute;
-import org.bouncycastle.asn1.cms.AttributeTable;
-import org.bouncycastle.asn1.cms.CMSAttributes;
-import org.bouncycastle.asn1.cms.CMSObjectIdentifiers;
-import org.bouncycastle.asn1.cms.ContentInfo;
-import org.bouncycastle.asn1.ocsp.OCSPResponse;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.cert.X509AttributeCertificateHolder;
-import org.bouncycastle.cert.X509CertificateHolder;
-import org.bouncycastle.cert.jcajce.JcaCRLStore;
-import org.bouncycastle.cert.jcajce.JcaCertStore;
-import org.bouncycastle.cert.jcajce.JcaX509CRLHolder;
-import org.bouncycastle.cert.jcajce.JcaX509CertificateConverter;
-import org.bouncycastle.cert.jcajce.JcaX509CertificateHolder;
-import org.bouncycastle.cert.ocsp.OCSPResp;
-import org.bouncycastle.cms.CMSAbsentContent;
-import org.bouncycastle.cms.CMSAlgorithm;
-import org.bouncycastle.cms.CMSProcessableByteArray;
-import org.bouncycastle.cms.CMSSignedData;
-import org.bouncycastle.cms.CMSSignedDataGenerator;
-import org.bouncycastle.cms.CMSSignedDataParser;
-import org.bouncycastle.cms.CMSTypedData;
-import org.bouncycastle.cms.DefaultCMSSignatureAlgorithmNameGenerator;
-import org.bouncycastle.cms.DefaultSignedAttributeTableGenerator;
-import org.bouncycastle.cms.SignerId;
-import org.bouncycastle.cms.SignerInfoGeneratorBuilder;
-import org.bouncycastle.cms.SignerInformation;
-import org.bouncycastle.cms.SignerInformationStore;
-import org.bouncycastle.cms.SignerInformationVerifier;
-import org.bouncycastle.cms.SignerInformationVerifierProvider;
-import org.bouncycastle.cms.bc.BcRSASignerInfoVerifierBuilder;
-import org.bouncycastle.cms.jcajce.JcaSignerId;
-import org.bouncycastle.cms.jcajce.JcaSignerInfoGeneratorBuilder;
-import org.bouncycastle.cms.jcajce.JcaSimpleSignerInfoGeneratorBuilder;
-import org.bouncycastle.cms.jcajce.JcaSimpleSignerInfoVerifierBuilder;
-import org.bouncycastle.crypto.Signer;
-import org.bouncycastle.crypto.params.AsymmetricKeyParameter;
-import org.bouncycastle.crypto.tls.SignatureAndHashAlgorithm;
-import org.bouncycastle.crypto.util.PrivateKeyFactory;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.operator.ContentSigner;
-import org.bouncycastle.operator.DefaultDigestAlgorithmIdentifierFinder;
-import org.bouncycastle.operator.DefaultSignatureAlgorithmIdentifierFinder;
-import org.bouncycastle.operator.DigestCalculatorProvider;
-import org.bouncycastle.operator.OperatorCreationException;
-import org.bouncycastle.operator.bc.BcContentSignerBuilder;
-import org.bouncycastle.operator.bc.BcDigestCalculatorProvider;
-import org.bouncycastle.operator.bc.BcRSAContentSignerBuilder;
-import org.bouncycastle.operator.jcajce.JcaContentSignerBuilder;
-import org.bouncycastle.operator.jcajce.JcaDigestCalculatorProviderBuilder;
-import org.bouncycastle.util.CollectionStore;
-import org.bouncycastle.util.Store;
-import org.bouncycastle.util.encoders.Base64;
-import org.bouncycastle.util.io.Streams;
-
-public class NewSignedDataTest
-    extends TestCase
-{
-    private static final String BC = BouncyCastleProvider.PROVIDER_NAME;
-
-    boolean DEBUG = true;
-
-    private static String          _origDN;
-    private static KeyPair         _origKP;
-    private static X509Certificate _origCert;
-
-    private static String          _signDN;
-    private static KeyPair         _signKP;
-    private static X509Certificate _signCert;
-
-    private static KeyPair         _signGostKP;
-    private static X509Certificate _signGostCert;
-
-    private static KeyPair         _signEcDsaKP;
-    private static X509Certificate _signEcDsaCert;
-
-    private static KeyPair         _signEcGostKP;
-    private static X509Certificate _signEcGostCert;
-
-    private static KeyPair         _signDsaKP;
-    private static X509Certificate _signDsaCert;
-
-    private static String          _reciDN;
-    private static KeyPair         _reciKP;
-    private static X509Certificate _reciCert;
-
-    private static X509CRL         _signCrl;
-
-    private static boolean _initialised = false;
-
-    private byte[] disorderedMessage = Base64.decode(
-            "SU9fc3RkaW5fdXNlZABfX2xpYmNfc3RhcnRfbWFpbgBnZXRob3N0aWQAX19n"
-          + "bW9uX3M=");
-
-    private byte[] disorderedSet = Base64.decode(
-            "MIIYXQYJKoZIhvcNAQcCoIIYTjCCGEoCAQExCzAJBgUrDgMCGgUAMAsGCSqG"
-          + "SIb3DQEHAaCCFqswggJUMIIBwKADAgECAgMMg6wwCgYGKyQDAwECBQAwbzEL"
-          + "MAkGA1UEBhMCREUxPTA7BgNVBAoUNFJlZ3VsaWVydW5nc2JlaMhvcmRlIGbI"
-          + "dXIgVGVsZWtvbW11bmlrYXRpb24gdW5kIFBvc3QxITAMBgcCggYBCgcUEwEx"
-          + "MBEGA1UEAxQKNFItQ0EgMTpQTjAiGA8yMDAwMDMyMjA5NDM1MFoYDzIwMDQw"
-          + "MTIxMTYwNDUzWjBvMQswCQYDVQQGEwJERTE9MDsGA1UEChQ0UmVndWxpZXJ1"
-          + "bmdzYmVoyG9yZGUgZsh1ciBUZWxla29tbXVuaWthdGlvbiB1bmQgUG9zdDEh"
-          + "MAwGBwKCBgEKBxQTATEwEQYDVQQDFAo1Ui1DQSAxOlBOMIGhMA0GCSqGSIb3"
-          + "DQEBAQUAA4GPADCBiwKBgQCKHkFTJx8GmoqFTxEOxpK9XkC3NZ5dBEKiUv0I"
-          + "fe3QMqeGMoCUnyJxwW0k2/53duHxtv2yHSZpFKjrjvE/uGwdOMqBMTjMzkFg"
-          + "19e9JPv061wyADOucOIaNAgha/zFt9XUyrHF21knKCvDNExv2MYIAagkTKaj"
-          + "LMAw0bu1J0FadQIFAMAAAAEwCgYGKyQDAwECBQADgYEAgFauXpoTLh3Z3pT/"
-          + "3bhgrxO/2gKGZopWGSWSJPNwq/U3x2EuctOJurj+y2inTcJjespThflpN+7Q"
-          + "nvsUhXU+jL2MtPlObU0GmLvWbi47cBShJ7KElcZAaxgWMBzdRGqTOdtMv+ev"
-          + "2t4igGF/q71xf6J2c3pTLWr6P8s6tzLfOCMwggJDMIIBr6ADAgECAgQAuzyu"
-          + "MAoGBiskAwMBAgUAMG8xCzAJBgNVBAYTAkRFMT0wOwYDVQQKFDRSZWd1bGll"
-          + "cnVuZ3NiZWjIb3JkZSBmyHVyIFRlbGVrb21tdW5pa2F0aW9uIHVuZCBQb3N0"
-          + "MSEwDAYHAoIGAQoHFBMBMTARBgNVBAMUCjVSLUNBIDE6UE4wIhgPMjAwMTA4"
-          + "MjAwODA4MjBaGA8yMDA1MDgyMDA4MDgyMFowSzELMAkGA1UEBhMCREUxEjAQ"
-          + "BgNVBAoUCVNpZ250cnVzdDEoMAwGBwKCBgEKBxQTATEwGAYDVQQDFBFDQSBT"
-          + "SUdOVFJVU1QgMTpQTjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAhV12"
-          + "N2WhlR6f+3CXP57GrBM9la5Vnsu2b92zv5MZqQOPeEsYbZqDCFkYg1bSwsDE"
-          + "XsGVQqXdQNAGUaapr/EUVVN+hNZ07GcmC1sPeQECgUkxDYjGi4ihbvzxlahj"
-          + "L4nX+UTzJVBfJwXoIvJ+lMHOSpnOLIuEL3SRhBItvRECxN0CAwEAAaMSMBAw"
-          + "DgYDVR0PAQH/BAQDAgEGMAoGBiskAwMBAgUAA4GBACDc9Pc6X8sK1cerphiV"
-          + "LfFv4kpZb9ev4WPy/C6987Qw1SOTElhZAmxaJQBqmDHWlQ63wj1DEqswk7hG"
-          + "LrvQk/iX6KXIn8e64uit7kx6DHGRKNvNGofPjr1WelGeGW/T2ZJKgmPDjCkf"
-          + "sIKt2c3gwa2pDn4mmCz/DStUIqcPDbqLMIICVTCCAcGgAwIBAgIEAJ16STAK"
-          + "BgYrJAMDAQIFADBvMQswCQYDVQQGEwJERTE9MDsGA1UEChQ0UmVndWxpZXJ1"
-          + "bmdzYmVoyG9yZGUgZsh1ciBUZWxla29tbXVuaWthdGlvbiB1bmQgUG9zdDEh"
-          + "MAwGBwKCBgEKBxQTATEwEQYDVQQDFAo1Ui1DQSAxOlBOMCIYDzIwMDEwMjAx"
-          + "MTM0NDI1WhgPMjAwNTAzMjIwODU1NTFaMG8xCzAJBgNVBAYTAkRFMT0wOwYD"
-          + "VQQKFDRSZWd1bGllcnVuZ3NiZWjIb3JkZSBmyHVyIFRlbGVrb21tdW5pa2F0"
-          + "aW9uIHVuZCBQb3N0MSEwDAYHAoIGAQoHFBMBMTARBgNVBAMUCjZSLUNhIDE6"
-          + "UE4wgaEwDQYJKoZIhvcNAQEBBQADgY8AMIGLAoGBAIOiqxUkzVyqnvthihnl"
-          + "tsE5m1Xn5TZKeR/2MQPStc5hJ+V4yptEtIx+Fn5rOoqT5VEVWhcE35wdbPvg"
-          + "JyQFn5msmhPQT/6XSGOlrWRoFummXN9lQzAjCj1sgTcmoLCVQ5s5WpCAOXFw"
-          + "VWu16qndz3sPItn3jJ0F3Kh3w79NglvPAgUAwAAAATAKBgYrJAMDAQIFAAOB"
-          + "gQBpSRdnDb6AcNVaXSmGo6+kVPIBhot1LzJOGaPyDNpGXxd7LV4tMBF1U7gr"
-          + "4k1g9BO6YiMWvw9uiTZmn0CfV8+k4fWEuG/nmafRoGIuay2f+ILuT+C0rnp1"
-          + "4FgMsEhuVNJJAmb12QV0PZII+UneyhAneZuQQzVUkTcVgYxogxdSOzCCAlUw"
-          + "ggHBoAMCAQICBACdekowCgYGKyQDAwECBQAwbzELMAkGA1UEBhMCREUxPTA7"
-          + "BgNVBAoUNFJlZ3VsaWVydW5nc2JlaMhvcmRlIGbIdXIgVGVsZWtvbW11bmlr"
-          + "YXRpb24gdW5kIFBvc3QxITAMBgcCggYBCgcUEwExMBEGA1UEAxQKNlItQ2Eg"
-          + "MTpQTjAiGA8yMDAxMDIwMTEzNDcwN1oYDzIwMDUwMzIyMDg1NTUxWjBvMQsw"
-          + "CQYDVQQGEwJERTE9MDsGA1UEChQ0UmVndWxpZXJ1bmdzYmVoyG9yZGUgZsh1"
-          + "ciBUZWxla29tbXVuaWthdGlvbiB1bmQgUG9zdDEhMAwGBwKCBgEKBxQTATEw"
-          + "EQYDVQQDFAo1Ui1DQSAxOlBOMIGhMA0GCSqGSIb3DQEBAQUAA4GPADCBiwKB"
-          + "gQCKHkFTJx8GmoqFTxEOxpK9XkC3NZ5dBEKiUv0Ife3QMqeGMoCUnyJxwW0k"
-          + "2/53duHxtv2yHSZpFKjrjvE/uGwdOMqBMTjMzkFg19e9JPv061wyADOucOIa"
-          + "NAgha/zFt9XUyrHF21knKCvDNExv2MYIAagkTKajLMAw0bu1J0FadQIFAMAA"
-          + "AAEwCgYGKyQDAwECBQADgYEAV1yTi+2gyB7sUhn4PXmi/tmBxAfe5oBjDW8m"
-          + "gxtfudxKGZ6l/FUPNcrSc5oqBYxKWtLmf3XX87LcblYsch617jtNTkMzhx9e"
-          + "qxiD02ufcrxz2EVt0Akdqiz8mdVeqp3oLcNU/IttpSrcA91CAnoUXtDZYwb/"
-          + "gdQ4FI9l3+qo/0UwggJVMIIBwaADAgECAgQAxIymMAoGBiskAwMBAgUAMG8x"
-          + "CzAJBgNVBAYTAkRFMT0wOwYDVQQKFDRSZWd1bGllcnVuZ3NiZWjIb3JkZSBm"
-          + "yHVyIFRlbGVrb21tdW5pa2F0aW9uIHVuZCBQb3N0MSEwDAYHAoIGAQoHFBMB"
-          + "MTARBgNVBAMUCjZSLUNhIDE6UE4wIhgPMjAwMTEwMTUxMzMxNThaGA8yMDA1"
-          + "MDYwMTA5NTIxN1owbzELMAkGA1UEBhMCREUxPTA7BgNVBAoUNFJlZ3VsaWVy"
-          + "dW5nc2JlaMhvcmRlIGbIdXIgVGVsZWtvbW11bmlrYXRpb24gdW5kIFBvc3Qx"
-          + "ITAMBgcCggYBCgcUEwExMBEGA1UEAxQKN1ItQ0EgMTpQTjCBoTANBgkqhkiG"
-          + "9w0BAQEFAAOBjwAwgYsCgYEAiokD/j6lEP4FexF356OpU5teUpGGfUKjIrFX"
-          + "BHc79G0TUzgVxqMoN1PWnWktQvKo8ETaugxLkP9/zfX3aAQzDW4Zki6x6GDq"
-          + "fy09Agk+RJvhfbbIzRkV4sBBco0n73x7TfG/9NTgVr/96U+I+z/1j30aboM6"
-          + "9OkLEhjxAr0/GbsCBQDAAAABMAoGBiskAwMBAgUAA4GBAHWRqRixt+EuqHhR"
-          + "K1kIxKGZL2vZuakYV0R24Gv/0ZR52FE4ECr+I49o8FP1qiGSwnXB0SwjuH2S"
-          + "iGiSJi+iH/MeY85IHwW1P5e+bOMvEOFhZhQXQixOD7totIoFtdyaj1XGYRef"
-          + "0f2cPOjNJorXHGV8wuBk+/j++sxbd/Net3FtMIICVTCCAcGgAwIBAgIEAMSM"
-          + "pzAKBgYrJAMDAQIFADBvMQswCQYDVQQGEwJERTE9MDsGA1UEChQ0UmVndWxp"
-          + "ZXJ1bmdzYmVoyG9yZGUgZsh1ciBUZWxla29tbXVuaWthdGlvbiB1bmQgUG9z"
-          + "dDEhMAwGBwKCBgEKBxQTATEwEQYDVQQDFAo3Ui1DQSAxOlBOMCIYDzIwMDEx"
-          + "MDE1MTMzNDE0WhgPMjAwNTA2MDEwOTUyMTdaMG8xCzAJBgNVBAYTAkRFMT0w"
-          + "OwYDVQQKFDRSZWd1bGllcnVuZ3NiZWjIb3JkZSBmyHVyIFRlbGVrb21tdW5p"
-          + "a2F0aW9uIHVuZCBQb3N0MSEwDAYHAoIGAQoHFBMBMTARBgNVBAMUCjZSLUNh"
-          + "IDE6UE4wgaEwDQYJKoZIhvcNAQEBBQADgY8AMIGLAoGBAIOiqxUkzVyqnvth"
-          + "ihnltsE5m1Xn5TZKeR/2MQPStc5hJ+V4yptEtIx+Fn5rOoqT5VEVWhcE35wd"
-          + "bPvgJyQFn5msmhPQT/6XSGOlrWRoFummXN9lQzAjCj1sgTcmoLCVQ5s5WpCA"
-          + "OXFwVWu16qndz3sPItn3jJ0F3Kh3w79NglvPAgUAwAAAATAKBgYrJAMDAQIF"
-          + "AAOBgQBi5W96UVDoNIRkCncqr1LLG9vF9SGBIkvFpLDIIbcvp+CXhlvsdCJl"
-          + "0pt2QEPSDl4cmpOet+CxJTdTuMeBNXxhb7Dvualog69w/+K2JbPhZYxuVFZs"
-          + "Zh5BkPn2FnbNu3YbJhE60aIkikr72J4XZsI5DxpZCGh6xyV/YPRdKSljFjCC"
-          + "AlQwggHAoAMCAQICAwyDqzAKBgYrJAMDAQIFADBvMQswCQYDVQQGEwJERTE9"
-          + "MDsGA1UEChQ0UmVndWxpZXJ1bmdzYmVoyG9yZGUgZsh1ciBUZWxla29tbXVu"
-          + "aWthdGlvbiB1bmQgUG9zdDEhMAwGBwKCBgEKBxQTATEwEQYDVQQDFAo1Ui1D"
-          + "QSAxOlBOMCIYDzIwMDAwMzIyMDk0MTI3WhgPMjAwNDAxMjExNjA0NTNaMG8x"
-          + "CzAJBgNVBAYTAkRFMT0wOwYDVQQKFDRSZWd1bGllcnVuZ3NiZWjIb3JkZSBm"
-          + "yHVyIFRlbGVrb21tdW5pa2F0aW9uIHVuZCBQb3N0MSEwDAYHAoIGAQoHFBMB"
-          + "MTARBgNVBAMUCjRSLUNBIDE6UE4wgaEwDQYJKoZIhvcNAQEBBQADgY8AMIGL"
-          + "AoGBAI8x26tmrFJanlm100B7KGlRemCD1R93PwdnG7svRyf5ZxOsdGrDszNg"
-          + "xg6ouO8ZHQMT3NC2dH8TvO65Js+8bIyTm51azF6clEg0qeWNMKiiXbBXa+ph"
-          + "hTkGbXiLYvACZ6/MTJMJ1lcrjpRF7BXtYeYMcEF6znD4pxOqrtbf9z5hAgUA"
-          + "wAAAATAKBgYrJAMDAQIFAAOBgQB99BjSKlGPbMLQAgXlvA9jUsDNhpnVm3a1"
-          + "YkfxSqS/dbQlYkbOKvCxkPGA9NBxisBM8l1zFynVjJoy++aysRmcnLY/sHaz"
-          + "23BF2iU7WERy18H3lMBfYB6sXkfYiZtvQZcWaO48m73ZBySuiV3iXpb2wgs/"
-          + "Cs20iqroAWxwq/W/9jCCAlMwggG/oAMCAQICBDsFZ9UwCgYGKyQDAwECBQAw"
-          + "bzELMAkGA1UEBhMCREUxITAMBgcCggYBCgcUEwExMBEGA1UEAxQKNFItQ0Eg"
-          + "MTpQTjE9MDsGA1UEChQ0UmVndWxpZXJ1bmdzYmVoyG9yZGUgZsh1ciBUZWxl"
-          + "a29tbXVuaWthdGlvbiB1bmQgUG9zdDAiGA8xOTk5MDEyMTE3MzUzNFoYDzIw"
-          + "MDQwMTIxMTYwMDAyWjBvMQswCQYDVQQGEwJERTE9MDsGA1UEChQ0UmVndWxp"
-          + "ZXJ1bmdzYmVoyG9yZGUgZsh1ciBUZWxla29tbXVuaWthdGlvbiB1bmQgUG9z"
-          + "dDEhMAwGBwKCBgEKBxQTATEwEQYDVQQDFAozUi1DQSAxOlBOMIGfMA0GCSqG"
-          + "SIb3DQEBAQUAA4GNADCBiQKBgI4B557mbKQg/AqWBXNJhaT/6lwV93HUl4U8"
-          + "u35udLq2+u9phns1WZkdM3gDfEpL002PeLfHr1ID/96dDYf04lAXQfombils"
-          + "of1C1k32xOvxjlcrDOuPEMxz9/HDAQZA5MjmmYHAIulGI8Qg4Tc7ERRtg/hd"
-          + "0QX0/zoOeXoDSEOBAgTAAAABMAoGBiskAwMBAgUAA4GBAIyzwfT3keHI/n2P"
-          + "LrarRJv96mCohmDZNpUQdZTVjGu5VQjVJwk3hpagU0o/t/FkdzAjOdfEw8Ql"
-          + "3WXhfIbNLv1YafMm2eWSdeYbLcbB5yJ1od+SYyf9+tm7cwfDAcr22jNRBqx8"
-          + "wkWKtKDjWKkevaSdy99sAI8jebHtWz7jzydKMIID9TCCA16gAwIBAgICbMcw"
-          + "DQYJKoZIhvcNAQEFBQAwSzELMAkGA1UEBhMCREUxEjAQBgNVBAoUCVNpZ250"
-          + "cnVzdDEoMAwGBwKCBgEKBxQTATEwGAYDVQQDFBFDQSBTSUdOVFJVU1QgMTpQ"
-          + "TjAeFw0wNDA3MzAxMzAyNDZaFw0wNzA3MzAxMzAyNDZaMDwxETAPBgNVBAMM"
-          + "CFlhY29tOlBOMQ4wDAYDVQRBDAVZYWNvbTELMAkGA1UEBhMCREUxCjAIBgNV"
-          + "BAUTATEwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAIWzLlYLQApocXIp"
-          + "pgCCpkkOUVLgcLYKeOd6/bXAnI2dTHQqT2bv7qzfUnYvOqiNgYdF13pOYtKg"
-          + "XwXMTNFL4ZOI6GoBdNs9TQiZ7KEWnqnr2945HYx7UpgTBclbOK/wGHuCdcwO"
-          + "x7juZs1ZQPFG0Lv8RoiV9s6HP7POqh1sO0P/AgMBAAGjggH1MIIB8TCBnAYD"
-          + "VR0jBIGUMIGRgBQcZzNghfnXoXRm8h1+VITC5caNRqFzpHEwbzELMAkGA1UE"
-          + "BhMCREUxPTA7BgNVBAoUNFJlZ3VsaWVydW5nc2JlaMhvcmRlIGbIdXIgVGVs"
-          + "ZWtvbW11bmlrYXRpb24gdW5kIFBvc3QxITAMBgcCggYBCgcUEwExMBEGA1UE"
-          + "AxQKNVItQ0EgMTpQToIEALs8rjAdBgNVHQ4EFgQU2e5KAzkVuKaM9I5heXkz"
-          + "bcAIuR8wDgYDVR0PAQH/BAQDAgZAMBIGA1UdIAQLMAkwBwYFKyQIAQEwfwYD"
-          + "VR0fBHgwdjB0oCygKoYobGRhcDovL2Rpci5zaWdudHJ1c3QuZGUvbz1TaWdu"
-          + "dHJ1c3QsYz1kZaJEpEIwQDEdMBsGA1UEAxMUQ1JMU2lnblNpZ250cnVzdDE6"
-          + "UE4xEjAQBgNVBAoTCVNpZ250cnVzdDELMAkGA1UEBhMCREUwYgYIKwYBBQUH"
-          + "AQEEVjBUMFIGCCsGAQUFBzABhkZodHRwOi8vZGlyLnNpZ250cnVzdC5kZS9T"
-          + "aWdudHJ1c3QvT0NTUC9zZXJ2bGV0L2h0dHBHYXRld2F5LlBvc3RIYW5kbGVy"
-          + "MBgGCCsGAQUFBwEDBAwwCjAIBgYEAI5GAQEwDgYHAoIGAQoMAAQDAQH/MA0G"
-          + "CSqGSIb3DQEBBQUAA4GBAHn1m3GcoyD5GBkKUY/OdtD6Sj38LYqYCF+qDbJR"
-          + "6pqUBjY2wsvXepUppEler+stH8mwpDDSJXrJyuzf7xroDs4dkLl+Rs2x+2tg"
-          + "BjU+ABkBDMsym2WpwgA8LCdymmXmjdv9tULxY+ec2pjSEzql6nEZNEfrU8nt"
-          + "ZCSCavgqW4TtMYIBejCCAXYCAQEwUTBLMQswCQYDVQQGEwJERTESMBAGA1UE"
-          + "ChQJU2lnbnRydXN0MSgwDAYHAoIGAQoHFBMBMTAYBgNVBAMUEUNBIFNJR05U"
-          + "UlVTVCAxOlBOAgJsxzAJBgUrDgMCGgUAoIGAMBgGCSqGSIb3DQEJAzELBgkq"
-          + "hkiG9w0BBwEwIwYJKoZIhvcNAQkEMRYEFIYfhPoyfGzkLWWSSLjaHb4HQmaK"
-          + "MBwGCSqGSIb3DQEJBTEPFw0wNTAzMjQwNzM4MzVaMCEGBSskCAYFMRgWFi92"
-          + "YXIvZmlsZXMvdG1wXzEvdGVzdDEwDQYJKoZIhvcNAQEFBQAEgYA2IvA8lhVz"
-          + "VD5e/itUxbFboKxeKnqJ5n/KuO/uBCl1N14+7Z2vtw1sfkIG+bJdp3OY2Cmn"
-          + "mrQcwsN99Vjal4cXVj8t+DJzFG9tK9dSLvD3q9zT/GQ0kJXfimLVwCa4NaSf"
-          + "Qsu4xtG0Rav6bCcnzabAkKuNNvKtH8amSRzk870DBg==");
-
-    public static byte[] xtraCounterSig = Base64.decode(
-                 "MIIR/AYJKoZIhvcNAQcCoIIR7TCCEekCAQExCzAJBgUrDgMCGgUAMBoGCSqG"
-               + "SIb3DQEHAaANBAtIZWxsbyB3b3JsZKCCDnkwggTPMIIDt6ADAgECAgRDnYD3"
-               + "MA0GCSqGSIb3DQEBBQUAMFgxCzAJBgNVBAYTAklUMRowGAYDVQQKExFJbi5U"
-               + "ZS5TLkEuIFMucC5BLjEtMCsGA1UEAxMkSW4uVGUuUy5BLiAtIENlcnRpZmlj"
-               + "YXRpb24gQXV0aG9yaXR5MB4XDTA4MDkxMjExNDMxMloXDTEwMDkxMjExNDMx"
-               + "MlowgdgxCzAJBgNVBAYTAklUMSIwIAYDVQQKDBlJbnRlc2EgUy5wLkEuLzA1"
-               + "MjYyODkwMDE0MSowKAYDVQQLDCFCdXNpbmVzcyBDb2xsYWJvcmF0aW9uICYg"
-               + "U2VjdXJpdHkxHjAcBgNVBAMMFU1BU1NJTUlMSUFOTyBaSUNDQVJESTERMA8G"
-               + "A1UEBAwIWklDQ0FSREkxFTATBgNVBCoMDE1BU1NJTUlMSUFOTzEcMBoGA1UE"
-               + "BRMTSVQ6WkNDTVNNNzZIMTRMMjE5WTERMA8GA1UELhMIMDAwMDI1ODUwgaAw"
-               + "DQYJKoZIhvcNAQEBBQADgY4AMIGKAoGBALeJTjmyFgx1SIP6c2AuB/kuyHo5"
-               + "j/prKELTALsFDimre/Hxr3wOSet1TdQfFzU8Lu+EJqgfV9cV+cI1yeH1rZs7"
-               + "lei7L3tX/VR565IywnguX5xwvteASgWZr537Fkws50bvTEMyYOj1Tf3FZvZU"
-               + "z4n4OD39KI4mfR9i1eEVIxR3AgQAizpNo4IBoTCCAZ0wHQYDVR0RBBYwFIES"
-               + "emljY2FyZGlAaW50ZXNhLml0MC8GCCsGAQUFBwEDBCMwITAIBgYEAI5GAQEw"
-               + "CwYGBACORgEDAgEUMAgGBgQAjkYBBDBZBgNVHSAEUjBQME4GBgQAizABATBE"
-               + "MEIGCCsGAQUFBwIBFjZodHRwOi8vZS10cnVzdGNvbS5pbnRlc2EuaXQvY2Ff"
-               + "cHViYmxpY2EvQ1BTX0lOVEVTQS5odG0wDgYDVR0PAQH/BAQDAgZAMIGDBgNV"
-               + "HSMEfDB6gBQZCQOW0bjFWBt+EORuxPagEgkQqKFcpFowWDELMAkGA1UEBhMC"
-               + "SVQxGjAYBgNVBAoTEUluLlRlLlMuQS4gUy5wLkEuMS0wKwYDVQQDEyRJbi5U"
-               + "ZS5TLkEuIC0gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHmCBDzRARMwOwYDVR0f"
-               + "BDQwMjAwoC6gLIYqaHR0cDovL2UtdHJ1c3Rjb20uaW50ZXNhLml0L0NSTC9J"
-               + "TlRFU0EuY3JsMB0GA1UdDgQWBBTf5ItL8KmQh541Dxt7YxcWI1254TANBgkq"
-               + "hkiG9w0BAQUFAAOCAQEAgW+uL1CVWQepbC/wfCmR6PN37Sueb4xiKQj2mTD5"
-               + "UZ5KQjpivy/Hbuf0NrfKNiDEhAvoHSPC31ebGiKuTMFNyZPHfPEUnyYGSxea"
-               + "2w837aXJFr6utPNQGBRi89kH90sZDlXtOSrZI+AzJJn5QK3F9gjcayU2NZXQ"
-               + "MJgRwYmFyn2w4jtox+CwXPQ9E5XgxiMZ4WDL03cWVXDLX00EOJwnDDMUNTRI"
-               + "m9Zv+4SKTNlfFbi9UTBqWBySkDzAelsfB2U61oqc2h1xKmCtkGMmN9iZT+Qz"
-               + "ZC/vaaT+hLEBFGAH2gwFrYc4/jTBKyBYeU1vsAxsibIoTs1Apgl6MH75qPDL"
-               + "BzCCBM8wggO3oAMCAQICBEOdgPcwDQYJKoZIhvcNAQEFBQAwWDELMAkGA1UE"
-               + "BhMCSVQxGjAYBgNVBAoTEUluLlRlLlMuQS4gUy5wLkEuMS0wKwYDVQQDEyRJ"
-               + "bi5UZS5TLkEuIC0gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMDgwOTEy"
-               + "MTE0MzEyWhcNMTAwOTEyMTE0MzEyWjCB2DELMAkGA1UEBhMCSVQxIjAgBgNV"
-               + "BAoMGUludGVzYSBTLnAuQS4vMDUyNjI4OTAwMTQxKjAoBgNVBAsMIUJ1c2lu"
-               + "ZXNzIENvbGxhYm9yYXRpb24gJiBTZWN1cml0eTEeMBwGA1UEAwwVTUFTU0lN"
-               + "SUxJQU5PIFpJQ0NBUkRJMREwDwYDVQQEDAhaSUNDQVJESTEVMBMGA1UEKgwM"
-               + "TUFTU0lNSUxJQU5PMRwwGgYDVQQFExNJVDpaQ0NNU003NkgxNEwyMTlZMREw"
-               + "DwYDVQQuEwgwMDAwMjU4NTCBoDANBgkqhkiG9w0BAQEFAAOBjgAwgYoCgYEA"
-               + "t4lOObIWDHVIg/pzYC4H+S7IejmP+msoQtMAuwUOKat78fGvfA5J63VN1B8X"
-               + "NTwu74QmqB9X1xX5wjXJ4fWtmzuV6Lsve1f9VHnrkjLCeC5fnHC+14BKBZmv"
-               + "nfsWTCznRu9MQzJg6PVN/cVm9lTPifg4Pf0ojiZ9H2LV4RUjFHcCBACLOk2j"
-               + "ggGhMIIBnTAdBgNVHREEFjAUgRJ6aWNjYXJkaUBpbnRlc2EuaXQwLwYIKwYB"
-               + "BQUHAQMEIzAhMAgGBgQAjkYBATALBgYEAI5GAQMCARQwCAYGBACORgEEMFkG"
-               + "A1UdIARSMFAwTgYGBACLMAEBMEQwQgYIKwYBBQUHAgEWNmh0dHA6Ly9lLXRy"
-               + "dXN0Y29tLmludGVzYS5pdC9jYV9wdWJibGljYS9DUFNfSU5URVNBLmh0bTAO"
-               + "BgNVHQ8BAf8EBAMCBkAwgYMGA1UdIwR8MHqAFBkJA5bRuMVYG34Q5G7E9qAS"
-               + "CRCooVykWjBYMQswCQYDVQQGEwJJVDEaMBgGA1UEChMRSW4uVGUuUy5BLiBT"
-               + "LnAuQS4xLTArBgNVBAMTJEluLlRlLlMuQS4gLSBDZXJ0aWZpY2F0aW9uIEF1"
-               + "dGhvcml0eYIEPNEBEzA7BgNVHR8ENDAyMDCgLqAshipodHRwOi8vZS10cnVz"
-               + "dGNvbS5pbnRlc2EuaXQvQ1JML0lOVEVTQS5jcmwwHQYDVR0OBBYEFN/ki0vw"
-               + "qZCHnjUPG3tjFxYjXbnhMA0GCSqGSIb3DQEBBQUAA4IBAQCBb64vUJVZB6ls"
-               + "L/B8KZHo83ftK55vjGIpCPaZMPlRnkpCOmK/L8du5/Q2t8o2IMSEC+gdI8Lf"
-               + "V5saIq5MwU3Jk8d88RSfJgZLF5rbDzftpckWvq6081AYFGLz2Qf3SxkOVe05"
-               + "Ktkj4DMkmflArcX2CNxrJTY1ldAwmBHBiYXKfbDiO2jH4LBc9D0TleDGIxnh"
-               + "YMvTdxZVcMtfTQQ4nCcMMxQ1NEib1m/7hIpM2V8VuL1RMGpYHJKQPMB6Wx8H"
-               + "ZTrWipzaHXEqYK2QYyY32JlP5DNkL+9ppP6EsQEUYAfaDAWthzj+NMErIFh5"
-               + "TW+wDGyJsihOzUCmCXowfvmo8MsHMIIEzzCCA7egAwIBAgIEQ52A9zANBgkq"
-               + "hkiG9w0BAQUFADBYMQswCQYDVQQGEwJJVDEaMBgGA1UEChMRSW4uVGUuUy5B"
-               + "LiBTLnAuQS4xLTArBgNVBAMTJEluLlRlLlMuQS4gLSBDZXJ0aWZpY2F0aW9u"
-               + "IEF1dGhvcml0eTAeFw0wODA5MTIxMTQzMTJaFw0xMDA5MTIxMTQzMTJaMIHY"
-               + "MQswCQYDVQQGEwJJVDEiMCAGA1UECgwZSW50ZXNhIFMucC5BLi8wNTI2Mjg5"
-               + "MDAxNDEqMCgGA1UECwwhQnVzaW5lc3MgQ29sbGFib3JhdGlvbiAmIFNlY3Vy"
-               + "aXR5MR4wHAYDVQQDDBVNQVNTSU1JTElBTk8gWklDQ0FSREkxETAPBgNVBAQM"
-               + "CFpJQ0NBUkRJMRUwEwYDVQQqDAxNQVNTSU1JTElBTk8xHDAaBgNVBAUTE0lU"
-               + "OlpDQ01TTTc2SDE0TDIxOVkxETAPBgNVBC4TCDAwMDAyNTg1MIGgMA0GCSqG"
-               + "SIb3DQEBAQUAA4GOADCBigKBgQC3iU45shYMdUiD+nNgLgf5Lsh6OY/6ayhC"
-               + "0wC7BQ4pq3vx8a98DknrdU3UHxc1PC7vhCaoH1fXFfnCNcnh9a2bO5Xouy97"
-               + "V/1UeeuSMsJ4Ll+ccL7XgEoFma+d+xZMLOdG70xDMmDo9U39xWb2VM+J+Dg9"
-               + "/SiOJn0fYtXhFSMUdwIEAIs6TaOCAaEwggGdMB0GA1UdEQQWMBSBEnppY2Nh"
-               + "cmRpQGludGVzYS5pdDAvBggrBgEFBQcBAwQjMCEwCAYGBACORgEBMAsGBgQA"
-               + "jkYBAwIBFDAIBgYEAI5GAQQwWQYDVR0gBFIwUDBOBgYEAIswAQEwRDBCBggr"
-               + "BgEFBQcCARY2aHR0cDovL2UtdHJ1c3Rjb20uaW50ZXNhLml0L2NhX3B1YmJs"
-               + "aWNhL0NQU19JTlRFU0EuaHRtMA4GA1UdDwEB/wQEAwIGQDCBgwYDVR0jBHww"
-               + "eoAUGQkDltG4xVgbfhDkbsT2oBIJEKihXKRaMFgxCzAJBgNVBAYTAklUMRow"
-               + "GAYDVQQKExFJbi5UZS5TLkEuIFMucC5BLjEtMCsGA1UEAxMkSW4uVGUuUy5B"
-               + "LiAtIENlcnRpZmljYXRpb24gQXV0aG9yaXR5ggQ80QETMDsGA1UdHwQ0MDIw"
-               + "MKAuoCyGKmh0dHA6Ly9lLXRydXN0Y29tLmludGVzYS5pdC9DUkwvSU5URVNB"
-               + "LmNybDAdBgNVHQ4EFgQU3+SLS/CpkIeeNQ8be2MXFiNdueEwDQYJKoZIhvcN"
-               + "AQEFBQADggEBAIFvri9QlVkHqWwv8Hwpkejzd+0rnm+MYikI9pkw+VGeSkI6"
-               + "Yr8vx27n9Da3yjYgxIQL6B0jwt9XmxoirkzBTcmTx3zxFJ8mBksXmtsPN+2l"
-               + "yRa+rrTzUBgUYvPZB/dLGQ5V7Tkq2SPgMySZ+UCtxfYI3GslNjWV0DCYEcGJ"
-               + "hcp9sOI7aMfgsFz0PROV4MYjGeFgy9N3FlVwy19NBDicJwwzFDU0SJvWb/uE"
-               + "ikzZXxW4vVEwalgckpA8wHpbHwdlOtaKnNodcSpgrZBjJjfYmU/kM2Qv72mk"
-               + "/oSxARRgB9oMBa2HOP40wSsgWHlNb7AMbImyKE7NQKYJejB++ajwywcxggM8"
-               + "MIIDOAIBATBgMFgxCzAJBgNVBAYTAklUMRowGAYDVQQKExFJbi5UZS5TLkEu"
-               + "IFMucC5BLjEtMCsGA1UEAxMkSW4uVGUuUy5BLiAtIENlcnRpZmljYXRpb24g"
-               + "QXV0aG9yaXR5AgRDnYD3MAkGBSsOAwIaBQAwDQYJKoZIhvcNAQEBBQAEgYB+"
-               + "lH2cwLqc91mP8prvgSV+RRzk13dJdZvdoVjgQoFrPhBiZCNIEoHvIhMMA/sM"
-               + "X6euSRZk7EjD24FasCEGYyd0mJVLEy6TSPmuW+wWz/28w3a6IWXBGrbb/ild"
-               + "/CJMkPgLPGgOVD1WDwiNKwfasiQSFtySf5DPn3jFevdLeMmEY6GCAjIwggEV"
-               + "BgkqhkiG9w0BCQYxggEGMIIBAgIBATBgMFgxCzAJBgNVBAYTAklUMRowGAYD"
-               + "VQQKExFJbi5UZS5TLkEuIFMucC5BLjEtMCsGA1UEAxMkSW4uVGUuUy5BLiAt"
-               + "IENlcnRpZmljYXRpb24gQXV0aG9yaXR5AgRDnYD3MAkGBSsOAwIaBQAwDQYJ"
-               + "KoZIhvcNAQEBBQAEgYBHlOULfT5GDigIvxP0qZOy8VbpntmzaPF55VV4buKV"
-               + "35J+uHp98gXKp0LrHM69V5IRKuyuQzHHFBqsXxsRI9o6KoOfgliD9Xc+BeMg"
-               + "dKzQhBhBYoFREq8hQM0nSbqDNHYAQyNHMzUA/ZQUO5dlFuH8Dw3iDYAhNtfd"
-               + "PrlchKJthDCCARUGCSqGSIb3DQEJBjGCAQYwggECAgEBMGAwWDELMAkGA1UE"
-               + "BhMCSVQxGjAYBgNVBAoTEUluLlRlLlMuQS4gUy5wLkEuMS0wKwYDVQQDEyRJ"
-               + "bi5UZS5TLkEuIC0gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkCBEOdgPcwCQYF"
-               + "Kw4DAhoFADANBgkqhkiG9w0BAQEFAASBgEeU5Qt9PkYOKAi/E/Spk7LxVume"
-               + "2bNo8XnlVXhu4pXfkn64en3yBcqnQusczr1XkhEq7K5DMccUGqxfGxEj2joq"
-               + "g5+CWIP1dz4F4yB0rNCEGEFigVESryFAzSdJuoM0dgBDI0czNQD9lBQ7l2UW"
-               + "4fwPDeINgCE2190+uVyEom2E");
-
-    byte[] noSignedAttrSample2 = Base64.decode(
-          "MIIIlAYJKoZIhvcNAQcCoIIIhTCCCIECAQExCzAJBgUrDgMCGgUAMAsGCSqG"
-        + "SIb3DQEHAaCCB3UwggOtMIIDa6ADAgECAgEzMAsGByqGSM44BAMFADCBkDEL"
-        + "MAkGA1UEBhMCVVMxCzAJBgNVBAgTAkNBMRIwEAYDVQQHEwlQYWxvIEFsdG8x"
-        + "HTAbBgNVBAoTFFN1biBNaWNyb3N5c3RlbXMgSW5jMSMwIQYDVQQLExpKYXZh"
-        + "IFNvZnR3YXJlIENvZGUgU2lnbmluZzEcMBoGA1UEAxMTSkNFIENvZGUgU2ln"
-        + "bmluZyBDQTAeFw0wMTA1MjkxNjQ3MTFaFw0wNjA1MjgxNjQ3MTFaMG4xHTAb"
-        + "BgNVBAoTFFN1biBNaWNyb3N5c3RlbXMgSW5jMSMwIQYDVQQLExpKYXZhIFNv"
-        + "ZnR3YXJlIENvZGUgU2lnbmluZzEoMCYGA1UEAxMfVGhlIExlZ2lvbiBvZiB0"
-        + "aGUgQm91bmN5IENhc3RsZTCCAbcwggEsBgcqhkjOOAQBMIIBHwKBgQD9f1OB"
-        + "HXUSKVLfSpwu7OTn9hG3UjzvRADDHj+AtlEmaUVdQCJR+1k9jVj6v8X1ujD2"
-        + "y5tVbNeBO4AdNG/yZmC3a5lQpaSfn+gEexAiwk+7qdf+t8Yb+DtX58aophUP"
-        + "BPuD9tPFHsMCNVQTWhaRMvZ1864rYdcq7/IiAxmd0UgBxwIVAJdgUI8VIwvM"
-        + "spK5gqLrhAvwWBz1AoGBAPfhoIXWmz3ey7yrXDa4V7l5lK+7+jrqgvlXTAs9"
-        + "B4JnUVlXjrrUWU/mcQcQgYC0SRZxI+hMKBYTt88JMozIpuE8FnqLVHyNKOCj"
-        + "rh4rs6Z1kW6jfwv6ITVi8ftiegEkO8yk8b6oUZCJqIPf4VrlnwaSi2ZegHtV"
-        + "JWQBTDv+z0kqA4GEAAKBgBWry/FCAZ6miyy39+ftsa+h9lxoL+JtV0MJcUyQ"
-        + "E4VAhpAwWb8vyjba9AwOylYQTktHX5sAkFvjBiU0LOYDbFSTVZSHMRJgfjxB"
-        + "SHtICjOEvr1BJrrOrdzqdxcOUge5n7El124BCrv91x5Ol8UTwtiO9LrRXF/d"
-        + "SyK+RT5n1klRo3YwdDARBglghkgBhvhCAQEEBAMCAIcwDgYDVR0PAQH/BAQD"
-        + "AgHGMB0GA1UdDgQWBBQwMY4NRcco1AO3w1YsokfDLVseEjAPBgNVHRMBAf8E"
-        + "BTADAQH/MB8GA1UdIwQYMBaAFGXi9IbJ007wkU5Yomr12HhamsGmMAsGByqG"
-        + "SM44BAMFAAMvADAsAhRmigTu6QV0sTfEkVljgij/hhdVfAIUQZvMxAnIHc30"
-        + "y/u0C1T5UEG9glUwggPAMIIDfqADAgECAgEQMAsGByqGSM44BAMFADCBkDEL"
-        + "MAkGA1UEBhMCVVMxCzAJBgNVBAgTAkNBMRIwEAYDVQQHEwlQYWxvIEFsdG8x"
-        + "HTAbBgNVBAoTFFN1biBNaWNyb3N5c3RlbXMgSW5jMSMwIQYDVQQLExpKYXZh"
-        + "IFNvZnR3YXJlIENvZGUgU2lnbmluZzEcMBoGA1UEAxMTSkNFIENvZGUgU2ln"
-        + "bmluZyBDQTAeFw0wMTA0MjUwNzAwMDBaFw0yMDA0MjUwNzAwMDBaMIGQMQsw"
-        + "CQYDVQQGEwJVUzELMAkGA1UECBMCQ0ExEjAQBgNVBAcTCVBhbG8gQWx0bzEd"
-        + "MBsGA1UEChMUU3VuIE1pY3Jvc3lzdGVtcyBJbmMxIzAhBgNVBAsTGkphdmEg"
-        + "U29mdHdhcmUgQ29kZSBTaWduaW5nMRwwGgYDVQQDExNKQ0UgQ29kZSBTaWdu"
-        + "aW5nIENBMIIBtzCCASwGByqGSM44BAEwggEfAoGBAOuvNwQeylEeaV2w8o/2"
-        + "tUkfxqSZBdcpv3S3avUZ2B7kG/gKAZqY/3Cr4kpWhmxTs/zhyIGMMfDE87CL"
-        + "5nAG7PdpaNuDTHIpiSk2F1w7SgegIAIqRpdRHXDICBgLzgxum3b3BePn+9Nh"
-        + "eeFgmiSNBpWDPFEg4TDPOFeCphpyDc7TAhUAhCVF4bq5qWKreehbMLiJaxv/"
-        + "e3UCgYEAq8l0e3Tv7kK1alNNO92QBnJokQ8LpCl2LlU71a5NZVx+KjoEpmem"
-        + "0HGqpde34sFyDaTRqh6SVEwgAAmisAlBGTMAssNcrkL4sYvKfJbYEH83RFuq"
-        + "zHjI13J2N2tAmahVZvqoAx6LShECactMuCUGHKB30sms0j3pChD6dnC3+9wD"
-        + "gYQAAoGALQmYXKy4nMeZfu4gGSo0kPnXq6uu3WtylQ1m+O8nj0Sy7ShEx/6v"
-        + "sKYnbwBnRYJbB6hWVjvSKVFhXmk51y50dxLPGUr1LcjLcmHETm/6R0M/FLv6"
-        + "vBhmKMLZZot6LS/CYJJLFP5YPiF/aGK+bEhJ+aBLXoWdGRD5FUVRG3HU9wuj"
-        + "ZjBkMBEGCWCGSAGG+EIBAQQEAwIABzAPBgNVHRMBAf8EBTADAQH/MB8GA1Ud"
-        + "IwQYMBaAFGXi9IbJ007wkU5Yomr12HhamsGmMB0GA1UdDgQWBBRl4vSGydNO"
-        + "8JFOWKJq9dh4WprBpjALBgcqhkjOOAQDBQADLwAwLAIUKvfPPJdd+Xi2CNdB"
-        + "tNkNRUzktJwCFEXNdWkOIfod1rMpsun3Mx0z/fxJMYHoMIHlAgEBMIGWMIGQ"
-        + "MQswCQYDVQQGEwJVUzELMAkGA1UECBMCQ0ExEjAQBgNVBAcTCVBhbG8gQWx0"
-        + "bzEdMBsGA1UEChMUU3VuIE1pY3Jvc3lzdGVtcyBJbmMxIzAhBgNVBAsTGkph"
-        + "dmEgU29mdHdhcmUgQ29kZSBTaWduaW5nMRwwGgYDVQQDExNKQ0UgQ29kZSBT"
-        + "aWduaW5nIENBAgEzMAkGBSsOAwIaBQAwCwYHKoZIzjgEAQUABC8wLQIVAIGV"
-        + "khm+kbV4a/+EP45PHcq0hIViAhR4M9os6IrJnoEDS3Y3l7O6zrSosA==");
-
-    private static final byte[] rawGost = Base64.decode(
-        "MIIEBwYJKoZIhvcNAQcCoIID+DCCA/QCAQExDDAKBgYqhQMCAgkFADAfBgkq"
-      + "hkiG9w0BBwGgEgQQU29tZSBEYXRhIEhFUkUhIaCCAuYwggLiMIICkaADAgEC"
-      + "AgopoLG9AAIAArWeMAgGBiqFAwICAzBlMSAwHgYJKoZIhvcNAQkBFhFpbmZv"
-      + "QGNyeXB0b3Byby5ydTELMAkGA1UEBhMCUlUxEzARBgNVBAoTCkNSWVBUTy1Q"
-      + "Uk8xHzAdBgNVBAMTFlRlc3QgQ2VudGVyIENSWVBUTy1QUk8wHhcNMTIxMDE1"
-      + "MTEwNDIzWhcNMTQxMDA0MDcwOTQxWjAhMRIwEAYDVQQDDAl0ZXN0IGdvc3Qx"
-      + "CzAJBgNVBAYTAlJVMGMwHAYGKoUDAgITMBIGByqFAwICJAAGByqFAwICHgED"
-      + "QwAEQPz/F99AG8wyMQz5uK3vJ3MdHk7ZyFzM4Ofnq8nAmDgI5/Nuzcu791/0"
-      + "hRd+1i+fArRsiPMdQXOF0E7bEMHwWfWjggFjMIIBXzAOBgNVHQ8BAf8EBAMC"
-      + "BPAwEwYDVR0lBAwwCgYIKwYBBQUHAwIwHQYDVR0OBBYEFO353ZD7sLCx6rVR"
-      + "2o/IsSxuE1gAMB8GA1UdIwQYMBaAFG2PXgXZX6yRF5QelZoFMDg3ehAqMFUG"
-      + "A1UdHwROMEwwSqBIoEaGRGh0dHA6Ly93d3cuY3J5cHRvcHJvLnJ1L0NlcnRF"
-      + "bnJvbGwvVGVzdCUyMENlbnRlciUyMENSWVBUTy1QUk8oMikuY3JsMIGgBggr"
-      + "BgEFBQcBAQSBkzCBkDAzBggrBgEFBQcwAYYnaHR0cDovL3d3dy5jcnlwdG9w"
-      + "cm8ucnUvb2NzcG5jL29jc3Auc3JmMFkGCCsGAQUFBzAChk1odHRwOi8vd3d3"
-      + "LmNyeXB0b3Byby5ydS9DZXJ0RW5yb2xsL3BraS1zaXRlX1Rlc3QlMjBDZW50"
-      + "ZXIlMjBDUllQVE8tUFJPKDIpLmNydDAIBgYqhQMCAgMDQQBAR4mr69a62d3l"
-      + "yK/UZ4Yz/Yi3jqURtbnJR2gugdzkG5pYHRwC41BbDaa1ItP+1gDp4s78+EiK"
-      + "AJc17CHGZTz3MYHVMIHSAgEBMHMwZTEgMB4GCSqGSIb3DQEJARYRaW5mb0Bj"
-      + "cnlwdG9wcm8ucnUxCzAJBgNVBAYTAlJVMRMwEQYDVQQKEwpDUllQVE8tUFJP"
-      + "MR8wHQYDVQQDExZUZXN0IENlbnRlciBDUllQVE8tUFJPAgopoLG9AAIAArWe"
-      + "MAoGBiqFAwICCQUAMAoGBiqFAwICEwUABED0Gs9zP9lSz/2/e3BUSpzCI3dx"
-      + "39gfl/pFVkx4p5N/GW5o4gHIST9OhDSmdxwpMSK+39YSRD4R0Ue0faOqWEsj"
-      + "AAAAAAAAAAAAAAAAAAAAAA==");
-
-    private static final byte[] noAttrEncData = Base64.decode(
-       "MIIFjwYJKoZIhvcNAQcCoIIFgDCCBXwCAQExDTALBglghkgBZQMEAgEwgdAG"
-     + "CSqGSIb3DQEHAaCBwgSBv01JTUUtVmVyc2lvbjogMS4wCkNvbnRlbnQtVHlw"
-     + "ZTogYXBwbGljYXRpb24vb2N0ZXQtc3RyZWFtCkNvbnRlbnQtVHJhbnNmZXIt"
-     + "RW5jb2Rpbmc6IGJpbmFyeQpDb250ZW50LURpc3Bvc2l0aW9uOiBhdHRhY2ht"
-     + "ZW50OyBmaWxlbmFtZT1kb2MuYmluCgpUaGlzIGlzIGEgdmVyeSBodWdlIHNl"
-     + "Y3JldCwgbWFkZSB3aXRoIG9wZW5zc2wKCgoKoIIDNDCCAzAwggKZoAMCAQIC"
-     + "AQEwDQYJKoZIhvcNAQEFBQAwgawxCzAJBgNVBAYTAkFUMRAwDgYDVQQIEwdB"
-     + "dXN0cmlhMQ8wDQYDVQQHEwZWaWVubmExFTATBgNVBAoTDFRpYW5pIFNwaXJp"
-     + "dDEUMBIGA1UECxMLSlVuaXQgdGVzdHMxGjAYBgNVBAMTEU1hc3NpbWlsaWFu"
-     + "byBNYXNpMTEwLwYJKoZIhvcNAQkBFiJtYXNzaW1pbGlhbm8ubWFzaUB0aWFu"
-     + "aS1zcGlyaXQuY29tMCAXDTEyMDEwMjA5MDAzNVoYDzIxOTEwNjA4MDkwMDM1"
-     + "WjCBjzELMAkGA1UEBhMCQVQxEDAOBgNVBAgTB0F1c3RyaWExFTATBgNVBAoT"
-     + "DFRpYW5pIFNwaXJpdDEUMBIGA1UECxMLSlVuaXQgVGVzdHMxDjAMBgNVBAMT"
-     + "BWNlcnQxMTEwLwYJKoZIhvcNAQkBFiJtYXNzaW1pbGlhbm8ubWFzaUB0aWFu"
-     + "aS1zcGlyaXQuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDYHz8n"
-     + "soeWpILn+5tK8XgJc3k5n0h0MOlRXLbZZVB7yuxKMBIZwl8kqqnehfqxX+hr"
-     + "b2MXSCgKEstnVunJVPUGuNxnQ8Z0R9p1o/9gR0KTXmoJ+Epx5wdEofk4Phsi"
-     + "MxjC8FVvt3sSnzal1/m0/9KntrPWksefumGm5XD3W43e5wIDAQABo3sweTAJ"
-     + "BgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBD"
-     + "ZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQU8mTZGl0EFv6aHo3bup144d6wYW8wHwYD"
-     + "VR0jBBgwFoAUdHG2RdrchT0PFcUBiIiYcy5hAA4wDQYJKoZIhvcNAQEFBQAD"
-     + "gYEATcc52eo73zEA4wmbyPv0lRrmyAxrHvZGIHiKpM8bP38WUB39lgmS8J0S"
-     + "1ioj21bosiakGj/gXnxlk8M8O+mm4zzpYjy8gqGXiUt20+j3bm7MJYM8ePcq"
-     + "dG/kReNuLUbRgIA6b0T4o+0WCELhrd9IlTk5IBKjHIjsP/GR1h0t//kxggFb"
-     + "MIIBVwIBATCBsjCBrDELMAkGA1UEBhMCQVQxEDAOBgNVBAgTB0F1c3RyaWEx"
-     + "DzANBgNVBAcTBlZpZW5uYTEVMBMGA1UEChMMVGlhbmkgU3Bpcml0MRQwEgYD"
-     + "VQQLEwtKVW5pdCB0ZXN0czEaMBgGA1UEAxMRTWFzc2ltaWxpYW5vIE1hc2kx"
-     + "MTAvBgkqhkiG9w0BCQEWIm1hc3NpbWlsaWFuby5tYXNpQHRpYW5pLXNwaXJp"
-     + "dC5jb20CAQEwCwYJYIZIAWUDBAIBMA0GCSqGSIb3DQEBAQUABIGAEthqA7FK"
-     + "V1i+MzzS4zz4DxT4lwUYkWfHaDtZADUyTD5lnP3Pf+t/ScpBEGkEtI7hDqOO"
-     + "zE0WfkBshTx5B/uxDibc/jqjQpSYSz5cvBTgpocIalbqsErOkDYF1QP6UgaV"
-     + "ZoVGwvGYIuIrFgWqgk08NsPHVVjYseTEhUDwkI1KSxU=");
-
-    byte[] successResp = Base64.decode(
-          "MIIFnAoBAKCCBZUwggWRBgkrBgEFBQcwAQEEggWCMIIFfjCCARehgZ8wgZwx"
-        + "CzAJBgNVBAYTAklOMRcwFQYDVQQIEw5BbmRocmEgcHJhZGVzaDESMBAGA1UE"
-        + "BxMJSHlkZXJhYmFkMQwwCgYDVQQKEwNUQ1MxDDAKBgNVBAsTA0FUQzEeMBwG"
-        + "A1UEAxMVVENTLUNBIE9DU1AgUmVzcG9uZGVyMSQwIgYJKoZIhvcNAQkBFhVv"
-        + "Y3NwQHRjcy1jYS50Y3MuY28uaW4YDzIwMDMwNDAyMTIzNDU4WjBiMGAwOjAJ"
-        + "BgUrDgMCGgUABBRs07IuoCWNmcEl1oHwIak1BPnX8QQUtGyl/iL9WJ1VxjxF"
-        + "j0hAwJ/s1AcCAQKhERgPMjAwMjA4MjkwNzA5MjZaGA8yMDAzMDQwMjEyMzQ1"
-        + "OFowDQYJKoZIhvcNAQEFBQADgYEAfbN0TCRFKdhsmvOdUoiJ+qvygGBzDxD/"
-        + "VWhXYA+16AphHLIWNABR3CgHB3zWtdy2j7DJmQ/R7qKj7dUhWLSqclAiPgFt"
-        + "QQ1YvSJAYfEIdyHkxv4NP0LSogxrumANcDyC9yt/W9yHjD2ICPBIqCsZLuLk"
-        + "OHYi5DlwWe9Zm9VFwCGgggPMMIIDyDCCA8QwggKsoAMCAQICAQYwDQYJKoZI"
-        + "hvcNAQEFBQAwgZQxFDASBgNVBAMTC1RDUy1DQSBPQ1NQMSYwJAYJKoZIhvcN"
-        + "AQkBFhd0Y3MtY2FAdGNzLWNhLnRjcy5jby5pbjEMMAoGA1UEChMDVENTMQww"
-        + "CgYDVQQLEwNBVEMxEjAQBgNVBAcTCUh5ZGVyYWJhZDEXMBUGA1UECBMOQW5k"
-        + "aHJhIHByYWRlc2gxCzAJBgNVBAYTAklOMB4XDTAyMDgyOTA3MTE0M1oXDTAz"
-        + "MDgyOTA3MTE0M1owgZwxCzAJBgNVBAYTAklOMRcwFQYDVQQIEw5BbmRocmEg"
-        + "cHJhZGVzaDESMBAGA1UEBxMJSHlkZXJhYmFkMQwwCgYDVQQKEwNUQ1MxDDAK"
-        + "BgNVBAsTA0FUQzEeMBwGA1UEAxMVVENTLUNBIE9DU1AgUmVzcG9uZGVyMSQw"
-        + "IgYJKoZIhvcNAQkBFhVvY3NwQHRjcy1jYS50Y3MuY28uaW4wgZ8wDQYJKoZI"
-        + "hvcNAQEBBQADgY0AMIGJAoGBAM+XWW4caMRv46D7L6Bv8iwtKgmQu0SAybmF"
-        + "RJiz12qXzdvTLt8C75OdgmUomxp0+gW/4XlTPUqOMQWv463aZRv9Ust4f8MH"
-        + "EJh4ekP/NS9+d8vEO3P40ntQkmSMcFmtA9E1koUtQ3MSJlcs441JjbgUaVnm"
-        + "jDmmniQnZY4bU3tVAgMBAAGjgZowgZcwDAYDVR0TAQH/BAIwADALBgNVHQ8E"
-        + "BAMCB4AwEwYDVR0lBAwwCgYIKwYBBQUHAwkwNgYIKwYBBQUHAQEEKjAoMCYG"
-        + "CCsGAQUFBzABhhpodHRwOi8vMTcyLjE5LjQwLjExMDo3NzAwLzAtBgNVHR8E"
-        + "JjAkMCKgIKAehhxodHRwOi8vMTcyLjE5LjQwLjExMC9jcmwuY3JsMA0GCSqG"
-        + "SIb3DQEBBQUAA4IBAQB6FovM3B4VDDZ15o12gnADZsIk9fTAczLlcrmXLNN4"
-        + "PgmqgnwF0Ymj3bD5SavDOXxbA65AZJ7rBNAguLUo+xVkgxmoBH7R2sBxjTCc"
-        + "r07NEadxM3HQkt0aX5XYEl8eRoifwqYAI9h0ziZfTNes8elNfb3DoPPjqq6V"
-        + "mMg0f0iMS4W8LjNPorjRB+kIosa1deAGPhq0eJ8yr0/s2QR2/WFD5P4aXc8I"
-        + "KWleklnIImS3zqiPrq6tl2Bm8DZj7vXlTOwmraSQxUwzCKwYob1yGvNOUQTq"
-        + "pG6jxn7jgDawHU1+WjWQe4Q34/pWeGLysxTraMa+Ug9kPe+jy/qRX2xwvKBZ");
-
-    public NewSignedDataTest(String name)
-    {
-        super(name);
-    }
-
-    public static void main(String args[])
-        throws Exception
-    {
-        if (Security.getProvider("BC") == null)
-        {
-            Security.addProvider(new BouncyCastleProvider());
-        }
-
-        init();
-
-        junit.textui.TestRunner.run(NewSignedDataTest.class);
-    }
-
-    public static Test suite() 
-        throws Exception
-    {
-        init();
-        
-        return new CMSTestSetup(new TestSuite(NewSignedDataTest.class));
-    }
-
-    private static void init()
-        throws Exception
-    {
-        if (!_initialised)
-        {
-            _initialised = true;
-
-            if (Security.getProvider(BC) == null)
-            {
-                Security.addProvider(new org.bouncycastle.jce.provider.BouncyCastleProvider());
-            }
-
-            _origDN   = "O=Bouncy Castle, C=AU";
-            _origKP   = CMSTestUtil.makeKeyPair();  
-            _origCert = CMSTestUtil.makeCertificate(_origKP, _origDN, _origKP, _origDN);
-
-            _signDN   = "CN=Bob, OU=Sales, O=Bouncy Castle, C=AU";
-            _signKP   = CMSTestUtil.makeKeyPair();
-            _signCert = CMSTestUtil.makeCertificate(_signKP, _signDN, _origKP, _origDN);
-
-            _signGostKP   = CMSTestUtil.makeGostKeyPair();
-            _signGostCert = CMSTestUtil.makeCertificate(_signGostKP, _signDN, _origKP, _origDN);
-    
-            _signDsaKP   = CMSTestUtil.makeDsaKeyPair();
-            _signDsaCert = CMSTestUtil.makeCertificate(_signDsaKP, _signDN, _origKP, _origDN);
-
-            _signEcDsaKP   = CMSTestUtil.makeEcDsaKeyPair();
-            _signEcDsaCert = CMSTestUtil.makeCertificate(_signEcDsaKP, _signDN, _origKP, _origDN);
-
-            _signEcGostKP = CMSTestUtil.makeEcGostKeyPair();
-            _signEcGostCert = CMSTestUtil.makeCertificate(_signEcGostKP, _signDN, _origKP, _origDN);
-
-            _reciDN   = "CN=Doug, OU=Sales, O=Bouncy Castle, C=AU";
-            _reciKP   = CMSTestUtil.makeKeyPair();
-            _reciCert = CMSTestUtil.makeCertificate(_reciKP, _reciDN, _signKP, _signDN);
-
-            _signCrl  = CMSTestUtil.makeCrl(_signKP);
-        }
-    }
-
-    private void verifyRSASignatures(CMSSignedData s, byte[] contentDigest)
-        throws Exception
-    {
-        Store                   certStore = s.getCertificates();
-        SignerInformationStore  signers = s.getSignerInfos();
-
-        Collection              c = signers.getSigners();
-        Iterator                it = c.iterator();
-
-        while (it.hasNext())
-        {
-            SignerInformation   signer = (SignerInformation)it.next();
-            Collection          certCollection = certStore.getMatches(signer.getSID());
-
-            Iterator        certIt = certCollection.iterator();
-            X509CertificateHolder cert = (X509CertificateHolder)certIt.next();
-
-            assertEquals(true, signer.verify(new BcRSASignerInfoVerifierBuilder(new DefaultCMSSignatureAlgorithmNameGenerator(), new DefaultSignatureAlgorithmIdentifierFinder(), new DefaultDigestAlgorithmIdentifierFinder(), new BcDigestCalculatorProvider()).build(cert)));
-
-            if (contentDigest != null)
-            {
-                assertTrue(MessageDigest.isEqual(contentDigest, signer.getContentDigest()));
-            }
-        }
-    }
-
-    private void verifySignatures(CMSSignedData s, byte[] contentDigest) 
-        throws Exception
-    {
-        Store                   certStore = s.getCertificates();
-        Store                   crlStore = s.getCRLs();
-        SignerInformationStore  signers = s.getSignerInfos();
-        
-        Collection              c = signers.getSigners();
-        Iterator                it = c.iterator();
-
-        while (it.hasNext())
-        {
-            SignerInformation   signer = (SignerInformation)it.next();
-            Collection          certCollection = certStore.getMatches(signer.getSID());
-    
-            Iterator        certIt = certCollection.iterator();
-            X509CertificateHolder cert = (X509CertificateHolder)certIt.next();
-
-            assertEquals(true, signer.verify(new JcaSimpleSignerInfoVerifierBuilder().setProvider(BC).build(cert)));
-            
-            if (contentDigest != null)
-            {
-                assertTrue(MessageDigest.isEqual(contentDigest, signer.getContentDigest()));
-            }
-        }
-
-        Collection certColl = certStore.getMatches(null);
-        Collection crlColl = crlStore.getMatches(null);
-
-        assertEquals(certColl.size(), s.getCertificates().getMatches(null).size());
-        assertEquals(crlColl.size(), s.getCRLs().getMatches(null).size());
-    }
-
-    private void verifySignatures(CMSSignedData s) 
-        throws Exception
-    {
-        verifySignatures(s, null);
-    }
-
-    public void testDetachedVerification()
-        throws Exception
-    {
-        byte[]              data = "Hello World!".getBytes();
-        List                certList = new ArrayList();
-        CMSTypedData        msg = new CMSProcessableByteArray(data);
-
-        certList.add(_origCert);
-        certList.add(_signCert);
-
-        Store           certs = new JcaCertStore(certList);
-
-        CMSSignedDataGenerator gen = new CMSSignedDataGenerator();
-
-        DigestCalculatorProvider digProvider = new JcaDigestCalculatorProviderBuilder().setProvider(BC).build();
-        JcaSignerInfoGeneratorBuilder signerInfoGeneratorBuilder = new JcaSignerInfoGeneratorBuilder(digProvider);
-        ContentSigner sha1Signer = new JcaContentSignerBuilder("SHA1withRSA").setProvider(BC).build(_origKP.getPrivate());
-        ContentSigner md5Signer = new JcaContentSignerBuilder("MD5withRSA").setProvider(BC).build(_origKP.getPrivate());
-
-        gen.addSignerInfoGenerator(signerInfoGeneratorBuilder.build(sha1Signer, _origCert));
-        gen.addSignerInfoGenerator(signerInfoGeneratorBuilder.build(md5Signer, _origCert));
-
-        gen.addCertificates(certs);
-
-        CMSSignedData s = gen.generate(msg);
-
-        MessageDigest sha1 = MessageDigest.getInstance("SHA1", BC);
-        MessageDigest md5 = MessageDigest.getInstance("MD5", BC);
-        Map hashes = new HashMap();
-        byte[] sha1Hash = sha1.digest(data);
-        byte[] md5Hash = md5.digest(data);
-
-        hashes.put(CMSAlgorithm.SHA1, sha1Hash);
-        hashes.put(CMSAlgorithm.MD5, md5Hash);
-
-        s = new CMSSignedData(hashes, s.getEncoded());
-
-        verifySignatures(s, null);
-    }
-
-    public void testSHA1AndMD5WithRSAEncapsulatedRepeated()
-        throws Exception
-    {
-        List              certList = new ArrayList();
-        CMSTypedData      msg = new CMSProcessableByteArray("Hello World!".getBytes());
-
-        certList.add(_origCert);
-        certList.add(_signCert);
-
-        Store           certs = new JcaCertStore(certList);
-
-        CMSSignedDataGenerator gen = new CMSSignedDataGenerator();
-
-        DigestCalculatorProvider digCalcProv = new JcaDigestCalculatorProviderBuilder().setProvider(BC).build();
-
-        gen.addSignerInfoGenerator(new JcaSignerInfoGeneratorBuilder(digCalcProv).build(new JcaContentSignerBuilder("SHA1withRSA").setProvider(BC).build(_origKP.getPrivate()), _origCert));
-
-        gen.addSignerInfoGenerator(new JcaSignerInfoGeneratorBuilder(digCalcProv).build(new JcaContentSignerBuilder("MD5withRSA").setProvider(BC).build(_origKP.getPrivate()), _origCert));
-        
-        gen.addCertificates(certs);
-
-        CMSSignedData s = gen.generate(msg, true);
-
-        ByteArrayInputStream bIn = new ByteArrayInputStream(s.getEncoded());
-        ASN1InputStream      aIn = new ASN1InputStream(bIn);
-        
-        s = new CMSSignedData(ContentInfo.getInstance(aIn.readObject()));
-
-        certs = s.getCertificates();
-
-        SignerInformationStore  signers = s.getSignerInfos();
-        
-        assertEquals(2, signers.size());
-        
-        Collection              c = signers.getSigners();
-        Iterator                it = c.iterator();
-        SignerId                sid = null;
-
-        while (it.hasNext())
-        {
-            SignerInformation   signer = (SignerInformation)it.next();
-            Collection          certCollection = certs.getMatches(signer.getSID());
-
-            Iterator        certIt = certCollection.iterator();
-            X509CertificateHolder cert = (X509CertificateHolder)certIt.next();
-
-            sid = signer.getSID();
-            
-            assertEquals(true, signer.verify(new JcaSimpleSignerInfoVerifierBuilder().setProvider(BC).build(cert)));
-
-            //
-            // check content digest
-            //
-
-            byte[] contentDigest = (byte[])gen.getGeneratedDigests().get(signer.getDigestAlgOID());
-
-            AttributeTable table = signer.getSignedAttributes();
-            Attribute hash = table.get(CMSAttributes.messageDigest);
-
-            assertTrue(MessageDigest.isEqual(contentDigest, ((ASN1OctetString)hash.getAttrValues().getObjectAt(0)).getOctets()));
-        }
-        
-        c = signers.getSigners(sid);
-        
-        assertEquals(2, c.size());
-
-
-        //
-        // try using existing signer
-        //
-        
-        gen = new CMSSignedDataGenerator();
-           
-        gen.addSigners(s.getSignerInfos());
-        
-        gen.addCertificates(s.getCertificates());
-           
-        s = gen.generate(msg, true);
-
-        bIn = new ByteArrayInputStream(s.getEncoded());
-        aIn = new ASN1InputStream(bIn);
-
-        s = new CMSSignedData(ContentInfo.getInstance(aIn.readObject()));
-
-        certs = s.getCertificates();
-
-        signers = s.getSignerInfos();
-        c = signers.getSigners();
-        it = c.iterator();
-
-        assertEquals(2, c.size());
-        
-        while (it.hasNext())
-        {
-            SignerInformation   signer = (SignerInformation)it.next();
-            Collection          certCollection = certs.getMatches(signer.getSID());
-
-            Iterator        certIt = certCollection.iterator();
-            X509CertificateHolder cert = (X509CertificateHolder)certIt.next();
-
-            assertEquals(true, signer.verify(new JcaSimpleSignerInfoVerifierBuilder().setProvider(BC).build(cert)));
-        }
-        
-        checkSignerStoreReplacement(s, signers);
-    }
-    
-    public void testSHA1WithRSANoAttributes()
-        throws Exception
-    {
-        List              certList = new ArrayList();
-        CMSTypedData      msg = new CMSProcessableByteArray("Hello world!".getBytes());
-    
-        certList.add(_origCert);
-        certList.add(_signCert);
-    
-        Store           certs = new JcaCertStore(certList);
-    
-        CMSSignedDataGenerator gen = new CMSSignedDataGenerator();
-        ContentSigner sha1Signer = new JcaContentSignerBuilder("SHA1withRSA").setProvider(BC).build(_origKP.getPrivate());
-
-        JcaSignerInfoGeneratorBuilder builder = new JcaSignerInfoGeneratorBuilder(new JcaDigestCalculatorProviderBuilder().setProvider(BC).build());
-
-        builder.setDirectSignature(true);
-
-        gen.addSignerInfoGenerator(builder.build(sha1Signer, _origCert));
-    
-        gen.addCertificates(certs);
-    
-        CMSSignedData s = gen.generate(msg, false);
-    
-        //
-        // compute expected content digest
-        //
-        MessageDigest md = MessageDigest.getInstance("SHA1", BC);
-        
-        verifySignatures(s, md.digest("Hello world!".getBytes()));
-    }
-
-    public void testSHA1WithRSANoAttributesSimple()
-        throws Exception
-    {
-        List              certList = new ArrayList();
-        CMSTypedData      msg = new CMSProcessableByteArray("Hello world!".getBytes());
-
-        certList.add(_origCert);
-        certList.add(_signCert);
-
-        Store           certs = new JcaCertStore(certList);
-
-        CMSSignedDataGenerator gen = new CMSSignedDataGenerator();
-        
-        JcaSimpleSignerInfoGeneratorBuilder builder = new JcaSimpleSignerInfoGeneratorBuilder().setProvider(BC).setDirectSignature(true);
-
-        gen.addSignerInfoGenerator(builder.build("SHA1withRSA", _origKP.getPrivate(), _origCert));
-
-        gen.addCertificates(certs);
-
-        CMSSignedData s = gen.generate(msg, false);
-
-        //
-        // compute expected content digest
-        //
-        MessageDigest md = MessageDigest.getInstance("SHA1", BC);
-
-        verifySignatures(s, md.digest("Hello world!".getBytes()));
-    }
-
-    public void testSHA1WithRSAAndOtherRevocation()
-        throws Exception
-    {
-        List              certList = new ArrayList();
-        CMSTypedData      msg = new CMSProcessableByteArray("Hello world!".getBytes());
-
-        certList.add(_origCert);
-        certList.add(_signCert);
-
-        Store           certs = new JcaCertStore(certList);
-
-        CMSSignedDataGenerator gen = new CMSSignedDataGenerator();
-
-        ContentSigner sha1Signer = new JcaContentSignerBuilder("SHA1withRSA").setProvider(BC).build(_origKP.getPrivate());
-
-        gen.addSignerInfoGenerator(new JcaSignerInfoGeneratorBuilder(new JcaDigestCalculatorProviderBuilder().setProvider(BC).build()).build(sha1Signer, _origCert));
-
-        gen.addCertificates(certs);
-
-        List otherInfo = new ArrayList();
-        OCSPResp response = new OCSPResp(successResp);
-
-        otherInfo.add(response.toASN1Structure());
-
-        gen.addOtherRevocationInfo(CMSObjectIdentifiers.id_ri_ocsp_response, new CollectionStore(otherInfo));
-
-        CMSSignedData s;
-
-        s = gen.generate(msg, false);
-
-        //
-        // check version
-        //
-        assertEquals(5, s.getVersion());
-
-        //
-        // compute expected content digest
-        //
-        MessageDigest md = MessageDigest.getInstance("SHA1", BC);
-
-        verifySignatures(s, md.digest("Hello world!".getBytes()));
-
-        Store dataOtherInfo = s.getOtherRevocationInfo(CMSObjectIdentifiers.id_ri_ocsp_response);
-
-        assertEquals(1, dataOtherInfo.getMatches(null).size());
-
-        OCSPResp dataResponse = new OCSPResp(OCSPResponse.getInstance(dataOtherInfo.getMatches(null).iterator().next()));
-
-        assertEquals(response, dataResponse);
-    }
-
-    public void testSHA1WithRSAAndAttributeTableSimple()
-        throws Exception
-    {
-        MessageDigest       md = MessageDigest.getInstance("SHA1", BC);
-        List                certList = new ArrayList();
-        CMSTypedData        msg = new CMSProcessableByteArray("Hello world!".getBytes());
-
-        certList.add(_origCert);
-        certList.add(_signCert);
-
-        Store           certs = new JcaCertStore(certList);
-
-        CMSSignedDataGenerator gen = new CMSSignedDataGenerator();
-
-        Attribute attr = new Attribute(CMSAttributes.messageDigest,
-                                       new DERSet(
-                                            new DEROctetString(
-                                                md.digest("Hello world!".getBytes()))));
-
-        ASN1EncodableVector v = new ASN1EncodableVector();
-
-        v.add(attr);
-
-        JcaSimpleSignerInfoGeneratorBuilder builder = new JcaSimpleSignerInfoGeneratorBuilder().setProvider(BC).setSignedAttributeGenerator(new DefaultSignedAttributeTableGenerator(new AttributeTable(v)));
-
-        gen.addSignerInfoGenerator(builder.build("SHA1withRSA", _origKP.getPrivate(), _origCert));
-
-        gen.addCertificates(certs);
-
-        CMSSignedData s = gen.generate(new CMSAbsentContent(), false);
-
-        //
-        // the signature is detached, so need to add msg before passing on
-        //
-        s = new CMSSignedData(msg, s.getEncoded());
-        //
-        // compute expected content digest
-        //
-
-        verifySignatures(s, md.digest("Hello world!".getBytes()));
-        verifyRSASignatures(s, md.digest("Hello world!".getBytes()));
-    }
-
-    public void testSHA1WithRSAAndAttributeTable()
-        throws Exception
-    {
-        MessageDigest       md = MessageDigest.getInstance("SHA1", BC);
-        List                certList = new ArrayList();
-        CMSTypedData        msg = new CMSProcessableByteArray("Hello world!".getBytes());
-
-        certList.add(_origCert);
-        certList.add(_signCert);
-
-        Store           certs = new JcaCertStore(certList);
-
-        CMSSignedDataGenerator gen = new CMSSignedDataGenerator();
-
-        Attribute attr = new Attribute(CMSAttributes.messageDigest,
-                                       new DERSet(
-                                            new DEROctetString(
-                                                md.digest("Hello world!".getBytes()))));
-
-        ASN1EncodableVector v = new ASN1EncodableVector();
-
-        v.add(attr);
-
-        JcaSignerInfoGeneratorBuilder builder = new JcaSignerInfoGeneratorBuilder(new JcaDigestCalculatorProviderBuilder().setProvider(BC).build());
-
-        builder.setSignedAttributeGenerator(new DefaultSignedAttributeTableGenerator(new AttributeTable(v)));
-        
-        ContentSigner sha1Signer = new JcaContentSignerBuilder("SHA1withRSA").setProvider(BC).build(_origKP.getPrivate());
-
-        gen.addSignerInfoGenerator(builder.build(sha1Signer, _origCert));
-
-        gen.addCertificates(certs);
-
-        CMSSignedData s = gen.generate(new CMSAbsentContent(), false);
-
-        //
-        // the signature is detached, so need to add msg before passing on
-        //
-        s = new CMSSignedData(msg, s.getEncoded());
-        //
-        // compute expected content digest
-        //
-
-        verifySignatures(s, md.digest("Hello world!".getBytes()));
-        verifyRSASignatures(s, md.digest("Hello world!".getBytes()));
-    }
-
-    public void testLwSHA1WithRSAAndAttributeTable()
-        throws Exception
-    {
-        MessageDigest       md = MessageDigest.getInstance("SHA1", BC);
-        List                certList = new ArrayList();
-        CMSTypedData        msg = new CMSProcessableByteArray("Hello world!".getBytes());
-
-        certList.add(_origCert);
-        certList.add(_signCert);
-
-        Store           certs = new JcaCertStore(certList);
-
-        CMSSignedDataGenerator gen = new CMSSignedDataGenerator();
-
-        Attribute attr = new Attribute(CMSAttributes.messageDigest,
-                                       new DERSet(
-                                            new DEROctetString(
-                                                md.digest("Hello world!".getBytes()))));
-
-        ASN1EncodableVector v = new ASN1EncodableVector();
-
-        v.add(attr);
-
-        AsymmetricKeyParameter privKey = PrivateKeyFactory.createKey(_origKP.getPrivate().getEncoded());
-        
-        AlgorithmIdentifier sigAlgId = new DefaultSignatureAlgorithmIdentifierFinder().find("SHA1withRSA");
-        AlgorithmIdentifier digAlgId = new DefaultDigestAlgorithmIdentifierFinder().find(sigAlgId);
-
-        BcContentSignerBuilder contentSignerBuilder = new BcRSAContentSignerBuilder(sigAlgId, digAlgId);
-
-        gen.addSignerInfoGenerator(
-            new SignerInfoGeneratorBuilder(new BcDigestCalculatorProvider())
-                .setSignedAttributeGenerator(new DefaultSignedAttributeTableGenerator(new AttributeTable(v)))
-                .build(contentSignerBuilder.build(privKey), new JcaX509CertificateHolder(_origCert)));
-
-        gen.addCertificates(certs);
-
-        CMSSignedData s = gen.generate(new CMSAbsentContent(), false);
-
-        //
-        // the signature is detached, so need to add msg before passing on
-        //
-        s = new CMSSignedData(msg, s.getEncoded());
-        //
-        // compute expected content digest
-        //
-
-        verifySignatures(s, md.digest("Hello world!".getBytes()));
-        verifyRSASignatures(s, md.digest("Hello world!".getBytes()));
-    }
-
-    public void testSHA1WithRSAEncapsulated()
-        throws Exception
-    {
-        encapsulatedTest(_signKP, _signCert, "SHA1withRSA");
-    }
-
-    public void testSHA1WithRSAEncapsulatedSubjectKeyID()
-        throws Exception
-    {
-        subjectKeyIDTest(_signKP, _signCert, "SHA1withRSA");
-    }
-
-    public void testSHA1WithRSAPSS()
-        throws Exception
-    {
-        rsaPSSTest("SHA1withRSAandMGF1");
-    }
-
-    public void testSHA224WithRSAPSS()
-        throws Exception
-    {
-        rsaPSSTest("SHA224withRSAandMGF1");
-    }
-
-    public void testSHA256WithRSAPSS()
-        throws Exception
-    {
-        rsaPSSTest("SHA256withRSAandMGF1");
-    }
-
-    public void testSHA384WithRSAPSS()
-        throws Exception
-    {
-        rsaPSSTest("SHA384withRSAandMGF1");
-    }
-
-    public void testSHA224WithRSAEncapsulated()
-        throws Exception
-    {
-        encapsulatedTest(_signKP, _signCert, "SHA224withRSA");
-    }
-    
-    public void testSHA256WithRSAEncapsulated()
-        throws Exception
-    {
-        encapsulatedTest(_signKP, _signCert, "SHA256withRSA");
-    }
-
-    public void testRIPEMD128WithRSAEncapsulated()
-        throws Exception
-    {
-        encapsulatedTest(_signKP, _signCert, "RIPEMD128withRSA");
-    }
-
-    public void testRIPEMD160WithRSAEncapsulated()
-        throws Exception
-    {
-        encapsulatedTest(_signKP, _signCert, "RIPEMD160withRSA");
-    }
-
-    public void testRIPEMD256WithRSAEncapsulated()
-        throws Exception
-    {
-        encapsulatedTest(_signKP, _signCert, "RIPEMD256withRSA");
-    }
-
-    public void testECDSAEncapsulated()
-        throws Exception
-    {
-        encapsulatedTest(_signEcDsaKP, _signEcDsaCert, "SHA1withECDSA");
-    }
-
-    public void testECDSAEncapsulatedSubjectKeyID()
-        throws Exception
-    {
-        subjectKeyIDTest(_signEcDsaKP, _signEcDsaCert, "SHA1withECDSA");
-    }
-
-    public void testECDSASHA224Encapsulated()
-        throws Exception
-    {
-        encapsulatedTest(_signEcDsaKP, _signEcDsaCert, "SHA224withECDSA");
-    }
-
-    public void testECDSASHA256Encapsulated()
-        throws Exception
-    {
-        encapsulatedTest(_signEcDsaKP, _signEcDsaCert, "SHA256withECDSA");
-    }
-
-    public void testECDSASHA384Encapsulated()
-        throws Exception
-    {
-        encapsulatedTest(_signEcDsaKP, _signEcDsaCert, "SHA384withECDSA");
-    }
-
-    public void testECDSASHA512Encapsulated()
-        throws Exception
-    {
-        encapsulatedTest(_signEcDsaKP, _signEcDsaCert, "SHA512withECDSA");
-    }
-
-    public void testECDSASHA512EncapsulatedWithKeyFactoryAsEC()
-        throws Exception
-    {
-        X509EncodedKeySpec  pubSpec = new X509EncodedKeySpec(_signEcDsaKP.getPublic().getEncoded());
-        PKCS8EncodedKeySpec privSpec = new PKCS8EncodedKeySpec(_signEcDsaKP.getPrivate().getEncoded());
-        KeyFactory          keyFact = KeyFactory.getInstance("EC", BC);
-        KeyPair             kp = new KeyPair(keyFact.generatePublic(pubSpec), keyFact.generatePrivate(privSpec));
-        
-        encapsulatedTest(kp, _signEcDsaCert, "SHA512withECDSA");
-    }
-
-    public void testDSAEncapsulated()
-        throws Exception
-    {
-        encapsulatedTest(_signDsaKP, _signDsaCert, "SHA1withDSA");
-    }
-
-    public void testDSAEncapsulatedSubjectKeyID()
-        throws Exception
-    {
-        subjectKeyIDTest(_signDsaKP, _signDsaCert, "SHA1withDSA");
-    }
-        
-    public void testGOST3411WithGOST3410Encapsulated()
-        throws Exception
-    {
-        encapsulatedTest(_signGostKP, _signGostCert, "GOST3411withGOST3410");
-    }
-
-    public void testGOST3411WithECGOST3410Encapsulated()
-        throws Exception
-    {
-        encapsulatedTest(_signEcGostKP, _signEcGostCert, "GOST3411withECGOST3410");
-    }
-
-    public void testGostNoAttributesEncapsulated()
-        throws Exception
-    {
-        CMSSignedData data = new CMSSignedData(rawGost);
-
-        Store                   certStore = data.getCertificates();
-        SignerInformationStore  signers = data.getSignerInfos();
-
-        Collection              c = signers.getSigners();
-        Iterator                it = c.iterator();
-
-        while (it.hasNext())
-        {
-            SignerInformation   signer = (SignerInformation)it.next();
-            Collection          certCollection = certStore.getMatches(signer.getSID());
-
-            Iterator        certIt = certCollection.iterator();
-            X509CertificateHolder cert = (X509CertificateHolder)certIt.next();
-
-            assertEquals(true, signer.verify(new JcaSimpleSignerInfoVerifierBuilder().setProvider("BC").build(cert)));
-        }
-    }
-
-    public void testSHA1WithRSACounterSignature()
-        throws Exception
-    {
-        List                certList = new ArrayList();
-        List                crlList = new ArrayList();
-        CMSTypedData        msg = new CMSProcessableByteArray("Hello World!".getBytes());
-
-        certList.add(_signCert);
-        certList.add(_origCert);
-
-        crlList.add(_signCrl);
-
-        Store           certStore = new JcaCertStore(certList);
-        Store           crlStore = new JcaCRLStore(crlList);
-
-        CMSSignedDataGenerator gen = new CMSSignedDataGenerator();
-
-        ContentSigner sha1Signer = new JcaContentSignerBuilder("SHA1withRSA").setProvider(BC).build(_signKP.getPrivate());
-
-        gen.addSignerInfoGenerator(new JcaSignerInfoGeneratorBuilder(new JcaDigestCalculatorProviderBuilder().setProvider(BC).build()).build(sha1Signer, _signCert));
-
-        gen.addCertificates(certStore);
-        gen.addCRLs(crlStore);
-        
-        CMSSignedData s = gen.generate(msg, true);
-        SignerInformation origSigner = (SignerInformation)s.getSignerInfos().getSigners().toArray()[0];
-        SignerInformationStore counterSigners1 = gen.generateCounterSigners(origSigner);
-        SignerInformationStore counterSigners2 = gen.generateCounterSigners(origSigner);
-
-        SignerInformation signer1 = SignerInformation.addCounterSigners(origSigner, counterSigners1);
-        SignerInformation signer2 = SignerInformation.addCounterSigners(signer1, counterSigners2);
-
-        SignerInformationStore cs = signer2.getCounterSignatures();
-        Collection csSigners = cs.getSigners();
-        assertEquals(2, csSigners.size());
-
-        Iterator it = csSigners.iterator();
-        while (it.hasNext())
-        {
-            SignerInformation   cSigner = (SignerInformation)it.next();
-            Collection          certCollection = certStore.getMatches(cSigner.getSID());
-
-            Iterator        certIt = certCollection.iterator();
-            X509CertificateHolder cert = (X509CertificateHolder)certIt.next();
-
-            assertTrue(cSigner.isCounterSignature());
-            assertNull(cSigner.getSignedAttributes().get(PKCSObjectIdentifiers.pkcs_9_at_contentType));
-            assertEquals(true, cSigner.verify(new JcaSimpleSignerInfoVerifierBuilder().setProvider(BC).build(cert)));
-        }
-    }
-
-    public void testSHA1WithRSACounterSignatureAndVerifierProvider()
-        throws Exception
-    {
-        List                certList = new ArrayList();
-        List                crlList = new ArrayList();
-        CMSTypedData        msg = new CMSProcessableByteArray("Hello World!".getBytes());
-
-        certList.add(_signCert);
-        certList.add(_origCert);
-
-        crlList.add(_signCrl);
-
-        Store           certStore = new JcaCertStore(certList);
-        Store           crlStore = new JcaCRLStore(crlList);
-
-        CMSSignedDataGenerator gen = new CMSSignedDataGenerator();
-
-        ContentSigner sha1Signer = new JcaContentSignerBuilder("SHA1withRSA").setProvider(BC).build(_signKP.getPrivate());
-
-        gen.addSignerInfoGenerator(new JcaSignerInfoGeneratorBuilder(new JcaDigestCalculatorProviderBuilder().setProvider(BC).build()).build(sha1Signer, _signCert));
-
-        gen.addCertificates(certStore);
-        gen.addCRLs(crlStore);
-
-        CMSSignedData s = gen.generate(msg, true);
-
-        SignerInformationVerifierProvider vProv = new SignerInformationVerifierProvider()
-        {
-            public SignerInformationVerifier get(SignerId signerId)
-                throws OperatorCreationException
-            {
-                return new JcaSimpleSignerInfoVerifierBuilder().setProvider(BC).build(_signCert);
-            }
-        };
-
-        assertTrue(s.verifySignatures(vProv));
-
-        SignerInformation origSigner = (SignerInformation)s.getSignerInfos().getSigners().toArray()[0];
-
-        gen = new CMSSignedDataGenerator();
-
-        sha1Signer = new JcaContentSignerBuilder("SHA1withRSA").setProvider(BC).build(_origKP.getPrivate());
-
-        gen.addSignerInfoGenerator(new JcaSignerInfoGeneratorBuilder(new JcaDigestCalculatorProviderBuilder().setProvider(BC).build()).build(sha1Signer, _origCert));
-
-        SignerInformationStore counterSigners = gen.generateCounterSigners(origSigner);
-
-        final SignerInformation signer1 = SignerInformation.addCounterSigners(origSigner, counterSigners);
-
-        List signers = new ArrayList();
-
-        signers.add(signer1);
-
-        s = CMSSignedData.replaceSigners(s, new SignerInformationStore(signers));
-
-        assertTrue(s.verifySignatures(vProv, true));
-
-        // provider can't handle counter sig
-        assertFalse(s.verifySignatures(vProv, false));
-
-        vProv = new SignerInformationVerifierProvider()
-        {
-            public SignerInformationVerifier get(SignerId signerId)
-                throws OperatorCreationException
-            {
-                if (_signCert.getSerialNumber().equals(signerId.getSerialNumber()))
-                {
-                    return new JcaSimpleSignerInfoVerifierBuilder().setProvider(BC).build(_signCert);
-                }
-                else if (_origCert.getSerialNumber().equals(signerId.getSerialNumber()))
-                {
-                    return new JcaSimpleSignerInfoVerifierBuilder().setProvider(BC).build(_origCert);
-                }
-                else
-                {
-                    throw new IllegalStateException("no signerID matched");
-                }
-            }
-        };
-
-        // verify sig and counter sig.
-        assertTrue(s.verifySignatures(vProv, false));
-    }
-
-    private void rsaPSSTest(String signatureAlgorithmName)
-        throws Exception
-    {
-        List              certList = new ArrayList();
-        CMSTypedData      msg = new CMSProcessableByteArray("Hello world!".getBytes());
-
-        certList.add(_origCert);
-        certList.add(_signCert);
-
-        Store           certs = new JcaCertStore(certList);
-
-        CMSSignedDataGenerator gen = new CMSSignedDataGenerator();
-
-        ContentSigner contentSigner = new JcaContentSignerBuilder(signatureAlgorithmName).setProvider(BC).build(_origKP.getPrivate());
-
-        JcaSignerInfoGeneratorBuilder siBuilder = new JcaSignerInfoGeneratorBuilder(new JcaDigestCalculatorProviderBuilder().setProvider(BC).build());
-
-        siBuilder.setDirectSignature(true);
-
-        gen.addSignerInfoGenerator(siBuilder.build(contentSigner, _origCert));
-
-        gen.addCertificates(certs);
-
-        CMSSignedData s = gen.generate(msg, false);
-
-        //
-        // compute expected content digest
-        //
-        String digestName = signatureAlgorithmName.substring(0, signatureAlgorithmName.indexOf('w'));
-        MessageDigest md = MessageDigest.getInstance(digestName, BC);
-
-        verifySignatures(s, md.digest("Hello world!".getBytes()));
-    }
-
-    private void subjectKeyIDTest(
-        KeyPair         signaturePair,
-        X509Certificate signatureCert,
-        String          signatureAlgorithm)
-        throws Exception
-    {
-        List              certList = new ArrayList();
-        List              crlList = new ArrayList();
-        CMSTypedData      msg = new CMSProcessableByteArray("Hello World!".getBytes());
-
-        certList.add(signatureCert);
-        certList.add(_origCert);
-
-        crlList.add(_signCrl);
-
-        Store           certStore = new JcaCertStore(certList);
-        Store           crlStore = new JcaCRLStore(crlList);
-
-        CMSSignedDataGenerator gen = new CMSSignedDataGenerator();
-
-        ContentSigner contentSigner = new JcaContentSignerBuilder(signatureAlgorithm).setProvider(BC).build(signaturePair.getPrivate());
-
-        gen.addSignerInfoGenerator(new JcaSignerInfoGeneratorBuilder(new JcaDigestCalculatorProviderBuilder().setProvider(BC).build()).build(contentSigner, CMSTestUtil.createSubjectKeyId(signatureCert.getPublicKey()).getKeyIdentifier()));
-
-        gen.addCertificates(certStore);
-        gen.addCRLs(crlStore);
-
-        CMSSignedData s = gen.generate(msg, true);
-
-        assertEquals(3, s.getVersion());
-        
-        ByteArrayInputStream bIn = new ByteArrayInputStream(s.getEncoded());
-        ASN1InputStream      aIn = new ASN1InputStream(bIn);
-
-        s = new CMSSignedData(ContentInfo.getInstance(aIn.readObject()));
-
-        certStore = s.getCertificates();
-
-        SignerInformationStore  signers = s.getSignerInfos();
-        Collection              c = signers.getSigners();
-        Iterator                it = c.iterator();
-
-        while (it.hasNext())
-        {
-            SignerInformation   signer = (SignerInformation)it.next();
-            Collection          certCollection = certStore.getMatches(signer.getSID());
-
-            Iterator        certIt = certCollection.iterator();
-            X509CertificateHolder cert = (X509CertificateHolder)certIt.next();
-
-            assertEquals(true, signer.verify(new JcaSimpleSignerInfoVerifierBuilder().setProvider(BC).build(cert)));
-        }
-
-        //
-        // check for CRLs
-        //
-        Collection crls = crlStore.getMatches(null);
-
-        assertEquals(1, crls.size());
-
-        assertTrue(crls.contains(new JcaX509CRLHolder(_signCrl)));
-
-        //
-        // try using existing signer
-        //
-
-        gen = new CMSSignedDataGenerator();
-
-        gen.addSigners(s.getSignerInfos());
-
-        gen.addCertificates(s.getCertificates());
-
-        s = gen.generate(msg, true);
-
-        bIn = new ByteArrayInputStream(s.getEncoded());
-        aIn = new ASN1InputStream(bIn);
-
-        s = new CMSSignedData(ContentInfo.getInstance(aIn.readObject()));
-
-        certStore = s.getCertificates();
-
-        signers = s.getSignerInfos();
-        c = signers.getSigners();
-        it = c.iterator();
-
-        while (it.hasNext())
-        {
-            SignerInformation   signer = (SignerInformation)it.next();
-            Collection          certCollection = certStore.getMatches(signer.getSID());
-
-            Iterator        certIt = certCollection.iterator();
-            X509CertificateHolder cert = (X509CertificateHolder)certIt.next();
-
-            assertEquals(true, signer.verify(new JcaSimpleSignerInfoVerifierBuilder().setProvider(BC).build(cert)));
-        }
-
-        checkSignerStoreReplacement(s, signers);
-    }
-
-    private void encapsulatedTest(
-        KeyPair         signaturePair, 
-        X509Certificate signatureCert,
-        String          signatureAlgorithm)
-        throws Exception
-    {
-        List                certList = new ArrayList();
-        List                crlList = new ArrayList();
-        CMSTypedData        msg = new CMSProcessableByteArray("Hello World!".getBytes());
-    
-        certList.add(signatureCert);
-        certList.add(_origCert);
-
-        crlList.add(_signCrl);
-
-        Store           certs = new JcaCertStore(certList);
-        Store           crlStore = new JcaCRLStore(crlList);
-
-        CMSSignedDataGenerator gen = new CMSSignedDataGenerator();
-
-        ContentSigner contentSigner = new JcaContentSignerBuilder(signatureAlgorithm).setProvider(BC).build(signaturePair.getPrivate());
-
-        gen.addSignerInfoGenerator(new JcaSignerInfoGeneratorBuilder(new JcaDigestCalculatorProviderBuilder().setProvider(BC).build()).build(contentSigner, signatureCert));
-
-        gen.addCertificates(certs);
-    
-        CMSSignedData s = gen.generate(msg, true);
-    
-        ByteArrayInputStream bIn = new ByteArrayInputStream(s.getEncoded());
-        ASN1InputStream      aIn = new ASN1InputStream(bIn);
-        
-        s = new CMSSignedData(ContentInfo.getInstance(aIn.readObject()));
-    
-        certs = s.getCertificates();
-    
-        SignerInformationStore  signers = s.getSignerInfos();
-        Collection              c = signers.getSigners();
-        Iterator                it = c.iterator();
-    
-        while (it.hasNext())
-        {
-            SignerInformation   signer = (SignerInformation)it.next();
-            Collection          certCollection = certs.getMatches(signer.getSID());
-    
-            Iterator        certIt = certCollection.iterator();
-            X509CertificateHolder cert = (X509CertificateHolder)certIt.next();
-    
-            assertEquals(true, signer.verify(new JcaSimpleSignerInfoVerifierBuilder().setProvider(BC).build(cert)));
-        }
-
-        //
-        // check signer information lookup
-        //
-
-        SignerId sid = new JcaSignerId(signatureCert);
-
-        Collection collection = signers.getSigners(sid);
-
-        assertEquals(1, collection.size());
-        assertTrue(collection.iterator().next() instanceof SignerInformation);
-
-        //
-        // check for CRLs
-        //
-        Collection crls = crlStore.getMatches(null);
-
-        assertEquals(1, crls.size());
-
-        assertTrue(crls.contains(new JcaX509CRLHolder(_signCrl)));
-        
-        //
-        // try using existing signer
-        //
-        
-        gen = new CMSSignedDataGenerator();
-           
-        gen.addSigners(s.getSignerInfos());
-        
-        gen.addCertificates(s.getCertificates());
-           
-        s = gen.generate(msg, true);
-    
-        bIn = new ByteArrayInputStream(s.getEncoded());
-        aIn = new ASN1InputStream(bIn);
-    
-        s = new CMSSignedData(ContentInfo.getInstance(aIn.readObject()));
-    
-        certs = s.getCertificates();
-    
-        signers = s.getSignerInfos();
-        c = signers.getSigners();
-        it = c.iterator();
-    
-        while (it.hasNext())
-        {
-            SignerInformation   signer = (SignerInformation)it.next();
-            Collection          certCollection = certs.getMatches(signer.getSID());
-    
-            Iterator        certIt = certCollection.iterator();
-            X509CertificateHolder cert = (X509CertificateHolder)certIt.next();
-    
-            assertEquals(true, signer.verify(new JcaSimpleSignerInfoVerifierBuilder().setProvider(BC).build(cert)));
-        }
-        
-        checkSignerStoreReplacement(s, signers);
-    }
-
-    //
-    // signerInformation store replacement test.
-    //
-    private void checkSignerStoreReplacement(
-        CMSSignedData orig, 
-        SignerInformationStore signers) 
-        throws Exception
-    {
-        CMSSignedData s = CMSSignedData.replaceSigners(orig, signers);
-        
-        Store certs = s.getCertificates();
-        
-        signers = s.getSignerInfos();
-        Collection c = signers.getSigners();
-        Iterator   it = c.iterator();
-    
-        while (it.hasNext())
-        {
-            SignerInformation   signer = (SignerInformation)it.next();
-            Collection          certCollection = certs.getMatches(signer.getSID());
-    
-            Iterator        certIt = certCollection.iterator();
-            X509CertificateHolder cert = (X509CertificateHolder)certIt.next();
-    
-            assertEquals(true, signer.verify(new JcaSimpleSignerInfoVerifierBuilder().setProvider(BC).build(cert)));
-        }
-    }
-    
-    public void testUnsortedAttributes()
-        throws Exception
-    {
-        CMSSignedData s = new CMSSignedData(new CMSProcessableByteArray(disorderedMessage), disorderedSet);
-
-        Store certs = s.getCertificates();
-
-        SignerInformationStore  signers = s.getSignerInfos();
-        Collection              c = signers.getSigners();
-        Iterator                it = c.iterator();
-
-        while (it.hasNext())
-        {
-            SignerInformation   signer = (SignerInformation)it.next();
-            Collection          certCollection = certs.getMatches(signer.getSID());
-            Iterator              certIt = certCollection.iterator();
-            X509CertificateHolder cert = (X509CertificateHolder)certIt.next();
-
-            assertEquals(false, signer.verify(new JcaSimpleSignerInfoVerifierBuilder().setProvider(BC).build(cert)));
-
-            Signature sig = Signature.getInstance("SHA1withRSA", BC);
-
-            sig.initVerify(new JcaX509CertificateConverter().getCertificate(cert).getPublicKey());
-
-            sig.update(signer.toASN1Structure().getAuthenticatedAttributes().getEncoded());
-
-            assertEquals(true, sig.verify(signer.getSignature()));
-        }
-    }
-    
-    public void testNullContentWithSigner()
-        throws Exception
-    {
-        List                certList = new ArrayList();
-
-        certList.add(_origCert);
-        certList.add(_signCert);
-
-        Store           certs = new JcaCertStore(certList);
-
-        CMSSignedDataGenerator gen = new CMSSignedDataGenerator();
-
-        ContentSigner sha1Signer = new JcaContentSignerBuilder("SHA1withRSA").setProvider(BC).build(_origKP.getPrivate());
-
-        gen.addSignerInfoGenerator(new JcaSignerInfoGeneratorBuilder(new JcaDigestCalculatorProviderBuilder().setProvider(BC).build()).build(sha1Signer, _origCert));
-
-        gen.addCertificates(certs);
-
-        CMSSignedData s = gen.generate(new CMSAbsentContent(), false);
-
-        ByteArrayInputStream bIn = new ByteArrayInputStream(s.getEncoded());
-        ASN1InputStream      aIn = new ASN1InputStream(bIn);
-        
-        s = new CMSSignedData(ContentInfo.getInstance(aIn.readObject()));
-
-        verifySignatures(s);
-    }
-
-    public void testWithAttributeCertificate()
-        throws Exception
-    {
-        List                certList = new ArrayList();
-        CMSTypedData        msg = new CMSProcessableByteArray("Hello World!".getBytes());
-
-
-        certList.add(_signDsaCert);
-
-        Store           certs = new JcaCertStore(certList);
-
-        CMSSignedDataGenerator gen = new CMSSignedDataGenerator();
-
-        JcaSignerInfoGeneratorBuilder builder = new JcaSignerInfoGeneratorBuilder(new JcaDigestCalculatorProviderBuilder().setProvider(BC).build());
-        ContentSigner sha1Signer = new JcaContentSignerBuilder("SHA1withRSA").setProvider(BC).build(_origKP.getPrivate());
-
-        gen.addSignerInfoGenerator(builder.build(sha1Signer, _origCert));
-
-        gen.addCertificates(certs);
-
-        X509AttributeCertificateHolder attrCert = CMSTestUtil.getAttributeCertificate();
-        List attrList = new ArrayList();
-
-        attrList.add(new X509AttributeCertificateHolder(attrCert.getEncoded()));
-
-        Store store = new CollectionStore(attrList);
-
-        gen.addAttributeCertificates(store);
-
-        CMSSignedData sd = gen.generate(msg);
-
-        assertEquals(4, sd.getVersion());
-
-        store = sd.getAttributeCertificates();
-
-        Collection coll = store.getMatches(null);
-
-        assertEquals(1, coll.size());
-
-        assertTrue(coll.contains(new X509AttributeCertificateHolder(attrCert.getEncoded())));
-        
-        //
-        // create new certstore
-        //
-        certList = new ArrayList();
-        certList.add(_origCert);
-        certList.add(_signCert);
-
-        certs = new JcaCertStore(certList);
-
-
-        //
-        // replace certs
-        //
-        sd = CMSSignedData.replaceCertificatesAndCRLs(sd, certs, null, null);
-
-        verifySignatures(sd);
-    }
-
-    public void testCertStoreReplacement()
-        throws Exception
-    {
-        List         certList = new ArrayList();
-        CMSTypedData msg = new CMSProcessableByteArray("Hello World!".getBytes());
-
-
-        certList.add(_signDsaCert);
-
-        Store certs = new JcaCertStore(certList);
-
-        CMSSignedDataGenerator gen = new CMSSignedDataGenerator();
-
-        ContentSigner sha1Signer = new JcaContentSignerBuilder("SHA1withRSA").setProvider(BC).build(_origKP.getPrivate());
-
-        gen.addSignerInfoGenerator(new JcaSignerInfoGeneratorBuilder(new JcaDigestCalculatorProviderBuilder().setProvider(BC).build()).build(sha1Signer, _origCert));
-
-        gen.addCertificates(certs);
-
-        CMSSignedData sd = gen.generate(msg);
-
-        //
-        // create new certstore
-        //
-        certList = new ArrayList();
-        certList.add(_origCert);
-        certList.add(_signCert);
-
-        certs = new JcaCertStore(certList);
-
-        //
-        // replace certs
-        //
-        sd = CMSSignedData.replaceCertificatesAndCRLs(sd, certs, null, null);
-
-        verifySignatures(sd);
-    }
-
-    public void testEncapsulatedCertStoreReplacement()
-        throws Exception
-    {
-        List                certList = new ArrayList();
-        CMSTypedData        msg = new CMSProcessableByteArray("Hello World!".getBytes());
-
-
-        certList.add(_signDsaCert);
-
-        Store           certs = new JcaCertStore(certList);
-
-        CMSSignedDataGenerator gen = new CMSSignedDataGenerator();
-        ContentSigner sha1Signer = new JcaContentSignerBuilder("SHA1withRSA").setProvider(BC).build(_origKP.getPrivate());
-
-        gen.addSignerInfoGenerator(new JcaSignerInfoGeneratorBuilder(new JcaDigestCalculatorProviderBuilder().setProvider(BC).build()).build(sha1Signer, _origCert));
-
-        gen.addCertificates(certs);
-
-        CMSSignedData sd = gen.generate(msg, true);
-
-        //
-        // create new certstore
-        //
-        certList = new ArrayList();
-        certList.add(_origCert);
-        certList.add(_signCert);
-
-        certs = new JcaCertStore(certList);
-
-
-        //
-        // replace certs
-        //
-        sd = CMSSignedData.replaceCertificatesAndCRLs(sd, certs, null, null);
-
-        verifySignatures(sd);
-    }
-
-    public void testCertOrdering1()
-        throws Exception
-    {
-        List            certList = new ArrayList();
-        CMSTypedData    msg = new CMSProcessableByteArray("Hello World!".getBytes());
-
-        certList.add(_origCert);
-        certList.add(_signCert);
-        certList.add(_signDsaCert);
-
-        Store      certs = new JcaCertStore(certList);
-
-        CMSSignedDataGenerator gen = new CMSSignedDataGenerator();
-
-        ContentSigner sha1Signer = new JcaContentSignerBuilder("SHA1withRSA").setProvider(BC).build(_origKP.getPrivate());
-
-        gen.addSignerInfoGenerator(new JcaSignerInfoGeneratorBuilder(new JcaDigestCalculatorProviderBuilder().setProvider(BC).build()).build(sha1Signer, _origCert));
-
-        gen.addCertificates(certs);
-
-        CMSSignedData sd = gen.generate(msg, true);
-
-        certs = sd.getCertificates();
-        Iterator it = certs.getMatches(null).iterator();
-
-        assertEquals(new JcaX509CertificateHolder(_origCert), it.next());
-        assertEquals(new JcaX509CertificateHolder(_signCert), it.next());
-        assertEquals(new JcaX509CertificateHolder(_signDsaCert), it.next());
-    }
-
-    public void testCertOrdering2()
-        throws Exception
-    {
-        List               certList = new ArrayList();
-        CMSTypedData       msg = new CMSProcessableByteArray("Hello World!".getBytes());
-
-        certList.add(_signCert);
-        certList.add(_signDsaCert);
-        certList.add(_origCert);
-
-        Store           certs = new JcaCertStore(certList);
-
-        CMSSignedDataGenerator gen = new CMSSignedDataGenerator();
-
-        ContentSigner sha1Signer = new JcaContentSignerBuilder("SHA1withRSA").setProvider(BC).build(_origKP.getPrivate());
-
-        gen.addSignerInfoGenerator(new JcaSignerInfoGeneratorBuilder(new JcaDigestCalculatorProviderBuilder().setProvider(BC).build()).build(sha1Signer, _origCert));
-
-        gen.addCertificates(certs);
-
-        CMSSignedData sd = gen.generate(msg, true);
-
-        certs = sd.getCertificates();
-        Iterator it = certs.getMatches(null).iterator();
-
-        assertEquals(new JcaX509CertificateHolder(_signCert), it.next());
-        assertEquals(new JcaX509CertificateHolder(_signDsaCert), it.next());
-        assertEquals(new JcaX509CertificateHolder(_origCert), it.next());
-    }
-
-    public void testSignerStoreReplacement()
-        throws Exception
-    {
-        List                  certList = new ArrayList();
-        CMSTypedData        msg = new CMSProcessableByteArray("Hello World!".getBytes());
-
-        certList.add(_origCert);
-        certList.add(_signCert);
-
-        Store           certs = new JcaCertStore(certList);
-
-        CMSSignedDataGenerator gen = new CMSSignedDataGenerator();
-
-        ContentSigner sha1Signer = new JcaContentSignerBuilder("SHA1withRSA").setProvider(BC).build(_origKP.getPrivate());
-
-        gen.addSignerInfoGenerator(new JcaSignerInfoGeneratorBuilder(new JcaDigestCalculatorProviderBuilder().setProvider(BC).build()).build(sha1Signer, _origCert));
-
-        gen.addCertificates(certs);
-
-        CMSSignedData original = gen.generate(msg, true);
-
-        //
-        // create new Signer
-        //
-        gen = new CMSSignedDataGenerator();
-
-        ContentSigner sha224Signer = new JcaContentSignerBuilder("SHA224withRSA").setProvider(BC).build(_origKP.getPrivate());
-
-        gen.addSignerInfoGenerator(new JcaSignerInfoGeneratorBuilder(new JcaDigestCalculatorProviderBuilder().setProvider(BC).build()).build(sha224Signer, _origCert));
-
-        gen.addCertificates(certs);
-
-        CMSSignedData newSD = gen.generate(msg, true);
-
-        //
-        // replace signer
-        //
-        CMSSignedData sd = CMSSignedData.replaceSigners(original, newSD.getSignerInfos());
-
-        SignerInformation signer = (SignerInformation)sd.getSignerInfos().getSigners().iterator().next();
-
-        assertEquals(CMSAlgorithm.SHA224.getId(), signer.getDigestAlgOID());
-
-        // we use a parser here as it requires the digests to be correct in the digest set, if it
-        // isn't we'll get a NullPointerException
-        CMSSignedDataParser sp = new CMSSignedDataParser(new JcaDigestCalculatorProviderBuilder().setProvider(BC).build(), sd.getEncoded());
-
-        sp.getSignedContent().drain();
-
-        verifySignatures(sp);
-    }
-
-    public void testEncapsulatedSamples()
-        throws Exception
-    {
-        testSample("PSSSignDataSHA1Enc.sig");
-        testSample("PSSSignDataSHA256Enc.sig");
-        testSample("PSSSignDataSHA512Enc.sig");
-    }
-    
-    public void testSamples()
-        throws Exception
-    {
-        testSample("PSSSignData.data", "PSSSignDataSHA1.sig");
-        testSample("PSSSignData.data", "PSSSignDataSHA256.sig");
-        testSample("PSSSignData.data", "PSSSignDataSHA512.sig");
-    }
-
-    public void testNoAttrEncapsulatedSample()
-        throws Exception
-    {
-        CMSSignedData s = new CMSSignedData(noAttrEncData);
-
-        Store certStore = s.getCertificates();
-
-        assertNotNull(certStore);
-
-        SignerInformationStore signers = s.getSignerInfos();
-
-        assertNotNull(signers);
-
-        Collection c = signers.getSigners();
-
-        Iterator it = c.iterator();
-
-        while (it.hasNext())
-        {
-            SignerInformation signer = (SignerInformation)it.next();
-            Collection certCollection = certStore.getMatches(signer.getSID());
-            Iterator certIt = certCollection.iterator();
-            X509CertificateHolder cert = (X509CertificateHolder)certIt.next();
-
-            if (!signer.verify(new JcaSimpleSignerInfoVerifierBuilder().setProvider(BC).build(cert)))
-            {
-                fail("Verification FAILED! ");
-            }
-        }
-    }
-
-    public void testCounterSig()
-        throws Exception
-    {
-        CMSSignedData sig = new CMSSignedData(getInput("counterSig.p7m"));
-
-        SignerInformationStore ss = sig.getSignerInfos();
-        Collection signers = ss.getSigners();
-
-        SignerInformationStore cs = ((SignerInformation)signers.iterator().next()).getCounterSignatures();
-        Collection csSigners = cs.getSigners();
-        assertEquals(1, csSigners.size());
-
-        Iterator it = csSigners.iterator();
-        while (it.hasNext())
-        {
-            SignerInformation   cSigner = (SignerInformation)it.next();
-            Collection          certCollection = sig.getCertificates().getMatches(cSigner.getSID());
-
-            Iterator        certIt = certCollection.iterator();
-            X509CertificateHolder cert = (X509CertificateHolder)certIt.next();
-
-            assertTrue(cSigner.isCounterSignature());
-            assertNull(cSigner.getSignedAttributes().get(PKCSObjectIdentifiers.pkcs_9_at_contentType));
-            assertEquals(true, cSigner.verify(new JcaSimpleSignerInfoVerifierBuilder().setProvider(BC).build(cert)));
-        }
-        
-        verifySignatures(sig);
-    }
-
-    public void testCertificateManagement()
-        throws Exception
-    {
-        CMSSignedDataGenerator sGen = new CMSSignedDataGenerator();
-
-        List                  certList = new ArrayList();
-
-        certList.add(_origCert);
-        certList.add(_signCert);
-
-        Store           certs = new JcaCertStore(certList);
-
-        sGen.addCertificates(certs);
-
-        CMSSignedData sData = sGen.generate(new CMSAbsentContent(), true);
-
-        CMSSignedData rsData = new CMSSignedData(sData.getEncoded());
-
-        assertEquals(2, rsData.getCertificates().getMatches(null).size());
-    }
-
-    private void testSample(String sigName)
-        throws Exception
-    {
-        CMSSignedData sig = new CMSSignedData(getInput(sigName));
-
-        verifySignatures(sig);
-    }
-
-    private void testSample(String messageName, String sigName)
-        throws Exception
-    {
-        CMSSignedData sig = new CMSSignedData(new CMSProcessableByteArray(getInput(messageName)), getInput(sigName));
-
-        verifySignatures(sig);
-    }
-
-    private byte[] getInput(String name)
-        throws IOException
-    {
-        return Streams.readAll(getClass().getResourceAsStream(name));
-    }
-
-    public void testForMultipleCounterSignatures()
-        throws Exception
-    {
-        CMSSignedData sd = new CMSSignedData(xtraCounterSig);
-
-        for (Iterator sI = sd.getSignerInfos().getSigners().iterator(); sI.hasNext();)
-        {
-            SignerInformation sigI = (SignerInformation)sI.next();
-
-            SignerInformationStore counter = sigI.getCounterSignatures();
-            List                   sigs = new ArrayList(counter.getSigners());
-
-            assertEquals(2, sigs.size());
-        }
-    }
-
-    private void verifySignatures(CMSSignedDataParser sp)
-        throws Exception
-    {
-        Store               certs = sp.getCertificates();
-        SignerInformationStore  signers = sp.getSignerInfos();
-
-        Collection              c = signers.getSigners();
-        Iterator                it = c.iterator();
-
-        while (it.hasNext())
-        {
-            SignerInformation   signer = (SignerInformation)it.next();
-            Collection          certCollection = certs.getMatches(signer.getSID());
-
-            Iterator        certIt = certCollection.iterator();
-            X509CertificateHolder cert = (X509CertificateHolder)certIt.next();
-
-            assertEquals(true, signer.verify(new JcaSimpleSignerInfoVerifierBuilder().setProvider(BC).build(cert)));
-        }
-    }
-
-    private class TestCMSSignatureAlgorithmNameGenerator
-        extends DefaultCMSSignatureAlgorithmNameGenerator
-    {
-        void setDigestAlgorithmMapping(ASN1ObjectIdentifier oid, String algName)
-        {
-            super.setSigningDigestAlgorithmMapping(oid, algName);
-        }
-
-        void setEncryptionAlgorithmMapping(ASN1ObjectIdentifier oid, String algName)
-        {
-            super.setSigningEncryptionAlgorithmMapping(oid, algName);
-        }
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cms/test/NullProviderTest.java b/bcpkix/src/main/java/org/bouncycastle/cms/test/NullProviderTest.java
deleted file mode 100644
index a97b21c..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cms/test/NullProviderTest.java
+++ /dev/null
@@ -1,281 +0,0 @@
-package org.bouncycastle.cms.test;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.math.BigInteger;
-import java.security.GeneralSecurityException;
-import java.security.KeyPair;
-import java.security.KeyPairGenerator;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-import java.security.NoSuchProviderException;
-import java.security.PrivateKey;
-import java.security.PublicKey;
-import java.security.SecureRandom;
-import java.security.cert.X509Certificate;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.List;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.cms.ContentInfo;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.asn1.x509.X509Name;
-import org.bouncycastle.cert.X509CertificateHolder;
-import org.bouncycastle.cms.CMSEnvelopedData;
-import org.bouncycastle.cms.CMSEnvelopedDataGenerator;
-import org.bouncycastle.cms.CMSProcessableByteArray;
-import org.bouncycastle.cms.CMSSignedData;
-import org.bouncycastle.cms.CMSSignedDataGenerator;
-import org.bouncycastle.cms.CMSSignedDataParser;
-import org.bouncycastle.cms.CMSSignedDataStreamGenerator;
-import org.bouncycastle.cms.CMSTypedData;
-import org.bouncycastle.cms.CMSTypedStream;
-import org.bouncycastle.cms.RecipientInformation;
-import org.bouncycastle.cms.RecipientInformationStore;
-import org.bouncycastle.cms.SignerInformation;
-import org.bouncycastle.cms.SignerInformationStore;
-import org.bouncycastle.cms.jcajce.JcaSignerInfoGeneratorBuilder;
-import org.bouncycastle.cms.jcajce.JcaSimpleSignerInfoVerifierBuilder;
-import org.bouncycastle.cms.jcajce.JcaX509CertSelectorConverter;
-import org.bouncycastle.cms.jcajce.JceCMSContentEncryptorBuilder;
-import org.bouncycastle.cms.jcajce.JceKeyTransEnvelopedRecipient;
-import org.bouncycastle.cms.jcajce.JceKeyTransRecipientInfoGenerator;
-import org.bouncycastle.operator.DigestCalculatorProvider;
-import org.bouncycastle.operator.jcajce.JcaContentSignerBuilder;
-import org.bouncycastle.operator.jcajce.JcaDigestCalculatorProviderBuilder;
-import org.bouncycastle.util.CollectionStore;
-import org.bouncycastle.util.Store;
-import org.bouncycastle.x509.X509V3CertificateGenerator;
-
-public class NullProviderTest
-    extends TestCase
-{
-    static KeyPair keyPair;
-    static X509Certificate keyCert;
-    private static final String TEST_MESSAGE = "Hello World!";
-
-    private JcaX509CertSelectorConverter selectorConverter = new JcaX509CertSelectorConverter();
-
-    static
-    {
-        try
-        {
-            keyPair = generateKeyPair();
-            String origDN = "O=Bouncy Castle, C=AU";
-            keyCert = makeCertificate(keyPair, origDN, keyPair, origDN);
-        }
-        catch (Exception e)
-        {
-            throw new RuntimeException(e);
-        }
-    }
-
-    public void testSHA1WithRSAEncapsulated()
-        throws Exception
-    {
-        List certList = new ArrayList();
-        CMSTypedData msg = new CMSProcessableByteArray(TEST_MESSAGE.getBytes());
-
-        certList.add(new X509CertificateHolder(keyCert.getEncoded()));
-
-        DigestCalculatorProvider digCalcProv = new JcaDigestCalculatorProviderBuilder().build();
-
-        CMSSignedDataGenerator gen = new CMSSignedDataGenerator();
-
-        gen.addSignerInfoGenerator(new JcaSignerInfoGeneratorBuilder(digCalcProv).build(new JcaContentSignerBuilder("SHA1withRSA").build(keyPair.getPrivate()), keyCert));
-
-        gen.addCertificates(new CollectionStore(certList));
-
-        CMSSignedData s = gen.generate(msg, true);
-
-        ByteArrayInputStream bIn = new ByteArrayInputStream(s.getEncoded());
-        ASN1InputStream aIn = new ASN1InputStream(bIn);
-
-        s = new CMSSignedData(ContentInfo.getInstance(aIn.readObject()));
-
-        Store certsAndCrls = s.getCertificates();
-
-        SignerInformationStore signers = s.getSignerInfos();
-        Collection c = signers.getSigners();
-        Iterator it = c.iterator();
-
-        while (it.hasNext())
-        {
-            SignerInformation     signer = (SignerInformation)it.next();
-            Collection            certCollection = certsAndCrls.getMatches(signer.getSID());
-            Iterator              certIt = certCollection.iterator();
-            X509CertificateHolder cert = (X509CertificateHolder)certIt.next();
-
-            assertEquals(true, signer.verify(new JcaSimpleSignerInfoVerifierBuilder().build(cert)));
-        }
-    }
-
-    public void testSHA1WithRSAStream()
-        throws Exception
-    {
-        List                  certList = new ArrayList();
-        ByteArrayOutputStream bOut = new ByteArrayOutputStream();
-
-        certList.add(new X509CertificateHolder(keyCert.getEncoded()));
-
-        DigestCalculatorProvider digCalcProv = new JcaDigestCalculatorProviderBuilder().build();
-
-        CMSSignedDataStreamGenerator gen = new CMSSignedDataStreamGenerator();
-
-        gen.addSignerInfoGenerator(new JcaSignerInfoGeneratorBuilder(digCalcProv).build(new JcaContentSignerBuilder("SHA1withRSA").build(keyPair.getPrivate()), keyCert));
-
-        gen.addCertificates(new CollectionStore(certList));
-
-        OutputStream sigOut = gen.open(bOut);
-
-        sigOut.write(TEST_MESSAGE.getBytes());
-
-        sigOut.close();
-
-        CMSSignedDataParser sp = new CMSSignedDataParser(digCalcProv,
-                new CMSTypedStream(new ByteArrayInputStream(TEST_MESSAGE.getBytes())), bOut.toByteArray());
-
-        sp.getSignedContent().drain();
-
-        //
-        // compute expected content digest
-        //
-        MessageDigest md = MessageDigest.getInstance("SHA1");
-
-        byte[]                  contentDigest = md.digest(TEST_MESSAGE.getBytes());
-        Store                   certStore = sp.getCertificates();
-        SignerInformationStore  signers = sp.getSignerInfos();
-
-        Collection              c = signers.getSigners();
-        Iterator                it = c.iterator();
-
-        while (it.hasNext())
-        {
-            SignerInformation   signer = (SignerInformation)it.next();
-            Collection          certCollection = certStore.getMatches(signer.getSID());
-
-            Iterator        certIt = certCollection.iterator();
-            X509CertificateHolder cert = (X509CertificateHolder)certIt.next();
-
-            assertEquals(true, signer.verify(new JcaSimpleSignerInfoVerifierBuilder().build(cert)));
-
-            if (contentDigest != null)
-            {
-                assertTrue(MessageDigest.isEqual(contentDigest, signer.getContentDigest()));
-            }
-        }
-    }
-
-    public void testKeyTransDES()
-        throws Exception
-    {
-        testKeyTrans(CMSEnvelopedDataGenerator.DES_EDE3_CBC);
-    }
-
-    public void testKeyTransAES128()
-        throws Exception
-    {
-        testKeyTrans(CMSEnvelopedDataGenerator.AES128_CBC);
-    }
-
-    public void testKeyTransAES192()
-        throws Exception
-    {
-        testKeyTrans(CMSEnvelopedDataGenerator.AES192_CBC);
-    }
-
-    public void testKeyTransAES256()
-        throws Exception
-    {
-        testKeyTrans(CMSEnvelopedDataGenerator.AES256_CBC);
-    }
-
-    private void testKeyTrans(String algorithm)
-        throws Exception
-    {
-        byte[]          data     = "WallaWallaWashington".getBytes();
-
-        CMSEnvelopedDataGenerator edGen = new CMSEnvelopedDataGenerator();
-
-        edGen.addRecipientInfoGenerator(new JceKeyTransRecipientInfoGenerator(keyCert));
-
-        CMSEnvelopedData ed = edGen.generate(
-            new CMSProcessableByteArray(data),
-            new JceCMSContentEncryptorBuilder(new ASN1ObjectIdentifier(algorithm)).build());
-
-        RecipientInformationStore recipients = ed.getRecipientInfos();
-
-        assertEquals(ed.getEncryptionAlgOID(), algorithm);
-
-        Collection  c = recipients.getRecipients();
-
-        assertEquals(1, c.size());
-
-        Iterator    it = c.iterator();
-
-        while (it.hasNext())
-        {
-            RecipientInformation recipient = (RecipientInformation)it.next();
-
-            assertEquals(recipient.getKeyEncryptionAlgOID(), PKCSObjectIdentifiers.rsaEncryption.getId());
-
-            byte[] recData = recipient.getContent(new JceKeyTransEnvelopedRecipient(keyPair.getPrivate()));
-
-            assertEquals(true, Arrays.equals(data, recData));
-        }
-    }
-
-    private static KeyPair generateKeyPair()
-        throws NoSuchProviderException, NoSuchAlgorithmException
-    {
-        KeyPairGenerator kpg  = KeyPairGenerator.getInstance("RSA", "SunRsaSign");
-
-        kpg.initialize(512, new SecureRandom());
-
-        return kpg.generateKeyPair();
-    }
-
-    private static X509Certificate makeCertificate(KeyPair subKP, String _subDN, KeyPair issKP, String _issDN)
-        throws GeneralSecurityException, IOException
-    {
-
-        PublicKey subPub  = subKP.getPublic();
-        PrivateKey issPriv = issKP.getPrivate();
-        PublicKey  issPub  = issKP.getPublic();
-
-        X509V3CertificateGenerator v3CertGen = new X509V3CertificateGenerator();
-
-        v3CertGen.reset();
-        v3CertGen.setSerialNumber(BigInteger.valueOf(1));
-        v3CertGen.setIssuerDN(new X509Name(_issDN));
-        v3CertGen.setNotBefore(new Date(System.currentTimeMillis()));
-        v3CertGen.setNotAfter(new Date(System.currentTimeMillis() + (1000L * 60 * 60 * 24 * 100)));
-        v3CertGen.setSubjectDN(new X509Name(_subDN));
-        v3CertGen.setPublicKey(subPub);
-
-        v3CertGen.setSignatureAlgorithm("SHA1WithRSA");
-
-        X509Certificate _cert = v3CertGen.generate(issPriv, "SunRsaSign");
-
-        _cert.checkValidity(new Date());
-        _cert.verify(issPub);
-
-        return _cert;
-    }
-
-    public static Test suite()
-        throws Exception
-    {
-        return new TestSuite(NullProviderTest.class);
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cms/test/Rfc4134Test.java b/bcpkix/src/main/java/org/bouncycastle/cms/test/Rfc4134Test.java
deleted file mode 100644
index 2f59702..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cms/test/Rfc4134Test.java
+++ /dev/null
@@ -1,445 +0,0 @@
-package org.bouncycastle.cms.test;
-
-import java.io.ByteArrayInputStream;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.security.KeyFactory;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-import java.security.NoSuchProviderException;
-import java.security.PrivateKey;
-import java.security.PublicKey;
-import java.security.Security;
-import java.security.cert.CertificateFactory;
-import java.security.cert.X509Certificate;
-import java.security.interfaces.DSAParams;
-import java.security.interfaces.DSAPublicKey;
-import java.security.spec.DSAPublicKeySpec;
-import java.security.spec.InvalidKeySpecException;
-import java.security.spec.PKCS8EncodedKeySpec;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Iterator;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.DERUTF8String;
-import org.bouncycastle.asn1.cms.Attribute;
-import org.bouncycastle.asn1.cms.AttributeTable;
-import org.bouncycastle.asn1.cms.CMSAttributes;
-import org.bouncycastle.asn1.cms.CMSObjectIdentifiers;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.cert.X509CertificateHolder;
-import org.bouncycastle.cert.jcajce.JcaX509CertificateConverter;
-import org.bouncycastle.cms.CMSEnvelopedData;
-import org.bouncycastle.cms.CMSEnvelopedDataGenerator;
-import org.bouncycastle.cms.CMSEnvelopedDataParser;
-import org.bouncycastle.cms.CMSException;
-import org.bouncycastle.cms.CMSProcessableByteArray;
-import org.bouncycastle.cms.CMSSignedData;
-import org.bouncycastle.cms.CMSSignedDataParser;
-import org.bouncycastle.cms.CMSTypedStream;
-import org.bouncycastle.cms.RecipientInformation;
-import org.bouncycastle.cms.RecipientInformationStore;
-import org.bouncycastle.cms.SignerInformation;
-import org.bouncycastle.cms.SignerInformationStore;
-import org.bouncycastle.cms.jcajce.JcaSignerInfoVerifierBuilder;
-import org.bouncycastle.cms.jcajce.JcaX509CertSelectorConverter;
-import org.bouncycastle.cms.jcajce.JceKeyTransEnvelopedRecipient;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.operator.DigestCalculatorProvider;
-import org.bouncycastle.operator.OperatorCreationException;
-import org.bouncycastle.operator.jcajce.JcaDigestCalculatorProviderBuilder;
-import org.bouncycastle.util.Store;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.io.Streams;
-
-public class Rfc4134Test
-    extends TestCase
-{
-    private static final String BC = BouncyCastleProvider.PROVIDER_NAME;    
-    private static final String TEST_DATA_HOME = "bc.test.data.home";
-    
-    private static byte[] exContent = getRfc4134Data("ExContent.bin");
-    private static byte[] sha1 = Hex.decode("406aec085279ba6e16022d9e0629c0229687dd48");
-
-    private static final JcaX509CertSelectorConverter selectorConverter = new JcaX509CertSelectorConverter();
-    private static final DigestCalculatorProvider digCalcProv;
-
-    static
-    {
-        try
-        {
-            digCalcProv =  new JcaDigestCalculatorProviderBuilder().build();
-        }
-        catch (OperatorCreationException e)
-        {
-            throw new IllegalStateException("can't create default provider!!!");
-        }
-    }
-
-    public Rfc4134Test(String name)
-    {
-        super(name);
-    }
-
-    public static void main(String args[])
-    {
-        Security.addProvider(new BouncyCastleProvider());
-
-        junit.textui.TestRunner.run(Rfc4134Test.class);
-    }
-
-    public static Test suite() 
-        throws Exception
-    {
-        return new CMSTestSetup(new TestSuite(Rfc4134Test.class));
-    }
-
-    public void test4_1()
-        throws Exception
-    {
-        byte[] data = getRfc4134Data("4.1.bin");
-        CMSSignedData signedData = new CMSSignedData(data);
-
-        verifySignatures(signedData);
-
-        CMSSignedDataParser parser = new CMSSignedDataParser(digCalcProv, data);
-
-        verifySignatures(parser);
-    }
-
-    public void test4_2()
-        throws Exception
-    {
-        byte[] data = getRfc4134Data("4.2.bin");
-        CMSSignedData signedData = new CMSSignedData(data);
-
-        verifySignatures(signedData);
-
-        CMSSignedDataParser parser = new CMSSignedDataParser(digCalcProv, data);
-
-        verifySignatures(parser);
-    }
-
-    public void testRfc4_3()
-        throws Exception
-    {
-        byte[] data = getRfc4134Data("4.3.bin");
-        CMSSignedData signedData = new CMSSignedData(new CMSProcessableByteArray(exContent), data);
-
-        verifySignatures(signedData, sha1);
-
-        CMSSignedDataParser parser = new CMSSignedDataParser(digCalcProv,
-                new CMSTypedStream(new ByteArrayInputStream(exContent)),
-                data);
-
-        verifySignatures(parser);
-    }
-
-    public void test4_4()
-        throws Exception
-    {
-        byte[] data = getRfc4134Data("4.4.bin");
-        byte[] counterSigCert = getRfc4134Data("AliceRSASignByCarl.cer");
-        CMSSignedData signedData = new CMSSignedData(data);
-
-        verifySignatures(signedData, sha1);
-
-        verifySignerInfo4_4(getFirstSignerInfo(signedData.getSignerInfos()), counterSigCert);
-
-        CMSSignedDataParser parser = new CMSSignedDataParser(digCalcProv, data);
-
-        verifySignatures(parser);
-
-        verifySignerInfo4_4(getFirstSignerInfo(parser.getSignerInfos()), counterSigCert);
-    }
-
-    public void test4_5()
-        throws Exception
-    {
-        byte[] data = getRfc4134Data("4.5.bin");
-        CMSSignedData signedData = new CMSSignedData(data);
-
-        verifySignatures(signedData);
-
-        CMSSignedDataParser parser = new CMSSignedDataParser(digCalcProv, data);
-
-        verifySignatures(parser);
-    }
-
-    public void test4_6()
-        throws Exception
-    {
-        byte[] data = getRfc4134Data("4.6.bin");
-        CMSSignedData signedData = new CMSSignedData(data);
-
-        verifySignatures(signedData);
-
-        CMSSignedDataParser parser = new CMSSignedDataParser(digCalcProv, data);
-
-        verifySignatures(parser);
-    }
-
-    public void test4_7()
-        throws Exception
-    {
-        byte[] data = getRfc4134Data("4.7.bin");
-        CMSSignedData signedData = new CMSSignedData(data);
-
-        verifySignatures(signedData);
-
-        CMSSignedDataParser parser = new CMSSignedDataParser(digCalcProv, data);
-
-        verifySignatures(parser);
-    }
-
-    public void test5_1()
-        throws Exception
-    {
-        byte[] data = getRfc4134Data("5.1.bin");
-        CMSEnvelopedData envelopedData = new CMSEnvelopedData(data);
-
-        verifyEnvelopedData(envelopedData, CMSEnvelopedDataGenerator.DES_EDE3_CBC);
-
-        CMSEnvelopedDataParser envelopedParser = new CMSEnvelopedDataParser(data);
-
-        verifyEnvelopedData(envelopedParser, CMSEnvelopedDataGenerator.DES_EDE3_CBC);
-    }
-
-    public void test5_2()
-        throws Exception
-    {
-        byte[] data = getRfc4134Data("5.2.bin");
-        CMSEnvelopedData envelopedData = new CMSEnvelopedData(data);
-
-        verifyEnvelopedData(envelopedData, CMSEnvelopedDataGenerator.RC2_CBC);
-
-        CMSEnvelopedDataParser envelopedParser = new CMSEnvelopedDataParser(data);
-
-        verifyEnvelopedData(envelopedParser, CMSEnvelopedDataGenerator.RC2_CBC);
-    }
-
-    private void verifyEnvelopedData(CMSEnvelopedData envelopedData, String symAlgorithmOID)
-        throws NoSuchAlgorithmException, NoSuchProviderException, InvalidKeySpecException, CMSException
-    {
-        byte[]              privKeyData = getRfc4134Data("BobPrivRSAEncrypt.pri");
-        PKCS8EncodedKeySpec keySpec = new PKCS8EncodedKeySpec(privKeyData);
-        KeyFactory keyFact = KeyFactory.getInstance("RSA", BC);
-        PrivateKey privKey = keyFact.generatePrivate(keySpec);
-
-        RecipientInformationStore recipients = envelopedData.getRecipientInfos();
-
-        assertEquals(envelopedData.getEncryptionAlgOID(), symAlgorithmOID);
-
-        Collection c = recipients.getRecipients();
-        assertTrue(c.size() >= 1 && c.size() <= 2);
-
-        Iterator it = c.iterator();
-        verifyRecipient((RecipientInformation)it.next(), privKey);
-
-        if (c.size() == 2)
-        {
-            RecipientInformation recInfo = (RecipientInformation)it.next();
-
-            assertEquals(PKCSObjectIdentifiers.id_alg_CMSRC2wrap.getId(), recInfo.getKeyEncryptionAlgOID());
-        }
-    }
-
-    private void verifyEnvelopedData(CMSEnvelopedDataParser envelopedParser, String symAlgorithmOID)
-        throws NoSuchAlgorithmException, NoSuchProviderException, InvalidKeySpecException, CMSException
-    {
-        byte[]              privKeyData = getRfc4134Data("BobPrivRSAEncrypt.pri");
-        PKCS8EncodedKeySpec keySpec = new PKCS8EncodedKeySpec(privKeyData);
-        KeyFactory keyFact = KeyFactory.getInstance("RSA", BC);
-        PrivateKey privKey = keyFact.generatePrivate(keySpec);
-
-        RecipientInformationStore recipients = envelopedParser.getRecipientInfos();
-
-        assertEquals(envelopedParser.getEncryptionAlgOID(), symAlgorithmOID);
-
-        Collection c = recipients.getRecipients();
-        assertTrue(c.size() >= 1 && c.size() <= 2);
-
-        Iterator it = c.iterator();
-        verifyRecipient((RecipientInformation)it.next(), privKey);
-
-        if (c.size() == 2)
-        {
-            RecipientInformation recInfo = (RecipientInformation)it.next();
-
-            assertEquals(PKCSObjectIdentifiers.id_alg_CMSRC2wrap.getId(), recInfo.getKeyEncryptionAlgOID());
-        }
-    }
-
-    private void verifyRecipient(RecipientInformation recipient, PrivateKey privKey)
-        throws CMSException, NoSuchProviderException
-    {
-        assertEquals(recipient.getKeyEncryptionAlgOID(), PKCSObjectIdentifiers.rsaEncryption.getId());
-
-        byte[] recData = recipient.getContent(new JceKeyTransEnvelopedRecipient(privKey).setProvider(BC));
-
-        assertEquals(true, Arrays.equals(exContent, recData));
-    }
-
-    private void verifySignerInfo4_4(SignerInformation signerInfo, byte[] counterSigCert)
-        throws Exception
-    {
-        verifyCounterSignature(signerInfo, counterSigCert);
-
-        verifyContentHint(signerInfo);
-    }
-
-    private SignerInformation getFirstSignerInfo(SignerInformationStore store)
-    {
-        return (SignerInformation)store.getSigners().iterator().next();
-    }
-
-    private void verifyCounterSignature(SignerInformation signInfo, byte[] certificate)
-        throws Exception
-    {
-        SignerInformation csi = (SignerInformation)signInfo.getCounterSignatures().getSigners().iterator().next();
-
-        CertificateFactory certFact = CertificateFactory.getInstance("X.509", BC);
-        X509Certificate    cert = (X509Certificate)certFact.generateCertificate(new ByteArrayInputStream(certificate));
-
-        assertTrue(csi.verify(new JcaSignerInfoVerifierBuilder(digCalcProv).setProvider(BC).build(cert)));
-    }
-
-    private void verifyContentHint(SignerInformation signInfo)
-    {
-        AttributeTable attrTable = signInfo.getUnsignedAttributes();
-
-        Attribute attr = attrTable.get(CMSAttributes.contentHint);
-
-        assertEquals(1, attr.getAttrValues().size());
-
-        ASN1EncodableVector v = new ASN1EncodableVector();
-
-        v.add(new DERUTF8String("Content Hints Description Buffer"));
-        v.add(CMSObjectIdentifiers.data);
-        
-        assertTrue(attr.getAttrValues().getObjectAt(0).equals(new DERSequence(v)));
-    }
-
-    private void verifySignatures(CMSSignedData s, byte[] contentDigest)
-        throws Exception
-    {
-        Store               certStore = s.getCertificates();
-        SignerInformationStore  signers = s.getSignerInfos();
-
-        Collection              c = signers.getSigners();
-        Iterator                it = c.iterator();
-
-        while (it.hasNext())
-        {
-            SignerInformation   signer = (SignerInformation)it.next();
-            Collection          certCollection = certStore.getMatches(signer.getSID());
-
-            Iterator        certIt = certCollection.iterator();
-            X509CertificateHolder cert = (X509CertificateHolder)certIt.next();
-
-            verifySigner(signer, cert);
-
-            if (contentDigest != null)
-            {
-                assertTrue(MessageDigest.isEqual(contentDigest, signer.getContentDigest()));
-            }
-        }
-    }
-
-    private void verifySignatures(CMSSignedData s)
-        throws Exception
-    {
-        verifySignatures(s, null);
-    }
-
-    private void verifySignatures(CMSSignedDataParser sp)
-        throws Exception
-    {
-        CMSTypedStream sc = sp.getSignedContent();
-        if (sc != null)
-        {
-            sc.drain();
-        }
-        
-        Store certs = sp.getCertificates();
-        SignerInformationStore  signers = sp.getSignerInfos();
-
-        Collection              c = signers.getSigners();
-        Iterator                it = c.iterator();
-
-        while (it.hasNext())
-        {
-            SignerInformation   signer = (SignerInformation)it.next();
-            Collection          certCollection = certs.getMatches(signer.getSID());
-
-            Iterator        certIt = certCollection.iterator();
-            X509CertificateHolder cert = (X509CertificateHolder)certIt.next();
-
-            verifySigner(signer, cert);
-        }
-    }
-
-    private void verifySigner(SignerInformation signer, X509CertificateHolder certHolder)
-        throws Exception
-    {
-        X509Certificate cert = new JcaX509CertificateConverter().setProvider("BC").getCertificate(certHolder);
-        if (cert.getPublicKey() instanceof DSAPublicKey)
-        {
-            DSAPublicKey key = (DSAPublicKey)cert.getPublicKey();
-
-            if (key.getParams() == null)
-            {
-                assertEquals(true, signer.verify(new JcaSignerInfoVerifierBuilder(digCalcProv).setProvider(BC).build(getInheritedKey(key))));
-            }
-            else
-            {
-                assertEquals(true, signer.verify(new JcaSignerInfoVerifierBuilder(digCalcProv).setProvider(BC).build(cert)));
-            }
-        }
-        else
-        {
-            assertEquals(true, signer.verify(new JcaSignerInfoVerifierBuilder(digCalcProv).setProvider(BC).build(cert)));
-        }
-    }
-
-    private PublicKey getInheritedKey(DSAPublicKey key)
-        throws Exception
-    {
-        CertificateFactory certFact = CertificateFactory.getInstance("X.509", BC);
-
-        X509Certificate cert = (X509Certificate)certFact.generateCertificate(new ByteArrayInputStream(getRfc4134Data("CarlDSSSelf.cer")));
-
-        DSAParams dsaParams = ((DSAPublicKey)cert.getPublicKey()).getParams();
-
-        DSAPublicKeySpec dsaPubKeySpec = new DSAPublicKeySpec(
-                        key.getY(), dsaParams.getP(), dsaParams.getQ(), dsaParams.getG());
-
-        KeyFactory keyFactory = KeyFactory.getInstance("DSA", BC);
-
-        return keyFactory.generatePublic(dsaPubKeySpec);
-    }
-
-    private static byte[] getRfc4134Data(String name)
-    {
-        String dataHome = System.getProperty(TEST_DATA_HOME);
-
-        if (dataHome == null)
-        {
-            throw new IllegalStateException(TEST_DATA_HOME + " property not set");
-        }
-
-        try
-        {
-            return Streams.readAll(new FileInputStream(dataHome + "/rfc4134/" + name));
-        }
-        catch (IOException e)
-        {
-            throw new RuntimeException(e.toString());
-        }
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cms/test/SHA1DigestCalculator.java b/bcpkix/src/main/java/org/bouncycastle/cms/test/SHA1DigestCalculator.java
deleted file mode 100644
index 934bfcf..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cms/test/SHA1DigestCalculator.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package org.bouncycastle.cms.test;
-
-import java.io.ByteArrayOutputStream;
-import java.io.OutputStream;
-
-import org.bouncycastle.asn1.oiw.OIWObjectIdentifiers;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.digests.SHA1Digest;
-import org.bouncycastle.operator.DigestCalculator;
-
-
-class SHA1DigestCalculator
-    implements DigestCalculator
-{
-    private ByteArrayOutputStream bOut = new ByteArrayOutputStream();
-
-    public AlgorithmIdentifier getAlgorithmIdentifier()
-    {
-        return new AlgorithmIdentifier(OIWObjectIdentifiers.idSHA1);
-    }
-
-    public OutputStream getOutputStream()
-    {
-        return bOut;
-    }
-
-    public byte[] getDigest()
-    {
-        byte[] bytes = bOut.toByteArray();
-
-        bOut.reset();
-
-        Digest sha1 = new SHA1Digest();
-
-        sha1.update(bytes, 0, bytes.length);
-
-        byte[] digest = new byte[sha1.getDigestSize()];
-
-        sha1.doFinal(digest, 0);
-
-        return digest;
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cms/test/SunProviderTest.java b/bcpkix/src/main/java/org/bouncycastle/cms/test/SunProviderTest.java
deleted file mode 100644
index 3ec8c5a..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cms/test/SunProviderTest.java
+++ /dev/null
@@ -1,284 +0,0 @@
-package org.bouncycastle.cms.test;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.math.BigInteger;
-import java.security.GeneralSecurityException;
-import java.security.KeyPair;
-import java.security.KeyPairGenerator;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-import java.security.NoSuchProviderException;
-import java.security.PrivateKey;
-import java.security.PublicKey;
-import java.security.SecureRandom;
-import java.security.cert.X509Certificate;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.List;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.cms.ContentInfo;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.asn1.x509.X509Name;
-import org.bouncycastle.cert.X509CertificateHolder;
-import org.bouncycastle.cert.jcajce.JcaX509CertificateConverter;
-import org.bouncycastle.cms.CMSEnvelopedData;
-import org.bouncycastle.cms.CMSEnvelopedDataGenerator;
-import org.bouncycastle.cms.CMSProcessableByteArray;
-import org.bouncycastle.cms.CMSSignedData;
-import org.bouncycastle.cms.CMSSignedDataGenerator;
-import org.bouncycastle.cms.CMSSignedDataParser;
-import org.bouncycastle.cms.CMSSignedDataStreamGenerator;
-import org.bouncycastle.cms.CMSTypedData;
-import org.bouncycastle.cms.CMSTypedStream;
-import org.bouncycastle.cms.RecipientInformation;
-import org.bouncycastle.cms.RecipientInformationStore;
-import org.bouncycastle.cms.SignerInformation;
-import org.bouncycastle.cms.SignerInformationStore;
-import org.bouncycastle.cms.jcajce.JcaSignerInfoGeneratorBuilder;
-import org.bouncycastle.cms.jcajce.JcaSignerInfoVerifierBuilder;
-import org.bouncycastle.cms.jcajce.JcaSimpleSignerInfoVerifierBuilder;
-import org.bouncycastle.cms.jcajce.JcaX509CertSelectorConverter;
-import org.bouncycastle.cms.jcajce.JceCMSContentEncryptorBuilder;
-import org.bouncycastle.cms.jcajce.JceKeyTransEnvelopedRecipient;
-import org.bouncycastle.cms.jcajce.JceKeyTransRecipientInfoGenerator;
-import org.bouncycastle.operator.DigestCalculatorProvider;
-import org.bouncycastle.operator.jcajce.JcaContentSignerBuilder;
-import org.bouncycastle.operator.jcajce.JcaDigestCalculatorProviderBuilder;
-import org.bouncycastle.util.CollectionStore;
-import org.bouncycastle.util.Store;
-import org.bouncycastle.x509.X509V3CertificateGenerator;
-
-public class SunProviderTest
-    extends TestCase
-{
-    static KeyPair keyPair;
-    static X509Certificate keyCert;
-    private static final String TEST_MESSAGE = "Hello World!";
-    private static final JcaX509CertSelectorConverter selectorConverter = new JcaX509CertSelectorConverter();
-
-    static
-    {
-        try
-        {
-        keyPair = generateKeyPair();
-        String origDN = "O=Bouncy Castle, C=AU";
-        keyCert = makeCertificate(keyPair, origDN, keyPair, origDN);
-        }
-        catch (Exception e)
-        {
-            throw new RuntimeException(e);
-        }
-    }
-
-    public void testSHA1WithRSAEncapsulated()
-        throws Exception
-    {
-        List certList = new ArrayList();
-        CMSTypedData msg = new CMSProcessableByteArray(TEST_MESSAGE.getBytes());
-
-        certList.add(new X509CertificateHolder(keyCert.getEncoded()));
-
-        DigestCalculatorProvider digCalcProv = new JcaDigestCalculatorProviderBuilder().build();
-
-        CMSSignedDataGenerator gen = new CMSSignedDataGenerator();
-
-        gen.addSignerInfoGenerator(new JcaSignerInfoGeneratorBuilder(digCalcProv).build(new JcaContentSignerBuilder("SHA1withRSA").setProvider("SunRsaSign").build(keyPair.getPrivate()), keyCert));
-
-        gen.addCertificates(new CollectionStore(certList));
-
-        CMSSignedData s = gen.generate(msg, true);
-
-        ByteArrayInputStream bIn = new ByteArrayInputStream(s.getEncoded());
-        ASN1InputStream aIn = new ASN1InputStream(bIn);
-
-        s = new CMSSignedData(ContentInfo.getInstance(aIn.readObject()));
-
-        Store certsAndCrls = s.getCertificates();
-
-        SignerInformationStore signers = s.getSignerInfos();
-        Collection c = signers.getSigners();
-        Iterator it = c.iterator();
-
-        while (it.hasNext())
-        {
-            SignerInformation signer = (SignerInformation)it.next();
-            Collection          certCollection = certsAndCrls.getMatches(signer.getSID());
-
-            Iterator        certIt = certCollection.iterator();
-            X509Certificate cert = new JcaX509CertificateConverter().getCertificate((X509CertificateHolder)certIt.next());
-
-            assertEquals(true, signer.verify(new JcaSignerInfoVerifierBuilder(new JcaDigestCalculatorProviderBuilder().build()).setProvider("SunRsaSign").build(cert)));
-        }
-    }
-
-    public void testSHA1WithRSAStream()
-        throws Exception
-    {
-        List                  certList = new ArrayList();
-        ByteArrayOutputStream bOut = new ByteArrayOutputStream();
-
-        certList.add(new X509CertificateHolder(keyCert.getEncoded()));
-
-        DigestCalculatorProvider digCalcProv = new JcaDigestCalculatorProviderBuilder().build();
-
-        CMSSignedDataStreamGenerator gen = new CMSSignedDataStreamGenerator();
-
-        gen.addSignerInfoGenerator(new JcaSignerInfoGeneratorBuilder(digCalcProv).build(new JcaContentSignerBuilder("SHA1withRSA").setProvider("SunRsaSign").build(keyPair.getPrivate()), keyCert));
-
-        gen.addCertificates(new CollectionStore(certList));
-
-        OutputStream sigOut = gen.open(bOut);
-
-        sigOut.write(TEST_MESSAGE.getBytes());
-
-        sigOut.close();
-
-        CMSSignedDataParser sp = new CMSSignedDataParser(digCalcProv,
-                new CMSTypedStream(new ByteArrayInputStream(TEST_MESSAGE.getBytes())), bOut.toByteArray());
-
-        sp.getSignedContent().drain();
-
-        //
-        // compute expected content digest
-        //
-        MessageDigest md = MessageDigest.getInstance("SHA1", "SUN");
-
-        byte[]                  contentDigest = md.digest(TEST_MESSAGE.getBytes());
-        Store                   certStore = sp.getCertificates();
-        SignerInformationStore  signers = sp.getSignerInfos();
-
-        Collection              c = signers.getSigners();
-        Iterator                it = c.iterator();
-
-        while (it.hasNext())
-        {
-            SignerInformation   signer = (SignerInformation)it.next();
-            Collection          certCollection = certStore.getMatches(signer.getSID());
-
-            Iterator        certIt = certCollection.iterator();
-            X509CertificateHolder cert = (X509CertificateHolder)certIt.next();
-
-            assertEquals(true, signer.verify(new JcaSimpleSignerInfoVerifierBuilder().setProvider("SunRsaSign").build(new JcaX509CertificateConverter().getCertificate(cert))));
-
-            if (contentDigest != null)
-            {
-                assertTrue(MessageDigest.isEqual(contentDigest, signer.getContentDigest()));
-            }
-        }
-    }
-
-    public void testKeyTransDES()
-        throws Exception
-    {
-        testKeyTrans(CMSEnvelopedDataGenerator.DES_EDE3_CBC);
-    }
-
-    public void testKeyTransAES128()
-        throws Exception
-    {
-        testKeyTrans(CMSEnvelopedDataGenerator.AES128_CBC);
-    }
-
-    public void testKeyTransAES192()
-        throws Exception
-    {
-        testKeyTrans(CMSEnvelopedDataGenerator.AES192_CBC);
-    }
-
-    public void testKeyTransAES256()
-        throws Exception
-    {
-        testKeyTrans(CMSEnvelopedDataGenerator.AES256_CBC);
-    }
-
-    private void testKeyTrans(String algorithm)
-        throws Exception
-    {
-        byte[]          data     = "WallaWallaWashington".getBytes();
-
-        CMSEnvelopedDataGenerator edGen = new CMSEnvelopedDataGenerator();
-
-        edGen.addRecipientInfoGenerator(new JceKeyTransRecipientInfoGenerator(keyCert).setProvider("SunJCE"));
-
-        CMSEnvelopedData ed = edGen.generate(
-                                new CMSProcessableByteArray(data),
-                                new JceCMSContentEncryptorBuilder(new ASN1ObjectIdentifier(algorithm)).setProvider("SunJCE").build());
-
-        RecipientInformationStore recipients = ed.getRecipientInfos();
-
-
-        assertEquals(ed.getEncryptionAlgOID(), algorithm);
-
-        Collection  c = recipients.getRecipients();
-
-        assertEquals(1, c.size());
-
-        Iterator    it = c.iterator();
-
-        while (it.hasNext())
-        {
-            RecipientInformation recipient = (RecipientInformation)it.next();
-
-            assertEquals(recipient.getKeyEncryptionAlgOID(), PKCSObjectIdentifiers.rsaEncryption.getId());
-
-            byte[] recData = recipient.getContent(new JceKeyTransEnvelopedRecipient(keyPair.getPrivate()).setProvider("SunJCE"));
-
-            assertEquals(true, Arrays.equals(data, recData));
-        }
-    }
-
-    private static KeyPair generateKeyPair()
-        throws NoSuchProviderException, NoSuchAlgorithmException
-    {
-        KeyPairGenerator    kpg  = KeyPairGenerator.getInstance("RSA", "SunRsaSign");
-
-        kpg.initialize(512, new SecureRandom());
-
-        return kpg.generateKeyPair();
-    }
-
-    private static X509Certificate makeCertificate(KeyPair subKP, String _subDN, KeyPair issKP, String _issDN)
-        throws GeneralSecurityException, IOException
-    {
-
-        PublicKey subPub  = subKP.getPublic();
-        PrivateKey issPriv = issKP.getPrivate();
-        PublicKey  issPub  = issKP.getPublic();
-
-        X509V3CertificateGenerator v3CertGen = new X509V3CertificateGenerator();
-
-        v3CertGen.reset();
-        v3CertGen.setSerialNumber(BigInteger.valueOf(1));
-        v3CertGen.setIssuerDN(new X509Name(_issDN));
-        v3CertGen.setNotBefore(new Date(System.currentTimeMillis()));
-        v3CertGen.setNotAfter(new Date(System.currentTimeMillis() + (1000L * 60 * 60 * 24 * 100)));
-        v3CertGen.setSubjectDN(new X509Name(_subDN));
-        v3CertGen.setPublicKey(subPub);
-
-        v3CertGen.setSignatureAlgorithm("SHA1WithRSA");
-
-        X509Certificate _cert = v3CertGen.generate(issPriv, "SunRsaSign");
-
-        _cert.checkValidity(new Date());
-        _cert.verify(issPub);
-
-        return _cert;
-    }
-
-    public static Test suite()
-        throws Exception
-    {
-        return new TestSuite(SunProviderTest.class);
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/cms/test/package.html b/bcpkix/src/main/java/org/bouncycastle/cms/test/package.html
deleted file mode 100644
index 153bbd0..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/cms/test/package.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<html>
-<body bgcolor="#ffffff">
-Regression tests for the org.bouncycastle.cms package. 
-<p>
-<b>Note</b>: The classes in this package are also a useful source of example code.
-</body>
-</html>
diff --git a/bcpkix/src/main/java/org/bouncycastle/dvcs/CCPDRequestBuilder.java b/bcpkix/src/main/java/org/bouncycastle/dvcs/CCPDRequestBuilder.java
deleted file mode 100644
index d8ed653..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/dvcs/CCPDRequestBuilder.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package org.bouncycastle.dvcs;
-
-import org.bouncycastle.asn1.dvcs.DVCSRequestInformationBuilder;
-import org.bouncycastle.asn1.dvcs.Data;
-import org.bouncycastle.asn1.dvcs.ServiceType;
-
-/**
- * Builder of CCPD requests (Certify Claim of Possession of Data).
- */
-public class CCPDRequestBuilder
-    extends DVCSRequestBuilder
-{
-    public CCPDRequestBuilder()
-    {
-        super(new DVCSRequestInformationBuilder(ServiceType.CCPD));
-    }
-
-    /**
-     * Builds CCPD request.
-     *
-     * @param messageImprint - the message imprint to include.
-     * @return
-     * @throws DVCSException
-     */
-    public DVCSRequest build(MessageImprint messageImprint)
-        throws DVCSException
-    {
-        Data data = new Data(messageImprint.toASN1Structure());
-
-        return createDVCRequest(data);
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/dvcs/CCPDRequestData.java b/bcpkix/src/main/java/org/bouncycastle/dvcs/CCPDRequestData.java
deleted file mode 100644
index f97ff9d..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/dvcs/CCPDRequestData.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package org.bouncycastle.dvcs;
-
-import org.bouncycastle.asn1.dvcs.Data;
-
-/**
- * Data piece of DVCRequest for CCPD service (Certify Claim of Possession of Data).
- * It contains CCPD-specific selector interface.
- * <p>
- * This objects are constructed internally,
- * to build DVCS request to CCPD service use CCPDRequestBuilder.
- * </p>
- */
-public class CCPDRequestData
-    extends DVCSRequestData
-{
-    /**
-     * Construct from corresponding ASN.1 Data structure.
-     * Note, that data should have messageImprint choice,
-     * otherwise DVCSConstructionException is thrown.
-     *
-     * @param data
-     * @throws DVCSConstructionException
-     */
-    CCPDRequestData(Data data)
-        throws DVCSConstructionException
-    {
-        super(data);
-        initDigest();
-    }
-
-    private void initDigest()
-        throws DVCSConstructionException
-    {
-        if (data.getMessageImprint() == null)
-        {
-            throw new DVCSConstructionException("DVCSRequest.data.messageImprint should be specified for CCPD service");
-        }
-    }
-
-    /**
-     * Get MessageImprint value
-     *
-     * @return
-     */
-    public MessageImprint getMessageImprint()
-    {
-        return new MessageImprint(data.getMessageImprint());
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/dvcs/CPDRequestBuilder.java b/bcpkix/src/main/java/org/bouncycastle/dvcs/CPDRequestBuilder.java
deleted file mode 100644
index 3d671f2..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/dvcs/CPDRequestBuilder.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package org.bouncycastle.dvcs;
-
-import java.io.IOException;
-
-import org.bouncycastle.asn1.dvcs.DVCSRequestInformationBuilder;
-import org.bouncycastle.asn1.dvcs.Data;
-import org.bouncycastle.asn1.dvcs.ServiceType;
-
-/**
- * Builder of DVCSRequests to CPD service (Certify Possession of Data).
- */
-public class CPDRequestBuilder
-    extends DVCSRequestBuilder
-{
-    public CPDRequestBuilder()
-    {
-        super(new DVCSRequestInformationBuilder(ServiceType.CPD));
-    }
-
-    /**
-     * Build CPD request.
-     *
-     * @param messageBytes  - data to be certified
-     * @return
-     * @throws DVCSException
-     */
-    public DVCSRequest build(byte[] messageBytes)
-        throws DVCSException, IOException
-    {
-        Data data = new Data(messageBytes);
-
-        return createDVCRequest(data);
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/dvcs/CPDRequestData.java b/bcpkix/src/main/java/org/bouncycastle/dvcs/CPDRequestData.java
deleted file mode 100644
index 703de52..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/dvcs/CPDRequestData.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package org.bouncycastle.dvcs;
-
-import org.bouncycastle.asn1.dvcs.Data;
-
-/**
- * Data piece of DVCRequest for CPD service (Certify Possession of Data).
- * It contains CPD-specific selector interface.
- * <p>
- * This objects are constructed internally,
- * to build DVCS request to CPD service use CPDRequestBuilder.
- * </p>
- */
-public class CPDRequestData
-    extends DVCSRequestData
-{
-    CPDRequestData(Data data)
-        throws DVCSConstructionException
-    {
-        super(data);
-        initMessage();
-    }
-
-    private void initMessage()
-        throws DVCSConstructionException
-    {
-        if (data.getMessage() == null)
-        {
-            throw new DVCSConstructionException("DVCSRequest.data.message should be specified for CPD service");
-        }
-    }
-
-    /**
-     * Get contained message (data to be certified).
-     *
-     * @return
-     */
-    public byte[] getMessage()
-    {
-        return data.getMessage().getOctets();
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/dvcs/DVCSConstructionException.java b/bcpkix/src/main/java/org/bouncycastle/dvcs/DVCSConstructionException.java
deleted file mode 100644
index ec865c8..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/dvcs/DVCSConstructionException.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package org.bouncycastle.dvcs;
-
-/**
- * Exception thrown when failed to initialize some DVCS-related staff.
- */
-public class DVCSConstructionException
-    extends DVCSException
-{
-    private static final long serialVersionUID = 660035299653583980L;
-
-    public DVCSConstructionException(String message)
-    {
-        super(message);
-    }
-
-    public DVCSConstructionException(String message, Throwable cause)
-    {
-        super(message, cause);
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/dvcs/DVCSException.java b/bcpkix/src/main/java/org/bouncycastle/dvcs/DVCSException.java
deleted file mode 100644
index c5e3897..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/dvcs/DVCSException.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package org.bouncycastle.dvcs;
-
-/**
- * General DVCSException.
- */
-public class DVCSException
-    extends Exception
-{
-    private static final long serialVersionUID = 389345256020131488L;
-
-    private Throwable cause;
-
-    public DVCSException(String message)
-    {
-        super(message);
-    }
-
-    public DVCSException(String message, Throwable cause)
-    {
-        super(message);
-        this.cause = cause;
-    }
-
-    public Throwable getCause()
-    {
-        return cause;
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/dvcs/DVCSMessage.java b/bcpkix/src/main/java/org/bouncycastle/dvcs/DVCSMessage.java
deleted file mode 100644
index f6db5fa..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/dvcs/DVCSMessage.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package org.bouncycastle.dvcs;
-
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.cms.ContentInfo;
-
-public abstract class DVCSMessage
-{
-    private final ContentInfo contentInfo;
-
-    protected DVCSMessage(ContentInfo contentInfo)
-    {
-        this.contentInfo = contentInfo;
-    }
-
-    public ASN1ObjectIdentifier getContentType()
-    {
-        return contentInfo.getContentType();
-    }
-
-    public abstract ASN1Encodable getContent();
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/dvcs/DVCSParsingException.java b/bcpkix/src/main/java/org/bouncycastle/dvcs/DVCSParsingException.java
deleted file mode 100644
index a034e38..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/dvcs/DVCSParsingException.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package org.bouncycastle.dvcs;
-
-/**
- * DVCS parsing exception - thrown when failed to parse DVCS message.
- */
-public class DVCSParsingException
-    extends DVCSException
-{
-    private static final long serialVersionUID = -7895880961377691266L;
-
-    public DVCSParsingException(String message)
-    {
-        super(message);
-    }
-
-    public DVCSParsingException(String message, Throwable cause)
-    {
-        super(message, cause);
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/dvcs/DVCSRequest.java b/bcpkix/src/main/java/org/bouncycastle/dvcs/DVCSRequest.java
deleted file mode 100644
index b82f1f1..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/dvcs/DVCSRequest.java
+++ /dev/null
@@ -1,134 +0,0 @@
-package org.bouncycastle.dvcs;
-
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.cms.ContentInfo;
-import org.bouncycastle.asn1.cms.SignedData;
-import org.bouncycastle.asn1.dvcs.DVCSObjectIdentifiers;
-import org.bouncycastle.asn1.dvcs.ServiceType;
-import org.bouncycastle.asn1.x509.GeneralName;
-import org.bouncycastle.cms.CMSSignedData;
-
-/**
- * DVCRequest is general request to DVCS (RFC 3029).
- * It represents requests for all types of services.
- * Requests for different services differ in DVCData structure.
- */
-public class DVCSRequest
-    extends DVCSMessage
-{
-    private org.bouncycastle.asn1.dvcs.DVCSRequest asn1;
-    private DVCSRequestInfo reqInfo;
-    private DVCSRequestData data;
-
-    /**
-     * Constructs DVCRequest from CMS SignedData object.
-     *
-     * @param signedData the CMS SignedData object containing the request
-     * @throws DVCSConstructionException
-     */
-    public DVCSRequest(CMSSignedData signedData)
-        throws DVCSConstructionException
-    {
-        this(SignedData.getInstance(signedData.toASN1Structure().getContent()).getEncapContentInfo());
-    }
-
-    /**
-     * Construct a DVCS Request from a ContentInfo
-     *
-     * @param contentInfo the contentInfo representing the DVCSRequest
-     * @throws DVCSConstructionException
-     */
-    public DVCSRequest(ContentInfo contentInfo)
-        throws DVCSConstructionException
-    {
-        super(contentInfo);
-
-        if (!DVCSObjectIdentifiers.id_ct_DVCSRequestData.equals(contentInfo.getContentType()))
-        {
-            throw new DVCSConstructionException("ContentInfo not a DVCS Request");
-        }
-
-        try
-        {
-            if (contentInfo.getContent().toASN1Primitive() instanceof ASN1Sequence)
-            {
-                this.asn1 = org.bouncycastle.asn1.dvcs.DVCSRequest.getInstance(contentInfo.getContent());
-            }
-            else
-            {
-                this.asn1 = org.bouncycastle.asn1.dvcs.DVCSRequest.getInstance(ASN1OctetString.getInstance(contentInfo.getContent()).getOctets());
-            }
-        }
-        catch (Exception e)
-        {
-            throw new DVCSConstructionException("Unable to parse content: " + e.getMessage(), e);
-        }
-
-        this.reqInfo = new DVCSRequestInfo(asn1.getRequestInformation());
-
-        int service = reqInfo.getServiceType();
-        if (service == ServiceType.CPD.getValue().intValue())
-        {
-            this.data = new CPDRequestData(asn1.getData());
-        }
-        else if (service == ServiceType.VSD.getValue().intValue())
-        {
-            this.data = new VSDRequestData(asn1.getData());
-        }
-        else if (service == ServiceType.VPKC.getValue().intValue())
-        {
-            this.data = new VPKCRequestData(asn1.getData());
-        }
-        else if (service == ServiceType.CCPD.getValue().intValue())
-        {
-            this.data = new CCPDRequestData(asn1.getData());
-        }
-        else
-        {
-            throw new DVCSConstructionException("Unknown service type: " + service);
-        }
-    }
-
-    /**
-     * Return the ASN.1 DVCSRequest structure making up the body of this request.
-     *
-     * @return an org.bouncycastle.asn1.dvcs.DVCSRequest object.
-     */
-    public ASN1Encodable getContent()
-    {
-        return asn1;
-    }
-
-    /**
-     * Get RequestInformation envelope.
-     *
-     * @return the request info object.
-     */
-    public DVCSRequestInfo getRequestInfo()
-    {
-        return reqInfo;
-    }
-
-    /**
-     * Get data of DVCRequest.
-     * Depending on type of the request it could be different subclasses of DVCRequestData.
-     *
-     * @return the request Data object.
-     */
-    public DVCSRequestData getData()
-    {
-        return data;
-    }
-
-    /**
-     * Get the transaction identifier of request.
-     *
-     * @return the GeneralName representing the Transaction Identifier.
-     */
-    public GeneralName getTransactionIdentifier()
-    {
-        return asn1.getTransactionIdentifier();
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/dvcs/DVCSRequestBuilder.java b/bcpkix/src/main/java/org/bouncycastle/dvcs/DVCSRequestBuilder.java
deleted file mode 100644
index aab4570..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/dvcs/DVCSRequestBuilder.java
+++ /dev/null
@@ -1,131 +0,0 @@
-package org.bouncycastle.dvcs;
-
-import java.io.IOException;
-import java.math.BigInteger;
-
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.cms.ContentInfo;
-import org.bouncycastle.asn1.dvcs.DVCSObjectIdentifiers;
-import org.bouncycastle.asn1.dvcs.DVCSRequestInformationBuilder;
-import org.bouncycastle.asn1.dvcs.Data;
-import org.bouncycastle.asn1.x509.ExtensionsGenerator;
-import org.bouncycastle.asn1.x509.GeneralName;
-import org.bouncycastle.asn1.x509.GeneralNames;
-import org.bouncycastle.cms.CMSSignedDataGenerator;
-
-/**
- * Common base class for client DVCRequest builders.
- * This class aims at DVCSRequestInformation and TransactionIdentifier construction,
- * and its subclasses - for Data field construction (as it is specific for the requested service).
- */
-public abstract class DVCSRequestBuilder
-{
-    private final ExtensionsGenerator extGenerator = new ExtensionsGenerator();
-    private final CMSSignedDataGenerator signedDataGen = new CMSSignedDataGenerator();
-
-    protected final DVCSRequestInformationBuilder requestInformationBuilder;
-
-    protected DVCSRequestBuilder(DVCSRequestInformationBuilder requestInformationBuilder)
-    {
-        this.requestInformationBuilder = requestInformationBuilder;
-    }
-
-    /**
-     * Set a nonce for this request,
-     *
-     * @param nonce
-     */
-    public void setNonce(BigInteger nonce)
-    {
-        requestInformationBuilder.setNonce(nonce);
-    }
-
-    /**
-     * Set requester name.
-     *
-     * @param requester
-     */
-    public void setRequester(GeneralName requester)
-    {
-        requestInformationBuilder.setRequester(requester);
-    }
-
-    /**
-     * Set DVCS name to generated requests.
-     *
-     * @param dvcs
-     */
-    public void setDVCS(GeneralName dvcs)
-    {
-        requestInformationBuilder.setDVCS(dvcs);
-    }
-
-    /**
-     * Set DVCS name to generated requests.
-     *
-     * @param dvcs
-     */
-    public void setDVCS(GeneralNames dvcs)
-    {
-        requestInformationBuilder.setDVCS(dvcs);
-    }
-
-    /**
-     * Set data location to generated requests.
-     *
-     * @param dataLocation
-     */
-    public void setDataLocations(GeneralName dataLocation)
-    {
-        requestInformationBuilder.setDataLocations(dataLocation);
-    }
-
-    /**
-     * Set data location to generated requests.
-     *
-     * @param dataLocations
-     */
-    public void setDataLocations(GeneralNames dataLocations)
-    {
-        requestInformationBuilder.setDataLocations(dataLocations);
-    }
-
-    /**
-     * Add a given extension field.
-     *
-     * @param oid the OID defining the extension type.
-     * @param isCritical true if the extension is critical, false otherwise.
-     * @param value the ASN.1 structure that forms the extension's value.
-     * @return this builder object.
-     * @throws DVCSException if there is an issue encoding the extension for adding.
-     */
-    public void addExtension(
-        ASN1ObjectIdentifier oid,
-        boolean isCritical,
-        ASN1Encodable value)
-        throws DVCSException
-    {
-        try
-        {
-            extGenerator.addExtension(oid, isCritical, value);
-        }
-        catch (IOException e)
-        {
-            throw new DVCSException("cannot encode extension: " + e.getMessage(), e);
-        }
-    }
-
-    protected DVCSRequest createDVCRequest(Data data)
-        throws DVCSException
-    {
-        if (!extGenerator.isEmpty())
-        {
-            requestInformationBuilder.setExtensions(extGenerator.generate());
-        }
-
-        org.bouncycastle.asn1.dvcs.DVCSRequest request = new org.bouncycastle.asn1.dvcs.DVCSRequest(requestInformationBuilder.build(), data);
-
-        return new DVCSRequest(new ContentInfo(DVCSObjectIdentifiers.id_ct_DVCSRequestData, request));
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/dvcs/DVCSRequestData.java b/bcpkix/src/main/java/org/bouncycastle/dvcs/DVCSRequestData.java
deleted file mode 100644
index 811306b..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/dvcs/DVCSRequestData.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package org.bouncycastle.dvcs;
-
-import org.bouncycastle.asn1.dvcs.Data;
-
-/**
- * Data piece of DVCRequest object (DVCS Data structure).
- * Its contents depend on the service type.
- * Its subclasses define the service-specific interface.
- * <p>
- * The concrete objects of DVCRequestData are created by buildDVCRequestData static method.
- * </p>
- */
-public abstract class DVCSRequestData
-{
-    /**
-     * The underlying data object is accessible by subclasses.
-     */
-    protected Data data;
-
-    /**
-     * The constructor is accessible by subclasses.
-     *
-     * @param data
-     */
-    protected DVCSRequestData(Data data)
-    {
-        this.data = data;
-    }
-
-    /**
-     * Convert to ASN.1 structure (Data).
-     *
-     * @return
-     */
-    public Data toASN1Structure()
-    {
-        return data;
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/dvcs/DVCSRequestInfo.java b/bcpkix/src/main/java/org/bouncycastle/dvcs/DVCSRequestInfo.java
deleted file mode 100644
index 4d0767d..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/dvcs/DVCSRequestInfo.java
+++ /dev/null
@@ -1,237 +0,0 @@
-package org.bouncycastle.dvcs;
-
-import java.math.BigInteger;
-import java.util.Date;
-
-import org.bouncycastle.asn1.dvcs.DVCSRequestInformation;
-import org.bouncycastle.asn1.dvcs.DVCSTime;
-import org.bouncycastle.asn1.x509.GeneralNames;
-import org.bouncycastle.asn1.x509.PolicyInformation;
-import org.bouncycastle.tsp.TimeStampToken;
-import org.bouncycastle.util.Arrays;
-
-/**
- * Information piece of DVCS requests.
- * It is common for all types of DVCS requests.
- */
-public class DVCSRequestInfo
-{
-    private DVCSRequestInformation data;
-
-    /**
-     * Constructs DVCRequestInfo from byte array (DER encoded DVCSRequestInformation).
-     *
-     * @param in
-     */
-    public DVCSRequestInfo(byte[] in)
-    {
-        this(DVCSRequestInformation.getInstance(in));
-    }
-
-    /**
-     * Constructs DVCRequestInfo from DVCSRequestInformation ASN.1 structure.
-     *
-     * @param data
-     */
-    public DVCSRequestInfo(DVCSRequestInformation data)
-    {
-        this.data = data;
-    }
-
-    /**
-     * Converts to corresponding ASN.1 structure (DVCSRequestInformation).
-     *
-     * @return
-     */
-    public DVCSRequestInformation toASN1Structure()
-    {
-        return data;
-    }
-
-    //
-    // DVCRequestInfo selector interface
-    //
-
-    /**
-     * Get DVCS version of request.
-     *
-     * @return
-     */
-    public int getVersion()
-    {
-        return data.getVersion();
-    }
-
-    /**
-     * Get requested service type.
-     *
-     * @return one of CPD, VSD, VPKC, CCPD (see constants).
-     */
-    public int getServiceType()
-    {
-        return data.getService().getValue().intValue();
-    }
-
-    /**
-     * Get nonce if it is set.
-     * Note: this field can be set (if not present) or extended (if present) by DVCS.
-     *
-     * @return nonce value, or null if it is not set.
-     */
-    public BigInteger getNonce()
-    {
-        return data.getNonce();
-    }
-
-    /**
-     * Get request generation time if it is set.
-     *
-     * @return time of request, or null if it is not set.
-     * @throws DVCSParsingException if a request time is present but cannot be extracted.
-     */
-    public Date getRequestTime()
-        throws DVCSParsingException
-    {
-        DVCSTime time = data.getRequestTime();
-
-        if (time == null)
-        {
-            return null;
-        }
-
-        try
-        {
-            if (time.getGenTime() != null)
-            {
-                return time.getGenTime().getDate();
-            }
-            else
-            {
-                TimeStampToken token = new TimeStampToken(time.getTimeStampToken());
-
-                return token.getTimeStampInfo().getGenTime();
-            }
-        }
-        catch (Exception e)
-        {
-            throw new DVCSParsingException("unable to extract time: " + e.getMessage(), e);
-        }
-    }
-
-    /**
-     * Get names of requesting entity, if set.
-     *
-     * @return
-     */
-    public GeneralNames getRequester()
-    {
-        return data.getRequester();
-    }
-
-    /**
-     * Get policy, under which the validation is requested.
-     *
-     * @return policy identifier or null, if any policy is acceptable.
-     */
-    public PolicyInformation getRequestPolicy()
-    {
-        if (data.getRequestPolicy() != null)
-        {
-            return data.getRequestPolicy();
-        }
-        return null;
-    }
-
-    /**
-     * Get names of DVCS servers.
-     * Note: this field can be set by DVCS.
-     *
-     * @return
-     */
-    public GeneralNames getDVCSNames()
-    {
-        return data.getDVCS();
-    }
-
-    /**
-     * Get data locations, where the copy of request Data can be obtained.
-     * Note: the exact meaning of field is up to applications.
-     * Note: this field can be set by DVCS.
-     *
-     * @return
-     */
-    public GeneralNames getDataLocations()
-    {
-        return data.getDataLocations();
-    }
-
-    /**
-     * Compares two DVCRequestInfo structures: one from DVCRequest, and one from DVCResponse.
-     * This function implements RFC 3029, 9.1 checks of reqInfo.
-     *
-     * @param requestInfo  - DVCRequestInfo of DVCRequest
-     * @param responseInfo - DVCRequestInfo of DVCResponse
-     * @return true if server's requestInfo matches client's requestInfo
-     */
-    public static boolean validate(DVCSRequestInfo requestInfo, DVCSRequestInfo responseInfo)
-    {
-        // RFC 3029, 9.1
-        // The DVCS MAY modify the fields:
-        // 'dvcs', 'requester', 'dataLocations', and 'nonce' of the ReqInfo structure.
-
-        DVCSRequestInformation clientInfo = requestInfo.data;
-        DVCSRequestInformation serverInfo = responseInfo.data;
-
-        if (clientInfo.getVersion() != serverInfo.getVersion())
-        {
-            return false;
-        }
-        if (!clientEqualsServer(clientInfo.getService(), serverInfo.getService()))
-        {
-            return false;
-        }
-        if (!clientEqualsServer(clientInfo.getRequestTime(), serverInfo.getRequestTime()))
-        {
-            return false;
-        }
-        if (!clientEqualsServer(clientInfo.getRequestPolicy(), serverInfo.getRequestPolicy()))
-        {
-            return false;
-        }
-        if (!clientEqualsServer(clientInfo.getExtensions(), serverInfo.getExtensions()))
-        {
-            return false;
-        }
-
-        // RFC 3029, 9.1. The only modification allowed to a 'nonce'
-        // is the inclusion of a new field if it was not present,
-        // or to concatenate other data to the end (right) of an existing value.
-
-        if (clientInfo.getNonce() != null)
-        {
-            if (serverInfo.getNonce() == null)
-            {
-                return false;
-            }
-            byte[] clientNonce = clientInfo.getNonce().toByteArray();
-            byte[] serverNonce = serverInfo.getNonce().toByteArray();
-            if (serverNonce.length < clientNonce.length)
-            {
-                return false;
-            }
-            if (!Arrays.areEqual(clientNonce, Arrays.copyOfRange(serverNonce, 0, clientNonce.length)))
-            {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    // null-protected compare of any two objects
-    private static boolean clientEqualsServer(Object client, Object server)
-    {
-        return (client == null && server == null) || (client != null && client.equals(server));
-    }
-}
-
diff --git a/bcpkix/src/main/java/org/bouncycastle/dvcs/DVCSResponse.java b/bcpkix/src/main/java/org/bouncycastle/dvcs/DVCSResponse.java
deleted file mode 100644
index ac1a6b7..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/dvcs/DVCSResponse.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package org.bouncycastle.dvcs;
-
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.cms.ContentInfo;
-import org.bouncycastle.asn1.cms.SignedData;
-import org.bouncycastle.asn1.dvcs.DVCSObjectIdentifiers;
-import org.bouncycastle.cms.CMSSignedData;
-
-/**
- * DVCResponse is general response to DVCS (RFC 3029).
- * It represents responses for all types of services.
- */
-public class DVCSResponse
-    extends DVCSMessage
-{
-    private org.bouncycastle.asn1.dvcs.DVCSResponse asn1;
-
-    /**
-     * Constructs DVCRequest from CMS SignedData object.
-     *
-     * @param signedData the CMS SignedData object containing the request
-     * @throws org.bouncycastle.dvcs.DVCSConstructionException
-     */
-    public DVCSResponse(CMSSignedData signedData)
-        throws DVCSConstructionException
-    {
-        this(SignedData.getInstance(signedData.toASN1Structure().getContent()).getEncapContentInfo());
-    }
-
-    /**
-     * Construct a DVCS Request from a ContentInfo
-     *
-     * @param contentInfo the contentInfo representing the DVCSRequest
-     * @throws org.bouncycastle.dvcs.DVCSConstructionException
-     */
-    public DVCSResponse(ContentInfo contentInfo)
-        throws DVCSConstructionException
-    {
-        super(contentInfo);
-
-        if (!DVCSObjectIdentifiers.id_ct_DVCSResponseData.equals(contentInfo.getContentType()))
-        {
-            throw new DVCSConstructionException("ContentInfo not a DVCS Request");
-        }
-
-        try
-        {
-            if (contentInfo.getContent().toASN1Primitive() instanceof ASN1Sequence)
-            {
-                this.asn1 = org.bouncycastle.asn1.dvcs.DVCSResponse.getInstance(contentInfo.getContent());
-            }
-            else
-            {
-                this.asn1 = org.bouncycastle.asn1.dvcs.DVCSResponse.getInstance(ASN1OctetString.getInstance(contentInfo.getContent()).getOctets());
-            }
-        }
-        catch (Exception e)
-        {
-            throw new DVCSConstructionException("Unable to parse content: " + e.getMessage(), e);
-        }
-    }
-
-    /**
-     * Return the ASN.1 DVCSResponse structure making up the body of this response.
-     *
-     * @return an org.bouncycastle.asn1.dvcs.DVCSResponse object.
-     */
-    public ASN1Encodable getContent()
-    {
-        return asn1;
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/dvcs/MessageImprint.java b/bcpkix/src/main/java/org/bouncycastle/dvcs/MessageImprint.java
deleted file mode 100644
index 5f4fbc1..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/dvcs/MessageImprint.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package org.bouncycastle.dvcs;
-
-import org.bouncycastle.asn1.x509.DigestInfo;
-
-public class MessageImprint
-{
-    private final DigestInfo messageImprint;
-
-    public MessageImprint(DigestInfo messageImprint)
-    {
-        this.messageImprint = messageImprint;
-    }
-
-    public DigestInfo toASN1Structure()
-    {
-        return messageImprint;
-    }
-
-    public boolean equals(Object o)
-    {
-        if (o == this)
-        {
-            return true;
-        }
-
-        if (o instanceof MessageImprint)
-        {
-            return messageImprint.equals(((MessageImprint)o).messageImprint);
-        }
-
-        return false;
-    }
-
-    public int hashCode()
-    {
-        return messageImprint.hashCode();
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/dvcs/MessageImprintBuilder.java b/bcpkix/src/main/java/org/bouncycastle/dvcs/MessageImprintBuilder.java
deleted file mode 100644
index 052d4fe..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/dvcs/MessageImprintBuilder.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package org.bouncycastle.dvcs;
-
-import java.io.OutputStream;
-
-import org.bouncycastle.asn1.x509.DigestInfo;
-import org.bouncycastle.operator.DigestCalculator;
-
-public class MessageImprintBuilder
-{
-    private final DigestCalculator digestCalculator;
-
-    public MessageImprintBuilder(DigestCalculator digestCalculator)
-    {
-        this.digestCalculator = digestCalculator;
-    }
-
-    public MessageImprint build(byte[] message)
-        throws DVCSException
-    {
-        try
-        {
-            OutputStream dOut = digestCalculator.getOutputStream();
-
-            dOut.write(message);
-
-            dOut.close();
-
-            return new MessageImprint(new DigestInfo(digestCalculator.getAlgorithmIdentifier(), digestCalculator.getDigest()));
-        }
-        catch (Exception e)
-        {
-            throw new DVCSException("unable to build MessageImprint: " + e.getMessage(), e);
-        }
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/dvcs/SignedDVCSMessageGenerator.java b/bcpkix/src/main/java/org/bouncycastle/dvcs/SignedDVCSMessageGenerator.java
deleted file mode 100644
index 68be777..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/dvcs/SignedDVCSMessageGenerator.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package org.bouncycastle.dvcs;
-
-import java.io.IOException;
-
-import org.bouncycastle.asn1.ASN1Encoding;
-import org.bouncycastle.cms.CMSException;
-import org.bouncycastle.cms.CMSProcessableByteArray;
-import org.bouncycastle.cms.CMSSignedData;
-import org.bouncycastle.cms.CMSSignedDataGenerator;
-
-public class SignedDVCSMessageGenerator
-{
-    private final CMSSignedDataGenerator signedDataGen;
-
-    public SignedDVCSMessageGenerator(CMSSignedDataGenerator signedDataGen)
-    {
-        this.signedDataGen = signedDataGen;
-    }
-
-    /**
-     * Creates a CMSSignedData object containing the passed in DVCSMessage
-     *
-     * @param message the request to be signed.
-     * @return an encapsulating SignedData object.
-     * @throws DVCSException in the event of failure to encode the request or sign it.
-     */
-    public CMSSignedData build(DVCSMessage message)
-        throws DVCSException
-    {
-        try
-        {
-            byte[] encapsulatedData = message.getContent().toASN1Primitive().getEncoded(ASN1Encoding.DER);
-
-            return signedDataGen.generate(new CMSProcessableByteArray(message.getContentType(), encapsulatedData), true);
-        }
-        catch (CMSException e)
-        {
-            throw new DVCSException("Could not sign DVCS request", e);
-        }
-        catch (IOException e)
-        {
-            throw new DVCSException("Could not encode DVCS request", e);
-        }
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/dvcs/TargetChain.java b/bcpkix/src/main/java/org/bouncycastle/dvcs/TargetChain.java
deleted file mode 100644
index 7dca8f8..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/dvcs/TargetChain.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package org.bouncycastle.dvcs;
-
-import org.bouncycastle.asn1.dvcs.TargetEtcChain;
-
-public class TargetChain
-{
-    private final TargetEtcChain certs;
-
-    public TargetChain(TargetEtcChain certs)
-    {
-        this.certs = certs;
-    }
-
-    public TargetEtcChain toASN1Structure()
-    {
-        return certs;
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/dvcs/VPKCRequestBuilder.java b/bcpkix/src/main/java/org/bouncycastle/dvcs/VPKCRequestBuilder.java
deleted file mode 100644
index 51e0307..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/dvcs/VPKCRequestBuilder.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package org.bouncycastle.dvcs;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-import org.bouncycastle.asn1.dvcs.CertEtcToken;
-import org.bouncycastle.asn1.dvcs.DVCSRequestInformationBuilder;
-import org.bouncycastle.asn1.dvcs.DVCSTime;
-import org.bouncycastle.asn1.dvcs.Data;
-import org.bouncycastle.asn1.dvcs.ServiceType;
-import org.bouncycastle.asn1.dvcs.TargetEtcChain;
-import org.bouncycastle.asn1.x509.Extension;
-import org.bouncycastle.cert.X509CertificateHolder;
-
-/**
- * Builder of DVC requests to VPKC service (Verify Public Key Certificates).
- */
-public class VPKCRequestBuilder
-    extends DVCSRequestBuilder
-{
-    private List chains = new ArrayList();
-
-    public VPKCRequestBuilder()
-    {
-        super(new DVCSRequestInformationBuilder(ServiceType.VPKC));
-    }
-
-    /**
-     * Adds a TargetChain representing a X.509 certificate to the request.
-     *
-     * @param cert the certificate to be added
-     */
-    public void addTargetChain(X509CertificateHolder cert)
-    {
-        chains.add(new TargetEtcChain(new CertEtcToken(CertEtcToken.TAG_CERTIFICATE, cert.toASN1Structure())));
-    }
-
-    /**
-     * Adds a TargetChain representing a single X.509 Extension to the request
-     *
-     * @param extension the extension to be added.
-     */
-    public void addTargetChain(Extension extension)
-    {
-        chains.add(new TargetEtcChain(new CertEtcToken(extension)));
-    }
-
-    /**
-     * Adds a X.509 certificate to the request.
-     *
-     * @param targetChain the CertChain object to be added.
-     */
-    public void addTargetChain(TargetChain targetChain)
-    {
-        chains.add(targetChain.toASN1Structure());
-    }
-
-    public void setRequestTime(Date requestTime)
-    {
-        requestInformationBuilder.setRequestTime(new DVCSTime(requestTime));
-    }
-
-    /**
-     * Build DVCS request to VPKC service.
-     *
-     * @throws DVCSException
-     */
-    public DVCSRequest build()
-        throws DVCSException
-    {
-        Data data = new Data((TargetEtcChain[])chains.toArray(new TargetEtcChain[chains.size()]));
-
-        return createDVCRequest(data);
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/dvcs/VPKCRequestData.java b/bcpkix/src/main/java/org/bouncycastle/dvcs/VPKCRequestData.java
deleted file mode 100644
index 8ddca12..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/dvcs/VPKCRequestData.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package org.bouncycastle.dvcs;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import org.bouncycastle.asn1.dvcs.Data;
-import org.bouncycastle.asn1.dvcs.TargetEtcChain;
-
-/**
- * Data piece of DVCS request to VPKC service (Verify Public Key Certificates).
- * It contains VPKC-specific interface.
- * <p>
- * This objects are constructed internally,
- * to build DVCS request to VPKC service use VPKCRequestBuilder.
- * </p>
- */
-public class VPKCRequestData
-    extends DVCSRequestData
-{
-    private List chains;
-
-    VPKCRequestData(Data data)
-        throws DVCSConstructionException
-    {
-        super(data);
-
-        TargetEtcChain[] certs = data.getCerts();
-
-        if (certs == null)
-        {
-            throw new DVCSConstructionException("DVCSRequest.data.certs should be specified for VPKC service");
-        }
-
-        chains = new ArrayList(certs.length);
-
-        for (int i = 0; i != certs.length; i++)
-        {
-            chains.add(new TargetChain(certs[i]));
-        }
-    }
-
-    /**
-     * Get contained certs choice data..
-     *
-     * @return a list of CertChain objects.
-     */
-    public List getCerts()
-    {
-        return Collections.unmodifiableList(chains);
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/dvcs/VSDRequestBuilder.java b/bcpkix/src/main/java/org/bouncycastle/dvcs/VSDRequestBuilder.java
deleted file mode 100644
index 52ca320..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/dvcs/VSDRequestBuilder.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package org.bouncycastle.dvcs;
-
-import java.io.IOException;
-import java.util.Date;
-
-import org.bouncycastle.asn1.dvcs.DVCSRequestInformationBuilder;
-import org.bouncycastle.asn1.dvcs.DVCSTime;
-import org.bouncycastle.asn1.dvcs.Data;
-import org.bouncycastle.asn1.dvcs.ServiceType;
-import org.bouncycastle.cms.CMSSignedData;
-
-/**
- * Builder of DVCS requests to VSD service (Verify Signed Document).
- */
-public class VSDRequestBuilder
-    extends DVCSRequestBuilder
-{
-    public VSDRequestBuilder()
-    {
-        super(new DVCSRequestInformationBuilder(ServiceType.VSD));
-    }
-
-    public void setRequestTime(Date requestTime)
-    {
-        requestInformationBuilder.setRequestTime(new DVCSTime(requestTime));
-    }
-
-    /**
-     * Build VSD request from CMS SignedData object.
-     *
-     * @param document
-     * @return
-     * @throws DVCSException
-     */
-    public DVCSRequest build(CMSSignedData document)
-        throws DVCSException
-    {
-        try
-        {
-            Data data = new Data(document.getEncoded());
-
-            return createDVCRequest(data);
-        }
-        catch (IOException e)
-        {
-            throw new DVCSException("Failed to encode CMS signed data", e);
-        }
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/dvcs/VSDRequestData.java b/bcpkix/src/main/java/org/bouncycastle/dvcs/VSDRequestData.java
deleted file mode 100644
index 17deb22..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/dvcs/VSDRequestData.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package org.bouncycastle.dvcs;
-
-import org.bouncycastle.asn1.dvcs.Data;
-import org.bouncycastle.cms.CMSException;
-import org.bouncycastle.cms.CMSSignedData;
-
-/**
- * Data piece of DVCS request to VSD service (Verify Signed Document).
- * It contains VSD-specific selector interface.
- * Note: the request should contain CMS SignedData object as message.
- * <p>
- * This objects are constructed internally,
- * to build DVCS request to VSD service use VSDRequestBuilder.
- * </p>
- */
-public class VSDRequestData
-    extends DVCSRequestData
-{
-    private CMSSignedData doc;
-
-    VSDRequestData(Data data)
-        throws DVCSConstructionException
-    {
-        super(data);
-        initDocument();
-    }
-
-    private void initDocument()
-        throws DVCSConstructionException
-    {
-        if (doc == null)
-        {
-            if (data.getMessage() == null)
-            {
-                throw new DVCSConstructionException("DVCSRequest.data.message should be specified for VSD service");
-            }
-            try
-            {
-                doc = new CMSSignedData(data.getMessage().getOctets());
-            }
-            catch (CMSException e)
-            {
-                throw new DVCSConstructionException("Can't read CMS SignedData from input", e);
-            }
-        }
-    }
-
-    /**
-     * Get contained message (data to be certified).
-     *
-     * @return
-     */
-    public byte[] getMessage()
-    {
-        return data.getMessage().getOctets();
-    }
-
-    /**
-     * Get the CMS SignedData object represented by the encoded message.
-     *
-     * @return
-     */
-    public CMSSignedData getParsedMessage()
-    {
-        return doc;
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/dvcs/package.html b/bcpkix/src/main/java/org/bouncycastle/dvcs/package.html
deleted file mode 100644
index aecbd70..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/dvcs/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body bgcolor="#ffffff">
-Classes for dealing "Internet X.509 Public Key Infrastructure Data Validation and Certification Server Protocols" - RFC 3029.
-</body>
-</html>
diff --git a/bcpkix/src/main/java/org/bouncycastle/dvcs/test/AllTests.java b/bcpkix/src/main/java/org/bouncycastle/dvcs/test/AllTests.java
deleted file mode 100644
index 3cfeefe..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/dvcs/test/AllTests.java
+++ /dev/null
@@ -1,239 +0,0 @@
-package org.bouncycastle.dvcs.test;
-
-import java.io.IOException;
-import java.security.KeyPair;
-import java.security.Security;
-import java.security.cert.CertificateEncodingException;
-import java.security.cert.X509Certificate;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import org.bouncycastle.asn1.dvcs.CertEtcToken;
-import org.bouncycastle.asn1.dvcs.TargetEtcChain;
-import org.bouncycastle.cert.jcajce.JcaX509CertificateHolder;
-import org.bouncycastle.cms.CMSSignedData;
-import org.bouncycastle.cms.CMSSignedDataGenerator;
-import org.bouncycastle.cms.SignerId;
-import org.bouncycastle.cms.SignerInformationVerifier;
-import org.bouncycastle.cms.SignerInformationVerifierProvider;
-import org.bouncycastle.cms.jcajce.JcaSignerInfoGeneratorBuilder;
-import org.bouncycastle.cms.jcajce.JcaSimpleSignerInfoVerifierBuilder;
-import org.bouncycastle.cms.test.CMSTestUtil;
-import org.bouncycastle.dvcs.CCPDRequestBuilder;
-import org.bouncycastle.dvcs.CCPDRequestData;
-import org.bouncycastle.dvcs.CPDRequestBuilder;
-import org.bouncycastle.dvcs.CPDRequestData;
-import org.bouncycastle.dvcs.DVCSException;
-import org.bouncycastle.dvcs.DVCSRequest;
-import org.bouncycastle.dvcs.MessageImprint;
-import org.bouncycastle.dvcs.MessageImprintBuilder;
-import org.bouncycastle.dvcs.SignedDVCSMessageGenerator;
-import org.bouncycastle.dvcs.TargetChain;
-import org.bouncycastle.dvcs.VPKCRequestBuilder;
-import org.bouncycastle.dvcs.VPKCRequestData;
-import org.bouncycastle.dvcs.VSDRequestBuilder;
-import org.bouncycastle.dvcs.VSDRequestData;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.operator.ContentSigner;
-import org.bouncycastle.operator.OperatorCreationException;
-import org.bouncycastle.operator.jcajce.JcaContentSignerBuilder;
-import org.bouncycastle.operator.jcajce.JcaDigestCalculatorProviderBuilder;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.io.Streams;
-
-public class AllTests
-    extends TestCase
-{
-    private static final String BC = BouncyCastleProvider.PROVIDER_NAME;
-
-    private static boolean initialised = false;
-
-    private static String origDN;
-    private static KeyPair origKP;
-    private static X509Certificate origCert;
-
-    private static String signDN;
-    private static KeyPair signKP;
-    private static X509Certificate signCert;
-
-    private static void init()
-        throws Exception
-    {
-        if (!initialised)
-        {
-            initialised = true;
-
-            if (Security.getProvider(BC) == null)
-            {
-                Security.addProvider(new BouncyCastleProvider());
-            }
-            origDN = "O=Bouncy Castle, C=AU";
-            origKP = CMSTestUtil.makeKeyPair();
-            origCert = CMSTestUtil.makeCertificate(origKP, origDN, origKP, origDN);
-
-            signDN = "CN=Bob, OU=Sales, O=Bouncy Castle, C=AU";
-            signKP = CMSTestUtil.makeKeyPair();
-            signCert = CMSTestUtil.makeCertificate(signKP, signDN, origKP, origDN);
-        }
-    }
-
-    public void setUp()
-        throws Exception
-    {
-        init();
-    }
-
-    private byte[] getInput(String name)
-        throws IOException
-    {
-        return Streams.readAll(getClass().getResourceAsStream(name));
-    }
-
-    public void testCCPDRequest()
-        throws Exception
-    {
-        SignedDVCSMessageGenerator gen = getSignedDVCSMessageGenerator();
-
-        CCPDRequestBuilder reqBuilder = new CCPDRequestBuilder();
-
-        MessageImprintBuilder imprintBuilder = new MessageImprintBuilder(new SHA1DigestCalculator());
-
-        MessageImprint messageImprint = imprintBuilder.build(new byte[100]);
-
-        CMSSignedData reqMsg = gen.build(reqBuilder.build(messageImprint));
-
-        assertTrue(reqMsg.verifySignatures(new SignerInformationVerifierProvider()
-        {
-            public SignerInformationVerifier get(SignerId sid)
-                throws OperatorCreationException
-            {
-                return new JcaSimpleSignerInfoVerifierBuilder().setProvider(BC).build(signCert);
-            }
-        }));
-
-        DVCSRequest request = new DVCSRequest(reqMsg);
-
-        CCPDRequestData reqData = (CCPDRequestData)request.getData();
-
-        assertEquals(messageImprint, reqData.getMessageImprint());
-    }
-
-    private CMSSignedData getWrappedCPDRequest()
-        throws OperatorCreationException, CertificateEncodingException, DVCSException, IOException
-    {
-        SignedDVCSMessageGenerator gen = getSignedDVCSMessageGenerator();
-
-        CPDRequestBuilder reqBuilder = new CPDRequestBuilder();
-
-        return gen.build(reqBuilder.build(new byte[100]));
-    }
-
-    public void testCPDRequest()
-        throws Exception
-    {
-        CMSSignedData reqMsg = getWrappedCPDRequest();
-
-        assertTrue(reqMsg.verifySignatures(new SignerInformationVerifierProvider()
-        {
-            public SignerInformationVerifier get(SignerId sid)
-                throws OperatorCreationException
-            {
-                return new JcaSimpleSignerInfoVerifierBuilder().setProvider(BC).build(signCert);
-            }
-        }));
-
-        DVCSRequest request = new DVCSRequest(reqMsg);
-
-        CPDRequestData reqData = (CPDRequestData)request.getData();
-
-        assertTrue(Arrays.areEqual(new byte[100], reqData.getMessage()));
-    }
-
-    public void testVPKCRequest()
-        throws Exception
-    {
-        SignedDVCSMessageGenerator gen = getSignedDVCSMessageGenerator();
-
-        VPKCRequestBuilder reqBuilder = new VPKCRequestBuilder();
-
-        reqBuilder.addTargetChain(new JcaX509CertificateHolder(signCert));
-
-        CMSSignedData reqMsg = gen.build(reqBuilder.build());
-
-        assertTrue(reqMsg.verifySignatures(new SignerInformationVerifierProvider()
-        {
-            public SignerInformationVerifier get(SignerId sid)
-                throws OperatorCreationException
-            {
-                return new JcaSimpleSignerInfoVerifierBuilder().setProvider(BC).build(signCert);
-            }
-        }));
-
-        DVCSRequest request = new DVCSRequest(reqMsg);
-
-        VPKCRequestData reqData = (VPKCRequestData)request.getData();
-
-        assertEquals(new TargetEtcChain(new CertEtcToken(CertEtcToken.TAG_CERTIFICATE, new JcaX509CertificateHolder(signCert).toASN1Structure())), ((TargetChain)reqData.getCerts().get(0)).toASN1Structure());
-    }
-
-    public void testVSDRequest()
-        throws Exception
-    {
-        CMSSignedData message = getWrappedCPDRequest();
-
-        SignedDVCSMessageGenerator gen = getSignedDVCSMessageGenerator();
-
-        VSDRequestBuilder reqBuilder = new VSDRequestBuilder();
-
-        CMSSignedData reqMsg = gen.build(reqBuilder.build(message));
-
-        assertTrue(reqMsg.verifySignatures(new SignerInformationVerifierProvider()
-        {
-            public SignerInformationVerifier get(SignerId sid)
-                throws OperatorCreationException
-            {
-                return new JcaSimpleSignerInfoVerifierBuilder().setProvider(BC).build(signCert);
-            }
-        }));
-
-        DVCSRequest request = new DVCSRequest(reqMsg);
-
-        VSDRequestData reqData = (VSDRequestData)request.getData();
-
-        assertEquals(message.toASN1Structure().getContentType(), reqData.getParsedMessage().toASN1Structure().getContentType());
-    }
-
-    private SignedDVCSMessageGenerator getSignedDVCSMessageGenerator()
-        throws OperatorCreationException, CertificateEncodingException
-    {
-        CMSSignedDataGenerator sigDataGen = new CMSSignedDataGenerator();
-
-        JcaDigestCalculatorProviderBuilder calculatorProviderBuilder = new JcaDigestCalculatorProviderBuilder().setProvider(BC);
-
-        ContentSigner contentSigner = new JcaContentSignerBuilder("SHA1withRSA").setProvider(BC).build(signKP.getPrivate());
-
-        sigDataGen.addSignerInfoGenerator(new JcaSignerInfoGeneratorBuilder(calculatorProviderBuilder.build()).build(contentSigner, signCert));
-
-        return new SignedDVCSMessageGenerator(sigDataGen);
-    }
-
-    public static void main(String[] args)
-        throws Exception
-    {
-        Security.addProvider(new BouncyCastleProvider());
-
-        junit.textui.TestRunner.run(suite());
-    }
-
-    public static Test suite()
-        throws Exception
-    {
-        TestSuite suite= new TestSuite("EAC tests");
-
-        suite.addTestSuite(AllTests.class);
-        suite.addTestSuite(DVCSParseTest.class);
-
-        return new DVCSTestSetup(suite);
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/dvcs/test/DVCSParseTest.java b/bcpkix/src/main/java/org/bouncycastle/dvcs/test/DVCSParseTest.java
deleted file mode 100644
index 90a46b4..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/dvcs/test/DVCSParseTest.java
+++ /dev/null
@@ -1,390 +0,0 @@
-package org.bouncycastle.dvcs.test;
-
-import java.io.IOException;
-import java.math.BigInteger;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import junit.framework.TestCase;
-import org.bouncycastle.asn1.ASN1GeneralizedTime;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.cmp.PKIStatus;
-import org.bouncycastle.asn1.cmp.PKIStatusInfo;
-import org.bouncycastle.asn1.dvcs.CertEtcToken;
-import org.bouncycastle.asn1.dvcs.DVCSCertInfo;
-import org.bouncycastle.asn1.dvcs.DVCSCertInfoBuilder;
-import org.bouncycastle.asn1.dvcs.DVCSErrorNotice;
-import org.bouncycastle.asn1.dvcs.DVCSRequest;
-import org.bouncycastle.asn1.dvcs.DVCSRequestInformation;
-import org.bouncycastle.asn1.dvcs.DVCSRequestInformationBuilder;
-import org.bouncycastle.asn1.dvcs.DVCSResponse;
-import org.bouncycastle.asn1.dvcs.DVCSTime;
-import org.bouncycastle.asn1.dvcs.Data;
-import org.bouncycastle.asn1.dvcs.ServiceType;
-import org.bouncycastle.asn1.dvcs.TargetEtcChain;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.asn1.x509.Certificate;
-import org.bouncycastle.asn1.x509.DigestInfo;
-import org.bouncycastle.asn1.x509.GeneralName;
-import org.bouncycastle.asn1.x509.PolicyInformation;
-import org.bouncycastle.cms.CMSException;
-import org.bouncycastle.cms.CMSSignedData;
-import org.bouncycastle.dvcs.DVCSException;
-import org.bouncycastle.util.encoders.Base64;
-import org.bouncycastle.util.encoders.Hex;
-
-public class DVCSParseTest
-    extends TestCase
-{
-
-    // Clepsydre requests and responses
-    private static final String REQUEST_CCPD_CLEPSYDRE = "MIICRgYJKoZIhvcNAQcCoIICNzCCAjMCAQMxCzAJBgUrDgMCGgUAMIGZBgsqhkiG9w0BCRABB6CBiQSBhjCBgzBgCgEEoE2kSzBJMQswCQYDVQQGEwJGUjEOMAwGA1UEBxMFUGFyaXMxEDAOBgNVBAoTB0VkZWxXZWIxGDAWBgNVBAMTD1BldGVyIFN5bHZlc3RlcqEMBgorBgEEAak9AQIBMB8wBwYFKw4DAhoEFHW2ha9viUZ96AcVJR5Fl4/NH6VmMYIBgzCCAX8CAQEwfDBwMQswCQYDVQQGEwJGUjEVMBMGA1UEChMMRWRlbFdlYiBTLkEuMSgwJgYDVQQLEx9DbGVwc3lkcmUgRGVtb25zdHJhdGlvbiBTZXJ2aWNlMSAwHgYDVQQDExdUaW1lIFN0YW1waW5nIEF1dGhvcml0eQIIAJSIFyE0N3YwCQYFKw4DAhoFAKBfMBoGCSqGSIb3DQEJAzENBgsqhkiG9w0BCRABBzAcBgkqhkiG9w0BCQUxDxcNMDAwNDE3MTcxNDU3WjAjBgkqhkiG9w0BCQQxFgQUTajC0s58DQRBL0QTM3XbL1st+dwwDQYJKoZIhvcNAQEBBQAEgYBuew429QhfFjwxeyi7C8LGF2emtVTxmOJviZYODJnmy0DBm43Y147TK0H3FiZbtwi/5pWy2QFs/rEsUsFa0jHzjsrdEaFyBSlBat0oQKpcd8adHYBT22+cTKWjj5KLGD/VOq0Bh2nD/dPYw9DKa+YNTlNuUCCZfJTCRCUbBsCZlg==";
-    private static final String RESPONSE_CCPD_CLEPSYDRE = "MIIH9wYJKoZIhvcNAQcCoIIH6DCCB+QCAQMxCzAJBgUrDgMCGgUAMIIBLQYLKoZIhvcNAQkQAQigggEcBIIBGDCCARQwgdYKAQSgTaRLMEkxCzAJBgNVBAYTAkZSMQ4wDAYDVQQHEwVQYXJpczEQMA4GA1UEChMHRWRlbFdlYjEYMBYGA1UEAxMPUGV0ZXIgU3lsdmVzdGVyoQwGCisGAQQBqT0BAgGidKRyMHAxCzAJBgNVBAYTAkZSMRUwEwYDVQQKEwxFZGVsV2ViIFMuQS4xKDAmBgNVBAsTH0NsZXBzeWRyZSBEZW1vbnN0cmF0aW9uIFNlcnZpY2UxIDAeBgNVBAMTF1RpbWUgU3RhbXBpbmcgQXV0aG9yaXR5MB8wBwYFKw4DAhoEFHW2ha9viUZ96AcVJR5Fl4/NH6VmAgcBeAoeyogjGA8yMDAwMDQxNzE3MTYxN1qgggPgMIID3DCCAsSgAwIBAgIIAJSIFxdkNzIwDQYJKoZIhvcNAQEEBQAwcDELMAkGA1UEBhMCRlIxFTATBgNVBAoTDEVkZWxXZWIgUy5BLjEoMCYGA1UECxMfQ2xlcHN5ZHJlIERlbW9uc3RyYXRpb24gU2VydmljZTEgMB4GA1UEAxMXVGltZSBTdGFtcGluZyBBdXRob3JpdHkwHhcNMDAwMTI1MTYxOTM4WhcNMjAwMTIwMTYxOTM4WjBwMQswCQYDVQQGEwJGUjEVMBMGA1UEChMMRWRlbFdlYiBTLkEuMSgwJgYDVQQLEx9DbGVwc3lkcmUgRGVtb25zdHJhdGlvbiBTZXJ2aWNlMSAwHgYDVQQDExdUaW1lIFN0YW1waW5nIEF1dGhvcml0eTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAPrDF67rt53rq70FfjlDbQRFWHQFpczzbC+Mjnd+wp8SEVx9274jKJqQ0qvGorq9o36ZppkhpdiQuc+nI06gVqDBCkaJjjyRZzf9m6tJF/xKpfLkTG7jahySlwRvfwxc+3TLlX5Mw1gS6KnW8N0SRBXniy6vUcAMX6hl/EehyZgf1OHqvBwaJ7uLVvESVRD0jtifGZwegffbY92INz9xeVuW4l+C1RIZBQ3hPaVtZuQsHu3HTLjfqjjIFWquJX1GKgf5g3fEUe6Q3AXQw/DxX+jU7V00cJGdnwhVfVvljV81WYNOchm7nIjRevwjpYSZtBeKTWyd0KY1gF/K+ySLVB0CAwEAAaN6MHgwDwYDVR0TBAgwBgEB/wIBADAWBgNVHSUBAf8EDDAKBggrBgEFBQcDCjBNBggrBgEFBQcBAQEB/wQ+MDwwOgYIKwYBBQUHMASGLmh0dHBzOi8vY2xlcHN5ZHJlLmVkZWx3ZWIuZnIvZHZjcy9zZXJ2aWNlLWNjcGQwDQYJKoZIhvcNAQEEBQADggEBAAjar1sJOWbTvoAd13K1LKME+0b4BfW/g/NtbTIoHEbuD+owYYoeigNOmIFgH5cXU9FUcz9ymEXTEJrTd7h0DpqQKY6spOvSJG32IR0/Uoss5pLnUsZUk5G8V3QhODl1zTBJVBOUbP7xZDgfX3274D6o8Sgc8dko+jIeO0i/XHAhKe++ciTaDflRev7X9f/owurGTEUUUVP9ANVbzGcqI5QxnsKQOJuw3/neZwxXXNew/PJylsTRep2g5lEkmZ6Jxjn5cnpE/S0/vN/HJSeUobV9ugZ1ZxyVbL0sdEE+zc05XC6cw8MJ43nV64Xo8XIpgPbGbmEbWPyHPtnhUxDgsQUxggK7MIICtwIBATB8MHAxCzAJBgNVBAYTAkZSMRUwEwYDVQQKEwxFZGVsV2ViIFMuQS4xKDAmBgNVBAsTH0NsZXBzeWRyZSBEZW1vbnN0cmF0aW9uIFNlcnZpY2UxIDAeBgNVBAMTF1RpbWUgU3RhbXBpbmcgQXV0aG9yaXR5AggAlIglcjUnUDAJBgUrDgMCGgUAoIIBFDAaBgkqhkiG9w0BCQMxDQYLKoZIhvcNAQkQAQgwHAYJKoZIhvcNAQkFMQ8XDTAwMDQxNzE3MTYxOVowIwYJKoZIhvcNAQkEMRYEFGhQ3JAgLsLwVRV/d6mmDDTMEwb6MIGyBgsqhkiG9w0BCRACDDGBojCBnzCBnDCBmQQUXPEY80rKtGfW2Of4O0rZejKlQ6UwgYAwdKRyMHAxCzAJBgNVBAYTAkZSMRUwEwYDVQQKEwxFZGVsV2ViIFMuQS4xKDAmBgNVBAsTH0NsZXBzeWRyZSBEZW1vbnN0cmF0aW9uIFNlcnZpY2UxIDAeBgNVBAMTF1RpbWUgU3RhbXBpbmcgQXV0aG9yaXR5AggAlIglcjUnUDANBgkqhkiG9w0BAQEFAASCAQAucJ9WXgFWqeFHgRI1ISkJFnrtRflaou3k/p0s5NoSZmIUWWGLUHsBgj29fuY40KigN5h5EyY5KcZyIKmVcedTf3l3mO8jAk65vZCbrAWicI86QjacLLCUsSsLNpQOeA6w0QkgY7z/zTLxWtOrn5OcWqNYmaAoEeCATU0edwT0UAfVi1SgIzL/ppziurjbVUfJyLoH75AUSKi2xXzVqSB0HFbvjxuz/IdtgfHUbxqHMJJHaeB54LwQmc9NNkw2A1Fy0VumHi2G8R8K6L/rOPnOGuywj1GuKjtGhL9NjJ/uH+/FNaNjvjjAA3w6XrjPOxgQiNu7T3j2++QcjdT4++tQ";
-    // Top-Cross requests and responses
-    private static final String REQUEST_CPD_TOMSK = "MIIJWgYJKoZIhvcNAQcCoIIJSzCCCUcCAQMxDDAKBgYqhQMCAgkFADCCBFwGCyqGSIb3DQEJEAEHoIIESwSCBEcwggRDMAkKAQECBA33L7cEggQcMIIEGDCCA8WgAwIBAgIKTOD69wAAAAA80DAKBgYqhQMCAgMFADCB5zEbMBkGCSqGSIb3DQEJARYMdWRjc0B1ZGNzLnJ1MQswCQYDVQQGEwJSVTEXMBUGA1UECB4OBCIEPgQ8BEEEOgQwBE8xEzARBgNVBAceCgQiBD4EPARBBDoxRzBFBgNVBAoTPlRvbXNrIFN0YXRlIFVuaXZlcnNpdHkgb2YgQ29udHJvbCBTeXN0ZW1zIGFuZCBSYWRpb2VsZWN0cm9uaWNzMScwJQYDVQQLHh4EJgQiBBEAIAAtACAEIwQmACAEIQQ4BDEEOARABDgxGzAZBgNVBAMTElVEQyBTaWJpcmlhIFRTVUNTUjAeFw0xMjExMTIwMzI4MDBaFw0xMzAzMDMwNjE5MDBaMIHRMSgwJgYJKoZIhvcNAQkBFhl0ZXN0X3VkY3NAY3RiLnJrLnR1c3VyLnJ1MQswCQYDVQQGEwJSVTETMBEGA1UEBwwK0KLQvtC80YHQujE9MDsGA1UECgw00KPQtNC+0YHRgtC+0LLQtdGA0Y/RjtGJ0LjQuSDQptC10L3RgtGAINCh0LjQsdC40YDQuDFEMEIGA1UEAww70KLQtdGB0YLQvtCy0YvQuSDQn9C+0LvRjNC30L7QstCw0YLQtdC70Ywg0KPQpiDQodC40LHQuNGA0LgwYzAcBgYqhQMCAhMwEgYHKoUDAgIkAAYHKoUDAgIeAQNDAARAR01H5PIXecUsIknQwHuiDRSy5k4uNezKe7zETWfhPb9Bm0+djzJkEc13t2IeMwLHXVOla91gFoSbhfWRYp07WKOCAWEwggFdMA4GA1UdDwEB/wQEAwIE8DAmBgNVHSUEHzAdBggrBgEFBQcDBAYHKoUDAgIiBgYIKwYBBQUHAwIwHQYDVR0OBBYEFOJVTSiR/zqkOU0HtBcR1AtX2CU9MB8GA1UdIwQYMBaAFLkeioDYZtqO5B8ojEBYjFzq1uciMFoGA1UdHwRTMFEwT6BNoEuGI2h0dHA6Ly93d3cudWRjcy5ydS9jZXJ0c3J2L3VkY3MuY3JshiRodHRwOi8vd3d3Mi51ZGNzLnJ1L2NlcnRzcnYvdWRjcy5jcmwwcQYIKwYBBQUHAQEEZTBjMC8GCCsGAQUFBzAChiNodHRwOi8vd3d3LnVkY3MucnUvY2VydHNydi91ZGNzLmNlcjAwBggrBgEFBQcwAoYkaHR0cDovL3d3dzIudWRjcy5ydS9jZXJ0c3J2L3VkY3MuY2VyMBQGA1UdIAQNMAswCQYHKoUDAxMCBDAKBgYqhQMCAgMFAANBABGJw/oHPHm0aRdmKW8LHcITCO7sA0BrAxzZQlV0USmZGS5VKPCgnpdoPQbsW4ynnxTivDfh8ZAJGcKVZ9kiD/SgFgYLKoUDAhUBAQIBAwKgBwIFAIW6DUGgggN0MIIDcDCCAx2gAwIBAgIKJjs9ewAAAAA3FDAKBgYqhQMCAgMFADCB5zEbMBkGCSqGSIb3DQEJARYMdWRjc0B1ZGNzLnJ1MQswCQYDVQQGEwJSVTEXMBUGA1UECB4OBCIEPgQ8BEEEOgQwBE8xEzARBgNVBAceCgQiBD4EPARBBDoxRzBFBgNVBAoTPlRvbXNrIFN0YXRlIFVuaXZlcnNpdHkgb2YgQ29udHJvbCBTeXN0ZW1zIGFuZCBSYWRpb2VsZWN0cm9uaWNzMScwJQYDVQQLHh4EJgQiBBEAIAAtACAEIwQmACAEIQQ4BDEEOARABDgxGzAZBgNVBAMTElVEQyBTaWJpcmlhIFRTVUNTUjAeFw0xMTEyMDcwNDI0MDBaFw0xMjEyMDcwNDMzMDBaMB8xHTAbBgNVBAMeFABSAEMAQQBJAFIAXwB0AGUAYwBoMGMwHAYGKoUDAgITMBIGByqFAwICJAAGByqFAwICHgEDQwAEQLgMQUEkI9li1pn4dHHEWv5SSCjI77W6wfG3mSzEKw0vd3qQUTd86xZGAEwVC2dxJIdiQlSuMtyog6vSau3FriKjggFsMIIBaDAOBgNVHQ8BAf8EBAMCBPAwMAYDVR0lBCkwJwYIKwYBBQUHAwQGCCqFAwMTAgUCBgcqhQMCAiIGBggrBgEFBQcDAjAdBgNVHQ4EFgQU/hZ+9/9Tt/94ckUhTWabJMCegqQwHwYDVR0jBBgwFoAUuR6KgNhm2o7kHyiMQFiMXOrW5yIwWgYDVR0fBFMwUTBPoE2gS4YjaHR0cDovL3d3dy51ZGNzLnJ1L2NlcnRzcnYvdWRjcy5jcmyGJGh0dHA6Ly93d3cyLnVkY3MucnUvY2VydHNydi91ZGNzLmNybDBxBggrBgEFBQcBAQRlMGMwLwYIKwYBBQUHMAKGI2h0dHA6Ly93d3cudWRjcy5ydS9jZXJ0c3J2L3VkY3MuY2VyMDAGCCsGAQUFBzAChiRodHRwOi8vd3d3Mi51ZGNzLnJ1L2NlcnRzcnYvdWRjcy5jZXIwFQYDVR0gBA4wDDAKBggqhQMDEwIFATAKBgYqhQMCAgMFAANBALCWVdYVTPSLtijWd6utGC/rtl0mGvU3UjyaHC2jbFovDwyRpx13BseqbcsxBA+aNabeH2WuEQMirhVt7lpV4jMxggFaMIIBVgIBATCB9jCB5zEbMBkGCSqGSIb3DQEJARYMdWRjc0B1ZGNzLnJ1MQswCQYDVQQGEwJSVTEXMBUGA1UECB4OBCIEPgQ8BEEEOgQwBE8xEzARBgNVBAceCgQiBD4EPARBBDoxRzBFBgNVBAoTPlRvbXNrIFN0YXRlIFVuaXZlcnNpdHkgb2YgQ29udHJvbCBTeXN0ZW1zIGFuZCBSYWRpb2VsZWN0cm9uaWNzMScwJQYDVQQLHh4EJgQiBBEAIAAtACAEIwQmACAEIQQ4BDEEOARABDgxGzAZBgNVBAMTElVEQyBTaWJpcmlhIFRTVUNTUgIKJjs9ewAAAAA3FDAKBgYqhQMCAgkFADAKBgYqhQMCAhMFAARAMdcEVUhDQ9XZl5Pu2N9At4a2y34fQY0uCQvIq47gOk0MBAXmTfT+7sJsTk1RMTMoeopDd+W7r3qO7isleghpgQ==";
-    private static final String RESPONSE_CPD_TOMSK = "MIIGuQYJKoZIhvcNAQcCoIIGqjCCBqYCAQMxDDAKBgYqhQMCAgkFADBvBgsqhkiG9w0BCRABCKBgBF4wXDAJCgEBAgR0q0Q5MDUwEQYGKoUDAgIJBgcqhQMCAh4BBCC+uAKu1Kom7NbBYTtd6VC/RwHvV6FxeSH86KR7Oq+XVgICGLkYDzIwMTIxMjA1MDY1NzIwWqADAgEAoIIEczCCBG8wggQcoAMCAQICCjBVmIkAAAAANVowCgYGKoUDAgIDBQAwgecxGzAZBgkqhkiG9w0BCQEWDHVkY3NAdWRjcy5ydTELMAkGA1UEBhMCUlUxFzAVBgNVBAgeDgQiBD4EPARBBDoEMARPMRMwEQYDVQQHHgoEIgQ+BDwEQQQ6MUcwRQYDVQQKEz5Ub21zayBTdGF0ZSBVbml2ZXJzaXR5IG9mIENvbnRyb2wgU3lzdGVtcyBhbmQgUmFkaW9lbGVjdHJvbmljczEnMCUGA1UECx4eBCYEIgQRACAALQAgBCMEJgAgBCEEOAQxBDgEQAQ4MRswGQYDVQQDExJVREMgU2liaXJpYSBUU1VDU1IwHhcNMTExMDIwMTAyNzAwWhcNMTMwMTIwMTAzNjAwWjCCATgxCzAJBgNVBAYTAlJVMRMwEQYDVQQHHgoEIgQeBBwEIQQaMUMwQQYDVQQKHjoEEAQ0BDwEOAQ9BDgEQQRCBEAEMARGBDgETwAgBCIEPgQ8BEEEOgQ+BDkAIAQ+BDEEOwQwBEEEQgQ4MYGBMH8GA1UECx54BBoEPgQ8BDgEQgQ1BEIAIAQ4BD0ERAQ+BEAEPAQwBEIEOAQ3BDAERgQ4BDgAIAQ4ACAEQQQyBE8ENwQ4ACAEEAQ0BDwEOAQ9BDgEQQRCBEAEMARGBDgEOAAgBCIEPgQ8BEEEOgQ+BDkAIAQ+BDEEOwQwBEEEQgQ4MUswSQYDVQQDHkIELQQbBBUEGgQiBCAEHgQdBB0EKwQZACAEHQQeBCIEEAQgBBgEEAQiACAAKABEAFYAQwBTACwAIABPAEMAUwBQACkwYzAcBgYqhQMCAhMwEgYHKoUDAgIkAAYHKoUDAgIeAQNDAARAijmkemSx9EYvcgxb7/O1AHd5r4mH6V6L97UyX/GGg9geywTqm/sPuq/wuVicW82f/f7huHHlIlUf5ejTwpH53aOCAVAwggFMMB0GA1UdJQQWMBQGCCsGAQUFBwMJBggrBgEFBQcDCjALBgNVHQ8EBAMCBsAwDwYJKwYBBQUHMAEFBAIFADAdBgNVHQ4EFgQUX5qI5TV4fjSwaGkElbHRedmg2NgwHwYDVR0jBBgwFoAUuR6KgNhm2o7kHyiMQFiMXOrW5yIwWgYDVR0fBFMwUTBPoE2gS4YjaHR0cDovL3d3dy51ZGNzLnJ1L2NlcnRzcnYvdWRjcy5jcmyGJGh0dHA6Ly93d3cyLnVkY3MucnUvY2VydHNydi91ZGNzLmNybDBxBggrBgEFBQcBAQRlMGMwLwYIKwYBBQUHMAKGI2h0dHA6Ly93d3cudWRjcy5ydS9jZXJ0c3J2L3VkY3MuY2VyMDAGCCsGAQUFBzAChiRodHRwOi8vd3d3Mi51ZGNzLnJ1L2NlcnRzcnYvdWRjcy5jZXIwCgYGKoUDAgIDBQADQQAw+l6X2T9zF2FtGiTvssRq0RGNaJ9d9P07qSt+gJ9gnveOnD4o8pVqCM+IgXfUrmh9IHRJ+u2LnhkDo8bUbOpIMYIBqTCCAaUCAQEwgfYwgecxGzAZBgkqhkiG9w0BCQEWDHVkY3NAdWRjcy5ydTELMAkGA1UEBhMCUlUxFzAVBgNVBAgeDgQiBD4EPARBBDoEMARPMRMwEQYDVQQHHgoEIgQ+BDwEQQQ6MUcwRQYDVQQKEz5Ub21zayBTdGF0ZSBVbml2ZXJzaXR5IG9mIENvbnRyb2wgU3lzdGVtcyBhbmQgUmFkaW9lbGVjdHJvbmljczEnMCUGA1UECx4eBCYEIgQRACAALQAgBCMEJgAgBCEEOAQxBDgEQAQ4MRswGQYDVQQDExJVREMgU2liaXJpYSBUU1VDU1ICCjBVmIkAAAAANVowCgYGKoUDAgIJBQCgTTAvBgkqhkiG9w0BCQQxIgQgm+Q/Zv0Y8bLGF6nUo1K6Tvdwda2tAOQIoJPeCOR4IfIwGgYJKoZIhvcNAQkDMQ0GCyqGSIb3DQEJEAEIMAoGBiqFAwICEwUABECBRv1CPSBsCsV1eczuPz3w3+Px1xfbZCWVUyJJ+mcfo4B9UxeBEuQxMXSS2B+r1162ZDcnn3ZHAJ8M1rwH4mms";
-    //    private static final String REQUEST_VSD_TOMSK   = "";
-//    private static final String RESPONSE_VSD_TOMSK  = "";
-    private static final String REQUEST_VPKC_TOMSK = "MIIJXwYJKoZIhvcNAQcCoIIJUDCCCUwCAQMxDDAKBgYqhQMCAgkFADCCBGEGCyqGSIb3DQEJEAEHoIIEUASCBEwwggRIMAoKAQMCBQDT+FBRoIIEIDCCBBygggQYMIIDxaADAgECAgpM4Pr3AAAAADzQMAoGBiqFAwICAwUAMIHnMRswGQYJKoZIhvcNAQkBFgx1ZGNzQHVkY3MucnUxCzAJBgNVBAYTAlJVMRcwFQYDVQQIHg4EIgQ+BDwEQQQ6BDAETzETMBEGA1UEBx4KBCIEPgQ8BEEEOjFHMEUGA1UEChM+VG9tc2sgU3RhdGUgVW5pdmVyc2l0eSBvZiBDb250cm9sIFN5c3RlbXMgYW5kIFJhZGlvZWxlY3Ryb25pY3MxJzAlBgNVBAseHgQmBCIEEQAgAC0AIAQjBCYAIAQhBDgEMQQ4BEAEODEbMBkGA1UEAxMSVURDIFNpYmlyaWEgVFNVQ1NSMB4XDTEyMTExMjAzMjgwMFoXDTEzMDMwMzA2MTkwMFowgdExKDAmBgkqhkiG9w0BCQEWGXRlc3RfdWRjc0BjdGIucmsudHVzdXIucnUxCzAJBgNVBAYTAlJVMRMwEQYDVQQHDArQotC+0LzRgdC6MT0wOwYDVQQKDDTQo9C00L7RgdGC0L7QstC10YDRj9GO0YnQuNC5INCm0LXQvdGC0YAg0KHQuNCx0LjRgNC4MUQwQgYDVQQDDDvQotC10YHRgtC+0LLRi9C5INCf0L7Qu9GM0LfQvtCy0LDRgtC10LvRjCDQo9CmINCh0LjQsdC40YDQuDBjMBwGBiqFAwICEzASBgcqhQMCAiQABgcqhQMCAh4BA0MABEBHTUfk8hd5xSwiSdDAe6INFLLmTi417Mp7vMRNZ+E9v0GbT52PMmQRzXe3Yh4zAsddU6Vr3WAWhJuF9ZFinTtYo4IBYTCCAV0wDgYDVR0PAQH/BAQDAgTwMCYGA1UdJQQfMB0GCCsGAQUFBwMEBgcqhQMCAiIGBggrBgEFBQcDAjAdBgNVHQ4EFgQU4lVNKJH/OqQ5TQe0FxHUC1fYJT0wHwYDVR0jBBgwFoAUuR6KgNhm2o7kHyiMQFiMXOrW5yIwWgYDVR0fBFMwUTBPoE2gS4YjaHR0cDovL3d3dy51ZGNzLnJ1L2NlcnRzcnYvdWRjcy5jcmyGJGh0dHA6Ly93d3cyLnVkY3MucnUvY2VydHNydi91ZGNzLmNybDBxBggrBgEFBQcBAQRlMGMwLwYIKwYBBQUHMAKGI2h0dHA6Ly93d3cudWRjcy5ydS9jZXJ0c3J2L3VkY3MuY2VyMDAGCCsGAQUFBzAChiRodHRwOi8vd3d3Mi51ZGNzLnJ1L2NlcnRzcnYvdWRjcy5jZXIwFAYDVR0gBA0wCzAJBgcqhQMDEwIEMAoGBiqFAwICAwUAA0EAEYnD+gc8ebRpF2YpbwsdwhMI7uwDQGsDHNlCVXRRKZkZLlUo8KCel2g9BuxbjKefFOK8N+HxkAkZwpVn2SIP9KAWBgsqhQMCFQEBAgEDAqAHAgUArjROZKCCA3QwggNwMIIDHaADAgECAgomOz17AAAAADcUMAoGBiqFAwICAwUAMIHnMRswGQYJKoZIhvcNAQkBFgx1ZGNzQHVkY3MucnUxCzAJBgNVBAYTAlJVMRcwFQYDVQQIHg4EIgQ+BDwEQQQ6BDAETzETMBEGA1UEBx4KBCIEPgQ8BEEEOjFHMEUGA1UEChM+VG9tc2sgU3RhdGUgVW5pdmVyc2l0eSBvZiBDb250cm9sIFN5c3RlbXMgYW5kIFJhZGlvZWxlY3Ryb25pY3MxJzAlBgNVBAseHgQmBCIEEQAgAC0AIAQjBCYAIAQhBDgEMQQ4BEAEODEbMBkGA1UEAxMSVURDIFNpYmlyaWEgVFNVQ1NSMB4XDTExMTIwNzA0MjQwMFoXDTEyMTIwNzA0MzMwMFowHzEdMBsGA1UEAx4UAFIAQwBBAEkAUgBfAHQAZQBjAGgwYzAcBgYqhQMCAhMwEgYHKoUDAgIkAAYHKoUDAgIeAQNDAARAuAxBQSQj2WLWmfh0ccRa/lJIKMjvtbrB8beZLMQrDS93epBRN3zrFkYATBULZ3Ekh2JCVK4y3KiDq9Jq7cWuIqOCAWwwggFoMA4GA1UdDwEB/wQEAwIE8DAwBgNVHSUEKTAnBggrBgEFBQcDBAYIKoUDAxMCBQIGByqFAwICIgYGCCsGAQUFBwMCMB0GA1UdDgQWBBT+Fn73/1O3/3hyRSFNZpskwJ6CpDAfBgNVHSMEGDAWgBS5HoqA2GbajuQfKIxAWIxc6tbnIjBaBgNVHR8EUzBRME+gTaBLhiNodHRwOi8vd3d3LnVkY3MucnUvY2VydHNydi91ZGNzLmNybIYkaHR0cDovL3d3dzIudWRjcy5ydS9jZXJ0c3J2L3VkY3MuY3JsMHEGCCsGAQUFBwEBBGUwYzAvBggrBgEFBQcwAoYjaHR0cDovL3d3dy51ZGNzLnJ1L2NlcnRzcnYvdWRjcy5jZXIwMAYIKwYBBQUHMAKGJGh0dHA6Ly93d3cyLnVkY3MucnUvY2VydHNydi91ZGNzLmNlcjAVBgNVHSAEDjAMMAoGCCqFAwMTAgUBMAoGBiqFAwICAwUAA0EAsJZV1hVM9Iu2KNZ3q60YL+u2XSYa9TdSPJocLaNsWi8PDJGnHXcGx6ptyzEED5o1pt4fZa4RAyKuFW3uWlXiMzGCAVowggFWAgEBMIH2MIHnMRswGQYJKoZIhvcNAQkBFgx1ZGNzQHVkY3MucnUxCzAJBgNVBAYTAlJVMRcwFQYDVQQIHg4EIgQ+BDwEQQQ6BDAETzETMBEGA1UEBx4KBCIEPgQ8BEEEOjFHMEUGA1UEChM+VG9tc2sgU3RhdGUgVW5pdmVyc2l0eSBvZiBDb250cm9sIFN5c3RlbXMgYW5kIFJhZGlvZWxlY3Ryb25pY3MxJzAlBgNVBAseHgQmBCIEEQAgAC0AIAQjBCYAIAQhBDgEMQQ4BEAEODEbMBkGA1UEAxMSVURDIFNpYmlyaWEgVFNVQ1NSAgomOz17AAAAADcUMAoGBiqFAwICCQUAMAoGBiqFAwICEwUABEAk1zo3ySf6aEM4r58ECqQckUfZIdKXX6+eZusE2pNLcpL9u+x4igzroaZ29u3Tan1t//ehxYk4TFGJ9GCyWkG9";
-    private static final String RESPONSE_VPKC_TOMSK = "MIIhoQYJKoZIhvcNAQcCoIIhkjCCIY4CAQMxDDAKBgYqhQMCAgkFADCCFzkGCyqGSIb3DQEJEAEIoIIXKASCFyQwghcgMAoKAQMCBQDT+FBRMDUwEQYGKoUDAgIJBgcqhQMCAh4BBCD9l6MZHJXSrXM8Eavg5q6wga+HNRd/UPawjCnTqv6N5wICGHEYDzIwMTIxMjA0MDQwNzUzWqADAgEAo4IWvzCCFrugggQYMIIDxaADAgECAgpM4Pr3AAAAADzQMAoGBiqFAwICAwUAMIHnMRswGQYJKoZIhvcNAQkBFgx1ZGNzQHVkY3MucnUxCzAJBgNVBAYTAlJVMRcwFQYDVQQIHg4EIgQ+BDwEQQQ6BDAETzETMBEGA1UEBx4KBCIEPgQ8BEEEOjFHMEUGA1UEChM+VG9tc2sgU3RhdGUgVW5pdmVyc2l0eSBvZiBDb250cm9sIFN5c3RlbXMgYW5kIFJhZGlvZWxlY3Ryb25pY3MxJzAlBgNVBAseHgQmBCIEEQAgAC0AIAQjBCYAIAQhBDgEMQQ4BEAEODEbMBkGA1UEAxMSVURDIFNpYmlyaWEgVFNVQ1NSMB4XDTEyMTExMjAzMjgwMFoXDTEzMDMwMzA2MTkwMFowgdExKDAmBgkqhkiG9w0BCQEWGXRlc3RfdWRjc0BjdGIucmsudHVzdXIucnUxCzAJBgNVBAYTAlJVMRMwEQYDVQQHDArQotC+0LzRgdC6MT0wOwYDVQQKDDTQo9C00L7RgdGC0L7QstC10YDRj9GO0YnQuNC5INCm0LXQvdGC0YAg0KHQuNCx0LjRgNC4MUQwQgYDVQQDDDvQotC10YHRgtC+0LLRi9C5INCf0L7Qu9GM0LfQvtCy0LDRgtC10LvRjCDQo9CmINCh0LjQsdC40YDQuDBjMBwGBiqFAwICEzASBgcqhQMCAiQABgcqhQMCAh4BA0MABEBHTUfk8hd5xSwiSdDAe6INFLLmTi417Mp7vMRNZ+E9v0GbT52PMmQRzXe3Yh4zAsddU6Vr3WAWhJuF9ZFinTtYo4IBYTCCAV0wDgYDVR0PAQH/BAQDAgTwMCYGA1UdJQQfMB0GCCsGAQUFBwMEBgcqhQMCAiIGBggrBgEFBQcDAjAdBgNVHQ4EFgQU4lVNKJH/OqQ5TQe0FxHUC1fYJT0wHwYDVR0jBBgwFoAUuR6KgNhm2o7kHyiMQFiMXOrW5yIwWgYDVR0fBFMwUTBPoE2gS4YjaHR0cDovL3d3dy51ZGNzLnJ1L2NlcnRzcnYvdWRjcy5jcmyGJGh0dHA6Ly93d3cyLnVkY3MucnUvY2VydHNydi91ZGNzLmNybDBxBggrBgEFBQcBAQRlMGMwLwYIKwYBBQUHMAKGI2h0dHA6Ly93d3cudWRjcy5ydS9jZXJ0c3J2L3VkY3MuY2VyMDAGCCsGAQUFBzAChiRodHRwOi8vd3d3Mi51ZGNzLnJ1L2NlcnRzcnYvdWRjcy5jZXIwFAYDVR0gBA0wCzAJBgcqhQMDEwIEMAoGBiqFAwICAwUAA0EAEYnD+gc8ebRpF2YpbwsdwhMI7uwDQGsDHNlCVXRRKZkZLlUo8KCel2g9BuxbjKefFOK8N+HxkAkZwpVn2SIP9DCCEpukghKSMIISPwIBATAKBgYqhQMCAgMFADCB5zEbMBkGCSqGSIb3DQEJARYMdWRjc0B1ZGNzLnJ1MQswCQYDVQQGEwJSVTEXMBUGA1UECB4OBCIEPgQ8BEEEOgQwBE8xEzARBgNVBAceCgQiBD4EPARBBDoxRzBFBgNVBAoTPlRvbXNrIFN0YXRlIFVuaXZlcnNpdHkgb2YgQ29udHJvbCBTeXN0ZW1zIGFuZCBSYWRpb2VsZWN0cm9uaWNzMScwJQYDVQQLHh4EJgQiBBEAIAAtACAEIwQmACAEIQQ4BDEEOARABDgxGzAZBgNVBAMTElVEQyBTaWJpcmlhIFRTVUNTUhcNMTIxMjAzMjMxNDQyWhcNMTIxMjA0MTEzNDQyWjCCEMIwKQIKY9ERPQAAAAA39BcNMTIwNTI5MDU0MTQyWjAMMAoGA1UdFQQDCgEFMCkCClMQVqAAAAAAPJ0XDTEyMDUwNDA2NDAwN1owDDAKBgNVHRUEAwoBBTApAgpzVc4NAAAAADhZFw0xMjA1MDIwNTM4MDdaMAwwCgYDVR0VBAMKAQUwKQIKSug0MAAAAAA3rBcNMTIwNDA1MTAwMTA4WjAMMAoGA1UdFQQDCgEFMCkCClm0GYoAAAAAPLAXDTEyMDMwMjA4MTY1OVowDDAKBgNVHRUEAwoBBjApAgoYJJymAAAAADiyFw0xMjAzMDEwODQ4MzdaMAwwCgYDVR0VBAMKAQUwKQIKber2EgAAAAA4JBcNMTIwMjI3MTEwNDMzWjAMMAoGA1UdFQQDCgEFMBsCCjnR3koAAAAAPIcXDTEyMDIyNDA1MzQzMlowKQIKRET0xAAAAAA7oRcNMTIwMjIyMDczNjUxWjAMMAoGA1UdFQQDCgEGMCkCCkNiUHEAAAAAO44XDTEyMDIxNzAzNDMzOVowDDAKBgNVHRUEAwoBBjApAgpDGzBQAAAAADuCFw0xMjAyMTcwMzM5NTNaMAwwCgYDVR0VBAMKAQYwKQIKZDO2iQAAAAA3/BcNMTIwMjE3MDI1OTU5WjAMMAoGA1UdFQQDCgEGMBsCChxb9AQAAAAAPEsXDTEyMDIxNjA5NDkxMFowKQIKHPY0WgAAAAA29RcNMTIwMjE2MDg1NzI2WjAMMAoGA1UdFQQDCgEGMCkCCm2GTwEAAAAAPAQXDTEyMDIxNDA5MDk1N1owDDAKBgNVHRUEAwoBBjAbAgoWLVhPAAAAADwsFw0xMjAyMTQwNzQ3MjNaMBsCChbo/oUAAAAAPDEXDTEyMDIxNDA3NDcwOVowKQIKcsSY7AAAAAA8GRcNMTIwMjEwMTAwMTU5WjAMMAoGA1UdFQQDCgEGMCkCChT6NkoAAAAAOt4XDTEyMDIwNjEwMTM0NFowDDAKBgNVHRUEAwoBBjApAgpDGCUzAAAAADuBFw0xMjAyMDYwNDI5MTdaMAwwCgYDVR0VBAMKAQYwKQIKQxUI/wAAAAA7gBcNMTIwMjA2MDI1MjA1WjAMMAoGA1UdFQQDCgEGMCkCCkMSDtkAAAAAO38XDTEyMDIwNjAyNDYwMVowDDAKBgNVHRUEAwoBBjApAgpDDnP/AAAAADt+Fw0xMjAyMDYwMjQyMjZaMAwwCgYDVR0VBAMKAQYwKQIKQwYdSwAAAAA7fBcNMTIwMjAzMDUxMDI2WjAMMAoGA1UdFQQDCgEGMCkCCkL++I8AAAAAO3oXDTEyMDIwMjEwMjQ1NlowDDAKBgNVHRUEAwoBBjApAgpDCsDbAAAAADt9Fw0xMjAyMDEwNzIxMjZaMAwwCgYDVR0VBAMKAQYwKQIKQwK02wAAAAA7excNMTIwMjAxMDMyNjU0WjAMMAoGA1UdFQQDCgEGMCkCCj3Mu7oAAAAAO2MXDTEyMDEzMTAzMTAwMVowDDAKBgNVHRUEAwoBBjApAgoqQD8LAAAAADsyFw0xMjAxMzAwODQ5MjJaMAwwCgYDVR0VBAMKAQYwKQIKOWQy4QAAAAA7QxcNMTIwMTMwMDYzNzA1WjAMMAoGA1UdFQQDCgEGMCkCCknsIyMAAAAAN6IXDTEyMDEzMDA1NTIzOVowDDAKBgNVHRUEAwoBBjApAgpgtCuYAAAAADmsFw0xMjAxMjcwNzU5NTRaMAwwCgYDVR0VBAMKAQYwGwIKJVQHUgAAAAA7HBcNMTIwMTI2MTA1ODEwWjApAgphN+VDAAAAADq3Fw0xMjAxMjYwNDQwNDNaMAwwCgYDVR0VBAMKAQYwKQIKYS3NlgAAAAA6thcNMTIwMTI2MDQzNTE5WjAMMAoGA1UdFQQDCgEGMCkCCmDDA5UAAAAAOa4XDTEyMDEyNjA0MjYyNlowDDAKBgNVHRUEAwoBBjAbAgokOfuWAAAAADsCFw0xMjAxMjYwNDEwNTVaMCkCCjCuCiMAAAAAN20XDTEyMDEyNTEwMTkzMFowDDAKBgNVHRUEAwoBBjApAgor/6fDAAAAADdWFw0xMjAxMjUxMDA0MjdaMAwwCgYDVR0VBAMKAQYwKQIKG7cchQAAAAA6JhcNMTIwMTI1MTAwMTUxWjAMMAoGA1UdFQQDCgEGMCkCCivPIFwAAAAANzsXDTEyMDEyNTEwMDEwMlowDDAKBgNVHRUEAwoBBjApAgor8Dn+AAAAADdLFw0xMjAxMjUxMDAwMTlaMAwwCgYDVR0VBAMKAQYwKQIKHwmcLgAAAAA6dxcNMTIwMTI1MDk1OTQwWjAMMAoGA1UdFQQDCgEGMCkCCivHoyAAAAAANzYXDTEyMDEyNTA5NTkwMFowDDAKBgNVHRUEAwoBBjApAgor+9gdAAAAADdTFw0xMjAxMjUwOTU4MzhaMAwwCgYDVR0VBAMKAQYwKQIKK9SEuwAAAAA3PRcNMTIwMTI1MDk1ODE1WjAMMAoGA1UdFQQDCgEGMCkCCiv0m4QAAAAAN04XDTEyMDEyNTA5NTc1M1owDDAKBgNVHRUEAwoBBjApAgosANWVAAAAADdXFw0xMjAxMjUwOTU3MDNaMAwwCgYDVR0VBAMKAQYwKQIKK7wKAgAAAAA3MBcNMTIwMTI1MDk1NjAxWjAMMAoGA1UdFQQDCgEGMCkCCivrl5gAAAAAN0gXDTEyMDEyNTA5NTUzNVowDDAKBgNVHRUEAwoBBjApAgor2rWiAAAAADdBFw0xMjAxMjUwOTU0MTVaMAwwCgYDVR0VBAMKAQYwKQIKLAkPigAAAAA3WRcNMTIwMTI1MDk1MzMwWjAMMAoGA1UdFQQDCgEGMCkCCiv3lhYAAAAAN1AXDTEyMDEyNTA5NTIxMlowDDAKBgNVHRUEAwoBBjApAgor7rNPAAAAADdKFw0xMjAxMjUwOTUxMDhaMAwwCgYDVR0VBAMKAQYwKQIKK/Z1sgAAAAA3TxcNMTIwMTI1MDk1MDQyWjAMMAoGA1UdFQQDCgEGMCkCCivWDJQAAAAANz4XDTEyMDEyNTA5NDkyNFowDDAKBgNVHRUEAwoBBjApAgor15vfAAAAADc/Fw0xMjAxMjUwOTAxMDhaMAwwCgYDVR0VBAMKAQYwKQIKK/1MTwAAAAA3VBcNMTIwMTI1MDkwMDQzWjAMMAoGA1UdFQQDCgEGMCkCCm8dIG0AAAAAOEkXDTEyMDEyNTA4NTcwNFowDDAKBgNVHRUEAwoBBjApAgor+TrOAAAAADdRFw0xMjAxMjUwODU0NDhaMAwwCgYDVR0VBAMKAQYwKQIKK91HCwAAAAA3QxcNMTIwMTI1MDg1NDE2WjAMMAoGA1UdFQQDCgEGMCkCCivhXOEAAAAAN0YXDTEyMDEyNTA4NTEyNFowDDAKBgNVHRUEAwoBBjApAgor3oavAAAAADdEFw0xMjAxMjUwODUwNTFaMAwwCgYDVR0VBAMKAQYwKQIKK/qgKgAAAAA3UhcNMTIwMTI1MDg1MDIzWjAMMAoGA1UdFQQDCgEGMCkCCivInW4AAAAANzcXDTEyMDEyNTA4NDk1NVowDDAKBgNVHRUEAwoBBjApAgor2NfKAAAAADdAFw0xMjAxMjUwODQ5MjlaMAwwCgYDVR0VBAMKAQYwKQIKK9FDTAAAAAA3PBcNMTIwMTI1MDg0OTA1WjAMMAoGA1UdFQQDCgEGMCkCCivKj7gAAAAANzgXDTEyMDEyNTA4NDg0MlowDDAKBgNVHRUEAwoBBjApAgob10E4AAAAADorFw0xMjAxMjUwODQ3MzBaMAwwCgYDVR0VBAMKAQYwKQIKG8RtwwAAAAA6JxcNMTIwMTI1MDg0NDUyWjAMMAoGA1UdFQQDCgEGMCkCCjGytWcAAAAAN3AXDTEyMDEyNTA4NDMxMFowDDAKBgNVHRUEAwoBBjApAgoeuuXKAAAAADpqFw0xMjAxMjMwODQ0MTVaMAwwCgYDVR0VBAMKAQYwKQIKFlB0AwAAAAA6zRcNMTIwMTIwMDgzNjEyWjAMMAoGA1UdFQQDCgEGMBsCChEz1ZoAAAAAOsAXDTEyMDExOTA4NTg1M1owGwIKVOxrrAAAAAA5HxcNMTIwMTE5MDg0NzI0WjApAgpWLsAnAAAAADk9Fw0xMjAxMTkwODA4NDFaMAwwCgYDVR0VBAMKAQYwKQIKE+YW2gAAAAA6jRcNMTIwMTE3MDgzNDEzWjAMMAoGA1UdFQQDCgEGMCkCCivgIWMAAAAAN0UXDTEyMDExNjA5NTIzNFowDDAKBgNVHRUEAwoBBjApAgorvndoAAAAADcxFw0xMjAxMTYwNzU4MzhaMAwwCgYDVR0VBAMKAQYwKQIKK/GkqgAAAAA3TBcNMTIwMTE2MDc1NDAzWjAMMAoGA1UdFQQDCgEGMBsCCh3sMrEAAAAAOksXDTEyMDExNjA0NDgxNFowKQIKG/ZSaAAAAAA6MhcNMTIwMTE1MTkzMjUzWjAMMAoGA1UdFQQDCgEGMCkCCivD4PcAAAAANzMXDTEyMDExNTE4MTQzMVowDDAKBgNVHRUEAwoBBjApAgphBr7eAAAAADnkFw0xMjAxMTMwOTE4MjlaMAwwCgYDVR0VBAMKAQYwKQIKVcRrawAAAAA36BcNMTIwMTEzMDIyNDAwWjAMMAoGA1UdFQQDCgEGMCkCClr+ASQAAAAAOWcXDTEyMDExMTA2NTgxMVowDDAKBgNVHRUEAwoBBjApAgohQuc4AAAAADcFFw0xMjAxMTEwNTUwMDFaMAwwCgYDVR0VBAMKAQYwGwIKVovg+QAAAAA5RBcNMTIwMTEwMTAyMDI0WjAbAgoSlRTAAAAAADjlFw0xMTEyMzAwNjIwMzRaMBsCChKowuUAAAAAOOYXDTExMTIzMDA2MTkzMFowGwIKF1KCJAAAAAA5ChcNMTExMjI5MDMzNzM3WjApAgoTN65cAAAAADjtFw0xMTEyMjkwMzE1MjJaMAwwCgYDVR0VBAMKAQYwKQIKHku/ZAAAAAA40xcNMTExMjI3MDk0MzAxWjAMMAoGA1UdFQQDCgEEMCkCCh5IkncAAAAAONIXDTExMTIyNzA5NDIwM1owDDAKBgNVHRUEAwoBBDApAgp5B70xAAAAADiPFw0xMTEyMjMwNjI2MDFaMAwwCgYDVR0VBAMKAQYwKQIKKxMM5gAAAAA3IRcNMTExMjIxMDgyOTU0WjAMMAoGA1UdFQQDCgEGMCkCCivB5A4AAAAANzIXDTExMTIyMTA0NTcwN1owDDAKBgNVHRUEAwoBBjApAgpp1jH9AAAAADgaFw0xMTEyMjAwNzQzMDRaMAwwCgYDVR0VBAMKAQYwKQIKQGK3qAAAAAA3excNMTExMjEyMDYyNzM4WjAMMAoGA1UdFQQDCgEEMCkCCjHUWwwAAAAAN3EXDTExMTIxMjA0MzczM1owDDAKBgNVHRUEAwoBBjApAgowaQhuAAAAADdqFw0xMTEyMDkwNDAzMzhaMAwwCgYDVR0VBAMKAQQwKQIKLAIhfQAAAAA3WBcNMTExMjA4MDcyOTA1WjAMMAoGA1UdFQQDCgEEMCkCCitrXO8AAAAANysXDTExMTIwODA1MzIyMVowDDAKBgNVHRUEAwoBBDApAgoh0ZweAAAAADcJFw0xMTEyMDYwNzU5NTdaMAwwCgYDVR0VBAMKAQagYDBeMB8GA1UdIwQYMBaAFLkeioDYZtqO5B8ojEBYjFzq1uciMBAGCSsGAQQBgjcVAQQDAgEAMAsGA1UdFAQEAgIJ4DAcBgkrBgEEAYI3FQQEDxcNMTIxMjA0MDUyNDQyWjAKBgYqhQMCAgMFAANBAG2cPM2e+xfFuw+OpA+vYvnHpXZdFj4nCvyZivcB1/mE9a9JS5Y9p2R2ONLD4lLVwuAOp13otcGkBfaS0gaWGzqiAwIBAKCCCI8wggQYMIIDxaADAgECAgpM4Pr3AAAAADzQMAoGBiqFAwICAwUAMIHnMRswGQYJKoZIhvcNAQkBFgx1ZGNzQHVkY3MucnUxCzAJBgNVBAYTAlJVMRcwFQYDVQQIHg4EIgQ+BDwEQQQ6BDAETzETMBEGA1UEBx4KBCIEPgQ8BEEEOjFHMEUGA1UEChM+VG9tc2sgU3RhdGUgVW5pdmVyc2l0eSBvZiBDb250cm9sIFN5c3RlbXMgYW5kIFJhZGlvZWxlY3Ryb25pY3MxJzAlBgNVBAseHgQmBCIEEQAgAC0AIAQjBCYAIAQhBDgEMQQ4BEAEODEbMBkGA1UEAxMSVURDIFNpYmlyaWEgVFNVQ1NSMB4XDTEyMTExMjAzMjgwMFoXDTEzMDMwMzA2MTkwMFowgdExKDAmBgkqhkiG9w0BCQEWGXRlc3RfdWRjc0BjdGIucmsudHVzdXIucnUxCzAJBgNVBAYTAlJVMRMwEQYDVQQHDArQotC+0LzRgdC6MT0wOwYDVQQKDDTQo9C00L7RgdGC0L7QstC10YDRj9GO0YnQuNC5INCm0LXQvdGC0YAg0KHQuNCx0LjRgNC4MUQwQgYDVQQDDDvQotC10YHRgtC+0LLRi9C5INCf0L7Qu9GM0LfQvtCy0LDRgtC10LvRjCDQo9CmINCh0LjQsdC40YDQuDBjMBwGBiqFAwICEzASBgcqhQMCAiQABgcqhQMCAh4BA0MABEBHTUfk8hd5xSwiSdDAe6INFLLmTi417Mp7vMRNZ+E9v0GbT52PMmQRzXe3Yh4zAsddU6Vr3WAWhJuF9ZFinTtYo4IBYTCCAV0wDgYDVR0PAQH/BAQDAgTwMCYGA1UdJQQfMB0GCCsGAQUFBwMEBgcqhQMCAiIGBggrBgEFBQcDAjAdBgNVHQ4EFgQU4lVNKJH/OqQ5TQe0FxHUC1fYJT0wHwYDVR0jBBgwFoAUuR6KgNhm2o7kHyiMQFiMXOrW5yIwWgYDVR0fBFMwUTBPoE2gS4YjaHR0cDovL3d3dy51ZGNzLnJ1L2NlcnRzcnYvdWRjcy5jcmyGJGh0dHA6Ly93d3cyLnVkY3MucnUvY2VydHNydi91ZGNzLmNybDBxBggrBgEFBQcBAQRlMGMwLwYIKwYBBQUHMAKGI2h0dHA6Ly93d3cudWRjcy5ydS9jZXJ0c3J2L3VkY3MuY2VyMDAGCCsGAQUFBzAChiRodHRwOi8vd3d3Mi51ZGNzLnJ1L2NlcnRzcnYvdWRjcy5jZXIwFAYDVR0gBA0wCzAJBgcqhQMDEwIEMAoGBiqFAwICAwUAA0EAEYnD+gc8ebRpF2YpbwsdwhMI7uwDQGsDHNlCVXRRKZkZLlUo8KCel2g9BuxbjKefFOK8N+HxkAkZwpVn2SIP9DCCBG8wggQcoAMCAQICCjBVmIkAAAAANVowCgYGKoUDAgIDBQAwgecxGzAZBgkqhkiG9w0BCQEWDHVkY3NAdWRjcy5ydTELMAkGA1UEBhMCUlUxFzAVBgNVBAgeDgQiBD4EPARBBDoEMARPMRMwEQYDVQQHHgoEIgQ+BDwEQQQ6MUcwRQYDVQQKEz5Ub21zayBTdGF0ZSBVbml2ZXJzaXR5IG9mIENvbnRyb2wgU3lzdGVtcyBhbmQgUmFkaW9lbGVjdHJvbmljczEnMCUGA1UECx4eBCYEIgQRACAALQAgBCMEJgAgBCEEOAQxBDgEQAQ4MRswGQYDVQQDExJVREMgU2liaXJpYSBUU1VDU1IwHhcNMTExMDIwMTAyNzAwWhcNMTMwMTIwMTAzNjAwWjCCATgxCzAJBgNVBAYTAlJVMRMwEQYDVQQHHgoEIgQeBBwEIQQaMUMwQQYDVQQKHjoEEAQ0BDwEOAQ9BDgEQQRCBEAEMARGBDgETwAgBCIEPgQ8BEEEOgQ+BDkAIAQ+BDEEOwQwBEEEQgQ4MYGBMH8GA1UECx54BBoEPgQ8BDgEQgQ1BEIAIAQ4BD0ERAQ+BEAEPAQwBEIEOAQ3BDAERgQ4BDgAIAQ4ACAEQQQyBE8ENwQ4ACAEEAQ0BDwEOAQ9BDgEQQRCBEAEMARGBDgEOAAgBCIEPgQ8BEEEOgQ+BDkAIAQ+BDEEOwQwBEEEQgQ4MUswSQYDVQQDHkIELQQbBBUEGgQiBCAEHgQdBB0EKwQZACAEHQQeBCIEEAQgBBgEEAQiACAAKABEAFYAQwBTACwAIABPAEMAUwBQACkwYzAcBgYqhQMCAhMwEgYHKoUDAgIkAAYHKoUDAgIeAQNDAARAijmkemSx9EYvcgxb7/O1AHd5r4mH6V6L97UyX/GGg9geywTqm/sPuq/wuVicW82f/f7huHHlIlUf5ejTwpH53aOCAVAwggFMMB0GA1UdJQQWMBQGCCsGAQUFBwMJBggrBgEFBQcDCjALBgNVHQ8EBAMCBsAwDwYJKwYBBQUHMAEFBAIFADAdBgNVHQ4EFgQUX5qI5TV4fjSwaGkElbHRedmg2NgwHwYDVR0jBBgwFoAUuR6KgNhm2o7kHyiMQFiMXOrW5yIwWgYDVR0fBFMwUTBPoE2gS4YjaHR0cDovL3d3dy51ZGNzLnJ1L2NlcnRzcnYvdWRjcy5jcmyGJGh0dHA6Ly93d3cyLnVkY3MucnUvY2VydHNydi91ZGNzLmNybDBxBggrBgEFBQcBAQRlMGMwLwYIKwYBBQUHMAKGI2h0dHA6Ly93d3cudWRjcy5ydS9jZXJ0c3J2L3VkY3MuY2VyMDAGCCsGAQUFBzAChiRodHRwOi8vd3d3Mi51ZGNzLnJ1L2NlcnRzcnYvdWRjcy5jZXIwCgYGKoUDAgIDBQADQQAw+l6X2T9zF2FtGiTvssRq0RGNaJ9d9P07qSt+gJ9gnveOnD4o8pVqCM+IgXfUrmh9IHRJ+u2LnhkDo8bUbOpIMYIBqTCCAaUCAQEwgfYwgecxGzAZBgkqhkiG9w0BCQEWDHVkY3NAdWRjcy5ydTELMAkGA1UEBhMCUlUxFzAVBgNVBAgeDgQiBD4EPARBBDoEMARPMRMwEQYDVQQHHgoEIgQ+BDwEQQQ6MUcwRQYDVQQKEz5Ub21zayBTdGF0ZSBVbml2ZXJzaXR5IG9mIENvbnRyb2wgU3lzdGVtcyBhbmQgUmFkaW9lbGVjdHJvbmljczEnMCUGA1UECx4eBCYEIgQRACAALQAgBCMEJgAgBCEEOAQxBDgEQAQ4MRswGQYDVQQDExJVREMgU2liaXJpYSBUU1VDU1ICCjBVmIkAAAAANVowCgYGKoUDAgIJBQCgTTAvBgkqhkiG9w0BCQQxIgQg4BFH+uPjI3T5F7Tr2QodH7RYWZYVWLtqaJMvXB44iy0wGgYJKoZIhvcNAQkDMQ0GCyqGSIb3DQEJEAEIMAoGBiqFAwICEwUABEB+KdP1VDfB3CM6cVHW2KodvfW8NilYhJ8aq6mMKSHRoZ94KCNBI3OfZvBVFCnIPeGSGmnTwHPVXbih/PFnUcp8";
-    private static final String REQUEST_CCPD_TOMSK = "MIIFagYJKoZIhvcNAQcCoIIFWzCCBVcCAQMxDDAKBgYqhQMCAgkFADBuBgsqhkiG9w0BCRABB6BfBF0wWzAKCgEEAgUAwDELHDA1MBEGBiqFAwICCQYHKoUDAgIeAQQgvrgCrtSqJuzWwWE7XelQv0cB71ehcXkh/Oikezqvl1agFgYLKoUDAhUBAQIBAwKgBwIFAJ7ldeKgggN0MIIDcDCCAx2gAwIBAgIKJjs9ewAAAAA3FDAKBgYqhQMCAgMFADCB5zEbMBkGCSqGSIb3DQEJARYMdWRjc0B1ZGNzLnJ1MQswCQYDVQQGEwJSVTEXMBUGA1UECB4OBCIEPgQ8BEEEOgQwBE8xEzARBgNVBAceCgQiBD4EPARBBDoxRzBFBgNVBAoTPlRvbXNrIFN0YXRlIFVuaXZlcnNpdHkgb2YgQ29udHJvbCBTeXN0ZW1zIGFuZCBSYWRpb2VsZWN0cm9uaWNzMScwJQYDVQQLHh4EJgQiBBEAIAAtACAEIwQmACAEIQQ4BDEEOARABDgxGzAZBgNVBAMTElVEQyBTaWJpcmlhIFRTVUNTUjAeFw0xMTEyMDcwNDI0MDBaFw0xMjEyMDcwNDMzMDBaMB8xHTAbBgNVBAMeFABSAEMAQQBJAFIAXwB0AGUAYwBoMGMwHAYGKoUDAgITMBIGByqFAwICJAAGByqFAwICHgEDQwAEQLgMQUEkI9li1pn4dHHEWv5SSCjI77W6wfG3mSzEKw0vd3qQUTd86xZGAEwVC2dxJIdiQlSuMtyog6vSau3FriKjggFsMIIBaDAOBgNVHQ8BAf8EBAMCBPAwMAYDVR0lBCkwJwYIKwYBBQUHAwQGCCqFAwMTAgUCBgcqhQMCAiIGBggrBgEFBQcDAjAdBgNVHQ4EFgQU/hZ+9/9Tt/94ckUhTWabJMCegqQwHwYDVR0jBBgwFoAUuR6KgNhm2o7kHyiMQFiMXOrW5yIwWgYDVR0fBFMwUTBPoE2gS4YjaHR0cDovL3d3dy51ZGNzLnJ1L2NlcnRzcnYvdWRjcy5jcmyGJGh0dHA6Ly93d3cyLnVkY3MucnUvY2VydHNydi91ZGNzLmNybDBxBggrBgEFBQcBAQRlMGMwLwYIKwYBBQUHMAKGI2h0dHA6Ly93d3cudWRjcy5ydS9jZXJ0c3J2L3VkY3MuY2VyMDAGCCsGAQUFBzAChiRodHRwOi8vd3d3Mi51ZGNzLnJ1L2NlcnRzcnYvdWRjcy5jZXIwFQYDVR0gBA4wDDAKBggqhQMDEwIFATAKBgYqhQMCAgMFAANBALCWVdYVTPSLtijWd6utGC/rtl0mGvU3UjyaHC2jbFovDwyRpx13BseqbcsxBA+aNabeH2WuEQMirhVt7lpV4jMxggFaMIIBVgIBATCB9jCB5zEbMBkGCSqGSIb3DQEJARYMdWRjc0B1ZGNzLnJ1MQswCQYDVQQGEwJSVTEXMBUGA1UECB4OBCIEPgQ8BEEEOgQwBE8xEzARBgNVBAceCgQiBD4EPARBBDoxRzBFBgNVBAoTPlRvbXNrIFN0YXRlIFVuaXZlcnNpdHkgb2YgQ29udHJvbCBTeXN0ZW1zIGFuZCBSYWRpb2VsZWN0cm9uaWNzMScwJQYDVQQLHh4EJgQiBBEAIAAtACAEIwQmACAEIQQ4BDEEOARABDgxGzAZBgNVBAMTElVEQyBTaWJpcmlhIFRTVUNTUgIKJjs9ewAAAAA3FDAKBgYqhQMCAgkFADAKBgYqhQMCAhMFAARAl0/LMiXMPCJIkAgCI6x3/8wPBDTR8P5GGs40Xzbz1rdvxcBTPEsyp8kNYMzxmQNegTOFemy15KKnQq8e4Fja6w==";
-    private static final String RESPONSE_CCPD_TOMSK = "MIIGugYJKoZIhvcNAQcCoIIGqzCCBqcCAQMxDDAKBgYqhQMCAgkFADBwBgsqhkiG9w0BCRABCKBhBF8wXTAKCgEEAgUAwDELHDA1MBEGBiqFAwICCQYHKoUDAgIeAQQgvrgCrtSqJuzWwWE7XelQv0cB71ehcXkh/Oikezqvl1YCAhhwGA8yMDEyMTIwNDA0MDY0M1qgAwIBAKCCBHMwggRvMIIEHKADAgECAgowVZiJAAAAADVaMAoGBiqFAwICAwUAMIHnMRswGQYJKoZIhvcNAQkBFgx1ZGNzQHVkY3MucnUxCzAJBgNVBAYTAlJVMRcwFQYDVQQIHg4EIgQ+BDwEQQQ6BDAETzETMBEGA1UEBx4KBCIEPgQ8BEEEOjFHMEUGA1UEChM+VG9tc2sgU3RhdGUgVW5pdmVyc2l0eSBvZiBDb250cm9sIFN5c3RlbXMgYW5kIFJhZGlvZWxlY3Ryb25pY3MxJzAlBgNVBAseHgQmBCIEEQAgAC0AIAQjBCYAIAQhBDgEMQQ4BEAEODEbMBkGA1UEAxMSVURDIFNpYmlyaWEgVFNVQ1NSMB4XDTExMTAyMDEwMjcwMFoXDTEzMDEyMDEwMzYwMFowggE4MQswCQYDVQQGEwJSVTETMBEGA1UEBx4KBCIEHgQcBCEEGjFDMEEGA1UECh46BBAENAQ8BDgEPQQ4BEEEQgRABDAERgQ4BE8AIAQiBD4EPARBBDoEPgQ5ACAEPgQxBDsEMARBBEIEODGBgTB/BgNVBAseeAQaBD4EPAQ4BEIENQRCACAEOAQ9BEQEPgRABDwEMARCBDgENwQwBEYEOAQ4ACAEOAAgBEEEMgRPBDcEOAAgBBAENAQ8BDgEPQQ4BEEEQgRABDAERgQ4BDgAIAQiBD4EPARBBDoEPgQ5ACAEPgQxBDsEMARBBEIEODFLMEkGA1UEAx5CBC0EGwQVBBoEIgQgBB4EHQQdBCsEGQAgBB0EHgQiBBAEIAQYBBAEIgAgACgARABWAEMAUwAsACAATwBDAFMAUAApMGMwHAYGKoUDAgITMBIGByqFAwICJAAGByqFAwICHgEDQwAEQIo5pHpksfRGL3IMW+/ztQB3ea+Jh+lei/e1Ml/xhoPYHssE6pv7D7qv8LlYnFvNn/3+4bhx5SJVH+Xo08KR+d2jggFQMIIBTDAdBgNVHSUEFjAUBggrBgEFBQcDCQYIKwYBBQUHAwowCwYDVR0PBAQDAgbAMA8GCSsGAQUFBzABBQQCBQAwHQYDVR0OBBYEFF+aiOU1eH40sGhpBJWx0XnZoNjYMB8GA1UdIwQYMBaAFLkeioDYZtqO5B8ojEBYjFzq1uciMFoGA1UdHwRTMFEwT6BNoEuGI2h0dHA6Ly93d3cudWRjcy5ydS9jZXJ0c3J2L3VkY3MuY3JshiRodHRwOi8vd3d3Mi51ZGNzLnJ1L2NlcnRzcnYvdWRjcy5jcmwwcQYIKwYBBQUHAQEEZTBjMC8GCCsGAQUFBzAChiNodHRwOi8vd3d3LnVkY3MucnUvY2VydHNydi91ZGNzLmNlcjAwBggrBgEFBQcwAoYkaHR0cDovL3d3dzIudWRjcy5ydS9jZXJ0c3J2L3VkY3MuY2VyMAoGBiqFAwICAwUAA0EAMPpel9k/cxdhbRok77LEatERjWifXfT9O6krfoCfYJ73jpw+KPKVagjPiIF31K5ofSB0Sfrti54ZA6PG1GzqSDGCAakwggGlAgEBMIH2MIHnMRswGQYJKoZIhvcNAQkBFgx1ZGNzQHVkY3MucnUxCzAJBgNVBAYTAlJVMRcwFQYDVQQIHg4EIgQ+BDwEQQQ6BDAETzETMBEGA1UEBx4KBCIEPgQ8BEEEOjFHMEUGA1UEChM+VG9tc2sgU3RhdGUgVW5pdmVyc2l0eSBvZiBDb250cm9sIFN5c3RlbXMgYW5kIFJhZGlvZWxlY3Ryb25pY3MxJzAlBgNVBAseHgQmBCIEEQAgAC0AIAQjBCYAIAQhBDgEMQQ4BEAEODEbMBkGA1UEAxMSVURDIFNpYmlyaWEgVFNVQ1NSAgowVZiJAAAAADVaMAoGBiqFAwICCQUAoE0wLwYJKoZIhvcNAQkEMSIEINO9R6CnEfi/gJi+AWp3FDKG0HZ5Fq94JvwCoRpXze93MBoGCSqGSIb3DQEJAzENBgsqhkiG9w0BCRABCDAKBgYqhQMCAhMFAARAIVnBio5IT1m+Dkzxktb9BRoElW5au5SO8T/+wGXnWD86CsBF25F5jvN6a2l83XzD0YDrC0wuMsY/dyThotWwvw==";
-    // expected info initialization:
-    private static final DVCSRequest REQ_CCPD_CLEPSYDRE, REQ_CCPD_TOMSK, REQ_CPD_TOMSK, REQ_VPKC_TOMSK;
-    private static final DVCSResponse RES_CCPD_CLEPSYDRE, RES_CCPD_TOMSK, RES_CPD_TOMSK, RES_VPKC_TOMSK;
-    private static List requests = new ArrayList();
-    private static List responses = new ArrayList();
-
-    static
-    {
-        GeneralName CLEPSYDRE_REQUESTER = GeneralName.getInstance(Hex.decode("A44B3049310B3009060355040613024652310E300C0603550407130550617269733110300E060355040A13074564656C576562311830160603550403130F50657465722053796C766573746572"));
-        GeneralName CLEPSYDRE_RESPONDER = GeneralName.getInstance(Hex.decode("A4723070310B300906035504061302465231153013060355040A130C4564656C57656220532E412E31283026060355040B131F436C657073796472652044656D6F6E7374726174696F6E20536572766963653120301E0603550403131754696D65205374616D70696E6720417574686F72697479"));
-        PolicyInformation CLEPSYDRE_POLICY = new PolicyInformation(new ASN1ObjectIdentifier("1.3.6.1.4.1.5309.1.2.1"));
-
-        DVCSRequestInformationBuilder INFO_CCPD_CLEPSYDRE = new DVCSRequestInformationBuilder(ServiceType.CCPD);
-        INFO_CCPD_CLEPSYDRE.setRequester(CLEPSYDRE_REQUESTER);
-        INFO_CCPD_CLEPSYDRE.setRequestPolicy(CLEPSYDRE_POLICY);
-
-        DigestInfo DIGEST_CCPD_CLEPSYDRE = new DigestInfo(new AlgorithmIdentifier(new ASN1ObjectIdentifier("1.3.14.3.2.26")), Hex.decode("75B685AF6F89467DE80715251E45978FCD1FA566"));
-
-        DVCSRequestInformationBuilder INFO_CCPD_CLEPSYDRE2 = new DVCSRequestInformationBuilder(ServiceType.CCPD);
-        INFO_CCPD_CLEPSYDRE2.setRequester(CLEPSYDRE_REQUESTER);
-        INFO_CCPD_CLEPSYDRE2.setRequestPolicy(CLEPSYDRE_POLICY);
-        INFO_CCPD_CLEPSYDRE2.setDVCS(CLEPSYDRE_RESPONDER);
-
-        REQ_CCPD_CLEPSYDRE = new DVCSRequest(INFO_CCPD_CLEPSYDRE.build(), new Data(DIGEST_CCPD_CLEPSYDRE));
-        RES_CCPD_CLEPSYDRE = new DVCSResponse(new DVCSCertInfo(INFO_CCPD_CLEPSYDRE2.build(), DIGEST_CCPD_CLEPSYDRE, new ASN1Integer(new BigInteger(Hex.decode("01780A1ECA8823"))), new DVCSTime(new ASN1GeneralizedTime("20000417171617Z"))));
-
-        DVCSRequestInformationBuilder INFO_CCPD_TOMSK = new DVCSRequestInformationBuilder(ServiceType.CCPD);
-        INFO_CCPD_TOMSK.setNonce(new BigInteger(Hex.decode("00C0310B1C")));
-
-        DigestInfo DIGEST_CCPD_TOMSK = new DigestInfo(new AlgorithmIdentifier(new ASN1ObjectIdentifier("1.2.643.2.2.9"), new ASN1ObjectIdentifier("1.2.643.2.2.30.1")), Hex.decode("BEB802AED4AA26ECD6C1613B5DE950BF4701EF57A1717921FCE8A47B3AAF9756"));
-        GeneralName ID_CCPD_TOMSK = GeneralName.getInstance(Hex.decode("A016060B2A85030215010102010302A0070205009EE575E2"));
-
-        REQ_CCPD_TOMSK = new DVCSRequest(INFO_CCPD_TOMSK.build(), new Data(DIGEST_CCPD_TOMSK), ID_CCPD_TOMSK);
-
-        DVCSCertInfoBuilder certInfoBldr = new DVCSCertInfoBuilder(INFO_CCPD_TOMSK.build(), DIGEST_CCPD_TOMSK, new ASN1Integer(6256), new DVCSTime(new ASN1GeneralizedTime("20121204040643Z")));
-        certInfoBldr.setDvStatus(new PKIStatusInfo(PKIStatus.granted));
-        RES_CCPD_TOMSK = new DVCSResponse(certInfoBldr.build());
-
-
-        DVCSRequestInformationBuilder INFO_CPD_TOMSK = new DVCSRequestInformationBuilder(ServiceType.CPD);
-        INFO_CPD_TOMSK.setNonce(new BigInteger("234303415"));
-
-        DVCSRequestInformationBuilder INFO_CPD_TOMSK2 = new DVCSRequestInformationBuilder(ServiceType.CPD);
-        INFO_CPD_TOMSK2.setNonce(new BigInteger("1957381177"));
-
-        String CPD_DATA_TOMSK = "30820418308203C5A003020102020A4CE0FAF7000000003CD0300A06062A850302020305003081E7311B301906092A864886F70D010901160C7564637340756463732E7275310B30090603550406130252553117301506035504081E0E0422043E043C0441043A0430044F3113301106035504071E0A0422043E043C0441043A31473045060355040A133E546F6D736B20537461746520556E6976657273697479206F6620436F6E74726F6C2053797374656D7320616E6420526164696F656C656374726F6E69637331273025060355040B1E1E0426042204110020002D0020042304260020042104380431043804400438311B301906035504031312554443205369626972696120545355435352301E170D3132313131323033323830305A170D3133303330333036313930305A3081D13128302606092A864886F70D0109011619746573745F75646373406374622E726B2E74757375722E7275310B30090603550406130252553113301106035504070C0AD0A2D0BED0BCD181D0BA313D303B060355040A0C34D0A3D0B4D0BED181D182D0BED0B2D0B5D180D18FD18ED189D0B8D0B920D0A6D0B5D0BDD182D18020D0A1D0B8D0B1D0B8D180D0B83144304206035504030C3BD0A2D0B5D181D182D0BED0B2D18BD0B920D09FD0BED0BBD18CD0B7D0BED0B2D0B0D182D0B5D0BBD18C20D0A3D0A620D0A1D0B8D0B1D0B8D180D0B83063301C06062A8503020213301206072A85030202240006072A850302021E010343000440474D47E4F21779C52C2249D0C07BA20D14B2E64E2E35ECCA7BBCC44D67E13DBF419B4F9D8F326411CD77B7621E3302C75D53A56BDD6016849B85F591629D3B58A38201613082015D300E0603551D0F0101FF0404030204F030260603551D25041F301D06082B0601050507030406072A85030202220606082B06010505070302301D0603551D0E04160414E2554D2891FF3AA4394D07B41711D40B57D8253D301F0603551D23041830168014B91E8A80D866DA8EE41F288C40588C5CEAD6E722305A0603551D1F04533051304FA04DA04B8623687474703A2F2F7777772E756463732E72752F636572747372762F756463732E63726C8624687474703A2F2F777777322E756463732E72752F636572747372762F756463732E63726C307106082B0601050507010104653063302F06082B060105050730028623687474703A2F2F7777772E756463732E72752F636572747372762F756463732E636572303006082B060105050730028624687474703A2F2F777777322E756463732E72752F636572747372762F756463732E63657230140603551D20040D300B300906072A850303130204300A06062A850302020305000341001189C3FA073C79B4691766296F0B1DC21308EEEC03406B031CD9425574512999192E5528F0A09E97683D06EC5B8CA79F14E2BC37E1F1900919C29567D9220FF4";
-        DigestInfo DIGEST_CPD_TOMSK = DIGEST_CCPD_TOMSK;
-        GeneralName ID_CPD_TOMSK = GeneralName.getInstance(Hex.decode("A016060B2A85030215010102010302A00702050085BA0D41"));
-
-        REQ_CPD_TOMSK = new DVCSRequest(INFO_CPD_TOMSK.build(), new Data(Hex.decode(CPD_DATA_TOMSK)), ID_CPD_TOMSK);
-
-        certInfoBldr = new DVCSCertInfoBuilder(INFO_CPD_TOMSK2.build(), DIGEST_CPD_TOMSK, new ASN1Integer(6329), new DVCSTime(new ASN1GeneralizedTime("20121205065720Z")));
-        certInfoBldr.setDvStatus(new PKIStatusInfo(PKIStatus.granted));
-        RES_CPD_TOMSK = new DVCSResponse(certInfoBldr.build());
-
-
-        DVCSRequestInformationBuilder INFO_VPKC_TOMSK = new DVCSRequestInformationBuilder(ServiceType.VPKC);
-        INFO_VPKC_TOMSK.setNonce(new BigInteger(Hex.decode("00D3F85051")));
-
-        String VPKC_DATA_TOMSK = CPD_DATA_TOMSK;
-        DigestInfo DIGEST_VPKC_TOMSK = new DigestInfo(new AlgorithmIdentifier(new ASN1ObjectIdentifier("1.2.643.2.2.9"), new ASN1ObjectIdentifier("1.2.643.2.2.30.1")), Hex.decode("FD97A3191C95D2AD733C11ABE0E6AEB081AF8735177F50F6B08C29D3AAFE8DE7"));
-        GeneralName ID_VPKC_TOMSK = GeneralName.getInstance(Hex.decode("A016060B2A85030215010102010302A007020500AE344E64"));
-
-        CertEtcToken target = new CertEtcToken(CertEtcToken.TAG_CERTIFICATE, Certificate.getInstance(Hex.decode(VPKC_DATA_TOMSK)));
-        TargetEtcChain REQ_CERTS = new TargetEtcChain(target);
-
-        TargetEtcChain[] RES_CERTS = TargetEtcChain.arrayFromSequence(new DERSequence(ASN1Sequence.getInstance(Hex.decode("308216BBA0820418308203C5A003020102020A4CE0FAF7000000003CD0300A06062A850302020305003081E7311B301906092A864886F70D010901160C7564637340756463732E7275310B30090603550406130252553117301506035504081E0E0422043E043C0441043A0430044F3113301106035504071E0A0422043E043C0441043A31473045060355040A133E546F6D736B20537461746520556E6976657273697479206F6620436F6E74726F6C2053797374656D7320616E6420526164696F656C656374726F6E69637331273025060355040B1E1E0426042204110020002D0020042304260020042104380431043804400438311B301906035504031312554443205369626972696120545355435352301E170D3132313131323033323830305A170D3133303330333036313930305A3081D13128302606092A864886F70D0109011619746573745F75646373406374622E726B2E74757375722E7275310B30090603550406130252553113301106035504070C0AD0A2D0BED0BCD181D0BA313D303B060355040A0C34D0A3D0B4D0BED181D182D0BED0B2D0B5D180D18FD18ED189D0B8D0B920D0A6D0B5D0BDD182D18020D0A1D0B8D0B1D0B8D180D0B83144304206035504030C3BD0A2D0B5D181D182D0BED0B2D18BD0B920D09FD0BED0BBD18CD0B7D0BED0B2D0B0D182D0B5D0BBD18C20D0A3D0A620D0A1D0B8D0B1D0B8D180D0B83063301C06062A8503020213301206072A85030202240006072A850302021E010343000440474D47E4F21779C52C2249D0C07BA20D14B2E64E2E35ECCA7BBCC44D67E13DBF419B4F9D8F326411CD77B7621E3302C75D53A56BDD6016849B85F591629D3B58A38201613082015D300E0603551D0F0101FF0404030204F030260603551D25041F301D06082B0601050507030406072A85030202220606082B06010505070302301D0603551D0E04160414E2554D2891FF3AA4394D07B41711D40B57D8253D301F0603551D23041830168014B91E8A80D866DA8EE41F288C40588C5CEAD6E722305A0603551D1F04533051304FA04DA04B8623687474703A2F2F7777772E756463732E72752F636572747372762F756463732E63726C8624687474703A2F2F777777322E756463732E72752F636572747372762F756463732E63726C307106082B0601050507010104653063302F06082B060105050730028623687474703A2F2F7777772E756463732E72752F636572747372762F756463732E636572303006082B060105050730028624687474703A2F2F777777322E756463732E72752F636572747372762F756463732E63657230140603551D20040D300B300906072A850303130204300A06062A850302020305000341001189C3FA073C79B4691766296F0B1DC21308EEEC03406B031CD9425574512999192E5528F0A09E97683D06EC5B8CA79F14E2BC37E1F1900919C29567D9220FF43082129BA48212923082123F020101300A06062A850302020305003081E7311B301906092A864886F70D010901160C7564637340756463732E7275310B30090603550406130252553117301506035504081E0E0422043E043C0441043A0430044F3113301106035504071E0A0422043E043C0441043A31473045060355040A133E546F6D736B20537461746520556E6976657273697479206F6620436F6E74726F6C2053797374656D7320616E6420526164696F656C656374726F6E69637331273025060355040B1E1E0426042204110020002D0020042304260020042104380431043804400438311B301906035504031312554443205369626972696120545355435352170D3132313230333233313434325A170D3132313230343131333434325A308210C23029020A63D1113D0000000037F4170D3132303532393035343134325A300C300A0603551D1504030A01053029020A531056A0000000003C9D170D3132303530343036343030375A300C300A0603551D1504030A01053029020A7355CE0D000000003859170D3132303530323035333830375A300C300A0603551D1504030A01053029020A4AE834300000000037AC170D3132303430353130303130385A300C300A0603551D1504030A01053029020A59B4198A000000003CB0170D3132303330323038313635395A300C300A0603551D1504030A01063029020A18249CA60000000038B2170D3132303330313038343833375A300C300A0603551D1504030A01053029020A6DEAF612000000003824170D3132303232373131303433335A300C300A0603551D1504030A0105301B020A39D1DE4A000000003C87170D3132303232343035333433325A3029020A4444F4C4000000003BA1170D3132303232323037333635315A300C300A0603551D1504030A01063029020A43625071000000003B8E170D3132303231373033343333395A300C300A0603551D1504030A01063029020A431B3050000000003B82170D3132303231373033333935335A300C300A0603551D1504030A01063029020A6433B6890000000037FC170D3132303231373032353935395A300C300A0603551D1504030A0106301B020A1C5BF404000000003C4B170D3132303231363039343931305A3029020A1CF6345A0000000036F5170D3132303231363038353732365A300C300A0603551D1504030A01063029020A6D864F01000000003C04170D3132303231343039303935375A300C300A0603551D1504030A0106301B020A162D584F000000003C2C170D3132303231343037343732335A301B020A16E8FE85000000003C31170D3132303231343037343730395A3029020A72C498EC000000003C19170D3132303231303130303135395A300C300A0603551D1504030A01063029020A14FA364A000000003ADE170D3132303230363130313334345A300C300A0603551D1504030A01063029020A43182533000000003B81170D3132303230363034323931375A300C300A0603551D1504030A01063029020A431508FF000000003B80170D3132303230363032353230355A300C300A0603551D1504030A01063029020A43120ED9000000003B7F170D3132303230363032343630315A300C300A0603551D1504030A01063029020A430E73FF000000003B7E170D3132303230363032343232365A300C300A0603551D1504030A01063029020A43061D4B000000003B7C170D3132303230333035313032365A300C300A0603551D1504030A01063029020A42FEF88F000000003B7A170D3132303230323130323435365A300C300A0603551D1504030A01063029020A430AC0DB000000003B7D170D3132303230313037323132365A300C300A0603551D1504030A01063029020A4302B4DB000000003B7B170D3132303230313033323635345A300C300A0603551D1504030A01063029020A3DCCBBBA000000003B63170D3132303133313033313030315A300C300A0603551D1504030A01063029020A2A403F0B000000003B32170D3132303133303038343932325A300C300A0603551D1504030A01063029020A396432E1000000003B43170D3132303133303036333730355A300C300A0603551D1504030A01063029020A49EC23230000000037A2170D3132303133303035353233395A300C300A0603551D1504030A01063029020A60B42B980000000039AC170D3132303132373037353935345A300C300A0603551D1504030A0106301B020A25540752000000003B1C170D3132303132363130353831305A3029020A6137E543000000003AB7170D3132303132363034343034335A300C300A0603551D1504030A01063029020A612DCD96000000003AB6170D3132303132363034333531395A300C300A0603551D1504030A01063029020A60C303950000000039AE170D3132303132363034323632365A300C300A0603551D1504030A0106301B020A2439FB96000000003B02170D3132303132363034313035355A3029020A30AE0A2300000000376D170D3132303132353130313933305A300C300A0603551D1504030A01063029020A2BFFA7C3000000003756170D3132303132353130303432375A300C300A0603551D1504030A01063029020A1BB71C85000000003A26170D3132303132353130303135315A300C300A0603551D1504030A01063029020A2BCF205C00000000373B170D3132303132353130303130325A300C300A0603551D1504030A01063029020A2BF039FE00000000374B170D3132303132353130303031395A300C300A0603551D1504030A01063029020A1F099C2E000000003A77170D3132303132353039353934305A300C300A0603551D1504030A01063029020A2BC7A320000000003736170D3132303132353039353930305A300C300A0603551D1504030A01063029020A2BFBD81D000000003753170D3132303132353039353833385A300C300A0603551D1504030A01063029020A2BD484BB00000000373D170D3132303132353039353831355A300C300A0603551D1504030A01063029020A2BF49B8400000000374E170D3132303132353039353735335A300C300A0603551D1504030A01063029020A2C00D595000000003757170D3132303132353039353730335A300C300A0603551D1504030A01063029020A2BBC0A02000000003730170D3132303132353039353630315A300C300A0603551D1504030A01063029020A2BEB9798000000003748170D3132303132353039353533355A300C300A0603551D1504030A01063029020A2BDAB5A2000000003741170D3132303132353039353431355A300C300A0603551D1504030A01063029020A2C090F8A000000003759170D3132303132353039353333305A300C300A0603551D1504030A01063029020A2BF79616000000003750170D3132303132353039353231325A300C300A0603551D1504030A01063029020A2BEEB34F00000000374A170D3132303132353039353130385A300C300A0603551D1504030A01063029020A2BF675B200000000374F170D3132303132353039353034325A300C300A0603551D1504030A01063029020A2BD60C9400000000373E170D3132303132353039343932345A300C300A0603551D1504030A01063029020A2BD79BDF00000000373F170D3132303132353039303130385A300C300A0603551D1504030A01063029020A2BFD4C4F000000003754170D3132303132353039303034335A300C300A0603551D1504030A01063029020A6F1D206D000000003849170D3132303132353038353730345A300C300A0603551D1504030A01063029020A2BF93ACE000000003751170D3132303132353038353434385A300C300A0603551D1504030A01063029020A2BDD470B000000003743170D3132303132353038353431365A300C300A0603551D1504030A01063029020A2BE15CE1000000003746170D3132303132353038353132345A300C300A0603551D1504030A01063029020A2BDE86AF000000003744170D3132303132353038353035315A300C300A0603551D1504030A01063029020A2BFAA02A000000003752170D3132303132353038353032335A300C300A0603551D1504030A01063029020A2BC89D6E000000003737170D3132303132353038343935355A300C300A0603551D1504030A01063029020A2BD8D7CA000000003740170D3132303132353038343932395A300C300A0603551D1504030A01063029020A2BD1434C00000000373C170D3132303132353038343930355A300C300A0603551D1504030A01063029020A2BCA8FB8000000003738170D3132303132353038343834325A300C300A0603551D1504030A01063029020A1BD74138000000003A2B170D3132303132353038343733305A300C300A0603551D1504030A01063029020A1BC46DC3000000003A27170D3132303132353038343435325A300C300A0603551D1504030A01063029020A31B2B567000000003770170D3132303132353038343331305A300C300A0603551D1504030A01063029020A1EBAE5CA000000003A6A170D3132303132333038343431355A300C300A0603551D1504030A01063029020A16507403000000003ACD170D3132303132303038333631325A300C300A0603551D1504030A0106301B020A1133D59A000000003AC0170D3132303131393038353835335A301B020A54EC6BAC00000000391F170D3132303131393038343732345A3029020A562EC02700000000393D170D3132303131393038303834315A300C300A0603551D1504030A01063029020A13E616DA000000003A8D170D3132303131373038333431335A300C300A0603551D1504030A01063029020A2BE02163000000003745170D3132303131363039353233345A300C300A0603551D1504030A01063029020A2BBE7768000000003731170D3132303131363037353833385A300C300A0603551D1504030A01063029020A2BF1A4AA00000000374C170D3132303131363037353430335A300C300A0603551D1504030A0106301B020A1DEC32B1000000003A4B170D3132303131363034343831345A3029020A1BF65268000000003A32170D3132303131353139333235335A300C300A0603551D1504030A01063029020A2BC3E0F7000000003733170D3132303131353138313433315A300C300A0603551D1504030A01063029020A6106BEDE0000000039E4170D3132303131333039313832395A300C300A0603551D1504030A01063029020A55C46B6B0000000037E8170D3132303131333032323430305A300C300A0603551D1504030A01063029020A5AFE0124000000003967170D3132303131313036353831315A300C300A0603551D1504030A01063029020A2142E738000000003705170D3132303131313035353030315A300C300A0603551D1504030A0106301B020A568BE0F9000000003944170D3132303131303130323032345A301B020A129514C00000000038E5170D3131313233303036323033345A301B020A12A8C2E50000000038E6170D3131313233303036313933305A301B020A1752822400000000390A170D3131313232393033333733375A3029020A1337AE5C0000000038ED170D3131313232393033313532325A300C300A0603551D1504030A01063029020A1E4BBF640000000038D3170D3131313232373039343330315A300C300A0603551D1504030A01043029020A1E4892770000000038D2170D3131313232373039343230335A300C300A0603551D1504030A01043029020A7907BD3100000000388F170D3131313232333036323630315A300C300A0603551D1504030A01063029020A2B130CE6000000003721170D3131313232313038323935345A300C300A0603551D1504030A01063029020A2BC1E40E000000003732170D3131313232313034353730375A300C300A0603551D1504030A01063029020A69D631FD00000000381A170D3131313232303037343330345A300C300A0603551D1504030A01063029020A4062B7A800000000377B170D3131313231323036323733385A300C300A0603551D1504030A01043029020A31D45B0C000000003771170D3131313231323034333733335A300C300A0603551D1504030A01063029020A3069086E00000000376A170D3131313230393034303333385A300C300A0603551D1504030A01043029020A2C02217D000000003758170D3131313230383037323930355A300C300A0603551D1504030A01043029020A2B6B5CEF00000000372B170D3131313230383035333232315A300C300A0603551D1504030A01043029020A21D19C1E000000003709170D3131313230363037353935375A300C300A0603551D1504030A0106A060305E301F0603551D23041830168014B91E8A80D866DA8EE41F288C40588C5CEAD6E722301006092B06010401823715010403020100300B0603551D140404020209E0301C06092B0601040182371504040F170D3132313230343035323434325A300A06062A850302020305000341006D9C3CCD9EFB17C5BB0F8EA40FAF62F9C7A5765D163E270AFC998AF701D7F984F5AF494B963DA7647638D2C3E252D5C2E00EA75DE8B5C1A405F692D206961B3AA203020100"))));
-
-        REQ_VPKC_TOMSK = new DVCSRequest(INFO_VPKC_TOMSK.build(), new Data(REQ_CERTS), ID_VPKC_TOMSK);
-
-        certInfoBldr = new DVCSCertInfoBuilder(INFO_VPKC_TOMSK.build(), DIGEST_VPKC_TOMSK, new ASN1Integer(6257), new DVCSTime(new ASN1GeneralizedTime("20121204040753Z")));
-
-        certInfoBldr.setDvStatus(new PKIStatusInfo(PKIStatus.granted));
-        certInfoBldr.setCerts(RES_CERTS);
-
-        RES_VPKC_TOMSK = new DVCSResponse(certInfoBldr.build());
-
-        requests.add(new Info("req_ccpd_clepsydre", REQUEST_CCPD_CLEPSYDRE, REQ_CCPD_CLEPSYDRE));
-        requests.add(new Info("req_ccpd_tomsk", REQUEST_CCPD_TOMSK, REQ_CCPD_TOMSK));
-        requests.add(new Info("req_cpd_tomsk", REQUEST_CPD_TOMSK, REQ_CPD_TOMSK));
-        requests.add(new Info("req_vpkc_tomsk", REQUEST_VPKC_TOMSK, REQ_VPKC_TOMSK));
-
-        responses.add(new Info("res_ccpd_clepsydre", RESPONSE_CCPD_CLEPSYDRE, RES_CCPD_CLEPSYDRE));
-        responses.add(new Info("res_ccpd_tomsk", RESPONSE_CCPD_TOMSK, RES_CCPD_TOMSK));
-        responses.add(new Info("res_cpd_tomsk", RESPONSE_CPD_TOMSK, RES_CPD_TOMSK));
-        responses.add(new Info("res_vpkc_tomsk", RESPONSE_VPKC_TOMSK, RES_VPKC_TOMSK));
-
-    }
-
-    private static boolean areNull(String type, Object result, Object expected)
-    {
-        if (result == null && expected == null)
-        {
-            return true;
-        }
-        if (result == null && expected != null)
-        {
-            fail("Result '" + type + "' is null, whereas expected '" + type + "' is not null");
-        }
-        if (result != null && expected == null)
-        {
-            fail("Result '" + type + "' is not null, whereas expected '" + type + "' is null");
-        }
-        return false;
-    }
-
-    ////////////////////////////////////////////////////
-    //                  PARSE TESTS                   //
-    ////////////////////////////////////////////////////
-
-    private static void validate(String type, Object result, Object expected)
-    {
-        if (areNull(type, result, expected))
-        {
-            return;
-        }
-
-        if (!result.equals(expected))
-        {
-            fail("Different " + type + ": " + result + " while expected: " + expected);
-        }
-    }
-
-    private static void validateArray(String type, Object[] result, Object[] expected)
-    {
-        if (areNull(type, result, expected))
-        {
-            return;
-        }
-
-        if (result.length != expected.length)
-        {
-            fail("Different " + type + ": " + result + " while expected: " + expected);
-        }
-        for (int i = 0; i != result.length; i++)
-        {
-            if (!result[i].equals(expected[i]))
-            {
-                fail("Different " + type + ": " + result[i] + " while expected: " + expected[i]);
-            }
-        }
-    }
-
-    public void testParseRequests()
-        throws IOException, DVCSException, CMSException
-    {
-        for (Iterator it = requests.iterator(); it.hasNext();)
-        {
-            Info info = (Info)it.next();
-            testParseRequest(info.name, info.base64, (DVCSRequest)info.expected);
-        }
-    }
-
-    private void testParseRequest(String name, String base64request, DVCSRequest expected)
-        throws DVCSException, IOException, CMSException
-    {
-        byte[] requestBytes = Base64.decode(base64request);
-
-        org.bouncycastle.dvcs.DVCSRequest request = new org.bouncycastle.dvcs.DVCSRequest(new CMSSignedData(requestBytes));
-
-        validate(name, request.getContent(), expected);
-    }
-
-    public void testParseResponses()
-        throws IOException, DVCSException, CMSException
-    {
-        for (Iterator it = responses.iterator(); it.hasNext();)
-        {
-            Info info = (Info)it.next();
-            testParseResponse(info.name, info.base64, (DVCSResponse)info.expected);
-        }
-    }
-
-    ////////////////////////////////////////////////////
-    //                  VALIDATIONS                   //
-    ////////////////////////////////////////////////////
-
-    private void testParseResponse(String name, String base64response, DVCSResponse expected)
-        throws DVCSException, IOException, CMSException
-    {
-        byte[] responseBytes = Base64.decode(base64response);
-        org.bouncycastle.dvcs.DVCSResponse response = new org.bouncycastle.dvcs.DVCSResponse(new CMSSignedData(responseBytes));
-
-        validate(name, response.getContent(), expected);
-    }
-
-    /*
-        DVCSRequest ::= SEQUENCE  {
-            requestInformation         DVCSRequestInformation,
-            data                       Data,
-            transactionIdentifier      GeneralName OPTIONAL
-        }
-     */
-    private void validate(String name, DVCSRequest result, DVCSRequest expected)
-    {
-        validate(name + ".requestInformation", result.getRequestInformation(), expected.getRequestInformation());
-        validate(name + ".data", result.getData(), expected.getData());
-        validate(name + ".transactionIdentifier", result.getTransactionIdentifier(), expected.getTransactionIdentifier());
-    }
-
-    /*
-        DVCSRequestInformation ::= SEQUENCE  {
-                version                      INTEGER DEFAULT 1 ,
-                service                      ServiceType,
-                nonce                        Nonce OPTIONAL,
-                requestTime                  DVCSTime OPTIONAL,
-                requester                    [0] GeneralNames OPTIONAL,
-                requestPolicy                [1] PolicyInformation OPTIONAL,
-                dvcs                         [2] GeneralNames OPTIONAL,
-                dataLocations                [3] GeneralNames OPTIONAL,
-                extensions                   [4] IMPLICIT Extensions OPTIONAL
-        }
-     */
-    private void validate(String name, DVCSRequestInformation info, DVCSRequestInformation expected)
-    {
-        validate(name + ".version", new Integer(info.getVersion()), new Integer(expected.getVersion()));
-        validate(name + ".service", info.getService().getValue(), expected.getService().getValue());
-        validate(name + ".nonce", info.getNonce(), expected.getNonce());
-        validate(name + ".requestTime", info.getRequestTime(), expected.getRequestTime());
-        validate(name + ".requester", info.getRequester(), expected.getRequester());
-        validate(name + ".requestPolicy", info.getRequestPolicy(), expected.getRequestPolicy());
-        validate(name + ".dvcs", info.getDVCS(), expected.getDVCS());
-        validate(name + ".dataLocations", info.getDataLocations(), expected.getDataLocations());
-        validate(name + ".extensions", info.getExtensions(), expected.getExtensions());
-    }
-
-    /*
-        DVCSTime ::= CHOICE  {
-             genTime                      GeneralizedTime,
-             timeStampToken               ContentInfo
-        }
-     */
-    private void validate(String name, DVCSTime result, DVCSTime expected)
-    {
-        if (areNull(name, result, expected))
-        {
-            return;
-        }
-        validate(name + ".genTime", result.getGenTime(), expected.getGenTime());
-        validate(name + ".timeStampToken", result.getTimeStampToken(), expected.getTimeStampToken());
-    }
-
-    /*
-        Data ::= CHOICE {
-              message           OCTET STRING ,
-              messageImprint    DigestInfo,
-              certs             SEQUENCE SIZE (1..MAX) OF
-                                    TargetEtcChain
-        }
-     */
-    private void validate(String name, Data result, Data expected)
-    {
-        validate(name + ".message", result.getMessage(), expected.getMessage());
-        validate(name + ".messageImprint", result.getMessageImprint(), expected.getMessageImprint());
-        validateArray(name + ".certs", result.getCerts(), expected.getCerts());
-    }
-
-    /*
-        DVCSResponse ::= CHOICE
-        {
-            dvCertInfo         DVCSCertInfo ,
-            dvErrorNote        [0] DVCSErrorNotice
-        }
-     */
-    private void validate(String name, DVCSResponse result, DVCSResponse expected)
-    {
-        validate(name + ".dvCertInfo", result.getCertInfo(), expected.getCertInfo());
-        validate(name + ".dvErrorNote", result.getErrorNotice(), expected.getErrorNotice());
-    }
-
-    /*
-        DVCSCertInfo::= SEQUENCE  {
-                 version             Integer DEFAULT 1 ,
-                 dvReqInfo           DVCSRequestInformation,
-                 messageImprint      DigestInfo,
-                 serialNumber        Integer,
-                 responseTime        DVCSTime,
-                 dvStatus            [0] PKIStatusInfo OPTIONAL,
-                 policy              [1] PolicyInformation OPTIONAL,
-                 reqSignature        [2] SignerInfos  OPTIONAL,
-                 certs               [3] SEQUENCE SIZE (1..MAX) OF
-                                         TargetEtcChain OPTIONAL,
-                 extensions          Extensions OPTIONAL
-        }
-     */
-    private void validate(String name, DVCSCertInfo result, DVCSCertInfo expected)
-    {
-        if (areNull(name, result, expected))
-        {
-            return;
-        }
-        validate(name + ".version", new Integer(result.getVersion()), new Integer(expected.getVersion()));
-        validate(name + ".dvReqInfo", result.getDvReqInfo(), expected.getDvReqInfo());
-        validate(name + ".messageImprint", result.getMessageImprint(), expected.getMessageImprint());
-        validate(name + ".serialNumber", result.getSerialNumber(), expected.getSerialNumber());
-        validate(name + ".responseTime", result.getResponseTime(), expected.getResponseTime());
-        validate(name + ".dvStatus", result.getDvStatus(), expected.getDvStatus());
-        validate(name + ".policy", result.getPolicy(), expected.getPolicy());
-        validate(name + ".reqSignature", result.getReqSignature(), expected.getReqSignature());
-        validateArray(name + ".certs", result.getCerts(), expected.getCerts());
-        validateArray(name + ".certs", result.getCerts(), expected.getCerts());
-        validate(name + ".extensions", result.getExtensions(), expected.getExtensions());
-    }
-
-    /*
-        DVCSErrorNotice ::= SEQUENCE {
-            transactionStatus           PKIStatusInfo ,
-            transactionIdentifier       GeneralName OPTIONAL
-        }
-     */
-    private void validate(String name, DVCSErrorNotice result, DVCSErrorNotice expected)
-    {
-        if (areNull(name, result, expected))
-        {
-            return;
-        }
-        validate(name + ".transactionStatus", result.getTransactionStatus(), expected.getTransactionStatus());
-        validate(name + ".transactionIdentifier", result.getTransactionIdentifier(), expected.getTransactionIdentifier());
-    }
-
-    private static class Info
-    {
-        public String name;
-        public String base64;
-        public Object expected;
-
-        public Info(String name, String base64, Object expected)
-        {
-            this.name = name;
-            this.base64 = base64;
-            this.expected = expected;
-        }
-    }
-
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/dvcs/test/DVCSTestSetup.java b/bcpkix/src/main/java/org/bouncycastle/dvcs/test/DVCSTestSetup.java
deleted file mode 100644
index 3d86191..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/dvcs/test/DVCSTestSetup.java
+++ /dev/null
@@ -1,28 +0,0 @@
-
-package org.bouncycastle.dvcs.test;
-
-import java.security.Security;
-
-import junit.extensions.TestSetup;
-import junit.framework.Test;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-
-class DVCSTestSetup
-    extends TestSetup
-{
-    public DVCSTestSetup(Test test)
-    {
-        super(test);
-    }
-
-    protected void setUp()
-    {
-        Security.addProvider(new BouncyCastleProvider());
-    }
-
-    protected void tearDown()
-    {
-        Security.removeProvider(BouncyCastleProvider.PROVIDER_NAME);
-    }
-
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/dvcs/test/SHA1DigestCalculator.java b/bcpkix/src/main/java/org/bouncycastle/dvcs/test/SHA1DigestCalculator.java
deleted file mode 100644
index 82f3016..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/dvcs/test/SHA1DigestCalculator.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package org.bouncycastle.dvcs.test;
-
-import java.io.ByteArrayOutputStream;
-import java.io.OutputStream;
-
-import org.bouncycastle.asn1.oiw.OIWObjectIdentifiers;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.digests.SHA1Digest;
-import org.bouncycastle.operator.DigestCalculator;
-
-
-class SHA1DigestCalculator
-    implements DigestCalculator
-{
-    private ByteArrayOutputStream bOut = new ByteArrayOutputStream();
-
-    public AlgorithmIdentifier getAlgorithmIdentifier()
-    {
-        return new AlgorithmIdentifier(OIWObjectIdentifiers.idSHA1);
-    }
-
-    public OutputStream getOutputStream()
-    {
-        return bOut;
-    }
-
-    public byte[] getDigest()
-    {
-        byte[] bytes = bOut.toByteArray();
-
-        bOut.reset();
-
-        Digest sha1 = new SHA1Digest();
-
-        sha1.update(bytes, 0, bytes.length);
-
-        byte[] digest = new byte[sha1.getDigestSize()];
-
-        sha1.doFinal(digest, 0);
-
-        return digest;
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/eac/EACCertificateBuilder.java b/bcpkix/src/main/java/org/bouncycastle/eac/EACCertificateBuilder.java
deleted file mode 100644
index a5b3373..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/eac/EACCertificateBuilder.java
+++ /dev/null
@@ -1,83 +0,0 @@
-package org.bouncycastle.eac;
-
-import java.io.OutputStream;
-
-import org.bouncycastle.asn1.ASN1Encoding;
-import org.bouncycastle.asn1.DERApplicationSpecific;
-import org.bouncycastle.asn1.eac.CVCertificate;
-import org.bouncycastle.asn1.eac.CertificateBody;
-import org.bouncycastle.asn1.eac.CertificateHolderAuthorization;
-import org.bouncycastle.asn1.eac.CertificateHolderReference;
-import org.bouncycastle.asn1.eac.CertificationAuthorityReference;
-import org.bouncycastle.asn1.eac.EACTags;
-import org.bouncycastle.asn1.eac.PackedDate;
-import org.bouncycastle.asn1.eac.PublicKeyDataObject;
-import org.bouncycastle.eac.operator.EACSigner;
-
-public class EACCertificateBuilder
-{
-    private static final byte [] ZeroArray = new byte [] {0};
-
-    private PublicKeyDataObject publicKey;
-    private CertificateHolderAuthorization certificateHolderAuthorization;
-    private PackedDate certificateEffectiveDate;
-    private PackedDate certificateExpirationDate;
-    private CertificateHolderReference certificateHolderReference;
-    private CertificationAuthorityReference certificationAuthorityReference;
-
-    public EACCertificateBuilder(
-        CertificationAuthorityReference certificationAuthorityReference,
-        PublicKeyDataObject publicKey,
-        CertificateHolderReference certificateHolderReference,
-        CertificateHolderAuthorization certificateHolderAuthorization,
-        PackedDate certificateEffectiveDate,
-        PackedDate certificateExpirationDate)
-    {
-        this.certificationAuthorityReference = certificationAuthorityReference;
-        this.publicKey = publicKey;
-        this.certificateHolderReference = certificateHolderReference;
-        this.certificateHolderAuthorization = certificateHolderAuthorization;
-        this.certificateEffectiveDate = certificateEffectiveDate;
-        this.certificateExpirationDate = certificateExpirationDate;
-    }
-
-    private CertificateBody buildBody()
-    {
-        DERApplicationSpecific  certificateProfileIdentifier;
-
-        certificateProfileIdentifier = new DERApplicationSpecific(
-                EACTags.INTERCHANGE_PROFILE, ZeroArray);
-
-        CertificateBody body = new CertificateBody(
-                certificateProfileIdentifier,
-                certificationAuthorityReference,
-                publicKey,
-                certificateHolderReference,
-                certificateHolderAuthorization,
-                certificateEffectiveDate,
-                certificateExpirationDate);
-
-        return body;
-    }
-
-    public EACCertificateHolder build(EACSigner signer)
-        throws EACException
-    {
-        try
-        {
-            CertificateBody body = buildBody();
-
-            OutputStream vOut = signer.getOutputStream();
-
-            vOut.write(body.getEncoded(ASN1Encoding.DER));
-
-            vOut.close();
-
-            return new EACCertificateHolder(new CVCertificate(body, signer.getSignature()));
-        }
-        catch (Exception e)
-        {
-            throw new EACException("unable to process signature: " + e.getMessage(), e);
-        }
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/eac/EACCertificateHolder.java b/bcpkix/src/main/java/org/bouncycastle/eac/EACCertificateHolder.java
deleted file mode 100644
index c5e2033..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/eac/EACCertificateHolder.java
+++ /dev/null
@@ -1,88 +0,0 @@
-package org.bouncycastle.eac;
-
-import java.io.IOException;
-import java.io.OutputStream;
-
-import org.bouncycastle.asn1.ASN1Encoding;
-import org.bouncycastle.asn1.ASN1ParsingException;
-import org.bouncycastle.asn1.eac.CVCertificate;
-import org.bouncycastle.asn1.eac.PublicKeyDataObject;
-import org.bouncycastle.eac.operator.EACSignatureVerifier;
-
-public class EACCertificateHolder
-{
-    private CVCertificate cvCertificate;
-
-    private static CVCertificate parseBytes(byte[] certEncoding)
-        throws IOException
-    {
-        try
-        {
-            return CVCertificate.getInstance(certEncoding);
-        }
-        catch (ClassCastException e)
-        {
-            throw new EACIOException("malformed data: " + e.getMessage(), e);
-        }
-        catch (IllegalArgumentException e)
-        {
-            throw new EACIOException("malformed data: " + e.getMessage(), e);
-        }
-        catch (ASN1ParsingException e)
-        {
-            if (e.getCause() instanceof IOException)
-            {
-                throw (IOException)e.getCause();
-            }
-            else
-            {
-                throw new EACIOException("malformed data: " + e.getMessage(), e);
-            }
-        }
-    }
-
-    public EACCertificateHolder(byte[] certEncoding)
-        throws IOException
-    {
-        this(parseBytes(certEncoding));
-    }
-
-    public EACCertificateHolder(CVCertificate cvCertificate)
-    {
-        this.cvCertificate = cvCertificate;
-    }
-
-    /**
-     * Return the underlying ASN.1 structure for the certificate in this holder.
-     *
-     * @return a X509CertificateStructure object.
-     */
-    public CVCertificate toASN1Structure()
-    {
-        return cvCertificate;
-    }
-
-    public PublicKeyDataObject getPublicKeyDataObject()
-    {
-        return cvCertificate.getBody().getPublicKey();
-    }
-
-    public boolean isSignatureValid(EACSignatureVerifier verifier)
-        throws EACException
-    {
-        try
-        {
-            OutputStream vOut = verifier.getOutputStream();
-
-            vOut.write(cvCertificate.getBody().getEncoded(ASN1Encoding.DER));
-
-            vOut.close();
-
-            return verifier.verify(cvCertificate.getSignature());
-        }
-        catch (Exception e)
-        {
-            throw new EACException("unable to process signature: " + e.getMessage(), e);
-        }
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/eac/EACCertificateRequestHolder.java b/bcpkix/src/main/java/org/bouncycastle/eac/EACCertificateRequestHolder.java
deleted file mode 100644
index 560b730..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/eac/EACCertificateRequestHolder.java
+++ /dev/null
@@ -1,88 +0,0 @@
-package org.bouncycastle.eac;
-
-import java.io.IOException;
-import java.io.OutputStream;
-
-import org.bouncycastle.asn1.ASN1Encoding;
-import org.bouncycastle.asn1.ASN1ParsingException;
-import org.bouncycastle.asn1.eac.CVCertificateRequest;
-import org.bouncycastle.asn1.eac.PublicKeyDataObject;
-import org.bouncycastle.eac.operator.EACSignatureVerifier;
-
-public class EACCertificateRequestHolder
-{
-    private CVCertificateRequest request;
-
-    private static CVCertificateRequest parseBytes(byte[] requestEncoding)
-        throws IOException
-    {
-        try
-        {
-            return CVCertificateRequest.getInstance(requestEncoding);
-        }
-        catch (ClassCastException e)
-        {
-            throw new EACIOException("malformed data: " + e.getMessage(), e);
-        }
-        catch (IllegalArgumentException e)
-        {
-            throw new EACIOException("malformed data: " + e.getMessage(), e);
-        }
-        catch (ASN1ParsingException e)
-        {
-            if (e.getCause() instanceof IOException)
-            {
-                throw (IOException)e.getCause();
-            }
-            else
-            {
-                throw new EACIOException("malformed data: " + e.getMessage(), e);
-            }
-        }
-    }
-
-    public EACCertificateRequestHolder(byte[] certEncoding)
-        throws IOException
-    {
-        this(parseBytes(certEncoding));
-    }
-
-    public EACCertificateRequestHolder(CVCertificateRequest request)
-    {
-        this.request = request;
-    }
-
-    /**
-     * Return the underlying ASN.1 structure for the certificate in this holder.
-     *
-     * @return a X509CertificateStructure object.
-     */
-    public CVCertificateRequest toASN1Structure()
-    {
-        return request;
-    }
-
-    public PublicKeyDataObject getPublicKeyDataObject()
-    {
-        return request.getPublicKey();
-    }
-
-    public boolean isInnerSignatureValid(EACSignatureVerifier verifier)
-        throws EACException
-    {
-        try
-        {
-            OutputStream vOut = verifier.getOutputStream();
-
-            vOut.write(request.getCertificateBody().getEncoded(ASN1Encoding.DER));
-
-            vOut.close();
-
-            return verifier.verify(request.getInnerSignature());
-        }
-        catch (Exception e)
-        {
-            throw new EACException("unable to process signature: " + e.getMessage(), e);
-        }
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/eac/EACException.java b/bcpkix/src/main/java/org/bouncycastle/eac/EACException.java
deleted file mode 100644
index b6e02cf..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/eac/EACException.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package org.bouncycastle.eac;
-
-/**
- * General checked Exception thrown in the cert package and its sub-packages.
- */
-public class EACException
-    extends Exception
-{
-    private Throwable cause;
-
-    public EACException(String msg, Throwable cause)
-    {
-        super(msg);
-
-        this.cause = cause;
-    }
-
-    public EACException(String msg)
-    {
-        super(msg);
-    }
-
-    public Throwable getCause()
-    {
-        return cause;
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/eac/EACIOException.java b/bcpkix/src/main/java/org/bouncycastle/eac/EACIOException.java
deleted file mode 100644
index 8aa480b..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/eac/EACIOException.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package org.bouncycastle.eac;
-
-import java.io.IOException;
-
-/**
- * General IOException thrown in the cert package and its sub-packages.
- */
-public class EACIOException
-    extends IOException
-{
-    private Throwable cause;
-
-    public EACIOException(String msg, Throwable cause)
-    {
-        super(msg);
-
-        this.cause = cause;
-    }
-
-    public EACIOException(String msg)
-    {
-        super(msg);
-    }
-
-    public Throwable getCause()
-    {
-        return cause;
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/eac/jcajce/DefaultEACHelper.java b/bcpkix/src/main/java/org/bouncycastle/eac/jcajce/DefaultEACHelper.java
deleted file mode 100644
index d281fb3..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/eac/jcajce/DefaultEACHelper.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package org.bouncycastle.eac.jcajce;
-
-import java.security.KeyFactory;
-import java.security.NoSuchAlgorithmException;
-
-class DefaultEACHelper
-    implements EACHelper
-{
-    public KeyFactory createKeyFactory(String type)
-        throws NoSuchAlgorithmException
-    {
-        return KeyFactory.getInstance(type);
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/eac/jcajce/EACHelper.java b/bcpkix/src/main/java/org/bouncycastle/eac/jcajce/EACHelper.java
deleted file mode 100644
index 8c42a63..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/eac/jcajce/EACHelper.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package org.bouncycastle.eac.jcajce;
-
-import java.security.KeyFactory;
-import java.security.NoSuchAlgorithmException;
-import java.security.NoSuchProviderException;
-
-interface EACHelper
-{
-    KeyFactory createKeyFactory(String type)
-        throws NoSuchProviderException, NoSuchAlgorithmException;
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/eac/jcajce/JcaPublicKeyConverter.java b/bcpkix/src/main/java/org/bouncycastle/eac/jcajce/JcaPublicKeyConverter.java
deleted file mode 100644
index f47709b..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/eac/jcajce/JcaPublicKeyConverter.java
+++ /dev/null
@@ -1,168 +0,0 @@
-package org.bouncycastle.eac.jcajce;
-
-import java.math.BigInteger;
-import java.security.KeyFactory;
-import java.security.NoSuchAlgorithmException;
-import java.security.NoSuchProviderException;
-import java.security.Provider;
-import java.security.PublicKey;
-import java.security.interfaces.ECPublicKey;
-import java.security.spec.ECField;
-import java.security.spec.ECFieldFp;
-import java.security.spec.EllipticCurve;
-import java.security.spec.InvalidKeySpecException;
-import java.security.spec.RSAPublicKeySpec;
-
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.eac.EACObjectIdentifiers;
-import org.bouncycastle.asn1.eac.ECDSAPublicKey;
-import org.bouncycastle.asn1.eac.PublicKeyDataObject;
-import org.bouncycastle.asn1.eac.RSAPublicKey;
-import org.bouncycastle.eac.EACException;
-import org.bouncycastle.jce.spec.ECParameterSpec;
-import org.bouncycastle.jce.spec.ECPublicKeySpec;
-import org.bouncycastle.math.ec.ECCurve;
-import org.bouncycastle.math.ec.ECPoint;
-
-public class JcaPublicKeyConverter
-{
-    private EACHelper helper = new DefaultEACHelper();
-
-    public JcaPublicKeyConverter setProvider(String providerName)
-    {
-        this.helper = new NamedEACHelper(providerName);
-
-        return this;
-    }
-
-    public JcaPublicKeyConverter setProvider(Provider provider)
-    {
-        this.helper = new ProviderEACHelper(provider);
-
-        return this;
-    }
-
-    public PublicKey getKey(PublicKeyDataObject publicKeyDataObject)
-        throws EACException, InvalidKeySpecException
-    {
-        if (publicKeyDataObject.getUsage().on(EACObjectIdentifiers.id_TA_ECDSA))
-        {
-            return getECPublicKeyPublicKey((ECDSAPublicKey)publicKeyDataObject);
-        }
-        else
-        {
-            RSAPublicKey pubKey = (RSAPublicKey)publicKeyDataObject;
-            RSAPublicKeySpec pubKeySpec = new RSAPublicKeySpec(pubKey.getModulus(), pubKey.getPublicExponent());
-
-            try
-            {
-                KeyFactory factk = helper.createKeyFactory("RSA");
-
-                return factk.generatePublic(pubKeySpec);
-            }
-            catch (NoSuchProviderException e)
-            {
-                throw new EACException("cannot find provider: " + e.getMessage(), e);
-            }
-            catch (NoSuchAlgorithmException e)
-            {
-                throw new EACException("cannot find algorithm ECDSA: " + e.getMessage(), e);
-            }
-        }
-    }
-
-    private PublicKey getECPublicKeyPublicKey(ECDSAPublicKey key)
-        throws EACException, InvalidKeySpecException
-    {
-        ECParameterSpec spec = getParams(key);
-        ECCurve curve = spec.getCurve();
-
-        ECPoint point = curve.decodePoint(key.getPublicPointY());
-        ECPublicKeySpec pubKeySpec = new ECPublicKeySpec(point, spec);
-
-        KeyFactory factk;
-        try
-        {
-            factk = helper.createKeyFactory("ECDSA");
-        }
-        catch (NoSuchProviderException e)
-        {
-            throw new EACException("cannot find provider: " + e.getMessage(), e);
-        }
-        catch (NoSuchAlgorithmException e)
-        {
-            throw new EACException("cannot find algorithm ECDSA: " + e.getMessage(), e);
-        }
-
-        return factk.generatePublic(pubKeySpec);
-    }
-
-    private ECParameterSpec getParams(ECDSAPublicKey key)
-    {
-        if (!key.hasParameters())
-        {
-            throw new IllegalArgumentException("Public key does not contains EC Params");
-        }
-
-        BigInteger p = key.getPrimeModulusP();
-        ECCurve.Fp curve = new ECCurve.Fp(p, key.getFirstCoefA(), key.getSecondCoefB());
-
-        ECPoint G = curve.decodePoint(key.getBasePointG());
-
-        BigInteger order = key.getOrderOfBasePointR();
-        BigInteger coFactor = key.getCofactorF();
-                   // TODO: update to use JDK 1.5 EC API
-        ECParameterSpec ecspec = new ECParameterSpec(curve, G, order, coFactor);
-
-        return ecspec;
-    }
-
-    public PublicKeyDataObject getPublicKeyDataObject(ASN1ObjectIdentifier usage, PublicKey publicKey)
-    {
-        if (publicKey instanceof java.security.interfaces.RSAPublicKey)
-        {
-            java.security.interfaces.RSAPublicKey pubKey = (java.security.interfaces.RSAPublicKey)publicKey;
-
-            return new RSAPublicKey(usage, pubKey.getModulus(), pubKey.getPublicExponent());
-        }
-        else
-        {
-            ECPublicKey pubKey = (ECPublicKey)publicKey;
-            java.security.spec.ECParameterSpec params = pubKey.getParams();
-
-            return new ECDSAPublicKey(
-                usage,
-                ((ECFieldFp)params.getCurve().getField()).getP(),
-                params.getCurve().getA(), params.getCurve().getB(),
-                convertPoint(convertCurve(params.getCurve()), params.getGenerator(), false).getEncoded(),
-                params.getOrder(),
-                convertPoint(convertCurve(params.getCurve()), pubKey.getW(), false).getEncoded(),
-                params.getCofactor());
-        }
-    }
-
-    private static org.bouncycastle.math.ec.ECPoint convertPoint(
-        ECCurve curve,
-        java.security.spec.ECPoint point,
-        boolean withCompression)
-    {
-        return curve.createPoint(point.getAffineX(), point.getAffineY(), withCompression);
-    }
-
-    private static ECCurve convertCurve(
-        EllipticCurve ec)
-    {
-        ECField field = ec.getField();
-        BigInteger a = ec.getA();
-        BigInteger b = ec.getB();
-
-        if (field instanceof ECFieldFp)
-        {
-            return new ECCurve.Fp(((ECFieldFp)field).getP(), a, b);
-        }
-        else
-        {
-            throw new IllegalStateException("not implemented yet!!!");
-        }
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/eac/jcajce/NamedEACHelper.java b/bcpkix/src/main/java/org/bouncycastle/eac/jcajce/NamedEACHelper.java
deleted file mode 100644
index e1af5be..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/eac/jcajce/NamedEACHelper.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package org.bouncycastle.eac.jcajce;
-
-import java.security.KeyFactory;
-import java.security.NoSuchAlgorithmException;
-import java.security.NoSuchProviderException;
-
-class NamedEACHelper
-    implements EACHelper
-{
-    private final String providerName;
-
-    NamedEACHelper(String providerName)
-    {
-        this.providerName = providerName;
-    }
-
-    public KeyFactory createKeyFactory(String type)
-        throws NoSuchProviderException, NoSuchAlgorithmException
-    {
-        return KeyFactory.getInstance(type, providerName);
-    }
-}
\ No newline at end of file
diff --git a/bcpkix/src/main/java/org/bouncycastle/eac/jcajce/ProviderEACHelper.java b/bcpkix/src/main/java/org/bouncycastle/eac/jcajce/ProviderEACHelper.java
deleted file mode 100644
index 5ecfee9..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/eac/jcajce/ProviderEACHelper.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package org.bouncycastle.eac.jcajce;
-
-import java.security.KeyFactory;
-import java.security.NoSuchAlgorithmException;
-import java.security.Provider;
-
-class ProviderEACHelper
-    implements EACHelper
-{
-    private final Provider provider;
-
-    ProviderEACHelper(Provider provider)
-    {
-        this.provider = provider;
-    }
-
-    public KeyFactory createKeyFactory(String type)
-        throws NoSuchAlgorithmException
-    {
-        return KeyFactory.getInstance(type, provider);
-    }
-}
\ No newline at end of file
diff --git a/bcpkix/src/main/java/org/bouncycastle/eac/operator/EACSignatureVerifier.java b/bcpkix/src/main/java/org/bouncycastle/eac/operator/EACSignatureVerifier.java
deleted file mode 100644
index 2cd4b50..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/eac/operator/EACSignatureVerifier.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package org.bouncycastle.eac.operator;
-
-import java.io.OutputStream;
-
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-
-public interface EACSignatureVerifier
-{
-    /**
-     * Return the usage OID specifying the signature type.
-     *
-     * @return algorithm oid.
-     */
-    ASN1ObjectIdentifier getUsageIdentifier();
-
-    /**
-     * Returns a stream that will accept data for the purpose of calculating
-     * a signature for later verification. Use org.bouncycastle.util.io.TeeOutputStream if you want to accumulate
-     * the data on the fly as well.
-     *
-     * @return an OutputStream
-     */
-    OutputStream getOutputStream();
-
-    /**
-     * @param expected expected value of the signature on the data.
-     * @return true if the signature verifies, false otherwise
-     */
-    boolean verify(byte[] expected);
-}
\ No newline at end of file
diff --git a/bcpkix/src/main/java/org/bouncycastle/eac/operator/EACSigner.java b/bcpkix/src/main/java/org/bouncycastle/eac/operator/EACSigner.java
deleted file mode 100644
index 999d812..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/eac/operator/EACSigner.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package org.bouncycastle.eac.operator;
-
-import java.io.OutputStream;
-
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-
-public interface EACSigner
-{
-    ASN1ObjectIdentifier getUsageIdentifier();
-
-    /**
-     * Returns a stream that will accept data for the purpose of calculating
-     * a signature. Use org.bouncycastle.util.io.TeeOutputStream if you want to accumulate
-     * the data on the fly as well.
-     *
-     * @return an OutputStream
-     */
-    OutputStream getOutputStream();
-
-    /**
-     * Returns a signature based on the current data written to the stream, since the
-     * start or the last call to getSignature().
-     *
-     * @return bytes representing the signature.
-     */
-    byte[] getSignature();
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/eac/operator/jcajce/DefaultEACHelper.java b/bcpkix/src/main/java/org/bouncycastle/eac/operator/jcajce/DefaultEACHelper.java
deleted file mode 100644
index a84fda7..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/eac/operator/jcajce/DefaultEACHelper.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package org.bouncycastle.eac.operator.jcajce;
-
-import java.security.NoSuchAlgorithmException;
-import java.security.Signature;
-
-class DefaultEACHelper
-    extends EACHelper
-{
-    protected Signature createSignature(String type)
-        throws NoSuchAlgorithmException
-    {
-        return Signature.getInstance(type);
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/eac/operator/jcajce/EACHelper.java b/bcpkix/src/main/java/org/bouncycastle/eac/operator/jcajce/EACHelper.java
deleted file mode 100644
index da756ff..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/eac/operator/jcajce/EACHelper.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package org.bouncycastle.eac.operator.jcajce;
-
-import java.security.NoSuchAlgorithmException;
-import java.security.NoSuchProviderException;
-import java.security.Signature;
-import java.util.Hashtable;
-
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.eac.EACObjectIdentifiers;
-
-abstract class EACHelper
-{
-    private static final Hashtable sigNames = new Hashtable();
-
-    static
-    {
-        sigNames.put(EACObjectIdentifiers.id_TA_RSA_v1_5_SHA_1, "SHA1withRSA");
-        sigNames.put(EACObjectIdentifiers.id_TA_RSA_v1_5_SHA_256, "SHA256withRSA");
-        sigNames.put(EACObjectIdentifiers.id_TA_RSA_PSS_SHA_1, "SHA1withRSAandMGF1");
-        sigNames.put(EACObjectIdentifiers.id_TA_RSA_PSS_SHA_256, "SHA256withRSAandMGF1");
-        sigNames.put(EACObjectIdentifiers.id_TA_RSA_v1_5_SHA_512, "SHA512withRSA");
-        sigNames.put(EACObjectIdentifiers.id_TA_RSA_PSS_SHA_512, "SHA512withRSAandMGF1");
-
-        sigNames.put(EACObjectIdentifiers.id_TA_ECDSA_SHA_1, "SHA1withECDSA");
-        sigNames.put(EACObjectIdentifiers.id_TA_ECDSA_SHA_224, "SHA224withECDSA");
-        sigNames.put(EACObjectIdentifiers.id_TA_ECDSA_SHA_256, "SHA256withECDSA");
-        sigNames.put(EACObjectIdentifiers.id_TA_ECDSA_SHA_384, "SHA384withECDSA");
-        sigNames.put(EACObjectIdentifiers.id_TA_ECDSA_SHA_512, "SHA512withECDSA");
-    }
-
-    public Signature getSignature(ASN1ObjectIdentifier oid)
-        throws NoSuchProviderException, NoSuchAlgorithmException
-    {
-        return createSignature((String)sigNames.get(oid));
-    }
-
-    protected abstract Signature createSignature(String type)
-        throws NoSuchProviderException, NoSuchAlgorithmException;
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/eac/operator/jcajce/EACUtil.java b/bcpkix/src/main/java/org/bouncycastle/eac/operator/jcajce/EACUtil.java
deleted file mode 100644
index 5e5942a..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/eac/operator/jcajce/EACUtil.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package org.bouncycastle.eac.operator.jcajce;
-
-class EACUtil
-{
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/eac/operator/jcajce/JcaEACSignatureVerifierBuilder.java b/bcpkix/src/main/java/org/bouncycastle/eac/operator/jcajce/JcaEACSignatureVerifierBuilder.java
deleted file mode 100644
index 5115642..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/eac/operator/jcajce/JcaEACSignatureVerifierBuilder.java
+++ /dev/null
@@ -1,181 +0,0 @@
-package org.bouncycastle.eac.operator.jcajce;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.math.BigInteger;
-import java.security.InvalidKeyException;
-import java.security.NoSuchAlgorithmException;
-import java.security.NoSuchProviderException;
-import java.security.Provider;
-import java.security.PublicKey;
-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.DERSequence;
-import org.bouncycastle.asn1.eac.EACObjectIdentifiers;
-import org.bouncycastle.eac.operator.EACSignatureVerifier;
-import org.bouncycastle.operator.OperatorCreationException;
-import org.bouncycastle.operator.OperatorStreamException;
-import org.bouncycastle.operator.RuntimeOperatorException;
-
-public class JcaEACSignatureVerifierBuilder
-{
-    private EACHelper helper = new DefaultEACHelper();
-
-    public JcaEACSignatureVerifierBuilder setProvider(String providerName)
-    {
-        this.helper = new NamedEACHelper(providerName);
-
-        return this;
-    }
-
-    public JcaEACSignatureVerifierBuilder setProvider(Provider provider)
-    {
-        this.helper = new ProviderEACHelper(provider);
-
-        return this;
-    }
-
-    public EACSignatureVerifier build(final ASN1ObjectIdentifier usageOid, PublicKey pubKey)
-        throws OperatorCreationException
-    {
-        Signature sig;
-        try
-        {
-            sig = helper.getSignature(usageOid);
-
-            sig.initVerify(pubKey);
-        }
-        catch (NoSuchAlgorithmException e)
-        {
-            throw new OperatorCreationException("unable to find algorithm: " + e.getMessage(), e);
-        }
-        catch (NoSuchProviderException e)
-        {
-            throw new OperatorCreationException("unable to find provider: " + e.getMessage(), e);
-        }
-        catch (InvalidKeyException e)
-        {
-            throw new OperatorCreationException("invalid key: " + e.getMessage(), e);
-        }
-
-        final SignatureOutputStream sigStream = new SignatureOutputStream(sig);
-
-        return new EACSignatureVerifier()
-        {
-            public ASN1ObjectIdentifier getUsageIdentifier()
-            {
-                return usageOid;
-            }
-
-            public OutputStream getOutputStream()
-            {
-                return sigStream;
-            }
-
-            public boolean verify(byte[] expected)
-            {
-                try
-                {
-                    if (usageOid.on(EACObjectIdentifiers.id_TA_ECDSA))
-                    {
-                        try
-                        {
-                            byte[] reencoded = derEncode(expected);
-
-                            return sigStream.verify(reencoded);
-                        }
-                        catch (Exception e)
-                        {
-                            return false;
-                        }
-                    }
-                    else
-                    {
-                        return sigStream.verify(expected);
-                    }
-                }
-                catch (SignatureException e)
-                {
-                    throw new RuntimeOperatorException("exception obtaining signature: " + e.getMessage(), e);
-                }
-            }
-        };
-    }
-
-    private static byte[] derEncode(byte[] rawSign) throws IOException
-    {
-        int len = rawSign.length / 2;
-
-        byte[] r = new byte[len];
-        byte[] s = new byte[len];
-        System.arraycopy(rawSign, 0, r, 0, len);
-        System.arraycopy(rawSign, len, s, 0, len);
-
-        ASN1EncodableVector v = new ASN1EncodableVector();
-        v.add(new ASN1Integer(new BigInteger(1, r)));
-        v.add(new ASN1Integer(new BigInteger(1, s)));
-
-        DERSequence seq = new DERSequence(v);
-        return seq.getEncoded();
-    }
-
-    private class SignatureOutputStream
-        extends OutputStream
-    {
-        private Signature sig;
-
-        SignatureOutputStream(Signature sig)
-        {
-            this.sig = sig;
-        }
-
-        public void write(byte[] bytes, int off, int len)
-            throws IOException
-        {
-            try
-            {
-                sig.update(bytes, off, len);
-            }
-            catch (SignatureException e)
-            {
-                throw new OperatorStreamException("exception in content signer: " + e.getMessage(), e);
-            }
-        }
-
-        public void write(byte[] bytes)
-            throws IOException
-        {
-            try
-            {
-                sig.update(bytes);
-            }
-            catch (SignatureException e)
-            {
-                throw new OperatorStreamException("exception in content signer: " + e.getMessage(), e);
-            }
-        }
-
-        public void write(int b)
-            throws IOException
-        {
-            try
-            {
-                sig.update((byte)b);
-            }
-            catch (SignatureException e)
-            {
-                throw new OperatorStreamException("exception in content signer: " + e.getMessage(), e);
-            }
-        }
-
-        boolean verify(byte[] expected)
-            throws SignatureException
-        {
-            return sig.verify(expected);
-        }
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/eac/operator/jcajce/JcaEACSignerBuilder.java b/bcpkix/src/main/java/org/bouncycastle/eac/operator/jcajce/JcaEACSignerBuilder.java
deleted file mode 100644
index 380ec14..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/eac/operator/jcajce/JcaEACSignerBuilder.java
+++ /dev/null
@@ -1,234 +0,0 @@
-package org.bouncycastle.eac.operator.jcajce;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.math.BigInteger;
-import java.security.InvalidKeyException;
-import java.security.NoSuchAlgorithmException;
-import java.security.NoSuchProviderException;
-import java.security.PrivateKey;
-import java.security.Provider;
-import java.security.Signature;
-import java.security.SignatureException;
-import java.util.Arrays;
-import java.util.Hashtable;
-
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.eac.EACObjectIdentifiers;
-import org.bouncycastle.eac.operator.EACSigner;
-import org.bouncycastle.operator.OperatorCreationException;
-import org.bouncycastle.operator.OperatorStreamException;
-import org.bouncycastle.operator.RuntimeOperatorException;
-
-public class JcaEACSignerBuilder
-{
-    private static final Hashtable sigNames = new Hashtable();
-
-    static
-    {
-        sigNames.put("SHA1withRSA", EACObjectIdentifiers.id_TA_RSA_v1_5_SHA_1);
-        sigNames.put("SHA256withRSA", EACObjectIdentifiers.id_TA_RSA_v1_5_SHA_256);
-        sigNames.put("SHA1withRSAandMGF1", EACObjectIdentifiers.id_TA_RSA_PSS_SHA_1);
-        sigNames.put("SHA256withRSAandMGF1", EACObjectIdentifiers.id_TA_RSA_PSS_SHA_256);
-        sigNames.put("SHA512withRSA", EACObjectIdentifiers.id_TA_RSA_v1_5_SHA_512);
-        sigNames.put("SHA512withRSAandMGF1", EACObjectIdentifiers.id_TA_RSA_PSS_SHA_512);
-
-        sigNames.put("SHA1withECDSA", EACObjectIdentifiers.id_TA_ECDSA_SHA_1);
-        sigNames.put("SHA224withECDSA", EACObjectIdentifiers.id_TA_ECDSA_SHA_224);
-        sigNames.put("SHA256withECDSA", EACObjectIdentifiers.id_TA_ECDSA_SHA_256);
-        sigNames.put("SHA384withECDSA", EACObjectIdentifiers.id_TA_ECDSA_SHA_384);
-        sigNames.put("SHA512withECDSA", EACObjectIdentifiers.id_TA_ECDSA_SHA_512);
-    }
-
-    private EACHelper helper = new DefaultEACHelper();
-
-    public JcaEACSignerBuilder setProvider(String providerName)
-    {
-        this.helper = new NamedEACHelper(providerName);
-
-        return this;
-    }
-
-    public JcaEACSignerBuilder setProvider(Provider provider)
-    {
-        this.helper = new ProviderEACHelper(provider);
-
-        return this;
-    }
-
-    public EACSigner build(String algorithm, PrivateKey privKey)
-        throws OperatorCreationException
-    {
-        return build((ASN1ObjectIdentifier)sigNames.get(algorithm), privKey);
-    }
-
-    public EACSigner build(final ASN1ObjectIdentifier usageOid, PrivateKey privKey)
-        throws OperatorCreationException
-    {
-        Signature sig;
-        try
-        {
-            sig = helper.getSignature(usageOid);
-
-            sig.initSign(privKey);
-        }
-        catch (NoSuchAlgorithmException e)
-        {
-            throw new OperatorCreationException("unable to find algorithm: " + e.getMessage(), e);
-        }
-        catch (NoSuchProviderException e)
-        {
-            throw new OperatorCreationException("unable to find provider: " + e.getMessage(), e);
-        }
-        catch (InvalidKeyException e)
-        {
-            throw new OperatorCreationException("invalid key: " + e.getMessage(), e);
-        }
-
-        final SignatureOutputStream sigStream = new SignatureOutputStream(sig);
-
-        return new EACSigner()
-        {
-            public ASN1ObjectIdentifier getUsageIdentifier()
-            {
-                return usageOid;
-            }
-
-            public OutputStream getOutputStream()
-            {
-                return sigStream;
-            }
-
-            public byte[] getSignature()
-            {
-                try
-                {
-                    byte[] signature = sigStream.getSignature();
-
-                    if (usageOid.on(EACObjectIdentifiers.id_TA_ECDSA))
-                    {
-                        return reencode(signature);
-                    }
-
-                    return signature;
-                }
-                catch (SignatureException e)
-                {
-                    throw new RuntimeOperatorException("exception obtaining signature: " + e.getMessage(), e);
-                }
-            }
-        };
-    }
-
-    public static int max(int el1, int el2)
-    {
-        return el1 > el2 ? el1 : el2;
-    }
-
-    private static byte[] reencode(byte[] rawSign)
-    {
-        ASN1Sequence sData = ASN1Sequence.getInstance(rawSign);
-
-        BigInteger r = ASN1Integer.getInstance(sData.getObjectAt(0)).getValue();
-        BigInteger s = ASN1Integer.getInstance(sData.getObjectAt(1)).getValue();
-
-        byte[] rB = r.toByteArray();
-        byte[] sB = s.toByteArray();
-
-        int rLen = unsignedIntLength(rB);
-        int sLen = unsignedIntLength(sB);
-
-        byte[] ret;
-        int len = max(rLen, sLen);
-
-        ret = new byte[len * 2];
-        Arrays.fill(ret, (byte)0);
-
-        copyUnsignedInt(rB, ret, len - rLen);
-        copyUnsignedInt(sB, ret, 2 * len - sLen);
-
-        return ret;
-    }
-
-    private static int unsignedIntLength(byte[] i)
-    {
-        int len = i.length;
-        if (i[0] == 0)
-        {
-            len--;
-        }
-
-        return len;
-    }
-
-    private static void copyUnsignedInt(byte[] src, byte[] dst, int offset)
-    {
-        int len = src.length;
-        int readoffset = 0;
-        if (src[0] == 0)
-        {
-            len--;
-            readoffset = 1;
-        }
-
-        System.arraycopy(src, readoffset, dst, offset, len);
-    }
-
-    private class SignatureOutputStream
-        extends OutputStream
-    {
-        private Signature sig;
-
-        SignatureOutputStream(Signature sig)
-        {
-            this.sig = sig;
-        }
-
-        public void write(byte[] bytes, int off, int len)
-            throws IOException
-        {
-            try
-            {
-                sig.update(bytes, off, len);
-            }
-            catch (SignatureException e)
-            {
-                throw new OperatorStreamException("exception in content signer: " + e.getMessage(), e);
-            }
-        }
-
-        public void write(byte[] bytes)
-            throws IOException
-        {
-            try
-            {
-                sig.update(bytes);
-            }
-            catch (SignatureException e)
-            {
-                throw new OperatorStreamException("exception in content signer: " + e.getMessage(), e);
-            }
-        }
-
-        public void write(int b)
-            throws IOException
-        {
-            try
-            {
-                sig.update((byte)b);
-            }
-            catch (SignatureException e)
-            {
-                throw new OperatorStreamException("exception in content signer: " + e.getMessage(), e);
-            }
-        }
-
-        byte[] getSignature()
-            throws SignatureException
-        {
-            return sig.sign();
-        }
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/eac/operator/jcajce/NamedEACHelper.java b/bcpkix/src/main/java/org/bouncycastle/eac/operator/jcajce/NamedEACHelper.java
deleted file mode 100644
index 511cfcf..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/eac/operator/jcajce/NamedEACHelper.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package org.bouncycastle.eac.operator.jcajce;
-
-import java.security.NoSuchAlgorithmException;
-import java.security.NoSuchProviderException;
-import java.security.Signature;
-
-class NamedEACHelper
-    extends EACHelper
-{
-    private final String providerName;
-
-    NamedEACHelper(String providerName)
-    {
-        this.providerName = providerName;
-    }
-
-    protected Signature createSignature(String type)
-        throws NoSuchProviderException, NoSuchAlgorithmException
-    {
-        return Signature.getInstance(type, providerName);
-    }
-}
\ No newline at end of file
diff --git a/bcpkix/src/main/java/org/bouncycastle/eac/operator/jcajce/ProviderEACHelper.java b/bcpkix/src/main/java/org/bouncycastle/eac/operator/jcajce/ProviderEACHelper.java
deleted file mode 100644
index 148a41e..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/eac/operator/jcajce/ProviderEACHelper.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package org.bouncycastle.eac.operator.jcajce;
-
-import java.security.NoSuchAlgorithmException;
-import java.security.Provider;
-import java.security.Signature;
-
-class ProviderEACHelper
-    extends EACHelper
-{
-    private final Provider provider;
-
-    ProviderEACHelper(Provider provider)
-    {
-        this.provider = provider;
-    }
-
-    protected Signature createSignature(String type)
-        throws NoSuchAlgorithmException
-    {
-        return Signature.getInstance(type, provider);
-    }
-}
\ No newline at end of file
diff --git a/bcpkix/src/main/java/org/bouncycastle/eac/package.html b/bcpkix/src/main/java/org/bouncycastle/eac/package.html
deleted file mode 100644
index 97c41fa..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/eac/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body bgcolor="#ffffff">
-Base classes Extended Access Control (EAC) Certificates as described in "Technical Guideline, Advanced Security Mechanisms for Machine Readable Travel Documents, Extended Access Control (EAC), Version 1.0.1, BSI 2006".
-</body>
-</html>
diff --git a/bcpkix/src/main/java/org/bouncycastle/eac/test/AllTests.java b/bcpkix/src/main/java/org/bouncycastle/eac/test/AllTests.java
deleted file mode 100644
index f819855..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/eac/test/AllTests.java
+++ /dev/null
@@ -1,201 +0,0 @@
-package org.bouncycastle.eac.test;
-
-import java.io.IOException;
-import java.security.InvalidAlgorithmParameterException;
-import java.security.KeyPair;
-import java.security.KeyPairGenerator;
-import java.security.NoSuchAlgorithmException;
-import java.security.NoSuchProviderException;
-import java.security.PublicKey;
-import java.security.SecureRandom;
-import java.security.Security;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import org.bouncycastle.asn1.eac.CertificateHolderAuthorization;
-import org.bouncycastle.asn1.eac.CertificateHolderReference;
-import org.bouncycastle.asn1.eac.CertificationAuthorityReference;
-import org.bouncycastle.asn1.eac.EACObjectIdentifiers;
-import org.bouncycastle.asn1.eac.PackedDate;
-import org.bouncycastle.eac.EACCertificateBuilder;
-import org.bouncycastle.eac.EACCertificateHolder;
-import org.bouncycastle.eac.EACCertificateRequestHolder;
-import org.bouncycastle.eac.jcajce.JcaPublicKeyConverter;
-import org.bouncycastle.eac.operator.EACSignatureVerifier;
-import org.bouncycastle.eac.operator.EACSigner;
-import org.bouncycastle.eac.operator.jcajce.JcaEACSignatureVerifierBuilder;
-import org.bouncycastle.eac.operator.jcajce.JcaEACSignerBuilder;
-import org.bouncycastle.jce.ECNamedCurveTable;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.jce.spec.ECParameterSpec;
-import org.bouncycastle.util.io.Streams;
-
-public class AllTests
-    extends TestCase
-{
-    private static final String BC = BouncyCastleProvider.PROVIDER_NAME;
-
-    public void setUp()
-    {
-        if (Security.getProvider(BC) != null)
-        {
-            Security.addProvider(new BouncyCastleProvider());
-        }
-    }
-
-    public void testLoadCertificate() throws Exception
-    {
-        EACCertificateHolder certHolder = new EACCertificateHolder(getInput("Belgique CVCA-02032010.7816.cvcert"));
-
-        PublicKey pubKey = new JcaPublicKeyConverter().setProvider(BC).getKey(certHolder.getPublicKeyDataObject());
-        EACSignatureVerifier verifier = new JcaEACSignatureVerifierBuilder().build(certHolder.getPublicKeyDataObject().getUsage(), pubKey);
-
-        if (!certHolder.isSignatureValid(verifier))
-        {
-            fail("signature test failed");
-        }
-    }
-
-    private byte[] getInput(String name)
-        throws IOException
-    {
-        return Streams.readAll(getClass().getResourceAsStream(name));
-    }
-
-    public void testLoadInvalidRequest() throws Exception
-    {
-        // this request contains invalid unsigned integers (see D 2.1.1)
-        EACCertificateRequestHolder requestHolder = new EACCertificateRequestHolder(getInput("REQ_18102010.csr"));
-
-        PublicKey pubKey = new JcaPublicKeyConverter().setProvider(BC).getKey(requestHolder.getPublicKeyDataObject());
-        EACSignatureVerifier verifier = new JcaEACSignatureVerifierBuilder().build(requestHolder.getPublicKeyDataObject().getUsage(), pubKey);
-
-        if (requestHolder.isInnerSignatureValid(verifier))
-        {
-            fail("signature test failed");
-        }
-    }
-
-    public void testLoadRefCert() throws Exception
-    {
-        EACCertificateHolder certHolder = new EACCertificateHolder(getInput("at_cert_19a.cvcert"));
-
-
-    }
-
-    public void testGenerateEC()
-        throws Exception
-    {
-        ECParameterSpec ecSpec = ECNamedCurveTable.getParameterSpec("prime256v1");
-        KeyPair kp = generateECKeyPair(ecSpec);
-
-        JcaEACSignerBuilder signerBuilder = new JcaEACSignerBuilder().setProvider(BC);
-
-        EACSigner signer = signerBuilder.build("SHA256withECDSA", kp.getPrivate());
-
-        int role = CertificateHolderAuthorization.CVCA;
-        int rights = CertificateHolderAuthorization.RADG3 | CertificateHolderAuthorization.RADG4;
-
-        EACCertificateBuilder certBuilder = new EACCertificateBuilder(
-            new CertificationAuthorityReference("AU", "BC TEST", "12345"),
-            new JcaPublicKeyConverter().getPublicKeyDataObject(signer.getUsageIdentifier(), kp.getPublic()),
-            new CertificateHolderReference("AU", "BC TEST", "12345"),
-            new CertificateHolderAuthorization(EACObjectIdentifiers.id_EAC_ePassport, role | rights),
-            new PackedDate("110101"),
-            new PackedDate("120101"));
-
-        EACCertificateHolder certHolder = certBuilder.build(signer);
-
-        EACSignatureVerifier verifier = new JcaEACSignatureVerifierBuilder().build(certHolder.getPublicKeyDataObject().getUsage(), kp.getPublic());
-
-        if (!certHolder.isSignatureValid(verifier))
-        {
-            fail("first signature test failed");
-        }
-
-        PublicKey pubKey = new JcaPublicKeyConverter().setProvider(BC).getKey(certHolder.getPublicKeyDataObject());
-        verifier = new JcaEACSignatureVerifierBuilder().build(certHolder.getPublicKeyDataObject().getUsage(), pubKey);
-
-        if (!certHolder.isSignatureValid(verifier))
-        {
-            fail("second signature test failed");
-        }
-    }
-
-    public void testGenerateRSA()
-        throws Exception
-    {
-        KeyPair kp = generateRSAKeyPair();
-
-        JcaEACSignerBuilder signerBuilder = new JcaEACSignerBuilder().setProvider(BC);
-
-        EACSigner signer = signerBuilder.build("SHA256withRSA", kp.getPrivate());
-
-        int role = CertificateHolderAuthorization.CVCA;
-        int rights = CertificateHolderAuthorization.RADG3 | CertificateHolderAuthorization.RADG4;
-
-        EACCertificateBuilder certBuilder = new EACCertificateBuilder(
-            new CertificationAuthorityReference("AU", "BC TEST", "12345"),
-            new JcaPublicKeyConverter().getPublicKeyDataObject(signer.getUsageIdentifier(), kp.getPublic()),
-            new CertificateHolderReference("AU", "BC TEST", "12345"),
-            new CertificateHolderAuthorization(EACObjectIdentifiers.id_EAC_ePassport, role | rights),
-            new PackedDate("110101"),
-            new PackedDate("120101"));
-
-        EACCertificateHolder certHolder = certBuilder.build(signer);
-
-        EACSignatureVerifier verifier = new JcaEACSignatureVerifierBuilder().build(certHolder.getPublicKeyDataObject().getUsage(), kp.getPublic());
-
-        if (!certHolder.isSignatureValid(verifier))
-        {
-            fail("first signature test failed");
-        }
-
-        PublicKey pubKey = new JcaPublicKeyConverter().setProvider(BC).getKey(certHolder.getPublicKeyDataObject());
-        verifier = new JcaEACSignatureVerifierBuilder().build(certHolder.getPublicKeyDataObject().getUsage(), pubKey);
-
-        if (!certHolder.isSignatureValid(verifier))
-        {
-            fail("second signature test failed");
-        }
-    }
-
-    private KeyPair generateECKeyPair(ECParameterSpec spec) throws NoSuchAlgorithmException, NoSuchProviderException, InvalidAlgorithmParameterException
-    {
-        KeyPairGenerator gen = KeyPairGenerator.getInstance("ECDSA",BC);
-
-        gen.initialize(spec, new SecureRandom());
-
-        KeyPair generatedKeyPair = gen.generateKeyPair();
-        return generatedKeyPair;
-    }
-
-    private KeyPair generateRSAKeyPair() throws NoSuchAlgorithmException, NoSuchProviderException, InvalidAlgorithmParameterException
-    {
-        KeyPairGenerator gen = KeyPairGenerator.getInstance("RSA",BC);
-
-        gen.initialize(1024, new SecureRandom());
-
-        KeyPair generatedKeyPair = gen.generateKeyPair();
-        return generatedKeyPair;
-    }
-
-    public static void main(String[] args)
-        throws Exception
-    {
-        Security.addProvider(new BouncyCastleProvider());
-
-        junit.textui.TestRunner.run(suite());
-    }
-
-    public static Test suite()
-        throws Exception
-    {
-        TestSuite suite = new TestSuite("EAC tests");
-
-        suite.addTestSuite(AllTests.class);
-
-        return new EACTestSetup(suite);
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/eac/test/EACTestSetup.java b/bcpkix/src/main/java/org/bouncycastle/eac/test/EACTestSetup.java
deleted file mode 100644
index 92f884c..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/eac/test/EACTestSetup.java
+++ /dev/null
@@ -1,28 +0,0 @@
-
-package org.bouncycastle.eac.test;
-
-import java.security.Security;
-
-import junit.extensions.TestSetup;
-import junit.framework.Test;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-
-class EACTestSetup
-    extends TestSetup
-{
-    public EACTestSetup(Test test)
-    {
-        super(test);
-    }
-
-    protected void setUp()
-    {
-        Security.addProvider(new org.bouncycastle.jce.provider.BouncyCastleProvider());
-    }
-
-    protected void tearDown()
-    {
-        Security.removeProvider(BouncyCastleProvider.PROVIDER_NAME);
-    }
-
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/mozilla/SignedPublicKeyAndChallenge.java b/bcpkix/src/main/java/org/bouncycastle/mozilla/SignedPublicKeyAndChallenge.java
deleted file mode 100644
index f9c4bca..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/mozilla/SignedPublicKeyAndChallenge.java
+++ /dev/null
@@ -1,139 +0,0 @@
-package org.bouncycastle.mozilla;
-
-import java.io.ByteArrayInputStream;
-import java.security.InvalidKeyException;
-import java.security.KeyFactory;
-import java.security.NoSuchAlgorithmException;
-import java.security.NoSuchProviderException;
-import java.security.PublicKey;
-import java.security.Signature;
-import java.security.SignatureException;
-import java.security.spec.X509EncodedKeySpec;
-
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DERBitString;
-import org.bouncycastle.asn1.mozilla.PublicKeyAndChallenge;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-
-/**
- * This is designed to parse the SignedPublicKeyAndChallenge created by the
- * KEYGEN tag included by Mozilla based browsers.
- *  <pre>
- *  PublicKeyAndChallenge ::= SEQUENCE {
- *    spki SubjectPublicKeyInfo,
- *    challenge IA5STRING
- *  }
- *
- *  SignedPublicKeyAndChallenge ::= SEQUENCE {
- *    publicKeyAndChallenge PublicKeyAndChallenge,
- *    signatureAlgorithm AlgorithmIdentifier,
- *    signature BIT STRING
- *  }
- *  </pre>
- */
-public class SignedPublicKeyAndChallenge
-    extends ASN1Object
-{
-    private static ASN1Sequence toDERSequence(byte[]  bytes)
-    {
-        try
-        {
-            ByteArrayInputStream    bIn = new ByteArrayInputStream(bytes);
-            ASN1InputStream         aIn = new ASN1InputStream(bIn);
-
-            return (ASN1Sequence)aIn.readObject();
-        }
-        catch (Exception e)
-        {
-            throw new IllegalArgumentException("badly encoded request");
-        }
-    }
-
-    private ASN1Sequence          spkacSeq;
-    private PublicKeyAndChallenge pkac;
-    private AlgorithmIdentifier   signatureAlgorithm;
-    private DERBitString          signature;
-
-    public SignedPublicKeyAndChallenge(byte[] bytes)
-    {
-        spkacSeq = toDERSequence(bytes);
-        pkac = PublicKeyAndChallenge.getInstance(spkacSeq.getObjectAt(0));
-        signatureAlgorithm = 
-            AlgorithmIdentifier.getInstance(spkacSeq.getObjectAt(1));
-        signature = (DERBitString)spkacSeq.getObjectAt(2);
-    }
-
-    public ASN1Primitive toASN1Primitive()
-    {
-        return spkacSeq;
-    }
-
-    public PublicKeyAndChallenge getPublicKeyAndChallenge()
-    {
-        return pkac;
-    }
-
-    public boolean verify()
-        throws NoSuchAlgorithmException, SignatureException, 
-               NoSuchProviderException, InvalidKeyException
-    {
-        return verify(null);
-    }
-
-    public boolean verify(String provider)
-        throws NoSuchAlgorithmException, SignatureException, 
-               NoSuchProviderException, InvalidKeyException
-    {
-        Signature sig = null;
-        if (provider == null)
-        {
-            sig = Signature.getInstance(signatureAlgorithm.getAlgorithm().getId());
-        }
-        else
-        {
-            sig = Signature.getInstance(signatureAlgorithm.getAlgorithm().getId(), provider);
-        }
-        PublicKey pubKey = this.getPublicKey(provider);
-        sig.initVerify(pubKey);
-        try
-        {
-            DERBitString pkBytes = new DERBitString(pkac);
-            sig.update(pkBytes.getBytes());
-
-            return sig.verify(signature.getBytes());
-        }
-        catch (Exception e)
-        {
-            throw new InvalidKeyException("error encoding public key");
-        }
-    }
-
-    public PublicKey getPublicKey(String provider)
-        throws NoSuchAlgorithmException, NoSuchProviderException, 
-               InvalidKeyException
-    {
-        SubjectPublicKeyInfo subjectPKInfo = pkac.getSubjectPublicKeyInfo();
-        try
-        {
-            DERBitString bStr = new DERBitString(subjectPKInfo);
-            X509EncodedKeySpec xspec = new X509EncodedKeySpec(bStr.getBytes());
-            
-
-            AlgorithmIdentifier keyAlg = subjectPKInfo.getAlgorithm();
-
-            KeyFactory factory =
-                KeyFactory.getInstance(keyAlg.getAlgorithm().getId(),provider);
-
-            return factory.generatePublic(xspec);
-                           
-        }
-        catch (Exception e)
-        {
-            throw new InvalidKeyException("error encoding public key");
-        }
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/mozilla/package.html b/bcpkix/src/main/java/org/bouncycastle/mozilla/package.html
deleted file mode 100644
index dd2203e..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/mozilla/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body bgcolor="#ffffff">
-Support class for mozilla signed public key and challenge.
-</body>
-</html>
diff --git a/bcpkix/src/main/java/org/bouncycastle/mozilla/test/AllTests.java b/bcpkix/src/main/java/org/bouncycastle/mozilla/test/AllTests.java
deleted file mode 100644
index 3c0dcc6..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/mozilla/test/AllTests.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package org.bouncycastle.mozilla.test;
-
-import java.security.Security;
-
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.util.test.SimpleTestResult;
-
-import junit.framework.*;
-
-public class AllTests
-    extends TestCase
-{
-    public void testMozilla()
-    {   
-        Security.addProvider(new BouncyCastleProvider());
-        
-        org.bouncycastle.util.test.Test[] tests = new org.bouncycastle.util.test.Test[] { new SPKACTest() };
-        
-        for (int i = 0; i != tests.length; i++)
-        {
-            SimpleTestResult  result = (SimpleTestResult)tests[i].perform();
-            
-            if (!result.isSuccessful())
-            {
-                fail(result.toString());
-            }
-        }
-    }
-    
-    public static void main (String[] args)
-    {
-        junit.textui.TestRunner.run(suite());
-    }
-    
-    public static Test suite()
-    {
-        TestSuite suite = new TestSuite("Mozilla Tests");
-        
-        suite.addTestSuite(AllTests.class);
-        
-        return suite;
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/mozilla/test/SPKACTest.java b/bcpkix/src/main/java/org/bouncycastle/mozilla/test/SPKACTest.java
deleted file mode 100644
index 192bfd8..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/mozilla/test/SPKACTest.java
+++ /dev/null
@@ -1,113 +0,0 @@
-package org.bouncycastle.mozilla.test;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.security.PublicKey;
-import java.security.Security;
-
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.DERIA5String;
-import org.bouncycastle.asn1.DEROutputStream;
-import org.bouncycastle.asn1.mozilla.PublicKeyAndChallenge;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.mozilla.SignedPublicKeyAndChallenge;
-import org.bouncycastle.util.encoders.Base64;
-import org.bouncycastle.util.test.SimpleTest;
-
-public class SPKACTest
-    extends SimpleTest
-{
-  byte[] spkac = Base64.decode(
-         "MIIBOjCBpDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEApne7ti0ibPhV8Iht"+
-         "7Pws5iRckM7x4mtZYxEpeX5/IO8tDsBFdY86ewuY2f2KCca0oMWr43kdkZbPyzf4"+
-         "CSV+0fZm9MJyNMywygZjoOCC+rS8kr0Ef31iHChhYsyejJnjw116Jnn96syhdHY6"+
-         "lVD1rK0nn5ZkHjxU74gjoZu6BJMCAwEAARYAMA0GCSqGSIb3DQEBBAUAA4GBAKFL"+
-         "g/luv0C7gMTI8ZKfFoSyi7Q7kiSQcmSj1WJgT56ouIRJO5NdvB/1n4GNik8VOAU0"+
-         "NRztvGy3ZGqgbSav7lrxcNEvXH+dLbtS97s7yiaozpsOcEHqsBribpLOTRzYa8ci"+
-         "CwkPmIiYqcby11diKLpd+W9RFYNme2v0rrbM2CyV");
- 
-
-  public String getName()
-  {
-      return "SignedPubicKeyAndChallenge";
-  }
-
-  public void spkacTest(String testName, byte[] req)
-      throws Exception
-  {
-      SignedPublicKeyAndChallenge spkac;
-
-      spkac = new SignedPublicKeyAndChallenge(req);
-
-      PublicKeyAndChallenge pkac = spkac.getPublicKeyAndChallenge();
-      PublicKey pubKey = spkac.getPublicKey("BC");
-      ASN1Primitive obj = pkac.toASN1Primitive();
-      if (obj == null)
-      {
-          fail("Error - " + testName + " PKAC ASN1Primitive was null.");
-      }
-      
-      obj = spkac.toASN1Primitive();
-      if (obj == null)
-      {
-          fail("Error - "+testName+ " SPKAC ASN1Primitive was null.");
-      }
-
-      SubjectPublicKeyInfo spki = pkac.getSubjectPublicKeyInfo();
-      if (spki == null)
-      {
-          fail("Error - "+testName + " SubjectPublicKeyInfo was null.");
-      }
-      
-      DERIA5String challenge = pkac.getChallenge();
-      // Most cases this will be a string of length zero.
-      if (challenge == null)
-      {
-          fail(":Error - "+testName+ " challenge was null.");
-      }
-    
-      ByteArrayInputStream    bIn = new ByteArrayInputStream(req);
-      ASN1InputStream         dIn = new ASN1InputStream(bIn);
-
-
-      ByteArrayOutputStream   bOut = new ByteArrayOutputStream();
-      DEROutputStream         dOut = new DEROutputStream(bOut);
-
-      dOut.writeObject(spkac.toASN1Primitive());
-
-      byte[]                  bytes = bOut.toByteArray();
-
-      if (bytes.length != req.length)
-      {
-          fail(testName + " failed length test");
-      }
-
-      for (int i = 0; i != req.length; i++)
-      {
-          if (bytes[i] != req[i])
-          {
-              fail(testName + " failed comparison test");
-          }
-      }
-
-      if (!spkac.verify("BC"))
-      {
-          fail(testName + " verification failed");
-      }
-  }
-
-  public void performTest()
-      throws Exception
-  {
-      spkacTest("spkac", spkac);
-  }
-
-  public static void main(String[] args)
-  {
-      Security.addProvider(new BouncyCastleProvider());
-      
-      runTest(new SPKACTest());
-  }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/mozilla/test/package.html b/bcpkix/src/main/java/org/bouncycastle/mozilla/test/package.html
deleted file mode 100644
index 54047ad..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/mozilla/test/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body bgcolor="#ffffff">
-Test class for mozilla signed public key and challenge.
-</body>
-</html>
diff --git a/bcpkix/src/main/java/org/bouncycastle/openssl/EncryptionException.java b/bcpkix/src/main/java/org/bouncycastle/openssl/EncryptionException.java
deleted file mode 100644
index 67db207..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/openssl/EncryptionException.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package org.bouncycastle.openssl;
-
-public class EncryptionException
-    extends PEMException
-{
-    private Throwable cause;
-
-    public EncryptionException(String msg)
-    {
-        super(msg);
-    }
-
-    public EncryptionException(String msg, Throwable ex)
-    {
-        super(msg);
-        this.cause = ex;
-    }
-
-    public Throwable getCause()
-    {
-        return cause;
-    }
-}
\ No newline at end of file
diff --git a/bcpkix/src/main/java/org/bouncycastle/openssl/MiscPEMGenerator.java b/bcpkix/src/main/java/org/bouncycastle/openssl/MiscPEMGenerator.java
deleted file mode 100644
index 0286688..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/openssl/MiscPEMGenerator.java
+++ /dev/null
@@ -1,209 +0,0 @@
-package org.bouncycastle.openssl;
-
-import java.io.IOException;
-import java.math.BigInteger;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.cms.ContentInfo;
-import org.bouncycastle.asn1.oiw.OIWObjectIdentifiers;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
-import org.bouncycastle.asn1.x509.DSAParameter;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.bouncycastle.asn1.x9.X9ObjectIdentifiers;
-import org.bouncycastle.cert.X509AttributeCertificateHolder;
-import org.bouncycastle.cert.X509CRLHolder;
-import org.bouncycastle.cert.X509CertificateHolder;
-import org.bouncycastle.pkcs.PKCS10CertificationRequest;
-import org.bouncycastle.util.Strings;
-import org.bouncycastle.util.io.pem.PemGenerationException;
-import org.bouncycastle.util.io.pem.PemHeader;
-import org.bouncycastle.util.io.pem.PemObject;
-import org.bouncycastle.util.io.pem.PemObjectGenerator;
-
-/**
- * PEM generator for the original set of PEM objects used in Open SSL.
- */
-public class MiscPEMGenerator
-    implements PemObjectGenerator
-{
-    private static final ASN1ObjectIdentifier[] dsaOids =
-    {
-        X9ObjectIdentifiers.id_dsa,
-        OIWObjectIdentifiers.dsaWithSHA1
-    };
-
-    private static final byte[] hexEncodingTable =
-    {
-        (byte)'0', (byte)'1', (byte)'2', (byte)'3', (byte)'4', (byte)'5', (byte)'6', (byte)'7',
-        (byte)'8', (byte)'9', (byte)'A', (byte)'B', (byte)'C', (byte)'D', (byte)'E', (byte)'F'
-    };
-
-    private final Object obj;
-    private final PEMEncryptor encryptor;
-
-    public MiscPEMGenerator(Object o)
-    {
-        this.obj = o;              // use of this confuses some earlier JDKs.
-        this.encryptor = null;
-    }
-
-    public MiscPEMGenerator(Object o, PEMEncryptor encryptor)
-    {
-        this.obj = o;
-        this.encryptor = encryptor;
-    }
-
-    private PemObject createPemObject(Object o)
-        throws IOException
-    {
-        String  type;
-        byte[]  encoding;
-
-        if (o instanceof PemObject)
-        {
-            return (PemObject)o;
-        }
-        if (o instanceof PemObjectGenerator)
-        {
-            return ((PemObjectGenerator)o).generate();
-        }
-        if (o instanceof X509CertificateHolder)
-        {
-            type = "CERTIFICATE";
-
-            encoding = ((X509CertificateHolder)o).getEncoded();
-        }
-        else if (o instanceof X509CRLHolder)
-        {
-            type = "X509 CRL";
-
-            encoding = ((X509CRLHolder)o).getEncoded();
-        }
-        else if (o instanceof PrivateKeyInfo)
-        {
-            PrivateKeyInfo info = (PrivateKeyInfo)o;
-            ASN1ObjectIdentifier algOID = info.getPrivateKeyAlgorithm().getAlgorithm();
-
-            if (algOID.equals(PKCSObjectIdentifiers.rsaEncryption))
-            {
-                type = "RSA PRIVATE KEY";
-
-                encoding = info.parsePrivateKey().toASN1Primitive().getEncoded();
-            }
-            else if (algOID.equals(dsaOids[0]) || algOID.equals(dsaOids[1]))
-            {
-                type = "DSA PRIVATE KEY";
-
-                DSAParameter p = DSAParameter.getInstance(info.getPrivateKeyAlgorithm().getParameters());
-                ASN1EncodableVector v = new ASN1EncodableVector();
-
-                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 ASN1Integer(y));
-                v.add(new ASN1Integer(x));
-
-                encoding = new DERSequence(v).getEncoded();
-            }
-            else if (algOID.equals(X9ObjectIdentifiers.id_ecPublicKey))
-            {
-                type = "EC PRIVATE KEY";
-
-                encoding = info.parsePrivateKey().toASN1Primitive().getEncoded();
-            }
-            else
-            {
-                throw new IOException("Cannot identify private key");
-            }
-        }
-        else if (o instanceof SubjectPublicKeyInfo)
-        {
-            type = "PUBLIC KEY";
-
-            encoding = ((SubjectPublicKeyInfo)o).getEncoded();
-        }
-        else if (o instanceof X509AttributeCertificateHolder)
-        {
-            type = "ATTRIBUTE CERTIFICATE";
-            encoding = ((X509AttributeCertificateHolder)o).getEncoded();
-        }
-        else if (o instanceof org.bouncycastle.pkcs.PKCS10CertificationRequest)
-        {
-            type = "CERTIFICATE REQUEST";
-            encoding = ((PKCS10CertificationRequest)o).getEncoded();
-        }
-        else if (o instanceof ContentInfo)
-        {
-            type = "PKCS7";
-            encoding = ((ContentInfo)o).getEncoded();
-        }
-        else
-        {
-            throw new PemGenerationException("unknown object passed - can't encode.");
-        }
-
-        if (encryptor != null)
-        {
-            String dekAlgName = Strings.toUpperCase(encryptor.getAlgorithm());
-
-            // Note: For backward compatibility
-            if (dekAlgName.equals("DESEDE"))
-            {
-                dekAlgName = "DES-EDE3-CBC";
-            }
-
-
-            byte[] iv = encryptor.getIV();
-
-            byte[] encData = encryptor.encrypt(encoding);
-
-            List headers = new ArrayList(2);
-
-            headers.add(new PemHeader("Proc-Type", "4,ENCRYPTED"));
-            headers.add(new PemHeader("DEK-Info", dekAlgName + "," + getHexEncoded(iv)));
-
-            return new PemObject(type, headers, encData);
-        }
-        return new PemObject(type, encoding);
-    }
-
-    private String getHexEncoded(byte[] bytes)
-        throws IOException
-    {
-        char[] chars = new char[bytes.length * 2];
-
-        for (int i = 0; i != bytes.length; i++)
-        {
-            int    v = bytes[i] & 0xff;
-
-            chars[2 * i] = (char)(hexEncodingTable[(v >>> 4)]);
-            chars[2 * i + 1]  = (char)(hexEncodingTable[v & 0xf]);
-        }
-
-        return new String(chars);
-    }
-
-    public PemObject generate()
-        throws PemGenerationException
-    {
-        try
-        {
-            return createPemObject(obj);
-        }
-        catch (IOException e)
-        {
-            throw new PemGenerationException("encoding exception: " + e.getMessage(), e);
-        }
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/openssl/PEMDecryptor.java b/bcpkix/src/main/java/org/bouncycastle/openssl/PEMDecryptor.java
deleted file mode 100644
index 09cef5b..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/openssl/PEMDecryptor.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package org.bouncycastle.openssl;
-
-public interface PEMDecryptor
-{
-    byte[] decrypt(byte[] keyBytes, byte[] iv)
-        throws PEMException;
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/openssl/PEMDecryptorProvider.java b/bcpkix/src/main/java/org/bouncycastle/openssl/PEMDecryptorProvider.java
deleted file mode 100644
index b1827cd..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/openssl/PEMDecryptorProvider.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package org.bouncycastle.openssl;
-
-import org.bouncycastle.operator.OperatorCreationException;
-
-public interface PEMDecryptorProvider
-{
-    PEMDecryptor get(String dekAlgName)
-        throws OperatorCreationException;
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/openssl/PEMEncryptedKeyPair.java b/bcpkix/src/main/java/org/bouncycastle/openssl/PEMEncryptedKeyPair.java
deleted file mode 100644
index 4c28f8d..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/openssl/PEMEncryptedKeyPair.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package org.bouncycastle.openssl;
-
-import java.io.IOException;
-
-import org.bouncycastle.operator.OperatorCreationException;
-
-public class PEMEncryptedKeyPair
-{
-    private final String dekAlgName;
-    private final byte[] iv;
-    private final byte[] keyBytes;
-    private final PEMKeyPairParser parser;
-
-    PEMEncryptedKeyPair(String dekAlgName, byte[] iv, byte[] keyBytes, PEMKeyPairParser parser)
-    {
-        this.dekAlgName = dekAlgName;
-        this.iv = iv;
-        this.keyBytes = keyBytes;
-        this.parser = parser;
-    }
-
-    public PEMKeyPair decryptKeyPair(PEMDecryptorProvider keyDecryptorProvider)
-        throws IOException
-    {
-        try
-        {
-            PEMDecryptor keyDecryptor = keyDecryptorProvider.get(dekAlgName);
-
-            return parser.parse(keyDecryptor.decrypt(keyBytes, iv));
-        }
-        catch (IOException e)
-        {
-            throw e;
-        }
-        catch (OperatorCreationException e)
-        {
-            throw new PEMException("cannot create extraction operator: " + e.getMessage(), e);
-        }
-        catch (Exception e)
-        {
-            throw new PEMException("exception processing key pair: " + e.getMessage(), e);
-        }
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/openssl/PEMEncryptor.java b/bcpkix/src/main/java/org/bouncycastle/openssl/PEMEncryptor.java
deleted file mode 100644
index 5fb6647..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/openssl/PEMEncryptor.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package org.bouncycastle.openssl;
-
-public interface PEMEncryptor
-{
-    String getAlgorithm();
-
-    byte[] getIV();
-
-    byte[] encrypt(byte[] encoding)
-        throws PEMException;
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/openssl/PEMException.java b/bcpkix/src/main/java/org/bouncycastle/openssl/PEMException.java
deleted file mode 100644
index 3753aec..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/openssl/PEMException.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package org.bouncycastle.openssl;
-
-import java.io.IOException;
-
-public class PEMException
-    extends IOException
-{
-    Exception    underlying;
-
-    public PEMException(
-        String    message)
-    {
-        super(message);
-    }
-
-    public PEMException(
-        String        message,
-        Exception    underlying)
-    {
-        super(message);
-        this.underlying = underlying;
-    }
-
-    public Exception getUnderlyingException()
-    {
-        return underlying;
-    }
-
-
-    public Throwable getCause()
-    {
-        return underlying;
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/openssl/PEMKeyPair.java b/bcpkix/src/main/java/org/bouncycastle/openssl/PEMKeyPair.java
deleted file mode 100644
index 077934e..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/openssl/PEMKeyPair.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package org.bouncycastle.openssl;
-
-import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-
-public class PEMKeyPair
-{
-    private final SubjectPublicKeyInfo publicKeyInfo;
-    private final PrivateKeyInfo privateKeyInfo;
-
-    public PEMKeyPair(SubjectPublicKeyInfo publicKeyInfo, PrivateKeyInfo privateKeyInfo)
-    {
-        this.publicKeyInfo = publicKeyInfo;
-        this.privateKeyInfo = privateKeyInfo;
-    }
-
-    public PrivateKeyInfo getPrivateKeyInfo()
-    {
-        return privateKeyInfo;
-    }
-
-    public SubjectPublicKeyInfo getPublicKeyInfo()
-    {
-        return publicKeyInfo;
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/openssl/PEMKeyPairParser.java b/bcpkix/src/main/java/org/bouncycastle/openssl/PEMKeyPairParser.java
deleted file mode 100644
index fc0cb04..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/openssl/PEMKeyPairParser.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package org.bouncycastle.openssl;
-
-import java.io.IOException;
-
-interface PEMKeyPairParser
-{
-    PEMKeyPair parse(byte[] encoding)
-        throws IOException;
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/openssl/PEMParser.java b/bcpkix/src/main/java/org/bouncycastle/openssl/PEMParser.java
deleted file mode 100644
index dacdba4..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/openssl/PEMParser.java
+++ /dev/null
@@ -1,510 +0,0 @@
-package org.bouncycastle.openssl;
-
-import java.io.IOException;
-import java.io.Reader;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.StringTokenizer;
-
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DERNull;
-import org.bouncycastle.asn1.cms.ContentInfo;
-import org.bouncycastle.asn1.pkcs.EncryptedPrivateKeyInfo;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
-import org.bouncycastle.asn1.pkcs.RSAPublicKey;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.asn1.x509.DSAParameter;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.bouncycastle.asn1.x9.X9ECParameters;
-import org.bouncycastle.asn1.x9.X9ObjectIdentifiers;
-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.encoders.Hex;
-import org.bouncycastle.util.io.pem.PemHeader;
-import org.bouncycastle.util.io.pem.PemObject;
-import org.bouncycastle.util.io.pem.PemObjectParser;
-import org.bouncycastle.util.io.pem.PemReader;
-
-/**
- * Class for parsing OpenSSL PEM encoded streams containing
- * X509 certificates, PKCS8 encoded keys and PKCS7 objects.
- * <p>
- * In the case of PKCS7 objects the reader will return a CMS ContentInfo object. Public keys will be returned as
- * well formed SubjectPublicKeyInfo objects, private keys will be returned as well formed PrivateKeyInfo objects. In the
- * case of a private key a PEMKeyPair will normally be returned if the encoding contains both the private and public
- * key definition. CRLs, Certificates, PKCS#10 requests, and Attribute Certificates will generate the appropriate BC holder class.
- * </p>
- */
-public class PEMParser
-    extends PemReader
-{
-    private final Map parsers = new HashMap();
-
-    /**
-     * Create a new PEMReader
-     *
-     * @param reader the Reader
-     */
-    public PEMParser(
-        Reader reader)
-    {
-        super(reader);
-
-        parsers.put("CERTIFICATE REQUEST", new PKCS10CertificationRequestParser());
-        parsers.put("NEW CERTIFICATE REQUEST", new PKCS10CertificationRequestParser());
-        parsers.put("CERTIFICATE", new X509CertificateParser());
-        parsers.put("TRUSTED CERTIFICATE", new X509CertificateParser());
-        parsers.put("X509 CERTIFICATE", new X509CertificateParser());
-        parsers.put("X509 CRL", new X509CRLParser());
-        parsers.put("PKCS7", new PKCS7Parser());
-        parsers.put("ATTRIBUTE CERTIFICATE", new X509AttributeCertificateParser());
-        parsers.put("EC PARAMETERS", new ECCurveParamsParser());
-        parsers.put("PUBLIC KEY", new PublicKeyParser());
-        parsers.put("RSA PUBLIC KEY", new RSAPublicKeyParser());
-        parsers.put("RSA PRIVATE KEY", new KeyPairParser(new RSAKeyPairParser()));
-        parsers.put("DSA PRIVATE KEY", new KeyPairParser(new DSAKeyPairParser()));
-        parsers.put("EC PRIVATE KEY", new KeyPairParser(new ECDSAKeyPairParser()));
-        parsers.put("ENCRYPTED PRIVATE KEY", new EncryptedPrivateKeyParser());
-        parsers.put("PRIVATE KEY", new PrivateKeyParser());
-    }
-
-    public Object readObject()
-        throws IOException
-    {
-        PemObject obj = readPemObject();
-
-        if (obj != null)
-        {
-            String type = obj.getType();
-            if (parsers.containsKey(type))
-            {
-                return ((PemObjectParser)parsers.get(type)).parseObject(obj);
-            }
-            else
-            {
-                throw new IOException("unrecognised object: " + type);
-            }
-        }
-
-        return null;
-    }
-
-    private class KeyPairParser
-        implements PemObjectParser
-    {
-        private final PEMKeyPairParser pemKeyPairParser;
-
-        public KeyPairParser(PEMKeyPairParser pemKeyPairParser)
-        {
-            this.pemKeyPairParser = pemKeyPairParser;
-        }
-
-        /**
-         * Read a Key Pair
-         */
-        public Object parseObject(
-            PemObject obj)
-            throws IOException
-        {
-            boolean isEncrypted = false;
-            String dekInfo = null;
-            List headers = obj.getHeaders();
-
-            for (Iterator it = headers.iterator(); it.hasNext();)
-            {
-                PemHeader hdr = (PemHeader)it.next();
-
-                if (hdr.getName().equals("Proc-Type") && hdr.getValue().equals("4,ENCRYPTED"))
-                {
-                    isEncrypted = true;
-                }
-                else if (hdr.getName().equals("DEK-Info"))
-                {
-                    dekInfo = hdr.getValue();
-                }
-            }
-
-            //
-            // extract the key
-            //
-            byte[] keyBytes = obj.getContent();
-
-            try
-            {
-                if (isEncrypted)
-                {
-                    StringTokenizer tknz = new StringTokenizer(dekInfo, ",");
-                    String dekAlgName = tknz.nextToken();
-                    byte[] iv = Hex.decode(tknz.nextToken());
-
-                    return new PEMEncryptedKeyPair(dekAlgName, iv, keyBytes, pemKeyPairParser);
-                }
-
-                return pemKeyPairParser.parse(keyBytes);
-            }
-            catch (IOException e)
-            {
-                if (isEncrypted)
-                {
-                    throw new PEMException("exception decoding - please check password and data.", e);
-                }
-                else
-                {
-                    throw new PEMException(e.getMessage(), e);
-                }
-            }
-            catch (IllegalArgumentException e)
-            {
-                if (isEncrypted)
-                {
-                    throw new PEMException("exception decoding - please check password and data.", e);
-                }
-                else
-                {
-                    throw new PEMException(e.getMessage(), e);
-                }
-            }
-        }
-    }
-
-    private class DSAKeyPairParser
-        implements PEMKeyPairParser
-    {
-        public PEMKeyPair parse(byte[] encoding)
-            throws IOException
-        {
-            try
-            {
-                ASN1Sequence seq = ASN1Sequence.getInstance(encoding);
-
-                if (seq.size() != 6)
-                {
-                    throw new PEMException("malformed sequence in DSA private key");
-                }
-
-                //            ASN1Integer              v = (ASN1Integer)seq.getObjectAt(0);
-                ASN1Integer p = ASN1Integer.getInstance(seq.getObjectAt(1));
-                ASN1Integer q = ASN1Integer.getInstance(seq.getObjectAt(2));
-                ASN1Integer g = ASN1Integer.getInstance(seq.getObjectAt(3));
-                ASN1Integer y = ASN1Integer.getInstance(seq.getObjectAt(4));
-                ASN1Integer x = ASN1Integer.getInstance(seq.getObjectAt(5));
-
-                return new PEMKeyPair(
-                    new SubjectPublicKeyInfo(new AlgorithmIdentifier(X9ObjectIdentifiers.id_dsa, new DSAParameter(p.getValue(), q.getValue(), g.getValue())), y),
-                    new PrivateKeyInfo(new AlgorithmIdentifier(X9ObjectIdentifiers.id_dsa, new DSAParameter(p.getValue(), q.getValue(), g.getValue())), x));
-            }
-            catch (IOException e)
-            {
-                throw e;
-            }
-            catch (Exception e)
-            {
-                throw new PEMException(
-                    "problem creating DSA private key: " + e.toString(), e);
-            }
-        }
-    }
-
-    private class ECDSAKeyPairParser
-        implements PEMKeyPairParser
-    {
-        public PEMKeyPair parse(byte[] encoding)
-            throws IOException
-        {
-            try
-            {
-                ASN1Sequence seq = ASN1Sequence.getInstance(encoding);
-
-                org.bouncycastle.asn1.sec.ECPrivateKey pKey = org.bouncycastle.asn1.sec.ECPrivateKey.getInstance(seq);
-                AlgorithmIdentifier algId = new AlgorithmIdentifier(X9ObjectIdentifiers.id_ecPublicKey, pKey.getParameters());
-                PrivateKeyInfo privInfo = new PrivateKeyInfo(algId, pKey);
-                SubjectPublicKeyInfo pubInfo = new SubjectPublicKeyInfo(algId, pKey.getPublicKey().getBytes());
-
-                return new PEMKeyPair(pubInfo, privInfo);
-            }
-            catch (IOException e)
-            {
-                throw e;
-            }
-            catch (Exception e)
-            {
-                throw new PEMException(
-                    "problem creating EC private key: " + e.toString(), e);
-            }
-        }
-    }
-
-    private class RSAKeyPairParser
-        implements PEMKeyPairParser
-    {
-        public PEMKeyPair parse(byte[] encoding)
-            throws IOException
-        {
-            try
-            {
-                ASN1Sequence seq = ASN1Sequence.getInstance(encoding);
-
-                if (seq.size() != 9)
-                {
-                    throw new PEMException("malformed sequence in RSA private key");
-                }
-
-                org.bouncycastle.asn1.pkcs.RSAPrivateKey keyStruct = org.bouncycastle.asn1.pkcs.RSAPrivateKey.getInstance(seq);
-
-                RSAPublicKey pubSpec = new RSAPublicKey(
-                    keyStruct.getModulus(), keyStruct.getPublicExponent());
-
-                AlgorithmIdentifier algId = new AlgorithmIdentifier(PKCSObjectIdentifiers.rsaEncryption, DERNull.INSTANCE);
-
-                return new PEMKeyPair(new SubjectPublicKeyInfo(algId, pubSpec), new PrivateKeyInfo(algId, keyStruct));
-            }
-            catch (IOException e)
-            {
-                throw e;
-            }
-            catch (Exception e)
-            {
-                throw new PEMException(
-                    "problem creating RSA private key: " + e.toString(), e);
-            }
-        }
-    }
-
-    private class PublicKeyParser
-        implements PemObjectParser
-    {
-        public PublicKeyParser()
-        {
-        }
-
-        public Object parseObject(PemObject obj)
-            throws IOException
-        {
-            return SubjectPublicKeyInfo.getInstance(obj.getContent());
-        }
-    }
-
-    private class RSAPublicKeyParser
-        implements PemObjectParser
-    {
-        public RSAPublicKeyParser()
-        {
-        }
-
-        public Object parseObject(PemObject obj)
-            throws IOException
-        {
-            try
-            {
-                RSAPublicKey rsaPubStructure = RSAPublicKey.getInstance(obj.getContent());
-
-                return new SubjectPublicKeyInfo(new AlgorithmIdentifier(PKCSObjectIdentifiers.rsaEncryption, DERNull.INSTANCE), rsaPubStructure);
-            }
-            catch (IOException e)
-            {
-                throw e;
-            }
-            catch (Exception e)
-            {
-                throw new PEMException("problem extracting key: " + e.toString(), e);
-            }
-        }
-    }
-
-    private class X509CertificateParser
-        implements PemObjectParser
-    {
-        /**
-         * Reads in a X509Certificate.
-         *
-         * @return the X509Certificate
-         * @throws java.io.IOException if an I/O error occured
-         */
-        public Object parseObject(PemObject obj)
-            throws IOException
-        {
-            try
-            {
-                return new X509CertificateHolder(obj.getContent());
-            }
-            catch (Exception e)
-            {
-                throw new PEMException("problem parsing cert: " + e.toString(), e);
-            }
-        }
-    }
-
-    private class X509CRLParser
-        implements PemObjectParser
-    {
-        /**
-         * Reads in a X509CRL.
-         *
-         * @return the X509Certificate
-         * @throws java.io.IOException if an I/O error occured
-         */
-        public Object parseObject(PemObject obj)
-            throws IOException
-        {
-            try
-            {
-                return new X509CRLHolder(obj.getContent());
-            }
-            catch (Exception e)
-            {
-                throw new PEMException("problem parsing cert: " + e.toString(), e);
-            }
-        }
-    }
-
-    private class PKCS10CertificationRequestParser
-        implements PemObjectParser
-    {
-        /**
-         * Reads in a PKCS10 certification request.
-         *
-         * @return the certificate request.
-         * @throws java.io.IOException if an I/O error occured
-         */
-        public Object parseObject(PemObject obj)
-            throws IOException
-        {
-            try
-            {
-                return new PKCS10CertificationRequest(obj.getContent());
-            }
-            catch (Exception e)
-            {
-                throw new PEMException("problem parsing certrequest: " + e.toString(), e);
-            }
-        }
-    }
-
-    private class PKCS7Parser
-        implements PemObjectParser
-    {
-        /**
-         * Reads in a PKCS7 object. This returns a ContentInfo object suitable for use with the CMS
-         * API.
-         *
-         * @return the X509Certificate
-         * @throws java.io.IOException if an I/O error occured
-         */
-        public Object parseObject(PemObject obj)
-            throws IOException
-        {
-            try
-            {
-                ASN1InputStream aIn = new ASN1InputStream(obj.getContent());
-
-                return ContentInfo.getInstance(aIn.readObject());
-            }
-            catch (Exception e)
-            {
-                throw new PEMException("problem parsing PKCS7 object: " + e.toString(), e);
-            }
-        }
-    }
-
-    private class X509AttributeCertificateParser
-        implements PemObjectParser
-    {
-        public Object parseObject(PemObject obj)
-            throws IOException
-        {
-            return new X509AttributeCertificateHolder(obj.getContent());
-        }
-    }
-
-    private class ECCurveParamsParser
-        implements PemObjectParser
-    {
-        public Object parseObject(PemObject obj)
-            throws IOException
-        {
-            try
-            {
-                Object param = ASN1Primitive.fromByteArray(obj.getContent());
-
-                if (param instanceof ASN1ObjectIdentifier)
-                {
-                    return ASN1Primitive.fromByteArray(obj.getContent());
-                }
-                else if (param instanceof ASN1Sequence)
-                {
-                    return X9ECParameters.getInstance(param);
-                }
-                else
-                {
-                    return null;  // implicitly CA
-                }
-            }
-            catch (IOException e)
-            {
-                throw e;
-            }
-            catch (Exception e)
-            {
-                throw new PEMException("exception extracting EC named curve: " + e.toString());
-            }
-        }
-    }
-
-    private class EncryptedPrivateKeyParser
-        implements PemObjectParser
-    {
-        public EncryptedPrivateKeyParser()
-        {
-        }
-
-        /**
-         * Reads in an EncryptedPrivateKeyInfo
-         *
-         * @return the X509Certificate
-         * @throws java.io.IOException if an I/O error occured
-         */
-        public Object parseObject(PemObject obj)
-            throws IOException
-        {
-            try
-            {
-                return new PKCS8EncryptedPrivateKeyInfo(EncryptedPrivateKeyInfo.getInstance(obj.getContent()));
-            }
-            catch (Exception e)
-            {
-                throw new PEMException("problem parsing ENCRYPTED PRIVATE KEY: " + e.toString(), e);
-            }
-        }
-    }
-
-    private class PrivateKeyParser
-        implements PemObjectParser
-    {
-        public PrivateKeyParser()
-        {
-        }
-
-        public Object parseObject(PemObject obj)
-            throws IOException
-        {
-            try
-            {
-                return PrivateKeyInfo.getInstance(obj.getContent());
-            }
-            catch (Exception e)
-            {
-                throw new PEMException("problem parsing PRIVATE KEY: " + e.toString(), e);
-            }
-        }
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/openssl/PEMUtilities.java b/bcpkix/src/main/java/org/bouncycastle/openssl/PEMUtilities.java
deleted file mode 100644
index a2f96de..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/openssl/PEMUtilities.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package org.bouncycastle.openssl;
-
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.nist.NISTObjectIdentifiers;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.util.Integers;
-
-final class PEMUtilities
-{
-    private static final Map KEYSIZES = new HashMap();
-    private static final Set PKCS5_SCHEME_1 = new HashSet();
-    private static final Set PKCS5_SCHEME_2 = new HashSet();
-
-    static
-    {
-        PKCS5_SCHEME_1.add(PKCSObjectIdentifiers.pbeWithMD2AndDES_CBC);
-        PKCS5_SCHEME_1.add(PKCSObjectIdentifiers.pbeWithMD2AndRC2_CBC);
-        PKCS5_SCHEME_1.add(PKCSObjectIdentifiers.pbeWithMD5AndDES_CBC);
-        PKCS5_SCHEME_1.add(PKCSObjectIdentifiers.pbeWithMD5AndRC2_CBC);
-        PKCS5_SCHEME_1.add(PKCSObjectIdentifiers.pbeWithSHA1AndDES_CBC);
-        PKCS5_SCHEME_1.add(PKCSObjectIdentifiers.pbeWithSHA1AndRC2_CBC);
-
-        PKCS5_SCHEME_2.add(PKCSObjectIdentifiers.id_PBES2);
-        PKCS5_SCHEME_2.add(PKCSObjectIdentifiers.des_EDE3_CBC);
-        PKCS5_SCHEME_2.add(NISTObjectIdentifiers.id_aes128_CBC);
-        PKCS5_SCHEME_2.add(NISTObjectIdentifiers.id_aes192_CBC);
-        PKCS5_SCHEME_2.add(NISTObjectIdentifiers.id_aes256_CBC);
-
-        KEYSIZES.put(PKCSObjectIdentifiers.des_EDE3_CBC.getId(), Integers.valueOf(192));
-        KEYSIZES.put(NISTObjectIdentifiers.id_aes128_CBC.getId(), Integers.valueOf(128));
-        KEYSIZES.put(NISTObjectIdentifiers.id_aes192_CBC.getId(), Integers.valueOf(192));
-        KEYSIZES.put(NISTObjectIdentifiers.id_aes256_CBC.getId(), Integers.valueOf(256));
-    }
-
-    static int getKeySize(String algorithm)
-    {
-        if (!KEYSIZES.containsKey(algorithm))
-        {
-            throw new IllegalStateException("no key size for algorithm: " + algorithm);
-        }
-        
-        return ((Integer)KEYSIZES.get(algorithm)).intValue();
-    }
-
-    static boolean isPKCS5Scheme1(ASN1ObjectIdentifier algOid)
-    {
-        return PKCS5_SCHEME_1.contains(algOid);
-    }
-
-    public static boolean isPKCS5Scheme2(ASN1ObjectIdentifier algOid)
-    {
-        return PKCS5_SCHEME_2.contains(algOid);
-    }
-
-    public static boolean isPKCS12(ASN1ObjectIdentifier algOid)
-    {
-        return algOid.getId().startsWith(PKCSObjectIdentifiers.pkcs_12PbeIds.getId());
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/openssl/PEMWriter.java b/bcpkix/src/main/java/org/bouncycastle/openssl/PEMWriter.java
deleted file mode 100644
index 131d02c..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/openssl/PEMWriter.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package org.bouncycastle.openssl;
-
-import java.io.IOException;
-import java.io.Writer;
-
-import org.bouncycastle.openssl.jcajce.JcaMiscPEMGenerator;
-import org.bouncycastle.util.io.pem.PemGenerationException;
-import org.bouncycastle.util.io.pem.PemObjectGenerator;
-import org.bouncycastle.util.io.pem.PemWriter;
-
-/**
- * General purpose writer for OpenSSL PEM objects.
- * @deprecated use JcaPEMWriter
- */
-public class PEMWriter
-    extends PemWriter
-{
-    /**
-     * Base constructor.
-     * 
-     * @param out output stream to use.
-     */
-    public PEMWriter(Writer out)
-    {
-        super(out);
-    }
-
-    /**
-     * @throws IOException
-     */
-    public void writeObject(
-        Object  obj)
-        throws IOException
-    {
-        writeObject(obj, null);
-    }
-
-    /**
-     * @param obj
-     * @param encryptor
-     * @throws IOException
-     */
-    public void writeObject(
-        Object  obj,
-        PEMEncryptor encryptor)
-        throws IOException
-    {
-        try
-        {
-            super.writeObject(new JcaMiscPEMGenerator(obj, encryptor));
-        }
-        catch (PemGenerationException e)
-        {
-            if (e.getCause() instanceof IOException)
-            {
-                throw (IOException)e.getCause();
-            }
-
-            throw e;
-        }
-    }
-
-    public void writeObject(
-        PemObjectGenerator obj)
-        throws IOException
-    {
-        super.writeObject(obj);
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/openssl/PKCS8Generator.java b/bcpkix/src/main/java/org/bouncycastle/openssl/PKCS8Generator.java
deleted file mode 100644
index f822cba..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/openssl/PKCS8Generator.java
+++ /dev/null
@@ -1,87 +0,0 @@
-package org.bouncycastle.openssl;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.nist.NISTObjectIdentifiers;
-import org.bouncycastle.asn1.pkcs.EncryptedPrivateKeyInfo;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
-import org.bouncycastle.operator.OutputEncryptor;
-import org.bouncycastle.util.io.pem.PemGenerationException;
-import org.bouncycastle.util.io.pem.PemObject;
-import org.bouncycastle.util.io.pem.PemObjectGenerator;
-
-public class PKCS8Generator
-    implements PemObjectGenerator
-{
-    public static final ASN1ObjectIdentifier AES_128_CBC = NISTObjectIdentifiers.id_aes128_CBC;
-    public static final ASN1ObjectIdentifier AES_192_CBC = NISTObjectIdentifiers.id_aes192_CBC;
-    public static final ASN1ObjectIdentifier AES_256_CBC = NISTObjectIdentifiers.id_aes256_CBC;
-
-    public static final ASN1ObjectIdentifier DES3_CBC = PKCSObjectIdentifiers.des_EDE3_CBC;
-
-    public static final ASN1ObjectIdentifier PBE_SHA1_RC4_128 = PKCSObjectIdentifiers.pbeWithSHAAnd128BitRC4;
-    public static final ASN1ObjectIdentifier PBE_SHA1_RC4_40 = PKCSObjectIdentifiers.pbeWithSHAAnd40BitRC4;
-    public static final ASN1ObjectIdentifier PBE_SHA1_3DES = PKCSObjectIdentifiers.pbeWithSHAAnd3_KeyTripleDES_CBC;
-    public static final ASN1ObjectIdentifier PBE_SHA1_2DES = PKCSObjectIdentifiers.pbeWithSHAAnd2_KeyTripleDES_CBC;
-    public static final ASN1ObjectIdentifier PBE_SHA1_RC2_128 = PKCSObjectIdentifiers.pbeWithSHAAnd128BitRC2_CBC;
-    public static final ASN1ObjectIdentifier PBE_SHA1_RC2_40 = PKCSObjectIdentifiers.pbeWithSHAAnd40BitRC2_CBC;
-
-    private PrivateKeyInfo key;
-    private OutputEncryptor outputEncryptor;
-
-    /**
-     * Base constructor.
-     */
-    public PKCS8Generator(PrivateKeyInfo key, OutputEncryptor outputEncryptor)
-    {
-        this.key = key;
-        this.outputEncryptor = outputEncryptor;
-    }
-
-    public PemObject generate()
-        throws PemGenerationException
-    {
-        if (outputEncryptor != null)
-        {
-            return generate(key, outputEncryptor);
-        }
-        else
-        {
-            return generate(key, null);
-        }
-    }
-
-    private PemObject generate(PrivateKeyInfo key, OutputEncryptor encryptor)
-        throws PemGenerationException
-    {
-        try
-        {
-            byte[] keyData = key.getEncoded();
-
-            if (encryptor == null)
-            {
-                return new PemObject("PRIVATE KEY", keyData);
-            }
-
-            ByteArrayOutputStream bOut = new ByteArrayOutputStream();
-
-            OutputStream cOut = encryptor.getOutputStream(bOut);
-
-            cOut.write(key.getEncoded());
-
-            cOut.close();
-
-            EncryptedPrivateKeyInfo info = new EncryptedPrivateKeyInfo(encryptor.getAlgorithmIdentifier(), bOut.toByteArray());
-
-            return new PemObject("ENCRYPTED PRIVATE KEY", info.getEncoded());
-        }
-        catch (IOException e)
-        {
-            throw new PemGenerationException("unable to process encoded key data: " + e.getMessage(), e);
-        }
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/openssl/PasswordException.java b/bcpkix/src/main/java/org/bouncycastle/openssl/PasswordException.java
deleted file mode 100644
index 89625e7..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/openssl/PasswordException.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package org.bouncycastle.openssl;
-
-public class PasswordException
-    extends PEMException
-{
-    public PasswordException(String msg)
-    {
-        super(msg);
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/openssl/PasswordFinder.java b/bcpkix/src/main/java/org/bouncycastle/openssl/PasswordFinder.java
deleted file mode 100644
index fb89cf0..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/openssl/PasswordFinder.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package org.bouncycastle.openssl;
-
-/**
- * call back to allow a password to be fetched when one is requested.
- */
-public interface PasswordFinder
-{
-    public char[] getPassword();
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/openssl/jcajce/JcaMiscPEMGenerator.java b/bcpkix/src/main/java/org/bouncycastle/openssl/jcajce/JcaMiscPEMGenerator.java
deleted file mode 100644
index 6547078..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/openssl/jcajce/JcaMiscPEMGenerator.java
+++ /dev/null
@@ -1,98 +0,0 @@
-package org.bouncycastle.openssl.jcajce;
-
-import java.io.IOException;
-import java.security.Key;
-import java.security.KeyPair;
-import java.security.PrivateKey;
-import java.security.Provider;
-import java.security.PublicKey;
-import java.security.SecureRandom;
-import java.security.cert.CRLException;
-import java.security.cert.CertificateEncodingException;
-import java.security.cert.X509CRL;
-import java.security.cert.X509Certificate;
-
-import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.bouncycastle.cert.jcajce.JcaX509AttributeCertificateHolder;
-import org.bouncycastle.cert.jcajce.JcaX509CRLHolder;
-import org.bouncycastle.cert.jcajce.JcaX509CertificateHolder;
-import org.bouncycastle.jce.PKCS10CertificationRequest;
-import org.bouncycastle.openssl.MiscPEMGenerator;
-import org.bouncycastle.openssl.PEMEncryptor;
-import org.bouncycastle.x509.X509AttributeCertificate;
-import org.bouncycastle.x509.X509V2AttributeCertificate;
-
-/**
- * PEM generator for the original set of PEM objects used in Open SSL.
- */
-public class JcaMiscPEMGenerator
-    extends MiscPEMGenerator
-{
-    private Object obj;
-    private String algorithm;
-    private char[] password;
-    private SecureRandom random;
-    private Provider provider;
-
-    public JcaMiscPEMGenerator(Object o)
-        throws IOException
-    {
-        super(convertObject(o));
-    }
-
-    public JcaMiscPEMGenerator(Object o, PEMEncryptor encryptor)
-        throws IOException
-    {
-        super(convertObject(o), encryptor);
-    }
-
-    private static Object convertObject(Object o)
-        throws IOException
-    {
-        if (o instanceof X509Certificate)
-        {
-            try
-            {
-                return new JcaX509CertificateHolder((X509Certificate)o);
-            }
-            catch (CertificateEncodingException e)
-            {
-                throw new IllegalArgumentException("Cannot encode object: " + e.toString());
-            }
-        }
-        else if (o instanceof X509CRL)
-        {
-            try
-            {
-                return new JcaX509CRLHolder((X509CRL)o);
-            }
-            catch (CRLException e)
-            {
-                throw new IllegalArgumentException("Cannot encode object: " + e.toString());
-            }
-        }
-        else if (o instanceof KeyPair)
-        {
-            return convertObject(((KeyPair)o).getPrivate());
-        }
-        else if (o instanceof PrivateKey)
-        {
-            return PrivateKeyInfo.getInstance(((Key)o).getEncoded());
-        }
-        else if (o instanceof PublicKey)
-        {
-            return SubjectPublicKeyInfo.getInstance(((PublicKey)o).getEncoded());
-        }
-        else if (o instanceof X509AttributeCertificate)
-        {
-            return new JcaX509AttributeCertificateHolder((X509V2AttributeCertificate)o);
-        }
-        else if (o instanceof PKCS10CertificationRequest)
-        {
-            return new org.bouncycastle.pkcs.PKCS10CertificationRequest(((PKCS10CertificationRequest)o).getEncoded());
-        }
-
-        return o;
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/openssl/jcajce/JcaPEMKeyConverter.java b/bcpkix/src/main/java/org/bouncycastle/openssl/jcajce/JcaPEMKeyConverter.java
deleted file mode 100644
index 0107f4a..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/openssl/jcajce/JcaPEMKeyConverter.java
+++ /dev/null
@@ -1,115 +0,0 @@
-package org.bouncycastle.openssl.jcajce;
-
-import java.security.KeyFactory;
-import java.security.KeyPair;
-import java.security.NoSuchAlgorithmException;
-import java.security.NoSuchProviderException;
-import java.security.PrivateKey;
-import java.security.Provider;
-import java.security.PublicKey;
-import java.security.spec.PKCS8EncodedKeySpec;
-import java.security.spec.X509EncodedKeySpec;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.bouncycastle.asn1.x9.X9ObjectIdentifiers;
-import org.bouncycastle.jcajce.util.DefaultJcaJceHelper;
-import org.bouncycastle.jcajce.util.JcaJceHelper;
-import org.bouncycastle.jcajce.util.NamedJcaJceHelper;
-import org.bouncycastle.jcajce.util.ProviderJcaJceHelper;
-import org.bouncycastle.openssl.PEMException;
-import org.bouncycastle.openssl.PEMKeyPair;
-
-public class JcaPEMKeyConverter
-{
-    private JcaJceHelper helper = new DefaultJcaJceHelper();
-
-    private static final Map algorithms = new HashMap();
-
-    static
-    {
-        algorithms.put(X9ObjectIdentifiers.id_ecPublicKey, "ECDSA");
-        algorithms.put(PKCSObjectIdentifiers.rsaEncryption, "RSA");
-        algorithms.put(X9ObjectIdentifiers.id_dsa, "DSA");
-    }
-
-    public JcaPEMKeyConverter setProvider(Provider provider)
-    {
-        this.helper = new ProviderJcaJceHelper(provider);
-
-        return this;
-    }
-
-    public JcaPEMKeyConverter setProvider(String providerName)
-    {
-        this.helper = new NamedJcaJceHelper(providerName);
-
-        return this;
-    }
-
-    public KeyPair getKeyPair(PEMKeyPair keyPair)
-        throws PEMException
-    {
-        try
-        {
-            KeyFactory keyFactory = getKeyFactory(keyPair.getPrivateKeyInfo().getPrivateKeyAlgorithm());
-
-            return new KeyPair(keyFactory.generatePublic(new X509EncodedKeySpec(keyPair.getPublicKeyInfo().getEncoded())),
-                                keyFactory.generatePrivate(new PKCS8EncodedKeySpec(keyPair.getPrivateKeyInfo().getEncoded())));
-        }
-        catch (Exception e)
-        {
-            throw new PEMException("unable to convert key pair: " + e.getMessage(), e);
-        }
-    }
-
-    public PublicKey getPublicKey(SubjectPublicKeyInfo publicKeyInfo)
-        throws PEMException
-    {
-        try
-        {
-            KeyFactory keyFactory = getKeyFactory(publicKeyInfo.getAlgorithm());
-
-            return keyFactory.generatePublic(new X509EncodedKeySpec(publicKeyInfo.getEncoded()));
-        }
-        catch (Exception e)
-        {
-            throw new PEMException("unable to convert key pair: " + e.getMessage(), e);
-        }
-    }
-
-    public PrivateKey getPrivateKey(PrivateKeyInfo privateKeyInfo)
-        throws PEMException
-    {
-        try
-        {
-            KeyFactory keyFactory = getKeyFactory(privateKeyInfo.getPrivateKeyAlgorithm());
-
-            return keyFactory.generatePrivate(new PKCS8EncodedKeySpec(privateKeyInfo.getEncoded()));
-        }
-        catch (Exception e)
-        {
-            throw new PEMException("unable to convert key pair: " + e.getMessage(), e);
-        }
-    }
-
-    private KeyFactory getKeyFactory(AlgorithmIdentifier algId)
-        throws NoSuchAlgorithmException, NoSuchProviderException
-    {
-        ASN1ObjectIdentifier algorithm =  algId.getAlgorithm();
-
-        String algName = (String)algorithms.get(algorithm);
-
-        if (algName == null)
-        {
-            algName = algorithm.getId();
-        }
-
-        return helper.createKeyFactory(algName);
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/openssl/jcajce/JcaPEMWriter.java b/bcpkix/src/main/java/org/bouncycastle/openssl/jcajce/JcaPEMWriter.java
deleted file mode 100644
index 423f950..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/openssl/jcajce/JcaPEMWriter.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package org.bouncycastle.openssl.jcajce;
-
-import java.io.IOException;
-import java.io.Writer;
-
-import org.bouncycastle.openssl.PEMEncryptor;
-import org.bouncycastle.util.io.pem.PemGenerationException;
-import org.bouncycastle.util.io.pem.PemObjectGenerator;
-import org.bouncycastle.util.io.pem.PemWriter;
-
-/**
- * General purpose writer for OpenSSL PEM objects based on JCA/JCE classes.
- */
-public class JcaPEMWriter
-    extends PemWriter
-{
-    /**
-     * Base constructor.
-     *
-     * @param out output stream to use.
-     */
-    public JcaPEMWriter(Writer out)
-    {
-        super(out);
-    }
-
-    /**
-     * @throws java.io.IOException
-     */
-    public void writeObject(
-        Object  obj)
-        throws IOException
-    {
-        writeObject(obj, null);
-    }
-
-    /**
-     * @param obj
-     * @param encryptor
-     * @throws java.io.IOException
-     */
-    public void writeObject(
-        Object  obj,
-        PEMEncryptor encryptor)
-        throws IOException
-    {
-        try
-        {
-            super.writeObject(new JcaMiscPEMGenerator(obj, encryptor));
-        }
-        catch (PemGenerationException e)
-        {
-            if (e.getCause() instanceof IOException)
-            {
-                throw (IOException)e.getCause();
-            }
-
-            throw e;
-        }
-    }
-
-    public void writeObject(
-        PemObjectGenerator obj)
-        throws IOException
-    {
-        super.writeObject(obj);
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/openssl/jcajce/JcaPKCS8Generator.java b/bcpkix/src/main/java/org/bouncycastle/openssl/jcajce/JcaPKCS8Generator.java
deleted file mode 100644
index 261dcec..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/openssl/jcajce/JcaPKCS8Generator.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package org.bouncycastle.openssl.jcajce;
-
-import java.security.PrivateKey;
-
-import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
-import org.bouncycastle.openssl.PKCS8Generator;
-import org.bouncycastle.operator.OutputEncryptor;
-import org.bouncycastle.util.io.pem.PemGenerationException;
-
-public class JcaPKCS8Generator
-    extends PKCS8Generator
-{
-    public JcaPKCS8Generator(PrivateKey key, OutputEncryptor encryptor)
-         throws PemGenerationException
-    {
-         super(PrivateKeyInfo.getInstance(key.getEncoded()), encryptor);
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/openssl/jcajce/JcaPKIXIdentityBuilder.java b/bcpkix/src/main/java/org/bouncycastle/openssl/jcajce/JcaPKIXIdentityBuilder.java
deleted file mode 100644
index 4573354..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/openssl/jcajce/JcaPKIXIdentityBuilder.java
+++ /dev/null
@@ -1,134 +0,0 @@
-package org.bouncycastle.openssl.jcajce;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.security.PrivateKey;
-import java.security.Provider;
-import java.security.cert.CertificateException;
-import java.security.cert.X509Certificate;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
-import org.bouncycastle.cert.X509CertificateHolder;
-import org.bouncycastle.cert.jcajce.JcaX509CertificateConverter;
-import org.bouncycastle.openssl.PEMKeyPair;
-import org.bouncycastle.openssl.PEMParser;
-import org.bouncycastle.pkix.jcajce.JcaPKIXIdentity;
-
-/**
- * Builder for a private/public identity object representing a "user"
- */
-public class JcaPKIXIdentityBuilder
-{
-    private JcaPEMKeyConverter keyConverter = new JcaPEMKeyConverter();
-    private JcaX509CertificateConverter certConverter = new JcaX509CertificateConverter();
-
-    public JcaPKIXIdentityBuilder()
-    {
-
-    }
-
-    public JcaPKIXIdentityBuilder setProvider(Provider provider)
-    {
-        this.keyConverter = keyConverter.setProvider(provider);
-        this.certConverter = certConverter.setProvider(provider);
-
-        return this;
-    }
-
-    public JcaPKIXIdentityBuilder setProvider(String providerName)
-    {
-        this.keyConverter = keyConverter.setProvider(providerName);
-        this.certConverter = certConverter.setProvider(providerName);
-
-        return this;
-    }
-
-    /**
-     * Build an identity from the passed in key and certificate file in PEM format.
-     *
-     * @param keyFile  the PEM file containing the key
-     * @param certificateFile the PEM file containing the certificate
-     * @return an identity object.
-     * @throws IOException on a general parsing error.
-     * @throws CertificateException on a certificate parsing error.
-     */
-    public JcaPKIXIdentity build(File keyFile, File certificateFile)
-        throws IOException, CertificateException
-    {
-        checkFile(keyFile);
-        checkFile(certificateFile);
-
-        FileInputStream keyStream = new FileInputStream(keyFile);
-        FileInputStream certificateStream = new FileInputStream(certificateFile);
-
-        JcaPKIXIdentity rv =  build(keyStream, certificateStream);
-
-        keyStream.close();
-        certificateStream.close();
-
-        return rv;
-    }
-
-    /**
-     * Build an identity from the passed in key and certificate stream in PEM format.
-     *
-     * @param keyStream  the PEM stream containing the key
-     * @param certificateStream the PEM stream containing the certificate
-     * @return an identity object.
-     * @throws IOException on a general parsing error.
-     * @throws CertificateException on a certificate parsing error.
-     */
-    public JcaPKIXIdentity build(InputStream keyStream, InputStream certificateStream)
-        throws IOException, CertificateException
-    {
-        PEMParser keyParser = new PEMParser(new InputStreamReader(keyStream));
-
-        PrivateKey privKey;
-
-        Object keyObj = keyParser.readObject();
-        if (keyObj instanceof PEMKeyPair)
-        {
-            PEMKeyPair kp = (PEMKeyPair)keyObj;
-
-            privKey = keyConverter.getPrivateKey(kp.getPrivateKeyInfo());
-        }
-        else if (keyObj instanceof PrivateKeyInfo)
-        {
-            privKey = keyConverter.getPrivateKey((PrivateKeyInfo)keyObj);
-        }
-        else
-        {
-            throw new IOException("unrecognised private key file"); // TODO: handle encrypted private keys
-        }
-
-        PEMParser certParser = new PEMParser(new InputStreamReader(certificateStream));
-
-        List certs = new ArrayList();
-        Object certObj;
-        while ((certObj = certParser.readObject()) != null)
-        {
-            certs.add(certConverter.getCertificate((X509CertificateHolder)certObj));
-        }
-
-        return new JcaPKIXIdentity(privKey, (X509Certificate[])certs.toArray(new X509Certificate[certs.size()]));
-    }
-
-    private void checkFile(File file)
-        throws IOException
-    {
-        if (file.canRead())
-        {
-            if (file.exists())
-            {
-                throw new IOException("Unable to open file " + file.getPath() + " for reading.");
-            }
-            throw new FileNotFoundException("Unable to open " + file.getPath() + ": it does not exist.");
-        }
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/openssl/jcajce/JceOpenSSLPKCS8DecryptorProviderBuilder.java b/bcpkix/src/main/java/org/bouncycastle/openssl/jcajce/JceOpenSSLPKCS8DecryptorProviderBuilder.java
deleted file mode 100644
index 46cca30..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/openssl/jcajce/JceOpenSSLPKCS8DecryptorProviderBuilder.java
+++ /dev/null
@@ -1,141 +0,0 @@
-package org.bouncycastle.openssl.jcajce;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.security.AlgorithmParameters;
-import java.security.GeneralSecurityException;
-import java.security.Provider;
-
-import javax.crypto.Cipher;
-import javax.crypto.CipherInputStream;
-import javax.crypto.SecretKey;
-import javax.crypto.SecretKeyFactory;
-import javax.crypto.spec.PBEKeySpec;
-import javax.crypto.spec.PBEParameterSpec;
-
-import org.bouncycastle.asn1.pkcs.EncryptionScheme;
-import org.bouncycastle.asn1.pkcs.KeyDerivationFunc;
-import org.bouncycastle.asn1.pkcs.PBEParameter;
-import org.bouncycastle.asn1.pkcs.PBES2Parameters;
-import org.bouncycastle.asn1.pkcs.PBKDF2Params;
-import org.bouncycastle.asn1.pkcs.PKCS12PBEParams;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.jcajce.util.DefaultJcaJceHelper;
-import org.bouncycastle.jcajce.util.JcaJceHelper;
-import org.bouncycastle.jcajce.util.NamedJcaJceHelper;
-import org.bouncycastle.jcajce.util.ProviderJcaJceHelper;
-import org.bouncycastle.openssl.PEMException;
-import org.bouncycastle.operator.InputDecryptor;
-import org.bouncycastle.operator.InputDecryptorProvider;
-import org.bouncycastle.operator.OperatorCreationException;
-
-public class JceOpenSSLPKCS8DecryptorProviderBuilder
-{
-    private JcaJceHelper helper = new DefaultJcaJceHelper();
-
-    public JceOpenSSLPKCS8DecryptorProviderBuilder()
-    {
-        helper = new DefaultJcaJceHelper();
-    }
-
-    public JceOpenSSLPKCS8DecryptorProviderBuilder setProvider(String providerName)
-    {
-        helper = new NamedJcaJceHelper(providerName);
-
-        return this;
-    }
-
-    public JceOpenSSLPKCS8DecryptorProviderBuilder setProvider(Provider provider)
-    {
-        helper = new ProviderJcaJceHelper(provider);
-
-        return this;
-    }
-
-    public InputDecryptorProvider build(final char[] password)
-        throws OperatorCreationException
-    {
-        return new InputDecryptorProvider()
-        {
-            public InputDecryptor get(final AlgorithmIdentifier algorithm)
-                throws OperatorCreationException
-            {
-                final Cipher cipher;
-
-                try
-                {
-                    if (PEMUtilities.isPKCS5Scheme2(algorithm.getAlgorithm()))
-                    {
-                        PBES2Parameters params = PBES2Parameters.getInstance(algorithm.getParameters());
-                        KeyDerivationFunc func = params.getKeyDerivationFunc();
-                        EncryptionScheme scheme = params.getEncryptionScheme();
-                        PBKDF2Params defParams = (PBKDF2Params)func.getParameters();
-
-                        int iterationCount = defParams.getIterationCount().intValue();
-                        byte[] salt = defParams.getSalt();
-
-                        String oid = scheme.getAlgorithm().getId();
-
-                        SecretKey key = PEMUtilities.generateSecretKeyForPKCS5Scheme2(oid, password, salt, iterationCount);
-
-                        cipher = helper.createCipher(oid);
-                        AlgorithmParameters algParams = helper.createAlgorithmParameters(oid);
-
-                        algParams.init(scheme.getParameters().toASN1Primitive().getEncoded());
-
-                        cipher.init(Cipher.DECRYPT_MODE, key, algParams);
-                    }
-                    else if (PEMUtilities.isPKCS12(algorithm.getAlgorithm()))
-                    {
-                        PKCS12PBEParams params = PKCS12PBEParams.getInstance(algorithm.getParameters());
-                        PBEKeySpec pbeSpec = new PBEKeySpec(password);
-
-                        SecretKeyFactory secKeyFact = helper.createSecretKeyFactory(algorithm.getAlgorithm().getId());
-                        PBEParameterSpec defParams = new PBEParameterSpec(params.getIV(), params.getIterations().intValue());
-
-                        cipher = helper.createCipher(algorithm.getAlgorithm().getId());
-
-                        cipher.init(Cipher.DECRYPT_MODE, secKeyFact.generateSecret(pbeSpec), defParams);
-                    }
-                    else if (PEMUtilities.isPKCS5Scheme1(algorithm.getAlgorithm()))
-                    {
-                        PBEParameter params = PBEParameter.getInstance(algorithm.getParameters());
-                        PBEKeySpec pbeSpec = new PBEKeySpec(password);
-
-                        SecretKeyFactory secKeyFact = helper.createSecretKeyFactory(algorithm.getAlgorithm().getId());
-                        PBEParameterSpec defParams = new PBEParameterSpec(params.getSalt(), params.getIterationCount().intValue());
-
-                        cipher = helper.createCipher(algorithm.getAlgorithm().getId());
-
-                        cipher.init(Cipher.DECRYPT_MODE, secKeyFact.generateSecret(pbeSpec), defParams);
-                    }
-                    else
-                    {
-                        throw new PEMException("Unknown algorithm: " + algorithm.getAlgorithm());
-                    }
-
-                    return new InputDecryptor()
-                    {
-                        public AlgorithmIdentifier getAlgorithmIdentifier()
-                        {
-                            return algorithm;
-                        }
-
-                        public InputStream getInputStream(InputStream encIn)
-                        {
-                            return new CipherInputStream(encIn, cipher);
-                        }
-                    };
-                }
-                catch (IOException e)
-                {
-                    throw new OperatorCreationException(algorithm.getAlgorithm() + " not available: " + e.getMessage(), e);
-                }
-                catch (GeneralSecurityException e)
-                {
-                    throw new OperatorCreationException(algorithm.getAlgorithm() + " not available: " + e.getMessage(), e);
-                }
-            };
-        };
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/openssl/jcajce/JceOpenSSLPKCS8EncryptorBuilder.java b/bcpkix/src/main/java/org/bouncycastle/openssl/jcajce/JceOpenSSLPKCS8EncryptorBuilder.java
deleted file mode 100644
index 09f8807..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/openssl/jcajce/JceOpenSSLPKCS8EncryptorBuilder.java
+++ /dev/null
@@ -1,221 +0,0 @@
-package org.bouncycastle.openssl.jcajce;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.security.AlgorithmParameterGenerator;
-import java.security.AlgorithmParameters;
-import java.security.GeneralSecurityException;
-import java.security.Provider;
-import java.security.SecureRandom;
-
-import javax.crypto.Cipher;
-import javax.crypto.CipherOutputStream;
-import javax.crypto.SecretKey;
-import javax.crypto.SecretKeyFactory;
-import javax.crypto.spec.PBEKeySpec;
-import javax.crypto.spec.PBEParameterSpec;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.DEROctetString;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.nist.NISTObjectIdentifiers;
-import org.bouncycastle.asn1.pkcs.KeyDerivationFunc;
-import org.bouncycastle.asn1.pkcs.PBES2Parameters;
-import org.bouncycastle.asn1.pkcs.PBKDF2Params;
-import org.bouncycastle.asn1.pkcs.PKCS12PBEParams;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.jcajce.util.DefaultJcaJceHelper;
-import org.bouncycastle.jcajce.util.JcaJceHelper;
-import org.bouncycastle.jcajce.util.NamedJcaJceHelper;
-import org.bouncycastle.jcajce.util.ProviderJcaJceHelper;
-import org.bouncycastle.operator.GenericKey;
-import org.bouncycastle.operator.OperatorCreationException;
-import org.bouncycastle.operator.OutputEncryptor;
-import org.bouncycastle.operator.jcajce.JceGenericKey;
-
-public class JceOpenSSLPKCS8EncryptorBuilder
-{
-    public static final String AES_128_CBC = NISTObjectIdentifiers.id_aes128_CBC.getId();
-    public static final String AES_192_CBC = NISTObjectIdentifiers.id_aes192_CBC.getId();
-    public static final String AES_256_CBC = NISTObjectIdentifiers.id_aes256_CBC.getId();
-
-    public static final String DES3_CBC = PKCSObjectIdentifiers.des_EDE3_CBC.getId();
-
-    public static final String PBE_SHA1_RC4_128 = PKCSObjectIdentifiers.pbeWithSHAAnd128BitRC4.getId();
-    public static final String PBE_SHA1_RC4_40 = PKCSObjectIdentifiers.pbeWithSHAAnd40BitRC4.getId();
-    public static final String PBE_SHA1_3DES = PKCSObjectIdentifiers.pbeWithSHAAnd3_KeyTripleDES_CBC.getId();
-    public static final String PBE_SHA1_2DES = PKCSObjectIdentifiers.pbeWithSHAAnd2_KeyTripleDES_CBC.getId();
-    public static final String PBE_SHA1_RC2_128 = PKCSObjectIdentifiers.pbeWithSHAAnd128BitRC2_CBC.getId();
-    public static final String PBE_SHA1_RC2_40 = PKCSObjectIdentifiers.pbeWithSHAAnd40BitRC2_CBC.getId();
-
-    private JcaJceHelper helper = new DefaultJcaJceHelper();
-
-    private AlgorithmParameters params;
-    private ASN1ObjectIdentifier algOID;
-    byte[] salt;
-    int iterationCount;
-    private Cipher cipher;
-    private SecureRandom random;
-    private AlgorithmParameterGenerator paramGen;
-    private SecretKeyFactory secKeyFact;
-    private char[] password;
-
-    private SecretKey key;
-
-    public JceOpenSSLPKCS8EncryptorBuilder(ASN1ObjectIdentifier algorithm)
-    {
-        algOID = algorithm;
-
-        this.iterationCount = 2048;
-    }
-
-    public JceOpenSSLPKCS8EncryptorBuilder setRandom(SecureRandom random)
-    {
-        this.random = random;
-
-        return this;
-    }
-
-    public JceOpenSSLPKCS8EncryptorBuilder setPasssword(char[] password)
-    {
-        this.password = password;
-
-        return this;
-    }
-
-    public JceOpenSSLPKCS8EncryptorBuilder setIterationCount(int iterationCount)
-    {
-        this.iterationCount = iterationCount;
-
-        return this;
-    }
-
-    public JceOpenSSLPKCS8EncryptorBuilder setProvider(String providerName)
-    {
-        helper = new NamedJcaJceHelper(providerName);
-
-        return this;
-    }
-
-    public JceOpenSSLPKCS8EncryptorBuilder setProvider(Provider provider)
-    {
-        helper = new ProviderJcaJceHelper(provider);
-
-        return this;
-    }
-
-    public OutputEncryptor build()
-        throws OperatorCreationException
-    {
-        final AlgorithmIdentifier algID;
-
-        salt = new byte[20];
-
-        if (random == null)
-        {
-            random = new SecureRandom();
-        }
-
-        random.nextBytes(salt);
-
-        try
-        {
-            this.cipher = helper.createCipher(algOID.getId());
-
-            if (PEMUtilities.isPKCS5Scheme2(algOID))
-            {
-                this.paramGen = helper.createAlgorithmParameterGenerator(algOID.getId());
-            }
-            else
-            {
-                this.secKeyFact = helper.createSecretKeyFactory(algOID.getId());
-            }
-        }
-        catch (GeneralSecurityException e)
-        {
-            throw new OperatorCreationException(algOID + " not available: " + e.getMessage(), e);
-        }
-
-        if (PEMUtilities.isPKCS5Scheme2(algOID))
-        {
-            params = paramGen.generateParameters();
-
-            try
-            {
-                KeyDerivationFunc scheme = new KeyDerivationFunc(algOID, ASN1Primitive.fromByteArray(params.getEncoded()));
-                KeyDerivationFunc func = new KeyDerivationFunc(PKCSObjectIdentifiers.id_PBKDF2, new PBKDF2Params(salt, iterationCount));
-
-                ASN1EncodableVector v = new ASN1EncodableVector();
-
-                v.add(func);
-                v.add(scheme);
-
-                algID = new AlgorithmIdentifier(PKCSObjectIdentifiers.id_PBES2, PBES2Parameters.getInstance(new DERSequence(v)));
-            }
-            catch (IOException e)
-            {
-                throw new OperatorCreationException(e.getMessage(), e);
-            }
-
-            key = PEMUtilities.generateSecretKeyForPKCS5Scheme2(algOID.getId(), password, salt, iterationCount);
-
-            try
-            {
-                cipher.init(Cipher.ENCRYPT_MODE, key, params);
-            }
-            catch (GeneralSecurityException e)
-            {
-                throw new OperatorCreationException(e.getMessage(), e);
-            }
-        }
-        else if (PEMUtilities.isPKCS12(algOID))
-        {
-            ASN1EncodableVector v = new ASN1EncodableVector();
-
-            v.add(new DEROctetString(salt));
-            v.add(new ASN1Integer(iterationCount));
-
-            algID = new AlgorithmIdentifier(algOID, PKCS12PBEParams.getInstance(new DERSequence(v)));
-
-            try
-            {
-                PBEKeySpec pbeSpec = new PBEKeySpec(password);
-                PBEParameterSpec defParams = new PBEParameterSpec(salt, iterationCount);
-
-                key = secKeyFact.generateSecret(pbeSpec);
-
-                cipher.init(Cipher.ENCRYPT_MODE, key, defParams);
-            }
-            catch (GeneralSecurityException e)
-            {
-                throw new OperatorCreationException(e.getMessage(), e);
-            }
-        }
-        else
-        {
-            throw new OperatorCreationException("unknown algorithm: " + algOID, null);
-        }
-
-        return new OutputEncryptor()
-        {
-            public AlgorithmIdentifier getAlgorithmIdentifier()
-            {
-                return algID;
-            }
-
-            public OutputStream getOutputStream(OutputStream encOut)
-            {
-                return new CipherOutputStream(encOut, cipher);
-            }
-
-            public GenericKey getKey()
-            {
-                return new JceGenericKey(algID, key);
-            }
-        };
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/openssl/jcajce/JcePEMDecryptorProviderBuilder.java b/bcpkix/src/main/java/org/bouncycastle/openssl/jcajce/JcePEMDecryptorProviderBuilder.java
deleted file mode 100644
index a9d5c5c..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/openssl/jcajce/JcePEMDecryptorProviderBuilder.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package org.bouncycastle.openssl.jcajce;
-
-import java.security.Provider;
-
-import org.bouncycastle.jcajce.util.DefaultJcaJceHelper;
-import org.bouncycastle.jcajce.util.JcaJceHelper;
-import org.bouncycastle.jcajce.util.NamedJcaJceHelper;
-import org.bouncycastle.jcajce.util.ProviderJcaJceHelper;
-import org.bouncycastle.openssl.PEMDecryptor;
-import org.bouncycastle.openssl.PEMDecryptorProvider;
-import org.bouncycastle.openssl.PEMException;
-import org.bouncycastle.openssl.PasswordException;
-
-public class JcePEMDecryptorProviderBuilder
-{
-    private JcaJceHelper helper = new DefaultJcaJceHelper();
-
-    public JcePEMDecryptorProviderBuilder setProvider(Provider provider)
-    {
-        this.helper = new ProviderJcaJceHelper(provider);
-
-        return this;
-    }
-
-    public JcePEMDecryptorProviderBuilder setProvider(String providerName)
-    {
-        this.helper = new NamedJcaJceHelper(providerName);
-
-        return this;
-    }
-
-    public PEMDecryptorProvider build(final char[] password)
-    {
-        return new PEMDecryptorProvider()
-        {
-            public PEMDecryptor get(final String dekAlgName)
-            {
-                return new PEMDecryptor()
-                {
-                    public byte[] decrypt(byte[] keyBytes, byte[] iv)
-                        throws PEMException
-                    {
-                        if (password == null)
-                        {
-                            throw new PasswordException("Password is null, but a password is required");
-                        }
-
-                        return PEMUtilities.crypt(false, helper, keyBytes, password, dekAlgName, iv);
-                    }
-                };
-            }
-        };
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/openssl/jcajce/JcePEMEncryptorBuilder.java b/bcpkix/src/main/java/org/bouncycastle/openssl/jcajce/JcePEMEncryptorBuilder.java
deleted file mode 100644
index de1de13..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/openssl/jcajce/JcePEMEncryptorBuilder.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package org.bouncycastle.openssl.jcajce;
-
-import java.security.Provider;
-import java.security.SecureRandom;
-
-import org.bouncycastle.jcajce.util.DefaultJcaJceHelper;
-import org.bouncycastle.jcajce.util.JcaJceHelper;
-import org.bouncycastle.jcajce.util.NamedJcaJceHelper;
-import org.bouncycastle.jcajce.util.ProviderJcaJceHelper;
-import org.bouncycastle.openssl.PEMEncryptor;
-import org.bouncycastle.openssl.PEMException;
-
-public class JcePEMEncryptorBuilder
-{
-    private final String algorithm;
-
-    private JcaJceHelper helper = new DefaultJcaJceHelper();
-    private SecureRandom random;
-
-    public JcePEMEncryptorBuilder(String algorithm)
-    {
-        this.algorithm = algorithm;
-    }
-
-    public JcePEMEncryptorBuilder setProvider(Provider provider)
-    {
-        this.helper = new ProviderJcaJceHelper(provider);
-
-        return this;
-    }
-
-    public JcePEMEncryptorBuilder setProvider(String providerName)
-    {
-        this.helper = new NamedJcaJceHelper(providerName);
-
-        return this;
-    }
-
-    public JcePEMEncryptorBuilder setSecureRandom(SecureRandom random)
-    {
-        this.random = random;
-
-        return this;
-    }
-
-    public PEMEncryptor build(final char[] password)
-    {
-        if (random == null)
-        {
-            random = new SecureRandom();
-        }
-
-        int ivLength = algorithm.startsWith("AES-") ? 16 : 8;
-
-        final byte[] iv = new byte[ivLength];
-
-        random.nextBytes(iv);
-
-        return new PEMEncryptor()
-        {
-            public String getAlgorithm()
-            {
-                return algorithm;
-            }
-
-            public byte[] getIV()
-            {
-                return iv;
-            }
-
-            public byte[] encrypt(byte[] encoding)
-                throws PEMException
-            {
-                return PEMUtilities.crypt(true, helper, encoding, password, algorithm, iv);
-            }
-        };
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/openssl/jcajce/PEMUtilities.java b/bcpkix/src/main/java/org/bouncycastle/openssl/jcajce/PEMUtilities.java
deleted file mode 100644
index a5a88a9..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/openssl/jcajce/PEMUtilities.java
+++ /dev/null
@@ -1,257 +0,0 @@
-package org.bouncycastle.openssl.jcajce;
-
-import java.security.Key;
-import java.security.spec.AlgorithmParameterSpec;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
-import javax.crypto.Cipher;
-import javax.crypto.SecretKey;
-import javax.crypto.spec.IvParameterSpec;
-import javax.crypto.spec.RC2ParameterSpec;
-import javax.crypto.spec.SecretKeySpec;
-
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.nist.NISTObjectIdentifiers;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.crypto.PBEParametersGenerator;
-import org.bouncycastle.crypto.generators.OpenSSLPBEParametersGenerator;
-import org.bouncycastle.crypto.generators.PKCS5S2ParametersGenerator;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.jcajce.util.JcaJceHelper;
-import org.bouncycastle.openssl.EncryptionException;
-import org.bouncycastle.openssl.PEMException;
-import org.bouncycastle.util.Integers;
-
-class PEMUtilities
-{
-    private static final Map KEYSIZES = new HashMap();
-    private static final Set PKCS5_SCHEME_1 = new HashSet();
-    private static final Set PKCS5_SCHEME_2 = new HashSet();
-
-    static
-    {
-        PKCS5_SCHEME_1.add(PKCSObjectIdentifiers.pbeWithMD2AndDES_CBC);
-        PKCS5_SCHEME_1.add(PKCSObjectIdentifiers.pbeWithMD2AndRC2_CBC);
-        PKCS5_SCHEME_1.add(PKCSObjectIdentifiers.pbeWithMD5AndDES_CBC);
-        PKCS5_SCHEME_1.add(PKCSObjectIdentifiers.pbeWithMD5AndRC2_CBC);
-        PKCS5_SCHEME_1.add(PKCSObjectIdentifiers.pbeWithSHA1AndDES_CBC);
-        PKCS5_SCHEME_1.add(PKCSObjectIdentifiers.pbeWithSHA1AndRC2_CBC);
-
-        PKCS5_SCHEME_2.add(PKCSObjectIdentifiers.id_PBES2);
-        PKCS5_SCHEME_2.add(PKCSObjectIdentifiers.des_EDE3_CBC);
-        PKCS5_SCHEME_2.add(NISTObjectIdentifiers.id_aes128_CBC);
-        PKCS5_SCHEME_2.add(NISTObjectIdentifiers.id_aes192_CBC);
-        PKCS5_SCHEME_2.add(NISTObjectIdentifiers.id_aes256_CBC);
-
-        KEYSIZES.put(PKCSObjectIdentifiers.des_EDE3_CBC.getId(), Integers.valueOf(192));
-        KEYSIZES.put(NISTObjectIdentifiers.id_aes128_CBC.getId(), Integers.valueOf(128));
-        KEYSIZES.put(NISTObjectIdentifiers.id_aes192_CBC.getId(), Integers.valueOf(192));
-        KEYSIZES.put(NISTObjectIdentifiers.id_aes256_CBC.getId(), Integers.valueOf(256));
-    }
-
-    static int getKeySize(String algorithm)
-    {
-        if (!KEYSIZES.containsKey(algorithm))
-        {
-            throw new IllegalStateException("no key size for algorithm: " + algorithm);
-        }
-        
-        return ((Integer)KEYSIZES.get(algorithm)).intValue();
-    }
-
-    static boolean isPKCS5Scheme1(ASN1ObjectIdentifier algOid)
-    {
-        return PKCS5_SCHEME_1.contains(algOid);
-    }
-
-    static boolean isPKCS5Scheme2(ASN1ObjectIdentifier algOid)
-    {
-        return PKCS5_SCHEME_2.contains(algOid);
-    }
-
-    public static boolean isPKCS12(ASN1ObjectIdentifier algOid)
-    {
-        return algOid.getId().startsWith(PKCSObjectIdentifiers.pkcs_12PbeIds.getId());
-    }
-
-    public static SecretKey generateSecretKeyForPKCS5Scheme2(String algorithm, char[] password, byte[] salt, int iterationCount)
-    {
-        PBEParametersGenerator generator = new PKCS5S2ParametersGenerator();
-
-        generator.init(
-            PBEParametersGenerator.PKCS5PasswordToBytes(password),
-            salt,
-            iterationCount);
-
-        return new SecretKeySpec(((KeyParameter)generator.generateDerivedParameters(PEMUtilities.getKeySize(algorithm))).getKey(), algorithm);
-    }
-
-    static byte[] crypt(
-        boolean encrypt,
-        JcaJceHelper helper,
-        byte[]  bytes,
-        char[]  password,
-        String  dekAlgName,
-        byte[]  iv)
-        throws PEMException
-    {
-        AlgorithmParameterSpec paramSpec = new IvParameterSpec(iv);
-        String                 alg;
-        String                 blockMode = "CBC";
-        String                 padding = "PKCS5Padding";
-        Key                    sKey;
-
-        // Figure out block mode and padding.
-        if (dekAlgName.endsWith("-CFB"))
-        {
-            blockMode = "CFB";
-            padding = "NoPadding";
-        }
-        if (dekAlgName.endsWith("-ECB") ||
-            "DES-EDE".equals(dekAlgName) ||
-            "DES-EDE3".equals(dekAlgName))
-        {
-            // ECB is actually the default (though seldom used) when OpenSSL
-            // uses DES-EDE (des2) or DES-EDE3 (des3).
-            blockMode = "ECB";
-            paramSpec = null;
-        }
-        if (dekAlgName.endsWith("-OFB"))
-        {
-            blockMode = "OFB";
-            padding = "NoPadding";
-        }
-
-
-        // Figure out algorithm and key size.
-        if (dekAlgName.startsWith("DES-EDE"))
-        {
-            alg = "DESede";
-            // "DES-EDE" is actually des2 in OpenSSL-speak!
-            // "DES-EDE3" is des3.
-            boolean des2 = !dekAlgName.startsWith("DES-EDE3");
-            sKey = getKey(password, alg, 24, iv, des2);
-        }
-        else if (dekAlgName.startsWith("DES-"))
-        {
-            alg = "DES";
-            sKey = getKey(password, alg, 8, iv);
-        }
-        else if (dekAlgName.startsWith("BF-"))
-        {
-            alg = "Blowfish";
-            sKey = getKey(password, alg, 16, iv);
-        }
-        else if (dekAlgName.startsWith("RC2-"))
-        {
-            alg = "RC2";
-            int keyBits = 128;
-            if (dekAlgName.startsWith("RC2-40-"))
-            {
-                keyBits = 40;
-            }
-            else if (dekAlgName.startsWith("RC2-64-"))
-            {
-                keyBits = 64;
-            }
-            sKey = getKey(password, alg, keyBits / 8, iv);
-            if (paramSpec == null) // ECB block mode
-            {
-                paramSpec = new RC2ParameterSpec(keyBits);
-            }
-            else
-            {
-                paramSpec = new RC2ParameterSpec(keyBits, iv);
-            }
-        }
-        else if (dekAlgName.startsWith("AES-"))
-        {
-            alg = "AES";
-            byte[] salt = iv;
-            if (salt.length > 8)
-            {
-                salt = new byte[8];
-                System.arraycopy(iv, 0, salt, 0, 8);
-            }
-
-            int keyBits;
-            if (dekAlgName.startsWith("AES-128-"))
-            {
-                keyBits = 128;
-            }
-            else if (dekAlgName.startsWith("AES-192-"))
-            {
-                keyBits = 192;
-            }
-            else if (dekAlgName.startsWith("AES-256-"))
-            {
-                keyBits = 256;
-            }
-            else
-            {
-                throw new EncryptionException("unknown AES encryption with private key");
-            }
-            sKey = getKey(password, "AES", keyBits / 8, salt);
-        }
-        else
-        {
-            throw new EncryptionException("unknown encryption with private key");
-        }
-
-        String transformation = alg + "/" + blockMode + "/" + padding;
-
-        try
-        {
-            Cipher c = helper.createCipher(transformation);
-            int    mode = encrypt ? Cipher.ENCRYPT_MODE : Cipher.DECRYPT_MODE;
-
-            if (paramSpec == null) // ECB block mode
-            {
-                c.init(mode, sKey);
-            }
-            else
-            {
-                c.init(mode, sKey, paramSpec);
-            }
-            return c.doFinal(bytes);
-        }
-        catch (Exception e)
-        {
-            throw new EncryptionException("exception using cipher - please check password and data.", e);
-        }
-    }
-
-    private static SecretKey getKey(
-        char[]  password,
-        String  algorithm,
-        int     keyLength,
-        byte[]  salt)
-    {
-        return getKey(password, algorithm, keyLength, salt, false);
-    }
-
-    private static SecretKey getKey(
-        char[]  password,
-        String  algorithm,
-        int     keyLength,
-        byte[]  salt,
-        boolean des2)
-    {
-        OpenSSLPBEParametersGenerator   pGen = new OpenSSLPBEParametersGenerator();
-
-        pGen.init(PBEParametersGenerator.PKCS5PasswordToBytes(password), salt);
-
-        KeyParameter keyParam;
-        keyParam = (KeyParameter) pGen.generateDerivedParameters(keyLength * 8);
-        byte[] key = keyParam.getKey();
-        if (des2 && key.length >= 24)
-        {
-            // For DES2, we must copy first 8 bytes into the last 8 bytes.
-            System.arraycopy(key, 0, key, 16, 8);
-        }
-        return new SecretKeySpec(key, algorithm);
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/openssl/package.html b/bcpkix/src/main/java/org/bouncycastle/openssl/package.html
deleted file mode 100644
index 7e60a79..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/openssl/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body bgcolor="#ffffff">
-Classes for dealing with OpenSSL PEM files.
-</body>
-</html>
diff --git a/bcpkix/src/main/java/org/bouncycastle/openssl/test/AllTests.java b/bcpkix/src/main/java/org/bouncycastle/openssl/test/AllTests.java
deleted file mode 100644
index faae18e..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/openssl/test/AllTests.java
+++ /dev/null
@@ -1,151 +0,0 @@
-package org.bouncycastle.openssl.test;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.OutputStreamWriter;
-import java.security.KeyPairGenerator;
-import java.security.NoSuchAlgorithmException;
-import java.security.NoSuchProviderException;
-import java.security.PrivateKey;
-import java.security.Security;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.openssl.PEMParser;
-import org.bouncycastle.openssl.PEMWriter;
-import org.bouncycastle.openssl.PKCS8Generator;
-import org.bouncycastle.openssl.jcajce.JcaPEMKeyConverter;
-import org.bouncycastle.openssl.jcajce.JcaPKCS8Generator;
-import org.bouncycastle.openssl.jcajce.JceOpenSSLPKCS8DecryptorProviderBuilder;
-import org.bouncycastle.openssl.jcajce.JceOpenSSLPKCS8EncryptorBuilder;
-import org.bouncycastle.operator.OperatorCreationException;
-import org.bouncycastle.pkcs.PKCS8EncryptedPrivateKeyInfo;
-import org.bouncycastle.pkcs.PKCSException;
-import org.bouncycastle.util.test.SimpleTestResult;
-
-public class
-    AllTests
-    extends TestCase
-{
-    public void testOpenSSL()
-    {
-        if (Security.getProvider("BC") == null)
-        {
-            Security.addProvider(new BouncyCastleProvider());
-        }
-        
-        org.bouncycastle.util.test.Test[] tests = new org.bouncycastle.util.test.Test[]
-        {
-            new WriterTest(),
-            new ParserTest()
-        };
-
-        for (int i = 0; i != tests.length; i++)
-        {
-            SimpleTestResult  result = (SimpleTestResult)tests[i].perform();
-            
-            if (!result.isSuccessful())
-            {
-                fail(result.toString());
-            }
-        }
-    }
-
-    public void testPKCS8Encrypted()
-        throws Exception
-    {
-        if (Security.getProvider("BC") == null)
-        {
-            Security.addProvider(new BouncyCastleProvider());
-        }
-
-        KeyPairGenerator kpGen = KeyPairGenerator.getInstance("RSA", "BC");
-
-        kpGen.initialize(1024);
-
-        PrivateKey key = kpGen.generateKeyPair().getPrivate();
-
-        encryptedTestNew(key, PKCS8Generator.AES_256_CBC);
-        encryptedTestNew(key, PKCS8Generator.DES3_CBC);
-        encryptedTestNew(key, PKCS8Generator.PBE_SHA1_3DES);
-    }
-
-    private void encryptedTestNew(PrivateKey key, ASN1ObjectIdentifier algorithm)
-        throws NoSuchProviderException, NoSuchAlgorithmException, IOException, OperatorCreationException, PKCSException
-    {
-        ByteArrayOutputStream bOut = new ByteArrayOutputStream();
-        PEMWriter pWrt = new PEMWriter(new OutputStreamWriter(bOut));
-
-        JceOpenSSLPKCS8EncryptorBuilder encryptorBuilder = new JceOpenSSLPKCS8EncryptorBuilder(algorithm);
-
-        encryptorBuilder.setProvider("BC");
-        encryptorBuilder.setPasssword("hello".toCharArray());
-
-        PKCS8Generator pkcs8 = new JcaPKCS8Generator(key, encryptorBuilder.build());
-
-        pWrt.writeObject(pkcs8);
-
-        pWrt.close();
-
-        PEMParser pRd = new PEMParser(new InputStreamReader(new ByteArrayInputStream(bOut.toByteArray())));
-
-        PKCS8EncryptedPrivateKeyInfo pInfo = (PKCS8EncryptedPrivateKeyInfo)pRd.readObject();
-
-        PrivateKey rdKey = new JcaPEMKeyConverter().setProvider("BC").getPrivateKey(pInfo.decryptPrivateKeyInfo(new JceOpenSSLPKCS8DecryptorProviderBuilder().setProvider("BC").build("hello".toCharArray())));
-
-
-        assertEquals(key, rdKey);
-    }
-
-    public void testPKCS8PlainNew()
-        throws Exception
-    {
-        if (Security.getProvider("BC") == null)
-        {
-            Security.addProvider(new BouncyCastleProvider());
-        }
-
-        KeyPairGenerator kpGen = KeyPairGenerator.getInstance("RSA", "BC");
-
-        kpGen.initialize(1024);
-
-        PrivateKey key = kpGen.generateKeyPair().getPrivate();
-        ByteArrayOutputStream bOut = new ByteArrayOutputStream();
-        PEMWriter pWrt = new PEMWriter(new OutputStreamWriter(bOut));
-        PKCS8Generator pkcs8 = new JcaPKCS8Generator(key, null);
-
-        pWrt.writeObject(pkcs8);
-
-        pWrt.close();
-
-        PEMParser pRd = new PEMParser(new InputStreamReader(new ByteArrayInputStream(bOut.toByteArray())));
-
-        PrivateKeyInfo kp = (PrivateKeyInfo)pRd.readObject();
-
-        PrivateKey rdKey = new JcaPEMKeyConverter().setProvider("BC").getPrivateKey(kp);
-
-        assertEquals(key, rdKey);
-    }
-
-    public static void main (String[] args)
-    {
-        Security.addProvider(new BouncyCastleProvider());
-        
-        junit.textui.TestRunner.run(suite());
-    }
-    
-    public static Test suite()
-    {
-        TestSuite suite = new TestSuite("OpenSSL Tests");
-        
-        suite.addTestSuite(AllTests.class);
-        
-        return suite;
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/openssl/test/ParserTest.java b/bcpkix/src/main/java/org/bouncycastle/openssl/test/ParserTest.java
deleted file mode 100644
index 521106b..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/openssl/test/ParserTest.java
+++ /dev/null
@@ -1,500 +0,0 @@
-package org.bouncycastle.openssl.test;
-
-import java.io.BufferedReader;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStreamWriter;
-import java.io.Reader;
-import java.math.BigInteger;
-import java.security.KeyPair;
-import java.security.KeyPairGenerator;
-import java.security.PrivateKey;
-import java.security.PublicKey;
-import java.security.SecureRandom;
-import java.security.Security;
-import java.security.Signature;
-import java.security.interfaces.DSAPrivateKey;
-import java.security.interfaces.RSAPrivateCrtKey;
-import java.security.interfaces.RSAPrivateKey;
-
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.cms.CMSObjectIdentifiers;
-import org.bouncycastle.asn1.cms.ContentInfo;
-import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.bouncycastle.asn1.x9.ECNamedCurveTable;
-import org.bouncycastle.asn1.x9.X9ECParameters;
-import org.bouncycastle.cert.X509CertificateHolder;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.openssl.PEMDecryptorProvider;
-import org.bouncycastle.openssl.PEMEncryptedKeyPair;
-import org.bouncycastle.openssl.PEMKeyPair;
-import org.bouncycastle.openssl.PEMParser;
-import org.bouncycastle.openssl.PEMWriter;
-import org.bouncycastle.openssl.PasswordFinder;
-import org.bouncycastle.openssl.jcajce.JcaPEMKeyConverter;
-import org.bouncycastle.openssl.jcajce.JceOpenSSLPKCS8DecryptorProviderBuilder;
-import org.bouncycastle.openssl.jcajce.JcePEMDecryptorProviderBuilder;
-import org.bouncycastle.operator.InputDecryptorProvider;
-import org.bouncycastle.pkcs.PKCS8EncryptedPrivateKeyInfo;
-import org.bouncycastle.util.test.SimpleTest;
-
-/**
- * basic class for reading test.pem - the password is "secret"
- */
-public class ParserTest
-    extends SimpleTest
-{
-    private static class Password
-        implements PasswordFinder
-    {
-        char[]  password;
-
-        Password(
-            char[] word)
-        {
-            this.password = word;
-        }
-
-        public char[] getPassword()
-        {
-            return password;
-        }
-    }
-
-    public String getName()
-    {
-        return "PEMParserTest";
-    }
-
-    private PEMParser openPEMResource(
-        String          fileName)
-    {
-        InputStream res = this.getClass().getResourceAsStream(fileName);
-        Reader fRd = new BufferedReader(new InputStreamReader(res));
-        return new PEMParser(fRd);
-    }
-
-    public void performTest()
-        throws Exception
-    {
-        PEMParser       pemRd = openPEMResource("test.pem");
-        Object          o;
-        PEMKeyPair      pemPair;
-        KeyPair         pair;
-
-        while ((o = pemRd.readObject()) != null)
-        {
-            if (o instanceof KeyPair)
-            {
-                //pair = (KeyPair)o;
-
-                //System.out.println(pair.getPublic());
-                //System.out.println(pair.getPrivate());
-            }
-            else
-            {
-                //System.out.println(o.toString());
-            }
-        }
-
-        // test bogus lines before begin are ignored.
-        pemRd = openPEMResource("extratest.pem");
-
-        while ((o = pemRd.readObject()) != null)
-        {
-            if (!(o instanceof X509CertificateHolder))
-            {
-                fail("wrong object found");
-            }
-        }
-
-        //
-        // pkcs 7 data
-        //
-        pemRd = openPEMResource("pkcs7.pem");
-        ContentInfo d = (ContentInfo)pemRd.readObject();
-
-        if (!d.getContentType().equals(CMSObjectIdentifiers.envelopedData))
-        {
-            fail("failed envelopedData check");
-        }
-
-        //
-        // ECKey
-        //
-        pemRd = openPEMResource("eckey.pem");
-        ASN1ObjectIdentifier ecOID = (ASN1ObjectIdentifier)pemRd.readObject();
-        X9ECParameters ecSpec = ECNamedCurveTable.getByOID(ecOID);
-
-        if (ecSpec == null)
-        {
-            fail("ecSpec not found for named curve");
-        }
-
-        pemPair = (PEMKeyPair)pemRd.readObject();
-
-        pair = new JcaPEMKeyConverter().setProvider("BC").getKeyPair(pemPair);
-
-        Signature sgr = Signature.getInstance("ECDSA", "BC");
-
-        sgr.initSign(pair.getPrivate());
-
-        byte[] message = new byte[] { (byte)'a', (byte)'b', (byte)'c' };
-
-        sgr.update(message);
-
-        byte[]  sigBytes = sgr.sign();
-
-        sgr.initVerify(pair.getPublic());
-
-        sgr.update(message);
-
-        if (!sgr.verify(sigBytes))
-        {
-            fail("EC verification failed");
-        }
-
-        if (!pair.getPublic().getAlgorithm().equals("ECDSA"))
-        {
-            fail("wrong algorithm name on public got: " + pair.getPublic().getAlgorithm());
-        }
-
-        if (!pair.getPrivate().getAlgorithm().equals("ECDSA"))
-        {
-            fail("wrong algorithm name on private");
-        }
-
-        //
-        // ECKey -- explicit parameters
-        //
-        pemRd = openPEMResource("ecexpparam.pem");
-        ecSpec = (X9ECParameters)pemRd.readObject();
-
-        pemPair = (PEMKeyPair)pemRd.readObject();
-
-        pair = new JcaPEMKeyConverter().setProvider("BC").getKeyPair(pemPair);
-
-        sgr = Signature.getInstance("ECDSA", "BC");
-
-        sgr.initSign(pair.getPrivate());
-
-        message = new byte[] { (byte)'a', (byte)'b', (byte)'c' };
-
-        sgr.update(message);
-
-        sigBytes = sgr.sign();
-
-        sgr.initVerify(pair.getPublic());
-
-        sgr.update(message);
-
-        if (!sgr.verify(sigBytes))
-        {
-            fail("EC verification failed");
-        }
-
-        if (!pair.getPublic().getAlgorithm().equals("ECDSA"))
-        {
-            fail("wrong algorithm name on public got: " + pair.getPublic().getAlgorithm());
-        }
-
-        if (!pair.getPrivate().getAlgorithm().equals("ECDSA"))
-        {
-            fail("wrong algorithm name on private");
-        }
-
-        //
-        // writer/parser test
-        //
-        KeyPairGenerator      kpGen = KeyPairGenerator.getInstance("RSA", "BC");
-
-        pair = kpGen.generateKeyPair();
-
-        keyPairTest("RSA", pair);
-
-        kpGen = KeyPairGenerator.getInstance("DSA", "BC");
-        kpGen.initialize(512, new SecureRandom());
-        pair = kpGen.generateKeyPair();
-
-        keyPairTest("DSA", pair);
-
-        //
-        // PKCS7
-        //
-        ByteArrayOutputStream bOut = new ByteArrayOutputStream();
-        PEMWriter             pWrt = new PEMWriter(new OutputStreamWriter(bOut));
-
-        pWrt.writeObject(d);
-
-        pWrt.close();
-
-        pemRd = new PEMParser(new InputStreamReader(new ByteArrayInputStream(bOut.toByteArray())));
-        d = (ContentInfo)pemRd.readObject();
-
-        if (!d.getContentType().equals(CMSObjectIdentifiers.envelopedData))
-        {
-            fail("failed envelopedData recode check");
-        }
-
-
-        // OpenSSL test cases (as embedded resources)
-        doOpenSslDsaTest("unencrypted");
-        doOpenSslRsaTest("unencrypted");
-
-        doOpenSslTests("aes128");
-        doOpenSslTests("aes192");
-        doOpenSslTests("aes256");
-        doOpenSslTests("blowfish");
-        doOpenSslTests("des1");
-        doOpenSslTests("des2");
-        doOpenSslTests("des3");
-        doOpenSslTests("rc2_128");
-
-        doOpenSslDsaTest("rc2_40_cbc");
-        doOpenSslRsaTest("rc2_40_cbc");
-        doOpenSslDsaTest("rc2_64_cbc");
-        doOpenSslRsaTest("rc2_64_cbc");
-
-        doDudPasswordTest("7fd98", 0, "corrupted stream - out of bounds length found");
-        doDudPasswordTest("ef677", 1, "corrupted stream - out of bounds length found");
-        doDudPasswordTest("800ce", 2, "unknown tag 26 encountered");
-        doDudPasswordTest("b6cd8", 3, "DEF length 81 object truncated by 56");
-        doDudPasswordTest("28ce09", 4, "DEF length 110 object truncated by 28");
-        doDudPasswordTest("2ac3b9", 5, "DER length more than 4 bytes: 11");
-        doDudPasswordTest("2cba96", 6, "DEF length 100 object truncated by 35");
-        doDudPasswordTest("2e3354", 7, "DEF length 42 object truncated by 9");
-        doDudPasswordTest("2f4142", 8, "DER length more than 4 bytes: 14");
-        doDudPasswordTest("2fe9bb", 9, "DER length more than 4 bytes: 65");
-        doDudPasswordTest("3ee7a8", 10, "DER length more than 4 bytes: 57");
-        doDudPasswordTest("41af75", 11, "unknown tag 16 encountered");
-        doDudPasswordTest("1704a5", 12, "corrupted stream detected");
-        doDudPasswordTest("1c5822", 13, "unknown object in getInstance: org.bouncycastle.asn1.DERUTF8String");
-        doDudPasswordTest("5a3d16", 14, "corrupted stream detected");
-        doDudPasswordTest("8d0c97", 15, "corrupted stream detected");
-        doDudPasswordTest("bc0daf", 16, "corrupted stream detected");
-        doDudPasswordTest("aaf9c4d",17, "corrupted stream - out of bounds length found");
-
-        doNoPasswordTest();
-
-        // encrypted private key test
-        InputDecryptorProvider pkcs8Prov = new JceOpenSSLPKCS8DecryptorProviderBuilder().build("password".toCharArray());
-        pemRd = openPEMResource("enckey.pem");
-
-        PKCS8EncryptedPrivateKeyInfo encPrivKeyInfo = (PKCS8EncryptedPrivateKeyInfo)pemRd.readObject();
-        JcaPEMKeyConverter   converter = new JcaPEMKeyConverter().setProvider("BC");
-
-        RSAPrivateCrtKey privKey = (RSAPrivateCrtKey)converter.getPrivateKey(encPrivKeyInfo.decryptPrivateKeyInfo(pkcs8Prov));
-
-        if (!privKey.getPublicExponent().equals(new BigInteger("10001", 16)))
-        {
-            fail("decryption of private key data check failed");
-        }
-
-        // general PKCS8 test
-
-        pemRd = openPEMResource("pkcs8test.pem");
-
-        Object privInfo;
-
-        while ((privInfo = pemRd.readObject()) != null)
-        {
-            if (privInfo instanceof PrivateKeyInfo)
-            {
-                privKey = (RSAPrivateCrtKey)converter.getPrivateKey(PrivateKeyInfo.getInstance(privInfo));
-            }
-            else
-            {
-                privKey = (RSAPrivateCrtKey)converter.getPrivateKey(((PKCS8EncryptedPrivateKeyInfo)privInfo).decryptPrivateKeyInfo(pkcs8Prov));
-            }
-            if (!privKey.getPublicExponent().equals(new BigInteger("10001", 16)))
-            {
-                fail("decryption of private key data check failed");
-            }
-        }
-    }
-
-    private void keyPairTest(
-        String   name,
-        KeyPair pair) 
-        throws IOException
-    {
-        PEMParser pemRd;
-        ByteArrayOutputStream bOut = new ByteArrayOutputStream();
-        PEMWriter             pWrt = new PEMWriter(new OutputStreamWriter(bOut));
-        
-        pWrt.writeObject(pair.getPublic());
-        
-        pWrt.close();
-
-        pemRd = new PEMParser(new InputStreamReader(new ByteArrayInputStream(bOut.toByteArray())));
-
-        SubjectPublicKeyInfo pub = SubjectPublicKeyInfo.getInstance(pemRd.readObject());
-        JcaPEMKeyConverter   converter = new JcaPEMKeyConverter().setProvider("BC");
-
-        PublicKey k = converter.getPublicKey(pub);
-
-        if (!k.equals(pair.getPublic()))
-        {
-            fail("Failed public key read: " + name);
-        }
-        
-        bOut = new ByteArrayOutputStream();
-        pWrt = new PEMWriter(new OutputStreamWriter(bOut));
-        
-        pWrt.writeObject(pair.getPrivate());
-        
-        pWrt.close();
-        
-        pemRd = new PEMParser(new InputStreamReader(new ByteArrayInputStream(bOut.toByteArray())));
-        
-        KeyPair kPair = converter.getKeyPair((PEMKeyPair)pemRd.readObject());
-        if (!kPair.getPrivate().equals(pair.getPrivate()))
-        {
-            fail("Failed private key read: " + name);
-        }
-        
-        if (!kPair.getPublic().equals(pair.getPublic()))
-        {
-            fail("Failed private key public read: " + name);
-        }
-    }
-
-    private void doOpenSslTests(
-        String baseName)
-        throws IOException
-    {
-        doOpenSslDsaModesTest(baseName);
-        doOpenSslRsaModesTest(baseName);
-    }
-
-    private void doOpenSslDsaModesTest(
-        String baseName)
-        throws IOException
-    {
-        doOpenSslDsaTest(baseName + "_cbc");
-        doOpenSslDsaTest(baseName + "_cfb");
-        doOpenSslDsaTest(baseName + "_ecb");
-        doOpenSslDsaTest(baseName + "_ofb");
-    }
-
-    private void doOpenSslRsaModesTest(
-        String baseName)
-        throws IOException
-    {
-        doOpenSslRsaTest(baseName + "_cbc");
-        doOpenSslRsaTest(baseName + "_cfb");
-        doOpenSslRsaTest(baseName + "_ecb");
-        doOpenSslRsaTest(baseName + "_ofb");
-    }
-
-    private void doOpenSslDsaTest(
-        String name)
-        throws IOException
-    {
-        String fileName = "dsa/openssl_dsa_" + name + ".pem";
-
-        doOpenSslTestFile(fileName, DSAPrivateKey.class);
-    }
-
-    private void doOpenSslRsaTest(
-        String name)
-        throws IOException
-    {
-        String fileName = "rsa/openssl_rsa_" + name + ".pem";
-
-        doOpenSslTestFile(fileName, RSAPrivateKey.class);
-    }
-
-    private void doOpenSslTestFile(
-        String  fileName,
-        Class   expectedPrivKeyClass)
-        throws IOException
-    {
-        JcaPEMKeyConverter   converter = new JcaPEMKeyConverter().setProvider("BC");
-        PEMDecryptorProvider decProv = new JcePEMDecryptorProviderBuilder().setProvider("BC").build("changeit".toCharArray());
-        PEMParser pr = openPEMResource("data/" + fileName);
-        Object o = pr.readObject();
-
-        if (o == null || !((o instanceof PEMKeyPair) || (o instanceof PEMEncryptedKeyPair)))
-        {
-            fail("Didn't find OpenSSL key");
-        }
-
-        KeyPair kp = (o instanceof PEMEncryptedKeyPair) ?
-            converter.getKeyPair(((PEMEncryptedKeyPair)o).decryptKeyPair(decProv)) : converter.getKeyPair((PEMKeyPair)o);
-
-        PrivateKey privKey = kp.getPrivate();
-
-        if (!expectedPrivKeyClass.isInstance(privKey))
-        {
-            fail("Returned key not of correct type");
-        }
-    }
-
-    private void doDudPasswordTest(String password, int index, String message)
-    {
-        // illegal state exception check - in this case the wrong password will
-        // cause an underlying class cast exception.
-        try
-        {
-            PEMDecryptorProvider decProv = new JcePEMDecryptorProviderBuilder().setProvider("BC").build(password.toCharArray());
-
-            PEMParser pemRd = openPEMResource("test.pem");
-            Object o;
-
-            while ((o = pemRd.readObject()) != null)
-            {
-                if (o instanceof PEMEncryptedKeyPair)
-                {
-                    ((PEMEncryptedKeyPair)o).decryptKeyPair(decProv);
-                }
-            }
-
-            fail("issue not detected: " + index);
-        }
-        catch (IOException e)
-        {
-            if (e.getCause() != null && !e.getCause().getMessage().endsWith(message))
-            {
-               fail("issue " + index + " exception thrown, but wrong message");
-            }
-            else if (e.getCause() == null && !e.getMessage().equals(message))
-            {
-                               e.printStackTrace();
-               fail("issue " + index + " exception thrown, but wrong message");
-            }
-        }
-    }
-
-    private void doNoPasswordTest()
-        throws IOException
-    {
-        PEMDecryptorProvider decProv = new JcePEMDecryptorProviderBuilder().setProvider("BC").build("".toCharArray());
-
-        PEMParser pemRd = openPEMResource("smimenopw.pem");
-        Object o;
-        PrivateKeyInfo key = null;
-
-        while ((o = pemRd.readObject()) != null)
-        {
-             key = (PrivateKeyInfo)o;
-        }
-
-        if (key == null)
-        {
-            fail("private key not detected");
-        }
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        Security.addProvider(new BouncyCastleProvider());
-
-        runTest(new ParserTest());
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/openssl/test/WriterTest.java b/bcpkix/src/main/java/org/bouncycastle/openssl/test/WriterTest.java
deleted file mode 100644
index e41efd6..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/openssl/test/WriterTest.java
+++ /dev/null
@@ -1,248 +0,0 @@
-package org.bouncycastle.openssl.test;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.OutputStreamWriter;
-import java.io.StringReader;
-import java.io.StringWriter;
-import java.math.BigInteger;
-import java.security.KeyFactory;
-import java.security.KeyPair;
-import java.security.KeyPairGenerator;
-import java.security.PrivateKey;
-import java.security.SecureRandom;
-import java.security.Security;
-import java.security.spec.DSAParameterSpec;
-import java.security.spec.PKCS8EncodedKeySpec;
-import java.security.spec.RSAPrivateCrtKeySpec;
-import java.util.List;
-
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.openssl.PEMEncryptedKeyPair;
-import org.bouncycastle.openssl.PEMKeyPair;
-import org.bouncycastle.openssl.PEMParser;
-import org.bouncycastle.openssl.PEMWriter;
-import org.bouncycastle.openssl.PasswordFinder;
-import org.bouncycastle.openssl.jcajce.JcaMiscPEMGenerator;
-import org.bouncycastle.openssl.jcajce.JcaPEMKeyConverter;
-import org.bouncycastle.openssl.jcajce.JcePEMDecryptorProviderBuilder;
-import org.bouncycastle.openssl.jcajce.JcePEMEncryptorBuilder;
-import org.bouncycastle.util.encoders.Base64;
-import org.bouncycastle.util.io.pem.PemHeader;
-import org.bouncycastle.util.io.pem.PemObject;
-import org.bouncycastle.util.test.SimpleTest;
-
-public class WriterTest
-    extends SimpleTest
-{
-    private static final SecureRandom random = new SecureRandom();
-
-    // TODO Replace with a randomly generated key each test run?
-    private static final RSAPrivateCrtKeySpec testRsaKeySpec = new RSAPrivateCrtKeySpec(
-        new BigInteger("b4a7e46170574f16a97082b22be58b6a2a629798419be12872a4bdba626cfae9900f76abfb12139dce5de56564fab2b6543165a040c606887420e33d91ed7ed7", 16),
-        new BigInteger("11", 16),
-        new BigInteger("9f66f6b05410cd503b2709e88115d55daced94d1a34d4e32bf824d0dde6028ae79c5f07b580f5dce240d7111f7ddb130a7945cd7d957d1920994da389f490c89", 16),
-        new BigInteger("c0a0758cdf14256f78d4708c86becdead1b50ad4ad6c5c703e2168fbf37884cb", 16),
-        new BigInteger("f01734d7960ea60070f1b06f2bb81bfac48ff192ae18451d5e56c734a5aab8a5", 16),
-        new BigInteger("b54bb9edff22051d9ee60f9351a48591b6500a319429c069a3e335a1d6171391", 16),
-        new BigInteger("d3d83daf2a0cecd3367ae6f8ae1aeb82e9ac2f816c6fc483533d8297dd7884cd", 16),
-        new BigInteger("b8f52fc6f38593dabb661d3f50f8897f8106eee68b1bce78a95b132b4e5b5d19", 16));
-
-    private static final DSAParameterSpec testDsaParams = new DSAParameterSpec(
-        new BigInteger("7434410770759874867539421675728577177024889699586189000788950934679315164676852047058354758883833299702695428196962057871264685291775577130504050839126673"),
-        new BigInteger("1138656671590261728308283492178581223478058193247"),
-        new BigInteger("4182906737723181805517018315469082619513954319976782448649747742951189003482834321192692620856488639629011570381138542789803819092529658402611668375788410"));
-
-    private static final PKCS8EncodedKeySpec testEcDsaKeySpec = new PKCS8EncodedKeySpec(
-        Base64.decode("MIG/AgEAMBAGByqGSM49AgEGBSuBBAAiBIGnMIGkAgEBBDCSBU3vo7ieeKs0ABQamy/ynxlde7Ylr8HmyfLaNnMr" +
-            "jAwPp9R+KMUEhB7zxSAXv9KgBwYFK4EEACKhZANiAQQyyolMpg+TyB4o9kPWqafHIOe8o9K1glus+w2sY8OIPQQWGb5i5LdAyi" +
-            "/SscwU24rZM0yiL3BHodp9ccwyhLrFYgXJUOQcCN2dno1GMols5497in5gL5+zn0yMsRtyv5o=")
-    );
-
-    private static final char[] testPassword = "bouncy".toCharArray();
-
-    private static final String[] algorithms = new String[]
-    {
-        "AES-128-CBC", "AES-128-CFB", "AES-128-ECB", "AES-128-OFB",
-        "AES-192-CBC", "AES-192-CFB", "AES-192-ECB", "AES-192-OFB",
-        "AES-256-CBC", "AES-256-CFB", "AES-256-ECB", "AES-256-OFB",
-        "BF-CBC", "BF-CFB", "BF-ECB", "BF-OFB",
-        "DES-CBC", "DES-CFB", "DES-ECB", "DES-OFB",
-        "DES-EDE", "DES-EDE-CBC", "DES-EDE-CFB", "DES-EDE-ECB", "DES-EDE-OFB",
-        "DES-EDE3", "DES-EDE3-CBC", "DES-EDE3-CFB", "DES-EDE3-ECB", "DES-EDE3-OFB",
-        "RC2-CBC", "RC2-CFB", "RC2-ECB", "RC2-OFB",
-        "RC2-40-CBC",
-        "RC2-64-CBC",
-    };
-
-    private class Password
-        implements PasswordFinder
-    {
-        private final char[] password;
-
-        public Password(
-            char[] word)
-        {
-            this.password = (char[]) word.clone();
-        }
-
-        public char[] getPassword()
-        {
-            return (char[]) password.clone();
-        }
-    }
-
-    public String getName()
-    {
-        return "PEMWriterTest";
-    }
-
-    public void performTest()
-        throws Exception
-    {
-        final String provider = "BC";
-
-        KeyPairGenerator dsaKpg = KeyPairGenerator.getInstance("DSA", provider);
-        dsaKpg.initialize(testDsaParams, random);
-
-        KeyPair dsaKp = dsaKpg.generateKeyPair();
-        PrivateKey testDsaKey = dsaKp.getPrivate();
-
-        doWriteReadTest(testDsaKey, provider);
-        doWriteReadTests(testDsaKey, provider, algorithms);
-
-        KeyFactory fact = KeyFactory.getInstance("RSA", provider);
-        PrivateKey testRsaKey = fact.generatePrivate(testRsaKeySpec);
-
-        doWriteReadTest(testRsaKey, provider);
-        doWriteReadTests(testRsaKey, provider, algorithms);
-
-        fact = KeyFactory.getInstance("ECDSA", provider);
-        PrivateKey testEcDsaKey = fact.generatePrivate(testEcDsaKeySpec);
-
-        doWriteReadTest(testEcDsaKey, provider);
-        doWriteReadTests(testEcDsaKey, provider, algorithms);
-
-        KeyPairGenerator kpGen = KeyPairGenerator.getInstance("ECDSA", "BC");
-
-        kpGen.initialize(239);
-
-        PrivateKey privKey = kpGen.generateKeyPair().getPrivate();
-
-        doWriteReadTest(privKey, provider);
-        doWriteReadTests(privKey, "BC", algorithms);
-
-        // override test
-        PEMWriter pWrt = new PEMWriter(new OutputStreamWriter(new ByteArrayOutputStream()));
-
-        Object o = new PemObject("FRED", new byte[100]);
-        pWrt.writeObject(o);
-
-        pWrt.close();
-    }
-
-    private void doWriteReadTests(
-        PrivateKey  akp,
-        String      provider,
-        String[]    algorithms)
-        throws IOException
-    {
-        for (int i = 0; i < algorithms.length; ++i)
-        {
-            doWriteReadTest(akp, provider, algorithms[i]);
-        }
-    }
-
-    private void doWriteReadTest(
-        PrivateKey  akp,
-        String      provider)
-        throws IOException
-    {
-        StringWriter sw = new StringWriter();
-        PEMWriter pw = new PEMWriter(sw);
-
-        pw.writeObject(akp);
-        pw.close();
-
-        String data = sw.toString();
-
-        PEMParser pr = new PEMParser(new StringReader(data));
-
-        Object o = pr.readObject();
-
-        if (o == null || !(o instanceof PEMKeyPair))
-        {
-            fail("Didn't find OpenSSL key");
-        }
-
-        KeyPair kp = new JcaPEMKeyConverter().setProvider("BC").getKeyPair((PEMKeyPair)o);
-        PrivateKey privKey = kp.getPrivate();
-
-        if (!akp.equals(privKey))
-        {
-            fail("Failed to read back test");
-        }
-    }
-
-    private void doWriteReadTest(
-        PrivateKey  akp,
-        String      provider,
-        String      algorithm)
-        throws IOException
-    {
-        StringWriter sw = new StringWriter();
-        PEMWriter pw = new PEMWriter(sw);
-
-        pw.writeObject(new JcaMiscPEMGenerator(akp, new JcePEMEncryptorBuilder(algorithm).setSecureRandom(random).build(testPassword)));
-        pw.close();
-
-        String data = sw.toString();
-
-        PEMParser pRaw = new PEMParser(new StringReader(data));
-        PemObject pemObject = pRaw.readPemObject();
-
-        List headers = pemObject.getHeaders();
-
-        for (int i = 0; i != headers.size(); i++)
-        {
-            PemHeader pemH = (PemHeader)headers.get(i);
-
-            if (pemH.getName().equals("DEK-Info"))
-            {
-                String v = pemH.getValue();
-                for (int j = 0; j != v.length(); j++)
-                {
-                    if (v.charAt(j) >= 'a' && v.charAt(j) <= 'f')
-                    {
-                        fail("lower case detected in DEK-Info: " + v);
-                    }
-                }
-            }
-        }
-
-        PEMParser pr = new PEMParser(new StringReader(data));
-
-        Object o = pr.readObject();
-
-        if (o == null || !(o instanceof PEMEncryptedKeyPair))
-        {
-            fail("Didn't find OpenSSL key");
-        }
-
-        KeyPair kp = new JcaPEMKeyConverter().setProvider("BC").getKeyPair(((PEMEncryptedKeyPair)o).decryptKeyPair(new JcePEMDecryptorProviderBuilder().setProvider("BC").build(testPassword)));
-        PrivateKey privKey = kp.getPrivate();
-
-        if (!akp.equals(privKey))
-        {
-            fail("Failed to read back test key encoded with: " + algorithm);
-        }
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        Security.addProvider(new BouncyCastleProvider());
-
-        runTest(new WriterTest());
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/openssl/test/package.html b/bcpkix/src/main/java/org/bouncycastle/openssl/test/package.html
deleted file mode 100644
index 368d709..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/openssl/test/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body bgcolor="#ffffff">
-Test class for OpenSSL PEMReader.
-</body>
-</html>
diff --git a/bcpkix/src/main/java/org/bouncycastle/operator/AlgorithmNameFinder.java b/bcpkix/src/main/java/org/bouncycastle/operator/AlgorithmNameFinder.java
deleted file mode 100644
index c196cfc..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/operator/AlgorithmNameFinder.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package org.bouncycastle.operator;
-
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-
-/**
- * General finder for converting OIDs and AlgorithmIdentifiers into strings.
- */
-public interface AlgorithmNameFinder
-{
-    /**
-     * Return true if the passed in objectIdentifier has a "human friendly" name associated with it.
-     *
-     * @param objectIdentifier the OID of interest.
-     * @boolean true if a name lookup exists for the OID, false otherwise.
-     */
-    boolean hasAlgorithmName(ASN1ObjectIdentifier objectIdentifier);
-
-    /**
-     * Return a string representation of the passed in objectIdentifier.
-     *
-     * @param objectIdentifier the OID of interest.
-     * @return a "human friendly" representation of the OID, the OID as a string if none available.
-     */
-    String getAlgorithmName(ASN1ObjectIdentifier objectIdentifier);
-
-    /**
-     * Return a string representation of the passed in AlgorithmIdentifier, based on the OID in the AlgorithmField, with the parameters
-     * included where appropriate.
-     *
-     * @param algorithmIdentifier the AlgorithmIdentifier of interest.
-     * @return a "human friendly" representation of the algorithmIdentifier, the identifiers OID as a string if none available.
-     */
-    String getAlgorithmName(AlgorithmIdentifier algorithmIdentifier);
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/operator/AsymmetricKeyUnwrapper.java b/bcpkix/src/main/java/org/bouncycastle/operator/AsymmetricKeyUnwrapper.java
deleted file mode 100644
index 3c3aa2f..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/operator/AsymmetricKeyUnwrapper.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package org.bouncycastle.operator;
-
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-
-public abstract class AsymmetricKeyUnwrapper
-    implements KeyUnwrapper
-{
-    private AlgorithmIdentifier algorithmId;
-
-    protected AsymmetricKeyUnwrapper(AlgorithmIdentifier algorithmId)
-    {
-        this.algorithmId = algorithmId;
-    }
-
-    public AlgorithmIdentifier getAlgorithmIdentifier()
-    {
-        return algorithmId;
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/operator/AsymmetricKeyWrapper.java b/bcpkix/src/main/java/org/bouncycastle/operator/AsymmetricKeyWrapper.java
deleted file mode 100644
index 27af719..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/operator/AsymmetricKeyWrapper.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package org.bouncycastle.operator;
-
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-
-public abstract class AsymmetricKeyWrapper
-    implements KeyWrapper
-{
-    private AlgorithmIdentifier algorithmId;
-
-    protected AsymmetricKeyWrapper(AlgorithmIdentifier algorithmId)
-    {
-        this.algorithmId = algorithmId;
-    }
-
-    public AlgorithmIdentifier getAlgorithmIdentifier()
-    {
-        return algorithmId;
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/operator/BufferingContentSigner.java b/bcpkix/src/main/java/org/bouncycastle/operator/BufferingContentSigner.java
deleted file mode 100644
index d174367..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/operator/BufferingContentSigner.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package org.bouncycastle.operator;
-
-import java.io.OutputStream;
-
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.util.io.BufferingOutputStream;
-
-/**
- * A class that explicitly buffers the data to be signed, sending it in one
- * block when ready for signing.
- */
-public class BufferingContentSigner
-    implements ContentSigner
-{
-    private final ContentSigner contentSigner;
-    private final OutputStream  output;
-
-    /**
-     * Base constructor.
-     *
-     * @param contentSigner the content signer to be wrapped.
-     */
-    public BufferingContentSigner(ContentSigner contentSigner)
-    {
-        this.contentSigner = contentSigner;
-        this.output = new BufferingOutputStream(contentSigner.getOutputStream());
-    }
-
-    /**
-     * Base constructor.
-     *
-     * @param contentSigner the content signer to be wrapped.
-     * @param bufferSize the size of the internal buffer to use.
-     */
-    public BufferingContentSigner(ContentSigner contentSigner, int bufferSize)
-    {
-        this.contentSigner = contentSigner;
-        this.output = new BufferingOutputStream(contentSigner.getOutputStream(), bufferSize);
-    }
-
-    /**
-     * Return the algorithm identifier supported by this signer.
-     *
-     * @return algorithm identifier for the signature generated.
-     */
-    public AlgorithmIdentifier getAlgorithmIdentifier()
-    {
-        return contentSigner.getAlgorithmIdentifier();
-    }
-
-    /**
-     * Return the buffering stream.
-     *
-     * @return the output stream used to accumulate the data.
-     */
-    public OutputStream getOutputStream()
-    {
-        return output;
-    }
-
-    /**
-     * Generate signature from internally buffered data.
-     *
-     * @return the signature calculated from the bytes written to the buffering stream.
-     */
-    public byte[] getSignature()
-    {
-        return contentSigner.getSignature();
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/operator/DefaultAlgorithmNameFinder.java b/bcpkix/src/main/java/org/bouncycastle/operator/DefaultAlgorithmNameFinder.java
deleted file mode 100644
index 6defb27..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/operator/DefaultAlgorithmNameFinder.java
+++ /dev/null
@@ -1,113 +0,0 @@
-package org.bouncycastle.operator;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.bsi.BSIObjectIdentifiers;
-import org.bouncycastle.asn1.cryptopro.CryptoProObjectIdentifiers;
-import org.bouncycastle.asn1.eac.EACObjectIdentifiers;
-import org.bouncycastle.asn1.kisa.KISAObjectIdentifiers;
-import org.bouncycastle.asn1.misc.MiscObjectIdentifiers;
-import org.bouncycastle.asn1.nist.NISTObjectIdentifiers;
-import org.bouncycastle.asn1.ntt.NTTObjectIdentifiers;
-import org.bouncycastle.asn1.oiw.OIWObjectIdentifiers;
-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.cms.CMSEnvelopedGenerator;
-
-public class DefaultAlgorithmNameFinder
-    implements AlgorithmNameFinder
-{
-    private final static Map algorithms = new HashMap();
-
-    static
-    {
-        algorithms.put(BSIObjectIdentifiers.ecdsa_plain_RIPEMD160, "RIPEMD160WITHPLAIN-ECDSA");
-        algorithms.put(BSIObjectIdentifiers.ecdsa_plain_SHA1, "SHA1WITHPLAIN-ECDSA");
-        algorithms.put(BSIObjectIdentifiers.ecdsa_plain_SHA224, "SHA224WITHPLAIN-ECDSA");
-        algorithms.put(BSIObjectIdentifiers.ecdsa_plain_SHA256, "SHA256WITHPLAIN-ECDSA");
-        algorithms.put(BSIObjectIdentifiers.ecdsa_plain_SHA384, "SHA384WITHPLAIN-ECDSA");
-        algorithms.put(BSIObjectIdentifiers.ecdsa_plain_SHA512, "SHA512WITHPLAIN-ECDSA");
-        algorithms.put(CryptoProObjectIdentifiers.gostR3411_94_with_gostR3410_2001, "GOST3411WITHECGOST3410");
-        algorithms.put(CryptoProObjectIdentifiers.gostR3411_94_with_gostR3410_2001, "GOST3411WITHECGOST3410-2001");
-        algorithms.put(CryptoProObjectIdentifiers.gostR3411_94_with_gostR3410_2001, "GOST3411WITHGOST3410-2001");
-        algorithms.put(CryptoProObjectIdentifiers.gostR3411_94_with_gostR3410_94, "GOST3411WITHGOST3410");
-        algorithms.put(CryptoProObjectIdentifiers.gostR3411_94_with_gostR3410_94, "GOST3411WITHGOST3410-94");
-        algorithms.put(CryptoProObjectIdentifiers.gostR3411, "GOST3411");
-        algorithms.put(EACObjectIdentifiers.id_TA_ECDSA_SHA_1, "SHA1WITHCVC-ECDSA");
-        algorithms.put(EACObjectIdentifiers.id_TA_ECDSA_SHA_224, "SHA224WITHPCVC-ECDSA");
-        algorithms.put(EACObjectIdentifiers.id_TA_ECDSA_SHA_256, "SHA256WITHCVC-ECDSA");
-        algorithms.put(EACObjectIdentifiers.id_TA_ECDSA_SHA_384, "SHA384WITHCVC-ECDSA");
-        algorithms.put(EACObjectIdentifiers.id_TA_ECDSA_SHA_512, "SHA512WITHCVC-ECDSA");
-        algorithms.put(NISTObjectIdentifiers.dsa_with_sha224, "SHA224WITHDSA");
-        algorithms.put(NISTObjectIdentifiers.dsa_with_sha256, "SHA256WITHDSA");
-        algorithms.put(NISTObjectIdentifiers.dsa_with_sha384, "SHA384WITHDSA");
-        algorithms.put(NISTObjectIdentifiers.dsa_with_sha512, "SHA512WITHDSA");
-        algorithms.put(NISTObjectIdentifiers.id_sha224, "SHA224");
-        algorithms.put(NISTObjectIdentifiers.id_sha256, "SHA256");
-        algorithms.put(NISTObjectIdentifiers.id_sha384, "SHA384");
-        algorithms.put(NISTObjectIdentifiers.id_sha512, "SHA512");
-        algorithms.put(OIWObjectIdentifiers.elGamalAlgorithm, "ELGAMAL");
-        algorithms.put(OIWObjectIdentifiers.idSHA1, "SHA1");
-        algorithms.put(OIWObjectIdentifiers.md5WithRSA, "MD5WITHRSA");
-        algorithms.put(OIWObjectIdentifiers.sha1WithRSA, "SHA1WITHRSA");
-        algorithms.put(PKCSObjectIdentifiers.id_RSAES_OAEP, "RSAOAEP");
-        algorithms.put(PKCSObjectIdentifiers.id_RSASSA_PSS, "RSAPSS");
-        algorithms.put(PKCSObjectIdentifiers.md2WithRSAEncryption, "MD2WITHRSA");
-        algorithms.put(PKCSObjectIdentifiers.md5, "MD5");
-        algorithms.put(PKCSObjectIdentifiers.md5WithRSAEncryption, "MD5WITHRSA");
-        algorithms.put(PKCSObjectIdentifiers.rsaEncryption, "RSA");
-        algorithms.put(PKCSObjectIdentifiers.sha1WithRSAEncryption, "SHA1WITHRSA");
-        algorithms.put(PKCSObjectIdentifiers.sha224WithRSAEncryption, "SHA224WITHRSA");
-        algorithms.put(PKCSObjectIdentifiers.sha256WithRSAEncryption, "SHA256WITHRSA");
-        algorithms.put(PKCSObjectIdentifiers.sha384WithRSAEncryption, "SHA384WITHRSA");
-        algorithms.put(PKCSObjectIdentifiers.sha512WithRSAEncryption, "SHA512WITHRSA");
-        algorithms.put(TeleTrusTObjectIdentifiers.ripemd128, "RIPEMD128");
-        algorithms.put(TeleTrusTObjectIdentifiers.ripemd160, "RIPEMD160");
-        algorithms.put(TeleTrusTObjectIdentifiers.ripemd256, "RIPEMD256");
-        algorithms.put(TeleTrusTObjectIdentifiers.rsaSignatureWithripemd128, "RIPEMD128WITHRSA");
-        algorithms.put(TeleTrusTObjectIdentifiers.rsaSignatureWithripemd160, "RIPEMD160WITHRSA");
-        algorithms.put(TeleTrusTObjectIdentifiers.rsaSignatureWithripemd256, "RIPEMD256WITHRSA");
-        algorithms.put(X9ObjectIdentifiers.ecdsa_with_SHA1, "ECDSAWITHSHA1");
-        algorithms.put(X9ObjectIdentifiers.ecdsa_with_SHA1, "SHA1WITHECDSA");
-        algorithms.put(X9ObjectIdentifiers.ecdsa_with_SHA224, "SHA224WITHECDSA");
-        algorithms.put(X9ObjectIdentifiers.ecdsa_with_SHA256, "SHA256WITHECDSA");
-        algorithms.put(X9ObjectIdentifiers.ecdsa_with_SHA384, "SHA384WITHECDSA");
-        algorithms.put(X9ObjectIdentifiers.ecdsa_with_SHA512, "SHA512WITHECDSA");
-        algorithms.put(X9ObjectIdentifiers.id_dsa_with_sha1, "SHA1WITHDSA");
-
-        algorithms.put(PKCSObjectIdentifiers.RC2_CBC, "RC2/CBC");
-        algorithms.put(PKCSObjectIdentifiers.des_EDE3_CBC, "DESEDE-3KEY/CBC");
-        algorithms.put(NISTObjectIdentifiers.id_aes128_ECB, "AES-128/ECB");
-        algorithms.put(NISTObjectIdentifiers.id_aes192_ECB, "AES-192/ECB");
-        algorithms.put(NISTObjectIdentifiers.id_aes256_ECB, "AES-256/ECB");
-        algorithms.put(NISTObjectIdentifiers.id_aes128_CBC, "AES-128/CBC");
-        algorithms.put(NISTObjectIdentifiers.id_aes192_CBC, "AES-192/CBC");
-        algorithms.put(NISTObjectIdentifiers.id_aes256_CBC, "AES-256/CBC");
-        algorithms.put(NTTObjectIdentifiers.id_camellia128_cbc, "CAMELLIA-128/CBC");
-        algorithms.put(NTTObjectIdentifiers.id_camellia192_cbc, "CAMELLIA-128/CBC");
-        algorithms.put(NTTObjectIdentifiers.id_camellia256_cbc, "CAMELLIA-128/CBC");
-        algorithms.put(KISAObjectIdentifiers.id_seedCBC, "SEED/CBC");
-    }
-
-    public boolean hasAlgorithmName(ASN1ObjectIdentifier objectIdentifier)
-    {
-        return algorithms.containsKey(objectIdentifier);
-    }
-
-    public String getAlgorithmName(ASN1ObjectIdentifier objectIdentifier)
-    {
-        String name = (String)algorithms.get(objectIdentifier);
-
-        return (name != null) ? name : objectIdentifier.getId();
-    }
-
-    public String getAlgorithmName(AlgorithmIdentifier algorithmIdentifier)
-    {
-        // TODO: take into account PSS/OAEP params
-        return getAlgorithmName(algorithmIdentifier.getAlgorithm());
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/operator/DefaultDigestAlgorithmIdentifierFinder.java b/bcpkix/src/main/java/org/bouncycastle/operator/DefaultDigestAlgorithmIdentifierFinder.java
index c03b5d3..293370f 100644
--- a/bcpkix/src/main/java/org/bouncycastle/operator/DefaultDigestAlgorithmIdentifierFinder.java
+++ b/bcpkix/src/main/java/org/bouncycastle/operator/DefaultDigestAlgorithmIdentifierFinder.java
@@ -5,7 +5,9 @@ import java.util.Map;
 
 import org.bouncycastle.asn1.ASN1ObjectIdentifier;
 import org.bouncycastle.asn1.DERNull;
-import org.bouncycastle.asn1.cryptopro.CryptoProObjectIdentifiers;
+// BEGIN android-removed
+// import org.bouncycastle.asn1.cryptopro.CryptoProObjectIdentifiers;
+// END android-removed
 import org.bouncycastle.asn1.nist.NISTObjectIdentifiers;
 import org.bouncycastle.asn1.oiw.OIWObjectIdentifiers;
 import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
@@ -25,16 +27,20 @@ public class DefaultDigestAlgorithmIdentifierFinder
         //
         // digests
         //
-        digestOids.put(OIWObjectIdentifiers.md4WithRSAEncryption, PKCSObjectIdentifiers.md4);
-        digestOids.put(OIWObjectIdentifiers.md4WithRSA, PKCSObjectIdentifiers.md4);
+        // BEGIN android-removed
+        // digestOids.put(OIWObjectIdentifiers.md4WithRSAEncryption, PKCSObjectIdentifiers.md4);
+        // digestOids.put(OIWObjectIdentifiers.md4WithRSA, PKCSObjectIdentifiers.md4);
+        // END android-removed
         digestOids.put(OIWObjectIdentifiers.sha1WithRSA, OIWObjectIdentifiers.idSHA1);
 
         digestOids.put(PKCSObjectIdentifiers.sha224WithRSAEncryption, NISTObjectIdentifiers.id_sha224);
         digestOids.put(PKCSObjectIdentifiers.sha256WithRSAEncryption, NISTObjectIdentifiers.id_sha256);
         digestOids.put(PKCSObjectIdentifiers.sha384WithRSAEncryption, NISTObjectIdentifiers.id_sha384);
         digestOids.put(PKCSObjectIdentifiers.sha512WithRSAEncryption, NISTObjectIdentifiers.id_sha512);
-        digestOids.put(PKCSObjectIdentifiers.md2WithRSAEncryption, PKCSObjectIdentifiers.md2);
-        digestOids.put(PKCSObjectIdentifiers.md4WithRSAEncryption, PKCSObjectIdentifiers.md4);
+        // BEGIN android-removed
+        // digestOids.put(PKCSObjectIdentifiers.md2WithRSAEncryption, PKCSObjectIdentifiers.md2);
+        // digestOids.put(PKCSObjectIdentifiers.md4WithRSAEncryption, PKCSObjectIdentifiers.md4);
+        // END android-removed
         digestOids.put(PKCSObjectIdentifiers.md5WithRSAEncryption, PKCSObjectIdentifiers.md5);
         digestOids.put(PKCSObjectIdentifiers.sha1WithRSAEncryption, OIWObjectIdentifiers.idSHA1);
 
@@ -50,12 +56,14 @@ public class DefaultDigestAlgorithmIdentifierFinder
         digestOids.put(NISTObjectIdentifiers.dsa_with_sha384, NISTObjectIdentifiers.id_sha384);
         digestOids.put(NISTObjectIdentifiers.dsa_with_sha512, NISTObjectIdentifiers.id_sha512);
 
-        digestOids.put(TeleTrusTObjectIdentifiers.rsaSignatureWithripemd128, TeleTrusTObjectIdentifiers.ripemd128);
-        digestOids.put(TeleTrusTObjectIdentifiers.rsaSignatureWithripemd160, TeleTrusTObjectIdentifiers.ripemd160);
-        digestOids.put(TeleTrusTObjectIdentifiers.rsaSignatureWithripemd256, TeleTrusTObjectIdentifiers.ripemd256);
-
-        digestOids.put(CryptoProObjectIdentifiers.gostR3411_94_with_gostR3410_94, CryptoProObjectIdentifiers.gostR3411);
-        digestOids.put(CryptoProObjectIdentifiers.gostR3411_94_with_gostR3410_2001, CryptoProObjectIdentifiers.gostR3411);
+        // BEGIN android-removed
+        // digestOids.put(TeleTrusTObjectIdentifiers.rsaSignatureWithripemd128, TeleTrusTObjectIdentifiers.ripemd128);
+        // digestOids.put(TeleTrusTObjectIdentifiers.rsaSignatureWithripemd160, TeleTrusTObjectIdentifiers.ripemd160);
+        // digestOids.put(TeleTrusTObjectIdentifiers.rsaSignatureWithripemd256, TeleTrusTObjectIdentifiers.ripemd256);
+        //
+        // digestOids.put(CryptoProObjectIdentifiers.gostR3411_94_with_gostR3410_94, CryptoProObjectIdentifiers.gostR3411);
+        // digestOids.put(CryptoProObjectIdentifiers.gostR3411_94_with_gostR3410_2001, CryptoProObjectIdentifiers.gostR3411);
+        // END android-removed
 
         digestNameToOids.put("SHA-1", OIWObjectIdentifiers.idSHA1);
         digestNameToOids.put("SHA-224", NISTObjectIdentifiers.id_sha224);
@@ -63,15 +71,19 @@ public class DefaultDigestAlgorithmIdentifierFinder
         digestNameToOids.put("SHA-384", NISTObjectIdentifiers.id_sha384);
         digestNameToOids.put("SHA-512", NISTObjectIdentifiers.id_sha512);
 
-        digestNameToOids.put("GOST3411", CryptoProObjectIdentifiers.gostR3411);
-
-        digestNameToOids.put("MD2", PKCSObjectIdentifiers.md2);
-        digestNameToOids.put("MD4", PKCSObjectIdentifiers.md4);
+        // BEGIN android-removed
+        // digestNameToOids.put("GOST3411", CryptoProObjectIdentifiers.gostR3411);
+        //
+        // digestNameToOids.put("MD2", PKCSObjectIdentifiers.md2);
+        // digestNameToOids.put("MD4", PKCSObjectIdentifiers.md4);
+        // END android-removed
         digestNameToOids.put("MD5", PKCSObjectIdentifiers.md5);
 
-        digestNameToOids.put("RIPEMD128", TeleTrusTObjectIdentifiers.ripemd128);
-        digestNameToOids.put("RIPEMD160", TeleTrusTObjectIdentifiers.ripemd160);
-        digestNameToOids.put("RIPEMD256", TeleTrusTObjectIdentifiers.ripemd256);
+        // BEGIN android-removed
+        // digestNameToOids.put("RIPEMD128", TeleTrusTObjectIdentifiers.ripemd128);
+        // digestNameToOids.put("RIPEMD160", TeleTrusTObjectIdentifiers.ripemd160);
+        // digestNameToOids.put("RIPEMD256", TeleTrusTObjectIdentifiers.ripemd256);
+        // END android-removed
     }
 
     public AlgorithmIdentifier find(AlgorithmIdentifier sigAlgId)
diff --git a/bcpkix/src/main/java/org/bouncycastle/operator/DefaultSecretKeySizeProvider.java b/bcpkix/src/main/java/org/bouncycastle/operator/DefaultSecretKeySizeProvider.java
deleted file mode 100644
index a1c6ba1..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/operator/DefaultSecretKeySizeProvider.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package org.bouncycastle.operator;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.cryptopro.CryptoProObjectIdentifiers;
-import org.bouncycastle.asn1.nist.NISTObjectIdentifiers;
-import org.bouncycastle.asn1.ntt.NTTObjectIdentifiers;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.util.Integers;
-
-public class DefaultSecretKeySizeProvider
-    implements SecretKeySizeProvider
-{
-    public static final SecretKeySizeProvider INSTANCE = new DefaultSecretKeySizeProvider();
-
-    private static final Map KEY_SIZES;
-
-    static
-    {
-        Map keySizes = new HashMap();
-
-        keySizes.put(new ASN1ObjectIdentifier("1.2.840.113533.7.66.10"), Integers.valueOf(128));
-
-        keySizes.put(PKCSObjectIdentifiers.des_EDE3_CBC, Integers.valueOf(192));
-
-        keySizes.put(NISTObjectIdentifiers.id_aes128_CBC, Integers.valueOf(128));
-        keySizes.put(NISTObjectIdentifiers.id_aes192_CBC, Integers.valueOf(192));
-        keySizes.put(NISTObjectIdentifiers.id_aes256_CBC, Integers.valueOf(256));
-
-        keySizes.put(NTTObjectIdentifiers.id_camellia128_cbc, Integers.valueOf(128));
-        keySizes.put(NTTObjectIdentifiers.id_camellia192_cbc, Integers.valueOf(192));
-        keySizes.put(NTTObjectIdentifiers.id_camellia256_cbc, Integers.valueOf(256));
-
-        keySizes.put(CryptoProObjectIdentifiers.gostR28147_gcfb, Integers.valueOf(256));
-
-        KEY_SIZES = Collections.unmodifiableMap(keySizes);
-    }
-
-    public int getKeySize(AlgorithmIdentifier algorithmIdentifier)
-    {
-        int keySize = getKeySize(algorithmIdentifier.getAlgorithm());
-
-        // just need the OID
-        if (keySize > 0)
-        {
-            return keySize;
-        }
-
-        // TODO: support OID/Parameter key sizes (e.g. RC2).
-
-        return -1;
-    }
-
-    public int getKeySize(ASN1ObjectIdentifier algorithm)
-    {
-        Integer keySize = (Integer)KEY_SIZES.get(algorithm);
-
-        if (keySize != null)
-        {
-            return keySize.intValue();
-        }
-
-        return -1;
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/operator/DefaultSignatureAlgorithmIdentifierFinder.java b/bcpkix/src/main/java/org/bouncycastle/operator/DefaultSignatureAlgorithmIdentifierFinder.java
index 5eb18d4..f6a5482 100644
--- a/bcpkix/src/main/java/org/bouncycastle/operator/DefaultSignatureAlgorithmIdentifierFinder.java
+++ b/bcpkix/src/main/java/org/bouncycastle/operator/DefaultSignatureAlgorithmIdentifierFinder.java
@@ -9,9 +9,11 @@ import org.bouncycastle.asn1.ASN1Encodable;
 import org.bouncycastle.asn1.ASN1Integer;
 import org.bouncycastle.asn1.ASN1ObjectIdentifier;
 import org.bouncycastle.asn1.DERNull;
-import org.bouncycastle.asn1.bsi.BSIObjectIdentifiers;
-import org.bouncycastle.asn1.cryptopro.CryptoProObjectIdentifiers;
-import org.bouncycastle.asn1.eac.EACObjectIdentifiers;
+// BEGIN android-removed
+// import org.bouncycastle.asn1.bsi.BSIObjectIdentifiers;
+// import org.bouncycastle.asn1.cryptopro.CryptoProObjectIdentifiers;
+// import org.bouncycastle.asn1.eac.EACObjectIdentifiers;
+// END android-removed
 import org.bouncycastle.asn1.nist.NISTObjectIdentifiers;
 import org.bouncycastle.asn1.oiw.OIWObjectIdentifiers;
 import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
@@ -34,13 +36,17 @@ public class DefaultSignatureAlgorithmIdentifierFinder
     private static final ASN1ObjectIdentifier ENCRYPTION_DSA = X9ObjectIdentifiers.id_dsa_with_sha1;
     private static final ASN1ObjectIdentifier ENCRYPTION_ECDSA = X9ObjectIdentifiers.ecdsa_with_SHA1;
     private static final ASN1ObjectIdentifier ENCRYPTION_RSA_PSS = PKCSObjectIdentifiers.id_RSASSA_PSS;
-    private static final ASN1ObjectIdentifier ENCRYPTION_GOST3410 = CryptoProObjectIdentifiers.gostR3410_94;
-    private static final ASN1ObjectIdentifier ENCRYPTION_ECGOST3410 = CryptoProObjectIdentifiers.gostR3410_2001;
+    // BEGIN android-removed
+    // private static final ASN1ObjectIdentifier ENCRYPTION_GOST3410 = CryptoProObjectIdentifiers.gostR3410_94;
+    // private static final ASN1ObjectIdentifier ENCRYPTION_ECGOST3410 = CryptoProObjectIdentifiers.gostR3410_2001;
+    // END android-removed
 
     static
     {
-        algorithms.put("MD2WITHRSAENCRYPTION", PKCSObjectIdentifiers.md2WithRSAEncryption);
-        algorithms.put("MD2WITHRSA", PKCSObjectIdentifiers.md2WithRSAEncryption);
+        // BEGIN android-removed
+        // algorithms.put("MD2WITHRSAENCRYPTION", PKCSObjectIdentifiers.md2WithRSAEncryption);
+        // algorithms.put("MD2WITHRSA", PKCSObjectIdentifiers.md2WithRSAEncryption);
+        // END android-removed
         algorithms.put("MD5WITHRSAENCRYPTION", PKCSObjectIdentifiers.md5WithRSAEncryption);
         algorithms.put("MD5WITHRSA", PKCSObjectIdentifiers.md5WithRSAEncryption);
         algorithms.put("SHA1WITHRSAENCRYPTION", PKCSObjectIdentifiers.sha1WithRSAEncryption);
@@ -58,12 +64,14 @@ public class DefaultSignatureAlgorithmIdentifierFinder
         algorithms.put("SHA256WITHRSAANDMGF1", PKCSObjectIdentifiers.id_RSASSA_PSS);
         algorithms.put("SHA384WITHRSAANDMGF1", PKCSObjectIdentifiers.id_RSASSA_PSS);
         algorithms.put("SHA512WITHRSAANDMGF1", PKCSObjectIdentifiers.id_RSASSA_PSS);
-        algorithms.put("RIPEMD160WITHRSAENCRYPTION", TeleTrusTObjectIdentifiers.rsaSignatureWithripemd160);
-        algorithms.put("RIPEMD160WITHRSA", TeleTrusTObjectIdentifiers.rsaSignatureWithripemd160);
-        algorithms.put("RIPEMD128WITHRSAENCRYPTION", TeleTrusTObjectIdentifiers.rsaSignatureWithripemd128);
-        algorithms.put("RIPEMD128WITHRSA", TeleTrusTObjectIdentifiers.rsaSignatureWithripemd128);
-        algorithms.put("RIPEMD256WITHRSAENCRYPTION", TeleTrusTObjectIdentifiers.rsaSignatureWithripemd256);
-        algorithms.put("RIPEMD256WITHRSA", TeleTrusTObjectIdentifiers.rsaSignatureWithripemd256);
+        // BEGIN android-removed
+        // algorithms.put("RIPEMD160WITHRSAENCRYPTION", TeleTrusTObjectIdentifiers.rsaSignatureWithripemd160);
+        // algorithms.put("RIPEMD160WITHRSA", TeleTrusTObjectIdentifiers.rsaSignatureWithripemd160);
+        // algorithms.put("RIPEMD128WITHRSAENCRYPTION", TeleTrusTObjectIdentifiers.rsaSignatureWithripemd128);
+        // algorithms.put("RIPEMD128WITHRSA", TeleTrusTObjectIdentifiers.rsaSignatureWithripemd128);
+        // algorithms.put("RIPEMD256WITHRSAENCRYPTION", TeleTrusTObjectIdentifiers.rsaSignatureWithripemd256);
+        // algorithms.put("RIPEMD256WITHRSA", TeleTrusTObjectIdentifiers.rsaSignatureWithripemd256);
+        // END android-removed
         algorithms.put("SHA1WITHDSA", X9ObjectIdentifiers.id_dsa_with_sha1);
         algorithms.put("DSAWITHSHA1", X9ObjectIdentifiers.id_dsa_with_sha1);
         algorithms.put("SHA224WITHDSA", NISTObjectIdentifiers.dsa_with_sha224);
@@ -76,22 +84,24 @@ public class DefaultSignatureAlgorithmIdentifierFinder
         algorithms.put("SHA256WITHECDSA", X9ObjectIdentifiers.ecdsa_with_SHA256);
         algorithms.put("SHA384WITHECDSA", X9ObjectIdentifiers.ecdsa_with_SHA384);
         algorithms.put("SHA512WITHECDSA", X9ObjectIdentifiers.ecdsa_with_SHA512);
-        algorithms.put("GOST3411WITHGOST3410", CryptoProObjectIdentifiers.gostR3411_94_with_gostR3410_94);
-        algorithms.put("GOST3411WITHGOST3410-94", CryptoProObjectIdentifiers.gostR3411_94_with_gostR3410_94);
-        algorithms.put("GOST3411WITHECGOST3410", CryptoProObjectIdentifiers.gostR3411_94_with_gostR3410_2001);
-        algorithms.put("GOST3411WITHECGOST3410-2001", CryptoProObjectIdentifiers.gostR3411_94_with_gostR3410_2001);
-        algorithms.put("GOST3411WITHGOST3410-2001", CryptoProObjectIdentifiers.gostR3411_94_with_gostR3410_2001);
-        algorithms.put("SHA1WITHPLAIN-ECDSA", BSIObjectIdentifiers.ecdsa_plain_SHA1);
-        algorithms.put("SHA224WITHPLAIN-ECDSA", BSIObjectIdentifiers.ecdsa_plain_SHA224);
-        algorithms.put("SHA256WITHPLAIN-ECDSA", BSIObjectIdentifiers.ecdsa_plain_SHA256);
-        algorithms.put("SHA384WITHPLAIN-ECDSA", BSIObjectIdentifiers.ecdsa_plain_SHA384);
-        algorithms.put("SHA512WITHPLAIN-ECDSA", BSIObjectIdentifiers.ecdsa_plain_SHA512);
-        algorithms.put("RIPEMD160WITHPLAIN-ECDSA", BSIObjectIdentifiers.ecdsa_plain_RIPEMD160);
-        algorithms.put("SHA1WITHCVC-ECDSA", EACObjectIdentifiers.id_TA_ECDSA_SHA_1);
-        algorithms.put("SHA224WITHPCVC-ECDSA", EACObjectIdentifiers.id_TA_ECDSA_SHA_224);
-        algorithms.put("SHA256WITHCVC-ECDSA", EACObjectIdentifiers.id_TA_ECDSA_SHA_256);
-        algorithms.put("SHA384WITHCVC-ECDSA", EACObjectIdentifiers.id_TA_ECDSA_SHA_384);
-        algorithms.put("SHA512WITHCVC-ECDSA", EACObjectIdentifiers.id_TA_ECDSA_SHA_512);
+        // BEGIN android-removed
+        // algorithms.put("GOST3411WITHGOST3410", CryptoProObjectIdentifiers.gostR3411_94_with_gostR3410_94);
+        // algorithms.put("GOST3411WITHGOST3410-94", CryptoProObjectIdentifiers.gostR3411_94_with_gostR3410_94);
+        // algorithms.put("GOST3411WITHECGOST3410", CryptoProObjectIdentifiers.gostR3411_94_with_gostR3410_2001);
+        // algorithms.put("GOST3411WITHECGOST3410-2001", CryptoProObjectIdentifiers.gostR3411_94_with_gostR3410_2001);
+        // algorithms.put("GOST3411WITHGOST3410-2001", CryptoProObjectIdentifiers.gostR3411_94_with_gostR3410_2001);
+        // algorithms.put("SHA1WITHPLAIN-ECDSA", BSIObjectIdentifiers.ecdsa_plain_SHA1);
+        // algorithms.put("SHA224WITHPLAIN-ECDSA", BSIObjectIdentifiers.ecdsa_plain_SHA224);
+        // algorithms.put("SHA256WITHPLAIN-ECDSA", BSIObjectIdentifiers.ecdsa_plain_SHA256);
+        // algorithms.put("SHA384WITHPLAIN-ECDSA", BSIObjectIdentifiers.ecdsa_plain_SHA384);
+        // algorithms.put("SHA512WITHPLAIN-ECDSA", BSIObjectIdentifiers.ecdsa_plain_SHA512);
+        // algorithms.put("RIPEMD160WITHPLAIN-ECDSA", BSIObjectIdentifiers.ecdsa_plain_RIPEMD160);
+        // algorithms.put("SHA1WITHCVC-ECDSA", EACObjectIdentifiers.id_TA_ECDSA_SHA_1);
+        // algorithms.put("SHA224WITHPCVC-ECDSA", EACObjectIdentifiers.id_TA_ECDSA_SHA_224);
+        // algorithms.put("SHA256WITHCVC-ECDSA", EACObjectIdentifiers.id_TA_ECDSA_SHA_256);
+        // algorithms.put("SHA384WITHCVC-ECDSA", EACObjectIdentifiers.id_TA_ECDSA_SHA_384);
+        // algorithms.put("SHA512WITHCVC-ECDSA", EACObjectIdentifiers.id_TA_ECDSA_SHA_512);
+        // END android-removed
         //
         // According to RFC 3279, the ASN.1 encoding SHALL (id-dsa-with-sha1) or MUST (ecdsa-with-SHA*) omit the parameters field.
         // The parameters field SHALL be NULL for RSA based signature algorithms.
@@ -110,8 +120,10 @@ public class DefaultSignatureAlgorithmIdentifierFinder
         //
         // RFC 4491
         //
-        noParams.add(CryptoProObjectIdentifiers.gostR3411_94_with_gostR3410_94);
-        noParams.add(CryptoProObjectIdentifiers.gostR3411_94_with_gostR3410_2001);
+        // BEGIN android-removed
+        // noParams.add(CryptoProObjectIdentifiers.gostR3411_94_with_gostR3410_94);
+        // noParams.add(CryptoProObjectIdentifiers.gostR3411_94_with_gostR3410_2001);
+        // END android-removed
 
         //
         // PKCS 1.5 encrypted  algorithms
@@ -121,9 +133,11 @@ public class DefaultSignatureAlgorithmIdentifierFinder
         pkcs15RsaEncryption.add(PKCSObjectIdentifiers.sha256WithRSAEncryption);
         pkcs15RsaEncryption.add(PKCSObjectIdentifiers.sha384WithRSAEncryption);
         pkcs15RsaEncryption.add(PKCSObjectIdentifiers.sha512WithRSAEncryption);
-        pkcs15RsaEncryption.add(TeleTrusTObjectIdentifiers.rsaSignatureWithripemd128);
-        pkcs15RsaEncryption.add(TeleTrusTObjectIdentifiers.rsaSignatureWithripemd160);
-        pkcs15RsaEncryption.add(TeleTrusTObjectIdentifiers.rsaSignatureWithripemd256);
+        // BEGIN android-removed
+        // pkcs15RsaEncryption.add(TeleTrusTObjectIdentifiers.rsaSignatureWithripemd128);
+        // pkcs15RsaEncryption.add(TeleTrusTObjectIdentifiers.rsaSignatureWithripemd160);
+        // pkcs15RsaEncryption.add(TeleTrusTObjectIdentifiers.rsaSignatureWithripemd256);
+        // END android-removed
 
         //
         // explicit params
@@ -150,15 +164,19 @@ public class DefaultSignatureAlgorithmIdentifierFinder
         digestOids.put(PKCSObjectIdentifiers.sha256WithRSAEncryption, NISTObjectIdentifiers.id_sha256);
         digestOids.put(PKCSObjectIdentifiers.sha384WithRSAEncryption, NISTObjectIdentifiers.id_sha384);
         digestOids.put(PKCSObjectIdentifiers.sha512WithRSAEncryption, NISTObjectIdentifiers.id_sha512);
-        digestOids.put(PKCSObjectIdentifiers.md2WithRSAEncryption, PKCSObjectIdentifiers.md2);
-        digestOids.put(PKCSObjectIdentifiers.md4WithRSAEncryption, PKCSObjectIdentifiers.md4);
+        // BEGIN android-removed
+        // digestOids.put(PKCSObjectIdentifiers.md2WithRSAEncryption, PKCSObjectIdentifiers.md2);
+        // digestOids.put(PKCSObjectIdentifiers.md4WithRSAEncryption, PKCSObjectIdentifiers.md4);
+        // END android-removed
         digestOids.put(PKCSObjectIdentifiers.md5WithRSAEncryption, PKCSObjectIdentifiers.md5);
         digestOids.put(PKCSObjectIdentifiers.sha1WithRSAEncryption, OIWObjectIdentifiers.idSHA1);
-        digestOids.put(TeleTrusTObjectIdentifiers.rsaSignatureWithripemd128, TeleTrusTObjectIdentifiers.ripemd128);
-        digestOids.put(TeleTrusTObjectIdentifiers.rsaSignatureWithripemd160, TeleTrusTObjectIdentifiers.ripemd160);
-        digestOids.put(TeleTrusTObjectIdentifiers.rsaSignatureWithripemd256, TeleTrusTObjectIdentifiers.ripemd256);
-        digestOids.put(CryptoProObjectIdentifiers.gostR3411_94_with_gostR3410_94, CryptoProObjectIdentifiers.gostR3411);
-        digestOids.put(CryptoProObjectIdentifiers.gostR3411_94_with_gostR3410_2001, CryptoProObjectIdentifiers.gostR3411);
+        // BEGIN android-removed
+        // digestOids.put(TeleTrusTObjectIdentifiers.rsaSignatureWithripemd128, TeleTrusTObjectIdentifiers.ripemd128);
+        // digestOids.put(TeleTrusTObjectIdentifiers.rsaSignatureWithripemd160, TeleTrusTObjectIdentifiers.ripemd160);
+        // digestOids.put(TeleTrusTObjectIdentifiers.rsaSignatureWithripemd256, TeleTrusTObjectIdentifiers.ripemd256);
+        // digestOids.put(CryptoProObjectIdentifiers.gostR3411_94_with_gostR3410_94, CryptoProObjectIdentifiers.gostR3411);
+        // digestOids.put(CryptoProObjectIdentifiers.gostR3411_94_with_gostR3410_2001, CryptoProObjectIdentifiers.gostR3411);
+        // END android-removed
     }
 
     private static AlgorithmIdentifier generate(String signatureAlgorithm)
@@ -221,4 +239,4 @@ public class DefaultSignatureAlgorithmIdentifierFinder
     {
         return generate(sigAlgName);
     }
-}
\ No newline at end of file
+}
diff --git a/bcpkix/src/main/java/org/bouncycastle/operator/InputDecryptorProvider.java b/bcpkix/src/main/java/org/bouncycastle/operator/InputDecryptorProvider.java
deleted file mode 100644
index d50e6a7..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/operator/InputDecryptorProvider.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package org.bouncycastle.operator;
-
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-
-public interface InputDecryptorProvider
-{
-    public InputDecryptor get(AlgorithmIdentifier algorithm)
-        throws OperatorCreationException;
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/operator/InputExpander.java b/bcpkix/src/main/java/org/bouncycastle/operator/InputExpander.java
deleted file mode 100644
index 4767aed..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/operator/InputExpander.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package org.bouncycastle.operator;
-
-import java.io.InputStream;
-
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-
-/**
- * General interface for an operator that is able to produce
- * an InputStream that will produce uncompressed data.
- */
-public interface InputExpander
-{
-    /**
-     * Return the algorithm identifier describing the compression
-     * algorithm and parameters this expander supports.
-     *
-     * @return algorithm oid and parameters.
-     */
-    AlgorithmIdentifier getAlgorithmIdentifier();
-
-    /**
-     * Wrap the passed in input stream comIn, returning an input stream
-     * that expands anything read in from comIn.
-     *
-     * @param comIn the compressed input data stream..
-     * @return an expanding InputStream.
-     */
-    InputStream getInputStream(InputStream comIn);
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/operator/InputExpanderProvider.java b/bcpkix/src/main/java/org/bouncycastle/operator/InputExpanderProvider.java
deleted file mode 100644
index f560e04..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/operator/InputExpanderProvider.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package org.bouncycastle.operator;
-
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-
-public interface InputExpanderProvider
-{
-    InputExpander get(AlgorithmIdentifier algorithm);
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/operator/KeyUnwrapper.java b/bcpkix/src/main/java/org/bouncycastle/operator/KeyUnwrapper.java
deleted file mode 100644
index e34f670..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/operator/KeyUnwrapper.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package org.bouncycastle.operator;
-
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-
-public interface KeyUnwrapper
-{
-    AlgorithmIdentifier getAlgorithmIdentifier();
-
-    GenericKey generateUnwrappedKey(AlgorithmIdentifier encryptionKeyAlgorithm, byte[] encryptedKey)
-        throws OperatorException;
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/operator/KeyWrapper.java b/bcpkix/src/main/java/org/bouncycastle/operator/KeyWrapper.java
deleted file mode 100644
index 29b76a8..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/operator/KeyWrapper.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package org.bouncycastle.operator;
-
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-
-public interface KeyWrapper
-{
-    AlgorithmIdentifier getAlgorithmIdentifier();
-
-    byte[] generateWrappedKey(GenericKey encryptionKey)
-        throws OperatorException;
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/operator/MacCalculatorProvider.java b/bcpkix/src/main/java/org/bouncycastle/operator/MacCalculatorProvider.java
deleted file mode 100644
index 5f50744..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/operator/MacCalculatorProvider.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package org.bouncycastle.operator;
-
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-
-public interface MacCalculatorProvider
-{
-    public MacCalculator get(AlgorithmIdentifier algorithm);
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/operator/OutputCompressor.java b/bcpkix/src/main/java/org/bouncycastle/operator/OutputCompressor.java
deleted file mode 100644
index 054966e..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/operator/OutputCompressor.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package org.bouncycastle.operator;
-
-import java.io.OutputStream;
-
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-
-/**
- * General interface for an operator that is able to produce
- * an OutputStream that will output compressed data.
- */
-public interface OutputCompressor
-{
-    /**
-     * Return the algorithm identifier describing the compression
-     * algorithm and parameters this compressor uses.
-     *
-     * @return algorithm oid and parameters.
-     */
-    AlgorithmIdentifier getAlgorithmIdentifier();
-
-    /**
-     * Wrap the passed in output stream comOut, returning an output stream
-     * that compresses anything passed in before sending on to comOut.
-     *
-     * @param comOut output stream for compressed output.
-     * @return a compressing OutputStream
-     */
-    OutputStream getOutputStream(OutputStream comOut);
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/operator/OutputEncryptor.java b/bcpkix/src/main/java/org/bouncycastle/operator/OutputEncryptor.java
deleted file mode 100644
index 383e1fd..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/operator/OutputEncryptor.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package org.bouncycastle.operator;
-
-import java.io.OutputStream;
-
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-
-/**
- * General interface for an operator that is able to produce
- * an OutputStream that will output encrypted data.
- */
-public interface OutputEncryptor
-{
-    /**
-     * Return the algorithm identifier describing the encryption
-     * algorithm and parameters this encryptor uses.
-     *
-     * @return algorithm oid and parameters.
-     */
-    AlgorithmIdentifier getAlgorithmIdentifier();
-
-    /**
-     * Wrap the passed in output stream encOut, returning an output stream
-     * that encrypts anything passed in before sending on to encOut.
-     *
-     * @param encOut output stream for encrypted output.
-     * @return an encrypting OutputStream
-     */
-    OutputStream getOutputStream(OutputStream encOut);
-
-    /**
-     * Return the key used for encrypting the output.
-     *
-     * @return the encryption key.
-     */
-    GenericKey getKey();
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/operator/SecretKeySizeProvider.java b/bcpkix/src/main/java/org/bouncycastle/operator/SecretKeySizeProvider.java
deleted file mode 100644
index 5f92ef0..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/operator/SecretKeySizeProvider.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.bouncycastle.operator;
-
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-
-public interface SecretKeySizeProvider
-{
-    int getKeySize(AlgorithmIdentifier algorithmIdentifier);
-
-    /**
-     * Return the key size implied by the OID, if one exists.
-     *
-     * @param algorithm the OID of the algorithm of interest.
-     * @return -1 if there is no fixed key size associated with the OID, or more information is required.
-     */
-    int getKeySize(ASN1ObjectIdentifier algorithm);
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/operator/SymmetricKeyUnwrapper.java b/bcpkix/src/main/java/org/bouncycastle/operator/SymmetricKeyUnwrapper.java
deleted file mode 100644
index 7c72455..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/operator/SymmetricKeyUnwrapper.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package org.bouncycastle.operator;
-
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-
-public abstract class SymmetricKeyUnwrapper
-    implements KeyUnwrapper
-{
-    private AlgorithmIdentifier algorithmId;
-
-    protected SymmetricKeyUnwrapper(AlgorithmIdentifier algorithmId)
-    {
-        this.algorithmId = algorithmId;
-    }
-
-    public AlgorithmIdentifier getAlgorithmIdentifier()
-    {
-        return algorithmId;
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/operator/SymmetricKeyWrapper.java b/bcpkix/src/main/java/org/bouncycastle/operator/SymmetricKeyWrapper.java
deleted file mode 100644
index b1864d2..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/operator/SymmetricKeyWrapper.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package org.bouncycastle.operator;
-
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-
-public abstract class SymmetricKeyWrapper
-    implements KeyWrapper
-{
-    private AlgorithmIdentifier algorithmId;
-
-    protected SymmetricKeyWrapper(AlgorithmIdentifier algorithmId)
-    {
-        this.algorithmId = algorithmId;
-    }
-
-    public AlgorithmIdentifier getAlgorithmIdentifier()
-    {
-        return algorithmId;
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/operator/bc/AESUtil.java b/bcpkix/src/main/java/org/bouncycastle/operator/bc/AESUtil.java
deleted file mode 100644
index 83fab44..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/operator/bc/AESUtil.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package org.bouncycastle.operator.bc;
-
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.nist.NISTObjectIdentifiers;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.crypto.params.KeyParameter;
-
-class AESUtil
-{
-    static AlgorithmIdentifier determineKeyEncAlg(KeyParameter key)
-    {
-        int length = key.getKey().length * 8;
-        ASN1ObjectIdentifier wrapOid;
-
-        if (length == 128)
-        {
-            wrapOid = NISTObjectIdentifiers.id_aes128_wrap;
-        }
-        else if (length == 192)
-        {
-            wrapOid = NISTObjectIdentifiers.id_aes192_wrap;
-        }
-        else if (length == 256)
-        {
-            wrapOid = NISTObjectIdentifiers.id_aes256_wrap;
-        }
-        else
-        {
-            throw new IllegalArgumentException("illegal keysize in AES");
-        }
-
-        return new AlgorithmIdentifier(wrapOid); // parameters absent
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/operator/bc/BcAESSymmetricKeyUnwrapper.java b/bcpkix/src/main/java/org/bouncycastle/operator/bc/BcAESSymmetricKeyUnwrapper.java
deleted file mode 100644
index 024bbd6..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/operator/bc/BcAESSymmetricKeyUnwrapper.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package org.bouncycastle.operator.bc;
-
-import org.bouncycastle.crypto.engines.AESWrapEngine;
-import org.bouncycastle.crypto.params.KeyParameter;
-
-public class BcAESSymmetricKeyUnwrapper
-    extends BcSymmetricKeyUnwrapper
-{
-    public BcAESSymmetricKeyUnwrapper(KeyParameter wrappingKey)
-    {
-        super(AESUtil.determineKeyEncAlg(wrappingKey), new AESWrapEngine(), wrappingKey);
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/operator/bc/BcAESSymmetricKeyWrapper.java b/bcpkix/src/main/java/org/bouncycastle/operator/bc/BcAESSymmetricKeyWrapper.java
deleted file mode 100644
index 0da561b..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/operator/bc/BcAESSymmetricKeyWrapper.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package org.bouncycastle.operator.bc;
-
-import org.bouncycastle.crypto.engines.AESWrapEngine;
-import org.bouncycastle.crypto.params.KeyParameter;
-
-public class BcAESSymmetricKeyWrapper
-    extends BcSymmetricKeyWrapper
-{
-    public BcAESSymmetricKeyWrapper(KeyParameter wrappingKey)
-    {
-        super(AESUtil.determineKeyEncAlg(wrappingKey), new AESWrapEngine(), wrappingKey);
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/operator/bc/BcAsymmetricKeyUnwrapper.java b/bcpkix/src/main/java/org/bouncycastle/operator/bc/BcAsymmetricKeyUnwrapper.java
deleted file mode 100644
index 2bf5c2d..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/operator/bc/BcAsymmetricKeyUnwrapper.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package org.bouncycastle.operator.bc;
-
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.crypto.AsymmetricBlockCipher;
-import org.bouncycastle.crypto.InvalidCipherTextException;
-import org.bouncycastle.crypto.params.AsymmetricKeyParameter;
-import org.bouncycastle.operator.AsymmetricKeyUnwrapper;
-import org.bouncycastle.operator.GenericKey;
-import org.bouncycastle.operator.OperatorException;
-
-public abstract class BcAsymmetricKeyUnwrapper
-    extends AsymmetricKeyUnwrapper
-{
-    private AsymmetricKeyParameter privateKey;
-
-    public BcAsymmetricKeyUnwrapper(AlgorithmIdentifier encAlgId, AsymmetricKeyParameter privateKey)
-    {
-        super(encAlgId);
-
-        this.privateKey = privateKey;
-    }
-
-    public GenericKey generateUnwrappedKey(AlgorithmIdentifier encryptedKeyAlgorithm, byte[] encryptedKey)
-        throws OperatorException
-    {
-        AsymmetricBlockCipher keyCipher = createAsymmetricUnwrapper(this.getAlgorithmIdentifier().getAlgorithm());
-
-        keyCipher.init(false, privateKey);
-        try
-        {
-            byte[] key = keyCipher.processBlock(encryptedKey, 0, encryptedKey.length);
-
-            if (encryptedKeyAlgorithm.getAlgorithm().equals(PKCSObjectIdentifiers.des_EDE3_CBC))
-            {
-                return new GenericKey(encryptedKeyAlgorithm, key);
-            }
-            else
-            {
-                return new GenericKey(encryptedKeyAlgorithm, key);
-            }
-        }
-        catch (InvalidCipherTextException e)
-        {
-            throw new OperatorException("unable to recover secret key: " + e.getMessage(), e);
-        }
-    }
-
-    protected abstract AsymmetricBlockCipher createAsymmetricUnwrapper(ASN1ObjectIdentifier algorithm);
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/operator/bc/BcAsymmetricKeyWrapper.java b/bcpkix/src/main/java/org/bouncycastle/operator/bc/BcAsymmetricKeyWrapper.java
deleted file mode 100644
index f9c7808..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/operator/bc/BcAsymmetricKeyWrapper.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package org.bouncycastle.operator.bc;
-
-import java.security.SecureRandom;
-
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.crypto.AsymmetricBlockCipher;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.InvalidCipherTextException;
-import org.bouncycastle.crypto.params.AsymmetricKeyParameter;
-import org.bouncycastle.crypto.params.ParametersWithRandom;
-import org.bouncycastle.operator.AsymmetricKeyWrapper;
-import org.bouncycastle.operator.GenericKey;
-import org.bouncycastle.operator.OperatorException;
-
-public abstract class BcAsymmetricKeyWrapper
-    extends AsymmetricKeyWrapper
-{
-    private AsymmetricKeyParameter publicKey;
-    private SecureRandom random;
-
-    public BcAsymmetricKeyWrapper(AlgorithmIdentifier encAlgId, AsymmetricKeyParameter publicKey)
-    {
-        super(encAlgId);
-
-        this.publicKey = publicKey;
-    }
-
-    public BcAsymmetricKeyWrapper setSecureRandom(SecureRandom random)
-    {
-        this.random = random;
-
-        return this;
-    }
-
-    public byte[] generateWrappedKey(GenericKey encryptionKey)
-        throws OperatorException
-    {
-        AsymmetricBlockCipher keyEncryptionCipher = createAsymmetricWrapper(getAlgorithmIdentifier().getAlgorithm());
-        
-        CipherParameters params = publicKey;
-        if (random != null)
-        {
-            params = new ParametersWithRandom(params, random);
-        }
-
-        try
-        {
-            byte[] keyEnc = OperatorUtils.getKeyBytes(encryptionKey);
-            keyEncryptionCipher.init(true, publicKey);
-            return keyEncryptionCipher.processBlock(keyEnc, 0, keyEnc.length);
-        }
-        catch (InvalidCipherTextException e)
-        {
-            throw new OperatorException("unable to encrypt contents key", e);
-        }
-    }
-
-    protected abstract AsymmetricBlockCipher createAsymmetricWrapper(ASN1ObjectIdentifier algorithm);
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/operator/bc/BcContentSignerBuilder.java b/bcpkix/src/main/java/org/bouncycastle/operator/bc/BcContentSignerBuilder.java
deleted file mode 100644
index a7b45fc..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/operator/bc/BcContentSignerBuilder.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package org.bouncycastle.operator.bc;
-
-import java.io.OutputStream;
-import java.security.SecureRandom;
-import java.util.Map;
-
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.crypto.CryptoException;
-import org.bouncycastle.crypto.Signer;
-import org.bouncycastle.crypto.params.AsymmetricKeyParameter;
-import org.bouncycastle.crypto.params.ParametersWithRandom;
-import org.bouncycastle.operator.ContentSigner;
-import org.bouncycastle.operator.OperatorCreationException;
-import org.bouncycastle.operator.RuntimeOperatorException;
-
-public abstract class BcContentSignerBuilder
-{
-    private SecureRandom random;
-    private AlgorithmIdentifier sigAlgId;
-    private AlgorithmIdentifier digAlgId;
-
-    protected BcDigestProvider                digestProvider;
-
-    public BcContentSignerBuilder(AlgorithmIdentifier sigAlgId, AlgorithmIdentifier digAlgId)
-    {
-        this.sigAlgId = sigAlgId;
-        this.digAlgId = digAlgId;
-        this.digestProvider = BcDefaultDigestProvider.INSTANCE;
-    }
-
-    public BcContentSignerBuilder setSecureRandom(SecureRandom random)
-    {
-        this.random = random;
-
-        return this;
-    }
-
-    public ContentSigner build(AsymmetricKeyParameter privateKey)
-        throws OperatorCreationException
-    {
-        final Signer sig = createSigner(sigAlgId, digAlgId);
-
-        if (random != null)
-        {
-            sig.init(true, new ParametersWithRandom(privateKey, random));
-        }
-        else
-        {
-            sig.init(true, privateKey);
-        }
-
-        return new ContentSigner()
-        {
-            private BcSignerOutputStream stream = new BcSignerOutputStream(sig);
-
-            public AlgorithmIdentifier getAlgorithmIdentifier()
-            {
-                return sigAlgId;
-            }
-
-            public OutputStream getOutputStream()
-            {
-                return stream;
-            }
-
-            public byte[] getSignature()
-            {
-                try
-                {
-                    return stream.getSignature();
-                }
-                catch (CryptoException e)
-                {
-                    throw new RuntimeOperatorException("exception obtaining signature: " + e.getMessage(), e);
-                }
-            }
-        };
-    }
-
-    protected abstract Signer createSigner(AlgorithmIdentifier sigAlgId, AlgorithmIdentifier algorithmIdentifier)
-        throws OperatorCreationException;
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/operator/bc/BcContentVerifierProviderBuilder.java b/bcpkix/src/main/java/org/bouncycastle/operator/bc/BcContentVerifierProviderBuilder.java
deleted file mode 100644
index ff57e60..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/operator/bc/BcContentVerifierProviderBuilder.java
+++ /dev/null
@@ -1,144 +0,0 @@
-package org.bouncycastle.operator.bc;
-
-import java.io.IOException;
-import java.io.OutputStream;
-
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.bouncycastle.cert.X509CertificateHolder;
-import org.bouncycastle.crypto.Signer;
-import org.bouncycastle.crypto.params.AsymmetricKeyParameter;
-import org.bouncycastle.operator.ContentVerifier;
-import org.bouncycastle.operator.ContentVerifierProvider;
-import org.bouncycastle.operator.OperatorCreationException;
-
-public abstract class BcContentVerifierProviderBuilder
-{
-    protected BcDigestProvider digestProvider;
-
-    public BcContentVerifierProviderBuilder()
-    {
-        this.digestProvider = BcDefaultDigestProvider.INSTANCE;
-    }
-
-    public ContentVerifierProvider build(final X509CertificateHolder certHolder)
-        throws OperatorCreationException
-    {
-        return new ContentVerifierProvider()
-        {
-            public boolean hasAssociatedCertificate()
-            {
-                return true;
-            }
-
-            public X509CertificateHolder getAssociatedCertificate()
-            {
-                return certHolder;
-            }
-
-            public ContentVerifier get(AlgorithmIdentifier algorithm)
-                throws OperatorCreationException
-            {
-                try
-                {
-                    AsymmetricKeyParameter publicKey = extractKeyParameters(certHolder.getSubjectPublicKeyInfo());
-                    BcSignerOutputStream stream = createSignatureStream(algorithm, publicKey);
-
-                    return new SigVerifier(algorithm, stream);
-                }
-                catch (IOException e)
-                {
-                    throw new OperatorCreationException("exception on setup: " + e, e);
-                }
-            }
-        };
-    }
-
-    public ContentVerifierProvider build(final AsymmetricKeyParameter publicKey)
-        throws OperatorCreationException
-    {
-        return new ContentVerifierProvider()
-        {
-            public boolean hasAssociatedCertificate()
-            {
-                return false;
-            }
-
-            public X509CertificateHolder getAssociatedCertificate()
-            {
-                return null;
-            }
-
-            public ContentVerifier get(AlgorithmIdentifier algorithm)
-                throws OperatorCreationException
-            {
-                BcSignerOutputStream stream = createSignatureStream(algorithm, publicKey);
-
-                return new SigVerifier(algorithm, stream);
-            }
-        };
-    }
-
-    private BcSignerOutputStream createSignatureStream(AlgorithmIdentifier algorithm, AsymmetricKeyParameter publicKey)
-        throws OperatorCreationException
-    {
-        Signer sig = createSigner(algorithm);
-
-        sig.init(false, publicKey);
-
-        return new BcSignerOutputStream(sig);
-    }
-
-    /**
-     * Extract an AsymmetricKeyParameter from the passed in SubjectPublicKeyInfo structure.
-     *
-     * @param publicKeyInfo a publicKeyInfo structure describing the public key required.
-     * @return an AsymmetricKeyParameter object containing the appropriate public key.
-     * @throws IOException if the publicKeyInfo data cannot be parsed,
-     */
-    protected abstract AsymmetricKeyParameter extractKeyParameters(SubjectPublicKeyInfo publicKeyInfo)
-        throws IOException;
-
-    /**
-     * Create the correct signer for the algorithm identifier sigAlgId.
-     *
-     * @param sigAlgId the algorithm details for the signature we want to verify.
-     * @return a Signer object.
-     * @throws OperatorCreationException if the Signer cannot be constructed.
-     */
-    protected abstract Signer createSigner(AlgorithmIdentifier sigAlgId)
-        throws OperatorCreationException;
-
-    private class SigVerifier
-        implements ContentVerifier
-    {
-        private BcSignerOutputStream stream;
-        private AlgorithmIdentifier algorithm;
-
-        SigVerifier(AlgorithmIdentifier algorithm, BcSignerOutputStream stream)
-        {
-            this.algorithm = algorithm;
-            this.stream = stream;
-        }
-
-        public AlgorithmIdentifier getAlgorithmIdentifier()
-        {
-            return algorithm;
-        }
-
-        public OutputStream getOutputStream()
-        {
-            if (stream == null)
-            {
-                throw new IllegalStateException("verifier not initialised");
-            }
-
-            return stream;
-        }
-
-        public boolean verify(byte[] expected)
-        {
-            return stream.verify(expected);
-        }
-    }
-}
\ No newline at end of file
diff --git a/bcpkix/src/main/java/org/bouncycastle/operator/bc/BcDSAContentSignerBuilder.java b/bcpkix/src/main/java/org/bouncycastle/operator/bc/BcDSAContentSignerBuilder.java
deleted file mode 100644
index 893f9fd..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/operator/bc/BcDSAContentSignerBuilder.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package org.bouncycastle.operator.bc;
-
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.Signer;
-import org.bouncycastle.crypto.signers.DSADigestSigner;
-import org.bouncycastle.crypto.signers.DSASigner;
-import org.bouncycastle.operator.OperatorCreationException;
-
-public class BcDSAContentSignerBuilder
-    extends BcContentSignerBuilder
-{
-    public BcDSAContentSignerBuilder(AlgorithmIdentifier sigAlgId, AlgorithmIdentifier digAlgId)
-    {
-        super(sigAlgId, digAlgId);
-    }
-
-    protected Signer createSigner(AlgorithmIdentifier sigAlgId, AlgorithmIdentifier digAlgId)
-        throws OperatorCreationException
-    {
-        Digest dig = digestProvider.get(digAlgId);
-
-        return new DSADigestSigner(new DSASigner(), dig);
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/operator/bc/BcDSAContentVerifierProviderBuilder.java b/bcpkix/src/main/java/org/bouncycastle/operator/bc/BcDSAContentVerifierProviderBuilder.java
deleted file mode 100644
index 15bb301..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/operator/bc/BcDSAContentVerifierProviderBuilder.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package org.bouncycastle.operator.bc;
-
-import java.io.IOException;
-
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.Signer;
-import org.bouncycastle.crypto.params.AsymmetricKeyParameter;
-import org.bouncycastle.crypto.signers.DSADigestSigner;
-import org.bouncycastle.crypto.signers.DSASigner;
-import org.bouncycastle.crypto.util.PublicKeyFactory;
-import org.bouncycastle.operator.DigestAlgorithmIdentifierFinder;
-import org.bouncycastle.operator.OperatorCreationException;
-
-public class BcDSAContentVerifierProviderBuilder
-    extends BcContentVerifierProviderBuilder
-{
-    private DigestAlgorithmIdentifierFinder digestAlgorithmFinder;
-
-    public BcDSAContentVerifierProviderBuilder(DigestAlgorithmIdentifierFinder digestAlgorithmFinder)
-    {
-        this.digestAlgorithmFinder = digestAlgorithmFinder;
-    }
-
-    protected Signer createSigner(AlgorithmIdentifier sigAlgId)
-        throws OperatorCreationException
-    {
-        AlgorithmIdentifier digAlg = digestAlgorithmFinder.find(sigAlgId);
-        Digest dig = digestProvider.get(digAlg);
-
-        return new DSADigestSigner(new DSASigner(), dig);
-    }
-
-    protected AsymmetricKeyParameter extractKeyParameters(SubjectPublicKeyInfo publicKeyInfo)
-        throws IOException
-    {
-        return PublicKeyFactory.createKey(publicKeyInfo);
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/operator/bc/BcDefaultDigestProvider.java b/bcpkix/src/main/java/org/bouncycastle/operator/bc/BcDefaultDigestProvider.java
index 655b695..805dc47 100644
--- a/bcpkix/src/main/java/org/bouncycastle/operator/bc/BcDefaultDigestProvider.java
+++ b/bcpkix/src/main/java/org/bouncycastle/operator/bc/BcDefaultDigestProvider.java
@@ -4,20 +4,26 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.bouncycastle.asn1.cryptopro.CryptoProObjectIdentifiers;
+// BEGIN android-removed
+// import org.bouncycastle.asn1.cryptopro.CryptoProObjectIdentifiers;
+// END android-removed
 import org.bouncycastle.asn1.nist.NISTObjectIdentifiers;
 import org.bouncycastle.asn1.oiw.OIWObjectIdentifiers;
 import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
 import org.bouncycastle.asn1.teletrust.TeleTrusTObjectIdentifiers;
 import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
 import org.bouncycastle.crypto.ExtendedDigest;
-import org.bouncycastle.crypto.digests.GOST3411Digest;
-import org.bouncycastle.crypto.digests.MD2Digest;
-import org.bouncycastle.crypto.digests.MD4Digest;
+// BEGIN android-removed
+// import org.bouncycastle.crypto.digests.GOST3411Digest;
+// import org.bouncycastle.crypto.digests.MD2Digest;
+// import org.bouncycastle.crypto.digests.MD4Digest;
+// END android-removed
 import org.bouncycastle.crypto.digests.MD5Digest;
-import org.bouncycastle.crypto.digests.RIPEMD128Digest;
-import org.bouncycastle.crypto.digests.RIPEMD160Digest;
-import org.bouncycastle.crypto.digests.RIPEMD256Digest;
+// BEGIN android-removed
+// import org.bouncycastle.crypto.digests.RIPEMD128Digest;
+// import org.bouncycastle.crypto.digests.RIPEMD160Digest;
+// import org.bouncycastle.crypto.digests.RIPEMD256Digest;
+// END android-removed
 import org.bouncycastle.crypto.digests.SHA1Digest;
 import org.bouncycastle.crypto.digests.SHA224Digest;
 import org.bouncycastle.crypto.digests.SHA256Digest;
@@ -76,48 +82,50 @@ public class BcDefaultDigestProvider
                 return new MD5Digest();
             }
         });
-        table.put(PKCSObjectIdentifiers.md4, new BcDigestProvider()
-        {
-            public ExtendedDigest get(AlgorithmIdentifier digestAlgorithmIdentifier)
-            {
-                return new MD4Digest();
-            }
-        });
-        table.put(PKCSObjectIdentifiers.md2, new BcDigestProvider()
-        {
-            public ExtendedDigest get(AlgorithmIdentifier digestAlgorithmIdentifier)
-            {
-                return new MD2Digest();
-            }
-        });
-        table.put(CryptoProObjectIdentifiers.gostR3411, new BcDigestProvider()
-        {
-            public ExtendedDigest get(AlgorithmIdentifier digestAlgorithmIdentifier)
-            {
-                return new GOST3411Digest();
-            }
-        });
-        table.put(TeleTrusTObjectIdentifiers.ripemd128, new BcDigestProvider()
-        {
-            public ExtendedDigest get(AlgorithmIdentifier digestAlgorithmIdentifier)
-            {
-                return new RIPEMD128Digest();
-            }
-        });
-        table.put(TeleTrusTObjectIdentifiers.ripemd160, new BcDigestProvider()
-        {
-            public ExtendedDigest get(AlgorithmIdentifier digestAlgorithmIdentifier)
-            {
-                return new RIPEMD160Digest();
-            }
-        });
-        table.put(TeleTrusTObjectIdentifiers.ripemd256, new BcDigestProvider()
-        {
-            public ExtendedDigest get(AlgorithmIdentifier digestAlgorithmIdentifier)
-            {
-                return new RIPEMD256Digest();
-            }
-        });
+        // BEGIN android-removed
+        // table.put(PKCSObjectIdentifiers.md4, new BcDigestProvider()
+        // {
+        //     public ExtendedDigest get(AlgorithmIdentifier digestAlgorithmIdentifier)
+        //     {
+        //         return new MD4Digest();
+        //     }
+        // });
+        // table.put(PKCSObjectIdentifiers.md2, new BcDigestProvider()
+        // {
+        //     public ExtendedDigest get(AlgorithmIdentifier digestAlgorithmIdentifier)
+        //     {
+        //         return new MD2Digest();
+        //     }
+        // });
+        // table.put(CryptoProObjectIdentifiers.gostR3411, new BcDigestProvider()
+        // {
+        //     public ExtendedDigest get(AlgorithmIdentifier digestAlgorithmIdentifier)
+        //     {
+        //         return new GOST3411Digest();
+        //     }
+        // });
+        // table.put(TeleTrusTObjectIdentifiers.ripemd128, new BcDigestProvider()
+        // {
+        //     public ExtendedDigest get(AlgorithmIdentifier digestAlgorithmIdentifier)
+        //     {
+        //         return new RIPEMD128Digest();
+        //     }
+        // });
+        // table.put(TeleTrusTObjectIdentifiers.ripemd160, new BcDigestProvider()
+        // {
+        //     public ExtendedDigest get(AlgorithmIdentifier digestAlgorithmIdentifier)
+        //     {
+        //         return new RIPEMD160Digest();
+        //     }
+        // });
+        // table.put(TeleTrusTObjectIdentifiers.ripemd256, new BcDigestProvider()
+        // {
+        //     public ExtendedDigest get(AlgorithmIdentifier digestAlgorithmIdentifier)
+        //     {
+        //         return new RIPEMD256Digest();
+        //     }
+        // });
+        // END android-removed
 
         return Collections.unmodifiableMap(table);
     }
diff --git a/bcpkix/src/main/java/org/bouncycastle/operator/bc/BcRSAAsymmetricKeyUnwrapper.java b/bcpkix/src/main/java/org/bouncycastle/operator/bc/BcRSAAsymmetricKeyUnwrapper.java
deleted file mode 100644
index 84eb29d..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/operator/bc/BcRSAAsymmetricKeyUnwrapper.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package org.bouncycastle.operator.bc;
-
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.crypto.AsymmetricBlockCipher;
-import org.bouncycastle.crypto.encodings.PKCS1Encoding;
-import org.bouncycastle.crypto.engines.RSAEngine;
-import org.bouncycastle.crypto.params.AsymmetricKeyParameter;
-
-public class BcRSAAsymmetricKeyUnwrapper
-    extends BcAsymmetricKeyUnwrapper
-{
-    public BcRSAAsymmetricKeyUnwrapper(AlgorithmIdentifier encAlgId, AsymmetricKeyParameter privateKey)
-    {
-        super(encAlgId, privateKey);
-    }
-
-    protected AsymmetricBlockCipher createAsymmetricUnwrapper(ASN1ObjectIdentifier algorithm)
-    {
-        return new PKCS1Encoding(new RSAEngine());
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/operator/bc/BcRSAAsymmetricKeyWrapper.java b/bcpkix/src/main/java/org/bouncycastle/operator/bc/BcRSAAsymmetricKeyWrapper.java
deleted file mode 100644
index 9375bd1..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/operator/bc/BcRSAAsymmetricKeyWrapper.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package org.bouncycastle.operator.bc;
-
-import java.io.IOException;
-
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.bouncycastle.crypto.AsymmetricBlockCipher;
-import org.bouncycastle.crypto.encodings.PKCS1Encoding;
-import org.bouncycastle.crypto.engines.RSAEngine;
-import org.bouncycastle.crypto.params.AsymmetricKeyParameter;
-import org.bouncycastle.crypto.util.PublicKeyFactory;
-
-public class BcRSAAsymmetricKeyWrapper
-    extends BcAsymmetricKeyWrapper
-{
-    public BcRSAAsymmetricKeyWrapper(AlgorithmIdentifier encAlgId, AsymmetricKeyParameter publicKey)
-    {
-        super(encAlgId, publicKey);
-    }
-
-    public BcRSAAsymmetricKeyWrapper(AlgorithmIdentifier encAlgId, SubjectPublicKeyInfo publicKeyInfo)
-        throws IOException
-    {
-        super(encAlgId, PublicKeyFactory.createKey(publicKeyInfo));
-    }
-
-    protected AsymmetricBlockCipher createAsymmetricWrapper(ASN1ObjectIdentifier algorithm)
-    {
-        return new PKCS1Encoding(new RSAEngine());
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/operator/bc/BcRSAContentSignerBuilder.java b/bcpkix/src/main/java/org/bouncycastle/operator/bc/BcRSAContentSignerBuilder.java
deleted file mode 100644
index db317de..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/operator/bc/BcRSAContentSignerBuilder.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.bouncycastle.operator.bc;
-
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.Signer;
-import org.bouncycastle.crypto.signers.RSADigestSigner;
-import org.bouncycastle.operator.OperatorCreationException;
-
-public class BcRSAContentSignerBuilder
-    extends BcContentSignerBuilder
-{
-    public BcRSAContentSignerBuilder(AlgorithmIdentifier sigAlgId, AlgorithmIdentifier digAlgId)
-    {
-        super(sigAlgId, digAlgId);
-    }
-
-    protected Signer createSigner(AlgorithmIdentifier sigAlgId, AlgorithmIdentifier digAlgId)
-        throws OperatorCreationException
-    {
-        Digest dig = digestProvider.get(digAlgId);
-
-        return new RSADigestSigner(dig);
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/operator/bc/BcRSAContentVerifierProviderBuilder.java b/bcpkix/src/main/java/org/bouncycastle/operator/bc/BcRSAContentVerifierProviderBuilder.java
deleted file mode 100644
index 7b2249c..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/operator/bc/BcRSAContentVerifierProviderBuilder.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package org.bouncycastle.operator.bc;
-
-import java.io.IOException;
-
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.Signer;
-import org.bouncycastle.crypto.params.AsymmetricKeyParameter;
-import org.bouncycastle.crypto.signers.RSADigestSigner;
-import org.bouncycastle.crypto.util.PublicKeyFactory;
-import org.bouncycastle.operator.DigestAlgorithmIdentifierFinder;
-import org.bouncycastle.operator.OperatorCreationException;
-
-public class BcRSAContentVerifierProviderBuilder
-    extends BcContentVerifierProviderBuilder
-{
-    private DigestAlgorithmIdentifierFinder digestAlgorithmFinder;
-
-    public BcRSAContentVerifierProviderBuilder(DigestAlgorithmIdentifierFinder digestAlgorithmFinder)
-    {
-        this.digestAlgorithmFinder = digestAlgorithmFinder;
-    }
-
-    protected Signer createSigner(AlgorithmIdentifier sigAlgId)
-        throws OperatorCreationException
-    {
-        AlgorithmIdentifier digAlg = digestAlgorithmFinder.find(sigAlgId);
-        Digest dig = digestProvider.get(digAlg);
-
-        return new RSADigestSigner(dig);
-    }
-
-    protected AsymmetricKeyParameter extractKeyParameters(SubjectPublicKeyInfo publicKeyInfo)
-        throws IOException
-    {
-        return PublicKeyFactory.createKey(publicKeyInfo);
-    }
-}
\ No newline at end of file
diff --git a/bcpkix/src/main/java/org/bouncycastle/operator/bc/BcSignerOutputStream.java b/bcpkix/src/main/java/org/bouncycastle/operator/bc/BcSignerOutputStream.java
deleted file mode 100644
index 0ef1656..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/operator/bc/BcSignerOutputStream.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package org.bouncycastle.operator.bc;
-
-import java.io.IOException;
-import java.io.OutputStream;
-
-import org.bouncycastle.crypto.CryptoException;
-import org.bouncycastle.crypto.Signer;
-
-public class BcSignerOutputStream
-    extends OutputStream
-{
-    private Signer sig;
-
-    BcSignerOutputStream(Signer sig)
-    {
-        this.sig = sig;
-    }
-
-    public void write(byte[] bytes, int off, int len)
-        throws IOException
-    {
-        sig.update(bytes, off, len);
-    }
-
-    public void write(byte[] bytes)
-        throws IOException
-    {
-        sig.update(bytes, 0, bytes.length);
-    }
-
-    public void write(int b)
-        throws IOException
-    {
-        sig.update((byte)b);
-    }
-
-    byte[] getSignature()
-        throws CryptoException
-    {
-        return sig.generateSignature();
-    }
-
-    boolean verify(byte[] expected)
-    {
-        return sig.verifySignature(expected);
-    }
-}
\ No newline at end of file
diff --git a/bcpkix/src/main/java/org/bouncycastle/operator/bc/BcSymmetricKeyUnwrapper.java b/bcpkix/src/main/java/org/bouncycastle/operator/bc/BcSymmetricKeyUnwrapper.java
deleted file mode 100644
index f8df3b6..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/operator/bc/BcSymmetricKeyUnwrapper.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package org.bouncycastle.operator.bc;
-
-import java.security.SecureRandom;
-
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.crypto.InvalidCipherTextException;
-import org.bouncycastle.crypto.Wrapper;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.operator.GenericKey;
-import org.bouncycastle.operator.OperatorException;
-import org.bouncycastle.operator.SymmetricKeyUnwrapper;
-
-public class BcSymmetricKeyUnwrapper
-    extends SymmetricKeyUnwrapper
-{
-    private SecureRandom random;
-    private Wrapper wrapper;
-    private KeyParameter wrappingKey;
-
-    public BcSymmetricKeyUnwrapper(AlgorithmIdentifier wrappingAlgorithm, Wrapper wrapper, KeyParameter wrappingKey)
-    {
-        super(wrappingAlgorithm);
-
-        this.wrapper = wrapper;
-        this.wrappingKey = wrappingKey;
-    }
-
-    public BcSymmetricKeyUnwrapper setSecureRandom(SecureRandom random)
-    {
-        this.random = random;
-
-        return this;
-    }
-
-    public GenericKey generateUnwrappedKey(AlgorithmIdentifier encryptedKeyAlgorithm, byte[] encryptedKey)
-        throws OperatorException
-    {
-        wrapper.init(false, wrappingKey);
-
-        try
-        {
-            return new GenericKey(encryptedKeyAlgorithm, wrapper.unwrap(encryptedKey, 0, encryptedKey.length));
-        }
-        catch (InvalidCipherTextException e)
-        {
-            throw new OperatorException("unable to unwrap key: " + e.getMessage(), e);
-        }
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/operator/bc/BcSymmetricKeyWrapper.java b/bcpkix/src/main/java/org/bouncycastle/operator/bc/BcSymmetricKeyWrapper.java
deleted file mode 100644
index b7f8950..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/operator/bc/BcSymmetricKeyWrapper.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package org.bouncycastle.operator.bc;
-
-import java.security.SecureRandom;
-
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.crypto.Wrapper;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.crypto.params.ParametersWithRandom;
-import org.bouncycastle.operator.GenericKey;
-import org.bouncycastle.operator.OperatorException;
-import org.bouncycastle.operator.SymmetricKeyWrapper;
-
-public class BcSymmetricKeyWrapper
-    extends SymmetricKeyWrapper
-{
-    private SecureRandom random;
-    private Wrapper wrapper;
-    private KeyParameter wrappingKey;
-
-    public BcSymmetricKeyWrapper(AlgorithmIdentifier wrappingAlgorithm, Wrapper wrapper, KeyParameter wrappingKey)
-    {
-        super(wrappingAlgorithm);
-
-        this.wrapper = wrapper;
-        this.wrappingKey = wrappingKey;
-    }
-
-    public BcSymmetricKeyWrapper setSecureRandom(SecureRandom random)
-    {
-        this.random = random;
-
-        return this;
-    }
-
-    public byte[] generateWrappedKey(GenericKey encryptionKey)
-        throws OperatorException
-    {
-        byte[] contentEncryptionKeySpec = OperatorUtils.getKeyBytes(encryptionKey);
-
-        if (random == null)
-        {
-            wrapper.init(true, wrappingKey);
-        }
-        else
-        {
-            wrapper.init(true, new ParametersWithRandom(wrappingKey, random));
-        }
-
-        return wrapper.wrap(contentEncryptionKeySpec, 0, contentEncryptionKeySpec.length);
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/operator/bc/CamelliaUtil.java b/bcpkix/src/main/java/org/bouncycastle/operator/bc/CamelliaUtil.java
deleted file mode 100644
index 819637d..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/operator/bc/CamelliaUtil.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package org.bouncycastle.operator.bc;
-
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ntt.NTTObjectIdentifiers;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.crypto.params.KeyParameter;
-
-class CamelliaUtil
-{
-    static AlgorithmIdentifier determineKeyEncAlg(KeyParameter key)
-    {
-        int length = key.getKey().length * 8;
-        ASN1ObjectIdentifier wrapOid;
-
-        if (length == 128)
-        {
-            wrapOid = NTTObjectIdentifiers.id_camellia128_wrap;
-        }
-        else if (length == 192)
-        {
-            wrapOid = NTTObjectIdentifiers.id_camellia192_wrap;
-        }
-        else if (length == 256)
-        {
-            wrapOid = NTTObjectIdentifiers.id_camellia256_wrap;
-        }
-        else
-        {
-            throw new IllegalArgumentException(
-                "illegal keysize in Camellia");
-        }
-
-        return new AlgorithmIdentifier(wrapOid); // parameters must be
-        // absent
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/operator/bc/OperatorUtils.java b/bcpkix/src/main/java/org/bouncycastle/operator/bc/OperatorUtils.java
deleted file mode 100644
index bc8e7f6..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/operator/bc/OperatorUtils.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package org.bouncycastle.operator.bc;
-
-import java.security.Key;
-
-import org.bouncycastle.operator.GenericKey;
-
-class OperatorUtils
-{
-    static byte[] getKeyBytes(GenericKey key)
-    {
-        if (key.getRepresentation() instanceof Key)
-        {
-            return ((Key)key.getRepresentation()).getEncoded();
-        }
-
-        if (key.getRepresentation() instanceof byte[])
-        {
-            return (byte[])key.getRepresentation();
-        }
-
-        throw new IllegalArgumentException("unknown generic key type");
-    }
-}
\ No newline at end of file
diff --git a/bcpkix/src/main/java/org/bouncycastle/operator/bc/SEEDUtil.java b/bcpkix/src/main/java/org/bouncycastle/operator/bc/SEEDUtil.java
deleted file mode 100644
index 3b1971c..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/operator/bc/SEEDUtil.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package org.bouncycastle.operator.bc;
-
-import org.bouncycastle.asn1.kisa.KISAObjectIdentifiers;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-
-class SEEDUtil
-{
-    static AlgorithmIdentifier determineKeyEncAlg()
-    {
-        // parameters absent
-        return new AlgorithmIdentifier(
-            KISAObjectIdentifiers.id_npki_app_cmsSeed_wrap);
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/operator/jcajce/JcaAlgorithmParametersConverter.java b/bcpkix/src/main/java/org/bouncycastle/operator/jcajce/JcaAlgorithmParametersConverter.java
deleted file mode 100644
index d4e2162..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/operator/jcajce/JcaAlgorithmParametersConverter.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package org.bouncycastle.operator.jcajce;
-
-
-import java.io.IOException;
-import java.security.AlgorithmParameters;
-import java.security.InvalidAlgorithmParameterException;
-import java.security.spec.AlgorithmParameterSpec;
-import java.security.spec.MGF1ParameterSpec;
-
-import javax.crypto.spec.OAEPParameterSpec;
-import javax.crypto.spec.PSource;
-
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.DEROctetString;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.asn1.pkcs.RSAESOAEPparams;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.operator.DefaultDigestAlgorithmIdentifierFinder;
-
-public class JcaAlgorithmParametersConverter
-{
-    public JcaAlgorithmParametersConverter()
-    {
-    }
-
-    public AlgorithmIdentifier getAlgorithmIdentifier(ASN1ObjectIdentifier algId, AlgorithmParameters parameters)
-        throws InvalidAlgorithmParameterException
-    {
-        try
-        {
-            ASN1Encodable params = ASN1Primitive.fromByteArray(parameters.getEncoded());
-
-            return new AlgorithmIdentifier(algId, params);
-        }
-        catch (IOException e)
-        {
-            throw new InvalidAlgorithmParameterException("unable to encode parameters object: " + e.getMessage());
-        }
-    }
-
-    public AlgorithmIdentifier getAlgorithmIdentifier(ASN1ObjectIdentifier algorithm, AlgorithmParameterSpec algorithmSpec)
-        throws InvalidAlgorithmParameterException
-    {
-        if (algorithmSpec instanceof OAEPParameterSpec)
-        {
-            if (algorithmSpec.equals(OAEPParameterSpec.DEFAULT))
-            {
-                return new AlgorithmIdentifier(algorithm,
-                    new RSAESOAEPparams(RSAESOAEPparams.DEFAULT_HASH_ALGORITHM, RSAESOAEPparams.DEFAULT_MASK_GEN_FUNCTION, RSAESOAEPparams.DEFAULT_P_SOURCE_ALGORITHM));
-            }
-            else
-            {
-                OAEPParameterSpec oaepSpec = (OAEPParameterSpec)algorithmSpec;
-                PSource pSource = oaepSpec.getPSource();
-
-                if (!oaepSpec.getMGFAlgorithm().equals(OAEPParameterSpec.DEFAULT.getMGFAlgorithm()))
-                {
-                    throw new InvalidAlgorithmParameterException("only " + OAEPParameterSpec.DEFAULT.getMGFAlgorithm() + " mask generator supported.");
-                }
-
-                AlgorithmIdentifier hashAlgorithm = new DefaultDigestAlgorithmIdentifierFinder().find(oaepSpec.getDigestAlgorithm());
-                AlgorithmIdentifier mgf1HashAlgorithm = new DefaultDigestAlgorithmIdentifierFinder().find((((MGF1ParameterSpec)oaepSpec.getMGFParameters()).getDigestAlgorithm()));
-                return new AlgorithmIdentifier(algorithm,
-                                    new RSAESOAEPparams(hashAlgorithm, new AlgorithmIdentifier(PKCSObjectIdentifiers.id_mgf1, mgf1HashAlgorithm),
-                                                        new AlgorithmIdentifier(PKCSObjectIdentifiers.id_pSpecified, new DEROctetString(((PSource.PSpecified)pSource).getValue()))));
-            }
-        }
-
-        throw new InvalidAlgorithmParameterException("unknown parameter spec passed.");
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/operator/jcajce/JceAsymmetricKeyUnwrapper.java b/bcpkix/src/main/java/org/bouncycastle/operator/jcajce/JceAsymmetricKeyUnwrapper.java
deleted file mode 100644
index 8e0ea75..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/operator/jcajce/JceAsymmetricKeyUnwrapper.java
+++ /dev/null
@@ -1,133 +0,0 @@
-package org.bouncycastle.operator.jcajce;
-
-import java.security.AlgorithmParameters;
-import java.security.GeneralSecurityException;
-import java.security.InvalidKeyException;
-import java.security.Key;
-import java.security.PrivateKey;
-import java.security.Provider;
-import java.security.ProviderException;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.crypto.BadPaddingException;
-import javax.crypto.Cipher;
-import javax.crypto.IllegalBlockSizeException;
-import javax.crypto.spec.SecretKeySpec;
-
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.jcajce.util.DefaultJcaJceHelper;
-import org.bouncycastle.jcajce.util.NamedJcaJceHelper;
-import org.bouncycastle.jcajce.util.ProviderJcaJceHelper;
-import org.bouncycastle.operator.AsymmetricKeyUnwrapper;
-import org.bouncycastle.operator.GenericKey;
-import org.bouncycastle.operator.OperatorException;
-
-public class JceAsymmetricKeyUnwrapper
-    extends AsymmetricKeyUnwrapper
-{
-    private OperatorHelper helper = new OperatorHelper(new DefaultJcaJceHelper());
-    private Map extraMappings = new HashMap();
-    private PrivateKey privKey;
-
-    public JceAsymmetricKeyUnwrapper(AlgorithmIdentifier algorithmIdentifier, PrivateKey privKey)
-    {
-        super(algorithmIdentifier);
-
-        this.privKey = privKey;
-    }
-
-    public JceAsymmetricKeyUnwrapper setProvider(Provider provider)
-    {
-        this.helper = new OperatorHelper(new ProviderJcaJceHelper(provider));
-
-        return this;
-    }
-
-    public JceAsymmetricKeyUnwrapper setProvider(String providerName)
-    {
-        this.helper = new OperatorHelper(new NamedJcaJceHelper(providerName));
-
-        return this;
-    }
-
-    /**
-     * Internally algorithm ids are converted into cipher names using a lookup table. For some providers
-     * the standard lookup table won't work. Use this method to establish a specific mapping from an
-     * algorithm identifier to a specific algorithm.
-     * <p>
-     *     For example:
-     * <pre>
-     *     unwrapper.setAlgorithmMapping(PKCSObjectIdentifiers.rsaEncryption, "RSA");
-     * </pre>
-     * </p>
-     * @param algorithm  OID of algorithm in recipient.
-     * @param algorithmName JCE algorithm name to use.
-     * @return  the current Unwrapper.
-     */
-    public JceAsymmetricKeyUnwrapper setAlgorithmMapping(ASN1ObjectIdentifier algorithm, String algorithmName)
-    {
-        extraMappings.put(algorithm, algorithmName);
-
-        return this;
-    }
-
-    public GenericKey generateUnwrappedKey(AlgorithmIdentifier encryptedKeyAlgorithm, byte[] encryptedKey)
-        throws OperatorException
-    {
-        try
-        {
-            Key sKey = null;
-
-            Cipher keyCipher = helper.createAsymmetricWrapper(this.getAlgorithmIdentifier().getAlgorithm(), extraMappings);
-            AlgorithmParameters algParams = helper.createAlgorithmParameters(this.getAlgorithmIdentifier());
-
-            try
-            {
-                if (algParams != null)
-                {
-                    keyCipher.init(Cipher.UNWRAP_MODE, privKey, algParams);
-                }
-                else
-                {
-                    keyCipher.init(Cipher.UNWRAP_MODE, privKey);
-                }
-                sKey = keyCipher.unwrap(encryptedKey, helper.getKeyAlgorithmName(encryptedKeyAlgorithm.getAlgorithm()), Cipher.SECRET_KEY);
-            }
-            catch (GeneralSecurityException e)
-            {
-            }
-            catch (IllegalStateException e)
-            {
-            }
-            catch (UnsupportedOperationException e)
-            {
-            }
-            catch (ProviderException e)
-            {
-            }
-
-            // some providers do not support UNWRAP (this appears to be only for asymmetric algorithms)
-            if (sKey == null)
-            {
-                keyCipher.init(Cipher.DECRYPT_MODE, privKey);
-                sKey = new SecretKeySpec(keyCipher.doFinal(encryptedKey), encryptedKeyAlgorithm.getAlgorithm().getId());
-            }
-
-            return new JceGenericKey(encryptedKeyAlgorithm, sKey);
-        }
-        catch (InvalidKeyException e)
-        {
-            throw new OperatorException("key invalid: " + e.getMessage(), e);
-        }
-        catch (IllegalBlockSizeException e)
-        {
-            throw new OperatorException("illegal blocksize: " + e.getMessage(), e);
-        }
-        catch (BadPaddingException e)
-        {
-            throw new OperatorException("bad padding: " + e.getMessage(), e);
-        }
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/operator/jcajce/JceAsymmetricKeyWrapper.java b/bcpkix/src/main/java/org/bouncycastle/operator/jcajce/JceAsymmetricKeyWrapper.java
deleted file mode 100644
index 6ae402d..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/operator/jcajce/JceAsymmetricKeyWrapper.java
+++ /dev/null
@@ -1,157 +0,0 @@
-package org.bouncycastle.operator.jcajce;
-
-import java.security.AlgorithmParameters;
-import java.security.GeneralSecurityException;
-import java.security.InvalidKeyException;
-import java.security.Provider;
-import java.security.ProviderException;
-import java.security.PublicKey;
-import java.security.SecureRandom;
-import java.security.cert.X509Certificate;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.crypto.Cipher;
-
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.bouncycastle.jcajce.util.DefaultJcaJceHelper;
-import org.bouncycastle.jcajce.util.NamedJcaJceHelper;
-import org.bouncycastle.jcajce.util.ProviderJcaJceHelper;
-import org.bouncycastle.operator.AsymmetricKeyWrapper;
-import org.bouncycastle.operator.GenericKey;
-import org.bouncycastle.operator.OperatorException;
-
-public class JceAsymmetricKeyWrapper
-    extends AsymmetricKeyWrapper
-{
-    private OperatorHelper helper = new OperatorHelper(new DefaultJcaJceHelper());
-    private Map extraMappings = new HashMap();
-    private PublicKey publicKey;
-    private SecureRandom random;
-
-    public JceAsymmetricKeyWrapper(PublicKey publicKey)
-    {
-        super(SubjectPublicKeyInfo.getInstance(publicKey.getEncoded()).getAlgorithm());
-
-        this.publicKey = publicKey;
-    }
-
-    public JceAsymmetricKeyWrapper(X509Certificate certificate)
-    {
-        this(certificate.getPublicKey());
-    }
-
-    /**
-     * Create a wrapper, overriding the algorithm type that is stored in the public key.
-     *
-     * @param algorithmIdentifier identifier for encryption algorithm to be used.
-     * @param publicKey the public key to be used.
-     */
-    public JceAsymmetricKeyWrapper(AlgorithmIdentifier algorithmIdentifier, PublicKey publicKey)
-    {
-        super(algorithmIdentifier);
-
-        this.publicKey = publicKey;
-    }
-
-    public JceAsymmetricKeyWrapper setProvider(Provider provider)
-    {
-        this.helper = new OperatorHelper(new ProviderJcaJceHelper(provider));
-
-        return this;
-    }
-
-    public JceAsymmetricKeyWrapper setProvider(String providerName)
-    {
-        this.helper = new OperatorHelper(new NamedJcaJceHelper(providerName));
-
-        return this;
-    }
-
-    public JceAsymmetricKeyWrapper setSecureRandom(SecureRandom random)
-    {
-        this.random = random;
-
-        return this;
-    }
-
-    /**
-     * Internally algorithm ids are converted into cipher names using a lookup table. For some providers
-     * the standard lookup table won't work. Use this method to establish a specific mapping from an
-     * algorithm identifier to a specific algorithm.
-     * <p>
-     *     For example:
-     * <pre>
-     *     unwrapper.setAlgorithmMapping(PKCSObjectIdentifiers.rsaEncryption, "RSA");
-     * </pre>
-     * </p>
-     * @param algorithm  OID of algorithm in recipient.
-     * @param algorithmName JCE algorithm name to use.
-     * @return the current Wrapper.
-     */
-    public JceAsymmetricKeyWrapper setAlgorithmMapping(ASN1ObjectIdentifier algorithm, String algorithmName)
-    {
-        extraMappings.put(algorithm, algorithmName);
-
-        return this;
-    }
-
-    public byte[] generateWrappedKey(GenericKey encryptionKey)
-        throws OperatorException
-    {
-        Cipher keyEncryptionCipher = helper.createAsymmetricWrapper(getAlgorithmIdentifier().getAlgorithm(), extraMappings);
-        AlgorithmParameters algParams = helper.createAlgorithmParameters(this.getAlgorithmIdentifier());
-
-        byte[] encryptedKeyBytes = null;
-
-        try
-        {
-            if (algParams != null)
-            {
-                keyEncryptionCipher.init(Cipher.WRAP_MODE, publicKey, algParams, random);
-            }
-            else
-            {
-                keyEncryptionCipher.init(Cipher.WRAP_MODE, publicKey, random);
-            }
-            encryptedKeyBytes = keyEncryptionCipher.wrap(OperatorUtils.getJceKey(encryptionKey));
-        }
-        catch (InvalidKeyException e)
-        {
-        }
-        catch (GeneralSecurityException e)
-        {
-        }
-        catch (IllegalStateException e)
-        {
-        }
-        catch (UnsupportedOperationException e)
-        {
-        }
-        catch (ProviderException e)
-        {
-        }
-
-        // some providers do not support WRAP (this appears to be only for asymmetric algorithms)
-        if (encryptedKeyBytes == null)
-        {
-            try
-            {
-                keyEncryptionCipher.init(Cipher.ENCRYPT_MODE, publicKey, random);
-                encryptedKeyBytes = keyEncryptionCipher.doFinal(OperatorUtils.getJceKey(encryptionKey).getEncoded());
-            }
-            catch (InvalidKeyException e)
-            {
-                throw new OperatorException("unable to encrypt contents key", e);
-            }
-            catch (GeneralSecurityException e)
-            {
-                throw new OperatorException("unable to encrypt contents key", e);
-            }
-        }
-
-        return encryptedKeyBytes;
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/operator/jcajce/JceGenericKey.java b/bcpkix/src/main/java/org/bouncycastle/operator/jcajce/JceGenericKey.java
deleted file mode 100644
index efcbc3d..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/operator/jcajce/JceGenericKey.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package org.bouncycastle.operator.jcajce;
-
-import java.security.Key;
-
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.operator.GenericKey;
-
-public class JceGenericKey
-    extends GenericKey
-{
-    /**
-     * Attempt to simplify the key representation if possible.
-     *
-     * @param key a provider based key
-     * @return the byte encoding if one exists, key object otherwise.
-     */
-    private static Object getRepresentation(Key key)
-    {
-        byte[] keyBytes = key.getEncoded();
-
-        if (keyBytes != null)
-        {
-            return keyBytes;
-        }
-
-        return key;
-    }
-
-    public JceGenericKey(AlgorithmIdentifier algorithmIdentifier, Key representation)
-    {
-        super(algorithmIdentifier, getRepresentation(representation));
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/operator/jcajce/JceSymmetricKeyUnwrapper.java b/bcpkix/src/main/java/org/bouncycastle/operator/jcajce/JceSymmetricKeyUnwrapper.java
deleted file mode 100644
index b2c9cd3..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/operator/jcajce/JceSymmetricKeyUnwrapper.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package org.bouncycastle.operator.jcajce;
-
-import java.security.InvalidKeyException;
-import java.security.NoSuchAlgorithmException;
-import java.security.Provider;
-
-import javax.crypto.Cipher;
-import javax.crypto.SecretKey;
-
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.jcajce.util.DefaultJcaJceHelper;
-import org.bouncycastle.jcajce.util.NamedJcaJceHelper;
-import org.bouncycastle.jcajce.util.ProviderJcaJceHelper;
-import org.bouncycastle.operator.GenericKey;
-import org.bouncycastle.operator.OperatorException;
-import org.bouncycastle.operator.SymmetricKeyUnwrapper;
-
-public class JceSymmetricKeyUnwrapper
-    extends SymmetricKeyUnwrapper
-{
-    private OperatorHelper helper = new OperatorHelper(new DefaultJcaJceHelper());
-    private SecretKey secretKey;
-
-    public JceSymmetricKeyUnwrapper(AlgorithmIdentifier algorithmIdentifier, SecretKey secretKey)
-    {
-        super(algorithmIdentifier);
-
-        this.secretKey = secretKey;
-    }
-
-    public JceSymmetricKeyUnwrapper setProvider(Provider provider)
-    {
-        this.helper = new OperatorHelper(new ProviderJcaJceHelper(provider));
-
-        return this;
-    }
-
-    public JceSymmetricKeyUnwrapper setProvider(String providerName)
-    {
-        this.helper = new OperatorHelper(new NamedJcaJceHelper(providerName));
-
-        return this;
-    }
-
-    public GenericKey generateUnwrappedKey(AlgorithmIdentifier encryptedKeyAlgorithm, byte[] encryptedKey)
-        throws OperatorException
-    {
-        try
-        {
-            Cipher keyCipher = helper.createSymmetricWrapper(this.getAlgorithmIdentifier().getAlgorithm());
-
-            keyCipher.init(Cipher.UNWRAP_MODE, secretKey);
-
-            return new JceGenericKey(encryptedKeyAlgorithm, keyCipher.unwrap(encryptedKey, helper.getKeyAlgorithmName(encryptedKeyAlgorithm.getAlgorithm()), Cipher.SECRET_KEY));
-        }
-        catch (InvalidKeyException e)
-        {
-            throw new OperatorException("key invalid in message.", e);
-        }
-        catch (NoSuchAlgorithmException e)
-        {
-            throw new OperatorException("can't find algorithm.", e);
-        }
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/operator/jcajce/JceSymmetricKeyWrapper.java b/bcpkix/src/main/java/org/bouncycastle/operator/jcajce/JceSymmetricKeyWrapper.java
deleted file mode 100644
index a8f712a..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/operator/jcajce/JceSymmetricKeyWrapper.java
+++ /dev/null
@@ -1,154 +0,0 @@
-package org.bouncycastle.operator.jcajce;
-
-import java.security.GeneralSecurityException;
-import java.security.Key;
-import java.security.Provider;
-import java.security.SecureRandom;
-
-import javax.crypto.Cipher;
-import javax.crypto.SecretKey;
-
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.DERNull;
-import org.bouncycastle.asn1.kisa.KISAObjectIdentifiers;
-import org.bouncycastle.asn1.nist.NISTObjectIdentifiers;
-import org.bouncycastle.asn1.ntt.NTTObjectIdentifiers;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.jcajce.util.DefaultJcaJceHelper;
-import org.bouncycastle.jcajce.util.NamedJcaJceHelper;
-import org.bouncycastle.jcajce.util.ProviderJcaJceHelper;
-import org.bouncycastle.operator.GenericKey;
-import org.bouncycastle.operator.OperatorException;
-import org.bouncycastle.operator.SymmetricKeyWrapper;
-
-public class JceSymmetricKeyWrapper
-    extends SymmetricKeyWrapper
-{
-    private OperatorHelper helper = new OperatorHelper(new DefaultJcaJceHelper());
-    private SecureRandom random;
-    private SecretKey wrappingKey;
-
-    public JceSymmetricKeyWrapper(SecretKey wrappingKey)
-    {
-        super(determineKeyEncAlg(wrappingKey));
-
-        this.wrappingKey = wrappingKey;
-    }
-
-    public JceSymmetricKeyWrapper setProvider(Provider provider)
-    {
-        this.helper = new OperatorHelper(new ProviderJcaJceHelper(provider));
-
-        return this;
-    }
-
-    public JceSymmetricKeyWrapper setProvider(String providerName)
-    {
-        this.helper = new OperatorHelper(new NamedJcaJceHelper(providerName));
-
-        return this;
-    }
-
-    public JceSymmetricKeyWrapper setSecureRandom(SecureRandom random)
-    {
-        this.random = random;
-
-        return this;
-    }
-
-    public byte[] generateWrappedKey(GenericKey encryptionKey)
-        throws OperatorException
-    {
-        Key contentEncryptionKeySpec = OperatorUtils.getJceKey(encryptionKey);
-
-        Cipher keyEncryptionCipher = helper.createSymmetricWrapper(this.getAlgorithmIdentifier().getAlgorithm());
-
-        try
-        {
-            keyEncryptionCipher.init(Cipher.WRAP_MODE, wrappingKey, random);
-
-            return keyEncryptionCipher.wrap(contentEncryptionKeySpec);
-        }
-        catch (GeneralSecurityException e)
-        {
-            throw new OperatorException("cannot wrap key: " + e.getMessage(), e);
-        }
-    }
-
-    private static AlgorithmIdentifier determineKeyEncAlg(SecretKey key)
-    {
-        String algorithm = key.getAlgorithm();
-
-        if (algorithm.startsWith("DES"))
-        {
-            return new AlgorithmIdentifier(new ASN1ObjectIdentifier(
-                    "1.2.840.113549.1.9.16.3.6"), DERNull.INSTANCE);
-        }
-        else if (algorithm.startsWith("RC2"))
-        {
-            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;
-            ASN1ObjectIdentifier wrapOid;
-
-            if (length == 128)
-            {
-                wrapOid = NISTObjectIdentifiers.id_aes128_wrap;
-            }
-            else if (length == 192)
-            {
-                wrapOid = NISTObjectIdentifiers.id_aes192_wrap;
-            }
-            else if (length == 256)
-            {
-                wrapOid = NISTObjectIdentifiers.id_aes256_wrap;
-            }
-            else
-            {
-                throw new IllegalArgumentException("illegal keysize in AES");
-            }
-
-            return new AlgorithmIdentifier(wrapOid); // parameters absent
-        }
-        else if (algorithm.startsWith("SEED"))
-        {
-            // parameters absent
-            return new AlgorithmIdentifier(
-                    KISAObjectIdentifiers.id_npki_app_cmsSeed_wrap);
-        }
-        else if (algorithm.startsWith("Camellia"))
-        {
-            int length = key.getEncoded().length * 8;
-            ASN1ObjectIdentifier wrapOid;
-
-            if (length == 128)
-            {
-                wrapOid = NTTObjectIdentifiers.id_camellia128_wrap;
-            }
-            else if (length == 192)
-            {
-                wrapOid = NTTObjectIdentifiers.id_camellia192_wrap;
-            }
-            else if (length == 256)
-            {
-                wrapOid = NTTObjectIdentifiers.id_camellia256_wrap;
-            }
-            else
-            {
-                throw new IllegalArgumentException(
-                        "illegal keysize in Camellia");
-            }
-
-            return new AlgorithmIdentifier(wrapOid); // parameters must be
-                                                     // absent
-        }
-        else
-        {
-            throw new IllegalArgumentException("unknown algorithm");
-        }
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/operator/jcajce/OperatorHelper.java b/bcpkix/src/main/java/org/bouncycastle/operator/jcajce/OperatorHelper.java
index f33b84a..a0847fb 100644
--- a/bcpkix/src/main/java/org/bouncycastle/operator/jcajce/OperatorHelper.java
+++ b/bcpkix/src/main/java/org/bouncycastle/operator/jcajce/OperatorHelper.java
@@ -24,9 +24,11 @@ import javax.crypto.Cipher;
 import org.bouncycastle.asn1.ASN1Encodable;
 import org.bouncycastle.asn1.ASN1ObjectIdentifier;
 import org.bouncycastle.asn1.DERNull;
-import org.bouncycastle.asn1.bsi.BSIObjectIdentifiers;
-import org.bouncycastle.asn1.cryptopro.CryptoProObjectIdentifiers;
-import org.bouncycastle.asn1.eac.EACObjectIdentifiers;
+// BEGIN android-removed
+// import org.bouncycastle.asn1.bsi.BSIObjectIdentifiers;
+// import org.bouncycastle.asn1.cryptopro.CryptoProObjectIdentifiers;
+// import org.bouncycastle.asn1.eac.EACObjectIdentifiers;
+// END android-removed
 import org.bouncycastle.asn1.kisa.KISAObjectIdentifiers;
 import org.bouncycastle.asn1.nist.NISTObjectIdentifiers;
 import org.bouncycastle.asn1.ntt.NTTObjectIdentifiers;
@@ -59,22 +61,26 @@ class OperatorHelper
         oids.put(PKCSObjectIdentifiers.sha256WithRSAEncryption, "SHA256WITHRSA");
         oids.put(PKCSObjectIdentifiers.sha384WithRSAEncryption, "SHA384WITHRSA");
         oids.put(PKCSObjectIdentifiers.sha512WithRSAEncryption, "SHA512WITHRSA");
-        oids.put(CryptoProObjectIdentifiers.gostR3411_94_with_gostR3410_94, "GOST3411WITHGOST3410");
-        oids.put(CryptoProObjectIdentifiers.gostR3411_94_with_gostR3410_2001, "GOST3411WITHECGOST3410");
-        oids.put(BSIObjectIdentifiers.ecdsa_plain_SHA1, "SHA1WITHPLAIN-ECDSA");
-        oids.put(BSIObjectIdentifiers.ecdsa_plain_SHA224, "SHA224WITHPLAIN-ECDSA");
-        oids.put(BSIObjectIdentifiers.ecdsa_plain_SHA256, "SHA256WITHPLAIN-ECDSA");
-        oids.put(BSIObjectIdentifiers.ecdsa_plain_SHA384, "SHA384WITHPLAIN-ECDSA");
-        oids.put(BSIObjectIdentifiers.ecdsa_plain_SHA512, "SHA512WITHPLAIN-ECDSA");
-        oids.put(BSIObjectIdentifiers.ecdsa_plain_RIPEMD160, "RIPEMD160WITHPLAIN-ECDSA");
-        oids.put(EACObjectIdentifiers.id_TA_ECDSA_SHA_1, "SHA1WITHCVC-ECDSA");
-        oids.put(EACObjectIdentifiers.id_TA_ECDSA_SHA_224, "SHA224WITHCVC-ECDSA");
-        oids.put(EACObjectIdentifiers.id_TA_ECDSA_SHA_256, "SHA256WITHCVC-ECDSA");
-        oids.put(EACObjectIdentifiers.id_TA_ECDSA_SHA_384, "SHA384WITHCVC-ECDSA");
-        oids.put(EACObjectIdentifiers.id_TA_ECDSA_SHA_512, "SHA512WITHCVC-ECDSA");
+        // BEGIN android-removed
+        // oids.put(CryptoProObjectIdentifiers.gostR3411_94_with_gostR3410_94, "GOST3411WITHGOST3410");
+        // oids.put(CryptoProObjectIdentifiers.gostR3411_94_with_gostR3410_2001, "GOST3411WITHECGOST3410");
+        // oids.put(BSIObjectIdentifiers.ecdsa_plain_SHA1, "SHA1WITHPLAIN-ECDSA");
+        // oids.put(BSIObjectIdentifiers.ecdsa_plain_SHA224, "SHA224WITHPLAIN-ECDSA");
+        // oids.put(BSIObjectIdentifiers.ecdsa_plain_SHA256, "SHA256WITHPLAIN-ECDSA");
+        // oids.put(BSIObjectIdentifiers.ecdsa_plain_SHA384, "SHA384WITHPLAIN-ECDSA");
+        // oids.put(BSIObjectIdentifiers.ecdsa_plain_SHA512, "SHA512WITHPLAIN-ECDSA");
+        // oids.put(BSIObjectIdentifiers.ecdsa_plain_RIPEMD160, "RIPEMD160WITHPLAIN-ECDSA");
+        // oids.put(EACObjectIdentifiers.id_TA_ECDSA_SHA_1, "SHA1WITHCVC-ECDSA");
+        // oids.put(EACObjectIdentifiers.id_TA_ECDSA_SHA_224, "SHA224WITHCVC-ECDSA");
+        // oids.put(EACObjectIdentifiers.id_TA_ECDSA_SHA_256, "SHA256WITHCVC-ECDSA");
+        // oids.put(EACObjectIdentifiers.id_TA_ECDSA_SHA_384, "SHA384WITHCVC-ECDSA");
+        // oids.put(EACObjectIdentifiers.id_TA_ECDSA_SHA_512, "SHA512WITHCVC-ECDSA");
+        // END android-removed
 
         oids.put(new ASN1ObjectIdentifier("1.2.840.113549.1.1.4"), "MD5WITHRSA");
-        oids.put(new ASN1ObjectIdentifier("1.2.840.113549.1.1.2"), "MD2WITHRSA");
+        // BEGIN android-removed
+        // oids.put(new ASN1ObjectIdentifier("1.2.840.113549.1.1.2"), "MD2WITHRSA");
+        // END android-removed
         oids.put(new ASN1ObjectIdentifier("1.2.840.10040.4.3"), "SHA1WITHDSA");
         oids.put(X9ObjectIdentifiers.ecdsa_with_SHA1, "SHA1WITHECDSA");
         oids.put(X9ObjectIdentifiers.ecdsa_with_SHA224, "SHA224WITHECDSA");
diff --git a/bcpkix/src/main/java/org/bouncycastle/operator/jcajce/OperatorUtils.java b/bcpkix/src/main/java/org/bouncycastle/operator/jcajce/OperatorUtils.java
deleted file mode 100644
index 6c41d96..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/operator/jcajce/OperatorUtils.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package org.bouncycastle.operator.jcajce;
-
-import java.security.Key;
-
-import javax.crypto.spec.SecretKeySpec;
-
-import org.bouncycastle.operator.GenericKey;
-
-class OperatorUtils
-{
-    static Key getJceKey(GenericKey key)
-    {
-        if (key.getRepresentation() instanceof Key)
-        {
-            return (Key)key.getRepresentation();
-        }
-
-        if (key.getRepresentation() instanceof byte[])
-        {
-            return new SecretKeySpec((byte[])key.getRepresentation(), "ENC");
-        }
-
-        throw new IllegalArgumentException("unknown generic key type");
-    }
-}
\ No newline at end of file
diff --git a/bcpkix/src/main/java/org/bouncycastle/operator/package.html b/bcpkix/src/main/java/org/bouncycastle/operator/package.html
deleted file mode 100644
index b64343a..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/operator/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body bgcolor="#ffffff">
-Basic operators for doing encryption, signing, and digest operations.
-</body>
-</html>
diff --git a/bcpkix/src/main/java/org/bouncycastle/operator/test/AllTests.java b/bcpkix/src/main/java/org/bouncycastle/operator/test/AllTests.java
deleted file mode 100644
index ad19503..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/operator/test/AllTests.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package org.bouncycastle.operator.test;
-
-import java.security.Security;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import org.bouncycastle.asn1.DERNull;
-import org.bouncycastle.asn1.nist.NISTObjectIdentifiers;
-import org.bouncycastle.asn1.oiw.OIWObjectIdentifiers;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.asn1.teletrust.TeleTrusTObjectIdentifiers;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.asn1.x509.Extension;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.operator.AlgorithmNameFinder;
-import org.bouncycastle.operator.DefaultAlgorithmNameFinder;
-
-public class AllTests
-    extends TestCase
-{
-    private static final byte[] TEST_DATA = "Hello world!".getBytes();
-    private static final String BC = BouncyCastleProvider.PROVIDER_NAME;
-    private static final String TEST_DATA_HOME = "bc.test.data.home";
-
-    public AllTests(String name)
-    {
-        super(name);
-    }
-
-    public static void main(String args[])
-    {
-        junit.textui.TestRunner.run(AllTests.class);
-    }
-
-    public static Test suite()
-    {
-        return new TestSuite(AllTests.class);
-    }
-
-    public void setUp()
-    {
-        Security.addProvider(new BouncyCastleProvider());
-    }
-
-    public void tearDown()
-    {
-
-    }
-
-    public void testAlgorithmNameFinder()
-        throws Exception
-    {
-        AlgorithmNameFinder nameFinder = new DefaultAlgorithmNameFinder();
-
-        assertTrue(nameFinder.hasAlgorithmName(OIWObjectIdentifiers.elGamalAlgorithm));
-        assertFalse(nameFinder.hasAlgorithmName(Extension.authorityKeyIdentifier));
-
-        assertEquals(nameFinder.getAlgorithmName(OIWObjectIdentifiers.elGamalAlgorithm), "ELGAMAL");
-        assertEquals(nameFinder.getAlgorithmName(PKCSObjectIdentifiers.rsaEncryption), "RSA");
-        assertEquals(nameFinder.getAlgorithmName(PKCSObjectIdentifiers.id_RSAES_OAEP), "RSAOAEP");
-        assertEquals(nameFinder.getAlgorithmName(PKCSObjectIdentifiers.md5), "MD5");
-        assertEquals(nameFinder.getAlgorithmName(OIWObjectIdentifiers.idSHA1), "SHA1");
-        assertEquals(nameFinder.getAlgorithmName(NISTObjectIdentifiers.id_sha224), "SHA224");
-        assertEquals(nameFinder.getAlgorithmName(NISTObjectIdentifiers.id_sha256), "SHA256");
-        assertEquals(nameFinder.getAlgorithmName(NISTObjectIdentifiers.id_sha384), "SHA384");
-        assertEquals(nameFinder.getAlgorithmName(NISTObjectIdentifiers.id_sha512), "SHA512");
-        assertEquals(nameFinder.getAlgorithmName(PKCSObjectIdentifiers.sha512WithRSAEncryption), "SHA512WITHRSA");
-        assertEquals(nameFinder.getAlgorithmName(PKCSObjectIdentifiers.id_RSASSA_PSS), "RSAPSS");
-        assertEquals(nameFinder.getAlgorithmName(TeleTrusTObjectIdentifiers.rsaSignatureWithripemd160), "RIPEMD160WITHRSA");
-        assertEquals(nameFinder.getAlgorithmName(new AlgorithmIdentifier(OIWObjectIdentifiers.elGamalAlgorithm, DERNull.INSTANCE)), "ELGAMAL");
-        assertEquals(nameFinder.getAlgorithmName(new AlgorithmIdentifier(PKCSObjectIdentifiers.rsaEncryption, DERNull.INSTANCE)), "RSA");
-
-        assertEquals(nameFinder.getAlgorithmName(Extension.authorityKeyIdentifier), Extension.authorityKeyIdentifier.getId());
-    }
-
-}
\ No newline at end of file
diff --git a/bcpkix/src/main/java/org/bouncycastle/pkcs/MacDataGenerator.java b/bcpkix/src/main/java/org/bouncycastle/pkcs/MacDataGenerator.java
deleted file mode 100644
index 7b9daa8..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/pkcs/MacDataGenerator.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package org.bouncycastle.pkcs;
-
-
-import java.io.IOException;
-import java.io.OutputStream;
-
-import org.bouncycastle.asn1.pkcs.MacData;
-import org.bouncycastle.asn1.pkcs.PKCS12PBEParams;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.asn1.x509.DigestInfo;
-import org.bouncycastle.operator.MacCalculator;
-
-class MacDataGenerator
-{
-    private PKCS12MacCalculatorBuilder builder;
-
-    MacDataGenerator(PKCS12MacCalculatorBuilder builder)
-    {
-        this.builder = builder;
-    }
-
-    public MacData build(char[] password, byte[] data)
-        throws PKCSException
-    {
-        MacCalculator     macCalculator;
-
-        try
-        {
-            macCalculator = builder.build(password);
-
-            OutputStream out = macCalculator.getOutputStream();
-
-            out.write(data);
-
-            out.close();
-        }
-        catch (Exception e)
-        {
-            throw new PKCSException("unable to process data: " + e.getMessage(), e);
-        }
-
-        AlgorithmIdentifier algId = macCalculator.getAlgorithmIdentifier();
-
-        DigestInfo dInfo = new DigestInfo(builder.getDigestAlgorithmIdentifier(), macCalculator.getMac());
-        PKCS12PBEParams params = PKCS12PBEParams.getInstance(algId.getParameters());
-
-        return new MacData(dInfo, params.getIV(), params.getIterations().intValue());
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/pkcs/PKCS10CertificationRequest.java b/bcpkix/src/main/java/org/bouncycastle/pkcs/PKCS10CertificationRequest.java
deleted file mode 100644
index 88e430d..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/pkcs/PKCS10CertificationRequest.java
+++ /dev/null
@@ -1,236 +0,0 @@
-package org.bouncycastle.pkcs;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.bouncycastle.asn1.ASN1Encoding;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Set;
-import org.bouncycastle.asn1.pkcs.Attribute;
-import org.bouncycastle.asn1.pkcs.CertificationRequest;
-import org.bouncycastle.asn1.pkcs.CertificationRequestInfo;
-import org.bouncycastle.asn1.x500.X500Name;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.bouncycastle.operator.ContentVerifier;
-import org.bouncycastle.operator.ContentVerifierProvider;
-
-/**
- * Holding class for a PKCS#10 certification request.
- */
-public class PKCS10CertificationRequest
-{
-    private static Attribute[] EMPTY_ARRAY = new Attribute[0];
-
-    private CertificationRequest certificationRequest;
-
-    private static CertificationRequest parseBytes(byte[] encoding)
-        throws IOException
-    {
-        try
-        {
-            return CertificationRequest.getInstance(ASN1Primitive.fromByteArray(encoding));
-        }
-        catch (ClassCastException e)
-        {
-            throw new PKCSIOException("malformed data: " + e.getMessage(), e);
-        }
-        catch (IllegalArgumentException e)
-        {
-            throw new PKCSIOException("malformed data: " + e.getMessage(), e);
-        }
-    }
-
-    /**
-     * Create a PKCS10CertificationRequestHolder from an underlying ASN.1 structure.
-     *
-     * @param certificationRequest the underlying ASN.1 structure representing a request.
-     */
-    public PKCS10CertificationRequest(CertificationRequest certificationRequest)
-    {
-         this.certificationRequest = certificationRequest;
-    }
-
-    /**
-     * Create a PKCS10CertificationRequestHolder from the passed in bytes.
-     *
-     * @param encoded BER/DER encoding of the CertificationRequest structure.
-     * @throws IOException in the event of corrupted data, or an incorrect structure.
-     */
-    public PKCS10CertificationRequest(byte[] encoded)
-        throws IOException
-    {
-        this(parseBytes(encoded));
-    }
-
-    /**
-     * Return the underlying ASN.1 structure for this request.
-     *
-     * @return a CertificateRequest object.
-     */
-    public CertificationRequest toASN1Structure()
-    {
-         return certificationRequest;
-    }
-
-    /**
-     * Return the subject on this request.
-     *
-     * @return the X500Name representing the request's subject.
-     */
-    public X500Name getSubject()
-    {
-        return X500Name.getInstance(certificationRequest.getCertificationRequestInfo().getSubject());
-    }
-
-    /**
-     * Return the details of the signature algorithm used to create this request.
-     *
-     * @return the AlgorithmIdentifier describing the signature algorithm used to create this request.
-     */
-    public AlgorithmIdentifier getSignatureAlgorithm()
-    {
-        return certificationRequest.getSignatureAlgorithm();
-    }
-
-    /**
-     * Return the bytes making up the signature associated with this request.
-     *
-     * @return the request signature bytes.
-     */
-    public byte[] getSignature()
-    {
-        return certificationRequest.getSignature().getBytes();
-    }
-
-    /**
-     * Return the SubjectPublicKeyInfo describing the public key this request is carrying.
-     *
-     * @return the public key ASN.1 structure contained in the request.
-     */
-    public SubjectPublicKeyInfo getSubjectPublicKeyInfo()
-    {
-        return certificationRequest.getCertificationRequestInfo().getSubjectPublicKeyInfo();
-    }
-
-    /**
-     * Return the attributes, if any associated with this request.
-     *
-     * @return an array of Attribute, zero length if none present.
-     */
-    public Attribute[] getAttributes()
-    {
-        ASN1Set attrSet = certificationRequest.getCertificationRequestInfo().getAttributes();
-
-        if (attrSet == null)
-        {
-            return EMPTY_ARRAY;
-        }
-
-        Attribute[] attrs = new Attribute[attrSet.size()];
-
-        for (int i = 0; i != attrSet.size(); i++)
-        {
-            attrs[i] = Attribute.getInstance(attrSet.getObjectAt(i));
-        }
-
-        return attrs;
-    }
-
-    /**
-     * Return an  array of attributes matching the passed in type OID.
-     *
-     * @param type the type of the attribute being looked for.
-     * @return an array of Attribute of the requested type, zero length if none present.
-     */
-    public Attribute[] getAttributes(ASN1ObjectIdentifier type)
-    {
-        ASN1Set    attrSet = certificationRequest.getCertificationRequestInfo().getAttributes();
-
-        if (attrSet == null)
-        {
-            return EMPTY_ARRAY;
-        }
-        
-        List list = new ArrayList();
-
-        for (int i = 0; i != attrSet.size(); i++)
-        {
-            Attribute attr = Attribute.getInstance(attrSet.getObjectAt(i));
-            if (attr.getAttrType().equals(type))
-            {
-                list.add(attr);
-            }
-        }
-
-        if (list.size() == 0)
-        {
-            return EMPTY_ARRAY;
-        }
-
-        return (Attribute[])list.toArray(new Attribute[list.size()]);
-    }
-
-    public byte[] getEncoded()
-        throws IOException
-    {
-        return certificationRequest.getEncoded();
-    }
-
-    /**
-     * Validate the signature on the PKCS10 certification request in this holder.
-     *
-     * @param verifierProvider a ContentVerifierProvider that can generate a verifier for the signature.
-     * @return true if the signature is valid, false otherwise.
-     * @throws PKCSException if the signature cannot be processed or is inappropriate.
-     */
-    public boolean isSignatureValid(ContentVerifierProvider verifierProvider)
-        throws PKCSException
-    {
-        CertificationRequestInfo requestInfo = certificationRequest.getCertificationRequestInfo();
-
-        ContentVerifier verifier;
-
-        try
-        {
-            verifier = verifierProvider.get(certificationRequest.getSignatureAlgorithm());
-
-            OutputStream sOut = verifier.getOutputStream();
-
-            sOut.write(requestInfo.getEncoded(ASN1Encoding.DER));
-
-            sOut.close();
-        }
-        catch (Exception e)
-        {
-            throw new PKCSException("unable to process signature: " + e.getMessage(), e);
-        }
-
-        return verifier.verify(certificationRequest.getSignature().getBytes());
-    }
-
-    public boolean equals(Object o)
-    {
-        if (o == this)
-        {
-            return true;
-        }
-
-        if (!(o instanceof PKCS10CertificationRequest))
-        {
-            return false;
-        }
-
-        PKCS10CertificationRequest other = (PKCS10CertificationRequest)o;
-
-        return this.toASN1Structure().equals(other.toASN1Structure());
-    }
-
-    public int hashCode()
-    {
-        return this.toASN1Structure().hashCode();
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/pkcs/PKCS10CertificationRequestBuilder.java b/bcpkix/src/main/java/org/bouncycastle/pkcs/PKCS10CertificationRequestBuilder.java
deleted file mode 100644
index 851e697..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/pkcs/PKCS10CertificationRequestBuilder.java
+++ /dev/null
@@ -1,156 +0,0 @@
-package org.bouncycastle.pkcs;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Encoding;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.DERBitString;
-import org.bouncycastle.asn1.DERSet;
-import org.bouncycastle.asn1.pkcs.Attribute;
-import org.bouncycastle.asn1.pkcs.CertificationRequest;
-import org.bouncycastle.asn1.pkcs.CertificationRequestInfo;
-import org.bouncycastle.asn1.x500.X500Name;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.bouncycastle.operator.ContentSigner;
-
-/**
- * A class for creating PKCS#10 Certification requests.
- * <pre>
- * CertificationRequest ::= SEQUENCE {
- *   certificationRequestInfo  CertificationRequestInfo,
- *   signatureAlgorithm        AlgorithmIdentifier{{ SignatureAlgorithms }},
- *   signature                 BIT STRING
- * }
- *
- * CertificationRequestInfo ::= SEQUENCE {
- *   version             INTEGER { v1(0) } (v1,...),
- *   subject             Name,
- *   subjectPKInfo   SubjectPublicKeyInfo{{ PKInfoAlgorithms }},
- *   attributes          [0] Attributes{{ CRIAttributes }}
- *  }
- *
- *  Attributes { ATTRIBUTE:IOSet } ::= SET OF Attribute{{ IOSet }}
- *
- *  Attribute { ATTRIBUTE:IOSet } ::= SEQUENCE {
- *    type    ATTRIBUTE.&id({IOSet}),
- *    values  SET SIZE(1..MAX) OF ATTRIBUTE.&Type({IOSet}{\@type})
- *  }
- * </pre>
- */
-public class PKCS10CertificationRequestBuilder
-{
-    private SubjectPublicKeyInfo publicKeyInfo;
-    private X500Name subject;
-    private List attributes = new ArrayList();
-    private boolean leaveOffEmpty = false;
-
-    /**
-     * Basic constructor.
-     *
-     * @param subject the X.500 Name defining the certificate subject this request is for.
-     * @param publicKeyInfo the info structure for the public key to be associated with this subject.
-     */
-    public PKCS10CertificationRequestBuilder(X500Name subject, SubjectPublicKeyInfo publicKeyInfo)
-    {
-        this.subject = subject;
-        this.publicKeyInfo = publicKeyInfo;
-    }
-
-    /**
-     * Add an attribute to the certification request we are building.
-     *
-     * @param attrType the OID giving the type of the attribute.
-     * @param attrValue the ASN.1 structure that forms the value of the attribute.
-     * @return this builder object.
-     */
-    public PKCS10CertificationRequestBuilder addAttribute(ASN1ObjectIdentifier attrType, ASN1Encodable attrValue)
-    {
-        attributes.add(new Attribute(attrType, new DERSet(attrValue)));
-
-        return this;
-    }
-
-    /**
-     * Add an attribute with multiple values to the certification request we are building.
-     *
-     * @param attrType the OID giving the type of the attribute.
-     * @param attrValues an array of ASN.1 structures that form the value of the attribute.
-     * @return this builder object.
-     */
-    public PKCS10CertificationRequestBuilder addAttribute(ASN1ObjectIdentifier attrType, ASN1Encodable[] attrValues)
-    {
-        attributes.add(new Attribute(attrType, new DERSet(attrValues)));
-
-        return this;
-    }
-
-    /**
-     * The attributes field in PKCS10 should encoded to an empty tagged set if there are
-     * no attributes. Some CAs will reject requests with the attribute field present.
-     *
-     * @param leaveOffEmpty true if empty attributes should be left out of the encoding false otherwise.
-     * @return this builder object.
-     */
-    public PKCS10CertificationRequestBuilder setLeaveOffEmptyAttributes(boolean leaveOffEmpty)
-    {
-        this.leaveOffEmpty = leaveOffEmpty;
-
-        return this;
-    }
-
-    /**
-     * Generate an PKCS#10 request based on the past in signer.
-     *
-     * @param signer the content signer to be used to generate the signature validating the certificate.
-     * @return a holder containing the resulting PKCS#10 certification request.
-     */
-    public PKCS10CertificationRequest build(
-        ContentSigner signer)
-    {
-        CertificationRequestInfo info;
-
-        if (attributes.isEmpty())
-        {
-            if (leaveOffEmpty)
-            {
-                info = new CertificationRequestInfo(subject, publicKeyInfo, null);
-            }
-            else
-            {
-                info = new CertificationRequestInfo(subject, publicKeyInfo, new DERSet());
-            }
-        }
-        else
-        {
-            ASN1EncodableVector v = new ASN1EncodableVector();
-
-            for (Iterator it = attributes.iterator(); it.hasNext();)
-            {
-                v.add(Attribute.getInstance(it.next()));
-            }
-
-            info = new CertificationRequestInfo(subject, publicKeyInfo, new DERSet(v));
-        }
-
-        try
-        {
-            OutputStream sOut = signer.getOutputStream();
-
-            sOut.write(info.getEncoded(ASN1Encoding.DER));
-
-            sOut.close();
-
-            return new PKCS10CertificationRequest(new CertificationRequest(info, signer.getAlgorithmIdentifier(), new DERBitString(signer.getSignature())));
-        }
-        catch (IOException e)
-        {
-            throw new IllegalStateException("cannot produce certification request signature");
-        }
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/pkcs/PKCS12MacCalculatorBuilder.java b/bcpkix/src/main/java/org/bouncycastle/pkcs/PKCS12MacCalculatorBuilder.java
deleted file mode 100644
index 7f159c6..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/pkcs/PKCS12MacCalculatorBuilder.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package org.bouncycastle.pkcs;
-
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.operator.MacCalculator;
-import org.bouncycastle.operator.OperatorCreationException;
-
-public interface PKCS12MacCalculatorBuilder
-{
-    MacCalculator build(char[] password)
-        throws OperatorCreationException;
-
-    AlgorithmIdentifier getDigestAlgorithmIdentifier();
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/pkcs/PKCS12MacCalculatorBuilderProvider.java b/bcpkix/src/main/java/org/bouncycastle/pkcs/PKCS12MacCalculatorBuilderProvider.java
deleted file mode 100644
index c262ac1..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/pkcs/PKCS12MacCalculatorBuilderProvider.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package org.bouncycastle.pkcs;
-
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-
-public interface PKCS12MacCalculatorBuilderProvider
-{
-    PKCS12MacCalculatorBuilder get(AlgorithmIdentifier algorithmIdentifier);
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/pkcs/PKCS12PfxPdu.java b/bcpkix/src/main/java/org/bouncycastle/pkcs/PKCS12PfxPdu.java
deleted file mode 100644
index e39025b..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/pkcs/PKCS12PfxPdu.java
+++ /dev/null
@@ -1,161 +0,0 @@
-package org.bouncycastle.pkcs;
-
-import java.io.IOException;
-
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.pkcs.ContentInfo;
-import org.bouncycastle.asn1.pkcs.MacData;
-import org.bouncycastle.asn1.pkcs.PKCS12PBEParams;
-import org.bouncycastle.asn1.pkcs.Pfx;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.cert.CertIOException;
-import org.bouncycastle.util.Arrays;
-
-/**
- * A holding class for the PKCS12 Pfx structure.
- */
-public class PKCS12PfxPdu
-{
-    private Pfx pfx;
-
-    private static Pfx parseBytes(byte[] pfxEncoding)
-        throws IOException
-    {
-        try
-        {
-            return Pfx.getInstance(ASN1Primitive.fromByteArray(pfxEncoding));
-        }
-        catch (ClassCastException e)
-        {
-            throw new CertIOException("malformed data: " + e.getMessage(), e);
-        }
-        catch (IllegalArgumentException e)
-        {
-            throw new CertIOException("malformed data: " + e.getMessage(), e);
-        }
-    }
-
-    public PKCS12PfxPdu(Pfx pfx)
-    {
-        this.pfx = pfx;
-    }
-
-    public PKCS12PfxPdu(byte[] pfx)
-        throws IOException
-    {
-        this(parseBytes(pfx));
-    }
-
-    /**
-     * Return the content infos in the AuthenticatedSafe contained in this Pfx.
-     *
-     * @return an array of ContentInfo.
-     */
-    public ContentInfo[] getContentInfos()
-    {
-        ASN1Sequence seq = ASN1Sequence.getInstance(ASN1OctetString.getInstance(this.pfx.getAuthSafe().getContent()).getOctets());
-        ContentInfo[] content = new ContentInfo[seq.size()];
-
-        for (int i = 0; i != seq.size(); i++)
-        {
-            content[i] = ContentInfo.getInstance(seq.getObjectAt(i));
-        }
-
-        return content;
-    }
-
-    /**
-     * Return whether or not there is MAC attached to this file.
-     *
-     * @return true if there is, false otherwise.
-     */
-    public boolean hasMac()
-    {
-        return pfx.getMacData() != null;
-    }
-
-    /**
-     * Return the algorithm identifier describing the MAC algorithm
-     *
-     * @return the AlgorithmIdentifier representing the MAC algorithm, null if none present.
-     */
-    public AlgorithmIdentifier getMacAlgorithmID()
-    {
-        MacData md = pfx.getMacData();
-
-        if (md != null)
-        {
-            return md.getMac().getAlgorithmId();
-        }
-
-        return null;
-    }
-
-    /**
-     * Verify the MacData attached to the PFX is consistent with what is expected.
-     *
-     * @param macCalcProviderBuilder provider builder for the calculator for the MAC
-     * @param password password to use
-     * @return true if mac data is valid, false otherwise.
-     * @throws PKCSException if there is a problem evaluating the MAC.
-     * @throws IllegalStateException if no MAC is actually present
-     */
-    public boolean isMacValid(PKCS12MacCalculatorBuilderProvider macCalcProviderBuilder, char[] password)
-        throws PKCSException
-    {
-        if (hasMac())
-        {
-            MacData pfxmData = pfx.getMacData();
-            MacDataGenerator mdGen = new MacDataGenerator(macCalcProviderBuilder.get(new AlgorithmIdentifier(pfxmData.getMac().getAlgorithmId().getAlgorithm(), new PKCS12PBEParams(pfxmData.getSalt(), pfxmData.getIterationCount().intValue()))));
-
-            try
-            {
-                MacData mData = mdGen.build(
-                    password,
-                    ASN1OctetString.getInstance(pfx.getAuthSafe().getContent()).getOctets());
-
-                return Arrays.constantTimeAreEqual(mData.getEncoded(), pfx.getMacData().getEncoded());
-            }
-            catch (IOException e)
-            {
-                throw new PKCSException("unable to process AuthSafe: " + e.getMessage());
-            }
-        }
-
-        throw new IllegalStateException("no MAC present on PFX");
-    }
-
-    /**
-     * Return the underlying ASN.1 object.
-     *
-     * @return a Pfx object.
-     */
-    public Pfx toASN1Structure()
-    {
-        return pfx;
-    }
-
-    public byte[] getEncoded()
-        throws IOException
-    {
-        return toASN1Structure().getEncoded();
-    }
-
-    /**
-     * Return a Pfx with the outer wrapper encoded as asked for. For example, Pfx is a usually
-     * a BER encoded object, to get one with DefiniteLength encoding use:
-     * <pre>
-     * getEncoded(ASN1Encoding.DL)
-     * </pre>
-     * @param encoding encoding style (ASN1Encoding.DER, ASN1Encoding.DL, ASN1Encoding.BER)
-     * @return a byte array containing the encoded object.
-     * @throws IOException
-     */
-    public byte[] getEncoded(String encoding)
-        throws IOException
-    {
-        return toASN1Structure().getEncoded(encoding);
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/pkcs/PKCS12PfxPduBuilder.java b/bcpkix/src/main/java/org/bouncycastle/pkcs/PKCS12PfxPduBuilder.java
deleted file mode 100644
index 563ca04..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/pkcs/PKCS12PfxPduBuilder.java
+++ /dev/null
@@ -1,179 +0,0 @@
-package org.bouncycastle.pkcs;
-
-import java.io.IOException;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DEROctetString;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.DLSequence;
-import org.bouncycastle.asn1.pkcs.AuthenticatedSafe;
-import org.bouncycastle.asn1.pkcs.ContentInfo;
-import org.bouncycastle.asn1.pkcs.MacData;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.asn1.pkcs.Pfx;
-import org.bouncycastle.cms.CMSEncryptedDataGenerator;
-import org.bouncycastle.cms.CMSException;
-import org.bouncycastle.cms.CMSProcessableByteArray;
-import org.bouncycastle.operator.OutputEncryptor;
-
-/**
- * A builder for the PKCS#12 Pfx key and certificate store.
- * <p>
- * For example: you can build a basic key store for the user owning privKey as follows:
- * </p>
- * <pre>
- *      X509Certificate[] chain = ....
- *      PublicKey         pubKey = ....
- *      PrivateKey        privKey = ....
- *      JcaX509ExtensionUtils extUtils = new JcaX509ExtensionUtils();
- *
- *      PKCS12SafeBagBuilder taCertBagBuilder = new JcaPKCS12SafeBagBuilder(chain[2]);
- *
- *      taCertBagBuilder.addBagAttribute(PKCSObjectIdentifiers.pkcs_9_at_friendlyName, new DERBMPString("Bouncy Primary Certificate"));
- *
- *      PKCS12SafeBagBuilder caCertBagBuilder = new JcaPKCS12SafeBagBuilder(chain[1]);
- *
- *      caCertBagBuilder.addBagAttribute(PKCSObjectIdentifiers.pkcs_9_at_friendlyName, new DERBMPString("Bouncy Intermediate Certificate"));
- *
- *      PKCS12SafeBagBuilder eeCertBagBuilder = new JcaPKCS12SafeBagBuilder(chain[0]);
- *
- *      eeCertBagBuilder.addBagAttribute(PKCSObjectIdentifiers.pkcs_9_at_friendlyName, new DERBMPString("Eric's Key"));
- *      eeCertBagBuilder.addBagAttribute(PKCSObjectIdentifiers.pkcs_9_at_localKeyId, extUtils.createSubjectKeyIdentifier(pubKey));
- *
- *      PKCS12SafeBagBuilder keyBagBuilder = new JcaPKCS12SafeBagBuilder(privKey, new BcPKCS12PBEOutputEncryptorBuilder(PKCSObjectIdentifiers.pbeWithSHAAnd3_KeyTripleDES_CBC, new CBCBlockCipher(new DESedeEngine())).build(passwd));
- *
- *      keyBagBuilder.addBagAttribute(PKCSObjectIdentifiers.pkcs_9_at_friendlyName, new DERBMPString("Eric's Key"));
- *      keyBagBuilder.addBagAttribute(PKCSObjectIdentifiers.pkcs_9_at_localKeyId, extUtils.createSubjectKeyIdentifier(pubKey));
- *
- *      //
- *      // construct the actual key store
- *      //
- *      PKCS12PfxPduBuilder pfxPduBuilder = new PKCS12PfxPduBuilder();
- *
- *      PKCS12SafeBag[] certs = new PKCS12SafeBag[3];
- *
- *      certs[0] = eeCertBagBuilder.build();
- *      certs[1] = caCertBagBuilder.build();
- *      certs[2] = taCertBagBuilder.build();
- *
- *      pfxPduBuilder.addEncryptedData(new BcPKCS12PBEOutputEncryptorBuilder(PKCSObjectIdentifiers.pbeWithSHAAnd40BitRC2_CBC, new CBCBlockCipher(new RC2Engine())).build(passwd), certs);
- *
- *      pfxPduBuilder.addData(keyBagBuilder.build());
- *
- *      PKCS12PfxPdu pfx = pfxPduBuilder.build(new BcPKCS12MacCalculatorBuilder(), passwd);
- * </pre>
- *
- */
-public class PKCS12PfxPduBuilder
-{
-    private ASN1EncodableVector dataVector = new ASN1EncodableVector();
-
-    /**
-     * Add a SafeBag that is to be included as is.
-     *
-     * @param data the SafeBag to add.
-     * @return this builder.
-     * @throws IOException
-     */
-    public PKCS12PfxPduBuilder addData(PKCS12SafeBag data)
-        throws IOException
-    {
-        dataVector.add(new ContentInfo(PKCSObjectIdentifiers.data, new DEROctetString(new DLSequence(data.toASN1Structure()).getEncoded())));
-
-        return this;
-    }
-
-    /**
-     * Add a SafeBag that is to be wrapped in a EncryptedData object.
-     *
-     * @param dataEncryptor the encryptor to use for encoding the data.
-     * @param data the SafeBag to include.
-     * @return this builder.
-     * @throws IOException if a issue occurs processing the data.
-     */
-    public PKCS12PfxPduBuilder addEncryptedData(OutputEncryptor dataEncryptor, PKCS12SafeBag data)
-        throws IOException
-    {
-        return addEncryptedData(dataEncryptor, new DERSequence(data.toASN1Structure()));
-    }
-
-    /**
-     * Add a set of SafeBags that are to be wrapped in a EncryptedData object.
-     *
-     * @param dataEncryptor the encryptor to use for encoding the data.
-     * @param data the SafeBags to include.
-     * @return this builder.
-     * @throws IOException if a issue occurs processing the data.
-     */
-    public PKCS12PfxPduBuilder addEncryptedData(OutputEncryptor dataEncryptor, PKCS12SafeBag[] data)
-        throws IOException
-    {
-        ASN1EncodableVector v = new ASN1EncodableVector();
-
-        for (int i = 0; i != data.length; i++)
-        {
-            v.add(data[i].toASN1Structure());
-        }
-
-        return addEncryptedData(dataEncryptor, new DLSequence(v));
-    }
-
-    private PKCS12PfxPduBuilder addEncryptedData(OutputEncryptor dataEncryptor, ASN1Sequence data)
-        throws IOException
-    {
-        CMSEncryptedDataGenerator envGen = new CMSEncryptedDataGenerator();
-
-        try
-        {
-            dataVector.add(envGen.generate(new CMSProcessableByteArray(data.getEncoded()), dataEncryptor).toASN1Structure());
-        }
-        catch (CMSException e)
-        {
-            throw new PKCSIOException(e.getMessage(), e.getCause());
-        }
-
-        return this;
-    }
-
-    /**
-     * Build the Pfx structure, protecting it with a MAC calculated against the passed in password.
-     *
-     * @param macCalcBuilder a builder for a PKCS12 mac calculator.
-     * @param password the password to use.
-     * @return a Pfx object.
-     * @throws PKCSException on a encoding or processing error.
-     */
-    public PKCS12PfxPdu build(PKCS12MacCalculatorBuilder macCalcBuilder, char[] password)
-        throws PKCSException
-    {
-        AuthenticatedSafe auth = AuthenticatedSafe.getInstance(new DLSequence(dataVector));
-        byte[]            encAuth;
-
-        try
-        {
-            encAuth = auth.getEncoded();
-        }
-        catch (IOException e)
-        {
-            throw new PKCSException("unable to encode AuthenticatedSafe: " + e.getMessage(), e);
-        }
-
-        ContentInfo       mainInfo = new ContentInfo(PKCSObjectIdentifiers.data, new DEROctetString(encAuth));
-        MacData           mData = null;
-
-        if (macCalcBuilder != null)
-        {
-            MacDataGenerator mdGen = new MacDataGenerator(macCalcBuilder);
-
-            mData = mdGen.build(password, encAuth);
-        }
-
-        //
-        // output the Pfx
-        //
-        Pfx pfx = new Pfx(mainInfo, mData);
-
-        return new PKCS12PfxPdu(pfx);
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/pkcs/PKCS12SafeBag.java b/bcpkix/src/main/java/org/bouncycastle/pkcs/PKCS12SafeBag.java
deleted file mode 100644
index 6f053ba..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/pkcs/PKCS12SafeBag.java
+++ /dev/null
@@ -1,93 +0,0 @@
-package org.bouncycastle.pkcs;
-
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.ASN1Set;
-import org.bouncycastle.asn1.pkcs.Attribute;
-import org.bouncycastle.asn1.pkcs.CRLBag;
-import org.bouncycastle.asn1.pkcs.CertBag;
-import org.bouncycastle.asn1.pkcs.EncryptedPrivateKeyInfo;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
-import org.bouncycastle.asn1.pkcs.SafeBag;
-import org.bouncycastle.asn1.x509.Certificate;
-import org.bouncycastle.asn1.x509.CertificateList;
-import org.bouncycastle.cert.X509CRLHolder;
-import org.bouncycastle.cert.X509CertificateHolder;
-
-public class PKCS12SafeBag
-{
-    public static final ASN1ObjectIdentifier friendlyNameAttribute = PKCSObjectIdentifiers.pkcs_9_at_friendlyName;
-    public static final ASN1ObjectIdentifier localKeyIdAttribute = PKCSObjectIdentifiers.pkcs_9_at_localKeyId;
-
-    private SafeBag safeBag;
-
-    public PKCS12SafeBag(SafeBag safeBag)
-    {
-        this.safeBag = safeBag;
-    }
-
-    /**
-     * Return the underlying ASN.1 structure for this safe bag.
-     *
-     * @return a SafeBag
-     */
-    public SafeBag toASN1Structure()
-    {
-        return safeBag;
-    }
-
-    /**
-     * Return the BagId giving the type of content in the bag.
-     *
-     * @return the bagId
-     */
-    public ASN1ObjectIdentifier getType()
-    {
-        return safeBag.getBagId();
-    }
-
-    public Attribute[] getAttributes()
-    {
-        ASN1Set attrs = safeBag.getBagAttributes();
-
-        if (attrs == null)
-        {
-            return null;
-        }
-
-        Attribute[] attributes = new Attribute[attrs.size()];
-        for (int i = 0; i != attrs.size(); i++)
-        {
-            attributes[i] = Attribute.getInstance(attrs.getObjectAt(i));
-        }
-
-        return attributes;
-    }
-
-    public Object getBagValue()
-    {
-        if (getType().equals(PKCSObjectIdentifiers.pkcs8ShroudedKeyBag))
-        {
-            return new PKCS8EncryptedPrivateKeyInfo(EncryptedPrivateKeyInfo.getInstance(safeBag.getBagValue()));
-        }
-        if (getType().equals(PKCSObjectIdentifiers.certBag))
-        {
-            CertBag certBag = CertBag.getInstance(safeBag.getBagValue());
-
-            return new X509CertificateHolder(Certificate.getInstance(ASN1OctetString.getInstance(certBag.getCertValue()).getOctets()));
-        }
-        if (getType().equals(PKCSObjectIdentifiers.keyBag))
-        {
-            return PrivateKeyInfo.getInstance(safeBag.getBagValue());
-        }
-        if (getType().equals(PKCSObjectIdentifiers.crlBag))
-        {
-            CRLBag crlBag = CRLBag.getInstance(safeBag.getBagValue());
-
-            return new X509CRLHolder(CertificateList.getInstance(ASN1OctetString.getInstance(crlBag.getCRLValue()).getOctets()));
-        }
-
-        return safeBag.getBagValue();
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/pkcs/PKCS12SafeBagBuilder.java b/bcpkix/src/main/java/org/bouncycastle/pkcs/PKCS12SafeBagBuilder.java
deleted file mode 100644
index 1e3a262..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/pkcs/PKCS12SafeBagBuilder.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package org.bouncycastle.pkcs;
-
-import java.io.IOException;
-
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.DEROctetString;
-import org.bouncycastle.asn1.DERSet;
-import org.bouncycastle.asn1.pkcs.Attribute;
-import org.bouncycastle.asn1.pkcs.CertBag;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
-import org.bouncycastle.asn1.pkcs.SafeBag;
-import org.bouncycastle.asn1.x509.Certificate;
-import org.bouncycastle.asn1.x509.CertificateList;
-import org.bouncycastle.cert.X509CRLHolder;
-import org.bouncycastle.cert.X509CertificateHolder;
-import org.bouncycastle.operator.OutputEncryptor;
-
-public class PKCS12SafeBagBuilder
-{
-    private ASN1ObjectIdentifier bagType;
-    private ASN1Encodable        bagValue;
-    private ASN1EncodableVector  bagAttrs = new ASN1EncodableVector();
-
-    public PKCS12SafeBagBuilder(PrivateKeyInfo privateKeyInfo, OutputEncryptor encryptor)
-    {
-        this.bagType = PKCSObjectIdentifiers.pkcs8ShroudedKeyBag;
-        this.bagValue = new PKCS8EncryptedPrivateKeyInfoBuilder(privateKeyInfo).build(encryptor).toASN1Structure();
-    }
-
-    public PKCS12SafeBagBuilder(PrivateKeyInfo privateKeyInfo)
-    {
-        this.bagType = PKCSObjectIdentifiers.keyBag;
-        this.bagValue = privateKeyInfo;
-    }
-
-    public PKCS12SafeBagBuilder(X509CertificateHolder certificate)
-        throws IOException
-    {
-        this(certificate.toASN1Structure());
-    }
-
-    public PKCS12SafeBagBuilder(X509CRLHolder crl)
-        throws IOException
-    {
-        this(crl.toASN1Structure());
-    }
-
-    public PKCS12SafeBagBuilder(Certificate certificate)
-        throws IOException
-    {
-        this.bagType = PKCSObjectIdentifiers.certBag;
-        this.bagValue = new CertBag(PKCSObjectIdentifiers.x509Certificate, new DEROctetString(certificate.getEncoded()));
-    }
-
-    public PKCS12SafeBagBuilder(CertificateList crl)
-        throws IOException
-    {
-        this.bagType = PKCSObjectIdentifiers.crlBag;
-        this.bagValue = new CertBag(PKCSObjectIdentifiers.x509Crl, new DEROctetString(crl.getEncoded()));
-    }
-
-    public PKCS12SafeBagBuilder addBagAttribute(ASN1ObjectIdentifier attrType, ASN1Encodable attrValue)
-    {
-        bagAttrs.add(new Attribute(attrType, new DERSet(attrValue)));
-
-        return this;
-    }
-
-    public PKCS12SafeBag build()
-    {
-        return new PKCS12SafeBag(new SafeBag(bagType, bagValue, new DERSet(bagAttrs)));
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/pkcs/PKCS12SafeBagFactory.java b/bcpkix/src/main/java/org/bouncycastle/pkcs/PKCS12SafeBagFactory.java
deleted file mode 100644
index 2773855..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/pkcs/PKCS12SafeBagFactory.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package org.bouncycastle.pkcs;
-
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.pkcs.ContentInfo;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.asn1.pkcs.SafeBag;
-import org.bouncycastle.cms.CMSEncryptedData;
-import org.bouncycastle.cms.CMSException;
-import org.bouncycastle.operator.InputDecryptorProvider;
-
-public class PKCS12SafeBagFactory
-{
-    private ASN1Sequence safeBagSeq;
-
-    public PKCS12SafeBagFactory(ContentInfo info)
-    {
-        if (info.getContentType().equals(PKCSObjectIdentifiers.encryptedData))
-        {
-            throw new IllegalArgumentException("encryptedData requires constructor with decryptor.");
-        }
-
-        this.safeBagSeq = ASN1Sequence.getInstance(ASN1OctetString.getInstance(info.getContent()).getOctets());
-    }
-
-    public PKCS12SafeBagFactory(ContentInfo info, InputDecryptorProvider inputDecryptorProvider)
-        throws PKCSException
-    {
-        if (info.getContentType().equals(PKCSObjectIdentifiers.encryptedData))
-        {
-            CMSEncryptedData encData = new CMSEncryptedData(org.bouncycastle.asn1.cms.ContentInfo.getInstance(info));
-
-            try
-            {
-                this.safeBagSeq = ASN1Sequence.getInstance(encData.getContent(inputDecryptorProvider));
-            }
-            catch (CMSException e)
-            {
-                throw new PKCSException("unable to extract data: " + e.getMessage(), e);
-            }
-            return;
-        }
-
-        throw new IllegalArgumentException("encryptedData requires constructor with decryptor.");
-    }
-
-    public PKCS12SafeBag[] getSafeBags()
-    {
-        PKCS12SafeBag[] safeBags = new PKCS12SafeBag[safeBagSeq.size()];
-
-        for (int i = 0; i != safeBagSeq.size(); i++)
-        {
-            safeBags[i] = new PKCS12SafeBag(SafeBag.getInstance(safeBagSeq.getObjectAt(i)));
-        }
-
-        return safeBags;
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/pkcs/PKCS8EncryptedPrivateKeyInfo.java b/bcpkix/src/main/java/org/bouncycastle/pkcs/PKCS8EncryptedPrivateKeyInfo.java
deleted file mode 100644
index 37f1ed8..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/pkcs/PKCS8EncryptedPrivateKeyInfo.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package org.bouncycastle.pkcs;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.pkcs.EncryptedPrivateKeyInfo;
-import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
-import org.bouncycastle.cert.CertIOException;
-import org.bouncycastle.operator.InputDecryptor;
-import org.bouncycastle.operator.InputDecryptorProvider;
-import org.bouncycastle.util.io.Streams;
-
-/**
- * Holding class for a PKCS#8 EncryptedPrivateKeyInfo structure.
- */
-public class PKCS8EncryptedPrivateKeyInfo
-{
-    private EncryptedPrivateKeyInfo encryptedPrivateKeyInfo;
-
-    private static EncryptedPrivateKeyInfo parseBytes(byte[] pkcs8Encoding)
-        throws IOException
-    {
-        try
-        {
-            return EncryptedPrivateKeyInfo.getInstance(ASN1Primitive.fromByteArray(pkcs8Encoding));
-        }
-        catch (ClassCastException e)
-        {
-            throw new CertIOException("malformed data: " + e.getMessage(), e);
-        }
-        catch (IllegalArgumentException e)
-        {
-            throw new CertIOException("malformed data: " + e.getMessage(), e);
-        }
-    }
-
-    public PKCS8EncryptedPrivateKeyInfo(EncryptedPrivateKeyInfo encryptedPrivateKeyInfo)
-    {
-        this.encryptedPrivateKeyInfo = encryptedPrivateKeyInfo;
-    }
-
-    public PKCS8EncryptedPrivateKeyInfo(byte[] encryptedPrivateKeyInfo)
-        throws IOException
-    {
-        this(parseBytes(encryptedPrivateKeyInfo));
-    }
-
-    public EncryptedPrivateKeyInfo toASN1Structure()
-    {
-         return encryptedPrivateKeyInfo;
-    }
-
-    public byte[] getEncoded()
-        throws IOException
-    {
-        return encryptedPrivateKeyInfo.getEncoded();
-    }
-
-    public PrivateKeyInfo decryptPrivateKeyInfo(InputDecryptorProvider inputDecryptorProvider)
-        throws PKCSException
-    {
-        try
-        {
-            InputDecryptor decrytor = inputDecryptorProvider.get(encryptedPrivateKeyInfo.getEncryptionAlgorithm());
-
-            ByteArrayInputStream encIn = new ByteArrayInputStream(encryptedPrivateKeyInfo.getEncryptedData());
-
-            return PrivateKeyInfo.getInstance(Streams.readAll(decrytor.getInputStream(encIn)));
-        }
-        catch (Exception e)
-        {
-            throw new PKCSException("unable to read encrypted data: " + e.getMessage(), e);
-        }
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/pkcs/PKCS8EncryptedPrivateKeyInfoBuilder.java b/bcpkix/src/main/java/org/bouncycastle/pkcs/PKCS8EncryptedPrivateKeyInfoBuilder.java
deleted file mode 100644
index 653aa57..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/pkcs/PKCS8EncryptedPrivateKeyInfoBuilder.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package org.bouncycastle.pkcs;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-
-import org.bouncycastle.asn1.pkcs.EncryptedPrivateKeyInfo;
-import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
-import org.bouncycastle.operator.OutputEncryptor;
-
-/**
- * A class for creating EncryptedPrivateKeyInfo structures.
- * <pre>
- * EncryptedPrivateKeyInfo ::= SEQUENCE {
- *      encryptionAlgorithm AlgorithmIdentifier {{KeyEncryptionAlgorithms}},
- *      encryptedData EncryptedData
- * }
- *
- * EncryptedData ::= OCTET STRING
- *
- * KeyEncryptionAlgorithms ALGORITHM-IDENTIFIER ::= {
- *          ... -- For local profiles
- * }
- * </pre>
- */
-public class PKCS8EncryptedPrivateKeyInfoBuilder
-{
-    private PrivateKeyInfo privateKeyInfo;
-
-    public PKCS8EncryptedPrivateKeyInfoBuilder(PrivateKeyInfo privateKeyInfo)
-    {
-        this.privateKeyInfo = privateKeyInfo;
-    }
-
-    public PKCS8EncryptedPrivateKeyInfo build(
-        OutputEncryptor encryptor)
-    {
-        try
-        {
-            ByteArrayOutputStream bOut = new ByteArrayOutputStream();
-            OutputStream cOut = encryptor.getOutputStream(bOut);
-
-            cOut.write(privateKeyInfo.getEncoded());
-
-            cOut.close();
-
-            return new PKCS8EncryptedPrivateKeyInfo(new EncryptedPrivateKeyInfo(encryptor.getAlgorithmIdentifier(), bOut.toByteArray()));
-        }
-        catch (IOException e)
-        {
-            throw new IllegalStateException("cannot encode privateKeyInfo");
-        }
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/pkcs/PKCSException.java b/bcpkix/src/main/java/org/bouncycastle/pkcs/PKCSException.java
deleted file mode 100644
index 8ee6f6f..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/pkcs/PKCSException.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package org.bouncycastle.pkcs;
-
-/**
- * General checked Exception thrown in the cert package and its sub-packages.
- */
-public class PKCSException
-    extends Exception
-{
-    private Throwable cause;
-
-    public PKCSException(String msg, Throwable cause)
-    {
-        super(msg);
-
-        this.cause = cause;
-    }
-
-    public PKCSException(String msg)
-    {
-        super(msg);
-    }
-
-    public Throwable getCause()
-    {
-        return cause;
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/pkcs/PKCSIOException.java b/bcpkix/src/main/java/org/bouncycastle/pkcs/PKCSIOException.java
deleted file mode 100644
index c34f739..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/pkcs/PKCSIOException.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package org.bouncycastle.pkcs;
-
-import java.io.IOException;
-
-/**
- * General IOException thrown in the cert package and its sub-packages.
- */
-public class PKCSIOException
-    extends IOException
-{
-    private Throwable cause;
-
-    public PKCSIOException(String msg, Throwable cause)
-    {
-        super(msg);
-
-        this.cause = cause;
-    }
-
-    public PKCSIOException(String msg)
-    {
-        super(msg);
-    }
-
-    public Throwable getCause()
-    {
-        return cause;
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/pkcs/bc/BcPKCS10CertificationRequest.java b/bcpkix/src/main/java/org/bouncycastle/pkcs/bc/BcPKCS10CertificationRequest.java
deleted file mode 100644
index 99c337c..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/pkcs/bc/BcPKCS10CertificationRequest.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package org.bouncycastle.pkcs.bc;
-
-import java.io.IOException;
-
-import org.bouncycastle.asn1.pkcs.CertificationRequest;
-import org.bouncycastle.crypto.params.AsymmetricKeyParameter;
-import org.bouncycastle.crypto.util.PublicKeyFactory;
-import org.bouncycastle.pkcs.PKCS10CertificationRequest;
-import org.bouncycastle.pkcs.PKCSException;
-
-public class BcPKCS10CertificationRequest
-    extends PKCS10CertificationRequest
-{
-    public BcPKCS10CertificationRequest(CertificationRequest certificationRequest)
-    {
-        super(certificationRequest);
-    }
-
-    public BcPKCS10CertificationRequest(byte[] encoding)
-        throws IOException
-    {
-        super(encoding);
-    }
-
-    public BcPKCS10CertificationRequest(PKCS10CertificationRequest requestHolder)
-    {
-        super(requestHolder.toASN1Structure());
-    }
-
-    public AsymmetricKeyParameter getPublicKey()
-        throws PKCSException
-    {
-        try
-        {
-            return PublicKeyFactory.createKey(this.getSubjectPublicKeyInfo());
-        }
-        catch (IOException e)
-        {
-            throw new PKCSException("error extracting key encoding: " + e.getMessage(), e);
-        }
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/pkcs/bc/BcPKCS10CertificationRequestBuilder.java b/bcpkix/src/main/java/org/bouncycastle/pkcs/bc/BcPKCS10CertificationRequestBuilder.java
deleted file mode 100644
index 04b0fc6..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/pkcs/bc/BcPKCS10CertificationRequestBuilder.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package org.bouncycastle.pkcs.bc;
-
-import java.io.IOException;
-
-import org.bouncycastle.asn1.x500.X500Name;
-import org.bouncycastle.crypto.params.AsymmetricKeyParameter;
-import org.bouncycastle.crypto.util.SubjectPublicKeyInfoFactory;
-import org.bouncycastle.pkcs.PKCS10CertificationRequestBuilder;
-
-/**
- * Extension of the PKCS#10 builder to support AsymmetricKey objects.
- */
-public class BcPKCS10CertificationRequestBuilder
-    extends PKCS10CertificationRequestBuilder
-{
-    /**
-     * Create a PKCS#10 builder for the passed in subject and JCA public key.
-     *
-     * @param subject an X500Name containing the subject associated with the request we are building.
-     * @param publicKey a JCA public key that is to be associated with the request we are building.
-     * @throws IOException if there is a problem encoding the public key.
-     */
-    public BcPKCS10CertificationRequestBuilder(X500Name subject, AsymmetricKeyParameter publicKey)
-        throws IOException
-    {
-        super(subject, SubjectPublicKeyInfoFactory.createSubjectPublicKeyInfo(publicKey));
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/pkcs/bc/BcPKCS12MacCalculatorBuilder.java b/bcpkix/src/main/java/org/bouncycastle/pkcs/bc/BcPKCS12MacCalculatorBuilder.java
deleted file mode 100644
index b942079..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/pkcs/bc/BcPKCS12MacCalculatorBuilder.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package org.bouncycastle.pkcs.bc;
-
-import java.security.SecureRandom;
-
-import org.bouncycastle.asn1.DERNull;
-import org.bouncycastle.asn1.oiw.OIWObjectIdentifiers;
-import org.bouncycastle.asn1.pkcs.PKCS12PBEParams;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.crypto.ExtendedDigest;
-import org.bouncycastle.crypto.digests.SHA1Digest;
-import org.bouncycastle.operator.MacCalculator;
-import org.bouncycastle.pkcs.PKCS12MacCalculatorBuilder;
-
-public class BcPKCS12MacCalculatorBuilder
-    implements PKCS12MacCalculatorBuilder
-{
-    private ExtendedDigest digest;
-    private AlgorithmIdentifier algorithmIdentifier;
-
-    private SecureRandom  random;
-    private int    saltLength;
-    private int    iterationCount = 1024;
-
-    public BcPKCS12MacCalculatorBuilder()
-    {
-        this(new SHA1Digest(), new AlgorithmIdentifier(OIWObjectIdentifiers.idSHA1, DERNull.INSTANCE));
-    }
-
-    public BcPKCS12MacCalculatorBuilder(ExtendedDigest digest, AlgorithmIdentifier algorithmIdentifier)
-    {
-        this.digest = digest;
-        this.algorithmIdentifier = algorithmIdentifier;
-        this.saltLength = digest.getDigestSize();
-    }
-
-    public BcPKCS12MacCalculatorBuilder setIterationCount(int iterationCount)
-    {
-        this.iterationCount = iterationCount;
-
-        return this;
-    }
-
-    public AlgorithmIdentifier getDigestAlgorithmIdentifier()
-    {
-        return algorithmIdentifier;
-    }
-
-    public MacCalculator build(final char[] password)
-    {
-        if (random == null)
-        {
-            random = new SecureRandom();
-        }
-
-        byte[] salt = new byte[saltLength];
-
-        random.nextBytes(salt);
-
-        return PKCS12PBEUtils.createMacCalculator(algorithmIdentifier.getAlgorithm(), digest, new PKCS12PBEParams(salt, iterationCount), password);
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/pkcs/bc/BcPKCS12MacCalculatorBuilderProvider.java b/bcpkix/src/main/java/org/bouncycastle/pkcs/bc/BcPKCS12MacCalculatorBuilderProvider.java
deleted file mode 100644
index d6f9230..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/pkcs/bc/BcPKCS12MacCalculatorBuilderProvider.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package org.bouncycastle.pkcs.bc;
-
-import org.bouncycastle.asn1.DERNull;
-import org.bouncycastle.asn1.pkcs.PKCS12PBEParams;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.operator.MacCalculator;
-import org.bouncycastle.operator.OperatorCreationException;
-import org.bouncycastle.operator.bc.BcDigestProvider;
-import org.bouncycastle.pkcs.PKCS12MacCalculatorBuilder;
-import org.bouncycastle.pkcs.PKCS12MacCalculatorBuilderProvider;
-
-public class BcPKCS12MacCalculatorBuilderProvider
-    implements PKCS12MacCalculatorBuilderProvider
-{
-    private BcDigestProvider digestProvider;
-
-    public BcPKCS12MacCalculatorBuilderProvider(BcDigestProvider digestProvider)
-    {
-        this.digestProvider = digestProvider;
-    }
-
-    public PKCS12MacCalculatorBuilder get(final AlgorithmIdentifier algorithmIdentifier)
-    {
-        return new PKCS12MacCalculatorBuilder()
-        {
-            public MacCalculator build(final char[] password)
-                throws OperatorCreationException
-            {
-                PKCS12PBEParams pbeParams = PKCS12PBEParams.getInstance(algorithmIdentifier.getParameters());
-
-                return PKCS12PBEUtils.createMacCalculator(algorithmIdentifier.getAlgorithm(), digestProvider.get(algorithmIdentifier), pbeParams, password);
-            }
-
-            public AlgorithmIdentifier getDigestAlgorithmIdentifier()
-            {
-                return new AlgorithmIdentifier(algorithmIdentifier.getAlgorithm(), DERNull.INSTANCE);
-            }
-        };
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/pkcs/bc/BcPKCS12PBEInputDecryptorProviderBuilder.java b/bcpkix/src/main/java/org/bouncycastle/pkcs/bc/BcPKCS12PBEInputDecryptorProviderBuilder.java
deleted file mode 100644
index e578fd5..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/pkcs/bc/BcPKCS12PBEInputDecryptorProviderBuilder.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package org.bouncycastle.pkcs.bc;
-
-import java.io.InputStream;
-
-import org.bouncycastle.asn1.pkcs.PKCS12PBEParams;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.ExtendedDigest;
-import org.bouncycastle.crypto.digests.SHA1Digest;
-import org.bouncycastle.crypto.generators.PKCS12ParametersGenerator;
-import org.bouncycastle.crypto.io.CipherInputStream;
-import org.bouncycastle.crypto.paddings.PaddedBufferedBlockCipher;
-import org.bouncycastle.operator.GenericKey;
-import org.bouncycastle.operator.InputDecryptor;
-import org.bouncycastle.operator.InputDecryptorProvider;
-
-public class BcPKCS12PBEInputDecryptorProviderBuilder
-{
-    private ExtendedDigest digest;
-
-    public BcPKCS12PBEInputDecryptorProviderBuilder()
-    {
-         this(new SHA1Digest());
-    }
-
-    public BcPKCS12PBEInputDecryptorProviderBuilder(ExtendedDigest digest)
-    {
-         this.digest = digest;
-    }
-
-    public InputDecryptorProvider build(final char[] password)
-    {
-        return new InputDecryptorProvider()
-        {
-            public InputDecryptor get(final AlgorithmIdentifier algorithmIdentifier)
-            {
-                final PaddedBufferedBlockCipher engine = PKCS12PBEUtils.getEngine(algorithmIdentifier.getAlgorithm());
-
-                PKCS12PBEParams           pbeParams = PKCS12PBEParams.getInstance(algorithmIdentifier.getParameters());
-
-                CipherParameters params = PKCS12PBEUtils.createCipherParameters(algorithmIdentifier.getAlgorithm(), digest, engine.getBlockSize(), pbeParams, password);
-
-                engine.init(false, params);
-
-                return new InputDecryptor()
-                {
-                    public AlgorithmIdentifier getAlgorithmIdentifier()
-                    {
-                        return algorithmIdentifier;
-                    }
-
-                    public InputStream getInputStream(InputStream input)
-                    {
-                        return new CipherInputStream(input, engine);
-                    }
-
-                    public GenericKey getKey()
-                    {
-                        return new GenericKey(PKCS12ParametersGenerator.PKCS12PasswordToBytes(password));
-                    }
-                };
-            }
-        };
-
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/pkcs/bc/BcPKCS12PBEOutputEncryptorBuilder.java b/bcpkix/src/main/java/org/bouncycastle/pkcs/bc/BcPKCS12PBEOutputEncryptorBuilder.java
deleted file mode 100644
index f7f4a7e..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/pkcs/bc/BcPKCS12PBEOutputEncryptorBuilder.java
+++ /dev/null
@@ -1,83 +0,0 @@
-package org.bouncycastle.pkcs.bc;
-
-import java.io.OutputStream;
-import java.security.SecureRandom;
-
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.pkcs.PKCS12PBEParams;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.crypto.BlockCipher;
-import org.bouncycastle.crypto.BufferedBlockCipher;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.ExtendedDigest;
-import org.bouncycastle.crypto.digests.SHA1Digest;
-import org.bouncycastle.crypto.generators.PKCS12ParametersGenerator;
-import org.bouncycastle.crypto.io.CipherOutputStream;
-import org.bouncycastle.crypto.paddings.PKCS7Padding;
-import org.bouncycastle.crypto.paddings.PaddedBufferedBlockCipher;
-import org.bouncycastle.operator.GenericKey;
-import org.bouncycastle.operator.OutputEncryptor;
-
-public class BcPKCS12PBEOutputEncryptorBuilder
-{
-    private ExtendedDigest digest;
-
-    private BufferedBlockCipher engine;
-    private ASN1ObjectIdentifier algorithm;
-    private SecureRandom random;
-    private int iterationCount = 1024;
-
-    public BcPKCS12PBEOutputEncryptorBuilder(ASN1ObjectIdentifier algorithm, BlockCipher engine)
-    {
-        this(algorithm, engine, new SHA1Digest());
-    }
-
-    public BcPKCS12PBEOutputEncryptorBuilder(ASN1ObjectIdentifier algorithm, BlockCipher engine, ExtendedDigest pbeDigest)
-    {
-        this.algorithm = algorithm;
-        this.engine = new PaddedBufferedBlockCipher(engine, new PKCS7Padding());
-        this.digest = pbeDigest;
-    }
-
-    public BcPKCS12PBEOutputEncryptorBuilder setIterationCount(int iterationCount)
-    {
-        this.iterationCount = iterationCount;
-        return this;
-    }
-
-    public OutputEncryptor build(final char[] password)
-    {
-        if (random == null)
-        {
-            random = new SecureRandom();
-        }
-
-        final byte[] salt = new byte[20];
-
-        random.nextBytes(salt);
-
-        final PKCS12PBEParams pbeParams = new PKCS12PBEParams(salt, iterationCount);
-
-        CipherParameters params = PKCS12PBEUtils.createCipherParameters(algorithm, digest, engine.getBlockSize(), pbeParams, password);
-
-        engine.init(true, params);
-
-        return new OutputEncryptor()
-        {
-            public AlgorithmIdentifier getAlgorithmIdentifier()
-            {
-                return new AlgorithmIdentifier(algorithm, pbeParams);
-            }
-
-            public OutputStream getOutputStream(OutputStream out)
-            {
-                return new CipherOutputStream(out, engine);
-            }
-
-            public GenericKey getKey()
-            {
-                return new GenericKey(new AlgorithmIdentifier(algorithm, pbeParams), PKCS12ParametersGenerator.PKCS12PasswordToBytes(password));
-            }
-        };
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/pkcs/bc/PKCS12PBEUtils.java b/bcpkix/src/main/java/org/bouncycastle/pkcs/bc/PKCS12PBEUtils.java
deleted file mode 100644
index 2edce23..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/pkcs/bc/PKCS12PBEUtils.java
+++ /dev/null
@@ -1,153 +0,0 @@
-package org.bouncycastle.pkcs.bc;
-
-import java.io.OutputStream;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.pkcs.PKCS12PBEParams;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.crypto.BlockCipher;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.ExtendedDigest;
-import org.bouncycastle.crypto.engines.DESedeEngine;
-import org.bouncycastle.crypto.engines.RC2Engine;
-import org.bouncycastle.crypto.generators.PKCS12ParametersGenerator;
-import org.bouncycastle.crypto.io.MacOutputStream;
-import org.bouncycastle.crypto.macs.HMac;
-import org.bouncycastle.crypto.modes.CBCBlockCipher;
-import org.bouncycastle.crypto.paddings.PKCS7Padding;
-import org.bouncycastle.crypto.paddings.PaddedBufferedBlockCipher;
-import org.bouncycastle.crypto.params.DESedeParameters;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.crypto.params.ParametersWithIV;
-import org.bouncycastle.operator.GenericKey;
-import org.bouncycastle.operator.MacCalculator;
-import org.bouncycastle.util.Integers;
-
-class PKCS12PBEUtils
-{
-    private static Map keySizes = new HashMap();
-    private static Set noIvAlgs = new HashSet();
-    private static Set desAlgs = new HashSet();
-
-    static
-    {
-        keySizes.put(PKCSObjectIdentifiers.pbeWithSHAAnd128BitRC4, Integers.valueOf(128));
-        keySizes.put(PKCSObjectIdentifiers.pbeWithSHAAnd40BitRC4, Integers.valueOf(40));
-        keySizes.put(PKCSObjectIdentifiers.pbeWithSHAAnd3_KeyTripleDES_CBC, Integers.valueOf(192));
-        keySizes.put(PKCSObjectIdentifiers.pbeWithSHAAnd2_KeyTripleDES_CBC, Integers.valueOf(128));
-        keySizes.put(PKCSObjectIdentifiers.pbeWithSHAAnd128BitRC2_CBC, Integers.valueOf(128));
-        keySizes.put(PKCSObjectIdentifiers.pbeWithSHAAnd40BitRC2_CBC, Integers.valueOf(40));
-
-        noIvAlgs.add(PKCSObjectIdentifiers.pbeWithSHAAnd128BitRC4);
-        noIvAlgs.add(PKCSObjectIdentifiers.pbeWithSHAAnd40BitRC4);
-
-        desAlgs.add(PKCSObjectIdentifiers.pbeWithSHAAnd3_KeyTripleDES_CBC);
-        desAlgs.add(PKCSObjectIdentifiers.pbeWithSHAAnd3_KeyTripleDES_CBC);
-    }
-
-    static int getKeySize(ASN1ObjectIdentifier algorithm)
-    {
-        return ((Integer)keySizes.get(algorithm)).intValue();
-    }
-
-    static boolean hasNoIv(ASN1ObjectIdentifier algorithm)
-    {
-        return noIvAlgs.contains(algorithm);
-    }
-
-    static boolean isDesAlg(ASN1ObjectIdentifier algorithm)
-    {
-        return desAlgs.contains(algorithm);
-    }
-
-    static PaddedBufferedBlockCipher getEngine(ASN1ObjectIdentifier algorithm)
-    {
-        BlockCipher engine;
-
-        if (algorithm.equals(PKCSObjectIdentifiers.pbeWithSHAAnd3_KeyTripleDES_CBC)
-            || algorithm.equals(PKCSObjectIdentifiers.pbeWithSHAAnd2_KeyTripleDES_CBC))
-        {
-            engine = new DESedeEngine();
-        }
-        else if (algorithm.equals(PKCSObjectIdentifiers.pbeWithSHAAnd128BitRC2_CBC)
-            || algorithm.equals(PKCSObjectIdentifiers.pbeWithSHAAnd40BitRC2_CBC))
-        {
-            engine = new RC2Engine();
-        }
-        else
-        {
-            throw new IllegalStateException("unknown algorithm");
-        }
-
-        return new PaddedBufferedBlockCipher(new CBCBlockCipher(engine), new PKCS7Padding());
-    }
-
-    static MacCalculator createMacCalculator(final ASN1ObjectIdentifier digestAlgorithm, ExtendedDigest digest, final PKCS12PBEParams pbeParams, final char[] password)
-    {
-        PKCS12ParametersGenerator pGen = new PKCS12ParametersGenerator(digest);
-
-        pGen.init(PKCS12ParametersGenerator.PKCS12PasswordToBytes(password), pbeParams.getIV(), pbeParams.getIterations().intValue());
-
-        final KeyParameter keyParam = (KeyParameter)pGen.generateDerivedMacParameters(digest.getDigestSize() * 8);
-
-        final HMac hMac = new HMac(digest);
-
-        hMac.init(keyParam);
-
-        return new MacCalculator()
-        {
-            public AlgorithmIdentifier getAlgorithmIdentifier()
-            {
-                return new AlgorithmIdentifier(digestAlgorithm, pbeParams);
-            }
-
-            public OutputStream getOutputStream()
-            {
-                return new MacOutputStream(hMac);
-            }
-
-            public byte[] getMac()
-            {
-                byte[] res = new byte[hMac.getMacSize()];
-
-                hMac.doFinal(res, 0);
-
-                return res;
-            }
-
-            public GenericKey getKey()
-            {
-                return new GenericKey(getAlgorithmIdentifier(), PKCS12ParametersGenerator.PKCS12PasswordToBytes(password));
-            }
-        };
-    }
-
-    static CipherParameters createCipherParameters(ASN1ObjectIdentifier algorithm, ExtendedDigest digest, int blockSize, PKCS12PBEParams pbeParams, char[] password)
-    {
-        PKCS12ParametersGenerator pGen = new PKCS12ParametersGenerator(digest);
-
-        pGen.init(PKCS12ParametersGenerator.PKCS12PasswordToBytes(password), pbeParams.getIV(), pbeParams.getIterations().intValue());
-
-        CipherParameters params;
-
-        if (PKCS12PBEUtils.hasNoIv(algorithm))
-        {
-            params = pGen.generateDerivedParameters(PKCS12PBEUtils.getKeySize(algorithm));
-        }
-        else
-        {
-            params = pGen.generateDerivedParameters(PKCS12PBEUtils.getKeySize(algorithm), blockSize * 8);
-
-            if (PKCS12PBEUtils.isDesAlg(algorithm))
-            {
-                DESedeParameters.setOddParity(((KeyParameter)((ParametersWithIV)params).getParameters()).getKey());
-            }
-        }
-        return params;
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/pkcs/jcajce/JcaPKCS10CertificationRequest.java b/bcpkix/src/main/java/org/bouncycastle/pkcs/jcajce/JcaPKCS10CertificationRequest.java
deleted file mode 100644
index db57d0f..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/pkcs/jcajce/JcaPKCS10CertificationRequest.java
+++ /dev/null
@@ -1,115 +0,0 @@
-package org.bouncycastle.pkcs.jcajce;
-
-import java.io.IOException;
-import java.security.InvalidKeyException;
-import java.security.KeyFactory;
-import java.security.NoSuchAlgorithmException;
-import java.security.NoSuchProviderException;
-import java.security.Provider;
-import java.security.PublicKey;
-import java.security.spec.InvalidKeySpecException;
-import java.security.spec.X509EncodedKeySpec;
-import java.util.Hashtable;
-
-import org.bouncycastle.asn1.pkcs.CertificationRequest;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.bouncycastle.asn1.x9.X9ObjectIdentifiers;
-import org.bouncycastle.jcajce.util.DefaultJcaJceHelper;
-import org.bouncycastle.jcajce.util.JcaJceHelper;
-import org.bouncycastle.jcajce.util.NamedJcaJceHelper;
-import org.bouncycastle.jcajce.util.ProviderJcaJceHelper;
-import org.bouncycastle.pkcs.PKCS10CertificationRequest;
-
-public class JcaPKCS10CertificationRequest
-    extends PKCS10CertificationRequest
-{
-    private static Hashtable keyAlgorithms = new Hashtable();
-
-    static
-    {
-        //
-        // key types
-        //
-        keyAlgorithms.put(PKCSObjectIdentifiers.rsaEncryption, "RSA");
-        keyAlgorithms.put(X9ObjectIdentifiers.id_dsa, "DSA");
-    }
-
-    private JcaJceHelper helper = new DefaultJcaJceHelper();
-
-    public JcaPKCS10CertificationRequest(CertificationRequest certificationRequest)
-    {
-        super(certificationRequest);
-    }
-
-    public JcaPKCS10CertificationRequest(byte[] encoding)
-        throws IOException
-    {
-        super(encoding);
-    }
-
-    public JcaPKCS10CertificationRequest(PKCS10CertificationRequest requestHolder)
-    {
-        super(requestHolder.toASN1Structure());
-    }
-
-    public JcaPKCS10CertificationRequest setProvider(String providerName)
-    {
-        helper = new NamedJcaJceHelper(providerName);
-
-        return this;
-    }
-
-    public JcaPKCS10CertificationRequest setProvider(Provider provider)
-    {
-        helper = new ProviderJcaJceHelper(provider);
-
-        return this;
-    }
-
-    public PublicKey getPublicKey()
-        throws InvalidKeyException, NoSuchAlgorithmException
-    {
-        try
-        {
-            SubjectPublicKeyInfo keyInfo = this.getSubjectPublicKeyInfo();
-            X509EncodedKeySpec xspec = new X509EncodedKeySpec(keyInfo.getEncoded());
-            KeyFactory kFact;
-
-            try
-            {
-                kFact = helper.createKeyFactory(keyInfo.getAlgorithm().getAlgorithm().getId());
-            }
-            catch (NoSuchAlgorithmException e)
-            {
-                //
-                // try an alternate
-                //
-                if (keyAlgorithms.get(keyInfo.getAlgorithm().getAlgorithm()) != null)
-                {
-                    String  keyAlgorithm = (String)keyAlgorithms.get(keyInfo.getAlgorithm().getAlgorithm());
-
-                    kFact = helper.createKeyFactory(keyAlgorithm);
-                }
-                else
-                {
-                    throw e;
-                }
-            }
-
-            return kFact.generatePublic(xspec);
-        }
-        catch (InvalidKeySpecException e)
-        {
-            throw new InvalidKeyException("error decoding public key");
-        }
-        catch (IOException e)
-        {
-            throw new InvalidKeyException("error extracting key encoding");
-        }
-        catch (NoSuchProviderException e)
-        {
-            throw new NoSuchAlgorithmException("cannot find provider: " + e.getMessage());
-        }
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/pkcs/jcajce/JcaPKCS10CertificationRequestBuilder.java b/bcpkix/src/main/java/org/bouncycastle/pkcs/jcajce/JcaPKCS10CertificationRequestBuilder.java
deleted file mode 100644
index 5466e5f..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/pkcs/jcajce/JcaPKCS10CertificationRequestBuilder.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package org.bouncycastle.pkcs.jcajce;
-
-import java.security.PublicKey;
-
-import javax.security.auth.x500.X500Principal;
-
-import org.bouncycastle.asn1.x500.X500Name;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.bouncycastle.pkcs.PKCS10CertificationRequestBuilder;
-
-/**
- * Extension of the PKCS#10 builder to support PublicKey and X500Principal objects.
- */
-public class JcaPKCS10CertificationRequestBuilder
-    extends PKCS10CertificationRequestBuilder
-{
-    /**
-     * Create a PKCS#10 builder for the passed in subject and JCA public key.
-     *
-     * @param subject an X500Name containing the subject associated with the request we are building.
-     * @param publicKey a JCA public key that is to be associated with the request we are building.
-     */
-    public JcaPKCS10CertificationRequestBuilder(X500Name subject, PublicKey publicKey)
-    {
-        super(subject, SubjectPublicKeyInfo.getInstance(publicKey.getEncoded()));
-    }
-
-    /**
-     * Create a PKCS#10 builder for the passed in subject and JCA public key.
-     *
-     * @param subject an X500Principal containing the subject associated with the request we are building.
-     * @param publicKey a JCA public key that is to be associated with the request we are building.
-     */
-    public JcaPKCS10CertificationRequestBuilder(X500Principal subject, PublicKey publicKey)
-    {
-        super(X500Name.getInstance(subject.getEncoded()), SubjectPublicKeyInfo.getInstance(publicKey.getEncoded()));
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/pkcs/jcajce/JcaPKCS12SafeBagBuilder.java b/bcpkix/src/main/java/org/bouncycastle/pkcs/jcajce/JcaPKCS12SafeBagBuilder.java
deleted file mode 100644
index 0af510c..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/pkcs/jcajce/JcaPKCS12SafeBagBuilder.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package org.bouncycastle.pkcs.jcajce;
-
-import java.io.IOException;
-import java.security.PrivateKey;
-import java.security.cert.CertificateEncodingException;
-import java.security.cert.X509Certificate;
-
-import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
-import org.bouncycastle.asn1.x509.Certificate;
-import org.bouncycastle.operator.OutputEncryptor;
-import org.bouncycastle.pkcs.PKCS12SafeBagBuilder;
-import org.bouncycastle.pkcs.PKCSIOException;
-
-public class JcaPKCS12SafeBagBuilder
-    extends PKCS12SafeBagBuilder
-{
-    public JcaPKCS12SafeBagBuilder(X509Certificate certificate)
-        throws IOException
-    {
-        super(convertCert(certificate));
-    }
-
-    private static Certificate convertCert(X509Certificate certificate)
-        throws IOException
-    {
-        try
-        {
-            return Certificate.getInstance(certificate.getEncoded());
-        }
-        catch (CertificateEncodingException e)
-        {
-            throw new PKCSIOException("cannot encode certificate: " + e.getMessage(), e);
-        }
-    }
-
-    public JcaPKCS12SafeBagBuilder(PrivateKey privateKey, OutputEncryptor encryptor)
-    {
-        super(PrivateKeyInfo.getInstance(privateKey.getEncoded()), encryptor);
-    }
-
-    public JcaPKCS12SafeBagBuilder(PrivateKey privateKey)
-    {
-        super(PrivateKeyInfo.getInstance(privateKey.getEncoded()));
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/pkcs/jcajce/JcaPKCS8EncryptedPrivateKeyInfoBuilder.java b/bcpkix/src/main/java/org/bouncycastle/pkcs/jcajce/JcaPKCS8EncryptedPrivateKeyInfoBuilder.java
deleted file mode 100644
index 691288d..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/pkcs/jcajce/JcaPKCS8EncryptedPrivateKeyInfoBuilder.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package org.bouncycastle.pkcs.jcajce;
-
-import java.security.PrivateKey;
-
-import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
-import org.bouncycastle.pkcs.PKCS8EncryptedPrivateKeyInfoBuilder;
-
-public class JcaPKCS8EncryptedPrivateKeyInfoBuilder
-    extends PKCS8EncryptedPrivateKeyInfoBuilder
-{
-    public JcaPKCS8EncryptedPrivateKeyInfoBuilder(PrivateKey privateKey)
-    {
-         super(PrivateKeyInfo.getInstance(privateKey.getEncoded()));
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/pkcs/jcajce/JcePKCS12MacCalculatorBuilder.java b/bcpkix/src/main/java/org/bouncycastle/pkcs/jcajce/JcePKCS12MacCalculatorBuilder.java
deleted file mode 100644
index f04dc85..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/pkcs/jcajce/JcePKCS12MacCalculatorBuilder.java
+++ /dev/null
@@ -1,129 +0,0 @@
-package org.bouncycastle.pkcs.jcajce;
-
-import java.io.OutputStream;
-import java.security.Provider;
-import java.security.SecureRandom;
-
-import javax.crypto.Mac;
-import javax.crypto.SecretKey;
-import javax.crypto.SecretKeyFactory;
-import javax.crypto.spec.PBEKeySpec;
-import javax.crypto.spec.PBEParameterSpec;
-
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.DERNull;
-import org.bouncycastle.asn1.oiw.OIWObjectIdentifiers;
-import org.bouncycastle.asn1.pkcs.PKCS12PBEParams;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.crypto.ExtendedDigest;
-import org.bouncycastle.crypto.generators.PKCS12ParametersGenerator;
-import org.bouncycastle.jcajce.io.MacOutputStream;
-import org.bouncycastle.jcajce.util.DefaultJcaJceHelper;
-import org.bouncycastle.jcajce.util.JcaJceHelper;
-import org.bouncycastle.jcajce.util.NamedJcaJceHelper;
-import org.bouncycastle.jcajce.util.ProviderJcaJceHelper;
-import org.bouncycastle.operator.GenericKey;
-import org.bouncycastle.operator.MacCalculator;
-import org.bouncycastle.operator.OperatorCreationException;
-import org.bouncycastle.pkcs.PKCS12MacCalculatorBuilder;
-
-public class JcePKCS12MacCalculatorBuilder
-    implements PKCS12MacCalculatorBuilder
-{
-    private JcaJceHelper helper = new DefaultJcaJceHelper();
-    private ExtendedDigest digest;
-    private ASN1ObjectIdentifier algorithm;
-
-    private SecureRandom random;
-    private int saltLength;
-    private int iterationCount = 1024;
-
-    public JcePKCS12MacCalculatorBuilder()
-    {
-        this(OIWObjectIdentifiers.idSHA1);
-    }
-
-    public JcePKCS12MacCalculatorBuilder(ASN1ObjectIdentifier hashAlgorithm)
-    {
-        this.algorithm = hashAlgorithm;
-    }
-
-    public JcePKCS12MacCalculatorBuilder setProvider(Provider provider)
-    {
-        this.helper = new ProviderJcaJceHelper(provider);
-
-        return this;
-    }
-
-    public JcePKCS12MacCalculatorBuilder setProvider(String providerName)
-    {
-        this.helper = new NamedJcaJceHelper(providerName);
-
-        return this;
-    }
-
-    public JcePKCS12MacCalculatorBuilder setIterationCount(int iterationCount)
-    {
-        this.iterationCount = iterationCount;
-
-        return this;
-    }
-
-    public AlgorithmIdentifier getDigestAlgorithmIdentifier()
-    {
-        return new AlgorithmIdentifier(algorithm, DERNull.INSTANCE);
-    }
-
-    public MacCalculator build(final char[] password)
-        throws OperatorCreationException
-    {
-        if (random == null)
-        {
-            random = new SecureRandom();
-        }
-
-        try
-        {
-            final Mac mac = helper.createMac(algorithm.getId());
-
-            saltLength = mac.getMacLength();
-            final byte[] salt = new byte[saltLength];
-
-            random.nextBytes(salt);
-
-            SecretKeyFactory keyFact = helper.createSecretKeyFactory(algorithm.getId());
-            PBEParameterSpec defParams = new PBEParameterSpec(salt, iterationCount);
-            PBEKeySpec pbeSpec = new PBEKeySpec(password);
-            SecretKey key = keyFact.generateSecret(pbeSpec);
-
-            mac.init(key, defParams);
-
-            return new MacCalculator()
-            {
-                public AlgorithmIdentifier getAlgorithmIdentifier()
-                {
-                    return new AlgorithmIdentifier(algorithm, new PKCS12PBEParams(salt, iterationCount));
-                }
-
-                public OutputStream getOutputStream()
-                {
-                    return new MacOutputStream(mac);
-                }
-
-                public byte[] getMac()
-                {
-                    return mac.doFinal();
-                }
-
-                public GenericKey getKey()
-                {
-                    return new GenericKey(getAlgorithmIdentifier(), PKCS12ParametersGenerator.PKCS12PasswordToBytes(password));
-                }
-            };
-        }
-        catch (Exception e)
-        {
-            throw new OperatorCreationException("unable to create MAC calculator: " + e.getMessage(), e);
-        }
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/pkcs/jcajce/JcePKCS12MacCalculatorBuilderProvider.java b/bcpkix/src/main/java/org/bouncycastle/pkcs/jcajce/JcePKCS12MacCalculatorBuilderProvider.java
deleted file mode 100644
index ca666d1..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/pkcs/jcajce/JcePKCS12MacCalculatorBuilderProvider.java
+++ /dev/null
@@ -1,108 +0,0 @@
-package org.bouncycastle.pkcs.jcajce;
-
-import java.io.OutputStream;
-import java.security.Provider;
-
-import javax.crypto.Mac;
-import javax.crypto.SecretKey;
-import javax.crypto.SecretKeyFactory;
-import javax.crypto.spec.PBEKeySpec;
-import javax.crypto.spec.PBEParameterSpec;
-
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.DERNull;
-import org.bouncycastle.asn1.pkcs.PKCS12PBEParams;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.crypto.generators.PKCS12ParametersGenerator;
-import org.bouncycastle.jcajce.io.MacOutputStream;
-import org.bouncycastle.jcajce.util.DefaultJcaJceHelper;
-import org.bouncycastle.jcajce.util.JcaJceHelper;
-import org.bouncycastle.jcajce.util.NamedJcaJceHelper;
-import org.bouncycastle.jcajce.util.ProviderJcaJceHelper;
-import org.bouncycastle.operator.GenericKey;
-import org.bouncycastle.operator.MacCalculator;
-import org.bouncycastle.operator.OperatorCreationException;
-import org.bouncycastle.pkcs.PKCS12MacCalculatorBuilder;
-import org.bouncycastle.pkcs.PKCS12MacCalculatorBuilderProvider;
-
-public class JcePKCS12MacCalculatorBuilderProvider
-    implements PKCS12MacCalculatorBuilderProvider
-{
-    private JcaJceHelper helper = new DefaultJcaJceHelper();
-
-    public JcePKCS12MacCalculatorBuilderProvider()
-    {
-    }
-
-    public JcePKCS12MacCalculatorBuilderProvider setProvider(Provider provider)
-    {
-        this.helper = new ProviderJcaJceHelper(provider);
-
-        return this;
-    }
-
-    public JcePKCS12MacCalculatorBuilderProvider setProvider(String providerName)
-    {
-        this.helper = new NamedJcaJceHelper(providerName);
-
-        return this;
-    }
-
-    public PKCS12MacCalculatorBuilder get(final AlgorithmIdentifier algorithmIdentifier)
-    {
-        return new PKCS12MacCalculatorBuilder()
-        {
-            public MacCalculator build(final char[] password)
-                throws OperatorCreationException
-            {
-                final PKCS12PBEParams pbeParams = PKCS12PBEParams.getInstance(algorithmIdentifier.getParameters());
-
-                try
-                {
-                    final ASN1ObjectIdentifier algorithm = algorithmIdentifier.getAlgorithm();
-
-                    final Mac mac = helper.createMac(algorithm.getId());
-
-                    SecretKeyFactory keyFact = helper.createSecretKeyFactory(algorithm.getId());
-                    PBEParameterSpec defParams = new PBEParameterSpec(pbeParams.getIV(), pbeParams.getIterations().intValue());
-                    PBEKeySpec pbeSpec = new PBEKeySpec(password);
-                    SecretKey key = keyFact.generateSecret(pbeSpec);
-
-                    mac.init(key, defParams);
-
-                    return new MacCalculator()
-                    {
-                        public AlgorithmIdentifier getAlgorithmIdentifier()
-                        {
-                            return new AlgorithmIdentifier(algorithm, pbeParams);
-                        }
-
-                        public OutputStream getOutputStream()
-                        {
-                            return new MacOutputStream(mac);
-                        }
-
-                        public byte[] getMac()
-                        {
-                            return mac.doFinal();
-                        }
-
-                        public GenericKey getKey()
-                        {
-                            return new GenericKey(getAlgorithmIdentifier(), PKCS12ParametersGenerator.PKCS12PasswordToBytes(password));
-                        }
-                    };
-                }
-                catch (Exception e)
-                {
-                    throw new OperatorCreationException("unable to create MAC calculator: " + e.getMessage(), e);
-                }
-            }
-
-            public AlgorithmIdentifier getDigestAlgorithmIdentifier()
-            {
-                return new AlgorithmIdentifier(algorithmIdentifier.getAlgorithm(), DERNull.INSTANCE);
-            }
-        };
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/pkcs/jcajce/JcePKCSPBEInputDecryptorProviderBuilder.java b/bcpkix/src/main/java/org/bouncycastle/pkcs/jcajce/JcePKCSPBEInputDecryptorProviderBuilder.java
deleted file mode 100644
index 1b6d066..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/pkcs/jcajce/JcePKCSPBEInputDecryptorProviderBuilder.java
+++ /dev/null
@@ -1,177 +0,0 @@
-package org.bouncycastle.pkcs.jcajce;
-
-import java.io.InputStream;
-import java.security.Provider;
-
-import javax.crypto.Cipher;
-import javax.crypto.CipherInputStream;
-import javax.crypto.SecretKey;
-import javax.crypto.SecretKeyFactory;
-import javax.crypto.spec.IvParameterSpec;
-import javax.crypto.spec.PBEKeySpec;
-import javax.crypto.spec.PBEParameterSpec;
-
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.cryptopro.GOST28147Parameters;
-import org.bouncycastle.asn1.pkcs.PBES2Parameters;
-import org.bouncycastle.asn1.pkcs.PBKDF2Params;
-import org.bouncycastle.asn1.pkcs.PKCS12PBEParams;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.jcajce.provider.symmetric.util.BCPBEKey;
-import org.bouncycastle.jcajce.spec.GOST28147ParameterSpec;
-import org.bouncycastle.jcajce.spec.PBKDF2KeySpec;
-import org.bouncycastle.jcajce.util.DefaultJcaJceHelper;
-import org.bouncycastle.jcajce.util.JcaJceHelper;
-import org.bouncycastle.jcajce.util.NamedJcaJceHelper;
-import org.bouncycastle.jcajce.util.ProviderJcaJceHelper;
-import org.bouncycastle.operator.DefaultSecretKeySizeProvider;
-import org.bouncycastle.operator.InputDecryptor;
-import org.bouncycastle.operator.InputDecryptorProvider;
-import org.bouncycastle.operator.OperatorCreationException;
-import org.bouncycastle.operator.SecretKeySizeProvider;
-
-public class JcePKCSPBEInputDecryptorProviderBuilder
-{
-    private JcaJceHelper helper = new DefaultJcaJceHelper();
-    private boolean      wrongPKCS12Zero = false;
-    private SecretKeySizeProvider keySizeProvider = DefaultSecretKeySizeProvider.INSTANCE;
-
-    public JcePKCSPBEInputDecryptorProviderBuilder()
-    {
-    }
-
-    public JcePKCSPBEInputDecryptorProviderBuilder setProvider(Provider provider)
-    {
-        this.helper = new ProviderJcaJceHelper(provider);
-
-        return this;
-    }
-
-    public JcePKCSPBEInputDecryptorProviderBuilder setProvider(String providerName)
-    {
-        this.helper = new NamedJcaJceHelper(providerName);
-
-        return this;
-    }
-
-    public JcePKCSPBEInputDecryptorProviderBuilder setTryWrongPKCS12Zero(boolean tryWrong)
-    {
-        this.wrongPKCS12Zero = tryWrong;
-
-        return this;
-    }
-
-    /**
-     * Set the lookup provider of AlgorithmIdentifier returning key_size_in_bits used to
-     * handle PKCS5 decryption.
-     *
-     * @param keySizeProvider  a provider of integer secret key sizes.
-     *
-     * @return the current builder.
-     */
-    public JcePKCSPBEInputDecryptorProviderBuilder setKeySizeProvider(SecretKeySizeProvider keySizeProvider)
-    {
-        this.keySizeProvider = keySizeProvider;
-
-        return this;
-    }
-
-    public InputDecryptorProvider build(final char[] password)
-    {
-        return new InputDecryptorProvider()
-        {
-            private Cipher cipher;
-            private SecretKey key;
-            private AlgorithmIdentifier encryptionAlg;
-
-            public InputDecryptor get(final AlgorithmIdentifier algorithmIdentifier)
-                throws OperatorCreationException
-            {
-                ASN1ObjectIdentifier algorithm = algorithmIdentifier.getAlgorithm();
-
-                try
-                {
-                    if (algorithm.on(PKCSObjectIdentifiers.pkcs_12PbeIds))
-                    {
-                        PKCS12PBEParams pbeParams = PKCS12PBEParams.getInstance(algorithmIdentifier.getParameters());
-
-                        PBEKeySpec pbeSpec = new PBEKeySpec(password);
-
-                        SecretKeyFactory keyFact = helper.createSecretKeyFactory(algorithm.getId());
-
-                        PBEParameterSpec defParams = new PBEParameterSpec(
-                            pbeParams.getIV(),
-                            pbeParams.getIterations().intValue());
-
-                        key = keyFact.generateSecret(pbeSpec);
-
-                        if (key instanceof BCPBEKey)
-                        {
-                            ((BCPBEKey)key).setTryWrongPKCS12Zero(wrongPKCS12Zero);
-                        }
-
-                        cipher = helper.createCipher(algorithm.getId());
-
-                        cipher.init(Cipher.DECRYPT_MODE, key, defParams);
-
-                        encryptionAlg = algorithmIdentifier;
-                    }
-                    else if (algorithm.equals(PKCSObjectIdentifiers.id_PBES2))
-                    {
-                        PBES2Parameters alg = PBES2Parameters.getInstance(algorithmIdentifier.getParameters());
-                        PBKDF2Params func = PBKDF2Params.getInstance(alg.getKeyDerivationFunc().getParameters());
-                        AlgorithmIdentifier encScheme = AlgorithmIdentifier.getInstance(alg.getEncryptionScheme());
-
-                        SecretKeyFactory keyFact = helper.createSecretKeyFactory(alg.getKeyDerivationFunc().getAlgorithm().getId());
-
-                        if (func.isDefaultPrf())
-                        {
-                            key = keyFact.generateSecret(new PBEKeySpec(password, func.getSalt(), func.getIterationCount().intValue(), keySizeProvider.getKeySize(encScheme)));
-                        }
-                        else
-                        {
-                            key = keyFact.generateSecret(new PBKDF2KeySpec(password, func.getSalt(), func.getIterationCount().intValue(), keySizeProvider.getKeySize(encScheme), func.getPrf()));
-                        }
-
-                        cipher = helper.createCipher(alg.getEncryptionScheme().getAlgorithm().getId());
-
-                        encryptionAlg = AlgorithmIdentifier.getInstance(alg.getEncryptionScheme());
-
-                        ASN1Encodable encParams = alg.getEncryptionScheme().getParameters();
-                        if (encParams instanceof ASN1OctetString)
-                        {
-                            cipher.init(Cipher.DECRYPT_MODE, key, new IvParameterSpec(ASN1OctetString.getInstance(encParams).getOctets()));
-                        }
-                        else
-                        {
-                            // TODO: at the moment it's just GOST, but...
-                            GOST28147Parameters gParams = GOST28147Parameters.getInstance(encParams);
-
-                            cipher.init(Cipher.DECRYPT_MODE, key, new GOST28147ParameterSpec(gParams.getEncryptionParamSet(), gParams.getIV()));
-                        }
-                    }
-                }
-                catch (Exception e)
-                {
-                    throw new OperatorCreationException("unable to create InputDecryptor: " + e.getMessage(), e);
-                }
-
-                return new InputDecryptor()
-                {
-                    public AlgorithmIdentifier getAlgorithmIdentifier()
-                    {
-                        return encryptionAlg;
-                    }
-
-                    public InputStream getInputStream(InputStream input)
-                    {
-                        return new CipherInputStream(input, cipher);
-                    }
-                };
-            }
-        };
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/pkcs/jcajce/JcePKCSPBEOutputEncryptorBuilder.java b/bcpkix/src/main/java/org/bouncycastle/pkcs/jcajce/JcePKCSPBEOutputEncryptorBuilder.java
deleted file mode 100644
index 34a8883..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/pkcs/jcajce/JcePKCSPBEOutputEncryptorBuilder.java
+++ /dev/null
@@ -1,192 +0,0 @@
-package org.bouncycastle.pkcs.jcajce;
-
-import java.io.OutputStream;
-import java.security.Provider;
-import java.security.SecureRandom;
-
-import javax.crypto.Cipher;
-import javax.crypto.CipherOutputStream;
-import javax.crypto.SecretKey;
-import javax.crypto.SecretKeyFactory;
-import javax.crypto.spec.PBEKeySpec;
-import javax.crypto.spec.PBEParameterSpec;
-
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.bc.BCObjectIdentifiers;
-import org.bouncycastle.asn1.pkcs.EncryptionScheme;
-import org.bouncycastle.asn1.pkcs.KeyDerivationFunc;
-import org.bouncycastle.asn1.pkcs.PBES2Parameters;
-import org.bouncycastle.asn1.pkcs.PBKDF2Params;
-import org.bouncycastle.asn1.pkcs.PKCS12PBEParams;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.crypto.PBEParametersGenerator;
-import org.bouncycastle.jcajce.util.DefaultJcaJceHelper;
-import org.bouncycastle.jcajce.util.JcaJceHelper;
-import org.bouncycastle.jcajce.util.NamedJcaJceHelper;
-import org.bouncycastle.jcajce.util.ProviderJcaJceHelper;
-import org.bouncycastle.operator.DefaultSecretKeySizeProvider;
-import org.bouncycastle.operator.GenericKey;
-import org.bouncycastle.operator.OperatorCreationException;
-import org.bouncycastle.operator.OutputEncryptor;
-import org.bouncycastle.operator.SecretKeySizeProvider;
-
-public class JcePKCSPBEOutputEncryptorBuilder
-{
-    private JcaJceHelper helper = new DefaultJcaJceHelper();
-    private ASN1ObjectIdentifier algorithm;
-    private ASN1ObjectIdentifier keyEncAlgorithm;
-    private SecureRandom random;
-    private SecretKeySizeProvider keySizeProvider = DefaultSecretKeySizeProvider.INSTANCE;
-    private int iterationCount = 1024;
-
-    public JcePKCSPBEOutputEncryptorBuilder(ASN1ObjectIdentifier algorithm)
-    {
-        if (isPKCS12(algorithm))
-        {
-            this.algorithm = algorithm;
-            this.keyEncAlgorithm = algorithm;
-        }
-        else
-        {
-            this.algorithm = PKCSObjectIdentifiers.id_PBES2;
-            this.keyEncAlgorithm = algorithm;
-        }
-    }
-
-    public JcePKCSPBEOutputEncryptorBuilder setProvider(Provider provider)
-    {
-        this.helper = new ProviderJcaJceHelper(provider);
-
-        return this;
-    }
-
-    public JcePKCSPBEOutputEncryptorBuilder setProvider(String providerName)
-    {
-        this.helper = new NamedJcaJceHelper(providerName);
-
-        return this;
-    }
-
-    /**
-     * Set the lookup provider of AlgorithmIdentifier returning key_size_in_bits used to
-     * handle PKCS5 decryption.
-     *
-     * @param keySizeProvider  a provider of integer secret key sizes.
-     *
-     * @return the current builder.
-     */
-    public JcePKCSPBEOutputEncryptorBuilder setKeySizeProvider(SecretKeySizeProvider keySizeProvider)
-    {
-        this.keySizeProvider = keySizeProvider;
-
-        return this;
-    }
-
-    /**
-     * Set the iteration count for the PBE calculation.
-     *
-     * @param iterationCount the iteration count to apply to the key creation.
-     * @return the current builder.
-     */
-    public JcePKCSPBEOutputEncryptorBuilder setIterationCount(int iterationCount)
-    {
-        this.iterationCount = iterationCount;
-
-        return this;
-    }
-
-    public OutputEncryptor build(final char[] password)
-        throws OperatorCreationException
-    {
-        final Cipher cipher;
-        SecretKey key;
-
-        if (random == null)
-        {
-            random = new SecureRandom();
-        }
-
-        final AlgorithmIdentifier encryptionAlg;
-        final byte[] salt = new byte[20];
-
-        random.nextBytes(salt);
-
-        try
-        {
-            if (algorithm.on(PKCSObjectIdentifiers.pkcs_12PbeIds))
-            {
-                PBEKeySpec pbeSpec = new PBEKeySpec(password);
-
-                SecretKeyFactory keyFact = helper.createSecretKeyFactory(algorithm.getId());
-
-                PBEParameterSpec defParams = new PBEParameterSpec(salt, iterationCount);
-
-                key = keyFact.generateSecret(pbeSpec);
-
-                cipher = helper.createCipher(algorithm.getId());
-
-                cipher.init(Cipher.ENCRYPT_MODE, key, defParams);
-
-                encryptionAlg = new AlgorithmIdentifier(algorithm, new PKCS12PBEParams(salt, iterationCount));
-            }
-            else if (algorithm.equals(PKCSObjectIdentifiers.id_PBES2))
-            {
-                SecretKeyFactory keyFact = helper.createSecretKeyFactory(PKCSObjectIdentifiers.id_PBKDF2.getId());
-
-                key = keyFact.generateSecret(new PBEKeySpec(password, salt, iterationCount, keySizeProvider.getKeySize(new AlgorithmIdentifier(keyEncAlgorithm))));
-
-                cipher = helper.createCipher(keyEncAlgorithm.getId());
-
-                cipher.init(Cipher.ENCRYPT_MODE, key, random);
-
-                PBES2Parameters algParams = new PBES2Parameters(
-                                   new KeyDerivationFunc(PKCSObjectIdentifiers.id_PBKDF2, new PBKDF2Params(salt, iterationCount)),
-                                   new EncryptionScheme(keyEncAlgorithm, ASN1Primitive.fromByteArray(cipher.getParameters().getEncoded())));
-
-                encryptionAlg = new AlgorithmIdentifier(algorithm, algParams);
-            }
-            else
-            {
-                throw new OperatorCreationException("unrecognised algorithm");
-            }
-
-            return new OutputEncryptor()
-            {
-                public AlgorithmIdentifier getAlgorithmIdentifier()
-                {
-                    return encryptionAlg;
-                }
-
-                public OutputStream getOutputStream(OutputStream out)
-                {
-                    return new CipherOutputStream(out, cipher);
-                }
-
-                public GenericKey getKey()
-                {
-                    if (isPKCS12(encryptionAlg.getAlgorithm()))
-                    {
-                        return new GenericKey(encryptionAlg, PBEParametersGenerator.PKCS5PasswordToBytes(password));
-                    }
-                    else
-                    {
-                        return new GenericKey(encryptionAlg, PBEParametersGenerator.PKCS12PasswordToBytes(password));
-                    }
-                }
-            };
-        }
-        catch (Exception e)
-        {
-            throw new OperatorCreationException("unable to create OutputEncryptor: " + e.getMessage(), e);
-        }
-    }
-
-    private boolean isPKCS12(ASN1ObjectIdentifier algorithm)
-    {
-        return algorithm.on(PKCSObjectIdentifiers.pkcs_12PbeIds)
-            || algorithm.on(BCObjectIdentifiers.bc_pbe_sha1_pkcs12)
-            || algorithm.on(BCObjectIdentifiers.bc_pbe_sha256_pkcs12);
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/pkcs/jcajce/package.html b/bcpkix/src/main/java/org/bouncycastle/pkcs/jcajce/package.html
deleted file mode 100644
index 9b10dc4..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/pkcs/jcajce/package.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-        "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<body bgcolor="#ffffff">
-JCA extensions to the PKCS#10 certification request package.
-</body>
-</html>
\ No newline at end of file
diff --git a/bcpkix/src/main/java/org/bouncycastle/pkcs/package.html b/bcpkix/src/main/java/org/bouncycastle/pkcs/package.html
deleted file mode 100644
index c83de7c..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/pkcs/package.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-        "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<body bgcolor="#ffffff">
-Basic support package for handling and creating PKCS#10 certification requests, PKCS#8 encrypted keys and PKCS#12 keys stores.
-</body>
-</html>
\ No newline at end of file
diff --git a/bcpkix/src/main/java/org/bouncycastle/pkcs/test/AllTests.java b/bcpkix/src/main/java/org/bouncycastle/pkcs/test/AllTests.java
deleted file mode 100644
index 809c5c5..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/pkcs/test/AllTests.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.bouncycastle.pkcs.test;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-public class AllTests
-    extends TestCase
-{
-    public static void main (String[] args)
-    {
-        junit.textui.TestRunner.run(suite());
-    }
-    
-    public static Test suite()
-    {
-        TestSuite suite = new TestSuite("PKCS Tests");
-        
-        suite.addTestSuite(PfxPduTest.class);
-        suite.addTestSuite(PKCS10Test.class);
-
-        return new BCTestSetup(suite);
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/pkcs/test/BCTestSetup.java b/bcpkix/src/main/java/org/bouncycastle/pkcs/test/BCTestSetup.java
deleted file mode 100644
index 7a13561..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/pkcs/test/BCTestSetup.java
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright (c) 2005 The Legion Of The Bouncy Castle (http://www.bouncycastle.org)
-package org.bouncycastle.pkcs.test;
-
-import java.security.Security;
-
-import junit.extensions.TestSetup;
-import junit.framework.Test;
-
-class BCTestSetup
-    extends TestSetup
-{
-    public BCTestSetup(Test test)
-    {
-        super(test);
-    }
-
-    protected void setUp()
-    {
-        Security.addProvider(new org.bouncycastle.jce.provider.BouncyCastleProvider());
-    }
-
-    protected void tearDown()
-    {
-        Security.removeProvider("BC");
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/pkcs/test/PKCS10Test.java b/bcpkix/src/main/java/org/bouncycastle/pkcs/test/PKCS10Test.java
deleted file mode 100644
index a0c13d2..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/pkcs/test/PKCS10Test.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package org.bouncycastle.pkcs.test;
-
-import java.math.BigInteger;
-import java.security.KeyFactory;
-import java.security.PrivateKey;
-import java.security.PublicKey;
-import java.security.spec.RSAPrivateCrtKeySpec;
-import java.security.spec.RSAPublicKeySpec;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import org.bouncycastle.asn1.pkcs.CertificationRequest;
-import org.bouncycastle.asn1.x500.X500Name;
-import org.bouncycastle.operator.jcajce.JcaContentSignerBuilder;
-import org.bouncycastle.pkcs.PKCS10CertificationRequest;
-import org.bouncycastle.pkcs.PKCS10CertificationRequestBuilder;
-import org.bouncycastle.pkcs.jcajce.JcaPKCS10CertificationRequestBuilder;
-
-public class PKCS10Test
-    extends TestCase
-{
-     //
-    // personal keys
-    //
-    private static final RSAPublicKeySpec pubKeySpec = new RSAPublicKeySpec(
-        new BigInteger("b4a7e46170574f16a97082b22be58b6a2a629798419be12872a4bdba626cfae9900f76abfb12139dce5de56564fab2b6543165a040c606887420e33d91ed7ed7", 16),
-        new BigInteger("11", 16));
-
-    private static final RSAPrivateCrtKeySpec privKeySpec = new RSAPrivateCrtKeySpec(
-        new BigInteger("b4a7e46170574f16a97082b22be58b6a2a629798419be12872a4bdba626cfae9900f76abfb12139dce5de56564fab2b6543165a040c606887420e33d91ed7ed7", 16),
-        new BigInteger("11", 16),
-        new BigInteger("9f66f6b05410cd503b2709e88115d55daced94d1a34d4e32bf824d0dde6028ae79c5f07b580f5dce240d7111f7ddb130a7945cd7d957d1920994da389f490c89", 16),
-        new BigInteger("c0a0758cdf14256f78d4708c86becdead1b50ad4ad6c5c703e2168fbf37884cb", 16),
-        new BigInteger("f01734d7960ea60070f1b06f2bb81bfac48ff192ae18451d5e56c734a5aab8a5", 16),
-        new BigInteger("b54bb9edff22051d9ee60f9351a48591b6500a319429c069a3e335a1d6171391", 16),
-        new BigInteger("d3d83daf2a0cecd3367ae6f8ae1aeb82e9ac2f816c6fc483533d8297dd7884cd", 16),
-        new BigInteger("b8f52fc6f38593dabb661d3f50f8897f8106eee68b1bce78a95b132b4e5b5d19", 16));
-
-    public void testLeaveOffEmpty()
-        throws Exception
-    {
-        KeyFactory keyFact = KeyFactory.getInstance("RSA", "BC");
-        PublicKey  pubKey = keyFact.generatePublic(pubKeySpec);
-        PrivateKey privKey = keyFact.generatePrivate(privKeySpec);
-
-        PKCS10CertificationRequestBuilder pkcs10Builder = new JcaPKCS10CertificationRequestBuilder(new X500Name("CN=Test"), pubKey);
-
-        PKCS10CertificationRequest request = pkcs10Builder.build(new JcaContentSignerBuilder("SHA1withRSA").setProvider("BC").build(privKey));
-
-        assertEquals(0, request.getAttributes().length);
-        assertNotNull(CertificationRequest.getInstance(request.getEncoded()).getCertificationRequestInfo().getAttributes());
-
-        pkcs10Builder.setLeaveOffEmptyAttributes(true);
-
-        request = pkcs10Builder.build(new JcaContentSignerBuilder("SHA1withRSA").setProvider("BC").build(privKey));
-
-        assertEquals(0, request.getAttributes().length);
-        assertNull(CertificationRequest.getInstance(request.getEncoded()).getCertificationRequestInfo().getAttributes());
-
-        pkcs10Builder.setLeaveOffEmptyAttributes(false);
-
-        request = pkcs10Builder.build(new JcaContentSignerBuilder("SHA1withRSA").setProvider("BC").build(privKey));
-
-        assertEquals(0, request.getAttributes().length);
-        assertNotNull(CertificationRequest.getInstance(request.getEncoded()).getCertificationRequestInfo().getAttributes());
-    }
-
-    public static void main(String args[])
-    {
-        junit.textui.TestRunner.run(suite());
-    }
-
-    public static Test suite()
-    {
-        return new BCTestSetup(new TestSuite(PKCS10Test.class));
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/pkcs/test/PfxPduTest.java b/bcpkix/src/main/java/org/bouncycastle/pkcs/test/PfxPduTest.java
deleted file mode 100644
index 931ed12..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/pkcs/test/PfxPduTest.java
+++ /dev/null
@@ -1,1255 +0,0 @@
-package org.bouncycastle.pkcs.test;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.math.BigInteger;
-import java.security.*;
-import java.security.cert.Certificate;
-import java.security.cert.X509Certificate;
-import java.security.spec.RSAPrivateCrtKeySpec;
-import java.security.spec.RSAPublicKeySpec;
-import java.util.Date;
-
-import junit.framework.TestCase;
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1Encoding;
-import org.bouncycastle.asn1.DERBMPString;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.cryptopro.CryptoProObjectIdentifiers;
-import org.bouncycastle.asn1.nist.NISTObjectIdentifiers;
-import org.bouncycastle.asn1.pkcs.Attribute;
-import org.bouncycastle.asn1.pkcs.ContentInfo;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
-import org.bouncycastle.asn1.x500.X500Name;
-import org.bouncycastle.asn1.x500.X500NameBuilder;
-import org.bouncycastle.asn1.x500.style.BCStyle;
-import org.bouncycastle.asn1.x509.BasicConstraints;
-import org.bouncycastle.asn1.x509.Extension;
-import org.bouncycastle.asn1.x509.SubjectKeyIdentifier;
-import org.bouncycastle.cert.X509CertificateHolder;
-import org.bouncycastle.cert.X509v1CertificateBuilder;
-import org.bouncycastle.cert.X509v3CertificateBuilder;
-import org.bouncycastle.cert.jcajce.JcaX500NameUtil;
-import org.bouncycastle.cert.jcajce.JcaX509CertificateConverter;
-import org.bouncycastle.cert.jcajce.JcaX509ExtensionUtils;
-import org.bouncycastle.cert.jcajce.JcaX509v1CertificateBuilder;
-import org.bouncycastle.cert.jcajce.JcaX509v3CertificateBuilder;
-import org.bouncycastle.crypto.engines.DESedeEngine;
-import org.bouncycastle.crypto.engines.RC2Engine;
-import org.bouncycastle.crypto.modes.CBCBlockCipher;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.operator.InputDecryptorProvider;
-import org.bouncycastle.operator.OutputEncryptor;
-import org.bouncycastle.operator.bc.BcDefaultDigestProvider;
-import org.bouncycastle.operator.jcajce.JcaContentSignerBuilder;
-import org.bouncycastle.pkcs.PKCS12PfxPdu;
-import org.bouncycastle.pkcs.PKCS12PfxPduBuilder;
-import org.bouncycastle.pkcs.PKCS12SafeBag;
-import org.bouncycastle.pkcs.PKCS12SafeBagBuilder;
-import org.bouncycastle.pkcs.PKCS12SafeBagFactory;
-import org.bouncycastle.pkcs.PKCS8EncryptedPrivateKeyInfo;
-import org.bouncycastle.pkcs.PKCS8EncryptedPrivateKeyInfoBuilder;
-import org.bouncycastle.pkcs.PKCSException;
-import org.bouncycastle.pkcs.bc.BcPKCS12MacCalculatorBuilder;
-import org.bouncycastle.pkcs.bc.BcPKCS12MacCalculatorBuilderProvider;
-import org.bouncycastle.pkcs.bc.BcPKCS12PBEInputDecryptorProviderBuilder;
-import org.bouncycastle.pkcs.bc.BcPKCS12PBEOutputEncryptorBuilder;
-import org.bouncycastle.pkcs.jcajce.JcaPKCS12SafeBagBuilder;
-import org.bouncycastle.pkcs.jcajce.JcaPKCS8EncryptedPrivateKeyInfoBuilder;
-import org.bouncycastle.pkcs.jcajce.JcePKCS12MacCalculatorBuilder;
-import org.bouncycastle.pkcs.jcajce.JcePKCS12MacCalculatorBuilderProvider;
-import org.bouncycastle.pkcs.jcajce.JcePKCSPBEInputDecryptorProviderBuilder;
-import org.bouncycastle.pkcs.jcajce.JcePKCSPBEOutputEncryptorBuilder;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.encoders.Base64;
-
-public class PfxPduTest
-    extends TestCase
-{
-    private static final String BC = BouncyCastleProvider.PROVIDER_NAME;
-    private static final char[] passwd = {'h', 'e', 'l', 'l', 'o', ' ', 'w', 'o', 'r', 'l', 'd'};
-
-    //
-    // personal keys
-    //
-    private static final RSAPublicKeySpec pubKeySpec = new RSAPublicKeySpec(
-        new BigInteger("b4a7e46170574f16a97082b22be58b6a2a629798419be12872a4bdba626cfae9900f76abfb12139dce5de56564fab2b6543165a040c606887420e33d91ed7ed7", 16),
-        new BigInteger("11", 16));
-
-    private static final RSAPrivateCrtKeySpec privKeySpec = new RSAPrivateCrtKeySpec(
-        new BigInteger("b4a7e46170574f16a97082b22be58b6a2a629798419be12872a4bdba626cfae9900f76abfb12139dce5de56564fab2b6543165a040c606887420e33d91ed7ed7", 16),
-        new BigInteger("11", 16),
-        new BigInteger("9f66f6b05410cd503b2709e88115d55daced94d1a34d4e32bf824d0dde6028ae79c5f07b580f5dce240d7111f7ddb130a7945cd7d957d1920994da389f490c89", 16),
-        new BigInteger("c0a0758cdf14256f78d4708c86becdead1b50ad4ad6c5c703e2168fbf37884cb", 16),
-        new BigInteger("f01734d7960ea60070f1b06f2bb81bfac48ff192ae18451d5e56c734a5aab8a5", 16),
-        new BigInteger("b54bb9edff22051d9ee60f9351a48591b6500a319429c069a3e335a1d6171391", 16),
-        new BigInteger("d3d83daf2a0cecd3367ae6f8ae1aeb82e9ac2f816c6fc483533d8297dd7884cd", 16),
-        new BigInteger("b8f52fc6f38593dabb661d3f50f8897f8106eee68b1bce78a95b132b4e5b5d19", 16));
-
-    //
-    // intermediate keys.
-    //
-    private static final RSAPublicKeySpec intPubKeySpec = new RSAPublicKeySpec(
-        new BigInteger("8de0d113c5e736969c8d2b047a243f8fe18edad64cde9e842d3669230ca486f7cfdde1f8eec54d1905fff04acc85e61093e180cadc6cea407f193d44bb0e9449b8dbb49784cd9e36260c39e06a947299978c6ed8300724e887198cfede20f3fbde658fa2bd078be946a392bd349f2b49c486e20c405588e306706c9017308e69", 16),
-        new BigInteger("ffff", 16));
-
-
-    private static final RSAPrivateCrtKeySpec intPrivKeySpec = new RSAPrivateCrtKeySpec(
-        new BigInteger("8de0d113c5e736969c8d2b047a243f8fe18edad64cde9e842d3669230ca486f7cfdde1f8eec54d1905fff04acc85e61093e180cadc6cea407f193d44bb0e9449b8dbb49784cd9e36260c39e06a947299978c6ed8300724e887198cfede20f3fbde658fa2bd078be946a392bd349f2b49c486e20c405588e306706c9017308e69", 16),
-        new BigInteger("ffff", 16),
-        new BigInteger("7deb1b194a85bcfd29cf871411468adbc987650903e3bacc8338c449ca7b32efd39ffc33bc84412fcd7df18d23ce9d7c25ea910b1ae9985373e0273b4dca7f2e0db3b7314056ac67fd277f8f89cf2fd73c34c6ca69f9ba477143d2b0e2445548aa0b4a8473095182631da46844c356f5e5c7522eb54b5a33f11d730ead9c0cff", 16),
-        new BigInteger("ef4cede573cea47f83699b814de4302edb60eefe426c52e17bd7870ec7c6b7a24fe55282ebb73775f369157726fcfb988def2b40350bdca9e5b418340288f649", 16),
-        new BigInteger("97c7737d1b9a0088c3c7b528539247fd2a1593e7e01cef18848755be82f4a45aa093276cb0cbf118cb41117540a78f3fc471ba5d69f0042274defc9161265721", 16),
-        new BigInteger("6c641094e24d172728b8da3c2777e69adfd0839085be7e38c7c4a2dd00b1ae969f2ec9d23e7e37090fcd449a40af0ed463fe1c612d6810d6b4f58b7bfa31eb5f", 16),
-        new BigInteger("70b7123e8e69dfa76feb1236d0a686144b00e9232ed52b73847e74ef3af71fb45ccb24261f40d27f98101e230cf27b977a5d5f1f15f6cf48d5cb1da2a3a3b87f", 16),
-        new BigInteger("e38f5750d97e270996a286df2e653fd26c242106436f5bab0f4c7a9e654ce02665d5a281f2c412456f2d1fa26586ef04a9adac9004ca7f913162cb28e13bf40d", 16));
-
-    //
-    // ca keys
-    //
-    private static final RSAPublicKeySpec caPubKeySpec = new RSAPublicKeySpec(
-        new BigInteger("b259d2d6e627a768c94be36164c2d9fc79d97aab9253140e5bf17751197731d6f7540d2509e7b9ffee0a70a6e26d56e92d2edd7f85aba85600b69089f35f6bdbf3c298e05842535d9f064e6b0391cb7d306e0a2d20c4dfb4e7b49a9640bdea26c10ad69c3f05007ce2513cee44cfe01998e62b6c3637d3fc0391079b26ee36d5", 16),
-        new BigInteger("11", 16));
-
-    private static final RSAPrivateCrtKeySpec caPrivKeySpec = new RSAPrivateCrtKeySpec(
-        new BigInteger("b259d2d6e627a768c94be36164c2d9fc79d97aab9253140e5bf17751197731d6f7540d2509e7b9ffee0a70a6e26d56e92d2edd7f85aba85600b69089f35f6bdbf3c298e05842535d9f064e6b0391cb7d306e0a2d20c4dfb4e7b49a9640bdea26c10ad69c3f05007ce2513cee44cfe01998e62b6c3637d3fc0391079b26ee36d5", 16),
-        new BigInteger("11", 16),
-        new BigInteger("92e08f83cc9920746989ca5034dcb384a094fb9c5a6288fcc4304424ab8f56388f72652d8fafc65a4b9020896f2cde297080f2a540e7b7ce5af0b3446e1258d1dd7f245cf54124b4c6e17da21b90a0ebd22605e6f45c9f136d7a13eaac1c0f7487de8bd6d924972408ebb58af71e76fd7b012a8d0e165f3ae2e5077a8648e619", 16),
-        new BigInteger("f75e80839b9b9379f1cf1128f321639757dba514642c206bbbd99f9a4846208b3e93fbbe5e0527cc59b1d4b929d9555853004c7c8b30ee6a213c3d1bb7415d03", 16),
-        new BigInteger("b892d9ebdbfc37e397256dd8a5d3123534d1f03726284743ddc6be3a709edb696fc40c7d902ed804c6eee730eee3d5b20bf6bd8d87a296813c87d3b3cc9d7947", 16),
-        new BigInteger("1d1a2d3ca8e52068b3094d501c9a842fec37f54db16e9a67070a8b3f53cc03d4257ad252a1a640eadd603724d7bf3737914b544ae332eedf4f34436cac25ceb5", 16),
-        new BigInteger("6c929e4e81672fef49d9c825163fec97c4b7ba7acb26c0824638ac22605d7201c94625770984f78a56e6e25904fe7db407099cad9b14588841b94f5ab498dded", 16),
-        new BigInteger("dae7651ee69ad1d081ec5e7188ae126f6004ff39556bde90e0b870962fa7b926d070686d8244fe5a9aa709a95686a104614834b0ada4b10f53197a5cb4c97339", 16));
-
-    //
-    // pkcs-12 pfx-pdu
-    //
-    private String pkcs12Pass = "hello world";
-
-    private byte[]  pkcs12 = Base64.decode(
-          "MIACAQMwgAYJKoZIhvcNAQcBoIAkgAQBMAQBgAQBMAQBgAQBBgQBCQQJKoZI"
-        + "hvcNAQcBBAGgBAGABAEkBAGABAEEBAEBBAEwBAEEBAEDBAOCAzQEAQQEAQEE"
-        + "ATAEAQQEAQMEA4IDMAQBBAQBAQQBBgQBBAQBAQQBCwQBBAQBCwQLKoZIhvcN"
-        + "AQwKAQIEAQQEAQEEAaAEAQQEAQMEA4ICpQQBBAQBAQQBMAQBBAQBAwQDggKh"
-        + "BAEEBAEBBAEwBAEEBAEBBAEbBAEEBAEBBAEGBAEEBAEBBAEKBAEEBAEKBAoq"
-        + "hkiG9w0BDAEDBAEEBAEPBA8wDQQIoagiwNZPJR4CAQEEAQQEAQEEAQQEAQQE"
-        + "AQMEA4ICgAQBBAQDggKABIICgEPG0XlhMFyrs4ZWDrvEzl51ICfXd6K2ql2l"
-        + "nnxhszUbigtSj6x49VEx4PfOB9fQFeidc5L5An+nKp646NBMIY0UwXGs8BLQ"
-        + "au59jtOs987+l7QYIvl6fdGUIuLPhVSnZZDyqD+HQjU/0/ccKFHRif4tlEQq"
-        + "aErvZbFeH0pg4ijf1HfgX6gBJGRKdO+msa4qKGnZdHCSLZehyyxvxAmURetg"
-        + "yhtEl7RmedTB+4TDs7atekqxkNlD9tfwDUX6sb0IH6qbEA6P/DlVMdaD54Cl"
-        + "QDxRzOfIIjklZhv5OMFWtPK0aYPcqyxzLpw1qRAyoTVXpidkj/hpIpgCVBP/"
-        + "k5s2+WdGbLgA/4/zSrF6feRCE5llzM2IGxiHVq4oPzzngl3R+Fi5VCPDMcuW"
-        + "NRuIOzJA+RNV2NPOE/P3knThDnwiImq+rfxmvZ1u6T06s20RmWK6cxp7fTEw"
-        + "lQ9BOsv+mmyV8dr6cYJq4IlRzHdFOyEUBDwfHThyribNKKobO50xh2f93xYj"
-        + "Rn5UMOQBJIe3b7OKZt5HOIMrJSZO02IZgvImi9yQWi96PnWa419D1cAsLWvM"
-        + "xiN0HqZMbDFfxVM2BZmsxiexLhkHWKwLqfQDzRjJfmVww8fnXpWZhFXKyut9"
-        + "gMGEyCNoba4RU3QI/wHKWYaK74qtJpsucuLWBH6UcsHsCry6VZkwRxWwC0lb"
-        + "/F3Bm5UKHax5n9JHJ2amQm9zW3WJ0S5stpPObfmg5ArhbPY+pVOsTqBRlop1"
-        + "bYJLD/X8Qbs468Bwzej0FhoEU59ZxFrbjLSBsMUYrVrwD83JE9kEazMLVchc"
-        + "uCB9WT1g0hxYb7VA0BhOrWhL8F5ZH72RMCYLPI0EAQQEAQEEATEEAQQEAQEE"
-        + "AXgEAQQEAQEEATAEAQQEAQEEAVEEAQQEAQEEAQYEAQQEAQEEAQkEAQQEAQkE"
-        + "CSqGSIb3DQEJFAQBBAQBAQQBMQQBBAQBAQQBRAQBBAQBAQQBHgQBBAQBAQQB"
-        + "QgQBBAQBQgRCAEQAYQB2AGkAZAAgAEcALgAgAEgAbwBvAGsAJwBzACAAVgBl"
-        + "AHIAaQBTAGkAZwBuACwAIABJAG4AYwAuACAASQBEBAEEBAEBBAEwBAEEBAEB"
-        + "BAEjBAEEBAEBBAEGBAEEBAEBBAEJBAEEBAEJBAkqhkiG9w0BCRUEAQQEAQEE"
-        + "ATEEAQQEAQEEARYEAQQEAQEEAQQEAQQEAQEEARQEAQQEARQEFKEcMJ798oZL"
-        + "FkH0OnpbUBnrTLgWBAIAAAQCAAAEAgAABAEwBAGABAEGBAEJBAkqhkiG9w0B"
-        + "BwYEAaAEAYAEATAEAYAEAQIEAQEEAQAEATAEAYAEAQYEAQkECSqGSIb3DQEH"
-        + "AQQBMAQBGwQBBgQBCgQKKoZIhvcNAQwBBgQPMA0ECEE7euvmxxwYAgEBBAGg"
-        + "BAGABAEEBAEIBAgQIWDGlBWxnwQBBAQBCAQI2WsMhavhSCcEAQQEAQgECPol"
-        + "uHJy9bm/BAEEBAEQBBCiRxtllKXkJS2anKD2q3FHBAEEBAEIBAjKy6BRFysf"
-        + "7gQBBAQDggMwBIIDMJWRGu2ZLZild3oz7UBdpBDUVMOA6eSoWiRIfVTo4++l"
-        + "RUBm8TpmmGrVkV32PEoLkoV+reqlyWCvqqSjRzi3epQiVwPQ6PV+ccLqxDhV"
-        + "pGWDRQ5UttDBC2+u4fUQVZi2Z1i1g2tsk6SzB3MKUCrjoWKvaDUUwXo5k9Vz"
-        + "qSLWCLTZCjs3RaY+jg3NbLZYtfMDdYovhCU2jMYV9adJ8MxxmJRz+zPWAJph"
-        + "LH8hhfkKG+wJOSszqk9BqGZUa/mnZyzeQSMTEFga1ZB/kt2e8SZFWrTZEBgJ"
-        + "oszsL5MObbwMDowNurnZsnS+Mf7xi01LeG0VT1fjd6rn9BzVwuMwhoqyoCNo"
-        + "ziUqSUyLEwnGTYYpvXLxzhNiYzW8546KdoEKDkEjhfYsc4XqSjm9NYy/BW/M"
-        + "qR+aL92j8hqnkrWkrWyvocUe3mWaiqt7/oOzNZiMTcV2dgjjh9HfnjSHjFGe"
-        + "CVhnEWzV7dQIVyc/qvNzOuND8X5IyJ28xb6a/i1vScwGuo/UDgPAaMjGw28f"
-        + "siOZBShzde0Kj82y8NilfYLHHeIGRW+N/grUFWhW25mAcBReXDd5JwOqM/eF"
-        + "y+4+zBzlO84ws88T1pkSifwtMldglN0APwr4hvUH0swfiqQOWtwyeM4t+bHd"
-        + "5buAlXOkSeF5rrLzZ2/Lx+JJmI2pJ/CQx3ej3bxPlx/BmarUGAxaI4le5go4"
-        + "KNfs4GV8U+dbEHQz+yDYL+ksYNs1eb+DjI2khbl28jhoeAFKBtu2gGOL5M9M"
-        + "CIP/JDOCHimu1YZRuOTAf6WISnG/0Ri3pYZsgQ0i4cXj+WfYwYVjhKX5AcDj"
-        + "UKnc4/Cxp+TbbgZqEKRcYVb2q0kOAxkeaNo3WCm+qvUYrwAmKp4nVB+/24rK"
-        + "khHiyYJQsETxtOEyvJkVxAS01djY4amuJ4jL0sYnXIhW3Ag93eavbzksGT7W"
-        + "Fg1ywpr1x1xpXWIIuVt1k4e+g9fy7Yx7rx0IK1qCSjNwU3QPWbaef1rp0Q/X"
-        + "P9IVXYkqo1g/T3SyXqrbZLO+sDjiG4IT3z3fJJqt81sRSVT0QN1ND8l93BG4"
-        + "QKzghYw8sZ4FwKPtLky1dDcVTgQBBAQBCAQIK/85VMKWDWYEAQQEAQgECGsO"
-        + "Q85CcFwPBAEEBAEIBAhaup6ot9XnQAQBBAQCgaAEgaCeCMadSm5fkLfhErYQ"
-        + "DgePZl/rrjP9FQ3VJZ13XrjTSjTRknAbXi0DEu2tvAbmCf0sdoVNuZIZ92W0"
-        + "iyaa2/A3RHA2RLPNQz5meTi1RE2N361yR0q181dC3ztkkJ8PLyd74nCtgPUX"
-        + "0JlsvLRrdSjPBpBQ14GiM8VjqeIY7EVFy3vte6IbPzodxaviuSc70iXM4Yko"
-        + "fQq6oaSjNBFRqkHrBAEEBAEIBAjlIvOf8SnfugQBBAQBCAQIutCF3Jovvl0E"
-        + "AQQEAQgECO7jxbucdp/3BAEEBAEIBAidxK3XDLj+BwQBBAQBCAQI3m/HMbd3"
-        + "TwwEAQQEA4ICOASCAjgtoCiMfTkjpCRuMhF5gNLRBiNv+xjg6GvZftR12qiJ"
-        + "dLeCERI5bvXbh9GD6U+DjTUfhEab/37TbiI7VOFzsI/R137sYy9Tbnu7qkSx"
-        + "u0bTvyXSSmio6sMRiWIcakmDbv+TDWR/xgtj7+7C6p+1jfUGXn/RjB3vlyjL"
-        + "Q9lFe5F84qkZjnADo66p9gor2a48fgGm/nkABIUeyzFWCiTp9v6FEzuBfeuP"
-        + "T9qoKSnCitaXRCru5qekF6L5LJHLNXLtIMSrbO0bS3hZK58FZAUVMaqawesJ"
-        + "e/sVfQip9x/aFQ6U3KlSpJkmZK4TAqp9jIfxBC8CclbuwmoXPMomiCH57ykr"
-        + "vkFHOGcxRcCxax5HySCwSyPDr8I4+6Kocty61i/1Xr4xJjb+3oyFStIpB24x"
-        + "+ALb0Mz6mUa1ls76o+iQv0VM2YFwnx+TC8KC1+O4cNOE/gKeh0ircenVX83h"
-        + "GNez8C5Ltg81g6p9HqZPc2pkwsneX2sJ4jMsjDhewV7TyyS3x3Uy3vTpZPek"
-        + "VdjYeVIcgAz8VLJOpsIjyHMB57AyT7Yj87hVVy//VODnE1T88tRXZb+D+fCg"
-        + "lj2weQ/bZtFzDX0ReiEQP6+yklGah59omeklIy9wctGV1o9GNZnGBSLvQ5NI"
-        + "61e9zmQTJD2iDjihvQA/6+edKswCjGRX6rMjRWXT5Jv436l75DVoUj09tgR9"
-        + "ytXSathCjQUL9MNXzUMtr7mgEUPETjM/kYBR7CNrsc+gWTWHYaSWuqKVBAEE"
-        + "BAEIBAh6slfZ6iqkqwQBBAQBCAQI9McJKl5a+UwEAQQEATgEOBelrmiYMay3"
-        + "q0OW2x2a8QQodYqdUs1TCUU4JhfFGFRy+g3yU1cP/9ZSI8gcI4skdPc31cFG"
-        + "grP7BAEEBAEIBAhzv/wSV+RBJQQBBAQBCAQI837ImVqqlr4EAQQEAQgECGeU"
-        + "gjULLnylBAEEBAEIBAjD3P4hlSBCvQQBBAQBCAQISP/qivIzf50EAQQEAQgE"
-        + "CKIDMX9PKxICBAEEBAOCBOgEggTocP5VVT1vWvpAV6koZupKN1btJ3C01dR6"
-        + "16g1zJ5FK5xL1PTdA0r6iAwVtgYdxQYnU8tht3bkNXdPJC1BdsC9oTkBg9Nr"
-        + "dqlF5cCzXWIezcR3ObjGLpXu49SAHvChH4emT5rytv81MYxZ7bGmlQfp8BNa"
-        + "0cMZz05A56LXw//WWDEzZcbKSk4tCsfMXBdGk/ngs7aILZ4FGM620PBPtD92"
-        + "pz2Ui/tUZqtQ0WKdLzwga1E/rl02a/x78/OdlVRNeaIYWJWLmLavX98w0PhY"
-        + "ha3Tbj/fqq+H3ua6Vv2Ff4VeXazkXpp4tTiqUxhc6aAGiRYckwZaP7OPSbos"
-        + "RKFlRLVofSGu1IVSKO+7faxV4IrVaAAzqRwLGkpJZLV7NkzkU1BwgvsAZAI4"
-        + "WClPDF228ygbhLwrSN2NK0s+5bKhTCNAR/LCUf3k7uip3ZSe18IwEkUMWiaZ"
-        + "ayktcTYn2ZjmfIfV7wIxHgWPkP1DeB+RMS7VZe9zEgJKOA16L+9SNBwJSSs9"
-        + "5Sb1+nmhquZmnAltsXMgwOrR12JLIgdfyyqGcNq997U0/KuHybqBVDVu0Fyr"
-        + "6O+q5oRmQZq6rju7h+Hb/ZUqRxRoTTSPjGD4Cu9vUqkoNVgwYOT+88FIMYun"
-        + "g9eChhio2kwPYwU/9BNGGzh+hAvAKcUpO016mGLImYin+FpQxodJXfpNCFpG"
-        + "4v4HhIwKh71OOfL6ocM/518dYwuU4Ds2/JrDhYYFsn+KprLftjrnTBnSsfYS"
-        + "t68b+Xr16qv9r6sseEkXbsaNbrGiZAhfHEVBOxQ4lchHrMp4zpduxG4crmpc"
-        + "+Jy4SadvS0uaJvADgI03DpsDYffUdriECUqAfOg/Hr7HHyr6Q9XMo1GfIarz"
-        + "eUHBgi1Ny0nDTWkdb7I3bIajG+Unr3KfK6dZz5Lb3g5NeclU5zintB1045Jr"
-        + "j9fvGGk0/2lG0n17QViBiOzGs2poTlhn7YxmiskwlkRKVafxPZNPxKILpN9s"
-        + "YaWGz93qER/pGMJarGJxu8sFi3+yt6FZ4pVPkvKE8JZMEPBBrmH41batS3sw"
-        + "sfnJ5CicAkwd8bluQpoc6qQd81HdNpS6u7djaRSDwPtYnZWu/8Hhj4DXisje"
-        + "FJBAjQdn2nK4MV7WKVwr+mNcVgOdc5IuOZbRLOfc3Sff6kYVuQFfcCGgAFpd"
-        + "nbprF/FnYXR/rghWE7fT1gfzSMNv+z5UjZ5Rtg1S/IQfUM/P7t0UqQ01/w58"
-        + "bTlMGihTxHiJ4Qf3o5GUzNmAyryLvID+nOFqxpr5es6kqSN4GPRHsmUIpB9t"
-        + "f9Nw952vhsXI9uVkhQap3JvmdAKJaIyDz6Qi7JBZvhxpghVIDh73BQTaAFP9"
-        + "5GUcPbYOYJzKaU5MeYEsorGoanSqPDeKDeZxjxJD4xFsqJCoutyssqIxnXUN"
-        + "Y3Uojbz26IJOhqIBLaUn6QVFX79buWYjJ5ZkDS7D8kq6DZeqZclt5711AO5U"
-        + "uz/eDSrx3d4iVHR+kSeopxFKsrK+KCH3CbBUMIFGX/GE9WPhDWCtjjNKEe8W"
-        + "PinQtxvv8MlqGXtv3v7ObJ2BmfIfLD0rh3EB5WuRNKL7Ssxaq14KZGEBvc7G"
-        + "Fx7jXLOW6ZV3SH+C3deJGlKM2kVhDdIVjjODvQzD8qw8a/ZKqDO5hGGKUTGD"
-        + "Psdd7O/k/Wfn+XdE+YuKIhcEAQQEAQgECJJCZNJdIshRBAEEBAEIBAiGGrlG"
-        + "HlKwrAQBBAQBCAQIkdvKinJYjJcEAQQEAUAEQBGiIgN/s1bvPQr+p1aQNh/X"
-        + "UQFmay6Vm5HIvPhoNrX86gmMjr6/sg28/WCRtSfyuYjwQkK91n7MwFLOBaU3"
-        + "RrsEAQQEAQgECLRqESFR50+zBAEEBAEIBAguqbAEWMTiPwQBBAQBGAQYKzUv"
-        + "EetQEAe3cXEGlSsY4a/MNTbzu1WbBAEEBAEIBAiVpOv1dOWZ1AQCAAAEAgAA"
-        + "BAIAAAQCAAAEAgAABAIAAAAAAAAAADA1MCEwCQYFKw4DAhoFAAQUvMkeVqe6"
-        + "D4UmMHGEQwcb8O7ZwhgEEGiX9DeqtRwQnVi+iY/6Re8AAA==");
-
-    private String sha256Pass = "D317F8D5191F2602C527F8E6E0E8855C4517EC9512F7A06A7A588ACF0B3A6325";
-
-    private byte[] sha256Pfx = Base64.decode(
-              "MIIFvwIBAzCCBXEGCSqGSIb3DQEHAaCCBWIEggVeMIIFWjCCBVYGCSqGSIb3"
-            + "DQEHAaCCBUcEggVDMIIFPzCCBTsGCyqGSIb3DQEMCgECoIIFKjCCBSYwUAYJ"
-            + "KoZIhvcNAQUNMEMwIgYJKoZIhvcNAQUMMBUEEFEZik5RaSrwXtrWCnaLzAQC"
-            + "AQEwHQYJYIZIAWUDBAEqBBBTqY5oFOjZxnBBtWchzf0TBIIE0Pcvwtwthm8d"
-            + "yR16f5yqtofxGzJ0aAbCF7JJ+XsL9QhNuqndTtnXits+E2WgNwwm24XyRhPA"
-            + "obAwqz+DvH+gdUbKoN/gCEp+/6xhlwMQZyjyqi5ePznwLQ/bJueqmXZDT+pO"
-            + "zTIeMXMF0YaSjcZZ4FJnZtBX7XQDEAPmialrknhcSZI5RoLjOzFv51FgYd9+"
-            + "nWdtWlRINS9LrGCVL+y8wwHp55tWEoCR2/o9YWFMYNrUkVUUzImHCN1fkbIH"
-            + "XQxPp5fUqP00kwYY4288JZrzHGWGmSVYm54ok5YRLpCs0yhB0ve//iH/fNNO"
-            + "esShfBTUcRCc086skxgoCVWBZERyVJHWkKl/Q4RVzYt70k2/Qfq/xBNwVCrw"
-            + "YiOB0TwSQJKpvRbtufPx2vODfAmhIKes08ZLJHsMJ+O3p99O2rWZslNY7nfx"
-            + "1vWXYLVkHg0q79ThgbP4p0qQQziIVZoF9ViisJTJWzZbfJLdaKPeHcduvXsR"
-            + "lRvfEpR6/lifcxvkloxjpYtM6JEjtvT1x442VRKJWZofkjCohpLSmEDt77FM"
-            + "ENvra7B9ojlY+0DkwNV34FlSRrwi/nVl2XhebI11DfQFEUN+krNoZ3U4n5Sb"
-            + "g0Heibg5mILPwVS5Zh2vEybXzFY6b1XPA7TlGQATm6xBaU+BNFiACp+7+6CZ"
-            + "PxofFKKlWq0+Apx43JDATerwlPBKxLqxxgo0xTJUtL8OKnt6oSFX4P6O6AgX"
-            + "D9Pz3dzdWW9ga65N2qEmqpeIsd6SB4eGRJ1Vf1ePDgdVBUD9DG/eWfpn8l1T"
-            + "neg7wsQOGDrX00uDfio/WrjRBOw37IfToqJ/j6y/Ybggg5tldvCNoxq/42rC"
-            + "RvP0GJH+LJAHgB9sOWbksR7tKizWeFEyHwrAQfYc8aIZocApObtsZp8O5nuI"
-            + "MNcSCc77WZfVacrJzssKki1YHPoZeTYb9q4DRm0F6Rk+bqyvd7vs2DyLN7jT"
-            + "bkWoSoyCw8PAOuc8Q/+X3jhs18RQGzsEpeTOHoYJWeTUxgPrPqDFNKNLhD+L"
-            + "7mvDM7EvB08tVfLTSMeVBY+RUW6eFCbdlHfqszvp9pFZPNxQHtgbAYplwK6J"
-            + "i24gCH2UMF+BNzdcN2Fw9vP3nao+mzjtY1HuYebDDNNxgBAEoUFS4jr1YLoa"
-            + "+li3A9T/NqSf+J5OwASsSsp0YttAJQ+VU19amwJ141U+04kVc2bUIvSxEyxu"
-            + "UzWfFs26J1FhKzacirtpNv21iH78NHWOgS3jlEZMirpCHtHDbwF0z3V0upJ7"
-            + "cZzMwHJPQIGP4Nk8ei20dEogc/D2ijXHGRKdRjstzi89YXs4iLWjy2lEqhlK"
-            + "IvmlbF/snra1He2En/TFYv7m1zMuEPtS/+DTcwzqoe10Lko+2bNlOikW58u/"
-            + "OdAlteo1IissecMjL6743ttt8SAwx9gpAn6XHaIfFL1jiGKUQPJ5Mx9RUzfB"
-            + "lsKzHLNWmrDCZtR4BC4A21aRUueDGgRbtiOCYLbVtoiTc2XWM5juahaWCNKm"
-            + "4+ENQNOPrB4rJUeWJquNOj9+Brhe6pWWfi4EYVBuWlbTQB7u3uP9lnYvQHSo"
-            + "nOjkhjwEhPZneaKctEqXx2LoYc8arY1LSSpaXORcOJc/LkgVCq3bBEDNCJrZ"
-            + "DBOUpcPXDj43MEUwMTANBglghkgBZQMEAgEFAAQgdWQUVEirOjgax8qJhjqC"
-            + "bArDHuZQQvCmtrjqyhWbI4MEENBoJ4T1+xY5fmdiwmoXPPM=");
-
-    private String pkcs5Pass = "hello";
-
-    private byte[] pkcs5Aes128Pfx = Base64.decode(
-        "MIIFsQIBAzCCBXcGCSqGSIb3DQEHAaCCBWgEggVkMIIFYDCCAxcGCSqGSIb3"
-      + "DQEHBqCCAwgwggMEAgEAMIIC/QYJKoZIhvcNAQcBMBwGCiqGSIb3DQEMAQYw"
-      + "DgQIBumPBl/jV0kCAggAgIIC0Dd2zn5WPPxgqdZg0a4zB10ErQnNlRUd1EOw"
-      + "kodoXH7Vt3/zVgssPDmuUJo6OlneBaYXjjjrqaDbmuc+1JTpB3GPsCAdDvAd"
-      + "m3IQR9oJJOqX0RYFKw4rFQ2xmzkybHiXWvt24lKr1A7MSfSWc+xO3xupNzQt"
-      + "z8dLGx0VJejJe8KSM+ST6JTXaHWcijPo/pADjyTWp2xwZaEfBDUOLgCPTlHY"
-      + "95cfqB0FlwfT+jGqrQjVXex9hL1MmANFwZ0bqxx+9yfdcDY8K/87NYZ4LJdA"
-      + "L7qAJg5Ziduhe+NMugzOMQijUGHX9g21kMmU96CUbUNyc0JWXyDJqwh0aAvV"
-      + "QVbLW9F+qzWPCMlV/5u30WNZ0gdVulCdQ9wIO1vt3oa3wUUdO1LCaEGyqO+h"
-      + "x5iPGH3f5WTeJK2BoOKtUXhZtfp7GvYYFcI8BeoTo5poT/uqLdZmaPgBXc5O"
-      + "kyRQCpvQJipNcwD+R8FPbTExUxTWnbxbx3f7n0v8vMFPqb26BrFzCN+JTFRw"
-      + "bN0dRaysOGgzMeBjk0TGpHHj5/g5DUvIxVjN6wY7HO+849g64a+Z/wHWB1vp"
-      + "fALen3hGVdYIgWXGWn3bBMXT5peWc1omPXJdoltpiFRGku3JFCBJEQ6LzqZD"
-      + "ApVqVgE6WbfTQXgsEE9+J5zJJx/yTGvFjxXNNUMSdo2zQtHJVj0karXHVLxu"
-      + "phGb8Eg23obEOZj6Y6cZviWeiEeBjinGh4M1RD4HuYnczDF3FWZbi9aRku9r"
-      + "a1VgUbftiXeqmRpIWtZhfB40IELadTbEMTOi4pQ2cPcjZRAKAZwnijTfXEA5"
-      + "XwBQYdPvORlP6PJJv2Ai6Zc2XrevvOYLnSXSU+2ZpVuTTaX7xcQFi4APexyc"
-      + "Csfhpcpmb2K8jek3XN0jnOti9rU6Rlab9U5bPMLuOqoISsQ/x2ho3M0uYZIh"
-      + "9nGPixL1lxKgNDXfh0sZ7u7/AzCCAkEGCSqGSIb3DQEHAaCCAjIEggIuMIIC"
-      + "KjCCAiYGCyqGSIb3DQEMCgECoIIBszCCAa8wSQYJKoZIhvcNAQUNMDwwGwYJ"
-      + "KoZIhvcNAQUMMA4ECDD2zGfoVExtAgIIADAdBglghkgBZQMEAQIEEFER8VTx"
-      + "Owq7+dXKJn8zEMwEggFgpsQbBZJ1/NCAv5G05MsoujT6jNmhUI5RyHlKVqBD"
-      + "odvw/wS13qmWqUA3gL0/sJz/uf9/DJ7ur5XbkW56Y5qlqXBc8xvZ22Mabfy4"
-      + "hBzBuL+A6gfEQZNuZPiev0w02fEuVAtceDgsnJfMaawK06PUjxTUP3n/Bczc"
-      + "rhYYaGHwTtX+N6C3Q0Zn/W3zoIsoSruN6jc9x2DCAc3cdv5zaXxvZv6GhQou"
-      + "kcibQhRnTqQVRRWsF2zX3ZgPLJrQcB4NPGoEecHceD8jB6JnKqgGUpWybrjK"
-      + "7Mwwl2wB8Ffd2XpTTw2beiNSZXhCp+IxqgggwK3L1RGWhRoQE3esAVlCDhkz"
-      + "sk/ngnpqaauE9NVcrZEY0x6++/MOJssQZZ8X+Ci/zJuyH1dpUQii3kuw4F/O"
-      + "8nHiHClR0IA/xrVM+h0NC1/o2jCjeKXPf67j2Wp95o40apldtqlHyTm3TM2O"
-      + "uXrT5ExzcjFgMCMGCSqGSIb3DQEJFTEWBBSpuRoBZ82LWCyE2mXmT5Gmk1xv"
-      + "+DA5BgkqhkiG9w0BCRQxLB4qAHQAZQBzAHQAQABiAG8AdQBuAGMAeQBjAGEA"
-      + "cwB0AGwAZQAuAG8AcgBnMDEwITAJBgUrDgMCGgUABBQRvdgo1LVPm68qJcVT"
-      + "gw8dRrSS4gQISYYYgNAwxl0CAggA");
-
-    private byte[] pkcs5Aes192Pfx = Base64.decode(
-        "MIIFsQIBAzCCBXcGCSqGSIb3DQEHAaCCBWgEggVkMIIFYDCCAxcGCSqGSIb3"
-      + "DQEHBqCCAwgwggMEAgEAMIIC/QYJKoZIhvcNAQcBMBwGCiqGSIb3DQEMAQYw"
-      + "DgQImAP7SD16WkACAggAgIIC0MCS81oGaIY1yHwP6faAhe3eseR6gGMlezbx"
-      + "r/7jmVQ8xe2jsZwqRVp/WCx716/9RHab17UFy+e3efbCrCGUJGUU5OrADf0l"
-      + "6/S7v/C5hR5XeE12zukSe/c5mkGhPuM+for0daQpLP6zDQMNLENyp+mPVBsI"
-      + "7IqFihwWUow7lvZEwaUOmsu+m978BOqhMRykZ7MbEjq4lMumZNvp37WqPRrh"
-      + "eQ4tz7q47C+k5NkTjMz2s/2a9SZViW+FZWOvV0DXJj/BCpAARR0bQDpjqlQ8"
-      + "HoSjoVgP+p5Y1pnLBvI/pFecS4ZwM1TyAdFZbjFpkNe8DREO/Py+89kOJpZa"
-      + "aZoFKjxY5m7Z9ftJx615vih5d8D4t685tBJNAEiah9RFppNA41GpJc1winx1"
-      + "CuqQQqStOmmMD/uk1BEgaQ4R4lR88Bms69shK8Nk2U4egVYKdbrruulKY5M0"
-      + "dj5j2JChqYjE5dPxPyd1s0qYW9ABMeDT8l7gtiDTOfS4qZjVPWRW2vGbj80g"
-      + "HnBnd6SAC2DdWkY1QuDRVRABQO5NJPPqGhL2LclX1dE1FS0puXpl/oyxbAMU"
-      + "pCt+pnZZLPrMSZgZ6I3VWt+Dbg6jHtM4a+y3gsswL+uzdb4AnHqCcuFbnZDh"
-      + "2hz6IFsyw4LgUeIBJNBAqgag3VeJLL7bpKm58XSd/6hC369HXn91F1NAkBOO"
-      + "IZFZQPVgEufdryZck1/u0+zmyelAWG7Jq4SQF07C4v/dpgVH8U1OwR34+D0f"
-      + "0fPA3qdBLGL5cKNBxnKCx5+Gu/+dDR33aY176qaDZu7OmZkCJ3qkhOif7/Qi"
-      + "0s4NpG6ATLGD6TzSnmje3GwJze5KwOvMgAewWGScdqOE9KOh7iPC1kIDgwhE"
-      + "eBM+yciGGfinStyeSik6fLRi2JPnVNIALIh74DIfK3QJVVRNi9vuQ0j0Dm8C"
-      + "JSD/heWsebKIFrQSoeEAZCYPhzCCAkEGCSqGSIb3DQEHAaCCAjIEggIuMIIC"
-      + "KjCCAiYGCyqGSIb3DQEMCgECoIIBszCCAa8wSQYJKoZIhvcNAQUNMDwwGwYJ"
-      + "KoZIhvcNAQUMMA4ECBGQFSR+KZ2AAgIIADAdBglghkgBZQMEARYEEABRcxC7"
-      + "xWHsYaX2UsUZ5JoEggFgyrYAZowHdclsxaAeoY/Ch1F+NBb64bXdDOp56OWh"
-      + "HHu79vhLsjAOmbTYoMsmRZw8REen7ztBUv9h/f7WbfKs84FDI6LbM9EIaeun"
-      + "jrqaUdmSADQhakd7hJQhWAw4h/Df5KNhwsVJ1+i9RCtMzY1nFk1Pjg6yL/5E"
-      + "rWVvNRkconjrDbUwLPA+TfDlhOMapttER4k8kOY0WMc7iWHmowkh1JHUNbvC"
-      + "gEQvGwysXiFqoEcy/UbY7Wgke3h7HwoColAYorHhkV4/NBENmQbsiUdkxD/Z"
-      + "6KrgOuAvvluGUY79M6SusH11PfVBwyJX7Wt1HmllrykrsmJuF6UuN1BavUrR"
-      + "rr0Utm9T28iiqO6ky74V4XesmFdr7oObT2kLcGiFbWzXyVrWL3GM9N03CWXx"
-      + "b1M5hXACRlwKVp79qxeyw5k+ccixnjCumsSX8MMttKYwRJ1ML2YL0v8XdE0i"
-      + "LSkXsEoG5zFgMCMGCSqGSIb3DQEJFTEWBBSpuRoBZ82LWCyE2mXmT5Gmk1xv"
-      + "+DA5BgkqhkiG9w0BCRQxLB4qAHQAZQBzAHQAQABiAG8AdQBuAGMAeQBjAGEA"
-      + "cwB0AGwAZQAuAG8AcgBnMDEwITAJBgUrDgMCGgUABBQz1gLRjMDYVLIPGdsd"
-      + "4EPgRMGPtQQItR+KgKM/oRMCAggA");
-
-    private byte[] pkcs5Camellia128Pfx = Base64.decode(
-        "MIIFswIBAzCCBXkGCSqGSIb3DQEHAaCCBWoEggVmMIIFYjCCAxcGCSqGSIb3"
-      + "DQEHBqCCAwgwggMEAgEAMIIC/QYJKoZIhvcNAQcBMBwGCiqGSIb3DQEMAQYw"
-      + "DgQIq+wFOOOtSokCAggAgIIC0IWDRpk4L/tSSMfwWx0mN3ecbaL+m2XZWvN9"
-      + "hK1K5PghAYquCs36l603cYSV9pypOkGC5rn1d2fyZCFhUMOObSC7V/mpkitr"
-      + "OfOYpaW7tU1JJecpONgIHlbd8N4fbBtH73E7vdmi6X/tg4Tl7yJf40fruYVq"
-      + "yzqfJCO2aGJIFv6JWsFivjCwehBa+6ppCHBnNcj4SsVlozj1y2B0Wl2TVi3r"
-      + "joBIsK2RQ+RMjM55k3pS57mV+jXtd29wb2q9utDKogvpBCboTk8dPMFcFGWz"
-      + "2D41onJoEJKizAEIgXiS7UvqHddhIL9O/rSZ68j2d2GcFi1Oxer1PyZoCI61"
-      + "CpZdk2QeNeVaVFTPJ26We6J34w2ivZwHOhn+iUZ7q0Sm9gcYa1QRG79LA/AC"
-      + "nE3Xxzl4nEjRRi5AKb6IOnMKBbr0povesS8tL323x91uPZc0jMctC6Q+vegX"
-      + "tIZ7dZPuNxhqRHqb62LSm11cpYQWibj16rRQ0ulOFSQGIr514PvfbIig6oo8"
-      + "niwHuefp/ey/Zvl/dAl+um2UkVdR9Mwn8vTM8oMF+ptJfpWyZEIrP785Rpu3"
-      + "oyBMyEYA2djX7JsFvoCxKxGCC5VK3C/9EFv9xUGmiV0zrTPcHb1P4sK1AJyI"
-      + "vhSY+Tgv+Fjq5KoPCa4ZXP+Y+vSzkttcP8u7x0wt9cblvgzdBy9Ee1xqCdJd"
-      + "F67U6vbQ6ErDrdVAwtRqc0TsPKG1XH5NFtxTwILyCeh8XzdYMIaHkEnTuITQ"
-      + "eeICaUJ2YPZrADLxXTNHI9e6dVcDvhjf/JfBXZfiiqFH8XmbCIMqyGSGTmQr"
-      + "8uwb8cquLMS78RbXSHLNcv+f/DmPOClNjmWgVAYxaDuw5lZBaU+YDyZaKEy2"
-      + "Mdjd+lR/g2LZhvAEfcM3V4bzr17s0GOSwJ5/5yzczPKZZ8auMwML+Bcmoggt"
-      + "EJgubVFHg/3l11xVe2djfg78CTCCAkMGCSqGSIb3DQEHAaCCAjQEggIwMIIC"
-      + "LDCCAigGCyqGSIb3DQEMCgECoIIBtTCCAbEwSwYJKoZIhvcNAQUNMD4wGwYJ"
-      + "KoZIhvcNAQUMMA4ECInc03N3q5vSAgIIADAfBgsqgwiMmks9AQEBAgQQR+Uo"
-      + "WVvmSL5AcwwRq6vtOQSCAWD0Ms1i2wHGaFi6qUWLqA5EnmYFwqwQQlfz5To+"
-      + "FwVEpHQHrqd0pehOt1J9vyDVYwfjU8DUOJDovCiBIzRsopyf0Qp5hcZnaTDw"
-      + "YJSNd3pIAYiEUAzfdtC7tQw2v0aLt5X/7zthEcoRtTe061dK8DhbV4fALWa9"
-      + "VF2E91L35+wq52DblvpJHBw28PHTbuhfJZsNshXKO7qU7uk+UR6V/Pwc7rsp"
-      + "x/TQ35fVfm7v53rapdHlMVyY4Bx/4fdEWV9aK1cV3qOfiBMByxt8WD0xBLoc"
-      + "Yy3qo3+k/N7q6t4hqjus3LPVrmCbpgAe5S5EkDgnjy7Mpz19tf7hhzL957p2"
-      + "ecWregvR9rQHoWZNOaxS2e2hdOiZUPSxIJ46nOJyCnoZQHG0CFVEwwJkGcWf"
-      + "Thjz38U203IRzuCPgsO1f8wjSXXMp4xJQtJW2TqMm+5/aaDtuXAsUGqQzGiH"
-      + "DQfUs4z/PCKyMWAwIwYJKoZIhvcNAQkVMRYEFKm5GgFnzYtYLITaZeZPkaaT"
-      + "XG/4MDkGCSqGSIb3DQEJFDEsHioAdABlAHMAdABAAGIAbwB1AG4AYwB5AGMA"
-      + "YQBzAHQAbABlAC4AbwByAGcwMTAhMAkGBSsOAwIaBQAEFHIzAiyzoVOmPvLE"
-      + "XCD2HHG5MC23BAhhHlFnklHZYgICCAA=");
-
-    private byte[] pkcs5Camellia256Pfx = Base64.decode(
-        "MIIFswIBAzCCBXkGCSqGSIb3DQEHAaCCBWoEggVmMIIFYjCCAxcGCSqGSIb3"
-      + "DQEHBqCCAwgwggMEAgEAMIIC/QYJKoZIhvcNAQcBMBwGCiqGSIb3DQEMAQYw"
-      + "DgQIq+wFOOOtSokCAggAgIIC0IWDRpk4L/tSSMfwWx0mN3ecbaL+m2XZWvN9"
-      + "hK1K5PghAYquCs36l603cYSV9pypOkGC5rn1d2fyZCFhUMOObSC7V/mpkitr"
-      + "OfOYpaW7tU1JJecpONgIHlbd8N4fbBtH73E7vdmi6X/tg4Tl7yJf40fruYVq"
-      + "yzqfJCO2aGJIFv6JWsFivjCwehBa+6ppCHBnNcj4SsVlozj1y2B0Wl2TVi3r"
-      + "joBIsK2RQ+RMjM55k3pS57mV+jXtd29wb2q9utDKogvpBCboTk8dPMFcFGWz"
-      + "2D41onJoEJKizAEIgXiS7UvqHddhIL9O/rSZ68j2d2GcFi1Oxer1PyZoCI61"
-      + "CpZdk2QeNeVaVFTPJ26We6J34w2ivZwHOhn+iUZ7q0Sm9gcYa1QRG79LA/AC"
-      + "nE3Xxzl4nEjRRi5AKb6IOnMKBbr0povesS8tL323x91uPZc0jMctC6Q+vegX"
-      + "tIZ7dZPuNxhqRHqb62LSm11cpYQWibj16rRQ0ulOFSQGIr514PvfbIig6oo8"
-      + "niwHuefp/ey/Zvl/dAl+um2UkVdR9Mwn8vTM8oMF+ptJfpWyZEIrP785Rpu3"
-      + "oyBMyEYA2djX7JsFvoCxKxGCC5VK3C/9EFv9xUGmiV0zrTPcHb1P4sK1AJyI"
-      + "vhSY+Tgv+Fjq5KoPCa4ZXP+Y+vSzkttcP8u7x0wt9cblvgzdBy9Ee1xqCdJd"
-      + "F67U6vbQ6ErDrdVAwtRqc0TsPKG1XH5NFtxTwILyCeh8XzdYMIaHkEnTuITQ"
-      + "eeICaUJ2YPZrADLxXTNHI9e6dVcDvhjf/JfBXZfiiqFH8XmbCIMqyGSGTmQr"
-      + "8uwb8cquLMS78RbXSHLNcv+f/DmPOClNjmWgVAYxaDuw5lZBaU+YDyZaKEy2"
-      + "Mdjd+lR/g2LZhvAEfcM3V4bzr17s0GOSwJ5/5yzczPKZZ8auMwML+Bcmoggt"
-      + "EJgubVFHg/3l11xVe2djfg78CTCCAkMGCSqGSIb3DQEHAaCCAjQEggIwMIIC"
-      + "LDCCAigGCyqGSIb3DQEMCgECoIIBtTCCAbEwSwYJKoZIhvcNAQUNMD4wGwYJ"
-      + "KoZIhvcNAQUMMA4ECInc03N3q5vSAgIIADAfBgsqgwiMmks9AQEBAgQQR+Uo"
-      + "WVvmSL5AcwwRq6vtOQSCAWD0Ms1i2wHGaFi6qUWLqA5EnmYFwqwQQlfz5To+"
-      + "FwVEpHQHrqd0pehOt1J9vyDVYwfjU8DUOJDovCiBIzRsopyf0Qp5hcZnaTDw"
-      + "YJSNd3pIAYiEUAzfdtC7tQw2v0aLt5X/7zthEcoRtTe061dK8DhbV4fALWa9"
-      + "VF2E91L35+wq52DblvpJHBw28PHTbuhfJZsNshXKO7qU7uk+UR6V/Pwc7rsp"
-      + "x/TQ35fVfm7v53rapdHlMVyY4Bx/4fdEWV9aK1cV3qOfiBMByxt8WD0xBLoc"
-      + "Yy3qo3+k/N7q6t4hqjus3LPVrmCbpgAe5S5EkDgnjy7Mpz19tf7hhzL957p2"
-      + "ecWregvR9rQHoWZNOaxS2e2hdOiZUPSxIJ46nOJyCnoZQHG0CFVEwwJkGcWf"
-      + "Thjz38U203IRzuCPgsO1f8wjSXXMp4xJQtJW2TqMm+5/aaDtuXAsUGqQzGiH"
-      + "DQfUs4z/PCKyMWAwIwYJKoZIhvcNAQkVMRYEFKm5GgFnzYtYLITaZeZPkaaT"
-      + "XG/4MDkGCSqGSIb3DQEJFDEsHioAdABlAHMAdABAAGIAbwB1AG4AYwB5AGMA"
-      + "YQBzAHQAbABlAC4AbwByAGcwMTAhMAkGBSsOAwIaBQAEFHIzAiyzoVOmPvLE"
-      + "XCD2HHG5MC23BAhhHlFnklHZYgICCAA=");
-
-    private byte[] pkcs5Cast5Pfx = Base64.decode(
-        "MIIFqQIBAzCCBW8GCSqGSIb3DQEHAaCCBWAEggVcMIIFWDCCAxcGCSqGSIb3"
-      + "DQEHBqCCAwgwggMEAgEAMIIC/QYJKoZIhvcNAQcBMBwGCiqGSIb3DQEMAQYw"
-      + "DgQIkiiANhrORysCAggAgIIC0GDKlVmlIcRXqb1XoCIhnHcKRm1Sa/bCJc7j"
-      + "ylp5Y8l2/ugimFeeM1yjZRke+KxTPXL0TO859j45NGUArL6hZipx8v6RzvH7"
-      + "WqyJx5wuDwufItgoJT2DE4UFGZEi/pP/RWALxNEZysVB5zod56vw3dZu/+rR"
-      + "gPIO7mOnWgqC2P1Pw4YLXOk4qNxaCCwIIp9aJlAdvCRfLBqPr8QjJFMGw5NQ"
-      + "gcHLG3QRW846wUtOxZj2+/Qy9GNAvo+PV6qIR/IS/A+QUwQ3+7SRojUWMUhV"
-      + "6N/L/+l2UyU551pA5oX8anPbKCU5bRa/MRIpfPvm+XJpEpbwhS164X7wBFIR"
-      + "RSdoj83wEWcR0WFTCXijCRdJcniO+h13kiaR3ltBD0dETjM7xu1XvkbAb3EV"
-      + "71PeRQC8kY6DPsJCI9DWDBCnJpVzO4q2atzYej4IAZNgF9PBAwA5isAzurVz"
-      + "xxxS4SF930CnrFLb/CxF/IBuz6RBh0lreRMfCP5g5sZUp686kShMSeAKNb7s"
-      + "xU2YshusTTShhK+2tK8Lf7z9O/P59P0yZOiFDStrDRUPo7IAfUD29+1EdWVQ"
-      + "3LGBtN/t/YOedKGVxd+YXZ4YKFRoNBR9GHsL31wrOm14mmWNib6nbd5+6Zcj"
-      + "j3xXLLXG7MT40KlmsmKDYCVeGhc7AfGU3b/HceX5u30RUWbgaC0ATiM/vJKX"
-      + "djvCpEiB5pPy2YtpSNAc0bV9GsHorL85WjJDWnMlm3yoy+Bfiu/doNzMEytL"
-      + "ycXq4LtaRl6EV8G4ak59lNJ7HdsABcsSa2fxEa595hbWYeYB1xgt0mHl+btx"
-      + "E5hrfyZmjN74YDbkPSIWsAFktcCHF2eGrwK/2NTewKHdsE6FSzc1pAYDgnxT"
-      + "aNnhxw/Nfb1XmwH0C3soolJuoTRKyMJxvMDVuCSB2WyoyEjq+BNQzUTkYYR6"
-      + "Hijzd9ljvX84XUlicSucbTHHVDCCAjkGCSqGSIb3DQEHAaCCAioEggImMIIC"
-      + "IjCCAh4GCyqGSIb3DQEMCgECoIIBqzCCAacwQQYJKoZIhvcNAQUNMDQwGwYJ"
-      + "KoZIhvcNAQUMMA4ECCDJh37hrS+SAgIIADAVBgkqhkiG9n0HQgoECOXn7rhs"
-      + "5ectBIIBYLiRI2Yb955K6WAeTBXOnb58hJxgsir3zsGCoIRWlGNhr5Ur0ebX"
-      + "AnXyD5ER8HTaArSO2EtZlVI8Ff6OIcYg5sKliYJEgbI7TPKcaImD92Um4Qim"
-      + "/8h4xkM3K4VQmT0H8zFM3Mm/86mnON+2UjVcFBrCxek9m06gMlkIrxbiSh8X"
-      + "YAYfHGTKTTX4HtvkZsQTKkcxSVzavyfVZFw1QtRXShvvJDY6TUGplyycWvu/"
-      + "+braWfuH1u2AGh30g1+SOx7vnJM78a0rZIwd3TP9rKczzqexDF/GwuGuZF+1"
-      + "bMe8xxC1ZdMZ1Mnh27TNoGMuU5VVsqhs5NP0XehuuV8rHdzDDxdx/2buiA4+"
-      + "8SrzW5LQAs6Z+U3pna3UsuH24tIPMm3OfDH7WSBU6+nvXub7d5XxA31OYHEk"
-      + "nAsuo6p6iuosnedTObA9bX+mTU4nR3oaa87ZDIPxbQVTHKberFlYhDzmmwAx"
-      + "YDAjBgkqhkiG9w0BCRUxFgQUqbkaAWfNi1gshNpl5k+RppNcb/gwOQYJKoZI"
-      + "hvcNAQkUMSweKgB0AGUAcwB0AEAAYgBvAHUAbgBjAHkAYwBhAHMAdABsAGUA"
-      + "LgBvAHIAZzAxMCEwCQYFKw4DAhoFAAQUc8hyg5aq/58lH3whwo66zJkWY28E"
-      + "CKHZUIQsQX9hAgIIAA==");
-
-    private byte[] gostPfx = Base64.decode(
-        "MIIHEgIBAzCCBssGCSqGSIb3DQEHAaCCBrwEgga4MIIGtDCCBYEGCSqGSIb3"
-      + "DQEHBqCCBXIwggVuAgEAMIIFZwYJKoZIhvcNAQcBMFUGCSqGSIb3DQEFDTBI"
-      + "MCcGCSqGSIb3DQEFDDAaBAi114+lRrpkXAICCAAwCgYGKoUDAgIKBQAwHQYG"
-      + "KoUDAgIVMBMECLEIQPMsz/ZZBgcqhQMCAh8BgIIFAbu13yJiW/BnSKYKbtv9"
-      + "tDJoTv6l9BVpCCI4tvpzJnMeLBJyVZU4JevcJNii+R1LilVuuB+xc8e7/P4G"
-      + "6TILWmnnispr9KPRAbYRfoCJOa59+TYJMur58wwDuYgMapQAFzsvpzyUWi62"
-      + "o3uQbbLKO9hQCeJW2L+K9cbg8k33MjXMLpnblKpqmZbHTmBJDFR3xGw7IEjD"
-      + "UNqruu7DlHY6jctiVJSii9UNEVetSo9AAzfROxRjROg38VsWxLyO9wEMBv/8"
-      + "H8ur+zOtmQPGqirNXmN+pa08OvZin9kh7CgswW03xIbfsdGGGLRAWtvCnEwJ"
-      + "mS2tEfH1SZcuVLpMomhq3FU/jsc12k+vq/jw4I2cmfDL41ieK72bwNj8xUXu"
-      + "JHeoFSPGX4z+nsJUrFbFG4VBuDs2Y0SCWLyYZvdjvJwYjfqtyi/RoFSZjGHF"
-      + "crstf9YNQ0vW0efCJ7pUBH44OrbnCx5ng2U5jFm1b3HBIKA2RX+Tlhv14MgT"
-      + "KSftPZ67eSmgdsyPuQAdMu6fEdBMpVKMNZNRV565690sqi+1jOmH94TUX8XU"
-      + "2pRQj6eGGLq6lgGnnDabcePUEPXW8zW2KYrDKYJ/1QZmVGldvlqnjZMNhIO+"
-      + "Afsqax/P8RBjMduGqdilGdRzbN8PdhVaN0Ys+WzFxiS9gtaA2yPzcQuedWDN"
-      + "T7sIrfIapgFYmmHRQ7ht4AKj+lmOyNadONYw+ww+8RzHB1d2Kk+iXeZCtvH0"
-      + "XFWJZtuoGKSt/gkI0E2vpDfMbLaczaRC7ityO0iJs25ozP4JhZRBVvOmpxc9"
-      + "YuIetbTnTf1TLJKXDgt1IwPZeugbofSeiNv117lx8VgtvMYFD4W+WQlB8HnO"
-      + "C8NOYjkMPElc6PCMB9gGm0cIu1fKLvY8ycLav93JJjdDuC0kgKLb2+8mC5+2"
-      + "DdMkcfgW6hy4c98xnJs8enCww3A4xkRbMU13zMq70liqmKHV2SSurg5hwUHM"
-      + "ZthT8p988ZBrnqW24lXfMBqTK4YtIBMeMnvKocYBXr96ig3GfahI1Aj2Bw2e"
-      + "bpZTVeayYUd+2xX8JJMdqna6Q61AL8/eUhJUETz5+fgQJtPjcKmdJfVHO6nB"
-      + "vOk1t/rjK17eiXLxHCyvfP+Tw8lSFOhcvr4eIeG8WfsWNRu2eKKosOU7uash"
-      + "QpnvQieqDeijuRxf+tbbJ5D86inwbJqdxra7wNuZXmiaB9gFDzNbNjhtL+6i"
-      + "gUyX/iQHKi9bNK+PH6pdH/gkwnG/juhdgqoNY6GRty/LUOPgXD+r5e/ST16R"
-      + "vnlwrlKp5FzRWBEkem+dhelj3rb+cxKEyvPe3TvIUFcmIlV1VCRQ1fBHtX18"
-      + "eC3a3GprH8c40z3S/kdyk7GlFQ27DRLka+iDN05b+MP5jlgvfqYBKxwLfeNu"
-      + "MpxWoCUvYWiQdMih86/l0H+0o5UB8SqRbpuvr6fY910JCk0hDaO1pgB3HlRz"
-      + "k1vb46pg25heXQm3JmO+ghxjOGliYBWjl8p7AfRS9cjS8ca+X02Mv9Viv7Ce"
-      + "3+Gz0MVwfK98viJ3CFxkaEBlM2LM0IeUQbkHG+YwYaTSfl4GYyrug4F0ZdrA"
-      + "KeY9/kIxa/OJxjcIMs2H+2mSpxmrb7ylmHZ2RB8ITiduRVtO091hn/J7N+eT"
-      + "h6BvLBKIFU+UFUdgjxoDNDk7ao++Mu9T3dQfceFBOYzW9vMQgX30yaPLSdan"
-      + "ZMAP0VtiNjCCASsGCSqGSIb3DQEHAaCCARwEggEYMIIBFDCCARAGCyqGSIb3"
-      + "DQEMCgECoIGyMIGvMFUGCSqGSIb3DQEFDTBIMCcGCSqGSIb3DQEFDDAaBAiQ"
-      + "Owewo16xzQICCAAwCgYGKoUDAgIKBQAwHQYGKoUDAgIVMBMECHSCNJJcQ2VI"
-      + "BgcqhQMCAh8BBFYCyRRpFtZgnsxeK7ZHT+aOyoVmzhtnLrqoBHgV4nJJW2/e"
-      + "UcJjc2Rlbzfd+3L/GWcRGF8Bgn+MjiaAqE64Rzaao9t2hc3myw1WrCfPnoEx"
-      + "VI7OPBM5FzFMMCMGCSqGSIb3DQEJFTEWBBTV7LvI27QWRmHD45X2WKXYs3ct"
-      + "AzAlBgkqhkiG9w0BCRQxGB4WAGMAcABfAGUAeABwAG8AcgB0AGUAZDA+MC4w"
-      + "CgYGKoUDAgIJBQAEIJbGZorQsNM63+xozwEI561cTFVCbyHAEEpkvF3eijT8"
-      + "BAgY5sDtkrVeBQICCAA=");
-
-    private byte[] gostPfxFoo123 = Base64.decode(
-        "MIID6gIBAzCCA6MGCSqGSIb3DQEHAaCCA5QEggOQMIIDjDCCApQGCSqGSIb3"
-      + "DQEHBqCCAoUwggKBAgEAMIICegYJKoZIhvcNAQcBMFUGCSqGSIb3DQEFDTBI"
-      + "MCcGCSqGSIb3DQEFDDAaBAhIVrbUVNoQ2wICCAAwCgYGKoUDAgIKBQAwHQYG"
-      + "KoUDAgIVMBMECBLmAh+XCCYhBgcqhQMCAh8BgIICFP9hQLgDq5SORy2npOdo"
-      + "1bvoGl9Qdga1kV9s2c1/Y1kTGpuiYKfm5Il+PurzYdE5t/Wi2+SxoePm/AKA"
-      + "x1Ep5btK/002wnyRbUKdjgF1r7fMXRrd5Ioy8lYxB1v6qhHmzE5fz7FxY+iV"
-      + "Z70dSRS0JkTasI8MRsFLkJJfDb9twgoch8lYGFfYirHLcVy4xxA3JO9VSHm2"
-      + "8nuSWSnsmGN0ufPX14UpV2RFe3Rt0gZ0Jc8u2h2Mo0sIoVU6HVwdXzoe6LN7"
-      + "1NPZdRuhVtjxEvjDAvNJ8WHXQnBQMai2nVAj87uNr6OHLRs+foEccEY9WpPQ"
-      + "GPt4XbPt4MtmVctT2+Gsvf6Ws2UCx6hD4k8i28a6xS8lhTVam2g/2Z5cxtUV"
-      + "HxYt7j13HjuQVsuSNdgtrUnw3l43LnBxRZhlFz0r2zrvTB04ynenS+lGdVuG"
-      + "0TauIH+rdP1ubujw6lFdG9RNgUxWvS5IdwbFGX73a+ZrWiYJeERX11N/6r3g"
-      + "0EqVFNH9t/ROsdAtCCe2FycQoOSb+VxPU6I+SHjwe7Oa7R8Xxazh/eWTsV59"
-      + "QzPuLriUMbyYdQIf4xdclgcJoxFElopgl4orRfzH3XQsVbtTxN33lwjkE0j/"
-      + "686VtcO+b+dU7+BEB7O5yDcx1tupgre0ha/0KOlYfPvmbogGdDf0r6MOwrS7"
-      + "QFXxKlHfp8vn4mNwoy7pjrzjmjclkbkwgfEGCSqGSIb3DQEHAaCB4wSB4DCB"
-      + "3TCB2gYLKoZIhvcNAQwKAQKggaMwgaAwVQYJKoZIhvcNAQUNMEgwJwYJKoZI"
-      + "hvcNAQUMMBoECLD6Ld7TqurqAgIIADAKBgYqhQMCAgoFADAdBgYqhQMCAhUw"
-      + "EwQIoYXV7LETOEAGByqFAwICHwEERyBQK9LuYnOO0ELrge+a6JFeAVwPL85V"
-      + "ip2Kj/GfD3nzZR4tPzCwAt79RriKQklNqa3uCc9o0C9Zk5Qcj36SqiXxD1tz"
-      + "Ea63MSUwIwYJKoZIhvcNAQkVMRYEFKjg5gKM+i+vFhSwaga8YGaZ5thVMD4w"
-      + "LjAKBgYqhQMCAgkFAAQgIwD0CRCwva2Bjdlv5g970H2bCB1aafBNr/hxJLZE"
-      + "Ey4ECAW3VYXJzJpYAgIIAA==");
-
-    /**
-     * we generate the CA's certificate
-     */
-    public static X509Certificate createMasterCert(
-        PublicKey pubKey,
-        PrivateKey privKey)
-        throws Exception
-    {
-        //
-        // signers name
-        //
-        String issuer = "C=AU, O=The Legion of the Bouncy Castle, OU=Bouncy Primary Certificate";
-
-        //
-        // subjects name - the same as we are self signed.
-        //
-        String subject = "C=AU, O=The Legion of the Bouncy Castle, OU=Bouncy Primary Certificate";
-
-        //
-        // create the certificate - version 1
-        //
-        X509v1CertificateBuilder v1CertBuilder = new JcaX509v1CertificateBuilder(
-            new X500Name(issuer),
-            BigInteger.valueOf(1),
-            new Date(System.currentTimeMillis() - 1000L * 60 * 60 * 24 * 30),
-            new Date(System.currentTimeMillis() + (1000L * 60 * 60 * 24 * 30)),
-            new X500Name(subject),
-            pubKey);
-
-        X509CertificateHolder cert = v1CertBuilder.build(new JcaContentSignerBuilder("SHA1withRSA").setProvider(BC).build(privKey));
-
-        return new JcaX509CertificateConverter().setProvider(BC).getCertificate(cert);
-    }
-
-    /**
-     * we generate an intermediate certificate signed by our CA
-     */
-    public static X509Certificate createIntermediateCert(
-        PublicKey pubKey,
-        PrivateKey caPrivKey,
-        X509Certificate caCert)
-        throws Exception
-    {
-        //
-        // subject name builder.
-        //
-        X500NameBuilder subjectBuilder = new X500NameBuilder(BCStyle.INSTANCE);
-
-        subjectBuilder.addRDN(BCStyle.C, "AU");
-        subjectBuilder.addRDN(BCStyle.O, "The Legion of the Bouncy Castle");
-        subjectBuilder.addRDN(BCStyle.OU, "Bouncy Intermediate Certificate");
-        subjectBuilder.addRDN(BCStyle.EmailAddress, "feedback-crypto@bouncycastle.org");
-
-        //
-        // create the certificate - version 3
-        //
-        X509v3CertificateBuilder v3CertBuilder = new JcaX509v3CertificateBuilder(
-            JcaX500NameUtil.getIssuer(caCert),
-            BigInteger.valueOf(2),
-            new Date(System.currentTimeMillis() - 1000L * 60 * 60 * 24 * 30),
-            new Date(System.currentTimeMillis() + (1000L * 60 * 60 * 24 * 30)),
-            subjectBuilder.build(),
-            pubKey);
-
-
-        //
-        // extensions
-        //
-        JcaX509ExtensionUtils utils = new JcaX509ExtensionUtils();
-
-        v3CertBuilder.addExtension(
-            Extension.subjectKeyIdentifier,
-            false,
-            utils.createSubjectKeyIdentifier(pubKey));
-
-        v3CertBuilder.addExtension(
-            Extension.authorityKeyIdentifier,
-            false,
-            utils.createAuthorityKeyIdentifier(caCert));
-
-        v3CertBuilder.addExtension(
-            Extension.basicConstraints,
-            true,
-            new BasicConstraints(0));
-
-        X509CertificateHolder cert = v3CertBuilder.build(new JcaContentSignerBuilder("SHA1withRSA").setProvider(BC).build(caPrivKey));
-
-        return new JcaX509CertificateConverter().setProvider(BC).getCertificate(cert);
-    }
-
-    /**
-     * we generate a certificate signed by our CA's intermediate certficate
-     */
-    public static X509Certificate createCert(
-        PublicKey pubKey,
-        PrivateKey caPrivKey,
-        PublicKey caPubKey)
-        throws Exception
-    {
-        //
-        // signer name builder.
-        //
-        X500NameBuilder issuerBuilder = new X500NameBuilder(BCStyle.INSTANCE);
-
-        issuerBuilder.addRDN(BCStyle.C, "AU");
-        issuerBuilder.addRDN(BCStyle.O, "The Legion of the Bouncy Castle");
-        issuerBuilder.addRDN(BCStyle.OU, "Bouncy Intermediate Certificate");
-        issuerBuilder.addRDN(BCStyle.EmailAddress, "feedback-crypto@bouncycastle.org");
-
-        //
-        // subject name builder
-        //
-        X500NameBuilder subjectBuilder = new X500NameBuilder(BCStyle.INSTANCE);
-
-        subjectBuilder.addRDN(BCStyle.C, "AU");
-        subjectBuilder.addRDN(BCStyle.O, "The Legion of the Bouncy Castle");
-        subjectBuilder.addRDN(BCStyle.L, "Melbourne");
-        subjectBuilder.addRDN(BCStyle.CN, "Eric H. Echidna");
-        subjectBuilder.addRDN(BCStyle.EmailAddress, "feedback-crypto@bouncycastle.org");
-
-        //
-        // create the certificate - version 3
-        //
-        //
-        // create the certificate - version 3
-        //
-        X509v3CertificateBuilder v3CertBuilder = new JcaX509v3CertificateBuilder(
-            issuerBuilder.build(),
-            BigInteger.valueOf(3),
-            new Date(System.currentTimeMillis() - 1000L * 60 * 60 * 24 * 30),
-            new Date(System.currentTimeMillis() + (1000L * 60 * 60 * 24 * 30)),
-            subjectBuilder.build(),
-            pubKey);
-
-
-        //
-        // add the extensions
-        //
-        JcaX509ExtensionUtils utils = new JcaX509ExtensionUtils();
-
-        v3CertBuilder.addExtension(
-            Extension.subjectKeyIdentifier,
-            false,
-            utils.createSubjectKeyIdentifier(pubKey));
-
-        v3CertBuilder.addExtension(
-            Extension.authorityKeyIdentifier,
-            false,
-            utils.createAuthorityKeyIdentifier(caPubKey));
-
-        X509CertificateHolder cert = v3CertBuilder.build(new JcaContentSignerBuilder("SHA1withRSA").setProvider(BC).build(caPrivKey));
-
-        return new JcaX509CertificateConverter().setProvider(BC).getCertificate(cert);
-    }
-
-    public void setUp()
-    {
-        Security.addProvider(new BouncyCastleProvider());
-    }
-
-    public void testPfxPdu()
-        throws Exception
-    {
-        //
-        // set up the keys
-        //
-        KeyFactory fact = KeyFactory.getInstance("RSA", BC);
-        PrivateKey privKey = fact.generatePrivate(privKeySpec);
-        PublicKey pubKey = fact.generatePublic(pubKeySpec);
-
-        X509Certificate[] chain = createCertChain(fact, pubKey);
-
-        PKCS12PfxPdu pfx = createPfx(privKey, pubKey, chain);
-
-        //
-        // now try reading our object
-        //
-        KeyStore store = KeyStore.getInstance("PKCS12", "BC");
-
-        store.load(new ByteArrayInputStream(pfx.toASN1Structure().getEncoded()), passwd);
-
-        PrivateKey recPrivKey = (PrivateKey)store.getKey("Eric's Key", passwd);
-
-        if (!privKey.equals(recPrivKey))
-        {
-            fail("private key extraction failed");
-        }
-
-        Certificate[] certChain = store.getCertificateChain("Eric's Key");
-
-        for (int i = 0; i != certChain.length; i++)
-        {
-            if (!certChain[i].equals(chain[i]))
-            {
-                fail("certificate recovery failed");
-            }
-        }
-    }
-
-    public void testPfxPduMac()
-        throws Exception
-    {
-        //
-        // set up the keys
-        //
-        KeyFactory fact = KeyFactory.getInstance("RSA", BC);
-        PrivateKey privKey = fact.generatePrivate(privKeySpec);
-        PublicKey pubKey = fact.generatePublic(pubKeySpec);
-
-        X509Certificate[] chain = createCertChain(fact, pubKey);
-
-        PKCS12PfxPdu pfx = createPfx(privKey, pubKey, chain);
-
-        assertTrue(pfx.hasMac());
-        assertTrue(pfx.isMacValid(new BcPKCS12MacCalculatorBuilderProvider(BcDefaultDigestProvider.INSTANCE), passwd));
-        assertFalse(pfx.isMacValid(new BcPKCS12MacCalculatorBuilderProvider(BcDefaultDigestProvider.INSTANCE), "not right".toCharArray()));
-    }
-
-    public void testBcEncryptedPrivateKeyInfo()
-        throws Exception
-    {
-        KeyFactory fact = KeyFactory.getInstance("RSA", BC);
-        PrivateKey privKey = fact.generatePrivate(privKeySpec);
-
-        PKCS8EncryptedPrivateKeyInfoBuilder builder = new JcaPKCS8EncryptedPrivateKeyInfoBuilder(privKey);
-
-        PKCS8EncryptedPrivateKeyInfo priv = builder.build(new BcPKCS12PBEOutputEncryptorBuilder(PKCSObjectIdentifiers.pbeWithSHAAnd3_KeyTripleDES_CBC, new CBCBlockCipher(new DESedeEngine())).build(passwd));
-
-        PrivateKeyInfo info = priv.decryptPrivateKeyInfo(new BcPKCS12PBEInputDecryptorProviderBuilder().build(passwd));
-
-        assertTrue(Arrays.areEqual(info.getEncoded(), privKey.getEncoded()));
-    }
-
-    public void testEncryptedPrivateKeyInfo()
-        throws Exception
-    {
-        KeyFactory fact = KeyFactory.getInstance("RSA", BC);
-        PrivateKey privKey = fact.generatePrivate(privKeySpec);
-
-        PKCS8EncryptedPrivateKeyInfoBuilder builder = new JcaPKCS8EncryptedPrivateKeyInfoBuilder(privKey);
-
-        PKCS8EncryptedPrivateKeyInfo priv = builder.build(new JcePKCSPBEOutputEncryptorBuilder(PKCSObjectIdentifiers.pbeWithSHAAnd3_KeyTripleDES_CBC).build(passwd));
-
-        PrivateKeyInfo info = priv.decryptPrivateKeyInfo(new JcePKCSPBEInputDecryptorProviderBuilder().build(passwd));
-
-        assertTrue(Arrays.areEqual(info.getEncoded(), privKey.getEncoded()));
-    }
-
-    public void testEncryptedPrivateKeyInfoPKCS5()
-        throws Exception
-    {
-        KeyFactory fact = KeyFactory.getInstance("RSA", BC);
-        PrivateKey privKey = fact.generatePrivate(privKeySpec);
-
-        PKCS8EncryptedPrivateKeyInfoBuilder builder = new JcaPKCS8EncryptedPrivateKeyInfoBuilder(privKey);
-
-        PKCS8EncryptedPrivateKeyInfo priv = builder.build(new JcePKCSPBEOutputEncryptorBuilder(NISTObjectIdentifiers.id_aes256_CBC).build(passwd));
-
-        PrivateKeyInfo info = priv.decryptPrivateKeyInfo(new JcePKCSPBEInputDecryptorProviderBuilder().build(passwd));
-
-        assertTrue(Arrays.areEqual(info.getEncoded(), privKey.getEncoded()));
-    }
-
-    public void testKeyBag()
-        throws Exception
-    {
-        OutputEncryptor encOut = new BcPKCS12PBEOutputEncryptorBuilder(PKCSObjectIdentifiers.pbeWithSHAAnd3_KeyTripleDES_CBC, new CBCBlockCipher(new DESedeEngine())).build(passwd);
-        InputDecryptorProvider inputDecryptorProvider = new BcPKCS12PBEInputDecryptorProviderBuilder().build(passwd);
-        KeyFactory fact = KeyFactory.getInstance("RSA", BC);
-        PrivateKey privKey = fact.generatePrivate(privKeySpec);
-        PKCS12SafeBagBuilder keyBagBuilder = new JcaPKCS12SafeBagBuilder(privKey);
-
-        keyBagBuilder.addBagAttribute(PKCSObjectIdentifiers.pkcs_9_at_friendlyName, new DERBMPString("Eric's Key"));
-
-        PKCS12PfxPduBuilder builder = new PKCS12PfxPduBuilder();
-
-        builder.addEncryptedData(encOut, keyBagBuilder.build());
-
-        PKCS12PfxPdu pfx = builder.build(new BcPKCS12MacCalculatorBuilder(), passwd);
-        assertTrue(pfx.hasMac());
-        assertTrue(pfx.isMacValid(new BcPKCS12MacCalculatorBuilderProvider(BcDefaultDigestProvider.INSTANCE), passwd));
-
-        ContentInfo[] infos = pfx.getContentInfos();
-
-        for (int i = 0; i != infos.length; i++)
-        {
-            if (infos[i].getContentType().equals(PKCSObjectIdentifiers.encryptedData))
-            {
-                PKCS12SafeBagFactory dataFact = new PKCS12SafeBagFactory(infos[i], inputDecryptorProvider);
-
-                PKCS12SafeBag[] bags = dataFact.getSafeBags();
-
-                assertEquals(1, bags.length);
-                assertEquals(PKCSObjectIdentifiers.keyBag, bags[0].getType());
-
-                assertTrue(Arrays.areEqual(privKey.getEncoded(), ((PrivateKeyInfo)bags[0].getBagValue()).getEncoded()));
-
-                Attribute[] attributes = bags[0].getAttributes();
-
-                assertEquals(1, attributes.length);
-
-                assertEquals(PKCSObjectIdentifiers.pkcs_9_at_friendlyName, attributes[0].getAttrType());
-
-                ASN1Encodable[] attrValues = attributes[0].getAttributeValues();
-
-                assertEquals(1, attrValues.length);
-                assertEquals(new DERBMPString("Eric's Key"), attrValues[0]);
-            }
-            else
-            {
-                fail("unknown bag encountered");
-            }
-        }
-    }
-
-    public void testSafeBagRecovery()
-        throws Exception
-    {
-        InputDecryptorProvider inputDecryptorProvider = new BcPKCS12PBEInputDecryptorProviderBuilder().build(passwd);
-        KeyFactory fact = KeyFactory.getInstance("RSA", BC);
-        PrivateKey privKey = fact.generatePrivate(privKeySpec);
-        PublicKey pubKey = fact.generatePublic(pubKeySpec);
-
-        X509Certificate[] chain = createCertChain(fact, pubKey);
-
-        PKCS12PfxPdu pfx = createPfx(privKey, pubKey, chain);
-
-        ContentInfo[] infos = pfx.getContentInfos();
-
-        for (int i = 0; i != infos.length; i++)
-        {
-            if (infos[i].getContentType().equals(PKCSObjectIdentifiers.encryptedData))
-            {
-                PKCS12SafeBagFactory dataFact = new PKCS12SafeBagFactory(infos[i], inputDecryptorProvider);
-
-                PKCS12SafeBag[] bags = dataFact.getSafeBags();
-
-                assertEquals(3, bags.length);
-                assertEquals(PKCSObjectIdentifiers.certBag, bags[0].getType());
-
-                for (int j = 0; j != bags.length; j++)
-                {
-                    assertTrue(Arrays.areEqual(chain[j].getEncoded(), ((X509CertificateHolder)bags[j].getBagValue()).getEncoded()));
-                }
-            }
-            else
-            {
-                PKCS12SafeBagFactory dataFact = new PKCS12SafeBagFactory(infos[i]);
-
-                PKCS12SafeBag[] bags = dataFact.getSafeBags();
-
-                assertEquals(1, bags.length);
-                assertEquals(PKCSObjectIdentifiers.pkcs8ShroudedKeyBag, bags[0].getType());
-
-                PKCS8EncryptedPrivateKeyInfo encInfo = (PKCS8EncryptedPrivateKeyInfo)bags[0].getBagValue();
-                PrivateKeyInfo info = encInfo.decryptPrivateKeyInfo(inputDecryptorProvider);
-
-                assertTrue(Arrays.areEqual(info.getEncoded(), privKey.getEncoded()));
-            }
-        }
-    }
-
-    public void testExceptions()
-        throws Exception
-    {
-        PKCS12SafeBagFactory dataFact;
-
-        try
-        {
-            dataFact = new PKCS12SafeBagFactory(new ContentInfo(PKCSObjectIdentifiers.data, new DERSequence()), null);
-        }
-        catch (IllegalArgumentException e)
-        {
-
-        }
-
-        try
-        {
-            dataFact = new PKCS12SafeBagFactory(new ContentInfo(PKCSObjectIdentifiers.encryptedData, new DERSequence()));
-        }
-        catch (IllegalArgumentException e)
-        {
-
-        }
-    }
-
-    public void testBasicPKCS12()
-        throws Exception
-    {
-        InputDecryptorProvider inputDecryptorProvider = new JcePKCSPBEInputDecryptorProviderBuilder()
-                                                              .setProvider("BC").build(pkcs12Pass.toCharArray());
-        PKCS12PfxPdu pfx = new PKCS12PfxPdu(pkcs12);
-
-        ContentInfo[] infos = pfx.getContentInfos();
-
-        for (int i = 0; i != infos.length; i++)
-        {
-            if (infos[i].getContentType().equals(PKCSObjectIdentifiers.encryptedData))
-            {
-                PKCS12SafeBagFactory dataFact = new PKCS12SafeBagFactory(infos[i], inputDecryptorProvider);
-
-                PKCS12SafeBag[] bags = dataFact.getSafeBags();
-
-                // TODO: finish!
-//                assertEquals(3, bags.length);
-//                assertEquals(PKCSObjectIdentifiers.certBag, bags[0].getType());
-            }
-            else
-            {
-                PKCS12SafeBagFactory dataFact = new PKCS12SafeBagFactory(infos[i]);
-
-                PKCS12SafeBag[] bags = dataFact.getSafeBags();
-
-                assertEquals(1, bags.length);
-                assertEquals(PKCSObjectIdentifiers.pkcs8ShroudedKeyBag, bags[0].getType());
-
-                PKCS8EncryptedPrivateKeyInfo encInfo = (PKCS8EncryptedPrivateKeyInfo)bags[0].getBagValue();
-                PrivateKeyInfo info = encInfo.decryptPrivateKeyInfo(inputDecryptorProvider);
-            }
-        }
-    }
-
-    public void testSHA256withPKCS5()
-        throws Exception
-    {
-        InputDecryptorProvider inputDecryptorProvider = new JcePKCSPBEInputDecryptorProviderBuilder()
-                                                              .setProvider("BC").build(sha256Pass.toCharArray());
-        PKCS12PfxPdu pfx = new PKCS12PfxPdu(sha256Pfx);
-
-        ContentInfo[] infos = pfx.getContentInfos();
-
-        for (int i = 0; i != infos.length; i++)
-        {
-            if (infos[i].getContentType().equals(PKCSObjectIdentifiers.encryptedData))
-            {
-                PKCS12SafeBagFactory dataFact = new PKCS12SafeBagFactory(infos[i], inputDecryptorProvider);
-
-                PKCS12SafeBag[] bags = dataFact.getSafeBags();
-
-                // TODO: finish!
-//                assertEquals(3, bags.length);
-//                assertEquals(PKCSObjectIdentifiers.certBag, bags[0].getType());
-            }
-            else
-            {
-                PKCS12SafeBagFactory dataFact = new PKCS12SafeBagFactory(infos[i]);
-
-                PKCS12SafeBag[] bags = dataFact.getSafeBags();
-
-                assertEquals(1, bags.length);
-                assertEquals(PKCSObjectIdentifiers.pkcs8ShroudedKeyBag, bags[0].getType());
-
-                PKCS8EncryptedPrivateKeyInfo encInfo = (PKCS8EncryptedPrivateKeyInfo)bags[0].getBagValue();
-                PrivateKeyInfo info = encInfo.decryptPrivateKeyInfo(inputDecryptorProvider);
-            }
-        }
-    }
-
-    public void testCreateAES256andSHA256()
-        throws Exception
-    {
-        OutputEncryptor encOut = new JcePKCSPBEOutputEncryptorBuilder(NISTObjectIdentifiers.id_aes256_CBC).setProvider("BC").build(passwd);
-
-        KeyFactory fact = KeyFactory.getInstance("RSA", BC);
-        PrivateKey privKey = fact.generatePrivate(privKeySpec);
-        PublicKey pubKey = fact.generatePublic(pubKeySpec);
-
-        X509Certificate[] chain = createCertChain(fact, pubKey);
-
-        PKCS12SafeBagBuilder taCertBagBuilder = new JcaPKCS12SafeBagBuilder(chain[2]);
-
-        taCertBagBuilder.addBagAttribute(PKCS12SafeBag.friendlyNameAttribute, new DERBMPString("Bouncy Primary Certificate"));
-
-        PKCS12SafeBagBuilder caCertBagBuilder = new JcaPKCS12SafeBagBuilder(chain[1]);
-
-        caCertBagBuilder.addBagAttribute(PKCS12SafeBag.friendlyNameAttribute, new DERBMPString("Bouncy Intermediate Certificate"));
-
-        JcaX509ExtensionUtils extUtils = new JcaX509ExtensionUtils();
-        PKCS12SafeBagBuilder eeCertBagBuilder = new JcaPKCS12SafeBagBuilder(chain[0]);
-
-        eeCertBagBuilder.addBagAttribute(PKCS12SafeBag.friendlyNameAttribute, new DERBMPString("Eric's Key"));
-        SubjectKeyIdentifier pubKeyId = extUtils.createSubjectKeyIdentifier(chain[0].getPublicKey());
-        eeCertBagBuilder.addBagAttribute(PKCS12SafeBag.localKeyIdAttribute, pubKeyId);
-
-        PKCS12SafeBagBuilder keyBagBuilder = new JcaPKCS12SafeBagBuilder(privKey, encOut);
-
-        keyBagBuilder.addBagAttribute(PKCS12SafeBag.friendlyNameAttribute, new DERBMPString("Eric's Key"));
-        keyBagBuilder.addBagAttribute(PKCS12SafeBag.localKeyIdAttribute, pubKeyId);
-
-        PKCS12PfxPduBuilder builder = new PKCS12PfxPduBuilder();
-
-        builder.addData(keyBagBuilder.build());
-
-        builder.addEncryptedData(new JcePKCSPBEOutputEncryptorBuilder(PKCSObjectIdentifiers.pbeWithSHAAnd128BitRC2_CBC).setProvider("BC").build(passwd), new PKCS12SafeBag[] { eeCertBagBuilder.build(), caCertBagBuilder.build(), taCertBagBuilder.build() });
-
-        PKCS12PfxPdu pfx = builder.build(new JcePKCS12MacCalculatorBuilder(NISTObjectIdentifiers.id_sha256), passwd);
-
-        assertTrue(pfx.hasMac());
-        assertTrue(pfx.isMacValid(new JcePKCS12MacCalculatorBuilderProvider().setProvider("BC"), passwd));
-
-        InputDecryptorProvider inputDecryptorProvider = new JcePKCSPBEInputDecryptorProviderBuilder()
-                                                              .setProvider("BC").build(passwd);
-
-        pfx = new PKCS12PfxPdu(pfx.toASN1Structure().getEncoded());
-
-        ContentInfo[] infos = pfx.getContentInfos();
-        boolean encDataFound = false;
-        boolean pkcs8Found = false;
-
-        for (int i = 0; i != infos.length; i++)
-        {
-            if (infos[i].getContentType().equals(PKCSObjectIdentifiers.encryptedData))
-            {
-                encDataFound = true;
-                PKCS12SafeBagFactory dataFact = new PKCS12SafeBagFactory(infos[i], inputDecryptorProvider);
-
-                PKCS12SafeBag[] bags = dataFact.getSafeBags();
-
-                assertEquals(3, bags.length);
-                assertEquals(PKCSObjectIdentifiers.certBag, bags[0].getType());
-            }
-            else
-            {
-                pkcs8Found = true;
-                PKCS12SafeBagFactory dataFact = new PKCS12SafeBagFactory(infos[i]);
-
-                PKCS12SafeBag[] bags = dataFact.getSafeBags();
-
-                assertEquals(1, bags.length);
-                assertEquals(PKCSObjectIdentifiers.pkcs8ShroudedKeyBag, bags[0].getType());
-
-                PKCS8EncryptedPrivateKeyInfo encInfo = (PKCS8EncryptedPrivateKeyInfo)bags[0].getBagValue();
-                PrivateKeyInfo info = encInfo.decryptPrivateKeyInfo(inputDecryptorProvider);
-            }
-        }
-
-        assertTrue(encDataFound);
-        assertTrue(pkcs8Found);
-
-        KeyStore ks = KeyStore.getInstance("PKCS12", "BC");
-
-        ks.load(new ByteArrayInputStream(pfx.getEncoded(ASN1Encoding.DL)), passwd);
-
-        assertTrue(ks.containsAlias("Eric's Key"));
-    }
-
-    public void testPKCS5()
-        throws Exception
-    {
-        doPKCS5Test(pkcs5Aes128Pfx);
-        doPKCS5Test(pkcs5Aes192Pfx);
-        doPKCS5Test(pkcs5Camellia128Pfx);
-        doPKCS5Test(pkcs5Camellia256Pfx);
-        doPKCS5Test(pkcs5Cast5Pfx);
-    }
-
-    private void doPKCS5Test(byte[] keyStore)
-        throws Exception
-    {
-        InputDecryptorProvider inputDecryptorProvider = new JcePKCSPBEInputDecryptorProviderBuilder()
-                                                                      .setProvider("BC").build(pkcs5Pass.toCharArray());
-        PKCS12PfxPdu pfx = new PKCS12PfxPdu(keyStore);
-
-        ContentInfo[] infos = pfx.getContentInfos();
-
-        for (int i = 0; i != infos.length; i++)
-        {
-            if (infos[i].getContentType().equals(PKCSObjectIdentifiers.encryptedData))
-            {
-                PKCS12SafeBagFactory dataFact = new PKCS12SafeBagFactory(infos[i], inputDecryptorProvider);
-
-                PKCS12SafeBag[] bags = dataFact.getSafeBags();
-
-                // TODO: finish!
-//                assertEquals(3, bags.length);
-//                assertEquals(PKCSObjectIdentifiers.certBag, bags[0].getType());
-            }
-            else
-            {
-                PKCS12SafeBagFactory dataFact = new PKCS12SafeBagFactory(infos[i]);
-
-                PKCS12SafeBag[] bags = dataFact.getSafeBags();
-
-                assertEquals(1, bags.length);
-                assertEquals(PKCSObjectIdentifiers.pkcs8ShroudedKeyBag, bags[0].getType());
-
-                PKCS8EncryptedPrivateKeyInfo encInfo = (PKCS8EncryptedPrivateKeyInfo)bags[0].getBagValue();
-                PrivateKeyInfo info = encInfo.decryptPrivateKeyInfo(inputDecryptorProvider);
-            }
-        }
-    }
-
-    public void testGOST1()
-        throws Exception
-    {
-        char[] password = "1".toCharArray();
-
-        InputDecryptorProvider inputDecryptorProvider = new JcePKCSPBEInputDecryptorProviderBuilder()
-                                                                      .setProvider("BC").build(password);
-        PKCS12PfxPdu pfx = new PKCS12PfxPdu(gostPfx);
-
-        assertTrue(pfx.hasMac());
-        assertTrue(pfx.isMacValid(new JcePKCS12MacCalculatorBuilderProvider().setProvider("BC"), password));
-
-        ContentInfo[] infos = pfx.getContentInfos();
-
-        for (int i = 0; i != infos.length; i++)
-        {
-            if (infos[i].getContentType().equals(PKCSObjectIdentifiers.encryptedData))
-            {
-               PKCS12SafeBagFactory dataFact = new PKCS12SafeBagFactory(infos[i], inputDecryptorProvider);
-
-              PKCS12SafeBag[] bags = dataFact.getSafeBags();
-
-                // TODO: finish!
-//                assertEquals(3, bags.length);
-//                assertEquals(PKCSObjectIdentifiers.certBag, bags[0].getType());
-            }
-            else
-            {
-                PKCS12SafeBagFactory dataFact = new PKCS12SafeBagFactory(infos[i]);
-
-                PKCS12SafeBag[] bags = dataFact.getSafeBags();
-
-                assertEquals(1, bags.length);
-                assertEquals(PKCSObjectIdentifiers.pkcs8ShroudedKeyBag, bags[0].getType());
-
-                PKCS8EncryptedPrivateKeyInfo encInfo = (PKCS8EncryptedPrivateKeyInfo)bags[0].getBagValue();
-                PrivateKeyInfo info = encInfo.decryptPrivateKeyInfo(inputDecryptorProvider);
-                assertEquals(CryptoProObjectIdentifiers.gostR3410_2001, info.getPrivateKeyAlgorithm().getAlgorithm());
-            }
-        }
-    }
-
-    public void testGOST2()
-        throws Exception
-    {
-        char[] password = "foo123".toCharArray();
-
-        InputDecryptorProvider inputDecryptorProvider = new JcePKCSPBEInputDecryptorProviderBuilder()
-                                                                      .setProvider("BC").build(password);
-        PKCS12PfxPdu pfx = new PKCS12PfxPdu(gostPfxFoo123);
-
-        assertTrue(pfx.hasMac());
-        assertTrue(pfx.isMacValid(new JcePKCS12MacCalculatorBuilderProvider().setProvider("BC"), password));
-
-        ContentInfo[] infos = pfx.getContentInfos();
-
-        for (int i = 0; i != infos.length; i++)
-        {
-            if (infos[i].getContentType().equals(PKCSObjectIdentifiers.encryptedData))
-            {
-                PKCS12SafeBagFactory dataFact = new PKCS12SafeBagFactory(infos[i], inputDecryptorProvider);
-
-                PKCS12SafeBag[] bags = dataFact.getSafeBags();
-
-                // TODO: finish!
-//                assertEquals(3, bags.length);
-//                assertEquals(PKCSObjectIdentifiers.certBag, bags[0].getType());
-            }
-            else
-            {
-                PKCS12SafeBagFactory dataFact = new PKCS12SafeBagFactory(infos[i]);
-
-                PKCS12SafeBag[] bags = dataFact.getSafeBags();
-
-                assertEquals(1, bags.length);
-                assertEquals(PKCSObjectIdentifiers.pkcs8ShroudedKeyBag, bags[0].getType());
-
-                PKCS8EncryptedPrivateKeyInfo encInfo = (PKCS8EncryptedPrivateKeyInfo)bags[0].getBagValue();
-                PrivateKeyInfo info = encInfo.decryptPrivateKeyInfo(inputDecryptorProvider);
-                assertEquals(CryptoProObjectIdentifiers.gostR3410_2001, info.getPrivateKeyAlgorithm().getAlgorithm());
-            }
-        }
-    }
-
-    private X509Certificate[] createCertChain(KeyFactory fact, PublicKey pubKey)
-        throws Exception
-    {
-        PrivateKey caPrivKey = fact.generatePrivate(caPrivKeySpec);
-        PublicKey caPubKey = fact.generatePublic(caPubKeySpec);
-        PrivateKey intPrivKey = fact.generatePrivate(intPrivKeySpec);
-        PublicKey intPubKey = fact.generatePublic(intPubKeySpec);
-
-        X509Certificate[] chain = new X509Certificate[3];
-
-        chain[2] = createMasterCert(caPubKey, caPrivKey);
-        chain[1] = createIntermediateCert(intPubKey, caPrivKey, chain[2]);
-        chain[0] = createCert(pubKey, intPrivKey, intPubKey);
-        return chain;
-    }
-
-    private PKCS12PfxPdu createPfx(PrivateKey privKey, PublicKey pubKey, X509Certificate[] chain)
-        throws NoSuchAlgorithmException, IOException, PKCSException
-    {
-        JcaX509ExtensionUtils extUtils = new JcaX509ExtensionUtils();
-
-        PKCS12SafeBagBuilder taCertBagBuilder = new JcaPKCS12SafeBagBuilder(chain[2]);
-
-        taCertBagBuilder.addBagAttribute(PKCSObjectIdentifiers.pkcs_9_at_friendlyName, new DERBMPString("Bouncy Primary Certificate"));
-
-        PKCS12SafeBagBuilder caCertBagBuilder = new JcaPKCS12SafeBagBuilder(chain[1]);
-
-        caCertBagBuilder.addBagAttribute(PKCSObjectIdentifiers.pkcs_9_at_friendlyName, new DERBMPString("Bouncy Intermediate Certificate"));
-
-        PKCS12SafeBagBuilder eeCertBagBuilder = new JcaPKCS12SafeBagBuilder(chain[0]);
-
-        eeCertBagBuilder.addBagAttribute(PKCSObjectIdentifiers.pkcs_9_at_friendlyName, new DERBMPString("Eric's Key"));
-        eeCertBagBuilder.addBagAttribute(PKCSObjectIdentifiers.pkcs_9_at_localKeyId, extUtils.createSubjectKeyIdentifier(pubKey));
-
-        PKCS12SafeBagBuilder keyBagBuilder = new JcaPKCS12SafeBagBuilder(privKey, new BcPKCS12PBEOutputEncryptorBuilder(PKCSObjectIdentifiers.pbeWithSHAAnd3_KeyTripleDES_CBC, new CBCBlockCipher(new DESedeEngine())).build(passwd));
-
-        keyBagBuilder.addBagAttribute(PKCSObjectIdentifiers.pkcs_9_at_friendlyName, new DERBMPString("Eric's Key"));
-        keyBagBuilder.addBagAttribute(PKCSObjectIdentifiers.pkcs_9_at_localKeyId, extUtils.createSubjectKeyIdentifier(pubKey));
-
-        //
-        // construct the actual key store
-        //
-        PKCS12PfxPduBuilder pfxPduBuilder = new PKCS12PfxPduBuilder();
-
-        PKCS12SafeBag[] certs = new PKCS12SafeBag[3];
-
-        certs[0] = eeCertBagBuilder.build();
-        certs[1] = caCertBagBuilder.build();
-        certs[2] = taCertBagBuilder.build();
-
-        pfxPduBuilder.addEncryptedData(new BcPKCS12PBEOutputEncryptorBuilder(PKCSObjectIdentifiers.pbeWithSHAAnd40BitRC2_CBC, new CBCBlockCipher(new RC2Engine())).build(passwd), certs);
-
-        pfxPduBuilder.addData(keyBagBuilder.build());
-
-        return pfxPduBuilder.build(new BcPKCS12MacCalculatorBuilder(), passwd);
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/pkix/PKIXIdentity.java b/bcpkix/src/main/java/org/bouncycastle/pkix/PKIXIdentity.java
deleted file mode 100644
index 84ac046..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/pkix/PKIXIdentity.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package org.bouncycastle.pkix;
-
-import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
-import org.bouncycastle.asn1.x509.SubjectKeyIdentifier;
-import org.bouncycastle.cert.X509CertificateHolder;
-import org.bouncycastle.cms.KeyTransRecipientId;
-import org.bouncycastle.cms.RecipientId;
-
-/**
- * Holder class for public/private key based identity information.
- */
-public class PKIXIdentity
-{
-    private final PrivateKeyInfo privateKeyInfo;
-    private final X509CertificateHolder[] certificateHolders;
-
-    public PKIXIdentity(PrivateKeyInfo privateKeyInfo, X509CertificateHolder[] certificateHolders)
-    {
-        this.privateKeyInfo = privateKeyInfo;
-        this.certificateHolders = new X509CertificateHolder[certificateHolders.length];
-        System.arraycopy(certificateHolders, 0, this.certificateHolders, 0, certificateHolders.length);
-    }
-
-    /**
-     * Return the private key info for this identity.
-     *
-     * @return the identity's private key (if available, null otherwise).
-     */
-    public PrivateKeyInfo getPrivateKeyInfo()
-    {
-        return privateKeyInfo;
-    }
-
-    /**
-     * Return the certificate associated with the private key info.
-     *
-     * @return a X509CertificateHolder
-     */
-    public X509CertificateHolder getCertificate()
-    {
-        return certificateHolders[0];
-    }
-
-    /**
-     * Return a RecipientId for the identity's (private key, certificate) pair.
-     */
-    public RecipientId getRecipientId()
-    {
-        // TODO: handle key agreement
-        return new KeyTransRecipientId(certificateHolders[0].getIssuer(), certificateHolders[0].getSerialNumber(), getSubjectKeyIdentifier());
-    }
-
-    private byte[] getSubjectKeyIdentifier()
-    {
-        SubjectKeyIdentifier subId = SubjectKeyIdentifier.fromExtensions(certificateHolders[0].getExtensions());
-
-        if (subId == null)
-        {
-            return null;
-        }
-
-        return subId.getKeyIdentifier();
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/pkix/jcajce/JcaPKIXIdentity.java b/bcpkix/src/main/java/org/bouncycastle/pkix/jcajce/JcaPKIXIdentity.java
deleted file mode 100644
index 4872c1b..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/pkix/jcajce/JcaPKIXIdentity.java
+++ /dev/null
@@ -1,81 +0,0 @@
-package org.bouncycastle.pkix.jcajce;
-
-import java.security.PrivateKey;
-import java.security.cert.CertificateEncodingException;
-import java.security.cert.X509Certificate;
-
-import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
-import org.bouncycastle.cert.X509CertificateHolder;
-import org.bouncycastle.cert.jcajce.JcaX509CertificateHolder;
-import org.bouncycastle.pkix.PKIXIdentity;
-
-/**
- * Holder class for public/private key based identity information.
- */
-public class JcaPKIXIdentity
-    extends PKIXIdentity
-{
-    private final PrivateKey privKey;
-    private final X509Certificate[] certs;
-
-    private static PrivateKeyInfo getPrivateKeyInfo(PrivateKey privateKey)
-    {
-         try
-         {
-             return PrivateKeyInfo.getInstance(privateKey.getEncoded());
-         }
-         catch (Exception e)             // for a HSM getEncoded() may do anything...
-         {
-             return null;
-         }
-    }
-
-    private static X509CertificateHolder[] getCertificates(X509Certificate[] certs)
-    {
-        X509CertificateHolder[] certHldrs = new X509CertificateHolder[certs.length];
-
-        try
-        {
-            for (int i = 0; i != certHldrs.length; i++)
-            {
-                certHldrs[i] = new JcaX509CertificateHolder(certs[i]);
-            }
-
-            return certHldrs;
-        }
-        catch (CertificateEncodingException e)
-        {
-            throw new IllegalArgumentException("Unable to process certificates: " + e.getMessage());
-        }
-    }
-
-    public JcaPKIXIdentity(PrivateKey privKey, X509Certificate[] certs)
-    {
-        super(getPrivateKeyInfo(privKey), getCertificates(certs));
-
-        this.privKey = privKey;
-        this.certs = new X509Certificate[certs.length];
-
-        System.arraycopy(certs, 0, this.certs, 0, certs.length);
-    }
-
-    /**
-     * Return the private key for this identity.
-     *
-     * @return the identity's private key.
-     */
-    public PrivateKey getPrivateKey()
-    {
-        return privKey;
-    }
-
-    /**
-     * Return the certificate associated with the private key.
-     *
-     * @return the primary certificate.
-     */
-    public X509Certificate getX509Certificate()
-    {
-        return certs[0];
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/tsp/GenTimeAccuracy.java b/bcpkix/src/main/java/org/bouncycastle/tsp/GenTimeAccuracy.java
deleted file mode 100644
index 3cabb86..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/tsp/GenTimeAccuracy.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package org.bouncycastle.tsp;
-
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.tsp.Accuracy;
-
-public class GenTimeAccuracy
-{
-    private Accuracy accuracy;
-
-    public GenTimeAccuracy(Accuracy accuracy)
-    {
-        this.accuracy = accuracy;
-    }
-    
-    public int getSeconds()
-    {
-        return getTimeComponent(accuracy.getSeconds());
-    }
-
-    public int getMillis()
-    {
-        return getTimeComponent(accuracy.getMillis());
-    }
-
-    public int getMicros()
-    {
-        return getTimeComponent(accuracy.getMicros());
-    }
-
-    private int getTimeComponent(
-        ASN1Integer time)
-    {
-        if (time != null)
-        {
-            return time.getValue().intValue();
-        }
-
-        return 0;
-    }
-    
-    public String toString()
-    {                               // digits
-        return getSeconds() + "." + format(getMillis()) + format(getMicros());
-    }
-
-    private String format(int v)
-    {
-        if (v < 10)
-        {
-            return "00" + v;
-        }
-
-        if (v < 100)
-        {
-            return "0" + v;
-        }
-
-        return Integer.toString(v);
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/tsp/TSPAlgorithms.java b/bcpkix/src/main/java/org/bouncycastle/tsp/TSPAlgorithms.java
deleted file mode 100644
index e8b26ad..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/tsp/TSPAlgorithms.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package org.bouncycastle.tsp;
-
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.cryptopro.CryptoProObjectIdentifiers;
-import org.bouncycastle.asn1.nist.NISTObjectIdentifiers;
-import org.bouncycastle.asn1.oiw.OIWObjectIdentifiers;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.asn1.teletrust.TeleTrusTObjectIdentifiers;
-
-/**
- * Recognised hash algorithms for the time stamp protocol.
- */
-public interface TSPAlgorithms
-{
-    public static final ASN1ObjectIdentifier MD5 = PKCSObjectIdentifiers.md5;
-
-    public static final ASN1ObjectIdentifier SHA1 = OIWObjectIdentifiers.idSHA1;
-    
-    public static final ASN1ObjectIdentifier SHA224 = NISTObjectIdentifiers.id_sha224;
-    public static final ASN1ObjectIdentifier SHA256 = NISTObjectIdentifiers.id_sha256;
-    public static final ASN1ObjectIdentifier SHA384 = NISTObjectIdentifiers.id_sha384;
-    public static final ASN1ObjectIdentifier SHA512 = NISTObjectIdentifiers.id_sha512;
-
-    public static final ASN1ObjectIdentifier RIPEMD128 = TeleTrusTObjectIdentifiers.ripemd128;
-    public static final ASN1ObjectIdentifier RIPEMD160 = TeleTrusTObjectIdentifiers.ripemd160;
-    public static final ASN1ObjectIdentifier RIPEMD256 = TeleTrusTObjectIdentifiers.ripemd256;
-    
-    public static final ASN1ObjectIdentifier GOST3411 = CryptoProObjectIdentifiers.gostR3411;
-    
-    public static final Set    ALLOWED = new HashSet(Arrays.asList(new ASN1ObjectIdentifier[] { GOST3411, MD5, SHA1, SHA224, SHA256, SHA384, SHA512, RIPEMD128, RIPEMD160, RIPEMD256 }));
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/tsp/TSPException.java b/bcpkix/src/main/java/org/bouncycastle/tsp/TSPException.java
deleted file mode 100644
index a04e5c5..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/tsp/TSPException.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package org.bouncycastle.tsp;
-
-public class TSPException
-    extends Exception
-{
-    Throwable underlyingException;
-
-    public TSPException(String message)
-    {
-        super(message);
-    }
-
-    public TSPException(String message, Throwable e)
-    {
-        super(message);
-        underlyingException = e;
-    }
-
-    public Exception getUnderlyingException()
-    {
-        return (Exception)underlyingException;
-    }
-
-    public Throwable getCause()
-    {
-        return underlyingException;
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/tsp/TSPIOException.java b/bcpkix/src/main/java/org/bouncycastle/tsp/TSPIOException.java
deleted file mode 100644
index 0be66db..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/tsp/TSPIOException.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package org.bouncycastle.tsp;
-
-import java.io.IOException;
-
-public class TSPIOException
-    extends IOException
-{
-    Throwable underlyingException;
-
-    public TSPIOException(String message)
-    {
-        super(message);
-    }
-
-    public TSPIOException(String message, Throwable e)
-    {
-        super(message);
-        underlyingException = e;
-    }
-
-    public Exception getUnderlyingException()
-    {
-        return (Exception)underlyingException;
-    }
-
-    public Throwable getCause()
-    {
-        return underlyingException;
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/tsp/TSPUtil.java b/bcpkix/src/main/java/org/bouncycastle/tsp/TSPUtil.java
deleted file mode 100644
index d757071..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/tsp/TSPUtil.java
+++ /dev/null
@@ -1,209 +0,0 @@
-package org.bouncycastle.tsp;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1Set;
-import org.bouncycastle.asn1.cms.Attribute;
-import org.bouncycastle.asn1.cms.AttributeTable;
-import org.bouncycastle.asn1.cms.ContentInfo;
-import org.bouncycastle.asn1.cryptopro.CryptoProObjectIdentifiers;
-import org.bouncycastle.asn1.nist.NISTObjectIdentifiers;
-import org.bouncycastle.asn1.oiw.OIWObjectIdentifiers;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.asn1.teletrust.TeleTrusTObjectIdentifiers;
-import org.bouncycastle.asn1.x509.ExtendedKeyUsage;
-import org.bouncycastle.asn1.x509.Extension;
-import org.bouncycastle.asn1.x509.Extensions;
-import org.bouncycastle.asn1.x509.ExtensionsGenerator;
-import org.bouncycastle.asn1.x509.KeyPurposeId;
-import org.bouncycastle.cert.X509CertificateHolder;
-import org.bouncycastle.cms.SignerInformation;
-import org.bouncycastle.operator.DigestCalculator;
-import org.bouncycastle.operator.DigestCalculatorProvider;
-import org.bouncycastle.operator.OperatorCreationException;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.Integers;
-
-public class TSPUtil
-{
-    private static List EMPTY_LIST = Collections.unmodifiableList(new ArrayList());
-
-    private static final Map digestLengths = new HashMap();
-    private static final Map digestNames = new HashMap();
-
-    static
-    {
-        digestLengths.put(PKCSObjectIdentifiers.md5.getId(), Integers.valueOf(16));
-        digestLengths.put(OIWObjectIdentifiers.idSHA1.getId(), Integers.valueOf(20));
-        digestLengths.put(NISTObjectIdentifiers.id_sha224.getId(), Integers.valueOf(28));
-        digestLengths.put(NISTObjectIdentifiers.id_sha256.getId(), Integers.valueOf(32));
-        digestLengths.put(NISTObjectIdentifiers.id_sha384.getId(), Integers.valueOf(48));
-        digestLengths.put(NISTObjectIdentifiers.id_sha512.getId(), Integers.valueOf(64));
-        digestLengths.put(TeleTrusTObjectIdentifiers.ripemd128.getId(), Integers.valueOf(16));
-        digestLengths.put(TeleTrusTObjectIdentifiers.ripemd160.getId(), Integers.valueOf(20));
-        digestLengths.put(TeleTrusTObjectIdentifiers.ripemd256.getId(), Integers.valueOf(32));
-        digestLengths.put(CryptoProObjectIdentifiers.gostR3411.getId(), Integers.valueOf(32));
-
-        digestNames.put(PKCSObjectIdentifiers.md5.getId(), "MD5");
-        digestNames.put(OIWObjectIdentifiers.idSHA1.getId(), "SHA1");
-        digestNames.put(NISTObjectIdentifiers.id_sha224.getId(), "SHA224");
-        digestNames.put(NISTObjectIdentifiers.id_sha256.getId(), "SHA256");
-        digestNames.put(NISTObjectIdentifiers.id_sha384.getId(), "SHA384");
-        digestNames.put(NISTObjectIdentifiers.id_sha512.getId(), "SHA512");
-        digestNames.put(PKCSObjectIdentifiers.sha1WithRSAEncryption.getId(), "SHA1");
-        digestNames.put(PKCSObjectIdentifiers.sha224WithRSAEncryption.getId(), "SHA224");
-        digestNames.put(PKCSObjectIdentifiers.sha256WithRSAEncryption.getId(), "SHA256");
-        digestNames.put(PKCSObjectIdentifiers.sha384WithRSAEncryption.getId(), "SHA384");
-        digestNames.put(PKCSObjectIdentifiers.sha512WithRSAEncryption.getId(), "SHA512");
-        digestNames.put(TeleTrusTObjectIdentifiers.ripemd128.getId(), "RIPEMD128");
-        digestNames.put(TeleTrusTObjectIdentifiers.ripemd160.getId(), "RIPEMD160");
-        digestNames.put(TeleTrusTObjectIdentifiers.ripemd256.getId(), "RIPEMD256");
-        digestNames.put(CryptoProObjectIdentifiers.gostR3411.getId(), "GOST3411");
-    }
-
-     /**
-     * Fetches the signature time-stamp attributes from a SignerInformation object.
-     * Checks that the MessageImprint for each time-stamp matches the signature field.
-     * (see RFC 3161 Appendix A).
-     *
-     * @param signerInfo a SignerInformation to search for time-stamps
-     * @param digCalcProvider provider for digest calculators
-     * @return a collection of TimeStampToken objects
-     * @throws TSPValidationException
-     */
-    public static Collection getSignatureTimestamps(SignerInformation signerInfo, DigestCalculatorProvider digCalcProvider)
-        throws TSPValidationException
-    {
-        List timestamps = new ArrayList();
-
-        AttributeTable unsignedAttrs = signerInfo.getUnsignedAttributes();
-        if (unsignedAttrs != null)
-        {
-            ASN1EncodableVector allTSAttrs = unsignedAttrs.getAll(
-                PKCSObjectIdentifiers.id_aa_signatureTimeStampToken);
-            for (int i = 0; i < allTSAttrs.size(); ++i)
-            {
-                Attribute tsAttr = (Attribute)allTSAttrs.get(i);
-                ASN1Set tsAttrValues = tsAttr.getAttrValues();
-                for (int j = 0; j < tsAttrValues.size(); ++j)
-                {
-                    try
-                    {
-                        ContentInfo contentInfo = ContentInfo.getInstance(tsAttrValues.getObjectAt(j));
-                        TimeStampToken timeStampToken = new TimeStampToken(contentInfo);
-                        TimeStampTokenInfo tstInfo = timeStampToken.getTimeStampInfo();
-
-                        DigestCalculator digCalc = digCalcProvider.get(tstInfo.getHashAlgorithm());
-
-                        OutputStream dOut = digCalc.getOutputStream();
-
-                        dOut.write(signerInfo.getSignature());
-                        dOut.close();
-
-                        byte[] expectedDigest = digCalc.getDigest();
-
-                        if (!Arrays.constantTimeAreEqual(expectedDigest, tstInfo.getMessageImprintDigest()))
-                        {
-                            throw new TSPValidationException("Incorrect digest in message imprint");
-                        }
-
-                        timestamps.add(timeStampToken);
-                    }
-                    catch (OperatorCreationException e)
-                    {
-                        throw new TSPValidationException("Unknown hash algorithm specified in timestamp");
-                    }
-                    catch (Exception e)
-                    {
-                        throw new TSPValidationException("Timestamp could not be parsed");
-                    }
-                }
-            }
-        }
-
-        return timestamps;
-    }
-
-    /**
-     * Validate the passed in certificate as being of the correct type to be used
-     * for time stamping. To be valid it must have an ExtendedKeyUsage extension
-     * which has a key purpose identifier of id-kp-timeStamping.
-     *
-     * @param cert the certificate of interest.
-     * @throws TSPValidationException if the certificate fails on one of the check points.
-     */
-    public static void validateCertificate(
-        X509CertificateHolder cert)
-        throws TSPValidationException
-    {
-        if (cert.toASN1Structure().getVersionNumber() != 3)
-        {
-            throw new IllegalArgumentException("Certificate must have an ExtendedKeyUsage extension.");
-        }
-
-        Extension ext = cert.getExtension(Extension.extendedKeyUsage);
-        if (ext == null)
-        {
-            throw new TSPValidationException("Certificate must have an ExtendedKeyUsage extension.");
-        }
-
-        if (!ext.isCritical())
-        {
-            throw new TSPValidationException("Certificate must have an ExtendedKeyUsage extension marked as critical.");
-        }
-
-        ExtendedKeyUsage    extKey = ExtendedKeyUsage.getInstance(ext.getParsedValue());
-
-        if (!extKey.hasKeyPurposeId(KeyPurposeId.id_kp_timeStamping) || extKey.size() != 1)
-        {
-            throw new TSPValidationException("ExtendedKeyUsage not solely time stamping.");
-        }
-    }
-
-    static int getDigestLength(
-        String digestAlgOID)
-        throws TSPException
-    {
-        Integer length = (Integer)digestLengths.get(digestAlgOID);
-
-        if (length != null)
-        {
-            return length.intValue();
-        }
-
-        throw new TSPException("digest algorithm cannot be found.");
-    }
-
-    static List getExtensionOIDs(Extensions extensions)
-    {
-        if (extensions == null)
-        {
-            return EMPTY_LIST;
-        }
-
-        return Collections.unmodifiableList(java.util.Arrays.asList(extensions.getExtensionOIDs()));
-    }
-
-    static void addExtension(ExtensionsGenerator extGenerator, ASN1ObjectIdentifier oid, boolean isCritical, ASN1Encodable value)
-        throws TSPIOException
-    {
-        try
-        {
-            extGenerator.addExtension(oid, isCritical, value);
-        }
-        catch (IOException e)
-        {
-            throw new TSPIOException("cannot encode extension: " + e.getMessage(), e);
-        }
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/tsp/TSPValidationException.java b/bcpkix/src/main/java/org/bouncycastle/tsp/TSPValidationException.java
deleted file mode 100644
index 552b302..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/tsp/TSPValidationException.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package org.bouncycastle.tsp;
-
-/**
- * Exception thrown if a TSP request or response fails to validate.
- * <p>
- * If a failure code is associated with the exception it can be retrieved using
- * the getFailureCode() method.
- */
-public class TSPValidationException
-    extends TSPException
-{
-    private int failureCode = -1;
-    
-    public TSPValidationException(String message)
-    {
-        super(message);
-    }
-
-    public TSPValidationException(String message, int failureCode)
-    {
-        super(message);
-        this.failureCode = failureCode;
-    }
-    
-    /**
-     * Return the failure code associated with this exception - if one is set.
-     * 
-     * @return the failure code if set, -1 otherwise.
-     */
-    public int getFailureCode()
-    {
-        return failureCode;
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/tsp/TimeStampRequest.java b/bcpkix/src/main/java/org/bouncycastle/tsp/TimeStampRequest.java
deleted file mode 100644
index fa7c9f7..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/tsp/TimeStampRequest.java
+++ /dev/null
@@ -1,267 +0,0 @@
-package org.bouncycastle.tsp;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.math.BigInteger;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.cmp.PKIFailureInfo;
-import org.bouncycastle.asn1.tsp.TimeStampReq;
-import org.bouncycastle.asn1.x509.Extension;
-import org.bouncycastle.asn1.x509.Extensions;
-
-/**
- * Base class for an RFC 3161 Time Stamp Request.
- */
-public class TimeStampRequest
-{
-    private static Set EMPTY_SET = Collections.unmodifiableSet(new HashSet());
-
-    private TimeStampReq req;
-    private Extensions extensions;
-
-    public TimeStampRequest(TimeStampReq req)
-    {
-        this.req = req;
-        this.extensions = req.getExtensions();
-    }
-
-    /**
-     * Create a TimeStampRequest from the past in byte array.
-     * 
-     * @param req byte array containing the request.
-     * @throws IOException if the request is malformed.
-     */
-    public TimeStampRequest(byte[] req) 
-        throws IOException
-    {
-        this(new ByteArrayInputStream(req));
-    }
-
-    /**
-     * Create a TimeStampRequest from the past in input stream.
-     * 
-     * @param in input stream containing the request.
-     * @throws IOException if the request is malformed.
-     */
-    public TimeStampRequest(InputStream in) 
-        throws IOException
-    {
-        this(loadRequest(in));
-    }
-
-    private static TimeStampReq loadRequest(InputStream in)
-        throws IOException
-    {
-        try
-        {
-            return TimeStampReq.getInstance(new ASN1InputStream(in).readObject());
-        }
-        catch (ClassCastException e)
-        {
-            throw new IOException("malformed request: " + e);
-        }
-        catch (IllegalArgumentException e)
-        {
-            throw new IOException("malformed request: " + e);
-        }
-    }
-
-    public int getVersion()
-    {
-        return req.getVersion().getValue().intValue();
-    }
-
-    public ASN1ObjectIdentifier getMessageImprintAlgOID()
-    {
-        return req.getMessageImprint().getHashAlgorithm().getAlgorithm();
-    }
-
-    public byte[] getMessageImprintDigest()
-    {
-        return req.getMessageImprint().getHashedMessage();
-    }
-
-    public ASN1ObjectIdentifier getReqPolicy()
-    {
-        if (req.getReqPolicy() != null)
-        {
-            return req.getReqPolicy();
-        }
-        else
-        {
-            return null;
-        }
-    }
-
-    public BigInteger getNonce()
-    {
-        if (req.getNonce() != null)
-        {
-            return req.getNonce().getValue();
-        }
-        else
-        {
-            return null;
-        }
-    }
-
-    public boolean getCertReq()
-    {
-        if (req.getCertReq() != null)
-        {
-            return req.getCertReq().isTrue();
-        }
-        else
-        {
-            return false;
-        }
-    }
-
-    /**
-     * Validate the timestamp request, checking the digest to see if it is of an
-     * accepted type and whether it is of the correct length for the algorithm specified.
-     *
-     * @param algorithms a set of OIDs giving accepted algorithms.
-     * @param policies if non-null a set of policies OIDs we are willing to sign under.
-     * @param extensions if non-null a set of extensions OIDs we are willing to accept.
-     * @throws TSPException if the request is invalid, or processing fails.
-     */
-    public void validate(
-        Set    algorithms,
-        Set    policies,
-        Set    extensions)
-        throws TSPException
-    {
-        algorithms = convert(algorithms);
-        policies = convert(policies);
-        extensions = convert(extensions);
-
-        if (!algorithms.contains(this.getMessageImprintAlgOID()))
-        {
-            throw new TSPValidationException("request contains unknown algorithm.", PKIFailureInfo.badAlg);
-        }
-
-        if (policies != null && this.getReqPolicy() != null && !policies.contains(this.getReqPolicy()))
-        {
-            throw new TSPValidationException("request contains unknown policy.", PKIFailureInfo.unacceptedPolicy);
-        }
-
-        if (this.getExtensions() != null && extensions != null)
-        {
-            Enumeration en = this.getExtensions().oids();
-            while(en.hasMoreElements())
-            {
-                String  oid = ((ASN1ObjectIdentifier)en.nextElement()).getId();
-                if (!extensions.contains(oid))
-                {
-                    throw new TSPValidationException("request contains unknown extension.", PKIFailureInfo.unacceptedExtension);
-                }
-            }
-        }
-
-        int digestLength = TSPUtil.getDigestLength(this.getMessageImprintAlgOID().getId());
-
-        if (digestLength != this.getMessageImprintDigest().length)
-        {
-            throw new TSPValidationException("imprint digest the wrong length.", PKIFailureInfo.badDataFormat);
-        }
-    }
-
-   /**
-    * return the ASN.1 encoded representation of this object.
-    * @return the default ASN,1 byte encoding for the object.
-    */
-    public byte[] getEncoded() throws IOException
-    {
-        return req.getEncoded();
-    }
-
-    Extensions getExtensions()
-    {
-        return extensions;
-    }
-
-    public boolean hasExtensions()
-    {
-        return extensions != null;
-    }
-
-    public Extension getExtension(ASN1ObjectIdentifier oid)
-    {
-        if (extensions != null)
-        {
-            return extensions.getExtension(oid);
-        }
-
-        return null;
-    }
-
-    public List getExtensionOIDs()
-    {
-        return TSPUtil.getExtensionOIDs(extensions);
-    }
-
-    /**
-     * Returns a set of ASN1ObjectIdentifiers giving the non-critical extensions.
-     * @return a set of ASN1ObjectIdentifiers.
-     */
-    public Set getNonCriticalExtensionOIDs()
-    {
-        if (extensions == null)
-        {
-            return EMPTY_SET;
-        }
-
-        return Collections.unmodifiableSet(new HashSet(Arrays.asList(extensions.getNonCriticalExtensionOIDs())));
-    }
-
-    /**
-     * Returns a set of ASN1ObjectIdentifiers giving the critical extensions.
-     * @return a set of ASN1ObjectIdentifiers.
-     */
-    public Set getCriticalExtensionOIDs()
-    {
-        if (extensions == null)
-        {
-            return EMPTY_SET;
-        }
-
-        return Collections.unmodifiableSet(new HashSet(Arrays.asList(extensions.getCriticalExtensionOIDs())));
-    }
-
-    private Set convert(Set orig)
-    {
-        if (orig == null)
-        {
-            return orig;
-        }
-
-        Set con = new HashSet(orig.size());
-
-        for (Iterator it = orig.iterator(); it.hasNext();)
-        {
-            Object o = it.next();
-
-            if (o instanceof String)
-            {
-                con.add(new ASN1ObjectIdentifier((String)o));
-            }
-            else
-            {
-                con.add(o);
-            }
-        }
-
-        return con;
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/tsp/TimeStampRequestGenerator.java b/bcpkix/src/main/java/org/bouncycastle/tsp/TimeStampRequestGenerator.java
deleted file mode 100644
index 0f9900d..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/tsp/TimeStampRequestGenerator.java
+++ /dev/null
@@ -1,163 +0,0 @@
-package org.bouncycastle.tsp;
-
-import java.io.IOException;
-import java.math.BigInteger;
-
-import org.bouncycastle.asn1.ASN1Boolean;
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.DERNull;
-import org.bouncycastle.asn1.tsp.MessageImprint;
-import org.bouncycastle.asn1.tsp.TimeStampReq;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.asn1.x509.Extensions;
-import org.bouncycastle.asn1.x509.ExtensionsGenerator;
-
-/**
- * Generator for RFC 3161 Time Stamp Request objects.
- */
-public class TimeStampRequestGenerator
-{
-    private ASN1ObjectIdentifier reqPolicy;
-
-    private ASN1Boolean certReq;
-    private ExtensionsGenerator extGenerator = new ExtensionsGenerator();
-
-    public TimeStampRequestGenerator()
-    {
-    }
-
-    /**
-     * @deprecated use method taking ASN1ObjectIdentifier
-     * @param reqPolicy
-     */
-    public void setReqPolicy(
-        String reqPolicy)
-    {
-        this.reqPolicy= new ASN1ObjectIdentifier(reqPolicy);
-    }
-
-    public void setReqPolicy(
-        ASN1ObjectIdentifier reqPolicy)
-    {
-        this.reqPolicy= reqPolicy;
-    }
-
-    public void setCertReq(
-        boolean certReq)
-    {
-        this.certReq = ASN1Boolean.getInstance(certReq);
-    }
-
-    /**
-     * add a given extension field for the standard extensions tag (tag 3)
-     * @throws IOException
-     * @deprecated use method taking ASN1ObjectIdentifier
-     */
-    public void addExtension(
-        String          OID,
-        boolean         critical,
-        ASN1Encodable   value)
-        throws IOException
-    {
-        this.addExtension(OID, critical, value.toASN1Primitive().getEncoded());
-    }
-
-    /**
-     * add a given extension field for the standard extensions tag
-     * The value parameter becomes the contents of the octet string associated
-     * with the extension.
-     * @deprecated use method taking ASN1ObjectIdentifier
-     */
-    public void addExtension(
-        String          OID,
-        boolean         critical,
-        byte[]          value)
-    {
-        extGenerator.addExtension(new ASN1ObjectIdentifier(OID), critical, value);
-    }
-
-    /**
-     * add a given extension field for the standard extensions tag (tag 3)
-     * @throws TSPIOException
-     */
-    public void addExtension(
-        ASN1ObjectIdentifier oid,
-        boolean              isCritical,
-        ASN1Encodable        value)
-        throws TSPIOException
-    {
-        TSPUtil.addExtension(extGenerator, oid, isCritical, value);
-    }
-
-    /**
-     * add a given extension field for the standard extensions tag
-     * The value parameter becomes the contents of the octet string associated
-     * with the extension.
-     */
-    public void addExtension(
-        ASN1ObjectIdentifier oid,
-        boolean              isCritical,
-        byte[]               value)
-    {
-        extGenerator.addExtension(oid, isCritical, value);
-    }
-
-    /**
-     * @deprecated use method taking ANS1ObjectIdentifier
-     */
-    public TimeStampRequest generate(
-        String digestAlgorithm,
-        byte[] digest)
-    {
-        return this.generate(digestAlgorithm, digest, null);
-    }
-
-    /**
-     * @deprecated use method taking ANS1ObjectIdentifier
-     */
-    public TimeStampRequest generate(
-        String      digestAlgorithmOID,
-        byte[]      digest,
-        BigInteger  nonce)
-    {
-        if (digestAlgorithmOID == null)
-        {
-            throw new IllegalArgumentException("No digest algorithm specified");
-        }
-
-        ASN1ObjectIdentifier digestAlgOID = new ASN1ObjectIdentifier(digestAlgorithmOID);
-
-        AlgorithmIdentifier algID = new AlgorithmIdentifier(digestAlgOID, DERNull.INSTANCE);
-        MessageImprint messageImprint = new MessageImprint(algID, digest);
-
-        Extensions  ext = null;
-        
-        if (!extGenerator.isEmpty())
-        {
-            ext = extGenerator.generate();
-        }
-        
-        if (nonce != null)
-        {
-            return new TimeStampRequest(new TimeStampReq(messageImprint,
-                    reqPolicy, new ASN1Integer(nonce), certReq, ext));
-        }
-        else
-        {
-            return new TimeStampRequest(new TimeStampReq(messageImprint,
-                    reqPolicy, null, certReq, ext));
-        }
-    }
-
-    public TimeStampRequest generate(ASN1ObjectIdentifier digestAlgorithm, byte[] digest)
-    {
-        return generate(digestAlgorithm.getId(), digest);
-    }
-
-    public TimeStampRequest generate(ASN1ObjectIdentifier digestAlgorithm, byte[] digest, BigInteger nonce)
-    {
-        return generate(digestAlgorithm.getId(), digest, nonce);
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/tsp/TimeStampResponse.java b/bcpkix/src/main/java/org/bouncycastle/tsp/TimeStampResponse.java
deleted file mode 100644
index 7d13510..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/tsp/TimeStampResponse.java
+++ /dev/null
@@ -1,189 +0,0 @@
-package org.bouncycastle.tsp;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.cmp.PKIFailureInfo;
-import org.bouncycastle.asn1.cmp.PKIFreeText;
-import org.bouncycastle.asn1.cmp.PKIStatus;
-import org.bouncycastle.asn1.cms.Attribute;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.asn1.tsp.TimeStampResp;
-import org.bouncycastle.util.Arrays;
-
-/**
- * Base class for an RFC 3161 Time Stamp Response object.
- */
-public class TimeStampResponse
-{
-    TimeStampResp   resp;
-    TimeStampToken  timeStampToken;
-
-    public TimeStampResponse(TimeStampResp resp)
-        throws TSPException, IOException
-    {
-        this.resp = resp;
-        
-        if (resp.getTimeStampToken() != null)
-        {
-            timeStampToken = new TimeStampToken(resp.getTimeStampToken());
-        }
-    }
-
-    /**
-     * Create a TimeStampResponse from a byte array containing an ASN.1 encoding.
-     * 
-     * @param resp the byte array containing the encoded response.
-     * @throws TSPException if the response is malformed.
-     * @throws IOException if the byte array doesn't represent an ASN.1 encoding.
-     */
-    public TimeStampResponse(byte[] resp)
-        throws TSPException, IOException
-    {
-        this(new ByteArrayInputStream(resp));
-    }
-
-    /**
-     * Create a TimeStampResponse from an input stream containing an ASN.1 encoding.
-     * 
-     * @param in the input stream containing the encoded response.
-     * @throws TSPException if the response is malformed.
-     * @throws IOException if the stream doesn't represent an ASN.1 encoding.
-     */
-    public TimeStampResponse(InputStream in)
-        throws TSPException, IOException
-    {
-        this(readTimeStampResp(in));
-    }
-
-    private static TimeStampResp readTimeStampResp(
-        InputStream in) 
-        throws IOException, TSPException
-    {
-        try
-        {
-            return TimeStampResp.getInstance(new ASN1InputStream(in).readObject());
-        }
-        catch (IllegalArgumentException e)
-        {
-            throw new TSPException("malformed timestamp response: " + e, e);
-        }
-        catch (ClassCastException e)
-        {
-            throw new TSPException("malformed timestamp response: " + e, e);
-        }
-    }
-    
-    public int getStatus()
-    {
-        return resp.getStatus().getStatus().intValue();
-    }
-
-    public String getStatusString()
-    {
-        if (resp.getStatus().getStatusString() != null)
-        {
-            StringBuffer statusStringBuf = new StringBuffer();
-            PKIFreeText text = resp.getStatus().getStatusString();
-            for (int i = 0; i != text.size(); i++)
-            {
-                statusStringBuf.append(text.getStringAt(i).getString());
-            }
-            return statusStringBuf.toString();
-        }
-        else
-        {
-            return null;
-        }
-    }
-
-    public PKIFailureInfo getFailInfo()
-    {
-        if (resp.getStatus().getFailInfo() != null)
-        {
-            return new PKIFailureInfo(resp.getStatus().getFailInfo());
-        }
-        
-        return null;
-    }
-
-    public TimeStampToken getTimeStampToken()
-    {
-        return timeStampToken;
-    }
-
-    /**
-     * Check this response against to see if it a well formed response for 
-     * the passed in request. Validation will include checking the time stamp
-     * token if the response status is GRANTED or GRANTED_WITH_MODS.
-     * 
-     * @param request the request to be checked against
-     * @throws TSPException if the request can not match this response.
-     */
-    public void validate(
-        TimeStampRequest    request)
-        throws TSPException
-    {
-        TimeStampToken tok = this.getTimeStampToken();
-        
-        if (tok != null)
-        {
-            TimeStampTokenInfo  tstInfo = tok.getTimeStampInfo();
-            
-            if (request.getNonce() != null && !request.getNonce().equals(tstInfo.getNonce()))
-            {
-                throw new TSPValidationException("response contains wrong nonce value.");
-            }
-            
-            if (this.getStatus() != PKIStatus.GRANTED && this.getStatus() != PKIStatus.GRANTED_WITH_MODS)
-            {
-                throw new TSPValidationException("time stamp token found in failed request.");
-            }
-            
-            if (!Arrays.constantTimeAreEqual(request.getMessageImprintDigest(), tstInfo.getMessageImprintDigest()))
-            {
-                throw new TSPValidationException("response for different message imprint digest.");
-            }
-            
-            if (!tstInfo.getMessageImprintAlgOID().equals(request.getMessageImprintAlgOID()))
-            {
-                throw new TSPValidationException("response for different message imprint algorithm.");
-            }
-
-            Attribute scV1 = tok.getSignedAttributes().get(PKCSObjectIdentifiers.id_aa_signingCertificate);
-            Attribute scV2 = tok.getSignedAttributes().get(PKCSObjectIdentifiers.id_aa_signingCertificateV2);
-
-            if (scV1 == null && scV2 == null)
-            {
-                throw new TSPValidationException("no signing certificate attribute present.");
-            }
-
-            if (scV1 != null && scV2 != null)
-            {
-                /*
-                 * RFC 5035 5.4. If both attributes exist in a single message,
-                 * they are independently evaluated. 
-                 */
-            }
-
-            if (request.getReqPolicy() != null && !request.getReqPolicy().equals(tstInfo.getPolicy()))
-            {
-                throw new TSPValidationException("TSA policy wrong for request.");
-            }
-        }
-        else if (this.getStatus() == PKIStatus.GRANTED || this.getStatus() == PKIStatus.GRANTED_WITH_MODS)
-        {
-            throw new TSPValidationException("no time stamp token found and one expected.");
-        }
-    }
-    
-    /**
-     * return the ASN.1 encoded representation of this object.
-     */
-    public byte[] getEncoded() throws IOException
-    {
-        return resp.getEncoded();
-    }
-}
\ No newline at end of file
diff --git a/bcpkix/src/main/java/org/bouncycastle/tsp/TimeStampResponseGenerator.java b/bcpkix/src/main/java/org/bouncycastle/tsp/TimeStampResponseGenerator.java
deleted file mode 100644
index 8ab68aa..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/tsp/TimeStampResponseGenerator.java
+++ /dev/null
@@ -1,353 +0,0 @@
-package org.bouncycastle.tsp;
-
-import java.io.IOException;
-import java.math.BigInteger;
-import java.util.Date;
-import java.util.HashSet;
-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.DERSequence;
-import org.bouncycastle.asn1.DERUTF8String;
-import org.bouncycastle.asn1.cmp.PKIFailureInfo;
-import org.bouncycastle.asn1.cmp.PKIFreeText;
-import org.bouncycastle.asn1.cmp.PKIStatus;
-import org.bouncycastle.asn1.cmp.PKIStatusInfo;
-import org.bouncycastle.asn1.cms.ContentInfo;
-import org.bouncycastle.asn1.tsp.TimeStampResp;
-
-/**
- * Generator for RFC 3161 Time Stamp Responses.
- * <p>
- * New generate methods have been introduced to give people more control over what ends up in the message.
- * Unfortunately it turns out that in some cases fields like statusString must be left out otherwise a an
- * otherwise valid timestamp will be rejected.
- * </p>
- * If you're after the most control with generating a response use:
- * <pre>
- *    TimeStampResponse tsResp;
- *
- *    try
- *    {
- *       tsResp = tsRespGen.generateGrantedResponse(request, new BigInteger("23"), new Date());
- *    }
- *    catch (Exception e)
- *    {
- *        tsResp = tsRespGen.generateRejectedResponse(e);
- *    }
- * </pre>
- * The generate method does this, but provides a status string of "Operation Okay".
- * <p>
- * It should be pointed out that generateRejectedResponse() may also, on very rare occasions throw a TSPException.
- * In the event that happens, there's a serious internal problem with your responder.
- * </p>
- */
-public class TimeStampResponseGenerator
-{
-    int status;
-
-    ASN1EncodableVector statusStrings;
-
-    int failInfo;
-    private TimeStampTokenGenerator tokenGenerator;
-    private Set                     acceptedAlgorithms;
-    private Set                     acceptedPolicies;
-    private Set                     acceptedExtensions;
-
-    /**
-     *
-     * @param tokenGenerator
-     * @param acceptedAlgorithms a set of OIDs giving accepted algorithms.
-     */
-    public TimeStampResponseGenerator(
-        TimeStampTokenGenerator tokenGenerator,
-        Set                     acceptedAlgorithms)
-    {
-        this(tokenGenerator, acceptedAlgorithms, null, null);
-    }
-
-    /**
-     *
-     * @param tokenGenerator
-     * @param acceptedAlgorithms a set of OIDs giving accepted algorithms.
-     * @param acceptedPolicies if non-null a set of policies OIDs we are willing to sign under.
-     */
-    public TimeStampResponseGenerator(
-        TimeStampTokenGenerator tokenGenerator,
-        Set                     acceptedAlgorithms,
-        Set                     acceptedPolicies)
-    {
-        this(tokenGenerator, acceptedAlgorithms, acceptedPolicies, null);
-    }
-
-    /**
-     *
-     * @param tokenGenerator
-     * @param acceptedAlgorithms a set of OIDs giving accepted algorithms.
-     * @param acceptedPolicies if non-null a set of policies OIDs we are willing to sign under.
-     * @param acceptedExtensions if non-null a set of extensions OIDs we are willing to accept.
-     */
-    public TimeStampResponseGenerator(
-        TimeStampTokenGenerator tokenGenerator,
-        Set                     acceptedAlgorithms,
-        Set                     acceptedPolicies,
-        Set                     acceptedExtensions)
-    {
-        this.tokenGenerator = tokenGenerator;
-        this.acceptedAlgorithms = convert(acceptedAlgorithms);
-        this.acceptedPolicies = convert(acceptedPolicies);
-        this.acceptedExtensions = convert(acceptedExtensions);
-
-        statusStrings = new ASN1EncodableVector();
-    }
-
-    private void addStatusString(String statusString)
-    {
-        statusStrings.add(new DERUTF8String(statusString));
-    }
-
-    private void setFailInfoField(int field)
-    {
-        failInfo = failInfo | field;
-    }
-
-    private PKIStatusInfo getPKIStatusInfo()
-    {
-        ASN1EncodableVector v = new ASN1EncodableVector();
-        
-        v.add(new ASN1Integer(status));
-        
-        if (statusStrings.size() > 0)
-        {
-            v.add(PKIFreeText.getInstance(new DERSequence(statusStrings)));
-        }
-
-        if (failInfo != 0)
-        {
-            DERBitString failInfoBitString = new FailInfo(failInfo);
-            v.add(failInfoBitString);
-        }
-
-        return PKIStatusInfo.getInstance(new DERSequence(v));
-    }
-
-    /**
-     * Return an appropriate TimeStampResponse.
-     * <p>
-     * If genTime is null a timeNotAvailable error response will be returned. Calling generate() is the
-     * equivalent of:
-     * <pre>
-     *    TimeStampResponse tsResp;
-     *
-     *    try
-     *    {
-     *       tsResp = tsRespGen.generateGrantedResponse(request, serialNumber, genTime, "Operation Okay");
-     *    }
-     *    catch (Exception e)
-     *    {
-     *        tsResp = tsRespGen.generateRejectedResponse(e);
-     *    }
-     * </pre>
-     * @param request the request this response is for.
-     * @param serialNumber serial number for the response token.
-     * @param genTime generation time for the response token.
-     * @return a TimeStampResponse.
-     * @throws TSPException
-     */
-    public TimeStampResponse generate(
-        TimeStampRequest    request,
-        BigInteger          serialNumber,
-        Date                genTime)
-        throws TSPException
-    {
-        try
-        {
-            return this.generateGrantedResponse(request, serialNumber, genTime, "Operation Okay");
-        }
-        catch (Exception e)
-        {
-            return this.generateRejectedResponse(e);
-        }
-    }
-
-    /**
-     * Return a granted response, if the passed in request passes validation.
-     * <p>
-     * If genTime is null a timeNotAvailable or a validation exception occurs a TSPValidationException will
-     * be thrown. The parent TSPException will only occur on some sort of system failure.
-     * </p>
-     * @param request the request this response is for.
-     * @param serialNumber serial number for the response token.
-     * @param genTime generation time for the response token.
-     * @return  the TimeStampResponse with a status of  PKIStatus.GRANTED
-     * @throws TSPException on validation exception or internal error.
-     */
-    public TimeStampResponse generateGrantedResponse(
-        TimeStampRequest    request,
-        BigInteger          serialNumber,
-        Date                genTime)
-        throws TSPException
-    {
-        return generateGrantedResponse(request, serialNumber, genTime, null);
-    }
-
-    /**
-     * Return a granted response, if the passed in request passes validation with the passed in status string.
-     * <p>
-     * If genTime is null a timeNotAvailable or a validation exception occurs a TSPValidationException will
-     * be thrown. The parent TSPException will only occur on some sort of system failure.
-     * </p>
-     * @param request the request this response is for.
-     * @param serialNumber serial number for the response token.
-     * @param genTime generation time for the response token.
-     * @return  the TimeStampResponse with a status of  PKIStatus.GRANTED
-     * @throws TSPException on validation exception or internal error.
-     */
-    public TimeStampResponse generateGrantedResponse(
-        TimeStampRequest    request,
-        BigInteger          serialNumber,
-        Date                genTime,
-        String              statusString)
-        throws TSPException
-    {
-        if (genTime == null)
-        {
-            throw new TSPValidationException("The time source is not available.", PKIFailureInfo.timeNotAvailable);
-        }
-
-        request.validate(acceptedAlgorithms, acceptedPolicies, acceptedExtensions);
-
-        status = PKIStatus.GRANTED;
-        statusStrings = new ASN1EncodableVector();
-
-        if (statusString != null)
-        {
-            this.addStatusString(statusString);
-        }
-
-        PKIStatusInfo pkiStatusInfo = getPKIStatusInfo();
-
-        ContentInfo tstTokenContentInfo;
-        try
-        {
-            tstTokenContentInfo = tokenGenerator.generate(request, serialNumber, genTime).toCMSSignedData().toASN1Structure();
-        }
-        catch (TSPException e)
-        {
-            throw e;
-        }
-        catch (Exception e)
-        {
-            throw new TSPException(
-                    "Timestamp token received cannot be converted to ContentInfo", e);
-        }
-
-        TimeStampResp resp = new TimeStampResp(pkiStatusInfo, tstTokenContentInfo);
-
-        try
-        {
-            return new TimeStampResponse(resp);
-        }
-        catch (IOException e)
-        {
-            throw new TSPException("created badly formatted response!");
-        }
-    }
-
-    /**
-     * Generate a generic rejection response based on a TSPValidationException or
-     * an Exception. Exceptions which are not an instance of TSPValidationException
-     * will be treated as systemFailure. The return value of exception.getMessage() will
-     * be used as the status string for the response.
-     *
-     * @param exception the exception thrown on validating the request.
-     * @return a TimeStampResponse.
-     * @throws TSPException if a failure response cannot be generated.
-     */
-    public TimeStampResponse generateRejectedResponse(Exception exception)
-        throws TSPException
-    {
-        if (exception instanceof TSPValidationException)
-        {
-            return generateFailResponse(PKIStatus.REJECTION, ((TSPValidationException)exception).getFailureCode(), exception.getMessage());
-        }
-        else
-        {
-            return generateFailResponse(PKIStatus.REJECTION, PKIFailureInfo.systemFailure, exception.getMessage());
-        }
-    }
-
-    /**
-     * Generate a non-granted TimeStampResponse with chosen status and FailInfoField.
-     * 
-     * @param status the PKIStatus to set.
-     * @param failInfoField the FailInfoField to set.
-     * @param statusString an optional string describing the failure.
-     * @return a TimeStampResponse with a failInfoField and optional statusString
-     * @throws TSPException in case the response could not be created
-     */
-    public TimeStampResponse generateFailResponse(int status, int failInfoField, String statusString)
-        throws TSPException
-    {
-        this.status = status;
-        this.statusStrings = new ASN1EncodableVector();
-
-        this.setFailInfoField(failInfoField);
-
-        if (statusString != null)
-        {
-            this.addStatusString(statusString);
-        }
-
-        PKIStatusInfo pkiStatusInfo = getPKIStatusInfo();
-
-        TimeStampResp resp = new TimeStampResp(pkiStatusInfo, null);
-
-        try
-        {
-            return new TimeStampResponse(resp);
-        }
-        catch (IOException e)
-        {
-            throw new TSPException("created badly formatted response!");
-        }
-    }
-
-    private Set convert(Set orig)
-    {
-        if (orig == null)
-        {
-            return orig;
-        }
-
-        Set con = new HashSet(orig.size());
-
-        for (Iterator it = orig.iterator(); it.hasNext();)
-        {
-            Object o = it.next();
-
-            if (o instanceof String)
-            {
-                con.add(new ASN1ObjectIdentifier((String)o));
-            }
-            else
-            {
-                con.add(o);
-            }
-        }
-
-        return con;
-    }
-
-    class FailInfo extends DERBitString
-    {
-        FailInfo(int failInfoValue)
-        {
-            super(getBytes(failInfoValue), getPadBits(failInfoValue));
-        }
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/tsp/TimeStampToken.java b/bcpkix/src/main/java/org/bouncycastle/tsp/TimeStampToken.java
deleted file mode 100644
index 0422998..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/tsp/TimeStampToken.java
+++ /dev/null
@@ -1,393 +0,0 @@
-package org.bouncycastle.tsp;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.Collection;
-import java.util.Date;
-
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.cms.Attribute;
-import org.bouncycastle.asn1.cms.AttributeTable;
-import org.bouncycastle.asn1.cms.ContentInfo;
-import org.bouncycastle.asn1.cms.IssuerAndSerialNumber;
-import org.bouncycastle.asn1.ess.ESSCertID;
-import org.bouncycastle.asn1.ess.ESSCertIDv2;
-import org.bouncycastle.asn1.ess.SigningCertificate;
-import org.bouncycastle.asn1.ess.SigningCertificateV2;
-import org.bouncycastle.asn1.nist.NISTObjectIdentifiers;
-import org.bouncycastle.asn1.oiw.OIWObjectIdentifiers;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.asn1.tsp.TSTInfo;
-import org.bouncycastle.asn1.x500.X500Name;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.asn1.x509.GeneralName;
-import org.bouncycastle.asn1.x509.IssuerSerial;
-import org.bouncycastle.cert.X509CertificateHolder;
-import org.bouncycastle.cms.CMSException;
-import org.bouncycastle.cms.CMSProcessable;
-import org.bouncycastle.cms.CMSSignedData;
-import org.bouncycastle.cms.SignerId;
-import org.bouncycastle.cms.SignerInformation;
-import org.bouncycastle.cms.SignerInformationVerifier;
-import org.bouncycastle.operator.DigestCalculator;
-import org.bouncycastle.operator.OperatorCreationException;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.Store;
-
-/**
- * Carrier class for a TimeStampToken.
- */
-public class TimeStampToken
-{
-    CMSSignedData tsToken;
-
-    SignerInformation tsaSignerInfo;
-
-    Date genTime;
-
-    TimeStampTokenInfo tstInfo;
-    
-    CertID   certID;
-
-    public TimeStampToken(ContentInfo contentInfo)
-        throws TSPException, IOException
-    {
-        this(getSignedData(contentInfo));
-    }
-
-    private static CMSSignedData getSignedData(ContentInfo contentInfo)
-        throws TSPException
-    {
-        try
-        {
-            return new CMSSignedData(contentInfo);
-        }
-        catch (CMSException e)
-        {
-            throw new TSPException("TSP parsing error: " + e.getMessage(), e.getCause());
-        }
-    }
-
-    public TimeStampToken(CMSSignedData signedData)
-        throws TSPException, IOException
-    {
-        this.tsToken = signedData;
-
-        if (!this.tsToken.getSignedContentTypeOID().equals(PKCSObjectIdentifiers.id_ct_TSTInfo.getId()))
-        {
-            throw new TSPValidationException("ContentInfo object not for a time stamp.");
-        }
-        
-        Collection signers = tsToken.getSignerInfos().getSigners();
-
-        if (signers.size() != 1)
-        {
-            throw new IllegalArgumentException("Time-stamp token signed by "
-                    + signers.size()
-                    + " signers, but it must contain just the TSA signature.");
-        }
-
-        tsaSignerInfo = (SignerInformation)signers.iterator().next();
-
-        try
-        {
-            CMSProcessable content = tsToken.getSignedContent();
-            ByteArrayOutputStream bOut = new ByteArrayOutputStream();
-
-            content.write(bOut);
-
-            ASN1InputStream aIn = new ASN1InputStream(new ByteArrayInputStream(bOut.toByteArray()));
-
-            this.tstInfo = new TimeStampTokenInfo(TSTInfo.getInstance(aIn.readObject()));
-            
-            Attribute   attr = tsaSignerInfo.getSignedAttributes().get(PKCSObjectIdentifiers.id_aa_signingCertificate);
-
-            if (attr != null)
-            {
-                SigningCertificate    signCert = SigningCertificate.getInstance(attr.getAttrValues().getObjectAt(0));
-
-                this.certID = new CertID(ESSCertID.getInstance(signCert.getCerts()[0]));
-            }
-            else
-            {
-                attr = tsaSignerInfo.getSignedAttributes().get(PKCSObjectIdentifiers.id_aa_signingCertificateV2);
-
-                if (attr == null)
-                {
-                    throw new TSPValidationException("no signing certificate attribute found, time stamp invalid.");
-                }
-
-                SigningCertificateV2 signCertV2 = SigningCertificateV2.getInstance(attr.getAttrValues().getObjectAt(0));
-
-                this.certID = new CertID(ESSCertIDv2.getInstance(signCertV2.getCerts()[0]));
-            }
-        }
-        catch (CMSException e)
-        {
-            throw new TSPException(e.getMessage(), e.getUnderlyingException());
-        }
-    }
-
-    public TimeStampTokenInfo getTimeStampInfo()
-    {
-        return tstInfo;
-    }
-
-    public SignerId getSID()
-    {
-        return tsaSignerInfo.getSID();
-    }
-    
-    public AttributeTable getSignedAttributes()
-    {
-        return tsaSignerInfo.getSignedAttributes();
-    }
-
-    public AttributeTable getUnsignedAttributes()
-    {
-        return tsaSignerInfo.getUnsignedAttributes();
-    }
-
-    public Store getCertificates()
-    {
-        return tsToken.getCertificates();
-    }
-
-    public Store getCRLs()
-    {
-        return tsToken.getCRLs();
-    }
-
-    public Store getAttributeCertificates()
-    {
-        return tsToken.getAttributeCertificates();
-    }
-
-    /**
-     * Validate the time stamp token.
-     * <p>
-     * To be valid the token must be signed by the passed in certificate and
-     * the certificate must be the one referred to by the SigningCertificate
-     * attribute included in the hashed attributes of the token. The
-     * certificate must also have the ExtendedKeyUsageExtension with only
-     * KeyPurposeId.id_kp_timeStamping and have been valid at the time the
-     * timestamp was created.
-     * </p>
-     * <p>
-     * A successful call to validate means all the above are true.
-     * </p>
-     *
-     * @param sigVerifier the content verifier create the objects required to verify the CMS object in the timestamp.
-     * @throws TSPException if an exception occurs in processing the token.
-     * @throws TSPValidationException if the certificate or signature fail to be valid.
-     * @throws IllegalArgumentException if the sigVerifierProvider has no associated certificate.
-     */
-    public void validate(
-        SignerInformationVerifier sigVerifier)
-        throws TSPException, TSPValidationException
-    {
-        if (!sigVerifier.hasAssociatedCertificate())
-        {
-            throw new IllegalArgumentException("verifier provider needs an associated certificate");
-        }
-
-        try
-        {
-            X509CertificateHolder certHolder = sigVerifier.getAssociatedCertificate();
-            DigestCalculator calc = sigVerifier.getDigestCalculator(certID.getHashAlgorithm());
-
-            OutputStream cOut = calc.getOutputStream();
-
-            cOut.write(certHolder.getEncoded());
-            cOut.close();
-
-            if (!Arrays.constantTimeAreEqual(certID.getCertHash(), calc.getDigest()))
-            {
-                throw new TSPValidationException("certificate hash does not match certID hash.");
-            }
-
-            if (certID.getIssuerSerial() != null)
-            {
-                IssuerAndSerialNumber issuerSerial = new IssuerAndSerialNumber(certHolder.toASN1Structure());
-
-                if (!certID.getIssuerSerial().getSerial().equals(issuerSerial.getSerialNumber()))
-                {
-                    throw new TSPValidationException("certificate serial number does not match certID for signature.");
-                }
-
-                GeneralName[]   names = certID.getIssuerSerial().getIssuer().getNames();
-                boolean         found = false;
-
-                for (int i = 0; i != names.length; i++)
-                {
-                    if (names[i].getTagNo() == 4 && X500Name.getInstance(names[i].getName()).equals(X500Name.getInstance(issuerSerial.getName())))
-                    {
-                        found = true;
-                        break;
-                    }
-                }
-
-                if (!found)
-                {
-                    throw new TSPValidationException("certificate name does not match certID for signature. ");
-                }
-            }
-
-            TSPUtil.validateCertificate(certHolder);
-
-            if (!certHolder.isValidOn(tstInfo.getGenTime()))
-            {
-                throw new TSPValidationException("certificate not valid when time stamp created.");
-            }
-
-            if (!tsaSignerInfo.verify(sigVerifier))
-            {
-                throw new TSPValidationException("signature not created by certificate.");
-            }
-        }
-        catch (CMSException e)
-        {
-            if (e.getUnderlyingException() != null)
-            {
-                throw new TSPException(e.getMessage(), e.getUnderlyingException());
-            }
-            else
-            {
-                throw new TSPException("CMS exception: " + e, e);
-            }
-        }
-        catch (IOException e)
-        {
-            throw new TSPException("problem processing certificate: " + e, e);
-        }
-        catch (OperatorCreationException e)
-        {
-            throw new TSPException("unable to create digest: " + e.getMessage(), e);
-        }
-    }
-
-    /**
-     * Return true if the signature on time stamp token is valid.
-     * <p>
-     * Note: this is a much weaker proof of correctness than calling validate().
-     * </p>
-     *
-     * @param sigVerifier the content verifier create the objects required to verify the CMS object in the timestamp.
-     * @return true if the signature matches, false otherwise.
-     * @throws TSPException if the signature cannot be processed or the provider cannot match the algorithm.
-     */
-    public boolean isSignatureValid(
-        SignerInformationVerifier sigVerifier)
-        throws TSPException
-    {
-        try
-        {
-            return tsaSignerInfo.verify(sigVerifier);
-        }
-        catch (CMSException e)
-        {
-            if (e.getUnderlyingException() != null)
-            {
-                throw new TSPException(e.getMessage(), e.getUnderlyingException());
-            }
-            else
-            {
-                throw new TSPException("CMS exception: " + e, e);
-            }
-        }
-    }
-
-    /**
-     * Return the underlying CMSSignedData object.
-     * 
-     * @return the underlying CMS structure.
-     */
-    public CMSSignedData toCMSSignedData()
-    {
-        return tsToken;
-    }
-    
-    /**
-     * Return a ASN.1 encoded byte stream representing the encoded object.
-     * 
-     * @throws IOException if encoding fails.
-     */
-    public byte[] getEncoded() 
-        throws IOException
-    {
-        return tsToken.getEncoded();
-    }
-
-    // perhaps this should be done using an interface on the ASN.1 classes...
-    private class CertID
-    {
-        private ESSCertID certID;
-        private ESSCertIDv2 certIDv2;
-
-        CertID(ESSCertID certID)
-        {
-            this.certID = certID;
-            this.certIDv2 = null;
-        }
-
-        CertID(ESSCertIDv2 certID)
-        {
-            this.certIDv2 = certID;
-            this.certID = null;
-        }
-
-        public String getHashAlgorithmName()
-        {
-            if (certID != null)
-            {
-                return "SHA-1";
-            }
-            else
-            {
-                if (NISTObjectIdentifiers.id_sha256.equals(certIDv2.getHashAlgorithm().getAlgorithm()))
-                {
-                    return "SHA-256";
-                }
-                return certIDv2.getHashAlgorithm().getAlgorithm().getId();
-            }
-        }
-
-        public AlgorithmIdentifier getHashAlgorithm()
-        {
-            if (certID != null)
-            {
-                return new AlgorithmIdentifier(OIWObjectIdentifiers.idSHA1);
-            }
-            else
-            {
-                return certIDv2.getHashAlgorithm();
-            }
-        }
-
-        public byte[] getCertHash()
-        {
-            if (certID != null)
-            {
-                return certID.getCertHash();
-            }
-            else
-            {
-                return certIDv2.getCertHash();
-            }
-        }
-
-        public IssuerSerial getIssuerSerial()
-        {
-            if (certID != null)
-            {
-                return certID.getIssuerSerial();
-            }
-            else
-            {
-                return certIDv2.getIssuerSerial();
-            }
-        }
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/tsp/TimeStampTokenGenerator.java b/bcpkix/src/main/java/org/bouncycastle/tsp/TimeStampTokenGenerator.java
deleted file mode 100644
index 91586c5..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/tsp/TimeStampTokenGenerator.java
+++ /dev/null
@@ -1,380 +0,0 @@
-package org.bouncycastle.tsp;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.math.BigInteger;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.bouncycastle.asn1.ASN1Boolean;
-import org.bouncycastle.asn1.ASN1Encoding;
-import org.bouncycastle.asn1.ASN1GeneralizedTime;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.DERNull;
-import org.bouncycastle.asn1.cms.AttributeTable;
-import org.bouncycastle.asn1.ess.ESSCertID;
-import org.bouncycastle.asn1.ess.ESSCertIDv2;
-import org.bouncycastle.asn1.ess.SigningCertificate;
-import org.bouncycastle.asn1.ess.SigningCertificateV2;
-import org.bouncycastle.asn1.oiw.OIWObjectIdentifiers;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.asn1.tsp.Accuracy;
-import org.bouncycastle.asn1.tsp.MessageImprint;
-import org.bouncycastle.asn1.tsp.TSTInfo;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.asn1.x509.GeneralName;
-import org.bouncycastle.asn1.x509.GeneralNames;
-import org.bouncycastle.asn1.x509.IssuerSerial;
-import org.bouncycastle.cert.X509CertificateHolder;
-import org.bouncycastle.cms.CMSAttributeTableGenerationException;
-import org.bouncycastle.cms.CMSAttributeTableGenerator;
-import org.bouncycastle.cms.CMSException;
-import org.bouncycastle.cms.CMSProcessableByteArray;
-import org.bouncycastle.cms.CMSSignedData;
-import org.bouncycastle.cms.CMSSignedDataGenerator;
-import org.bouncycastle.cms.SignerInfoGenerator;
-import org.bouncycastle.operator.DigestCalculator;
-import org.bouncycastle.util.CollectionStore;
-import org.bouncycastle.util.Store;
-
-/**
- * Currently the class supports ESSCertID by if a digest calculator based on SHA1 is passed in, otherwise it uses
- * ESSCertIDv2. In the event you need to pass both types, you will need to override the SignedAttributeGenerator
- * for the SignerInfoGeneratorBuilder you are using. For the default for ESSCertIDv2 the code will look something
- * like the following:
- * <pre>
- * final ESSCertID essCertid = new ESSCertID(certHashSha1, issuerSerial);
- * final ESSCertIDv2 essCertidV2 = new ESSCertIDv2(certHashSha256, issuerSerial);
- *
- * signerInfoGenBuilder.setSignedAttributeGenerator(new CMSAttributeTableGenerator()
- * {
- *     public AttributeTable getAttributes(Map parameters)
- *         throws CMSAttributeTableGenerationException
- *     {
- *         CMSAttributeTableGenerator attrGen = new DefaultSignedAttributeTableGenerator();
- *
- *         AttributeTable table = attrGen.getAttributes(parameters);
- *
- *         table = table.add(PKCSObjectIdentifiers.id_aa_signingCertificate, new SigningCertificate(essCertid));
- *         table = table.add(PKCSObjectIdentifiers.id_aa_signingCertificateV2, new SigningCertificateV2(essCertidV2));
- *
- *         return table;
- *     }
- * });
- * </pre>
- */
-public class TimeStampTokenGenerator
-{
-    int accuracySeconds = -1;
-
-    int accuracyMillis = -1;
-
-    int accuracyMicros = -1;
-
-    boolean ordering = false;
-
-    GeneralName tsa = null;
-    
-    private ASN1ObjectIdentifier  tsaPolicyOID;
-
-    private List certs = new ArrayList();
-    private List crls = new ArrayList();
-    private List attrCerts = new ArrayList();
-    private Map otherRevoc = new HashMap();
-    private SignerInfoGenerator signerInfoGen;
-
-    /**
-     * Basic Constructor - set up a calculator based on signerInfoGen with a ESSCertID calculated from
-     * the signer's associated certificate using the sha1DigestCalculator. If alternate values are required
-     * for id-aa-signingCertificate they should be added to the signerInfoGen object before it is passed in,
-     * otherwise a standard digest based value will be added.
-     *
-     * @param signerInfoGen the generator for the signer we are using.
-     * @param digestCalculator calculator for to use for digest of certificate.
-     * @param tsaPolicy tasPolicy to send.
-     * @throws IllegalArgumentException if calculator is not SHA-1 or there is no associated certificate for the signer,
-     * @throws TSPException if the signer certificate cannot be processed.
-     */
-    public TimeStampTokenGenerator(
-        final SignerInfoGenerator       signerInfoGen,
-        DigestCalculator                digestCalculator,
-        ASN1ObjectIdentifier            tsaPolicy)
-        throws IllegalArgumentException, TSPException
-    {
-        this(signerInfoGen, digestCalculator, tsaPolicy, false);
-    }
-
-    /**
-     * Basic Constructor - set up a calculator based on signerInfoGen with a ESSCertID calculated from
-     * the signer's associated certificate using the sha1DigestCalculator. If alternate values are required
-     * for id-aa-signingCertificate they should be added to the signerInfoGen object before it is passed in,
-     * otherwise a standard digest based value will be added.
-     *
-     * @param signerInfoGen the generator for the signer we are using.
-     * @param digestCalculator calculator for to use for digest of certificate.
-     * @param tsaPolicy tasPolicy to send.
-     * @param isIssuerSerialIncluded should issuerSerial be included in the ESSCertIDs, true if yes, by default false.
-     * @throws IllegalArgumentException if calculator is not SHA-1 or there is no associated certificate for the signer,
-     * @throws TSPException if the signer certificate cannot be processed.
-     */
-    public TimeStampTokenGenerator(
-        final SignerInfoGenerator       signerInfoGen,
-        DigestCalculator                digestCalculator,
-        ASN1ObjectIdentifier            tsaPolicy,
-        boolean                         isIssuerSerialIncluded)
-        throws IllegalArgumentException, TSPException
-    {
-        this.signerInfoGen = signerInfoGen;
-        this.tsaPolicyOID = tsaPolicy;
-
-        if (!signerInfoGen.hasAssociatedCertificate())
-        {
-            throw new IllegalArgumentException("SignerInfoGenerator must have an associated certificate");
-        }
-
-        X509CertificateHolder assocCert = signerInfoGen.getAssociatedCertificate();
-        TSPUtil.validateCertificate(assocCert);
-
-        try
-        {
-            OutputStream dOut = digestCalculator.getOutputStream();
-
-            dOut.write(assocCert.getEncoded());
-
-            dOut.close();
-
-            if (digestCalculator.getAlgorithmIdentifier().getAlgorithm().equals(OIWObjectIdentifiers.idSHA1))
-            {
-                final ESSCertID essCertid = new ESSCertID(digestCalculator.getDigest(),
-                                            isIssuerSerialIncluded ? new IssuerSerial(new GeneralNames(new GeneralName(assocCert.getIssuer())), assocCert.getSerialNumber())
-                                                                   : null);
-
-                this.signerInfoGen = new SignerInfoGenerator(signerInfoGen, new CMSAttributeTableGenerator()
-                {
-                    public AttributeTable getAttributes(Map parameters)
-                        throws CMSAttributeTableGenerationException
-                    {
-                        AttributeTable table = signerInfoGen.getSignedAttributeTableGenerator().getAttributes(parameters);
-
-                        if (table.get(PKCSObjectIdentifiers.id_aa_signingCertificate) == null)
-                        {
-                            return table.add(PKCSObjectIdentifiers.id_aa_signingCertificate, new SigningCertificate(essCertid));
-                        }
-
-                        return table;
-                    }
-                }, signerInfoGen.getUnsignedAttributeTableGenerator());
-            }
-            else
-            {
-                AlgorithmIdentifier digAlgID = new AlgorithmIdentifier(digestCalculator.getAlgorithmIdentifier().getAlgorithm());
-                final ESSCertIDv2   essCertid = new ESSCertIDv2(digAlgID, digestCalculator.getDigest(),
-                                                    isIssuerSerialIncluded ? new IssuerSerial(new GeneralNames(new GeneralName(assocCert.getIssuer())), new ASN1Integer(assocCert.getSerialNumber()))
-                                                                           : null);
-
-                this.signerInfoGen = new SignerInfoGenerator(signerInfoGen, new CMSAttributeTableGenerator()
-                {
-                    public AttributeTable getAttributes(Map parameters)
-                        throws CMSAttributeTableGenerationException
-                    {
-                        AttributeTable table = signerInfoGen.getSignedAttributeTableGenerator().getAttributes(parameters);
-
-                        if (table.get(PKCSObjectIdentifiers.id_aa_signingCertificateV2) == null)
-                        {
-                            return table.add(PKCSObjectIdentifiers.id_aa_signingCertificateV2, new SigningCertificateV2(essCertid));
-                        }
-
-                        return table;
-                    }
-                }, signerInfoGen.getUnsignedAttributeTableGenerator());
-            }
-        }
-        catch (IOException e)
-        {
-            throw new TSPException("Exception processing certificate.", e);
-        }
-    }
-
-    /**
-     * Add the store of X509 Certificates to the generator.
-     *
-     * @param certStore  a Store containing X509CertificateHolder objects
-     */
-    public void addCertificates(
-        Store certStore)
-    {
-        certs.addAll(certStore.getMatches(null));
-    }
-
-    /**
-     *
-     * @param crlStore a Store containing X509CRLHolder objects.
-     */
-    public void addCRLs(
-        Store crlStore)
-    {
-        crls.addAll(crlStore.getMatches(null));
-    }
-
-    /**
-     *
-     * @param attrStore a Store containing X509AttributeCertificate objects.
-     */
-    public void addAttributeCertificates(
-        Store attrStore)
-    {
-        attrCerts.addAll(attrStore.getMatches(null));
-    }
-
-    /**
-     * Add a Store of otherRevocationData to the CRL set to be included with the generated TimeStampToken.
-     *
-     * @param otherRevocationInfoFormat the OID specifying the format of the otherRevocationInfo data.
-     * @param otherRevocationInfos a Store of otherRevocationInfo data to add.
-     */
-    public void addOtherRevocationInfo(
-        ASN1ObjectIdentifier   otherRevocationInfoFormat,
-        Store                  otherRevocationInfos)
-    {
-        otherRevoc.put(otherRevocationInfoFormat, otherRevocationInfos.getMatches(null));
-    }
-
-    public void setAccuracySeconds(int accuracySeconds)
-    {
-        this.accuracySeconds = accuracySeconds;
-    }
-
-    public void setAccuracyMillis(int accuracyMillis)
-    {
-        this.accuracyMillis = accuracyMillis;
-    }
-
-    public void setAccuracyMicros(int accuracyMicros)
-    {
-        this.accuracyMicros = accuracyMicros;
-    }
-
-    public void setOrdering(boolean ordering)
-    {
-        this.ordering = ordering;
-    }
-
-    public void setTSA(GeneralName tsa)
-    {
-        this.tsa = tsa;
-    }
-
-    /**
-     * Generate a TimeStampToken for the passed in request and serialNumber marking it with the passed in genTime.
-     *
-     * @param request the originating request.
-     * @param serialNumber serial number for the TimeStampToken
-     * @param genTime token generation time.
-     * @return a TimeStampToken
-     * @throws TSPException
-     */
-    public TimeStampToken generate(
-        TimeStampRequest    request,
-        BigInteger          serialNumber,
-        Date                genTime)
-        throws TSPException
-    {
-        ASN1ObjectIdentifier digestAlgOID = request.getMessageImprintAlgOID();
-
-        AlgorithmIdentifier algID = new AlgorithmIdentifier(digestAlgOID, DERNull.INSTANCE);
-        MessageImprint      messageImprint = new MessageImprint(algID, request.getMessageImprintDigest());
-
-        Accuracy accuracy = null;
-        if (accuracySeconds > 0 || accuracyMillis > 0 || accuracyMicros > 0)
-        {
-            ASN1Integer seconds = null;
-            if (accuracySeconds > 0)
-            {
-                seconds = new ASN1Integer(accuracySeconds);
-            }
-
-            ASN1Integer millis = null;
-            if (accuracyMillis > 0)
-            {
-                millis = new ASN1Integer(accuracyMillis);
-            }
-
-            ASN1Integer micros = null;
-            if (accuracyMicros > 0)
-            {
-                micros = new ASN1Integer(accuracyMicros);
-            }
-
-            accuracy = new Accuracy(seconds, millis, micros);
-        }
-
-        ASN1Boolean derOrdering = null;
-        if (ordering)
-        {
-            derOrdering = new ASN1Boolean(ordering);
-        }
-
-        ASN1Integer  nonce = null;
-        if (request.getNonce() != null)
-        {
-            nonce = new ASN1Integer(request.getNonce());
-        }
-
-        ASN1ObjectIdentifier tsaPolicy = tsaPolicyOID;
-        if (request.getReqPolicy() != null)
-        {
-            tsaPolicy = request.getReqPolicy();
-        }
-
-        TSTInfo tstInfo = new TSTInfo(tsaPolicy,
-                messageImprint, new ASN1Integer(serialNumber),
-                new ASN1GeneralizedTime(genTime), accuracy, derOrdering,
-                nonce, tsa, request.getExtensions());
-
-        try
-        {
-            CMSSignedDataGenerator  signedDataGenerator = new CMSSignedDataGenerator();
-
-            if (request.getCertReq())
-            {
-                // TODO: do we need to check certs non-empty?
-                signedDataGenerator.addCertificates(new CollectionStore(certs));
-                signedDataGenerator.addAttributeCertificates(new CollectionStore(attrCerts));
-            }
-
-            signedDataGenerator.addCRLs(new CollectionStore(crls));
-
-            if (!otherRevoc.isEmpty())
-            {
-                for (Iterator it = otherRevoc.keySet().iterator(); it.hasNext();)
-                {
-                    ASN1ObjectIdentifier format = (ASN1ObjectIdentifier)it.next();
-
-                    signedDataGenerator.addOtherRevocationInfo(format, new CollectionStore((Collection)otherRevoc.get(format)));
-                }
-            }
-
-            signedDataGenerator.addSignerInfoGenerator(signerInfoGen);
-
-            byte[] derEncodedTSTInfo = tstInfo.getEncoded(ASN1Encoding.DER);
-
-            CMSSignedData signedData = signedDataGenerator.generate(new CMSProcessableByteArray(PKCSObjectIdentifiers.id_ct_TSTInfo, derEncodedTSTInfo), true);
-
-            return new TimeStampToken(signedData);
-        }
-        catch (CMSException cmsEx)
-        {
-            throw new TSPException("Error generating time-stamp token", cmsEx);
-        }
-        catch (IOException e)
-        {
-            throw new TSPException("Exception encoding info", e);
-        }
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/tsp/TimeStampTokenInfo.java b/bcpkix/src/main/java/org/bouncycastle/tsp/TimeStampTokenInfo.java
deleted file mode 100644
index 98011a0..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/tsp/TimeStampTokenInfo.java
+++ /dev/null
@@ -1,121 +0,0 @@
-package org.bouncycastle.tsp;
-
-import java.io.IOException;
-import java.math.BigInteger;
-import java.text.ParseException;
-import java.util.Date;
-
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.tsp.Accuracy;
-import org.bouncycastle.asn1.tsp.TSTInfo;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.asn1.x509.GeneralName;
-
-public class TimeStampTokenInfo
-{
-    TSTInfo tstInfo;
-    Date    genTime;
-    
-    TimeStampTokenInfo(TSTInfo tstInfo)
-        throws TSPException, IOException
-    {
-        this.tstInfo = tstInfo;
-
-        try
-        {
-            this.genTime = tstInfo.getGenTime().getDate();
-        }
-        catch (ParseException e)
-        {
-            throw new TSPException("unable to parse genTime field");
-        }
-    }
-
-    public boolean isOrdered()
-    {
-        return tstInfo.getOrdering().isTrue();
-    }
-
-    public Accuracy getAccuracy()
-    {
-        return tstInfo.getAccuracy();
-    }
-
-    public Date getGenTime()
-    {
-        return genTime;
-    }
-
-    public GenTimeAccuracy getGenTimeAccuracy()
-    {
-        if (this.getAccuracy() != null)
-        {
-            return new GenTimeAccuracy(this.getAccuracy());
-        }
-        
-        return null;
-    }
-    
-    public ASN1ObjectIdentifier getPolicy()
-    {
-        return tstInfo.getPolicy();
-    }
-    
-    public BigInteger getSerialNumber()
-    {
-        return tstInfo.getSerialNumber().getValue();
-    }
-
-    public GeneralName getTsa()
-    {
-        return tstInfo.getTsa();
-    }
-
-    /**
-     * @return the nonce value, null if there isn't one.
-     */
-    public BigInteger getNonce()
-    {
-        if (tstInfo.getNonce() != null)
-        {
-            return tstInfo.getNonce().getValue();
-        }
-
-        return null;
-    }
-
-    public AlgorithmIdentifier getHashAlgorithm()
-    {
-        return tstInfo.getMessageImprint().getHashAlgorithm();
-    }
-
-    public ASN1ObjectIdentifier getMessageImprintAlgOID()
-    {
-        return tstInfo.getMessageImprint().getHashAlgorithm().getAlgorithm();
-    }
-
-    public byte[] getMessageImprintDigest()
-    {
-        return tstInfo.getMessageImprint().getHashedMessage();
-    }
-
-    public byte[] getEncoded() 
-        throws IOException
-    {
-        return tstInfo.getEncoded();
-    }
-
-    /**
-     * @deprecated use toASN1Structure
-     * @return
-     */
-    public TSTInfo toTSTInfo()
-    {
-        return tstInfo;
-    }
-
-    public TSTInfo toASN1Structure()
-    {
-        return tstInfo;
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/tsp/cms/CMSTimeStampedData.java b/bcpkix/src/main/java/org/bouncycastle/tsp/cms/CMSTimeStampedData.java
deleted file mode 100644
index 3093a6d..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/tsp/cms/CMSTimeStampedData.java
+++ /dev/null
@@ -1,204 +0,0 @@
-package org.bouncycastle.tsp.cms;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URI;
-import java.net.URISyntaxException;
-
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.DERIA5String;
-import org.bouncycastle.asn1.cms.AttributeTable;
-import org.bouncycastle.asn1.cms.CMSObjectIdentifiers;
-import org.bouncycastle.asn1.cms.ContentInfo;
-import org.bouncycastle.asn1.cms.Evidence;
-import org.bouncycastle.asn1.cms.TimeStampAndCRL;
-import org.bouncycastle.asn1.cms.TimeStampTokenEvidence;
-import org.bouncycastle.asn1.cms.TimeStampedData;
-import org.bouncycastle.cms.CMSException;
-import org.bouncycastle.operator.DigestCalculator;
-import org.bouncycastle.operator.DigestCalculatorProvider;
-import org.bouncycastle.operator.OperatorCreationException;
-import org.bouncycastle.tsp.TimeStampToken;
-
-public class CMSTimeStampedData
-{
-    private TimeStampedData timeStampedData;
-    private ContentInfo contentInfo;
-    private TimeStampDataUtil util;
-
-    public CMSTimeStampedData(ContentInfo contentInfo)
-    {
-        this.initialize(contentInfo);
-    }
-
-    public CMSTimeStampedData(InputStream in)
-        throws IOException
-    {
-        try
-        {
-            initialize(ContentInfo.getInstance(new ASN1InputStream(in).readObject()));
-        }
-        catch (ClassCastException e)
-        {
-            throw new IOException("Malformed content: " + e);
-        }
-        catch (IllegalArgumentException e)
-        {
-            throw new IOException("Malformed content: " + e);
-        }
-    }
-
-    public CMSTimeStampedData(byte[] baseData)
-        throws IOException
-    {
-        this(new ByteArrayInputStream(baseData));
-    }
-
-    private void initialize(ContentInfo contentInfo)
-    {
-        this.contentInfo = contentInfo;
-
-        if (CMSObjectIdentifiers.timestampedData.equals(contentInfo.getContentType()))
-        {
-            this.timeStampedData = TimeStampedData.getInstance(contentInfo.getContent());
-        }
-        else
-        {
-            throw new IllegalArgumentException("Malformed content - type must be " + CMSObjectIdentifiers.timestampedData.getId());
-        }
-
-        util = new TimeStampDataUtil(this.timeStampedData);
-    }
-
-    public byte[] calculateNextHash(DigestCalculator calculator)
-        throws CMSException
-    {
-        return util.calculateNextHash(calculator);
-    }
-
-    /**
-     * Return a new timeStampedData object with the additional token attached.
-     *
-     * @throws CMSException
-     */
-    public CMSTimeStampedData addTimeStamp(TimeStampToken token)
-        throws CMSException
-    {
-        TimeStampAndCRL[] timeStamps = util.getTimeStamps();
-        TimeStampAndCRL[] newTimeStamps = new TimeStampAndCRL[timeStamps.length + 1];
-
-        System.arraycopy(timeStamps, 0, newTimeStamps, 0, timeStamps.length);
-
-        newTimeStamps[timeStamps.length] = new TimeStampAndCRL(token.toCMSSignedData().toASN1Structure());
-
-        return new CMSTimeStampedData(new ContentInfo(CMSObjectIdentifiers.timestampedData, new TimeStampedData(timeStampedData.getDataUri(), timeStampedData.getMetaData(), timeStampedData.getContent(), new Evidence(new TimeStampTokenEvidence(newTimeStamps)))));
-    }
-
-    public byte[] getContent()
-    {
-        if (timeStampedData.getContent() != null)
-        {
-            return timeStampedData.getContent().getOctets();
-        }
-
-        return null;
-    }
-
-    public URI getDataUri()
-        throws URISyntaxException
-    {
-        DERIA5String dataURI = this.timeStampedData.getDataUri();
-
-        if (dataURI != null)
-        {
-            return new URI(dataURI.getString());
-        }
-
-        return null;
-    }
-
-    public String getFileName()
-    {
-        return util.getFileName();
-    }
-
-    public String getMediaType()
-    {
-        return util.getMediaType();
-    }
-
-    public AttributeTable getOtherMetaData()
-    {
-        return util.getOtherMetaData();
-    }
-
-    public TimeStampToken[] getTimeStampTokens()
-        throws CMSException
-    {
-        return util.getTimeStampTokens();
-    }
-
-    /**
-     * Initialise the passed in calculator with the MetaData for this message, if it is
-     * required as part of the initial message imprint calculation.
-     *
-     * @param calculator the digest calculator to be initialised.
-     * @throws CMSException if the MetaData is required and cannot be processed
-     */
-    public void initialiseMessageImprintDigestCalculator(DigestCalculator calculator)
-        throws CMSException
-    {
-        util.initialiseMessageImprintDigestCalculator(calculator);
-    }
-
-    /**
-     * Returns an appropriately initialised digest calculator based on the message imprint algorithm
-     * described in the first time stamp in the TemporalData for this message. If the metadata is required
-     * to be included in the digest calculation, the returned calculator will be pre-initialised.
-     *
-     * @param calculatorProvider  a provider of DigestCalculator objects.
-     * @return an initialised digest calculator.
-     * @throws OperatorCreationException if the provider is unable to create the calculator.
-     */
-    public DigestCalculator getMessageImprintDigestCalculator(DigestCalculatorProvider calculatorProvider)
-        throws OperatorCreationException
-    {
-        return util.getMessageImprintDigestCalculator(calculatorProvider);
-    }
-
-    /**
-     * Validate the digests present in the TimeStampTokens contained in the CMSTimeStampedData.
-     *
-     * @param calculatorProvider provider for digest calculators
-     * @param dataDigest the calculated data digest for the message
-     * @throws ImprintDigestInvalidException if an imprint digest fails to compare
-     * @throws CMSException  if an exception occurs processing the message.
-     */
-    public void validate(DigestCalculatorProvider calculatorProvider, byte[] dataDigest)
-        throws ImprintDigestInvalidException, CMSException
-    {
-        util.validate(calculatorProvider, dataDigest);
-    }
-
-    /**
-     * Validate the passed in timestamp token against the tokens and data present in the message.
-     *
-     * @param calculatorProvider provider for digest calculators
-     * @param dataDigest the calculated data digest for the message.
-     * @param timeStampToken  the timestamp token of interest.
-     * @throws ImprintDigestInvalidException if the token is not present in the message, or an imprint digest fails to compare.
-     * @throws CMSException if an exception occurs processing the message.
-     */
-    public void validate(DigestCalculatorProvider calculatorProvider, byte[] dataDigest, TimeStampToken timeStampToken)
-        throws ImprintDigestInvalidException, CMSException
-    {
-        util.validate(calculatorProvider, dataDigest, timeStampToken);
-    }
-
-    public byte[] getEncoded()
-        throws IOException
-    {
-        return contentInfo.getEncoded();
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/tsp/cms/CMSTimeStampedDataGenerator.java b/bcpkix/src/main/java/org/bouncycastle/tsp/cms/CMSTimeStampedDataGenerator.java
deleted file mode 100644
index e6f2830..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/tsp/cms/CMSTimeStampedDataGenerator.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package org.bouncycastle.tsp.cms;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.BEROctetString;
-import org.bouncycastle.asn1.DERIA5String;
-import org.bouncycastle.asn1.cms.CMSObjectIdentifiers;
-import org.bouncycastle.asn1.cms.ContentInfo;
-import org.bouncycastle.asn1.cms.Evidence;
-import org.bouncycastle.asn1.cms.TimeStampAndCRL;
-import org.bouncycastle.asn1.cms.TimeStampTokenEvidence;
-import org.bouncycastle.asn1.cms.TimeStampedData;
-import org.bouncycastle.cms.CMSException;
-import org.bouncycastle.tsp.TimeStampToken;
-import org.bouncycastle.util.io.Streams;
-
-public class CMSTimeStampedDataGenerator
-    extends CMSTimeStampedGenerator
-{
-    public CMSTimeStampedData generate(TimeStampToken timeStamp) throws CMSException
-    {
-        return generate(timeStamp, (InputStream)null);
-    }
-
-    public CMSTimeStampedData generate(TimeStampToken timeStamp, byte[] content) throws CMSException
-    {
-        return generate(timeStamp, new ByteArrayInputStream(content));
-    }
-
-    public CMSTimeStampedData generate(TimeStampToken timeStamp, InputStream content)
-        throws CMSException
-    {
-        ByteArrayOutputStream contentOut = new ByteArrayOutputStream();
-
-        if (content != null)
-        {
-            try
-            {
-                Streams.pipeAll(content, contentOut);
-            }
-            catch (IOException e)
-            {
-                throw new CMSException("exception encapsulating content: " + e.getMessage(), e);
-            }
-        }
-
-        ASN1OctetString encContent = null;
-
-        if (contentOut.size() != 0)
-        {
-            encContent = new BEROctetString(contentOut.toByteArray());
-        }
-
-        TimeStampAndCRL stamp = new TimeStampAndCRL(timeStamp.toCMSSignedData().toASN1Structure());
-
-        DERIA5String asn1DataUri = null;
-
-        if (dataUri != null)
-        {
-            asn1DataUri = new DERIA5String(dataUri.toString());
-        }
-        
-        return new CMSTimeStampedData(new ContentInfo(CMSObjectIdentifiers.timestampedData, new TimeStampedData(asn1DataUri, metaData, encContent, new Evidence(new TimeStampTokenEvidence(stamp)))));
-    }
-}
-
diff --git a/bcpkix/src/main/java/org/bouncycastle/tsp/cms/CMSTimeStampedDataParser.java b/bcpkix/src/main/java/org/bouncycastle/tsp/cms/CMSTimeStampedDataParser.java
deleted file mode 100644
index 28c7e87..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/tsp/cms/CMSTimeStampedDataParser.java
+++ /dev/null
@@ -1,207 +0,0 @@
-package org.bouncycastle.tsp.cms;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URI;
-import java.net.URISyntaxException;
-
-import org.bouncycastle.asn1.BERTags;
-import org.bouncycastle.asn1.DERIA5String;
-import org.bouncycastle.asn1.cms.AttributeTable;
-import org.bouncycastle.asn1.cms.CMSObjectIdentifiers;
-import org.bouncycastle.asn1.cms.ContentInfoParser;
-import org.bouncycastle.asn1.cms.TimeStampedDataParser;
-import org.bouncycastle.cms.CMSContentInfoParser;
-import org.bouncycastle.cms.CMSException;
-import org.bouncycastle.operator.DigestCalculator;
-import org.bouncycastle.operator.DigestCalculatorProvider;
-import org.bouncycastle.operator.OperatorCreationException;
-import org.bouncycastle.tsp.TimeStampToken;
-import org.bouncycastle.util.io.Streams;
-
-public class CMSTimeStampedDataParser
-    extends CMSContentInfoParser
-{
-    private TimeStampedDataParser timeStampedData;
-    private TimeStampDataUtil util;
-
-    public CMSTimeStampedDataParser(InputStream in)
-        throws CMSException
-    {
-        super(in);
-
-        initialize(_contentInfo);
-    }
-
-    public CMSTimeStampedDataParser(byte[] baseData)
-        throws CMSException
-    {
-        this(new ByteArrayInputStream(baseData));
-    }
-
-    private void initialize(ContentInfoParser contentInfo)
-        throws CMSException
-    {
-        try
-        {
-            if (CMSObjectIdentifiers.timestampedData.equals(contentInfo.getContentType()))
-            {
-                this.timeStampedData = TimeStampedDataParser.getInstance(contentInfo.getContent(BERTags.SEQUENCE));
-            }
-            else
-            {
-                throw new IllegalArgumentException("Malformed content - type must be " + CMSObjectIdentifiers.timestampedData.getId());
-            }
-        }
-        catch (IOException e)
-        {
-            throw new CMSException("parsing exception: " + e.getMessage(), e);
-        }
-    }
-
-    public byte[] calculateNextHash(DigestCalculator calculator)
-        throws CMSException
-    {
-        return util.calculateNextHash(calculator);
-    }
-
-    public InputStream getContent()
-    {
-        if (timeStampedData.getContent() != null)
-        {
-            return timeStampedData.getContent().getOctetStream();
-        }
-
-        return null;
-    }
-
-    public URI getDataUri()
-        throws URISyntaxException
-    {
-        DERIA5String dataURI = this.timeStampedData.getDataUri();
-
-        if (dataURI != null)
-        {
-           return new URI(dataURI.getString());
-        }
-
-        return null;
-    }
-
-    public String getFileName()
-    {
-        return util.getFileName();
-    }
-
-    public String getMediaType()
-    {
-        return util.getMediaType();
-    }
-
-    public AttributeTable getOtherMetaData()
-    {
-        return util.getOtherMetaData();
-    }
-
-    /**
-     * Initialise the passed in calculator with the MetaData for this message, if it is
-     * required as part of the initial message imprint calculation.
-     *
-     * @param calculator the digest calculator to be initialised.
-     * @throws CMSException if the MetaData is required and cannot be processed
-     */
-    public void initialiseMessageImprintDigestCalculator(DigestCalculator calculator)
-        throws CMSException
-    {
-        util.initialiseMessageImprintDigestCalculator(calculator);
-    }
-
-    /**
-     * Returns an appropriately initialised digest calculator based on the message imprint algorithm
-     * described in the first time stamp in the TemporalData for this message. If the metadata is required
-     * to be included in the digest calculation, the returned calculator will be pre-initialised.
-     *
-     * @param calculatorProvider  a provider of DigestCalculator objects.
-     * @return an initialised digest calculator.
-     * @throws OperatorCreationException if the provider is unable to create the calculator.
-     */
-    public DigestCalculator getMessageImprintDigestCalculator(DigestCalculatorProvider calculatorProvider)
-        throws OperatorCreationException
-    {
-        try
-        {
-            parseTimeStamps();
-        }
-        catch (CMSException e)
-        {
-            throw new OperatorCreationException("unable to extract algorithm ID: " + e.getMessage(), e);
-        }
-
-        return util.getMessageImprintDigestCalculator(calculatorProvider);
-    }
-
-    public TimeStampToken[] getTimeStampTokens()
-        throws CMSException
-    {
-        parseTimeStamps();
-
-        return util.getTimeStampTokens();
-    }
-
-    /**
-     * Validate the digests present in the TimeStampTokens contained in the CMSTimeStampedData.
-     *
-     * @param calculatorProvider provider for digest calculators
-     * @param dataDigest the calculated data digest for the message
-     * @throws ImprintDigestInvalidException if an imprint digest fails to compare
-     * @throws CMSException  if an exception occurs processing the message.
-     */
-    public void validate(DigestCalculatorProvider calculatorProvider, byte[] dataDigest)
-        throws ImprintDigestInvalidException, CMSException
-    {
-        parseTimeStamps();
-
-        util.validate(calculatorProvider, dataDigest);
-    }
-
-    /**
-     * Validate the passed in timestamp token against the tokens and data present in the message.
-     *
-     * @param calculatorProvider provider for digest calculators
-     * @param dataDigest the calculated data digest for the message.
-     * @param timeStampToken  the timestamp token of interest.
-     * @throws ImprintDigestInvalidException if the token is not present in the message, or an imprint digest fails to compare.
-     * @throws CMSException if an exception occurs processing the message.
-     */
-    public void validate(DigestCalculatorProvider calculatorProvider, byte[] dataDigest, TimeStampToken timeStampToken)
-        throws ImprintDigestInvalidException, CMSException
-    {
-        parseTimeStamps();
-
-        util.validate(calculatorProvider, dataDigest, timeStampToken);
-    }
-
-    private void parseTimeStamps()
-        throws CMSException
-    {
-        try
-        {
-            if (util == null)
-            {
-                InputStream cont = this.getContent();
-
-                if (cont != null)
-                {
-                    Streams.drain(cont);
-                }
-
-                util = new TimeStampDataUtil(timeStampedData);
-            }
-        }
-        catch (IOException e)
-        {
-            throw new CMSException("unable to parse evidence block: " + e.getMessage(), e);
-        }
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/tsp/cms/CMSTimeStampedGenerator.java b/bcpkix/src/main/java/org/bouncycastle/tsp/cms/CMSTimeStampedGenerator.java
deleted file mode 100644
index 5cc8866..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/tsp/cms/CMSTimeStampedGenerator.java
+++ /dev/null
@@ -1,88 +0,0 @@
-package org.bouncycastle.tsp.cms;
-
-import java.net.URI;
-
-import org.bouncycastle.asn1.ASN1Boolean;
-import org.bouncycastle.asn1.DERIA5String;
-import org.bouncycastle.asn1.DERUTF8String;
-import org.bouncycastle.asn1.cms.Attributes;
-import org.bouncycastle.asn1.cms.MetaData;
-import org.bouncycastle.cms.CMSException;
-import org.bouncycastle.operator.DigestCalculator;
-
-public class CMSTimeStampedGenerator
-{
-    protected MetaData metaData;
-    protected URI dataUri;
-
-    /**
-     * Set the dataURI to be included in message.
-     *
-     * @param dataUri URI for the data the initial message imprint digest is based on.
-     */
-    public void setDataUri(URI dataUri)
-    {
-        this.dataUri = dataUri;
-    }
-
-    /**
-     * Set the MetaData for the generated message.
-     *
-     * @param hashProtected true if the MetaData should be included in first imprint calculation, false otherwise.
-     * @param fileName optional file name, may be null.
-     * @param mediaType optional media type, may be null.
-     */
-    public void setMetaData(boolean hashProtected, String fileName, String mediaType)
-    {
-        setMetaData(hashProtected, fileName, mediaType, null);
-    }
-
-    /**
-     * Set the MetaData for the generated message.
-     *
-     * @param hashProtected true if the MetaData should be included in first imprint calculation, false otherwise.
-     * @param fileName optional file name, may be null.
-     * @param mediaType optional media type, may be null.
-     * @param attributes optional attributes, may be null.
-     */
-    public void setMetaData(boolean hashProtected, String fileName, String mediaType, Attributes attributes)
-    {
-        DERUTF8String asn1FileName = null;
-
-        if (fileName != null)
-        {
-            asn1FileName = new DERUTF8String(fileName);
-        }
-
-        DERIA5String asn1MediaType = null;
-
-        if (mediaType != null)
-        {
-            asn1MediaType = new DERIA5String(mediaType);
-        }
-
-        setMetaData(hashProtected, asn1FileName, asn1MediaType, attributes);
-    }
-
-    private void setMetaData(boolean hashProtected, DERUTF8String fileName, DERIA5String mediaType, Attributes attributes)
-    {
-        this.metaData = new MetaData(ASN1Boolean.getInstance(hashProtected), fileName, mediaType, attributes);
-    }
-
-    /**
-     * Initialise the passed in calculator with the MetaData for this message, if it is
-     * required as part of the initial message imprint calculation. After initialisation the
-     * calculator can then be used to calculate the initial message imprint digest for the first
-     * timestamp.
-     *
-     * @param calculator the digest calculator to be initialised.
-     * @throws CMSException if the MetaData is required and cannot be processed
-     */
-    public void initialiseMessageImprintDigestCalculator(DigestCalculator calculator)
-        throws CMSException
-    {
-        MetaDataUtil util = new MetaDataUtil(metaData);
-
-        util.initialiseMessageImprintDigestCalculator(calculator);
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/tsp/cms/ImprintDigestInvalidException.java b/bcpkix/src/main/java/org/bouncycastle/tsp/cms/ImprintDigestInvalidException.java
deleted file mode 100644
index 3699997..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/tsp/cms/ImprintDigestInvalidException.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package org.bouncycastle.tsp.cms;
-
-import org.bouncycastle.tsp.TimeStampToken;
-
-public class ImprintDigestInvalidException
-    extends Exception
-{
-    private TimeStampToken token;
-
-    public ImprintDigestInvalidException(String message, TimeStampToken token)
-    {
-        super(message);
-
-        this.token = token;
-    }
-
-    public TimeStampToken getTimeStampToken()
-    {
-        return token;
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/tsp/cms/MetaDataUtil.java b/bcpkix/src/main/java/org/bouncycastle/tsp/cms/MetaDataUtil.java
deleted file mode 100644
index b52f669..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/tsp/cms/MetaDataUtil.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package org.bouncycastle.tsp.cms;
-
-import java.io.IOException;
-
-import org.bouncycastle.asn1.ASN1Encoding;
-import org.bouncycastle.asn1.ASN1String;
-import org.bouncycastle.asn1.cms.Attributes;
-import org.bouncycastle.asn1.cms.MetaData;
-import org.bouncycastle.cms.CMSException;
-import org.bouncycastle.operator.DigestCalculator;
-
-class MetaDataUtil
-{
-    private final MetaData          metaData;
-
-    MetaDataUtil(MetaData metaData)
-    {
-        this.metaData = metaData;
-    }
-
-    void initialiseMessageImprintDigestCalculator(DigestCalculator calculator)
-        throws CMSException
-    {
-        if (metaData != null && metaData.isHashProtected())
-        {
-            try
-            {
-                calculator.getOutputStream().write(metaData.getEncoded(ASN1Encoding.DER));
-            }
-            catch (IOException e)
-            {
-                throw new CMSException("unable to initialise calculator from metaData: " + e.getMessage(), e);
-            }
-        }
-    }
-
-    String getFileName()
-    {
-        if (metaData != null)
-        {
-            return convertString(metaData.getFileName());
-        }
-
-        return null;
-    }
-
-    String getMediaType()
-    {
-        if (metaData != null)
-        {
-            return convertString(metaData.getMediaType());
-        }
-
-        return null;
-    }
-
-    Attributes getOtherMetaData()
-    {
-        if (metaData != null)
-        {
-            return metaData.getOtherMetaData();
-        }
-
-        return null;
-    }
-
-    private String convertString(ASN1String s)
-    {
-        if (s != null)
-        {
-            return s.toString();
-        }
-
-        return null;
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/tsp/cms/TimeStampDataUtil.java b/bcpkix/src/main/java/org/bouncycastle/tsp/cms/TimeStampDataUtil.java
deleted file mode 100644
index ce115f4..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/tsp/cms/TimeStampDataUtil.java
+++ /dev/null
@@ -1,256 +0,0 @@
-package org.bouncycastle.tsp.cms;
-
-import java.io.IOException;
-import java.io.OutputStream;
-
-import org.bouncycastle.asn1.ASN1Encoding;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.cms.AttributeTable;
-import org.bouncycastle.asn1.cms.ContentInfo;
-import org.bouncycastle.asn1.cms.Evidence;
-import org.bouncycastle.asn1.cms.TimeStampAndCRL;
-import org.bouncycastle.asn1.cms.TimeStampedData;
-import org.bouncycastle.asn1.cms.TimeStampedDataParser;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.cms.CMSException;
-import org.bouncycastle.operator.DigestCalculator;
-import org.bouncycastle.operator.DigestCalculatorProvider;
-import org.bouncycastle.operator.OperatorCreationException;
-import org.bouncycastle.tsp.TSPException;
-import org.bouncycastle.tsp.TimeStampToken;
-import org.bouncycastle.tsp.TimeStampTokenInfo;
-import org.bouncycastle.util.Arrays;
-
-class TimeStampDataUtil
-{
-    private final TimeStampAndCRL[] timeStamps;
-
-    private final MetaDataUtil      metaDataUtil;
-
-    TimeStampDataUtil(TimeStampedData timeStampedData)
-    {
-        this.metaDataUtil = new MetaDataUtil(timeStampedData.getMetaData());
-
-        Evidence evidence = timeStampedData.getTemporalEvidence();
-        this.timeStamps = evidence.getTstEvidence().toTimeStampAndCRLArray();
-    }
-
-    TimeStampDataUtil(TimeStampedDataParser timeStampedData)
-        throws IOException
-    {       
-        this.metaDataUtil = new MetaDataUtil(timeStampedData.getMetaData());
-
-        Evidence evidence = timeStampedData.getTemporalEvidence();
-        this.timeStamps = evidence.getTstEvidence().toTimeStampAndCRLArray();
-    }
-
-    TimeStampToken getTimeStampToken(TimeStampAndCRL timeStampAndCRL)
-        throws CMSException
-    {
-        ContentInfo timeStampToken = timeStampAndCRL.getTimeStampToken();
-
-        try
-        {
-            TimeStampToken token = new TimeStampToken(timeStampToken);
-            return token;
-        }
-        catch (IOException e)
-        {
-            throw new CMSException("unable to parse token data: " + e.getMessage(), e);
-        }
-        catch (TSPException e)
-        {
-            if (e.getCause() instanceof CMSException)
-            {
-                throw (CMSException)e.getCause();
-            }
-
-            throw new CMSException("token data invalid: " + e.getMessage(), e);
-        }
-        catch (IllegalArgumentException e)
-        {
-            throw new CMSException("token data invalid: " + e.getMessage(), e);
-        }
-    }
-
-    void initialiseMessageImprintDigestCalculator(DigestCalculator calculator)
-        throws CMSException
-    {
-        metaDataUtil.initialiseMessageImprintDigestCalculator(calculator);
-    }
-
-    DigestCalculator getMessageImprintDigestCalculator(DigestCalculatorProvider calculatorProvider)
-        throws OperatorCreationException
-    {
-        TimeStampToken token;
-
-        try
-        {
-            token = this.getTimeStampToken(timeStamps[0]);
-
-            TimeStampTokenInfo info = token.getTimeStampInfo();
-            ASN1ObjectIdentifier algOID = info.getMessageImprintAlgOID();
-
-            DigestCalculator calc = calculatorProvider.get(new AlgorithmIdentifier(algOID));
-
-            initialiseMessageImprintDigestCalculator(calc);
-
-            return calc;
-        }
-        catch (CMSException e)
-        {
-            throw new OperatorCreationException("unable to extract algorithm ID: " + e.getMessage(), e);
-        }
-    }
-
-    TimeStampToken[] getTimeStampTokens()
-        throws CMSException
-    {
-        TimeStampToken[] tokens = new TimeStampToken[timeStamps.length];
-        for (int i = 0; i < timeStamps.length; i++)
-        {
-            tokens[i] = this.getTimeStampToken(timeStamps[i]);
-        }
-
-        return tokens;
-    }
-
-    TimeStampAndCRL[] getTimeStamps()
-    {
-        return timeStamps;
-    }
-
-    byte[] calculateNextHash(DigestCalculator calculator)
-        throws CMSException
-    {
-        TimeStampAndCRL tspToken = timeStamps[timeStamps.length - 1];
-
-        OutputStream out = calculator.getOutputStream();
-
-        try
-        {
-            out.write(tspToken.getEncoded(ASN1Encoding.DER));
-
-            out.close();
-
-            return calculator.getDigest();
-        }
-        catch (IOException e)
-        {
-            throw new CMSException("exception calculating hash: " + e.getMessage(), e);
-        }
-    }
-
-    /**
-     * Validate the digests present in the TimeStampTokens contained in the CMSTimeStampedData.
-     */
-    void validate(DigestCalculatorProvider calculatorProvider, byte[] dataDigest)
-        throws ImprintDigestInvalidException, CMSException
-    {
-        byte[] currentDigest = dataDigest;
-
-        for (int i = 0; i < timeStamps.length; i++)
-        {
-            try
-            {
-                TimeStampToken token = this.getTimeStampToken(timeStamps[i]);
-                if (i > 0)
-                {
-                    TimeStampTokenInfo info = token.getTimeStampInfo();
-                    DigestCalculator calculator = calculatorProvider.get(info.getHashAlgorithm());
-
-                    calculator.getOutputStream().write(timeStamps[i - 1].getEncoded(ASN1Encoding.DER));
-
-                    currentDigest = calculator.getDigest();
-                }
-
-                this.compareDigest(token, currentDigest);
-            }
-            catch (IOException e)
-            {
-                throw new CMSException("exception calculating hash: " + e.getMessage(), e);
-            }
-            catch (OperatorCreationException e)
-            {
-                throw new CMSException("cannot create digest: " + e.getMessage(), e);
-            }
-        }
-    }
-
-    void validate(DigestCalculatorProvider calculatorProvider, byte[] dataDigest, TimeStampToken timeStampToken)
-        throws ImprintDigestInvalidException, CMSException
-    {
-        byte[] currentDigest = dataDigest;
-        byte[] encToken;
-
-        try
-        {
-            encToken = timeStampToken.getEncoded();
-        }
-        catch (IOException e)
-        {
-            throw new CMSException("exception encoding timeStampToken: " + e.getMessage(), e);
-        }
-
-        for (int i = 0; i < timeStamps.length; i++)
-        {
-            try
-            {
-                TimeStampToken token = this.getTimeStampToken(timeStamps[i]);
-                if (i > 0)
-                {
-                    TimeStampTokenInfo info = token.getTimeStampInfo();
-                    DigestCalculator calculator = calculatorProvider.get(info.getHashAlgorithm());
-
-                    calculator.getOutputStream().write(timeStamps[i - 1].getEncoded(ASN1Encoding.DER));
-
-                    currentDigest = calculator.getDigest();
-                }
-
-                this.compareDigest(token, currentDigest);
-
-                if (Arrays.areEqual(token.getEncoded(), encToken))
-                {
-                    return;
-                }
-            }
-            catch (IOException e)
-            {
-                throw new CMSException("exception calculating hash: " + e.getMessage(), e);
-            }
-            catch (OperatorCreationException e)
-            {
-                throw new CMSException("cannot create digest: " + e.getMessage(), e);
-            }
-        }
-
-        throw new ImprintDigestInvalidException("passed in token not associated with timestamps present", timeStampToken);
-    }
-
-    private void compareDigest(TimeStampToken timeStampToken, byte[] digest)
-        throws ImprintDigestInvalidException
-    {
-        TimeStampTokenInfo info = timeStampToken.getTimeStampInfo();
-        byte[] tsrMessageDigest = info.getMessageImprintDigest();
-
-        if (!Arrays.areEqual(digest, tsrMessageDigest))
-        {
-            throw new ImprintDigestInvalidException("hash calculated is different from MessageImprintDigest found in TimeStampToken", timeStampToken);
-        }
-    }
-
-    String getFileName()
-    {
-        return metaDataUtil.getFileName();
-    }
-
-    String getMediaType()
-    {
-        return metaDataUtil.getMediaType();
-    }
-
-    AttributeTable getOtherMetaData()
-    {
-        return new AttributeTable(metaDataUtil.getOtherMetaData());
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/tsp/cms/package.html b/bcpkix/src/main/java/org/bouncycastle/tsp/cms/package.html
deleted file mode 100644
index 2cf1bac..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/tsp/cms/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body bgcolor="#ffffff">
-Classes for dealing Syntax for Binding Documents with Time-Stamps - RFC 5544.
-</body>
-</html>
diff --git a/bcpkix/src/main/java/org/bouncycastle/tsp/package.html b/bcpkix/src/main/java/org/bouncycastle/tsp/package.html
deleted file mode 100644
index 45d0c3c..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/tsp/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body bgcolor="#ffffff">
-Classes for dealing Time Stamp Protocol (TSP) - RFC 3161.
-</body>
-</html>
diff --git a/bcpkix/src/main/java/org/bouncycastle/tsp/test/AllTests.java b/bcpkix/src/main/java/org/bouncycastle/tsp/test/AllTests.java
deleted file mode 100644
index 19fc664..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/tsp/test/AllTests.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package org.bouncycastle.tsp.test;
-
-import java.security.Security;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-
-public class AllTests
-    extends TestCase
-{
-    public static void main (String[] args)
-    {
-        junit.textui.TestRunner.run(suite());
-    }
-    
-    public static Test suite()
-    {
-        Security.addProvider(new BouncyCastleProvider());
-        
-        TestSuite suite = new TestSuite("TSP Tests");
-        
-        suite.addTestSuite(ParseTest.class);
-        suite.addTestSuite(NewTSPTest.class);
-        suite.addTestSuite(CMSTimeStampedDataTest.class);
-        suite.addTestSuite(CMSTimeStampedDataParserTest.class);
-        suite.addTestSuite(CMSTimeStampedDataGeneratorTest.class);
-        
-        return suite;
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/tsp/test/CMSTimeStampedDataGeneratorTest.java b/bcpkix/src/main/java/org/bouncycastle/tsp/test/CMSTimeStampedDataGeneratorTest.java
deleted file mode 100644
index 45f502a..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/tsp/test/CMSTimeStampedDataGeneratorTest.java
+++ /dev/null
@@ -1,309 +0,0 @@
-package org.bouncycastle.tsp.test;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
-import java.math.BigInteger;
-import java.security.KeyPair;
-import java.security.PrivateKey;
-import java.security.Security;
-import java.security.cert.X509Certificate;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-import junit.framework.TestCase;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.nist.NISTObjectIdentifiers;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.cert.jcajce.JcaCertStore;
-import org.bouncycastle.cms.jcajce.JcaSimpleSignerInfoGeneratorBuilder;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.operator.DigestCalculator;
-import org.bouncycastle.operator.DigestCalculatorProvider;
-import org.bouncycastle.operator.bc.BcDigestCalculatorProvider;
-import org.bouncycastle.tsp.TSPAlgorithms;
-import org.bouncycastle.tsp.TimeStampRequest;
-import org.bouncycastle.tsp.TimeStampRequestGenerator;
-import org.bouncycastle.tsp.TimeStampResponse;
-import org.bouncycastle.tsp.TimeStampResponseGenerator;
-import org.bouncycastle.tsp.TimeStampToken;
-import org.bouncycastle.tsp.TimeStampTokenGenerator;
-import org.bouncycastle.tsp.cms.CMSTimeStampedData;
-import org.bouncycastle.tsp.cms.CMSTimeStampedDataGenerator;
-import org.bouncycastle.tsp.cms.CMSTimeStampedDataParser;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.Store;
-import org.bouncycastle.util.io.Streams;
-
-public class CMSTimeStampedDataGeneratorTest
-    extends TestCase
-{
-
-    BouncyCastleProvider bouncyCastleProvider;
-    CMSTimeStampedDataGenerator cmsTimeStampedDataGenerator = null;
-    String fileInput = "FileDaFirmare.data";
-    byte[] baseData;
-
-    protected void setUp()
-        throws Exception
-    {
-        bouncyCastleProvider = new BouncyCastleProvider();
-        if (Security.getProvider(bouncyCastleProvider.getName()) == null)
-        {
-            Security.addProvider(bouncyCastleProvider);
-        }
-
-        cmsTimeStampedDataGenerator = new CMSTimeStampedDataGenerator();
-        ByteArrayOutputStream origStream = new ByteArrayOutputStream();
-        InputStream in = this.getClass().getResourceAsStream(fileInput);
-        int ch;
-
-        while ((ch = in.read()) >= 0)
-        {
-            origStream.write(ch);
-        }
-
-        origStream.close();
-
-        this.baseData = origStream.toByteArray();
-
-    }
-
-    protected void tearDown()
-        throws Exception
-    {
-        cmsTimeStampedDataGenerator = null;
-        Security.removeProvider(bouncyCastleProvider.getName());
-    }
-
-    public void testGenerate()
-        throws Exception
-    {
-        BcDigestCalculatorProvider calculatorProvider = new BcDigestCalculatorProvider();
-        ASN1ObjectIdentifier algOID = new ASN1ObjectIdentifier("2.16.840.1.101.3.4.2.1"); // SHA-256
-        DigestCalculator hashCalculator = calculatorProvider.get(new AlgorithmIdentifier(algOID));
-
-        cmsTimeStampedDataGenerator.initialiseMessageImprintDigestCalculator(hashCalculator);
-
-        hashCalculator.getOutputStream().write(baseData);
-        hashCalculator.getOutputStream().close();
-
-        TimeStampToken timeStampToken = createTimeStampToken(hashCalculator.getDigest(), NISTObjectIdentifiers.id_sha256);
-        CMSTimeStampedData cmsTimeStampedData = cmsTimeStampedDataGenerator.generate(timeStampToken, baseData);
-
-        for (int i = 0; i < 3; i++)
-        {
-            byte[] newRequestData = cmsTimeStampedData.calculateNextHash(hashCalculator);
-            TimeStampToken newTimeStampToken = createTimeStampToken(newRequestData, NISTObjectIdentifiers.id_sha256);
-            cmsTimeStampedData = cmsTimeStampedData.addTimeStamp(newTimeStampToken);
-        }
-        byte[] timeStampedData = cmsTimeStampedData.getEncoded();
-
-        // verify
-        DigestCalculatorProvider newCalculatorProvider = new BcDigestCalculatorProvider();
-        DigestCalculator imprintCalculator = cmsTimeStampedData.getMessageImprintDigestCalculator(newCalculatorProvider);
-        CMSTimeStampedData newCMSTimeStampedData = new CMSTimeStampedData(timeStampedData);
-        byte[] newContent = newCMSTimeStampedData.getContent();
-        assertEquals("Content expected and verified are different", true, Arrays.areEqual(newContent, baseData));
-
-        imprintCalculator.getOutputStream().write(newContent);
-
-        byte[] digest = imprintCalculator.getDigest();
-
-        TimeStampToken[] tokens = cmsTimeStampedData.getTimeStampTokens();
-        assertEquals("TimeStampToken expected and verified are different", 4, tokens.length);
-        for (int i = 0; i < tokens.length; i++)
-        {
-            cmsTimeStampedData.validate(newCalculatorProvider, digest, tokens[i]);
-        }
-    }
-
-    public void testGenerateWithMetadata()
-        throws Exception
-    {
-        cmsTimeStampedDataGenerator.setMetaData(true, fileInput, "TXT");
-
-        BcDigestCalculatorProvider calculatorProvider = new BcDigestCalculatorProvider();
-        ASN1ObjectIdentifier algOID = new ASN1ObjectIdentifier("2.16.840.1.101.3.4.2.1"); // SHA-256
-        DigestCalculator hashCalculator = calculatorProvider.get(new AlgorithmIdentifier(algOID));
-
-        cmsTimeStampedDataGenerator.initialiseMessageImprintDigestCalculator(hashCalculator);
-
-        hashCalculator.getOutputStream().write(baseData);
-        hashCalculator.getOutputStream().close();
-
-        TimeStampToken timeStampToken = createTimeStampToken(hashCalculator.getDigest(), NISTObjectIdentifiers.id_sha256);
-        CMSTimeStampedData cmsTimeStampedData = cmsTimeStampedDataGenerator.generate(timeStampToken, baseData);
-
-        for (int i = 0; i <= 3; i++)
-        {
-            byte[] newRequestData = cmsTimeStampedData.calculateNextHash(hashCalculator);
-            TimeStampToken newTimeStampToken = createTimeStampToken(newRequestData, NISTObjectIdentifiers.id_sha256);
-            cmsTimeStampedData = cmsTimeStampedData.addTimeStamp(newTimeStampToken);
-        }
-        byte[] timeStampedData = cmsTimeStampedData.getEncoded();
-
-        metadataCheck(timeStampedData);
-        metadataParserCheck(timeStampedData);
-    }
-
-    public void testGenerateWithMetadataAndDifferentAlgorithmIdentifier()
-        throws Exception
-    {
-        cmsTimeStampedDataGenerator.setMetaData(true, fileInput, "TXT");
-
-        BcDigestCalculatorProvider calculatorProvider = new BcDigestCalculatorProvider();
-
-        ASN1ObjectIdentifier algIdentifier = NISTObjectIdentifiers.id_sha224;
-
-        DigestCalculator hashCalculator = calculatorProvider.get(new AlgorithmIdentifier(algIdentifier));
-        cmsTimeStampedDataGenerator.initialiseMessageImprintDigestCalculator(hashCalculator);
-        hashCalculator.getOutputStream().write(baseData);
-        hashCalculator.getOutputStream().close();
-
-        byte[] requestData = hashCalculator.getDigest();
-        TimeStampToken timeStampToken = createTimeStampToken(requestData, algIdentifier);
-
-        CMSTimeStampedData cmsTimeStampedData = cmsTimeStampedDataGenerator.generate(timeStampToken, baseData);
-
-        for (int i = 0; i <= 3; i++) {
-            switch (i) {
-            case 0:
-                algIdentifier =    NISTObjectIdentifiers.id_sha224;
-                break;
-            case 1:
-                algIdentifier =    NISTObjectIdentifiers.id_sha256;
-                break;
-            case 2:
-                algIdentifier =    NISTObjectIdentifiers.id_sha384;
-                break;
-            case 3:
-                algIdentifier =    NISTObjectIdentifiers.id_sha512;
-                break;
-            }
-            hashCalculator = calculatorProvider.get(new AlgorithmIdentifier(algIdentifier));
-            byte[] newRequestData = cmsTimeStampedData.calculateNextHash(hashCalculator);
-            TimeStampToken newTimeStampToken = createTimeStampToken(newRequestData, algIdentifier);
-            cmsTimeStampedData = cmsTimeStampedData.addTimeStamp(newTimeStampToken);
-        }
-        byte[] timeStampedData = cmsTimeStampedData.getEncoded();
-
-        metadataCheck(timeStampedData);
-        metadataParserCheck(timeStampedData);
-
-    }
-
-
-    private void metadataCheck(byte[] timeStampedData)
-        throws Exception
-    {
-        CMSTimeStampedData cmsTspData = new CMSTimeStampedData(timeStampedData);
-        DigestCalculatorProvider newCalculatorProvider = new BcDigestCalculatorProvider();
-        DigestCalculator imprintCalculator = cmsTspData.getMessageImprintDigestCalculator(newCalculatorProvider);
-
-        byte[] newContent = cmsTspData.getContent();
-        assertEquals("Content expected and verified are different", true, Arrays.areEqual(newContent, baseData));
-
-        imprintCalculator.getOutputStream().write(newContent);
-
-        assertEquals(fileInput, cmsTspData.getFileName());
-        assertEquals("TXT", cmsTspData.getMediaType());
-
-        byte[] digest = imprintCalculator.getDigest();
-
-        TimeStampToken[] tokens = cmsTspData.getTimeStampTokens();
-        assertEquals("TimeStampToken expected and verified are different", 5, tokens.length);
-        for (int i = 0; i < tokens.length; i++)
-        {
-            cmsTspData.validate(newCalculatorProvider, digest, tokens[i]);
-        }
-    }
-
-    private void metadataParserCheck(byte[] timeStampedData)
-        throws Exception
-    {
-        CMSTimeStampedDataParser cmsTspData = new CMSTimeStampedDataParser(timeStampedData);
-        DigestCalculatorProvider newCalculatorProvider = new BcDigestCalculatorProvider();
-
-        InputStream input = cmsTspData.getContent();
-        ByteArrayOutputStream bOut = new ByteArrayOutputStream();
-
-        Streams.pipeAll(input, bOut);
-
-        assertEquals("Content expected and verified are different", true, Arrays.areEqual(bOut.toByteArray(), baseData));
-
-        DigestCalculator imprintCalculator = cmsTspData.getMessageImprintDigestCalculator(newCalculatorProvider);
-
-        Streams.pipeAll(new ByteArrayInputStream(bOut.toByteArray()), imprintCalculator.getOutputStream());
-
-        assertEquals(fileInput, cmsTspData.getFileName());
-        assertEquals("TXT", cmsTspData.getMediaType());
-
-        byte[] digest = imprintCalculator.getDigest();
-
-        TimeStampToken[] tokens = cmsTspData.getTimeStampTokens();
-        assertEquals("TimeStampToken expected and verified are different", 5, tokens.length);
-        for (int i = 0; i < tokens.length; i++)
-        {
-            cmsTspData.validate(newCalculatorProvider, digest, tokens[i]);
-        }
-    }
-
-    private TimeStampToken createTimeStampToken(byte[] hash, ASN1ObjectIdentifier hashAlg)
-        throws Exception
-    {
-        String algorithmName = null;
-        if (hashAlg.equals(NISTObjectIdentifiers.id_sha224))
-        {
-            algorithmName = "SHA224withRSA";
-        }
-        else if (hashAlg.equals(NISTObjectIdentifiers.id_sha256))
-        {
-            algorithmName = "SHA256withRSA";
-        }
-        else if (hashAlg.equals(NISTObjectIdentifiers.id_sha384))
-        {
-            algorithmName = "SHA384withRSA";
-        }
-        else if (hashAlg.equals(NISTObjectIdentifiers.id_sha512))
-        {
-            algorithmName = "SHA512withRSA";
-        }
-
-        String signDN = "O=Bouncy Castle, C=AU";
-        KeyPair signKP = TSPTestUtil.makeKeyPair();
-        X509Certificate signCert = TSPTestUtil.makeCACertificate(signKP,
-            signDN, signKP, signDN);
-
-        String origDN = "CN=Eric H. Echidna, E=eric@bouncycastle.org, O=Bouncy Castle, C=AU";
-        KeyPair origKP = TSPTestUtil.makeKeyPair();
-        X509Certificate cert = TSPTestUtil.makeCertificate(origKP,
-            origDN, signKP, signDN);
-
-        PrivateKey privateKey = origKP.getPrivate();
-
-        List certList = new ArrayList();
-        certList.add(cert);
-        certList.add(signCert);
-
-        Store certs = new JcaCertStore(certList);
-
-
-        TimeStampTokenGenerator tsTokenGen = new TimeStampTokenGenerator(
-            new JcaSimpleSignerInfoGeneratorBuilder().setProvider("BC").build(algorithmName, privateKey, cert), new SHA1DigestCalculator(), new ASN1ObjectIdentifier("1.2"));
-
-        tsTokenGen.addCertificates(certs);
-
-        TimeStampRequestGenerator reqGen = new TimeStampRequestGenerator();
-        TimeStampRequest request = reqGen.generate(hashAlg, hash);
-
-        TimeStampResponseGenerator tsRespGen = new TimeStampResponseGenerator(tsTokenGen, TSPAlgorithms.ALLOWED);
-
-        TimeStampResponse tsResp = tsRespGen.generate(request, new BigInteger("23"), new Date());
-
-        tsResp = new TimeStampResponse(tsResp.getEncoded());
-
-        return tsResp.getTimeStampToken();
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/tsp/test/CMSTimeStampedDataParserTest.java b/bcpkix/src/main/java/org/bouncycastle/tsp/test/CMSTimeStampedDataParserTest.java
deleted file mode 100644
index 138e892..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/tsp/test/CMSTimeStampedDataParserTest.java
+++ /dev/null
@@ -1,91 +0,0 @@
-package org.bouncycastle.tsp.test;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
-
-import junit.framework.TestCase;
-import org.bouncycastle.operator.DigestCalculator;
-import org.bouncycastle.operator.DigestCalculatorProvider;
-import org.bouncycastle.operator.bc.BcDigestCalculatorProvider;
-import org.bouncycastle.tsp.TimeStampToken;
-import org.bouncycastle.tsp.cms.CMSTimeStampedDataParser;
-import org.bouncycastle.util.io.Streams;
-
-public class CMSTimeStampedDataParserTest
-    extends TestCase
-{
-
-    CMSTimeStampedDataParser cmsTimeStampedData = null;
-    String fileInput = "FileDaFirmare.txt.tsd.der";
-    private byte[] baseData;
-
-    protected void setUp()
-        throws Exception
-    {
-        ByteArrayOutputStream origStream = new ByteArrayOutputStream();
-        InputStream in = this.getClass().getResourceAsStream(fileInput);
-        int ch;
-
-        while ((ch = in.read()) >= 0)
-        {
-            origStream.write(ch);
-        }
-
-        origStream.close();
-
-        this.baseData = origStream.toByteArray();
-
-        cmsTimeStampedData = new CMSTimeStampedDataParser(baseData);
-    }
-
-    protected void tearDown()
-        throws Exception
-    {
-        cmsTimeStampedData = null;
-    }
-
-    public void testGetTimeStampTokens()
-        throws Exception
-    {
-        TimeStampToken[] tokens = cmsTimeStampedData.getTimeStampTokens();
-        assertEquals(3, tokens.length);
-    }
-
-    public void testValidateAllTokens()
-        throws Exception
-    {
-        DigestCalculatorProvider digestCalculatorProvider = new BcDigestCalculatorProvider();
-        ByteArrayOutputStream bOut = new ByteArrayOutputStream();
-
-        Streams.pipeAll(cmsTimeStampedData.getContent(), bOut);
-
-        DigestCalculator imprintCalculator = cmsTimeStampedData.getMessageImprintDigestCalculator(digestCalculatorProvider);
-
-        Streams.pipeAll(new ByteArrayInputStream(bOut.toByteArray()), imprintCalculator.getOutputStream());
-
-        byte[] digest = imprintCalculator.getDigest();
-
-        TimeStampToken[] tokens = cmsTimeStampedData.getTimeStampTokens();
-        for (int i = 0; i < tokens.length; i++)
-        {
-            cmsTimeStampedData.validate(digestCalculatorProvider, digest, tokens[i]);
-        }
-    }
-
-    public void testValidate()
-        throws Exception
-    {
-        DigestCalculatorProvider digestCalculatorProvider = new BcDigestCalculatorProvider();
-        ByteArrayOutputStream bOut = new ByteArrayOutputStream();
-
-        Streams.pipeAll(cmsTimeStampedData.getContent(), bOut);
-
-        DigestCalculator imprintCalculator = cmsTimeStampedData.getMessageImprintDigestCalculator(digestCalculatorProvider);
-
-        Streams.pipeAll(new ByteArrayInputStream(bOut.toByteArray()), imprintCalculator.getOutputStream());
-
-        cmsTimeStampedData.validate(digestCalculatorProvider, imprintCalculator.getDigest());
-    }
-
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/tsp/test/CMSTimeStampedDataTest.java b/bcpkix/src/main/java/org/bouncycastle/tsp/test/CMSTimeStampedDataTest.java
deleted file mode 100644
index 0bfefaa..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/tsp/test/CMSTimeStampedDataTest.java
+++ /dev/null
@@ -1,84 +0,0 @@
-package org.bouncycastle.tsp.test;
-
-import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
-
-import junit.framework.TestCase;
-import org.bouncycastle.operator.DigestCalculator;
-import org.bouncycastle.operator.DigestCalculatorProvider;
-import org.bouncycastle.operator.bc.BcDigestCalculatorProvider;
-import org.bouncycastle.tsp.TimeStampToken;
-import org.bouncycastle.tsp.cms.CMSTimeStampedData;
-
-public class CMSTimeStampedDataTest
-    extends TestCase
-{
-
-    CMSTimeStampedData cmsTimeStampedData = null;
-    String fileInput = "FileDaFirmare.txt.tsd.der";
-    String fileOutput = fileInput.substring(0, fileInput.indexOf(".tsd"));
-    private byte[] baseData;
-
-    protected void setUp()
-        throws Exception
-    {
-        ByteArrayOutputStream origStream = new ByteArrayOutputStream();
-        InputStream in = this.getClass().getResourceAsStream(fileInput);
-        int ch;
-
-        while ((ch = in.read()) >= 0)
-        {
-            origStream.write(ch);
-        }
-
-        origStream.close();
-
-        this.baseData = origStream.toByteArray();
-
-        cmsTimeStampedData = new CMSTimeStampedData(baseData);
-    }
-
-    protected void tearDown()
-        throws Exception
-    {
-        cmsTimeStampedData = null;
-    }
-
-    public void testGetTimeStampTokens()
-        throws Exception
-    {
-        TimeStampToken[] tokens = cmsTimeStampedData.getTimeStampTokens();
-        assertEquals(3, tokens.length);
-    }
-
-    public void testValidateAllTokens()
-        throws Exception
-    {
-        DigestCalculatorProvider digestCalculatorProvider = new BcDigestCalculatorProvider();
-
-        DigestCalculator imprintCalculator = cmsTimeStampedData.getMessageImprintDigestCalculator(digestCalculatorProvider);
-
-        imprintCalculator.getOutputStream().write(cmsTimeStampedData.getContent());
-
-        byte[] digest = imprintCalculator.getDigest();
-
-        TimeStampToken[] tokens = cmsTimeStampedData.getTimeStampTokens();
-        for (int i = 0; i < tokens.length; i++)
-        {
-            cmsTimeStampedData.validate(digestCalculatorProvider, digest, tokens[i]);
-        }
-    }
-
-    public void testValidate()
-        throws Exception
-    {
-        DigestCalculatorProvider digestCalculatorProvider = new BcDigestCalculatorProvider();
-
-        DigestCalculator imprintCalculator = cmsTimeStampedData.getMessageImprintDigestCalculator(digestCalculatorProvider);
-
-        imprintCalculator.getOutputStream().write(cmsTimeStampedData.getContent());
-
-        cmsTimeStampedData.validate(digestCalculatorProvider, imprintCalculator.getDigest());
-    }
-
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/tsp/test/NewTSPTest.java b/bcpkix/src/main/java/org/bouncycastle/tsp/test/NewTSPTest.java
deleted file mode 100644
index 3aa3e97..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/tsp/test/NewTSPTest.java
+++ /dev/null
@@ -1,833 +0,0 @@
-package org.bouncycastle.tsp.test;
-
-import java.io.OutputStream;
-import java.math.BigInteger;
-import java.security.KeyPair;
-import java.security.PrivateKey;
-import java.security.Security;
-import java.security.cert.X509Certificate;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-
-import junit.framework.TestCase;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.cmp.PKIFailureInfo;
-import org.bouncycastle.asn1.cmp.PKIStatus;
-import org.bouncycastle.asn1.cms.AttributeTable;
-import org.bouncycastle.asn1.ess.ESSCertID;
-import org.bouncycastle.asn1.ess.ESSCertIDv2;
-import org.bouncycastle.asn1.ess.SigningCertificate;
-import org.bouncycastle.asn1.ess.SigningCertificateV2;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.asn1.x500.X500Name;
-import org.bouncycastle.asn1.x509.GeneralName;
-import org.bouncycastle.asn1.x509.GeneralNames;
-import org.bouncycastle.asn1.x509.IssuerSerial;
-import org.bouncycastle.cert.X509CertificateHolder;
-import org.bouncycastle.cert.jcajce.JcaCertStore;
-import org.bouncycastle.cms.CMSAttributeTableGenerationException;
-import org.bouncycastle.cms.CMSAttributeTableGenerator;
-import org.bouncycastle.cms.DefaultSignedAttributeTableGenerator;
-import org.bouncycastle.cms.jcajce.JcaSignerInfoGeneratorBuilder;
-import org.bouncycastle.cms.jcajce.JcaSimpleSignerInfoGeneratorBuilder;
-import org.bouncycastle.cms.jcajce.JcaSimpleSignerInfoVerifierBuilder;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.operator.DigestCalculator;
-import org.bouncycastle.operator.jcajce.JcaContentSignerBuilder;
-import org.bouncycastle.operator.jcajce.JcaDigestCalculatorProviderBuilder;
-import org.bouncycastle.tsp.GenTimeAccuracy;
-import org.bouncycastle.tsp.TSPAlgorithms;
-import org.bouncycastle.tsp.TSPException;
-import org.bouncycastle.tsp.TSPValidationException;
-import org.bouncycastle.tsp.TimeStampRequest;
-import org.bouncycastle.tsp.TimeStampRequestGenerator;
-import org.bouncycastle.tsp.TimeStampResponse;
-import org.bouncycastle.tsp.TimeStampResponseGenerator;
-import org.bouncycastle.tsp.TimeStampToken;
-import org.bouncycastle.tsp.TimeStampTokenGenerator;
-import org.bouncycastle.tsp.TimeStampTokenInfo;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.Store;
-
-public class NewTSPTest
-    extends TestCase
-{
-    private static final String BC = BouncyCastleProvider.PROVIDER_NAME;
-
-    public void setUp()
-    {
-        Security.addProvider(new BouncyCastleProvider());
-    }
-
-    public void testGeneral()
-        throws Exception
-    {
-            String signDN = "O=Bouncy Castle, C=AU";
-            KeyPair signKP = TSPTestUtil.makeKeyPair();
-            X509Certificate signCert = TSPTestUtil.makeCACertificate(signKP,
-                    signDN, signKP, signDN);
-
-            String origDN = "CN=Eric H. Echidna, E=eric@bouncycastle.org, O=Bouncy Castle, C=AU";
-            KeyPair origKP = TSPTestUtil.makeKeyPair();
-            X509Certificate origCert = TSPTestUtil.makeCertificate(origKP,
-                    origDN, signKP, signDN);
-
-
-            
-            List certList = new ArrayList();
-            certList.add(origCert);
-            certList.add(signCert);
-
-            Store certs = new JcaCertStore(certList);
-            
-            basicTest(origKP.getPrivate(), origCert, certs);
-            basicSha256Test(origKP.getPrivate(), origCert, certs);
-            basicTestWithTSA(origKP.getPrivate(), origCert, certs);
-            overrideAttrsTest(origKP.getPrivate(), origCert, certs);
-            responseValidationTest(origKP.getPrivate(), origCert, certs);
-            incorrectHashTest(origKP.getPrivate(), origCert, certs);
-            badAlgorithmTest(origKP.getPrivate(), origCert, certs);
-            timeNotAvailableTest(origKP.getPrivate(), origCert, certs);
-            badPolicyTest(origKP.getPrivate(), origCert, certs);
-            tokenEncodingTest(origKP.getPrivate(), origCert, certs);
-            certReqTest(origKP.getPrivate(), origCert, certs);
-            testAccuracyZeroCerts(origKP.getPrivate(), origCert, certs);
-            testAccuracyWithCertsAndOrdering(origKP.getPrivate(), origCert, certs);
-            testNoNonse(origKP.getPrivate(), origCert, certs);
-    }
-    
-    private void basicTest(
-        PrivateKey      privateKey,
-        X509Certificate cert,
-        Store certs)
-        throws Exception
-    {
-        TimeStampTokenGenerator tsTokenGen = new TimeStampTokenGenerator(
-                new JcaSimpleSignerInfoGeneratorBuilder().build("SHA1withRSA", privateKey, cert), new SHA1DigestCalculator(), new ASN1ObjectIdentifier("1.2"));
-        
-        tsTokenGen.addCertificates(certs);
-
-        TimeStampRequestGenerator reqGen = new TimeStampRequestGenerator();
-        TimeStampRequest          request = reqGen.generate(TSPAlgorithms.SHA1, new byte[20], BigInteger.valueOf(100));
-
-        TimeStampResponseGenerator tsRespGen = new TimeStampResponseGenerator(tsTokenGen, TSPAlgorithms.ALLOWED);
-
-        TimeStampResponse tsResp = tsRespGen.generate(request, new BigInteger("23"), new Date());
-
-        tsResp = new TimeStampResponse(tsResp.getEncoded());
-
-        TimeStampToken  tsToken = tsResp.getTimeStampToken();
-
-        tsToken.validate(new JcaSimpleSignerInfoVerifierBuilder().setProvider(BC).build(cert));
-
-        AttributeTable  table = tsToken.getSignedAttributes();
-
-        assertNotNull("no signingCertificate attribute found", table.get(PKCSObjectIdentifiers.id_aa_signingCertificate));
-    }
-
-    private void basicSha256Test(
-        PrivateKey      privateKey,
-        X509Certificate cert,
-        Store certs)
-        throws Exception
-    {
-        TimeStampTokenGenerator tsTokenGen = new TimeStampTokenGenerator(
-                new JcaSimpleSignerInfoGeneratorBuilder().build("SHA256withRSA", privateKey, cert), new SHA256DigestCalculator(), new ASN1ObjectIdentifier("1.2"));
-
-        tsTokenGen.addCertificates(certs);
-
-        TimeStampRequestGenerator reqGen = new TimeStampRequestGenerator();
-        TimeStampRequest          request = reqGen.generate(TSPAlgorithms.SHA256, new byte[32], BigInteger.valueOf(100));
-
-        TimeStampResponseGenerator tsRespGen = new TimeStampResponseGenerator(tsTokenGen, TSPAlgorithms.ALLOWED);
-
-        TimeStampResponse tsResp = tsRespGen.generate(request, new BigInteger("23"), new Date());
-
-        assertEquals(PKIStatus.GRANTED, tsResp.getStatus());
-
-        tsResp = new TimeStampResponse(tsResp.getEncoded());
-
-        TimeStampToken  tsToken = tsResp.getTimeStampToken();
-
-        tsToken.validate(new JcaSimpleSignerInfoVerifierBuilder().setProvider(BC).build(cert));
-
-        AttributeTable  table = tsToken.getSignedAttributes();
-
-        assertNotNull("no signingCertificate attribute found", table.get(PKCSObjectIdentifiers.id_aa_signingCertificateV2));
-
-        DigestCalculator digCalc = new SHA256DigestCalculator();
-
-        OutputStream dOut = digCalc.getOutputStream();
-
-        dOut.write(cert.getEncoded());
-
-        dOut.close();
-
-        byte[] certHash = digCalc.getDigest();
-
-        SigningCertificateV2 sigCertV2 = SigningCertificateV2.getInstance(table.get(PKCSObjectIdentifiers.id_aa_signingCertificateV2).getAttributeValues()[0]);
-
-        assertTrue(Arrays.areEqual(certHash, sigCertV2.getCerts()[0].getCertHash()));
-    }
-
-    private void overrideAttrsTest(
-        PrivateKey      privateKey,
-        X509Certificate cert,
-        Store certs)
-        throws Exception
-    {
-        JcaSimpleSignerInfoGeneratorBuilder signerInfoGenBuilder = new JcaSimpleSignerInfoGeneratorBuilder().setProvider("BC");
-
-        IssuerSerial issuerSerial = new IssuerSerial(new GeneralNames(new GeneralName(new X509CertificateHolder(cert.getEncoded()).getIssuer())), cert.getSerialNumber());
-
-        DigestCalculator digCalc = new SHA1DigestCalculator();
-
-        OutputStream dOut = digCalc.getOutputStream();
-
-        dOut.write(cert.getEncoded());
-
-        dOut.close();
-
-        byte[] certHash = digCalc.getDigest();
-
-        digCalc = new SHA256DigestCalculator();
-
-        dOut = digCalc.getOutputStream();
-
-        dOut.write(cert.getEncoded());
-
-        dOut.close();
-
-        byte[] certHash256 = digCalc.getDigest();
-
-        final ESSCertID essCertid = new ESSCertID(certHash, issuerSerial);
-        final ESSCertIDv2 essCertidV2 = new ESSCertIDv2(certHash256, issuerSerial);
-
-        signerInfoGenBuilder.setSignedAttributeGenerator(new CMSAttributeTableGenerator()
-        {
-            public AttributeTable getAttributes(Map parameters)
-                throws CMSAttributeTableGenerationException
-            {
-                CMSAttributeTableGenerator attrGen = new DefaultSignedAttributeTableGenerator();
-
-                AttributeTable table = attrGen.getAttributes(parameters);
-                table = table.add(PKCSObjectIdentifiers.id_aa_signingCertificate, new SigningCertificate(essCertid));
-                table = table.add(PKCSObjectIdentifiers.id_aa_signingCertificateV2, new SigningCertificateV2(new ESSCertIDv2[]{essCertidV2}));
-
-                return table;
-            }
-        });
-
-        TimeStampTokenGenerator tsTokenGen = new TimeStampTokenGenerator(signerInfoGenBuilder.build("SHA1withRSA", privateKey, cert), new SHA1DigestCalculator(), new ASN1ObjectIdentifier("1.2"));
-
-        tsTokenGen.addCertificates(certs);
-
-        TimeStampRequestGenerator reqGen = new TimeStampRequestGenerator();
-        TimeStampRequest          request = reqGen.generate(TSPAlgorithms.SHA1, new byte[20], BigInteger.valueOf(100));
-
-        TimeStampResponseGenerator tsRespGen = new TimeStampResponseGenerator(tsTokenGen, TSPAlgorithms.ALLOWED);
-
-        TimeStampResponse tsResp = tsRespGen.generate(request, new BigInteger("23"), new Date());
-
-        tsResp = new TimeStampResponse(tsResp.getEncoded());
-
-        TimeStampToken  tsToken = tsResp.getTimeStampToken();
-
-        tsToken.validate(new JcaSimpleSignerInfoVerifierBuilder().setProvider(BC).build(cert));
-
-        AttributeTable  table = tsToken.getSignedAttributes();
-
-        assertNotNull("no signingCertificate attribute found", table.get(PKCSObjectIdentifiers.id_aa_signingCertificate));
-        assertNotNull("no signingCertificateV2 attribute found", table.get(PKCSObjectIdentifiers.id_aa_signingCertificateV2));
-
-        SigningCertificate sigCert = SigningCertificate.getInstance(table.get(PKCSObjectIdentifiers.id_aa_signingCertificate).getAttributeValues()[0]);
-
-        assertEquals(new X509CertificateHolder(cert.getEncoded()).getIssuer(), sigCert.getCerts()[0].getIssuerSerial().getIssuer().getNames()[0].getName());
-        assertEquals(cert.getSerialNumber(), sigCert.getCerts()[0].getIssuerSerial().getSerial().getValue());
-        assertTrue(Arrays.areEqual(certHash, sigCert.getCerts()[0].getCertHash()));
-
-        SigningCertificateV2 sigCertV2 = SigningCertificateV2.getInstance(table.get(PKCSObjectIdentifiers.id_aa_signingCertificateV2).getAttributeValues()[0]);
-
-        assertEquals(new X509CertificateHolder(cert.getEncoded()).getIssuer(), sigCertV2.getCerts()[0].getIssuerSerial().getIssuer().getNames()[0].getName());
-        assertEquals(cert.getSerialNumber(), sigCertV2.getCerts()[0].getIssuerSerial().getSerial().getValue());
-        assertTrue(Arrays.areEqual(certHash256, sigCertV2.getCerts()[0].getCertHash()));
-    }
-
-    private void basicTestWithTSA(
-        PrivateKey      privateKey,
-        X509Certificate cert,
-        Store certs)
-        throws Exception
-    {
-        TimeStampTokenGenerator tsTokenGen = new TimeStampTokenGenerator(
-                new JcaSimpleSignerInfoGeneratorBuilder().build("SHA1withRSA", privateKey, cert), new SHA1DigestCalculator(), new ASN1ObjectIdentifier("1.2"));
-
-        tsTokenGen.addCertificates(certs);
-        tsTokenGen.setTSA(new GeneralName(new X500Name("CN=Test")));
-
-        TimeStampRequestGenerator reqGen = new TimeStampRequestGenerator();
-        TimeStampRequest          request = reqGen.generate(TSPAlgorithms.SHA1, new byte[20], BigInteger.valueOf(100));
-
-        TimeStampResponseGenerator tsRespGen = new TimeStampResponseGenerator(tsTokenGen, TSPAlgorithms.ALLOWED);
-
-        TimeStampResponse tsResp = tsRespGen.generate(request, new BigInteger("23"), new Date());
-
-        tsResp = new TimeStampResponse(tsResp.getEncoded());
-
-        TimeStampToken  tsToken = tsResp.getTimeStampToken();
-
-        tsToken.validate(new JcaSimpleSignerInfoVerifierBuilder().setProvider(BC).build(cert));
-
-        AttributeTable  table = tsToken.getSignedAttributes();
-
-        assertNotNull("no signingCertificate attribute found", table.get(PKCSObjectIdentifiers.id_aa_signingCertificate));
-    }
-
-    private void responseValidationTest(
-        PrivateKey      privateKey,
-        X509Certificate cert,
-        Store       certs)
-        throws Exception
-    {
-        JcaSignerInfoGeneratorBuilder infoGeneratorBuilder = new JcaSignerInfoGeneratorBuilder(new JcaDigestCalculatorProviderBuilder().setProvider(BC).build());
-
-        TimeStampTokenGenerator tsTokenGen = new TimeStampTokenGenerator(
-            infoGeneratorBuilder.build(new JcaContentSignerBuilder("MD5withRSA").setProvider(BC).build(privateKey), cert), new SHA1DigestCalculator(), new ASN1ObjectIdentifier("1.2"));
-
-        tsTokenGen.addCertificates(certs);
-
-        TimeStampRequestGenerator reqGen = new TimeStampRequestGenerator();
-        TimeStampRequest          request = reqGen.generate(TSPAlgorithms.SHA1, new byte[20], BigInteger.valueOf(100));
-
-        TimeStampResponseGenerator tsRespGen = new TimeStampResponseGenerator(tsTokenGen, TSPAlgorithms.ALLOWED);
-
-        TimeStampResponse tsResp = tsRespGen.generate(request, new BigInteger("23"), new Date());
-
-        tsResp = new TimeStampResponse(tsResp.getEncoded());
-
-        TimeStampToken  tsToken = tsResp.getTimeStampToken();
-
-        tsToken.validate(new JcaSimpleSignerInfoVerifierBuilder().setProvider("BC").build(cert));
-        
-        //
-        // check validation
-        //
-        tsResp.validate(request);
-        
-        try
-        {
-            request = reqGen.generate(TSPAlgorithms.SHA1, new byte[20], BigInteger.valueOf(101));
-            
-            tsResp.validate(request);
-            
-            fail("response validation failed on invalid nonce.");
-        }
-        catch (TSPValidationException e)
-        {
-            // ignore
-        }
-
-        try
-        {
-            request = reqGen.generate(TSPAlgorithms.SHA1, new byte[22], BigInteger.valueOf(100));
-            
-            tsResp.validate(request);
-            
-            fail("response validation failed on wrong digest.");
-        }
-        catch (TSPValidationException e)
-        {
-            // ignore
-        }
-        
-        try
-        {
-            request = reqGen.generate(TSPAlgorithms.MD5, new byte[20], BigInteger.valueOf(100));
-            
-            tsResp.validate(request);
-            
-            fail("response validation failed on wrong digest.");
-        }
-        catch (TSPValidationException e)
-        {
-            // ignore
-        }
-    }
-    
-    private void incorrectHashTest(
-        PrivateKey      privateKey,
-        X509Certificate cert,
-        Store       certs)
-        throws Exception
-    {
-        JcaSignerInfoGeneratorBuilder infoGeneratorBuilder = new JcaSignerInfoGeneratorBuilder(new JcaDigestCalculatorProviderBuilder().setProvider(BC).build());
-
-        TimeStampTokenGenerator tsTokenGen = new TimeStampTokenGenerator(infoGeneratorBuilder.build(new JcaContentSignerBuilder("SHA1withRSA").setProvider(BC).build(privateKey), cert), new SHA1DigestCalculator(), new ASN1ObjectIdentifier("1.2"));
-        
-        tsTokenGen.addCertificates(certs);
-
-        TimeStampRequestGenerator reqGen = new TimeStampRequestGenerator();
-        TimeStampRequest          request = reqGen.generate(TSPAlgorithms.SHA1, new byte[16]);
-
-        TimeStampResponseGenerator tsRespGen = new TimeStampResponseGenerator(tsTokenGen, TSPAlgorithms.ALLOWED);
-
-        TimeStampResponse tsResp = tsRespGen.generate(request, new BigInteger("23"), new Date());
-
-        tsResp = new TimeStampResponse(tsResp.getEncoded());
-
-        TimeStampToken  tsToken = tsResp.getTimeStampToken();
-
-        if (tsToken != null)
-        {
-            fail("incorrectHash - token not null.");
-        }
-        
-        PKIFailureInfo  failInfo = tsResp.getFailInfo();
-        
-        if (failInfo == null)
-        {
-            fail("incorrectHash - failInfo set to null.");
-        }
-        
-        if (failInfo.intValue() != PKIFailureInfo.badDataFormat)
-        {
-            fail("incorrectHash - wrong failure info returned.");
-        }
-    }
-    
-    private void badAlgorithmTest(
-        PrivateKey      privateKey,
-        X509Certificate cert,
-        Store       certs)
-        throws Exception
-    {
-        JcaSimpleSignerInfoGeneratorBuilder infoGeneratorBuilder = new JcaSimpleSignerInfoGeneratorBuilder().setProvider(BC);
-
-        TimeStampTokenGenerator tsTokenGen = new TimeStampTokenGenerator(infoGeneratorBuilder.build("SHA1withRSA", privateKey, cert), new SHA1DigestCalculator(), new ASN1ObjectIdentifier("1.2"));
-
-        tsTokenGen.addCertificates(certs);
-
-        TimeStampRequestGenerator reqGen = new TimeStampRequestGenerator();
-        TimeStampRequest            request = reqGen.generate(new ASN1ObjectIdentifier("1.2.3.4.5"), new byte[20]);
-
-        TimeStampResponseGenerator tsRespGen = new TimeStampResponseGenerator(tsTokenGen, TSPAlgorithms.ALLOWED);
-
-        TimeStampResponse tsResp = tsRespGen.generate(request, new BigInteger("23"), new Date());
-
-        tsResp = new TimeStampResponse(tsResp.getEncoded());
-
-        TimeStampToken  tsToken = tsResp.getTimeStampToken();
-
-        if (tsToken != null)
-        {
-            fail("badAlgorithm - token not null.");
-        }
-
-        PKIFailureInfo  failInfo = tsResp.getFailInfo();
-        
-        if (failInfo == null)
-        {
-            fail("badAlgorithm - failInfo set to null.");
-        }
-        
-        if (failInfo.intValue() != PKIFailureInfo.badAlg)
-        {
-            fail("badAlgorithm - wrong failure info returned.");
-        }
-    }
-
-    private void timeNotAvailableTest(
-        PrivateKey      privateKey,
-        X509Certificate cert,
-        Store       certs)
-        throws Exception
-    {
-        JcaSignerInfoGeneratorBuilder infoGeneratorBuilder = new JcaSignerInfoGeneratorBuilder(new JcaDigestCalculatorProviderBuilder().setProvider(BC).build());
-
-        TimeStampTokenGenerator tsTokenGen = new TimeStampTokenGenerator(infoGeneratorBuilder.build(new JcaContentSignerBuilder("SHA1withRSA").setProvider(BC).build(privateKey), cert), new SHA1DigestCalculator(), new ASN1ObjectIdentifier("1.2"));
-
-        tsTokenGen.addCertificates(certs);
-
-        TimeStampRequestGenerator reqGen = new TimeStampRequestGenerator();
-        TimeStampRequest            request = reqGen.generate(new ASN1ObjectIdentifier("1.2.3.4.5"), new byte[20]);
-
-        TimeStampResponseGenerator tsRespGen = new TimeStampResponseGenerator(tsTokenGen, TSPAlgorithms.ALLOWED);
-
-        TimeStampResponse tsResp;
-
-        try
-        {
-            tsResp = tsRespGen.generateGrantedResponse(request, new BigInteger("23"), null);
-        }
-        catch (TSPException e)
-        {
-            tsResp = tsRespGen.generateRejectedResponse(e);
-        }
-
-        tsResp = new TimeStampResponse(tsResp.getEncoded());
-
-        TimeStampToken  tsToken = tsResp.getTimeStampToken();
-
-        if (tsToken != null)
-        {
-            fail("timeNotAvailable - token not null.");
-        }
-
-        PKIFailureInfo  failInfo = tsResp.getFailInfo();
-
-        if (failInfo == null)
-        {
-            fail("timeNotAvailable - failInfo set to null.");
-        }
-
-        if (failInfo.intValue() != PKIFailureInfo.timeNotAvailable)
-        {
-            fail("timeNotAvailable - wrong failure info returned.");
-        }
-    }
-
-    private void badPolicyTest(
-        PrivateKey      privateKey,
-        X509Certificate cert,
-        Store       certs)
-        throws Exception
-    {
-        JcaSignerInfoGeneratorBuilder infoGeneratorBuilder = new JcaSignerInfoGeneratorBuilder(new JcaDigestCalculatorProviderBuilder().setProvider(BC).build());
-
-        TimeStampTokenGenerator tsTokenGen = new TimeStampTokenGenerator(infoGeneratorBuilder.build(new JcaContentSignerBuilder("SHA1withRSA").setProvider(BC).build(privateKey), cert), new SHA1DigestCalculator(), new ASN1ObjectIdentifier("1.2"));
-
-        tsTokenGen.addCertificates(certs);
-
-        TimeStampRequestGenerator reqGen = new TimeStampRequestGenerator();
-        
-        reqGen.setReqPolicy(new ASN1ObjectIdentifier("1.1"));
-        
-        TimeStampRequest            request = reqGen.generate(TSPAlgorithms.SHA1, new byte[20]);
-
-        TimeStampResponseGenerator tsRespGen = new TimeStampResponseGenerator(tsTokenGen, TSPAlgorithms.ALLOWED, new HashSet());
-
-        TimeStampResponse tsResp;
-
-        try
-        {
-            tsResp = tsRespGen.generateGrantedResponse(request, new BigInteger("23"), new Date());
-        }
-        catch (TSPException e)
-        {
-            tsResp = tsRespGen.generateRejectedResponse(e);
-        }
-
-        tsResp = new TimeStampResponse(tsResp.getEncoded());
-
-        TimeStampToken  tsToken = tsResp.getTimeStampToken();
-
-        if (tsToken != null)
-        {
-            fail("badPolicy - token not null.");
-        }
-
-        PKIFailureInfo  failInfo = tsResp.getFailInfo();
-        
-        if (failInfo == null)
-        {
-            fail("badPolicy - failInfo set to null.");
-        }
-        
-        if (failInfo.intValue() != PKIFailureInfo.unacceptedPolicy)
-        {
-            fail("badPolicy - wrong failure info returned.");
-        }
-    }
-    
-    private void certReqTest(
-        PrivateKey      privateKey,
-        X509Certificate cert,
-        Store       certs)
-        throws Exception
-    {
-        JcaSignerInfoGeneratorBuilder infoGeneratorBuilder = new JcaSignerInfoGeneratorBuilder(new JcaDigestCalculatorProviderBuilder().setProvider(BC).build());
-
-        TimeStampTokenGenerator tsTokenGen = new TimeStampTokenGenerator(infoGeneratorBuilder.build(new JcaContentSignerBuilder("MD5withRSA").setProvider(BC).build(privateKey), cert), new SHA1DigestCalculator(), new ASN1ObjectIdentifier("1.2"));
-
-        tsTokenGen.addCertificates(certs);
-        
-        TimeStampRequestGenerator reqGen = new TimeStampRequestGenerator();
-        
-        //
-        // request with certReq false
-        //
-        reqGen.setCertReq(false);
-        
-        TimeStampRequest          request = reqGen.generate(TSPAlgorithms.SHA1, new byte[20], BigInteger.valueOf(100));
-
-        TimeStampResponseGenerator tsRespGen = new TimeStampResponseGenerator(tsTokenGen, TSPAlgorithms.ALLOWED);
-
-        TimeStampResponse tsResp = tsRespGen.generateGrantedResponse(request, new BigInteger("23"), new Date());
-        
-        tsResp = new TimeStampResponse(tsResp.getEncoded());
-
-        TimeStampToken  tsToken = tsResp.getTimeStampToken();
-        
-        assertNull(tsToken.getTimeStampInfo().getGenTimeAccuracy());  // check for abscence of accuracy
-        
-        assertEquals("1.2", tsToken.getTimeStampInfo().getPolicy().getId());
-        
-        try
-        {
-            tsToken.validate(new JcaSimpleSignerInfoVerifierBuilder().setProvider(BC).build(cert));
-        }
-        catch (TSPValidationException e)
-        {
-            fail("certReq(false) verification of token failed.");
-        }
-
-        Store   respCerts = tsToken.getCertificates();
-        
-        Collection  certsColl = respCerts.getMatches(null);
-        
-        if (!certsColl.isEmpty())
-        {
-            fail("certReq(false) found certificates in response.");
-        }
-    }
-    
-    
-    private void tokenEncodingTest(
-        PrivateKey      privateKey,
-        X509Certificate cert,
-        Store       certs)
-        throws Exception
-    {
-        JcaSignerInfoGeneratorBuilder infoGeneratorBuilder = new JcaSignerInfoGeneratorBuilder(new JcaDigestCalculatorProviderBuilder().setProvider(BC).build());
-
-        TimeStampTokenGenerator tsTokenGen = new TimeStampTokenGenerator(infoGeneratorBuilder.build(new JcaContentSignerBuilder("SHA1withRSA").setProvider(BC).build(privateKey), cert), new SHA1DigestCalculator(), new ASN1ObjectIdentifier("1.2.3.4.5.6"));
-
-        tsTokenGen.addCertificates(certs);
-
-        TimeStampRequestGenerator  reqGen = new TimeStampRequestGenerator();
-        TimeStampRequest           request = reqGen.generate(TSPAlgorithms.SHA1, new byte[20], BigInteger.valueOf(100));
-        TimeStampResponseGenerator tsRespGen = new TimeStampResponseGenerator(tsTokenGen, TSPAlgorithms.ALLOWED);
-        TimeStampResponse          tsResp = tsRespGen.generate(request, new BigInteger("23"), new Date());
-
-        tsResp = new TimeStampResponse(tsResp.getEncoded());
-
-        TimeStampResponse tsResponse = new TimeStampResponse(tsResp.getEncoded());
-
-        if (!Arrays.areEqual(tsResponse.getEncoded(), tsResp.getEncoded())
-            || !Arrays.areEqual(tsResponse.getTimeStampToken().getEncoded(),
-                        tsResp.getTimeStampToken().getEncoded()))
-        {
-            fail();
-        }
-    }
-    
-    private void testAccuracyZeroCerts(
-        PrivateKey      privateKey,
-        X509Certificate cert,
-        Store       certs)
-        throws Exception
-    {
-        JcaSignerInfoGeneratorBuilder infoGeneratorBuilder = new JcaSignerInfoGeneratorBuilder(new JcaDigestCalculatorProviderBuilder().setProvider(BC).build());
-
-        TimeStampTokenGenerator tsTokenGen = new TimeStampTokenGenerator(infoGeneratorBuilder.build(new JcaContentSignerBuilder("MD5withRSA").setProvider(BC).build(privateKey), cert), new SHA1DigestCalculator(), new ASN1ObjectIdentifier("1.2"));
-
-        tsTokenGen.addCertificates(certs);
-
-        tsTokenGen.setAccuracySeconds(1);
-        tsTokenGen.setAccuracyMillis(2);
-        tsTokenGen.setAccuracyMicros(3);
-        
-        TimeStampRequestGenerator reqGen = new TimeStampRequestGenerator();
-        TimeStampRequest          request = reqGen.generate(TSPAlgorithms.SHA1, new byte[20], BigInteger.valueOf(100));
-
-        TimeStampResponseGenerator tsRespGen = new TimeStampResponseGenerator(tsTokenGen, TSPAlgorithms.ALLOWED);
-
-        TimeStampResponse tsResp = tsRespGen.generate(request, new BigInteger("23"), new Date());
-
-        tsResp = new TimeStampResponse(tsResp.getEncoded());
-
-        TimeStampToken  tsToken = tsResp.getTimeStampToken();
-
-        tsToken.validate(new JcaSimpleSignerInfoVerifierBuilder().setProvider("BC").build(cert));
-        
-        //
-        // check validation
-        //
-        tsResp.validate(request);
-
-        //
-        // check tstInfo
-        //
-        TimeStampTokenInfo tstInfo = tsToken.getTimeStampInfo();
-        
-        //
-        // check accuracy
-        //
-        GenTimeAccuracy accuracy = tstInfo.getGenTimeAccuracy();
-        
-        assertEquals(1, accuracy.getSeconds());
-        assertEquals(2, accuracy.getMillis());
-        assertEquals(3, accuracy.getMicros());
-        
-        assertEquals(new BigInteger("23"), tstInfo.getSerialNumber());
-        
-        assertEquals("1.2", tstInfo.getPolicy().getId());
-        
-        //
-        // test certReq
-        //
-        Store store = tsToken.getCertificates();
-        
-        Collection certificates = store.getMatches(null);
-        
-        assertEquals(0, certificates.size());
-    }
-    
-    private void testAccuracyWithCertsAndOrdering(
-        PrivateKey      privateKey,
-        X509Certificate cert,
-        Store       certs)
-        throws Exception
-    {
-        JcaSignerInfoGeneratorBuilder infoGeneratorBuilder = new JcaSignerInfoGeneratorBuilder(new JcaDigestCalculatorProviderBuilder().setProvider(BC).build());
-
-        TimeStampTokenGenerator tsTokenGen = new TimeStampTokenGenerator(infoGeneratorBuilder.build(new JcaContentSignerBuilder("MD5withRSA").setProvider(BC).build(privateKey), cert), new SHA1DigestCalculator(), new ASN1ObjectIdentifier("1.2.3"));
-
-        tsTokenGen.addCertificates(certs);
-
-        tsTokenGen.setAccuracySeconds(3);
-        tsTokenGen.setAccuracyMillis(1);
-        tsTokenGen.setAccuracyMicros(2);
-        
-        tsTokenGen.setOrdering(true);
-        
-        TimeStampRequestGenerator reqGen = new TimeStampRequestGenerator();
-        
-        reqGen.setCertReq(true);
-        
-        TimeStampRequest          request = reqGen.generate(TSPAlgorithms.SHA1, new byte[20], BigInteger.valueOf(100));
-
-        assertTrue(request.getCertReq());
-        
-        TimeStampResponseGenerator tsRespGen = new TimeStampResponseGenerator(tsTokenGen, TSPAlgorithms.ALLOWED);
-
-        TimeStampResponse tsResp;
-
-        try
-        {
-            tsResp = tsRespGen.generateGrantedResponse(request, new BigInteger("23"), new Date());
-        }
-        catch (TSPException e)
-        {
-            tsResp = tsRespGen.generateRejectedResponse(e);
-        }
-
-        tsResp = new TimeStampResponse(tsResp.getEncoded());
-
-        TimeStampToken  tsToken = tsResp.getTimeStampToken();
-
-        tsToken.validate(new JcaSimpleSignerInfoVerifierBuilder().setProvider("BC").build(cert));
-        
-        //
-        // check validation
-        //
-        tsResp.validate(request);
-
-        //
-        // check tstInfo
-        //
-        TimeStampTokenInfo tstInfo = tsToken.getTimeStampInfo();
-        
-        //
-        // check accuracy
-        //
-        GenTimeAccuracy accuracy = tstInfo.getGenTimeAccuracy();
-        
-        assertEquals(3, accuracy.getSeconds());
-        assertEquals(1, accuracy.getMillis());
-        assertEquals(2, accuracy.getMicros());
-        
-        assertEquals(new BigInteger("23"), tstInfo.getSerialNumber());
-        
-        assertEquals("1.2.3", tstInfo.getPolicy().getId());
-        
-        assertEquals(true, tstInfo.isOrdered());
-        
-        assertEquals(tstInfo.getNonce(), BigInteger.valueOf(100));
-        
-        //
-        // test certReq
-        //
-        Store store = tsToken.getCertificates();
-        
-        Collection certificates = store.getMatches(null);
-        
-        assertEquals(2, certificates.size());
-    }   
-    
-    private void testNoNonse(
-        PrivateKey      privateKey,
-        X509Certificate cert,
-        Store       certs)
-        throws Exception
-    {
-        JcaSignerInfoGeneratorBuilder infoGeneratorBuilder = new JcaSignerInfoGeneratorBuilder(new JcaDigestCalculatorProviderBuilder().setProvider(BC).build());
-
-        TimeStampTokenGenerator tsTokenGen = new TimeStampTokenGenerator(infoGeneratorBuilder.build(new JcaContentSignerBuilder("MD5withRSA").setProvider(BC).build(privateKey), cert), new SHA1DigestCalculator(), new ASN1ObjectIdentifier("1.2.3"));
-
-        tsTokenGen.addCertificates(certs);
-        
-        TimeStampRequestGenerator reqGen = new TimeStampRequestGenerator();
-        TimeStampRequest          request = reqGen.generate(TSPAlgorithms.SHA1, new byte[20]);
-
-        assertFalse(request.getCertReq());
-        
-        TimeStampResponseGenerator tsRespGen = new TimeStampResponseGenerator(tsTokenGen, TSPAlgorithms.ALLOWED);
-
-        TimeStampResponse tsResp = tsRespGen.generate(request, new BigInteger("24"), new Date());
-
-        tsResp = new TimeStampResponse(tsResp.getEncoded());
-
-        TimeStampToken  tsToken = tsResp.getTimeStampToken();
-
-        tsToken.validate(new JcaSimpleSignerInfoVerifierBuilder().setProvider("BC").build(cert));
-        
-        //
-        // check validation
-        //
-        tsResp.validate(request);
-
-        //
-        // check tstInfo
-        //
-        TimeStampTokenInfo tstInfo = tsToken.getTimeStampInfo();
-        
-        //
-        // check accuracy
-        //
-        GenTimeAccuracy accuracy = tstInfo.getGenTimeAccuracy();
-        
-        assertNull(accuracy);
-        
-        assertEquals(new BigInteger("24"), tstInfo.getSerialNumber());
-        
-        assertEquals("1.2.3", tstInfo.getPolicy().getId());
-        
-        assertEquals(false, tstInfo.isOrdered());
-        
-        assertNull(tstInfo.getNonce());
-        
-        //
-        // test certReq
-        //
-        Store store = tsToken.getCertificates();
-        
-        Collection certificates = store.getMatches(null);
-        
-        assertEquals(0, certificates.size());
-    } 
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/tsp/test/ParseTest.java b/bcpkix/src/main/java/org/bouncycastle/tsp/test/ParseTest.java
deleted file mode 100644
index 46821d4..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/tsp/test/ParseTest.java
+++ /dev/null
@@ -1,417 +0,0 @@
-package org.bouncycastle.tsp.test;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.security.Security;
-import java.security.cert.CertificateFactory;
-import java.security.cert.X509Certificate;
-
-import junit.framework.TestCase;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.cmp.PKIFailureInfo;
-import org.bouncycastle.asn1.cmp.PKIStatus;
-import org.bouncycastle.cert.X509CertificateHolder;
-import org.bouncycastle.cms.jcajce.JcaSimpleSignerInfoVerifierBuilder;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.tsp.TSPAlgorithms;
-import org.bouncycastle.tsp.TimeStampRequest;
-import org.bouncycastle.tsp.TimeStampResponse;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.Store;
-import org.bouncycastle.util.encoders.Base64;
-
-/**
- * Test Cases
- */
-public class ParseTest
-    extends TestCase
-{
-    private byte[] sha1Request = Base64.decode(
-          "MDACAQEwITAJBgUrDgMCGgUABBT5UbEBmJssO3RxcQtOePxNvfoMpgIIC+Gv"
-        + "YW2mtZQ=");
-
-
-    private byte[] sha1noNonse = Base64.decode(
-        "MCYCAQEwITAJBgUrDgMCGgUABBT5UbEBmJssO3RxcQtOePxNvfoMpg==");
-
-    private byte[] md5Request = Base64.decode(
-          "MDoCAQEwIDAMBggqhkiG9w0CBQUABBDIl9FBCvjyx0+6EbHbUR6eBgkrBgEE"
-        + "AakHBQECCDQluayIxIzn");
-
-    private byte[] ripemd160Request = Base64.decode(
-        "MD8CAQEwITAJBgUrJAMCAQUABBSq03a/mk50Yd9lMF+BSqOp/RHGQQYJKwYB"
-      + "BAGpBwUBAgkA4SZs9NfqISMBAf8=");
-
-    private byte[] sha1Response = Base64.decode(
-          "MIICbDADAgEAMIICYwYJKoZIhvcNAQcCoIICVDCCAlACAQMxCzAJBgUrDgMC"
-        + "GgUAMIHaBgsqhkiG9w0BCRABBKCBygSBxzCBxAIBAQYEKgMEATAhMAkGBSsO"
-        + "AwIaBQAEFPlRsQGYmyw7dHFxC054/E29+gymAgEEGA8yMDA0MTIwOTA3NTIw"
-        + "NVowCgIBAYACAfSBAWQBAf8CCAvhr2FtprWUoGmkZzBlMRgwFgYDVQQDEw9F"
-        + "cmljIEguIEVjaGlkbmExJDAiBgkqhkiG9w0BCQEWFWVyaWNAYm91bmN5Y2Fz"
-        + "dGxlLm9yZzEWMBQGA1UEChMNQm91bmN5IENhc3RsZTELMAkGA1UEBhMCQVUx"
-        + "ggFfMIIBWwIBATAqMCUxFjAUBgNVBAoTDUJvdW5jeSBDYXN0bGUxCzAJBgNV"
-        + "BAYTAkFVAgECMAkGBSsOAwIaBQCggYwwGgYJKoZIhvcNAQkDMQ0GCyqGSIb3"
-        + "DQEJEAEEMBwGCSqGSIb3DQEJBTEPFw0wNDEyMDkwNzUyMDVaMCMGCSqGSIb3"
-        + "DQEJBDEWBBTGR1cbm94tWbcpDWrH+bD8UYePsTArBgsqhkiG9w0BCRACDDEc"
-        + "MBowGDAWBBS37aLzFcheqeJ5cla0gjNWHGKbRzANBgkqhkiG9w0BAQEFAASB"
-        + "gBrc9CJ3xlcTQuWQXJUqPEn6f6vfJAINKsn22z8LIfS/2p/CTFU6+W/bz8j8"
-        + "j+8uWEJe8okTsI0FflljIsspqOPTB/RrnXteajbkuk/rLmz1B2g/qWBGAzPI"
-        + "D214raBc1a7Bpd76PkvSSdjqrEaaskd+7JJiPr9l9yeSoh1AIt0N");
-
-    private byte[] sha1noNonseResponse = Base64.decode(
-          "MIICYjADAgEAMIICWQYJKoZIhvcNAQcCoIICSjCCAkYCAQMxCzAJBgUrDgMC"
-        + "GgUAMIHQBgsqhkiG9w0BCRABBKCBwASBvTCBugIBAQYEKgMEATAhMAkGBSsO"
-        + "AwIaBQAEFPlRsQGYmyw7dHFxC054/E29+gymAgECGA8yMDA0MTIwOTA3MzQx"
-        + "MlowCgIBAYACAfSBAWQBAf+gaaRnMGUxGDAWBgNVBAMTD0VyaWMgSC4gRWNo"
-        + "aWRuYTEkMCIGCSqGSIb3DQEJARYVZXJpY0Bib3VuY3ljYXN0bGUub3JnMRYw"
-        + "FAYDVQQKEw1Cb3VuY3kgQ2FzdGxlMQswCQYDVQQGEwJBVTGCAV8wggFbAgEB"
-        + "MCowJTEWMBQGA1UEChMNQm91bmN5IENhc3RsZTELMAkGA1UEBhMCQVUCAQIw"
-        + "CQYFKw4DAhoFAKCBjDAaBgkqhkiG9w0BCQMxDQYLKoZIhvcNAQkQAQQwHAYJ"
-        + "KoZIhvcNAQkFMQ8XDTA0MTIwOTA3MzQxMlowIwYJKoZIhvcNAQkEMRYEFMNA"
-        + "xlscHYiByHL9DIEh3FewIhgSMCsGCyqGSIb3DQEJEAIMMRwwGjAYMBYEFLft"
-        + "ovMVyF6p4nlyVrSCM1YcYptHMA0GCSqGSIb3DQEBAQUABIGAaj46Tarrg7V7"
-        + "z13bbetrGv+xy159eE8kmIW9nPegru3DuK/GmbMx9W3l0ydx0zdXRwYi6NZc"
-        + "nNqbEZQZ2L1biJVTflgWq4Nxu4gPGjH/BGHKdH/LyW4eDcXZR39AkNBMnDAK"
-        + "EmhhJo1/Tc+S/WkV9lnHJCPIn+TAijBUO6EiTik=");
-    
-    private byte[] md5Response = Base64.decode(
-          "MIICcDADAgEAMIICZwYJKoZIhvcNAQcCoIICWDCCAlQCAQMxCzAJBgUrDgMC"
-        + "GgUAMIHeBgsqhkiG9w0BCRABBKCBzgSByzCByAIBAQYJKwYBBAGpBwUBMCAw"
-        + "DAYIKoZIhvcNAgUFAAQQyJfRQQr48sdPuhGx21EengIBAxgPMjAwNDEyMDkw"
-        + "NzQ2MTZaMAoCAQGAAgH0gQFkAQH/Agg0JbmsiMSM56BppGcwZTEYMBYGA1UE"
-        + "AxMPRXJpYyBILiBFY2hpZG5hMSQwIgYJKoZIhvcNAQkBFhVlcmljQGJvdW5j"
-        + "eWNhc3RsZS5vcmcxFjAUBgNVBAoTDUJvdW5jeSBDYXN0bGUxCzAJBgNVBAYT"
-        + "AkFVMYIBXzCCAVsCAQEwKjAlMRYwFAYDVQQKEw1Cb3VuY3kgQ2FzdGxlMQsw"
-        + "CQYDVQQGEwJBVQIBAjAJBgUrDgMCGgUAoIGMMBoGCSqGSIb3DQEJAzENBgsq"
-        + "hkiG9w0BCRABBDAcBgkqhkiG9w0BCQUxDxcNMDQxMjA5MDc0NjE2WjAjBgkq"
-        + "hkiG9w0BCQQxFgQUFpRpaiRUUjiY7EbefbWLKDIY0XMwKwYLKoZIhvcNAQkQ"
-        + "AgwxHDAaMBgwFgQUt+2i8xXIXqnieXJWtIIzVhxim0cwDQYJKoZIhvcNAQEB"
-        + "BQAEgYBTwKsLLrQm+bvKV7Jwto/cMQh0KsVB5RoEeGn5CI9XyF2Bm+JRcvQL"
-        + "Nm7SgSOBVt4A90TqujxirNeyQnXRiSnFvXd09Wet9WIQNpwpiGlE7lCrAhuq"
-        + "/TAUe79VIpoQZDtyhbh0Vzxl24yRoechabC0zuPpOWOzrA4YC3Hv1J2tAA==");
-
-    private byte[] signingCert = Base64.decode(
-        "MIICWjCCAcOgAwIBAgIBAjANBgkqhkiG9w0BAQQFADAlMRYwFAYDVQQKEw1Cb3Vu"
-      + "Y3kgQ2FzdGxlMQswCQYDVQQGEwJBVTAeFw0wNDEyMDkwNzEzMTRaFw0wNTAzMTkw"
-      + "NzEzMTRaMGUxGDAWBgNVBAMTD0VyaWMgSC4gRWNoaWRuYTEkMCIGCSqGSIb3DQEJ"
-      + "ARYVZXJpY0Bib3VuY3ljYXN0bGUub3JnMRYwFAYDVQQKEw1Cb3VuY3kgQ2FzdGxl"
-      + "MQswCQYDVQQGEwJBVTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAqGAFO3dK"
-      + "jB7Ca7u5Z3CabsbGr2Exg+3sztSPiRCIba03es4295EhtDF5bXQvrW2R1Bg72vED"
-      + "5tWaQjVDetvDfCzVC3ErHLTVk3OgpLIP1gf2T0LcOH2pTh2LP9c5Ceta+uggK8zK"
-      + "9sYUUnzGPSAZxrqHIIAlPIgqk0BMV+KApyECAwEAAaNaMFgwHQYDVR0OBBYEFO4F"
-      + "YoqogtB9MjD0NB5x5HN3TrGUMB8GA1UdIwQYMBaAFPXAecuwLqNkCxYVLE/ngFQR"
-      + "7RLIMBYGA1UdJQEB/wQMMAoGCCsGAQUFBwMIMA0GCSqGSIb3DQEBBAUAA4GBADGi"
-      + "D5/qmGvcBgswEM/z2dF4lOxbTNKUW31ZHiU8CXlN0IkFtNbBLBTbJOQIAUnNEabL"
-      + "T7aYgj813OZKUbJTx4MuGChhot/TEP7hKo/xz9OnXLsqYDKbqbo8iLOode+SI7II"
-      + "+yYghOtqvx32cL2Qmffi1LaMbhJP+8NbsIxowdRC");
-
-    private byte[] unacceptablePolicy = Base64.decode(
-          "MDAwLgIBAjAkDCJSZXF1ZXN0ZWQgcG9saWN5IGlzIG5vdCBzdXBwb3J0ZWQu"
-        + "AwMAAAE=");
-
-    private byte[] generalizedTime = Base64.decode(
-        "MIIKPTADAgEAMIIKNAYJKoZIhvcNAQcCoIIKJTCCCiECAQMxCzAJBgUrDgMC"
-      + "GgUAMIIBGwYLKoZIhvcNAQkQAQSgggEKBIIBBjCCAQICAQEGCisGAQQBhFkK"
-      + "AwEwITAJBgUrDgMCGgUABBQAAAAAAAAAAAAAAAAAAAAAAAAAAAICUC8YEzIw"
-      + "MDUwMzEwMTA1ODQzLjkzM1owBIACAfQBAf8CAWSggaikgaUwgaIxCzAJBgNV"
-      + "BAYTAkdCMRcwFQYDVQQIEw5DYW1icmlkZ2VzaGlyZTESMBAGA1UEBxMJQ2Ft"
-      + "YnJpZGdlMSQwIgYDVQQKExtuQ2lwaGVyIENvcnBvcmF0aW9uIExpbWl0ZWQx"
-      + "JzAlBgNVBAsTHm5DaXBoZXIgRFNFIEVTTjozMjJBLUI1REQtNzI1QjEXMBUG"
-      + "A1UEAxMOZGVtby1kc2UyMDAtMDGgggaFMIID2TCCA0KgAwIBAgICAIswDQYJ"
-      + "KoZIhvcNAQEFBQAwgYwxCzAJBgNVBAYTAkdCMRcwFQYDVQQIEw5DYW1icmlk"
-      + "Z2VzaGlyZTESMBAGA1UEBxMJQ2FtYnJpZGdlMSQwIgYDVQQKExtuQ2lwaGVy"
-      + "IENvcnBvcmF0aW9uIExpbWl0ZWQxGDAWBgNVBAsTD1Byb2R1Y3Rpb24gVEVT"
-      + "VDEQMA4GA1UEAxMHVEVTVCBDQTAeFw0wNDA2MTQxNDIzNTlaFw0wNTA2MTQx"
-      + "NDIzNTlaMIGiMQswCQYDVQQGEwJHQjEXMBUGA1UECBMOQ2FtYnJpZGdlc2hp"
-      + "cmUxEjAQBgNVBAcTCUNhbWJyaWRnZTEkMCIGA1UEChMbbkNpcGhlciBDb3Jw"
-      + "b3JhdGlvbiBMaW1pdGVkMScwJQYDVQQLEx5uQ2lwaGVyIERTRSBFU046MzIy"
-      + "QS1CNURELTcyNUIxFzAVBgNVBAMTDmRlbW8tZHNlMjAwLTAxMIGfMA0GCSqG"
-      + "SIb3DQEBAQUAA4GNADCBiQKBgQC7zUamCeLIApddx1etW5YEFrL1WXnlCd7j"
-      + "mMFI6RpSq056LBkF1z5LgucLY+e/c3u2Nw+XJuS3a2fKuBD7I1s/6IkVtIb/"
-      + "KLDjjafOnottKhprH8K41siJUeuK3PRzfZ5kF0vwB3rNvWPCBJmp7kHtUQw3"
-      + "RhIsJTYs7Wy8oVFHVwIDAQABo4IBMDCCASwwCQYDVR0TBAIwADAWBgNVHSUB"
-      + "Af8EDDAKBggrBgEFBQcDCDAsBglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5l"
-      + "cmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFDlEe9Pd0WwQrtnEmFRI2Vmt"
-      + "b+lCMIG5BgNVHSMEgbEwga6AFNy1VPweOQLC65bs6/0RcUYB19vJoYGSpIGP"
-      + "MIGMMQswCQYDVQQGEwJHQjEXMBUGA1UECBMOQ2FtYnJpZGdlc2hpcmUxEjAQ"
-      + "BgNVBAcTCUNhbWJyaWRnZTEkMCIGA1UEChMbbkNpcGhlciBDb3Jwb3JhdGlv"
-      + "biBMaW1pdGVkMRgwFgYDVQQLEw9Qcm9kdWN0aW9uIFRFU1QxEDAOBgNVBAMT"
-      + "B1RFU1QgQ0GCAQAwDQYJKoZIhvcNAQEFBQADgYEASEMlrpRE1RYZPxP3530e"
-      + "hOYUDjgQbw0dwpPjQtLWkeJrePMzDBAbuWwpRI8dOzKP3Rnrm5rxJ7oLY2S0"
-      + "A9ZfV+iwFKagEHFytfnPm2Y9AeNR7a3ladKd7NFMw+5Tbk7Asbetbb+NJfCl"
-      + "9YzHwxLGiQbpKxgc+zYOjq74eGLKtcKhggKkMIICDQIBATCB0qGBqKSBpTCB"
-      + "ojELMAkGA1UEBhMCR0IxFzAVBgNVBAgTDkNhbWJyaWRnZXNoaXJlMRIwEAYD"
-      + "VQQHEwlDYW1icmlkZ2UxJDAiBgNVBAoTG25DaXBoZXIgQ29ycG9yYXRpb24g"
-      + "TGltaXRlZDEnMCUGA1UECxMebkNpcGhlciBEU0UgRVNOOjMyMkEtQjVERC03"
-      + "MjVCMRcwFQYDVQQDEw5kZW1vLWRzZTIwMC0wMaIlCgEBMAkGBSsOAwIaBQAD"
-      + "FQDaLe88TQvM+iMKmIXMmDSyPCZ/+KBmMGSkYjBgMQswCQYDVQQGEwJVUzEk"
-      + "MCIGA1UEChMbbkNpcGhlciBDb3Jwb3JhdGlvbiBMaW1pdGVkMRgwFgYDVQQL"
-      + "Ew9Qcm9kdWN0aW9uIFRlc3QxETAPBgNVBAMTCFRlc3QgVE1DMA0GCSqGSIb3"
-      + "DQEBBQUAAgjF2jVbAAAAADAiGA8yMDA1MDMxMDAyNTQxOVoYDzIwMDUwMzEz"
-      + "MDI1NDE5WjCBjTBLBgorBgEEAYRZCgQBMT0wOzAMAgTF2jVbAgQAAAAAMA8C"
-      + "BAAAAAACBAAAaLkCAf8wDAIEAAAAAAIEAAKV/DAMAgTF3inbAgQAAAAAMD4G"
-      + "CisGAQQBhFkKBAIxMDAuMAwGCisGAQQBhFkKAwGgDjAMAgQAAAAAAgQAB6Eg"
-      + "oQ4wDAIEAAAAAAIEAAPQkDANBgkqhkiG9w0BAQUFAAOBgQB1q4d3GNWk7oAT"
-      + "WkpYmZaTFvapMhTwAmAtSGgFmNOZhs21iHWl/X990/HEBsduwxohfrd8Pz64"
-      + "hV/a76rpeJCVUfUNmbRIrsurFx6uKwe2HUHKW8grZWeCD1L8Y1pKQdrD41gu"
-      + "v0msfOXzLWW+xe5BcJguKclN8HmT7s2odtgiMTGCAmUwggJhAgEBMIGTMIGM"
-      + "MQswCQYDVQQGEwJHQjEXMBUGA1UECBMOQ2FtYnJpZGdlc2hpcmUxEjAQBgNV"
-      + "BAcTCUNhbWJyaWRnZTEkMCIGA1UEChMbbkNpcGhlciBDb3Jwb3JhdGlvbiBM"
-      + "aW1pdGVkMRgwFgYDVQQLEw9Qcm9kdWN0aW9uIFRFU1QxEDAOBgNVBAMTB1RF"
-      + "U1QgQ0ECAgCLMAkGBSsOAwIaBQCgggEnMBoGCSqGSIb3DQEJAzENBgsqhkiG"
-      + "9w0BCRABBDAjBgkqhkiG9w0BCQQxFgQUi1iYx5H3ACnvngWZTPfdxGswkSkw"
-      + "geMGCyqGSIb3DQEJEAIMMYHTMIHQMIHNMIGyBBTaLe88TQvM+iMKmIXMmDSy"
-      + "PCZ/+DCBmTCBkqSBjzCBjDELMAkGA1UEBhMCR0IxFzAVBgNVBAgTDkNhbWJy"
-      + "aWRnZXNoaXJlMRIwEAYDVQQHEwlDYW1icmlkZ2UxJDAiBgNVBAoTG25DaXBo"
-      + "ZXIgQ29ycG9yYXRpb24gTGltaXRlZDEYMBYGA1UECxMPUHJvZHVjdGlvbiBU"
-      + "RVNUMRAwDgYDVQQDEwdURVNUIENBAgIAizAWBBSpS/lH6bN/wf3E2z2X29vF"
-      + "2U7YHTANBgkqhkiG9w0BAQUFAASBgGvDVsgsG5I5WKjEDVHvdRwUx+8Cp10l"
-      + "zGF8o1h7aK5O3zQ4jLayYHea54E5+df35gG7Z3eoOy8E350J7BvHiwDLTqe8"
-      + "SoRlGs9VhL6LMmCcERfGSlSn61Aa15iXZ8eHMSc5JTeJl+kqy4I3FPP4m2ai"
-      + "8wy2fQhn7hUM8Ntg7Y2s");
-
-    private byte[] v2SigningCertResponse = Base64.decode(
-        "MIIPPTADAgEAMIIPNAYJKoZIhvcNAQcCoIIPJTCCDyECAQMxDzANBglghkgBZQMEAgEFADCB6QYL"
-      + "KoZIhvcNAQkQAQSggdkEgdYwgdMCAQEGBgQAj2cBATAxMA0GCWCGSAFlAwQCAQUABCBcU0GN08TA"
-      + "LUFi7AAwQwVkSXqGu9tAzvJ7EXW7SMXHHQIRAM7Fa7g6tMvZI3dgllwMfpcYDzIwMDcxMjExMTAy"
-      + "MTU5WjADAgEBAgYBFsi5OlmgYqRgMF4xCzAJBgNVBAYTAkRFMSQwIgYDVQQKDBtEZXV0c2NoZSBS"
-      + "ZW50ZW52ZXJzaWNoZXJ1bmcxEzARBgNVBAsMClFDIFJvb3QgQ0ExFDASBgNVBAMMC1FDIFJvb3Qg"
-      + "VFNQoIILQjCCBwkwggXxoAMCAQICAwN1pjANBgkqhkiG9w0BAQsFADBIMQswCQYDVQQGEwJERTEk"
-      + "MCIGA1UECgwbRGV1dHNjaGUgUmVudGVudmVyc2ljaGVydW5nMRMwEQYDVQQLDApRQyBSb290IENB"
-      + "MB4XDTA3MTEyMDE2MDcyMFoXDTEyMDcyNzIwMjExMVowXjELMAkGA1UEBhMCREUxJDAiBgNVBAoM"
-      + "G0RldXRzY2hlIFJlbnRlbnZlcnNpY2hlcnVuZzETMBEGA1UECwwKUUMgUm9vdCBDQTEUMBIGA1UE"
-      + "AwwLUUMgUm9vdCBUU1AwggEkMA0GCSqGSIb3DQEBAQUAA4IBEQAwggEMAoIBAQCv1vO+EtGnJNs0"
-      + "atv76BAJXs4bmO8yzVwe3RUtgeu5z9iefh8P46i1g3EL2CD15NcTfoHksr5KudNY30olfjHG7lIu"
-      + "MO3R5sAcrGDPP7riZJnaI6VD/e6kVR569VBid5z105fJAB7mID7+Bn7pdRwDW3Fy2CzfofXGuvrO"
-      + "GPNEWq8x8kqqf75DB5nAs5QP8H41obkdkap2ttHkkPZCiMghTs8iHfpJ0STn47MKq+QrUmuATMZi"
-      + "XrdEfb7f3TBMjO0UVJF64Mh+kC9GtUEHlcm0Tq2Pk5XIUxWEyL94rZ4UWcVdSVE7IjggV2MifMNx"
-      + "geZO3SwsDZk71AhDBy30CSzBAgUAx3HB5aOCA+IwggPeMBYGA1UdJQEB/wQMMAoGCCsGAQUFBwMI"
-      + "MBMGA1UdIwQMMAqACECefuBmflfeMBgGCCsGAQUFBwEDBAwwCjAIBgYEAI5GAQEwUAYIKwYBBQUH"
-      + "AQEERDBCMEAGCCsGAQUFBzABhjRodHRwOi8vb2NzcC1yb290cWMudGMuZGV1dHNjaGUtcmVudGVu"
-      + "dmVyc2ljaGVydW5nLmRlMHcGA1UdIARwMG4wbAYNKwYBBAGBrTwBCAEBAzBbMFkGCCsGAQUFBwIB"
-      + "Fk1odHRwOi8vd3d3LmRldXRzY2hlLXJlbnRlbnZlcnNpY2hlcnVuZy1idW5kLmRlL3N0YXRpYy90"
-      + "cnVzdGNlbnRlci9wb2xpY3kuaHRtbDCCATwGA1UdHwSCATMwggEvMHygeqB4hnZsZGFwOi8vZGly"
-      + "LnRjLmRldXRzY2hlLXJlbnRlbnZlcnNpY2hlcnVuZy5kZS9vdT1RQyUyMFJvb3QlMjBDQSxjbj1Q"
-      + "dWJsaWMsbz1EUlYsYz1ERT9hdHRybmFtZT1jZXJ0aWZpY2F0ZVJldm9jYXRpb25MaXN0MIGuoIGr"
-      + "oIGohoGlaHR0cDovL2Rpci50Yy5kZXV0c2NoZS1yZW50ZW52ZXJzaWNoZXJ1bmcuZGU6ODA4OS9z"
-      + "ZXJ2bGV0L0Rpclh3ZWIvQ2EveC5jcmw/ZG49b3UlM0RRQyUyMFJvb3QlMjBDQSUyQ2NuJTNEUHVi"
-      + "bGljJTJDbyUzRERSViUyQ2MlM0RERSZhdHRybmFtZT1jZXJ0aWZpY2F0ZVJldm9jYXRpb25MaXN0"
-      + "MIIBLQYDVR0SBIIBJDCCASCGdGxkYXA6Ly9kaXIudGMuZGV1dHNjaGUtcmVudGVudmVyc2ljaGVy"
-      + "dW5nLmRlL2NuPTE0NTUxOCxvdT1RQyUyMFJvb3QlMjBDQSxjbj1QdWJsaWMsbz1EUlYsYz1ERT9h"
-      + "dHRybmFtZT1jQUNlcnRpZmljYXRlhoGnaHR0cDovL2Rpci50Yy5kZXV0c2NoZS1yZW50ZW52ZXJz"
-      + "aWNoZXJ1bmcuZGU6ODA4OS9zZXJ2bGV0L0Rpclh3ZWIvQ2EveC5jZXI/ZG49Y24lM0QxNDU1MTgl"
-      + "MkNvdSUzRFFDJTIwUm9vdCUyMENBJTJDY24lM0RQdWJsaWMlMkNvJTNERFJWJTJDYyUzRERFJmF0"
-      + "dHJuYW1lPWNBQ2VydGlmaWNhdGUwDgYDVR0PAQH/BAQDAgZAMDsGA1UdCQQ0MDIwMAYDVQQDMSkT"
-      + "J1FDIFRTUCBEZXV0c2NoZSBSZW50ZW52ZXJzaWNoZXJ1bmcgMTpQTjAMBgNVHRMBAf8EAjAAMA0G"
-      + "CSqGSIb3DQEBCwUAA4IBAQCCrWe3Pd3ioX7d8phXvVAa859Rvgf0k3pZ6R4GMj8h/k6MNjNIrdAs"
-      + "wgUVkBbXMLLBk0smsvTdFIVtTBdp1urb9l7vXjDA4MckXBOXPcz4fN8Oswk92d+fM9XU1jKVPsFG"
-      + "PV6j8lAqfq5jwaRxOnS96UBGLKG+NdcrEyiMp/ZkpqnEQZZfu2mkeq6CPahnbBTZqsE0jgY351gU"
-      + "9T6SFVvLIFH7cOxJqsoxPqv5YEcgiXPpOyyu2rpQqKYBYcnerF6/zx5hmWHxTd7MWaTHm0gJI/Im"
-      + "d8esbW+xyaJuAVUcBA+sDmSe8AAoRVxwBRY+xi9ApaJHpmwT+0n2K2GsL3wIMIIEMTCCAxmgAwIB"
-      + "AgIDAjhuMA0GCSqGSIb3DQEBCwUAMEgxCzAJBgNVBAYTAkRFMSQwIgYDVQQKDBtEZXV0c2NoZSBS"
-      + "ZW50ZW52ZXJzaWNoZXJ1bmcxEzARBgNVBAsMClFDIFJvb3QgQ0EwHhcNMDcwNzI3MjAyMTExWhcN"
-      + "MTIwNzI3MjAyMTExWjBIMQswCQYDVQQGEwJERTEkMCIGA1UECgwbRGV1dHNjaGUgUmVudGVudmVy"
-      + "c2ljaGVydW5nMRMwEQYDVQQLDApRQyBSb290IENBMIIBJDANBgkqhkiG9w0BAQEFAAOCAREAMIIB"
-      + "DAKCAQEAzuhBdo9c84DdzsggjWOgfC4jJ2jYqpsOpBo3DVyem+5R26QK4feZdyFnaGvyG+TLcdLO"
-      + "iCecGmrRGD+ey4IhjCONb7hsQQhJWTyDEtBblzYB0yjY8+9fnNeR61W+M/KlMgC6Rw/w+zwzklTM"
-      + "MWwIbxLHm8l9jTSKFjAWTwjE8bCzpUCwN8+4JbFTwjwOJ5lsVA5Xa34wpgr6lgL3WrVTV1NSprqR"
-      + "ZYDWg477tht0KkyOJt3guF3RONKBBuTO2qCbpUeI8m4v3tznoopYbV5Gp5wu5gqd6lTfgju3ldql"
-      + "bxtuCLZd0nAI5rLEOPItDKl4vPXllmmtGIrtDZlwr86cbwIFAJvMJpGjggEgMIIBHDAPBgNVHRMB"
-      + "Af8EBTADAQH/MBEGA1UdDgQKBAhAnn7gZn5X3jB3BgNVHSAEcDBuMGwGDSsGAQQBga08AQgBAQEw"
-      + "WzBZBggrBgEFBQcCARZNaHR0cDovL3d3dy5kZXV0c2NoZS1yZW50ZW52ZXJzaWNoZXJ1bmctYnVu"
-      + "ZC5kZS9zdGF0aWMvdHJ1c3RjZW50ZXIvcG9saWN5Lmh0bWwwUwYDVR0JBEwwSjBIBgNVBAMxQRM/"
-      + "UUMgV3VyemVsemVydGlmaXppZXJ1bmdzc3RlbGxlIERldXRzY2hlIFJlbnRlbnZlcnNpY2hlcnVu"
-      + "ZyAxOlBOMBgGCCsGAQUFBwEDBAwwCjAIBgYEAI5GAQEwDgYDVR0PAQH/BAQDAgIEMA0GCSqGSIb3"
-      + "DQEBCwUAA4IBAQBNGs7Dnc1yzzpZrkuC+oLv+NhbORTEYNgpaOetB1JQ1EbUBoPuNN4ih0ngy/uJ"
-      + "D2O+h4JsNkmELgaehLWyFwATqCYZY4cTAGVoEwgn93x3aW8JbMDQf+YEJDSDsXcm4oIDFPqv5M6o"
-      + "HZUWfsPka3mxKivfKtWhooTz1/+BEGReVQ2oOAvlwXlkEab9e3GOqXQUcLPYDTl8BQxiYhtQtf3d"
-      + "kORiUkuGiGX1YJ5JnZnG3ElMjPgOl8rOiYU7oj9uv1HVb5sdAwuVw0BR/eiMVDBT8DNyfoJmPeQQ"
-      + "A9pXtoAYO0Ya7wNNmCY2Y63YfBlRCF+9VQv2RZ4TdO1KGWwxR98OMYIC1zCCAtMCAQEwTzBIMQsw"
-      + "CQYDVQQGEwJERTEkMCIGA1UECgwbRGV1dHNjaGUgUmVudGVudmVyc2ljaGVydW5nMRMwEQYDVQQL"
-      + "DApRQyBSb290IENBAgMDdaYwDQYJYIZIAWUDBAIBBQCgggFZMBoGCSqGSIb3DQEJAzENBgsqhkiG"
-      + "9w0BCRABBDAvBgkqhkiG9w0BCQQxIgQgO7FFODWWwF5RUjo6wjIkgkD5u7dH+NICiCpSgRRqd/Aw"
-      + "ggEIBgsqhkiG9w0BCRACLzGB+DCB9TCB8jB3BCAMMZqK/5pZxOb3ruCbcgxStaTDwDHaf2glEo6P"
-      + "+89t8TBTMEykSjBIMQswCQYDVQQGEwJERTEkMCIGA1UECgwbRGV1dHNjaGUgUmVudGVudmVyc2lj"
-      + "aGVydW5nMRMwEQYDVQQLDApRQyBSb290IENBAgMDdaYwdwQgl7vwI+P47kpxhWLoIdEco7UfGwZ2"
-      + "X4el3jaZ67q5/9IwUzBMpEowSDELMAkGA1UEBhMCREUxJDAiBgNVBAoMG0RldXRzY2hlIFJlbnRl"
-      + "bnZlcnNpY2hlcnVuZzETMBEGA1UECwwKUUMgUm9vdCBDQQIDAjhuMA0GCSqGSIb3DQEBCwUABIIB"
-      + "AIOYgpDI0BaeG4RF/EB5QzkUqAZ9nX6w895+m2hHyRKrAKdj3913j5QI+aEVIG3DVbFaAfdKeKfn"
-      + "xsTW48aWs6aARtPAc+1OXwoGUSYElOFqqVpSeTaXe+kjY5bsLSQeETB+EPvXl8EcKTaxTRCNOqJU"
-      + "XbnyYRgWTI55A2jH6IsQQVHc5DaIcmbdI8iATaRTHY5eUeVuI+Q/3RMVBFAb5qRhM61Ddcrjq058"
-      + "C0uiH9G2IB5QRyu6RsCUgrkeMTMBqlIBlnDBy+EgLouDU4Dehxy5uzEl5DBKZEewZpQZOTO/kAgL"
-      + "WruAAg/Lj4r0f9vN12wRlHoS2UKDjrE1DnUBbrM=");
-
-    /* (non-Javadoc)
-     * @see org.bouncycastle.util.test.Test#getName()
-     */
-    public String getName()
-    {
-        return "ParseTest";
-    }
-
-    private void requestParse(
-        byte[]  request,
-        ASN1ObjectIdentifier algorithm)
-        throws IOException
-    {
-        TimeStampRequest    req = new TimeStampRequest(request);
-        
-        if (!req.getMessageImprintAlgOID().equals(algorithm))
-        {
-            fail("failed to get expected algorithm - got " 
-                    + req.getMessageImprintAlgOID() + " not " + algorithm);
-        }
-        
-        if (request != sha1Request && request != sha1noNonse)
-        {
-            if (!req.getReqPolicy().equals(TSPTestUtil.EuroPKI_TSA_Test_Policy))
-            {
-                fail("" + algorithm + " failed policy check.");
-            }
-            
-            if (request == ripemd160Request)
-            {
-                if (!req.getCertReq())
-                {
-                    fail("" + algorithm + " failed certReq check.");
-                }
-            }
-        }
-        
-        assertEquals("version not 1", 1, req.getVersion());
-        
-        assertEquals("critical extensions found when none expected", 0, req.getCriticalExtensionOIDs().size());
-        
-        assertEquals("non-critical extensions found when none expected", 0, req.getNonCriticalExtensionOIDs().size());
-        
-        if (request != sha1noNonse)
-        {
-            if (req.getNonce() == null)
-            {
-                fail("" + algorithm + " nonse not found when one expected.");
-            }
-        }
-        else
-        {
-            if (req.getNonce() != null)
-            {
-                fail("" + algorithm + " nonse not found when one not expected.");
-            } 
-        }
-        
-        try
-        {
-            req.validate(TSPAlgorithms.ALLOWED, null, null);
-        }
-        catch (Exception e)
-        {
-            fail("validation exception.");
-        }
-        
-        if (!Arrays.areEqual(req.getEncoded(), request))
-        {
-            fail("" + algorithm + " failed encode check."); 
-        }
-    }
-    
-    private void responseParse(
-        byte[]  request,
-        byte[]  response,
-        ASN1ObjectIdentifier algorithm)
-        throws Exception
-    {
-        TimeStampRequest  req = new TimeStampRequest(request);
-        TimeStampResponse resp = new TimeStampResponse(response);
-
-        CertificateFactory  fact = CertificateFactory.getInstance("X.509", "BC");
-                
-        X509Certificate cert = (X509Certificate)fact.generateCertificate(new ByteArrayInputStream(signingCert));
-
-        resp.validate(req);
-
-        resp.getTimeStampToken().validate(new JcaSimpleSignerInfoVerifierBuilder().setProvider("BC").build(cert));
-    }
-    
-    private void unacceptableResponseParse(
-        byte[]  response) 
-        throws Exception
-    {
-        TimeStampResponse resp = new TimeStampResponse(response);
-
-        if (resp.getStatus() != PKIStatus.REJECTION)
-        {
-            fail("request not rejected.");
-        }
-        
-        if (resp.getFailInfo().intValue() != PKIFailureInfo.unacceptedPolicy)
-        {
-            fail("request not rejected.");
-        }
-    }
-    
-    private void generalizedTimeParse(
-        byte[]  response) 
-        throws Exception
-    {
-        TimeStampResponse resp = new TimeStampResponse(response);
-
-        if (resp.getStatus() != PKIStatus.GRANTED)
-        {
-            fail("request not rejected.");
-        }
-    }
-
-    public void setUp()
-    {
-        Security.addProvider(new BouncyCastleProvider());
-    }
-    
-    public void testParsing()
-        throws Exception
-    { 
-        requestParse(sha1Request, TSPAlgorithms.SHA1);
-        
-        requestParse(sha1noNonse, TSPAlgorithms.SHA1);
-
-        requestParse(md5Request, TSPAlgorithms.MD5);
-
-        requestParse(ripemd160Request, TSPAlgorithms.RIPEMD160);
-
-        responseParse(sha1Request, sha1Response, TSPAlgorithms.SHA1);
-
-        responseParse(sha1noNonse, sha1noNonseResponse, TSPAlgorithms.SHA1);
-
-        responseParse(md5Request, md5Response, TSPAlgorithms.MD5);
-
-        unacceptableResponseParse(unacceptablePolicy);
-
-        generalizedTimeParse(generalizedTime);
-
-        v2SigningResponseParse(v2SigningCertResponse);
-    }
-
-    private void v2SigningResponseParse(
-        byte[] encoded)
-        throws Exception
-    {
-        TimeStampResponse response = new TimeStampResponse(encoded);
-
-        Store store = response.getTimeStampToken().getCertificates();
-        X509CertificateHolder cert = (X509CertificateHolder)store.getMatches(response.getTimeStampToken().getSID()).iterator().next();
-
-        response.getTimeStampToken().validate(new JcaSimpleSignerInfoVerifierBuilder().setProvider("BC").build(cert));
-    }
-
-    public void parse(
-        byte[]  encoded,
-        boolean tokenPresent)
-        throws Exception
-    {
-        TimeStampResponse   response = new TimeStampResponse(encoded);
-
-        if (tokenPresent && response.getTimeStampToken() == null)
-        {
-            fail("token not found when expected.");
-        }
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/tsp/test/SHA1DigestCalculator.java b/bcpkix/src/main/java/org/bouncycastle/tsp/test/SHA1DigestCalculator.java
deleted file mode 100644
index 8bbd4ad..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/tsp/test/SHA1DigestCalculator.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package org.bouncycastle.tsp.test;
-
-import java.io.ByteArrayOutputStream;
-import java.io.OutputStream;
-
-import org.bouncycastle.asn1.oiw.OIWObjectIdentifiers;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.digests.SHA1Digest;
-import org.bouncycastle.operator.DigestCalculator;
-
-
-class SHA1DigestCalculator
-    implements DigestCalculator
-{
-    private ByteArrayOutputStream bOut = new ByteArrayOutputStream();
-
-    public AlgorithmIdentifier getAlgorithmIdentifier()
-    {
-        return new AlgorithmIdentifier(OIWObjectIdentifiers.idSHA1);
-    }
-
-    public OutputStream getOutputStream()
-    {
-        return bOut;
-    }
-
-    public byte[] getDigest()
-    {
-        byte[] bytes = bOut.toByteArray();
-
-        bOut.reset();
-
-        Digest sha1 = new SHA1Digest();
-
-        sha1.update(bytes, 0, bytes.length);
-
-        byte[] digest = new byte[sha1.getDigestSize()];
-
-        sha1.doFinal(digest, 0);
-
-        return digest;
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/tsp/test/SHA256DigestCalculator.java b/bcpkix/src/main/java/org/bouncycastle/tsp/test/SHA256DigestCalculator.java
deleted file mode 100644
index 89b0a1f..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/tsp/test/SHA256DigestCalculator.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package org.bouncycastle.tsp.test;
-
-import java.io.ByteArrayOutputStream;
-import java.io.OutputStream;
-
-import org.bouncycastle.asn1.nist.NISTObjectIdentifiers;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.digests.SHA256Digest;
-import org.bouncycastle.operator.DigestCalculator;
-
-
-class SHA256DigestCalculator
-    implements DigestCalculator
-{
-    private ByteArrayOutputStream bOut = new ByteArrayOutputStream();
-
-    public AlgorithmIdentifier getAlgorithmIdentifier()
-    {
-        return new AlgorithmIdentifier(NISTObjectIdentifiers.id_sha256);
-    }
-
-    public OutputStream getOutputStream()
-    {
-        return bOut;
-    }
-
-    public byte[] getDigest()
-    {
-        byte[] bytes = bOut.toByteArray();
-
-        bOut.reset();
-
-        Digest sha256 = new SHA256Digest();
-
-        sha256.update(bytes, 0, bytes.length);
-
-        byte[] digest = new byte[sha256.getDigestSize()];
-
-        sha256.doFinal(digest, 0);
-
-        return digest;
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/tsp/test/TSPTestUtil.java b/bcpkix/src/main/java/org/bouncycastle/tsp/test/TSPTestUtil.java
deleted file mode 100644
index e9d9426..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/tsp/test/TSPTestUtil.java
+++ /dev/null
@@ -1,229 +0,0 @@
-package org.bouncycastle.tsp.test;
-
-import java.io.IOException;
-import java.math.BigInteger;
-import java.security.GeneralSecurityException;
-import java.security.KeyPair;
-import java.security.KeyPairGenerator;
-import java.security.PrivateKey;
-import java.security.PublicKey;
-import java.security.SecureRandom;
-import java.security.cert.X509Certificate;
-import java.util.Date;
-
-import javax.crypto.KeyGenerator;
-import javax.crypto.SecretKey;
-
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.x509.AuthorityKeyIdentifier;
-import org.bouncycastle.asn1.x509.BasicConstraints;
-import org.bouncycastle.asn1.x509.ExtendedKeyUsage;
-import org.bouncycastle.asn1.x509.Extension;
-import org.bouncycastle.asn1.x509.KeyPurposeId;
-import org.bouncycastle.asn1.x509.SubjectKeyIdentifier;
-import org.bouncycastle.asn1.x509.X509Name;
-import org.bouncycastle.cert.jcajce.JcaX509ExtensionUtils;
-import org.bouncycastle.util.encoders.Base64;
-import org.bouncycastle.x509.X509V3CertificateGenerator;
-
-public class TSPTestUtil
-{
-
-    public static SecureRandom rand = new SecureRandom();
-
-    public static KeyPairGenerator kpg;
-
-    public static KeyGenerator desede128kg;
-
-    public static KeyGenerator desede192kg;
-
-    public static KeyGenerator rc240kg;
-
-    public static KeyGenerator rc264kg;
-
-    public static KeyGenerator rc2128kg;
-
-    public static BigInteger serialNumber = BigInteger.ONE;
-
-    public static final boolean DEBUG = true;
-
-    public static ASN1ObjectIdentifier EuroPKI_TSA_Test_Policy = new ASN1ObjectIdentifier(
-            "1.3.6.1.4.1.5255.5.1");
-
-    public static JcaX509ExtensionUtils extUtils;
-
-    static
-    {
-        try
-        {
-            rand = new SecureRandom();
-
-            kpg = KeyPairGenerator.getInstance("RSA", "BC");
-            kpg.initialize(1024, rand);
-
-            desede128kg = KeyGenerator.getInstance("DESEDE", "BC");
-            desede128kg.init(112, rand);
-
-            desede192kg = KeyGenerator.getInstance("DESEDE", "BC");
-            desede192kg.init(168, rand);
-
-            rc240kg = KeyGenerator.getInstance("RC2", "BC");
-            rc240kg.init(40, rand);
-
-            rc264kg = KeyGenerator.getInstance("RC2", "BC");
-            rc264kg.init(64, rand);
-
-            rc2128kg = KeyGenerator.getInstance("RC2", "BC");
-            rc2128kg.init(128, rand);
-
-            serialNumber = new BigInteger("1");
-
-            extUtils = new JcaX509ExtensionUtils();
-
-        }
-        catch (Exception ex)
-        {
-            throw new RuntimeException(ex.toString());
-        }
-    }
-
-    public static String dumpBase64(byte[] data)
-    {
-        StringBuffer buf = new StringBuffer();
-
-        data = Base64.encode(data);
-
-        for (int i = 0; i < data.length; i += 64)
-        {
-            if (i + 64 < data.length)
-            {
-                buf.append(new String(data, i, 64));
-            }
-            else
-            {
-                buf.append(new String(data, i, data.length - i));
-            }
-            buf.append('\n');
-        }
-
-        return buf.toString();
-    }
-
-    public static KeyPair makeKeyPair()
-    {
-        return kpg.generateKeyPair();
-    }
-
-    public static SecretKey makeDesede128Key()
-    {
-        return desede128kg.generateKey();
-    }
-
-    public static SecretKey makeDesede192Key()
-    {
-        return desede192kg.generateKey();
-    }
-
-    public static SecretKey makeRC240Key()
-    {
-        return rc240kg.generateKey();
-    }
-
-    public static SecretKey makeRC264Key()
-    {
-        return rc264kg.generateKey();
-    }
-
-    public static SecretKey makeRC2128Key()
-    {
-        return rc2128kg.generateKey();
-    }
-
-    public static X509Certificate makeCertificate(KeyPair _subKP,
-            String _subDN, KeyPair _issKP, String _issDN)
-            throws GeneralSecurityException, IOException
-    {
-
-        return makeCertificate(_subKP, _subDN, _issKP, _issDN, false);
-    }
-
-    public static X509Certificate makeCACertificate(KeyPair _subKP,
-            String _subDN, KeyPair _issKP, String _issDN)
-            throws GeneralSecurityException, IOException
-    {
-
-        return makeCertificate(_subKP, _subDN, _issKP, _issDN, true);
-    }
-
-    public static X509Certificate makeCertificate(KeyPair _subKP,
-            String _subDN, KeyPair _issKP, String _issDN, boolean _ca)
-            throws GeneralSecurityException, IOException
-    {
-
-        PublicKey _subPub = _subKP.getPublic();
-        PrivateKey _issPriv = _issKP.getPrivate();
-        PublicKey _issPub = _issKP.getPublic();
-
-        X509V3CertificateGenerator _v3CertGen = new X509V3CertificateGenerator();
-
-        _v3CertGen.reset();
-        _v3CertGen.setSerialNumber(allocateSerialNumber());
-        _v3CertGen.setIssuerDN(new X509Name(_issDN));
-        _v3CertGen.setNotBefore(new Date(System.currentTimeMillis()));
-        _v3CertGen.setNotAfter(new Date(System.currentTimeMillis()
-                + (1000L * 60 * 60 * 24 * 100)));
-        _v3CertGen.setSubjectDN(new X509Name(_subDN));
-        _v3CertGen.setPublicKey(_subPub);
-        _v3CertGen.setSignatureAlgorithm("MD5WithRSAEncryption");
-
-        _v3CertGen.addExtension(Extension.subjectKeyIdentifier, false,
-                createSubjectKeyId(_subPub));
-
-        _v3CertGen.addExtension(Extension.authorityKeyIdentifier, false,
-                createAuthorityKeyId(_issPub));
-
-        if (_ca)
-        {
-            _v3CertGen.addExtension(Extension.basicConstraints, false,
-                    new BasicConstraints(_ca));
-        }
-        else
-        {
-            _v3CertGen.addExtension(Extension.extendedKeyUsage, true,
-                    new ExtendedKeyUsage(KeyPurposeId.id_kp_timeStamping));
-        }
-
-        X509Certificate _cert = _v3CertGen.generate(_issPriv);
-
-        _cert.checkValidity(new Date());
-        _cert.verify(_issPub);
-
-        return _cert;
-    }
-
-    /*  
-     *  
-     *  INTERNAL METHODS
-     *  
-     */
-
-
-    private static AuthorityKeyIdentifier createAuthorityKeyId(PublicKey _pubKey)
-            throws IOException
-    {
-        return extUtils.createAuthorityKeyIdentifier(_pubKey);
-    }
-
-    private static SubjectKeyIdentifier createSubjectKeyId(PublicKey _pubKey)
-            throws IOException
-    {
-        return extUtils.createSubjectKeyIdentifier(_pubKey);
-    }
-
-    private static BigInteger allocateSerialNumber()
-    {
-        BigInteger _tmp = serialNumber;
-        serialNumber = serialNumber.add(BigInteger.ONE);
-        return _tmp;
-    }
-}
diff --git a/bcpkix/src/main/java/org/bouncycastle/voms/VOMSAttribute.java b/bcpkix/src/main/java/org/bouncycastle/voms/VOMSAttribute.java
deleted file mode 100644
index 9c062f3..0000000
--- a/bcpkix/src/main/java/org/bouncycastle/voms/VOMSAttribute.java
+++ /dev/null
@@ -1,242 +0,0 @@
-package org.bouncycastle.voms;
-
-import java.util.List;
-import java.util.ArrayList;
-
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.DERIA5String;
-import org.bouncycastle.asn1.x509.IetfAttrSyntax;
-import org.bouncycastle.x509.X509Attribute;
-import org.bouncycastle.x509.X509AttributeCertificate;
-
-
-/**
- * Representation of the authorization information (VO, server address
- * and list of Fully Qualified Attribute Names, or FQANs) contained in
- * a VOMS attribute certificate.
- */
-public class VOMSAttribute
-{
-
-    /**
-     * The ASN.1 object identifier for VOMS attributes
-     */
-    public static final String VOMS_ATTR_OID = "1.3.6.1.4.1.8005.100.100.4";
-    private X509AttributeCertificate myAC;
-    private String myHostPort;
-    private String myVo;
-    private List myStringList = new ArrayList();
-    private List myFQANs = new ArrayList();
-
-    /**
-     * Parses the contents of an attribute certificate.<br>
-     * <b>NOTE:</b> Cryptographic signatures, time stamps etc. will <b>not</b> be checked.
-     *
-     * @param ac the attribute certificate to parse for VOMS attributes
-     */
-    public VOMSAttribute(X509AttributeCertificate ac) 
-    {
-        if (ac == null) 
-        {
-            throw new IllegalArgumentException("VOMSAttribute: AttributeCertificate is NULL");
-        }
-
-        myAC = ac;
-
-        X509Attribute[] l = ac.getAttributes(VOMS_ATTR_OID);
-
-        if (l == null) 
-        {
-            return;
-        }
-
-        try 
-        {
-            for (int i = 0; i != l.length; i++) 
-            {
-                IetfAttrSyntax attr = IetfAttrSyntax.getInstance(l[i].getValues()[0]);
-
-                // policyAuthority is on the format <vo>/<host>:<port>
-                String url = ((DERIA5String)attr.getPolicyAuthority().getNames()[0].getName()).getString();
-                int idx = url.indexOf("://");
-
-                if ((idx < 0) || (idx == (url.length() - 1)))
-                {
-                    throw new IllegalArgumentException("Bad encoding of VOMS policyAuthority : [" + url + "]");
-                }
-
-                myVo = url.substring(0, idx);
-                myHostPort = url.substring(idx + 3);
-
-                if (attr.getValueType() != IetfAttrSyntax.VALUE_OCTETS)
-                {
-                    throw new IllegalArgumentException(
-                        "VOMS attribute values are not encoded as octet strings, policyAuthority = " + url);
-                }
-
-                ASN1OctetString[]   values = (ASN1OctetString[])attr.getValues();
-                for (int j = 0; j != values.length; j++)        
-                {
-                    String fqan = new String(values[j].getOctets());
-                    FQAN f = new FQAN(fqan);
-
-                    if (!myStringList.contains(fqan) && fqan.startsWith("/" + myVo + "/"))
-               {
-                        myStringList.add(fqan);
-                        myFQANs.add(f);
-                    }
-                }
-            }
-        }
-        catch (IllegalArgumentException ie) 
-        {
-            throw ie;
-        }
-        catch (Exception e) 
-        {
-            throw new IllegalArgumentException("Badly encoded VOMS extension in AC issued by " +
-                ac.getIssuer());
-        }
-    }
-
-    /**
-     * @return The AttributeCertificate containing the VOMS information
-     */
-    public X509AttributeCertificate getAC()
-    {
-        return myAC;
-    }
-
-    /**
-     * @return List of String of the VOMS fully qualified
-     * attributes names (FQANs):<br>
-     * <code>/vo[/group[/group2...]][/Role=[role]][/Capability=capability]</code>
-     */
-    public List getFullyQualifiedAttributes()
-    {
-        return myStringList;
-    }
-
-    /**
-     * @return List of FQAN of the VOMS fully qualified
-     * attributes names (FQANs)
-     */
-    public List getListOfFQAN()
-    {
-        return myFQANs;
-    }
-
-    /**
-     * Returns the address of the issuing VOMS server, on the form <code>&lt;host&gt;:&lt;port&gt;</code>
-     * @return String
-     */
-    public String getHostPort()
-    {
-        return myHostPort;
-    }
-
-    /**
-     * Returns the VO name
-     * @return
-     */
-    public String getVO()
-    {
-        return myVo;
-    }
-
-    public String toString()
-    {
-        return "VO      :" + myVo + "\n" + "HostPort:" + myHostPort + "\n" + "FQANs   :" + myFQANs;
-    }
-
-    /**
-     * Inner class providing a container of the group,role,capability
-     * information triplet in an FQAN.
-     */
-    public class FQAN
-    {
-        String fqan;
-        String group;
-        String role;
-        String capability;
-
-        public FQAN(String fqan)
-        {
-            this.fqan = fqan;
-        }
-
-        public FQAN(String group, String role, String capability)
-        {
-            this.group = group;
-            this.role = role;
-            this.capability = capability;
-        }
-
-        public String getFQAN()
-        {
-            if (fqan != null)
-            {
-                return fqan;
-            }
-
-            fqan = group + "/Role=" + ((role != null) ? role : "") +
-                ((capability != null) ? ("/Capability=" + capability) : "");
-
-            return fqan;
-        }
-
-        protected void split()
-        {
-            int len = fqan.length();
-            int i = fqan.indexOf("/Role=");
-
-            if (i < 0)
-            {
-                return;
-            }
-
-            group = fqan.substring(0, i);
-
-            int j = fqan.indexOf("/Capability=", i + 6);
-            String s = (j < 0) ? fqan.substring(i + 6) : fqan.substring(i + 6, j);
-            role = (s.length() == 0) ? null : s;
-            s = (j < 0) ? null : fqan.substring(j + 12);
-            capability = ((s == null) || (s.length() == 0)) ? null : s;
-        }
-
-        public String getGroup()
-        {
-            if ((group == null) && (fqan != null))
-            {
-                split();
-            }
-
-            return group;
-        }
-
-        public String getRole()
-        {
-            if ((group == null) && (fqan != null))
-            {
-                split();
-            }
-
-            return role;
-        }
-
-        public String getCapability()   
-        {
-            if ((group == null) && (fqan != null))
-            {
-                split();
-            }
-
-            return capability;
-        }
-
-        public String toString()
-        {
-            return getFQAN();
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/LICENSE.java b/bcprov/src/main/java/org/bouncycastle/LICENSE.java
deleted file mode 100644
index 2104505..0000000
--- a/bcprov/src/main/java/org/bouncycastle/LICENSE.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package org.bouncycastle;
-
-/**
- * The Bouncy Castle License
- *
- * Copyright (c) 2000-2015 The Legion Of The Bouncy Castle Inc. (http://www.bouncycastle.org)
- * <p>
- * Permission is hereby granted, free of charge, to any person obtaining a copy of this software 
- * and associated documentation files (the "Software"), to deal in the Software without restriction, 
- * including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, 
- * and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- * <p>
- * The above copyright notice and this permission notice shall be included in all copies or substantial
- * portions of the Software.
- * <p>
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
- * PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
- * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- */
-public class LICENSE
-{
-    public static String licenseText =
-      "Copyright (c) 2000-2015 The Legion of the Bouncy Castle Inc. (http://www.bouncycastle.org) "
-      + System.getProperty("line.separator")
-      + System.getProperty("line.separator")
-      + "Permission is hereby granted, free of charge, to any person obtaining a copy of this software "
-      + System.getProperty("line.separator")
-      + "and associated documentation files (the \"Software\"), to deal in the Software without restriction, "
-      + System.getProperty("line.separator")
-      + "including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, "
-      + System.getProperty("line.separator")
-      + "and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so,"
-      + System.getProperty("line.separator")
-      + "subject to the following conditions:"
-      + System.getProperty("line.separator")
-      + System.getProperty("line.separator")
-      + "The above copyright notice and this permission notice shall be included in all copies or substantial"
-      + System.getProperty("line.separator")
-      + "portions of the Software."
-      + System.getProperty("line.separator")
-      + System.getProperty("line.separator")
-      + "THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,"
-      + System.getProperty("line.separator")
-      + "INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR"
-      + System.getProperty("line.separator")
-      + "PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE"
-      + System.getProperty("line.separator")
-      + "LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR"
-      + System.getProperty("line.separator")
-      + "OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER"
-      + System.getProperty("line.separator")
-      + "DEALINGS IN THE SOFTWARE.";
-
-    public static void main(
-        String[]    args)
-    {
-        System.out.println(licenseText);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/ASN1Boolean.java b/bcprov/src/main/java/org/bouncycastle/asn1/ASN1Boolean.java
index ace3110..30d7d45 100644
--- a/bcprov/src/main/java/org/bouncycastle/asn1/ASN1Boolean.java
+++ b/bcprov/src/main/java/org/bouncycastle/asn1/ASN1Boolean.java
@@ -23,7 +23,9 @@ public class ASN1Boolean
     private static final byte[] TRUE_VALUE = new byte[] { (byte)0xff };
     private static final byte[] FALSE_VALUE = new byte[] { 0 };
 
-    private byte[]         value;
+    // BEGIN android-changed
+    final private byte[]         value;
+    // END android-changed
 
     public static final ASN1Boolean FALSE = new ASN1Boolean(false);
     public static final ASN1Boolean TRUE  = new ASN1Boolean(true);
@@ -79,6 +81,17 @@ public class ASN1Boolean
         return (value != 0 ? TRUE : FALSE);
     }
 
+    // BEGIN android-added
+    /**
+     * return a ASN1Boolean from the passed in array.
+     */
+    public static ASN1Boolean getInstance(
+        byte[] octets)
+    {
+        return (octets[0] != 0) ? TRUE : FALSE;
+    }
+
+    // END android-added
     /**
      * return a Boolean from a tagged object.
      *
@@ -105,7 +118,9 @@ public class ASN1Boolean
         }
     }
 
-    ASN1Boolean(
+    // BEGIN android-changed
+    protected ASN1Boolean(
+    // END android-changed
         byte[] value)
     {
         if (value.length != 1)
@@ -131,8 +146,10 @@ public class ASN1Boolean
      * @deprecated use getInstance(boolean) method.
      * @param value true or false.
      */
-    public ASN1Boolean(
+    // BEGIN android-changed
+    protected ASN1Boolean(
         boolean     value)
+    // END android-changed
     {
         this.value = (value) ? TRUE_VALUE : FALSE_VALUE;
     }
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/ASN1Null.java b/bcprov/src/main/java/org/bouncycastle/asn1/ASN1Null.java
index f39d120..f1098e7 100644
--- a/bcprov/src/main/java/org/bouncycastle/asn1/ASN1Null.java
+++ b/bcprov/src/main/java/org/bouncycastle/asn1/ASN1Null.java
@@ -8,6 +8,12 @@ import java.io.IOException;
 public abstract class ASN1Null
     extends ASN1Primitive
 {
+    // BEGIN android-added
+    /*package*/ ASN1Null()
+    {
+    }
+
+    // END android-added
     /**
      * Return an instance of ASN.1 NULL from the passed in object.
      * <p>
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/ASN1ObjectIdentifier.java b/bcprov/src/main/java/org/bouncycastle/asn1/ASN1ObjectIdentifier.java
index 4de41b7..9d54058 100644
--- a/bcprov/src/main/java/org/bouncycastle/asn1/ASN1ObjectIdentifier.java
+++ b/bcprov/src/main/java/org/bouncycastle/asn1/ASN1ObjectIdentifier.java
@@ -152,7 +152,13 @@ public class ASN1ObjectIdentifier
             }
         }
 
-        this.identifier = objId.toString();
+        // BEGIN android-changed
+        /*
+         * Intern the identifier so there aren't hundreds of duplicates
+         * (in practice).
+         */
+        this.identifier = objId.toString().intern();
+        // END android-changed
         this.body = Arrays.clone(bytes);
     }
 
@@ -173,7 +179,13 @@ public class ASN1ObjectIdentifier
             throw new IllegalArgumentException("string " + identifier + " not an OID");
         }
 
-        this.identifier = identifier;
+        // BEGIN android-changed
+        /*
+         * Intern the identifier so there aren't hundreds of duplicates
+         * (in practice).
+         */
+        this.identifier = identifier.intern();
+        // END android-changed
     }
 
      /**
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/BERSequenceGenerator.java b/bcprov/src/main/java/org/bouncycastle/asn1/BERSequenceGenerator.java
deleted file mode 100644
index 6e27565..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/BERSequenceGenerator.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package org.bouncycastle.asn1;
-
-import java.io.IOException;
-import java.io.OutputStream;
-
-public class BERSequenceGenerator
-    extends BERGenerator
-{
-    public BERSequenceGenerator(
-        OutputStream out) 
-        throws IOException
-    {
-        super(out);
-
-        writeBERHeader(BERTags.CONSTRUCTED | BERTags.SEQUENCE);
-    }
-
-    public BERSequenceGenerator(
-        OutputStream out,
-        int tagNo,
-        boolean isExplicit) 
-        throws IOException
-    {
-        super(out, tagNo, isExplicit);
-        
-        writeBERHeader(BERTags.CONSTRUCTED | BERTags.SEQUENCE);
-    }
-
-    public void addObject(
-        ASN1Encodable object)
-        throws IOException
-    {
-        object.toASN1Primitive().encode(new BEROutputStream(_out));
-    }
-    
-    public void close() 
-        throws IOException
-    {
-        writeBEREnd();
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/DERGenerator.java b/bcprov/src/main/java/org/bouncycastle/asn1/DERGenerator.java
deleted file mode 100644
index 7451ad4..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/DERGenerator.java
+++ /dev/null
@@ -1,119 +0,0 @@
-package org.bouncycastle.asn1;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-import org.bouncycastle.util.io.Streams;
-
-public abstract class DERGenerator
-    extends ASN1Generator
-{       
-    private boolean      _tagged = false;
-    private boolean      _isExplicit;
-    private int          _tagNo;
-    
-    protected DERGenerator(
-        OutputStream out)
-    {
-        super(out);
-    }
-
-    public DERGenerator(
-        OutputStream out,
-        int          tagNo,
-        boolean      isExplicit)
-    { 
-        super(out);
-        
-        _tagged = true;
-        _isExplicit = isExplicit;
-        _tagNo = tagNo;
-    }
-
-    private void writeLength(
-        OutputStream out,
-        int          length)
-        throws IOException
-    {
-        if (length > 127)
-        {
-            int size = 1;
-            int val = length;
-
-            while ((val >>>= 8) != 0)
-            {
-                size++;
-            }
-
-            out.write((byte)(size | 0x80));
-
-            for (int i = (size - 1) * 8; i >= 0; i -= 8)
-            {
-                out.write((byte)(length >> i));
-            }
-        }
-        else
-        {
-            out.write((byte)length);
-        }
-    }
-
-    void writeDEREncoded(
-        OutputStream out,
-        int          tag,
-        byte[]       bytes)
-        throws IOException
-    {
-        out.write(tag);
-        writeLength(out, bytes.length);
-        out.write(bytes);
-    }
-
-    void writeDEREncoded(
-        int       tag,
-        byte[]    bytes)
-        throws IOException
-    {
-        if (_tagged)
-        {
-            int tagNum = _tagNo | BERTags.TAGGED;
-            
-            if (_isExplicit)
-            {
-                int newTag = _tagNo | BERTags.CONSTRUCTED | BERTags.TAGGED;
-
-                ByteArrayOutputStream bOut = new ByteArrayOutputStream();
-                
-                writeDEREncoded(bOut, tag, bytes);
-                
-                writeDEREncoded(_out, newTag, bOut.toByteArray());
-            }
-            else
-            {   
-                if ((tag & BERTags.CONSTRUCTED) != 0)
-                {
-                    writeDEREncoded(_out, tagNum | BERTags.CONSTRUCTED, bytes);
-                }
-                else
-                {
-                    writeDEREncoded(_out, tagNum, bytes);
-                }
-            }
-        }
-        else
-        {
-            writeDEREncoded(_out, tag, bytes);
-        }
-    }
-    
-    void writeDEREncoded(
-        OutputStream out,
-        int          tag,
-        InputStream  in)
-        throws IOException
-    {
-        writeDEREncoded(out, tag, Streams.readAll(in));
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/DERNull.java b/bcprov/src/main/java/org/bouncycastle/asn1/DERNull.java
index 1eb9f45..7df2acf 100644
--- a/bcprov/src/main/java/org/bouncycastle/asn1/DERNull.java
+++ b/bcprov/src/main/java/org/bouncycastle/asn1/DERNull.java
@@ -15,7 +15,9 @@ public class DERNull
     /**
      * @deprecated use DERNull.INSTANCE
      */
-    public DERNull()
+    // BEGIN android-changed
+    protected DERNull()
+    // END android-changed
     {
     }
 
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/DERPrintableString.java b/bcprov/src/main/java/org/bouncycastle/asn1/DERPrintableString.java
index e7c5d75..7d56b49 100644
--- a/bcprov/src/main/java/org/bouncycastle/asn1/DERPrintableString.java
+++ b/bcprov/src/main/java/org/bouncycastle/asn1/DERPrintableString.java
@@ -12,7 +12,9 @@ public class DERPrintableString
     extends ASN1Primitive
     implements ASN1String
 {
-    private byte[]  string;
+    // BEGIN android-changed
+    private final byte[]  string;
+    // END android-changed
 
     /**
      * return a printable string from the passed in object.
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/DERSequenceGenerator.java b/bcprov/src/main/java/org/bouncycastle/asn1/DERSequenceGenerator.java
deleted file mode 100644
index 8cb5271..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/DERSequenceGenerator.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package org.bouncycastle.asn1;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-
-public class DERSequenceGenerator
-    extends DERGenerator
-{
-    private final ByteArrayOutputStream _bOut = new ByteArrayOutputStream();
-
-    public DERSequenceGenerator(
-        OutputStream out)
-        throws IOException
-    {
-        super(out);
-    }
-
-    public DERSequenceGenerator(
-        OutputStream out,
-        int          tagNo,
-        boolean      isExplicit)
-        throws IOException
-    {
-        super(out, tagNo, isExplicit);
-    }
-
-    public void addObject(
-        ASN1Encodable object)
-        throws IOException
-    {
-        object.toASN1Primitive().encode(new DEROutputStream(_bOut));
-    }
-    
-    public OutputStream getRawOutputStream()
-    {
-        return _bOut;
-    }
-    
-    public void close() 
-        throws IOException
-    {
-        writeDEREncoded(BERTags.CONSTRUCTED | BERTags.SEQUENCE, _bOut.toByteArray());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/DERT61UTF8String.java b/bcprov/src/main/java/org/bouncycastle/asn1/DERT61UTF8String.java
deleted file mode 100644
index 784aaa9..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/DERT61UTF8String.java
+++ /dev/null
@@ -1,154 +0,0 @@
-package org.bouncycastle.asn1;
-
-import java.io.IOException;
-
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.Strings;
-
-/**
- * DER T61String (also the teletex string) - a "modern" encapsulation that uses UTF-8. If at all possible, avoid this one! It's only for emergencies.
- * Use UTF8String instead.
- */
-public class DERT61UTF8String
-    extends ASN1Primitive
-    implements ASN1String
-{
-    private byte[] string;
-
-    /**
-     * return a T61 string from the passed in object. UTF-8 Encoding is assumed in this case.
-     *
-     * @param obj a DERT61UTF8String or an object that can be converted into one.
-     * @throws IllegalArgumentException if the object cannot be converted.
-     * @return a DERT61UTF8String instance, or null
-     */
-    public static DERT61UTF8String getInstance(
-        Object obj)
-    {
-        if (obj instanceof DERT61String)
-        {
-            return new DERT61UTF8String(((DERT61String)obj).getOctets());
-        }
-
-        if (obj == null || obj instanceof DERT61UTF8String)
-        {
-            return (DERT61UTF8String)obj;
-        }
-
-        if (obj instanceof byte[])
-        {
-            try
-            {
-                return new DERT61UTF8String(((DERT61String)fromByteArray((byte[])obj)).getOctets());
-            }
-            catch (Exception e)
-            {
-                throw new IllegalArgumentException("encoding error in getInstance: " + e.toString());
-            }
-        }
-
-        throw new IllegalArgumentException("illegal object in getInstance: " + obj.getClass().getName());
-    }
-
-    /**
-     * return an T61 String from a tagged object. UTF-8 encoding is assumed in this case.
-     *
-     * @param obj      the tagged object holding the object we want
-     * @param explicit true if the object is meant to be explicitly
-     *                 tagged false otherwise.
-     * @throws IllegalArgumentException if the tagged object cannot
-     * be converted.
-     * @return a DERT61UTF8String instance, or null
-     */
-    public static DERT61UTF8String getInstance(
-        ASN1TaggedObject obj,
-        boolean explicit)
-    {
-        ASN1Primitive o = obj.getObject();
-
-        if (explicit || o instanceof DERT61String || o instanceof DERT61UTF8String)
-        {
-            return getInstance(o);
-        }
-        else
-        {
-            return new DERT61UTF8String(ASN1OctetString.getInstance(o).getOctets());
-        }
-    }
-
-    /**
-     * basic constructor - string encoded as a sequence of bytes.
-     */
-    public DERT61UTF8String(
-        byte[] string)
-    {
-        this.string = string;
-    }
-
-    /**
-     * basic constructor - with string UTF8 conversion assumed.
-     */
-    public DERT61UTF8String(
-        String string)
-    {
-        this(Strings.toUTF8ByteArray(string));
-    }
-
-    /**
-     * Decode the encoded string and return it, UTF8 assumed.
-     *
-     * @return the decoded String
-     */
-    public String getString()
-    {
-        return Strings.fromUTF8ByteArray(string);
-    }
-
-    public String toString()
-    {
-        return getString();
-    }
-
-    boolean isConstructed()
-    {
-        return false;
-    }
-
-    int encodedLength()
-    {
-        return 1 + StreamUtil.calculateBodyLength(string.length) + string.length;
-    }
-
-    void encode(
-        ASN1OutputStream out)
-        throws IOException
-    {
-        out.writeEncoded(BERTags.T61_STRING, string);
-    }
-
-    /**
-     * Return the encoded string as a byte array.
-     *
-     * @return the actual bytes making up the encoded body of the T61 string.
-     */
-    public byte[] getOctets()
-    {
-        return Arrays.clone(string);
-    }
-
-    boolean asn1Equals(
-        ASN1Primitive o)
-    {
-        if (!(o instanceof DERT61UTF8String))
-        {
-            return false;
-        }
-
-        return Arrays.areEqual(string, ((DERT61UTF8String)o).string);
-    }
-
-    public int hashCode()
-    {
-        return Arrays.hashCode(string);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/StreamUtil.java b/bcprov/src/main/java/org/bouncycastle/asn1/StreamUtil.java
index b6cb070..59e96e8 100644
--- a/bcprov/src/main/java/org/bouncycastle/asn1/StreamUtil.java
+++ b/bcprov/src/main/java/org/bouncycastle/asn1/StreamUtil.java
@@ -8,7 +8,9 @@ import java.nio.channels.FileChannel;
 
 class StreamUtil
 {
-    private static final long  MAX_MEMORY = Runtime.getRuntime().maxMemory();
+    // BEGIN android-removed
+    // private static final long  MAX_MEMORY = Runtime.getRuntime().maxMemory();
+    // END android-removed
 
     /**
      * Find out possible longest length...
@@ -48,12 +50,15 @@ class StreamUtil
             }
         }
 
-        if (MAX_MEMORY > Integer.MAX_VALUE)
+        // BEGIN android-changed
+        long maxMemory = Runtime.getRuntime().maxMemory();
+        if (maxMemory > Integer.MAX_VALUE)
         {
             return Integer.MAX_VALUE;
         }
 
-        return (int)MAX_MEMORY;
+        return (int) maxMemory;
+        // END android-changed
     }
 
     static int calculateBodyLength(
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/bc/package.html b/bcprov/src/main/java/org/bouncycastle/asn1/bc/package.html
deleted file mode 100644
index a8beb00..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/bc/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body bgcolor="#ffffff">
-ASN.1 classes specific to the Bouncy Castle APIs.
-</body>
-</html>
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/bsi/BSIObjectIdentifiers.java b/bcprov/src/main/java/org/bouncycastle/asn1/bsi/BSIObjectIdentifiers.java
deleted file mode 100644
index 315f6c4..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/bsi/BSIObjectIdentifiers.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package org.bouncycastle.asn1.bsi;
-
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-
-/**
- * See https://www.bsi.bund.de/cae/servlet/contentblob/471398/publicationFile/30615/BSI-TR-03111_pdf.pdf
- */
-public interface BSIObjectIdentifiers
-{
-    static final ASN1ObjectIdentifier bsi_de = new ASN1ObjectIdentifier("0.4.0.127.0.7");
-
-    /* 0.4.0.127.0.7.1.1 */
-    static final ASN1ObjectIdentifier id_ecc = bsi_de.branch("1.1");
-    
-    /* 0.4.0.127.0.7.1.1.4.1 */
-    static final ASN1ObjectIdentifier ecdsa_plain_signatures = id_ecc.branch("4.1");
-    
-    /* 0.4.0.127.0.7.1.1.4.1.1 */
-    static final ASN1ObjectIdentifier ecdsa_plain_SHA1 = ecdsa_plain_signatures.branch("1");
-
-    /* 0.4.0.127.0.7.1.1.4.1.2 */
-    static final ASN1ObjectIdentifier ecdsa_plain_SHA224 = ecdsa_plain_signatures.branch("2");
-
-    /* 0.4.0.127.0.7.1.1.4.1.3 */
-    static final ASN1ObjectIdentifier ecdsa_plain_SHA256 = ecdsa_plain_signatures.branch("3");
-
-    /* 0.4.0.127.0.7.1.1.4.1.4 */
-    static final ASN1ObjectIdentifier ecdsa_plain_SHA384 = ecdsa_plain_signatures.branch("4");
-
-    /* 0.4.0.127.0.7.1.1.4.1.5 */
-    static final ASN1ObjectIdentifier ecdsa_plain_SHA512 = ecdsa_plain_signatures.branch("5");
-
-    /* 0.4.0.127.0.7.1.1.4.1.6 */
-    static final ASN1ObjectIdentifier ecdsa_plain_RIPEMD160 = ecdsa_plain_signatures.branch("6");
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/bsi/package.html b/bcprov/src/main/java/org/bouncycastle/asn1/bsi/package.html
deleted file mode 100644
index be9bd80..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/bsi/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body bgcolor="#ffffff">
-ASN.1 classes specific to the Bundesamt f&uuml;r Sicherheit in der Informationstechnik (BSI) standards.
-</body>
-</html>
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/cmp/CAKeyUpdAnnContent.java b/bcprov/src/main/java/org/bouncycastle/asn1/cmp/CAKeyUpdAnnContent.java
deleted file mode 100644
index 41ebd51..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/cmp/CAKeyUpdAnnContent.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package org.bouncycastle.asn1.cmp;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DERSequence;
-
-public class CAKeyUpdAnnContent
-    extends ASN1Object
-{
-    private CMPCertificate oldWithNew;
-    private CMPCertificate newWithOld;
-    private CMPCertificate newWithNew;
-
-    private CAKeyUpdAnnContent(ASN1Sequence seq)
-    {
-        oldWithNew = CMPCertificate.getInstance(seq.getObjectAt(0));
-        newWithOld = CMPCertificate.getInstance(seq.getObjectAt(1));
-        newWithNew = CMPCertificate.getInstance(seq.getObjectAt(2));
-    }
-
-    public static CAKeyUpdAnnContent getInstance(Object o)
-    {
-        if (o instanceof CAKeyUpdAnnContent)
-        {
-            return (CAKeyUpdAnnContent)o;
-        }
-
-        if (o != null)
-        {
-            return new CAKeyUpdAnnContent(ASN1Sequence.getInstance(o));
-        }
-
-        return null;
-    }
-
-    public CAKeyUpdAnnContent(CMPCertificate oldWithNew, CMPCertificate newWithOld, CMPCertificate newWithNew)
-    {
-        this.oldWithNew = oldWithNew;
-        this.newWithOld = newWithOld;
-        this.newWithNew = newWithNew;
-    }
-
-    public CMPCertificate getOldWithNew()
-    {
-        return oldWithNew;
-    }
-
-    public CMPCertificate getNewWithOld()
-    {
-        return newWithOld;
-    }
-
-    public CMPCertificate getNewWithNew()
-    {
-        return newWithNew;
-    }
-
-    /**
-     * <pre>
-     * CAKeyUpdAnnContent ::= SEQUENCE {
-     *                             oldWithNew   CMPCertificate, -- old pub signed with new priv
-     *                             newWithOld   CMPCertificate, -- new pub signed with old priv
-     *                             newWithNew   CMPCertificate  -- new pub signed with new priv
-     *  }
-     * </pre>
-     * @return a basic ASN.1 object representation.
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector v = new ASN1EncodableVector();
-
-        v.add(oldWithNew);
-        v.add(newWithOld);
-        v.add(newWithNew);
-
-        return new DERSequence(v);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/cmp/CMPCertificate.java b/bcprov/src/main/java/org/bouncycastle/asn1/cmp/CMPCertificate.java
deleted file mode 100644
index 782c8c2..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/cmp/CMPCertificate.java
+++ /dev/null
@@ -1,141 +0,0 @@
-package org.bouncycastle.asn1.cmp;
-
-import java.io.IOException;
-
-import org.bouncycastle.asn1.ASN1Choice;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.ASN1TaggedObject;
-import org.bouncycastle.asn1.DERTaggedObject;
-import org.bouncycastle.asn1.x509.AttributeCertificate;
-import org.bouncycastle.asn1.x509.Certificate;
-
-public class CMPCertificate
-    extends ASN1Object
-    implements ASN1Choice
-{
-    private Certificate x509v3PKCert;
-
-    private int        otherTagValue;
-    private ASN1Object otherCert;
-
-    /**
-     * Note: the addition of attribute certificates is a BC extension. If you use this constructor they
-     * will be added with a tag value of 1.
-     * @deprecated use (type. otherCert) constructor
-     */
-    public CMPCertificate(AttributeCertificate x509v2AttrCert)
-    {
-        this(1, x509v2AttrCert);
-    }
-
-    /**
-     * Note: the addition of other certificates is a BC extension. If you use this constructor they
-     * will be added with an explicit tag value of type.
-     *
-     * @param type the type of the certificate (used as a tag value).
-     * @param otherCert the object representing the certificate
-     */
-    public CMPCertificate(int type, ASN1Object otherCert)
-    {
-        this.otherTagValue = type;
-        this.otherCert = otherCert;
-    }
-
-    public CMPCertificate(Certificate x509v3PKCert)
-    {
-        if (x509v3PKCert.getVersionNumber() != 3)
-        {
-            throw new IllegalArgumentException("only version 3 certificates allowed");
-        }
-
-        this.x509v3PKCert = x509v3PKCert;
-    }
-
-    public static CMPCertificate getInstance(Object o)
-    {
-        if (o == null || o instanceof CMPCertificate)
-        {
-            return (CMPCertificate)o;
-        }
-
-        if (o instanceof byte[])
-        {
-            try
-            {
-                o = ASN1Primitive.fromByteArray((byte[])o);
-            }
-            catch (IOException e)
-            {
-                throw new IllegalArgumentException("Invalid encoding in CMPCertificate");
-            }
-        }
-
-        if (o instanceof ASN1Sequence)
-        {
-            return new CMPCertificate(Certificate.getInstance(o));
-        }
-
-        if (o instanceof ASN1TaggedObject)
-        {
-            ASN1TaggedObject taggedObject = (ASN1TaggedObject)o;
-
-            return new CMPCertificate(taggedObject.getTagNo(), taggedObject.getObject());
-        }
-
-        throw new IllegalArgumentException("Invalid object: " + o.getClass().getName());
-    }
-
-    public boolean isX509v3PKCert()
-    {
-         return x509v3PKCert != null;
-    }
-
-    public Certificate getX509v3PKCert()
-    {
-        return x509v3PKCert;
-    }
-
-    /**
-     * Return an AttributeCertificate interpretation of otherCert.
-     * @deprecated use getOtherCert and getOtherTag to make sure message is really what it should be.
-     *
-     * @return  an AttributeCertificate
-     */
-    public AttributeCertificate getX509v2AttrCert()
-    {
-        return AttributeCertificate.getInstance(otherCert);
-    }
-
-    public int getOtherCertTag()
-    {
-        return otherTagValue;
-    }
-
-    public ASN1Object getOtherCert()
-    {
-        return otherCert;
-    }
-
-    /**
-     * <pre>
-     * CMPCertificate ::= CHOICE {
-     *            x509v3PKCert    Certificate
-     *            otherCert      [tag] EXPLICIT ANY DEFINED BY tag
-     *  }
-     * </pre>
-     * Note: the addition of the explicit tagging is a BC extension. We apologise for the warped syntax, but hopefully you get the idea.
-     *
-     * @return a basic ASN.1 object representation.
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        if (otherCert != null)
-        {        // explicit following CMP conventions
-            return new DERTaggedObject(true, otherTagValue, otherCert);
-        }
-
-        return x509v3PKCert.toASN1Primitive();
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/cmp/CMPObjectIdentifiers.java b/bcprov/src/main/java/org/bouncycastle/asn1/cmp/CMPObjectIdentifiers.java
deleted file mode 100644
index 51aba65..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/cmp/CMPObjectIdentifiers.java
+++ /dev/null
@@ -1,141 +0,0 @@
-package org.bouncycastle.asn1.cmp;
-
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-
-public interface CMPObjectIdentifiers
-{
-    // RFC 4210
-
-    /** id-PasswordBasedMac OBJECT IDENTIFIER ::= {1 2 840 113533 7 66 13} */
-    static final ASN1ObjectIdentifier    passwordBasedMac        = new ASN1ObjectIdentifier("1.2.840.113533.7.66.13");
-
-    /** id-DHBasedMac OBJECT IDENTIFIER ::= {1 2 840 113533 7 66 30} */
-    static final ASN1ObjectIdentifier    dhBasedMac              = new ASN1ObjectIdentifier("1.2.840.113533.7.66.30");
-
-    // Example InfoTypeAndValue contents include, but are not limited
-    // to, the following (un-comment in this ASN.1 module and use as
-    // appropriate for a given environment):
-    //
-    //   id-it-caProtEncCert    OBJECT IDENTIFIER ::= {id-it 1}
-    //      CAProtEncCertValue      ::= CMPCertificate
-    //   id-it-signKeyPairTypes OBJECT IDENTIFIER ::= {id-it 2}
-    //      SignKeyPairTypesValue   ::= SEQUENCE OF AlgorithmIdentifier
-    //   id-it-encKeyPairTypes  OBJECT IDENTIFIER ::= {id-it 3}
-    //      EncKeyPairTypesValue    ::= SEQUENCE OF AlgorithmIdentifier
-    //   id-it-preferredSymmAlg OBJECT IDENTIFIER ::= {id-it 4}
-    //      PreferredSymmAlgValue   ::= AlgorithmIdentifier
-    //   id-it-caKeyUpdateInfo  OBJECT IDENTIFIER ::= {id-it 5}
-    //      CAKeyUpdateInfoValue    ::= CAKeyUpdAnnContent
-    //   id-it-currentCRL       OBJECT IDENTIFIER ::= {id-it 6}
-    //      CurrentCRLValue         ::= CertificateList
-    //   id-it-unsupportedOIDs  OBJECT IDENTIFIER ::= {id-it 7}
-    //      UnsupportedOIDsValue    ::= SEQUENCE OF OBJECT IDENTIFIER
-    //   id-it-keyPairParamReq  OBJECT IDENTIFIER ::= {id-it 10}
-    //      KeyPairParamReqValue    ::= OBJECT IDENTIFIER
-    //   id-it-keyPairParamRep  OBJECT IDENTIFIER ::= {id-it 11}
-    //      KeyPairParamRepValue    ::= AlgorithmIdentifer
-    //   id-it-revPassphrase    OBJECT IDENTIFIER ::= {id-it 12}
-    //      RevPassphraseValue      ::= EncryptedValue
-    //   id-it-implicitConfirm  OBJECT IDENTIFIER ::= {id-it 13}
-    //      ImplicitConfirmValue    ::= NULL
-    //   id-it-confirmWaitTime  OBJECT IDENTIFIER ::= {id-it 14}
-    //      ConfirmWaitTimeValue    ::= GeneralizedTime
-    //   id-it-origPKIMessage   OBJECT IDENTIFIER ::= {id-it 15}
-    //      OrigPKIMessageValue     ::= PKIMessages
-    //   id-it-suppLangTags     OBJECT IDENTIFIER ::= {id-it 16}
-    //      SuppLangTagsValue       ::= SEQUENCE OF UTF8String
-    //
-    // where
-    //
-    //   id-pkix OBJECT IDENTIFIER ::= {
-    //      iso(1) identified-organization(3)
-    //      dod(6) internet(1) security(5) mechanisms(5) pkix(7)}
-    // and
-    //   id-it   OBJECT IDENTIFIER ::= {id-pkix 4}
-
-    /** RFC 4120: it-id: PKIX.4 = 1.3.6.1.5.5.7.4 */
-
-    /** RFC 4120: 1.3.6.1.5.5.7.4.1 */
-    static final ASN1ObjectIdentifier    it_caProtEncCert        = new ASN1ObjectIdentifier("1.3.6.1.5.5.7.4.1");
-    /** RFC 4120: 1.3.6.1.5.5.7.4.2 */
-    static final ASN1ObjectIdentifier    it_signKeyPairTypes     = new ASN1ObjectIdentifier("1.3.6.1.5.5.7.4.2");
-    /** RFC 4120: 1.3.6.1.5.5.7.4.3 */
-    static final ASN1ObjectIdentifier    it_encKeyPairTypes      = new ASN1ObjectIdentifier("1.3.6.1.5.5.7.4.3");
-    /** RFC 4120: 1.3.6.1.5.5.7.4.4 */
-    static final ASN1ObjectIdentifier    it_preferredSymAlg      = new ASN1ObjectIdentifier("1.3.6.1.5.5.7.4.4");
-    /** RFC 4120: 1.3.6.1.5.5.7.4.5 */
-    static final ASN1ObjectIdentifier    it_caKeyUpdateInfo      = new ASN1ObjectIdentifier("1.3.6.1.5.5.7.4.5");
-    /** RFC 4120: 1.3.6.1.5.5.7.4.6 */
-    static final ASN1ObjectIdentifier    it_currentCRL           = new ASN1ObjectIdentifier("1.3.6.1.5.5.7.4.6");
-    /** RFC 4120: 1.3.6.1.5.5.7.4.7 */
-    static final ASN1ObjectIdentifier    it_unsupportedOIDs      = new ASN1ObjectIdentifier("1.3.6.1.5.5.7.4.7");
-    /** RFC 4120: 1.3.6.1.5.5.7.4.10 */
-    static final ASN1ObjectIdentifier    it_keyPairParamReq      = new ASN1ObjectIdentifier("1.3.6.1.5.5.7.4.10");
-    /** RFC 4120: 1.3.6.1.5.5.7.4.11 */
-    static final ASN1ObjectIdentifier    it_keyPairParamRep      = new ASN1ObjectIdentifier("1.3.6.1.5.5.7.4.11");
-    /** RFC 4120: 1.3.6.1.5.5.7.4.12 */
-    static final ASN1ObjectIdentifier    it_revPassphrase        = new ASN1ObjectIdentifier("1.3.6.1.5.5.7.4.12");
-    /** RFC 4120: 1.3.6.1.5.5.7.4.13 */
-    static final ASN1ObjectIdentifier    it_implicitConfirm      = new ASN1ObjectIdentifier("1.3.6.1.5.5.7.4.13");
-    /** RFC 4120: 1.3.6.1.5.5.7.4.14 */
-    static final ASN1ObjectIdentifier    it_confirmWaitTime      = new ASN1ObjectIdentifier("1.3.6.1.5.5.7.4.14");
-    /** RFC 4120: 1.3.6.1.5.5.7.4.15 */
-    static final ASN1ObjectIdentifier    it_origPKIMessage       = new ASN1ObjectIdentifier("1.3.6.1.5.5.7.4.15");
-    /** RFC 4120: 1.3.6.1.5.5.7.4.16 */
-    static final ASN1ObjectIdentifier    it_suppLangTags         = new ASN1ObjectIdentifier("1.3.6.1.5.5.7.4.16");
-
-    // RFC 4211
-
-    // id-pkix  OBJECT IDENTIFIER  ::= { iso(1) identified-organization(3)
-    //     dod(6) internet(1) security(5) mechanisms(5) pkix(7) }
-    //
-    // arc for Internet X.509 PKI protocols and their components
-    // id-pkip  OBJECT IDENTIFIER :: { id-pkix pkip(5) }
-    //
-    // arc for Registration Controls in CRMF
-    // id-regCtrl  OBJECT IDENTIFIER ::= { id-pkip regCtrl(1) }
-    //
-    // arc for Registration Info in CRMF
-    // id-regInfo       OBJECT IDENTIFIER ::= { id-pkip id-regInfo(2) }
-
-    /** RFC 4211: it-pkip: PKIX.5 = 1.3.6.1.5.5.7.5 */
-    static final ASN1ObjectIdentifier    id_pkip                 = new ASN1ObjectIdentifier("1.3.6.1.5.5.7.5");
-
-    /** RFC 4211: it-regCtrl: 1.3.6.1.5.5.7.5.1 */
-    static final ASN1ObjectIdentifier    id_regCtrl              = new ASN1ObjectIdentifier("1.3.6.1.5.5.7.5.1");
-    /** RFC 4211: it-regInfo: 1.3.6.1.5.5.7.5.2 */
-    static final ASN1ObjectIdentifier    id_regInfo              = new ASN1ObjectIdentifier("1.3.6.1.5.5.7.5.2");
-
-
-    /** 1.3.6.1.5.5.7.5.1.1 */
-    static final ASN1ObjectIdentifier    regCtrl_regToken        = new ASN1ObjectIdentifier("1.3.6.1.5.5.7.5.1.1");
-    /** 1.3.6.1.5.5.7.5.1.2 */
-    static final ASN1ObjectIdentifier    regCtrl_authenticator   = new ASN1ObjectIdentifier("1.3.6.1.5.5.7.5.1.2");
-    /** 1.3.6.1.5.5.7.5.1.3 */
-    static final ASN1ObjectIdentifier    regCtrl_pkiPublicationInfo = new ASN1ObjectIdentifier("1.3.6.1.5.5.7.5.1.3");
-    /** 1.3.6.1.5.5.7.5.1.4 */
-    static final ASN1ObjectIdentifier    regCtrl_pkiArchiveOptions  = new ASN1ObjectIdentifier("1.3.6.1.5.5.7.5.1.4");
-    /** 1.3.6.1.5.5.7.5.1.5 */
-    static final ASN1ObjectIdentifier    regCtrl_oldCertID       = new ASN1ObjectIdentifier("1.3.6.1.5.5.7.5.1.5");
-    /** 1.3.6.1.5.5.7.5.1.6 */
-    static final ASN1ObjectIdentifier    regCtrl_protocolEncrKey = new ASN1ObjectIdentifier("1.3.6.1.5.5.7.5.1.6");
-
-    /** From RFC4210:
-     * id-regCtrl-altCertTemplate OBJECT IDENTIFIER ::= {id-regCtrl 7}; 1.3.6.1.5.5.7.1.7 */
-    static final ASN1ObjectIdentifier    regCtrl_altCertTemplate = new ASN1ObjectIdentifier("1.3.6.1.5.5.7.5.1.7");
-
-    /** RFC 4211: it-regInfo-utf8Pairs: 1.3.6.1.5.5.7.5.2.1 */
-    static final ASN1ObjectIdentifier    regInfo_utf8Pairs       = new ASN1ObjectIdentifier("1.3.6.1.5.5.7.5.2.1");
-    /** RFC 4211: it-regInfo-certReq: 1.3.6.1.5.5.7.5.2.1 */
-    static final ASN1ObjectIdentifier    regInfo_certReq         = new ASN1ObjectIdentifier("1.3.6.1.5.5.7.5.2.2");
-
-    /**
-     * 1.2.840.113549.1.9.16.1.21
-     * <p>
-     * id-ct   OBJECT IDENTIFIER ::= { id-smime  1 }  -- content types
-     * <p>
-     * id-ct-encKeyWithID OBJECT IDENTIFIER ::= {id-ct 21}
-     */
-    static final ASN1ObjectIdentifier    ct_encKeyWithID         = new ASN1ObjectIdentifier("1.2.840.113549.1.9.16.1.21");
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/cmp/CRLAnnContent.java b/bcprov/src/main/java/org/bouncycastle/asn1/cmp/CRLAnnContent.java
deleted file mode 100644
index 10948ae..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/cmp/CRLAnnContent.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package org.bouncycastle.asn1.cmp;
-
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.x509.CertificateList;
-
-public class CRLAnnContent
-    extends ASN1Object
-{
-    private ASN1Sequence content;
-
-    private CRLAnnContent(ASN1Sequence seq)
-    {
-        content = seq;
-    }
-
-    public static CRLAnnContent getInstance(Object o)
-    {
-        if (o instanceof CRLAnnContent)
-        {
-            return (CRLAnnContent)o;
-        }
-
-        if (o != null)
-        {
-            return new CRLAnnContent(ASN1Sequence.getInstance(o));
-        }
-
-        return null;
-    }
-
-    public CRLAnnContent(CertificateList crl)
-    {
-        this.content = new DERSequence(crl);
-    }
-
-    public CertificateList[] getCertificateLists()
-    {
-        CertificateList[] result = new CertificateList[content.size()];
-
-        for (int i = 0; i != result.length; i++)
-        {
-            result[i] = CertificateList.getInstance(content.getObjectAt(i));
-        }
-
-        return result;
-    }
-
-    /**
-     * <pre>
-     * CRLAnnContent ::= SEQUENCE OF CertificateList
-     * </pre>
-     * @return a basic ASN.1 object representation.
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        return content;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/cmp/CertConfirmContent.java b/bcprov/src/main/java/org/bouncycastle/asn1/cmp/CertConfirmContent.java
deleted file mode 100644
index e4d786f..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/cmp/CertConfirmContent.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package org.bouncycastle.asn1.cmp;
-
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-
-public class CertConfirmContent
-    extends ASN1Object
-{
-    private ASN1Sequence content;
-
-    private CertConfirmContent(ASN1Sequence seq)
-    {
-        content = seq;
-    }
-
-    public static CertConfirmContent getInstance(Object o)
-    {
-        if (o instanceof CertConfirmContent)
-        {
-            return (CertConfirmContent)o;
-        }
-
-        if (o != null)
-        {
-            return new CertConfirmContent(ASN1Sequence.getInstance(o));
-        }
-
-        return null;
-    }
-
-    public CertStatus[] toCertStatusArray()
-    {
-        CertStatus[] result = new CertStatus[content.size()];
-
-        for (int i = 0; i != result.length; i++)
-        {
-            result[i] = CertStatus.getInstance(content.getObjectAt(i));
-        }
-
-        return result;
-    }
-    
-    /**
-     * <pre>
-     * CertConfirmContent ::= SEQUENCE OF CertStatus
-     * </pre>
-     * @return a basic ASN.1 object representation.
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        return content;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/cmp/CertOrEncCert.java b/bcprov/src/main/java/org/bouncycastle/asn1/cmp/CertOrEncCert.java
deleted file mode 100644
index b94a79c..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/cmp/CertOrEncCert.java
+++ /dev/null
@@ -1,96 +0,0 @@
-package org.bouncycastle.asn1.cmp;
-
-import org.bouncycastle.asn1.ASN1Choice;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1TaggedObject;
-import org.bouncycastle.asn1.DERTaggedObject;
-import org.bouncycastle.asn1.crmf.EncryptedValue;
-
-public class CertOrEncCert
-    extends ASN1Object
-    implements ASN1Choice
-{
-    private CMPCertificate certificate;
-    private EncryptedValue encryptedCert;
-
-    private CertOrEncCert(ASN1TaggedObject tagged)
-    {
-        if (tagged.getTagNo() == 0)
-        {
-            certificate = CMPCertificate.getInstance(tagged.getObject());
-        }
-        else if (tagged.getTagNo() == 1)
-        {
-            encryptedCert = EncryptedValue.getInstance(tagged.getObject());
-        }
-        else
-        {
-            throw new IllegalArgumentException("unknown tag: " + tagged.getTagNo());
-        }
-    }
-
-    public static CertOrEncCert getInstance(Object o)
-    {
-        if (o instanceof CertOrEncCert)
-        {
-            return (CertOrEncCert)o;
-        }
-
-        if (o instanceof ASN1TaggedObject)
-        {
-            return new CertOrEncCert((ASN1TaggedObject)o);
-        }
-
-        return null;
-    }
-
-    public CertOrEncCert(CMPCertificate certificate)
-    {
-        if (certificate == null)
-        {
-            throw new IllegalArgumentException("'certificate' cannot be null");
-        }
-
-        this.certificate = certificate;
-    }
-
-    public CertOrEncCert(EncryptedValue encryptedCert)
-    {
-        if (encryptedCert == null)
-        {
-            throw new IllegalArgumentException("'encryptedCert' cannot be null");
-        }
-
-        this.encryptedCert = encryptedCert;
-    }
-
-    public CMPCertificate getCertificate()
-    {
-        return certificate;
-    }
-
-    public EncryptedValue getEncryptedCert()
-    {
-        return encryptedCert;
-    }
-
-    /**
-     * <pre>
-     * CertOrEncCert ::= CHOICE {
-     *                      certificate     [0] CMPCertificate,
-     *                      encryptedCert   [1] EncryptedValue
-     *           }
-     * </pre>
-     * @return a basic ASN.1 object representation.
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        if (certificate != null)
-        {
-            return new DERTaggedObject(true, 0, certificate);
-        }
-
-        return new DERTaggedObject(true, 1, encryptedCert);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/cmp/CertRepMessage.java b/bcprov/src/main/java/org/bouncycastle/asn1/cmp/CertRepMessage.java
deleted file mode 100644
index 6180796..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/cmp/CertRepMessage.java
+++ /dev/null
@@ -1,123 +0,0 @@
-package org.bouncycastle.asn1.cmp;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.ASN1TaggedObject;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.DERTaggedObject;
-
-public class CertRepMessage
-    extends ASN1Object
-{
-    private ASN1Sequence caPubs;
-    private ASN1Sequence response;
-
-    private CertRepMessage(ASN1Sequence seq)
-    {
-        int index = 0;
-
-        if (seq.size() > 1)
-        {
-            caPubs = ASN1Sequence.getInstance((ASN1TaggedObject)seq.getObjectAt(index++), true);
-        }
-
-        response = ASN1Sequence.getInstance(seq.getObjectAt(index));
-    }
-
-    public static CertRepMessage getInstance(Object o)
-    {
-        if (o instanceof CertRepMessage)
-        {
-            return (CertRepMessage)o;
-        }
-
-        if (o != null)
-        {
-            return new CertRepMessage(ASN1Sequence.getInstance(o));
-        }
-
-        return null;
-    }
-
-    public CertRepMessage(CMPCertificate[] caPubs, CertResponse[] response)
-    {
-        if (response == null)
-        {
-            throw new IllegalArgumentException("'response' cannot be null");
-        }
-
-        if (caPubs != null)
-        {
-            ASN1EncodableVector v = new ASN1EncodableVector();
-            for (int i = 0; i < caPubs.length; i++)
-            {
-                v.add(caPubs[i]);
-            }
-            this.caPubs = new DERSequence(v);
-        }
-
-        {
-            ASN1EncodableVector v = new ASN1EncodableVector();
-            for (int i = 0; i < response.length; i++)
-            {
-                v.add(response[i]);
-            }
-            this.response = new DERSequence(v);
-        }
-    }
-
-    public CMPCertificate[] getCaPubs()
-    {
-        if (caPubs == null)
-        {
-            return null;
-        }
-
-        CMPCertificate[] results = new CMPCertificate[caPubs.size()];
-
-        for (int i = 0; i != results.length; i++)
-        {
-            results[i] = CMPCertificate.getInstance(caPubs.getObjectAt(i));
-        }
-
-        return results;
-    }
-
-    public CertResponse[] getResponse()
-    {
-        CertResponse[] results = new CertResponse[response.size()];
-
-        for (int i = 0; i != results.length; i++)
-        {
-            results[i] = CertResponse.getInstance(response.getObjectAt(i));
-        }
-
-        return results;
-    }
-
-    /**
-     * <pre>
-     * CertRepMessage ::= SEQUENCE {
-     *                          caPubs       [1] SEQUENCE SIZE (1..MAX) OF CMPCertificate
-     *                                                                             OPTIONAL,
-     *                          response         SEQUENCE OF CertResponse
-     * }
-     * </pre>
-     * @return a basic ASN.1 object representation.
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector v = new ASN1EncodableVector();
-
-        if (caPubs != null)
-        {
-            v.add(new DERTaggedObject(true, 1, caPubs));
-        }
-
-        v.add(response);
-
-        return new DERSequence(v);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/cmp/CertResponse.java b/bcprov/src/main/java/org/bouncycastle/asn1/cmp/CertResponse.java
deleted file mode 100644
index 794e7bd..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/cmp/CertResponse.java
+++ /dev/null
@@ -1,139 +0,0 @@
-package org.bouncycastle.asn1.cmp;
-
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DERSequence;
-
-public class CertResponse
-    extends ASN1Object
-{
-    private ASN1Integer certReqId;
-    private PKIStatusInfo status;
-    private CertifiedKeyPair certifiedKeyPair;
-    private ASN1OctetString rspInfo;
-
-    private CertResponse(ASN1Sequence seq)
-    {
-        certReqId = ASN1Integer.getInstance(seq.getObjectAt(0));
-        status = PKIStatusInfo.getInstance(seq.getObjectAt(1));
-
-        if (seq.size() >= 3)
-        {
-            if (seq.size() == 3)
-            {
-                ASN1Encodable o = seq.getObjectAt(2);
-                if (o instanceof ASN1OctetString)
-                {
-                    rspInfo = ASN1OctetString.getInstance(o);
-                }
-                else
-                {
-                    certifiedKeyPair = CertifiedKeyPair.getInstance(o);
-                }
-            }
-            else
-            {
-                certifiedKeyPair = CertifiedKeyPair.getInstance(seq.getObjectAt(2));
-                rspInfo = ASN1OctetString.getInstance(seq.getObjectAt(3));
-            }
-        }
-    }
-
-    public static CertResponse getInstance(Object o)
-    {
-        if (o instanceof CertResponse)
-        {
-            return (CertResponse)o;
-        }
-
-        if (o != null)
-        {
-            return new CertResponse(ASN1Sequence.getInstance(o));
-        }
-
-        return null;
-    }
-
-    public CertResponse(
-        ASN1Integer certReqId,
-        PKIStatusInfo status)
-    {
-        this(certReqId, status, null, null);
-    }
-
-    public CertResponse(
-        ASN1Integer certReqId,
-        PKIStatusInfo status,
-        CertifiedKeyPair certifiedKeyPair,
-        ASN1OctetString rspInfo)
-    {
-        if (certReqId == null)
-        {
-            throw new IllegalArgumentException("'certReqId' cannot be null");
-        }
-        if (status == null)
-        {
-            throw new IllegalArgumentException("'status' cannot be null");
-        }
-        this.certReqId = certReqId;
-        this.status = status;
-        this.certifiedKeyPair = certifiedKeyPair;
-        this.rspInfo = rspInfo;
-    }
-
-    public ASN1Integer getCertReqId()
-    {
-        return certReqId;
-    }
-
-    public PKIStatusInfo getStatus()
-    {
-        return status;
-    }
-
-    public CertifiedKeyPair getCertifiedKeyPair()
-    {
-        return certifiedKeyPair;
-    }
-
-    /**
-     * <pre>
-     * CertResponse ::= SEQUENCE {
-     *                            certReqId           INTEGER,
-     *                            -- to match this response with corresponding request (a value
-     *                            -- of -1 is to be used if certReqId is not specified in the
-     *                            -- corresponding request)
-     *                            status              PKIStatusInfo,
-     *                            certifiedKeyPair    CertifiedKeyPair    OPTIONAL,
-     *                            rspInfo             OCTET STRING        OPTIONAL
-     *                            -- analogous to the id-regInfo-utf8Pairs string defined
-     *                            -- for regInfo in CertReqMsg [CRMF]
-     *             }
-     * </pre> 
-     * @return a basic ASN.1 object representation.
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector v = new ASN1EncodableVector();
-
-        v.add(certReqId);
-        v.add(status);
-
-        if (certifiedKeyPair != null)
-        {
-            v.add(certifiedKeyPair);
-        }
-
-        if (rspInfo != null)
-        {
-            v.add(rspInfo);
-        }
-        
-        return new DERSequence(v);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/cmp/CertStatus.java b/bcprov/src/main/java/org/bouncycastle/asn1/cmp/CertStatus.java
deleted file mode 100644
index c92b2a2..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/cmp/CertStatus.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package org.bouncycastle.asn1.cmp;
-
-import java.math.BigInteger;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DEROctetString;
-import org.bouncycastle.asn1.DERSequence;
-
-public class CertStatus
-    extends ASN1Object
-{
-    private ASN1OctetString certHash;
-    private ASN1Integer certReqId;
-    private PKIStatusInfo statusInfo;
-
-    private CertStatus(ASN1Sequence seq)
-    {
-        certHash = ASN1OctetString.getInstance(seq.getObjectAt(0));
-        certReqId = ASN1Integer.getInstance(seq.getObjectAt(1));
-
-        if (seq.size() > 2)
-        {
-            statusInfo = PKIStatusInfo.getInstance(seq.getObjectAt(2));
-        }
-    }
-
-    public CertStatus(byte[] certHash, BigInteger certReqId)
-    {
-        this.certHash = new DEROctetString(certHash);
-        this.certReqId = new ASN1Integer(certReqId);
-    }
-
-    public CertStatus(byte[] certHash, BigInteger certReqId, PKIStatusInfo statusInfo)
-    {
-        this.certHash = new DEROctetString(certHash);
-        this.certReqId = new ASN1Integer(certReqId);
-        this.statusInfo = statusInfo;
-    }
-
-    public static CertStatus getInstance(Object o)
-    {
-        if (o instanceof CertStatus)
-        {
-            return (CertStatus)o;
-        }
-
-        if (o != null)
-        {
-            return new CertStatus(ASN1Sequence.getInstance(o));
-        }
-
-        return null;
-    }
-
-    public ASN1OctetString getCertHash()
-    {
-        return certHash;
-    }
-
-    public ASN1Integer getCertReqId()
-    {
-        return certReqId;
-    }
-
-    public PKIStatusInfo getStatusInfo()
-    {
-        return statusInfo;
-    }
-
-    /**
-     * <pre>
-     * CertStatus ::= SEQUENCE {
-     *                   certHash    OCTET STRING,
-     *                   -- the hash of the certificate, using the same hash algorithm
-     *                   -- as is used to create and verify the certificate signature
-     *                   certReqId   INTEGER,
-     *                   -- to match this confirmation with the corresponding req/rep
-     *                   statusInfo  PKIStatusInfo OPTIONAL
-     * }
-     * </pre>
-     * @return a basic ASN.1 object representation.
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector v = new ASN1EncodableVector();
-
-        v.add(certHash);
-        v.add(certReqId);
-
-        if (statusInfo != null)
-        {
-            v.add(statusInfo);
-        }
-
-        return new DERSequence(v);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/cmp/CertifiedKeyPair.java b/bcprov/src/main/java/org/bouncycastle/asn1/cmp/CertifiedKeyPair.java
deleted file mode 100644
index 949ad73..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/cmp/CertifiedKeyPair.java
+++ /dev/null
@@ -1,127 +0,0 @@
-package org.bouncycastle.asn1.cmp;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.ASN1TaggedObject;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.DERTaggedObject;
-import org.bouncycastle.asn1.crmf.EncryptedValue;
-import org.bouncycastle.asn1.crmf.PKIPublicationInfo;
-
-public class CertifiedKeyPair
-    extends ASN1Object
-{
-    private CertOrEncCert certOrEncCert;
-    private EncryptedValue privateKey;
-    private PKIPublicationInfo  publicationInfo;
-
-    private CertifiedKeyPair(ASN1Sequence seq)
-    {
-        certOrEncCert = CertOrEncCert.getInstance(seq.getObjectAt(0));
-
-        if (seq.size() >= 2)
-        {
-            if (seq.size() == 2)
-            {
-                ASN1TaggedObject tagged = ASN1TaggedObject.getInstance(seq.getObjectAt(1));
-                if (tagged.getTagNo() == 0)
-                {
-                    privateKey = EncryptedValue.getInstance(tagged.getObject());
-                }
-                else
-                {
-                    publicationInfo = PKIPublicationInfo.getInstance(tagged.getObject());
-                }
-            }
-            else
-            {
-                privateKey = EncryptedValue.getInstance(ASN1TaggedObject.getInstance(seq.getObjectAt(1)));
-                publicationInfo = PKIPublicationInfo.getInstance(ASN1TaggedObject.getInstance(seq.getObjectAt(2)));
-            }
-        }
-    }
-
-    public static CertifiedKeyPair getInstance(Object o)
-    {
-        if (o instanceof CertifiedKeyPair)
-        {
-            return (CertifiedKeyPair)o;
-        }
-
-        if (o != null)
-        {
-            return new CertifiedKeyPair(ASN1Sequence.getInstance(o));
-        }
-
-        return null;
-    }
-
-    public CertifiedKeyPair(
-        CertOrEncCert certOrEncCert)
-    {
-        this(certOrEncCert, null, null);
-    }
-
-    public CertifiedKeyPair(
-        CertOrEncCert certOrEncCert,
-        EncryptedValue privateKey,
-        PKIPublicationInfo  publicationInfo
-        )
-    {
-        if (certOrEncCert == null)
-        {
-            throw new IllegalArgumentException("'certOrEncCert' cannot be null");
-        }
-
-        this.certOrEncCert = certOrEncCert;
-        this.privateKey = privateKey;
-        this.publicationInfo = publicationInfo;
-    }
-
-    public CertOrEncCert getCertOrEncCert()
-    {
-        return certOrEncCert;
-    }
-
-    public EncryptedValue getPrivateKey()
-    {
-        return privateKey;
-    }
-
-    public PKIPublicationInfo getPublicationInfo()
-    {
-        return publicationInfo;
-    }
-
-    /**
-     * <pre>
-     * CertifiedKeyPair ::= SEQUENCE {
-     *                                  certOrEncCert       CertOrEncCert,
-     *                                  privateKey      [0] EncryptedValue      OPTIONAL,
-     *                                  -- see [CRMF] for comment on encoding
-     *                                  publicationInfo [1] PKIPublicationInfo  OPTIONAL
-     *       }
-     * </pre>
-     * @return a basic ASN.1 object representation.
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector v = new ASN1EncodableVector();
-
-        v.add(certOrEncCert);
-
-        if (privateKey != null)
-        {
-            v.add(new DERTaggedObject(true, 0, privateKey));
-        }
-
-        if (publicationInfo != null)
-        {
-            v.add(new DERTaggedObject(true, 1, publicationInfo));
-        }
-
-        return new DERSequence(v);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/cmp/Challenge.java b/bcprov/src/main/java/org/bouncycastle/asn1/cmp/Challenge.java
deleted file mode 100644
index 60eb1ba..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/cmp/Challenge.java
+++ /dev/null
@@ -1,120 +0,0 @@
-package org.bouncycastle.asn1.cmp;
-
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DEROctetString;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-
-public class Challenge
-    extends ASN1Object
-{
-    private AlgorithmIdentifier owf;
-    private ASN1OctetString witness;
-    private ASN1OctetString challenge;
-
-    private Challenge(ASN1Sequence seq)
-    {
-        int index = 0;
-
-        if (seq.size() == 3)
-        {
-            owf = AlgorithmIdentifier.getInstance(seq.getObjectAt(index++));
-        }
-
-        witness = ASN1OctetString.getInstance(seq.getObjectAt(index++));
-        challenge = ASN1OctetString.getInstance(seq.getObjectAt(index));
-    }
-
-    public static Challenge getInstance(Object o)
-    {
-        if (o instanceof Challenge)
-        {
-            return (Challenge)o;
-        }
-
-        if (o != null)
-        {
-            return new Challenge(ASN1Sequence.getInstance(o));
-        }
-
-        return null;
-    }
-
-    public Challenge(byte[] witness, byte[] challenge)
-    {
-        this(null, witness, challenge);
-    }
-
-    public Challenge(AlgorithmIdentifier owf, byte[] witness, byte[] challenge)
-    {
-        this.owf = owf;
-        this.witness = new DEROctetString(witness);
-        this.challenge = new DEROctetString(challenge);
-    }
-
-    public AlgorithmIdentifier getOwf()
-    {
-        return owf;
-    }
-
-    public byte[] getWitness()
-    {
-        return witness.getOctets();
-    }
-
-    public byte[] getChallenge()
-    {
-        return challenge.getOctets();
-    }
-
-    /**
-     * <pre>
-     * Challenge ::= SEQUENCE {
-     *                 owf                 AlgorithmIdentifier  OPTIONAL,
-     *
-     *                 -- MUST be present in the first Challenge; MAY be omitted in
-     *                 -- any subsequent Challenge in POPODecKeyChallContent (if
-     *                 -- omitted, then the owf used in the immediately preceding
-     *                 -- Challenge is to be used).
-     *
-     *                 witness             OCTET STRING,
-     *                 -- the result of applying the one-way function (owf) to a
-     *                 -- randomly-generated INTEGER, A.  [Note that a different
-     *                 -- INTEGER MUST be used for each Challenge.]
-     *                 challenge           OCTET STRING
-     *                 -- the encryption (under the public key for which the cert.
-     *                 -- request is being made) of Rand, where Rand is specified as
-     *                 --   Rand ::= SEQUENCE {
-     *                 --      int      INTEGER,
-     *                 --       - the randomly-generated INTEGER A (above)
-     *                 --      sender   GeneralName
-     *                 --       - the sender's name (as included in PKIHeader)
-     *                 --   }
-     *      }
-     * </pre>
-     * @return a basic ASN.1 object representation.
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector v = new ASN1EncodableVector();
-
-        addOptional(v, owf);
-        v.add(witness);
-        v.add(challenge);
-
-        return new DERSequence(v);
-    }
-
-    private void addOptional(ASN1EncodableVector v, ASN1Encodable obj)
-    {
-        if (obj != null)
-        {
-            v.add(obj);
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/cmp/ErrorMsgContent.java b/bcprov/src/main/java/org/bouncycastle/asn1/cmp/ErrorMsgContent.java
deleted file mode 100644
index 5dc1ac3..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/cmp/ErrorMsgContent.java
+++ /dev/null
@@ -1,121 +0,0 @@
-package org.bouncycastle.asn1.cmp;
-
-import java.util.Enumeration;
-
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DERSequence;
-
-public class ErrorMsgContent
-    extends ASN1Object
-{
-    private PKIStatusInfo pkiStatusInfo;
-    private ASN1Integer errorCode;
-    private PKIFreeText errorDetails;
-
-    private ErrorMsgContent(ASN1Sequence seq)
-    {
-        Enumeration en = seq.getObjects();
-
-        pkiStatusInfo = PKIStatusInfo.getInstance(en.nextElement());
-
-        while (en.hasMoreElements())
-        {
-            Object o = en.nextElement();
-
-            if (o instanceof ASN1Integer)
-            {
-                errorCode = ASN1Integer.getInstance(o);
-            }
-            else
-            {
-                errorDetails = PKIFreeText.getInstance(o);
-            }
-        }
-    }
-
-    public static ErrorMsgContent getInstance(Object o)
-    {
-        if (o instanceof ErrorMsgContent)
-        {
-            return (ErrorMsgContent)o;
-        }
-
-        if (o != null)
-        {
-            return new ErrorMsgContent(ASN1Sequence.getInstance(o));
-        }
-
-        return null;
-    }
-
-    public ErrorMsgContent(PKIStatusInfo pkiStatusInfo)
-    {
-        this(pkiStatusInfo, null, null);
-    }
-
-    public ErrorMsgContent(
-        PKIStatusInfo pkiStatusInfo,
-        ASN1Integer errorCode,
-        PKIFreeText errorDetails)
-    {
-        if (pkiStatusInfo == null)
-        {
-            throw new IllegalArgumentException("'pkiStatusInfo' cannot be null");
-        }
-
-        this.pkiStatusInfo = pkiStatusInfo;
-        this.errorCode = errorCode;
-        this.errorDetails = errorDetails;
-    }
-
-    public PKIStatusInfo getPKIStatusInfo()
-    {
-        return pkiStatusInfo;
-    }
-
-    public ASN1Integer getErrorCode()
-    {
-        return errorCode;
-    }
-
-    public PKIFreeText getErrorDetails()
-    {
-        return errorDetails;
-    }
-
-    /**
-     * <pre>
-     * ErrorMsgContent ::= SEQUENCE {
-     *                        pKIStatusInfo          PKIStatusInfo,
-     *                        errorCode              INTEGER           OPTIONAL,
-     *                        -- implementation-specific error codes
-     *                        errorDetails           PKIFreeText       OPTIONAL
-     *                        -- implementation-specific error details
-     * }
-     * </pre>
-     * @return a basic ASN.1 object representation.
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector v = new ASN1EncodableVector();
-
-        v.add(pkiStatusInfo);
-        addOptional(v, errorCode);
-        addOptional(v, errorDetails);
-
-        return new DERSequence(v);
-    }
-
-    private void addOptional(ASN1EncodableVector v, ASN1Encodable obj)
-    {
-        if (obj != null)
-        {
-            v.add(obj);
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/cmp/GenMsgContent.java b/bcprov/src/main/java/org/bouncycastle/asn1/cmp/GenMsgContent.java
deleted file mode 100644
index 109d180..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/cmp/GenMsgContent.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package org.bouncycastle.asn1.cmp;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DERSequence;
-
-public class GenMsgContent
-    extends ASN1Object
-{
-    private ASN1Sequence content;
-
-    private GenMsgContent(ASN1Sequence seq)
-    {
-        content = seq;
-    }
-
-    public static GenMsgContent getInstance(Object o)
-    {
-        if (o instanceof GenMsgContent)
-        {
-            return (GenMsgContent)o;
-        }
-
-        if (o != null)
-        {
-            return new GenMsgContent(ASN1Sequence.getInstance(o));
-        }
-
-        return null;
-    }
-
-    public GenMsgContent(InfoTypeAndValue itv)
-    {
-        content = new DERSequence(itv);
-    }
-
-    public GenMsgContent(InfoTypeAndValue[] itv)
-    {
-        ASN1EncodableVector v = new ASN1EncodableVector();
-        for (int i = 0; i < itv.length; i++)
-        {
-            v.add(itv[i]);
-        }
-        content = new DERSequence(v);
-    }
-
-    public InfoTypeAndValue[] toInfoTypeAndValueArray()
-    {
-        InfoTypeAndValue[] result = new InfoTypeAndValue[content.size()];
-
-        for (int i = 0; i != result.length; i++)
-        {
-            result[i] = InfoTypeAndValue.getInstance(content.getObjectAt(i));
-        }
-
-        return result;
-    }
-
-    /**
-     * <pre>
-     * GenMsgContent ::= SEQUENCE OF InfoTypeAndValue
-     * </pre>
-     * @return a basic ASN.1 object representation.
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        return content;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/cmp/GenRepContent.java b/bcprov/src/main/java/org/bouncycastle/asn1/cmp/GenRepContent.java
deleted file mode 100644
index aca4d30..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/cmp/GenRepContent.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package org.bouncycastle.asn1.cmp;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DERSequence;
-
-public class GenRepContent
-    extends ASN1Object
-{
-    private ASN1Sequence content;
-
-    private GenRepContent(ASN1Sequence seq)
-    {
-        content = seq;
-    }
-
-    public static GenRepContent getInstance(Object o)
-    {
-        if (o instanceof GenRepContent)
-        {
-            return (GenRepContent)o;
-        }
-
-        if (o != null)
-        {
-            return new GenRepContent(ASN1Sequence.getInstance(o));
-        }
-
-        return null;
-    }
-
-    public GenRepContent(InfoTypeAndValue itv)
-    {
-        content = new DERSequence(itv);
-    }
-
-    public GenRepContent(InfoTypeAndValue[] itv)
-    {
-        ASN1EncodableVector v = new ASN1EncodableVector();
-        for (int i = 0; i < itv.length; i++)
-        {
-            v.add(itv[i]);
-        }
-        content = new DERSequence(v);
-    }
-
-    public InfoTypeAndValue[] toInfoTypeAndValueArray()
-    {
-        InfoTypeAndValue[] result = new InfoTypeAndValue[content.size()];
-
-        for (int i = 0; i != result.length; i++)
-        {
-            result[i] = InfoTypeAndValue.getInstance(content.getObjectAt(i));
-        }
-
-        return result;
-    }
-
-    /**
-     * <pre>
-     * GenRepContent ::= SEQUENCE OF InfoTypeAndValue
-     * </pre>
-     * @return a basic ASN.1 object representation.
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        return content;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/cmp/InfoTypeAndValue.java b/bcprov/src/main/java/org/bouncycastle/asn1/cmp/InfoTypeAndValue.java
deleted file mode 100644
index 9405462..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/cmp/InfoTypeAndValue.java
+++ /dev/null
@@ -1,132 +0,0 @@
-package org.bouncycastle.asn1.cmp;
-
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DERSequence;
-
-/**
- * Example InfoTypeAndValue contents include, but are not limited
- * to, the following (un-comment in this ASN.1 module and use as
- * appropriate for a given environment):
- * <pre>
- *   id-it-caProtEncCert    OBJECT IDENTIFIER ::= {id-it 1}
- *      CAProtEncCertValue      ::= CMPCertificate
- *   id-it-signKeyPairTypes OBJECT IDENTIFIER ::= {id-it 2}
- *     SignKeyPairTypesValue   ::= SEQUENCE OF AlgorithmIdentifier
- *   id-it-encKeyPairTypes  OBJECT IDENTIFIER ::= {id-it 3}
- *     EncKeyPairTypesValue    ::= SEQUENCE OF AlgorithmIdentifier
- *   id-it-preferredSymmAlg OBJECT IDENTIFIER ::= {id-it 4}
- *      PreferredSymmAlgValue   ::= AlgorithmIdentifier
- *   id-it-caKeyUpdateInfo  OBJECT IDENTIFIER ::= {id-it 5}
- *      CAKeyUpdateInfoValue    ::= CAKeyUpdAnnContent
- *   id-it-currentCRL       OBJECT IDENTIFIER ::= {id-it 6}
- *      CurrentCRLValue         ::= CertificateList
- *   id-it-unsupportedOIDs  OBJECT IDENTIFIER ::= {id-it 7}
- *      UnsupportedOIDsValue    ::= SEQUENCE OF OBJECT IDENTIFIER
- *   id-it-keyPairParamReq  OBJECT IDENTIFIER ::= {id-it 10}
- *      KeyPairParamReqValue    ::= OBJECT IDENTIFIER
- *   id-it-keyPairParamRep  OBJECT IDENTIFIER ::= {id-it 11}
- *      KeyPairParamRepValue    ::= AlgorithmIdentifer
- *   id-it-revPassphrase    OBJECT IDENTIFIER ::= {id-it 12}
- *      RevPassphraseValue      ::= EncryptedValue
- *   id-it-implicitConfirm  OBJECT IDENTIFIER ::= {id-it 13}
- *      ImplicitConfirmValue    ::= NULL
- *   id-it-confirmWaitTime  OBJECT IDENTIFIER ::= {id-it 14}
- *      ConfirmWaitTimeValue    ::= GeneralizedTime
- *   id-it-origPKIMessage   OBJECT IDENTIFIER ::= {id-it 15}
- *      OrigPKIMessageValue     ::= PKIMessages
- *   id-it-suppLangTags     OBJECT IDENTIFIER ::= {id-it 16}
- *      SuppLangTagsValue       ::= SEQUENCE OF UTF8String
- *
- * where
- *
- *   id-pkix OBJECT IDENTIFIER ::= {
- *      iso(1) identified-organization(3)
- *      dod(6) internet(1) security(5) mechanisms(5) pkix(7)}
- * and
- *      id-it   OBJECT IDENTIFIER ::= {id-pkix 4}
- * </pre>
- */
-public class InfoTypeAndValue
-    extends ASN1Object
-{
-    private ASN1ObjectIdentifier infoType;
-    private ASN1Encodable       infoValue;
-
-    private InfoTypeAndValue(ASN1Sequence seq)
-    {
-        infoType = ASN1ObjectIdentifier.getInstance(seq.getObjectAt(0));
-
-        if (seq.size() > 1)
-        {
-            infoValue = (ASN1Encodable)seq.getObjectAt(1);
-        }
-    }
-
-    public static InfoTypeAndValue getInstance(Object o)
-    {
-        if (o instanceof InfoTypeAndValue)
-        {
-            return (InfoTypeAndValue)o;
-        }
-
-        if (o != null)
-        {
-            return new InfoTypeAndValue(ASN1Sequence.getInstance(o));
-        }
-
-        return null;
-    }
-
-    public InfoTypeAndValue(
-        ASN1ObjectIdentifier infoType)
-    {
-        this.infoType = infoType;
-        this.infoValue = null;
-    }
-
-    public InfoTypeAndValue(
-        ASN1ObjectIdentifier infoType,
-        ASN1Encodable optionalValue)
-    {
-        this.infoType = infoType;
-        this.infoValue = optionalValue;
-    }
-
-    public ASN1ObjectIdentifier getInfoType()
-    {
-        return infoType;
-    }
-
-    public ASN1Encodable getInfoValue()
-    {
-        return infoValue;
-    }
-
-    /**
-     * <pre>
-     * InfoTypeAndValue ::= SEQUENCE {
-     *                         infoType               OBJECT IDENTIFIER,
-     *                         infoValue              ANY DEFINED BY infoType  OPTIONAL
-     * }
-     * </pre>
-     * @return a basic ASN.1 object representation.
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector v = new ASN1EncodableVector();
-
-        v.add(infoType);
-
-        if (infoValue != null)
-        {
-            v.add(infoValue);
-        }
-
-        return new DERSequence(v);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/cmp/KeyRecRepContent.java b/bcprov/src/main/java/org/bouncycastle/asn1/cmp/KeyRecRepContent.java
deleted file mode 100644
index 3bc5032..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/cmp/KeyRecRepContent.java
+++ /dev/null
@@ -1,142 +0,0 @@
-package org.bouncycastle.asn1.cmp;
-
-import java.util.Enumeration;
-
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.ASN1TaggedObject;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.DERTaggedObject;
-
-public class KeyRecRepContent
-    extends ASN1Object
-{
-    private PKIStatusInfo status;
-    private CMPCertificate newSigCert;
-    private ASN1Sequence caCerts;
-    private ASN1Sequence keyPairHist;
-
-    private KeyRecRepContent(ASN1Sequence seq)
-    {
-        Enumeration en = seq.getObjects();
-
-        status = PKIStatusInfo.getInstance(en.nextElement());
-
-        while (en.hasMoreElements())
-        {
-            ASN1TaggedObject tObj = ASN1TaggedObject.getInstance(en.nextElement());
-
-            switch (tObj.getTagNo())
-            {
-            case 0:
-                newSigCert = CMPCertificate.getInstance(tObj.getObject());
-                break;
-            case 1:
-                caCerts = ASN1Sequence.getInstance(tObj.getObject());
-                break;
-            case 2:
-                keyPairHist = ASN1Sequence.getInstance(tObj.getObject());
-                break;
-            default:
-                throw new IllegalArgumentException("unknown tag number: " + tObj.getTagNo());
-            }
-        }
-    }
-
-    public static KeyRecRepContent getInstance(Object o)
-    {
-        if (o instanceof KeyRecRepContent)
-        {
-            return (KeyRecRepContent)o;
-        }
-
-        if (o != null)
-        {
-            return new KeyRecRepContent(ASN1Sequence.getInstance(o));
-        }
-
-        return null;
-    }
-
-
-    public PKIStatusInfo getStatus()
-    {
-        return status;
-    }
-
-    public CMPCertificate getNewSigCert()
-    {
-        return newSigCert;
-    }
-
-    public CMPCertificate[] getCaCerts()
-    {
-        if (caCerts == null)
-        {
-            return null;
-        }
-
-        CMPCertificate[] results = new CMPCertificate[caCerts.size()];
-
-        for (int i = 0; i != results.length; i++)
-        {
-            results[i] = CMPCertificate.getInstance(caCerts.getObjectAt(i));
-        }
-
-        return results;
-    }
-
-    public CertifiedKeyPair[] getKeyPairHist()
-    {
-        if (keyPairHist == null)
-        {
-            return null;
-        }
-
-        CertifiedKeyPair[] results = new CertifiedKeyPair[keyPairHist.size()];
-
-        for (int i = 0; i != results.length; i++)
-        {
-            results[i] = CertifiedKeyPair.getInstance(keyPairHist.getObjectAt(i));
-        }
-
-        return results;
-    }
-
-    /**
-     * <pre>
-     * KeyRecRepContent ::= SEQUENCE {
-     *                         status                  PKIStatusInfo,
-     *                         newSigCert          [0] CMPCertificate OPTIONAL,
-     *                         caCerts             [1] SEQUENCE SIZE (1..MAX) OF
-     *                                                           CMPCertificate OPTIONAL,
-     *                         keyPairHist         [2] SEQUENCE SIZE (1..MAX) OF
-     *                                                           CertifiedKeyPair OPTIONAL
-     *              }
-     * </pre> 
-     * @return a basic ASN.1 object representation.
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector v = new ASN1EncodableVector();
-
-        v.add(status);
-
-        addOptional(v, 0, newSigCert);
-        addOptional(v, 1, caCerts);
-        addOptional(v, 2, keyPairHist);
-
-        return new DERSequence(v);
-    }
-
-    private void addOptional(ASN1EncodableVector v, int tagNo, ASN1Encodable obj)
-    {
-        if (obj != null)
-        {
-            v.add(new DERTaggedObject(true, tagNo, obj));
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/cmp/OOBCertHash.java b/bcprov/src/main/java/org/bouncycastle/asn1/cmp/OOBCertHash.java
deleted file mode 100644
index fd833c4..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/cmp/OOBCertHash.java
+++ /dev/null
@@ -1,117 +0,0 @@
-package org.bouncycastle.asn1.cmp;
-
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.ASN1TaggedObject;
-import org.bouncycastle.asn1.DERBitString;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.DERTaggedObject;
-import org.bouncycastle.asn1.crmf.CertId;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-
-public class OOBCertHash
-    extends ASN1Object
-{
-    private AlgorithmIdentifier hashAlg;
-    private CertId certId;
-    private DERBitString  hashVal;
-
-    private OOBCertHash(ASN1Sequence seq)
-    {
-        int index = seq.size() - 1;
-
-        hashVal = DERBitString.getInstance(seq.getObjectAt(index--));
-
-        for (int i = index; i >= 0; i--)
-        {
-            ASN1TaggedObject tObj = (ASN1TaggedObject)seq.getObjectAt(i);
-
-            if (tObj.getTagNo() == 0)
-            {
-                hashAlg = AlgorithmIdentifier.getInstance(tObj, true);
-            }
-            else
-            {
-                certId = CertId.getInstance(tObj, true);
-            }
-        }
-
-    }
-
-    public static OOBCertHash getInstance(Object o)
-    {
-        if (o instanceof OOBCertHash)
-        {
-            return (OOBCertHash)o;
-        }
-
-        if (o != null)
-        {
-            return new OOBCertHash(ASN1Sequence.getInstance(o));
-        }
-
-        return null;
-    }
-
-    public OOBCertHash(AlgorithmIdentifier hashAlg, CertId certId, byte[] hashVal)
-    {
-        this(hashAlg, certId, new DERBitString(hashVal));
-    }
-
-    public OOBCertHash(AlgorithmIdentifier hashAlg, CertId certId, DERBitString hashVal)
-    {
-        this.hashAlg = hashAlg;
-        this.certId = certId;
-        this.hashVal = hashVal;
-    }
-
-    public AlgorithmIdentifier getHashAlg()
-    {
-        return hashAlg;
-    }
-
-    public CertId getCertId()
-    {
-        return certId;
-    }
-
-    public DERBitString getHashVal()
-    {
-        return hashVal;
-    }
-
-    /**
-     * <pre>
-     * OOBCertHash ::= SEQUENCE {
-     *                      hashAlg     [0] AlgorithmIdentifier     OPTIONAL,
-     *                      certId      [1] CertId                  OPTIONAL,
-     *                      hashVal         BIT STRING
-     *                      -- hashVal is calculated over the DER encoding of the
-     *                      -- self-signed certificate with the identifier certID.
-     *       }
-     * </pre>
-     * @return a basic ASN.1 object representation.
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector v = new ASN1EncodableVector();
-
-        addOptional(v, 0, hashAlg);
-        addOptional(v, 1, certId);
-
-        v.add(hashVal);
-
-        return new DERSequence(v);
-    }
-
-    private void addOptional(ASN1EncodableVector v, int tagNo, ASN1Encodable obj)
-    {
-        if (obj != null)
-        {
-            v.add(new DERTaggedObject(true, tagNo, obj));
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/cmp/PBMParameter.java b/bcprov/src/main/java/org/bouncycastle/asn1/cmp/PBMParameter.java
deleted file mode 100644
index fdf2c25..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/cmp/PBMParameter.java
+++ /dev/null
@@ -1,117 +0,0 @@
-package org.bouncycastle.asn1.cmp;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DEROctetString;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-
-public class PBMParameter
-    extends ASN1Object
-{
-    private ASN1OctetString salt;
-    private AlgorithmIdentifier owf;
-    private ASN1Integer iterationCount;
-    private AlgorithmIdentifier mac;
-
-    private PBMParameter(ASN1Sequence seq)
-    {
-        salt = ASN1OctetString.getInstance(seq.getObjectAt(0));
-        owf = AlgorithmIdentifier.getInstance(seq.getObjectAt(1));
-        iterationCount = ASN1Integer.getInstance(seq.getObjectAt(2));
-        mac = AlgorithmIdentifier.getInstance(seq.getObjectAt(3));
-    }
-
-    public static PBMParameter getInstance(Object o)
-    {
-        if (o instanceof PBMParameter)
-        {
-            return (PBMParameter)o;
-        }
-
-        if (o != null)
-        {
-            return new PBMParameter(ASN1Sequence.getInstance(o));
-        }
-
-        return null;
-    }
-
-    public PBMParameter(
-        byte[] salt,
-        AlgorithmIdentifier owf,
-        int iterationCount,
-        AlgorithmIdentifier mac)
-    {
-        this(new DEROctetString(salt), owf,
-             new ASN1Integer(iterationCount), mac);
-    }
-
-    public PBMParameter(
-        ASN1OctetString salt,
-        AlgorithmIdentifier owf,
-        ASN1Integer iterationCount,
-        AlgorithmIdentifier mac)
-    {
-        this.salt = salt;
-        this.owf = owf;
-        this.iterationCount = iterationCount;
-        this.mac = mac;
-    }
-
-    public ASN1OctetString getSalt()
-    {
-        return salt;
-    }
-
-    public AlgorithmIdentifier getOwf()
-    {
-        return owf;
-    }
-
-    public ASN1Integer getIterationCount()
-    {
-        return iterationCount;
-    }
-
-    public AlgorithmIdentifier getMac()
-    {
-        return mac;
-    }
-
-    /**
-     * <pre>
-     *  PBMParameter ::= SEQUENCE {
-     *                        salt                OCTET STRING,
-     *                        -- note:  implementations MAY wish to limit acceptable sizes
-     *                        -- of this string to values appropriate for their environment
-     *                        -- in order to reduce the risk of denial-of-service attacks
-     *                        owf                 AlgorithmIdentifier,
-     *                        -- AlgId for a One-Way Function (SHA-1 recommended)
-     *                        iterationCount      INTEGER,
-     *                        -- number of times the OWF is applied
-     *                        -- note:  implementations MAY wish to limit acceptable sizes
-     *                        -- of this integer to values appropriate for their environment
-     *                        -- in order to reduce the risk of denial-of-service attacks
-     *                        mac                 AlgorithmIdentifier
-     *                        -- the MAC AlgId (e.g., DES-MAC, Triple-DES-MAC [PKCS11],
-     *    }   -- or HMAC [RFC2104, RFC2202])
-     * </pre>
-     * @return a basic ASN.1 object representation.
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector v = new ASN1EncodableVector();
-
-        v.add(salt);
-        v.add(owf);
-        v.add(iterationCount);
-        v.add(mac);
-        
-        return new DERSequence(v);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/cmp/PKIBody.java b/bcprov/src/main/java/org/bouncycastle/asn1/cmp/PKIBody.java
deleted file mode 100644
index 269c369..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/cmp/PKIBody.java
+++ /dev/null
@@ -1,194 +0,0 @@
-package org.bouncycastle.asn1.cmp;
-
-import org.bouncycastle.asn1.ASN1Choice;
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1TaggedObject;
-import org.bouncycastle.asn1.DERTaggedObject;
-import org.bouncycastle.asn1.crmf.CertReqMessages;
-import org.bouncycastle.asn1.pkcs.CertificationRequest;
-
-public class PKIBody
-    extends ASN1Object
-    implements ASN1Choice
-{
-    public static final int TYPE_INIT_REQ = 0;
-    public static final int TYPE_INIT_REP = 1;
-    public static final int TYPE_CERT_REQ = 2;
-    public static final int TYPE_CERT_REP = 3;
-    public static final int TYPE_P10_CERT_REQ = 4;
-    public static final int TYPE_POPO_CHALL = 5;
-    public static final int TYPE_POPO_REP = 6;
-    public static final int TYPE_KEY_UPDATE_REQ = 7;
-    public static final int TYPE_KEY_UPDATE_REP = 8;
-    public static final int TYPE_KEY_RECOVERY_REQ = 9;
-    public static final int TYPE_KEY_RECOVERY_REP = 10;
-    public static final int TYPE_REVOCATION_REQ = 11;
-    public static final int TYPE_REVOCATION_REP = 12;
-    public static final int TYPE_CROSS_CERT_REQ = 13;
-    public static final int TYPE_CROSS_CERT_REP = 14;
-    public static final int TYPE_CA_KEY_UPDATE_ANN = 15;
-    public static final int TYPE_CERT_ANN = 16;
-    public static final int TYPE_REVOCATION_ANN = 17;
-    public static final int TYPE_CRL_ANN = 18;
-    public static final int TYPE_CONFIRM = 19;
-    public static final int TYPE_NESTED = 20;
-    public static final int TYPE_GEN_MSG = 21;
-    public static final int TYPE_GEN_REP = 22;
-    public static final int TYPE_ERROR = 23;
-    public static final int TYPE_CERT_CONFIRM = 24;
-    public static final int TYPE_POLL_REQ = 25;
-    public static final int TYPE_POLL_REP = 26;
-
-    private int tagNo;
-    private ASN1Encodable body;
-
-    public static PKIBody getInstance(Object o)
-    {
-        if (o == null || o instanceof PKIBody)
-        {
-            return (PKIBody)o;
-        }
-
-        if (o instanceof ASN1TaggedObject)
-        {
-            return new PKIBody((ASN1TaggedObject)o);
-        }
-
-        throw new IllegalArgumentException("Invalid object: " + o.getClass().getName());
-    }
-
-    private PKIBody(ASN1TaggedObject tagged)
-    {
-        tagNo = tagged.getTagNo();
-        body = getBodyForType(tagNo, tagged.getObject());
-    }
-
-    /**
-     * Creates a new PKIBody.
-     * @param type one of the TYPE_* constants
-     * @param content message content
-     */
-    public PKIBody(
-        int type,
-        ASN1Encodable content)
-    {
-        tagNo = type;
-        body = getBodyForType(type, content);
-    }
-
-    private static ASN1Encodable getBodyForType(
-        int type,
-        ASN1Encodable o)
-    {
-        switch (type)
-        {
-        case TYPE_INIT_REQ:
-            return CertReqMessages.getInstance(o);
-        case TYPE_INIT_REP:
-            return CertRepMessage.getInstance(o);
-        case TYPE_CERT_REQ:
-            return CertReqMessages.getInstance(o);
-        case TYPE_CERT_REP:
-            return CertRepMessage.getInstance(o);
-        case TYPE_P10_CERT_REQ:
-            return CertificationRequest.getInstance(o);
-        case TYPE_POPO_CHALL:
-            return POPODecKeyChallContent.getInstance(o);
-        case TYPE_POPO_REP:
-            return POPODecKeyRespContent.getInstance(o);
-        case TYPE_KEY_UPDATE_REQ:
-            return CertReqMessages.getInstance(o);
-        case TYPE_KEY_UPDATE_REP:
-            return CertRepMessage.getInstance(o);
-        case TYPE_KEY_RECOVERY_REQ:
-            return CertReqMessages.getInstance(o);
-        case TYPE_KEY_RECOVERY_REP:
-            return KeyRecRepContent.getInstance(o);
-        case TYPE_REVOCATION_REQ:
-            return RevReqContent.getInstance(o);
-        case TYPE_REVOCATION_REP:
-            return RevRepContent.getInstance(o);
-        case TYPE_CROSS_CERT_REQ:
-            return CertReqMessages.getInstance(o);
-        case TYPE_CROSS_CERT_REP:
-            return CertRepMessage.getInstance(o);
-        case TYPE_CA_KEY_UPDATE_ANN:
-            return CAKeyUpdAnnContent.getInstance(o);
-        case TYPE_CERT_ANN:
-            return CMPCertificate.getInstance(o);
-        case TYPE_REVOCATION_ANN:
-            return RevAnnContent.getInstance(o);
-        case TYPE_CRL_ANN:
-            return CRLAnnContent.getInstance(o);
-        case TYPE_CONFIRM:
-            return PKIConfirmContent.getInstance(o);
-        case TYPE_NESTED:
-            return PKIMessages.getInstance(o);
-        case TYPE_GEN_MSG:
-            return GenMsgContent.getInstance(o);
-        case TYPE_GEN_REP:
-            return GenRepContent.getInstance(o);
-        case TYPE_ERROR:
-            return ErrorMsgContent.getInstance(o);
-        case TYPE_CERT_CONFIRM:
-            return CertConfirmContent.getInstance(o);
-        case TYPE_POLL_REQ:
-            return PollReqContent.getInstance(o);
-        case TYPE_POLL_REP:
-            return PollRepContent.getInstance(o);
-        default:
-            throw new IllegalArgumentException("unknown tag number: " + type);
-        }
-    }
-
-    public int getType()
-    {
-        return tagNo;
-    }
-
-    public ASN1Encodable getContent()
-    {
-        return body;
-    }
-
-    /**
-     * <pre>
-     * PKIBody ::= CHOICE {       -- message-specific body elements
-     *        ir       [0]  CertReqMessages,        --Initialization Request
-     *        ip       [1]  CertRepMessage,         --Initialization Response
-     *        cr       [2]  CertReqMessages,        --Certification Request
-     *        cp       [3]  CertRepMessage,         --Certification Response
-     *        p10cr    [4]  CertificationRequest,   --imported from [PKCS10]
-     *        popdecc  [5]  POPODecKeyChallContent, --pop Challenge
-     *        popdecr  [6]  POPODecKeyRespContent,  --pop Response
-     *        kur      [7]  CertReqMessages,        --Key Update Request
-     *        kup      [8]  CertRepMessage,         --Key Update Response
-     *        krr      [9]  CertReqMessages,        --Key Recovery Request
-     *        krp      [10] KeyRecRepContent,       --Key Recovery Response
-     *        rr       [11] RevReqContent,          --Revocation Request
-     *        rp       [12] RevRepContent,          --Revocation Response
-     *        ccr      [13] CertReqMessages,        --Cross-Cert. Request
-     *        ccp      [14] CertRepMessage,         --Cross-Cert. Response
-     *        ckuann   [15] CAKeyUpdAnnContent,     --CA Key Update Ann.
-     *        cann     [16] CertAnnContent,         --Certificate Ann.
-     *        rann     [17] RevAnnContent,          --Revocation Ann.
-     *        crlann   [18] CRLAnnContent,          --CRL Announcement
-     *        pkiconf  [19] PKIConfirmContent,      --Confirmation
-     *        nested   [20] NestedMessageContent,   --Nested Message
-     *        genm     [21] GenMsgContent,          --General Message
-     *        genp     [22] GenRepContent,          --General Response
-     *        error    [23] ErrorMsgContent,        --Error Message
-     *        certConf [24] CertConfirmContent,     --Certificate confirm
-     *        pollReq  [25] PollReqContent,         --Polling request
-     *        pollRep  [26] PollRepContent          --Polling response
-     * }
-     * </pre>
-     * @return a basic ASN.1 object representation.
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        return new DERTaggedObject(true, tagNo, body);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/cmp/PKIConfirmContent.java b/bcprov/src/main/java/org/bouncycastle/asn1/cmp/PKIConfirmContent.java
deleted file mode 100644
index 5af3f7d..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/cmp/PKIConfirmContent.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package org.bouncycastle.asn1.cmp;
-
-import org.bouncycastle.asn1.ASN1Null;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.DERNull;
-
-public class PKIConfirmContent
-    extends ASN1Object
-{
-    private ASN1Null val;
-
-    private PKIConfirmContent(ASN1Null val)
-    {
-        this.val = val;
-    }
-
-    public static PKIConfirmContent getInstance(Object o)
-    {
-        if (o == null || o instanceof PKIConfirmContent)
-        {
-            return (PKIConfirmContent)o;
-        }
-
-        if (o instanceof ASN1Null)
-        {
-            return new PKIConfirmContent((ASN1Null)o);
-        }
-
-        throw new IllegalArgumentException("Invalid object: " + o.getClass().getName());
-    }
-
-    public PKIConfirmContent()
-    {
-        val = DERNull.INSTANCE;
-    }
-
-    /**
-     * <pre>
-     * PKIConfirmContent ::= NULL
-     * </pre>
-     * @return a basic ASN.1 object representation.
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        return val;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/cmp/PKIFailureInfo.java b/bcprov/src/main/java/org/bouncycastle/asn1/cmp/PKIFailureInfo.java
deleted file mode 100644
index 10acbb4..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/cmp/PKIFailureInfo.java
+++ /dev/null
@@ -1,126 +0,0 @@
-package org.bouncycastle.asn1.cmp;
-
-import org.bouncycastle.asn1.DERBitString;
-
-/**
- * <pre>
- * PKIFailureInfo ::= BIT STRING {
- * badAlg               (0),
- *   -- unrecognized or unsupported Algorithm Identifier
- * badMessageCheck      (1), -- integrity check failed (e.g., signature did not verify)
- * badRequest           (2),
- *   -- transaction not permitted or supported
- * badTime              (3), -- messageTime was not sufficiently close to the system time, as defined by local policy
- * badCertId            (4), -- no certificate could be found matching the provided criteria
- * badDataFormat        (5),
- *   -- the data submitted has the wrong format
- * wrongAuthority       (6), -- the authority indicated in the request is different from the one creating the response token
- * incorrectData        (7), -- the requester's data is incorrect (for notary services)
- * missingTimeStamp     (8), -- when the timestamp is missing but should be there (by policy)
- * badPOP               (9)  -- the proof-of-possession failed
- * certRevoked         (10),
- * certConfirmed       (11),
- * wrongIntegrity      (12),
- * badRecipientNonce   (13), 
- * timeNotAvailable    (14),
- *   -- the TSA's time source is not available
- * unacceptedPolicy    (15),
- *   -- the requested TSA policy is not supported by the TSA
- * unacceptedExtension (16),
- *   -- the requested extension is not supported by the TSA
- * addInfoNotAvailable (17)
- *   -- the additional information requested could not be understood
- *   -- or is not available
- * badSenderNonce      (18),
- * badCertTemplate     (19),
- * signerNotTrusted    (20),
- * transactionIdInUse  (21),
- * unsupportedVersion  (22),
- * notAuthorized       (23),
- * systemUnavail       (24),    
- * systemFailure       (25),
- *   -- the request cannot be handled due to system failure
- * duplicateCertReq    (26) 
- * </pre>
- */
-public class PKIFailureInfo
-    extends DERBitString
-{
-    public static final int badAlg               = (1 << 7); // unrecognized or unsupported Algorithm Identifier
-    public static final int badMessageCheck      = (1 << 6); // integrity check failed (e.g., signature did not verify)
-    public static final int badRequest           = (1 << 5);
-    public static final int badTime              = (1 << 4); // -- messageTime was not sufficiently close to the system time, as defined by local policy
-    public static final int badCertId            = (1 << 3); // no certificate could be found matching the provided criteria
-    public static final int badDataFormat        = (1 << 2);
-    public static final int wrongAuthority       = (1 << 1); // the authority indicated in the request is different from the one creating the response token
-    public static final int incorrectData        = 1;        // the requester's data is incorrect (for notary services)
-    public static final int missingTimeStamp     = (1 << 15); // when the timestamp is missing but should be there (by policy)
-    public static final int badPOP               = (1 << 14); // the proof-of-possession failed
-    public static final int certRevoked          = (1 << 13);
-    public static final int certConfirmed        = (1 << 12);
-    public static final int wrongIntegrity       = (1 << 11);
-    public static final int badRecipientNonce    = (1 << 10);
-    public static final int timeNotAvailable     = (1 << 9); // the TSA's time source is not available
-    public static final int unacceptedPolicy     = (1 << 8); // the requested TSA policy is not supported by the TSA
-    public static final int unacceptedExtension  = (1 << 23); //the requested extension is not supported by the TSA
-    public static final int addInfoNotAvailable  = (1 << 22); //the additional information requested could not be understood or is not available
-    public static final int badSenderNonce       = (1 << 21);
-    public static final int badCertTemplate      = (1 << 20);
-    public static final int signerNotTrusted     = (1 << 19);
-    public static final int transactionIdInUse   = (1 << 18);
-    public static final int unsupportedVersion   = (1 << 17);
-    public static final int notAuthorized        = (1 << 16);
-    public static final int systemUnavail        = (1 << 31);
-    public static final int systemFailure        = (1 << 30); //the request cannot be handled due to system failure
-    public static final int duplicateCertReq     = (1 << 29);
-
-    /** @deprecated use lower case version */
-    public static final int BAD_ALG                   = badAlg; // unrecognized or unsupported Algorithm Identifier
-    /** @deprecated use lower case version */
-    public static final int BAD_MESSAGE_CHECK         = badMessageCheck;
-    /** @deprecated use lower case version */
-    public static final int BAD_REQUEST               = badRequest; // transaction not permitted or supported
-    /** @deprecated use lower case version */
-    public static final int BAD_TIME                  = badTime;
-    /** @deprecated use lower case version */
-    public static final int BAD_CERT_ID               = badCertId;
-    /** @deprecated use lower case version */
-    public static final int BAD_DATA_FORMAT           = badDataFormat; // the data submitted has the wrong format
-    /** @deprecated use lower case version */
-    public static final int WRONG_AUTHORITY           = wrongAuthority;
-    /** @deprecated use lower case version */
-    public static final int INCORRECT_DATA            = incorrectData;
-    /** @deprecated use lower case version */
-    public static final int MISSING_TIME_STAMP        = missingTimeStamp;
-    /** @deprecated use lower case version */
-    public static final int BAD_POP                   = badPOP;
-    /** @deprecated use lower case version */
-    public static final int TIME_NOT_AVAILABLE        = timeNotAvailable;
-    /** @deprecated use lower case version */
-    public static final int UNACCEPTED_POLICY         = unacceptedPolicy;
-    /** @deprecated use lower case version */
-    public static final int UNACCEPTED_EXTENSION      = unacceptedExtension;
-    /** @deprecated use lower case version */
-    public static final int ADD_INFO_NOT_AVAILABLE    = addInfoNotAvailable; 
-    /** @deprecated use lower case version */
-    public static final int SYSTEM_FAILURE            = systemFailure; 
-    /**
-     * Basic constructor.
-     */
-    public PKIFailureInfo(
-        int info)
-    {
-        super(getBytes(info), getPadBits(info));
-    }
-
-    public PKIFailureInfo(
-        DERBitString info)
-    {
-        super(info.getBytes(), info.getPadBits());
-    }
-    
-    public String toString()
-    {
-        return "PKIFailureInfo: 0x" + Integer.toHexString(this.intValue());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/cmp/PKIFreeText.java b/bcprov/src/main/java/org/bouncycastle/asn1/cmp/PKIFreeText.java
deleted file mode 100644
index 5b63c19..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/cmp/PKIFreeText.java
+++ /dev/null
@@ -1,115 +0,0 @@
-package org.bouncycastle.asn1.cmp;
-
-import java.util.Enumeration;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.ASN1TaggedObject;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.DERUTF8String;
-
-public class PKIFreeText
-    extends ASN1Object
-{
-    ASN1Sequence strings;
-
-    public static PKIFreeText getInstance(
-        ASN1TaggedObject    obj,
-        boolean             explicit)
-    {
-        return getInstance(ASN1Sequence.getInstance(obj, explicit));
-    }
-
-    public static PKIFreeText getInstance(
-        Object obj)
-    {
-        if (obj instanceof PKIFreeText)
-        {
-            return (PKIFreeText)obj;
-        }
-        else if (obj != null)
-        {
-            return new PKIFreeText(ASN1Sequence.getInstance(obj));
-        }
-
-        return null;
-    }
-
-    private PKIFreeText(
-        ASN1Sequence seq)
-    {
-        Enumeration e = seq.getObjects();
-        while (e.hasMoreElements())
-        {
-            if (!(e.nextElement() instanceof DERUTF8String))
-            {
-                throw new IllegalArgumentException("attempt to insert non UTF8 STRING into PKIFreeText");
-            }
-        }
-        
-        strings = seq;
-    }
-
-    public PKIFreeText(
-        DERUTF8String p)
-    {
-        strings = new DERSequence(p);
-    }
-
-    public PKIFreeText(
-        String p)
-    {
-        this(new DERUTF8String(p));
-    }
-
-    public PKIFreeText(
-        DERUTF8String[] strs)
-    {
-        strings = new DERSequence(strs);
-    }
-
-    public PKIFreeText(
-        String[] strs)
-    {
-        ASN1EncodableVector v = new ASN1EncodableVector();
-        for (int i = 0; i < strs.length; i++)
-        {
-            v.add(new DERUTF8String(strs[i]));
-        }
-        strings = new DERSequence(v);
-    }
-
-    /**
-     * Return the number of string elements present.
-     * 
-     * @return number of elements present.
-     */
-    public int size()
-    {
-        return strings.size();
-    }
-    
-    /**
-     * Return the UTF8STRING at index i.
-     * 
-     * @param i index of the string of interest
-     * @return the string at index i.
-     */
-    public DERUTF8String getStringAt(
-        int i)
-    {
-        return (DERUTF8String)strings.getObjectAt(i);
-    }
-    
-    /**
-     * <pre>
-     * PKIFreeText ::= SEQUENCE SIZE (1..MAX) OF UTF8String
-     * </pre>
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        return strings;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/cmp/PKIHeader.java b/bcprov/src/main/java/org/bouncycastle/asn1/cmp/PKIHeader.java
deleted file mode 100644
index 82f1b08..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/cmp/PKIHeader.java
+++ /dev/null
@@ -1,260 +0,0 @@
-package org.bouncycastle.asn1.cmp;
-
-import java.util.Enumeration;
-
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1GeneralizedTime;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.ASN1TaggedObject;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.DERTaggedObject;
-import org.bouncycastle.asn1.x500.X500Name;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.asn1.x509.GeneralName;
-
-public class PKIHeader
-    extends ASN1Object
-{
-    /**
-     * Value for a "null" recipient or sender.
-     */
-    public static final GeneralName NULL_NAME = new GeneralName(X500Name.getInstance(new DERSequence()));
-
-    public static final int CMP_1999 = 1;
-    public static final int CMP_2000 = 2;
-
-    private ASN1Integer pvno;
-    private GeneralName sender;
-    private GeneralName recipient;
-    private ASN1GeneralizedTime messageTime;
-    private AlgorithmIdentifier protectionAlg;
-    private ASN1OctetString senderKID;       // KeyIdentifier
-    private ASN1OctetString recipKID;        // KeyIdentifier
-    private ASN1OctetString transactionID;
-    private ASN1OctetString senderNonce;
-    private ASN1OctetString recipNonce;
-    private PKIFreeText freeText;
-    private ASN1Sequence generalInfo;
-
-    private PKIHeader(ASN1Sequence seq)
-    {
-        Enumeration en = seq.getObjects();
-
-        pvno = ASN1Integer.getInstance(en.nextElement());
-        sender = GeneralName.getInstance(en.nextElement());
-        recipient = GeneralName.getInstance(en.nextElement());
-
-        while (en.hasMoreElements())
-        {
-            ASN1TaggedObject tObj = (ASN1TaggedObject)en.nextElement();
-
-            switch (tObj.getTagNo())
-            {
-            case 0:
-                messageTime = ASN1GeneralizedTime.getInstance(tObj, true);
-                break;
-            case 1:
-                protectionAlg = AlgorithmIdentifier.getInstance(tObj, true);
-                break;
-            case 2:
-                senderKID = ASN1OctetString.getInstance(tObj, true);
-                break;
-            case 3:
-                recipKID = ASN1OctetString.getInstance(tObj, true);
-                break;
-            case 4:
-                transactionID = ASN1OctetString.getInstance(tObj, true);
-                break;
-            case 5:
-                senderNonce = ASN1OctetString.getInstance(tObj, true);
-                break;
-            case 6:
-                recipNonce = ASN1OctetString.getInstance(tObj, true);
-                break;
-            case 7:
-                freeText = PKIFreeText.getInstance(tObj, true);
-                break;
-            case 8:
-                generalInfo = ASN1Sequence.getInstance(tObj, true);
-                break;
-            default:
-                throw new IllegalArgumentException("unknown tag number: " + tObj.getTagNo());
-            }
-        }
-    }
-
-    public static PKIHeader getInstance(Object o)
-    {
-        if (o instanceof PKIHeader)
-        {
-            return (PKIHeader)o;
-        }
-
-        if (o != null)
-        {
-            return new PKIHeader(ASN1Sequence.getInstance(o));
-        }
-
-        return null;
-    }
-
-    public PKIHeader(
-        int pvno,
-        GeneralName sender,
-        GeneralName recipient)
-    {
-        this(new ASN1Integer(pvno), sender, recipient);
-    }
-
-    private PKIHeader(
-        ASN1Integer pvno,
-        GeneralName sender,
-        GeneralName recipient)
-    {
-        this.pvno = pvno;
-        this.sender = sender;
-        this.recipient = recipient;
-    }
-
-    public ASN1Integer getPvno()
-    {
-        return pvno;
-    }
-
-    public GeneralName getSender()
-    {
-        return sender;
-    }
-
-    public GeneralName getRecipient()
-    {
-        return recipient;
-    }
-
-    public ASN1GeneralizedTime getMessageTime()
-    {
-        return messageTime;
-    }
-
-    public AlgorithmIdentifier getProtectionAlg()
-    {
-        return protectionAlg;
-    }
-
-    public ASN1OctetString getSenderKID()
-    {
-        return senderKID;
-    }
-
-    public ASN1OctetString getRecipKID()
-    {
-        return recipKID;
-    }
-
-    public ASN1OctetString getTransactionID()
-    {
-        return transactionID;
-    }
-
-    public ASN1OctetString getSenderNonce()
-    {
-        return senderNonce;
-    }
-
-    public ASN1OctetString getRecipNonce()
-    {
-        return recipNonce;
-    }
-
-    public PKIFreeText getFreeText()
-    {
-        return freeText;
-    }
-
-    public InfoTypeAndValue[] getGeneralInfo()
-    {
-        if (generalInfo == null)
-        {
-            return null;
-        }
-        InfoTypeAndValue[] results = new InfoTypeAndValue[generalInfo.size()];
-        for (int i = 0; i < results.length; i++)
-        {
-            results[i]
-                = InfoTypeAndValue.getInstance(generalInfo.getObjectAt(i));
-        }
-        return results;
-    }
-
-    /**
-     * <pre>
-     *  PKIHeader ::= SEQUENCE {
-     *            pvno                INTEGER     { cmp1999(1), cmp2000(2) },
-     *            sender              GeneralName,
-     *            -- identifies the sender
-     *            recipient           GeneralName,
-     *            -- identifies the intended recipient
-     *            messageTime     [0] GeneralizedTime         OPTIONAL,
-     *            -- time of production of this message (used when sender
-     *            -- believes that the transport will be "suitable"; i.e.,
-     *            -- that the time will still be meaningful upon receipt)
-     *            protectionAlg   [1] AlgorithmIdentifier     OPTIONAL,
-     *            -- algorithm used for calculation of protection bits
-     *            senderKID       [2] KeyIdentifier           OPTIONAL,
-     *            recipKID        [3] KeyIdentifier           OPTIONAL,
-     *            -- to identify specific keys used for protection
-     *            transactionID   [4] OCTET STRING            OPTIONAL,
-     *            -- identifies the transaction; i.e., this will be the same in
-     *            -- corresponding request, response, certConf, and PKIConf
-     *            -- messages
-     *            senderNonce     [5] OCTET STRING            OPTIONAL,
-     *            recipNonce      [6] OCTET STRING            OPTIONAL,
-     *            -- nonces used to provide replay protection, senderNonce
-     *            -- is inserted by the creator of this message; recipNonce
-     *            -- is a nonce previously inserted in a related message by
-     *            -- the intended recipient of this message
-     *            freeText        [7] PKIFreeText             OPTIONAL,
-     *            -- this may be used to indicate context-specific instructions
-     *            -- (this field is intended for human consumption)
-     *            generalInfo     [8] SEQUENCE SIZE (1..MAX) OF
-     *                                 InfoTypeAndValue     OPTIONAL
-     *            -- this may be used to convey context-specific information
-     *            -- (this field not primarily intended for human consumption)
-     * }
-     * </pre>
-     *
-     * @return a basic ASN.1 object representation.
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector v = new ASN1EncodableVector();
-
-        v.add(pvno);
-        v.add(sender);
-        v.add(recipient);
-        addOptional(v, 0, messageTime);
-        addOptional(v, 1, protectionAlg);
-        addOptional(v, 2, senderKID);
-        addOptional(v, 3, recipKID);
-        addOptional(v, 4, transactionID);
-        addOptional(v, 5, senderNonce);
-        addOptional(v, 6, recipNonce);
-        addOptional(v, 7, freeText);
-        addOptional(v, 8, generalInfo);
-
-        return new DERSequence(v);
-    }
-
-    private void addOptional(ASN1EncodableVector v, int tagNo, ASN1Encodable obj)
-    {
-        if (obj != null)
-        {
-            v.add(new DERTaggedObject(true, tagNo, obj));
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/cmp/PKIHeaderBuilder.java b/bcprov/src/main/java/org/bouncycastle/asn1/cmp/PKIHeaderBuilder.java
deleted file mode 100644
index c5465a9..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/cmp/PKIHeaderBuilder.java
+++ /dev/null
@@ -1,243 +0,0 @@
-package org.bouncycastle.asn1.cmp;
-
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1GeneralizedTime;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DEROctetString;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.DERTaggedObject;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.asn1.x509.GeneralName;
-
-public class PKIHeaderBuilder
-{
-    private ASN1Integer pvno;
-    private GeneralName sender;
-    private GeneralName recipient;
-    private ASN1GeneralizedTime messageTime;
-    private AlgorithmIdentifier protectionAlg;
-    private ASN1OctetString senderKID;       // KeyIdentifier
-    private ASN1OctetString recipKID;        // KeyIdentifier
-    private ASN1OctetString transactionID;
-    private ASN1OctetString senderNonce;
-    private ASN1OctetString recipNonce;
-    private PKIFreeText     freeText;
-    private ASN1Sequence    generalInfo;
-
-    public PKIHeaderBuilder(
-        int pvno,
-        GeneralName sender,
-        GeneralName recipient)
-    {
-        this(new ASN1Integer(pvno), sender, recipient);
-    }
-
-    private PKIHeaderBuilder(
-        ASN1Integer pvno,
-        GeneralName sender,
-        GeneralName recipient)
-    {
-        this.pvno = pvno;
-        this.sender = sender;
-        this.recipient = recipient;
-    }
-
-    public PKIHeaderBuilder setMessageTime(ASN1GeneralizedTime time)
-    {
-        messageTime = time;
-
-        return this;
-    }
-
-    public PKIHeaderBuilder setProtectionAlg(AlgorithmIdentifier aid)
-    {
-        protectionAlg = aid;
-
-        return this;
-    }
-
-    public PKIHeaderBuilder setSenderKID(byte[] kid)
-    {
-        return setSenderKID(kid == null ? null : new DEROctetString(kid));
-    }
-
-    public PKIHeaderBuilder setSenderKID(ASN1OctetString kid)
-    {
-        senderKID = kid;
-
-        return this;
-    }
-
-    public PKIHeaderBuilder setRecipKID(byte[] kid)
-    {
-        return setRecipKID(kid == null ? null : new DEROctetString(kid));
-    }
-
-    public PKIHeaderBuilder setRecipKID(DEROctetString kid)
-    {
-        recipKID = kid;
-
-        return this;
-    }
-
-    public PKIHeaderBuilder setTransactionID(byte[] tid)
-    {
-        return setTransactionID(tid == null ? null : new DEROctetString(tid));
-    }
-
-    public PKIHeaderBuilder setTransactionID(ASN1OctetString tid)
-    {
-        transactionID = tid;
-
-        return this;
-    }
-
-    public PKIHeaderBuilder setSenderNonce(byte[] nonce)
-    {
-        return setSenderNonce(nonce == null ? null : new DEROctetString(nonce));
-    }
-
-    public PKIHeaderBuilder setSenderNonce(ASN1OctetString nonce)
-    {
-        senderNonce = nonce;
-
-        return this;
-    }
-
-    public PKIHeaderBuilder setRecipNonce(byte[] nonce)
-    {
-        return setRecipNonce(nonce == null ? null : new DEROctetString(nonce));
-    }
-
-    public PKIHeaderBuilder setRecipNonce(ASN1OctetString nonce)
-    {
-        recipNonce = nonce;
-
-        return this;
-    }
-
-    public PKIHeaderBuilder setFreeText(PKIFreeText text)
-    {
-        freeText = text;
-
-        return this;
-    }
-
-    public PKIHeaderBuilder setGeneralInfo(InfoTypeAndValue genInfo)
-    {
-        return setGeneralInfo(makeGeneralInfoSeq(genInfo));
-    }
-
-    public PKIHeaderBuilder setGeneralInfo(InfoTypeAndValue[] genInfos)
-    {
-        return setGeneralInfo(makeGeneralInfoSeq(genInfos));
-    }
-
-    public PKIHeaderBuilder setGeneralInfo(ASN1Sequence seqOfInfoTypeAndValue)
-    {
-        generalInfo = seqOfInfoTypeAndValue;
-
-        return this;
-    }
-
-    private static ASN1Sequence makeGeneralInfoSeq(
-        InfoTypeAndValue generalInfo)
-    {
-        return new DERSequence(generalInfo);
-    }
-
-    private static ASN1Sequence makeGeneralInfoSeq(
-        InfoTypeAndValue[] generalInfos)
-    {
-        ASN1Sequence genInfoSeq = null;
-        if (generalInfos != null)
-        {
-            ASN1EncodableVector v = new ASN1EncodableVector();
-            for (int i = 0; i < generalInfos.length; i++)
-            {
-                v.add(generalInfos[i]);
-            }
-            genInfoSeq = new DERSequence(v);
-        }
-        return genInfoSeq;
-    }
-
-    /**
-     * <pre>
-     *  PKIHeader ::= SEQUENCE {
-     *            pvno                INTEGER     { cmp1999(1), cmp2000(2) },
-     *            sender              GeneralName,
-     *            -- identifies the sender
-     *            recipient           GeneralName,
-     *            -- identifies the intended recipient
-     *            messageTime     [0] GeneralizedTime         OPTIONAL,
-     *            -- time of production of this message (used when sender
-     *            -- believes that the transport will be "suitable"; i.e.,
-     *            -- that the time will still be meaningful upon receipt)
-     *            protectionAlg   [1] AlgorithmIdentifier     OPTIONAL,
-     *            -- algorithm used for calculation of protection bits
-     *            senderKID       [2] KeyIdentifier           OPTIONAL,
-     *            recipKID        [3] KeyIdentifier           OPTIONAL,
-     *            -- to identify specific keys used for protection
-     *            transactionID   [4] OCTET STRING            OPTIONAL,
-     *            -- identifies the transaction; i.e., this will be the same in
-     *            -- corresponding request, response, certConf, and PKIConf
-     *            -- messages
-     *            senderNonce     [5] OCTET STRING            OPTIONAL,
-     *            recipNonce      [6] OCTET STRING            OPTIONAL,
-     *            -- nonces used to provide replay protection, senderNonce
-     *            -- is inserted by the creator of this message; recipNonce
-     *            -- is a nonce previously inserted in a related message by
-     *            -- the intended recipient of this message
-     *            freeText        [7] PKIFreeText             OPTIONAL,
-     *            -- this may be used to indicate context-specific instructions
-     *            -- (this field is intended for human consumption)
-     *            generalInfo     [8] SEQUENCE SIZE (1..MAX) OF
-     *                                 InfoTypeAndValue     OPTIONAL
-     *            -- this may be used to convey context-specific information
-     *            -- (this field not primarily intended for human consumption)
-     * }
-     * </pre>
-     * @return a basic ASN.1 object representation.
-     */
-    public PKIHeader build()
-    {
-        ASN1EncodableVector v = new ASN1EncodableVector();
-
-        v.add(pvno);
-        v.add(sender);
-        v.add(recipient);
-        addOptional(v, 0, messageTime);
-        addOptional(v, 1, protectionAlg);
-        addOptional(v, 2, senderKID);
-        addOptional(v, 3, recipKID);
-        addOptional(v, 4, transactionID);
-        addOptional(v, 5, senderNonce);
-        addOptional(v, 6, recipNonce);
-        addOptional(v, 7, freeText);
-        addOptional(v, 8, generalInfo);
-
-        messageTime = null;
-        protectionAlg = null;
-        senderKID = null;
-        recipKID = null;
-        transactionID = null;
-        senderNonce = null;
-        recipNonce = null;
-        freeText = null;
-        generalInfo = null;
-        
-        return PKIHeader.getInstance(new DERSequence(v));
-    }
-
-    private void addOptional(ASN1EncodableVector v, int tagNo, ASN1Encodable obj)
-    {
-        if (obj != null)
-        {
-            v.add(new DERTaggedObject(true, tagNo, obj));
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/cmp/PKIMessage.java b/bcprov/src/main/java/org/bouncycastle/asn1/cmp/PKIMessage.java
deleted file mode 100644
index bfc2113..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/cmp/PKIMessage.java
+++ /dev/null
@@ -1,166 +0,0 @@
-package org.bouncycastle.asn1.cmp;
-
-import java.util.Enumeration;
-
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.ASN1TaggedObject;
-import org.bouncycastle.asn1.DERBitString;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.DERTaggedObject;
-
-public class PKIMessage
-    extends ASN1Object
-{
-    private PKIHeader header;
-    private PKIBody body;
-    private DERBitString protection;
-    private ASN1Sequence extraCerts;
-
-    private PKIMessage(ASN1Sequence seq)
-    {
-        Enumeration en = seq.getObjects();
-
-        header = PKIHeader.getInstance(en.nextElement());
-        body = PKIBody.getInstance(en.nextElement());
-
-        while (en.hasMoreElements())
-        {
-            ASN1TaggedObject tObj = (ASN1TaggedObject)en.nextElement();
-
-            if (tObj.getTagNo() == 0)
-            {
-                protection = DERBitString.getInstance(tObj, true);
-            }
-            else
-            {
-                extraCerts = ASN1Sequence.getInstance(tObj, true);
-            }
-        }
-    }
-
-    public static PKIMessage getInstance(Object o)
-    {
-        if (o instanceof PKIMessage)
-        {
-            return (PKIMessage)o;
-        }
-        else if (o != null)
-        {
-            return new PKIMessage(ASN1Sequence.getInstance(o));
-        }
-
-        return null;
-    }
-
-    /**
-     * Creates a new PKIMessage.
-     *
-     * @param header     message header
-     * @param body       message body
-     * @param protection message protection (may be null)
-     * @param extraCerts extra certificates (may be null)
-     */
-    public PKIMessage(
-        PKIHeader header,
-        PKIBody body,
-        DERBitString protection,
-        CMPCertificate[] extraCerts)
-    {
-        this.header = header;
-        this.body = body;
-        this.protection = protection;
-        if (extraCerts != null)
-        {
-            ASN1EncodableVector v = new ASN1EncodableVector();
-            for (int i = 0; i < extraCerts.length; i++)
-            {
-                v.add(extraCerts[i]);
-            }
-            this.extraCerts = new DERSequence(v);
-        }
-    }
-
-    public PKIMessage(
-        PKIHeader header,
-        PKIBody body,
-        DERBitString protection)
-    {
-        this(header, body, protection, null);
-    }
-
-    public PKIMessage(
-        PKIHeader header,
-        PKIBody body)
-    {
-        this(header, body, null, null);
-    }
-
-    public PKIHeader getHeader()
-    {
-        return header;
-    }
-
-    public PKIBody getBody()
-    {
-        return body;
-    }
-
-    public DERBitString getProtection()
-    {
-        return protection;
-    }
-
-    public CMPCertificate[] getExtraCerts()
-    {
-        if (extraCerts == null)
-        {
-            return null;
-        }
-
-        CMPCertificate[] results = new CMPCertificate[extraCerts.size()];
-
-        for (int i = 0; i < results.length; i++)
-        {
-            results[i] = CMPCertificate.getInstance(extraCerts.getObjectAt(i));
-        }
-        return results;
-    }
-
-    /**
-     * <pre>
-     * PKIMessage ::= SEQUENCE {
-     *                  header           PKIHeader,
-     *                  body             PKIBody,
-     *                  protection   [0] PKIProtection OPTIONAL,
-     *                  extraCerts   [1] SEQUENCE SIZE (1..MAX) OF CMPCertificate
-     *                                                                     OPTIONAL
-     * }
-     * </pre>
-     *
-     * @return a basic ASN.1 object representation.
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector v = new ASN1EncodableVector();
-
-        v.add(header);
-        v.add(body);
-
-        addOptional(v, 0, protection);
-        addOptional(v, 1, extraCerts);
-
-        return new DERSequence(v);
-    }
-
-    private void addOptional(ASN1EncodableVector v, int tagNo, ASN1Encodable obj)
-    {
-        if (obj != null)
-        {
-            v.add(new DERTaggedObject(true, tagNo, obj));
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/cmp/PKIMessages.java b/bcprov/src/main/java/org/bouncycastle/asn1/cmp/PKIMessages.java
deleted file mode 100644
index 5a80a0f..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/cmp/PKIMessages.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package org.bouncycastle.asn1.cmp;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DERSequence;
-
-public class PKIMessages
-    extends ASN1Object
-{
-    private ASN1Sequence content;
-
-    private PKIMessages(ASN1Sequence seq)
-    {
-        content = seq;
-    }
-
-    public static PKIMessages getInstance(Object o)
-    {
-        if (o instanceof PKIMessages)
-        {
-            return (PKIMessages)o;
-        }
-
-        if (o != null)
-        {
-            return new PKIMessages(ASN1Sequence.getInstance(o));
-        }
-
-        return null;
-    }
-
-    public PKIMessages(PKIMessage msg)
-    {
-        content = new DERSequence(msg);
-    }
-
-    public PKIMessages(PKIMessage[] msgs)
-    {
-        ASN1EncodableVector v = new ASN1EncodableVector();
-        for (int i = 0; i < msgs.length; i++)
-        {
-            v.add(msgs[i]);
-        }
-        content = new DERSequence(v);
-    }
-
-    public PKIMessage[] toPKIMessageArray()
-    {
-        PKIMessage[] result = new PKIMessage[content.size()];
-
-        for (int i = 0; i != result.length; i++)
-        {
-            result[i] = PKIMessage.getInstance(content.getObjectAt(i));
-        }
-
-        return result;
-    }
-
-    /**
-     * <pre>
-     * PKIMessages ::= SEQUENCE SIZE (1..MAX) OF PKIMessage
-     * </pre>
-     * @return a basic ASN.1 object representation.
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        return content;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/cmp/PKIStatus.java b/bcprov/src/main/java/org/bouncycastle/asn1/cmp/PKIStatus.java
deleted file mode 100644
index 58f7ec0..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/cmp/PKIStatus.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package org.bouncycastle.asn1.cmp;
-
-import java.math.BigInteger;
-
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1Primitive;
-
-public class PKIStatus
-    extends ASN1Object
-{
-    public static final int GRANTED                 = 0;
-    public static final int GRANTED_WITH_MODS       = 1;
-    public static final int REJECTION               = 2;
-    public static final int WAITING                 = 3;
-    public static final int REVOCATION_WARNING      = 4;
-    public static final int REVOCATION_NOTIFICATION = 5;
-    public static final int KEY_UPDATE_WARNING      = 6;
-
-    public static final PKIStatus granted = new PKIStatus(GRANTED);
-    public static final PKIStatus grantedWithMods = new PKIStatus(GRANTED_WITH_MODS);
-    public static final PKIStatus rejection = new PKIStatus(REJECTION);
-    public static final PKIStatus waiting = new PKIStatus(WAITING);
-    public static final PKIStatus revocationWarning = new PKIStatus(REVOCATION_WARNING);
-    public static final PKIStatus revocationNotification = new PKIStatus(REVOCATION_NOTIFICATION);
-    public static final PKIStatus keyUpdateWaiting = new PKIStatus(KEY_UPDATE_WARNING);
-
-    private ASN1Integer value;
-
-    private PKIStatus(int value)
-    {
-        this(new ASN1Integer(value));
-    }
-
-    private PKIStatus(ASN1Integer value)
-    {
-        this.value = value;
-    }
-
-    public static PKIStatus getInstance(Object o)
-    {
-        if (o instanceof PKIStatus)
-        {
-            return (PKIStatus)o;
-        }
-
-        if (o != null)
-        {
-            return new PKIStatus(ASN1Integer.getInstance(o));
-        }
-
-        return null;
-    }
-
-    public BigInteger getValue()
-    {
-        return value.getValue();
-    }
-    
-    public ASN1Primitive toASN1Primitive()
-    {
-        return value;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/cmp/PKIStatusInfo.java b/bcprov/src/main/java/org/bouncycastle/asn1/cmp/PKIStatusInfo.java
deleted file mode 100644
index bac1ba5..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/cmp/PKIStatusInfo.java
+++ /dev/null
@@ -1,165 +0,0 @@
-package org.bouncycastle.asn1.cmp;
-
-import java.math.BigInteger;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.ASN1TaggedObject;
-import org.bouncycastle.asn1.DERBitString;
-import org.bouncycastle.asn1.DERSequence;
-
-public class PKIStatusInfo
-    extends ASN1Object
-{
-    ASN1Integer      status;
-    PKIFreeText     statusString;
-    DERBitString    failInfo;
-
-    public static PKIStatusInfo getInstance(
-        ASN1TaggedObject obj,
-        boolean explicit)
-    {
-        return getInstance(ASN1Sequence.getInstance(obj, explicit));
-    }
-
-    public static PKIStatusInfo getInstance(
-        Object obj)
-    {
-        if (obj instanceof PKIStatusInfo)
-        {
-            return (PKIStatusInfo)obj;
-        }
-        else if (obj != null)
-        {
-            return new PKIStatusInfo(ASN1Sequence.getInstance(obj));
-        }
-
-        return null;
-    }
-
-    private PKIStatusInfo(
-        ASN1Sequence seq)
-    {
-        this.status = ASN1Integer.getInstance(seq.getObjectAt(0));
-
-        this.statusString = null;
-        this.failInfo = null;
-
-        if (seq.size() > 2)
-        {
-            this.statusString = PKIFreeText.getInstance(seq.getObjectAt(1));
-            this.failInfo = DERBitString.getInstance(seq.getObjectAt(2));
-        }
-        else if (seq.size() > 1)
-        {
-            Object obj = seq.getObjectAt(1); 
-            if (obj instanceof DERBitString)
-            {
-                this.failInfo = DERBitString.getInstance(obj);
-            }
-            else
-            {
-                this.statusString = PKIFreeText.getInstance(obj);
-            }
-        }
-    }
-
-    /**
-     * @param status
-     */
-    public PKIStatusInfo(PKIStatus status)
-    {
-        this.status = ASN1Integer.getInstance(status.toASN1Primitive());
-    }
-
-    /**
-     *
-     * @param status
-     * @param statusString
-     */
-    public PKIStatusInfo(
-        PKIStatus   status,
-        PKIFreeText statusString)
-    {
-        this.status = ASN1Integer.getInstance(status.toASN1Primitive());
-        this.statusString = statusString;
-    }
-
-    public PKIStatusInfo(
-        PKIStatus      status,
-        PKIFreeText    statusString,
-        PKIFailureInfo failInfo)
-    {
-        this.status = ASN1Integer.getInstance(status.toASN1Primitive());
-        this.statusString = statusString;
-        this.failInfo = failInfo;
-    }
-    
-    public BigInteger getStatus()
-    {
-        return status.getValue();
-    }
-
-    public PKIFreeText getStatusString()
-    {
-        return statusString;
-    }
-
-    public DERBitString getFailInfo()
-    {
-        return failInfo;
-    }
-
-    /**
-     * <pre>
-     * PKIStatusInfo ::= SEQUENCE {
-     *     status        PKIStatus,                (INTEGER)
-     *     statusString  PKIFreeText     OPTIONAL,
-     *     failInfo      PKIFailureInfo  OPTIONAL  (BIT STRING)
-     * }
-     *
-     * PKIStatus:
-     *   granted                (0), -- you got exactly what you asked for
-     *   grantedWithMods        (1), -- you got something like what you asked for
-     *   rejection              (2), -- you don't get it, more information elsewhere in the message
-     *   waiting                (3), -- the request body part has not yet been processed, expect to hear more later
-     *   revocationWarning      (4), -- this message contains a warning that a revocation is imminent
-     *   revocationNotification (5), -- notification that a revocation has occurred
-     *   keyUpdateWarning       (6)  -- update already done for the oldCertId specified in CertReqMsg
-     *
-     * PKIFailureInfo:
-     *   badAlg           (0), -- unrecognized or unsupported Algorithm Identifier
-     *   badMessageCheck  (1), -- integrity check failed (e.g., signature did not verify)
-     *   badRequest       (2), -- transaction not permitted or supported
-     *   badTime          (3), -- messageTime was not sufficiently close to the system time, as defined by local policy
-     *   badCertId        (4), -- no certificate could be found matching the provided criteria
-     *   badDataFormat    (5), -- the data submitted has the wrong format
-     *   wrongAuthority   (6), -- the authority indicated in the request is different from the one creating the response token
-     *   incorrectData    (7), -- the requester's data is incorrect (for notary services)
-     *   missingTimeStamp (8), -- when the timestamp is missing but should be there (by policy)
-     *   badPOP           (9)  -- the proof-of-possession failed
-     *
-     * </pre>
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector  v = new ASN1EncodableVector();
-
-        v.add(status);
-
-        if (statusString != null)
-        {
-            v.add(statusString);
-        }
-
-        if (failInfo!= null)
-        {
-            v.add(failInfo);
-        }
-
-        return new DERSequence(v);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/cmp/POPODecKeyChallContent.java b/bcprov/src/main/java/org/bouncycastle/asn1/cmp/POPODecKeyChallContent.java
deleted file mode 100644
index 2234068..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/cmp/POPODecKeyChallContent.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package org.bouncycastle.asn1.cmp;
-
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-
-public class POPODecKeyChallContent
-    extends ASN1Object
-{
-    private ASN1Sequence content;
-
-    private POPODecKeyChallContent(ASN1Sequence seq)
-    {
-        content = seq;
-    }
-
-    public static POPODecKeyChallContent getInstance(Object o)
-    {
-        if (o instanceof POPODecKeyChallContent)
-        {
-            return (POPODecKeyChallContent)o;
-        }
-
-        if (o != null)
-        {
-            return new POPODecKeyChallContent(ASN1Sequence.getInstance(o));
-        }
-
-        return null;
-    }
-
-    public Challenge[] toChallengeArray()
-    {
-        Challenge[] result = new Challenge[content.size()];
-
-        for (int i = 0; i != result.length; i++)
-        {
-            result[i] = Challenge.getInstance(content.getObjectAt(i));
-        }
-
-        return result;
-    }
-
-    /**
-     * <pre>
-     * POPODecKeyChallContent ::= SEQUENCE OF Challenge
-     * </pre>
-     * @return a basic ASN.1 object representation.
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        return content;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/cmp/POPODecKeyRespContent.java b/bcprov/src/main/java/org/bouncycastle/asn1/cmp/POPODecKeyRespContent.java
deleted file mode 100644
index 9c64db0..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/cmp/POPODecKeyRespContent.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package org.bouncycastle.asn1.cmp;
-
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-
-public class POPODecKeyRespContent
-    extends ASN1Object
-{
-    private ASN1Sequence content;
-
-    private POPODecKeyRespContent(ASN1Sequence seq)
-    {
-        content = seq;
-    }
-
-    public static POPODecKeyRespContent getInstance(Object o)
-    {
-        if (o instanceof POPODecKeyRespContent)
-        {
-            return (POPODecKeyRespContent)o;
-        }
-
-        if (o != null)
-        {
-            return new POPODecKeyRespContent(ASN1Sequence.getInstance(o));
-        }
-
-        return null;
-    }
-
-    public ASN1Integer[] toASN1IntegerArray()
-    {
-        ASN1Integer[] result = new ASN1Integer[content.size()];
-
-        for (int i = 0; i != result.length; i++)
-        {
-            result[i] = ASN1Integer.getInstance(content.getObjectAt(i));
-        }
-
-        return result;
-    }
-
-    /**
-     * <pre>
-     * POPODecKeyRespContent ::= SEQUENCE OF INTEGER
-     * </pre>
-     * @return a basic ASN.1 object representation.
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        return content;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/cmp/PollRepContent.java b/bcprov/src/main/java/org/bouncycastle/asn1/cmp/PollRepContent.java
deleted file mode 100644
index 95d5f82..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/cmp/PollRepContent.java
+++ /dev/null
@@ -1,119 +0,0 @@
-package org.bouncycastle.asn1.cmp;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DERSequence;
-
-public class PollRepContent
-    extends ASN1Object
-{
-    private ASN1Integer[] certReqId;
-    private ASN1Integer[] checkAfter;
-    private PKIFreeText[] reason;
-
-    private PollRepContent(ASN1Sequence seq)
-    {
-        certReqId = new ASN1Integer[seq.size()];
-        checkAfter = new ASN1Integer[seq.size()];
-        reason = new PKIFreeText[seq.size()];
-
-        for (int i = 0; i != seq.size(); i++)
-        {
-            ASN1Sequence s = ASN1Sequence.getInstance(seq.getObjectAt(i));
-
-            certReqId[i] = ASN1Integer.getInstance(s.getObjectAt(0));
-            checkAfter[i] = ASN1Integer.getInstance(s.getObjectAt(1));
-
-            if (s.size() > 2)
-            {
-                reason[i] = PKIFreeText.getInstance(s.getObjectAt(2));
-            }
-        }
-    }
-
-    public static PollRepContent getInstance(Object o)
-    {
-        if (o instanceof PollRepContent)
-        {
-            return (PollRepContent)o;
-        }
-
-        if (o != null)
-        {
-            return new PollRepContent(ASN1Sequence.getInstance(o));
-        }
-
-        return null;
-    }
-
-    public PollRepContent(ASN1Integer certReqId, ASN1Integer checkAfter)
-    {
-        this(certReqId, checkAfter, null);
-    }
-
-    public PollRepContent(ASN1Integer certReqId, ASN1Integer checkAfter, PKIFreeText reason)
-    {
-        this.certReqId = new ASN1Integer[1];
-        this.checkAfter = new ASN1Integer[1];
-        this.reason = new PKIFreeText[1];
-
-        this.certReqId[0] = certReqId;
-        this.checkAfter[0] = checkAfter;
-        this.reason[0] = reason;
-    }
-
-    public int size()
-    {
-        return certReqId.length;
-    }
-
-    public ASN1Integer getCertReqId(int index)
-    {
-        return certReqId[index];
-    }
-
-    public ASN1Integer getCheckAfter(int index)
-    {
-        return checkAfter[index];
-    }
-
-    public PKIFreeText getReason(int index)
-    {
-        return reason[index];
-    }
-
-    /**
-     * <pre>
-     * PollRepContent ::= SEQUENCE OF SEQUENCE {
-     *         certReqId              INTEGER,
-     *         checkAfter             INTEGER,  -- time in seconds
-     *         reason                 PKIFreeText OPTIONAL
-     *     }
-     * </pre>
-     * @return a basic ASN.1 object representation.
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector outer = new ASN1EncodableVector();
-
-        for (int i = 0; i != certReqId.length; i++)
-        {
-            ASN1EncodableVector v = new ASN1EncodableVector();
-
-            v.add(certReqId[i]);
-            v.add(checkAfter[i]);
-
-            if (reason[i] != null)
-            {
-                v.add(reason[i]);
-            }
-
-            outer.add(new DERSequence(v));
-        }
-        
-        return new DERSequence(outer);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/cmp/PollReqContent.java b/bcprov/src/main/java/org/bouncycastle/asn1/cmp/PollReqContent.java
deleted file mode 100644
index de059c5..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/cmp/PollReqContent.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package org.bouncycastle.asn1.cmp;
-
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DERSequence;
-
-public class PollReqContent
-    extends ASN1Object
-{
-    private ASN1Sequence content;
-
-    private PollReqContent(ASN1Sequence seq)
-    {
-        content = seq;
-    }
-
-    public static PollReqContent getInstance(Object o)
-    {
-        if (o instanceof PollReqContent)
-        {
-            return (PollReqContent)o;
-        }
-
-        if (o != null)
-        {
-            return new PollReqContent(ASN1Sequence.getInstance(o));
-        }
-
-        return null;
-    }
-
-    /**
-     * Create a pollReqContent for a single certReqId.
-     *
-     * @param certReqId the certificate request ID.
-     */
-    public PollReqContent(ASN1Integer certReqId)
-    {
-        this(new DERSequence(new DERSequence(certReqId)));
-    }
-
-    public ASN1Integer[][] getCertReqIds()
-    {
-        ASN1Integer[][] result = new ASN1Integer[content.size()][];
-
-        for (int i = 0; i != result.length; i++)
-        {
-            result[i] = sequenceToASN1IntegerArray((ASN1Sequence)content.getObjectAt(i));
-        }
-
-        return result;
-    }
-
-    private static ASN1Integer[] sequenceToASN1IntegerArray(ASN1Sequence seq)
-    {
-         ASN1Integer[] result = new ASN1Integer[seq.size()];
-
-        for (int i = 0; i != result.length; i++)
-        {
-            result[i] = ASN1Integer.getInstance(seq.getObjectAt(i));
-        }
-
-        return result;
-    }
-
-    /**
-     * <pre>
-     * PollReqContent ::= SEQUENCE OF SEQUENCE {
-     *                        certReqId              INTEGER
-     * }
-     * </pre>
-     * @return a basic ASN.1 object representation.
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        return content;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/cmp/ProtectedPart.java b/bcprov/src/main/java/org/bouncycastle/asn1/cmp/ProtectedPart.java
deleted file mode 100644
index 38e4fb8..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/cmp/ProtectedPart.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package org.bouncycastle.asn1.cmp;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DERSequence;
-
-public class ProtectedPart
-    extends ASN1Object
-{
-    private PKIHeader header;
-    private PKIBody body;
-
-    private ProtectedPart(ASN1Sequence seq)
-    {
-        header = PKIHeader.getInstance(seq.getObjectAt(0));
-        body = PKIBody.getInstance(seq.getObjectAt(1));
-    }
-
-    public static ProtectedPart getInstance(Object o)
-    {
-        if (o instanceof ProtectedPart)
-        {
-            return (ProtectedPart)o;
-        }
-
-        if (o != null)
-        {
-            return new ProtectedPart(ASN1Sequence.getInstance(o));
-        }
-
-        return null;
-    }
-
-    public ProtectedPart(PKIHeader header, PKIBody body)
-    {
-        this.header = header;
-        this.body = body;
-    }
-
-    public PKIHeader getHeader()
-    {
-        return header;
-    }
-
-    public PKIBody getBody()
-    {
-        return body;
-    }
-
-    /**
-     * <pre>
-     * ProtectedPart ::= SEQUENCE {
-     *                    header    PKIHeader,
-     *                    body      PKIBody
-     * }
-     * </pre>
-     * @return a basic ASN.1 object representation.
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector v = new ASN1EncodableVector();
-
-        v.add(header);
-        v.add(body);
-
-        return new DERSequence(v);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/cmp/RevAnnContent.java b/bcprov/src/main/java/org/bouncycastle/asn1/cmp/RevAnnContent.java
deleted file mode 100644
index 36b4621..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/cmp/RevAnnContent.java
+++ /dev/null
@@ -1,103 +0,0 @@
-package org.bouncycastle.asn1.cmp;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1GeneralizedTime;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.crmf.CertId;
-import org.bouncycastle.asn1.x509.Extensions;
-
-public class RevAnnContent
-    extends ASN1Object
-{
-    private PKIStatus status;
-    private CertId certId;
-    private ASN1GeneralizedTime willBeRevokedAt;
-    private ASN1GeneralizedTime badSinceDate;
-    private Extensions crlDetails;
-    
-    private RevAnnContent(ASN1Sequence seq)
-    {
-        status = PKIStatus.getInstance(seq.getObjectAt(0));
-        certId = CertId.getInstance(seq.getObjectAt(1));
-        willBeRevokedAt = ASN1GeneralizedTime.getInstance(seq.getObjectAt(2));
-        badSinceDate = ASN1GeneralizedTime.getInstance(seq.getObjectAt(3));
-
-        if (seq.size() > 4)
-        {
-            crlDetails = Extensions.getInstance(seq.getObjectAt(4));
-        }
-    }
-
-    public static RevAnnContent getInstance(Object o)
-    {
-        if (o instanceof RevAnnContent)
-        {
-            return (RevAnnContent)o;
-        }
-
-        if (o != null)
-        {
-            return new RevAnnContent(ASN1Sequence.getInstance(o));
-        }
-
-        return null;
-    }
-
-    public PKIStatus getStatus()
-    {
-        return status;
-    }
-
-    public CertId getCertId()
-    {
-        return certId;
-    }
-
-    public ASN1GeneralizedTime getWillBeRevokedAt()
-    {
-        return willBeRevokedAt;
-    }
-
-    public ASN1GeneralizedTime getBadSinceDate()
-    {
-        return badSinceDate;
-    }
-
-    public Extensions getCrlDetails()
-    {
-        return crlDetails;
-    }
-
-    /**
-     * <pre>
-     * RevAnnContent ::= SEQUENCE {
-     *       status              PKIStatus,
-     *       certId              CertId,
-     *       willBeRevokedAt     GeneralizedTime,
-     *       badSinceDate        GeneralizedTime,
-     *       crlDetails          Extensions  OPTIONAL
-     *        -- extra CRL details (e.g., crl number, reason, location, etc.)
-     * }
-     * </pre>
-     * @return a basic ASN.1 object representation.
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector v = new ASN1EncodableVector();
-
-        v.add(status);
-        v.add(certId);
-        v.add(willBeRevokedAt);
-        v.add(badSinceDate);
-
-        if (crlDetails != null)
-        {
-            v.add(crlDetails);
-        }
-
-        return new DERSequence(v);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/cmp/RevDetails.java b/bcprov/src/main/java/org/bouncycastle/asn1/cmp/RevDetails.java
deleted file mode 100644
index 3d9eb71..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/cmp/RevDetails.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package org.bouncycastle.asn1.cmp;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.crmf.CertTemplate;
-import org.bouncycastle.asn1.x509.Extensions;
-import org.bouncycastle.asn1.x509.X509Extensions;
-
-public class RevDetails
-    extends ASN1Object
-{
-    private CertTemplate certDetails;
-    private Extensions crlEntryDetails;
-
-    private RevDetails(ASN1Sequence seq)
-    {
-        certDetails = CertTemplate.getInstance(seq.getObjectAt(0));
-        if  (seq.size() > 1)
-        {
-            crlEntryDetails = Extensions.getInstance(seq.getObjectAt(1));
-        }
-    }
-
-    public static RevDetails getInstance(Object o)
-    {
-        if (o instanceof RevDetails)
-        {
-            return (RevDetails)o;
-        }
-
-        if (o != null)
-        {
-            return new RevDetails(ASN1Sequence.getInstance(o));
-        }
-
-        return null;
-    }
-
-    public RevDetails(CertTemplate certDetails)
-    {
-        this.certDetails = certDetails;
-    }
-
-    /**
-     * @deprecated use method taking Extensions
-     * @param certDetails
-     * @param crlEntryDetails
-     */
-    public RevDetails(CertTemplate certDetails, X509Extensions crlEntryDetails)
-    {
-        this.certDetails = certDetails;
-        this.crlEntryDetails = Extensions.getInstance(crlEntryDetails.toASN1Primitive());
-    }
-
-    public RevDetails(CertTemplate certDetails, Extensions crlEntryDetails)
-    {
-        this.certDetails = certDetails;
-        this.crlEntryDetails = crlEntryDetails;
-    }
-
-    public CertTemplate getCertDetails()
-    {
-        return certDetails;
-    }
-
-    public Extensions getCrlEntryDetails()
-    {
-        return crlEntryDetails;
-    }
-
-    /**
-     * <pre>
-     * RevDetails ::= SEQUENCE {
-     *                  certDetails         CertTemplate,
-     *                   -- allows requester to specify as much as they can about
-     *                   -- the cert. for which revocation is requested
-     *                   -- (e.g., for cases in which serialNumber is not available)
-     *                   crlEntryDetails     Extensions       OPTIONAL
-     *                   -- requested crlEntryExtensions
-     *             }
-     * </pre>
-     * @return a basic ASN.1 object representation.
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector v = new ASN1EncodableVector();
-
-        v.add(certDetails);
-
-        if (crlEntryDetails != null)
-        {
-            v.add(crlEntryDetails);
-        }
-
-        return new DERSequence(v);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/cmp/RevRepContent.java b/bcprov/src/main/java/org/bouncycastle/asn1/cmp/RevRepContent.java
deleted file mode 100644
index 5cbb8e6..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/cmp/RevRepContent.java
+++ /dev/null
@@ -1,137 +0,0 @@
-package org.bouncycastle.asn1.cmp;
-
-import java.util.Enumeration;
-
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.ASN1TaggedObject;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.DERTaggedObject;
-import org.bouncycastle.asn1.crmf.CertId;
-import org.bouncycastle.asn1.x509.CertificateList;
-
-public class RevRepContent
-    extends ASN1Object
-{
-    private ASN1Sequence status;
-    private ASN1Sequence revCerts;
-    private ASN1Sequence crls;
-
-    private RevRepContent(ASN1Sequence seq)
-    {
-        Enumeration en = seq.getObjects();
-
-        status = ASN1Sequence.getInstance(en.nextElement());
-        while (en.hasMoreElements())
-        {
-            ASN1TaggedObject tObj = ASN1TaggedObject.getInstance(en.nextElement());
-
-            if (tObj.getTagNo() == 0)
-            {
-                revCerts = ASN1Sequence.getInstance(tObj, true);
-            }
-            else
-            {
-                crls = ASN1Sequence.getInstance(tObj, true);
-            }
-        }
-    }
-
-    public static RevRepContent getInstance(Object o)
-    {
-        if (o instanceof RevRepContent)
-        {
-            return (RevRepContent)o;
-        }
-
-        if (o != null)
-        {
-            return new RevRepContent(ASN1Sequence.getInstance(o));
-        }
-
-        return null;
-    }
-
-    public PKIStatusInfo[] getStatus()
-    {
-        PKIStatusInfo[] results = new PKIStatusInfo[status.size()];
-
-        for (int i = 0; i != results.length; i++)
-        {
-            results[i] = PKIStatusInfo.getInstance(status.getObjectAt(i));
-        }
-
-        return results;
-    }
-
-    public CertId[] getRevCerts()
-    {
-        if (revCerts == null)
-        {
-            return null;
-        }
-
-        CertId[] results = new CertId[revCerts.size()];
-
-        for (int i = 0; i != results.length; i++)
-        {
-            results[i] = CertId.getInstance(revCerts.getObjectAt(i));
-        }
-
-        return results;
-    }
-
-    public CertificateList[] getCrls()
-    {
-        if (crls == null)
-        {
-            return null;
-        }
-
-        CertificateList[] results = new CertificateList[crls.size()];
-
-        for (int i = 0; i != results.length; i++)
-        {
-            results[i] = CertificateList.getInstance(crls.getObjectAt(i));
-        }
-
-        return results;
-    }
-
-    /**
-     * <pre>
-     * RevRepContent ::= SEQUENCE {
-     *        status       SEQUENCE SIZE (1..MAX) OF PKIStatusInfo,
-     *        -- in same order as was sent in RevReqContent
-     *        revCerts [0] SEQUENCE SIZE (1..MAX) OF CertId OPTIONAL,
-     *        -- IDs for which revocation was requested
-     *        -- (same order as status)
-     *        crls     [1] SEQUENCE SIZE (1..MAX) OF CertificateList OPTIONAL
-     *        -- the resulting CRLs (there may be more than one)
-     *   }
-     * </pre>
-     * @return a basic ASN.1 object representation.
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector v = new ASN1EncodableVector();
-
-        v.add(status);
-
-        addOptional(v, 0, revCerts);
-        addOptional(v, 1, crls);
-
-        return new DERSequence(v);
-    }
-
-    private void addOptional(ASN1EncodableVector v, int tagNo, ASN1Encodable obj)
-    {
-        if (obj != null)
-        {
-            v.add(new DERTaggedObject(true, tagNo, obj));
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/cmp/RevRepContentBuilder.java b/bcprov/src/main/java/org/bouncycastle/asn1/cmp/RevRepContentBuilder.java
deleted file mode 100644
index 10522c2..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/cmp/RevRepContentBuilder.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package org.bouncycastle.asn1.cmp;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.DERTaggedObject;
-import org.bouncycastle.asn1.crmf.CertId;
-import org.bouncycastle.asn1.x509.CertificateList;
-
-public class RevRepContentBuilder
-{
-    private ASN1EncodableVector status = new ASN1EncodableVector();
-    private ASN1EncodableVector revCerts = new ASN1EncodableVector();
-    private ASN1EncodableVector crls = new ASN1EncodableVector();
-
-    public RevRepContentBuilder add(PKIStatusInfo status)
-    {
-        this.status.add(status);
-
-        return this;
-    }
-
-    public RevRepContentBuilder add(PKIStatusInfo status, CertId certId)
-    {
-        if (this.status.size() != this.revCerts.size())
-        {
-            throw new IllegalStateException("status and revCerts sequence must be in common order");
-        }
-        this.status.add(status);
-        this.revCerts.add(certId);
-
-        return this;
-    }
-
-    public RevRepContentBuilder addCrl(CertificateList crl)
-    {
-        this.crls.add(crl);
-
-        return this;
-    }
-
-    public RevRepContent build()
-    {
-        ASN1EncodableVector v = new ASN1EncodableVector();
-
-        v.add(new DERSequence(status));
-
-        if (revCerts.size() != 0)
-        {
-            v.add(new DERTaggedObject(true, 0, new DERSequence(revCerts)));
-        }
-
-        if (crls.size() != 0)
-        {
-            v.add(new DERTaggedObject(true, 1, new DERSequence(crls)));
-        }
-
-        return RevRepContent.getInstance(new DERSequence(v));
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/cmp/RevReqContent.java b/bcprov/src/main/java/org/bouncycastle/asn1/cmp/RevReqContent.java
deleted file mode 100644
index 468be4e..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/cmp/RevReqContent.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package org.bouncycastle.asn1.cmp;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DERSequence;
-
-public class RevReqContent
-    extends ASN1Object
-{
-    private ASN1Sequence content;
-
-    private RevReqContent(ASN1Sequence seq)
-    {
-        content = seq;
-    }
-
-    public static RevReqContent getInstance(Object o)
-    {
-        if (o instanceof RevReqContent)
-        {
-            return (RevReqContent)o;
-        }
-
-        if (o != null)
-        {
-            return new RevReqContent(ASN1Sequence.getInstance(o));
-        }
-
-        return null;
-    }
-
-    public RevReqContent(RevDetails revDetails)
-    {
-        this.content = new DERSequence(revDetails);
-    }
-
-    public RevReqContent(RevDetails[] revDetailsArray)
-    {
-        ASN1EncodableVector v = new ASN1EncodableVector();
-
-        for (int i = 0; i != revDetailsArray.length; i++)
-        {
-            v.add(revDetailsArray[i]);
-        }
-
-        this.content = new DERSequence(v);
-    }
-
-    public RevDetails[] toRevDetailsArray()
-    {
-        RevDetails[] result = new RevDetails[content.size()];
-
-        for (int i = 0; i != result.length; i++)
-        {
-            result[i] = RevDetails.getInstance(content.getObjectAt(i));
-        }
-
-        return result;
-    }
-
-    /**
-     * <pre>
-     * RevReqContent ::= SEQUENCE OF RevDetails
-     * </pre>
-     * @return a basic ASN.1 object representation.
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        return content;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/cmp/package.html b/bcprov/src/main/java/org/bouncycastle/asn1/cmp/package.html
deleted file mode 100644
index d5ce6b9..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/cmp/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body bgcolor="#ffffff">
-Support classes useful for encoding and supporting PKIX-CMP as described RFC 4210.
-</body>
-</html>
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/cms/AuthEnvelopedData.java b/bcprov/src/main/java/org/bouncycastle/asn1/cms/AuthEnvelopedData.java
deleted file mode 100644
index 034753f..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/cms/AuthEnvelopedData.java
+++ /dev/null
@@ -1,248 +0,0 @@
-package org.bouncycastle.asn1.cms;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.ASN1Set;
-import org.bouncycastle.asn1.ASN1TaggedObject;
-import org.bouncycastle.asn1.BERSequence;
-import org.bouncycastle.asn1.DERTaggedObject;
-
-/**
- * <a href="http://tools.ietf.org/html/rfc5083">RFC 5083</a>:
- *
- * CMS AuthEnveloped Data object.
- * <p>
- * ASN.1:
- * <pre>
- * id-ct-authEnvelopedData OBJECT IDENTIFIER ::= { iso(1)
- *       member-body(2) us(840) rsadsi(113549) pkcs(1) pkcs-9(9)
- *       smime(16) ct(1) 23 }
- *
- * AuthEnvelopedData ::= SEQUENCE {
- *       version CMSVersion,
- *       originatorInfo [0] IMPLICIT OriginatorInfo OPTIONAL,
- *       recipientInfos RecipientInfos,
- *       authEncryptedContentInfo EncryptedContentInfo,
- *       authAttrs [1] IMPLICIT AuthAttributes OPTIONAL,
- *       mac MessageAuthenticationCode,
- *       unauthAttrs [2] IMPLICIT UnauthAttributes OPTIONAL }
- * </pre>
- */
-public class AuthEnvelopedData
-    extends ASN1Object
-{
-    private ASN1Integer version;
-    private OriginatorInfo originatorInfo;
-    private ASN1Set recipientInfos;
-    private EncryptedContentInfo authEncryptedContentInfo;
-    private ASN1Set authAttrs;
-    private ASN1OctetString mac;
-    private ASN1Set unauthAttrs;
-
-    public AuthEnvelopedData(
-        OriginatorInfo originatorInfo,
-        ASN1Set recipientInfos,
-        EncryptedContentInfo authEncryptedContentInfo,
-        ASN1Set authAttrs,
-        ASN1OctetString mac,
-        ASN1Set unauthAttrs)
-    {
-        // "It MUST be set to 0."
-        this.version = new ASN1Integer(0);
-
-        this.originatorInfo = originatorInfo;
-
-        // TODO
-        // "There MUST be at least one element in the collection."
-        this.recipientInfos = recipientInfos;
-
-        this.authEncryptedContentInfo = authEncryptedContentInfo;
-
-        // TODO
-        // "The authAttrs MUST be present if the content type carried in
-        // EncryptedContentInfo is not id-data."
-        this.authAttrs = authAttrs;
-
-        this.mac = mac;
-
-        this.unauthAttrs = unauthAttrs;
-    }
-
-    /**
-     * Constructs AuthEnvelopedData by parsing supplied ASN1Sequence
-     * <p>
-     * @param seq An ASN1Sequence with AuthEnvelopedData
-     * @deprecated use getInstance().
-     */
-    public AuthEnvelopedData(
-        ASN1Sequence seq)
-    {
-        int index = 0;
-
-        // TODO
-        // "It MUST be set to 0."
-        ASN1Primitive tmp = seq.getObjectAt(index++).toASN1Primitive();
-        version = (ASN1Integer)tmp;
-
-        tmp = seq.getObjectAt(index++).toASN1Primitive();
-        if (tmp instanceof ASN1TaggedObject)
-        {
-            originatorInfo = OriginatorInfo.getInstance((ASN1TaggedObject)tmp, false);
-            tmp = seq.getObjectAt(index++).toASN1Primitive();
-        }
-
-        // TODO
-        // "There MUST be at least one element in the collection."
-        recipientInfos = ASN1Set.getInstance(tmp);
-
-        tmp = seq.getObjectAt(index++).toASN1Primitive();
-        authEncryptedContentInfo = EncryptedContentInfo.getInstance(tmp);
-
-        tmp = seq.getObjectAt(index++).toASN1Primitive();
-        if (tmp instanceof ASN1TaggedObject)
-        {
-            authAttrs = ASN1Set.getInstance((ASN1TaggedObject)tmp, false);
-            tmp = seq.getObjectAt(index++).toASN1Primitive();
-        }
-        else
-        {
-            // TODO
-            // "The authAttrs MUST be present if the content type carried in
-            // EncryptedContentInfo is not id-data."
-        }
-
-        mac = ASN1OctetString.getInstance(tmp);
-
-        if (seq.size() > index)
-        {
-            tmp = seq.getObjectAt(index++).toASN1Primitive();
-            unauthAttrs = ASN1Set.getInstance((ASN1TaggedObject)tmp, false);
-        }
-    }
-
-    /**
-     * Return an AuthEnvelopedData object from a tagged object.
-     * <p>
-     * Accepted inputs:
-     * <ul>
-     * <li> {@link org.bouncycastle.asn1.ASN1Sequence#getInstance(java.lang.Object) ASN1Sequence} input formats
-     * </ul>
-     *
-
-     * @param obj      the tagged object holding the object we want.
-     * @param explicit true if the object is meant to be explicitly
-     *                 tagged false otherwise.
-     * @throws IllegalArgumentException if the object held by the
-     *                                  tagged object cannot be converted.
-     */
-    public static AuthEnvelopedData getInstance(
-        ASN1TaggedObject obj,
-        boolean explicit)
-    {
-        return getInstance(ASN1Sequence.getInstance(obj, explicit));
-    }
-
-    /**
-     * Return an AuthEnvelopedData object from the given object.
-     * <p>
-     * Accepted inputs:
-     * <ul>
-     * <li> null &rarr; null
-     * <li> {@link AuthEnvelopedData} object
-     * <li> {@link ASN1Sequence org.bouncycastle.asn1.ASN1Sequence} input formats with AuthEnvelopedData structure inside
-     * </ul>
-     *
-     * @param obj The object we want converted.
-     * @throws IllegalArgumentException if the object cannot be converted, or was null.
-     */
-    public static AuthEnvelopedData getInstance(
-        Object obj)
-    {
-        if (obj == null || obj instanceof AuthEnvelopedData)
-        {
-            return (AuthEnvelopedData)obj;
-        }
-
-        if (obj instanceof ASN1Sequence)
-        {
-            return new AuthEnvelopedData((ASN1Sequence)obj);
-        }
-
-        throw new IllegalArgumentException("Invalid AuthEnvelopedData: " + obj.getClass().getName());
-    }
-
-    public ASN1Integer getVersion()
-    {
-        return version;
-    }
-
-    public OriginatorInfo getOriginatorInfo()
-    {
-        return originatorInfo;
-    }
-
-    public ASN1Set getRecipientInfos()
-    {
-        return recipientInfos;
-    }
-
-    public EncryptedContentInfo getAuthEncryptedContentInfo()
-    {
-        return authEncryptedContentInfo;
-    }
-
-    public ASN1Set getAuthAttrs()
-    {
-        return authAttrs;
-    }
-
-    public ASN1OctetString getMac()
-    {
-        return mac;
-    }
-
-    public ASN1Set getUnauthAttrs()
-    {
-        return unauthAttrs;
-    }
-
-    /**
-     * Produce an object suitable for an ASN1OutputStream.
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector v = new ASN1EncodableVector();
-
-        v.add(version);
-
-        if (originatorInfo != null)
-        {
-            v.add(new DERTaggedObject(false, 0, originatorInfo));
-        }
-
-        v.add(recipientInfos);
-        v.add(authEncryptedContentInfo);
-
-        // "authAttrs optionally contains the authenticated attributes."
-        if (authAttrs != null)
-        {
-            // "AuthAttributes MUST be DER encoded, even if the rest of the
-            // AuthEnvelopedData structure is BER encoded."
-            v.add(new DERTaggedObject(false, 1, authAttrs));
-        }
-
-        v.add(mac);
-
-        // "unauthAttrs optionally contains the unauthenticated attributes."
-        if (unauthAttrs != null)
-        {
-            v.add(new DERTaggedObject(false, 2, unauthAttrs));
-        }
-
-        return new BERSequence(v);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/cms/AuthEnvelopedDataParser.java b/bcprov/src/main/java/org/bouncycastle/asn1/cms/AuthEnvelopedDataParser.java
deleted file mode 100644
index 8460c33..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/cms/AuthEnvelopedDataParser.java
+++ /dev/null
@@ -1,157 +0,0 @@
-package org.bouncycastle.asn1.cms;
-
-import java.io.IOException;
-
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.ASN1SequenceParser;
-import org.bouncycastle.asn1.ASN1SetParser;
-import org.bouncycastle.asn1.ASN1TaggedObjectParser;
-import org.bouncycastle.asn1.BERTags;
-
-/**
- * Parse {@link AuthEnvelopedData} input stream.
- * 
- * <pre>
- * AuthEnvelopedData ::= SEQUENCE {
- *   version CMSVersion,
- *   originatorInfo [0] IMPLICIT OriginatorInfo OPTIONAL,
- *   recipientInfos RecipientInfos,
- *   authEncryptedContentInfo EncryptedContentInfo,
- *   authAttrs [1] IMPLICIT AuthAttributes OPTIONAL,
- *   mac MessageAuthenticationCode,
- *   unauthAttrs [2] IMPLICIT UnauthAttributes OPTIONAL }
- * </pre>
- */
-public class AuthEnvelopedDataParser
-{
-    private ASN1SequenceParser seq;
-    private ASN1Integer version;
-    private ASN1Encodable nextObject;
-    private boolean originatorInfoCalled;
-
-    public AuthEnvelopedDataParser(ASN1SequenceParser seq) throws IOException
-    {
-        this.seq = seq;
-
-        // TODO
-        // "It MUST be set to 0."
-        this.version = ASN1Integer.getInstance(seq.readObject());
-    }
-
-    public ASN1Integer getVersion()
-    {
-        return version;
-    }
-
-    public OriginatorInfo getOriginatorInfo()
-        throws IOException
-    {
-        originatorInfoCalled = true;
-
-        if (nextObject == null)
-        {
-            nextObject = seq.readObject();
-        }
-
-        if (nextObject instanceof ASN1TaggedObjectParser && ((ASN1TaggedObjectParser)nextObject).getTagNo() == 0)
-        {
-            ASN1SequenceParser originatorInfo = (ASN1SequenceParser) ((ASN1TaggedObjectParser)nextObject).getObjectParser(BERTags.SEQUENCE, false);
-            nextObject = null;
-            return OriginatorInfo.getInstance(originatorInfo.toASN1Primitive());
-        }
-
-        return null;
-    }
-
-    public ASN1SetParser getRecipientInfos()
-        throws IOException
-    {
-        if (!originatorInfoCalled)
-        {
-            getOriginatorInfo();
-        }
-
-        if (nextObject == null)
-        {
-            nextObject = seq.readObject();
-        }
-
-        ASN1SetParser recipientInfos = (ASN1SetParser)nextObject;
-        nextObject = null;
-        return recipientInfos;
-    }
-
-    public EncryptedContentInfoParser getAuthEncryptedContentInfo() 
-        throws IOException
-    {
-        if (nextObject == null)
-        {
-            nextObject = seq.readObject();
-        }
-
-        if (nextObject != null)
-        {
-            ASN1SequenceParser o = (ASN1SequenceParser) nextObject;
-            nextObject = null;
-            return new EncryptedContentInfoParser(o);
-        }
-
-        return null;
-    }
-
-    public ASN1SetParser getAuthAttrs()
-        throws IOException
-    {
-        if (nextObject == null)
-        {
-            nextObject = seq.readObject();
-        }
-
-        if (nextObject instanceof ASN1TaggedObjectParser)
-        {
-            ASN1Encodable o = nextObject;
-            nextObject = null;
-            return (ASN1SetParser)((ASN1TaggedObjectParser)o).getObjectParser(BERTags.SET, false);
-        }
-
-        // TODO
-        // "The authAttrs MUST be present if the content type carried in
-        // EncryptedContentInfo is not id-data."
-
-        return null;
-    }
-
-    public ASN1OctetString getMac()
-        throws IOException
-    {
-        if (nextObject == null)
-        {
-            nextObject = seq.readObject();
-        }
-
-        ASN1Encodable o = nextObject;
-        nextObject = null;
-
-        return ASN1OctetString.getInstance(o.toASN1Primitive());
-    }
-
-    public ASN1SetParser getUnauthAttrs()
-        throws IOException
-    {
-        if (nextObject == null)
-        {
-            nextObject = seq.readObject();
-        }
-
-        if (nextObject != null)
-        {
-            ASN1Encodable o = nextObject;
-            nextObject = null;
-            return (ASN1SetParser)((ASN1TaggedObjectParser)o).getObjectParser(BERTags.SET, false);
-        }
-
-        return null;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/cms/AuthenticatedData.java b/bcprov/src/main/java/org/bouncycastle/asn1/cms/AuthenticatedData.java
deleted file mode 100644
index c0945f3..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/cms/AuthenticatedData.java
+++ /dev/null
@@ -1,312 +0,0 @@
-package org.bouncycastle.asn1.cms;
-
-import java.util.Enumeration;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.ASN1Set;
-import org.bouncycastle.asn1.ASN1TaggedObject;
-import org.bouncycastle.asn1.BERSequence;
-import org.bouncycastle.asn1.DERTaggedObject;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-
-/**
- * <a href="http://tools.ietf.org/html/rfc5652#section-9.1">RFC 5652</a> section 9.1:
- * The AuthenticatedData carries AuthAttributes and other data
- * which define what really is being signed.
- * <p>
- * <pre>
- * AuthenticatedData ::= SEQUENCE {
- *       version CMSVersion,
- *       originatorInfo [0] IMPLICIT OriginatorInfo OPTIONAL,
- *       recipientInfos RecipientInfos,
- *       macAlgorithm MessageAuthenticationCodeAlgorithm,
- *       digestAlgorithm [1] DigestAlgorithmIdentifier OPTIONAL,
- *       encapContentInfo EncapsulatedContentInfo,
- *       authAttrs [2] IMPLICIT AuthAttributes OPTIONAL,
- *       mac MessageAuthenticationCode,
- *       unauthAttrs [3] IMPLICIT UnauthAttributes OPTIONAL }
- *
- * AuthAttributes ::= SET SIZE (1..MAX) OF Attribute
- *
- * UnauthAttributes ::= SET SIZE (1..MAX) OF Attribute
- *
- * MessageAuthenticationCode ::= OCTET STRING
- * </pre>
- */
-public class AuthenticatedData
-    extends ASN1Object
-{
-    private ASN1Integer version;
-    private OriginatorInfo originatorInfo;
-    private ASN1Set recipientInfos;
-    private AlgorithmIdentifier macAlgorithm;
-    private AlgorithmIdentifier digestAlgorithm;
-    private ContentInfo encapsulatedContentInfo;
-    private ASN1Set authAttrs;
-    private ASN1OctetString mac;
-    private ASN1Set unauthAttrs;
-
-    public AuthenticatedData(
-        OriginatorInfo originatorInfo,
-        ASN1Set recipientInfos,
-        AlgorithmIdentifier macAlgorithm,
-        AlgorithmIdentifier digestAlgorithm,
-        ContentInfo encapsulatedContent,
-        ASN1Set authAttrs,
-        ASN1OctetString mac,
-        ASN1Set unauthAttrs)
-    {
-        if (digestAlgorithm != null || authAttrs != null)
-        {
-            if (digestAlgorithm == null || authAttrs == null)
-            {
-                throw new IllegalArgumentException("digestAlgorithm and authAttrs must be set together");
-            }
-        }
-
-        version = new ASN1Integer(calculateVersion(originatorInfo));
-        
-        this.originatorInfo = originatorInfo;
-        this.macAlgorithm = macAlgorithm;
-        this.digestAlgorithm = digestAlgorithm;
-        this.recipientInfos = recipientInfos;
-        this.encapsulatedContentInfo = encapsulatedContent;
-        this.authAttrs = authAttrs;
-        this.mac = mac;
-        this.unauthAttrs = unauthAttrs;
-    }
-
-    /**
-     * @deprecated use getInstance()
-     */
-    public AuthenticatedData(
-        ASN1Sequence seq)
-    {
-        int index = 0;
-
-        version = (ASN1Integer)seq.getObjectAt(index++);
-
-        Object tmp = seq.getObjectAt(index++);
-
-        if (tmp instanceof ASN1TaggedObject)
-        {
-            originatorInfo = OriginatorInfo.getInstance((ASN1TaggedObject)tmp, false);
-            tmp = seq.getObjectAt(index++);
-        }
-
-        recipientInfos = ASN1Set.getInstance(tmp);
-        macAlgorithm = AlgorithmIdentifier.getInstance(seq.getObjectAt(index++));
-
-        tmp = seq.getObjectAt(index++);
-
-        if (tmp instanceof ASN1TaggedObject)
-        {
-            digestAlgorithm = AlgorithmIdentifier.getInstance((ASN1TaggedObject)tmp, false);
-            tmp = seq.getObjectAt(index++);
-        }
-
-        encapsulatedContentInfo = ContentInfo.getInstance(tmp);
-
-        tmp = seq.getObjectAt(index++);
-
-        if (tmp instanceof ASN1TaggedObject)
-        {
-            authAttrs = ASN1Set.getInstance((ASN1TaggedObject)tmp, false);
-            tmp = seq.getObjectAt(index++);
-        }
-
-        mac = ASN1OctetString.getInstance(tmp);
-        
-        if (seq.size() > index)
-        {
-            unauthAttrs = ASN1Set.getInstance((ASN1TaggedObject)seq.getObjectAt(index), false);
-        }
-    }
-
-    /**
-     * Return an AuthenticatedData object from a tagged object.
-     *
-     * @param obj      the tagged object holding the object we want.
-     * @param explicit true if the object is meant to be explicitly
-     *                 tagged false otherwise.
-     * @throws IllegalArgumentException if the object held by the
-     *                                  tagged object cannot be converted.
-     */
-    public static AuthenticatedData getInstance(
-        ASN1TaggedObject obj,
-        boolean explicit)
-    {
-        return getInstance(ASN1Sequence.getInstance(obj, explicit));
-    }
-
-    /**
-     * Return an AuthenticatedData object from the given object.
-     * <p>
-     * Accepted inputs:
-     * <ul>
-     * <li> null &rarr; null
-     * <li> {@link AuthenticatedData} object
-     * <li> {@link org.bouncycastle.asn1.ASN1Sequence#getInstance(java.lang.Object) ASN1Sequence} input formats with AuthenticatedData structure inside
-     * </ul>
-     *
-     * @param obj the object we want converted.
-     * @throws IllegalArgumentException if the object cannot be converted.
-     */
-    public static AuthenticatedData getInstance(
-        Object obj)
-    {
-        if (obj == null || obj instanceof AuthenticatedData)
-        {
-            return (AuthenticatedData)obj;
-        }
-
-        if (obj instanceof ASN1Sequence)
-        {
-            return new AuthenticatedData((ASN1Sequence)obj);
-        }
-
-        throw new IllegalArgumentException("Invalid AuthenticatedData: " + obj.getClass().getName());
-    }
-
-    public ASN1Integer getVersion()
-    {
-        return version;
-    }
-
-    public OriginatorInfo getOriginatorInfo()
-    {
-        return originatorInfo;
-    }
-
-    public ASN1Set getRecipientInfos()
-    {
-        return recipientInfos;
-    }
-
-    public AlgorithmIdentifier getMacAlgorithm()
-    {
-        return macAlgorithm;
-    }
-
-    public AlgorithmIdentifier getDigestAlgorithm()
-    {
-        return digestAlgorithm;
-    }
-
-    public ContentInfo getEncapsulatedContentInfo()
-    {
-        return encapsulatedContentInfo;
-    }
-
-    public ASN1Set getAuthAttrs()
-    {
-        return authAttrs;
-    }
-
-    public ASN1OctetString getMac()
-    {
-        return mac;
-    }
-
-    public ASN1Set getUnauthAttrs()
-    {
-        return unauthAttrs;
-    }
-
-    /**
-     * Produce an object suitable for an ASN1OutputStream.
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector v = new ASN1EncodableVector();
-
-        v.add(version);
-
-        if (originatorInfo != null)
-        {
-            v.add(new DERTaggedObject(false, 0, originatorInfo));
-        }
-
-        v.add(recipientInfos);
-        v.add(macAlgorithm);
-
-        if (digestAlgorithm != null)
-        {
-            v.add(new DERTaggedObject(false, 1, digestAlgorithm));
-        }
-
-        v.add(encapsulatedContentInfo);
-
-        if (authAttrs != null)
-        {
-            v.add(new DERTaggedObject(false, 2, authAttrs));
-        }
-
-        v.add(mac);
-
-        if (unauthAttrs != null)
-        {
-            v.add(new DERTaggedObject(false, 3, unauthAttrs));
-        }
-
-        return new BERSequence(v);
-    }
-
-    public static int calculateVersion(OriginatorInfo origInfo)
-    {
-        if (origInfo == null)
-        {
-            return 0;
-        }
-        else
-        {
-            int ver = 0;
-
-            for (Enumeration e = origInfo.getCertificates().getObjects(); e.hasMoreElements();)
-            {
-                Object obj = e.nextElement();
-
-                if (obj instanceof ASN1TaggedObject)
-                {
-                    ASN1TaggedObject tag = (ASN1TaggedObject)obj;
-
-                    if (tag.getTagNo() == 2)
-                    {
-                        ver = 1;
-                    }
-                    else if (tag.getTagNo() == 3)
-                    {
-                        ver = 3;
-                        break;
-                    }
-                }
-            }
-
-            if (origInfo.getCRLs() != null)
-            {
-                for (Enumeration e = origInfo.getCRLs().getObjects(); e.hasMoreElements();)
-                {
-                    Object obj = e.nextElement();
-
-                    if (obj instanceof ASN1TaggedObject)
-                    {
-                        ASN1TaggedObject tag = (ASN1TaggedObject)obj;
-
-                        if (tag.getTagNo() == 1)
-                        {
-                            ver = 3;
-                            break;
-                        }
-                    }
-                }
-            }
-
-            return ver;
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/cms/AuthenticatedDataParser.java b/bcprov/src/main/java/org/bouncycastle/asn1/cms/AuthenticatedDataParser.java
deleted file mode 100644
index ce9aa4f..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/cms/AuthenticatedDataParser.java
+++ /dev/null
@@ -1,206 +0,0 @@
-package org.bouncycastle.asn1.cms;
-
-import java.io.IOException;
-
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.ASN1SequenceParser;
-import org.bouncycastle.asn1.ASN1SetParser;
-import org.bouncycastle.asn1.ASN1TaggedObject;
-import org.bouncycastle.asn1.ASN1TaggedObjectParser;
-import org.bouncycastle.asn1.BERTags;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-
-/**
- * Parse {@link AuthenticatedData} stream.
- * <pre>
- * AuthenticatedData ::= SEQUENCE {
- *       version CMSVersion,
- *       originatorInfo [0] IMPLICIT OriginatorInfo OPTIONAL,
- *       recipientInfos RecipientInfos,
- *       macAlgorithm MessageAuthenticationCodeAlgorithm,
- *       digestAlgorithm [1] DigestAlgorithmIdentifier OPTIONAL,
- *       encapContentInfo EncapsulatedContentInfo,
- *       authAttrs [2] IMPLICIT AuthAttributes OPTIONAL,
- *       mac MessageAuthenticationCode,
- *       unauthAttrs [3] IMPLICIT UnauthAttributes OPTIONAL }
- *
- * AuthAttributes ::= SET SIZE (1..MAX) OF Attribute
- *
- * UnauthAttributes ::= SET SIZE (1..MAX) OF Attribute
- *
- * MessageAuthenticationCode ::= OCTET STRING
- * </pre>
- */
-public class AuthenticatedDataParser
-{
-    private ASN1SequenceParser seq;
-    private ASN1Integer version;
-    private ASN1Encodable nextObject;
-    private boolean originatorInfoCalled;
-
-    public AuthenticatedDataParser(
-        ASN1SequenceParser seq)
-        throws IOException
-    {
-        this.seq = seq;
-        this.version = ASN1Integer.getInstance(seq.readObject());
-    }
-
-    public ASN1Integer getVersion()
-    {
-        return version;
-    }
-
-    public OriginatorInfo getOriginatorInfo()
-        throws IOException
-    {
-        originatorInfoCalled = true;
-
-        if (nextObject == null)
-        {
-            nextObject = seq.readObject();
-        }
-
-        if (nextObject instanceof ASN1TaggedObjectParser && ((ASN1TaggedObjectParser)nextObject).getTagNo() == 0)
-        {
-            ASN1SequenceParser originatorInfo = (ASN1SequenceParser) ((ASN1TaggedObjectParser)nextObject).getObjectParser(BERTags.SEQUENCE, false);
-            nextObject = null;
-            return OriginatorInfo.getInstance(originatorInfo.toASN1Primitive());
-        }
-
-        return null;
-    }
-
-    public ASN1SetParser getRecipientInfos()
-        throws IOException
-    {
-        if (!originatorInfoCalled)
-        {
-            getOriginatorInfo();
-        }
-
-        if (nextObject == null)
-        {
-            nextObject = seq.readObject();
-        }
-
-        ASN1SetParser recipientInfos = (ASN1SetParser)nextObject;
-        nextObject = null;
-        return recipientInfos;
-    }
-
-    public AlgorithmIdentifier getMacAlgorithm()
-        throws IOException
-    {
-        if (nextObject == null)
-        {
-            nextObject = seq.readObject();
-        }
-
-        if (nextObject != null)
-        {
-            ASN1SequenceParser o = (ASN1SequenceParser)nextObject;
-            nextObject = null;
-            return AlgorithmIdentifier.getInstance(o.toASN1Primitive());
-        }
-
-        return null;
-    }
-
-    public AlgorithmIdentifier getDigestAlgorithm()
-        throws IOException
-    {
-        if (nextObject == null)
-        {
-            nextObject = seq.readObject();
-        }
-
-        if (nextObject instanceof ASN1TaggedObjectParser)
-        {
-            AlgorithmIdentifier obj = AlgorithmIdentifier.getInstance((ASN1TaggedObject)nextObject.toASN1Primitive(), false);
-            nextObject = null;
-            return obj;
-        }
-
-        return null;
-    }
-
-    /**
-     * @deprecated use getEncapsulatedContentInfo()
-     */
-    public ContentInfoParser getEnapsulatedContentInfo()
-        throws IOException
-    {
-        return getEncapsulatedContentInfo();
-    }
-
-    public ContentInfoParser getEncapsulatedContentInfo()
-        throws IOException
-    {
-        if (nextObject == null)
-        {
-            nextObject = seq.readObject();
-        }
-
-        if (nextObject != null)
-        {
-            ASN1SequenceParser o = (ASN1SequenceParser)nextObject;
-            nextObject = null;
-            return new ContentInfoParser(o);
-        }
-
-        return null;
-    }
-
-    public ASN1SetParser getAuthAttrs()
-        throws IOException
-    {
-        if (nextObject == null)
-        {
-            nextObject = seq.readObject();
-        }
-
-        if (nextObject instanceof ASN1TaggedObjectParser)
-        {
-            ASN1Encodable o = nextObject;
-            nextObject = null;
-            return (ASN1SetParser)((ASN1TaggedObjectParser)o).getObjectParser(BERTags.SET, false);
-        }
-
-        return null;
-    }
-
-    public ASN1OctetString getMac()
-        throws IOException
-    {
-        if (nextObject == null)
-        {
-            nextObject = seq.readObject();
-        }
-
-        ASN1Encodable o = nextObject;
-        nextObject = null;
-
-        return ASN1OctetString.getInstance(o.toASN1Primitive());
-    }
-
-    public ASN1SetParser getUnauthAttrs()
-        throws IOException
-    {
-        if (nextObject == null)
-        {
-            nextObject = seq.readObject();
-        }
-
-        if (nextObject != null)
-        {
-            ASN1Encodable o = nextObject;
-            nextObject = null;
-            return (ASN1SetParser)((ASN1TaggedObjectParser)o).getObjectParser(BERTags.SET, false);
-        }
-
-        return null;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/cms/CCMParameters.java b/bcprov/src/main/java/org/bouncycastle/asn1/cms/CCMParameters.java
deleted file mode 100644
index 3277bb2..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/cms/CCMParameters.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package org.bouncycastle.asn1.cms;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DEROctetString;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.util.Arrays;
-
-/**
- * <a href="http://tools.ietf.org/html/rfc5084">RFC 5084</a>: CCMParameters object.
- * <p>
- * <pre>
- CCMParameters ::= SEQUENCE {
-   aes-nonce        OCTET STRING, -- recommended size is 12 octets
-   aes-ICVlen       AES-CCM-ICVlen DEFAULT 12 }
- * </pre>
- */
-public class CCMParameters
-    extends ASN1Object
-{
-    private byte[] nonce;
-    private int icvLen;
-
-    /**
-     * Return an CCMParameters object from the given object.
-     * <p>
-     * Accepted inputs:
-     * <ul>
-     * <li> null &rarr; null
-     * <li> {@link org.bouncycastle.asn1.cms.CCMParameters} object
-     * <li> {@link org.bouncycastle.asn1.ASN1Sequence#getInstance(Object) ASN1Sequence} input formats with CCMParameters structure inside
-     * </ul>
-     *
-     * @param obj the object we want converted.
-     * @exception IllegalArgumentException if the object cannot be converted.
-     */
-    public static CCMParameters getInstance(
-        Object  obj)
-    {
-        if (obj instanceof CCMParameters)
-        {
-            return (CCMParameters)obj;
-        }
-        else if (obj != null)
-        {
-            return new CCMParameters(ASN1Sequence.getInstance(obj));
-        }
-
-        return null;
-    }
-
-    private CCMParameters(
-        ASN1Sequence seq)
-    {
-        this.nonce = ASN1OctetString.getInstance(seq.getObjectAt(0)).getOctets();
-
-        if (seq.size() == 2)
-        {
-            this.icvLen = ASN1Integer.getInstance(seq.getObjectAt(1)).getValue().intValue();
-        }
-        else
-        {
-            this.icvLen = 12;
-        }
-    }
-
-    public CCMParameters(
-        byte[] nonce,
-        int icvLen)
-    {
-        this.nonce = Arrays.clone(nonce);
-        this.icvLen = icvLen;
-    }
-
-    public byte[] getNonce()
-    {
-        return Arrays.clone(nonce);
-    }
-
-    public int getIcvLen()
-    {
-        return icvLen;
-    }
-
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector    v = new ASN1EncodableVector();
-
-        v.add(new DEROctetString(nonce));
-
-        if (icvLen != 12)
-        {
-            v.add(new ASN1Integer(icvLen));
-        }
-
-        return new DERSequence(v);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/cms/CompressedData.java b/bcprov/src/main/java/org/bouncycastle/asn1/cms/CompressedData.java
deleted file mode 100644
index e546470..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/cms/CompressedData.java
+++ /dev/null
@@ -1,117 +0,0 @@
-package org.bouncycastle.asn1.cms;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.ASN1TaggedObject;
-import org.bouncycastle.asn1.BERSequence;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-
-/** 
- * <a href="http://tools.ietf.org/html/rfc3274">RFC 3274</a>: CMS Compressed Data.
- * 
- * <pre>
- * CompressedData ::= SEQUENCE {
- *     version CMSVersion,
- *     compressionAlgorithm CompressionAlgorithmIdentifier,
- *     encapContentInfo EncapsulatedContentInfo
- * }
- * </pre>
- */
-public class CompressedData
-    extends ASN1Object
-{
-    private ASN1Integer           version;
-    private AlgorithmIdentifier  compressionAlgorithm;
-    private ContentInfo          encapContentInfo;
-
-    public CompressedData(
-        AlgorithmIdentifier compressionAlgorithm,
-        ContentInfo         encapContentInfo)
-    {
-        this.version = new ASN1Integer(0);
-        this.compressionAlgorithm = compressionAlgorithm;
-        this.encapContentInfo = encapContentInfo;
-    }
-    
-    private CompressedData(
-        ASN1Sequence seq)
-    {
-        this.version = (ASN1Integer)seq.getObjectAt(0);
-        this.compressionAlgorithm = AlgorithmIdentifier.getInstance(seq.getObjectAt(1));
-        this.encapContentInfo = ContentInfo.getInstance(seq.getObjectAt(2));
-    }
-
-    /**
-     * Return a CompressedData object from a tagged object.
-     *
-     * @param ato the tagged object holding the object we want.
-     * @param isExplicit true if the object is meant to be explicitly
-     *              tagged false otherwise.
-     * @exception IllegalArgumentException if the object held by the
-     *          tagged object cannot be converted.
-     */
-    public static CompressedData getInstance(
-        ASN1TaggedObject ato,
-        boolean isExplicit)
-    {
-        return getInstance(ASN1Sequence.getInstance(ato, isExplicit));
-    }
-    
-    /**
-     * Return a CompressedData object from the given object.
-     * <p>
-     * Accepted inputs:
-     * <ul>
-     * <li> null &rarr; null
-     * <li> {@link CompressedData} object
-     * <li> {@link org.bouncycastle.asn1.ASN1Sequence#getInstance(java.lang.Object) ASN1Sequence} input formats with CompressedData structure inside
-     * </ul>
-     *
-     * @param obj the object we want converted.
-     * @exception IllegalArgumentException if the object cannot be converted.
-     */
-    public static CompressedData getInstance(
-        Object obj)
-    {
-        if (obj instanceof CompressedData)
-        {
-            return (CompressedData)obj;
-        }
-
-        if (obj != null)
-        {
-            return new CompressedData(ASN1Sequence.getInstance(obj));
-        }
-
-        return null;
-    }
-
-    public ASN1Integer getVersion()
-    {
-        return version;
-    }
-
-    public AlgorithmIdentifier getCompressionAlgorithmIdentifier()
-    {
-        return compressionAlgorithm;
-    }
-
-    public ContentInfo getEncapContentInfo()
-    {
-        return encapContentInfo;
-    }
-
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector v = new ASN1EncodableVector();
-
-        v.add(version);
-        v.add(compressionAlgorithm);
-        v.add(encapContentInfo);
-
-        return new BERSequence(v);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/cms/CompressedDataParser.java b/bcprov/src/main/java/org/bouncycastle/asn1/cms/CompressedDataParser.java
deleted file mode 100644
index 41895ce..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/cms/CompressedDataParser.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package org.bouncycastle.asn1.cms;
-
-import java.io.IOException;
-
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1SequenceParser;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-
-/**
- * Parser of <a href="http://tools.ietf.org/html/rfc3274">RFC 3274</a> {@link CompressedData} object.
- * <p>
- * <pre>
- * CompressedData ::= SEQUENCE {
- *     version CMSVersion,
- *     compressionAlgorithm CompressionAlgorithmIdentifier,
- *     encapContentInfo EncapsulatedContentInfo
- * }
- * </pre>
- */
-public class CompressedDataParser
-{
-    private ASN1Integer _version;
-    private AlgorithmIdentifier _compressionAlgorithm;
-    private ContentInfoParser _encapContentInfo;
-
-    public CompressedDataParser(
-        ASN1SequenceParser seq)
-        throws IOException
-    {
-        this._version = (ASN1Integer)seq.readObject();
-        this._compressionAlgorithm = AlgorithmIdentifier.getInstance(seq.readObject().toASN1Primitive());
-        this._encapContentInfo = new ContentInfoParser((ASN1SequenceParser)seq.readObject());
-    }
-
-    public ASN1Integer getVersion()
-    {
-        return _version;
-    }
-
-    public AlgorithmIdentifier getCompressionAlgorithmIdentifier()
-    {
-        return _compressionAlgorithm;
-    }
-
-    public ContentInfoParser getEncapContentInfo()
-    {
-        return _encapContentInfo;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/cms/ContentInfo.java b/bcprov/src/main/java/org/bouncycastle/asn1/cms/ContentInfo.java
index 2e8e039..1592c75 100644
--- a/bcprov/src/main/java/org/bouncycastle/asn1/cms/ContentInfo.java
+++ b/bcprov/src/main/java/org/bouncycastle/asn1/cms/ContentInfo.java
@@ -28,7 +28,9 @@ import org.bouncycastle.asn1.BERTaggedObject;
  */
 public class ContentInfo
     extends ASN1Object
-    implements CMSObjectIdentifiers
+    // BEGIN android-removed
+    // implements CMSObjectIdentifiers
+    // END android-removed
 {
     private ASN1ObjectIdentifier contentType;
     private ASN1Encodable        content;
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/cms/ContentInfoParser.java b/bcprov/src/main/java/org/bouncycastle/asn1/cms/ContentInfoParser.java
deleted file mode 100644
index 19f0ec8..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/cms/ContentInfoParser.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package org.bouncycastle.asn1.cms;
-
-import java.io.IOException;
-
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1SequenceParser;
-import org.bouncycastle.asn1.ASN1TaggedObjectParser;
-
-/**
- * <a href="http://tools.ietf.org/html/rfc5652#section-3">RFC 5652</a> {@link ContentInfo} object parser.
- *
- * <pre>
- * ContentInfo ::= SEQUENCE {
- *     contentType ContentType,
- *     content [0] EXPLICIT ANY DEFINED BY contentType OPTIONAL }
- * </pre>
- */
-public class ContentInfoParser
-{
-    private ASN1ObjectIdentifier contentType;
-    private ASN1TaggedObjectParser content;
-
-    public ContentInfoParser(
-        ASN1SequenceParser seq)
-        throws IOException
-    {
-        contentType = (ASN1ObjectIdentifier)seq.readObject();
-        content = (ASN1TaggedObjectParser)seq.readObject();
-    }
-
-    public ASN1ObjectIdentifier getContentType()
-    {
-        return contentType;
-    }
-
-    public ASN1Encodable getContent(
-        int  tag)
-        throws IOException
-    {
-        if (content != null)
-        {
-            return content.getObjectParser(tag, true);
-        }
-
-        return null;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/cms/DigestedData.java b/bcprov/src/main/java/org/bouncycastle/asn1/cms/DigestedData.java
deleted file mode 100644
index 0f3b906..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/cms/DigestedData.java
+++ /dev/null
@@ -1,128 +0,0 @@
-package org.bouncycastle.asn1.cms;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.ASN1TaggedObject;
-import org.bouncycastle.asn1.BERSequence;
-import org.bouncycastle.asn1.DEROctetString;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-
-/** 
- * <a href="http://tools.ietf.org/html/rfc5652#section-7">RFC 5652</a> DigestedData object.
- * <pre>
- * DigestedData ::= SEQUENCE {
- *       version CMSVersion,
- *       digestAlgorithm DigestAlgorithmIdentifier,
- *       encapContentInfo EncapsulatedContentInfo,
- *       digest Digest }
- * </pre>
- */
-public class DigestedData
-    extends ASN1Object
-{
-    private ASN1Integer           version;
-    private AlgorithmIdentifier  digestAlgorithm;
-    private ContentInfo          encapContentInfo;
-    private ASN1OctetString      digest;
-
-    public DigestedData(
-        AlgorithmIdentifier digestAlgorithm,
-        ContentInfo encapContentInfo,
-        byte[]      digest)
-    {
-        this.version = new ASN1Integer(0);
-        this.digestAlgorithm = digestAlgorithm;
-        this.encapContentInfo = encapContentInfo;
-        this.digest = new DEROctetString(digest);
-    }
-
-    private DigestedData(
-        ASN1Sequence seq)
-    {
-        this.version = (ASN1Integer)seq.getObjectAt(0);
-        this.digestAlgorithm = AlgorithmIdentifier.getInstance(seq.getObjectAt(1));
-        this.encapContentInfo = ContentInfo.getInstance(seq.getObjectAt(2));
-        this.digest = ASN1OctetString.getInstance(seq.getObjectAt(3));
-    }
-
-    /**
-     * Return a DigestedData object from a tagged object.
-     *
-     * @param ato the tagged object holding the object we want.
-     * @param isExplicit true if the object is meant to be explicitly
-     *              tagged false otherwise.
-     * @exception IllegalArgumentException if the object held by the
-     *          tagged object cannot be converted.
-     */
-    public static DigestedData getInstance(
-        ASN1TaggedObject ato,
-        boolean isExplicit)
-    {
-        return getInstance(ASN1Sequence.getInstance(ato, isExplicit));
-    }
-    
-    /**
-     * Return a DigestedData object from the given object.
-     * <p>
-     * Accepted inputs:
-     * <ul>
-     * <li> null &rarr; null
-     * <li> {@link DigestedData} object
-     * <li> {@link org.bouncycastle.asn1.ASN1Sequence#getInstance(java.lang.Object) ASN1Sequence} input formats
-     * </ul>
-     *
-     * @param obj the object we want converted.
-     * @exception IllegalArgumentException if the object cannot be converted.
-     */
-    public static DigestedData getInstance(
-        Object obj)
-    {
-        if (obj instanceof DigestedData)
-        {
-            return (DigestedData)obj;
-        }
-        
-        if (obj != null)
-        {
-            return new DigestedData(ASN1Sequence.getInstance(obj));
-        }
-        
-        return null;
-    }
-
-    public ASN1Integer getVersion()
-    {
-        return version;
-    }
-
-    public AlgorithmIdentifier getDigestAlgorithm()
-    {
-        return digestAlgorithm;
-    }
-
-    public ContentInfo getEncapContentInfo()
-    {
-        return encapContentInfo;
-    }
-
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector v = new ASN1EncodableVector();
-
-        v.add(version);
-        v.add(digestAlgorithm);
-        v.add(encapContentInfo);
-        v.add(digest);
-
-        return new BERSequence(v);
-    }
-
-    public byte[] getDigest()
-    {
-        return digest.getOctets();
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/cms/EncryptedContentInfo.java b/bcprov/src/main/java/org/bouncycastle/asn1/cms/EncryptedContentInfo.java
deleted file mode 100644
index 64d887d..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/cms/EncryptedContentInfo.java
+++ /dev/null
@@ -1,120 +0,0 @@
-package org.bouncycastle.asn1.cms;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.ASN1TaggedObject;
-import org.bouncycastle.asn1.BERSequence;
-import org.bouncycastle.asn1.BERTaggedObject;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-
-/**
- * <a href="http://tools.ietf.org/html/rfc5652#section-6.1">RFC 5652</a> EncryptedContentInfo object.
- *
- * <pre>
- * EncryptedContentInfo ::= SEQUENCE {
- *     contentType ContentType,
- *     contentEncryptionAlgorithm ContentEncryptionAlgorithmIdentifier,
- *     encryptedContent [0] IMPLICIT EncryptedContent OPTIONAL 
- * }
- * </pre>
- */
-public class EncryptedContentInfo
-    extends ASN1Object
-{
-    private ASN1ObjectIdentifier contentType;
-    private AlgorithmIdentifier contentEncryptionAlgorithm;
-    private ASN1OctetString     encryptedContent;
-    
-    public EncryptedContentInfo(
-        ASN1ObjectIdentifier contentType, 
-        AlgorithmIdentifier contentEncryptionAlgorithm,
-        ASN1OctetString     encryptedContent)
-    {
-        this.contentType = contentType;
-        this.contentEncryptionAlgorithm = contentEncryptionAlgorithm;
-        this.encryptedContent = encryptedContent;
-    }
-    
-    private EncryptedContentInfo(
-        ASN1Sequence seq)
-    {
-        if (seq.size() < 2)
-        {
-            throw new IllegalArgumentException("Truncated Sequence Found");
-        }
-
-        contentType = (ASN1ObjectIdentifier)seq.getObjectAt(0);
-        contentEncryptionAlgorithm = AlgorithmIdentifier.getInstance(
-                                                        seq.getObjectAt(1));
-        if (seq.size() > 2)
-        {
-            encryptedContent = ASN1OctetString.getInstance(
-                                (ASN1TaggedObject)seq.getObjectAt(2), false);
-        }
-    }
-
-    /**
-     * Return an EncryptedContentInfo object from the given object.
-     * <p>
-     * Accepted inputs:
-     * <ul>
-     * <li> null &rarr; null
-     * <li> {@link EncryptedContentInfo} object
-     * <li> {@link org.bouncycastle.asn1.ASN1Sequence#getInstance(java.lang.Object) ASN1Sequence} input formats
-     * </ul>
-     *
-     * @param obj the object we want converted.
-     * @exception IllegalArgumentException if the object cannot be converted.
-     */
-    public static EncryptedContentInfo getInstance(
-        Object obj)
-    {
-        if (obj instanceof EncryptedContentInfo)
-        {
-            return (EncryptedContentInfo)obj;
-        }
-        if (obj != null)
-        {
-            return new EncryptedContentInfo(ASN1Sequence.getInstance(obj));
-        }
-        
-        return null;
-    }
-
-    public ASN1ObjectIdentifier getContentType()
-    {
-        return contentType;
-    }
-
-    public AlgorithmIdentifier getContentEncryptionAlgorithm()
-    {
-        return contentEncryptionAlgorithm;
-    }
-
-    public ASN1OctetString getEncryptedContent()
-    {
-        return encryptedContent;
-    }
-
-    /** 
-     * Produce an object suitable for an ASN1OutputStream.
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector  v = new ASN1EncodableVector();
-        
-        v.add(contentType);
-        v.add(contentEncryptionAlgorithm);
-
-        if (encryptedContent != null)
-        {
-            v.add(new BERTaggedObject(false, 0, encryptedContent));
-        }
-        
-        return new BERSequence(v);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/cms/EncryptedContentInfoParser.java b/bcprov/src/main/java/org/bouncycastle/asn1/cms/EncryptedContentInfoParser.java
deleted file mode 100644
index 77fb0bb..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/cms/EncryptedContentInfoParser.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package org.bouncycastle.asn1.cms;
-
-import java.io.IOException;
-
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1SequenceParser;
-import org.bouncycastle.asn1.ASN1TaggedObjectParser;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-
-/**
- * Parser for <a href="http://tools.ietf.org/html/rfc5652#section-6.1">RFC 5652</a> EncryptedContentInfo object.
- * <p>
- * <pre>
- * EncryptedContentInfo ::= SEQUENCE {
- *     contentType ContentType,
- *     contentEncryptionAlgorithm ContentEncryptionAlgorithmIdentifier,
- *     encryptedContent [0] IMPLICIT EncryptedContent OPTIONAL 
- * }
- * </pre>
- */
-public class EncryptedContentInfoParser
-{
-    private ASN1ObjectIdentifier    _contentType;
-    private AlgorithmIdentifier     _contentEncryptionAlgorithm;
-    private ASN1TaggedObjectParser _encryptedContent;
-
-    public EncryptedContentInfoParser(
-        ASN1SequenceParser  seq) 
-        throws IOException
-    {
-        _contentType = (ASN1ObjectIdentifier)seq.readObject();
-        _contentEncryptionAlgorithm = AlgorithmIdentifier.getInstance(seq.readObject().toASN1Primitive());
-        _encryptedContent = (ASN1TaggedObjectParser)seq.readObject();
-    }
-    
-    public ASN1ObjectIdentifier getContentType()
-    {
-        return _contentType;
-    }
-    
-    public AlgorithmIdentifier getContentEncryptionAlgorithm()
-    {
-        return _contentEncryptionAlgorithm;
-    }
-
-    public ASN1Encodable getEncryptedContent(
-        int  tag) 
-        throws IOException
-    {
-        return _encryptedContent.getObjectParser(tag, false);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/cms/EncryptedData.java b/bcprov/src/main/java/org/bouncycastle/asn1/cms/EncryptedData.java
deleted file mode 100644
index 080abfc..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/cms/EncryptedData.java
+++ /dev/null
@@ -1,112 +0,0 @@
-package org.bouncycastle.asn1.cms;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.ASN1Set;
-import org.bouncycastle.asn1.ASN1TaggedObject;
-import org.bouncycastle.asn1.BERSequence;
-import org.bouncycastle.asn1.BERTaggedObject;
-
-/**
- * <a href="http://tools.ietf.org/html/rfc5652#section-8">RFC 5652</a> EncryptedData object.
- * <p>
- * <pre>
- * EncryptedData ::= SEQUENCE {
- *     version CMSVersion,
- *     encryptedContentInfo EncryptedContentInfo,
- *     unprotectedAttrs [1] IMPLICIT UnprotectedAttributes OPTIONAL }
- * </pre>
- */
-public class EncryptedData
-    extends ASN1Object
-{
-    private ASN1Integer version;
-    private EncryptedContentInfo encryptedContentInfo;
-    private ASN1Set unprotectedAttrs;
-
-    /**
-     * Return an EncryptedData object from the given object.
-     * <p>
-     * Accepted inputs:
-     * <ul>
-     * <li> null &rarr; null
-     * <li> {@link EncryptedData} object
-     * <li> {@link org.bouncycastle.asn1.ASN1Sequence#getInstance(java.lang.Object) ASN1Sequence} input formats
-     * </ul>
-     *
-     * @param o the object we want converted.
-     * @exception IllegalArgumentException if the object cannot be converted.
-     */
-    public static EncryptedData getInstance(Object o)
-    {
-        if (o instanceof EncryptedData)
-        {
-            return (EncryptedData)o;
-        }
-
-        if (o != null)
-        {
-            return new EncryptedData(ASN1Sequence.getInstance(o));
-        }
-
-        return null;
-    }
-
-    public EncryptedData(EncryptedContentInfo encInfo)
-    {
-        this(encInfo,  null);
-    }
-
-    public EncryptedData(EncryptedContentInfo encInfo, ASN1Set unprotectedAttrs)
-    {
-        this.version = new ASN1Integer((unprotectedAttrs == null) ? 0 : 2);
-        this.encryptedContentInfo = encInfo;
-        this.unprotectedAttrs = unprotectedAttrs;
-    }
-
-    private EncryptedData(ASN1Sequence seq)
-    {
-        this.version = ASN1Integer.getInstance(seq.getObjectAt(0));
-        this.encryptedContentInfo = EncryptedContentInfo.getInstance(seq.getObjectAt(1));
-
-        if (seq.size() == 3)
-        {
-            this.unprotectedAttrs = ASN1Set.getInstance((ASN1TaggedObject)seq.getObjectAt(2), false);
-        }
-    }
-
-    public ASN1Integer getVersion()
-    {
-        return version;
-    }
-
-    public EncryptedContentInfo getEncryptedContentInfo()
-    {
-        return encryptedContentInfo;
-    }
-
-    public ASN1Set getUnprotectedAttrs()
-    {
-        return unprotectedAttrs;
-    }
-
-    /**
-     * @return a basic ASN.1 object representation.
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector v = new ASN1EncodableVector();
-
-        v.add(version);
-        v.add(encryptedContentInfo);
-        if (unprotectedAttrs != null)
-        {
-            v.add(new BERTaggedObject(false, 1, unprotectedAttrs));
-        }
-
-        return new BERSequence(v);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/cms/EnvelopedData.java b/bcprov/src/main/java/org/bouncycastle/asn1/cms/EnvelopedData.java
deleted file mode 100644
index 994575a..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/cms/EnvelopedData.java
+++ /dev/null
@@ -1,215 +0,0 @@
-package org.bouncycastle.asn1.cms;
-
-import java.util.Enumeration;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.ASN1Set;
-import org.bouncycastle.asn1.ASN1TaggedObject;
-import org.bouncycastle.asn1.BERSequence;
-import org.bouncycastle.asn1.DERTaggedObject;
-
-/**
- * <a href="http://tools.ietf.org/html/rfc5652#section-6.1">RFC 5652</a> EnvelopedData object.
- * <pre>
- * EnvelopedData ::= SEQUENCE {
- *     version CMSVersion,
- *     originatorInfo [0] IMPLICIT OriginatorInfo OPTIONAL,
- *     recipientInfos RecipientInfos,
- *     encryptedContentInfo EncryptedContentInfo,
- *     unprotectedAttrs [1] IMPLICIT UnprotectedAttributes OPTIONAL 
- * }
- * </pre>
- */
-public class EnvelopedData
-    extends ASN1Object
-{
-    private ASN1Integer              version;
-    private OriginatorInfo          originatorInfo;
-    private ASN1Set                 recipientInfos;
-    private EncryptedContentInfo    encryptedContentInfo;
-    private ASN1Set                 unprotectedAttrs;
-
-    public EnvelopedData(
-        OriginatorInfo          originatorInfo,
-        ASN1Set                 recipientInfos,
-        EncryptedContentInfo    encryptedContentInfo,
-        ASN1Set                 unprotectedAttrs)
-    {
-        version = new ASN1Integer(calculateVersion(originatorInfo, recipientInfos, unprotectedAttrs));
-
-        this.originatorInfo = originatorInfo;
-        this.recipientInfos = recipientInfos;
-        this.encryptedContentInfo = encryptedContentInfo;
-        this.unprotectedAttrs = unprotectedAttrs;
-    }
-
-    public EnvelopedData(
-        OriginatorInfo          originatorInfo,
-        ASN1Set                 recipientInfos,
-        EncryptedContentInfo    encryptedContentInfo,
-        Attributes              unprotectedAttrs)
-    {
-        version = new ASN1Integer(calculateVersion(originatorInfo, recipientInfos, ASN1Set.getInstance(unprotectedAttrs)));
-
-        this.originatorInfo = originatorInfo;
-        this.recipientInfos = recipientInfos;
-        this.encryptedContentInfo = encryptedContentInfo;
-        this.unprotectedAttrs = ASN1Set.getInstance(unprotectedAttrs);
-    }
-
-    /**
-     * @deprecated use getInstance()
-     */
-    public EnvelopedData(
-        ASN1Sequence seq)
-    {
-        int     index = 0;
-        
-        version = (ASN1Integer)seq.getObjectAt(index++);
-        
-        Object  tmp = seq.getObjectAt(index++);
-
-        if (tmp instanceof ASN1TaggedObject)
-        {
-            originatorInfo = OriginatorInfo.getInstance((ASN1TaggedObject)tmp, false);
-            tmp = seq.getObjectAt(index++);
-        }
-
-        recipientInfos = ASN1Set.getInstance(tmp);
-        
-        encryptedContentInfo = EncryptedContentInfo.getInstance(seq.getObjectAt(index++));
-        
-        if(seq.size() > index)
-        {
-            unprotectedAttrs = ASN1Set.getInstance((ASN1TaggedObject)seq.getObjectAt(index), false);
-        }
-    }
-    
-    /**
-     * Return an EnvelopedData object from a tagged object.
-     *
-     * @param obj the tagged object holding the object we want.
-     * @param explicit true if the object is meant to be explicitly
-     *              tagged false otherwise.
-     * @exception IllegalArgumentException if the object held by the
-     *          tagged object cannot be converted.
-     */
-    public static EnvelopedData getInstance(
-        ASN1TaggedObject obj,
-        boolean explicit)
-    {
-        return getInstance(ASN1Sequence.getInstance(obj, explicit));
-    }
-    
-    /**
-     * Return an EnvelopedData object from the given object.
-     * <p>
-     * Accepted inputs:
-     * <ul>
-     * <li> null &rarr; null
-     * <li> {@link EnvelopedData} object
-     * <li> {@link org.bouncycastle.asn1.ASN1Sequence#getInstance(java.lang.Object) ASN1Sequence} input formats with EnvelopedData structure inside
-     * </ul>
-     *
-     * @param obj the object we want converted.
-     * @exception IllegalArgumentException if the object cannot be converted.
-     */
-    public static EnvelopedData getInstance(
-        Object obj)
-    {
-        if (obj instanceof EnvelopedData)
-        {
-            return (EnvelopedData)obj;
-        }
-        
-        if (obj != null)
-        {
-            return new EnvelopedData(ASN1Sequence.getInstance(obj));
-        }
-        
-        return null;
-    }
-
-    public ASN1Integer getVersion()
-    {
-        return version;
-    }
-    
-    public OriginatorInfo getOriginatorInfo()
-    {
-        return originatorInfo;
-    }
-
-    public ASN1Set getRecipientInfos()
-    {
-        return recipientInfos;
-    }
-
-    public EncryptedContentInfo getEncryptedContentInfo()
-    {
-        return encryptedContentInfo;
-    }
-
-    public ASN1Set getUnprotectedAttrs()
-    {
-        return unprotectedAttrs;
-    }
-
-    /** 
-     * Produce an object suitable for an ASN1OutputStream.
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector  v = new ASN1EncodableVector();
-        
-        v.add(version);
-
-        if (originatorInfo != null)
-        {
-            v.add(new DERTaggedObject(false, 0, originatorInfo));
-        }
-
-        v.add(recipientInfos);
-        v.add(encryptedContentInfo);
-
-        if (unprotectedAttrs != null)
-        {
-            v.add(new DERTaggedObject(false, 1, unprotectedAttrs));
-        }
-        
-        return new BERSequence(v);
-    }
-
-    public static int calculateVersion(OriginatorInfo originatorInfo, ASN1Set recipientInfos, ASN1Set unprotectedAttrs)
-    {
-        int version;
-
-        if (originatorInfo != null || unprotectedAttrs != null)
-        {
-            version = 2;
-        }
-        else
-        {
-            version = 0;
-
-            Enumeration e = recipientInfos.getObjects();
-
-            while (e.hasMoreElements())
-            {
-                RecipientInfo   ri = RecipientInfo.getInstance(e.nextElement());
-
-                if (ri.getVersion().getValue().intValue() != version)
-                {
-                    version = 2;
-                    break;
-                }
-            }
-        }
-
-        return version;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/cms/EnvelopedDataParser.java b/bcprov/src/main/java/org/bouncycastle/asn1/cms/EnvelopedDataParser.java
deleted file mode 100644
index 774813a..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/cms/EnvelopedDataParser.java
+++ /dev/null
@@ -1,120 +0,0 @@
-package org.bouncycastle.asn1.cms;
-
-import java.io.IOException;
-
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1SequenceParser;
-import org.bouncycastle.asn1.ASN1SetParser;
-import org.bouncycastle.asn1.ASN1TaggedObjectParser;
-import org.bouncycastle.asn1.BERTags;
-
-/** 
- * Parser of <a href="http://tools.ietf.org/html/rfc5652#section-6.1">RFC 5652</a> {@link EnvelopedData} object.
- * <p>
- * <pre>
- * EnvelopedData ::= SEQUENCE {
- *     version CMSVersion,
- *     originatorInfo [0] IMPLICIT OriginatorInfo OPTIONAL,
- *     recipientInfos RecipientInfos,
- *     encryptedContentInfo EncryptedContentInfo,
- *     unprotectedAttrs [1] IMPLICIT UnprotectedAttributes OPTIONAL 
- * }
- * </pre>
- */
-public class EnvelopedDataParser
-{
-    private ASN1SequenceParser _seq;
-    private ASN1Integer        _version;
-    private ASN1Encodable      _nextObject;
-    private boolean            _originatorInfoCalled;
-    
-    public EnvelopedDataParser(
-        ASN1SequenceParser seq)
-        throws IOException
-    {
-        this._seq = seq;
-        this._version = ASN1Integer.getInstance(seq.readObject());
-    }
-
-    public ASN1Integer getVersion()
-    {
-        return _version;
-    }
-
-    public OriginatorInfo getOriginatorInfo() 
-        throws IOException
-    {
-        _originatorInfoCalled = true; 
-        
-        if (_nextObject == null)
-        {
-            _nextObject = _seq.readObject();
-        }
-        
-        if (_nextObject instanceof ASN1TaggedObjectParser && ((ASN1TaggedObjectParser)_nextObject).getTagNo() == 0)
-        {
-            ASN1SequenceParser originatorInfo = (ASN1SequenceParser) ((ASN1TaggedObjectParser)_nextObject).getObjectParser(BERTags.SEQUENCE, false);
-            _nextObject = null;
-            return OriginatorInfo.getInstance(originatorInfo.toASN1Primitive());
-        }
-        
-        return null;
-    }
-    
-    public ASN1SetParser getRecipientInfos()
-        throws IOException
-    {
-        if (!_originatorInfoCalled)
-        {
-            getOriginatorInfo();
-        }
-        
-        if (_nextObject == null)
-        {
-            _nextObject = _seq.readObject();
-        }
-        
-        ASN1SetParser recipientInfos = (ASN1SetParser)_nextObject;
-        _nextObject = null;
-        return recipientInfos;
-    }
-
-    public EncryptedContentInfoParser getEncryptedContentInfo() 
-        throws IOException
-    {
-        if (_nextObject == null)
-        {
-            _nextObject = _seq.readObject();
-        }
-        
-        
-        if (_nextObject != null)
-        {
-            ASN1SequenceParser o = (ASN1SequenceParser) _nextObject;
-            _nextObject = null;
-            return new EncryptedContentInfoParser(o);
-        }
-        
-        return null;
-    }
-
-    public ASN1SetParser getUnprotectedAttrs()
-        throws IOException
-    {
-        if (_nextObject == null)
-        {
-            _nextObject = _seq.readObject();
-        }
-        
-        
-        if (_nextObject != null)
-        {
-            ASN1Encodable o = _nextObject;
-            _nextObject = null;
-            return (ASN1SetParser)((ASN1TaggedObjectParser)o).getObjectParser(BERTags.SET, false);
-        }
-        
-        return null;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/cms/Evidence.java b/bcprov/src/main/java/org/bouncycastle/asn1/cms/Evidence.java
deleted file mode 100644
index 4dcbfde..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/cms/Evidence.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package org.bouncycastle.asn1.cms;
-
-import org.bouncycastle.asn1.ASN1Choice;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1TaggedObject;
-import org.bouncycastle.asn1.DERTaggedObject;
-
-/**
- * <a href="http://tools.ietf.org/html/rfc5544">RFC 5544</a>:
- * Binding Documents with Time-Stamps; Evidence object.
- * <p>
- * <pre>
- * Evidence ::= CHOICE {
- *     tstEvidence    [0] TimeStampTokenEvidence,   -- see RFC 3161
- *     ersEvidence    [1] EvidenceRecord,           -- see RFC 4998
- *     otherEvidence  [2] OtherEvidence
- * }
- * </pre>
- */
-public class Evidence
-    extends ASN1Object
-    implements ASN1Choice
-{
-    private TimeStampTokenEvidence tstEvidence;
-
-    public Evidence(TimeStampTokenEvidence tstEvidence)
-    {
-        this.tstEvidence = tstEvidence;
-    }
-
-    private Evidence(ASN1TaggedObject tagged)
-    {
-        if (tagged.getTagNo() == 0)
-        {
-            this.tstEvidence = TimeStampTokenEvidence.getInstance(tagged, false);
-        }
-    }
-
-    /**
-     * Return an Evidence object from the given object.
-     * <p>
-     * Accepted inputs:
-     * <ul>
-     * <li> {@link Evidence} object
-     * <li> {@link org.bouncycastle.asn1.ASN1TaggedObject#getInstance(java.lang.Object) ASN1TaggedObject} input formats with Evidence data inside
-     * </ul>
-     *
-     * @param obj the object we want converted.
-     * @exception IllegalArgumentException if the object cannot be converted.
-     */
-    public static Evidence getInstance(Object obj)
-    {
-        if (obj == null || obj instanceof Evidence)
-        {
-            return (Evidence)obj;
-        }
-        else if (obj instanceof ASN1TaggedObject)
-        {
-            return new Evidence(ASN1TaggedObject.getInstance(obj));
-        }
-
-        throw new IllegalArgumentException("unknown object in getInstance");
-    }
-
-    public TimeStampTokenEvidence getTstEvidence()
-    {
-        return tstEvidence;
-    }
-
-    public ASN1Primitive toASN1Primitive()
-    {
-       if (tstEvidence != null)
-       {
-           return new DERTaggedObject(false, 0, tstEvidence);
-       }
-
-       return null;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/cms/KEKIdentifier.java b/bcprov/src/main/java/org/bouncycastle/asn1/cms/KEKIdentifier.java
deleted file mode 100644
index 0361e9f..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/cms/KEKIdentifier.java
+++ /dev/null
@@ -1,151 +0,0 @@
-package org.bouncycastle.asn1.cms;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1GeneralizedTime;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.ASN1TaggedObject;
-import org.bouncycastle.asn1.DEROctetString;
-import org.bouncycastle.asn1.DERSequence;
-
-/**
- * <a href="http://tools.ietf.org/html/rfc5652#section-6.2.3">RFC 5652</a>:
- * Content encryption key delivery mechanisms.
- * <p>
- * <pre>
- * KEKIdentifier ::= SEQUENCE {
- *     keyIdentifier OCTET STRING,
- *     date GeneralizedTime OPTIONAL,
- *     other OtherKeyAttribute OPTIONAL 
- * }
- * </pre>
- */
-public class KEKIdentifier
-    extends ASN1Object
-{
-    private ASN1OctetString    keyIdentifier;
-    private ASN1GeneralizedTime date;
-    private OtherKeyAttribute  other;
-    
-    public KEKIdentifier(
-        byte[]              keyIdentifier,
-        ASN1GeneralizedTime  date,
-        OtherKeyAttribute   other)
-    {
-        this.keyIdentifier = new DEROctetString(keyIdentifier);
-        this.date = date;
-        this.other = other;
-    }
-    
-    private KEKIdentifier(
-        ASN1Sequence seq)
-    {
-        keyIdentifier = (ASN1OctetString)seq.getObjectAt(0);
-        
-        switch (seq.size())
-        {
-        case 1:
-            break;
-        case 2:
-            if (seq.getObjectAt(1) instanceof ASN1GeneralizedTime)
-            {
-                date = (ASN1GeneralizedTime)seq.getObjectAt(1); 
-            }
-            else
-            {
-                other = OtherKeyAttribute.getInstance(seq.getObjectAt(1));
-            }
-            break;
-        case 3:
-            date  = (ASN1GeneralizedTime)seq.getObjectAt(1);
-            other = OtherKeyAttribute.getInstance(seq.getObjectAt(2));
-            break;
-        default:
-                throw new IllegalArgumentException("Invalid KEKIdentifier");
-        }
-    }
-
-    /**
-     * Return a KEKIdentifier object from a tagged object.
-     *
-     * @param obj the tagged object holding the object we want.
-     * @param explicit true if the object is meant to be explicitly
-     *              tagged false otherwise.
-     * @exception IllegalArgumentException if the object held by the
-     *          tagged object cannot be converted.
-     */
-    public static KEKIdentifier getInstance(
-        ASN1TaggedObject obj,
-        boolean explicit)
-    {
-        return getInstance(ASN1Sequence.getInstance(obj, explicit));
-    }
-    
-    /**
-     * Return a KEKIdentifier object from the given object.
-     * <p>
-     * Accepted inputs:
-     * <ul>
-     * <li> null &rarr; null
-     * <li> {@link KEKIdentifier} object
-     * <li> {@link org.bouncycastle.asn1.ASN1Sequence#getInstance(java.lang.Object) ASN1Sequence} input formats with KEKIdentifier structure inside
-     * </ul>
-     *
-     * @param obj the object we want converted.
-     * @exception IllegalArgumentException if the object cannot be converted.
-     */
-    public static KEKIdentifier getInstance(
-        Object obj)
-    {
-        if (obj == null || obj instanceof KEKIdentifier)
-        {
-            return (KEKIdentifier)obj;
-        }
-        
-        if (obj instanceof ASN1Sequence)
-        {
-            return new KEKIdentifier((ASN1Sequence)obj);
-        }
-        
-        throw new IllegalArgumentException("Invalid KEKIdentifier: " + obj.getClass().getName());
-    }
-
-    public ASN1OctetString getKeyIdentifier()
-    {
-        return keyIdentifier;
-    }
-
-    public ASN1GeneralizedTime getDate()
-    {
-        return date;
-    }
-
-    public OtherKeyAttribute getOther()
-    {
-        return other;
-    }
-
-    /** 
-     * Produce an object suitable for an ASN1OutputStream.
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector  v = new ASN1EncodableVector();
-
-        v.add(keyIdentifier);
-        
-        if (date != null)
-        {
-            v.add(date);
-        }
-
-        if (other != null)
-        {
-            v.add(other);
-        }
-        
-        return new DERSequence(v);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/cms/KEKRecipientInfo.java b/bcprov/src/main/java/org/bouncycastle/asn1/cms/KEKRecipientInfo.java
deleted file mode 100644
index 2d0cfa6..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/cms/KEKRecipientInfo.java
+++ /dev/null
@@ -1,133 +0,0 @@
-package org.bouncycastle.asn1.cms;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.ASN1TaggedObject;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-
-/**
- * <a href="http://tools.ietf.org/html/rfc5652#section-6.2.3">RFC 5652</a>:
- * Content encryption key delivery mechanisms.
- * <p>
- * <pre>
- * KEKRecipientInfo ::= SEQUENCE {
- *     version CMSVersion,  -- always set to 4
- *     kekid KEKIdentifier,
- *     keyEncryptionAlgorithm KeyEncryptionAlgorithmIdentifier,
- *     encryptedKey EncryptedKey 
- * }
- * </pre>
- */
-public class KEKRecipientInfo
-    extends ASN1Object
-{
-    private ASN1Integer          version;
-    private KEKIdentifier       kekid;
-    private AlgorithmIdentifier keyEncryptionAlgorithm;
-    private ASN1OctetString     encryptedKey;
-
-    public KEKRecipientInfo(
-        KEKIdentifier       kekid,
-        AlgorithmIdentifier keyEncryptionAlgorithm,
-        ASN1OctetString     encryptedKey)
-    {
-        this.version = new ASN1Integer(4);
-        this.kekid = kekid;
-        this.keyEncryptionAlgorithm = keyEncryptionAlgorithm;
-        this.encryptedKey = encryptedKey;
-    }
-    
-    public KEKRecipientInfo(
-        ASN1Sequence seq)
-    {
-        version = (ASN1Integer)seq.getObjectAt(0);
-        kekid = KEKIdentifier.getInstance(seq.getObjectAt(1));
-        keyEncryptionAlgorithm = AlgorithmIdentifier.getInstance(seq.getObjectAt(2));
-        encryptedKey = (ASN1OctetString)seq.getObjectAt(3);
-    }
-
-    /**
-     * Return a KEKRecipientInfo object from a tagged object.
-     *
-     * @param obj the tagged object holding the object we want.
-     * @param explicit true if the object is meant to be explicitly
-     *              tagged false otherwise.
-     * @exception IllegalArgumentException if the object held by the
-     *          tagged object cannot be converted.
-     */
-    public static KEKRecipientInfo getInstance(
-        ASN1TaggedObject    obj,
-        boolean             explicit)
-    {
-        return getInstance(ASN1Sequence.getInstance(obj, explicit));
-    }
-    
-    /**
-     * Return a KEKRecipientInfo object from the given object.
-     * <p>
-     * Accepted inputs:
-     * <ul>
-     * <li> null &rarr; null
-     * <li> {@link KEKRecipientInfo} object
-     * <li> {@link org.bouncycastle.asn1.ASN1Sequence#getInstance(java.lang.Object) ASN1Sequence} input formats with KEKRecipientInfo structure inside
-     * </ul>
-     *
-     * @param obj the object we want converted.
-     * @exception IllegalArgumentException if the object cannot be converted.
-     */
-    public static KEKRecipientInfo getInstance(
-        Object obj)
-    {
-        if (obj instanceof KEKRecipientInfo)
-        {
-            return (KEKRecipientInfo)obj;
-        }
-        
-        if (obj != null)
-        {
-            return new KEKRecipientInfo(ASN1Sequence.getInstance(obj));
-        }
-        
-        return null;
-    }
-
-    public ASN1Integer getVersion()
-    {
-        return version;
-    }
-    
-    public KEKIdentifier getKekid()
-    {
-        return kekid;
-    }
-
-    public AlgorithmIdentifier getKeyEncryptionAlgorithm()
-    {
-        return keyEncryptionAlgorithm;
-    }
-
-    public ASN1OctetString getEncryptedKey()
-    {
-        return encryptedKey;
-    }
-
-    /** 
-     * Produce an object suitable for an ASN1OutputStream.
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector  v = new ASN1EncodableVector();
-
-        v.add(version);
-        v.add(kekid);
-        v.add(keyEncryptionAlgorithm);
-        v.add(encryptedKey);
-
-        return new DERSequence(v);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/cms/KeyAgreeRecipientIdentifier.java b/bcprov/src/main/java/org/bouncycastle/asn1/cms/KeyAgreeRecipientIdentifier.java
deleted file mode 100644
index 6580cd4..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/cms/KeyAgreeRecipientIdentifier.java
+++ /dev/null
@@ -1,116 +0,0 @@
-package org.bouncycastle.asn1.cms;
-
-import org.bouncycastle.asn1.ASN1Choice;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.ASN1TaggedObject;
-import org.bouncycastle.asn1.DERTaggedObject;
-
-/**
- * <a href="http://tools.ietf.org/html/rfc5652#section-6.2.2">RFC 5652</a>:
- * Content encryption key delivery mechanisms.
- * <p>
- * <pre>
- * KeyAgreeRecipientIdentifier ::= CHOICE {
- *     issuerAndSerialNumber IssuerAndSerialNumber,
- *     rKeyId [0] IMPLICIT RecipientKeyIdentifier }
- * </pre>
- */
-public class KeyAgreeRecipientIdentifier
-    extends ASN1Object
-    implements ASN1Choice
-{
-    private IssuerAndSerialNumber issuerSerial;
-    private RecipientKeyIdentifier rKeyID;
-
-    /**
-     * Return an KeyAgreeRecipientIdentifier object from a tagged object.
-     *
-     * @param obj the tagged object holding the object we want.
-     * @param explicit true if the object is meant to be explicitly
-     *              tagged false otherwise.
-     * @exception IllegalArgumentException if the object held by the
-     *          tagged object cannot be converted.
-     */
-    public static KeyAgreeRecipientIdentifier getInstance(
-        ASN1TaggedObject    obj,
-        boolean             explicit)
-    {
-        return getInstance(ASN1Sequence.getInstance(obj, explicit));
-    }
-    
-    /**
-     * Return an KeyAgreeRecipientIdentifier object from the given object.
-     * <p>
-     * Accepted inputs:
-     * <ul>
-     * <li> {@link KeyAgreeRecipientIdentifier} object
-     * <li> {@link org.bouncycastle.asn1.ASN1Sequence#getInstance(java.lang.Object) ASN1Sequence} input formats with IssuerAndSerialNumber structure inside
-     * <li> {@link org.bouncycastle.asn1.ASN1TaggedObject#getInstance(java.lang.Object) ASN1TaggedObject} with tag value 0: a KeyAgreeRecipientIdentifier data structure
-     * </ul>
-     * <p>
-     * Note: no byte[] input!
-     *
-     * @param obj the object we want converted.
-     * @exception IllegalArgumentException if the object cannot be converted.
-     */
-    public static KeyAgreeRecipientIdentifier getInstance(
-        Object obj)
-    {
-        if (obj == null || obj instanceof KeyAgreeRecipientIdentifier)
-        {
-            return (KeyAgreeRecipientIdentifier)obj;
-        }
-        
-        if (obj instanceof ASN1Sequence)
-        {
-            return new KeyAgreeRecipientIdentifier(IssuerAndSerialNumber.getInstance(obj));
-        }
-        
-        if (obj instanceof ASN1TaggedObject && ((ASN1TaggedObject)obj).getTagNo() == 0)
-        {
-            return new KeyAgreeRecipientIdentifier(RecipientKeyIdentifier.getInstance(
-                (ASN1TaggedObject)obj, false));
-        }
-        
-        throw new IllegalArgumentException("Invalid KeyAgreeRecipientIdentifier: " + obj.getClass().getName());
-    } 
-
-    public KeyAgreeRecipientIdentifier(
-        IssuerAndSerialNumber issuerSerial)
-    {
-        this.issuerSerial = issuerSerial;
-        this.rKeyID = null;
-    }
-
-    public KeyAgreeRecipientIdentifier(
-         RecipientKeyIdentifier rKeyID)
-    {
-        this.issuerSerial = null;
-        this.rKeyID = rKeyID;
-    }
-
-    public IssuerAndSerialNumber getIssuerAndSerialNumber()
-    {
-        return issuerSerial;
-    }
-
-    public RecipientKeyIdentifier getRKeyID()
-    {
-        return rKeyID;
-    }
-
-    /** 
-     * Produce an object suitable for an ASN1OutputStream.
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        if (issuerSerial != null)
-        {
-            return issuerSerial.toASN1Primitive();
-        }
-
-        return new DERTaggedObject(false, 0, rKeyID);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/cms/KeyAgreeRecipientInfo.java b/bcprov/src/main/java/org/bouncycastle/asn1/cms/KeyAgreeRecipientInfo.java
deleted file mode 100644
index 224932a..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/cms/KeyAgreeRecipientInfo.java
+++ /dev/null
@@ -1,166 +0,0 @@
-package org.bouncycastle.asn1.cms;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.ASN1TaggedObject;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.DERTaggedObject;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-
-/**
- * <a href="http://tools.ietf.org/html/rfc5652#section-6.2.2">RFC 5652</a>:
- * Content encryption key delivery mechanisms.
- * <p>
- * <pre>
- * KeyAgreeRecipientInfo ::= SEQUENCE {
- *     version CMSVersion,  -- always set to 3
- *     originator [0] EXPLICIT OriginatorIdentifierOrKey,
- *     ukm [1] EXPLICIT UserKeyingMaterial OPTIONAL,
- *     keyEncryptionAlgorithm KeyEncryptionAlgorithmIdentifier,
- *     recipientEncryptedKeys RecipientEncryptedKeys 
- * }
- *
- * UserKeyingMaterial ::= OCTET STRING
- * </pre>
- */
-public class KeyAgreeRecipientInfo
-    extends ASN1Object
-{
-    private ASN1Integer                  version;
-    private OriginatorIdentifierOrKey   originator;
-    private ASN1OctetString             ukm;
-    private AlgorithmIdentifier         keyEncryptionAlgorithm;
-    private ASN1Sequence                recipientEncryptedKeys;
-    
-    public KeyAgreeRecipientInfo(
-        OriginatorIdentifierOrKey   originator,
-        ASN1OctetString             ukm,
-        AlgorithmIdentifier         keyEncryptionAlgorithm,
-        ASN1Sequence                recipientEncryptedKeys)
-    {
-        this.version = new ASN1Integer(3);
-        this.originator = originator;
-        this.ukm = ukm;
-        this.keyEncryptionAlgorithm = keyEncryptionAlgorithm;
-        this.recipientEncryptedKeys = recipientEncryptedKeys;
-    }
-
-    /**
-     * @deprecated use getInstance()
-     */
-    public KeyAgreeRecipientInfo(
-        ASN1Sequence seq)
-    {
-        int index = 0;
-        
-        version = (ASN1Integer)seq.getObjectAt(index++);
-        originator = OriginatorIdentifierOrKey.getInstance(
-                            (ASN1TaggedObject)seq.getObjectAt(index++), true);
-
-        if (seq.getObjectAt(index) instanceof ASN1TaggedObject)
-        {
-            ukm = ASN1OctetString.getInstance(
-                            (ASN1TaggedObject)seq.getObjectAt(index++), true);
-        }
-
-        keyEncryptionAlgorithm = AlgorithmIdentifier.getInstance(
-                                                seq.getObjectAt(index++));
-
-        recipientEncryptedKeys = (ASN1Sequence)seq.getObjectAt(index++);
-    }
-    
-    /**
-     * Return a KeyAgreeRecipientInfo object from a tagged object.
-     *
-     * @param obj the tagged object holding the object we want.
-     * @param explicit true if the object is meant to be explicitly
-     *              tagged false otherwise.
-     * @exception IllegalArgumentException if the object held by the
-     *          tagged object cannot be converted.
-     */
-    public static KeyAgreeRecipientInfo getInstance(
-        ASN1TaggedObject    obj,
-        boolean             explicit)
-    {
-        return getInstance(ASN1Sequence.getInstance(obj, explicit));
-    }
-    
-    /**
-     * Return a KeyAgreeRecipientInfo object from the given object.
-     * <p>
-     * Accepted inputs:
-     * <ul>
-     * <li> null &rarr; null
-     * <li> {@link KeyAgreeRecipientInfo} object
-     * <li> {@link org.bouncycastle.asn1.ASN1Sequence#getInstance(java.lang.Object) ASN1Sequence} input formats with KeyAgreeRecipientInfo structure inside
-     * </ul>
-     *
-     * @param obj the object we want converted.
-     * @exception IllegalArgumentException if the object cannot be converted.
-     */
-    public static KeyAgreeRecipientInfo getInstance(
-        Object obj)
-    {
-        if (obj instanceof KeyAgreeRecipientInfo)
-        {
-            return (KeyAgreeRecipientInfo)obj;
-        }
-        
-        if (obj != null)
-        {
-            return new KeyAgreeRecipientInfo(ASN1Sequence.getInstance(obj));
-        }
-        
-        return null;
-    } 
-
-    public ASN1Integer getVersion()
-    {
-        return version;
-    }
-
-    public OriginatorIdentifierOrKey getOriginator()
-    {
-        return originator;
-    }
-
-    public ASN1OctetString getUserKeyingMaterial()
-    {
-        return ukm;
-    }
-
-    public AlgorithmIdentifier getKeyEncryptionAlgorithm()
-    {
-        return keyEncryptionAlgorithm;
-    }
-
-    public ASN1Sequence getRecipientEncryptedKeys()
-    {
-        return recipientEncryptedKeys;
-    }
-
-    /** 
-     * Produce an object suitable for an ASN1OutputStream.
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector  v = new ASN1EncodableVector();
-
-        v.add(version);
-        v.add(new DERTaggedObject(true, 0, originator));
-        
-        if (ukm != null)
-        {
-            v.add(new DERTaggedObject(true, 1, ukm));
-        }
-        
-        v.add(keyEncryptionAlgorithm);
-        v.add(recipientEncryptedKeys);
-
-        return new DERSequence(v);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/cms/KeyTransRecipientInfo.java b/bcprov/src/main/java/org/bouncycastle/asn1/cms/KeyTransRecipientInfo.java
deleted file mode 100644
index 7d31111..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/cms/KeyTransRecipientInfo.java
+++ /dev/null
@@ -1,127 +0,0 @@
-package org.bouncycastle.asn1.cms;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.ASN1TaggedObject;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-
-/**
- * <a href="http://tools.ietf.org/html/rfc5652#section-6.2.1">RFC 5652</a>:
- * Content encryption key delivery mechanisms.
- * <pre>
- * KeyTransRecipientInfo ::= SEQUENCE {
- *     version CMSVersion,  -- always set to 0 or 2
- *     rid RecipientIdentifier,
- *     keyEncryptionAlgorithm KeyEncryptionAlgorithmIdentifier,
- *     encryptedKey EncryptedKey 
- * }
- * </pre>
- */
-public class KeyTransRecipientInfo
-    extends ASN1Object
-{
-    private ASN1Integer          version;
-    private RecipientIdentifier rid;
-    private AlgorithmIdentifier keyEncryptionAlgorithm;
-    private ASN1OctetString     encryptedKey;
-
-    public KeyTransRecipientInfo(
-        RecipientIdentifier rid,
-        AlgorithmIdentifier keyEncryptionAlgorithm,
-        ASN1OctetString     encryptedKey)
-    {
-        if (rid.toASN1Primitive() instanceof ASN1TaggedObject)
-        {
-            this.version = new ASN1Integer(2);
-        }
-        else
-        {
-            this.version = new ASN1Integer(0);
-        }
-
-        this.rid = rid;
-        this.keyEncryptionAlgorithm = keyEncryptionAlgorithm;
-        this.encryptedKey = encryptedKey;
-    }
-
-    /**
-     * @deprecated use getInstance()
-     */
-    public KeyTransRecipientInfo(
-        ASN1Sequence seq)
-    {
-        this.version = (ASN1Integer)seq.getObjectAt(0);
-        this.rid = RecipientIdentifier.getInstance(seq.getObjectAt(1));
-        this.keyEncryptionAlgorithm = AlgorithmIdentifier.getInstance(seq.getObjectAt(2));
-        this.encryptedKey = (ASN1OctetString)seq.getObjectAt(3);
-    }
-
-    /**
-     * Return a KeyTransRecipientInfo object from the given object.
-     * <p>
-     * Accepted inputs:
-     * <ul>
-     * <li> null &rarr; null
-     * <li> {@link KeyTransRecipientInfo} object
-     * <li> {@link org.bouncycastle.asn1.ASN1Sequence#getInstance(java.lang.Object) ASN1Sequence} input formats with KeyTransRecipientInfo structure inside
-     * </ul>
-     *
-     * @param obj the object we want converted.
-     * @exception IllegalArgumentException if the object cannot be converted.
-     */
-    public static KeyTransRecipientInfo getInstance(
-        Object obj)
-    {
-        if (obj instanceof KeyTransRecipientInfo)
-        {
-            return (KeyTransRecipientInfo)obj;
-        }
-        
-        if(obj != null)
-        {
-            return new KeyTransRecipientInfo(ASN1Sequence.getInstance(obj));
-        }
-        
-        return null;
-    } 
-
-    public ASN1Integer getVersion()
-    {
-        return version;
-    }
-
-    public RecipientIdentifier getRecipientIdentifier()
-    {
-        return rid;
-    }
-
-    public AlgorithmIdentifier getKeyEncryptionAlgorithm()
-    {
-        return keyEncryptionAlgorithm;
-    }
-
-    public ASN1OctetString getEncryptedKey()
-    {
-        return encryptedKey;
-    }
-
-    /** 
-     * Produce an object suitable for an ASN1OutputStream.
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector  v = new ASN1EncodableVector();
-
-        v.add(version);
-        v.add(rid);
-        v.add(keyEncryptionAlgorithm);
-        v.add(encryptedKey);
-
-        return new DERSequence(v);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/cms/MetaData.java b/bcprov/src/main/java/org/bouncycastle/asn1/cms/MetaData.java
deleted file mode 100644
index 667187b..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/cms/MetaData.java
+++ /dev/null
@@ -1,135 +0,0 @@
-package org.bouncycastle.asn1.cms;
-
-import org.bouncycastle.asn1.ASN1Boolean;
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DERIA5String;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.DERUTF8String;
-
-/**
- * <a href="http://tools.ietf.org/html/rfc5544">RFC 5544</a>:
- * Binding Documents with Time-Stamps; MetaData object.
- * <p>
- * <pre>
- * MetaData ::= SEQUENCE {
- *   hashProtected        BOOLEAN,
- *   fileName             UTF8String OPTIONAL,
- *   mediaType            IA5String OPTIONAL,
- *   otherMetaData        Attributes OPTIONAL
- * }
- * </pre>
- */
-public class MetaData
-    extends ASN1Object
-{
-    private ASN1Boolean hashProtected;
-    private DERUTF8String fileName;
-    private DERIA5String  mediaType;
-    private Attributes otherMetaData;
-
-    public MetaData(
-        ASN1Boolean hashProtected,
-        DERUTF8String fileName,
-        DERIA5String mediaType,
-        Attributes otherMetaData)
-    {
-        this.hashProtected = hashProtected;
-        this.fileName = fileName;
-        this.mediaType = mediaType;
-        this.otherMetaData = otherMetaData;
-    }
-
-    private MetaData(ASN1Sequence seq)
-    {
-        this.hashProtected = ASN1Boolean.getInstance(seq.getObjectAt(0));
-
-        int index = 1;
-
-        if (index < seq.size() && seq.getObjectAt(index) instanceof DERUTF8String)
-        {
-            this.fileName = DERUTF8String.getInstance(seq.getObjectAt(index++));
-        }
-        if (index < seq.size() && seq.getObjectAt(index) instanceof DERIA5String)
-        {
-            this.mediaType = DERIA5String.getInstance(seq.getObjectAt(index++));
-        }
-        if (index < seq.size())
-        {
-            this.otherMetaData = Attributes.getInstance(seq.getObjectAt(index++));
-        }
-    }
-
-    /**
-     * Return a MetaData object from the given object.
-     * <p>
-     * Accepted inputs:
-     * <ul>
-     * <li> null &rarr; null
-     * <li> {@link MetaData} object
-     * <li> {@link org.bouncycastle.asn1.ASN1Sequence#getInstance(java.lang.Object) ASN1Sequence} input formats with MetaData structure inside
-     * </ul>
-     *
-     * @param obj the object we want converted.
-     * @exception IllegalArgumentException if the object cannot be converted.
-     */
-    public static MetaData getInstance(Object obj)
-    {
-        if (obj instanceof MetaData)
-        {
-            return (MetaData)obj;
-        }
-        else if (obj != null)
-        {
-            return new MetaData(ASN1Sequence.getInstance(obj));
-        }
-
-        return null;
-    }
-
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector v = new ASN1EncodableVector();
-
-        v.add(hashProtected);
-
-        if (fileName != null)
-        {
-            v.add(fileName);
-        }
-
-        if (mediaType != null)
-        {
-            v.add(mediaType);
-        }
-
-        if (otherMetaData != null)
-        {
-            v.add(otherMetaData);
-        }
-        
-        return new DERSequence(v);
-    }
-
-    public boolean isHashProtected()
-    {
-        return hashProtected.isTrue();
-    }
-
-    public DERUTF8String getFileName()
-    {
-        return this.fileName;
-    }
-
-    public DERIA5String getMediaType()
-    {
-        return this.mediaType;
-    }
-
-    public Attributes getOtherMetaData()
-    {
-        return otherMetaData;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/cms/OriginatorIdentifierOrKey.java b/bcprov/src/main/java/org/bouncycastle/asn1/cms/OriginatorIdentifierOrKey.java
deleted file mode 100644
index 2096be2..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/cms/OriginatorIdentifierOrKey.java
+++ /dev/null
@@ -1,179 +0,0 @@
-package org.bouncycastle.asn1.cms;
-
-import org.bouncycastle.asn1.ASN1Choice;
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1TaggedObject;
-import org.bouncycastle.asn1.DERTaggedObject;
-import org.bouncycastle.asn1.x509.SubjectKeyIdentifier;
-
-/**
- * <a href="http://tools.ietf.org/html/rfc5652#section-6.2.2">RFC 5652</a>:
- * Content encryption key delivery mechanisms.
- * <pre>
- * OriginatorIdentifierOrKey ::= CHOICE {
- *     issuerAndSerialNumber IssuerAndSerialNumber,
- *     subjectKeyIdentifier [0] SubjectKeyIdentifier,
- *     originatorKey [1] OriginatorPublicKey 
- * }
- *
- * SubjectKeyIdentifier ::= OCTET STRING
- * </pre>
- */
-public class OriginatorIdentifierOrKey
-    extends ASN1Object
-    implements ASN1Choice
-{
-    private ASN1Encodable id;
-
-    public OriginatorIdentifierOrKey(
-        IssuerAndSerialNumber id)
-    {
-        this.id = id;
-    }
-
-    /**
-     * @deprecated use version taking a SubjectKeyIdentifier
-     */
-    public OriginatorIdentifierOrKey(
-        ASN1OctetString id)
-    {
-        this(new SubjectKeyIdentifier(id.getOctets()));
-    }
-
-    public OriginatorIdentifierOrKey(
-        SubjectKeyIdentifier id)
-    {
-        this.id = new DERTaggedObject(false, 0, id);
-    }
-
-    public OriginatorIdentifierOrKey(
-        OriginatorPublicKey id)
-    {
-        this.id = new DERTaggedObject(false, 1, id);
-    }
-
-    /**
-     * @deprecated use more specific version
-     */
-    public OriginatorIdentifierOrKey(
-        ASN1Primitive id)
-    {
-        this.id = id;
-    }
-
-    /**
-     * Return an OriginatorIdentifierOrKey object from a tagged object.
-     *
-     * @param o the tagged object holding the object we want.
-     * @param explicit true if the object is meant to be explicitly
-     *              tagged false otherwise.
-     * @exception IllegalArgumentException if the object held by the
-     *          tagged object cannot be converted.
-     */
-    public static OriginatorIdentifierOrKey getInstance(
-        ASN1TaggedObject    o,
-        boolean             explicit)
-    {
-        if (!explicit)
-        {
-            throw new IllegalArgumentException(
-                    "Can't implicitly tag OriginatorIdentifierOrKey");
-        }
-
-        return getInstance(o.getObject());
-    }
-    
-    /**
-     * Return an OriginatorIdentifierOrKey object from the given object.
-     * <p>
-     * Accepted inputs:
-     * <ul>
-     * <li> null &rarr; null
-     * <li> {@link OriginatorIdentifierOrKey} object
-     * <li> {@link IssuerAndSerialNumber} object
-     * <li> {@link SubjectKeyIdentifier} object
-     * <li> {@link OriginatorPublicKey} object
-     * <li> {@link org.bouncycastle.asn1.ASN1TaggedObject#getInstance(java.lang.Object) ASN1TaggedObject} input formats with IssuerAndSerialNumber structure inside
-     * </ul>
-     *
-     * @param o the object we want converted.
-     * @exception IllegalArgumentException if the object cannot be converted.
-     */
-    public static OriginatorIdentifierOrKey getInstance(
-        Object o)
-    {
-        if (o == null || o instanceof OriginatorIdentifierOrKey)
-        {
-            return (OriginatorIdentifierOrKey)o;
-        }
-
-        if (o instanceof IssuerAndSerialNumber)
-        {
-            return new OriginatorIdentifierOrKey((IssuerAndSerialNumber)o);
-        }
-
-        if (o instanceof SubjectKeyIdentifier)
-        {
-            return new OriginatorIdentifierOrKey((SubjectKeyIdentifier)o);
-        }
-
-        if (o instanceof OriginatorPublicKey)
-        {
-            return new OriginatorIdentifierOrKey((OriginatorPublicKey)o);
-        }
-
-        if (o instanceof ASN1TaggedObject)
-        {
-            // TODO Add validation
-            return new OriginatorIdentifierOrKey((ASN1TaggedObject)o);
-        }
-
-        throw new IllegalArgumentException("Invalid OriginatorIdentifierOrKey: " + o.getClass().getName());
-    }
-
-    public ASN1Encodable getId()
-    {
-        return id;
-    }
-
-    public IssuerAndSerialNumber getIssuerAndSerialNumber()
-    {
-        if (id instanceof IssuerAndSerialNumber)
-        {
-            return (IssuerAndSerialNumber)id;
-        }
-
-        return null;
-    }
-
-    public SubjectKeyIdentifier getSubjectKeyIdentifier()
-    {
-        if (id instanceof ASN1TaggedObject && ((ASN1TaggedObject)id).getTagNo() == 0)
-        {
-            return SubjectKeyIdentifier.getInstance((ASN1TaggedObject)id, false);
-        }
-
-        return null;
-    }
-
-    public OriginatorPublicKey getOriginatorKey()
-    {
-        if (id instanceof ASN1TaggedObject && ((ASN1TaggedObject)id).getTagNo() == 1)
-        {
-            return OriginatorPublicKey.getInstance((ASN1TaggedObject)id, false);
-        }
-
-        return null;
-    }
-
-    /**
-     * Produce an object suitable for an ASN1OutputStream.
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        return id.toASN1Primitive();
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/cms/OriginatorInfo.java b/bcprov/src/main/java/org/bouncycastle/asn1/cms/OriginatorInfo.java
deleted file mode 100644
index 96abf7d..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/cms/OriginatorInfo.java
+++ /dev/null
@@ -1,159 +0,0 @@
-package org.bouncycastle.asn1.cms;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.ASN1Set;
-import org.bouncycastle.asn1.ASN1TaggedObject;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.DERTaggedObject;
-
-/**
- * <a href="http://tools.ietf.org/html/rfc5652#section-6.2.1">RFC 5652</a>: OriginatorInfo object.
- * <pre>
- * RFC 3369:
- *
- * OriginatorInfo ::= SEQUENCE {
- *     certs [0] IMPLICIT CertificateSet OPTIONAL,
- *     crls  [1] IMPLICIT CertificateRevocationLists OPTIONAL 
- * }
- * CertificateRevocationLists ::= SET OF CertificateList (from X.509)
- *
- * RFC 3582 / 5652:
- *
- * OriginatorInfo ::= SEQUENCE {
- *     certs [0] IMPLICIT CertificateSet OPTIONAL,
- *     crls  [1] IMPLICIT RevocationInfoChoices OPTIONAL
- * }
- * RevocationInfoChoices ::= SET OF RevocationInfoChoice
- * RevocationInfoChoice ::= CHOICE {
- *     crl CertificateList,
- *     other [1] IMPLICIT OtherRevocationInfoFormat }
- *
- * OtherRevocationInfoFormat ::= SEQUENCE {
- *     otherRevInfoFormat OBJECT IDENTIFIER,
- *     otherRevInfo ANY DEFINED BY otherRevInfoFormat }
- * </pre>
- * <p>
- * TODO: RevocationInfoChoices / RevocationInfoChoice.
- *       Constructor using CertificateSet, CertificationInfoChoices
- */
-public class OriginatorInfo
-    extends ASN1Object
-{
-    private ASN1Set certs;
-    private ASN1Set crls;
-    
-    public OriginatorInfo(
-        ASN1Set certs,
-        ASN1Set crls)
-    {
-        this.certs = certs;
-        this.crls = crls;
-    }
-    
-    private OriginatorInfo(
-        ASN1Sequence seq)
-    {
-        switch (seq.size())
-        {
-        case 0:     // empty
-            break;
-        case 1:
-            ASN1TaggedObject o = (ASN1TaggedObject)seq.getObjectAt(0);
-            switch (o.getTagNo())
-            {
-            case 0 :
-                certs = ASN1Set.getInstance(o, false);
-                break;
-            case 1 :
-                crls = ASN1Set.getInstance(o, false);
-                break;
-            default:
-                throw new IllegalArgumentException("Bad tag in OriginatorInfo: " + o.getTagNo());
-            }
-            break;
-        case 2:
-            certs = ASN1Set.getInstance((ASN1TaggedObject)seq.getObjectAt(0), false);
-            crls  = ASN1Set.getInstance((ASN1TaggedObject)seq.getObjectAt(1), false);
-            break;
-        default:
-            throw new IllegalArgumentException("OriginatorInfo too big");
-        }
-    }
-    
-    /**
-     * Return an OriginatorInfo object from a tagged object.
-     *
-     * @param obj the tagged object holding the object we want.
-     * @param explicit true if the object is meant to be explicitly
-     *              tagged false otherwise.
-     * @exception IllegalArgumentException if the object held by the
-     *          tagged object cannot be converted.
-     */
-    public static OriginatorInfo getInstance(
-        ASN1TaggedObject    obj,
-        boolean             explicit)
-    {
-        return getInstance(ASN1Sequence.getInstance(obj, explicit));
-    }
-    
-    /**
-     * Return an OriginatorInfo object from the given object.
-     * <p>
-     * Accepted inputs:
-     * <ul>
-     * <li> null &rarr; null
-     * <li> {@link OriginatorInfo} object
-     * <li> {@link org.bouncycastle.asn1.ASN1Sequence#getInstance(java.lang.Object) ASN1Sequence} input formats with OriginatorInfo structure inside
-     * </ul>
-     *
-     * @param obj the object we want converted.
-     * @exception IllegalArgumentException if the object cannot be converted.
-     */
-    public static OriginatorInfo getInstance(
-        Object obj)
-    {
-        if (obj instanceof OriginatorInfo)
-        {
-            return (OriginatorInfo)obj;
-        }
-        else if (obj != null)
-        {
-            return new OriginatorInfo(ASN1Sequence.getInstance(obj));
-        }
-
-        return null;
-    }
-    
-    public ASN1Set getCertificates()
-    {
-        return certs;
-    }
-
-    public ASN1Set getCRLs()
-    {
-        return crls;
-    }
-
-    /** 
-     * Produce an object suitable for an ASN1OutputStream.
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector  v = new ASN1EncodableVector();
-
-        if (certs != null)
-        {
-            v.add(new DERTaggedObject(false, 0, certs));
-        }
-        
-        if (crls != null)
-        {
-            v.add(new DERTaggedObject(false, 1, crls));
-        }
-        
-        return new DERSequence(v);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/cms/OriginatorPublicKey.java b/bcprov/src/main/java/org/bouncycastle/asn1/cms/OriginatorPublicKey.java
deleted file mode 100644
index b9bc52f..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/cms/OriginatorPublicKey.java
+++ /dev/null
@@ -1,114 +0,0 @@
-package org.bouncycastle.asn1.cms;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.ASN1TaggedObject;
-import org.bouncycastle.asn1.DERBitString;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-
-/**
- * <a href="http://tools.ietf.org/html/rfc5652#section-6.2.2">RFC 5652</a>:
- * Content encryption key delivery mechanisms.
- * <p>
- * <pre>
- * OriginatorPublicKey ::= SEQUENCE {
- *     algorithm AlgorithmIdentifier,
- *     publicKey BIT STRING 
- * }
- * </pre>
- */
-public class OriginatorPublicKey
-    extends ASN1Object
-{
-    private AlgorithmIdentifier algorithm;
-    private DERBitString        publicKey;
-    
-    public OriginatorPublicKey(
-        AlgorithmIdentifier algorithm,
-        byte[]              publicKey)
-    {
-        this.algorithm = algorithm;
-        this.publicKey = new DERBitString(publicKey);
-    }
-
-    /**
-     * @deprecated use getInstance()
-     */
-    public OriginatorPublicKey(
-        ASN1Sequence seq)
-    {
-        algorithm = AlgorithmIdentifier.getInstance(seq.getObjectAt(0));
-        publicKey = (DERBitString)seq.getObjectAt(1);
-    }
-    
-    /**
-     * Return an OriginatorPublicKey object from a tagged object.
-     *
-     * @param obj the tagged object holding the object we want.
-     * @param explicit true if the object is meant to be explicitly
-     *              tagged false otherwise.
-     * @exception IllegalArgumentException if the object held by the
-     *          tagged object cannot be converted.
-     */
-    public static OriginatorPublicKey getInstance(
-        ASN1TaggedObject    obj,
-        boolean             explicit)
-    {
-        return getInstance(ASN1Sequence.getInstance(obj, explicit));
-    }
-    
-    /**
-     * Return an OriginatorPublicKey object from the given object.
-     * <p>
-     * Accepted inputs:
-     * <ul>
-     * <li> null &rarr; null
-     * <li> {@link OriginatorPublicKey} object
-     * <li> {@link org.bouncycastle.asn1.ASN1Sequence#getInstance(java.lang.Object) ASN1Sequence} input formats with OriginatorPublicKey structure inside
-     * </ul>
-     *
-     * @param obj the object we want converted.
-     * @exception IllegalArgumentException if the object cannot be converted.
-     */
-    public static OriginatorPublicKey getInstance(
-        Object obj)
-    {
-        if (obj instanceof OriginatorPublicKey)
-        {
-            return (OriginatorPublicKey)obj;
-        }
-        
-        if (obj != null)
-        {
-            return new OriginatorPublicKey(ASN1Sequence.getInstance(obj));
-        }
-
-        return null;
-    } 
-
-    public AlgorithmIdentifier getAlgorithm()
-    {
-        return algorithm;
-    }
-
-    public DERBitString getPublicKey()
-    {
-        return publicKey;
-    }
-
-    /** 
-     * Produce an object suitable for an ASN1OutputStream.
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector  v = new ASN1EncodableVector();
-
-        v.add(algorithm);
-        v.add(publicKey);
-
-        return new DERSequence(v);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/cms/OtherKeyAttribute.java b/bcprov/src/main/java/org/bouncycastle/asn1/cms/OtherKeyAttribute.java
deleted file mode 100644
index 7363c81..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/cms/OtherKeyAttribute.java
+++ /dev/null
@@ -1,96 +0,0 @@
-package org.bouncycastle.asn1.cms;
-
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DERSequence;
-
-/**
- * <a href="http://tools.ietf.org/html/rfc5652#section-10.2.7">RFC 5652</a>: OtherKeyAttribute object.
- * <p>
- * <pre>
- * OtherKeyAttribute ::= SEQUENCE {
- *     keyAttrId OBJECT IDENTIFIER,
- *     keyAttr ANY DEFINED BY keyAttrId OPTIONAL
- * }
- * </pre>
- */
-public class OtherKeyAttribute
-    extends ASN1Object
-{
-    private ASN1ObjectIdentifier keyAttrId;
-    private ASN1Encodable        keyAttr;
-
-    /**
-     * Return an OtherKeyAttribute object from the given object.
-     * <p>
-     * Accepted inputs:
-     * <ul>
-     * <li> null &rarr; null
-     * <li> {@link OtherKeyAttribute} object
-     * <li> {@link org.bouncycastle.asn1.ASN1Sequence#getInstance(java.lang.Object) ASN1Sequence} input formats with OtherKeyAttribute structure inside
-     * </ul>
-     *
-     * @param o the object we want converted.
-     * @exception IllegalArgumentException if the object cannot be converted.
-     */
-    public static OtherKeyAttribute getInstance(
-        Object o)
-    {
-        if (o instanceof OtherKeyAttribute)
-        {
-            return (OtherKeyAttribute)o;
-        }
-        
-        if (o != null)
-        {
-            return new OtherKeyAttribute(ASN1Sequence.getInstance(o));
-        }
-
-        return null;
-    }
-
-    /**
-     * @deprecated use getInstance()
-     */
-    public OtherKeyAttribute(
-        ASN1Sequence seq)
-    {
-        keyAttrId = (ASN1ObjectIdentifier)seq.getObjectAt(0);
-        keyAttr = seq.getObjectAt(1);
-    }
-
-    public OtherKeyAttribute(
-        ASN1ObjectIdentifier keyAttrId,
-        ASN1Encodable        keyAttr)
-    {
-        this.keyAttrId = keyAttrId;
-        this.keyAttr = keyAttr;
-    }
-
-    public ASN1ObjectIdentifier getKeyAttrId()
-    {
-        return keyAttrId;
-    }
-    
-    public ASN1Encodable getKeyAttr()
-    {
-        return keyAttr;
-    }
-
-    /** 
-     * Produce an object suitable for an ASN1OutputStream.
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector v = new ASN1EncodableVector();
-
-        v.add(keyAttrId);
-        v.add(keyAttr);
-
-        return new DERSequence(v);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/cms/OtherRecipientInfo.java b/bcprov/src/main/java/org/bouncycastle/asn1/cms/OtherRecipientInfo.java
deleted file mode 100644
index b77b150..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/cms/OtherRecipientInfo.java
+++ /dev/null
@@ -1,112 +0,0 @@
-package org.bouncycastle.asn1.cms;
-
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.ASN1TaggedObject;
-import org.bouncycastle.asn1.DERSequence;
-
-/**
- * <a href="http://tools.ietf.org/html/rfc5652#section-6.2.5">RFC 5652</a>:
- * Content encryption key delivery mechanisms.
- * <pre>
- * OtherRecipientInfo ::= SEQUENCE {
- *    oriType OBJECT IDENTIFIER,
- *    oriValue ANY DEFINED BY oriType }
- * </pre>
- */
-public class OtherRecipientInfo
-    extends ASN1Object
-{
-    private ASN1ObjectIdentifier    oriType;
-    private ASN1Encodable           oriValue;
-
-    public OtherRecipientInfo(
-        ASN1ObjectIdentifier     oriType,
-        ASN1Encodable            oriValue)
-    {
-        this.oriType = oriType;
-        this.oriValue = oriValue;
-    }
-
-    /**
-     * @deprecated use getInstance().
-     */
-    public OtherRecipientInfo(
-        ASN1Sequence seq)
-    {
-        oriType = ASN1ObjectIdentifier.getInstance(seq.getObjectAt(0));
-        oriValue = seq.getObjectAt(1);
-    }
-
-    /**
-     * Return a OtherRecipientInfo object from a tagged object.
-     *
-     * @param obj the tagged object holding the object we want.
-     * @param explicit true if the object is meant to be explicitly
-     *              tagged false otherwise.
-     * @exception IllegalArgumentException if the object held by the
-     *          tagged object cannot be converted.
-     */
-    public static OtherRecipientInfo getInstance(
-        ASN1TaggedObject    obj,
-        boolean             explicit)
-    {
-        return getInstance(ASN1Sequence.getInstance(obj, explicit));
-    }
-    
-    /**
-     * Return a OtherRecipientInfo object from the given object.
-     * <p>
-     * Accepted inputs:
-     * <ul>
-     * <li> null &rarr; null
-     * <li> {@link PasswordRecipientInfo} object
-     * <li> {@link org.bouncycastle.asn1.ASN1Sequence#getInstance(java.lang.Object) ASN1Sequence} input formats with OtherRecipientInfo structure inside
-     * </ul>
-     *
-     * @param obj the object we want converted.
-     * @exception IllegalArgumentException if the object cannot be converted.
-     */
-    public static OtherRecipientInfo getInstance(
-        Object obj)
-    {
-        if (obj instanceof OtherRecipientInfo)
-        {
-            return (OtherRecipientInfo)obj;
-        }
-        
-        if (obj != null)
-        {
-            return new OtherRecipientInfo(ASN1Sequence.getInstance(obj));
-        }
-        
-        return null;
-    }
-
-    public ASN1ObjectIdentifier getType()
-    {
-        return oriType;
-    }
-
-    public ASN1Encodable getValue()
-    {
-        return oriValue;
-    }
-
-    /** 
-     * Produce an object suitable for an ASN1OutputStream.
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector  v = new ASN1EncodableVector();
-
-        v.add(oriType);
-        v.add(oriValue);
-
-        return new DERSequence(v);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/cms/OtherRevocationInfoFormat.java b/bcprov/src/main/java/org/bouncycastle/asn1/cms/OtherRevocationInfoFormat.java
deleted file mode 100644
index a8348ff..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/cms/OtherRevocationInfoFormat.java
+++ /dev/null
@@ -1,109 +0,0 @@
-package org.bouncycastle.asn1.cms;
-
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.ASN1TaggedObject;
-import org.bouncycastle.asn1.DERSequence;
-
-/**
- * <a href="http://tools.ietf.org/html/rfc5652#section-10.2.1">RFC 5652</a>: OtherRevocationInfoFormat object.
- * <p>
- * <pre>
- * OtherRevocationInfoFormat ::= SEQUENCE {
- *      otherRevInfoFormat OBJECT IDENTIFIER,
- *      otherRevInfo ANY DEFINED BY otherRevInfoFormat }
- * </pre>
- */
-public class OtherRevocationInfoFormat
-    extends ASN1Object
-{
-    private ASN1ObjectIdentifier otherRevInfoFormat;
-    private ASN1Encodable otherRevInfo;
-
-    public OtherRevocationInfoFormat(
-        ASN1ObjectIdentifier otherRevInfoFormat,
-        ASN1Encodable otherRevInfo)
-    {
-        this.otherRevInfoFormat = otherRevInfoFormat;
-        this.otherRevInfo = otherRevInfo;
-    }
-
-    private OtherRevocationInfoFormat(
-        ASN1Sequence seq)
-    {
-        otherRevInfoFormat = ASN1ObjectIdentifier.getInstance(seq.getObjectAt(0));
-        otherRevInfo = seq.getObjectAt(1);
-    }
-
-    /**
-     * Return a OtherRevocationInfoFormat object from a tagged object.
-     *
-     * @param obj the tagged object holding the object we want.
-     * @param explicit true if the object is meant to be explicitly
-     *              tagged false otherwise.
-     * @exception IllegalArgumentException if the object held by the
-     *          tagged object cannot be converted.
-     */
-    public static OtherRevocationInfoFormat getInstance(
-        ASN1TaggedObject    obj,
-        boolean             explicit)
-    {
-        return getInstance(ASN1Sequence.getInstance(obj, explicit));
-    }
-    
-    /**
-     * Return a OtherRevocationInfoFormat object from the given object.
-     * <p>
-     * Accepted inputs:
-     * <ul>
-     * <li> null &rarr; null
-     * <li> {@link OtherRevocationInfoFormat} object
-     * <li> {@link org.bouncycastle.asn1.ASN1Sequence#getInstance(java.lang.Object) ASN1Sequence} input formats with OtherRevocationInfoFormat structure inside
-     * </ul>
-     *
-     * @param obj the object we want converted.
-     * @exception IllegalArgumentException if the object cannot be converted.
-     */
-    public static OtherRevocationInfoFormat getInstance(
-        Object obj)
-    {
-        if (obj instanceof OtherRevocationInfoFormat)
-        {
-            return (OtherRevocationInfoFormat)obj;
-        }
-        
-        if (obj != null)
-        {
-            return new OtherRevocationInfoFormat(ASN1Sequence.getInstance(obj));
-        }
-        
-        return null;
-    }
-
-    public ASN1ObjectIdentifier getInfoFormat()
-    {
-        return otherRevInfoFormat;
-    }
-
-    public ASN1Encodable getInfo()
-    {
-        return otherRevInfo;
-    }
-
-    /** 
-     * Produce an object suitable for an ASN1OutputStream.
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector  v = new ASN1EncodableVector();
-
-        v.add(otherRevInfoFormat);
-        v.add(otherRevInfo);
-
-        return new DERSequence(v);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/cms/PasswordRecipientInfo.java b/bcprov/src/main/java/org/bouncycastle/asn1/cms/PasswordRecipientInfo.java
deleted file mode 100644
index 7ed16cf..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/cms/PasswordRecipientInfo.java
+++ /dev/null
@@ -1,157 +0,0 @@
-package org.bouncycastle.asn1.cms;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.ASN1TaggedObject;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.DERTaggedObject;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-
-/**
- * <a href="http://tools.ietf.org/html/rfc5652#section-10.2.7">RFC 5652</a>:
- * Content encryption key delivery mechanisms.
- * <pre>
- * PasswordRecipientInfo ::= SEQUENCE {
- *     version       CMSVersion,   -- Always set to 0
- *     keyDerivationAlgorithm [0] KeyDerivationAlgorithmIdentifier
- *                             OPTIONAL,
- *     keyEncryptionAlgorithm KeyEncryptionAlgorithmIdentifier,
- *     encryptedKey  EncryptedKey }
- * </pre>
- */
-public class PasswordRecipientInfo
-    extends ASN1Object
-{
-    private ASN1Integer          version;
-    private AlgorithmIdentifier keyDerivationAlgorithm;
-    private AlgorithmIdentifier keyEncryptionAlgorithm;
-    private ASN1OctetString     encryptedKey;
-
-    public PasswordRecipientInfo(
-        AlgorithmIdentifier     keyEncryptionAlgorithm,
-        ASN1OctetString         encryptedKey)
-    {
-        this.version = new ASN1Integer(0);
-        this.keyEncryptionAlgorithm = keyEncryptionAlgorithm;
-        this.encryptedKey = encryptedKey;
-    }
-    
-    public PasswordRecipientInfo(
-        AlgorithmIdentifier     keyDerivationAlgorithm,
-        AlgorithmIdentifier     keyEncryptionAlgorithm,
-        ASN1OctetString         encryptedKey)
-    {
-        this.version = new ASN1Integer(0);
-        this.keyDerivationAlgorithm = keyDerivationAlgorithm;
-        this.keyEncryptionAlgorithm = keyEncryptionAlgorithm;
-        this.encryptedKey = encryptedKey;
-    }
-
-    /**
-     * @deprecated use getInstance() method.
-     */
-    public PasswordRecipientInfo(
-        ASN1Sequence seq)
-    {
-        version = (ASN1Integer)seq.getObjectAt(0);
-        if (seq.getObjectAt(1) instanceof ASN1TaggedObject)
-        {
-            keyDerivationAlgorithm = AlgorithmIdentifier.getInstance((ASN1TaggedObject)seq.getObjectAt(1), false);
-            keyEncryptionAlgorithm = AlgorithmIdentifier.getInstance(seq.getObjectAt(2));
-            encryptedKey = (ASN1OctetString)seq.getObjectAt(3);
-        }
-        else
-        {
-            keyEncryptionAlgorithm = AlgorithmIdentifier.getInstance(seq.getObjectAt(1));
-            encryptedKey = (ASN1OctetString)seq.getObjectAt(2);
-        }
-    }
-
-    /**
-     * Return a PasswordRecipientInfo object from a tagged object.
-     *
-     * @param obj the tagged object holding the object we want.
-     * @param explicit true if the object is meant to be explicitly
-     *              tagged false otherwise.
-     * @exception IllegalArgumentException if the object held by the
-     *          tagged object cannot be converted.
-     */
-    public static PasswordRecipientInfo getInstance(
-        ASN1TaggedObject    obj,
-        boolean             explicit)
-    {
-        return getInstance(ASN1Sequence.getInstance(obj, explicit));
-    }
-    
-    /**
-     * Return a PasswordRecipientInfo object from the given object.
-     * <p>
-     * Accepted inputs:
-     * <ul>
-     * <li> null &rarr; null
-     * <li> {@link PasswordRecipientInfo} object
-     * <li> {@link org.bouncycastle.asn1.ASN1Sequence#getInstance(java.lang.Object) ASN1Sequence} input formats with PasswordRecipientInfo structure inside
-     * </ul>
-     *
-     * @param obj the object we want converted.
-     * @exception IllegalArgumentException if the object cannot be converted.
-     */
-    public static PasswordRecipientInfo getInstance(
-        Object obj)
-    {
-        if (obj instanceof PasswordRecipientInfo)
-        {
-            return (PasswordRecipientInfo)obj;
-        }
-        
-        if (obj != null)
-        {
-            return new PasswordRecipientInfo(ASN1Sequence.getInstance(obj));
-        }
-        
-        return null;
-    }
-
-    public ASN1Integer getVersion()
-    {
-        return version;
-    }
-
-    public AlgorithmIdentifier getKeyDerivationAlgorithm()
-    {
-        return keyDerivationAlgorithm;
-    }
-
-    public AlgorithmIdentifier getKeyEncryptionAlgorithm()
-    {
-        return keyEncryptionAlgorithm;
-    }
-
-    public ASN1OctetString getEncryptedKey()
-    {
-        return encryptedKey;
-    }
-
-    /** 
-     * Produce an object suitable for an ASN1OutputStream.
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector  v = new ASN1EncodableVector();
-
-        v.add(version);
-        
-        if (keyDerivationAlgorithm != null)
-        {
-            v.add(new DERTaggedObject(false, 0, keyDerivationAlgorithm));
-        }
-        v.add(keyEncryptionAlgorithm);
-        v.add(encryptedKey);
-
-        return new DERSequence(v);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/cms/RecipientEncryptedKey.java b/bcprov/src/main/java/org/bouncycastle/asn1/cms/RecipientEncryptedKey.java
deleted file mode 100644
index 5062c10..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/cms/RecipientEncryptedKey.java
+++ /dev/null
@@ -1,109 +0,0 @@
-package org.bouncycastle.asn1.cms;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.ASN1TaggedObject;
-import org.bouncycastle.asn1.DERSequence;
-
-/**
- * <a href="http://tools.ietf.org/html/rfc5652#section-6.2.2">RFC 5652</a>:
- * Content encryption key delivery mechanisms.
- * <pre>
- * RecipientEncryptedKey ::= SEQUENCE {
- *     rid KeyAgreeRecipientIdentifier,
- *     encryptedKey EncryptedKey
- * }
- * </pre>
- */
-public class RecipientEncryptedKey
-    extends ASN1Object
-{
-    private KeyAgreeRecipientIdentifier identifier;
-    private ASN1OctetString encryptedKey;
-
-    private RecipientEncryptedKey(
-        ASN1Sequence seq)
-    {
-        identifier = KeyAgreeRecipientIdentifier.getInstance(seq.getObjectAt(0));
-        encryptedKey = (ASN1OctetString)seq.getObjectAt(1);
-    }
-    
-    /**
-     * Return an RecipientEncryptedKey object from a tagged object.
-     *
-     * @param obj the tagged object holding the object we want.
-     * @param explicit true if the object is meant to be explicitly
-     *              tagged false otherwise.
-     * @exception IllegalArgumentException if the object held by the
-     *          tagged object cannot be converted.
-     */
-    public static RecipientEncryptedKey getInstance(
-        ASN1TaggedObject    obj,
-        boolean             explicit)
-    {
-        return getInstance(ASN1Sequence.getInstance(obj, explicit));
-    }
-    
-    /**
-     * Return a RecipientEncryptedKey object from the given object.
-     * <p>
-     * Accepted inputs:
-     * <ul>
-     * <li> null &rarr; null
-     * <li> {@link RecipientEncryptedKey} object
-     * <li> {@link org.bouncycastle.asn1.ASN1Sequence#getInstance(java.lang.Object) ASN1Sequence} input formats with RecipientEncryptedKey structure inside
-     * </ul>
-     *
-     * @param obj the object we want converted.
-     * @exception IllegalArgumentException if the object cannot be converted.
-     */
-    public static RecipientEncryptedKey getInstance(
-        Object obj)
-    {
-        if (obj instanceof RecipientEncryptedKey)
-        {
-            return (RecipientEncryptedKey)obj;
-        }
-        
-        if (obj != null)
-        {
-            return new RecipientEncryptedKey(ASN1Sequence.getInstance(obj));
-        }
-        
-        return null;
-    } 
-
-    public RecipientEncryptedKey(
-        KeyAgreeRecipientIdentifier id,
-        ASN1OctetString             encryptedKey)
-    {
-        this.identifier = id;
-        this.encryptedKey = encryptedKey;
-    }
-
-    public KeyAgreeRecipientIdentifier getIdentifier()
-    {
-        return identifier;
-    }
-
-    public ASN1OctetString getEncryptedKey()
-    {
-        return encryptedKey;
-    }
-
-    /** 
-     * Produce an object suitable for an ASN1OutputStream.
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector  v = new ASN1EncodableVector();
-
-        v.add(identifier);
-        v.add(encryptedKey);
-
-        return new DERSequence(v);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/cms/RecipientIdentifier.java b/bcprov/src/main/java/org/bouncycastle/asn1/cms/RecipientIdentifier.java
deleted file mode 100644
index 66b154a..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/cms/RecipientIdentifier.java
+++ /dev/null
@@ -1,111 +0,0 @@
-package org.bouncycastle.asn1.cms;
-
-import org.bouncycastle.asn1.ASN1Choice;
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1TaggedObject;
-import org.bouncycastle.asn1.DERTaggedObject;
-
-/**
- * <a href="http://tools.ietf.org/html/rfc5652#section-6.2.1">RFC 5652</a>:
- * Content encryption key delivery mechanisms.
- * <pre>
- * RecipientIdentifier ::= CHOICE {
- *     issuerAndSerialNumber IssuerAndSerialNumber,
- *     subjectKeyIdentifier [0] SubjectKeyIdentifier 
- * }
- *
- * SubjectKeyIdentifier ::= OCTET STRING
- * </pre>
- */
-public class RecipientIdentifier
-    extends ASN1Object
-    implements ASN1Choice
-{
-    private ASN1Encodable id;
-    
-    public RecipientIdentifier(
-        IssuerAndSerialNumber id)
-    {
-        this.id = id;
-    }
-    
-    public RecipientIdentifier(
-        ASN1OctetString id)
-    {
-        this.id = new DERTaggedObject(false, 0, id);
-    }
-    
-    public RecipientIdentifier(
-        ASN1Primitive id)
-    {
-        this.id = id;
-    }
-    
-    /**
-     * Return a RecipientIdentifier object from the given object.
-     * <p>
-     * Accepted inputs:
-     * <ul>
-     * <li> null &rarr; null
-     * <li> {@link RecipientIdentifier} object
-     * <li> {@link IssuerAndSerialNumber} object
-     * <li> {@link org.bouncycastle.asn1.ASN1OctetString#getInstance(java.lang.Object) ASN1OctetString} input formats (OctetString, byte[]) with value of KeyIdentifier in DER form
-     * <li> {@link org.bouncycastle.asn1.ASN1Primitive ASN1Primitive} for RecipientIdentifier constructor
-     * </ul>
-     *
-     * @param o the object we want converted.
-     * @exception IllegalArgumentException if the object cannot be converted.
-     */
-    public static RecipientIdentifier getInstance(
-        Object o)
-    {
-        if (o == null || o instanceof RecipientIdentifier)
-        {
-            return (RecipientIdentifier)o;
-        }
-        
-        if (o instanceof IssuerAndSerialNumber)
-        {
-            return new RecipientIdentifier((IssuerAndSerialNumber)o);
-        }
-        
-        if (o instanceof ASN1OctetString)
-        {
-            return new RecipientIdentifier((ASN1OctetString)o);
-        }
-        
-        if (o instanceof ASN1Primitive)
-        {
-            return new RecipientIdentifier((ASN1Primitive)o);
-        }
-        
-        throw new IllegalArgumentException(
-          "Illegal object in RecipientIdentifier: " + o.getClass().getName());
-    } 
-
-    public boolean isTagged()
-    {
-        return (id instanceof ASN1TaggedObject);
-    }
-
-    public ASN1Encodable getId()
-    {
-        if (id instanceof ASN1TaggedObject)
-        {
-            return ASN1OctetString.getInstance((ASN1TaggedObject)id, false);
-        }
-
-        return IssuerAndSerialNumber.getInstance(id);
-    }
-
-    /** 
-     * Produce an object suitable for an ASN1OutputStream.
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        return id.toASN1Primitive();
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/cms/RecipientInfo.java b/bcprov/src/main/java/org/bouncycastle/asn1/cms/RecipientInfo.java
deleted file mode 100644
index 39a7bb2..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/cms/RecipientInfo.java
+++ /dev/null
@@ -1,173 +0,0 @@
-package org.bouncycastle.asn1.cms;
-
-import org.bouncycastle.asn1.ASN1Choice;
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.ASN1TaggedObject;
-import org.bouncycastle.asn1.DERTaggedObject;
-
-/**
- * <a href="http://tools.ietf.org/html/rfc5652#section-6.2">RFC 5652</a>:
- * Content encryption key delivery mechanisms.
- * <p>
- * <pre>
- * RecipientInfo ::= CHOICE {
- *     ktri      KeyTransRecipientInfo,
- *     kari  [1] KeyAgreeRecipientInfo,
- *     kekri [2] KEKRecipientInfo,
- *     pwri  [3] PasswordRecipientInfo,
- *     ori   [4] OtherRecipientInfo }
- * </pre>
- */
-public class RecipientInfo
-    extends ASN1Object
-    implements ASN1Choice
-{
-    ASN1Encodable    info;
-
-    public RecipientInfo(
-        KeyTransRecipientInfo info)
-    {
-        this.info = info;
-    }
-
-    public RecipientInfo(
-        KeyAgreeRecipientInfo info)
-    {
-        this.info = new DERTaggedObject(false, 1, info);
-    }
-
-    public RecipientInfo(
-        KEKRecipientInfo info)
-    {
-        this.info = new DERTaggedObject(false, 2, info);
-    }
-
-    public RecipientInfo(
-        PasswordRecipientInfo info)
-    {
-        this.info = new DERTaggedObject(false, 3, info);
-    }
-
-    public RecipientInfo(
-        OtherRecipientInfo info)
-    {
-        this.info = new DERTaggedObject(false, 4, info);
-    }
-
-    public RecipientInfo(
-        ASN1Primitive   info)
-    {
-        this.info = info;
-    }
-
-    /**
-     * Return a RecipientInfo object from the given object.
-     * <p>
-     * Accepted inputs:
-     * <ul>
-     * <li> null &rarr; null
-     * <li> {@link RecipientInfo} object
-     * <li> {@link org.bouncycastle.asn1.ASN1Sequence#getInstance(java.lang.Object) ASN1Sequence} input formats with RecipientInfo structure inside
-     * <li> {@link org.bouncycastle.asn1.ASN1TaggedObject#getInstance(java.lang.Object) ASN1TaggedObject} input formats with RecipientInfo structure inside
-     * </ul>
-     *
-     * @param o the object we want converted.
-     * @exception IllegalArgumentException if the object cannot be converted.
-     */
-    public static RecipientInfo getInstance(
-        Object  o)
-    {
-        if (o == null || o instanceof RecipientInfo)
-        {
-            return (RecipientInfo)o;
-        }
-        else if (o instanceof ASN1Sequence)
-        {
-            return new RecipientInfo((ASN1Sequence)o);
-        }
-        else if (o instanceof ASN1TaggedObject)
-        {
-            return new RecipientInfo((ASN1TaggedObject)o);
-        }
-
-        throw new IllegalArgumentException("unknown object in factory: "
-                                                    + o.getClass().getName());
-    }
-
-    public ASN1Integer getVersion()
-    {
-        if (info instanceof ASN1TaggedObject)
-        {
-            ASN1TaggedObject o = (ASN1TaggedObject)info;
-
-            switch (o.getTagNo())
-            {
-            case 1:
-                return KeyAgreeRecipientInfo.getInstance(o, false).getVersion();
-            case 2:
-                return getKEKInfo(o).getVersion();
-            case 3:
-                return PasswordRecipientInfo.getInstance(o, false).getVersion();
-            case 4:
-                return new ASN1Integer(0);    // no syntax version for OtherRecipientInfo
-            default:
-                throw new IllegalStateException("unknown tag");
-            }
-        }
-
-        return KeyTransRecipientInfo.getInstance(info).getVersion();
-    }
-
-    public boolean isTagged()
-    {
-        return (info instanceof ASN1TaggedObject);
-    }
-
-    public ASN1Encodable getInfo()
-    {
-        if (info instanceof ASN1TaggedObject)
-        {
-            ASN1TaggedObject o = (ASN1TaggedObject)info;
-
-            switch (o.getTagNo())
-            {
-            case 1:
-                return KeyAgreeRecipientInfo.getInstance(o, false);
-            case 2:
-                return getKEKInfo(o);
-            case 3:
-                return PasswordRecipientInfo.getInstance(o, false);
-            case 4:
-                return OtherRecipientInfo.getInstance(o, false);
-            default:
-                throw new IllegalStateException("unknown tag");
-            }
-        }
-
-        return KeyTransRecipientInfo.getInstance(info);
-    }
-
-    private KEKRecipientInfo getKEKInfo(ASN1TaggedObject o)
-    {
-        if (o.isExplicit())
-        {                        // compatibilty with erroneous version
-            return KEKRecipientInfo.getInstance(o, true);
-        }
-        else
-        {
-            return KEKRecipientInfo.getInstance(o, false);
-        }
-    }
-
-    /**
-     * Produce an object suitable for an ASN1OutputStream.
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        return info.toASN1Primitive();
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/cms/RecipientKeyIdentifier.java b/bcprov/src/main/java/org/bouncycastle/asn1/cms/RecipientKeyIdentifier.java
deleted file mode 100644
index a680e4a..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/cms/RecipientKeyIdentifier.java
+++ /dev/null
@@ -1,171 +0,0 @@
-package org.bouncycastle.asn1.cms;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1GeneralizedTime;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.ASN1TaggedObject;
-import org.bouncycastle.asn1.DEROctetString;
-import org.bouncycastle.asn1.DERSequence;
-
-/**
- * <a href="http://tools.ietf.org/html/rfc5652#section-6.2.2">RFC 5652</a>:
- * Content encryption key delivery mechanisms.
- * <p>
- * <pre>
- * RecipientKeyIdentifier ::= SEQUENCE {
- *     subjectKeyIdentifier SubjectKeyIdentifier,
- *     date GeneralizedTime OPTIONAL,
- *     other OtherKeyAttribute OPTIONAL 
- * }
- *
- * SubjectKeyIdentifier ::= OCTET STRING
- * </pre>
- */
-public class RecipientKeyIdentifier
-    extends ASN1Object
-{
-    private ASN1OctetString      subjectKeyIdentifier;
-    private ASN1GeneralizedTime  date;
-    private OtherKeyAttribute    other;
-
-    public RecipientKeyIdentifier(
-        ASN1OctetString         subjectKeyIdentifier,
-        ASN1GeneralizedTime     date,
-        OtherKeyAttribute       other)
-    {
-        this.subjectKeyIdentifier = subjectKeyIdentifier;
-        this.date = date;
-        this.other = other;
-    }
-
-    public RecipientKeyIdentifier(
-        byte[]                  subjectKeyIdentifier,
-        ASN1GeneralizedTime     date,
-        OtherKeyAttribute       other)
-    {
-        this.subjectKeyIdentifier = new DEROctetString(subjectKeyIdentifier);
-        this.date = date;
-        this.other = other;
-    }
-
-    public RecipientKeyIdentifier(
-        byte[]         subjectKeyIdentifier)
-    {
-        this(subjectKeyIdentifier, null, null);
-    }
-
-    /**
-     * @deprecated use getInstance()
-     */
-    public RecipientKeyIdentifier(
-        ASN1Sequence seq)
-    {
-        subjectKeyIdentifier = ASN1OctetString.getInstance(
-                                                    seq.getObjectAt(0));
-        
-        switch(seq.size())
-        {
-        case 1:
-            break;
-        case 2:
-            if (seq.getObjectAt(1) instanceof ASN1GeneralizedTime)
-            {
-                date = ASN1GeneralizedTime.getInstance(seq.getObjectAt(1));
-            }
-            else
-            {
-                other = OtherKeyAttribute.getInstance(seq.getObjectAt(2));
-            }
-            break;
-        case 3:
-            date  = ASN1GeneralizedTime.getInstance(seq.getObjectAt(1));
-            other = OtherKeyAttribute.getInstance(seq.getObjectAt(2));
-            break;
-        default:
-            throw new IllegalArgumentException("Invalid RecipientKeyIdentifier");
-        }
-    }
-
-    /**
-     * Return a RecipientKeyIdentifier object from a tagged object.
-     *
-     * @param ato the tagged object holding the object we want.
-     * @param isExplicit true if the object is meant to be explicitly
-     *              tagged false otherwise.
-     * @exception IllegalArgumentException if the object held by the
-     *          tagged object cannot be converted.
-     */
-    public static RecipientKeyIdentifier getInstance(ASN1TaggedObject ato, boolean isExplicit)
-    {
-        return getInstance(ASN1Sequence.getInstance(ato, isExplicit));
-    }
-    
-    /**
-     * Return a RecipientKeyIdentifier object from the given object.
-     * <p>
-     * Accepted inputs:
-     * <ul>
-     * <li> null &rarr; null
-     * <li> {@link RecipientKeyIdentifier} object
-     * <li> {@link org.bouncycastle.asn1.ASN1Sequence#getInstance(java.lang.Object) ASN1Sequence} input formats with RecipientKeyIdentifier structure inside
-     * </ul>
-     *
-     * @param obj the object we want converted.
-     * @exception IllegalArgumentException if the object cannot be converted.
-     */
-    public static RecipientKeyIdentifier getInstance(Object obj)
-    {
-        if (obj instanceof RecipientKeyIdentifier)
-        {
-            return (RecipientKeyIdentifier)obj;
-        }
-        
-        if(obj != null)
-        {
-            return new RecipientKeyIdentifier(ASN1Sequence.getInstance(obj));
-        }
-        
-        return null;
-    } 
-
-    public ASN1OctetString getSubjectKeyIdentifier()
-    {
-        return subjectKeyIdentifier;
-    }
-
-    public ASN1GeneralizedTime getDate()
-    {
-        return date;
-    }
-
-    public OtherKeyAttribute getOtherKeyAttribute()
-    {
-        return other;
-    }
-
-
-    /** 
-     * Produce an object suitable for an ASN1OutputStream.
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector  v = new ASN1EncodableVector();
-
-        v.add(subjectKeyIdentifier);
-        
-        if (date != null)
-        {
-            v.add(date);
-        }
-
-        if (other != null)
-        {
-            v.add(other);
-        }
-        
-        return new DERSequence(v);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/cms/SCVPReqRes.java b/bcprov/src/main/java/org/bouncycastle/asn1/cms/SCVPReqRes.java
deleted file mode 100644
index 52279c3..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/cms/SCVPReqRes.java
+++ /dev/null
@@ -1,108 +0,0 @@
-package org.bouncycastle.asn1.cms;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.ASN1TaggedObject;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.DERTaggedObject;
-
-/**
- * <a href="http://tools.ietf.org/html/rfc5940">RFC 5940</a>:
- * Additional Cryptographic Message Syntax (CMS) Revocation Information Choices.
- * <p>
- * <pre>
- * SCVPReqRes ::= SEQUENCE {
- *     request  [0] EXPLICIT ContentInfo OPTIONAL,
- *     response     ContentInfo }
- * </pre>
- */
-public class SCVPReqRes
-    extends ASN1Object
-{
-    private final ContentInfo request;
-    private final ContentInfo response;
-
-    /**
-     * Return a SCVPReqRes object from the given object.
-     * <p>
-     * Accepted inputs:
-     * <ul>
-     * <li> null &rarr; null
-     * <li> {@link SCVPReqRes} object
-     * <li> {@link org.bouncycastle.asn1.ASN1Sequence#getInstance(java.lang.Object) ASN1Sequence} input formats with SCVPReqRes structure inside
-     * </ul>
-     *
-     * @param obj the object we want converted.
-     * @exception IllegalArgumentException if the object cannot be converted.
-     */
-    public static SCVPReqRes getInstance(
-        Object  obj)
-    {
-        if (obj instanceof SCVPReqRes)
-        {
-            return (SCVPReqRes)obj;
-        }
-        else if (obj != null)
-        {
-            return new SCVPReqRes(ASN1Sequence.getInstance(obj));
-        }
-
-        return null;
-    }
-
-    private SCVPReqRes(
-        ASN1Sequence seq)
-    {
-        if (seq.getObjectAt(0) instanceof ASN1TaggedObject)
-        {
-            this.request = ContentInfo.getInstance(ASN1TaggedObject.getInstance(seq.getObjectAt(0)), true);
-            this.response = ContentInfo.getInstance(seq.getObjectAt(1));
-        }
-        else
-        {
-            this.request = null;
-            this.response = ContentInfo.getInstance(seq.getObjectAt(0));
-        }
-    }
-
-    public SCVPReqRes(ContentInfo response)
-    {
-        this.request = null;       // use of this confuses earlier JDKs
-        this.response = response;
-    }
-
-    public SCVPReqRes(ContentInfo request, ContentInfo response)
-    {
-        this.request = request;
-        this.response = response;
-    }
-
-    public ContentInfo getRequest()
-    {
-        return request;
-    }
-
-    public ContentInfo getResponse()
-    {
-        return response;
-    }
-
-    /**
-     * @return  the ASN.1 primitive representation.
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector    v = new ASN1EncodableVector();
-
-        if (request != null)
-        {
-            v.add(new DERTaggedObject(true, 0, request));
-        }
-
-        v.add(response);
-
-        return new DERSequence(v);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/cms/SignedDataParser.java b/bcprov/src/main/java/org/bouncycastle/asn1/cms/SignedDataParser.java
deleted file mode 100644
index df22b8e..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/cms/SignedDataParser.java
+++ /dev/null
@@ -1,141 +0,0 @@
-package org.bouncycastle.asn1.cms;
-
-import java.io.IOException;
-
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.ASN1SequenceParser;
-import org.bouncycastle.asn1.ASN1Set;
-import org.bouncycastle.asn1.ASN1SetParser;
-import org.bouncycastle.asn1.ASN1TaggedObjectParser;
-import org.bouncycastle.asn1.BERTags;
-
-/**
- * Parser for <a href="http://tools.ietf.org/html/rfc5652#section-5.1">RFC 5652</a>: {@link SignedData} object.
- * <p>
- * <pre>
- * SignedData ::= SEQUENCE {
- *     version CMSVersion,
- *     digestAlgorithms DigestAlgorithmIdentifiers,
- *     encapContentInfo EncapsulatedContentInfo,
- *     certificates [0] IMPLICIT CertificateSet OPTIONAL,
- *     crls [1] IMPLICIT CertificateRevocationLists OPTIONAL,
- *     signerInfos SignerInfos
- *   }
- * </pre>
- */
-public class SignedDataParser
-{
-    private ASN1SequenceParser _seq;
-    private ASN1Integer         _version;
-    private Object             _nextObject;
-    private boolean            _certsCalled;
-    private boolean            _crlsCalled;
-
-    public static SignedDataParser getInstance(
-        Object o)
-        throws IOException
-    {
-        if (o instanceof ASN1Sequence)
-        {
-            return new SignedDataParser(((ASN1Sequence)o).parser());
-        }
-        if (o instanceof ASN1SequenceParser)
-        {
-            return new SignedDataParser((ASN1SequenceParser)o);
-        }
-
-        throw new IOException("unknown object encountered: " + o.getClass().getName());
-    }
-
-    private SignedDataParser(
-        ASN1SequenceParser seq)
-        throws IOException
-    {
-        this._seq = seq;
-        this._version = (ASN1Integer)seq.readObject();
-    }
-
-    public ASN1Integer getVersion()
-    {
-        return _version;
-    }
-
-    public ASN1SetParser getDigestAlgorithms()
-        throws IOException
-    {
-        Object o = _seq.readObject();
-
-        if (o instanceof ASN1Set)
-        {
-            return ((ASN1Set)o).parser();
-        }
-
-        return (ASN1SetParser)o;
-    }
-
-    public ContentInfoParser getEncapContentInfo()
-        throws IOException
-    {
-        return new ContentInfoParser((ASN1SequenceParser)_seq.readObject());
-    }
-
-    public ASN1SetParser getCertificates()
-        throws IOException
-    {
-        _certsCalled = true;
-        _nextObject = _seq.readObject();
-
-        if (_nextObject instanceof ASN1TaggedObjectParser && ((ASN1TaggedObjectParser)_nextObject).getTagNo() == 0)
-        {
-            ASN1SetParser certs = (ASN1SetParser)((ASN1TaggedObjectParser)_nextObject).getObjectParser(BERTags.SET, false);
-            _nextObject = null;
-
-            return certs;
-        }
-
-        return null;
-    }
-
-    public ASN1SetParser getCrls()
-        throws IOException
-    {
-        if (!_certsCalled)
-        {
-            throw new IOException("getCerts() has not been called.");
-        }
-
-        _crlsCalled = true;
-
-        if (_nextObject == null)
-        {
-            _nextObject = _seq.readObject();
-        }
-
-        if (_nextObject instanceof ASN1TaggedObjectParser && ((ASN1TaggedObjectParser)_nextObject).getTagNo() == 1)
-        {
-            ASN1SetParser crls = (ASN1SetParser)((ASN1TaggedObjectParser)_nextObject).getObjectParser(BERTags.SET, false);
-            _nextObject = null;
-
-            return crls;
-        }
-
-        return null;
-    }
-
-    public ASN1SetParser getSignerInfos()
-        throws IOException
-    {
-        if (!_certsCalled || !_crlsCalled)
-        {
-            throw new IOException("getCerts() and/or getCrls() has not been called.");
-        }
-
-        if (_nextObject == null)
-        {
-            _nextObject = _seq.readObject();
-        }
-
-        return (ASN1SetParser)_nextObject;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/cms/TimeStampAndCRL.java b/bcprov/src/main/java/org/bouncycastle/asn1/cms/TimeStampAndCRL.java
deleted file mode 100644
index f6d8d5a..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/cms/TimeStampAndCRL.java
+++ /dev/null
@@ -1,96 +0,0 @@
-package org.bouncycastle.asn1.cms;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.x509.CertificateList;
-
-/**
- * <a href="http://tools.ietf.org/html/rfc5544">RFC 5544</a>
- * Binding Documents with Time-Stamps; TimeStampAndCRL object.
- * <pre>
- * TimeStampAndCRL ::= SEQUENCE {
- *     timeStamp   TimeStampToken,          -- according to RFC 3161
- *     crl         CertificateList OPTIONAL -- according to RFC 5280
- *  }
- * </pre>
- */
-public class TimeStampAndCRL
-    extends ASN1Object
-{
-    private ContentInfo timeStamp;
-    private CertificateList crl;
-
-    public TimeStampAndCRL(ContentInfo timeStamp)
-    {
-        this.timeStamp = timeStamp;
-    }
-
-    private TimeStampAndCRL(ASN1Sequence seq)
-    {
-        this.timeStamp = ContentInfo.getInstance(seq.getObjectAt(0));
-        if (seq.size() == 2)
-        {
-            this.crl = CertificateList.getInstance(seq.getObjectAt(1));
-        }
-    }
-
-    /**
-     * Return a TimeStampAndCRL object from the given object.
-     * <p>
-     * Accepted inputs:
-     * <ul>
-     * <li> null &rarr; null
-     * <li> {@link TimeStampAndCRL} object
-     * <li> {@link org.bouncycastle.asn1.ASN1Sequence#getInstance(java.lang.Object) ASN1Sequence} input formats with TimeStampAndCRL structure inside
-     * </ul>
-     *
-     * @param obj the object we want converted.
-     * @exception IllegalArgumentException if the object cannot be converted.
-     */
-    public static TimeStampAndCRL getInstance(Object obj)
-    {
-        if (obj instanceof TimeStampAndCRL)
-        {
-            return (TimeStampAndCRL)obj;
-        }
-        else if (obj != null)
-        {
-            return new TimeStampAndCRL(ASN1Sequence.getInstance(obj));
-        }
-
-        return null;
-    }
-
-    public ContentInfo getTimeStampToken()
-    {
-        return this.timeStamp;
-    }
-
-    /** @deprecated use getCRL() */
-    public CertificateList getCertificateList()
-    {
-        return this.crl;
-    }
-
-    public CertificateList getCRL()
-    {
-        return this.crl;
-    }
-
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector v = new ASN1EncodableVector();
-
-        v.add(timeStamp);
-
-        if (crl != null)
-        {
-            v.add(crl);
-        }
-
-        return new DERSequence(v);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/cms/TimeStampTokenEvidence.java b/bcprov/src/main/java/org/bouncycastle/asn1/cms/TimeStampTokenEvidence.java
deleted file mode 100644
index 5461147..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/cms/TimeStampTokenEvidence.java
+++ /dev/null
@@ -1,98 +0,0 @@
-package org.bouncycastle.asn1.cms;
-
-import java.util.Enumeration;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.ASN1TaggedObject;
-import org.bouncycastle.asn1.DERSequence;
-
-/**
- * <a href="http://tools.ietf.org/html/rfc5544">RFC 5544</a>
- * Binding Documents with Time-Stamps; TimeStampTokenEvidence object.
- * <pre>
- * TimeStampTokenEvidence ::=
- *    SEQUENCE SIZE(1..MAX) OF TimeStampAndCRL
- * </pre>
- */
-public class TimeStampTokenEvidence
-    extends ASN1Object
-{
-    private TimeStampAndCRL[] timeStampAndCRLs;
-
-    public TimeStampTokenEvidence(TimeStampAndCRL[] timeStampAndCRLs)
-    {
-        this.timeStampAndCRLs = timeStampAndCRLs;
-    }
-
-    public TimeStampTokenEvidence(TimeStampAndCRL timeStampAndCRL)
-    {
-        this.timeStampAndCRLs = new TimeStampAndCRL[1];
-
-        timeStampAndCRLs[0] = timeStampAndCRL;
-    }
-
-    private TimeStampTokenEvidence(ASN1Sequence seq)
-    {
-        this.timeStampAndCRLs = new TimeStampAndCRL[seq.size()];
-
-        int count = 0;
-
-        for (Enumeration en = seq.getObjects(); en.hasMoreElements();)
-        {
-            timeStampAndCRLs[count++] = TimeStampAndCRL.getInstance(en.nextElement());
-        }
-    }
-
-    public static TimeStampTokenEvidence getInstance(ASN1TaggedObject tagged, boolean explicit)
-    {
-        return getInstance(ASN1Sequence.getInstance(tagged, explicit));
-    }
-
-    /**
-     * Return a TimeStampTokenEvidence object from the given object.
-     * <p>
-     * Accepted inputs:
-     * <ul>
-     * <li> null &rarr; null
-     * <li> {@link TimeStampTokenEvidence} object
-     * <li> {@link org.bouncycastle.asn1.ASN1Sequence#getInstance(java.lang.Object) ASN1Sequence} input formats with TimeStampTokenEvidence structure inside
-     * </ul>
-     *
-     * @param obj the object we want converted.
-     * @exception IllegalArgumentException if the object cannot be converted.
-     */
-    public static TimeStampTokenEvidence getInstance(Object obj)
-    {
-        if (obj instanceof TimeStampTokenEvidence)
-        {
-            return (TimeStampTokenEvidence)obj;
-        }
-        else if (obj != null)
-        {
-            return new TimeStampTokenEvidence(ASN1Sequence.getInstance(obj));
-        }
-
-        return null;
-    }
-
-    public TimeStampAndCRL[] toTimeStampAndCRLArray()
-    {
-        return timeStampAndCRLs;
-    }
-    
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector v = new ASN1EncodableVector();
-
-        for (int i = 0; i != timeStampAndCRLs.length; i++)
-        {
-            v.add(timeStampAndCRLs[i]);
-        }
-
-        return new DERSequence(v);
-    }
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/cms/TimeStampedData.java b/bcprov/src/main/java/org/bouncycastle/asn1/cms/TimeStampedData.java
deleted file mode 100644
index f19061e..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/cms/TimeStampedData.java
+++ /dev/null
@@ -1,131 +0,0 @@
-package org.bouncycastle.asn1.cms;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.BERSequence;
-import org.bouncycastle.asn1.DERIA5String;
-
-/**
- * <a href="http://tools.ietf.org/html/rfc5544">RFC 5544</a>:
- * Binding Documents with Time-Stamps; TimeStampedData object.
- * <p>
- * <pre>
- * TimeStampedData ::= SEQUENCE {
- *   version              INTEGER { v1(1) },
- *   dataUri              IA5String OPTIONAL,
- *   metaData             MetaData OPTIONAL,
- *   content              OCTET STRING OPTIONAL,
- *   temporalEvidence     Evidence
- * }
- * </pre>
- */
-public class TimeStampedData
-    extends ASN1Object
-{
-    private ASN1Integer version;
-    private DERIA5String dataUri;
-    private MetaData metaData;
-    private ASN1OctetString content;
-    private Evidence temporalEvidence;
-
-    public TimeStampedData(DERIA5String dataUri, MetaData metaData, ASN1OctetString content, Evidence temporalEvidence)
-    {
-        this.version = new ASN1Integer(1);
-        this.dataUri = dataUri;
-        this.metaData = metaData;
-        this.content = content;
-        this.temporalEvidence = temporalEvidence;
-    }
-
-    private TimeStampedData(ASN1Sequence seq)
-    {
-        this.version = ASN1Integer.getInstance(seq.getObjectAt(0));
-
-        int index = 1;
-        if (seq.getObjectAt(index) instanceof DERIA5String)
-        {
-            this.dataUri = DERIA5String.getInstance(seq.getObjectAt(index++));
-        }
-        if (seq.getObjectAt(index) instanceof MetaData || seq.getObjectAt(index) instanceof ASN1Sequence)
-        {
-            this.metaData = MetaData.getInstance(seq.getObjectAt(index++));
-        }
-        if (seq.getObjectAt(index) instanceof ASN1OctetString)
-        {
-            this.content = ASN1OctetString.getInstance(seq.getObjectAt(index++));
-        }
-        this.temporalEvidence = Evidence.getInstance(seq.getObjectAt(index));
-    }
-
-    /**
-     * Return a TimeStampedData object from the given object.
-     * <p>
-     * Accepted inputs:
-     * <ul>
-     * <li> null &rarr; null
-     * <li> {@link RecipientKeyIdentifier} object
-     * <li> {@link org.bouncycastle.asn1.ASN1Sequence#getInstance(java.lang.Object) ASN1Sequence} input formats with TimeStampedData structure inside
-     * </ul>
-     *
-     * @param obj the object we want converted.
-     * @exception IllegalArgumentException if the object cannot be converted.
-     */
-    public static TimeStampedData getInstance(Object obj)
-    {
-        if (obj == null || obj instanceof TimeStampedData)
-        {
-            return (TimeStampedData)obj;
-        }
-        return new TimeStampedData(ASN1Sequence.getInstance(obj));
-    }
-
-    public DERIA5String getDataUri()
-    {
-        return dataUri;
-    }
-
-    public MetaData getMetaData()
-    {
-        return metaData;
-    }
-
-    public ASN1OctetString getContent()
-    {
-        return content;
-    }
-
-    public Evidence getTemporalEvidence()
-    {
-        return temporalEvidence;
-    }
-
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector v = new ASN1EncodableVector();
-
-        v.add(version);
-
-        if (dataUri != null)
-        {
-            v.add(dataUri);
-        }
-
-        if (metaData != null)
-        {
-            v.add(metaData);
-        }
-
-        if (content != null)
-        {
-            v.add(content);
-        }
-
-        v.add(temporalEvidence);
-
-        return new BERSequence(v);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/cms/TimeStampedDataParser.java b/bcprov/src/main/java/org/bouncycastle/asn1/cms/TimeStampedDataParser.java
deleted file mode 100644
index f53e00f..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/cms/TimeStampedDataParser.java
+++ /dev/null
@@ -1,141 +0,0 @@
-package org.bouncycastle.asn1.cms;
-
-import java.io.IOException;
-
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1OctetStringParser;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.ASN1SequenceParser;
-import org.bouncycastle.asn1.BERSequence;
-import org.bouncycastle.asn1.DERIA5String;
-
-/**
- * Parser for <a href="http://tools.ietf.org/html/rfc5544">RFC 5544</a>:
- * {@link TimeStampedData} object.
- * <p>
- * <pre>
- * TimeStampedData ::= SEQUENCE {
- *   version              INTEGER { v1(1) },
- *   dataUri              IA5String OPTIONAL,
- *   metaData             MetaData OPTIONAL,
- *   content              OCTET STRING OPTIONAL,
- *   temporalEvidence     Evidence
- * }
- * </pre>
- */
-public class TimeStampedDataParser
-{
-    private ASN1Integer version;
-    private DERIA5String dataUri;
-    private MetaData metaData;
-    private ASN1OctetStringParser content;
-    private Evidence temporalEvidence;
-    private ASN1SequenceParser parser;
-
-    private TimeStampedDataParser(ASN1SequenceParser parser)
-        throws IOException
-    {
-        this.parser = parser;
-        this.version = ASN1Integer.getInstance(parser.readObject());
-
-        ASN1Encodable obj = parser.readObject();
-
-        if (obj instanceof DERIA5String)
-        {
-            this.dataUri = DERIA5String.getInstance(obj);
-            obj = parser.readObject();
-        }
-        if (obj instanceof MetaData || obj instanceof ASN1SequenceParser)
-        {
-            this.metaData = MetaData.getInstance(obj.toASN1Primitive());
-            obj = parser.readObject();
-        }
-        if (obj instanceof ASN1OctetStringParser)
-        {
-            this.content = (ASN1OctetStringParser)obj;
-        }
-    }
-
-    public static TimeStampedDataParser getInstance(Object obj)
-        throws IOException
-    {
-        if (obj instanceof ASN1Sequence)
-        {
-            return new TimeStampedDataParser(((ASN1Sequence)obj).parser());
-        }
-        if (obj instanceof ASN1SequenceParser)
-        {
-            return new TimeStampedDataParser((ASN1SequenceParser)obj);
-        }
-
-        return null;
-    }
-
-    public DERIA5String getDataUri()
-    {
-        return dataUri;
-    }
-
-    public MetaData getMetaData()
-    {
-        return metaData;
-    }
-
-    public ASN1OctetStringParser getContent()
-    {
-        return content;
-    }
-
-    public Evidence getTemporalEvidence()
-        throws IOException
-    {
-        if (temporalEvidence == null)
-        {
-            temporalEvidence = Evidence.getInstance(parser.readObject().toASN1Primitive());
-        }
-
-        return temporalEvidence;
-    }
-
-    /**
-     * <pre>
-     * TimeStampedData ::= SEQUENCE {
-     *   version              INTEGER { v1(1) },
-     *   dataUri              IA5String OPTIONAL,
-     *   metaData             MetaData OPTIONAL,
-     *   content              OCTET STRING OPTIONAL,
-     *   temporalEvidence     Evidence
-     * }
-     * </pre>
-     * @return
-     * @deprecated will be removed
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector v = new ASN1EncodableVector();
-
-        v.add(version);
-
-        if (dataUri != null)
-        {
-            v.add(dataUri);
-        }
-
-        if (metaData != null)
-        {
-            v.add(metaData);
-        }
-
-        if (content != null)
-        {
-            v.add(content);
-        }
-
-        v.add(temporalEvidence);
-
-        return new BERSequence(v);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/cms/ecc/MQVuserKeyingMaterial.java b/bcprov/src/main/java/org/bouncycastle/asn1/cms/ecc/MQVuserKeyingMaterial.java
deleted file mode 100644
index bd7267b..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/cms/ecc/MQVuserKeyingMaterial.java
+++ /dev/null
@@ -1,122 +0,0 @@
-package org.bouncycastle.asn1.cms.ecc;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.ASN1TaggedObject;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.DERTaggedObject;
-import org.bouncycastle.asn1.cms.OriginatorPublicKey;
-
-/**
- * <a href="http://tools.ietf.org/html/rfc5753">RFC 5753/3278</a>: MQVuserKeyingMaterial object.
- * <pre>
- * MQVuserKeyingMaterial ::= SEQUENCE {
- *   ephemeralPublicKey OriginatorPublicKey,
- *   addedukm [0] EXPLICIT UserKeyingMaterial OPTIONAL  }
- * </pre>
- */
-public class MQVuserKeyingMaterial
-    extends ASN1Object
-{
-    private OriginatorPublicKey ephemeralPublicKey;
-    private ASN1OctetString addedukm;
-
-    public MQVuserKeyingMaterial(
-        OriginatorPublicKey ephemeralPublicKey,
-        ASN1OctetString addedukm)
-    {
-        // TODO Check ephemeralPublicKey not null
-        
-        this.ephemeralPublicKey = ephemeralPublicKey;
-        this.addedukm = addedukm;
-    }
-
-    private MQVuserKeyingMaterial(
-        ASN1Sequence seq)
-    {
-        // TODO Check seq has either 1 or 2 elements
-
-        this.ephemeralPublicKey = OriginatorPublicKey.getInstance(
-            seq.getObjectAt(0));
-
-        if (seq.size() > 1)
-        {
-            this.addedukm = ASN1OctetString.getInstance(
-                (ASN1TaggedObject)seq.getObjectAt(1), true);
-        }
-    }
-
-    /**
-     * Return an MQVuserKeyingMaterial object from a tagged object.
-     *
-     * @param obj      the tagged object holding the object we want.
-     * @param explicit true if the object is meant to be explicitly
-     *                 tagged false otherwise.
-     * @throws IllegalArgumentException if the object held by the
-     *                                  tagged object cannot be converted.
-     */
-    public static MQVuserKeyingMaterial getInstance(
-        ASN1TaggedObject obj,
-        boolean explicit)
-    {
-        return getInstance(ASN1Sequence.getInstance(obj, explicit));
-    }
-
-    /**
-     * Return an MQVuserKeyingMaterial object from the given object.
-     * <p>
-     * Accepted inputs:
-     * <ul>
-     * <li> null &rarr; null
-     * <li> {@link MQVuserKeyingMaterial} object
-     * <li> {@link org.bouncycastle.asn1.ASN1Sequence ASN1Sequence} with MQVuserKeyingMaterial inside it.
-     * </ul>
-     *
-     * @param obj the object we want converted.
-     * @throws IllegalArgumentException if the object cannot be converted.
-     */
-    public static MQVuserKeyingMaterial getInstance(
-        Object obj)
-    {
-        if (obj == null || obj instanceof MQVuserKeyingMaterial)
-        {
-            return (MQVuserKeyingMaterial)obj;
-        }
-
-        if (obj instanceof ASN1Sequence)
-        {
-            return new MQVuserKeyingMaterial((ASN1Sequence)obj);
-        }
-
-        throw new IllegalArgumentException("Invalid MQVuserKeyingMaterial: " + obj.getClass().getName());
-    }
-
-    public OriginatorPublicKey getEphemeralPublicKey()
-    {
-        return ephemeralPublicKey;
-    }
-
-    public ASN1OctetString getAddedukm()
-    {
-        return addedukm;
-    }
-
-    /**
-     * Produce an object suitable for an ASN1OutputStream.
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector v = new ASN1EncodableVector();
-        v.add(ephemeralPublicKey);
-
-        if (addedukm != null)
-        {
-            v.add(new DERTaggedObject(true, 0, addedukm));
-        }
-
-        return new DERSequence(v);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/cms/ecc/package.html b/bcprov/src/main/java/org/bouncycastle/asn1/cms/ecc/package.html
deleted file mode 100644
index 9d33025..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/cms/ecc/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body bgcolor="#ffffff">
-Support classes for CMS ECC - RFC 5753/3278.
-</body>
-</html>
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/cms/package.html b/bcprov/src/main/java/org/bouncycastle/asn1/cms/package.html
deleted file mode 100644
index c165a7a..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/cms/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body bgcolor="#ffffff">
-Support classes useful for encoding and supporting Cryptographic Message Syntax as described in PKCS#7 and RFC 3369 (formerly RFC 2630).
-</body>
-</html>
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/crmf/AttributeTypeAndValue.java b/bcprov/src/main/java/org/bouncycastle/asn1/crmf/AttributeTypeAndValue.java
deleted file mode 100644
index ec7d283..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/crmf/AttributeTypeAndValue.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package org.bouncycastle.asn1.crmf;
-
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DERSequence;
-
-public class AttributeTypeAndValue
-    extends ASN1Object
-{
-    private ASN1ObjectIdentifier type;
-    private ASN1Encodable       value;
-
-    private AttributeTypeAndValue(ASN1Sequence seq)
-    {
-        type = (ASN1ObjectIdentifier)seq.getObjectAt(0);
-        value = (ASN1Encodable)seq.getObjectAt(1);
-    }
-
-    public static AttributeTypeAndValue getInstance(Object o)
-    {
-        if (o instanceof AttributeTypeAndValue)
-        {
-            return (AttributeTypeAndValue)o;
-        }
-
-        if (o != null)
-        {
-            return new AttributeTypeAndValue(ASN1Sequence.getInstance(o));
-        }
-
-        return null;
-    }
-
-    public AttributeTypeAndValue(
-        String oid,
-        ASN1Encodable value)
-    {
-        this(new ASN1ObjectIdentifier(oid), value);
-    }
-
-    public AttributeTypeAndValue(
-        ASN1ObjectIdentifier type,
-        ASN1Encodable value)
-    {
-        this.type = type;
-        this.value = value;
-    }
-
-    public ASN1ObjectIdentifier getType()
-    {
-        return type;
-    }
-
-    public ASN1Encodable getValue()
-    {
-        return value;
-    }
-
-    /**
-     * <pre>
-     * AttributeTypeAndValue ::= SEQUENCE {
-     *           type         OBJECT IDENTIFIER,
-     *           value        ANY DEFINED BY type }
-     * </pre>
-     * @return a basic ASN.1 object representation.
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector v = new ASN1EncodableVector();
-
-        v.add(type);
-        v.add(value);
-
-        return new DERSequence(v);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/crmf/CRMFObjectIdentifiers.java b/bcprov/src/main/java/org/bouncycastle/asn1/crmf/CRMFObjectIdentifiers.java
deleted file mode 100644
index c298a7e..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/crmf/CRMFObjectIdentifiers.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package org.bouncycastle.asn1.crmf;
-
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-
-public interface CRMFObjectIdentifiers
-{
-    /** 1.3.6.1.5.5.7 */
-    static final ASN1ObjectIdentifier id_pkix = new ASN1ObjectIdentifier("1.3.6.1.5.5.7");
-
-    // arc for Internet X.509 PKI protocols and their components
-
-    /** 1.3.6.1.5.5.7.5 */
-    static final ASN1ObjectIdentifier id_pkip    = id_pkix.branch("5");
-
-    /** 1.3.6.1.5.5.7.1 */
-    static final ASN1ObjectIdentifier id_regCtrl = id_pkip.branch("1");
-    /** 1.3.6.1.5.5.7.1.1 */
-    static final ASN1ObjectIdentifier id_regCtrl_regToken           = id_regCtrl.branch("1");
-    /** 1.3.6.1.5.5.7.1.2 */
-    static final ASN1ObjectIdentifier id_regCtrl_authenticator      = id_regCtrl.branch("2");
-    /** 1.3.6.1.5.5.7.1.3 */
-    static final ASN1ObjectIdentifier id_regCtrl_pkiPublicationInfo = id_regCtrl.branch("3");
-    /** 1.3.6.1.5.5.7.1.4 */
-    static final ASN1ObjectIdentifier id_regCtrl_pkiArchiveOptions  = id_regCtrl.branch("4");
-
-    /** 1.2.840.113549.1.9.16.1,21 */
-    static final ASN1ObjectIdentifier id_ct_encKeyWithID = PKCSObjectIdentifiers.id_ct.branch("21");
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/crmf/CertId.java b/bcprov/src/main/java/org/bouncycastle/asn1/crmf/CertId.java
deleted file mode 100644
index bd54c11..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/crmf/CertId.java
+++ /dev/null
@@ -1,84 +0,0 @@
-package org.bouncycastle.asn1.crmf;
-
-import java.math.BigInteger;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.ASN1TaggedObject;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.x509.GeneralName;
-
-public class CertId
-    extends ASN1Object
-{
-    private GeneralName issuer;
-    private ASN1Integer serialNumber;
-
-    private CertId(ASN1Sequence seq)
-    {
-        issuer = GeneralName.getInstance(seq.getObjectAt(0));
-        serialNumber = ASN1Integer.getInstance(seq.getObjectAt(1));
-    }
-
-    public static CertId getInstance(Object o)
-    {
-        if (o instanceof CertId)
-        {
-            return (CertId)o;
-        }
-
-        if (o != null)
-        {
-            return new CertId(ASN1Sequence.getInstance(o));
-        }
-
-        return null;
-    }
-
-    public static CertId getInstance(ASN1TaggedObject obj, boolean isExplicit)
-    {
-        return getInstance(ASN1Sequence.getInstance(obj, isExplicit));
-    }
-
-    public CertId(GeneralName issuer, BigInteger serialNumber)
-    {
-        this(issuer, new ASN1Integer(serialNumber));
-    }
-
-    public CertId(GeneralName issuer, ASN1Integer serialNumber)
-    {
-        this.issuer = issuer;
-        this.serialNumber = serialNumber;
-    }
-
-    public GeneralName getIssuer()
-    {
-        return issuer;
-    }
-
-    public ASN1Integer getSerialNumber()
-    {
-        return serialNumber;
-    }
-
-    /**
-     * <pre>
-     * CertId ::= SEQUENCE {
-     *                 issuer           GeneralName,
-     *                 serialNumber     INTEGER }
-     * </pre>
-     * @return a basic ASN.1 object representation.
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector v = new ASN1EncodableVector();
-
-        v.add(issuer);
-        v.add(serialNumber);
-        
-        return new DERSequence(v);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/crmf/CertReqMessages.java b/bcprov/src/main/java/org/bouncycastle/asn1/crmf/CertReqMessages.java
deleted file mode 100644
index aa48a18..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/crmf/CertReqMessages.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package org.bouncycastle.asn1.crmf;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DERSequence;
-
-public class CertReqMessages
-    extends ASN1Object
-{
-    private ASN1Sequence content;
-
-    private CertReqMessages(ASN1Sequence seq)
-    {
-        content = seq;
-    }
-
-    public static CertReqMessages getInstance(Object o)
-    {
-        if (o instanceof CertReqMessages)
-        {
-            return (CertReqMessages)o;
-        }
-
-        if (o != null)
-        {
-            return new CertReqMessages(ASN1Sequence.getInstance(o));
-        }
-
-        return null;
-    }
-
-    public CertReqMessages(
-        CertReqMsg msg)
-    {
-        content = new DERSequence(msg);
-    }
-
-    public CertReqMessages(
-        CertReqMsg[] msgs)
-    {
-        ASN1EncodableVector v = new ASN1EncodableVector();
-        for (int i = 0; i < msgs.length; i++)
-        {
-            v.add(msgs[i]);
-        }
-        content = new DERSequence(v);
-    }
-
-    public CertReqMsg[] toCertReqMsgArray()
-    {
-        CertReqMsg[] result = new CertReqMsg[content.size()];
-
-        for (int i = 0; i != result.length; i++)
-        {
-            result[i] = CertReqMsg.getInstance(content.getObjectAt(i));
-        }
-
-        return result;
-    }
-
-    /**
-     * <pre>
-     * CertReqMessages ::= SEQUENCE SIZE (1..MAX) OF CertReqMsg
-     * </pre>
-     *
-     * @return a basic ASN.1 object representation.
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        return content;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/crmf/CertReqMsg.java b/bcprov/src/main/java/org/bouncycastle/asn1/crmf/CertReqMsg.java
deleted file mode 100644
index 3893663..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/crmf/CertReqMsg.java
+++ /dev/null
@@ -1,145 +0,0 @@
-package org.bouncycastle.asn1.crmf;
-
-import java.util.Enumeration;
-
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.ASN1TaggedObject;
-import org.bouncycastle.asn1.DERSequence;
-
-public class CertReqMsg
-    extends ASN1Object
-{
-    private CertRequest certReq;
-    private ProofOfPossession pop;
-    private ASN1Sequence regInfo;
-
-    private CertReqMsg(ASN1Sequence seq)
-    {
-        Enumeration en = seq.getObjects();
-
-        certReq = CertRequest.getInstance(en.nextElement());
-        while (en.hasMoreElements())
-        {
-            Object o = en.nextElement();
-
-            if (o instanceof ASN1TaggedObject || o instanceof ProofOfPossession)
-            {
-                pop = ProofOfPossession.getInstance(o);
-            }
-            else
-            {
-                regInfo = ASN1Sequence.getInstance(o);
-            }
-        }
-    }
-
-    public static CertReqMsg getInstance(Object o)
-    {
-        if (o instanceof CertReqMsg)
-        {
-            return (CertReqMsg)o;
-        }
-        else if (o != null)
-        {
-            return new CertReqMsg(ASN1Sequence.getInstance(o));
-        }
-
-        return null;
-    }
-
-    /**
-     * Creates a new CertReqMsg.
-     * @param certReq CertRequest
-     * @param pop may be null
-     * @param regInfo may be null
-     */
-    public CertReqMsg(
-        CertRequest certReq,
-        ProofOfPossession pop,
-        AttributeTypeAndValue[] regInfo)
-    {
-        if (certReq == null)
-        {
-            throw new IllegalArgumentException("'certReq' cannot be null");
-        }
-
-        this.certReq = certReq;
-        this.pop = pop;
-
-        if (regInfo != null)
-        {
-            this.regInfo = new DERSequence(regInfo);
-        }
-    }
-
-    public CertRequest getCertReq()
-    {
-        return certReq;
-    }
-
-
-    /**
-     * @deprecated use getPopo
-     */
-    public ProofOfPossession getPop()
-    {
-        return pop;
-    }
-
-
-    public ProofOfPossession getPopo()
-    {
-        return pop;
-    }
-
-    public AttributeTypeAndValue[] getRegInfo()
-    {
-        if (regInfo == null)
-        {
-            return null;
-        }
-
-        AttributeTypeAndValue[] results = new AttributeTypeAndValue[regInfo.size()];
-
-        for (int i = 0; i != results.length; i++)
-        {
-            results[i] = AttributeTypeAndValue.getInstance(regInfo.getObjectAt(i));
-        }
-
-        return results;
-    }
-
-    /**
-     * <pre>
-     * CertReqMsg ::= SEQUENCE {
-     *                    certReq   CertRequest,
-     *                    popo       ProofOfPossession  OPTIONAL,
-     *                    -- content depends upon key type
-     *                    regInfo   SEQUENCE SIZE(1..MAX) OF AttributeTypeAndValue OPTIONAL }
-     * </pre>
-     * @return a basic ASN.1 object representation.
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector v = new ASN1EncodableVector();
-
-        v.add(certReq);
-
-        addOptional(v, pop);
-        addOptional(v, regInfo);
-
-        return new DERSequence(v);
-    }
-
-    private void addOptional(ASN1EncodableVector v, ASN1Encodable obj)
-    {
-        if (obj != null)
-        {
-            v.add(obj);
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/crmf/CertRequest.java b/bcprov/src/main/java/org/bouncycastle/asn1/crmf/CertRequest.java
deleted file mode 100644
index 70afe8e..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/crmf/CertRequest.java
+++ /dev/null
@@ -1,97 +0,0 @@
-package org.bouncycastle.asn1.crmf;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DERSequence;
-
-public class CertRequest
-    extends ASN1Object
-{
-    private ASN1Integer certReqId;
-    private CertTemplate certTemplate;
-    private Controls controls;
-
-    private CertRequest(ASN1Sequence seq)
-    {
-        certReqId = new ASN1Integer(ASN1Integer.getInstance(seq.getObjectAt(0)).getValue());
-        certTemplate = CertTemplate.getInstance(seq.getObjectAt(1));
-        if (seq.size() > 2)
-        {
-            controls = Controls.getInstance(seq.getObjectAt(2));
-        }
-    }
-
-    public static CertRequest getInstance(Object o)
-    {
-        if (o instanceof CertRequest)
-        {
-            return (CertRequest)o;
-        }
-        else if (o != null)
-        {
-            return new CertRequest(ASN1Sequence.getInstance(o));
-        }
-
-        return null;
-    }
-
-    public CertRequest(
-        int certReqId,
-        CertTemplate certTemplate,
-        Controls controls)
-    {
-        this(new ASN1Integer(certReqId), certTemplate, controls);
-    }
-
-    public CertRequest(
-        ASN1Integer certReqId,
-        CertTemplate certTemplate,
-        Controls controls)
-    {
-        this.certReqId = certReqId;
-        this.certTemplate = certTemplate;
-        this.controls = controls;
-    }
-
-    public ASN1Integer getCertReqId()
-    {
-        return certReqId;
-    }
-
-    public CertTemplate getCertTemplate()
-    {
-        return certTemplate;
-    }
-
-    public Controls getControls()
-    {
-        return controls;
-    }
-
-    /**
-     * <pre>
-     * CertRequest ::= SEQUENCE {
-     *                      certReqId     INTEGER,          -- ID for matching request and reply
-     *                      certTemplate  CertTemplate,  -- Selected fields of cert to be issued
-     *                      controls      Controls OPTIONAL }   -- Attributes affecting issuance
-     * </pre>
-     * @return a basic ASN.1 object representation.
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector v = new ASN1EncodableVector();
-
-        v.add(certReqId);
-        v.add(certTemplate);
-
-        if (controls != null)
-        {
-            v.add(controls);
-        }
-
-        return new DERSequence(v);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/crmf/CertTemplate.java b/bcprov/src/main/java/org/bouncycastle/asn1/crmf/CertTemplate.java
deleted file mode 100644
index 73412e9..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/crmf/CertTemplate.java
+++ /dev/null
@@ -1,163 +0,0 @@
-package org.bouncycastle.asn1.crmf;
-
-import java.util.Enumeration;
-
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.ASN1TaggedObject;
-import org.bouncycastle.asn1.DERBitString;
-import org.bouncycastle.asn1.x500.X500Name;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.asn1.x509.Extensions;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-
-public class CertTemplate
-    extends ASN1Object
-{
-    private ASN1Sequence seq;
-
-    private ASN1Integer version;
-    private ASN1Integer serialNumber;
-    private AlgorithmIdentifier signingAlg;
-    private X500Name issuer;
-    private OptionalValidity validity;
-    private X500Name subject;
-    private SubjectPublicKeyInfo publicKey;
-    private DERBitString issuerUID;
-    private DERBitString subjectUID;
-    private Extensions extensions;
-
-    private CertTemplate(ASN1Sequence seq)
-    {
-        this.seq = seq;
-
-        Enumeration en = seq.getObjects();
-        while (en.hasMoreElements())
-        {
-            ASN1TaggedObject tObj = (ASN1TaggedObject)en.nextElement();
-
-            switch (tObj.getTagNo())
-            {
-            case 0:
-                version = ASN1Integer.getInstance(tObj, false);
-                break;
-            case 1:
-                serialNumber = ASN1Integer.getInstance(tObj, false);
-                break;
-            case 2:
-                signingAlg = AlgorithmIdentifier.getInstance(tObj, false);
-                break;
-            case 3:
-                issuer = X500Name.getInstance(tObj, true); // CHOICE
-                break;
-            case 4:
-                validity = OptionalValidity.getInstance(ASN1Sequence.getInstance(tObj, false));
-                break;
-            case 5:
-                subject = X500Name.getInstance(tObj, true); // CHOICE
-                break;
-            case 6:
-                publicKey = SubjectPublicKeyInfo.getInstance(tObj, false);
-                break;
-            case 7:
-                issuerUID = DERBitString.getInstance(tObj, false);
-                break;
-            case 8:
-                subjectUID = DERBitString.getInstance(tObj, false);
-                break;
-            case 9:
-                extensions = Extensions.getInstance(tObj, false);
-                break;
-            default:
-                throw new IllegalArgumentException("unknown tag: " + tObj.getTagNo());
-            }
-        }
-    }
-
-    public static CertTemplate getInstance(Object o)
-    {
-        if (o instanceof CertTemplate)
-        {
-            return (CertTemplate)o;
-        }
-        else if (o != null)
-        {
-            return new CertTemplate(ASN1Sequence.getInstance(o));
-        }
-
-        return null;
-    }
-
-    public int getVersion()
-    {
-        return version.getValue().intValue();
-    }
-
-    public ASN1Integer getSerialNumber()
-    {
-        return serialNumber;
-    }
-
-    public AlgorithmIdentifier getSigningAlg()
-    {
-        return signingAlg;
-    }
-
-    public X500Name getIssuer()
-    {
-        return issuer;
-    }
-
-    public OptionalValidity getValidity()
-    {
-        return validity;
-    }
-
-    public X500Name getSubject()
-    {
-        return subject;
-    }
-
-    public SubjectPublicKeyInfo getPublicKey()
-    {
-        return publicKey;
-    }
-
-    public DERBitString getIssuerUID()
-    {
-        return issuerUID;
-    }
-
-    public DERBitString getSubjectUID()
-    {
-        return subjectUID;
-    }
-
-    public Extensions getExtensions()
-    {
-        return extensions;
-    }
-
-    /**
-     * <pre>
-     *  CertTemplate ::= SEQUENCE {
-     *      version      [0] Version               OPTIONAL,
-     *      serialNumber [1] INTEGER               OPTIONAL,
-     *      signingAlg   [2] AlgorithmIdentifier   OPTIONAL,
-     *      issuer       [3] Name                  OPTIONAL,
-     *      validity     [4] OptionalValidity      OPTIONAL,
-     *      subject      [5] Name                  OPTIONAL,
-     *      publicKey    [6] SubjectPublicKeyInfo  OPTIONAL,
-     *      issuerUID    [7] UniqueIdentifier      OPTIONAL,
-     *      subjectUID   [8] UniqueIdentifier      OPTIONAL,
-     *      extensions   [9] Extensions            OPTIONAL }
-     * </pre>
-     * @return a basic ASN.1 object representation.
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        return seq;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/crmf/CertTemplateBuilder.java b/bcprov/src/main/java/org/bouncycastle/asn1/crmf/CertTemplateBuilder.java
deleted file mode 100644
index be5cbe6..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/crmf/CertTemplateBuilder.java
+++ /dev/null
@@ -1,152 +0,0 @@
-package org.bouncycastle.asn1.crmf;
-
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.DERBitString;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.DERTaggedObject;
-import org.bouncycastle.asn1.x500.X500Name;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.asn1.x509.Extensions;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.bouncycastle.asn1.x509.X509Extensions;
-
-public class CertTemplateBuilder
-{
-    private ASN1Integer version;
-    private ASN1Integer serialNumber;
-    private AlgorithmIdentifier signingAlg;
-    private X500Name issuer;
-    private OptionalValidity validity;
-    private X500Name subject;
-    private SubjectPublicKeyInfo publicKey;
-    private DERBitString issuerUID;
-    private DERBitString subjectUID;
-    private Extensions extensions;
-
-    /** Sets the X.509 version. Note: for X509v3, use 2 here. */
-    public CertTemplateBuilder setVersion(int ver)
-    {
-        version = new ASN1Integer(ver);
-
-        return this;
-    }
-
-    public CertTemplateBuilder setSerialNumber(ASN1Integer ser)
-    {
-        serialNumber = ser;
-
-        return this;
-    }
-
-    public CertTemplateBuilder setSigningAlg(AlgorithmIdentifier aid)
-    {
-        signingAlg = aid;
-
-        return this;
-    }
-
-    public CertTemplateBuilder setIssuer(X500Name name)
-    {
-        issuer = name;
-
-        return this;
-    }
-
-    public CertTemplateBuilder setValidity(OptionalValidity v)
-    {
-        validity = v;
-
-        return this;
-    }
-
-    public CertTemplateBuilder setSubject(X500Name name)
-    {
-        subject = name;
-
-        return this;
-    }
-
-    public CertTemplateBuilder setPublicKey(SubjectPublicKeyInfo spki)
-    {
-        publicKey = spki;
-
-        return this;
-    }
-
-    /** Sets the issuer unique ID (deprecated in X.509v3) */
-    public CertTemplateBuilder setIssuerUID(DERBitString uid)
-    {
-        issuerUID = uid;
-
-        return this;
-    }
-
-    /** Sets the subject unique ID (deprecated in X.509v3) */
-    public CertTemplateBuilder setSubjectUID(DERBitString uid)
-    {
-        subjectUID = uid;
-
-        return this;
-    }
-
-    /**
-     * @deprecated use method taking Extensions
-     * @param extens
-     * @return
-     */
-    public CertTemplateBuilder setExtensions(X509Extensions extens)
-    {
-        return setExtensions(Extensions.getInstance(extens));
-    }
-
-    public CertTemplateBuilder setExtensions(Extensions extens)
-    {
-        extensions = extens;
-
-        return this;
-    }
-
-    /**
-     * <pre>
-     *  CertTemplate ::= SEQUENCE {
-     *      version      [0] Version               OPTIONAL,
-     *      serialNumber [1] INTEGER               OPTIONAL,
-     *      signingAlg   [2] AlgorithmIdentifier   OPTIONAL,
-     *      issuer       [3] Name                  OPTIONAL,
-     *      validity     [4] OptionalValidity      OPTIONAL,
-     *      subject      [5] Name                  OPTIONAL,
-     *      publicKey    [6] SubjectPublicKeyInfo  OPTIONAL,
-     *      issuerUID    [7] UniqueIdentifier      OPTIONAL,
-     *      subjectUID   [8] UniqueIdentifier      OPTIONAL,
-     *      extensions   [9] Extensions            OPTIONAL }
-     * </pre>
-     * @return a basic ASN.1 object representation.
-     */
-    public CertTemplate build()
-    {
-        ASN1EncodableVector v = new ASN1EncodableVector();
-
-        addOptional(v, 0, false, version);
-        addOptional(v, 1, false, serialNumber);
-        addOptional(v, 2, false, signingAlg);
-        addOptional(v, 3, true, issuer); // CHOICE
-        addOptional(v, 4, false, validity);
-        addOptional(v, 5, true, subject); // CHOICE
-        addOptional(v, 6, false, publicKey);
-        addOptional(v, 7, false, issuerUID);
-        addOptional(v, 8, false, subjectUID);
-        addOptional(v, 9, false, extensions);
-
-        return CertTemplate.getInstance(new DERSequence(v));
-    }
-
-    private void addOptional(ASN1EncodableVector v, int tagNo, boolean isExplicit, ASN1Encodable obj)
-    {
-        if (obj != null)
-        {
-            v.add(new DERTaggedObject(isExplicit, tagNo, obj));
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/crmf/Controls.java b/bcprov/src/main/java/org/bouncycastle/asn1/crmf/Controls.java
deleted file mode 100644
index 2e188fe..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/crmf/Controls.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package org.bouncycastle.asn1.crmf;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DERSequence;
-
-public class Controls
-    extends ASN1Object
-{
-    private ASN1Sequence content;
-
-    private Controls(ASN1Sequence seq)
-    {
-        content = seq;
-    }
-
-    public static Controls getInstance(Object o)
-    {
-        if (o instanceof Controls)
-        {
-            return (Controls)o;
-        }
-
-        if (o != null)
-        {
-            return new Controls(ASN1Sequence.getInstance(o));
-        }
-
-        return null;
-    }
-
-    public Controls(AttributeTypeAndValue atv)
-    {
-        content = new DERSequence(atv);
-    }
-
-    public Controls(AttributeTypeAndValue[] atvs)
-    {
-        ASN1EncodableVector v = new ASN1EncodableVector();
-        for (int i = 0; i < atvs.length; i++)
-        {
-            v.add(atvs[i]);
-        }
-        content = new DERSequence(v);
-    }
-
-    public AttributeTypeAndValue[] toAttributeTypeAndValueArray()
-    {
-        AttributeTypeAndValue[] result = new AttributeTypeAndValue[content.size()];
-
-        for (int i = 0; i != result.length; i++)
-        {
-            result[i] = AttributeTypeAndValue.getInstance(content.getObjectAt(i));
-        }
-
-        return result;
-    }
-
-    /**
-     * <pre>
-     * Controls  ::= SEQUENCE SIZE(1..MAX) OF AttributeTypeAndValue
-     * </pre>
-     *
-     * @return a basic ASN.1 object representation.
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        return content;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/crmf/EncKeyWithID.java b/bcprov/src/main/java/org/bouncycastle/asn1/crmf/EncKeyWithID.java
deleted file mode 100644
index 478a918..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/crmf/EncKeyWithID.java
+++ /dev/null
@@ -1,117 +0,0 @@
-package org.bouncycastle.asn1.crmf;
-
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.DERUTF8String;
-import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
-import org.bouncycastle.asn1.x509.GeneralName;
-
-public class EncKeyWithID
-    extends ASN1Object
-{
-    private final PrivateKeyInfo privKeyInfo;
-    private final ASN1Encodable identifier;
-
-    public static EncKeyWithID getInstance(Object o)
-    {
-        if (o instanceof EncKeyWithID)
-        {
-            return (EncKeyWithID)o;
-        }
-        else if (o != null)
-        {
-            return new EncKeyWithID(ASN1Sequence.getInstance(o));
-        }
-
-        return null;
-    }
-
-    private EncKeyWithID(ASN1Sequence seq)
-    {
-        this.privKeyInfo = PrivateKeyInfo.getInstance(seq.getObjectAt(0));
-
-        if (seq.size() > 1)
-        {
-            if (!(seq.getObjectAt(1) instanceof DERUTF8String))
-            {
-                this.identifier = GeneralName.getInstance(seq.getObjectAt(1));
-            }
-            else
-            {
-                this.identifier = (ASN1Encodable)seq.getObjectAt(1);
-            }
-        }
-        else
-        {
-            this.identifier = null;
-        }
-    }
-
-    public EncKeyWithID(PrivateKeyInfo privKeyInfo)
-    {
-        this.privKeyInfo = privKeyInfo;
-        this.identifier = null;
-    }
-
-    public EncKeyWithID(PrivateKeyInfo privKeyInfo, DERUTF8String str)
-    {
-        this.privKeyInfo = privKeyInfo;
-        this.identifier = str;
-    }
-
-    public EncKeyWithID(PrivateKeyInfo privKeyInfo, GeneralName generalName)
-    {
-        this.privKeyInfo = privKeyInfo;
-        this.identifier = generalName;
-    }
-
-    public PrivateKeyInfo getPrivateKey()
-    {
-        return privKeyInfo;
-    }
-
-    public boolean hasIdentifier()
-    {
-        return identifier != null;
-    }
-
-    public boolean isIdentifierUTF8String()
-    {
-        return identifier instanceof DERUTF8String;
-    }
-
-    public ASN1Encodable getIdentifier()
-    {
-        return identifier;
-    }
-    
-    /**
-     * <pre>
-     * EncKeyWithID ::= SEQUENCE {
-     *      privateKey           PrivateKeyInfo,
-     *      identifier CHOICE {
-     *         string               UTF8String,
-     *         generalName          GeneralName
-     *     } OPTIONAL
-     * }
-     * </pre>
-     * @return
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector v = new ASN1EncodableVector();
-
-        v.add(privKeyInfo);
-
-        if (identifier != null)
-        {
-            v.add(identifier);
-        }
-
-        return new DERSequence(v);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/crmf/EncryptedKey.java b/bcprov/src/main/java/org/bouncycastle/asn1/crmf/EncryptedKey.java
deleted file mode 100644
index 10ae47b..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/crmf/EncryptedKey.java
+++ /dev/null
@@ -1,81 +0,0 @@
-package org.bouncycastle.asn1.crmf;
-
-import org.bouncycastle.asn1.ASN1Choice;
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1TaggedObject;
-import org.bouncycastle.asn1.DERTaggedObject;
-import org.bouncycastle.asn1.cms.EnvelopedData;
-
-public class EncryptedKey
-    extends ASN1Object
-    implements ASN1Choice
-{
-    private EnvelopedData envelopedData;
-    private EncryptedValue encryptedValue;
-
-    public static EncryptedKey getInstance(Object o)
-    {
-        if (o instanceof EncryptedKey)
-        {
-            return (EncryptedKey)o;
-        }
-        else if (o instanceof ASN1TaggedObject)
-        {
-            return new EncryptedKey(EnvelopedData.getInstance((ASN1TaggedObject)o, false));
-        }
-        else if (o instanceof EncryptedValue)
-        {
-            return new EncryptedKey((EncryptedValue)o);
-        }
-        else
-        {
-            return new EncryptedKey(EncryptedValue.getInstance(o));
-        }
-    }
-
-    public EncryptedKey(EnvelopedData envelopedData)
-    {
-        this.envelopedData = envelopedData;
-    }
-
-    public EncryptedKey(EncryptedValue encryptedValue)
-    {
-        this.encryptedValue = encryptedValue;
-    }
-
-    public boolean isEncryptedValue()
-    {
-        return encryptedValue != null;
-    }
-
-    public ASN1Encodable getValue()
-    {
-        if (encryptedValue != null)
-        {
-            return encryptedValue;
-        }
-
-        return envelopedData;
-    }
-
-    /**
-     * <pre>
-     *    EncryptedKey ::= CHOICE {
-     *        encryptedValue        EncryptedValue, -- deprecated
-     *        envelopedData     [0] EnvelopedData }
-     *        -- The encrypted private key MUST be placed in the envelopedData
-     *        -- encryptedContentInfo encryptedContent OCTET STRING.
-     * </pre>
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        if (encryptedValue != null)
-        {
-            return encryptedValue.toASN1Primitive();
-        }
-
-        return new DERTaggedObject(false, 0, envelopedData);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/crmf/EncryptedValue.java b/bcprov/src/main/java/org/bouncycastle/asn1/crmf/EncryptedValue.java
deleted file mode 100644
index 3aa5457..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/crmf/EncryptedValue.java
+++ /dev/null
@@ -1,164 +0,0 @@
-package org.bouncycastle.asn1.crmf;
-
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.ASN1TaggedObject;
-import org.bouncycastle.asn1.DERBitString;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.DERTaggedObject;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-
-public class EncryptedValue
-    extends ASN1Object
-{
-    private AlgorithmIdentifier intendedAlg;
-    private AlgorithmIdentifier symmAlg;
-    private DERBitString        encSymmKey;
-    private AlgorithmIdentifier keyAlg;
-    private ASN1OctetString     valueHint;
-    private DERBitString        encValue;
-
-    private EncryptedValue(ASN1Sequence seq)
-    {
-        int index = 0;
-        while (seq.getObjectAt(index) instanceof ASN1TaggedObject)
-        {
-            ASN1TaggedObject tObj = (ASN1TaggedObject)seq.getObjectAt(index);
-
-            switch (tObj.getTagNo())
-            {
-            case 0:
-                intendedAlg = AlgorithmIdentifier.getInstance(tObj, false);
-                break;
-            case 1:
-                symmAlg = AlgorithmIdentifier.getInstance(tObj, false);
-                break;
-            case 2:
-                encSymmKey = DERBitString.getInstance(tObj, false);
-                break;
-            case 3:
-                keyAlg = AlgorithmIdentifier.getInstance(tObj, false);
-                break;
-            case 4:
-                valueHint = ASN1OctetString.getInstance(tObj, false);
-                break;
-            }
-            index++;
-        }
-
-        encValue = DERBitString.getInstance(seq.getObjectAt(index));
-    }
-
-    public static EncryptedValue getInstance(Object o)
-    {
-        if (o instanceof EncryptedValue)
-        {
-            return (EncryptedValue)o;
-        }
-        else if (o != null)
-        {
-            return new EncryptedValue(ASN1Sequence.getInstance(o));
-        }
-
-        return null;
-    }
-
-    public EncryptedValue(
-        AlgorithmIdentifier intendedAlg,
-        AlgorithmIdentifier symmAlg,
-        DERBitString encSymmKey,
-        AlgorithmIdentifier keyAlg,
-        ASN1OctetString valueHint,
-        DERBitString encValue)
-    {
-        if (encValue == null)
-        {
-            throw new IllegalArgumentException("'encValue' cannot be null");
-        }
-
-        this.intendedAlg = intendedAlg;
-        this.symmAlg = symmAlg;
-        this.encSymmKey = encSymmKey;
-        this.keyAlg = keyAlg;
-        this.valueHint = valueHint;
-        this.encValue = encValue;
-    }
-
-    public AlgorithmIdentifier getIntendedAlg()
-    {
-        return intendedAlg;
-    }
-
-    public AlgorithmIdentifier getSymmAlg()
-    {
-        return symmAlg;
-    }
-
-    public DERBitString getEncSymmKey()
-    {
-        return encSymmKey;
-    }
-
-    public AlgorithmIdentifier getKeyAlg()
-    {
-        return keyAlg;
-    }
-
-    public ASN1OctetString getValueHint()
-    {
-        return valueHint;
-    }
-
-    public DERBitString getEncValue()
-    {
-        return encValue;
-    }
-
-    /**
-     * <pre>
-     * EncryptedValue ::= SEQUENCE {
-     *                     intendedAlg   [0] AlgorithmIdentifier  OPTIONAL,
-     *                     -- the intended algorithm for which the value will be used
-     *                     symmAlg       [1] AlgorithmIdentifier  OPTIONAL,
-     *                     -- the symmetric algorithm used to encrypt the value
-     *                     encSymmKey    [2] BIT STRING           OPTIONAL,
-     *                     -- the (encrypted) symmetric key used to encrypt the value
-     *                     keyAlg        [3] AlgorithmIdentifier  OPTIONAL,
-     *                     -- algorithm used to encrypt the symmetric key
-     *                     valueHint     [4] OCTET STRING         OPTIONAL,
-     *                     -- a brief description or identifier of the encValue content
-     *                     -- (may be meaningful only to the sending entity, and used only
-     *                     -- if EncryptedValue might be re-examined by the sending entity
-     *                     -- in the future)
-     *                     encValue       BIT STRING }
-     *                     -- the encrypted value itself
-     * </pre>
-     * @return a basic ASN.1 object representation.
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector v = new ASN1EncodableVector();
-
-        addOptional(v, 0, intendedAlg);
-        addOptional(v, 1, symmAlg);
-        addOptional(v, 2, encSymmKey);
-        addOptional(v, 3, keyAlg);
-        addOptional(v, 4, valueHint);
-
-        v.add(encValue);
-
-        return new DERSequence(v);
-    }
-
-    private void addOptional(ASN1EncodableVector v, int tagNo, ASN1Encodable obj)
-    {
-        if (obj != null)
-        {
-            v.add(new DERTaggedObject(false, tagNo, obj));
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/crmf/OptionalValidity.java b/bcprov/src/main/java/org/bouncycastle/asn1/crmf/OptionalValidity.java
deleted file mode 100644
index 9174b5f..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/crmf/OptionalValidity.java
+++ /dev/null
@@ -1,98 +0,0 @@
-package org.bouncycastle.asn1.crmf;
-
-import java.util.Enumeration;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.ASN1TaggedObject;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.DERTaggedObject;
-import org.bouncycastle.asn1.x509.Time;
-
-public class OptionalValidity
-    extends ASN1Object
-{
-    private Time notBefore;
-    private Time notAfter;
-
-    private OptionalValidity(ASN1Sequence seq)
-    {
-        Enumeration en = seq.getObjects();
-        while (en.hasMoreElements())
-        {
-            ASN1TaggedObject tObj = (ASN1TaggedObject)en.nextElement();
-
-            if (tObj.getTagNo() == 0)
-            {
-                notBefore = Time.getInstance(tObj, true);
-            }
-            else
-            {
-                notAfter = Time.getInstance(tObj, true);
-            }
-        }
-    }
-
-    public static OptionalValidity getInstance(Object o)
-    {
-        if (o instanceof OptionalValidity)
-        {
-            return (OptionalValidity)o;
-        }
-
-        if (o != null)
-        {
-            return new OptionalValidity(ASN1Sequence.getInstance(o));
-        }
-
-        return null;
-    }
-
-    public OptionalValidity(Time notBefore, Time notAfter)
-    {
-        if (notBefore == null && notAfter == null)
-        {
-            throw new IllegalArgumentException("at least one of notBefore/notAfter must not be null.");
-        }
-
-        this.notBefore = notBefore;
-        this.notAfter = notAfter;
-    }
-
-    public Time getNotBefore()
-    {
-        return notBefore;
-    }
-
-    public Time getNotAfter()
-    {
-        return notAfter;
-    }
-
-    /**
-     * <pre>
-     * OptionalValidity ::= SEQUENCE {
-     *                        notBefore  [0] Time OPTIONAL,
-     *                        notAfter   [1] Time OPTIONAL } --at least one MUST be present
-     * </pre>
-     * @return a basic ASN.1 object representation.
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector v = new ASN1EncodableVector();
-
-        if (notBefore != null)
-        {
-            v.add(new DERTaggedObject(true, 0, notBefore));
-        }
-
-        if (notAfter != null)
-        {
-            v.add(new DERTaggedObject(true, 1, notAfter));
-        }
-
-        return new DERSequence(v);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/crmf/PKIArchiveOptions.java b/bcprov/src/main/java/org/bouncycastle/asn1/crmf/PKIArchiveOptions.java
deleted file mode 100644
index 46e0e44..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/crmf/PKIArchiveOptions.java
+++ /dev/null
@@ -1,116 +0,0 @@
-package org.bouncycastle.asn1.crmf;
-
-import org.bouncycastle.asn1.ASN1Boolean;
-import org.bouncycastle.asn1.ASN1Choice;
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1TaggedObject;
-import org.bouncycastle.asn1.DERTaggedObject;
-
-public class PKIArchiveOptions
-    extends ASN1Object
-    implements ASN1Choice
-{
-    public static final int encryptedPrivKey = 0;
-    public static final int keyGenParameters = 1;
-    public static final int archiveRemGenPrivKey = 2;
-
-    private ASN1Encodable value;
-
-    public static PKIArchiveOptions getInstance(Object o)
-    {
-        if (o == null || o instanceof PKIArchiveOptions)
-        {
-            return (PKIArchiveOptions)o;
-        }
-        else if (o instanceof ASN1TaggedObject)
-        {
-            return new PKIArchiveOptions((ASN1TaggedObject)o);
-        }
-
-        throw new IllegalArgumentException("unknown object: " + o);
-    }
-
-    private PKIArchiveOptions(ASN1TaggedObject tagged)
-    {
-        switch (tagged.getTagNo())
-        {
-        case encryptedPrivKey:
-            value = EncryptedKey.getInstance(tagged.getObject());
-            break;
-        case keyGenParameters:
-            value = ASN1OctetString.getInstance(tagged, false);
-            break;
-        case archiveRemGenPrivKey:
-            value = ASN1Boolean.getInstance(tagged, false);
-            break;
-        default:
-            throw new IllegalArgumentException("unknown tag number: " + tagged.getTagNo());
-        }
-    }
-
-    public PKIArchiveOptions(EncryptedKey encKey)
-    {
-        this.value = encKey;
-    }
-
-    public PKIArchiveOptions(ASN1OctetString keyGenParameters)
-    {
-        this.value = keyGenParameters;
-    }
-
-    public PKIArchiveOptions(boolean archiveRemGenPrivKey)
-    {
-        this.value = ASN1Boolean.getInstance(archiveRemGenPrivKey);
-    }
-
-    public int getType()
-    {
-        if (value instanceof EncryptedKey)
-        {
-            return encryptedPrivKey;
-        }
-
-        if (value instanceof ASN1OctetString)
-        {
-            return keyGenParameters;
-        }
-
-        return archiveRemGenPrivKey;
-    }
-
-    public ASN1Encodable getValue()
-    {
-        return value;
-    }
-    
-    /**
-     * <pre>
-     *  PKIArchiveOptions ::= CHOICE {
-     *      encryptedPrivKey     [0] EncryptedKey,
-     *      -- the actual value of the private key
-     *      keyGenParameters     [1] KeyGenParameters,
-     *      -- parameters which allow the private key to be re-generated
-     *      archiveRemGenPrivKey [2] BOOLEAN }
-     *      -- set to TRUE if sender wishes receiver to archive the private
-     *      -- key of a key pair that the receiver generates in response to
-     *      -- this request; set to FALSE if no archival is desired.
-     * </pre>
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        if (value instanceof EncryptedKey)
-        {
-            return new DERTaggedObject(true, encryptedPrivKey, value);  // choice
-        }
-
-        if (value instanceof ASN1OctetString)
-        {
-            return new DERTaggedObject(false, keyGenParameters, value);
-        }
-
-        return new DERTaggedObject(false, archiveRemGenPrivKey, value);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/crmf/PKIPublicationInfo.java b/bcprov/src/main/java/org/bouncycastle/asn1/crmf/PKIPublicationInfo.java
deleted file mode 100644
index dba0422..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/crmf/PKIPublicationInfo.java
+++ /dev/null
@@ -1,81 +0,0 @@
-package org.bouncycastle.asn1.crmf;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DERSequence;
-
-public class PKIPublicationInfo
-    extends ASN1Object
-{
-    private ASN1Integer action;
-    private ASN1Sequence pubInfos;
-
-    private PKIPublicationInfo(ASN1Sequence seq)
-    {
-        action = ASN1Integer.getInstance(seq.getObjectAt(0));
-        pubInfos = ASN1Sequence.getInstance(seq.getObjectAt(1));
-    }
-
-    public static PKIPublicationInfo getInstance(Object o)
-    {
-        if (o instanceof PKIPublicationInfo)
-        {
-            return (PKIPublicationInfo)o;
-        }
-
-        if (o != null)
-        {
-            return new PKIPublicationInfo(ASN1Sequence.getInstance(o));
-        }
-
-        return null;
-    }
-
-    public ASN1Integer getAction()
-    {
-        return action;
-    }
-
-    public SinglePubInfo[] getPubInfos()
-    {
-        if (pubInfos == null)
-        {
-            return null;
-        }
-
-        SinglePubInfo[] results = new SinglePubInfo[pubInfos.size()];
-
-        for (int i = 0; i != results.length; i++)
-        {
-            results[i] = SinglePubInfo.getInstance(pubInfos.getObjectAt(i));
-        }
-
-        return results;
-    }
-
-    /**
-     * <pre>
-     * PKIPublicationInfo ::= SEQUENCE {
-     *                  action     INTEGER {
-     *                                 dontPublish (0),
-     *                                 pleasePublish (1) },
-     *                  pubInfos  SEQUENCE SIZE (1..MAX) OF SinglePubInfo OPTIONAL }
-     * -- pubInfos MUST NOT be present if action is "dontPublish"
-     * -- (if action is "pleasePublish" and pubInfos is omitted,
-     * -- "dontCare" is assumed)
-     * </pre>
-     * @return a basic ASN.1 object representation.
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector v = new ASN1EncodableVector();
-
-        v.add(action);
-        v.add(pubInfos);
-
-        return new DERSequence(v);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/crmf/PKMACValue.java b/bcprov/src/main/java/org/bouncycastle/asn1/crmf/PKMACValue.java
deleted file mode 100644
index ebbf2dc..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/crmf/PKMACValue.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package org.bouncycastle.asn1.crmf;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.ASN1TaggedObject;
-import org.bouncycastle.asn1.DERBitString;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.cmp.CMPObjectIdentifiers;
-import org.bouncycastle.asn1.cmp.PBMParameter;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-
-/**
- * Password-based MAC value for use with POPOSigningKeyInput.
- */
-public class PKMACValue
-    extends ASN1Object
-{
-    private AlgorithmIdentifier  algId;
-    private DERBitString        value;
-
-    private PKMACValue(ASN1Sequence seq)
-    {
-        algId = AlgorithmIdentifier.getInstance(seq.getObjectAt(0));
-        value = DERBitString.getInstance(seq.getObjectAt(1));
-    }
-
-    public static PKMACValue getInstance(Object o)
-    {
-        if (o instanceof PKMACValue)
-        {
-            return (PKMACValue)o;
-        }
-
-        if (o != null)
-        {
-            return new PKMACValue(ASN1Sequence.getInstance(o));
-        }
-
-        return null;
-    }
-
-    public static PKMACValue getInstance(ASN1TaggedObject obj, boolean isExplicit)
-    {
-        return getInstance(ASN1Sequence.getInstance(obj, isExplicit));
-    }
-
-    /**
-     * Creates a new PKMACValue.
-     * @param params parameters for password-based MAC
-     * @param value MAC of the DER-encoded SubjectPublicKeyInfo
-     */
-    public PKMACValue(
-        PBMParameter params,
-        DERBitString value)
-    {
-        this(new AlgorithmIdentifier(
-                    CMPObjectIdentifiers.passwordBasedMac, params), value);
-    }
-
-    /**
-     * Creates a new PKMACValue.
-     * @param aid CMPObjectIdentifiers.passwordBasedMAC, with PBMParameter
-     * @param value MAC of the DER-encoded SubjectPublicKeyInfo
-     */
-    public PKMACValue(
-        AlgorithmIdentifier aid,
-        DERBitString value)
-    {
-        this.algId = aid;
-        this.value = value;
-    }
-
-    public AlgorithmIdentifier getAlgId()
-    {
-        return algId;
-    }
-
-    public DERBitString getValue()
-    {
-        return value;
-    }
-
-    /**
-     * <pre>
-     * PKMACValue ::= SEQUENCE {
-     *      algId  AlgorithmIdentifier,
-     *      -- algorithm value shall be PasswordBasedMac 1.2.840.113533.7.66.13
-     *      -- parameter value is PBMParameter
-     *      value  BIT STRING }
-     * </pre>
-     * @return a basic ASN.1 object representation.
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector v = new ASN1EncodableVector();
-
-        v.add(algId);
-        v.add(value);
-
-        return new DERSequence(v);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/crmf/POPOPrivKey.java b/bcprov/src/main/java/org/bouncycastle/asn1/crmf/POPOPrivKey.java
deleted file mode 100644
index 8c9db8a..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/crmf/POPOPrivKey.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package org.bouncycastle.asn1.crmf;
-
-import org.bouncycastle.asn1.ASN1Choice;
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1TaggedObject;
-import org.bouncycastle.asn1.DERBitString;
-import org.bouncycastle.asn1.DERTaggedObject;
-import org.bouncycastle.asn1.cms.EnvelopedData;
-
-public class POPOPrivKey
-    extends ASN1Object
-    implements ASN1Choice
-{
-    public static final int thisMessage = 0;
-    public static final int subsequentMessage = 1;
-    public static final int dhMAC = 2;
-    public static final int agreeMAC = 3;
-    public static final int encryptedKey = 4;
-
-    private int tagNo;
-    private ASN1Encodable obj;
-
-    private POPOPrivKey(ASN1TaggedObject obj)
-    {
-        this.tagNo = obj.getTagNo();
-
-        switch (tagNo)
-        {
-        case thisMessage:
-            this.obj = DERBitString.getInstance(obj, false);
-            break;
-        case subsequentMessage:
-            this.obj = SubsequentMessage.valueOf(ASN1Integer.getInstance(obj, false).getValue().intValue());
-            break;
-        case dhMAC:
-            this.obj = DERBitString.getInstance(obj, false);
-            break;
-        case agreeMAC:
-            this.obj = PKMACValue.getInstance(obj, false);
-            break;
-        case encryptedKey:
-            this.obj = EnvelopedData.getInstance(obj, false);
-            break;
-        default:
-            throw new IllegalArgumentException("unknown tag in POPOPrivKey");
-        }
-    }
-
-    public static POPOPrivKey getInstance(Object obj)
-    {
-        if (obj instanceof POPOPrivKey)
-        {
-            return (POPOPrivKey)obj;
-        }
-        if (obj != null)
-        {
-            return new POPOPrivKey(ASN1TaggedObject.getInstance(obj));
-        }
-
-        return null;
-    }
-
-    public static POPOPrivKey getInstance(ASN1TaggedObject obj, boolean explicit)
-    {
-        return getInstance(ASN1TaggedObject.getInstance(obj, explicit));
-    }
-
-    public POPOPrivKey(SubsequentMessage msg)
-    {
-        this.tagNo = subsequentMessage;
-        this.obj = msg;
-    }
-
-    public int getType()
-    {
-        return tagNo;
-    }
-
-    public ASN1Encodable getValue()
-    {
-        return obj;
-    }
-
-    /**
-     * <pre>
-     * POPOPrivKey ::= CHOICE {
-     *        thisMessage       [0] BIT STRING,         -- Deprecated
-     *         -- possession is proven in this message (which contains the private
-     *         -- key itself (encrypted for the CA))
-     *        subsequentMessage [1] SubsequentMessage,
-     *         -- possession will be proven in a subsequent message
-     *        dhMAC             [2] BIT STRING,         -- Deprecated
-     *        agreeMAC          [3] PKMACValue,
-     *        encryptedKey      [4] EnvelopedData }
-     * </pre>
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        return new DERTaggedObject(false, tagNo, obj);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/crmf/POPOSigningKey.java b/bcprov/src/main/java/org/bouncycastle/asn1/crmf/POPOSigningKey.java
deleted file mode 100644
index 43dd05b..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/crmf/POPOSigningKey.java
+++ /dev/null
@@ -1,127 +0,0 @@
-package org.bouncycastle.asn1.crmf;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.ASN1TaggedObject;
-import org.bouncycastle.asn1.DERBitString;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.DERTaggedObject;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-
-public class POPOSigningKey
-    extends ASN1Object
-{
-    private POPOSigningKeyInput poposkInput;
-    private AlgorithmIdentifier algorithmIdentifier;
-    private DERBitString signature;
-
-    private POPOSigningKey(ASN1Sequence seq)
-    {
-        int index = 0;
-
-        if (seq.getObjectAt(index) instanceof ASN1TaggedObject)
-        {
-            ASN1TaggedObject tagObj
-                = (ASN1TaggedObject)seq.getObjectAt(index++);
-            if (tagObj.getTagNo() != 0)
-            {
-                throw new IllegalArgumentException(
-                    "Unknown POPOSigningKeyInput tag: " + tagObj.getTagNo());
-            }
-            poposkInput = POPOSigningKeyInput.getInstance(tagObj.getObject());
-        }
-        algorithmIdentifier = AlgorithmIdentifier.getInstance(seq.getObjectAt(index++));
-        signature = DERBitString.getInstance(seq.getObjectAt(index));
-    }
-
-    public static POPOSigningKey getInstance(Object o)
-    {
-        if (o instanceof POPOSigningKey)
-        {
-            return (POPOSigningKey)o;
-        }
-
-        if (o != null)
-        {
-            return new POPOSigningKey(ASN1Sequence.getInstance(o));
-        }
-
-        return null;
-    }
-
-    public static POPOSigningKey getInstance(ASN1TaggedObject obj, boolean explicit)
-    {
-        return getInstance(ASN1Sequence.getInstance(obj, explicit));
-    }
-
-    /**
-     * Creates a new Proof of Possession object for a signing key.
-     *
-     * @param poposkIn  the POPOSigningKeyInput structure, or null if the
-     *                  CertTemplate includes both subject and publicKey values.
-     * @param aid       the AlgorithmIdentifier used to sign the proof of possession.
-     * @param signature a signature over the DER-encoded value of poposkIn,
-     *                  or the DER-encoded value of certReq if poposkIn is null.
-     */
-    public POPOSigningKey(
-        POPOSigningKeyInput poposkIn,
-        AlgorithmIdentifier aid,
-        DERBitString signature)
-    {
-        this.poposkInput = poposkIn;
-        this.algorithmIdentifier = aid;
-        this.signature = signature;
-    }
-
-    public POPOSigningKeyInput getPoposkInput()
-    {
-        return poposkInput;
-    }
-
-    public AlgorithmIdentifier getAlgorithmIdentifier()
-    {
-        return algorithmIdentifier;
-    }
-
-    public DERBitString getSignature()
-    {
-        return signature;
-    }
-
-    /**
-     * <pre>
-     * POPOSigningKey ::= SEQUENCE {
-     *                      poposkInput           [0] POPOSigningKeyInput OPTIONAL,
-     *                      algorithmIdentifier   AlgorithmIdentifier,
-     *                      signature             BIT STRING }
-     *  -- The signature (using "algorithmIdentifier") is on the
-     *  -- DER-encoded value of poposkInput.  NOTE: If the CertReqMsg
-     *  -- certReq CertTemplate contains the subject and publicKey values,
-     *  -- then poposkInput MUST be omitted and the signature MUST be
-     *  -- computed on the DER-encoded value of CertReqMsg certReq.  If
-     *  -- the CertReqMsg certReq CertTemplate does not contain the public
-     *  -- key and subject values, then poposkInput MUST be present and
-     *  -- MUST be signed.  This strategy ensures that the public key is
-     *  -- not present in both the poposkInput and CertReqMsg certReq
-     *  -- CertTemplate fields.
-     * </pre>
-     *
-     * @return a basic ASN.1 object representation.
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector v = new ASN1EncodableVector();
-
-        if (poposkInput != null)
-        {
-            v.add(new DERTaggedObject(false, 0, poposkInput));
-        }
-
-        v.add(algorithmIdentifier);
-        v.add(signature);
-
-        return new DERSequence(v);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/crmf/POPOSigningKeyInput.java b/bcprov/src/main/java/org/bouncycastle/asn1/crmf/POPOSigningKeyInput.java
deleted file mode 100644
index 54d828e..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/crmf/POPOSigningKeyInput.java
+++ /dev/null
@@ -1,134 +0,0 @@
-package org.bouncycastle.asn1.crmf;
-
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.ASN1TaggedObject;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.DERTaggedObject;
-import org.bouncycastle.asn1.x509.GeneralName;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-
-public class POPOSigningKeyInput
-    extends ASN1Object
-{
-    private GeneralName sender;
-    private PKMACValue publicKeyMAC;
-    private SubjectPublicKeyInfo publicKey;
-
-    private POPOSigningKeyInput(ASN1Sequence seq)
-    {
-        ASN1Encodable authInfo = (ASN1Encodable)seq.getObjectAt(0);
-
-        if (authInfo instanceof ASN1TaggedObject)
-        {
-            ASN1TaggedObject tagObj = (ASN1TaggedObject)authInfo;
-            if (tagObj.getTagNo() != 0)
-            {
-                throw new IllegalArgumentException(
-                    "Unknown authInfo tag: " + tagObj.getTagNo());
-            }
-            sender = GeneralName.getInstance(tagObj.getObject());
-        }
-        else
-        {
-            publicKeyMAC = PKMACValue.getInstance(authInfo);
-        }
-
-        publicKey = SubjectPublicKeyInfo.getInstance(seq.getObjectAt(1));
-    }
-
-    public static POPOSigningKeyInput getInstance(Object o)
-    {
-        if (o instanceof POPOSigningKeyInput)
-        {
-            return (POPOSigningKeyInput)o;
-        }
-
-        if (o != null)
-        {
-            return new POPOSigningKeyInput(ASN1Sequence.getInstance(o));
-        }
-
-        return null;
-    }
-
-    /**
-     *  Creates a new POPOSigningKeyInput with sender name as authInfo.
-     */
-    public POPOSigningKeyInput(
-        GeneralName sender,
-        SubjectPublicKeyInfo spki)
-    {
-        this.sender = sender;
-        this.publicKey = spki;
-    }
-
-    /**
-     * Creates a new POPOSigningKeyInput using password-based MAC.
-     */
-    public POPOSigningKeyInput(
-        PKMACValue pkmac,
-        SubjectPublicKeyInfo spki)
-    {
-        this.publicKeyMAC = pkmac;
-        this.publicKey = spki;
-    }
-
-    /**
-     * Returns the sender field, or null if authInfo is publicKeyMAC
-     */
-    public GeneralName getSender()
-    {
-        return sender;
-    }
-
-    /**
-     * Returns the publicKeyMAC field, or null if authInfo is sender
-     */
-    public PKMACValue getPublicKeyMAC()
-    {
-        return publicKeyMAC;
-    }
-
-    public SubjectPublicKeyInfo getPublicKey()
-    {
-        return publicKey;
-    }
-
-    /**
-     * <pre>
-     * POPOSigningKeyInput ::= SEQUENCE {
-     *        authInfo             CHOICE {
-     *                                 sender              [0] GeneralName,
-     *                                 -- used only if an authenticated identity has been
-     *                                 -- established for the sender (e.g., a DN from a
-     *                                 -- previously-issued and currently-valid certificate
-     *                                 publicKeyMAC        PKMACValue },
-     *                                 -- used if no authenticated GeneralName currently exists for
-     *                                 -- the sender; publicKeyMAC contains a password-based MAC
-     *                                 -- on the DER-encoded value of publicKey
-     *        publicKey           SubjectPublicKeyInfo }  -- from CertTemplate
-     * </pre>
-     * @return a basic ASN.1 object representation.
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector v = new ASN1EncodableVector();
-
-        if (sender != null)
-        {
-            v.add(new DERTaggedObject(false, 0, sender));
-        }
-        else
-        {
-            v.add(publicKeyMAC);
-        }
-
-        v.add(publicKey);
-
-        return new DERSequence(v);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/crmf/ProofOfPossession.java b/bcprov/src/main/java/org/bouncycastle/asn1/crmf/ProofOfPossession.java
deleted file mode 100644
index 8ff2342..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/crmf/ProofOfPossession.java
+++ /dev/null
@@ -1,108 +0,0 @@
-package org.bouncycastle.asn1.crmf;
-
-import org.bouncycastle.asn1.ASN1Choice;
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1TaggedObject;
-import org.bouncycastle.asn1.DERNull;
-import org.bouncycastle.asn1.DERTaggedObject;
-
-public class ProofOfPossession
-    extends ASN1Object
-    implements ASN1Choice
-{
-    public static final int TYPE_RA_VERIFIED = 0;
-    public static final int TYPE_SIGNING_KEY = 1;
-    public static final int TYPE_KEY_ENCIPHERMENT = 2;
-    public static final int TYPE_KEY_AGREEMENT = 3;
-
-    private int tagNo;
-    private ASN1Encodable obj;
-
-    private ProofOfPossession(ASN1TaggedObject tagged)
-    {
-        tagNo = tagged.getTagNo();
-        switch (tagNo)
-        {
-        case 0:
-            obj = DERNull.INSTANCE;
-            break;
-        case 1:
-            obj = POPOSigningKey.getInstance(tagged, false);
-            break;
-        case 2:
-        case 3:
-            obj = POPOPrivKey.getInstance(tagged, true);
-            break;
-        default:
-            throw new IllegalArgumentException("unknown tag: " + tagNo);
-        }
-    }
-
-    public static ProofOfPossession getInstance(Object o)
-    {
-        if (o == null || o instanceof ProofOfPossession)
-        {
-            return (ProofOfPossession)o;
-        }
-
-        if (o instanceof ASN1TaggedObject)
-        {
-            return new ProofOfPossession((ASN1TaggedObject)o);
-        }
-
-        throw new IllegalArgumentException("Invalid object: " + o.getClass().getName());
-    }
-
-    /** Creates a ProofOfPossession with type raVerified. */
-    public ProofOfPossession()
-    {
-        tagNo = TYPE_RA_VERIFIED;
-        obj = DERNull.INSTANCE;
-    }
-
-    /** Creates a ProofOfPossession for a signing key. */
-    public ProofOfPossession(POPOSigningKey poposk)
-    {
-        tagNo = TYPE_SIGNING_KEY;
-        obj = poposk;
-    }
-
-    /**
-     * Creates a ProofOfPossession for key encipherment or agreement.
-     * @param type one of TYPE_KEY_ENCIPHERMENT or TYPE_KEY_AGREEMENT
-     */
-    public ProofOfPossession(int type, POPOPrivKey privkey)
-    {
-        tagNo = type;
-        obj = privkey;
-    }
-
-    public int getType()
-    {
-        return tagNo;
-    }
-
-    public ASN1Encodable getObject()
-    {
-        return obj;
-    }
-
-    /**
-     * <pre>
-     * ProofOfPossession ::= CHOICE {
-     *                           raVerified        [0] NULL,
-     *                           -- used if the RA has already verified that the requester is in
-     *                           -- possession of the private key
-     *                           signature         [1] POPOSigningKey,
-     *                           keyEncipherment   [2] POPOPrivKey,
-     *                           keyAgreement      [3] POPOPrivKey }
-     * </pre>
-     * @return a basic ASN.1 object representation.
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        return new DERTaggedObject(false, tagNo, obj);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/crmf/SinglePubInfo.java b/bcprov/src/main/java/org/bouncycastle/asn1/crmf/SinglePubInfo.java
deleted file mode 100644
index 0237b3a..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/crmf/SinglePubInfo.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package org.bouncycastle.asn1.crmf;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.x509.GeneralName;
-
-public class SinglePubInfo
-    extends ASN1Object
-{
-    private ASN1Integer pubMethod;
-    private GeneralName pubLocation;
-
-    private SinglePubInfo(ASN1Sequence seq)
-    {
-        pubMethod = ASN1Integer.getInstance(seq.getObjectAt(0));
-
-        if (seq.size() == 2)
-        {
-            pubLocation = GeneralName.getInstance(seq.getObjectAt(1));
-        }
-    }
-
-    public static SinglePubInfo getInstance(Object o)
-    {
-        if (o instanceof SinglePubInfo)
-        {
-            return (SinglePubInfo)o;
-        }
-
-        if (o != null)
-        {
-            return new SinglePubInfo(ASN1Sequence.getInstance(o));
-        }
-
-        return null;
-    }
-
-    public GeneralName getPubLocation()
-    {
-        return pubLocation;
-    }
-
-    /**
-     * <pre>
-     * SinglePubInfo ::= SEQUENCE {
-     *        pubMethod    INTEGER {
-     *           dontCare    (0),
-     *           x500        (1),
-     *           web         (2),
-     *           ldap        (3) },
-     *       pubLocation  GeneralName OPTIONAL }
-     * </pre>
-     * @return a basic ASN.1 object representation.
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector v = new ASN1EncodableVector();
-
-        v.add(pubMethod);
-
-        if (pubLocation != null)
-        {
-            v.add(pubLocation);
-        }
-
-        return new DERSequence(v);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/crmf/SubsequentMessage.java b/bcprov/src/main/java/org/bouncycastle/asn1/crmf/SubsequentMessage.java
deleted file mode 100644
index 4691722..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/crmf/SubsequentMessage.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package org.bouncycastle.asn1.crmf;
-
-import org.bouncycastle.asn1.ASN1Integer;
-
-public class SubsequentMessage
-    extends ASN1Integer
-{
-    public static final SubsequentMessage encrCert = new SubsequentMessage(0);
-    public static final SubsequentMessage challengeResp = new SubsequentMessage(1);
-    
-    private SubsequentMessage(int value)
-    {
-        super(value);
-    }
-
-    public static SubsequentMessage valueOf(int value)
-    {
-        if (value == 0)
-        {
-            return encrCert;
-        }
-        if (value == 1)
-        {
-            return challengeResp;
-        }
-
-        throw new IllegalArgumentException("unknown value: " + value);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/crmf/package.html b/bcprov/src/main/java/org/bouncycastle/asn1/crmf/package.html
deleted file mode 100644
index c804924..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/crmf/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body bgcolor="#ffffff">
-Support classes useful for encoding and supporting PKIX-CRMF as described RFC 4211.
-</body>
-</html>
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/cryptopro/CryptoProObjectIdentifiers.java b/bcprov/src/main/java/org/bouncycastle/asn1/cryptopro/CryptoProObjectIdentifiers.java
deleted file mode 100644
index c6e8e0d..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/cryptopro/CryptoProObjectIdentifiers.java
+++ /dev/null
@@ -1,101 +0,0 @@
-package org.bouncycastle.asn1.cryptopro;
-
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-
-/**
- * <pre>
- * GOST Algorithms OBJECT IDENTIFIERS :
- *    { iso(1) member-body(2) ru(643) rans(2) cryptopro(2)}
- * </pre>
- */
-public interface CryptoProObjectIdentifiers
-{
-    /** Base OID: 1.2.643.2.2 */
-    static final ASN1ObjectIdentifier    GOST_id            = new ASN1ObjectIdentifier("1.2.643.2.2");
-
-    /** Gost R3411 OID: 1.2.643.2.2.9 */
-    static final ASN1ObjectIdentifier    gostR3411          = GOST_id.branch("9");
-    /** Gost R3411 HMAC OID: 1.2.643.2.2.10 */
-    static final ASN1ObjectIdentifier    gostR3411Hmac      = GOST_id.branch("10");
-
-    /** Gost R28147 OID: 1.2.643.2.2.21 */
-    static final ASN1ObjectIdentifier    gostR28147_gcfb = GOST_id.branch("21");
-
-    /** Gost R28147-89-CryotoPro-A-ParamSet OID: 1.2.643.2.2.31.1 */
-    static final ASN1ObjectIdentifier    id_Gost28147_89_CryptoPro_A_ParamSet = GOST_id.branch("31.1");
-
-    /** Gost R28147-89-CryotoPro-B-ParamSet OID: 1.2.643.2.2.31.2 */
-    static final ASN1ObjectIdentifier    id_Gost28147_89_CryptoPro_B_ParamSet = GOST_id.branch("31.2");
-
-    /** Gost R28147-89-CryotoPro-C-ParamSet OID: 1.2.643.2.2.31.3 */
-    static final ASN1ObjectIdentifier    id_Gost28147_89_CryptoPro_C_ParamSet = GOST_id.branch("31.3");
-
-    /** Gost R28147-89-CryotoPro-D-ParamSet OID: 1.2.643.2.2.31.4 */
-    static final ASN1ObjectIdentifier    id_Gost28147_89_CryptoPro_D_ParamSet = GOST_id.branch("31.4");
-
-    /** Gost R3410-94 OID: 1.2.643.2.2.20 */
-    static final ASN1ObjectIdentifier    gostR3410_94       = GOST_id.branch("20");
-    /** Gost R3410-2001 OID: 1.2.643.2.2.19 */
-    static final ASN1ObjectIdentifier    gostR3410_2001     = GOST_id.branch("19");
-
-    /** Gost R3411-94-with-R3410-94 OID: 1.2.643.2.2.4 */
-    static final ASN1ObjectIdentifier    gostR3411_94_with_gostR3410_94   = GOST_id.branch("4");
-    /** Gost R3411-94-with-R3410-2001 OID: 1.2.643.2.2.3 */
-    static final ASN1ObjectIdentifier    gostR3411_94_with_gostR3410_2001 = GOST_id.branch("3");
-
-    /**
-     * { iso(1) member-body(2) ru(643) rans(2) cryptopro(2) hashes(30) }
-     * <p>
-     * Gost R3411-94-CryptoProParamSet OID: 1.2.643.2.2.30.1
-     */
-    static final ASN1ObjectIdentifier    gostR3411_94_CryptoProParamSet = GOST_id.branch("30.1");
-
-    /**
-     * { iso(1) member-body(2) ru(643) rans(2) cryptopro(2) signs(32) }
-     * <p>
-     * Gost R3410-94-CryptoPro-A OID: 1.2.643.2.2.32.2
-     */
-    static final ASN1ObjectIdentifier    gostR3410_94_CryptoPro_A     = GOST_id.branch("32.2");
-    /** Gost R3410-94-CryptoPro-B OID: 1.2.643.2.2.32.3 */
-    static final ASN1ObjectIdentifier    gostR3410_94_CryptoPro_B     = GOST_id.branch("32.3");
-    /** Gost R3410-94-CryptoPro-C OID: 1.2.643.2.2.32.4 */
-    static final ASN1ObjectIdentifier    gostR3410_94_CryptoPro_C     = GOST_id.branch("32.4");
-    /** Gost R3410-94-CryptoPro-D OID: 1.2.643.2.2.32.5 */
-    static final ASN1ObjectIdentifier    gostR3410_94_CryptoPro_D     = GOST_id.branch("32.5");
-
-    /**
-     * { iso(1) member-body(2) ru(643) rans(2) cryptopro(2) exchanges(33) }
-     * <p>
-     * Gost R3410-94-CryptoPro-XchA OID: 1.2.643.2.2.33.1
-     */
-    static final ASN1ObjectIdentifier    gostR3410_94_CryptoPro_XchA  = GOST_id.branch("33.1");
-    /** Gost R3410-94-CryptoPro-XchB OID: 1.2.643.2.2.33.2 */
-    static final ASN1ObjectIdentifier    gostR3410_94_CryptoPro_XchB  = GOST_id.branch("33.2");
-    /** Gost R3410-94-CryptoPro-XchC OID: 1.2.643.2.2.33.3 */
-    static final ASN1ObjectIdentifier    gostR3410_94_CryptoPro_XchC  = GOST_id.branch("33.3");
-
-    /**
-     * { iso(1) member-body(2)ru(643) rans(2) cryptopro(2) ecc-signs(35) }
-     * <p>
-     * Gost R3410-2001-CryptoPro-A OID: 1.2.643.2.2.35.1
-     */
-    static final ASN1ObjectIdentifier    gostR3410_2001_CryptoPro_A = GOST_id.branch("35.1");
-    /** Gost R3410-2001-CryptoPro-B OID: 1.2.643.2.2.35.2 */
-    static final ASN1ObjectIdentifier    gostR3410_2001_CryptoPro_B = GOST_id.branch("35.2");
-    /** Gost R3410-2001-CryptoPro-C OID: 1.2.643.2.2.35.3 */
-    static final ASN1ObjectIdentifier    gostR3410_2001_CryptoPro_C = GOST_id.branch("35.3");
-
-    /**
-     * { iso(1) member-body(2) ru(643) rans(2) cryptopro(2) ecc-exchanges(36) }
-     * <p>
-     * Gost R3410-2001-CryptoPro-XchA OID: 1.2.643.2.2.36.0
-     */
-    static final ASN1ObjectIdentifier    gostR3410_2001_CryptoPro_XchA  = GOST_id.branch("36.0");
-    /** Gost R3410-2001-CryptoPro-XchA OID: 1.2.643.2.2.36.1 */
-    static final ASN1ObjectIdentifier    gostR3410_2001_CryptoPro_XchB  = GOST_id.branch("36.1");
-    
-    /** Gost R3410-ElSqDH3410-default OID: 1.2.643.2.2.36.0 */
-    static final ASN1ObjectIdentifier    gost_ElSgDH3410_default    = GOST_id.branch("36.0");
-    /** Gost R3410-ElSqDH3410-1 OID: 1.2.643.2.2.36.1 */
-    static final ASN1ObjectIdentifier    gost_ElSgDH3410_1          = GOST_id.branch("36.1");
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/cryptopro/ECGOST3410NamedCurves.java b/bcprov/src/main/java/org/bouncycastle/asn1/cryptopro/ECGOST3410NamedCurves.java
deleted file mode 100644
index b0233da..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/cryptopro/ECGOST3410NamedCurves.java
+++ /dev/null
@@ -1,177 +0,0 @@
-package org.bouncycastle.asn1.cryptopro;
-
-import java.math.BigInteger;
-import java.util.Enumeration;
-import java.util.Hashtable;
-
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.crypto.params.ECDomainParameters;
-import org.bouncycastle.math.ec.ECConstants;
-import org.bouncycastle.math.ec.ECCurve;
-
-/**
- * table of the available named parameters for GOST 3410-2001.
- */
-public class ECGOST3410NamedCurves
-{
-    static final Hashtable objIds = new Hashtable();
-    static final Hashtable params = new Hashtable();
-    static final Hashtable names = new Hashtable();
-
-    static
-    {
-        BigInteger mod_p = new BigInteger("115792089237316195423570985008687907853269984665640564039457584007913129639319");
-        BigInteger mod_q = new BigInteger("115792089237316195423570985008687907853073762908499243225378155805079068850323");
-
-        ECCurve.Fp curve = new ECCurve.Fp(
-            mod_p, // p
-            new BigInteger("115792089237316195423570985008687907853269984665640564039457584007913129639316"), // a
-            new BigInteger("166"), // b
-            mod_q,
-            ECConstants.ONE);
-
-        ECDomainParameters ecParams = new ECDomainParameters(
-            curve,
-            curve.createPoint(
-                new BigInteger("1"), // x
-                new BigInteger("64033881142927202683649881450433473985931760268884941288852745803908878638612")), // y
-            mod_q);
-
-        params.put(CryptoProObjectIdentifiers.gostR3410_2001_CryptoPro_A, ecParams);  
-
-        mod_p = new BigInteger("115792089237316195423570985008687907853269984665640564039457584007913129639319");
-        mod_q = new BigInteger("115792089237316195423570985008687907853073762908499243225378155805079068850323");
-
-        curve = new ECCurve.Fp(
-            mod_p, // p
-            new BigInteger("115792089237316195423570985008687907853269984665640564039457584007913129639316"),
-            new BigInteger("166"),
-            mod_q,
-            ECConstants.ONE);
-
-        ecParams = new ECDomainParameters(
-            curve,
-            curve.createPoint(
-                new BigInteger("1"), // x
-                new BigInteger("64033881142927202683649881450433473985931760268884941288852745803908878638612")), // y
-            mod_q);
-
-        params.put(CryptoProObjectIdentifiers.gostR3410_2001_CryptoPro_XchA, ecParams); 
-
-        mod_p = new BigInteger("57896044618658097711785492504343953926634992332820282019728792003956564823193"); //p
-        mod_q = new BigInteger("57896044618658097711785492504343953927102133160255826820068844496087732066703"); //q
-
-        curve = new ECCurve.Fp(
-            mod_p, // p
-            new BigInteger("57896044618658097711785492504343953926634992332820282019728792003956564823190"), // a
-            new BigInteger("28091019353058090096996979000309560759124368558014865957655842872397301267595"), // b
-            mod_q,
-            ECConstants.ONE);
-
-        ecParams = new ECDomainParameters(
-            curve,
-            curve.createPoint(
-                new BigInteger("1"), // x
-                new BigInteger("28792665814854611296992347458380284135028636778229113005756334730996303888124")), // y
-            mod_q); // q
-
-        params.put(CryptoProObjectIdentifiers.gostR3410_2001_CryptoPro_B, ecParams);  
-
-        mod_p = new BigInteger("70390085352083305199547718019018437841079516630045180471284346843705633502619");
-        mod_q = new BigInteger("70390085352083305199547718019018437840920882647164081035322601458352298396601");
-
-        curve = new ECCurve.Fp(
-            mod_p, // p
-            new BigInteger("70390085352083305199547718019018437841079516630045180471284346843705633502616"),
-            new BigInteger("32858"),
-            mod_q,
-            ECConstants.ONE);
-
-        ecParams = new ECDomainParameters(
-            curve,
-            curve.createPoint(
-                new BigInteger("0"),
-                new BigInteger("29818893917731240733471273240314769927240550812383695689146495261604565990247")),
-            mod_q);
-
-        params.put(CryptoProObjectIdentifiers.gostR3410_2001_CryptoPro_XchB, ecParams);  
-
-        mod_p = new BigInteger("70390085352083305199547718019018437841079516630045180471284346843705633502619"); //p
-        mod_q = new BigInteger("70390085352083305199547718019018437840920882647164081035322601458352298396601"); //q
-        curve = new ECCurve.Fp(
-            mod_p, // p
-            new BigInteger("70390085352083305199547718019018437841079516630045180471284346843705633502616"), // a
-            new BigInteger("32858"), // b
-            mod_q,
-            ECConstants.ONE);
-
-        ecParams = new ECDomainParameters(
-            curve,
-            curve.createPoint(
-                new BigInteger("0"), // x
-                new BigInteger("29818893917731240733471273240314769927240550812383695689146495261604565990247")), // y
-            mod_q); // q
-
-        params.put(CryptoProObjectIdentifiers.gostR3410_2001_CryptoPro_C, ecParams); 
-
-        objIds.put("GostR3410-2001-CryptoPro-A", CryptoProObjectIdentifiers.gostR3410_2001_CryptoPro_A);
-        objIds.put("GostR3410-2001-CryptoPro-B", CryptoProObjectIdentifiers.gostR3410_2001_CryptoPro_B);
-        objIds.put("GostR3410-2001-CryptoPro-C", CryptoProObjectIdentifiers.gostR3410_2001_CryptoPro_C);
-        objIds.put("GostR3410-2001-CryptoPro-XchA", CryptoProObjectIdentifiers.gostR3410_2001_CryptoPro_XchA);
-        objIds.put("GostR3410-2001-CryptoPro-XchB", CryptoProObjectIdentifiers.gostR3410_2001_CryptoPro_XchB);
-
-        names.put(CryptoProObjectIdentifiers.gostR3410_2001_CryptoPro_A, "GostR3410-2001-CryptoPro-A");
-        names.put(CryptoProObjectIdentifiers.gostR3410_2001_CryptoPro_B, "GostR3410-2001-CryptoPro-B");
-        names.put(CryptoProObjectIdentifiers.gostR3410_2001_CryptoPro_C, "GostR3410-2001-CryptoPro-C");
-        names.put(CryptoProObjectIdentifiers.gostR3410_2001_CryptoPro_XchA, "GostR3410-2001-CryptoPro-XchA");
-        names.put(CryptoProObjectIdentifiers.gostR3410_2001_CryptoPro_XchB, "GostR3410-2001-CryptoPro-XchB");
-    }
-
-    /**
-     * return the ECDomainParameters object for the given OID, null if it 
-     * isn't present.
-     *
-     * @param oid an object identifier representing a named parameters, if present.
-     */
-    public static ECDomainParameters getByOID(
-        ASN1ObjectIdentifier  oid)
-    {
-        return (ECDomainParameters)params.get(oid);
-    }
-
-    /**
-     * returns an enumeration containing the name strings for parameters
-     * contained in this structure.
-     */
-    public static Enumeration getNames()
-    {
-        return objIds.keys();
-    }
-
-    public static ECDomainParameters getByName(
-        String  name)
-    {
-        ASN1ObjectIdentifier oid = (ASN1ObjectIdentifier)objIds.get(name);
-
-        if (oid != null)
-        {
-            return (ECDomainParameters)params.get(oid);
-        }
-
-        return null;
-    }
-
-    /**
-     * return the named curve name represented by the given object identifier.
-     */
-    public static String getName(
-        ASN1ObjectIdentifier  oid)
-    {
-        return (String)names.get(oid);
-    }
-    
-    public static ASN1ObjectIdentifier getOID(String name)
-    {
-        return (ASN1ObjectIdentifier)objIds.get(name);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/cryptopro/ECGOST3410ParamSetParameters.java b/bcprov/src/main/java/org/bouncycastle/asn1/cryptopro/ECGOST3410ParamSetParameters.java
deleted file mode 100644
index 189eabd..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/cryptopro/ECGOST3410ParamSetParameters.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package org.bouncycastle.asn1.cryptopro;
-
-import java.math.BigInteger;
-import java.util.Enumeration;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.ASN1TaggedObject;
-import org.bouncycastle.asn1.DERSequence;
-
-public class ECGOST3410ParamSetParameters
-    extends ASN1Object
-{
-    ASN1Integer      p, q, a, b, x, y;
-
-    public static ECGOST3410ParamSetParameters getInstance(
-        ASN1TaggedObject obj,
-        boolean          explicit)
-    {
-        return getInstance(ASN1Sequence.getInstance(obj, explicit));
-    }
-
-    public static ECGOST3410ParamSetParameters getInstance(
-        Object obj)
-    {
-        if(obj == null || obj instanceof ECGOST3410ParamSetParameters)
-        {
-            return (ECGOST3410ParamSetParameters)obj;
-        }
-
-        if(obj instanceof ASN1Sequence)
-        {
-            return new ECGOST3410ParamSetParameters((ASN1Sequence)obj);
-        }
-
-        throw new IllegalArgumentException("Invalid GOST3410Parameter: " + obj.getClass().getName());
-    }
-
-    public ECGOST3410ParamSetParameters(
-        BigInteger a,
-        BigInteger b,
-        BigInteger p,
-        BigInteger q,
-        int        x,
-        BigInteger y)
-    {
-        this.a = new ASN1Integer(a);
-        this.b = new ASN1Integer(b);
-        this.p = new ASN1Integer(p);
-        this.q = new ASN1Integer(q);
-        this.x = new ASN1Integer(x);
-        this.y = new ASN1Integer(y);
-    }
-
-    public ECGOST3410ParamSetParameters(
-        ASN1Sequence  seq)
-    {
-        Enumeration     e = seq.getObjects();
-
-        a = (ASN1Integer)e.nextElement();
-        b = (ASN1Integer)e.nextElement();
-        p = (ASN1Integer)e.nextElement();
-        q = (ASN1Integer)e.nextElement();
-        x = (ASN1Integer)e.nextElement();
-        y = (ASN1Integer)e.nextElement();
-    }
-    
-    public BigInteger getP()
-    {
-        return p.getPositiveValue();
-    }
-
-    public BigInteger getQ()
-    {
-        return q.getPositiveValue();
-    }
-
-    public BigInteger getA()
-    {
-        return a.getPositiveValue();
-    }
-
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector  v = new ASN1EncodableVector();
-
-        v.add(a);
-        v.add(b);
-        v.add(p);
-        v.add(q);
-        v.add(x);
-        v.add(y);
-
-        return new DERSequence(v);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/cryptopro/GOST28147Parameters.java b/bcprov/src/main/java/org/bouncycastle/asn1/cryptopro/GOST28147Parameters.java
deleted file mode 100644
index 124bca6..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/cryptopro/GOST28147Parameters.java
+++ /dev/null
@@ -1,98 +0,0 @@
-package org.bouncycastle.asn1.cryptopro;
-
-import java.util.Enumeration;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.ASN1TaggedObject;
-import org.bouncycastle.asn1.DERSequence;
-
-/**
- * ASN.1 algorithm identifier parameters for GOST-28147
- */
-public class GOST28147Parameters
-    extends ASN1Object
-{
-    private ASN1OctetString iv;
-    private ASN1ObjectIdentifier paramSet;
-
-    public static GOST28147Parameters getInstance(
-        ASN1TaggedObject obj,
-        boolean          explicit)
-    {
-        return getInstance(ASN1Sequence.getInstance(obj, explicit));
-    }
-
-    public static GOST28147Parameters getInstance(
-        Object obj)
-    {
-        if (obj instanceof GOST28147Parameters)
-        {
-            return (GOST28147Parameters)obj;
-        }
-
-        if (obj != null)
-        {
-            return new GOST28147Parameters(ASN1Sequence.getInstance(obj));
-        }
-
-        return null;
-    }
-
-    /**
-     * @deprecated use the getInstance() method. This constructor will vanish!
-     */
-    public GOST28147Parameters(
-        ASN1Sequence  seq)
-    {
-        Enumeration     e = seq.getObjects();
-
-        iv = (ASN1OctetString)e.nextElement();
-        paramSet = (ASN1ObjectIdentifier)e.nextElement();
-    }
-
-    /**
-     * <pre>
-     * Gost28147-89-Parameters ::=
-     *               SEQUENCE {
-     *                       iv                   Gost28147-89-IV,
-     *                       encryptionParamSet   OBJECT IDENTIFIER
-     *                }
-     *
-     *   Gost28147-89-IV ::= OCTET STRING (SIZE (8))
-     * </pre>
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector  v = new ASN1EncodableVector();
-
-        v.add(iv);
-        v.add(paramSet);
-
-        return new DERSequence(v);
-    }
-
-    /**
-     * Return the OID representing the sBox to use.
-     *
-     * @return the sBox OID.
-     */
-    public ASN1ObjectIdentifier getEncryptionParamSet()
-    {
-        return paramSet;
-    }
-
-    /**
-     * Return the initialisation vector to use.
-     *
-     * @return the IV.
-     */
-    public byte[] getIV()
-    {
-        return iv.getOctets();
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/cryptopro/GOST3410NamedParameters.java b/bcprov/src/main/java/org/bouncycastle/asn1/cryptopro/GOST3410NamedParameters.java
deleted file mode 100644
index 6c398b5..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/cryptopro/GOST3410NamedParameters.java
+++ /dev/null
@@ -1,116 +0,0 @@
-package org.bouncycastle.asn1.cryptopro;
-
-import java.math.BigInteger;
-import java.util.Enumeration;
-import java.util.Hashtable;
-
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-
-/**
- * table of the available named parameters for GOST 3410-94.
- */
-public class GOST3410NamedParameters
-{
-    static final Hashtable objIds = new Hashtable();
-    static final Hashtable params = new Hashtable();
-    static final Hashtable names = new Hashtable();
-
-    static private GOST3410ParamSetParameters cryptoProA = new GOST3410ParamSetParameters(
-            1024,
-            new BigInteger("127021248288932417465907042777176443525787653508916535812817507265705031260985098497423188333483401180925999995120988934130659205614996724254121049274349357074920312769561451689224110579311248812610229678534638401693520013288995000362260684222750813532307004517341633685004541062586971416883686778842537820383"),
-            new BigInteger("68363196144955700784444165611827252895102170888761442055095051287550314083023"),
-            new BigInteger("100997906755055304772081815535925224869841082572053457874823515875577147990529272777244152852699298796483356699682842027972896052747173175480590485607134746852141928680912561502802222185647539190902656116367847270145019066794290930185446216399730872221732889830323194097355403213400972588322876850946740663962")
-//            validationAlgorithm {
-//                    algorithm
-//                        id-GostR3410-94-bBis,
-//                    parameters
-//                        GostR3410-94-ValidationBisParameters: {
-//                            x0      1376285941,
-//                            c       3996757427
-//                        }
-//                }
-
-           );
-    
-    static private GOST3410ParamSetParameters cryptoProB = new GOST3410ParamSetParameters(
-            1024,
-            new BigInteger("139454871199115825601409655107690713107041707059928031797758001454375765357722984094124368522288239833039114681648076688236921220737322672160740747771700911134550432053804647694904686120113087816240740184800477047157336662926249423571248823968542221753660143391485680840520336859458494803187341288580489525163"),
-            new BigInteger("79885141663410976897627118935756323747307951916507639758300472692338873533959"),
-            new BigInteger("42941826148615804143873447737955502392672345968607143066798112994089471231420027060385216699563848719957657284814898909770759462613437669456364882730370838934791080835932647976778601915343474400961034231316672578686920482194932878633360203384797092684342247621055760235016132614780652761028509445403338652341")
-//    validationAlgorithm {
-//            algorithm
-//                id-GostR3410-94-bBis,
-//            parameters
-//                GostR3410-94-ValidationBisParameters: {
-//                    x0      1536654555,
-//                    c       1855361757,
-//                    d       14408629386140014567655
-//4902939282056547857802241461782996702017713059974755104394739915140
-//6115284791024439062735788342744854120601660303926203867703556828005
-//8957203818114895398976594425537561271800850306
-//                }
-//        }
-//}
-         );
-
-    static private GOST3410ParamSetParameters cryptoProXchA = new GOST3410ParamSetParameters(
-    1024,
-    new BigInteger("142011741597563481196368286022318089743276138395243738762872573441927459393512718973631166078467600360848946623567625795282774719212241929071046134208380636394084512691828894000571524625445295769349356752728956831541775441763139384457191755096847107846595662547942312293338483924514339614727760681880609734239"),
-    new BigInteger("91771529896554605945588149018382750217296858393520724172743325725474374979801"),
-    new BigInteger("133531813272720673433859519948319001217942375967847486899482359599369642528734712461590403327731821410328012529253871914788598993103310567744136196364803064721377826656898686468463277710150809401182608770201615324990468332931294920912776241137878030224355746606283971659376426832674269780880061631528163475887")
-   );
-    
-    static
-    {      
-        params.put(CryptoProObjectIdentifiers.gostR3410_94_CryptoPro_A, cryptoProA);       
-        params.put(CryptoProObjectIdentifiers.gostR3410_94_CryptoPro_B, cryptoProB);       
-//        params.put(CryptoProObjectIdentifiers.gostR3410_94_CryptoPro_C, cryptoProC);       
-//        params.put(CryptoProObjectIdentifiers.gostR3410_94_CryptoPro_D, cryptoProD);       
-        params.put(CryptoProObjectIdentifiers.gostR3410_94_CryptoPro_XchA, cryptoProXchA);       
-//        params.put(CryptoProObjectIdentifiers.gostR3410_94_CryptoPro_XchB, cryptoProXchA);   
-//        params.put(CryptoProObjectIdentifiers.gostR3410_94_CryptoPro_XchC, cryptoProXchA);
-        
-        objIds.put("GostR3410-94-CryptoPro-A", CryptoProObjectIdentifiers.gostR3410_94_CryptoPro_A);
-        objIds.put("GostR3410-94-CryptoPro-B", CryptoProObjectIdentifiers.gostR3410_94_CryptoPro_B);
-        objIds.put("GostR3410-94-CryptoPro-XchA", CryptoProObjectIdentifiers.gostR3410_94_CryptoPro_XchA);
-    }
-
-    /**
-     * return the GOST3410ParamSetParameters object for the given OID, null if it 
-     * isn't present.
-     *
-     * @param oid an object identifier representing a named parameters, if present.
-     */
-    public static GOST3410ParamSetParameters getByOID(
-        ASN1ObjectIdentifier  oid)
-    {
-        return (GOST3410ParamSetParameters)params.get(oid);
-    }
-
-    /**
-     * returns an enumeration containing the name strings for parameters
-     * contained in this structure.
-     */
-    public static Enumeration getNames()
-    {
-        return objIds.keys();
-    }
-
-    public static GOST3410ParamSetParameters getByName(
-        String  name)
-    {
-        ASN1ObjectIdentifier oid = (ASN1ObjectIdentifier)objIds.get(name);
-
-        if (oid != null)
-        {
-            return (GOST3410ParamSetParameters)params.get(oid);
-        }
-
-        return null;
-    }
-
-    public static ASN1ObjectIdentifier getOID(String name)
-    {
-        return (ASN1ObjectIdentifier)objIds.get(name);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/cryptopro/GOST3410ParamSetParameters.java b/bcprov/src/main/java/org/bouncycastle/asn1/cryptopro/GOST3410ParamSetParameters.java
deleted file mode 100644
index 35e9b73..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/cryptopro/GOST3410ParamSetParameters.java
+++ /dev/null
@@ -1,105 +0,0 @@
-package org.bouncycastle.asn1.cryptopro;
-
-import java.math.BigInteger;
-import java.util.Enumeration;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.ASN1TaggedObject;
-import org.bouncycastle.asn1.DERSequence;
-
-public class GOST3410ParamSetParameters
-    extends ASN1Object
-{
-    int             keySize;
-    ASN1Integer      p, q, a;
-
-    public static GOST3410ParamSetParameters getInstance(
-        ASN1TaggedObject obj,
-        boolean          explicit)
-    {
-        return getInstance(ASN1Sequence.getInstance(obj, explicit));
-    }
-
-    public static GOST3410ParamSetParameters getInstance(
-        Object obj)
-    {
-        if(obj == null || obj instanceof GOST3410ParamSetParameters)
-        {
-            return (GOST3410ParamSetParameters)obj;
-        }
-
-        if(obj instanceof ASN1Sequence)
-        {
-            return new GOST3410ParamSetParameters((ASN1Sequence)obj);
-        }
-
-        throw new IllegalArgumentException("Invalid GOST3410Parameter: " + obj.getClass().getName());
-    }
-
-    public GOST3410ParamSetParameters(
-        int keySize,
-        BigInteger  p,
-        BigInteger  q,
-        BigInteger  a)
-    {
-        this.keySize = keySize;
-        this.p = new ASN1Integer(p);
-        this.q = new ASN1Integer(q);
-        this.a = new ASN1Integer(a);
-    }
-
-    public GOST3410ParamSetParameters(
-        ASN1Sequence  seq)
-    {
-        Enumeration     e = seq.getObjects();
-
-        keySize = ((ASN1Integer)e.nextElement()).getValue().intValue();
-        p = (ASN1Integer)e.nextElement();
-        q = (ASN1Integer)e.nextElement();
-        a = (ASN1Integer)e.nextElement();
-    }
-
-    /**
-     * @deprecated use getKeySize
-     */
-    public int getLKeySize()
-    {
-        return keySize;
-    }
-
-    public int getKeySize()
-    {
-        return keySize;
-    }
-    
-    public BigInteger getP()
-    {
-        return p.getPositiveValue();
-    }
-
-    public BigInteger getQ()
-    {
-        return q.getPositiveValue();
-    }
-
-    public BigInteger getA()
-    {
-        return a.getPositiveValue();
-    }
-
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector  v = new ASN1EncodableVector();
-
-        v.add(new ASN1Integer(keySize));
-        v.add(p);
-        v.add(q);
-        v.add(a);
-
-        return new DERSequence(v);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/cryptopro/GOST3410PublicKeyAlgParameters.java b/bcprov/src/main/java/org/bouncycastle/asn1/cryptopro/GOST3410PublicKeyAlgParameters.java
deleted file mode 100644
index 45d7814..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/cryptopro/GOST3410PublicKeyAlgParameters.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package org.bouncycastle.asn1.cryptopro;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.ASN1TaggedObject;
-import org.bouncycastle.asn1.DERSequence;
-
-public class GOST3410PublicKeyAlgParameters
-    extends ASN1Object
-{
-    private ASN1ObjectIdentifier  publicKeyParamSet;
-    private ASN1ObjectIdentifier  digestParamSet;
-    private ASN1ObjectIdentifier  encryptionParamSet;
-    
-    public static GOST3410PublicKeyAlgParameters getInstance(
-        ASN1TaggedObject obj,
-        boolean          explicit)
-    {
-        return getInstance(ASN1Sequence.getInstance(obj, explicit));
-    }
-
-    public static GOST3410PublicKeyAlgParameters getInstance(
-        Object obj)
-    {
-        if (obj instanceof GOST3410PublicKeyAlgParameters)
-        {
-            return (GOST3410PublicKeyAlgParameters)obj;
-        }
-
-        if(obj != null)
-        {
-            return new GOST3410PublicKeyAlgParameters(ASN1Sequence.getInstance(obj));
-        }
-
-        return null;
-    }
-    
-    public GOST3410PublicKeyAlgParameters(
-        ASN1ObjectIdentifier  publicKeyParamSet,
-        ASN1ObjectIdentifier  digestParamSet)
-    {
-        this.publicKeyParamSet = publicKeyParamSet;
-        this.digestParamSet = digestParamSet;
-        this.encryptionParamSet = null;
-    }
-
-    public GOST3410PublicKeyAlgParameters(
-        ASN1ObjectIdentifier  publicKeyParamSet,
-        ASN1ObjectIdentifier  digestParamSet,
-        ASN1ObjectIdentifier  encryptionParamSet)
-    {
-        this.publicKeyParamSet = publicKeyParamSet;
-        this.digestParamSet = digestParamSet;
-        this.encryptionParamSet = encryptionParamSet;
-    }
-
-    /**
-     * @deprecated use getInstance()
-     */
-    public GOST3410PublicKeyAlgParameters(
-        ASN1Sequence  seq)
-    {
-        this.publicKeyParamSet = (ASN1ObjectIdentifier)seq.getObjectAt(0);
-        this.digestParamSet = (ASN1ObjectIdentifier)seq.getObjectAt(1);
-        
-        if (seq.size() > 2)
-        {
-            this.encryptionParamSet = (ASN1ObjectIdentifier)seq.getObjectAt(2);
-        }
-    }
-
-    public ASN1ObjectIdentifier getPublicKeyParamSet()
-    {
-        return publicKeyParamSet;
-    }
-
-    public ASN1ObjectIdentifier getDigestParamSet()
-    {
-        return digestParamSet;
-    }
-
-    public ASN1ObjectIdentifier getEncryptionParamSet()
-    {
-        return encryptionParamSet;
-    }
-
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector  v = new ASN1EncodableVector();
-
-        v.add(publicKeyParamSet);
-        v.add(digestParamSet);
-        
-        if (encryptionParamSet != null)
-        {
-            v.add(encryptionParamSet);
-        }
-
-        return new DERSequence(v);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/cryptopro/package.html b/bcprov/src/main/java/org/bouncycastle/asn1/cryptopro/package.html
deleted file mode 100644
index 2b0af9e..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/cryptopro/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body bgcolor="#ffffff">
-Support classes for CRYPTO-PRO related objects - such as GOST identifiers.
-</body>
-</html>
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/dvcs/CertEtcToken.java b/bcprov/src/main/java/org/bouncycastle/asn1/dvcs/CertEtcToken.java
deleted file mode 100644
index 3f69c52..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/dvcs/CertEtcToken.java
+++ /dev/null
@@ -1,171 +0,0 @@
-package org.bouncycastle.asn1.dvcs;
-
-import org.bouncycastle.asn1.ASN1Choice;
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.ASN1TaggedObject;
-import org.bouncycastle.asn1.DERTaggedObject;
-import org.bouncycastle.asn1.cmp.PKIStatusInfo;
-import org.bouncycastle.asn1.cms.ContentInfo;
-import org.bouncycastle.asn1.ess.ESSCertID;
-import org.bouncycastle.asn1.ocsp.CertID;
-import org.bouncycastle.asn1.ocsp.CertStatus;
-import org.bouncycastle.asn1.ocsp.OCSPResponse;
-import org.bouncycastle.asn1.smime.SMIMECapabilities;
-import org.bouncycastle.asn1.x509.Certificate;
-import org.bouncycastle.asn1.x509.CertificateList;
-import org.bouncycastle.asn1.x509.Extension;
-
-/**
- * <pre>
- * CertEtcToken ::= CHOICE {
- *         certificate                  [0] IMPLICIT Certificate ,
- *         esscertid                    [1] ESSCertId ,
- *         pkistatus                    [2] IMPLICIT PKIStatusInfo ,
- *         assertion                    [3] ContentInfo ,
- *         crl                          [4] IMPLICIT CertificateList,
- *         ocspcertstatus               [5] CertStatus,
- *         oscpcertid                   [6] IMPLICIT CertId ,
- *         oscpresponse                 [7] IMPLICIT OCSPResponse,
- *         capabilities                 [8] SMIMECapabilities,
- *         extension                    Extension
- * }
- * </pre>
- */
-public class CertEtcToken
-    extends ASN1Object
-    implements ASN1Choice
-{
-    public static final int TAG_CERTIFICATE = 0;
-    public static final int TAG_ESSCERTID = 1;
-    public static final int TAG_PKISTATUS = 2;
-    public static final int TAG_ASSERTION = 3;
-    public static final int TAG_CRL = 4;
-    public static final int TAG_OCSPCERTSTATUS = 5;
-    public static final int TAG_OCSPCERTID = 6;
-    public static final int TAG_OCSPRESPONSE = 7;
-    public static final int TAG_CAPABILITIES = 8;
-
-    private static final boolean[] explicit = new boolean[]
-        {
-            false, true, false, true, false, true, false, false, true
-        };
-
-    private int tagNo;
-    private ASN1Encodable value;
-    private Extension extension;
-
-    public CertEtcToken(int tagNo, ASN1Encodable value)
-    {
-        this.tagNo = tagNo;
-        this.value = value;
-    }
-
-    public CertEtcToken(Extension extension)
-    {
-        this.tagNo = -1;
-        this.extension = extension;
-    }
-
-    private CertEtcToken(ASN1TaggedObject choice)
-    {
-        this.tagNo = choice.getTagNo();
-
-        switch (tagNo)
-        {
-        case TAG_CERTIFICATE:
-            value = Certificate.getInstance(choice, false);
-            break;
-        case TAG_ESSCERTID:
-            value = ESSCertID.getInstance(choice.getObject());
-            break;
-        case TAG_PKISTATUS:
-            value = PKIStatusInfo.getInstance(choice, false);
-            break;
-        case TAG_ASSERTION:
-            value = ContentInfo.getInstance(choice.getObject());
-            break;
-        case TAG_CRL:
-            value = CertificateList.getInstance(choice, false);
-            break;
-        case TAG_OCSPCERTSTATUS:
-            value = CertStatus.getInstance(choice.getObject());
-            break;
-        case TAG_OCSPCERTID:
-            value = CertID.getInstance(choice, false);
-            break;
-        case TAG_OCSPRESPONSE:
-            value = OCSPResponse.getInstance(choice, false);
-            break;
-        case TAG_CAPABILITIES:
-            value = SMIMECapabilities.getInstance(choice.getObject());
-            break;
-        default:
-            throw new IllegalArgumentException("Unknown tag: " + tagNo);
-        }
-    }
-
-    public static CertEtcToken getInstance(Object obj)
-    {
-        if (obj instanceof CertEtcToken)
-        {
-            return (CertEtcToken)obj;
-        }
-        else if (obj instanceof ASN1TaggedObject)
-        {
-            return new CertEtcToken((ASN1TaggedObject)obj);
-        }
-        else if (obj != null)
-        {
-            return new CertEtcToken(Extension.getInstance(obj));
-        }
-
-        return null;
-    }
-
-    public ASN1Primitive toASN1Primitive()
-    {
-        if (extension == null)
-        {
-            return new DERTaggedObject(explicit[tagNo], tagNo, value);
-        }
-        else
-        {
-            return extension.toASN1Primitive();
-        }
-    }
-
-    public int getTagNo()
-    {
-        return tagNo;
-    }
-
-    public ASN1Encodable getValue()
-    {
-        return value;
-    }
-
-    public Extension getExtension()
-    {
-        return extension;
-    }
-
-    public String toString()
-    {
-        return "CertEtcToken {\n" + value + "}\n";
-    }
-
-    public static CertEtcToken[] arrayFromSequence(ASN1Sequence seq)
-    {
-        CertEtcToken[] tmp = new CertEtcToken[seq.size()];
-
-        for (int i = 0; i != tmp.length; i++)
-        {
-            tmp[i] = CertEtcToken.getInstance(seq.getObjectAt(i));
-        }
-
-        return tmp;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/dvcs/DVCSCertInfo.java b/bcprov/src/main/java/org/bouncycastle/asn1/dvcs/DVCSCertInfo.java
deleted file mode 100644
index b64b31c..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/dvcs/DVCSCertInfo.java
+++ /dev/null
@@ -1,302 +0,0 @@
-package org.bouncycastle.asn1.dvcs;
-
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.ASN1Set;
-import org.bouncycastle.asn1.ASN1TaggedObject;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.DERTaggedObject;
-import org.bouncycastle.asn1.cmp.PKIStatusInfo;
-import org.bouncycastle.asn1.x509.DigestInfo;
-import org.bouncycastle.asn1.x509.Extensions;
-import org.bouncycastle.asn1.x509.PolicyInformation;
-
-/**
- * <pre>
- *     DVCSCertInfo::= SEQUENCE  {
- *         version             Integer DEFAULT 1 ,
- *         dvReqInfo           DVCSRequestInformation,
- *         messageImprint      DigestInfo,
- *         serialNumber        Integer,
- *         responseTime        DVCSTime,
- *         dvStatus            [0] PKIStatusInfo OPTIONAL,
- *         policy              [1] PolicyInformation OPTIONAL,
- *         reqSignature        [2] SignerInfos  OPTIONAL,
- *         certs               [3] SEQUENCE SIZE (1..MAX) OF
- *                                 TargetEtcChain OPTIONAL,
- *         extensions          Extensions OPTIONAL
- *     }
- * </pre>
- */
-
-public class DVCSCertInfo
-    extends ASN1Object
-{
-
-    private int version = DEFAULT_VERSION;
-    private DVCSRequestInformation dvReqInfo;
-    private DigestInfo messageImprint;
-    private ASN1Integer serialNumber;
-    private DVCSTime responseTime;
-    private PKIStatusInfo dvStatus;
-    private PolicyInformation policy;
-    private ASN1Set reqSignature;
-    private ASN1Sequence certs;
-    private Extensions extensions;
-
-    private static final int DEFAULT_VERSION = 1;
-    private static final int TAG_DV_STATUS = 0;
-    private static final int TAG_POLICY = 1;
-    private static final int TAG_REQ_SIGNATURE = 2;
-    private static final int TAG_CERTS = 3;
-
-    public DVCSCertInfo(
-        DVCSRequestInformation dvReqInfo,
-        DigestInfo messageImprint,
-        ASN1Integer serialNumber,
-        DVCSTime responseTime)
-    {
-        this.dvReqInfo = dvReqInfo;
-        this.messageImprint = messageImprint;
-        this.serialNumber = serialNumber;
-        this.responseTime = responseTime;
-    }
-
-    private DVCSCertInfo(ASN1Sequence seq)
-    {
-        int i = 0;
-        ASN1Encodable x = seq.getObjectAt(i++);
-        try
-        {
-            ASN1Integer encVersion = ASN1Integer.getInstance(x);
-            this.version = encVersion.getValue().intValue();
-            x = seq.getObjectAt(i++);
-        }
-        catch (IllegalArgumentException e)
-        {
-        }
-
-        this.dvReqInfo = DVCSRequestInformation.getInstance(x);
-        x = seq.getObjectAt(i++);
-        this.messageImprint = DigestInfo.getInstance(x);
-        x = seq.getObjectAt(i++);
-        this.serialNumber = ASN1Integer.getInstance(x);
-        x = seq.getObjectAt(i++);
-        this.responseTime = DVCSTime.getInstance(x);
-
-        while (i < seq.size())
-        {
-
-            x = seq.getObjectAt(i++);
-
-            try
-            {
-                ASN1TaggedObject t = ASN1TaggedObject.getInstance(x);
-                int tagNo = t.getTagNo();
-
-                switch (tagNo)
-                {
-                case TAG_DV_STATUS:
-                    this.dvStatus = PKIStatusInfo.getInstance(t, false);
-                    break;
-                case TAG_POLICY:
-                    this.policy = PolicyInformation.getInstance(ASN1Sequence.getInstance(t, false));
-                    break;
-                case TAG_REQ_SIGNATURE:
-                    this.reqSignature = ASN1Set.getInstance(t, false);
-                    break;
-                case TAG_CERTS:
-                    this.certs = ASN1Sequence.getInstance(t, false);
-                    break;
-                }
-
-                continue;
-
-            }
-            catch (IllegalArgumentException e)
-            {
-            }
-
-            try
-            {
-                this.extensions = Extensions.getInstance(x);
-            }
-            catch (IllegalArgumentException e)
-            {
-            }
-
-        }
-
-    }
-
-    public static DVCSCertInfo getInstance(Object obj)
-    {
-        if (obj instanceof DVCSCertInfo)
-        {
-            return (DVCSCertInfo)obj;
-        }
-        else if (obj != null)
-        {
-            return new DVCSCertInfo(ASN1Sequence.getInstance(obj));
-        }
-
-        return null;
-    }
-
-    public static DVCSCertInfo getInstance(
-        ASN1TaggedObject obj,
-        boolean explicit)
-    {
-        return getInstance(ASN1Sequence.getInstance(obj, explicit));
-    }
-
-    public ASN1Primitive toASN1Primitive()
-    {
-
-        ASN1EncodableVector v = new ASN1EncodableVector();
-
-        if (version != DEFAULT_VERSION)
-        {
-            v.add(new ASN1Integer(version));
-        }
-        v.add(dvReqInfo);
-        v.add(messageImprint);
-        v.add(serialNumber);
-        v.add(responseTime);
-        if (dvStatus != null)
-        {
-            v.add(new DERTaggedObject(false, TAG_DV_STATUS, dvStatus));
-        }
-        if (policy != null)
-        {
-            v.add(new DERTaggedObject(false, TAG_POLICY, policy));
-        }
-        if (reqSignature != null)
-        {
-            v.add(new DERTaggedObject(false, TAG_REQ_SIGNATURE, reqSignature));
-        }
-        if (certs != null)
-        {
-            v.add(new DERTaggedObject(false, TAG_CERTS, certs));
-        }
-        if (extensions != null)
-        {
-            v.add(extensions);
-        }
-
-        return new DERSequence(v);
-    }
-
-    public String toString()
-    {
-        StringBuffer s = new StringBuffer();
-
-        s.append("DVCSCertInfo {\n");
-
-        if (version != DEFAULT_VERSION)
-        {
-            s.append("version: " + version + "\n");
-        }
-        s.append("dvReqInfo: " + dvReqInfo + "\n");
-        s.append("messageImprint: " + messageImprint + "\n");
-        s.append("serialNumber: " + serialNumber + "\n");
-        s.append("responseTime: " + responseTime + "\n");
-        if (dvStatus != null)
-        {
-            s.append("dvStatus: " + dvStatus + "\n");
-        }
-        if (policy != null)
-        {
-            s.append("policy: " + policy + "\n");
-        }
-        if (reqSignature != null)
-        {
-            s.append("reqSignature: " + reqSignature + "\n");
-        }
-        if (certs != null)
-        {
-            s.append("certs: " + certs + "\n");
-        }
-        if (extensions != null)
-        {
-            s.append("extensions: " + extensions + "\n");
-        }
-
-        s.append("}\n");
-        return s.toString();
-    }
-
-    public int getVersion()
-    {
-        return version;
-    }
-
-    private void setVersion(int version)
-    {
-        this.version = version;
-    }
-
-    public DVCSRequestInformation getDvReqInfo()
-    {
-        return dvReqInfo;
-    }
-
-    private void setDvReqInfo(DVCSRequestInformation dvReqInfo)
-    {
-        this.dvReqInfo = dvReqInfo;
-    }
-
-    public DigestInfo getMessageImprint()
-    {
-        return messageImprint;
-    }
-
-    private void setMessageImprint(DigestInfo messageImprint)
-    {
-        this.messageImprint = messageImprint;
-    }
-
-    public ASN1Integer getSerialNumber()
-    {
-        return serialNumber;
-    }
-
-    public DVCSTime getResponseTime()
-    {
-        return responseTime;
-    }
-
-    public PKIStatusInfo getDvStatus()
-    {
-        return dvStatus;
-    }
-
-    public PolicyInformation getPolicy()
-    {
-        return policy;
-    }
-
-    public ASN1Set getReqSignature()
-    {
-        return reqSignature;
-    }
-
-    public TargetEtcChain[] getCerts()
-    {
-        if (certs != null)
-        {
-            return TargetEtcChain.arrayFromSequence(certs);
-        }
-
-        return null;
-    }
-
-    public Extensions getExtensions()
-    {
-        return extensions;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/dvcs/DVCSCertInfoBuilder.java b/bcprov/src/main/java/org/bouncycastle/asn1/dvcs/DVCSCertInfoBuilder.java
deleted file mode 100644
index 5da097f..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/dvcs/DVCSCertInfoBuilder.java
+++ /dev/null
@@ -1,151 +0,0 @@
-package org.bouncycastle.asn1.dvcs;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.ASN1Set;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.DERTaggedObject;
-import org.bouncycastle.asn1.cmp.PKIStatusInfo;
-import org.bouncycastle.asn1.x509.DigestInfo;
-import org.bouncycastle.asn1.x509.Extensions;
-import org.bouncycastle.asn1.x509.PolicyInformation;
-
-/**
- * <pre>
- *     DVCSCertInfo::= SEQUENCE  {
- *         version             Integer DEFAULT 1 ,
- *         dvReqInfo           DVCSRequestInformation,
- *         messageImprint      DigestInfo,
- *         serialNumber        Integer,
- *         responseTime        DVCSTime,
- *         dvStatus            [0] PKIStatusInfo OPTIONAL,
- *         policy              [1] PolicyInformation OPTIONAL,
- *         reqSignature        [2] SignerInfos  OPTIONAL,
- *         certs               [3] SEQUENCE SIZE (1..MAX) OF
- *                                 TargetEtcChain OPTIONAL,
- *         extensions          Extensions OPTIONAL
- *     }
- * </pre>
- */
-
-public class DVCSCertInfoBuilder
-{
-
-    private int version = DEFAULT_VERSION;
-    private DVCSRequestInformation dvReqInfo;
-    private DigestInfo messageImprint;
-    private ASN1Integer serialNumber;
-    private DVCSTime responseTime;
-    private PKIStatusInfo dvStatus;
-    private PolicyInformation policy;
-    private ASN1Set reqSignature;
-    private ASN1Sequence certs;
-    private Extensions extensions;
-
-    private static final int DEFAULT_VERSION = 1;
-    private static final int TAG_DV_STATUS = 0;
-    private static final int TAG_POLICY = 1;
-    private static final int TAG_REQ_SIGNATURE = 2;
-    private static final int TAG_CERTS = 3;
-
-    public DVCSCertInfoBuilder(
-        DVCSRequestInformation dvReqInfo,
-        DigestInfo messageImprint,
-        ASN1Integer serialNumber,
-        DVCSTime responseTime)
-    {
-        this.dvReqInfo = dvReqInfo;
-        this.messageImprint = messageImprint;
-        this.serialNumber = serialNumber;
-        this.responseTime = responseTime;
-    }
-
-    public DVCSCertInfo build()
-    {
-
-        ASN1EncodableVector v = new ASN1EncodableVector();
-
-        if (version != DEFAULT_VERSION)
-        {
-            v.add(new ASN1Integer(version));
-        }
-        v.add(dvReqInfo);
-        v.add(messageImprint);
-        v.add(serialNumber);
-        v.add(responseTime);
-        if (dvStatus != null)
-        {
-            v.add(new DERTaggedObject(false, TAG_DV_STATUS, dvStatus));
-        }
-        if (policy != null)
-        {
-            v.add(new DERTaggedObject(false, TAG_POLICY, policy));
-        }
-        if (reqSignature != null)
-        {
-            v.add(new DERTaggedObject(false, TAG_REQ_SIGNATURE, reqSignature));
-        }
-        if (certs != null)
-        {
-            v.add(new DERTaggedObject(false, TAG_CERTS, certs));
-        }
-        if (extensions != null)
-        {
-            v.add(extensions);
-        }
-
-        return DVCSCertInfo.getInstance(new DERSequence(v));
-    }
-
-    public void setVersion(int version)
-    {
-        this.version = version;
-    }
-
-    public void setDvReqInfo(DVCSRequestInformation dvReqInfo)
-    {
-        this.dvReqInfo = dvReqInfo;
-    }
-
-    public void setMessageImprint(DigestInfo messageImprint)
-    {
-        this.messageImprint = messageImprint;
-    }
-
-    public void setSerialNumber(ASN1Integer serialNumber)
-    {
-        this.serialNumber = serialNumber;
-    }
-
-    public void setResponseTime(DVCSTime responseTime)
-    {
-        this.responseTime = responseTime;
-    }
-
-    public void setDvStatus(PKIStatusInfo dvStatus)
-    {
-        this.dvStatus = dvStatus;
-    }
-
-    public void setPolicy(PolicyInformation policy)
-    {
-        this.policy = policy;
-    }
-
-    public void setReqSignature(ASN1Set reqSignature)
-    {
-        this.reqSignature = reqSignature;
-    }
-
-    public void setCerts(TargetEtcChain[] certs)
-    {
-        this.certs = new DERSequence(certs);
-    }
-
-    public void setExtensions(Extensions extensions)
-    {
-        this.extensions = extensions;
-    }
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/dvcs/DVCSErrorNotice.java b/bcprov/src/main/java/org/bouncycastle/asn1/dvcs/DVCSErrorNotice.java
deleted file mode 100644
index 8dd69a9..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/dvcs/DVCSErrorNotice.java
+++ /dev/null
@@ -1,96 +0,0 @@
-package org.bouncycastle.asn1.dvcs;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.ASN1TaggedObject;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.cmp.PKIStatusInfo;
-import org.bouncycastle.asn1.x509.GeneralName;
-
-/**
- * <pre>
- *     DVCSErrorNotice ::= SEQUENCE {
- *         transactionStatus           PKIStatusInfo ,
- *         transactionIdentifier       GeneralName OPTIONAL
- *     }
- * </pre>
- */
-public class DVCSErrorNotice
-    extends ASN1Object
-{
-    private PKIStatusInfo transactionStatus;
-    private GeneralName transactionIdentifier;
-
-    public DVCSErrorNotice(PKIStatusInfo status)
-    {
-        this(status, null);
-    }
-
-    public DVCSErrorNotice(PKIStatusInfo status, GeneralName transactionIdentifier)
-    {
-        this.transactionStatus = status;
-        this.transactionIdentifier = transactionIdentifier;
-    }
-
-    private DVCSErrorNotice(ASN1Sequence seq)
-    {
-        this.transactionStatus = PKIStatusInfo.getInstance(seq.getObjectAt(0));
-        if (seq.size() > 1)
-        {
-            this.transactionIdentifier = GeneralName.getInstance(seq.getObjectAt(1));
-        }
-    }
-
-    public static DVCSErrorNotice getInstance(Object obj)
-    {
-        if (obj instanceof DVCSErrorNotice)
-        {
-            return (DVCSErrorNotice)obj;
-        }
-        else if (obj != null)
-        {
-            return new DVCSErrorNotice(ASN1Sequence.getInstance(obj));
-        }
-
-        return null;
-    }
-
-    public static DVCSErrorNotice getInstance(
-        ASN1TaggedObject obj,
-        boolean explicit)
-    {
-        return getInstance(ASN1Sequence.getInstance(obj, explicit));
-    }
-
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector v = new ASN1EncodableVector();
-        v.add(transactionStatus);
-        if (transactionIdentifier != null)
-        {
-            v.add(transactionIdentifier);
-        }
-        return new DERSequence(v);
-    }
-
-    public String toString()
-    {
-        return "DVCSErrorNotice {\n" +
-            "transactionStatus: " + transactionStatus + "\n" +
-            (transactionIdentifier != null ? "transactionIdentifier: " + transactionIdentifier + "\n" : "") +
-            "}\n";
-    }
-
-
-    public PKIStatusInfo getTransactionStatus()
-    {
-        return transactionStatus;
-    }
-
-    public GeneralName getTransactionIdentifier()
-    {
-        return transactionIdentifier;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/dvcs/DVCSObjectIdentifiers.java b/bcprov/src/main/java/org/bouncycastle/asn1/dvcs/DVCSObjectIdentifiers.java
deleted file mode 100644
index d5f6ab6..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/dvcs/DVCSObjectIdentifiers.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package org.bouncycastle.asn1.dvcs;
-
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-
-/**
- * OIDs for <a href="http://tools.ietf.org/html/rfc3029">RFC 3029</a>
- * Data Validation and Certification Server Protocols
- */
-public interface DVCSObjectIdentifiers
-{
-    /** Base OID id-pkix: 1.3.6.1.5.5.7 */
-    static final ASN1ObjectIdentifier id_pkix  = new ASN1ObjectIdentifier("1.3.6.1.5.5.7");
-    /** Base OID id-smime: 1.2.840.113549.1.9.16 */
-    static final ASN1ObjectIdentifier id_smime = new ASN1ObjectIdentifier("1.2.840.113549.1.9.16");
-
-    /** Authority Information Access for DVCS; id-ad-dcvs;  OID: 1.3.6.1.5.5.7.48.4 */
-    static final ASN1ObjectIdentifier id_ad_dvcs = id_pkix.branch("48.4");
-
-    /** Key Purpose for DVCS; id-kp-dvcs; OID: 1.3.6.1.5.5.7.3.10 */
-    static final ASN1ObjectIdentifier id_kp_dvcs = id_pkix.branch("3.10");
-
-    /** SMIME eContentType id-ct-DVCSRequestData;   OID: 1.2.840.113549.1.9.16.1.7 */
-    static final ASN1ObjectIdentifier id_ct_DVCSRequestData  = id_smime.branch("1.7");
-    /** SMIME eContentType id-ct-DVCSResponseData;  OID: 1.2.840.113549.1.9.16.1.8 */
-    static final ASN1ObjectIdentifier id_ct_DVCSResponseData = id_smime.branch("1.8");
-
-    /** SMIME DataValidation certificate attribute id-aa-dvcs-dvc;  OID: 1.2.840.113549.1.9.16.2,29 */
-    static final ASN1ObjectIdentifier id_aa_dvcs_dvc = id_smime.branch("2.29");
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/dvcs/DVCSRequest.java b/bcprov/src/main/java/org/bouncycastle/asn1/dvcs/DVCSRequest.java
deleted file mode 100644
index b9506e7..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/dvcs/DVCSRequest.java
+++ /dev/null
@@ -1,107 +0,0 @@
-package org.bouncycastle.asn1.dvcs;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.ASN1TaggedObject;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.x509.GeneralName;
-
-/**
- * <pre>
- *     DVCSRequest ::= SEQUENCE  {
- *         requestInformation         DVCSRequestInformation,
- *         data                       Data,
- *         transactionIdentifier      GeneralName OPTIONAL
- *     }
- * </pre>
- */
-
-public class DVCSRequest
-    extends ASN1Object
-{
-
-    private DVCSRequestInformation requestInformation;
-    private Data data;
-    private GeneralName transactionIdentifier;
-
-    public DVCSRequest(DVCSRequestInformation requestInformation, Data data)
-    {
-        this(requestInformation, data, null);
-    }
-
-    public DVCSRequest(DVCSRequestInformation requestInformation, Data data, GeneralName transactionIdentifier)
-    {
-        this.requestInformation = requestInformation;
-        this.data = data;
-        this.transactionIdentifier = transactionIdentifier;
-    }
-
-    private DVCSRequest(ASN1Sequence seq)
-    {
-        requestInformation = DVCSRequestInformation.getInstance(seq.getObjectAt(0));
-        data = Data.getInstance(seq.getObjectAt(1));
-        if (seq.size() > 2)
-        {
-            transactionIdentifier = GeneralName.getInstance(seq.getObjectAt(2));
-        }
-    }
-
-    public static DVCSRequest getInstance(Object obj)
-    {
-        if (obj instanceof DVCSRequest)
-        {
-            return (DVCSRequest)obj;
-        }
-        else if (obj != null)
-        {
-            return new DVCSRequest(ASN1Sequence.getInstance(obj));
-        }
-
-        return null;
-    }
-
-    public static DVCSRequest getInstance(
-        ASN1TaggedObject obj,
-        boolean explicit)
-    {
-        return getInstance(ASN1Sequence.getInstance(obj, explicit));
-    }
-
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector v = new ASN1EncodableVector();
-        v.add(requestInformation);
-        v.add(data);
-        if (transactionIdentifier != null)
-        {
-            v.add(transactionIdentifier);
-        }
-        return new DERSequence(v);
-    }
-
-    public String toString()
-    {
-        return "DVCSRequest {\n" +
-            "requestInformation: " + requestInformation + "\n" +
-            "data: " + data + "\n" +
-            (transactionIdentifier != null ? "transactionIdentifier: " + transactionIdentifier + "\n" : "") +
-            "}\n";
-    }
-
-    public Data getData()
-    {
-        return data;
-    }
-
-    public DVCSRequestInformation getRequestInformation()
-    {
-        return requestInformation;
-    }
-
-    public GeneralName getTransactionIdentifier()
-    {
-        return transactionIdentifier;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/dvcs/DVCSRequestInformation.java b/bcprov/src/main/java/org/bouncycastle/asn1/dvcs/DVCSRequestInformation.java
deleted file mode 100644
index 8d28f93..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/dvcs/DVCSRequestInformation.java
+++ /dev/null
@@ -1,271 +0,0 @@
-package org.bouncycastle.asn1.dvcs;
-
-import java.math.BigInteger;
-
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1GeneralizedTime;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.ASN1TaggedObject;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.DERTaggedObject;
-import org.bouncycastle.asn1.x509.Extensions;
-import org.bouncycastle.asn1.x509.GeneralNames;
-import org.bouncycastle.asn1.x509.PolicyInformation;
-
-/**
- * <pre>
- *     DVCSRequestInformation ::= SEQUENCE  {
- *         version                      INTEGER DEFAULT 1 ,
- *         service                      ServiceType,
- *         nonce                        Nonce OPTIONAL,
- *         requestTime                  DVCSTime OPTIONAL,
- *         requester                    [0] GeneralNames OPTIONAL,
- *         requestPolicy                [1] PolicyInformation OPTIONAL,
- *         dvcs                         [2] GeneralNames OPTIONAL,
- *         dataLocations                [3] GeneralNames OPTIONAL,
- *         extensions                   [4] IMPLICIT Extensions OPTIONAL
- *     }
- * </pre>
- */
-
-public class DVCSRequestInformation
-    extends ASN1Object
-{
-    private int version = DEFAULT_VERSION;
-    private ServiceType service;
-    private BigInteger nonce;
-    private DVCSTime requestTime;
-    private GeneralNames requester;
-    private PolicyInformation requestPolicy;
-    private GeneralNames dvcs;
-    private GeneralNames dataLocations;
-    private Extensions extensions;
-
-    private static final int DEFAULT_VERSION = 1;
-    private static final int TAG_REQUESTER = 0;
-    private static final int TAG_REQUEST_POLICY = 1;
-    private static final int TAG_DVCS = 2;
-    private static final int TAG_DATA_LOCATIONS = 3;
-    private static final int TAG_EXTENSIONS = 4;
-
-    private DVCSRequestInformation(ASN1Sequence seq)
-    {
-        int i = 0;
-
-        if (seq.getObjectAt(0) instanceof ASN1Integer)
-        {
-            ASN1Integer encVersion = ASN1Integer.getInstance(seq.getObjectAt(i++));
-            this.version = encVersion.getValue().intValue();
-        }
-        else
-        {
-            this.version = 1;
-        }
-
-        this.service = ServiceType.getInstance(seq.getObjectAt(i++));
-
-        while (i < seq.size())
-        {
-            ASN1Encodable x = seq.getObjectAt(i);
-
-            if (x instanceof ASN1Integer)
-            {
-                this.nonce = ASN1Integer.getInstance(x).getValue();
-            }
-            else if (x instanceof ASN1GeneralizedTime)
-            {
-                this.requestTime = DVCSTime.getInstance(x);
-            }
-            else if (x instanceof ASN1TaggedObject)
-            {
-                ASN1TaggedObject t = ASN1TaggedObject.getInstance(x);
-                int tagNo = t.getTagNo();
-
-                switch (tagNo)
-                {
-                case TAG_REQUESTER:
-                    this.requester = GeneralNames.getInstance(t, false);
-                    break;
-                case TAG_REQUEST_POLICY:
-                    this.requestPolicy = PolicyInformation.getInstance(ASN1Sequence.getInstance(t, false));
-                    break;
-                case TAG_DVCS:
-                    this.dvcs = GeneralNames.getInstance(t, false);
-                    break;
-                case TAG_DATA_LOCATIONS:
-                    this.dataLocations = GeneralNames.getInstance(t, false);
-                    break;
-                case TAG_EXTENSIONS:
-                    this.extensions = Extensions.getInstance(t, false);
-                    break;
-                }
-            }
-            else
-            {
-                this.requestTime = DVCSTime.getInstance(x);
-            }
-
-            i++;
-        }
-    }
-
-    public static DVCSRequestInformation getInstance(Object obj)
-    {
-        if (obj instanceof DVCSRequestInformation)
-        {
-            return (DVCSRequestInformation)obj;
-        }
-        else if (obj != null)
-        {
-            return new DVCSRequestInformation(ASN1Sequence.getInstance(obj));
-        }
-
-        return null;
-    }
-
-    public static DVCSRequestInformation getInstance(
-        ASN1TaggedObject obj,
-        boolean explicit)
-    {
-        return getInstance(ASN1Sequence.getInstance(obj, explicit));
-    }
-
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector v = new ASN1EncodableVector();
-
-        if (version != DEFAULT_VERSION)
-        {
-            v.add(new ASN1Integer(version));
-        }
-        v.add(service);
-        if (nonce != null)
-        {
-            v.add(new ASN1Integer(nonce));
-        }
-        if (requestTime != null)
-        {
-            v.add(requestTime);
-        }
-
-        int[] tags = new int[]{
-            TAG_REQUESTER,
-            TAG_REQUEST_POLICY,
-            TAG_DVCS,
-            TAG_DATA_LOCATIONS,
-            TAG_EXTENSIONS
-        };
-        ASN1Encodable[] taggedObjects = new ASN1Encodable[]{
-            requester,
-            requestPolicy,
-            dvcs,
-            dataLocations,
-            extensions
-        };
-        for (int i = 0; i < tags.length; i++)
-        {
-            int tag = tags[i];
-            ASN1Encodable taggedObject = taggedObjects[i];
-            if (taggedObject != null)
-            {
-                v.add(new DERTaggedObject(false, tag, taggedObject));
-            }
-        }
-
-        return new DERSequence(v);
-    }
-
-    public String toString()
-    {
-
-        StringBuffer s = new StringBuffer();
-
-        s.append("DVCSRequestInformation {\n");
-
-        if (version != DEFAULT_VERSION)
-        {
-            s.append("version: " + version + "\n");
-        }
-        s.append("service: " + service + "\n");
-        if (nonce != null)
-        {
-            s.append("nonce: " + nonce + "\n");
-        }
-        if (requestTime != null)
-        {
-            s.append("requestTime: " + requestTime + "\n");
-        }
-        if (requester != null)
-        {
-            s.append("requester: " + requester + "\n");
-        }
-        if (requestPolicy != null)
-        {
-            s.append("requestPolicy: " + requestPolicy + "\n");
-        }
-        if (dvcs != null)
-        {
-            s.append("dvcs: " + dvcs + "\n");
-        }
-        if (dataLocations != null)
-        {
-            s.append("dataLocations: " + dataLocations + "\n");
-        }
-        if (extensions != null)
-        {
-            s.append("extensions: " + extensions + "\n");
-        }
-
-        s.append("}\n");
-        return s.toString();
-    }
-
-    public int getVersion()
-    {
-        return version;
-    }
-
-    public ServiceType getService()
-    {
-        return service;
-    }
-
-    public BigInteger getNonce()
-    {
-        return nonce;
-    }
-
-    public DVCSTime getRequestTime()
-    {
-        return requestTime;
-    }
-
-    public GeneralNames getRequester()
-    {
-        return requester;
-    }
-
-    public PolicyInformation getRequestPolicy()
-    {
-        return requestPolicy;
-    }
-
-    public GeneralNames getDVCS()
-    {
-        return dvcs;
-    }
-
-    public GeneralNames getDataLocations()
-    {
-        return dataLocations;
-    }
-
-    public Extensions getExtensions()
-    {
-        return extensions;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/dvcs/DVCSRequestInformationBuilder.java b/bcprov/src/main/java/org/bouncycastle/asn1/dvcs/DVCSRequestInformationBuilder.java
deleted file mode 100644
index 9b73c0a..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/dvcs/DVCSRequestInformationBuilder.java
+++ /dev/null
@@ -1,224 +0,0 @@
-package org.bouncycastle.asn1.dvcs;
-
-import java.math.BigInteger;
-
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.DERTaggedObject;
-import org.bouncycastle.asn1.x509.Extensions;
-import org.bouncycastle.asn1.x509.GeneralName;
-import org.bouncycastle.asn1.x509.GeneralNames;
-import org.bouncycastle.asn1.x509.PolicyInformation;
-import org.bouncycastle.util.BigIntegers;
-
-/**
- * <pre>
- *     DVCSRequestInformation ::= SEQUENCE  {
- *         version                      INTEGER DEFAULT 1 ,
- *         service                      ServiceType,
- *         nonce                        Nonce OPTIONAL,
- *         requestTime                  DVCSTime OPTIONAL,
- *         requester                    [0] GeneralNames OPTIONAL,
- *         requestPolicy                [1] PolicyInformation OPTIONAL,
- *         dvcs                         [2] GeneralNames OPTIONAL,
- *         dataLocations                [3] GeneralNames OPTIONAL,
- *         extensions                   [4] IMPLICIT Extensions OPTIONAL
- *     }
- * </pre>
- */
-public class DVCSRequestInformationBuilder
-{
-    private int version = DEFAULT_VERSION;
-
-    private final ServiceType service;
-    private DVCSRequestInformation initialInfo;
-
-    private BigInteger nonce;
-    private DVCSTime requestTime;
-    private GeneralNames requester;
-    private PolicyInformation requestPolicy;
-    private GeneralNames dvcs;
-    private GeneralNames dataLocations;
-    private Extensions extensions;
-
-    private static final int DEFAULT_VERSION = 1;
-    private static final int TAG_REQUESTER = 0;
-    private static final int TAG_REQUEST_POLICY = 1;
-    private static final int TAG_DVCS = 2;
-    private static final int TAG_DATA_LOCATIONS = 3;
-    private static final int TAG_EXTENSIONS = 4;
-
-    public DVCSRequestInformationBuilder(ServiceType service)
-    {
-        this.service = service;
-    }
-
-    public DVCSRequestInformationBuilder(DVCSRequestInformation initialInfo)
-    {
-        this.initialInfo = initialInfo;
-        this.service = initialInfo.getService();
-        this.version = initialInfo.getVersion();
-        this.nonce = initialInfo.getNonce();
-        this.requestTime = initialInfo.getRequestTime();
-        this.requestPolicy = initialInfo.getRequestPolicy();
-        this.dvcs = initialInfo.getDVCS();
-        this.dataLocations = initialInfo.getDataLocations();
-    }
-
-    public DVCSRequestInformation build()
-    {
-        ASN1EncodableVector v = new ASN1EncodableVector();
-
-        if (version != DEFAULT_VERSION)
-        {
-            v.add(new ASN1Integer(version));
-        }
-        v.add(service);
-        if (nonce != null)
-        {
-            v.add(new ASN1Integer(nonce));
-        }
-        if (requestTime != null)
-        {
-            v.add(requestTime);
-        }
-
-        int[] tags = new int[]{
-            TAG_REQUESTER,
-            TAG_REQUEST_POLICY,
-            TAG_DVCS,
-            TAG_DATA_LOCATIONS,
-            TAG_EXTENSIONS
-        };
-        ASN1Encodable[] taggedObjects = new ASN1Encodable[]{
-            requester,
-            requestPolicy,
-            dvcs,
-            dataLocations,
-            extensions
-        };
-        for (int i = 0; i < tags.length; i++)
-        {
-            int tag = tags[i];
-            ASN1Encodable taggedObject = taggedObjects[i];
-            if (taggedObject != null)
-            {
-                v.add(new DERTaggedObject(false, tag, taggedObject));
-            }
-        }
-
-        return DVCSRequestInformation.getInstance(new DERSequence(v));
-    }
-
-    public void setVersion(int version)
-    {
-        if (initialInfo != null)
-        {
-            throw new IllegalStateException("cannot change version in existing DVCSRequestInformation");
-        }
-
-        this.version = version;
-    }
-
-    public void setNonce(BigInteger nonce)
-    {
-        // RFC 3029, 9.1: The DVCS MAY modify the fields
-        // 'dvcs', 'requester', 'dataLocations', and 'nonce' of the ReqInfo structure
-
-        // RFC 3029, 9.1: The only modification
-        // allowed to a 'nonce' is the inclusion of a new field if it was not
-        // present, or to concatenate other data to the end (right) of an
-        // existing value.
-        if (initialInfo != null)
-        {
-            if (initialInfo.getNonce() == null)
-            {
-                this.nonce = nonce;
-            }
-            else
-            {
-                byte[] initialBytes = initialInfo.getNonce().toByteArray();
-                byte[] newBytes = BigIntegers.asUnsignedByteArray(nonce);
-                byte[] nonceBytes = new byte[initialBytes.length + newBytes.length];
-
-                System.arraycopy(initialBytes, 0, nonceBytes, 0, initialBytes.length);
-                System.arraycopy(newBytes, 0, nonceBytes, initialBytes.length, newBytes.length);
-
-                this.nonce = new BigInteger(nonceBytes);
-            }
-        }
-
-        this.nonce = nonce;
-    }
-
-    public void setRequestTime(DVCSTime requestTime)
-    {
-        if (initialInfo != null)
-        {
-            throw new IllegalStateException("cannot change request time in existing DVCSRequestInformation");
-        }
-
-        this.requestTime = requestTime;
-    }
-
-    public void setRequester(GeneralName requester)
-    {
-        this.setRequester(new GeneralNames(requester));
-    }
-
-    public void setRequester(GeneralNames requester)
-    {
-        // RFC 3029, 9.1: The DVCS MAY modify the fields
-        // 'dvcs', 'requester', 'dataLocations', and 'nonce' of the ReqInfo structure
-
-        this.requester = requester;
-    }
-
-    public void setRequestPolicy(PolicyInformation requestPolicy)
-    {
-        if (initialInfo != null)
-        {
-            throw new IllegalStateException("cannot change request policy in existing DVCSRequestInformation");
-        }
-
-        this.requestPolicy = requestPolicy;
-    }
-
-    public void setDVCS(GeneralName dvcs)
-    {
-        this.setDVCS(new GeneralNames(dvcs));
-    }
-
-    public void setDVCS(GeneralNames dvcs)
-    {
-        // RFC 3029, 9.1: The DVCS MAY modify the fields
-        // 'dvcs', 'requester', 'dataLocations', and 'nonce' of the ReqInfo structure
-
-        this.dvcs = dvcs;
-    }
-
-    public void setDataLocations(GeneralName dataLocation)
-    {
-        this.setDataLocations(new GeneralNames(dataLocation));
-    }
-
-    public void setDataLocations(GeneralNames dataLocations)
-    {
-        // RFC 3029, 9.1: The DVCS MAY modify the fields
-        // 'dvcs', 'requester', 'dataLocations', and 'nonce' of the ReqInfo structure
-
-        this.dataLocations = dataLocations;
-    }
-
-    public void setExtensions(Extensions extensions)
-    {
-        if (initialInfo != null)
-        {
-            throw new IllegalStateException("cannot change extensions in existing DVCSRequestInformation");
-        }
-
-        this.extensions = extensions;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/dvcs/DVCSResponse.java b/bcprov/src/main/java/org/bouncycastle/asn1/dvcs/DVCSResponse.java
deleted file mode 100644
index 3617e21..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/dvcs/DVCSResponse.java
+++ /dev/null
@@ -1,117 +0,0 @@
-package org.bouncycastle.asn1.dvcs;
-
-import java.io.IOException;
-
-import org.bouncycastle.asn1.ASN1Choice;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.ASN1TaggedObject;
-import org.bouncycastle.asn1.DERTaggedObject;
-
-/**
- * <pre>
- *     DVCSResponse ::= CHOICE
- *     {
- *         dvCertInfo         DVCSCertInfo ,
- *         dvErrorNote        [0] DVCSErrorNotice
- *     }
- * </pre>
- */
-
-public class DVCSResponse
-    extends ASN1Object
-    implements ASN1Choice
-{
-    private DVCSCertInfo dvCertInfo;
-    private DVCSErrorNotice dvErrorNote;
-
-    public DVCSResponse(DVCSCertInfo dvCertInfo)
-    {
-        this.dvCertInfo = dvCertInfo;
-    }
-
-    public DVCSResponse(DVCSErrorNotice dvErrorNote)
-    {
-        this.dvErrorNote = dvErrorNote;
-    }
-
-    public static DVCSResponse getInstance(Object obj)
-    {
-        if (obj == null || obj instanceof DVCSResponse)
-        {
-            return (DVCSResponse)obj;
-        }
-        else
-        {
-            if (obj instanceof byte[])
-            {
-                try
-                {
-                    return getInstance(ASN1Primitive.fromByteArray((byte[])obj));
-                }
-                catch (IOException e)
-                {
-                    throw new IllegalArgumentException("failed to construct sequence from byte[]: " + e.getMessage());
-                }
-            }
-            if (obj instanceof ASN1Sequence)
-            {
-                DVCSCertInfo dvCertInfo = DVCSCertInfo.getInstance(obj);
-
-                return new DVCSResponse(dvCertInfo);
-            }
-            if (obj instanceof ASN1TaggedObject)
-            {
-                ASN1TaggedObject t = ASN1TaggedObject.getInstance(obj);
-                DVCSErrorNotice dvErrorNote = DVCSErrorNotice.getInstance(t, false);
-
-                return new DVCSResponse(dvErrorNote);
-            }
-        }
-
-        throw new IllegalArgumentException("Couldn't convert from object to DVCSResponse: " + obj.getClass().getName());
-    }
-
-    public static DVCSResponse getInstance(
-        ASN1TaggedObject obj,
-        boolean explicit)
-    {
-        return getInstance(ASN1Sequence.getInstance(obj, explicit));
-    }
-
-    public DVCSCertInfo getCertInfo()
-    {
-        return dvCertInfo;
-    }
-
-    public DVCSErrorNotice getErrorNotice()
-    {
-        return dvErrorNote;
-    }
-
-    public ASN1Primitive toASN1Primitive()
-    {
-        if (dvCertInfo != null)
-        {
-            return dvCertInfo.toASN1Primitive();
-        }
-        else
-        {
-            return new DERTaggedObject(0, dvErrorNote);
-        }
-    }
-
-    public String toString()
-    {
-        if (dvCertInfo != null)
-        {
-            return "DVCSResponse {\ndvCertInfo: " + dvCertInfo.toString() + "}\n";
-        }
-        if (dvErrorNote != null)
-        {
-            return "DVCSResponse {\ndvErrorNote: " + dvErrorNote.toString() + "}\n";
-        }
-        return null;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/dvcs/DVCSTime.java b/bcprov/src/main/java/org/bouncycastle/asn1/dvcs/DVCSTime.java
deleted file mode 100644
index aeb3c2c..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/dvcs/DVCSTime.java
+++ /dev/null
@@ -1,111 +0,0 @@
-package org.bouncycastle.asn1.dvcs;
-
-import java.util.Date;
-
-import org.bouncycastle.asn1.ASN1Choice;
-import org.bouncycastle.asn1.ASN1GeneralizedTime;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1TaggedObject;
-import org.bouncycastle.asn1.cms.ContentInfo;
-
-/**
- * <pre>
- *     DVCSTime ::= CHOICE  {
- *         genTime                      GeneralizedTime,
- *         timeStampToken               ContentInfo
- *     }
- * </pre>
- */
-public class DVCSTime
-    extends ASN1Object
-    implements ASN1Choice
-{
-    private ASN1GeneralizedTime genTime;
-    private ContentInfo timeStampToken;
-    private Date time;
-
-    // constructors:
-
-    public DVCSTime(Date time)
-    {
-        this(new ASN1GeneralizedTime(time));
-    }
-
-    public DVCSTime(ASN1GeneralizedTime genTime)
-    {
-        this.genTime = genTime;
-    }
-
-    public DVCSTime(ContentInfo timeStampToken)
-    {
-        this.timeStampToken = timeStampToken;
-    }
-
-    public static DVCSTime getInstance(Object obj)
-    {
-        if (obj instanceof DVCSTime)
-        {
-            return (DVCSTime)obj;
-        }
-        else if (obj instanceof ASN1GeneralizedTime)
-        {
-            return new DVCSTime(ASN1GeneralizedTime.getInstance(obj));
-        }
-        else if (obj != null)
-        {
-            return new DVCSTime(ContentInfo.getInstance(obj));
-        }
-
-        return null;
-    }
-
-    public static DVCSTime getInstance(
-        ASN1TaggedObject obj,
-        boolean explicit)
-    {
-        return getInstance(obj.getObject()); // must be explicitly tagged
-    }
-
-
-    // selectors:
-
-    public ASN1GeneralizedTime getGenTime()
-    {
-        return genTime;
-    }
-
-    public ContentInfo getTimeStampToken()
-    {
-        return timeStampToken;
-    }
-
-    public ASN1Primitive toASN1Primitive()
-    {
-
-        if (genTime != null)
-        {
-            return genTime;
-        }
-
-        if (timeStampToken != null)
-        {
-            return timeStampToken.toASN1Primitive();
-        }
-
-        return null;
-    }
-
-    public String toString()
-    {
-        if (genTime != null)
-        {
-            return genTime.toString();
-        }
-        if (timeStampToken != null)
-        {
-            return timeStampToken.toString();
-        }
-        return null;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/dvcs/Data.java b/bcprov/src/main/java/org/bouncycastle/asn1/dvcs/Data.java
deleted file mode 100644
index 9c661f1..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/dvcs/Data.java
+++ /dev/null
@@ -1,149 +0,0 @@
-package org.bouncycastle.asn1.dvcs;
-
-import org.bouncycastle.asn1.ASN1Choice;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.ASN1TaggedObject;
-import org.bouncycastle.asn1.DEROctetString;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.DERTaggedObject;
-import org.bouncycastle.asn1.x509.DigestInfo;
-
-/**
- * <pre>
- * Data ::= CHOICE {
- *   message           OCTET STRING ,
- *   messageImprint    DigestInfo,
- *   certs             [0] SEQUENCE SIZE (1..MAX) OF
- *                         TargetEtcChain
- * }
- * </pre>
- */
-
-public class Data
-    extends ASN1Object
-    implements ASN1Choice
-{
-    private ASN1OctetString message;
-    private DigestInfo messageImprint;
-    private ASN1Sequence certs;
-
-    public Data(byte[] messageBytes)
-    {
-        this.message = new DEROctetString(messageBytes);
-    }
-
-    public Data(ASN1OctetString message)
-    {
-        this.message = message;
-    }
-
-    public Data(DigestInfo messageImprint)
-    {
-        this.messageImprint = messageImprint;
-    }
-
-    public Data(TargetEtcChain cert)
-    {
-        this.certs = new DERSequence(cert);
-    }
-
-    public Data(TargetEtcChain[] certs)
-    {
-        this.certs = new DERSequence(certs);
-    }
-
-    private Data(ASN1Sequence certs)
-    {
-        this.certs = certs;
-    }
-
-    public static Data getInstance(Object obj)
-    {
-        if (obj instanceof Data)
-        {
-            return (Data)obj;
-        }
-        else if (obj instanceof ASN1OctetString)
-        {
-            return new Data((ASN1OctetString)obj);
-        }
-        else if (obj instanceof ASN1Sequence)
-        {
-            return new Data(DigestInfo.getInstance(obj));
-        }
-        else if (obj instanceof ASN1TaggedObject)
-        {
-            return new Data(ASN1Sequence.getInstance((ASN1TaggedObject)obj, false));
-        }
-        throw new IllegalArgumentException("Unknown object submitted to getInstance: " + obj.getClass().getName());
-    }
-
-    public static Data getInstance(
-        ASN1TaggedObject obj,
-        boolean explicit)
-    {
-        return getInstance(obj.getObject());
-    }
-
-    public ASN1Primitive toASN1Primitive()
-    {
-        if (message != null)
-        {
-            return message.toASN1Primitive();
-        }
-        if (messageImprint != null)
-        {
-            return messageImprint.toASN1Primitive();
-        }
-        else
-        {
-            return new DERTaggedObject(false, 0, certs);
-        }
-    }
-
-    public String toString()
-    {
-        if (message != null)
-        {
-            return "Data {\n" + message + "}\n";
-        }
-        if (messageImprint != null)
-        {
-            return "Data {\n" + messageImprint + "}\n";
-        }
-        else
-        {
-            return "Data {\n" + certs + "}\n";
-        }
-    }
-
-    public ASN1OctetString getMessage()
-    {
-        return message;
-    }
-
-    public DigestInfo getMessageImprint()
-    {
-        return messageImprint;
-    }
-
-    public TargetEtcChain[] getCerts()
-    {
-        if (certs == null)
-        {
-            return null;
-        }
-
-        TargetEtcChain[] tmp = new TargetEtcChain[certs.size()];
-
-        for (int i = 0; i != tmp.length; i++)
-        {
-            tmp[i] = TargetEtcChain.getInstance(certs.getObjectAt(i));
-        }
-
-        return tmp;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/dvcs/PathProcInput.java b/bcprov/src/main/java/org/bouncycastle/asn1/dvcs/PathProcInput.java
deleted file mode 100644
index 3123f40..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/dvcs/PathProcInput.java
+++ /dev/null
@@ -1,180 +0,0 @@
-package org.bouncycastle.asn1.dvcs;
-
-import org.bouncycastle.asn1.ASN1Boolean;
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.ASN1TaggedObject;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.DERTaggedObject;
-import org.bouncycastle.asn1.x509.PolicyInformation;
-
-/**
- * <pre>
- *     PathProcInput ::= SEQUENCE {
- *         acceptablePolicySet          SEQUENCE SIZE (1..MAX) OF
- *                                         PolicyInformation,
- *         inhibitPolicyMapping         BOOLEAN DEFAULT FALSE,
- *         explicitPolicyReqd           [0] BOOLEAN DEFAULT FALSE ,
- *         inhibitAnyPolicy             [1] BOOLEAN DEFAULT FALSE
- *     }
- * </pre>
- */
-public class PathProcInput
-    extends ASN1Object
-{
-
-    private PolicyInformation[] acceptablePolicySet;
-    private boolean inhibitPolicyMapping = false;
-    private boolean explicitPolicyReqd = false;
-    private boolean inhibitAnyPolicy = false;
-
-    public PathProcInput(PolicyInformation[] acceptablePolicySet)
-    {
-        this.acceptablePolicySet = acceptablePolicySet;
-    }
-
-    public PathProcInput(PolicyInformation[] acceptablePolicySet, boolean inhibitPolicyMapping, boolean explicitPolicyReqd, boolean inhibitAnyPolicy)
-    {
-        this.acceptablePolicySet = acceptablePolicySet;
-        this.inhibitPolicyMapping = inhibitPolicyMapping;
-        this.explicitPolicyReqd = explicitPolicyReqd;
-        this.inhibitAnyPolicy = inhibitAnyPolicy;
-    }
-
-    private static PolicyInformation[] fromSequence(ASN1Sequence seq)
-    {
-        PolicyInformation[] tmp = new PolicyInformation[seq.size()];
-
-        for (int i = 0; i != tmp.length; i++)
-        {
-            tmp[i] = PolicyInformation.getInstance(seq.getObjectAt(i));
-        }
-
-        return tmp;
-    }
-
-    public static PathProcInput getInstance(Object obj)
-    {
-        if (obj instanceof PathProcInput)
-        {
-            return (PathProcInput)obj;
-        }
-        else if (obj != null)
-        {
-            ASN1Sequence seq = ASN1Sequence.getInstance(obj);
-            ASN1Sequence policies = ASN1Sequence.getInstance(seq.getObjectAt(0));
-            PathProcInput result = new PathProcInput(fromSequence(policies));
-
-            for (int i = 1; i < seq.size(); i++)
-            {
-                Object o = seq.getObjectAt(i);
-
-                if (o instanceof ASN1Boolean)
-                {
-                    ASN1Boolean x = ASN1Boolean.getInstance(o);
-                    result.setInhibitPolicyMapping(x.isTrue());
-                }
-                else if (o instanceof ASN1TaggedObject)
-                {
-                    ASN1TaggedObject t = ASN1TaggedObject.getInstance(o);
-                    ASN1Boolean x;
-                    switch (t.getTagNo())
-                    {
-                    case 0:
-                        x = ASN1Boolean.getInstance(t, false);
-                        result.setExplicitPolicyReqd(x.isTrue());
-                        break;
-                    case 1:
-                        x = ASN1Boolean.getInstance(t, false);
-                        result.setInhibitAnyPolicy(x.isTrue());
-                    }
-                }
-            }
-            return result;
-        }
-
-        return null;
-    }
-
-    public static PathProcInput getInstance(
-        ASN1TaggedObject obj,
-        boolean explicit)
-    {
-        return getInstance(ASN1Sequence.getInstance(obj, explicit));
-    }
-
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector v = new ASN1EncodableVector();
-        ASN1EncodableVector pV = new ASN1EncodableVector();
-
-        for (int i = 0; i != acceptablePolicySet.length; i++)
-        {
-            pV.add(acceptablePolicySet[i]);
-        }
-
-        v.add(new DERSequence(pV));
-
-        if (inhibitPolicyMapping)
-        {
-            v.add(new ASN1Boolean(inhibitPolicyMapping));
-        }
-        if (explicitPolicyReqd)
-        {
-            v.add(new DERTaggedObject(false, 0, new ASN1Boolean(explicitPolicyReqd)));
-        }
-        if (inhibitAnyPolicy)
-        {
-            v.add(new DERTaggedObject(false, 1, new ASN1Boolean(inhibitAnyPolicy)));
-        }
-
-        return new DERSequence(v);
-    }
-
-    public String toString()
-    {
-        return "PathProcInput: {\n" +
-            "acceptablePolicySet: " + acceptablePolicySet + "\n" +
-            "inhibitPolicyMapping: " + inhibitPolicyMapping + "\n" +
-            "explicitPolicyReqd: " + explicitPolicyReqd + "\n" +
-            "inhibitAnyPolicy: " + inhibitAnyPolicy + "\n" +
-            "}\n";
-    }
-
-    public PolicyInformation[] getAcceptablePolicySet()
-    {
-        return acceptablePolicySet;
-    }
-
-    public boolean isInhibitPolicyMapping()
-    {
-        return inhibitPolicyMapping;
-    }
-
-    private void setInhibitPolicyMapping(boolean inhibitPolicyMapping)
-    {
-        this.inhibitPolicyMapping = inhibitPolicyMapping;
-    }
-
-    public boolean isExplicitPolicyReqd()
-    {
-        return explicitPolicyReqd;
-    }
-
-    private void setExplicitPolicyReqd(boolean explicitPolicyReqd)
-    {
-        this.explicitPolicyReqd = explicitPolicyReqd;
-    }
-
-    public boolean isInhibitAnyPolicy()
-    {
-        return inhibitAnyPolicy;
-    }
-
-    private void setInhibitAnyPolicy(boolean inhibitAnyPolicy)
-    {
-        this.inhibitAnyPolicy = inhibitAnyPolicy;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/dvcs/ServiceType.java b/bcprov/src/main/java/org/bouncycastle/asn1/dvcs/ServiceType.java
deleted file mode 100644
index d6ee94f..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/dvcs/ServiceType.java
+++ /dev/null
@@ -1,92 +0,0 @@
-package org.bouncycastle.asn1.dvcs;
-
-import java.math.BigInteger;
-
-import org.bouncycastle.asn1.ASN1Enumerated;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1TaggedObject;
-
-
-/**
- * ServiceType ::= ENUMERATED { cpd(1), vsd(2), cpkc(3), ccpd(4) }
- */
-
-public class ServiceType
-    extends ASN1Object
-{
-    /**
-     * Identifier of CPD service (Certify Possession of Data).
-     */
-    public static final ServiceType CPD = new ServiceType(1);
-
-    /**
-     * Identifier of VSD service (Verify Signed Document).
-     */
-    public static final ServiceType VSD = new ServiceType(2);
-
-    /**
-     * Identifier of VPKC service (Verify Public Key Certificates (also referred to as CPKC)).
-     */
-    public static final ServiceType VPKC = new ServiceType(3);
-
-    /**
-     * Identifier of CCPD service (Certify Claim of Possession of Data).
-     */
-    public static final ServiceType CCPD = new ServiceType(4);
-
-    private ASN1Enumerated value;
-
-    public ServiceType(int value)
-    {
-        this.value = new ASN1Enumerated(value);
-    }
-
-    private ServiceType(ASN1Enumerated value)
-    {
-        this.value = value;
-    }
-
-    public static ServiceType getInstance(Object obj)
-    {
-        if (obj instanceof ServiceType)
-        {
-            return (ServiceType)obj;
-        }
-        else if (obj != null)
-        {
-            return new ServiceType(ASN1Enumerated.getInstance(obj));
-        }
-
-        return null;
-    }
-
-    public static ServiceType getInstance(
-        ASN1TaggedObject obj,
-        boolean explicit)
-    {
-        return getInstance(ASN1Enumerated.getInstance(obj, explicit));
-    }
-
-    public BigInteger getValue()
-    {
-        return value.getValue();
-    }
-
-    public ASN1Primitive toASN1Primitive()
-    {
-        return value;
-    }
-
-    public String toString()
-    {
-        int num = value.getValue().intValue();
-        return "" + num + (
-            num == CPD.getValue().intValue() ? "(CPD)" :
-                num == VSD.getValue().intValue() ? "(VSD)" :
-                    num == VPKC.getValue().intValue() ? "(VPKC)" :
-                        num == CCPD.getValue().intValue() ? "(CCPD)" :
-                            "?");
-    }
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/dvcs/TargetEtcChain.java b/bcprov/src/main/java/org/bouncycastle/asn1/dvcs/TargetEtcChain.java
deleted file mode 100644
index ec3caad..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/dvcs/TargetEtcChain.java
+++ /dev/null
@@ -1,191 +0,0 @@
-package org.bouncycastle.asn1.dvcs;
-
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.ASN1TaggedObject;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.DERTaggedObject;
-
-/**
- * <pre>
- *     TargetEtcChain ::= SEQUENCE {
- *         target                       CertEtcToken,
- *         chain                        SEQUENCE SIZE (1..MAX) OF
- *                                         CertEtcToken OPTIONAL,
- *         pathProcInput                [0] PathProcInput OPTIONAL
- *     }
- * </pre>
- */
-
-public class TargetEtcChain
-    extends ASN1Object
-{
-    private CertEtcToken target;
-    private ASN1Sequence chain;
-    private PathProcInput pathProcInput;
-
-    public TargetEtcChain(CertEtcToken target)
-    {
-        this(target, null, null);
-    }
-
-    public TargetEtcChain(CertEtcToken target, CertEtcToken[] chain)
-    {
-        this(target, chain, null);
-    }
-
-    public TargetEtcChain(CertEtcToken target, PathProcInput pathProcInput)
-    {
-        this(target, null, pathProcInput);
-    }
-
-    public TargetEtcChain(CertEtcToken target, CertEtcToken[] chain, PathProcInput pathProcInput)
-    {
-        this.target = target;
-
-        if (chain != null)
-        {
-            this.chain = new DERSequence(chain);
-        }
-
-        this.pathProcInput = pathProcInput;
-    }
-
-    private TargetEtcChain(ASN1Sequence seq)
-    {
-        int i = 0;
-        ASN1Encodable obj = seq.getObjectAt(i++);
-        this.target = CertEtcToken.getInstance(obj);
-
-        try
-        {
-            obj = seq.getObjectAt(i++);
-            this.chain = ASN1Sequence.getInstance(obj);
-        }
-        catch (IllegalArgumentException e)
-        {
-        }
-        catch (IndexOutOfBoundsException e)
-        {
-            return;
-        }
-
-        try
-        {
-            obj = seq.getObjectAt(i++);
-            ASN1TaggedObject tagged = ASN1TaggedObject.getInstance(obj);
-            switch (tagged.getTagNo())
-            {
-            case 0:
-                this.pathProcInput = PathProcInput.getInstance(tagged, false);
-                break;
-            }
-        }
-        catch (IllegalArgumentException e)
-        {
-        }
-        catch (IndexOutOfBoundsException e)
-        {
-        }
-    }
-
-    public static TargetEtcChain getInstance(Object obj)
-    {
-        if (obj instanceof TargetEtcChain)
-        {
-            return (TargetEtcChain)obj;
-        }
-        else if (obj != null)
-        {
-            return new TargetEtcChain(ASN1Sequence.getInstance(obj));
-        }
-
-        return null;
-    }
-
-    public static TargetEtcChain getInstance(
-        ASN1TaggedObject obj,
-        boolean explicit)
-    {
-        return getInstance(ASN1Sequence.getInstance(obj, explicit));
-    }
-
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector v = new ASN1EncodableVector();
-        v.add(target);
-        if (chain != null)
-        {
-            v.add(chain);
-        }
-        if (pathProcInput != null)
-        {
-            v.add(new DERTaggedObject(false, 0, pathProcInput));
-        }
-
-        return new DERSequence(v);
-    }
-
-    public String toString()
-    {
-        StringBuffer s = new StringBuffer();
-        s.append("TargetEtcChain {\n");
-        s.append("target: " + target + "\n");
-        if (chain != null)
-        {
-            s.append("chain: " + chain + "\n");
-        }
-        if (pathProcInput != null)
-        {
-            s.append("pathProcInput: " + pathProcInput + "\n");
-        }
-        s.append("}\n");
-        return s.toString();
-    }
-
-
-    public CertEtcToken getTarget()
-    {
-        return target;
-    }
-
-    public CertEtcToken[] getChain()
-    {
-        if (chain != null)
-        {
-            return CertEtcToken.arrayFromSequence(chain);
-        }
-
-        return null;
-    }
-
-    private void setChain(ASN1Sequence chain)
-    {
-        this.chain = chain;
-    }
-
-    public PathProcInput getPathProcInput()
-    {
-        return pathProcInput;
-    }
-
-    private void setPathProcInput(PathProcInput pathProcInput)
-    {
-        this.pathProcInput = pathProcInput;
-    }
-
-    public static TargetEtcChain[] arrayFromSequence(ASN1Sequence seq)
-    {
-        TargetEtcChain[] tmp = new TargetEtcChain[seq.size()];
-
-        for (int i = 0; i != tmp.length; i++)
-        {
-            tmp[i] = TargetEtcChain.getInstance(seq.getObjectAt(i));
-        }
-
-        return tmp;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/dvcs/package.html b/bcprov/src/main/java/org/bouncycastle/asn1/dvcs/package.html
deleted file mode 100644
index a941922..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/dvcs/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body bgcolor="#ffffff">
-Support classes useful for encoding and processing Data Validation and Certification Server (DVCS) protocols as described in RFC 3029.
-</body>
-</html>
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/eac/BidirectionalMap.java b/bcprov/src/main/java/org/bouncycastle/asn1/eac/BidirectionalMap.java
deleted file mode 100644
index 3cf1450..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/eac/BidirectionalMap.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package org.bouncycastle.asn1.eac;
-
-import java.util.Hashtable;
-
-public class BidirectionalMap
-    extends Hashtable
-{
-    private static final long serialVersionUID = -7457289971962812909L;
-
-    Hashtable reverseMap = new Hashtable();
-
-    public Object getReverse(Object o)
-    {
-        return reverseMap.get(o);
-    }
-
-    public Object put(Object key, Object o)
-    {
-        reverseMap.put(o, key);
-        return super.put(key, o);
-    }
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/eac/CVCertificate.java b/bcprov/src/main/java/org/bouncycastle/asn1/eac/CVCertificate.java
deleted file mode 100644
index 7bbd7f1..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/eac/CVCertificate.java
+++ /dev/null
@@ -1,313 +0,0 @@
-package org.bouncycastle.asn1.eac;
-
-
-import java.io.IOException;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1ParsingException;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.DERApplicationSpecific;
-import org.bouncycastle.asn1.DEROctetString;
-
-
-/**
- * an iso7816Certificate structure.
- * <pre>
- *  Certificate ::= SEQUENCE {
- *      CertificateBody         Iso7816CertificateBody,
- *      signature               DER Application specific
- *  }
- * </pre>
- */
-public class CVCertificate
-    extends ASN1Object
-{
-    private CertificateBody certificateBody;
-    private byte[] signature;
-    private int valid;
-    private static int bodyValid = 0x01;
-    private static int signValid = 0x02;
-    public static final byte version_1 = 0x0;
-
-    public static String ReferenceEncoding = "ISO-8859-1";
-
-    /**
-     * Sets the values of the certificate (body and signature).
-     *
-     * @param appSpe is a DERApplicationSpecific object containing body and signature.
-     * @throws IOException if tags or value are incorrect.
-     */
-    private void setPrivateData(DERApplicationSpecific appSpe)
-        throws IOException
-    {
-        valid = 0;
-        if (appSpe.getApplicationTag() == EACTags.CARDHOLDER_CERTIFICATE)
-        {
-            ASN1InputStream content = new ASN1InputStream(appSpe.getContents());
-            ASN1Primitive tmpObj;
-            while ((tmpObj = content.readObject()) != null)
-            {
-                DERApplicationSpecific aSpe;
-                if (tmpObj instanceof DERApplicationSpecific)
-                {
-                    aSpe = (DERApplicationSpecific)tmpObj;
-                    switch (aSpe.getApplicationTag())
-                    {
-                    case EACTags.CERTIFICATE_CONTENT_TEMPLATE:
-                        certificateBody = CertificateBody.getInstance(aSpe);
-                        valid |= bodyValid;
-                        break;
-                    case EACTags.STATIC_INTERNAL_AUTHENTIFICATION_ONE_STEP:
-                        signature = aSpe.getContents();
-                        valid |= signValid;
-                        break;
-                    default:
-                        throw new IOException("Invalid tag, not an Iso7816CertificateStructure :" + aSpe.getApplicationTag());
-                    }
-                }
-                else
-                {
-                    throw new IOException("Invalid Object, not an Iso7816CertificateStructure");
-                }
-            }
-        }
-        else
-        {
-            throw new IOException("not a CARDHOLDER_CERTIFICATE :" + appSpe.getApplicationTag());
-        }
-    }
-
-    /**
-     * Create an iso7816Certificate structure from an ASN1InputStream.
-     *
-     * @param aIS the byte stream to parse.
-     * @throws IOException if there is a problem parsing the data.
-     */
-    public CVCertificate(ASN1InputStream aIS)
-        throws IOException
-    {
-        initFrom(aIS);
-    }
-
-    private void initFrom(ASN1InputStream aIS)
-        throws IOException
-    {
-        ASN1Primitive obj;
-        while ((obj = aIS.readObject()) != null)
-        {
-            if (obj instanceof DERApplicationSpecific)
-            {
-                setPrivateData((DERApplicationSpecific)obj);
-            }
-            else
-            {
-                throw new IOException("Invalid Input Stream for creating an Iso7816CertificateStructure");
-            }
-        }
-    }
-
-    /**
-     * Create an iso7816Certificate structure from a DERApplicationSpecific.
-     *
-     * @param appSpe the DERApplicationSpecific object.
-     * @return the Iso7816CertificateStructure represented by the DERApplicationSpecific object.
-     * @throws IOException if there is a problem parsing the data.
-     */
-    private CVCertificate(DERApplicationSpecific appSpe)
-        throws IOException
-    {
-        setPrivateData(appSpe);
-    }
-
-    /**
-     * Create an iso7816Certificate structure from a body and its signature.
-     *
-     * @param body the Iso7816CertificateBody object containing the body.
-     * @param signature   the byte array containing the signature
-     * @throws IOException if there is a problem parsing the data.
-     */
-    public CVCertificate(CertificateBody body, byte[] signature)
-        throws IOException
-    {
-        certificateBody = body;
-        this.signature = signature;
-        // patch remi
-        valid |= bodyValid;
-        valid |= signValid;
-    }
-
-    /**
-     * Create an iso7816Certificate structure from an object.
-     *
-     * @param obj the Object to extract the certificate from.
-     * @return the Iso7816CertificateStructure represented by the byte stream.
-     */
-    public static CVCertificate getInstance(Object obj)
-    {
-        if (obj instanceof CVCertificate)
-        {
-            return (CVCertificate)obj;
-        }
-        else if (obj != null)
-        {
-            try
-            {
-                return new CVCertificate(DERApplicationSpecific.getInstance(obj));
-            }
-            catch (IOException e)
-            {
-                throw new ASN1ParsingException("unable to parse data: " + e.getMessage(), e);
-            }
-        }
-
-        return null;
-    }
-
-    /**
-     * Gives the signature of the whole body. Type of signature is given in
-     * the Iso7816CertificateBody.Iso7816PublicKey.ASN1ObjectIdentifier
-     *
-     * @return the signature of the body.
-     */
-    public byte[] getSignature()
-    {
-        return signature;
-    }
-
-    /**
-     * Gives the body of the certificate.
-     *
-     * @return the body.
-     */
-    public CertificateBody getBody()
-    {
-        return certificateBody;
-    }
-
-    /**
-     * @see org.bouncycastle.asn1.ASN1Object#toASN1Primitive()
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector v = new ASN1EncodableVector();
-
-        if (valid != (signValid | bodyValid))
-        {
-            return null;
-        }
-        v.add(certificateBody);
-
-        try
-        {
-            v.add(new DERApplicationSpecific(false, EACTags.STATIC_INTERNAL_AUTHENTIFICATION_ONE_STEP, new DEROctetString(signature)));
-        }
-        catch (IOException e)
-        {
-            throw new IllegalStateException("unable to convert signature!");
-        }
-
-        return new DERApplicationSpecific(EACTags.CARDHOLDER_CERTIFICATE, v);
-    }
-
-    /**
-     * @return the Holder authorization and role (CVCA, DV, IS).
-     */
-    public ASN1ObjectIdentifier getHolderAuthorization()
-        throws IOException
-    {
-        CertificateHolderAuthorization cha = certificateBody.getCertificateHolderAuthorization();
-        return cha.getOid();
-    }
-
-    /**
-     * @return the date of the certificate generation
-     */
-    public PackedDate getEffectiveDate()
-        throws IOException
-    {
-        return certificateBody.getCertificateEffectiveDate();
-    }
-
-
-    /**
-     * @return the type of certificate (request or profile)
-     *         value is either Iso7816CertificateBody.profileType
-     *         or Iso7816CertificateBody.requestType. Any other value
-     *         is not valid.
-     */
-    public int getCertificateType()
-    {
-        return this.certificateBody.getCertificateType();
-    }
-
-    /**
-     * @return the date of the certificate generation
-     */
-    public PackedDate getExpirationDate()
-        throws IOException
-    {
-        return certificateBody.getCertificateExpirationDate();
-    }
-
-
-    /**
-     * return a bits field coded on one byte. For signification of the
-     * several bit see Iso7816CertificateHolderAuthorization
-     *
-     * @return role and access rigth
-     * @throws IOException
-     * @see CertificateHolderAuthorization
-     */
-    public int getRole()
-        throws IOException
-    {
-        CertificateHolderAuthorization cha = certificateBody.getCertificateHolderAuthorization();
-        return cha.getAccessRights();
-    }
-
-    /**
-     * @return the Authority Reference field of the certificate
-     * @throws IOException
-     */
-    public CertificationAuthorityReference getAuthorityReference()
-        throws IOException
-    {
-        return certificateBody.getCertificationAuthorityReference();
-    }
-
-    /**
-     * @return the Holder Reference Field of the certificate
-     * @throws IOException
-     */
-    public CertificateHolderReference getHolderReference()
-        throws IOException
-    {
-        return certificateBody.getCertificateHolderReference();
-    }
-
-    /**
-     * @return the bits corresponding to the role intented for the certificate
-     *         See Iso7816CertificateHolderAuthorization static int for values
-     * @throws IOException
-     */
-    public int getHolderAuthorizationRole()
-        throws IOException
-    {
-        int rights = certificateBody.getCertificateHolderAuthorization().getAccessRights();
-        return rights & 0xC0;
-    }
-
-    /**
-     * @return the bits corresponding the authorizations contained in the certificate
-     *         See Iso7816CertificateHolderAuthorization static int for values
-     * @throws IOException
-     */
-    public Flags getHolderAuthorizationRights()
-        throws IOException
-    {
-        return new Flags(certificateBody.getCertificateHolderAuthorization().getAccessRights() & 0x1F);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/eac/CVCertificateRequest.java b/bcprov/src/main/java/org/bouncycastle/asn1/eac/CVCertificateRequest.java
deleted file mode 100644
index dcbc8f1..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/eac/CVCertificateRequest.java
+++ /dev/null
@@ -1,170 +0,0 @@
-package org.bouncycastle.asn1.eac;
-
-import java.io.IOException;
-import java.util.Enumeration;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1ParsingException;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.BERTags;
-import org.bouncycastle.asn1.DERApplicationSpecific;
-import org.bouncycastle.asn1.DEROctetString;
-
-//import java.math.BigInteger;
-
-
-public class CVCertificateRequest
-    extends ASN1Object
-{
-    private CertificateBody certificateBody;
-
-    private byte[] innerSignature = null;
-    private byte[] outerSignature = null;
-
-    private int valid;
-
-    private static int bodyValid = 0x01;
-    private static int signValid = 0x02;
-
-    private CVCertificateRequest(DERApplicationSpecific request)
-        throws IOException
-    {
-        if (request.getApplicationTag() == EACTags.AUTHENTIFICATION_DATA)
-        {
-            ASN1Sequence seq = ASN1Sequence.getInstance(request.getObject(BERTags.SEQUENCE));
-
-            initCertBody(DERApplicationSpecific.getInstance(seq.getObjectAt(0)));
-
-            outerSignature = DERApplicationSpecific.getInstance(seq.getObjectAt(seq.size() - 1)).getContents();
-        }
-        else
-        {
-            initCertBody(request);
-        }
-    }
-
-    private void initCertBody(DERApplicationSpecific request)
-        throws IOException
-    {
-        if (request.getApplicationTag() == EACTags.CARDHOLDER_CERTIFICATE)
-        {
-            ASN1Sequence seq = ASN1Sequence.getInstance(request.getObject(BERTags.SEQUENCE));
-            for (Enumeration en = seq.getObjects(); en.hasMoreElements();)
-            {
-                DERApplicationSpecific obj = DERApplicationSpecific.getInstance(en.nextElement());
-                switch (obj.getApplicationTag())
-                {
-                case EACTags.CERTIFICATE_CONTENT_TEMPLATE:
-                    certificateBody = CertificateBody.getInstance(obj);
-                    valid |= bodyValid;
-                    break;
-                case EACTags.STATIC_INTERNAL_AUTHENTIFICATION_ONE_STEP:
-                    innerSignature = obj.getContents();
-                    valid |= signValid;
-                    break;
-                default:
-                    throw new IOException("Invalid tag, not an CV Certificate Request element:" + obj.getApplicationTag());
-                }
-            }
-        }
-        else
-        {
-            throw new IOException("not a CARDHOLDER_CERTIFICATE in request:" + request.getApplicationTag());
-        }
-    }
-
-    public static CVCertificateRequest getInstance(Object obj)
-    {
-        if (obj instanceof CVCertificateRequest)
-        {
-            return (CVCertificateRequest)obj;
-        }
-        else if (obj != null)
-        {
-            try
-            {
-                return new CVCertificateRequest(DERApplicationSpecific.getInstance(obj));
-            }
-            catch (IOException e)
-            {
-                throw new ASN1ParsingException("unable to parse data: " + e.getMessage(), e);
-            }
-        }
-
-        return null;
-    }
-
-    ASN1ObjectIdentifier signOid = null;
-    ASN1ObjectIdentifier keyOid = null;
-
-    public static byte[] ZeroArray = new byte[]{0};
-
-
-    String strCertificateHolderReference;
-
-    byte[] encodedAuthorityReference;
-
-    int ProfileId;
-
-    /**
-     * Returns the body of the certificate template
-     *
-     * @return the body.
-     */
-    public CertificateBody getCertificateBody()
-    {
-        return certificateBody;
-    }
-
-    /**
-     * Return the public key data object carried in the request
-     * @return  the public key
-     */
-    public PublicKeyDataObject getPublicKey()
-    {
-        return certificateBody.getPublicKey();
-    }
-
-    public byte[] getInnerSignature()
-    {
-        return innerSignature;
-    }
-
-    public byte[] getOuterSignature()
-    {
-        return outerSignature;
-    }
-
-    byte[] certificate = null;
-    protected String overSignerReference = null;
-
-    public boolean hasOuterSignature()
-    {
-        return outerSignature != null;
-    }
-
-    byte[] encoded;
-
-    PublicKeyDataObject iso7816PubKey = null;
-
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector v = new ASN1EncodableVector();
-
-        v.add(certificateBody);
-
-        try
-        {
-            v.add(new DERApplicationSpecific(false, EACTags.STATIC_INTERNAL_AUTHENTIFICATION_ONE_STEP, new DEROctetString(innerSignature)));
-        }
-        catch (IOException e)
-        {
-            throw new IllegalStateException("unable to convert signature!");
-        }
-
-        return new DERApplicationSpecific(EACTags.CARDHOLDER_CERTIFICATE, v);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/eac/CertificateBody.java b/bcprov/src/main/java/org/bouncycastle/asn1/eac/CertificateBody.java
deleted file mode 100644
index 04c4d70..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/eac/CertificateBody.java
+++ /dev/null
@@ -1,472 +0,0 @@
-package org.bouncycastle.asn1.eac;
-
-import java.io.IOException;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.BERTags;
-import org.bouncycastle.asn1.DERApplicationSpecific;
-import org.bouncycastle.asn1.DEROctetString;
-
-
-/**
- * an Iso7816CertificateBody structure.
- * <pre>
- *  CertificateBody ::= SEQUENCE {
- *      // version of the certificate format. Must be 0 (version 1)
- *      CertificateProfileIdentifer         DERApplicationSpecific,
- *      //uniquely identifies the issuinng CA's signature key pair
- *      // contains the iso3166-1 alpha2 encoded country code, the
- *      // name of issuer and the sequence number of the key pair.
- *      CertificationAuthorityReference        DERApplicationSpecific,
- *      // stores the encoded public key
- *      PublicKey                            Iso7816PublicKey,
- *      //associates the public key contained in the certificate with a unique name
- *      // contains the iso3166-1 alpha2 encoded country code, the
- *      // name of the holder and the sequence number of the key pair.
- *      certificateHolderReference            DERApplicationSpecific,
- *      // Encodes the role of the holder (i.e. CVCA, DV, IS) and assigns read/write
- *      // access rights to data groups storing sensitive data
- *      certificateHolderAuthorization        Iso7816CertificateHolderAuthorization,
- *      // the date of the certificate generation
- *      CertificateEffectiveDate            DERApplicationSpecific,
- *      // the date after wich the certificate expires
- *      certificateExpirationDate            DERApplicationSpecific
- *  }
- * </pre>
- */
-public class CertificateBody
-    extends ASN1Object
-{
-    ASN1InputStream seq;
-    private DERApplicationSpecific certificateProfileIdentifier;// version of the certificate format. Must be 0 (version 1)
-    private DERApplicationSpecific certificationAuthorityReference;//uniquely identifies the issuinng CA's signature key pair
-    private PublicKeyDataObject publicKey;// stores the encoded public key
-    private DERApplicationSpecific certificateHolderReference;//associates the public key contained in the certificate with a unique name
-    private CertificateHolderAuthorization certificateHolderAuthorization;// Encodes the role of the holder (i.e. CVCA, DV, IS) and assigns read/write access rights to data groups storing sensitive data
-    private DERApplicationSpecific certificateEffectiveDate;// the date of the certificate generation
-    private DERApplicationSpecific certificateExpirationDate;// the date after wich the certificate expires
-    private int certificateType = 0;// bit field of initialized data. This will tell us if the data are valid.
-    private static final int CPI = 0x01;//certificate Profile Identifier
-    private static final int CAR = 0x02;//certification Authority Reference
-    private static final int PK = 0x04;//public Key
-    private static final int CHR = 0x08;//certificate Holder Reference
-    private static final int CHA = 0x10;//certificate Holder Authorization
-    private static final int CEfD = 0x20;//certificate Effective Date
-    private static final int CExD = 0x40;//certificate Expiration Date
-
-    public static final int profileType = 0x7f;//Profile type Certificate
-    public static final int requestType = 0x0D;// Request type Certificate
-
-    private void setIso7816CertificateBody(DERApplicationSpecific appSpe)
-        throws IOException
-    {
-        byte[] content;
-        if (appSpe.getApplicationTag() == EACTags.CERTIFICATE_CONTENT_TEMPLATE)
-        {
-            content = appSpe.getContents();
-        }
-        else
-        {
-            throw new IOException("Bad tag : not an iso7816 CERTIFICATE_CONTENT_TEMPLATE");
-        }
-        ASN1InputStream aIS = new ASN1InputStream(content);
-        ASN1Primitive obj;
-        while ((obj = aIS.readObject()) != null)
-        {
-            DERApplicationSpecific aSpe;
-
-            if (obj instanceof DERApplicationSpecific)
-            {
-                aSpe = (DERApplicationSpecific)obj;
-            }
-            else
-            {
-                throw new IOException("Not a valid iso7816 content : not a DERApplicationSpecific Object :" + EACTags.encodeTag(appSpe) + obj.getClass());
-            }
-            switch (aSpe.getApplicationTag())
-            {
-            case EACTags.INTERCHANGE_PROFILE:
-                setCertificateProfileIdentifier(aSpe);
-                break;
-            case EACTags.ISSUER_IDENTIFICATION_NUMBER:
-                setCertificationAuthorityReference(aSpe);
-                break;
-            case EACTags.CARDHOLDER_PUBLIC_KEY_TEMPLATE:
-                setPublicKey(PublicKeyDataObject.getInstance(aSpe.getObject(BERTags.SEQUENCE)));
-                break;
-            case EACTags.CARDHOLDER_NAME:
-                setCertificateHolderReference(aSpe);
-                break;
-            case EACTags.CERTIFICATE_HOLDER_AUTHORIZATION_TEMPLATE:
-                setCertificateHolderAuthorization(new CertificateHolderAuthorization(aSpe));
-                break;
-            case EACTags.APPLICATION_EFFECTIVE_DATE:
-                setCertificateEffectiveDate(aSpe);
-                break;
-            case EACTags.APPLICATION_EXPIRATION_DATE:
-                setCertificateExpirationDate(aSpe);
-                break;
-            default:
-                certificateType = 0;
-                throw new IOException("Not a valid iso7816 DERApplicationSpecific tag " + aSpe.getApplicationTag());
-            }
-        }
-    }
-
-    /**
-     * builds an Iso7816CertificateBody by settings each parameters.
-     *
-     * @param certificateProfileIdentifier
-     * @param certificationAuthorityReference
-     *
-     * @param publicKey
-     * @param certificateHolderReference
-     * @param certificateHolderAuthorization
-     * @param certificateEffectiveDate
-     * @param certificateExpirationDate
-     */
-    public CertificateBody(
-        DERApplicationSpecific certificateProfileIdentifier,
-        CertificationAuthorityReference certificationAuthorityReference,
-        PublicKeyDataObject publicKey,
-        CertificateHolderReference certificateHolderReference,
-        CertificateHolderAuthorization certificateHolderAuthorization,
-        PackedDate certificateEffectiveDate,
-        PackedDate certificateExpirationDate
-    )
-    {
-        setCertificateProfileIdentifier(certificateProfileIdentifier);
-        setCertificationAuthorityReference(new DERApplicationSpecific(
-            EACTags.ISSUER_IDENTIFICATION_NUMBER, certificationAuthorityReference.getEncoded()));
-        setPublicKey(publicKey);
-        setCertificateHolderReference(new DERApplicationSpecific(
-            EACTags.CARDHOLDER_NAME, certificateHolderReference.getEncoded()));
-        setCertificateHolderAuthorization(certificateHolderAuthorization);
-        try
-        {
-            setCertificateEffectiveDate(new DERApplicationSpecific(
-                false, EACTags.APPLICATION_EFFECTIVE_DATE, new DEROctetString(certificateEffectiveDate.getEncoding())));
-            setCertificateExpirationDate(new DERApplicationSpecific(
-                false, EACTags.APPLICATION_EXPIRATION_DATE, new DEROctetString(certificateExpirationDate.getEncoding())));
-        }
-        catch (IOException e)
-        {
-            throw new IllegalArgumentException("unable to encode dates: " + e.getMessage());
-        }
-    }
-
-    /**
-     * builds an Iso7816CertificateBody with an ASN1InputStream.
-     *
-     * @param obj DERApplicationSpecific containing the whole body.
-     * @throws IOException if the body is not valid.
-     */
-    private CertificateBody(DERApplicationSpecific obj)
-        throws IOException
-    {
-        setIso7816CertificateBody(obj);
-    }
-
-    /**
-     * create a profile type Iso7816CertificateBody.
-     *
-     * @return return the "profile" type certificate body.
-     * @throws IOException if the DERApplicationSpecific cannot be created.
-     */
-    private ASN1Primitive profileToASN1Object()
-        throws IOException
-    {
-        ASN1EncodableVector v = new ASN1EncodableVector();
-
-        v.add(certificateProfileIdentifier);
-        v.add(certificationAuthorityReference);
-        v.add(new DERApplicationSpecific(false, EACTags.CARDHOLDER_PUBLIC_KEY_TEMPLATE, publicKey));
-        v.add(certificateHolderReference);
-        v.add(certificateHolderAuthorization);
-        v.add(certificateEffectiveDate);
-        v.add(certificateExpirationDate);
-        return new DERApplicationSpecific(EACTags.CERTIFICATE_CONTENT_TEMPLATE, v);
-    }
-
-    private void setCertificateProfileIdentifier(DERApplicationSpecific certificateProfileIdentifier)
-        throws IllegalArgumentException
-    {
-        if (certificateProfileIdentifier.getApplicationTag() == EACTags.INTERCHANGE_PROFILE)
-        {
-            this.certificateProfileIdentifier = certificateProfileIdentifier;
-            certificateType |= CPI;
-        }
-        else
-        {
-            throw new IllegalArgumentException("Not an Iso7816Tags.INTERCHANGE_PROFILE tag :" + EACTags.encodeTag(certificateProfileIdentifier));
-        }
-    }
-
-    private void setCertificateHolderReference(DERApplicationSpecific certificateHolderReference)
-        throws IllegalArgumentException
-    {
-        if (certificateHolderReference.getApplicationTag() == EACTags.CARDHOLDER_NAME)
-        {
-            this.certificateHolderReference = certificateHolderReference;
-            certificateType |= CHR;
-        }
-        else
-        {
-            throw new IllegalArgumentException("Not an Iso7816Tags.CARDHOLDER_NAME tag");
-        }
-    }
-
-    /**
-     * set the CertificationAuthorityReference.
-     *
-     * @param certificationAuthorityReference
-     *         the DERApplicationSpecific containing the CertificationAuthorityReference.
-     * @throws IllegalArgumentException if the DERApplicationSpecific is not valid.
-     */
-    private void setCertificationAuthorityReference(
-        DERApplicationSpecific certificationAuthorityReference)
-        throws IllegalArgumentException
-    {
-        if (certificationAuthorityReference.getApplicationTag() == EACTags.ISSUER_IDENTIFICATION_NUMBER)
-        {
-            this.certificationAuthorityReference = certificationAuthorityReference;
-            certificateType |= CAR;
-        }
-        else
-        {
-            throw new IllegalArgumentException("Not an Iso7816Tags.ISSUER_IDENTIFICATION_NUMBER tag");
-        }
-    }
-
-    /**
-     * set the public Key
-     *
-     * @param publicKey : the DERApplicationSpecific containing the public key
-     * @throws java.io.IOException
-     */
-    private void setPublicKey(PublicKeyDataObject publicKey)
-    {
-        this.publicKey = PublicKeyDataObject.getInstance(publicKey);
-        this.certificateType |= PK;
-    }
-
-    /**
-     * create a request type Iso7816CertificateBody.
-     *
-     * @return return the "request" type certificate body.
-     * @throws IOException if the DERApplicationSpecific cannot be created.
-     */
-    private ASN1Primitive requestToASN1Object()
-        throws IOException
-    {
-        ASN1EncodableVector v = new ASN1EncodableVector();
-
-        v.add(certificateProfileIdentifier);
-        v.add(new DERApplicationSpecific(false, EACTags.CARDHOLDER_PUBLIC_KEY_TEMPLATE, publicKey));
-        v.add(certificateHolderReference);
-        return new DERApplicationSpecific(EACTags.CERTIFICATE_CONTENT_TEMPLATE, v);
-    }
-
-    /**
-     * create a "request" or "profile" type Iso7816CertificateBody according to the variables sets.
-     *
-     * @return return the ASN1Primitive representing the "request" or "profile" type certificate body.
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        try
-        {
-            if (certificateType == profileType)
-            {
-                return profileToASN1Object();
-            }
-            if (certificateType == requestType)
-            {
-                return requestToASN1Object();
-            }
-        }
-        catch (IOException e)
-        {
-            return null;
-        }
-        return null;
-    }
-
-    /**
-     * gives the type of the certificate (value should be profileType or requestType if all data are set).
-     *
-     * @return the int representing the data already set.
-     */
-    public int getCertificateType()
-    {
-        return certificateType;
-    }
-
-    /**
-     * Gives an instance of Iso7816CertificateBody taken from Object obj
-     *
-     * @param obj is the Object to extract the certificate body from.
-     * @return the Iso7816CertificateBody taken from Object obj.
-     * @throws IOException if object is not valid.
-     */
-    public static CertificateBody getInstance(Object obj)
-        throws IOException
-    {
-        if (obj instanceof CertificateBody)
-        {
-            return (CertificateBody)obj;
-        }
-        else if (obj != null)
-        {
-            return new CertificateBody(DERApplicationSpecific.getInstance(obj));
-        }
-
-        return null;
-    }
-
-    /**
-     * @return the date of the certificate generation
-     */
-    public PackedDate getCertificateEffectiveDate()
-    {
-        if ((this.certificateType & CertificateBody.CEfD) ==
-            CertificateBody.CEfD)
-        {
-            return new PackedDate(certificateEffectiveDate.getContents());
-        }
-        return null;
-    }
-
-    /**
-     * set the date of the certificate generation
-     *
-     * @param ced DERApplicationSpecific containing the date of the certificate generation
-     * @throws IllegalArgumentException if the tag is not Iso7816Tags.APPLICATION_EFFECTIVE_DATE
-     */
-    private void setCertificateEffectiveDate(DERApplicationSpecific ced)
-        throws IllegalArgumentException
-    {
-        if (ced.getApplicationTag() == EACTags.APPLICATION_EFFECTIVE_DATE)
-        {
-            this.certificateEffectiveDate = ced;
-            certificateType |= CEfD;
-        }
-        else
-        {
-            throw new IllegalArgumentException("Not an Iso7816Tags.APPLICATION_EFFECTIVE_DATE tag :" + EACTags.encodeTag(ced));
-        }
-    }
-
-    /**
-     * @return the date after wich the certificate expires
-     */
-    public PackedDate getCertificateExpirationDate()
-        throws IOException
-    {
-        if ((this.certificateType & CertificateBody.CExD) ==
-            CertificateBody.CExD)
-        {
-            return new PackedDate(certificateExpirationDate.getContents());
-        }
-        throw new IOException("certificate Expiration Date not set");
-    }
-
-    /**
-     * set the date after wich the certificate expires
-     *
-     * @param ced DERApplicationSpecific containing the date after wich the certificate expires
-     * @throws IllegalArgumentException if the tag is not Iso7816Tags.APPLICATION_EXPIRATION_DATE
-     */
-    private void setCertificateExpirationDate(DERApplicationSpecific ced)
-        throws IllegalArgumentException
-    {
-        if (ced.getApplicationTag() == EACTags.APPLICATION_EXPIRATION_DATE)
-        {
-            this.certificateExpirationDate = ced;
-            certificateType |= CExD;
-        }
-        else
-        {
-            throw new IllegalArgumentException("Not an Iso7816Tags.APPLICATION_EXPIRATION_DATE tag");
-        }
-    }
-
-    /**
-     * the Iso7816CertificateHolderAuthorization encodes the role of the holder
-     * (i.e. CVCA, DV, IS) and assigns read/write access rights to data groups
-     * storing sensitive data. This functions returns the Certificate Holder
-     * Authorization
-     *
-     * @return the Iso7816CertificateHolderAuthorization
-     */
-    public CertificateHolderAuthorization getCertificateHolderAuthorization()
-        throws IOException
-    {
-        if ((this.certificateType & CertificateBody.CHA) ==
-            CertificateBody.CHA)
-        {
-            return certificateHolderAuthorization;
-        }
-        throw new IOException("Certificate Holder Authorisation not set");
-    }
-
-    /**
-     * set the CertificateHolderAuthorization
-     *
-     * @param cha the Certificate Holder Authorization
-     */
-    private void setCertificateHolderAuthorization(
-        CertificateHolderAuthorization cha)
-    {
-        this.certificateHolderAuthorization = cha;
-        certificateType |= CHA;
-    }
-
-    /**
-     * certificateHolderReference : associates the public key contained in the certificate with a unique name
-     *
-     * @return the certificateHolderReference.
-     */
-    public CertificateHolderReference getCertificateHolderReference()
-    {
-        return new CertificateHolderReference(certificateHolderReference.getContents());
-    }
-
-    /**
-     * CertificateProfileIdentifier : version of the certificate format. Must be 0 (version 1)
-     *
-     * @return the CertificateProfileIdentifier
-     */
-    public DERApplicationSpecific getCertificateProfileIdentifier()
-    {
-        return certificateProfileIdentifier;
-    }
-
-    /**
-     * get the certificationAuthorityReference
-     * certificationAuthorityReference : uniquely identifies the issuinng CA's signature key pair
-     *
-     * @return the certificationAuthorityReference
-     */
-    public CertificationAuthorityReference getCertificationAuthorityReference()
-        throws IOException
-    {
-        if ((this.certificateType & CertificateBody.CAR) ==
-            CertificateBody.CAR)
-        {
-            return new CertificationAuthorityReference(certificationAuthorityReference.getContents());
-        }
-        throw new IOException("Certification authority reference not set");
-    }
-
-    /**
-     * @return the PublicKey
-     */
-    public PublicKeyDataObject getPublicKey()
-    {
-        return publicKey;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/eac/CertificateHolderAuthorization.java b/bcprov/src/main/java/org/bouncycastle/asn1/eac/CertificateHolderAuthorization.java
deleted file mode 100644
index ba8486a..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/eac/CertificateHolderAuthorization.java
+++ /dev/null
@@ -1,184 +0,0 @@
-package org.bouncycastle.asn1.eac;
-
-import java.io.IOException;
-import java.util.Hashtable;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.DERApplicationSpecific;
-import org.bouncycastle.util.Integers;
-
-/**
- * an Iso7816CertificateHolderAuthorization structure.
- * <pre>
- *  Certificate Holder Authorization ::= SEQUENCE {
- *      // specifies the format and the rules for the evaluation of the authorization
- *      // level
- *      ASN1ObjectIdentifier        oid,
- *      // access rights
- *      DERApplicationSpecific    accessRights,
- *  }
- * </pre>
- */
-public class CertificateHolderAuthorization
-    extends ASN1Object
-{
-    ASN1ObjectIdentifier oid;
-    DERApplicationSpecific accessRights;
-    public static final ASN1ObjectIdentifier id_role_EAC = EACObjectIdentifiers.bsi_de.branch("3.1.2.1");
-    public static final int CVCA = 0xC0;
-    public static final int DV_DOMESTIC = 0x80;
-    public static final int DV_FOREIGN = 0x40;
-    public static final int IS = 0;
-    public static final int RADG4 = 0x02;//Read Access to DG4 (Iris)
-    public static final int RADG3 = 0x01;//Read Access to DG3 (fingerprint)
-
-    static Hashtable RightsDecodeMap = new Hashtable();
-    static BidirectionalMap AuthorizationRole = new BidirectionalMap();
-    static Hashtable ReverseMap = new Hashtable();
-
-    static
-    {
-        RightsDecodeMap.put(Integers.valueOf(RADG4), "RADG4");
-        RightsDecodeMap.put(Integers.valueOf(RADG3), "RADG3");
-
-        AuthorizationRole.put(Integers.valueOf(CVCA), "CVCA");
-        AuthorizationRole.put(Integers.valueOf(DV_DOMESTIC), "DV_DOMESTIC");
-        AuthorizationRole.put(Integers.valueOf(DV_FOREIGN), "DV_FOREIGN");
-        AuthorizationRole.put(Integers.valueOf(IS), "IS");
-
-        /*
-          for (int i : RightsDecodeMap.keySet())
-              ReverseMap.put(RightsDecodeMap.get(i), i);
-
-          for (int i : AuthorizationRole.keySet())
-              ReverseMap.put(AuthorizationRole.get(i), i);
-          */
-    }
-
-    public static String GetRoleDescription(int i)
-    {
-        return (String)AuthorizationRole.get(Integers.valueOf(i));
-    }
-
-    public static int GetFlag(String description)
-    {
-        Integer i = (Integer)AuthorizationRole.getReverse(description);
-        if (i == null)
-        {
-            throw new IllegalArgumentException("Unknown value " + description);
-        }
-
-        return i.intValue();
-    }
-
-    private void setPrivateData(ASN1InputStream cha)
-        throws IOException
-    {
-        ASN1Primitive obj;
-        obj = cha.readObject();
-        if (obj instanceof ASN1ObjectIdentifier)
-        {
-            this.oid = (ASN1ObjectIdentifier)obj;
-        }
-        else
-        {
-            throw new IllegalArgumentException("no Oid in CerticateHolderAuthorization");
-        }
-        obj = cha.readObject();
-        if (obj instanceof DERApplicationSpecific)
-        {
-            this.accessRights = (DERApplicationSpecific)obj;
-        }
-        else
-        {
-            throw new IllegalArgumentException("No access rights in CerticateHolderAuthorization");
-        }
-    }
-
-
-    /**
-     * create an Iso7816CertificateHolderAuthorization according to the parameters
-     *
-     * @param oid    Object Identifier : specifies the format and the rules for the
-     *               evaluatioin of the authorization level.
-     * @param rights specifies the access rights
-     * @throws IOException
-     */
-    public CertificateHolderAuthorization(ASN1ObjectIdentifier oid, int rights)
-        throws IOException
-    {
-        setOid(oid);
-        setAccessRights((byte)rights);
-    }
-
-    /**
-     * create an Iso7816CertificateHolderAuthorization according to the {@link DERApplicationSpecific}
-     *
-     * @param aSpe the DERApplicationSpecific containing the data
-     * @throws IOException
-     */
-    public CertificateHolderAuthorization(DERApplicationSpecific aSpe)
-        throws IOException
-    {
-        if (aSpe.getApplicationTag() == EACTags.CERTIFICATE_HOLDER_AUTHORIZATION_TEMPLATE)
-        {
-            setPrivateData(new ASN1InputStream(aSpe.getContents()));
-        }
-    }
-
-    /**
-     * @return containing the access rights
-     */
-    public int getAccessRights()
-    {
-        return accessRights.getContents()[0] & 0xff;
-    }
-
-    /**
-     * create a DERApplicationSpecific and set the access rights to "rights"
-     *
-     * @param rights byte containing the rights.
-     */
-    private void setAccessRights(byte rights)
-    {
-        byte[] accessRights = new byte[1];
-        accessRights[0] = rights;
-        this.accessRights = new DERApplicationSpecific(
-            EACTags.getTag(EACTags.DISCRETIONARY_DATA), accessRights);
-    }
-
-    /**
-     * @return the Object identifier
-     */
-    public ASN1ObjectIdentifier getOid()
-    {
-        return oid;
-    }
-
-    /**
-     * set the Object Identifier
-     *
-     * @param oid {@link ASN1ObjectIdentifier} containing the Object Identifier
-     */
-    private void setOid(ASN1ObjectIdentifier oid)
-    {
-        this.oid = oid;
-    }
-
-    /**
-     * return the Certificate Holder Authorization as a DERApplicationSpecific Object
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector v = new ASN1EncodableVector();
-
-        v.add(oid);
-        v.add(accessRights);
-
-        return new DERApplicationSpecific(EACTags.CERTIFICATE_HOLDER_AUTHORIZATION_TEMPLATE, v);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/eac/CertificateHolderReference.java b/bcprov/src/main/java/org/bouncycastle/asn1/eac/CertificateHolderReference.java
deleted file mode 100644
index ec8dec0..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/eac/CertificateHolderReference.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package org.bouncycastle.asn1.eac;
-
-import java.io.UnsupportedEncodingException;
-
-public class CertificateHolderReference
-{
-    private static final String ReferenceEncoding = "ISO-8859-1";
-
-    private String countryCode;
-    private String holderMnemonic;
-    private String sequenceNumber;
-
-    public CertificateHolderReference(String countryCode, String holderMnemonic, String sequenceNumber)
-    {
-        this.countryCode = countryCode;
-        this.holderMnemonic = holderMnemonic;
-        this.sequenceNumber = sequenceNumber;
-    }
-
-    CertificateHolderReference(byte[] contents)
-    {
-        try
-        {
-            String concat = new String(contents, ReferenceEncoding);
-
-            this.countryCode = concat.substring(0, 2);
-            this.holderMnemonic = concat.substring(2, concat.length() - 5);
-
-            this.sequenceNumber = concat.substring(concat.length() - 5);
-        }
-        catch (UnsupportedEncodingException e)
-        {
-            throw new IllegalStateException(e.toString());
-        }
-    }
-
-    public String getCountryCode()
-    {
-        return countryCode;
-    }
-
-    public String getHolderMnemonic()
-    {
-        return holderMnemonic;
-    }
-
-    public String getSequenceNumber()
-    {
-        return sequenceNumber;
-    }
-
-
-    public byte[] getEncoded()
-    {
-        String ref = countryCode + holderMnemonic + sequenceNumber;
-
-        try
-        {
-            return ref.getBytes(ReferenceEncoding);
-        }
-        catch (UnsupportedEncodingException e)
-        {
-            throw new IllegalStateException(e.toString());
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/eac/CertificationAuthorityReference.java b/bcprov/src/main/java/org/bouncycastle/asn1/eac/CertificationAuthorityReference.java
deleted file mode 100644
index 7a5dc8a..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/eac/CertificationAuthorityReference.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package org.bouncycastle.asn1.eac;
-
-public class CertificationAuthorityReference
-    extends CertificateHolderReference
-{
-    public CertificationAuthorityReference(String countryCode, String holderMnemonic, String sequenceNumber)
-    {
-        super(countryCode, holderMnemonic, sequenceNumber);
-    }
-
-    CertificationAuthorityReference(byte[] contents)
-    {
-        super(contents);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/eac/EACTags.java b/bcprov/src/main/java/org/bouncycastle/asn1/eac/EACTags.java
deleted file mode 100644
index b9ffe9d..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/eac/EACTags.java
+++ /dev/null
@@ -1,209 +0,0 @@
-package org.bouncycastle.asn1.eac;
-
-import org.bouncycastle.asn1.BERTags;
-import org.bouncycastle.asn1.DERApplicationSpecific;
-
-public class EACTags
-{
-    public static final int OBJECT_IDENTIFIER = 0x06;
-    public static final int COUNTRY_CODE_NATIONAL_DATA = 0x41;
-    public static final int ISSUER_IDENTIFICATION_NUMBER = 0x02; //0x42;
-    public static final int CARD_SERVICE_DATA = 0x43;
-    public static final int INITIAL_ACCESS_DATA = 0x44;
-    public static final int CARD_ISSUER_DATA = 0x45;
-    public static final int PRE_ISSUING_DATA = 0x46;
-    public static final int CARD_CAPABILITIES = 0x47;
-    public static final int STATUS_INFORMATION = 0x48;
-    public static final int EXTENDED_HEADER_LIST = 0x4D;
-    public static final int APPLICATION_IDENTIFIER = 0x4F;
-    public static final int APPLICATION_LABEL = 0x50;
-    public static final int FILE_REFERENCE = 0x51;
-    public static final int COMMAND_TO_PERFORM = 0x52;
-    public static final int DISCRETIONARY_DATA = 0x53;
-    public static final int OFFSET_DATA_OBJECT = 0x54;
-    public static final int TRACK1_APPLICATION = 0x56;
-    public static final int TRACK2_APPLICATION = 0x57;
-    public static final int TRACK3_APPLICATION = 0x58;
-    public static final int CARD_EXPIRATION_DATA = 0x59;
-    public static final int PRIMARY_ACCOUNT_NUMBER = 0x5A;// PAN
-    public static final int NAME = 0x5B;
-    public static final int TAG_LIST = 0x5C;
-    public static final int HEADER_LIST = 0x5D;
-    public static final int LOGIN_DATA = 0x5E;
-    public static final int CARDHOLDER_NAME = 0x20; // 0x5F20;
-    public static final int TRACK1_CARD = 0x5F21;
-    public static final int TRACK2_CARD = 0x5F22;
-    public static final int TRACK3_CARD = 0x5F23;
-    public static final int APPLICATION_EXPIRATION_DATE = 0x24; // 0x5F24;
-    public static final int APPLICATION_EFFECTIVE_DATE = 0x25; // 0x5F25;
-    public static final int CARD_EFFECTIVE_DATE = 0x5F26;
-    public static final int INTERCHANGE_CONTROL = 0x5F27;
-    public static final int COUNTRY_CODE = 0x5F28;
-    public static final int INTERCHANGE_PROFILE = 0x29; // 0x5F29;
-    public static final int CURRENCY_CODE = 0x5F2A;
-    public static final int DATE_OF_BIRTH = 0x5F2B;
-    public static final int CARDHOLDER_NATIONALITY = 0x5F2C;
-    public static final int LANGUAGE_PREFERENCES = 0x5F2D;
-    public static final int CARDHOLDER_BIOMETRIC_DATA = 0x5F2E;
-    public static final int PIN_USAGE_POLICY = 0x5F2F;
-    public static final int SERVICE_CODE = 0x5F30;
-    public static final int TRANSACTION_COUNTER = 0x5F32;
-    public static final int TRANSACTION_DATE = 0x5F33;
-    public static final int CARD_SEQUENCE_NUMBER = 0x5F34;
-    public static final int SEX = 0x5F35;
-    public static final int CURRENCY_EXPONENT = 0x5F36;
-    public static final int STATIC_INTERNAL_AUTHENTIFICATION_ONE_STEP = 0x37; // 0x5F37;
-    public static final int SIGNATURE = 0x5F37;
-    public static final int STATIC_INTERNAL_AUTHENTIFICATION_FIRST_DATA = 0x5F38;
-    public static final int STATIC_INTERNAL_AUTHENTIFICATION_SECOND_DATA = 0x5F39;
-    public static final int DYNAMIC_INTERNAL_AUTHENTIFICATION = 0x5F3A;
-    public static final int DYNAMIC_EXTERNAL_AUTHENTIFICATION = 0x5F3B;
-    public static final int DYNAMIC_MUTUAL_AUTHENTIFICATION = 0x5F3C;
-    public static final int CARDHOLDER_PORTRAIT_IMAGE = 0x5F40;
-    public static final int ELEMENT_LIST = 0x5F41;
-    public static final int ADDRESS = 0x5F42;
-    public static final int CARDHOLDER_HANDWRITTEN_SIGNATURE = 0x5F43;
-    public static final int APPLICATION_IMAGE = 0x5F44;
-    public static final int DISPLAY_IMAGE = 0x5F45;
-    public static final int TIMER = 0x5F46;
-    public static final int MESSAGE_REFERENCE = 0x5F47;
-    public static final int CARDHOLDER_PRIVATE_KEY = 0x5F48;
-    public static final int CARDHOLDER_PUBLIC_KEY = 0x5F49;
-    public static final int CERTIFICATION_AUTHORITY_PUBLIC_KEY = 0x5F4A;
-    public static final int DEPRECATED = 0x5F4B;
-    public static final int CERTIFICATE_HOLDER_AUTHORIZATION = 0x5F4C;// Not yet defined in iso7816. The allocation is requested
-    public static final int INTEGRATED_CIRCUIT_MANUFACTURER_ID = 0x5F4D;
-    public static final int CERTIFICATE_CONTENT = 0x5F4E;
-    public static final int UNIFORM_RESOURCE_LOCATOR = 0x5F50;
-    public static final int ANSWER_TO_RESET = 0x5F51;
-    public static final int HISTORICAL_BYTES = 0x5F52;
-    public static final int DIGITAL_SIGNATURE = 0x5F3D;
-    public static final int APPLICATION_TEMPLATE = 0x61;
-    public static final int FCP_TEMPLATE = 0x62;
-    public static final int WRAPPER = 0x63;
-    public static final int FMD_TEMPLATE = 0x64;
-    public static final int CARDHOLDER_RELATIVE_DATA = 0x65;
-    public static final int CARD_DATA = 0x66;
-    public static final int AUTHENTIFICATION_DATA = 0x67;
-    public static final int SPECIAL_USER_REQUIREMENTS = 0x68;
-    public static final int LOGIN_TEMPLATE = 0x6A;
-    public static final int QUALIFIED_NAME = 0x6B;
-    public static final int CARDHOLDER_IMAGE_TEMPLATE = 0x6C;
-    public static final int APPLICATION_IMAGE_TEMPLATE = 0x6D;
-    public static final int APPLICATION_RELATED_DATA = 0x6E;
-    public static final int FCI_TEMPLATE = 0x6F;
-    public static final int DISCRETIONARY_DATA_OBJECTS = 0x73;
-    public static final int COMPATIBLE_TAG_ALLOCATION_AUTHORITY = 0x78;
-    public static final int COEXISTANT_TAG_ALLOCATION_AUTHORITY = 0x79;
-    public static final int SECURITY_SUPPORT_TEMPLATE = 0x7A;
-    public static final int SECURITY_ENVIRONMENT_TEMPLATE = 0x7B;
-    public static final int DYNAMIC_AUTHENTIFICATION_TEMPLATE = 0x7C;
-    public static final int SECURE_MESSAGING_TEMPLATE = 0x7D;
-    public static final int NON_INTERINDUSTRY_DATA_OBJECT_NESTING_TEMPLATE = 0x7E;
-    public static final int DISPLAY_CONTROL = 0x7F20;
-    public static final int CARDHOLDER_CERTIFICATE = 0x21; // 0x7F21;
-    public static final int CV_CERTIFICATE = 0x7F21;
-    public static final int CARDHOLER_REQUIREMENTS_INCLUDED_FEATURES = 0x7F22;
-    public static final int CARDHOLER_REQUIREMENTS_EXCLUDED_FEATURES = 0x7F23;
-    public static final int BIOMETRIC_DATA_TEMPLATE = 0x7F2E;
-    public static final int DIGITAL_SIGNATURE_BLOCK = 0x7F3D;
-    public static final int CARDHOLDER_PRIVATE_KEY_TEMPLATE = 0x7F48;
-    public static final int CARDHOLDER_PUBLIC_KEY_TEMPLATE = 0x49; // 0x7F49;
-    public static final int CERTIFICATE_HOLDER_AUTHORIZATION_TEMPLATE = 0x4C; // 0x7F4C;
-    public static final int CERTIFICATE_CONTENT_TEMPLATE = 0x4E; // 0x7F4E;
-    public static final int CERTIFICATE_BODY = 0x4E; // 0x7F4E;
-    public static final int BIOMETRIC_INFORMATION_TEMPLATE = 0x7F60;
-    public static final int BIOMETRIC_INFORMATION_GROUP_TEMPLATE = 0x7F61;
-
-    public static int getTag(int encodedTag)
-    {
-        /*
-        int i;
-        for (i = 24; i>=0; i-=8) {
-            if (((0xFF<<i) & tag) != 0)
-                return (((0xFF<<i) & tag) >> i);
-        }
-        return 0;
-        */
-        return decodeTag(encodedTag);
-    }
-
-    public static int getTagNo(int tag)
-    {
-        int i;
-        for (i = 24; i >= 0; i -= 8)
-        {
-            if (((0xFF << i) & tag) != 0)
-            {
-                return ((~(0xFF << i)) & tag);
-            }
-        }
-        return 0;
-    }
-
-    public static int encodeTag(DERApplicationSpecific spec)
-    {
-        int retValue = BERTags.APPLICATION;
-        boolean constructed = spec.isConstructed();
-        if (constructed)
-        {
-            retValue |= BERTags.CONSTRUCTED;
-        }
-
-        int tag = spec.getApplicationTag();
-
-        if (tag > 31)
-        {
-            retValue |= 0x1F;
-            retValue <<= 8;
-
-            int currentByte = tag & 0x7F;
-            retValue |= currentByte;
-            tag >>= 7;
-
-            while (tag > 0)
-            {
-                retValue |= 0x80;
-                retValue <<= 8;
-
-                currentByte = tag & 0x7F;
-                tag >>= 7;
-            }
-        }
-        else
-        {
-            retValue |= tag;
-        }
-
-        return retValue;
-    }
-
-    public static int decodeTag(int tag)
-    {
-        int retValue = 0;
-        boolean multiBytes = false;
-        for (int i = 24; i >= 0; i -= 8)
-        {
-            int currentByte = tag >> i & 0xFF;
-            if (currentByte == 0)
-            {
-                continue;
-            }
-
-            if (multiBytes)
-            {
-                retValue <<= 7;
-                retValue |= currentByte & 0x7F;
-            }
-            else if ((currentByte & 0x1F) == 0x1F)
-            {
-                multiBytes = true;
-            }
-            else
-            {
-                return currentByte & 0x1F; // higher order bit are for DER.Constructed and type
-            }
-        }
-        return retValue;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/eac/ECDSAPublicKey.java b/bcprov/src/main/java/org/bouncycastle/asn1/eac/ECDSAPublicKey.java
deleted file mode 100644
index 077807f..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/eac/ECDSAPublicKey.java
+++ /dev/null
@@ -1,340 +0,0 @@
-package org.bouncycastle.asn1.eac;
-
-import java.math.BigInteger;
-import java.util.Enumeration;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.ASN1TaggedObject;
-import org.bouncycastle.asn1.DEROctetString;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.DERTaggedObject;
-
-/**
- * an Iso7816ECDSAPublicKeyStructure structure.
- * <pre>
- *  Certificate Holder Authorization ::= SEQUENCE {
- *      ASN1TaggedObject primeModulusP;        // OPTIONAL
- *      ASN1TaggedObject firstCoefA;            // OPTIONAL
- *      ASN1TaggedObject secondCoefB;        // OPTIONAL
- *      ASN1TaggedObject basePointG;            // OPTIONAL
- *      ASN1TaggedObject orderOfBasePointR;    // OPTIONAL
- *      ASN1TaggedObject publicPointY;        //REQUIRED
- *      ASN1TaggedObject    cofactorF;            // OPTIONAL
- *  }
- * </pre>
- */
-public class ECDSAPublicKey
-    extends PublicKeyDataObject
-{
-    private ASN1ObjectIdentifier usage;
-    private BigInteger primeModulusP;        // OPTIONAL
-    private BigInteger firstCoefA;            // OPTIONAL
-    private BigInteger secondCoefB;        // OPTIONAL
-    private byte[]     basePointG;            // OPTIONAL
-    private BigInteger orderOfBasePointR;    // OPTIONAL
-    private byte[]     publicPointY;        //REQUIRED
-    private BigInteger cofactorF;            // OPTIONAL
-    private int options;
-    private static final int P = 0x01;
-    private static final int A = 0x02;
-    private static final int B = 0x04;
-    private static final int G = 0x08;
-    private static final int R = 0x10;
-    private static final int Y = 0x20;
-    private static final int F = 0x40;
-
-    ECDSAPublicKey(ASN1Sequence seq)
-        throws IllegalArgumentException
-    {
-        Enumeration en = seq.getObjects();
-
-        this.usage = ASN1ObjectIdentifier.getInstance(en.nextElement());
-
-        options = 0;
-        while (en.hasMoreElements())
-        {
-            Object obj = en.nextElement();
-            
-            if (obj instanceof ASN1TaggedObject)
-            {
-                ASN1TaggedObject to = (ASN1TaggedObject)obj;
-                switch (to.getTagNo())
-                {
-                case 0x1:
-                    setPrimeModulusP(UnsignedInteger.getInstance(to).getValue());
-                    break;
-                case 0x2:
-                    setFirstCoefA(UnsignedInteger.getInstance(to).getValue());
-                    break;
-                case 0x3:
-                    setSecondCoefB(UnsignedInteger.getInstance(to).getValue());
-                    break;
-                case 0x4:
-                    setBasePointG(ASN1OctetString.getInstance(to, false));
-                    break;
-                case 0x5:
-                    setOrderOfBasePointR(UnsignedInteger.getInstance(to).getValue());
-                    break;
-                case 0x6:
-                    setPublicPointY(ASN1OctetString.getInstance(to, false));
-                    break;
-                case 0x7:
-                    setCofactorF(UnsignedInteger.getInstance(to).getValue());
-                    break;
-                default:
-                    options = 0;
-                    throw new IllegalArgumentException("Unknown Object Identifier!");
-                }
-            }
-            else
-            {
-                throw new IllegalArgumentException("Unknown Object Identifier!");
-            }
-        }
-        if (options != 0x20 && options != 0x7F)
-        {
-            throw new IllegalArgumentException("All options must be either present or absent!");
-        }
-    }
-
-    public ECDSAPublicKey(ASN1ObjectIdentifier usage, byte[] ppY)
-        throws IllegalArgumentException
-    {
-        this.usage = usage;
-        setPublicPointY(new DEROctetString(ppY));
-    }
-
-    public ECDSAPublicKey(ASN1ObjectIdentifier usage, BigInteger p, BigInteger a, BigInteger b, byte[] basePoint, BigInteger order, byte[] publicPoint, int cofactor)
-    {
-        this.usage = usage;
-        setPrimeModulusP(p);
-        setFirstCoefA(a);
-        setSecondCoefB(b);
-        setBasePointG(new DEROctetString(basePoint));
-        setOrderOfBasePointR(order);
-        setPublicPointY(new DEROctetString(publicPoint));
-        setCofactorF(BigInteger.valueOf(cofactor));
-    }
-
-    public ASN1ObjectIdentifier getUsage()
-    {
-        return usage;
-    }
-
-    public byte[] getBasePointG()
-    {
-        if ((options & G) != 0)
-        {
-            return basePointG;
-        }
-        else
-        {
-            return null;
-        }
-    }
-
-    private void setBasePointG(ASN1OctetString basePointG)
-        throws IllegalArgumentException
-    {
-        if ((options & G) == 0)
-        {
-            options |= G;
-            this.basePointG = basePointG.getOctets();
-        }
-        else
-        {
-            throw new IllegalArgumentException("Base Point G already set");
-        }
-    }
-
-    public BigInteger getCofactorF()
-    {
-        if ((options & F) != 0)
-        {
-            return cofactorF;
-        }
-        else
-        {
-            return null;
-        }
-    }
-
-    private void setCofactorF(BigInteger cofactorF)
-        throws IllegalArgumentException
-    {
-        if ((options & F) == 0)
-        {
-            options |= F;
-            this.cofactorF = cofactorF;
-        }
-        else
-        {
-            throw new IllegalArgumentException("Cofactor F already set");
-        }
-    }
-
-    public BigInteger getFirstCoefA()
-    {
-        if ((options & A) != 0)
-        {
-            return firstCoefA;
-        }
-        else
-        {
-            return null;
-        }
-    }
-
-    private void setFirstCoefA(BigInteger firstCoefA)
-        throws IllegalArgumentException
-    {
-        if ((options & A) == 0)
-        {
-            options |= A;
-            this.firstCoefA = firstCoefA;
-        }
-        else
-        {
-            throw new IllegalArgumentException("First Coef A already set");
-        }
-    }
-
-    public BigInteger getOrderOfBasePointR()
-    {
-        if ((options & R) != 0)
-        {
-            return orderOfBasePointR;
-        }
-        else
-        {
-            return null;
-        }
-    }
-
-    private void setOrderOfBasePointR(BigInteger orderOfBasePointR)
-        throws IllegalArgumentException
-    {
-        if ((options & R) == 0)
-        {
-            options |= R;
-            this.orderOfBasePointR = orderOfBasePointR;
-        }
-        else
-        {
-            throw new IllegalArgumentException("Order of base point R already set");
-        }
-    }
-
-    public BigInteger getPrimeModulusP()
-    {
-        if ((options & P) != 0)
-        {
-            return primeModulusP;
-        }
-        else
-        {
-            return null;
-        }
-    }
-
-    private void setPrimeModulusP(BigInteger primeModulusP)
-    {
-        if ((options & P) == 0)
-        {
-            options |= P;
-            this.primeModulusP = primeModulusP;
-        }
-        else
-        {
-            throw new IllegalArgumentException("Prime Modulus P already set");
-        }
-    }
-
-    public byte[] getPublicPointY()
-    {
-        if ((options & Y) != 0)
-        {
-            return publicPointY;
-        }
-        else
-        {
-            return null;
-        }
-    }
-
-    private void setPublicPointY(ASN1OctetString publicPointY)
-        throws IllegalArgumentException
-    {
-        if ((options & Y) == 0)
-        {
-            options |= Y;
-            this.publicPointY = publicPointY.getOctets();
-        }
-        else
-        {
-            throw new IllegalArgumentException("Public Point Y already set");
-        }
-    }
-
-    public BigInteger getSecondCoefB()
-    {
-        if ((options & B) != 0)
-        {
-            return secondCoefB;
-        }
-        else
-        {
-            return null;
-        }
-    }
-
-    private void setSecondCoefB(BigInteger secondCoefB)
-        throws IllegalArgumentException
-    {
-        if ((options & B) == 0)
-        {
-            options |= B;
-            this.secondCoefB = secondCoefB;
-        }
-        else
-        {
-            throw new IllegalArgumentException("Second Coef B already set");
-        }
-    }
-
-    public boolean hasParameters()
-    {
-        return primeModulusP != null;
-    }
-
-    public ASN1EncodableVector getASN1EncodableVector(ASN1ObjectIdentifier oid, boolean publicPointOnly)
-    {
-        ASN1EncodableVector v = new ASN1EncodableVector();
-        v.add(oid);
-
-        if (!publicPointOnly)
-        {
-            v.add(new UnsignedInteger(0x01, getPrimeModulusP()));
-            v.add(new UnsignedInteger(0x02, getFirstCoefA()));
-            v.add(new UnsignedInteger(0x03, getSecondCoefB()));
-            v.add(new DERTaggedObject(false, 0x04, new DEROctetString(getBasePointG())));
-            v.add(new UnsignedInteger(0x05, getOrderOfBasePointR()));
-        }
-        v.add(new DERTaggedObject(false, 0x06, new DEROctetString(getPublicPointY())));
-        if (!publicPointOnly)
-        {
-            v.add(new UnsignedInteger(0x07, getCofactorF()));
-        }
-
-        return v;
-    }
-
-    public ASN1Primitive toASN1Primitive()
-    {
-        return new DERSequence(getASN1EncodableVector(usage, false));
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/eac/Flags.java b/bcprov/src/main/java/org/bouncycastle/asn1/eac/Flags.java
deleted file mode 100644
index 89d4e9f..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/eac/Flags.java
+++ /dev/null
@@ -1,96 +0,0 @@
-package org.bouncycastle.asn1.eac;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-
-
-public class Flags
-{
-
-    int value = 0;
-
-    public Flags()
-    {
-
-    }
-
-    public Flags(int v)
-    {
-        value = v;
-    }
-
-    public void set(int flag)
-    {
-        value |= flag;
-    }
-
-    public boolean isSet(int flag)
-    {
-        return (value & flag) != 0;
-    }
-
-    public int getFlags()
-    {
-        return value;
-    }
-
-    /* Java 1.5
-     String decode(Map<Integer, String> decodeMap)
-     {
-         StringJoiner joiner = new StringJoiner(" ");
-         for (int i : decodeMap.keySet())
-         {
-             if (isSet(i))
-                 joiner.add(decodeMap.get(i));
-         }
-         return joiner.toString();
-     }
-     */
-
-    String decode(Hashtable decodeMap)
-    {
-        StringJoiner joiner = new StringJoiner(" ");
-        Enumeration e = decodeMap.keys();
-        while (e.hasMoreElements())
-        {
-            Integer i = (Integer)e.nextElement();
-            if (isSet(i.intValue()))
-            {
-                joiner.add((String)decodeMap.get(i));
-            }
-        }
-        return joiner.toString();
-    }
-
-    private class StringJoiner
-    {
-
-        String mSeparator;
-        boolean First = true;
-        StringBuffer b = new StringBuffer();
-
-        public StringJoiner(String separator)
-        {
-            mSeparator = separator;
-        }
-
-        public void add(String str)
-        {
-            if (First)
-            {
-                First = false;
-            }
-            else
-            {
-                b.append(mSeparator);
-            }
-
-            b.append(str);
-        }
-
-        public String toString()
-        {
-            return b.toString();
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/eac/PackedDate.java b/bcprov/src/main/java/org/bouncycastle/asn1/eac/PackedDate.java
deleted file mode 100644
index e19c96f..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/eac/PackedDate.java
+++ /dev/null
@@ -1,124 +0,0 @@
-package org.bouncycastle.asn1.eac;
-
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.Locale;
-import java.util.SimpleTimeZone;
-
-import org.bouncycastle.util.Arrays;
-
-/**
- * EAC encoding date object
- */
-public class PackedDate
-{
-    private byte[]      time;
-
-    public PackedDate(
-        String time)
-    {
-        this.time = convert(time);
-    }
-
-    /**
-     * Base constructor from a java.util.date object.
-     *
-     * @param time a date object representing the time of interest.
-     */
-    public PackedDate(
-        Date time)
-    {
-        SimpleDateFormat dateF = new SimpleDateFormat("yyMMdd'Z'");
-
-        dateF.setTimeZone(new SimpleTimeZone(0,"Z"));
-
-        this.time = convert(dateF.format(time));
-    }
-
-    /**
-     * Base constructor from a java.util.date object. You may need to use this constructor if the default locale
-     * doesn't use a Gregorian calender so that the PackedDate produced is compatible with other ASN.1 implementations.
-     *
-     * @param time a date object representing the time of interest.
-     * @param locale an appropriate Locale for producing an ASN.1 GeneralizedTime value.
-     */
-    public PackedDate(
-        Date time,
-        Locale locale)
-    {
-        SimpleDateFormat dateF = new SimpleDateFormat("yyMMdd'Z'", locale);
-
-        dateF.setTimeZone(new SimpleTimeZone(0,"Z"));
-
-        this.time = convert(dateF.format(time));
-    }
-
-    private byte[] convert(String sTime)
-    {
-        char[] digs = sTime.toCharArray();
-        byte[] date = new byte[6];
-
-        for (int i = 0; i != 6; i++)
-        {
-            date[i] = (byte)(digs[i] - '0');
-        }
-
-        return date;
-    }
-
-    PackedDate(
-        byte[] bytes)
-    {
-        this.time = bytes;
-    }
-
-    /**
-     * return the time as a date based on whatever a 2 digit year will return. For
-     * standardised processing use getAdjustedDate().
-     *
-     * @return the resulting date
-     * @exception java.text.ParseException if the date string cannot be parsed.
-     */
-    public Date getDate()
-        throws ParseException
-    {
-        SimpleDateFormat dateF = new SimpleDateFormat("yyyyMMdd");
-
-        return dateF.parse("20" + toString());
-    }
-
-    public int hashCode()
-    {
-        return Arrays.hashCode(time);
-    }
-
-    public boolean equals(Object o)
-    {
-        if (!(o instanceof PackedDate))
-        {
-            return false;
-        }
-
-        PackedDate other = (PackedDate)o;
-
-        return Arrays.areEqual(time, other.time);
-    }
-
-    public String toString() 
-    {
-        char[]  dateC = new char[time.length];
-
-        for (int i = 0; i != dateC.length; i++)
-        {
-            dateC[i] = (char)((time[i] & 0xff) + '0');
-        }
-
-        return new String(dateC);
-    }
-
-    public byte[] getEncoding()
-    {
-        return time;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/eac/PublicKeyDataObject.java b/bcprov/src/main/java/org/bouncycastle/asn1/eac/PublicKeyDataObject.java
deleted file mode 100644
index 40ad3bb..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/eac/PublicKeyDataObject.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package org.bouncycastle.asn1.eac;
-
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1Sequence;
-
-public abstract class PublicKeyDataObject
-    extends ASN1Object
-{
-    public static PublicKeyDataObject getInstance(Object obj)
-    {
-        if (obj instanceof PublicKeyDataObject)
-        {
-            return (PublicKeyDataObject)obj;
-        }
-        if (obj != null)
-        {
-            ASN1Sequence seq = ASN1Sequence.getInstance(obj);
-            ASN1ObjectIdentifier usage = ASN1ObjectIdentifier.getInstance(seq.getObjectAt(0));
-
-            if (usage.on(EACObjectIdentifiers.id_TA_ECDSA))
-            {
-                return new ECDSAPublicKey(seq);
-            }
-            else
-            {
-                return new RSAPublicKey(seq);
-            }
-        }
-
-        return null;
-    }
-
-    public abstract ASN1ObjectIdentifier getUsage();
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/eac/RSAPublicKey.java b/bcprov/src/main/java/org/bouncycastle/asn1/eac/RSAPublicKey.java
deleted file mode 100644
index 3e1727e..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/eac/RSAPublicKey.java
+++ /dev/null
@@ -1,120 +0,0 @@
-package org.bouncycastle.asn1.eac;
-
-import java.math.BigInteger;
-import java.util.Enumeration;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DERSequence;
-
-
-/**
- * an Iso7816RSAPublicKeyStructure structure.
- * <pre>
- *  Certificate Holder Authorization ::= SEQUENCE {
- *      // modulus should be at least 1024bit and a multiple of 512.
- *      DERTaggedObject        modulus,
- *      // access rights    exponent
- *      DERTaggedObject    accessRights,
- *  }
- * </pre>
- */
-public class RSAPublicKey
-    extends PublicKeyDataObject
-{
-    private ASN1ObjectIdentifier usage;
-    private BigInteger modulus;
-    private BigInteger exponent;
-    private int valid = 0;
-    private static int modulusValid = 0x01;
-    private static int exponentValid = 0x02;
-
-    RSAPublicKey(ASN1Sequence seq)
-    {
-        Enumeration en = seq.getObjects();
-
-        this.usage = ASN1ObjectIdentifier.getInstance(en.nextElement());
-
-        while (en.hasMoreElements())
-        {
-            UnsignedInteger val = UnsignedInteger.getInstance(en.nextElement());
-
-            switch (val.getTagNo())
-            {
-            case 0x1:
-                setModulus(val);
-                break;
-            case 0x2:
-                setExponent(val);
-                break;
-            default:
-                throw new IllegalArgumentException("Unknown DERTaggedObject :" + val.getTagNo() + "-> not an Iso7816RSAPublicKeyStructure");
-            }
-        }
-        if (valid != 0x3)
-        {
-            throw new IllegalArgumentException("missing argument -> not an Iso7816RSAPublicKeyStructure");
-        }
-    }
-
-    public RSAPublicKey(ASN1ObjectIdentifier usage, BigInteger modulus, BigInteger exponent)
-    {
-        this.usage = usage;
-        this.modulus = modulus;
-        this.exponent = exponent;
-    }
-
-    public ASN1ObjectIdentifier getUsage()
-    {
-        return usage;
-    }
-
-    public BigInteger getModulus()
-    {
-        return modulus;
-    }
-
-    public BigInteger getPublicExponent()
-    {
-        return exponent;
-    }
-
-    private void setModulus(UnsignedInteger modulus)
-    {
-        if ((valid & modulusValid) == 0)
-        {
-            valid |= modulusValid;
-            this.modulus = modulus.getValue();
-        }
-        else
-        {
-            throw new IllegalArgumentException("Modulus already set");
-        }
-    }
-
-    private void setExponent(UnsignedInteger exponent)
-    {
-        if ((valid & exponentValid) == 0)
-        {
-            valid |= exponentValid;
-            this.exponent = exponent.getValue();
-        }
-        else
-        {
-            throw new IllegalArgumentException("Exponent already set");
-        }
-    }
-
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector v = new ASN1EncodableVector();
-
-        v.add(usage);
-        v.add(new UnsignedInteger(0x01, getModulus()));
-        v.add(new UnsignedInteger(0x02, getPublicExponent()));
-
-        return new DERSequence(v);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/eac/UnsignedInteger.java b/bcprov/src/main/java/org/bouncycastle/asn1/eac/UnsignedInteger.java
deleted file mode 100644
index 64a9142..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/eac/UnsignedInteger.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package org.bouncycastle.asn1.eac;
-
-import java.math.BigInteger;
-
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1TaggedObject;
-import org.bouncycastle.asn1.DEROctetString;
-import org.bouncycastle.asn1.DERTaggedObject;
-
-public class UnsignedInteger
-    extends ASN1Object
-{
-    private int tagNo;
-    private BigInteger value;
-
-    public UnsignedInteger(int tagNo, BigInteger value)
-    {
-        this.tagNo = tagNo;
-        this.value = value;
-    }
-
-    private UnsignedInteger(ASN1TaggedObject obj)
-    {
-        this.tagNo = obj.getTagNo();
-        this.value = new BigInteger(1, ASN1OctetString.getInstance(obj, false).getOctets());
-    }
-
-    public static UnsignedInteger getInstance(Object obj)
-    {
-        if (obj instanceof  UnsignedInteger)
-        {
-            return (UnsignedInteger)obj;
-        }
-        if (obj != null)
-        {
-            return new UnsignedInteger(ASN1TaggedObject.getInstance(obj));
-        }
-
-        return null;
-    }
-
-    private byte[] convertValue()
-    {
-        byte[] v = value.toByteArray();
-
-        if (v[0] == 0)
-        {
-            byte[] tmp = new byte[v.length - 1];
-
-            System.arraycopy(v, 1, tmp, 0, tmp.length);
-
-            return tmp;
-        }
-
-        return v;
-    }
-
-    public int getTagNo()
-    {
-        return tagNo;
-    }
-
-    public BigInteger getValue()
-    {
-        return value;
-    }
-
-    public ASN1Primitive toASN1Primitive()
-    {
-        return new DERTaggedObject(false, tagNo, new DEROctetString(convertValue()));
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/eac/package.html b/bcprov/src/main/java/org/bouncycastle/asn1/eac/package.html
deleted file mode 100644
index 360d598..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/eac/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body bgcolor="#ffffff">
-ASN.1 classes specific to the Bundesamt f&uuml;r Sicherheit in der Informationstechnik (BSI) Technical Guideline Advanced Security Mechanisms for Machine Readable Travel Documents.
-</body>
-</html>
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/esf/CommitmentTypeIdentifier.java b/bcprov/src/main/java/org/bouncycastle/asn1/esf/CommitmentTypeIdentifier.java
deleted file mode 100644
index be52e45..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/esf/CommitmentTypeIdentifier.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package org.bouncycastle.asn1.esf;
-
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-
-public interface CommitmentTypeIdentifier
-{
-    public static final ASN1ObjectIdentifier proofOfOrigin = PKCSObjectIdentifiers.id_cti_ets_proofOfOrigin;
-    public static final ASN1ObjectIdentifier proofOfReceipt = PKCSObjectIdentifiers.id_cti_ets_proofOfReceipt;
-    public static final ASN1ObjectIdentifier proofOfDelivery = PKCSObjectIdentifiers.id_cti_ets_proofOfDelivery;
-    public static final ASN1ObjectIdentifier proofOfSender = PKCSObjectIdentifiers.id_cti_ets_proofOfSender;
-    public static final ASN1ObjectIdentifier proofOfApproval = PKCSObjectIdentifiers.id_cti_ets_proofOfApproval;
-    public static final ASN1ObjectIdentifier proofOfCreation = PKCSObjectIdentifiers.id_cti_ets_proofOfCreation;
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/esf/CommitmentTypeIndication.java b/bcprov/src/main/java/org/bouncycastle/asn1/esf/CommitmentTypeIndication.java
deleted file mode 100644
index 9e2533d..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/esf/CommitmentTypeIndication.java
+++ /dev/null
@@ -1,83 +0,0 @@
-package org.bouncycastle.asn1.esf;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DERSequence;
-
-public class CommitmentTypeIndication
-    extends ASN1Object
-{
-    private ASN1ObjectIdentifier   commitmentTypeId;
-    private ASN1Sequence          commitmentTypeQualifier;
-    
-    private CommitmentTypeIndication(
-        ASN1Sequence seq)
-    {
-        commitmentTypeId = (ASN1ObjectIdentifier)seq.getObjectAt(0);
-
-        if (seq.size() > 1)
-        {
-            commitmentTypeQualifier = (ASN1Sequence)seq.getObjectAt(1);
-        }
-    }
-
-    public CommitmentTypeIndication(
-        ASN1ObjectIdentifier commitmentTypeId)
-    {
-        this.commitmentTypeId = commitmentTypeId;
-    }
-
-    public CommitmentTypeIndication(
-        ASN1ObjectIdentifier commitmentTypeId,
-        ASN1Sequence        commitmentTypeQualifier)
-    {
-        this.commitmentTypeId = commitmentTypeId;
-        this.commitmentTypeQualifier = commitmentTypeQualifier;
-    }
-
-    public static CommitmentTypeIndication getInstance(
-        Object obj)
-    {
-        if (obj == null || obj instanceof CommitmentTypeIndication)
-        {
-            return (CommitmentTypeIndication)obj;
-        }
-
-        return new CommitmentTypeIndication(ASN1Sequence.getInstance(obj));
-    }
-
-    public ASN1ObjectIdentifier getCommitmentTypeId()
-    {
-        return commitmentTypeId;
-    }
-    
-    public ASN1Sequence getCommitmentTypeQualifier()
-    {
-        return commitmentTypeQualifier;
-    }
-    
-    /**
-     * <pre>
-     * CommitmentTypeIndication ::= SEQUENCE {
-     *      commitmentTypeId   CommitmentTypeIdentifier,
-     *      commitmentTypeQualifier   SEQUENCE SIZE (1..MAX) OF
-     *              CommitmentTypeQualifier OPTIONAL }
-     * </pre>
-     */ 
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector v = new ASN1EncodableVector();
-        
-        v.add(commitmentTypeId);
-
-        if (commitmentTypeQualifier != null)
-        {
-            v.add(commitmentTypeQualifier);
-        }
-        
-        return new DERSequence(v);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/esf/CommitmentTypeQualifier.java b/bcprov/src/main/java/org/bouncycastle/asn1/esf/CommitmentTypeQualifier.java
deleted file mode 100644
index 2cbba92..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/esf/CommitmentTypeQualifier.java
+++ /dev/null
@@ -1,108 +0,0 @@
-package org.bouncycastle.asn1.esf;
-
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DERSequence;
-
-/**
- * Commitment type qualifiers, used in the Commitment-Type-Indication attribute (RFC3126).
- * 
- * <pre>
- *   CommitmentTypeQualifier ::= SEQUENCE {
- *       commitmentTypeIdentifier  CommitmentTypeIdentifier,
- *       qualifier          ANY DEFINED BY commitmentTypeIdentifier OPTIONAL }
- * </pre>
- */
-public class CommitmentTypeQualifier
-    extends ASN1Object
-{
-   private ASN1ObjectIdentifier commitmentTypeIdentifier;
-   private ASN1Encodable qualifier;
-
-   /**
-    * Creates a new <code>CommitmentTypeQualifier</code> instance.
-    *
-    * @param commitmentTypeIdentifier a <code>CommitmentTypeIdentifier</code> value
-    */
-    public CommitmentTypeQualifier(
-        ASN1ObjectIdentifier commitmentTypeIdentifier)
-    {
-        this(commitmentTypeIdentifier, null);
-    }
-    
-   /**
-    * Creates a new <code>CommitmentTypeQualifier</code> instance.
-    *
-    * @param commitmentTypeIdentifier a <code>CommitmentTypeIdentifier</code> value
-    * @param qualifier the qualifier, defined by the above field.
-    */
-    public CommitmentTypeQualifier(
-        ASN1ObjectIdentifier commitmentTypeIdentifier,
-        ASN1Encodable qualifier)
-    {
-        this.commitmentTypeIdentifier = commitmentTypeIdentifier;
-        this.qualifier = qualifier;
-    }
-
-    /**
-     * Creates a new <code>CommitmentTypeQualifier</code> instance.
-     *
-     * @param as <code>CommitmentTypeQualifier</code> structure
-     * encoded as an ASN1Sequence. 
-     */
-    private CommitmentTypeQualifier(
-        ASN1Sequence as)
-    {
-        commitmentTypeIdentifier = (ASN1ObjectIdentifier)as.getObjectAt(0);
-        
-        if (as.size() > 1)
-        {
-            qualifier = as.getObjectAt(1);
-        }
-    }
-
-    public static CommitmentTypeQualifier getInstance(Object as)
-    {
-        if (as instanceof CommitmentTypeQualifier)
-        {
-            return (CommitmentTypeQualifier)as;
-        }
-        else if (as != null)
-        {
-            return new CommitmentTypeQualifier(ASN1Sequence.getInstance(as));
-        }
-
-        return null;
-    }
-
-    public ASN1ObjectIdentifier getCommitmentTypeIdentifier()
-    {
-        return commitmentTypeIdentifier;
-    }
-    
-    public ASN1Encodable getQualifier()
-    {
-        return qualifier;
-    }
-
-   /**
-    * Returns a DER-encodable representation of this instance. 
-    *
-    * @return a <code>ASN1Primitive</code> value
-    */
-   public ASN1Primitive toASN1Primitive()
-   {
-      ASN1EncodableVector dev = new ASN1EncodableVector();
-      dev.add(commitmentTypeIdentifier);
-      if (qualifier != null)
-      {
-          dev.add(qualifier);
-      }
-
-      return new DERSequence(dev);
-   }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/esf/CompleteRevocationRefs.java b/bcprov/src/main/java/org/bouncycastle/asn1/esf/CompleteRevocationRefs.java
deleted file mode 100644
index 4e81f29..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/esf/CompleteRevocationRefs.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package org.bouncycastle.asn1.esf;
-
-import java.util.Enumeration;
-
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DERSequence;
-
-/**
- * <pre>
- * CompleteRevocationRefs ::= SEQUENCE OF CrlOcspRef
- * </pre>
- */
-public class CompleteRevocationRefs
-    extends ASN1Object
-{
-
-    private ASN1Sequence crlOcspRefs;
-
-    public static CompleteRevocationRefs getInstance(Object obj)
-    {
-        if (obj instanceof CompleteRevocationRefs)
-        {
-            return (CompleteRevocationRefs)obj;
-        }
-        else if (obj != null)
-        {
-            return new CompleteRevocationRefs(ASN1Sequence.getInstance(obj));
-        }
-
-        return null;
-    }
-
-    private CompleteRevocationRefs(ASN1Sequence seq)
-    {
-        Enumeration seqEnum = seq.getObjects();
-        while (seqEnum.hasMoreElements())
-        {
-            CrlOcspRef.getInstance(seqEnum.nextElement());
-        }
-        this.crlOcspRefs = seq;
-    }
-
-    public CompleteRevocationRefs(CrlOcspRef[] crlOcspRefs)
-    {
-        this.crlOcspRefs = new DERSequence(crlOcspRefs);
-    }
-
-    public CrlOcspRef[] getCrlOcspRefs()
-    {
-        CrlOcspRef[] result = new CrlOcspRef[this.crlOcspRefs.size()];
-        for (int idx = 0; idx < result.length; idx++)
-        {
-            result[idx] = CrlOcspRef.getInstance(this.crlOcspRefs
-                .getObjectAt(idx));
-        }
-        return result;
-    }
-
-    public ASN1Primitive toASN1Primitive()
-    {
-        return this.crlOcspRefs;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/esf/CrlIdentifier.java b/bcprov/src/main/java/org/bouncycastle/asn1/esf/CrlIdentifier.java
deleted file mode 100644
index 6800418..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/esf/CrlIdentifier.java
+++ /dev/null
@@ -1,106 +0,0 @@
-package org.bouncycastle.asn1.esf;
-
-import java.math.BigInteger;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.ASN1UTCTime;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.x500.X500Name;
-
-/**
- * <pre>
- *  CrlIdentifier ::= SEQUENCE 
- * {
- *   crlissuer    Name,
- *   crlIssuedTime  UTCTime,
- *   crlNumber    INTEGER OPTIONAL
- * }
- * </pre>
- */
-public class CrlIdentifier
-    extends ASN1Object
-{
-    private X500Name crlIssuer;
-    private ASN1UTCTime crlIssuedTime;
-    private ASN1Integer crlNumber;
-
-    public static CrlIdentifier getInstance(Object obj)
-    {
-        if (obj instanceof CrlIdentifier)
-        {
-            return (CrlIdentifier)obj;
-        }
-        else if (obj != null)
-        {
-            return new CrlIdentifier(ASN1Sequence.getInstance(obj));
-        }
-
-        return null;
-    }
-
-    private CrlIdentifier(ASN1Sequence seq)
-    {
-        if (seq.size() < 2 || seq.size() > 3)
-        {
-            throw new IllegalArgumentException();
-        }
-        this.crlIssuer = X500Name.getInstance(seq.getObjectAt(0));
-        this.crlIssuedTime = ASN1UTCTime.getInstance(seq.getObjectAt(1));
-        if (seq.size() > 2)
-        {
-            this.crlNumber = ASN1Integer.getInstance(seq.getObjectAt(2));
-        }
-    }
-
-    public CrlIdentifier(X500Name crlIssuer, ASN1UTCTime crlIssuedTime)
-    {
-        this(crlIssuer, crlIssuedTime, null);
-    }
-
-    public CrlIdentifier(X500Name crlIssuer, ASN1UTCTime crlIssuedTime,
-                         BigInteger crlNumber)
-    {
-        this.crlIssuer = crlIssuer;
-        this.crlIssuedTime = crlIssuedTime;
-        if (null != crlNumber)
-        {
-            this.crlNumber = new ASN1Integer(crlNumber);
-        }
-    }
-
-    public X500Name getCrlIssuer()
-    {
-        return this.crlIssuer;
-    }
-
-    public ASN1UTCTime getCrlIssuedTime()
-    {
-        return this.crlIssuedTime;
-    }
-
-    public BigInteger getCrlNumber()
-    {
-        if (null == this.crlNumber)
-        {
-            return null;
-        }
-        return this.crlNumber.getValue();
-    }
-
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector v = new ASN1EncodableVector();
-        v.add(this.crlIssuer.toASN1Primitive());
-        v.add(this.crlIssuedTime);
-        if (null != this.crlNumber)
-        {
-            v.add(this.crlNumber);
-        }
-        return new DERSequence(v);
-    }
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/esf/CrlListID.java b/bcprov/src/main/java/org/bouncycastle/asn1/esf/CrlListID.java
deleted file mode 100644
index c0cb333..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/esf/CrlListID.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package org.bouncycastle.asn1.esf;
-
-import java.util.Enumeration;
-
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DERSequence;
-
-/**
- * <pre>
- * CRLListID ::= SEQUENCE {
- *     crls SEQUENCE OF CrlValidatedID }
- * </pre>
- */
-public class CrlListID
-    extends ASN1Object
-{
-
-    private ASN1Sequence crls;
-
-    public static CrlListID getInstance(Object obj)
-    {
-        if (obj instanceof CrlListID)
-        {
-            return (CrlListID)obj;
-        }
-        else if (obj != null)
-        {
-            return new CrlListID(ASN1Sequence.getInstance(obj));
-        }
-
-        return null;
-    }
-
-    private CrlListID(ASN1Sequence seq)
-    {
-        this.crls = (ASN1Sequence)seq.getObjectAt(0);
-        Enumeration e = this.crls.getObjects();
-        while (e.hasMoreElements())
-        {
-            CrlValidatedID.getInstance(e.nextElement());
-        }
-    }
-
-    public CrlListID(CrlValidatedID[] crls)
-    {
-        this.crls = new DERSequence(crls);
-    }
-
-    public CrlValidatedID[] getCrls()
-    {
-        CrlValidatedID[] result = new CrlValidatedID[this.crls.size()];
-        for (int idx = 0; idx < result.length; idx++)
-        {
-            result[idx] = CrlValidatedID
-                .getInstance(this.crls.getObjectAt(idx));
-        }
-        return result;
-    }
-
-    public ASN1Primitive toASN1Primitive()
-    {
-        return new DERSequence(this.crls);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/esf/CrlOcspRef.java b/bcprov/src/main/java/org/bouncycastle/asn1/esf/CrlOcspRef.java
deleted file mode 100644
index 39539f3..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/esf/CrlOcspRef.java
+++ /dev/null
@@ -1,106 +0,0 @@
-package org.bouncycastle.asn1.esf;
-
-import java.util.Enumeration;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.DERTaggedObject;
-
-/**
- * <pre>
- * CrlOcspRef ::= SEQUENCE {
- *     crlids [0] CRLListID OPTIONAL,
- *     ocspids [1] OcspListID OPTIONAL,
- *     otherRev [2] OtherRevRefs OPTIONAL
- * }
- * </pre>
- */
-public class CrlOcspRef
-    extends ASN1Object
-{
-
-    private CrlListID crlids;
-    private OcspListID ocspids;
-    private OtherRevRefs otherRev;
-
-    public static CrlOcspRef getInstance(Object obj)
-    {
-        if (obj instanceof CrlOcspRef)
-        {
-            return (CrlOcspRef)obj;
-        }
-        else if (obj != null)
-        {
-            return new CrlOcspRef(ASN1Sequence.getInstance(obj));
-        }
-
-        return null;
-    }
-
-    private CrlOcspRef(ASN1Sequence seq)
-    {
-        Enumeration e = seq.getObjects();
-        while (e.hasMoreElements())
-        {
-            DERTaggedObject o = (DERTaggedObject)e.nextElement();
-            switch (o.getTagNo())
-            {
-                case 0:
-                    this.crlids = CrlListID.getInstance(o.getObject());
-                    break;
-                case 1:
-                    this.ocspids = OcspListID.getInstance(o.getObject());
-                    break;
-                case 2:
-                    this.otherRev = OtherRevRefs.getInstance(o.getObject());
-                    break;
-                default:
-                    throw new IllegalArgumentException("illegal tag");
-            }
-        }
-    }
-
-    public CrlOcspRef(CrlListID crlids, OcspListID ocspids,
-                      OtherRevRefs otherRev)
-    {
-        this.crlids = crlids;
-        this.ocspids = ocspids;
-        this.otherRev = otherRev;
-    }
-
-    public CrlListID getCrlids()
-    {
-        return this.crlids;
-    }
-
-    public OcspListID getOcspids()
-    {
-        return this.ocspids;
-    }
-
-    public OtherRevRefs getOtherRev()
-    {
-        return this.otherRev;
-    }
-
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector v = new ASN1EncodableVector();
-        if (null != this.crlids)
-        {
-            v.add(new DERTaggedObject(true, 0, this.crlids.toASN1Primitive()));
-        }
-        if (null != this.ocspids)
-        {
-            v.add(new DERTaggedObject(true, 1, this.ocspids.toASN1Primitive()));
-        }
-        if (null != this.otherRev)
-        {
-            v.add(new DERTaggedObject(true, 2, this.otherRev.toASN1Primitive()));
-        }
-        return new DERSequence(v);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/esf/CrlValidatedID.java b/bcprov/src/main/java/org/bouncycastle/asn1/esf/CrlValidatedID.java
deleted file mode 100644
index b378aea..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/esf/CrlValidatedID.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package org.bouncycastle.asn1.esf;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DERSequence;
-
-/**
- * <pre>
- * CrlValidatedID ::= SEQUENCE {
- *   crlHash OtherHash,
- *   crlIdentifier CrlIdentifier OPTIONAL }
- * </pre>
- */
-public class CrlValidatedID
-    extends ASN1Object
-{
-
-    private OtherHash crlHash;
-    private CrlIdentifier crlIdentifier;
-
-    public static CrlValidatedID getInstance(Object obj)
-    {
-        if (obj instanceof CrlValidatedID)
-        {
-            return (CrlValidatedID)obj;
-        }
-        else if (obj != null)
-        {
-            return new CrlValidatedID(ASN1Sequence.getInstance(obj));
-        }
-
-        return null;
-    }
-
-    private CrlValidatedID(ASN1Sequence seq)
-    {
-        if (seq.size() < 1 || seq.size() > 2)
-        {
-            throw new IllegalArgumentException("Bad sequence size: "
-                + seq.size());
-        }
-        this.crlHash = OtherHash.getInstance(seq.getObjectAt(0));
-        if (seq.size() > 1)
-        {
-            this.crlIdentifier = CrlIdentifier.getInstance(seq.getObjectAt(1));
-        }
-    }
-
-    public CrlValidatedID(OtherHash crlHash)
-    {
-        this(crlHash, null);
-    }
-
-    public CrlValidatedID(OtherHash crlHash, CrlIdentifier crlIdentifier)
-    {
-        this.crlHash = crlHash;
-        this.crlIdentifier = crlIdentifier;
-    }
-
-    public OtherHash getCrlHash()
-    {
-        return this.crlHash;
-    }
-
-    public CrlIdentifier getCrlIdentifier()
-    {
-        return this.crlIdentifier;
-    }
-
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector v = new ASN1EncodableVector();
-        v.add(this.crlHash.toASN1Primitive());
-        if (null != this.crlIdentifier)
-        {
-            v.add(this.crlIdentifier.toASN1Primitive());
-        }
-        return new DERSequence(v);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/esf/ESFAttributes.java b/bcprov/src/main/java/org/bouncycastle/asn1/esf/ESFAttributes.java
deleted file mode 100644
index ebdc5ea..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/esf/ESFAttributes.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package org.bouncycastle.asn1.esf;
-
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-
-public interface ESFAttributes
-{
-    public static final ASN1ObjectIdentifier  sigPolicyId = PKCSObjectIdentifiers.id_aa_ets_sigPolicyId;
-    public static final ASN1ObjectIdentifier  commitmentType = PKCSObjectIdentifiers.id_aa_ets_commitmentType;
-    public static final ASN1ObjectIdentifier  signerLocation = PKCSObjectIdentifiers.id_aa_ets_signerLocation;
-    public static final ASN1ObjectIdentifier  signerAttr = PKCSObjectIdentifiers.id_aa_ets_signerAttr;
-    public static final ASN1ObjectIdentifier  otherSigCert = PKCSObjectIdentifiers.id_aa_ets_otherSigCert;
-    public static final ASN1ObjectIdentifier  contentTimestamp = PKCSObjectIdentifiers.id_aa_ets_contentTimestamp;
-    public static final ASN1ObjectIdentifier  certificateRefs = PKCSObjectIdentifiers.id_aa_ets_certificateRefs;
-    public static final ASN1ObjectIdentifier  revocationRefs = PKCSObjectIdentifiers.id_aa_ets_revocationRefs;
-    public static final ASN1ObjectIdentifier  certValues = PKCSObjectIdentifiers.id_aa_ets_certValues;
-    public static final ASN1ObjectIdentifier  revocationValues = PKCSObjectIdentifiers.id_aa_ets_revocationValues;
-    public static final ASN1ObjectIdentifier  escTimeStamp = PKCSObjectIdentifiers.id_aa_ets_escTimeStamp;
-    public static final ASN1ObjectIdentifier  certCRLTimestamp = PKCSObjectIdentifiers.id_aa_ets_certCRLTimestamp;
-    public static final ASN1ObjectIdentifier  archiveTimestamp = PKCSObjectIdentifiers.id_aa_ets_archiveTimestamp;
-    public static final ASN1ObjectIdentifier  archiveTimestampV2 = PKCSObjectIdentifiers.id_aa.branch("48");
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/esf/OcspIdentifier.java b/bcprov/src/main/java/org/bouncycastle/asn1/esf/OcspIdentifier.java
deleted file mode 100644
index a3c41d4..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/esf/OcspIdentifier.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package org.bouncycastle.asn1.esf;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1GeneralizedTime;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.ocsp.ResponderID;
-
-/**
- * <pre>
- * OcspIdentifier ::= SEQUENCE {
- *     ocspResponderID ResponderID, -- As in OCSP response data
- *     producedAt GeneralizedTime -- As in OCSP response data
- * }
- * </pre>
- */
-public class OcspIdentifier
-    extends ASN1Object
-{
-    private ResponderID ocspResponderID;
-    private ASN1GeneralizedTime producedAt;
-
-    public static OcspIdentifier getInstance(Object obj)
-    {
-        if (obj instanceof OcspIdentifier)
-        {
-            return (OcspIdentifier)obj;
-        }
-        else if (obj != null)
-        {
-            return new OcspIdentifier(ASN1Sequence.getInstance(obj));
-        }
-
-        return null;
-    }
-
-    private OcspIdentifier(ASN1Sequence seq)
-    {
-        if (seq.size() != 2)
-        {
-            throw new IllegalArgumentException("Bad sequence size: "
-                + seq.size());
-        }
-        this.ocspResponderID = ResponderID.getInstance(seq.getObjectAt(0));
-        this.producedAt = (ASN1GeneralizedTime)seq.getObjectAt(1);
-    }
-
-    public OcspIdentifier(ResponderID ocspResponderID, ASN1GeneralizedTime producedAt)
-    {
-        this.ocspResponderID = ocspResponderID;
-        this.producedAt = producedAt;
-    }
-
-    public ResponderID getOcspResponderID()
-    {
-        return this.ocspResponderID;
-    }
-
-    public ASN1GeneralizedTime getProducedAt()
-    {
-        return this.producedAt;
-    }
-
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector v = new ASN1EncodableVector();
-        v.add(this.ocspResponderID);
-        v.add(this.producedAt);
-        return new DERSequence(v);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/esf/OcspListID.java b/bcprov/src/main/java/org/bouncycastle/asn1/esf/OcspListID.java
deleted file mode 100644
index 349136f..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/esf/OcspListID.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package org.bouncycastle.asn1.esf;
-
-import java.util.Enumeration;
-
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DERSequence;
-
-/**
- * <pre>
- * OcspListID ::=  SEQUENCE {
- *    ocspResponses  SEQUENCE OF OcspResponsesID
- * }
- * </pre>
- */
-public class OcspListID
-    extends ASN1Object
-{
-    private ASN1Sequence ocspResponses;
-
-    public static OcspListID getInstance(Object obj)
-    {
-        if (obj instanceof OcspListID)
-        {
-            return (OcspListID)obj;
-        }
-        else if (obj != null)
-        {
-            return new OcspListID(ASN1Sequence.getInstance(obj));
-        }
-
-        return null;
-    }
-
-    private OcspListID(ASN1Sequence seq)
-    {
-        if (seq.size() != 1)
-        {
-            throw new IllegalArgumentException("Bad sequence size: "
-                + seq.size());
-        }
-        this.ocspResponses = (ASN1Sequence)seq.getObjectAt(0);
-        Enumeration e = this.ocspResponses.getObjects();
-        while (e.hasMoreElements())
-        {
-            OcspResponsesID.getInstance(e.nextElement());
-        }
-    }
-
-    public OcspListID(OcspResponsesID[] ocspResponses)
-    {
-        this.ocspResponses = new DERSequence(ocspResponses);
-    }
-
-    public OcspResponsesID[] getOcspResponses()
-    {
-        OcspResponsesID[] result = new OcspResponsesID[this.ocspResponses
-            .size()];
-        for (int idx = 0; idx < result.length; idx++)
-        {
-            result[idx] = OcspResponsesID.getInstance(this.ocspResponses
-                .getObjectAt(idx));
-        }
-        return result;
-    }
-
-    public ASN1Primitive toASN1Primitive()
-    {
-        return new DERSequence(this.ocspResponses);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/esf/OcspResponsesID.java b/bcprov/src/main/java/org/bouncycastle/asn1/esf/OcspResponsesID.java
deleted file mode 100644
index 2aac80e..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/esf/OcspResponsesID.java
+++ /dev/null
@@ -1,83 +0,0 @@
-package org.bouncycastle.asn1.esf;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DERSequence;
-
-/**
- * <pre>
- * OcspResponsesID ::= SEQUENCE {
- *    ocspIdentifier OcspIdentifier,
- *    ocspRepHash OtherHash OPTIONAL
- * }
- * </pre>
- */
-public class OcspResponsesID
-    extends ASN1Object
-{
-
-    private OcspIdentifier ocspIdentifier;
-    private OtherHash ocspRepHash;
-
-    public static OcspResponsesID getInstance(Object obj)
-    {
-        if (obj instanceof OcspResponsesID)
-        {
-            return (OcspResponsesID)obj;
-        }
-        else if (obj != null)
-        {
-            return new OcspResponsesID(ASN1Sequence.getInstance(obj));
-        }
-
-        return null;
-    }
-
-    private OcspResponsesID(ASN1Sequence seq)
-    {
-        if (seq.size() < 1 || seq.size() > 2)
-        {
-            throw new IllegalArgumentException("Bad sequence size: "
-                + seq.size());
-        }
-        this.ocspIdentifier = OcspIdentifier.getInstance(seq.getObjectAt(0));
-        if (seq.size() > 1)
-        {
-            this.ocspRepHash = OtherHash.getInstance(seq.getObjectAt(1));
-        }
-    }
-
-    public OcspResponsesID(OcspIdentifier ocspIdentifier)
-    {
-        this(ocspIdentifier, null);
-    }
-
-    public OcspResponsesID(OcspIdentifier ocspIdentifier, OtherHash ocspRepHash)
-    {
-        this.ocspIdentifier = ocspIdentifier;
-        this.ocspRepHash = ocspRepHash;
-    }
-
-    public OcspIdentifier getOcspIdentifier()
-    {
-        return this.ocspIdentifier;
-    }
-
-    public OtherHash getOcspRepHash()
-    {
-        return this.ocspRepHash;
-    }
-
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector v = new ASN1EncodableVector();
-        v.add(this.ocspIdentifier);
-        if (null != this.ocspRepHash)
-        {
-            v.add(this.ocspRepHash);
-        }
-        return new DERSequence(v);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/esf/OtherHash.java b/bcprov/src/main/java/org/bouncycastle/asn1/esf/OtherHash.java
deleted file mode 100644
index 0ec257d..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/esf/OtherHash.java
+++ /dev/null
@@ -1,81 +0,0 @@
-package org.bouncycastle.asn1.esf;
-
-import org.bouncycastle.asn1.ASN1Choice;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.DEROctetString;
-import org.bouncycastle.asn1.oiw.OIWObjectIdentifiers;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-
-/**
- * <pre>
- * OtherHash ::= CHOICE {
- *    sha1Hash  OtherHashValue, -- This contains a SHA-1 hash
- *   otherHash  OtherHashAlgAndValue
- *  }
- * </pre>
- */
-public class OtherHash
-    extends ASN1Object
-    implements ASN1Choice
-{
-
-    private ASN1OctetString sha1Hash;
-    private OtherHashAlgAndValue otherHash;
-
-    public static OtherHash getInstance(Object obj)
-    {
-        if (obj instanceof OtherHash)
-        {
-            return (OtherHash)obj;
-        }
-        if (obj instanceof ASN1OctetString)
-        {
-            return new OtherHash((ASN1OctetString)obj);
-        }
-        return new OtherHash(OtherHashAlgAndValue.getInstance(obj));
-    }
-
-    private OtherHash(ASN1OctetString sha1Hash)
-    {
-        this.sha1Hash = sha1Hash;
-    }
-
-    public OtherHash(OtherHashAlgAndValue otherHash)
-    {
-        this.otherHash = otherHash;
-    }
-
-    public OtherHash(byte[] sha1Hash)
-    {
-        this.sha1Hash = new DEROctetString(sha1Hash);
-    }
-
-    public AlgorithmIdentifier getHashAlgorithm()
-    {
-        if (null == this.otherHash)
-        {
-            return new AlgorithmIdentifier(OIWObjectIdentifiers.idSHA1);
-        }
-        return this.otherHash.getHashAlgorithm();
-    }
-
-    public byte[] getHashValue()
-    {
-        if (null == this.otherHash)
-        {
-            return this.sha1Hash.getOctets();
-        }
-        return this.otherHash.getHashValue().getOctets();
-    }
-
-    public ASN1Primitive toASN1Primitive()
-    {
-        if (null == this.otherHash)
-        {
-            return this.sha1Hash;
-        }
-        return this.otherHash.toASN1Primitive();
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/esf/OtherHashAlgAndValue.java b/bcprov/src/main/java/org/bouncycastle/asn1/esf/OtherHashAlgAndValue.java
deleted file mode 100644
index 34229d4..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/esf/OtherHashAlgAndValue.java
+++ /dev/null
@@ -1,81 +0,0 @@
-package org.bouncycastle.asn1.esf;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-
-public class OtherHashAlgAndValue
-    extends ASN1Object
-{
-    private AlgorithmIdentifier hashAlgorithm;
-    private ASN1OctetString     hashValue;
-
-
-    public static OtherHashAlgAndValue getInstance(
-        Object obj)
-    {
-        if (obj instanceof OtherHashAlgAndValue)
-        {
-            return (OtherHashAlgAndValue) obj;
-        }
-        else if (obj != null)
-        {
-            return new OtherHashAlgAndValue(ASN1Sequence.getInstance(obj));
-        }
-
-        return null;
-    }
-
-    private OtherHashAlgAndValue(
-        ASN1Sequence seq)
-    {
-        if (seq.size() != 2)
-        {
-            throw new IllegalArgumentException("Bad sequence size: " + seq.size());
-        }
-
-        hashAlgorithm = AlgorithmIdentifier.getInstance(seq.getObjectAt(0));
-        hashValue = ASN1OctetString.getInstance(seq.getObjectAt(1));
-    }
-
-    public OtherHashAlgAndValue(
-        AlgorithmIdentifier hashAlgorithm,
-        ASN1OctetString     hashValue)
-    {
-        this.hashAlgorithm = hashAlgorithm;
-        this.hashValue = hashValue;
-    }
-
-    public AlgorithmIdentifier getHashAlgorithm()
-    {
-        return hashAlgorithm;
-    }
-
-    public ASN1OctetString getHashValue()
-    {
-        return hashValue;
-    }
-
-    /**
-     * <pre>
-     * OtherHashAlgAndValue ::= SEQUENCE {
-     *     hashAlgorithm AlgorithmIdentifier,
-     *     hashValue OtherHashValue }
-     *
-     * OtherHashValue ::= OCTET STRING
-     * </pre>
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector v = new ASN1EncodableVector();
-
-        v.add(hashAlgorithm);
-        v.add(hashValue);
-
-        return new DERSequence(v);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/esf/OtherRevRefs.java b/bcprov/src/main/java/org/bouncycastle/asn1/esf/OtherRevRefs.java
deleted file mode 100644
index ed9a9b3..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/esf/OtherRevRefs.java
+++ /dev/null
@@ -1,87 +0,0 @@
-package org.bouncycastle.asn1.esf;
-
-import java.io.IOException;
-
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Encoding;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DERSequence;
-
-/**
- * <pre>
- * OtherRevRefs ::= SEQUENCE {
- *   otherRevRefType OtherRevRefType,
- *   otherRevRefs ANY DEFINED BY otherRevRefType
- * }
- *
- * OtherRevRefType ::= OBJECT IDENTIFIER
- * </pre>
- */
-public class OtherRevRefs
-    extends ASN1Object
-{
-
-    private ASN1ObjectIdentifier otherRevRefType;
-    private ASN1Encodable otherRevRefs;
-
-    public static OtherRevRefs getInstance(Object obj)
-    {
-        if (obj instanceof OtherRevRefs)
-        {
-            return (OtherRevRefs)obj;
-        }
-        else if (obj != null)
-        {
-            return new OtherRevRefs(ASN1Sequence.getInstance(obj));
-        }
-
-        return null;
-    }
-
-    private OtherRevRefs(ASN1Sequence seq)
-    {
-        if (seq.size() != 2)
-        {
-            throw new IllegalArgumentException("Bad sequence size: "
-                + seq.size());
-        }
-        this.otherRevRefType = new ASN1ObjectIdentifier(((ASN1ObjectIdentifier)seq.getObjectAt(0)).getId());
-        try
-        {
-            this.otherRevRefs = ASN1Primitive.fromByteArray(seq.getObjectAt(1)
-                .toASN1Primitive().getEncoded(ASN1Encoding.DER));
-        }
-        catch (IOException e)
-        {
-            throw new IllegalStateException();
-        }
-    }
-
-    public OtherRevRefs(ASN1ObjectIdentifier otherRevRefType, ASN1Encodable otherRevRefs)
-    {
-        this.otherRevRefType = otherRevRefType;
-        this.otherRevRefs = otherRevRefs;
-    }
-
-    public ASN1ObjectIdentifier getOtherRevRefType()
-    {
-        return this.otherRevRefType;
-    }
-
-    public ASN1Encodable getOtherRevRefs()
-    {
-        return this.otherRevRefs;
-    }
-
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector v = new ASN1EncodableVector();
-        v.add(this.otherRevRefType);
-        v.add(this.otherRevRefs);
-        return new DERSequence(v);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/esf/OtherRevVals.java b/bcprov/src/main/java/org/bouncycastle/asn1/esf/OtherRevVals.java
deleted file mode 100644
index 7389bdf..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/esf/OtherRevVals.java
+++ /dev/null
@@ -1,89 +0,0 @@
-package org.bouncycastle.asn1.esf;
-
-import java.io.IOException;
-
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Encoding;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DERSequence;
-
-/**
- * <pre>
- * OtherRevVals ::= SEQUENCE {
- *    otherRevValType OtherRevValType,
- *    otherRevVals ANY DEFINED BY OtherRevValType
- * }
- *
- * OtherRevValType ::= OBJECT IDENTIFIER
- * </pre>
- */
-public class OtherRevVals
-    extends ASN1Object
-{
-
-    private ASN1ObjectIdentifier otherRevValType;
-
-    private ASN1Encodable otherRevVals;
-
-    public static OtherRevVals getInstance(Object obj)
-    {
-        if (obj instanceof OtherRevVals)
-        {
-            return (OtherRevVals)obj;
-        }
-        if (obj != null)
-        {
-            return new OtherRevVals(ASN1Sequence.getInstance(obj));
-        }
-
-        return null;
-    }
-
-    private OtherRevVals(ASN1Sequence seq)
-    {
-        if (seq.size() != 2)
-        {
-            throw new IllegalArgumentException("Bad sequence size: "
-                + seq.size());
-        }
-        this.otherRevValType = (ASN1ObjectIdentifier)seq.getObjectAt(0);
-        try
-        {
-            this.otherRevVals = ASN1Primitive.fromByteArray(seq.getObjectAt(1)
-                .toASN1Primitive().getEncoded(ASN1Encoding.DER));
-        }
-        catch (IOException e)
-        {
-            throw new IllegalStateException();
-        }
-    }
-
-    public OtherRevVals(ASN1ObjectIdentifier otherRevValType,
-                        ASN1Encodable otherRevVals)
-    {
-        this.otherRevValType = otherRevValType;
-        this.otherRevVals = otherRevVals;
-    }
-
-    public ASN1ObjectIdentifier getOtherRevValType()
-    {
-        return this.otherRevValType;
-    }
-
-    public ASN1Encodable getOtherRevVals()
-    {
-        return this.otherRevVals;
-    }
-
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector v = new ASN1EncodableVector();
-        v.add(this.otherRevValType);
-        v.add(this.otherRevVals);
-        return new DERSequence(v);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/esf/RevocationValues.java b/bcprov/src/main/java/org/bouncycastle/asn1/esf/RevocationValues.java
deleted file mode 100644
index 9ff4113..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/esf/RevocationValues.java
+++ /dev/null
@@ -1,151 +0,0 @@
-package org.bouncycastle.asn1.esf;
-
-import java.util.Enumeration;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.DERTaggedObject;
-import org.bouncycastle.asn1.ocsp.BasicOCSPResponse;
-import org.bouncycastle.asn1.x509.CertificateList;
-
-/**
- * <pre>
- * RevocationValues ::= SEQUENCE {
- *    crlVals [0] SEQUENCE OF CertificateList OPTIONAL,
- *    ocspVals [1] SEQUENCE OF BasicOCSPResponse OPTIONAL,
- *    otherRevVals [2] OtherRevVals OPTIONAL}
- * </pre>
- */
-public class RevocationValues
-    extends ASN1Object
-{
-
-    private ASN1Sequence crlVals;
-    private ASN1Sequence ocspVals;
-    private OtherRevVals otherRevVals;
-
-    public static RevocationValues getInstance(Object obj)
-    {
-        if (obj instanceof RevocationValues)
-        {
-            return (RevocationValues)obj;
-        }
-        else if (obj != null)
-        {
-            return new RevocationValues(ASN1Sequence.getInstance(obj));
-        }
-
-        return null;
-    }
-
-    private RevocationValues(ASN1Sequence seq)
-    {
-        if (seq.size() > 3)
-        {
-            throw new IllegalArgumentException("Bad sequence size: "
-                + seq.size());
-        }
-        Enumeration e = seq.getObjects();
-        while (e.hasMoreElements())
-        {
-            DERTaggedObject o = (DERTaggedObject)e.nextElement();
-            switch (o.getTagNo())
-            {
-                case 0:
-                    ASN1Sequence crlValsSeq = (ASN1Sequence)o.getObject();
-                    Enumeration crlValsEnum = crlValsSeq.getObjects();
-                    while (crlValsEnum.hasMoreElements())
-                    {
-                        CertificateList.getInstance(crlValsEnum.nextElement());
-                    }
-                    this.crlVals = crlValsSeq;
-                    break;
-                case 1:
-                    ASN1Sequence ocspValsSeq = (ASN1Sequence)o.getObject();
-                    Enumeration ocspValsEnum = ocspValsSeq.getObjects();
-                    while (ocspValsEnum.hasMoreElements())
-                    {
-                        BasicOCSPResponse.getInstance(ocspValsEnum.nextElement());
-                    }
-                    this.ocspVals = ocspValsSeq;
-                    break;
-                case 2:
-                    this.otherRevVals = OtherRevVals.getInstance(o.getObject());
-                    break;
-                default:
-                    throw new IllegalArgumentException("invalid tag: "
-                        + o.getTagNo());
-            }
-        }
-    }
-
-    public RevocationValues(CertificateList[] crlVals,
-                            BasicOCSPResponse[] ocspVals, OtherRevVals otherRevVals)
-    {
-        if (null != crlVals)
-        {
-            this.crlVals = new DERSequence(crlVals);
-        }
-        if (null != ocspVals)
-        {
-            this.ocspVals = new DERSequence(ocspVals);
-        }
-        this.otherRevVals = otherRevVals;
-    }
-
-    public CertificateList[] getCrlVals()
-    {
-        if (null == this.crlVals)
-        {
-            return new CertificateList[0];
-        }
-        CertificateList[] result = new CertificateList[this.crlVals.size()];
-        for (int idx = 0; idx < result.length; idx++)
-        {
-            result[idx] = CertificateList.getInstance(this.crlVals
-                .getObjectAt(idx));
-        }
-        return result;
-    }
-
-    public BasicOCSPResponse[] getOcspVals()
-    {
-        if (null == this.ocspVals)
-        {
-            return new BasicOCSPResponse[0];
-        }
-        BasicOCSPResponse[] result = new BasicOCSPResponse[this.ocspVals.size()];
-        for (int idx = 0; idx < result.length; idx++)
-        {
-            result[idx] = BasicOCSPResponse.getInstance(this.ocspVals
-                .getObjectAt(idx));
-        }
-        return result;
-    }
-
-    public OtherRevVals getOtherRevVals()
-    {
-        return this.otherRevVals;
-    }
-
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector v = new ASN1EncodableVector();
-        if (null != this.crlVals)
-        {
-            v.add(new DERTaggedObject(true, 0, this.crlVals));
-        }
-        if (null != this.ocspVals)
-        {
-            v.add(new DERTaggedObject(true, 1, this.ocspVals));
-        }
-        if (null != this.otherRevVals)
-        {
-            v.add(new DERTaggedObject(true, 2, this.otherRevVals.toASN1Primitive()));
-        }
-        return new DERSequence(v);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/esf/SPUserNotice.java b/bcprov/src/main/java/org/bouncycastle/asn1/esf/SPUserNotice.java
deleted file mode 100644
index c026cde..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/esf/SPUserNotice.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package org.bouncycastle.asn1.esf;
-
-import java.util.Enumeration;
-
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.ASN1String;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.x509.DisplayText;
-import org.bouncycastle.asn1.x509.NoticeReference;
-
-public class SPUserNotice
-    extends ASN1Object
-{
-    private NoticeReference noticeRef;
-    private DisplayText     explicitText;
-
-    public static SPUserNotice getInstance(
-        Object obj)
-    {
-        if (obj instanceof SPUserNotice)
-        {
-            return (SPUserNotice)obj;
-        }
-        else if (obj != null)
-        {
-            return new SPUserNotice(ASN1Sequence.getInstance(obj));
-        }
-
-        return null;
-    }
-
-    private SPUserNotice(
-        ASN1Sequence seq)
-    {
-        Enumeration e = seq.getObjects();
-        while (e.hasMoreElements())
-        {
-            ASN1Encodable object = (ASN1Encodable)e.nextElement();
-            if (object instanceof DisplayText || object instanceof ASN1String)
-            {
-                explicitText = DisplayText.getInstance(object);
-            }
-            else if (object instanceof NoticeReference || object instanceof ASN1Sequence)
-            {
-                noticeRef = NoticeReference.getInstance(object);
-            }
-            else
-            {
-                throw new IllegalArgumentException("Invalid element in 'SPUserNotice': " + object.getClass().getName());
-            }
-        }
-    }
-
-    public SPUserNotice(
-        NoticeReference noticeRef,
-        DisplayText     explicitText)
-    {
-        this.noticeRef = noticeRef;
-        this.explicitText = explicitText;
-    }
-
-    public NoticeReference getNoticeRef()
-    {
-        return noticeRef;
-    }
-
-    public DisplayText getExplicitText()
-    {
-        return explicitText;
-    }
-
-    /**
-     * <pre>
-     * SPUserNotice ::= SEQUENCE {
-     *     noticeRef NoticeReference OPTIONAL,
-     *     explicitText DisplayText OPTIONAL }
-     * </pre>
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector  v = new ASN1EncodableVector();
-
-        if (noticeRef != null)
-        {
-            v.add(noticeRef);
-        }
-
-        if (explicitText != null)
-        {
-            v.add(explicitText);
-        }
-
-        return new DERSequence(v);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/esf/SPuri.java b/bcprov/src/main/java/org/bouncycastle/asn1/esf/SPuri.java
deleted file mode 100644
index 2e2483d..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/esf/SPuri.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package org.bouncycastle.asn1.esf;
-
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.DERIA5String;
-
-public class SPuri
-{
-    private DERIA5String uri;
-
-    public static SPuri getInstance(
-        Object obj)
-    {
-        if (obj instanceof SPuri)
-        {
-            return (SPuri) obj;
-        }
-        else if (obj instanceof DERIA5String)
-        {
-            return new SPuri(DERIA5String.getInstance(obj));
-        }
-
-        return null;
-    }
-
-    public SPuri(
-        DERIA5String uri)
-    {
-        this.uri = uri;
-    }
-
-    public DERIA5String getUri()
-    {
-        return uri;
-    }
-
-    /**
-     * <pre>
-     * SPuri ::= IA5String
-     * </pre>
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        return uri.toASN1Primitive();
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/esf/SigPolicyQualifierInfo.java b/bcprov/src/main/java/org/bouncycastle/asn1/esf/SigPolicyQualifierInfo.java
deleted file mode 100644
index 3ce4836..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/esf/SigPolicyQualifierInfo.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package org.bouncycastle.asn1.esf;
-
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DERSequence;
-
-public class SigPolicyQualifierInfo
-    extends ASN1Object
-{
-    private ASN1ObjectIdentifier  sigPolicyQualifierId;
-    private ASN1Encodable         sigQualifier;
-
-    public SigPolicyQualifierInfo(
-        ASN1ObjectIdentifier   sigPolicyQualifierId,
-        ASN1Encodable          sigQualifier)
-    {
-        this.sigPolicyQualifierId = sigPolicyQualifierId;
-        this.sigQualifier = sigQualifier;
-    }
-
-    private SigPolicyQualifierInfo(
-        ASN1Sequence seq)
-    {
-        sigPolicyQualifierId = ASN1ObjectIdentifier.getInstance(seq.getObjectAt(0));
-        sigQualifier = seq.getObjectAt(1);
-    }
-
-    public static SigPolicyQualifierInfo getInstance(
-        Object obj)
-    {
-        if (obj instanceof SigPolicyQualifierInfo)
-        {
-            return (SigPolicyQualifierInfo) obj;
-        }
-        else if (obj != null)
-        {
-            return new SigPolicyQualifierInfo(ASN1Sequence.getInstance(obj));
-        }
-
-        return null;
-    }
-
-    public ASN1ObjectIdentifier getSigPolicyQualifierId()
-    {
-        return new ASN1ObjectIdentifier(sigPolicyQualifierId.getId());
-    }
-
-    public ASN1Encodable getSigQualifier()
-    {
-        return sigQualifier;
-    }
-
-    /**
-     * <pre>
-     * SigPolicyQualifierInfo ::= SEQUENCE {
-     *    sigPolicyQualifierId SigPolicyQualifierId,
-     *    sigQualifier ANY DEFINED BY sigPolicyQualifierId }
-     *
-     * SigPolicyQualifierId ::= OBJECT IDENTIFIER
-     * </pre>
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector  v = new ASN1EncodableVector();
-
-        v.add(sigPolicyQualifierId);
-        v.add(sigQualifier);
-
-        return new DERSequence(v);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/esf/SigPolicyQualifiers.java b/bcprov/src/main/java/org/bouncycastle/asn1/esf/SigPolicyQualifiers.java
deleted file mode 100644
index 453c6d0..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/esf/SigPolicyQualifiers.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package org.bouncycastle.asn1.esf;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DERSequence;
-
-public class SigPolicyQualifiers
-    extends ASN1Object
-{
-    ASN1Sequence qualifiers;
-
-    public static SigPolicyQualifiers getInstance(
-        Object obj)
-    {
-        if (obj instanceof SigPolicyQualifiers)
-        {
-            return (SigPolicyQualifiers) obj;
-        }
-        else if (obj instanceof ASN1Sequence)
-        {
-            return new SigPolicyQualifiers(ASN1Sequence.getInstance(obj));
-        }
-
-        return null;
-    }
-
-    private SigPolicyQualifiers(
-        ASN1Sequence seq)
-    {
-        qualifiers = seq;
-    }
-
-    public SigPolicyQualifiers(
-        SigPolicyQualifierInfo[] qualifierInfos)
-    {
-        ASN1EncodableVector v = new ASN1EncodableVector();
-        for (int i=0; i < qualifierInfos.length; i++)
-        {
-            v.add(qualifierInfos[i]);
-        }
-        qualifiers = new DERSequence(v);
-    }
-
-    /**
-     * Return the number of qualifier info elements present.
-     *
-     * @return number of elements present.
-     */
-    public int size()
-    {
-        return qualifiers.size();
-    }
-
-    /**
-     * Return the SigPolicyQualifierInfo at index i.
-     *
-     * @param i index of the info of interest
-     * @return the info at index i.
-     */
-    public SigPolicyQualifierInfo getInfoAt(
-        int i)
-    {
-        return SigPolicyQualifierInfo.getInstance(qualifiers.getObjectAt(i));
-    }
-
-    /**
-     * <pre>
-     * SigPolicyQualifiers ::= SEQUENCE SIZE (1..MAX) OF SigPolicyQualifierInfo
-     * </pre>
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        return qualifiers;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/esf/SignaturePolicyId.java b/bcprov/src/main/java/org/bouncycastle/asn1/esf/SignaturePolicyId.java
deleted file mode 100644
index 10b88f8..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/esf/SignaturePolicyId.java
+++ /dev/null
@@ -1,103 +0,0 @@
-package org.bouncycastle.asn1.esf;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DERSequence;
-
-public class SignaturePolicyId
-    extends ASN1Object
-{
-    private ASN1ObjectIdentifier  sigPolicyId;
-    private OtherHashAlgAndValue sigPolicyHash;
-    private SigPolicyQualifiers  sigPolicyQualifiers;
-
-
-    public static SignaturePolicyId getInstance(
-        Object obj)
-    {
-        if (obj instanceof SignaturePolicyId)
-        {
-            return (SignaturePolicyId)obj;
-        }
-        else if (obj != null)
-        {
-            return new SignaturePolicyId(ASN1Sequence.getInstance(obj));
-        }
-
-        return null;
-    }
-
-    private SignaturePolicyId(
-        ASN1Sequence seq)
-    {
-        if (seq.size() != 2 && seq.size() != 3)
-        {
-            throw new IllegalArgumentException("Bad sequence size: " + seq.size());
-        }
-
-        sigPolicyId = ASN1ObjectIdentifier.getInstance(seq.getObjectAt(0));
-        sigPolicyHash = OtherHashAlgAndValue.getInstance(seq.getObjectAt(1));
-
-        if (seq.size() == 3)
-        {
-            sigPolicyQualifiers = SigPolicyQualifiers.getInstance(seq.getObjectAt(2));
-        }
-    }
-
-    public SignaturePolicyId(
-        ASN1ObjectIdentifier   sigPolicyIdentifier,
-        OtherHashAlgAndValue  sigPolicyHash)
-    {
-        this(sigPolicyIdentifier, sigPolicyHash, null);
-    }
-
-    public SignaturePolicyId(
-        ASN1ObjectIdentifier   sigPolicyId,
-        OtherHashAlgAndValue  sigPolicyHash,
-        SigPolicyQualifiers   sigPolicyQualifiers)
-    {
-        this.sigPolicyId = sigPolicyId;
-        this.sigPolicyHash = sigPolicyHash;
-        this.sigPolicyQualifiers = sigPolicyQualifiers;
-    }
-
-    public ASN1ObjectIdentifier getSigPolicyId()
-    {
-        return new ASN1ObjectIdentifier(sigPolicyId.getId());
-    }
-
-    public OtherHashAlgAndValue getSigPolicyHash()
-    {
-        return sigPolicyHash;
-    }
-
-    public SigPolicyQualifiers getSigPolicyQualifiers()
-    {
-        return sigPolicyQualifiers;
-    }
-
-    /**
-     * <pre>
-     * SignaturePolicyId ::= SEQUENCE {
-     *     sigPolicyId SigPolicyId,
-     *     sigPolicyHash SigPolicyHash,
-     *     sigPolicyQualifiers SEQUENCE SIZE (1..MAX) OF SigPolicyQualifierInfo OPTIONAL}
-     * </pre>
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector  v = new ASN1EncodableVector();
-
-        v.add(sigPolicyId);
-        v.add(sigPolicyHash);
-        if (sigPolicyQualifiers != null)
-        {
-            v.add(sigPolicyQualifiers);
-        }
-
-        return new DERSequence(v);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/esf/SignaturePolicyIdentifier.java b/bcprov/src/main/java/org/bouncycastle/asn1/esf/SignaturePolicyIdentifier.java
deleted file mode 100644
index acd8ac4..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/esf/SignaturePolicyIdentifier.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package org.bouncycastle.asn1.esf;
-
-import org.bouncycastle.asn1.ASN1Null;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.BERTags;
-import org.bouncycastle.asn1.DERNull;
-
-public class SignaturePolicyIdentifier
-    extends ASN1Object
-{
-    private SignaturePolicyId   signaturePolicyId;
-    private boolean             isSignaturePolicyImplied;
-
-    public static SignaturePolicyIdentifier getInstance(
-        Object  obj)
-    {
-        if (obj instanceof SignaturePolicyIdentifier)
-        {
-            return (SignaturePolicyIdentifier)obj;
-        }
-        else if (obj instanceof ASN1Null || hasEncodedTagValue(obj, BERTags.NULL))
-        {
-            return new SignaturePolicyIdentifier();
-        }
-        else if (obj != null)
-        {
-            return new SignaturePolicyIdentifier(SignaturePolicyId.getInstance(obj));
-        }
-
-        return null;
-    }
-
-    public SignaturePolicyIdentifier()
-    {
-        this.isSignaturePolicyImplied = true;
-    }
-
-    public SignaturePolicyIdentifier(
-        SignaturePolicyId signaturePolicyId)
-    {
-        this.signaturePolicyId = signaturePolicyId;
-        this.isSignaturePolicyImplied = false;
-    }
-
-    public SignaturePolicyId getSignaturePolicyId()
-    {
-        return signaturePolicyId;
-    }
-
-    public boolean isSignaturePolicyImplied()
-    {
-        return isSignaturePolicyImplied;
-    }
-
-    /**
-     * <pre>
-     * SignaturePolicyIdentifier ::= CHOICE{
-     *     SignaturePolicyId         SignaturePolicyId,
-     *     SignaturePolicyImplied    SignaturePolicyImplied }
-     *
-     * SignaturePolicyImplied ::= NULL
-     * </pre>
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        if (isSignaturePolicyImplied)
-        {
-            return DERNull.INSTANCE;
-        }
-        else
-        {
-            return signaturePolicyId.toASN1Primitive();
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/esf/SignerAttribute.java b/bcprov/src/main/java/org/bouncycastle/asn1/esf/SignerAttribute.java
deleted file mode 100644
index ecc4db3..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/esf/SignerAttribute.java
+++ /dev/null
@@ -1,123 +0,0 @@
-package org.bouncycastle.asn1.esf;
-
-import java.util.Enumeration;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.ASN1TaggedObject;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.DERTaggedObject;
-import org.bouncycastle.asn1.x509.Attribute;
-import org.bouncycastle.asn1.x509.AttributeCertificate;
-
-
-public class SignerAttribute
-    extends ASN1Object
-{
-    private Object[] values;
-
-    public static SignerAttribute getInstance(
-        Object o)
-    {
-        if (o instanceof SignerAttribute)
-        {
-            return (SignerAttribute) o;
-        }
-        else if (o != null)
-        {
-            return new SignerAttribute(ASN1Sequence.getInstance(o));
-        }
-
-        return null;
-    }
-
-    private SignerAttribute(
-        ASN1Sequence seq)
-    {
-        int index = 0;
-        values = new Object[seq.size()];
-
-        for (Enumeration e = seq.getObjects(); e.hasMoreElements();)
-        {
-            ASN1TaggedObject taggedObject = ASN1TaggedObject.getInstance(e.nextElement());
-
-            if (taggedObject.getTagNo() == 0)
-            {
-                ASN1Sequence attrs = ASN1Sequence.getInstance(taggedObject, true);
-                Attribute[]  attributes = new Attribute[attrs.size()];
-
-                for (int i = 0; i != attributes.length; i++)
-                {
-                    attributes[i] = Attribute.getInstance(attrs.getObjectAt(i));
-                }
-                values[index] = attributes;
-            }
-            else if (taggedObject.getTagNo() == 1)
-            {
-                values[index] = AttributeCertificate.getInstance(ASN1Sequence.getInstance(taggedObject, true));
-            }
-            else
-            {
-                throw new IllegalArgumentException("illegal tag: " + taggedObject.getTagNo());
-            }
-            index++;
-        }
-    }
-
-    public SignerAttribute(
-        Attribute[] claimedAttributes)
-    {
-        this.values = new Object[1];
-        this.values[0] = claimedAttributes;
-    }
-
-    public SignerAttribute(
-        AttributeCertificate certifiedAttributes)
-    {
-        this.values = new Object[1];
-        this.values[0] = certifiedAttributes;
-    }
-
-    /**
-     * Return the sequence of choices - the array elements will either be of
-     * type Attribute[] or AttributeCertificate depending on what tag was used.
-     *
-     * @return array of choices.
-     */
-    public Object[] getValues()
-    {
-        return values;
-    }
-
-    /**
-     *
-     * <pre>
-     *  SignerAttribute ::= SEQUENCE OF CHOICE {
-     *      claimedAttributes   [0] ClaimedAttributes,
-     *      certifiedAttributes [1] CertifiedAttributes }
-     *
-     *  ClaimedAttributes ::= SEQUENCE OF Attribute
-     *  CertifiedAttributes ::= AttributeCertificate -- as defined in RFC 3281: see clause 4.1.
-     * </pre>
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector v = new ASN1EncodableVector();
-
-        for (int i = 0; i != values.length; i++)
-        {
-            if (values[i] instanceof Attribute[])
-            {
-                v.add(new DERTaggedObject(0, new DERSequence((Attribute[])values[i])));
-            }
-            else
-            {
-                v.add(new DERTaggedObject(1, (AttributeCertificate)values[i]));
-            }
-        }
-
-        return new DERSequence(v);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/esf/SignerLocation.java b/bcprov/src/main/java/org/bouncycastle/asn1/esf/SignerLocation.java
deleted file mode 100644
index fcdb320..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/esf/SignerLocation.java
+++ /dev/null
@@ -1,162 +0,0 @@
-package org.bouncycastle.asn1.esf;
-
-import java.util.Enumeration;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.DERTaggedObject;
-import org.bouncycastle.asn1.DERUTF8String;
-import org.bouncycastle.asn1.x500.DirectoryString;
-
-/**
- * Signer-Location attribute (RFC3126).
- * 
- * <pre>
- *   SignerLocation ::= SEQUENCE {
- *       countryName        [0] DirectoryString OPTIONAL,
- *       localityName       [1] DirectoryString OPTIONAL,
- *       postalAddress      [2] PostalAddress OPTIONAL }
- *
- *   PostalAddress ::= SEQUENCE SIZE(1..6) OF DirectoryString
- * </pre>
- */
-public class SignerLocation
-    extends ASN1Object
-{
-    private DERUTF8String   countryName;
-    private DERUTF8String   localityName;
-    private ASN1Sequence    postalAddress;
-    
-    private SignerLocation(
-        ASN1Sequence seq)
-    {
-        Enumeration     e = seq.getObjects();
-
-        while (e.hasMoreElements())
-        {
-            DERTaggedObject o = (DERTaggedObject)e.nextElement();
-
-            switch (o.getTagNo())
-            {
-            case 0:
-                DirectoryString countryNameDirectoryString = DirectoryString.getInstance(o, true);
-                this.countryName = new DERUTF8String(countryNameDirectoryString.getString());
-                break;
-            case 1:
-                DirectoryString localityNameDirectoryString = DirectoryString.getInstance(o, true);
-                this.localityName = new DERUTF8String(localityNameDirectoryString.getString());
-                break;
-            case 2:
-                if (o.isExplicit())
-                {
-                    this.postalAddress = ASN1Sequence.getInstance(o, true);
-                }
-                else    // handle erroneous implicitly tagged sequences
-                {
-                    this.postalAddress = ASN1Sequence.getInstance(o, false);
-                }
-                if (postalAddress != null && postalAddress.size() > 6)
-                {
-                    throw new IllegalArgumentException("postal address must contain less than 6 strings");
-                }
-                break;
-            default:
-                throw new IllegalArgumentException("illegal tag");
-            }
-        }
-    }
-
-    public SignerLocation(
-        DERUTF8String   countryName,
-        DERUTF8String   localityName,
-        ASN1Sequence    postalAddress)
-    {
-        if (postalAddress != null && postalAddress.size() > 6)
-        {
-            throw new IllegalArgumentException("postal address must contain less than 6 strings");
-        }
-
-        if (countryName != null)
-        {
-            this.countryName = DERUTF8String.getInstance(countryName.toASN1Primitive());
-        }
-
-        if (localityName != null)
-        {
-            this.localityName = DERUTF8String.getInstance(localityName.toASN1Primitive());
-        }
-
-        if (postalAddress != null)
-        {
-            this.postalAddress = ASN1Sequence.getInstance(postalAddress.toASN1Primitive());
-        }
-    }
-
-    public static SignerLocation getInstance(
-        Object obj)
-    {
-        if (obj == null || obj instanceof SignerLocation)
-        {
-            return (SignerLocation)obj;
-        }
-
-        return new SignerLocation(ASN1Sequence.getInstance(obj));
-    }
-
-    public DERUTF8String getCountryName()
-    {
-        return countryName;
-    }
-
-    public DERUTF8String getLocalityName()
-    {
-        return localityName;
-    }
-
-    public ASN1Sequence getPostalAddress()
-    {
-        return postalAddress;
-    }
-
-    /**
-     * <pre>
-     *   SignerLocation ::= SEQUENCE {
-     *       countryName        [0] DirectoryString OPTIONAL,
-     *       localityName       [1] DirectoryString OPTIONAL,
-     *       postalAddress      [2] PostalAddress OPTIONAL }
-     *
-     *   PostalAddress ::= SEQUENCE SIZE(1..6) OF DirectoryString
-     *   
-     *   DirectoryString ::= CHOICE {
-     *         teletexString           TeletexString (SIZE (1..MAX)),
-     *         printableString         PrintableString (SIZE (1..MAX)),
-     *         universalString         UniversalString (SIZE (1..MAX)),
-     *         utf8String              UTF8String (SIZE (1.. MAX)),
-     *         bmpString               BMPString (SIZE (1..MAX)) }
-     * </pre>
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector  v = new ASN1EncodableVector();
-
-        if (countryName != null)
-        {
-            v.add(new DERTaggedObject(true, 0, countryName));
-        }
-
-        if (localityName != null)
-        {
-            v.add(new DERTaggedObject(true, 1, localityName));
-        }
-
-        if (postalAddress != null)
-        {
-            v.add(new DERTaggedObject(true, 2, postalAddress));
-        }
-
-        return new DERSequence(v);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/esf/package.html b/bcprov/src/main/java/org/bouncycastle/asn1/esf/package.html
deleted file mode 100644
index de27367..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/esf/package.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<html>
-<body bgcolor="#ffffff">
-Support classes useful for encoding and supporting [ESF] RFC3126 
-Electronic Signature Formats for long term electronic signatures.
-</body>
-</html>
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/ess/ContentHints.java b/bcprov/src/main/java/org/bouncycastle/asn1/ess/ContentHints.java
deleted file mode 100644
index 462d968..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/ess/ContentHints.java
+++ /dev/null
@@ -1,94 +0,0 @@
-package org.bouncycastle.asn1.ess;
-
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.DERUTF8String;
-
-public class ContentHints
-    extends ASN1Object
-{
-    private DERUTF8String contentDescription;
-    private ASN1ObjectIdentifier contentType;
-
-    public static ContentHints getInstance(Object o)
-    {
-        if (o instanceof ContentHints)
-        {
-            return (ContentHints)o;
-        }
-        else if (o != null)
-        {
-            return new ContentHints(ASN1Sequence.getInstance(o));
-        }
-
-        return null;
-    }
-
-    /**
-     * constructor
-     */
-    private ContentHints(ASN1Sequence seq)
-    {
-        ASN1Encodable field = seq.getObjectAt(0);
-        if (field.toASN1Primitive() instanceof DERUTF8String)
-        {
-            contentDescription = DERUTF8String.getInstance(field);
-            contentType = ASN1ObjectIdentifier.getInstance(seq.getObjectAt(1));
-        }
-        else
-        {
-            contentType = ASN1ObjectIdentifier.getInstance(seq.getObjectAt(0));
-        }
-    }
-
-    public ContentHints(
-        ASN1ObjectIdentifier contentType)
-    {
-        this.contentType = contentType;
-        this.contentDescription = null;
-    }
-
-    public ContentHints(
-        ASN1ObjectIdentifier contentType,
-        DERUTF8String contentDescription)
-    {
-        this.contentType = contentType;
-        this.contentDescription = contentDescription;
-    }
-
-    public ASN1ObjectIdentifier getContentType()
-    {
-        return contentType;
-    }
-
-    public DERUTF8String getContentDescription()
-    {
-        return contentDescription;
-    }
-
-    /**
-     * <pre>
-     * ContentHints ::= SEQUENCE {
-     *   contentDescription UTF8String (SIZE (1..MAX)) OPTIONAL,
-     *   contentType ContentType }
-     * </pre>
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector v = new ASN1EncodableVector();
-
-        if (contentDescription != null)
-        {
-            v.add(contentDescription);
-        }
-
-        v.add(contentType);
-
-        return new DERSequence(v);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/ess/ContentIdentifier.java b/bcprov/src/main/java/org/bouncycastle/asn1/ess/ContentIdentifier.java
deleted file mode 100644
index 37064c4..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/ess/ContentIdentifier.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package org.bouncycastle.asn1.ess;
-
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.DEROctetString;
-
-public class ContentIdentifier
-    extends ASN1Object
-{
-     ASN1OctetString value;
-
-    public static ContentIdentifier getInstance(Object o)
-    {
-        if (o instanceof ContentIdentifier)
-        {
-            return (ContentIdentifier) o;
-        }
-        else if (o != null)
-        {
-            return new ContentIdentifier(ASN1OctetString.getInstance(o));
-        }
-
-        return null;
-    }
-
-    /**
-     * Create from OCTET STRING whose octets represent the identifier.
-     */
-    private ContentIdentifier(
-        ASN1OctetString value)
-    {
-        this.value = value;
-    }
-
-    /**
-     * Create from byte array representing the identifier.
-     */
-    public ContentIdentifier(
-        byte[] value)
-    {
-        this(new DEROctetString(value));
-    }
-    
-    public ASN1OctetString getValue()
-    {
-        return value;
-    }
-
-    /**
-     * The definition of ContentIdentifier is
-     * <pre>
-     * ContentIdentifier ::=  OCTET STRING
-     * </pre>
-     * id-aa-contentIdentifier OBJECT IDENTIFIER ::= { iso(1)
-     *  member-body(2) us(840) rsadsi(113549) pkcs(1) pkcs9(9)
-     *  smime(16) id-aa(2) 7 }
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        return value;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/ess/ESSCertID.java b/bcprov/src/main/java/org/bouncycastle/asn1/ess/ESSCertID.java
deleted file mode 100644
index a6cc315..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/ess/ESSCertID.java
+++ /dev/null
@@ -1,95 +0,0 @@
-package org.bouncycastle.asn1.ess;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DEROctetString;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.x509.IssuerSerial;
-
-public class ESSCertID
-    extends ASN1Object
-{
-    private ASN1OctetString certHash;
-
-    private IssuerSerial issuerSerial;
-
-    public static ESSCertID getInstance(Object o)
-    {
-        if (o instanceof ESSCertID)
-        {
-            return (ESSCertID)o;
-        }
-        else if (o != null)
-        {
-            return new ESSCertID(ASN1Sequence.getInstance(o));
-        }
-
-        return null;
-    }
-
-    /**
-     * constructor
-     */
-    private ESSCertID(ASN1Sequence seq)
-    {
-        if (seq.size() < 1 || seq.size() > 2)
-        {
-            throw new IllegalArgumentException("Bad sequence size: " + seq.size());
-        }
-
-        certHash = ASN1OctetString.getInstance(seq.getObjectAt(0));
- 
-        if (seq.size() > 1)
-        {
-            issuerSerial = IssuerSerial.getInstance(seq.getObjectAt(1));
-        }
-    }
-
-    public ESSCertID(
-        byte[]          hash)
-    {
-        certHash = new DEROctetString(hash);
-    }
-
-    public ESSCertID(
-        byte[]          hash,
-        IssuerSerial    issuerSerial)
-    {
-        this.certHash = new DEROctetString(hash);
-        this.issuerSerial = issuerSerial;
-    }
-
-    public byte[] getCertHash()
-    {
-        return certHash.getOctets();
-    }
-
-    public IssuerSerial getIssuerSerial()
-    {
-        return issuerSerial;
-    }
-
-    /**
-     * <pre>
-     * ESSCertID ::= SEQUENCE {
-     *     certHash Hash, 
-     *     issuerSerial IssuerSerial OPTIONAL }
-     * </pre>
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector v = new ASN1EncodableVector();
-        
-        v.add(certHash);
-        
-        if (issuerSerial != null)
-        {
-            v.add(issuerSerial);
-        }
-
-        return new DERSequence(v);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/ess/ESSCertIDv2.java b/bcprov/src/main/java/org/bouncycastle/asn1/ess/ESSCertIDv2.java
deleted file mode 100644
index b511f2c..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/ess/ESSCertIDv2.java
+++ /dev/null
@@ -1,155 +0,0 @@
-package org.bouncycastle.asn1.ess;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DEROctetString;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.nist.NISTObjectIdentifiers;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.asn1.x509.IssuerSerial;
-
-public class ESSCertIDv2
-    extends ASN1Object
-{
-    private AlgorithmIdentifier hashAlgorithm;
-    private byte[]              certHash;
-    private IssuerSerial        issuerSerial;
-    private static final AlgorithmIdentifier DEFAULT_ALG_ID = new AlgorithmIdentifier(NISTObjectIdentifiers.id_sha256);
-
-    public static ESSCertIDv2 getInstance(
-        Object o)
-    {
-        if (o instanceof ESSCertIDv2)
-        {
-            return (ESSCertIDv2) o;
-        }
-        else if (o != null)
-        {
-            return new ESSCertIDv2(ASN1Sequence.getInstance(o));
-        }
-
-        return null;
-    }
-
-    private ESSCertIDv2(
-        ASN1Sequence seq)
-    {
-        if (seq.size() > 3)
-        {
-            throw new IllegalArgumentException("Bad sequence size: " + seq.size());
-        }
-
-        int count = 0;
-
-        if (seq.getObjectAt(0) instanceof ASN1OctetString)
-        {
-            // Default value
-            this.hashAlgorithm = DEFAULT_ALG_ID;
-        }
-        else
-        {
-            this.hashAlgorithm = AlgorithmIdentifier.getInstance(seq.getObjectAt(count++).toASN1Primitive());
-        }
-
-        this.certHash = ASN1OctetString.getInstance(seq.getObjectAt(count++).toASN1Primitive()).getOctets();
-
-        if (seq.size() > count)
-        {
-            this.issuerSerial = IssuerSerial.getInstance(seq.getObjectAt(count));
-        }
-    }
-
-    public ESSCertIDv2(
-        byte[]              certHash)
-    {
-        this(null, certHash, null);
-    }
-
-    public ESSCertIDv2(
-        AlgorithmIdentifier algId,
-        byte[]              certHash)
-    {
-        this(algId, certHash, null);
-    }
-
-    public ESSCertIDv2(
-        byte[]              certHash,
-        IssuerSerial        issuerSerial)
-    {
-        this(null, certHash, issuerSerial);
-    }
-
-    public ESSCertIDv2(
-        AlgorithmIdentifier algId,
-        byte[]              certHash,
-        IssuerSerial        issuerSerial)
-    {
-        if (algId == null)
-        {
-            // Default value
-            this.hashAlgorithm = DEFAULT_ALG_ID;
-        }
-        else
-        {
-            this.hashAlgorithm = algId;
-        }
-
-        this.certHash = certHash;
-        this.issuerSerial = issuerSerial;
-    }
-
-    public AlgorithmIdentifier getHashAlgorithm()
-    {
-        return this.hashAlgorithm;
-    }
-
-    public byte[] getCertHash()
-    {
-        return certHash;
-    }
-
-    public IssuerSerial getIssuerSerial()
-    {
-        return issuerSerial;
-    }
-
-    /**
-     * <pre>
-     * ESSCertIDv2 ::=  SEQUENCE {
-     *     hashAlgorithm     AlgorithmIdentifier
-     *              DEFAULT {algorithm id-sha256},
-     *     certHash          Hash,
-     *     issuerSerial      IssuerSerial OPTIONAL
-     * }
-     *
-     * Hash ::= OCTET STRING
-     *
-     * IssuerSerial ::= SEQUENCE {
-     *     issuer         GeneralNames,
-     *     serialNumber   CertificateSerialNumber
-     * }
-     * </pre>
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector v = new ASN1EncodableVector();
-
-        if (!hashAlgorithm.equals(DEFAULT_ALG_ID))
-        {
-            v.add(hashAlgorithm);
-        }
-
-        v.add(new DEROctetString(certHash).toASN1Primitive());
-
-        if (issuerSerial != null)
-        {
-            v.add(issuerSerial);
-        }
-
-        return new DERSequence(v);
-    }
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/ess/OtherCertID.java b/bcprov/src/main/java/org/bouncycastle/asn1/ess/OtherCertID.java
deleted file mode 100644
index 2cc88ec..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/ess/OtherCertID.java
+++ /dev/null
@@ -1,137 +0,0 @@
-package org.bouncycastle.asn1.ess;
-
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.asn1.x509.DigestInfo;
-import org.bouncycastle.asn1.x509.IssuerSerial;
-
-public class OtherCertID
-    extends ASN1Object
-{
-    private ASN1Encodable otherCertHash;
-    private IssuerSerial issuerSerial;
-
-    public static OtherCertID getInstance(Object o)
-    {
-        if (o instanceof OtherCertID)
-        {
-            return (OtherCertID) o;
-        }
-        else if (o != null)
-        {
-            return new OtherCertID(ASN1Sequence.getInstance(o));
-        }
-
-        return null;
-    }
-
-    /**
-     * constructor
-     */
-    private OtherCertID(ASN1Sequence seq)
-    {
-        if (seq.size() < 1 || seq.size() > 2)
-        {
-            throw new IllegalArgumentException("Bad sequence size: "
-                    + seq.size());
-        }
-
-        if (seq.getObjectAt(0).toASN1Primitive() instanceof ASN1OctetString)
-        {
-            otherCertHash = ASN1OctetString.getInstance(seq.getObjectAt(0));
-        }
-        else
-        {
-            otherCertHash = DigestInfo.getInstance(seq.getObjectAt(0));
-
-        }
-
-        if (seq.size() > 1)
-        {
-            issuerSerial = IssuerSerial.getInstance(seq.getObjectAt(1));
-        }
-    }
-
-    public OtherCertID(
-        AlgorithmIdentifier  algId,
-        byte[]               digest)
-    {
-        this.otherCertHash = new DigestInfo(algId, digest);
-    }
-
-    public OtherCertID(
-        AlgorithmIdentifier  algId,
-        byte[]               digest,
-        IssuerSerial    issuerSerial)
-    {
-        this.otherCertHash = new DigestInfo(algId, digest);
-        this.issuerSerial = issuerSerial;
-    }
-
-    public AlgorithmIdentifier getAlgorithmHash()
-    {
-        if (otherCertHash.toASN1Primitive() instanceof ASN1OctetString)
-        {
-            // SHA-1
-            return new AlgorithmIdentifier("1.3.14.3.2.26");
-        }
-        else
-        {
-            return DigestInfo.getInstance(otherCertHash).getAlgorithmId();
-        }
-    }
-
-    public byte[] getCertHash()
-    {
-        if (otherCertHash.toASN1Primitive() instanceof ASN1OctetString)
-        {
-            // SHA-1
-            return ((ASN1OctetString)otherCertHash.toASN1Primitive()).getOctets();
-        }
-        else
-        {
-            return DigestInfo.getInstance(otherCertHash).getDigest();
-        }
-    }
-
-    public IssuerSerial getIssuerSerial()
-    {
-        return issuerSerial;
-    }
-
-    /**
-     * <pre>
-     * OtherCertID ::= SEQUENCE {
-     *     otherCertHash    OtherHash,
-     *     issuerSerial     IssuerSerial OPTIONAL }
-     *
-     * OtherHash ::= CHOICE {
-     *     sha1Hash     OCTET STRING,
-     *     otherHash    OtherHashAlgAndValue }
-     *
-     * OtherHashAlgAndValue ::= SEQUENCE {
-     *     hashAlgorithm    AlgorithmIdentifier,
-     *     hashValue        OCTET STRING }
-     *
-     * </pre>
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector v = new ASN1EncodableVector();
-
-        v.add(otherCertHash);
-
-        if (issuerSerial != null)
-        {
-            v.add(issuerSerial);
-        }
-
-        return new DERSequence(v);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/ess/OtherSigningCertificate.java b/bcprov/src/main/java/org/bouncycastle/asn1/ess/OtherSigningCertificate.java
deleted file mode 100644
index 41f9e93..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/ess/OtherSigningCertificate.java
+++ /dev/null
@@ -1,109 +0,0 @@
-package org.bouncycastle.asn1.ess;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.x509.PolicyInformation;
-
-public class OtherSigningCertificate
-    extends ASN1Object
-{
-    ASN1Sequence certs;
-    ASN1Sequence policies;
-
-    public static OtherSigningCertificate getInstance(Object o)
-    {
-        if (o instanceof OtherSigningCertificate)
-        {
-            return (OtherSigningCertificate) o;
-        }
-        else if (o != null)
-        {
-            return new OtherSigningCertificate(ASN1Sequence.getInstance(o));
-        }
-
-        return null;
-    }
-
-    /**
-     * constructeurs
-     */
-    private OtherSigningCertificate(ASN1Sequence seq)
-    {
-        if (seq.size() < 1 || seq.size() > 2)
-        {
-            throw new IllegalArgumentException("Bad sequence size: "
-                    + seq.size());
-        }
-
-        this.certs = ASN1Sequence.getInstance(seq.getObjectAt(0));
-
-        if (seq.size() > 1)
-        {
-            this.policies = ASN1Sequence.getInstance(seq.getObjectAt(1));
-        }
-    }
-
-    public OtherSigningCertificate(
-        OtherCertID otherCertID)
-    {
-        certs = new DERSequence(otherCertID);
-    }
-
-    public OtherCertID[] getCerts()
-    {
-        OtherCertID[] cs = new OtherCertID[certs.size()];
-
-        for (int i = 0; i != certs.size(); i++)
-        {
-            cs[i] = OtherCertID.getInstance(certs.getObjectAt(i));
-        }
-
-        return cs;
-    }
-
-    public PolicyInformation[] getPolicies()
-    {
-        if (policies == null)
-        {
-            return null;
-        }
-
-        PolicyInformation[] ps = new PolicyInformation[policies.size()];
-
-        for (int i = 0; i != policies.size(); i++)
-        {
-            ps[i] = PolicyInformation.getInstance(policies.getObjectAt(i));
-        }
-
-        return ps;
-    }
-
-    /**
-     * The definition of OtherSigningCertificate is
-     * <pre>
-     * OtherSigningCertificate ::=  SEQUENCE {
-     *      certs        SEQUENCE OF OtherCertID,
-     *      policies     SEQUENCE OF PolicyInformation OPTIONAL
-     * }
-     * </pre>
-     * id-aa-ets-otherSigCert OBJECT IDENTIFIER ::= { iso(1)
-     *  member-body(2) us(840) rsadsi(113549) pkcs(1) pkcs9(9)
-     *  smime(16) id-aa(2) 19 }
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector v = new ASN1EncodableVector();
-
-        v.add(certs);
-
-        if (policies != null)
-        {
-            v.add(policies);
-        }
-
-        return new DERSequence(v);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/ess/SigningCertificate.java b/bcprov/src/main/java/org/bouncycastle/asn1/ess/SigningCertificate.java
deleted file mode 100644
index eaf22e9..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/ess/SigningCertificate.java
+++ /dev/null
@@ -1,109 +0,0 @@
-package org.bouncycastle.asn1.ess;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.x509.PolicyInformation;
-
-
-public class SigningCertificate
-    extends ASN1Object
-{
-    ASN1Sequence certs;
-    ASN1Sequence policies;
-
-    public static SigningCertificate getInstance(Object o)
-    {
-        if (o instanceof SigningCertificate)
-        {
-            return (SigningCertificate) o;
-        }
-        else if (o != null)
-        {
-            return new SigningCertificate(ASN1Sequence.getInstance(o));
-        }
-
-        return null;
-    }
-
-    /**
-     * constructeurs
-     */
-    private SigningCertificate(ASN1Sequence seq)
-    {
-        if (seq.size() < 1 || seq.size() > 2)
-        {
-            throw new IllegalArgumentException("Bad sequence size: "
-                    + seq.size());
-        }
-        this.certs = ASN1Sequence.getInstance(seq.getObjectAt(0));
-        
-        if (seq.size() > 1)
-        {
-            this.policies = ASN1Sequence.getInstance(seq.getObjectAt(1));
-        }
-    }
-
-    public SigningCertificate(
-        ESSCertID essCertID)
-    {
-        certs = new DERSequence(essCertID);
-    }
-
-    public ESSCertID[] getCerts()
-    {
-        ESSCertID[] cs = new ESSCertID[certs.size()];
-        
-        for (int i = 0; i != certs.size(); i++)
-        {
-            cs[i] = ESSCertID.getInstance(certs.getObjectAt(i));
-        }
-        
-        return cs;
-    }
-    
-    public PolicyInformation[] getPolicies()
-    {
-        if (policies == null)
-        {
-            return null;
-        }
-        
-        PolicyInformation[] ps = new PolicyInformation[policies.size()];
-        
-        for (int i = 0; i != policies.size(); i++)
-        {
-            ps[i] = PolicyInformation.getInstance(policies.getObjectAt(i));
-        }
-        
-        return ps;
-    }
-    
-    /**
-     * The definition of SigningCertificate is
-     * <pre>
-     * SigningCertificate ::=  SEQUENCE {
-     *      certs        SEQUENCE OF ESSCertID,
-     *      policies     SEQUENCE OF PolicyInformation OPTIONAL
-     * }
-     * </pre>
-     * id-aa-signingCertificate OBJECT IDENTIFIER ::= { iso(1)
-     *  member-body(2) us(840) rsadsi(113549) pkcs(1) pkcs9(9)
-     *  smime(16) id-aa(2) 12 }
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector v = new ASN1EncodableVector();
-
-        v.add(certs);
-        
-        if (policies != null)
-        {
-            v.add(policies);
-        }
-        
-        return new DERSequence(v);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/ess/SigningCertificateV2.java b/bcprov/src/main/java/org/bouncycastle/asn1/ess/SigningCertificateV2.java
deleted file mode 100644
index 07219cd..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/ess/SigningCertificateV2.java
+++ /dev/null
@@ -1,136 +0,0 @@
-package org.bouncycastle.asn1.ess;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.x509.PolicyInformation;
-
-public class SigningCertificateV2
-    extends ASN1Object
-{
-    ASN1Sequence certs;
-    ASN1Sequence policies;
-
-    public static SigningCertificateV2 getInstance(
-        Object o)
-    {
-        if (o == null || o instanceof SigningCertificateV2)
-        {
-            return (SigningCertificateV2) o;
-        }
-        else if (o instanceof ASN1Sequence)
-        {
-            return new SigningCertificateV2((ASN1Sequence) o);
-        }
-
-        return null;
-    }
-
-    private SigningCertificateV2(
-        ASN1Sequence seq)
-    {
-        if (seq.size() < 1 || seq.size() > 2)
-        {
-            throw new IllegalArgumentException("Bad sequence size: " + seq.size());
-        }
-
-        this.certs = ASN1Sequence.getInstance(seq.getObjectAt(0));
-
-        if (seq.size() > 1)
-        {
-            this.policies = ASN1Sequence.getInstance(seq.getObjectAt(1));
-        }
-    }
-
-    public SigningCertificateV2(
-        ESSCertIDv2 cert)
-    {
-        this.certs = new DERSequence(cert);
-    }
-
-    public SigningCertificateV2(
-        ESSCertIDv2[] certs)
-    {
-        ASN1EncodableVector v = new ASN1EncodableVector();
-        for (int i=0; i < certs.length; i++)
-        {
-            v.add(certs[i]);
-        }
-        this.certs = new DERSequence(v);
-    }
-
-    public SigningCertificateV2(
-        ESSCertIDv2[] certs,
-        PolicyInformation[] policies)
-    {
-        ASN1EncodableVector v = new ASN1EncodableVector();
-        for (int i=0; i < certs.length; i++)
-        {
-            v.add(certs[i]);
-        }
-        this.certs = new DERSequence(v);
-
-        if (policies != null)
-        {
-            v = new ASN1EncodableVector();
-            for (int i=0; i < policies.length; i++)
-            {
-                v.add(policies[i]);
-            }
-            this.policies = new DERSequence(v);
-        }
-    }
-
-    public ESSCertIDv2[] getCerts()
-    {
-        ESSCertIDv2[] certIds = new ESSCertIDv2[certs.size()];
-        for (int i = 0; i != certs.size(); i++)
-        {
-            certIds[i] = ESSCertIDv2.getInstance(certs.getObjectAt(i));
-        }
-        return certIds;
-    }
-
-    public PolicyInformation[] getPolicies()
-    {
-        if (policies == null)
-        {
-            return null;
-        }
-
-        PolicyInformation[] policyInformations = new PolicyInformation[policies.size()];
-        for (int i = 0; i != policies.size(); i++)
-        {
-            policyInformations[i] = PolicyInformation.getInstance(policies.getObjectAt(i));
-        }
-        return policyInformations;
-    }
-
-    /**
-     * The definition of SigningCertificateV2 is
-     * <pre>
-     * SigningCertificateV2 ::=  SEQUENCE {
-     *      certs        SEQUENCE OF ESSCertIDv2,
-     *      policies     SEQUENCE OF PolicyInformation OPTIONAL
-     * }
-     * </pre>
-     * id-aa-signingCertificateV2 OBJECT IDENTIFIER ::= { iso(1)
-     *    member-body(2) us(840) rsadsi(113549) pkcs(1) pkcs9(9)
-     *    smime(16) id-aa(2) 47 }
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector v = new ASN1EncodableVector();
-
-        v.add(certs);
-
-        if (policies != null)
-        {
-            v.add(policies);
-        }
-
-        return new DERSequence(v);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/ess/package.html b/bcprov/src/main/java/org/bouncycastle/asn1/ess/package.html
deleted file mode 100644
index 21854b3..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/ess/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body bgcolor="#ffffff">
-Support classes useful for encoding and supporting Enhanced Security Services for S/MIME as described RFC 2634 and RFC 5035.
-</body>
-</html>
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/gnu/GNUObjectIdentifiers.java b/bcprov/src/main/java/org/bouncycastle/asn1/gnu/GNUObjectIdentifiers.java
deleted file mode 100644
index a329e63..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/gnu/GNUObjectIdentifiers.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package org.bouncycastle.asn1.gnu;
-
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-
-/**
- *  GNU project OID collection<p>
- *  { iso(1) identifier-organization(3) dod(6) internet(1) private(4) } == IETF defined things
- */
-public interface GNUObjectIdentifiers
-{
-    /** 1.3.6.1.4.1.11591.1 -- used by GNU Radius */
-    public static final ASN1ObjectIdentifier GNU      = new ASN1ObjectIdentifier("1.3.6.1.4.1.11591.1"); // GNU Radius
-    /** 1.3.6.1.4.1.11591.2 -- used by GNU PG */
-    public static final ASN1ObjectIdentifier GnuPG    = new ASN1ObjectIdentifier("1.3.6.1.4.1.11591.2"); // GnuPG (Ägypten)
-    /** 1.3.6.1.4.1.11591.2.1 -- notation */
-    public static final ASN1ObjectIdentifier notation = new ASN1ObjectIdentifier("1.3.6.1.4.1.11591.2.1"); // notation
-    /** 1.3.6.1.4.1.11591.2.1.1 -- pkaAddress */
-    public static final ASN1ObjectIdentifier pkaAddress = new ASN1ObjectIdentifier("1.3.6.1.4.1.11591.2.1.1"); // pkaAddress
-    /** 1.3.6.1.4.1.11591.3 -- GNU Radar */
-    public static final ASN1ObjectIdentifier GnuRadar = new ASN1ObjectIdentifier("1.3.6.1.4.1.11591.3"); // GNU Radar
-    /** 1.3.6.1.4.1.11591.12 -- digestAlgorithm */
-    public static final ASN1ObjectIdentifier digestAlgorithm = new ASN1ObjectIdentifier("1.3.6.1.4.1.11591.12"); // digestAlgorithm
-    /** 1.3.6.1.4.1.11591.12.2 -- TIGER/192 */
-    public static final ASN1ObjectIdentifier Tiger_192 = new ASN1ObjectIdentifier("1.3.6.1.4.1.11591.12.2"); // TIGER/192
-    /** 1.3.6.1.4.1.11591.13 -- encryptionAlgorithm */
-    public static final ASN1ObjectIdentifier encryptionAlgorithm = new ASN1ObjectIdentifier("1.3.6.1.4.1.11591.13"); // encryptionAlgorithm
-    /** 1.3.6.1.4.1.11591.13.2 -- Serpent */
-    public static final ASN1ObjectIdentifier Serpent = new ASN1ObjectIdentifier("1.3.6.1.4.1.11591.13.2"); // Serpent
-    /** 1.3.6.1.4.1.11591.13.2.1 -- Serpent-128-ECB */
-    public static final ASN1ObjectIdentifier Serpent_128_ECB = new ASN1ObjectIdentifier("1.3.6.1.4.1.11591.13.2.1"); // Serpent-128-ECB
-    /** 1.3.6.1.4.1.11591.13.2.2 -- Serpent-128-CBC */
-    public static final ASN1ObjectIdentifier Serpent_128_CBC = new ASN1ObjectIdentifier("1.3.6.1.4.1.11591.13.2.2"); // Serpent-128-CBC
-    /** 1.3.6.1.4.1.11591.13.2.3 -- Serpent-128-OFB */
-    public static final ASN1ObjectIdentifier Serpent_128_OFB = new ASN1ObjectIdentifier("1.3.6.1.4.1.11591.13.2.3"); // Serpent-128-OFB
-    /** 1.3.6.1.4.1.11591.13.2.4 -- Serpent-128-CFB */
-    public static final ASN1ObjectIdentifier Serpent_128_CFB = new ASN1ObjectIdentifier("1.3.6.1.4.1.11591.13.2.4"); // Serpent-128-CFB
-    /** 1.3.6.1.4.1.11591.13.2.21 -- Serpent-192-ECB */
-    public static final ASN1ObjectIdentifier Serpent_192_ECB = new ASN1ObjectIdentifier("1.3.6.1.4.1.11591.13.2.21"); // Serpent-192-ECB
-    /** 1.3.6.1.4.1.11591.13.2.22 -- Serpent-192-CCB */
-    public static final ASN1ObjectIdentifier Serpent_192_CBC = new ASN1ObjectIdentifier("1.3.6.1.4.1.11591.13.2.22"); // Serpent-192-CBC
-    /** 1.3.6.1.4.1.11591.13.2.23 -- Serpent-192-OFB */
-    public static final ASN1ObjectIdentifier Serpent_192_OFB = new ASN1ObjectIdentifier("1.3.6.1.4.1.11591.13.2.23"); // Serpent-192-OFB
-    /** 1.3.6.1.4.1.11591.13.2.24 -- Serpent-192-CFB */
-    public static final ASN1ObjectIdentifier Serpent_192_CFB = new ASN1ObjectIdentifier("1.3.6.1.4.1.11591.13.2.24"); // Serpent-192-CFB
-    /** 1.3.6.1.4.1.11591.13.2.41 -- Serpent-256-ECB */
-    public static final ASN1ObjectIdentifier Serpent_256_ECB = new ASN1ObjectIdentifier("1.3.6.1.4.1.11591.13.2.41"); // Serpent-256-ECB
-    /** 1.3.6.1.4.1.11591.13.2.42 -- Serpent-256-CBC */
-    public static final ASN1ObjectIdentifier Serpent_256_CBC = new ASN1ObjectIdentifier("1.3.6.1.4.1.11591.13.2.42"); // Serpent-256-CBC
-    /** 1.3.6.1.4.1.11591.13.2.43 -- Serpent-256-OFB */
-    public static final ASN1ObjectIdentifier Serpent_256_OFB = new ASN1ObjectIdentifier("1.3.6.1.4.1.11591.13.2.43"); // Serpent-256-OFB
-    /** 1.3.6.1.4.1.11591.13.2.44 -- Serpent-256-CFB */
-    public static final ASN1ObjectIdentifier Serpent_256_CFB = new ASN1ObjectIdentifier("1.3.6.1.4.1.11591.13.2.44"); // Serpent-256-CFB
-
-    /** 1.3.6.1.4.1.11591.14 -- CRC algorithms */
-    public static final ASN1ObjectIdentifier CRC = new ASN1ObjectIdentifier("1.3.6.1.4.1.11591.14"); // CRC algorithms
-    /** 1.3.6.1.4.1.11591.14,1 -- CRC32 */
-    public static final ASN1ObjectIdentifier CRC32 = new ASN1ObjectIdentifier("1.3.6.1.4.1.11591.14.1"); // CRC 32
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/gnu/package.html b/bcprov/src/main/java/org/bouncycastle/asn1/gnu/package.html
deleted file mode 100644
index cdb9f59..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/gnu/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body bgcolor="#ffffff">
-ASN.1 classes specific to the GNU APIs and applications.
-</body>
-</html>
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/iana/package.html b/bcprov/src/main/java/org/bouncycastle/asn1/iana/package.html
deleted file mode 100644
index bb60b43..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/iana/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body bgcolor="#ffffff">
-ASN.1 classes specific to the Internet Assigned Numbers Authority (IANA).
-</body>
-</html>
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/icao/CscaMasterList.java b/bcprov/src/main/java/org/bouncycastle/asn1/icao/CscaMasterList.java
deleted file mode 100644
index ff629f2..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/icao/CscaMasterList.java
+++ /dev/null
@@ -1,114 +0,0 @@
-package org.bouncycastle.asn1.icao;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.ASN1Set;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.DERSet;
-import org.bouncycastle.asn1.x509.Certificate;
-
-/**
- * The CscaMasterList object. This object can be wrapped in a
- * CMSSignedData to be published in LDAP.
- *
- * <pre>
- * CscaMasterList ::= SEQUENCE {
- *   version                CscaMasterListVersion,
- *   certList               SET OF Certificate }
- *
- * CscaMasterListVersion :: INTEGER {v0(0)}
- * </pre>
- */
-
-public class CscaMasterList
-    extends ASN1Object
-{
-    private ASN1Integer version = new ASN1Integer(0);
-    private Certificate[] certList;
-
-    public static CscaMasterList getInstance(
-        Object obj)
-    {
-        if (obj instanceof CscaMasterList)
-        {
-            return (CscaMasterList)obj;
-        }
-        else if (obj != null)
-        {
-            return new CscaMasterList(ASN1Sequence.getInstance(obj));
-        }
-
-        return null;
-    }
-
-    private CscaMasterList(
-        ASN1Sequence seq)
-    {
-        if (seq == null || seq.size() == 0)
-        {
-            throw new IllegalArgumentException(
-                "null or empty sequence passed.");
-        }
-        if (seq.size() != 2)
-        {
-            throw new IllegalArgumentException(
-                "Incorrect sequence size: " + seq.size());
-        }
-
-        version = ASN1Integer.getInstance(seq.getObjectAt(0));
-        ASN1Set certSet = ASN1Set.getInstance(seq.getObjectAt(1));
-        certList = new Certificate[certSet.size()];
-        for (int i = 0; i < certList.length; i++)
-        {
-            certList[i]
-                = Certificate.getInstance(certSet.getObjectAt(i));
-        }
-    }
-
-    public CscaMasterList(
-        Certificate[] certStructs)
-    {
-        certList = copyCertList(certStructs);
-    }
-
-    public int getVersion()
-    {
-        return version.getValue().intValue();
-    }
-
-    public Certificate[] getCertStructs()
-    {
-        return copyCertList(certList);
-    }
-
-    private Certificate[] copyCertList(Certificate[] orig)
-    {
-        Certificate[] certs = new Certificate[orig.length];
-
-        for (int i = 0; i != certs.length; i++)
-        {
-            certs[i] = orig[i];
-        }
-
-        return certs;
-    }
-
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector seq = new ASN1EncodableVector();
-
-        seq.add(version);
-
-        ASN1EncodableVector certSet = new ASN1EncodableVector();
-        for (int i = 0; i < certList.length; i++)
-        {
-            certSet.add(certList[i]);
-        }
-        seq.add(new DERSet(certSet));
-
-        return new DERSequence(seq);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/icao/DataGroupHash.java b/bcprov/src/main/java/org/bouncycastle/asn1/icao/DataGroupHash.java
deleted file mode 100644
index b4c4c5c..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/icao/DataGroupHash.java
+++ /dev/null
@@ -1,97 +0,0 @@
-package org.bouncycastle.asn1.icao;
-
-import java.util.Enumeration;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DERSequence;
-
-/**
- * The DataGroupHash object.
- * <pre>
- * DataGroupHash  ::=  SEQUENCE {
- *      dataGroupNumber         DataGroupNumber,
- *      dataGroupHashValue     OCTET STRING }
- * 
- * DataGroupNumber ::= INTEGER {
- *         dataGroup1    (1),
- *         dataGroup1    (2),
- *         dataGroup1    (3),
- *         dataGroup1    (4),
- *         dataGroup1    (5),
- *         dataGroup1    (6),
- *         dataGroup1    (7),
- *         dataGroup1    (8),
- *         dataGroup1    (9),
- *         dataGroup1    (10),
- *         dataGroup1    (11),
- *         dataGroup1    (12),
- *         dataGroup1    (13),
- *         dataGroup1    (14),
- *         dataGroup1    (15),
- *         dataGroup1    (16) }
- * 
- * </pre>
- */
-public class DataGroupHash 
-    extends ASN1Object
-{
-    ASN1Integer dataGroupNumber;    
-    ASN1OctetString    dataGroupHashValue;
-    
-    public static DataGroupHash getInstance(
-        Object obj)
-    {
-        if (obj instanceof DataGroupHash)
-        {
-            return (DataGroupHash)obj;
-        }
-        else if (obj != null)
-        {
-            return new DataGroupHash(ASN1Sequence.getInstance(obj));
-        }
-
-        return null;
-    }                
-            
-    private DataGroupHash(ASN1Sequence seq)
-    {
-        Enumeration e = seq.getObjects();
-
-        // dataGroupNumber
-        dataGroupNumber = ASN1Integer.getInstance(e.nextElement());
-        // dataGroupHashValue
-        dataGroupHashValue = ASN1OctetString.getInstance(e.nextElement());   
-    }
-    
-    public DataGroupHash(
-        int dataGroupNumber,        
-        ASN1OctetString     dataGroupHashValue)
-    {
-        this.dataGroupNumber = new ASN1Integer(dataGroupNumber);
-        this.dataGroupHashValue = dataGroupHashValue; 
-    }    
-
-    public int getDataGroupNumber()
-    {
-        return dataGroupNumber.getValue().intValue();
-    }
-    
-    public ASN1OctetString getDataGroupHashValue()
-    {
-        return dataGroupHashValue;
-    }     
-    
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector seq = new ASN1EncodableVector();
-        seq.add(dataGroupNumber);
-        seq.add(dataGroupHashValue);  
-
-        return new DERSequence(seq);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/icao/ICAOObjectIdentifiers.java b/bcprov/src/main/java/org/bouncycastle/asn1/icao/ICAOObjectIdentifiers.java
deleted file mode 100644
index 3c271da..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/icao/ICAOObjectIdentifiers.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package org.bouncycastle.asn1.icao;
-
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-
-/**
- *
- * { ISOITU(2) intorgs(23) icao(136) }
- */
-public interface ICAOObjectIdentifiers
-{
-    //
-    // base id
-    //
-    /**  2.23.136  */
-    static final ASN1ObjectIdentifier    id_icao                   = new ASN1ObjectIdentifier("2.23.136");
-
-    /**  2.23.136.1  */
-    static final ASN1ObjectIdentifier    id_icao_mrtd              = id_icao.branch("1");
-    /**  2.23.136.1.1  */
-    static final ASN1ObjectIdentifier    id_icao_mrtd_security     = id_icao_mrtd.branch("1");
-
-    /** LDS security object, see ICAO Doc 9303-Volume 2-Section IV-A3.2<p>
-     *  2.23.136.1.1.1  */
-    static final ASN1ObjectIdentifier    id_icao_ldsSecurityObject = id_icao_mrtd_security.branch("1");
-
-    /** CSCA master list, see TR CSCA Countersigning and Master List issuance<p>
-     * 2.23.136.1.1.2
-     */
-    static final ASN1ObjectIdentifier    id_icao_cscaMasterList    = id_icao_mrtd_security.branch("2");
-    /** 2.23.136.1.1.3 */
-    static final ASN1ObjectIdentifier    id_icao_cscaMasterListSigningKey = id_icao_mrtd_security.branch("3");
-
-    /** document type list, see draft TR LDS and PKI Maintenance, par. 3.2.1 <p>
-     * 2.23.136.1.1.4
-     */
-    static final ASN1ObjectIdentifier    id_icao_documentTypeList  = id_icao_mrtd_security.branch("4");
-
-    /** Active Authentication protocol, see draft TR LDS and PKI Maintenance, par. 5.2.2<p>
-     * 2.23.136.1.1.5
-     */
-    static final ASN1ObjectIdentifier    id_icao_aaProtocolObject  = id_icao_mrtd_security.branch("5");
-
-    /** CSCA name change and key reoll-over, see draft TR LDS and PKI Maintenance, par. 3.2.1<p>
-     * 2.23.136.1.1.6
-     */
-    static final ASN1ObjectIdentifier    id_icao_extensions        = id_icao_mrtd_security.branch("6");
-    /** 2.23.136.1.1.6.1 */
-    static final ASN1ObjectIdentifier    id_icao_extensions_namechangekeyrollover = id_icao_extensions.branch("1");
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/icao/LDSSecurityObject.java b/bcprov/src/main/java/org/bouncycastle/asn1/icao/LDSSecurityObject.java
deleted file mode 100644
index fae8762..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/icao/LDSSecurityObject.java
+++ /dev/null
@@ -1,159 +0,0 @@
-package org.bouncycastle.asn1.icao;
-
-import java.util.Enumeration;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-
-/**
- * The LDSSecurityObject object (V1.8).
- * <pre>
- * LDSSecurityObject ::= SEQUENCE {
- *   version                LDSSecurityObjectVersion,
- *   hashAlgorithm          DigestAlgorithmIdentifier,
- *   dataGroupHashValues    SEQUENCE SIZE (2..ub-DataGroups) OF DataHashGroup,
- *   ldsVersionInfo         LDSVersionInfo OPTIONAL
- *   -- if present, version MUST be v1 }
- *   
- * DigestAlgorithmIdentifier ::= AlgorithmIdentifier,
- * 
- * LDSSecurityObjectVersion :: INTEGER {V0(0)}
- * </pre>
- */
-
-public class LDSSecurityObject 
-    extends ASN1Object
-    implements ICAOObjectIdentifiers    
-{
-    public static final int ub_DataGroups = 16;
-    
-    private ASN1Integer version = new ASN1Integer(0);
-    private AlgorithmIdentifier digestAlgorithmIdentifier;
-    private DataGroupHash[] datagroupHash;
-    private LDSVersionInfo versionInfo;
-
-    public static LDSSecurityObject getInstance(
-        Object obj)
-    {
-        if (obj instanceof LDSSecurityObject)
-        {
-            return (LDSSecurityObject)obj;
-        }
-        else if (obj != null)
-        {
-            return new LDSSecurityObject(ASN1Sequence.getInstance(obj));            
-        }
-        
-        return null;
-    }    
-    
-    private LDSSecurityObject(
-        ASN1Sequence seq)
-    {
-        if (seq == null || seq.size() == 0)
-        {
-            throw new IllegalArgumentException("null or empty sequence passed.");
-        }
-        
-        Enumeration e = seq.getObjects();
-
-        // version
-        version = ASN1Integer.getInstance(e.nextElement());
-        // digestAlgorithmIdentifier
-        digestAlgorithmIdentifier = AlgorithmIdentifier.getInstance(e.nextElement());
-      
-        ASN1Sequence datagroupHashSeq = ASN1Sequence.getInstance(e.nextElement());
-
-        if (version.getValue().intValue() == 1)
-        {
-            versionInfo = LDSVersionInfo.getInstance(e.nextElement());
-        }
-
-        checkDatagroupHashSeqSize(datagroupHashSeq.size());        
-        
-        datagroupHash = new DataGroupHash[datagroupHashSeq.size()];
-        for (int i= 0; i< datagroupHashSeq.size();i++)
-        {
-            datagroupHash[i] = DataGroupHash.getInstance(datagroupHashSeq.getObjectAt(i));
-        }
-    }
-
-    public LDSSecurityObject(
-        AlgorithmIdentifier digestAlgorithmIdentifier, 
-        DataGroupHash[]       datagroupHash)
-    {
-        this.version = new ASN1Integer(0);
-        this.digestAlgorithmIdentifier = digestAlgorithmIdentifier;
-        this.datagroupHash = datagroupHash;
-        
-        checkDatagroupHashSeqSize(datagroupHash.length);                      
-    }    
-
-    public LDSSecurityObject(
-        AlgorithmIdentifier digestAlgorithmIdentifier,
-        DataGroupHash[]     datagroupHash,
-        LDSVersionInfo      versionInfo)
-    {
-        this.version = new ASN1Integer(1);
-        this.digestAlgorithmIdentifier = digestAlgorithmIdentifier;
-        this.datagroupHash = datagroupHash;
-        this.versionInfo = versionInfo;
-
-        checkDatagroupHashSeqSize(datagroupHash.length);
-    }
-
-    private void checkDatagroupHashSeqSize(int size)
-    {
-        if ((size < 2) || (size > ub_DataGroups))
-        {
-               throw new IllegalArgumentException("wrong size in DataGroupHashValues : not in (2.."+ ub_DataGroups +")");
-        }
-    }  
-
-    public int getVersion()
-    {
-        return version.getValue().intValue();
-    }
-
-    public AlgorithmIdentifier getDigestAlgorithmIdentifier()
-    {
-        return digestAlgorithmIdentifier;
-    }
-    
-    public DataGroupHash[] getDatagroupHash()
-    {
-        return datagroupHash;
-    }
-
-    public LDSVersionInfo getVersionInfo()
-    {
-        return versionInfo;
-    }
-
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector seq = new ASN1EncodableVector();
-        
-        seq.add(version);
-        seq.add(digestAlgorithmIdentifier);
-                
-        ASN1EncodableVector seqname = new ASN1EncodableVector();
-        for (int i = 0; i < datagroupHash.length; i++) 
-        {
-            seqname.add(datagroupHash[i]);
-        }            
-        seq.add(new DERSequence(seqname));                   
-
-        if (versionInfo != null)
-        {
-            seq.add(versionInfo);
-        }
-
-        return new DERSequence(seq);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/icao/LDSVersionInfo.java b/bcprov/src/main/java/org/bouncycastle/asn1/icao/LDSVersionInfo.java
deleted file mode 100644
index 9c5ae33..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/icao/LDSVersionInfo.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package org.bouncycastle.asn1.icao;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DERPrintableString;
-import org.bouncycastle.asn1.DERSequence;
-
-public class LDSVersionInfo
-    extends ASN1Object
-{
-    private DERPrintableString ldsVersion;
-    private DERPrintableString unicodeVersion;
-
-    public LDSVersionInfo(String ldsVersion, String unicodeVersion)
-    {
-        this.ldsVersion = new DERPrintableString(ldsVersion);
-        this.unicodeVersion = new DERPrintableString(unicodeVersion);
-    }
-
-    private LDSVersionInfo(ASN1Sequence seq)
-    {
-        if (seq.size() != 2)
-        {
-            throw new IllegalArgumentException("sequence wrong size for LDSVersionInfo");
-        }
-
-        this.ldsVersion = DERPrintableString.getInstance(seq.getObjectAt(0));
-        this.unicodeVersion = DERPrintableString.getInstance(seq.getObjectAt(1));
-    }
-
-    public static LDSVersionInfo getInstance(Object obj)
-    {
-        if (obj instanceof LDSVersionInfo)
-        {
-            return (LDSVersionInfo)obj;
-        }
-        else if (obj != null)
-        {
-            return new LDSVersionInfo(ASN1Sequence.getInstance(obj));
-        }
-
-        return null;
-    }
-
-    public String getLdsVersion()
-    {
-        return ldsVersion.getString();
-    }
-
-    public String getUnicodeVersion()
-    {
-        return unicodeVersion.getString();
-    }
-
-    /**
-     * <pre>
-     * LDSVersionInfo ::= SEQUENCE {
-     *    ldsVersion PRINTABLE STRING
-     *    unicodeVersion PRINTABLE STRING
-     *  }
-     * </pre>
-     * @return
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector v = new ASN1EncodableVector();
-
-        v.add(ldsVersion);
-        v.add(unicodeVersion);
-
-        return new DERSequence(v);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/icao/package.html b/bcprov/src/main/java/org/bouncycastle/asn1/icao/package.html
deleted file mode 100644
index f2301db..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/icao/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body bgcolor="#ffffff">
-ICAO ASN.1 classes for electronic passport.
-</body>
-</html>
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/isismtt/ocsp/CertHash.java b/bcprov/src/main/java/org/bouncycastle/asn1/isismtt/ocsp/CertHash.java
deleted file mode 100644
index dff3d84..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/isismtt/ocsp/CertHash.java
+++ /dev/null
@@ -1,120 +0,0 @@
-package org.bouncycastle.asn1.isismtt.ocsp;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DEROctetString;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-
-/**
- * ISIS-MTT PROFILE: The responder may include this extension in a response to
- * send the hash of the requested certificate to the responder. This hash is
- * cryptographically bound to the certificate and serves as evidence that the
- * certificate is known to the responder (i.e. it has been issued and is present
- * in the directory). Hence, this extension is a means to provide a positive
- * statement of availability as described in T8.[8]. As explained in T13.[1],
- * clients may rely on this information to be able to validate signatures after
- * the expiry of the corresponding certificate. Hence, clients MUST support this
- * extension. If a positive statement of availability is to be delivered, this
- * extension syntax and OID MUST be used.
- * <pre>
- *     CertHash ::= SEQUENCE {
- *       hashAlgorithm AlgorithmIdentifier,
- *       certificateHash OCTET STRING
- *     }
- * </pre>
- */
-public class CertHash
-    extends ASN1Object
-{
-
-    private AlgorithmIdentifier hashAlgorithm;
-    private byte[] certificateHash;
-
-    public static CertHash getInstance(Object obj)
-    {
-        if (obj == null || obj instanceof CertHash)
-        {
-            return (CertHash)obj;
-        }
-
-        if (obj instanceof ASN1Sequence)
-        {
-            return new CertHash((ASN1Sequence)obj);
-        }
-
-        throw new IllegalArgumentException("illegal object in getInstance: "
-            + obj.getClass().getName());
-    }
-
-    /**
-     * Constructor from ASN1Sequence.
-     * <p>
-     * The sequence is of type CertHash:
-     * <pre>
-     *     CertHash ::= SEQUENCE {
-     *       hashAlgorithm AlgorithmIdentifier,
-     *       certificateHash OCTET STRING
-     *     }
-     * </pre>
-     * </p>
-     * @param seq The ASN.1 sequence.
-     */
-    private CertHash(ASN1Sequence seq)
-    {
-        if (seq.size() != 2)
-        {
-            throw new IllegalArgumentException("Bad sequence size: "
-                + seq.size());
-        }
-        hashAlgorithm = AlgorithmIdentifier.getInstance(seq.getObjectAt(0));
-        certificateHash = DEROctetString.getInstance(seq.getObjectAt(1)).getOctets();
-    }
-
-    /**
-     * Constructor from a given details.
-     *
-     * @param hashAlgorithm   The hash algorithm identifier.
-     * @param certificateHash The hash of the whole DER encoding of the certificate.
-     */
-    public CertHash(AlgorithmIdentifier hashAlgorithm, byte[] certificateHash)
-    {
-        this.hashAlgorithm = hashAlgorithm;
-        this.certificateHash = new byte[certificateHash.length];
-        System.arraycopy(certificateHash, 0, this.certificateHash, 0,
-            certificateHash.length);
-    }
-
-    public AlgorithmIdentifier getHashAlgorithm()
-    {
-        return hashAlgorithm;
-    }
-
-    public byte[] getCertificateHash()
-    {
-        return certificateHash;
-    }
-
-    /**
-     * Produce an object suitable for an ASN1OutputStream.
-     * <p>
-     * Returns:
-     * <pre>
-     *     CertHash ::= SEQUENCE {
-     *       hashAlgorithm AlgorithmIdentifier,
-     *       certificateHash OCTET STRING
-     *     }
-     * </pre>
-     *
-     * @return a DERObject
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector vec = new ASN1EncodableVector();
-        vec.add(hashAlgorithm);
-        vec.add(new DEROctetString(certificateHash));
-        return new DERSequence(vec);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/isismtt/ocsp/RequestedCertificate.java b/bcprov/src/main/java/org/bouncycastle/asn1/isismtt/ocsp/RequestedCertificate.java
deleted file mode 100644
index 5c12016..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/isismtt/ocsp/RequestedCertificate.java
+++ /dev/null
@@ -1,181 +0,0 @@
-package org.bouncycastle.asn1.isismtt.ocsp;
-
-import java.io.IOException;
-
-import org.bouncycastle.asn1.ASN1Choice;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.ASN1TaggedObject;
-import org.bouncycastle.asn1.DEROctetString;
-import org.bouncycastle.asn1.DERTaggedObject;
-import org.bouncycastle.asn1.x509.Certificate;
-
-/**
- * ISIS-MTT-Optional: The certificate requested by the client by inserting the
- * RetrieveIfAllowed extension in the request, will be returned in this
- * extension.
- * <p>
- * ISIS-MTT-SigG: The signature act allows publishing certificates only then,
- * when the certificate owner gives his explicit permission. Accordingly, there
- * may be �nondownloadable� certificates, about which the responder must provide
- * status information, but MUST NOT include them in the response. Clients may
- * get therefore the following three kind of answers on a single request
- * including the RetrieveIfAllowed extension:
- * <ul>
- * <li> a) the responder supports the extension and is allowed to publish the
- * certificate: RequestedCertificate returned including the requested
- * certificate
- * <li>b) the responder supports the extension but is NOT allowed to publish
- * the certificate: RequestedCertificate returned including an empty OCTET
- * STRING
- * <li>c) the responder does not support the extension: RequestedCertificate is
- * not included in the response
- * </ul>
- * Clients requesting RetrieveIfAllowed MUST be able to handle these cases. If
- * any of the OCTET STRING options is used, it MUST contain the DER encoding of
- * the requested certificate.
- * <pre>
- *            RequestedCertificate ::= CHOICE {
- *              Certificate Certificate,
- *              publicKeyCertificate [0] EXPLICIT OCTET STRING,
- *              attributeCertificate [1] EXPLICIT OCTET STRING
- *            }
- * </pre>
- */
-public class RequestedCertificate
-    extends ASN1Object
-    implements ASN1Choice
-{
-    public static final int certificate = -1;
-    public static final int publicKeyCertificate = 0;
-    public static final int attributeCertificate = 1;
-
-    private Certificate cert;
-    private byte[] publicKeyCert;
-    private byte[] attributeCert;
-
-    public static RequestedCertificate getInstance(Object obj)
-    {
-        if (obj == null || obj instanceof RequestedCertificate)
-        {
-            return (RequestedCertificate)obj;
-        }
-
-        if (obj instanceof ASN1Sequence)
-        {
-            return new RequestedCertificate(Certificate.getInstance(obj));
-        }
-        if (obj instanceof ASN1TaggedObject)
-        {
-            return new RequestedCertificate((ASN1TaggedObject)obj);
-        }
-
-        throw new IllegalArgumentException("illegal object in getInstance: "
-            + obj.getClass().getName());
-    }
-
-    public static RequestedCertificate getInstance(ASN1TaggedObject obj, boolean explicit)
-    {
-        if (!explicit)
-        {
-            throw new IllegalArgumentException("choice item must be explicitly tagged");
-        }
-
-        return getInstance(obj.getObject());
-    }
-
-    private RequestedCertificate(ASN1TaggedObject tagged)
-    {
-        if (tagged.getTagNo() == publicKeyCertificate)
-        {
-            publicKeyCert = ASN1OctetString.getInstance(tagged, true).getOctets();
-        }
-        else if (tagged.getTagNo() == attributeCertificate)
-        {
-            attributeCert = ASN1OctetString.getInstance(tagged, true).getOctets();
-        }
-        else
-        {
-            throw new IllegalArgumentException("unknown tag number: " + tagged.getTagNo());
-        }
-    }
-
-    /**
-     * Constructor from a given details.
-     * <p>
-     * Only one parameter can be given. All other must be <code>null</code>.
-     *
-     * @param certificate          Given as Certificate
-     */
-    public RequestedCertificate(Certificate certificate)
-    {
-        this.cert = certificate;
-    }
-
-    public RequestedCertificate(int type, byte[] certificateOctets)
-    {
-        this(new DERTaggedObject(type, new DEROctetString(certificateOctets)));
-    }
-
-    public int getType()
-    {
-        if (cert != null)
-        {
-            return certificate;
-        }
-        if (publicKeyCert != null)
-        {
-            return publicKeyCertificate;
-        }
-        return attributeCertificate;
-    }
-
-    public byte[] getCertificateBytes()
-    {
-        if (cert != null)
-        {
-            try
-            {
-                return cert.getEncoded();
-            }
-            catch (IOException e)
-            {
-                throw new IllegalStateException("can't decode certificate: " + e);
-            }
-        }
-        if (publicKeyCert != null)
-        {
-            return publicKeyCert;
-        }
-        return attributeCert;
-    }
-    
-    /**
-     * Produce an object suitable for an ASN1OutputStream.
-     * <p>
-     * Returns:
-     * <pre>
-     *            RequestedCertificate ::= CHOICE {
-     *              Certificate Certificate,
-     *              publicKeyCertificate [0] EXPLICIT OCTET STRING,
-     *              attributeCertificate [1] EXPLICIT OCTET STRING
-     *            }
-     * </pre>
-     *
-     * @return a DERObject
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        if (publicKeyCert != null)
-        {
-            return new DERTaggedObject(0, new DEROctetString(publicKeyCert));
-        }
-        if (attributeCert != null)
-        {
-            return new DERTaggedObject(1, new DEROctetString(attributeCert));
-        }
-        return cert.toASN1Primitive();
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/isismtt/ocsp/package.html b/bcprov/src/main/java/org/bouncycastle/asn1/isismtt/ocsp/package.html
deleted file mode 100644
index cd95ca3..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/isismtt/ocsp/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body bgcolor="#ffffff">
-Support classes for the ISIS-MTT profile for OCSP.
-</body>
-</html>
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/isismtt/package.html b/bcprov/src/main/java/org/bouncycastle/asn1/isismtt/package.html
deleted file mode 100644
index 14ab390..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/isismtt/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body bgcolor="#ffffff">
-Support classes for the ISIS-MTT Project.
-</body>
-</html>
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/isismtt/x509/AdditionalInformationSyntax.java b/bcprov/src/main/java/org/bouncycastle/asn1/isismtt/x509/AdditionalInformationSyntax.java
deleted file mode 100644
index 55c7d43..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/isismtt/x509/AdditionalInformationSyntax.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package org.bouncycastle.asn1.isismtt.x509;
-
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.x500.DirectoryString;
-
-/**
- * Some other information of non-restrictive nature regarding the usage of this
- * certificate.
- * 
- * <pre>
- *    AdditionalInformationSyntax ::= DirectoryString (SIZE(1..2048))
- * </pre>
- */
-public class AdditionalInformationSyntax
-    extends ASN1Object
-{
-    private DirectoryString information;
-
-    public static AdditionalInformationSyntax getInstance(Object obj)
-    {
-        if (obj instanceof AdditionalInformationSyntax)
-        {
-            return (AdditionalInformationSyntax)obj;
-        }
-
-        if (obj != null)
-        {
-            return new AdditionalInformationSyntax(DirectoryString.getInstance(obj));
-        }
-
-        return null;
-    }
-
-    private AdditionalInformationSyntax(DirectoryString information)
-    {
-        this.information = information;
-    }
-
-    /**
-     * Constructor from a given details.
-     *
-     * @param information The describtion of the information.
-     */
-    public AdditionalInformationSyntax(String information)
-    {
-        this(new DirectoryString(information));
-    }
-
-    public DirectoryString getInformation()
-    {
-        return information;
-    }
-
-    /**
-     * Produce an object suitable for an ASN1OutputStream.
-     * <p>
-     * Returns:
-     * <pre>
-     *   AdditionalInformationSyntax ::= DirectoryString (SIZE(1..2048))
-     * </pre>
-     *
-     * @return a DERObject
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        return information.toASN1Primitive();
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/isismtt/x509/AdmissionSyntax.java b/bcprov/src/main/java/org/bouncycastle/asn1/isismtt/x509/AdmissionSyntax.java
deleted file mode 100644
index 4943d52..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/isismtt/x509/AdmissionSyntax.java
+++ /dev/null
@@ -1,275 +0,0 @@
-package org.bouncycastle.asn1.isismtt.x509;
-
-import java.util.Enumeration;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.x509.GeneralName;
-
-/**
- * Attribute to indicate admissions to certain professions.
- *
- * <pre>
- *     AdmissionSyntax ::= SEQUENCE
- *     {
- *       admissionAuthority GeneralName OPTIONAL,
- *       contentsOfAdmissions SEQUENCE OF Admissions
- *     }
- *
- *     Admissions ::= SEQUENCE
- *     {
- *       admissionAuthority [0] EXPLICIT GeneralName OPTIONAL
- *       namingAuthority [1] EXPLICIT NamingAuthority OPTIONAL
- *       professionInfos SEQUENCE OF ProfessionInfo
- *     }
- *
- *     NamingAuthority ::= SEQUENCE
- *     {
- *       namingAuthorityId OBJECT IDENTIFIER OPTIONAL,
- *       namingAuthorityUrl IA5String OPTIONAL,
- *       namingAuthorityText DirectoryString(SIZE(1..128)) OPTIONAL
- *     }
- *
- *     ProfessionInfo ::= SEQUENCE
- *     {
- *       namingAuthority [0] EXPLICIT NamingAuthority OPTIONAL,
- *       professionItems SEQUENCE OF DirectoryString (SIZE(1..128)),
- *       professionOIDs SEQUENCE OF OBJECT IDENTIFIER OPTIONAL,
- *       registrationNumber PrintableString(SIZE(1..128)) OPTIONAL,
- *       addProfessionInfo OCTET STRING OPTIONAL
- *     }
- * </pre>
- * <p>
- * ISIS-MTT PROFILE: The relatively complex structure of AdmissionSyntax
- * supports the following concepts and requirements:
- * <ul>
- * <li> External institutions (e.g. professional associations, chambers, unions,
- * administrative bodies, companies, etc.), which are responsible for granting
- * and verifying professional admissions, are indicated by means of the data
- * field admissionAuthority. An admission authority is indicated by a
- * GeneralName object. Here an X.501 directory name (distinguished name) can be
- * indicated in the field directoryName, a URL address can be indicated in the
- * field uniformResourceIdentifier, and an object identifier can be indicated in
- * the field registeredId.
- * <li> The names of authorities which are responsible for the administration of
- * title registers are indicated in the data field namingAuthority. The name of
- * the authority can be identified by an object identifier in the field
- * namingAuthorityId, by means of a text string in the field
- * namingAuthorityText, by means of a URL address in the field
- * namingAuthorityUrl, or by a combination of them. For example, the text string
- * can contain the name of the authority, the country and the name of the title
- * register. The URL-option refers to a web page which contains lists with
- * �officially� registered professions (text and possibly OID) as well as
- * further information on these professions. Object identifiers for the
- * component namingAuthorityId are grouped under the OID-branch
- * id-isis-at-namingAuthorities and must be applied for.
- * <li>See
- * http://www.teletrust.de/anwend.asp?Id=30200&amp;Sprache=E_&amp;HomePG=0 for
- * an application form and http://www.teletrust.de/links.asp?id=30220,11
- * for an overview of registered naming authorities.
- * <li> By means of the data type ProfessionInfo certain professions,
- * specializations, disciplines, fields of activity, etc. are identified. A
- * profession is represented by one or more text strings, resp. profession OIDs
- * in the fields professionItems and professionOIDs and by a registration number
- * in the field registrationNumber. An indication in text form must always be
- * present, whereas the other indications are optional. The component
- * addProfessionInfo may contain additional applicationspecific information in
- * DER-encoded form.
- * </ul>
- * <p>
- * By means of different namingAuthority-OIDs or profession OIDs hierarchies of
- * professions, specializations, disciplines, fields of activity, etc. can be
- * expressed. The issuing admission authority should always be indicated (field
- * admissionAuthority), whenever a registration number is presented. Still,
- * information on admissions can be given without indicating an admission or a
- * naming authority by the exclusive use of the component professionItems. In
- * this case the certification authority is responsible for the verification of
- * the admission information.
- * <p>
- * This attribute is single-valued. Still, several admissions can be captured in
- * the sequence structure of the component contentsOfAdmissions of
- * AdmissionSyntax or in the component professionInfos of Admissions. The
- * component admissionAuthority of AdmissionSyntax serves as default value for
- * the component admissionAuthority of Admissions. Within the latter component
- * the default value can be overwritten, in case that another authority is
- * responsible. The component namingAuthority of Admissions serves as a default
- * value for the component namingAuthority of ProfessionInfo. Within the latter
- * component the default value can be overwritten, in case that another naming
- * authority needs to be recorded.
- * <p>
- * The length of the string objects is limited to 128 characters. It is
- * recommended to indicate a namingAuthorityURL in all issued attribute
- * certificates. If a namingAuthorityURL is indicated, the field professionItems
- * of ProfessionInfo should contain only registered titles. If the field
- * professionOIDs exists, it has to contain the OIDs of the professions listed
- * in professionItems in the same order. In general, the field professionInfos
- * should contain only one entry, unless the admissions that are to be listed
- * are logically connected (e.g. they have been issued under the same admission
- * number).
- *
- * @see org.bouncycastle.asn1.isismtt.x509.Admissions
- * @see org.bouncycastle.asn1.isismtt.x509.ProfessionInfo
- * @see org.bouncycastle.asn1.isismtt.x509.NamingAuthority
- */
-public class AdmissionSyntax
-    extends ASN1Object
-{
-
-    private GeneralName admissionAuthority;
-
-    private ASN1Sequence contentsOfAdmissions;
-
-    public static AdmissionSyntax getInstance(Object obj)
-    {
-        if (obj == null || obj instanceof AdmissionSyntax)
-        {
-            return (AdmissionSyntax)obj;
-        }
-
-        if (obj instanceof ASN1Sequence)
-        {
-            return new AdmissionSyntax((ASN1Sequence)obj);
-        }
-
-        throw new IllegalArgumentException("illegal object in getInstance: "
-            + obj.getClass().getName());
-    }
-
-    /**
-     * Constructor from ASN1Sequence.
-     * <p>
-     * The sequence is of type ProcurationSyntax:
-     * <pre>
-     *     AdmissionSyntax ::= SEQUENCE
-     *     {
-     *       admissionAuthority GeneralName OPTIONAL,
-     *       contentsOfAdmissions SEQUENCE OF Admissions
-     *     }
-     *
-     *     Admissions ::= SEQUENCE
-     *     {
-     *       admissionAuthority [0] EXPLICIT GeneralName OPTIONAL
-     *       namingAuthority [1] EXPLICIT NamingAuthority OPTIONAL
-     *       professionInfos SEQUENCE OF ProfessionInfo
-     *     }
-     *
-     *     NamingAuthority ::= SEQUENCE
-     *     {
-     *       namingAuthorityId OBJECT IDENTIFIER OPTIONAL,
-     *       namingAuthorityUrl IA5String OPTIONAL,
-     *       namingAuthorityText DirectoryString(SIZE(1..128)) OPTIONAL
-     *     }
-     *
-     *     ProfessionInfo ::= SEQUENCE
-     *     {
-     *       namingAuthority [0] EXPLICIT NamingAuthority OPTIONAL,
-     *       professionItems SEQUENCE OF DirectoryString (SIZE(1..128)),
-     *       professionOIDs SEQUENCE OF OBJECT IDENTIFIER OPTIONAL,
-     *       registrationNumber PrintableString(SIZE(1..128)) OPTIONAL,
-     *       addProfessionInfo OCTET STRING OPTIONAL
-     *     }
-     * </pre>
-     * </p>
-     * @param seq The ASN.1 sequence.
-     */
-    private AdmissionSyntax(ASN1Sequence seq)
-    {
-        switch (seq.size())
-        {
-        case 1:
-            contentsOfAdmissions = DERSequence.getInstance(seq.getObjectAt(0));
-            break;
-        case 2:
-            admissionAuthority = GeneralName.getInstance(seq.getObjectAt(0));
-            contentsOfAdmissions = DERSequence.getInstance(seq.getObjectAt(1));
-            break;
-        default:
-            throw new IllegalArgumentException("Bad sequence size: " + seq.size());
-        }
-    }
-
-    /**
-     * Constructor from given details.
-     *
-     * @param admissionAuthority   The admission authority.
-     * @param contentsOfAdmissions The admissions.
-     */
-    public AdmissionSyntax(GeneralName admissionAuthority, ASN1Sequence contentsOfAdmissions)
-    {
-        this.admissionAuthority = admissionAuthority;
-        this.contentsOfAdmissions = contentsOfAdmissions;
-    }
-
-    /**
-     * Produce an object suitable for an ASN1OutputStream.
-     * <p>
-     * Returns:
-     * <pre>
-     *     AdmissionSyntax ::= SEQUENCE
-     *     {
-     *       admissionAuthority GeneralName OPTIONAL,
-     *       contentsOfAdmissions SEQUENCE OF Admissions
-     *     }
-     *
-     *     Admissions ::= SEQUENCE
-     *     {
-     *       admissionAuthority [0] EXPLICIT GeneralName OPTIONAL
-     *       namingAuthority [1] EXPLICIT NamingAuthority OPTIONAL
-     *       professionInfos SEQUENCE OF ProfessionInfo
-     *     }
-     *
-     *     NamingAuthority ::= SEQUENCE
-     *     {
-     *       namingAuthorityId OBJECT IDENTIFIER OPTIONAL,
-     *       namingAuthorityUrl IA5String OPTIONAL,
-     *       namingAuthorityText DirectoryString(SIZE(1..128)) OPTIONAL
-     *     }
-     *
-     *     ProfessionInfo ::= SEQUENCE
-     *     {
-     *       namingAuthority [0] EXPLICIT NamingAuthority OPTIONAL,
-     *       professionItems SEQUENCE OF DirectoryString (SIZE(1..128)),
-     *       professionOIDs SEQUENCE OF OBJECT IDENTIFIER OPTIONAL,
-     *       registrationNumber PrintableString(SIZE(1..128)) OPTIONAL,
-     *       addProfessionInfo OCTET STRING OPTIONAL
-     *     }
-     * </pre>
-     *
-     * @return a DERObject
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector vec = new ASN1EncodableVector();
-        if (admissionAuthority != null)
-        {
-            vec.add(admissionAuthority);
-        }
-        vec.add(contentsOfAdmissions);
-        return new DERSequence(vec);
-    }
-
-    /**
-     * @return Returns the admissionAuthority if present, null otherwise.
-     */
-    public GeneralName getAdmissionAuthority()
-    {
-        return admissionAuthority;
-    }
-
-    /**
-     * @return Returns the contentsOfAdmissions.
-     */
-    public Admissions[] getContentsOfAdmissions()
-    {
-        Admissions[] admissions = new Admissions[contentsOfAdmissions.size()];
-        int count = 0;
-        for (Enumeration e = contentsOfAdmissions.getObjects(); e.hasMoreElements();)
-        {
-            admissions[count++] = Admissions.getInstance(e.nextElement());
-        }
-        return admissions;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/isismtt/x509/Admissions.java b/bcprov/src/main/java/org/bouncycastle/asn1/isismtt/x509/Admissions.java
deleted file mode 100644
index bda1514..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/isismtt/x509/Admissions.java
+++ /dev/null
@@ -1,184 +0,0 @@
-package org.bouncycastle.asn1.isismtt.x509;
-
-import java.util.Enumeration;
-
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.ASN1TaggedObject;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.DERTaggedObject;
-import org.bouncycastle.asn1.x509.GeneralName;
-
-/**
- * An Admissions structure.
- * <pre>
- *            Admissions ::= SEQUENCE
- *            {
- *              admissionAuthority [0] EXPLICIT GeneralName OPTIONAL
- *              namingAuthority [1] EXPLICIT NamingAuthority OPTIONAL
- *              professionInfos SEQUENCE OF ProfessionInfo
- *            }
- * </pre>
- *
- * @see org.bouncycastle.asn1.isismtt.x509.AdmissionSyntax
- * @see org.bouncycastle.asn1.isismtt.x509.ProfessionInfo
- * @see org.bouncycastle.asn1.isismtt.x509.NamingAuthority
- */
-public class Admissions 
-    extends ASN1Object
-{
-
-    private GeneralName admissionAuthority;
-
-    private NamingAuthority namingAuthority;
-
-    private ASN1Sequence professionInfos;
-
-    public static Admissions getInstance(Object obj)
-    {
-        if (obj == null || obj instanceof Admissions)
-        {
-            return (Admissions)obj;
-        }
-
-        if (obj instanceof ASN1Sequence)
-        {
-            return new Admissions((ASN1Sequence)obj);
-        }
-
-        throw new IllegalArgumentException("illegal object in getInstance: " + obj.getClass().getName());
-    }
-
-    /**
-     * Constructor from ASN1Sequence.
-     * <p>
-     * The sequence is of type ProcurationSyntax:
-     * <pre>
-     *            Admissions ::= SEQUENCE
-     *            {
-     *              admissionAuthority [0] EXPLICIT GeneralName OPTIONAL
-     *              namingAuthority [1] EXPLICIT NamingAuthority OPTIONAL
-     *              professionInfos SEQUENCE OF ProfessionInfo
-     *            }
-     * </pre>
-     * </p>
-     * @param seq The ASN.1 sequence.
-     */
-    private Admissions(ASN1Sequence seq)
-    {
-        if (seq.size() > 3)
-        {
-            throw new IllegalArgumentException("Bad sequence size: "
-                + seq.size());
-        }
-        Enumeration e = seq.getObjects();
-
-        ASN1Encodable o = (ASN1Encodable)e.nextElement();
-        if (o instanceof ASN1TaggedObject)
-        {
-            switch (((ASN1TaggedObject)o).getTagNo())
-            {
-            case 0:
-                admissionAuthority = GeneralName.getInstance((ASN1TaggedObject)o, true);
-                break;
-            case 1:
-                namingAuthority = NamingAuthority.getInstance((ASN1TaggedObject)o, true);
-                break;
-            default:
-                throw new IllegalArgumentException("Bad tag number: " + ((ASN1TaggedObject)o).getTagNo());
-            }
-            o = (ASN1Encodable)e.nextElement();
-        }
-        if (o instanceof ASN1TaggedObject)
-        {
-            switch (((ASN1TaggedObject)o).getTagNo())
-            {
-            case 1:
-                namingAuthority = NamingAuthority.getInstance((ASN1TaggedObject)o, true);
-                break;
-            default:
-                throw new IllegalArgumentException("Bad tag number: " + ((ASN1TaggedObject)o).getTagNo());
-            }
-            o = (ASN1Encodable)e.nextElement();
-        }
-        professionInfos = ASN1Sequence.getInstance(o);
-        if (e.hasMoreElements())
-        {
-            throw new IllegalArgumentException("Bad object encountered: "
-                + e.nextElement().getClass());
-        }
-    }
-
-    /**
-     * Constructor from a given details.
-     * <p>
-     * Parameter <code>professionInfos</code> is mandatory.
-     *
-     * @param admissionAuthority The admission authority.
-     * @param namingAuthority    The naming authority.
-     * @param professionInfos    The profession infos.
-     */
-    public Admissions(GeneralName admissionAuthority,
-                      NamingAuthority namingAuthority, ProfessionInfo[] professionInfos)
-    {
-        this.admissionAuthority = admissionAuthority;
-        this.namingAuthority = namingAuthority;
-        this.professionInfos = new DERSequence(professionInfos);
-    }
-
-    public GeneralName getAdmissionAuthority()
-    {
-        return admissionAuthority;
-    }
-
-    public NamingAuthority getNamingAuthority()
-    {
-        return namingAuthority;
-    }
-
-    public ProfessionInfo[] getProfessionInfos()
-    {
-        ProfessionInfo[] infos = new ProfessionInfo[professionInfos.size()];
-        int count = 0;
-        for (Enumeration e = professionInfos.getObjects(); e.hasMoreElements();)
-        {
-            infos[count++] = ProfessionInfo.getInstance(e.nextElement());
-        }
-        return infos;
-    }
-
-    /**
-     * Produce an object suitable for an ASN1OutputStream.
-     * <p>
-     * Returns:
-     * <pre>
-     *       Admissions ::= SEQUENCE
-     *       {
-     *         admissionAuthority [0] EXPLICIT GeneralName OPTIONAL
-     *         namingAuthority [1] EXPLICIT NamingAuthority OPTIONAL
-     *         professionInfos SEQUENCE OF ProfessionInfo
-     *       }
-     * </pre>
-     *
-     * @return an ASN1Primitive
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector vec = new ASN1EncodableVector();
-        
-        if (admissionAuthority != null)
-        {
-            vec.add(new DERTaggedObject(true, 0, admissionAuthority));
-        }
-        if (namingAuthority != null)
-        {
-            vec.add(new DERTaggedObject(true, 1, namingAuthority));
-        }
-        vec.add(professionInfos);
-
-        return new DERSequence(vec);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/isismtt/x509/DeclarationOfMajority.java b/bcprov/src/main/java/org/bouncycastle/asn1/isismtt/x509/DeclarationOfMajority.java
deleted file mode 100644
index 987c590..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/isismtt/x509/DeclarationOfMajority.java
+++ /dev/null
@@ -1,163 +0,0 @@
-package org.bouncycastle.asn1.isismtt.x509;
-
-import org.bouncycastle.asn1.ASN1Boolean;
-import org.bouncycastle.asn1.ASN1Choice;
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1GeneralizedTime;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.ASN1TaggedObject;
-import org.bouncycastle.asn1.DERPrintableString;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.DERTaggedObject;
-
-/**
- * A declaration of majority.
- *
- * <pre>
- *           DeclarationOfMajoritySyntax ::= CHOICE
- *           {
- *             notYoungerThan [0] IMPLICIT INTEGER,
- *             fullAgeAtCountry [1] IMPLICIT SEQUENCE
- *             {
- *               fullAge BOOLEAN DEFAULT TRUE,
- *               country PrintableString (SIZE(2))
- *             }
- *             dateOfBirth [2] IMPLICIT GeneralizedTime
- *           }
- * </pre>
- * <p>
- * fullAgeAtCountry indicates the majority of the owner with respect to the laws
- * of a specific country.
- */
-public class DeclarationOfMajority
-    extends ASN1Object
-    implements ASN1Choice
-{
-    public static final int notYoungerThan = 0;
-    public static final int fullAgeAtCountry = 1;
-    public static final int dateOfBirth = 2;
-
-    private ASN1TaggedObject declaration;
-
-    public DeclarationOfMajority(int notYoungerThan)
-    {
-        declaration = new DERTaggedObject(false, 0, new ASN1Integer(notYoungerThan));
-    }
-
-    public DeclarationOfMajority(boolean fullAge, String country)
-    {
-        if (country.length() > 2)
-        {
-            throw new IllegalArgumentException("country can only be 2 characters");
-        }
-
-        if (fullAge)
-        {
-            declaration = new DERTaggedObject(false, 1, new DERSequence(new DERPrintableString(country, true)));
-        }
-        else
-        {
-            ASN1EncodableVector v = new ASN1EncodableVector();
-
-            v.add(ASN1Boolean.FALSE);
-            v.add(new DERPrintableString(country, true));
-
-            declaration = new DERTaggedObject(false, 1, new DERSequence(v));
-        }
-    }
-
-    public DeclarationOfMajority(ASN1GeneralizedTime dateOfBirth)
-    {
-        declaration = new DERTaggedObject(false, 2, dateOfBirth);
-    }
-
-    public static DeclarationOfMajority getInstance(Object obj)
-    {
-        if (obj == null || obj instanceof DeclarationOfMajority)
-        {
-            return (DeclarationOfMajority)obj;
-        }
-
-        if (obj instanceof ASN1TaggedObject)
-        {
-            return new DeclarationOfMajority((ASN1TaggedObject)obj);
-        }
-
-        throw new IllegalArgumentException("illegal object in getInstance: "
-            + obj.getClass().getName());
-    }
-
-    private DeclarationOfMajority(ASN1TaggedObject o)
-    {
-        if (o.getTagNo() > 2)
-        {
-                throw new IllegalArgumentException("Bad tag number: " + o.getTagNo());
-        }
-        declaration = o;
-    }
-
-    /**
-     * Produce an object suitable for an ASN1OutputStream.
-     * <p>
-     * Returns:
-     * <pre>
-     *           DeclarationOfMajoritySyntax ::= CHOICE
-     *           {
-     *             notYoungerThan [0] IMPLICIT INTEGER,
-     *             fullAgeAtCountry [1] IMPLICIT SEQUENCE
-     *             {
-     *               fullAge BOOLEAN DEFAULT TRUE,
-     *               country PrintableString (SIZE(2))
-     *             }
-     *             dateOfBirth [2] IMPLICIT GeneralizedTime
-     *           }
-     * </pre>
-     *
-     * @return a DERObject
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        return declaration;
-    }
-
-    public int getType()
-    {
-        return declaration.getTagNo();
-    }
-
-    /**
-     * @return notYoungerThan if that's what we are, -1 otherwise
-     */
-    public int notYoungerThan()
-    {
-        if (declaration.getTagNo() != 0)
-        {
-            return -1;
-        }
-
-        return ASN1Integer.getInstance(declaration, false).getValue().intValue();
-    }
-
-    public ASN1Sequence fullAgeAtCountry()
-    {
-        if (declaration.getTagNo() != 1)
-        {
-            return null;
-        }
-
-        return ASN1Sequence.getInstance(declaration, false);
-    }
-
-    public ASN1GeneralizedTime getDateOfBirth()
-    {
-        if (declaration.getTagNo() != 2)
-        {
-            return null;
-        }
-
-        return ASN1GeneralizedTime.getInstance(declaration, false);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/isismtt/x509/MonetaryLimit.java b/bcprov/src/main/java/org/bouncycastle/asn1/isismtt/x509/MonetaryLimit.java
deleted file mode 100644
index 7425287..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/isismtt/x509/MonetaryLimit.java
+++ /dev/null
@@ -1,128 +0,0 @@
-package org.bouncycastle.asn1.isismtt.x509;
-
-import java.math.BigInteger;
-import java.util.Enumeration;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DERPrintableString;
-import org.bouncycastle.asn1.DERSequence;
-
-/**
- * Monetary limit for transactions. The QcEuMonetaryLimit QC statement MUST be
- * used in new certificates in place of the extension/attribute MonetaryLimit
- * since January 1, 2004. For the sake of backward compatibility with
- * certificates already in use, components SHOULD support MonetaryLimit (as well
- * as QcEuLimitValue).
- * <p>
- * Indicates a monetary limit within which the certificate holder is authorized
- * to act. (This value DOES NOT express a limit on the liability of the
- * certification authority).
- * <pre>
- *    MonetaryLimitSyntax ::= SEQUENCE
- *    {
- *      currency PrintableString (SIZE(3)),
- *      amount INTEGER,
- *      exponent INTEGER
- *    }
- * </pre>
- * <p>
- * currency must be the ISO code.
- * <p>
- * value = amount�10*exponent
- */
-public class MonetaryLimit
-    extends ASN1Object
-{
-    DERPrintableString currency;
-    ASN1Integer amount;
-    ASN1Integer exponent;
-
-    public static MonetaryLimit getInstance(Object obj)
-    {
-        if (obj == null || obj instanceof MonetaryLimit)
-        {
-            return (MonetaryLimit)obj;
-        }
-
-        if (obj instanceof ASN1Sequence)
-        {
-            return new MonetaryLimit(ASN1Sequence.getInstance(obj));
-        }
-
-        throw new IllegalArgumentException("unknown object in getInstance");
-    }
-
-    private MonetaryLimit(ASN1Sequence seq)
-    {
-        if (seq.size() != 3)
-        {
-            throw new IllegalArgumentException("Bad sequence size: "
-                + seq.size());
-        }
-        Enumeration e = seq.getObjects();
-        currency = DERPrintableString.getInstance(e.nextElement());
-        amount = ASN1Integer.getInstance(e.nextElement());
-        exponent = ASN1Integer.getInstance(e.nextElement());
-    }
-
-    /**
-     * Constructor from a given details.
-     * <p>
-     * value = amount�10^exponent
-     *
-     * @param currency The currency. Must be the ISO code.
-     * @param amount   The amount
-     * @param exponent The exponent
-     */
-    public MonetaryLimit(String currency, int amount, int exponent)
-    {
-        this.currency = new DERPrintableString(currency, true);
-        this.amount = new ASN1Integer(amount);
-        this.exponent = new ASN1Integer(exponent);
-    }
-
-    public String getCurrency()
-    {
-        return currency.getString();
-    }
-
-    public BigInteger getAmount()
-    {
-        return amount.getValue();
-    }
-
-    public BigInteger getExponent()
-    {
-        return exponent.getValue();
-    }
-
-    /**
-     * Produce an object suitable for an ASN1OutputStream.
-     * <p>
-     * Returns:
-     * <pre>
-     *    MonetaryLimitSyntax ::= SEQUENCE
-     *    {
-     *      currency PrintableString (SIZE(3)),
-     *      amount INTEGER,
-     *      exponent INTEGER
-     *    }
-     * </pre>
-     *
-     * @return a DERObject
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector seq = new ASN1EncodableVector();
-        seq.add(currency);
-        seq.add(amount);
-        seq.add(exponent);
-
-        return new DERSequence(seq);
-    }
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/isismtt/x509/NamingAuthority.java b/bcprov/src/main/java/org/bouncycastle/asn1/isismtt/x509/NamingAuthority.java
deleted file mode 100644
index 9a123c3..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/isismtt/x509/NamingAuthority.java
+++ /dev/null
@@ -1,222 +0,0 @@
-package org.bouncycastle.asn1.isismtt.x509;
-
-import java.util.Enumeration;
-
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.ASN1String;
-import org.bouncycastle.asn1.ASN1TaggedObject;
-import org.bouncycastle.asn1.DERIA5String;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.isismtt.ISISMTTObjectIdentifiers;
-import org.bouncycastle.asn1.x500.DirectoryString;
-
-/**
- * Names of authorities which are responsible for the administration of title
- * registers.
- * 
- * <pre>
- *             NamingAuthority ::= SEQUENCE 
- *             {
- *               namingAuthorityId OBJECT IDENTIFIER OPTIONAL,
- *               namingAuthorityUrl IA5String OPTIONAL,
- *               namingAuthorityText DirectoryString(SIZE(1..128)) OPTIONAL
- *             }
- * </pre>
- * @see org.bouncycastle.asn1.isismtt.x509.AdmissionSyntax
- * 
- */
-public class NamingAuthority
-    extends ASN1Object
-{
-
-    /**
-     * Profession OIDs should always be defined under the OID branch of the
-     * responsible naming authority. At the time of this writing, the work group
-     * �Recht, Wirtschaft, Steuern� (�Law, Economy, Taxes�) is registered as the
-     * first naming authority under the OID id-isismtt-at-namingAuthorities.
-     */
-    public static final ASN1ObjectIdentifier id_isismtt_at_namingAuthorities_RechtWirtschaftSteuern =
-        new ASN1ObjectIdentifier(ISISMTTObjectIdentifiers.id_isismtt_at_namingAuthorities + ".1");
-
-    private ASN1ObjectIdentifier namingAuthorityId;
-    private String namingAuthorityUrl;
-    private DirectoryString namingAuthorityText;
-
-    public static NamingAuthority getInstance(Object obj)
-    {
-        if (obj == null || obj instanceof NamingAuthority)
-        {
-            return (NamingAuthority)obj;
-        }
-
-        if (obj instanceof ASN1Sequence)
-        {
-            return new NamingAuthority((ASN1Sequence)obj);
-        }
-
-        throw new IllegalArgumentException("illegal object in getInstance: "
-            + obj.getClass().getName());
-    }
-
-    public static NamingAuthority getInstance(ASN1TaggedObject obj, boolean explicit)
-    {
-        return getInstance(ASN1Sequence.getInstance(obj, explicit));
-    }
-
-    /**
-     * Constructor from ASN1Sequence.
-     * <pre>
-     *             NamingAuthority ::= SEQUENCE
-     *             {
-     *               namingAuthorityId OBJECT IDENTIFIER OPTIONAL,
-     *               namingAuthorityUrl IA5String OPTIONAL,
-     *               namingAuthorityText DirectoryString(SIZE(1..128)) OPTIONAL
-     *             }
-     * </pre>
-     *
-     * @param seq The ASN.1 sequence.
-     */
-    private NamingAuthority(ASN1Sequence seq)
-    {
-
-        if (seq.size() > 3)
-        {
-            throw new IllegalArgumentException("Bad sequence size: "
-                + seq.size());
-        }
-
-        Enumeration e = seq.getObjects();
-
-        if (e.hasMoreElements())
-        {
-            ASN1Encodable o = (ASN1Encodable)e.nextElement();
-            if (o instanceof ASN1ObjectIdentifier)
-            {
-                namingAuthorityId = (ASN1ObjectIdentifier)o;
-            }
-            else if (o instanceof DERIA5String)
-            {
-                namingAuthorityUrl = DERIA5String.getInstance(o).getString();
-            }
-            else if (o instanceof ASN1String)
-            {
-                namingAuthorityText = DirectoryString.getInstance(o);
-            }
-            else
-            {
-                throw new IllegalArgumentException("Bad object encountered: "
-                    + o.getClass());
-            }
-        }
-        if (e.hasMoreElements())
-        {
-            ASN1Encodable o = (ASN1Encodable)e.nextElement();
-            if (o instanceof DERIA5String)
-            {
-                namingAuthorityUrl = DERIA5String.getInstance(o).getString();
-            }
-            else if (o instanceof ASN1String)
-            {
-                namingAuthorityText = DirectoryString.getInstance(o);
-            }
-            else
-            {
-                throw new IllegalArgumentException("Bad object encountered: "
-                    + o.getClass());
-            }
-        }
-        if (e.hasMoreElements())
-        {
-            ASN1Encodable o = (ASN1Encodable)e.nextElement();
-            if (o instanceof ASN1String)
-            {
-                namingAuthorityText = DirectoryString.getInstance(o);
-            }
-            else
-            {
-                throw new IllegalArgumentException("Bad object encountered: "
-                    + o.getClass());
-            }
-
-        }
-    }
-
-    /**
-     * @return Returns the namingAuthorityId.
-     */
-    public ASN1ObjectIdentifier getNamingAuthorityId()
-    {
-        return namingAuthorityId;
-    }
-
-    /**
-     * @return Returns the namingAuthorityText.
-     */
-    public DirectoryString getNamingAuthorityText()
-    {
-        return namingAuthorityText;
-    }
-
-    /**
-     * @return Returns the namingAuthorityUrl.
-     */
-    public String getNamingAuthorityUrl()
-    {
-        return namingAuthorityUrl;
-    }
-
-    /**
-     * Constructor from given details.
-     * <p>
-     * All parameters can be combined.
-     *
-     * @param namingAuthorityId   ObjectIdentifier for naming authority.
-     * @param namingAuthorityUrl  URL for naming authority.
-     * @param namingAuthorityText Textual representation of naming authority.
-     */
-    public NamingAuthority(ASN1ObjectIdentifier namingAuthorityId,
-                           String namingAuthorityUrl, DirectoryString namingAuthorityText)
-    {
-        this.namingAuthorityId = namingAuthorityId;
-        this.namingAuthorityUrl = namingAuthorityUrl;
-        this.namingAuthorityText = namingAuthorityText;
-    }
-
-    /**
-     * Produce an object suitable for an ASN1OutputStream.
-     * <p>
-     * Returns:
-     * <pre>
-     *             NamingAuthority ::= SEQUENCE
-     *             {
-     *               namingAuthorityId OBJECT IDENTIFIER OPTIONAL,
-     *               namingAuthorityUrl IA5String OPTIONAL,
-     *               namingAuthorityText DirectoryString(SIZE(1..128)) OPTIONAL
-     *             }
-     * </pre>
-     *
-     * @return a DERObject
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector vec = new ASN1EncodableVector();
-        if (namingAuthorityId != null)
-        {
-            vec.add(namingAuthorityId);
-        }
-        if (namingAuthorityUrl != null)
-        {
-            vec.add(new DERIA5String(namingAuthorityUrl, true));
-        }
-        if (namingAuthorityText != null)
-        {
-            vec.add(namingAuthorityText);
-        }
-        return new DERSequence(vec);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/isismtt/x509/ProcurationSyntax.java b/bcprov/src/main/java/org/bouncycastle/asn1/isismtt/x509/ProcurationSyntax.java
deleted file mode 100644
index 506f75a..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/isismtt/x509/ProcurationSyntax.java
+++ /dev/null
@@ -1,236 +0,0 @@
-package org.bouncycastle.asn1.isismtt.x509;
-
-import java.util.Enumeration;
-
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.ASN1TaggedObject;
-import org.bouncycastle.asn1.DERPrintableString;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.DERTaggedObject;
-import org.bouncycastle.asn1.x500.DirectoryString;
-import org.bouncycastle.asn1.x509.GeneralName;
-import org.bouncycastle.asn1.x509.IssuerSerial;
-
-/**
- * Attribute to indicate that the certificate holder may sign in the name of a
- * third person.
- * <p>
- * ISIS-MTT PROFILE: The corresponding ProcurationSyntax contains either the
- * name of the person who is represented (subcomponent thirdPerson) or a
- * reference to his/her base certificate (in the component signingFor,
- * subcomponent certRef), furthermore the optional components country and
- * typeSubstitution to indicate the country whose laws apply, and respectively
- * the type of procuration (e.g. manager, procuration, custody).
- * <p>
- * ISIS-MTT PROFILE: The GeneralName MUST be of type directoryName and MAY only
- * contain: - RFC3039 attributes, except pseudonym (countryName, commonName,
- * surname, givenName, serialNumber, organizationName, organizationalUnitName,
- * stateOrProvincename, localityName, postalAddress) and - SubjectDirectoryName
- * attributes (title, dateOfBirth, placeOfBirth, gender, countryOfCitizenship,
- * countryOfResidence and NameAtBirth).
- * 
- * <pre>
- *               ProcurationSyntax ::= SEQUENCE {
- *                 country [1] EXPLICIT PrintableString(SIZE(2)) OPTIONAL,
- *                 typeOfSubstitution [2] EXPLICIT DirectoryString (SIZE(1..128)) OPTIONAL,
- *                 signingFor [3] EXPLICIT SigningFor 
- *               }
- *               
- *               SigningFor ::= CHOICE 
- *               { 
- *                 thirdPerson GeneralName,
- *                 certRef IssuerSerial 
- *               }
- * </pre>
- * 
- */
-public class ProcurationSyntax
-    extends ASN1Object
-{
-    private String country;
-    private DirectoryString typeOfSubstitution;
-
-    private GeneralName thirdPerson;
-    private IssuerSerial certRef;
-
-    public static ProcurationSyntax getInstance(Object obj)
-    {
-        if (obj == null || obj instanceof ProcurationSyntax)
-        {
-            return (ProcurationSyntax)obj;
-        }
-
-        if (obj instanceof ASN1Sequence)
-        {
-            return new ProcurationSyntax((ASN1Sequence)obj);
-        }
-
-        throw new IllegalArgumentException("illegal object in getInstance: "
-            + obj.getClass().getName());
-    }
-
-    /**
-     * Constructor from ASN1Sequence.
-     * <p>
-     * The sequence is of type ProcurationSyntax:
-     * <pre>
-     *               ProcurationSyntax ::= SEQUENCE {
-     *                 country [1] EXPLICIT PrintableString(SIZE(2)) OPTIONAL,
-     *                 typeOfSubstitution [2] EXPLICIT DirectoryString (SIZE(1..128)) OPTIONAL,
-     *                 signingFor [3] EXPLICIT SigningFor
-     *               }
-     *
-     *               SigningFor ::= CHOICE
-     *               {
-     *                 thirdPerson GeneralName,
-     *                 certRef IssuerSerial
-     *               }
-     * </pre>
-     * </p>
-     * @param seq The ASN.1 sequence.
-     */
-    private ProcurationSyntax(ASN1Sequence seq)
-    {
-        if (seq.size() < 1 || seq.size() > 3)
-        {
-            throw new IllegalArgumentException("Bad sequence size: " + seq.size());
-        }
-        Enumeration e = seq.getObjects();
-
-        while (e.hasMoreElements())
-        {
-            ASN1TaggedObject o = ASN1TaggedObject.getInstance(e.nextElement());
-            switch (o.getTagNo())
-            {
-                case 1:
-                    country = DERPrintableString.getInstance(o, true).getString();
-                    break;
-                case 2:
-                    typeOfSubstitution = DirectoryString.getInstance(o, true);
-                    break;
-                case 3:
-                    ASN1Encodable signingFor = o.getObject();
-                    if (signingFor instanceof ASN1TaggedObject)
-                    {
-                        thirdPerson = GeneralName.getInstance(signingFor);
-                    }
-                    else
-                    {
-                        certRef = IssuerSerial.getInstance(signingFor);
-                    }
-                    break;
-                default:
-                    throw new IllegalArgumentException("Bad tag number: " + o.getTagNo());
-            }
-        }
-    }
-
-    /**
-     * Constructor from a given details.
-     * <p>
-     * Either <code>generalName</code> or <code>certRef</code> MUST be
-     * <code>null</code>.
-     *
-     * @param country            The country code whose laws apply.
-     * @param typeOfSubstitution The type of procuration.
-     * @param certRef            Reference to certificate of the person who is represented.
-     */
-    public ProcurationSyntax(
-        String country,
-        DirectoryString typeOfSubstitution,
-        IssuerSerial certRef)
-    {
-        this.country = country;
-        this.typeOfSubstitution = typeOfSubstitution;
-        this.thirdPerson = null;
-        this.certRef = certRef;
-    }
-
-    /**
-     * Constructor from a given details.
-     * <p>
-     * Either <code>generalName</code> or <code>certRef</code> MUST be
-     * <code>null</code>.
-     *
-     * @param country            The country code whose laws apply.
-     * @param typeOfSubstitution The type of procuration.
-     * @param thirdPerson        The GeneralName of the person who is represented.
-     */
-    public ProcurationSyntax(
-        String country,
-        DirectoryString typeOfSubstitution,
-        GeneralName thirdPerson)
-    {
-        this.country = country;
-        this.typeOfSubstitution = typeOfSubstitution;
-        this.thirdPerson = thirdPerson;
-        this.certRef = null;
-    }
-
-    public String getCountry()
-    {
-        return country;
-    }
-
-    public DirectoryString getTypeOfSubstitution()
-    {
-        return typeOfSubstitution;
-    }
-
-    public GeneralName getThirdPerson()
-    {
-        return thirdPerson;
-    }
-
-    public IssuerSerial getCertRef()
-    {
-        return certRef;
-    }
-
-    /**
-     * Produce an object suitable for an ASN1OutputStream.
-     * <p>
-     * Returns:
-     * <pre>
-     *               ProcurationSyntax ::= SEQUENCE {
-     *                 country [1] EXPLICIT PrintableString(SIZE(2)) OPTIONAL,
-     *                 typeOfSubstitution [2] EXPLICIT DirectoryString (SIZE(1..128)) OPTIONAL,
-     *                 signingFor [3] EXPLICIT SigningFor
-     *               }
-     *
-     *               SigningFor ::= CHOICE
-     *               {
-     *                 thirdPerson GeneralName,
-     *                 certRef IssuerSerial
-     *               }
-     * </pre>
-     *
-     * @return a DERObject
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector vec = new ASN1EncodableVector();
-        if (country != null)
-        {
-            vec.add(new DERTaggedObject(true, 1, new DERPrintableString(country, true)));
-        }
-        if (typeOfSubstitution != null)
-        {
-            vec.add(new DERTaggedObject(true, 2, typeOfSubstitution));
-        }
-        if (thirdPerson != null)
-        {
-            vec.add(new DERTaggedObject(true, 3, thirdPerson));
-        }
-        else
-        {
-            vec.add(new DERTaggedObject(true, 3, certRef));
-        }
-
-        return new DERSequence(vec);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/isismtt/x509/ProfessionInfo.java b/bcprov/src/main/java/org/bouncycastle/asn1/isismtt/x509/ProfessionInfo.java
deleted file mode 100644
index e0f94be..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/isismtt/x509/ProfessionInfo.java
+++ /dev/null
@@ -1,405 +0,0 @@
-package org.bouncycastle.asn1.isismtt.x509;
-
-import java.util.Enumeration;
-
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.ASN1TaggedObject;
-import org.bouncycastle.asn1.DEROctetString;
-import org.bouncycastle.asn1.DERPrintableString;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.DERTaggedObject;
-import org.bouncycastle.asn1.x500.DirectoryString;
-
-/**
- * Professions, specializations, disciplines, fields of activity, etc.
- * 
- * <pre>
- *               ProfessionInfo ::= SEQUENCE 
- *               {
- *                 namingAuthority [0] EXPLICIT NamingAuthority OPTIONAL,
- *                 professionItems SEQUENCE OF DirectoryString (SIZE(1..128)),
- *                 professionOIDs SEQUENCE OF OBJECT IDENTIFIER OPTIONAL,
- *                 registrationNumber PrintableString(SIZE(1..128)) OPTIONAL,
- *                 addProfessionInfo OCTET STRING OPTIONAL 
- *               }
- * </pre>
- * 
- * @see org.bouncycastle.asn1.isismtt.x509.AdmissionSyntax
- */
-public class ProfessionInfo 
-    extends ASN1Object
-{
-
-    /**
-     * Rechtsanw�ltin
-     */
-    public static final ASN1ObjectIdentifier Rechtsanwltin = new ASN1ObjectIdentifier(
-        NamingAuthority.id_isismtt_at_namingAuthorities_RechtWirtschaftSteuern + ".1");
-
-    /**
-     * Rechtsanwalt
-     */
-    public static final ASN1ObjectIdentifier Rechtsanwalt = new ASN1ObjectIdentifier(
-        NamingAuthority.id_isismtt_at_namingAuthorities_RechtWirtschaftSteuern + ".2");
-
-    /**
-     * Rechtsbeistand
-     */
-    public static final ASN1ObjectIdentifier Rechtsbeistand = new ASN1ObjectIdentifier(
-        NamingAuthority.id_isismtt_at_namingAuthorities_RechtWirtschaftSteuern + ".3");
-
-    /**
-     * Steuerberaterin
-     */
-    public static final ASN1ObjectIdentifier Steuerberaterin = new ASN1ObjectIdentifier(
-        NamingAuthority.id_isismtt_at_namingAuthorities_RechtWirtschaftSteuern + ".4");
-
-    /**
-     * Steuerberater
-     */
-    public static final ASN1ObjectIdentifier Steuerberater = new ASN1ObjectIdentifier(
-        NamingAuthority.id_isismtt_at_namingAuthorities_RechtWirtschaftSteuern + ".5");
-
-    /**
-     * Steuerbevollm�chtigte
-     */
-    public static final ASN1ObjectIdentifier Steuerbevollmchtigte = new ASN1ObjectIdentifier(
-        NamingAuthority.id_isismtt_at_namingAuthorities_RechtWirtschaftSteuern + ".6");
-
-    /**
-     * Steuerbevollm�chtigter
-     */
-    public static final ASN1ObjectIdentifier Steuerbevollmchtigter = new ASN1ObjectIdentifier(
-        NamingAuthority.id_isismtt_at_namingAuthorities_RechtWirtschaftSteuern + ".7");
-
-    /**
-     * Notarin
-     */
-    public static final ASN1ObjectIdentifier Notarin = new ASN1ObjectIdentifier(
-        NamingAuthority.id_isismtt_at_namingAuthorities_RechtWirtschaftSteuern + ".8");
-
-    /**
-     * Notar
-     */
-    public static final ASN1ObjectIdentifier Notar = new ASN1ObjectIdentifier(
-        NamingAuthority.id_isismtt_at_namingAuthorities_RechtWirtschaftSteuern + ".9");
-
-    /**
-     * Notarvertreterin
-     */
-    public static final ASN1ObjectIdentifier Notarvertreterin = new ASN1ObjectIdentifier(
-        NamingAuthority.id_isismtt_at_namingAuthorities_RechtWirtschaftSteuern + ".10");
-
-    /**
-     * Notarvertreter
-     */
-    public static final ASN1ObjectIdentifier Notarvertreter = new ASN1ObjectIdentifier(
-        NamingAuthority.id_isismtt_at_namingAuthorities_RechtWirtschaftSteuern + ".11");
-
-    /**
-     * Notariatsverwalterin
-     */
-    public static final ASN1ObjectIdentifier Notariatsverwalterin = new ASN1ObjectIdentifier(
-        NamingAuthority.id_isismtt_at_namingAuthorities_RechtWirtschaftSteuern + ".12");
-
-    /**
-     * Notariatsverwalter
-     */
-    public static final ASN1ObjectIdentifier Notariatsverwalter = new ASN1ObjectIdentifier(
-        NamingAuthority.id_isismtt_at_namingAuthorities_RechtWirtschaftSteuern + ".13");
-
-    /**
-     * Wirtschaftspr�ferin
-     */
-    public static final ASN1ObjectIdentifier Wirtschaftsprferin = new ASN1ObjectIdentifier(
-        NamingAuthority.id_isismtt_at_namingAuthorities_RechtWirtschaftSteuern + ".14");
-
-    /**
-     * Wirtschaftspr�fer
-     */
-    public static final ASN1ObjectIdentifier Wirtschaftsprfer = new ASN1ObjectIdentifier(
-        NamingAuthority.id_isismtt_at_namingAuthorities_RechtWirtschaftSteuern + ".15");
-
-    /**
-     * Vereidigte Buchpr�ferin
-     */
-    public static final ASN1ObjectIdentifier VereidigteBuchprferin = new ASN1ObjectIdentifier(
-        NamingAuthority.id_isismtt_at_namingAuthorities_RechtWirtschaftSteuern + ".16");
-
-    /**
-     * Vereidigter Buchpr�fer
-     */
-    public static final ASN1ObjectIdentifier VereidigterBuchprfer = new ASN1ObjectIdentifier(
-        NamingAuthority.id_isismtt_at_namingAuthorities_RechtWirtschaftSteuern + ".17");
-
-    /**
-     * Patentanw�ltin
-     */
-    public static final ASN1ObjectIdentifier Patentanwltin = new ASN1ObjectIdentifier(
-        NamingAuthority.id_isismtt_at_namingAuthorities_RechtWirtschaftSteuern + ".18");
-
-    /**
-     * Patentanwalt
-     */
-    public static final ASN1ObjectIdentifier Patentanwalt = new ASN1ObjectIdentifier(
-        NamingAuthority.id_isismtt_at_namingAuthorities_RechtWirtschaftSteuern + ".19");
-
-    private NamingAuthority namingAuthority;
-
-    private ASN1Sequence professionItems;
-
-    private ASN1Sequence professionOIDs;
-
-    private String registrationNumber;
-
-    private ASN1OctetString addProfessionInfo;
-
-    public static ProfessionInfo getInstance(Object obj)
-    {
-        if (obj == null || obj instanceof ProfessionInfo)
-        {
-            return (ProfessionInfo)obj;
-        }
-
-        if (obj instanceof ASN1Sequence)
-        {
-            return new ProfessionInfo((ASN1Sequence)obj);
-        }
-
-        throw new IllegalArgumentException("illegal object in getInstance: "
-            + obj.getClass().getName());
-    }
-
-    /**
-     * Constructor from ASN1Sequence.
-     * <pre>
-     *               ProfessionInfo ::= SEQUENCE
-     *               {
-     *                 namingAuthority [0] EXPLICIT NamingAuthority OPTIONAL,
-     *                 professionItems SEQUENCE OF DirectoryString (SIZE(1..128)),
-     *                 professionOIDs SEQUENCE OF OBJECT IDENTIFIER OPTIONAL,
-     *                 registrationNumber PrintableString(SIZE(1..128)) OPTIONAL,
-     *                 addProfessionInfo OCTET STRING OPTIONAL
-     *               }
-     * </pre>
-     *
-     * @param seq The ASN.1 sequence.
-     */
-    private ProfessionInfo(ASN1Sequence seq)
-    {
-        if (seq.size() > 5)
-        {
-            throw new IllegalArgumentException("Bad sequence size: "
-                + seq.size());
-        }
-
-        Enumeration e = seq.getObjects();
-
-        ASN1Encodable o = (ASN1Encodable)e.nextElement();
-
-        if (o instanceof ASN1TaggedObject)
-        {
-            if (((ASN1TaggedObject)o).getTagNo() != 0)
-            {
-                throw new IllegalArgumentException("Bad tag number: "
-                    + ((ASN1TaggedObject)o).getTagNo());
-            }
-            namingAuthority = NamingAuthority.getInstance((ASN1TaggedObject)o, true);
-            o = (ASN1Encodable)e.nextElement();
-        }
-
-        professionItems = ASN1Sequence.getInstance(o);
-
-        if (e.hasMoreElements())
-        {
-            o = (ASN1Encodable)e.nextElement();
-            if (o instanceof ASN1Sequence)
-            {
-                professionOIDs = ASN1Sequence.getInstance(o);
-            }
-            else if (o instanceof DERPrintableString)
-            {
-                registrationNumber = DERPrintableString.getInstance(o).getString();
-            }
-            else if (o instanceof ASN1OctetString)
-            {
-                addProfessionInfo = ASN1OctetString.getInstance(o);
-            }
-            else
-            {
-                throw new IllegalArgumentException("Bad object encountered: "
-                    + o.getClass());
-            }
-        }
-        if (e.hasMoreElements())
-        {
-            o = (ASN1Encodable)e.nextElement();
-            if (o instanceof DERPrintableString)
-            {
-                registrationNumber = DERPrintableString.getInstance(o).getString();
-            }
-            else if (o instanceof DEROctetString)
-            {
-                addProfessionInfo = (DEROctetString)o;
-            }
-            else
-            {
-                throw new IllegalArgumentException("Bad object encountered: "
-                    + o.getClass());
-            }
-        }
-        if (e.hasMoreElements())
-        {
-            o = (ASN1Encodable)e.nextElement();
-            if (o instanceof DEROctetString)
-            {
-                addProfessionInfo = (DEROctetString)o;
-            }
-            else
-            {
-                throw new IllegalArgumentException("Bad object encountered: "
-                    + o.getClass());
-            }
-        }
-
-    }
-
-    /**
-     * Constructor from given details.
-     * <p>
-     * <code>professionItems</code> is mandatory, all other parameters are
-     * optional.
-     *
-     * @param namingAuthority    The naming authority.
-     * @param professionItems    Directory strings of the profession.
-     * @param professionOIDs     DERObjectIdentfier objects for the
-     *                           profession.
-     * @param registrationNumber Registration number.
-     * @param addProfessionInfo  Additional infos in encoded form.
-     */
-    public ProfessionInfo(NamingAuthority namingAuthority,
-                          DirectoryString[] professionItems, ASN1ObjectIdentifier[] professionOIDs,
-                          String registrationNumber, ASN1OctetString addProfessionInfo)
-    {
-        this.namingAuthority = namingAuthority;
-        ASN1EncodableVector v = new ASN1EncodableVector();
-        for (int i = 0; i != professionItems.length; i++)
-        {
-            v.add(professionItems[i]);
-        }
-        this.professionItems = new DERSequence(v);
-        if (professionOIDs != null)
-        {
-            v = new ASN1EncodableVector();
-            for (int i = 0; i != professionOIDs.length; i++)
-            {
-                v.add(professionOIDs[i]);
-            }
-            this.professionOIDs = new DERSequence(v);
-        }
-        this.registrationNumber = registrationNumber;
-        this.addProfessionInfo = addProfessionInfo;
-    }
-
-    /**
-     * Produce an object suitable for an ASN1OutputStream.
-     * <p>
-     * Returns:
-     * <pre>
-     *               ProfessionInfo ::= SEQUENCE
-     *               {
-     *                 namingAuthority [0] EXPLICIT NamingAuthority OPTIONAL,
-     *                 professionItems SEQUENCE OF DirectoryString (SIZE(1..128)),
-     *                 professionOIDs SEQUENCE OF OBJECT IDENTIFIER OPTIONAL,
-     *                 registrationNumber PrintableString(SIZE(1..128)) OPTIONAL,
-     *                 addProfessionInfo OCTET STRING OPTIONAL
-     *               }
-     * </pre>
-     *
-     * @return a DERObject
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector vec = new ASN1EncodableVector();
-        if (namingAuthority != null)
-        {
-            vec.add(new DERTaggedObject(true, 0, namingAuthority));
-        }
-        vec.add(professionItems);
-        if (professionOIDs != null)
-        {
-            vec.add(professionOIDs);
-        }
-        if (registrationNumber != null)
-        {
-            vec.add(new DERPrintableString(registrationNumber, true));
-        }
-        if (addProfessionInfo != null)
-        {
-            vec.add(addProfessionInfo);
-        }
-        return new DERSequence(vec);
-    }
-
-    /**
-     * @return Returns the addProfessionInfo.
-     */
-    public ASN1OctetString getAddProfessionInfo()
-    {
-        return addProfessionInfo;
-    }
-
-    /**
-     * @return Returns the namingAuthority.
-     */
-    public NamingAuthority getNamingAuthority()
-    {
-        return namingAuthority;
-    }
-
-    /**
-     * @return Returns the professionItems.
-     */
-    public DirectoryString[] getProfessionItems()
-    {
-        DirectoryString[] items = new DirectoryString[professionItems.size()];
-        int count = 0;
-        for (Enumeration e = professionItems.getObjects(); e.hasMoreElements();)
-        {
-            items[count++] = DirectoryString.getInstance(e.nextElement());
-        }
-        return items;
-    }
-
-    /**
-     * @return Returns the professionOIDs.
-     */
-    public ASN1ObjectIdentifier[] getProfessionOIDs()
-    {
-        if (professionOIDs == null)
-        {
-            return new ASN1ObjectIdentifier[0];
-        }
-        ASN1ObjectIdentifier[] oids = new ASN1ObjectIdentifier[professionOIDs.size()];
-        int count = 0;
-        for (Enumeration e = professionOIDs.getObjects(); e.hasMoreElements();)
-        {
-            oids[count++] = ASN1ObjectIdentifier.getInstance(e.nextElement());
-        }
-        return oids;
-    }
-
-    /**
-     * @return Returns the registrationNumber.
-     */
-    public String getRegistrationNumber()
-    {
-        return registrationNumber;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/isismtt/x509/Restriction.java b/bcprov/src/main/java/org/bouncycastle/asn1/isismtt/x509/Restriction.java
deleted file mode 100644
index 1a72bea..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/isismtt/x509/Restriction.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package org.bouncycastle.asn1.isismtt.x509;
-
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.x500.DirectoryString;
-
-/**
- * Some other restriction regarding the usage of this certificate.
- *
- * <pre>
- *  RestrictionSyntax ::= DirectoryString (SIZE(1..1024))
- * </pre>
- */
-public class Restriction
-    extends ASN1Object
-{
-    private DirectoryString restriction;
-
-    public static Restriction getInstance(Object obj)
-    {
-        if (obj instanceof Restriction)
-        {
-            return (Restriction)obj;
-        }
-
-        if (obj != null)
-        {
-            return new Restriction(DirectoryString.getInstance(obj));
-        }
-
-        return null;
-    }
-
-    /**
-     * Constructor from DirectoryString.
-     * <p>
-     * The DirectoryString is of type RestrictionSyntax:
-     * <pre>
-     *      RestrictionSyntax ::= DirectoryString (SIZE(1..1024))
-     * </pre>
-     * </p>
-     * @param restriction A DirectoryString.
-     */
-    private Restriction(DirectoryString restriction)
-    {
-        this.restriction = restriction;
-    }
-
-    /**
-     * Constructor from a given details.
-     *
-     * @param restriction The describtion of the restriction.
-     */
-    public Restriction(String restriction)
-    {
-        this.restriction = new DirectoryString(restriction);
-    }
-
-    public DirectoryString getRestriction()
-    {
-        return restriction;
-    }
-
-    /**
-     * Produce an object suitable for an ASN1OutputStream.
-     * <p>
-     * Returns:
-     * <pre>
-     *      RestrictionSyntax ::= DirectoryString (SIZE(1..1024))
-     * </pre>
-     *
-     * @return a DERObject
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        return restriction.toASN1Primitive();
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/isismtt/x509/package.html b/bcprov/src/main/java/org/bouncycastle/asn1/isismtt/x509/package.html
deleted file mode 100644
index fa411ec..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/isismtt/x509/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body bgcolor="#ffffff">
-Support classes for the ISIS-MTT X.509 Certificate Extensions.
-</body>
-</html>
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/kisa/package.html b/bcprov/src/main/java/org/bouncycastle/asn1/kisa/package.html
deleted file mode 100644
index 48b5afd..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/kisa/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body bgcolor="#ffffff">
-Support classes for the Korea Information Security Agency (KISA) standard - SEED algorithm.
-</body>
-</html>
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/microsoft/MicrosoftObjectIdentifiers.java b/bcprov/src/main/java/org/bouncycastle/asn1/microsoft/MicrosoftObjectIdentifiers.java
deleted file mode 100644
index a7b651a..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/microsoft/MicrosoftObjectIdentifiers.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package org.bouncycastle.asn1.microsoft;
-
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-
-/**
- * Microsoft
- * <p>
- * Object identifier base:
- * <pre>
- *    iso(1) identified-organization(3) dod(6) internet(1) private(4) enterprise(1) microsoft(311)
- * </pre>
- * 1.3.6.1.4.1.311
- */
-public interface MicrosoftObjectIdentifiers
-{
-    /** Base OID: 1.3.6.1.4.1.311 */
-    static final ASN1ObjectIdentifier    microsoft               = new ASN1ObjectIdentifier("1.3.6.1.4.1.311");
-    /** OID: 1.3.6.1.4.1.311.20.2 */
-    static final ASN1ObjectIdentifier    microsoftCertTemplateV1 = microsoft.branch("20.2");
-    /** OID: 1.3.6.1.4.1.311.21.1 */
-    static final ASN1ObjectIdentifier    microsoftCaVersion      = microsoft.branch("21.1");
-    /** OID: 1.3.6.1.4.1.311.21.2 */
-    static final ASN1ObjectIdentifier    microsoftPrevCaCertHash = microsoft.branch("21.2");
-    /** OID: 1.3.6.1.4.1.311.21.4 */
-    static final ASN1ObjectIdentifier    microsoftCrlNextPublish = microsoft.branch("21.4");
-    /** OID: 1.3.6.1.4.1.311.21.7 */
-    static final ASN1ObjectIdentifier    microsoftCertTemplateV2 = microsoft.branch("21.7");
-    /** OID: 1.3.6.1.4.1.311.21.10 */
-    static final ASN1ObjectIdentifier    microsoftAppPolicies    = microsoft.branch("21.10");
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/microsoft/package.html b/bcprov/src/main/java/org/bouncycastle/asn1/microsoft/package.html
deleted file mode 100644
index 35d1248..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/microsoft/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body bgcolor="#ffffff">
-Support for Microsoft specific ASN.1 classes and object identifiers.
-</body>
-</html>
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/misc/CAST5CBCParameters.java b/bcprov/src/main/java/org/bouncycastle/asn1/misc/CAST5CBCParameters.java
deleted file mode 100644
index 715e4bb..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/misc/CAST5CBCParameters.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package org.bouncycastle.asn1.misc;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DEROctetString;
-import org.bouncycastle.asn1.DERSequence;
-
-public class CAST5CBCParameters
-    extends ASN1Object
-{
-    ASN1Integer      keyLength;
-    ASN1OctetString iv;
-
-    public static CAST5CBCParameters getInstance(
-        Object  o)
-    {
-        if (o instanceof CAST5CBCParameters)
-        {
-            return (CAST5CBCParameters)o;
-        }
-        else if (o != null)
-        {
-            return new CAST5CBCParameters(ASN1Sequence.getInstance(o));
-        }
-
-        return null;
-    }
-
-    public CAST5CBCParameters(
-        byte[]  iv,
-        int     keyLength)
-    {
-        this.iv = new DEROctetString(iv);
-        this.keyLength = new ASN1Integer(keyLength);
-    }
-
-    public CAST5CBCParameters(
-        ASN1Sequence  seq)
-    {
-        iv = (ASN1OctetString)seq.getObjectAt(0);
-        keyLength = (ASN1Integer)seq.getObjectAt(1);
-    }
-
-    public byte[] getIV()
-    {
-        return iv.getOctets();
-    }
-
-    public int getKeyLength()
-    {
-        return keyLength.getValue().intValue();
-    }
-
-    /**
-     * Produce an object suitable for an ASN1OutputStream.
-     * <pre>
-     * cast5CBCParameters ::= SEQUENCE {
-     *                           iv         OCTET STRING DEFAULT 0,
-     *                                  -- Initialization vector
-     *                           keyLength  INTEGER
-     *                                  -- Key length, in bits
-     *                      }
-     * </pre>
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector  v = new ASN1EncodableVector();
-
-        v.add(iv);
-        v.add(keyLength);
-
-        return new DERSequence(v);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/misc/IDEACBCPar.java b/bcprov/src/main/java/org/bouncycastle/asn1/misc/IDEACBCPar.java
deleted file mode 100644
index 35b0f24..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/misc/IDEACBCPar.java
+++ /dev/null
@@ -1,81 +0,0 @@
-package org.bouncycastle.asn1.misc;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DEROctetString;
-import org.bouncycastle.asn1.DERSequence;
-
-public class IDEACBCPar
-    extends ASN1Object
-{
-    ASN1OctetString  iv;
-
-    public static IDEACBCPar getInstance(
-        Object  o)
-    {
-        if (o instanceof IDEACBCPar)
-        {
-            return (IDEACBCPar)o;
-        }
-        else if (o != null)
-        {
-            return new IDEACBCPar(ASN1Sequence.getInstance(o));
-        }
-
-        return null;
-    }
-
-    public IDEACBCPar(
-        byte[]  iv)
-    {
-        this.iv = new DEROctetString(iv);
-    }
-
-    public IDEACBCPar(
-        ASN1Sequence  seq)
-    {
-        if (seq.size() == 1)
-        {
-            iv = (ASN1OctetString)seq.getObjectAt(0);
-        }
-        else
-        {
-            iv = null;
-        }
-    }
-
-    public byte[] getIV()
-    {
-        if (iv != null)
-        {
-            return iv.getOctets();
-        }
-        else
-        {
-            return null;
-        }
-    }
-
-    /**
-     * Produce an object suitable for an ASN1OutputStream.
-     * <pre>
-     * IDEA-CBCPar ::= SEQUENCE {
-     *                      iv    OCTET STRING OPTIONAL -- exactly 8 octets
-     *                  }
-     * </pre>
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector  v = new ASN1EncodableVector();
-
-        if (iv != null)
-        {
-            v.add(iv);
-        }
-
-        return new DERSequence(v);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/misc/package.html b/bcprov/src/main/java/org/bouncycastle/asn1/misc/package.html
deleted file mode 100644
index e3bda64..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/misc/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body bgcolor="#ffffff">
-Miscellaneous object identifiers and objects.
-</body>
-</html>
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/mozilla/PublicKeyAndChallenge.java b/bcprov/src/main/java/org/bouncycastle/asn1/mozilla/PublicKeyAndChallenge.java
deleted file mode 100644
index b4e44bf..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/mozilla/PublicKeyAndChallenge.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package org.bouncycastle.asn1.mozilla;
-
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DERIA5String;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-
-/**
- * This is designed to parse
- * the PublicKeyAndChallenge created by the KEYGEN tag included by
- * Mozilla based browsers.
- *  <pre>
- *  PublicKeyAndChallenge ::= SEQUENCE {
- *    spki SubjectPublicKeyInfo,
- *    challenge IA5STRING
- *  }
- *
- *  </pre>
- */
-public class PublicKeyAndChallenge
-    extends ASN1Object
-{
-    private ASN1Sequence         pkacSeq;
-    private SubjectPublicKeyInfo spki;
-    private DERIA5String         challenge;
-
-    public static PublicKeyAndChallenge getInstance(Object obj)
-    {
-        if (obj instanceof PublicKeyAndChallenge)
-        {
-            return (PublicKeyAndChallenge)obj;
-        }
-        else if (obj != null)
-        {
-            return new PublicKeyAndChallenge(ASN1Sequence.getInstance(obj));
-        }
-
-        return null;
-    }
-
-    private PublicKeyAndChallenge(ASN1Sequence seq)
-    {
-        pkacSeq = seq;
-        spki = SubjectPublicKeyInfo.getInstance(seq.getObjectAt(0));
-        challenge = DERIA5String.getInstance(seq.getObjectAt(1));
-    }
-
-    public ASN1Primitive toASN1Primitive()
-    {
-        return pkacSeq;
-    }
-
-    public SubjectPublicKeyInfo getSubjectPublicKeyInfo()
-    {
-        return spki;
-    }
-
-    public DERIA5String getChallenge()
-    {
-        return challenge;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/mozilla/package.html b/bcprov/src/main/java/org/bouncycastle/asn1/mozilla/package.html
deleted file mode 100644
index 40776b0..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/mozilla/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body bgcolor="#ffffff">
-Support classes useful for encoding objects used by mozilla.
-</body>
-</html>
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/nist/package.html b/bcprov/src/main/java/org/bouncycastle/asn1/nist/package.html
deleted file mode 100644
index 1cdca76..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/nist/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body bgcolor="#ffffff">
-Support classes for NIST related objects.
-</body>
-</html>
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/ntt/package.html b/bcprov/src/main/java/org/bouncycastle/asn1/ntt/package.html
deleted file mode 100644
index 4b9d05d..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/ntt/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body bgcolor="#ffffff">
-ASN.1 classes relevant to the standards produced by Nippon Telegraph and Telephone.
-</body>
-</html>
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/ocsp/BasicOCSPResponse.java b/bcprov/src/main/java/org/bouncycastle/asn1/ocsp/BasicOCSPResponse.java
deleted file mode 100644
index 1b2e7f5..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/ocsp/BasicOCSPResponse.java
+++ /dev/null
@@ -1,112 +0,0 @@
-package org.bouncycastle.asn1.ocsp;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.ASN1TaggedObject;
-import org.bouncycastle.asn1.DERBitString;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.DERTaggedObject;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-
-public class BasicOCSPResponse
-    extends ASN1Object
-{
-    private ResponseData        tbsResponseData;
-    private AlgorithmIdentifier signatureAlgorithm;
-    private DERBitString        signature;
-    private ASN1Sequence        certs;
-
-    public BasicOCSPResponse(
-        ResponseData        tbsResponseData,
-        AlgorithmIdentifier signatureAlgorithm,
-        DERBitString        signature,
-        ASN1Sequence        certs)
-    {
-        this.tbsResponseData = tbsResponseData;
-        this.signatureAlgorithm = signatureAlgorithm;
-        this.signature = signature;
-        this.certs = certs;
-    }
-
-    private BasicOCSPResponse(
-        ASN1Sequence    seq)
-    {
-        this.tbsResponseData = ResponseData.getInstance(seq.getObjectAt(0));
-        this.signatureAlgorithm = AlgorithmIdentifier.getInstance(seq.getObjectAt(1));
-        this.signature = (DERBitString)seq.getObjectAt(2);
-
-        if (seq.size() > 3)
-        {
-            this.certs = ASN1Sequence.getInstance((ASN1TaggedObject)seq.getObjectAt(3), true);
-        }
-    }
-
-    public static BasicOCSPResponse getInstance(
-        ASN1TaggedObject obj,
-        boolean          explicit)
-    {
-        return getInstance(ASN1Sequence.getInstance(obj, explicit));
-    }
-
-    public static BasicOCSPResponse getInstance(
-        Object  obj)
-    {
-        if (obj instanceof BasicOCSPResponse)
-        {
-            return (BasicOCSPResponse)obj;
-        }
-        else if (obj != null)
-        {
-            return new BasicOCSPResponse(ASN1Sequence.getInstance(obj));
-        }
-
-        return null;
-    }
-
-    public ResponseData getTbsResponseData()
-    {
-        return tbsResponseData;
-    }
-
-    public AlgorithmIdentifier getSignatureAlgorithm()
-    {
-        return signatureAlgorithm;
-    }
-
-    public DERBitString getSignature()
-    {
-        return signature;
-    }
-
-    public ASN1Sequence getCerts()
-    {
-        return certs;
-    }
-
-    /**
-     * Produce an object suitable for an ASN1OutputStream.
-     * <pre>
-     * BasicOCSPResponse       ::= SEQUENCE {
-     *      tbsResponseData      ResponseData,
-     *      signatureAlgorithm   AlgorithmIdentifier,
-     *      signature            BIT STRING,
-     *      certs                [0] EXPLICIT SEQUENCE OF Certificate OPTIONAL }
-     * </pre>
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector v = new ASN1EncodableVector();
-
-        v.add(tbsResponseData);
-        v.add(signatureAlgorithm);
-        v.add(signature);
-        if (certs != null)
-        {
-            v.add(new DERTaggedObject(true, 0, certs));
-        }
-
-        return new DERSequence(v);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/ocsp/CertID.java b/bcprov/src/main/java/org/bouncycastle/asn1/ocsp/CertID.java
deleted file mode 100644
index 9d3496e..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/ocsp/CertID.java
+++ /dev/null
@@ -1,105 +0,0 @@
-package org.bouncycastle.asn1.ocsp;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.ASN1TaggedObject;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-
-public class CertID
-    extends ASN1Object
-{
-    AlgorithmIdentifier    hashAlgorithm;
-    ASN1OctetString        issuerNameHash;
-    ASN1OctetString        issuerKeyHash;
-    ASN1Integer             serialNumber;
-
-    public CertID(
-        AlgorithmIdentifier hashAlgorithm,
-        ASN1OctetString     issuerNameHash,
-        ASN1OctetString     issuerKeyHash,
-        ASN1Integer         serialNumber)
-    {
-        this.hashAlgorithm = hashAlgorithm;
-        this.issuerNameHash = issuerNameHash;
-        this.issuerKeyHash = issuerKeyHash;
-        this.serialNumber = serialNumber;
-    }
-
-    private CertID(
-        ASN1Sequence    seq)
-    {
-        hashAlgorithm = AlgorithmIdentifier.getInstance(seq.getObjectAt(0));
-        issuerNameHash = (ASN1OctetString)seq.getObjectAt(1);
-        issuerKeyHash = (ASN1OctetString)seq.getObjectAt(2);
-        serialNumber = (ASN1Integer)seq.getObjectAt(3);
-    }
-
-    public static CertID getInstance(
-        ASN1TaggedObject obj,
-        boolean          explicit)
-    {
-        return getInstance(ASN1Sequence.getInstance(obj, explicit));
-    }
-
-    public static CertID getInstance(
-        Object  obj)
-    {
-        if (obj instanceof CertID)
-        {
-            return (CertID)obj;
-        }
-        else if (obj != null)
-        {
-            return new CertID(ASN1Sequence.getInstance(obj));
-        }
-
-        return null;
-    }
-
-    public AlgorithmIdentifier getHashAlgorithm()
-    {
-        return hashAlgorithm;
-    }
-
-    public ASN1OctetString getIssuerNameHash()
-    {
-        return issuerNameHash;
-    }
-
-    public ASN1OctetString getIssuerKeyHash()
-    {
-        return issuerKeyHash;
-    }
-
-    public ASN1Integer getSerialNumber()
-    {
-        return serialNumber;
-    }
-
-    /**
-     * Produce an object suitable for an ASN1OutputStream.
-     * <pre>
-     * CertID          ::=     SEQUENCE {
-     *     hashAlgorithm       AlgorithmIdentifier,
-     *     issuerNameHash      OCTET STRING, -- Hash of Issuer's DN
-     *     issuerKeyHash       OCTET STRING, -- Hash of Issuers public key
-     *     serialNumber        CertificateSerialNumber }
-     * </pre>
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector    v = new ASN1EncodableVector();
-
-        v.add(hashAlgorithm);
-        v.add(issuerNameHash);
-        v.add(issuerKeyHash);
-        v.add(serialNumber);
-
-        return new DERSequence(v);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/ocsp/CertStatus.java b/bcprov/src/main/java/org/bouncycastle/asn1/ocsp/CertStatus.java
deleted file mode 100644
index af530ae..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/ocsp/CertStatus.java
+++ /dev/null
@@ -1,105 +0,0 @@
-package org.bouncycastle.asn1.ocsp;
-
-import org.bouncycastle.asn1.ASN1Choice;
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1TaggedObject;
-import org.bouncycastle.asn1.DERNull;
-import org.bouncycastle.asn1.DERTaggedObject;
-
-public class CertStatus
-    extends ASN1Object
-    implements ASN1Choice
-{
-    private int             tagNo;
-    private ASN1Encodable    value;
-
-    /**
-     * create a CertStatus object with a tag of zero.
-     */
-    public CertStatus()
-    {
-        tagNo = 0;
-        value = DERNull.INSTANCE;
-    }
-
-    public CertStatus(
-        RevokedInfo info)
-    {
-        tagNo = 1;
-        value = info;
-    }
-
-    public CertStatus(
-        int tagNo,
-        ASN1Encodable    value)
-    {
-        this.tagNo = tagNo;
-        this.value = value;
-    }
-
-    public CertStatus(
-        ASN1TaggedObject    choice)
-    {
-        this.tagNo = choice.getTagNo();
-
-        switch (choice.getTagNo())
-        {
-        case 0:
-            value = DERNull.INSTANCE;
-            break;
-        case 1:
-            value = RevokedInfo.getInstance(choice, false);
-            break;
-        case 2:
-            value = DERNull.INSTANCE;
-        }
-    }
-
-    public static CertStatus getInstance(
-        Object  obj)
-    {
-        if (obj == null || obj instanceof CertStatus)
-        {
-            return (CertStatus)obj;
-        }
-        else if (obj instanceof ASN1TaggedObject)
-        {
-            return new CertStatus((ASN1TaggedObject)obj);
-        }
-
-        throw new IllegalArgumentException("unknown object in factory: " + obj.getClass().getName());
-    }
-
-    public static CertStatus getInstance(
-        ASN1TaggedObject obj,
-        boolean          explicit)
-    {
-        return getInstance(obj.getObject()); // must be explicitly tagged
-    }
-    
-    public int getTagNo()
-    {
-        return tagNo;
-    }
-
-    public ASN1Encodable getStatus()
-    {
-        return value;
-    }
-
-    /**
-     * Produce an object suitable for an ASN1OutputStream.
-     * <pre>
-     *  CertStatus ::= CHOICE {
-     *                  good        [0]     IMPLICIT NULL,
-     *                  revoked     [1]     IMPLICIT RevokedInfo,
-     *                  unknown     [2]     IMPLICIT UnknownInfo }
-     * </pre>
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        return new DERTaggedObject(false, tagNo, value);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/ocsp/CrlID.java b/bcprov/src/main/java/org/bouncycastle/asn1/ocsp/CrlID.java
deleted file mode 100644
index f5a3581..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/ocsp/CrlID.java
+++ /dev/null
@@ -1,110 +0,0 @@
-package org.bouncycastle.asn1.ocsp;
-
-import java.util.Enumeration;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1GeneralizedTime;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.ASN1TaggedObject;
-import org.bouncycastle.asn1.DERIA5String;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.DERTaggedObject;
-
-public class CrlID
-    extends ASN1Object
-{
-    private DERIA5String         crlUrl;
-    private ASN1Integer          crlNum;
-    private ASN1GeneralizedTime  crlTime;
-
-    private CrlID(
-        ASN1Sequence    seq)
-    {
-        Enumeration    e = seq.getObjects();
-
-        while (e.hasMoreElements())
-        {
-            ASN1TaggedObject    o = (ASN1TaggedObject)e.nextElement();
-
-            switch (o.getTagNo())
-            {
-            case 0:
-                crlUrl = DERIA5String.getInstance(o, true);
-                break;
-            case 1:
-                crlNum = ASN1Integer.getInstance(o, true);
-                break;
-            case 2:
-                crlTime = ASN1GeneralizedTime.getInstance(o, true);
-                break;
-            default:
-                throw new IllegalArgumentException(
-                        "unknown tag number: " + o.getTagNo());
-            }
-        }
-    }
-
-    public static CrlID getInstance(
-        Object  obj)
-    {
-        if (obj instanceof CrlID)
-        {
-            return (CrlID)obj;
-        }
-        else if (obj != null)
-        {
-            return new CrlID(ASN1Sequence.getInstance(obj));
-        }
-
-        return null;
-    }
-
-    public DERIA5String getCrlUrl()
-    {
-        return crlUrl;
-    }
-
-    public ASN1Integer getCrlNum()
-    {
-        return crlNum;
-    }
-
-    public ASN1GeneralizedTime getCrlTime()
-    {
-        return crlTime;
-    }
-
-    /**
-     * Produce an object suitable for an ASN1OutputStream.
-     * <pre>
-     * CrlID ::= SEQUENCE {
-     *     crlUrl               [0]     EXPLICIT IA5String OPTIONAL,
-     *     crlNum               [1]     EXPLICIT INTEGER OPTIONAL,
-     *     crlTime              [2]     EXPLICIT GeneralizedTime OPTIONAL }
-     * </pre>
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector    v = new ASN1EncodableVector();
-
-        if (crlUrl != null)
-        {
-            v.add(new DERTaggedObject(true, 0, crlUrl));
-        }
-
-        if (crlNum != null)
-        {
-            v.add(new DERTaggedObject(true, 1, crlNum));
-        }
-
-        if (crlTime != null)
-        {
-            v.add(new DERTaggedObject(true, 2, crlTime));
-        }
-
-        return new DERSequence(v);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/ocsp/OCSPObjectIdentifiers.java b/bcprov/src/main/java/org/bouncycastle/asn1/ocsp/OCSPObjectIdentifiers.java
deleted file mode 100644
index 577e413..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/ocsp/OCSPObjectIdentifiers.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package org.bouncycastle.asn1.ocsp;
-
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-
-/**
- * OIDs for <a href="http://tools.ietf.org/html/rfc2560">RFC 2560</a> and <a href="http://tools.ietf.org/html/rfc6960">RFC 6960</a>
- * Online Certificate Status Protocol - OCSP.
- */
-public interface OCSPObjectIdentifiers
-{
-    /** OID: 1.3.6.1.5.5.7.48.1 */
-    static final ASN1ObjectIdentifier id_pkix_ocsp       = new ASN1ObjectIdentifier("1.3.6.1.5.5.7.48.1");
-    /** OID: 1.3.6.1.5.5.7.48.1.1 */
-    static final ASN1ObjectIdentifier id_pkix_ocsp_basic = new ASN1ObjectIdentifier("1.3.6.1.5.5.7.48.1.1");
-    
-    /** OID: 1.3.6.1.5.5.7.48.1.2 */
-    static final ASN1ObjectIdentifier id_pkix_ocsp_nonce = new ASN1ObjectIdentifier("1.3.6.1.5.5.7.48.1.2");
-    /** OID: 1.3.6.1.5.5.7.48.1.3 */
-    static final ASN1ObjectIdentifier id_pkix_ocsp_crl   = new ASN1ObjectIdentifier("1.3.6.1.5.5.7.48.1.3");
-    
-    /** OID: 1.3.6.1.5.5.7.48.1.4 */
-    static final ASN1ObjectIdentifier id_pkix_ocsp_response        = new ASN1ObjectIdentifier("1.3.6.1.5.5.7.48.1.4");
-    /** OID: 1.3.6.1.5.5.7.48.1.5 */
-    static final ASN1ObjectIdentifier id_pkix_ocsp_nocheck         = new ASN1ObjectIdentifier("1.3.6.1.5.5.7.48.1.5");
-    /** OID: 1.3.6.1.5.5.7.48.1.6 */
-    static final ASN1ObjectIdentifier id_pkix_ocsp_archive_cutoff  = new ASN1ObjectIdentifier("1.3.6.1.5.5.7.48.1.6");
-    /** OID: 1.3.6.1.5.5.7.48.1.7 */
-    static final ASN1ObjectIdentifier id_pkix_ocsp_service_locator = new ASN1ObjectIdentifier("1.3.6.1.5.5.7.48.1.7");
-
-
-    static final ASN1ObjectIdentifier id_pkix_ocsp_pref_sig_algs = id_pkix_ocsp.branch("8");
-
-    static final ASN1ObjectIdentifier id_pkix_ocsp_extended_revoke = id_pkix_ocsp.branch("9");
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/ocsp/OCSPRequest.java b/bcprov/src/main/java/org/bouncycastle/asn1/ocsp/OCSPRequest.java
deleted file mode 100644
index 559cf4c..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/ocsp/OCSPRequest.java
+++ /dev/null
@@ -1,90 +0,0 @@
-package org.bouncycastle.asn1.ocsp;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.ASN1TaggedObject;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.DERTaggedObject;
-
-public class OCSPRequest
-    extends ASN1Object
-{
-    TBSRequest      tbsRequest;
-    Signature       optionalSignature;
-
-    public OCSPRequest(
-        TBSRequest  tbsRequest,
-        Signature   optionalSignature)
-    {
-        this.tbsRequest = tbsRequest;
-        this.optionalSignature = optionalSignature;
-    }
-
-    private OCSPRequest(
-        ASN1Sequence    seq)
-    {
-        tbsRequest = TBSRequest.getInstance(seq.getObjectAt(0));
-
-        if (seq.size() == 2)
-        {
-            optionalSignature = Signature.getInstance(
-                                (ASN1TaggedObject)seq.getObjectAt(1), true);
-        }
-    }
-    
-    public static OCSPRequest getInstance(
-        ASN1TaggedObject obj,
-        boolean          explicit)
-    {
-        return getInstance(ASN1Sequence.getInstance(obj, explicit));
-    }
-
-    public static OCSPRequest getInstance(
-        Object  obj)
-    {
-        if (obj instanceof OCSPRequest)
-        {
-            return (OCSPRequest)obj;
-        }
-        else if (obj != null)
-        {
-            return new OCSPRequest(ASN1Sequence.getInstance(obj));
-        }
-
-        return null;
-    }
-    
-    public TBSRequest getTbsRequest()
-    {
-        return tbsRequest;
-    }
-
-    public Signature getOptionalSignature()
-    {
-        return optionalSignature;
-    }
-
-    /**
-     * Produce an object suitable for an ASN1OutputStream.
-     * <pre>
-     * OCSPRequest     ::=     SEQUENCE {
-     *     tbsRequest                  TBSRequest,
-     *     optionalSignature   [0]     EXPLICIT Signature OPTIONAL }
-     * </pre>
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector    v = new ASN1EncodableVector();
-
-        v.add(tbsRequest);
-
-        if (optionalSignature != null)
-        {
-            v.add(new DERTaggedObject(true, 0, optionalSignature));
-        }
-
-        return new DERSequence(v);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/ocsp/OCSPResponse.java b/bcprov/src/main/java/org/bouncycastle/asn1/ocsp/OCSPResponse.java
deleted file mode 100644
index 31602da..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/ocsp/OCSPResponse.java
+++ /dev/null
@@ -1,90 +0,0 @@
-package org.bouncycastle.asn1.ocsp;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.ASN1TaggedObject;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.DERTaggedObject;
-
-public class OCSPResponse
-    extends ASN1Object
-{
-    OCSPResponseStatus    responseStatus;
-    ResponseBytes        responseBytes;
-
-    public OCSPResponse(
-        OCSPResponseStatus  responseStatus,
-        ResponseBytes       responseBytes)
-    {
-        this.responseStatus = responseStatus;
-        this.responseBytes = responseBytes;
-    }
-
-    private OCSPResponse(
-        ASN1Sequence    seq)
-    {
-        responseStatus = OCSPResponseStatus.getInstance(seq.getObjectAt(0));
-
-        if (seq.size() == 2)
-        {
-            responseBytes = ResponseBytes.getInstance(
-                                (ASN1TaggedObject)seq.getObjectAt(1), true);
-        }
-    }
-
-    public static OCSPResponse getInstance(
-        ASN1TaggedObject obj,
-        boolean          explicit)
-    {
-        return getInstance(ASN1Sequence.getInstance(obj, explicit));
-    }
-
-    public static OCSPResponse getInstance(
-        Object  obj)
-    {
-        if (obj instanceof OCSPResponse)
-        {
-            return (OCSPResponse)obj;
-        }
-        else if (obj != null)
-        {
-            return new OCSPResponse(ASN1Sequence.getInstance(obj));
-        }
-
-        return null;
-    }
-
-    public OCSPResponseStatus getResponseStatus()
-    {
-        return responseStatus;
-    }
-
-    public ResponseBytes getResponseBytes()
-    {
-        return responseBytes;
-    }
-
-    /**
-     * Produce an object suitable for an ASN1OutputStream.
-     * <pre>
-     * OCSPResponse ::= SEQUENCE {
-     *     responseStatus         OCSPResponseStatus,
-     *     responseBytes          [0] EXPLICIT ResponseBytes OPTIONAL }
-     * </pre>
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector    v = new ASN1EncodableVector();
-
-        v.add(responseStatus);
-
-        if (responseBytes != null)
-        {
-            v.add(new DERTaggedObject(true, 0, responseBytes));
-        }
-
-        return new DERSequence(v);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/ocsp/OCSPResponseStatus.java b/bcprov/src/main/java/org/bouncycastle/asn1/ocsp/OCSPResponseStatus.java
deleted file mode 100644
index aa225f9..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/ocsp/OCSPResponseStatus.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package org.bouncycastle.asn1.ocsp;
-
-import java.math.BigInteger;
-
-import org.bouncycastle.asn1.ASN1Enumerated;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1Primitive;
-
-public class OCSPResponseStatus
-    extends ASN1Object
-{
-    public static final int SUCCESSFUL = 0;
-    public static final int MALFORMED_REQUEST = 1;
-    public static final int INTERNAL_ERROR = 2;
-    public static final int TRY_LATER = 3;
-    public static final int SIG_REQUIRED = 5;
-    public static final int UNAUTHORIZED = 6;
-
-    private ASN1Enumerated value;
-
-    /**
-     * The OCSPResponseStatus enumeration.
-     * <pre>
-     * OCSPResponseStatus ::= ENUMERATED {
-     *     successful            (0),  --Response has valid confirmations
-     *     malformedRequest      (1),  --Illegal confirmation request
-     *     internalError         (2),  --Internal error in issuer
-     *     tryLater              (3),  --Try again later
-     *                                 --(4) is not used
-     *     sigRequired           (5),  --Must sign the request
-     *     unauthorized          (6)   --Request unauthorized
-     * }
-     * </pre>
-     */
-    public OCSPResponseStatus(
-        int value)
-    {
-        this(new ASN1Enumerated(value));
-    }
-
-    private OCSPResponseStatus(
-        ASN1Enumerated value)
-    {
-        this.value = value;
-    }
-
-    public static OCSPResponseStatus getInstance(
-        Object  obj)
-    {
-        if (obj instanceof OCSPResponseStatus)
-        {
-            return (OCSPResponseStatus)obj;
-        }
-        else if (obj != null)
-        {
-            return new OCSPResponseStatus(ASN1Enumerated.getInstance(obj));
-        }
-
-        return null;
-    }
-
-    public BigInteger getValue()
-    {
-        return value.getValue();
-    }
-
-    public ASN1Primitive toASN1Primitive()
-    {
-        return value;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/ocsp/Request.java b/bcprov/src/main/java/org/bouncycastle/asn1/ocsp/Request.java
deleted file mode 100644
index 236bc72..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/ocsp/Request.java
+++ /dev/null
@@ -1,91 +0,0 @@
-package org.bouncycastle.asn1.ocsp;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.ASN1TaggedObject;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.DERTaggedObject;
-import org.bouncycastle.asn1.x509.Extensions;
-
-public class Request
-    extends ASN1Object
-{
-    CertID            reqCert;
-    Extensions    singleRequestExtensions;
-
-    public Request(
-        CertID          reqCert,
-        Extensions singleRequestExtensions)
-    {
-        this.reqCert = reqCert;
-        this.singleRequestExtensions = singleRequestExtensions;
-    }
-
-    private Request(
-        ASN1Sequence    seq)
-    {
-        reqCert = CertID.getInstance(seq.getObjectAt(0));
-
-        if (seq.size() == 2)
-        {
-            singleRequestExtensions = Extensions.getInstance(
-                                (ASN1TaggedObject)seq.getObjectAt(1), true);
-        }
-    }
-
-    public static Request getInstance(
-        ASN1TaggedObject obj,
-        boolean          explicit)
-    {
-        return getInstance(ASN1Sequence.getInstance(obj, explicit));
-    }
-
-    public static Request getInstance(
-        Object  obj)
-    {
-        if (obj instanceof Request)
-        {
-            return (Request)obj;
-        }
-        else if (obj != null)
-        {
-            return new Request(ASN1Sequence.getInstance(obj));
-        }
-
-        return null;
-    }
-
-    public CertID getReqCert()
-    {
-        return reqCert;
-    }
-
-    public Extensions getSingleRequestExtensions()
-    {
-        return singleRequestExtensions;
-    }
-
-    /**
-     * Produce an object suitable for an ASN1OutputStream.
-     * <pre>
-     * Request         ::=     SEQUENCE {
-     *     reqCert                     CertID,
-     *     singleRequestExtensions     [0] EXPLICIT Extensions OPTIONAL }
-     * </pre>
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector    v = new ASN1EncodableVector();
-
-        v.add(reqCert);
-
-        if (singleRequestExtensions != null)
-        {
-            v.add(new DERTaggedObject(true, 0, singleRequestExtensions));
-        }
-
-        return new DERSequence(v);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/ocsp/ResponderID.java b/bcprov/src/main/java/org/bouncycastle/asn1/ocsp/ResponderID.java
deleted file mode 100644
index 9719047..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/ocsp/ResponderID.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package org.bouncycastle.asn1.ocsp;
-
-import org.bouncycastle.asn1.ASN1Choice;
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1TaggedObject;
-import org.bouncycastle.asn1.DEROctetString;
-import org.bouncycastle.asn1.DERTaggedObject;
-import org.bouncycastle.asn1.x500.X500Name;
-
-public class ResponderID
-    extends ASN1Object
-    implements ASN1Choice
-{
-    private ASN1Encodable    value;
-
-    public ResponderID(
-        ASN1OctetString    value)
-    {
-        this.value = value;
-    }
-
-    public ResponderID(
-        X500Name value)
-    {
-        this.value = value;
-    }
-
-    public static ResponderID getInstance(
-        Object  obj)
-    {
-        if (obj instanceof ResponderID)
-        {
-            return (ResponderID)obj;
-        }
-        else if (obj instanceof DEROctetString)
-        {
-            return new ResponderID((DEROctetString)obj);
-        }
-        else if (obj instanceof ASN1TaggedObject)
-        {
-            ASN1TaggedObject    o = (ASN1TaggedObject)obj;
-
-            if (o.getTagNo() == 1)
-            {
-                return new ResponderID(X500Name.getInstance(o, true));
-            }
-            else
-            {
-                return new ResponderID(ASN1OctetString.getInstance(o, true));
-            }
-        }
-
-        return new ResponderID(X500Name.getInstance(obj));
-    }
-
-    public static ResponderID getInstance(
-        ASN1TaggedObject obj,
-        boolean          explicit)
-    {
-        return getInstance(obj.getObject()); // must be explicitly tagged
-    }
-
-    public byte[] getKeyHash()
-    {
-        if (this.value instanceof ASN1OctetString)
-        {
-            ASN1OctetString octetString = (ASN1OctetString)this.value;
-            return octetString.getOctets();
-        }
-
-        return null;
-    }
-
-    public X500Name getName()
-    {
-        if (this.value instanceof ASN1OctetString)
-        {
-            return null;
-        }
-
-        return X500Name.getInstance(value);
-    }
-
-    /**
-     * Produce an object suitable for an ASN1OutputStream.
-     * <pre>
-     * ResponderID ::= CHOICE {
-     *      byName          [1] Name,
-     *      byKey           [2] KeyHash }
-     * </pre>
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        if (value instanceof ASN1OctetString)
-        {
-            return new DERTaggedObject(true, 2, value);
-        }
-
-        return new DERTaggedObject(true, 1, value);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/ocsp/ResponseBytes.java b/bcprov/src/main/java/org/bouncycastle/asn1/ocsp/ResponseBytes.java
deleted file mode 100644
index 074294c..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/ocsp/ResponseBytes.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package org.bouncycastle.asn1.ocsp;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.ASN1TaggedObject;
-import org.bouncycastle.asn1.DERSequence;
-
-public class ResponseBytes
-    extends ASN1Object
-{
-    ASN1ObjectIdentifier    responseType;
-    ASN1OctetString        response;
-
-    public ResponseBytes(
-        ASN1ObjectIdentifier responseType,
-        ASN1OctetString     response)
-    {
-        this.responseType = responseType;
-        this.response = response;
-    }
-
-    public ResponseBytes(
-        ASN1Sequence    seq)
-    {
-        responseType = (ASN1ObjectIdentifier)seq.getObjectAt(0);
-        response = (ASN1OctetString)seq.getObjectAt(1);
-    }
-
-    public static ResponseBytes getInstance(
-        ASN1TaggedObject obj,
-        boolean          explicit)
-    {
-        return getInstance(ASN1Sequence.getInstance(obj, explicit));
-    }
-
-    public static ResponseBytes getInstance(
-        Object  obj)
-    {
-        if (obj == null || obj instanceof ResponseBytes)
-        {
-            return (ResponseBytes)obj;
-        }
-        else if (obj instanceof ASN1Sequence)
-        {
-            return new ResponseBytes((ASN1Sequence)obj);
-        }
-
-        throw new IllegalArgumentException("unknown object in factory: " + obj.getClass().getName());
-    }
-
-    public ASN1ObjectIdentifier getResponseType()
-    {
-        return responseType;
-    }
-
-    public ASN1OctetString getResponse()
-    {
-        return response;
-    }
-
-    /**
-     * Produce an object suitable for an ASN1OutputStream.
-     * <pre>
-     * ResponseBytes ::=       SEQUENCE {
-     *     responseType   OBJECT IDENTIFIER,
-     *     response       OCTET STRING }
-     * </pre>
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector    v = new ASN1EncodableVector();
-
-        v.add(responseType);
-        v.add(response);
-
-        return new DERSequence(v);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/ocsp/ResponseData.java b/bcprov/src/main/java/org/bouncycastle/asn1/ocsp/ResponseData.java
deleted file mode 100644
index 6874b22..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/ocsp/ResponseData.java
+++ /dev/null
@@ -1,181 +0,0 @@
-package org.bouncycastle.asn1.ocsp;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1GeneralizedTime;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.ASN1TaggedObject;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.DERTaggedObject;
-import org.bouncycastle.asn1.x509.Extensions;
-import org.bouncycastle.asn1.x509.X509Extensions;
-
-public class ResponseData
-    extends ASN1Object
-{
-    private static final ASN1Integer V1 = new ASN1Integer(0);
-    
-    private boolean             versionPresent;
-    
-    private ASN1Integer          version;
-    private ResponderID         responderID;
-    private ASN1GeneralizedTime  producedAt;
-    private ASN1Sequence        responses;
-    private Extensions      responseExtensions;
-
-    public ResponseData(
-        ASN1Integer          version,
-        ResponderID         responderID,
-        ASN1GeneralizedTime  producedAt,
-        ASN1Sequence        responses,
-        Extensions      responseExtensions)
-    {
-        this.version = version;
-        this.responderID = responderID;
-        this.producedAt = producedAt;
-        this.responses = responses;
-        this.responseExtensions = responseExtensions;
-    }
-
-    /**
-     * @deprecated use method taking Extensions
-     * @param responderID
-     * @param producedAt
-     * @param responses
-     * @param responseExtensions
-     */
-    public ResponseData(
-        ResponderID         responderID,
-        ASN1GeneralizedTime  producedAt,
-        ASN1Sequence        responses,
-        X509Extensions responseExtensions)
-    {
-        this(V1, responderID, ASN1GeneralizedTime.getInstance(producedAt), responses, Extensions.getInstance(responseExtensions));
-    }
-
-    public ResponseData(
-        ResponderID         responderID,
-        ASN1GeneralizedTime  producedAt,
-        ASN1Sequence        responses,
-        Extensions      responseExtensions)
-    {
-        this(V1, responderID, producedAt, responses, responseExtensions);
-    }
-    
-    private ResponseData(
-        ASN1Sequence    seq)
-    {
-        int index = 0;
-
-        if (seq.getObjectAt(0) instanceof ASN1TaggedObject)
-        {
-            ASN1TaggedObject    o = (ASN1TaggedObject)seq.getObjectAt(0);
-
-            if (o.getTagNo() == 0)
-            {
-                this.versionPresent = true;
-                this.version = ASN1Integer.getInstance(
-                                (ASN1TaggedObject)seq.getObjectAt(0), true);
-                index++;
-            }
-            else
-            {
-                this.version = V1;
-            }
-        }
-        else
-        {
-            this.version = V1;
-        }
-
-        this.responderID = ResponderID.getInstance(seq.getObjectAt(index++));
-        this.producedAt = ASN1GeneralizedTime.getInstance(seq.getObjectAt(index++));
-        this.responses = (ASN1Sequence)seq.getObjectAt(index++);
-
-        if (seq.size() > index)
-        {
-            this.responseExtensions = Extensions.getInstance(
-                                (ASN1TaggedObject)seq.getObjectAt(index), true);
-        }
-    }
-
-    public static ResponseData getInstance(
-        ASN1TaggedObject obj,
-        boolean          explicit)
-    {
-        return getInstance(ASN1Sequence.getInstance(obj, explicit));
-    }
-
-    public static ResponseData getInstance(
-        Object  obj)
-    {
-        if (obj instanceof ResponseData)
-        {
-            return (ResponseData)obj;
-        }
-        else if (obj != null)
-        {
-            return new ResponseData(ASN1Sequence.getInstance(obj));
-        }
-
-        return null;
-    }
-
-    public ASN1Integer getVersion()
-    {
-        return version;
-    }
-
-    public ResponderID getResponderID()
-    {
-        return responderID;
-    }
-
-    public ASN1GeneralizedTime getProducedAt()
-    {
-        return producedAt;
-    }
-
-    public ASN1Sequence getResponses()
-    {
-        return responses;
-    }
-
-    public Extensions getResponseExtensions()
-    {
-        return responseExtensions;
-    }
-
-    /**
-     * Produce an object suitable for an ASN1OutputStream.
-     * <pre>
-     * ResponseData ::= SEQUENCE {
-     *     version              [0] EXPLICIT Version DEFAULT v1,
-     *     responderID              ResponderID,
-     *     producedAt               GeneralizedTime,
-     *     responses                SEQUENCE OF SingleResponse,
-     *     responseExtensions   [1] EXPLICIT Extensions OPTIONAL }
-     * </pre>
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector v = new ASN1EncodableVector();
-
-        if (versionPresent || !version.equals(V1))
-        {
-            v.add(new DERTaggedObject(true, 0, version));
-        }
-
-        v.add(responderID);
-        v.add(producedAt);
-        v.add(responses);
-        if (responseExtensions != null)
-        {
-            v.add(new DERTaggedObject(true, 1, responseExtensions));
-        }
-
-        return new DERSequence(v);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/ocsp/RevokedInfo.java b/bcprov/src/main/java/org/bouncycastle/asn1/ocsp/RevokedInfo.java
deleted file mode 100644
index 6770050..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/ocsp/RevokedInfo.java
+++ /dev/null
@@ -1,92 +0,0 @@
-package org.bouncycastle.asn1.ocsp;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Enumerated;
-import org.bouncycastle.asn1.ASN1GeneralizedTime;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.ASN1TaggedObject;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.DERTaggedObject;
-import org.bouncycastle.asn1.x509.CRLReason;
-
-public class RevokedInfo
-    extends ASN1Object
-{
-    private ASN1GeneralizedTime  revocationTime;
-    private CRLReason           revocationReason;
-
-    public RevokedInfo(
-        ASN1GeneralizedTime  revocationTime,
-        CRLReason           revocationReason)
-    {
-        this.revocationTime = revocationTime;
-        this.revocationReason = revocationReason;
-    }
-
-    private RevokedInfo(
-        ASN1Sequence    seq)
-    {
-        this.revocationTime = ASN1GeneralizedTime.getInstance(seq.getObjectAt(0));
-
-        if (seq.size() > 1)
-        {
-            this.revocationReason = CRLReason.getInstance(ASN1Enumerated.getInstance(
-                (ASN1TaggedObject)seq.getObjectAt(1), true));
-        }
-    }
-
-    public static RevokedInfo getInstance(
-        ASN1TaggedObject obj,
-        boolean          explicit)
-    {
-        return getInstance(ASN1Sequence.getInstance(obj, explicit));
-    }
-
-    public static RevokedInfo getInstance(
-        Object  obj)
-    {
-        if (obj instanceof RevokedInfo)
-        {
-            return (RevokedInfo)obj;
-        }
-        else if (obj != null)
-        {
-            return new RevokedInfo(ASN1Sequence.getInstance(obj));
-        }
-
-        return null;
-    }
-
-    public ASN1GeneralizedTime getRevocationTime()
-    {
-        return revocationTime;
-    }
-
-    public CRLReason getRevocationReason()
-    {
-        return revocationReason;
-    }
-
-    /**
-     * Produce an object suitable for an ASN1OutputStream.
-     * <pre>
-     * RevokedInfo ::= SEQUENCE {
-     *      revocationTime              GeneralizedTime,
-     *      revocationReason    [0]     EXPLICIT CRLReason OPTIONAL }
-     * </pre>
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector v = new ASN1EncodableVector();
-
-        v.add(revocationTime);
-        if (revocationReason != null)
-        {
-            v.add(new DERTaggedObject(true, 0, revocationReason));
-        }
-
-        return new DERSequence(v);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/ocsp/ServiceLocator.java b/bcprov/src/main/java/org/bouncycastle/asn1/ocsp/ServiceLocator.java
deleted file mode 100644
index dc9486f..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/ocsp/ServiceLocator.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package org.bouncycastle.asn1.ocsp;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.x500.X500Name;
-
-public class ServiceLocator
-    extends ASN1Object
-{
-    X500Name    issuer;
-    ASN1Primitive locator;
-
-    /**
-     * Produce an object suitable for an ASN1OutputStream.
-     * <pre>
-     * ServiceLocator ::= SEQUENCE {
-     *     issuer    Name,
-     *     locator   AuthorityInfoAccessSyntax OPTIONAL }
-     * </pre>
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector    v = new ASN1EncodableVector();
-
-        v.add(issuer);
-
-        if (locator != null)
-        {
-            v.add(locator);
-        }
-
-        return new DERSequence(v);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/ocsp/Signature.java b/bcprov/src/main/java/org/bouncycastle/asn1/ocsp/Signature.java
deleted file mode 100644
index 80bd740..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/ocsp/Signature.java
+++ /dev/null
@@ -1,111 +0,0 @@
-package org.bouncycastle.asn1.ocsp;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.ASN1TaggedObject;
-import org.bouncycastle.asn1.DERBitString;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.DERTaggedObject;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-
-public class Signature
-    extends ASN1Object
-{
-    AlgorithmIdentifier signatureAlgorithm;
-    DERBitString        signature;
-    ASN1Sequence        certs;
-
-    public Signature(
-        AlgorithmIdentifier signatureAlgorithm,
-        DERBitString        signature)
-    {
-        this.signatureAlgorithm = signatureAlgorithm;
-        this.signature = signature;
-    }
-
-    public Signature(
-        AlgorithmIdentifier signatureAlgorithm,
-        DERBitString        signature,
-        ASN1Sequence        certs)
-    {
-        this.signatureAlgorithm = signatureAlgorithm;
-        this.signature = signature;
-        this.certs = certs;
-    }
-
-    private Signature(
-        ASN1Sequence    seq)
-    {
-        signatureAlgorithm  = AlgorithmIdentifier.getInstance(seq.getObjectAt(0));
-        signature = (DERBitString)seq.getObjectAt(1);
-
-        if (seq.size() == 3)
-        {
-            certs = ASN1Sequence.getInstance(
-                                (ASN1TaggedObject)seq.getObjectAt(2), true);
-        }
-    }
-
-    public static Signature getInstance(
-        ASN1TaggedObject obj,
-        boolean          explicit)
-    {
-        return getInstance(ASN1Sequence.getInstance(obj, explicit));
-    }
-
-    public static Signature getInstance(
-        Object  obj)
-    {
-        if (obj instanceof Signature)
-        {
-            return (Signature)obj;
-        }
-        else if (obj != null)
-        {
-            return new Signature(ASN1Sequence.getInstance(obj));
-        }
-
-        return null;
-    }
-
-    public AlgorithmIdentifier getSignatureAlgorithm()
-    {
-        return signatureAlgorithm;
-    }
-
-    public DERBitString getSignature()
-    {
-        return signature;
-    }
-
-    public ASN1Sequence getCerts()
-    {
-        return certs;
-    }
-
-    /**
-     * Produce an object suitable for an ASN1OutputStream.
-     * <pre>
-     * Signature       ::=     SEQUENCE {
-     *     signatureAlgorithm      AlgorithmIdentifier,
-     *     signature               BIT STRING,
-     *     certs               [0] EXPLICIT SEQUENCE OF Certificate OPTIONAL}
-     * </pre>
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector    v = new ASN1EncodableVector();
-
-        v.add(signatureAlgorithm);
-        v.add(signature);
-
-        if (certs != null)
-        {
-            v.add(new DERTaggedObject(true, 0, certs));
-        }
-
-        return new DERSequence(v);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/ocsp/SingleResponse.java b/bcprov/src/main/java/org/bouncycastle/asn1/ocsp/SingleResponse.java
deleted file mode 100644
index 0dc2a91..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/ocsp/SingleResponse.java
+++ /dev/null
@@ -1,162 +0,0 @@
-package org.bouncycastle.asn1.ocsp;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1GeneralizedTime;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.ASN1TaggedObject;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.DERTaggedObject;
-import org.bouncycastle.asn1.x509.Extensions;
-import org.bouncycastle.asn1.x509.X509Extensions;
-
-public class SingleResponse
-    extends ASN1Object
-{
-    private CertID              certID;
-    private CertStatus          certStatus;
-    private ASN1GeneralizedTime  thisUpdate;
-    private ASN1GeneralizedTime  nextUpdate;
-    private Extensions      singleExtensions;
-
-    /**
-     * @deprecated use method taking ASN1GeneralizedTime and Extensions
-     * @param certID
-     * @param certStatus
-     * @param thisUpdate
-     * @param nextUpdate
-     * @param singleExtensions
-     */
-    public SingleResponse(
-        CertID              certID,
-        CertStatus          certStatus,
-        ASN1GeneralizedTime thisUpdate,
-        ASN1GeneralizedTime nextUpdate,
-        X509Extensions singleExtensions)
-    {
-        this(certID, certStatus, thisUpdate, nextUpdate, Extensions.getInstance(singleExtensions));
-    }
-
-    public SingleResponse(
-        CertID              certID,
-        CertStatus          certStatus,
-        ASN1GeneralizedTime thisUpdate,
-        ASN1GeneralizedTime nextUpdate,
-        Extensions          singleExtensions)
-    {
-        this.certID = certID;
-        this.certStatus = certStatus;
-        this.thisUpdate = thisUpdate;
-        this.nextUpdate = nextUpdate;
-        this.singleExtensions = singleExtensions;
-    }
-
-    private SingleResponse(
-        ASN1Sequence    seq)
-    {
-        this.certID = CertID.getInstance(seq.getObjectAt(0));
-        this.certStatus = CertStatus.getInstance(seq.getObjectAt(1));
-        this.thisUpdate = ASN1GeneralizedTime.getInstance(seq.getObjectAt(2));
-
-        if (seq.size() > 4)
-        {
-            this.nextUpdate = ASN1GeneralizedTime.getInstance(
-                                (ASN1TaggedObject)seq.getObjectAt(3), true);
-            this.singleExtensions = Extensions.getInstance(
-                                (ASN1TaggedObject)seq.getObjectAt(4), true);
-        }
-        else if (seq.size() > 3)
-        {
-            ASN1TaggedObject    o = (ASN1TaggedObject)seq.getObjectAt(3);
-
-            if (o.getTagNo() == 0)
-            {
-                this.nextUpdate = ASN1GeneralizedTime.getInstance(o, true);
-            }
-            else
-            {
-                this.singleExtensions = Extensions.getInstance(o, true);
-            }
-        }
-    }
-
-    public static SingleResponse getInstance(
-        ASN1TaggedObject obj,
-        boolean          explicit)
-    {
-        return getInstance(ASN1Sequence.getInstance(obj, explicit));
-    }
-
-    public static SingleResponse getInstance(
-        Object  obj)
-    {
-        if (obj instanceof SingleResponse)
-        {
-            return (SingleResponse)obj;
-        }
-        else if (obj != null)
-        {
-            return new SingleResponse(ASN1Sequence.getInstance(obj));
-        }
-
-        return null;
-    }
-
-    public CertID getCertID()
-    {
-        return certID;
-    }
-
-    public CertStatus getCertStatus()
-    {
-        return certStatus;
-    }
-
-    public ASN1GeneralizedTime getThisUpdate()
-    {
-        return thisUpdate;
-    }
-
-    public ASN1GeneralizedTime getNextUpdate()
-    {
-        return nextUpdate;
-    }
-
-    public Extensions getSingleExtensions()
-    {
-        return singleExtensions;
-    }
-
-    /**
-     * Produce an object suitable for an ASN1OutputStream.
-     * <pre>
-     *  SingleResponse ::= SEQUENCE {
-     *          certID                       CertID,
-     *          certStatus                   CertStatus,
-     *          thisUpdate                   GeneralizedTime,
-     *          nextUpdate         [0]       EXPLICIT GeneralizedTime OPTIONAL,
-     *          singleExtensions   [1]       EXPLICIT Extensions OPTIONAL }
-     * </pre>
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector v = new ASN1EncodableVector();
-
-        v.add(certID);
-        v.add(certStatus);
-        v.add(thisUpdate);
-
-        if (nextUpdate != null)
-        {
-            v.add(new DERTaggedObject(true, 0, nextUpdate));
-        }
-
-        if (singleExtensions != null)
-        {
-            v.add(new DERTaggedObject(true, 1, singleExtensions));
-        }
-
-        return new DERSequence(v);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/ocsp/TBSRequest.java b/bcprov/src/main/java/org/bouncycastle/asn1/ocsp/TBSRequest.java
deleted file mode 100644
index 2a05705..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/ocsp/TBSRequest.java
+++ /dev/null
@@ -1,172 +0,0 @@
-package org.bouncycastle.asn1.ocsp;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.ASN1TaggedObject;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.DERTaggedObject;
-import org.bouncycastle.asn1.x509.Extensions;
-import org.bouncycastle.asn1.x509.GeneralName;
-import org.bouncycastle.asn1.x509.X509Extensions;
-
-public class TBSRequest
-    extends ASN1Object
-{
-    private static final ASN1Integer V1 = new ASN1Integer(0);
-    
-    ASN1Integer      version;
-    GeneralName     requestorName;
-    ASN1Sequence    requestList;
-    Extensions  requestExtensions;
-
-    boolean         versionSet;
-
-    /**
-     * @deprecated use method taking Extensions
-     * @param requestorName
-     * @param requestList
-     * @param requestExtensions
-     */
-    public TBSRequest(
-        GeneralName     requestorName,
-        ASN1Sequence    requestList,
-        X509Extensions requestExtensions)
-    {
-        this.version = V1;
-        this.requestorName = requestorName;
-        this.requestList = requestList;
-        this.requestExtensions = Extensions.getInstance(requestExtensions);
-    }
-
-    public TBSRequest(
-        GeneralName     requestorName,
-        ASN1Sequence    requestList,
-        Extensions  requestExtensions)
-    {
-        this.version = V1;
-        this.requestorName = requestorName;
-        this.requestList = requestList;
-        this.requestExtensions = requestExtensions;
-    }
-
-    private TBSRequest(
-        ASN1Sequence    seq)
-    {
-        int    index = 0;
-
-        if (seq.getObjectAt(0) instanceof ASN1TaggedObject)
-        {
-            ASN1TaggedObject    o = (ASN1TaggedObject)seq.getObjectAt(0);
-
-            if (o.getTagNo() == 0)
-            {
-                versionSet = true;
-                version = ASN1Integer.getInstance((ASN1TaggedObject)seq.getObjectAt(0), true);
-                index++;
-            }
-            else
-            {
-                version = V1;
-            }
-        }
-        else
-        {
-            version = V1;
-        }
-
-        if (seq.getObjectAt(index) instanceof ASN1TaggedObject)
-        {
-            requestorName = GeneralName.getInstance((ASN1TaggedObject)seq.getObjectAt(index++), true);
-        }
-        
-        requestList = (ASN1Sequence)seq.getObjectAt(index++);
-
-        if (seq.size() == (index + 1))
-        {
-            requestExtensions = Extensions.getInstance((ASN1TaggedObject)seq.getObjectAt(index), true);
-        }
-    }
-
-    public static TBSRequest getInstance(
-        ASN1TaggedObject obj,
-        boolean          explicit)
-    {
-        return getInstance(ASN1Sequence.getInstance(obj, explicit));
-    }
-
-    public static TBSRequest getInstance(
-        Object  obj)
-    {
-        if (obj instanceof TBSRequest)
-        {
-            return (TBSRequest)obj;
-        }
-        else if (obj != null)
-        {
-            return new TBSRequest(ASN1Sequence.getInstance(obj));
-        }
-
-        return null;
-    }
-
-    public ASN1Integer getVersion()
-    {
-        return version;
-    }
-
-    public GeneralName getRequestorName()
-    {
-        return requestorName;
-    }
-
-    public ASN1Sequence getRequestList()
-    {
-        return requestList;
-    }
-
-    public Extensions getRequestExtensions()
-    {
-        return requestExtensions;
-    }
-
-    /**
-     * Produce an object suitable for an ASN1OutputStream.
-     * <pre>
-     * TBSRequest      ::=     SEQUENCE {
-     *     version             [0]     EXPLICIT Version DEFAULT v1,
-     *     requestorName       [1]     EXPLICIT GeneralName OPTIONAL,
-     *     requestList                 SEQUENCE OF Request,
-     *     requestExtensions   [2]     EXPLICIT Extensions OPTIONAL }
-     * </pre>
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector    v = new ASN1EncodableVector();
-
-        //
-        // if default don't include - unless explicitly provided. Not strictly correct
-        // but required for some requests
-        //
-        if (!version.equals(V1) || versionSet)
-        {
-            v.add(new DERTaggedObject(true, 0, version));
-        }
-        
-        if (requestorName != null)
-        {
-            v.add(new DERTaggedObject(true, 1, requestorName));
-        }
-
-        v.add(requestList);
-
-        if (requestExtensions != null)
-        {
-            v.add(new DERTaggedObject(true, 2, requestExtensions));
-        }
-
-        return new DERSequence(v);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/ocsp/package.html b/bcprov/src/main/java/org/bouncycastle/asn1/ocsp/package.html
deleted file mode 100644
index 22c560d..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/ocsp/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body bgcolor="#ffffff">
-Support classes useful for encoding and supporting OCSP objects.
-</body>
-</html>
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/oiw/ElGamalParameter.java b/bcprov/src/main/java/org/bouncycastle/asn1/oiw/ElGamalParameter.java
deleted file mode 100644
index d654d03..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/oiw/ElGamalParameter.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package org.bouncycastle.asn1.oiw;
-
-import java.math.BigInteger;
-import java.util.Enumeration;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DERSequence;
-
-public class ElGamalParameter
-    extends ASN1Object
-{
-    ASN1Integer      p, g;
-
-    public ElGamalParameter(
-        BigInteger  p,
-        BigInteger  g)
-    {
-        this.p = new ASN1Integer(p);
-        this.g = new ASN1Integer(g);
-    }
-
-    private ElGamalParameter(
-        ASN1Sequence  seq)
-    {
-        Enumeration     e = seq.getObjects();
-
-        p = (ASN1Integer)e.nextElement();
-        g = (ASN1Integer)e.nextElement();
-    }
-
-    public static ElGamalParameter getInstance(Object o)
-    {
-        if (o instanceof ElGamalParameter)
-        {
-            return (ElGamalParameter)o;
-        }
-        else if (o != null)
-        {
-            return new ElGamalParameter(ASN1Sequence.getInstance(o));
-        }
-
-        return null;
-    }
-
-    public BigInteger getP()
-    {
-        return p.getPositiveValue();
-    }
-
-    public BigInteger getG()
-    {
-        return g.getPositiveValue();
-    }
-
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector  v = new ASN1EncodableVector();
-
-        v.add(p);
-        v.add(g);
-
-        return new DERSequence(v);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/oiw/package.html b/bcprov/src/main/java/org/bouncycastle/asn1/oiw/package.html
deleted file mode 100644
index 44eb2fe..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/oiw/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body bgcolor="#ffffff">
-Objects and OID for the support of ISO OIW.
-</body>
-</html>
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/package.html b/bcprov/src/main/java/org/bouncycastle/asn1/package.html
deleted file mode 100644
index 1ac16a5..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body bgcolor="#ffffff">
-A library for parsing and writing ASN.1 objects. Support is provided for DER and BER encoding.
-</body>
-</html>
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/pkcs/Attribute.java b/bcprov/src/main/java/org/bouncycastle/asn1/pkcs/Attribute.java
deleted file mode 100644
index 6374c98..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/pkcs/Attribute.java
+++ /dev/null
@@ -1,88 +0,0 @@
-package org.bouncycastle.asn1.pkcs;
-
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.ASN1Set;
-import org.bouncycastle.asn1.DERSequence;
-
-public class Attribute
-    extends ASN1Object
-{
-    private ASN1ObjectIdentifier attrType;
-    private ASN1Set              attrValues;
-
-    /**
-     * return an Attribute object from the given object.
-     *
-     * @param o the object we want converted.
-     * @exception IllegalArgumentException if the object cannot be converted.
-     */
-    public static Attribute getInstance(
-        Object o)
-    {
-        if (o == null || o instanceof Attribute)
-        {
-            return (Attribute)o;
-        }
-        
-        if (o instanceof ASN1Sequence)
-        {
-            return new Attribute((ASN1Sequence)o);
-        }
-
-        throw new IllegalArgumentException("unknown object in factory: " + o.getClass().getName());
-    }
-    
-    public Attribute(
-        ASN1Sequence seq)
-    {
-        attrType = (ASN1ObjectIdentifier)seq.getObjectAt(0);
-        attrValues = (ASN1Set)seq.getObjectAt(1);
-    }
-
-    public Attribute(
-        ASN1ObjectIdentifier attrType,
-        ASN1Set             attrValues)
-    {
-        this.attrType = attrType;
-        this.attrValues = attrValues;
-    }
-
-    public ASN1ObjectIdentifier getAttrType()
-    {
-        return attrType;
-    }
-    
-    public ASN1Set getAttrValues()
-    {
-        return attrValues;
-    }
-
-    public ASN1Encodable[] getAttributeValues()
-    {
-        return attrValues.toArray();
-    }
-
-    /** 
-     * Produce an object suitable for an ASN1OutputStream.
-     * <pre>
-     * Attribute ::= SEQUENCE {
-     *     attrType OBJECT IDENTIFIER,
-     *     attrValues SET OF AttributeValue
-     * }
-     * </pre>
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector v = new ASN1EncodableVector();
-
-        v.add(attrType);
-        v.add(attrValues);
-
-        return new DERSequence(v);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/pkcs/PKCSObjectIdentifiers.java b/bcprov/src/main/java/org/bouncycastle/asn1/pkcs/PKCSObjectIdentifiers.java
index 05fced0..82f1f94 100644
--- a/bcprov/src/main/java/org/bouncycastle/asn1/pkcs/PKCSObjectIdentifiers.java
+++ b/bcprov/src/main/java/org/bouncycastle/asn1/pkcs/PKCSObjectIdentifiers.java
@@ -13,10 +13,12 @@ public interface PKCSObjectIdentifiers
     static final ASN1ObjectIdentifier    pkcs_1                    = new ASN1ObjectIdentifier("1.2.840.113549.1.1");
     /** PKCS#1: 1.2.840.113549.1.1.1 */
     static final ASN1ObjectIdentifier    rsaEncryption             = pkcs_1.branch("1");
-    /** PKCS#1: 1.2.840.113549.1.1.2 */
-    static final ASN1ObjectIdentifier    md2WithRSAEncryption      = pkcs_1.branch("2");
-    /** PKCS#1: 1.2.840.113549.1.1.3 */
-    static final ASN1ObjectIdentifier    md4WithRSAEncryption      = pkcs_1.branch("3");
+    // BEGIN android-removed
+    // /** PKCS#1: 1.2.840.113549.1.1.2 */
+    // static final ASN1ObjectIdentifier    md2WithRSAEncryption      = pkcs_1.branch("2");
+    // /** PKCS#1: 1.2.840.113549.1.1.3 */
+    // static final ASN1ObjectIdentifier    md4WithRSAEncryption      = pkcs_1.branch("3");
+    // END android-removed
     /** PKCS#1: 1.2.840.113549.1.1.4 */
     static final ASN1ObjectIdentifier    md5WithRSAEncryption      = pkcs_1.branch("4");
     /** PKCS#1: 1.2.840.113549.1.1.5 */
@@ -96,15 +98,19 @@ public interface PKCSObjectIdentifiers
     // md2 OBJECT IDENTIFIER ::=
     //      {iso(1) member-body(2) US(840) rsadsi(113549) digestAlgorithm(2) 2}
     //
-    /**  1.2.840.113549.2.2 */
-    static final ASN1ObjectIdentifier    md2                    = digestAlgorithm.branch("2");
+    // BEGIN android-removed
+    // /**  1.2.840.113549.2.2 */
+    // static final ASN1ObjectIdentifier    md2                    = digestAlgorithm.branch("2");
+    // END android-removed
 
     //
     // md4 OBJECT IDENTIFIER ::=
     //      {iso(1) member-body(2) US(840) rsadsi(113549) digestAlgorithm(2) 4}
     //
-    /**  1.2.840.113549.2.4 */
-    static final ASN1ObjectIdentifier    md4                    = digestAlgorithm.branch("4");
+    // BEGIN android-removed
+    // /**  1.2.840.113549.2.4 */
+    // static final ASN1ObjectIdentifier    md4                    = digestAlgorithm.branch("4");
+    // END android-removed
 
     //
     // md5 OBJECT IDENTIFIER ::=
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/pkcs/RC2CBCParameter.java b/bcprov/src/main/java/org/bouncycastle/asn1/pkcs/RC2CBCParameter.java
deleted file mode 100644
index 0a116f7..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/pkcs/RC2CBCParameter.java
+++ /dev/null
@@ -1,93 +0,0 @@
-package org.bouncycastle.asn1.pkcs;
-
-import java.math.BigInteger;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DEROctetString;
-import org.bouncycastle.asn1.DERSequence;
-
-public class RC2CBCParameter
-    extends ASN1Object
-{
-    ASN1Integer      version;
-    ASN1OctetString iv;
-
-    public static RC2CBCParameter getInstance(
-        Object  o)
-    {
-        if (o instanceof RC2CBCParameter)
-        {
-            return (RC2CBCParameter)o;
-        }
-        if (o != null)
-        {
-            return new RC2CBCParameter(ASN1Sequence.getInstance(o));
-        }
-
-        return null;
-    }
-
-    public RC2CBCParameter(
-        byte[]  iv)
-    {
-        this.version = null;
-        this.iv = new DEROctetString(iv);
-    }
-
-    public RC2CBCParameter(
-        int     parameterVersion,
-        byte[]  iv)
-    {
-        this.version = new ASN1Integer(parameterVersion);
-        this.iv = new DEROctetString(iv);
-    }
-
-    private RC2CBCParameter(
-        ASN1Sequence  seq)
-    {
-        if (seq.size() == 1)
-        {
-            version = null;
-            iv = (ASN1OctetString)seq.getObjectAt(0);
-        }
-        else
-        {
-            version = (ASN1Integer)seq.getObjectAt(0);
-            iv = (ASN1OctetString)seq.getObjectAt(1);
-        }
-    }
-
-    public BigInteger getRC2ParameterVersion()
-    {
-        if (version == null)
-        {
-            return null;
-        }
-
-        return version.getValue();
-    }
-
-    public byte[] getIV()
-    {
-        return iv.getOctets();
-    }
-
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector  v = new ASN1EncodableVector();
-
-        if (version != null)
-        {
-            v.add(version);
-        }
-
-        v.add(iv);
-
-        return new DERSequence(v);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/pkcs/SignerInfo.java b/bcprov/src/main/java/org/bouncycastle/asn1/pkcs/SignerInfo.java
deleted file mode 100644
index ab5d78a..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/pkcs/SignerInfo.java
+++ /dev/null
@@ -1,178 +0,0 @@
-package org.bouncycastle.asn1.pkcs;
-
-import java.util.Enumeration;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.ASN1Set;
-import org.bouncycastle.asn1.ASN1TaggedObject;
-import org.bouncycastle.asn1.DEROctetString;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.DERTaggedObject;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-
-/**
- * a PKCS#7 signer info object.
- */
-public class SignerInfo
-    extends ASN1Object
-{
-    private ASN1Integer              version;
-    private IssuerAndSerialNumber   issuerAndSerialNumber;
-    private AlgorithmIdentifier     digAlgorithm;
-    private ASN1Set                 authenticatedAttributes;
-    private AlgorithmIdentifier     digEncryptionAlgorithm;
-    private ASN1OctetString         encryptedDigest;
-    private ASN1Set                 unauthenticatedAttributes;
-
-    public static SignerInfo getInstance(
-        Object  o)
-    {
-        if (o instanceof SignerInfo)
-        {
-            return (SignerInfo)o;
-        }
-        else if (o instanceof ASN1Sequence)
-        {
-            return new SignerInfo((ASN1Sequence)o);
-        }
-
-        throw new IllegalArgumentException("unknown object in factory: " + o.getClass().getName());
-    }
-
-    public SignerInfo(
-        ASN1Integer              version,
-        IssuerAndSerialNumber   issuerAndSerialNumber,
-        AlgorithmIdentifier     digAlgorithm,
-        ASN1Set                 authenticatedAttributes,
-        AlgorithmIdentifier     digEncryptionAlgorithm,
-        ASN1OctetString         encryptedDigest,
-        ASN1Set                 unauthenticatedAttributes)
-    {
-        this.version = version;
-        this.issuerAndSerialNumber = issuerAndSerialNumber;
-        this.digAlgorithm = digAlgorithm;
-        this.authenticatedAttributes = authenticatedAttributes;
-        this.digEncryptionAlgorithm = digEncryptionAlgorithm;
-        this.encryptedDigest = encryptedDigest;
-        this.unauthenticatedAttributes = unauthenticatedAttributes;
-    }
-
-    public SignerInfo(
-        ASN1Sequence seq)
-    {
-        Enumeration     e = seq.getObjects();
-
-        version = (ASN1Integer)e.nextElement();
-        issuerAndSerialNumber = IssuerAndSerialNumber.getInstance(e.nextElement());
-        digAlgorithm = AlgorithmIdentifier.getInstance(e.nextElement());
-
-        Object obj = e.nextElement();
-
-        if (obj instanceof ASN1TaggedObject)
-        {
-            authenticatedAttributes = ASN1Set.getInstance((ASN1TaggedObject)obj, false);
-
-            digEncryptionAlgorithm = AlgorithmIdentifier.getInstance(e.nextElement());
-        }
-        else
-        {
-            authenticatedAttributes = null;
-            digEncryptionAlgorithm = AlgorithmIdentifier.getInstance(obj);
-        }
-
-        encryptedDigest = DEROctetString.getInstance(e.nextElement());
-
-        if (e.hasMoreElements())
-        {
-            unauthenticatedAttributes = ASN1Set.getInstance((ASN1TaggedObject)e.nextElement(), false);
-        }
-        else
-        {
-            unauthenticatedAttributes = null;
-        }
-    }
-
-    public ASN1Integer getVersion()
-    {
-        return version;
-    }
-
-    public IssuerAndSerialNumber getIssuerAndSerialNumber()
-    {
-        return issuerAndSerialNumber;
-    }
-
-    public ASN1Set getAuthenticatedAttributes()
-    {
-        return authenticatedAttributes;
-    }
-
-    public AlgorithmIdentifier getDigestAlgorithm()
-    {
-        return digAlgorithm;
-    }
-
-    public ASN1OctetString getEncryptedDigest()
-    {
-        return encryptedDigest;
-    }
-
-    public AlgorithmIdentifier getDigestEncryptionAlgorithm()
-    {
-        return digEncryptionAlgorithm;
-    }
-
-    public ASN1Set getUnauthenticatedAttributes()
-    {
-        return unauthenticatedAttributes;
-    }
-
-    /**
-     * Produce an object suitable for an ASN1OutputStream.
-     * <pre>
-     *  SignerInfo ::= SEQUENCE {
-     *      version Version,
-     *      issuerAndSerialNumber IssuerAndSerialNumber,
-     *      digestAlgorithm DigestAlgorithmIdentifier,
-     *      authenticatedAttributes [0] IMPLICIT Attributes OPTIONAL,
-     *      digestEncryptionAlgorithm DigestEncryptionAlgorithmIdentifier,
-     *      encryptedDigest EncryptedDigest,
-     *      unauthenticatedAttributes [1] IMPLICIT Attributes OPTIONAL
-     *  }
-     *
-     *  EncryptedDigest ::= OCTET STRING
-     *
-     *  DigestAlgorithmIdentifier ::= AlgorithmIdentifier
-     *
-     *  DigestEncryptionAlgorithmIdentifier ::= AlgorithmIdentifier
-     * </pre>
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector v = new ASN1EncodableVector();
-
-        v.add(version);
-        v.add(issuerAndSerialNumber);
-        v.add(digAlgorithm);
-
-        if (authenticatedAttributes != null)
-        {
-            v.add(new DERTaggedObject(false, 0, authenticatedAttributes));
-        }
-
-        v.add(digEncryptionAlgorithm);
-        v.add(encryptedDigest);
-
-        if (unauthenticatedAttributes != null)
-        {
-            v.add(new DERTaggedObject(false, 1, unauthenticatedAttributes));
-        }
-
-        return new DERSequence(v);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/pkcs/package.html b/bcprov/src/main/java/org/bouncycastle/asn1/pkcs/package.html
deleted file mode 100644
index ab800f4..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/pkcs/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body bgcolor="#ffffff">
-Support classes useful for encoding and supporting the various RSA PKCS documents.
-</body>
-</html>
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/sec/package.html b/bcprov/src/main/java/org/bouncycastle/asn1/sec/package.html
deleted file mode 100644
index 5e34dec..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/sec/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body bgcolor="#ffffff">
-Classes for support of the SEC standard for Elliptic Curve.
-</body>
-</html>
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/smime/SMIMEAttributes.java b/bcprov/src/main/java/org/bouncycastle/asn1/smime/SMIMEAttributes.java
deleted file mode 100644
index eec29e6..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/smime/SMIMEAttributes.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package org.bouncycastle.asn1.smime;
-
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-
-public interface SMIMEAttributes
-{
-    public static final ASN1ObjectIdentifier  smimeCapabilities = PKCSObjectIdentifiers.pkcs_9_at_smimeCapabilities;
-    public static final ASN1ObjectIdentifier  encrypKeyPref = PKCSObjectIdentifiers.id_aa_encrypKeyPref;
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/smime/SMIMECapabilities.java b/bcprov/src/main/java/org/bouncycastle/asn1/smime/SMIMECapabilities.java
deleted file mode 100644
index f4558db..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/smime/SMIMECapabilities.java
+++ /dev/null
@@ -1,115 +0,0 @@
-package org.bouncycastle.asn1.smime;
-
-import java.util.Enumeration;
-import java.util.Vector;
-
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.cms.Attribute;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-
-/**
- * Handler class for dealing with S/MIME Capabilities
- */
-public class SMIMECapabilities
-    extends ASN1Object
-{
-    /**
-     * general preferences
-     */
-    public static final ASN1ObjectIdentifier preferSignedData = PKCSObjectIdentifiers.preferSignedData;
-    public static final ASN1ObjectIdentifier canNotDecryptAny = PKCSObjectIdentifiers.canNotDecryptAny;
-    public static final ASN1ObjectIdentifier sMIMECapabilitesVersions = PKCSObjectIdentifiers.sMIMECapabilitiesVersions;
-
-    /**
-     * encryption algorithms preferences
-     */
-    public static final ASN1ObjectIdentifier dES_CBC = new ASN1ObjectIdentifier("1.3.14.3.2.7");
-    public static final ASN1ObjectIdentifier dES_EDE3_CBC = PKCSObjectIdentifiers.des_EDE3_CBC;
-    public static final ASN1ObjectIdentifier rC2_CBC = PKCSObjectIdentifiers.RC2_CBC;
-    
-    private ASN1Sequence         capabilities;
-
-    /**
-     * return an Attribute object from the given object.
-     *
-     * @param o the object we want converted.
-     * @exception IllegalArgumentException if the object cannot be converted.
-     */
-    public static SMIMECapabilities getInstance(
-        Object o)
-    {
-        if (o == null || o instanceof SMIMECapabilities)
-        {
-            return (SMIMECapabilities)o;
-        }
-        
-        if (o instanceof ASN1Sequence)
-        {
-            return new SMIMECapabilities((ASN1Sequence)o);
-        }
-
-        if (o instanceof Attribute)
-        {
-            return new SMIMECapabilities(
-                (ASN1Sequence)(((Attribute)o).getAttrValues().getObjectAt(0)));
-        }
-
-        throw new IllegalArgumentException("unknown object in factory: " + o.getClass().getName());
-    }
-    
-    public SMIMECapabilities(
-        ASN1Sequence seq)
-    {
-        capabilities = seq;
-    }
-
-    /**
-     * returns a vector with 0 or more objects of all the capabilities
-     * matching the passed in capability OID. If the OID passed is null the
-     * entire set is returned.
-     */
-    public Vector getCapabilities(
-        ASN1ObjectIdentifier capability)
-    {
-        Enumeration e = capabilities.getObjects();
-        Vector      list = new Vector();
-
-        if (capability == null)
-        {
-            while (e.hasMoreElements())
-            {
-                SMIMECapability  cap = SMIMECapability.getInstance(e.nextElement());
-
-                list.addElement(cap);
-            }
-        }
-        else
-        {
-            while (e.hasMoreElements())
-            {
-                SMIMECapability  cap = SMIMECapability.getInstance(e.nextElement());
-
-                if (capability.equals(cap.getCapabilityID()))
-                {
-                    list.addElement(cap);
-                }
-            }
-        }
-
-        return list;
-    }
-
-    /** 
-     * Produce an object suitable for an ASN1OutputStream.
-     * <pre>
-     * SMIMECapabilities ::= SEQUENCE OF SMIMECapability
-     * </pre>
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        return capabilities;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/smime/SMIMECapabilitiesAttribute.java b/bcprov/src/main/java/org/bouncycastle/asn1/smime/SMIMECapabilitiesAttribute.java
deleted file mode 100644
index cfad31e..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/smime/SMIMECapabilitiesAttribute.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.bouncycastle.asn1.smime;
-
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.DERSet;
-import org.bouncycastle.asn1.cms.Attribute;
-
-public class SMIMECapabilitiesAttribute
-    extends Attribute
-{
-    public SMIMECapabilitiesAttribute(
-        SMIMECapabilityVector capabilities)
-    {
-        super(SMIMEAttributes.smimeCapabilities,
-                new DERSet(new DERSequence(capabilities.toASN1EncodableVector())));
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/smime/SMIMECapability.java b/bcprov/src/main/java/org/bouncycastle/asn1/smime/SMIMECapability.java
deleted file mode 100644
index f70d28a..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/smime/SMIMECapability.java
+++ /dev/null
@@ -1,103 +0,0 @@
-package org.bouncycastle.asn1.smime;
-
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.nist.NISTObjectIdentifiers;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-
-public class SMIMECapability
-    extends ASN1Object
-{
-    /**
-     * general preferences
-     */
-    public static final ASN1ObjectIdentifier preferSignedData = PKCSObjectIdentifiers.preferSignedData;
-    public static final ASN1ObjectIdentifier canNotDecryptAny = PKCSObjectIdentifiers.canNotDecryptAny;
-    public static final ASN1ObjectIdentifier sMIMECapabilitiesVersions = PKCSObjectIdentifiers.sMIMECapabilitiesVersions;
-
-    /**
-     * encryption algorithms preferences
-     */
-    public static final ASN1ObjectIdentifier dES_CBC = new ASN1ObjectIdentifier("1.3.14.3.2.7");
-    public static final ASN1ObjectIdentifier dES_EDE3_CBC = PKCSObjectIdentifiers.des_EDE3_CBC;
-    public static final ASN1ObjectIdentifier rC2_CBC = PKCSObjectIdentifiers.RC2_CBC;
-    public static final ASN1ObjectIdentifier aES128_CBC = NISTObjectIdentifiers.id_aes128_CBC;
-    public static final ASN1ObjectIdentifier aES192_CBC = NISTObjectIdentifiers.id_aes192_CBC;
-    public static final ASN1ObjectIdentifier aES256_CBC = NISTObjectIdentifiers.id_aes256_CBC;
-    
-    private ASN1ObjectIdentifier capabilityID;
-    private ASN1Encodable        parameters;
-
-    public SMIMECapability(
-        ASN1Sequence seq)
-    {
-        capabilityID = (ASN1ObjectIdentifier)seq.getObjectAt(0);
-
-        if (seq.size() > 1)
-        {
-            parameters = (ASN1Primitive)seq.getObjectAt(1);
-        }
-    }
-
-    public SMIMECapability(
-        ASN1ObjectIdentifier capabilityID,
-        ASN1Encodable        parameters)
-    {
-        this.capabilityID = capabilityID;
-        this.parameters = parameters;
-    }
-    
-    public static SMIMECapability getInstance(
-        Object obj)
-    {
-        if (obj == null || obj instanceof SMIMECapability)
-        {
-            return (SMIMECapability)obj;
-        }
-        
-        if (obj instanceof ASN1Sequence)
-        {
-            return new SMIMECapability((ASN1Sequence)obj);
-        }
-        
-        throw new IllegalArgumentException("Invalid SMIMECapability");
-    } 
-
-    public ASN1ObjectIdentifier getCapabilityID()
-    {
-        return capabilityID;
-    }
-
-    public ASN1Encodable getParameters()
-    {
-        return parameters;
-    }
-
-    /**
-     * Produce an object suitable for an ASN1OutputStream.
-     * <pre> 
-     * SMIMECapability ::= SEQUENCE {
-     *     capabilityID OBJECT IDENTIFIER,
-     *     parameters ANY DEFINED BY capabilityID OPTIONAL 
-     * }
-     * </pre>
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector  v = new ASN1EncodableVector();
-
-        v.add(capabilityID);
-        
-        if (parameters != null)
-        {
-            v.add(parameters);
-        }
-        
-        return new DERSequence(v);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/smime/SMIMECapabilityVector.java b/bcprov/src/main/java/org/bouncycastle/asn1/smime/SMIMECapabilityVector.java
deleted file mode 100644
index 965a996..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/smime/SMIMECapabilityVector.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package org.bouncycastle.asn1.smime;
-
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.DERSequence;
-
-/**
- * Handler for creating a vector S/MIME Capabilities
- */
-public class SMIMECapabilityVector
-{
-    private ASN1EncodableVector    capabilities = new ASN1EncodableVector();
-
-    public void addCapability(
-        ASN1ObjectIdentifier capability)
-    {
-        capabilities.add(new DERSequence(capability));
-    }
-
-    public void addCapability(
-        ASN1ObjectIdentifier capability,
-        int                 value)
-    {
-        ASN1EncodableVector  v = new ASN1EncodableVector();
-
-        v.add(capability);
-        v.add(new ASN1Integer(value));
-
-        capabilities.add(new DERSequence(v));
-    }
-
-    public void addCapability(
-        ASN1ObjectIdentifier capability,
-        ASN1Encodable params)
-    {
-        ASN1EncodableVector  v = new ASN1EncodableVector();
-
-        v.add(capability);
-        v.add(params);
-
-        capabilities.add(new DERSequence(v));
-    }
-
-    public ASN1EncodableVector toASN1EncodableVector()
-    {
-        return capabilities;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/smime/SMIMEEncryptionKeyPreferenceAttribute.java b/bcprov/src/main/java/org/bouncycastle/asn1/smime/SMIMEEncryptionKeyPreferenceAttribute.java
deleted file mode 100644
index 1e5b539..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/smime/SMIMEEncryptionKeyPreferenceAttribute.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package org.bouncycastle.asn1.smime;
-
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.DERSet;
-import org.bouncycastle.asn1.DERTaggedObject;
-import org.bouncycastle.asn1.cms.Attribute;
-import org.bouncycastle.asn1.cms.IssuerAndSerialNumber;
-import org.bouncycastle.asn1.cms.RecipientKeyIdentifier;
-
-/**
- * The SMIMEEncryptionKeyPreference object.
- * <pre>
- * SMIMEEncryptionKeyPreference ::= CHOICE {
- *     issuerAndSerialNumber   [0] IssuerAndSerialNumber,
- *     receipentKeyId          [1] RecipientKeyIdentifier,
- *     subjectAltKeyIdentifier [2] SubjectKeyIdentifier
- * }
- * </pre>
- */
-public class SMIMEEncryptionKeyPreferenceAttribute
-    extends Attribute
-{
-    public SMIMEEncryptionKeyPreferenceAttribute(
-        IssuerAndSerialNumber issAndSer)
-    {
-        super(SMIMEAttributes.encrypKeyPref,
-                new DERSet(new DERTaggedObject(false, 0, issAndSer)));
-    }
-    
-    public SMIMEEncryptionKeyPreferenceAttribute(
-        RecipientKeyIdentifier rKeyId)
-    {
-
-        super(SMIMEAttributes.encrypKeyPref, 
-                    new DERSet(new DERTaggedObject(false, 1, rKeyId)));
-    }
-    
-    /**
-     * @param sKeyId the subjectKeyIdentifier value (normally the X.509 one)
-     */
-    public SMIMEEncryptionKeyPreferenceAttribute(
-        ASN1OctetString sKeyId)
-    {
-
-        super(SMIMEAttributes.encrypKeyPref,
-                    new DERSet(new DERTaggedObject(false, 2, sKeyId)));
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/smime/package.html b/bcprov/src/main/java/org/bouncycastle/asn1/smime/package.html
deleted file mode 100644
index d527aba..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/smime/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body bgcolor="#ffffff">
-Support classes useful for encoding and supporting S/MIME.
-</body>
-</html>
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/teletrust/TeleTrusTNamedCurves.java b/bcprov/src/main/java/org/bouncycastle/asn1/teletrust/TeleTrusTNamedCurves.java
deleted file mode 100644
index 9420c3c..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/teletrust/TeleTrusTNamedCurves.java
+++ /dev/null
@@ -1,398 +0,0 @@
-package org.bouncycastle.asn1.teletrust;
-
-import java.math.BigInteger;
-import java.util.Enumeration;
-import java.util.Hashtable;
-
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.x9.X9ECParameters;
-import org.bouncycastle.asn1.x9.X9ECParametersHolder;
-import org.bouncycastle.math.ec.ECCurve;
-import org.bouncycastle.util.Strings;
-import org.bouncycastle.util.encoders.Hex;
-
-/**
- * elliptic curves defined in "ECC Brainpool Standard Curves and Curve Generation"
- * http://www.ecc-brainpool.org/download/draft_pkix_additional_ecc_dp.txt
- */
-public class TeleTrusTNamedCurves
-{
-    private static ECCurve configureCurve(ECCurve curve)
-    {
-        return curve;
-    }
-
-    static X9ECParametersHolder brainpoolP160r1 = new X9ECParametersHolder()
-    {
-        protected X9ECParameters createParameters()
-        {
-            BigInteger n = new BigInteger("E95E4A5F737059DC60DF5991D45029409E60FC09", 16);
-            BigInteger h = new BigInteger("01", 16);
-
-            ECCurve curve = configureCurve(new ECCurve.Fp(
-                new BigInteger("E95E4A5F737059DC60DFC7AD95B3D8139515620F", 16), // q
-                new BigInteger("340E7BE2A280EB74E2BE61BADA745D97E8F7C300", 16), // a
-                new BigInteger("1E589A8595423412134FAA2DBDEC95C8D8675E58", 16), // b
-                n, h));
-
-            return new X9ECParameters(
-                curve,
-                curve.decodePoint(Hex.decode("04BED5AF16EA3F6A4F62938C4631EB5AF7BDBCDBC31667CB477A1A8EC338F94741669C976316DA6321")), // G
-                n, h);
-        }
-    };
-
-    static X9ECParametersHolder brainpoolP160t1 = new X9ECParametersHolder()
-    {
-        protected X9ECParameters createParameters()
-        {
-            BigInteger n = new BigInteger("E95E4A5F737059DC60DF5991D45029409E60FC09", 16);
-            BigInteger h = new BigInteger("01", 16);
-
-            ECCurve curve = configureCurve(new ECCurve.Fp(
-                //   new BigInteger("24DBFF5DEC9B986BBFE5295A29BFBAE45E0F5D0B", 16), // Z
-                new BigInteger("E95E4A5F737059DC60DFC7AD95B3D8139515620F", 16), // q
-                new BigInteger("E95E4A5F737059DC60DFC7AD95B3D8139515620C", 16), // a'
-                new BigInteger("7A556B6DAE535B7B51ED2C4D7DAA7A0B5C55F380", 16), // b'
-                n, h));
-
-            return new X9ECParameters(
-                curve,
-                curve.decodePoint(Hex.decode("04B199B13B9B34EFC1397E64BAEB05ACC265FF2378ADD6718B7C7C1961F0991B842443772152C9E0AD")), // G
-                n, h);
-        }
-    };
-
-    static X9ECParametersHolder brainpoolP192r1 = new X9ECParametersHolder()
-    {
-        protected X9ECParameters createParameters()
-        {
-            BigInteger n = new BigInteger("C302F41D932A36CDA7A3462F9E9E916B5BE8F1029AC4ACC1", 16);
-            BigInteger h = new BigInteger("01", 16);
-
-            ECCurve curve = configureCurve(new ECCurve.Fp(
-                new BigInteger("C302F41D932A36CDA7A3463093D18DB78FCE476DE1A86297", 16), // q
-                new BigInteger("6A91174076B1E0E19C39C031FE8685C1CAE040E5C69A28EF", 16), // a
-                new BigInteger("469A28EF7C28CCA3DC721D044F4496BCCA7EF4146FBF25C9", 16), // b
-                n, h));
-
-            return new X9ECParameters(
-                curve,
-                curve.decodePoint(Hex.decode("04C0A0647EAAB6A48753B033C56CB0F0900A2F5C4853375FD614B690866ABD5BB88B5F4828C1490002E6773FA2FA299B8F")), // G
-                n, h);
-        }
-    };
-
-    static X9ECParametersHolder brainpoolP192t1 = new X9ECParametersHolder()
-    {
-        protected X9ECParameters createParameters()
-        {
-            BigInteger n = new BigInteger("C302F41D932A36CDA7A3462F9E9E916B5BE8F1029AC4ACC1", 16);
-            BigInteger h = new BigInteger("01", 16);
-
-            ECCurve curve = configureCurve(new ECCurve.Fp(
-                //new BigInteger("1B6F5CC8DB4DC7AF19458A9CB80DC2295E5EB9C3732104CB") //Z
-                new BigInteger("C302F41D932A36CDA7A3463093D18DB78FCE476DE1A86297", 16), // q
-                new BigInteger("C302F41D932A36CDA7A3463093D18DB78FCE476DE1A86294", 16), // a'
-                new BigInteger("13D56FFAEC78681E68F9DEB43B35BEC2FB68542E27897B79", 16), // b'
-                n, h));
-
-            return new X9ECParameters(
-                curve,
-                curve.decodePoint(Hex.decode("043AE9E58C82F63C30282E1FE7BBF43FA72C446AF6F4618129097E2C5667C2223A902AB5CA449D0084B7E5B3DE7CCC01C9")), // G'
-                n, h);
-        }
-    };
-
-    static X9ECParametersHolder brainpoolP224r1 = new X9ECParametersHolder()
-    {
-        protected X9ECParameters createParameters()
-        {
-            BigInteger n = new BigInteger("D7C134AA264366862A18302575D0FB98D116BC4B6DDEBCA3A5A7939F", 16);
-            BigInteger h = new BigInteger("01", 16);
-
-            ECCurve curve = configureCurve(new ECCurve.Fp(
-                new BigInteger("D7C134AA264366862A18302575D1D787B09F075797DA89F57EC8C0FF", 16), // q
-                new BigInteger("68A5E62CA9CE6C1C299803A6C1530B514E182AD8B0042A59CAD29F43", 16), // a
-                new BigInteger("2580F63CCFE44138870713B1A92369E33E2135D266DBB372386C400B", 16), // b
-                n, h));
-
-            return new X9ECParameters(
-                curve,
-                curve.decodePoint(Hex.decode("040D9029AD2C7E5CF4340823B2A87DC68C9E4CE3174C1E6EFDEE12C07D58AA56F772C0726F24C6B89E4ECDAC24354B9E99CAA3F6D3761402CD")), // G
-                n, h);
-        }
-    };
-    static X9ECParametersHolder brainpoolP224t1 = new X9ECParametersHolder()
-    {
-        protected X9ECParameters createParameters()
-        {
-            BigInteger n = new BigInteger("D7C134AA264366862A18302575D0FB98D116BC4B6DDEBCA3A5A7939F", 16);
-            BigInteger h = new BigInteger("01", 16);
-
-            ECCurve curve = configureCurve(new ECCurve.Fp(
-                //new BigInteger("2DF271E14427A346910CF7A2E6CFA7B3F484E5C2CCE1C8B730E28B3F") //Z
-                new BigInteger("D7C134AA264366862A18302575D1D787B09F075797DA89F57EC8C0FF", 16), // q
-                new BigInteger("D7C134AA264366862A18302575D1D787B09F075797DA89F57EC8C0FC", 16), // a'
-                new BigInteger("4B337D934104CD7BEF271BF60CED1ED20DA14C08B3BB64F18A60888D", 16), // b'
-                n, h));
-
-            return new X9ECParameters(
-                curve,
-                curve.decodePoint(Hex.decode("046AB1E344CE25FF3896424E7FFE14762ECB49F8928AC0C76029B4D5800374E9F5143E568CD23F3F4D7C0D4B1E41C8CC0D1C6ABD5F1A46DB4C")), // G'
-                n, h);
-        }
-    };
-    static X9ECParametersHolder brainpoolP256r1 = new X9ECParametersHolder()
-    {
-        protected X9ECParameters createParameters()
-        {
-            BigInteger n = new BigInteger("A9FB57DBA1EEA9BC3E660A909D838D718C397AA3B561A6F7901E0E82974856A7", 16);
-            BigInteger h = new BigInteger("01", 16);
-
-            ECCurve curve = configureCurve(new ECCurve.Fp(
-                new BigInteger("A9FB57DBA1EEA9BC3E660A909D838D726E3BF623D52620282013481D1F6E5377", 16), // q
-                new BigInteger("7D5A0975FC2C3057EEF67530417AFFE7FB8055C126DC5C6CE94A4B44F330B5D9", 16), // a
-                new BigInteger("26DC5C6CE94A4B44F330B5D9BBD77CBF958416295CF7E1CE6BCCDC18FF8C07B6", 16), // b
-                n, h));
-
-            return new X9ECParameters(
-                curve,
-                curve.decodePoint(Hex.decode("048BD2AEB9CB7E57CB2C4B482FFC81B7AFB9DE27E1E3BD23C23A4453BD9ACE3262547EF835C3DAC4FD97F8461A14611DC9C27745132DED8E545C1D54C72F046997")), // G
-                n, h);
-        }
-    };
-    static X9ECParametersHolder brainpoolP256t1 = new X9ECParametersHolder()
-    {
-        protected X9ECParameters createParameters()
-        {
-            BigInteger n = new BigInteger("A9FB57DBA1EEA9BC3E660A909D838D718C397AA3B561A6F7901E0E82974856A7", 16);
-            BigInteger h = new BigInteger("01", 16);
-
-            ECCurve curve = configureCurve(new ECCurve.Fp(
-                //new BigInteger("3E2D4BD9597B58639AE7AA669CAB9837CF5CF20A2C852D10F655668DFC150EF0") //Z
-                new BigInteger("A9FB57DBA1EEA9BC3E660A909D838D726E3BF623D52620282013481D1F6E5377", 16), // q
-                new BigInteger("A9FB57DBA1EEA9BC3E660A909D838D726E3BF623D52620282013481D1F6E5374", 16), // a'
-                new BigInteger("662C61C430D84EA4FE66A7733D0B76B7BF93EBC4AF2F49256AE58101FEE92B04", 16), // b'
-                n, h));
-
-            return new X9ECParameters(
-                curve,
-                curve.decodePoint(Hex.decode("04A3E8EB3CC1CFE7B7732213B23A656149AFA142C47AAFBC2B79A191562E1305F42D996C823439C56D7F7B22E14644417E69BCB6DE39D027001DABE8F35B25C9BE")), // G'
-                n, h);
-        }
-    };
-    static X9ECParametersHolder brainpoolP320r1 = new X9ECParametersHolder()
-    {
-        protected X9ECParameters createParameters()
-        {
-            BigInteger n = new BigInteger("D35E472036BC4FB7E13C785ED201E065F98FCFA5B68F12A32D482EC7EE8658E98691555B44C59311", 16);
-            BigInteger h = new BigInteger("01", 16);
-
-            ECCurve curve = configureCurve(new ECCurve.Fp(
-                new BigInteger("D35E472036BC4FB7E13C785ED201E065F98FCFA6F6F40DEF4F92B9EC7893EC28FCD412B1F1B32E27", 16), // q
-                new BigInteger("3EE30B568FBAB0F883CCEBD46D3F3BB8A2A73513F5EB79DA66190EB085FFA9F492F375A97D860EB4", 16), // a
-                new BigInteger("520883949DFDBC42D3AD198640688A6FE13F41349554B49ACC31DCCD884539816F5EB4AC8FB1F1A6", 16), // b
-                n, h));
-
-            return new X9ECParameters(
-                curve,
-                curve.decodePoint(Hex.decode("0443BD7E9AFB53D8B85289BCC48EE5BFE6F20137D10A087EB6E7871E2A10A599C710AF8D0D39E2061114FDD05545EC1CC8AB4093247F77275E0743FFED117182EAA9C77877AAAC6AC7D35245D1692E8EE1")), // G
-                n, h);
-        }
-    };
-    static X9ECParametersHolder brainpoolP320t1 = new X9ECParametersHolder()
-    {
-        protected X9ECParameters createParameters()
-        {
-            BigInteger n = new BigInteger("D35E472036BC4FB7E13C785ED201E065F98FCFA5B68F12A32D482EC7EE8658E98691555B44C59311", 16);
-            BigInteger h = new BigInteger("01", 16);
-
-            ECCurve curve = configureCurve(new ECCurve.Fp(
-                //new BigInteger("15F75CAF668077F7E85B42EB01F0A81FF56ECD6191D55CB82B7D861458A18FEFC3E5AB7496F3C7B1") //Z
-                new BigInteger("D35E472036BC4FB7E13C785ED201E065F98FCFA6F6F40DEF4F92B9EC7893EC28FCD412B1F1B32E27", 16), // q
-                new BigInteger("D35E472036BC4FB7E13C785ED201E065F98FCFA6F6F40DEF4F92B9EC7893EC28FCD412B1F1B32E24", 16), // a'
-                new BigInteger("A7F561E038EB1ED560B3D147DB782013064C19F27ED27C6780AAF77FB8A547CEB5B4FEF422340353", 16), // b'
-                n, h));
-
-            return new X9ECParameters(
-                curve,
-                curve.decodePoint(Hex.decode("04925BE9FB01AFC6FB4D3E7D4990010F813408AB106C4F09CB7EE07868CC136FFF3357F624A21BED5263BA3A7A27483EBF6671DBEF7ABB30EBEE084E58A0B077AD42A5A0989D1EE71B1B9BC0455FB0D2C3")), // G'
-                n, h);
-        }
-    };
-    static X9ECParametersHolder brainpoolP384r1 = new X9ECParametersHolder()
-    {
-        protected X9ECParameters createParameters()
-        {
-            BigInteger n = new BigInteger("8CB91E82A3386D280F5D6F7E50E641DF152F7109ED5456B31F166E6CAC0425A7CF3AB6AF6B7FC3103B883202E9046565", 16);
-            BigInteger h = new BigInteger("01", 16);
-
-            ECCurve curve = configureCurve(new ECCurve.Fp(
-                new BigInteger("8CB91E82A3386D280F5D6F7E50E641DF152F7109ED5456B412B1DA197FB71123ACD3A729901D1A71874700133107EC53", 16), // q
-                new BigInteger("7BC382C63D8C150C3C72080ACE05AFA0C2BEA28E4FB22787139165EFBA91F90F8AA5814A503AD4EB04A8C7DD22CE2826", 16), // a
-                new BigInteger("4A8C7DD22CE28268B39B55416F0447C2FB77DE107DCD2A62E880EA53EEB62D57CB4390295DBC9943AB78696FA504C11", 16), // b
-                n, h));
-
-            return new X9ECParameters(
-                curve,
-                curve.decodePoint(Hex.decode("041D1C64F068CF45FFA2A63A81B7C13F6B8847A3E77EF14FE3DB7FCAFE0CBD10E8E826E03436D646AAEF87B2E247D4AF1E8ABE1D7520F9C2A45CB1EB8E95CFD55262B70B29FEEC5864E19C054FF99129280E4646217791811142820341263C5315")), // G
-                n, h);
-        }
-    };
-    static X9ECParametersHolder brainpoolP384t1 = new X9ECParametersHolder()
-    {
-        protected X9ECParameters createParameters()
-        {
-            BigInteger n = new BigInteger("8CB91E82A3386D280F5D6F7E50E641DF152F7109ED5456B31F166E6CAC0425A7CF3AB6AF6B7FC3103B883202E9046565", 16);
-            BigInteger h = new BigInteger("01", 16);
-
-            ECCurve curve = configureCurve(new ECCurve.Fp(
-                //new BigInteger("41DFE8DD399331F7166A66076734A89CD0D2BCDB7D068E44E1F378F41ECBAE97D2D63DBC87BCCDDCCC5DA39E8589291C") //Z
-                new BigInteger("8CB91E82A3386D280F5D6F7E50E641DF152F7109ED5456B412B1DA197FB71123ACD3A729901D1A71874700133107EC53", 16), // q
-                new BigInteger("8CB91E82A3386D280F5D6F7E50E641DF152F7109ED5456B412B1DA197FB71123ACD3A729901D1A71874700133107EC50", 16), // a'
-                new BigInteger("7F519EADA7BDA81BD826DBA647910F8C4B9346ED8CCDC64E4B1ABD11756DCE1D2074AA263B88805CED70355A33B471EE", 16), // b'
-                n, h));
-
-            return new X9ECParameters(
-                curve,
-                curve.decodePoint(Hex.decode("0418DE98B02DB9A306F2AFCD7235F72A819B80AB12EBD653172476FECD462AABFFC4FF191B946A5F54D8D0AA2F418808CC25AB056962D30651A114AFD2755AD336747F93475B7A1FCA3B88F2B6A208CCFE469408584DC2B2912675BF5B9E582928")), // G'
-                n, h);
-        }
-    };
-    static X9ECParametersHolder brainpoolP512r1 = new X9ECParametersHolder()
-    {
-        protected X9ECParameters createParameters()
-        {
-            BigInteger n = new BigInteger("AADD9DB8DBE9C48B3FD4E6AE33C9FC07CB308DB3B3C9D20ED6639CCA70330870553E5C414CA92619418661197FAC10471DB1D381085DDADDB58796829CA90069", 16);
-            BigInteger h = new BigInteger("01", 16);
-
-            ECCurve curve = configureCurve(new ECCurve.Fp(
-                new BigInteger("AADD9DB8DBE9C48B3FD4E6AE33C9FC07CB308DB3B3C9D20ED6639CCA703308717D4D9B009BC66842AECDA12AE6A380E62881FF2F2D82C68528AA6056583A48F3", 16), // q
-                new BigInteger("7830A3318B603B89E2327145AC234CC594CBDD8D3DF91610A83441CAEA9863BC2DED5D5AA8253AA10A2EF1C98B9AC8B57F1117A72BF2C7B9E7C1AC4D77FC94CA", 16), // a
-                new BigInteger("3DF91610A83441CAEA9863BC2DED5D5AA8253AA10A2EF1C98B9AC8B57F1117A72BF2C7B9E7C1AC4D77FC94CADC083E67984050B75EBAE5DD2809BD638016F723", 16), // b
-                n, h));
-
-            return new X9ECParameters(
-                curve,
-                curve.decodePoint(Hex.decode("0481AEE4BDD82ED9645A21322E9C4C6A9385ED9F70B5D916C1B43B62EEF4D0098EFF3B1F78E2D0D48D50D1687B93B97D5F7C6D5047406A5E688B352209BCB9F8227DDE385D566332ECC0EABFA9CF7822FDF209F70024A57B1AA000C55B881F8111B2DCDE494A5F485E5BCA4BD88A2763AED1CA2B2FA8F0540678CD1E0F3AD80892")), // G
-                n, h);
-        }
-    };
-    static X9ECParametersHolder brainpoolP512t1 = new X9ECParametersHolder()
-    {
-        protected X9ECParameters createParameters()
-        {
-            BigInteger n = new BigInteger("AADD9DB8DBE9C48B3FD4E6AE33C9FC07CB308DB3B3C9D20ED6639CCA70330870553E5C414CA92619418661197FAC10471DB1D381085DDADDB58796829CA90069", 16);
-            BigInteger h = new BigInteger("01", 16);
-
-            ECCurve curve = configureCurve(new ECCurve.Fp(
-                //new BigInteger("12EE58E6764838B69782136F0F2D3BA06E27695716054092E60A80BEDB212B64E585D90BCE13761F85C3F1D2A64E3BE8FEA2220F01EBA5EEB0F35DBD29D922AB") //Z
-                new BigInteger("AADD9DB8DBE9C48B3FD4E6AE33C9FC07CB308DB3B3C9D20ED6639CCA703308717D4D9B009BC66842AECDA12AE6A380E62881FF2F2D82C68528AA6056583A48F3", 16), // q
-                new BigInteger("AADD9DB8DBE9C48B3FD4E6AE33C9FC07CB308DB3B3C9D20ED6639CCA703308717D4D9B009BC66842AECDA12AE6A380E62881FF2F2D82C68528AA6056583A48F0", 16), // a'
-                new BigInteger("7CBBBCF9441CFAB76E1890E46884EAE321F70C0BCB4981527897504BEC3E36A62BCDFA2304976540F6450085F2DAE145C22553B465763689180EA2571867423E", 16), // b'
-                n, h));
-
-            return new X9ECParameters(
-                curve,
-                curve.decodePoint(Hex.decode("04640ECE5C12788717B9C1BA06CBC2A6FEBA85842458C56DDE9DB1758D39C0313D82BA51735CDB3EA499AA77A7D6943A64F7A3F25FE26F06B51BAA2696FA9035DA5B534BD595F5AF0FA2C892376C84ACE1BB4E3019B71634C01131159CAE03CEE9D9932184BEEF216BD71DF2DADF86A627306ECFF96DBB8BACE198B61E00F8B332")), // G'
-                n, h);
-        }
-    };
-
-    static final Hashtable objIds = new Hashtable();
-    static final Hashtable curves = new Hashtable();
-    static final Hashtable names = new Hashtable();
-
-    static void defineCurve(String name, ASN1ObjectIdentifier oid, X9ECParametersHolder holder)
-    {
-        objIds.put(name, oid);
-        names.put(oid, name);
-        curves.put(oid, holder);
-    }
-
-    static
-    {
-        defineCurve("brainpoolp160r1", TeleTrusTObjectIdentifiers.brainpoolP160r1, brainpoolP160r1);
-        defineCurve("brainpoolp160t1", TeleTrusTObjectIdentifiers.brainpoolP160t1, brainpoolP160t1);
-        defineCurve("brainpoolp192r1", TeleTrusTObjectIdentifiers.brainpoolP192r1, brainpoolP192r1);
-        defineCurve("brainpoolp192t1", TeleTrusTObjectIdentifiers.brainpoolP192t1, brainpoolP192t1);
-        defineCurve("brainpoolp224r1", TeleTrusTObjectIdentifiers.brainpoolP224r1, brainpoolP224r1);
-        defineCurve("brainpoolp224t1", TeleTrusTObjectIdentifiers.brainpoolP224t1, brainpoolP224t1);
-        defineCurve("brainpoolp256r1", TeleTrusTObjectIdentifiers.brainpoolP256r1, brainpoolP256r1);
-        defineCurve("brainpoolp256t1", TeleTrusTObjectIdentifiers.brainpoolP256t1, brainpoolP256t1);
-        defineCurve("brainpoolp320r1", TeleTrusTObjectIdentifiers.brainpoolP320r1, brainpoolP320r1);
-        defineCurve("brainpoolp320t1", TeleTrusTObjectIdentifiers.brainpoolP320t1, brainpoolP320t1);
-        defineCurve("brainpoolp384r1", TeleTrusTObjectIdentifiers.brainpoolP384r1, brainpoolP384r1);
-        defineCurve("brainpoolp384t1", TeleTrusTObjectIdentifiers.brainpoolP384t1, brainpoolP384t1);
-        defineCurve("brainpoolp512r1", TeleTrusTObjectIdentifiers.brainpoolP512r1, brainpoolP512r1);
-        defineCurve("brainpoolp512t1", TeleTrusTObjectIdentifiers.brainpoolP512t1, brainpoolP512t1);
-    }
-
-    public static X9ECParameters getByName(
-        String name)
-    {
-        ASN1ObjectIdentifier oid = (ASN1ObjectIdentifier)objIds.get(Strings.toLowerCase(name));
-
-        if (oid != null)
-        {
-            return getByOID(oid);
-        }
-
-        return null;
-    }
-
-    /**
-     * return the X9ECParameters object for the named curve represented by
-     * the passed in object identifier. Null if the curve isn't present.
-     *
-     * @param oid an object identifier representing a named curve, if present.
-     */
-    public static X9ECParameters getByOID(
-        ASN1ObjectIdentifier oid)
-    {
-        X9ECParametersHolder holder = (X9ECParametersHolder)curves.get(oid);
-
-        if (holder != null)
-        {
-            return holder.getParameters();
-        }
-
-        return null;
-    }
-
-    /**
-     * return the object identifier signified by the passed in name. Null
-     * if there is no object identifier associated with name.
-     *
-     * @return the object identifier associated with name, if present.
-     */
-    public static ASN1ObjectIdentifier getOID(
-        String name)
-    {
-        return (ASN1ObjectIdentifier)objIds.get(Strings.toLowerCase(name));
-    }
-
-    /**
-     * return the named curve name represented by the given object identifier.
-     */
-    public static String getName(
-        ASN1ObjectIdentifier oid)
-    {
-        return (String)names.get(oid);
-    }
-
-    /**
-     * returns an enumeration containing the name strings for curves
-     * contained in this structure.
-     */
-    public static Enumeration getNames()
-    {
-        return objIds.keys();
-    }
-
-    public static ASN1ObjectIdentifier getOID(short curvesize, boolean twisted)
-    {
-        return getOID("brainpoolP" + curvesize + (twisted ? "t" : "r") + "1");
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/teletrust/package.html b/bcprov/src/main/java/org/bouncycastle/asn1/teletrust/package.html
deleted file mode 100644
index 86606c3..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/teletrust/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body bgcolor="#ffffff">
-Support classes for TeleTrust related objects.
-</body>
-</html>
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/test/ASN1SequenceParserTest.java b/bcprov/src/main/java/org/bouncycastle/asn1/test/ASN1SequenceParserTest.java
deleted file mode 100644
index e0cd1af..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/test/ASN1SequenceParserTest.java
+++ /dev/null
@@ -1,372 +0,0 @@
-package org.bouncycastle.asn1.test;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.math.BigInteger;
-import java.util.Arrays;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1Null;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1SequenceParser;
-import org.bouncycastle.asn1.ASN1StreamParser;
-import org.bouncycastle.asn1.BERSequenceGenerator;
-import org.bouncycastle.asn1.DERSequenceGenerator;
-import org.bouncycastle.util.encoders.Hex;
-
-public class ASN1SequenceParserTest 
-    extends TestCase 
-{
-    private static final byte[] seqData = Hex.decode("3006020100060129");
-    private static final byte[] nestedSeqData = Hex.decode("300b0201000601293003020101");
-    private static final byte[] expTagSeqData = Hex.decode("a1083006020100060129");
-    private static final byte[] implTagSeqData = Hex.decode("a106020100060129");
-    private static final byte[] nestedSeqExpTagData = Hex.decode("300d020100060129a1053003020101");
-    private static final byte[] nestedSeqImpTagData = Hex.decode("300b020100060129a103020101");
-    
-    private static final byte[] berSeqData = Hex.decode("30800201000601290000");
-    private static final byte[] berDERNestedSeqData = Hex.decode("308002010006012930030201010000");
-    private static final byte[] berNestedSeqData = Hex.decode("3080020100060129308002010100000000");
-    private static final byte[] berExpTagSeqData = Hex.decode("a180308002010006012900000000");
-
-    private static final byte[] berSeqWithDERNullData = Hex.decode("308005000201000601290000");
-
-    public void testDERWriting()
-        throws Exception
-    {
-       ByteArrayOutputStream bOut = new ByteArrayOutputStream();
-       DERSequenceGenerator  seqGen = new DERSequenceGenerator(bOut);
-       
-       seqGen.addObject(new ASN1Integer(BigInteger.valueOf(0)));
-       
-       seqGen.addObject(new ASN1ObjectIdentifier("1.1"));
-       
-       seqGen.close();
-
-       assertTrue("basic DER writing test failed.", Arrays.equals(seqData, bOut.toByteArray()));
-    }
- 
-    public void testNestedDERWriting()
-        throws Exception
-    {
-       ByteArrayOutputStream bOut = new ByteArrayOutputStream();
-       DERSequenceGenerator seqGen1 = new DERSequenceGenerator(bOut);
-       
-       seqGen1.addObject(new ASN1Integer(BigInteger.valueOf(0)));
-       
-       seqGen1.addObject(new ASN1ObjectIdentifier("1.1"));
-       
-       DERSequenceGenerator seqGen2 = new DERSequenceGenerator(seqGen1.getRawOutputStream());
-       
-       seqGen2.addObject(new ASN1Integer(BigInteger.valueOf(1)));
-       
-       seqGen2.close();
-       
-       seqGen1.close();
-
-       assertTrue("nested DER writing test failed.", Arrays.equals(nestedSeqData, bOut.toByteArray()));
-    }
-
-    public void testDERExplicitTaggedSequenceWriting()
-        throws Exception
-    {
-       ByteArrayOutputStream bOut = new ByteArrayOutputStream();
-       DERSequenceGenerator  seqGen = new DERSequenceGenerator(bOut, 1, true);
-       
-       seqGen.addObject(new ASN1Integer(BigInteger.valueOf(0)));
-       
-       seqGen.addObject(new ASN1ObjectIdentifier("1.1"));
-       
-       seqGen.close();
-
-       assertTrue("explicit tag writing test failed.", Arrays.equals(expTagSeqData, bOut.toByteArray()));
-    }
-    
-    public void testDERImplicitTaggedSequenceWriting()
-        throws Exception
-    {
-       ByteArrayOutputStream bOut = new ByteArrayOutputStream();
-       DERSequenceGenerator  seqGen = new DERSequenceGenerator(bOut, 1, false);
-       
-       seqGen.addObject(new ASN1Integer(BigInteger.valueOf(0)));
-       
-       seqGen.addObject(new ASN1ObjectIdentifier("1.1"));
-       
-       seqGen.close();
-
-       assertTrue("implicit tag writing test failed.", Arrays.equals(implTagSeqData, bOut.toByteArray()));
-    }
-    
-    public void testNestedExplicitTagDERWriting()
-        throws Exception
-    {
-       ByteArrayOutputStream bOut = new ByteArrayOutputStream();
-       DERSequenceGenerator  seqGen1 = new DERSequenceGenerator(bOut);
-       
-       seqGen1.addObject(new ASN1Integer(BigInteger.valueOf(0)));
-       
-       seqGen1.addObject(new ASN1ObjectIdentifier("1.1"));
-       
-       DERSequenceGenerator seqGen2 = new DERSequenceGenerator(seqGen1.getRawOutputStream(), 1, true);
-       
-       seqGen2.addObject(new ASN1Integer(BigInteger.valueOf(1)));
-       
-       seqGen2.close();
-       
-       seqGen1.close();
-
-       assertTrue("nested explicit tagged DER writing test failed.", Arrays.equals(nestedSeqExpTagData, bOut.toByteArray()));
-    }
-    
-    public void testNestedImplicitTagDERWriting()
-        throws Exception
-    {
-       ByteArrayOutputStream bOut = new ByteArrayOutputStream();
-       DERSequenceGenerator  seqGen1 = new DERSequenceGenerator(bOut);
-       
-       seqGen1.addObject(new ASN1Integer(BigInteger.valueOf(0)));
-       
-       seqGen1.addObject(new ASN1ObjectIdentifier("1.1"));
-       
-       DERSequenceGenerator seqGen2 = new DERSequenceGenerator(seqGen1.getRawOutputStream(), 1, false);
-       
-       seqGen2.addObject(new ASN1Integer(BigInteger.valueOf(1)));
-       
-       seqGen2.close();
-       
-       seqGen1.close();
-
-       assertTrue("nested implicit tagged DER writing test failed.", Arrays.equals(nestedSeqImpTagData, bOut.toByteArray()));
-    }
-    
-    public void testBERWriting()
-        throws Exception
-    {
-       ByteArrayOutputStream bOut = new ByteArrayOutputStream();
-       BERSequenceGenerator  seqGen = new BERSequenceGenerator(bOut);
-       
-       seqGen.addObject(new ASN1Integer(BigInteger.valueOf(0)));
-       
-       seqGen.addObject(new ASN1ObjectIdentifier("1.1"));
-       
-       seqGen.close();
-       
-       assertTrue("basic BER writing test failed.", Arrays.equals(berSeqData, bOut.toByteArray()));
-    }
-
-    public void testNestedBERDERWriting()
-        throws Exception
-    {
-       ByteArrayOutputStream bOut = new ByteArrayOutputStream();
-       BERSequenceGenerator seqGen1 = new BERSequenceGenerator(bOut);
-       
-       seqGen1.addObject(new ASN1Integer(BigInteger.valueOf(0)));
-       
-       seqGen1.addObject(new ASN1ObjectIdentifier("1.1"));
-       
-       DERSequenceGenerator seqGen2 = new DERSequenceGenerator(seqGen1.getRawOutputStream());
-       
-       seqGen2.addObject(new ASN1Integer(BigInteger.valueOf(1)));
-       
-       seqGen2.close();
-       
-       seqGen1.close();
-
-       assertTrue("nested BER/DER writing test failed.", Arrays.equals(berDERNestedSeqData, bOut.toByteArray()));
-    }
-    
-    public void testNestedBERWriting()
-        throws Exception
-    {
-       ByteArrayOutputStream bOut = new ByteArrayOutputStream();
-       BERSequenceGenerator  seqGen1 = new BERSequenceGenerator(bOut);
-       
-       seqGen1.addObject(new ASN1Integer(BigInteger.valueOf(0)));
-       
-       seqGen1.addObject(new ASN1ObjectIdentifier("1.1"));
-       
-       BERSequenceGenerator seqGen2 = new BERSequenceGenerator(seqGen1.getRawOutputStream());
-       
-       seqGen2.addObject(new ASN1Integer(BigInteger.valueOf(1)));
-       
-       seqGen2.close();
-       
-       seqGen1.close();
-
-       assertTrue("nested BER writing test failed.", Arrays.equals(berNestedSeqData, bOut.toByteArray()));
-    }
-    
-    public void testDERReading()
-        throws Exception
-    {
-        ASN1StreamParser aIn = new ASN1StreamParser(seqData);
-        
-        ASN1SequenceParser    seq = (ASN1SequenceParser)aIn.readObject();
-        Object          o;
-        int             count = 0;
-        
-        assertNotNull("null sequence returned", seq);
-        
-        while ((o = seq.readObject()) != null)
-        {
-            switch (count)
-            {
-            case 0:
-                assertTrue(o instanceof ASN1Integer);
-                break;
-            case 1:
-                assertTrue(o instanceof ASN1ObjectIdentifier);
-                break;
-            }
-            count++;
-        }
-        
-        assertEquals("wrong number of objects in sequence", 2, count);
-    }
-
-    private void testNestedReading(
-        byte[] data)
-        throws Exception
-    {
-        ASN1StreamParser aIn = new ASN1StreamParser(data);
-        
-        ASN1SequenceParser seq = (ASN1SequenceParser)aIn.readObject();
-        Object          o;
-        int             count = 0;
-        
-        assertNotNull("null sequence returned", seq);
-        
-        while ((o = seq.readObject()) != null)
-        {
-            switch (count)
-            {
-            case 0:
-                assertTrue(o instanceof ASN1Integer);
-                break;
-            case 1:
-                assertTrue(o instanceof ASN1ObjectIdentifier);
-                break;
-            case 2:
-                assertTrue(o instanceof ASN1SequenceParser);
-                
-                ASN1SequenceParser s = (ASN1SequenceParser)o;
-
-                // NB: Must exhaust the nested parser
-                while (s.readObject() != null)
-                {
-                    // Nothing
-                }
-
-                break;
-            }
-            count++;
-        }
-        
-        assertEquals("wrong number of objects in sequence", 3, count);
-    }
-    
-    public void testNestedDERReading()
-        throws Exception
-    {
-        testNestedReading(nestedSeqData);
-    }
-    
-    public void testBERReading()
-        throws Exception
-    {
-        ASN1StreamParser aIn = new ASN1StreamParser(berSeqData);
-        
-        ASN1SequenceParser    seq = (ASN1SequenceParser)aIn.readObject();
-        Object          o;
-        int             count = 0;
-        
-        assertNotNull("null sequence returned", seq);
-        
-        while ((o = seq.readObject()) != null)
-        {
-            switch (count)
-            {
-            case 0:
-                assertTrue(o instanceof ASN1Integer);
-                break;
-            case 1:
-                assertTrue(o instanceof ASN1ObjectIdentifier);
-                break;
-            }
-            count++;
-        }
-        
-        assertEquals("wrong number of objects in sequence", 2, count);
-    }
-    
-    public void testNestedBERDERReading()
-        throws Exception
-    {
-        testNestedReading(berDERNestedSeqData);
-    }
-    
-    public void testNestedBERReading()
-        throws Exception
-    {
-        testNestedReading(berNestedSeqData);
-    }
-    
-    public void testBERExplicitTaggedSequenceWriting()
-        throws Exception
-    {
-       ByteArrayOutputStream bOut = new ByteArrayOutputStream();
-       BERSequenceGenerator  seqGen = new BERSequenceGenerator(bOut, 1, true);
-       
-       seqGen.addObject(new ASN1Integer(BigInteger.valueOf(0)));
-       
-       seqGen.addObject(new ASN1ObjectIdentifier("1.1"));
-       
-       seqGen.close();
-      
-       assertTrue("explicit BER tag writing test failed.", Arrays.equals(berExpTagSeqData, bOut.toByteArray()));
-    }
-
-    public void testSequenceWithDERNullReading()
-        throws Exception
-    {
-        testParseWithNull(berSeqWithDERNullData);
-    }
-
-    private void testParseWithNull(byte[] data)
-        throws IOException
-    {
-        ASN1StreamParser aIn = new ASN1StreamParser(data);
-        ASN1SequenceParser seq = (ASN1SequenceParser)aIn.readObject();
-        Object          o;
-        int             count = 0;
-
-        assertNotNull("null sequence returned", seq);
-
-        while ((o = seq.readObject()) != null)
-        {
-            switch (count)
-            {
-            case 0:
-                assertTrue(o instanceof ASN1Null);
-                break;
-            case 1:
-                assertTrue(o instanceof ASN1Integer);
-                break;
-            case 2:
-                assertTrue(o instanceof ASN1ObjectIdentifier);
-                break;
-            }
-            count++;
-        }
-
-        assertEquals("wrong number of objects in sequence", 3, count);
-    }
-
-    public static Test suite()
-    {
-        return new TestSuite(ASN1SequenceParserTest.class);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/test/ASN1UnitTest.java b/bcprov/src/main/java/org/bouncycastle/asn1/test/ASN1UnitTest.java
deleted file mode 100644
index d51cc6a..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/test/ASN1UnitTest.java
+++ /dev/null
@@ -1,89 +0,0 @@
-package org.bouncycastle.asn1.test;
-
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.util.test.SimpleTest;
-
-import java.math.BigInteger;
-
-public abstract class ASN1UnitTest
-    extends SimpleTest
-{
-    protected void checkMandatoryField(String name, ASN1Encodable expected, ASN1Encodable present)
-    {
-        if (!expected.equals(present))
-        {
-            fail(name + " field doesn't match.");
-        }
-    }
-
-    protected void checkMandatoryField(String name, String expected, String present)
-    {
-        if (!expected.equals(present))
-        {
-            fail(name + " field doesn't match.");
-        }
-    }
-
-    protected void checkMandatoryField(String name, byte[] expected, byte[] present)
-    {
-        if (!areEqual(expected, present))
-        {
-            fail(name + " field doesn't match.");
-        }
-    }
-
-    protected void checkMandatoryField(String name, int expected, int present)
-    {
-        if (expected != present)
-        {
-            fail(name + " field doesn't match.");
-        }
-    }
-
-    protected void checkOptionalField(String name, ASN1Encodable expected, ASN1Encodable present)
-    {
-        if (expected != null)
-        {
-            if (!expected.equals(present))
-            {
-                fail(name + " field doesn't match.");
-            }
-        }
-        else if (present != null)
-        {
-            fail(name + " field found when none expected.");
-        }
-    }
-
-    protected void checkOptionalField(String name, String expected, String present)
-    {
-        if (expected != null)
-        {
-            if (!expected.equals(present))
-            {
-                fail(name + " field doesn't match.");
-            }
-        }
-        else if (present != null)
-        {
-            fail(name + " field found when none expected.");
-        }
-    }
-
-    protected void checkOptionalField(String name, BigInteger expected, BigInteger present)
-    {
-        if (expected != null)
-        {
-            if (!expected.equals(present))
-            {
-                fail(name + " field doesn't match.");
-            }
-        }
-        else if (present != null)
-        {
-            fail(name + " field found when none expected.");
-        }
-    }
-
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/test/AdditionalInformationSyntaxUnitTest.java b/bcprov/src/main/java/org/bouncycastle/asn1/test/AdditionalInformationSyntaxUnitTest.java
deleted file mode 100644
index baf0750..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/test/AdditionalInformationSyntaxUnitTest.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package org.bouncycastle.asn1.test;
-
-import java.io.IOException;
-
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1String;
-import org.bouncycastle.asn1.isismtt.x509.AdditionalInformationSyntax;
-import org.bouncycastle.asn1.x500.DirectoryString;
-
-public class AdditionalInformationSyntaxUnitTest
-    extends ASN1UnitTest
-{
-    public String getName()
-    {
-        return "AdditionalInformationSyntax";
-    }
-
-    public void performTest()
-        throws Exception
-    {
-        AdditionalInformationSyntax syntax = new AdditionalInformationSyntax("hello world");
-
-        checkConstruction(syntax, new DirectoryString("hello world"));
-
-        try
-        {
-            AdditionalInformationSyntax.getInstance(new Object());
-
-            fail("getInstance() failed to detect bad object.");
-        }
-        catch (IllegalArgumentException e)
-        {
-            // expected
-        }
-    }
-
-    private void checkConstruction(
-        AdditionalInformationSyntax syntax,
-        DirectoryString information)
-        throws IOException
-    {
-        checkValues(syntax, information);
-
-        syntax = AdditionalInformationSyntax.getInstance(syntax);
-
-        checkValues(syntax, information);
-
-        ASN1InputStream aIn = new ASN1InputStream(syntax.toASN1Object().getEncoded());
-
-        ASN1String info = (ASN1String)aIn.readObject();
-
-        syntax = AdditionalInformationSyntax.getInstance(info);
-
-        checkValues(syntax, information);
-    }
-
-    private void checkValues(
-        AdditionalInformationSyntax syntax,
-        DirectoryString information)
-    {
-        checkMandatoryField("information", information, syntax.getInformation());
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        runTest(new AdditionalInformationSyntaxUnitTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/test/AdmissionSyntaxUnitTest.java b/bcprov/src/main/java/org/bouncycastle/asn1/test/AdmissionSyntaxUnitTest.java
deleted file mode 100644
index ad0e925..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/test/AdmissionSyntaxUnitTest.java
+++ /dev/null
@@ -1,97 +0,0 @@
-package org.bouncycastle.asn1.test;
-
-import java.io.IOException;
-
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.isismtt.x509.AdmissionSyntax;
-import org.bouncycastle.asn1.isismtt.x509.Admissions;
-import org.bouncycastle.asn1.isismtt.x509.NamingAuthority;
-import org.bouncycastle.asn1.isismtt.x509.ProfessionInfo;
-import org.bouncycastle.asn1.x500.DirectoryString;
-import org.bouncycastle.asn1.x509.GeneralName;
-import org.bouncycastle.asn1.x509.X509Name;
-
-public class AdmissionSyntaxUnitTest
-    extends ASN1UnitTest
-{
-    public String getName()
-    {
-        return "AdmissionSyntax";
-    }
-
-    public void performTest()
-        throws Exception
-    {
-        GeneralName     name = new GeneralName(new X509Name("CN=hello world"));
-        ASN1Sequence    admissions = new DERSequence(
-                                        new Admissions(name,
-                                          new NamingAuthority(new ASN1ObjectIdentifier("1.2.3"), "url", new DirectoryString("fred")),
-                                          new ProfessionInfo[0]));
-        AdmissionSyntax syntax = new AdmissionSyntax(name, admissions);
-
-        checkConstruction(syntax, name, admissions);
-
-        syntax = AdmissionSyntax.getInstance(null);
-
-        if (syntax != null)
-        {
-            fail("null getInstance() failed.");
-        }
-
-        try
-        {
-            AdmissionSyntax.getInstance(new Object());
-
-            fail("getInstance() failed to detect bad object.");
-        }
-        catch (IllegalArgumentException e)
-        {
-            // expected
-        }
-    }
-
-    private void checkConstruction(
-        AdmissionSyntax syntax,
-        GeneralName     authority,
-        ASN1Sequence    admissions)
-        throws IOException
-    {
-        checkValues(syntax, authority, admissions);
-
-        syntax = AdmissionSyntax.getInstance(syntax);
-
-        checkValues(syntax, authority, admissions);
-
-        ASN1InputStream aIn = new ASN1InputStream(syntax.toASN1Object().getEncoded());
-
-        ASN1Sequence info = (ASN1Sequence)aIn.readObject();
-
-        syntax = AdmissionSyntax.getInstance(info);
-
-        checkValues(syntax, authority, admissions);
-    }
-
-    private void checkValues(
-        AdmissionSyntax syntax,
-        GeneralName     authority,
-        ASN1Sequence    admissions)
-    {
-        checkMandatoryField("admissionAuthority", authority, syntax.getAdmissionAuthority());
-
-        Admissions[] adm = syntax.getContentsOfAdmissions();
-
-        if (adm.length != 1 || !adm[0].equals(admissions.getObjectAt(0)))
-        {
-            fail("admissions check failed");
-        }
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        runTest(new AdmissionSyntaxUnitTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/test/AdmissionsUnitTest.java b/bcprov/src/main/java/org/bouncycastle/asn1/test/AdmissionsUnitTest.java
deleted file mode 100644
index 171faec..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/test/AdmissionsUnitTest.java
+++ /dev/null
@@ -1,86 +0,0 @@
-package org.bouncycastle.asn1.test;
-
-import java.io.IOException;
-
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.isismtt.x509.Admissions;
-import org.bouncycastle.asn1.isismtt.x509.NamingAuthority;
-import org.bouncycastle.asn1.isismtt.x509.ProfessionInfo;
-import org.bouncycastle.asn1.x500.DirectoryString;
-import org.bouncycastle.asn1.x509.GeneralName;
-import org.bouncycastle.asn1.x509.X509Name;
-
-public class AdmissionsUnitTest
-    extends ASN1UnitTest
-{
-    public String getName()
-    {
-        return "Admissions";
-    }
-
-    public void performTest()
-        throws Exception
-    {
-        GeneralName name = new GeneralName(new X509Name("CN=hello world"));
-        NamingAuthority auth =  new NamingAuthority(new ASN1ObjectIdentifier("1.2.3"), "url", new DirectoryString("fred"));
-        Admissions  admissions = new Admissions(name, auth, new ProfessionInfo[0]);
-
-        checkConstruction(admissions, name, auth);
-
-        admissions = Admissions.getInstance(null);
-
-        if (admissions != null)
-        {
-            fail("null getInstance() failed.");
-        }
-
-        try
-        {
-            Admissions.getInstance(new Object());
-
-            fail("getInstance() failed to detect bad object.");
-        }
-        catch (IllegalArgumentException e)
-        {
-            // expected
-        }
-    }
-
-    private void checkConstruction(
-        Admissions      admissions,
-        GeneralName     name,
-        NamingAuthority auth)
-        throws IOException
-    {
-        checkValues(admissions, name, auth);
-
-        admissions = Admissions.getInstance(admissions);
-
-        checkValues(admissions, name, auth);
-
-        ASN1InputStream aIn = new ASN1InputStream(admissions.toASN1Object().getEncoded());
-
-        ASN1Sequence info = (ASN1Sequence)aIn.readObject();
-
-        admissions = Admissions.getInstance(info);
-
-        checkValues(admissions, name, auth);
-    }
-
-    private void checkValues(
-        Admissions      admissions,
-        GeneralName     name,
-        NamingAuthority auth)
-    {
-        checkMandatoryField("admissionAuthority", name, admissions.getAdmissionAuthority());
-        checkMandatoryField("namingAuthority", auth, admissions.getNamingAuthority());
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        runTest(new AdmissionsUnitTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/test/AllTests.java b/bcprov/src/main/java/org/bouncycastle/asn1/test/AllTests.java
deleted file mode 100644
index 5b647b3..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/test/AllTests.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package org.bouncycastle.asn1.test;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import org.bouncycastle.util.test.SimpleTestResult;
-
-public class AllTests
-    extends TestCase
-{
-    public void testASN1()
-    {   
-        org.bouncycastle.util.test.Test[] tests = RegressionTest.tests;
-        
-        for (int i = 0; i != tests.length; i++)
-        {
-            SimpleTestResult  result = (SimpleTestResult)tests[i].perform();
-            
-            if (!result.isSuccessful())
-            {
-                fail(result.toString());
-            }
-        }
-    }
-    
-    public static void main (String[] args)
-    {
-        junit.textui.TestRunner.run(suite());
-    }
-    
-    public static Test suite()
-    {
-        TestSuite suite = new TestSuite("ASN.1 Tests");
-        
-        suite.addTestSuite(AllTests.class);
-        suite.addTestSuite(GetInstanceTest.class);
-        suite.addTestSuite(ASN1SequenceParserTest.class);
-        suite.addTestSuite(OctetStringTest.class);
-        suite.addTestSuite(ParseTest.class);
-        
-        return suite;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/test/AttributeTableUnitTest.java b/bcprov/src/main/java/org/bouncycastle/asn1/test/AttributeTableUnitTest.java
deleted file mode 100644
index 337fb1a..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/test/AttributeTableUnitTest.java
+++ /dev/null
@@ -1,144 +0,0 @@
-package org.bouncycastle.asn1.test;
-
-import java.util.Hashtable;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.DERSet;
-import org.bouncycastle.asn1.cms.Attribute;
-import org.bouncycastle.asn1.cms.AttributeTable;
-import org.bouncycastle.util.test.SimpleTest;
-
-public class AttributeTableUnitTest 
-    extends SimpleTest
-{
-    private static final ASN1ObjectIdentifier type1 = new ASN1ObjectIdentifier("1.1.1");
-    private static final ASN1ObjectIdentifier type2 = new ASN1ObjectIdentifier("1.1.2");
-    private static final ASN1ObjectIdentifier type3 = new ASN1ObjectIdentifier("1.1.3");
-    
-    public String getName()
-    {
-        return "AttributeTable";
-    }
-    
-    public void performTest() 
-        throws Exception
-    {
-        ASN1EncodableVector v = new ASN1EncodableVector();
-        
-        v.add(new Attribute(type1, new DERSet(type1)));
-        v.add(new Attribute(type2, new DERSet(type2)));
-        
-        AttributeTable table = new AttributeTable(v);
-        
-        Attribute a = table.get(type1);
-        if (a == null)
-        {
-            fail("type1 attribute not found.");
-        }
-        if (!a.getAttrValues().equals(new DERSet(type1)))
-        {
-            fail("wrong value retrieved for type1!");
-        }
-        
-        a = table.get(type2);
-        if (a == null)
-        {
-            fail("type2 attribute not found.");
-        }
-        if (!a.getAttrValues().equals(new DERSet(type2)))
-        {
-            fail("wrong value retrieved for type2!");
-        }
-        
-        a = table.get(type3);
-        if (a != null)
-        {
-            fail("type3 attribute found when none expected.");
-        }
-        
-        ASN1EncodableVector vec = table.getAll(type1);
-        if (vec.size() != 1)
-        {
-            fail("wrong vector size for type1.");
-        }
-        
-        vec = table.getAll(type3);
-        if (vec.size() != 0)
-        {
-            fail("wrong vector size for type3.");
-        }
-        
-        vec = table.toASN1EncodableVector();
-        if (vec.size() != 2)
-        {
-            fail("wrong vector size for single.");
-        }
-        
-        Hashtable t = table.toHashtable();
-        
-        if (t.size() != 2)
-        {
-            fail("hashtable wrong size.");
-        }
-        
-        // multiple
-        
-        v = new ASN1EncodableVector();
-        
-        v.add(new Attribute(type1, new DERSet(type1)));
-        v.add(new Attribute(type1, new DERSet(type2)));
-        v.add(new Attribute(type1, new DERSet(type3)));
-        v.add(new Attribute(type2, new DERSet(type2)));
-        
-        table = new AttributeTable(v);
-        
-        a = table.get(type1);
-        if (!a.getAttrValues().equals(new DERSet(type1)))
-        {
-            fail("wrong value retrieved for type1 multi get!");
-        }
-        
-        vec = table.getAll(type1);
-        if (vec.size() != 3)
-        {
-            fail("wrong vector size for multiple type1.");
-        }
-        
-        a = (Attribute)vec.get(0);
-        if (!a.getAttrValues().equals(new DERSet(type1)))
-        {
-            fail("wrong value retrieved for type1(0)!");
-        }
-        
-        a = (Attribute)vec.get(1);
-        if (!a.getAttrValues().equals(new DERSet(type2)))
-        {
-            fail("wrong value retrieved for type1(1)!");
-        }
-        
-        a = (Attribute)vec.get(2);
-        if (!a.getAttrValues().equals(new DERSet(type3)))
-        {
-            fail("wrong value retrieved for type1(2)!");
-        }
-        
-        vec = table.getAll(type2);
-        if (vec.size() != 1)
-        {
-            fail("wrong vector size for multiple type2.");
-        }
-        
-        vec = table.toASN1EncodableVector();
-        if (vec.size() != 4)
-        {
-            fail("wrong vector size for multiple.");
-        }
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        runTest(new AttributeTableUnitTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/test/BiometricDataUnitTest.java b/bcprov/src/main/java/org/bouncycastle/asn1/test/BiometricDataUnitTest.java
deleted file mode 100644
index b4c2ea4..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/test/BiometricDataUnitTest.java
+++ /dev/null
@@ -1,133 +0,0 @@
-package org.bouncycastle.asn1.test;
-
-import java.security.SecureRandom;
-
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DERIA5String;
-import org.bouncycastle.asn1.DERNull;
-import org.bouncycastle.asn1.DEROctetString;
-import org.bouncycastle.asn1.oiw.OIWObjectIdentifiers;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.asn1.x509.qualified.BiometricData;
-import org.bouncycastle.asn1.x509.qualified.TypeOfBiometricData;
-import org.bouncycastle.util.test.SimpleTest;
-
-public class BiometricDataUnitTest 
-    extends SimpleTest
-{
-    public String getName()
-    {
-        return "BiometricData";
-    }
-
-    private byte[] generateHash()
-    {
-        SecureRandom rand = new SecureRandom();
-        byte[] bytes = new byte[20];
-        
-        rand.nextBytes(bytes);
-        
-        return bytes;
-    }
-    
-    public void performTest() 
-        throws Exception
-    {
-        TypeOfBiometricData dataType = new TypeOfBiometricData(TypeOfBiometricData.HANDWRITTEN_SIGNATURE);
-        AlgorithmIdentifier hashAlgorithm = new AlgorithmIdentifier(OIWObjectIdentifiers.idSHA1, DERNull.INSTANCE);
-        ASN1OctetString     dataHash = new DEROctetString(generateHash());
-        BiometricData       bd = new BiometricData(dataType, hashAlgorithm, dataHash);
-
-        checkConstruction(bd, dataType, hashAlgorithm, dataHash, null);
-        
-        DERIA5String dataUri = new DERIA5String("http://test");
-        
-        bd = new BiometricData(dataType, hashAlgorithm, dataHash, dataUri);
-        
-        checkConstruction(bd, dataType, hashAlgorithm, dataHash, dataUri);
-        
-        bd = BiometricData.getInstance(null);
-        
-        if (bd != null)
-        {
-            fail("null getInstance() failed.");
-        }
-        
-        try
-        {
-            BiometricData.getInstance(new Object());
-            
-            fail("getInstance() failed to detect bad object.");
-        }
-        catch (IllegalArgumentException e)
-        {
-            // expected
-        }
-    }
-
-    private void checkConstruction(
-        BiometricData bd,
-        TypeOfBiometricData dataType, 
-        AlgorithmIdentifier hashAlgorithm,
-        ASN1OctetString dataHash, 
-        DERIA5String dataUri)
-        throws Exception
-    {
-        checkValues(bd, dataType, hashAlgorithm, dataHash, dataUri);
-
-        bd = BiometricData.getInstance(bd);
-
-        checkValues(bd, dataType, hashAlgorithm, dataHash, dataUri);
-
-        ASN1InputStream aIn = new ASN1InputStream(bd.toASN1Object().getEncoded());
-
-        ASN1Sequence seq = (ASN1Sequence)aIn.readObject();
-
-        bd = BiometricData.getInstance(seq);
-
-        checkValues(bd, dataType, hashAlgorithm, dataHash, dataUri);
-    }
-
-    private void checkValues(
-        BiometricData       bd,
-        TypeOfBiometricData dataType,
-        AlgorithmIdentifier algID,
-        ASN1OctetString     dataHash,
-        DERIA5String        sourceDataURI)
-    {
-        if (!bd.getTypeOfBiometricData().equals(dataType))
-        {
-            fail("types don't match.");
-        }
-        
-        if (!bd.getHashAlgorithm().equals(algID))
-        {
-            fail("hash algorithms don't match.");
-        }
-        
-        if (!bd.getBiometricDataHash().equals(dataHash))
-        {
-            fail("hash algorithms don't match.");
-        }
-        
-        if (sourceDataURI != null)
-        {
-            if (!bd.getSourceDataUri().equals(sourceDataURI))
-            {
-                fail("data uris don't match.");
-            }
-        }
-        else if (bd.getSourceDataUri() != null)
-        {
-            fail("data uri found when none expected.");
-        }
-    }
-    
-    public static void main(
-        String[]    args)
-    {
-        runTest(new BiometricDataUnitTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/test/BitStringConstantTester.java b/bcprov/src/main/java/org/bouncycastle/asn1/test/BitStringConstantTester.java
deleted file mode 100644
index bbea4a3..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/test/BitStringConstantTester.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package org.bouncycastle.asn1.test;
-
-public class BitStringConstantTester
-{
-    private static final int[] bits =
-    { 
-        1 << 7, 1 << 6, 1 << 5, 1 << 4, 1 << 3, 1 << 2, 1 << 1, 1 << 0,
-        1 << 15, 1 << 14, 1 << 13, 1 << 12, 1 << 11, 1 << 10, 1 << 9, 1 << 8,
-        1 << 23, 1 << 22, 1 << 21, 1 << 20, 1 << 19, 1 << 18, 1 << 17, 1 << 16,
-        1 << 31, 1 << 30, 1 << 29, 1 << 28, 1 << 27, 1 << 26, 1 << 25, 1 << 24
-    };
-    
-    public static void testFlagValueCorrect(
-        int bitNo,
-        int value)
-    {
-        if (bits[bitNo] != value)
-        {
-            throw new IllegalArgumentException("bit value " + bitNo + " wrong");
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/test/BitStringTest.java b/bcprov/src/main/java/org/bouncycastle/asn1/test/BitStringTest.java
deleted file mode 100644
index 1cd5bd3..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/test/BitStringTest.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package org.bouncycastle.asn1.test;
-
-import java.io.IOException;
-
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.DERBitString;
-import org.bouncycastle.asn1.x509.KeyUsage;
-import org.bouncycastle.util.test.SimpleTestResult;
-import org.bouncycastle.util.test.Test;
-import org.bouncycastle.util.test.TestResult;
-
-public class BitStringTest
-    implements Test
-{
-    public TestResult perform()
-    {
-        KeyUsage k = new KeyUsage(KeyUsage.digitalSignature);
-        if ((k.getBytes()[0] != (byte)KeyUsage.digitalSignature) || (k.getPadBits() != 7))
-        {
-            return new SimpleTestResult(false, getName() + ": failed digitalSignature");
-        }
-        
-        k = new KeyUsage(KeyUsage.nonRepudiation);
-        if ((k.getBytes()[0] != (byte)KeyUsage.nonRepudiation) || (k.getPadBits() != 6))
-        {
-            return new SimpleTestResult(false, getName() + ": failed nonRepudiation");
-        }
-        
-        k = new KeyUsage(KeyUsage.keyEncipherment);
-        if ((k.getBytes()[0] != (byte)KeyUsage.keyEncipherment) || (k.getPadBits() != 5))
-        {
-            return new SimpleTestResult(false, getName() + ": failed keyEncipherment");
-        }
-        
-        k = new KeyUsage(KeyUsage.cRLSign);
-        if ((k.getBytes()[0] != (byte)KeyUsage.cRLSign)  || (k.getPadBits() != 1))
-        {
-            return new SimpleTestResult(false, getName() + ": failed cRLSign");
-        }
-        
-        k = new KeyUsage(KeyUsage.decipherOnly);
-        if ((k.getBytes()[1] != (byte)(KeyUsage.decipherOnly >> 8))  || (k.getPadBits() != 7))
-        {
-            return new SimpleTestResult(false, getName() + ": failed decipherOnly");
-        }
-
-        // test for zero length bit string
-        try
-        {
-            ASN1Primitive.fromByteArray(new DERBitString(new byte[0], 0).getEncoded());
-        }
-        catch (IOException e)
-        {
-            return new SimpleTestResult(false, getName() + ": " + e);
-        }
-
-        return new SimpleTestResult(true, getName() + ": Okay");
-    }
-
-    public String getName()
-    {
-        return "BitString";
-    }
-
-    public static void main(
-        String[] args)
-    {
-        BitStringTest    test = new BitStringTest();
-        TestResult      result = test.perform();
-
-        System.out.println(result);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/test/CMSTest.java b/bcprov/src/main/java/org/bouncycastle/asn1/test/CMSTest.java
deleted file mode 100644
index 873b27c..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/test/CMSTest.java
+++ /dev/null
@@ -1,358 +0,0 @@
-package org.bouncycastle.asn1.test;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
-
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1OctetStringParser;
-import org.bouncycastle.asn1.ASN1OutputStream;
-import org.bouncycastle.asn1.ASN1SequenceParser;
-import org.bouncycastle.asn1.ASN1Set;
-import org.bouncycastle.asn1.ASN1SetParser;
-import org.bouncycastle.asn1.ASN1StreamParser;
-import org.bouncycastle.asn1.BERTags;
-import org.bouncycastle.asn1.DERSet;
-import org.bouncycastle.asn1.cms.CMSObjectIdentifiers;
-import org.bouncycastle.asn1.cms.CompressedData;
-import org.bouncycastle.asn1.cms.ContentInfo;
-import org.bouncycastle.asn1.cms.ContentInfoParser;
-import org.bouncycastle.asn1.cms.EncryptedContentInfoParser;
-import org.bouncycastle.asn1.cms.EnvelopedData;
-import org.bouncycastle.asn1.cms.EnvelopedDataParser;
-import org.bouncycastle.asn1.cms.KEKRecipientInfo;
-import org.bouncycastle.asn1.cms.KeyTransRecipientInfo;
-import org.bouncycastle.asn1.cms.RecipientInfo;
-import org.bouncycastle.asn1.cms.SignedData;
-import org.bouncycastle.util.encoders.Base64;
-import org.bouncycastle.util.io.Streams;
-import org.bouncycastle.util.test.SimpleTestResult;
-import org.bouncycastle.util.test.Test;
-import org.bouncycastle.util.test.TestResult;
-
-public class CMSTest
-    implements Test
-{
-    //
-    // compressed data object
-    //
-    byte[]  compData = Base64.decode(
-            "MIAGCyqGSIb3DQEJEAEJoIAwgAIBADANBgsqhkiG9w0BCRADCDCABgkqhkiG9w0BBwGggCSABIIC"
-          + "Hnic7ZRdb9owFIbvK/k/5PqVYPFXGK12YYyboVFASSp1vQtZGiLRACZE49/XHoUW7S/0tXP8Efux"
-          + "fU5ivWnasml72XFb3gb5druui7ytN803M570nii7C5r8tfwR281hy/p/KSM3+jzH5s3+pbQ90xSb"
-          + "P3VT3QbLusnt8WPIuN5vN/vaA2+DulnXTXkXvNTr8j8ouZmkCmGI/UW+ZS/C8zP0bz2dz0zwLt+1"
-          + "UEk2M8mlaxjRMByAhZTj0RGYg4TvogiRASROsZgjpVcJCb1KV6QzQeDJ1XkoQ5Jm+C5PbOHZZGRi"
-          + "v+ORAcshOGeCcdFJyfgFxdtCdEcmOrbinc/+BBMzRThEYpwl+jEBpciSGWQkI0TSlREmD/eOHb2D"
-          + "SGLuESm/iKUFt1y4XHBO2a5oq0IKJKWLS9kUZTA7vC5LSxYmgVL46SIWxIfWBQd6AdrnjLmH94UT"
-          + "vGxVibLqRCtIpp4g2qpdtqK1LiOeolpVK5wVQ5P7+QjZAlrh0cePYTx/gNZuB9Vhndtgujl9T/tg"
-          + "W9ogK+3rnmg3YWygnTuF5GDS+Q/jIVLnCcYZFc6Kk/+c80wKwZjwdZIqDYWRH68MuBQSXLgXYXj2"
-          + "3CAaYOBNJMliTl0X7eV5DnoKIFSKYdj3cRpD/cK/JWTHJRe76MUXnfBW8m7Hd5zhQ4ri2NrVF/WL"
-          + "+kV1/3AGSlJ32bFPd2BsQD8uSzIx6lObkjdz95c0AAAAAAAAAAAAAAAA");
-    
-    //
-    // enveloped data
-    //
-    byte[]   envDataKeyTrns = Base64.decode(
-            "MIAGCSqGSIb3DQEHA6CAMIACAQAxgcQwgcECAQAwKjAlMRYwFAYDVQQKEw1Cb3Vu"
-          + "Y3kgQ2FzdGxlMQswCQYDVQQGEwJBVQIBCjANBgkqhkiG9w0BAQEFAASBgC5vdGrB"
-          + "itQSGwifLf3KwPILjaB4WEXgT/IIO1KDzrsbItCJsMA0Smq2y0zptxT0pSRL6JRg"
-          + "NMxLk1ySnrIrvGiEPLMR1zjxlT8yQ6VLX+kEoK43ztd1aaLw0oBfrcXcLN7BEpZ1"
-          + "TIdjlBfXIOx1S88WY1MiYqJJFc3LMwRUaTEDMIAGCSqGSIb3DQEHATAdBglghkgB"
-          + "ZQMEARYEEAfxLMWeaBOTTZQwUq0Y5FuggAQgwOJhL04rjSZCBCSOv5i5XpFfGsOd"
-          + "YSHSqwntGpFqCx4AAAAAAAAAAAAA");
-    
-    byte[]   envDataKEK = Base64.decode(
-            "MIAGCSqGSIb3DQEHA6CAMIACAQIxUqJQAgEEMAcEBQECAwQFMBAGCyqGSIb3DQEJE"
-          + "AMHAgE6BDC7G/HyUPilIrin2Yeajqmj795VoLWETRnZAAFcAiQdoQWyz+oCh6WY/H"
-          + "jHHi+0y+cwgAYJKoZIhvcNAQcBMBQGCCqGSIb3DQMHBAiY3eDBBbF6naCABBiNdzJb"
-          + "/v6+UZB3XXKipxFDUpz9GyjzB+gAAAAAAAAAAAAA");
-
-    byte[] envDataNestedNDEF = Base64.decode(
-          "MIAGCSqGSIb3DQEHA6CAMIACAQAxge8wgewCAQAwgZUwgY8xKDAmBgNVBAoMH1RoZSBMZWdpb24g"
-        + "b2YgdGhlIEJvdW5jeSBDYXN0bGUxLzAtBgkqhkiG9w0BCQEWIGZlZWRiYWNrLWNyeXB0b0Bib3Vu"
-        + "Y3ljYXN0bGUub3JnMREwDwYDVQQIDAhWaWN0b3JpYTESMBAGA1UEBwwJTWVsYm91cm5lMQswCQYD"
-        + "VQQGEwJBVQIBATANBgkqhkiG9w0BAQEFAARABIXMd8xiTyWDKO/LQfvdGYTPW3I9oSQWwtm4OIaN"
-        + "VINpfY2lfwTvbmE6VXiLKeALC0dMBV8z7DEM9hE0HVmvLDCABgkqhkiG9w0BBwEwHQYJYIZIAWUD"
-        + "BAECBBB32ko6WrVxDTqwUYEpV6IUoIAEggKgS6RowrhNlmWWI13zxD/lryxkZ5oWXPUfNiUxYX/P"
-        + "r5iscW3s8VKJKUpJ4W5SNA7JGL4l/5LmSnJ4Qu/xzxcoH4r4vmt75EDE9p2Ob2Xi1NuSFAZubJFc"
-        + "Zlnp4e05UHKikmoaz0PbiAi277sLQlK2FcVsntTYVT00y8+IwuuQu0ATVqkXC+VhfjV/sK6vQZnw"
-        + "2rQKedZhLB7B4dUkmxCujb/UAq4lgSpLMXg2P6wMimTczXyQxRiZxPeI4ByCENjkafXbfcJft2eD"
-        + "gv1DEDdYM5WrW9Z75b4lmJiOJ/xxDniHCvum7KGXzpK1d1mqTlpzPC2xoz08/MO4lRf5Mb0bYdq6"
-        + "CjMaYqVwGsYryp/2ayX+d8H+JphEG+V9Eg8uPcDoibwhDI4KkoyGHstPw5bxcy7vVFt7LXUdNjJc"
-        + "K1wxaUKEXDGKt9Vj93FnBTLMX0Pc9HpueV5o1ipX34dn/P3HZB9XK8ScbrE38B1VnIgylStnhVFO"
-        + "Cj9s7qSVqI2L+xYHJRHsxaMumIRnmRuOqdXDfIo28EZAnFtQ/b9BziMGVvAW5+A8h8s2oazhSmK2"
-        + "23ftV7uv98ScgE8fCd3PwT1kKJM83ThTYyBzokvMfPYCCvsonMV+kTWXhWcwjYTS4ukrpR452ZdW"
-        + "l3aJqDnzobt5FK4T8OGciOj+1PxYFZyRmCuafm2Dx6o7Et2Tu/T5HYvhdY9jHyqtDl2PXH4CTnVi"
-        + "gA1YOAArjPVmsZVwAM3Ml46uyXXhcsXwQ1X0Tv4D+PSa/id4UQ2cObOw8Cj1eW2GB8iJIZVqkZaU"
-        + "XBexqgWYOIoxjqODSeoZKiBsTK3c+oOUBqBDueY1i55swE2o6dDt95FluX6iyr/q4w2wLt3upY1J"
-        + "YL+TuvZxAKviuAczMS1bAAAAAAAAAAAAAA==");
-
-    //
-    // signed data
-    //
-    byte[]   signedData = Base64.decode(
-            "MIAGCSqGSIb3DQEHAqCAMIACAQExCzAJBgUrDgMCGgUAMIAGCSqGSIb3DQEHAaCA"
-          + "JIAEDEhlbGxvIFdvcmxkIQAAAAAAAKCCBGIwggINMIIBdqADAgECAgEBMA0GCSqG"
-          + "SIb3DQEBBAUAMCUxFjAUBgNVBAoTDUJvdW5jeSBDYXN0bGUxCzAJBgNVBAYTAkFV"
-          + "MB4XDTA0MTAyNDA0MzA1OFoXDTA1MDIwMTA0MzA1OFowJTEWMBQGA1UEChMNQm91"
-          + "bmN5IENhc3RsZTELMAkGA1UEBhMCQVUwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ"
-          + "AoGBAJj3OAshAOgDmPcYZ1jdNSuhOHRH9VhC/PG17FdiInVGc2ulJhEifEQga/uq"
-          + "ZCpSd1nHsJUZKm9k1bVneWzC0941i9Znfxgb2jnXXsa5kwB2KEVESrOWsRjSRtnY"
-          + "iLgqBG0rzpaMn5A5ntu7N0406EesBhe19cjZAageEHGZDbufAgMBAAGjTTBLMB0G"
-          + "A1UdDgQWBBR/iHNKOo6f4ByWFFywRNZ65XSr1jAfBgNVHSMEGDAWgBR/iHNKOo6f"
-          + "4ByWFFywRNZ65XSr1jAJBgNVHRMEAjAAMA0GCSqGSIb3DQEBBAUAA4GBAFMJJ7QO"
-          + "pHo30bnlQ4Ny3PCnK+Se+Gw3TpaYGp84+a8fGD9Dme78G6NEsgvpFGTyoLxvJ4CB"
-          + "84Kzys+1p2HdXzoZiyXAer5S4IwptE3TxxFwKyj28cRrM6dK47DDyXUkV0qwBAMN"
-          + "luwnk/no4K7ilzN2MZk5l7wXyNa9yJ6CHW6dMIICTTCCAbagAwIBAgIBAjANBgkq"
-          + "hkiG9w0BAQQFADAlMRYwFAYDVQQKEw1Cb3VuY3kgQ2FzdGxlMQswCQYDVQQGEwJB"
-          + "VTAeFw0wNDEwMjQwNDMwNTlaFw0wNTAyMDEwNDMwNTlaMGUxGDAWBgNVBAMTD0Vy"
-          + "aWMgSC4gRWNoaWRuYTEkMCIGCSqGSIb3DQEJARYVZXJpY0Bib3VuY3ljYXN0bGUu"
-          + "b3JnMRYwFAYDVQQKEw1Cb3VuY3kgQ2FzdGxlMQswCQYDVQQGEwJBVTCBnzANBgkq"
-          + "hkiG9w0BAQEFAAOBjQAwgYkCgYEAm+5CnGU6W45iUpCsaGkn5gDruZv3j/o7N6ag"
-          + "mRZhikaLG2JF6ECaX13iioVJfmzBsPKxAACWwuTXCoSSXG8viK/qpSHwJpfQHYEh"
-          + "tcC0CxIqlnltv3KQAGwh/PdwpSPvSNnkQBGvtFq++9gnXDBbynfP8b2L2Eis0X9U"
-          + "2y6gFiMCAwEAAaNNMEswHQYDVR0OBBYEFEAmOksnF66FoQm6IQBVN66vJo1TMB8G"
-          + "A1UdIwQYMBaAFH+Ic0o6jp/gHJYUXLBE1nrldKvWMAkGA1UdEwQCMAAwDQYJKoZI"
-          + "hvcNAQEEBQADgYEAEeIjvNkKMPU/ZYCu1TqjGZPEqi+glntg2hC/CF0oGyHFpMuG"
-          + "tMepF3puW+uzKM1s61ar3ahidp3XFhr/GEU/XxK24AolI3yFgxP8PRgUWmQizTQX"
-          + "pWUmhlsBe1uIKVEfNAzCgtYfJQ8HJIKsUCcdWeCKVKs4jRionsek1rozkPExggEv"
-          + "MIIBKwIBATAqMCUxFjAUBgNVBAoTDUJvdW5jeSBDYXN0bGUxCzAJBgNVBAYTAkFV"
-          + "AgECMAkGBSsOAwIaBQCgXTAYBgkqhkiG9w0BCQMxCwYJKoZIhvcNAQcBMBwGCSqG"
-          + "SIb3DQEJBTEPFw0wNDEwMjQwNDMwNTlaMCMGCSqGSIb3DQEJBDEWBBQu973mCM5U"
-          + "BOl9XwQvlfifHCMocTANBgkqhkiG9w0BAQEFAASBgGHbe3/jcZu6b/erRhc3PEji"
-          + "MUO8mEIRiNYBr5/vFNhkry8TrGfOpI45m7gu1MS0/vdas7ykvidl/sNZfO0GphEI"
-          + "UaIjMRT3U6yuTWF4aLpatJbbRsIepJO/B2kdIAbV5SCbZgVDJIPOR2qnruHN2wLF"
-          + "a+fEv4J8wQ8Xwvk0C8iMAAAAAAAA");
-
-    private boolean isSameAs(
-        byte[]  a,
-        byte[]  b)
-    {
-        if (a.length != b.length)
-        {
-            return false;
-        }
-        
-        for (int i = 0; i != a.length; i++)
-        {
-            if (a[i] != b[i])
-            {
-                return false;
-            }
-        }
-        
-        return true;
-    }
-    
-    private TestResult compressionTest()
-    {
-        try
-        {
-            ASN1InputStream aIn = new ASN1InputStream(new ByteArrayInputStream(compData));
-            
-            ContentInfo     info = ContentInfo.getInstance(aIn.readObject());
-            CompressedData  data = CompressedData.getInstance(info.getContent());
-            
-            data = new CompressedData(data.getCompressionAlgorithmIdentifier(), data.getEncapContentInfo());
-            info = new ContentInfo(CMSObjectIdentifiers.compressedData, data);
-            
-            ByteArrayOutputStream   bOut = new ByteArrayOutputStream();
-            ASN1OutputStream        aOut = new ASN1OutputStream(bOut);
-            
-            aOut.writeObject(info);
-            
-            if (!isSameAs(bOut.toByteArray(), compData))
-            {
-                return new SimpleTestResult(false, getName() + ": CMS compression failed to re-encode");
-            }
-            
-            return new SimpleTestResult(true, getName() + ": Okay");
-        }
-        catch (Exception e)
-        {
-            return new SimpleTestResult(false, getName() + ": CMS compression failed - " + e.toString(), e);
-        }
-    }
-    
-    private TestResult envelopedTest()
-    {
-        try
-        {
-            //
-            // Key trans
-            //
-            ASN1InputStream aIn = new ASN1InputStream(new ByteArrayInputStream(envDataKeyTrns));
-            
-            ContentInfo     info = ContentInfo.getInstance(aIn.readObject());
-            EnvelopedData   envData = EnvelopedData.getInstance(info.getContent());
-            ASN1Set         s = envData.getRecipientInfos();
-            
-            if (s.size() != 1)
-            {
-                return new SimpleTestResult(false, getName() + ": CMS KeyTrans enveloped, wrong number of recipients");
-            }
-            
-            RecipientInfo   recip = RecipientInfo.getInstance(s.getObjectAt(0));
-
-            if (recip.getInfo() instanceof KeyTransRecipientInfo)
-            {
-                KeyTransRecipientInfo   inf = KeyTransRecipientInfo.getInstance(recip.getInfo());
-                
-                inf = new KeyTransRecipientInfo(inf.getRecipientIdentifier(), inf.getKeyEncryptionAlgorithm(), inf.getEncryptedKey());
-                
-                s = new DERSet(new RecipientInfo(inf));
-            }
-            else
-            {
-                return new SimpleTestResult(false, getName() + ": CMS KeyTrans enveloped, wrong recipient type");
-            }
-
-            ByteArrayOutputStream   bOut = new ByteArrayOutputStream();
-            ASN1OutputStream        aOut = new ASN1OutputStream(bOut);
-            
-            envData = new EnvelopedData(envData.getOriginatorInfo(), s, envData.getEncryptedContentInfo(), envData.getUnprotectedAttrs());
-            info = new ContentInfo(CMSObjectIdentifiers.envelopedData, envData);
-            
-            aOut.writeObject(info);
-            
-            if (!isSameAs(bOut.toByteArray(), envDataKeyTrns))
-            {
-                return new SimpleTestResult(false, getName() + ": CMS KeyTrans enveloped failed to re-encode");
-            }
-            
-            //
-            // KEK
-            //
-            aIn = new ASN1InputStream(new ByteArrayInputStream(envDataKEK));
-            
-            info = ContentInfo.getInstance(aIn.readObject());
-            envData = EnvelopedData.getInstance(info.getContent());
-            s = envData.getRecipientInfos();
-            
-            if (s.size() != 1)
-            {
-                return new SimpleTestResult(false, getName() + ": CMS KEK enveloped, wrong number of recipients");
-            }
-            
-            recip = RecipientInfo.getInstance(s.getObjectAt(0));
-
-            if (recip.getInfo() instanceof KEKRecipientInfo)
-            {
-                KEKRecipientInfo   inf = KEKRecipientInfo.getInstance(recip.getInfo());
-                
-                inf = new KEKRecipientInfo(inf.getKekid(), inf.getKeyEncryptionAlgorithm(), inf.getEncryptedKey());
-                
-                s = new DERSet(new RecipientInfo(inf));
-            }
-            else
-            {
-                return new SimpleTestResult(false, getName() + ": CMS KEK enveloped, wrong recipient type");
-            }
-            
-            bOut = new ByteArrayOutputStream();
-            aOut = new ASN1OutputStream(bOut);
-            
-            envData = new EnvelopedData(envData.getOriginatorInfo(), s, envData.getEncryptedContentInfo(), envData.getUnprotectedAttrs());
-            info = new ContentInfo(CMSObjectIdentifiers.envelopedData, envData);
-            
-            aOut.writeObject(info);
-            
-            if (!isSameAs(bOut.toByteArray(), envDataKEK))
-            {                                                         System.out.println(new String(Base64.encode(bOut.toByteArray())));
-                return new SimpleTestResult(false, getName() + ": CMS KEK enveloped failed to re-encode");
-            }
-
-            // Nested NDEF problem
-            ASN1StreamParser asn1In = new ASN1StreamParser(new ByteArrayInputStream(envDataNestedNDEF));
-            ContentInfoParser ci = new ContentInfoParser((ASN1SequenceParser)asn1In.readObject());
-            EnvelopedDataParser ed = new EnvelopedDataParser((ASN1SequenceParser)ci
-                .getContent(BERTags.SEQUENCE));
-            ed.getVersion();
-            ed.getOriginatorInfo();
-            ed.getRecipientInfos().toASN1Primitive();
-            EncryptedContentInfoParser eci = ed.getEncryptedContentInfo();
-            eci.getContentType();
-            eci.getContentEncryptionAlgorithm();
-
-            InputStream dataIn = ((ASN1OctetStringParser)eci.getEncryptedContent(BERTags.OCTET_STRING))
-                .getOctetStream();
-            Streams.drain(dataIn);
-            dataIn.close();
-
-            // Test data doesn't have unprotected attrs, bug was being thrown by this call
-            ASN1SetParser upa = ed.getUnprotectedAttrs();
-            if (upa != null)
-            {
-                upa.toASN1Primitive();
-            }
-
-            return new SimpleTestResult(true, getName() + ": Okay");
-        }
-        catch (Exception e)
-        {
-            return new SimpleTestResult(false, getName() + ": CMS enveloped failed - " + e.toString(), e);
-        }
-    }
-    
-    private TestResult signedTest()
-    {
-        try
-        {
-            ASN1InputStream aIn = new ASN1InputStream(new ByteArrayInputStream(signedData));
-            
-            ContentInfo     info = ContentInfo.getInstance(aIn.readObject());
-            SignedData      sData = SignedData.getInstance(info.getContent());
-            
-            ByteArrayOutputStream   bOut = new ByteArrayOutputStream();
-            ASN1OutputStream        aOut = new ASN1OutputStream(bOut);
-            
-            sData = new SignedData(sData.getDigestAlgorithms(), sData.getEncapContentInfo(), sData.getCertificates(), sData.getCRLs(), sData.getSignerInfos());
-            info = new ContentInfo(CMSObjectIdentifiers.signedData, sData);
-            
-            aOut.writeObject(info);
-            
-            if (!isSameAs(bOut.toByteArray(), signedData))
-            {
-                return new SimpleTestResult(false, getName() + ": CMS signed failed to re-encode");
-            }
-            
-            return new SimpleTestResult(true, getName() + ": Okay");
-        }
-        catch (Exception e)
-        {
-            return new SimpleTestResult(false, getName() + ": CMS signed failed - " + e.toString(), e);
-        }
-    }
-    
-    public TestResult perform()
-    {
-        TestResult  res = compressionTest();
-        
-        if (!res.isSuccessful())
-        {
-            return res;
-        }
-        
-        res = envelopedTest();
-        if (!res.isSuccessful())
-        {
-            return res;
-        }
-        
-        return signedTest();
-    }
-
-    public String getName()
-    {
-        return "CMS";
-    }
-
-    public static void main(
-        String[] args)
-    {
-        CMSTest    test = new CMSTest();
-        TestResult result = test.perform();
-
-        System.out.println(result);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/test/CertHashUnitTest.java b/bcprov/src/main/java/org/bouncycastle/asn1/test/CertHashUnitTest.java
deleted file mode 100644
index 62c81d4..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/test/CertHashUnitTest.java
+++ /dev/null
@@ -1,84 +0,0 @@
-package org.bouncycastle.asn1.test;
-
-import java.io.IOException;
-
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.isismtt.ocsp.CertHash;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-
-public class CertHashUnitTest
-    extends ASN1UnitTest
-{
-    public String getName()
-    {
-        return "CertHash";
-    }
-
-    public void performTest()
-        throws Exception
-    {
-        AlgorithmIdentifier algId = new AlgorithmIdentifier(new ASN1ObjectIdentifier("1.2.2.3"));
-        byte[]              digest = new byte[20];
-        
-        CertHash certID = new CertHash(algId, digest);
-
-        checkConstruction(certID, algId, digest);
-
-        certID = CertHash.getInstance(null);
-
-        if (certID != null)
-        {
-            fail("null getInstance() failed.");
-        }
-
-        try
-        {
-            CertHash.getInstance(new Object());
-
-            fail("getInstance() failed to detect bad object.");
-        }
-        catch (IllegalArgumentException e)
-        {
-            // expected
-        }
-    }
-
-    private void checkConstruction(
-        CertHash certHash,
-        AlgorithmIdentifier algId,
-        byte[] digest)
-        throws IOException
-    {
-        checkValues(certHash, algId, digest);
-
-        certHash = CertHash.getInstance(certHash);
-
-        checkValues(certHash, algId, digest);
-
-        ASN1InputStream aIn = new ASN1InputStream(certHash.toASN1Object().getEncoded());
-
-        ASN1Sequence seq = (ASN1Sequence)aIn.readObject();
-
-        certHash = CertHash.getInstance(seq);
-
-        checkValues(certHash, algId, digest);
-    }
-
-    private void checkValues(
-        CertHash certHash,
-        AlgorithmIdentifier algId,
-        byte[] digest)
-    {
-        checkMandatoryField("algorithmHash", algId, certHash.getHashAlgorithm());
-
-        checkMandatoryField("certificateHash", digest, certHash.getCertificateHash());
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        runTest(new CertHashUnitTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/test/CertificateTest.java b/bcprov/src/main/java/org/bouncycastle/asn1/test/CertificateTest.java
deleted file mode 100644
index 6aa8cef..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/test/CertificateTest.java
+++ /dev/null
@@ -1,602 +0,0 @@
-package org.bouncycastle.asn1.test;
-
-import java.io.ByteArrayInputStream;
-import java.util.Enumeration;
-
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.asn1.x509.AttCertIssuer;
-import org.bouncycastle.asn1.x509.AttCertValidityPeriod;
-import org.bouncycastle.asn1.x509.Attribute;
-import org.bouncycastle.asn1.x509.AttributeCertificate;
-import org.bouncycastle.asn1.x509.AttributeCertificateInfo;
-import org.bouncycastle.asn1.x509.AuthorityKeyIdentifier;
-import org.bouncycastle.asn1.x509.BasicConstraints;
-import org.bouncycastle.asn1.x509.CRLDistPoint;
-import org.bouncycastle.asn1.x509.Certificate;
-import org.bouncycastle.asn1.x509.DistributionPoint;
-import org.bouncycastle.asn1.x509.ExtendedKeyUsage;
-import org.bouncycastle.asn1.x509.Extension;
-import org.bouncycastle.asn1.x509.Extensions;
-import org.bouncycastle.asn1.x509.GeneralName;
-import org.bouncycastle.asn1.x509.GeneralNames;
-import org.bouncycastle.asn1.x509.Holder;
-import org.bouncycastle.asn1.x509.KeyPurposeId;
-import org.bouncycastle.asn1.x509.KeyUsage;
-import org.bouncycastle.asn1.x509.PolicyInformation;
-import org.bouncycastle.asn1.x509.SubjectKeyIdentifier;
-import org.bouncycastle.asn1.x509.TBSCertificate;
-import org.bouncycastle.util.encoders.Base64;
-import org.bouncycastle.util.test.SimpleTest;
-
-public class CertificateTest
-    extends SimpleTest
-{
-    //
-    // server.crt
-    //
-    byte[]  cert1 = Base64.decode(
-           "MIIDXjCCAsegAwIBAgIBBzANBgkqhkiG9w0BAQQFADCBtzELMAkGA1UEBhMCQVUx"
-         + "ETAPBgNVBAgTCFZpY3RvcmlhMRgwFgYDVQQHEw9Tb3V0aCBNZWxib3VybmUxGjAY"
-         + "BgNVBAoTEUNvbm5lY3QgNCBQdHkgTHRkMR4wHAYDVQQLExVDZXJ0aWZpY2F0ZSBB"
-         + "dXRob3JpdHkxFTATBgNVBAMTDENvbm5lY3QgNCBDQTEoMCYGCSqGSIb3DQEJARYZ"
-         + "d2VibWFzdGVyQGNvbm5lY3Q0LmNvbS5hdTAeFw0wMDA2MDIwNzU2MjFaFw0wMTA2"
-         + "MDIwNzU2MjFaMIG4MQswCQYDVQQGEwJBVTERMA8GA1UECBMIVmljdG9yaWExGDAW"
-         + "BgNVBAcTD1NvdXRoIE1lbGJvdXJuZTEaMBgGA1UEChMRQ29ubmVjdCA0IFB0eSBM"
-         + "dGQxFzAVBgNVBAsTDldlYnNlcnZlciBUZWFtMR0wGwYDVQQDExR3d3cyLmNvbm5l"
-         + "Y3Q0LmNvbS5hdTEoMCYGCSqGSIb3DQEJARYZd2VibWFzdGVyQGNvbm5lY3Q0LmNv"
-         + "bS5hdTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEArvDxclKAhyv7Q/Wmr2re"
-         + "Gw4XL9Cnh9e+6VgWy2AWNy/MVeXdlxzd7QAuc1eOWQkGQEiLPy5XQtTY+sBUJ3AO"
-         + "Rvd2fEVJIcjf29ey7bYua9J/vz5MG2KYo9/WCHIwqD9mmG9g0xLcfwq/s8ZJBswE"
-         + "7sb85VU+h94PTvsWOsWuKaECAwEAAaN3MHUwJAYDVR0RBB0wG4EZd2VibWFzdGVy"
-         + "QGNvbm5lY3Q0LmNvbS5hdTA6BglghkgBhvhCAQ0ELRYrbW9kX3NzbCBnZW5lcmF0"
-         + "ZWQgY3VzdG9tIHNlcnZlciBjZXJ0aWZpY2F0ZTARBglghkgBhvhCAQEEBAMCBkAw"
-         + "DQYJKoZIhvcNAQEEBQADgYEAotccfKpwSsIxM1Hae8DR7M/Rw8dg/RqOWx45HNVL"
-         + "iBS4/3N/TO195yeQKbfmzbAA2jbPVvIvGgTxPgO1MP4ZgvgRhasaa0qCJCkWvpM4"
-         + "yQf33vOiYQbpv4rTwzU8AmRlBG45WdjyNIigGV+oRc61aKCTnLq7zB8N3z1TF/bF"
-         + "5/8=");
-
-    //
-    // ca.crt
-    //
-    byte[]  cert2 = Base64.decode(
-           "MIIDbDCCAtWgAwIBAgIBADANBgkqhkiG9w0BAQQFADCBtzELMAkGA1UEBhMCQVUx"
-         + "ETAPBgNVBAgTCFZpY3RvcmlhMRgwFgYDVQQHEw9Tb3V0aCBNZWxib3VybmUxGjAY"
-         + "BgNVBAoTEUNvbm5lY3QgNCBQdHkgTHRkMR4wHAYDVQQLExVDZXJ0aWZpY2F0ZSBB"
-         + "dXRob3JpdHkxFTATBgNVBAMTDENvbm5lY3QgNCBDQTEoMCYGCSqGSIb3DQEJARYZ"
-         + "d2VibWFzdGVyQGNvbm5lY3Q0LmNvbS5hdTAeFw0wMDA2MDIwNzU1MzNaFw0wMTA2"
-         + "MDIwNzU1MzNaMIG3MQswCQYDVQQGEwJBVTERMA8GA1UECBMIVmljdG9yaWExGDAW"
-         + "BgNVBAcTD1NvdXRoIE1lbGJvdXJuZTEaMBgGA1UEChMRQ29ubmVjdCA0IFB0eSBM"
-         + "dGQxHjAcBgNVBAsTFUNlcnRpZmljYXRlIEF1dGhvcml0eTEVMBMGA1UEAxMMQ29u"
-         + "bmVjdCA0IENBMSgwJgYJKoZIhvcNAQkBFhl3ZWJtYXN0ZXJAY29ubmVjdDQuY29t"
-         + "LmF1MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDgs5ptNG6Qv1ZpCDuUNGmv"
-         + "rhjqMDPd3ri8JzZNRiiFlBA4e6/ReaO1U8ASewDeQMH6i9R6degFdQRLngbuJP0s"
-         + "xcEE+SksEWNvygfzLwV9J/q+TQDyJYK52utb++lS0b48A1KPLwEsyL6kOAgelbur"
-         + "ukwxowprKUIV7Knf1ajetQIDAQABo4GFMIGCMCQGA1UdEQQdMBuBGXdlYm1hc3Rl"
-         + "ckBjb25uZWN0NC5jb20uYXUwDwYDVR0TBAgwBgEB/wIBADA2BglghkgBhvhCAQ0E"
-         + "KRYnbW9kX3NzbCBnZW5lcmF0ZWQgY3VzdG9tIENBIGNlcnRpZmljYXRlMBEGCWCG"
-         + "SAGG+EIBAQQEAwICBDANBgkqhkiG9w0BAQQFAAOBgQCsGvfdghH8pPhlwm1r3pQk"
-         + "msnLAVIBb01EhbXm2861iXZfWqGQjrGAaA0ZpXNk9oo110yxoqEoSJSzniZa7Xtz"
-         + "soTwNUpE0SLHvWf/SlKdFWlzXA+vOZbzEv4UmjeelekTm7lc01EEa5QRVzOxHFtQ"
-         + "DhkaJ8VqOMajkQFma2r9iA==");
-
-    //
-    // testx509.pem
-    //
-    byte[]  cert3 = Base64.decode(
-           "MIIBWzCCAQYCARgwDQYJKoZIhvcNAQEEBQAwODELMAkGA1UEBhMCQVUxDDAKBgNV"
-         + "BAgTA1FMRDEbMBkGA1UEAxMSU1NMZWF5L3JzYSB0ZXN0IENBMB4XDTk1MDYxOTIz"
-         + "MzMxMloXDTk1MDcxNzIzMzMxMlowOjELMAkGA1UEBhMCQVUxDDAKBgNVBAgTA1FM"
-         + "RDEdMBsGA1UEAxMUU1NMZWF5L3JzYSB0ZXN0IGNlcnQwXDANBgkqhkiG9w0BAQEF"
-         + "AANLADBIAkEAqtt6qS5GTxVxGZYWa0/4u+IwHf7p2LNZbcPBp9/OfIcYAXBQn8hO"
-         + "/Re1uwLKXdCjIoaGs4DLdG88rkzfyK5dPQIDAQABMAwGCCqGSIb3DQIFBQADQQAE"
-         + "Wc7EcF8po2/ZO6kNCwK/ICH6DobgLekA5lSLr5EvuioZniZp5lFzAw4+YzPQ7XKJ"
-         + "zl9HYIMxATFyqSiD9jsx");
-
-    //
-    // v3-cert1.pem
-    //
-    byte[]  cert4 = Base64.decode(
-           "MIICjTCCAfigAwIBAgIEMaYgRzALBgkqhkiG9w0BAQQwRTELMAkGA1UEBhMCVVMx"
-         + "NjA0BgNVBAoTLU5hdGlvbmFsIEFlcm9uYXV0aWNzIGFuZCBTcGFjZSBBZG1pbmlz"
-         + "dHJhdGlvbjAmFxE5NjA1MjgxMzQ5MDUrMDgwMBcROTgwNTI4MTM0OTA1KzA4MDAw"
-         + "ZzELMAkGA1UEBhMCVVMxNjA0BgNVBAoTLU5hdGlvbmFsIEFlcm9uYXV0aWNzIGFu"
-         + "ZCBTcGFjZSBBZG1pbmlzdHJhdGlvbjEgMAkGA1UEBRMCMTYwEwYDVQQDEwxTdGV2"
-         + "ZSBTY2hvY2gwWDALBgkqhkiG9w0BAQEDSQAwRgJBALrAwyYdgxmzNP/ts0Uyf6Bp"
-         + "miJYktU/w4NG67ULaN4B5CnEz7k57s9o3YY3LecETgQ5iQHmkwlYDTL2fTgVfw0C"
-         + "AQOjgaswgagwZAYDVR0ZAQH/BFowWDBWMFQxCzAJBgNVBAYTAlVTMTYwNAYDVQQK"
-         + "Ey1OYXRpb25hbCBBZXJvbmF1dGljcyBhbmQgU3BhY2UgQWRtaW5pc3RyYXRpb24x"
-         + "DTALBgNVBAMTBENSTDEwFwYDVR0BAQH/BA0wC4AJODMyOTcwODEwMBgGA1UdAgQR"
-         + "MA8ECTgzMjk3MDgyM4ACBSAwDQYDVR0KBAYwBAMCBkAwCwYJKoZIhvcNAQEEA4GB"
-         + "AH2y1VCEw/A4zaXzSYZJTTUi3uawbbFiS2yxHvgf28+8Js0OHXk1H1w2d6qOHH21"
-         + "X82tZXd/0JtG0g1T9usFFBDvYK8O0ebgz/P5ELJnBL2+atObEuJy1ZZ0pBDWINR3"
-         + "WkDNLCGiTkCKp0F5EWIrVDwh54NNevkCQRZita+z4IBO");
-
-    //
-    // v3-cert2.pem
-    //
-    byte[]  cert5 = Base64.decode(
-           "MIICiTCCAfKgAwIBAgIEMeZfHzANBgkqhkiG9w0BAQQFADB9MQswCQYDVQQGEwJD"
-         + "YTEPMA0GA1UEBxMGTmVwZWFuMR4wHAYDVQQLExVObyBMaWFiaWxpdHkgQWNjZXB0"
-         + "ZWQxHzAdBgNVBAoTFkZvciBEZW1vIFB1cnBvc2VzIE9ubHkxHDAaBgNVBAMTE0Vu"
-         + "dHJ1c3QgRGVtbyBXZWIgQ0EwHhcNOTYwNzEyMTQyMDE1WhcNOTYxMDEyMTQyMDE1"
-         + "WjB0MSQwIgYJKoZIhvcNAQkBExVjb29rZUBpc3NsLmF0bC5ocC5jb20xCzAJBgNV"
-         + "BAYTAlVTMScwJQYDVQQLEx5IZXdsZXR0IFBhY2thcmQgQ29tcGFueSAoSVNTTCkx"
-         + "FjAUBgNVBAMTDVBhdWwgQS4gQ29va2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEA"
-         + "6ceSq9a9AU6g+zBwaL/yVmW1/9EE8s5you1mgjHnj0wAILuoB3L6rm6jmFRy7QZT"
-         + "G43IhVZdDua4e+5/n1ZslwIDAQABo2MwYTARBglghkgBhvhCAQEEBAMCB4AwTAYJ"
-         + "YIZIAYb4QgENBD8WPVRoaXMgY2VydGlmaWNhdGUgaXMgb25seSBpbnRlbmRlZCBm"
-         + "b3IgZGVtb25zdHJhdGlvbiBwdXJwb3Nlcy4wDQYJKoZIhvcNAQEEBQADgYEAi8qc"
-         + "F3zfFqy1sV8NhjwLVwOKuSfhR/Z8mbIEUeSTlnH3QbYt3HWZQ+vXI8mvtZoBc2Fz"
-         + "lexKeIkAZXCesqGbs6z6nCt16P6tmdfbZF3I3AWzLquPcOXjPf4HgstkyvVBn0Ap"
-         + "jAFN418KF/Cx4qyHB4cjdvLrRjjQLnb2+ibo7QU=");
-
-   byte[] cert6 = Base64.decode(
-       "MIIEDjCCAvagAwIBAgIEFAAq2jANBgkqhkiG9w0BAQUFADBLMSowKAYDVQQDEyFT"
-    + "dW4gTWljcm9zeXN0ZW1zIEluYyBDQSAoQ2xhc3MgQikxHTAbBgNVBAoTFFN1biBN"
-    + "aWNyb3N5c3RlbXMgSW5jMB4XDTA0MDIyOTAwNDMzNFoXDTA5MDMwMTAwNDMzNFow"
-    + "NzEdMBsGA1UEChMUU3VuIE1pY3Jvc3lzdGVtcyBJbmMxFjAUBgNVBAMTDXN0b3Jl"
-    + "LnN1bi5jb20wgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAP9ErzFT7MPg2bVV"
-    + "LNmHTgN4kmiRNlPpuLGWS7EDIXYBbLeSSOCp/e1ANcOGnsuf0WIq9ejd/CPyEfh4"
-    + "sWoVvQzpOfHZ/Jyei29PEuxzWT+4kQmCx3+sLK25lAnDFsz1KiFmB6Y3GJ/JSjpp"
-    + "L0Yy1R9YlIc82I8gSw44y5JDABW5AgMBAAGjggGQMIIBjDAOBgNVHQ8BAf8EBAMC"
-    + "BaAwHQYDVR0OBBYEFG1WB3PApZM7OPPVWJ31UrERaoKWMEcGA1UdIARAMD4wPAYL"
-    + "YIZIAYb3AIN9k18wLTArBggrBgEFBQcCARYfaHR0cDovL3d3dy5zdW4uY29tL3Br"
-    + "aS9jcHMuaHRtbDCBhQYDVR0fBH4wfDB6oCegJYYjaHR0cDovL3d3dy5zdW4uY29t"
-    + "L3BraS9wa2lzbWljYS5jcmyiT6RNMEsxKjAoBgNVBAMTIVN1biBNaWNyb3N5c3Rl"
-    + "bXMgSW5jIENBIChDbGFzcyBCKTEdMBsGA1UEChMUU3VuIE1pY3Jvc3lzdGVtcyBJ"
-    + "bmMwHwYDVR0jBBgwFoAUT7ZnqR/EEBSgG6h1wdYMI5RiiWswVAYIKwYBBQUHAQEE"
-    + "SDBGMB0GCCsGAQUFBzABhhFodHRwOi8vdmEuc3VuLmNvbTAlBggrBgEFBQcwAYYZ"
-    + "aHR0cDovL3ZhLmNlbnRyYWwuc3VuLmNvbTATBgNVHSUEDDAKBggrBgEFBQcDATAN"
-    + "BgkqhkiG9w0BAQUFAAOCAQEAq3byQgyU24tBpR07iQK7agm1zQyzDQ6itdbji0ln"
-    + "T7fOd5Pnp99iig8ovwWliNtXKAmgtJY60jWz7nEuk38AioZJhS+RPWIWX/+2PRV7"
-    + "s2aWTzM3n43BypD+jU2qF9c9kDWP/NW9K9IcrS7SfU/2MZVmiCMD/9FEL+CWndwE"
-    + "JJQ/oenXm44BFISI/NjV7fMckN8EayPvgtzQkD5KnEiggOD6HOrwTDFR+tmAEJ0K"
-    + "ZttQNwOzCOcEdxXTg6qBHUbONdL7bjTT5NzV+JR/bnfiCqHzdnGwfbHzhmrnXw8j"
-    + "QCVXcfBfL9++nmpNNRlnJMRdYGeCY6OAfh/PRo8/fXak1Q==");
-   
-   byte[] cert7 = Base64.decode(
-     "MIIFJDCCBAygAwIBAgIKEcJZuwAAAAAABzANBgkqhkiG9w0BAQUFADAPMQ0wCwYD"
-    + "VQQDEwRNU0NBMB4XDTA0MDUyMjE2MTM1OFoXDTA1MDUyMjE2MjM1OFowaTEbMBkG"
-    + "CSqGSIb3DQEJCBMMMTkyLjE2OC4xLjMzMScwJQYJKoZIhvcNAQkCExhwaXhmaXJl"
-    + "d2FsbC5jaXNjb3BpeC5jb20xITAfBgNVBAMTGHBpeGZpcmV3YWxsLmNpc2NvcGl4"
-    + "LmNvbTB8MA0GCSqGSIb3DQEBAQUAA2sAMGgCYQCbcsY7vrjweXZiFQdhUafEjJV+"
-    + "HRy5UKmuCy0237ffmYrN+XNLw0h90cdCSK6KPZebd2E2Bc2UmTikc/FY8meBT3/E"
-    + "O/Osmywzi++Ur8/IrDvtuR1zd0c/xEPnV1ZRezkCAwEAAaOCAs4wggLKMAsGA1Ud"
-    + "DwQEAwIFoDAdBgNVHQ4EFgQUzJBSxkQiN9TKvhTMQ1/Aq4gZnHswHwYDVR0jBBgw"
-    + "FoAUMsxzXVh+5UKMNpwNHmqSfcRYfJ4wgfcGA1UdHwSB7zCB7DCB6aCB5qCB44aB"
-    + "r2xkYXA6Ly8vQ049TVNDQSxDTj1NQVVELENOPUNEUCxDTj1QdWJsaWMlMjBLZXkl"
-    + "MjBTZXJ2aWNlcyxDTj1TZXJ2aWNlcyxDTj1Db25maWd1cmF0aW9uLERDPWludCxE"
-    + "Qz1wcmltZWtleSxEQz1zZT9jZXJ0aWZpY2F0ZVJldm9jYXRpb25MaXN0P2Jhc2U/"
-    + "b2JqZWN0Q2xhc3M9Y1JMRGlzdHJpYnV0aW9uUG9pbnSGL2h0dHA6Ly9tYXVkLmlu"
-    + "dC5wcmltZWtleS5zZS9DZXJ0RW5yb2xsL01TQ0EuY3JsMIIBEAYIKwYBBQUHAQEE"
-    + "ggECMIH/MIGqBggrBgEFBQcwAoaBnWxkYXA6Ly8vQ049TVNDQSxDTj1BSUEsQ049"
-    + "UHVibGljJTIwS2V5JTIwU2VydmljZXMsQ049U2VydmljZXMsQ049Q29uZmlndXJh"
-    + "dGlvbixEQz1pbnQsREM9cHJpbWVrZXksREM9c2U/Y0FDZXJ0aWZpY2F0ZT9iYXNl"
-    + "P29iamVjdENsYXNzPWNlcnRpZmljYXRpb25BdXRob3JpdHkwUAYIKwYBBQUHMAKG"
-    + "RGh0dHA6Ly9tYXVkLmludC5wcmltZWtleS5zZS9DZXJ0RW5yb2xsL01BVUQuaW50"
-    + "LnByaW1la2V5LnNlX01TQ0EuY3J0MCwGA1UdEQEB/wQiMCCCGHBpeGZpcmV3YWxs"
-    + "LmNpc2NvcGl4LmNvbYcEwKgBITA/BgkrBgEEAYI3FAIEMh4wAEkAUABTAEUAQwBJ"
-    + "AG4AdABlAHIAbQBlAGQAaQBhAHQAZQBPAGYAZgBsAGkAbgBlMA0GCSqGSIb3DQEB"
-    + "BQUAA4IBAQCa0asiPbObLJjpSz6ndJ7y4KOWMiuuBc/VQBnLr7RBCF3ZlZ6z1+e6"
-    + "dmv8se/z11NgateKfxw69IhLCriA960HEgX9Z61MiVG+DrCFpbQyp8+hPFHoqCZN"
-    + "b7upc8k2OtJW6KPaP9k0DW52YQDIky4Vb2rZeC4AMCorWN+KlndHhr1HFA14HxwA"
-    + "4Mka0FM6HNWnBV2UmTjBZMDr/OrGH1jLYIceAaZK0X2R+/DWXeeqIga8jwP5empq"
-    + "JetYnkXdtTbEh3xL0BX+mZl8vDI+/PGcwox/7YjFmyFWphRMxk9CZ3rF2/FQWMJP"
-    + "YqQpKiQOmQg5NAhcwffLAuVjVVibPYqi");
-
-   byte[] cert8 = Base64.decode(
-     "MIIB0zCCATwCAQEwbqBsMGekZTBjMQswCQYDVQQGEwJERTELMAkGA1UECBMCQlkx"
-    + "EzARBgNVBAcTClJlZ2Vuc2J1cmcxEDAOBgNVBAoTB0FDIFRlc3QxCzAJBgNVBAsT" 
-    + "AkNBMRMwEQYDVQQDEwpBQyBUZXN0IENBAgEBoHYwdKRyMHAxCzAJBgNVBAYTAkRF"
-    + "MQswCQYDVQQIEwJCWTETMBEGA1UEBxMKUmVnZW5zYnVyZzESMBAGA1UEChMJQUMg"
-    + "SXNzdWVyMRowGAYDVQQLExFBQyBJc3N1ZXIgc2VjdGlvbjEPMA0GA1UEAxMGQUMg"
-    + "TWFuMA0GCSqGSIb3DQEBBQUAAgEBMCIYDzIwMDQxMTI2MTI1MjUxWhgPMjAwNDEy"
-    + "MzEyMzAwMDBaMBkwFwYDVRhIMRAwDoEMREFVMTIzNDU2Nzg5MA0GCSqGSIb3DQEB"
-    + "BQUAA4GBABd4Odx3yEMGL/BvItuT1RafNR2uuWuZbajg0pD6bshUsl+WCIfRiEkq"
-    + "lHMkpI7WqAZikdnAEQ5jQsVWEuVejWxR6gjejKxc0fb9qpIui7/GoI5Eh6dmG20e"
-    + "xbwJL3+6YYFrZwxR8cC5rPvWrblUR5XKJy+Zp/H5+t9iANnL1L8J");
-
-    // V1 attribute certificate
-    private static final byte[] attrCertv1 = Base64.decode(
-        "MIIFdDCCBFygXTBbMFOkUTBPMQswCQYDVQQGEwJERTEcMBoGA1UECgwTRGV1"
-      + "dHNjaGUgVGVsZWtvbSBBRzEiMCAGA1UEAwwZVGVsZVNlYyBQS1MgU2lnRyBD"
-      + "QSAxNzpQTgIEG1toDjBTpFEwTzELMAkGA1UEBhMCREUxHDAaBgNVBAoME0Rl"
-      + "dXRzY2hlIFRlbGVrb20gQUcxIjAgBgNVBAMMGVRlbGVTZWMgUEtTIFNpZ0cg"
-      + "Q0EgMjU6UE4wDQYJKoZIhvcNAQELBQACBCep3f0wIhgPMjAxMDA0MTIxMTI5"
-      + "MTJaGA8yMDEyMDQxMjEwNTkyOFowggGmMIIBogYFKyQIAwgxggGXDIIBk1Ro"
-      + "ZSBxdWFsaWZpZWQgc2lnbmF0dXJlIGF0IGhhbmQgaXMgcmVzdHJpY3RlZCB0"
-      + "byBwcmVzZW50aW5nIGludm9pY2VzIG9yIGNyZWRpdHMgdG8gY3VzdG9tZXJz"
-      + "IGFjY29yZGluZyB0byBFVSBDb3VuY2lsIGRpcmVjdGl2ZSAyMDAxLzExNS9F"
-      + "QyAoMjB0aCBEZWNlbWJlciAyMDAxKSBhbmQgR2VybWFuIFZBVCB0YXggKMKn"
-      + "MTQgVVN0RykuICBEaWUgdm9ybGllZ2VuZGUgcXVhbGlmaXppZXJ0ZSBTaWdu"
-      + "YXR1ciBpc3QgYXVmIGRpZSAgUHJhZXNlbnRhdGlvbiB2b24gUmVjaG51bmdl"
-      + "biBvZGVyIEd1dHNjaHJpZnRlbiBnZW1hZXNzIEVVIERpcmVrdGl2ZSAyMDAx"
-      + "LzExNS9FQyAoMjAuIERlemVtYmVyIDIwMDEpIHVuZCBkZXV0c2NoZW0gVW1z"
-      + "YXR6c3RldWVyZ2VzZXR6ICAowqcxNCBVU3RHKSBiZXNjaHJhZW5rdC4wggHB"
-      + "MB8GA1UdIwQYMBaAFM6i1yR/z8IikpxpU/Fdh8BPxhq8MEMGA1UdIAQ8MDow"
-      + "OAYFKyQIAQEwLzAtBggrBgEFBQcCARYhaHR0cDovL3Brcy50ZWxlc2VjLmRl"
-      + "L2Nwcy9jcHMucGRmMIIBBAYDVR0fBIH8MIH5MIH2oG2ga4Y1bGRhcDovL3Br"
-      + "cy1sZGFwLnRlbGVzZWMuZGUvbz1EZXV0c2NoZSBUZWxla29tIEFHLGM9ZGWG"
-      + "Mmh0dHA6Ly9wa3MudGVsZXNlYy5kZS90ZWxlc2VjL3NlcnZsZXQvZG93bmxv"
-      + "YWRfY3JsooGEpIGBMH8xCzAJBgNVBAYTAkRFMRwwGgYDVQQKFBNEZXV0c2No"
-      + "ZSBUZWxla29tIEFHMR8wHQYDVQQLFBZQcm9kdWt0emVudHJ1bSBUZWxlU2Vj"
-      + "MTEwDAYHAoIGAQoHFBMBMTAhBgNVBAMUGlRlbGVTZWMgUEtTIFNpZ0cgRElS"
-      + "IDM1OlBOMDcGCCsGAQUFBwEBBCswKTAnBggrBgEFBQcwAYYbaHR0cDovL3Br"
-      + "cy50ZWxlc2VjLmRlL29jc3ByMBgGCCsGAQUFBwEDBAwwCjAIBgYEAI5GAQEw"
-      + "DQYJKoZIhvcNAQELBQADggEBAEz2OvU9YytJUKHMDQcND5njIyUXTkSrlWjV"
-      + "F28uwxVlveO4JPTAY7PvXy69HUuTPwlvqCfJIUF2RLPZFQx0wFto8ajC9v5X"
-      + "SqwQcINXRakpE6FPAdQFnH44TaIQWXW1hy9xr8GuD0uhQLTJGYqVzHfLoM8e"
-      + "llPNHUVhC7CEOxDb1PTHCUlQFNkFRmeeqzEVoj1F0pM6wI5zf8+w2WwrFPCD"
-      + "jrjEr/VoBRoEi/tKnsLq6oOkizUKT0KJEnSyYxoOa7euT1yX+Co94SPnMZi5"
-      + "qukHSj8Kiio6Jecl//qDPG/mHo1ro+8rH+rbze7EEfKMp5yeWCwXGthL9oYo"
-      + "RYl+UuI=");
-
-
-    // bad issuer certificate
-    private static final byte[] dudCert = Base64.decode(
-        "MIICLzCCAZgCBFp/9TowDQYJKoZIhvcNAQEFBQAwAjEAMB4XDTA4MDcyNTEzNTQ0" +
-        "MFoXDTEzMDgyNTA1MDAwMFowgboxCzAJBgNVBAYTAlVTMQ0wCwYDVQQIEwRJb3dh" +
-        "MRMwEQYDVQQHEwpEZXMgTW9pbmVzMT0wOwYDVQQKEzRTdGF0ZSBvZiBJb3dhLCBE" +
-        "ZXBhcnRtZW50IG9mIEFkbWluaXN0cmF0aXZlIFNlcnZpY2VzMSowKAYDVQQLEyFJ" +
-        "bmZvcm1hdGlvbiBUZWNobm9sb2d5IEVudGVycHJpc2UxHDAaBgNVBAMTE3d3dy5k" +
-        "b20uc3RhdGUuaWEudXMwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAK0C7Jca" +
-        "C0RiD0hcBcPUdGc78y815yPuHGmF/A2K+3LbwfFXDhsY7ebRxHVfL7gt+nFBvJ2r" +
-        "MqDBIMHFB3vYdSnGbND41eso6cLnzkMVtSisG25Tat3F8BF/js54sa0mFEn4qMQ+" +
-        "6T6jxyPflsjKpmi6L7lfRdPNbBbKSmK9ik2lAgMBAAEwDQYJKoZIhvcNAQEFBQAD" +
-        "gYEAc9Rx95MiPzJiCn3nOoP+3PPQCGTyUcUWZfYKXuC7aOzMYUXes71Q3K1/W6Vy" +
-        "V2Tlrbj0KT8j2/kBmy8+7d5whnUklJNsH6VJMst3V4Uxvk3os+uaW0FHsW389sNY" +
-        "/5LdslDjfqV2nUc2GqDPn38PATL26SRJKlCvU2NagdID3WM="
-    );
-
-   String[] subjects = 
-   {
-       "C=AU,ST=Victoria,L=South Melbourne,O=Connect 4 Pty Ltd,OU=Webserver Team,CN=www2.connect4.com.au,E=webmaster@connect4.com.au",
-       "C=AU,ST=Victoria,L=South Melbourne,O=Connect 4 Pty Ltd,OU=Certificate Authority,CN=Connect 4 CA,E=webmaster@connect4.com.au",
-       "C=AU,ST=QLD,CN=SSLeay/rsa test cert",
-       "C=US,O=National Aeronautics and Space Administration,SERIALNUMBER=16+CN=Steve Schoch",
-       "E=cooke@issl.atl.hp.com,C=US,OU=Hewlett Packard Company (ISSL),CN=Paul A. Cooke",
-       "O=Sun Microsystems Inc,CN=store.sun.com",
-       "unstructuredAddress=192.168.1.33,unstructuredName=pixfirewall.ciscopix.com,CN=pixfirewall.ciscopix.com"
-    };
-
-    public String getName()
-    {
-        return "Certificate";
-    }
-
-    public void checkCertificate(
-        int     id,
-        byte[]  cert)
-        throws Exception
-    {
-        ByteArrayInputStream bIn = new ByteArrayInputStream(cert);
-        ASN1InputStream aIn = new ASN1InputStream(bIn);
-
-        ASN1Sequence      seq = (ASN1Sequence)aIn.readObject();
-//        String dump = ASN1Dump.dumpAsString(seq);
-
-        Certificate obj = Certificate.getInstance(seq);
-        TBSCertificate     tbsCert = obj.getTBSCertificate();
-        
-        if (!tbsCert.getSubject().toString().equals(subjects[id - 1]))
-        {
-            fail("failed subject test for certificate id " + id + " got " + tbsCert.getSubject().toString());
-        }
-        
-        if (tbsCert.getVersionNumber() == 3)
-        {
-            Extensions                ext = tbsCert.getExtensions();
-            if (ext != null)
-            {
-                Enumeration    en = ext.oids();
-                while (en.hasMoreElements())
-                {
-                    ASN1ObjectIdentifier oid = (ASN1ObjectIdentifier)en.nextElement();
-                    Extension            extVal = ext.getExtension(oid);
-                    
-                    ASN1OctetString        oct = extVal.getExtnValue();
-                    ASN1InputStream        extIn = new ASN1InputStream(new ByteArrayInputStream(oct.getOctets()));
-                    
-                    if (oid.equals(Extension.subjectKeyIdentifier))
-                    {
-                        SubjectKeyIdentifier si = SubjectKeyIdentifier.getInstance(extIn.readObject());
-
-                        if (!si.equals(SubjectKeyIdentifier.fromExtensions(ext)))
-                        {
-                            fail("SubjectKeyIdentifier not matched");
-                        }
-                    }
-                    else if (oid.equals(Extension.keyUsage))
-                    {
-                        KeyUsage ku = KeyUsage.getInstance(extIn.readObject());
-
-                        if (!ku.equals(KeyUsage.fromExtensions(ext)))
-                        {
-                            fail("KeyUsage not matched");
-                        }
-                    }
-                    else if (oid.equals(Extension.extendedKeyUsage))
-                    {
-                        ExtendedKeyUsage ku = ExtendedKeyUsage.getInstance(extIn.readObject());
-                        
-                        ASN1Sequence    sq = (ASN1Sequence)ku.toASN1Primitive();
-                        for (int i = 0; i != sq.size(); i++)
-                        {
-                            ASN1ObjectIdentifier    p = ASN1ObjectIdentifier.getInstance(KeyPurposeId.getInstance(sq.getObjectAt(i)));
-                        }
-
-                        if (!ku.equals(ExtendedKeyUsage.fromExtensions(ext)))
-                        {
-                            fail("ExtendedKeyUsage not matched");
-                        }
-                    }
-                    else if (oid.equals(Extension.subjectAlternativeName))
-                    {
-                        GeneralNames    gn = GeneralNames.getInstance(extIn.readObject());
-                        
-                        ASN1Sequence    sq = (ASN1Sequence)gn.toASN1Primitive();
-                        for (int i = 0; i != sq.size(); i++)
-                        {
-                            GeneralName    n = GeneralName.getInstance(sq.getObjectAt(i));
-                        }
-                    }
-                    else if (oid.equals(Extension.issuerAlternativeName))
-                    {
-                        GeneralNames    gn = GeneralNames.getInstance(extIn.readObject());
-                        
-                        ASN1Sequence    sq = (ASN1Sequence)gn.toASN1Primitive();
-                        for (int i = 0; i != sq.size(); i++)
-                        {
-                            GeneralName    n = GeneralName.getInstance(sq.getObjectAt(i));
-                        }
-                    }
-                    else if (oid.equals(Extension.cRLDistributionPoints))
-                    {
-                        CRLDistPoint    p = CRLDistPoint.getInstance(extIn.readObject());
-                        
-                        DistributionPoint[] points = p.getDistributionPoints();
-                        for (int i = 0; i != points.length; i++)
-                        {
-                            // do nothing
-                        }
-                    }
-                    else if (oid.equals(Extension.certificatePolicies))
-                    {
-                        ASN1Sequence    cp = (ASN1Sequence)extIn.readObject();
-                        
-                        for (int i = 0; i != cp.size(); i++)
-                        {
-                            PolicyInformation.getInstance(cp.getObjectAt(i));
-                        }
-                    }
-                    else if (oid.equals(Extension.authorityKeyIdentifier))
-                    {
-                        AuthorityKeyIdentifier    auth = AuthorityKeyIdentifier.getInstance(extIn.readObject());
-
-                        if (!auth.equals(AuthorityKeyIdentifier.fromExtensions(ext)))
-                        {
-                            fail("AuthorityKeyIdentifier not matched");
-                        }
-                    }
-                    else if (oid.equals(Extension.basicConstraints))
-                    {
-                        BasicConstraints    bc = BasicConstraints.getInstance(extIn.readObject());
-
-                        if (!bc.equals(BasicConstraints.fromExtensions(ext)))
-                        {
-                            fail("BasicConstraints not matched");
-                        }
-                    }
-                    else
-                    {
-                        //System.out.println(oid.getId());
-                    }
-                }
-            }
-        }
-    }
-
-
-    public void checkAttributeCertificate(
-        int     id,
-        byte[]  cert)
-        throws Exception
-    {
-        ByteArrayInputStream bIn;
-        ASN1InputStream aIn;
-
-        bIn = new ByteArrayInputStream(cert);
-        aIn = new ASN1InputStream(bIn);
-
-        ASN1Sequence seq = (ASN1Sequence) aIn.readObject();
-//        String dump = ASN1Dump.dumpAsString(seq);
-
-        AttributeCertificate obj = AttributeCertificate.getInstance(seq);
-        AttributeCertificateInfo acInfo = obj.getAcinfo();
-
-        // Version
-        if (!(acInfo.getVersion().equals(new ASN1Integer(1)))
-                && (!(acInfo.getVersion().equals(new ASN1Integer(2)))))
-        {
-            fail(
-                    "failed AC Version test for id " + id);
-        }
-
-        // Holder
-        Holder h = acInfo.getHolder();
-        if (h == null)
-        {
-            fail(
-                    "failed AC Holder test, it's null, for id " + id);
-        }
-
-        // Issuer
-        AttCertIssuer aci = acInfo.getIssuer();
-        if (aci == null)
-        {
-            fail(
-                    "failed AC Issuer test, it's null, for id " + id);
-        }
-
-        // Signature
-        AlgorithmIdentifier sig = acInfo.getSignature();
-        if (sig == null)
-        {
-            fail(
-                    "failed AC Signature test for id " + id);
-        }
-
-        // Serial
-        ASN1Integer serial = acInfo.getSerialNumber();
-
-        // Validity
-        AttCertValidityPeriod validity = acInfo.getAttrCertValidityPeriod();
-        if (validity == null)
-        {
-            fail("failed AC AttCertValidityPeriod test for id " + id);
-        }
-
-        // Attributes
-        ASN1Sequence attribSeq = acInfo.getAttributes();
-        Attribute att[] = new Attribute[attribSeq.size()];
-        for (int i = 0; i < attribSeq.size(); i++)
-        {
-            att[i] = Attribute.getInstance(attribSeq.getObjectAt(i));
-        }
-
-        // IssuerUniqueId
-        // TODO, how to best test?
-
-        // X509 Extensions
-        Extensions ext = acInfo.getExtensions();
-        if (ext != null)
-        {
-            Enumeration en = ext.oids();
-            while (en.hasMoreElements())
-            {
-                ASN1ObjectIdentifier oid = (ASN1ObjectIdentifier) en
-                        .nextElement();
-                Extension extVal = ext.getExtension(oid);
-            }
-        }
-    }
-
-    public void checkV1AttributeCertificate(
-        int     id,
-        byte[]  cert)
-        throws Exception
-    {
-        ByteArrayInputStream bIn;
-        ASN1InputStream aIn;
-
-        bIn = new ByteArrayInputStream(cert);
-        aIn = new ASN1InputStream(bIn);
-
-        ASN1Sequence seq = (ASN1Sequence) aIn.readObject();
-        //String dump = ASN1Dump.dumpAsString(seq);
-
-        AttributeCertificate obj = AttributeCertificate.getInstance(seq);
-        AttributeCertificateInfo acInfo = obj.getAcinfo();
-
-        // Version
-        if (!(acInfo.getVersion().equals(new ASN1Integer(0))))
-        {
-            fail(
-                    "failed AC Version test for id " + id);
-        }
-
-        // Holder
-        Holder h = acInfo.getHolder();
-        if (h == null)
-        {
-            fail(
-                    "failed AC Holder test, it's null, for id " + id);
-        }
-
-        // Issuer
-        AttCertIssuer aci = acInfo.getIssuer();
-        if (aci == null)
-        {
-            fail(
-                    "failed AC Issuer test, it's null, for id " + id);
-        }
-
-        // Signature
-        AlgorithmIdentifier sig = acInfo.getSignature();
-        if (sig == null)
-        {
-            fail(
-                    "failed AC Signature test for id " + id);
-        }
-
-        // Serial
-        ASN1Integer serial = acInfo.getSerialNumber();
-
-        // Validity
-        AttCertValidityPeriod validity = acInfo.getAttrCertValidityPeriod();
-        if (validity == null)
-        {
-            fail("failed AC AttCertValidityPeriod test for id " + id);
-        }
-
-        // Attributes
-        ASN1Sequence attribSeq = acInfo.getAttributes();
-        Attribute att[] = new Attribute[attribSeq.size()];
-        for (int i = 0; i < attribSeq.size(); i++)
-        {
-            att[i] = Attribute.getInstance(attribSeq.getObjectAt(i));
-        }
-
-        // IssuerUniqueId
-        // TODO, how to best test?
-
-        // X509 Extensions
-        Extensions ext = acInfo.getExtensions();
-        if (ext != null)
-        {
-            Enumeration en = ext.oids();
-            while (en.hasMoreElements())
-            {
-                ASN1ObjectIdentifier oid = (ASN1ObjectIdentifier) en
-                        .nextElement();
-                Extension extVal = ext.getExtension(oid);
-            }
-        }
-    }
-
-    private void checkDudCertificate()
-    {
-        Certificate cert = Certificate.getInstance(dudCert);
-
-        if (!"".equals(cert.getIssuer().toString()))
-        {
-            fail("empty issuer not recognised correctly");
-        }
-    }
-
-    public void performTest()
-        throws Exception
-    {
-        checkCertificate(1, cert1);
-        checkCertificate(2, cert2);
-        checkCertificate(3, cert3);
-        checkCertificate(4, cert4);
-        checkCertificate(5, cert5);
-        checkCertificate(6, cert6);
-        checkCertificate(7, cert7);
-        checkAttributeCertificate(8,cert8);
-        checkV1AttributeCertificate(9, attrCertv1);
-        checkDudCertificate();
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        runTest(new CertificateTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/test/CommitmentTypeIndicationUnitTest.java b/bcprov/src/main/java/org/bouncycastle/asn1/test/CommitmentTypeIndicationUnitTest.java
deleted file mode 100644
index 0ce1c23..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/test/CommitmentTypeIndicationUnitTest.java
+++ /dev/null
@@ -1,103 +0,0 @@
-package org.bouncycastle.asn1.test;
-
-import java.io.IOException;
-
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.esf.CommitmentTypeIdentifier;
-import org.bouncycastle.asn1.esf.CommitmentTypeIndication;
-import org.bouncycastle.util.test.SimpleTest;
-
-public class CommitmentTypeIndicationUnitTest 
-    extends SimpleTest
-{
-    public String getName()
-    {
-        return "CommitmentTypeIndication";
-    }
-
-    public void performTest() 
-        throws Exception
-    {
-        CommitmentTypeIndication cti = new CommitmentTypeIndication(CommitmentTypeIdentifier.proofOfOrigin);
-        
-        checkConstruction(cti, CommitmentTypeIdentifier.proofOfOrigin, null);
-        
-        ASN1Sequence qualifier = new DERSequence(new ASN1ObjectIdentifier("1.2"));
-        
-        cti = new CommitmentTypeIndication(CommitmentTypeIdentifier.proofOfOrigin, qualifier);
-
-        checkConstruction(cti, CommitmentTypeIdentifier.proofOfOrigin, qualifier);
-        
-        cti = CommitmentTypeIndication.getInstance(null);
-        
-        if (cti != null)
-        {
-            fail("null getInstance() failed.");
-        }
-        
-        try
-        {
-            CommitmentTypeIndication.getInstance(new Object());
-            
-            fail("getInstance() failed to detect bad object.");
-        }
-        catch (IllegalArgumentException e)
-        {
-            // expected
-        }
-    }
-
-    private void checkConstruction(
-         CommitmentTypeIndication mv,
-         ASN1ObjectIdentifier commitmenttTypeId,
-         ASN1Encodable qualifier) 
-         throws IOException
-    {
-        checkStatement(mv, commitmenttTypeId, qualifier);
-        
-        mv = CommitmentTypeIndication.getInstance(mv);
-        
-        checkStatement(mv, commitmenttTypeId, qualifier);
-        
-        ASN1InputStream aIn = new ASN1InputStream(mv.toASN1Object().getEncoded());
-
-        ASN1Sequence seq = (ASN1Sequence)aIn.readObject();
-        
-        mv = CommitmentTypeIndication.getInstance(seq);
-        
-        checkStatement(mv, commitmenttTypeId, qualifier);
-    }
-
-    private void checkStatement(
-        CommitmentTypeIndication cti,
-        ASN1ObjectIdentifier     commitmentTypeId,
-        ASN1Encodable           qualifier)
-    {
-        if (!cti.getCommitmentTypeId().equals(commitmentTypeId))
-        {
-            fail("commitmentTypeIds don't match.");
-        }
-        
-        if (qualifier != null)
-        {
-            if (!cti.getCommitmentTypeQualifier().equals(qualifier))
-            {
-                fail("qualifiers don't match.");
-            }
-        }
-        else if (cti.getCommitmentTypeQualifier() != null)
-        {
-            fail("qualifier found when none expected.");
-        }
-    }
-    
-    public static void main(
-        String[]    args)
-    {
-        runTest(new CommitmentTypeIndicationUnitTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/test/CommitmentTypeQualifierUnitTest.java b/bcprov/src/main/java/org/bouncycastle/asn1/test/CommitmentTypeQualifierUnitTest.java
deleted file mode 100644
index 2d782ba..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/test/CommitmentTypeQualifierUnitTest.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package org.bouncycastle.asn1.test;
-
-import java.io.IOException;
-
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.esf.CommitmentTypeIdentifier;
-import org.bouncycastle.asn1.esf.CommitmentTypeQualifier;
-import org.bouncycastle.util.test.SimpleTest;
-
-public class CommitmentTypeQualifierUnitTest 
-    extends SimpleTest
-{
-    public String getName()
-    {
-        return "CommitmentTypeQualifier";
-    }
-
-    public void performTest() 
-        throws Exception
-    {
-        CommitmentTypeQualifier ctq = new CommitmentTypeQualifier(CommitmentTypeIdentifier.proofOfOrigin);
-        
-        checkConstruction(ctq, CommitmentTypeIdentifier.proofOfOrigin, null);
-        
-        ASN1Encodable info = new ASN1ObjectIdentifier("1.2");
-        
-        ctq = new CommitmentTypeQualifier(CommitmentTypeIdentifier.proofOfOrigin, info);
-
-        checkConstruction(ctq, CommitmentTypeIdentifier.proofOfOrigin, info);
-        
-        ctq = CommitmentTypeQualifier.getInstance(null);
-        
-        if (ctq != null)
-        {
-            fail("null getInstance() failed.");
-        }
-        
-        try
-        {
-            CommitmentTypeQualifier.getInstance(new Object());
-            
-            fail("getInstance() failed to detect bad object.");
-        }
-        catch (IllegalArgumentException e)
-        {
-            // expected
-        }
-    }
-
-    private void checkConstruction(
-         CommitmentTypeQualifier mv,
-         ASN1ObjectIdentifier commitmenttTypeId,
-         ASN1Encodable qualifier) 
-         throws IOException
-    {
-        checkStatement(mv, commitmenttTypeId, qualifier);
-        
-        mv = CommitmentTypeQualifier.getInstance(mv);
-        
-        checkStatement(mv, commitmenttTypeId, qualifier);
-        
-        ASN1InputStream aIn = new ASN1InputStream(mv.toASN1Object().getEncoded());
-
-        ASN1Sequence seq = (ASN1Sequence)aIn.readObject();
-        
-        mv = CommitmentTypeQualifier.getInstance(seq);
-        
-        checkStatement(mv, commitmenttTypeId, qualifier);
-    }
-
-    private void checkStatement(
-        CommitmentTypeQualifier ctq,
-        ASN1ObjectIdentifier     commitmentTypeId,
-        ASN1Encodable           qualifier)
-    {
-        if (!ctq.getCommitmentTypeIdentifier().equals(commitmentTypeId))
-        {
-            fail("commitmentTypeIds don't match.");
-        }
-        
-        if (qualifier != null)
-        {
-            if (!ctq.getQualifier().equals(qualifier))
-            {
-                fail("qualifiers don't match.");
-            }
-        }
-        else if (ctq.getQualifier() != null)
-        {
-            fail("qualifier found when none expected.");
-        }
-    }
-    
-    public static void main(
-        String[]    args)
-    {
-        runTest(new CommitmentTypeQualifierUnitTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/test/ContentHintsUnitTest.java b/bcprov/src/main/java/org/bouncycastle/asn1/test/ContentHintsUnitTest.java
deleted file mode 100644
index 1ae15e7..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/test/ContentHintsUnitTest.java
+++ /dev/null
@@ -1,87 +0,0 @@
-package org.bouncycastle.asn1.test;
-
-import java.io.IOException;
-
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DERUTF8String;
-import org.bouncycastle.asn1.ess.ContentHints;
-
-public class ContentHintsUnitTest
-    extends ASN1UnitTest
-{
-    public String getName()
-    {
-        return "ContentHints";
-    }
-
-    public void performTest()
-        throws Exception
-    {
-        DERUTF8String contentDescription = new DERUTF8String("Description");
-        ASN1ObjectIdentifier contentType = new ASN1ObjectIdentifier("1.2.2.3");
-
-        ContentHints hints = new ContentHints(contentType);
-
-        checkConstruction(hints, contentType, null);
-
-        hints = new ContentHints(contentType, contentDescription);
-
-        checkConstruction(hints, contentType, contentDescription);
-
-        hints = ContentHints.getInstance(null);
-
-        if (hints != null)
-        {
-            fail("null getInstance() failed.");
-        }
-
-        try
-        {
-            ContentHints.getInstance(new Object());
-
-            fail("getInstance() failed to detect bad object.");
-        }
-        catch (IllegalArgumentException e)
-        {
-            // expected
-        }
-    }
-
-    private void checkConstruction(
-        ContentHints hints,
-        ASN1ObjectIdentifier contentType,
-        DERUTF8String description)
-        throws IOException
-    {
-        checkValues(hints, contentType, description);
-
-        hints = ContentHints.getInstance(hints);
-
-        checkValues(hints, contentType, description);
-
-        ASN1InputStream aIn = new ASN1InputStream(hints.toASN1Primitive().getEncoded());
-
-        ASN1Sequence seq = (ASN1Sequence)aIn.readObject();
-
-        hints = ContentHints.getInstance(seq);
-
-        checkValues(hints, contentType, description);
-    }
-
-    private void checkValues(
-        ContentHints hints,
-        ASN1ObjectIdentifier contentType,
-        DERUTF8String description)
-    {
-        checkMandatoryField("contentType", contentType, hints.getContentType());
-        checkOptionalField("description", description, hints.getContentDescription());
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        runTest(new ContentHintsUnitTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/test/CscaMasterListTest.java b/bcprov/src/main/java/org/bouncycastle/asn1/test/CscaMasterListTest.java
deleted file mode 100644
index c870069..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/test/CscaMasterListTest.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package org.bouncycastle.asn1.test;
-
-import java.io.IOException;
-
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.icao.CscaMasterList;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.io.Streams;
-import org.bouncycastle.util.test.SimpleTest;
-
-public class CscaMasterListTest
-    extends SimpleTest
-{
-    public String getName()
-    {
-        return "CscaMasterList";
-    }
-
-    public void performTest()
-        throws Exception
-    {
-        byte[] input = getInput("masterlist-content.data");
-        CscaMasterList parsedList
-            = CscaMasterList.getInstance(ASN1Primitive.fromByteArray(input));
-
-        if (parsedList.getCertStructs().length != 3)
-        {
-            fail("Cert structure parsing failed: incorrect length");
-        }
-
-        byte[] output = parsedList.getEncoded();
-        if (!Arrays.areEqual(input, output))
-        {
-            fail("Encoding failed after parse");
-        }
-    }
-
-    private byte[] getInput(String name)
-        throws IOException
-    {
-        return Streams.readAll(getClass().getResourceAsStream(name));
-    }
-
-    public static void main(
-        String[] args)
-    {
-        runTest(new CscaMasterListTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/test/DERApplicationSpecificTest.java b/bcprov/src/main/java/org/bouncycastle/asn1/test/DERApplicationSpecificTest.java
deleted file mode 100644
index 2e047de..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/test/DERApplicationSpecificTest.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package org.bouncycastle.asn1.test;
-
-import org.bouncycastle.asn1.ASN1Encoding;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.BERTags;
-import org.bouncycastle.asn1.DERApplicationSpecific;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-
-public class DERApplicationSpecificTest
-    extends SimpleTest
-{
-    private static final byte[] impData = Hex.decode("430109");
-
-    private static final byte[] certData = Hex.decode(
-        "7F218201897F4E8201495F290100420E44454356434145504153533030317F49"
-      + "81FD060A04007F00070202020202811CD7C134AA264366862A18302575D1D787"
-      + "B09F075797DA89F57EC8C0FF821C68A5E62CA9CE6C1C299803A6C1530B514E18"
-      + "2AD8B0042A59CAD29F43831C2580F63CCFE44138870713B1A92369E33E2135D2"
-      + "66DBB372386C400B8439040D9029AD2C7E5CF4340823B2A87DC68C9E4CE3174C"
-      + "1E6EFDEE12C07D58AA56F772C0726F24C6B89E4ECDAC24354B9E99CAA3F6D376"
-      + "1402CD851CD7C134AA264366862A18302575D0FB98D116BC4B6DDEBCA3A5A793"
-      + "9F863904393EE8E06DB6C7F528F8B4260B49AA93309824D92CDB1807E5437EE2"
-      + "E26E29B73A7111530FA86B350037CB9415E153704394463797139E148701015F"
-      + "200E44454356434145504153533030317F4C0E060904007F0007030102015301"
-      + "C15F25060007000400015F24060009000400015F37384CCF25C59F3612EEE188"
-      + "75F6C5F2E2D21F0395683B532A26E4C189B71EFE659C3F26E0EB9AEAE9986310"
-      + "7F9B0DADA16414FFA204516AEE2B");
-
-    public String getName()
-    {
-        return "DERApplicationSpecific";
-    }
-
-    public void performTest()
-        throws Exception
-    {
-        ASN1Integer value = new ASN1Integer(9);
-
-        DERApplicationSpecific tagged = new DERApplicationSpecific(false, 3, value);
-
-        if (!areEqual(impData, tagged.getEncoded()))
-        {
-            fail("implicit encoding failed");
-        }
-
-        ASN1Integer recVal = (ASN1Integer)tagged.getObject(BERTags.INTEGER);
-
-        if (!value.equals(recVal))
-        {
-            fail("implicit read back failed");
-        }
-
-        DERApplicationSpecific certObj = (DERApplicationSpecific)
-        ASN1Primitive.fromByteArray(certData);
-
-        if (!certObj.isConstructed() || certObj.getApplicationTag() != 33)
-        {
-            fail("parsing of certificate data failed");
-        }
-
-        byte[] encoded = certObj.getEncoded(ASN1Encoding.DER);
-    
-        if (!Arrays.areEqual(certData, encoded))
-        {
-            fail("re-encoding of certificate data failed");
-        }
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        runTest(new DERApplicationSpecificTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/test/DERUTF8StringTest.java b/bcprov/src/main/java/org/bouncycastle/asn1/test/DERUTF8StringTest.java
deleted file mode 100644
index 7e38d7d..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/test/DERUTF8StringTest.java
+++ /dev/null
@@ -1,101 +0,0 @@
-package org.bouncycastle.asn1.test;
-
-import org.bouncycastle.asn1.DEROctetString;
-import org.bouncycastle.asn1.DERUTF8String;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.Strings;
-import org.bouncycastle.util.test.SimpleTestResult;
-import org.bouncycastle.util.test.Test;
-import org.bouncycastle.util.test.TestResult;
-
-public class DERUTF8StringTest 
-    implements Test
-{
-
-    /**
-     * Unicode code point U+10400 coded as surrogate in two native Java UTF-16
-     * code units
-     */
-    private final static char[] glyph1_utf16 = { 0xd801, 0xdc00 };
-
-    /**
-     * U+10400 coded in UTF-8
-     */
-    private final static byte[] glyph1_utf8 = { (byte)0xF0, (byte)0x90, (byte)0x90, (byte)0x80 };
-
-    /**
-     * Unicode code point U+6771 in native Java UTF-16
-     */
-    private final static char[] glyph2_utf16 = { 0x6771 };
-
-    /**
-     * U+6771 coded in UTF-8
-     */
-    private final static byte[] glyph2_utf8 = { (byte)0xE6, (byte)0x9D, (byte)0xB1 };
-
-    /**
-     * Unicode code point U+00DF in native Java UTF-16
-     */
-    private final static char[] glyph3_utf16 = { 0x00DF };
-
-    /**
-     * U+00DF coded in UTF-8
-     */
-    private final static byte[] glyph3_utf8 = { (byte)0xC3, (byte)0x9f };
-
-    /**
-     * Unicode code point U+0041 in native Java UTF-16
-     */
-    private final static char[] glyph4_utf16 = { 0x0041 };
-
-    /**
-     * U+0041 coded in UTF-8
-     */
-    private final static byte[] glyph4_utf8 = { 0x41 };
-
-    private final static byte[][] glyphs_utf8 = { glyph1_utf8, glyph2_utf8, glyph3_utf8, glyph4_utf8 };
-
-    private final static char[][] glyphs_utf16 = { glyph1_utf16, glyph2_utf16, glyph3_utf16, glyph4_utf16 };
-
-    public TestResult perform()
-    {
-        try
-        {
-            for (int i = 0; i < glyphs_utf16.length; i++)
-            {
-                String s = new String(glyphs_utf16[i]);
-                byte[] b1 = new DERUTF8String(s).getEncoded();
-                byte temp[] = new byte[b1.length - 2];
-                System.arraycopy(b1, 2, temp, 0, b1.length - 2);
-                byte[] b2 = new DERUTF8String(Strings.fromUTF8ByteArray(new DEROctetString(temp).getOctets())).getEncoded();
-                if (!Arrays.areEqual(b1, b2))
-                {
-                    return new SimpleTestResult(false, getName() + ": failed UTF-8 encoding and decoding");
-                }
-                if (!Arrays.areEqual(temp, glyphs_utf8[i]))
-                {
-                    return new SimpleTestResult(false, getName() + ": failed UTF-8 encoding and decoding");
-                }
-            }
-        }
-        catch (Exception e)
-        {
-            return new SimpleTestResult(false, getName() + ": failed with Exception " + e.getMessage());
-        }
-
-        return new SimpleTestResult(true, getName() + ": Okay");
-    }
-
-    public String getName()
-    {
-        return "DERUTF8String";
-    }
-
-    public static void main(String[] args)
-    {
-        DERUTF8StringTest test = new DERUTF8StringTest();
-        TestResult result = test.perform();
-
-        System.out.println(result);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/test/DataGroupHashUnitTest.java b/bcprov/src/main/java/org/bouncycastle/asn1/test/DataGroupHashUnitTest.java
deleted file mode 100644
index 85f01e9..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/test/DataGroupHashUnitTest.java
+++ /dev/null
@@ -1,106 +0,0 @@
-package org.bouncycastle.asn1.test;
-
-import java.io.IOException;
-import java.util.Random;
-
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DEROctetString;
-import org.bouncycastle.asn1.icao.DataGroupHash;
-import org.bouncycastle.util.test.SimpleTest;
-
-public class DataGroupHashUnitTest 
-    extends SimpleTest
-{
-    public String getName()
-    {
-        return "DataGroupHash";
-    }
-
-    private byte[] generateHash()
-    {
-        Random rand = new Random();
-        byte[] bytes = new byte[20];
-        
-        for (int i = 0; i != bytes.length; i++)
-        {
-            bytes[i] = (byte)rand.nextInt();
-        }
-        
-        return bytes;
-    }
-    
-    public void performTest() 
-        throws Exception
-    {
-        int dataGroupNumber = 1;       
-        ASN1OctetString     dataHash = new DEROctetString(generateHash());
-        DataGroupHash       dg = new DataGroupHash(dataGroupNumber, dataHash);
-
-        checkConstruction(dg, dataGroupNumber, dataHash);
-
-        try
-        {
-            DataGroupHash.getInstance(null);
-        }
-        catch (Exception e)
-        {
-            fail("getInstance() failed to handle null.");
-        }
-
-        try
-        {
-            DataGroupHash.getInstance(new Object());
-            
-            fail("getInstance() failed to detect bad object.");
-        }
-        catch (IllegalArgumentException e)
-        {
-            // expected
-        }
-    }
-
-    private void checkConstruction(
-        DataGroupHash dg,
-        int dataGroupNumber,        
-        ASN1OctetString     dataGroupHashValue) 
-        throws IOException
-    {
-        checkValues(dg, dataGroupNumber, dataGroupHashValue);
-
-        dg = DataGroupHash.getInstance(dg);
-
-        checkValues(dg, dataGroupNumber, dataGroupHashValue);
-
-        ASN1InputStream aIn = new ASN1InputStream(dg.toASN1Object().getEncoded());
-
-        ASN1Sequence seq = (ASN1Sequence)aIn.readObject();
-
-        dg = DataGroupHash.getInstance(seq);
-
-        checkValues(dg, dataGroupNumber, dataGroupHashValue);
-    }
-
-    private void checkValues(
-        DataGroupHash dg,
-        int dataGroupNumber,        
-        ASN1OctetString     dataGroupHashValue)
-    {
-        if (dg.getDataGroupNumber() != dataGroupNumber)
-        {
-            fail("group number don't match.");
-        }
-        
-        if (!dg.getDataGroupHashValue().equals(dataGroupHashValue))
-        {
-            fail("hash value don't match.");
-        }         
-    }
-    
-    public static void main(
-        String[]    args)
-    {
-        runTest(new DataGroupHashUnitTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/test/DeclarationOfMajorityUnitTest.java b/bcprov/src/main/java/org/bouncycastle/asn1/test/DeclarationOfMajorityUnitTest.java
deleted file mode 100644
index cd42340..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/test/DeclarationOfMajorityUnitTest.java
+++ /dev/null
@@ -1,90 +0,0 @@
-package org.bouncycastle.asn1.test;
-
-import java.io.IOException;
-
-import org.bouncycastle.asn1.ASN1GeneralizedTime;
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.DERTaggedObject;
-import org.bouncycastle.asn1.isismtt.x509.DeclarationOfMajority;
-
-public class DeclarationOfMajorityUnitTest
-    extends ASN1UnitTest
-{
-    public String getName()
-    {
-        return "DeclarationOfMajority";
-    }
-
-    public void performTest()
-        throws Exception
-    {
-        ASN1GeneralizedTime dateOfBirth = new ASN1GeneralizedTime("20070315173729Z");
-        DeclarationOfMajority decl = new DeclarationOfMajority(dateOfBirth);
-
-        checkConstruction(decl, DeclarationOfMajority.dateOfBirth, dateOfBirth, -1);
-
-        decl = new DeclarationOfMajority(6);
-
-        checkConstruction(decl, DeclarationOfMajority.notYoungerThan, null, 6);
-
-        decl = DeclarationOfMajority.getInstance(null);
-
-        if (decl != null)
-        {
-            fail("null getInstance() failed.");
-        }
-
-        try
-        {
-            DeclarationOfMajority.getInstance(new Object());
-
-            fail("getInstance() failed to detect bad object.");
-        }
-        catch (IllegalArgumentException e)
-        {
-            // expected
-        }
-    }
-
-    private void checkConstruction(
-        DeclarationOfMajority decl,
-        int                   type,
-        ASN1GeneralizedTime   dateOfBirth,
-        int                   notYoungerThan)
-        throws IOException
-    {
-        checkValues(decl, type, dateOfBirth, notYoungerThan);
-
-        decl = DeclarationOfMajority.getInstance(decl);
-
-        checkValues(decl, type, dateOfBirth, notYoungerThan);
-
-        ASN1InputStream aIn = new ASN1InputStream(decl.toASN1Object().getEncoded());
-
-        DERTaggedObject info = (DERTaggedObject)aIn.readObject();
-
-        decl = DeclarationOfMajority.getInstance(info);
-
-        checkValues(decl, type, dateOfBirth, notYoungerThan);
-    }
-
-    private void checkValues(
-        DeclarationOfMajority decl,
-        int                   type,
-        ASN1GeneralizedTime   dateOfBirth,
-        int                   notYoungerThan)
-    {
-        checkMandatoryField("type", type, decl.getType());
-        checkOptionalField("dateOfBirth", dateOfBirth, decl.getDateOfBirth());
-        if (notYoungerThan != -1 && notYoungerThan != decl.notYoungerThan())
-        {
-            fail("notYoungerThan mismatch");
-        }
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        runTest(new DeclarationOfMajorityUnitTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/test/ESSCertIDv2UnitTest.java b/bcprov/src/main/java/org/bouncycastle/asn1/test/ESSCertIDv2UnitTest.java
deleted file mode 100644
index e8978ca..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/test/ESSCertIDv2UnitTest.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package org.bouncycastle.asn1.test;
-
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ess.ESSCertIDv2;
-import org.bouncycastle.asn1.nist.NISTObjectIdentifiers;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-
-public class ESSCertIDv2UnitTest
-    extends ASN1UnitTest
-{
-    public String getName()
-    {
-        return "ESSCertIDv2";
-    }
-
-    public void performTest()
-        throws Exception
-    {
-        // check getInstance on default algorithm.
-        byte[] digest = new byte [256];
-        ESSCertIDv2 essCertIdv2 = new ESSCertIDv2(new AlgorithmIdentifier(
-            NISTObjectIdentifiers.id_sha256), digest);
-        ASN1Primitive asn1Object = essCertIdv2.toASN1Primitive();
-
-        ESSCertIDv2.getInstance(asn1Object);
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        runTest(new ESSCertIDv2UnitTest());
-    }
-}
\ No newline at end of file
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/test/EncryptedPrivateKeyInfoTest.java b/bcprov/src/main/java/org/bouncycastle/asn1/test/EncryptedPrivateKeyInfoTest.java
deleted file mode 100644
index f4732cf..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/test/EncryptedPrivateKeyInfoTest.java
+++ /dev/null
@@ -1,135 +0,0 @@
-package org.bouncycastle.asn1.test;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.DEROutputStream;
-import org.bouncycastle.asn1.pkcs.EncryptedPrivateKeyInfo;
-import org.bouncycastle.asn1.util.ASN1Dump;
-import org.bouncycastle.util.encoders.Base64;
-import org.bouncycastle.util.test.SimpleTest;
-
-/**
- * Test the reading and writing of EncryptedPrivateKeyInfo objects using
- * the test vectors provided at
- * <a href=http://www.rsasecurity.com/rsalabs/pkcs/pkcs-5/index.html>
- * RSA's PKCS5 Page</a>.
- * <br>
- * The vectors are Base 64 encoded and encrypted using the password "password"
- * (without quotes). They should all yield the same PrivateKeyInfo object.
- */
-public class EncryptedPrivateKeyInfoTest
-    extends SimpleTest
-{
-    static byte[] sample1 = Base64.decode(
-        "MIIBozA9BgkqhkiG9w0BBQ0wMDAbBgkqhkiG9w0BBQwwDgQIfWBDXwLp4K4CAggA"
-      + "MBEGBSsOAwIHBAiaCF/AvOgQ6QSCAWDWX4BdAzCRNSQSANSuNsT5X8mWYO27mr3Y"
-      + "9c9LoBVXGNmYWKA77MI4967f7SmjNcgXj3xNE/jmnVz6hhsjS8E5VPT3kfyVkpdZ"
-      + "0lr5e9Yk2m3JWpPU7++v5zBkZmC4V/MwV/XuIs6U+vykgzMgpxQg0oZKS9zgmiZo"
-      + "f/4dOCL0UtCDnyOSvqT7mCVIcMDIEKu8QbVlgZYBop08l60EuEU3gARUo8WsYQmO"
-      + "Dz/ldx0Z+znIT0SXVuOwc+RVItC5T/Qx+aijmmpt+9l14nmaGBrEkmuhmtdvU/4v"
-      + "aptewGRgmjOfD6cqK+zs0O5NrrJ3P/6ZSxXj91CQgrThGfOv72bUncXEMNtc8pks"
-      + "2jpHFjGMdKufnadAD7XuMgzkkaklEXZ4f5tU6heIIwr51g0GBEGF96gYPFnjnSQM"
-      + "75JE02Clo+DfcfXpcybPTwwFg2jd6JTTOfkdf6OdSlA/1XNK43FA");
-
-    static byte[] sample2 = Base64.decode(
-        "MIIBpjBABgkqhkiG9w0BBQ0wMzAbBgkqhkiG9w0BBQwwDgQIeFeOWl1jywYCAggA"
-      + "MBQGCCqGSIb3DQMHBAjUJ5eGBhQGtQSCAWBrHrRgqO8UUMLcWzZEtpk1l3mjxiF/"
-      + "koCMkHsFwowgyWhEbgIkTgbSViK54LVK8PskekcGNLph+rB6bGZ7pPbL5pbXASJ8"
-      + "+MkQcG3FZdlS4Ek9tTJDApj3O1UubZGFG4uvTlJJFbF1BOJ3MkY3XQ9Gl1qwv7j5"
-      + "6e103Da7Cq9+oIDKmznza78XXQYrUsPo8mJGjUxPskEYlzwvHjKubRnYm/K6RKhi"
-      + "5f4zX4BQ/Dt3H812ZjRXrsjAJP0KrD/jyD/jCT7zNBVPH1izBds+RwizyQAHwfNJ"
-      + "BFR78TH4cgzB619X47FDVOnT0LqQNVd0O3cSwnPrXE9XR3tPayE+iOB15llFSmi8"
-      + "z0ByOXldEpkezCn92Umk++suzIVj1qfsK+bv2phZWJPbLEIWPDRHUbYf76q5ArAr"
-      + "u4xtxT/hoK3krEs/IN3d70qjlUJ36SEw1UaZ82PWhakQbdtu39ZraMJB");
-
-    static byte[] sample3 = Base64.decode(
-        "MIIBrjBIBgkqhkiG9w0BBQ0wOzAeBgkqhkiG9w0BBQwwEQQIrHyQPBZqWLUCAggA"
-      + "AgEQMBkGCCqGSIb3DQMCMA0CAToECEhbh7YZKiPSBIIBYCT1zp6o5jpFlIkgwPop"
-      + "7bW1+8ACr4exqzkeb3WflQ8cWJ4cURxzVdvxUnXeW1VJdaQZtjS/QHs5GhPTG/0f"
-      + "wtvnaPfwrIJ3FeGaZfcg2CrYhalOFmEb4xrE4KyoEQmUN8tb/Cg94uzd16BOPw21"
-      + "RDnE8bnPdIGY7TyL95kbkqH23mK53pi7h+xWIgduW+atIqDyyt55f7WMZcvDvlj6"
-      + "VpN/V0h+qxBHL274WA4dj6GYgeyUFpi60HdGCK7By2TBy8h1ZvKGjmB9h8jZvkx1"
-      + "MkbRumXxyFsowTZawyYvO8Um6lbfEDP9zIEUq0IV8RqH2MRyblsPNSikyYhxX/cz"
-      + "tdDxRKhilySbSBg5Kr8OfcwKp9bpinN96nmG4xr3Tch1bnVvqJzOQ5+Vva2WwVvH"
-      + "2JkWvYm5WaANg4Q6bRxu9vz7DuhbJjQdZbxFezIAgrJdSe92B00jO/0Kny1WjiVO"
-      + "6DA=");
-
-    public String getName()
-    {
-        return "EncryptedPrivateKeyInfoTest";
-    }
-
-    private void test(
-        int     id,
-        byte[]  sample)
-    {
-        ByteArrayInputStream    bIn = new ByteArrayInputStream(sample);
-        ASN1InputStream         aIn = new ASN1InputStream(bIn);
-        EncryptedPrivateKeyInfo info = null;
-
-        try
-        {
-            info = EncryptedPrivateKeyInfo.getInstance(aIn.readObject());
-        }
-        catch (Exception e)
-        {
-            fail("test " + id + " failed construction - exception " + e.toString(), e);
-        }
-
-        ByteArrayOutputStream   bOut = new ByteArrayOutputStream();
-        DEROutputStream         dOut = new DEROutputStream(bOut);
-
-        try
-        {
-            dOut.writeObject(info);
-        }
-        catch (Exception e)
-        {
-            fail("test " + id + " failed writing - exception " + e.toString(), e);
-        }
-
-        byte[]  bytes = bOut.toByteArray();
-
-        if (bytes.length != sample.length)
-        {
-            try
-            {
-                bIn = new ByteArrayInputStream(bytes);
-                aIn = new ASN1InputStream(bIn);
-
-                ASN1Primitive obj = aIn.readObject();
-    
-                fail("test " + id + " length mismatch - expected " + sample.length + System.getProperty("line.separator") + ASN1Dump.dumpAsString(info) + " got " + bytes.length + System.getProperty("line.separator") + ASN1Dump.dumpAsString(obj));
-            }
-            catch (Exception e)
-            {
-                fail("test " + id + " length mismatch - exception " + e.toString());
-            }
-        }
-
-        for (int i = 0; i != bytes.length; i++)
-        {
-            if (bytes[i] != sample[i])
-            {
-                fail("test " + id + " data mismatch");
-            }
-        }
-    }
-
-    public void performTest()
-    {
-        test(0, sample1);
-        test(1, sample2);
-        test(2, sample3);
-    }
-
-
-    public static void main(
-        String[]    args)
-    {
-        runTest(new EncryptedPrivateKeyInfoTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/test/EnumeratedTest.java b/bcprov/src/main/java/org/bouncycastle/asn1/test/EnumeratedTest.java
deleted file mode 100644
index c1c3b3b..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/test/EnumeratedTest.java
+++ /dev/null
@@ -1,115 +0,0 @@
-package org.bouncycastle.asn1.test;
-
-import java.io.IOException;
-
-import junit.framework.TestCase;
-
-import org.bouncycastle.asn1.ASN1Boolean;
-import org.bouncycastle.asn1.ASN1Enumerated;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.util.encoders.Hex;
-
-/**
- * Tests used to verify correct decoding of the ENUMERATED type.
- */
-public class EnumeratedTest
-    extends TestCase
-{
-    /**
-     * Test vector used to test decoding of multiple items. This sample uses an ENUMERATED and a BOOLEAN.
-     */
-    private static final byte[] MultipleSingleByteItems = Hex.decode("30060a01010101ff");
-
-    /**
-     * Test vector used to test decoding of multiple items. This sample uses two ENUMERATEDs.
-     */
-    private static final byte[] MultipleDoubleByteItems = Hex.decode("30080a0201010a020202");
-
-    /**
-     * Test vector used to test decoding of multiple items. This sample uses an ENUMERATED and an OBJECT IDENTIFIER.
-     */
-    private static final byte[] MultipleTripleByteItems = Hex.decode("300a0a0301010106032b0601");
-
-    /**
-     * Makes sure multiple identically sized values are parsed correctly.
-     */
-    public void testReadingMultipleSingleByteItems()
-        throws IOException
-    {
-        ASN1Primitive obj = ASN1Primitive.fromByteArray(MultipleSingleByteItems);
-
-        assertTrue("Null ASN.1 SEQUENCE", obj instanceof ASN1Sequence);
-
-        ASN1Sequence sequence = (ASN1Sequence)obj;
-
-        assertEquals("2 items expected", 2, sequence.size());
-
-        ASN1Enumerated enumerated = ASN1Enumerated.getInstance(sequence.getObjectAt(0));
-
-        assertNotNull("ENUMERATED expected", enumerated);
-
-        assertEquals("Unexpected ENUMERATED value", 1, enumerated.getValue().intValue());
-
-        ASN1Boolean b = ASN1Boolean.getInstance(sequence.getObjectAt(1));
-
-        assertNotNull("BOOLEAN expected", b);
-
-        assertTrue("Unexpected BOOLEAN value", b.isTrue());
-    }
-
-    /**
-     * Makes sure multiple identically sized values are parsed correctly.
-     */
-    public void testReadingMultipleDoubleByteItems()
-        throws IOException
-    {
-        ASN1Primitive obj = ASN1Primitive.fromByteArray(MultipleDoubleByteItems);
-
-        assertTrue("Null ASN.1 SEQUENCE", obj instanceof ASN1Sequence);
-
-        ASN1Sequence sequence = (ASN1Sequence)obj;
-
-        assertEquals("2 items expected", 2, sequence.size());
-
-        ASN1Enumerated enumerated1 = ASN1Enumerated.getInstance(sequence.getObjectAt(0));
-
-        assertNotNull("ENUMERATED expected", enumerated1);
-
-        assertEquals("Unexpected ENUMERATED value", 257, enumerated1.getValue().intValue());
-
-        ASN1Enumerated enumerated2 = ASN1Enumerated.getInstance(sequence.getObjectAt(1));
-
-        assertNotNull("ENUMERATED expected", enumerated2);
-
-        assertEquals("Unexpected ENUMERATED value", 514, enumerated2.getValue().intValue());
-    }
-
-    /**
-     * Makes sure multiple identically sized values are parsed correctly.
-     */
-    public void testReadingMultipleTripleByteItems()
-        throws IOException
-    {
-        ASN1Primitive obj = ASN1Primitive.fromByteArray(MultipleTripleByteItems);
-
-        assertTrue("Null ASN.1 SEQUENCE", obj instanceof ASN1Sequence);
-
-        ASN1Sequence sequence = (ASN1Sequence)obj;
-
-        assertEquals("2 items expected", 2, sequence.size());
-
-        ASN1Enumerated enumerated = ASN1Enumerated.getInstance(sequence.getObjectAt(0));
-
-        assertNotNull("ENUMERATED expected", enumerated);
-
-        assertEquals("Unexpected ENUMERATED value", 65793, enumerated.getValue().intValue());
-
-        ASN1ObjectIdentifier objectId = ASN1ObjectIdentifier.getInstance(sequence.getObjectAt(1));
-
-        assertNotNull("OBJECT IDENTIFIER expected", objectId);
-
-        assertEquals("Unexpected OBJECT IDENTIFIER value", "1.3.6.1", objectId.getId());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/test/EqualsAndHashCodeTest.java b/bcprov/src/main/java/org/bouncycastle/asn1/test/EqualsAndHashCodeTest.java
deleted file mode 100644
index 3da4e6a..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/test/EqualsAndHashCodeTest.java
+++ /dev/null
@@ -1,127 +0,0 @@
-package org.bouncycastle.asn1.test;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.util.Date;
-
-import org.bouncycastle.asn1.ASN1Boolean;
-import org.bouncycastle.asn1.ASN1Enumerated;
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1OutputStream;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.BERConstructedOctetString;
-import org.bouncycastle.asn1.BERSequence;
-import org.bouncycastle.asn1.BERSet;
-import org.bouncycastle.asn1.BERTaggedObject;
-import org.bouncycastle.asn1.DERApplicationSpecific;
-import org.bouncycastle.asn1.DERBMPString;
-import org.bouncycastle.asn1.DERBitString;
-import org.bouncycastle.asn1.DERGeneralString;
-import org.bouncycastle.asn1.DERGeneralizedTime;
-import org.bouncycastle.asn1.DERIA5String;
-import org.bouncycastle.asn1.DERNull;
-import org.bouncycastle.asn1.DERNumericString;
-import org.bouncycastle.asn1.DEROctetString;
-import org.bouncycastle.asn1.DERPrintableString;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.DERSet;
-import org.bouncycastle.asn1.DERT61String;
-import org.bouncycastle.asn1.DERTaggedObject;
-import org.bouncycastle.asn1.DERUTCTime;
-import org.bouncycastle.asn1.DERUTF8String;
-import org.bouncycastle.asn1.DERUniversalString;
-import org.bouncycastle.asn1.DERVisibleString;
-import org.bouncycastle.util.test.SimpleTestResult;
-import org.bouncycastle.util.test.Test;
-import org.bouncycastle.util.test.TestResult;
-
-public class EqualsAndHashCodeTest
-    implements Test
-{
-    public TestResult perform()
-    {
-        byte[]    data = { 0, 1, 0, 1, 0, 0, 1 };
-        
-        ASN1Primitive    values[] = {
-                new BERConstructedOctetString(data),
-                new BERSequence(new DERPrintableString("hello world")),
-                new BERSet(new DERPrintableString("hello world")),
-                new BERTaggedObject(0, new DERPrintableString("hello world")),
-                new DERApplicationSpecific(0, data),
-                new DERBitString(data),
-                new DERBMPString("hello world"),
-                new ASN1Boolean(true),
-                new ASN1Boolean(false),
-                new ASN1Enumerated(100),
-                new DERGeneralizedTime("20070315173729Z"),
-                new DERGeneralString("hello world"),
-                new DERIA5String("hello"),
-                new ASN1Integer(1000),
-                new DERNull(),
-                new DERNumericString("123456"),
-                new ASN1ObjectIdentifier("1.1.1.10000.1"),
-                new DEROctetString(data),
-                new DERPrintableString("hello world"),
-                new DERSequence(new DERPrintableString("hello world")),
-                new DERSet(new DERPrintableString("hello world")),
-                new DERT61String("hello world"),
-                new DERTaggedObject(0, new DERPrintableString("hello world")),
-                new DERUniversalString(data),
-                new DERUTCTime(new Date()),
-                new DERUTF8String("hello world"),
-                new DERVisibleString("hello world")
-            };
-        
-        try
-        {
-            ByteArrayOutputStream   bOut = new ByteArrayOutputStream();
-            ASN1OutputStream        aOut = new ASN1OutputStream(bOut);
-            
-            for (int i = 0; i != values.length; i++)
-            {
-                aOut.writeObject(values[i]);
-            }
-            
-            ASN1Primitive[] readValues = new ASN1Primitive[values.length];
-            
-            ByteArrayInputStream    bIn = new ByteArrayInputStream(bOut.toByteArray());
-            ASN1InputStream         aIn = new ASN1InputStream(bIn);
-            
-            for (int i = 0; i != values.length; i++)
-            {
-                ASN1Primitive o = aIn.readObject();
-                if (!o.equals(values[i]))
-                {
-                    return new SimpleTestResult(false, getName() + ": Failed equality test for " + o.getClass());
-                }
-                
-                if (o.hashCode() != values[i].hashCode())
-                {
-                    return new SimpleTestResult(false, getName() + ": Failed hashCode test for " + o.getClass());
-                }
-            }
-        }
-        catch (Exception e)
-        {
-            return new SimpleTestResult(false, getName() + ": Failed - exception " + e.toString(), e);
-        }
-        
-        return new SimpleTestResult(true, getName() + ": Okay");
-    }
-
-    public String getName()
-    {
-        return "EqualsAndHashCode";
-    }
-
-    public static void main(
-        String[] args)
-    {
-        EqualsAndHashCodeTest    test = new EqualsAndHashCodeTest();
-        TestResult      result = test.perform();
-
-        System.out.println(result);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/test/GeneralNameTest.java b/bcprov/src/main/java/org/bouncycastle/asn1/test/GeneralNameTest.java
deleted file mode 100644
index f88a83c..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/test/GeneralNameTest.java
+++ /dev/null
@@ -1,143 +0,0 @@
-package org.bouncycastle.asn1.test;
-
-import org.bouncycastle.asn1.x509.GeneralName;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-
-public class GeneralNameTest
-    extends SimpleTest
-{
-    private static final byte[] ipv4 = Hex.decode("87040a090800");
-    private static final byte[] ipv4WithMask1 = Hex.decode("87080a090800ffffff00");
-    private static final byte[] ipv4WithMask2 = Hex.decode("87080a090800ffff8000");
-    private static final byte[] ipv4WithMask3 = Hex.decode("87080a090800ffffc000");
-
-    private static final byte[] ipv6a = Hex.decode("871020010db885a308d313198a2e03707334");
-    private static final byte[] ipv6b = Hex.decode("871020010db885a3000013198a2e03707334");
-    private static final byte[] ipv6c = Hex.decode("871000000000000000000000000000000001");
-    private static final byte[] ipv6d = Hex.decode("871020010db885a3000000008a2e03707334");
-    private static final byte[] ipv6e = Hex.decode("871020010db885a3000000008a2e0a090800");
-    private static final byte[] ipv6f = Hex.decode("872020010db885a3000000008a2e0a090800ffffffffffff00000000000000000000");
-    private static final byte[] ipv6g = Hex.decode("872020010db885a3000000008a2e0a090800ffffffffffffffffffffffffffffffff");
-    private static final byte[] ipv6h = Hex.decode("872020010db885a300000000000000000000ffffffffffff00000000000000000000");
-    private static final byte[] ipv6i = Hex.decode("872020010db885a300000000000000000000fffffffffffe00000000000000000000");
-    private static final byte[] ipv6j = Hex.decode("872020010db885a300000000000000000000ffffffffffff80000000000000000000");
-
-    public String getName()
-    {
-        return "GeneralName";
-    }
-
-    public void performTest()
-        throws Exception
-    {
-        GeneralName nm = new GeneralName(GeneralName.iPAddress, "10.9.8.0");
-        if (!Arrays.areEqual(nm.getEncoded(), ipv4))
-        {
-            fail("ipv4 encoding failed");
-        }
-
-        nm = new GeneralName(GeneralName.iPAddress, "10.9.8.0/255.255.255.0");
-        if (!Arrays.areEqual(nm.getEncoded(), ipv4WithMask1))
-        {
-            fail("ipv4 with netmask 1 encoding failed");
-        }
-
-        nm = new GeneralName(GeneralName.iPAddress, "10.9.8.0/24");
-        if (!Arrays.areEqual(nm.getEncoded(), ipv4WithMask1))
-        {
-            fail("ipv4 with netmask 2 encoding failed");
-        }
-
-        nm = new GeneralName(GeneralName.iPAddress, "10.9.8.0/255.255.128.0");
-        if (!Arrays.areEqual(nm.getEncoded(), ipv4WithMask2))
-        {
-            fail("ipv4 with netmask 3a encoding failed");
-        }
-
-        nm = new GeneralName(GeneralName.iPAddress, "10.9.8.0/17");
-        if (!Arrays.areEqual(nm.getEncoded(), ipv4WithMask2))
-        {
-            fail("ipv4 with netmask 3b encoding failed");
-        }
-
-        nm = new GeneralName(GeneralName.iPAddress, "10.9.8.0/255.255.192.0");
-        if (!Arrays.areEqual(nm.getEncoded(), ipv4WithMask3))
-        {
-            fail("ipv4 with netmask 3a encoding failed");
-        }
-
-        nm = new GeneralName(GeneralName.iPAddress, "10.9.8.0/18");
-        if (!Arrays.areEqual(nm.getEncoded(), ipv4WithMask3))
-        {
-            fail("ipv4 with netmask 3b encoding failed");
-        }
-
-        nm = new GeneralName(GeneralName.iPAddress, "2001:0db8:85a3:08d3:1319:8a2e:0370:7334");
-        if (!Arrays.areEqual(nm.getEncoded(), ipv6a))
-        {
-            fail("ipv6 with netmask encoding failed");
-        }
-
-        nm = new GeneralName(GeneralName.iPAddress, "2001:0db8:85a3::1319:8a2e:0370:7334");
-        if (!Arrays.areEqual(nm.getEncoded(), ipv6b))
-        {
-            fail("ipv6b encoding failed");
-        }
-
-        nm = new GeneralName(GeneralName.iPAddress, "::1");
-        if (!Arrays.areEqual(nm.getEncoded(), ipv6c))
-        {
-            fail("ipv6c failed");
-        }
-
-        nm = new GeneralName(GeneralName.iPAddress, "2001:0db8:85a3::8a2e:0370:7334");
-        if (!Arrays.areEqual(nm.getEncoded(), ipv6d))
-        {
-            fail("ipv6d failed");
-        }
-
-        nm = new GeneralName(GeneralName.iPAddress, "2001:0db8:85a3::8a2e:10.9.8.0");
-        if (!Arrays.areEqual(nm.getEncoded(), ipv6e))
-        {
-            fail("ipv6e failed");
-        }
-
-        nm = new GeneralName(GeneralName.iPAddress, "2001:0db8:85a3::8a2e:10.9.8.0/ffff:ffff:ffff::0000");
-        if (!Arrays.areEqual(nm.getEncoded(), ipv6f))
-        {
-            fail("ipv6f failed");
-        }
-
-        nm = new GeneralName(GeneralName.iPAddress, "2001:0db8:85a3::8a2e:10.9.8.0/128");
-        if (!Arrays.areEqual(nm.getEncoded(), ipv6g))
-        {
-            fail("ipv6g failed");
-        }
-
-        nm = new GeneralName(GeneralName.iPAddress, "2001:0db8:85a3::/48");
-        if (!Arrays.areEqual(nm.getEncoded(), ipv6h))
-        {
-            fail("ipv6h failed");
-        }
-
-        nm = new GeneralName(GeneralName.iPAddress, "2001:0db8:85a3::/47");
-        if (!Arrays.areEqual(nm.getEncoded(), ipv6i))
-        {
-            fail("ipv6i failed");
-        }
-
-        nm = new GeneralName(GeneralName.iPAddress, "2001:0db8:85a3::/49");
-        if (!Arrays.areEqual(nm.getEncoded(), ipv6j))
-        {
-            fail("ipv6j failed");
-        }
-    }
-
-    public static void main(
-        String[] args)
-    {
-        runTest(new GeneralNameTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/test/GeneralizedTimeTest.java b/bcprov/src/main/java/org/bouncycastle/asn1/test/GeneralizedTimeTest.java
deleted file mode 100644
index 3a86370..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/test/GeneralizedTimeTest.java
+++ /dev/null
@@ -1,201 +0,0 @@
-package org.bouncycastle.asn1.test;
-
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.SimpleTimeZone;
-import java.util.TimeZone;
-
-import org.bouncycastle.asn1.DERGeneralizedTime;
-import org.bouncycastle.util.test.SimpleTest;
-
-/**
- * X.690 test example
- */
-public class GeneralizedTimeTest
-    extends SimpleTest
-{
-    String[] input =
-        {
-            "20020122122220",
-            "20020122122220Z",
-            "20020122122220-1000",
-            "20020122122220+00",
-            "20020122122220.1",
-            "20020122122220.1Z",
-            "20020122122220.1-1000",
-            "20020122122220.1+00",
-            "20020122122220.01",
-            "20020122122220.01Z",
-            "20020122122220.01-1000",
-            "20020122122220.01+00",
-            "20020122122220.001",
-            "20020122122220.001Z",
-            "20020122122220.001-1000",
-            "20020122122220.001+00",
-            "20020122122220.0001",
-            "20020122122220.0001Z",
-            "20020122122220.0001-1000",
-            "20020122122220.0001+00",
-            "20020122122220.0001+1000"
-        };
-
-    String[] output = {
-            "20020122122220",
-            "20020122122220GMT+00:00",
-            "20020122122220GMT-10:00",
-            "20020122122220GMT+00:00",
-            "20020122122220.1",
-            "20020122122220.1GMT+00:00",
-            "20020122122220.1GMT-10:00",
-            "20020122122220.1GMT+00:00",
-            "20020122122220.01",
-            "20020122122220.01GMT+00:00",
-            "20020122122220.01GMT-10:00",
-            "20020122122220.01GMT+00:00",
-            "20020122122220.001",
-            "20020122122220.001GMT+00:00",
-            "20020122122220.001GMT-10:00",
-            "20020122122220.001GMT+00:00",
-            "20020122122220.0001",
-            "20020122122220.0001GMT+00:00",
-            "20020122122220.0001GMT-10:00",
-            "20020122122220.0001GMT+00:00",
-            "20020122122220.0001GMT+10:00" };
-
-    String[] zOutput = {
-            "20020122122220Z",
-            "20020122122220Z",
-            "20020122222220Z",
-            "20020122122220Z",
-            "20020122122220Z",
-            "20020122122220Z",
-            "20020122222220Z",
-            "20020122122220Z",
-            "20020122122220Z",
-            "20020122122220Z",
-            "20020122222220Z",
-            "20020122122220Z",
-            "20020122122220Z",
-            "20020122122220Z",
-            "20020122222220Z",
-            "20020122122220Z",
-            "20020122122220Z",
-            "20020122122220Z",
-            "20020122222220Z",
-            "20020122122220Z",
-            "20020122022220Z"
-    };
-
-    String[] mzOutput = {
-        "20020122122220.000Z",
-        "20020122122220.000Z",
-        "20020122222220.000Z",
-        "20020122122220.000Z",
-        "20020122122220.100Z",
-        "20020122122220.100Z",
-        "20020122222220.100Z",
-        "20020122122220.100Z",
-        "20020122122220.010Z",
-        "20020122122220.010Z",
-        "20020122222220.010Z",
-        "20020122122220.010Z",
-        "20020122122220.001Z",
-        "20020122122220.001Z",
-        "20020122222220.001Z",
-        "20020122122220.001Z",
-        "20020122122220.000Z",
-        "20020122122220.000Z",
-        "20020122222220.000Z",
-        "20020122122220.000Z",
-        "20020122022220.000Z"
-    };
-
-    public String getName()
-    {
-        return "GeneralizedTime";
-    }
-    
-    public void performTest()
-        throws Exception
-    {
-        SimpleDateFormat dateF = new SimpleDateFormat("yyyyMMddHHmmss'Z'");
-
-        dateF.setTimeZone(new SimpleTimeZone(0,"Z"));
-
-        for (int i = 0; i != input.length; i++)
-        {
-            DERGeneralizedTime    t = new DERGeneralizedTime(input[i]);
-
-            if (output[i].indexOf('G') > 0)   // don't check local time the same way
-            {
-                if (!t.getTime().equals(output[i]))
-                {
-                    fail("failed conversion test");
-                }
-                if (!dateF.format(t.getDate()).equals(zOutput[i]))
-                {
-                    fail("failed date conversion test");
-                }
-            }
-            else
-            {
-                String offset = calculateGMTOffset(t.getDate());
-                if (!t.getTime().equals(output[i] + offset))
-                {
-                    fail("failed conversion test");
-                }
-            }
-        }
-
-        dateF = new SimpleDateFormat("yyyyMMddHHmmss.SSS'Z'");
-
-        dateF.setTimeZone(new SimpleTimeZone(0,"Z"));
-
-        for (int i = 0; i != input.length; i++)
-        {
-            DERGeneralizedTime    t = new DERGeneralizedTime(input[i]);
-
-            if (!dateF.format(t.getDate()).equals(mzOutput[i]))
-            {
-                fail("failed long date conversion test");
-            }
-        }
-    }
-
-    private String calculateGMTOffset(Date date)
-    {
-        String sign = "+";
-        TimeZone timeZone = TimeZone.getDefault();
-        int offset = timeZone.getRawOffset();
-        if (offset < 0)
-        {
-            sign = "-";
-            offset = -offset;
-        }
-        int hours = offset / (60 * 60 * 1000);
-        int minutes = (offset - (hours * 60 * 60 * 1000)) / (60 * 1000);
-
-        if (timeZone.useDaylightTime() && timeZone.inDaylightTime(date))
-        {
-            hours += sign.equals("+") ? 1 : -1;
-        }
-
-        return "GMT" + sign + convert(hours) + ":" + convert(minutes);
-    }
-
-    private String convert(int time)
-    {
-        if (time < 10)
-        {
-            return "0" + time;
-        }
-
-        return Integer.toString(time);
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        runTest(new GeneralizedTimeTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/test/GenerationTest.java b/bcprov/src/main/java/org/bouncycastle/asn1/test/GenerationTest.java
deleted file mode 100644
index aa5444f..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/test/GenerationTest.java
+++ /dev/null
@@ -1,441 +0,0 @@
-package org.bouncycastle.asn1.test;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.math.BigInteger;
-import java.text.ParseException;
-import java.util.Date;
-import java.util.Hashtable;
-import java.util.Vector;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1GeneralizedTime;
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1OutputStream;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.DERNull;
-import org.bouncycastle.asn1.DEROctetString;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.oiw.ElGamalParameter;
-import org.bouncycastle.asn1.oiw.OIWObjectIdentifiers;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.asn1.x500.X500Name;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.asn1.x509.AuthorityKeyIdentifier;
-import org.bouncycastle.asn1.x509.CRLReason;
-import org.bouncycastle.asn1.x509.Extension;
-import org.bouncycastle.asn1.x509.Extensions;
-import org.bouncycastle.asn1.x509.ExtensionsGenerator;
-import org.bouncycastle.asn1.x509.GeneralName;
-import org.bouncycastle.asn1.x509.GeneralNames;
-import org.bouncycastle.asn1.x509.IssuingDistributionPoint;
-import org.bouncycastle.asn1.x509.KeyUsage;
-import org.bouncycastle.asn1.x509.RSAPublicKeyStructure;
-import org.bouncycastle.asn1.x509.SubjectKeyIdentifier;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.bouncycastle.asn1.x509.TBSCertList;
-import org.bouncycastle.asn1.x509.TBSCertificate;
-import org.bouncycastle.asn1.x509.Time;
-import org.bouncycastle.asn1.x509.V1TBSCertificateGenerator;
-import org.bouncycastle.asn1.x509.V2TBSCertListGenerator;
-import org.bouncycastle.asn1.x509.V3TBSCertificateGenerator;
-import org.bouncycastle.asn1.x509.X509Extension;
-import org.bouncycastle.asn1.x509.X509Extensions;
-import org.bouncycastle.asn1.x509.X509Name;
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.digests.SHA1Digest;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.encoders.Base64;
-import org.bouncycastle.util.test.SimpleTest;
-
-public class GenerationTest
-    extends SimpleTest
-{
-    private byte[] v1Cert = Base64.decode(
-          "MIGtAgEBMA0GCSqGSIb3DQEBBAUAMCUxCzAJBgNVBAMMAkFVMRYwFAYDVQQKDA1Cb"
-        + "3VuY3kgQ2FzdGxlMB4XDTcwMDEwMTAwMDAwMVoXDTcwMDEwMTAwMDAxMlowNjELMA"
-        + "kGA1UEAwwCQVUxFjAUBgNVBAoMDUJvdW5jeSBDYXN0bGUxDzANBgNVBAsMBlRlc3Q"
-        + "gMTAaMA0GCSqGSIb3DQEBAQUAAwkAMAYCAQECAQI=");
-
-    private byte[] v3Cert = Base64.decode(
-          "MIIBSKADAgECAgECMA0GCSqGSIb3DQEBBAUAMCUxCzAJBgNVBAMMAkFVMRYwFAYD"
-        + "VQQKDA1Cb3VuY3kgQ2FzdGxlMB4XDTcwMDEwMTAwMDAwMVoXDTcwMDEwMTAwMDAw"
-        + "MlowNjELMAkGA1UEAwwCQVUxFjAUBgNVBAoMDUJvdW5jeSBDYXN0bGUxDzANBgNV"
-        + "BAsMBlRlc3QgMjAYMBAGBisOBwIBATAGAgEBAgECAwQAAgEDo4GVMIGSMGEGA1Ud"
-        + "IwEB/wRXMFWAFDZPdpHPzKi7o8EJokkQU2uqCHRRoTqkODA2MQswCQYDVQQDDAJB"
-        + "VTEWMBQGA1UECgwNQm91bmN5IENhc3RsZTEPMA0GA1UECwwGVGVzdCAyggECMCAG"
-        + "A1UdDgEB/wQWBBQ2T3aRz8you6PBCaJJEFNrqgh0UTALBgNVHQ8EBAMCBBA=");
-
-    private byte[] v3CertNullSubject = Base64.decode(
-          "MIHGoAMCAQICAQIwDQYJKoZIhvcNAQEEBQAwJTELMAkGA1UEAwwCQVUxFjAUBgNVB"
-        + "AoMDUJvdW5jeSBDYXN0bGUwHhcNNzAwMTAxMDAwMDAxWhcNNzAwMTAxMDAwMDAyWj"
-        + "AAMBgwEAYGKw4HAgEBMAYCAQECAQIDBAACAQOjSjBIMEYGA1UdEQEB/wQ8MDqkODA"
-        + "2MQswCQYDVQQDDAJBVTEWMBQGA1UECgwNQm91bmN5IENhc3RsZTEPMA0GA1UECwwG"
-        + "VGVzdCAy");
-
-    private byte[] v2CertList = Base64.decode(
-          "MIIBQwIBATANBgkqhkiG9w0BAQUFADAlMQswCQYDVQQDDAJBVTEWMBQGA1UECgwN" +
-          "Qm91bmN5IENhc3RsZRcNNzAwMTAxMDAwMDAwWhcNNzAwMTAxMDAwMDAyWjAiMCAC" +
-          "AQEXDTcwMDEwMTAwMDAwMVowDDAKBgNVHRUEAwoBCqCBxTCBwjBhBgNVHSMBAf8E" +
-          "VzBVgBQ2T3aRz8you6PBCaJJEFNrqgh0UaE6pDgwNjELMAkGA1UEAwwCQVUxFjAU" +
-          "BgNVBAoMDUJvdW5jeSBDYXN0bGUxDzANBgNVBAsMBlRlc3QgMoIBAjBDBgNVHRIE" +
-          "PDA6pDgwNjELMAkGA1UEAwwCQVUxFjAUBgNVBAoMDUJvdW5jeSBDYXN0bGUxDzAN" +
-          "BgNVBAsMBlRlc3QgMzAKBgNVHRQEAwIBATAMBgNVHRwBAf8EAjAA");
-    
-    private void tbsV1CertGen()
-        throws IOException
-    {
-        V1TBSCertificateGenerator   gen = new V1TBSCertificateGenerator();
-        Date                        startDate = new Date(1000);
-        Date                        endDate = new Date(12000);
-
-        gen.setSerialNumber(new ASN1Integer(1));
-
-        gen.setStartDate(new Time(startDate));
-        gen.setEndDate(new Time(endDate));
-
-        gen.setIssuer(new X500Name("CN=AU,O=Bouncy Castle"));
-        gen.setSubject(new X500Name("CN=AU,O=Bouncy Castle,OU=Test 1"));
-
-        gen.setSignature(new AlgorithmIdentifier(PKCSObjectIdentifiers.md5WithRSAEncryption, DERNull.INSTANCE));
-
-        SubjectPublicKeyInfo    info = new SubjectPublicKeyInfo(new AlgorithmIdentifier(PKCSObjectIdentifiers.rsaEncryption, DERNull.INSTANCE),
-                                                     new RSAPublicKeyStructure(BigInteger.valueOf(1), BigInteger.valueOf(2)));
-
-        gen.setSubjectPublicKeyInfo(info);
-
-        TBSCertificate              tbs = gen.generateTBSCertificate();
-        ByteArrayOutputStream       bOut = new ByteArrayOutputStream();
-        ASN1OutputStream            aOut = new ASN1OutputStream(bOut);
-
-        aOut.writeObject(tbs);
-
-        if (!Arrays.areEqual(bOut.toByteArray(), v1Cert))
-        {
-            fail("failed v1 cert generation");
-        }
-
-        //
-        // read back test
-        //
-        ASN1InputStream aIn = new ASN1InputStream(new ByteArrayInputStream(v1Cert));
-        ASN1Primitive       o = aIn.readObject();
-
-        bOut = new ByteArrayOutputStream();
-        aOut = new ASN1OutputStream(bOut);
-
-        aOut.writeObject(o);
-
-        if (!Arrays.areEqual(bOut.toByteArray(), v1Cert))
-        {
-            fail("failed v1 cert read back test");
-        }
-    }
-    
-    private AuthorityKeyIdentifier createAuthorityKeyId(
-        SubjectPublicKeyInfo    info,
-        X500Name                name,
-        int                     sNumber)
-    {
-        GeneralName             genName = new GeneralName(name);
-        ASN1EncodableVector     v = new ASN1EncodableVector();
-
-        v.add(genName);
-
-        return new AuthorityKeyIdentifier(
-            info, GeneralNames.getInstance(new DERSequence(v)), BigInteger.valueOf(sNumber));
-    }
-    
-    private void tbsV3CertGen()
-        throws IOException
-    {
-        V3TBSCertificateGenerator   gen = new V3TBSCertificateGenerator();
-        Date                        startDate = new Date(1000);
-        Date                        endDate = new Date(2000);
-
-        gen.setSerialNumber(new ASN1Integer(2));
-
-        gen.setStartDate(new Time(startDate));
-        gen.setEndDate(new Time(endDate));
-
-        gen.setIssuer(new X500Name("CN=AU,O=Bouncy Castle"));
-        gen.setSubject(new X500Name("CN=AU,O=Bouncy Castle,OU=Test 2"));
-
-        gen.setSignature(new AlgorithmIdentifier(PKCSObjectIdentifiers.md5WithRSAEncryption, DERNull.INSTANCE));
-
-        SubjectPublicKeyInfo    info = new SubjectPublicKeyInfo(new AlgorithmIdentifier(OIWObjectIdentifiers.elGamalAlgorithm, new ElGamalParameter(BigInteger.valueOf(1), BigInteger.valueOf(2))), new ASN1Integer(3));
-
-        gen.setSubjectPublicKeyInfo(info);
-
-        //
-        // add extensions
-        //
-        Vector          order = new Vector();
-        Hashtable       extensions = new Hashtable();
-
-        order.addElement(X509Extension.authorityKeyIdentifier);
-        order.addElement(X509Extension.subjectKeyIdentifier);
-        order.addElement(X509Extension.keyUsage);
-
-        extensions.put(X509Extension.authorityKeyIdentifier, new X509Extension(true, new DEROctetString(createAuthorityKeyId(info, new X500Name("CN=AU,O=Bouncy Castle,OU=Test 2"), 2))));
-        extensions.put(X509Extension.subjectKeyIdentifier, new X509Extension(true, new DEROctetString(new SubjectKeyIdentifier(getDigest(info)))));
-        extensions.put(X509Extension.keyUsage, new X509Extension(false, new DEROctetString(new KeyUsage(KeyUsage.dataEncipherment))));
-
-        X509Extensions  ex = new X509Extensions(order, extensions);
-
-        gen.setExtensions(ex);
-
-        TBSCertificate              tbs = gen.generateTBSCertificate();
-        ByteArrayOutputStream       bOut = new ByteArrayOutputStream();
-        ASN1OutputStream            aOut = new ASN1OutputStream(bOut);
-
-        aOut.writeObject(tbs);
-
-        if (!Arrays.areEqual(bOut.toByteArray(), v3Cert))
-        {
-            fail("failed v3 cert generation");
-        }
-
-        //
-        // read back test
-        //
-        ASN1InputStream aIn = new ASN1InputStream(new ByteArrayInputStream(v3Cert));
-        ASN1Primitive       o = aIn.readObject();
-
-        bOut = new ByteArrayOutputStream();
-        aOut = new ASN1OutputStream(bOut);
-
-        aOut.writeObject(o);
-
-        if (!Arrays.areEqual(bOut.toByteArray(), v3Cert))
-        {
-            fail("failed v3 cert read back test");
-        }
-    }
-
-    private void tbsV3CertGenWithNullSubject()
-        throws IOException
-    {
-        V3TBSCertificateGenerator   gen = new V3TBSCertificateGenerator();
-        Date                        startDate = new Date(1000);
-        Date                        endDate = new Date(2000);
-
-        gen.setSerialNumber(new ASN1Integer(2));
-
-        gen.setStartDate(new Time(startDate));
-        gen.setEndDate(new Time(endDate));
-
-        gen.setIssuer(new X500Name("CN=AU,O=Bouncy Castle"));
-
-        gen.setSignature(new AlgorithmIdentifier(PKCSObjectIdentifiers.md5WithRSAEncryption, DERNull.INSTANCE));
-
-        SubjectPublicKeyInfo    info = new SubjectPublicKeyInfo(new AlgorithmIdentifier(OIWObjectIdentifiers.elGamalAlgorithm, new ElGamalParameter(BigInteger.valueOf(1), BigInteger.valueOf(2))), new ASN1Integer(3));
-
-        gen.setSubjectPublicKeyInfo(info);
-
-        try
-        {
-            gen.generateTBSCertificate();
-            fail("null subject not caught!");
-        }
-        catch (IllegalStateException e)
-        {
-            if (!e.getMessage().equals("not all mandatory fields set in V3 TBScertificate generator"))
-            {
-                fail("unexpected exception", e);
-            }
-        }
-
-        //
-        // add extensions
-        //
-        Vector          order = new Vector();
-        Hashtable       extensions = new Hashtable();
-
-        order.addElement(X509Extension.subjectAlternativeName);
-
-        extensions.put(X509Extension.subjectAlternativeName, new X509Extension(true, new DEROctetString(new GeneralNames(new GeneralName(new X509Name("CN=AU,O=Bouncy Castle,OU=Test 2"))))));
-
-        X509Extensions  ex = new X509Extensions(order, extensions);
-
-        gen.setExtensions(ex);
-
-        TBSCertificate              tbs = gen.generateTBSCertificate();
-        ByteArrayOutputStream       bOut = new ByteArrayOutputStream();
-        ASN1OutputStream            aOut = new ASN1OutputStream(bOut);
-
-        aOut.writeObject(tbs);
-
-        if (!Arrays.areEqual(bOut.toByteArray(), v3CertNullSubject))
-        {
-            fail("failed v3 null sub cert generation");
-        }
-
-        //
-        // read back test
-        //
-        ASN1InputStream aIn = new ASN1InputStream(new ByteArrayInputStream(v3CertNullSubject));
-        ASN1Primitive       o = aIn.readObject();
-
-        bOut = new ByteArrayOutputStream();
-        aOut = new ASN1OutputStream(bOut);
-
-        aOut.writeObject(o);
-
-        if (!Arrays.areEqual(bOut.toByteArray(), v3CertNullSubject))
-        {
-            fail("failed v3 null sub cert read back test");
-        }
-    }
-
-    private void tbsV2CertListGen()
-        throws IOException
-    {
-        V2TBSCertListGenerator  gen = new V2TBSCertListGenerator();
-
-        gen.setIssuer(new X500Name("CN=AU,O=Bouncy Castle"));
-
-        gen.addCRLEntry(new ASN1Integer(1), new Time(new Date(1000)), CRLReason.aACompromise);
-
-        gen.setNextUpdate(new Time(new Date(2000)));
-
-        gen.setThisUpdate(new Time(new Date(500)));
-
-        gen.setSignature(new AlgorithmIdentifier(PKCSObjectIdentifiers.sha1WithRSAEncryption, DERNull.INSTANCE));
-
-        //
-        // extensions
-        //
-        SubjectPublicKeyInfo    info = new SubjectPublicKeyInfo(new AlgorithmIdentifier(OIWObjectIdentifiers.elGamalAlgorithm, new ElGamalParameter(BigInteger.valueOf(1), BigInteger.valueOf(2))), new ASN1Integer(3));
-
-        ExtensionsGenerator     extGen = new ExtensionsGenerator();
-
-        extGen.addExtension(Extension.authorityKeyIdentifier, true, createAuthorityKeyId(info, new X500Name("CN=AU,O=Bouncy Castle,OU=Test 2"), 2));
-        extGen.addExtension(Extension.issuerAlternativeName, false, new GeneralNames(new GeneralName(new X500Name("CN=AU,O=Bouncy Castle,OU=Test 3"))));
-        extGen.addExtension(Extension.cRLNumber, false, new ASN1Integer(1));
-        extGen.addExtension(Extension.issuingDistributionPoint, true, IssuingDistributionPoint.getInstance(new DERSequence()));
-
-        Extensions          ex = extGen.generate();
-
-        gen.setExtensions(ex);
-
-        TBSCertList                 tbs = gen.generateTBSCertList();
-        ByteArrayOutputStream       bOut = new ByteArrayOutputStream();
-        ASN1OutputStream            aOut = new ASN1OutputStream(bOut);
-
-        aOut.writeObject(tbs);
-
-        if (!Arrays.areEqual(bOut.toByteArray(), v2CertList))
-        {
-            System.out.println(new String(Base64.encode(bOut.toByteArray())));
-            fail("failed v2 cert list generation");
-        }
-
-        //
-        // read back test
-        //
-        ASN1InputStream aIn = new ASN1InputStream(new ByteArrayInputStream(v2CertList));
-        ASN1Primitive o = aIn.readObject();
-
-        bOut = new ByteArrayOutputStream();
-        aOut = new ASN1OutputStream(bOut);
-
-        aOut.writeObject(o);
-
-        if (!Arrays.areEqual(bOut.toByteArray(), v2CertList))
-        {
-            fail("failed v2 cert list read back test");
-        }
-
-        //
-        // check we can add a custom reason
-        //
-        gen.addCRLEntry(new ASN1Integer(1), new Time(new Date(1000)), CRLReason.aACompromise);
-
-        //
-        // check invalidity date
-        gen.addCRLEntry(new ASN1Integer(2), new Time(new Date(1000)), CRLReason.affiliationChanged, new ASN1GeneralizedTime(new Date(2000)));
-
-        TBSCertList crl = gen.generateTBSCertList();
-
-        TBSCertList.CRLEntry[] entries = crl.getRevokedCertificates();
-        for (int i = 0; i != entries.length; i++)
-        {
-            TBSCertList.CRLEntry entry = entries[i];
-
-            if (entry.getUserCertificate().equals(new ASN1Integer(1)))
-            {
-                Extensions extensions = entry.getExtensions();
-                Extension ext = extensions.getExtension(Extension.reasonCode);
-
-                CRLReason r = CRLReason.getInstance(ext.getParsedValue());
-
-                if (r.getValue().intValue() != CRLReason.aACompromise)
-                {
-                    fail("reason code mismatch");
-                }
-            }
-            else if (entry.getUserCertificate().equals(new ASN1Integer(2)))
-            {
-                Extensions extensions = entry.getExtensions();
-                Extension ext = extensions.getExtension(Extension.reasonCode);
-
-                CRLReason r = CRLReason.getInstance(ext.getParsedValue());
-
-                if (r.getValue().intValue() != CRLReason.affiliationChanged)
-                {
-                    fail("reason code mismatch");
-                }
-
-                ext = extensions.getExtension(Extension.invalidityDate);
-
-                ASN1GeneralizedTime t = ASN1GeneralizedTime.getInstance(ext.getParsedValue());
-
-                try
-                {
-                    if (!t.getDate().equals(new Date(2000)))
-                    {
-                        fail("invalidity date mismatch");
-                    }
-                }
-                catch (ParseException e)
-                {
-                    fail("can't parse date", e);
-                }
-            }
-        }
-    }
-    
-    public void performTest()
-        throws Exception
-    {
-        tbsV1CertGen();
-        tbsV3CertGen();
-        tbsV3CertGenWithNullSubject();
-        tbsV2CertListGen();
-    }
-
-    public String getName()
-    {
-        return "Generation";
-    }
-
-    private static byte[] getDigest(SubjectPublicKeyInfo spki)
-    {
-        Digest digest = new SHA1Digest();
-        byte[]  resBuf = new byte[digest.getDigestSize()];
-
-        byte[] bytes = spki.getPublicKeyData().getBytes();
-        digest.update(bytes, 0, bytes.length);
-        digest.doFinal(resBuf, 0);
-        return resBuf;
-    }
-
-    public static void main(
-        String[] args)
-    {
-        runTest(new GenerationTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/test/GetInstanceTest.java b/bcprov/src/main/java/org/bouncycastle/asn1/test/GetInstanceTest.java
deleted file mode 100644
index cda7c50..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/test/GetInstanceTest.java
+++ /dev/null
@@ -1,888 +0,0 @@
-package org.bouncycastle.asn1.test;
-
-import java.lang.reflect.Method;
-import java.math.BigInteger;
-import java.util.Date;
-import java.util.Vector;
-
-import junit.framework.TestCase;
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Enumerated;
-import org.bouncycastle.asn1.ASN1GeneralizedTime;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1TaggedObject;
-import org.bouncycastle.asn1.ASN1UTCTime;
-import org.bouncycastle.asn1.DERBMPString;
-import org.bouncycastle.asn1.DERBitString;
-import org.bouncycastle.asn1.DERGeneralString;
-import org.bouncycastle.asn1.DERIA5String;
-import org.bouncycastle.asn1.DERNull;
-import org.bouncycastle.asn1.DERNumericString;
-import org.bouncycastle.asn1.DEROctetString;
-import org.bouncycastle.asn1.DERPrintableString;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.DERSet;
-import org.bouncycastle.asn1.DERT61String;
-import org.bouncycastle.asn1.DERTaggedObject;
-import org.bouncycastle.asn1.DERUTF8String;
-import org.bouncycastle.asn1.DERUniversalString;
-import org.bouncycastle.asn1.DERVisibleString;
-import org.bouncycastle.asn1.cmp.CAKeyUpdAnnContent;
-import org.bouncycastle.asn1.cmp.CMPCertificate;
-import org.bouncycastle.asn1.cmp.CRLAnnContent;
-import org.bouncycastle.asn1.cmp.CertConfirmContent;
-import org.bouncycastle.asn1.cmp.CertOrEncCert;
-import org.bouncycastle.asn1.cmp.CertRepMessage;
-import org.bouncycastle.asn1.cmp.CertResponse;
-import org.bouncycastle.asn1.cmp.CertifiedKeyPair;
-import org.bouncycastle.asn1.cmp.Challenge;
-import org.bouncycastle.asn1.cmp.ErrorMsgContent;
-import org.bouncycastle.asn1.cmp.GenMsgContent;
-import org.bouncycastle.asn1.cmp.GenRepContent;
-import org.bouncycastle.asn1.cmp.InfoTypeAndValue;
-import org.bouncycastle.asn1.cmp.KeyRecRepContent;
-import org.bouncycastle.asn1.cmp.OOBCertHash;
-import org.bouncycastle.asn1.cmp.PBMParameter;
-import org.bouncycastle.asn1.cmp.PKIBody;
-import org.bouncycastle.asn1.cmp.PKIConfirmContent;
-import org.bouncycastle.asn1.cmp.PKIFailureInfo;
-import org.bouncycastle.asn1.cmp.PKIFreeText;
-import org.bouncycastle.asn1.cmp.PKIHeader;
-import org.bouncycastle.asn1.cmp.PKIMessage;
-import org.bouncycastle.asn1.cmp.PKIMessages;
-import org.bouncycastle.asn1.cmp.PKIStatus;
-import org.bouncycastle.asn1.cmp.PKIStatusInfo;
-import org.bouncycastle.asn1.cmp.POPODecKeyChallContent;
-import org.bouncycastle.asn1.cmp.POPODecKeyRespContent;
-import org.bouncycastle.asn1.cmp.PollRepContent;
-import org.bouncycastle.asn1.cmp.PollReqContent;
-import org.bouncycastle.asn1.cmp.ProtectedPart;
-import org.bouncycastle.asn1.cmp.RevAnnContent;
-import org.bouncycastle.asn1.cmp.RevDetails;
-import org.bouncycastle.asn1.cmp.RevRepContent;
-import org.bouncycastle.asn1.cmp.RevReqContent;
-import org.bouncycastle.asn1.cms.Attribute;
-import org.bouncycastle.asn1.cms.Attributes;
-import org.bouncycastle.asn1.cms.AuthEnvelopedData;
-import org.bouncycastle.asn1.cms.AuthenticatedData;
-import org.bouncycastle.asn1.cms.CompressedData;
-import org.bouncycastle.asn1.cms.ContentInfo;
-import org.bouncycastle.asn1.cms.EncryptedContentInfo;
-import org.bouncycastle.asn1.cms.EncryptedData;
-import org.bouncycastle.asn1.cms.EnvelopedData;
-import org.bouncycastle.asn1.cms.Evidence;
-import org.bouncycastle.asn1.cms.IssuerAndSerialNumber;
-import org.bouncycastle.asn1.cms.KEKIdentifier;
-import org.bouncycastle.asn1.cms.KEKRecipientInfo;
-import org.bouncycastle.asn1.cms.KeyAgreeRecipientIdentifier;
-import org.bouncycastle.asn1.cms.KeyAgreeRecipientInfo;
-import org.bouncycastle.asn1.cms.KeyTransRecipientInfo;
-import org.bouncycastle.asn1.cms.MetaData;
-import org.bouncycastle.asn1.cms.OriginatorIdentifierOrKey;
-import org.bouncycastle.asn1.cms.OriginatorInfo;
-import org.bouncycastle.asn1.cms.OriginatorPublicKey;
-import org.bouncycastle.asn1.cms.OtherKeyAttribute;
-import org.bouncycastle.asn1.cms.OtherRecipientInfo;
-import org.bouncycastle.asn1.cms.PasswordRecipientInfo;
-import org.bouncycastle.asn1.cms.RecipientEncryptedKey;
-import org.bouncycastle.asn1.cms.RecipientIdentifier;
-import org.bouncycastle.asn1.cms.RecipientInfo;
-import org.bouncycastle.asn1.cms.RecipientKeyIdentifier;
-import org.bouncycastle.asn1.cms.SignerIdentifier;
-import org.bouncycastle.asn1.cms.SignerInfo;
-import org.bouncycastle.asn1.cms.TimeStampAndCRL;
-import org.bouncycastle.asn1.cms.TimeStampTokenEvidence;
-import org.bouncycastle.asn1.cms.TimeStampedData;
-import org.bouncycastle.asn1.cms.ecc.MQVuserKeyingMaterial;
-import org.bouncycastle.asn1.crmf.AttributeTypeAndValue;
-import org.bouncycastle.asn1.crmf.CertId;
-import org.bouncycastle.asn1.crmf.CertReqMessages;
-import org.bouncycastle.asn1.crmf.CertReqMsg;
-import org.bouncycastle.asn1.crmf.CertRequest;
-import org.bouncycastle.asn1.crmf.CertTemplate;
-import org.bouncycastle.asn1.crmf.Controls;
-import org.bouncycastle.asn1.crmf.EncKeyWithID;
-import org.bouncycastle.asn1.crmf.EncryptedKey;
-import org.bouncycastle.asn1.crmf.EncryptedValue;
-import org.bouncycastle.asn1.crmf.OptionalValidity;
-import org.bouncycastle.asn1.crmf.PKIArchiveOptions;
-import org.bouncycastle.asn1.crmf.PKIPublicationInfo;
-import org.bouncycastle.asn1.crmf.PKMACValue;
-import org.bouncycastle.asn1.crmf.POPOPrivKey;
-import org.bouncycastle.asn1.crmf.POPOSigningKey;
-import org.bouncycastle.asn1.crmf.POPOSigningKeyInput;
-import org.bouncycastle.asn1.crmf.ProofOfPossession;
-import org.bouncycastle.asn1.crmf.SinglePubInfo;
-import org.bouncycastle.asn1.cryptopro.ECGOST3410ParamSetParameters;
-import org.bouncycastle.asn1.cryptopro.GOST28147Parameters;
-import org.bouncycastle.asn1.cryptopro.GOST3410ParamSetParameters;
-import org.bouncycastle.asn1.cryptopro.GOST3410PublicKeyAlgParameters;
-import org.bouncycastle.asn1.eac.CVCertificate;
-import org.bouncycastle.asn1.eac.CVCertificateRequest;
-import org.bouncycastle.asn1.eac.CertificateBody;
-import org.bouncycastle.asn1.eac.PublicKeyDataObject;
-import org.bouncycastle.asn1.eac.RSAPublicKey;
-import org.bouncycastle.asn1.eac.UnsignedInteger;
-import org.bouncycastle.asn1.esf.CommitmentTypeIndication;
-import org.bouncycastle.asn1.esf.CommitmentTypeQualifier;
-import org.bouncycastle.asn1.esf.CompleteRevocationRefs;
-import org.bouncycastle.asn1.esf.CrlIdentifier;
-import org.bouncycastle.asn1.esf.CrlListID;
-import org.bouncycastle.asn1.esf.CrlOcspRef;
-import org.bouncycastle.asn1.esf.CrlValidatedID;
-import org.bouncycastle.asn1.esf.OcspIdentifier;
-import org.bouncycastle.asn1.esf.OcspListID;
-import org.bouncycastle.asn1.esf.OcspResponsesID;
-import org.bouncycastle.asn1.esf.OtherHash;
-import org.bouncycastle.asn1.esf.OtherHashAlgAndValue;
-import org.bouncycastle.asn1.esf.OtherRevRefs;
-import org.bouncycastle.asn1.esf.OtherRevVals;
-import org.bouncycastle.asn1.esf.RevocationValues;
-import org.bouncycastle.asn1.esf.SPUserNotice;
-import org.bouncycastle.asn1.esf.SPuri;
-import org.bouncycastle.asn1.esf.SigPolicyQualifierInfo;
-import org.bouncycastle.asn1.esf.SigPolicyQualifiers;
-import org.bouncycastle.asn1.esf.SignaturePolicyId;
-import org.bouncycastle.asn1.esf.SignaturePolicyIdentifier;
-import org.bouncycastle.asn1.esf.SignerAttribute;
-import org.bouncycastle.asn1.esf.SignerLocation;
-import org.bouncycastle.asn1.ess.ContentHints;
-import org.bouncycastle.asn1.ess.ContentIdentifier;
-import org.bouncycastle.asn1.ess.ESSCertID;
-import org.bouncycastle.asn1.ess.ESSCertIDv2;
-import org.bouncycastle.asn1.ess.OtherCertID;
-import org.bouncycastle.asn1.ess.OtherSigningCertificate;
-import org.bouncycastle.asn1.ess.SigningCertificate;
-import org.bouncycastle.asn1.ess.SigningCertificateV2;
-import org.bouncycastle.asn1.icao.CscaMasterList;
-import org.bouncycastle.asn1.icao.DataGroupHash;
-import org.bouncycastle.asn1.icao.LDSSecurityObject;
-import org.bouncycastle.asn1.icao.LDSVersionInfo;
-import org.bouncycastle.asn1.isismtt.ocsp.CertHash;
-import org.bouncycastle.asn1.isismtt.ocsp.RequestedCertificate;
-import org.bouncycastle.asn1.isismtt.x509.AdditionalInformationSyntax;
-import org.bouncycastle.asn1.isismtt.x509.AdmissionSyntax;
-import org.bouncycastle.asn1.isismtt.x509.Admissions;
-import org.bouncycastle.asn1.isismtt.x509.DeclarationOfMajority;
-import org.bouncycastle.asn1.isismtt.x509.MonetaryLimit;
-import org.bouncycastle.asn1.isismtt.x509.NamingAuthority;
-import org.bouncycastle.asn1.isismtt.x509.ProcurationSyntax;
-import org.bouncycastle.asn1.isismtt.x509.ProfessionInfo;
-import org.bouncycastle.asn1.isismtt.x509.Restriction;
-import org.bouncycastle.asn1.misc.CAST5CBCParameters;
-import org.bouncycastle.asn1.misc.IDEACBCPar;
-import org.bouncycastle.asn1.mozilla.PublicKeyAndChallenge;
-import org.bouncycastle.asn1.ocsp.BasicOCSPResponse;
-import org.bouncycastle.asn1.ocsp.CertID;
-import org.bouncycastle.asn1.ocsp.CertStatus;
-import org.bouncycastle.asn1.ocsp.CrlID;
-import org.bouncycastle.asn1.ocsp.OCSPRequest;
-import org.bouncycastle.asn1.ocsp.OCSPResponse;
-import org.bouncycastle.asn1.ocsp.OCSPResponseStatus;
-import org.bouncycastle.asn1.ocsp.Request;
-import org.bouncycastle.asn1.ocsp.ResponderID;
-import org.bouncycastle.asn1.ocsp.ResponseBytes;
-import org.bouncycastle.asn1.ocsp.ResponseData;
-import org.bouncycastle.asn1.ocsp.RevokedInfo;
-import org.bouncycastle.asn1.ocsp.Signature;
-import org.bouncycastle.asn1.ocsp.SingleResponse;
-import org.bouncycastle.asn1.ocsp.TBSRequest;
-import org.bouncycastle.asn1.oiw.OIWObjectIdentifiers;
-import org.bouncycastle.asn1.pkcs.AuthenticatedSafe;
-import org.bouncycastle.asn1.pkcs.CertificationRequest;
-import org.bouncycastle.asn1.pkcs.CertificationRequestInfo;
-import org.bouncycastle.asn1.pkcs.DHParameter;
-import org.bouncycastle.asn1.pkcs.EncryptedPrivateKeyInfo;
-import org.bouncycastle.asn1.pkcs.MacData;
-import org.bouncycastle.asn1.pkcs.PBEParameter;
-import org.bouncycastle.asn1.pkcs.PBES2Parameters;
-import org.bouncycastle.asn1.pkcs.PBKDF2Params;
-import org.bouncycastle.asn1.pkcs.PKCS12PBEParams;
-import org.bouncycastle.asn1.pkcs.Pfx;
-import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
-import org.bouncycastle.asn1.pkcs.RC2CBCParameter;
-import org.bouncycastle.asn1.pkcs.RSAESOAEPparams;
-import org.bouncycastle.asn1.pkcs.RSAPrivateKey;
-import org.bouncycastle.asn1.pkcs.RSASSAPSSparams;
-import org.bouncycastle.asn1.pkcs.SafeBag;
-import org.bouncycastle.asn1.pkcs.SignedData;
-import org.bouncycastle.asn1.sec.ECPrivateKey;
-import org.bouncycastle.asn1.smime.SMIMECapabilities;
-import org.bouncycastle.asn1.smime.SMIMECapability;
-import org.bouncycastle.asn1.tsp.Accuracy;
-import org.bouncycastle.asn1.tsp.MessageImprint;
-import org.bouncycastle.asn1.tsp.TSTInfo;
-import org.bouncycastle.asn1.tsp.TimeStampReq;
-import org.bouncycastle.asn1.tsp.TimeStampResp;
-import org.bouncycastle.asn1.x500.DirectoryString;
-import org.bouncycastle.asn1.x500.RDN;
-import org.bouncycastle.asn1.x500.X500Name;
-import org.bouncycastle.asn1.x509.AccessDescription;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.asn1.x509.AttCertIssuer;
-import org.bouncycastle.asn1.x509.AttCertValidityPeriod;
-import org.bouncycastle.asn1.x509.AttributeCertificate;
-import org.bouncycastle.asn1.x509.AttributeCertificateInfo;
-import org.bouncycastle.asn1.x509.AuthorityInformationAccess;
-import org.bouncycastle.asn1.x509.AuthorityKeyIdentifier;
-import org.bouncycastle.asn1.x509.BasicConstraints;
-import org.bouncycastle.asn1.x509.CRLDistPoint;
-import org.bouncycastle.asn1.x509.CRLNumber;
-import org.bouncycastle.asn1.x509.CRLReason;
-import org.bouncycastle.asn1.x509.Certificate;
-import org.bouncycastle.asn1.x509.CertificateList;
-import org.bouncycastle.asn1.x509.CertificatePair;
-import org.bouncycastle.asn1.x509.CertificatePolicies;
-import org.bouncycastle.asn1.x509.DSAParameter;
-import org.bouncycastle.asn1.x509.DigestInfo;
-import org.bouncycastle.asn1.x509.DisplayText;
-import org.bouncycastle.asn1.x509.DistributionPoint;
-import org.bouncycastle.asn1.x509.DistributionPointName;
-import org.bouncycastle.asn1.x509.ExtendedKeyUsage;
-import org.bouncycastle.asn1.x509.Extensions;
-import org.bouncycastle.asn1.x509.GeneralName;
-import org.bouncycastle.asn1.x509.GeneralNames;
-import org.bouncycastle.asn1.x509.GeneralSubtree;
-import org.bouncycastle.asn1.x509.Holder;
-import org.bouncycastle.asn1.x509.IetfAttrSyntax;
-import org.bouncycastle.asn1.x509.IssuerSerial;
-import org.bouncycastle.asn1.x509.IssuingDistributionPoint;
-import org.bouncycastle.asn1.x509.NameConstraints;
-import org.bouncycastle.asn1.x509.NoticeReference;
-import org.bouncycastle.asn1.x509.ObjectDigestInfo;
-import org.bouncycastle.asn1.x509.PolicyInformation;
-import org.bouncycastle.asn1.x509.PolicyMappings;
-import org.bouncycastle.asn1.x509.PolicyQualifierInfo;
-import org.bouncycastle.asn1.x509.PrivateKeyUsagePeriod;
-import org.bouncycastle.asn1.x509.RSAPublicKeyStructure;
-import org.bouncycastle.asn1.x509.RoleSyntax;
-import org.bouncycastle.asn1.x509.SubjectDirectoryAttributes;
-import org.bouncycastle.asn1.x509.SubjectKeyIdentifier;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.bouncycastle.asn1.x509.TBSCertList;
-import org.bouncycastle.asn1.x509.TBSCertificate;
-import org.bouncycastle.asn1.x509.TBSCertificateStructure;
-import org.bouncycastle.asn1.x509.Target;
-import org.bouncycastle.asn1.x509.TargetInformation;
-import org.bouncycastle.asn1.x509.Targets;
-import org.bouncycastle.asn1.x509.Time;
-import org.bouncycastle.asn1.x509.UserNotice;
-import org.bouncycastle.asn1.x509.V2Form;
-import org.bouncycastle.asn1.x509.X509CertificateStructure;
-import org.bouncycastle.asn1.x509.X509Extensions;
-import org.bouncycastle.asn1.x509.X509Name;
-import org.bouncycastle.asn1.x509.qualified.BiometricData;
-import org.bouncycastle.asn1.x509.qualified.Iso4217CurrencyCode;
-import org.bouncycastle.asn1.x509.qualified.MonetaryValue;
-import org.bouncycastle.asn1.x509.qualified.QCStatement;
-import org.bouncycastle.asn1.x509.qualified.SemanticsInformation;
-import org.bouncycastle.asn1.x509.qualified.TypeOfBiometricData;
-import org.bouncycastle.asn1.x509.sigi.NameOrPseudonym;
-import org.bouncycastle.asn1.x509.sigi.PersonalData;
-import org.bouncycastle.asn1.x9.DHDomainParameters;
-import org.bouncycastle.asn1.x9.DHPublicKey;
-import org.bouncycastle.asn1.x9.DHValidationParms;
-import org.bouncycastle.asn1.x9.X962Parameters;
-import org.bouncycastle.asn1.x9.X9ECParameters;
-import org.bouncycastle.util.Integers;
-import org.bouncycastle.util.encoders.Base64;
-
-public class GetInstanceTest
-    extends TestCase
-{
-    public static byte[]  attrCert = Base64.decode(
-            "MIIHQDCCBqkCAQEwgZChgY2kgYowgYcxHDAaBgkqhkiG9w0BCQEWDW1sb3JjaEB2"
-          + "dC5lZHUxHjAcBgNVBAMTFU1hcmt1cyBMb3JjaCAobWxvcmNoKTEbMBkGA1UECxMS"
-          + "VmlyZ2luaWEgVGVjaCBVc2VyMRAwDgYDVQQLEwdDbGFzcyAyMQswCQYDVQQKEwJ2"
-          + "dDELMAkGA1UEBhMCVVMwgYmkgYYwgYMxGzAZBgkqhkiG9w0BCQEWDHNzaGFoQHZ0"
-          + "LmVkdTEbMBkGA1UEAxMSU3VtaXQgU2hhaCAoc3NoYWgpMRswGQYDVQQLExJWaXJn"
-          + "aW5pYSBUZWNoIFVzZXIxEDAOBgNVBAsTB0NsYXNzIDExCzAJBgNVBAoTAnZ0MQsw"
-          + "CQYDVQQGEwJVUzANBgkqhkiG9w0BAQQFAAIBBTAiGA8yMDAzMDcxODE2MDgwMloY"
-          + "DzIwMDMwNzI1MTYwODAyWjCCBU0wggVJBgorBgEEAbRoCAEBMYIFORaCBTU8UnVs"
-          + "ZSBSdWxlSWQ9IkZpbGUtUHJpdmlsZWdlLVJ1bGUiIEVmZmVjdD0iUGVybWl0Ij4K"
-          + "IDxUYXJnZXQ+CiAgPFN1YmplY3RzPgogICA8U3ViamVjdD4KICAgIDxTdWJqZWN0"
-          + "TWF0Y2ggTWF0Y2hJZD0idXJuOm9hc2lzOm5hbWVzOnRjOnhhY21sOjEuMDpmdW5j"
-          + "dGlvbjpzdHJpbmctZXF1YWwiPgogICAgIDxBdHRyaWJ1dGVWYWx1ZSBEYXRhVHlw"
-          + "ZT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS9YTUxTY2hlbWEjc3RyaW5nIj4KICAg"
-          + "ICAgIENOPU1hcmt1cyBMb3JjaDwvQXR0cmlidXRlVmFsdWU+CiAgICAgPFN1Ympl"
-          + "Y3RBdHRyaWJ1dGVEZXNpZ25hdG9yIEF0dHJpYnV0ZUlkPSJ1cm46b2FzaXM6bmFt"
-          + "ZXM6dGM6eGFjbWw6MS4wOnN1YmplY3Q6c3ViamVjdC1pZCIgRGF0YVR5cGU9Imh0"
-          + "dHA6Ly93d3cudzMub3JnLzIwMDEvWE1MU2NoZW1hI3N0cmluZyIgLz4gCiAgICA8"
-          + "L1N1YmplY3RNYXRjaD4KICAgPC9TdWJqZWN0PgogIDwvU3ViamVjdHM+CiAgPFJl"
-          + "c291cmNlcz4KICAgPFJlc291cmNlPgogICAgPFJlc291cmNlTWF0Y2ggTWF0Y2hJ"
-          + "ZD0idXJuOm9hc2lzOm5hbWVzOnRjOnhhY21sOjEuMDpmdW5jdGlvbjpzdHJpbmct"
-          + "ZXF1YWwiPgogICAgIDxBdHRyaWJ1dGVWYWx1ZSBEYXRhVHlwZT0iaHR0cDovL3d3"
-          + "dy53My5vcmcvMjAwMS9YTUxTY2hlbWEjYW55VVJJIj4KICAgICAgaHR0cDovL3p1"
-          + "bmkuY3MudnQuZWR1PC9BdHRyaWJ1dGVWYWx1ZT4KICAgICA8UmVzb3VyY2VBdHRy"
-          + "aWJ1dGVEZXNpZ25hdG9yIEF0dHJpYnV0ZUlkPSJ1cm46b2FzaXM6bmFtZXM6dGM6"
-          + "eGFjbWw6MS4wOnJlc291cmNlOnJlc291cmNlLWlkIiBEYXRhVHlwZT0iaHR0cDov"
-          + "L3d3dy53My5vcmcvMjAwMS9YTUxTY2hlbWEjYW55VVJJIiAvPiAKICAgIDwvUmVz"
-          + "b3VyY2VNYXRjaD4KICAgPC9SZXNvdXJjZT4KICA8L1Jlc291cmNlcz4KICA8QWN0"
-          + "aW9ucz4KICAgPEFjdGlvbj4KICAgIDxBY3Rpb25NYXRjaCBNYXRjaElkPSJ1cm46"
-          + "b2FzaXM6bmFtZXM6dGM6eGFjbWw6MS4wOmZ1bmN0aW9uOnN0cmluZy1lcXVhbCI+"
-          + "CiAgICAgPEF0dHJpYnV0ZVZhbHVlIERhdGFUeXBlPSJodHRwOi8vd3d3LnczLm9y"
-          + "Zy8yMDAxL1hNTFNjaGVtYSNzdHJpbmciPgpEZWxlZ2F0ZSBBY2Nlc3MgICAgIDwv"
-          + "QXR0cmlidXRlVmFsdWU+CgkgIDxBY3Rpb25BdHRyaWJ1dGVEZXNpZ25hdG9yIEF0"
-          + "dHJpYnV0ZUlkPSJ1cm46b2FzaXM6bmFtZXM6dGM6eGFjbWw6MS4wOmFjdGlvbjph"
-          + "Y3Rpb24taWQiIERhdGFUeXBlPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxL1hNTFNj"
-          + "aGVtYSNzdHJpbmciIC8+IAogICAgPC9BY3Rpb25NYXRjaD4KICAgPC9BY3Rpb24+"
-          + "CiAgPC9BY3Rpb25zPgogPC9UYXJnZXQ+CjwvUnVsZT4KMA0GCSqGSIb3DQEBBAUA"
-          + "A4GBAGiJSM48XsY90HlYxGmGVSmNR6ZW2As+bot3KAfiCIkUIOAqhcphBS23egTr"
-          + "6asYwy151HshbPNYz+Cgeqs45KkVzh7bL/0e1r8sDVIaaGIkjHK3CqBABnfSayr3"
-          + "Rd1yBoDdEv8Qb+3eEPH6ab9021AsLEnJ6LWTmybbOpMNZ3tv");
-
-    byte[]  cert1 = Base64.decode(
-        "MIIDXjCCAsegAwIBAgIBBzANBgkqhkiG9w0BAQQFADCBtzELMAkGA1UEBhMCQVUx"
-            + "ETAPBgNVBAgTCFZpY3RvcmlhMRgwFgYDVQQHEw9Tb3V0aCBNZWxib3VybmUxGjAY"
-            + "BgNVBAoTEUNvbm5lY3QgNCBQdHkgTHRkMR4wHAYDVQQLExVDZXJ0aWZpY2F0ZSBB"
-            + "dXRob3JpdHkxFTATBgNVBAMTDENvbm5lY3QgNCBDQTEoMCYGCSqGSIb3DQEJARYZ"
-            + "d2VibWFzdGVyQGNvbm5lY3Q0LmNvbS5hdTAeFw0wMDA2MDIwNzU2MjFaFw0wMTA2"
-            + "MDIwNzU2MjFaMIG4MQswCQYDVQQGEwJBVTERMA8GA1UECBMIVmljdG9yaWExGDAW"
-            + "BgNVBAcTD1NvdXRoIE1lbGJvdXJuZTEaMBgGA1UEChMRQ29ubmVjdCA0IFB0eSBM"
-            + "dGQxFzAVBgNVBAsTDldlYnNlcnZlciBUZWFtMR0wGwYDVQQDExR3d3cyLmNvbm5l"
-            + "Y3Q0LmNvbS5hdTEoMCYGCSqGSIb3DQEJARYZd2VibWFzdGVyQGNvbm5lY3Q0LmNv"
-            + "bS5hdTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEArvDxclKAhyv7Q/Wmr2re"
-            + "Gw4XL9Cnh9e+6VgWy2AWNy/MVeXdlxzd7QAuc1eOWQkGQEiLPy5XQtTY+sBUJ3AO"
-            + "Rvd2fEVJIcjf29ey7bYua9J/vz5MG2KYo9/WCHIwqD9mmG9g0xLcfwq/s8ZJBswE"
-            + "7sb85VU+h94PTvsWOsWuKaECAwEAAaN3MHUwJAYDVR0RBB0wG4EZd2VibWFzdGVy"
-            + "QGNvbm5lY3Q0LmNvbS5hdTA6BglghkgBhvhCAQ0ELRYrbW9kX3NzbCBnZW5lcmF0"
-            + "ZWQgY3VzdG9tIHNlcnZlciBjZXJ0aWZpY2F0ZTARBglghkgBhvhCAQEEBAMCBkAw"
-            + "DQYJKoZIhvcNAQEEBQADgYEAotccfKpwSsIxM1Hae8DR7M/Rw8dg/RqOWx45HNVL"
-            + "iBS4/3N/TO195yeQKbfmzbAA2jbPVvIvGgTxPgO1MP4ZgvgRhasaa0qCJCkWvpM4"
-            + "yQf33vOiYQbpv4rTwzU8AmRlBG45WdjyNIigGV+oRc61aKCTnLq7zB8N3z1TF/bF"
-            + "5/8=");
-
-    private byte[] v2CertList = Base64.decode(
-          "MIICjTCCAfowDQYJKoZIhvcNAQECBQAwXzELMAkGA1UEBhMCVVMxIDAeBgNVBAoT"
-        + "F1JTQSBEYXRhIFNlY3VyaXR5LCBJbmMuMS4wLAYDVQQLEyVTZWN1cmUgU2VydmVy"
-        + "IENlcnRpZmljYXRpb24gQXV0aG9yaXR5Fw05NTA1MDIwMjEyMjZaFw05NTA2MDEw"
-        + "MDAxNDlaMIIBaDAWAgUCQQAABBcNOTUwMjAxMTcyNDI2WjAWAgUCQQAACRcNOTUw"
-        + "MjEwMDIxNjM5WjAWAgUCQQAADxcNOTUwMjI0MDAxMjQ5WjAWAgUCQQAADBcNOTUw"
-        + "MjI1MDA0NjQ0WjAWAgUCQQAAGxcNOTUwMzEzMTg0MDQ5WjAWAgUCQQAAFhcNOTUw"
-        + "MzE1MTkxNjU0WjAWAgUCQQAAGhcNOTUwMzE1MTk0MDQxWjAWAgUCQQAAHxcNOTUw"
-        + "MzI0MTk0NDMzWjAWAgUCcgAABRcNOTUwMzI5MjAwNzExWjAWAgUCcgAAERcNOTUw"
-        + "MzMwMDIzNDI2WjAWAgUCQQAAIBcNOTUwNDA3MDExMzIxWjAWAgUCcgAAHhcNOTUw"
-        + "NDA4MDAwMjU5WjAWAgUCcgAAQRcNOTUwNDI4MTcxNzI0WjAWAgUCcgAAOBcNOTUw"
-        + "NDI4MTcyNzIxWjAWAgUCcgAATBcNOTUwNTAyMDIxMjI2WjANBgkqhkiG9w0BAQIF"
-        + "AAN+AHqOEJXSDejYy0UwxxrH/9+N2z5xu/if0J6qQmK92W0hW158wpJg+ovV3+wQ"
-        + "wvIEPRL2rocL0tKfAsVq1IawSJzSNgxG0lrcla3MrJBnZ4GaZDu4FutZh72MR3Gt"
-        + "JaAL3iTJHJD55kK2D/VoyY1djlsPuNh6AEgdVwFAyp0v");
-
-    private static final Object[] NULL_ARGS = new Object[] { null };
-
-    private void doFullGetInstanceTest(Class clazz, ASN1Object o1)
-        throws Exception
-    {
-        Method m;
-
-        try
-        {
-            m = clazz.getMethod("getInstance", Object.class);
-        }
-        catch (NoSuchMethodException e)
-        {
-            fail("no getInstance method found");
-            return;
-        }
-
-        ASN1Object o2 = (ASN1Object)m.invoke(clazz, NULL_ARGS);
-        if (o2 != null)
-        {
-            fail(clazz.getName() + " null failed");
-        }
-
-        o2 = (ASN1Object)m.invoke(clazz, o1);
-
-        if (!o1.equals(o2) || !clazz.isInstance(o2))
-        {
-            fail(clazz.getName() + " equality failed");
-        }
-
-        o2 = (ASN1Object)m.invoke(clazz, o1.getEncoded());
-        if (!o1.equals(o2) || !clazz.isInstance(o2))
-        {
-            fail(clazz.getName() + " encoded equality failed");
-        }
-
-        o2 = (ASN1Object)m.invoke(clazz, o1.toASN1Primitive());
-        if (!o1.equals(o2) || !clazz.isInstance(o2))
-        {
-            fail(clazz.getName() + " sequence equality failed");
-        }
-
-        try
-        {
-            m = clazz.getMethod("getInstance", ASN1TaggedObject.class, Boolean.TYPE);
-        }
-        catch (NoSuchMethodException e)
-        {
-            return;
-        }
-
-        ASN1TaggedObject t = new DERTaggedObject(true, 0, o1);
-        o2 = (ASN1Object)m.invoke(clazz, t, true);
-        if (!o1.equals(o2) || !clazz.isInstance(o2))
-        {
-            fail(clazz.getName() + " tag equality failed");
-        }
-
-        t = new DERTaggedObject(true, 0, o1.toASN1Primitive());
-        o2 = (ASN1Object)m.invoke(clazz, t, true);
-        if (!o1.equals(o2) || !clazz.isInstance(o2))
-        {
-            fail(clazz.getName() + " tag equality failed");
-        }
-
-        t = ASN1TaggedObject.getInstance(t.getEncoded());
-        o2 = (ASN1Object)m.invoke(clazz, t, true);
-        if (!o1.equals(o2) || !clazz.isInstance(o2))
-        {
-            fail(clazz.getName() + " tag equality failed");
-        }
-
-        t = new DERTaggedObject(false, 0, o1);
-        o2 = (ASN1Object)m.invoke(clazz, t, false);
-        if (!o1.equals(o2) || !clazz.isInstance(o2))
-        {
-            fail(clazz.getName() + " tag equality failed");
-        }
-
-        t = new DERTaggedObject(false, 0, o1.toASN1Primitive());
-        o2 = (ASN1Object)m.invoke(clazz, t, false);
-        if (!o1.equals(o2) || !clazz.isInstance(o2))
-        {
-            fail(clazz.getName() + " tag equality failed");
-        }
-
-        t = ASN1TaggedObject.getInstance(t.getEncoded());
-        o2 = (ASN1Object)m.invoke(clazz, t, false);
-        if (!o1.equals(o2) || !clazz.isInstance(o2))
-        {
-            fail(clazz.getName() + " tag equality failed");
-        }
-    }
-
-    public void testGetInstance()
-        throws Exception
-    {
-        doFullGetInstanceTest(DERPrintableString.class, new DERPrintableString("hello world"));
-        doFullGetInstanceTest(DERBMPString.class, new DERBMPString("hello world"));
-        doFullGetInstanceTest(DERUTF8String.class, new DERUTF8String("hello world"));
-        doFullGetInstanceTest(DERUniversalString.class, new DERUniversalString(new byte[20]));
-        doFullGetInstanceTest(DERIA5String.class, new DERIA5String("hello world"));
-        doFullGetInstanceTest(DERGeneralString.class, new DERGeneralString("hello world"));
-        doFullGetInstanceTest(DERNumericString.class, new DERNumericString("hello world"));
-        doFullGetInstanceTest(DERNumericString.class, new DERNumericString("99999", true));
-        doFullGetInstanceTest(DERT61String.class, new DERT61String("hello world"));
-        doFullGetInstanceTest(DERVisibleString.class, new DERVisibleString("hello world"));
-
-        doFullGetInstanceTest(ASN1Integer.class, new ASN1Integer(1));
-        doFullGetInstanceTest(ASN1GeneralizedTime.class, new ASN1GeneralizedTime(new Date()));
-        doFullGetInstanceTest(ASN1UTCTime.class, new ASN1UTCTime(new Date()));
-        doFullGetInstanceTest(ASN1Enumerated.class, new ASN1Enumerated(1));
-
-        CMPCertificate cmpCert = new CMPCertificate(Certificate.getInstance(cert1));
-        CertificateList crl = CertificateList.getInstance(v2CertList);
-        AttributeCertificate attributeCert = AttributeCertificate.getInstance(attrCert);
-
-        doFullGetInstanceTest(CAKeyUpdAnnContent.class, new CAKeyUpdAnnContent(cmpCert, cmpCert, cmpCert));
-
-        CertConfirmContent.getInstance(null);
-        CertifiedKeyPair.getInstance(null);
-        CertOrEncCert.getInstance(null);
-        CertRepMessage.getInstance(null);
-        doFullGetInstanceTest(CertResponse.class, new CertResponse(new ASN1Integer(1), new PKIStatusInfo(PKIStatus.granted)));
-        doFullGetInstanceTest(org.bouncycastle.asn1.cmp.CertStatus.class, new org.bouncycastle.asn1.cmp.CertStatus(new byte[10], BigInteger.valueOf(1), new PKIStatusInfo(PKIStatus.granted)));
-        doFullGetInstanceTest(Challenge.class, new Challenge(new AlgorithmIdentifier(OIWObjectIdentifiers.idSHA1, DERNull.INSTANCE), new byte[10], new byte[10]));
-
-        doFullGetInstanceTest(CMPCertificate.class, cmpCert);
-        doFullGetInstanceTest(CRLAnnContent.class, new CRLAnnContent(crl));
-        doFullGetInstanceTest(ErrorMsgContent.class, new ErrorMsgContent(new PKIStatusInfo(PKIStatus.granted), new ASN1Integer(1), new PKIFreeText("fred")));
-        GenMsgContent.getInstance(null);
-        GenRepContent.getInstance(null);
-        InfoTypeAndValue.getInstance(null);
-        KeyRecRepContent.getInstance(null);
-        OOBCertHash.getInstance(null);
-        PBMParameter.getInstance(null);
-        PKIBody.getInstance(null);
-        PKIConfirmContent.getInstance(null);
-        PKIFreeText.getInstance(null);
-        doFullGetInstanceTest(PKIFreeText.class, new PKIFreeText("hello world"));
-        doFullGetInstanceTest(PKIFreeText.class, new PKIFreeText(new String[]{"hello", "world"}));
-        doFullGetInstanceTest(PKIFreeText.class, new PKIFreeText(new DERUTF8String[]{new DERUTF8String("hello"), new DERUTF8String("world")}));
-        PKIHeader.getInstance(null);
-        PKIMessage.getInstance(null);
-        PKIMessages.getInstance(null);
-        doFullGetInstanceTest(PKIStatusInfo.class, new PKIStatusInfo(PKIStatus.rejection, new PKIFreeText("hello world"), new PKIFailureInfo(PKIFailureInfo.badAlg)));
-        doFullGetInstanceTest(PKIStatusInfo.class, new PKIStatusInfo(PKIStatus.granted, new PKIFreeText("hello world")));
-        PKIStatus.getInstance(null);
-        PollRepContent.getInstance(null);
-        PollReqContent.getInstance(null);
-        POPODecKeyChallContent.getInstance(null);
-        POPODecKeyRespContent.getInstance(null);
-        ProtectedPart.getInstance(null);
-        RevAnnContent.getInstance(null);
-        RevDetails.getInstance(null);
-        RevRepContent.getInstance(null);
-        RevReqContent.getInstance(null);
-        Attribute.getInstance(null);
-        Attributes.getInstance(null);
-        AuthenticatedData.getInstance(null);
-        AuthenticatedData.getInstance(null);
-        AuthEnvelopedData.getInstance(null);
-        AuthEnvelopedData.getInstance(null);
-        CompressedData.getInstance(null);
-        CompressedData.getInstance(null);
-        ContentInfo.getInstance(null);
-        EncryptedContentInfo.getInstance(null);
-        EncryptedData.getInstance(null);
-        EnvelopedData.getInstance(null);
-        EnvelopedData.getInstance(null);
-        Evidence.getInstance(null);
-        IssuerAndSerialNumber.getInstance(null);
-        KEKIdentifier.getInstance(null);
-        KEKIdentifier.getInstance(null);
-        KEKRecipientInfo.getInstance(null);
-        KEKRecipientInfo.getInstance(null);
-        KeyAgreeRecipientIdentifier.getInstance(null);
-        KeyAgreeRecipientIdentifier.getInstance(null);
-        KeyAgreeRecipientInfo.getInstance(null);
-        KeyAgreeRecipientInfo.getInstance(null);
-        KeyTransRecipientInfo.getInstance(null);
-        MetaData.getInstance(null);
-        OriginatorIdentifierOrKey.getInstance(null);
-        OriginatorIdentifierOrKey.getInstance(null);
-        OriginatorInfo.getInstance(null);
-        OriginatorInfo.getInstance(null);
-        OriginatorPublicKey.getInstance(null);
-        OriginatorPublicKey.getInstance(null);
-        OtherKeyAttribute.getInstance(null);
-        OtherRecipientInfo.getInstance(null);
-        OtherRecipientInfo.getInstance(null);
-        PasswordRecipientInfo.getInstance(null);
-        PasswordRecipientInfo.getInstance(null);
-        RecipientEncryptedKey.getInstance(null);
-        RecipientIdentifier.getInstance(null);
-        RecipientInfo.getInstance(null);
-        RecipientKeyIdentifier.getInstance(null);
-        RecipientKeyIdentifier.getInstance(null);
-        SignedData.getInstance(null);
-        SignerIdentifier.getInstance(null);
-        SignerInfo.getInstance(null);
-        Time.getInstance(null);
-        Time.getInstance(null);
-        TimeStampAndCRL.getInstance(null);
-        TimeStampedData.getInstance(null);
-        TimeStampTokenEvidence.getInstance(null);
-        AttributeTypeAndValue.getInstance(null);
-
-        doFullGetInstanceTest(CertId.class, new CertId(new GeneralName(new X500Name("CN=Test")), BigInteger.valueOf(1)));
-
-
-        CertReqMessages.getInstance(null);
-        CertReqMsg.getInstance(null);
-        CertRequest.getInstance(null);
-        CertTemplate.getInstance(null);
-        Controls.getInstance(null);
-        EncKeyWithID.getInstance(null);
-        EncryptedKey.getInstance(null);
-        EncryptedValue.getInstance(null);
-        OptionalValidity.getInstance(null);
-        PKIArchiveOptions.getInstance(null);
-        PKIPublicationInfo.getInstance(null);
-        PKMACValue.getInstance(null);
-        PKMACValue.getInstance(null);
-        POPOPrivKey.getInstance(null);
-        POPOSigningKeyInput.getInstance(null);
-        POPOSigningKey.getInstance(null);
-        POPOSigningKey.getInstance(null);
-        ProofOfPossession.getInstance(null);
-        SinglePubInfo.getInstance(null);
-        ECGOST3410ParamSetParameters.getInstance(null);
-        ECGOST3410ParamSetParameters.getInstance(null);
-        GOST28147Parameters.getInstance(null);
-        GOST28147Parameters.getInstance(null);
-        GOST3410ParamSetParameters.getInstance(null);
-        GOST3410ParamSetParameters.getInstance(null);
-        GOST3410PublicKeyAlgParameters.getInstance(null);
-        GOST3410PublicKeyAlgParameters.getInstance(null);
-        CertificateBody.getInstance(null);
-        CVCertificate.getInstance(null);
-        CVCertificateRequest.getInstance(null);
-        PublicKeyDataObject.getInstance(null);
-        UnsignedInteger.getInstance(null);
-        CommitmentTypeIndication.getInstance(null);
-        CommitmentTypeQualifier.getInstance(null);
-
-        OcspIdentifier ocspIdentifier = new OcspIdentifier(new ResponderID(new X500Name("CN=Test")), new ASN1GeneralizedTime(new Date()));
-        CrlListID crlListID = new CrlListID(new CrlValidatedID[]{new CrlValidatedID(new OtherHash(new byte[20]))});
-        OcspListID ocspListID = new OcspListID(new OcspResponsesID[] { new OcspResponsesID(ocspIdentifier) });
-        OtherRevRefs otherRevRefs = new OtherRevRefs(new ASN1ObjectIdentifier("1.2.1"), new DERSequence());
-        OtherRevVals otherRevVals = new OtherRevVals(new ASN1ObjectIdentifier("1.2.1"), new DERSequence());
-        CrlOcspRef crlOcspRef = new CrlOcspRef(crlListID, ocspListID, otherRevRefs);
-        doFullGetInstanceTest(CompleteRevocationRefs.class, new CompleteRevocationRefs(new CrlOcspRef[]{crlOcspRef, crlOcspRef}));
-
-        doFullGetInstanceTest(CrlIdentifier.class, new CrlIdentifier(new X500Name("CN=Test"), new ASN1UTCTime(new Date()), BigInteger.valueOf(1)));
-
-
-        doFullGetInstanceTest(CrlListID.class, crlListID);
-        doFullGetInstanceTest(CrlOcspRef.class, crlOcspRef);
-        doFullGetInstanceTest(CrlValidatedID.class, new CrlValidatedID(new OtherHash(new byte[20])));
-        doFullGetInstanceTest(OcspIdentifier.class, ocspIdentifier);
-        doFullGetInstanceTest(OcspListID.class, ocspListID);
-        doFullGetInstanceTest(OcspResponsesID.class, new OcspResponsesID(ocspIdentifier));
-
-        OtherHashAlgAndValue otherHashAlgAndValue = new OtherHashAlgAndValue(new AlgorithmIdentifier(OIWObjectIdentifiers.idSHA1, DERNull.INSTANCE), new DEROctetString(new byte[10]));
-        doFullGetInstanceTest(OtherHashAlgAndValue.class, otherHashAlgAndValue);
-        OtherHash.getInstance(null);
-        doFullGetInstanceTest(OtherRevRefs.class, otherRevRefs);
-        doFullGetInstanceTest(OtherRevVals.class, otherRevVals);
-        doFullGetInstanceTest(RevocationValues.class, new RevocationValues(new CertificateList[]{crl}, null, otherRevVals));
-
-        SignaturePolicyId signaturePolicyId = new SignaturePolicyId(new ASN1ObjectIdentifier("1.2.1"), otherHashAlgAndValue);
-        doFullGetInstanceTest(SignaturePolicyIdentifier.class, new SignaturePolicyIdentifier());
-        doFullGetInstanceTest(SignaturePolicyIdentifier.class, new SignaturePolicyIdentifier(signaturePolicyId));
-        doFullGetInstanceTest(SignaturePolicyId.class, signaturePolicyId);
-        doFullGetInstanceTest(SignerAttribute.class, new SignerAttribute(new org.bouncycastle.asn1.x509.Attribute[]{new org.bouncycastle.asn1.x509.Attribute(new ASN1ObjectIdentifier("1.2.1"), new DERSet())}));
-        doFullGetInstanceTest(SignerAttribute.class, new SignerAttribute(attributeCert));
-
-        ASN1EncodableVector postalAddr = new ASN1EncodableVector();
-
-        postalAddr.add(new DERUTF8String("line 1"));
-        postalAddr.add(new DERUTF8String("line 2"));
-
-        doFullGetInstanceTest(SignerLocation.class, new SignerLocation(new DERUTF8String("AU"), new DERUTF8String("Melbourne"), new DERSequence(postalAddr)));
-        doFullGetInstanceTest(SigPolicyQualifierInfo.class, new SigPolicyQualifierInfo(new ASN1ObjectIdentifier("1.2.1"), new DERSequence()));
-        SigPolicyQualifiers.getInstance(null);
-        SPuri.getInstance(null);
-        Vector v = new Vector();
-
-        v.add(Integers.valueOf(1));
-        v.add(BigInteger.valueOf(2));
-        NoticeReference noticeReference = new NoticeReference("BC", v);
-        doFullGetInstanceTest(SPUserNotice.class, new SPUserNotice(noticeReference, new DisplayText("hello world")));
-        ContentHints.getInstance(null);
-        ContentIdentifier.getInstance(null);
-        ESSCertID.getInstance(null);
-        ESSCertIDv2.getInstance(null);
-        OtherCertID.getInstance(null);
-        OtherSigningCertificate.getInstance(null);
-        SigningCertificate.getInstance(null);
-        SigningCertificateV2.getInstance(null);
-        CscaMasterList.getInstance(null);
-        DataGroupHash.getInstance(null);
-        LDSSecurityObject.getInstance(null);
-        LDSVersionInfo.getInstance(null);
-        CAST5CBCParameters.getInstance(null);
-        IDEACBCPar.getInstance(null);
-        PublicKeyAndChallenge.getInstance(null);
-        BasicOCSPResponse.getInstance(null);
-        BasicOCSPResponse.getInstance(null);
-
-        doFullGetInstanceTest(CertID.class, new CertID(new AlgorithmIdentifier(OIWObjectIdentifiers.idSHA1, DERNull.INSTANCE), new DEROctetString(new byte[1]), new DEROctetString(new byte[1]), new ASN1Integer(1)));
-
-        CertStatus.getInstance(null);
-        CertStatus.getInstance(null);
-        CrlID.getInstance(null);
-        OCSPRequest.getInstance(null);
-        OCSPRequest.getInstance(null);
-        OCSPResponse.getInstance(null);
-        OCSPResponse.getInstance(null);
-        OCSPResponseStatus.getInstance(null);
-        Request.getInstance(null);
-        Request.getInstance(null);
-        ResponderID.getInstance(null);
-        ResponderID.getInstance(null);
-        ResponseBytes.getInstance(null);
-        ResponseBytes.getInstance(null);
-        ResponseData.getInstance(null);
-        ResponseData.getInstance(null);
-        RevokedInfo.getInstance(null);
-        RevokedInfo.getInstance(null);
-        Signature.getInstance(null);
-        Signature.getInstance(null);
-        SingleResponse.getInstance(null);
-        SingleResponse.getInstance(null);
-        TBSRequest.getInstance(null);
-        TBSRequest.getInstance(null);
-        Attribute.getInstance(null);
-        AuthenticatedSafe.getInstance(null);
-        CertificationRequestInfo.getInstance(null);
-        CertificationRequest.getInstance(null);
-        ContentInfo.getInstance(null);
-        DHParameter.getInstance(null);
-        EncryptedData.getInstance(null);
-        EncryptedPrivateKeyInfo.getInstance(null);
-        AlgorithmIdentifier.getInstance(null);
-        IssuerAndSerialNumber.getInstance(null);
-        MacData.getInstance(null);
-        PBEParameter.getInstance(null);
-        PBES2Parameters.getInstance(null);
-        PBKDF2Params.getInstance(null);
-        Pfx.getInstance(null);
-        PKCS12PBEParams.getInstance(null);
-        PrivateKeyInfo.getInstance(null);
-        PrivateKeyInfo.getInstance(null);
-        RC2CBCParameter.getInstance(null);
-        RSAESOAEPparams.getInstance(null);
-        RSAPrivateKey.getInstance(null);
-        RSAPrivateKey.getInstance(null);
-        RSAPublicKey.getInstance(null);
-        RSAPublicKey.getInstance(null);
-        RSASSAPSSparams.getInstance(null);
-        SafeBag.getInstance(null);
-        SignedData.getInstance(null);
-        SignerInfo.getInstance(null);
-        ECPrivateKey.getInstance(null);
-        SMIMECapabilities.getInstance(null);
-        SMIMECapability.getInstance(null);
-        Accuracy.getInstance(null);
-        MessageImprint.getInstance(null);
-        TimeStampReq.getInstance(null);
-        TimeStampResp.getInstance(null);
-        TSTInfo.getInstance(null);
-        AttributeTypeAndValue.getInstance(null);
-        DirectoryString.getInstance(null);
-        DirectoryString.getInstance(null);
-        RDN.getInstance(null);
-        X500Name.getInstance(null);
-        X500Name.getInstance(null);
-        AccessDescription.getInstance(null);
-        AlgorithmIdentifier.getInstance(null);
-        AlgorithmIdentifier.getInstance(null);
-        AttCertIssuer.getInstance(null);
-        AttCertIssuer.getInstance(null);
-        AttCertValidityPeriod.getInstance(null);
-        AttributeCertificateInfo.getInstance(null);
-        AttributeCertificateInfo.getInstance(null);
-        AttributeCertificate.getInstance(null);
-        Attribute.getInstance(null);
-        AuthorityInformationAccess.getInstance(null);
-        AuthorityKeyIdentifier.getInstance(null);
-        AuthorityKeyIdentifier.getInstance(null);
-        BasicConstraints.getInstance(null);
-        BasicConstraints.getInstance(null);
-        Certificate.getInstance(null);
-        Certificate.getInstance(null);
-        CertificateList.getInstance(null);
-        CertificateList.getInstance(null);
-        CertificatePair.getInstance(null);
-        CertificatePolicies.getInstance(null);
-        CertificatePolicies.getInstance(null);
-        CRLDistPoint.getInstance(null);
-        CRLDistPoint.getInstance(null);
-        CRLNumber.getInstance(null);
-        CRLReason.getInstance(null);
-        DigestInfo.getInstance(null);
-        DigestInfo.getInstance(null);
-        DisplayText.getInstance(null);
-        DisplayText.getInstance(null);
-        DistributionPoint.getInstance(null);
-        DistributionPoint.getInstance(null);
-        DistributionPointName.getInstance(null);
-        DistributionPointName.getInstance(null);
-        DSAParameter.getInstance(null);
-        DSAParameter.getInstance(null);
-        ExtendedKeyUsage.getInstance(null);
-        ExtendedKeyUsage.getInstance(null);
-        Extensions.getInstance(null);
-        Extensions.getInstance(null);
-        GeneralName.getInstance(null);
-        GeneralName.getInstance(null);
-        GeneralNames.getInstance(null);
-        GeneralNames.getInstance(null);
-
-        GeneralSubtree generalSubtree = new GeneralSubtree(new GeneralName(new X500Name("CN=Test")));
-        ASN1ObjectIdentifier algOid = new ASN1ObjectIdentifier("1.2.1");
-        ObjectDigestInfo objectDigestInfo = new ObjectDigestInfo(ObjectDigestInfo.otherObjectDigest, algOid, new AlgorithmIdentifier(algOid), new byte[20]);
-
-        doFullGetInstanceTest(GeneralSubtree.class, generalSubtree);
-        doFullGetInstanceTest(Holder.class, new Holder(objectDigestInfo));
-        IetfAttrSyntax.getInstance(null);
-        IssuerSerial.getInstance(null);
-        IssuerSerial.getInstance(null);
-        IssuingDistributionPoint.getInstance(null);
-        IssuingDistributionPoint.getInstance(null);
-        DERBitString.getInstance(null);
-
-        v.clear();
-        v.add(generalSubtree);
-
-        doFullGetInstanceTest(NameConstraints.class, new NameConstraints(null, null));
-        doFullGetInstanceTest(NoticeReference.class, noticeReference);
-        doFullGetInstanceTest(ObjectDigestInfo.class, objectDigestInfo);
-
-        PolicyInformation.getInstance(null);
-        PolicyMappings.getInstance(null);
-        PolicyQualifierInfo.getInstance(null);
-        PrivateKeyUsagePeriod.getInstance(null);
-        doFullGetInstanceTest(RoleSyntax.class, new RoleSyntax(new GeneralNames(new GeneralName(new X500Name("CN=Test"))), new GeneralName(GeneralName.uniformResourceIdentifier, "http://bc")));
-        RSAPublicKeyStructure.getInstance(null);
-        RSAPublicKeyStructure.getInstance(null);
-        SubjectDirectoryAttributes.getInstance(null);
-        SubjectKeyIdentifier.getInstance(null);
-        SubjectKeyIdentifier.getInstance(null);
-        SubjectPublicKeyInfo.getInstance(null);
-        SubjectPublicKeyInfo.getInstance(null);
-        TargetInformation.getInstance(null);
-        Target.getInstance(null);
-        Targets.getInstance(null);
-        TBSCertificate.getInstance(null);
-        TBSCertificate.getInstance(null);
-        TBSCertificateStructure.getInstance(null);
-        TBSCertificateStructure.getInstance(null);
-        TBSCertList.CRLEntry.getInstance(null);
-        TBSCertList.getInstance(null);
-        TBSCertList.getInstance(null);
-        Time.getInstance(null);
-        Time.getInstance(null);
-        doFullGetInstanceTest(UserNotice.class, new UserNotice(noticeReference, "hello world"));
-        V2Form.getInstance(null);
-        V2Form.getInstance(null);
-        X509CertificateStructure.getInstance(null);
-        X509CertificateStructure.getInstance(null);
-        X509Extensions.getInstance(null);
-        X509Extensions.getInstance(null);
-        X509Name.getInstance(null);
-        X509Name.getInstance(null);
-        DHDomainParameters.getInstance(null);
-        DHDomainParameters.getInstance(null);
-        DHPublicKey.getInstance(null);
-        DHPublicKey.getInstance(null);
-        DHValidationParms.getInstance(null);
-        DHValidationParms.getInstance(null);
-        X962Parameters.getInstance(null);
-        X962Parameters.getInstance(null);
-        X9ECParameters.getInstance(null);
-        MQVuserKeyingMaterial.getInstance(null);
-        MQVuserKeyingMaterial.getInstance(null);
-        CertHash.getInstance(null);
-        RequestedCertificate.getInstance(null);
-        RequestedCertificate.getInstance(null);
-        AdditionalInformationSyntax.getInstance(null);
-        Admissions.getInstance(null);
-        AdmissionSyntax.getInstance(null);
-        DeclarationOfMajority.getInstance(null);
-        MonetaryLimit.getInstance(null);
-        NamingAuthority.getInstance(null);
-        NamingAuthority.getInstance(null);
-        ProcurationSyntax.getInstance(null);
-        ProfessionInfo.getInstance(null);
-        Restriction.getInstance(null);
-        BiometricData.getInstance(null);
-        Iso4217CurrencyCode.getInstance(null);
-        MonetaryValue.getInstance(null);
-        QCStatement.getInstance(null);
-        SemanticsInformation.getInstance(null);
-        TypeOfBiometricData.getInstance(null);
-        NameOrPseudonym.getInstance(null);
-        PersonalData.getInstance(null);
-    }
-
-    public String getName()
-    {
-        return "GetInstanceNullTest";
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/test/InputStreamTest.java b/bcprov/src/main/java/org/bouncycastle/asn1/test/InputStreamTest.java
deleted file mode 100644
index 819d285..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/test/InputStreamTest.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package org.bouncycastle.asn1.test;
-
-import java.io.IOException;
-
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.util.test.SimpleTest;
-
-public class InputStreamTest 
-    extends SimpleTest
-{
-    private static final byte[] outOfBoundsLength = new byte[] { (byte)0x30, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff };
-    private static final byte[] negativeLength = new byte[] { (byte)0x30, (byte)0x84, (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff };
-    private static final byte[] outsideLimitLength = new byte[] { (byte)0x30, (byte)0x83, (byte)0x0f, (byte)0xff, (byte)0xff };
-    
-    
-    public String getName()
-    {
-        return "InputStream";
-    }
-    
-    public void performTest() 
-        throws Exception
-    {
-        ASN1InputStream aIn = new ASN1InputStream(outOfBoundsLength);
-        
-        try
-        {
-            aIn.readObject();
-            fail("out of bounds length not detected.");
-        }
-        catch (IOException e)
-        {
-            if (!e.getMessage().startsWith("DER length more than 4 bytes"))
-            {
-                fail("wrong exception: " + e.getMessage());
-            }
-        }
-        
-        aIn = new ASN1InputStream(negativeLength);
-        
-        try
-        {
-            aIn.readObject();
-            fail("negative length not detected.");
-        }
-        catch (IOException e)
-        {
-            if (!e.getMessage().equals("corrupted stream - negative length found"))
-            {
-                fail("wrong exception: " + e.getMessage());
-            }
-        }
-        
-        aIn = new ASN1InputStream(outsideLimitLength);
-        
-        try
-        {
-            aIn.readObject();
-            fail("outside limit length not detected.");
-        }
-        catch (IOException e)
-        {
-            if (!e.getMessage().equals("corrupted stream - out of bounds length found"))
-            {
-                fail("wrong exception: " + e.getMessage());
-            }
-        }
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        runTest(new InputStreamTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/test/Iso4217CurrencyCodeUnitTest.java b/bcprov/src/main/java/org/bouncycastle/asn1/test/Iso4217CurrencyCodeUnitTest.java
deleted file mode 100644
index 9a1d6a8..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/test/Iso4217CurrencyCodeUnitTest.java
+++ /dev/null
@@ -1,142 +0,0 @@
-package org.bouncycastle.asn1.test;
-
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.x509.qualified.Iso4217CurrencyCode;
-import org.bouncycastle.util.test.SimpleTest;
-
-public class Iso4217CurrencyCodeUnitTest 
-    extends SimpleTest
-{
-    private static final String ALPHABETIC_CURRENCY_CODE = "AUD";
-    private static final int    NUMERIC_CURRENCY_CODE = 1;
-
-    public String getName()
-    {
-        return "Iso4217CurrencyCode";
-    }
-
-    public void performTest() 
-        throws Exception
-    {
-        //
-        // alphabetic
-        //
-        Iso4217CurrencyCode cc = new Iso4217CurrencyCode(ALPHABETIC_CURRENCY_CODE);
-
-        checkNumeric(cc, ALPHABETIC_CURRENCY_CODE);
-        
-        cc = Iso4217CurrencyCode.getInstance(cc);
-        
-        checkNumeric(cc, ALPHABETIC_CURRENCY_CODE);
-        
-        ASN1Primitive obj = cc.toASN1Object();
-        
-        cc = Iso4217CurrencyCode.getInstance(obj);
-        
-        checkNumeric(cc, ALPHABETIC_CURRENCY_CODE);
-        
-        //
-        // numeric
-        //
-        cc = new Iso4217CurrencyCode(NUMERIC_CURRENCY_CODE);
-
-        checkNumeric(cc, NUMERIC_CURRENCY_CODE);
-        
-        cc = Iso4217CurrencyCode.getInstance(cc);
-        
-        checkNumeric(cc, NUMERIC_CURRENCY_CODE);
-        
-        obj = cc.toASN1Object();
-        
-        cc = Iso4217CurrencyCode.getInstance(obj);
-        
-        checkNumeric(cc, NUMERIC_CURRENCY_CODE);
-        
-        cc = Iso4217CurrencyCode.getInstance(null);
-        
-        if (cc != null)
-        {
-            fail("null getInstance() failed.");
-        }
-        
-        try
-        {
-            Iso4217CurrencyCode.getInstance(new Object());
-            
-            fail("getInstance() failed to detect bad object.");
-        }
-        catch (IllegalArgumentException e)
-        {
-            // expected
-        }
-        
-        try
-        {
-            new Iso4217CurrencyCode("ABCD");
-            
-            fail("constructor failed to detect out of range currencycode.");
-        }
-        catch (IllegalArgumentException e)
-        {
-            // expected
-        }
-        
-        try
-        {
-            new Iso4217CurrencyCode(0);
-            
-            fail("constructor failed to detect out of range small numeric code.");
-        }
-        catch (IllegalArgumentException e)
-        {
-            // expected
-        }
-        
-        try
-        {
-            new Iso4217CurrencyCode(1000);
-            
-            fail("constructor failed to detect out of range large numeric code.");
-        }
-        catch (IllegalArgumentException e)
-        {
-            // expected
-        }
-    }
-
-    private void checkNumeric(
-        Iso4217CurrencyCode cc,
-        String              code)
-    {
-        if (!cc.isAlphabetic())
-        {
-            fail("non-alphabetic code found when one expected.");
-        }
-        
-        if (!cc.getAlphabetic().equals(code))
-        {
-            fail("string codes don't match.");
-        }
-    }
-    
-    private void checkNumeric(
-        Iso4217CurrencyCode cc,
-        int                 code)
-    {
-        if (cc.isAlphabetic())
-        {
-            fail("alphabetic code found when one not expected.");
-        }
-        
-        if (cc.getNumeric() != code)
-        {
-            fail("numeric codes don't match.");
-        }
-    }
-    
-    public static void main(
-        String[]    args)
-    {
-        runTest(new Iso4217CurrencyCodeUnitTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/test/IssuingDistributionPointUnitTest.java b/bcprov/src/main/java/org/bouncycastle/asn1/test/IssuingDistributionPointUnitTest.java
deleted file mode 100644
index 3f27f19..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/test/IssuingDistributionPointUnitTest.java
+++ /dev/null
@@ -1,122 +0,0 @@
-package org.bouncycastle.asn1.test;
-
-import java.io.IOException;
-
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.x509.DistributionPointName;
-import org.bouncycastle.asn1.x509.GeneralName;
-import org.bouncycastle.asn1.x509.GeneralNames;
-import org.bouncycastle.asn1.x509.IssuingDistributionPoint;
-import org.bouncycastle.asn1.x509.ReasonFlags;
-import org.bouncycastle.asn1.x509.X509Name;
-import org.bouncycastle.util.test.SimpleTest;
-
-public class IssuingDistributionPointUnitTest 
-    extends SimpleTest
-{
-    public String getName()
-    {
-        return "IssuingDistributionPoint";
-    }
-
-    public void performTest()
-        throws Exception
-    {
-        DistributionPointName    name = new DistributionPointName(
-                                              new GeneralNames(new GeneralName(new X509Name("cn=test"))));
-        ReasonFlags reasonFlags = new ReasonFlags(ReasonFlags.cACompromise);
-
-        checkPoint(6, name, true, true, reasonFlags, true, true);
-
-        checkPoint(2, name, false, false, reasonFlags, false, false);
-
-        checkPoint(0, null, false, false, null, false, false);
-
-        try
-        {
-            IssuingDistributionPoint.getInstance(new Object());
-
-            fail("getInstance() failed to detect bad object.");
-        }
-        catch (IllegalArgumentException e)
-        {
-            // expected
-        }
-    }
-
-    private void checkPoint(
-        int size,
-        DistributionPointName distributionPoint,
-        boolean onlyContainsUserCerts,
-        boolean onlyContainsCACerts,
-        ReasonFlags onlySomeReasons,
-        boolean indirectCRL,
-        boolean onlyContainsAttributeCerts)
-        throws IOException
-    {
-        IssuingDistributionPoint point = new IssuingDistributionPoint(distributionPoint, onlyContainsUserCerts, onlyContainsCACerts, onlySomeReasons, indirectCRL, onlyContainsAttributeCerts);
-
-        checkValues(point, distributionPoint, onlyContainsUserCerts, onlyContainsCACerts, onlySomeReasons, indirectCRL, onlyContainsAttributeCerts);
-
-        ASN1Sequence seq = ASN1Sequence.getInstance(ASN1Primitive.fromByteArray(point.getEncoded()));
-
-        if (seq.size() != size)
-        {
-            fail("size mismatch");
-        }
-
-        point = IssuingDistributionPoint.getInstance(seq);
-
-        checkValues(point, distributionPoint, onlyContainsUserCerts, onlyContainsCACerts, onlySomeReasons, indirectCRL, onlyContainsAttributeCerts);
-    }
-
-    private void checkValues(IssuingDistributionPoint point, DistributionPointName distributionPoint, boolean onlyContainsUserCerts, boolean onlyContainsCACerts, ReasonFlags onlySomeReasons, boolean indirectCRL, boolean onlyContainsAttributeCerts)
-    {
-        if (point.onlyContainsUserCerts() != onlyContainsUserCerts)
-        {
-            fail("mismatch on onlyContainsUserCerts");
-        }
-
-        if (point.onlyContainsCACerts() != onlyContainsCACerts)
-        {
-            fail("mismatch on onlyContainsCACerts");
-        }
-
-        if (point.isIndirectCRL() != indirectCRL)
-        {
-            fail("mismatch on indirectCRL");
-        }
-
-        if (point.onlyContainsAttributeCerts() != onlyContainsAttributeCerts)
-        {
-            fail("mismatch on onlyContainsAttributeCerts");
-        }
-
-        if (!isEquiv(onlySomeReasons, point.getOnlySomeReasons()))
-        {
-            fail("mismatch on onlySomeReasons");
-        }
-
-        if (!isEquiv(distributionPoint, point.getDistributionPoint()))
-        {
-            fail("mismatch on distributionPoint");
-        }
-    }
-
-    private boolean isEquiv(Object o1, Object o2)
-    {
-        if (o1 == null)
-        {
-            return o2 == null;
-        }
-
-        return o1.equals(o2);
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        runTest(new IssuingDistributionPointUnitTest());
-    }
-}
\ No newline at end of file
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/test/KeyUsageTest.java b/bcprov/src/main/java/org/bouncycastle/asn1/test/KeyUsageTest.java
deleted file mode 100644
index f5c90cd..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/test/KeyUsageTest.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package org.bouncycastle.asn1.test;
-
-import java.io.IOException;
-
-import org.bouncycastle.asn1.x509.KeyUsage;
-import org.bouncycastle.util.test.SimpleTest;
-
-public class KeyUsageTest
-    extends SimpleTest
-{
-    public String getName()
-    {
-        return "KeyUsage";
-    }
-
-    public void performTest()
-        throws IOException
-    {
-        BitStringConstantTester.testFlagValueCorrect(0, KeyUsage.digitalSignature); 
-        BitStringConstantTester.testFlagValueCorrect(1, KeyUsage.nonRepudiation);
-        BitStringConstantTester.testFlagValueCorrect(2, KeyUsage.keyEncipherment);
-        BitStringConstantTester.testFlagValueCorrect(3, KeyUsage.dataEncipherment);
-        BitStringConstantTester.testFlagValueCorrect(4, KeyUsage.keyAgreement);
-        BitStringConstantTester.testFlagValueCorrect(5, KeyUsage.keyCertSign);
-        BitStringConstantTester.testFlagValueCorrect(6, KeyUsage.cRLSign);
-        BitStringConstantTester.testFlagValueCorrect(7, KeyUsage.encipherOnly);
-        BitStringConstantTester.testFlagValueCorrect(8, KeyUsage.decipherOnly);
-
-        if (!new KeyUsage(KeyUsage.keyCertSign).hasUsages(KeyUsage.keyCertSign))
-        {
-            fail("usages bit test failed 1");
-        }
-
-        if (new KeyUsage(KeyUsage.cRLSign).hasUsages(KeyUsage.keyCertSign))
-        {
-            fail("usages bit test failed 2");
-        }
-
-        if (!new KeyUsage(KeyUsage.cRLSign | KeyUsage.decipherOnly).hasUsages(KeyUsage.cRLSign | KeyUsage.decipherOnly))
-        {
-            fail("usages bit test failed 3");
-        }
-
-        if (new KeyUsage(KeyUsage.cRLSign | KeyUsage.decipherOnly).hasUsages(KeyUsage.cRLSign | KeyUsage.decipherOnly | KeyUsage.keyCertSign))
-        {
-            fail("usages bit test failed 4");
-        }
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        runTest(new KeyUsageTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/test/LDSSecurityObjectUnitTest.java b/bcprov/src/main/java/org/bouncycastle/asn1/test/LDSSecurityObjectUnitTest.java
deleted file mode 100644
index 3c7cd5f..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/test/LDSSecurityObjectUnitTest.java
+++ /dev/null
@@ -1,214 +0,0 @@
-package org.bouncycastle.asn1.test;
-
-import java.io.IOException;
-import java.util.Random;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DEROctetString;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.icao.DataGroupHash;
-import org.bouncycastle.asn1.icao.LDSSecurityObject;
-import org.bouncycastle.asn1.icao.LDSVersionInfo;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.util.test.SimpleTest;
-
-public class LDSSecurityObjectUnitTest 
-    extends SimpleTest
-{
-    public String getName()
-    {
-        return "LDSSecurityObject";
-    }
-    
-    private byte[] generateHash()
-    {
-        Random rand = new Random();
-        byte[] bytes = new byte[20];
-        
-        for (int i = 0; i != bytes.length; i++)
-        {
-            bytes[i] = (byte)rand.nextInt();
-        }
-        
-        return bytes;
-    }
-    
-    public void performTest() 
-        throws Exception
-    {
-        AlgorithmIdentifier  algoId = new AlgorithmIdentifier("1.3.14.3.2.26");
-        DataGroupHash[] datas = new DataGroupHash[2];
-      
-        datas[0] = new DataGroupHash(1, new DEROctetString(generateHash()));
-        datas[1] = new DataGroupHash(2, new DEROctetString(generateHash()));
-        
-        LDSSecurityObject so = new LDSSecurityObject(algoId, datas);
-
-        checkConstruction(so, algoId, datas);
-
-        LDSVersionInfo versionInfo = new LDSVersionInfo("Hello", "world");
-
-        so = new LDSSecurityObject(algoId, datas, versionInfo);
-
-        checkConstruction(so, algoId, datas, versionInfo);
-
-        try
-        {
-            LDSSecurityObject.getInstance(null);
-        }
-        catch (Exception e)
-        {
-            fail("getInstance() failed to handle null.");
-        }
-        
-        try
-        {
-            LDSSecurityObject.getInstance(new Object());
-            
-            fail("getInstance() failed to detect bad object.");
-        }
-        catch (IllegalArgumentException e)
-        {
-            // expected
-        }
-        
-        try
-        {
-            ASN1EncodableVector v = new ASN1EncodableVector();
-            
-            LDSSecurityObject.getInstance(new DERSequence(v));
-            
-            fail("constructor failed to detect empty sequence.");
-        }
-        catch (IllegalArgumentException e)
-        {
-            // expected
-        }
-        
-        try
-        {
-            new LDSSecurityObject(algoId, new DataGroupHash[1]);
-            
-            fail("constructor failed to detect small DataGroupHash array.");
-        }
-        catch (IllegalArgumentException e)
-        {
-            // expected
-        }
-        
-        try
-        {
-            new LDSSecurityObject(algoId, new DataGroupHash[LDSSecurityObject.ub_DataGroups + 1]);
-            
-            fail("constructor failed to out of bounds DataGroupHash array.");
-        }
-        catch (IllegalArgumentException e)
-        {
-            // expected
-        }
-    }
-
-    private void checkConstruction(
-        LDSSecurityObject so,
-        AlgorithmIdentifier digestAlgorithmIdentifier, 
-        DataGroupHash[]       datagroupHash) 
-        throws IOException
-    {
-        checkStatement(so, digestAlgorithmIdentifier, datagroupHash, null);
-        
-        so = LDSSecurityObject.getInstance(so);
-        
-        checkStatement(so, digestAlgorithmIdentifier, datagroupHash, null);
-        
-        ASN1InputStream aIn = new ASN1InputStream(so.toASN1Object().getEncoded());
-
-        ASN1Sequence seq = (ASN1Sequence)aIn.readObject();
-        
-        so = LDSSecurityObject.getInstance(seq);
-        
-        checkStatement(so, digestAlgorithmIdentifier, datagroupHash, null);
-    }
-
-    private void checkConstruction(
-        LDSSecurityObject   so,
-        AlgorithmIdentifier digestAlgorithmIdentifier,
-        DataGroupHash[]     datagroupHash,
-        LDSVersionInfo      versionInfo)
-        throws IOException
-    {
-        if (so.getVersion() != 1)
-        {
-            fail("version number not 1");
-        }
-
-        checkStatement(so, digestAlgorithmIdentifier, datagroupHash, versionInfo);
-
-        so = LDSSecurityObject.getInstance(so);
-
-        checkStatement(so, digestAlgorithmIdentifier, datagroupHash, versionInfo);
-
-        ASN1InputStream aIn = new ASN1InputStream(so.toASN1Object().getEncoded());
-
-        ASN1Sequence seq = (ASN1Sequence)aIn.readObject();
-
-        so = LDSSecurityObject.getInstance(seq);
-
-        checkStatement(so, digestAlgorithmIdentifier, datagroupHash, versionInfo);
-    }
-
-    private void checkStatement(
-        LDSSecurityObject   so,
-        AlgorithmIdentifier digestAlgorithmIdentifier, 
-        DataGroupHash[]     datagroupHash,
-        LDSVersionInfo      versionInfo)
-    {
-        if (digestAlgorithmIdentifier != null)
-        {
-            if (!so.getDigestAlgorithmIdentifier().equals(digestAlgorithmIdentifier))
-            {
-                fail("ids don't match.");
-            }
-        }
-        else if (so.getDigestAlgorithmIdentifier() != null)
-        {
-            fail("digest algorithm Id found when none expected.");
-        }
-        
-        if (datagroupHash != null)
-        {
-            DataGroupHash[] datas = so.getDatagroupHash();
-            
-            for (int i = 0; i != datas.length; i++)
-            {
-                if (!datagroupHash[i].equals(datas[i]))
-                {
-                    fail("name registration authorities don't match.");
-                }
-            }
-        }
-        else if (so.getDatagroupHash() != null)
-        {
-            fail("data hash groups found when none expected.");
-        }
-
-        if (versionInfo != null)
-        {
-            if (!versionInfo.equals(so.getVersionInfo()))
-            {
-                fail("versionInfo doesn't match");
-            }
-        }
-        else if (so.getVersionInfo() != null)
-        {
-            fail("version info found when none expected.");
-        }
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        runTest(new LDSSecurityObjectUnitTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/test/MiscTest.java b/bcprov/src/main/java/org/bouncycastle/asn1/test/MiscTest.java
deleted file mode 100644
index 2a5f09a..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/test/MiscTest.java
+++ /dev/null
@@ -1,113 +0,0 @@
-package org.bouncycastle.asn1.test;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1OutputStream;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.DERIA5String;
-import org.bouncycastle.asn1.misc.CAST5CBCParameters;
-import org.bouncycastle.asn1.misc.IDEACBCPar;
-import org.bouncycastle.asn1.misc.NetscapeCertType;
-import org.bouncycastle.asn1.misc.NetscapeRevocationURL;
-import org.bouncycastle.asn1.misc.VerisignCzagExtension;
-import org.bouncycastle.util.encoders.Base64;
-import org.bouncycastle.util.test.SimpleTestResult;
-import org.bouncycastle.util.test.Test;
-import org.bouncycastle.util.test.TestResult;
-
-public class MiscTest
-    implements Test
-{
-    private boolean isSameAs(
-        byte[]  a,
-        byte[]  b)
-    {
-        if (a.length != b.length)
-        {
-            return false;
-        }
-        
-        for (int i = 0; i != a.length; i++)
-        {
-            if (a[i] != b[i])
-            {
-                return false;
-            }
-        }
-        
-        return true;
-    }
-    
-    public TestResult perform()
-    {
-        byte[]  testIv = { 1, 2, 3, 4, 5, 6, 7, 8 };
-        
-        ASN1Encodable[]     values = {
-            new CAST5CBCParameters(testIv, 128), 
-            new NetscapeCertType(NetscapeCertType.smime),    
-            new VerisignCzagExtension(new DERIA5String("hello")),
-            new IDEACBCPar(testIv),        
-            new NetscapeRevocationURL(new DERIA5String("http://test"))
-        };
-        
-        byte[] data = Base64.decode("MA4ECAECAwQFBgcIAgIAgAMCBSAWBWhlbGxvMAoECAECAwQFBgcIFgtodHRwOi8vdGVzdA==");
-        
-        try
-        {
-            ByteArrayOutputStream   bOut = new ByteArrayOutputStream();
-            ASN1OutputStream        aOut = new ASN1OutputStream(bOut);
-            
-            for (int i = 0; i != values.length; i++)
-            {
-                aOut.writeObject(values[i]);
-            }
-            
-            ASN1Primitive[] readValues = new ASN1Primitive[values.length];
-            
-            if (!isSameAs(bOut.toByteArray(), data))
-            {
-                return new SimpleTestResult(false, getName() + ": Failed data check");
-            }
-            
-            ByteArrayInputStream    bIn = new ByteArrayInputStream(bOut.toByteArray());
-            ASN1InputStream         aIn = new ASN1InputStream(bIn);
-            
-            for (int i = 0; i != values.length; i++)
-            {
-                ASN1Primitive   o = aIn.readObject();
-                if (!values[i].equals(o))
-                {
-                    return new SimpleTestResult(false, getName() + ": Failed equality test for " + o);
-                }
-                
-                if (o.hashCode() != values[i].hashCode())
-                {
-                    return new SimpleTestResult(false, getName() + ": Failed hashCode test for " + o);
-                }
-            }
-            
-            return new SimpleTestResult(true, getName() + ": Okay");
-        }
-        catch (Exception e)
-        {
-            return new SimpleTestResult(false, getName() + ": Failed - exception " + e.toString(), e);
-        }
-    }
-
-    public String getName()
-    {
-        return "Misc";
-    }
-
-    public static void main(
-        String[] args)
-    {
-        MiscTest    test = new MiscTest();
-        TestResult      result = test.perform();
-
-        System.out.println(result);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/test/MonetaryLimitUnitTest.java b/bcprov/src/main/java/org/bouncycastle/asn1/test/MonetaryLimitUnitTest.java
deleted file mode 100644
index 8456661..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/test/MonetaryLimitUnitTest.java
+++ /dev/null
@@ -1,85 +0,0 @@
-package org.bouncycastle.asn1.test;
-
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.isismtt.x509.MonetaryLimit;
-
-import java.io.IOException;
-
-public class MonetaryLimitUnitTest
-    extends ASN1UnitTest
-{
-    public String getName()
-    {
-        return "MonetaryLimit";
-    }
-
-    public void performTest()
-        throws Exception
-    {
-        String currency = "AUD";
-        int    amount = 1;
-        int    exponent = 2;
-
-        MonetaryLimit limit = new MonetaryLimit(currency, amount, exponent);
-
-        checkConstruction(limit, currency, amount, exponent);
-
-        limit = MonetaryLimit.getInstance(null);
-
-        if (limit != null)
-        {
-            fail("null getInstance() failed.");
-        }
-
-        try
-        {
-            MonetaryLimit.getInstance(new Object());
-
-            fail("getInstance() failed to detect bad object.");
-        }
-        catch (IllegalArgumentException e)
-        {
-            // expected
-        }
-    }
-
-    private void checkConstruction(
-        MonetaryLimit limit,
-        String currency,
-        int    amount,
-        int    exponent)
-        throws IOException
-    {
-        checkValues(limit, currency, amount, exponent);
-
-        limit = MonetaryLimit.getInstance(limit);
-
-        checkValues(limit, currency, amount, exponent);
-
-        ASN1InputStream aIn = new ASN1InputStream(limit.toASN1Object().getEncoded());
-
-        ASN1Sequence seq = (ASN1Sequence)aIn.readObject();
-
-        limit = MonetaryLimit.getInstance(seq);
-
-        checkValues(limit, currency, amount, exponent);
-    }
-
-    private void checkValues(
-        MonetaryLimit limit,
-        String currency,
-        int    amount,
-        int    exponent)
-    {
-        checkMandatoryField("currency", currency, limit.getCurrency());
-        checkMandatoryField("amount", amount, limit.getAmount().intValue());
-        checkMandatoryField("exponent", exponent, limit.getExponent().intValue());
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        runTest(new MonetaryLimitUnitTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/test/MonetaryValueUnitTest.java b/bcprov/src/main/java/org/bouncycastle/asn1/test/MonetaryValueUnitTest.java
deleted file mode 100644
index dd56469..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/test/MonetaryValueUnitTest.java
+++ /dev/null
@@ -1,88 +0,0 @@
-package org.bouncycastle.asn1.test;
-
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.x509.qualified.Iso4217CurrencyCode;
-import org.bouncycastle.asn1.x509.qualified.MonetaryValue;
-import org.bouncycastle.util.test.SimpleTest;
-
-public class MonetaryValueUnitTest 
-    extends SimpleTest
-{
-    private static final int TEST_AMOUNT = 100;
-    private static final int ZERO_EXPONENT = 0;
-    
-    private static final String CURRENCY_CODE = "AUD";
-
-    public String getName()
-    {
-        return "MonetaryValue";
-    }
-
-    public void performTest() 
-        throws Exception
-    {
-        MonetaryValue mv = new MonetaryValue(new Iso4217CurrencyCode(CURRENCY_CODE), TEST_AMOUNT, ZERO_EXPONENT);
-
-        checkValues(mv, TEST_AMOUNT, ZERO_EXPONENT);
-        
-        mv = MonetaryValue.getInstance(mv);
-        
-        checkValues(mv, TEST_AMOUNT, ZERO_EXPONENT);
-        
-        ASN1InputStream aIn = new ASN1InputStream(mv.toASN1Object().getEncoded());
-
-        ASN1Sequence seq = (ASN1Sequence)aIn.readObject();
-        
-        mv = MonetaryValue.getInstance(seq);
-        
-        checkValues(mv, TEST_AMOUNT, ZERO_EXPONENT);
-        
-        mv = MonetaryValue.getInstance(null);
-        
-        if (mv != null)
-        {
-            fail("null getInstance() failed.");
-        }
-        
-        try
-        {
-            MonetaryValue.getInstance(new Object());
-            
-            fail("getInstance() failed to detect bad object.");
-        }
-        catch (IllegalArgumentException e)
-        {
-            // expected
-        }
-    }
-
-    private void checkValues(
-        MonetaryValue mv,
-        int           amount,
-        int           exponent)
-    {
-        if (mv.getAmount().intValue() != amount)
-        {
-            fail("amounts don't match.");
-        }
-        
-        if (mv.getExponent().intValue() != exponent)
-        {
-            fail("exponents don't match.");
-        }
-        
-        Iso4217CurrencyCode cc = mv.getCurrency();
-        
-        if (!cc.getAlphabetic().equals(CURRENCY_CODE))
-        {
-            fail("currency code wrong");
-        }
-    }
-    
-    public static void main(
-        String[]    args)
-    {
-        runTest(new MonetaryValueUnitTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/test/NameOrPseudonymUnitTest.java b/bcprov/src/main/java/org/bouncycastle/asn1/test/NameOrPseudonymUnitTest.java
deleted file mode 100644
index 3fbaa10..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/test/NameOrPseudonymUnitTest.java
+++ /dev/null
@@ -1,108 +0,0 @@
-package org.bouncycastle.asn1.test;
-
-import java.io.IOException;
-
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.ASN1String;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.x500.DirectoryString;
-import org.bouncycastle.asn1.x509.sigi.NameOrPseudonym;
-
-public class NameOrPseudonymUnitTest
-    extends ASN1UnitTest
-{
-    public String getName()
-    {
-        return "NameOrPseudonym";
-    }
-
-    public void performTest()
-        throws Exception
-    {
-        String          pseudonym = "pseudonym";
-        DirectoryString surname = new DirectoryString("surname");
-        ASN1Sequence    givenName = new DERSequence(new DirectoryString("givenName"));
-
-        NameOrPseudonym id = new NameOrPseudonym(pseudonym);
-
-        checkConstruction(id, pseudonym, null, null);
-
-        id = new NameOrPseudonym(surname, givenName);
-
-        checkConstruction(id, null, surname, givenName);
-
-        id = NameOrPseudonym.getInstance(null);
-
-        if (id != null)
-        {
-            fail("null getInstance() failed.");
-        }
-
-        try
-        {
-            NameOrPseudonym.getInstance(new Object());
-
-            fail("getInstance() failed to detect bad object.");
-        }
-        catch (IllegalArgumentException e)
-        {
-            // expected
-        }
-    }
-
-    private void checkConstruction(
-        NameOrPseudonym id,
-        String          pseudonym,
-        DirectoryString surname,
-        ASN1Sequence    givenName)
-        throws IOException
-    {
-        checkValues(id, pseudonym, surname, givenName);
-
-        id = NameOrPseudonym.getInstance(id);
-
-        checkValues(id, pseudonym, surname, givenName);
-
-        ASN1InputStream aIn = new ASN1InputStream(id.toASN1Object().getEncoded());
-
-        if (surname != null)
-        {
-            ASN1Sequence seq = (ASN1Sequence)aIn.readObject();
-
-            id = NameOrPseudonym.getInstance(seq);
-        }
-        else
-        {
-            ASN1String s = (ASN1String)aIn.readObject();
-
-            id = NameOrPseudonym.getInstance(s);
-        }
-
-        checkValues(id, pseudonym, surname, givenName);
-    }
-
-    private void checkValues(
-        NameOrPseudonym id,
-        String          pseudonym,
-        DirectoryString surname,
-        ASN1Sequence    givenName)
-    {
-
-        if (surname != null)
-        {
-            checkMandatoryField("surname", surname, id.getSurname());
-            checkMandatoryField("givenName", givenName, new DERSequence(id.getGivenName()[0]));
-        }
-        else
-        {
-            checkOptionalField("pseudonym", new DirectoryString(pseudonym), id.getPseudonym());
-        }
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        runTest(new NameOrPseudonymUnitTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/test/NamingAuthorityUnitTest.java b/bcprov/src/main/java/org/bouncycastle/asn1/test/NamingAuthorityUnitTest.java
deleted file mode 100644
index 8dfcf8c..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/test/NamingAuthorityUnitTest.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package org.bouncycastle.asn1.test;
-
-import java.io.IOException;
-
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.isismtt.x509.NamingAuthority;
-import org.bouncycastle.asn1.x500.DirectoryString;
-
-public class NamingAuthorityUnitTest
-    extends ASN1UnitTest
-{
-    public String getName()
-    {
-        return "NamingAuthority";
-    }
-
-    public void performTest()
-        throws Exception
-    {
-        ASN1ObjectIdentifier namingAuthorityID = new ASN1ObjectIdentifier("1.2.3");
-        String              namingAuthorityURL = "url";
-        DirectoryString     namingAuthorityText = new DirectoryString("text");
-
-        NamingAuthority auth =  new NamingAuthority(namingAuthorityID, namingAuthorityURL, namingAuthorityText);
-
-        checkConstruction(auth, namingAuthorityID, namingAuthorityURL, namingAuthorityText);
-
-        auth =  new NamingAuthority(null, namingAuthorityURL, namingAuthorityText);
-
-        checkConstruction(auth, null, namingAuthorityURL, namingAuthorityText);
-
-        auth =  new NamingAuthority(namingAuthorityID, null, namingAuthorityText);
-
-        checkConstruction(auth, namingAuthorityID, null, namingAuthorityText);
-
-        auth =  new NamingAuthority(namingAuthorityID, namingAuthorityURL, null);
-
-        checkConstruction(auth, namingAuthorityID, namingAuthorityURL, null);
-
-        auth = NamingAuthority.getInstance(null);
-
-        if (auth != null)
-        {
-            fail("null getInstance() failed.");
-        }
-
-        try
-        {
-            NamingAuthority.getInstance(new Object());
-
-            fail("getInstance() failed to detect bad object.");
-        }
-        catch (IllegalArgumentException e)
-        {
-            // expected
-        }
-    }
-
-    private void checkConstruction(
-        NamingAuthority auth,
-        ASN1ObjectIdentifier namingAuthorityID,
-        String              namingAuthorityURL,
-        DirectoryString     namingAuthorityText)
-        throws IOException
-    {
-        checkValues(auth, namingAuthorityID, namingAuthorityURL, namingAuthorityText);
-
-        auth = NamingAuthority.getInstance(auth);
-
-        checkValues(auth, namingAuthorityID, namingAuthorityURL, namingAuthorityText);
-
-        ASN1InputStream aIn = new ASN1InputStream(auth.toASN1Object().getEncoded());
-
-        ASN1Sequence seq = (ASN1Sequence)aIn.readObject();
-
-        auth = NamingAuthority.getInstance(seq);
-
-        checkValues(auth, namingAuthorityID, namingAuthorityURL, namingAuthorityText);
-    }
-
-    private void checkValues(
-        NamingAuthority auth,
-        ASN1ObjectIdentifier namingAuthorityId,
-        String              namingAuthorityURL,
-        DirectoryString     namingAuthorityText)
-    {
-        checkOptionalField("namingAuthorityId", namingAuthorityId, auth.getNamingAuthorityId());
-        checkOptionalField("namingAuthorityURL", namingAuthorityURL, auth.getNamingAuthorityUrl());
-        checkOptionalField("namingAuthorityText", namingAuthorityText, auth.getNamingAuthorityText());
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        runTest(new NamingAuthorityUnitTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/test/NetscapeCertTypeTest.java b/bcprov/src/main/java/org/bouncycastle/asn1/test/NetscapeCertTypeTest.java
deleted file mode 100644
index e5aa96e..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/test/NetscapeCertTypeTest.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package org.bouncycastle.asn1.test;
-
-import java.io.IOException;
-
-import org.bouncycastle.asn1.misc.NetscapeCertType;
-import org.bouncycastle.util.test.SimpleTest;
-
-public class NetscapeCertTypeTest
-    extends SimpleTest
-{
-    public String getName()
-    {
-        return "NetscapeCertType";
-    }
-
-    public void performTest()
-        throws IOException
-    {
-        BitStringConstantTester.testFlagValueCorrect(0, NetscapeCertType.sslClient);
-        BitStringConstantTester.testFlagValueCorrect(1, NetscapeCertType.sslServer);
-        BitStringConstantTester.testFlagValueCorrect(2, NetscapeCertType.smime);
-        BitStringConstantTester.testFlagValueCorrect(3, NetscapeCertType.objectSigning);
-        BitStringConstantTester.testFlagValueCorrect(4, NetscapeCertType.reserved);
-        BitStringConstantTester.testFlagValueCorrect(5, NetscapeCertType.sslCA);
-        BitStringConstantTester.testFlagValueCorrect(6, NetscapeCertType.smimeCA);
-        BitStringConstantTester.testFlagValueCorrect(7, NetscapeCertType.objectSigningCA);
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        runTest(new NetscapeCertTypeTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/test/OCSPTest.java b/bcprov/src/main/java/org/bouncycastle/asn1/test/OCSPTest.java
deleted file mode 100644
index ae1b035..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/test/OCSPTest.java
+++ /dev/null
@@ -1,193 +0,0 @@
-package org.bouncycastle.asn1.test;
-
-import java.io.ByteArrayInputStream;
-
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.DEROctetString;
-import org.bouncycastle.asn1.ocsp.BasicOCSPResponse;
-import org.bouncycastle.asn1.ocsp.OCSPRequest;
-import org.bouncycastle.asn1.ocsp.OCSPResponse;
-import org.bouncycastle.asn1.ocsp.ResponseBytes;
-import org.bouncycastle.util.encoders.Base64;
-import org.bouncycastle.util.test.Test;
-import org.bouncycastle.util.test.TestResult;
-import org.bouncycastle.util.test.SimpleTestResult;
-
-public class OCSPTest
-    implements Test
-{
-    private byte[] unsignedReq = Base64.decode(
-        "MEIwQDA+MDwwOjAJBgUrDgMCGgUABBRDb9GODnq7lRhSkEqw4XX24huERwQUkY4j"
-      + "a6eKuDlkVP9hRgkEvIWqHPECAQE=");
-    
-    private byte[] signedReq = Base64.decode(
-        "MIIC9jBAMD4wPDA6MAkGBSsOAwIaBQAEFENv0Y4OeruVGFKQSrDhdfbiG4RHBBTc"
-      + "Mr1fP+mZAxbF2ZdehWxn6mtAngIBAaCCArAwggKsMA0GCSqGSIb3DQEBBQUAA4GB"
-      + "AAzHBm4nL5AcRQB3Jkz7ScNeZF+GbRZ0p4kBDTnqi3IeESuso12yJhpqqyijdnj5"
-      + "gd4/GsSAgdluLHyYZ6wgozV7G9MDXCnFnG4PBUW05HaVX81JYAp+amVyU0NOgNrG"
-      + "90npVBsHb0o+UlkxNgMiEbSkp/TeGb6YURsYKhmwp7BgoIICFTCCAhEwggINMIIB"
-      + "dqADAgECAgEBMA0GCSqGSIb3DQEBBAUAMCUxFjAUBgNVBAoTDUJvdW5jeSBDYXN0"
-      + "bGUxCzAJBgNVBAYTAkFVMB4XDTA0MTAyNDEzNDc0M1oXDTA1MDIwMTEzNDc0M1ow"
-      + "JTEWMBQGA1UEChMNQm91bmN5IENhc3RsZTELMAkGA1UEBhMCQVUwgZ8wDQYJKoZI"
-      + "hvcNAQEBBQADgY0AMIGJAoGBAJBmLeIzthMHUeTkOeJ76iBxcMHY31o/i3a9VT12"
-      + "y2FcS/ejJmeUCMTdtwl5alOwXY66vF4DyT1VU/nJG3mHpSoqq7qrMXOIFGcXg1Wf"
-      + "oJRrQgTOLdQ6bod7i9ME/EjEJy70orh0nVS7NGcu0R5TjcbLde2J5zxjb/W9wqfy"
-      + "RovJAgMBAAGjTTBLMB0GA1UdDgQWBBTcMr1fP+mZAxbF2ZdehWxn6mtAnjAfBgNV"
-      + "HSMEGDAWgBTcMr1fP+mZAxbF2ZdehWxn6mtAnjAJBgNVHRMEAjAAMA0GCSqGSIb3"
-      + "DQEBBAUAA4GBAF/4EH1KkNrNxocJPIp7lThmG1KIVYESIadowMowrbok46ESofRF"
-      + "OIPku07W+e1Y1Y1KXLIiPMG3IGwrBrn04iLsbbBUiN37BcC/VyT4xKJ2MYscGjKL"
-      + "ua/9bU0lOyeTRAwqb8towWRd5lLYAI3RQ7dhStUTFp3Vqd803PJ/cpR6");
-
-    private byte[] response = Base64.decode(
-            "MIIFnAoBAKCCBZUwggWRBgkrBgEFBQcwAQEEggWCMIIFfjCCARehgZ8wgZwx"
-          + "CzAJBgNVBAYTAklOMRcwFQYDVQQIEw5BbmRocmEgcHJhZGVzaDESMBAGA1UE"
-          + "BxMJSHlkZXJhYmFkMQwwCgYDVQQKEwNUQ1MxDDAKBgNVBAsTA0FUQzEeMBwG"
-          + "A1UEAxMVVENTLUNBIE9DU1AgUmVzcG9uZGVyMSQwIgYJKoZIhvcNAQkBFhVv"
-          + "Y3NwQHRjcy1jYS50Y3MuY28uaW4YDzIwMDMwNDAyMTIzNDU4WjBiMGAwOjAJ"
-          + "BgUrDgMCGgUABBRs07IuoCWNmcEl1oHwIak1BPnX8QQUtGyl/iL9WJ1VxjxF"
-          + "j0hAwJ/s1AcCAQKhERgPMjAwMjA4MjkwNzA5MjZaGA8yMDAzMDQwMjEyMzQ1"
-          + "OFowDQYJKoZIhvcNAQEFBQADgYEAfbN0TCRFKdhsmvOdUoiJ+qvygGBzDxD/"
-          + "VWhXYA+16AphHLIWNABR3CgHB3zWtdy2j7DJmQ/R7qKj7dUhWLSqclAiPgFt"
-          + "QQ1YvSJAYfEIdyHkxv4NP0LSogxrumANcDyC9yt/W9yHjD2ICPBIqCsZLuLk"
-          + "OHYi5DlwWe9Zm9VFwCGgggPMMIIDyDCCA8QwggKsoAMCAQICAQYwDQYJKoZI"
-          + "hvcNAQEFBQAwgZQxFDASBgNVBAMTC1RDUy1DQSBPQ1NQMSYwJAYJKoZIhvcN"
-          + "AQkBFhd0Y3MtY2FAdGNzLWNhLnRjcy5jby5pbjEMMAoGA1UEChMDVENTMQww"
-          + "CgYDVQQLEwNBVEMxEjAQBgNVBAcTCUh5ZGVyYWJhZDEXMBUGA1UECBMOQW5k"
-          + "aHJhIHByYWRlc2gxCzAJBgNVBAYTAklOMB4XDTAyMDgyOTA3MTE0M1oXDTAz"
-          + "MDgyOTA3MTE0M1owgZwxCzAJBgNVBAYTAklOMRcwFQYDVQQIEw5BbmRocmEg"
-          + "cHJhZGVzaDESMBAGA1UEBxMJSHlkZXJhYmFkMQwwCgYDVQQKEwNUQ1MxDDAK"
-          + "BgNVBAsTA0FUQzEeMBwGA1UEAxMVVENTLUNBIE9DU1AgUmVzcG9uZGVyMSQw"
-          + "IgYJKoZIhvcNAQkBFhVvY3NwQHRjcy1jYS50Y3MuY28uaW4wgZ8wDQYJKoZI"
-          + "hvcNAQEBBQADgY0AMIGJAoGBAM+XWW4caMRv46D7L6Bv8iwtKgmQu0SAybmF"
-          + "RJiz12qXzdvTLt8C75OdgmUomxp0+gW/4XlTPUqOMQWv463aZRv9Ust4f8MH"
-          + "EJh4ekP/NS9+d8vEO3P40ntQkmSMcFmtA9E1koUtQ3MSJlcs441JjbgUaVnm"
-          + "jDmmniQnZY4bU3tVAgMBAAGjgZowgZcwDAYDVR0TAQH/BAIwADALBgNVHQ8E"
-          + "BAMCB4AwEwYDVR0lBAwwCgYIKwYBBQUHAwkwNgYIKwYBBQUHAQEEKjAoMCYG"
-          + "CCsGAQUFBzABhhpodHRwOi8vMTcyLjE5LjQwLjExMDo3NzAwLzAtBgNVHR8E"
-          + "JjAkMCKgIKAehhxodHRwOi8vMTcyLjE5LjQwLjExMC9jcmwuY3JsMA0GCSqG"
-          + "SIb3DQEBBQUAA4IBAQB6FovM3B4VDDZ15o12gnADZsIk9fTAczLlcrmXLNN4"
-          + "PgmqgnwF0Ymj3bD5SavDOXxbA65AZJ7rBNAguLUo+xVkgxmoBH7R2sBxjTCc"
-          + "r07NEadxM3HQkt0aX5XYEl8eRoifwqYAI9h0ziZfTNes8elNfb3DoPPjqq6V"
-          + "mMg0f0iMS4W8LjNPorjRB+kIosa1deAGPhq0eJ8yr0/s2QR2/WFD5P4aXc8I"
-          + "KWleklnIImS3zqiPrq6tl2Bm8DZj7vXlTOwmraSQxUwzCKwYob1yGvNOUQTq"
-          + "pG6jxn7jgDawHU1+WjWQe4Q34/pWeGLysxTraMa+Ug9kPe+jy/qRX2xwvKBZ");
-    
-    private boolean isSameAs(
-        byte[]  a,
-        byte[]  b)
-    {
-        if (a.length != b.length)
-        {
-            return false;
-        }
-        
-        for (int i = 0; i != a.length; i++)
-        {
-            if (a[i] != b[i])
-            {
-                return false;
-            }
-        }
-        
-        return true;
-    }
-    
-    private TestResult unsignedRequest()
-    {
-        try
-        {
-            ASN1InputStream aIn = new ASN1InputStream(new ByteArrayInputStream(unsignedReq));
-            OCSPRequest     req = OCSPRequest.getInstance(aIn.readObject());
-            
-            if (!isSameAs(req.getEncoded(), unsignedReq))
-            {
-                return new SimpleTestResult(false, getName() + ": OCSP unsigned request failed to re-encode");
-            }
-            
-            return new SimpleTestResult(true, getName() + ": Okay");
-        }
-        catch (Exception e)
-        {
-            return new SimpleTestResult(false, getName() + ": failed unsigned exception - " + e.toString(), e);
-        }
-    }
-    
-    private TestResult signedRequest()
-    {
-        try
-        {
-            ASN1InputStream aIn = new ASN1InputStream(new ByteArrayInputStream(signedReq));
-            OCSPRequest     req = OCSPRequest.getInstance(aIn.readObject());
-            
-            if (!isSameAs(req.getEncoded(), signedReq))
-            {
-                return new SimpleTestResult(false, getName() + ": OCSP signed request failed to re-encode");
-            }
-            
-            return new SimpleTestResult(true, getName() + ": Okay");
-        }
-        catch (Exception e)
-        {
-            return new SimpleTestResult(false, getName() + ": failed signed exception - " + e.toString(), e);
-        }
-    }
-    
-    private TestResult response()
-    {
-        try
-        {
-            ASN1InputStream aIn = new ASN1InputStream(new ByteArrayInputStream(response));
-            OCSPResponse    resp = OCSPResponse.getInstance(aIn.readObject());
-            ResponseBytes   rBytes = ResponseBytes.getInstance(resp.getResponseBytes());
-            
-            aIn = new ASN1InputStream(new ByteArrayInputStream(rBytes.getResponse().getOctets()));
-            
-            BasicOCSPResponse   bResp = BasicOCSPResponse.getInstance(aIn.readObject());
-            
-            resp = new OCSPResponse(resp.getResponseStatus(), new ResponseBytes(rBytes.getResponseType(), new DEROctetString(bResp.getEncoded())));
-            
-            if (!isSameAs(resp.getEncoded(), response))
-            {
-                return new SimpleTestResult(false, getName() + ": OCSP response failed to re-encode");
-            }
-            
-            return new SimpleTestResult(true, getName() + ": Okay");
-        }
-        catch (Exception e)
-        {
-            return new SimpleTestResult(false, getName() + ": failed response exception - " + e.toString(), e);
-        }
-    }
-
-    public TestResult perform()
-    {
-        TestResult  res = unsignedRequest();
-        
-        if (!res.isSuccessful())
-        {
-            return res;
-        }
-        
-        res = signedRequest();
-        if (!res.isSuccessful())
-        {
-            return res;
-        }
-        
-        return response();
-    }
-
-    public String getName()
-    {
-        return "OCSP";
-    }
-
-    public static void main(
-        String[] args)
-    {
-        OCSPTest    test = new OCSPTest();
-        TestResult      result = test.perform();
-
-        System.out.println(result);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/test/OIDTest.java b/bcprov/src/main/java/org/bouncycastle/asn1/test/OIDTest.java
deleted file mode 100644
index fa5aa61..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/test/OIDTest.java
+++ /dev/null
@@ -1,165 +0,0 @@
-package org.bouncycastle.asn1.test;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1OutputStream;
-import org.bouncycastle.asn1.DEROutputStream;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-
-
-/**
- * X.690 test example
- */
-public class OIDTest
-    extends SimpleTest
-{
-    byte[]    req1 = Hex.decode("0603813403");
-    byte[]    req2 = Hex.decode("06082A36FFFFFFDD6311");
-
-    public String getName()
-    {
-        return "OID";
-    }
-    
-    private void recodeCheck(
-        String oid, 
-        byte[] enc) 
-        throws IOException
-    {
-        ByteArrayInputStream     bIn = new ByteArrayInputStream(enc);
-        ASN1InputStream          aIn = new ASN1InputStream(bIn);
-
-        ASN1ObjectIdentifier      o = new ASN1ObjectIdentifier(oid);
-        ASN1ObjectIdentifier      encO = (ASN1ObjectIdentifier)aIn.readObject();
-        
-        if (!o.equals(encO))
-        {
-            fail("oid ID didn't match", o, encO);
-        }
-        
-        ByteArrayOutputStream    bOut = new ByteArrayOutputStream();
-        DEROutputStream          dOut = new DEROutputStream(bOut);
-
-        dOut.writeObject(o);
-
-        byte[]                    bytes = bOut.toByteArray();
-
-        if (bytes.length != enc.length)
-        {
-            fail("failed length test");
-        }
-
-        for (int i = 0; i != enc.length; i++)
-        {
-            if (bytes[i] != enc[i])
-            {
-                fail("failed comparison test", new String(Hex.encode(enc)), new String(Hex.encode(bytes)));
-            }
-        }
-    }
-    
-    private void validOidCheck(
-        String  oid)
-        throws IOException
-    {
-        ASN1ObjectIdentifier     o = new ASN1ObjectIdentifier(oid);
-        ByteArrayOutputStream   bOut = new ByteArrayOutputStream();
-        ASN1OutputStream        aOut = new ASN1OutputStream(bOut);
-        
-        aOut.writeObject(o);
-        
-        ByteArrayInputStream    bIn = new ByteArrayInputStream(bOut.toByteArray());
-        ASN1InputStream         aIn = new ASN1InputStream(bIn);
-        
-        o = (ASN1ObjectIdentifier)aIn.readObject();
-        
-        if (!o.getId().equals(oid))
-        {
-            fail("failed oid check for " + oid);
-        }
-    }
-
-    private void invalidOidCheck(
-        String oid)
-    {
-        try
-        {
-            new ASN1ObjectIdentifier(oid);
-            fail("failed to catch bad oid: " + oid);
-        }
-        catch (IllegalArgumentException e)
-        {
-            // expected
-        }
-    }
-
-    private void branchCheck(String stem, String branch)
-    {
-        String expected = stem + "." + branch;
-        String actual = new ASN1ObjectIdentifier(stem).branch(branch).getId();
-
-        if (!expected.equals(actual))
-        {
-            fail("failed 'branch' check for " + stem + "/" + branch);
-        }
-    }
-
-    private void onCheck(String stem, String test, boolean expected)
-    {
-        if (expected != new ASN1ObjectIdentifier(test).on(new ASN1ObjectIdentifier(stem)))
-        {
-            fail("failed 'on' check for " + stem + "/" + test);
-        }
-    }
-
-    public void performTest()
-        throws IOException
-    {
-        recodeCheck("2.100.3", req1);
-        recodeCheck("1.2.54.34359733987.17", req2);
-        
-        validOidCheck(PKCSObjectIdentifiers.pkcs_9_at_contentType.getId());
-        validOidCheck("0.1");
-        validOidCheck("1.1.127.32512.8323072.2130706432.545460846592.139637976727552.35747322042253312.9151314442816847872");
-        validOidCheck("1.2.123.12345678901.1.1.1");
-        validOidCheck("2.25.196556539987194312349856245628873852187.1");
-
-        invalidOidCheck("0");
-        invalidOidCheck("1");
-        invalidOidCheck("2");
-        invalidOidCheck("3.1");
-        invalidOidCheck("..1");
-        invalidOidCheck("192.168.1.1");
-        invalidOidCheck(".123452");
-        invalidOidCheck("1.");
-        invalidOidCheck("1.345.23.34..234");
-        invalidOidCheck("1.345.23.34.234.");
-        invalidOidCheck(".12.345.77.234");
-        invalidOidCheck(".12.345.77.234.");
-        invalidOidCheck("1.2.3.4.A.5");
-        invalidOidCheck("1,2");
-
-        branchCheck("1.1", "2.2");
-
-        onCheck("1.1", "1.1", false);
-        onCheck("1.1", "1.2", false);
-        onCheck("1.1", "1.2.1", false);
-        onCheck("1.1", "2.1", false);
-        onCheck("1.1", "1.11", false);
-        onCheck("1.12", "1.1.2", false);
-        onCheck("1.1", "1.1.1", true);
-        onCheck("1.1", "1.1.2", true);
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        runTest(new OIDTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/test/ObjectIdentifierTest.java b/bcprov/src/main/java/org/bouncycastle/asn1/test/ObjectIdentifierTest.java
deleted file mode 100644
index bd665ec..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/test/ObjectIdentifierTest.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package org.bouncycastle.asn1.test;
-
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.util.test.SimpleTest;
-import org.bouncycastle.util.test.TestResult;
-
-public class ObjectIdentifierTest
-    extends SimpleTest
-{
-    public String getName()
-    {
-        return "ObjectIdentifier";
-    }
-
-    public void performTest()
-        throws Exception
-    {
-        // exercise the object cache
-        for (int i = 0; i < 1024; i++)
-        {
-            for (int j = 0; j != 17000; j++)
-            {
-                byte[] encoded = new ASN1ObjectIdentifier("1.1." + i + "." + j).getEncoded();
-
-                ASN1ObjectIdentifier.getInstance(encoded);
-            }
-        }
-    }
-
-    public static void main(
-        String[] args)
-    {
-        ObjectIdentifierTest    test = new ObjectIdentifierTest();
-        TestResult result = test.perform();
-
-        System.out.println(result);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/test/OctetStringTest.java b/bcprov/src/main/java/org/bouncycastle/asn1/test/OctetStringTest.java
deleted file mode 100644
index 68ed5da..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/test/OctetStringTest.java
+++ /dev/null
@@ -1,203 +0,0 @@
-package org.bouncycastle.asn1.test;
-
-import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1OctetStringParser;
-import org.bouncycastle.asn1.ASN1SequenceParser;
-import org.bouncycastle.asn1.ASN1StreamParser;
-import org.bouncycastle.asn1.BEROctetStringGenerator;
-import org.bouncycastle.asn1.BERSequenceGenerator;
-import org.bouncycastle.asn1.BERTags;
-import org.bouncycastle.asn1.DERSequenceGenerator;
-import org.bouncycastle.asn1.cms.CMSObjectIdentifiers;
-import org.bouncycastle.asn1.cms.CompressedDataParser;
-import org.bouncycastle.asn1.cms.ContentInfoParser;
-
-public class OctetStringTest 
-    extends TestCase 
-{
-    public void testReadingWriting()
-        throws Exception
-    {
-       ByteArrayOutputStream bOut = new ByteArrayOutputStream();
-       BEROctetStringGenerator octGen = new BEROctetStringGenerator(bOut);
-       
-       OutputStream out = octGen.getOctetOutputStream();
-       
-       out.write(new byte[] { 1, 2, 3, 4 });
-       out.write(new byte[4]);
-       
-       out.close();
-       
-       ASN1StreamParser aIn = new ASN1StreamParser(bOut.toByteArray());
-       
-       ASN1OctetStringParser s = (ASN1OctetStringParser)aIn.readObject();
-       
-       InputStream in = s.getOctetStream();
-       int         count = 0;
-       
-       while (in.read() >= 0)
-       {
-           count++;
-       }
-
-       assertEquals(8, count);
-    }
-    
-    public void testReadingWritingZeroInLength()
-        throws Exception
-    {
-       ByteArrayOutputStream bOut = new ByteArrayOutputStream();
-       BEROctetStringGenerator octGen = new BEROctetStringGenerator(bOut);
-       
-       OutputStream out = octGen.getOctetOutputStream();
-       
-       out.write(new byte[] { 1, 2, 3, 4 });
-       out.write(new byte[512]);  // forces a zero to appear in length
-       
-       out.close();
-       
-       ASN1StreamParser aIn = new ASN1StreamParser(bOut.toByteArray());
-       
-       ASN1OctetStringParser s = (ASN1OctetStringParser)aIn.readObject();
-       
-       InputStream in = s.getOctetStream();
-       int         count = 0;
-       
-       while (in.read() >= 0)
-       {
-           count++;
-       }
-    
-       assertEquals(516, count);
-    }
-    
-    public void testReadingWritingNested()
-        throws Exception
-    {
-       ByteArrayOutputStream bOut = new ByteArrayOutputStream();
-       BERSequenceGenerator sGen = new BERSequenceGenerator(bOut);
-       BEROctetStringGenerator octGen = new BEROctetStringGenerator(sGen.getRawOutputStream());
-       
-       OutputStream out = octGen.getOctetOutputStream();
-       
-       BERSequenceGenerator inSGen = new BERSequenceGenerator(out);
-       
-       BEROctetStringGenerator inOctGen = new BEROctetStringGenerator(inSGen.getRawOutputStream());
-       
-       OutputStream inOut = inOctGen.getOctetOutputStream();
-       
-       inOut.write(new byte[] { 1, 2, 3, 4 });
-       inOut.write(new byte[10]);
-       
-       inOut.close();
-       
-       inSGen.close();
-       
-       out.close();
-       
-       sGen.close();
-       
-       ASN1StreamParser aIn = new ASN1StreamParser(bOut.toByteArray());
-       
-       ASN1SequenceParser sq = (ASN1SequenceParser)aIn.readObject();
-       
-       ASN1OctetStringParser s = (ASN1OctetStringParser)sq.readObject();
-       
-       ASN1StreamParser aIn2 = new ASN1StreamParser(s.getOctetStream());
-       
-       ASN1SequenceParser sq2 = (ASN1SequenceParser)aIn2.readObject();
-       
-       ASN1OctetStringParser inS = (ASN1OctetStringParser)sq2.readObject();
-       
-       InputStream in = inS.getOctetStream();
-       int         count = 0;
-       
-       while (in.read() >= 0)
-       {
-           count++;
-       }
-    
-       assertEquals(14, count);
-    }
-    
-    public void testNestedStructure()
-        throws Exception
-    {
-        ByteArrayOutputStream bOut = new ByteArrayOutputStream();
-        
-        BERSequenceGenerator sGen = new BERSequenceGenerator(bOut);
-        
-        sGen.addObject(new ASN1ObjectIdentifier(CMSObjectIdentifiers.compressedData.getId()));
-        
-        BERSequenceGenerator cGen = new BERSequenceGenerator(sGen.getRawOutputStream(), 0, true);
-        
-        cGen.addObject(new ASN1Integer(0));
-        
-        //
-        // AlgorithmIdentifier
-        //
-        DERSequenceGenerator algGen = new DERSequenceGenerator(cGen.getRawOutputStream());
-        
-        algGen.addObject(new ASN1ObjectIdentifier("1.2"));
-
-        algGen.close();
-        
-        //
-        // Encapsulated ContentInfo
-        //
-        BERSequenceGenerator eiGen = new BERSequenceGenerator(cGen.getRawOutputStream());
-        
-        eiGen.addObject(new ASN1ObjectIdentifier("1.1"));
-        
-        BEROctetStringGenerator octGen = new BEROctetStringGenerator(eiGen.getRawOutputStream(), 0, true);
-        
-        //
-        // output containing zeroes
-        //
-        OutputStream out = octGen.getOctetOutputStream();
-        
-        out.write(new byte[] { 1, 2, 3, 4 });
-        out.write(new byte[4]);
-        out.write(new byte[20]);
-        
-        out.close();
-        eiGen.close();
-        cGen.close();
-        sGen.close();
-        
-        //
-        // reading back
-        //
-        ASN1StreamParser aIn = new ASN1StreamParser(bOut.toByteArray());
-
-        ContentInfoParser cp = new ContentInfoParser((ASN1SequenceParser)aIn.readObject());
-        
-        CompressedDataParser comData = new CompressedDataParser((ASN1SequenceParser)cp.getContent(BERTags.SEQUENCE));
-        ContentInfoParser     content = comData.getEncapContentInfo();
-
-        ASN1OctetStringParser bytes = (ASN1OctetStringParser)content.getContent(BERTags.OCTET_STRING);
-
-        InputStream in = bytes.getOctetStream();
-        int         count = 0;
-        
-        while (in.read() >= 0)
-        {
-            count++;
-        }
-
-        assertEquals(28, count);
-    }
-    
-    public static Test suite()
-    {
-        return new TestSuite(OctetStringTest.class);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/test/OtherCertIDUnitTest.java b/bcprov/src/main/java/org/bouncycastle/asn1/test/OtherCertIDUnitTest.java
deleted file mode 100644
index 9a85cea..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/test/OtherCertIDUnitTest.java
+++ /dev/null
@@ -1,97 +0,0 @@
-package org.bouncycastle.asn1.test;
-
-import java.io.IOException;
-
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.ess.OtherCertID;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.asn1.x509.GeneralName;
-import org.bouncycastle.asn1.x509.GeneralNames;
-import org.bouncycastle.asn1.x509.IssuerSerial;
-import org.bouncycastle.asn1.x509.X509Name;
-
-public class OtherCertIDUnitTest
-    extends ASN1UnitTest
-{
-    public String getName()
-    {
-        return "OtherCertID";
-    }
-
-    public void performTest()
-        throws Exception
-    {
-        AlgorithmIdentifier algId = new AlgorithmIdentifier(new ASN1ObjectIdentifier("1.2.2.3"));
-        byte[]              digest = new byte[20];
-        IssuerSerial        issuerSerial = new IssuerSerial(new GeneralNames(new GeneralName(new X509Name("CN=test"))), new ASN1Integer(1));
-
-        OtherCertID certID = new OtherCertID(algId, digest);
-
-        checkConstruction(certID, algId, digest, null);
-
-        certID = new OtherCertID(algId, digest, issuerSerial);
-
-        checkConstruction(certID, algId, digest, issuerSerial);
-
-        certID = OtherCertID.getInstance(null);
-
-        if (certID != null)
-        {
-            fail("null getInstance() failed.");
-        }
-
-        try
-        {
-            OtherCertID.getInstance(new Object());
-
-            fail("getInstance() failed to detect bad object.");
-        }
-        catch (IllegalArgumentException e)
-        {
-            // expected
-        }
-    }
-
-    private void checkConstruction(
-        OtherCertID certID,
-        AlgorithmIdentifier algId,
-        byte[] digest,
-        IssuerSerial issuerSerial)
-        throws IOException
-    {
-        checkValues(certID, algId, digest, issuerSerial);
-
-        certID = OtherCertID.getInstance(certID);
-
-        checkValues(certID, algId, digest, issuerSerial);
-
-        ASN1InputStream aIn = new ASN1InputStream(certID.toASN1Object().getEncoded());
-
-        ASN1Sequence seq = (ASN1Sequence)aIn.readObject();
-
-        certID = OtherCertID.getInstance(seq);
-
-        checkValues(certID, algId, digest, issuerSerial);
-    }
-
-    private void checkValues(
-        OtherCertID certID,
-        AlgorithmIdentifier algId,
-        byte[] digest,
-        IssuerSerial issuerSerial)
-    {
-        checkMandatoryField("algorithmHash", algId, certID.getAlgorithmHash());
-        checkMandatoryField("certHash", digest, certID.getCertHash());
-
-        checkOptionalField("issuerSerial", issuerSerial, certID.getIssuerSerial());
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        runTest(new OtherCertIDUnitTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/test/OtherSigningCertificateUnitTest.java b/bcprov/src/main/java/org/bouncycastle/asn1/test/OtherSigningCertificateUnitTest.java
deleted file mode 100644
index 9de12ee..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/test/OtherSigningCertificateUnitTest.java
+++ /dev/null
@@ -1,86 +0,0 @@
-package org.bouncycastle.asn1.test;
-
-import java.io.IOException;
-
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.ess.OtherCertID;
-import org.bouncycastle.asn1.ess.OtherSigningCertificate;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-
-public class OtherSigningCertificateUnitTest
-    extends ASN1UnitTest
-{
-    public String getName()
-    {
-        return "OtherSigningCertificate";
-    }
-
-    public void performTest()
-        throws Exception
-    {
-        AlgorithmIdentifier algId = new AlgorithmIdentifier(new ASN1ObjectIdentifier("1.2.2.3"));
-        byte[]              digest = new byte[20];
-        OtherCertID         otherCertID = new OtherCertID(algId, digest);
-
-        OtherSigningCertificate otherCert = new OtherSigningCertificate(otherCertID);
-
-        checkConstruction(otherCert, otherCertID);
-
-        otherCert = OtherSigningCertificate.getInstance(null);
-
-        if (otherCert != null)
-        {
-            fail("null getInstance() failed.");
-        }
-
-        try
-        {
-            OtherCertID.getInstance(new Object());
-
-            fail("getInstance() failed to detect bad object.");
-        }
-        catch (IllegalArgumentException e)
-        {
-            // expected
-        }
-    }
-
-    private void checkConstruction(
-        OtherSigningCertificate otherCert,
-        OtherCertID otherCertID)
-        throws IOException
-    {
-        checkValues(otherCert, otherCertID);
-
-        otherCert = OtherSigningCertificate.getInstance(otherCert);
-
-        checkValues(otherCert, otherCertID);
-
-        ASN1InputStream aIn = new ASN1InputStream(otherCert.toASN1Object().getEncoded());
-
-        ASN1Sequence seq = (ASN1Sequence)aIn.readObject();
-
-        otherCert = OtherSigningCertificate.getInstance(seq);
-
-        checkValues(otherCert, otherCertID);
-    }
-
-    private void checkValues(
-        OtherSigningCertificate otherCert,
-        OtherCertID otherCertID)
-    {
-        if (otherCert.getCerts().length != 1)
-        {
-            fail("getCerts() length wrong");
-        }
-        checkMandatoryField("getCerts()[0]", otherCertID, otherCert.getCerts()[0]);
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        runTest(new OtherSigningCertificateUnitTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/test/PKCS10Test.java b/bcprov/src/main/java/org/bouncycastle/asn1/test/PKCS10Test.java
deleted file mode 100644
index da6571d..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/test/PKCS10Test.java
+++ /dev/null
@@ -1,101 +0,0 @@
-package org.bouncycastle.asn1.test;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DEROutputStream;
-import org.bouncycastle.asn1.pkcs.CertificationRequest;
-import org.bouncycastle.util.encoders.Base64;
-import org.bouncycastle.util.test.SimpleTestResult;
-import org.bouncycastle.util.test.Test;
-import org.bouncycastle.util.test.TestResult;
-
-public class PKCS10Test
-    implements Test
-{
-    byte[]    req1 = Base64.decode(
-                "MIHoMIGTAgEAMC4xDjAMBgNVBAMTBVRlc3QyMQ8wDQYDVQQKEwZBbmFUb20xCzAJBgNVBAYTAlNF"
-            +   "MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALlEt31Tzt2MlcOljvacJgzQVhmlMoqAOgqJ9Pgd3Gux"
-            +   "Z7/WcIlgW4QCB7WZT21O1YoghwBhPDMcNGrHei9kHQkCAwEAAaAAMA0GCSqGSIb3DQEBBQUAA0EA"
-            +   "NDEI4ecNtJ3uHwGGlitNFq9WxcoZ0djbQJ5hABMotav6gtqlrwKXY2evaIrsNwkJtNdwwH18aQDU"
-            +   "KCjOuBL38Q==");
-
-    byte[]    req2 = Base64.decode(
-               "MIIB6TCCAVICAQAwgagxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRQwEgYDVQQH"
-            +  "EwtTYW50YSBDbGFyYTEMMAoGA1UEChMDQUJCMVEwTwYDVQQLHEhQAAAAAAAAAG8AAAAAAAAAdwAA"
-            +  "AAAAAABlAAAAAAAAAHIAAAAAAAAAIAAAAAAAAABUAAAAAAAAABxIAAAAAAAARAAAAAAAAAAxDTAL"
-            +  "BgNVBAMTBGJsdWUwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANETRZ+6occCOrFxNhfKIp4C"
-            +  "mMkxwhBNb7TnnahpbM9O0r4hrBPcfYuL7u9YX/jN0YNUP+/CiT39HhSe/bikaBPDEyNsl988I8vX"
-            +  "piEdgxYq/+LTgGHbjRsRYCkPtmzwBbuBldNF8bV7pu0v4UScSsExmGqqDlX1TbPU8KkPU1iTAgMB"
-            +  "AAGgADANBgkqhkiG9w0BAQQFAAOBgQAFbrs9qUwh93CtETk7DeUD5HcdCnxauo1bck44snSV6MZV"
-            +  "OCIGaYu1501kmhEvAtVVRr6SEHwimfQDDIjnrWwYsEr/DT6tkTZAbfRd3qUu3iKjT0H0vlUZp0hJ"
-            +  "66mINtBM84uZFBfoXiWY8M3FuAnGmvy6ah/dYtJorTxLKiGkew==");
-
-    public String getName()
-    {
-        return "PKCS10";
-    }
-    
-    public TestResult pkcs10Test(
-        String  testName,
-        byte[]  req)
-    {
-        try
-        {
-            ByteArrayInputStream    bIn = new ByteArrayInputStream(req);
-            ASN1InputStream         aIn = new ASN1InputStream(bIn);
-
-            CertificationRequest    r = new CertificationRequest((ASN1Sequence)aIn.readObject());
-
-            ByteArrayOutputStream    bOut = new ByteArrayOutputStream();
-            DEROutputStream            dOut = new DEROutputStream(bOut);
-
-            dOut.writeObject(r.toASN1Primitive());
-
-            byte[]                    bytes = bOut.toByteArray();
-
-            if (bytes.length != req.length)
-            {
-                return new SimpleTestResult(false, getName() + ": " + testName + " failed length test");
-            }
-
-            for (int i = 0; i != req.length; i++)
-            {
-                if (bytes[i] != req[i])
-                {
-                    return new SimpleTestResult(false, getName() + ": " + testName + " failed comparison test");
-                }
-            }
-        }
-        catch (Exception e)
-        {
-            return new SimpleTestResult(false, getName() + ": Exception - " + testName + " " + e.toString());
-        }
-
-        return new SimpleTestResult(true, getName() + ": Okay");
-    }
-
-    public TestResult perform()
-    {
-        TestResult  res = pkcs10Test("basic CR", req1);
-
-        if (!res.isSuccessful())
-        {
-            return res;
-        }
-
-        return pkcs10Test("Universal CR", req2);
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        Test    test = new PKCS10Test();
-
-        TestResult  result = test.perform();
-
-        System.out.println(result);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/test/PKCS12Test.java b/bcprov/src/main/java/org/bouncycastle/asn1/test/PKCS12Test.java
deleted file mode 100644
index f533a65..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/test/PKCS12Test.java
+++ /dev/null
@@ -1,227 +0,0 @@
-package org.bouncycastle.asn1.test;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.ASN1OutputStream;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.BEROctetString;
-import org.bouncycastle.asn1.DLSequence;
-import org.bouncycastle.asn1.pkcs.AuthenticatedSafe;
-import org.bouncycastle.asn1.pkcs.ContentInfo;
-import org.bouncycastle.asn1.pkcs.EncryptedData;
-import org.bouncycastle.asn1.pkcs.EncryptedPrivateKeyInfo;
-import org.bouncycastle.asn1.pkcs.MacData;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.asn1.pkcs.Pfx;
-import org.bouncycastle.asn1.pkcs.SafeBag;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.asn1.x509.DigestInfo;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.encoders.Base64;
-import org.bouncycastle.util.test.SimpleTest;
-
-public class PKCS12Test
-    extends SimpleTest
-{
-    byte[] pkcs12 = Base64.decode(
-          "MIACAQMwgAYJKoZIhvcNAQcBoIAkgASCA+gwgDCABgkqhkiG9w0BBwGggCSA"
-        + "BIIDRDCCA0AwggM8BgsqhkiG9w0BDAoBAqCCArEwggKtMCcGCiqGSIb3DQEM"
-        + "AQMwGQQUFlnNVpQoEHc+J3UEGxARipkHu5kCAWQEggKAAH9tmy40lly6QDoc"
-        + "1TfmY9y2qysD+lrgk+dnxP04RfoJfycTRDeaz2sPLImZtio9nsqCFqtzU/sl"
-        + "eWigbH34BpKU1sC0Gq1cyik0GO65sW95S6YjKtGcGOBfQCPk1oQjfiqnfU3G"
-        + "oeOaG3COQJukMFj8unv55u0xbX1hwO8SsZmr9RjPzLrVaeY6BP5+CCzOKBaj"
-        + "GxneIDqnQW7/kBIVWK7M+JXGdgQyiKhD6NvXL/zD8oKEne0nIX7IokQuWEn6"
-        + "8Sglv5OSclsSdvHTk57bCuV5lVzoIzczA4J/LZWdrtITeVefBLQSalBzpRde"
-        + "rSTMj485z2x5ChizhjE627/KQ5vkKQkQVqXYYXVyeTvKZRpL7vz13C4DUCwN"
-        + "im1XvNSCNebXS1yHJRtcONDhGJN3UsrVjHr+2kCfE5SCEeSU/dqgNLuLa1tk"
-        + "5+jwZFNj/HjO88wlOwPCol1uuJjDpaEW7dxu5qsVSfZhEXWHs8rZAMttFMzi"
-        + "yxsEkZe8kqngRbNJOY6KpppYedsMWDusUJGfIHo+8zymiw3gv/z+lmFOlDGt"
-        + "CKMk9Es/MgfjpbfhbTVYHOBKS6Qyrz7LdTuBMI8XdsZMuN+Uf73690ggLmKW"
-        + "IELUg8h1RX0ra2n6jOc/1rnebAifMhiMkL1ABQvqOobfOrG/9h9XcXoi64Qr"
-        + "htc3T7yMAHafBX5KUcNkbcn6kssYhpvd8bPADoLBnbx3GxGh/uziB0zKQEI0"
-        + "GnaY4SL7aR4C5xNNi41lYtsR6ohKyfPEGslhrhd4axx0cKxC2sHgVl0k+r8B"
-        + "8Vu44XHbW8LqdspjOHN9qg2erES1Dvgj05SfHDup+V6a3ogJo2YKXOiu3DF4"
-        + "MFEGCSqGSIb3DQEJFDFEHkIARABhAHYAaQBkACAARwAuACAASABvAG8AawAn"
-        + "AHMAIABWAGUAcgBpAFMAaQBnAG4ALAAgAEkAbgBjAC4AIABJAEQwIwYJKoZI"
-        + "hvcNAQkVMRYEFKEcMJ798oZLFkH0OnpbUBnrTLgWAAAAAAAAMIAGCSqGSIb3"
-        + "DQEHBqCAMIACAQAwgAYJKoZIhvcNAQcBMCcGCiqGSIb3DQEMAQYwGQQUTErH"
-        + "kWZ8nBXZYWO53FH4yqRZZsECAWSggASCDGCreuCr6/azcOv5w04bN3jkg4G2"
-        + "dsvTPAjL8bichaEOQCykhuNPt1dv3FsjUsdFC550K0+Y48RyBIID6JTiN9Gj"
-        + "K+a5aLPaXgTRdY74Toof1hYtZ4DIcVyq25LezVQHoe/++pAgEpWjqHTxVDIv"
-        + "YFAgT2oDB+2vkeXM61XnNWOjwCY3pXpk/VGjyN4USkD7Q/Y6tPjQOywvQE7c"
-        + "Ab1z62k9iMia7Yk/qmh+zJu4SSneo0/RLLdMZOlGZv89MResVG038TC8MTA9"
-        + "Uf+wDRcS20d7XDbTaBAgju8TpFIw5/lbDi0feUVlk6L+jkT1ktaTc1Pwtxn7"
-        + "psXMFW6HAWB4exOi09297R9BCOQX6vcetK/iA/3jIC6NuTdizYof0DWetdGy"
-        + "haIkMiEnERYE3unJocH4fq585Rw6mE+BYssPVPkVWZZInF3l69bKduuxsQt+"
-        + "pcApgBVsTjsU+1FOiUxuW2wWKi70RcQprPv5Ef1A5FRNxPFp+7IzLNlE4qCo"
-        + "wvC6NTpeuRw3aGsXSfqHmSddrHugNPmghNgG5lv1Ef7A8MUuyp8fyjAgxCDk"
-        + "4Hpb8PCHGj5t//Fr6Cd0MygJMIFQmv4kUd2LVHxQ9A9WFNCqTz/nBe+ZRLJL"
-        + "NghTv6gGpjGJiBnXYv6Sod2fs+5J2GIvex4qbdh6gzZIU2YTAwpj6Aca3SjA"
-        + "X8+m8AXt2SC3Z6T5+m8SxyiNp2P511paV/TZKtLWXQGKeEX1JXhQkaM6Q5W/"
-        + "IhSgC8/gppk1gbIraBqrW8bEnGBnC03wi0OnMz3ohM4CVHyaW3dQquT2+u6F"
-        + "8VeGXAYHU022NkrpPl/VlfNNEAyisU2+oJqpPZkqL6FsDWF3k6Fq2jXBLL+/"
-        + "a0WA82jIpgjNeXze/cgoHtU023V9E9Qcu+5nPBYdCTR4sRxvHLANii0W8lPv"
-        + "tvU5XO1UsEjHDfKL4E1bhGzGpb/OU5yg/98EN95r/xdFL5G+XVyHeR0UtkcB"
-        + "IuvyBdhkwoprCjkcgLZe8FPIBNw84HRe7Ye6f2gDW/F5uej6rBehJS1VFvCh"
-        + "DXzkajGmK40Gc2APS1/1vZqPu68polgw9dT84rem36PLEOq4KuU7n4QE0g7T"
-        + "YR2G8+4FNgQTjjg/qw3lX+sj6yLn1lYt1dOVvkiM8i8tdZg/3pCKKAW1uV7a"
-        + "astlBxVSkFfn1BrFTc2oFGkTrlUg90a+parOfGHTfDiaHX8ouEg63fk0+Xdi"
-        + "FCarXsqHNPDbpmWLKw8TAmdeneGipyScntJJk4ajy+jROQBgGew3ofOmfkqm"
-        + "oJFNwUvKOXN2ucViLZgsdK/7YgV1OR7oiTh8knQNPk3d5fRYSMFf9GJTjQRV"
-        + "y2CLdICAVzvrUXf9k7miWYkjIp2/HGD7pOH018sX9MrpfJKqvdPFOssZiFd0"
-        + "I2FUbgcEggPotvnT0XoabEiurTm8EPPpw66NKmK/H1kQL0hEtdIazPxfLmm/"
-        + "ZUDokwa7d4bE3BwFh0weQfEvMzJu6Y5E7ir2MqD33XaGMOGys1nst1SPPyDB"
-        + "WpOWD9w7Ng3yU1JVzqFWuVXaXDYbfnlG7AGevKF5PYNZj/RIQBBf5Xle9hTd"
-        + "c9CtxPkrsJwA8DeAwKl2WIfbXGzAYLSnXoYUcoTkWn/O81BlUFgAXv80gLe8"
-        + "NUrH7bhsnyGaPY953NyDk8IWUYrsn/sXvxTy5B0/7/WGMh3CSZrLX3p7TcFY"
-        + "yBrL6SRas4q9rrcwuhBq0tUUbbgWi92nhZl4bOGmx7ehHnwuUId2HWXyVGoB"
-        + "qToee/2E4PZFxSZwKCY6dahswFq5QGDrQKN2/qpOLZcJib6SvSGyEZl2pqr0"
-        + "lqk7tVPzBkN/4uP0qrcbZCDbGW6IXwu3RGMRehqj/HEJcs92lZKfVrk/U07X"
-        + "MBAiQHqV+kLw7kStECR/MGJG1c0xhqqBrf0W74+LpJiv/Q9iFNdWbXvE/cAk"
-        + "G7+OTUABd2kI88uA43T0UoRuPOi5KnLuD3AG+7IuyGyP69Xncd4u0srMg2fn"
-        + "DiLLZUy6vWmxwRFsSMCEfQNLtZaggukoPIihQvbX3mQS9izwLs6D89WtEcZ5"
-        + "6DVbIlUqUinnNKsT8vW1DZo5FMJkUxB666YIPVmkQbbJOEUU89dZg5Gw0og6"
-        + "rn4irEr4xHFdx+S7iqJXhzs9THg/9e4/k8KQ136z7LALOqDookcSdBzW6H8c"
-        + "STjs4qKQyNimsLB90mEuIEApzhseAaLFl+kgORGJv/2a+uoukZchMsJ98MVo"
-        + "sEPS1oBXJl2m9AshkWfON2GDeJatgcw6CyC1mSx++Gg602ZKUZZUaWxkz1Sw"
-        + "zTj3nhiJe+SZsdfxhsojNq7zfxqgY/Rq7BwvphU3StjnxvkB4rTkbmbiGOBO"
-        + "cvTFg4yOtQGRcifk2/XH/bgYiPqQrYSXpO3WRASV005RaSGufcpTtj3YlHGe"
-        + "8FUgZfDtfiGezhNET9KO3/Q0i34bGEpoIb/9uOWH4ZHULIlfdSm1ynV50nE4"
-        + "mJTXccrF6BE80KZI5GWGhqXdfPFaHTK1S20+XCw7bRJCGeiwVxvGfB+C0SZ4"
-        + "ndtqx165dKG5JwFukcygiIZN6foh0/PhwzmFxmPtZuPQt9dtuIQ35Y7PSDsy"
-        + "IH2Ot0Hh0YIN99lHJ6n9HomSjpwcgDXGssEuevbpz27u/MI/Uhq4Gfx0k5RF"
-        + "0pcRYtk1dYSx44a+8WgqZLF8DUNtyjSE/H8P5iGa6tqOl7kNyeeEkfoTtKst"
-        + "asGFwL4Qxxus4GC7repyVi7IJgSCA+iopiqKQJ2IqUHvoIEuD//sZooDx0Je"
-        + "oFRO5VakkTO6WHd8JpOOEU2f6Zjg++HdIl0QK7xcUaRH075LzEfqgn1vyw6J"
-        + "N6ex8D76sf/nAy01NvDPij48Z50XDwXu4kJGJvv0AJwId8BpjziBF0j3K/DI"
-        + "YOOpd6nW4EvdivCgaCnxqlIU/u1OP4BwpO+AUjJh6RKlKviGihQpi103DFhR"
-        + "yXNDhh55pqgCCCuNeEB+ovRt7UxzlGAVRSxJh1Zbjp/+iQun0E32RlSR4Diz"
-        + "p5vDk8NBZpIiKRqI+8GWZc3G1igp7dvViTLw4OdWMKwhccV5+3Ll/W72aNVm"
-        + "azYUoYOVn+OYS1NJkER0tjFOCozRGm5hfkxGlP+02wbH5uu/AQoJMqWIxT6l"
-        + "46IWC24lmAnDCXuM+gWmwUvyXLwuBdejVK8iG1Lnfg1qztoLpYRbBROgRdpt"
-        + "2cbPRm+9seqrth3eJbtmxCvuh3bZ3pR2e0/r5Tob/fDcOc5Kp+j4ndXWkwpa"
-        + "OuH1yxam7zNJR+mcYp1Wiujia5qIeY1QCAEY5QgAWaSHtjlEprwUuootA2Xm"
-        + "V7D8Vsr9BValhm9zMKj6IzsPmM+HZJWlhHcoucuAmPK6Lnys3Kv/mbkSgNOq"
-        + "fJDY901veFfKeqiCbAm6hZjNWoQDNJKFhjXUALrcOv9VCFPA3bMW3Xul/sB4"
-        + "Mq595e+x/1HkNOgZorBv97C6X7ENVDaAFcyZvrRU/ZeDnvFhisfxS4EJhzxl"
-        + "cWWnQhzD+ur1FTTlkmUFzgoB/rW+i3XigiHOuRRnkcoMy1uV17rwH8eELHJu"
-        + "Yni5vu2QUaD4jNEhliE2XCsn8Sm6bcXnfzBa7FXC39QvAcdJHzqcD6iIwjIz"
-        + "hKLu+/XoWFMFFNsgV78AwzPAn6TRya8LLCYPoIZkEP4qBoeZtUZ8PIS/Y7M9"
-        + "QStMwa/NI9SPswb3iScTGvor/obUEQS4QM6mVxFMpQWfwJfyU6jingX4EHRE"
-        + "mqvZ3ehzU8ZLOdKzRKuk022YDT7hwEQ+VL0Fg0Ld9oexqT96nQpUTHZtDRMV"
-        + "iTuJoUYTneDs2c9tsY4mWBqamZQSfTegj4sLMZagkuSUp/SpPM2zSGuD3nY6"
-        + "u3553gIM9jYhvLBEXwjGudVCwMd3bqo/4EhnKb2PcwUzdaMkipQlNteHZjBT"
-        + "1ici63xjJva+di0qTV+W9cyYyHwg1927X2qcMh06BhbHlcXQKbgmbL18KJEt"
-        + "K+GGhGNkP7mtPyHHgBb6vref/z8p7oxT2CG+oBuN/z+xQoYfe9c4IC3e/kNN"
-        + "DIoyYvPyEzAdfMS2aL8qDxzc5GH9UE9kcusJ/2dNEFTzBH2GK1CItL3IACv/"
-        + "LwX1SkI0w7oIQTL127CSnuTrUUkvJ/+rOYScQTMD/ntZPdLdu2ffszg3SzhN"
-        + "ELgojK8ss1OBlruWRHw/fP736Nx8MNsuOvXMnO8lruz+uyuEhF3BLv96oTcg"
-        + "XVHdWhPmOoqNdBQdRgAAAAAAAAAAAAAAAAAAAAAAADA8MCEwCQYFKw4DAhoF"
-        + "AAQUJMZn7MEKv4vW/+voCVyHBa6B0EMEFJOzH/BEjRtNNsZWlo/4L840aE5r"
-        + "AgFkAAA=");
-    
-    public void performTest()
-        throws Exception
-    {
-        ASN1InputStream     aIn = new ASN1InputStream(new ByteArrayInputStream(pkcs12));
-        ASN1Sequence        obj = (ASN1Sequence)aIn.readObject();
-        Pfx                 bag = Pfx.getInstance(obj);
-        ContentInfo         info = bag.getAuthSafe();
-        MacData             mData = bag.getMacData();
-        DigestInfo          dInfo = mData.getMac();
-        AlgorithmIdentifier algId = dInfo.getAlgorithmId();
-        byte[]              salt = mData.getSalt();
-        int                 itCount = mData.getIterationCount().intValue();
-
-        aIn = new ASN1InputStream(new ByteArrayInputStream(((ASN1OctetString)info.getContent()).getOctets()));
-
-        AuthenticatedSafe   authSafe = AuthenticatedSafe.getInstance(aIn.readObject());
-        ContentInfo[]       c = authSafe.getContentInfo();
-
-        //
-        // private key section
-        //
-        if (!c[0].getContentType().equals(PKCSObjectIdentifiers.data))
-        {
-            fail("failed comparison data test");
-        }
-
-        aIn = new ASN1InputStream(new ByteArrayInputStream(((ASN1OctetString)c[0].getContent()).getOctets()));
-        ASN1Sequence    seq = (ASN1Sequence)aIn.readObject();
-
-        SafeBag b = SafeBag.getInstance(seq.getObjectAt(0));
-        if (!b.getBagId().equals(PKCSObjectIdentifiers.pkcs8ShroudedKeyBag))
-        {
-            fail("failed comparison shroudedKeyBag test");
-        }
-
-        EncryptedPrivateKeyInfo encInfo = EncryptedPrivateKeyInfo.getInstance(b.getBagValue());
-
-        encInfo = new EncryptedPrivateKeyInfo(encInfo.getEncryptionAlgorithm(), encInfo.getEncryptedData());
-
-        b = new SafeBag(PKCSObjectIdentifiers.pkcs8ShroudedKeyBag, encInfo.toASN1Primitive(), b.getBagAttributes());
-
-        ByteArrayOutputStream abOut = new ByteArrayOutputStream();
-        ASN1OutputStream      berOut = new ASN1OutputStream(abOut);
-
-        berOut.writeObject(new DLSequence(b));
-
-        c[0] = new ContentInfo(PKCSObjectIdentifiers.data, new BEROctetString(abOut.toByteArray()));
-
-        //
-        // certificates
-        //
-        if (!c[1].getContentType().equals(PKCSObjectIdentifiers.encryptedData))
-        {
-            fail("failed comparison encryptedData test");
-        }
-
-        EncryptedData   eData = EncryptedData.getInstance(c[1].getContent());
-
-        c[1] = new ContentInfo(PKCSObjectIdentifiers.encryptedData, eData);
-
-        //
-        // create an octet stream represent the BER encoding of authSafe
-        //
-        authSafe = new AuthenticatedSafe(c);
-
-        abOut = new ByteArrayOutputStream();
-        berOut = new ASN1OutputStream(abOut);
-
-        berOut.writeObject(authSafe);
-
-        info = new ContentInfo(PKCSObjectIdentifiers.data, new BEROctetString(abOut.toByteArray()));
-
-        mData = new MacData(new DigestInfo(algId, dInfo.getDigest()), salt, itCount);
-
-        bag = new Pfx(info, mData);
-
-        //
-        // comparison test
-        //
-
-        ByteArrayOutputStream   bOut = new ByteArrayOutputStream();
-        ASN1OutputStream        aOut = new ASN1OutputStream(bOut);
-
-        aOut.writeObject(bag);
-
-        if (!Arrays.areEqual(bOut.toByteArray(), pkcs12))
-        {
-            fail("failed comparison test");
-        }
-    }
-
-    public String getName()
-    {
-        return "PKCS12";
-    }
-
-    public static void main(
-        String[] args)
-    {
-        runTest(new PKCS12Test());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/test/PKIFailureInfoTest.java b/bcprov/src/main/java/org/bouncycastle/asn1/test/PKIFailureInfoTest.java
deleted file mode 100644
index 164f5a6..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/test/PKIFailureInfoTest.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package org.bouncycastle.asn1.test;
-
-import java.io.IOException;
-
-import org.bouncycastle.asn1.ASN1Encoding;
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.DERBitString;
-import org.bouncycastle.asn1.cmp.PKIFailureInfo;
-import org.bouncycastle.util.encoders.Base64;
-import org.bouncycastle.util.test.SimpleTest;
-
-
-/**
- * PKIFailureInfoTest
- */
-public class PKIFailureInfoTest
-    extends SimpleTest
-{
-    // A correct hex encoded BAD_DATA_FORMAT PKIFailureInfo 
-    private static final byte[] CORRECT_FAILURE_INFO = Base64.decode("AwIANQ==");
-    
-    public String getName()
-    {
-        return "PKIFailureInfo";
-    }
-    
-    private void testEncoding()
-        throws IOException
-    {
-        DERBitString bitString = (DERBitString)new ASN1InputStream(CORRECT_FAILURE_INFO).readObject();
-        PKIFailureInfo correct = new PKIFailureInfo(bitString);
-                        
-        PKIFailureInfo bug = new PKIFailureInfo(PKIFailureInfo.badRequest | PKIFailureInfo.badTime |PKIFailureInfo.badDataFormat | PKIFailureInfo.incorrectData);
-
-        if (!areEqual(correct.getEncoded(ASN1Encoding.DER),bug.getEncoded(ASN1Encoding.DER)))
-        {
-            fail("encoding doesn't match");
-        }
-    }
-    
-    public void performTest()
-        throws IOException
-    {
-        BitStringConstantTester.testFlagValueCorrect(0, PKIFailureInfo.badAlg);
-        BitStringConstantTester.testFlagValueCorrect(1, PKIFailureInfo.badMessageCheck);
-        BitStringConstantTester.testFlagValueCorrect(2, PKIFailureInfo.badRequest);
-        BitStringConstantTester.testFlagValueCorrect(3, PKIFailureInfo.badTime);
-        BitStringConstantTester.testFlagValueCorrect(4, PKIFailureInfo.badCertId);
-        BitStringConstantTester.testFlagValueCorrect(5, PKIFailureInfo.badDataFormat);
-        BitStringConstantTester.testFlagValueCorrect(6, PKIFailureInfo.wrongAuthority);
-        BitStringConstantTester.testFlagValueCorrect(7, PKIFailureInfo.incorrectData);
-        BitStringConstantTester.testFlagValueCorrect(8, PKIFailureInfo.missingTimeStamp);
-        BitStringConstantTester.testFlagValueCorrect(9, PKIFailureInfo.badPOP);
-        BitStringConstantTester.testFlagValueCorrect(14, PKIFailureInfo.timeNotAvailable);
-        BitStringConstantTester.testFlagValueCorrect(15, PKIFailureInfo.unacceptedPolicy);
-        BitStringConstantTester.testFlagValueCorrect(16, PKIFailureInfo.unacceptedExtension);
-        BitStringConstantTester.testFlagValueCorrect(17, PKIFailureInfo.addInfoNotAvailable);
-        BitStringConstantTester.testFlagValueCorrect(25, PKIFailureInfo.systemFailure);
-
-        testEncoding();
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        runTest(new PKIFailureInfoTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/test/ParseTest.java b/bcprov/src/main/java/org/bouncycastle/asn1/test/ParseTest.java
deleted file mode 100644
index 2e5112a..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/test/ParseTest.java
+++ /dev/null
@@ -1,308 +0,0 @@
-package org.bouncycastle.asn1.test;
-
-import java.io.IOException;
-
-import junit.framework.TestCase;
-import org.bouncycastle.asn1.ASN1OctetStringParser;
-import org.bouncycastle.asn1.ASN1SequenceParser;
-import org.bouncycastle.asn1.ASN1StreamParser;
-import org.bouncycastle.asn1.ASN1TaggedObjectParser;
-import org.bouncycastle.asn1.BERTags;
-import org.bouncycastle.asn1.cms.ContentInfoParser;
-import org.bouncycastle.asn1.cms.EncryptedContentInfoParser;
-import org.bouncycastle.asn1.cms.EnvelopedDataParser;
-import org.bouncycastle.util.encoders.Base64;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.io.Streams;
-
-public class ParseTest
-    extends TestCase
-{
-    private static byte[] classCastTest = Base64.decode(
-      "MIIXqAYJKoZIhvcNAQcDoIIXmTCCF5UCAQAxggG1MIIBsQIBADCBmDCBkDEL"
-    + "MAkGA1UEBhMCVVMxETAPBgNVBAgTCE1pY2hpZ2FuMQ0wCwYDVQQHEwRUcm95"
-    + "MQwwCgYDVQQKEwNFRFMxGTAXBgNVBAsTEEVMSVQgRW5naW5lZXJpbmcxJDAi"
-    + "BgkqhkiG9w0BCQEWFUVsaXQuU2VydmljZXNAZWRzLmNvbTEQMA4GA1UEAxMH"
-    + "RURTRUxJVAIDD6FBMA0GCSqGSIb3DQEBAQUABIIBAGh04C2SyEnH9J2Va18w"
-    + "3vdp5L7immD5h5CDZFgdgHln5QBzT7hodXMVHmyGnycsWnAjYqpsil96H3xQ"
-    + "A6+9a7yB6TYSLTNv8zhL2qU3IrfdmUJyxxfsFJlWFO1MlRmu9xEAW5CeauXs"
-    + "RurQCT+C5tLc5uytbvw0Jqbz+Qp1+eaRbfvyhWFGkO/BYZ89hVL9Yl1sg/Ls"
-    + "mA5jwTj2AvHkAwis+F33ZhYlto2QDvbPsUa0cldnX8+1Pz4QzKMHmfUbFD2D"
-    + "ngaYN1tDlmezCsYFQmNx1th1SaQtTefvPr+qaqRsm8KEXlWbJQXmIfdyi0zY"
-    + "qiwztEtO81hXZYkKqc5fKMMwghXVBgkqhkiG9w0BBwEwFAYIKoZIhvcNAwcE"
-    + "CEq3cLLWVds9gIIVsAAik3al6Nn5pr7r0mSy9Ki3vEeCBcV9EzEG44BvNHNA"
-    + "WyEsqQsdSxuF7h1/DJAMuZFwCbGflaRGx/1L94zrmtpeuH501lzPMvvZCmpj"
-    + "KrOF8e1B4MVQ5TfQTdUVyRnbcDa6E4V1ZZIdAI7BgDeJttS4+L6btquXfxUg"
-    + "ttPYQkevF7MdShYNnfLkY4vUMDOp3+iVzrOlq0elM95dfSA7OdBavgDJbz/7"
-    + "mro3AFTytnWjGz8TUos+oUujTk9/kHOn4cEAIm0hHrNhPS5qoj3QnNduNrad"
-    + "rLpGtcYyNlHIsYCsvPMxwoHmIw+r9xQQRjjzmVYzidn+cNOt0FmLs6YE8ds4"
-    + "wvHRO9S69TgKPHRgk2bihgHqII9lF9qIzfG40YwJLHzGoEwVO1O0+wn8j2EP"
-    + "O9I/Q3vreCH+5VbpUD2NGTwsMwZ3YlUesurLwse/YICxmgdN5Ro4DeQJSa9M"
-    + "iJnRFYWRq+58cKgr+L11mNc9nApZBShlpPP7pdNqWOafStIEjo+dsY/J+iyS"
-    + "6WLlUvNt/12qF4NAgZMb3FvRQ9PrMe87lqSRnHcpLWHcFjuKbMKCBvcdWGWI"
-    + "R7JR8UNzUvoLGGAUI9Ck+yTq4QtfgtL5MLmdBGxSKzgs44Mmek+LnrFx+e9n"
-    + "pkrdDf2gM/m7E50FnLYqzUjctKYGLNYpXQorq9MJx6TB20CHXcqOOoQqesXa"
-    + "9jL9PIOtBQy1Ow5Bh4SP07nTFWFSMI/Wt4ZvNvWJj3ecA9KjMOA9EXWUDS/H"
-    + "k9iCb2EEMo7fe5mhoyxMxPO+EIa1sEC9A1+rDACKPQCHOLI0uPmsdo0AEECC"
-    + "QLgOQkcwQlkHexOyHiOOtBxehtGZ1eBQQZ+31DF+RRU6WvS6grg58eS4gGOQ"
-    + "bd7CS9yYebvAQkz61J8KprWdtZuG1gBGma12wKMuQuC6RuWlKsj+rPMvaQCt"
-    + "8mucGbkElPGZVhdyD8/BvpSCNbgRwb6iSiw4EECovu4P4GFJaMGUYEuCA711"
-    + "itEieYc1QqS6ULjb3LFL/RcwSw0fGdjnt6B2nHckC2VsYKU1NwU7j0R1Omb4"
-    + "y5AvSgpuWjTXWnHnE9Ey0B+KP5ERZA+jJGiwYz48ynYlvQFSbBm4I6nh/DuI"
-    + "dWB2dLNxWuhdfzafBGtEHhLHzjW3WQwwRZsKesgHLrrj9hBUObodl1uvqvZN"
-    + "AjMOj8DrqbGOhAClj1t4S1Zk1ZekuMjsuoxEL+/lgtbT+056ES0k3A/LnpRb"
-    + "uxA1ZBr26Im+GVFzEcsV0hB4vNujSwStTTZH5jX5rMyi085yJfnikcLYUn9N"
-    + "apl+srhpIZlDJPw7IHaw8tsqXKDxF7MozIXo8B45CKv5Am+BMrIemCMX/ehu"
-    + "PODICl98Ur8tNAn1L+m0nj7H3c8HW2vNuBLEI3SEHHgm2Ij3IY5pyyeVUaWC"
-    + "pumhy8Ru5dj3fZcfKgYuJBQxWMf+UqPsf4iUK3923pouJ1cQ8XU8gOXIRrtX"
-    + "e41d/yR+UAZXSig6SITLw+wLtvitSvtxvjcUSUOI9CYTovKyuz1PQKiaLsV5"
-    + "4CoJhMQ5uRlVFS3H829I2d2gLRpSp6pNWeIZO2NMBxPYf2qcSHyHqQjR7xP2"
-    + "ZTg7U3OO6dZHORfXxzAnW2ExavBIYQmZh1gLn5jSS4wXFPXyvnJAsF4s5wed"
-    + "YHsyAqM/ek0n2Oo/zAh7UcP2vcb9FOoeRK8qC9HjTciS6WbjskRN0ft4T69G"
-    + "+1RsH8/edBxo2LZeA48BSCXDXOlBZJBsOptzYJD8HSZONPnef0jn23lk0fkU"
-    + "C3BjJu2ubFChctRvJniTko4klpidkHwuJgrTnL4er8rG3RfiiEHn/d5era15"
-    + "E1cekdVYWqwQOObOd4v+0gZSJgI48TBc5Qdy8F6wIU38DR2pn/5uNthNDgXk"
-    + "NcV9a2gOE3DoLe8CEIPMihqYMPY8NuSp97eHB2YhKpjP7qX9TUMoOdE2Iat2"
-    + "klNxadJt6JTFeiBPL6R9RHAD5sVBrkrl0S+oYtgF92f9WHVwAXU7zP6IgM4x"
-    + "hhzeJT07yyIp44mKd//F+7ntbgQjZ/iLbHh0mtOlUmzkFsDR0UNSXEQoourZ"
-    + "EY4A62HXj0DMqEQbik6QwEF7FKuwZX2opdOyVKH9MzJxNfDLd5dc8wAc8bCX"
-    + "jcCx5/GzHx2S5DndWQEVhp2hOQYuoJS3r6QCYFaHtDPKnFHS2PBFyFWL+2UK"
-    + "c0WsvVaHYqYKnksmxse9I9oU75kx5O05DZCThPX6h8J8MHRuxU9tcuuleIUQ"
-    + "XY8On+JeEtLSUZgp+Z7ITLuagf6yuKQpaR396MlDii/449/dvBiXAXeduyO1"
-    + "QzSkQCh37fdasqGL3mP0ssMcxM/qpOwQsx3gMtwiHQRi1oQE1QHb8qZHDE4m"
-    + "I5afQJ9O/H/m/EVlGUSn2yYOsPlZrWuI3BBZKoRzRq1lZOQDtOh18BE3tWmX"
-    + "viGIAxajam0i2Ce3h2U7vNwtiePRNEgPmQ7RwTTv0U6X8qqkjeYskiF4Cv9G"
-    + "nrB0WreC19ih5psEWLIkCYKTr+OhQuRrtv7RcyUi9QSneh7BjcvRjlGB6joA"
-    + "F6J4Y6ENAA/nzOZJ699VkljTi59bbNJYlONpQhOeRTu8M/wExkIJz7yR9DTY"
-    + "bY4/JdbdHNFf5DSDmYAHaFLmdnnfuRy+tC9CGGJvlcLVv5LMFJQGt2Wi15p8"
-    + "lctx7sL6yNCi7OakWbEOCvGPOxY7ejnvOjVK/Krx1T+dAXNUqrsDZmvmakOP"
-    + "We+P4Di1GqcyLVOTP8wNCkuAUoN0JFoBHy336/Xnae91KlY4DciPMpEOIpPN"
-    + "oB+3h6CozV7IWX5Wh3rhfC25nyGJshIBUS6cMXAsswQI8rOylMlGaekNcSU4"
-    + "gNKNDZAK5jNkS0Z/ziIrElSvMNTfYbnx3gCkY0pV18uadmchXihVT11Bt77O"
-    + "8KCKHycR39WYFIRO09wvGv6P42CRBFTdQbWFtkSwRiH8l6x39Z7pIkDFxokT"
-    + "Dp6Htkj3ywfQXNbFgRXZUXqgD1gZVFDFx920hcJnuu65CKz6pEL6X0XUwNPg"
-    + "vtraA2nj4wjVB/y+Cxc+1FgzeELB4CAmWO1OfRVLjYe7WEe/X5DPT6p8HBkB"
-    + "5mWuv+iQ3e37e1Lrsjt2frRYQWoOSP5Lv7c8tZiNfuIp07IYnJKBWZLTqNf9"
-    + "60uiY93ssE0gr3mfYOj+fSbbjy6NgAenT7NRZmFCjFwAfmapIV0hJoqnquaN"
-    + "jj5KKOP72hp+Zr9l8cEcvIhG/BbkY3kYbx3JJ9lnujBVr69PphHQTdw67CNB"
-    + "mDkH7y3bvZ+YaDY0vdKOJif9YwW2qoALXKgVBu1T2BONbCTIUTOzrKhWEvW8"
-    + "D6x03JsWrMMqOKeoyomf1iMt4dIOjp7yGl/lQ3iserzzLsAzR699W2+PWrAT"
-    + "5vLgklJPX/Fb3Tojbsc074lBq669WZe3xzlj85hFcBmoLPPyBE91BLhEwlGC"
-    + "+lWmwFOENLFGZE0mGoRN+KYxwqfA2N6H8TWoz6m0oPUW4uQvy9sGtYTSyQO9"
-    + "6ZwVNT3ndlFrP5p2atdEFVc5aO5FsK8/Fenwez06B2wv9cE9QTVpFrnJkKtF"
-    + "SaPCZkignj64XN7cHbk7Ys6nC3WIrTCcj1UOyp5ihuMS9eL9vosYADsmrR6M"
-    + "uqqeqHsf2+6U1sO1JBkDYtLzoaILTJoqg9/eH7cTA0T0mEfxVos9kAzk5nVN"
-    + "nVOKFrCGVIbOStpYlWP6wyykIKVkssfO6D42D5Im0zmgUwgNEkB+Vxvs8bEs"
-    + "l1wPuB2YPRDCEvwM3A5d5vTKhPtKMECIcDxpdwkD5RmLt+iaYN6oSFzyeeU0"
-    + "YvXBQzq8gfpqJu/lP8cFsjEJ0qCKdDHVTAAeWE6s5XpIzXt5cEWa5JK7Us+I"
-    + "VbSmri4z0sVwSpuopXmhLqLlNWLGXRDyTjZSGGJbguczXCq5XJ2E3E4WGYd6"
-    + "mUWhnP5H7gfW7ILOUN8HLbwOWon8A6xZlMQssL/1PaP3nL8ukvOqzbIBCZQY"
-    + "nrIYGowGKDU83zhO6IOgO8RIVQBJsdjXbN0FyV/sFCs5Sf5WyPlXw/dUAXIA"
-    + "cQiVKM3GiVeAg/q8f5nfrr8+OD4TGMVtUVYujfJocDEtdjxBuyFz3aUaKj0F"
-    + "r9DM3ozAxgWcEvl2CUqJLPHH+AWn5kM7bDyQ2sTIUf5M6hdeick09hwrmXRF"
-    + "NdIoUpn7rZORh0h2VX3XytLj2ERmvv/jPVC97VKU916n1QeMJLprjIsp7GsH"
-    + "KieC1RCKEfg4i9uHoIyHo/VgnKrnTOGX/ksj2ArMhviUJ0yjDDx5jo/k5wLn"
-    + "Rew2+bhiQdghRSriUMkubFh7TN901yl1kF2BBP5PHbpgfTP6R7qfl8ZEwzzO"
-    + "elHe7t7SvI7ff5LkwDvUXSEIrHPGajYvBNZsgro+4Sx5rmaE0QSXACG228OQ"
-    + "Qaju8qWqA2UaPhcHSPHO/u7ad/r8kHceu0dYnSFNe1p5v9Tjux0Yn6y1c+xf"
-    + "V1cu3plCwzW3Byw14PH9ATmi8KJpZQaJOqTxn+zD9TvOa93blK/9b5KDY1QM"
-    + "1s70+VOq0lEMI6Ch3QhFbXaslpgMUJLgvEa5fz3GhmD6+BRHkqjjwlLdwmyR"
-    + "qbr4v6o+vnJKucoUmzvDT8ZH9nH2WCtiiEtQaLNU2vsJ4kZvEy0CEajOrqUF"
-    + "d8qgEAHgh9it5oiyGBB2X/52notXWOi6OMKgWlxxKHPTJDvEVcQ4zZUverII"
-    + "4vYrveRXdiDodggfrafziDrA/0eEKWpcZj7fDBYjUBazwjrsn5VIWfwP2AUE"
-    + "wNn+xR81/so8Nl7EDBeoRXttyH7stbZYdRnkPK025CQug9RLzfhEAgjdgQYw"
-    + "uG+z0IuyctJW1Q1E8YSOpWEFcOK5okQkLFUfB63sO1M2LS0dDHzmdZriCfIE"
-    + "F+9aPMzojaHg3OQmZD7MiIjioV6w43bzVmtMRG22weZIYH/Sh3lDRZn13AS9"
-    + "YV6L7hbFtKKYrie79SldtYazYT8FTSNml/+Qv2TvYTjVwYwHpm7t479u+MLh"
-    + "LxMRVsVeJeSxjgufHmiLk7yYJajNyS2j9Kx/fmXmJbWZNcerrfLP+q+b594Y"
-    + "1TGWr8E6ZTh9I1gU2JR7WYl/hB2/eT6sgSYHTPyGSxTEvEHP242lmjkiHY94"
-    + "CfiTMDu281gIsnAskl05aeCBkj2M5S0BWCxy7bpVAVFf5nhf74EFIBOtHaJl"
-    + "/8psz1kGVF3TzgYHkZXpUjVX/mJX8FG0R8HN7g/xK73HSvqeamr4qVz3Kmm/"
-    + "kMtYRbZre7E1D10qh/ksNYnOkYBcG4P2JyjZ5q+8CQNungz2/b0Glg5LztNz"
-    + "hUgG27xDOUraJXjkkZl/GOh0eTqhfLHXC/TfyoEAQOPcA59MKqvroFC5Js0Q"
-    + "sTgqm2lWzaLNz+PEXpJHuSifHFXaYIkLUJs+8X5711+0M03y8iP4jZeEOrjI"
-    + "l9t3ZYbazwsI3hBIke2hGprw4m3ZmSvQ22g+N6+hnitnDALMsZThesjb6aJd"
-    + "XOwhjLkWRD4nQN594o6ZRrfv4bFEPTp4ev8l6diouKlXSFFnVqz7AZw3Pe53"
-    + "BvIsoh66zHBpZhauPV/s/uLb5x6Z8sU2OK6AoJ7b8R9V/AT7zvonBi/XQNw3"
-    + "nwkwGnTS9Mh7PFnGHLJWTKKlYXrSpNviR1vPxqHMO6b+Lki10d/YMY0vHQrY"
-    + "P6oSVkA6RIKsepHWo11+rV838+2NRrdedCe91foUmOs+eoWQnwmTy2CTZmQ5"
-    + "b7/TTcau9ewimZAqI+MtDWcmWoZfgibZmnIITGcduNOJDRn+aLt9dz+zr1qA"
-    + "HxlLXCOyBPdtfx6eo4Jon+fVte37i3HmxHk+8ZGMMSS9hJbLQEkA59b4E+7L"
-    + "GI3JZjvEkhizB4n/aFeG7KT7K3x072DMbHLZ7VgsXQ1VDDmcZmizFwgyNqKy"
-    + "hKCKxU+I2O10IMtiZUpEzV1Pw7hD5Kv/eFCsJFPXOJ2j3KP6qPtX5IYki1qH"
-    + "Juo5C5uGKtqNc6OzkXsvNUfBz5sJkEYl0WfitSSo4ARyshFUNh2hGxNxUVKM"
-    + "2opOcuHSxBgwUSmVprym50C305zdHulBXv3mLzGjvRstE9qfkQ8qVJYLQEkL"
-    + "1Yn7E92ex71YsC8JhNNMy0/YZwMkiFrqyaFd/LrblWpBbGumhe4reCJ4K3mk"
-    + "lFGEsICcMoe+zU1+QuLlz/bQ+UtvClHUe8hTyIjfY04Fwo2vbdSc1U/SHho5"
-    + "thQy+lOZ/HijzCmfWK3aTqYMdwCUTCsoxri2N8vyD/K2kbMLQWUfUlBQfDOK"
-    + "VrksBoSfcluNVaO56uEUw3enPhhJghfNlJnpr5gUcrAMES53DfkjNr0dCsfM"
-    + "JOY2ZfQEwwYey1c4W1MNNMoegSTg4aXzjVc0xDgKa7RGbtRmVNbOxIhUNAVi"
-    + "thQV3Qujoz1ehDt2GyLpjGjHSpQo3WlIU4OUqJaQfF6EH+3khFqUmp1LT7Iq"
-    + "zH3ydYsoCDjvdXSSEY3hLcZVijUJqoaNWBLb/LF8OG5qTjsM2gLgy2vgO/lM"
-    + "NsqkHnWTtDimoaRRjZBlYLhdzf6QlfLi7RPmmRriiAOM0nXmylF5xBPHQLoz"
-    + "LO9lXYIfNbVJVqQsV43z52MvEQCqPNpGqjB+Au/PZalYHbosiVOQLgTB9hTI"
-    + "sGutSXXeLnf5rftCFvWyL3n5DgURzDFLibrbyVGGKAk166bK1RyVP9XZJonr"
-    + "hPYELk4KawCysJJSmC0E8sSsuXpfd6PPDru6nCV1EdXKR7DybS7NVHCktiPR"
-    + "4B4y8O/AgfJX8sb6LuxmjaINtUKEJ1+O88Gb69uy6b/Kpu2ri/SUBaNNw4Sn"
-    + "/tuaD+jxroL7RlZmt9ME/saNKn9OmLuggd6IUKAL4Ifsx9i7+JKcYuP8Cjdf"
-    + "Rx6U6H4qkEwwYGXnZYqF3jxplyOfqA2Vpvp4rnf8mST6dRLKk49IhKGTzwZr"
-    + "4za/RZhyl6lyoRAFDrVs1b+tj6RYZk0QnK3dLiN1MFYojLyz5Uvi5KlSyFw9"
-    + "trsvXyfyWdyRmJqo1fT7OUe0ImJW2RN3v/qs1k+EXizgb7DW4Rc2goDsCGrZ"
-    + "ZdMwuAdpRnyg9WNtmWwp4XXeb66u3hJHr4RwMd5oyKFB1GsmzZF7aOhSIb2B"
-    + "t3coNXo/Y+WpEj9fD7/snq7I1lS2+3Jrnna1048O7N4b5S4b5TtEcCBILP1C"
-    + "SRvaHyZhBtJpoH6UyimKfabXi08ksrcHmbs1+HRvn+3pl0bHcdeBIQS/wjk1"
-    + "TVEDtaP+K9zkJxaExtoa45QvqowxtcKtMftNoznF45LvwriXEDV9jCXvKMcO"
-    + "nxG5aQ//fbnn4j4q1wsKXxn61wuLUW5Nrg9fIhX7nTNAAooETO7bMUeOWjig"
-    + "2S1nscmtwaV+Sumyz/XUhvWynwE0AXveLrA8Gxfx");
-    
-    private static byte[] derExpTest = Base64.decode(
-      "MIIS6AYJKoZIhvcNAQcDoIIS2TCCEtUCAQAxggG1MIIBsQIBADCBmDCBkDEL"
-    + "MAkGA1UEBhMCVVMxETAPBgNVBAgTCE1pY2hpZ2FuMQ0wCwYDVQQHEwRUcm95"
-    + "MQwwCgYDVQQKEwNFRFMxGTAXBgNVBAsTEEVMSVQgRW5naW5lZXJpbmcxJDAi"
-    + "BgkqhkiG9w0BCQEWFUVsaXQuU2VydmljZXNAZWRzLmNvbTEQMA4GA1UEAxMH"
-    + "RURTRUxJVAIDD6FBMA0GCSqGSIb3DQEBAQUABIIBAGsRYK/jP1YujirddAMl"
-    + "ATysfLCwd0eZhENohVqLiMleH25Dnwf+tBaH4a9hyW+7VrWw/LC6ILPVbKpo"
-    + "oLBAOical40cw6C3zulajc4gM3AlE2KEeAWtI+bgPMXhumqiWDb4byX/APYk"
-    + "53Gk7WXF6Xs4hj3tmrHSJxCUOsTdHKUJYvOqjwKGARPQDjP0EUbVJezeAwBA"
-    + "RMlJ/qBVLBj2UW28n5oJZm3oaSaU93Uc6GPVIk43IWrmEUcWVPiMfUtUCwcX"
-    + "tRNtHuQ9os++rmdNBiuB5p+vtUeA45KWnTUtkwJXvrzE6Sf9AUH/p8uOvvZJ"
-    + "3yt9LhPxcZukGIVvcQnBxLswghEVBgkqhkiG9w0BBwEwFAYIKoZIhvcNAwcE"
-    + "CGObmTycubs2gIIQ8AKUC8ciGPxa3sFJ1EPeX/nRwYGNAarlpVnG+07NITL2"
-    + "pUzqZSgsYh5JiKd8TptQBZNdebzNmCvjrVv5s9PaescGcypL7FNVPEubh0w/"
-    + "8h9rTACqUpF5yRgfcgpAGeK29F1hyZ1WaIH43avUCaDnrZcOKB7wc1ats1aQ"
-    + "TSDLImyFn4KjSo5k0Ec/xSoWnfg391vebp8eOsyHZhFMffFtKQMaayZNHJ7Q"
-    + "BzG3r/ysUbkgI5x+0bX0QfZjEIs7yuV5Wt8DxMTueCm3RQ+HkR4lNdTBkM4V"
-    + "qozCqC1SjcAF5YHB0WFkGouEPGgTlmyvLqR2xerEXVZn9YwSnT48kOde3oGt"
-    + "EAYyg0yHbNbL0sp6LDM7upRmrgWwxf0BR6lP4wyWdv/XSLatEB7twSNiPBJ4"
-    + "PJ+QagK08yQJ84UB7YpMTudKsaUs7zW76eA7KkW3TndfDYGdhbmZ5wxNl+5x"
-    + "yPZc/jcQHW7vplMfWglUVxnzibNW12th0QXSB57Mzk8v1Rvc/HLGvAOJZG/S"
-    + "N12FZOxbUrMIHGi3kXsmfWznVyq92X4P9tuDDD7sxkSGsyUAm/UJIZ3KsXhV"
-    + "QeaRHVTVDxtJtnbYxBupy1FDBO6AhVrp16Blvnip9cPn/aLfxDoFHzmsZmEg"
-    + "IcOFqpT1fW+KN6i/JxLD3mn3gKzzdL1/8F36A2GxhCbefQFp0MfIovlnMLFv"
-    + "mrINwMP8a9VnP8gIV5oW5CxmmMUPHuGkXrfg+69iVACaC2sTq6KGebhtg9OC"
-    + "8vZhmu7+Eescst694pYa3b8Sbr5bTFXV68mMMjuRnhvF2NZgF+O0jzU+sFps"
-    + "o7s1rUloCBk1clJUJ/r+j9vbhVahCeJQw62JAqjZu4R1JYAzON3S7jWU5zJ7"
-    + "pWYPSAQkLYUz3FmRRS2Yv65mXDNHqR9vqkHTIphwA9CLMKC2rIONxSVB57q1"
-    + "Npa/TFkVdXnw+cmYjyFWiWeDP7Mw0Kwy7tO008UrBY0rKQU466RI5ezDqYPc"
-    + "Lm73dUH2EjUYmKUi8zCtXpzgfTYVa/DmkbVUL9ThHMVRq1OpT2nctE7kpXZk"
-    + "OsZjEZHZX4MCrSOlc10ZW7MJIRreWMs70n7JX7MISU+8fK6JKOuaQNG8XcQp"
-    + "5IrCTIH8vmN2rVt4UT8zgm640FtO3jWUxScvxCtUJJ49hGCwK+HwDDpO6fLw"
-    + "LFuybey+6hnAbtaDyqgsgDh2KN8GSkQT9wixqwQPWsMQ4h0xQixf4IMdFOjP"
-    + "ciwp3ul8KAp/q70i0xldWGqcDjUasx6WHKc++rFjVJjoVvijKgEhlod5wJIw"
-    + "BqQVMKRsXle07NS1MOB+CRTVW6mwBEhDDERL+ym2GT2Q4uSDzoolmLq2y5vL"
-    + "+RfDHuh3W0UeC3Q5D2bJclgMsVjgfQUN19iD+lPFp2xvLTaNWi5fYDn4uuJL"
-    + "lgVDXIMmM8I+Z2hlTXTM1Pldz2/UFe3QXTbYnjP6kfd7Bo2Webhhgs/YmSR2"
-    + "XPuA42tWNAAjlK77lETWodxi3UC7XELjZ9xoGPRbxjOklXXvev9v5Vo+vcmN"
-    + "0KrLXhLdkyHRSm81SRsWoadCTSyT8ibv66P00GOt+OlIUOt0YKSUkULQfPvC"
-    + "EgMpeTm1/9l8n9bJ6td5fpJFDqLDm+FpJX6T2sWevV/Tyt6aoDPuET5iHBHW"
-    + "PoHxKl8YPRHBf+nRWoh45QMGQWNSrJRDlO8oYOhdznh4wxLn3DXEfDr0Z7Kd"
-    + "gEg6xr1XCobBn6Gi7wWXp5FDTaRF41t7fH8VxPwwDa8Yfu3vsgB6q426kjAj"
-    + "Q77wx1QFIg8gOYopTOgqze1i4h1U8ehP9btznDD6OR8+hPsVKoXYGp8Ukkc7"
-    + "JBA0o8l9O2DSGh0StsD94UhdYzn+ri7ozkXFy2SHFT2/saC34NHLoIF0v/aw"
-    + "L9G506Dtz6xXOACZ4brCG+NNnPLIcGblXIrYTy4+sm0KSdsl6BGzYh9uc8tu"
-    + "tfCh+iDuhT0n+nfnvdCmPwonONFb53Is1+dz5sisILfjB7OPRW4ngyfjgfHm"
-    + "oxxHDC/N01uoJIdmQRIisLi2nLhG+si8+Puz0SyPaB820VuV2mp77Y2osTAB"
-    + "0hTDv/sU0DQjqcuepYPUMvMs3SlkEmaEzNSiu7xOOBQYB8FoK4PeOXDIW6n2"
-    + "0hv6iS17hcZ+8GdhwC4x2Swkxt99ikRM0AxWrh1lCk5BagVN5xG79c/ZQ1M7"
-    + "a0k3WTzYF1Y4d6QPNOYeOBP9+G7/a2o3hGXDRRXnFpO7gQtlXy9A15RfvsWH"
-    + "O+UuFsOTtuiiZk1qRgWW5nkSCPCl2rP1Z7bwr3VD7o6VYhNCSdjuFfxwgNbW"
-    + "x8t35dBn6xLkc6QcBs2SZaRxvPTSAfjON++Ke0iK5w3mec0Br4QSNB1B0Aza"
-    + "w3t3AleqPyJC6IP1OQl5bi+PA+h3YZthwQmcwgXgW9bWxNDqUjUPZfsnNNDX"
-    + "MU9ANDLjITxvwr3F3ZSfJyeeDdbhr3EJUTtnzzWC6157EL9dt0jdPO35V0w4"
-    + "iUyZIW1FcYlCJp6t6Sy9n3TmxeLbq2xML4hncJBClaDMOp2QfabJ0XEYrD8F"
-    + "jq+aDM0NEUHng+Gt9WNqnjc8GzNlhxTNm3eQ6gyM/9Ip154GhH6c9hsmkMy5"
-    + "DlMjGFpFnsSTNFka2+DOzumWUiXLGbe4M3RePl1N4MLwXrkR2llguQynyoqF"
-    + "Ptat2Ky5yW2q9+IQHY49NJTlsCpunE5HFkAK9rY/4lM4/Q7hVunP6U4a0Kbu"
-    + "beFuOQMKQlBZvcplnYBefXD79uarY/q7ui6nFHlqND5mlXMknMrsQk3papfp"
-    + "OpMS4T07rCTLek0ODtb5KsHdIF76NZXevko4+d/xbv7HLCUYd8xuOuqf+y4I"
-    + "VJiT1FmYtZd9w+ubfHrOfHxY+SBtN6fs02WAccZqBXUYzZEijRbN2YUv1OnG"
-    + "rfYe4EcfOu/Sa+wLbB7msYpLfvUfEO3iseKf4LXZkgtF5P610PBZR8edeSgr"
-    + "YZW+J0K78PRAl5nEi1mvzBxi9DyNf6iQ9mWLyyCmr9p9HGE+aCMKVCn9jfZH"
-    + "WeBDAJNYDcUh5NEckqJtbEc2S1FJM7yZBWLQUt3NCQvj+nvQT45osZ3BJvFg"
-    + "IcGJ0CysoblVz4fCLybrYxby9HP89WMLHqdqsIeVX8IJ3x84SqLPuzrqf9FT"
-    + "ZVYLo0F2oBjAzjT7obt9+NJc/psOMCg+OGQkAfwj3VNvaqkkQsVxSiozgxrC"
-    + "7KaTXuAL6eKKspman96kz4QVk9P0usUPii+LFnW4XYc0RNfgJVO6BgJT7pLX"
-    + "NWwv/izMIMNAqSiWfzHHRVkhq4f1TMSF91auXOSICpJb3QQ4XFh52Mgl8+zs"
-    + "fobsb0geyb49WqFrZhUu+X+8LfQztppGmiUpFL+8EW0aPHbfaf4y9J1/Wthy"
-    + "c28Yqu62j/ljXq4Qa21uaEkoxzH1wPKCoKM9TXJtZJ39Yl9cf119Qy4M6QsB"
-    + "6oMXExlMjqIMCCWaLXLRiqbc2Y7rZHgEr08msibdoYHbSkEl8U+Kii2p6Vdx"
-    + "zyiEIz4CadrFbrAzxmrR/+3u8JuBdq0K3KNR0WWx73BU+G0rgBX56GnP7Ixy"
-    + "fuvkRb4YfJUF4PkDa50BGVhybPrIhoFteT6bSh6LQtBm9c4Kop8Svx3ZbqOT"
-    + "kgQDa0n+O0iR7x3fvNZ0Wz4YJrKGnVOPCqJSlSsnX6v2JScmaNdrSwkMTnUf"
-    + "F9450Hasd88+skC4jVAv3WAB03Gz1MtiGDhdUKFnHnU9HeHUnh38peCFEfnK"
-    + "WihakVQNfc72YoFVZHeJI5fJAW8P7xGTZ95ysyirtirxt2zkRVJa5p7semOw"
-    + "bL/lBC1bp4J6xHF/NHY8NQjvuhqkDyNlh3dRpIBVBu6Z04hRhLFW6IBxcCCv"
-    + "pjfoxJoox9yxKQKpr3J6MiZKBlndZRbSogO/wYwFeh7HhUzMNM1xIy3jWVVC"
-    + "CrzWp+Q1uxnL74SwrMP/EcZh+jZO4CYWk6guUMhTo1kbW03BZfyAqbPM+X+e"
-    + "ZqMZljydH8AWgl0MZd2IAfajDxI03/6XZSgzq24n+J7wKMYWS3WzB98OIwr+"
-    + "oKoQ7aKwaaT/KtR8ggUVYsCLs4ScFY24MnjUvMm+gQcVyeX74UlqR30Aipnf"
-    + "qzDRVcAUMMNcs0fuqePcrZ/yxPo+P135YClPDo9J8bwNpioUY8g+BQxjEQTj"
-    + "py3i2rAoX+Z5fcGjnZQVPMog0niIvLPRJ1Xl7yzPW0SevhlnMo6uDYDjWgQ2"
-    + "TLeTehRCiSd3z7ZunYR3kvJIw1Kzo4YjdO3l3WNf3RQvxPmJcSKzeqKVxWxU"
-    + "QBMIC/dIzmRDcY787qjAlKDZOdDp7qBKIqnfodWolxBA0KhvE61eYabZqUCT"
-    + "G2HJaQE1SvOdL9KM4ORFlxE3/dqv8ttBJ6N1qKk423CJjajZHYTwf1dCfj8T"
-    + "VAE/A3INTc6vg02tfkig+7ebmbeXJRH93KveEo2Wi1xQDsWNA+3DVzsMyTqV"
-    + "+AgfSjjwKouXAznhpgNc5QjmD2I6RyTf+hngftve18ZmVhtlW5+K6qi62M7o"
-    + "aM83KweH1QgCS12/p2tMEAfz//pPbod2NrFDxnmozhp2ZnD04wC+6HGz6bX/"
-    + "h8x2PDaXrpuqnZREFEYzUDKQqxdglXj5oE/chBR8+eBfYSS4JW3TBkW6RfwM"
-    + "KOBBOOv8pe3Sfq/bg7OLq5bn0jKwulqP50bysZJNlQUG/KqJagKRx60fnTqB"
-    + "7gZRebvtqgn3JQU3fRCm8ikmGz9XHruoPlrUQJitWIt4AWFxjyl3oj+suLJn"
-    + "7sK62KwsqAztLV7ztoC9dxldJF34ykok1XQ2cMT+uSrD6ghYZrmrG5QDkiKW"
-    + "tOQCUvVh/CorZNlON2rt67UvueMoW+ua25K4pLKDW316c2hGZRf/jmCpRSdb"
-    + "Xr3RDaRFIK6JpmEiFMMOEnk9yf4rChnS6MHrun7vPkf82w6Q0VxoR8NRdFyW"
-    + "3mETtm2mmG5zPFMMD8uM0BYJ/mlJ2zUcD4P3hWZ8NRiU5y1kazvrC6v7NijV"
-    + "o459AKOasZUj1rDMlXDLPloTHT2ViURHh/8GKqFHi2PDhIjPYUlLR5IrPRAl"
-    + "3m6DLZ7/tvZ1hHEu9lUMMcjrt7EJ3ujS/RRkuxhrM9BFlwzpa2VK8eckuCHm"
-    + "j89UH5Nn7TvH964K67hp3TeV5DKV6WTJmtIoZKCxSi6FFzMlky73gHZM4Vur"
-    + "eccwycFHu+8o+tQqbIAVXaJvdDstHpluUCMtb2SzVmI0bxABXp5XrkOOCg8g"
-    + "EDZz1I7rKLFcyERSifhsnXaC5E99BY0DJ/7v668ZR3bE5cU7Pmo/YmJctK3n"
-    + "m8cThrYDXJNbUi0c5vrAs36ZQECn7BY/bdDDk2NPgi36UfePI8XsbezcyrUR"
-    + "ZZwT+uQ5LOB931NjD5GOMEb96cjmECONcRjB0uD7DoTiVeS3QoWmf7Yz4g0p"
-    + "v9894YWQgOl+CvmTERO4dxd7X5wJsM3Y0acGPwneDF+HtQrIpJlslm2DivEv"
-    + "sikc6DtAQrnVRSNDr67HPPeIpgzThbxH3bm5UjvnP/zcGV1W8Nzk/OBQWi0l"
-    + "fQM9DccS6P/DW3XPSD1+fDtUK5dfH8DFf8wwgnxeVwi/1hCBq9+33XPwiVpz"
-    + "489DnjGhHqq7BdHjTIqAZvNm8UPQfXRpeexbkFZx1mJvS7so54Cs58/hHgQN"
-    + "GHJh4AUCLEt0v7Hc3CMy38ovLr3Q8eZsyNGKO5GvGNa7EffGjzOKxgqtMwT2"
-    + "yv8TOTFCWnZEUTtVA9+2CpwfmuEjD2UQ4vxoM+o=");
-
-    byte[] longTagged = Hex.decode("9f1f023330");
-    
-    public void testClassCast()
-        throws IOException
-    {
-        parseEnveloped(classCastTest);
-    }
-
-    public void testDerExp()
-        throws IOException
-    {
-        parseEnveloped(derExpTest);
-    }
-    
-    public void testLongTag()
-        throws IOException
-    {
-        ASN1StreamParser aIn = new ASN1StreamParser(longTagged);
-        
-        ASN1TaggedObjectParser tagged = (ASN1TaggedObjectParser)aIn.readObject();
-        
-        assertEquals(31, tagged.getTagNo());
-    }
-    
-    private void parseEnveloped(byte[] data) throws IOException
-    {
-        ASN1StreamParser aIn = new ASN1StreamParser(data);
-        
-        ContentInfoParser cP = new ContentInfoParser((ASN1SequenceParser)aIn.readObject());
-        
-        EnvelopedDataParser eP = new EnvelopedDataParser((ASN1SequenceParser)cP.getContent(BERTags.SEQUENCE));
-        
-        eP.getRecipientInfos().toASN1Primitive(); // Must drain the parser!
-        
-        EncryptedContentInfoParser ecP = eP.getEncryptedContentInfo();
-        
-        ASN1OctetStringParser content = (ASN1OctetStringParser)ecP.getEncryptedContent(BERTags.OCTET_STRING);
-
-        Streams.drain(content.getOctetStream());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/test/ParsingTest.java b/bcprov/src/main/java/org/bouncycastle/asn1/test/ParsingTest.java
deleted file mode 100644
index c5a3353..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/test/ParsingTest.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package org.bouncycastle.asn1.test;
-
-import java.io.IOException;
-
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1StreamParser;
-import org.bouncycastle.util.encoders.Base64;
-import org.bouncycastle.util.test.SimpleTest;
-
-public class ParsingTest
-    extends SimpleTest
-{
-     String[] streams = {
-        "oRNphCO0F+jcMQKC1uMO8qFBPikDDYmtfVGeB45xvbfj1qu696YGjdW2igRnePYM/KkQtADG7gMHIhqBRcl7dBtkejNeolOklPNA3NgsACTiVN9JFUsYq0a5842+TU+U2/6Kt/D0kvz0WmwWFRPHWEWVM9PYOWabGsh28Iucc6s7eEqmr8NEzWUx/jM3dmjpFYVpSpxt2KbbT+yUO0EqFQyy8hQ7JvKRgv1AoWQfPjMsfjkKgxnA8DjenmwXaZnDaKEvQIKQl46L1Yyu3boN082SQliSJMJVgNuNNLFIt5QSUdG1ant5O6f9Yr0niAkAoqGzmqz+LZE1S7RrGHWiQ3DowE9NzviBuaAoI4WdCn1ClMwb9fdEmBMU4C7DJSgs3qaJzPUuaAT9vU3GhZqZ0wcTV5DHxSRzGLqg9JEJRi4qyeuG3Qkg3YBtathl+FiLJ7mVoO3dFIccRuuqp2MpMhfuP1DxHLNLNiUZEhLMQ0CLTGabUISBuyQudVFlKBZIpcLD0k7fKpMPuywrYiDrTinMc2ZP3fOGevoR5fnZ6kZAE5oMTtMNokzBuctGqVapblXNrVMLYbriT538oYz5",
-        "KEKVhHxtyUR9D3v5K4IJbVQLAMiVKoK9z7wFWUjzvLFNLg9C/r8zKfBa3YgZrt0Nq64+MxBePMbiNLCnfditc2qUcQZUHnvNnhwT6uGK37JmXg7MvQiKwvi31EIYt6ghqBZVs1iaqc0ep7wuQ16uwSQMlaDdXc9Qf1L0dGO/6eLyREz+p4UR4NOXK+GooQLfMxYL40zJlYcwNyR0rigvIr84WP2IMS2hZjqXtyS6HMM4yUv70hkIorjr7+JC4GtU1MyWuPuNSAGen0AZTaEEXd5sMbqXMqWg3jeM4mzRH1Kb3WdAChO5vMJZPBj9jZZKgXzmxkUh5GlIhUdYgztoNceBzQ3PIc7slCDUw9I2PjB87xsfy7jA5tFtFADs2EUyxUTMCuhilP664jSHgwbrr80k9Xc4sU+MCwCq2nQmcZYcPgKb4M31VJMlKwnZF3JUU2Jtqgg4gbErw58YoBwSkEcMJ2Juhiyx9U36MzxHs9OcTURfpsilMy+mDL8arCDx1knM1KkAHCLjWuJI+p1PvuIypgCwVc+MtGfd7wW8iR1JPJLBiuoZyNJ+xx9htd/HVB+rLtB57H8Gz8W+R00f",
-        "Ol9I/rXMwbLpxTY97v70B+HCl2+cojz2574x/cC56A7KGVF13La8RdzOOvSkl338ct9T/blEFa6QwNz3GmF+MoPdH9lncwz+tqixIqGU02Bp5swH0qjbp/Yjaeq91eR6B+9fl+KKrpglBr8S1BrI4Ey5v3AxxJdCWP8Gd+6Sp15/HMYanwlHBpCsW4+Kq8sGJoJXUXpQ/GBUJKs+WjX1zE6PsvF7/B8cByuqE3NJt7x4Oa+qZtF8qNc0CFDNj31Yhdt7JkAoD30IAd+ue9OhImQMCWwFwySRIRJXU3865K2dBR+VhLuI2aKzLh7MlgVKJk6b2P/ZIkc86ksR1sOUiHrs9EdoYuIssAgMc8QGzn4VN8lxopdzQYVG6pbXGS/VQlHkGdyLd+OHt4srz/NTUWiOquVTRxa6GgtlBFfIXikPTb+iT2pZKyKUlBvpgo0BY9vVUadsteHAI5qrFZBrL5ecK/Qtl9hf/M8qEjyjt2aCXe9B96Hg2QR5A53qW2PJW5VzS0AeB3g+zJSPCTpygrBs20q5Xrna0ux2l17r6HT9Q/AXIOkwPZUXXn0d02igS4D6Hxrg3Fhdp+OTXL8G",
-        "o3eXWpwAGmUkxHEKm/pGkDb1ZQQctCQ06lltZjeMXDp9AkowmA0KXjPQCQwyWE/nqEvk2g/58AxNU0TWSujo5uU0h4/hdMZ7Mrj33NSskWvDpKe7lE5tUjPi74Rmc5RRS+1T/EQobpNxoic3+tTO7NBbZfJtcUYeZ3jqxL+3YQL3PrGe/Zpno9TnQW8mWbbhKhDRtKY4p3Pgk9hPSpJCM9xYo3EMAOAIiH2P6RKH6uX/gSaUY2b6DE/TT0V6v/jdSmYM4+cnYiTyJCi5txI35jfCqIlVCXJd7klirvUMg9SXBhGR25AgQ5Z8yjd7lbB8FvD8JQAXZrp6xiHxbLIW7G11fWEo7RGLFtALI6H38Ud0vKjsEN7N5AibJcxS2A/CWk9R00sTHRBHFUP8o5mz8nE7FeCiwJPs/+tCt04nGb9wxBFMsmWcPEDfIzphCaO6U/D/tQHlA846gbKoikv/6LI0ussSR/i85XBclNcvzTctxylSbCR02lZ+go6fe5rmMouiel/0Tndz8t1YpQGilVeOQ3mqAFyAJk3dgfTNKZuOhNzVIZ5GWScKQ5ZtNcWrg6siR+6YwKvLiRb/TJZk",
-        "PwRUnW4yU8PI7ggbI1BIO9fcTup8optkqCirodyHCiqsPOMZ4g28bJ2+kpfQRujWGlKFYQzA1ZT32s9hdci+fvXPX0KAjcUgcxsGzMABFbEm04BwDF2WLgg9s4/x71r5JrgME1S08I3mCo4N0eFHWDeLJL1b5YNNo6tfO5V2WpIE867N9zdAgvp1gijVjUNWqEB3A/NLb3reLMu2hYgqRFTCVBfcFclD46k0XEfUJqwWdQhOz92WNl/3g53bjKX1hDZgjLIzK6m+SU6+J/h4NidrS7E0gOBevZW8gRYdKMVqNWxzUfxv6kgG+kIeF9JqMcO6jdh/Zu/0tpZoHFeCweZ1jT1eEtltFu1FcTTPc1UT0pT+ZNVgefrBONoGnvn8+dBjPese6F2TmRCExJq9taKlIh/kHdkbpaa7vwrBpYRgVGfARPyM9SSCaE7pVBDuwkFeYiGU4tamm5Gq10ojRQgetJ3UOg/PGTJcxo97GBiG5zAST9NdHdgK3eI4FAbWpGwmWxNpPWOst0a7zuGKAzYU+1IQh8XA3IgJ2vy3+w0JihU6G+12LUzsL2aQtpG7d1PqLhwOqHq3Qqv3SDsB",
-        "ZIAKizvGzbvqvqOlxOeVgHGHV9TfKNjjqyzbCj8tggv2yp7kkq1D3yRlC349tuul3zN9g4u83Ctio9Gg3HiLzMULxoOImF/hKRDhJpPLbLm0jSq1fyF+N7/YvyLeFhGoPhYEBUihDcxo1NIcWy66aBt3EuOlTyDQWrDe0Za3mrTrrl10uLHVKcQMgeD+UMgjQqmHzQJR8wdNjHPKHWVvZEdiwI031nV2giHJHXv08Jvf4vmw4dAlH2drCl6cBgg33jy7ohK8IiXz6eCw6iY9Ri8YaMzxOhgE2BOHzEz5ZC2hilL4xO/ambTER4bhb4+9VTUIehHP18FcXm8TKPQRMqyKP2fMlzWW3/uelYfPP5SHlyLAULa1KjDCkLIDunEKZDpv2ljGB6JPrTlNwFsvlZcihfOAwjbr2jW3MwP704OA8xzd/dynBU47unIZEu0LAvQ3TUz3PLga0GGO1LZGtg0Foo9zFG2wuVCdgYHmozOQ+8I3gRguW1CjGy7ZCTBuN1GZ510ERhae+bRQtldHsLeiHTghnkU1xEX1+W0iEf3csDYrgpuq3NaBYRGirovDiPBYFHmru0AMclhFnpcX",
-        "uG0wQ55kMlfZtJFAqTl0bnYW/oy9NFOi0e4FqAYwsvMxGO4JtGzXgkVwEUAC0AUDItRUjxBl+TkoPTYaprgn0M/NQvKPpXJ+yzI7Ssi+F2alLR0T6eF/4rQ32AVjnANJaghXZm0ZKduckbhSxk5lilJVJRuzXKchZRtlPluvlj448bq+iThktsEQoNP8NMpi7n/EVxovp+dow4Q6t7msSRP4cGXtyYoWKbf/7e5XzBKOZZ1/f3s86uJke4dcKIaljpJfBrtuFxZC6NYXzX6PkoDoBgqQ8RBrxsX54S9cBDAPxxmkq8zviAOW3oqPMULGGmQzHBiRwE8oeDFoMnzF5aR/lkbNuTLOxhbIkosgLWlDNVEFYx9bVhdLzO7VwaAK829dimlPOo5loKB7Pd2G7ekRKXwu7wNvJBq8KRkhtLKbKoS8D6TaRWUMb9VBJ1CMy4mrw+YwTmAKURQ6Dko9J/RgzRg5Y/sUlwdMYS9HOnvKiTVu5I/ha35wwkhIPVm+FCn05tstntZaXXXu4xExHeugAKNBhkcc/SQt+GFdxXDd+R4C2LfKxGDSyZKVTFYojHTdZUo8Gx6SZLY6b2SZ",
-        "sH0kIwIq1THAfTLfqUKJfG1YauCQKPc9/mk3l39yK6zgxSpCH2IjZIwhhJtGm3F+8PTneT725OuyR617nxqrgqMGkkZkyY4DA5CjsikpBo5mo8TspX1g+vtXXtxymJMTMo8JwX3nSH4gSb3vPia+gwOW2TcJmxVdp3ITPA4gJpMfqoMBqRM+eDWO6QXW5ijVL4+wnp40u5bU4fQLVzpg25+QGLqBHD6PZTQaN6F9Vy5XpsAGDlncCklVuX3Lkp3Xb9cTiNa/4ii04uwZqx0juszjwFAMPPb6u56crvN1x4FXfXzabWECHbdQLlKazowvU9bEnqG2i4H44Ae+v8Iw8HK5mbZ6ercLTD9oPgs7Ogal037l2WwLApUz/fmD5fV8SxHh+vKDpfOzv6xcQxynS82jAJw9AdUwE/4ndGzzHPIu2M81gbAgZQ02EurMMU62hYgiXeridrtyh+H5R+CiwQdEyX7/op6WVihsYj2O3O/1hgjhGQRFD6sGwnko50jgWRxaMMfJGNlyGoT8WT5k931jU7547u7Ovr7XP/t8r3G7ceCiCcYjQgdwXdvIStzPvvV7Yy02isZjiJF8TLJQ",
-        "tycxf1mOz1yLE6cT/ZlCxMeTxlEEHFeIdw0+nF/40Tsw4vLco+4kR2A6cVml611CSpN6l/RMKk2LnAkprrbJ/Uam902WBnQ+I6Vsl6GkFFq7362bdixojqMFVKYytXLCT8I78f6s8M6a3jSALQloD6Ftvn+cc+cctO3weaaaPgAlrz+f2MFs8bqpnLQYbbY/JS9IAYJFH+yVtLz7eKcedEp9JMlJ3/43szU2fDN9ZMxBoQnxEmF3WZv6GF0WRc8VhTblXRgk4mlz6Fu3IXvwW/rbn+VCYYIk/XaVLrxFAnnw6mBozAF7vmV0OrIYBlSDU8rMb+F7AvE7pwErO9TJtCE8IUvQf8TsJYRoYv21/X57pzcBedtqVeU3DnTlmESHxG6H1uJbadSFLWSxKS4svfp8T9FWqX5815yD/UplAKEIeorLTAlPIC2ASKDU6SQW260biNAfY8FYQCWa8btaTwFuY8NMwSHzyqgU0aoPKnagi/4hOIWNO5rZ8Xcnzx+ELtEl33hQnzc4OUlT5eeVYQWkz2IWVQ6Re4JWF3L4OXzNZWgefKGMzZU6IHoBeCgfi+popLRJpaOx0dcvwGjk",
-        "oDsoFvUA+sGOoMyZY6w1UhY3NBkeoozzjEkDSRN1golyXJ1dC5CtYNEjvAJYKj+sqNwg9mBlYyybYpnI3GSP125zMeBHPCoy5CoNOkJW4OH/oLyjVeQbFNic/b2Jcz6lTguYhep8hq9EM2XuFV8T1rm5+4ucI7fH1UiOqRZyuHBAJ0Cna5kv6D3efsa9rd+swybiMIUjmPWpyxzNOOihCYuf4JqRh/D5eZKm6x0Zj2uRhTAYYxI7Q3czd0R9490ufG8VbF8ASBMireMONNNAA/OZCpxJh6xnIANBqV6YDeysws3NBWY2QuNumvg5Kr3/g+VMzJHi4wGuJjraKWi9+ylMfelHF5h/h+pAQVxCotq8JU3OTnMUW4rQp2a8BR5S+mZqPSPlb87tDG9r0+yqb1uO4UIo71C7Xxwoq4M0tXjk6mSmtP/sm+Lh14qfUzKRhTHVdz91TK104mbTJNXbK+jGPD/2BJO9fiaXY8IYanpfDLBfJo06VYbm6HehRZTwnDHnN50j7ki4aMS3COZvffjRInXD8dS5h9zmtKNpoqg//lPg4gpS+4Th2sJ3SGtBV0Ne89r7AfZMAVa26PMK",
-        "MIDLuZTrtZnEBOB6l14iSEyokAg5Wf5JviumhfPeL7WSFTHfOodU2hrvhyvM6oAlRHY1blTj7mw+Tcf9Tmc+/FHT6PGu0NT5UAqaqChX0gS9jizgAE2Yfhd4X/DoeQySMAixKuhu8TbvDxb54jeW9+7LVkmlntJ/0SkMgsT+WQ31OfpwDmEGDczYc+Ol14aJS+EW+rnGv9d38bo/cy+EnpNh8iV2rGGoC8fDzFHKU4gqGFSZF/tnD2OfCne0Vjr/GD6kyp2MVcHig19DBg2toGRkHnuY5kLkwOanztXA80IaAmv8e6s62U8CE8ozUZeDBcvBigEkSGx79Vsyiks8+9Kq9xLHLeS5kRT6zSl8whe8U1fIfrgic34KPlozcQVahwCru1XWyQ+9uevih8x4zMftkJ3JBZhPrnlgtx9McntH/Ss9fdUEkNwWpDnq8Xby8/5gMMMwQ13XDB73vqqteDiltMq8i7LRez4iIHfSBBfIkZIzMZAblQXaSm029iBcAAUes7wcGHUl7KOpRy18jNtI3+h7e1Ri6sT2vJYQaove0nzZ5xAjpBKnbJX+lpGVlI00fC2YSTfyNqFA0jkL",
-        "MG4QbKLbQR3enPn6Z/kEUtHrzWBIqYKR7Gvs5QHLPF6417p1O58suZq38Bb8dO5udtgOqNEVAPGmOuidYygWWfWOP5ReggTUk5XlrkvRxCU0MHWbkSKkJ+T4nLjozreqTJ0io41sFVrpxuOugAvXJ6QtMmixSABUaNgU9SkkWf9pOEiJI8dfND51HxJCbXHwsMCMBp5FbaMZmlWPwirRdAox4wbLk9ZLmoWUcorUjdaWhKvT/LnjMgPmwnwwKpN/4MOnRDdAPdzXX3aWHdkzpfsQnqt3UJsTsSaJlzeUja5C5L4CXGyt99qmfcwB8OB9TL4EYTIl3maD/gUWBfckOsji8x2E2c2iuKKrcmMmcChYr4wCjtTjEeVKOAZ2m9mU2MKc2z2hDw3AuZxsY6aOtdAjnrwl5QXGRg9I5LVl5SI5RwnLwk90pJzDGuSSCtSmzh9DUZ4WpfN+1393aTGRqCMOsB4KxbXjspUbVMFJbnXXlsSNWaoFTpHjK6b6Ghi2/re7KJpoKElM3nGs3qvxdvGTKu7LKr/sgKDL6uQLRKoyk8AHSIGX9c8ZUTk7Sq9jV9p4QfV1WFVpaBxSsEmw",
-        "MR0BACgWKis9/AKwG9/ARgGWJn1aM3nU8YXzWG+b7aeRUkVCjl4WxeL38E3FAMLW4UcyLzxeb+CskOqhPPTglmxhK7jQcrNILsWcZvdZfApYIvk5uKqA5FKuUuL48uvD0aKGRENe/VEUFlkQru5YX4Xnp+ZThrJJlgn7ANat/qAdP6ULEcLaOQlLYcGRh5ttsJTRT4+cZQggTJjWt+9idUQ66HfC6zQ1qHcMuochy7GHiUmNXAs0AgwOF9Jwet/Qh74KGMtmppJ9gkEqiYECFQA2gVgKc1AufHJS6S6Re72FfH/UkL41L2hvlwktkD5/hZrUZ1R+RG12Eip2zKgus4g/aGl0V8B/JvkcnFUsZJ6uxs24arOBDJOuzzxky5F5B/hwVGPEdcfHunqndUcx26/KCK72hOljlqTXl8yEbXlcMqVFNByZLr7TnGzGGUlO7kuHPW/ItZUJvrHokpsLLrb3ZhEZ8pTQd75gFcf0Ve8CYzEtk2ISHtNJQV6Iz4AZHWssU6F6YWM/OlJz5JGTtPHfGMJXgl4oxbBjeenS3JQ0X7vWXYMwPe3U1dat6m5hrRC1KzI6e6w+gPDtF8GQ",
-        "DH2WX6XoIseX6lHIey3seUr3DAz82fyk0jL7xc5IDTrDfqS64QBhHDpqHETF/81MrPXsM3IANBfjDOl9g/gua8wWPpPNxuWZMNh0GLcAr6PJ939TCbjE3soZHF2wiA82nZEO8jIZosDVRWFUfJS6Y3nrJz63SExqB6OUdBfvSfz1Y1M/90ofBxkfeuS85deMdn+1rZdsnZJYwz2Z6lCDvYjUTfrSwfVFJBP8Y2BXr8WClUYkfGG4eNG7IPNBRuMmhrhHj5y9z+5Jor+EbbTi5F5Jvdu2/bDM7s32XsaMNLYuVtNYONrbQ+3QZ746/yKZM4hDREvxyGLgDx3Apz7pyvwKm0//iTCY3yJLxZifGLh2uc28cFBln7IH1x8oui4Xq9vF+Z2EH4Ow48Ln5pzggBKMGy4dsfW6266TNYd/Z3SZUi28sxondqhGCSGUo7ZVPAOoYDcYKvjdI/cJ688PHliyZSYBYVmR5HBxZ57sqWwgZQ7zVvwv4CHHysvb92sPrXijHxBIkwpNuK56UMyQCcywlTRLDCMAMNAEGi4fWbDQIoPfn+NixMhEieg3Zh7GXPwHxW8morlgBW5aF76P",
-        "AwClK6Tq9R2DYGf8RAHu9dEttLeOfUVmS4WPwX0NehsnyM7y7n2sgGnXsiva3yFqK1hKZICkVukvHF7/bpgEEm/jRwcAhQUoG+c1qVde38eHJXj58YOBGTveruc+021or9/tHBtenmYPO6+arLQtONi43NKm7+I6ugkgQlp6iBr4haa0XMDTzMX9c8Qm/O+MrVo3qESYKkVtoSSK7SGZTBaRWNF/dOM0NQxeMP+XTVOuroqE23ZNsubBTEZnd4vUilFb/iKnhyT9XnIo7gM/Yz7HLVU5yc3yIj2sFUE+DcwpvcNO5EnPhj3bHsJvf3N4r72+5my2KjoR3KAJE1Imabd54o4xZ/9UaR93qLkVuXMkLRCCU/zlZDtfbJDsRR0C5rSYd2k6IPlNcl7PgmUpsNPUyoDYqvhuRUZxgoUAfKbogzJX8FU/QpllsKVtt68ucBi0bqC5pVKu23j79nDvYQsSlYY3JwJQaM5M558J5qpP1yEF2p4kSRphnB9UR29wWgch5eWZ4a02LlHVM5Msl6W5PdmHt+eFARBRv6edIyYDFzxm4WZroH5F/GxBhM0KObgawkxa5VWsYm0VhhXb",
-        "KACwq8rZuOLHuNnZJA07WzI7kppCwptbcYU2B7t86QcZrnadCtxoM5QNcl9rsbMA26iWCPV3VlDAmLSWcxtMoSKWuo4edJpk8K915xkFU5U6I/901vx5hqAECQDy/Q+QDWmWTXDoVHqFV9wvIj3wCJPpJL/Ewpl0NZd+68jjOjUhjIdNebLrWNK2nhTPiIjFjkcVqEgashpOmnbHT+2MV/CHoixmUEiuRI1B0dvSf7FHGRgbXGBubisuu60g8XTens5zyRo4Qn/LTxIu2aj4LTtyLonV3sXr+y35A1zq5mCrE1f1nOINVzwYYY76iJGIaBkZuMU3366FPIbYkmXwla6RQU1FA0Y7n05qczw7Ie5TveRTByKFtUqW8OAb9vH+H2ezJ4CXE3AGbu/nTj64KClO/zL499GA+97g+X6tTN6xOJdNknlqw6ZnFNtCL8+A3hL4OyOgWD0IGC+xFvcKjDUaaJenCtQvprCJaFrvoOS+yYmixnFqglnPYL/64/Lca8NmDVpPzlHI8HNwUDzKiXTw3q7GnQZWmUYzu1vLIEi6/hyqrULRN1vLdd/8HCMNQFj4ot61UftHtOG8MCKa",
-        "rUABPQ3SEWE5rY16pM+o+7EObLNM1jEa5YCMQM/aen0PWajWNax3Pyo6TZL8aGDXZF0yWqDM3b2m6UHOr6yqsUSrD+0jXPT48QN1VdBmh+AFRK+UcaYO383a0nvtv0c9uHt4yfceXLPGWrNjW+uTnS/lKpCdpE4GfLF1SFHIUcMxT+3At7hwDHNkLXllEXqbgDP8LyQSlYwT5jQUDCOzwc8CSxAryUOj6fN+iLKAiw4haPV/WZDG+JOmDMG2azo8SoBMi3y6Z2Le2fz2dMuvn5DUvCUvazrUmWYx4NEdSzc9GfBc6cXkduMqCs+lT2Ik2GHO0WjhrEB6j5NULOaCtbrislM85P6QutN4Pj9l18pcD6vZCcDTOwMj/BznclH342jeMn7rBgpW1YSzbNGP6KC4NeNW1H2xqNtuyhcJvasx4dwhzO18A36H6HtkiQyJNnfnVHh1oviO6mi3atmnh9B/55ugXM1Wf/6Kv8kJyaKtK8cWo+jCAR0/P/EsPtzToJM9Yk2+qxaPFd3k7T2KXvCQ9D1jLeECxL59L+WDvdBtxOEBD7W0a/Mn/9LuQPOiwARKJSTU+blJ6ezTeo83",
-        "poA1hF4zRh7HF0xVglYoLFqkUR7Pru/qYFnfMKBPuEOOGdgO3MMcAvIZ+w+Ug4THr/6+Vux0TN3wdOB+beObOboLgNE2zaD65lyMFbaulzrEnWjUgIg63CdpQJ2ESaimHGg/GmsipUCndRJ37TbUtn8W112SehsAgrsjiBcuJhw61i4bVfAZEcycq4Y/FlEDxtzoH8WzDoESNbl+r5agLcHGr37BFi81IXS8TLihC1T8b7d6tLb6lpXT+9IR4xAyZTw1IFMDZZEzVmHgYE/Et20/WhkX/oGghkWSpCxR0kynDplk+BEK2oyGKnl+rf4vymhsse2iQ/C99PhaodZjDfuGVSwPLoU0AYyAKaEwmgHPOFbDlrAmNk4iBp+IZYm9guZM2hcQ4GeA5WQyZzw4C1yMywWbdjtL9ZhpClmmPZ28nmwNORAat7tXPJoBBdXFB0gNT/wU7UYIKU5GnAiDIFJ0o8ijnuAMat3AsBki2vxwdypuBq5M6OF9DVA0HRUjOA0l4JHjK8Y282mz3U34PDPQvwCT342uD9cO3uXoSr3T2FnDmsVHz4Q9zYpSjioLmZk9ZTnQWgN5V5Oyat6m"
-     };
-
-    public String getName()
-    {
-        return "ParsingTest";
-    }
-
-    public void performTest()
-        throws Exception
-    {
-        inputStreamTest();
-        parserTest();
-    }
-
-    private void parserTest()
-    {
-        for (int i = 0; i != streams.length; i++)
-        {
-            ASN1StreamParser aIn = new ASN1StreamParser(Base64.decode(streams[i]));
-
-            try
-            {
-                Object obj;
-
-                while ((obj = aIn.readObject()) != null)
-                {
-
-                }
-
-                fail("bad stream parsed successfully!");
-            }
-            catch (IOException e)
-            {
-                // ignore
-            }
-        }
-    }
-
-    private void inputStreamTest()
-    {
-        for (int i = 0; i != streams.length; i++)
-        {
-            ASN1InputStream aIn = new ASN1InputStream(Base64.decode(streams[i]));
-
-            try
-            {
-                Object obj;
-
-                while ((obj = aIn.readObject()) != null)
-                {
-
-                }
-
-                fail("bad stream parsed successfully!");
-            }
-            catch (IOException e)
-            {
-                // ignore
-            }
-        }
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        runTest(new ParsingTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/test/PersonalDataUnitTest.java b/bcprov/src/main/java/org/bouncycastle/asn1/test/PersonalDataUnitTest.java
deleted file mode 100644
index 95a3120..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/test/PersonalDataUnitTest.java
+++ /dev/null
@@ -1,121 +0,0 @@
-package org.bouncycastle.asn1.test;
-
-import java.io.IOException;
-import java.math.BigInteger;
-
-import org.bouncycastle.asn1.ASN1GeneralizedTime;
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.x500.DirectoryString;
-import org.bouncycastle.asn1.x509.sigi.NameOrPseudonym;
-import org.bouncycastle.asn1.x509.sigi.PersonalData;
-
-public class PersonalDataUnitTest
-    extends ASN1UnitTest
-{
-    public String getName()
-    {
-        return "PersonalData";
-    }
-
-    public void performTest()
-        throws Exception
-    {
-        NameOrPseudonym nameOrPseudonym = new NameOrPseudonym("pseudonym");
-        BigInteger nameDistinguisher = BigInteger.valueOf(10);
-        ASN1GeneralizedTime dateOfBirth= new ASN1GeneralizedTime("20070315173729Z");
-        DirectoryString placeOfBirth = new DirectoryString("placeOfBirth");
-        String gender = "M";
-        DirectoryString postalAddress = new DirectoryString("address");
-
-        PersonalData data = new PersonalData(nameOrPseudonym, nameDistinguisher, dateOfBirth, placeOfBirth, gender, postalAddress);
-
-        checkConstruction(data, nameOrPseudonym, nameDistinguisher, dateOfBirth, placeOfBirth, gender, postalAddress);
-
-        data = new PersonalData(nameOrPseudonym, null, dateOfBirth, placeOfBirth, gender, postalAddress);
-
-        checkConstruction(data, nameOrPseudonym, null, dateOfBirth, placeOfBirth, gender, postalAddress);
-
-        data = new PersonalData(nameOrPseudonym, nameDistinguisher, null, placeOfBirth, gender, postalAddress);
-
-        checkConstruction(data, nameOrPseudonym, nameDistinguisher, null, placeOfBirth, gender, postalAddress);
-
-        data = new PersonalData(nameOrPseudonym, nameDistinguisher, dateOfBirth, null, gender, postalAddress);
-
-        checkConstruction(data, nameOrPseudonym, nameDistinguisher, dateOfBirth, null, gender, postalAddress);
-
-        data = new PersonalData(nameOrPseudonym, nameDistinguisher, dateOfBirth, placeOfBirth, null, postalAddress);
-
-        checkConstruction(data, nameOrPseudonym, nameDistinguisher, dateOfBirth, placeOfBirth, null, postalAddress);
-
-        data = new PersonalData(nameOrPseudonym, nameDistinguisher, dateOfBirth, placeOfBirth, gender, null);
-
-        checkConstruction(data, nameOrPseudonym, nameDistinguisher, dateOfBirth, placeOfBirth, gender, null);
-
-        data = PersonalData.getInstance(null);
-
-        if (data != null)
-        {
-            fail("null getInstance() failed.");
-        }
-
-        try
-        {
-            PersonalData.getInstance(new Object());
-
-            fail("getInstance() failed to detect bad object.");
-        }
-        catch (IllegalArgumentException e)
-        {
-            // expected
-        }
-    }
-
-    private void checkConstruction(
-        PersonalData data,
-        NameOrPseudonym nameOrPseudonym,
-        BigInteger nameDistinguisher,
-        ASN1GeneralizedTime dateOfBirth,
-        DirectoryString placeOfBirth,
-        String gender,
-        DirectoryString postalAddress)
-        throws IOException
-    {
-        checkValues(data, nameOrPseudonym, nameDistinguisher, dateOfBirth, placeOfBirth, gender, postalAddress);
-
-        data = PersonalData.getInstance(data);
-
-        checkValues(data, nameOrPseudonym, nameDistinguisher, dateOfBirth, placeOfBirth, gender, postalAddress);
-
-        ASN1InputStream aIn = new ASN1InputStream(data.toASN1Object().getEncoded());
-
-        ASN1Sequence seq = (ASN1Sequence)aIn.readObject();
-
-        data = PersonalData.getInstance(seq);
-
-        checkValues(data, nameOrPseudonym, nameDistinguisher, dateOfBirth, placeOfBirth, gender, postalAddress);
-    }
-
-    private void checkValues(
-        PersonalData data,
-        NameOrPseudonym nameOrPseudonym,
-        BigInteger nameDistinguisher,
-        ASN1GeneralizedTime dateOfBirth,
-        DirectoryString placeOfBirth,
-        String gender,
-        DirectoryString postalAddress)
-    {
-        checkMandatoryField("nameOrPseudonym", nameOrPseudonym, data.getNameOrPseudonym());
-        checkOptionalField("nameDistinguisher", nameDistinguisher, data.getNameDistinguisher());
-        checkOptionalField("dateOfBirth", dateOfBirth, data.getDateOfBirth());
-        checkOptionalField("placeOfBirth", placeOfBirth, data.getPlaceOfBirth());
-        checkOptionalField("gender", gender, data.getGender());
-        checkOptionalField("postalAddress", postalAddress, data.getPostalAddress());
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        runTest(new PersonalDataUnitTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/test/ProcurationSyntaxUnitTest.java b/bcprov/src/main/java/org/bouncycastle/asn1/test/ProcurationSyntaxUnitTest.java
deleted file mode 100644
index 32120bb..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/test/ProcurationSyntaxUnitTest.java
+++ /dev/null
@@ -1,107 +0,0 @@
-package org.bouncycastle.asn1.test;
-
-import java.io.IOException;
-
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.isismtt.x509.ProcurationSyntax;
-import org.bouncycastle.asn1.x500.DirectoryString;
-import org.bouncycastle.asn1.x509.GeneralName;
-import org.bouncycastle.asn1.x509.GeneralNames;
-import org.bouncycastle.asn1.x509.IssuerSerial;
-import org.bouncycastle.asn1.x509.X509Name;
-
-public class ProcurationSyntaxUnitTest
-    extends ASN1UnitTest
-{
-    public String getName()
-    {
-        return "ProcurationSyntax";
-    }
-
-    public void performTest()
-        throws Exception
-    {
-        String country = "AU";
-        DirectoryString  typeOfSubstitution = new DirectoryString("substitution");
-        GeneralName thirdPerson = new GeneralName(new X509Name("CN=thirdPerson"));
-        IssuerSerial certRef = new IssuerSerial(new GeneralNames(new GeneralName(new X509Name("CN=test"))), new ASN1Integer(1));
-
-        ProcurationSyntax procuration = new ProcurationSyntax(country, typeOfSubstitution, thirdPerson);
-
-        checkConstruction(procuration, country, typeOfSubstitution, thirdPerson, null);
-
-        procuration = new ProcurationSyntax(country, typeOfSubstitution, certRef);
-
-        checkConstruction(procuration, country, typeOfSubstitution, null, certRef);
-
-        procuration = new ProcurationSyntax(null, typeOfSubstitution, certRef);
-
-        checkConstruction(procuration, null, typeOfSubstitution, null, certRef);
-
-        procuration = new ProcurationSyntax(country, null, certRef);
-
-        checkConstruction(procuration, country, null, null, certRef);
-
-        procuration = ProcurationSyntax.getInstance(null);
-
-        if (procuration != null)
-        {
-            fail("null getInstance() failed.");
-        }
-
-        try
-        {
-            ProcurationSyntax.getInstance(new Object());
-
-            fail("getInstance() failed to detect bad object.");
-        }
-        catch (IllegalArgumentException e)
-        {
-            // expected
-        }
-    }
-
-    private void checkConstruction(
-        ProcurationSyntax procuration,
-        String country,
-        DirectoryString  typeOfSubstitution,
-        GeneralName thirdPerson,
-        IssuerSerial certRef)
-        throws IOException
-    {
-        checkValues(procuration, country, typeOfSubstitution, thirdPerson, certRef);
-
-        procuration = ProcurationSyntax.getInstance(procuration);
-
-        checkValues(procuration, country, typeOfSubstitution, thirdPerson, certRef);
-
-        ASN1InputStream aIn = new ASN1InputStream(procuration.toASN1Object().getEncoded());
-
-        ASN1Sequence seq = (ASN1Sequence)aIn.readObject();
-
-        procuration = ProcurationSyntax.getInstance(seq);
-
-        checkValues(procuration, country, typeOfSubstitution, thirdPerson, certRef);
-    }
-
-    private void checkValues(
-        ProcurationSyntax procuration,
-        String country,
-        DirectoryString  typeOfSubstitution,
-        GeneralName thirdPerson,
-        IssuerSerial certRef)
-    {
-        checkOptionalField("country", country, procuration.getCountry());
-        checkOptionalField("typeOfSubstitution", typeOfSubstitution, procuration.getTypeOfSubstitution());
-        checkOptionalField("thirdPerson", thirdPerson, procuration.getThirdPerson());
-        checkOptionalField("certRef", certRef, procuration.getCertRef());
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        runTest(new ProcurationSyntaxUnitTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/test/ProfessionInfoUnitTest.java b/bcprov/src/main/java/org/bouncycastle/asn1/test/ProfessionInfoUnitTest.java
deleted file mode 100644
index 34b3307..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/test/ProfessionInfoUnitTest.java
+++ /dev/null
@@ -1,117 +0,0 @@
-package org.bouncycastle.asn1.test;
-
-import java.io.IOException;
-
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DEROctetString;
-import org.bouncycastle.asn1.isismtt.x509.NamingAuthority;
-import org.bouncycastle.asn1.isismtt.x509.ProcurationSyntax;
-import org.bouncycastle.asn1.isismtt.x509.ProfessionInfo;
-import org.bouncycastle.asn1.x500.DirectoryString;
-
-public class ProfessionInfoUnitTest
-    extends ASN1UnitTest
-{
-    public String getName()
-    {
-        return "ProfessionInfo";
-    }
-
-    public void performTest()
-        throws Exception
-    {
-        NamingAuthority auth =  new NamingAuthority(new ASN1ObjectIdentifier("1.2.3"), "url", new DirectoryString("fred"));
-        DirectoryString[] professionItems = { new DirectoryString("substitution") };
-        ASN1ObjectIdentifier[] professionOids = { new ASN1ObjectIdentifier("1.2.3") };
-        String registrationNumber = "12345";
-        DEROctetString addProfInfo = new DEROctetString(new byte[20]);
-
-        ProfessionInfo info = new ProfessionInfo(auth, professionItems, professionOids, registrationNumber, addProfInfo);
-
-        checkConstruction(info, auth, professionItems, professionOids, registrationNumber, addProfInfo);
-
-        info = new ProfessionInfo(null, professionItems, professionOids, registrationNumber, addProfInfo);
-
-        checkConstruction(info, null, professionItems, professionOids, registrationNumber, addProfInfo);
-
-        info = new ProfessionInfo(auth, professionItems, null, registrationNumber, addProfInfo);
-
-        checkConstruction(info, auth, professionItems, null, registrationNumber, addProfInfo);
-
-        info = new ProfessionInfo(auth, professionItems, professionOids, null, addProfInfo);
-
-        checkConstruction(info, auth, professionItems, professionOids, null, addProfInfo);
-
-        info = new ProfessionInfo(auth, professionItems, professionOids, registrationNumber, null);
-
-        checkConstruction(info, auth, professionItems, professionOids, registrationNumber, null);
-
-        info = ProfessionInfo.getInstance(null);
-
-        if (info != null)
-        {
-            fail("null getInstance() failed.");
-        }
-
-        try
-        {
-            ProcurationSyntax.getInstance(new Object());
-
-            fail("getInstance() failed to detect bad object.");
-        }
-        catch (IllegalArgumentException e)
-        {
-            // expected
-        }
-    }
-
-    private void checkConstruction(
-        ProfessionInfo profInfo,
-        NamingAuthority auth,
-        DirectoryString[] professionItems,
-        ASN1ObjectIdentifier[] professionOids,
-        String registrationNumber,
-        DEROctetString addProfInfo)
-        throws IOException
-    {
-        checkValues(profInfo, auth, professionItems, professionOids, registrationNumber, addProfInfo);
-
-        profInfo = ProfessionInfo.getInstance(profInfo);
-
-        checkValues(profInfo, auth, professionItems, professionOids, registrationNumber, addProfInfo);
-
-        ASN1InputStream aIn = new ASN1InputStream(profInfo.toASN1Object().getEncoded());
-
-        ASN1Sequence seq = (ASN1Sequence)aIn.readObject();
-
-        profInfo = ProfessionInfo.getInstance(seq);
-
-        checkValues(profInfo, auth, professionItems, professionOids, registrationNumber, addProfInfo);
-    }
-
-    private void checkValues(
-        ProfessionInfo profInfo,
-        NamingAuthority auth,
-        DirectoryString[] professionItems,
-        ASN1ObjectIdentifier[] professionOids,
-        String registrationNumber,
-        DEROctetString addProfInfo)
-    {
-        checkOptionalField("auth", auth, profInfo.getNamingAuthority());
-        checkMandatoryField("professionItems", professionItems[0], profInfo.getProfessionItems()[0]);
-        if (professionOids != null)
-        {
-            checkOptionalField("professionOids", professionOids[0], profInfo.getProfessionOIDs()[0]);
-        }
-        checkOptionalField("registrationNumber", registrationNumber, profInfo.getRegistrationNumber());
-        checkOptionalField("addProfessionInfo", addProfInfo, profInfo.getAddProfessionInfo());
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        runTest(new ProfessionInfoUnitTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/test/QCStatementUnitTest.java b/bcprov/src/main/java/org/bouncycastle/asn1/test/QCStatementUnitTest.java
deleted file mode 100644
index d7a84a5..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/test/QCStatementUnitTest.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package org.bouncycastle.asn1.test;
-
-import java.io.IOException;
-
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.x509.qualified.QCStatement;
-import org.bouncycastle.asn1.x509.qualified.RFC3739QCObjectIdentifiers;
-import org.bouncycastle.asn1.x509.qualified.SemanticsInformation;
-import org.bouncycastle.util.test.SimpleTest;
-
-public class QCStatementUnitTest 
-    extends SimpleTest
-{
-    public String getName()
-    {
-        return "QCStatement";
-    }
-
-    public void performTest() 
-        throws Exception
-    {
-        QCStatement mv = new QCStatement(RFC3739QCObjectIdentifiers.id_qcs_pkixQCSyntax_v1);
-
-        checkConstruction(mv, RFC3739QCObjectIdentifiers.id_qcs_pkixQCSyntax_v1, null);
-        
-        ASN1Encodable info = new SemanticsInformation(new ASN1ObjectIdentifier("1.2"));
-        
-        mv = new QCStatement(RFC3739QCObjectIdentifiers.id_qcs_pkixQCSyntax_v1, info);
-
-        checkConstruction(mv, RFC3739QCObjectIdentifiers.id_qcs_pkixQCSyntax_v1, info);
-        
-        mv = QCStatement.getInstance(null);
-        
-        if (mv != null)
-        {
-            fail("null getInstance() failed.");
-        }
-        
-        try
-        {
-            QCStatement.getInstance(new Object());
-            
-            fail("getInstance() failed to detect bad object.");
-        }
-        catch (IllegalArgumentException e)
-        {
-            // expected
-        }
-    }
-
-    private void checkConstruction(
-         QCStatement mv,
-         ASN1ObjectIdentifier statementId,
-         ASN1Encodable statementInfo) 
-         throws IOException
-    {
-        checkStatement(mv, statementId, statementInfo);
-        
-        mv = QCStatement.getInstance(mv);
-        
-        checkStatement(mv, statementId, statementInfo);
-        
-        ASN1InputStream aIn = new ASN1InputStream(mv.toASN1Object().getEncoded());
-
-        ASN1Sequence seq = (ASN1Sequence)aIn.readObject();
-        
-        mv = QCStatement.getInstance(seq);
-        
-        checkStatement(mv, statementId, statementInfo);
-    }
-
-    private void checkStatement(
-        QCStatement         qcs,
-        ASN1ObjectIdentifier statementId,
-        ASN1Encodable       statementInfo)
-        throws IOException
-    {
-        if (!qcs.getStatementId().equals(statementId))
-        {
-            fail("statementIds don't match.");
-        }
-        
-        if (statementInfo != null)
-        {
-            if (!qcs.getStatementInfo().equals(statementInfo))
-            {
-                fail("statementInfos don't match.");
-            }
-        }
-        else if (qcs.getStatementInfo() != null)
-        {
-            fail("statementInfo found when none expected.");
-        }
-    }
-    
-    public static void main(
-        String[]    args)
-    {
-        runTest(new QCStatementUnitTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/test/RFC4519Test.java b/bcprov/src/main/java/org/bouncycastle/asn1/test/RFC4519Test.java
deleted file mode 100644
index 8d7e175..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/test/RFC4519Test.java
+++ /dev/null
@@ -1,149 +0,0 @@
-package org.bouncycastle.asn1.test;
-
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.x500.X500Name;
-import org.bouncycastle.asn1.x500.X500NameStyle;
-import org.bouncycastle.asn1.x500.style.RFC4519Style;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-
-public class RFC4519Test
-    extends SimpleTest
-{
-    static String[] attributeTypes =
-        {
-            "businessCategory",
-            "c",
-            "cn",
-            "dc",
-            "description",
-            "destinationIndicator",
-            "distinguishedName",
-            "dnQualifier",
-            "enhancedSearchGuide",
-            "facsimileTelephoneNumber",
-            "generationQualifier",
-            "givenName",
-            "houseIdentifier",
-            "initials",
-            "internationalISDNNumber",
-            "l",
-            "member",
-            "name",
-            "o",
-            "ou",
-            "owner",
-            "physicalDeliveryOfficeName",
-            "postalAddress",
-            "postalCode",
-            "postOfficeBox",
-            "preferredDeliveryMethod",
-            "registeredAddress",
-            "roleOccupant",
-            "searchGuide",
-            "seeAlso",
-            "serialNumber",
-            "sn",
-            "st",
-            "street",
-            "telephoneNumber",
-            "teletexTerminalIdentifier",
-            "telexNumber",
-            "title",
-            "uid",
-            "uniqueMember",
-            "userPassword",
-            "x121Address",
-            "x500UniqueIdentifier"
-        };
-
-    static ASN1ObjectIdentifier[] attributeTypeOIDs =
-        {
-            new ASN1ObjectIdentifier("2.5.4.15"),
-            new ASN1ObjectIdentifier("2.5.4.6"),
-            new ASN1ObjectIdentifier("2.5.4.3"),
-            new ASN1ObjectIdentifier("0.9.2342.19200300.100.1.25"),
-            new ASN1ObjectIdentifier("2.5.4.13"),
-            new ASN1ObjectIdentifier("2.5.4.27"),
-            new ASN1ObjectIdentifier("2.5.4.49"),
-            new ASN1ObjectIdentifier("2.5.4.46"),
-            new ASN1ObjectIdentifier("2.5.4.47"),
-            new ASN1ObjectIdentifier("2.5.4.23"),
-            new ASN1ObjectIdentifier("2.5.4.44"),
-            new ASN1ObjectIdentifier("2.5.4.42"),
-            new ASN1ObjectIdentifier("2.5.4.51"),
-            new ASN1ObjectIdentifier("2.5.4.43"),
-            new ASN1ObjectIdentifier("2.5.4.25"),
-            new ASN1ObjectIdentifier("2.5.4.7"),
-            new ASN1ObjectIdentifier("2.5.4.31"),
-            new ASN1ObjectIdentifier("2.5.4.41"),
-            new ASN1ObjectIdentifier("2.5.4.10"),
-            new ASN1ObjectIdentifier("2.5.4.11"),
-            new ASN1ObjectIdentifier("2.5.4.32"),
-            new ASN1ObjectIdentifier("2.5.4.19"),
-            new ASN1ObjectIdentifier("2.5.4.16"),
-            new ASN1ObjectIdentifier("2.5.4.17"),
-            new ASN1ObjectIdentifier("2.5.4.18"),
-            new ASN1ObjectIdentifier("2.5.4.28"),
-            new ASN1ObjectIdentifier("2.5.4.26"),
-            new ASN1ObjectIdentifier("2.5.4.33"),
-            new ASN1ObjectIdentifier("2.5.4.14"),
-            new ASN1ObjectIdentifier("2.5.4.34"),
-            new ASN1ObjectIdentifier("2.5.4.5"),
-            new ASN1ObjectIdentifier("2.5.4.4"),
-            new ASN1ObjectIdentifier("2.5.4.8"),
-            new ASN1ObjectIdentifier("2.5.4.9"),
-            new ASN1ObjectIdentifier("2.5.4.20"),
-            new ASN1ObjectIdentifier("2.5.4.22"),
-            new ASN1ObjectIdentifier("2.5.4.21"),
-            new ASN1ObjectIdentifier("2.5.4.12"),
-            new ASN1ObjectIdentifier("0.9.2342.19200300.100.1.1"),
-            new ASN1ObjectIdentifier("2.5.4.50"),
-            new ASN1ObjectIdentifier("2.5.4.35"),
-            new ASN1ObjectIdentifier("2.5.4.24"),
-            new ASN1ObjectIdentifier("2.5.4.45")
-        };
-
-    public String getName()
-    {
-        return "RFC4519Test";
-    }
-
-    public void performTest()
-        throws Exception
-    {
-        X500NameStyle style = RFC4519Style.INSTANCE;
-
-        for (int i = 0; i != attributeTypes.length; i++)
-        {
-            if (!attributeTypeOIDs[i].equals(style.attrNameToOID(attributeTypes[i])))
-            {
-                fail("mismatch for " + attributeTypes[i]);
-            }
-        }
-
-        byte[] enc = Hex.decode("305e310b300906035504061302415531283026060355040a0c1f546865204c6567696f6e206f662074686520426f756e637920436173746c653125301006035504070c094d656c626f75726e653011060355040b0c0a4173636f742056616c65");
-
-        X500Name n = new X500Name(style, X500Name.getInstance(enc));
-
-        if (!n.toString().equals("l=Melbourne+ou=Ascot Vale,o=The Legion of the Bouncy Castle,c=AU"))
-        {
-            fail("Failed composite to string test got: " + n.toString());
-        }
-
-        n = new X500Name(style, "l=Melbourne+ou=Ascot Vale,o=The Legion of the Bouncy Castle,c=AU");
-
-        if (!Arrays.areEqual(n.getEncoded(), enc))
-        {
-            fail("re-encoding test after parse failed");
-        }
-    }
-
-
-    public static void main(
-        String[] args)
-    {
-        runTest(new RFC4519Test());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/test/ReasonFlagsTest.java b/bcprov/src/main/java/org/bouncycastle/asn1/test/ReasonFlagsTest.java
deleted file mode 100644
index ebfd126..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/test/ReasonFlagsTest.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package org.bouncycastle.asn1.test;
-
-import java.io.IOException;
-
-import org.bouncycastle.asn1.x509.ReasonFlags;
-import org.bouncycastle.util.test.SimpleTest;
-
-public class ReasonFlagsTest
-    extends SimpleTest
-{
-    public String getName()
-    {
-        return "ReasonFlags";
-    }
-
-    public void performTest()
-        throws IOException
-    {
-        BitStringConstantTester.testFlagValueCorrect(0, ReasonFlags.unused);
-        BitStringConstantTester.testFlagValueCorrect(1, ReasonFlags.keyCompromise);
-        BitStringConstantTester.testFlagValueCorrect(2, ReasonFlags.cACompromise);
-        BitStringConstantTester.testFlagValueCorrect(3, ReasonFlags.affiliationChanged);
-        BitStringConstantTester.testFlagValueCorrect(4, ReasonFlags.superseded);
-        BitStringConstantTester.testFlagValueCorrect(5, ReasonFlags.cessationOfOperation);
-        BitStringConstantTester.testFlagValueCorrect(6, ReasonFlags.certificateHold);
-        BitStringConstantTester.testFlagValueCorrect(7, ReasonFlags.privilegeWithdrawn);
-        BitStringConstantTester.testFlagValueCorrect(8, ReasonFlags.aACompromise);
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        runTest(new ReasonFlagsTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/test/RegressionTest.java b/bcprov/src/main/java/org/bouncycastle/asn1/test/RegressionTest.java
deleted file mode 100644
index e442729..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/test/RegressionTest.java
+++ /dev/null
@@ -1,92 +0,0 @@
-package org.bouncycastle.asn1.test;
-
-import org.bouncycastle.util.test.Test;
-import org.bouncycastle.util.test.TestResult;
-
-public class RegressionTest
-{
-    public static Test[]    tests = {
-        new InputStreamTest(),
-        new EqualsAndHashCodeTest(),
-        new TagTest(),
-        new SetTest(),
-        new DERUTF8StringTest(),
-        new CertificateTest(),
-        new GenerationTest(),
-        new CMSTest(),
-        new OCSPTest(),
-        new OIDTest(),
-        new PKCS10Test(),
-        new PKCS12Test(),
-        new X509NameTest(),
-        new X500NameTest(),
-        new X509ExtensionsTest(),
-        new GeneralizedTimeTest(),
-        new BitStringTest(),
-        new MiscTest(),
-        new SMIMETest(),
-        new X9Test(),
-        new MonetaryValueUnitTest(),
-        new BiometricDataUnitTest(),
-        new Iso4217CurrencyCodeUnitTest(),
-        new SemanticsInformationUnitTest(),
-        new QCStatementUnitTest(),
-        new TypeOfBiometricDataUnitTest(),
-        new SignerLocationUnitTest(),
-        new CommitmentTypeQualifierUnitTest(),
-        new CommitmentTypeIndicationUnitTest(),
-        new EncryptedPrivateKeyInfoTest(),
-        new DataGroupHashUnitTest(),
-        new LDSSecurityObjectUnitTest(),
-        new CscaMasterListTest(),
-        new AttributeTableUnitTest(),
-        new ReasonFlagsTest(),
-        new NetscapeCertTypeTest(),
-        new PKIFailureInfoTest(),
-        new KeyUsageTest(),
-        new StringTest(),
-        new UTCTimeTest(),
-        new RequestedCertificateUnitTest(),
-        new OtherCertIDUnitTest(),
-        new OtherSigningCertificateUnitTest(),
-        new ContentHintsUnitTest(),
-        new CertHashUnitTest(),
-        new AdditionalInformationSyntaxUnitTest(),
-        new AdmissionSyntaxUnitTest(),
-        new AdmissionsUnitTest(),
-        new DeclarationOfMajorityUnitTest(),
-        new ProcurationSyntaxUnitTest(),
-        new ProfessionInfoUnitTest(),
-        new RestrictionUnitTest(),
-        new NamingAuthorityUnitTest(),
-        new MonetaryLimitUnitTest(),
-        new NameOrPseudonymUnitTest(),
-        new PersonalDataUnitTest(),
-        new DERApplicationSpecificTest(),
-        new IssuingDistributionPointUnitTest(),
-        new TargetInformationTest(),
-        new SubjectKeyIdentifierTest(),
-        new ESSCertIDv2UnitTest(),
-        new ParsingTest(),
-        new GeneralNameTest(),
-        new ObjectIdentifierTest(),
-        new RFC4519Test()
-    };
-
-    public static void main(
-        String[]    args)
-    {
-        for (int i = 0; i != tests.length; i++)
-        {
-            TestResult  result = tests[i].perform();
-            
-            if (result.getException() != null)
-            {
-                result.getException().printStackTrace();
-            }
-            
-            System.out.println(result);
-        }
-    }
-}
-
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/test/RequestedCertificateUnitTest.java b/bcprov/src/main/java/org/bouncycastle/asn1/test/RequestedCertificateUnitTest.java
deleted file mode 100644
index b167e4e..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/test/RequestedCertificateUnitTest.java
+++ /dev/null
@@ -1,108 +0,0 @@
-package org.bouncycastle.asn1.test;
-
-import java.io.IOException;
-
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.isismtt.ocsp.RequestedCertificate;
-import org.bouncycastle.asn1.x509.Certificate;
-import org.bouncycastle.util.encoders.Base64;
-
-public class RequestedCertificateUnitTest
-    extends ASN1UnitTest
-{
-   byte[]  certBytes = Base64.decode(
-           "MIIBWzCCAQYCARgwDQYJKoZIhvcNAQEEBQAwODELMAkGA1UEBhMCQVUxDDAKBgNV"
-         + "BAgTA1FMRDEbMBkGA1UEAxMSU1NMZWF5L3JzYSB0ZXN0IENBMB4XDTk1MDYxOTIz"
-         + "MzMxMloXDTk1MDcxNzIzMzMxMlowOjELMAkGA1UEBhMCQVUxDDAKBgNVBAgTA1FM"
-         + "RDEdMBsGA1UEAxMUU1NMZWF5L3JzYSB0ZXN0IGNlcnQwXDANBgkqhkiG9w0BAQEF"
-         + "AANLADBIAkEAqtt6qS5GTxVxGZYWa0/4u+IwHf7p2LNZbcPBp9/OfIcYAXBQn8hO"
-         + "/Re1uwLKXdCjIoaGs4DLdG88rkzfyK5dPQIDAQABMAwGCCqGSIb3DQIFBQADQQAE"
-         + "Wc7EcF8po2/ZO6kNCwK/ICH6DobgLekA5lSLr5EvuioZniZp5lFzAw4+YzPQ7XKJ"
-         + "zl9HYIMxATFyqSiD9jsx");
-
-    public String getName()
-    {
-        return "RequestedCertificate";
-    }
-
-    public void performTest()
-        throws Exception
-    {
-        int type = 1;
-        byte[] certOctets = new byte[20];
-        Certificate cert = Certificate.getInstance(certBytes);
-
-        RequestedCertificate requested = new RequestedCertificate(type, certOctets);
-
-        checkConstruction(requested, type, certOctets, null);
-
-        requested = new RequestedCertificate(cert);
-
-        checkConstruction(requested, RequestedCertificate.certificate, null, cert);
-
-        requested = RequestedCertificate.getInstance(null);
-
-        if (requested != null)
-        {
-            fail("null getInstance() failed.");
-        }
-
-        try
-        {
-            RequestedCertificate.getInstance(new Object());
-
-            fail("getInstance() failed to detect bad object.");
-        }
-        catch (IllegalArgumentException e)
-        {
-            // expected
-        }
-    }
-
-    private void checkConstruction(
-        RequestedCertificate requested,
-        int type,
-        byte[] certOctets,
-        Certificate cert)
-        throws IOException
-    {
-        checkValues(requested, type, certOctets, cert);
-
-        requested = RequestedCertificate.getInstance(requested);
-
-        checkValues(requested, type, certOctets, cert);
-
-        ASN1InputStream aIn = new ASN1InputStream(requested.toASN1Object().getEncoded());
-
-        Object obj = aIn.readObject();
-
-        requested = RequestedCertificate.getInstance(obj);
-
-        checkValues(requested, type, certOctets, cert);
-    }
-
-    private void checkValues(
-        RequestedCertificate requested,
-        int type,
-        byte[] certOctets,
-        Certificate cert)
-        throws IOException
-    {
-        checkMandatoryField("certType", type, requested.getType());
-
-        if (requested.getType() == RequestedCertificate.certificate)
-        {
-            checkMandatoryField("certificate", cert.getEncoded(), requested.getCertificateBytes());
-        }
-        else
-        {
-            checkMandatoryField("certificateOctets", certOctets, requested.getCertificateBytes());
-        }
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        runTest(new RequestedCertificateUnitTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/test/RestrictionUnitTest.java b/bcprov/src/main/java/org/bouncycastle/asn1/test/RestrictionUnitTest.java
deleted file mode 100644
index 3b11305..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/test/RestrictionUnitTest.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package org.bouncycastle.asn1.test;
-
-import java.io.IOException;
-
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1String;
-import org.bouncycastle.asn1.isismtt.x509.Restriction;
-import org.bouncycastle.asn1.x500.DirectoryString;
-
-public class RestrictionUnitTest
-    extends ASN1UnitTest
-{
-    public String getName()
-    {
-        return "Restriction";
-    }
-
-    public void performTest()
-        throws Exception
-    {
-        DirectoryString res = new DirectoryString("test");
-        Restriction restriction = new Restriction(res.getString());
-
-        checkConstruction(restriction, res);
-
-        try
-        {
-            Restriction.getInstance(new Object());
-
-            fail("getInstance() failed to detect bad object.");
-        }
-        catch (IllegalArgumentException e)
-        {
-            // expected
-        }
-    }
-
-    private void checkConstruction(
-        Restriction restriction,
-        DirectoryString res)
-        throws IOException
-    {
-        checkValues(restriction, res);
-
-        restriction = Restriction.getInstance(restriction);
-
-        checkValues(restriction, res);
-
-        ASN1InputStream aIn = new ASN1InputStream(restriction.toASN1Object().getEncoded());
-
-        ASN1String str = (ASN1String)aIn.readObject();
-
-        restriction = Restriction.getInstance(str);
-
-        checkValues(restriction, res);
-    }
-
-    private void checkValues(
-        Restriction restriction,
-        DirectoryString res)
-    {
-        checkMandatoryField("restriction", res, restriction.getRestriction());
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        runTest(new RestrictionUnitTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/test/SMIMETest.java b/bcprov/src/main/java/org/bouncycastle/asn1/test/SMIMETest.java
deleted file mode 100644
index 44d6b1c..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/test/SMIMETest.java
+++ /dev/null
@@ -1,109 +0,0 @@
-package org.bouncycastle.asn1.test;
-
-import java.io.ByteArrayInputStream;
-
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.DERGeneralizedTime;
-import org.bouncycastle.asn1.DEROctetString;
-import org.bouncycastle.asn1.cms.RecipientKeyIdentifier;
-import org.bouncycastle.asn1.smime.SMIMECapabilitiesAttribute;
-import org.bouncycastle.asn1.smime.SMIMECapability;
-import org.bouncycastle.asn1.smime.SMIMECapabilityVector;
-import org.bouncycastle.asn1.smime.SMIMEEncryptionKeyPreferenceAttribute;
-import org.bouncycastle.util.encoders.Base64;
-import org.bouncycastle.util.test.SimpleTestResult;
-import org.bouncycastle.util.test.Test;
-import org.bouncycastle.util.test.TestResult;
-
-public class SMIMETest
-    implements Test
-{
-    byte[] attrBytes = Base64.decode("MDQGCSqGSIb3DQEJDzEnMCUwCgYIKoZIhvcNAwcwDgYIKoZIhvcNAwICAgCAMAcGBSsOAwIH");
-    byte[] prefBytes = Base64.decode("MCwGCyqGSIb3DQEJEAILMR2hGwQIAAAAAAAAAAAYDzIwMDcwMzE1MTczNzI5Wg==");
-
-    private boolean isSameAs(
-        byte[]  a,
-        byte[]  b)
-    {
-        if (a.length != b.length)
-        {
-            return false;
-        }
-        
-        for (int i = 0; i != a.length; i++)
-        {
-            if (a[i] != b[i])
-            {
-                return false;
-            }
-        }
-        
-        return true;
-    }
-    
-    public TestResult perform()
-    {
-        SMIMECapabilityVector       caps = new SMIMECapabilityVector();
-                
-        caps.addCapability(SMIMECapability.dES_EDE3_CBC);
-        caps.addCapability(SMIMECapability.rC2_CBC, 128);
-        caps.addCapability(SMIMECapability.dES_CBC);
-                
-        SMIMECapabilitiesAttribute attr = new SMIMECapabilitiesAttribute(caps);
-        
-        SMIMEEncryptionKeyPreferenceAttribute   pref = new SMIMEEncryptionKeyPreferenceAttribute(
-                                                  new RecipientKeyIdentifier(new DEROctetString(new byte[8]), new DERGeneralizedTime("20070315173729Z"), null));
-        
-        try
-        {
-            if (!isSameAs(attr.getEncoded(), attrBytes))
-            {
-                return new SimpleTestResult(false, getName() + ": Failed attr data check");
-            }
-            
-            ByteArrayInputStream    bIn = new ByteArrayInputStream(attrBytes);
-            ASN1InputStream         aIn = new ASN1InputStream(bIn);
-            
-            ASN1Primitive o = aIn.readObject();
-            if (!attr.equals(o))
-            {
-                return new SimpleTestResult(false, getName() + ": Failed equality test for attr");
-            }
-            
-            if (!isSameAs(pref.getEncoded(), prefBytes))
-            {
-                return new SimpleTestResult(false, getName() + ": Failed attr data check");
-            }
-            
-            bIn = new ByteArrayInputStream(prefBytes);
-            aIn = new ASN1InputStream(bIn);
-            
-            o = aIn.readObject();
-            if (!pref.equals(o))
-            {
-                return new SimpleTestResult(false, getName() + ": Failed equality test for pref");
-            }
-            
-            return new SimpleTestResult(true, getName() + ": Okay");
-        }
-        catch (Exception e)
-        {
-            return new SimpleTestResult(false, getName() + ": Failed - exception " + e.toString(), e);
-        }
-    }
-
-    public String getName()
-    {
-        return "SMIME";
-    }
-
-    public static void main(
-        String[] args)
-    {
-        SMIMETest    test = new SMIMETest();
-        TestResult      result = test.perform();
-
-        System.out.println(result);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/test/SemanticsInformationUnitTest.java b/bcprov/src/main/java/org/bouncycastle/asn1/test/SemanticsInformationUnitTest.java
deleted file mode 100644
index 3fd26db..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/test/SemanticsInformationUnitTest.java
+++ /dev/null
@@ -1,135 +0,0 @@
-package org.bouncycastle.asn1.test;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.x509.GeneralName;
-import org.bouncycastle.asn1.x509.X509Name;
-import org.bouncycastle.asn1.x509.qualified.SemanticsInformation;
-import org.bouncycastle.util.test.SimpleTest;
-
-public class SemanticsInformationUnitTest 
-    extends SimpleTest
-{
-    public String getName()
-    {
-        return "SemanticsInformation";
-    }
-
-    public void performTest() 
-        throws Exception
-    {
-        ASN1ObjectIdentifier statementId = new ASN1ObjectIdentifier("1.1");
-        SemanticsInformation mv = new SemanticsInformation(statementId);
-
-        checkConstruction(mv, statementId, null);
-        
-        GeneralName[] names = new GeneralName[2];
-        
-        names[0] = new GeneralName(GeneralName.rfc822Name, "test@test.org");
-        names[1] = new GeneralName(new X509Name("cn=test"));
-        
-        mv = new SemanticsInformation(statementId, names);
-
-        checkConstruction(mv, statementId, names);
-        
-        mv = new SemanticsInformation(names);
-
-        checkConstruction(mv, null, names);
-        
-        mv = SemanticsInformation.getInstance(null);
-        
-        if (mv != null)
-        {
-            fail("null getInstance() failed.");
-        }
-        
-        try
-        {
-            SemanticsInformation.getInstance(new Object());
-            
-            fail("getInstance() failed to detect bad object.");
-        }
-        catch (IllegalArgumentException e)
-        {
-            // expected
-        }
-        
-        try
-        {
-            ASN1EncodableVector v = new ASN1EncodableVector();
-            
-            SemanticsInformation.getInstance(new DERSequence(v));
-            
-            fail("constructor failed to detect empty sequence.");
-        }
-        catch (IllegalArgumentException e)
-        {
-            // expected
-        }
-    }
-
-    private void checkConstruction(
-        SemanticsInformation mv,
-        ASN1ObjectIdentifier  semanticsIdentifier,
-        GeneralName[]        names)
-        throws Exception
-    {
-        checkStatement(mv, semanticsIdentifier, names);
-        
-        mv = SemanticsInformation.getInstance(mv);
-        
-        checkStatement(mv, semanticsIdentifier, names);
-        
-        ASN1InputStream aIn = new ASN1InputStream(mv.toASN1Object().getEncoded());
-        
-        ASN1Sequence seq = (ASN1Sequence)aIn.readObject();
-
-        mv = SemanticsInformation.getInstance(seq);
-        
-        checkStatement(mv, semanticsIdentifier, names);
-    }
-
-    private void checkStatement(
-        SemanticsInformation si,
-        ASN1ObjectIdentifier  id,
-        GeneralName[]        names)
-    {
-        if (id != null)
-        {
-            if (!si.getSemanticsIdentifier().equals(id))
-            {
-                fail("ids don't match.");
-            }
-        }
-        else if (si.getSemanticsIdentifier() != null)
-        {
-            fail("statementId found when none expected.");
-        }
-        
-        if (names != null)
-        {
-            GeneralName[] siNames = si.getNameRegistrationAuthorities();
-            
-            for (int i = 0; i != siNames.length; i++)
-            {
-                if (!names[i].equals(siNames[i]))
-                {
-                    fail("name registration authorities don't match.");
-                }
-            }
-        }
-        else if (si.getNameRegistrationAuthorities() != null)
-        {
-            fail("name registration authorities found when none expected.");
-        }
-    }
-    
-    public static void main(
-        String[]    args)
-    {
-        runTest(new SemanticsInformationUnitTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/test/SetTest.java b/bcprov/src/main/java/org/bouncycastle/asn1/test/SetTest.java
deleted file mode 100644
index 9e568a9..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/test/SetTest.java
+++ /dev/null
@@ -1,115 +0,0 @@
-package org.bouncycastle.asn1.test;
-
-import org.bouncycastle.asn1.ASN1Boolean;
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1Set;
-import org.bouncycastle.asn1.ASN1TaggedObject;
-import org.bouncycastle.asn1.BERSet;
-import org.bouncycastle.asn1.DERBitString;
-import org.bouncycastle.asn1.DEROctetString;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.DERSet;
-import org.bouncycastle.asn1.DERTaggedObject;
-import org.bouncycastle.util.test.SimpleTest;
-
-/**
- * Set sorting test example
- */
-public class SetTest
-    extends SimpleTest
-{
-
-    public String getName()
-    {
-        return "Set";
-    }
-
-    private void checkedSortedSet(int attempt, ASN1Set s)
-    {
-        if (s.getObjectAt(0) instanceof ASN1Boolean
-            && s.getObjectAt(1) instanceof ASN1Integer
-            && s.getObjectAt(2) instanceof DERBitString
-            && s.getObjectAt(3) instanceof DEROctetString)
-        {
-            return;
-        }
-
-        fail("sorting failed on attempt: " + attempt);
-    }
-
-    public void performTest()
-    {
-        ASN1EncodableVector v = new ASN1EncodableVector();
-        byte[] data = new byte[10];
-
-        v.add(new DEROctetString(data));
-        v.add(new DERBitString(data));
-        v.add(new ASN1Integer(100));
-        v.add(ASN1Boolean.getInstance(true));
-
-        checkedSortedSet(0, new DERSet(v));
-
-        v = new ASN1EncodableVector();
-        v.add(new ASN1Integer(100));
-        v.add(ASN1Boolean.getInstance(true));
-        v.add(new DEROctetString(data));
-        v.add(new DERBitString(data));
-
-        checkedSortedSet(1, new DERSet(v));
-
-        v = new ASN1EncodableVector();
-        v.add(ASN1Boolean.getInstance(true));
-        v.add(new DEROctetString(data));
-        v.add(new DERBitString(data));
-        v.add(new ASN1Integer(100));
-
-
-        checkedSortedSet(2, new DERSet(v));
-
-        v = new ASN1EncodableVector();
-        v.add(new DERBitString(data));
-        v.add(new DEROctetString(data));
-        v.add(new ASN1Integer(100));
-        v.add(ASN1Boolean.getInstance(true));
-
-        checkedSortedSet(3, new DERSet(v));
-
-        v = new ASN1EncodableVector();
-        v.add(new DEROctetString(data));
-        v.add(new DERBitString(data));
-        v.add(new ASN1Integer(100));
-        v.add(ASN1Boolean.getInstance(true));
-
-        ASN1Set s = new BERSet(v);
-
-        if (!(s.getObjectAt(0) instanceof DEROctetString))
-        {
-            fail("BER set sort order changed.");
-        }
-
-        // create an implicitly tagged "set" without sorting
-        ASN1TaggedObject tag = new DERTaggedObject(false, 1, new DERSequence(v));
-        s = ASN1Set.getInstance(tag, false);
-
-        if (s.getObjectAt(0) instanceof ASN1Boolean)
-        {
-            fail("sorted when shouldn't be.");
-        }
-
-        // equality test
-        v = new ASN1EncodableVector();
-
-        v.add(ASN1Boolean.getInstance(true));
-        v.add(ASN1Boolean.getInstance(true));
-        v.add(ASN1Boolean.getInstance(true));
-
-        s = new DERSet(v);
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        runTest(new SetTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/test/SignerLocationUnitTest.java b/bcprov/src/main/java/org/bouncycastle/asn1/test/SignerLocationUnitTest.java
deleted file mode 100644
index 8d2c2c0..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/test/SignerLocationUnitTest.java
+++ /dev/null
@@ -1,197 +0,0 @@
-package org.bouncycastle.asn1.test;
-
-import java.io.IOException;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.DERTaggedObject;
-import org.bouncycastle.asn1.DERUTF8String;
-import org.bouncycastle.asn1.esf.SignerLocation;
-import org.bouncycastle.util.test.SimpleTest;
-
-public class SignerLocationUnitTest 
-    extends SimpleTest
-{
-    public String getName()
-    {
-        return "SignerLocation";
-    }
-
-    public void performTest() 
-        throws Exception
-    {
-        DERUTF8String countryName = new DERUTF8String("Australia");
-        
-        SignerLocation sl = new SignerLocation(countryName, null, null);
-
-        checkConstruction(sl, countryName, null, null);
-
-        DERUTF8String localityName = new DERUTF8String("Melbourne");
-        
-        sl = new SignerLocation(null, localityName, null);
-
-        checkConstruction(sl, null, localityName, null);
-        
-        sl = new SignerLocation(countryName, localityName, null);
-
-        checkConstruction(sl, countryName, localityName, null);
-        
-        ASN1EncodableVector v = new ASN1EncodableVector();
-        
-        v.add(new DERUTF8String("line 1"));
-        v.add(new DERUTF8String("line 2"));
-        
-        ASN1Sequence postalAddress = new DERSequence(v);
-        
-        sl = new SignerLocation(null, null, postalAddress);
-        
-        checkConstruction(sl, null, null, postalAddress);
-        
-        sl = new SignerLocation(countryName, null, postalAddress);
-        
-        checkConstruction(sl, countryName, null, postalAddress);
-        
-        sl = new SignerLocation(countryName, localityName, postalAddress);
-        
-        checkConstruction(sl, countryName, localityName, postalAddress);
-        
-        sl = SignerLocation.getInstance(null);
-        
-        if (sl != null)
-        {
-            fail("null getInstance() failed.");
-        }
-        
-        try
-        {
-            SignerLocation.getInstance(new Object());
-            
-            fail("getInstance() failed to detect bad object.");
-        }
-        catch (IllegalArgumentException e)
-        {
-            // expected
-        }
-      
-        //
-        // out of range postal address
-        //
-        v = new ASN1EncodableVector();
-        
-        v.add(new DERUTF8String("line 1"));
-        v.add(new DERUTF8String("line 2"));
-        v.add(new DERUTF8String("line 3"));
-        v.add(new DERUTF8String("line 4"));
-        v.add(new DERUTF8String("line 5"));
-        v.add(new DERUTF8String("line 6"));
-        v.add(new DERUTF8String("line 7"));
-        
-        postalAddress = new DERSequence(v);
-        
-        try
-        {
-            new SignerLocation(null, null, postalAddress);
-            
-            fail("constructor failed to detect bad postalAddress.");
-        }
-        catch (IllegalArgumentException e)
-        {
-            // expected
-        }
-        
-        try
-        {
-            SignerLocation.getInstance(new DERSequence(new DERTaggedObject(2, postalAddress)));
-            
-            fail("sequence constructor failed to detect bad postalAddress.");
-        }
-        catch (IllegalArgumentException e)
-        {
-            // expected
-        }
-        
-        try
-        {
-            SignerLocation.getInstance(new DERSequence(new DERTaggedObject(5, postalAddress)));
-            
-            fail("sequence constructor failed to detect bad tag.");
-        }
-        catch (IllegalArgumentException e)
-        {
-            // expected
-        }
-    }
-
-    private void checkConstruction(
-        SignerLocation sl,
-        DERUTF8String  countryName,
-        DERUTF8String  localityName,
-        ASN1Sequence   postalAddress) 
-        throws IOException
-    {
-        checkValues(sl, countryName, localityName, postalAddress);
-        
-        sl = SignerLocation.getInstance(sl);
-        
-        checkValues(sl, countryName, localityName, postalAddress);
-        
-        ASN1InputStream aIn = new ASN1InputStream(sl.toASN1Object().getEncoded());
-
-        ASN1Sequence seq = (ASN1Sequence)aIn.readObject();
-        
-        sl = SignerLocation.getInstance(seq);
-        
-        checkValues(sl, countryName, localityName, postalAddress);
-    }
-    
-    private void checkValues(
-        SignerLocation sl,
-        DERUTF8String  countryName,
-        DERUTF8String  localityName,
-        ASN1Sequence   postalAddress)
-    {
-        if (countryName != null)
-        {
-            if (!countryName.equals(sl.getCountryName()))
-            {
-                fail("countryNames don't match.");
-            }
-        }
-        else if (sl.getCountryName() != null)
-        {
-            fail("countryName found when none expected.");
-        }
-        
-        if (localityName != null)
-        {
-            if (!localityName.equals(sl.getLocalityName()))
-            {
-                fail("localityNames don't match.");
-            }
-        }
-        else if (sl.getLocalityName() != null)
-        {
-            fail("localityName found when none expected.");
-        }
-        
-        if (postalAddress != null)
-        {
-            if (!postalAddress.equals(sl.getPostalAddress()))
-            {
-                fail("postalAddresses don't match.");
-            }
-        }
-        else if (sl.getPostalAddress() != null)
-        {
-            fail("postalAddress found when none expected.");
-        }
-    }
-    
-    public static void main(
-        String[]    args)
-    {
-        runTest(new SignerLocationUnitTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/test/StringTest.java b/bcprov/src/main/java/org/bouncycastle/asn1/test/StringTest.java
deleted file mode 100644
index 426c06a..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/test/StringTest.java
+++ /dev/null
@@ -1,161 +0,0 @@
-package org.bouncycastle.asn1.test;
-
-import java.io.IOException;
-
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1String;
-import org.bouncycastle.asn1.DERBMPString;
-import org.bouncycastle.asn1.DERBitString;
-import org.bouncycastle.asn1.DERGeneralString;
-import org.bouncycastle.asn1.DERIA5String;
-import org.bouncycastle.asn1.DERNumericString;
-import org.bouncycastle.asn1.DERPrintableString;
-import org.bouncycastle.asn1.DERT61String;
-import org.bouncycastle.asn1.DERUTF8String;
-import org.bouncycastle.asn1.DERUniversalString;
-import org.bouncycastle.asn1.DERVisibleString;
-import org.bouncycastle.util.Strings;
-import org.bouncycastle.util.test.SimpleTest;
-
-/**
- * X.690 test example
- */
-public class StringTest
-    extends SimpleTest
-{
-    public String getName()
-    {
-        return "String";
-    }
-
-    public void performTest()
-        throws IOException
-    {
-        DERBitString bs = new DERBitString(
-            new byte[] { (byte)0x01,(byte)0x23,(byte)0x45,(byte)0x67,(byte)0x89,(byte)0xab,(byte)0xcd,(byte)0xef });
-
-        if (!bs.getString().equals("#0309000123456789ABCDEF"))
-        {
-            fail("DERBitString.getString() result incorrect");
-        }
-
-        if (!bs.toString().equals("#0309000123456789ABCDEF"))
-        {
-            fail("DERBitString.toString() result incorrect");
-        }
-
-        bs = new DERBitString(
-            new byte[] { (byte)0xfe,(byte)0xdc,(byte)0xba,(byte)0x98,(byte)0x76,(byte)0x54,(byte)0x32,(byte)0x10 });
-
-        if (!bs.getString().equals("#030900FEDCBA9876543210"))
-        {
-            fail("DERBitString.getString() result incorrect");
-        }
-
-        if (!bs.toString().equals("#030900FEDCBA9876543210"))
-        {
-            fail("DERBitString.toString() result incorrect");
-        }
-
-        DERUniversalString us = new DERUniversalString(
-            new byte[] { (byte)0x01,(byte)0x23,(byte)0x45,(byte)0x67,(byte)0x89,(byte)0xab,(byte)0xcd,(byte)0xef });
-
-        if (!us.getString().equals("#1C080123456789ABCDEF"))
-        {
-            fail("DERUniversalString.getString() result incorrect");
-        }
-
-        if (!us.toString().equals("#1C080123456789ABCDEF"))
-        {
-            fail("DERUniversalString.toString() result incorrect");
-        }
-
-        us = new DERUniversalString(
-            new byte[] { (byte)0xfe,(byte)0xdc,(byte)0xba,(byte)0x98,(byte)0x76,(byte)0x54,(byte)0x32,(byte)0x10 });
-
-        if (!us.getString().equals("#1C08FEDCBA9876543210"))
-        {
-            fail("DERUniversalString.getString() result incorrect");
-        }
-
-        if (!us.toString().equals("#1C08FEDCBA9876543210"))
-        {
-            fail("DERUniversalString.toString() result incorrect");
-        }
-
-        byte[] t61Bytes = new byte[] { -1, -2, -3, -4, -5, -6, -7, -8 };
-        String t61String = new String(t61Bytes, "iso-8859-1");
-        DERT61String t61 = new DERT61String(Strings.fromByteArray(t61Bytes));
-
-        if (!t61.getString().equals(t61String))
-        {
-            fail("DERT61String.getString() result incorrect");
-        }
-
-        if (!t61.toString().equals(t61String))
-        {
-            fail("DERT61String.toString() result incorrect");
-        }
-
-        char[] shortChars = new char[] { 'a', 'b', 'c', 'd', 'e'};
-        char[] longChars = new char[1000];
-
-        for (int i = 0; i != longChars.length; i++)
-        {
-            longChars[i] = 'X';
-        }
-
-        checkString(new DERBMPString(new String(shortChars)), new DERBMPString(new String(longChars)));
-        checkString(new DERUTF8String(new String(shortChars)), new DERUTF8String(new String(longChars)));
-        checkString(new DERIA5String(new String(shortChars)), new DERIA5String(new String(longChars)));
-        checkString(new DERPrintableString(new String(shortChars)), new DERPrintableString(new String(longChars)));
-        checkString(new DERVisibleString(new String(shortChars)), new DERVisibleString(new String(longChars)));
-        checkString(new DERGeneralString(new String(shortChars)), new DERGeneralString(new String(longChars)));
-        checkString(new DERT61String(new String(shortChars)), new DERT61String(new String(longChars)));
-
-        shortChars = new char[] { '1', '2', '3', '4', '5'};
-        longChars = new char[1000];
-
-        for (int i = 0; i != longChars.length; i++)
-        {
-            longChars[i] = '1';
-        }
-
-        checkString(new DERNumericString(new String(shortChars)), new DERNumericString(new String(longChars)));
-
-        byte[] shortBytes = new byte[] { (byte)'a', (byte)'b', (byte)'c', (byte)'d', (byte)'e'};
-        byte[] longBytes = new byte[1000];
-
-        for (int i = 0; i != longChars.length; i++)
-        {
-            longBytes[i] = (byte)'X';
-        }
-
-        checkString(new DERUniversalString(shortBytes), new DERUniversalString(longBytes));
-
-    }
-
-    private void checkString(ASN1String shortString, ASN1String longString)
-        throws IOException
-    {
-        ASN1String short2 = (ASN1String)ASN1Primitive.fromByteArray(((ASN1Primitive)shortString).getEncoded());
-
-        if (!shortString.toString().equals(short2.toString()))
-        {
-            fail(short2.getClass().getName() + " shortBytes result incorrect");
-        }
-
-        ASN1String long2 = (ASN1String)ASN1Primitive.fromByteArray(((ASN1Primitive)longString).getEncoded());
-
-        if (!longString.toString().equals(long2.toString()))
-        {
-            fail(long2.getClass().getName() + " longBytes result incorrect");
-        }
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        runTest(new StringTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/test/SubjectKeyIdentifierTest.java b/bcprov/src/main/java/org/bouncycastle/asn1/test/SubjectKeyIdentifierTest.java
deleted file mode 100644
index 9887a31..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/test/SubjectKeyIdentifierTest.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package org.bouncycastle.asn1.test;
-
-import java.io.IOException;
-
-import org.bouncycastle.util.encoders.Base64;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-
-public class SubjectKeyIdentifierTest
-    extends SimpleTest
-{
-    private static byte[] pubKeyInfo = Base64.decode(
-        "MFgwCwYJKoZIhvcNAQEBA0kAMEYCQQC6wMMmHYMZszT/7bNFMn+gaZoiWJLVP8ODRuu1C2jeAe" +
-        "QpxM+5Oe7PaN2GNy3nBE4EOYkB5pMJWA0y9n04FX8NAgED");
-
-    private static byte[] shaID = Hex.decode("d8128a06d6c2feb0865994a2936e7b75b836a021");
-    private static byte[] shaTruncID = Hex.decode("436e7b75b836a021");
-
-    public String getName()
-    {
-        return "SubjectKeyIdentifier";
-    }
-
-    public void performTest()
-        throws IOException
-    {
-//        SubjectPublicKeyInfo pubInfo = SubjectPublicKeyInfo.getInstance(ASN1Primitive.fromByteArray(pubKeyInfo));
-//        SubjectKeyIdentifier ski = SubjectKeyIdentifier.createSHA1KeyIdentifier(pubInfo);
-//
-//        if (!Arrays.areEqual(shaID, ski.getKeyIdentifier()))
-//        {
-//            fail("SHA-1 ID does not match");
-//        }
-//
-//        ski = SubjectKeyIdentifier.createTruncatedSHA1KeyIdentifier(pubInfo);
-//
-//        if (!Arrays.areEqual(shaTruncID, ski.getKeyIdentifier()))
-//        {
-//            fail("truncated SHA-1 ID does not match");
-//        }
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        runTest(new SubjectKeyIdentifierTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/test/TagTest.java b/bcprov/src/main/java/org/bouncycastle/asn1/test/TagTest.java
deleted file mode 100644
index 90489a7..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/test/TagTest.java
+++ /dev/null
@@ -1,113 +0,0 @@
-package org.bouncycastle.asn1.test;
-
-import java.io.IOException;
-import java.security.SecureRandom;
-
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1TaggedObject;
-import org.bouncycastle.asn1.DERApplicationSpecific;
-import org.bouncycastle.util.encoders.Base64;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-
-
-/**
- * X.690 test example
- */
-public class TagTest
-    extends SimpleTest
-{
-    byte[] longTagged = Base64.decode(
-                  "ZSRzIp8gEEZFRENCQTk4NzY1NDMyMTCfIQwyMDA2MDQwMTEyMzSUCCAFERVz"
-                + "A4kCAHEXGBkalAggBRcYGRqUCCAFZS6QAkRFkQlURUNITklLRVKSBQECAwQF"
-                + "kxAREhMUFRYXGBkalAggBREVcwOJAgBxFxgZGpQIIAUXGBkalAggBWUukAJE"
-                + "RZEJVEVDSE5JS0VSkgUBAgMEBZMQERITFBUWFxgZGpQIIAURFXMDiQIAcRcY"
-                + "GRqUCCAFFxgZGpQIIAVlLpACREWRCVRFQ0hOSUtFUpIFAQIDBAWTEBESExQV"
-                + "FhcYGRqUCCAFERVzA4kCAHEXGBkalAggBRcYGRqUCCAFFxgZGpQIIAUXGBka"
-                + "lAg=");
-
-    byte[] longAppSpecificTag = Hex.decode("5F610101");
-
-    public String getName()
-    {
-        return "Tag";
-    }
-    
-    public void performTest()
-        throws IOException
-    {
-        ASN1InputStream aIn = new ASN1InputStream(longTagged);
-
-        DERApplicationSpecific app = (DERApplicationSpecific)aIn.readObject();
-        
-        aIn = new ASN1InputStream(app.getContents());
-
-        app = (DERApplicationSpecific)aIn.readObject();
-
-        aIn = new ASN1InputStream(app.getContents());
-
-        ASN1TaggedObject tagged = (ASN1TaggedObject)aIn.readObject();
-
-        if (tagged.getTagNo() != 32)
-        {
-            fail("unexpected tag value found - not 32");
-        }
-
-        tagged = (ASN1TaggedObject)ASN1Primitive.fromByteArray(tagged.getEncoded());
-
-        if (tagged.getTagNo() != 32)
-        {
-            fail("unexpected tag value found on recode - not 32");
-        }
-
-        tagged = (ASN1TaggedObject)aIn.readObject();
-
-        if (tagged.getTagNo() != 33)
-        {
-            fail("unexpected tag value found - not 33");
-        }
-
-        tagged = (ASN1TaggedObject)ASN1Primitive.fromByteArray(tagged.getEncoded());
-
-        if (tagged.getTagNo() != 33)
-        {
-            fail("unexpected tag value found on recode - not 33");
-        }
-
-        aIn = new ASN1InputStream(longAppSpecificTag);
-
-        app = (DERApplicationSpecific)aIn.readObject();
-
-        if (app.getApplicationTag() != 97)
-        {
-            fail("incorrect tag number read");
-        }
-
-        app = (DERApplicationSpecific)ASN1Primitive.fromByteArray(app.getEncoded());
-
-        if (app.getApplicationTag() != 97)
-        {
-            fail("incorrect tag number read on recode");
-        }
-
-        SecureRandom sr = new SecureRandom();
-        for (int i = 0; i < 100; ++i)
-        {
-            int testTag = sr.nextInt() >>> (1 + (sr.nextInt() >>> 1) % 26);
-            app = new DERApplicationSpecific(testTag, new byte[]{ 1 });
-            app = (DERApplicationSpecific)ASN1Primitive.fromByteArray(app.getEncoded());
-
-            if (app.getApplicationTag() != testTag)
-            {
-                fail("incorrect tag number read on recode (random test value: " + testTag + ")");
-            }
-        }
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        runTest(new TagTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/test/TargetInformationTest.java b/bcprov/src/main/java/org/bouncycastle/asn1/test/TargetInformationTest.java
deleted file mode 100644
index 34dc70f..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/test/TargetInformationTest.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package org.bouncycastle.asn1.test;
-
-import org.bouncycastle.asn1.x509.GeneralName;
-import org.bouncycastle.asn1.x509.Target;
-import org.bouncycastle.asn1.x509.TargetInformation;
-import org.bouncycastle.asn1.x509.Targets;
-import org.bouncycastle.util.test.SimpleTest;
-
-public class TargetInformationTest
-    extends SimpleTest
-{
-
-    public String getName()
-    {
-        return "TargetInformation";
-    }
-
-    public void performTest() throws Exception
-    {
-        Target[] targets = new Target[2];
-        Target targetName = new Target(Target.targetName, new GeneralName(GeneralName.dNSName, "www.test.com"));
-        Target targetGroup = new Target(Target.targetGroup, new GeneralName(GeneralName.directoryName, "o=Test, ou=Test"));
-        targets[0] = targetName;
-        targets[1] = targetGroup;
-        Targets targetss = new Targets(targets);
-        TargetInformation targetInformation1 = new TargetInformation(targetss);
-        // use an Target array
-        TargetInformation targetInformation2 = new TargetInformation(targets);
-        // targetInformation1 and targetInformation2 must have same
-        // encoding.
-        if (!targetInformation1.equals(targetInformation2))
-        {
-            fail("targetInformation1 and targetInformation2 should have the same encoding.");
-        }
-        TargetInformation targetInformation3 = TargetInformation.getInstance(targetInformation1);
-        TargetInformation targetInformation4 = TargetInformation.getInstance(targetInformation2);
-        if (!targetInformation3.equals(targetInformation4))
-        {
-            fail("targetInformation3 and targetInformation4 should have the same encoding.");
-        }
-    }
-
-    public static void main(String[] args)
-    {
-        runTest(new TargetInformationTest());
-    }
-}
-
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/test/TypeOfBiometricDataUnitTest.java b/bcprov/src/main/java/org/bouncycastle/asn1/test/TypeOfBiometricDataUnitTest.java
deleted file mode 100644
index add21ce..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/test/TypeOfBiometricDataUnitTest.java
+++ /dev/null
@@ -1,144 +0,0 @@
-package org.bouncycastle.asn1.test;
-
-import java.io.IOException;
-
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.x509.qualified.TypeOfBiometricData;
-import org.bouncycastle.util.test.SimpleTest;
-
-public class TypeOfBiometricDataUnitTest 
-    extends SimpleTest
-{
-    public String getName()
-    {
-        return "TypeOfBiometricData";
-    }
-
-    public void performTest() 
-        throws Exception
-    {
-        //
-        // predefined
-        //
-        checkPredefinedType(TypeOfBiometricData.PICTURE);
-        
-        checkPredefinedType(TypeOfBiometricData.HANDWRITTEN_SIGNATURE);
-        
-        //
-        // non-predefined
-        //
-        ASN1ObjectIdentifier localType = new ASN1ObjectIdentifier("1.1");
-        
-        TypeOfBiometricData type = new TypeOfBiometricData(localType);
-
-        checkNonPredefined(type, localType);
-        
-        type = TypeOfBiometricData.getInstance(type);
-        
-        checkNonPredefined(type, localType);
-        
-        ASN1Primitive obj = type.toASN1Primitive();
-        
-        type = TypeOfBiometricData.getInstance(obj);
-        
-        checkNonPredefined(type, localType);
-        
-        type = TypeOfBiometricData.getInstance(null);
-        
-        if (type != null)
-        {
-            fail("null getInstance() failed.");
-        }
-        
-        try
-        {
-            TypeOfBiometricData.getInstance(new Object());
-            
-            fail("getInstance() failed to detect bad object.");
-        }
-        catch (IllegalArgumentException e)
-        {
-            // expected
-        }
-        
-        try
-        {
-            new TypeOfBiometricData(100);
-            
-            fail("constructor failed to detect bad predefined type.");
-        }
-        catch (IllegalArgumentException e)
-        {
-            // expected
-        }
-        
-        if (TypeOfBiometricData.PICTURE != 0)
-        {
-            fail("predefined picture should be 0");
-        }
-        
-        if (TypeOfBiometricData.HANDWRITTEN_SIGNATURE != 1)
-        {
-            fail("predefined handwritten signature should be 1");
-        }
-    }
-
-    private void checkPredefinedType(
-        int predefinedType)
-        throws IOException
-    {
-        TypeOfBiometricData type = new TypeOfBiometricData(predefinedType);
-
-        checkPredefined(type, predefinedType);
-        
-        type = TypeOfBiometricData.getInstance(type);
-        
-        checkPredefined(type, predefinedType);
-        
-        ASN1InputStream aIn = new ASN1InputStream(type.toASN1Object().getEncoded());
-
-        ASN1Primitive obj = aIn.readObject();
-
-        type = TypeOfBiometricData.getInstance(obj);
-        
-        checkPredefined(type, predefinedType);
-    }
-
-    private void checkPredefined(
-        TypeOfBiometricData type,
-        int                 value)
-    {
-        if (!type.isPredefined())
-        {
-            fail("predefined type expected but not found.");
-        }
-        
-        if (type.getPredefinedBiometricType() != value)
-        {
-            fail("predefined type does not match.");
-        }
-    }
-    
-    private void checkNonPredefined(
-        TypeOfBiometricData type,
-        ASN1ObjectIdentifier value)
-    {
-        if (type.isPredefined())
-        {
-            fail("predefined type found when not expected.");
-        }
-        
-        if (!type.getBiometricDataOid().equals(value))
-        {
-            fail("data oid does not match.");
-        }
-    }
-    
-    public static void main(
-        String[]    args)
-    {
-        runTest(new TypeOfBiometricDataUnitTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/test/UTCTimeTest.java b/bcprov/src/main/java/org/bouncycastle/asn1/test/UTCTimeTest.java
deleted file mode 100644
index 8067e78..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/test/UTCTimeTest.java
+++ /dev/null
@@ -1,108 +0,0 @@
-package org.bouncycastle.asn1.test;
-
-import org.bouncycastle.asn1.DERUTCTime;
-import org.bouncycastle.util.test.SimpleTest;
-
-import java.text.SimpleDateFormat;
-import java.util.SimpleTimeZone;
-
-/**
- * X.690 test example
- */
-public class UTCTimeTest
-    extends SimpleTest
-{
-    String[] input =
-        {
-            "020122122220Z",
-            "020122122220-1000",
-            "020122122220+1000",
-            "020122122220+00",
-            "0201221222Z",
-            "0201221222-1000",
-            "0201221222+1000",
-            "0201221222+00",
-            "550122122220Z",
-            "5501221222Z"
-        };
-
-    String[] output = {
-            "20020122122220GMT+00:00",
-            "20020122122220GMT-10:00",
-            "20020122122220GMT+10:00",
-            "20020122122220GMT+00:00",
-            "20020122122200GMT+00:00",
-            "20020122122200GMT-10:00",
-            "20020122122200GMT+10:00",
-            "20020122122200GMT+00:00",
-            "19550122122220GMT+00:00",
-            "19550122122200GMT+00:00"
-             };
-
-    String[] zOutput1 = {
-            "20020122122220Z",
-            "20020122222220Z",
-            "20020122022220Z",
-            "20020122122220Z",
-            "20020122122200Z",
-            "20020122222200Z",
-            "20020122022200Z",
-            "20020122122200Z",
-            "19550122122220Z",
-            "19550122122200Z"
-    };
-
-    String[] zOutput2 = {
-            "20020122122220Z",
-            "20020122222220Z",
-            "20020122022220Z",
-            "20020122122220Z",
-            "20020122122200Z",
-            "20020122222200Z",
-            "20020122022200Z",
-            "20020122122200Z",
-            "19550122122220Z",
-            "19550122122200Z"
-    };
-
-    public String getName()
-    {
-        return "UTCTime";
-    }
-
-    public void performTest()
-        throws Exception
-    {
-        SimpleDateFormat yyyyF = new SimpleDateFormat("yyyyMMddHHmmss'Z'");
-        SimpleDateFormat yyF = new SimpleDateFormat("yyyyMMddHHmmss'Z'");
-
-        yyyyF.setTimeZone(new SimpleTimeZone(0,"Z"));
-        yyF.setTimeZone(new SimpleTimeZone(0,"Z"));
-
-        for (int i = 0; i != input.length; i++)
-        {
-            DERUTCTime t = new DERUTCTime(input[i]);
-
-            if (!t.getAdjustedTime().equals(output[i]))
-            {
-                fail("failed conversion test " + i);
-            }
-
-            if (!yyyyF.format(t.getAdjustedDate()).equals(zOutput1[i]))
-            {
-                fail("failed date conversion test " + i);
-            }
-
-            if (!yyF.format(t.getDate()).equals(zOutput2[i]))
-            {
-                fail("failed date shortened conversion test " + i);
-            }
-        }
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        runTest(new UTCTimeTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/test/X500NameTest.java b/bcprov/src/main/java/org/bouncycastle/asn1/test/X500NameTest.java
deleted file mode 100644
index 2822f8c..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/test/X500NameTest.java
+++ /dev/null
@@ -1,777 +0,0 @@
-package org.bouncycastle.asn1.test;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1GeneralizedTime;
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1OutputStream;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.ASN1Set;
-import org.bouncycastle.asn1.ASN1String;
-import org.bouncycastle.asn1.ASN1TaggedObject;
-import org.bouncycastle.asn1.DERIA5String;
-import org.bouncycastle.asn1.DERPrintableString;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.DERSet;
-import org.bouncycastle.asn1.DERTaggedObject;
-import org.bouncycastle.asn1.DERUTF8String;
-import org.bouncycastle.asn1.x500.RDN;
-import org.bouncycastle.asn1.x500.X500Name;
-import org.bouncycastle.asn1.x500.X500NameBuilder;
-import org.bouncycastle.asn1.x500.style.BCStrictStyle;
-import org.bouncycastle.asn1.x500.style.BCStyle;
-import org.bouncycastle.asn1.x500.style.IETFUtils;
-import org.bouncycastle.asn1.x509.X509DefaultEntryConverter;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-
-public class X500NameTest
-    extends SimpleTest
-{
-   String[] subjects =
-   {
-       "C=AU,ST=Victoria,L=South Melbourne,O=Connect 4 Pty Ltd,OU=Webserver Team,CN=www2.connect4.com.au,E=webmaster@connect4.com.au",
-       "C=AU,ST=Victoria,L=South Melbourne,O=Connect 4 Pty Ltd,OU=Certificate Authority,CN=Connect 4 CA,E=webmaster@connect4.com.au",
-       "C=AU,ST=QLD,CN=SSLeay/rsa test cert",
-       "C=US,O=National Aeronautics and Space Administration,SERIALNUMBER=16+CN=Steve Schoch",
-       "E=cooke@issl.atl.hp.com,C=US,OU=Hewlett Packard Company (ISSL),CN=Paul A. Cooke",
-       "O=Sun Microsystems Inc,CN=store.sun.com",
-       "unstructuredAddress=192.168.1.33,unstructuredName=pixfirewall.ciscopix.com,CN=pixfirewall.ciscopix.com",
-       "CN=*.canal-plus.com,OU=Provided by TBS INTERNET http://www.tbs-certificats.com/,OU=\\ CANAL \\+,O=CANAL\\+DISTRIBUTION,L=issy les moulineaux,ST=Hauts de Seine,C=FR",
-       "O=Bouncy Castle,CN=www.bouncycastle.org\\ ",
-       "O=Bouncy Castle,CN=c:\\\\fred\\\\bob",
-    };
-
-    String[] hexSubjects =
-    {
-        "CN=\\20Test\\20X,O=\\20Test,C=GB",    // input
-        "CN=\\ Test X,O=\\ Test,C=GB",          // expected
-        "CN=\\20Test\\20X\\20,O=\\20Test,C=GB",    // input
-        "CN=\\ Test X\\ ,O=\\ Test,C=GB"          // expected
-    };
-
-    public String getName()
-    {
-        return "X500Name";
-    }
-    
-    private static X500Name fromBytes(
-        byte[]  bytes) 
-        throws IOException
-    {
-        return X500Name.getInstance(new ASN1InputStream(new ByteArrayInputStream(bytes)).readObject());
-    }
-
-    private ASN1Encodable createEntryValue(ASN1ObjectIdentifier oid, String value)
-    {
-        X500NameBuilder builder = new X500NameBuilder(BCStyle.INSTANCE);
-
-        builder.addRDN(oid, value);
-        
-        X500Name name = builder.build();
-
-        ASN1Sequence seq = (ASN1Sequence)name.toASN1Primitive();
-        ASN1Set set = ASN1Set.getInstance(seq.getObjectAt(0).toASN1Primitive());
-        seq = (ASN1Sequence)set.getObjectAt(0);
-
-        return seq.getObjectAt(1);
-    }
-
-    private ASN1Encodable createEntryValueFromString(ASN1ObjectIdentifier oid, String value)
-    {
-        X500NameBuilder builder = new X500NameBuilder(BCStyle.INSTANCE);
-
-        builder.addRDN(oid, value);
-
-        X500Name name = new X500Name(builder.build().toString());
-
-        ASN1Sequence seq = (ASN1Sequence)name.toASN1Primitive();
-        ASN1Set set = ASN1Set.getInstance(seq.getObjectAt(0).toASN1Primitive());
-        seq = (ASN1Sequence)set.getObjectAt(0);
-
-        return seq.getObjectAt(1);
-    }
-
-    private void testEncodingPrintableString(ASN1ObjectIdentifier oid, String value)
-    {
-        ASN1Encodable converted = createEntryValue(oid, value);
-        if (!(converted instanceof DERPrintableString))
-        {
-            fail("encoding for " + oid + " not printable string");
-        }
-    }
-
-    private void testEncodingIA5String(ASN1ObjectIdentifier oid, String value)
-    {
-        ASN1Encodable converted = createEntryValue(oid, value);
-        if (!(converted instanceof DERIA5String))
-        {
-            fail("encoding for " + oid + " not IA5String");
-        }
-    }
-
-    private void testEncodingUTF8String(ASN1ObjectIdentifier oid, String value)
-        throws IOException
-    {
-        ASN1Encodable converted = createEntryValue(oid, value);
-        if (!(converted instanceof DERUTF8String))
-        {
-            fail("encoding for " + oid + " not IA5String");
-        }
-        if (!value.equals((DERUTF8String.getInstance(converted.toASN1Primitive().getEncoded()).getString())))
-        {
-            fail("decoding not correct");
-        }
-    }
-
-    private void testEncodingGeneralizedTime(ASN1ObjectIdentifier oid, String value)
-    {
-        ASN1Encodable converted = createEntryValue(oid, value);
-        if (!(converted instanceof ASN1GeneralizedTime))
-        {
-            fail("encoding for " + oid + " not GeneralizedTime");
-        }
-        converted = createEntryValueFromString(oid, value);
-        if (!(converted instanceof ASN1GeneralizedTime))
-        {
-            fail("encoding for " + oid + " not GeneralizedTime");
-        }
-    }
-
-    public void performTest()
-        throws Exception
-    {
-        ietfUtilsTest();
-
-        testEncodingPrintableString(BCStyle.C, "AU");
-        testEncodingPrintableString(BCStyle.SERIALNUMBER, "123456");
-        testEncodingPrintableString(BCStyle.DN_QUALIFIER, "123456");
-        testEncodingIA5String(BCStyle.EmailAddress, "test@test.com");
-        testEncodingIA5String(BCStyle.DC, "test");
-        // correct encoding
-        testEncodingGeneralizedTime(BCStyle.DATE_OF_BIRTH, "#180F32303032303132323132323232305A");
-        // compatibility encoding
-        testEncodingGeneralizedTime(BCStyle.DATE_OF_BIRTH, "20020122122220Z");
-        testEncodingUTF8String(BCStyle.CN, "Mörsky");
-
-        //
-        // composite
-        //
-        X500NameBuilder builder = new X500NameBuilder(BCStyle.INSTANCE);
-
-        builder.addRDN(BCStyle.C, "AU");
-        builder.addRDN(BCStyle.O, "The Legion of the Bouncy Castle");
-        builder.addRDN(BCStyle.L, "Melbourne");
-        builder.addRDN(BCStyle.ST, "Victoria");
-        builder.addRDN(BCStyle.E, "feedback-crypto@bouncycastle.org");
-
-        X500Name    name1 = builder.build();
-
-        if (!name1.equals(name1))
-        {
-            fail("Failed same object test");
-        }
-
-//        if (!name1.equals(name1, true))
-//        {
-//            fail("Failed same object test - in Order");
-//        }
-
-        builder = new X500NameBuilder(BCStyle.INSTANCE);
-
-        builder.addRDN(BCStyle.C, "AU");
-        builder.addRDN(BCStyle.O, "The Legion of the Bouncy Castle");
-        builder.addRDN(BCStyle.L, "Melbourne");
-        builder.addRDN(BCStyle.ST, "Victoria");
-        builder.addRDN(BCStyle.E, "feedback-crypto@bouncycastle.org");
-
-        X500Name    name2 = builder.build();
-
-        if (!name1.equals(name2))
-        {
-            fail("Failed same name test");
-        }
-
-//        if (!name1.equals(name2, true))
-//        {
-//            fail("Failed same name test - in Order");
-//        }
-
-        if (name1.hashCode() != name2.hashCode())
-        {
-            fail("Failed same name test - in Order");
-        }
-
-        X500NameBuilder builder1 = new X500NameBuilder(BCStyle.INSTANCE);
-
-        builder.addRDN(BCStyle.C, "AU");
-        builder.addRDN(BCStyle.O, "The Legion of the Bouncy Castle");
-        builder.addRDN(BCStyle.L, "Melbourne");
-        builder.addRDN(BCStyle.ST, "Victoria");
-        builder.addRDN(BCStyle.E, "feedback-crypto@bouncycastle.org");
-
-        X500NameBuilder builder2 = new X500NameBuilder(BCStyle.INSTANCE);
-
-        builder.addRDN(BCStyle.E, "feedback-crypto@bouncycastle.org");
-        builder.addRDN(BCStyle.C, "AU");
-        builder.addRDN(BCStyle.O, "The Legion of the Bouncy Castle");
-        builder.addRDN(BCStyle.L, "Melbourne");
-        builder.addRDN(BCStyle.ST, "Victoria");
-
-        name1 = builder1.build();
-        name2 = builder2.build();
-
-        if (!name1.equals(name2))
-        {
-            fail("Failed reverse name test");
-        }
-
-        if (name1.hashCode() != name2.hashCode())
-        {
-            fail("Failed reverse name test hashCode");
-        }
-
-//        if (name1.equals(name2, true))
-//        {
-//            fail("Failed reverse name test - in Order");
-//        }
-//
-//        if (!name1.equals(name2, false))
-//        {
-//            fail("Failed reverse name test - in Order false");
-//        }
-
-//        Vector oids = name1.getOIDs();
-//        if (!compareVectors(oids, ord1))
-//        {
-//            fail("oid comparison test");
-//        }
-       /*
-        Vector val1 = new Vector();
-
-        val1.addElement("AU");
-        val1.addElement("The Legion of the Bouncy Castle");
-        val1.addElement("Melbourne");
-        val1.addElement("Victoria");
-        val1.addElement("feedback-crypto@bouncycastle.org");
-
-        name1 = new X500Name(ord1, val1);
-
-        Vector values = name1.getValues();
-        if (!compareVectors(values, val1))
-        {
-            fail("value comparison test");
-        }
-
-        ord2 = new Vector();
-
-        ord2.addElement(X500Name.ST);
-        ord2.addElement(X500Name.ST);
-        ord2.addElement(X500Name.L);
-        ord2.addElement(X500Name.O);
-        ord2.addElement(X500Name.C);
-
-        name1 = new X500Name(ord1, attrs);
-        name2 = new X500Name(ord2, attrs);
-
-        if (name1.equals(name2))
-        {
-            fail("Failed different name test");
-        }
-
-        ord2 = new Vector();
-
-        ord2.addElement(X500Name.ST);
-        ord2.addElement(X500Name.L);
-        ord2.addElement(X500Name.O);
-        ord2.addElement(X500Name.C);
-
-        name1 = new X500Name(ord1, attrs);
-        name2 = new X500Name(ord2, attrs);
-
-        if (name1.equals(name2))
-        {
-            fail("Failed subset name test");
-        }
-
-        compositeTest();
-         */
-        ByteArrayOutputStream bOut;
-        ASN1OutputStream aOut;
-        ASN1InputStream aIn;
-       /*
-        //
-        // getValues test
-        //
-        Vector v1 = name1.getValues(X500Name.O);
-
-        if (v1.size() != 1 || !v1.elementAt(0).equals("The Legion of the Bouncy Castle"))
-        {
-            fail("O test failed");
-        }
-
-        Vector v2 = name1.getValues(X500Name.L);
-
-        if (v2.size() != 1 || !v2.elementAt(0).equals("Melbourne"))
-        {
-            fail("L test failed");
-        }
-       */
-        //
-        // general subjects test
-        //
-        for (int i = 0; i != subjects.length; i++)
-        {
-            X500Name    name = new X500Name(subjects[i]);
-
-            bOut = new ByteArrayOutputStream();
-            aOut = new ASN1OutputStream(bOut);
-
-            aOut.writeObject(name);
-
-            aIn = new ASN1InputStream(new ByteArrayInputStream(bOut.toByteArray()));
-
-            name = X500Name.getInstance(aIn.readObject());
-            if (!name.toString().equals(subjects[i]))
-            {
-                fail("failed regeneration test " + i + " got: " + name.toString() + " expected " + subjects[i]);
-            }
-        }
-
-        for (int i = 0; i < hexSubjects.length; i += 2)
-        {
-            X500Name    name = new X500Name(hexSubjects[i]);
-
-            bOut = new ByteArrayOutputStream();
-            aOut = new ASN1OutputStream(bOut);
-
-            aOut.writeObject(name);
-
-            aIn = new ASN1InputStream(new ByteArrayInputStream(bOut.toByteArray()));
-
-            name = X500Name.getInstance(aIn.readObject());
-            if (!name.toString().equals(hexSubjects[i + 1]))
-            {
-                fail("failed hex regeneration test " + i + " got: " + name.toString() + " expected " + subjects[i]);
-            }
-        }
-
-        //
-        // sort test
-        //
-        X500Name unsorted = new X500Name("SERIALNUMBER=BBB + CN=AA");
-
-        if (!fromBytes(unsorted.getEncoded()).toString().equals("CN=AA+SERIALNUMBER=BBB"))
-        {
-            fail("failed sort test 1");
-        }
-
-        unsorted = new X500Name("CN=AA + SERIALNUMBER=BBB");
-
-        if (!fromBytes(unsorted.getEncoded()).toString().equals("CN=AA+SERIALNUMBER=BBB"))
-        {
-            fail("failed sort test 2");
-        }
-
-        unsorted = new X500Name("SERIALNUMBER=B + CN=AA");
-
-        if (!fromBytes(unsorted.getEncoded()).toString().equals("SERIALNUMBER=B+CN=AA"))
-        {
-            fail("failed sort test 3");
-        }
-
-        unsorted = new X500Name("CN=AA + SERIALNUMBER=B");
-
-        if (!fromBytes(unsorted.getEncoded()).toString().equals("SERIALNUMBER=B+CN=AA"))
-        {
-            fail("failed sort test 4");
-        }
-
-        //
-        // equality tests
-        //
-        equalityTest(new X500Name("CN=The     Legion"), new X500Name("CN=The Legion"));
-        equalityTest(new X500Name("CN=   The Legion"), new X500Name("CN=The Legion"));
-        equalityTest(new X500Name("CN=The Legion   "), new X500Name("CN=The Legion"));
-        equalityTest(new X500Name("CN=  The     Legion "), new X500Name("CN=The Legion"));
-        equalityTest(new X500Name("CN=  the     legion "), new X500Name("CN=The Legion"));
-
-        equalityTest(new X500Name("CN=  the     legion+C=AU, O=Legion "), new X500Name("CN=The Legion+C=AU, O=Legion"));
-        // # test
-
-        X500Name n1 = new X500Name("SERIALNUMBER=8,O=ABC,CN=ABC Class 3 CA,C=LT");
-        X500Name n2 = new X500Name("2.5.4.5=8,O=ABC,CN=ABC Class 3 CA,C=LT");
-        X500Name n3 = new X500Name("2.5.4.5=#130138,O=ABC,CN=ABC Class 3 CA,C=LT");
-
-        equalityTest(n1, n2);
-        equalityTest(n2, n3);
-        equalityTest(n3, n1);
-
-        n1 = new X500Name("2.5.4.5=#130138,CN=SSC Class 3 CA,O=UAB Skaitmeninio sertifikavimo centras,C=LT");
-        n2 = new X500Name("SERIALNUMBER=#130138,CN=SSC Class 3 CA,O=UAB Skaitmeninio sertifikavimo centras,C=LT");
-        n3 = X500Name.getInstance(ASN1Primitive.fromByteArray(Hex.decode("3063310b3009060355040613024c54312f302d060355040a1326"
-            + "55414220536b6169746d656e696e696f20736572746966696b6176696d6f2063656e74726173311730150603550403130e53534320436c6173732033204341310a30080603550405130138")));
-
-        equalityTest(n1, n2);
-        equalityTest(n2, n3);
-        equalityTest(n3, n1);
-
-        n1 = new X500Name("SERIALNUMBER=8,O=XX,CN=ABC Class 3 CA,C=LT");
-        n2 = new X500Name("2.5.4.5=8,O=,CN=ABC Class 3 CA,C=LT");
-
-//        if (n1.equals(n2))
-//        {
-//            fail("empty inequality check failed");
-//        }
-
-        n1 = new X500Name("SERIALNUMBER=8,O=,CN=ABC Class 3 CA,C=LT");
-        n2 = new X500Name("2.5.4.5=8,O=,CN=ABC Class 3 CA,C=LT");
-
-        equalityTest(n1, n2);
-
-        equalityTest(X500Name.getInstance(BCStrictStyle.INSTANCE, n1), X500Name.getInstance(BCStrictStyle.INSTANCE, n2));
-
-        n2 = new X500Name("C=LT,2.5.4.5=8,O=,CN=ABC Class 3 CA");
-
-        equalityTest(n1, n2);
-
-        if (X500Name.getInstance(BCStrictStyle.INSTANCE, n1).equals(X500Name.getInstance(BCStrictStyle.INSTANCE, n2)))
-        {
-            fail("strict comparison failed");
-        }
-
-        //
-        // inequality to sequences
-        //
-        name1 = new X500Name("CN=The Legion");
-
-        if (name1.equals(new DERSequence()))
-        {
-            fail("inequality test with sequence");
-        }
-
-        if (name1.equals(new DERSequence(new DERSet())))
-        {
-            fail("inequality test with sequence and set");
-        }
-
-        ASN1EncodableVector v = new ASN1EncodableVector();
-
-        v.add(new ASN1ObjectIdentifier("1.1"));
-        v.add(new ASN1ObjectIdentifier("1.1"));
-        if (name1.equals(new DERSequence(new DERSet(new DERSet(v)))))
-        {
-            fail("inequality test with sequence and bad set");
-        }
-
-        if (name1.equals(new DERSequence(new DERSet(new DERSet(v)))))
-        {
-            fail("inequality test with sequence and bad set");
-        }
-
-        if (name1.equals(new DERSequence(new DERSet(new DERSequence()))))
-        {
-            fail("inequality test with sequence and short sequence");
-        }
-
-        if (name1.equals(new DERSequence(new DERSet(new DERSequence()))))
-        {
-            fail("inequality test with sequence and short sequence");
-        }
-
-        v = new ASN1EncodableVector();
-
-        v.add(new ASN1ObjectIdentifier("1.1"));
-        v.add(new DERSequence());
-
-        if (name1.equals(new DERSequence(new DERSet(new DERSequence(v)))))
-        {
-            fail("inequality test with sequence and bad sequence");
-        }
-
-        if (name1.equals(null))
-        {
-            fail("inequality test with null");
-        }
-
-//        if (name1.equals(null, true))
-//        {
-//            fail("inequality test with null");
-//        }
-
-        //
-        // this is contrived but it checks sorting of sets with equal elements
-        //
-        unsorted = new X500Name("CN=AA + CN=AA + CN=AA");
-
-        ASN1ObjectIdentifier[] types = unsorted.getAttributeTypes();
-        if (types.length != 3 || !types[0].equals(BCStyle.CN) || !types[1].equals(BCStyle.CN) || !types[2].equals(BCStyle.CN))
-        {
-            fail("types not matched correctly");
-        }
-
-        // general type test
-        X500Name nested = new X500Name("CN=AA + CN=AA, C=AU");
-
-        types = nested.getAttributeTypes();
-        if (types.length != 3 || !types[0].equals(BCStyle.CN) || !types[1].equals(BCStyle.CN) || !types[2].equals(BCStyle.C))
-        {
-            fail("nested types not matched correctly");
-        }
-        //
-        // tagging test - only works if CHOICE implemented
-        //
-        ASN1TaggedObject tag = new DERTaggedObject(false, 1, new X500Name("CN=AA"));
-
-        if (!tag.isExplicit())
-        {
-            fail("failed to explicitly tag CHOICE object");
-        }
-
-        X500Name name = X500Name.getInstance(tag, false);
-
-        if (!name.equals(new X500Name("CN=AA")))
-        {
-            fail("failed to recover tagged name");
-        }
-
-        DERUTF8String testString = new DERUTF8String("The Legion of the Bouncy Castle");
-        byte[] encodedBytes = testString.getEncoded();
-        byte[] hexEncodedBytes = Hex.encode(encodedBytes);
-        String hexEncodedString = "#" + new String(hexEncodedBytes);
-
-        DERUTF8String converted = (DERUTF8String)
-            new X509DefaultEntryConverter().getConvertedValue(
-                BCStyle.L , hexEncodedString);
-
-        if (!converted.equals(testString))
-        {
-            fail("failed X509DefaultEntryConverter test");
-        }
-
-        //
-        // try escaped.
-        //
-        converted = (DERUTF8String)
-            new X509DefaultEntryConverter().getConvertedValue(
-                BCStyle.L , "\\" + hexEncodedString);
-
-        if (!converted.equals(new DERUTF8String(hexEncodedString)))
-        {
-            fail("failed X509DefaultEntryConverter test got " + converted + " expected: " + hexEncodedString);
-        }
-
-        //
-        // try a weird value
-        //
-        X500Name n = new X500Name("CN=\\#nothex#string");
-
-        if (!n.toString().equals("CN=\\#nothex#string"))
-        {
-            fail("# string not properly escaped.");
-        }
-
-        RDN[] vls = n.getRDNs(BCStyle.CN);
-        if (vls.length != 1 || !getValue(vls[0]).equals("#nothex#string"))
-        {
-            fail("escaped # not reduced properly");
-        }
-
-        types = n.getAttributeTypes();
-        if (types.length != 1 || !types[0].equals(BCStyle.CN))
-        {
-            fail("type not matched correctly");
-        }
-
-        n = new X500Name("CN=\"a+b\"");
-
-        vls = n.getRDNs(BCStyle.CN);
-        if (vls.length != 1 || !getValue(vls[0]).equals("a+b"))
-        {
-            fail("escaped + not reduced properly");
-        }
-
-        n = new X500Name("CN=a\\+b");
-
-        vls = n.getRDNs(BCStyle.CN);
-        if (vls.length != 1 || !getValue(vls[0]).equals("a+b"))
-        {
-            fail("escaped + not reduced properly");
-        }
-
-        if (!n.toString().equals("CN=a\\+b"))
-        {
-            fail("+ in string not properly escaped.");
-        }
-
-        n = new X500Name("CN=a\\=b");
-
-        vls = n.getRDNs(BCStyle.CN);
-        if (vls.length != 1 || !getValue(vls[0]).equals("a=b"))
-        {
-            fail("escaped = not reduced properly");
-        }
-
-        if (!n.toString().equals("CN=a\\=b"))
-        {
-            fail("= in string not properly escaped.");
-        }
-
-        n = new X500Name("TELEPHONENUMBER=\"+61999999999\"");
-
-        vls = n.getRDNs(BCStyle.TELEPHONE_NUMBER);
-        if (vls.length != 1 || !getValue(vls[0]).equals("+61999999999"))
-        {
-            fail("telephonenumber escaped + not reduced properly");
-        }
-
-        n = new X500Name("TELEPHONENUMBER=\\+61999999999");
-
-        vls = n.getRDNs(BCStyle.TELEPHONE_NUMBER);
-        if (vls.length != 1 || !getValue(vls[0]).equals("+61999999999"))
-        {
-            fail("telephonenumber escaped + not reduced properly");
-        }
-
-        // test query methods
-        if (!"E".equals(BCStyle.INSTANCE.oidToDisplayName(BCStyle.EmailAddress)))
-        {
-            fail("display name for E incorrect");
-        }
-
-        String[] aliases = BCStyle.INSTANCE.oidToAttrNames(BCStyle.EmailAddress);
-        if (aliases.length != 2)
-        {
-            fail("no aliases found");
-        }
-        if (!("e".equals(aliases[0]) || "e".equals(aliases[1])))
-        {
-            fail("first alias name for E incorrect");
-        }
-        if (!("emailaddress".equals(aliases[0]) || "emailaddress".equals(aliases[1])))
-        {
-            fail("second alias name for E incorrect");
-        }
-
-        if (BCStyle.INSTANCE.oidToDisplayName(new ASN1ObjectIdentifier("1.2.1")) != null)
-        {
-            fail("unknown oid matched!");
-        }
-
-        if (BCStyle.INSTANCE.oidToAttrNames(new ASN1ObjectIdentifier("1.2.1")).length != 0)
-        {
-            fail("unknown oid matched aliases!");
-        }
-
-        if (!new X500Name("CN=\"  CA1 -   CP.04.03\", OU=Testing, OU=Dod, O=U.S. Government, C=US")
-            .equals(new X500Name("CN=\"ca1 - CP.04.03  \", OU=Testing, OU=Dod, O=U.S. Government, C=US")))
-        {
-            fail("padded equality test failed");
-        }
-    }
-
-    private String getValue(RDN vl)
-    {
-        return ((ASN1String)vl.getFirst().getValue()).getString();
-    }
-
-    private void ietfUtilsTest()
-        throws Exception
-    {
-        IETFUtils.valueToString(new DERUTF8String(" "));
-    }
-
-    /*
-  private boolean compareVectors(Vector a, Vector b)    // for compatibility with early JDKs
-  {
-      if (a.size() != b.size())
-      {
-          return false;
-      }
-
-      for (int i = 0; i != a.size(); i++)
-      {
-          if (!a.elementAt(i).equals(b.elementAt(i)))
-          {
-              return false;
-          }
-      }
-
-      return true;
-  }
-
-  private void compositeTest()
-      throws IOException
-  {
-      //
-      // composite test
-      //
-      byte[]  enc = Hex.decode("305e310b300906035504061302415531283026060355040a0c1f546865204c6567696f6e206f662074686520426f756e637920436173746c653125301006035504070c094d656c626f75726e653011060355040b0c0a4173636f742056616c65");
-      ASN1InputStream aIn = new ASN1InputStream(new ByteArrayInputStream(enc));
-
-      X500Name    n = X500Name.getInstance(aIn.readObject());
-
-      if (!n.toString().equals("C=AU,O=The Legion of the Bouncy Castle,L=Melbourne+OU=Ascot Vale"))
-      {
-          fail("Failed composite to string test got: " + n.toString());
-      }
-
-      if (!n.toString(true, X500Name.DefaultSymbols).equals("L=Melbourne+OU=Ascot Vale,O=The Legion of the Bouncy Castle,C=AU"))
-      {
-          fail("Failed composite to string test got: " + n.toString(true, X500Name.DefaultSymbols));
-      }
-
-      n = new X500Name(true, "L=Melbourne+OU=Ascot Vale,O=The Legion of the Bouncy Castle,C=AU");
-      if (!n.toString().equals("C=AU,O=The Legion of the Bouncy Castle,L=Melbourne+OU=Ascot Vale"))
-      {
-          fail("Failed composite to string reversal test got: " + n.toString());
-      }
-
-      n = new X500Name("C=AU, O=The Legion of the Bouncy Castle, L=Melbourne + OU=Ascot Vale");
-
-      ByteArrayOutputStream bOut = new ByteArrayOutputStream();
-      ASN1OutputStream aOut = new ASN1OutputStream(bOut);
-
-      aOut.writeObject(n);
-
-      byte[]  enc2 = bOut.toByteArray();
-
-      if (!Arrays.areEqual(enc, enc2))
-      {
-          fail("Failed composite string to encoding test");
-      }
-
-      //
-      // dud name test - handle empty DN without barfing.
-      //
-      n = new X500Name("C=CH,O=,OU=dummy,CN=mail@dummy.com");
-
-      n = X500Name.getInstance(ASN1Object.fromByteArray(n.getEncoded()));
-  }
-    */
-    private void equalityTest(X500Name name1, X500Name name2)
-    {
-        if (!name1.equals(name2))
-        {
-            fail("equality test failed for " + name1 + " : " + name2);
-        }
-
-        if (name1.hashCode() != name2.hashCode())
-        {
-            fail("hashCodeTest test failed for " + name1 + " : " + name2);
-        }
-    }
-
-
-    public static void main(
-        String[]    args)
-    {
-        runTest(new X500NameTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/test/X509ExtensionsTest.java b/bcprov/src/main/java/org/bouncycastle/asn1/test/X509ExtensionsTest.java
deleted file mode 100644
index 008d4d8..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/test/X509ExtensionsTest.java
+++ /dev/null
@@ -1,105 +0,0 @@
-package org.bouncycastle.asn1.test;
-
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.x509.X509Extensions;
-import org.bouncycastle.asn1.x509.X509ExtensionsGenerator;
-import org.bouncycastle.util.test.SimpleTest;
-
-public class X509ExtensionsTest
-    extends SimpleTest
-{
-    private static final ASN1ObjectIdentifier OID_2 = new ASN1ObjectIdentifier("1.2.2");
-    private static final ASN1ObjectIdentifier OID_3 = new ASN1ObjectIdentifier("1.2.3");
-    private static final ASN1ObjectIdentifier OID_1 = new ASN1ObjectIdentifier("1.2.1");
-
-    public String getName()
-    {
-        return "X509Extensions";
-    }
-
-    public void performTest() throws Exception
-    {
-        X509ExtensionsGenerator gen = new X509ExtensionsGenerator();
-
-        gen.addExtension(OID_1, true, new byte[20]);
-        gen.addExtension(OID_2, true, new byte[20]);
-
-        X509Extensions ext1 = gen.generate();
-        X509Extensions ext2 = gen.generate();
-
-        if (!ext1.equals(ext2))
-        {
-            fail("equals test failed");
-        }
-
-        gen.reset();
-
-        gen.addExtension(OID_2, true, new byte[20]);
-        gen.addExtension(OID_1, true, new byte[20]);
-
-        ext2 = gen.generate();
-
-        if (ext1.equals(ext2))
-        {
-            fail("inequality test failed");
-        }
-
-        if (!ext1.equivalent(ext2))
-        {
-            fail("equivalence true failed");
-        }
-
-        gen.reset();
-
-        gen.addExtension(OID_1, true, new byte[22]);
-        gen.addExtension(OID_2, true, new byte[20]);
-
-        ext2 = gen.generate();
-
-        if (ext1.equals(ext2))
-        {
-            fail("inequality 1 failed");
-        }
-
-        if (ext1.equivalent(ext2))
-        {
-            fail("non-equivalence 1 failed");
-        }
-
-        gen.reset();
-
-        gen.addExtension(OID_3, true, new byte[20]);
-        gen.addExtension(OID_2, true, new byte[20]);
-
-        ext2 = gen.generate();
-
-        if (ext1.equals(ext2))
-        {
-            fail("inequality 2 failed");
-        }
-
-        if (ext1.equivalent(ext2))
-        {
-            fail("non-equivalence 2 failed");
-        }
-
-        try
-        {
-            gen.addExtension(OID_2, true, new byte[20]);
-            fail("repeated oid");
-        }
-        catch (IllegalArgumentException e)
-        {
-            if (!e.getMessage().equals("extension 1.2.2 already added"))
-            {
-                fail("wrong exception on repeated oid: " + e.getMessage());
-            }
-        }
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        runTest(new X509ExtensionsTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/test/X509NameTest.java b/bcprov/src/main/java/org/bouncycastle/asn1/test/X509NameTest.java
deleted file mode 100644
index f1ae757..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/test/X509NameTest.java
+++ /dev/null
@@ -1,693 +0,0 @@
-package org.bouncycastle.asn1.test;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.util.Hashtable;
-import java.util.Vector;
-
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1GeneralizedTime;
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1OutputStream;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.ASN1Set;
-import org.bouncycastle.asn1.DERIA5String;
-import org.bouncycastle.asn1.DERPrintableString;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.DERSet;
-import org.bouncycastle.asn1.DERUTF8String;
-import org.bouncycastle.asn1.x500.X500Name;
-import org.bouncycastle.asn1.x500.X500NameBuilder;
-import org.bouncycastle.asn1.x500.style.BCStyle;
-import org.bouncycastle.asn1.x509.X509DefaultEntryConverter;
-import org.bouncycastle.asn1.x509.X509Name;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-
-public class X509NameTest
-    extends SimpleTest
-{
-   String[] subjects =
-   {
-       "C=AU,ST=Victoria,L=South Melbourne,O=Connect 4 Pty Ltd,OU=Webserver Team,CN=www2.connect4.com.au,E=webmaster@connect4.com.au",
-       "C=AU,ST=Victoria,L=South Melbourne,O=Connect 4 Pty Ltd,OU=Certificate Authority,CN=Connect 4 CA,E=webmaster@connect4.com.au",
-       "C=AU,ST=QLD,CN=SSLeay/rsa test cert",
-       "C=US,O=National Aeronautics and Space Administration,SERIALNUMBER=16+CN=Steve Schoch",
-       "E=cooke@issl.atl.hp.com,C=US,OU=Hewlett Packard Company (ISSL),CN=Paul A. Cooke",
-       "O=Sun Microsystems Inc,CN=store.sun.com",
-       "unstructuredAddress=192.168.1.33,unstructuredName=pixfirewall.ciscopix.com,CN=pixfirewall.ciscopix.com",
-       "CN=*.canal-plus.com,OU=Provided by TBS INTERNET http://www.tbs-certificats.com/,OU=\\ CANAL \\+,O=CANAL\\+DISTRIBUTION,L=issy les moulineaux,ST=Hauts de Seine,C=FR",
-       "O=Bouncy Castle,CN=www.bouncycastle.org\\ ",
-       "O=Bouncy Castle,CN=c:\\\\fred\\\\bob"
-    };
-
-    public String getName()
-    {
-        return "X509Name";
-    }
-    
-    private static X509Name fromBytes(
-        byte[]  bytes) 
-        throws IOException
-    {
-        return X509Name.getInstance(new ASN1InputStream(new ByteArrayInputStream(bytes)).readObject());
-    }
-
-    private ASN1Encodable createEntryValue(ASN1ObjectIdentifier oid, String value)
-    {
-        Hashtable attrs = new Hashtable();
-
-        attrs.put(oid, value);
-
-        Vector order = new Vector();
-
-        order.addElement(oid);
-        
-        X509Name name = new X509Name(order, attrs);
-
-        ASN1Sequence seq = (ASN1Sequence)name.toASN1Primitive();
-        ASN1Set set = (ASN1Set)seq.getObjectAt(0);
-        seq = (ASN1Sequence)set.getObjectAt(0);
-
-        return seq.getObjectAt(1);
-    }
-
-    private ASN1Encodable createEntryValueFromString(ASN1ObjectIdentifier oid, String value)
-    {
-        Hashtable attrs = new Hashtable();
-
-        attrs.put(oid, value);
-
-        Vector order = new Vector();
-
-        order.addElement(oid);
-        
-        X509Name name = new X509Name(new X509Name(order, attrs).toString());
-
-        ASN1Sequence seq = (ASN1Sequence)name.toASN1Primitive();
-        ASN1Set set = (ASN1Set)seq.getObjectAt(0);
-        seq = (ASN1Sequence)set.getObjectAt(0);
-
-        return seq.getObjectAt(1);
-    }
-
-    private void testEncodingPrintableString(ASN1ObjectIdentifier oid, String value)
-    {
-        ASN1Encodable converted = createEntryValue(oid, value);
-        if (!(converted instanceof DERPrintableString))
-        {
-            fail("encoding for " + oid + " not printable string");
-        }
-    }
-
-    private void testEncodingIA5String(ASN1ObjectIdentifier oid, String value)
-    {
-        ASN1Encodable converted = createEntryValue(oid, value);
-        if (!(converted instanceof DERIA5String))
-        {
-            fail("encoding for " + oid + " not IA5String");
-        }
-    }
-
-
-    private void testEncodingUTF8String(ASN1ObjectIdentifier oid, String value)
-        throws IOException
-    {
-        ASN1Encodable converted = createEntryValue(oid, value);
-        if (!(converted instanceof DERUTF8String))
-        {
-            fail("encoding for " + oid + " not IA5String");
-        }
-        if (!value.equals((DERUTF8String.getInstance(converted.toASN1Primitive().getEncoded()).getString())))
-        {
-            fail("decoding not correct");
-        }
-    }
-
-    private void testEncodingGeneralizedTime(ASN1ObjectIdentifier oid, String value)
-    {
-        ASN1Encodable converted = createEntryValue(oid, value);
-        if (!(converted instanceof ASN1GeneralizedTime))
-        {
-            fail("encoding for " + oid + " not GeneralizedTime");
-        }
-        converted = createEntryValueFromString(oid, value);
-        if (!(converted instanceof ASN1GeneralizedTime))
-        {
-            fail("encoding for " + oid + " not GeneralizedTime");
-        }
-    }
-
-    public void performTest()
-        throws Exception
-    {
-        testEncodingPrintableString(X509Name.C, "AU");
-        testEncodingPrintableString(X509Name.SERIALNUMBER, "123456");
-        testEncodingPrintableString(X509Name.DN_QUALIFIER, "123456");
-        testEncodingIA5String(X509Name.EmailAddress, "test@test.com");
-        testEncodingIA5String(X509Name.DC, "test");
-        // correct encoding
-        testEncodingGeneralizedTime(X509Name.DATE_OF_BIRTH, "#180F32303032303132323132323232305A");
-        // compatibility encoding
-        testEncodingGeneralizedTime(X509Name.DATE_OF_BIRTH, "20020122122220Z");
-        testEncodingUTF8String(X509Name.CN, "Mörsky");
-        //
-        // composite
-        //
-        Hashtable                   attrs = new Hashtable();
-
-        attrs.put(X509Name.C, "AU");
-        attrs.put(X509Name.O, "The Legion of the Bouncy Castle");
-        attrs.put(X509Name.L, "Melbourne");
-        attrs.put(X509Name.ST, "Victoria");
-        attrs.put(X509Name.E, "feedback-crypto@bouncycastle.org");
-
-        Vector                     order = new Vector();
-
-        order.addElement(X509Name.C);
-        order.addElement(X509Name.O);
-        order.addElement(X509Name.L);
-        order.addElement(X509Name.ST);
-        order.addElement(X509Name.E);
-
-        X509Name    name1 = new X509Name(order, attrs);
-
-        if (!name1.equals(name1))
-        {
-            fail("Failed same object test");
-        }
-
-        if (!name1.equals(name1, true))
-        {
-            fail("Failed same object test - in Order");
-        }
-
-        X509Name    name2 = new X509Name(order, attrs);
-
-        if (!name1.equals(name2))
-        {
-            fail("Failed same name test");
-        }
-
-        if (!name1.equals(name2, true))
-        {
-            fail("Failed same name test - in Order");
-        }
-
-        if (name1.hashCode() != name2.hashCode())
-        {
-            fail("Failed same name test - in Order");
-        }
-
-        Vector  ord1 = new Vector();
-
-        ord1.addElement(X509Name.C);
-        ord1.addElement(X509Name.O);
-        ord1.addElement(X509Name.L);
-        ord1.addElement(X509Name.ST);
-        ord1.addElement(X509Name.E);
-
-        Vector  ord2 = new Vector();
-
-        ord2.addElement(X509Name.E);
-        ord2.addElement(X509Name.ST);
-        ord2.addElement(X509Name.L);
-        ord2.addElement(X509Name.O);
-        ord2.addElement(X509Name.C);
-
-        name1 = new X509Name(ord1, attrs);
-        name2 = new X509Name(ord2, attrs);
-
-        if (!name1.equals(name2))
-        {
-            fail("Failed reverse name test");
-        }
-
-        if (name1.hashCode() != name2.hashCode())
-        {
-            fail("Failed reverse name test hashCode");
-        }
-
-        if (name1.equals(name2, true))
-        {
-            fail("Failed reverse name test - in Order");
-        }
-
-        if (!name1.equals(name2, false))
-        {
-            fail("Failed reverse name test - in Order false");
-        }
-
-        Vector oids = name1.getOIDs();
-        if (!compareVectors(oids, ord1))
-        {
-            fail("oid comparison test");
-        }
-
-        Vector val1 = new Vector();
-
-        val1.addElement("AU");
-        val1.addElement("The Legion of the Bouncy Castle");
-        val1.addElement("Melbourne");
-        val1.addElement("Victoria");
-        val1.addElement("feedback-crypto@bouncycastle.org");
-
-        name1 = new X509Name(ord1, val1);
-        
-        Vector values = name1.getValues();
-        if (!compareVectors(values, val1))
-        {
-            fail("value comparison test");
-        }
-
-        ord2 = new Vector();
-
-        ord2.addElement(X509Name.ST);
-        ord2.addElement(X509Name.ST);
-        ord2.addElement(X509Name.L);
-        ord2.addElement(X509Name.O);
-        ord2.addElement(X509Name.C);
-
-        name1 = new X509Name(ord1, attrs);
-        name2 = new X509Name(ord2, attrs);
-
-        if (name1.equals(name2))
-        {
-            fail("Failed different name test");
-        }
-
-        ord2 = new Vector();
-
-        ord2.addElement(X509Name.ST);
-        ord2.addElement(X509Name.L);
-        ord2.addElement(X509Name.O);
-        ord2.addElement(X509Name.C);
-
-        name1 = new X509Name(ord1, attrs);
-        name2 = new X509Name(ord2, attrs);
-
-        if (name1.equals(name2))
-        {
-            fail("Failed subset name test");
-        }
-
-        compositeTest();
-
-        ByteArrayOutputStream bOut;
-        ASN1OutputStream aOut;
-        ASN1InputStream aIn;
-
-        //
-        // getValues test
-        //
-        Vector v1 = name1.getValues(X509Name.O);
-
-        if (v1.size() != 1 || !v1.elementAt(0).equals("The Legion of the Bouncy Castle"))
-        {
-            fail("O test failed");
-        }
-
-        Vector v2 = name1.getValues(X509Name.L);
-
-        if (v2.size() != 1 || !v2.elementAt(0).equals("Melbourne"))
-        {
-            fail("L test failed");
-        }
-
-        //
-        // general subjects test
-        //
-        for (int i = 0; i != subjects.length; i++)
-        {
-            X509Name    name = new X509Name(subjects[i]);
-
-            bOut = new ByteArrayOutputStream();
-            aOut = new ASN1OutputStream(bOut);
-
-            aOut.writeObject(name);
-
-            aIn = new ASN1InputStream(new ByteArrayInputStream(bOut.toByteArray()));
-
-            name = X509Name.getInstance(aIn.readObject());
-
-            if (!name.toString().equals(subjects[i]))
-            {
-                fail("failed regeneration test " + i + " got " + name.toString());
-            }
-        }
-
-        //
-        // sort test
-        //
-        X509Name unsorted = new X509Name("SERIALNUMBER=BBB + CN=AA");
-
-        if (!fromBytes(unsorted.getEncoded()).toString().equals("CN=AA+SERIALNUMBER=BBB"))
-        {
-            fail("failed sort test 1");
-        }
-
-        unsorted = new X509Name("CN=AA + SERIALNUMBER=BBB");
-
-        if (!fromBytes(unsorted.getEncoded()).toString().equals("CN=AA+SERIALNUMBER=BBB"))
-        {
-            fail("failed sort test 2");
-        }
-
-        unsorted = new X509Name("SERIALNUMBER=B + CN=AA");
-
-        if (!fromBytes(unsorted.getEncoded()).toString().equals("SERIALNUMBER=B+CN=AA"))
-        {
-            fail("failed sort test 3");
-        }
-
-        unsorted = new X509Name("CN=AA + SERIALNUMBER=B");
-
-        if (!fromBytes(unsorted.getEncoded()).toString().equals("SERIALNUMBER=B+CN=AA"))
-        {
-            fail("failed sort test 4");
-        }
-
-        //
-        // equality tests
-        //
-        equalityTest(new X509Name("CN=The     Legion"), new X509Name("CN=The Legion"));
-        equalityTest(new X509Name("CN=   The Legion"), new X509Name("CN=The Legion"));
-        equalityTest(new X509Name("CN=The Legion   "), new X509Name("CN=The Legion"));
-        equalityTest(new X509Name("CN=  The     Legion "), new X509Name("CN=The Legion"));
-        equalityTest(new X509Name("CN=  the     legion "), new X509Name("CN=The Legion"));
-
-        // # test
-
-        X509Name n1 = new X509Name("SERIALNUMBER=8,O=ABC,CN=ABC Class 3 CA,C=LT");
-        X509Name n2 = new X509Name("2.5.4.5=8,O=ABC,CN=ABC Class 3 CA,C=LT");
-        X509Name n3 = new X509Name("2.5.4.5=#130138,O=ABC,CN=ABC Class 3 CA,C=LT");
-
-        equalityTest(n1, n2);
-        equalityTest(n2, n3);
-        equalityTest(n3, n1);
-
-        n1 = new X509Name(true, "2.5.4.5=#130138,CN=SSC Class 3 CA,O=UAB Skaitmeninio sertifikavimo centras,C=LT");
-        n2 = new X509Name(true, "SERIALNUMBER=#130138,CN=SSC Class 3 CA,O=UAB Skaitmeninio sertifikavimo centras,C=LT");
-        n3 = X509Name.getInstance(ASN1Primitive.fromByteArray(Hex.decode("3063310b3009060355040613024c54312f302d060355040a1326"
-            + "55414220536b6169746d656e696e696f20736572746966696b6176696d6f2063656e74726173311730150603550403130e53534320436c6173732033204341310a30080603550405130138")));
-
-        equalityTest(n1, n2);
-        equalityTest(n2, n3);
-        equalityTest(n3, n1);
-
-        n1 = new X509Name("SERIALNUMBER=8,O=XX,CN=ABC Class 3 CA,C=LT");
-        n2 = new X509Name("2.5.4.5=8,O=,CN=ABC Class 3 CA,C=LT");
-
-        if (n1.equals(n2))
-        {
-            fail("empty inequality check failed");
-        }
-
-        n1 = new X509Name("SERIALNUMBER=8,O=,CN=ABC Class 3 CA,C=LT");
-        n2 = new X509Name("2.5.4.5=8,O=,CN=ABC Class 3 CA,C=LT");
-
-        equalityTest(n1, n2);
-        
-        //
-        // inequality to sequences
-        //
-        name1 = new X509Name("CN=The Legion");
-
-        if (name1.equals(new DERSequence()))
-        {
-            fail("inequality test with sequence");
-        }
-
-        if (name1.equals(new DERSequence(new DERSet())))
-        {
-            fail("inequality test with sequence and set");
-        }
-
-        ASN1EncodableVector v = new ASN1EncodableVector();
-
-        v.add(new ASN1ObjectIdentifier("1.1"));
-        v.add(new ASN1ObjectIdentifier("1.1"));
-        if (name1.equals(new DERSequence(new DERSet(new DERSet(v)))))
-        {
-            fail("inequality test with sequence and bad set");
-        }
-
-        if (name1.equals(new DERSequence(new DERSet(new DERSet(v))), true))
-        {
-            fail("inequality test with sequence and bad set");
-        }
-
-        if (name1.equals(new DERSequence(new DERSet(new DERSequence()))))
-        {
-            fail("inequality test with sequence and short sequence");
-        }
-
-        if (name1.equals(new DERSequence(new DERSet(new DERSequence())), true))
-        {
-            fail("inequality test with sequence and short sequence");
-        }
-
-        v = new ASN1EncodableVector();
-
-        v.add(new ASN1ObjectIdentifier("1.1"));
-        v.add(new DERSequence());
-
-        if (name1.equals(new DERSequence(new DERSet(new DERSequence(v)))))
-        {
-            fail("inequality test with sequence and bad sequence");
-        }
-
-        if (name1.equals(null))
-        {
-            fail("inequality test with null");
-        }
-
-        if (name1.equals(null, true))
-        {
-            fail("inequality test with null");
-        }
-
-        //
-        // this is contrived but it checks sorting of sets with equal elements
-        //
-        unsorted = new X509Name("CN=AA + CN=AA + CN=AA");
-
-        //
-        // tagging test - only works if CHOICE implemented
-        //
-        /*
-        ASN1TaggedObject tag = new DERTaggedObject(false, 1, new X509Name("CN=AA"));
-
-        if (!tag.isExplicit())
-        {
-            fail("failed to explicitly tag CHOICE object");
-        }
-
-        X509Name name = X509Name.getInstance(tag, false);
-
-        if (!name.equals(new X509Name("CN=AA")))
-        {
-            fail("failed to recover tagged name");
-        }
-        */
-
-        DERUTF8String testString = new DERUTF8String("The Legion of the Bouncy Castle");
-        byte[] encodedBytes = testString.getEncoded();
-        byte[] hexEncodedBytes = Hex.encode(encodedBytes);
-        String hexEncodedString = "#" + new String(hexEncodedBytes);
-
-        DERUTF8String converted = (DERUTF8String)
-            new X509DefaultEntryConverter().getConvertedValue(
-                X509Name.L , hexEncodedString);
-
-        if (!converted.equals(testString))
-        {
-            fail("failed X509DefaultEntryConverter test");
-        }
-
-        //
-        // try escaped.
-        //
-        converted = (DERUTF8String)
-            new X509DefaultEntryConverter().getConvertedValue(
-                X509Name.L , "\\" + hexEncodedString);
-
-        if (!converted.equals(new DERUTF8String(hexEncodedString)))
-        {
-            fail("failed X509DefaultEntryConverter test got " + converted + " expected: " + hexEncodedString);
-        }
-        
-        //
-        // try a weird value
-        //
-        X509Name n = new X509Name("CN=\\#nothex#string");
-
-        if (!n.toString().equals("CN=\\#nothex#string"))
-        {
-            fail("# string not properly escaped.");
-        }
-
-        Vector vls = n.getValues(X509Name.CN);
-        if (vls.size() != 1 || !vls.elementAt(0).equals("#nothex#string"))
-        {
-            fail("escaped # not reduced properly");
-        }
-
-        n = new X509Name("CN=\"a+b\"");
-
-        vls = n.getValues(X509Name.CN);
-        if (vls.size() != 1 || !vls.elementAt(0).equals("a+b"))
-        {
-            fail("escaped + not reduced properly");
-        }
-
-        n = new X509Name("CN=a\\+b");
-
-        vls = n.getValues(X509Name.CN);
-        if (vls.size() != 1 || !vls.elementAt(0).equals("a+b"))
-        {
-            fail("escaped + not reduced properly");
-        }
-
-        if (!n.toString().equals("CN=a\\+b"))
-        {
-            fail("+ in string not properly escaped.");
-        }
-
-        n = new X509Name("CN=a\\=b");
-
-        vls = n.getValues(X509Name.CN);
-        if (vls.size() != 1 || !vls.elementAt(0).equals("a=b"))
-        {
-            fail("escaped = not reduced properly");
-        }
-
-        if (!n.toString().equals("CN=a\\=b"))
-        {
-            fail("= in string not properly escaped.");
-        }
-
-        n = new X509Name("TELEPHONENUMBER=\"+61999999999\"");
-
-        vls = n.getValues(X509Name.TELEPHONE_NUMBER);
-        if (vls.size() != 1 || !vls.elementAt(0).equals("+61999999999"))
-        {
-            fail("telephonenumber escaped + not reduced properly");
-        }
-
-        n = new X509Name("TELEPHONENUMBER=\\+61999999999");
-
-        vls = n.getValues(X509Name.TELEPHONE_NUMBER);
-        if (vls.size() != 1 || !vls.elementAt(0).equals("+61999999999"))
-        {
-            fail("telephonenumber escaped + not reduced properly");
-        }
-
-        // migration
-        X500NameBuilder builder = new X500NameBuilder(BCStyle.INSTANCE);
-        builder.addMultiValuedRDN(new ASN1ObjectIdentifier[] { BCStyle.CN, BCStyle.SN }, new String[] { "Thomas", "CVR:12341233-UID:1111" });
-        builder.addRDN(BCStyle.O, "Test");
-        builder.addRDN(BCStyle.C, "DK");
-
-        X500Name subject = builder.build();
-        ASN1Primitive derObject = subject.toASN1Primitive();
-        X509Name instance = X509Name.getInstance(derObject);
-    }
-
-    private boolean compareVectors(Vector a, Vector b)    // for compatibility with early JDKs
-    {
-        if (a.size() != b.size())
-        {
-            return false;
-        }
-
-        for (int i = 0; i != a.size(); i++)
-        {
-            if (!a.elementAt(i).equals(b.elementAt(i)))
-            {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    private void compositeTest()
-        throws IOException
-    {
-        //
-        // composite test
-        //
-        byte[]  enc = Hex.decode("305e310b300906035504061302415531283026060355040a0c1f546865204c6567696f6e206f662074686520426f756e637920436173746c653125301006035504070c094d656c626f75726e653011060355040b0c0a4173636f742056616c65");
-        ASN1InputStream aIn = new ASN1InputStream(new ByteArrayInputStream(enc));
-
-        X509Name    n = X509Name.getInstance(aIn.readObject());
-
-        if (!n.toString().equals("C=AU,O=The Legion of the Bouncy Castle,L=Melbourne+OU=Ascot Vale"))
-        {
-            fail("Failed composite to string test got: " + n.toString());
-        }
-
-        if (!n.toString(true, X509Name.DefaultSymbols).equals("L=Melbourne+OU=Ascot Vale,O=The Legion of the Bouncy Castle,C=AU"))
-        {
-            fail("Failed composite to string test got: " + n.toString(true, X509Name.DefaultSymbols));
-        }
-
-        n = new X509Name(true, "L=Melbourne+OU=Ascot Vale,O=The Legion of the Bouncy Castle,C=AU");
-        if (!n.toString().equals("C=AU,O=The Legion of the Bouncy Castle,L=Melbourne+OU=Ascot Vale"))
-        {
-            fail("Failed composite to string reversal test got: " + n.toString());
-        }
-
-        n = new X509Name("C=AU, O=The Legion of the Bouncy Castle, L=Melbourne + OU=Ascot Vale");
-
-        ByteArrayOutputStream bOut = new ByteArrayOutputStream();
-        ASN1OutputStream aOut = new ASN1OutputStream(bOut);
-
-        aOut.writeObject(n);
-
-        byte[]  enc2 = bOut.toByteArray();
-
-        if (!Arrays.areEqual(enc, enc2))
-        {
-            //fail("Failed composite string to encoding test");
-        }
-        
-        //
-        // dud name test - handle empty DN without barfing.
-        //
-        n = new X509Name("C=CH,O=,OU=dummy,CN=mail@dummy.com");
-
-        n = X509Name.getInstance(ASN1Primitive.fromByteArray(n.getEncoded()));
-    }
-
-    private void equalityTest(X509Name x509Name, X509Name x509Name1)
-    {
-        if (!x509Name.equals(x509Name1))
-        {
-            fail("equality test failed for " + x509Name + " : " + x509Name1);
-        }
-
-        if (x509Name.hashCode() != x509Name1.hashCode())
-        {
-            fail("hashCodeTest test failed for " + x509Name + " : " + x509Name1);
-        }
-
-        if (!x509Name.equals(x509Name1, true))
-        {
-            fail("equality test failed for " + x509Name + " : " + x509Name1);
-        }
-    }
-
-
-    public static void main(
-        String[]    args)
-    {
-        runTest(new X509NameTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/test/X9Test.java b/bcprov/src/main/java/org/bouncycastle/asn1/test/X9Test.java
deleted file mode 100644
index effe266..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/test/X9Test.java
+++ /dev/null
@@ -1,173 +0,0 @@
-package org.bouncycastle.asn1.test;
-
-import java.math.BigInteger;
-
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.DEROctetString;
-import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
-import org.bouncycastle.asn1.sec.ECPrivateKey;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.bouncycastle.asn1.x9.X962NamedCurves;
-import org.bouncycastle.asn1.x9.X962Parameters;
-import org.bouncycastle.asn1.x9.X9ECParameters;
-import org.bouncycastle.asn1.x9.X9ECPoint;
-import org.bouncycastle.asn1.x9.X9IntegerConverter;
-import org.bouncycastle.asn1.x9.X9ObjectIdentifiers;
-import org.bouncycastle.math.ec.ECPoint;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.encoders.Base64;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-
-public class X9Test
-    extends SimpleTest
-{
-    private byte[] namedPub = Base64.decode("MDcwEwYHKoZIzj0CAQYIKoZIzj0DAQEDIAADG5xRI+Iki/JrvL20hoDUa7Cggzorv5B9yyqSMjYu");
-    private byte[] expPub = Base64.decode(
-                "MIH8MIHXBgcqhkjOPQIBMIHLAgEBMCkGByqGSM49AQECHn///////////////3///////4AAAA" +
-                "AAAH///////zBXBB5///////////////9///////+AAAAAAAB///////wEHiVXBfoqMGZUsfTL" +
-                "A9anUKMMJQEC1JiHF9m6FattPgMVAH1zdBaP/jRxtgqFdoahlHXTv6L/BB8DZ2iujhi7ks/PAF" +
-                "yUmqLG2UhT0OZgu/hUsclQX+laAh5///////////////9///+XXetBs6YFfDxDIUZSZVECAQED" +
-                "IAADG5xRI+Iki/JrvL20hoDUa7Cggzorv5B9yyqSMjYu");
-
-    private byte[] namedPriv = Base64.decode("MDkCAQAwEwYHKoZIzj0CAQYIKoZIzj0DAQEEHzAdAgEBBB" +
-                                                 "gAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAo=");
-
-    private byte[] expPriv = Base64.decode(
-                "MIIBBAIBADCB1wYHKoZIzj0CATCBywIBATApBgcqhkjOPQEBAh5///////////////9///////" +
-                    "+AAAAAAAB///////8wVwQef///////////////f///////gAAAAAAAf//////8BB4lVwX6KjBmVL" +
-                    "H0ywPWp1CjDCUBAtSYhxfZuhWrbT4DFQB9c3QWj/40cbYKhXaGoZR107+i/wQfA2doro4Yu5LPzw" +
-                    "BclJqixtlIU9DmYLv4VLHJUF/pWgIef///////////////f///l13rQbOmBXw8QyFGUmVRAgEBBC" +
-                    "UwIwIBAQQeAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAU");
- 
-    private void encodePublicKey()
-        throws Exception
-    {
-        X9ECParameters          ecP = X962NamedCurves.getByOID(X9ObjectIdentifiers.prime239v3);
-
-        X9IntegerConverter conv = new X9IntegerConverter();
-
-        if (conv.getByteLength(ecP.getCurve()) != 30)
-        {
-            fail("wrong byte length reported for curve");
-        }
-
-        if (ecP.getCurve().getFieldSize() != 239)
-        {
-            fail("wrong field size reported for curve");
-        }
-
-        //
-        // named curve
-        //
-        X962Parameters          params = new X962Parameters(X9ObjectIdentifiers.prime192v1);
-        ECPoint                 point = ecP.getG().multiply(BigInteger.valueOf(100));
-
-        ASN1OctetString         p = new DEROctetString(point.getEncoded(true));
-
-        SubjectPublicKeyInfo    info = new SubjectPublicKeyInfo(new AlgorithmIdentifier(X9ObjectIdentifiers.id_ecPublicKey, params), p.getOctets());
-        if (!areEqual(info.getEncoded(), namedPub))
-        {
-            fail("failed public named generation");
-        }
-
-        X9ECPoint               x9P = new X9ECPoint(ecP.getCurve(), p);
-
-        if (!Arrays.areEqual(p.getOctets(), x9P.getPoint().getEncoded()))
-        {
-            fail("point encoding not preserved");
-        }
-
-        ASN1Primitive           o = ASN1Primitive.fromByteArray(namedPub);
-        
-        if (!info.equals(o))
-        {
-            fail("failed public named equality");
-        }
-        
-        //
-        // explicit curve parameters
-        //
-        params = new X962Parameters(ecP);
-        
-        info = new SubjectPublicKeyInfo(new AlgorithmIdentifier(X9ObjectIdentifiers.id_ecPublicKey, params), p.getOctets());
-
-        if (!areEqual(info.getEncoded(), expPub))
-        {
-            fail("failed public explicit generation");
-        }
-
-        o = ASN1Primitive.fromByteArray(expPub);
-        
-        if (!info.equals(o))
-        {
-            fail("failed public explicit equality");
-        }
-    }
-    
-    private void encodePrivateKey()
-        throws Exception
-    {
-        X9ECParameters          ecP = X962NamedCurves.getByOID(X9ObjectIdentifiers.prime192v1);
-
-        //
-        // named curve
-        //
-        X962Parameters          params = new X962Parameters(X9ObjectIdentifiers.prime192v1);
-
-        PrivateKeyInfo          info = new PrivateKeyInfo(new AlgorithmIdentifier(X9ObjectIdentifiers.id_ecPublicKey, params), new ECPrivateKey(ecP.getCurve().getOrder().bitLength(), BigInteger.valueOf(10)));
-
-        if (!areEqual(info.getEncoded(), namedPriv))
-        {
-            fail("failed private named generation");
-        }
-
-        ASN1Primitive           o = ASN1Primitive.fromByteArray(namedPriv);
-
-        if (!info.equals(o))
-        {
-            fail("failed private named equality");
-        }
-        
-        //
-        // explicit curve parameters
-        //
-        ecP = X962NamedCurves.getByOID(X9ObjectIdentifiers.prime239v3);
-
-        params = new X962Parameters(ecP);
-        
-        info = new PrivateKeyInfo(new AlgorithmIdentifier(X9ObjectIdentifiers.id_ecPublicKey, params), new ECPrivateKey(ecP.getCurve().getOrder().bitLength(), BigInteger.valueOf(20)));
-
-        if (!areEqual(info.getEncoded(), expPriv))
-        {
-            fail("failed private explicit generation");
-        }
-
-        o = ASN1Primitive.fromByteArray(expPriv);
-        
-        if (!info.equals(o))
-        {
-            fail("failed private explicit equality");
-        }
-    }
-    
-    public void performTest()
-        throws Exception
-    {
-        encodePublicKey();
-        encodePrivateKey();
-    }
-
-    public String getName()
-    {
-        return "X9";
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        runTest(new X9Test());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/test/package.html b/bcprov/src/main/java/org/bouncycastle/asn1/test/package.html
deleted file mode 100644
index df45e19..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/test/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body bgcolor="#ffffff">
-Test programs for the ASN.1 package.
-</body>
-</html>
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/tsp/Accuracy.java b/bcprov/src/main/java/org/bouncycastle/asn1/tsp/Accuracy.java
deleted file mode 100644
index fb7763d..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/tsp/Accuracy.java
+++ /dev/null
@@ -1,173 +0,0 @@
-package org.bouncycastle.asn1.tsp;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.DERTaggedObject;
-
-
-public class Accuracy
-    extends ASN1Object
-{
-    ASN1Integer seconds;
-
-    ASN1Integer millis;
-
-    ASN1Integer micros;
-
-    // constantes
-    protected static final int MIN_MILLIS = 1;
-
-    protected static final int MAX_MILLIS = 999;
-
-    protected static final int MIN_MICROS = 1;
-
-    protected static final int MAX_MICROS = 999;
-
-    protected Accuracy()
-    {
-    }
-
-    public Accuracy(
-        ASN1Integer seconds,
-        ASN1Integer millis,
-        ASN1Integer micros)
-    {
-        this.seconds = seconds;
-
-        //Verifications
-        if (millis != null
-                && (millis.getValue().intValue() < MIN_MILLIS || millis
-                        .getValue().intValue() > MAX_MILLIS))
-        {
-            throw new IllegalArgumentException(
-                    "Invalid millis field : not in (1..999)");
-        }
-        else
-        {
-            this.millis = millis;
-        }
-
-        if (micros != null
-                && (micros.getValue().intValue() < MIN_MICROS || micros
-                        .getValue().intValue() > MAX_MICROS))
-        {
-            throw new IllegalArgumentException(
-                    "Invalid micros field : not in (1..999)");
-        }
-        else
-        {
-            this.micros = micros;
-        }
-
-    }
-
-    private Accuracy(ASN1Sequence seq)
-    {
-        seconds = null;
-        millis = null;
-        micros = null;
-
-        for (int i = 0; i < seq.size(); i++)
-        {
-            // seconds
-            if (seq.getObjectAt(i) instanceof ASN1Integer)
-            {
-                seconds = (ASN1Integer) seq.getObjectAt(i);
-            }
-            else if (seq.getObjectAt(i) instanceof DERTaggedObject)
-            {
-                DERTaggedObject extra = (DERTaggedObject) seq.getObjectAt(i);
-
-                switch (extra.getTagNo())
-                {
-                case 0:
-                    millis = ASN1Integer.getInstance(extra, false);
-                    if (millis.getValue().intValue() < MIN_MILLIS
-                            || millis.getValue().intValue() > MAX_MILLIS)
-                    {
-                        throw new IllegalArgumentException(
-                                "Invalid millis field : not in (1..999).");
-                    }
-                    break;
-                case 1:
-                    micros = ASN1Integer.getInstance(extra, false);
-                    if (micros.getValue().intValue() < MIN_MICROS
-                            || micros.getValue().intValue() > MAX_MICROS)
-                    {
-                        throw new IllegalArgumentException(
-                                "Invalid micros field : not in (1..999).");
-                    }
-                    break;
-                default:
-                    throw new IllegalArgumentException("Invalig tag number");
-                }
-            }
-        }
-    }
-
-    public static Accuracy getInstance(Object o)
-    {
-        if (o instanceof Accuracy)
-        {
-            return (Accuracy) o;
-        }
-
-        if (o != null)
-        {
-            return new Accuracy(ASN1Sequence.getInstance(o));
-        }
-
-        return null;
-    }
-
-    public ASN1Integer getSeconds()
-    {
-        return seconds;
-    }
-
-    public ASN1Integer getMillis()
-    {
-        return millis;
-    }
-
-    public ASN1Integer getMicros()
-    {
-        return micros;
-    }
-
-    /**
-     * <pre>
-     * Accuracy ::= SEQUENCE {
-     *             seconds        INTEGER              OPTIONAL,
-     *             millis     [0] INTEGER  (1..999)    OPTIONAL,
-     *             micros     [1] INTEGER  (1..999)    OPTIONAL
-     *             }
-     * </pre>
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-
-        ASN1EncodableVector v = new ASN1EncodableVector();
-        
-        if (seconds != null)
-        {
-            v.add(seconds);
-        }
-        
-        if (millis != null)
-        {
-            v.add(new DERTaggedObject(false, 0, millis));
-        }
-        
-        if (micros != null)
-        {
-            v.add(new DERTaggedObject(false, 1, micros));
-        }
-
-        return new DERSequence(v);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/tsp/MessageImprint.java b/bcprov/src/main/java/org/bouncycastle/asn1/tsp/MessageImprint.java
deleted file mode 100644
index b551fcf..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/tsp/MessageImprint.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package org.bouncycastle.asn1.tsp;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DEROctetString;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-
-public class MessageImprint
-    extends ASN1Object
-{
-    AlgorithmIdentifier hashAlgorithm;
-    byte[]              hashedMessage;
-    
-    /**
-     * @param o
-     * @return a MessageImprint object.
-     */
-    public static MessageImprint getInstance(Object o)
-    {
-        if (o instanceof MessageImprint)
-        {
-            return (MessageImprint)o;
-        }
-
-        if (o != null)
-        {
-            return new MessageImprint(ASN1Sequence.getInstance(o));
-        }
-
-        return null;
-    }
-    
-    private MessageImprint(
-        ASN1Sequence seq)
-    {
-        this.hashAlgorithm = AlgorithmIdentifier.getInstance(seq.getObjectAt(0));
-        this.hashedMessage = ASN1OctetString.getInstance(seq.getObjectAt(1)).getOctets();
-    }
-    
-    public MessageImprint(
-        AlgorithmIdentifier hashAlgorithm,
-        byte[]              hashedMessage)
-    {
-        this.hashAlgorithm = hashAlgorithm;
-        this.hashedMessage = hashedMessage;
-    }
-    
-    public AlgorithmIdentifier getHashAlgorithm()
-    {
-        return hashAlgorithm;
-    }
-    
-    public byte[] getHashedMessage()
-    {
-        return hashedMessage;
-    }
-    
-    /**
-     * <pre>
-     *    MessageImprint ::= SEQUENCE  {
-     *       hashAlgorithm                AlgorithmIdentifier,
-     *       hashedMessage                OCTET STRING  }
-     * </pre>
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector v = new ASN1EncodableVector();
-
-        v.add(hashAlgorithm);
-        v.add(new DEROctetString(hashedMessage));
-
-        return new DERSequence(v);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/tsp/TSTInfo.java b/bcprov/src/main/java/org/bouncycastle/asn1/tsp/TSTInfo.java
deleted file mode 100644
index 312224e..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/tsp/TSTInfo.java
+++ /dev/null
@@ -1,233 +0,0 @@
-package org.bouncycastle.asn1.tsp;
-
-import java.util.Enumeration;
-
-import org.bouncycastle.asn1.ASN1Boolean;
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1GeneralizedTime;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.ASN1TaggedObject;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.DERTaggedObject;
-import org.bouncycastle.asn1.x509.Extensions;
-import org.bouncycastle.asn1.x509.GeneralName;
-
-public class TSTInfo
-    extends ASN1Object
-{
-    private ASN1Integer version;
-    private ASN1ObjectIdentifier tsaPolicyId;
-    private MessageImprint messageImprint;
-    private ASN1Integer serialNumber;
-    private ASN1GeneralizedTime genTime;
-    private Accuracy accuracy;
-    private ASN1Boolean ordering;
-    private ASN1Integer nonce;
-    private GeneralName tsa;
-    private Extensions extensions;
-
-    public static TSTInfo getInstance(Object o)
-    {
-        if (o instanceof TSTInfo)
-        {
-            return (TSTInfo)o;
-        }
-        else if (o != null)
-        {
-            return new TSTInfo(ASN1Sequence.getInstance(o));
-        }
-
-        return null;
-    }
-
-    private TSTInfo(ASN1Sequence seq)
-    {
-        Enumeration e = seq.getObjects();
-
-        // version
-        version = ASN1Integer.getInstance(e.nextElement());
-
-        // tsaPolicy
-        tsaPolicyId = ASN1ObjectIdentifier.getInstance(e.nextElement());
-
-        // messageImprint
-        messageImprint = MessageImprint.getInstance(e.nextElement());
-
-        // serialNumber
-        serialNumber = ASN1Integer.getInstance(e.nextElement());
-
-        // genTime
-        genTime = ASN1GeneralizedTime.getInstance(e.nextElement());
-
-        // default for ordering
-        ordering = ASN1Boolean.getInstance(false);
-        
-        while (e.hasMoreElements())
-        {
-            ASN1Object o = (ASN1Object) e.nextElement();
-
-            if (o instanceof ASN1TaggedObject)
-            {
-                DERTaggedObject tagged = (DERTaggedObject) o;
-
-                switch (tagged.getTagNo())
-                {
-                case 0:
-                    tsa = GeneralName.getInstance(tagged, true);
-                    break;
-                case 1:
-                    extensions = Extensions.getInstance(tagged, false);
-                    break;
-                default:
-                    throw new IllegalArgumentException("Unknown tag value " + tagged.getTagNo());
-                }
-            }
-            else if (o instanceof ASN1Sequence || o instanceof Accuracy)
-            {
-                accuracy = Accuracy.getInstance(o);
-            }
-            else if (o instanceof ASN1Boolean)
-            {
-                ordering = ASN1Boolean.getInstance(o);
-            }
-            else if (o instanceof ASN1Integer)
-            {
-                nonce = ASN1Integer.getInstance(o);
-            }
-
-        }
-    }
-
-    public TSTInfo(ASN1ObjectIdentifier tsaPolicyId, MessageImprint messageImprint,
-            ASN1Integer serialNumber, ASN1GeneralizedTime genTime,
-            Accuracy accuracy, ASN1Boolean ordering, ASN1Integer nonce,
-            GeneralName tsa, Extensions extensions)
-    {
-        version = new ASN1Integer(1);
-        this.tsaPolicyId = tsaPolicyId;
-        this.messageImprint = messageImprint;
-        this.serialNumber = serialNumber;
-        this.genTime = genTime;
-
-        this.accuracy = accuracy;
-        this.ordering = ordering;
-        this.nonce = nonce;
-        this.tsa = tsa;
-        this.extensions = extensions;
-    }
-
-    public ASN1Integer getVersion()
-    {
-        return version;
-    }
-
-    public MessageImprint getMessageImprint()
-    {
-        return messageImprint;
-    }
-
-    public ASN1ObjectIdentifier getPolicy()
-    {
-        return tsaPolicyId;
-    }
-
-    public ASN1Integer getSerialNumber()
-    {
-        return serialNumber;
-    }
-
-    public Accuracy getAccuracy()
-    {
-        return accuracy;
-    }
-
-    public ASN1GeneralizedTime getGenTime()
-    {
-        return genTime;
-    }
-
-    public ASN1Boolean getOrdering()
-    {
-        return ordering;
-    }
-
-    public ASN1Integer getNonce()
-    {
-        return nonce;
-    }
-
-    public GeneralName getTsa()
-    {
-        return tsa;
-    }
-
-    public Extensions getExtensions()
-    {
-        return extensions;
-    }
-
-    /**
-     * <pre>
-     * 
-     *     TSTInfo ::= SEQUENCE  {
-     *        version                      INTEGER  { v1(1) },
-     *        policy                       TSAPolicyId,
-     *        messageImprint               MessageImprint,
-     *          -- MUST have the same value as the similar field in
-     *          -- TimeStampReq
-     *        serialNumber                 INTEGER,
-     *         -- Time-Stamping users MUST be ready to accommodate integers
-     *         -- up to 160 bits.
-     *        genTime                      GeneralizedTime,
-     *        accuracy                     Accuracy                 OPTIONAL,
-     *        ordering                     BOOLEAN             DEFAULT FALSE,
-     *        nonce                        INTEGER                  OPTIONAL,
-     *          -- MUST be present if the similar field was present
-     *          -- in TimeStampReq.  In that case it MUST have the same value.
-     *        tsa                          [0] GeneralName          OPTIONAL,
-     *        extensions                   [1] IMPLICIT Extensions   OPTIONAL  }
-     * 
-     * </pre>
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector seq = new ASN1EncodableVector();
-        seq.add(version);
-
-        seq.add(tsaPolicyId);
-        seq.add(messageImprint);
-        seq.add(serialNumber);
-        seq.add(genTime);
-
-        if (accuracy != null)
-        {
-            seq.add(accuracy);
-        }
-        
-        if (ordering != null && ordering.isTrue())
-        {
-            seq.add(ordering);
-        }
-        
-        if (nonce != null)
-        {
-            seq.add(nonce);
-        }
-        
-        if (tsa != null)
-        {
-            seq.add(new DERTaggedObject(true, 0, tsa));
-        }
-        
-        if (extensions != null)
-        {
-            seq.add(new DERTaggedObject(false, 1, extensions));
-        }
-
-        return new DERSequence(seq);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/tsp/TimeStampReq.java b/bcprov/src/main/java/org/bouncycastle/asn1/tsp/TimeStampReq.java
deleted file mode 100644
index 44490f0..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/tsp/TimeStampReq.java
+++ /dev/null
@@ -1,179 +0,0 @@
-package org.bouncycastle.asn1.tsp;
-
-import org.bouncycastle.asn1.ASN1Boolean;
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.ASN1TaggedObject;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.DERTaggedObject;
-import org.bouncycastle.asn1.x509.Extensions;
-
-public class TimeStampReq
-    extends ASN1Object
-{
-    ASN1Integer version;
-
-    MessageImprint messageImprint;
-
-    ASN1ObjectIdentifier tsaPolicy;
-
-    ASN1Integer nonce;
-
-    ASN1Boolean certReq;
-
-    Extensions extensions;
-
-    public static TimeStampReq getInstance(Object o)
-    {
-        if (o instanceof TimeStampReq)
-        {
-            return (TimeStampReq) o;
-        }
-        else if (o != null)
-        {
-            return new TimeStampReq(ASN1Sequence.getInstance(o));
-        }
-
-        return null;
-    }
-
-    private TimeStampReq(ASN1Sequence seq)
-    {
-        int nbObjects = seq.size();
-
-        int seqStart = 0;
-
-        // version
-        version = ASN1Integer.getInstance(seq.getObjectAt(seqStart));
-
-        seqStart++;
-
-        // messageImprint
-        messageImprint = MessageImprint.getInstance(seq.getObjectAt(seqStart));
-
-        seqStart++;
-
-        for (int opt = seqStart; opt < nbObjects; opt++)
-        {
-            // tsaPolicy
-            if (seq.getObjectAt(opt) instanceof ASN1ObjectIdentifier)
-            {
-                tsaPolicy = ASN1ObjectIdentifier.getInstance(seq.getObjectAt(opt));
-            }
-            // nonce
-            else if (seq.getObjectAt(opt) instanceof ASN1Integer)
-            {
-                nonce = ASN1Integer.getInstance(seq.getObjectAt(opt));
-            }
-            // certReq
-            else if (seq.getObjectAt(opt) instanceof ASN1Boolean)
-            {
-                certReq = ASN1Boolean.getInstance(seq.getObjectAt(opt));
-            }
-            // extensions
-            else if (seq.getObjectAt(opt) instanceof ASN1TaggedObject)
-            {
-                ASN1TaggedObject    tagged = (ASN1TaggedObject)seq.getObjectAt(opt);
-                if (tagged.getTagNo() == 0)
-                {
-                    extensions = Extensions.getInstance(tagged, false);
-                }
-            }
-        }
-    }
-
-    public TimeStampReq(
-        MessageImprint      messageImprint,
-        ASN1ObjectIdentifier tsaPolicy,
-        ASN1Integer          nonce,
-        ASN1Boolean          certReq,
-        Extensions      extensions)
-    {
-        // default
-        version = new ASN1Integer(1);
-
-        this.messageImprint = messageImprint;
-        this.tsaPolicy = tsaPolicy;
-        this.nonce = nonce;
-        this.certReq = certReq;
-        this.extensions = extensions;
-    }
-
-    public ASN1Integer getVersion()
-    {
-        return version;
-    }
-
-    public MessageImprint getMessageImprint()
-    {
-        return messageImprint;
-    }
-
-    public ASN1ObjectIdentifier getReqPolicy()
-    {
-        return tsaPolicy;
-    }
-
-    public ASN1Integer getNonce()
-    {
-        return nonce;
-    }
-
-    public ASN1Boolean getCertReq()
-    {
-        return certReq;
-    }
-
-    public Extensions getExtensions()
-    {
-        return extensions;
-    }
-
-    /**
-     * <pre>
-     * TimeStampReq ::= SEQUENCE  {
-     *  version                      INTEGER  { v1(1) },
-     *  messageImprint               MessageImprint,
-     *    --a hash algorithm OID and the hash value of the data to be
-     *    --time-stamped
-     *  reqPolicy             TSAPolicyId              OPTIONAL,
-     *  nonce                 INTEGER                  OPTIONAL,
-     *  certReq               BOOLEAN                  DEFAULT FALSE,
-     *  extensions            [0] IMPLICIT Extensions  OPTIONAL
-     * }
-     * </pre>
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector v = new ASN1EncodableVector();
-        
-        v.add(version);
-        v.add(messageImprint);
-        
-        if (tsaPolicy != null)
-        {
-            v.add(tsaPolicy);
-        }
-        
-        if (nonce != null)
-        {
-            v.add(nonce);
-        }
-        
-        if (certReq != null && certReq.isTrue())
-        {
-            v.add(certReq);
-        }
-        
-        if (extensions != null)
-        {
-            v.add(new DERTaggedObject(false, 0, extensions));
-        }
-
-        return new DERSequence(v);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/tsp/TimeStampResp.java b/bcprov/src/main/java/org/bouncycastle/asn1/tsp/TimeStampResp.java
deleted file mode 100644
index 96d08a1..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/tsp/TimeStampResp.java
+++ /dev/null
@@ -1,84 +0,0 @@
-package org.bouncycastle.asn1.tsp;
-
-import java.util.Enumeration;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.cmp.PKIStatusInfo;
-import org.bouncycastle.asn1.cms.ContentInfo;
-
-
-public class TimeStampResp
-    extends ASN1Object
-{
-    PKIStatusInfo pkiStatusInfo;
-
-    ContentInfo timeStampToken;
-
-    public static TimeStampResp getInstance(Object o)
-    {
-        if (o instanceof TimeStampResp)
-        {
-            return (TimeStampResp) o;
-        }
-        else if (o != null)
-        {
-            return new TimeStampResp(ASN1Sequence.getInstance(o));
-        }
-
-        return null;
-    }
-
-    private TimeStampResp(ASN1Sequence seq)
-    {
-
-        Enumeration e = seq.getObjects();
-
-        // status
-        pkiStatusInfo = PKIStatusInfo.getInstance(e.nextElement());
-
-        if (e.hasMoreElements())
-        {
-            timeStampToken = ContentInfo.getInstance(e.nextElement());
-        }
-    }
-
-    public TimeStampResp(PKIStatusInfo pkiStatusInfo, ContentInfo timeStampToken)
-    {
-        this.pkiStatusInfo = pkiStatusInfo;
-        this.timeStampToken = timeStampToken;
-    }
-
-    public PKIStatusInfo getStatus()
-    {
-        return pkiStatusInfo;
-    }
-
-    public ContentInfo getTimeStampToken()
-    {
-        return timeStampToken;
-    }
-
-    /**
-     * <pre>
-     * TimeStampResp ::= SEQUENCE  {
-     *   status                  PKIStatusInfo,
-     *   timeStampToken          TimeStampToken     OPTIONAL  }
-     * </pre>
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector v = new ASN1EncodableVector();
-        
-        v.add(pkiStatusInfo);
-        if (timeStampToken != null)
-        {
-            v.add(timeStampToken);
-        }
-
-        return new DERSequence(v);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/tsp/package.html b/bcprov/src/main/java/org/bouncycastle/asn1/tsp/package.html
deleted file mode 100644
index d6265f0..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/tsp/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body bgcolor="#ffffff">
-Support classes useful for encoding and supporting Time Stamp Protocol as described RFC 3161.
-</body>
-</html>
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/ua/DSTU4145BinaryField.java b/bcprov/src/main/java/org/bouncycastle/asn1/ua/DSTU4145BinaryField.java
deleted file mode 100644
index a0cca6b..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/ua/DSTU4145BinaryField.java
+++ /dev/null
@@ -1,119 +0,0 @@
-package org.bouncycastle.asn1.ua;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DERSequence;
-
-public class DSTU4145BinaryField
-    extends ASN1Object
-{
-
-    private int m, k, j, l;
-
-    private DSTU4145BinaryField(ASN1Sequence seq)
-    {
-        m = ASN1Integer.getInstance(seq.getObjectAt(0)).getPositiveValue().intValue();
-
-        if (seq.getObjectAt(1) instanceof ASN1Integer)
-        {
-            k = ((ASN1Integer)seq.getObjectAt(1)).getPositiveValue().intValue();
-        }
-        else if (seq.getObjectAt(1) instanceof ASN1Sequence)
-        {
-            ASN1Sequence coefs = ASN1Sequence.getInstance(seq.getObjectAt(1));
-
-            k = ASN1Integer.getInstance(coefs.getObjectAt(0)).getPositiveValue().intValue();
-            j = ASN1Integer.getInstance(coefs.getObjectAt(1)).getPositiveValue().intValue();
-            l = ASN1Integer.getInstance(coefs.getObjectAt(2)).getPositiveValue().intValue();
-        }
-        else
-        {
-            throw new IllegalArgumentException("object parse error");
-        }
-    }
-
-    public static DSTU4145BinaryField getInstance(Object obj)
-    {
-        if (obj instanceof DSTU4145BinaryField)
-        {
-            return (DSTU4145BinaryField)obj;
-        }
-
-        if (obj != null)
-        {
-            return new DSTU4145BinaryField(ASN1Sequence.getInstance(obj));
-        }
-
-        return null;
-    }
-
-    public DSTU4145BinaryField(int m, int k1, int k2, int k3)
-    {
-        this.m = m;
-        this.k = k1;
-        this.j = k2;
-        this.l = k3;
-    }
-
-    public int getM()
-    {
-        return m;
-    }
-
-    public int getK1()
-    {
-        return k;
-    }
-
-    public int getK2()
-    {
-        return j;
-    }
-
-    public int getK3()
-    {
-        return l;
-    }
-
-    public DSTU4145BinaryField(int m, int k)
-    {
-        this(m, k, 0, 0);
-    }
-
-    /**
-     * BinaryField ::= SEQUENCE {
-     * M INTEGER,
-     * CHOICE {Trinomial,    Pentanomial}
-     * Trinomial::= INTEGER
-     * Pentanomial::= SEQUENCE {
-     * k INTEGER,
-     * j INTEGER,
-     * l INTEGER}
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-
-        ASN1EncodableVector v = new ASN1EncodableVector();
-
-        v.add(new ASN1Integer(m));
-        if (j == 0) //Trinomial
-        {
-            v.add(new ASN1Integer(k));
-        }
-        else
-        {
-            ASN1EncodableVector coefs = new ASN1EncodableVector();
-            coefs.add(new ASN1Integer(k));
-            coefs.add(new ASN1Integer(j));
-            coefs.add(new ASN1Integer(l));
-
-            v.add(new DERSequence(coefs));
-        }
-
-        return new DERSequence(v);
-    }
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/ua/DSTU4145ECBinary.java b/bcprov/src/main/java/org/bouncycastle/asn1/ua/DSTU4145ECBinary.java
deleted file mode 100644
index dc9f74c..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/ua/DSTU4145ECBinary.java
+++ /dev/null
@@ -1,154 +0,0 @@
-package org.bouncycastle.asn1.ua;
-
-import java.math.BigInteger;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.ASN1TaggedObject;
-import org.bouncycastle.asn1.DEROctetString;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.DERTaggedObject;
-import org.bouncycastle.crypto.params.ECDomainParameters;
-import org.bouncycastle.math.ec.ECAlgorithms;
-import org.bouncycastle.math.ec.ECCurve;
-import org.bouncycastle.math.field.PolynomialExtensionField;
-import org.bouncycastle.util.Arrays;
-
-public class DSTU4145ECBinary
-    extends ASN1Object
-{
-    BigInteger version = BigInteger.valueOf(0);
-
-    DSTU4145BinaryField f;
-    ASN1Integer a;
-    ASN1OctetString b;
-    ASN1Integer n;
-    ASN1OctetString bp;
-
-    public DSTU4145ECBinary(ECDomainParameters params)
-    {
-        ECCurve curve = params.getCurve();
-        if (!ECAlgorithms.isF2mCurve(curve))
-        {
-            throw new IllegalArgumentException("only binary domain is possible");
-        }
-
-        // We always use big-endian in parameter encoding
-
-        PolynomialExtensionField field = (PolynomialExtensionField)curve.getField();
-        int[] exponents = field.getMinimalPolynomial().getExponentsPresent();
-        if (exponents.length == 3)
-        {
-            f = new DSTU4145BinaryField(exponents[2], exponents[1]);
-        }
-        else if (exponents.length == 5)
-        {
-            f = new DSTU4145BinaryField(exponents[4], exponents[1], exponents[2], exponents[3]);
-        }
-
-        a = new ASN1Integer(curve.getA().toBigInteger());
-        b = new DEROctetString(curve.getB().getEncoded());
-        n = new ASN1Integer(params.getN());
-        bp = new DEROctetString(DSTU4145PointEncoder.encodePoint(params.getG()));
-    }
-
-    private DSTU4145ECBinary(ASN1Sequence seq)
-    {
-        int index = 0;
-
-        if (seq.getObjectAt(index) instanceof ASN1TaggedObject)
-        {
-            ASN1TaggedObject taggedVersion = (ASN1TaggedObject)seq.getObjectAt(index);
-            if (taggedVersion.isExplicit() && 0 == taggedVersion.getTagNo())
-            {
-                version = ASN1Integer.getInstance(taggedVersion.getLoadedObject()).getValue();
-                index++;
-            }
-            else
-            {
-                throw new IllegalArgumentException("object parse error");
-            }
-        }
-        f = DSTU4145BinaryField.getInstance(seq.getObjectAt(index));
-        index++;
-        a = ASN1Integer.getInstance(seq.getObjectAt(index));
-        index++;
-        b = ASN1OctetString.getInstance(seq.getObjectAt(index));
-        index++;
-        n = ASN1Integer.getInstance(seq.getObjectAt(index));
-        index++;
-        bp = ASN1OctetString.getInstance(seq.getObjectAt(index));
-    }
-
-    public static DSTU4145ECBinary getInstance(Object obj)
-    {
-        if (obj instanceof DSTU4145ECBinary)
-        {
-            return (DSTU4145ECBinary)obj;
-        }
-
-        if (obj != null)
-        {
-            return new DSTU4145ECBinary(ASN1Sequence.getInstance(obj));
-        }
-
-        return null;
-    }
-
-    public DSTU4145BinaryField getField()
-    {
-        return f;
-    }
-
-    public BigInteger getA()
-    {
-        return a.getValue();
-    }
-
-    public byte[] getB()
-    {
-        return Arrays.clone(b.getOctets());
-    }
-
-    public BigInteger getN()
-    {
-        return n.getValue();
-    }
-
-    public byte[] getG()
-    {
-        return Arrays.clone(bp.getOctets());
-    }
-
-    /**
-     * ECBinary  ::= SEQUENCE {
-     * version          [0] EXPLICIT INTEGER    DEFAULT 0,
-     * f     BinaryField,
-     * a    INTEGER (0..1),
-     * b    OCTET STRING,
-     * n    INTEGER,
-     * bp    OCTET STRING}
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-
-        ASN1EncodableVector v = new ASN1EncodableVector();
-
-        if (0 != version.compareTo(BigInteger.valueOf(0)))
-        {
-            v.add(new DERTaggedObject(true, 0, new ASN1Integer(version)));
-        }
-        v.add(f);
-        v.add(a);
-        v.add(b);
-        v.add(n);
-        v.add(bp);
-
-        return new DERSequence(v);
-    }
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/ua/DSTU4145NamedCurves.java b/bcprov/src/main/java/org/bouncycastle/asn1/ua/DSTU4145NamedCurves.java
deleted file mode 100644
index 0c02ce8..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/ua/DSTU4145NamedCurves.java
+++ /dev/null
@@ -1,106 +0,0 @@
-package org.bouncycastle.asn1.ua;
-
-import java.math.BigInteger;
-
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.crypto.params.ECDomainParameters;
-import org.bouncycastle.math.ec.ECCurve;
-import org.bouncycastle.math.ec.ECPoint;
-
-public class DSTU4145NamedCurves
-{
-    private static final BigInteger ZERO = BigInteger.valueOf(0);
-    private static final BigInteger ONE = BigInteger.valueOf(1);
-
-    public static final ECDomainParameters[] params = new ECDomainParameters[10];
-    static final ASN1ObjectIdentifier[] oids = new ASN1ObjectIdentifier[10];
-
-    //All named curves have the following oid format: 1.2.804.2.1.1.1.1.3.1.1.2.X
-    //where X is the curve number 0-9
-    static final String oidBase = UAObjectIdentifiers.dstu4145le.getId() + ".2.";
-
-    static
-    {
-        BigInteger[] n_s = new BigInteger[10];
-        n_s[0] = new BigInteger("400000000000000000002BEC12BE2262D39BCF14D", 16);
-        n_s[1] = new BigInteger("3FFFFFFFFFFFFFFFFFFFFFB12EBCC7D7F29FF7701F", 16);
-        n_s[2] = new BigInteger("800000000000000000000189B4E67606E3825BB2831", 16);
-        n_s[3] = new BigInteger("3FFFFFFFFFFFFFFFFFFFFFFB981960435FE5AB64236EF", 16);
-        n_s[4] = new BigInteger("40000000000000000000000069A779CAC1DABC6788F7474F", 16);
-        n_s[5] = new BigInteger("1000000000000000000000000000013E974E72F8A6922031D2603CFE0D7", 16);
-        n_s[6] = new BigInteger("800000000000000000000000000000006759213AF182E987D3E17714907D470D", 16);
-        n_s[7] = new BigInteger("3FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFC079C2F3825DA70D390FBBA588D4604022B7B7", 16);
-        n_s[8] = new BigInteger("40000000000000000000000000000000000000000000009C300B75A3FA824F22428FD28CE8812245EF44049B2D49", 16);
-        n_s[9] = new BigInteger("3FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFBA3175458009A8C0A724F02F81AA8A1FCBAF80D90C7A95110504CF", 16);
-
-        BigInteger[] h_s = new BigInteger[10];
-        h_s[0] = BigInteger.valueOf(2);
-        h_s[1] = BigInteger.valueOf(2);
-        h_s[2] = BigInteger.valueOf(4);
-        h_s[3] = BigInteger.valueOf(2);
-        h_s[4] = BigInteger.valueOf(2);
-        h_s[5] = BigInteger.valueOf(2);
-        h_s[6] = BigInteger.valueOf(4);
-        h_s[7] = BigInteger.valueOf(2);
-        h_s[8] = BigInteger.valueOf(2);
-        h_s[9] = BigInteger.valueOf(2);
-
-        ECCurve.F2m[] curves = new ECCurve.F2m[10];
-        curves[0] = new ECCurve.F2m(163, 3, 6, 7, ONE, new BigInteger("5FF6108462A2DC8210AB403925E638A19C1455D21", 16), n_s[0], h_s[0]);
-        curves[1] = new ECCurve.F2m(167, 6, ONE, new BigInteger("6EE3CEEB230811759F20518A0930F1A4315A827DAC", 16), n_s[1], h_s[1]);
-        curves[2] = new ECCurve.F2m(173, 1, 2, 10, ZERO, new BigInteger("108576C80499DB2FC16EDDF6853BBB278F6B6FB437D9", 16), n_s[2], h_s[2]);
-        curves[3] = new ECCurve.F2m(179, 1, 2, 4, ONE, new BigInteger("4A6E0856526436F2F88DD07A341E32D04184572BEB710", 16), n_s[3], h_s[3]);
-        curves[4] = new ECCurve.F2m(191, 9, ONE, new BigInteger("7BC86E2102902EC4D5890E8B6B4981ff27E0482750FEFC03", 16), n_s[4], h_s[4]);
-        curves[5] = new ECCurve.F2m(233, 1, 4, 9, ONE, new BigInteger("06973B15095675534C7CF7E64A21BD54EF5DD3B8A0326AA936ECE454D2C", 16), n_s[5], h_s[5]);
-        curves[6] = new ECCurve.F2m(257, 12, ZERO, new BigInteger("1CEF494720115657E18F938D7A7942394FF9425C1458C57861F9EEA6ADBE3BE10", 16), n_s[6], h_s[6]);
-        curves[7] = new ECCurve.F2m(307, 2, 4, 8, ONE, new BigInteger("393C7F7D53666B5054B5E6C6D3DE94F4296C0C599E2E2E241050DF18B6090BDC90186904968BB", 16), n_s[7], h_s[7]);
-        curves[8] = new ECCurve.F2m(367, 21, ONE, new BigInteger("43FC8AD242B0B7A6F3D1627AD5654447556B47BF6AA4A64B0C2AFE42CADAB8F93D92394C79A79755437B56995136", 16), n_s[8], h_s[8]);
-        curves[9] = new ECCurve.F2m(431, 1, 3, 5, ONE, new BigInteger("03CE10490F6A708FC26DFE8C3D27C4F94E690134D5BFF988D8D28AAEAEDE975936C66BAC536B18AE2DC312CA493117DAA469C640CAF3", 16), n_s[9], h_s[9]);
-
-        ECPoint[] points = new ECPoint[10];
-        points[0] = curves[0].createPoint(new BigInteger("2E2F85F5DD74CE983A5C4237229DAF8A3F35823BE", 16), new BigInteger("3826F008A8C51D7B95284D9D03FF0E00CE2CD723A", 16));
-        points[1] = curves[1].createPoint(new BigInteger("7A1F6653786A68192803910A3D30B2A2018B21CD54", 16), new BigInteger("5F49EB26781C0EC6B8909156D98ED435E45FD59918", 16));
-        points[2] = curves[2].createPoint(new BigInteger("4D41A619BCC6EADF0448FA22FAD567A9181D37389CA", 16), new BigInteger("10B51CC12849B234C75E6DD2028BF7FF5C1CE0D991A1", 16));
-        points[3] = curves[3].createPoint(new BigInteger("6BA06FE51464B2BD26DC57F48819BA9954667022C7D03", 16), new BigInteger("25FBC363582DCEC065080CA8287AAFF09788A66DC3A9E", 16));
-        points[4] = curves[4].createPoint(new BigInteger("714114B762F2FF4A7912A6D2AC58B9B5C2FCFE76DAEB7129", 16), new BigInteger("29C41E568B77C617EFE5902F11DB96FA9613CD8D03DB08DA", 16));
-        points[5] = curves[5].createPoint(new BigInteger("3FCDA526B6CDF83BA1118DF35B3C31761D3545F32728D003EEB25EFE96", 16), new BigInteger("9CA8B57A934C54DEEDA9E54A7BBAD95E3B2E91C54D32BE0B9DF96D8D35", 16));
-        points[6] = curves[6].createPoint(new BigInteger("02A29EF207D0E9B6C55CD260B306C7E007AC491CA1B10C62334A9E8DCD8D20FB7", 16), new BigInteger("10686D41FF744D4449FCCF6D8EEA03102E6812C93A9D60B978B702CF156D814EF", 16));
-        points[7] = curves[7].createPoint(new BigInteger("216EE8B189D291A0224984C1E92F1D16BF75CCD825A087A239B276D3167743C52C02D6E7232AA", 16), new BigInteger("5D9306BACD22B7FAEB09D2E049C6E2866C5D1677762A8F2F2DC9A11C7F7BE8340AB2237C7F2A0", 16));
-        points[8] = curves[8].createPoint(new BigInteger("324A6EDDD512F08C49A99AE0D3F961197A76413E7BE81A400CA681E09639B5FE12E59A109F78BF4A373541B3B9A1", 16), new BigInteger("1AB597A5B4477F59E39539007C7F977D1A567B92B043A49C6B61984C3FE3481AAF454CD41BA1F051626442B3C10", 16));
-        points[9] = curves[9].createPoint(new BigInteger("1A62BA79D98133A16BBAE7ED9A8E03C32E0824D57AEF72F88986874E5AAE49C27BED49A2A95058068426C2171E99FD3B43C5947C857D", 16), new BigInteger("70B5E1E14031C1F70BBEFE96BDDE66F451754B4CA5F48DA241F331AA396B8D1839A855C1769B1EA14BA53308B5E2723724E090E02DB9", 16));
-
-        for (int i = 0; i < params.length; i++)
-        {
-            params[i] = new ECDomainParameters(curves[i], points[i], n_s[i], h_s[i]);
-        }
-
-        for (int i = 0; i < oids.length; i++)
-        {
-            oids[i] = new ASN1ObjectIdentifier(oidBase + i);
-        }
-    }
-
-    /**
-     * All named curves have the following oid format: 1.2.804.2.1.1.1.1.3.1.1.2.X
-     * where X is the curve number 0-9
-     */
-    public static ASN1ObjectIdentifier[] getOIDs()
-    {
-        return oids;
-    }
-
-    /**
-     * All named curves have the following oid format: 1.2.804.2.1.1.1.1.3.1.1.2.X
-     * where X is the curve number 0-9
-     */
-    public static ECDomainParameters getByOID(ASN1ObjectIdentifier oid)
-    {
-        String oidStr = oid.getId();
-        if (oidStr.startsWith(oidBase))
-        {
-            int index = Integer.parseInt(oidStr.substring(oidStr.length() - 1));
-            return params[index];
-        }
-        return null;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/ua/DSTU4145Params.java b/bcprov/src/main/java/org/bouncycastle/asn1/ua/DSTU4145Params.java
deleted file mode 100644
index c425d73..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/ua/DSTU4145Params.java
+++ /dev/null
@@ -1,121 +0,0 @@
-package org.bouncycastle.asn1.ua;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DEROctetString;
-import org.bouncycastle.asn1.DERSequence;
-
-public class DSTU4145Params
-    extends ASN1Object
-{
-    private static final byte DEFAULT_DKE[] = {
-        (byte)0xa9, (byte)0xd6, (byte)0xeb, 0x45, (byte)0xf1, 0x3c, 0x70, (byte)0x82,
-        (byte)0x80, (byte)0xc4, (byte)0x96, 0x7b, 0x23, 0x1f, 0x5e, (byte)0xad,
-        (byte)0xf6, 0x58, (byte)0xeb, (byte)0xa4, (byte)0xc0, 0x37, 0x29, 0x1d,
-        0x38, (byte)0xd9, 0x6b, (byte)0xf0, 0x25, (byte)0xca, 0x4e, 0x17,
-        (byte)0xf8, (byte)0xe9, 0x72, 0x0d, (byte)0xc6, 0x15, (byte)0xb4, 0x3a,
-        0x28, (byte)0x97, 0x5f, 0x0b, (byte)0xc1, (byte)0xde, (byte)0xa3, 0x64,
-        0x38, (byte)0xb5, 0x64, (byte)0xea, 0x2c, 0x17, (byte)0x9f, (byte)0xd0,
-        0x12, 0x3e, 0x6d, (byte)0xb8, (byte)0xfa, (byte)0xc5, 0x79, 0x04};
-
-
-    private ASN1ObjectIdentifier namedCurve;
-    private DSTU4145ECBinary ecbinary;
-    private byte[] dke = DEFAULT_DKE;
-
-    public DSTU4145Params(ASN1ObjectIdentifier namedCurve)
-    {
-        this.namedCurve = namedCurve;
-    }
-
-    public DSTU4145Params(DSTU4145ECBinary ecbinary)
-    {
-        this.ecbinary = ecbinary;
-    }
-
-    public boolean isNamedCurve()
-    {
-        return namedCurve != null;
-    }
-
-    public DSTU4145ECBinary getECBinary()
-    {
-        return ecbinary;
-    }
-
-    public byte[] getDKE()
-    {
-        return dke;
-    }
-
-    public static byte[] getDefaultDKE()
-    {
-        return DEFAULT_DKE;
-    }
-
-    public ASN1ObjectIdentifier getNamedCurve()
-    {
-        return namedCurve;
-    }
-
-    public static DSTU4145Params getInstance(Object obj)
-    {
-        if (obj instanceof DSTU4145Params)
-        {
-            return (DSTU4145Params)obj;
-        }
-
-        if (obj != null)
-        {
-            ASN1Sequence seq = ASN1Sequence.getInstance(obj);
-            DSTU4145Params params;
-
-            if (seq.getObjectAt(0) instanceof ASN1ObjectIdentifier)
-            {
-                params = new DSTU4145Params(ASN1ObjectIdentifier.getInstance(seq.getObjectAt(0)));
-            }
-            else
-            {
-                params = new DSTU4145Params(DSTU4145ECBinary.getInstance(seq.getObjectAt(0)));
-            }
-
-            if (seq.size() == 2)
-            {
-                params.dke = ASN1OctetString.getInstance(seq.getObjectAt(1)).getOctets();
-                if (params.dke.length != DSTU4145Params.DEFAULT_DKE.length)
-                {
-                    throw new IllegalArgumentException("object parse error");
-                }
-            }
-
-            return params;
-        }
-
-        throw new IllegalArgumentException("object parse error");
-    }
-
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector v = new ASN1EncodableVector();
-
-        if (namedCurve != null)
-        {
-            v.add(namedCurve);
-        }
-        else
-        {
-            v.add(ecbinary);
-        }
-
-        if (!org.bouncycastle.util.Arrays.areEqual(dke, DEFAULT_DKE))
-        {
-            v.add(new DEROctetString(dke));
-        }
-
-        return new DERSequence(v);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/ua/DSTU4145PointEncoder.java b/bcprov/src/main/java/org/bouncycastle/asn1/ua/DSTU4145PointEncoder.java
deleted file mode 100644
index 3405130..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/ua/DSTU4145PointEncoder.java
+++ /dev/null
@@ -1,154 +0,0 @@
-package org.bouncycastle.asn1.ua;
-
-import java.math.BigInteger;
-import java.util.Random;
-
-import org.bouncycastle.math.ec.ECConstants;
-import org.bouncycastle.math.ec.ECCurve;
-import org.bouncycastle.math.ec.ECFieldElement;
-import org.bouncycastle.math.ec.ECPoint;
-
-/**
- * DSTU4145 encodes points somewhat differently than X9.62
- * It compresses the point to the size of the field element
- */
-public abstract class DSTU4145PointEncoder
-{
-    private static ECFieldElement trace(ECFieldElement fe)
-    {
-        ECFieldElement t = fe;
-        for (int i = 1; i < fe.getFieldSize(); ++i)
-        {
-            t = t.square().add(fe);
-        }
-        return t;
-    }
-
-    /**
-     * Solves a quadratic equation <code>z<sup>2</sup> + z = beta</code>(X9.62
-     * D.1.6) The other solution is <code>z + 1</code>.
-     *
-     * @param beta The value to solve the quadratic equation for.
-     * @return the solution for <code>z<sup>2</sup> + z = beta</code> or
-     *         <code>null</code> if no solution exists.
-     */
-    private static ECFieldElement solveQuadraticEquation(ECCurve curve, ECFieldElement beta)
-    {
-        if (beta.isZero())
-        {
-            return beta;
-        }
-
-        ECFieldElement zeroElement = curve.fromBigInteger(ECConstants.ZERO);
-
-        ECFieldElement z = null;
-        ECFieldElement gamma = null;
-
-        Random rand = new Random();
-        int m = beta.getFieldSize();
-        do
-        {
-            ECFieldElement t = curve.fromBigInteger(new BigInteger(m, rand));
-            z = zeroElement;
-            ECFieldElement w = beta;
-            for (int i = 1; i <= m - 1; i++)
-            {
-                ECFieldElement w2 = w.square();
-                z = z.square().add(w2.multiply(t));
-                w = w2.add(beta);
-            }
-            if (!w.isZero())
-            {
-                return null;
-            }
-            gamma = z.square().add(z);
-        }
-        while (gamma.isZero());
-
-        return z;
-    }
-
-    public static byte[] encodePoint(ECPoint Q)
-    {
-        /*if (!Q.isCompressed())
-              Q=new ECPoint.F2m(Q.getCurve(),Q.getX(),Q.getY(),true);
-
-          byte[] bytes=Q.getEncoded();
-
-          if (bytes[0]==0x02)
-              bytes[bytes.length-1]&=0xFE;
-          else if (bytes[0]==0x02)
-              bytes[bytes.length-1]|=0x01;
-
-          return Arrays.copyOfRange(bytes, 1, bytes.length);*/
-
-        Q = Q.normalize();
-
-        ECFieldElement x = Q.getAffineXCoord();
-
-        byte[] bytes = x.getEncoded();
-
-        if (!x.isZero())
-        {
-            ECFieldElement z = Q.getAffineYCoord().divide(x);
-            if (trace(z).isOne())
-            {
-                bytes[bytes.length - 1] |= 0x01;
-            }
-            else
-            {
-                bytes[bytes.length - 1] &= 0xFE;
-            }
-        }
-
-        return bytes;
-    }
-
-    public static ECPoint decodePoint(ECCurve curve, byte[] bytes)
-    {
-        /*byte[] bp_enc=new byte[bytes.length+1];
-          if (0==(bytes[bytes.length-1]&0x1))
-              bp_enc[0]=0x02;
-          else
-              bp_enc[0]=0x03;
-          System.arraycopy(bytes, 0, bp_enc, 1, bytes.length);
-          if (!trace(curve.fromBigInteger(new BigInteger(1, bytes))).equals(curve.getA().toBigInteger()))
-              bp_enc[bp_enc.length-1]^=0x01;
-
-          return curve.decodePoint(bp_enc);*/
-
-        ECFieldElement k = curve.fromBigInteger(BigInteger.valueOf(bytes[bytes.length - 1] & 0x1));
-
-        ECFieldElement xp = curve.fromBigInteger(new BigInteger(1, bytes));
-        if (!trace(xp).equals(curve.getA()))
-        {
-            xp = xp.addOne();
-        }
-
-        ECFieldElement yp = null;
-        if (xp.isZero())
-        {
-            yp = curve.getB().sqrt();
-        }
-        else
-        {
-            ECFieldElement beta = xp.square().invert().multiply(curve.getB()).add(curve.getA()).add(xp);
-            ECFieldElement z = solveQuadraticEquation(curve, beta);
-            if (z != null)
-            {
-                if (!trace(z).equals(k))
-                {
-                    z = z.addOne();
-                }
-                yp = xp.multiply(z);
-            }
-        }
-
-        if (yp == null)
-        {
-            throw new IllegalArgumentException("Invalid point compression");
-        }
-
-        return curve.createPoint(xp.toBigInteger(), yp.toBigInteger());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/ua/DSTU4145PublicKey.java b/bcprov/src/main/java/org/bouncycastle/asn1/ua/DSTU4145PublicKey.java
deleted file mode 100644
index 769eff6..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/ua/DSTU4145PublicKey.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package org.bouncycastle.asn1.ua;
-
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.DEROctetString;
-import org.bouncycastle.math.ec.ECPoint;
-
-public class DSTU4145PublicKey
-    extends ASN1Object
-{
-
-    private ASN1OctetString pubKey;
-
-    public DSTU4145PublicKey(ECPoint pubKey)
-    {
-        // We always use big-endian in parameter encoding
-        this.pubKey = new DEROctetString(DSTU4145PointEncoder.encodePoint(pubKey));
-    }
-
-    private DSTU4145PublicKey(ASN1OctetString ocStr)
-    {
-        pubKey = ocStr;
-    }
-
-    public static DSTU4145PublicKey getInstance(Object obj)
-    {
-        if (obj instanceof DSTU4145PublicKey)
-        {
-            return (DSTU4145PublicKey)obj;
-        }
-
-        if (obj != null)
-        {
-            return new DSTU4145PublicKey(ASN1OctetString.getInstance(obj));
-        }
-
-        return null;
-    }
-
-    public ASN1Primitive toASN1Primitive()
-    {
-        return pubKey;
-    }
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/ua/UAObjectIdentifiers.java b/bcprov/src/main/java/org/bouncycastle/asn1/ua/UAObjectIdentifiers.java
deleted file mode 100644
index ccdb34e..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/ua/UAObjectIdentifiers.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package org.bouncycastle.asn1.ua;
-
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-
-/**
- * Ukrainian object identifiers
- * <p>
- * {iso(1) member-body(2) Ukraine(804) root(2) security(1) cryptography(1) pki(1)}
- * <p>
- * { ...  pki-alg(1) pki-alg-sym(3) Dstu4145WithGost34311(1) PB(1)}
- * <p>
- * DSTU4145 in polynomial basis has 2 oids, one for little-endian representation and one for big-endian
- */
-public interface UAObjectIdentifiers
-{
-    /** Base OID: 1.2.804.2.1.1.1 */
-    static final ASN1ObjectIdentifier UaOid = new ASN1ObjectIdentifier("1.2.804.2.1.1.1");
-
-    /** DSTU4145 Little Endian presentation.  OID: 1.2.804.2.1.1.1.1.3.1.1 */
-    static final ASN1ObjectIdentifier dstu4145le = UaOid.branch("1.3.1.1");
-    /** DSTU4145 Big Endian presentation.  OID: 1.2.804.2.1.1.1.1.3.1.1.1 */
-    static final ASN1ObjectIdentifier dstu4145be = UaOid.branch("1.3.1.1.1.1");
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/ua/package.html b/bcprov/src/main/java/org/bouncycastle/asn1/ua/package.html
deleted file mode 100644
index 0fc273f..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/ua/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body bgcolor="#ffffff">
-Support classes for the Ukrainian DSTU standard.
-</body>
-</html>
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/util/DERDump.java b/bcprov/src/main/java/org/bouncycastle/asn1/util/DERDump.java
deleted file mode 100644
index 78875ff..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/util/DERDump.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package org.bouncycastle.asn1.util;
-
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1Primitive;
-
-/**
- * @deprecated use ASN1Dump.
- */
-public class DERDump
-    extends ASN1Dump
-{
-    /**
-     * dump out a DER object as a formatted string
-     *
-     * @param obj the ASN1Primitive to be dumped out.
-     */
-    public static String dumpAsString(
-        ASN1Primitive obj)
-    {
-        StringBuffer buf = new StringBuffer();
-
-        _dumpAsString("", false, obj, buf);
-
-        return buf.toString();
-    }
-
-    /**
-     * dump out a DER object as a formatted string
-     *
-     * @param obj the ASN1Primitive to be dumped out.
-     */
-    public static String dumpAsString(
-        ASN1Encodable obj)
-    {
-        StringBuffer buf = new StringBuffer();
-
-        _dumpAsString("", false, obj.toASN1Primitive(), buf);
-
-        return buf.toString();
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/util/Dump.java b/bcprov/src/main/java/org/bouncycastle/asn1/util/Dump.java
deleted file mode 100644
index 27a37f3..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/util/Dump.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package org.bouncycastle.asn1.util;
-
-import java.io.FileInputStream;
-
-import org.bouncycastle.asn1.ASN1InputStream;
-
-public class Dump
-{
-    public static void main(
-        String args[])
-        throws Exception
-    {
-        FileInputStream fIn = new FileInputStream(args[0]);
-        ASN1InputStream bIn = new ASN1InputStream(fIn);
-        Object          obj = null;
-
-        while ((obj = bIn.readObject()) != null)
-        {
-            System.out.println(ASN1Dump.dumpAsString(obj));
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/util/package.html b/bcprov/src/main/java/org/bouncycastle/asn1/util/package.html
deleted file mode 100644
index 1db893d..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/util/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body bgcolor="#ffffff">
-An ASN.1 dump utility.
-</body>
-</html>
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/x500/package.html b/bcprov/src/main/java/org/bouncycastle/asn1/x500/package.html
deleted file mode 100644
index 9a3f9c6..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/x500/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body bgcolor="#ffffff">
-Support classes for the creation and processing of object based on X.500 names.
-</body>
-</html>
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/x500/style/package.html b/bcprov/src/main/java/org/bouncycastle/asn1/x500/style/package.html
deleted file mode 100644
index 219d3f5..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/x500/style/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body bgcolor="#ffffff">
-Template classes for the common styles used for converting X.500 names to strings and back.
-</body>
-</html>
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/x509/AccessDescription.java b/bcprov/src/main/java/org/bouncycastle/asn1/x509/AccessDescription.java
deleted file mode 100644
index a1aaca4..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/x509/AccessDescription.java
+++ /dev/null
@@ -1,98 +0,0 @@
-package org.bouncycastle.asn1.x509;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DERSequence;
-
-/**
- * The AccessDescription object.
- * <pre>
- * AccessDescription  ::=  SEQUENCE {
- *       accessMethod          OBJECT IDENTIFIER,
- *       accessLocation        GeneralName  }
- * </pre>
- */
-public class AccessDescription
-    extends ASN1Object
-{
-    public final static ASN1ObjectIdentifier id_ad_caIssuers = new ASN1ObjectIdentifier("1.3.6.1.5.5.7.48.2");
-    
-    public final static ASN1ObjectIdentifier id_ad_ocsp = new ASN1ObjectIdentifier("1.3.6.1.5.5.7.48.1");
-        
-    ASN1ObjectIdentifier accessMethod = null;
-    GeneralName accessLocation = null;
-
-    public static AccessDescription getInstance(
-        Object  obj)
-    {
-        if (obj instanceof AccessDescription)
-        {
-            return (AccessDescription)obj;
-        }
-        else if (obj != null)
-        {
-            return new AccessDescription(ASN1Sequence.getInstance(obj));
-        }
-
-        return null;
-    }
- 
-    private AccessDescription(
-        ASN1Sequence   seq)
-    {
-        if (seq.size() != 2) 
-        {
-            throw new IllegalArgumentException("wrong number of elements in sequence");
-        }
-        
-        accessMethod = ASN1ObjectIdentifier.getInstance(seq.getObjectAt(0));
-        accessLocation = GeneralName.getInstance(seq.getObjectAt(1));
-    }
-
-    /**
-     * create an AccessDescription with the oid and location provided.
-     */
-    public AccessDescription(
-        ASN1ObjectIdentifier oid,
-        GeneralName location)
-    {
-        accessMethod = oid;
-        accessLocation = location;
-    }
-
-    /**
-     * 
-     * @return the access method.
-     */
-    public ASN1ObjectIdentifier getAccessMethod()
-    {
-        return accessMethod;
-    }
-    
-    /**
-     * 
-     * @return the access location
-     */
-    public GeneralName getAccessLocation()
-    {
-        return accessLocation;
-    }
-    
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector accessDescription  = new ASN1EncodableVector();
-        
-        accessDescription.add(accessMethod);
-        accessDescription.add(accessLocation);
-
-        return new DERSequence(accessDescription);
-    }
-
-    public String toString()
-    {
-        return ("AccessDescription: Oid(" + this.accessMethod.getId() + ")");
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/x509/AuthorityInformationAccess.java b/bcprov/src/main/java/org/bouncycastle/asn1/x509/AuthorityInformationAccess.java
deleted file mode 100644
index f66f270..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/x509/AuthorityInformationAccess.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package org.bouncycastle.asn1.x509;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DERSequence;
-
-/**
- * The AuthorityInformationAccess object.
- * <pre>
- * id-pe-authorityInfoAccess OBJECT IDENTIFIER ::= { id-pe 1 }
- *
- * AuthorityInfoAccessSyntax  ::=
- *      SEQUENCE SIZE (1..MAX) OF AccessDescription
- * AccessDescription  ::=  SEQUENCE {
- *       accessMethod          OBJECT IDENTIFIER,
- *       accessLocation        GeneralName  }
- *
- * id-ad OBJECT IDENTIFIER ::= { id-pkix 48 }
- * id-ad-caIssuers OBJECT IDENTIFIER ::= { id-ad 2 }
- * id-ad-ocsp OBJECT IDENTIFIER ::= { id-ad 1 }
- * </pre>
- */
-public class AuthorityInformationAccess
-    extends ASN1Object
-{
-    private AccessDescription[]    descriptions;
-
-    public static AuthorityInformationAccess getInstance(
-        Object  obj)
-    {
-        if (obj instanceof AuthorityInformationAccess)
-        {
-            return (AuthorityInformationAccess)obj;
-        }
-
-        if (obj != null)
-        {
-            return new AuthorityInformationAccess(ASN1Sequence.getInstance(obj));
-        }
-
-        return null;
-    }
- 
-    private AuthorityInformationAccess(
-        ASN1Sequence   seq)
-    {
-        if (seq.size() < 1) 
-        {
-            throw new IllegalArgumentException("sequence may not be empty");
-        }
-
-        descriptions = new AccessDescription[seq.size()];
-        
-        for (int i = 0; i != seq.size(); i++)
-        {
-            descriptions[i] = AccessDescription.getInstance(seq.getObjectAt(i));
-        }
-    }
-
-    public AuthorityInformationAccess(
-        AccessDescription description)
-    {
-        this.descriptions = new AccessDescription[]{ description };
-    }
-
-    /**
-     * create an AuthorityInformationAccess with the oid and location provided.
-     */
-    public AuthorityInformationAccess(
-        ASN1ObjectIdentifier oid,
-        GeneralName location)
-    {
-        this(new AccessDescription(oid, location));
-    }
-
-    /**
-     * 
-     * @return the access descriptions contained in this object.
-     */
-    public AccessDescription[] getAccessDescriptions()
-    {
-        return descriptions;
-    }
-    
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector vec = new ASN1EncodableVector();
-        
-        for (int i = 0; i != descriptions.length; i++)
-        {
-            vec.add(descriptions[i]);
-        }
-        
-        return new DERSequence(vec);
-    }
-
-    public String toString()
-    {
-        return ("AuthorityInformationAccess: Oid(" + this.descriptions[0].getAccessMethod().getId() + ")");
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/x509/AuthorityKeyIdentifier.java b/bcprov/src/main/java/org/bouncycastle/asn1/x509/AuthorityKeyIdentifier.java
index 302ba03..20f6ea3 100644
--- a/bcprov/src/main/java/org/bouncycastle/asn1/x509/AuthorityKeyIdentifier.java
+++ b/bcprov/src/main/java/org/bouncycastle/asn1/x509/AuthorityKeyIdentifier.java
@@ -14,7 +14,9 @@ import org.bouncycastle.asn1.DEROctetString;
 import org.bouncycastle.asn1.DERSequence;
 import org.bouncycastle.asn1.DERTaggedObject;
 import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.digests.SHA1Digest;
+// BEGIN android-changed
+import org.bouncycastle.crypto.digests.AndroidDigestFactory;
+// END android-changed
 
 /**
  * The AuthorityKeyIdentifier object.
@@ -106,7 +108,9 @@ public class AuthorityKeyIdentifier
     public AuthorityKeyIdentifier(
         SubjectPublicKeyInfo    spki)
     {
-        Digest  digest = new SHA1Digest();
+        // BEGIN android-changed
+        Digest  digest = AndroidDigestFactory.getSHA1();
+        // END android-changed
         byte[]  resBuf = new byte[digest.getDigestSize()];
 
         byte[] bytes = spki.getPublicKeyData().getBytes();
@@ -125,7 +129,9 @@ public class AuthorityKeyIdentifier
         GeneralNames            name,
         BigInteger              serialNumber)
     {
-        Digest  digest = new SHA1Digest();
+        // BEGIN android-changed
+        Digest  digest = AndroidDigestFactory.getSHA1();
+        // END android-changed
         byte[]  resBuf = new byte[digest.getDigestSize()];
 
         byte[] bytes = spki.getPublicKeyData().getBytes();
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/x509/CertPolicyId.java b/bcprov/src/main/java/org/bouncycastle/asn1/x509/CertPolicyId.java
deleted file mode 100644
index ab1e5a2..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/x509/CertPolicyId.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package org.bouncycastle.asn1.x509;
-
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1Primitive;
-
-
-/**
- * CertPolicyId, used in the CertificatePolicies and PolicyMappings
- * X509V3 Extensions.
- *
- * <pre>
- *     CertPolicyId ::= OBJECT IDENTIFIER
- * </pre>
- */
-/**
- * CertPolicyId, used in the CertificatePolicies and PolicyMappings
- * X509V3 Extensions.
- *
- * <pre>
- *     CertPolicyId ::= OBJECT IDENTIFIER
- * </pre>
- */
-public class CertPolicyId
-    extends ASN1Object
-{
-    private ASN1ObjectIdentifier id;
-
-    private CertPolicyId(ASN1ObjectIdentifier id)
-    {
-        this.id = id;
-    }
-
-    public static CertPolicyId getInstance(Object o)
-    {
-        if (o instanceof CertPolicyId)
-        {
-            return (CertPolicyId)o;
-        }
-        else if (o != null)
-        {
-            return new CertPolicyId(ASN1ObjectIdentifier.getInstance(o));
-        }
-
-        return null;
-    }
-
-    public String getId()
-    {
-        return id.getId();
-    }
-
-    public ASN1Primitive toASN1Primitive()
-    {
-        return id;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/x509/CertificatePair.java b/bcprov/src/main/java/org/bouncycastle/asn1/x509/CertificatePair.java
deleted file mode 100644
index ef187e1..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/x509/CertificatePair.java
+++ /dev/null
@@ -1,167 +0,0 @@
-package org.bouncycastle.asn1.x509;
-
-import java.util.Enumeration;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.ASN1TaggedObject;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.DERTaggedObject;
-
-/**
- * This class helps to support crossCerfificatePairs in a LDAP directory
- * according RFC 2587
- * 
- * <pre>
- *     crossCertificatePairATTRIBUTE::={
- *       WITH SYNTAX   CertificatePair
- *       EQUALITY MATCHING RULE certificatePairExactMatch
- *       ID joint-iso-ccitt(2) ds(5) attributeType(4) crossCertificatePair(40)}
- * </pre>
- * 
- * <blockquote> The forward elements of the crossCertificatePair attribute of a
- * CA's directory entry shall be used to store all, except self-issued
- * certificates issued to this CA. Optionally, the reverse elements of the
- * crossCertificatePair attribute, of a CA's directory entry may contain a
- * subset of certificates issued by this CA to other CAs. When both the forward
- * and the reverse elements are present in a single attribute value, issuer name
- * in one certificate shall match the subject name in the other and vice versa,
- * and the subject public key in one certificate shall be capable of verifying
- * the digital signature on the other certificate and vice versa.
- * 
- * When a reverse element is present, the forward element value and the reverse
- * element value need not be stored in the same attribute value; in other words,
- * they can be stored in either a single attribute value or two attribute
- * values. </blockquote>
- * 
- * <pre>
- *       CertificatePair ::= SEQUENCE {
- *         forward        [0]    Certificate OPTIONAL,
- *         reverse        [1]    Certificate OPTIONAL,
- *         -- at least one of the pair shall be present -- } 
- * </pre>
- */
-public class CertificatePair
-    extends ASN1Object
-{
-    private Certificate forward;
-
-    private Certificate reverse;
-
-    public static CertificatePair getInstance(Object obj)
-    {
-        if (obj == null || obj instanceof CertificatePair)
-        {
-            return (CertificatePair)obj;
-        }
-
-        if (obj instanceof ASN1Sequence)
-        {
-            return new CertificatePair((ASN1Sequence)obj);
-        }
-
-        throw new IllegalArgumentException("illegal object in getInstance: "
-            + obj.getClass().getName());
-    }
-
-    /**
-     * Constructor from ASN1Sequence.
-     * <p>
-     * The sequence is of type CertificatePair:
-     * <pre>
-     *       CertificatePair ::= SEQUENCE {
-     *         forward        [0]    Certificate OPTIONAL,
-     *         reverse        [1]    Certificate OPTIONAL,
-     *         -- at least one of the pair shall be present -- }
-     * </pre>
-     * </p>
-     * @param seq The ASN.1 sequence.
-     */
-    private CertificatePair(ASN1Sequence seq)
-    {
-        if (seq.size() != 1 && seq.size() != 2)
-        {
-            throw new IllegalArgumentException("Bad sequence size: "
-                + seq.size());
-        }
-
-        Enumeration e = seq.getObjects();
-
-        while (e.hasMoreElements())
-        {
-            ASN1TaggedObject o = ASN1TaggedObject.getInstance(e.nextElement());
-            if (o.getTagNo() == 0)
-            {
-                forward = Certificate.getInstance(o, true);
-            }
-            else if (o.getTagNo() == 1)
-            {
-                reverse = Certificate.getInstance(o, true);
-            }
-            else
-            {
-                throw new IllegalArgumentException("Bad tag number: "
-                    + o.getTagNo());
-            }
-        }
-    }
-
-    /**
-     * Constructor from a given details.
-     *
-     * @param forward Certificates issued to this CA.
-     * @param reverse Certificates issued by this CA to other CAs.
-     */
-    public CertificatePair(Certificate forward, Certificate reverse)
-    {
-        this.forward = forward;
-        this.reverse = reverse;
-    }
-
-    /**
-     * Produce an object suitable for an ASN1OutputStream.
-     * <p>
-     * Returns:
-     * <pre>
-     *       CertificatePair ::= SEQUENCE {
-     *         forward        [0]    Certificate OPTIONAL,
-     *         reverse        [1]    Certificate OPTIONAL,
-     *         -- at least one of the pair shall be present -- }
-     * </pre>
-     *
-     * @return a ASN1Primitive
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector vec = new ASN1EncodableVector();
-
-        if (forward != null)
-        {
-            vec.add(new DERTaggedObject(0, forward));
-        }
-        if (reverse != null)
-        {
-            vec.add(new DERTaggedObject(1, reverse));
-        }
-
-        return new DERSequence(vec);
-    }
-
-    /**
-     * @return Returns the forward.
-     */
-    public Certificate getForward()
-    {
-        return forward;
-    }
-
-    /**
-     * @return Returns the reverse.
-     */
-    public Certificate getReverse()
-    {
-        return reverse;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/x509/CertificatePolicies.java b/bcprov/src/main/java/org/bouncycastle/asn1/x509/CertificatePolicies.java
deleted file mode 100644
index 4d7fc0b..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/x509/CertificatePolicies.java
+++ /dev/null
@@ -1,124 +0,0 @@
-package org.bouncycastle.asn1.x509;
-
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.ASN1TaggedObject;
-import org.bouncycastle.asn1.DERSequence;
-
-public class CertificatePolicies
-    extends ASN1Object
-{
-    private final PolicyInformation[] policyInformation;
-
-    public static CertificatePolicies getInstance(
-        Object  obj)
-    {
-        if (obj instanceof CertificatePolicies)
-        {
-            return (CertificatePolicies)obj;
-        }
-
-        if (obj != null)
-        {
-            return new CertificatePolicies(ASN1Sequence.getInstance(obj));
-        }
-
-        return null;
-    }
-
-    public static CertificatePolicies getInstance(
-        ASN1TaggedObject obj,
-        boolean          explicit)
-    {
-        return getInstance(ASN1Sequence.getInstance(obj, explicit));
-    }
-
-    /**
-     * Retrieve a CertificatePolicies for a passed in Extensions object, if present.
-     *
-     * @param extensions the extensions object to be examined.
-     * @return  the CertificatePolicies, null if the extension is not present.
-     */
-    public static CertificatePolicies fromExtensions(Extensions extensions)
-    {
-        return CertificatePolicies.getInstance(extensions.getExtensionParsedValue(Extension.certificatePolicies));
-    }
-
-    /**
-     * Construct a CertificatePolicies object containing one PolicyInformation.
-     * 
-     * @param name the name to be contained.
-     */
-    public CertificatePolicies(
-        PolicyInformation  name)
-    {
-        this.policyInformation = new PolicyInformation[] { name };
-    }
-
-    public CertificatePolicies(
-        PolicyInformation[] policyInformation)
-    {
-        this.policyInformation = policyInformation;
-    }
-
-    private CertificatePolicies(
-        ASN1Sequence  seq)
-    {
-        this.policyInformation = new PolicyInformation[seq.size()];
-
-        for (int i = 0; i != seq.size(); i++)
-        {
-            policyInformation[i] = PolicyInformation.getInstance(seq.getObjectAt(i));
-        }
-    }
-
-    public PolicyInformation[] getPolicyInformation()
-    {
-        PolicyInformation[] tmp = new PolicyInformation[policyInformation.length];
-
-        System.arraycopy(policyInformation, 0, tmp, 0, policyInformation.length);
-
-        return tmp;
-    }
-
-    public PolicyInformation getPolicyInformation(ASN1ObjectIdentifier policyIdentifier)
-    {
-        for (int i = 0; i != policyInformation.length; i++)
-        {
-            if (policyIdentifier.equals(policyInformation[i].getPolicyIdentifier()))
-            {
-                 return policyInformation[i];
-            }
-        }
-
-        return null;
-    }
-
-    /**
-     * Produce an object suitable for an ASN1OutputStream.
-     * <pre>
-     * CertificatePolicies ::= SEQUENCE SIZE {1..MAX} OF PolicyInformation
-     * </pre>
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        return new DERSequence(policyInformation);
-    }
-
-    public String toString()
-    {
-        String p = null;
-        for (int i = 0; i < policyInformation.length; i++)
-        {
-            if (p != null)
-            {
-                p += ", ";
-            }
-            p += policyInformation[i];
-        }
-
-        return "CertificatePolicies: " + p;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/x509/DisplayText.java b/bcprov/src/main/java/org/bouncycastle/asn1/x509/DisplayText.java
deleted file mode 100644
index acebcbe..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/x509/DisplayText.java
+++ /dev/null
@@ -1,165 +0,0 @@
-
-package org.bouncycastle.asn1.x509;
-
-import org.bouncycastle.asn1.ASN1Choice;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1String;
-import org.bouncycastle.asn1.ASN1TaggedObject;
-import org.bouncycastle.asn1.DERBMPString;
-import org.bouncycastle.asn1.DERIA5String;
-import org.bouncycastle.asn1.DERUTF8String;
-import org.bouncycastle.asn1.DERVisibleString;
-
-/**
- * <code>DisplayText</code> class, used in
- * <code>CertificatePolicies</code> X509 V3 extensions (in policy qualifiers).
- *
- * <p>It stores a string in a chosen encoding. 
- * <pre>
- * DisplayText ::= CHOICE {
- *      ia5String        IA5String      (SIZE (1..200)),
- *      visibleString    VisibleString  (SIZE (1..200)),
- *      bmpString        BMPString      (SIZE (1..200)),
- *      utf8String       UTF8String     (SIZE (1..200)) }
- * </pre>
- * @see PolicyQualifierInfo
- * @see PolicyInformation
- */
-public class DisplayText 
-    extends ASN1Object
-    implements ASN1Choice
-{
-   /**
-    * Constant corresponding to ia5String encoding. 
-    *
-    */
-   public static final int CONTENT_TYPE_IA5STRING = 0;
-   /**
-    * Constant corresponding to bmpString encoding. 
-    *
-    */
-   public static final int CONTENT_TYPE_BMPSTRING = 1;
-   /**
-    * Constant corresponding to utf8String encoding. 
-    *
-    */
-   public static final int CONTENT_TYPE_UTF8STRING = 2;
-   /**
-    * Constant corresponding to visibleString encoding. 
-    *
-    */
-   public static final int CONTENT_TYPE_VISIBLESTRING = 3;
-
-   /**
-    * Describe constant <code>DISPLAY_TEXT_MAXIMUM_SIZE</code> here.
-    *
-    */
-   public static final int DISPLAY_TEXT_MAXIMUM_SIZE = 200;
-   
-   int contentType;
-   ASN1String contents;
-   
-   /**
-    * Creates a new <code>DisplayText</code> instance.
-    *
-    * @param type the desired encoding type for the text. 
-    * @param text the text to store. Strings longer than 200
-    * characters are truncated. 
-    */
-   public DisplayText(int type, String text)
-   {
-      if (text.length() > DISPLAY_TEXT_MAXIMUM_SIZE)
-      {
-         // RFC3280 limits these strings to 200 chars
-         // truncate the string
-         text = text.substring (0, DISPLAY_TEXT_MAXIMUM_SIZE);
-      }
-     
-      contentType = type;
-      switch (type)
-      {
-         case CONTENT_TYPE_IA5STRING:
-            contents = new DERIA5String(text);
-            break;
-         case CONTENT_TYPE_UTF8STRING:
-            contents = new DERUTF8String(text);
-            break;
-         case CONTENT_TYPE_VISIBLESTRING:
-            contents = new DERVisibleString(text);
-            break;
-         case CONTENT_TYPE_BMPSTRING:
-            contents = new DERBMPString(text);
-            break;
-         default:
-            contents = new DERUTF8String(text);
-            break;
-      }
-   }
-   
-   /**
-    * Creates a new <code>DisplayText</code> instance.
-    *
-    * @param text the text to encapsulate. Strings longer than 200
-    * characters are truncated. 
-    */
-   public DisplayText(String text) 
-   {
-      // by default use UTF8String
-      if (text.length() > DISPLAY_TEXT_MAXIMUM_SIZE)
-      {
-         text = text.substring(0, DISPLAY_TEXT_MAXIMUM_SIZE);
-      }
-      
-      contentType = CONTENT_TYPE_UTF8STRING;
-      contents = new DERUTF8String(text);
-   }
-
-   /**
-    * Creates a new <code>DisplayText</code> instance.
-    * <p>Useful when reading back a <code>DisplayText</code> class
-    * from it's ASN1Encodable/DEREncodable form. 
-    *
-    * @param de a <code>DEREncodable</code> instance. 
-    */
-   private DisplayText(ASN1String de)
-   {
-      contents = de;
-   }
-
-   public static DisplayText getInstance(Object obj) 
-   {
-      if  (obj instanceof ASN1String)
-      {
-          return new DisplayText((ASN1String)obj);
-      }
-      else if (obj == null || obj instanceof DisplayText)
-      {
-          return (DisplayText)obj;
-      }
-
-      throw new IllegalArgumentException("illegal object in getInstance: " + obj.getClass().getName());
-   }
-
-   public static DisplayText getInstance(
-       ASN1TaggedObject obj,
-       boolean          explicit)
-   {
-       return getInstance(obj.getObject()); // must be explicitly tagged
-   }
-   
-   public ASN1Primitive toASN1Primitive()
-   {
-      return (ASN1Primitive)contents;
-   }
-
-   /**
-    * Returns the stored <code>String</code> object. 
-    *
-    * @return the stored text as a <code>String</code>. 
-    */
-   public String getString() 
-   {
-      return contents.getString();
-   }   
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/x509/GeneralNamesBuilder.java b/bcprov/src/main/java/org/bouncycastle/asn1/x509/GeneralNamesBuilder.java
deleted file mode 100644
index 14f0c2c..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/x509/GeneralNamesBuilder.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package org.bouncycastle.asn1.x509;
-
-import java.util.Vector;
-
-public class GeneralNamesBuilder
-{
-    private Vector names = new Vector();
-
-    public GeneralNamesBuilder addNames(GeneralNames names)
-    {
-        GeneralName[] n = names.getNames();
-
-        for (int i = 0; i != n.length; i++)
-        {
-            this.names.addElement(n[i]);
-        }
-
-        return this;
-    }
-
-    public GeneralNamesBuilder addName(GeneralName name)
-    {
-        names.addElement(name);
-
-        return this;
-    }
-
-    public GeneralNames build()
-    {
-        GeneralName[] tmp = new GeneralName[names.size()];
-
-        for (int i = 0; i != tmp.length; i++)
-        {
-            tmp[i] = (GeneralName)names.elementAt(i);
-        }
-
-        return new GeneralNames(tmp);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/x509/IetfAttrSyntax.java b/bcprov/src/main/java/org/bouncycastle/asn1/x509/IetfAttrSyntax.java
deleted file mode 100644
index 5a70140..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/x509/IetfAttrSyntax.java
+++ /dev/null
@@ -1,189 +0,0 @@
-package org.bouncycastle.asn1.x509;
-
-import java.util.Enumeration;
-import java.util.Vector;
-
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.ASN1TaggedObject;
-import org.bouncycastle.asn1.DEROctetString;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.DERTaggedObject;
-import org.bouncycastle.asn1.DERUTF8String;
-
-/**
- * Implementation of <code>IetfAttrSyntax</code> as specified by RFC3281.
- */
-public class IetfAttrSyntax
-    extends ASN1Object
-{
-    public static final int VALUE_OCTETS    = 1;
-    public static final int VALUE_OID       = 2;
-    public static final int VALUE_UTF8      = 3;
-    GeneralNames            policyAuthority = null;
-    Vector                  values          = new Vector();
-    int                     valueChoice     = -1;
-
-    public static IetfAttrSyntax getInstance(Object obj)
-    {
-        if (obj instanceof IetfAttrSyntax)
-        {
-            return (IetfAttrSyntax)obj;
-        }
-        if (obj != null)
-        {
-            return new IetfAttrSyntax(ASN1Sequence.getInstance(obj));
-        }
-
-        return null;
-    }
-
-    /**
-     *  
-     */
-    private IetfAttrSyntax(ASN1Sequence seq)
-    {
-        int i = 0;
-
-        if (seq.getObjectAt(0) instanceof ASN1TaggedObject)
-        {
-            policyAuthority = GeneralNames.getInstance(((ASN1TaggedObject)seq.getObjectAt(0)), false);
-            i++;
-        }
-        else if (seq.size() == 2)
-        { // VOMS fix
-            policyAuthority = GeneralNames.getInstance(seq.getObjectAt(0));
-            i++;
-        }
-
-        if (!(seq.getObjectAt(i) instanceof ASN1Sequence))
-        {
-            throw new IllegalArgumentException("Non-IetfAttrSyntax encoding");
-        }
-
-        seq = (ASN1Sequence)seq.getObjectAt(i);
-
-        for (Enumeration e = seq.getObjects(); e.hasMoreElements();)
-        {
-            ASN1Primitive obj = (ASN1Primitive)e.nextElement();
-            int type;
-
-            if (obj instanceof ASN1ObjectIdentifier)
-            {
-                type = VALUE_OID;
-            }
-            else if (obj instanceof DERUTF8String)
-            {
-                type = VALUE_UTF8;
-            }
-            else if (obj instanceof DEROctetString)
-            {
-                type = VALUE_OCTETS;
-            }
-            else
-            {
-                throw new IllegalArgumentException("Bad value type encoding IetfAttrSyntax");
-            }
-
-            if (valueChoice < 0)
-            {
-                valueChoice = type;
-            }
-
-            if (type != valueChoice)
-            {
-                throw new IllegalArgumentException("Mix of value types in IetfAttrSyntax");
-            }
-
-            values.addElement(obj);
-        }
-    }
-
-    public GeneralNames getPolicyAuthority()
-    {
-        return policyAuthority;
-    }
-
-    public int getValueType()
-    {
-        return valueChoice;
-    }
-
-    public Object[] getValues()
-    {
-        if (this.getValueType() == VALUE_OCTETS)
-        {
-            ASN1OctetString[] tmp = new ASN1OctetString[values.size()];
-            
-            for (int i = 0; i != tmp.length; i++)
-            {
-                tmp[i] = (ASN1OctetString)values.elementAt(i);
-            }
-            
-            return tmp;
-        }
-        else if (this.getValueType() == VALUE_OID)
-        {
-            ASN1ObjectIdentifier[] tmp = new ASN1ObjectIdentifier[values.size()];
-            
-            for (int i = 0; i != tmp.length; i++)
-            {
-                tmp[i] = (ASN1ObjectIdentifier)values.elementAt(i);
-            }
-            
-            return tmp;
-        }
-        else
-        {
-            DERUTF8String[] tmp = new DERUTF8String[values.size()];
-            
-            for (int i = 0; i != tmp.length; i++)
-            {
-                tmp[i] = (DERUTF8String)values.elementAt(i);
-            }
-            
-            return tmp;
-        }
-    }
-
-    /**
-     * 
-     * <pre>
-     * 
-     *  IetfAttrSyntax ::= SEQUENCE {
-     *    policyAuthority [0] GeneralNames OPTIONAL,
-     *    values SEQUENCE OF CHOICE {
-     *      octets OCTET STRING,
-     *      oid OBJECT IDENTIFIER,
-     *      string UTF8String
-     *    }
-     *  }
-     *  
-     * </pre>
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector v = new ASN1EncodableVector();
-
-        if (policyAuthority != null)
-        {
-            v.add(new DERTaggedObject(0, policyAuthority));
-        }
-
-        ASN1EncodableVector v2 = new ASN1EncodableVector();
-
-        for (Enumeration i = values.elements(); i.hasMoreElements();)
-        {
-            v2.add((ASN1Encodable)i.nextElement());
-        }
-
-        v.add(new DERSequence(v2));
-
-        return new DERSequence(v);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/x509/NoticeReference.java b/bcprov/src/main/java/org/bouncycastle/asn1/x509/NoticeReference.java
deleted file mode 100644
index d46f524..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/x509/NoticeReference.java
+++ /dev/null
@@ -1,170 +0,0 @@
-package org.bouncycastle.asn1.x509;
-
-import java.math.BigInteger;
-import java.util.Enumeration;
-import java.util.Vector;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DERSequence;
-
-/**
- * <code>NoticeReference</code> class, used in
- * <code>CertificatePolicies</code> X509 V3 extensions
- * (in policy qualifiers).
- * 
- * <pre>
- *  NoticeReference ::= SEQUENCE {
- *      organization     DisplayText,
- *      noticeNumbers    SEQUENCE OF INTEGER }
- *
- * </pre> 
- * 
- * @see PolicyQualifierInfo
- * @see PolicyInformation
- */
-public class NoticeReference 
-    extends ASN1Object
-{
-    private DisplayText organization;
-    private ASN1Sequence noticeNumbers;
-
-    private static ASN1EncodableVector convertVector(Vector numbers)
-    {
-        ASN1EncodableVector av = new ASN1EncodableVector();
-
-        Enumeration it = numbers.elements();
-
-        while (it.hasMoreElements())
-        {
-            Object o = it.nextElement();
-            ASN1Integer di;
-
-            if (o instanceof BigInteger)
-            {
-                di = new ASN1Integer((BigInteger)o);
-            }
-            else if (o instanceof Integer)
-            {
-                di = new ASN1Integer(((Integer)o).intValue());
-            }
-            else
-            {
-                throw new IllegalArgumentException();
-            }
-
-            av.add(di);
-        }
-        return av;
-    }
-
-   /**
-    * Creates a new <code>NoticeReference</code> instance.
-    *
-    * @param organization a <code>String</code> value
-    * @param numbers a <code>Vector</code> value
-    */
-   public NoticeReference(
-       String organization,
-       Vector numbers) 
-   {
-       this(organization, convertVector(numbers));
-   }
-
-    /**
-    * Creates a new <code>NoticeReference</code> instance.
-    *
-    * @param organization a <code>String</code> value
-    * @param noticeNumbers an <code>ASN1EncodableVector</code> value
-    */
-   public NoticeReference(
-       String organization,
-       ASN1EncodableVector noticeNumbers)
-   {
-       this(new DisplayText(organization), noticeNumbers);
-   }
-
-   /**
-    * Creates a new <code>NoticeReference</code> instance.
-    *
-    * @param organization displayText
-    * @param noticeNumbers an <code>ASN1EncodableVector</code> value
-    */
-   public NoticeReference(
-       DisplayText  organization,
-       ASN1EncodableVector noticeNumbers)
-   {
-       this.organization = organization;
-       this.noticeNumbers = new DERSequence(noticeNumbers);
-   }
-
-   /**
-    * Creates a new <code>NoticeReference</code> instance.
-    * <p>Useful for reconstructing a <code>NoticeReference</code>
-    * instance from its encodable/encoded form. 
-    *
-    * @param as an <code>ASN1Sequence</code> value obtained from either
-    * calling @{link toASN1Primitive()} for a <code>NoticeReference</code>
-    * instance or from parsing it from a DER-encoded stream. 
-    */
-   private NoticeReference(
-       ASN1Sequence as) 
-   {
-       if (as.size() != 2)
-       {
-            throw new IllegalArgumentException("Bad sequence size: "
-                    + as.size());
-       }
-
-       organization = DisplayText.getInstance(as.getObjectAt(0));
-       noticeNumbers = ASN1Sequence.getInstance(as.getObjectAt(1));
-   }
-
-   public static NoticeReference getInstance(
-       Object as) 
-   {
-      if (as instanceof NoticeReference)
-      {
-          return (NoticeReference)as;
-      }
-      else if (as != null)
-      {
-          return new NoticeReference(ASN1Sequence.getInstance(as));
-      }
-
-      return null;
-   }
-   
-   public DisplayText getOrganization()
-   {
-       return organization;
-   }
-   
-   public ASN1Integer[] getNoticeNumbers()
-   {
-       ASN1Integer[] tmp = new ASN1Integer[noticeNumbers.size()];
-
-       for (int i = 0; i != noticeNumbers.size(); i++)
-       {
-           tmp[i] = ASN1Integer.getInstance(noticeNumbers.getObjectAt(i));
-       }
-
-       return tmp;
-   }
-   
-   /**
-    * Describe <code>toASN1Object</code> method here.
-    *
-    * @return a <code>ASN1Primitive</code> value
-    */
-   public ASN1Primitive toASN1Primitive()
-   {
-      ASN1EncodableVector av = new ASN1EncodableVector();
-      av.add (organization);
-      av.add (noticeNumbers);
-      return new DERSequence (av);
-   }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/x509/PolicyMappings.java b/bcprov/src/main/java/org/bouncycastle/asn1/x509/PolicyMappings.java
deleted file mode 100644
index 6afab95..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/x509/PolicyMappings.java
+++ /dev/null
@@ -1,107 +0,0 @@
-package org.bouncycastle.asn1.x509;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DERSequence;
-
-/**
- * PolicyMappings V3 extension, described in RFC3280.
- * <pre>
- *    PolicyMappings ::= SEQUENCE SIZE (1..MAX) OF SEQUENCE {
- *      issuerDomainPolicy      CertPolicyId,
- *      subjectDomainPolicy     CertPolicyId }
- * </pre>
- *
- * @see <a href="http://www.faqs.org/rfc/rfc3280.txt">RFC 3280, section 4.2.1.6</a>
- */
-public class PolicyMappings
-    extends ASN1Object
-{
-    ASN1Sequence seq = null;
-
-    public static PolicyMappings getInstance(Object obj)
-    {
-        if (obj instanceof PolicyMappings)
-        {
-            return (PolicyMappings)obj;
-        }
-        if (obj != null)
-        {
-            return new PolicyMappings(ASN1Sequence.getInstance(obj));
-        }
-
-        return null;
-    }
-
-    /**
-     * Creates a new <code>PolicyMappings</code> instance.
-     *
-     * @param seq an <code>ASN1Sequence</code> constructed as specified
-     *            in RFC 3280
-     */
-    private PolicyMappings(ASN1Sequence seq)
-    {
-        this.seq = seq;
-    }
-
-    /**
-     * Creates a new <code>PolicyMappings</code> instance.
-     *
-     * @param mappings a <code>HashMap</code> value that maps
-     *                 <code>String</code> oids
-     *                 to other <code>String</code> oids.
-     * @deprecated use CertPolicyId constructors.
-     */
-    public PolicyMappings(Hashtable mappings)
-    {
-        ASN1EncodableVector dev = new ASN1EncodableVector();
-        Enumeration it = mappings.keys();
-
-        while (it.hasMoreElements())
-        {
-            String idp = (String)it.nextElement();
-            String sdp = (String)mappings.get(idp);
-            ASN1EncodableVector dv = new ASN1EncodableVector();
-            dv.add(new ASN1ObjectIdentifier(idp));
-            dv.add(new ASN1ObjectIdentifier(sdp));
-            dev.add(new DERSequence(dv));
-        }
-
-        seq = new DERSequence(dev);
-    }
-
-    public PolicyMappings(CertPolicyId issuerDomainPolicy, CertPolicyId subjectDomainPolicy)
-    {
-        ASN1EncodableVector dv = new ASN1EncodableVector();
-        dv.add(issuerDomainPolicy);
-        dv.add(subjectDomainPolicy);
-
-        seq = new DERSequence(new DERSequence(dv));
-    }
-
-    public PolicyMappings(CertPolicyId[] issuerDomainPolicy, CertPolicyId[] subjectDomainPolicy)
-    {
-        ASN1EncodableVector dev = new ASN1EncodableVector();
-
-        for (int i = 0; i != issuerDomainPolicy.length; i++)
-        {
-            ASN1EncodableVector dv = new ASN1EncodableVector();
-            dv.add(issuerDomainPolicy[i]);
-            dv.add(subjectDomainPolicy[i]);
-            dev.add(new DERSequence(dv));
-        }
-
-        seq = new DERSequence(dev);
-    }
-
-    public ASN1Primitive toASN1Primitive()
-    {
-        return seq;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/x509/PolicyQualifierId.java b/bcprov/src/main/java/org/bouncycastle/asn1/x509/PolicyQualifierId.java
deleted file mode 100644
index 82835f6..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/x509/PolicyQualifierId.java
+++ /dev/null
@@ -1,31 +0,0 @@
-
-package org.bouncycastle.asn1.x509;
-
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-
-/**
- * PolicyQualifierId, used in the CertificatePolicies
- * X509V3 extension.
- * 
- * <pre>
- *    id-qt          OBJECT IDENTIFIER ::=  { id-pkix 2 }
- *    id-qt-cps      OBJECT IDENTIFIER ::=  { id-qt 1 }
- *    id-qt-unotice  OBJECT IDENTIFIER ::=  { id-qt 2 }
- *  PolicyQualifierId ::=
- *       OBJECT IDENTIFIER (id-qt-cps | id-qt-unotice)
- * </pre>
- */
-public class PolicyQualifierId extends ASN1ObjectIdentifier 
-{
-   private static final String id_qt = "1.3.6.1.5.5.7.2";
-
-   private PolicyQualifierId(String id) 
-      {
-         super(id);
-      }
-   
-   public static final PolicyQualifierId id_qt_cps =
-       new PolicyQualifierId(id_qt + ".1");
-   public static final PolicyQualifierId id_qt_unotice =
-       new PolicyQualifierId(id_qt + ".2");
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/x509/PolicyQualifierInfo.java b/bcprov/src/main/java/org/bouncycastle/asn1/x509/PolicyQualifierInfo.java
deleted file mode 100644
index fe09169..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/x509/PolicyQualifierInfo.java
+++ /dev/null
@@ -1,115 +0,0 @@
-package org.bouncycastle.asn1.x509;
-
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DERIA5String;
-import org.bouncycastle.asn1.DERSequence;
-
-/**
- * Policy qualifiers, used in the X509V3 CertificatePolicies
- * extension.
- * 
- * <pre>
- *   PolicyQualifierInfo ::= SEQUENCE {
- *       policyQualifierId  PolicyQualifierId,
- *       qualifier          ANY DEFINED BY policyQualifierId }
- * </pre>
- */
-public class PolicyQualifierInfo
-    extends ASN1Object
-{
-   private ASN1ObjectIdentifier policyQualifierId;
-   private ASN1Encodable        qualifier;
-
-   /**
-    * Creates a new <code>PolicyQualifierInfo</code> instance.
-    *
-    * @param policyQualifierId a <code>PolicyQualifierId</code> value
-    * @param qualifier the qualifier, defined by the above field.
-    */
-   public PolicyQualifierInfo(
-       ASN1ObjectIdentifier policyQualifierId,
-       ASN1Encodable qualifier) 
-   {
-      this.policyQualifierId = policyQualifierId;
-      this.qualifier = qualifier;
-   }
-
-   /**
-    * Creates a new <code>PolicyQualifierInfo</code> containing a
-    * cPSuri qualifier.
-    *
-    * @param cps the CPS (certification practice statement) uri as a
-    * <code>String</code>.
-    */
-   public PolicyQualifierInfo(
-       String cps) 
-   {
-      policyQualifierId = PolicyQualifierId.id_qt_cps;
-      qualifier = new DERIA5String (cps);
-   }
-
-   /**
-    * Creates a new <code>PolicyQualifierInfo</code> instance.
-    *
-    * @param as <code>PolicyQualifierInfo</code> X509 structure
-    * encoded as an ASN1Sequence.
-    * @deprecated use PolicyQualifierInfo.getInstance()
-    */
-   public PolicyQualifierInfo(
-       ASN1Sequence as)
-   {
-        if (as.size() != 2)
-        {
-            throw new IllegalArgumentException("Bad sequence size: "
-                    + as.size());
-        }
-
-        policyQualifierId = ASN1ObjectIdentifier.getInstance(as.getObjectAt(0));
-        qualifier = as.getObjectAt(1);
-   }
-
-   public static PolicyQualifierInfo getInstance(
-       Object obj)
-   {
-        if (obj instanceof PolicyQualifierInfo)
-        {
-            return (PolicyQualifierInfo)obj;
-        }
-        else if (obj != null)
-        {
-            return new PolicyQualifierInfo(ASN1Sequence.getInstance(obj));
-        }
-
-        return null;
-   }
-
-
-   public ASN1ObjectIdentifier getPolicyQualifierId()
-   {
-       return policyQualifierId;
-   }
-
-   public ASN1Encodable getQualifier()
-   {
-       return qualifier;
-   }
-   
-   /**
-    * Returns a DER-encodable representation of this instance. 
-    *
-    * @return a <code>ASN1Primitive</code> value
-    */
-   public ASN1Primitive toASN1Primitive()
-   {
-      ASN1EncodableVector dev = new ASN1EncodableVector();
-      dev.add(policyQualifierId);
-      dev.add(qualifier);
-
-      return new DERSequence(dev);
-   }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/x509/PrivateKeyUsagePeriod.java b/bcprov/src/main/java/org/bouncycastle/asn1/x509/PrivateKeyUsagePeriod.java
deleted file mode 100644
index 44e0b67..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/x509/PrivateKeyUsagePeriod.java
+++ /dev/null
@@ -1,84 +0,0 @@
-package org.bouncycastle.asn1.x509;
-
-import java.util.Enumeration;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1GeneralizedTime;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.ASN1TaggedObject;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.DERTaggedObject;
-
-/**
- * <pre>
- *    PrivateKeyUsagePeriod ::= SEQUENCE {
- *      notBefore       [0]     GeneralizedTime OPTIONAL,
- *      notAfter        [1]     GeneralizedTime OPTIONAL }
- * </pre>
- */
-public class PrivateKeyUsagePeriod
-    extends ASN1Object
-{
-    public static PrivateKeyUsagePeriod getInstance(Object obj)
-    {
-        if (obj instanceof PrivateKeyUsagePeriod)
-        {
-            return (PrivateKeyUsagePeriod)obj;
-        }
-
-        if (obj != null)
-        {
-            return new PrivateKeyUsagePeriod(ASN1Sequence.getInstance(obj));
-        }
-
-        return null;
-    }
-
-    private ASN1GeneralizedTime _notBefore, _notAfter;
-
-    private PrivateKeyUsagePeriod(ASN1Sequence seq)
-    {
-        Enumeration en = seq.getObjects();
-        while (en.hasMoreElements())
-        {
-            ASN1TaggedObject tObj = (ASN1TaggedObject)en.nextElement();
-
-            if (tObj.getTagNo() == 0)
-            {
-                _notBefore = ASN1GeneralizedTime.getInstance(tObj, false);
-            }
-            else if (tObj.getTagNo() == 1)
-            {
-                _notAfter = ASN1GeneralizedTime.getInstance(tObj, false);
-            }
-        }
-    }
-
-    public ASN1GeneralizedTime getNotBefore()
-    {
-        return _notBefore;
-    }
-
-    public ASN1GeneralizedTime getNotAfter()
-    {
-        return _notAfter;
-    }
-
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector v = new ASN1EncodableVector();
-
-        if (_notBefore != null)
-        {
-            v.add(new DERTaggedObject(false, 0, _notBefore));
-        }
-        if (_notAfter != null)
-        {
-            v.add(new DERTaggedObject(false, 1, _notAfter));
-        }
-
-        return new DERSequence(v);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/x509/RoleSyntax.java b/bcprov/src/main/java/org/bouncycastle/asn1/x509/RoleSyntax.java
deleted file mode 100644
index 7558c12..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/x509/RoleSyntax.java
+++ /dev/null
@@ -1,237 +0,0 @@
-package org.bouncycastle.asn1.x509;
-
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.ASN1String;
-import org.bouncycastle.asn1.ASN1TaggedObject;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.DERTaggedObject;
-
-/**
- * Implementation of the RoleSyntax object as specified by the RFC3281.
- * 
- * <pre>
- * RoleSyntax ::= SEQUENCE {
- *                 roleAuthority  [0] GeneralNames OPTIONAL,
- *                 roleName       [1] GeneralName
- *           } 
- * </pre>
- */
-public class RoleSyntax 
-    extends ASN1Object
-{
-    private GeneralNames roleAuthority;
-    private GeneralName roleName;
-
-    /**
-     * RoleSyntax factory method.
-     * @param obj the object used to construct an instance of <code>
-     * RoleSyntax</code>. It must be an instance of <code>RoleSyntax
-     * </code> or <code>ASN1Sequence</code>.
-     * @return the instance of <code>RoleSyntax</code> built from the
-     * supplied object.
-     * @throws java.lang.IllegalArgumentException if the object passed
-     * to the factory is not an instance of <code>RoleSyntax</code> or
-     * <code>ASN1Sequence</code>.
-     */
-    public static RoleSyntax getInstance(
-        Object obj)
-    {
-        
-        if (obj instanceof RoleSyntax)
-        {
-            return (RoleSyntax)obj;
-        }
-        else if (obj != null)
-        {
-            return new RoleSyntax(ASN1Sequence.getInstance(obj));
-        }
-
-        return null;
-    }
-    
-    /**
-     * Constructor.
-     * @param roleAuthority the role authority of this RoleSyntax.
-     * @param roleName    the role name of this RoleSyntax.
-     */
-    public RoleSyntax(
-        GeneralNames roleAuthority,
-        GeneralName roleName)
-    {
-        if(roleName == null || 
-                roleName.getTagNo() != GeneralName.uniformResourceIdentifier ||
-                ((ASN1String)roleName.getName()).getString().equals(""))
-        {
-            throw new IllegalArgumentException("the role name MUST be non empty and MUST " +
-                    "use the URI option of GeneralName");
-        }
-        this.roleAuthority = roleAuthority;
-        this.roleName = roleName;
-    }
-    
-    /**
-     * Constructor. Invoking this constructor is the same as invoking
-     * <code>new RoleSyntax(null, roleName)</code>.
-     * @param roleName    the role name of this RoleSyntax.
-     */
-    public RoleSyntax(
-        GeneralName roleName)
-    {
-        this(null, roleName);
-    }
-
-    /**
-     * Utility constructor. Takes a <code>String</code> argument representing
-     * the role name, builds a <code>GeneralName</code> to hold the role name
-     * and calls the constructor that takes a <code>GeneralName</code>.
-     * @param roleName
-     */
-    public RoleSyntax(
-        String roleName)
-    {
-        this(new GeneralName(GeneralName.uniformResourceIdentifier,
-                (roleName == null)? "": roleName));
-    }
-    
-    /**
-     * Constructor that builds an instance of <code>RoleSyntax</code> by
-     * extracting the encoded elements from the <code>ASN1Sequence</code>
-     * object supplied.
-     * @param seq    an instance of <code>ASN1Sequence</code> that holds
-     * the encoded elements used to build this <code>RoleSyntax</code>.
-     */
-    private RoleSyntax(
-        ASN1Sequence seq)
-    {
-        if (seq.size() < 1 || seq.size() > 2)
-        {
-            throw new IllegalArgumentException("Bad sequence size: "
-                    + seq.size());
-        }
-
-        for (int i = 0; i != seq.size(); i++)
-        {
-            ASN1TaggedObject taggedObject = ASN1TaggedObject.getInstance(seq.getObjectAt(i));
-            switch (taggedObject.getTagNo())
-            {
-            case 0:
-                roleAuthority = GeneralNames.getInstance(taggedObject, false);
-                break;
-            case 1:
-                roleName = GeneralName.getInstance(taggedObject, true);
-                break;
-            default:
-                throw new IllegalArgumentException("Unknown tag in RoleSyntax");
-            }
-        }
-    }
-
-    /**
-     * Gets the role authority of this RoleSyntax.
-     * @return    an instance of <code>GeneralNames</code> holding the
-     * role authority of this RoleSyntax.
-     */
-    public GeneralNames getRoleAuthority()
-    {
-        return this.roleAuthority;
-    }
-    
-    /**
-     * Gets the role name of this RoleSyntax.
-     * @return    an instance of <code>GeneralName</code> holding the
-     * role name of this RoleSyntax.
-     */
-    public GeneralName getRoleName()
-    {
-        return this.roleName;
-    }
-    
-    /**
-     * Gets the role name as a <code>java.lang.String</code> object.
-     * @return    the role name of this RoleSyntax represented as a 
-     * <code>java.lang.String</code> object.
-     */
-    public String getRoleNameAsString()
-    {
-        ASN1String str = (ASN1String)this.roleName.getName();
-        
-        return str.getString();
-    }
-    
-    /**
-     * Gets the role authority as a <code>String[]</code> object.
-     * @return the role authority of this RoleSyntax represented as a
-     * <code>String[]</code> array.
-     */
-    public String[] getRoleAuthorityAsString() 
-    {
-        if(roleAuthority == null) 
-        {
-            return new String[0];
-        }
-        
-        GeneralName[] names = roleAuthority.getNames();
-        String[] namesString = new String[names.length];
-        for(int i = 0; i < names.length; i++) 
-        {
-            ASN1Encodable value = names[i].getName();
-            if(value instanceof ASN1String)
-            {
-                namesString[i] = ((ASN1String)value).getString();
-            }
-            else
-            {
-                namesString[i] = value.toString();
-            }
-        }
-        return namesString;
-    }
-    
-    /**
-     * Implementation of the method <code>toASN1Object</code> as
-     * required by the superclass <code>ASN1Encodable</code>.
-     * 
-     * <pre>
-     * RoleSyntax ::= SEQUENCE {
-     *                 roleAuthority  [0] GeneralNames OPTIONAL,
-     *                 roleName       [1] GeneralName
-     *           } 
-     * </pre>
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector v = new ASN1EncodableVector();
-        if(this.roleAuthority != null)
-        {
-            v.add(new DERTaggedObject(false, 0, roleAuthority));
-        }
-        v.add(new DERTaggedObject(true, 1, roleName));
-        
-        return new DERSequence(v);
-    }
-    
-    public String toString() 
-    {
-        StringBuffer buff = new StringBuffer("Name: " + this.getRoleNameAsString() +
-                " - Auth: ");
-        if(this.roleAuthority == null || roleAuthority.getNames().length == 0)
-        {
-            buff.append("N/A");
-        }
-        else 
-        {
-            String[] names = this.getRoleAuthorityAsString();
-            buff.append('[').append(names[0]);
-            for(int i = 1; i < names.length; i++) 
-            {
-                    buff.append(", ").append(names[i]);
-            }
-            buff.append(']');
-        }
-        return buff.toString();
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/x509/SubjectDirectoryAttributes.java b/bcprov/src/main/java/org/bouncycastle/asn1/x509/SubjectDirectoryAttributes.java
deleted file mode 100644
index 9591802..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/x509/SubjectDirectoryAttributes.java
+++ /dev/null
@@ -1,144 +0,0 @@
-package org.bouncycastle.asn1.x509;
-
-import java.util.Enumeration;
-import java.util.Vector;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DERSequence;
-
-/**
- * This extension may contain further X.500 attributes of the subject. See also
- * RFC 3039.
- * 
- * <pre>
- *     SubjectDirectoryAttributes ::= Attributes
- *     Attributes ::= SEQUENCE SIZE (1..MAX) OF Attribute
- *     Attribute ::= SEQUENCE 
- *     {
- *       type AttributeType 
- *       values SET OF AttributeValue 
- *     }
- *     
- *     AttributeType ::= OBJECT IDENTIFIER
- *     AttributeValue ::= ANY DEFINED BY AttributeType
- * </pre>
- * 
- * @see org.bouncycastle.asn1.x500.style.BCStyle for AttributeType ObjectIdentifiers.
- */
-public class SubjectDirectoryAttributes 
-    extends ASN1Object
-{
-    private Vector attributes = new Vector();
-
-    public static SubjectDirectoryAttributes getInstance(
-        Object obj)
-    {
-        if (obj instanceof SubjectDirectoryAttributes)
-        {
-            return (SubjectDirectoryAttributes)obj;
-        }
-
-        if (obj != null)
-        {
-            return new SubjectDirectoryAttributes(ASN1Sequence.getInstance(obj));
-        }
-
-        return null;
-    }
-
-    /**
-     * Constructor from ASN1Sequence.
-     * 
-     * The sequence is of type SubjectDirectoryAttributes:
-     * 
-     * <pre>
-     *      SubjectDirectoryAttributes ::= Attributes
-     *      Attributes ::= SEQUENCE SIZE (1..MAX) OF Attribute
-     *      Attribute ::= SEQUENCE 
-     *      {
-     *        type AttributeType 
-     *        values SET OF AttributeValue 
-     *      }
-     *      
-     *      AttributeType ::= OBJECT IDENTIFIER
-     *      AttributeValue ::= ANY DEFINED BY AttributeType
-     * </pre>
-     * 
-     * @param seq
-     *            The ASN.1 sequence.
-     */
-    private SubjectDirectoryAttributes(ASN1Sequence seq)
-    {
-        Enumeration e = seq.getObjects();
-
-        while (e.hasMoreElements())
-        {
-            ASN1Sequence s = ASN1Sequence.getInstance(e.nextElement());
-            attributes.addElement(Attribute.getInstance(s));
-        }
-    }
-
-    /**
-     * Constructor from a vector of attributes.
-     * 
-     * The vector consists of attributes of type {@link Attribute Attribute}
-     * 
-     * @param attributes
-     *            The attributes.
-     * 
-     */
-    public SubjectDirectoryAttributes(Vector attributes)
-    {
-        Enumeration e = attributes.elements();
-
-        while (e.hasMoreElements())
-        {
-            this.attributes.addElement(e.nextElement());
-        }
-    }
-
-    /**
-     * Produce an object suitable for an ASN1OutputStream.
-     * 
-     * Returns:
-     * 
-     * <pre>
-     *      SubjectDirectoryAttributes ::= Attributes
-     *      Attributes ::= SEQUENCE SIZE (1..MAX) OF Attribute
-     *      Attribute ::= SEQUENCE 
-     *      {
-     *        type AttributeType 
-     *        values SET OF AttributeValue 
-     *      }
-     *      
-     *      AttributeType ::= OBJECT IDENTIFIER
-     *      AttributeValue ::= ANY DEFINED BY AttributeType
-     * </pre>
-     * 
-     * @return a ASN1Primitive
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector vec = new ASN1EncodableVector();
-        Enumeration e = attributes.elements();
-
-        while (e.hasMoreElements())
-        {
-
-            vec.add((Attribute)e.nextElement());
-        }
-
-        return new DERSequence(vec);
-    }
-
-    /**
-     * @return Returns the attributes.
-     */
-    public Vector getAttributes()
-    {
-        return attributes;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/x509/Target.java b/bcprov/src/main/java/org/bouncycastle/asn1/x509/Target.java
deleted file mode 100644
index b302f5a..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/x509/Target.java
+++ /dev/null
@@ -1,138 +0,0 @@
-package org.bouncycastle.asn1.x509;
-
-import org.bouncycastle.asn1.ASN1Choice;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1TaggedObject;
-import org.bouncycastle.asn1.DERTaggedObject;
-
-/**
- * Target structure used in target information extension for attribute
- * certificates from RFC 3281.
- * 
- * <pre>
- *     Target  ::= CHOICE {
- *       targetName          [0] GeneralName,
- *       targetGroup         [1] GeneralName,
- *       targetCert          [2] TargetCert
- *     }
- * </pre>
- * 
- * <p>
- * The targetCert field is currently not supported and must not be used
- * according to RFC 3281.
- */
-public class Target
-    extends ASN1Object
-    implements ASN1Choice
-{
-    public static final int targetName = 0;
-    public static final int targetGroup = 1;
-
-    private GeneralName targName;
-    private GeneralName targGroup;
-
-    /**
-     * Creates an instance of a Target from the given object.
-     * <p>
-     * <code>obj</code> can be a Target or a {@link ASN1TaggedObject}
-     * 
-     * @param obj The object.
-     * @return A Target instance.
-     * @throws IllegalArgumentException if the given object cannot be
-     *             interpreted as Target.
-     */
-    public static Target getInstance(Object obj)
-    {
-        if (obj == null || obj instanceof Target)
-        {
-            return (Target) obj;
-        }
-        else if (obj instanceof ASN1TaggedObject)
-        {
-            return new Target((ASN1TaggedObject)obj);
-        }
-
-        throw new IllegalArgumentException("unknown object in factory: "
-            + obj.getClass());
-    }
-
-    /**
-     * Constructor from ASN1TaggedObject.
-     * 
-     * @param tagObj The tagged object.
-     * @throws IllegalArgumentException if the encoding is wrong.
-     */
-    private Target(ASN1TaggedObject tagObj)
-    {
-        switch (tagObj.getTagNo())
-        {
-        case targetName:     // GeneralName is already a choice so explicit
-            targName = GeneralName.getInstance(tagObj, true);
-            break;
-        case targetGroup:
-            targGroup = GeneralName.getInstance(tagObj, true);
-            break;
-        default:
-            throw new IllegalArgumentException("unknown tag: " + tagObj.getTagNo());
-        }
-    }
-
-    /**
-     * Constructor from given details.
-     * <p>
-     * Exactly one of the parameters must be not <code>null</code>.
-     *
-     * @param type the choice type to apply to the name.
-     * @param name the general name.
-     * @throws IllegalArgumentException if type is invalid.
-     */
-    public Target(int type, GeneralName name)
-    {
-        this(new DERTaggedObject(type, name));
-    }
-
-    /**
-     * @return Returns the targetGroup.
-     */
-    public GeneralName getTargetGroup()
-    {
-        return targGroup;
-    }
-
-    /**
-     * @return Returns the targetName.
-     */
-    public GeneralName getTargetName()
-    {
-        return targName;
-    }
-
-    /**
-     * Produce an object suitable for an ASN1OutputStream.
-     * 
-     * Returns:
-     * 
-     * <pre>
-     *     Target  ::= CHOICE {
-     *       targetName          [0] GeneralName,
-     *       targetGroup         [1] GeneralName,
-     *       targetCert          [2] TargetCert
-     *     }
-     * </pre>
-     * 
-     * @return a ASN1Primitive
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        // GeneralName is a choice already so most be explicitly tagged
-        if (targName != null)
-        {
-            return new DERTaggedObject(true, 0, targName);
-        }
-        else
-        {
-            return new DERTaggedObject(true, 1, targGroup);
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/x509/TargetInformation.java b/bcprov/src/main/java/org/bouncycastle/asn1/x509/TargetInformation.java
deleted file mode 100644
index eb892b9..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/x509/TargetInformation.java
+++ /dev/null
@@ -1,120 +0,0 @@
-package org.bouncycastle.asn1.x509;
-
-import java.util.Enumeration;
-
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DERSequence;
-
-/**
- * Target information extension for attributes certificates according to RFC
- * 3281.
- * 
- * <pre>
- *           SEQUENCE OF Targets
- * </pre>
- * 
- */
-public class TargetInformation
-    extends ASN1Object
-{
-    private ASN1Sequence targets;
-
-    /**
-     * Creates an instance of a TargetInformation from the given object.
-     * <p>
-     * <code>obj</code> can be a TargetInformation or a {@link ASN1Sequence}
-     * 
-     * @param obj The object.
-     * @return A TargetInformation instance.
-     * @throws IllegalArgumentException if the given object cannot be
-     *             interpreted as TargetInformation.
-     */
-    public static TargetInformation getInstance(Object obj)
-    {
-        if (obj instanceof TargetInformation)
-        {
-            return (TargetInformation)obj;
-        }
-        else if (obj != null)
-        {
-            return new TargetInformation(ASN1Sequence.getInstance(obj));
-        }
-
-        return null;
-    }
-
-    /**
-     * Constructor from a ASN1Sequence.
-     * 
-     * @param seq The ASN1Sequence.
-     * @throws IllegalArgumentException if the sequence does not contain
-     *             correctly encoded Targets elements.
-     */
-    private TargetInformation(ASN1Sequence seq)
-    {
-        targets = seq;
-    }
-
-    /**
-     * Returns the targets in this target information extension.
-     * 
-     * @return Returns the targets.
-     */
-    public Targets[] getTargetsObjects()
-    {
-        Targets[] copy = new Targets[targets.size()];
-        int count = 0;
-        for (Enumeration e = targets.getObjects(); e.hasMoreElements();)
-        {
-            copy[count++] = Targets.getInstance(e.nextElement());
-        }
-        return copy;
-    }
-
-    /**
-     * Constructs a target information from a single targets element. 
-     * According to RFC 3281 only one targets element must be produced.
-     * 
-     * @param targets A Targets instance.
-     */
-    public TargetInformation(Targets targets)
-    {
-        this.targets = new DERSequence(targets);
-    }
-
-    /**
-     * According to RFC 3281 only one targets element must be produced. If
-     * multiple targets are given they must be merged in
-     * into one targets element.
-     *
-     * @param targets An array with {@link Targets}.
-     */
-    public TargetInformation(Target[] targets)
-    {
-        this(new Targets(targets));
-    }
-
-    /**
-     * Produce an object suitable for an ASN1OutputStream.
-     * 
-     * Returns:
-     * 
-     * <pre>
-     *          SEQUENCE OF Targets
-     * </pre>
-     * 
-     * <p>
-     * According to RFC 3281 only one targets element must be produced. If
-     * multiple targets are given in the constructor they are merged into one
-     * targets element. If this was produced from a
-     * {@link org.bouncycastle.asn1.ASN1Sequence} the encoding is kept.
-     * 
-     * @return a ASN1Primitive
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        return targets;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/x509/Targets.java b/bcprov/src/main/java/org/bouncycastle/asn1/x509/Targets.java
deleted file mode 100644
index 4c7d062..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/x509/Targets.java
+++ /dev/null
@@ -1,121 +0,0 @@
-package org.bouncycastle.asn1.x509;
-
-import java.util.Enumeration;
-
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DERSequence;
-
-/**
- * Targets structure used in target information extension for attribute
- * certificates from RFC 3281.
- * 
- * <pre>
- *            Targets ::= SEQUENCE OF Target
- *           
- *            Target  ::= CHOICE {
- *              targetName          [0] GeneralName,
- *              targetGroup         [1] GeneralName,
- *              targetCert          [2] TargetCert
- *            }
- *           
- *            TargetCert  ::= SEQUENCE {
- *              targetCertificate    IssuerSerial,
- *              targetName           GeneralName OPTIONAL,
- *              certDigestInfo       ObjectDigestInfo OPTIONAL
- *            }
- * </pre>
- * 
- * @see org.bouncycastle.asn1.x509.Target
- * @see org.bouncycastle.asn1.x509.TargetInformation
- */
-public class Targets
-    extends ASN1Object
-{
-    private ASN1Sequence targets;
-
-    /**
-     * Creates an instance of a Targets from the given object.
-     * <p>
-     * <code>obj</code> can be a Targets or a {@link ASN1Sequence}
-     * 
-     * @param obj The object.
-     * @return A Targets instance.
-     * @throws IllegalArgumentException if the given object cannot be
-     *             interpreted as Target.
-     */
-    public static Targets getInstance(Object obj)
-    {
-        if (obj instanceof Targets)
-        {
-            return (Targets)obj;
-        }
-        else if (obj != null)
-        {
-            return new Targets(ASN1Sequence.getInstance(obj));
-        }
-
-        return null;
-    }
-
-    /**
-     * Constructor from ASN1Sequence.
-     * 
-     * @param targets The ASN.1 SEQUENCE.
-     * @throws IllegalArgumentException if the contents of the sequence are
-     *             invalid.
-     */
-    private Targets(ASN1Sequence targets)
-    {
-        this.targets = targets;
-    }
-
-    /**
-     * Constructor from given targets.
-     * <p>
-     * The vector is copied.
-     * 
-     * @param targets A <code>Vector</code> of {@link Target}s.
-     * @see Target
-     * @throws IllegalArgumentException if the vector contains not only Targets.
-     */
-    public Targets(Target[] targets)
-    {
-        this.targets = new DERSequence(targets);
-    }
-
-    /**
-     * Returns the targets in a <code>Vector</code>.
-     * <p>
-     * The vector is cloned before it is returned.
-     * 
-     * @return Returns the targets.
-     */
-    public Target[] getTargets()
-    {
-        Target[] targs = new Target[targets.size()];
-        int count = 0;
-        for (Enumeration e = targets.getObjects(); e.hasMoreElements();)
-        {
-            targs[count++] = Target.getInstance(e.nextElement());
-        }
-        return targs;
-    }
-
-    /**
-     * Produce an object suitable for an ASN1OutputStream.
-     * 
-     * Returns:
-     * 
-     * <pre>
-     *            Targets ::= SEQUENCE OF Target
-     * </pre>
-     * 
-     * @return a ASN1Primitive
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        return targets;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/x509/UserNotice.java b/bcprov/src/main/java/org/bouncycastle/asn1/x509/UserNotice.java
deleted file mode 100644
index ebc0405..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/x509/UserNotice.java
+++ /dev/null
@@ -1,132 +0,0 @@
-package org.bouncycastle.asn1.x509;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DERSequence;
-
-/**
- * <code>UserNotice</code> class, used in
- * <code>CertificatePolicies</code> X509 extensions (in policy
- * qualifiers).
- * <pre>
- * UserNotice ::= SEQUENCE {
- *      noticeRef        NoticeReference OPTIONAL,
- *      explicitText     DisplayText OPTIONAL}
- *
- * </pre>
- * 
- * @see PolicyQualifierId
- * @see PolicyInformation
- */
-public class UserNotice 
-    extends ASN1Object
-{
-    private NoticeReference noticeRef;
-    private DisplayText     explicitText;
-   
-    /**
-     * Creates a new <code>UserNotice</code> instance.
-     *
-     * @param noticeRef a <code>NoticeReference</code> value
-     * @param explicitText a <code>DisplayText</code> value
-     */
-    public UserNotice(
-        NoticeReference noticeRef, 
-        DisplayText explicitText) 
-    {
-        this.noticeRef = noticeRef;
-        this.explicitText = explicitText;
-    }
-
-    /**
-     * Creates a new <code>UserNotice</code> instance.
-     *
-     * @param noticeRef a <code>NoticeReference</code> value
-     * @param str the explicitText field as a String. 
-     */
-    public UserNotice(
-        NoticeReference noticeRef, 
-        String str) 
-    {
-        this(noticeRef, new DisplayText(str));
-    }
-
-    /**
-     * Creates a new <code>UserNotice</code> instance.
-     * <p>Useful from reconstructing a <code>UserNotice</code> instance
-     * from its encodable/encoded form. 
-     *
-     * @param as an <code>ASN1Sequence</code> value obtained from either
-     * calling @{link toASN1Primitive()} for a <code>UserNotice</code>
-     * instance or from parsing it from a DER-encoded stream. 
-     */
-    private UserNotice(
-       ASN1Sequence as) 
-    {
-       if (as.size() == 2)
-       {
-           noticeRef = NoticeReference.getInstance(as.getObjectAt(0));
-           explicitText = DisplayText.getInstance(as.getObjectAt(1));
-       }
-       else if (as.size() == 1)
-       {
-           if (as.getObjectAt(0).toASN1Primitive() instanceof ASN1Sequence)
-           {
-               noticeRef = NoticeReference.getInstance(as.getObjectAt(0));
-           }
-           else
-           {
-               explicitText = DisplayText.getInstance(as.getObjectAt(0));
-           }
-       }
-       else
-       {
-           throw new IllegalArgumentException("Bad sequence size: " + as.size());
-       }
-    }
-
-    public static UserNotice getInstance(
-        Object obj)
-    {
-        if (obj instanceof UserNotice)
-        {
-            return (UserNotice)obj;
-        }
-
-        if (obj != null)
-        {
-            return new UserNotice(ASN1Sequence.getInstance(obj));
-        }
-
-        return null;
-    }
-
-    public NoticeReference getNoticeRef()
-    {
-        return noticeRef;
-    }
-    
-    public DisplayText getExplicitText()
-    {
-        return explicitText;
-    }
-    
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector av = new ASN1EncodableVector();
-      
-        if (noticeRef != null)
-        {
-            av.add(noticeRef);
-        }
-        
-        if (explicitText != null)
-        {
-            av.add(explicitText);
-        }
-         
-        return new DERSequence(av);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/x509/V2AttributeCertificateInfoGenerator.java b/bcprov/src/main/java/org/bouncycastle/asn1/x509/V2AttributeCertificateInfoGenerator.java
deleted file mode 100644
index 635a69e..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/x509/V2AttributeCertificateInfoGenerator.java
+++ /dev/null
@@ -1,158 +0,0 @@
-package org.bouncycastle.asn1.x509;
-
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1GeneralizedTime;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.DERBitString;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.DERSet;
-
-/**
- * Generator for Version 2 AttributeCertificateInfo
- * <pre>
- * AttributeCertificateInfo ::= SEQUENCE {
- *       version              AttCertVersion -- version is v2,
- *       holder               Holder,
- *       issuer               AttCertIssuer,
- *       signature            AlgorithmIdentifier,
- *       serialNumber         CertificateSerialNumber,
- *       attrCertValidityPeriod   AttCertValidityPeriod,
- *       attributes           SEQUENCE OF Attribute,
- *       issuerUniqueID       UniqueIdentifier OPTIONAL,
- *       extensions           Extensions OPTIONAL
- * }
- * </pre>
- *
- */
-public class V2AttributeCertificateInfoGenerator
-{
-    private ASN1Integer version;
-    private Holder holder;
-    private AttCertIssuer issuer;
-    private AlgorithmIdentifier signature;
-    private ASN1Integer serialNumber;
-    private ASN1EncodableVector attributes;
-    private DERBitString issuerUniqueID;
-    private Extensions extensions;
-
-    // Note: validity period start/end dates stored directly
-    //private AttCertValidityPeriod attrCertValidityPeriod;
-    private ASN1GeneralizedTime startDate, endDate; 
-
-    public V2AttributeCertificateInfoGenerator()
-    {
-        this.version = new ASN1Integer(1);
-        attributes = new ASN1EncodableVector();
-    }
-    
-    public void setHolder(Holder holder)
-    {
-        this.holder = holder;
-    }
-    
-    public void addAttribute(String oid, ASN1Encodable value) 
-    {
-        attributes.add(new Attribute(new ASN1ObjectIdentifier(oid), new DERSet(value)));
-    }
-
-    /**
-     * @param attribute
-     */
-    public void addAttribute(Attribute attribute)
-    {
-        attributes.add(attribute);
-    }
-    
-    public void setSerialNumber(
-        ASN1Integer  serialNumber)
-    {
-        this.serialNumber = serialNumber;
-    }
-
-    public void setSignature(
-        AlgorithmIdentifier    signature)
-    {
-        this.signature = signature;
-    }
-
-    public void setIssuer(
-        AttCertIssuer    issuer)
-    {
-        this.issuer = issuer;
-    }
-
-    public void setStartDate(
-        ASN1GeneralizedTime startDate)
-    {
-        this.startDate = startDate;
-    }
-
-    public void setEndDate(
-        ASN1GeneralizedTime endDate)
-    {
-        this.endDate = endDate;
-    }
-
-    public void setIssuerUniqueID(
-        DERBitString    issuerUniqueID)
-    {
-        this.issuerUniqueID = issuerUniqueID;
-    }
-
-    /**
-     * @deprecated use method taking Extensions
-     * @param extensions
-     */
-    public void setExtensions(
-        X509Extensions    extensions)
-    {
-        this.extensions = Extensions.getInstance(extensions.toASN1Primitive());
-    }
-
-    public void setExtensions(
-        Extensions    extensions)
-    {
-        this.extensions = extensions;
-    }
-
-    public AttributeCertificateInfo generateAttributeCertificateInfo()
-    {
-        if ((serialNumber == null) || (signature == null)
-            || (issuer == null) || (startDate == null) || (endDate == null)
-            || (holder == null) || (attributes == null))
-        {
-            throw new IllegalStateException("not all mandatory fields set in V2 AttributeCertificateInfo generator");
-        }
-
-        ASN1EncodableVector  v = new ASN1EncodableVector();
-
-        v.add(version);
-        v.add(holder);
-        v.add(issuer);
-        v.add(signature);
-        v.add(serialNumber);
-    
-        //
-        // before and after dates => AttCertValidityPeriod
-        //
-        AttCertValidityPeriod validity = new AttCertValidityPeriod(startDate, endDate);
-        v.add(validity);
-        
-        // Attributes
-        v.add(new DERSequence(attributes));
-        
-        if (issuerUniqueID != null)
-        {
-            v.add(issuerUniqueID);
-        }
-    
-        if (extensions != null)
-        {
-            v.add(extensions);
-        }
-
-        return AttributeCertificateInfo.getInstance(new DERSequence(v));
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/x509/V2TBSCertListGenerator.java b/bcprov/src/main/java/org/bouncycastle/asn1/x509/V2TBSCertListGenerator.java
deleted file mode 100644
index 869f5bc..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/x509/V2TBSCertListGenerator.java
+++ /dev/null
@@ -1,281 +0,0 @@
-package org.bouncycastle.asn1.x509;
-
-import java.io.IOException;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1GeneralizedTime;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.ASN1UTCTime;
-import org.bouncycastle.asn1.DEROctetString;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.DERTaggedObject;
-import org.bouncycastle.asn1.x500.X500Name;
-
-/**
- * Generator for Version 2 TBSCertList structures.
- * <pre>
- *  TBSCertList  ::=  SEQUENCE  {
- *       version                 Version OPTIONAL,
- *                                    -- if present, shall be v2
- *       signature               AlgorithmIdentifier,
- *       issuer                  Name,
- *       thisUpdate              Time,
- *       nextUpdate              Time OPTIONAL,
- *       revokedCertificates     SEQUENCE OF SEQUENCE  {
- *            userCertificate         CertificateSerialNumber,
- *            revocationDate          Time,
- *            crlEntryExtensions      Extensions OPTIONAL
- *                                          -- if present, shall be v2
- *                                 }  OPTIONAL,
- *       crlExtensions           [0]  EXPLICIT Extensions OPTIONAL
- *                                          -- if present, shall be v2
- *                                 }
- * </pre>
- *
- * <b>Note: This class may be subject to change</b>
- */
-public class V2TBSCertListGenerator
-{
-    private ASN1Integer         version = new ASN1Integer(1);
-    private AlgorithmIdentifier signature;
-    private X500Name            issuer;
-    private Time                thisUpdate, nextUpdate=null;
-    private Extensions          extensions = null;
-    private ASN1EncodableVector crlentries = new ASN1EncodableVector();
-
-    private final static ASN1Sequence[] reasons;
-
-    static
-    {
-       reasons = new ASN1Sequence[11];
-
-        reasons[0] = createReasonExtension(CRLReason.unspecified);
-        reasons[1] = createReasonExtension(CRLReason.keyCompromise);
-        reasons[2] = createReasonExtension(CRLReason.cACompromise);
-        reasons[3] = createReasonExtension(CRLReason.affiliationChanged);
-        reasons[4] = createReasonExtension(CRLReason.superseded);
-        reasons[5] = createReasonExtension(CRLReason.cessationOfOperation);
-        reasons[6] = createReasonExtension(CRLReason.certificateHold);
-        reasons[7] = createReasonExtension(7); // 7 -> unknown
-        reasons[8] = createReasonExtension(CRLReason.removeFromCRL);
-        reasons[9] = createReasonExtension(CRLReason.privilegeWithdrawn);
-        reasons[10] = createReasonExtension(CRLReason.aACompromise);
-    }
-
-    public V2TBSCertListGenerator()
-    {
-    }
-
-
-    public void setSignature(
-        AlgorithmIdentifier    signature)
-    {
-        this.signature = signature;
-    }
-
-    /**
-     * @deprecated use X500Name method
-     */
-    public void setIssuer(
-        X509Name    issuer)
-    {
-        this.issuer = X500Name.getInstance(issuer.toASN1Primitive());
-    }
-
-    public void setIssuer(X500Name issuer)
-    {
-        this.issuer = issuer;
-    }
-
-    public void setThisUpdate(
-        ASN1UTCTime thisUpdate)
-    {
-        this.thisUpdate = new Time(thisUpdate);
-    }
-
-    public void setNextUpdate(
-        ASN1UTCTime nextUpdate)
-    {
-        this.nextUpdate = new Time(nextUpdate);
-    }
-
-    public void setThisUpdate(
-        Time thisUpdate)
-    {
-        this.thisUpdate = thisUpdate;
-    }
-
-    public void setNextUpdate(
-        Time nextUpdate)
-    {
-        this.nextUpdate = nextUpdate;
-    }
-
-    public void addCRLEntry(
-        ASN1Sequence crlEntry)
-    {
-        crlentries.add(crlEntry);
-    }
-
-    public void addCRLEntry(ASN1Integer userCertificate, ASN1UTCTime revocationDate, int reason)
-    {
-        addCRLEntry(userCertificate, new Time(revocationDate), reason);
-    }
-
-    public void addCRLEntry(ASN1Integer userCertificate, Time revocationDate, int reason)
-    {
-        addCRLEntry(userCertificate, revocationDate, reason, null);
-    }
-
-    public void addCRLEntry(ASN1Integer userCertificate, Time revocationDate, int reason, ASN1GeneralizedTime invalidityDate)
-    {
-        if (reason != 0)
-        {
-            ASN1EncodableVector v = new ASN1EncodableVector();
-
-            if (reason < reasons.length)
-            {
-                if (reason < 0)
-                {
-                    throw new IllegalArgumentException("invalid reason value: " + reason);
-                }
-                v.add(reasons[reason]);
-            }
-            else
-            {
-                v.add(createReasonExtension(reason));
-            }
-
-            if (invalidityDate != null)
-            {
-                v.add(createInvalidityDateExtension(invalidityDate));
-            }
-
-            internalAddCRLEntry(userCertificate, revocationDate, new DERSequence(v));
-        }
-        else if (invalidityDate != null)
-        {
-            ASN1EncodableVector v = new ASN1EncodableVector();
-
-            v.add(createInvalidityDateExtension(invalidityDate));
-
-            internalAddCRLEntry(userCertificate, revocationDate, new DERSequence(v));
-        }
-        else
-        {
-            addCRLEntry(userCertificate, revocationDate, null);
-        }
-    }
-
-    private void internalAddCRLEntry(ASN1Integer userCertificate, Time revocationDate, ASN1Sequence extensions)
-    {
-        ASN1EncodableVector v = new ASN1EncodableVector();
-
-        v.add(userCertificate);
-        v.add(revocationDate);
-
-        if (extensions != null)
-        {
-            v.add(extensions);
-        }
-
-        addCRLEntry(new DERSequence(v));
-    }
-
-    public void addCRLEntry(ASN1Integer userCertificate, Time revocationDate, Extensions extensions)
-    {
-        ASN1EncodableVector v = new ASN1EncodableVector();
-
-        v.add(userCertificate);
-        v.add(revocationDate);
-        
-        if (extensions != null)
-        {
-            v.add(extensions);
-        }
-        
-        addCRLEntry(new DERSequence(v));
-    }
-
-    public void setExtensions(
-        X509Extensions    extensions)
-    {
-        setExtensions(Extensions.getInstance(extensions));
-    }
-
-    public void setExtensions(
-        Extensions    extensions)
-    {
-        this.extensions = extensions;
-    }
-
-    public TBSCertList generateTBSCertList()
-    {
-        if ((signature == null) || (issuer == null) || (thisUpdate == null))
-        {
-            throw new IllegalStateException("Not all mandatory fields set in V2 TBSCertList generator.");
-        }
-
-        ASN1EncodableVector  v = new ASN1EncodableVector();
-
-        v.add(version);
-        v.add(signature);
-        v.add(issuer);
-
-        v.add(thisUpdate);
-        if (nextUpdate != null)
-        {
-            v.add(nextUpdate);
-        }
-
-        // Add CRLEntries if they exist
-        if (crlentries.size() != 0)
-        {
-            v.add(new DERSequence(crlentries));
-        }
-
-        if (extensions != null)
-        {
-            v.add(new DERTaggedObject(0, extensions));
-        }
-
-        return new TBSCertList(new DERSequence(v));
-    }
-
-    private static ASN1Sequence createReasonExtension(int reasonCode)
-    {
-        ASN1EncodableVector v = new ASN1EncodableVector();
-
-        CRLReason crlReason = CRLReason.lookup(reasonCode);
-
-        try
-        {
-            v.add(Extension.reasonCode);
-            v.add(new DEROctetString(crlReason.getEncoded()));
-        }
-        catch (IOException e)
-        {
-            throw new IllegalArgumentException("error encoding reason: " + e);
-        }
-
-        return new DERSequence(v);
-    }
-
-    private static ASN1Sequence createInvalidityDateExtension(ASN1GeneralizedTime invalidityDate)
-    {
-        ASN1EncodableVector v = new ASN1EncodableVector();
-
-        try
-        {
-            v.add(Extension.invalidityDate);
-            v.add(new DEROctetString(invalidityDate.getEncoded()));
-        }
-        catch (IOException e)
-        {
-            throw new IllegalArgumentException("error encoding reason: " + e);
-        }
-
-        return new DERSequence(v);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/x509/X509AttributeIdentifiers.java b/bcprov/src/main/java/org/bouncycastle/asn1/x509/X509AttributeIdentifiers.java
deleted file mode 100644
index 0ed12f7..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/x509/X509AttributeIdentifiers.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package org.bouncycastle.asn1.x509;
-
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-
-public interface X509AttributeIdentifiers
-{
-    /**
-     * @deprecated use id_at_role
-     */
-    static final ASN1ObjectIdentifier RoleSyntax = new ASN1ObjectIdentifier("2.5.4.72");
-
-    static final ASN1ObjectIdentifier id_pe_ac_auditIdentity = X509ObjectIdentifiers.id_pe.branch("4");
-    static final ASN1ObjectIdentifier id_pe_aaControls       = X509ObjectIdentifiers.id_pe.branch("6");
-    static final ASN1ObjectIdentifier id_pe_ac_proxying      = X509ObjectIdentifiers.id_pe.branch("10");
-
-    static final ASN1ObjectIdentifier id_ce_targetInformation= X509ObjectIdentifiers.id_ce.branch("55");
-
-    static final ASN1ObjectIdentifier id_aca = X509ObjectIdentifiers.id_pkix.branch("10");
-
-    static final ASN1ObjectIdentifier id_aca_authenticationInfo    = id_aca.branch("1");
-    static final ASN1ObjectIdentifier id_aca_accessIdentity        = id_aca.branch("2");
-    static final ASN1ObjectIdentifier id_aca_chargingIdentity      = id_aca.branch("3");
-    static final ASN1ObjectIdentifier id_aca_group                 = id_aca.branch("4");
-    // { id-aca 5 } is reserved
-    static final ASN1ObjectIdentifier id_aca_encAttrs              = id_aca.branch("6");
-
-    static final ASN1ObjectIdentifier id_at_role = new ASN1ObjectIdentifier("2.5.4.72");
-    static final ASN1ObjectIdentifier id_at_clearance = new ASN1ObjectIdentifier("2.5.1.5.55");
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/x509/X509Name.java b/bcprov/src/main/java/org/bouncycastle/asn1/x509/X509Name.java
index ff7af8c..0c372f7 100644
--- a/bcprov/src/main/java/org/bouncycastle/asn1/x509/X509Name.java
+++ b/bcprov/src/main/java/org/bouncycastle/asn1/x509/X509Name.java
@@ -255,8 +255,10 @@ public class X509Name
      */
     public static final Hashtable SymbolLookUp = DefaultLookUp;
 
-    private static final Boolean TRUE = new Boolean(true); // for J2ME compatibility
-    private static final Boolean FALSE = new Boolean(false);
+    // BEGIN android-changed
+    private static final Boolean TRUE = Boolean.TRUE;
+    private static final Boolean FALSE = Boolean.FALSE;
+    // END android-changed
 
     static
     {
@@ -446,7 +448,9 @@ public class X509Name
                            throw new IllegalArgumentException("cannot encode value");
                        }
                    }
-                   added.addElement((i != 0) ? TRUE : FALSE);  // to allow earlier JDK compatibility
+                   // BEGIN android-changed
+                   added.addElement(Boolean.valueOf(i != 0));
+                   // END android-changed
             }
         }
     }
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/x509/X509NameTokenizer.java b/bcprov/src/main/java/org/bouncycastle/asn1/x509/X509NameTokenizer.java
index 7f99235..454f322 100644
--- a/bcprov/src/main/java/org/bouncycastle/asn1/x509/X509NameTokenizer.java
+++ b/bcprov/src/main/java/org/bouncycastle/asn1/x509/X509NameTokenizer.java
@@ -78,6 +78,17 @@ public class X509NameTokenizer
                 }
                 else
                 {
+                    // BEGIN android-added
+                    // copied from a newer version of BouncyCastle
+                    if (c == '#' && buf.charAt(buf.length() - 1) == '=')
+                    {
+                        buf.append('\\');
+                    }
+                    else if (c == '+' && separator != '+')
+                    {
+                        buf.append('\\');
+                    }
+                    // END android-added
                     buf.append(c);
                 }
             }
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/x509/package.html b/bcprov/src/main/java/org/bouncycastle/asn1/x509/package.html
deleted file mode 100644
index 728921a..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/x509/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body bgcolor="#ffffff">
-Support classes useful for encoding and processing X.509 certificates.
-</body>
-</html>
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/x509/qualified/BiometricData.java b/bcprov/src/main/java/org/bouncycastle/asn1/x509/qualified/BiometricData.java
deleted file mode 100644
index 32fa451..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/x509/qualified/BiometricData.java
+++ /dev/null
@@ -1,122 +0,0 @@
-package org.bouncycastle.asn1.x509.qualified;
-
-import java.util.Enumeration;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DERIA5String;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-
-/**
- * The BiometricData object.
- * <pre>
- * BiometricData  ::=  SEQUENCE {
- *       typeOfBiometricData  TypeOfBiometricData,
- *       hashAlgorithm        AlgorithmIdentifier,
- *       biometricDataHash    OCTET STRING,
- *       sourceDataUri        IA5String OPTIONAL  }
- * </pre>
- */
-public class BiometricData 
-    extends ASN1Object
-{
-    private TypeOfBiometricData typeOfBiometricData;
-    private AlgorithmIdentifier hashAlgorithm;
-    private ASN1OctetString     biometricDataHash;
-    private DERIA5String        sourceDataUri;
-    
-    public static BiometricData getInstance(
-        Object obj)
-    {
-        if (obj instanceof BiometricData)
-        {
-            return (BiometricData)obj;
-        }
-
-        if (obj != null)
-        {
-            return new BiometricData(ASN1Sequence.getInstance(obj));            
-        }
-
-        return null;
-    }                
-            
-    private BiometricData(ASN1Sequence seq)
-    {
-        Enumeration e = seq.getObjects();
-
-        // typeOfBiometricData
-        typeOfBiometricData = TypeOfBiometricData.getInstance(e.nextElement());
-        // hashAlgorithm
-        hashAlgorithm = AlgorithmIdentifier.getInstance(e.nextElement());
-        // biometricDataHash
-        biometricDataHash = ASN1OctetString.getInstance(e.nextElement());
-        // sourceDataUri
-        if (e.hasMoreElements())
-        {
-            sourceDataUri = DERIA5String.getInstance(e.nextElement());
-        }
-    }
-    
-    public BiometricData(
-        TypeOfBiometricData typeOfBiometricData,
-        AlgorithmIdentifier hashAlgorithm,
-        ASN1OctetString     biometricDataHash,
-        DERIA5String        sourceDataUri)
-    {
-        this.typeOfBiometricData = typeOfBiometricData;
-        this.hashAlgorithm = hashAlgorithm;
-        this.biometricDataHash = biometricDataHash;
-        this.sourceDataUri = sourceDataUri;
-    }
-    
-    public BiometricData(
-        TypeOfBiometricData typeOfBiometricData,
-        AlgorithmIdentifier hashAlgorithm,
-        ASN1OctetString     biometricDataHash)
-    {
-        this.typeOfBiometricData = typeOfBiometricData;
-        this.hashAlgorithm = hashAlgorithm;
-        this.biometricDataHash = biometricDataHash;
-        this.sourceDataUri = null;
-    }
-
-    public TypeOfBiometricData getTypeOfBiometricData()
-    {
-        return typeOfBiometricData;
-    }
-    
-    public AlgorithmIdentifier getHashAlgorithm()
-    {
-        return hashAlgorithm;
-    }
-    
-    public ASN1OctetString getBiometricDataHash()
-    {
-        return biometricDataHash;
-    }
-    
-    public DERIA5String getSourceDataUri()
-    {
-        return sourceDataUri;
-    }
-    
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector seq = new ASN1EncodableVector();
-        seq.add(typeOfBiometricData);
-        seq.add(hashAlgorithm);
-        seq.add(biometricDataHash); 
-        
-        if (sourceDataUri != null)
-        {
-            seq.add(sourceDataUri);
-        }
-
-        return new DERSequence(seq);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/x509/qualified/ETSIQCObjectIdentifiers.java b/bcprov/src/main/java/org/bouncycastle/asn1/x509/qualified/ETSIQCObjectIdentifiers.java
deleted file mode 100644
index 22db8cb..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/x509/qualified/ETSIQCObjectIdentifiers.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package org.bouncycastle.asn1.x509.qualified;
-
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-
-public interface ETSIQCObjectIdentifiers
-{
-    static final ASN1ObjectIdentifier    id_etsi_qcs_QcCompliance     = new ASN1ObjectIdentifier("0.4.0.1862.1.1");
-    static final ASN1ObjectIdentifier    id_etsi_qcs_LimiteValue      = new ASN1ObjectIdentifier("0.4.0.1862.1.2");
-    static final ASN1ObjectIdentifier    id_etsi_qcs_RetentionPeriod  = new ASN1ObjectIdentifier("0.4.0.1862.1.3");
-    static final ASN1ObjectIdentifier    id_etsi_qcs_QcSSCD           = new ASN1ObjectIdentifier("0.4.0.1862.1.4");
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/x509/qualified/Iso4217CurrencyCode.java b/bcprov/src/main/java/org/bouncycastle/asn1/x509/qualified/Iso4217CurrencyCode.java
deleted file mode 100644
index b6cfb62..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/x509/qualified/Iso4217CurrencyCode.java
+++ /dev/null
@@ -1,93 +0,0 @@
-package org.bouncycastle.asn1.x509.qualified;
-
-import org.bouncycastle.asn1.ASN1Choice;
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.DERPrintableString;
-
-/**
- * The Iso4217CurrencyCode object.
- * <pre>
- * Iso4217CurrencyCode  ::=  CHOICE {
- *       alphabetic              PrintableString (SIZE 3), --Recommended
- *       numeric              INTEGER (1..999) }
- * -- Alphabetic or numeric currency code as defined in ISO 4217
- * -- It is recommended that the Alphabetic form is used
- * </pre>
- */
-public class Iso4217CurrencyCode 
-    extends ASN1Object
-    implements ASN1Choice
-{
-    final int ALPHABETIC_MAXSIZE = 3;
-    final int NUMERIC_MINSIZE = 1;
-    final int NUMERIC_MAXSIZE = 999;
-    
-    ASN1Encodable obj;
-    int          numeric;
-    
-    public static Iso4217CurrencyCode getInstance(
-        Object obj)
-    {
-        if (obj == null || obj instanceof Iso4217CurrencyCode)
-        {
-            return (Iso4217CurrencyCode)obj;
-        }
-
-        if (obj instanceof ASN1Integer)
-        {
-            ASN1Integer numericobj = ASN1Integer.getInstance(obj);
-            int numeric = numericobj.getValue().intValue();  
-            return new Iso4217CurrencyCode(numeric);            
-        }
-        else
-        if (obj instanceof DERPrintableString)
-        {
-            DERPrintableString alphabetic = DERPrintableString.getInstance(obj);
-            return new Iso4217CurrencyCode(alphabetic.getString());
-        }
-        throw new IllegalArgumentException("unknown object in getInstance");
-    }
-            
-    public Iso4217CurrencyCode(
-        int numeric)
-    {
-        if (numeric > NUMERIC_MAXSIZE || numeric < NUMERIC_MINSIZE)
-        {
-            throw new IllegalArgumentException("wrong size in numeric code : not in (" +NUMERIC_MINSIZE +".."+ NUMERIC_MAXSIZE +")");
-        }
-        obj = new ASN1Integer(numeric);
-    }
-    
-    public Iso4217CurrencyCode(
-        String alphabetic)
-    {
-        if (alphabetic.length() > ALPHABETIC_MAXSIZE)
-        {
-            throw new IllegalArgumentException("wrong size in alphabetic code : max size is " + ALPHABETIC_MAXSIZE);
-        }
-        obj = new DERPrintableString(alphabetic);
-    }            
-
-    public boolean isAlphabetic()
-    {
-        return obj instanceof DERPrintableString;
-    }
-    
-    public String getAlphabetic()
-    {
-        return ((DERPrintableString)obj).getString();
-    }
-    
-    public int getNumeric()
-    {
-        return ((ASN1Integer)obj).getValue().intValue();
-    }
-    
-    public ASN1Primitive toASN1Primitive()
-    {    
-        return obj.toASN1Primitive();
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/x509/qualified/MonetaryValue.java b/bcprov/src/main/java/org/bouncycastle/asn1/x509/qualified/MonetaryValue.java
deleted file mode 100644
index 1ec2dcd..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/x509/qualified/MonetaryValue.java
+++ /dev/null
@@ -1,92 +0,0 @@
-package org.bouncycastle.asn1.x509.qualified;
-
-import java.math.BigInteger;
-import java.util.Enumeration;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DERSequence;
-
-/**
- * The MonetaryValue object.
- * <pre>
- * MonetaryValue  ::=  SEQUENCE {
- *       currency              Iso4217CurrencyCode,
- *       amount               INTEGER, 
- *       exponent             INTEGER }
- * -- value = amount * 10^exponent
- * </pre>
- */
-public class MonetaryValue 
-    extends ASN1Object
-{
-    private Iso4217CurrencyCode currency;
-    private ASN1Integer         amount;
-    private ASN1Integer         exponent;
-        
-    public static MonetaryValue getInstance(
-        Object obj)
-    {
-        if (obj instanceof MonetaryValue)
-        {
-            return (MonetaryValue)obj;
-        }
-
-        if (obj != null)
-        {
-            return new MonetaryValue(ASN1Sequence.getInstance(obj));            
-        }
-        
-        return null;
-    }
-        
-    private MonetaryValue(
-        ASN1Sequence seq)
-    {
-        Enumeration e = seq.getObjects();    
-        // currency
-        currency = Iso4217CurrencyCode.getInstance(e.nextElement());
-        // hashAlgorithm
-        amount = ASN1Integer.getInstance(e.nextElement());
-        // exponent
-        exponent = ASN1Integer.getInstance(e.nextElement());            
-    }
-        
-    public MonetaryValue(
-        Iso4217CurrencyCode currency, 
-        int                 amount, 
-        int                 exponent)
-    {    
-        this.currency = currency;
-        this.amount = new ASN1Integer(amount);
-        this.exponent = new ASN1Integer(exponent);
-    }                    
-             
-    public Iso4217CurrencyCode getCurrency()
-    {
-        return currency;
-    }
-        
-    public BigInteger getAmount()
-    {
-        return amount.getValue();
-    }
-        
-    public BigInteger getExponent()
-    {
-        return exponent.getValue();
-    }   
-    
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector seq = new ASN1EncodableVector();
-        seq.add(currency);
-        seq.add(amount);
-        seq.add(exponent); 
-        
-        return new DERSequence(seq);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/x509/qualified/QCStatement.java b/bcprov/src/main/java/org/bouncycastle/asn1/x509/qualified/QCStatement.java
deleted file mode 100644
index 82b01e7..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/x509/qualified/QCStatement.java
+++ /dev/null
@@ -1,95 +0,0 @@
-package org.bouncycastle.asn1.x509.qualified;
-
-import java.util.Enumeration;
-
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DERSequence;
-
-/**
- * The QCStatement object.
- * <pre>
- * QCStatement ::= SEQUENCE {
- *   statementId        OBJECT IDENTIFIER,
- *   statementInfo      ANY DEFINED BY statementId OPTIONAL} 
- * </pre>
- */
-
-public class QCStatement 
-    extends ASN1Object
-    implements ETSIQCObjectIdentifiers, RFC3739QCObjectIdentifiers
-{
-    ASN1ObjectIdentifier qcStatementId;
-    ASN1Encodable        qcStatementInfo;
-
-    public static QCStatement getInstance(
-        Object obj)
-    {
-        if (obj instanceof QCStatement)
-        {
-            return (QCStatement)obj;
-        }
-        if (obj != null)
-        {
-            return new QCStatement(ASN1Sequence.getInstance(obj));            
-        }
-        
-        return null;
-    }    
-    
-    private QCStatement(
-        ASN1Sequence seq)
-    {
-        Enumeration e = seq.getObjects();
-
-        // qcStatementId
-        qcStatementId = ASN1ObjectIdentifier.getInstance(e.nextElement());
-        // qcstatementInfo
-        if (e.hasMoreElements())
-        {
-            qcStatementInfo = (ASN1Encodable) e.nextElement();
-        }
-    }    
-    
-    public QCStatement(
-        ASN1ObjectIdentifier qcStatementId)
-    {
-        this.qcStatementId = qcStatementId;
-        this.qcStatementInfo = null;
-    }
-    
-    public QCStatement(
-        ASN1ObjectIdentifier qcStatementId,
-        ASN1Encodable       qcStatementInfo)
-    {
-        this.qcStatementId = qcStatementId;
-        this.qcStatementInfo = qcStatementInfo;
-    }    
-        
-    public ASN1ObjectIdentifier getStatementId()
-    {
-        return qcStatementId;
-    }
-    
-    public ASN1Encodable getStatementInfo()
-    {
-        return qcStatementInfo;
-    }
-
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector seq = new ASN1EncodableVector();
-        seq.add(qcStatementId);       
-        
-        if (qcStatementInfo != null)
-        {
-            seq.add(qcStatementInfo);
-        }
-
-        return new DERSequence(seq);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/x509/qualified/RFC3739QCObjectIdentifiers.java b/bcprov/src/main/java/org/bouncycastle/asn1/x509/qualified/RFC3739QCObjectIdentifiers.java
deleted file mode 100644
index 0c840bd..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/x509/qualified/RFC3739QCObjectIdentifiers.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package org.bouncycastle.asn1.x509.qualified;
-
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-
-public interface RFC3739QCObjectIdentifiers
-{
-    /** OID: 1.3.6.1.5.5.7.11.1 */
-    static final ASN1ObjectIdentifier   id_qcs_pkixQCSyntax_v1  = new ASN1ObjectIdentifier("1.3.6.1.5.5.7.11.1");
-    /** OID: 1.3.6.1.5.5.7.11.2 */
-    static final ASN1ObjectIdentifier   id_qcs_pkixQCSyntax_v2  = new ASN1ObjectIdentifier("1.3.6.1.5.5.7.11.2");
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/x509/qualified/SemanticsInformation.java b/bcprov/src/main/java/org/bouncycastle/asn1/x509/qualified/SemanticsInformation.java
deleted file mode 100644
index 43d8d58..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/x509/qualified/SemanticsInformation.java
+++ /dev/null
@@ -1,131 +0,0 @@
-package org.bouncycastle.asn1.x509.qualified;
-
-import java.util.Enumeration;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.x509.GeneralName;
-
-/**
- * The SemanticsInformation object.
- * <pre>
- *       SemanticsInformation ::= SEQUENCE {
- *         semanticsIdentifier        OBJECT IDENTIFIER   OPTIONAL,
- *         nameRegistrationAuthorities NameRegistrationAuthorities
- *                                                         OPTIONAL }
- *         (WITH COMPONENTS {..., semanticsIdentifier PRESENT}|
- *          WITH COMPONENTS {..., nameRegistrationAuthorities PRESENT})
- *
- *     NameRegistrationAuthorities ::=  SEQUENCE SIZE (1..MAX) OF
- *         GeneralName
- * </pre>
- */
-public class SemanticsInformation
-    extends ASN1Object
-{
-    private ASN1ObjectIdentifier semanticsIdentifier;
-    private GeneralName[] nameRegistrationAuthorities;
-    
-    public static SemanticsInformation getInstance(Object obj)
-    {
-        if (obj instanceof SemanticsInformation)
-        {
-            return (SemanticsInformation)obj;
-        }
-
-        if (obj != null)
-        {
-            return new SemanticsInformation(ASN1Sequence.getInstance(obj));            
-        }
-        
-        return null;
-    }
-        
-    private SemanticsInformation(ASN1Sequence seq)
-    {
-        Enumeration e = seq.getObjects();
-        if (seq.size() < 1)
-        {
-             throw new IllegalArgumentException("no objects in SemanticsInformation");
-        }
-        
-        Object object = e.nextElement();
-        if (object instanceof ASN1ObjectIdentifier)
-        {
-            semanticsIdentifier = ASN1ObjectIdentifier.getInstance(object);
-            if (e.hasMoreElements())
-            {
-                object = e.nextElement();
-            }
-            else
-            {
-                object = null;
-            }
-        }
-        
-        if (object != null)
-        {
-            ASN1Sequence generalNameSeq = ASN1Sequence.getInstance(object);
-            nameRegistrationAuthorities = new GeneralName[generalNameSeq.size()];
-            for (int i= 0; i < generalNameSeq.size(); i++)
-            {
-                nameRegistrationAuthorities[i] = GeneralName.getInstance(generalNameSeq.getObjectAt(i));
-            } 
-        }
-    }
-        
-    public SemanticsInformation(
-        ASN1ObjectIdentifier semanticsIdentifier,
-        GeneralName[] generalNames)
-    {
-        this.semanticsIdentifier = semanticsIdentifier;
-        this.nameRegistrationAuthorities = generalNames;
-    }
-
-    public SemanticsInformation(ASN1ObjectIdentifier semanticsIdentifier)
-    {
-        this.semanticsIdentifier = semanticsIdentifier;
-        this.nameRegistrationAuthorities = null;
-    }
-
-    public SemanticsInformation(GeneralName[] generalNames)
-    {
-        this.semanticsIdentifier = null;
-        this.nameRegistrationAuthorities = generalNames;
-    }        
-    
-    public ASN1ObjectIdentifier getSemanticsIdentifier()
-    {
-        return semanticsIdentifier;
-    }
-        
-    public GeneralName[] getNameRegistrationAuthorities()
-    {
-        return nameRegistrationAuthorities;
-    } 
-    
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector seq = new ASN1EncodableVector();
-        
-        if (this.semanticsIdentifier != null)
-        {
-            seq.add(semanticsIdentifier);
-        }
-        if (this.nameRegistrationAuthorities != null)
-        {
-            ASN1EncodableVector seqname = new ASN1EncodableVector();
-            for (int i = 0; i < nameRegistrationAuthorities.length; i++) 
-            {
-                seqname.add(nameRegistrationAuthorities[i]);
-            }            
-            seq.add(new DERSequence(seqname));
-        }            
-        
-        return new DERSequence(seq);
-    }                   
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/x509/qualified/TypeOfBiometricData.java b/bcprov/src/main/java/org/bouncycastle/asn1/x509/qualified/TypeOfBiometricData.java
deleted file mode 100644
index 01b254e..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/x509/qualified/TypeOfBiometricData.java
+++ /dev/null
@@ -1,90 +0,0 @@
-package org.bouncycastle.asn1.x509.qualified;
-
-import org.bouncycastle.asn1.ASN1Choice;
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1Primitive;
-
-/**
- * The TypeOfBiometricData object.
- * <pre>
- * TypeOfBiometricData ::= CHOICE {
- *   predefinedBiometricType   PredefinedBiometricType,
- *   biometricDataOid          OBJECT IDENTIFIER }
- *
- * PredefinedBiometricType ::= INTEGER {
- *   picture(0),handwritten-signature(1)}
- *   (picture|handwritten-signature)
- * </pre>
- */
-public class TypeOfBiometricData  
-    extends ASN1Object
-    implements ASN1Choice
-{
-    public static final int PICTURE                     = 0;
-    public static final int HANDWRITTEN_SIGNATURE       = 1;
-
-    ASN1Encodable      obj;
-
-    public static TypeOfBiometricData getInstance(Object obj)
-    {
-        if (obj == null || obj instanceof TypeOfBiometricData)
-        {
-            return (TypeOfBiometricData)obj;
-        }
-
-        if (obj instanceof ASN1Integer)
-        {
-            ASN1Integer predefinedBiometricTypeObj = ASN1Integer.getInstance(obj);
-            int  predefinedBiometricType = predefinedBiometricTypeObj.getValue().intValue();
-
-            return new TypeOfBiometricData(predefinedBiometricType);
-        }
-        else if (obj instanceof ASN1ObjectIdentifier)
-        {
-            ASN1ObjectIdentifier BiometricDataID = ASN1ObjectIdentifier.getInstance(obj);
-            return new TypeOfBiometricData(BiometricDataID);
-        }
-
-        throw new IllegalArgumentException("unknown object in getInstance");
-    }
-        
-    public TypeOfBiometricData(int predefinedBiometricType)
-    {
-        if (predefinedBiometricType == PICTURE || predefinedBiometricType == HANDWRITTEN_SIGNATURE)
-        {
-                obj = new ASN1Integer(predefinedBiometricType);
-        }
-        else
-        {
-            throw new IllegalArgumentException("unknow PredefinedBiometricType : " + predefinedBiometricType);
-        }        
-    }
-    
-    public TypeOfBiometricData(ASN1ObjectIdentifier BiometricDataID)
-    {
-        obj = BiometricDataID;
-    }
-    
-    public boolean isPredefined()
-    {
-        return obj instanceof ASN1Integer;
-    }
-    
-    public int getPredefinedBiometricType()
-    {
-        return ((ASN1Integer)obj).getValue().intValue();
-    }
-    
-    public ASN1ObjectIdentifier getBiometricDataOid()
-    {
-        return (ASN1ObjectIdentifier)obj;
-    }
-    
-    public ASN1Primitive toASN1Primitive()
-    {        
-        return obj.toASN1Primitive();
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/x509/qualified/package.html b/bcprov/src/main/java/org/bouncycastle/asn1/x509/qualified/package.html
deleted file mode 100644
index 28cfef9..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/x509/qualified/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body bgcolor="#ffffff">
-Support classes useful for encoding and processing messages based around RFC3739
-</body>
-</html>
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/x509/sigi/NameOrPseudonym.java b/bcprov/src/main/java/org/bouncycastle/asn1/x509/sigi/NameOrPseudonym.java
deleted file mode 100644
index 8c05277..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/x509/sigi/NameOrPseudonym.java
+++ /dev/null
@@ -1,188 +0,0 @@
-package org.bouncycastle.asn1.x509.sigi;
-
-import java.util.Enumeration;
-
-import org.bouncycastle.asn1.ASN1Choice;
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.ASN1String;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.x500.DirectoryString;
-
-/**
- * Structure for a name or pseudonym.
- * 
- * <pre>
- *       NameOrPseudonym ::= CHOICE {
- *            surAndGivenName SEQUENCE {
- *              surName DirectoryString,
- *              givenName SEQUENCE OF DirectoryString 
- *         },
- *            pseudonym DirectoryString 
- *       }
- * </pre>
- * 
- * @see org.bouncycastle.asn1.x509.sigi.PersonalData
- * 
- */
-public class NameOrPseudonym
-    extends ASN1Object
-    implements ASN1Choice
-{
-    private DirectoryString pseudonym;
-
-    private DirectoryString surname;
-
-    private ASN1Sequence givenName;
-
-    public static NameOrPseudonym getInstance(Object obj)
-    {
-        if (obj == null || obj instanceof NameOrPseudonym)
-        {
-            return (NameOrPseudonym)obj;
-        }
-
-        if (obj instanceof ASN1String)
-        {
-            return new NameOrPseudonym(DirectoryString.getInstance(obj));
-        }
-
-        if (obj instanceof ASN1Sequence)
-        {
-            return new NameOrPseudonym((ASN1Sequence)obj);
-        }
-
-        throw new IllegalArgumentException("illegal object in getInstance: "
-            + obj.getClass().getName());
-    }
-
-    /**
-     * Constructor from DirectoryString.
-     * <p>
-     * The sequence is of type NameOrPseudonym:
-     * <pre>
-     *       NameOrPseudonym ::= CHOICE {
-     *            surAndGivenName SEQUENCE {
-     *              surName DirectoryString,
-     *              givenName SEQUENCE OF DirectoryString
-     *         },
-     *            pseudonym DirectoryString
-     *       }
-     * </pre>
-     * @param pseudonym pseudonym value to use.
-     */
-    public NameOrPseudonym(DirectoryString pseudonym)
-    {
-        this.pseudonym = pseudonym;
-    }
-
-    /**
-     * Constructor from ASN1Sequence.
-     * <p>
-     * The sequence is of type NameOrPseudonym:
-     * <pre>
-     *       NameOrPseudonym ::= CHOICE {
-     *            surAndGivenName SEQUENCE {
-     *              surName DirectoryString,
-     *              givenName SEQUENCE OF DirectoryString
-     *         },
-     *            pseudonym DirectoryString
-     *       }
-     * </pre>
-     * </p>
-     * @param seq The ASN.1 sequence.
-     */
-    private NameOrPseudonym(ASN1Sequence seq)
-    {
-        if (seq.size() != 2)
-        {
-            throw new IllegalArgumentException("Bad sequence size: "
-                + seq.size());
-        }
-
-        if (!(seq.getObjectAt(0) instanceof ASN1String))
-        {
-            throw new IllegalArgumentException("Bad object encountered: "
-                + seq.getObjectAt(0).getClass());
-        }
-
-        surname = DirectoryString.getInstance(seq.getObjectAt(0));
-        givenName = ASN1Sequence.getInstance(seq.getObjectAt(1));
-    }
-
-    /**
-     * Constructor from a given details.
-     *
-     * @param pseudonym The pseudonym.
-     */
-    public NameOrPseudonym(String pseudonym)
-    {
-        this(new DirectoryString(pseudonym));
-    }
-
-    /**
-     * Constructor from a given details.
-     *
-     * @param surname   The surname.
-     * @param givenName A sequence of directory strings making up the givenName
-     */
-    public NameOrPseudonym(DirectoryString surname, ASN1Sequence givenName)
-    {
-        this.surname = surname;
-        this.givenName = givenName;
-    }
-
-    public DirectoryString getPseudonym()
-    {
-        return pseudonym;
-    }
-
-    public DirectoryString getSurname()
-    {
-        return surname;
-    }
-
-    public DirectoryString[] getGivenName()
-    {
-        DirectoryString[] items = new DirectoryString[givenName.size()];
-        int count = 0;
-        for (Enumeration e = givenName.getObjects(); e.hasMoreElements();)
-        {
-            items[count++] = DirectoryString.getInstance(e.nextElement());
-        }
-        return items;
-    }
-
-    /**
-     * Produce an object suitable for an ASN1OutputStream.
-     * <p>
-     * Returns:
-     * <pre>
-     *       NameOrPseudonym ::= CHOICE {
-     *            surAndGivenName SEQUENCE {
-     *              surName DirectoryString,
-     *              givenName SEQUENCE OF DirectoryString
-     *         },
-     *            pseudonym DirectoryString
-     *       }
-     * </pre>
-     *
-     * @return a DERObject
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        if (pseudonym != null)
-        {
-            return pseudonym.toASN1Primitive();
-        }
-        else
-        {
-            ASN1EncodableVector vec1 = new ASN1EncodableVector();
-            vec1.add(surname);
-            vec1.add(givenName);
-            return new DERSequence(vec1);
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/x509/sigi/PersonalData.java b/bcprov/src/main/java/org/bouncycastle/asn1/x509/sigi/PersonalData.java
deleted file mode 100644
index 883ed8d..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/x509/sigi/PersonalData.java
+++ /dev/null
@@ -1,212 +0,0 @@
-package org.bouncycastle.asn1.x509.sigi;
-
-import java.math.BigInteger;
-import java.util.Enumeration;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1GeneralizedTime;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.ASN1TaggedObject;
-import org.bouncycastle.asn1.DERPrintableString;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.DERTaggedObject;
-import org.bouncycastle.asn1.x500.DirectoryString;
-
-/**
- * Contains personal data for the otherName field in the subjectAltNames
- * extension.
- *
- * <pre>
- *     PersonalData ::= SEQUENCE {
- *       nameOrPseudonym NameOrPseudonym,
- *       nameDistinguisher [0] INTEGER OPTIONAL,
- *       dateOfBirth [1] GeneralizedTime OPTIONAL,
- *       placeOfBirth [2] DirectoryString OPTIONAL,
- *       gender [3] PrintableString OPTIONAL,
- *       postalAddress [4] DirectoryString OPTIONAL
- *       }
- * </pre>
- *
- * @see org.bouncycastle.asn1.x509.sigi.NameOrPseudonym
- * @see org.bouncycastle.asn1.x509.sigi.SigIObjectIdentifiers
- */
-public class PersonalData
-    extends ASN1Object
-{
-    private NameOrPseudonym nameOrPseudonym;
-    private BigInteger nameDistinguisher;
-    private ASN1GeneralizedTime dateOfBirth;
-    private DirectoryString placeOfBirth;
-    private String gender;
-    private DirectoryString postalAddress;
-
-    public static PersonalData getInstance(Object obj)
-    {
-        if (obj == null || obj instanceof PersonalData)
-        {
-            return (PersonalData)obj;
-        }
-
-        if (obj instanceof ASN1Sequence)
-        {
-            return new PersonalData((ASN1Sequence)obj);
-        }
-
-        throw new IllegalArgumentException("illegal object in getInstance: " + obj.getClass().getName());
-    }
-
-    /**
-     * Constructor from ASN1Sequence.
-     * <p>
-     * The sequence is of type NameOrPseudonym:
-     * <pre>
-     *     PersonalData ::= SEQUENCE {
-     *       nameOrPseudonym NameOrPseudonym,
-     *       nameDistinguisher [0] INTEGER OPTIONAL,
-     *       dateOfBirth [1] GeneralizedTime OPTIONAL,
-     *       placeOfBirth [2] DirectoryString OPTIONAL,
-     *       gender [3] PrintableString OPTIONAL,
-     *       postalAddress [4] DirectoryString OPTIONAL
-     *       }
-     * </pre>
-     * </p>
-     * @param seq The ASN.1 sequence.
-     */
-    private PersonalData(ASN1Sequence seq)
-    {
-        if (seq.size() < 1)
-        {
-            throw new IllegalArgumentException("Bad sequence size: "
-                + seq.size());
-        }
-
-        Enumeration e = seq.getObjects();
-
-        nameOrPseudonym = NameOrPseudonym.getInstance(e.nextElement());
-
-        while (e.hasMoreElements())
-        {
-            ASN1TaggedObject o = ASN1TaggedObject.getInstance(e.nextElement());
-            int tag = o.getTagNo();
-            switch (tag)
-            {
-                case 0:
-                    nameDistinguisher = ASN1Integer.getInstance(o, false).getValue();
-                    break;
-                case 1:
-                    dateOfBirth = ASN1GeneralizedTime.getInstance(o, false);
-                    break;
-                case 2:
-                    placeOfBirth = DirectoryString.getInstance(o, true);
-                    break;
-                case 3:
-                    gender = DERPrintableString.getInstance(o, false).getString();
-                    break;
-                case 4:
-                    postalAddress = DirectoryString.getInstance(o, true);
-                    break;
-                default:
-                    throw new IllegalArgumentException("Bad tag number: " + o.getTagNo());
-            }
-        }
-    }
-
-    /**
-     * Constructor from a given details.
-     *
-     * @param nameOrPseudonym   Name or pseudonym.
-     * @param nameDistinguisher Name distinguisher.
-     * @param dateOfBirth       Date of birth.
-     * @param placeOfBirth      Place of birth.
-     * @param gender            Gender.
-     * @param postalAddress     Postal Address.
-     */
-    public PersonalData(NameOrPseudonym nameOrPseudonym,
-                        BigInteger nameDistinguisher, ASN1GeneralizedTime dateOfBirth,
-                        DirectoryString placeOfBirth, String gender, DirectoryString postalAddress)
-    {
-        this.nameOrPseudonym = nameOrPseudonym;
-        this.dateOfBirth = dateOfBirth;
-        this.gender = gender;
-        this.nameDistinguisher = nameDistinguisher;
-        this.postalAddress = postalAddress;
-        this.placeOfBirth = placeOfBirth;
-    }
-
-    public NameOrPseudonym getNameOrPseudonym()
-    {
-        return nameOrPseudonym;
-    }
-
-    public BigInteger getNameDistinguisher()
-    {
-        return nameDistinguisher;
-    }
-
-    public ASN1GeneralizedTime getDateOfBirth()
-    {
-        return dateOfBirth;
-    }
-
-    public DirectoryString getPlaceOfBirth()
-    {
-        return placeOfBirth;
-    }
-
-    public String getGender()
-    {
-        return gender;
-    }
-
-    public DirectoryString getPostalAddress()
-    {
-        return postalAddress;
-    }
-
-    /**
-     * Produce an object suitable for an ASN1OutputStream.
-     * <p>
-     * Returns:
-     * <pre>
-     *     PersonalData ::= SEQUENCE {
-     *       nameOrPseudonym NameOrPseudonym,
-     *       nameDistinguisher [0] INTEGER OPTIONAL,
-     *       dateOfBirth [1] GeneralizedTime OPTIONAL,
-     *       placeOfBirth [2] DirectoryString OPTIONAL,
-     *       gender [3] PrintableString OPTIONAL,
-     *       postalAddress [4] DirectoryString OPTIONAL
-     *       }
-     * </pre>
-     *
-     * @return a DERObject
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector vec = new ASN1EncodableVector();
-        vec.add(nameOrPseudonym);
-        if (nameDistinguisher != null)
-        {
-            vec.add(new DERTaggedObject(false, 0, new ASN1Integer(nameDistinguisher)));
-        }
-        if (dateOfBirth != null)
-        {
-            vec.add(new DERTaggedObject(false, 1, dateOfBirth));
-        }
-        if (placeOfBirth != null)
-        {
-            vec.add(new DERTaggedObject(true, 2, placeOfBirth));
-        }
-        if (gender != null)
-        {
-            vec.add(new DERTaggedObject(false, 3, new DERPrintableString(gender, true)));
-        }
-        if (postalAddress != null)
-        {
-            vec.add(new DERTaggedObject(true, 4, postalAddress));
-        }
-        return new DERSequence(vec);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/x509/sigi/SigIObjectIdentifiers.java b/bcprov/src/main/java/org/bouncycastle/asn1/x509/sigi/SigIObjectIdentifiers.java
deleted file mode 100644
index d338614..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/x509/sigi/SigIObjectIdentifiers.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package org.bouncycastle.asn1.x509.sigi;
-
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-
-/**
- * Object Identifiers of SigI specifciation (German Signature Law
- * Interoperability specification).
- */
-public interface SigIObjectIdentifiers
-{
-    /**
-     * OID: 1.3.36.8
-     */
-    public final static ASN1ObjectIdentifier id_sigi = new ASN1ObjectIdentifier("1.3.36.8");
-
-    /**
-     * Key purpose IDs for German SigI (Signature Interoperability
-     * Specification)
-     * <p>
-     * OID: 1.3.36.8.2
-     */
-    public final static ASN1ObjectIdentifier id_sigi_kp = new ASN1ObjectIdentifier("1.3.36.8.2");
-
-    /**
-     * Certificate policy IDs for German SigI (Signature Interoperability
-     * Specification)
-     * <p>
-     * OID: 1.3.36.8.1
-     */
-    public final static ASN1ObjectIdentifier id_sigi_cp = new ASN1ObjectIdentifier("1.3.36.8.1");
-
-    /**
-     * Other Name IDs for German SigI (Signature Interoperability Specification)
-     * <p>
-     * OID: 1.3.36.8.4
-     */
-    public final static ASN1ObjectIdentifier id_sigi_on = new ASN1ObjectIdentifier("1.3.36.8.4");
-
-    /**
-     * To be used for for the generation of directory service certificates.
-     * <p>
-     * OID: 1.3.36.8.2.1
-     */
-    public static final ASN1ObjectIdentifier id_sigi_kp_directoryService = new ASN1ObjectIdentifier("1.3.36.8.2.1");
-
-    /**
-     * ID for PersonalData
-     * <p>
-     * OID: 1.3.36.8.4.1
-     */
-    public static final ASN1ObjectIdentifier id_sigi_on_personalData = new ASN1ObjectIdentifier("1.3.36.8.4.1");
-
-    /**
-     * Certificate is conformant to german signature law.
-     * <p>
-     * OID: 1.3.36.8.1.1
-     */
-    public static final ASN1ObjectIdentifier id_sigi_cp_sigconform = new ASN1ObjectIdentifier("1.3.36.8.1.1");
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/x509/sigi/package.html b/bcprov/src/main/java/org/bouncycastle/asn1/x509/sigi/package.html
deleted file mode 100644
index 4e073ce..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/x509/sigi/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body bgcolor="#ffffff">
-Support classes for the  German SigI (Signature Interoperability Specification)  standard.
-</body>
-</html>
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/x9/ECNamedCurveTable.java b/bcprov/src/main/java/org/bouncycastle/asn1/x9/ECNamedCurveTable.java
index 2206a33..cf3c760 100644
--- a/bcprov/src/main/java/org/bouncycastle/asn1/x9/ECNamedCurveTable.java
+++ b/bcprov/src/main/java/org/bouncycastle/asn1/x9/ECNamedCurveTable.java
@@ -6,7 +6,9 @@ import java.util.Vector;
 import org.bouncycastle.asn1.ASN1ObjectIdentifier;
 import org.bouncycastle.asn1.nist.NISTNamedCurves;
 import org.bouncycastle.asn1.sec.SECNamedCurves;
-import org.bouncycastle.asn1.teletrust.TeleTrusTNamedCurves;
+// BEGIN android-removed
+// import org.bouncycastle.asn1.teletrust.TeleTrusTNamedCurves;
+// END android-removed
 
 /**
  * A general class that reads all X9.62 style EC curve tables.
@@ -30,10 +32,12 @@ public class ECNamedCurveTable
             ecP = SECNamedCurves.getByName(name);
         }
 
-        if (ecP == null)
-        {
-            ecP = TeleTrusTNamedCurves.getByName(name);
-        }
+        // BEGIN android-removed
+        // if (ecP == null)
+        // {
+        //     ecP = TeleTrusTNamedCurves.getByName(name);
+        // }
+        // END android-removed
 
         if (ecP == null)
         {
@@ -59,10 +63,12 @@ public class ECNamedCurveTable
             oid = SECNamedCurves.getOID(name);
         }
 
-        if (oid == null)
-        {
-            oid = TeleTrusTNamedCurves.getOID(name);
-        }
+        // BEGIN android-removed
+        // if (oid == null)
+        // {
+        //     oid = TeleTrusTNamedCurves.getOID(name);
+        // }
+        // END android-removed
 
         if (oid == null)
         {
@@ -89,10 +95,12 @@ public class ECNamedCurveTable
             ecP = SECNamedCurves.getByOID(oid);
         }
 
-        if (ecP == null)
-        {
-            ecP = TeleTrusTNamedCurves.getByOID(oid);
-        }
+        // BEGIN android-removed
+        // if (ecP == null)
+        // {
+        //     ecP = TeleTrusTNamedCurves.getByOID(oid);
+        // }
+        // END android-removed
 
         // NOTE: All the NIST curves are currently from SEC, so no point in redundant OID lookup
 
@@ -111,7 +119,9 @@ public class ECNamedCurveTable
         addEnumeration(v, X962NamedCurves.getNames());
         addEnumeration(v, SECNamedCurves.getNames());
         addEnumeration(v, NISTNamedCurves.getNames());
-        addEnumeration(v, TeleTrusTNamedCurves.getNames());
+        // BEGIN android-removed
+        // addEnumeration(v, TeleTrusTNamedCurves.getNames());
+        // END android-removed
 
         return v.elements();
     }
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/x9/KeySpecificInfo.java b/bcprov/src/main/java/org/bouncycastle/asn1/x9/KeySpecificInfo.java
deleted file mode 100644
index 092716f..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/x9/KeySpecificInfo.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package org.bouncycastle.asn1.x9;
-
-import java.util.Enumeration;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DERSequence;
-
-/**
- * ASN.1 def for Diffie-Hellman key exchange KeySpecificInfo structure. See
- * RFC 2631, or X9.42, for further details.
- */
-public class KeySpecificInfo
-    extends ASN1Object
-{
-    private ASN1ObjectIdentifier algorithm;
-    private ASN1OctetString      counter;
-
-    public KeySpecificInfo(
-        ASN1ObjectIdentifier algorithm,
-        ASN1OctetString      counter)
-    {
-        this.algorithm = algorithm;
-        this.counter = counter;
-    }
-
-    public KeySpecificInfo(
-        ASN1Sequence  seq)
-    {
-        Enumeration e = seq.getObjects();
-
-        algorithm = (ASN1ObjectIdentifier)e.nextElement();
-        counter = (ASN1OctetString)e.nextElement();
-    }
-
-    public ASN1ObjectIdentifier getAlgorithm()
-    {
-        return algorithm;
-    }
-
-    public ASN1OctetString getCounter()
-    {
-        return counter;
-    }
-
-    /**
-     * Produce an object suitable for an ASN1OutputStream.
-     * <pre>
-     *  KeySpecificInfo ::= SEQUENCE {
-     *      algorithm OBJECT IDENTIFIER,
-     *      counter OCTET STRING SIZE (4..4)
-     *  }
-     * </pre>
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector  v = new ASN1EncodableVector();
-
-        v.add(algorithm);
-        v.add(counter);
-
-        return new DERSequence(v);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/x9/OtherInfo.java b/bcprov/src/main/java/org/bouncycastle/asn1/x9/OtherInfo.java
deleted file mode 100644
index 0959244..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/x9/OtherInfo.java
+++ /dev/null
@@ -1,96 +0,0 @@
-package org.bouncycastle.asn1.x9;
-
-import java.util.Enumeration;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.DERTaggedObject;
-
-/**
- * ANS.1 def for Diffie-Hellman key exchange OtherInfo structure. See
- * RFC 2631, or X9.42, for further details.
- */
-public class OtherInfo
-    extends ASN1Object
-{
-    private KeySpecificInfo     keyInfo;
-    private ASN1OctetString     partyAInfo;
-    private ASN1OctetString     suppPubInfo;
-
-    public OtherInfo(
-        KeySpecificInfo     keyInfo,
-        ASN1OctetString     partyAInfo,
-        ASN1OctetString     suppPubInfo)
-    {
-        this.keyInfo = keyInfo;
-        this.partyAInfo = partyAInfo;
-        this.suppPubInfo = suppPubInfo;
-    }
-
-    public OtherInfo(
-        ASN1Sequence  seq)
-    {
-        Enumeration e = seq.getObjects();
-
-        keyInfo = new KeySpecificInfo((ASN1Sequence)e.nextElement());
-
-        while (e.hasMoreElements())
-        {
-            DERTaggedObject o = (DERTaggedObject)e.nextElement();
-
-            if (o.getTagNo() == 0)
-            {
-                partyAInfo = (ASN1OctetString)o.getObject();
-            }
-            else if (o.getTagNo() == 2)
-            {
-                suppPubInfo = (ASN1OctetString)o.getObject();
-            }
-        }
-    }
-
-    public KeySpecificInfo getKeyInfo()
-    {
-        return keyInfo;
-    }
-
-    public ASN1OctetString getPartyAInfo()
-    {
-        return partyAInfo;
-    }
-
-    public ASN1OctetString getSuppPubInfo()
-    {
-        return suppPubInfo;
-    }
-
-    /**
-     * Produce an object suitable for an ASN1OutputStream.
-     * <pre>
-     *  OtherInfo ::= SEQUENCE {
-     *      keyInfo KeySpecificInfo,
-     *      partyAInfo [0] OCTET STRING OPTIONAL,
-     *      suppPubInfo [2] OCTET STRING
-     *  }
-     * </pre>
-     */
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector  v = new ASN1EncodableVector();
-
-        v.add(keyInfo);
-
-        if (partyAInfo != null)
-        {
-            v.add(new DERTaggedObject(0, partyAInfo));
-        }
-
-        v.add(new DERTaggedObject(2, suppPubInfo));
-
-        return new DERSequence(v);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/x9/package.html b/bcprov/src/main/java/org/bouncycastle/asn1/x9/package.html
deleted file mode 100644
index 42fc97c..0000000
--- a/bcprov/src/main/java/org/bouncycastle/asn1/x9/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body bgcolor="#ffffff">
-Support classes useful for encoding and supporting X9.62 elliptic curve.
-</body>
-</html>
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/BufferedAsymmetricBlockCipher.java b/bcprov/src/main/java/org/bouncycastle/crypto/BufferedAsymmetricBlockCipher.java
deleted file mode 100644
index 1bf7ce3..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/BufferedAsymmetricBlockCipher.java
+++ /dev/null
@@ -1,171 +0,0 @@
-package org.bouncycastle.crypto;
-
-/**
- * a buffer wrapper for an asymmetric block cipher, allowing input
- * to be accumulated in a piecemeal fashion until final processing.
- */
-public class BufferedAsymmetricBlockCipher
-{
-    protected byte[]        buf;
-    protected int           bufOff;
-
-    private final AsymmetricBlockCipher   cipher;
-
-    /**
-     * base constructor.
-     *
-     * @param cipher the cipher this buffering object wraps.
-     */
-    public BufferedAsymmetricBlockCipher(
-        AsymmetricBlockCipher     cipher)
-    {
-        this.cipher = cipher;
-    }
-
-    /**
-     * return the underlying cipher for the buffer.
-     *
-     * @return the underlying cipher for the buffer.
-     */
-    public AsymmetricBlockCipher getUnderlyingCipher()
-    {
-        return cipher;
-    }
-
-    /**
-     * return the amount of data sitting in the buffer.
-     *
-     * @return the amount of data sitting in the buffer.
-     */
-    public int getBufferPosition()
-    {
-        return bufOff;
-    }
-
-    /**
-     * initialise the buffer and the underlying cipher.
-     *
-     * @param forEncryption if true the cipher is initialised for
-     *  encryption, if false for decryption.
-     * @param params the key and other data required by the cipher.
-     */
-    public void init(
-        boolean             forEncryption,
-        CipherParameters    params)
-    {
-        reset();
-
-        cipher.init(forEncryption, params);
-
-        //
-        // we allow for an extra byte where people are using their own padding
-        // mechanisms on a raw cipher.
-        //
-        buf = new byte[cipher.getInputBlockSize() + (forEncryption ? 1 : 0)];
-        bufOff = 0;
-    }
-
-    /**
-     * returns the largest size an input block can be.
-     *
-     * @return maximum size for an input block.
-     */
-    public int getInputBlockSize()
-    {
-        return cipher.getInputBlockSize();
-    }
-
-    /**
-     * returns the maximum size of the block produced by this cipher.
-     *
-     * @return maximum size of the output block produced by the cipher.
-     */
-    public int getOutputBlockSize()
-    {
-        return cipher.getOutputBlockSize();
-    }
-
-    /**
-     * add another byte for processing.
-     * 
-     * @param in the input byte.
-     */
-    public void processByte(
-        byte        in)
-    {
-        if (bufOff >= buf.length)
-        {
-            throw new DataLengthException("attempt to process message too long for cipher");
-        }
-
-        buf[bufOff++] = in;
-    }
-
-    /**
-     * add len bytes to the buffer for processing.
-     *
-     * @param in the input data
-     * @param inOff offset into the in array where the data starts
-     * @param len the length of the block to be processed.
-     */
-    public void processBytes(
-        byte[]      in,
-        int         inOff,
-        int         len)
-    {
-        if (len == 0)
-        {
-            return;
-        }
-
-        if (len < 0)
-        {
-            throw new IllegalArgumentException("Can't have a negative input length!");
-        }
-
-        if (bufOff + len > buf.length)
-        {
-            throw new DataLengthException("attempt to process message too long for cipher");
-        }
-
-        System.arraycopy(in, inOff, buf, bufOff, len);
-        bufOff += len;
-    }
-
-    /**
-     * process the contents of the buffer using the underlying
-     * cipher.
-     *
-     * @return the result of the encryption/decryption process on the
-     * buffer.
-     * @exception InvalidCipherTextException if we are given a garbage block.
-     */
-    public byte[] doFinal()
-        throws InvalidCipherTextException
-    {
-        byte[] out = cipher.processBlock(buf, 0, bufOff);
-
-        reset();
-
-        return out;
-    }
-
-    /**
-     * Reset the buffer and the underlying cipher.
-     */
-    public void reset()
-    {
-        /*
-         * clean the buffer.
-         */
-        if (buf != null)
-        {
-            for (int i = 0; i < buf.length; i++)
-            {
-                buf[i] = 0;
-            }
-        }
-
-        bufOff = 0;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/Commitment.java b/bcprov/src/main/java/org/bouncycastle/crypto/Commitment.java
deleted file mode 100644
index f1dc05a..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/Commitment.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package org.bouncycastle.crypto;
-
-/**
- * General holding class for a commitment.
- */
-public class Commitment
-{
-    private final byte[] secret;
-    private final byte[] commitment;
-
-    /**
-     * Base constructor.
-     *
-     * @param secret  an encoding of the secret required to reveal the commitment.
-     * @param commitment  an encoding of the sealed commitment.
-     */
-    public Commitment(byte[] secret, byte[] commitment)
-    {
-        this.secret = secret;
-        this.commitment = commitment;
-    }
-
-    /**
-     * The secret required to reveal the commitment.
-     *
-     * @return an encoding of the secret associated with the commitment.
-     */
-    public byte[] getSecret()
-    {
-        return secret;
-    }
-
-    /**
-     * The sealed commitment.
-     *
-     * @return an encoding of the sealed commitment.
-     */
-    public byte[] getCommitment()
-    {
-        return commitment;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/Committer.java b/bcprov/src/main/java/org/bouncycastle/crypto/Committer.java
deleted file mode 100644
index 5c93e5d..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/Committer.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.bouncycastle.crypto;
-
-/**
- * General interface fdr classes that produce and validate commitments.
- */
-public interface Committer
-{
-    /**
-     * Generate a commitment for the passed in message.
-     *
-     * @param message the message to be committed to,
-     * @return a Commitment
-     */
-    Commitment commit(byte[] message);
-
-    /**
-     * Return true if the passed in commitment represents a commitment to the passed in maessage.
-     *
-     * @param commitment a commitment previously generated.
-     * @param message the message that was expected to have been committed to.
-     * @return true if commitment matches message, false otherwise.
-     */
-    boolean isRevealed(Commitment commitment, byte[] message);
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/DigestDerivationFunction.java b/bcprov/src/main/java/org/bouncycastle/crypto/DigestDerivationFunction.java
deleted file mode 100644
index 180382d..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/DigestDerivationFunction.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package org.bouncycastle.crypto;
-
-/**
- * base interface for general purpose Digest based byte derivation functions.
- */
-public interface DigestDerivationFunction
-    extends DerivationFunction
-{
-    /**
-     * return the message digest used as the basis for the function
-     */
-    public Digest getDigest();
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/EphemeralKeyPair.java b/bcprov/src/main/java/org/bouncycastle/crypto/EphemeralKeyPair.java
deleted file mode 100644
index f16812f..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/EphemeralKeyPair.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package org.bouncycastle.crypto;
-
-public class EphemeralKeyPair
-{
-    private AsymmetricCipherKeyPair keyPair;
-    private KeyEncoder publicKeyEncoder;
-
-    public EphemeralKeyPair(AsymmetricCipherKeyPair keyPair, KeyEncoder publicKeyEncoder)
-    {
-        this.keyPair = keyPair;
-        this.publicKeyEncoder = publicKeyEncoder;
-    }
-
-    public AsymmetricCipherKeyPair getKeyPair()
-    {
-        return keyPair;
-    }
-
-    public byte[] getEncodedPublicKey()
-    {
-        return publicKeyEncoder.getEncoded(keyPair.getPublic());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/KeyEncapsulation.java b/bcprov/src/main/java/org/bouncycastle/crypto/KeyEncapsulation.java
deleted file mode 100644
index 1674457..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/KeyEncapsulation.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package org.bouncycastle.crypto;
-
-/**
- * The basic interface for key encapsulation mechanisms.
- */
-public interface KeyEncapsulation
-{
-    /**
-     * Initialise the key encapsulation mechanism.
-     */
-    public void init(CipherParameters param);
-
-    /**
-     * Encapsulate a randomly generated session key.    
-     */
-    public CipherParameters encrypt(byte[] out, int outOff, int keyLen);
-    
-    /**
-     * Decapsulate an encapsulated session key.
-     */
-    public CipherParameters decrypt(byte[] in, int inOff, int inLen, int keyLen);
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/KeyEncoder.java b/bcprov/src/main/java/org/bouncycastle/crypto/KeyEncoder.java
deleted file mode 100644
index 92ded9c..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/KeyEncoder.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package org.bouncycastle.crypto;
-
-import org.bouncycastle.crypto.params.AsymmetricKeyParameter;
-
-public interface KeyEncoder
-{
-    byte[] getEncoded(AsymmetricKeyParameter keyParameter);
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/KeyParser.java b/bcprov/src/main/java/org/bouncycastle/crypto/KeyParser.java
deleted file mode 100644
index 60ce29d..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/KeyParser.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.bouncycastle.crypto;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.bouncycastle.crypto.params.AsymmetricKeyParameter;
-
-public interface KeyParser
-{
-    AsymmetricKeyParameter readKey(InputStream stream)
-        throws IOException;
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/MacDerivationFunction.java b/bcprov/src/main/java/org/bouncycastle/crypto/MacDerivationFunction.java
deleted file mode 100644
index 16198ba..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/MacDerivationFunction.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package org.bouncycastle.crypto;
-
-/**
- * base interface for general purpose Mac based byte derivation functions.
- */
-public interface MacDerivationFunction
-    extends DerivationFunction
-{
-    /**
-     * return the MAC used as the basis for the function
-     */
-    public Mac getMac();
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/MaxBytesExceededException.java b/bcprov/src/main/java/org/bouncycastle/crypto/MaxBytesExceededException.java
deleted file mode 100644
index bfa1544..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/MaxBytesExceededException.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package org.bouncycastle.crypto;
-
-/**
- * this exception is thrown whenever a cipher requires a change of key, iv
- * or similar after x amount of bytes enciphered
- */
-public class MaxBytesExceededException
-    extends RuntimeCryptoException
-{
-    /**
-     * base constructor.
-     */
-    public MaxBytesExceededException()
-    {
-    }
-
-    /**
-     * create an with the given message.
-     *
-     * @param message the message to be carried with the exception.
-     */
-    public MaxBytesExceededException(
-        String  message)
-    {
-        super(message);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/agreement/DHAgreement.java b/bcprov/src/main/java/org/bouncycastle/crypto/agreement/DHAgreement.java
deleted file mode 100644
index 021a715..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/agreement/DHAgreement.java
+++ /dev/null
@@ -1,94 +0,0 @@
-package org.bouncycastle.crypto.agreement;
-
-import java.math.BigInteger;
-import java.security.SecureRandom;
-
-import org.bouncycastle.crypto.AsymmetricCipherKeyPair;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.generators.DHKeyPairGenerator;
-import org.bouncycastle.crypto.params.DHKeyGenerationParameters;
-import org.bouncycastle.crypto.params.DHParameters;
-import org.bouncycastle.crypto.params.DHPublicKeyParameters;
-import org.bouncycastle.crypto.params.DHPrivateKeyParameters;
-import org.bouncycastle.crypto.params.AsymmetricKeyParameter;
-import org.bouncycastle.crypto.params.ParametersWithRandom;
-
-/**
- * a Diffie-Hellman key exchange engine.
- * <p>
- * note: This uses MTI/A0 key agreement in order to make the key agreement
- * secure against passive attacks. If you're doing Diffie-Hellman and both
- * parties have long term public keys you should look at using this. For
- * further information have a look at RFC 2631.
- * <p>
- * It's possible to extend this to more than two parties as well, for the moment
- * that is left as an exercise for the reader.
- */
-public class DHAgreement
-{
-    private DHPrivateKeyParameters  key;
-    private DHParameters            dhParams;
-    private BigInteger              privateValue;
-    private SecureRandom            random;
-
-    public void init(
-        CipherParameters    param)
-    {
-        AsymmetricKeyParameter  kParam;
-
-        if (param instanceof ParametersWithRandom)
-        {
-            ParametersWithRandom    rParam = (ParametersWithRandom)param;
-
-            this.random = rParam.getRandom();
-            kParam = (AsymmetricKeyParameter)rParam.getParameters();
-        }
-        else
-        {
-            this.random = new SecureRandom();
-            kParam = (AsymmetricKeyParameter)param;
-        }
-
-        
-        if (!(kParam instanceof DHPrivateKeyParameters))
-        {
-            throw new IllegalArgumentException("DHEngine expects DHPrivateKeyParameters");
-        }
-
-        this.key = (DHPrivateKeyParameters)kParam;
-        this.dhParams = key.getParameters();
-    }
-
-    /**
-     * calculate our initial message.
-     */
-    public BigInteger calculateMessage()
-    {
-        DHKeyPairGenerator dhGen = new DHKeyPairGenerator();
-        dhGen.init(new DHKeyGenerationParameters(random, dhParams));
-        AsymmetricCipherKeyPair dhPair = dhGen.generateKeyPair();
-
-        this.privateValue = ((DHPrivateKeyParameters)dhPair.getPrivate()).getX();
-
-        return ((DHPublicKeyParameters)dhPair.getPublic()).getY();
-    }
-
-    /**
-     * given a message from a given party and the corresponding public key,
-     * calculate the next message in the agreement sequence. In this case
-     * this will represent the shared secret.
-     */
-    public BigInteger calculateAgreement(
-        DHPublicKeyParameters   pub,
-        BigInteger              message)
-    {
-        if (!pub.getParameters().equals(dhParams))
-        {
-            throw new IllegalArgumentException("Diffie-Hellman public key has wrong parameters.");
-        }
-
-        BigInteger p = dhParams.getP();
-
-        return message.modPow(key.getX(), p).multiply(pub.getY().modPow(privateValue, p)).mod(p);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/agreement/DHStandardGroups.java b/bcprov/src/main/java/org/bouncycastle/crypto/agreement/DHStandardGroups.java
deleted file mode 100644
index da4951d..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/agreement/DHStandardGroups.java
+++ /dev/null
@@ -1,206 +0,0 @@
-package org.bouncycastle.crypto.agreement;
-
-import java.math.BigInteger;
-
-import org.bouncycastle.crypto.params.DHParameters;
-import org.bouncycastle.util.encoders.Hex;
-
-/**
- * Standard Diffie-Hellman groups from various IETF specifications.
- */
-public class DHStandardGroups
-{
-    private static BigInteger fromHex(String hex)
-    {
-        return new BigInteger(1, Hex.decode(hex));
-    }
-
-    private static DHParameters fromPG(String hexP, String hexG)
-    {
-        return new DHParameters(fromHex(hexP), fromHex(hexG));
-    }
-
-    private static DHParameters fromPGQ(String hexP, String hexG, String hexQ)
-    {
-        return new DHParameters(fromHex(hexP), fromHex(hexG), fromHex(hexQ));
-    }
-
-    /*
-     * RFC 2409
-     */
-    private static final String rfc2409_768_p = "FFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD1"
-        + "29024E088A67CC74020BBEA63B139B22514A08798E3404DD" + "EF9519B3CD3A431B302B0A6DF25F14374FE1356D6D51C245"
-        + "E485B576625E7EC6F44C42E9A63A3620FFFFFFFFFFFFFFFF";
-    private static final String rfc2409_768_g = "02";
-    public static final DHParameters rfc2409_768 = fromPG(rfc2409_768_p, rfc2409_768_g);
-
-    private static final String rfc2409_1024_p = "FFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD1"
-        + "29024E088A67CC74020BBEA63B139B22514A08798E3404DD" + "EF9519B3CD3A431B302B0A6DF25F14374FE1356D6D51C245"
-        + "E485B576625E7EC6F44C42E9A637ED6B0BFF5CB6F406B7ED" + "EE386BFB5A899FA5AE9F24117C4B1FE649286651ECE65381"
-        + "FFFFFFFFFFFFFFFF";
-    private static final String rfc2409_1024_g = "02";
-    public static final DHParameters rfc2409_1024 = fromPG(rfc2409_1024_p, rfc2409_1024_g);
-
-    /*
-     * RFC 3526
-     */
-    private static final String rfc3526_1536_p = "FFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD1"
-        + "29024E088A67CC74020BBEA63B139B22514A08798E3404DD" + "EF9519B3CD3A431B302B0A6DF25F14374FE1356D6D51C245"
-        + "E485B576625E7EC6F44C42E9A637ED6B0BFF5CB6F406B7ED" + "EE386BFB5A899FA5AE9F24117C4B1FE649286651ECE45B3D"
-        + "C2007CB8A163BF0598DA48361C55D39A69163FA8FD24CF5F" + "83655D23DCA3AD961C62F356208552BB9ED529077096966D"
-        + "670C354E4ABC9804F1746C08CA237327FFFFFFFFFFFFFFFF";
-    private static final String rfc3526_1536_g = "02";
-    public static final DHParameters rfc3526_1536 = fromPG(rfc3526_1536_p, rfc3526_1536_g);
-
-    private static final String rfc3526_2048_p = "FFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD1"
-        + "29024E088A67CC74020BBEA63B139B22514A08798E3404DD" + "EF9519B3CD3A431B302B0A6DF25F14374FE1356D6D51C245"
-        + "E485B576625E7EC6F44C42E9A637ED6B0BFF5CB6F406B7ED" + "EE386BFB5A899FA5AE9F24117C4B1FE649286651ECE45B3D"
-        + "C2007CB8A163BF0598DA48361C55D39A69163FA8FD24CF5F" + "83655D23DCA3AD961C62F356208552BB9ED529077096966D"
-        + "670C354E4ABC9804F1746C08CA18217C32905E462E36CE3B" + "E39E772C180E86039B2783A2EC07A28FB5C55DF06F4C52C9"
-        + "DE2BCBF6955817183995497CEA956AE515D2261898FA0510" + "15728E5A8AACAA68FFFFFFFFFFFFFFFF";
-    private static final String rfc3526_2048_g = "02";
-    public static final DHParameters rfc3526_2048 = fromPG(rfc3526_2048_p, rfc3526_2048_g);
-
-    private static final String rfc3526_3072_p = "FFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD1"
-        + "29024E088A67CC74020BBEA63B139B22514A08798E3404DD" + "EF9519B3CD3A431B302B0A6DF25F14374FE1356D6D51C245"
-        + "E485B576625E7EC6F44C42E9A637ED6B0BFF5CB6F406B7ED" + "EE386BFB5A899FA5AE9F24117C4B1FE649286651ECE45B3D"
-        + "C2007CB8A163BF0598DA48361C55D39A69163FA8FD24CF5F" + "83655D23DCA3AD961C62F356208552BB9ED529077096966D"
-        + "670C354E4ABC9804F1746C08CA18217C32905E462E36CE3B" + "E39E772C180E86039B2783A2EC07A28FB5C55DF06F4C52C9"
-        + "DE2BCBF6955817183995497CEA956AE515D2261898FA0510" + "15728E5A8AAAC42DAD33170D04507A33A85521ABDF1CBA64"
-        + "ECFB850458DBEF0A8AEA71575D060C7DB3970F85A6E1E4C7" + "ABF5AE8CDB0933D71E8C94E04A25619DCEE3D2261AD2EE6B"
-        + "F12FFA06D98A0864D87602733EC86A64521F2B18177B200C" + "BBE117577A615D6C770988C0BAD946E208E24FA074E5AB31"
-        + "43DB5BFCE0FD108E4B82D120A93AD2CAFFFFFFFFFFFFFFFF";
-    private static final String rfc3526_3072_g = "02";
-    public static final DHParameters rfc3526_3072 = fromPG(rfc3526_3072_p, rfc3526_3072_g);
-
-    private static final String rfc3526_4096_p = "FFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD1"
-        + "29024E088A67CC74020BBEA63B139B22514A08798E3404DD" + "EF9519B3CD3A431B302B0A6DF25F14374FE1356D6D51C245"
-        + "E485B576625E7EC6F44C42E9A637ED6B0BFF5CB6F406B7ED" + "EE386BFB5A899FA5AE9F24117C4B1FE649286651ECE45B3D"
-        + "C2007CB8A163BF0598DA48361C55D39A69163FA8FD24CF5F" + "83655D23DCA3AD961C62F356208552BB9ED529077096966D"
-        + "670C354E4ABC9804F1746C08CA18217C32905E462E36CE3B" + "E39E772C180E86039B2783A2EC07A28FB5C55DF06F4C52C9"
-        + "DE2BCBF6955817183995497CEA956AE515D2261898FA0510" + "15728E5A8AAAC42DAD33170D04507A33A85521ABDF1CBA64"
-        + "ECFB850458DBEF0A8AEA71575D060C7DB3970F85A6E1E4C7" + "ABF5AE8CDB0933D71E8C94E04A25619DCEE3D2261AD2EE6B"
-        + "F12FFA06D98A0864D87602733EC86A64521F2B18177B200C" + "BBE117577A615D6C770988C0BAD946E208E24FA074E5AB31"
-        + "43DB5BFCE0FD108E4B82D120A92108011A723C12A787E6D7" + "88719A10BDBA5B2699C327186AF4E23C1A946834B6150BDA"
-        + "2583E9CA2AD44CE8DBBBC2DB04DE8EF92E8EFC141FBECAA6" + "287C59474E6BC05D99B2964FA090C3A2233BA186515BE7ED"
-        + "1F612970CEE2D7AFB81BDD762170481CD0069127D5B05AA9" + "93B4EA988D8FDDC186FFB7DC90A6C08F4DF435C934063199"
-        + "FFFFFFFFFFFFFFFF";
-    private static final String rfc3526_4096_g = "02";
-    public static final DHParameters rfc3526_4096 = fromPG(rfc3526_4096_p, rfc3526_4096_g);
-
-    private static final String rfc3526_6144_p = "FFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD129024E08"
-        + "8A67CC74020BBEA63B139B22514A08798E3404DDEF9519B3CD3A431B"
-        + "302B0A6DF25F14374FE1356D6D51C245E485B576625E7EC6F44C42E9"
-        + "A637ED6B0BFF5CB6F406B7EDEE386BFB5A899FA5AE9F24117C4B1FE6"
-        + "49286651ECE45B3DC2007CB8A163BF0598DA48361C55D39A69163FA8"
-        + "FD24CF5F83655D23DCA3AD961C62F356208552BB9ED529077096966D"
-        + "670C354E4ABC9804F1746C08CA18217C32905E462E36CE3BE39E772C"
-        + "180E86039B2783A2EC07A28FB5C55DF06F4C52C9DE2BCBF695581718"
-        + "3995497CEA956AE515D2261898FA051015728E5A8AAAC42DAD33170D"
-        + "04507A33A85521ABDF1CBA64ECFB850458DBEF0A8AEA71575D060C7D"
-        + "B3970F85A6E1E4C7ABF5AE8CDB0933D71E8C94E04A25619DCEE3D226"
-        + "1AD2EE6BF12FFA06D98A0864D87602733EC86A64521F2B18177B200C"
-        + "BBE117577A615D6C770988C0BAD946E208E24FA074E5AB3143DB5BFC"
-        + "E0FD108E4B82D120A92108011A723C12A787E6D788719A10BDBA5B26"
-        + "99C327186AF4E23C1A946834B6150BDA2583E9CA2AD44CE8DBBBC2DB"
-        + "04DE8EF92E8EFC141FBECAA6287C59474E6BC05D99B2964FA090C3A2"
-        + "233BA186515BE7ED1F612970CEE2D7AFB81BDD762170481CD0069127"
-        + "D5B05AA993B4EA988D8FDDC186FFB7DC90A6C08F4DF435C934028492"
-        + "36C3FAB4D27C7026C1D4DCB2602646DEC9751E763DBA37BDF8FF9406"
-        + "AD9E530EE5DB382F413001AEB06A53ED9027D831179727B0865A8918"
-        + "DA3EDBEBCF9B14ED44CE6CBACED4BB1BDB7F1447E6CC254B33205151"
-        + "2BD7AF426FB8F401378CD2BF5983CA01C64B92ECF032EA15D1721D03"
-        + "F482D7CE6E74FEF6D55E702F46980C82B5A84031900B1C9E59E7C97F"
-        + "BEC7E8F323A97A7E36CC88BE0F1D45B7FF585AC54BD407B22B4154AA"
-        + "CC8F6D7EBF48E1D814CC5ED20F8037E0A79715EEF29BE32806A1D58B"
-        + "B7C5DA76F550AA3D8A1FBFF0EB19CCB1A313D55CDA56C9EC2EF29632"
-        + "387FE8D76E3C0468043E8F663F4860EE12BF2D5B0B7474D6E694F91E"
-        + "6DCC4024FFFFFFFFFFFFFFFF";
-    private static final String rfc3526_6144_g = "02";
-    public static final DHParameters rfc3526_6144 = fromPG(rfc3526_6144_p, rfc3526_6144_g);
-
-    private static final String rfc3526_8192_p = "FFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD1"
-        + "29024E088A67CC74020BBEA63B139B22514A08798E3404DD" + "EF9519B3CD3A431B302B0A6DF25F14374FE1356D6D51C245"
-        + "E485B576625E7EC6F44C42E9A637ED6B0BFF5CB6F406B7ED" + "EE386BFB5A899FA5AE9F24117C4B1FE649286651ECE45B3D"
-        + "C2007CB8A163BF0598DA48361C55D39A69163FA8FD24CF5F" + "83655D23DCA3AD961C62F356208552BB9ED529077096966D"
-        + "670C354E4ABC9804F1746C08CA18217C32905E462E36CE3B" + "E39E772C180E86039B2783A2EC07A28FB5C55DF06F4C52C9"
-        + "DE2BCBF6955817183995497CEA956AE515D2261898FA0510" + "15728E5A8AAAC42DAD33170D04507A33A85521ABDF1CBA64"
-        + "ECFB850458DBEF0A8AEA71575D060C7DB3970F85A6E1E4C7" + "ABF5AE8CDB0933D71E8C94E04A25619DCEE3D2261AD2EE6B"
-        + "F12FFA06D98A0864D87602733EC86A64521F2B18177B200C" + "BBE117577A615D6C770988C0BAD946E208E24FA074E5AB31"
-        + "43DB5BFCE0FD108E4B82D120A92108011A723C12A787E6D7" + "88719A10BDBA5B2699C327186AF4E23C1A946834B6150BDA"
-        + "2583E9CA2AD44CE8DBBBC2DB04DE8EF92E8EFC141FBECAA6" + "287C59474E6BC05D99B2964FA090C3A2233BA186515BE7ED"
-        + "1F612970CEE2D7AFB81BDD762170481CD0069127D5B05AA9" + "93B4EA988D8FDDC186FFB7DC90A6C08F4DF435C934028492"
-        + "36C3FAB4D27C7026C1D4DCB2602646DEC9751E763DBA37BD" + "F8FF9406AD9E530EE5DB382F413001AEB06A53ED9027D831"
-        + "179727B0865A8918DA3EDBEBCF9B14ED44CE6CBACED4BB1B" + "DB7F1447E6CC254B332051512BD7AF426FB8F401378CD2BF"
-        + "5983CA01C64B92ECF032EA15D1721D03F482D7CE6E74FEF6" + "D55E702F46980C82B5A84031900B1C9E59E7C97FBEC7E8F3"
-        + "23A97A7E36CC88BE0F1D45B7FF585AC54BD407B22B4154AA" + "CC8F6D7EBF48E1D814CC5ED20F8037E0A79715EEF29BE328"
-        + "06A1D58BB7C5DA76F550AA3D8A1FBFF0EB19CCB1A313D55C" + "DA56C9EC2EF29632387FE8D76E3C0468043E8F663F4860EE"
-        + "12BF2D5B0B7474D6E694F91E6DBE115974A3926F12FEE5E4" + "38777CB6A932DF8CD8BEC4D073B931BA3BC832B68D9DD300"
-        + "741FA7BF8AFC47ED2576F6936BA424663AAB639C5AE4F568" + "3423B4742BF1C978238F16CBE39D652DE3FDB8BEFC848AD9"
-        + "22222E04A4037C0713EB57A81A23F0C73473FC646CEA306B" + "4BCBC8862F8385DDFA9D4B7FA2C087E879683303ED5BDD3A"
-        + "062B3CF5B3A278A66D2A13F83F44F82DDF310EE074AB6A36" + "4597E899A0255DC164F31CC50846851DF9AB48195DED7EA1"
-        + "B1D510BD7EE74D73FAF36BC31ECFA268359046F4EB879F92" + "4009438B481C6CD7889A002ED5EE382BC9190DA6FC026E47"
-        + "9558E4475677E9AA9E3050E2765694DFC81F56E880B96E71" + "60C980DD98EDD3DFFFFFFFFFFFFFFFFF";
-    private static final String rfc3526_8192_g = "02";
-    public static final DHParameters rfc3526_8192 = fromPG(rfc3526_8192_p, rfc3526_8192_g);
-
-    /*
-     * RFC 4306
-     */
-    public static final DHParameters rfc4306_768 = rfc2409_768;
-    public static final DHParameters rfc4306_1024 = rfc2409_1024;
-
-    /*
-     * RFC 5114
-     */
-    private static final String rfc5114_1024_160_p = "B10B8F96A080E01DDE92DE5EAE5D54EC52C99FBCFB06A3C6"
-        + "9A6A9DCA52D23B616073E28675A23D189838EF1E2EE652C0" + "13ECB4AEA906112324975C3CD49B83BFACCBDD7D90C4BD70"
-        + "98488E9C219A73724EFFD6FAE5644738FAA31A4FF55BCCC0" + "A151AF5F0DC8B4BD45BF37DF365C1A65E68CFDA76D4DA708"
-        + "DF1FB2BC2E4A4371";
-    private static final String rfc5114_1024_160_g = "A4D1CBD5C3FD34126765A442EFB99905F8104DD258AC507F"
-        + "D6406CFF14266D31266FEA1E5C41564B777E690F5504F213" + "160217B4B01B886A5E91547F9E2749F4D7FBD7D3B9A92EE1"
-        + "909D0D2263F80A76A6A24C087A091F531DBF0A0169B6A28A" + "D662A4D18E73AFA32D779D5918D08BC8858F4DCEF97C2A24"
-        + "855E6EEB22B3B2E5";
-    private static final String rfc5114_1024_160_q = "F518AA8781A8DF278ABA4E7D64B7CB9D49462353";
-    public static final DHParameters rfc5114_1024_160 = fromPGQ(rfc5114_1024_160_p, rfc5114_1024_160_g,
-        rfc5114_1024_160_q);
-
-    private static final String rfc5114_2048_224_p = "AD107E1E9123A9D0D660FAA79559C51FA20D64E5683B9FD1"
-        + "B54B1597B61D0A75E6FA141DF95A56DBAF9A3C407BA1DF15" + "EB3D688A309C180E1DE6B85A1274A0A66D3F8152AD6AC212"
-        + "9037C9EDEFDA4DF8D91E8FEF55B7394B7AD5B7D0B6C12207" + "C9F98D11ED34DBF6C6BA0B2C8BBC27BE6A00E0A0B9C49708"
-        + "B3BF8A317091883681286130BC8985DB1602E714415D9330" + "278273C7DE31EFDC7310F7121FD5A07415987D9ADC0A486D"
-        + "CDF93ACC44328387315D75E198C641A480CD86A1B9E587E8" + "BE60E69CC928B2B9C52172E413042E9B23F10B0E16E79763"
-        + "C9B53DCF4BA80A29E3FB73C16B8E75B97EF363E2FFA31F71" + "CF9DE5384E71B81C0AC4DFFE0C10E64F";
-    private static final String rfc5114_2048_224_g = "AC4032EF4F2D9AE39DF30B5C8FFDAC506CDEBE7B89998CAF"
-        + "74866A08CFE4FFE3A6824A4E10B9A6F0DD921F01A70C4AFA" + "AB739D7700C29F52C57DB17C620A8652BE5E9001A8D66AD7"
-        + "C17669101999024AF4D027275AC1348BB8A762D0521BC98A" + "E247150422EA1ED409939D54DA7460CDB5F6C6B250717CBE"
-        + "F180EB34118E98D119529A45D6F834566E3025E316A330EF" + "BB77A86F0C1AB15B051AE3D428C8F8ACB70A8137150B8EEB"
-        + "10E183EDD19963DDD9E263E4770589EF6AA21E7F5F2FF381" + "B539CCE3409D13CD566AFBB48D6C019181E1BCFE94B30269"
-        + "EDFE72FE9B6AA4BD7B5A0F1C71CFFF4C19C418E1F6EC0179" + "81BC087F2A7065B384B890D3191F2BFA";
-    private static final String rfc5114_2048_224_q = "801C0D34C58D93FE997177101F80535A4738CEBCBF389A99B36371EB";
-    public static final DHParameters rfc5114_2048_224 = fromPGQ(rfc5114_2048_224_p, rfc5114_2048_224_g,
-        rfc5114_2048_224_q);
-
-    private static final String rfc5114_2048_256_p = "87A8E61DB4B6663CFFBBD19C651959998CEEF608660DD0F2"
-        + "5D2CEED4435E3B00E00DF8F1D61957D4FAF7DF4561B2AA30" + "16C3D91134096FAA3BF4296D830E9A7C209E0C6497517ABD"
-        + "5A8A9D306BCF67ED91F9E6725B4758C022E0B1EF4275BF7B" + "6C5BFC11D45F9088B941F54EB1E59BB8BC39A0BF12307F5C"
-        + "4FDB70C581B23F76B63ACAE1CAA6B7902D52526735488A0E" + "F13C6D9A51BFA4AB3AD8347796524D8EF6A167B5A41825D9"
-        + "67E144E5140564251CCACB83E6B486F6B3CA3F7971506026" + "C0B857F689962856DED4010ABD0BE621C3A3960A54E710C3"
-        + "75F26375D7014103A4B54330C198AF126116D2276E11715F" + "693877FAD7EF09CADB094AE91E1A1597";
-    private static final String rfc5114_2048_256_g = "3FB32C9B73134D0B2E77506660EDBD484CA7B18F21EF2054"
-        + "07F4793A1A0BA12510DBC15077BE463FFF4FED4AAC0BB555" + "BE3A6C1B0C6B47B1BC3773BF7E8C6F62901228F8C28CBB18"
-        + "A55AE31341000A650196F931C77A57F2DDF463E5E9EC144B" + "777DE62AAAB8A8628AC376D282D6ED3864E67982428EBC83"
-        + "1D14348F6F2F9193B5045AF2767164E1DFC967C1FB3F2E55" + "A4BD1BFFE83B9C80D052B985D182EA0ADB2A3B7313D3FE14"
-        + "C8484B1E052588B9B7D2BBD2DF016199ECD06E1557CD0915" + "B3353BBB64E0EC377FD028370DF92B52C7891428CDC67EB6"
-        + "184B523D1DB246C32F63078490F00EF8D647D148D4795451" + "5E2327CFEF98C582664B4C0F6CC41659";
-    private static final String rfc5114_2048_256_q = "8CF83642A709A097B447997640129DA299B1A47D1EB3750B"
-        + "A308B0FE64F5FBD3";
-    public static final DHParameters rfc5114_2048_256 = fromPGQ(rfc5114_2048_256_p, rfc5114_2048_256_g,
-        rfc5114_2048_256_q);
-
-    /*
-     * RFC 5996
-     */
-    public static final DHParameters rfc5996_768 = rfc4306_768;
-    public static final DHParameters rfc5996_1024 = rfc4306_1024;
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/agreement/ECDHCBasicAgreement.java b/bcprov/src/main/java/org/bouncycastle/crypto/agreement/ECDHCBasicAgreement.java
deleted file mode 100644
index 28140df..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/agreement/ECDHCBasicAgreement.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package org.bouncycastle.crypto.agreement;
-
-import java.math.BigInteger;
-
-import org.bouncycastle.crypto.BasicAgreement;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.params.ECDomainParameters;
-import org.bouncycastle.crypto.params.ECPrivateKeyParameters;
-import org.bouncycastle.crypto.params.ECPublicKeyParameters;
-import org.bouncycastle.math.ec.ECPoint;
-
-/**
- * P1363 7.2.2 ECSVDP-DHC
- *
- * ECSVDP-DHC is Elliptic Curve Secret Value Derivation Primitive,
- * Diffie-Hellman version with cofactor multiplication. It is based on
- * the work of [DH76], [Mil86], [Kob87], [LMQ98] and [Kal98a]. This
- * primitive derives a shared secret value from one party's private key
- * and another party's public key, where both have the same set of EC
- * domain parameters. If two parties correctly execute this primitive,
- * they will produce the same output. This primitive can be invoked by a
- * scheme to derive a shared secret key; specifically, it may be used
- * with the schemes ECKAS-DH1 and DL/ECKAS-DH2. It does not assume the
- * validity of the input public key (see also Section 7.2.1).
- * <p>
- * Note: As stated P1363 compatibility mode with ECDH can be preset, and
- * in this case the implementation doesn't have a ECDH compatibility mode
- * (if you want that just use ECDHBasicAgreement and note they both implement
- * BasicAgreement!).
- */
-public class ECDHCBasicAgreement
-    implements BasicAgreement
-{
-    ECPrivateKeyParameters key;
-
-    public void init(
-        CipherParameters key)
-    {
-        this.key = (ECPrivateKeyParameters)key;
-    }
-
-    public int getFieldSize()
-    {
-        return (key.getParameters().getCurve().getFieldSize() + 7) / 8;
-    }
-
-    public BigInteger calculateAgreement(
-        CipherParameters pubKey)
-    {
-        ECPublicKeyParameters pub = (ECPublicKeyParameters)pubKey;
-        ECDomainParameters params = pub.getParameters();
-
-        BigInteger hd = params.getH().multiply(key.getD()).mod(params.getN());
-
-        ECPoint P = pub.getQ().multiply(hd).normalize();
-
-        if (P.isInfinity())
-        {
-            throw new IllegalStateException("Infinity is not a valid agreement value for ECDHC");
-        }
-
-        return P.getAffineXCoord().toBigInteger();
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/agreement/ECMQVBasicAgreement.java b/bcprov/src/main/java/org/bouncycastle/crypto/agreement/ECMQVBasicAgreement.java
deleted file mode 100644
index 794f555..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/agreement/ECMQVBasicAgreement.java
+++ /dev/null
@@ -1,91 +0,0 @@
-package org.bouncycastle.crypto.agreement;
-
-import java.math.BigInteger;
-
-import org.bouncycastle.crypto.BasicAgreement;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.params.ECDomainParameters;
-import org.bouncycastle.crypto.params.ECPrivateKeyParameters;
-import org.bouncycastle.crypto.params.ECPublicKeyParameters;
-import org.bouncycastle.crypto.params.MQVPrivateParameters;
-import org.bouncycastle.crypto.params.MQVPublicParameters;
-import org.bouncycastle.math.ec.ECAlgorithms;
-import org.bouncycastle.math.ec.ECConstants;
-import org.bouncycastle.math.ec.ECCurve;
-import org.bouncycastle.math.ec.ECPoint;
-
-public class ECMQVBasicAgreement
-    implements BasicAgreement
-{
-    MQVPrivateParameters privParams;
-
-    public void init(
-        CipherParameters key)
-    {
-        this.privParams = (MQVPrivateParameters)key;
-    }
-
-    public int getFieldSize()
-    {
-        return (privParams.getStaticPrivateKey().getParameters().getCurve().getFieldSize() + 7) / 8;
-    }
-
-    public BigInteger calculateAgreement(CipherParameters pubKey)
-    {
-        MQVPublicParameters pubParams = (MQVPublicParameters)pubKey;
-
-        ECPrivateKeyParameters staticPrivateKey = privParams.getStaticPrivateKey();
-
-        ECPoint agreement = calculateMqvAgreement(staticPrivateKey.getParameters(), staticPrivateKey,
-            privParams.getEphemeralPrivateKey(), privParams.getEphemeralPublicKey(),
-            pubParams.getStaticPublicKey(), pubParams.getEphemeralPublicKey()).normalize();
-
-        if (agreement.isInfinity())
-        {
-            throw new IllegalStateException("Infinity is not a valid agreement value for MQV");
-        }
-
-        return agreement.getAffineXCoord().toBigInteger();
-    }
-
-    // The ECMQV Primitive as described in SEC-1, 3.4
-    private ECPoint calculateMqvAgreement(
-        ECDomainParameters      parameters,
-        ECPrivateKeyParameters  d1U,
-        ECPrivateKeyParameters  d2U,
-        ECPublicKeyParameters   Q2U,
-        ECPublicKeyParameters   Q1V,
-        ECPublicKeyParameters   Q2V)
-    {
-        BigInteger n = parameters.getN();
-        int e = (n.bitLength() + 1) / 2;
-        BigInteger powE = ECConstants.ONE.shiftLeft(e);
-
-        ECCurve curve = parameters.getCurve();
-
-        ECPoint[] points = new ECPoint[]{
-            // The Q2U public key is optional
-            ECAlgorithms.importPoint(curve, Q2U == null ? parameters.getG().multiply(d2U.getD()) : Q2U.getQ()),
-            ECAlgorithms.importPoint(curve, Q1V.getQ()),
-            ECAlgorithms.importPoint(curve, Q2V.getQ())
-        };
-
-        curve.normalizeAll(points);
-
-        ECPoint q2u = points[0], q1v = points[1], q2v = points[2];
-
-        BigInteger x = q2u.getAffineXCoord().toBigInteger();
-        BigInteger xBar = x.mod(powE);
-        BigInteger Q2UBar = xBar.setBit(e);
-        BigInteger s = d1U.getD().multiply(Q2UBar).add(d2U.getD()).mod(n);
-
-        BigInteger xPrime = q2v.getAffineXCoord().toBigInteger();
-        BigInteger xPrimeBar = xPrime.mod(powE);
-        BigInteger Q2VBar = xPrimeBar.setBit(e);
-
-        BigInteger hs = parameters.getH().multiply(s).mod(n);
-
-        return ECAlgorithms.sumOfTwoMultiplies(
-            q1v, Q2VBar.multiply(hs).mod(n), q2v, hs);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/agreement/jpake/JPAKEParticipant.java b/bcprov/src/main/java/org/bouncycastle/crypto/agreement/jpake/JPAKEParticipant.java
deleted file mode 100644
index 3fcb2df..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/agreement/jpake/JPAKEParticipant.java
+++ /dev/null
@@ -1,547 +0,0 @@
-package org.bouncycastle.crypto.agreement.jpake;
-
-import java.math.BigInteger;
-import java.security.SecureRandom;
-
-import org.bouncycastle.crypto.CryptoException;
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.digests.SHA256Digest;
-import org.bouncycastle.util.Arrays;
-
-/**
- * A participant in a Password Authenticated Key Exchange by Juggling (J-PAKE) exchange.
- * <p>
- * The J-PAKE exchange is defined by Feng Hao and Peter Ryan in the paper
- * <a href="http://grouper.ieee.org/groups/1363/Research/contributions/hao-ryan-2008.pdf">
- * "Password Authenticated Key Exchange by Juggling, 2008."</a>
- * <p>
- * The J-PAKE protocol is symmetric.
- * There is no notion of a <i>client</i> or <i>server</i>, but rather just two <i>participants</i>.
- * An instance of {@link JPAKEParticipant} represents one participant, and
- * is the primary interface for executing the exchange.
- * <p>
- * To execute an exchange, construct a {@link JPAKEParticipant} on each end,
- * and call the following 7 methods
- * (once and only once, in the given order, for each participant, sending messages between them as described):
- * <ol>
- * <li>{@link #createRound1PayloadToSend()} - and send the payload to the other participant</li>
- * <li>{@link #validateRound1PayloadReceived(JPAKERound1Payload)} - use the payload received from the other participant</li>
- * <li>{@link #createRound2PayloadToSend()} - and send the payload to the other participant</li>
- * <li>{@link #validateRound2PayloadReceived(JPAKERound2Payload)} - use the payload received from the other participant</li>
- * <li>{@link #calculateKeyingMaterial()}</li>
- * <li>{@link #createRound3PayloadToSend(BigInteger)} - and send the payload to the other participant</li>
- * <li>{@link #validateRound3PayloadReceived(JPAKERound3Payload, BigInteger)} - use the payload received from the other participant</li>
- * </ol>
- * <p>
- * Each side should derive a session key from the keying material returned by {@link #calculateKeyingMaterial()}.
- * The caller is responsible for deriving the session key using a secure key derivation function (KDF).
- * <p>
- * Round 3 is an optional key confirmation process.
- * If you do not execute round 3, then there is no assurance that both participants are using the same key.
- * (i.e. if the participants used different passwords, then their session keys will differ.)
- * <p>
- * If the round 3 validation succeeds, then the keys are guaranteed to be the same on both sides.
- * <p>
- * The symmetric design can easily support the asymmetric cases when one party initiates the communication.
- * e.g. Sometimes the round1 payload and round2 payload may be sent in one pass.
- * Also, in some cases, the key confirmation payload can be sent together with the round2 payload.
- * These are the trivial techniques to optimize the communication.
- * <p>
- * The key confirmation process is implemented as specified in
- * <a href="http://csrc.nist.gov/publications/nistpubs/800-56A/SP800-56A_Revision1_Mar08-2007.pdf">NIST SP 800-56A Revision 1</a>,
- * Section 8.2 Unilateral Key Confirmation for Key Agreement Schemes.
- * <p>
- * This class is stateful and NOT threadsafe.
- * Each instance should only be used for ONE complete J-PAKE exchange
- * (i.e. a new {@link JPAKEParticipant} should be constructed for each new J-PAKE exchange).
- * <p>
- * See {@link JPAKEExample} for example usage.
- */
-public class JPAKEParticipant
-{
-    /*
-     * Possible internal states.  Used for state checking.
-     */
-
-    public static final int STATE_INITIALIZED = 0;
-    public static final int STATE_ROUND_1_CREATED = 10;
-    public static final int STATE_ROUND_1_VALIDATED = 20;
-    public static final int STATE_ROUND_2_CREATED = 30;
-    public static final int STATE_ROUND_2_VALIDATED = 40;
-    public static final int STATE_KEY_CALCULATED = 50;
-    public static final int STATE_ROUND_3_CREATED = 60;
-    public static final int STATE_ROUND_3_VALIDATED = 70;
-
-    /**
-     * Unique identifier of this participant.
-     * The two participants in the exchange must NOT share the same id.
-     */
-    private final String participantId;
-
-    /**
-     * Shared secret.  This only contains the secret between construction
-     * and the call to {@link #calculateKeyingMaterial()}.
-     * <p>
-     * i.e. When {@link #calculateKeyingMaterial()} is called, this buffer overwritten with 0's,
-     * and the field is set to null.
-     * </p>
-     */
-    private char[] password;
-
-    /**
-     * Digest to use during calculations.
-     */
-    private final Digest digest;
-
-    /**
-     * Source of secure random data.
-     */
-    private final SecureRandom random;
-
-    private final BigInteger p;
-    private final BigInteger q;
-    private final BigInteger g;
-
-    /**
-     * The participantId of the other participant in this exchange.
-     */
-    private String partnerParticipantId;
-
-    /**
-     * Alice's x1 or Bob's x3.
-     */
-    private BigInteger x1;
-    /**
-     * Alice's x2 or Bob's x4.
-     */
-    private BigInteger x2;
-    /**
-     * Alice's g^x1 or Bob's g^x3.
-     */
-    private BigInteger gx1;
-    /**
-     * Alice's g^x2 or Bob's g^x4.
-     */
-    private BigInteger gx2;
-    /**
-     * Alice's g^x3 or Bob's g^x1.
-     */
-    private BigInteger gx3;
-    /**
-     * Alice's g^x4 or Bob's g^x2.
-     */
-    private BigInteger gx4;
-    /**
-     * Alice's B or Bob's A.
-     */
-    private BigInteger b;
-
-    /**
-     * The current state.
-     * See the <tt>STATE_*</tt> constants for possible values.
-     */
-    private int state;
-
-    /**
-     * Convenience constructor for a new {@link JPAKEParticipant} that uses
-     * the {@link JPAKEPrimeOrderGroups#NIST_3072} prime order group,
-     * a SHA-256 digest, and a default {@link SecureRandom} implementation.
-     * <p>
-     * After construction, the {@link #getState() state} will be  {@link #STATE_INITIALIZED}.
-     *
-     * @param participantId unique identifier of this participant.
-     *                      The two participants in the exchange must NOT share the same id.
-     * @param password      shared secret.
-     *                      A defensive copy of this array is made (and cleared once {@link #calculateKeyingMaterial()} is called).
-     *                      Caller should clear the input password as soon as possible.
-     * @throws NullPointerException if any argument is null
-     * @throws IllegalArgumentException if password is empty
-     */
-    public JPAKEParticipant(
-        String participantId,
-        char[] password)
-    {
-        this(
-            participantId,
-            password,
-            JPAKEPrimeOrderGroups.NIST_3072);
-    }
-
-
-    /**
-     * Convenience constructor for a new {@link JPAKEParticipant} that uses
-     * a SHA-256 digest and a default {@link SecureRandom} implementation.
-     * <p>
-     * After construction, the {@link #getState() state} will be  {@link #STATE_INITIALIZED}.
-     *
-     * @param participantId unique identifier of this participant.
-     *                      The two participants in the exchange must NOT share the same id.
-     * @param password      shared secret.
-     *                      A defensive copy of this array is made (and cleared once {@link #calculateKeyingMaterial()} is called).
-     *                      Caller should clear the input password as soon as possible.
-     * @param group         prime order group.
-     *                      See {@link JPAKEPrimeOrderGroups} for standard groups
-     * @throws NullPointerException if any argument is null
-     * @throws IllegalArgumentException if password is empty
-     */
-    public JPAKEParticipant(
-        String participantId,
-        char[] password,
-        JPAKEPrimeOrderGroup group)
-    {
-        this(
-            participantId,
-            password,
-            group,
-            new SHA256Digest(),
-            new SecureRandom());
-    }
-
-
-    /**
-     * Construct a new {@link JPAKEParticipant}.
-     * <p>
-     * After construction, the {@link #getState() state} will be  {@link #STATE_INITIALIZED}.
-     *
-     * @param participantId unique identifier of this participant.
-     *                      The two participants in the exchange must NOT share the same id.
-     * @param password      shared secret.
-     *                      A defensive copy of this array is made (and cleared once {@link #calculateKeyingMaterial()} is called).
-     *                      Caller should clear the input password as soon as possible.
-     * @param group         prime order group.
-     *                      See {@link JPAKEPrimeOrderGroups} for standard groups
-     * @param digest        digest to use during zero knowledge proofs and key confirmation (SHA-256 or stronger preferred)
-     * @param random        source of secure random data for x1 and x2, and for the zero knowledge proofs
-     * @throws NullPointerException if any argument is null
-     * @throws IllegalArgumentException if password is empty
-     */
-    public JPAKEParticipant(
-        String participantId,
-        char[] password,
-        JPAKEPrimeOrderGroup group,
-        Digest digest,
-        SecureRandom random)
-    {
-        JPAKEUtil.validateNotNull(participantId, "participantId");
-        JPAKEUtil.validateNotNull(password, "password");
-        JPAKEUtil.validateNotNull(group, "p");
-        JPAKEUtil.validateNotNull(digest, "digest");
-        JPAKEUtil.validateNotNull(random, "random");
-        if (password.length == 0)
-        {
-            throw new IllegalArgumentException("Password must not be empty.");
-        }
-
-        this.participantId = participantId;
-        
-        /*
-         * Create a defensive copy so as to fully encapsulate the password.
-         * 
-         * This array will contain the password for the lifetime of this
-         * participant BEFORE {@link #calculateKeyingMaterial()} is called.
-         * 
-         * i.e. When {@link #calculateKeyingMaterial()} is called, the array will be cleared
-         * in order to remove the password from memory.
-         * 
-         * The caller is responsible for clearing the original password array
-         * given as input to this constructor.
-         */
-        this.password = Arrays.copyOf(password, password.length);
-
-        this.p = group.getP();
-        this.q = group.getQ();
-        this.g = group.getG();
-
-        this.digest = digest;
-        this.random = random;
-
-        this.state = STATE_INITIALIZED;
-    }
-
-    /**
-     * Gets the current state of this participant.
-     * See the <tt>STATE_*</tt> constants for possible values.
-     */
-    public int getState()
-    {
-        return this.state;
-    }
-
-    /**
-     * Creates and returns the payload to send to the other participant during round 1.
-     * <p>
-     * After execution, the {@link #getState() state} will be  {@link #STATE_ROUND_1_CREATED}.
-     */
-    public JPAKERound1Payload createRound1PayloadToSend()
-    {
-        if (this.state >= STATE_ROUND_1_CREATED)
-        {
-            throw new IllegalStateException("Round1 payload already created for " + participantId);
-        }
-
-        this.x1 = JPAKEUtil.generateX1(q, random);
-        this.x2 = JPAKEUtil.generateX2(q, random);
-
-        this.gx1 = JPAKEUtil.calculateGx(p, g, x1);
-        this.gx2 = JPAKEUtil.calculateGx(p, g, x2);
-        BigInteger[] knowledgeProofForX1 = JPAKEUtil.calculateZeroKnowledgeProof(p, q, g, gx1, x1, participantId, digest, random);
-        BigInteger[] knowledgeProofForX2 = JPAKEUtil.calculateZeroKnowledgeProof(p, q, g, gx2, x2, participantId, digest, random);
-
-        this.state = STATE_ROUND_1_CREATED;
-
-        return new JPAKERound1Payload(participantId, gx1, gx2, knowledgeProofForX1, knowledgeProofForX2);
-    }
-
-    /**
-     * Validates the payload received from the other participant during round 1.
-     * <p>
-     * Must be called prior to {@link #createRound2PayloadToSend()}.
-     * <p>
-     * After execution, the {@link #getState() state} will be  {@link #STATE_ROUND_1_VALIDATED}.
-     *
-     * @throws CryptoException if validation fails.
-     * @throws IllegalStateException if called multiple times.
-     */
-    public void validateRound1PayloadReceived(JPAKERound1Payload round1PayloadReceived)
-        throws CryptoException
-    {
-        if (this.state >= STATE_ROUND_1_VALIDATED)
-        {
-            throw new IllegalStateException("Validation already attempted for round1 payload for" + participantId);
-        }
-        this.partnerParticipantId = round1PayloadReceived.getParticipantId();
-        this.gx3 = round1PayloadReceived.getGx1();
-        this.gx4 = round1PayloadReceived.getGx2();
-
-        BigInteger[] knowledgeProofForX3 = round1PayloadReceived.getKnowledgeProofForX1();
-        BigInteger[] knowledgeProofForX4 = round1PayloadReceived.getKnowledgeProofForX2();
-
-        JPAKEUtil.validateParticipantIdsDiffer(participantId, round1PayloadReceived.getParticipantId());
-        JPAKEUtil.validateGx4(gx4);
-        JPAKEUtil.validateZeroKnowledgeProof(p, q, g, gx3, knowledgeProofForX3, round1PayloadReceived.getParticipantId(), digest);
-        JPAKEUtil.validateZeroKnowledgeProof(p, q, g, gx4, knowledgeProofForX4, round1PayloadReceived.getParticipantId(), digest);
-
-        this.state = STATE_ROUND_1_VALIDATED;
-    }
-
-    /**
-     * Creates and returns the payload to send to the other participant during round 2.
-     * <p>
-     * {@link #validateRound1PayloadReceived(JPAKERound1Payload)} must be called prior to this method.
-     * <p>
-     * After execution, the {@link #getState() state} will be  {@link #STATE_ROUND_2_CREATED}.
-     *
-     * @throws IllegalStateException if called prior to {@link #validateRound1PayloadReceived(JPAKERound1Payload)}, or multiple times
-     */
-    public JPAKERound2Payload createRound2PayloadToSend()
-    {
-        if (this.state >= STATE_ROUND_2_CREATED)
-        {
-            throw new IllegalStateException("Round2 payload already created for " + this.participantId);
-        }
-        if (this.state < STATE_ROUND_1_VALIDATED)
-        {
-            throw new IllegalStateException("Round1 payload must be validated prior to creating Round2 payload for " + this.participantId);
-        }
-        BigInteger gA = JPAKEUtil.calculateGA(p, gx1, gx3, gx4);
-        BigInteger s = JPAKEUtil.calculateS(password);
-        BigInteger x2s = JPAKEUtil.calculateX2s(q, x2, s);
-        BigInteger A = JPAKEUtil.calculateA(p, q, gA, x2s);
-        BigInteger[] knowledgeProofForX2s = JPAKEUtil.calculateZeroKnowledgeProof(p, q, gA, A, x2s, participantId, digest, random);
-
-        this.state = STATE_ROUND_2_CREATED;
-
-        return new JPAKERound2Payload(participantId, A, knowledgeProofForX2s);
-    }
-
-    /**
-     * Validates the payload received from the other participant during round 2.
-     * <p>
-     * Note that this DOES NOT detect a non-common password.
-     * The only indication of a non-common password is through derivation
-     * of different keys (which can be detected explicitly by executing round 3 and round 4)
-     * <p>
-     * Must be called prior to {@link #calculateKeyingMaterial()}.
-     * <p>
-     * After execution, the {@link #getState() state} will be  {@link #STATE_ROUND_2_VALIDATED}.
-     *
-     * @throws CryptoException if validation fails.
-     * @throws IllegalStateException if called prior to {@link #validateRound1PayloadReceived(JPAKERound1Payload)}, or multiple times
-     */
-    public void validateRound2PayloadReceived(JPAKERound2Payload round2PayloadReceived)
-        throws CryptoException
-    {
-        if (this.state >= STATE_ROUND_2_VALIDATED)
-        {
-            throw new IllegalStateException("Validation already attempted for round2 payload for" + participantId);
-        }
-        if (this.state < STATE_ROUND_1_VALIDATED)
-        {
-            throw new IllegalStateException("Round1 payload must be validated prior to validating Round2 payload for " + this.participantId);
-        }
-        BigInteger gB = JPAKEUtil.calculateGA(p, gx3, gx1, gx2);
-        this.b = round2PayloadReceived.getA();
-        BigInteger[] knowledgeProofForX4s = round2PayloadReceived.getKnowledgeProofForX2s();
-
-        JPAKEUtil.validateParticipantIdsDiffer(participantId, round2PayloadReceived.getParticipantId());
-        JPAKEUtil.validateParticipantIdsEqual(this.partnerParticipantId, round2PayloadReceived.getParticipantId());
-        JPAKEUtil.validateGa(gB);
-        JPAKEUtil.validateZeroKnowledgeProof(p, q, gB, b, knowledgeProofForX4s, round2PayloadReceived.getParticipantId(), digest);
-
-        this.state = STATE_ROUND_2_VALIDATED;
-    }
-
-    /**
-     * Calculates and returns the key material.
-     * A session key must be derived from this key material using a secure key derivation function (KDF).
-     * The KDF used to derive the key is handled externally (i.e. not by {@link JPAKEParticipant}).
-     * <p>
-     * The keying material will be identical for each participant if and only if
-     * each participant's password is the same.  i.e. If the participants do not
-     * share the same password, then each participant will derive a different key.
-     * Therefore, if you immediately start using a key derived from
-     * the keying material, then you must handle detection of incorrect keys.
-     * If you want to handle this detection explicitly, you can optionally perform
-     * rounds 3 and 4.  See {@link JPAKEParticipant} for details on how to execute
-     * rounds 3 and 4.
-     * <p>
-     * The keying material will be in the range <tt>[0, p-1]</tt>.
-     * <p>
-     * {@link #validateRound2PayloadReceived(JPAKERound2Payload)} must be called prior to this method.
-     * <p>
-     * As a side effect, the internal {@link #password} array is cleared, since it is no longer needed.
-     * <p>
-     * After execution, the {@link #getState() state} will be  {@link #STATE_KEY_CALCULATED}.
-     *
-     * @throws IllegalStateException if called prior to {@link #validateRound2PayloadReceived(JPAKERound2Payload)},
-     * or if called multiple times.
-     */
-    public BigInteger calculateKeyingMaterial()
-    {
-        if (this.state >= STATE_KEY_CALCULATED)
-        {
-            throw new IllegalStateException("Key already calculated for " + participantId);
-        }
-        if (this.state < STATE_ROUND_2_VALIDATED)
-        {
-            throw new IllegalStateException("Round2 payload must be validated prior to creating key for " + participantId);
-        }
-        BigInteger s = JPAKEUtil.calculateS(password);
-        
-        /*
-         * Clear the password array from memory, since we don't need it anymore.
-         * 
-         * Also set the field to null as a flag to indicate that the key has already been calculated.
-         */
-        Arrays.fill(password, (char)0);
-        this.password = null;
-
-        BigInteger keyingMaterial = JPAKEUtil.calculateKeyingMaterial(p, q, gx4, x2, s, b);
-        
-        /*
-         * Clear the ephemeral private key fields as well.
-         * Note that we're relying on the garbage collector to do its job to clean these up.
-         * The old objects will hang around in memory until the garbage collector destroys them.
-         * 
-         * If the ephemeral private keys x1 and x2 are leaked,
-         * the attacker might be able to brute-force the password.
-         */
-        this.x1 = null;
-        this.x2 = null;
-        this.b = null;
-        
-        /*
-         * Do not clear gx* yet, since those are needed by round 3.
-         */
-
-        this.state = STATE_KEY_CALCULATED;
-
-        return keyingMaterial;
-    }
-
-
-    /**
-     * Creates and returns the payload to send to the other participant during round 3.
-     * <p>
-     * See {@link JPAKEParticipant} for more details on round 3.
-     * <p>
-     * After execution, the {@link #getState() state} will be  {@link #STATE_ROUND_3_CREATED}.
-     *
-     * @param keyingMaterial The keying material as returned from {@link #calculateKeyingMaterial()}.
-     * @throws IllegalStateException if called prior to {@link #calculateKeyingMaterial()}, or multiple times
-     */
-    public JPAKERound3Payload createRound3PayloadToSend(BigInteger keyingMaterial)
-    {
-        if (this.state >= STATE_ROUND_3_CREATED)
-        {
-            throw new IllegalStateException("Round3 payload already created for " + this.participantId);
-        }
-        if (this.state < STATE_KEY_CALCULATED)
-        {
-            throw new IllegalStateException("Keying material must be calculated prior to creating Round3 payload for " + this.participantId);
-        }
-
-        BigInteger macTag = JPAKEUtil.calculateMacTag(
-            this.participantId,
-            this.partnerParticipantId,
-            this.gx1,
-            this.gx2,
-            this.gx3,
-            this.gx4,
-            keyingMaterial,
-            this.digest);
-
-        this.state = STATE_ROUND_3_CREATED;
-
-        return new JPAKERound3Payload(participantId, macTag);
-    }
-
-    /**
-     * Validates the payload received from the other participant during round 3.
-     * <p>
-     * See {@link JPAKEParticipant} for more details on round 3.
-     * <p>
-     * After execution, the {@link #getState() state} will be {@link #STATE_ROUND_3_VALIDATED}.
-     *
-     * @param keyingMaterial The keying material as returned from {@link #calculateKeyingMaterial()}.
-     * @throws CryptoException if validation fails.
-     * @throws IllegalStateException if called prior to {@link #calculateKeyingMaterial()}, or multiple times
-     */
-    public void validateRound3PayloadReceived(JPAKERound3Payload round3PayloadReceived, BigInteger keyingMaterial)
-        throws CryptoException
-    {
-        if (this.state >= STATE_ROUND_3_VALIDATED)
-        {
-            throw new IllegalStateException("Validation already attempted for round3 payload for" + participantId);
-        }
-        if (this.state < STATE_KEY_CALCULATED)
-        {
-            throw new IllegalStateException("Keying material must be calculated validated prior to validating Round3 payload for " + this.participantId);
-        }
-        JPAKEUtil.validateParticipantIdsDiffer(participantId, round3PayloadReceived.getParticipantId());
-        JPAKEUtil.validateParticipantIdsEqual(this.partnerParticipantId, round3PayloadReceived.getParticipantId());
-
-        JPAKEUtil.validateMacTag(
-            this.participantId,
-            this.partnerParticipantId,
-            this.gx1,
-            this.gx2,
-            this.gx3,
-            this.gx4,
-            keyingMaterial,
-            this.digest,
-            round3PayloadReceived.getMacTag());
-        
-        
-        /*
-         * Clear the rest of the fields.
-         */
-        this.gx1 = null;
-        this.gx2 = null;
-        this.gx3 = null;
-        this.gx4 = null;
-
-        this.state = STATE_ROUND_3_VALIDATED;
-    }
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/agreement/jpake/JPAKEPrimeOrderGroup.java b/bcprov/src/main/java/org/bouncycastle/crypto/agreement/jpake/JPAKEPrimeOrderGroup.java
deleted file mode 100644
index ad2c6ae..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/agreement/jpake/JPAKEPrimeOrderGroup.java
+++ /dev/null
@@ -1,115 +0,0 @@
-package org.bouncycastle.crypto.agreement.jpake;
-
-import java.math.BigInteger;
-
-/**
- * A pre-computed prime order group for use during a J-PAKE exchange.
- * <p>
- * Typically a Schnorr group is used.  In general, J-PAKE can use any prime order group
- * that is suitable for public key cryptography, including elliptic curve cryptography.
- * <p>
- * See {@link JPAKEPrimeOrderGroups} for convenient standard groups.
- * <p>
- * NIST <a href="http://csrc.nist.gov/groups/ST/toolkit/documents/Examples/DSA2_All.pdf">publishes</a>
- * many groups that can be used for the desired level of security.
- */
-public class JPAKEPrimeOrderGroup
-{
-    private final BigInteger p;
-    private final BigInteger q;
-    private final BigInteger g;
-
-    /**
-     * Constructs a new {@link JPAKEPrimeOrderGroup}.
-     * <p>
-     * In general, you should use one of the pre-approved groups from
-     * {@link JPAKEPrimeOrderGroups}, rather than manually constructing one.
-     * <p>
-     * The following basic checks are performed:
-     * <ul>
-     * <li>p-1 must be evenly divisible by q</li>
-     * <li>g must be in [2, p-1]</li>
-     * <li>g^q mod p must equal 1</li>
-     * <li>p must be prime (within reasonably certainty)</li>
-     * <li>q must be prime (within reasonably certainty)</li>
-     * </ul>
-     * <p>
-     * The prime checks are performed using {@link BigInteger#isProbablePrime(int)},
-     * and are therefore subject to the same probability guarantees.
-     * <p>
-     * These checks prevent trivial mistakes.
-     * However, due to the small uncertainties if p and q are not prime,
-     * advanced attacks are not prevented.
-     * Use it at your own risk.
-     *
-     * @throws NullPointerException if any argument is null
-     * @throws IllegalArgumentException if any of the above validations fail
-     */
-    public JPAKEPrimeOrderGroup(BigInteger p, BigInteger q, BigInteger g)
-    {
-        /*
-         * Don't skip the checks on user-specified groups.
-         */
-        this(p, q, g, false);
-    }
-
-    /**
-     * Internal package-private constructor used by the pre-approved
-     * groups in {@link JPAKEPrimeOrderGroups}.
-     * These pre-approved groups can avoid the expensive checks.
-     */
-    JPAKEPrimeOrderGroup(BigInteger p, BigInteger q, BigInteger g, boolean skipChecks)
-    {
-        JPAKEUtil.validateNotNull(p, "p");
-        JPAKEUtil.validateNotNull(q, "q");
-        JPAKEUtil.validateNotNull(g, "g");
-
-        if (!skipChecks)
-        {
-            if (!p.subtract(JPAKEUtil.ONE).mod(q).equals(JPAKEUtil.ZERO))
-            {
-                throw new IllegalArgumentException("p-1 must be evenly divisible by q");
-            }
-            if (g.compareTo(BigInteger.valueOf(2)) == -1 || g.compareTo(p.subtract(JPAKEUtil.ONE)) == 1)
-            {
-                throw new IllegalArgumentException("g must be in [2, p-1]");
-            }
-            if (!g.modPow(q, p).equals(JPAKEUtil.ONE))
-            {
-                throw new IllegalArgumentException("g^q mod p must equal 1");
-            }
-            /*
-             * Note that these checks do not guarantee that p and q are prime.
-             * We just have reasonable certainty that they are prime.
-             */
-            if (!p.isProbablePrime(20))
-            {
-                throw new IllegalArgumentException("p must be prime");
-            }
-            if (!q.isProbablePrime(20))
-            {
-                throw new IllegalArgumentException("q must be prime");
-            }
-        }
-
-        this.p = p;
-        this.q = q;
-        this.g = g;
-    }
-
-    public BigInteger getP()
-    {
-        return p;
-    }
-
-    public BigInteger getQ()
-    {
-        return q;
-    }
-
-    public BigInteger getG()
-    {
-        return g;
-    }
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/agreement/jpake/JPAKEPrimeOrderGroups.java b/bcprov/src/main/java/org/bouncycastle/crypto/agreement/jpake/JPAKEPrimeOrderGroups.java
deleted file mode 100644
index 2fb1861..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/agreement/jpake/JPAKEPrimeOrderGroups.java
+++ /dev/null
@@ -1,111 +0,0 @@
-package org.bouncycastle.crypto.agreement.jpake;
-
-import java.math.BigInteger;
-
-/**
- * Standard pre-computed prime order groups for use by J-PAKE.
- * (J-PAKE can use pre-computed prime order groups, same as DSA and Diffie-Hellman.)
- * <p>
- * This class contains some convenient constants for use as input for
- * constructing {@link JPAKEParticipant}s.
- * <p>
- * The prime order groups below are taken from Sun's JDK JavaDoc (docs/guide/security/CryptoSpec.html#AppB),
- * and from the prime order groups
- * <a href="http://csrc.nist.gov/groups/ST/toolkit/documents/Examples/DSA2_All.pdf">published by NIST</a>.
- */
-public class JPAKEPrimeOrderGroups
-{
-    /**
-     * From Sun's JDK JavaDoc (docs/guide/security/CryptoSpec.html#AppB)
-     * 1024-bit p, 160-bit q and 1024-bit g for 80-bit security.
-     */
-    public static final JPAKEPrimeOrderGroup SUN_JCE_1024 = new JPAKEPrimeOrderGroup(
-        // p
-        new BigInteger(
-            "fd7f53811d75122952df4a9c2eece4e7f611b7523cef4400c31e3f80b6512669" +
-                "455d402251fb593d8d58fabfc5f5ba30f6cb9b556cd7813b801d346ff26660b7" +
-                "6b9950a5a49f9fe8047b1022c24fbba9d7feb7c61bf83b57e7c6a8a6150f04fb" +
-                "83f6d3c51ec3023554135a169132f675f3ae2b61d72aeff22203199dd14801c7", 16),
-        // q
-        new BigInteger(
-            "9760508f15230bccb292b982a2eb840bf0581cf5", 16),
-        // g
-        new BigInteger(
-            "f7e1a085d69b3ddecbbcab5c36b857b97994afbbfa3aea82f9574c0b3d078267" +
-                "5159578ebad4594fe67107108180b449167123e84c281613b7cf09328cc8a6e1" +
-                "3c167a8b547c8d28e0a3ae1e2bb3a675916ea37f0bfa213562f1fb627a01243b" +
-                "cca4f1bea8519089a883dfe15ae59f06928b665e807b552564014c3bfecf492a", 16),
-        true
-    );
-
-    /**
-     * From NIST.
-     * 2048-bit p, 224-bit q and 2048-bit g for 112-bit security.
-     */
-    public static final JPAKEPrimeOrderGroup NIST_2048 = new JPAKEPrimeOrderGroup(
-        // p
-        new BigInteger(
-            "C196BA05AC29E1F9C3C72D56DFFC6154A033F1477AC88EC37F09BE6C5BB95F51" +
-                "C296DD20D1A28A067CCC4D4316A4BD1DCA55ED1066D438C35AEBAABF57E7DAE4" +
-                "28782A95ECA1C143DB701FD48533A3C18F0FE23557EA7AE619ECACC7E0B51652" +
-                "A8776D02A425567DED36EABD90CA33A1E8D988F0BBB92D02D1D20290113BB562" +
-                "CE1FC856EEB7CDD92D33EEA6F410859B179E7E789A8F75F645FAE2E136D252BF" +
-                "FAFF89528945C1ABE705A38DBC2D364AADE99BE0D0AAD82E5320121496DC65B3" +
-                "930E38047294FF877831A16D5228418DE8AB275D7D75651CEFED65F78AFC3EA7" +
-                "FE4D79B35F62A0402A1117599ADAC7B269A59F353CF450E6982D3B1702D9CA83", 16),
-        // q
-        new BigInteger(
-            "90EAF4D1AF0708B1B612FF35E0A2997EB9E9D263C9CE659528945C0D", 16),
-        // g
-        new BigInteger(
-            "A59A749A11242C58C894E9E5A91804E8FA0AC64B56288F8D47D51B1EDC4D6544" +
-                "4FECA0111D78F35FC9FDD4CB1F1B79A3BA9CBEE83A3F811012503C8117F98E50" +
-                "48B089E387AF6949BF8784EBD9EF45876F2E6A5A495BE64B6E770409494B7FEE" +
-                "1DBB1E4B2BC2A53D4F893D418B7159592E4FFFDF6969E91D770DAEBD0B5CB14C" +
-                "00AD68EC7DC1E5745EA55C706C4A1C5C88964E34D09DEB753AD418C1AD0F4FDF" +
-                "D049A955E5D78491C0B7A2F1575A008CCD727AB376DB6E695515B05BD412F5B8" +
-                "C2F4C77EE10DA48ABD53F5DD498927EE7B692BBBCDA2FB23A516C5B4533D7398" +
-                "0B2A3B60E384ED200AE21B40D273651AD6060C13D97FD69AA13C5611A51B9085", 16),
-        true
-    );
-
-    /**
-     * From NIST.
-     * 3072-bit p, 256-bit q and 3072-bit g for 128-bit security.
-     */
-    public static final JPAKEPrimeOrderGroup NIST_3072 = new JPAKEPrimeOrderGroup(
-        // p
-        new BigInteger(
-            "90066455B5CFC38F9CAA4A48B4281F292C260FEEF01FD61037E56258A7795A1C" +
-                "7AD46076982CE6BB956936C6AB4DCFE05E6784586940CA544B9B2140E1EB523F" +
-                "009D20A7E7880E4E5BFA690F1B9004A27811CD9904AF70420EEFD6EA11EF7DA1" +
-                "29F58835FF56B89FAA637BC9AC2EFAAB903402229F491D8D3485261CD068699B" +
-                "6BA58A1DDBBEF6DB51E8FE34E8A78E542D7BA351C21EA8D8F1D29F5D5D159394" +
-                "87E27F4416B0CA632C59EFD1B1EB66511A5A0FBF615B766C5862D0BD8A3FE7A0" +
-                "E0DA0FB2FE1FCB19E8F9996A8EA0FCCDE538175238FC8B0EE6F29AF7F642773E" +
-                "BE8CD5402415A01451A840476B2FCEB0E388D30D4B376C37FE401C2A2C2F941D" +
-                "AD179C540C1C8CE030D460C4D983BE9AB0B20F69144C1AE13F9383EA1C08504F" +
-                "B0BF321503EFE43488310DD8DC77EC5B8349B8BFE97C2C560EA878DE87C11E3D" +
-                "597F1FEA742D73EEC7F37BE43949EF1A0D15C3F3E3FC0A8335617055AC91328E" +
-                "C22B50FC15B941D3D1624CD88BC25F3E941FDDC6200689581BFEC416B4B2CB73", 16),
-        // q
-        new BigInteger(
-            "CFA0478A54717B08CE64805B76E5B14249A77A4838469DF7F7DC987EFCCFB11D", 16),
-        // g
-        new BigInteger(
-            "5E5CBA992E0A680D885EB903AEA78E4A45A469103D448EDE3B7ACCC54D521E37" +
-                "F84A4BDD5B06B0970CC2D2BBB715F7B82846F9A0C393914C792E6A923E2117AB" +
-                "805276A975AADB5261D91673EA9AAFFEECBFA6183DFCB5D3B7332AA19275AFA1" +
-                "F8EC0B60FB6F66CC23AE4870791D5982AAD1AA9485FD8F4A60126FEB2CF05DB8" +
-                "A7F0F09B3397F3937F2E90B9E5B9C9B6EFEF642BC48351C46FB171B9BFA9EF17" +
-                "A961CE96C7E7A7CC3D3D03DFAD1078BA21DA425198F07D2481622BCE45969D9C" +
-                "4D6063D72AB7A0F08B2F49A7CC6AF335E08C4720E31476B67299E231F8BD90B3" +
-                "9AC3AE3BE0C6B6CACEF8289A2E2873D58E51E029CAFBD55E6841489AB66B5B4B" +
-                "9BA6E2F784660896AFF387D92844CCB8B69475496DE19DA2E58259B090489AC8" +
-                "E62363CDF82CFD8EF2A427ABCD65750B506F56DDE3B988567A88126B914D7828" +
-                "E2B63A6D7ED0747EC59E0E0A23CE7D8A74C1D2C2A7AFB6A29799620F00E11C33" +
-                "787F7DED3B30E1A22D09F1FBDA1ABBBFBF25CAE05A13F812E34563F99410E73B", 16),
-        true
-    );
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/agreement/jpake/JPAKERound1Payload.java b/bcprov/src/main/java/org/bouncycastle/crypto/agreement/jpake/JPAKERound1Payload.java
deleted file mode 100644
index c704040..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/agreement/jpake/JPAKERound1Payload.java
+++ /dev/null
@@ -1,98 +0,0 @@
-package org.bouncycastle.crypto.agreement.jpake;
-
-import java.math.BigInteger;
-
-import org.bouncycastle.util.Arrays;
-
-/**
- * The payload sent/received during the first round of a J-PAKE exchange.
- * <p>
- * Each {@link JPAKEParticipant} creates and sends an instance
- * of this payload to the other {@link JPAKEParticipant}.
- * The payload to send should be created via
- * {@link JPAKEParticipant#createRound1PayloadToSend()}.
- * <p>
- * Each {@link JPAKEParticipant} must also validate the payload
- * received from the other {@link JPAKEParticipant}.
- * The received payload should be validated via
- * {@link JPAKEParticipant#validateRound1PayloadReceived(JPAKERound1Payload)}.
- */
-public class JPAKERound1Payload
-{
-    /**
-     * The id of the {@link JPAKEParticipant} who created/sent this payload.
-     */
-    private final String participantId;
-
-    /**
-     * The value of g^x1
-     */
-    private final BigInteger gx1;
-
-    /**
-     * The value of g^x2
-     */
-    private final BigInteger gx2;
-
-    /**
-     * The zero knowledge proof for x1.
-     * <p>
-     * This is a two element array, containing {g^v, r} for x1.
-     * </p>
-     */
-    private final BigInteger[] knowledgeProofForX1;
-
-    /**
-     * The zero knowledge proof for x2.
-     * <p>
-     * This is a two element array, containing {g^v, r} for x2.
-     * </p>
-     */
-    private final BigInteger[] knowledgeProofForX2;
-
-    public JPAKERound1Payload(
-        String participantId,
-        BigInteger gx1,
-        BigInteger gx2,
-        BigInteger[] knowledgeProofForX1,
-        BigInteger[] knowledgeProofForX2)
-    {
-        JPAKEUtil.validateNotNull(participantId, "participantId");
-        JPAKEUtil.validateNotNull(gx1, "gx1");
-        JPAKEUtil.validateNotNull(gx2, "gx2");
-        JPAKEUtil.validateNotNull(knowledgeProofForX1, "knowledgeProofForX1");
-        JPAKEUtil.validateNotNull(knowledgeProofForX2, "knowledgeProofForX2");
-
-        this.participantId = participantId;
-        this.gx1 = gx1;
-        this.gx2 = gx2;
-        this.knowledgeProofForX1 = Arrays.copyOf(knowledgeProofForX1, knowledgeProofForX1.length);
-        this.knowledgeProofForX2 = Arrays.copyOf(knowledgeProofForX2, knowledgeProofForX2.length);
-    }
-
-    public String getParticipantId()
-    {
-        return participantId;
-    }
-
-    public BigInteger getGx1()
-    {
-        return gx1;
-    }
-
-    public BigInteger getGx2()
-    {
-        return gx2;
-    }
-
-    public BigInteger[] getKnowledgeProofForX1()
-    {
-        return Arrays.copyOf(knowledgeProofForX1, knowledgeProofForX1.length);
-    }
-
-    public BigInteger[] getKnowledgeProofForX2()
-    {
-        return Arrays.copyOf(knowledgeProofForX2, knowledgeProofForX2.length);
-    }
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/agreement/jpake/JPAKERound2Payload.java b/bcprov/src/main/java/org/bouncycastle/crypto/agreement/jpake/JPAKERound2Payload.java
deleted file mode 100644
index af3cb5f..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/agreement/jpake/JPAKERound2Payload.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package org.bouncycastle.crypto.agreement.jpake;
-
-import java.math.BigInteger;
-
-import org.bouncycastle.util.Arrays;
-
-/**
- * The payload sent/received during the second round of a J-PAKE exchange.
- * <p>
- * Each {@link JPAKEParticipant} creates and sends an instance
- * of this payload to the other {@link JPAKEParticipant}.
- * The payload to send should be created via
- * {@link JPAKEParticipant#createRound2PayloadToSend()}
- * <p>
- * Each {@link JPAKEParticipant} must also validate the payload
- * received from the other {@link JPAKEParticipant}.
- * The received payload should be validated via
- * {@link JPAKEParticipant#validateRound2PayloadReceived(JPAKERound2Payload)}
- */
-public class JPAKERound2Payload
-{
-    /**
-     * The id of the {@link JPAKEParticipant} who created/sent this payload.
-     */
-    private final String participantId;
-
-    /**
-     * The value of A, as computed during round 2.
-     */
-    private final BigInteger a;
-
-    /**
-     * The zero knowledge proof for x2 * s.
-     * <p>
-     * This is a two element array, containing {g^v, r} for x2 * s.
-     * </p>
-     */
-    private final BigInteger[] knowledgeProofForX2s;
-
-    public JPAKERound2Payload(
-        String participantId,
-        BigInteger a,
-        BigInteger[] knowledgeProofForX2s)
-    {
-        JPAKEUtil.validateNotNull(participantId, "participantId");
-        JPAKEUtil.validateNotNull(a, "a");
-        JPAKEUtil.validateNotNull(knowledgeProofForX2s, "knowledgeProofForX2s");
-
-        this.participantId = participantId;
-        this.a = a;
-        this.knowledgeProofForX2s = Arrays.copyOf(knowledgeProofForX2s, knowledgeProofForX2s.length);
-    }
-
-    public String getParticipantId()
-    {
-        return participantId;
-    }
-
-    public BigInteger getA()
-    {
-        return a;
-    }
-
-    public BigInteger[] getKnowledgeProofForX2s()
-    {
-        return Arrays.copyOf(knowledgeProofForX2s, knowledgeProofForX2s.length);
-    }
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/agreement/jpake/JPAKERound3Payload.java b/bcprov/src/main/java/org/bouncycastle/crypto/agreement/jpake/JPAKERound3Payload.java
deleted file mode 100644
index 0fe1cba..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/agreement/jpake/JPAKERound3Payload.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package org.bouncycastle.crypto.agreement.jpake;
-
-import java.math.BigInteger;
-
-/**
- * The payload sent/received during the optional third round of a J-PAKE exchange,
- * which is for explicit key confirmation.
- * <p>
- * Each {@link JPAKEParticipant} creates and sends an instance
- * of this payload to the other {@link JPAKEParticipant}.
- * The payload to send should be created via
- * {@link JPAKEParticipant#createRound3PayloadToSend(BigInteger)}
- * <p>
- * Each {@link JPAKEParticipant} must also validate the payload
- * received from the other {@link JPAKEParticipant}.
- * The received payload should be validated via
- * {@link JPAKEParticipant#validateRound3PayloadReceived(JPAKERound3Payload, BigInteger)}
- */
-public class JPAKERound3Payload
-{
-    /**
-     * The id of the {@link JPAKEParticipant} who created/sent this payload.
-     */
-    private final String participantId;
-
-    /**
-     * The value of MacTag, as computed by round 3.
-     *
-     * @see JPAKEUtil#calculateMacTag(String, String, BigInteger, BigInteger, BigInteger, BigInteger, BigInteger, org.bouncycastle.crypto.Digest)
-     */
-    private final BigInteger macTag;
-
-    public JPAKERound3Payload(String participantId, BigInteger magTag)
-    {
-        this.participantId = participantId;
-        this.macTag = magTag;
-    }
-
-    public String getParticipantId()
-    {
-        return participantId;
-    }
-
-    public BigInteger getMacTag()
-    {
-        return macTag;
-    }
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/agreement/jpake/JPAKEUtil.java b/bcprov/src/main/java/org/bouncycastle/crypto/agreement/jpake/JPAKEUtil.java
deleted file mode 100644
index 0a6c5fe..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/agreement/jpake/JPAKEUtil.java
+++ /dev/null
@@ -1,495 +0,0 @@
-package org.bouncycastle.crypto.agreement.jpake;
-
-import java.math.BigInteger;
-import java.security.SecureRandom;
-
-import org.bouncycastle.crypto.CryptoException;
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.Mac;
-import org.bouncycastle.crypto.macs.HMac;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.BigIntegers;
-import org.bouncycastle.util.Strings;
-
-/**
- * Primitives needed for a J-PAKE exchange.
- * <p>
- * The recommended way to perform a J-PAKE exchange is by using
- * two {@link JPAKEParticipant}s.  Internally, those participants
- * call these primitive operations in {@link JPAKEUtil}.
- * <p>
- * The primitives, however, can be used without a {@link JPAKEParticipant}
- * if needed.
- */
-public class JPAKEUtil
-{
-    static final BigInteger ZERO = BigInteger.valueOf(0);
-    static final BigInteger ONE = BigInteger.valueOf(1);
-
-    /**
-     * Return a value that can be used as x1 or x3 during round 1.
-     * <p>
-     * The returned value is a random value in the range <tt>[0, q-1]</tt>.
-     */
-    public static BigInteger generateX1(
-        BigInteger q,
-        SecureRandom random)
-    {
-        BigInteger min = ZERO;
-        BigInteger max = q.subtract(ONE);
-        return BigIntegers.createRandomInRange(min, max, random);
-    }
-
-    /**
-     * Return a value that can be used as x2 or x4 during round 1.
-     * <p>
-     * The returned value is a random value in the range <tt>[1, q-1]</tt>.
-     */
-    public static BigInteger generateX2(
-        BigInteger q,
-        SecureRandom random)
-    {
-        BigInteger min = ONE;
-        BigInteger max = q.subtract(ONE);
-        return BigIntegers.createRandomInRange(min, max, random);
-    }
-
-    /**
-     * Converts the given password to a {@link BigInteger}
-     * for use in arithmetic calculations.
-     */
-    public static BigInteger calculateS(char[] password)
-    {
-        return new BigInteger(Strings.toUTF8ByteArray(password));
-    }
-
-    /**
-     * Calculate g^x mod p as done in round 1.
-     */
-    public static BigInteger calculateGx(
-        BigInteger p,
-        BigInteger g,
-        BigInteger x)
-    {
-        return g.modPow(x, p);
-    }
-
-
-    /**
-     * Calculate ga as done in round 2.
-     */
-    public static BigInteger calculateGA(
-        BigInteger p,
-        BigInteger gx1,
-        BigInteger gx3,
-        BigInteger gx4)
-    {
-        // ga = g^(x1+x3+x4) = g^x1 * g^x3 * g^x4 
-        return gx1.multiply(gx3).multiply(gx4).mod(p);
-    }
-
-
-    /**
-     * Calculate x2 * s as done in round 2.
-     */
-    public static BigInteger calculateX2s(
-        BigInteger q,
-        BigInteger x2,
-        BigInteger s)
-    {
-        return x2.multiply(s).mod(q);
-    }
-
-
-    /**
-     * Calculate A as done in round 2.
-     */
-    public static BigInteger calculateA(
-        BigInteger p,
-        BigInteger q,
-        BigInteger gA,
-        BigInteger x2s)
-    {
-        // A = ga^(x*s)
-        return gA.modPow(x2s, p);
-    }
-
-    /**
-     * Calculate a zero knowledge proof of x using Schnorr's signature.
-     * The returned array has two elements {g^v, r = v-x*h} for x.
-     */
-    public static BigInteger[] calculateZeroKnowledgeProof(
-        BigInteger p,
-        BigInteger q,
-        BigInteger g,
-        BigInteger gx,
-        BigInteger x,
-        String participantId,
-        Digest digest,
-        SecureRandom random)
-    {
-        BigInteger[] zeroKnowledgeProof = new BigInteger[2];
-
-        /* Generate a random v, and compute g^v */
-        BigInteger vMin = ZERO;
-        BigInteger vMax = q.subtract(ONE);
-        BigInteger v = BigIntegers.createRandomInRange(vMin, vMax, random);
-
-        BigInteger gv = g.modPow(v, p);
-        BigInteger h = calculateHashForZeroKnowledgeProof(g, gv, gx, participantId, digest); // h
-
-        zeroKnowledgeProof[0] = gv;
-        zeroKnowledgeProof[1] = v.subtract(x.multiply(h)).mod(q); // r = v-x*h
-
-        return zeroKnowledgeProof;
-    }
-
-    private static BigInteger calculateHashForZeroKnowledgeProof(
-        BigInteger g,
-        BigInteger gr,
-        BigInteger gx,
-        String participantId,
-        Digest digest)
-    {
-        digest.reset();
-
-        updateDigestIncludingSize(digest, g);
-
-        updateDigestIncludingSize(digest, gr);
-
-        updateDigestIncludingSize(digest, gx);
-
-        updateDigestIncludingSize(digest, participantId);
-
-        byte[] output = new byte[digest.getDigestSize()];
-        digest.doFinal(output, 0);
-
-        return new BigInteger(output);
-    }
-
-    /**
-     * Validates that g^x4 is not 1.
-     *
-     * @throws CryptoException if g^x4 is 1
-     */
-    public static void validateGx4(BigInteger gx4)
-        throws CryptoException
-    {
-        if (gx4.equals(ONE))
-        {
-            throw new CryptoException("g^x validation failed.  g^x should not be 1.");
-        }
-    }
-
-    /**
-     * Validates that ga is not 1.
-     * <p>
-     * As described by Feng Hao...
-     * <p>
-     * <blockquote>
-     * Alice could simply check ga != 1 to ensure it is a generator.
-     * In fact, as we will explain in Section 3, (x1 + x3 + x4 ) is random over Zq even in the face of active attacks.
-     * Hence, the probability for ga = 1 is extremely small - on the order of 2^160 for 160-bit q.
-     * </blockquote>
-     *
-     * @throws CryptoException if ga is 1
-     */
-    public static void validateGa(BigInteger ga)
-        throws CryptoException
-    {
-        if (ga.equals(ONE))
-        {
-            throw new CryptoException("ga is equal to 1.  It should not be.  The chances of this happening are on the order of 2^160 for a 160-bit q.  Try again.");
-        }
-    }
-
-    /**
-     * Validates the zero knowledge proof (generated by
-     * {@link #calculateZeroKnowledgeProof(BigInteger, BigInteger, BigInteger, BigInteger, BigInteger, String, Digest, SecureRandom)})
-     * is correct.
-     *
-     * @throws CryptoException if the zero knowledge proof is not correct
-     */
-    public static void validateZeroKnowledgeProof(
-        BigInteger p,
-        BigInteger q,
-        BigInteger g,
-        BigInteger gx,
-        BigInteger[] zeroKnowledgeProof,
-        String participantId,
-        Digest digest)
-        throws CryptoException
-    {
-
-        /* sig={g^v,r} */
-        BigInteger gv = zeroKnowledgeProof[0];
-        BigInteger r = zeroKnowledgeProof[1];
-
-        BigInteger h = calculateHashForZeroKnowledgeProof(g, gv, gx, participantId, digest);
-        if (!(gx.compareTo(ZERO) == 1 && // g^x > 0
-            gx.compareTo(p) == -1 && // g^x < p
-            gx.modPow(q, p).compareTo(ONE) == 0 && // g^x^q mod q = 1
-                /*
-                 * Below, I took an straightforward way to compute g^r * g^x^h,
-                 * which needs 2 exp. Using a simultaneous computation technique
-                 * would only need 1 exp.
-                 */
-            g.modPow(r, p).multiply(gx.modPow(h, p)).mod(p).compareTo(gv) == 0)) // g^v=g^r * g^x^h
-        {
-            throw new CryptoException("Zero-knowledge proof validation failed");
-        }
-    }
-
-    /**
-     * Calculates the keying material, which can be done after round 2 has completed.
-     * A session key must be derived from this key material using a secure key derivation function (KDF).
-     * The KDF used to derive the key is handled externally (i.e. not by {@link JPAKEParticipant}).
-     * <pre>
-     * KeyingMaterial = (B/g^{x2*x4*s})^x2
-     * </pre>
-     */
-    public static BigInteger calculateKeyingMaterial(
-        BigInteger p,
-        BigInteger q,
-        BigInteger gx4,
-        BigInteger x2,
-        BigInteger s,
-        BigInteger B)
-    {
-        return gx4.modPow(x2.multiply(s).negate().mod(q), p).multiply(B).modPow(x2, p);
-    }
-
-    /**
-     * Validates that the given participant ids are not equal.
-     * (For the J-PAKE exchange, each participant must use a unique id.)
-     *
-     * @throws CryptoException if the participantId strings are equal.
-     */
-    public static void validateParticipantIdsDiffer(String participantId1, String participantId2)
-        throws CryptoException
-    {
-        if (participantId1.equals(participantId2))
-        {
-            throw new CryptoException(
-                "Both participants are using the same participantId ("
-                    + participantId1
-                    + "). This is not allowed. "
-                    + "Each participant must use a unique participantId.");
-        }
-    }
-
-    /**
-     * Validates that the given participant ids are equal.
-     * This is used to ensure that the payloads received from
-     * each round all come from the same participant.
-     *
-     * @throws CryptoException if the participantId strings are equal.
-     */
-    public static void validateParticipantIdsEqual(String expectedParticipantId, String actualParticipantId)
-        throws CryptoException
-    {
-        if (!expectedParticipantId.equals(actualParticipantId))
-        {
-            throw new CryptoException(
-                "Received payload from incorrect partner ("
-                    + actualParticipantId
-                    + "). Expected to receive payload from "
-                    + expectedParticipantId
-                    + ".");
-        }
-    }
-
-    /**
-     * Validates that the given object is not null.
-     *
-     *  @param object object in question
-     * @param description name of the object (to be used in exception message)
-     * @throws NullPointerException if the object is null.
-     */
-    public static void validateNotNull(Object object, String description)
-    {
-        if (object == null)
-        {
-            throw new NullPointerException(description + " must not be null");
-        }
-    }
-
-    /**
-     * Calculates the MacTag (to be used for key confirmation), as defined by
-     * <a href="http://csrc.nist.gov/publications/nistpubs/800-56A/SP800-56A_Revision1_Mar08-2007.pdf">NIST SP 800-56A Revision 1</a>,
-     * Section 8.2 Unilateral Key Confirmation for Key Agreement Schemes.
-     * <pre>
-     * MacTag = HMAC(MacKey, MacLen, MacData)
-     *
-     * MacKey = H(K || "JPAKE_KC")
-     *
-     * MacData = "KC_1_U" || participantId || partnerParticipantId || gx1 || gx2 || gx3 || gx4
-     *
-     * Note that both participants use "KC_1_U" because the sender of the round 3 message
-     * is always the initiator for key confirmation.
-     *
-     * HMAC = {@link HMac} used with the given {@link Digest}
-     * H = The given {@link Digest}
-     * MacLen = length of MacTag
-     * </pre>
-     */
-    public static BigInteger calculateMacTag(
-        String participantId,
-        String partnerParticipantId,
-        BigInteger gx1,
-        BigInteger gx2,
-        BigInteger gx3,
-        BigInteger gx4,
-        BigInteger keyingMaterial,
-        Digest digest)
-    {
-        byte[] macKey = calculateMacKey(
-            keyingMaterial,
-            digest);
-
-        HMac mac = new HMac(digest);
-        byte[] macOutput = new byte[mac.getMacSize()];
-        mac.init(new KeyParameter(macKey));
-        
-        /*
-         * MacData = "KC_1_U" || participantId_Alice || participantId_Bob || gx1 || gx2 || gx3 || gx4.
-         */
-        updateMac(mac, "KC_1_U");
-        updateMac(mac, participantId);
-        updateMac(mac, partnerParticipantId);
-        updateMac(mac, gx1);
-        updateMac(mac, gx2);
-        updateMac(mac, gx3);
-        updateMac(mac, gx4);
-
-        mac.doFinal(macOutput, 0);
-
-        Arrays.fill(macKey, (byte)0);
-
-        return new BigInteger(macOutput);
-
-    }
-
-    /**
-     * Calculates the MacKey (i.e. the key to use when calculating the MagTag for key confirmation).
-     * <pre>
-     * MacKey = H(K || "JPAKE_KC")
-     * </pre>
-     */
-    private static byte[] calculateMacKey(BigInteger keyingMaterial, Digest digest)
-    {
-        digest.reset();
-
-        updateDigest(digest, keyingMaterial);
-        /*
-         * This constant is used to ensure that the macKey is NOT the same as the derived key.
-         */
-        updateDigest(digest, "JPAKE_KC");
-
-        byte[] output = new byte[digest.getDigestSize()];
-        digest.doFinal(output, 0);
-
-        return output;
-    }
-
-    /**
-     * Validates the MacTag received from the partner participant.
-     *
-     * @param partnerMacTag the MacTag received from the partner.
-     * @throws CryptoException if the participantId strings are equal.
-     */
-    public static void validateMacTag(
-        String participantId,
-        String partnerParticipantId,
-        BigInteger gx1,
-        BigInteger gx2,
-        BigInteger gx3,
-        BigInteger gx4,
-        BigInteger keyingMaterial,
-        Digest digest,
-        BigInteger partnerMacTag)
-        throws CryptoException
-    {
-        /*
-         * Calculate the expected MacTag using the parameters as the partner
-         * would have used when the partner called calculateMacTag.
-         * 
-         * i.e. basically all the parameters are reversed.
-         * participantId <-> partnerParticipantId
-         *            x1 <-> x3
-         *            x2 <-> x4
-         */
-        BigInteger expectedMacTag = calculateMacTag(
-            partnerParticipantId,
-            participantId,
-            gx3,
-            gx4,
-            gx1,
-            gx2,
-            keyingMaterial,
-            digest);
-
-        if (!expectedMacTag.equals(partnerMacTag))
-        {
-            throw new CryptoException(
-                "Partner MacTag validation failed. "
-                    + "Therefore, the password, MAC, or digest algorithm of each participant does not match.");
-        }
-    }
-
-    private static void updateDigest(Digest digest, BigInteger bigInteger)
-    {
-        byte[] byteArray = BigIntegers.asUnsignedByteArray(bigInteger);
-        digest.update(byteArray, 0, byteArray.length);
-        Arrays.fill(byteArray, (byte)0);
-    }
-
-    private static void updateDigestIncludingSize(Digest digest, BigInteger bigInteger)
-    {
-        byte[] byteArray = BigIntegers.asUnsignedByteArray(bigInteger);
-        digest.update(intToByteArray(byteArray.length), 0, 4);
-        digest.update(byteArray, 0, byteArray.length);
-        Arrays.fill(byteArray, (byte)0);
-    }
-
-    private static void updateDigest(Digest digest, String string)
-    {
-        byte[] byteArray = Strings.toUTF8ByteArray(string);
-        digest.update(byteArray, 0, byteArray.length);
-        Arrays.fill(byteArray, (byte)0);
-    }
-
-    private static void updateDigestIncludingSize(Digest digest, String string)
-    {
-        byte[] byteArray = Strings.toUTF8ByteArray(string);
-        digest.update(intToByteArray(byteArray.length), 0, 4);
-        digest.update(byteArray, 0, byteArray.length);
-        Arrays.fill(byteArray, (byte)0);
-    }
-
-    private static void updateMac(Mac mac, BigInteger bigInteger)
-    {
-        byte[] byteArray = BigIntegers.asUnsignedByteArray(bigInteger);
-        mac.update(byteArray, 0, byteArray.length);
-        Arrays.fill(byteArray, (byte)0);
-    }
-
-    private static void updateMac(Mac mac, String string)
-    {
-        byte[] byteArray = Strings.toUTF8ByteArray(string);
-        mac.update(byteArray, 0, byteArray.length);
-        Arrays.fill(byteArray, (byte)0);
-    }
-
-    private static byte[] intToByteArray(int value)
-    {
-        return new byte[]{
-            (byte)(value >>> 24),
-            (byte)(value >>> 16),
-            (byte)(value >>> 8),
-            (byte)value
-        };
-    }
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/agreement/jpake/package.html b/bcprov/src/main/java/org/bouncycastle/crypto/agreement/jpake/package.html
deleted file mode 100644
index df16b4f..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/agreement/jpake/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body bgcolor="#ffffff">
-Support classes for Password Authenticated Key Exchange by Juggling (J-PAKE) key exchange.
-</body>
-</html>
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/agreement/kdf/DHKDFParameters.java b/bcprov/src/main/java/org/bouncycastle/crypto/agreement/kdf/DHKDFParameters.java
deleted file mode 100644
index 315c548..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/agreement/kdf/DHKDFParameters.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package org.bouncycastle.crypto.agreement.kdf;
-
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.crypto.DerivationParameters;
-
-public class DHKDFParameters
-    implements DerivationParameters
-{
-    private ASN1ObjectIdentifier algorithm;
-    private int keySize;
-    private byte[] z;
-    private byte[] extraInfo;
-
-    public DHKDFParameters(
-        ASN1ObjectIdentifier algorithm,
-        int keySize,
-        byte[] z)
-    {
-        this(algorithm, keySize, z, null);
-    }
-
-    public DHKDFParameters(
-        ASN1ObjectIdentifier algorithm,
-        int keySize,
-        byte[] z,
-        byte[] extraInfo)
-    {
-        this.algorithm = algorithm;
-        this.keySize = keySize;
-        this.z = z;
-        this.extraInfo = extraInfo;
-    }
-
-    public ASN1ObjectIdentifier getAlgorithm()
-    {
-        return algorithm;
-    }
-
-    public int getKeySize()
-    {
-        return keySize;
-    }
-
-    public byte[] getZ()
-    {
-        return z;
-    }
-
-    public byte[] getExtraInfo()
-    {
-        return extraInfo;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/agreement/kdf/DHKEKGenerator.java b/bcprov/src/main/java/org/bouncycastle/crypto/agreement/kdf/DHKEKGenerator.java
deleted file mode 100644
index 6feb507..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/agreement/kdf/DHKEKGenerator.java
+++ /dev/null
@@ -1,131 +0,0 @@
-package org.bouncycastle.crypto.agreement.kdf;
-
-import java.io.IOException;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Encoding;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.DEROctetString;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.DERTaggedObject;
-import org.bouncycastle.crypto.DataLengthException;
-import org.bouncycastle.crypto.DerivationFunction;
-import org.bouncycastle.crypto.DerivationParameters;
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.util.Pack;
-
-/**
- * RFC 2631 Diffie-hellman KEK derivation function.
- */
-public class DHKEKGenerator
-    implements DerivationFunction
-{
-    private final Digest digest;
-
-    private ASN1ObjectIdentifier algorithm;
-    private int                 keySize;
-    private byte[]              z;
-    private byte[]              partyAInfo;
-
-    public DHKEKGenerator(
-        Digest digest)
-    {
-        this.digest = digest;
-    }
-
-    public void init(DerivationParameters param)
-    {
-        DHKDFParameters params = (DHKDFParameters)param;
-
-        this.algorithm = params.getAlgorithm();
-        this.keySize = params.getKeySize();
-        this.z = params.getZ();
-        this.partyAInfo = params.getExtraInfo();
-    }
-
-    public Digest getDigest()
-    {
-        return digest;
-    }
-
-    public int generateBytes(byte[] out, int outOff, int len)
-        throws DataLengthException, IllegalArgumentException
-    {
-        if ((out.length - len) < outOff)
-        {
-            throw new DataLengthException("output buffer too small");
-        }
-
-        long    oBytes = len;
-        int     outLen = digest.getDigestSize();
-
-        //
-        // this is at odds with the standard implementation, the
-        // maximum value should be hBits * (2^32 - 1) where hBits
-        // is the digest output size in bits. We can't have an
-        // array with a long index at the moment...
-        //
-        if (oBytes > ((2L << 32) - 1))
-        {
-            throw new IllegalArgumentException("Output length too large");
-        }
-
-        int cThreshold = (int)((oBytes + outLen - 1) / outLen);
-
-        byte[] dig = new byte[digest.getDigestSize()];
-
-        int counter = 1;
-
-        for (int i = 0; i < cThreshold; i++)
-        {
-            digest.update(z, 0, z.length);
-
-            // OtherInfo
-            ASN1EncodableVector v1 = new ASN1EncodableVector();
-            // KeySpecificInfo
-            ASN1EncodableVector v2 = new ASN1EncodableVector();
-
-            v2.add(algorithm);
-            v2.add(new DEROctetString(Pack.intToBigEndian(counter)));
-
-            v1.add(new DERSequence(v2));
-
-            if (partyAInfo != null)
-            {
-                v1.add(new DERTaggedObject(true, 0, new DEROctetString(partyAInfo)));
-            }
-
-            v1.add(new DERTaggedObject(true, 2, new DEROctetString(Pack.intToBigEndian(keySize))));
-
-            try
-            {
-                byte[] other = new DERSequence(v1).getEncoded(ASN1Encoding.DER);
-
-                digest.update(other, 0, other.length);
-            }
-            catch (IOException e)
-            {
-                throw new IllegalArgumentException("unable to encode parameter info: " + e.getMessage());
-            }
-
-            digest.doFinal(dig, 0);
-
-            if (len > outLen)
-            {
-                System.arraycopy(dig, 0, out, outOff, outLen);
-                outOff += outLen;
-                len -= outLen;
-            }
-            else
-            {
-                System.arraycopy(dig, 0, out, outOff, len);
-            }
-
-            counter++;
-        }
-
-        digest.reset();
-
-        return (int)oBytes;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/agreement/kdf/ECDHKEKGenerator.java b/bcprov/src/main/java/org/bouncycastle/crypto/agreement/kdf/ECDHKEKGenerator.java
deleted file mode 100644
index 5d15b99..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/agreement/kdf/ECDHKEKGenerator.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package org.bouncycastle.crypto.agreement.kdf;
-
-import java.io.IOException;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Encoding;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.DERNull;
-import org.bouncycastle.asn1.DEROctetString;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.DERTaggedObject;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.crypto.DataLengthException;
-import org.bouncycastle.crypto.DerivationParameters;
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.DigestDerivationFunction;
-import org.bouncycastle.crypto.generators.KDF2BytesGenerator;
-import org.bouncycastle.crypto.params.KDFParameters;
-import org.bouncycastle.util.Pack;
-
-/**
- * X9.63 based key derivation function for ECDH CMS.
- */
-public class ECDHKEKGenerator
-    implements DigestDerivationFunction
-{
-    private DigestDerivationFunction kdf;
-
-    private ASN1ObjectIdentifier algorithm;
-    private int                 keySize;
-    private byte[]              z;
-
-    public ECDHKEKGenerator(
-        Digest digest)
-    {
-        this.kdf = new KDF2BytesGenerator(digest);
-    }
-
-    public void init(DerivationParameters param)
-    {
-        DHKDFParameters params = (DHKDFParameters)param;
-
-        this.algorithm = params.getAlgorithm();
-        this.keySize = params.getKeySize();
-        this.z = params.getZ();
-    }
-
-    public Digest getDigest()
-    {
-        return kdf.getDigest();
-    }
-
-    public int generateBytes(byte[] out, int outOff, int len)
-        throws DataLengthException, IllegalArgumentException
-    {
-        // TODO Create an ASN.1 class for this (RFC3278)
-        // ECC-CMS-SharedInfo
-        ASN1EncodableVector v = new ASN1EncodableVector();
-
-        v.add(new AlgorithmIdentifier(algorithm, DERNull.INSTANCE));
-        v.add(new DERTaggedObject(true, 2, new DEROctetString(Pack.intToBigEndian(keySize))));
-
-        try
-        {
-            kdf.init(new KDFParameters(z, new DERSequence(v).getEncoded(ASN1Encoding.DER)));
-        }
-        catch (IOException e)
-        {
-            throw new IllegalArgumentException("unable to initialise kdf: " + e.getMessage());
-        }
-
-        return kdf.generateBytes(out, outOff, len);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/agreement/kdf/package.html b/bcprov/src/main/java/org/bouncycastle/crypto/agreement/kdf/package.html
deleted file mode 100644
index a00160f..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/agreement/kdf/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body bgcolor="#ffffff">
-Support classes for KDF based key derivation functions.
-</body>
-</html>
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/agreement/package.html b/bcprov/src/main/java/org/bouncycastle/crypto/agreement/package.html
deleted file mode 100644
index 4b49331..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/agreement/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body bgcolor="#ffffff">
-Basic key agreement classes.
-</body>
-</html>
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/agreement/srp/SRP6Client.java b/bcprov/src/main/java/org/bouncycastle/crypto/agreement/srp/SRP6Client.java
deleted file mode 100644
index 436a94c..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/agreement/srp/SRP6Client.java
+++ /dev/null
@@ -1,156 +0,0 @@
-package org.bouncycastle.crypto.agreement.srp;
-
-import java.math.BigInteger;
-import java.security.SecureRandom;
-
-import org.bouncycastle.crypto.CryptoException;
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.params.SRP6GroupParameters;
-
-/**
- * Implements the client side SRP-6a protocol. Note that this class is stateful, and therefore NOT threadsafe.
- * This implementation of SRP is based on the optimized message sequence put forth by Thomas Wu in the paper
- * "SRP-6: Improvements and Refinements to the Secure Remote Password Protocol, 2002"
- */
-public class SRP6Client
-{
-    protected BigInteger N;
-    protected BigInteger g;
-
-    protected BigInteger a;
-    protected BigInteger A;
-
-    protected BigInteger B;
-
-    protected BigInteger x;
-    protected BigInteger u;
-    protected BigInteger S;
-
-    protected BigInteger M1;
-	protected BigInteger M2;
-	protected BigInteger Key;
-	
-    protected Digest digest;
-    protected SecureRandom random;
-
-    public SRP6Client()
-    {
-    }
-
-    /**
-     * Initialises the client to begin new authentication attempt
-     * @param N The safe prime associated with the client's verifier
-     * @param g The group parameter associated with the client's verifier
-     * @param digest The digest algorithm associated with the client's verifier
-     * @param random For key generation
-     */
-    public void init(BigInteger N, BigInteger g, Digest digest, SecureRandom random)
-    {
-        this.N = N;
-        this.g = g;
-        this.digest = digest;
-        this.random = random;
-    }
-
-    public void init(SRP6GroupParameters group, Digest digest, SecureRandom random)
-    {
-        init(group.getN(), group.getG(), digest, random);
-    }
-
-    /**
-     * Generates client's credentials given the client's salt, identity and password
-     * @param salt The salt used in the client's verifier.
-     * @param identity The user's identity (eg. username)
-     * @param password The user's password
-     * @return Client's public value to send to server
-     */
-    public BigInteger generateClientCredentials(byte[] salt, byte[] identity, byte[] password)
-    {
-        this.x = SRP6Util.calculateX(digest, N, salt, identity, password);
-        this.a = selectPrivateValue();
-        this.A = g.modPow(a, N);
-
-        return A;
-    }
-
-    /**
-     * Generates the secret S given the server's credentials
-     * @param serverB The server's credentials
-     * @return Client's verification message for the server
-     * @throws CryptoException If server's credentials are invalid
-     */
-    public BigInteger calculateSecret(BigInteger serverB) throws CryptoException
-    {
-        this.B = SRP6Util.validatePublicValue(N, serverB);
-        this.u = SRP6Util.calculateU(digest, N, A, B);
-        this.S = calculateS();
-
-        return S;
-    }
-
-    protected BigInteger selectPrivateValue()
-    {
-        return SRP6Util.generatePrivateValue(digest, N, g, random);        
-    }
-
-    private BigInteger calculateS()
-    {
-        BigInteger k = SRP6Util.calculateK(digest, N, g);
-        BigInteger exp = u.multiply(x).add(a);
-        BigInteger tmp = g.modPow(x, N).multiply(k).mod(N);
-        return B.subtract(tmp).mod(N).modPow(exp, N);
-    }
-    
-    /**
-	 * Computes the client evidence message M1 using the previously received values.
-	 * To be called after calculating the secret S.
-	 * @return M1: the client side generated evidence message
-	 * @throws CryptoException
-	 */
-	public BigInteger calculateClientEvidenceMessage() throws CryptoException{
-		// verify pre-requirements
-		if ((this.A==null)||(this.B==null)||(this.S==null)){
-			throw new CryptoException("Impossible to compute M1: " +
-					"some data are missing from the previous operations (A,B,S)");
-		}
-		// compute the client evidence message 'M1'
-		this.M1 = SRP6Util.calculateM1(digest, N, A, B, S);  
-		return M1;
-	}
-
-	/** Authenticates the server evidence message M2 received and saves it only if correct.
-	 * @param M2: the server side generated evidence message
-	 * @return A boolean indicating if the server message M2 was the expected one.
-	 * @throws CryptoException
-	 */
-	public boolean verifyServerEvidenceMessage(BigInteger serverM2) throws CryptoException{
-		//verify pre-requirements
-		if ((this.A==null)||(this.M1==null)||(this.S==null)){
-			throw new CryptoException("Impossible to compute and verify M2: " +
-					"some data are missing from the previous operations (A,M1,S)");
-		}
-		// Compute the own server evidence message 'M2'
-		BigInteger computedM2 = SRP6Util.calculateM2(digest, N, A, M1, S);
-		if (computedM2.equals(serverM2)){
-			this.M2 = serverM2;
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * Computes the final session key as a result of the SRP successful mutual authentication
-	 * To be called after verifying the server evidence message M2.
-	 * @return Key: the mutually authenticated symmetric session key
-	 * @throws CryptoException
-	 */
-	public BigInteger calculateSessionKey() throws CryptoException{
-		//verify pre-requirements (here we enforce a previous calculation of M1 and M2)
-		if ((this.S==null)||(this.M1==null)||(this.M2==null)){
-			throw new CryptoException("Impossible to compute Key: " +
-					"some data are missing from the previous operations (S,M1,M2)");
-		}
-		this.Key = SRP6Util.calculateKey(digest, N, S);
-		return Key;
-	}
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/agreement/srp/SRP6Server.java b/bcprov/src/main/java/org/bouncycastle/crypto/agreement/srp/SRP6Server.java
deleted file mode 100644
index c0cc7bf..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/agreement/srp/SRP6Server.java
+++ /dev/null
@@ -1,154 +0,0 @@
-package org.bouncycastle.crypto.agreement.srp;
-
-import java.math.BigInteger;
-import java.security.SecureRandom;
-
-import org.bouncycastle.crypto.CryptoException;
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.params.SRP6GroupParameters;
-
-/**
- * Implements the server side SRP-6a protocol. Note that this class is stateful, and therefore NOT threadsafe.
- * This implementation of SRP is based on the optimized message sequence put forth by Thomas Wu in the paper
- * "SRP-6: Improvements and Refinements to the Secure Remote Password Protocol, 2002"
- */
-public class SRP6Server
-{
-    protected BigInteger N;
-    protected BigInteger g;
-    protected BigInteger v;
-
-    protected SecureRandom random;
-    protected Digest digest;
-
-    protected BigInteger A;
-
-    protected BigInteger b;
-    protected BigInteger B;
-
-    protected BigInteger u;
-    protected BigInteger S;
-    protected BigInteger M1;
-	protected BigInteger M2;
-	protected BigInteger Key;
-	
-    public SRP6Server()
-    {
-    }
-
-    /**
-     * Initialises the server to accept a new client authentication attempt
-     * @param N The safe prime associated with the client's verifier
-     * @param g The group parameter associated with the client's verifier
-     * @param v The client's verifier
-     * @param digest The digest algorithm associated with the client's verifier
-     * @param random For key generation
-     */
-    public void init(BigInteger N, BigInteger g, BigInteger v, Digest digest, SecureRandom random)
-    {
-        this.N = N;
-        this.g = g;
-        this.v = v;
-
-        this.random = random;
-        this.digest = digest;
-    }
-
-    public void init(SRP6GroupParameters group, BigInteger v, Digest digest, SecureRandom random)
-    {
-        init(group.getN(), group.getG(), v, digest, random);
-    }
-
-    /**
-     * Generates the server's credentials that are to be sent to the client.
-     * @return The server's public value to the client
-     */
-    public BigInteger generateServerCredentials()
-    {
-        BigInteger k = SRP6Util.calculateK(digest, N, g);
-        this.b = selectPrivateValue();
-        this.B = k.multiply(v).mod(N).add(g.modPow(b, N)).mod(N);
-
-        return B;
-    }
-
-    /**
-     * Processes the client's credentials. If valid the shared secret is generated and returned.
-     * @param clientA The client's credentials
-     * @return A shared secret BigInteger
-     * @throws CryptoException If client's credentials are invalid
-     */
-    public BigInteger calculateSecret(BigInteger clientA) throws CryptoException
-    {
-        this.A = SRP6Util.validatePublicValue(N, clientA);
-        this.u = SRP6Util.calculateU(digest, N, A, B);
-        this.S = calculateS();
-
-        return S;
-    }
-
-    protected BigInteger selectPrivateValue()
-    {
-        return SRP6Util.generatePrivateValue(digest, N, g, random);        
-    }
-
-    private BigInteger calculateS()
-    {
-        return v.modPow(u, N).multiply(A).mod(N).modPow(b, N);
-    }
-    
-    /** 
-	 * Authenticates the received client evidence message M1 and saves it only if correct.
-	 * To be called after calculating the secret S.
-	 * @param M1: the client side generated evidence message
-	 * @return A boolean indicating if the client message M1 was the expected one.
-	 * @throws CryptoException 
-	 */
-	public boolean verifyClientEvidenceMessage(BigInteger clientM1) throws CryptoException{
-		//verify pre-requirements
-		if ((this.A==null)||(this.B==null)||(this.S==null)){
-			throw new CryptoException("Impossible to compute and verify M1: " +
-					"some data are missing from the previous operations (A,B,S)");
-		}
-		// Compute the own client evidence message 'M1'
-		BigInteger computedM1 = SRP6Util.calculateM1(digest, N, A, B, S);
-		if (computedM1.equals(clientM1)){
-			this.M1 = clientM1;
-			return true;
-		}
-		return false;
-	}
-	
-	/**
-	 * Computes the server evidence message M2 using the previously verified values.
-	 * To be called after successfully verifying the client evidence message M1.
-	 * @return M2: the server side generated evidence message
-	 * @throws CryptoException
-	 */
-	public BigInteger calculateServerEvidenceMessage() throws CryptoException{
-		//verify pre-requirements
-		if ((this.A==null)||(this.M1==null)||(this.S==null)){
-			throw new CryptoException("Impossible to compute M2: " +
-					"some data are missing from the previous operations (A,M1,S)");
-		}
-		// Compute the server evidence message 'M2'
-		this.M2 = SRP6Util.calculateM2(digest, N, A, M1, S);  
-		return M2;
-	}
-	
-	/**
-	 * Computes the final session key as a result of the SRP successful mutual authentication
-	 * To be called after calculating the server evidence message M2.
-	 * @return Key: the mutual authenticated symmetric session key
-	 * @throws CryptoException
-	 */
-	public BigInteger calculateSessionKey() throws CryptoException{
-		//verify pre-requirements
-		if ((this.S==null)||(this.M1==null)||(this.M2==null)){
-			throw new CryptoException("Impossible to compute Key: " +
-					"some data are missing from the previous operations (S,M1,M2)");
-		}
-		this.Key = SRP6Util.calculateKey(digest, N, S);
-		return Key;
-	}
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/agreement/srp/SRP6StandardGroups.java b/bcprov/src/main/java/org/bouncycastle/crypto/agreement/srp/SRP6StandardGroups.java
deleted file mode 100644
index cc8b356..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/agreement/srp/SRP6StandardGroups.java
+++ /dev/null
@@ -1,157 +0,0 @@
-package org.bouncycastle.crypto.agreement.srp;
-
-import java.math.BigInteger;
-
-import org.bouncycastle.crypto.params.SRP6GroupParameters;
-import org.bouncycastle.util.encoders.Hex;
-
-public class SRP6StandardGroups
-{
-    private static BigInteger fromHex(String hex)
-    {
-        return new BigInteger(1, Hex.decode(hex));
-    }
-
-    private static SRP6GroupParameters fromNG(String hexN, String hexG)
-    {
-        return new SRP6GroupParameters(fromHex(hexN), fromHex(hexG));
-    }
-
-    /*
-     * RFC 5054
-     */
-    private static final String rfc5054_1024_N = "EEAF0AB9ADB38DD69C33F80AFA8FC5E86072618775FF3C0B9EA2314C"
-        + "9C256576D674DF7496EA81D3383B4813D692C6E0E0D5D8E250B98BE4"
-        + "8E495C1D6089DAD15DC7D7B46154D6B6CE8EF4AD69B15D4982559B29"
-        + "7BCF1885C529F566660E57EC68EDBC3C05726CC02FD4CBF4976EAA9A" + "FD5138FE8376435B9FC61D2FC0EB06E3";
-    private static final String rfc5054_1024_g = "02";
-    public static final SRP6GroupParameters rfc5054_1024 = fromNG(rfc5054_1024_N, rfc5054_1024_g);
-
-    private static final String rfc5054_1536_N = "9DEF3CAFB939277AB1F12A8617A47BBBDBA51DF499AC4C80BEEEA961"
-        + "4B19CC4D5F4F5F556E27CBDE51C6A94BE4607A291558903BA0D0F843"
-        + "80B655BB9A22E8DCDF028A7CEC67F0D08134B1C8B97989149B609E0B"
-        + "E3BAB63D47548381DBC5B1FC764E3F4B53DD9DA1158BFD3E2B9C8CF5"
-        + "6EDF019539349627DB2FD53D24B7C48665772E437D6C7F8CE442734A"
-        + "F7CCB7AE837C264AE3A9BEB87F8A2FE9B8B5292E5A021FFF5E91479E"
-        + "8CE7A28C2442C6F315180F93499A234DCF76E3FED135F9BB";
-    private static final String rfc5054_1536_g = "02";
-    public static final SRP6GroupParameters rfc5054_1536 = fromNG(rfc5054_1536_N, rfc5054_1536_g);
-
-    private static final String rfc5054_2048_N = "AC6BDB41324A9A9BF166DE5E1389582FAF72B6651987EE07FC319294"
-        + "3DB56050A37329CBB4A099ED8193E0757767A13DD52312AB4B03310D"
-        + "CD7F48A9DA04FD50E8083969EDB767B0CF6095179A163AB3661A05FB"
-        + "D5FAAAE82918A9962F0B93B855F97993EC975EEAA80D740ADBF4FF74"
-        + "7359D041D5C33EA71D281E446B14773BCA97B43A23FB801676BD207A"
-        + "436C6481F1D2B9078717461A5B9D32E688F87748544523B524B0D57D"
-        + "5EA77A2775D2ECFA032CFBDBF52FB3786160279004E57AE6AF874E73"
-        + "03CE53299CCC041C7BC308D82A5698F3A8D0C38271AE35F8E9DBFBB6"
-        + "94B5C803D89F7AE435DE236D525F54759B65E372FCD68EF20FA7111F" + "9E4AFF73";
-    private static final String rfc5054_2048_g = "02";
-    public static final SRP6GroupParameters rfc5054_2048 = fromNG(rfc5054_2048_N, rfc5054_2048_g);
-
-    private static final String rfc5054_3072_N = "FFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD129024E08"
-        + "8A67CC74020BBEA63B139B22514A08798E3404DDEF9519B3CD3A431B"
-        + "302B0A6DF25F14374FE1356D6D51C245E485B576625E7EC6F44C42E9"
-        + "A637ED6B0BFF5CB6F406B7EDEE386BFB5A899FA5AE9F24117C4B1FE6"
-        + "49286651ECE45B3DC2007CB8A163BF0598DA48361C55D39A69163FA8"
-        + "FD24CF5F83655D23DCA3AD961C62F356208552BB9ED529077096966D"
-        + "670C354E4ABC9804F1746C08CA18217C32905E462E36CE3BE39E772C"
-        + "180E86039B2783A2EC07A28FB5C55DF06F4C52C9DE2BCBF695581718"
-        + "3995497CEA956AE515D2261898FA051015728E5A8AAAC42DAD33170D"
-        + "04507A33A85521ABDF1CBA64ECFB850458DBEF0A8AEA71575D060C7D"
-        + "B3970F85A6E1E4C7ABF5AE8CDB0933D71E8C94E04A25619DCEE3D226"
-        + "1AD2EE6BF12FFA06D98A0864D87602733EC86A64521F2B18177B200C"
-        + "BBE117577A615D6C770988C0BAD946E208E24FA074E5AB3143DB5BFC" + "E0FD108E4B82D120A93AD2CAFFFFFFFFFFFFFFFF";
-    private static final String rfc5054_3072_g = "05";
-    public static final SRP6GroupParameters rfc5054_3072 = fromNG(rfc5054_3072_N, rfc5054_3072_g);
-
-    private static final String rfc5054_4096_N = "FFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD129024E08"
-        + "8A67CC74020BBEA63B139B22514A08798E3404DDEF9519B3CD3A431B"
-        + "302B0A6DF25F14374FE1356D6D51C245E485B576625E7EC6F44C42E9"
-        + "A637ED6B0BFF5CB6F406B7EDEE386BFB5A899FA5AE9F24117C4B1FE6"
-        + "49286651ECE45B3DC2007CB8A163BF0598DA48361C55D39A69163FA8"
-        + "FD24CF5F83655D23DCA3AD961C62F356208552BB9ED529077096966D"
-        + "670C354E4ABC9804F1746C08CA18217C32905E462E36CE3BE39E772C"
-        + "180E86039B2783A2EC07A28FB5C55DF06F4C52C9DE2BCBF695581718"
-        + "3995497CEA956AE515D2261898FA051015728E5A8AAAC42DAD33170D"
-        + "04507A33A85521ABDF1CBA64ECFB850458DBEF0A8AEA71575D060C7D"
-        + "B3970F85A6E1E4C7ABF5AE8CDB0933D71E8C94E04A25619DCEE3D226"
-        + "1AD2EE6BF12FFA06D98A0864D87602733EC86A64521F2B18177B200C"
-        + "BBE117577A615D6C770988C0BAD946E208E24FA074E5AB3143DB5BFC"
-        + "E0FD108E4B82D120A92108011A723C12A787E6D788719A10BDBA5B26"
-        + "99C327186AF4E23C1A946834B6150BDA2583E9CA2AD44CE8DBBBC2DB"
-        + "04DE8EF92E8EFC141FBECAA6287C59474E6BC05D99B2964FA090C3A2"
-        + "233BA186515BE7ED1F612970CEE2D7AFB81BDD762170481CD0069127"
-        + "D5B05AA993B4EA988D8FDDC186FFB7DC90A6C08F4DF435C934063199" + "FFFFFFFFFFFFFFFF";
-    private static final String rfc5054_4096_g = "05";
-    public static final SRP6GroupParameters rfc5054_4096 = fromNG(rfc5054_4096_N, rfc5054_4096_g);
-
-    private static final String rfc5054_6144_N = "FFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD129024E08"
-        + "8A67CC74020BBEA63B139B22514A08798E3404DDEF9519B3CD3A431B"
-        + "302B0A6DF25F14374FE1356D6D51C245E485B576625E7EC6F44C42E9"
-        + "A637ED6B0BFF5CB6F406B7EDEE386BFB5A899FA5AE9F24117C4B1FE6"
-        + "49286651ECE45B3DC2007CB8A163BF0598DA48361C55D39A69163FA8"
-        + "FD24CF5F83655D23DCA3AD961C62F356208552BB9ED529077096966D"
-        + "670C354E4ABC9804F1746C08CA18217C32905E462E36CE3BE39E772C"
-        + "180E86039B2783A2EC07A28FB5C55DF06F4C52C9DE2BCBF695581718"
-        + "3995497CEA956AE515D2261898FA051015728E5A8AAAC42DAD33170D"
-        + "04507A33A85521ABDF1CBA64ECFB850458DBEF0A8AEA71575D060C7D"
-        + "B3970F85A6E1E4C7ABF5AE8CDB0933D71E8C94E04A25619DCEE3D226"
-        + "1AD2EE6BF12FFA06D98A0864D87602733EC86A64521F2B18177B200C"
-        + "BBE117577A615D6C770988C0BAD946E208E24FA074E5AB3143DB5BFC"
-        + "E0FD108E4B82D120A92108011A723C12A787E6D788719A10BDBA5B26"
-        + "99C327186AF4E23C1A946834B6150BDA2583E9CA2AD44CE8DBBBC2DB"
-        + "04DE8EF92E8EFC141FBECAA6287C59474E6BC05D99B2964FA090C3A2"
-        + "233BA186515BE7ED1F612970CEE2D7AFB81BDD762170481CD0069127"
-        + "D5B05AA993B4EA988D8FDDC186FFB7DC90A6C08F4DF435C934028492"
-        + "36C3FAB4D27C7026C1D4DCB2602646DEC9751E763DBA37BDF8FF9406"
-        + "AD9E530EE5DB382F413001AEB06A53ED9027D831179727B0865A8918"
-        + "DA3EDBEBCF9B14ED44CE6CBACED4BB1BDB7F1447E6CC254B33205151"
-        + "2BD7AF426FB8F401378CD2BF5983CA01C64B92ECF032EA15D1721D03"
-        + "F482D7CE6E74FEF6D55E702F46980C82B5A84031900B1C9E59E7C97F"
-        + "BEC7E8F323A97A7E36CC88BE0F1D45B7FF585AC54BD407B22B4154AA"
-        + "CC8F6D7EBF48E1D814CC5ED20F8037E0A79715EEF29BE32806A1D58B"
-        + "B7C5DA76F550AA3D8A1FBFF0EB19CCB1A313D55CDA56C9EC2EF29632"
-        + "387FE8D76E3C0468043E8F663F4860EE12BF2D5B0B7474D6E694F91E" + "6DCC4024FFFFFFFFFFFFFFFF";
-    private static final String rfc5054_6144_g = "05";
-    public static final SRP6GroupParameters rfc5054_6144 = fromNG(rfc5054_6144_N, rfc5054_6144_g);
-
-    private static final String rfc5054_8192_N = "FFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD129024E08"
-        + "8A67CC74020BBEA63B139B22514A08798E3404DDEF9519B3CD3A431B"
-        + "302B0A6DF25F14374FE1356D6D51C245E485B576625E7EC6F44C42E9"
-        + "A637ED6B0BFF5CB6F406B7EDEE386BFB5A899FA5AE9F24117C4B1FE6"
-        + "49286651ECE45B3DC2007CB8A163BF0598DA48361C55D39A69163FA8"
-        + "FD24CF5F83655D23DCA3AD961C62F356208552BB9ED529077096966D"
-        + "670C354E4ABC9804F1746C08CA18217C32905E462E36CE3BE39E772C"
-        + "180E86039B2783A2EC07A28FB5C55DF06F4C52C9DE2BCBF695581718"
-        + "3995497CEA956AE515D2261898FA051015728E5A8AAAC42DAD33170D"
-        + "04507A33A85521ABDF1CBA64ECFB850458DBEF0A8AEA71575D060C7D"
-        + "B3970F85A6E1E4C7ABF5AE8CDB0933D71E8C94E04A25619DCEE3D226"
-        + "1AD2EE6BF12FFA06D98A0864D87602733EC86A64521F2B18177B200C"
-        + "BBE117577A615D6C770988C0BAD946E208E24FA074E5AB3143DB5BFC"
-        + "E0FD108E4B82D120A92108011A723C12A787E6D788719A10BDBA5B26"
-        + "99C327186AF4E23C1A946834B6150BDA2583E9CA2AD44CE8DBBBC2DB"
-        + "04DE8EF92E8EFC141FBECAA6287C59474E6BC05D99B2964FA090C3A2"
-        + "233BA186515BE7ED1F612970CEE2D7AFB81BDD762170481CD0069127"
-        + "D5B05AA993B4EA988D8FDDC186FFB7DC90A6C08F4DF435C934028492"
-        + "36C3FAB4D27C7026C1D4DCB2602646DEC9751E763DBA37BDF8FF9406"
-        + "AD9E530EE5DB382F413001AEB06A53ED9027D831179727B0865A8918"
-        + "DA3EDBEBCF9B14ED44CE6CBACED4BB1BDB7F1447E6CC254B33205151"
-        + "2BD7AF426FB8F401378CD2BF5983CA01C64B92ECF032EA15D1721D03"
-        + "F482D7CE6E74FEF6D55E702F46980C82B5A84031900B1C9E59E7C97F"
-        + "BEC7E8F323A97A7E36CC88BE0F1D45B7FF585AC54BD407B22B4154AA"
-        + "CC8F6D7EBF48E1D814CC5ED20F8037E0A79715EEF29BE32806A1D58B"
-        + "B7C5DA76F550AA3D8A1FBFF0EB19CCB1A313D55CDA56C9EC2EF29632"
-        + "387FE8D76E3C0468043E8F663F4860EE12BF2D5B0B7474D6E694F91E"
-        + "6DBE115974A3926F12FEE5E438777CB6A932DF8CD8BEC4D073B931BA"
-        + "3BC832B68D9DD300741FA7BF8AFC47ED2576F6936BA424663AAB639C"
-        + "5AE4F5683423B4742BF1C978238F16CBE39D652DE3FDB8BEFC848AD9"
-        + "22222E04A4037C0713EB57A81A23F0C73473FC646CEA306B4BCBC886"
-        + "2F8385DDFA9D4B7FA2C087E879683303ED5BDD3A062B3CF5B3A278A6"
-        + "6D2A13F83F44F82DDF310EE074AB6A364597E899A0255DC164F31CC5"
-        + "0846851DF9AB48195DED7EA1B1D510BD7EE74D73FAF36BC31ECFA268"
-        + "359046F4EB879F924009438B481C6CD7889A002ED5EE382BC9190DA6"
-        + "FC026E479558E4475677E9AA9E3050E2765694DFC81F56E880B96E71" + "60C980DD98EDD3DFFFFFFFFFFFFFFFFF";
-    private static final String rfc5054_8192_g = "13";
-    public static final SRP6GroupParameters rfc5054_8192 = fromNG(rfc5054_8192_N, rfc5054_8192_g);
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/agreement/srp/SRP6Util.java b/bcprov/src/main/java/org/bouncycastle/crypto/agreement/srp/SRP6Util.java
deleted file mode 100644
index 6bcf018..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/agreement/srp/SRP6Util.java
+++ /dev/null
@@ -1,154 +0,0 @@
-package org.bouncycastle.crypto.agreement.srp;
-
-import java.math.BigInteger;
-import java.security.SecureRandom;
-
-import org.bouncycastle.crypto.CryptoException;
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.util.BigIntegers;
-
-public class SRP6Util
-{
-    private static BigInteger ZERO = BigInteger.valueOf(0);
-    private static BigInteger ONE = BigInteger.valueOf(1);
-
-    public static BigInteger calculateK(Digest digest, BigInteger N, BigInteger g)
-    {
-        return hashPaddedPair(digest, N, N, g);
-    }
-
-    public static BigInteger calculateU(Digest digest, BigInteger N, BigInteger A, BigInteger B)
-    {
-        return hashPaddedPair(digest, N, A, B);
-    }
-
-    public static BigInteger calculateX(Digest digest, BigInteger N, byte[] salt, byte[] identity, byte[] password)
-    {
-        byte[] output = new byte[digest.getDigestSize()];
-
-        digest.update(identity, 0, identity.length);
-        digest.update((byte)':');
-        digest.update(password, 0, password.length);
-        digest.doFinal(output, 0);
-
-        digest.update(salt, 0, salt.length);
-        digest.update(output, 0, output.length);
-        digest.doFinal(output, 0);
-
-        return new BigInteger(1, output);
-    }
-
-    public static BigInteger generatePrivateValue(Digest digest, BigInteger N, BigInteger g, SecureRandom random)
-    {
-        int minBits = Math.min(256, N.bitLength() / 2);
-        BigInteger min = ONE.shiftLeft(minBits - 1);
-        BigInteger max = N.subtract(ONE);
-
-        return BigIntegers.createRandomInRange(min, max, random);
-    }
-
-    public static BigInteger validatePublicValue(BigInteger N, BigInteger val)
-        throws CryptoException
-    {
-        val = val.mod(N);
-
-        // Check that val % N != 0
-        if (val.equals(ZERO))
-        {
-            throw new CryptoException("Invalid public value: 0");
-        }
-
-        return val;
-    }
-    /** 
-	 * Computes the client evidence message (M1) according to the standard routine:
-	 * M1 = H( A | B | S )
-	 * @param digest The Digest used as the hashing function H
-	 * @param N Modulus used to get the pad length
-	 * @param A The public client value
-	 * @param B The public server value
-	 * @param S The secret calculated by both sides
-	 * @return M1 The calculated client evidence message
-	 */
-	public static BigInteger calculateM1(Digest digest, BigInteger N, BigInteger A, BigInteger B, BigInteger S) {
-		BigInteger M1 = hashPaddedTriplet(digest,N,A,B,S);
-		return M1;
-	}
-
-	/** 
-	 * Computes the server evidence message (M2) according to the standard routine:
-	 * M2 = H( A | M1 | S )
-	 * @param digest The Digest used as the hashing function H
-	 * @param N Modulus used to get the pad length
-	 * @param A The public client value
-	 * @param M1 The client evidence message
-	 * @param S The secret calculated by both sides
-	 * @return M2 The calculated server evidence message
-	 */
-	public static BigInteger calculateM2(Digest digest, BigInteger N, BigInteger A, BigInteger M1, BigInteger S){
-		BigInteger M2 = hashPaddedTriplet(digest,N,A,M1,S);
-		return M2;
-	}
-
-	/**
-	 * Computes the final Key according to the standard routine: Key = H(S)
-	 * @param digest The Digest used as the hashing function H
-	 * @param N Modulus used to get the pad length
-	 * @param S The secret calculated by both sides
-	 * @return
-	 */
-	public static BigInteger calculateKey(Digest digest, BigInteger N, BigInteger S) {
-		int padLength = (N.bitLength() + 7) / 8;
-		byte[] _S = getPadded(S,padLength);
-		digest.update(_S, 0, _S.length);
-		
-		byte[] output = new byte[digest.getDigestSize()];
-        digest.doFinal(output, 0);
-        return new BigInteger(1, output);
-	}
-	
-	private static BigInteger hashPaddedTriplet(Digest digest, BigInteger N, BigInteger n1, BigInteger n2, BigInteger n3){
-        int padLength = (N.bitLength() + 7) / 8;
-
-        byte[] n1_bytes = getPadded(n1, padLength);
-        byte[] n2_bytes = getPadded(n2, padLength);
-        byte[] n3_bytes = getPadded(n3, padLength);
-
-        digest.update(n1_bytes, 0, n1_bytes.length);
-        digest.update(n2_bytes, 0, n2_bytes.length);
-        digest.update(n3_bytes, 0, n3_bytes.length);
-
-        byte[] output = new byte[digest.getDigestSize()];
-        digest.doFinal(output, 0);
-
-        return new BigInteger(1, output);
-    }
-
-    private static BigInteger hashPaddedPair(Digest digest, BigInteger N, BigInteger n1, BigInteger n2)
-    {
-        int padLength = (N.bitLength() + 7) / 8;
-
-        byte[] n1_bytes = getPadded(n1, padLength);
-        byte[] n2_bytes = getPadded(n2, padLength);
-
-        digest.update(n1_bytes, 0, n1_bytes.length);
-        digest.update(n2_bytes, 0, n2_bytes.length);
-
-        byte[] output = new byte[digest.getDigestSize()];
-        digest.doFinal(output, 0);
-
-        return new BigInteger(1, output);
-    }
-
-    private static byte[] getPadded(BigInteger n, int length)
-    {
-        byte[] bs = BigIntegers.asUnsignedByteArray(n);
-        if (bs.length < length)
-        {
-            byte[] tmp = new byte[length];
-            System.arraycopy(bs, 0, tmp, length - bs.length, bs.length);
-            bs = tmp;
-        }
-        return bs;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/agreement/srp/SRP6VerifierGenerator.java b/bcprov/src/main/java/org/bouncycastle/crypto/agreement/srp/SRP6VerifierGenerator.java
deleted file mode 100644
index e0ae200..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/agreement/srp/SRP6VerifierGenerator.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package org.bouncycastle.crypto.agreement.srp;
-
-import java.math.BigInteger;
-
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.params.SRP6GroupParameters;
-
-/**
- * Generates new SRP verifier for user
- */
-public class SRP6VerifierGenerator
-{
-    protected BigInteger N;
-    protected BigInteger g;
-    protected Digest digest;
-
-    public SRP6VerifierGenerator()
-    {
-    }
-
-    /**
-     * Initialises generator to create new verifiers
-     * @param N The safe prime to use (see DHParametersGenerator)
-     * @param g The group parameter to use (see DHParametersGenerator)
-     * @param digest The digest to use. The same digest type will need to be used later for the actual authentication
-     * attempt. Also note that the final session key size is dependent on the chosen digest.
-     */
-    public void init(BigInteger N, BigInteger g, Digest digest)
-    {
-        this.N = N;
-        this.g = g;
-        this.digest = digest;
-    }
-
-    public void init(SRP6GroupParameters group, Digest digest)
-    {
-        this.N = group.getN();
-        this.g = group.getG();
-        this.digest = digest;
-    }
-
-    /**
-     * Creates a new SRP verifier
-     * @param salt The salt to use, generally should be large and random
-     * @param identity The user's identifying information (eg. username)
-     * @param password The user's password
-     * @return A new verifier for use in future SRP authentication
-     */
-    public BigInteger generateVerifier(byte[] salt, byte[] identity, byte[] password)
-    {
-        BigInteger x = SRP6Util.calculateX(digest, N, salt, identity, password);
-
-        return g.modPow(x, N);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/agreement/srp/package.html b/bcprov/src/main/java/org/bouncycastle/crypto/agreement/srp/package.html
deleted file mode 100644
index c125ffe..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/agreement/srp/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body bgcolor="#ffffff">
-Support classes for Secure Remote Password (SRP) protocol.
-</body>
-</html>
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/agreement/test/AllTests.java b/bcprov/src/main/java/org/bouncycastle/crypto/agreement/test/AllTests.java
deleted file mode 100644
index cb5a862..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/agreement/test/AllTests.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package org.bouncycastle.crypto.agreement.test;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-public class AllTests
-    extends TestCase
-{
-    public static void main(String[] args)
-    {
-        junit.textui.TestRunner.run(suite());
-    }
-
-    public static Test suite()
-    {
-        TestSuite suite = new TestSuite("JPKAE Engine Tests");
-
-        suite.addTestSuite(JPAKEParticipantTest.class);
-        suite.addTestSuite(JPAKEPrimeOrderGroupTest.class);
-        suite.addTestSuite(JPAKEUtilTest.class);
-
-        return suite;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/agreement/test/JPAKEParticipantTest.java b/bcprov/src/main/java/org/bouncycastle/crypto/agreement/test/JPAKEParticipantTest.java
deleted file mode 100644
index c6ecba2..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/agreement/test/JPAKEParticipantTest.java
+++ /dev/null
@@ -1,561 +0,0 @@
-package org.bouncycastle.crypto.agreement.test;
-
-import java.math.BigInteger;
-import java.security.SecureRandom;
-
-import junit.framework.TestCase;
-import org.bouncycastle.crypto.CryptoException;
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.agreement.jpake.JPAKEParticipant;
-import org.bouncycastle.crypto.agreement.jpake.JPAKEPrimeOrderGroup;
-import org.bouncycastle.crypto.agreement.jpake.JPAKEPrimeOrderGroups;
-import org.bouncycastle.crypto.agreement.jpake.JPAKERound1Payload;
-import org.bouncycastle.crypto.agreement.jpake.JPAKERound2Payload;
-import org.bouncycastle.crypto.agreement.jpake.JPAKERound3Payload;
-import org.bouncycastle.crypto.agreement.jpake.JPAKEUtil;
-import org.bouncycastle.crypto.digests.SHA256Digest;
-
-public class JPAKEParticipantTest
-    extends TestCase
-{
-
-    public void testConstruction()
-        throws CryptoException
-    {
-        JPAKEPrimeOrderGroup group = JPAKEPrimeOrderGroups.SUN_JCE_1024;
-        SecureRandom random = new SecureRandom();
-        Digest digest = new SHA256Digest();
-        String participantId = "participantId";
-        char[] password = "password".toCharArray();
-
-        // should succeed
-        new JPAKEParticipant(participantId, password, group, digest, random);
-
-        // null participantId
-        try
-        {
-            new JPAKEParticipant(null, password, group, digest, random);
-            fail();
-        }
-        catch (NullPointerException e)
-        {
-            // pass
-        }
-
-        // null password
-        try
-        {
-            new JPAKEParticipant(participantId, null, group, digest, random);
-            fail();
-        }
-        catch (NullPointerException e)
-        {
-            // pass
-        }
-
-        // empty password
-        try
-        {
-            new JPAKEParticipant(participantId, "".toCharArray(), group, digest, random);
-            fail();
-        }
-        catch (IllegalArgumentException e)
-        {
-            // pass
-        }
-
-        // null group
-        try
-        {
-            new JPAKEParticipant(participantId, password, null, digest, random);
-            fail();
-        }
-        catch (NullPointerException e)
-        {
-            // pass
-        }
-
-        // null digest
-        try
-        {
-            new JPAKEParticipant(participantId, password, group, null, random);
-            fail();
-        }
-        catch (NullPointerException e)
-        {
-            // pass
-        }
-
-        // null random
-        try
-        {
-            new JPAKEParticipant(participantId, password, group, digest, null);
-            fail();
-        }
-        catch (NullPointerException e)
-        {
-            // pass
-        }
-    }
-
-    public void testSuccessfulExchange()
-        throws CryptoException
-    {
-
-        JPAKEParticipant alice = createAlice();
-        JPAKEParticipant bob = createBob();
-
-        ExchangeAfterRound2Creation exchange = runExchangeUntilRound2Creation(alice, bob);
-
-        alice.validateRound2PayloadReceived(exchange.bobRound2Payload);
-        bob.validateRound2PayloadReceived(exchange.aliceRound2Payload);
-
-        BigInteger aliceKeyingMaterial = alice.calculateKeyingMaterial();
-        BigInteger bobKeyingMaterial = bob.calculateKeyingMaterial();
-
-        JPAKERound3Payload aliceRound3Payload = alice.createRound3PayloadToSend(aliceKeyingMaterial);
-        JPAKERound3Payload bobRound3Payload = bob.createRound3PayloadToSend(bobKeyingMaterial);
-
-        alice.validateRound3PayloadReceived(bobRound3Payload, aliceKeyingMaterial);
-        bob.validateRound3PayloadReceived(aliceRound3Payload, bobKeyingMaterial);
-
-        assertEquals(aliceKeyingMaterial, bobKeyingMaterial);
-
-    }
-
-    public void testIncorrectPassword()
-        throws CryptoException
-    {
-
-        JPAKEParticipant alice = createAlice();
-        JPAKEParticipant bob = createBobWithWrongPassword();
-
-        ExchangeAfterRound2Creation exchange = runExchangeUntilRound2Creation(alice, bob);
-
-        alice.validateRound2PayloadReceived(exchange.bobRound2Payload);
-        bob.validateRound2PayloadReceived(exchange.aliceRound2Payload);
-
-        BigInteger aliceKeyingMaterial = alice.calculateKeyingMaterial();
-        BigInteger bobKeyingMaterial = bob.calculateKeyingMaterial();
-
-        JPAKERound3Payload aliceRound3Payload = alice.createRound3PayloadToSend(aliceKeyingMaterial);
-        JPAKERound3Payload bobRound3Payload = bob.createRound3PayloadToSend(bobKeyingMaterial);
-
-        try
-        {
-            alice.validateRound3PayloadReceived(bobRound3Payload, aliceKeyingMaterial);
-            fail();
-        }
-        catch (CryptoException e)
-        {
-            // pass
-        }
-
-        try
-        {
-            bob.validateRound3PayloadReceived(aliceRound3Payload, bobKeyingMaterial);
-            fail();
-        }
-        catch (CryptoException e)
-        {
-            // pass
-        }
-
-    }
-
-    /**
-     * Tests that {@link JPAKEParticipant} throws appropriate {@link IllegalStateException}s
-     * when the methods are called in the wrong order.
-     */
-    public void testStateValidation()
-        throws CryptoException
-    {
-
-        JPAKEParticipant alice = createAlice();
-        JPAKEParticipant bob = createBob();
-
-        // We're testing alice here. Bob is just used for help.
-
-        // START ROUND 1 CHECKS
-
-        assertEquals(JPAKEParticipant.STATE_INITIALIZED, alice.getState());
-
-        // create round 2 before round 1
-        try
-        {
-            alice.createRound2PayloadToSend();
-            fail();
-        }
-        catch (IllegalStateException e)
-        {
-            // pass
-        }
-
-        JPAKERound1Payload aliceRound1Payload = alice.createRound1PayloadToSend();
-
-        assertEquals(JPAKEParticipant.STATE_ROUND_1_CREATED, alice.getState());
-
-        // create round 1 payload twice
-        try
-        {
-            alice.createRound1PayloadToSend();
-            fail();
-        }
-        catch (IllegalStateException e)
-        {
-            // pass
-        }
-
-        // create round 2 before validating round 1
-        try
-        {
-            alice.createRound2PayloadToSend();
-            fail();
-        }
-        catch (IllegalStateException e)
-        {
-            // pass
-        }
-
-        // validate round 2 before validating round 1
-        try
-        {
-            alice.validateRound2PayloadReceived(null);
-            fail();
-        }
-        catch (IllegalStateException e)
-        {
-            // pass
-        }
-
-        JPAKERound1Payload bobRound1Payload = bob.createRound1PayloadToSend();
-
-        alice.validateRound1PayloadReceived(bobRound1Payload);
-
-        assertEquals(JPAKEParticipant.STATE_ROUND_1_VALIDATED, alice.getState());
-
-        // validate round 1 payload twice
-        try
-        {
-            alice.validateRound1PayloadReceived(bobRound1Payload);
-            fail();
-        }
-        catch (IllegalStateException e)
-        {
-            // pass
-        }
-
-        bob.validateRound1PayloadReceived(aliceRound1Payload);
-
-        // START ROUND 2 CHECKS
-
-        JPAKERound2Payload aliceRound2Payload = alice.createRound2PayloadToSend();
-
-        assertEquals(JPAKEParticipant.STATE_ROUND_2_CREATED, alice.getState());
-
-        // create round 2 payload twice
-        try
-        {
-            alice.createRound2PayloadToSend();
-            fail();
-        }
-        catch (IllegalStateException e)
-        {
-            // pass
-        }
-
-        // create key before validating round 2
-        try
-        {
-            alice.calculateKeyingMaterial();
-            fail();
-        }
-        catch (IllegalStateException e)
-        {
-            // pass
-        }
-
-        // validate round 3 before validating round 2
-        try
-        {
-            alice.validateRound3PayloadReceived(null, null);
-            fail();
-        }
-        catch (IllegalStateException e)
-        {
-            // pass
-        }
-
-        JPAKERound2Payload bobRound2Payload = bob.createRound2PayloadToSend();
-
-        alice.validateRound2PayloadReceived(bobRound2Payload);
-
-        assertEquals(JPAKEParticipant.STATE_ROUND_2_VALIDATED, alice.getState());
-
-        // validate round 2 payload twice
-        try
-        {
-            alice.validateRound2PayloadReceived(bobRound2Payload);
-            fail();
-        }
-        catch (IllegalStateException e)
-        {
-            // pass
-        }
-
-        bob.validateRound2PayloadReceived(aliceRound2Payload);
-
-        // create round 3 before calculating key
-        try
-        {
-            alice.createRound3PayloadToSend(BigInteger.ONE);
-            fail();
-        }
-        catch (IllegalStateException e)
-        {
-            // pass
-        }
-
-        // START KEY CALCULATION CHECKS
-
-        BigInteger aliceKeyingMaterial = alice.calculateKeyingMaterial();
-
-        assertEquals(JPAKEParticipant.STATE_KEY_CALCULATED, alice.getState());
-
-        // calculate key twice
-        try
-        {
-            alice.calculateKeyingMaterial();
-            fail();
-        }
-        catch (IllegalStateException e)
-        {
-            // pass
-        }
-
-        BigInteger bobKeyingMaterial = bob.calculateKeyingMaterial();
-
-        // START ROUND 3 CHECKS
-
-        JPAKERound3Payload aliceRound3Payload = alice.createRound3PayloadToSend(aliceKeyingMaterial);
-
-        assertEquals(JPAKEParticipant.STATE_ROUND_3_CREATED, alice.getState());
-
-        // create round 3 payload twice
-        try
-        {
-            alice.createRound3PayloadToSend(aliceKeyingMaterial);
-            fail();
-        }
-        catch (IllegalStateException e)
-        {
-            // pass
-        }
-
-        JPAKERound3Payload bobRound3Payload = bob.createRound3PayloadToSend(bobKeyingMaterial);
-
-        alice.validateRound3PayloadReceived(bobRound3Payload, aliceKeyingMaterial);
-
-        assertEquals(JPAKEParticipant.STATE_ROUND_3_VALIDATED, alice.getState());
-
-        // validate round 3 payload twice
-        try
-        {
-            alice.validateRound3PayloadReceived(bobRound3Payload, aliceKeyingMaterial);
-            fail();
-        }
-        catch (IllegalStateException e)
-        {
-            // pass
-        }
-
-        bob.validateRound3PayloadReceived(aliceRound3Payload, bobKeyingMaterial);
-
-
-    }
-
-    /**
-     * Tests that {@link JPAKEParticipant#validateRound1PayloadReceived(JPAKERound1Payload)}
-     * calls the appropriate validate methods in {@link JPAKEUtil}.
-     * Note that {@link JPAKEUtilTest} tests the individual validate methods
-     * called by {@link JPAKEParticipant} more extensively.
-     */
-    public void testValidateRound1PayloadReceived()
-        throws CryptoException
-    {
-
-        // We're testing alice here. Bob is just used for help.
-
-        JPAKERound1Payload bobRound1Payload = createBob().createRound1PayloadToSend();
-
-        // should succeed
-        createAlice().validateRound1PayloadReceived(bobRound1Payload);
-
-        // alice verifies alice's payload
-        try
-        {
-            JPAKEParticipant alice = createAlice();
-            alice.validateRound1PayloadReceived(alice.createRound1PayloadToSend());
-            fail();
-        }
-        catch (CryptoException e)
-        {
-            // pass
-        }
-
-        // g^x4 == 1
-        try
-        {
-            createAlice().validateRound1PayloadReceived(new JPAKERound1Payload(
-                bobRound1Payload.getParticipantId(),
-                bobRound1Payload.getGx1(),
-                BigInteger.ONE,
-                bobRound1Payload.getKnowledgeProofForX1(),
-                bobRound1Payload.getKnowledgeProofForX2()));
-            fail();
-        }
-        catch (CryptoException e)
-        {
-            // pass
-        }
-
-        // zero knowledge proof for x3 fails
-        try
-        {
-            JPAKERound1Payload bobRound1Payload2 = createBob().createRound1PayloadToSend();
-            createAlice().validateRound1PayloadReceived(new JPAKERound1Payload(
-                bobRound1Payload.getParticipantId(),
-                bobRound1Payload.getGx1(),
-                bobRound1Payload.getGx2(),
-                bobRound1Payload2.getKnowledgeProofForX1(),
-                bobRound1Payload.getKnowledgeProofForX2()));
-            fail();
-        }
-        catch (CryptoException e)
-        {
-            // pass
-        }
-
-        // zero knowledge proof for x4 fails
-        try
-        {
-            JPAKERound1Payload bobRound1Payload2 = createBob().createRound1PayloadToSend();
-            createAlice().validateRound1PayloadReceived(new JPAKERound1Payload(
-                bobRound1Payload.getParticipantId(),
-                bobRound1Payload.getGx1(),
-                bobRound1Payload.getGx2(),
-                bobRound1Payload.getKnowledgeProofForX1(),
-                bobRound1Payload2.getKnowledgeProofForX2()));
-            fail();
-        }
-        catch (CryptoException e)
-        {
-            // pass
-        }
-
-    }
-
-    /**
-     * Tests that {@link JPAKEParticipant#validateRound2PayloadReceived(JPAKERound2Payload)}
-     * calls the appropriate validate methods in {@link JPAKEUtil}.
-     * Note that {@link JPAKEUtilTest} tests the individual validate methods
-     * called by {@link JPAKEParticipant} more extensively.
-     */
-    public void testValidateRound2PayloadReceived()
-        throws CryptoException
-    {
-
-        // We're testing alice here. Bob is just used for help.
-
-        // should succeed
-        ExchangeAfterRound2Creation exchange1 = runExchangeUntilRound2Creation(createAlice(), createBob());
-        exchange1.alice.validateRound2PayloadReceived(exchange1.bobRound2Payload);
-
-        // alice verifies alice's payload
-        ExchangeAfterRound2Creation exchange2 = runExchangeUntilRound2Creation(createAlice(), createBob());
-        try
-        {
-            exchange2.alice.validateRound2PayloadReceived(exchange2.aliceRound2Payload);
-            fail();
-        }
-        catch (CryptoException e)
-        {
-            // pass
-        }
-
-        // wrong z
-        ExchangeAfterRound2Creation exchange3 = runExchangeUntilRound2Creation(createAlice(), createBob());
-        ExchangeAfterRound2Creation exchange4 = runExchangeUntilRound2Creation(createAlice(), createBob());
-        try
-        {
-            exchange3.alice.validateRound2PayloadReceived(exchange4.bobRound2Payload);
-            fail();
-        }
-        catch (CryptoException e)
-        {
-            // pass
-        }
-
-    }
-
-    private static class ExchangeAfterRound2Creation
-    {
-
-        public JPAKEParticipant alice;
-        public JPAKERound2Payload aliceRound2Payload;
-        public JPAKERound2Payload bobRound2Payload;
-
-        public ExchangeAfterRound2Creation(
-            JPAKEParticipant alice,
-            JPAKERound2Payload aliceRound2Payload,
-            JPAKERound2Payload bobRound2Payload)
-        {
-            this.alice = alice;
-            this.aliceRound2Payload = aliceRound2Payload;
-            this.bobRound2Payload = bobRound2Payload;
-        }
-
-    }
-
-    private ExchangeAfterRound2Creation runExchangeUntilRound2Creation(JPAKEParticipant alice, JPAKEParticipant bob)
-        throws CryptoException
-    {
-        JPAKERound1Payload aliceRound1Payload = alice.createRound1PayloadToSend();
-        JPAKERound1Payload bobRound1Payload = bob.createRound1PayloadToSend();
-
-        alice.validateRound1PayloadReceived(bobRound1Payload);
-        bob.validateRound1PayloadReceived(aliceRound1Payload);
-
-        JPAKERound2Payload aliceRound2Payload = alice.createRound2PayloadToSend();
-        JPAKERound2Payload bobRound2Payload = bob.createRound2PayloadToSend();
-
-        return new ExchangeAfterRound2Creation(
-            alice,
-            aliceRound2Payload,
-            bobRound2Payload);
-    }
-
-    private JPAKEParticipant createAlice()
-    {
-        return createParticipant("alice", "password");
-    }
-
-    private JPAKEParticipant createBob()
-    {
-        return createParticipant("bob", "password");
-    }
-
-    private JPAKEParticipant createBobWithWrongPassword()
-    {
-        return createParticipant("bob", "wrong");
-    }
-
-    private JPAKEParticipant createParticipant(String participantId, String password)
-    {
-        return new JPAKEParticipant(
-            participantId,
-            password.toCharArray(),
-            JPAKEPrimeOrderGroups.SUN_JCE_1024);
-    }
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/agreement/test/JPAKEPrimeOrderGroupTest.java b/bcprov/src/main/java/org/bouncycastle/crypto/agreement/test/JPAKEPrimeOrderGroupTest.java
deleted file mode 100644
index 7d22f16..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/agreement/test/JPAKEPrimeOrderGroupTest.java
+++ /dev/null
@@ -1,85 +0,0 @@
-package org.bouncycastle.crypto.agreement.test;
-
-import java.math.BigInteger;
-
-import junit.framework.TestCase;
-import org.bouncycastle.crypto.CryptoException;
-import org.bouncycastle.crypto.agreement.jpake.JPAKEPrimeOrderGroup;
-
-public class JPAKEPrimeOrderGroupTest
-    extends TestCase
-{
-
-    public void testConstruction()
-        throws CryptoException
-    {
-        // p-1 not evenly divisible by q
-        try
-        {
-            new JPAKEPrimeOrderGroup(BigInteger.valueOf(7), BigInteger.valueOf(5), BigInteger.valueOf(6));
-            fail();
-        }
-        catch (IllegalArgumentException e)
-        {
-            // pass
-        }
-
-        // g < 2
-        try
-        {
-            new JPAKEPrimeOrderGroup(BigInteger.valueOf(11), BigInteger.valueOf(5), BigInteger.valueOf(1));
-            fail();
-        }
-        catch (IllegalArgumentException e)
-        {
-            // pass
-        }
-
-        // g > p-1
-        try
-        {
-            new JPAKEPrimeOrderGroup(BigInteger.valueOf(11), BigInteger.valueOf(5), BigInteger.valueOf(11));
-            fail();
-        }
-        catch (IllegalArgumentException e)
-        {
-            // pass
-        }
-
-        // g^q mod p not equal 1
-        try
-        {
-            new JPAKEPrimeOrderGroup(BigInteger.valueOf(11), BigInteger.valueOf(5), BigInteger.valueOf(6));
-            fail();
-        }
-        catch (IllegalArgumentException e)
-        {
-            // pass
-        }
-
-        // p not prime
-        try
-        {
-            new JPAKEPrimeOrderGroup(BigInteger.valueOf(15), BigInteger.valueOf(2), BigInteger.valueOf(4));
-            fail();
-        }
-        catch (IllegalArgumentException e)
-        {
-            // pass
-        }
-
-        // q not prime
-        try
-        {
-            new JPAKEPrimeOrderGroup(BigInteger.valueOf(7), BigInteger.valueOf(6), BigInteger.valueOf(3));
-            fail();
-        }
-        catch (IllegalArgumentException e)
-        {
-            // pass
-        }
-
-        // should succeed
-        new JPAKEPrimeOrderGroup(BigInteger.valueOf(7), BigInteger.valueOf(3), BigInteger.valueOf(4));
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/agreement/test/JPAKEUtilTest.java b/bcprov/src/main/java/org/bouncycastle/crypto/agreement/test/JPAKEUtilTest.java
deleted file mode 100644
index 20268b8..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/agreement/test/JPAKEUtilTest.java
+++ /dev/null
@@ -1,267 +0,0 @@
-package org.bouncycastle.crypto.agreement.test;
-
-import java.math.BigInteger;
-import java.security.SecureRandom;
-
-import junit.framework.TestCase;
-import org.bouncycastle.crypto.CryptoException;
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.agreement.jpake.JPAKEPrimeOrderGroup;
-import org.bouncycastle.crypto.agreement.jpake.JPAKEPrimeOrderGroups;
-import org.bouncycastle.crypto.agreement.jpake.JPAKEUtil;
-import org.bouncycastle.crypto.digests.SHA1Digest;
-import org.bouncycastle.crypto.digests.SHA256Digest;
-
-public class JPAKEUtilTest
-    extends TestCase
-{
-    private static final BigInteger TEN = BigInteger.valueOf(10);
-
-    public void testValidateGx4()
-        throws CryptoException
-    {
-        JPAKEUtil.validateGx4(TEN);
-
-        try
-        {
-            JPAKEUtil.validateGx4(BigInteger.ONE);
-            fail();
-        }
-        catch (CryptoException e)
-        {
-            // pass
-        }
-    }
-
-    public void testValidateGa()
-        throws CryptoException
-    {
-        JPAKEUtil.validateGa(TEN);
-
-        try
-        {
-            JPAKEUtil.validateGa(BigInteger.ONE);
-            fail();
-        }
-        catch (CryptoException e)
-        {
-            // pass
-        }
-    }
-
-    public void testValidateParticipantIdsDiffer()
-        throws CryptoException
-    {
-        JPAKEUtil.validateParticipantIdsDiffer("a", "b");
-        JPAKEUtil.validateParticipantIdsDiffer("a", "A");
-
-        try
-        {
-            JPAKEUtil.validateParticipantIdsDiffer("a", "a");
-            fail();
-        }
-        catch (CryptoException e)
-        {
-            // pass
-        }
-    }
-
-    public void testValidateParticipantIdsEqual()
-        throws CryptoException
-    {
-        JPAKEUtil.validateParticipantIdsEqual("a", "a");
-
-        try
-        {
-            JPAKEUtil.validateParticipantIdsEqual("a", "b");
-            fail();
-        }
-        catch (CryptoException e)
-        {
-            // pass
-        }
-    }
-
-    public void testValidateMacTag()
-        throws CryptoException
-    {
-        JPAKEPrimeOrderGroup pg1 = JPAKEPrimeOrderGroups.SUN_JCE_1024;
-
-        SecureRandom random = new SecureRandom();
-        Digest digest = new SHA256Digest();
-
-        BigInteger x1 = JPAKEUtil.generateX1(pg1.getQ(), random);
-        BigInteger x2 = JPAKEUtil.generateX2(pg1.getQ(), random);
-        BigInteger x3 = JPAKEUtil.generateX1(pg1.getQ(), random);
-        BigInteger x4 = JPAKEUtil.generateX2(pg1.getQ(), random);
-
-        BigInteger gx1 = JPAKEUtil.calculateGx(pg1.getP(), pg1.getG(), x1);
-        BigInteger gx2 = JPAKEUtil.calculateGx(pg1.getP(), pg1.getG(), x2);
-        BigInteger gx3 = JPAKEUtil.calculateGx(pg1.getP(), pg1.getG(), x3);
-        BigInteger gx4 = JPAKEUtil.calculateGx(pg1.getP(), pg1.getG(), x4);
-
-        BigInteger gB = JPAKEUtil.calculateGA(pg1.getP(), gx3, gx1, gx2);
-
-        BigInteger s = JPAKEUtil.calculateS("password".toCharArray());
-
-        BigInteger xs = JPAKEUtil.calculateX2s(pg1.getQ(), x4, s);
-
-        BigInteger B = JPAKEUtil.calculateA(pg1.getP(), pg1.getQ(), gB, xs);
-
-        BigInteger keyingMaterial = JPAKEUtil.calculateKeyingMaterial(pg1.getP(), pg1.getQ(), gx4, x2, s, B);
-
-        BigInteger macTag = JPAKEUtil.calculateMacTag("participantId", "partnerParticipantId", gx1, gx2, gx3, gx4, keyingMaterial, digest);
-
-        // should succed
-        JPAKEUtil.validateMacTag("partnerParticipantId", "participantId", gx3, gx4, gx1, gx2, keyingMaterial, digest, macTag);
-
-        // validating own macTag (as opposed to the other party's mactag)
-        try
-        {
-            JPAKEUtil.validateMacTag("participantId", "partnerParticipantId", gx1, gx2, gx3, gx4, keyingMaterial, digest, macTag);
-            fail();
-        }
-        catch (CryptoException e)
-        {
-            // pass
-        }
-
-        // participant ids switched
-        try
-        {
-            JPAKEUtil.validateMacTag("participantId", "partnerParticipantId", gx3, gx4, gx1, gx2, keyingMaterial, digest, macTag);
-            fail();
-        }
-        catch (CryptoException e)
-        {
-            // pass
-        }
-    }
-
-    public void testValidateNotNull()
-    {
-        JPAKEUtil.validateNotNull("a", "description");
-
-        try
-        {
-            JPAKEUtil.validateNotNull(null, "description");
-            fail();
-        }
-        catch (NullPointerException e)
-        {
-            // pass
-        }
-    }
-
-    public void testValidateZeroKnowledgeProof()
-        throws CryptoException
-    {
-        JPAKEPrimeOrderGroup pg1 = JPAKEPrimeOrderGroups.SUN_JCE_1024;
-
-        SecureRandom random = new SecureRandom();
-        Digest digest1 = new SHA256Digest();
-
-        BigInteger x1 = JPAKEUtil.generateX1(pg1.getQ(), random);
-        BigInteger gx1 = JPAKEUtil.calculateGx(pg1.getP(), pg1.getG(), x1);
-        String participantId1 = "participant1";
-
-        BigInteger[] zkp1 = JPAKEUtil.calculateZeroKnowledgeProof(pg1.getP(), pg1.getQ(), pg1.getG(), gx1, x1, participantId1, digest1, random);
-
-        // should succeed
-        JPAKEUtil.validateZeroKnowledgeProof(pg1.getP(), pg1.getQ(), pg1.getG(), gx1, zkp1, participantId1, digest1);
-
-        // wrong group
-        JPAKEPrimeOrderGroup pg2 = JPAKEPrimeOrderGroups.NIST_3072;
-        try
-        {
-            JPAKEUtil.validateZeroKnowledgeProof(pg2.getP(), pg2.getQ(), pg2.getG(), gx1, zkp1, participantId1, digest1);
-            fail();
-        }
-        catch (CryptoException e)
-        {
-            // pass
-        }
-
-        // wrong digest
-        Digest digest2 = new SHA1Digest();
-        try
-        {
-            JPAKEUtil.validateZeroKnowledgeProof(pg1.getP(), pg1.getQ(), pg1.getG(), gx1, zkp1, participantId1, digest2);
-            fail();
-        }
-        catch (CryptoException e)
-        {
-            // pass
-        }
-
-        // wrong participant
-        String participantId2 = "participant2";
-        try
-        {
-            JPAKEUtil.validateZeroKnowledgeProof(pg1.getP(), pg1.getQ(), pg1.getG(), gx1, zkp1, participantId2, digest1);
-            fail();
-        }
-        catch (CryptoException e)
-        {
-            // pass
-        }
-
-        // wrong gx
-        BigInteger x2 = JPAKEUtil.generateX1(pg1.getQ(), random);
-        BigInteger gx2 = JPAKEUtil.calculateGx(pg1.getP(), pg1.getG(), x2);
-        try
-        {
-            JPAKEUtil.validateZeroKnowledgeProof(pg1.getP(), pg1.getQ(), pg1.getG(), gx2, zkp1, participantId1, digest1);
-            fail();
-        }
-        catch (CryptoException e)
-        {
-            // pass
-        }
-
-        // wrong zkp
-        BigInteger[] zkp2 = JPAKEUtil.calculateZeroKnowledgeProof(pg1.getP(), pg1.getQ(), pg1.getG(), gx2, x2, participantId1, digest1, random);
-        try
-        {
-            JPAKEUtil.validateZeroKnowledgeProof(pg1.getP(), pg1.getQ(), pg1.getG(), gx1, zkp2, participantId1, digest1);
-            fail();
-        }
-        catch (CryptoException e)
-        {
-            // pass
-        }
-
-        // gx <= 0
-        try
-        {
-            JPAKEUtil.validateZeroKnowledgeProof(pg1.getP(), pg1.getQ(), pg1.getG(), BigInteger.ZERO, zkp1, participantId1, digest1);
-            fail();
-        }
-        catch (CryptoException e)
-        {
-            // pass
-        }
-
-        // gx >= p
-        try
-        {
-            JPAKEUtil.validateZeroKnowledgeProof(pg1.getP(), pg1.getQ(), pg1.getG(), pg1.getP(), zkp1, participantId1, digest1);
-            fail();
-        }
-        catch (CryptoException e)
-        {
-            // pass
-        }
-
-        // gx mod q == 1
-        try
-        {
-            JPAKEUtil.validateZeroKnowledgeProof(pg1.getP(), pg1.getQ(), pg1.getG(), pg1.getQ().add(BigInteger.ONE), zkp1, participantId1, digest1);
-            fail();
-        }
-        catch (CryptoException e)
-        {
-            // pass
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/commitments/GeneralHashCommitter.java b/bcprov/src/main/java/org/bouncycastle/crypto/commitments/GeneralHashCommitter.java
deleted file mode 100644
index 3969fe8..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/commitments/GeneralHashCommitter.java
+++ /dev/null
@@ -1,93 +0,0 @@
-package org.bouncycastle.crypto.commitments;
-
-import java.security.SecureRandom;
-
-import org.bouncycastle.crypto.Commitment;
-import org.bouncycastle.crypto.Committer;
-import org.bouncycastle.crypto.DataLengthException;
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.ExtendedDigest;
-import org.bouncycastle.util.Arrays;
-
-/**
- * A basic hash-committer based on the one described in "Making Mix Nets Robust for Electronic Voting by Randomized Partial Checking",
- * by Jakobsson, Juels, and Rivest (11th Usenix Security Symposium, 2002).
- * <p>
- * The algorithm used by this class differs from the one given in that it includes the length of the message in the hash calculation.
- * </p>
- */
-public class GeneralHashCommitter
-    implements Committer
-{
-    private final Digest digest;
-    private final int byteLength;
-    private final SecureRandom random;
-
-    /**
-     * Base Constructor. The maximum message length that can be committed to is half the length of the internal
-     * block size for the digest (ExtendedDigest.getBlockLength()).
-     *
-     * @param digest digest to use for creating commitments.
-     * @param random source of randomness for generating secrets.
-     */
-    public GeneralHashCommitter(ExtendedDigest digest, SecureRandom random)
-    {
-        this.digest = digest;
-        this.byteLength = digest.getByteLength();
-        this.random = random;
-    }
-
-    /**
-     * Generate a commitment for the passed in message.
-     *
-     * @param message the message to be committed to,
-     * @return a Commitment
-     */
-    public Commitment commit(byte[] message)
-    {
-        if (message.length > byteLength / 2)
-        {
-            throw new DataLengthException("Message to be committed to too large for digest.");
-        }
-
-        byte[] w = new byte[byteLength - message.length];
-
-        random.nextBytes(w);
-
-        return new Commitment(w, calculateCommitment(w, message));
-    }
-
-    /**
-     * Return true if the passed in commitment represents a commitment to the passed in message.
-     *
-     * @param commitment a commitment previously generated.
-     * @param message the message that was expected to have been committed to.
-     * @return true if commitment matches message, false otherwise.
-     */
-    public boolean isRevealed(Commitment commitment, byte[] message)
-    {
-        if (message.length + commitment.getSecret().length != byteLength)
-        {
-            throw new DataLengthException("Message and witness secret lengths do not match.");
-        }
-
-        byte[] calcCommitment = calculateCommitment(commitment.getSecret(), message);
-
-        return Arrays.constantTimeAreEqual(commitment.getCommitment(), calcCommitment);
-    }
-
-    private byte[] calculateCommitment(byte[] w, byte[] message)
-    {
-        byte[] commitment = new byte[digest.getDigestSize()];
-
-        digest.update(w, 0, w.length);
-        digest.update(message, 0, message.length);
-
-        digest.update((byte)((message.length >>> 8)));
-        digest.update((byte)(message.length));
-
-        digest.doFinal(commitment, 0);
-
-        return commitment;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/commitments/HashCommitter.java b/bcprov/src/main/java/org/bouncycastle/crypto/commitments/HashCommitter.java
deleted file mode 100644
index b5860b5..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/commitments/HashCommitter.java
+++ /dev/null
@@ -1,89 +0,0 @@
-package org.bouncycastle.crypto.commitments;
-
-import java.security.SecureRandom;
-
-import org.bouncycastle.crypto.Commitment;
-import org.bouncycastle.crypto.Committer;
-import org.bouncycastle.crypto.DataLengthException;
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.ExtendedDigest;
-import org.bouncycastle.util.Arrays;
-
-/**
- * A basic hash-committer as described in "Making Mix Nets Robust for Electronic Voting by Randomized Partial Checking",
- * by Jakobsson, Juels, and Rivest (11th Usenix Security Symposium, 2002).
- * <p>
- * Use this class if you can enforce fixed length for messages. If you need something more general, use the GeneralHashCommitter.
- * </p>
- */
-public class HashCommitter
-    implements Committer
-{
-    private final Digest digest;
-    private final int byteLength;
-    private final SecureRandom random;
-
-    /**
-     * Base Constructor. The maximum message length that can be committed to is half the length of the internal
-     * block size for the digest (ExtendedDigest.getBlockLength()).
-     *
-     * @param digest digest to use for creating commitments.
-     * @param random source of randomness for generating secrets.
-     */
-    public HashCommitter(ExtendedDigest digest, SecureRandom random)
-    {
-        this.digest = digest;
-        this.byteLength = digest.getByteLength();
-        this.random = random;
-    }
-
-    /**
-     * Generate a commitment for the passed in message.
-     *
-     * @param message the message to be committed to,
-     * @return a Commitment
-     */
-    public Commitment commit(byte[] message)
-    {
-        if (message.length > byteLength / 2)
-        {
-            throw new DataLengthException("Message to be committed to too large for digest.");
-        }
-
-        byte[] w = new byte[byteLength - message.length];
-
-        random.nextBytes(w);
-
-        return new Commitment(w, calculateCommitment(w, message));
-    }
-
-    /**
-     * Return true if the passed in commitment represents a commitment to the passed in message.
-     *
-     * @param commitment a commitment previously generated.
-     * @param message the message that was expected to have been committed to.
-     * @return true if commitment matches message, false otherwise.
-     */
-    public boolean isRevealed(Commitment commitment, byte[] message)
-    {
-        if (message.length + commitment.getSecret().length != byteLength)
-        {
-            throw new DataLengthException("Message and witness secret lengths do not match.");
-        }
-
-        byte[] calcCommitment = calculateCommitment(commitment.getSecret(), message);
-
-        return Arrays.constantTimeAreEqual(commitment.getCommitment(), calcCommitment);
-    }
-
-    private byte[] calculateCommitment(byte[] w, byte[] message)
-    {
-        byte[] commitment = new byte[digest.getDigestSize()];
-
-        digest.update(w, 0, w.length);
-        digest.update(message, 0, message.length);
-        digest.doFinal(commitment, 0);
-
-        return commitment;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/commitments/package.html b/bcprov/src/main/java/org/bouncycastle/crypto/commitments/package.html
deleted file mode 100644
index 5bab3fc..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/commitments/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body bgcolor="#ffffff">
-Classes for supporting commitment calculation.
-</body>
-</html>
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/digests/GOST3411Digest.java b/bcprov/src/main/java/org/bouncycastle/crypto/digests/GOST3411Digest.java
deleted file mode 100644
index 2df2d51..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/digests/GOST3411Digest.java
+++ /dev/null
@@ -1,362 +0,0 @@
-package org.bouncycastle.crypto.digests;
-
-import org.bouncycastle.crypto.BlockCipher;
-import org.bouncycastle.crypto.ExtendedDigest;
-import org.bouncycastle.crypto.engines.GOST28147Engine;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.crypto.params.ParametersWithSBox;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.Memoable;
-import org.bouncycastle.util.Pack;
-
-/**
- * implementation of GOST R 34.11-94
- */
-public class GOST3411Digest
-    implements ExtendedDigest, Memoable
-{
-    private static final int    DIGEST_LENGTH = 32;
-
-    private byte[]   H = new byte[32], L = new byte[32],
-                     M = new byte[32], Sum = new byte[32];
-    private byte[][] C = new byte[4][32];
-
-    private byte[]  xBuf = new byte[32];
-    private int  xBufOff;
-    private long byteCount;
-    
-    private BlockCipher cipher = new GOST28147Engine();
-    private byte[] sBox;
-
-    /**
-     * Standard constructor
-     */
-    public GOST3411Digest()
-    {
-        sBox = GOST28147Engine.getSBox("D-A");
-        cipher.init(true, new ParametersWithSBox(null, sBox));
-
-        reset();
-    }
-
-    /**
-     * Constructor to allow use of a particular sbox with GOST28147
-     * @see GOST28147Engine#getSBox(String)
-     */
-    public GOST3411Digest(byte[] sBoxParam)
-    {
-        sBox = Arrays.clone(sBoxParam);
-        cipher.init(true, new ParametersWithSBox(null, sBox));
-
-        reset();
-    }
-
-    /**
-     * Copy constructor.  This will copy the state of the provided
-     * message digest.
-     */
-    public GOST3411Digest(GOST3411Digest t)
-    {
-        reset(t);
-    }
-
-    public String getAlgorithmName()
-    {
-        return "GOST3411";
-    }
-
-    public int getDigestSize()
-    {
-        return DIGEST_LENGTH;
-    }
-
-    public void update(byte in)
-    {
-        xBuf[xBufOff++] = in;
-        if (xBufOff == xBuf.length)
-        {
-            sumByteArray(xBuf); // calc sum M
-            processBlock(xBuf, 0);
-            xBufOff = 0;
-        }
-        byteCount++;
-    }
-
-    public void update(byte[] in, int inOff, int len)
-    {
-        while ((xBufOff != 0) && (len > 0))
-        {
-            update(in[inOff]);
-            inOff++;
-            len--;
-        }
-
-        while (len > xBuf.length)
-        {
-            System.arraycopy(in, inOff, xBuf, 0, xBuf.length);
-
-            sumByteArray(xBuf); // calc sum M
-            processBlock(xBuf, 0);
-            inOff += xBuf.length;
-            len -= xBuf.length;
-            byteCount += xBuf.length;
-        }
-
-        // load in the remainder.
-        while (len > 0)
-        {
-            update(in[inOff]);
-            inOff++;
-            len--;
-        }
-    }
-
-    // (i + 1 + 4(k - 1)) = 8i + k      i = 0-3, k = 1-8
-    private byte[] K = new byte[32];
-
-    private byte[] P(byte[] in)
-    {
-        for(int k = 0; k < 8; k++)
-        {
-            K[4*k] = in[k];
-            K[1 + 4*k] = in[ 8 + k];
-            K[2 + 4*k] = in[16 + k];
-            K[3 + 4*k] = in[24 + k];
-        }
-
-        return K;
-    }
-
-    //A (x) = (x0 ^ x1) || x3 || x2 || x1
-    byte[] a = new byte[8];
-    private byte[] A(byte[] in)
-    {
-        for(int j=0; j<8; j++)
-        {
-            a[j]=(byte)(in[j] ^ in[j+8]);
-        }
-
-        System.arraycopy(in, 8, in, 0, 24);
-        System.arraycopy(a, 0, in, 24, 8);
-
-        return in;
-    }
-
-    //Encrypt function, ECB mode
-    private void E(byte[] key, byte[] s, int sOff, byte[] in, int inOff)
-    {
-        cipher.init(true, new KeyParameter(key));
-        
-        cipher.processBlock(in, inOff, s, sOff);
-    }
-
-    // (in:) n16||..||n1 ==> (out:) n1^n2^n3^n4^n13^n16||n16||..||n2
-    short[] wS = new short[16], w_S = new short[16];
-
-    private void fw(byte[] in)
-    {
-        cpyBytesToShort(in, wS);
-        w_S[15] = (short)(wS[0] ^ wS[1] ^ wS[2] ^ wS[3] ^ wS[12] ^ wS[15]);
-        System.arraycopy(wS, 1, w_S, 0, 15);
-        cpyShortToBytes(w_S, in);
-    }
-
-    // block processing
-    byte[] S = new byte[32];
-    byte[] U = new byte[32], V = new byte[32], W = new byte[32];
-
-    protected void processBlock(byte[] in, int inOff)
-    {
-        System.arraycopy(in, inOff, M, 0, 32);
-
-        //key step 1
- 
-        // H = h3 || h2 || h1 || h0
-        // S = s3 || s2 || s1 || s0
-        System.arraycopy(H, 0, U, 0, 32);
-        System.arraycopy(M, 0, V, 0, 32);
-        for (int j=0; j<32; j++)
-        {
-            W[j] = (byte)(U[j]^V[j]);
-        }
-        // Encrypt gost28147-ECB
-        E(P(W), S, 0, H, 0); // s0 = EK0 [h0]
-
-        //keys step 2,3,4
-        for (int i=1; i<4; i++)
-        {
-            byte[] tmpA = A(U);
-            for (int j=0; j<32; j++)
-            {
-                U[j] = (byte)(tmpA[j] ^ C[i][j]);
-            }
-            V = A(A(V));
-            for (int j=0; j<32; j++)
-            {
-                W[j] = (byte)(U[j]^V[j]);
-            }
-            // Encrypt gost28147-ECB
-            E(P(W), S, i * 8, H, i * 8); // si = EKi [hi]
-        }
-
-        // x(M, H) = y61(H^y(M^y12(S)))
-        for(int n = 0; n < 12; n++)
-        {
-            fw(S);
-        }
-        for(int n = 0; n < 32; n++)
-        {
-            S[n] = (byte)(S[n] ^ M[n]);
-        }
-
-        fw(S);
-
-        for(int n = 0; n < 32; n++)
-        {
-            S[n] = (byte)(H[n] ^ S[n]);
-        }
-        for(int n = 0; n < 61; n++)
-        {
-            fw(S);
-        }
-        System.arraycopy(S, 0, H, 0, H.length);
-    }
-
-    private void finish()
-    {
-        Pack.longToLittleEndian(byteCount * 8, L, 0); // get length into L (byteCount * 8 = bitCount)
-
-        while (xBufOff != 0)
-        {
-            update((byte)0);
-        }
-
-        processBlock(L, 0);
-        processBlock(Sum, 0);
-    }
-
-    public int doFinal(
-        byte[]  out,
-        int     outOff)
-    {
-        finish();
-
-        System.arraycopy(H, 0, out, outOff, H.length);
-
-        reset();
-
-        return DIGEST_LENGTH;
-    }
-
-    /**
-     * reset the chaining variables to the IV values.
-     */
-    private static final byte[]  C2 = {
-       0x00,(byte)0xFF,0x00,(byte)0xFF,0x00,(byte)0xFF,0x00,(byte)0xFF,
-       (byte)0xFF,0x00,(byte)0xFF,0x00,(byte)0xFF,0x00,(byte)0xFF,0x00,
-       0x00,(byte)0xFF,(byte)0xFF,0x00,(byte)0xFF,0x00,0x00,(byte)0xFF,
-       (byte)0xFF,0x00,0x00,0x00,(byte)0xFF,(byte)0xFF,0x00,(byte)0xFF};
-
-    public void reset()
-    {
-        byteCount = 0;
-        xBufOff = 0;
-
-        for(int i=0; i<H.length; i++)
-        {
-            H[i] = 0;  // start vector H
-        }
-        for(int i=0; i<L.length; i++)
-        {
-            L[i] = 0;
-        }
-        for(int i=0; i<M.length; i++)
-        {
-            M[i] = 0;
-        }
-        for(int i=0; i<C[1].length; i++)
-        {
-            C[1][i] = 0;  // real index C = +1 because index array with 0.
-        }
-        for(int i=0; i<C[3].length; i++)
-        {
-            C[3][i] = 0;
-        }
-        for(int i=0; i<Sum.length; i++)
-        {
-            Sum[i] = 0;
-        }
-        for(int i = 0; i < xBuf.length; i++)
-        {
-            xBuf[i] = 0;
-        }
-
-        System.arraycopy(C2, 0, C[2], 0, C2.length);
-    }
-
-    //  256 bitsblock modul -> (Sum + a mod (2^256))
-    private void sumByteArray(byte[] in)
-    {
-        int carry = 0;
-
-        for (int i = 0; i != Sum.length; i++)
-        {
-            int sum = (Sum[i] & 0xff) + (in[i] & 0xff) + carry;
-
-            Sum[i] = (byte)sum;
-
-            carry = sum >>> 8;
-        }
-    }
-
-    private void cpyBytesToShort(byte[] S, short[] wS)
-    {
-        for(int i=0; i<S.length/2; i++)
-        {
-            wS[i] = (short)(((S[i*2+1]<<8)&0xFF00)|(S[i*2]&0xFF));
-        }
-    }
-
-    private void cpyShortToBytes(short[] wS, byte[] S)
-    {
-        for(int i=0; i<S.length/2; i++) 
-        {
-            S[i*2 + 1] = (byte)(wS[i] >> 8);
-            S[i*2] = (byte)wS[i];
-        }
-    }
-
-   public int getByteLength() 
-   {
-      return 32;
-   }
-
-    public Memoable copy()
-    {
-        return new GOST3411Digest(this);
-    }
-
-    public void reset(Memoable other)
-    {
-        GOST3411Digest t = (GOST3411Digest)other;
-
-        this.sBox = t.sBox;
-        cipher.init(true, new ParametersWithSBox(null, sBox));
-
-        reset();
-
-        System.arraycopy(t.H, 0, this.H, 0, t.H.length);
-        System.arraycopy(t.L, 0, this.L, 0, t.L.length);
-        System.arraycopy(t.M, 0, this.M, 0, t.M.length);
-        System.arraycopy(t.Sum, 0, this.Sum, 0, t.Sum.length);
-        System.arraycopy(t.C[1], 0, this.C[1], 0, t.C[1].length);
-        System.arraycopy(t.C[2], 0, this.C[2], 0, t.C[2].length);
-        System.arraycopy(t.C[3], 0, this.C[3], 0, t.C[3].length);
-        System.arraycopy(t.xBuf, 0, this.xBuf, 0, t.xBuf.length);
-
-        this.xBufOff = t.xBufOff;
-        this.byteCount = t.byteCount;
-    }
-}
-
-
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/digests/MD2Digest.java b/bcprov/src/main/java/org/bouncycastle/crypto/digests/MD2Digest.java
deleted file mode 100644
index f96b4a1..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/digests/MD2Digest.java
+++ /dev/null
@@ -1,258 +0,0 @@
-package org.bouncycastle.crypto.digests;
-
-import org.bouncycastle.crypto.*;
-import org.bouncycastle.util.Memoable;
-
-/**
- * implementation of MD2
- * as outlined in RFC1319 by B.Kaliski from RSA Laboratories April 1992
- */
-public class MD2Digest
-    implements ExtendedDigest, Memoable
-{
-    private static final int DIGEST_LENGTH = 16;
-
-    /* X buffer */
-    private byte[]   X = new byte[48];
-    private int     xOff;
-    /* M buffer */
-    private byte[]   M = new byte[16];
-    private int     mOff;
-    /* check sum */
-    private byte[]   C = new byte[16];
-    private int COff;
-
-    public MD2Digest()
-    {
-        reset();
-    }
-
-    public MD2Digest(MD2Digest t)
-    {
-        copyIn(t);
-    }
-
-    private void copyIn(MD2Digest t)
-    {
-        System.arraycopy(t.X, 0, X, 0, t.X.length);
-        xOff = t.xOff;
-        System.arraycopy(t.M, 0, M, 0, t.M.length);
-        mOff = t.mOff;
-        System.arraycopy(t.C, 0, C, 0, t.C.length);
-        COff = t.COff;
-    }
-
-    /**
-     * return the algorithm name
-     *
-     * @return the algorithm name
-     */
-    public String getAlgorithmName()
-    {
-        return "MD2";
-    }
-    /**
-     * return the size, in bytes, of the digest produced by this message digest.
-     *
-     * @return the size, in bytes, of the digest produced by this message digest.
-     */
-    public int getDigestSize()
-    {
-        return DIGEST_LENGTH;
-    }
-    /**
-     * close the digest, producing the final digest value. The doFinal
-     * call leaves the digest reset.
-     *
-     * @param out the array the digest is to be copied into.
-     * @param outOff the offset into the out array the digest is to start at.
-     */
-    public int doFinal(byte[] out, int outOff)
-    {
-        // add padding
-        byte paddingByte = (byte)(M.length-mOff);
-        for (int i=mOff;i<M.length;i++)
-        {
-            M[i] = paddingByte;
-        }
-        //do final check sum
-        processCheckSum(M);
-        // do final block process
-        processBlock(M);
-
-        processBlock(C);
-
-        System.arraycopy(X,xOff,out,outOff,16);
-
-        reset();
-
-        return DIGEST_LENGTH;
-    }
-    /**
-     * reset the digest back to it's initial state.
-     */
-    public void reset()
-    {
-        xOff = 0;
-        for (int i = 0; i != X.length; i++)
-        {
-            X[i] = 0;
-        }
-        mOff = 0;
-        for (int i = 0; i != M.length; i++)
-        {
-            M[i] = 0;
-        }
-        COff = 0;
-        for (int i = 0; i != C.length; i++)
-        {
-            C[i] = 0;
-        }
-    }
-    /**
-     * update the message digest with a single byte.
-     *
-     * @param in the input byte to be entered.
-     */
-    public void update(byte in)
-    {
-        M[mOff++] = in;
-
-        if (mOff == 16)
-        {
-            processCheckSum(M);
-            processBlock(M);
-            mOff = 0;
-        }
-    }
-
-    /**
-     * update the message digest with a block of bytes.
-     *
-     * @param in the byte array containing the data.
-     * @param inOff the offset into the byte array where the data starts.
-     * @param len the length of the data.
-     */
-    public void update(byte[] in, int inOff, int len)
-    {
-        //
-        // fill the current word
-        //
-        while ((mOff != 0) && (len > 0))
-        {
-            update(in[inOff]);
-            inOff++;
-            len--;
-        }
-
-        //
-        // process whole words.
-        //
-        while (len > 16)
-        {
-            System.arraycopy(in,inOff,M,0,16);
-            processCheckSum(M);
-            processBlock(M);
-            len -= 16;
-            inOff += 16;
-        }
-
-        //
-        // load in the remainder.
-        //
-        while (len > 0)
-        {
-            update(in[inOff]);
-            inOff++;
-            len--;
-        }
-    }
-    protected void processCheckSum(byte[] m)
-    {
-        int L = C[15];
-        for (int i=0;i<16;i++)
-        {
-            C[i] ^= S[(m[i] ^ L) & 0xff];
-            L = C[i];
-        }
-    }
-    protected void processBlock(byte[] m)
-    {
-        for (int i=0;i<16;i++)
-        {
-            X[i+16] = m[i];
-            X[i+32] = (byte)(m[i] ^ X[i]);
-        }
-        // encrypt block
-        int t = 0;
-
-        for (int j=0;j<18;j++)
-        {
-            for (int k=0;k<48;k++)
-            {
-                t = X[k] ^= S[t];
-                t = t & 0xff;
-            }
-            t = (t + j)%256;
-        }
-     }
-     // 256-byte random permutation constructed from the digits of PI
-    private static final byte[] S = {
-      (byte)41,(byte)46,(byte)67,(byte)201,(byte)162,(byte)216,(byte)124,
-      (byte)1,(byte)61,(byte)54,(byte)84,(byte)161,(byte)236,(byte)240,
-      (byte)6,(byte)19,(byte)98,(byte)167,(byte)5,(byte)243,(byte)192,
-      (byte)199,(byte)115,(byte)140,(byte)152,(byte)147,(byte)43,(byte)217,
-      (byte)188,(byte)76,(byte)130,(byte)202,(byte)30,(byte)155,(byte)87,
-      (byte)60,(byte)253,(byte)212,(byte)224,(byte)22,(byte)103,(byte)66,
-      (byte)111,(byte)24,(byte)138,(byte)23,(byte)229,(byte)18,(byte)190,
-      (byte)78,(byte)196,(byte)214,(byte)218,(byte)158,(byte)222,(byte)73,
-      (byte)160,(byte)251,(byte)245,(byte)142,(byte)187,(byte)47,(byte)238,
-      (byte)122,(byte)169,(byte)104,(byte)121,(byte)145,(byte)21,(byte)178,
-      (byte)7,(byte)63,(byte)148,(byte)194,(byte)16,(byte)137,(byte)11,
-      (byte)34,(byte)95,(byte)33,(byte)128,(byte)127,(byte)93,(byte)154,
-      (byte)90,(byte)144,(byte)50,(byte)39,(byte)53,(byte)62,(byte)204,
-      (byte)231,(byte)191,(byte)247,(byte)151,(byte)3,(byte)255,(byte)25,
-      (byte)48,(byte)179,(byte)72,(byte)165,(byte)181,(byte)209,(byte)215,
-      (byte)94,(byte)146,(byte)42,(byte)172,(byte)86,(byte)170,(byte)198,
-      (byte)79,(byte)184,(byte)56,(byte)210,(byte)150,(byte)164,(byte)125,
-      (byte)182,(byte)118,(byte)252,(byte)107,(byte)226,(byte)156,(byte)116,
-      (byte)4,(byte)241,(byte)69,(byte)157,(byte)112,(byte)89,(byte)100,
-      (byte)113,(byte)135,(byte)32,(byte)134,(byte)91,(byte)207,(byte)101,
-      (byte)230,(byte)45,(byte)168,(byte)2,(byte)27,(byte)96,(byte)37,
-      (byte)173,(byte)174,(byte)176,(byte)185,(byte)246,(byte)28,(byte)70,
-      (byte)97,(byte)105,(byte)52,(byte)64,(byte)126,(byte)15,(byte)85,
-      (byte)71,(byte)163,(byte)35,(byte)221,(byte)81,(byte)175,(byte)58,
-      (byte)195,(byte)92,(byte)249,(byte)206,(byte)186,(byte)197,(byte)234,
-      (byte)38,(byte)44,(byte)83,(byte)13,(byte)110,(byte)133,(byte)40,
-      (byte)132, 9,(byte)211,(byte)223,(byte)205,(byte)244,(byte)65,
-      (byte)129,(byte)77,(byte)82,(byte)106,(byte)220,(byte)55,(byte)200,
-      (byte)108,(byte)193,(byte)171,(byte)250,(byte)36,(byte)225,(byte)123,
-      (byte)8,(byte)12,(byte)189,(byte)177,(byte)74,(byte)120,(byte)136,
-      (byte)149,(byte)139,(byte)227,(byte)99,(byte)232,(byte)109,(byte)233,
-      (byte)203,(byte)213,(byte)254,(byte)59,(byte)0,(byte)29,(byte)57,
-      (byte)242,(byte)239,(byte)183,(byte)14,(byte)102,(byte)88,(byte)208,
-      (byte)228,(byte)166,(byte)119,(byte)114,(byte)248,(byte)235,(byte)117,
-      (byte)75,(byte)10,(byte)49,(byte)68,(byte)80,(byte)180,(byte)143,
-      (byte)237,(byte)31,(byte)26,(byte)219,(byte)153,(byte)141,(byte)51,
-      (byte)159,(byte)17,(byte)131,(byte)20
-    };
-
-   public int getByteLength()
-   {
-      return 16;
-   }
-
-    public Memoable copy()
-    {
-        return new MD2Digest(this);
-    }
-
-    public void reset(Memoable other)
-    {
-        MD2Digest d = (MD2Digest)other;
-
-        copyIn(d);
-    }
-}
-
-
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/digests/MD4Digest.java b/bcprov/src/main/java/org/bouncycastle/crypto/digests/MD4Digest.java
deleted file mode 100644
index 68532bd..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/digests/MD4Digest.java
+++ /dev/null
@@ -1,291 +0,0 @@
-package org.bouncycastle.crypto.digests;
-
-
-import org.bouncycastle.util.Memoable;
-
-/**
- * implementation of MD4 as RFC 1320 by R. Rivest, MIT Laboratory for
- * Computer Science and RSA Data Security, Inc.
- * <p>
- * <b>NOTE</b>: This algorithm is only included for backwards compatability
- * with legacy applications, it's not secure, don't use it for anything new!
- */
-public class MD4Digest
-    extends GeneralDigest
-{
-    private static final int    DIGEST_LENGTH = 16;
-
-    private int     H1, H2, H3, H4;         // IV's
-
-    private int[]   X = new int[16];
-    private int     xOff;
-
-    /**
-     * Standard constructor
-     */
-    public MD4Digest()
-    {
-        reset();
-    }
-
-    /**
-     * Copy constructor.  This will copy the state of the provided
-     * message digest.
-     */
-    public MD4Digest(MD4Digest t)
-    {
-        super(t);
-
-        copyIn(t);
-    }
-
-    private void copyIn(MD4Digest t)
-    {
-        super.copyIn(t);
-
-        H1 = t.H1;
-        H2 = t.H2;
-        H3 = t.H3;
-        H4 = t.H4;
-
-        System.arraycopy(t.X, 0, X, 0, t.X.length);
-        xOff = t.xOff;
-    }
-
-    public String getAlgorithmName()
-    {
-        return "MD4";
-    }
-
-    public int getDigestSize()
-    {
-        return DIGEST_LENGTH;
-    }
-
-    protected void processWord(
-        byte[]  in,
-        int     inOff)
-    {
-        X[xOff++] = (in[inOff] & 0xff) | ((in[inOff + 1] & 0xff) << 8)
-            | ((in[inOff + 2] & 0xff) << 16) | ((in[inOff + 3] & 0xff) << 24); 
-
-        if (xOff == 16)
-        {
-            processBlock();
-        }
-    }
-
-    protected void processLength(
-        long    bitLength)
-    {
-        if (xOff > 14)
-        {
-            processBlock();
-        }
-
-        X[14] = (int)(bitLength & 0xffffffff);
-        X[15] = (int)(bitLength >>> 32);
-    }
-
-    private void unpackWord(
-        int     word,
-        byte[]  out,
-        int     outOff)
-    {
-        out[outOff]     = (byte)word;
-        out[outOff + 1] = (byte)(word >>> 8);
-        out[outOff + 2] = (byte)(word >>> 16);
-        out[outOff + 3] = (byte)(word >>> 24);
-    }
-
-    public int doFinal(
-        byte[]  out,
-        int     outOff)
-    {
-        finish();
-
-        unpackWord(H1, out, outOff);
-        unpackWord(H2, out, outOff + 4);
-        unpackWord(H3, out, outOff + 8);
-        unpackWord(H4, out, outOff + 12);
-
-        reset();
-
-        return DIGEST_LENGTH;
-    }
-
-    /**
-     * reset the chaining variables to the IV values.
-     */
-    public void reset()
-    {
-        super.reset();
-
-        H1 = 0x67452301;
-        H2 = 0xefcdab89;
-        H3 = 0x98badcfe;
-        H4 = 0x10325476;
-
-        xOff = 0;
-
-        for (int i = 0; i != X.length; i++)
-        {
-            X[i] = 0;
-        }
-    }
-
-    //
-    // round 1 left rotates
-    //
-    private static final int S11 = 3;
-    private static final int S12 = 7;
-    private static final int S13 = 11;
-    private static final int S14 = 19;
-
-    //
-    // round 2 left rotates
-    //
-    private static final int S21 = 3;
-    private static final int S22 = 5;
-    private static final int S23 = 9;
-    private static final int S24 = 13;
-
-    //
-    // round 3 left rotates
-    //
-    private static final int S31 = 3;
-    private static final int S32 = 9;
-    private static final int S33 = 11;
-    private static final int S34 = 15;
-
-    /*
-     * rotate int x left n bits.
-     */
-    private int rotateLeft(
-        int x,
-        int n)
-    {
-        return (x << n) | (x >>> (32 - n));
-    }
-
-    /*
-     * F, G, H and I are the basic MD4 functions.
-     */
-    private int F(
-        int u,
-        int v,
-        int w)
-    {
-        return (u & v) | (~u & w);
-    }
-
-    private int G(
-        int u,
-        int v,
-        int w)
-    {
-        return (u & v) | (u & w) | (v & w);
-    }
-
-    private int H(
-        int u,
-        int v,
-        int w)
-    {
-        return u ^ v ^ w;
-    }
-
-    protected void processBlock()
-    {
-        int a = H1;
-        int b = H2;
-        int c = H3;
-        int d = H4;
-
-        //
-        // Round 1 - F cycle, 16 times.
-        //
-        a = rotateLeft(a + F(b, c, d) + X[ 0], S11);
-        d = rotateLeft(d + F(a, b, c) + X[ 1], S12);
-        c = rotateLeft(c + F(d, a, b) + X[ 2], S13);
-        b = rotateLeft(b + F(c, d, a) + X[ 3], S14);
-        a = rotateLeft(a + F(b, c, d) + X[ 4], S11);
-        d = rotateLeft(d + F(a, b, c) + X[ 5], S12);
-        c = rotateLeft(c + F(d, a, b) + X[ 6], S13);
-        b = rotateLeft(b + F(c, d, a) + X[ 7], S14);
-        a = rotateLeft(a + F(b, c, d) + X[ 8], S11);
-        d = rotateLeft(d + F(a, b, c) + X[ 9], S12);
-        c = rotateLeft(c + F(d, a, b) + X[10], S13);
-        b = rotateLeft(b + F(c, d, a) + X[11], S14);
-        a = rotateLeft(a + F(b, c, d) + X[12], S11);
-        d = rotateLeft(d + F(a, b, c) + X[13], S12);
-        c = rotateLeft(c + F(d, a, b) + X[14], S13);
-        b = rotateLeft(b + F(c, d, a) + X[15], S14);
-
-        //
-        // Round 2 - G cycle, 16 times.
-        //
-        a = rotateLeft(a + G(b, c, d) + X[ 0] + 0x5a827999, S21);
-        d = rotateLeft(d + G(a, b, c) + X[ 4] + 0x5a827999, S22);
-        c = rotateLeft(c + G(d, a, b) + X[ 8] + 0x5a827999, S23);
-        b = rotateLeft(b + G(c, d, a) + X[12] + 0x5a827999, S24);
-        a = rotateLeft(a + G(b, c, d) + X[ 1] + 0x5a827999, S21);
-        d = rotateLeft(d + G(a, b, c) + X[ 5] + 0x5a827999, S22);
-        c = rotateLeft(c + G(d, a, b) + X[ 9] + 0x5a827999, S23);
-        b = rotateLeft(b + G(c, d, a) + X[13] + 0x5a827999, S24);
-        a = rotateLeft(a + G(b, c, d) + X[ 2] + 0x5a827999, S21);
-        d = rotateLeft(d + G(a, b, c) + X[ 6] + 0x5a827999, S22);
-        c = rotateLeft(c + G(d, a, b) + X[10] + 0x5a827999, S23);
-        b = rotateLeft(b + G(c, d, a) + X[14] + 0x5a827999, S24);
-        a = rotateLeft(a + G(b, c, d) + X[ 3] + 0x5a827999, S21);
-        d = rotateLeft(d + G(a, b, c) + X[ 7] + 0x5a827999, S22);
-        c = rotateLeft(c + G(d, a, b) + X[11] + 0x5a827999, S23);
-        b = rotateLeft(b + G(c, d, a) + X[15] + 0x5a827999, S24);
-
-        //
-        // Round 3 - H cycle, 16 times.
-        //
-        a = rotateLeft(a + H(b, c, d) + X[ 0] + 0x6ed9eba1, S31);
-        d = rotateLeft(d + H(a, b, c) + X[ 8] + 0x6ed9eba1, S32);
-        c = rotateLeft(c + H(d, a, b) + X[ 4] + 0x6ed9eba1, S33);
-        b = rotateLeft(b + H(c, d, a) + X[12] + 0x6ed9eba1, S34);
-        a = rotateLeft(a + H(b, c, d) + X[ 2] + 0x6ed9eba1, S31);
-        d = rotateLeft(d + H(a, b, c) + X[10] + 0x6ed9eba1, S32);
-        c = rotateLeft(c + H(d, a, b) + X[ 6] + 0x6ed9eba1, S33);
-        b = rotateLeft(b + H(c, d, a) + X[14] + 0x6ed9eba1, S34);
-        a = rotateLeft(a + H(b, c, d) + X[ 1] + 0x6ed9eba1, S31);
-        d = rotateLeft(d + H(a, b, c) + X[ 9] + 0x6ed9eba1, S32);
-        c = rotateLeft(c + H(d, a, b) + X[ 5] + 0x6ed9eba1, S33);
-        b = rotateLeft(b + H(c, d, a) + X[13] + 0x6ed9eba1, S34);
-        a = rotateLeft(a + H(b, c, d) + X[ 3] + 0x6ed9eba1, S31);
-        d = rotateLeft(d + H(a, b, c) + X[11] + 0x6ed9eba1, S32);
-        c = rotateLeft(c + H(d, a, b) + X[ 7] + 0x6ed9eba1, S33);
-        b = rotateLeft(b + H(c, d, a) + X[15] + 0x6ed9eba1, S34);
-
-        H1 += a;
-        H2 += b;
-        H3 += c;
-        H4 += d;
-
-        //
-        // reset the offset and clean out the word buffer.
-        //
-        xOff = 0;
-        for (int i = 0; i != X.length; i++)
-        {
-            X[i] = 0;
-        }
-    }
-
-    public Memoable copy()
-    {
-        return new MD4Digest(this);
-    }
-
-    public void reset(Memoable other)
-    {
-        MD4Digest d = (MD4Digest)other;
-
-        copyIn(d);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/digests/NonMemoableDigest.java b/bcprov/src/main/java/org/bouncycastle/crypto/digests/NonMemoableDigest.java
deleted file mode 100644
index 87a4d24..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/digests/NonMemoableDigest.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package org.bouncycastle.crypto.digests;
-
-import org.bouncycastle.crypto.ExtendedDigest;
-
-/**
- * Wrapper removes exposure to the Memoable interface on an ExtendedDigest implementation.
- */
-public class NonMemoableDigest
-    implements ExtendedDigest
-{
-    private ExtendedDigest baseDigest;
-
-    /**
-     * Base constructor.
-     *
-     * @param baseDigest underlying digest to use.
-     * @exception IllegalArgumentException if baseDigest is null
-     */
-    public NonMemoableDigest(
-        ExtendedDigest baseDigest)
-    {
-        if (baseDigest == null)
-        {
-            throw new IllegalArgumentException("baseDigest must not be null");
-        }
-
-        this.baseDigest = baseDigest;
-    }
-    
-    public String getAlgorithmName()
-    {
-        return baseDigest.getAlgorithmName();
-    }
-
-    public int getDigestSize()
-    {
-        return baseDigest.getDigestSize();
-    }
-
-    public void update(byte in)
-    {
-        baseDigest.update(in);
-    }
-
-    public void update(byte[] in, int inOff, int len)
-    {
-        baseDigest.update(in, inOff, len);
-    }
-
-    public int doFinal(byte[] out, int outOff)
-    {
-        return baseDigest.doFinal(out, outOff);
-    }
-
-    public void reset()
-    {
-        baseDigest.reset();
-    }
-
-    public int getByteLength()
-    {
-        return baseDigest.getByteLength();
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/digests/RIPEMD128Digest.java b/bcprov/src/main/java/org/bouncycastle/crypto/digests/RIPEMD128Digest.java
deleted file mode 100644
index ec7fa85..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/digests/RIPEMD128Digest.java
+++ /dev/null
@@ -1,482 +0,0 @@
-package org.bouncycastle.crypto.digests;
-
-
-import org.bouncycastle.util.Memoable;
-
-/**
- * implementation of RIPEMD128
- */
-public class RIPEMD128Digest
-    extends GeneralDigest
-{
-    private static final int DIGEST_LENGTH = 16;
-
-    private int H0, H1, H2, H3; // IV's
-
-    private int[] X = new int[16];
-    private int xOff;
-
-    /**
-     * Standard constructor
-     */
-    public RIPEMD128Digest()
-    {
-        reset();
-    }
-
-    /**
-     * Copy constructor.  This will copy the state of the provided
-     * message digest.
-     */
-    public RIPEMD128Digest(RIPEMD128Digest t)
-    {
-        super(t);
-
-        copyIn(t);
-    }
-
-    private void copyIn(RIPEMD128Digest t)
-    {
-        super.copyIn(t);
-
-        H0 = t.H0;
-        H1 = t.H1;
-        H2 = t.H2;
-        H3 = t.H3;
-
-        System.arraycopy(t.X, 0, X, 0, t.X.length);
-        xOff = t.xOff;
-    }
-
-    public String getAlgorithmName()
-    {
-        return "RIPEMD128";
-    }
-
-    public int getDigestSize()
-    {
-        return DIGEST_LENGTH;
-    }
-
-    protected void processWord(
-        byte[] in,
-        int inOff)
-    {
-        X[xOff++] = (in[inOff] & 0xff) | ((in[inOff + 1] & 0xff) << 8)
-            | ((in[inOff + 2] & 0xff) << 16) | ((in[inOff + 3] & 0xff) << 24); 
-
-        if (xOff == 16)
-        {
-            processBlock();
-        }
-    }
-
-    protected void processLength(
-        long bitLength)
-    {
-        if (xOff > 14)
-        {
-        processBlock();
-        }
-
-        X[14] = (int)(bitLength & 0xffffffff);
-        X[15] = (int)(bitLength >>> 32);
-    }
-
-    private void unpackWord(
-        int word,
-        byte[] out,
-        int outOff)
-    {
-        out[outOff]     = (byte)word;
-        out[outOff + 1] = (byte)(word >>> 8);
-        out[outOff + 2] = (byte)(word >>> 16);
-        out[outOff + 3] = (byte)(word >>> 24);
-    }
-
-    public int doFinal(
-        byte[] out,
-        int outOff)
-    {
-        finish();
-
-        unpackWord(H0, out, outOff);
-        unpackWord(H1, out, outOff + 4);
-        unpackWord(H2, out, outOff + 8);
-        unpackWord(H3, out, outOff + 12);
-
-        reset();
-
-        return DIGEST_LENGTH;
-    }
-
-    /**
-    * reset the chaining variables to the IV values.
-    */
-    public void reset()
-    {
-        super.reset();
-
-        H0 = 0x67452301;
-        H1 = 0xefcdab89;
-        H2 = 0x98badcfe;
-        H3 = 0x10325476;
-
-        xOff = 0;
-
-        for (int i = 0; i != X.length; i++)
-        {
-            X[i] = 0;
-        }
-    }
-
-    /*
-     * rotate int x left n bits.
-     */
-    private int RL(
-        int x,
-        int n)
-    {
-        return (x << n) | (x >>> (32 - n));
-    }
-
-    /*
-     * f1,f2,f3,f4 are the basic RIPEMD128 functions.
-     */
-
-    /*
-     * F
-     */
-    private int f1(
-        int x,
-        int y,
-        int z)
-    {
-        return x ^ y ^ z;
-    }
-
-    /*
-     * G
-     */
-    private int f2(
-        int x,
-        int y,
-        int z)
-    {
-        return (x & y) | (~x & z);
-    }
-
-    /*
-     * H
-     */
-    private int f3(
-        int x,
-        int y,
-        int z)
-    {
-        return (x | ~y) ^ z;
-    }
-
-    /*
-     * I
-     */
-    private int f4(
-        int x,
-        int y,
-        int z)
-    {
-        return (x & z) | (y & ~z);
-    }
-
-    private int F1(
-        int a,
-        int b,
-        int c,
-        int d,
-        int x,
-        int s)
-    {
-        return RL(a + f1(b, c, d) + x, s);
-    }
-
-    private int F2(
-        int a,
-        int b,
-        int c,
-        int d,
-        int x,
-        int s)
-    {
-        return RL(a + f2(b, c, d) + x + 0x5a827999, s);
-    }
-
-    private int F3(
-        int a,
-        int b,
-        int c,
-        int d,
-        int x,
-        int s)
-    {
-        return RL(a + f3(b, c, d) + x + 0x6ed9eba1, s);
-    }
-
-    private int F4(
-        int a,
-        int b,
-        int c,
-        int d,
-        int x,
-        int s)
-    {
-        return RL(a + f4(b, c, d) + x + 0x8f1bbcdc, s);
-    }
-
-    private int FF1(
-        int a,
-        int b,
-        int c,
-        int d,
-        int x,
-        int s)
-    {
-        return RL(a + f1(b, c, d) + x, s);
-    }
-
-    private int FF2(
-        int a,
-        int b,
-        int c,
-        int d,
-        int x,
-        int s)
-    {
-      return RL(a + f2(b, c, d) + x + 0x6d703ef3, s);
-    }
-
-    private int FF3(
-        int a,
-        int b,
-        int c,
-        int d,
-        int x,
-        int s)
-    {
-      return RL(a + f3(b, c, d) + x + 0x5c4dd124, s);
-    }
-
-    private int FF4(
-        int a,
-        int b,
-        int c,
-        int d,
-        int x,
-        int s)
-    {
-      return RL(a + f4(b, c, d) + x + 0x50a28be6, s);
-    }
-
-    protected void processBlock()
-    {
-        int a, aa;
-        int b, bb;
-        int c, cc;
-        int d, dd;
-
-        a = aa = H0;
-        b = bb = H1;
-        c = cc = H2;
-        d = dd = H3;
-
-        //
-        // Round 1
-        //
-        a = F1(a, b, c, d, X[ 0], 11);
-        d = F1(d, a, b, c, X[ 1], 14);
-        c = F1(c, d, a, b, X[ 2], 15);
-        b = F1(b, c, d, a, X[ 3], 12);
-        a = F1(a, b, c, d, X[ 4],  5);
-        d = F1(d, a, b, c, X[ 5],  8);
-        c = F1(c, d, a, b, X[ 6],  7);
-        b = F1(b, c, d, a, X[ 7],  9);
-        a = F1(a, b, c, d, X[ 8], 11);
-        d = F1(d, a, b, c, X[ 9], 13);
-        c = F1(c, d, a, b, X[10], 14);
-        b = F1(b, c, d, a, X[11], 15);
-        a = F1(a, b, c, d, X[12],  6);
-        d = F1(d, a, b, c, X[13],  7);
-        c = F1(c, d, a, b, X[14],  9);
-        b = F1(b, c, d, a, X[15],  8);
-
-        //
-        // Round 2
-        //
-        a = F2(a, b, c, d, X[ 7],  7);
-        d = F2(d, a, b, c, X[ 4],  6);
-        c = F2(c, d, a, b, X[13],  8);
-        b = F2(b, c, d, a, X[ 1], 13);
-        a = F2(a, b, c, d, X[10], 11);
-        d = F2(d, a, b, c, X[ 6],  9);
-        c = F2(c, d, a, b, X[15],  7);
-        b = F2(b, c, d, a, X[ 3], 15);
-        a = F2(a, b, c, d, X[12],  7);
-        d = F2(d, a, b, c, X[ 0], 12);
-        c = F2(c, d, a, b, X[ 9], 15);
-        b = F2(b, c, d, a, X[ 5],  9);
-        a = F2(a, b, c, d, X[ 2], 11);
-        d = F2(d, a, b, c, X[14],  7);
-        c = F2(c, d, a, b, X[11], 13);
-        b = F2(b, c, d, a, X[ 8], 12);
-
-        //
-        // Round 3
-        //
-        a = F3(a, b, c, d, X[ 3], 11);
-        d = F3(d, a, b, c, X[10], 13);
-        c = F3(c, d, a, b, X[14],  6);
-        b = F3(b, c, d, a, X[ 4],  7);
-        a = F3(a, b, c, d, X[ 9], 14);
-        d = F3(d, a, b, c, X[15],  9);
-        c = F3(c, d, a, b, X[ 8], 13);
-        b = F3(b, c, d, a, X[ 1], 15);
-        a = F3(a, b, c, d, X[ 2], 14);
-        d = F3(d, a, b, c, X[ 7],  8);
-        c = F3(c, d, a, b, X[ 0], 13);
-        b = F3(b, c, d, a, X[ 6],  6);
-        a = F3(a, b, c, d, X[13],  5);
-        d = F3(d, a, b, c, X[11], 12);
-        c = F3(c, d, a, b, X[ 5],  7);
-        b = F3(b, c, d, a, X[12],  5);
-
-        //
-        // Round 4
-        //
-        a = F4(a, b, c, d, X[ 1], 11);
-        d = F4(d, a, b, c, X[ 9], 12);
-        c = F4(c, d, a, b, X[11], 14);
-        b = F4(b, c, d, a, X[10], 15);
-        a = F4(a, b, c, d, X[ 0], 14);
-        d = F4(d, a, b, c, X[ 8], 15);
-        c = F4(c, d, a, b, X[12],  9);
-        b = F4(b, c, d, a, X[ 4],  8);
-        a = F4(a, b, c, d, X[13],  9);
-        d = F4(d, a, b, c, X[ 3], 14);
-        c = F4(c, d, a, b, X[ 7],  5);
-        b = F4(b, c, d, a, X[15],  6);
-        a = F4(a, b, c, d, X[14],  8);
-        d = F4(d, a, b, c, X[ 5],  6);
-        c = F4(c, d, a, b, X[ 6],  5);
-        b = F4(b, c, d, a, X[ 2], 12);
-
-        //
-        // Parallel round 1
-        //
-        aa = FF4(aa, bb, cc, dd, X[ 5],  8);
-        dd = FF4(dd, aa, bb, cc, X[14],  9);
-        cc = FF4(cc, dd, aa, bb, X[ 7],  9);
-        bb = FF4(bb, cc, dd, aa, X[ 0], 11);
-        aa = FF4(aa, bb, cc, dd, X[ 9], 13);
-        dd = FF4(dd, aa, bb, cc, X[ 2], 15);
-        cc = FF4(cc, dd, aa, bb, X[11], 15);
-        bb = FF4(bb, cc, dd, aa, X[ 4],  5);
-        aa = FF4(aa, bb, cc, dd, X[13],  7);
-        dd = FF4(dd, aa, bb, cc, X[ 6],  7);
-        cc = FF4(cc, dd, aa, bb, X[15],  8);
-        bb = FF4(bb, cc, dd, aa, X[ 8], 11);
-        aa = FF4(aa, bb, cc, dd, X[ 1], 14);
-        dd = FF4(dd, aa, bb, cc, X[10], 14);
-        cc = FF4(cc, dd, aa, bb, X[ 3], 12);
-        bb = FF4(bb, cc, dd, aa, X[12],  6);
-
-        //
-        // Parallel round 2
-        //
-        aa = FF3(aa, bb, cc, dd, X[ 6],  9);
-        dd = FF3(dd, aa, bb, cc, X[11], 13);
-        cc = FF3(cc, dd, aa, bb, X[ 3], 15);
-        bb = FF3(bb, cc, dd, aa, X[ 7],  7);
-        aa = FF3(aa, bb, cc, dd, X[ 0], 12);
-        dd = FF3(dd, aa, bb, cc, X[13],  8);
-        cc = FF3(cc, dd, aa, bb, X[ 5],  9);
-        bb = FF3(bb, cc, dd, aa, X[10], 11);
-        aa = FF3(aa, bb, cc, dd, X[14],  7);
-        dd = FF3(dd, aa, bb, cc, X[15],  7);
-        cc = FF3(cc, dd, aa, bb, X[ 8], 12);
-        bb = FF3(bb, cc, dd, aa, X[12],  7);
-        aa = FF3(aa, bb, cc, dd, X[ 4],  6);
-        dd = FF3(dd, aa, bb, cc, X[ 9], 15);
-        cc = FF3(cc, dd, aa, bb, X[ 1], 13);
-        bb = FF3(bb, cc, dd, aa, X[ 2], 11);
-
-        //
-        // Parallel round 3
-        //
-        aa = FF2(aa, bb, cc, dd, X[15],  9);
-        dd = FF2(dd, aa, bb, cc, X[ 5],  7);
-        cc = FF2(cc, dd, aa, bb, X[ 1], 15);
-        bb = FF2(bb, cc, dd, aa, X[ 3], 11);
-        aa = FF2(aa, bb, cc, dd, X[ 7],  8);
-        dd = FF2(dd, aa, bb, cc, X[14],  6);
-        cc = FF2(cc, dd, aa, bb, X[ 6],  6);
-        bb = FF2(bb, cc, dd, aa, X[ 9], 14);
-        aa = FF2(aa, bb, cc, dd, X[11], 12);
-        dd = FF2(dd, aa, bb, cc, X[ 8], 13);
-        cc = FF2(cc, dd, aa, bb, X[12],  5);
-        bb = FF2(bb, cc, dd, aa, X[ 2], 14);
-        aa = FF2(aa, bb, cc, dd, X[10], 13);
-        dd = FF2(dd, aa, bb, cc, X[ 0], 13);
-        cc = FF2(cc, dd, aa, bb, X[ 4],  7);
-        bb = FF2(bb, cc, dd, aa, X[13],  5);
-
-        //
-        // Parallel round 4
-        //
-        aa = FF1(aa, bb, cc, dd, X[ 8], 15);
-        dd = FF1(dd, aa, bb, cc, X[ 6],  5);
-        cc = FF1(cc, dd, aa, bb, X[ 4],  8);
-        bb = FF1(bb, cc, dd, aa, X[ 1], 11);
-        aa = FF1(aa, bb, cc, dd, X[ 3], 14);
-        dd = FF1(dd, aa, bb, cc, X[11], 14);
-        cc = FF1(cc, dd, aa, bb, X[15],  6);
-        bb = FF1(bb, cc, dd, aa, X[ 0], 14);
-        aa = FF1(aa, bb, cc, dd, X[ 5],  6);
-        dd = FF1(dd, aa, bb, cc, X[12],  9);
-        cc = FF1(cc, dd, aa, bb, X[ 2], 12);
-        bb = FF1(bb, cc, dd, aa, X[13],  9);
-        aa = FF1(aa, bb, cc, dd, X[ 9], 12);
-        dd = FF1(dd, aa, bb, cc, X[ 7],  5);
-        cc = FF1(cc, dd, aa, bb, X[10], 15);
-        bb = FF1(bb, cc, dd, aa, X[14],  8);
-
-        dd += c + H1;               // final result for H0
-
-        //
-        // combine the results
-        //
-        H1 = H2 + d + aa;
-        H2 = H3 + a + bb;
-        H3 = H0 + b + cc;
-        H0 = dd;
-
-        //
-        // reset the offset and clean out the word buffer.
-        //
-        xOff = 0;
-        for (int i = 0; i != X.length; i++)
-        {
-            X[i] = 0;
-        }
-    }
-
-    public Memoable copy()
-    {
-        return new RIPEMD128Digest(this);
-    }
-
-    public void reset(Memoable other)
-    {
-        RIPEMD128Digest d = (RIPEMD128Digest)other;
-
-        copyIn(d);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/digests/RIPEMD160Digest.java b/bcprov/src/main/java/org/bouncycastle/crypto/digests/RIPEMD160Digest.java
deleted file mode 100644
index 20c81e6..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/digests/RIPEMD160Digest.java
+++ /dev/null
@@ -1,443 +0,0 @@
-package org.bouncycastle.crypto.digests;
-
-
-import org.bouncycastle.util.Memoable;
-
-/**
- * implementation of RIPEMD see,
- * http://www.esat.kuleuven.ac.be/~bosselae/ripemd160.html
- */
-public class RIPEMD160Digest
-    extends GeneralDigest
-{
-    private static final int DIGEST_LENGTH = 20;
-
-    private int H0, H1, H2, H3, H4; // IV's
-
-    private int[] X = new int[16];
-    private int xOff;
-
-    /**
-     * Standard constructor
-     */
-    public RIPEMD160Digest()
-    {
-        reset();
-    }
-
-    /**
-     * Copy constructor.  This will copy the state of the provided
-     * message digest.
-     */
-    public RIPEMD160Digest(RIPEMD160Digest t)
-    {
-        super(t);
-
-        copyIn(t);
-    }
-
-    private void copyIn(RIPEMD160Digest t)
-    {
-        super.copyIn(t);
-
-        H0 = t.H0;
-        H1 = t.H1;
-        H2 = t.H2;
-        H3 = t.H3;
-        H4 = t.H4;
-
-        System.arraycopy(t.X, 0, X, 0, t.X.length);
-        xOff = t.xOff;
-    }
-
-    public String getAlgorithmName()
-    {
-        return "RIPEMD160";
-    }
-
-    public int getDigestSize()
-    {
-        return DIGEST_LENGTH;
-    }
-
-    protected void processWord(
-        byte[] in,
-        int inOff)
-    {
-        X[xOff++] = (in[inOff] & 0xff) | ((in[inOff + 1] & 0xff) << 8)
-            | ((in[inOff + 2] & 0xff) << 16) | ((in[inOff + 3] & 0xff) << 24); 
-
-        if (xOff == 16)
-        {
-            processBlock();
-        }
-    }
-
-    protected void processLength(
-        long bitLength)
-    {
-        if (xOff > 14)
-        {
-        processBlock();
-        }
-
-        X[14] = (int)(bitLength & 0xffffffff);
-        X[15] = (int)(bitLength >>> 32);
-    }
-
-    private void unpackWord(
-        int word,
-        byte[] out,
-        int outOff)
-    {
-        out[outOff]     = (byte)word;
-        out[outOff + 1] = (byte)(word >>> 8);
-        out[outOff + 2] = (byte)(word >>> 16);
-        out[outOff + 3] = (byte)(word >>> 24);
-    }
-
-    public int doFinal(
-        byte[] out,
-        int outOff)
-    {
-        finish();
-
-        unpackWord(H0, out, outOff);
-        unpackWord(H1, out, outOff + 4);
-        unpackWord(H2, out, outOff + 8);
-        unpackWord(H3, out, outOff + 12);
-        unpackWord(H4, out, outOff + 16);
-
-        reset();
-
-        return DIGEST_LENGTH;
-    }
-
-    /**
-    * reset the chaining variables to the IV values.
-    */
-    public void reset()
-    {
-        super.reset();
-
-        H0 = 0x67452301;
-        H1 = 0xefcdab89;
-        H2 = 0x98badcfe;
-        H3 = 0x10325476;
-        H4 = 0xc3d2e1f0;
-
-        xOff = 0;
-
-        for (int i = 0; i != X.length; i++)
-        {
-            X[i] = 0;
-        }
-    }
-
-    /*
-     * rotate int x left n bits.
-     */
-    private int RL(
-        int x,
-        int n)
-    {
-        return (x << n) | (x >>> (32 - n));
-    }
-
-    /*
-     * f1,f2,f3,f4,f5 are the basic RIPEMD160 functions.
-     */
-
-    /*
-     * rounds 0-15
-     */
-    private int f1(
-        int x,
-        int y,
-        int z)
-    {
-        return x ^ y ^ z;
-    }
-
-    /*
-     * rounds 16-31
-     */
-    private int f2(
-        int x,
-        int y,
-        int z)
-    {
-        return (x & y) | (~x & z);
-    }
-
-    /*
-     * rounds 32-47
-     */
-    private int f3(
-        int x,
-        int y,
-        int z)
-    {
-        return (x | ~y) ^ z;
-    }
-
-    /*
-     * rounds 48-63
-     */
-    private int f4(
-        int x,
-        int y,
-        int z)
-    {
-        return (x & z) | (y & ~z);
-    }
-
-    /*
-     * rounds 64-79
-     */
-    private int f5(
-        int x,
-        int y,
-        int z)
-    {
-        return x ^ (y | ~z);
-    }
-
-    protected void processBlock()
-    {
-        int a, aa;
-        int b, bb;
-        int c, cc;
-        int d, dd;
-        int e, ee;
-
-        a = aa = H0;
-        b = bb = H1;
-        c = cc = H2;
-        d = dd = H3;
-        e = ee = H4;
-
-        //
-        // Rounds 1 - 16
-        //
-        // left
-        a = RL(a + f1(b,c,d) + X[ 0], 11) + e; c = RL(c, 10);
-        e = RL(e + f1(a,b,c) + X[ 1], 14) + d; b = RL(b, 10);
-        d = RL(d + f1(e,a,b) + X[ 2], 15) + c; a = RL(a, 10);
-        c = RL(c + f1(d,e,a) + X[ 3], 12) + b; e = RL(e, 10);
-        b = RL(b + f1(c,d,e) + X[ 4],  5) + a; d = RL(d, 10);
-        a = RL(a + f1(b,c,d) + X[ 5],  8) + e; c = RL(c, 10);
-        e = RL(e + f1(a,b,c) + X[ 6],  7) + d; b = RL(b, 10);
-        d = RL(d + f1(e,a,b) + X[ 7],  9) + c; a = RL(a, 10);
-        c = RL(c + f1(d,e,a) + X[ 8], 11) + b; e = RL(e, 10);
-        b = RL(b + f1(c,d,e) + X[ 9], 13) + a; d = RL(d, 10);
-        a = RL(a + f1(b,c,d) + X[10], 14) + e; c = RL(c, 10);
-        e = RL(e + f1(a,b,c) + X[11], 15) + d; b = RL(b, 10);
-        d = RL(d + f1(e,a,b) + X[12],  6) + c; a = RL(a, 10);
-        c = RL(c + f1(d,e,a) + X[13],  7) + b; e = RL(e, 10);
-        b = RL(b + f1(c,d,e) + X[14],  9) + a; d = RL(d, 10);
-        a = RL(a + f1(b,c,d) + X[15],  8) + e; c = RL(c, 10);
-
-        // right
-        aa = RL(aa + f5(bb,cc,dd) + X[ 5] + 0x50a28be6,  8) + ee; cc = RL(cc, 10);
-        ee = RL(ee + f5(aa,bb,cc) + X[14] + 0x50a28be6,  9) + dd; bb = RL(bb, 10);
-        dd = RL(dd + f5(ee,aa,bb) + X[ 7] + 0x50a28be6,  9) + cc; aa = RL(aa, 10);
-        cc = RL(cc + f5(dd,ee,aa) + X[ 0] + 0x50a28be6, 11) + bb; ee = RL(ee, 10);
-        bb = RL(bb + f5(cc,dd,ee) + X[ 9] + 0x50a28be6, 13) + aa; dd = RL(dd, 10);
-        aa = RL(aa + f5(bb,cc,dd) + X[ 2] + 0x50a28be6, 15) + ee; cc = RL(cc, 10);
-        ee = RL(ee + f5(aa,bb,cc) + X[11] + 0x50a28be6, 15) + dd; bb = RL(bb, 10);
-        dd = RL(dd + f5(ee,aa,bb) + X[ 4] + 0x50a28be6,  5) + cc; aa = RL(aa, 10);
-        cc = RL(cc + f5(dd,ee,aa) + X[13] + 0x50a28be6,  7) + bb; ee = RL(ee, 10);
-        bb = RL(bb + f5(cc,dd,ee) + X[ 6] + 0x50a28be6,  7) + aa; dd = RL(dd, 10);
-        aa = RL(aa + f5(bb,cc,dd) + X[15] + 0x50a28be6,  8) + ee; cc = RL(cc, 10);
-        ee = RL(ee + f5(aa,bb,cc) + X[ 8] + 0x50a28be6, 11) + dd; bb = RL(bb, 10);
-        dd = RL(dd + f5(ee,aa,bb) + X[ 1] + 0x50a28be6, 14) + cc; aa = RL(aa, 10);
-        cc = RL(cc + f5(dd,ee,aa) + X[10] + 0x50a28be6, 14) + bb; ee = RL(ee, 10);
-        bb = RL(bb + f5(cc,dd,ee) + X[ 3] + 0x50a28be6, 12) + aa; dd = RL(dd, 10);
-        aa = RL(aa + f5(bb,cc,dd) + X[12] + 0x50a28be6,  6) + ee; cc = RL(cc, 10);
-
-        //
-        // Rounds 16-31
-        //
-        // left
-        e = RL(e + f2(a,b,c) + X[ 7] + 0x5a827999,  7) + d; b = RL(b, 10);
-        d = RL(d + f2(e,a,b) + X[ 4] + 0x5a827999,  6) + c; a = RL(a, 10);
-        c = RL(c + f2(d,e,a) + X[13] + 0x5a827999,  8) + b; e = RL(e, 10);
-        b = RL(b + f2(c,d,e) + X[ 1] + 0x5a827999, 13) + a; d = RL(d, 10);
-        a = RL(a + f2(b,c,d) + X[10] + 0x5a827999, 11) + e; c = RL(c, 10);
-        e = RL(e + f2(a,b,c) + X[ 6] + 0x5a827999,  9) + d; b = RL(b, 10);
-        d = RL(d + f2(e,a,b) + X[15] + 0x5a827999,  7) + c; a = RL(a, 10);
-        c = RL(c + f2(d,e,a) + X[ 3] + 0x5a827999, 15) + b; e = RL(e, 10);
-        b = RL(b + f2(c,d,e) + X[12] + 0x5a827999,  7) + a; d = RL(d, 10);
-        a = RL(a + f2(b,c,d) + X[ 0] + 0x5a827999, 12) + e; c = RL(c, 10);
-        e = RL(e + f2(a,b,c) + X[ 9] + 0x5a827999, 15) + d; b = RL(b, 10);
-        d = RL(d + f2(e,a,b) + X[ 5] + 0x5a827999,  9) + c; a = RL(a, 10);
-        c = RL(c + f2(d,e,a) + X[ 2] + 0x5a827999, 11) + b; e = RL(e, 10);
-        b = RL(b + f2(c,d,e) + X[14] + 0x5a827999,  7) + a; d = RL(d, 10);
-        a = RL(a + f2(b,c,d) + X[11] + 0x5a827999, 13) + e; c = RL(c, 10);
-        e = RL(e + f2(a,b,c) + X[ 8] + 0x5a827999, 12) + d; b = RL(b, 10);
-
-        // right
-        ee = RL(ee + f4(aa,bb,cc) + X[ 6] + 0x5c4dd124,  9) + dd; bb = RL(bb, 10);
-        dd = RL(dd + f4(ee,aa,bb) + X[11] + 0x5c4dd124, 13) + cc; aa = RL(aa, 10);
-        cc = RL(cc + f4(dd,ee,aa) + X[ 3] + 0x5c4dd124, 15) + bb; ee = RL(ee, 10);
-        bb = RL(bb + f4(cc,dd,ee) + X[ 7] + 0x5c4dd124,  7) + aa; dd = RL(dd, 10);
-        aa = RL(aa + f4(bb,cc,dd) + X[ 0] + 0x5c4dd124, 12) + ee; cc = RL(cc, 10);
-        ee = RL(ee + f4(aa,bb,cc) + X[13] + 0x5c4dd124,  8) + dd; bb = RL(bb, 10);
-        dd = RL(dd + f4(ee,aa,bb) + X[ 5] + 0x5c4dd124,  9) + cc; aa = RL(aa, 10);
-        cc = RL(cc + f4(dd,ee,aa) + X[10] + 0x5c4dd124, 11) + bb; ee = RL(ee, 10);
-        bb = RL(bb + f4(cc,dd,ee) + X[14] + 0x5c4dd124,  7) + aa; dd = RL(dd, 10);
-        aa = RL(aa + f4(bb,cc,dd) + X[15] + 0x5c4dd124,  7) + ee; cc = RL(cc, 10);
-        ee = RL(ee + f4(aa,bb,cc) + X[ 8] + 0x5c4dd124, 12) + dd; bb = RL(bb, 10);
-        dd = RL(dd + f4(ee,aa,bb) + X[12] + 0x5c4dd124,  7) + cc; aa = RL(aa, 10);
-        cc = RL(cc + f4(dd,ee,aa) + X[ 4] + 0x5c4dd124,  6) + bb; ee = RL(ee, 10);
-        bb = RL(bb + f4(cc,dd,ee) + X[ 9] + 0x5c4dd124, 15) + aa; dd = RL(dd, 10);
-        aa = RL(aa + f4(bb,cc,dd) + X[ 1] + 0x5c4dd124, 13) + ee; cc = RL(cc, 10);
-        ee = RL(ee + f4(aa,bb,cc) + X[ 2] + 0x5c4dd124, 11) + dd; bb = RL(bb, 10);
-
-        //
-        // Rounds 32-47
-        //
-        // left
-        d = RL(d + f3(e,a,b) + X[ 3] + 0x6ed9eba1, 11) + c; a = RL(a, 10);
-        c = RL(c + f3(d,e,a) + X[10] + 0x6ed9eba1, 13) + b; e = RL(e, 10);
-        b = RL(b + f3(c,d,e) + X[14] + 0x6ed9eba1,  6) + a; d = RL(d, 10);
-        a = RL(a + f3(b,c,d) + X[ 4] + 0x6ed9eba1,  7) + e; c = RL(c, 10);
-        e = RL(e + f3(a,b,c) + X[ 9] + 0x6ed9eba1, 14) + d; b = RL(b, 10);
-        d = RL(d + f3(e,a,b) + X[15] + 0x6ed9eba1,  9) + c; a = RL(a, 10);
-        c = RL(c + f3(d,e,a) + X[ 8] + 0x6ed9eba1, 13) + b; e = RL(e, 10);
-        b = RL(b + f3(c,d,e) + X[ 1] + 0x6ed9eba1, 15) + a; d = RL(d, 10);
-        a = RL(a + f3(b,c,d) + X[ 2] + 0x6ed9eba1, 14) + e; c = RL(c, 10);
-        e = RL(e + f3(a,b,c) + X[ 7] + 0x6ed9eba1,  8) + d; b = RL(b, 10);
-        d = RL(d + f3(e,a,b) + X[ 0] + 0x6ed9eba1, 13) + c; a = RL(a, 10);
-        c = RL(c + f3(d,e,a) + X[ 6] + 0x6ed9eba1,  6) + b; e = RL(e, 10);
-        b = RL(b + f3(c,d,e) + X[13] + 0x6ed9eba1,  5) + a; d = RL(d, 10);
-        a = RL(a + f3(b,c,d) + X[11] + 0x6ed9eba1, 12) + e; c = RL(c, 10);
-        e = RL(e + f3(a,b,c) + X[ 5] + 0x6ed9eba1,  7) + d; b = RL(b, 10);
-        d = RL(d + f3(e,a,b) + X[12] + 0x6ed9eba1,  5) + c; a = RL(a, 10);
-
-        // right
-        dd = RL(dd + f3(ee,aa,bb) + X[15] + 0x6d703ef3,  9) + cc; aa = RL(aa, 10);
-        cc = RL(cc + f3(dd,ee,aa) + X[ 5] + 0x6d703ef3,  7) + bb; ee = RL(ee, 10);
-        bb = RL(bb + f3(cc,dd,ee) + X[ 1] + 0x6d703ef3, 15) + aa; dd = RL(dd, 10);
-        aa = RL(aa + f3(bb,cc,dd) + X[ 3] + 0x6d703ef3, 11) + ee; cc = RL(cc, 10);
-        ee = RL(ee + f3(aa,bb,cc) + X[ 7] + 0x6d703ef3,  8) + dd; bb = RL(bb, 10);
-        dd = RL(dd + f3(ee,aa,bb) + X[14] + 0x6d703ef3,  6) + cc; aa = RL(aa, 10);
-        cc = RL(cc + f3(dd,ee,aa) + X[ 6] + 0x6d703ef3,  6) + bb; ee = RL(ee, 10);
-        bb = RL(bb + f3(cc,dd,ee) + X[ 9] + 0x6d703ef3, 14) + aa; dd = RL(dd, 10);
-        aa = RL(aa + f3(bb,cc,dd) + X[11] + 0x6d703ef3, 12) + ee; cc = RL(cc, 10);
-        ee = RL(ee + f3(aa,bb,cc) + X[ 8] + 0x6d703ef3, 13) + dd; bb = RL(bb, 10);
-        dd = RL(dd + f3(ee,aa,bb) + X[12] + 0x6d703ef3,  5) + cc; aa = RL(aa, 10);
-        cc = RL(cc + f3(dd,ee,aa) + X[ 2] + 0x6d703ef3, 14) + bb; ee = RL(ee, 10);
-        bb = RL(bb + f3(cc,dd,ee) + X[10] + 0x6d703ef3, 13) + aa; dd = RL(dd, 10);
-        aa = RL(aa + f3(bb,cc,dd) + X[ 0] + 0x6d703ef3, 13) + ee; cc = RL(cc, 10);
-        ee = RL(ee + f3(aa,bb,cc) + X[ 4] + 0x6d703ef3,  7) + dd; bb = RL(bb, 10);
-        dd = RL(dd + f3(ee,aa,bb) + X[13] + 0x6d703ef3,  5) + cc; aa = RL(aa, 10);
-
-        //
-        // Rounds 48-63
-        //
-        // left
-        c = RL(c + f4(d,e,a) + X[ 1] + 0x8f1bbcdc, 11) + b; e = RL(e, 10);
-        b = RL(b + f4(c,d,e) + X[ 9] + 0x8f1bbcdc, 12) + a; d = RL(d, 10);
-        a = RL(a + f4(b,c,d) + X[11] + 0x8f1bbcdc, 14) + e; c = RL(c, 10);
-        e = RL(e + f4(a,b,c) + X[10] + 0x8f1bbcdc, 15) + d; b = RL(b, 10);
-        d = RL(d + f4(e,a,b) + X[ 0] + 0x8f1bbcdc, 14) + c; a = RL(a, 10);
-        c = RL(c + f4(d,e,a) + X[ 8] + 0x8f1bbcdc, 15) + b; e = RL(e, 10);
-        b = RL(b + f4(c,d,e) + X[12] + 0x8f1bbcdc,  9) + a; d = RL(d, 10);
-        a = RL(a + f4(b,c,d) + X[ 4] + 0x8f1bbcdc,  8) + e; c = RL(c, 10);
-        e = RL(e + f4(a,b,c) + X[13] + 0x8f1bbcdc,  9) + d; b = RL(b, 10);
-        d = RL(d + f4(e,a,b) + X[ 3] + 0x8f1bbcdc, 14) + c; a = RL(a, 10);
-        c = RL(c + f4(d,e,a) + X[ 7] + 0x8f1bbcdc,  5) + b; e = RL(e, 10);
-        b = RL(b + f4(c,d,e) + X[15] + 0x8f1bbcdc,  6) + a; d = RL(d, 10);
-        a = RL(a + f4(b,c,d) + X[14] + 0x8f1bbcdc,  8) + e; c = RL(c, 10);
-        e = RL(e + f4(a,b,c) + X[ 5] + 0x8f1bbcdc,  6) + d; b = RL(b, 10);
-        d = RL(d + f4(e,a,b) + X[ 6] + 0x8f1bbcdc,  5) + c; a = RL(a, 10);
-        c = RL(c + f4(d,e,a) + X[ 2] + 0x8f1bbcdc, 12) + b; e = RL(e, 10);
-
-        // right
-        cc = RL(cc + f2(dd,ee,aa) + X[ 8] + 0x7a6d76e9, 15) + bb; ee = RL(ee, 10);
-        bb = RL(bb + f2(cc,dd,ee) + X[ 6] + 0x7a6d76e9,  5) + aa; dd = RL(dd, 10);
-        aa = RL(aa + f2(bb,cc,dd) + X[ 4] + 0x7a6d76e9,  8) + ee; cc = RL(cc, 10);
-        ee = RL(ee + f2(aa,bb,cc) + X[ 1] + 0x7a6d76e9, 11) + dd; bb = RL(bb, 10);
-        dd = RL(dd + f2(ee,aa,bb) + X[ 3] + 0x7a6d76e9, 14) + cc; aa = RL(aa, 10);
-        cc = RL(cc + f2(dd,ee,aa) + X[11] + 0x7a6d76e9, 14) + bb; ee = RL(ee, 10);
-        bb = RL(bb + f2(cc,dd,ee) + X[15] + 0x7a6d76e9,  6) + aa; dd = RL(dd, 10);
-        aa = RL(aa + f2(bb,cc,dd) + X[ 0] + 0x7a6d76e9, 14) + ee; cc = RL(cc, 10);
-        ee = RL(ee + f2(aa,bb,cc) + X[ 5] + 0x7a6d76e9,  6) + dd; bb = RL(bb, 10);
-        dd = RL(dd + f2(ee,aa,bb) + X[12] + 0x7a6d76e9,  9) + cc; aa = RL(aa, 10);
-        cc = RL(cc + f2(dd,ee,aa) + X[ 2] + 0x7a6d76e9, 12) + bb; ee = RL(ee, 10);
-        bb = RL(bb + f2(cc,dd,ee) + X[13] + 0x7a6d76e9,  9) + aa; dd = RL(dd, 10);
-        aa = RL(aa + f2(bb,cc,dd) + X[ 9] + 0x7a6d76e9, 12) + ee; cc = RL(cc, 10);
-        ee = RL(ee + f2(aa,bb,cc) + X[ 7] + 0x7a6d76e9,  5) + dd; bb = RL(bb, 10);
-        dd = RL(dd + f2(ee,aa,bb) + X[10] + 0x7a6d76e9, 15) + cc; aa = RL(aa, 10);
-        cc = RL(cc + f2(dd,ee,aa) + X[14] + 0x7a6d76e9,  8) + bb; ee = RL(ee, 10);
-
-        //
-        // Rounds 64-79
-        //
-        // left
-        b = RL(b + f5(c,d,e) + X[ 4] + 0xa953fd4e,  9) + a; d = RL(d, 10);
-        a = RL(a + f5(b,c,d) + X[ 0] + 0xa953fd4e, 15) + e; c = RL(c, 10);
-        e = RL(e + f5(a,b,c) + X[ 5] + 0xa953fd4e,  5) + d; b = RL(b, 10);
-        d = RL(d + f5(e,a,b) + X[ 9] + 0xa953fd4e, 11) + c; a = RL(a, 10);
-        c = RL(c + f5(d,e,a) + X[ 7] + 0xa953fd4e,  6) + b; e = RL(e, 10);
-        b = RL(b + f5(c,d,e) + X[12] + 0xa953fd4e,  8) + a; d = RL(d, 10);
-        a = RL(a + f5(b,c,d) + X[ 2] + 0xa953fd4e, 13) + e; c = RL(c, 10);
-        e = RL(e + f5(a,b,c) + X[10] + 0xa953fd4e, 12) + d; b = RL(b, 10);
-        d = RL(d + f5(e,a,b) + X[14] + 0xa953fd4e,  5) + c; a = RL(a, 10);
-        c = RL(c + f5(d,e,a) + X[ 1] + 0xa953fd4e, 12) + b; e = RL(e, 10);
-        b = RL(b + f5(c,d,e) + X[ 3] + 0xa953fd4e, 13) + a; d = RL(d, 10);
-        a = RL(a + f5(b,c,d) + X[ 8] + 0xa953fd4e, 14) + e; c = RL(c, 10);
-        e = RL(e + f5(a,b,c) + X[11] + 0xa953fd4e, 11) + d; b = RL(b, 10);
-        d = RL(d + f5(e,a,b) + X[ 6] + 0xa953fd4e,  8) + c; a = RL(a, 10);
-        c = RL(c + f5(d,e,a) + X[15] + 0xa953fd4e,  5) + b; e = RL(e, 10);
-        b = RL(b + f5(c,d,e) + X[13] + 0xa953fd4e,  6) + a; d = RL(d, 10);
-
-        // right
-        bb = RL(bb + f1(cc,dd,ee) + X[12],  8) + aa; dd = RL(dd, 10);
-        aa = RL(aa + f1(bb,cc,dd) + X[15],  5) + ee; cc = RL(cc, 10);
-        ee = RL(ee + f1(aa,bb,cc) + X[10], 12) + dd; bb = RL(bb, 10);
-        dd = RL(dd + f1(ee,aa,bb) + X[ 4],  9) + cc; aa = RL(aa, 10);
-        cc = RL(cc + f1(dd,ee,aa) + X[ 1], 12) + bb; ee = RL(ee, 10);
-        bb = RL(bb + f1(cc,dd,ee) + X[ 5],  5) + aa; dd = RL(dd, 10);
-        aa = RL(aa + f1(bb,cc,dd) + X[ 8], 14) + ee; cc = RL(cc, 10);
-        ee = RL(ee + f1(aa,bb,cc) + X[ 7],  6) + dd; bb = RL(bb, 10);
-        dd = RL(dd + f1(ee,aa,bb) + X[ 6],  8) + cc; aa = RL(aa, 10);
-        cc = RL(cc + f1(dd,ee,aa) + X[ 2], 13) + bb; ee = RL(ee, 10);
-        bb = RL(bb + f1(cc,dd,ee) + X[13],  6) + aa; dd = RL(dd, 10);
-        aa = RL(aa + f1(bb,cc,dd) + X[14],  5) + ee; cc = RL(cc, 10);
-        ee = RL(ee + f1(aa,bb,cc) + X[ 0], 15) + dd; bb = RL(bb, 10);
-        dd = RL(dd + f1(ee,aa,bb) + X[ 3], 13) + cc; aa = RL(aa, 10);
-        cc = RL(cc + f1(dd,ee,aa) + X[ 9], 11) + bb; ee = RL(ee, 10);
-        bb = RL(bb + f1(cc,dd,ee) + X[11], 11) + aa; dd = RL(dd, 10);
-
-        dd += c + H1;
-        H1 = H2 + d + ee;
-        H2 = H3 + e + aa;
-        H3 = H4 + a + bb;
-        H4 = H0 + b + cc;
-        H0 = dd;
-
-        //
-        // reset the offset and clean out the word buffer.
-        //
-        xOff = 0;
-        for (int i = 0; i != X.length; i++)
-        {
-            X[i] = 0;
-        }
-    }
-
-    public Memoable copy()
-    {
-        return new RIPEMD160Digest(this);
-    }
-
-    public void reset(Memoable other)
-    {
-        RIPEMD160Digest d = (RIPEMD160Digest)other;
-
-        copyIn(d);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/digests/RIPEMD256Digest.java b/bcprov/src/main/java/org/bouncycastle/crypto/digests/RIPEMD256Digest.java
deleted file mode 100644
index 86746b4..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/digests/RIPEMD256Digest.java
+++ /dev/null
@@ -1,497 +0,0 @@
-package org.bouncycastle.crypto.digests;
-
-
-import org.bouncycastle.util.Memoable;
-
-/**
- * implementation of RIPEMD256.
- * <p>
- * <b>note:</b> this algorithm offers the same level of security as RIPEMD128.
- */
-public class RIPEMD256Digest
-    extends GeneralDigest
-{
-    private static final int DIGEST_LENGTH = 32;
-
-    private int H0, H1, H2, H3, H4, H5, H6, H7; // IV's
-
-    private int[] X = new int[16];
-    private int xOff;
-
-    /**
-     * Standard constructor
-     */
-    public RIPEMD256Digest()
-    {
-        reset();
-    }
-
-    /**
-     * Copy constructor.  This will copy the state of the provided
-     * message digest.
-     */
-    public RIPEMD256Digest(RIPEMD256Digest t)
-    {
-        super(t);
-
-        copyIn(t);
-    }
-
-    private void copyIn(RIPEMD256Digest t)
-    {
-        super.copyIn(t);
-
-        H0 = t.H0;
-        H1 = t.H1;
-        H2 = t.H2;
-        H3 = t.H3;
-        H4 = t.H4;
-        H5 = t.H5;
-        H6 = t.H6;
-        H7 = t.H7;
-
-        System.arraycopy(t.X, 0, X, 0, t.X.length);
-        xOff = t.xOff;
-    }
-
-    public String getAlgorithmName()
-    {
-        return "RIPEMD256";
-    }
-
-    public int getDigestSize()
-    {
-        return DIGEST_LENGTH;
-    }
-
-    protected void processWord(
-        byte[] in,
-        int inOff)
-    {
-        X[xOff++] = (in[inOff] & 0xff) | ((in[inOff + 1] & 0xff) << 8)
-            | ((in[inOff + 2] & 0xff) << 16) | ((in[inOff + 3] & 0xff) << 24); 
-
-        if (xOff == 16)
-        {
-            processBlock();
-        }
-    }
-
-    protected void processLength(
-        long bitLength)
-    {
-        if (xOff > 14)
-        {
-            processBlock();
-        }
-
-        X[14] = (int)(bitLength & 0xffffffff);
-        X[15] = (int)(bitLength >>> 32);
-    }
-
-    private void unpackWord(
-        int word,
-        byte[] out,
-        int outOff)
-    {
-        out[outOff]     = (byte)word;
-        out[outOff + 1] = (byte)(word >>> 8);
-        out[outOff + 2] = (byte)(word >>> 16);
-        out[outOff + 3] = (byte)(word >>> 24);
-    }
-
-    public int doFinal(
-        byte[] out,
-        int outOff)
-    {
-        finish();
-
-        unpackWord(H0, out, outOff);
-        unpackWord(H1, out, outOff + 4);
-        unpackWord(H2, out, outOff + 8);
-        unpackWord(H3, out, outOff + 12);
-        unpackWord(H4, out, outOff + 16);
-        unpackWord(H5, out, outOff + 20);
-        unpackWord(H6, out, outOff + 24);
-        unpackWord(H7, out, outOff + 28);
-
-        reset();
-
-        return DIGEST_LENGTH;
-    }
-
-    /**
-    * reset the chaining variables to the IV values.
-    */
-    public void reset()
-    {
-        super.reset();
-
-        H0 = 0x67452301;
-        H1 = 0xefcdab89;
-        H2 = 0x98badcfe;
-        H3 = 0x10325476; 
-        H4 = 0x76543210; 
-        H5 = 0xFEDCBA98; 
-        H6 = 0x89ABCDEF; 
-        H7 = 0x01234567;
-        
-        xOff = 0;
-
-        for (int i = 0; i != X.length; i++)
-        {
-            X[i] = 0;
-        }
-    }
-
-    /*
-     * rotate int x left n bits.
-     */
-    private int RL(
-        int x,
-        int n)
-    {
-        return (x << n) | (x >>> (32 - n));
-    }
-
-    /*
-     * f1,f2,f3,f4 are the basic RIPEMD128 functions.
-     */
-
-    /*
-     * F
-     */
-    private int f1(
-        int x,
-        int y,
-        int z)
-    {
-        return x ^ y ^ z;
-    }
-
-    /*
-     * G
-     */
-    private int f2(
-        int x,
-        int y,
-        int z)
-    {
-        return (x & y) | (~x & z);
-    }
-
-    /*
-     * H
-     */
-    private int f3(
-        int x,
-        int y,
-        int z)
-    {
-        return (x | ~y) ^ z;
-    }
-
-    /*
-     * I
-     */
-    private int f4(
-        int x,
-        int y,
-        int z)
-    {
-        return (x & z) | (y & ~z);
-    }
-
-    private int F1(
-        int a,
-        int b,
-        int c,
-        int d,
-        int x,
-        int s)
-    {
-        return RL(a + f1(b, c, d) + x, s);
-    }
-
-    private int F2(
-        int a,
-        int b,
-        int c,
-        int d,
-        int x,
-        int s)
-    {
-        return RL(a + f2(b, c, d) + x + 0x5a827999, s);
-    }
-
-    private int F3(
-        int a,
-        int b,
-        int c,
-        int d,
-        int x,
-        int s)
-    {
-        return RL(a + f3(b, c, d) + x + 0x6ed9eba1, s);
-    }
-
-    private int F4(
-        int a,
-        int b,
-        int c,
-        int d,
-        int x,
-        int s)
-    {
-        return RL(a + f4(b, c, d) + x + 0x8f1bbcdc, s);
-    }
-
-    private int FF1(
-        int a,
-        int b,
-        int c,
-        int d,
-        int x,
-        int s)
-    {
-        return RL(a + f1(b, c, d) + x, s);
-    }
-
-    private int FF2(
-        int a,
-        int b,
-        int c,
-        int d,
-        int x,
-        int s)
-    {
-      return RL(a + f2(b, c, d) + x + 0x6d703ef3, s);
-    }
-
-    private int FF3(
-        int a,
-        int b,
-        int c,
-        int d,
-        int x,
-        int s)
-    {
-      return RL(a + f3(b, c, d) + x + 0x5c4dd124, s);
-    }
-
-    private int FF4(
-        int a,
-        int b,
-        int c,
-        int d,
-        int x,
-        int s)
-    {
-      return RL(a + f4(b, c, d) + x + 0x50a28be6, s);
-    }
-
-    protected void processBlock()
-    {
-        int a, aa;
-        int b, bb;
-        int c, cc;
-        int d, dd;
-        int t;
-        
-        a = H0;
-        b = H1;
-        c = H2;
-        d = H3;
-        aa = H4;
-        bb = H5;
-        cc = H6;
-        dd = H7;
-
-        //
-        // Round 1
-        //
-        
-        a = F1(a, b, c, d, X[ 0], 11);
-        d = F1(d, a, b, c, X[ 1], 14);
-        c = F1(c, d, a, b, X[ 2], 15);
-        b = F1(b, c, d, a, X[ 3], 12);
-        a = F1(a, b, c, d, X[ 4],  5);
-        d = F1(d, a, b, c, X[ 5],  8);
-        c = F1(c, d, a, b, X[ 6],  7);
-        b = F1(b, c, d, a, X[ 7],  9);
-        a = F1(a, b, c, d, X[ 8], 11);
-        d = F1(d, a, b, c, X[ 9], 13);
-        c = F1(c, d, a, b, X[10], 14);
-        b = F1(b, c, d, a, X[11], 15);
-        a = F1(a, b, c, d, X[12],  6);
-        d = F1(d, a, b, c, X[13],  7);
-        c = F1(c, d, a, b, X[14],  9);
-        b = F1(b, c, d, a, X[15],  8);
-
-        aa = FF4(aa, bb, cc, dd, X[ 5],  8);
-        dd = FF4(dd, aa, bb, cc, X[14],  9);
-        cc = FF4(cc, dd, aa, bb, X[ 7],  9);
-        bb = FF4(bb, cc, dd, aa, X[ 0], 11);
-        aa = FF4(aa, bb, cc, dd, X[ 9], 13);
-        dd = FF4(dd, aa, bb, cc, X[ 2], 15);
-        cc = FF4(cc, dd, aa, bb, X[11], 15);
-        bb = FF4(bb, cc, dd, aa, X[ 4],  5);
-        aa = FF4(aa, bb, cc, dd, X[13],  7);
-        dd = FF4(dd, aa, bb, cc, X[ 6],  7);
-        cc = FF4(cc, dd, aa, bb, X[15],  8);
-        bb = FF4(bb, cc, dd, aa, X[ 8], 11);
-        aa = FF4(aa, bb, cc, dd, X[ 1], 14);
-        dd = FF4(dd, aa, bb, cc, X[10], 14);
-        cc = FF4(cc, dd, aa, bb, X[ 3], 12);
-        bb = FF4(bb, cc, dd, aa, X[12],  6);
-
-        t = a; a = aa; aa = t;
-        
-        //
-        // Round 2
-        //
-        a = F2(a, b, c, d, X[ 7],  7);
-        d = F2(d, a, b, c, X[ 4],  6);
-        c = F2(c, d, a, b, X[13],  8);
-        b = F2(b, c, d, a, X[ 1], 13);
-        a = F2(a, b, c, d, X[10], 11);
-        d = F2(d, a, b, c, X[ 6],  9);
-        c = F2(c, d, a, b, X[15],  7);
-        b = F2(b, c, d, a, X[ 3], 15);
-        a = F2(a, b, c, d, X[12],  7);
-        d = F2(d, a, b, c, X[ 0], 12);
-        c = F2(c, d, a, b, X[ 9], 15);
-        b = F2(b, c, d, a, X[ 5],  9);
-        a = F2(a, b, c, d, X[ 2], 11);
-        d = F2(d, a, b, c, X[14],  7);
-        c = F2(c, d, a, b, X[11], 13);
-        b = F2(b, c, d, a, X[ 8], 12);
-
-        aa = FF3(aa, bb, cc, dd, X[ 6],  9);
-        dd = FF3(dd, aa, bb, cc, X[ 11], 13);
-        cc = FF3(cc, dd, aa, bb, X[3], 15);
-        bb = FF3(bb, cc, dd, aa, X[ 7],  7);
-        aa = FF3(aa, bb, cc, dd, X[0], 12);
-        dd = FF3(dd, aa, bb, cc, X[13],  8);
-        cc = FF3(cc, dd, aa, bb, X[5],  9);
-        bb = FF3(bb, cc, dd, aa, X[10], 11);
-        aa = FF3(aa, bb, cc, dd, X[14],  7);
-        dd = FF3(dd, aa, bb, cc, X[15],  7);
-        cc = FF3(cc, dd, aa, bb, X[ 8], 12);
-        bb = FF3(bb, cc, dd, aa, X[12],  7);
-        aa = FF3(aa, bb, cc, dd, X[ 4],  6);
-        dd = FF3(dd, aa, bb, cc, X[ 9], 15);
-        cc = FF3(cc, dd, aa, bb, X[ 1], 13);
-        bb = FF3(bb, cc, dd, aa, X[ 2], 11);
-
-        t = b; b = bb; bb = t;
-        
-        //
-        // Round 3
-        //
-        a = F3(a, b, c, d, X[ 3], 11);
-        d = F3(d, a, b, c, X[10], 13);
-        c = F3(c, d, a, b, X[14],  6);
-        b = F3(b, c, d, a, X[ 4],  7);
-        a = F3(a, b, c, d, X[ 9], 14);
-        d = F3(d, a, b, c, X[15],  9);
-        c = F3(c, d, a, b, X[ 8], 13);
-        b = F3(b, c, d, a, X[ 1], 15);
-        a = F3(a, b, c, d, X[ 2], 14);
-        d = F3(d, a, b, c, X[ 7],  8);
-        c = F3(c, d, a, b, X[ 0], 13);
-        b = F3(b, c, d, a, X[ 6],  6);
-        a = F3(a, b, c, d, X[13],  5);
-        d = F3(d, a, b, c, X[11], 12);
-        c = F3(c, d, a, b, X[ 5],  7);
-        b = F3(b, c, d, a, X[12],  5);
-
-        aa = FF2(aa, bb, cc, dd, X[ 15], 9);
-        dd = FF2(dd, aa, bb, cc, X[5], 7);
-        cc = FF2(cc, dd, aa, bb, X[1], 15);
-        bb = FF2(bb, cc, dd, aa, X[ 3],  11);
-        aa = FF2(aa, bb, cc, dd, X[ 7], 8);
-        dd = FF2(dd, aa, bb, cc, X[14],  6);
-        cc = FF2(cc, dd, aa, bb, X[ 6], 6);
-        bb = FF2(bb, cc, dd, aa, X[ 9], 14);
-        aa = FF2(aa, bb, cc, dd, X[11], 12);
-        dd = FF2(dd, aa, bb, cc, X[ 8], 13);
-        cc = FF2(cc, dd, aa, bb, X[12],  5);
-        bb = FF2(bb, cc, dd, aa, X[ 2], 14);
-        aa = FF2(aa, bb, cc, dd, X[10], 13);
-        dd = FF2(dd, aa, bb, cc, X[ 0], 13);
-        cc = FF2(cc, dd, aa, bb, X[ 4],  7);
-        bb = FF2(bb, cc, dd, aa, X[13],  5);
-
-        t = c; c = cc; cc = t;
-
-        //
-        // Round 4
-        //
-        a = F4(a, b, c, d, X[ 1], 11);
-        d = F4(d, a, b, c, X[ 9], 12);
-        c = F4(c, d, a, b, X[11], 14);
-        b = F4(b, c, d, a, X[10], 15);
-        a = F4(a, b, c, d, X[ 0], 14);
-        d = F4(d, a, b, c, X[ 8], 15);
-        c = F4(c, d, a, b, X[12],  9);
-        b = F4(b, c, d, a, X[ 4],  8);
-        a = F4(a, b, c, d, X[13],  9);
-        d = F4(d, a, b, c, X[ 3], 14);
-        c = F4(c, d, a, b, X[ 7],  5);
-        b = F4(b, c, d, a, X[15],  6);
-        a = F4(a, b, c, d, X[14],  8);
-        d = F4(d, a, b, c, X[ 5],  6);
-        c = F4(c, d, a, b, X[ 6],  5);
-        b = F4(b, c, d, a, X[ 2], 12);
-
-        aa = FF1(aa, bb, cc, dd, X[ 8], 15);
-        dd = FF1(dd, aa, bb, cc, X[ 6],  5);
-        cc = FF1(cc, dd, aa, bb, X[ 4],  8);
-        bb = FF1(bb, cc, dd, aa, X[ 1], 11);
-        aa = FF1(aa, bb, cc, dd, X[ 3], 14);
-        dd = FF1(dd, aa, bb, cc, X[11], 14);
-        cc = FF1(cc, dd, aa, bb, X[15],  6);
-        bb = FF1(bb, cc, dd, aa, X[ 0], 14);
-        aa = FF1(aa, bb, cc, dd, X[ 5],  6);
-        dd = FF1(dd, aa, bb, cc, X[12],  9);
-        cc = FF1(cc, dd, aa, bb, X[ 2],  12);
-        bb = FF1(bb, cc, dd, aa, X[13],  9);
-        aa = FF1(aa, bb, cc, dd, X[ 9],  12);
-        dd = FF1(dd, aa, bb, cc, X[ 7],  5);
-        cc = FF1(cc, dd, aa, bb, X[10],  15);
-        bb = FF1(bb, cc, dd, aa, X[14], 8);
-
-        t = d; d = dd; dd = t;
-
-        H0 += a; 
-        H1 += b; 
-        H2 += c; 
-        H3 += d;
-        H4 += aa; 
-        H5 += bb; 
-        H6 += cc; 
-        H7 += dd;
-        
-        //
-        // reset the offset and clean out the word buffer.
-        //
-        xOff = 0;
-        for (int i = 0; i != X.length; i++)
-        {
-            X[i] = 0;
-        }
-    }
-
-    public Memoable copy()
-    {
-        return new RIPEMD256Digest(this);
-    }
-
-    public void reset(Memoable other)
-    {
-        RIPEMD256Digest d = (RIPEMD256Digest)other;
-
-        copyIn(d);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/digests/RIPEMD320Digest.java b/bcprov/src/main/java/org/bouncycastle/crypto/digests/RIPEMD320Digest.java
deleted file mode 100644
index 32775e7..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/digests/RIPEMD320Digest.java
+++ /dev/null
@@ -1,481 +0,0 @@
-package org.bouncycastle.crypto.digests;
-
-
-import org.bouncycastle.util.Memoable;
-
-/**
- * implementation of RIPEMD 320.
- * <p>
- * <b>Note:</b> this implementation offers the same level of security
- * as RIPEMD 160.
- */
-public class RIPEMD320Digest
-    extends GeneralDigest
-{
-    private static final int DIGEST_LENGTH = 40;
-
-    private int H0, H1, H2, H3, H4, H5, H6, H7, H8, H9; // IV's
-
-    private int[] X = new int[16];
-    private int xOff;
-
-    /**
-     * Standard constructor
-     */
-    public RIPEMD320Digest()
-    {
-        reset();
-    }
-
-    /**
-     * Copy constructor.  This will copy the state of the provided
-     * message digest.
-     */
-    public RIPEMD320Digest(RIPEMD320Digest t)
-    {
-        super(t);
-
-        doCopy(t);
-    }
-
-    private void doCopy(RIPEMD320Digest t)
-    {
-        super.copyIn(t);
-        H0 = t.H0;
-        H1 = t.H1;
-        H2 = t.H2;
-        H3 = t.H3;
-        H4 = t.H4;
-        H5 = t.H5;
-        H6 = t.H6;
-        H7 = t.H7;
-        H8 = t.H8;
-        H9 = t.H9;
-        
-        System.arraycopy(t.X, 0, X, 0, t.X.length);
-        xOff = t.xOff;
-    }
-
-    public String getAlgorithmName()
-    {
-        return "RIPEMD320";
-    }
-
-    public int getDigestSize()
-    {
-        return DIGEST_LENGTH;
-    }
-
-    protected void processWord(
-        byte[] in,
-        int inOff)
-    {
-        X[xOff++] = (in[inOff] & 0xff) | ((in[inOff + 1] & 0xff) << 8)
-            | ((in[inOff + 2] & 0xff) << 16) | ((in[inOff + 3] & 0xff) << 24); 
-
-        if (xOff == 16)
-        {
-            processBlock();
-        }
-    }
-
-    protected void processLength(
-        long bitLength)
-    {
-        if (xOff > 14)
-        {
-        processBlock();
-        }
-
-        X[14] = (int)(bitLength & 0xffffffff);
-        X[15] = (int)(bitLength >>> 32);
-    }
-
-    private void unpackWord(
-        int word,
-        byte[] out,
-        int outOff)
-    {
-        out[outOff]     = (byte)word;
-        out[outOff + 1] = (byte)(word >>> 8);
-        out[outOff + 2] = (byte)(word >>> 16);
-        out[outOff + 3] = (byte)(word >>> 24);
-    }
-
-    public int doFinal(
-        byte[] out,
-        int outOff)
-    {
-        finish();
-
-        unpackWord(H0, out, outOff);
-        unpackWord(H1, out, outOff + 4);
-        unpackWord(H2, out, outOff + 8);
-        unpackWord(H3, out, outOff + 12);
-        unpackWord(H4, out, outOff + 16);
-        unpackWord(H5, out, outOff + 20);
-        unpackWord(H6, out, outOff + 24);
-        unpackWord(H7, out, outOff + 28);
-        unpackWord(H8, out, outOff + 32);
-        unpackWord(H9, out, outOff + 36);
-
-        reset();
-
-        return DIGEST_LENGTH;
-    }
-
-    /**
-    * reset the chaining variables to the IV values.
-    */
-    public void reset()
-    {
-        super.reset();
-
-        H0 = 0x67452301;
-        H1 = 0xefcdab89;
-        H2 = 0x98badcfe;
-        H3 = 0x10325476;
-        H4 = 0xc3d2e1f0;
-        H5 = 0x76543210; 
-        H6 = 0xFEDCBA98;
-        H7 = 0x89ABCDEF; 
-        H8 = 0x01234567; 
-        H9 = 0x3C2D1E0F;
-
-        xOff = 0;
-
-        for (int i = 0; i != X.length; i++)
-        {
-            X[i] = 0;
-        }
-    }
-
-    /*
-     * rotate int x left n bits.
-     */
-    private int RL(
-        int x,
-        int n)
-    {
-        return (x << n) | (x >>> (32 - n));
-    }
-
-    /*
-     * f1,f2,f3,f4,f5 are the basic RIPEMD160 functions.
-     */
-
-    /*
-     * rounds 0-15
-     */
-    private int f1(
-        int x,
-        int y,
-        int z)
-    {
-        return x ^ y ^ z;
-    }
-
-    /*
-     * rounds 16-31
-     */
-    private int f2(
-        int x,
-        int y,
-        int z)
-    {
-        return (x & y) | (~x & z);
-    }
-
-    /*
-     * rounds 32-47
-     */
-    private int f3(
-        int x,
-        int y,
-        int z)
-    {
-        return (x | ~y) ^ z;
-    }
-
-    /*
-     * rounds 48-63
-     */
-    private int f4(
-        int x,
-        int y,
-        int z)
-    {
-        return (x & z) | (y & ~z);
-    }
-
-    /*
-     * rounds 64-79
-     */
-    private int f5(
-        int x,
-        int y,
-        int z)
-    {
-        return x ^ (y | ~z);
-    }
-
-    protected void processBlock()
-    {
-        int a, aa;
-        int b, bb;
-        int c, cc;
-        int d, dd;
-        int e, ee;
-        int t;
-
-        a = H0;
-        b = H1;
-        c = H2;
-        d = H3;
-        e = H4;
-        aa = H5;
-        bb = H6;
-        cc = H7;
-        dd = H8;
-        ee = H9;
-        
-        //
-        // Rounds 1 - 16
-        //
-        // left
-        a = RL(a + f1(b,c,d) + X[ 0], 11) + e; c = RL(c, 10);
-        e = RL(e + f1(a,b,c) + X[ 1], 14) + d; b = RL(b, 10);
-        d = RL(d + f1(e,a,b) + X[ 2], 15) + c; a = RL(a, 10);
-        c = RL(c + f1(d,e,a) + X[ 3], 12) + b; e = RL(e, 10);
-        b = RL(b + f1(c,d,e) + X[ 4],  5) + a; d = RL(d, 10);
-        a = RL(a + f1(b,c,d) + X[ 5],  8) + e; c = RL(c, 10);
-        e = RL(e + f1(a,b,c) + X[ 6],  7) + d; b = RL(b, 10);
-        d = RL(d + f1(e,a,b) + X[ 7],  9) + c; a = RL(a, 10);
-        c = RL(c + f1(d,e,a) + X[ 8], 11) + b; e = RL(e, 10);
-        b = RL(b + f1(c,d,e) + X[ 9], 13) + a; d = RL(d, 10);
-        a = RL(a + f1(b,c,d) + X[10], 14) + e; c = RL(c, 10);
-        e = RL(e + f1(a,b,c) + X[11], 15) + d; b = RL(b, 10);
-        d = RL(d + f1(e,a,b) + X[12],  6) + c; a = RL(a, 10);
-        c = RL(c + f1(d,e,a) + X[13],  7) + b; e = RL(e, 10);
-        b = RL(b + f1(c,d,e) + X[14],  9) + a; d = RL(d, 10);
-        a = RL(a + f1(b,c,d) + X[15],  8) + e; c = RL(c, 10);
-
-        // right
-        aa = RL(aa + f5(bb,cc,dd) + X[ 5] + 0x50a28be6,  8) + ee; cc = RL(cc, 10);
-        ee = RL(ee + f5(aa,bb,cc) + X[14] + 0x50a28be6,  9) + dd; bb = RL(bb, 10);
-        dd = RL(dd + f5(ee,aa,bb) + X[ 7] + 0x50a28be6,  9) + cc; aa = RL(aa, 10);
-        cc = RL(cc + f5(dd,ee,aa) + X[ 0] + 0x50a28be6, 11) + bb; ee = RL(ee, 10);
-        bb = RL(bb + f5(cc,dd,ee) + X[ 9] + 0x50a28be6, 13) + aa; dd = RL(dd, 10);
-        aa = RL(aa + f5(bb,cc,dd) + X[ 2] + 0x50a28be6, 15) + ee; cc = RL(cc, 10);
-        ee = RL(ee + f5(aa,bb,cc) + X[11] + 0x50a28be6, 15) + dd; bb = RL(bb, 10);
-        dd = RL(dd + f5(ee,aa,bb) + X[ 4] + 0x50a28be6,  5) + cc; aa = RL(aa, 10);
-        cc = RL(cc + f5(dd,ee,aa) + X[13] + 0x50a28be6,  7) + bb; ee = RL(ee, 10);
-        bb = RL(bb + f5(cc,dd,ee) + X[ 6] + 0x50a28be6,  7) + aa; dd = RL(dd, 10);
-        aa = RL(aa + f5(bb,cc,dd) + X[15] + 0x50a28be6,  8) + ee; cc = RL(cc, 10);
-        ee = RL(ee + f5(aa,bb,cc) + X[ 8] + 0x50a28be6, 11) + dd; bb = RL(bb, 10);
-        dd = RL(dd + f5(ee,aa,bb) + X[ 1] + 0x50a28be6, 14) + cc; aa = RL(aa, 10);
-        cc = RL(cc + f5(dd,ee,aa) + X[10] + 0x50a28be6, 14) + bb; ee = RL(ee, 10);
-        bb = RL(bb + f5(cc,dd,ee) + X[ 3] + 0x50a28be6, 12) + aa; dd = RL(dd, 10);
-        aa = RL(aa + f5(bb,cc,dd) + X[12] + 0x50a28be6,  6) + ee; cc = RL(cc, 10);
-
-        t = a; a = aa; aa = t;
-
-        //
-        // Rounds 16-31
-        //
-        // left
-        e = RL(e + f2(a,b,c) + X[ 7] + 0x5a827999,  7) + d; b = RL(b, 10);
-        d = RL(d + f2(e,a,b) + X[ 4] + 0x5a827999,  6) + c; a = RL(a, 10);
-        c = RL(c + f2(d,e,a) + X[13] + 0x5a827999,  8) + b; e = RL(e, 10);
-        b = RL(b + f2(c,d,e) + X[ 1] + 0x5a827999, 13) + a; d = RL(d, 10);
-        a = RL(a + f2(b,c,d) + X[10] + 0x5a827999, 11) + e; c = RL(c, 10);
-        e = RL(e + f2(a,b,c) + X[ 6] + 0x5a827999,  9) + d; b = RL(b, 10);
-        d = RL(d + f2(e,a,b) + X[15] + 0x5a827999,  7) + c; a = RL(a, 10);
-        c = RL(c + f2(d,e,a) + X[ 3] + 0x5a827999, 15) + b; e = RL(e, 10);
-        b = RL(b + f2(c,d,e) + X[12] + 0x5a827999,  7) + a; d = RL(d, 10);
-        a = RL(a + f2(b,c,d) + X[ 0] + 0x5a827999, 12) + e; c = RL(c, 10);
-        e = RL(e + f2(a,b,c) + X[ 9] + 0x5a827999, 15) + d; b = RL(b, 10);
-        d = RL(d + f2(e,a,b) + X[ 5] + 0x5a827999,  9) + c; a = RL(a, 10);
-        c = RL(c + f2(d,e,a) + X[ 2] + 0x5a827999, 11) + b; e = RL(e, 10);
-        b = RL(b + f2(c,d,e) + X[14] + 0x5a827999,  7) + a; d = RL(d, 10);
-        a = RL(a + f2(b,c,d) + X[11] + 0x5a827999, 13) + e; c = RL(c, 10);
-        e = RL(e + f2(a,b,c) + X[ 8] + 0x5a827999, 12) + d; b = RL(b, 10);
-
-        // right
-        ee = RL(ee + f4(aa,bb,cc) + X[ 6] + 0x5c4dd124,  9) + dd; bb = RL(bb, 10);
-        dd = RL(dd + f4(ee,aa,bb) + X[11] + 0x5c4dd124, 13) + cc; aa = RL(aa, 10);
-        cc = RL(cc + f4(dd,ee,aa) + X[ 3] + 0x5c4dd124, 15) + bb; ee = RL(ee, 10);
-        bb = RL(bb + f4(cc,dd,ee) + X[ 7] + 0x5c4dd124,  7) + aa; dd = RL(dd, 10);
-        aa = RL(aa + f4(bb,cc,dd) + X[ 0] + 0x5c4dd124, 12) + ee; cc = RL(cc, 10);
-        ee = RL(ee + f4(aa,bb,cc) + X[13] + 0x5c4dd124,  8) + dd; bb = RL(bb, 10);
-        dd = RL(dd + f4(ee,aa,bb) + X[ 5] + 0x5c4dd124,  9) + cc; aa = RL(aa, 10);
-        cc = RL(cc + f4(dd,ee,aa) + X[10] + 0x5c4dd124, 11) + bb; ee = RL(ee, 10);
-        bb = RL(bb + f4(cc,dd,ee) + X[14] + 0x5c4dd124,  7) + aa; dd = RL(dd, 10);
-        aa = RL(aa + f4(bb,cc,dd) + X[15] + 0x5c4dd124,  7) + ee; cc = RL(cc, 10);
-        ee = RL(ee + f4(aa,bb,cc) + X[ 8] + 0x5c4dd124, 12) + dd; bb = RL(bb, 10);
-        dd = RL(dd + f4(ee,aa,bb) + X[12] + 0x5c4dd124,  7) + cc; aa = RL(aa, 10);
-        cc = RL(cc + f4(dd,ee,aa) + X[ 4] + 0x5c4dd124,  6) + bb; ee = RL(ee, 10);
-        bb = RL(bb + f4(cc,dd,ee) + X[ 9] + 0x5c4dd124, 15) + aa; dd = RL(dd, 10);
-        aa = RL(aa + f4(bb,cc,dd) + X[ 1] + 0x5c4dd124, 13) + ee; cc = RL(cc, 10);
-        ee = RL(ee + f4(aa,bb,cc) + X[ 2] + 0x5c4dd124, 11) + dd; bb = RL(bb, 10);
-
-        t = b; b = bb; bb = t;
-
-        //
-        // Rounds 32-47
-        //
-        // left
-        d = RL(d + f3(e,a,b) + X[ 3] + 0x6ed9eba1, 11) + c; a = RL(a, 10);
-        c = RL(c + f3(d,e,a) + X[10] + 0x6ed9eba1, 13) + b; e = RL(e, 10);
-        b = RL(b + f3(c,d,e) + X[14] + 0x6ed9eba1,  6) + a; d = RL(d, 10);
-        a = RL(a + f3(b,c,d) + X[ 4] + 0x6ed9eba1,  7) + e; c = RL(c, 10);
-        e = RL(e + f3(a,b,c) + X[ 9] + 0x6ed9eba1, 14) + d; b = RL(b, 10);
-        d = RL(d + f3(e,a,b) + X[15] + 0x6ed9eba1,  9) + c; a = RL(a, 10);
-        c = RL(c + f3(d,e,a) + X[ 8] + 0x6ed9eba1, 13) + b; e = RL(e, 10);
-        b = RL(b + f3(c,d,e) + X[ 1] + 0x6ed9eba1, 15) + a; d = RL(d, 10);
-        a = RL(a + f3(b,c,d) + X[ 2] + 0x6ed9eba1, 14) + e; c = RL(c, 10);
-        e = RL(e + f3(a,b,c) + X[ 7] + 0x6ed9eba1,  8) + d; b = RL(b, 10);
-        d = RL(d + f3(e,a,b) + X[ 0] + 0x6ed9eba1, 13) + c; a = RL(a, 10);
-        c = RL(c + f3(d,e,a) + X[ 6] + 0x6ed9eba1,  6) + b; e = RL(e, 10);
-        b = RL(b + f3(c,d,e) + X[13] + 0x6ed9eba1,  5) + a; d = RL(d, 10);
-        a = RL(a + f3(b,c,d) + X[11] + 0x6ed9eba1, 12) + e; c = RL(c, 10);
-        e = RL(e + f3(a,b,c) + X[ 5] + 0x6ed9eba1,  7) + d; b = RL(b, 10);
-        d = RL(d + f3(e,a,b) + X[12] + 0x6ed9eba1,  5) + c; a = RL(a, 10);
-
-        // right
-        dd = RL(dd + f3(ee,aa,bb) + X[15] + 0x6d703ef3,  9) + cc; aa = RL(aa, 10);
-        cc = RL(cc + f3(dd,ee,aa) + X[ 5] + 0x6d703ef3,  7) + bb; ee = RL(ee, 10);
-        bb = RL(bb + f3(cc,dd,ee) + X[ 1] + 0x6d703ef3, 15) + aa; dd = RL(dd, 10);
-        aa = RL(aa + f3(bb,cc,dd) + X[ 3] + 0x6d703ef3, 11) + ee; cc = RL(cc, 10);
-        ee = RL(ee + f3(aa,bb,cc) + X[ 7] + 0x6d703ef3,  8) + dd; bb = RL(bb, 10);
-        dd = RL(dd + f3(ee,aa,bb) + X[14] + 0x6d703ef3,  6) + cc; aa = RL(aa, 10);
-        cc = RL(cc + f3(dd,ee,aa) + X[ 6] + 0x6d703ef3,  6) + bb; ee = RL(ee, 10);
-        bb = RL(bb + f3(cc,dd,ee) + X[ 9] + 0x6d703ef3, 14) + aa; dd = RL(dd, 10);
-        aa = RL(aa + f3(bb,cc,dd) + X[11] + 0x6d703ef3, 12) + ee; cc = RL(cc, 10);
-        ee = RL(ee + f3(aa,bb,cc) + X[ 8] + 0x6d703ef3, 13) + dd; bb = RL(bb, 10);
-        dd = RL(dd + f3(ee,aa,bb) + X[12] + 0x6d703ef3,  5) + cc; aa = RL(aa, 10);
-        cc = RL(cc + f3(dd,ee,aa) + X[ 2] + 0x6d703ef3, 14) + bb; ee = RL(ee, 10);
-        bb = RL(bb + f3(cc,dd,ee) + X[10] + 0x6d703ef3, 13) + aa; dd = RL(dd, 10);
-        aa = RL(aa + f3(bb,cc,dd) + X[ 0] + 0x6d703ef3, 13) + ee; cc = RL(cc, 10);
-        ee = RL(ee + f3(aa,bb,cc) + X[ 4] + 0x6d703ef3,  7) + dd; bb = RL(bb, 10);
-        dd = RL(dd + f3(ee,aa,bb) + X[13] + 0x6d703ef3,  5) + cc; aa = RL(aa, 10);
-
-        t = c; c = cc; cc = t;
-
-        //
-        // Rounds 48-63
-        //
-        // left
-        c = RL(c + f4(d,e,a) + X[ 1] + 0x8f1bbcdc, 11) + b; e = RL(e, 10);
-        b = RL(b + f4(c,d,e) + X[ 9] + 0x8f1bbcdc, 12) + a; d = RL(d, 10);
-        a = RL(a + f4(b,c,d) + X[11] + 0x8f1bbcdc, 14) + e; c = RL(c, 10);
-        e = RL(e + f4(a,b,c) + X[10] + 0x8f1bbcdc, 15) + d; b = RL(b, 10);
-        d = RL(d + f4(e,a,b) + X[ 0] + 0x8f1bbcdc, 14) + c; a = RL(a, 10);
-        c = RL(c + f4(d,e,a) + X[ 8] + 0x8f1bbcdc, 15) + b; e = RL(e, 10);
-        b = RL(b + f4(c,d,e) + X[12] + 0x8f1bbcdc,  9) + a; d = RL(d, 10);
-        a = RL(a + f4(b,c,d) + X[ 4] + 0x8f1bbcdc,  8) + e; c = RL(c, 10);
-        e = RL(e + f4(a,b,c) + X[13] + 0x8f1bbcdc,  9) + d; b = RL(b, 10);
-        d = RL(d + f4(e,a,b) + X[ 3] + 0x8f1bbcdc, 14) + c; a = RL(a, 10);
-        c = RL(c + f4(d,e,a) + X[ 7] + 0x8f1bbcdc,  5) + b; e = RL(e, 10);
-        b = RL(b + f4(c,d,e) + X[15] + 0x8f1bbcdc,  6) + a; d = RL(d, 10);
-        a = RL(a + f4(b,c,d) + X[14] + 0x8f1bbcdc,  8) + e; c = RL(c, 10);
-        e = RL(e + f4(a,b,c) + X[ 5] + 0x8f1bbcdc,  6) + d; b = RL(b, 10);
-        d = RL(d + f4(e,a,b) + X[ 6] + 0x8f1bbcdc,  5) + c; a = RL(a, 10);
-        c = RL(c + f4(d,e,a) + X[ 2] + 0x8f1bbcdc, 12) + b; e = RL(e, 10);
-
-        // right
-        cc = RL(cc + f2(dd,ee,aa) + X[ 8] + 0x7a6d76e9, 15) + bb; ee = RL(ee, 10);
-        bb = RL(bb + f2(cc,dd,ee) + X[ 6] + 0x7a6d76e9,  5) + aa; dd = RL(dd, 10);
-        aa = RL(aa + f2(bb,cc,dd) + X[ 4] + 0x7a6d76e9,  8) + ee; cc = RL(cc, 10);
-        ee = RL(ee + f2(aa,bb,cc) + X[ 1] + 0x7a6d76e9, 11) + dd; bb = RL(bb, 10);
-        dd = RL(dd + f2(ee,aa,bb) + X[ 3] + 0x7a6d76e9, 14) + cc; aa = RL(aa, 10);
-        cc = RL(cc + f2(dd,ee,aa) + X[11] + 0x7a6d76e9, 14) + bb; ee = RL(ee, 10);
-        bb = RL(bb + f2(cc,dd,ee) + X[15] + 0x7a6d76e9,  6) + aa; dd = RL(dd, 10);
-        aa = RL(aa + f2(bb,cc,dd) + X[ 0] + 0x7a6d76e9, 14) + ee; cc = RL(cc, 10);
-        ee = RL(ee + f2(aa,bb,cc) + X[ 5] + 0x7a6d76e9,  6) + dd; bb = RL(bb, 10);
-        dd = RL(dd + f2(ee,aa,bb) + X[12] + 0x7a6d76e9,  9) + cc; aa = RL(aa, 10);
-        cc = RL(cc + f2(dd,ee,aa) + X[ 2] + 0x7a6d76e9, 12) + bb; ee = RL(ee, 10);
-        bb = RL(bb + f2(cc,dd,ee) + X[13] + 0x7a6d76e9,  9) + aa; dd = RL(dd, 10);
-        aa = RL(aa + f2(bb,cc,dd) + X[ 9] + 0x7a6d76e9, 12) + ee; cc = RL(cc, 10);
-        ee = RL(ee + f2(aa,bb,cc) + X[ 7] + 0x7a6d76e9,  5) + dd; bb = RL(bb, 10);
-        dd = RL(dd + f2(ee,aa,bb) + X[10] + 0x7a6d76e9, 15) + cc; aa = RL(aa, 10);
-        cc = RL(cc + f2(dd,ee,aa) + X[14] + 0x7a6d76e9,  8) + bb; ee = RL(ee, 10);
-
-       t = d; d = dd; dd = t;
-
-        //
-        // Rounds 64-79
-        //
-        // left
-        b = RL(b + f5(c,d,e) + X[ 4] + 0xa953fd4e,  9) + a; d = RL(d, 10);
-        a = RL(a + f5(b,c,d) + X[ 0] + 0xa953fd4e, 15) + e; c = RL(c, 10);
-        e = RL(e + f5(a,b,c) + X[ 5] + 0xa953fd4e,  5) + d; b = RL(b, 10);
-        d = RL(d + f5(e,a,b) + X[ 9] + 0xa953fd4e, 11) + c; a = RL(a, 10);
-        c = RL(c + f5(d,e,a) + X[ 7] + 0xa953fd4e,  6) + b; e = RL(e, 10);
-        b = RL(b + f5(c,d,e) + X[12] + 0xa953fd4e,  8) + a; d = RL(d, 10);
-        a = RL(a + f5(b,c,d) + X[ 2] + 0xa953fd4e, 13) + e; c = RL(c, 10);
-        e = RL(e + f5(a,b,c) + X[10] + 0xa953fd4e, 12) + d; b = RL(b, 10);
-        d = RL(d + f5(e,a,b) + X[14] + 0xa953fd4e,  5) + c; a = RL(a, 10);
-        c = RL(c + f5(d,e,a) + X[ 1] + 0xa953fd4e, 12) + b; e = RL(e, 10);
-        b = RL(b + f5(c,d,e) + X[ 3] + 0xa953fd4e, 13) + a; d = RL(d, 10);
-        a = RL(a + f5(b,c,d) + X[ 8] + 0xa953fd4e, 14) + e; c = RL(c, 10);
-        e = RL(e + f5(a,b,c) + X[11] + 0xa953fd4e, 11) + d; b = RL(b, 10);
-        d = RL(d + f5(e,a,b) + X[ 6] + 0xa953fd4e,  8) + c; a = RL(a, 10);
-        c = RL(c + f5(d,e,a) + X[15] + 0xa953fd4e,  5) + b; e = RL(e, 10);
-        b = RL(b + f5(c,d,e) + X[13] + 0xa953fd4e,  6) + a; d = RL(d, 10);
-
-        // right
-        bb = RL(bb + f1(cc,dd,ee) + X[12],  8) + aa; dd = RL(dd, 10);
-        aa = RL(aa + f1(bb,cc,dd) + X[15],  5) + ee; cc = RL(cc, 10);
-        ee = RL(ee + f1(aa,bb,cc) + X[10], 12) + dd; bb = RL(bb, 10);
-        dd = RL(dd + f1(ee,aa,bb) + X[ 4],  9) + cc; aa = RL(aa, 10);
-        cc = RL(cc + f1(dd,ee,aa) + X[ 1], 12) + bb; ee = RL(ee, 10);
-        bb = RL(bb + f1(cc,dd,ee) + X[ 5],  5) + aa; dd = RL(dd, 10);
-        aa = RL(aa + f1(bb,cc,dd) + X[ 8], 14) + ee; cc = RL(cc, 10);
-        ee = RL(ee + f1(aa,bb,cc) + X[ 7],  6) + dd; bb = RL(bb, 10);
-        dd = RL(dd + f1(ee,aa,bb) + X[ 6],  8) + cc; aa = RL(aa, 10);
-        cc = RL(cc + f1(dd,ee,aa) + X[ 2], 13) + bb; ee = RL(ee, 10);
-        bb = RL(bb + f1(cc,dd,ee) + X[13],  6) + aa; dd = RL(dd, 10);
-        aa = RL(aa + f1(bb,cc,dd) + X[14],  5) + ee; cc = RL(cc, 10);
-        ee = RL(ee + f1(aa,bb,cc) + X[ 0], 15) + dd; bb = RL(bb, 10);
-        dd = RL(dd + f1(ee,aa,bb) + X[ 3], 13) + cc; aa = RL(aa, 10);
-        cc = RL(cc + f1(dd,ee,aa) + X[ 9], 11) + bb; ee = RL(ee, 10);
-        bb = RL(bb + f1(cc,dd,ee) + X[11], 11) + aa; dd = RL(dd, 10);
-
-        //
-        // do (e, ee) swap as part of assignment.
-        //
-
-        H0 += a;
-        H1 += b;
-        H2 += c;
-        H3 += d;
-        H4 += ee;
-        H5 += aa;
-        H6 += bb;
-        H7 += cc;
-        H8 += dd;
-        H9 += e;
-        
-        //
-        // reset the offset and clean out the word buffer.
-        //
-        xOff = 0;
-        for (int i = 0; i != X.length; i++)
-        {
-            X[i] = 0;
-        }
-    }
-
-    public Memoable copy()
-    {
-        return new RIPEMD320Digest(this);
-    }
-
-    public void reset(Memoable other)
-    {
-        RIPEMD320Digest d = (RIPEMD320Digest)other;
-
-        doCopy(d);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/digests/SHA3Digest.java b/bcprov/src/main/java/org/bouncycastle/crypto/digests/SHA3Digest.java
deleted file mode 100644
index e13dc61..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/digests/SHA3Digest.java
+++ /dev/null
@@ -1,547 +0,0 @@
-package org.bouncycastle.crypto.digests;
-
-import org.bouncycastle.crypto.ExtendedDigest;
-import org.bouncycastle.util.Arrays;
-
-/**
- * implementation of SHA-3 based on following KeccakNISTInterface.c from http://keccak.noekeon.org/
- * <p>
- * Following the naming conventions used in the C source code to enable easy review of the implementation.
- */
-public class SHA3Digest
-    implements ExtendedDigest
-{
-    private static long[] KeccakRoundConstants = keccakInitializeRoundConstants();
-
-    private static int[] KeccakRhoOffsets = keccakInitializeRhoOffsets();
-
-    private static long[] keccakInitializeRoundConstants()
-    {
-        long[] keccakRoundConstants = new long[24];
-        byte[] LFSRstate = new byte[1];
-
-        LFSRstate[0] = 0x01;
-        int i, j, bitPosition;
-
-        for (i = 0; i < 24; i++)
-        {
-            keccakRoundConstants[i] = 0;
-            for (j = 0; j < 7; j++)
-            {
-                bitPosition = (1 << j) - 1;
-                if (LFSR86540(LFSRstate))
-                {
-                    keccakRoundConstants[i] ^= 1L << bitPosition;
-                }
-            }
-        }
-
-        return keccakRoundConstants;
-    }
-
-    private static boolean LFSR86540(byte[] LFSR)
-    {
-        boolean result = (((LFSR[0]) & 0x01) != 0);
-        if (((LFSR[0]) & 0x80) != 0)
-        {
-            LFSR[0] = (byte)(((LFSR[0]) << 1) ^ 0x71);
-        }
-        else
-        {
-            LFSR[0] <<= 1;
-        }
-
-        return result;
-    }
-
-    private static int[] keccakInitializeRhoOffsets()
-    {
-        int[] keccakRhoOffsets = new int[25];
-        int x, y, t, newX, newY;
-
-        keccakRhoOffsets[(((0) % 5) + 5 * ((0) % 5))] = 0;
-        x = 1;
-        y = 0;
-        for (t = 0; t < 24; t++)
-        {
-            keccakRhoOffsets[(((x) % 5) + 5 * ((y) % 5))] = ((t + 1) * (t + 2) / 2) % 64;
-            newX = (0 * x + 1 * y) % 5;
-            newY = (2 * x + 3 * y) % 5;
-            x = newX;
-            y = newY;
-        }
-
-        return keccakRhoOffsets;
-    }
-
-    private byte[] state = new byte[(1600 / 8)];
-    private byte[] dataQueue = new byte[(1536 / 8)];
-    private int rate;
-    private int bitsInQueue;
-    private int fixedOutputLength;
-    private boolean squeezing;
-    private int bitsAvailableForSqueezing;
-    private byte[] chunk;
-    private byte[] oneByte;
-
-    private void clearDataQueueSection(int off, int len)
-    {
-        for (int i = off; i != off + len; i++)
-        {
-            dataQueue[i] = 0;
-        }
-    }
-
-    public SHA3Digest()
-    {
-        init(0);
-    }
-
-    public SHA3Digest(int bitLength)
-    {
-        init(bitLength);
-    }
-
-    public SHA3Digest(SHA3Digest source) {
-        System.arraycopy(source.state, 0, this.state, 0, source.state.length);
-        System.arraycopy(source.dataQueue, 0, this.dataQueue, 0, source.dataQueue.length);
-        this.rate = source.rate;
-        this.bitsInQueue = source.bitsInQueue;
-        this.fixedOutputLength = source.fixedOutputLength;
-        this.squeezing = source.squeezing;
-        this.bitsAvailableForSqueezing = source.bitsAvailableForSqueezing;
-        this.chunk = Arrays.clone(source.chunk);
-        this.oneByte = Arrays.clone(source.oneByte);
-    }
-
-    public String getAlgorithmName()
-    {
-        return "SHA3-" + fixedOutputLength;
-    }
-
-    public int getDigestSize()
-    {
-        return fixedOutputLength / 8;
-    }
-
-    public void update(byte in)
-    {
-        oneByte[0] = in;
-
-        doUpdate(oneByte, 0, 8L);
-    }
-
-    public void update(byte[] in, int inOff, int len)
-    {
-        doUpdate(in, inOff, len * 8L);
-    }
-
-    public int doFinal(byte[] out, int outOff)
-    {
-        squeeze(out, outOff, fixedOutputLength);
-
-        reset();
-
-        return getDigestSize();
-    }
-
-    public void reset()
-    {
-        init(fixedOutputLength);
-    }
-
-    /**
-     * Return the size of block that the compression function is applied to in bytes.
-     *
-     * @return internal byte length of a block.
-     */
-    public int getByteLength()
-    {
-        return rate / 8;
-    }
-
-    private void init(int bitLength)
-    {
-        switch (bitLength)
-        {
-        case 0:
-        case 288:
-            initSponge(1024, 576);
-            break;
-        case 224:
-            initSponge(1152, 448);
-            break;
-        case 256:
-            initSponge(1088, 512);
-            break;
-        case 384:
-            initSponge(832, 768);
-            break;
-        case 512:
-            initSponge(576, 1024);
-            break;
-        default:
-            throw new IllegalArgumentException("bitLength must be one of 224, 256, 384, or 512.");
-        }
-    }
-
-    private void doUpdate(byte[] data, int off, long databitlen)
-    {
-        if ((databitlen % 8) == 0)
-        {
-            absorb(data, off, databitlen);
-        }
-        else
-        {
-            absorb(data, off, databitlen - (databitlen % 8));
-
-            byte[] lastByte = new byte[1];
-
-            lastByte[0] = (byte)(data[off + (int)(databitlen / 8)] >> (8 - (databitlen % 8)));
-            absorb(lastByte, off, databitlen % 8);
-        }
-    }
-
-    private void initSponge(int rate, int capacity)
-    {
-        if (rate + capacity != 1600)
-        {
-            throw new IllegalStateException("rate + capacity != 1600");
-        }
-        if ((rate <= 0) || (rate >= 1600) || ((rate % 64) != 0))
-        {
-            throw new IllegalStateException("invalid rate value");
-        }
-
-        this.rate = rate;
-        // this is never read, need to check to see why we want to save it
-        //  this.capacity = capacity;
-        this.fixedOutputLength = 0;
-        Arrays.fill(this.state, (byte)0);
-        Arrays.fill(this.dataQueue, (byte)0);
-        this.bitsInQueue = 0;
-        this.squeezing = false;
-        this.bitsAvailableForSqueezing = 0;
-        this.fixedOutputLength = capacity / 2;
-        this.chunk = new byte[rate / 8];
-        this.oneByte = new byte[1];
-    }
-
-    private void absorbQueue()
-    {
-        KeccakAbsorb(state, dataQueue, rate / 8);
-
-        bitsInQueue = 0;
-    }
-
-    private void absorb(byte[] data, int off, long databitlen)
-    {
-        long i, j, wholeBlocks;
-
-        if ((bitsInQueue % 8) != 0)
-        {
-            throw new IllegalStateException("attempt to absorb with odd length queue.");
-        }
-        if (squeezing)
-        {
-            throw new IllegalStateException("attempt to absorb while squeezing.");
-        }
-
-        i = 0;
-        while (i < databitlen)
-        {
-            if ((bitsInQueue == 0) && (databitlen >= rate) && (i <= (databitlen - rate)))
-            {
-                wholeBlocks = (databitlen - i) / rate;
-
-                for (j = 0; j < wholeBlocks; j++)
-                {
-                    System.arraycopy(data, (int)(off + (i / 8) + (j * chunk.length)), chunk, 0, chunk.length);
-
-//                            displayIntermediateValues.displayBytes(1, "Block to be absorbed", curData, rate / 8);
-
-                    KeccakAbsorb(state, chunk, chunk.length);
-                }
-
-                i += wholeBlocks * rate;
-            }
-            else
-            {
-                int partialBlock = (int)(databitlen - i);
-                if (partialBlock + bitsInQueue > rate)
-                {
-                    partialBlock = rate - bitsInQueue;
-                }
-                int partialByte = partialBlock % 8;
-                partialBlock -= partialByte;
-                System.arraycopy(data, off + (int)(i / 8), dataQueue, bitsInQueue / 8, partialBlock / 8);
-
-                bitsInQueue += partialBlock;
-                i += partialBlock;
-                if (bitsInQueue == rate)
-                {
-                    absorbQueue();
-                }
-                if (partialByte > 0)
-                {
-                    int mask = (1 << partialByte) - 1;
-                    dataQueue[bitsInQueue / 8] = (byte)(data[off + ((int)(i / 8))] & mask);
-                    bitsInQueue += partialByte;
-                    i += partialByte;
-                }
-            }
-        }
-    }
-
-    private void padAndSwitchToSqueezingPhase()
-    {
-        if (bitsInQueue + 1 == rate)
-        {
-            dataQueue[bitsInQueue / 8] |= 1 << (bitsInQueue % 8);
-            absorbQueue();
-            clearDataQueueSection(0, rate / 8);
-        }
-        else
-        {
-            clearDataQueueSection((bitsInQueue + 7) / 8, rate / 8 - (bitsInQueue + 7) / 8);
-            dataQueue[bitsInQueue / 8] |= 1 << (bitsInQueue % 8);
-        }
-        dataQueue[(rate - 1) / 8] |= 1 << ((rate - 1) % 8);
-        absorbQueue();
-
-
-//            displayIntermediateValues.displayText(1, "--- Switching to squeezing phase ---");
-
-
-        if (rate == 1024)
-        {
-            KeccakExtract1024bits(state, dataQueue);
-            bitsAvailableForSqueezing = 1024;
-        }
-        else
-
-        {
-            KeccakExtract(state, dataQueue, rate / 64);
-            bitsAvailableForSqueezing = rate;
-        }
-
-//            displayIntermediateValues.displayBytes(1, "Block available for squeezing", dataQueue, bitsAvailableForSqueezing / 8);
-
-        squeezing = true;
-    }
-
-    private void squeeze(byte[] output, int offset, long outputLength)
-    {
-        long i;
-        int partialBlock;
-
-        if (!squeezing)
-        {
-            padAndSwitchToSqueezingPhase();
-        }
-        if ((outputLength % 8) != 0)
-        {
-            throw new IllegalStateException("outputLength not a multiple of 8");
-        }
-
-        i = 0;
-        while (i < outputLength)
-        {
-            if (bitsAvailableForSqueezing == 0)
-            {
-                keccakPermutation(state);
-
-                if (rate == 1024)
-                {
-                    KeccakExtract1024bits(state, dataQueue);
-                    bitsAvailableForSqueezing = 1024;
-                }
-                else
-
-                {
-                    KeccakExtract(state, dataQueue, rate / 64);
-                    bitsAvailableForSqueezing = rate;
-                }
-
-//                    displayIntermediateValues.displayBytes(1, "Block available for squeezing", dataQueue, bitsAvailableForSqueezing / 8);
-
-            }
-            partialBlock = bitsAvailableForSqueezing;
-            if ((long)partialBlock > outputLength - i)
-            {
-                partialBlock = (int)(outputLength - i);
-            }
-
-            System.arraycopy(dataQueue, (rate - bitsAvailableForSqueezing) / 8, output, offset + (int)(i / 8), partialBlock / 8);
-            bitsAvailableForSqueezing -= partialBlock;
-            i += partialBlock;
-        }
-    }
-
-    private void fromBytesToWords(long[] stateAsWords, byte[] state)
-    {
-        for (int i = 0; i < (1600 / 64); i++)
-        {
-            stateAsWords[i] = 0;
-            int index = i * (64 / 8);
-            for (int j = 0; j < (64 / 8); j++)
-            {
-                stateAsWords[i] |= ((long)state[index + j] & 0xff) << ((8 * j));
-            }
-        }
-    }
-
-    private void fromWordsToBytes(byte[] state, long[] stateAsWords)
-    {
-        for (int i = 0; i < (1600 / 64); i++)
-        {
-            int index = i * (64 / 8);
-            for (int j = 0; j < (64 / 8); j++)
-            {
-                state[index + j] = (byte)((stateAsWords[i] >>> ((8 * j))) & 0xFF);
-            }
-        }
-    }
-
-    private void keccakPermutation(byte[] state)
-    {
-        long[] longState = new long[state.length / 8];
-
-        fromBytesToWords(longState, state);
-
-//        displayIntermediateValues.displayStateAsBytes(1, "Input of permutation", longState);
-
-        keccakPermutationOnWords(longState);
-
-//        displayIntermediateValues.displayStateAsBytes(1, "State after permutation", longState);
-
-        fromWordsToBytes(state, longState);
-    }
-
-    private void keccakPermutationAfterXor(byte[] state, byte[] data, int dataLengthInBytes)
-    {
-        int i;
-
-        for (i = 0; i < dataLengthInBytes; i++)
-        {
-            state[i] ^= data[i];
-        }
-
-        keccakPermutation(state);
-    }
-
-    private void keccakPermutationOnWords(long[] state)
-    {
-        int i;
-
-//        displayIntermediateValues.displayStateAs64bitWords(3, "Same, with lanes as 64-bit words", state);
-
-        for (i = 0; i < 24; i++)
-        {
-//            displayIntermediateValues.displayRoundNumber(3, i);
-
-            theta(state);
-//            displayIntermediateValues.displayStateAs64bitWords(3, "After theta", state);
-
-            rho(state);
-//            displayIntermediateValues.displayStateAs64bitWords(3, "After rho", state);
-
-            pi(state);
-//            displayIntermediateValues.displayStateAs64bitWords(3, "After pi", state);
-
-            chi(state);
-//            displayIntermediateValues.displayStateAs64bitWords(3, "After chi", state);
-
-            iota(state, i);
-//            displayIntermediateValues.displayStateAs64bitWords(3, "After iota", state);
-        }
-    }
-
-    long[] C = new long[5];
-
-    private void theta(long[] A)
-    {
-        for (int x = 0; x < 5; x++)
-        {
-            C[x] = 0;
-            for (int y = 0; y < 5; y++)
-            {
-                C[x] ^= A[x + 5 * y];
-            }
-        }
-        for (int x = 0; x < 5; x++)
-        {
-            long dX = ((((C[(x + 1) % 5]) << 1) ^ ((C[(x + 1) % 5]) >>> (64 - 1)))) ^ C[(x + 4) % 5];
-            for (int y = 0; y < 5; y++)
-            {
-                A[x + 5 * y] ^= dX;
-            }
-        }
-    }
-
-    private void rho(long[] A)
-    {
-        for (int x = 0; x < 5; x++)
-        {
-            for (int y = 0; y < 5; y++)
-            {
-                int index = x + 5 * y;
-                A[index] = ((KeccakRhoOffsets[index] != 0) ? (((A[index]) << KeccakRhoOffsets[index]) ^ ((A[index]) >>> (64 - KeccakRhoOffsets[index]))) : A[index]);
-            }
-        }
-    }
-
-    long[] tempA = new long[25];
-
-    private void pi(long[] A)
-    {
-        System.arraycopy(A, 0, tempA, 0, tempA.length);
-
-        for (int x = 0; x < 5; x++)
-        {
-            for (int y = 0; y < 5; y++)
-            {
-                A[y + 5 * ((2 * x + 3 * y) % 5)] = tempA[x + 5 * y];
-            }
-        }
-    }
-
-    long[] chiC = new long[5];
-
-    private void chi(long[] A)
-    {
-        for (int y = 0; y < 5; y++)
-        {
-            for (int x = 0; x < 5; x++)
-            {
-                chiC[x] = A[x + 5 * y] ^ ((~A[(((x + 1) % 5) + 5 * y)]) & A[(((x + 2) % 5) + 5 * y)]);
-            }
-            for (int x = 0; x < 5; x++)
-            {
-                A[x + 5 * y] = chiC[x];
-            }
-        }
-    }
-
-    private void iota(long[] A, int indexRound)
-    {
-        A[(((0) % 5) + 5 * ((0) % 5))] ^= KeccakRoundConstants[indexRound];
-    }
-
-    private void KeccakAbsorb(byte[] byteState, byte[] data, int dataInBytes)
-    {
-        keccakPermutationAfterXor(byteState, data, dataInBytes);
-    }
-
-
-    private void KeccakExtract1024bits(byte[] byteState, byte[] data)
-    {
-        System.arraycopy(byteState, 0, data, 0, 128);
-    }
-
-
-    private void KeccakExtract(byte[] byteState, byte[] data, int laneCount)
-    {
-        System.arraycopy(byteState, 0, data, 0, laneCount * 8);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/digests/SHA512tDigest.java b/bcprov/src/main/java/org/bouncycastle/crypto/digests/SHA512tDigest.java
deleted file mode 100644
index d5848b1..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/digests/SHA512tDigest.java
+++ /dev/null
@@ -1,227 +0,0 @@
-package org.bouncycastle.crypto.digests;
-
-import org.bouncycastle.util.Memoable;
-import org.bouncycastle.util.MemoableResetException;
-import org.bouncycastle.util.Pack;
-
-/**
- * FIPS 180-4 implementation of SHA-512/t
- */
-public class SHA512tDigest
-    extends LongDigest
-{
-    private int digestLength;      // non-final due to old flow analyser.
-
-    private long  H1t, H2t, H3t, H4t, H5t, H6t, H7t, H8t;
-
-    /**
-     * Standard constructor
-     */
-    public SHA512tDigest(int bitLength)
-    {
-        if (bitLength >= 512)
-        {
-            throw new IllegalArgumentException("bitLength cannot be >= 512");
-        }
-
-        if (bitLength % 8 != 0)
-        {
-            throw new IllegalArgumentException("bitLength needs to be a multiple of 8");
-        }
-
-        if (bitLength == 384)
-        {
-            throw new IllegalArgumentException("bitLength cannot be 384 use SHA384 instead");
-        }
-
-        this.digestLength = bitLength / 8;
-
-        tIvGenerate(digestLength * 8);
-
-        reset();
-    }
-
-    /**
-     * Copy constructor.  This will copy the state of the provided
-     * message digest.
-     */
-    public SHA512tDigest(SHA512tDigest t)
-    {
-        super(t);
-
-        this.digestLength = t.digestLength;
-
-        reset(t);
-    }
-
-    public SHA512tDigest(byte[] encodedState)
-    {
-        this(readDigestLength(encodedState));
-        restoreState(encodedState);
-    }
-
-    private static int readDigestLength(byte[] encodedState)
-    {
-        return Pack.bigEndianToInt(encodedState, encodedState.length - 4);
-    }
-
-    public String getAlgorithmName()
-    {
-        return "SHA-512/" + Integer.toString(digestLength * 8);
-    }
-
-    public int getDigestSize()
-    {
-        return digestLength;
-    }
-
-    public int doFinal(
-        byte[]  out,
-        int     outOff)
-    {
-        finish();
-
-        longToBigEndian(H1, out, outOff, digestLength);
-        longToBigEndian(H2, out, outOff + 8, digestLength - 8);
-        longToBigEndian(H3, out, outOff + 16, digestLength - 16);
-        longToBigEndian(H4, out, outOff + 24, digestLength - 24);
-        longToBigEndian(H5, out, outOff + 32, digestLength - 32);
-        longToBigEndian(H6, out, outOff + 40, digestLength - 40);
-        longToBigEndian(H7, out, outOff + 48, digestLength - 48);
-        longToBigEndian(H8, out, outOff + 56, digestLength - 56);
-
-        reset();
-
-        return digestLength;
-    }
-
-    /**
-     * reset the chaining variables
-     */
-    public void reset()
-    {
-        super.reset();
-
-        /*
-         * initial hash values use the iv generation algorithm for t.
-         */
-        H1 = H1t;
-        H2 = H2t;
-        H3 = H3t;
-        H4 = H4t;
-        H5 = H5t;
-        H6 = H6t;
-        H7 = H7t;
-        H8 = H8t;
-    }
-
-    private void tIvGenerate(int bitLength)
-    {
-        H1 = 0x6a09e667f3bcc908L ^ 0xa5a5a5a5a5a5a5a5L;
-        H2 = 0xbb67ae8584caa73bL ^ 0xa5a5a5a5a5a5a5a5L;
-        H3 = 0x3c6ef372fe94f82bL ^ 0xa5a5a5a5a5a5a5a5L;
-        H4 = 0xa54ff53a5f1d36f1L ^ 0xa5a5a5a5a5a5a5a5L;
-        H5 = 0x510e527fade682d1L ^ 0xa5a5a5a5a5a5a5a5L;
-        H6 = 0x9b05688c2b3e6c1fL ^ 0xa5a5a5a5a5a5a5a5L;
-        H7 = 0x1f83d9abfb41bd6bL ^ 0xa5a5a5a5a5a5a5a5L;
-        H8 = 0x5be0cd19137e2179L ^ 0xa5a5a5a5a5a5a5a5L;
-
-        update((byte)0x53);
-        update((byte)0x48);
-        update((byte)0x41);
-        update((byte)0x2D);
-        update((byte)0x35);
-        update((byte)0x31);
-        update((byte)0x32);
-        update((byte)0x2F);
-
-        if (bitLength > 100)
-        {
-            update((byte)(bitLength / 100 + 0x30));
-            bitLength = bitLength % 100;
-            update((byte)(bitLength / 10 + 0x30));
-            bitLength = bitLength % 10;
-            update((byte)(bitLength + 0x30));
-        }
-        else if (bitLength > 10)
-        {
-            update((byte)(bitLength / 10 + 0x30));
-            bitLength = bitLength % 10;
-            update((byte)(bitLength + 0x30));
-        }
-        else
-        {
-            update((byte)(bitLength + 0x30));
-        }
-
-        finish();
-
-        H1t = H1;
-        H2t = H2;
-        H3t = H3;
-        H4t = H4;
-        H5t = H5;
-        H6t = H6;
-        H7t = H7;
-        H8t = H8;
-    }
-
-    private static void longToBigEndian(long n, byte[] bs, int off, int max)
-    {
-        if (max > 0)
-        {
-            intToBigEndian((int)(n >>> 32), bs, off, max);
-
-            if (max > 4)
-            {
-                intToBigEndian((int)(n & 0xffffffffL), bs, off + 4, max - 4);
-            }
-        }
-    }
-
-    private static void intToBigEndian(int n, byte[] bs, int off, int max)
-    {
-        int num = Math.min(4, max);
-        while (--num >= 0)
-        {
-            int shift = 8 * (3 - num);
-            bs[off + num] = (byte)(n >>> shift);
-        }
-    }
-
-    public Memoable copy()
-    {
-        return new SHA512tDigest(this);
-    }
-
-    public void reset(Memoable other)
-    {
-        SHA512tDigest t = (SHA512tDigest)other;
-
-        if (this.digestLength != t.digestLength)
-        {
-            throw new MemoableResetException("digestLength inappropriate in other");
-        }
-
-        super.copyIn(t);
-
-        this.H1t = t.H1t;
-        this.H2t = t.H2t;
-        this.H3t = t.H3t;
-        this.H4t = t.H4t;
-        this.H5t = t.H5t;
-        this.H6t = t.H6t;
-        this.H7t = t.H7t;
-        this.H8t = t.H8t;
-    }
-
-    public byte[] getEncodedState()
-    {
-        final int baseSize = getEncodedStateSize();
-        byte[] encoded = new byte[baseSize + 4];
-        populateState(encoded);
-        Pack.intToBigEndian(digestLength * 8, encoded, baseSize);
-        return encoded;
-    }
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/digests/SM3Digest.java b/bcprov/src/main/java/org/bouncycastle/crypto/digests/SM3Digest.java
deleted file mode 100644
index 5e90add..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/digests/SM3Digest.java
+++ /dev/null
@@ -1,333 +0,0 @@
-package org.bouncycastle.crypto.digests;
-
-import org.bouncycastle.util.Memoable;
-import org.bouncycastle.util.Pack;
-
-/**
- * Implementation of Chinese SM3 digest as described at
- * http://tools.ietf.org/html/draft-shen-sm3-hash-00
- * and at .... ( Chinese PDF )
- * <p>
- * The specification says "process a bit stream",
- * but this is written to process bytes in blocks of 4,
- * meaning this will process 32-bit word groups.
- * But so do also most other digest specifications,
- * including the SHA-256 which was a origin for
- * this specification.
- */
-public class SM3Digest
-    extends GeneralDigest
-{
-    private static final int DIGEST_LENGTH = 32;   // bytes
-    private static final int BLOCK_SIZE = 64 / 4; // of 32 bit ints (16 ints)
-
-    private int[] V = new int[DIGEST_LENGTH / 4]; // in 32 bit ints (8 ints)
-    private int[] inwords = new int[BLOCK_SIZE];
-    private int xOff;
-
-    // Work-bufs used within processBlock()
-    private int[] W = new int[68];
-    private int[] W1 = new int[64];
-
-    // Round constant T for processBlock() which is 32 bit integer rolled left up to (63 MOD 32) bit positions.
-    private static final int[] T = new int[64];
-
-    static
-    {
-        for (int i = 0; i < 16; ++i)
-        {
-            int t = 0x79CC4519;
-            T[i] = (t << i) | (t >>> (32 - i));
-        }
-        for (int i = 16; i < 64; ++i)
-        {
-            int n = i % 32;
-            int t = 0x7A879D8A;
-            T[i] = (t << n) | (t >>> (32 - n));
-        }
-    }
-
-
-    /**
-     * Standard constructor
-     */
-    public SM3Digest()
-    {
-        reset();
-    }
-
-    /**
-     * Copy constructor.  This will copy the state of the provided
-     * message digest.
-     */
-    public SM3Digest(SM3Digest t)
-    {
-        super(t);
-
-        copyIn(t);
-    }
-
-    private void copyIn(SM3Digest t)
-    {
-        System.arraycopy(t.V, 0, this.V, 0, this.V.length);
-        System.arraycopy(t.inwords, 0, this.inwords, 0, this.inwords.length);
-        xOff = t.xOff;
-    }
-
-    public String getAlgorithmName()
-    {
-        return "SM3";
-    }
-
-    public int getDigestSize()
-    {
-        return DIGEST_LENGTH;
-    }
-
-
-    public Memoable copy()
-    {
-        return new SM3Digest(this);
-    }
-
-    public void reset(Memoable other)
-    {
-        SM3Digest d = (SM3Digest)other;
-
-        super.copyIn(d);
-        copyIn(d);
-    }
-
-
-    /**
-     * reset the chaining variables
-     */
-    public void reset()
-    {
-        super.reset();
-
-        this.V[0] = 0x7380166F;
-        this.V[1] = 0x4914B2B9;
-        this.V[2] = 0x172442D7;
-        this.V[3] = 0xDA8A0600;
-        this.V[4] = 0xA96F30BC;
-        this.V[5] = 0x163138AA;
-        this.V[6] = 0xE38DEE4D;
-        this.V[7] = 0xB0FB0E4E;
-
-        this.xOff = 0;
-    }
-
-
-    public int doFinal(byte[] out,
-                       int outOff)
-    {
-        finish();
-
-        Pack.intToBigEndian(this.V[0], out, outOff + 0);
-        Pack.intToBigEndian(this.V[1], out, outOff + 4);
-        Pack.intToBigEndian(this.V[2], out, outOff + 8);
-        Pack.intToBigEndian(this.V[3], out, outOff + 12);
-        Pack.intToBigEndian(this.V[4], out, outOff + 16);
-        Pack.intToBigEndian(this.V[5], out, outOff + 20);
-        Pack.intToBigEndian(this.V[6], out, outOff + 24);
-        Pack.intToBigEndian(this.V[7], out, outOff + 28);
-
-        reset();
-
-        return DIGEST_LENGTH;
-    }
-
-
-    protected void processWord(byte[] in,
-                               int inOff)
-    {
-        // Note: Inlined for performance
-        // this.inwords[xOff] = Pack.bigEndianToInt(in, inOff);
-        int n = (((in[inOff] & 0xff) << 24) |
-            ((in[++inOff] & 0xff) << 16) |
-            ((in[++inOff] & 0xff) << 8) |
-            ((in[++inOff] & 0xff)));
-
-        this.inwords[this.xOff] = n;
-        ++this.xOff;
-
-        if (this.xOff >= 16)
-        {
-            processBlock();
-        }
-    }
-
-    protected void processLength(long bitLength)
-    {
-        if (this.xOff > (BLOCK_SIZE - 2))
-        {
-            // xOff == 15  --> can't fit the 64 bit length field at tail..
-            this.inwords[this.xOff] = 0; // fill with zero
-            ++this.xOff;
-
-            processBlock();
-        }
-        // Fill with zero words, until reach 2nd to last slot
-        while (this.xOff < (BLOCK_SIZE - 2))
-        {
-            this.inwords[this.xOff] = 0;
-            ++this.xOff;
-        }
-
-        // Store input data length in BITS
-        this.inwords[this.xOff++] = (int)(bitLength >>> 32);
-        this.inwords[this.xOff++] = (int)(bitLength);
-    }
-
-/*
-
-3.4.2.  Constants
-
-
-   Tj = 79cc4519        when 0  < = j < = 15
-   Tj = 7a879d8a        when 16 < = j < = 63
-
-3.4.3.  Boolean function
-
-
-   FFj(X;Y;Z) = X XOR Y XOR Z                       when 0  < = j < = 15
-              = (X AND Y) OR (X AND Z) OR (Y AND Z) when 16 < = j < = 63
-
-   GGj(X;Y;Z) = X XOR Y XOR Z                       when 0  < = j < = 15
-              = (X AND Y) OR (NOT X AND Z)          when 16 < = j < = 63
-
-   The X, Y, Z in the fomular are words!GBP
-
-3.4.4.  Permutation function
-
-
-   P0(X) = X XOR (X <<<  9) XOR (X <<< 17)   ## ROLL, not SHIFT
-   P1(X) = X XOR (X <<< 15) XOR (X <<< 23)   ## ROLL, not SHIFT
-
-   The X in the fomular are a word.
-
-----------
-
-Each ROLL converted to Java expression:
-
-ROLL 9  :  ((x <<  9) | (x >>> (32-9))))
-ROLL 17 :  ((x << 17) | (x >>> (32-17)))
-ROLL 15 :  ((x << 15) | (x >>> (32-15)))
-ROLL 23 :  ((x << 23) | (x >>> (32-23)))
-
- */
-
-    private int P0(final int x)
-    {
-        final int r9 = ((x << 9) | (x >>> (32 - 9)));
-        final int r17 = ((x << 17) | (x >>> (32 - 17)));
-        return (x ^ r9 ^ r17);
-    }
-
-    private int P1(final int x)
-    {
-        final int r15 = ((x << 15) | (x >>> (32 - 15)));
-        final int r23 = ((x << 23) | (x >>> (32 - 23)));
-        return (x ^ r15 ^ r23);
-    }
-
-    private int FF0(final int x, final int y, final int z)
-    {
-        return (x ^ y ^ z);
-    }
-
-    private int FF1(final int x, final int y, final int z)
-    {
-        return ((x & y) | (x & z) | (y & z));
-    }
-
-    private int GG0(final int x, final int y, final int z)
-    {
-        return (x ^ y ^ z);
-    }
-
-    private int GG1(final int x, final int y, final int z)
-    {
-        return ((x & y) | ((~x) & z));
-    }
-
-
-    protected void processBlock()
-    {
-        for (int j = 0; j < 16; ++j)
-        {
-            this.W[j] = this.inwords[j];
-        }
-        for (int j = 16; j < 68; ++j)
-        {
-            int wj3 = this.W[j - 3];
-            int r15 = ((wj3 << 15) | (wj3 >>> (32 - 15)));
-            int wj13 = this.W[j - 13];
-            int r7 = ((wj13 << 7) | (wj13 >>> (32 - 7)));
-            this.W[j] = P1(this.W[j - 16] ^ this.W[j - 9] ^ r15) ^ r7 ^ this.W[j - 6];
-        }
-        for (int j = 0; j < 64; ++j)
-        {
-            this.W1[j] = this.W[j] ^ this.W[j + 4];
-        }
-
-        int A = this.V[0];
-        int B = this.V[1];
-        int C = this.V[2];
-        int D = this.V[3];
-        int E = this.V[4];
-        int F = this.V[5];
-        int G = this.V[6];
-        int H = this.V[7];
-
-
-        for (int j = 0; j < 16; ++j)
-        {
-            int a12 = ((A << 12) | (A >>> (32 - 12)));
-            int s1_ = a12 + E + T[j];
-            int SS1 = ((s1_ << 7) | (s1_ >>> (32 - 7)));
-            int SS2 = SS1 ^ a12;
-            int TT1 = FF0(A, B, C) + D + SS2 + this.W1[j];
-            int TT2 = GG0(E, F, G) + H + SS1 + this.W[j];
-            D = C;
-            C = ((B << 9) | (B >>> (32 - 9)));
-            B = A;
-            A = TT1;
-            H = G;
-            G = ((F << 19) | (F >>> (32 - 19)));
-            F = E;
-            E = P0(TT2);
-        }
-
-        // Different FF,GG functions on rounds 16..63
-        for (int j = 16; j < 64; ++j)
-        {
-            int a12 = ((A << 12) | (A >>> (32 - 12)));
-            int s1_ = a12 + E + T[j];
-            int SS1 = ((s1_ << 7) | (s1_ >>> (32 - 7)));
-            int SS2 = SS1 ^ a12;
-            int TT1 = FF1(A, B, C) + D + SS2 + this.W1[j];
-            int TT2 = GG1(E, F, G) + H + SS1 + this.W[j];
-            D = C;
-            C = ((B << 9) | (B >>> (32 - 9)));
-            B = A;
-            A = TT1;
-            H = G;
-            G = ((F << 19) | (F >>> (32 - 19)));
-            F = E;
-            E = P0(TT2);
-        }
-
-        this.V[0] ^= A;
-        this.V[1] ^= B;
-        this.V[2] ^= C;
-        this.V[3] ^= D;
-        this.V[4] ^= E;
-        this.V[5] ^= F;
-        this.V[6] ^= G;
-        this.V[7] ^= H;
-
-        this.xOff = 0;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/digests/ShortenedDigest.java b/bcprov/src/main/java/org/bouncycastle/crypto/digests/ShortenedDigest.java
deleted file mode 100644
index 89033e8..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/digests/ShortenedDigest.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package org.bouncycastle.crypto.digests;
-
-import org.bouncycastle.crypto.ExtendedDigest;
-
-/**
- * Wrapper class that reduces the output length of a particular digest to
- * only the first n bytes of the digest function.
- */
-public class ShortenedDigest 
-    implements ExtendedDigest
-{
-    private ExtendedDigest baseDigest;
-    private int            length;
-    
-    /**
-     * Base constructor.
-     * 
-     * @param baseDigest underlying digest to use.
-     * @param length length in bytes of the output of doFinal.
-     * @exception IllegalArgumentException if baseDigest is null, or length is greater than baseDigest.getDigestSize().
-     */
-    public ShortenedDigest(
-        ExtendedDigest baseDigest,
-        int            length)
-    {
-        if (baseDigest == null)
-        {
-            throw new IllegalArgumentException("baseDigest must not be null");
-        }
-        
-        if (length > baseDigest.getDigestSize())
-        {
-            throw new IllegalArgumentException("baseDigest output not large enough to support length");
-        }
-        
-        this.baseDigest = baseDigest;
-        this.length = length;
-    }
-    
-    public String getAlgorithmName()
-    {
-        return baseDigest.getAlgorithmName() + "(" + length * 8 + ")";
-    }
-
-    public int getDigestSize()
-    {
-        return length;
-    }
-
-    public void update(byte in)
-    {
-        baseDigest.update(in);
-    }
-
-    public void update(byte[] in, int inOff, int len)
-    {
-        baseDigest.update(in, inOff, len);
-    }
-
-    public int doFinal(byte[] out, int outOff)
-    {
-        byte[] tmp = new byte[baseDigest.getDigestSize()];
-        
-        baseDigest.doFinal(tmp, 0);
-        
-        System.arraycopy(tmp, 0, out, outOff, length);
-        
-        return length;
-    }
-
-    public void reset()
-    {
-        baseDigest.reset();
-    }
-
-    public int getByteLength()
-    {
-        return baseDigest.getByteLength();
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/digests/SkeinDigest.java b/bcprov/src/main/java/org/bouncycastle/crypto/digests/SkeinDigest.java
deleted file mode 100644
index ae1dbd6..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/digests/SkeinDigest.java
+++ /dev/null
@@ -1,115 +0,0 @@
-package org.bouncycastle.crypto.digests;
-
-import org.bouncycastle.crypto.ExtendedDigest;
-import org.bouncycastle.crypto.engines.ThreefishEngine;
-import org.bouncycastle.crypto.params.SkeinParameters;
-import org.bouncycastle.util.Memoable;
-
-/**
- * Implementation of the Skein parameterised hash function in 256, 512 and 1024 bit block sizes,
- * based on the {@link ThreefishEngine Threefish} tweakable block cipher.
- * <p>
- * This is the 1.3 version of Skein defined in the Skein hash function submission to the NIST SHA-3
- * competition in October 2010.
- * <p>
- * Skein was designed by Niels Ferguson - Stefan Lucks - Bruce Schneier - Doug Whiting - Mihir
- * Bellare - Tadayoshi Kohno - Jon Callas - Jesse Walker.
- *
- * @see SkeinEngine
- * @see SkeinParameters
- */
-public class SkeinDigest
-    implements ExtendedDigest, Memoable
-{
-    /**
-     * 256 bit block size - Skein-256
-     */
-    public static final int SKEIN_256 = SkeinEngine.SKEIN_256;
-    /**
-     * 512 bit block size - Skein-512
-     */
-    public static final int SKEIN_512 = SkeinEngine.SKEIN_512;
-    /**
-     * 1024 bit block size - Skein-1024
-     */
-    public static final int SKEIN_1024 = SkeinEngine.SKEIN_1024;
-
-    private SkeinEngine engine;
-
-    /**
-     * Constructs a Skein digest with an internal state size and output size.
-     *
-     * @param stateSizeBits  the internal state size in bits - one of {@link #SKEIN_256}, {@link #SKEIN_512} or
-     *                       {@link #SKEIN_1024}.
-     * @param digestSizeBits the output/digest size to produce in bits, which must be an integral number of
-     *                       bytes.
-     */
-    public SkeinDigest(int stateSizeBits, int digestSizeBits)
-    {
-        this.engine = new SkeinEngine(stateSizeBits, digestSizeBits);
-        init(null);
-    }
-
-    public SkeinDigest(SkeinDigest digest)
-    {
-        this.engine = new SkeinEngine(digest.engine);
-    }
-
-    public void reset(Memoable other)
-    {
-        SkeinDigest d = (SkeinDigest)other;
-        engine.reset(d.engine);
-    }
-
-    public Memoable copy()
-    {
-        return new SkeinDigest(this);
-    }
-
-    public String getAlgorithmName()
-    {
-        return "Skein-" + (engine.getBlockSize() * 8) + "-" + (engine.getOutputSize() * 8);
-    }
-
-    public int getDigestSize()
-    {
-        return engine.getOutputSize();
-    }
-
-    public int getByteLength()
-    {
-        return engine.getBlockSize();
-    }
-
-    /**
-     * Optionally initialises the Skein digest with the provided parameters.<br>
-     * See {@link SkeinParameters} for details on the parameterisation of the Skein hash function.
-     *
-     * @param params the parameters to apply to this engine, or <code>null</code> to use no parameters.
-     */
-    public void init(SkeinParameters params)
-    {
-        engine.init(params);
-    }
-
-    public void reset()
-    {
-        engine.reset();
-    }
-
-    public void update(byte in)
-    {
-        engine.update(in);
-    }
-
-    public void update(byte[] in, int inOff, int len)
-    {
-        engine.update(in, inOff, len);
-    }
-
-    public int doFinal(byte[] out, int outOff)
-    {
-        return engine.doFinal(out, outOff);
-    }
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/digests/SkeinEngine.java b/bcprov/src/main/java/org/bouncycastle/crypto/digests/SkeinEngine.java
deleted file mode 100644
index b125dbd..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/digests/SkeinEngine.java
+++ /dev/null
@@ -1,817 +0,0 @@
-package org.bouncycastle.crypto.digests;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Vector;
-
-import org.bouncycastle.crypto.DataLengthException;
-import org.bouncycastle.crypto.engines.ThreefishEngine;
-import org.bouncycastle.crypto.macs.SkeinMac;
-import org.bouncycastle.crypto.params.SkeinParameters;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.Memoable;
-
-/**
- * Implementation of the Skein family of parameterised hash functions in 256, 512 and 1024 bit block
- * sizes, based on the {@link ThreefishEngine Threefish} tweakable block cipher.
- * <p>
- * This is the 1.3 version of Skein defined in the Skein hash function submission to the NIST SHA-3
- * competition in October 2010.
- * <p>
- * Skein was designed by Niels Ferguson - Stefan Lucks - Bruce Schneier - Doug Whiting - Mihir
- * Bellare - Tadayoshi Kohno - Jon Callas - Jesse Walker.
- * <p>
- * This implementation is the basis for {@link SkeinDigest} and {@link SkeinMac}, implementing the
- * parameter based configuration system that allows Skein to be adapted to multiple applications. <br>
- * Initialising the engine with {@link SkeinParameters} allows standard and arbitrary parameters to
- * be applied during the Skein hash function.
- * <p>
- * Implemented:
- * <ul>
- * <li>256, 512 and 1024 bit internal states.</li>
- * <li>Full 96 bit input length.</li>
- * <li>Parameters defined in the Skein specification, and arbitrary other pre and post message
- * parameters.</li>
- * <li>Arbitrary output size in 1 byte intervals.</li>
- * </ul>
- * <p>
- * Not implemented:
- * <ul>
- * <li>Sub-byte length input (bit padding).</li>
- * <li>Tree hashing.</li>
- * </ul>
- *
- * @see SkeinParameters
- */
-public class SkeinEngine
-    implements Memoable
-{
-    /**
-     * 256 bit block size - Skein 256
-     */
-    public static final int SKEIN_256 = ThreefishEngine.BLOCKSIZE_256;
-    /**
-     * 512 bit block size - Skein 512
-     */
-    public static final int SKEIN_512 = ThreefishEngine.BLOCKSIZE_512;
-    /**
-     * 1024 bit block size - Skein 1024
-     */
-    public static final int SKEIN_1024 = ThreefishEngine.BLOCKSIZE_1024;
-
-    // Minimal at present, but more complex when tree hashing is implemented
-    private static class Configuration
-    {
-        private byte[] bytes = new byte[32];
-
-        public Configuration(long outputSizeBits)
-        {
-            // 0..3 = ASCII SHA3
-            bytes[0] = (byte)'S';
-            bytes[1] = (byte)'H';
-            bytes[2] = (byte)'A';
-            bytes[3] = (byte)'3';
-
-            // 4..5 = version number in LSB order
-            bytes[4] = 1;
-            bytes[5] = 0;
-
-            // 8..15 = output length
-            ThreefishEngine.wordToBytes(outputSizeBits, bytes, 8);
-        }
-
-        public byte[] getBytes()
-        {
-            return bytes;
-        }
-
-    }
-
-    public static class Parameter
-    {
-        private int type;
-        private byte[] value;
-
-        public Parameter(int type, byte[] value)
-        {
-            this.type = type;
-            this.value = value;
-        }
-
-        public int getType()
-        {
-            return type;
-        }
-
-        public byte[] getValue()
-        {
-            return value;
-        }
-
-    }
-
-    /**
-     * The parameter type for the Skein key.
-     */
-    private static final int PARAM_TYPE_KEY = 0;
-
-    /**
-     * The parameter type for the Skein configuration block.
-     */
-    private static final int PARAM_TYPE_CONFIG = 4;
-
-    /**
-     * The parameter type for the message.
-     */
-    private static final int PARAM_TYPE_MESSAGE = 48;
-
-    /**
-     * The parameter type for the output transformation.
-     */
-    private static final int PARAM_TYPE_OUTPUT = 63;
-
-    /**
-     * Precalculated UBI(CFG) states for common state/output combinations without key or other
-     * pre-message params.
-     */
-    private static final Hashtable INITIAL_STATES = new Hashtable();
-
-    static
-    {
-        // From Appendix C of the Skein 1.3 NIST submission
-        initialState(SKEIN_256, 128, new long[]{
-            0xe1111906964d7260L,
-            0x883daaa77c8d811cL,
-            0x10080df491960f7aL,
-            0xccf7dde5b45bc1c2L});
-
-        initialState(SKEIN_256, 160, new long[]{
-            0x1420231472825e98L,
-            0x2ac4e9a25a77e590L,
-            0xd47a58568838d63eL,
-            0x2dd2e4968586ab7dL});
-
-        initialState(SKEIN_256, 224, new long[]{
-            0xc6098a8c9ae5ea0bL,
-            0x876d568608c5191cL,
-            0x99cb88d7d7f53884L,
-            0x384bddb1aeddb5deL});
-
-        initialState(SKEIN_256, 256, new long[]{
-            0xfc9da860d048b449L,
-            0x2fca66479fa7d833L,
-            0xb33bc3896656840fL,
-            0x6a54e920fde8da69L});
-
-        initialState(SKEIN_512, 128, new long[]{
-            0xa8bc7bf36fbf9f52L,
-            0x1e9872cebd1af0aaL,
-            0x309b1790b32190d3L,
-            0xbcfbb8543f94805cL,
-            0x0da61bcd6e31b11bL,
-            0x1a18ebead46a32e3L,
-            0xa2cc5b18ce84aa82L,
-            0x6982ab289d46982dL});
-
-        initialState(SKEIN_512, 160, new long[]{
-            0x28b81a2ae013bd91L,
-            0xc2f11668b5bdf78fL,
-            0x1760d8f3f6a56f12L,
-            0x4fb747588239904fL,
-            0x21ede07f7eaf5056L,
-            0xd908922e63ed70b8L,
-            0xb8ec76ffeccb52faL,
-            0x01a47bb8a3f27a6eL});
-
-        initialState(SKEIN_512, 224, new long[]{
-            0xccd0616248677224L,
-            0xcba65cf3a92339efL,
-            0x8ccd69d652ff4b64L,
-            0x398aed7b3ab890b4L,
-            0x0f59d1b1457d2bd0L,
-            0x6776fe6575d4eb3dL,
-            0x99fbc70e997413e9L,
-            0x9e2cfccfe1c41ef7L});
-
-        initialState(SKEIN_512, 384, new long[]{
-            0xa3f6c6bf3a75ef5fL,
-            0xb0fef9ccfd84faa4L,
-            0x9d77dd663d770cfeL,
-            0xd798cbf3b468fddaL,
-            0x1bc4a6668a0e4465L,
-            0x7ed7d434e5807407L,
-            0x548fc1acd4ec44d6L,
-            0x266e17546aa18ff8L});
-
-        initialState(SKEIN_512, 512, new long[]{
-            0x4903adff749c51ceL,
-            0x0d95de399746df03L,
-            0x8fd1934127c79bceL,
-            0x9a255629ff352cb1L,
-            0x5db62599df6ca7b0L,
-            0xeabe394ca9d5c3f4L,
-            0x991112c71a75b523L,
-            0xae18a40b660fcc33L});
-    }
-
-    private static void initialState(int blockSize, int outputSize, long[] state)
-    {
-        INITIAL_STATES.put(variantIdentifier(blockSize / 8, outputSize / 8), state);
-    }
-
-    private static Integer variantIdentifier(int blockSizeBytes, int outputSizeBytes)
-    {
-        return new Integer((outputSizeBytes << 16) | blockSizeBytes);
-    }
-
-    private static class UbiTweak
-    {
-        /**
-         * Point at which position might overflow long, so switch to add with carry logic
-         */
-        private static final long LOW_RANGE = Long.MAX_VALUE - Integer.MAX_VALUE;
-
-        /**
-         * Bit 127 = final
-         */
-        private static final long T1_FINAL = 1L << 63;
-
-        /**
-         * Bit 126 = first
-         */
-        private static final long T1_FIRST = 1L << 62;
-
-        /**
-         * UBI uses a 128 bit tweak
-         */
-        private long tweak[] = new long[2];
-
-        /**
-         * Whether 64 bit position exceeded
-         */
-        private boolean extendedPosition;
-
-        public UbiTweak()
-        {
-            reset();
-        }
-
-        public void reset(UbiTweak tweak)
-        {
-            this.tweak = Arrays.clone(tweak.tweak, this.tweak);
-            this.extendedPosition = tweak.extendedPosition;
-        }
-
-        public void reset()
-        {
-            tweak[0] = 0;
-            tweak[1] = 0;
-            extendedPosition = false;
-            setFirst(true);
-        }
-
-        public void setType(int type)
-        {
-            // Bits 120..125 = type
-            tweak[1] = (tweak[1] & 0xFFFFFFC000000000L) | ((type & 0x3FL) << 56);
-        }
-
-        public int getType()
-        {
-            return (int)((tweak[1] >>> 56) & 0x3FL);
-        }
-
-        public void setFirst(boolean first)
-        {
-            if (first)
-            {
-                tweak[1] |= T1_FIRST;
-            }
-            else
-            {
-                tweak[1] &= ~T1_FIRST;
-            }
-        }
-
-        public boolean isFirst()
-        {
-            return ((tweak[1] & T1_FIRST) != 0);
-        }
-
-        public void setFinal(boolean last)
-        {
-            if (last)
-            {
-                tweak[1] |= T1_FINAL;
-            }
-            else
-            {
-                tweak[1] &= ~T1_FINAL;
-            }
-        }
-
-        public boolean isFinal()
-        {
-            return ((tweak[1] & T1_FINAL) != 0);
-        }
-
-        /**
-         * Advances the position in the tweak by the specified value.
-         */
-        public void advancePosition(int advance)
-        {
-            // Bits 0..95 = position
-            if (extendedPosition)
-            {
-                long[] parts = new long[3];
-                parts[0] = tweak[0] & 0xFFFFFFFFL;
-                parts[1] = (tweak[0] >>> 32) & 0xFFFFFFFFL;
-                parts[2] = tweak[1] & 0xFFFFFFFFL;
-
-                long carry = advance;
-                for (int i = 0; i < parts.length; i++)
-                {
-                    carry += parts[i];
-                    parts[i] = carry;
-                    carry >>>= 32;
-                }
-                tweak[0] = ((parts[1] & 0xFFFFFFFFL) << 32) | (parts[0] & 0xFFFFFFFFL);
-                tweak[1] = (tweak[1] & 0xFFFFFFFF00000000L) | (parts[2] & 0xFFFFFFFFL);
-            }
-            else
-            {
-                long position = tweak[0];
-                position += advance;
-                tweak[0] = position;
-                if (position > LOW_RANGE)
-                {
-                    extendedPosition = true;
-                }
-            }
-        }
-
-        public long[] getWords()
-        {
-            return tweak;
-        }
-
-        public String toString()
-        {
-            return getType() + " first: " + isFirst() + ", final: " + isFinal();
-        }
-
-    }
-
-    /**
-     * The Unique Block Iteration chaining mode.
-     */
-    // TODO: This might be better as methods...
-    private class UBI
-    {
-        private final UbiTweak tweak = new UbiTweak();
-
-        /**
-         * Buffer for the current block of message data
-         */
-        private byte[] currentBlock;
-
-        /**
-         * Offset into the current message block
-         */
-        private int currentOffset;
-
-        /**
-         * Buffer for message words for feedback into encrypted block
-         */
-        private long[] message;
-
-        public UBI(int blockSize)
-        {
-            currentBlock = new byte[blockSize];
-            message = new long[currentBlock.length / 8];
-        }
-
-        public void reset(UBI ubi)
-        {
-            currentBlock = Arrays.clone(ubi.currentBlock, currentBlock);
-            currentOffset = ubi.currentOffset;
-            message = Arrays.clone(ubi.message, this.message);
-            tweak.reset(ubi.tweak);
-        }
-
-        public void reset(int type)
-        {
-            tweak.reset();
-            tweak.setType(type);
-            currentOffset = 0;
-        }
-
-        public void update(byte[] value, int offset, int len, long[] output)
-        {
-            /*
-             * Buffer complete blocks for the underlying Threefish cipher, only flushing when there
-             * are subsequent bytes (last block must be processed in doFinal() with final=true set).
-             */
-            int copied = 0;
-            while (len > copied)
-            {
-                if (currentOffset == currentBlock.length)
-                {
-                    processBlock(output);
-                    tweak.setFirst(false);
-                    currentOffset = 0;
-                }
-
-                int toCopy = Math.min((len - copied), currentBlock.length - currentOffset);
-                System.arraycopy(value, offset + copied, currentBlock, currentOffset, toCopy);
-                copied += toCopy;
-                currentOffset += toCopy;
-                tweak.advancePosition(toCopy);
-            }
-        }
-
-        private void processBlock(long[] output)
-        {
-            threefish.init(true, chain, tweak.getWords());
-            for (int i = 0; i < message.length; i++)
-            {
-                message[i] = ThreefishEngine.bytesToWord(currentBlock, i * 8);
-            }
-
-            threefish.processBlock(message, output);
-
-            for (int i = 0; i < output.length; i++)
-            {
-                output[i] ^= message[i];
-            }
-        }
-
-        public void doFinal(long[] output)
-        {
-            // Pad remainder of current block with zeroes
-            for (int i = currentOffset; i < currentBlock.length; i++)
-            {
-                currentBlock[i] = 0;
-            }
-
-            tweak.setFinal(true);
-            processBlock(output);
-        }
-
-    }
-
-    /**
-     * Underlying Threefish tweakable block cipher
-     */
-    final ThreefishEngine threefish;
-
-    /**
-     * Size of the digest output, in bytes
-     */
-    private final int outputSizeBytes;
-
-    /**
-     * The current chaining/state value
-     */
-    long[] chain;
-
-    /**
-     * The initial state value
-     */
-    private long[] initialState;
-
-    /**
-     * The (optional) key parameter
-     */
-    private byte[] key;
-
-    /**
-     * Parameters to apply prior to the message
-     */
-    private Parameter[] preMessageParameters;
-
-    /**
-     * Parameters to apply after the message, but prior to output
-     */
-    private Parameter[] postMessageParameters;
-
-    /**
-     * The current UBI operation
-     */
-    private final UBI ubi;
-
-    /**
-     * Buffer for single byte update method
-     */
-    private final byte[] singleByte = new byte[1];
-
-    /**
-     * Constructs a Skein engine.
-     *
-     * @param blockSizeBits  the internal state size in bits - one of {@link #SKEIN_256}, {@link #SKEIN_512} or
-     *                       {@link #SKEIN_1024}.
-     * @param outputSizeBits the output/digest size to produce in bits, which must be an integral number of
-     *                       bytes.
-     */
-    public SkeinEngine(int blockSizeBits, int outputSizeBits)
-    {
-        if (outputSizeBits % 8 != 0)
-        {
-            throw new IllegalArgumentException("Output size must be a multiple of 8 bits. :" + outputSizeBits);
-        }
-        // TODO: Prevent digest sizes > block size?
-        this.outputSizeBytes = outputSizeBits / 8;
-
-        this.threefish = new ThreefishEngine(blockSizeBits);
-        this.ubi = new UBI(threefish.getBlockSize());
-    }
-
-    /**
-     * Creates a SkeinEngine as an exact copy of an existing instance.
-     */
-    public SkeinEngine(SkeinEngine engine)
-    {
-        this(engine.getBlockSize() * 8, engine.getOutputSize() * 8);
-        copyIn(engine);
-    }
-
-    private void copyIn(SkeinEngine engine)
-    {
-        this.ubi.reset(engine.ubi);
-        this.chain = Arrays.clone(engine.chain, this.chain);
-        this.initialState = Arrays.clone(engine.initialState, this.initialState);
-        this.key = Arrays.clone(engine.key, this.key);
-        this.preMessageParameters = clone(engine.preMessageParameters, this.preMessageParameters);
-        this.postMessageParameters = clone(engine.postMessageParameters, this.postMessageParameters);
-    }
-
-    private static Parameter[] clone(Parameter[] data, Parameter[] existing)
-    {
-        if (data == null)
-        {
-            return null;
-        }
-        if ((existing == null) || (existing.length != data.length))
-        {
-            existing = new Parameter[data.length];
-        }
-        System.arraycopy(data, 0, existing, 0, existing.length);
-        return existing;
-    }
-
-    public Memoable copy()
-    {
-        return new SkeinEngine(this);
-    }
-
-    public void reset(Memoable other)
-    {
-        SkeinEngine s = (SkeinEngine)other;
-        if ((getBlockSize() != s.getBlockSize()) || (outputSizeBytes != s.outputSizeBytes))
-        {
-            throw new IllegalArgumentException("Incompatible parameters in provided SkeinEngine.");
-        }
-        copyIn(s);
-    }
-
-    public int getOutputSize()
-    {
-        return outputSizeBytes;
-    }
-
-    public int getBlockSize()
-    {
-        return threefish.getBlockSize();
-    }
-
-    /**
-     * Initialises the Skein engine with the provided parameters. See {@link SkeinParameters} for
-     * details on the parameterisation of the Skein hash function.
-     *
-     * @param params the parameters to apply to this engine, or <code>null</code> to use no parameters.
-     */
-    public void init(SkeinParameters params)
-    {
-        this.chain = null;
-        this.key = null;
-        this.preMessageParameters = null;
-        this.postMessageParameters = null;
-
-        if (params != null)
-        {
-            byte[] key = params.getKey();
-            if (key.length < 16)
-            {
-                throw new IllegalArgumentException("Skein key must be at least 128 bits.");
-            }
-            initParams(params.getParameters());
-        }
-        createInitialState();
-
-        // Initialise message block
-        ubiInit(PARAM_TYPE_MESSAGE);
-    }
-
-    private void initParams(Hashtable parameters)
-    {
-        Enumeration keys = parameters.keys();
-        final Vector pre = new Vector();
-        final Vector post = new Vector();
-
-        while (keys.hasMoreElements())
-        {
-            Integer type = (Integer)keys.nextElement();
-            byte[] value = (byte[])parameters.get(type);
-
-            if (type.intValue() == PARAM_TYPE_KEY)
-            {
-                this.key = value;
-            }
-            else if (type.intValue() < PARAM_TYPE_MESSAGE)
-            {
-                pre.addElement(new Parameter(type.intValue(), value));
-            }
-            else
-            {
-                post.addElement(new Parameter(type.intValue(), value));
-            }
-        }
-        preMessageParameters = new Parameter[pre.size()];
-        pre.copyInto(preMessageParameters);
-        sort(preMessageParameters);
-
-        postMessageParameters = new Parameter[post.size()];
-        post.copyInto(postMessageParameters);
-        sort(postMessageParameters);
-    }
-
-    private static void sort(Parameter[] params)
-    {
-        if (params == null)
-        {
-            return;
-        }
-        // Insertion sort, for Java 1.1 compatibility
-        for (int i = 1; i < params.length; i++)
-        {
-            Parameter param = params[i];
-            int hole = i;
-            while (hole > 0 && param.getType() < params[hole - 1].getType())
-            {
-                params[hole] = params[hole - 1];
-                hole = hole - 1;
-            }
-            params[hole] = param;
-        }
-    }
-
-    /**
-     * Calculate the initial (pre message block) chaining state.
-     */
-    private void createInitialState()
-    {
-        long[] precalc = (long[])INITIAL_STATES.get(variantIdentifier(getBlockSize(), getOutputSize()));
-        if ((key == null) && (precalc != null))
-        {
-            // Precalculated UBI(CFG)
-            chain = Arrays.clone(precalc);
-        }
-        else
-        {
-            // Blank initial state
-            chain = new long[getBlockSize() / 8];
-
-            // Process key block
-            if (key != null)
-            {
-                ubiComplete(SkeinParameters.PARAM_TYPE_KEY, key);
-            }
-
-            // Process configuration block
-            ubiComplete(PARAM_TYPE_CONFIG, new Configuration(outputSizeBytes * 8).getBytes());
-        }
-
-        // Process additional pre-message parameters
-        if (preMessageParameters != null)
-        {
-            for (int i = 0; i < preMessageParameters.length; i++)
-            {
-                Parameter param = preMessageParameters[i];
-                ubiComplete(param.getType(), param.getValue());
-            }
-        }
-        initialState = Arrays.clone(chain);
-    }
-
-    /**
-     * Reset the engine to the initial state (with the key and any pre-message parameters , ready to
-     * accept message input.
-     */
-    public void reset()
-    {
-        System.arraycopy(initialState, 0, chain, 0, chain.length);
-
-        ubiInit(PARAM_TYPE_MESSAGE);
-    }
-
-    private void ubiComplete(int type, byte[] value)
-    {
-        ubiInit(type);
-        this.ubi.update(value, 0, value.length, chain);
-        ubiFinal();
-    }
-
-    private void ubiInit(int type)
-    {
-        this.ubi.reset(type);
-    }
-
-    private void ubiFinal()
-    {
-        ubi.doFinal(chain);
-    }
-
-    private void checkInitialised()
-    {
-        if (this.ubi == null)
-        {
-            throw new IllegalArgumentException("Skein engine is not initialised.");
-        }
-    }
-
-    public void update(byte in)
-    {
-        singleByte[0] = in;
-        update(singleByte, 0, 1);
-    }
-
-    public void update(byte[] in, int inOff, int len)
-    {
-        checkInitialised();
-        ubi.update(in, inOff, len, chain);
-    }
-
-    public int doFinal(byte[] out, int outOff)
-    {
-        checkInitialised();
-        if (out.length < (outOff + outputSizeBytes))
-        {
-            throw new DataLengthException("Output buffer is too short to hold output of " + outputSizeBytes + " bytes");
-        }
-
-        // Finalise message block
-        ubiFinal();
-
-        // Process additional post-message parameters
-        if (postMessageParameters != null)
-        {
-            for (int i = 0; i < postMessageParameters.length; i++)
-            {
-                Parameter param = postMessageParameters[i];
-                ubiComplete(param.getType(), param.getValue());
-            }
-        }
-
-        // Perform the output transform
-        final int blockSize = getBlockSize();
-        final int blocksRequired = ((outputSizeBytes + blockSize - 1) / blockSize);
-        for (int i = 0; i < blocksRequired; i++)
-        {
-            final int toWrite = Math.min(blockSize, outputSizeBytes - (i * blockSize));
-            output(i, out, outOff + (i * blockSize), toWrite);
-        }
-
-        reset();
-
-        return outputSizeBytes;
-    }
-
-    private void output(long outputSequence, byte[] out, int outOff, int outputBytes)
-    {
-        byte[] currentBytes = new byte[8];
-        ThreefishEngine.wordToBytes(outputSequence, currentBytes, 0);
-
-        // Output is a sequence of UBI invocations all of which use and preserve the pre-output
-        // state
-        long[] outputWords = new long[chain.length];
-        ubiInit(PARAM_TYPE_OUTPUT);
-        this.ubi.update(currentBytes, 0, currentBytes.length, outputWords);
-        ubi.doFinal(outputWords);
-
-        final int wordsRequired = ((outputBytes + 8 - 1) / 8);
-        for (int i = 0; i < wordsRequired; i++)
-        {
-            int toWrite = Math.min(8, outputBytes - (i * 8));
-            if (toWrite == 8)
-            {
-                ThreefishEngine.wordToBytes(outputWords[i], out, outOff + (i * 8));
-            }
-            else
-            {
-                ThreefishEngine.wordToBytes(outputWords[i], currentBytes, 0);
-                System.arraycopy(currentBytes, 0, out, outOff + (i * 8), toWrite);
-            }
-        }
-    }
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/digests/TigerDigest.java b/bcprov/src/main/java/org/bouncycastle/crypto/digests/TigerDigest.java
deleted file mode 100644
index 2899e30..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/digests/TigerDigest.java
+++ /dev/null
@@ -1,879 +0,0 @@
-package org.bouncycastle.crypto.digests;
-
-import org.bouncycastle.crypto.ExtendedDigest;
-import org.bouncycastle.util.Memoable;
-
-/**
- * implementation of Tiger based on:
- * <a href="http://www.cs.technion.ac.il/~biham/Reports/Tiger">
- *  http://www.cs.technion.ac.il/~biham/Reports/Tiger</a>
- */
-public class TigerDigest
-    implements ExtendedDigest, Memoable
-{
-    private static final int BYTE_LENGTH = 64;
-    
-    /*
-     * S-Boxes.
-     */
-    private static final long[] t1 = {
-        0x02AAB17CF7E90C5EL   /*    0 */,    0xAC424B03E243A8ECL   /*    1 */,
-        0x72CD5BE30DD5FCD3L   /*    2 */,    0x6D019B93F6F97F3AL   /*    3 */,
-        0xCD9978FFD21F9193L   /*    4 */,    0x7573A1C9708029E2L   /*    5 */,
-        0xB164326B922A83C3L   /*    6 */,    0x46883EEE04915870L   /*    7 */,
-        0xEAACE3057103ECE6L   /*    8 */,    0xC54169B808A3535CL   /*    9 */,
-        0x4CE754918DDEC47CL   /*   10 */,    0x0AA2F4DFDC0DF40CL   /*   11 */,
-        0x10B76F18A74DBEFAL   /*   12 */,    0xC6CCB6235AD1AB6AL   /*   13 */,
-        0x13726121572FE2FFL   /*   14 */,    0x1A488C6F199D921EL   /*   15 */,
-        0x4BC9F9F4DA0007CAL   /*   16 */,    0x26F5E6F6E85241C7L   /*   17 */,
-        0x859079DBEA5947B6L   /*   18 */,    0x4F1885C5C99E8C92L   /*   19 */,
-        0xD78E761EA96F864BL   /*   20 */,    0x8E36428C52B5C17DL   /*   21 */,
-        0x69CF6827373063C1L   /*   22 */,    0xB607C93D9BB4C56EL   /*   23 */,
-        0x7D820E760E76B5EAL   /*   24 */,    0x645C9CC6F07FDC42L   /*   25 */,
-        0xBF38A078243342E0L   /*   26 */,    0x5F6B343C9D2E7D04L   /*   27 */,
-        0xF2C28AEB600B0EC6L   /*   28 */,    0x6C0ED85F7254BCACL   /*   29 */,
-        0x71592281A4DB4FE5L   /*   30 */,    0x1967FA69CE0FED9FL   /*   31 */,
-        0xFD5293F8B96545DBL   /*   32 */,    0xC879E9D7F2A7600BL   /*   33 */,
-        0x860248920193194EL   /*   34 */,    0xA4F9533B2D9CC0B3L   /*   35 */,
-        0x9053836C15957613L   /*   36 */,    0xDB6DCF8AFC357BF1L   /*   37 */,
-        0x18BEEA7A7A370F57L   /*   38 */,    0x037117CA50B99066L   /*   39 */,
-        0x6AB30A9774424A35L   /*   40 */,    0xF4E92F02E325249BL   /*   41 */,
-        0x7739DB07061CCAE1L   /*   42 */,    0xD8F3B49CECA42A05L   /*   43 */,
-        0xBD56BE3F51382F73L   /*   44 */,    0x45FAED5843B0BB28L   /*   45 */,
-        0x1C813D5C11BF1F83L   /*   46 */,    0x8AF0E4B6D75FA169L   /*   47 */,
-        0x33EE18A487AD9999L   /*   48 */,    0x3C26E8EAB1C94410L   /*   49 */,
-        0xB510102BC0A822F9L   /*   50 */,    0x141EEF310CE6123BL   /*   51 */,
-        0xFC65B90059DDB154L   /*   52 */,    0xE0158640C5E0E607L   /*   53 */,
-        0x884E079826C3A3CFL   /*   54 */,    0x930D0D9523C535FDL   /*   55 */,
-        0x35638D754E9A2B00L   /*   56 */,    0x4085FCCF40469DD5L   /*   57 */,
-        0xC4B17AD28BE23A4CL   /*   58 */,    0xCAB2F0FC6A3E6A2EL   /*   59 */,
-        0x2860971A6B943FCDL   /*   60 */,    0x3DDE6EE212E30446L   /*   61 */,
-        0x6222F32AE01765AEL   /*   62 */,    0x5D550BB5478308FEL   /*   63 */,
-        0xA9EFA98DA0EDA22AL   /*   64 */,    0xC351A71686C40DA7L   /*   65 */,
-        0x1105586D9C867C84L   /*   66 */,    0xDCFFEE85FDA22853L   /*   67 */,
-        0xCCFBD0262C5EEF76L   /*   68 */,    0xBAF294CB8990D201L   /*   69 */,
-        0xE69464F52AFAD975L   /*   70 */,    0x94B013AFDF133E14L   /*   71 */,
-        0x06A7D1A32823C958L   /*   72 */,    0x6F95FE5130F61119L   /*   73 */,
-        0xD92AB34E462C06C0L   /*   74 */,    0xED7BDE33887C71D2L   /*   75 */,
-        0x79746D6E6518393EL   /*   76 */,    0x5BA419385D713329L   /*   77 */,
-        0x7C1BA6B948A97564L   /*   78 */,    0x31987C197BFDAC67L   /*   79 */,
-        0xDE6C23C44B053D02L   /*   80 */,    0x581C49FED002D64DL   /*   81 */,
-        0xDD474D6338261571L   /*   82 */,    0xAA4546C3E473D062L   /*   83 */,
-        0x928FCE349455F860L   /*   84 */,    0x48161BBACAAB94D9L   /*   85 */,
-        0x63912430770E6F68L   /*   86 */,    0x6EC8A5E602C6641CL   /*   87 */,
-        0x87282515337DDD2BL   /*   88 */,    0x2CDA6B42034B701BL   /*   89 */,
-        0xB03D37C181CB096DL   /*   90 */,    0xE108438266C71C6FL   /*   91 */,
-        0x2B3180C7EB51B255L   /*   92 */,    0xDF92B82F96C08BBCL   /*   93 */,
-        0x5C68C8C0A632F3BAL   /*   94 */,    0x5504CC861C3D0556L   /*   95 */,
-        0xABBFA4E55FB26B8FL   /*   96 */,    0x41848B0AB3BACEB4L   /*   97 */,
-        0xB334A273AA445D32L   /*   98 */,    0xBCA696F0A85AD881L   /*   99 */,
-        0x24F6EC65B528D56CL   /*  100 */,    0x0CE1512E90F4524AL   /*  101 */,
-        0x4E9DD79D5506D35AL   /*  102 */,    0x258905FAC6CE9779L   /*  103 */,
-        0x2019295B3E109B33L   /*  104 */,    0xF8A9478B73A054CCL   /*  105 */,
-        0x2924F2F934417EB0L   /*  106 */,    0x3993357D536D1BC4L   /*  107 */,
-        0x38A81AC21DB6FF8BL   /*  108 */,    0x47C4FBF17D6016BFL   /*  109 */,
-        0x1E0FAADD7667E3F5L   /*  110 */,    0x7ABCFF62938BEB96L   /*  111 */,
-        0xA78DAD948FC179C9L   /*  112 */,    0x8F1F98B72911E50DL   /*  113 */,
-        0x61E48EAE27121A91L   /*  114 */,    0x4D62F7AD31859808L   /*  115 */,
-        0xECEBA345EF5CEAEBL   /*  116 */,    0xF5CEB25EBC9684CEL   /*  117 */,
-        0xF633E20CB7F76221L   /*  118 */,    0xA32CDF06AB8293E4L   /*  119 */,
-        0x985A202CA5EE2CA4L   /*  120 */,    0xCF0B8447CC8A8FB1L   /*  121 */,
-        0x9F765244979859A3L   /*  122 */,    0xA8D516B1A1240017L   /*  123 */,
-        0x0BD7BA3EBB5DC726L   /*  124 */,    0xE54BCA55B86ADB39L   /*  125 */,
-        0x1D7A3AFD6C478063L   /*  126 */,    0x519EC608E7669EDDL   /*  127 */,
-        0x0E5715A2D149AA23L   /*  128 */,    0x177D4571848FF194L   /*  129 */,
-        0xEEB55F3241014C22L   /*  130 */,    0x0F5E5CA13A6E2EC2L   /*  131 */,
-        0x8029927B75F5C361L   /*  132 */,    0xAD139FABC3D6E436L   /*  133 */,
-        0x0D5DF1A94CCF402FL   /*  134 */,    0x3E8BD948BEA5DFC8L   /*  135 */,
-        0xA5A0D357BD3FF77EL   /*  136 */,    0xA2D12E251F74F645L   /*  137 */,
-        0x66FD9E525E81A082L   /*  138 */,    0x2E0C90CE7F687A49L   /*  139 */,
-        0xC2E8BCBEBA973BC5L   /*  140 */,    0x000001BCE509745FL   /*  141 */,
-        0x423777BBE6DAB3D6L   /*  142 */,    0xD1661C7EAEF06EB5L   /*  143 */,
-        0xA1781F354DAACFD8L   /*  144 */,    0x2D11284A2B16AFFCL   /*  145 */,
-        0xF1FC4F67FA891D1FL   /*  146 */,    0x73ECC25DCB920ADAL   /*  147 */,
-        0xAE610C22C2A12651L   /*  148 */,    0x96E0A810D356B78AL   /*  149 */,
-        0x5A9A381F2FE7870FL   /*  150 */,    0xD5AD62EDE94E5530L   /*  151 */,
-        0xD225E5E8368D1427L   /*  152 */,    0x65977B70C7AF4631L   /*  153 */,
-        0x99F889B2DE39D74FL   /*  154 */,    0x233F30BF54E1D143L   /*  155 */,
-        0x9A9675D3D9A63C97L   /*  156 */,    0x5470554FF334F9A8L   /*  157 */,
-        0x166ACB744A4F5688L   /*  158 */,    0x70C74CAAB2E4AEADL   /*  159 */,
-        0xF0D091646F294D12L   /*  160 */,    0x57B82A89684031D1L   /*  161 */,
-        0xEFD95A5A61BE0B6BL   /*  162 */,    0x2FBD12E969F2F29AL   /*  163 */,
-        0x9BD37013FEFF9FE8L   /*  164 */,    0x3F9B0404D6085A06L   /*  165 */,
-        0x4940C1F3166CFE15L   /*  166 */,    0x09542C4DCDF3DEFBL   /*  167 */,
-        0xB4C5218385CD5CE3L   /*  168 */,    0xC935B7DC4462A641L   /*  169 */,
-        0x3417F8A68ED3B63FL   /*  170 */,    0xB80959295B215B40L   /*  171 */,
-        0xF99CDAEF3B8C8572L   /*  172 */,    0x018C0614F8FCB95DL   /*  173 */,
-        0x1B14ACCD1A3ACDF3L   /*  174 */,    0x84D471F200BB732DL   /*  175 */,
-        0xC1A3110E95E8DA16L   /*  176 */,    0x430A7220BF1A82B8L   /*  177 */,
-        0xB77E090D39DF210EL   /*  178 */,    0x5EF4BD9F3CD05E9DL   /*  179 */,
-        0x9D4FF6DA7E57A444L   /*  180 */,    0xDA1D60E183D4A5F8L   /*  181 */,
-        0xB287C38417998E47L   /*  182 */,    0xFE3EDC121BB31886L   /*  183 */,
-        0xC7FE3CCC980CCBEFL   /*  184 */,    0xE46FB590189BFD03L   /*  185 */,
-        0x3732FD469A4C57DCL   /*  186 */,    0x7EF700A07CF1AD65L   /*  187 */,
-        0x59C64468A31D8859L   /*  188 */,    0x762FB0B4D45B61F6L   /*  189 */,
-        0x155BAED099047718L   /*  190 */,    0x68755E4C3D50BAA6L   /*  191 */,
-        0xE9214E7F22D8B4DFL   /*  192 */,    0x2ADDBF532EAC95F4L   /*  193 */,
-        0x32AE3909B4BD0109L   /*  194 */,    0x834DF537B08E3450L   /*  195 */,
-        0xFA209DA84220728DL   /*  196 */,    0x9E691D9B9EFE23F7L   /*  197 */,
-        0x0446D288C4AE8D7FL   /*  198 */,    0x7B4CC524E169785BL   /*  199 */,
-        0x21D87F0135CA1385L   /*  200 */,    0xCEBB400F137B8AA5L   /*  201 */,
-        0x272E2B66580796BEL   /*  202 */,    0x3612264125C2B0DEL   /*  203 */,
-        0x057702BDAD1EFBB2L   /*  204 */,    0xD4BABB8EACF84BE9L   /*  205 */,
-        0x91583139641BC67BL   /*  206 */,    0x8BDC2DE08036E024L   /*  207 */,
-        0x603C8156F49F68EDL   /*  208 */,    0xF7D236F7DBEF5111L   /*  209 */,
-        0x9727C4598AD21E80L   /*  210 */,    0xA08A0896670A5FD7L   /*  211 */,
-        0xCB4A8F4309EBA9CBL   /*  212 */,    0x81AF564B0F7036A1L   /*  213 */,
-        0xC0B99AA778199ABDL   /*  214 */,    0x959F1EC83FC8E952L   /*  215 */,
-        0x8C505077794A81B9L   /*  216 */,    0x3ACAAF8F056338F0L   /*  217 */,
-        0x07B43F50627A6778L   /*  218 */,    0x4A44AB49F5ECCC77L   /*  219 */,
-        0x3BC3D6E4B679EE98L   /*  220 */,    0x9CC0D4D1CF14108CL   /*  221 */,
-        0x4406C00B206BC8A0L   /*  222 */,    0x82A18854C8D72D89L   /*  223 */,
-        0x67E366B35C3C432CL   /*  224 */,    0xB923DD61102B37F2L   /*  225 */,
-        0x56AB2779D884271DL   /*  226 */,    0xBE83E1B0FF1525AFL   /*  227 */,
-        0xFB7C65D4217E49A9L   /*  228 */,    0x6BDBE0E76D48E7D4L   /*  229 */,
-        0x08DF828745D9179EL   /*  230 */,    0x22EA6A9ADD53BD34L   /*  231 */,
-        0xE36E141C5622200AL   /*  232 */,    0x7F805D1B8CB750EEL   /*  233 */,
-        0xAFE5C7A59F58E837L   /*  234 */,    0xE27F996A4FB1C23CL   /*  235 */,
-        0xD3867DFB0775F0D0L   /*  236 */,    0xD0E673DE6E88891AL   /*  237 */,
-        0x123AEB9EAFB86C25L   /*  238 */,    0x30F1D5D5C145B895L   /*  239 */,
-        0xBB434A2DEE7269E7L   /*  240 */,    0x78CB67ECF931FA38L   /*  241 */,
-        0xF33B0372323BBF9CL   /*  242 */,    0x52D66336FB279C74L   /*  243 */,
-        0x505F33AC0AFB4EAAL   /*  244 */,    0xE8A5CD99A2CCE187L   /*  245 */,
-        0x534974801E2D30BBL   /*  246 */,    0x8D2D5711D5876D90L   /*  247 */,
-        0x1F1A412891BC038EL   /*  248 */,    0xD6E2E71D82E56648L   /*  249 */,
-        0x74036C3A497732B7L   /*  250 */,    0x89B67ED96361F5ABL   /*  251 */,
-        0xFFED95D8F1EA02A2L   /*  252 */,    0xE72B3BD61464D43DL   /*  253 */,
-        0xA6300F170BDC4820L   /*  254 */,    0xEBC18760ED78A77AL   /*  255 */,
-    };
-
-    private static final long[] t2 = {
-        0xE6A6BE5A05A12138L   /*  256 */,    0xB5A122A5B4F87C98L   /*  257 */,
-        0x563C6089140B6990L   /*  258 */,    0x4C46CB2E391F5DD5L   /*  259 */,
-        0xD932ADDBC9B79434L   /*  260 */,    0x08EA70E42015AFF5L   /*  261 */,
-        0xD765A6673E478CF1L   /*  262 */,    0xC4FB757EAB278D99L   /*  263 */,
-        0xDF11C6862D6E0692L   /*  264 */,    0xDDEB84F10D7F3B16L   /*  265 */,
-        0x6F2EF604A665EA04L   /*  266 */,    0x4A8E0F0FF0E0DFB3L   /*  267 */,
-        0xA5EDEEF83DBCBA51L   /*  268 */,    0xFC4F0A2A0EA4371EL   /*  269 */,
-        0xE83E1DA85CB38429L   /*  270 */,    0xDC8FF882BA1B1CE2L   /*  271 */,
-        0xCD45505E8353E80DL   /*  272 */,    0x18D19A00D4DB0717L   /*  273 */,
-        0x34A0CFEDA5F38101L   /*  274 */,    0x0BE77E518887CAF2L   /*  275 */,
-        0x1E341438B3C45136L   /*  276 */,    0xE05797F49089CCF9L   /*  277 */,
-        0xFFD23F9DF2591D14L   /*  278 */,    0x543DDA228595C5CDL   /*  279 */,
-        0x661F81FD99052A33L   /*  280 */,    0x8736E641DB0F7B76L   /*  281 */,
-        0x15227725418E5307L   /*  282 */,    0xE25F7F46162EB2FAL   /*  283 */,
-        0x48A8B2126C13D9FEL   /*  284 */,    0xAFDC541792E76EEAL   /*  285 */,
-        0x03D912BFC6D1898FL   /*  286 */,    0x31B1AAFA1B83F51BL   /*  287 */,
-        0xF1AC2796E42AB7D9L   /*  288 */,    0x40A3A7D7FCD2EBACL   /*  289 */,
-        0x1056136D0AFBBCC5L   /*  290 */,    0x7889E1DD9A6D0C85L   /*  291 */,
-        0xD33525782A7974AAL   /*  292 */,    0xA7E25D09078AC09BL   /*  293 */,
-        0xBD4138B3EAC6EDD0L   /*  294 */,    0x920ABFBE71EB9E70L   /*  295 */,
-        0xA2A5D0F54FC2625CL   /*  296 */,    0xC054E36B0B1290A3L   /*  297 */,
-        0xF6DD59FF62FE932BL   /*  298 */,    0x3537354511A8AC7DL   /*  299 */,
-        0xCA845E9172FADCD4L   /*  300 */,    0x84F82B60329D20DCL   /*  301 */,
-        0x79C62CE1CD672F18L   /*  302 */,    0x8B09A2ADD124642CL   /*  303 */,
-        0xD0C1E96A19D9E726L   /*  304 */,    0x5A786A9B4BA9500CL   /*  305 */,
-        0x0E020336634C43F3L   /*  306 */,    0xC17B474AEB66D822L   /*  307 */,
-        0x6A731AE3EC9BAAC2L   /*  308 */,    0x8226667AE0840258L   /*  309 */,
-        0x67D4567691CAECA5L   /*  310 */,    0x1D94155C4875ADB5L   /*  311 */,
-        0x6D00FD985B813FDFL   /*  312 */,    0x51286EFCB774CD06L   /*  313 */,
-        0x5E8834471FA744AFL   /*  314 */,    0xF72CA0AEE761AE2EL   /*  315 */,
-        0xBE40E4CDAEE8E09AL   /*  316 */,    0xE9970BBB5118F665L   /*  317 */,
-        0x726E4BEB33DF1964L   /*  318 */,    0x703B000729199762L   /*  319 */,
-        0x4631D816F5EF30A7L   /*  320 */,    0xB880B5B51504A6BEL   /*  321 */,
-        0x641793C37ED84B6CL   /*  322 */,    0x7B21ED77F6E97D96L   /*  323 */,
-        0x776306312EF96B73L   /*  324 */,    0xAE528948E86FF3F4L   /*  325 */,
-        0x53DBD7F286A3F8F8L   /*  326 */,    0x16CADCE74CFC1063L   /*  327 */,
-        0x005C19BDFA52C6DDL   /*  328 */,    0x68868F5D64D46AD3L   /*  329 */,
-        0x3A9D512CCF1E186AL   /*  330 */,    0x367E62C2385660AEL   /*  331 */,
-        0xE359E7EA77DCB1D7L   /*  332 */,    0x526C0773749ABE6EL   /*  333 */,
-        0x735AE5F9D09F734BL   /*  334 */,    0x493FC7CC8A558BA8L   /*  335 */,
-        0xB0B9C1533041AB45L   /*  336 */,    0x321958BA470A59BDL   /*  337 */,
-        0x852DB00B5F46C393L   /*  338 */,    0x91209B2BD336B0E5L   /*  339 */,
-        0x6E604F7D659EF19FL   /*  340 */,    0xB99A8AE2782CCB24L   /*  341 */,
-        0xCCF52AB6C814C4C7L   /*  342 */,    0x4727D9AFBE11727BL   /*  343 */,
-        0x7E950D0C0121B34DL   /*  344 */,    0x756F435670AD471FL   /*  345 */,
-        0xF5ADD442615A6849L   /*  346 */,    0x4E87E09980B9957AL   /*  347 */,
-        0x2ACFA1DF50AEE355L   /*  348 */,    0xD898263AFD2FD556L   /*  349 */,
-        0xC8F4924DD80C8FD6L   /*  350 */,    0xCF99CA3D754A173AL   /*  351 */,
-        0xFE477BACAF91BF3CL   /*  352 */,    0xED5371F6D690C12DL   /*  353 */,
-        0x831A5C285E687094L   /*  354 */,    0xC5D3C90A3708A0A4L   /*  355 */,
-        0x0F7F903717D06580L   /*  356 */,    0x19F9BB13B8FDF27FL   /*  357 */,
-        0xB1BD6F1B4D502843L   /*  358 */,    0x1C761BA38FFF4012L   /*  359 */,
-        0x0D1530C4E2E21F3BL   /*  360 */,    0x8943CE69A7372C8AL   /*  361 */,
-        0xE5184E11FEB5CE66L   /*  362 */,    0x618BDB80BD736621L   /*  363 */,
-        0x7D29BAD68B574D0BL   /*  364 */,    0x81BB613E25E6FE5BL   /*  365 */,
-        0x071C9C10BC07913FL   /*  366 */,    0xC7BEEB7909AC2D97L   /*  367 */,
-        0xC3E58D353BC5D757L   /*  368 */,    0xEB017892F38F61E8L   /*  369 */,
-        0xD4EFFB9C9B1CC21AL   /*  370 */,    0x99727D26F494F7ABL   /*  371 */,
-        0xA3E063A2956B3E03L   /*  372 */,    0x9D4A8B9A4AA09C30L   /*  373 */,
-        0x3F6AB7D500090FB4L   /*  374 */,    0x9CC0F2A057268AC0L   /*  375 */,
-        0x3DEE9D2DEDBF42D1L   /*  376 */,    0x330F49C87960A972L   /*  377 */,
-        0xC6B2720287421B41L   /*  378 */,    0x0AC59EC07C00369CL   /*  379 */,
-        0xEF4EAC49CB353425L   /*  380 */,    0xF450244EEF0129D8L   /*  381 */,
-        0x8ACC46E5CAF4DEB6L   /*  382 */,    0x2FFEAB63989263F7L   /*  383 */,
-        0x8F7CB9FE5D7A4578L   /*  384 */,    0x5BD8F7644E634635L   /*  385 */,
-        0x427A7315BF2DC900L   /*  386 */,    0x17D0C4AA2125261CL   /*  387 */,
-        0x3992486C93518E50L   /*  388 */,    0xB4CBFEE0A2D7D4C3L   /*  389 */,
-        0x7C75D6202C5DDD8DL   /*  390 */,    0xDBC295D8E35B6C61L   /*  391 */,
-        0x60B369D302032B19L   /*  392 */,    0xCE42685FDCE44132L   /*  393 */,
-        0x06F3DDB9DDF65610L   /*  394 */,    0x8EA4D21DB5E148F0L   /*  395 */,
-        0x20B0FCE62FCD496FL   /*  396 */,    0x2C1B912358B0EE31L   /*  397 */,
-        0xB28317B818F5A308L   /*  398 */,    0xA89C1E189CA6D2CFL   /*  399 */,
-        0x0C6B18576AAADBC8L   /*  400 */,    0xB65DEAA91299FAE3L   /*  401 */,
-        0xFB2B794B7F1027E7L   /*  402 */,    0x04E4317F443B5BEBL   /*  403 */,
-        0x4B852D325939D0A6L   /*  404 */,    0xD5AE6BEEFB207FFCL   /*  405 */,
-        0x309682B281C7D374L   /*  406 */,    0xBAE309A194C3B475L   /*  407 */,
-        0x8CC3F97B13B49F05L   /*  408 */,    0x98A9422FF8293967L   /*  409 */,
-        0x244B16B01076FF7CL   /*  410 */,    0xF8BF571C663D67EEL   /*  411 */,
-        0x1F0D6758EEE30DA1L   /*  412 */,    0xC9B611D97ADEB9B7L   /*  413 */,
-        0xB7AFD5887B6C57A2L   /*  414 */,    0x6290AE846B984FE1L   /*  415 */,
-        0x94DF4CDEACC1A5FDL   /*  416 */,    0x058A5BD1C5483AFFL   /*  417 */,
-        0x63166CC142BA3C37L   /*  418 */,    0x8DB8526EB2F76F40L   /*  419 */,
-        0xE10880036F0D6D4EL   /*  420 */,    0x9E0523C9971D311DL   /*  421 */,
-        0x45EC2824CC7CD691L   /*  422 */,    0x575B8359E62382C9L   /*  423 */,
-        0xFA9E400DC4889995L   /*  424 */,    0xD1823ECB45721568L   /*  425 */,
-        0xDAFD983B8206082FL   /*  426 */,    0xAA7D29082386A8CBL   /*  427 */,
-        0x269FCD4403B87588L   /*  428 */,    0x1B91F5F728BDD1E0L   /*  429 */,
-        0xE4669F39040201F6L   /*  430 */,    0x7A1D7C218CF04ADEL   /*  431 */,
-        0x65623C29D79CE5CEL   /*  432 */,    0x2368449096C00BB1L   /*  433 */,
-        0xAB9BF1879DA503BAL   /*  434 */,    0xBC23ECB1A458058EL   /*  435 */,
-        0x9A58DF01BB401ECCL   /*  436 */,    0xA070E868A85F143DL   /*  437 */,
-        0x4FF188307DF2239EL   /*  438 */,    0x14D565B41A641183L   /*  439 */,
-        0xEE13337452701602L   /*  440 */,    0x950E3DCF3F285E09L   /*  441 */,
-        0x59930254B9C80953L   /*  442 */,    0x3BF299408930DA6DL   /*  443 */,
-        0xA955943F53691387L   /*  444 */,    0xA15EDECAA9CB8784L   /*  445 */,
-        0x29142127352BE9A0L   /*  446 */,    0x76F0371FFF4E7AFBL   /*  447 */,
-        0x0239F450274F2228L   /*  448 */,    0xBB073AF01D5E868BL   /*  449 */,
-        0xBFC80571C10E96C1L   /*  450 */,    0xD267088568222E23L   /*  451 */,
-        0x9671A3D48E80B5B0L   /*  452 */,    0x55B5D38AE193BB81L   /*  453 */,
-        0x693AE2D0A18B04B8L   /*  454 */,    0x5C48B4ECADD5335FL   /*  455 */,
-        0xFD743B194916A1CAL   /*  456 */,    0x2577018134BE98C4L   /*  457 */,
-        0xE77987E83C54A4ADL   /*  458 */,    0x28E11014DA33E1B9L   /*  459 */,
-        0x270CC59E226AA213L   /*  460 */,    0x71495F756D1A5F60L   /*  461 */,
-        0x9BE853FB60AFEF77L   /*  462 */,    0xADC786A7F7443DBFL   /*  463 */,
-        0x0904456173B29A82L   /*  464 */,    0x58BC7A66C232BD5EL   /*  465 */,
-        0xF306558C673AC8B2L   /*  466 */,    0x41F639C6B6C9772AL   /*  467 */,
-        0x216DEFE99FDA35DAL   /*  468 */,    0x11640CC71C7BE615L   /*  469 */,
-        0x93C43694565C5527L   /*  470 */,    0xEA038E6246777839L   /*  471 */,
-        0xF9ABF3CE5A3E2469L   /*  472 */,    0x741E768D0FD312D2L   /*  473 */,
-        0x0144B883CED652C6L   /*  474 */,    0xC20B5A5BA33F8552L   /*  475 */,
-        0x1AE69633C3435A9DL   /*  476 */,    0x97A28CA4088CFDECL   /*  477 */,
-        0x8824A43C1E96F420L   /*  478 */,    0x37612FA66EEEA746L   /*  479 */,
-        0x6B4CB165F9CF0E5AL   /*  480 */,    0x43AA1C06A0ABFB4AL   /*  481 */,
-        0x7F4DC26FF162796BL   /*  482 */,    0x6CBACC8E54ED9B0FL   /*  483 */,
-        0xA6B7FFEFD2BB253EL   /*  484 */,    0x2E25BC95B0A29D4FL   /*  485 */,
-        0x86D6A58BDEF1388CL   /*  486 */,    0xDED74AC576B6F054L   /*  487 */,
-        0x8030BDBC2B45805DL   /*  488 */,    0x3C81AF70E94D9289L   /*  489 */,
-        0x3EFF6DDA9E3100DBL   /*  490 */,    0xB38DC39FDFCC8847L   /*  491 */,
-        0x123885528D17B87EL   /*  492 */,    0xF2DA0ED240B1B642L   /*  493 */,
-        0x44CEFADCD54BF9A9L   /*  494 */,    0x1312200E433C7EE6L   /*  495 */,
-        0x9FFCC84F3A78C748L   /*  496 */,    0xF0CD1F72248576BBL   /*  497 */,
-        0xEC6974053638CFE4L   /*  498 */,    0x2BA7B67C0CEC4E4CL   /*  499 */,
-        0xAC2F4DF3E5CE32EDL   /*  500 */,    0xCB33D14326EA4C11L   /*  501 */,
-        0xA4E9044CC77E58BCL   /*  502 */,    0x5F513293D934FCEFL   /*  503 */,
-        0x5DC9645506E55444L   /*  504 */,    0x50DE418F317DE40AL   /*  505 */,
-        0x388CB31A69DDE259L   /*  506 */,    0x2DB4A83455820A86L   /*  507 */,
-        0x9010A91E84711AE9L   /*  508 */,    0x4DF7F0B7B1498371L   /*  509 */,
-        0xD62A2EABC0977179L   /*  510 */,    0x22FAC097AA8D5C0EL   /*  511 */,
-    };
-
-    private static final long[] t3 = {
-        0xF49FCC2FF1DAF39BL   /*  512 */,    0x487FD5C66FF29281L   /*  513 */,
-        0xE8A30667FCDCA83FL   /*  514 */,    0x2C9B4BE3D2FCCE63L   /*  515 */,
-        0xDA3FF74B93FBBBC2L   /*  516 */,    0x2FA165D2FE70BA66L   /*  517 */,
-        0xA103E279970E93D4L   /*  518 */,    0xBECDEC77B0E45E71L   /*  519 */,
-        0xCFB41E723985E497L   /*  520 */,    0xB70AAA025EF75017L   /*  521 */,
-        0xD42309F03840B8E0L   /*  522 */,    0x8EFC1AD035898579L   /*  523 */,
-        0x96C6920BE2B2ABC5L   /*  524 */,    0x66AF4163375A9172L   /*  525 */,
-        0x2174ABDCCA7127FBL   /*  526 */,    0xB33CCEA64A72FF41L   /*  527 */,
-        0xF04A4933083066A5L   /*  528 */,    0x8D970ACDD7289AF5L   /*  529 */,
-        0x8F96E8E031C8C25EL   /*  530 */,    0xF3FEC02276875D47L   /*  531 */,
-        0xEC7BF310056190DDL   /*  532 */,    0xF5ADB0AEBB0F1491L   /*  533 */,
-        0x9B50F8850FD58892L   /*  534 */,    0x4975488358B74DE8L   /*  535 */,
-        0xA3354FF691531C61L   /*  536 */,    0x0702BBE481D2C6EEL   /*  537 */,
-        0x89FB24057DEDED98L   /*  538 */,    0xAC3075138596E902L   /*  539 */,
-        0x1D2D3580172772EDL   /*  540 */,    0xEB738FC28E6BC30DL   /*  541 */,
-        0x5854EF8F63044326L   /*  542 */,    0x9E5C52325ADD3BBEL   /*  543 */,
-        0x90AA53CF325C4623L   /*  544 */,    0xC1D24D51349DD067L   /*  545 */,
-        0x2051CFEEA69EA624L   /*  546 */,    0x13220F0A862E7E4FL   /*  547 */,
-        0xCE39399404E04864L   /*  548 */,    0xD9C42CA47086FCB7L   /*  549 */,
-        0x685AD2238A03E7CCL   /*  550 */,    0x066484B2AB2FF1DBL   /*  551 */,
-        0xFE9D5D70EFBF79ECL   /*  552 */,    0x5B13B9DD9C481854L   /*  553 */,
-        0x15F0D475ED1509ADL   /*  554 */,    0x0BEBCD060EC79851L   /*  555 */,
-        0xD58C6791183AB7F8L   /*  556 */,    0xD1187C5052F3EEE4L   /*  557 */,
-        0xC95D1192E54E82FFL   /*  558 */,    0x86EEA14CB9AC6CA2L   /*  559 */,
-        0x3485BEB153677D5DL   /*  560 */,    0xDD191D781F8C492AL   /*  561 */,
-        0xF60866BAA784EBF9L   /*  562 */,    0x518F643BA2D08C74L   /*  563 */,
-        0x8852E956E1087C22L   /*  564 */,    0xA768CB8DC410AE8DL   /*  565 */,
-        0x38047726BFEC8E1AL   /*  566 */,    0xA67738B4CD3B45AAL   /*  567 */,
-        0xAD16691CEC0DDE19L   /*  568 */,    0xC6D4319380462E07L   /*  569 */,
-        0xC5A5876D0BA61938L   /*  570 */,    0x16B9FA1FA58FD840L   /*  571 */,
-        0x188AB1173CA74F18L   /*  572 */,    0xABDA2F98C99C021FL   /*  573 */,
-        0x3E0580AB134AE816L   /*  574 */,    0x5F3B05B773645ABBL   /*  575 */,
-        0x2501A2BE5575F2F6L   /*  576 */,    0x1B2F74004E7E8BA9L   /*  577 */,
-        0x1CD7580371E8D953L   /*  578 */,    0x7F6ED89562764E30L   /*  579 */,
-        0xB15926FF596F003DL   /*  580 */,    0x9F65293DA8C5D6B9L   /*  581 */,
-        0x6ECEF04DD690F84CL   /*  582 */,    0x4782275FFF33AF88L   /*  583 */,
-        0xE41433083F820801L   /*  584 */,    0xFD0DFE409A1AF9B5L   /*  585 */,
-        0x4325A3342CDB396BL   /*  586 */,    0x8AE77E62B301B252L   /*  587 */,
-        0xC36F9E9F6655615AL   /*  588 */,    0x85455A2D92D32C09L   /*  589 */,
-        0xF2C7DEA949477485L   /*  590 */,    0x63CFB4C133A39EBAL   /*  591 */,
-        0x83B040CC6EBC5462L   /*  592 */,    0x3B9454C8FDB326B0L   /*  593 */,
-        0x56F56A9E87FFD78CL   /*  594 */,    0x2DC2940D99F42BC6L   /*  595 */,
-        0x98F7DF096B096E2DL   /*  596 */,    0x19A6E01E3AD852BFL   /*  597 */,
-        0x42A99CCBDBD4B40BL   /*  598 */,    0xA59998AF45E9C559L   /*  599 */,
-        0x366295E807D93186L   /*  600 */,    0x6B48181BFAA1F773L   /*  601 */,
-        0x1FEC57E2157A0A1DL   /*  602 */,    0x4667446AF6201AD5L   /*  603 */,
-        0xE615EBCACFB0F075L   /*  604 */,    0xB8F31F4F68290778L   /*  605 */,
-        0x22713ED6CE22D11EL   /*  606 */,    0x3057C1A72EC3C93BL   /*  607 */,
-        0xCB46ACC37C3F1F2FL   /*  608 */,    0xDBB893FD02AAF50EL   /*  609 */,
-        0x331FD92E600B9FCFL   /*  610 */,    0xA498F96148EA3AD6L   /*  611 */,
-        0xA8D8426E8B6A83EAL   /*  612 */,    0xA089B274B7735CDCL   /*  613 */,
-        0x87F6B3731E524A11L   /*  614 */,    0x118808E5CBC96749L   /*  615 */,
-        0x9906E4C7B19BD394L   /*  616 */,    0xAFED7F7E9B24A20CL   /*  617 */,
-        0x6509EADEEB3644A7L   /*  618 */,    0x6C1EF1D3E8EF0EDEL   /*  619 */,
-        0xB9C97D43E9798FB4L   /*  620 */,    0xA2F2D784740C28A3L   /*  621 */,
-        0x7B8496476197566FL   /*  622 */,    0x7A5BE3E6B65F069DL   /*  623 */,
-        0xF96330ED78BE6F10L   /*  624 */,    0xEEE60DE77A076A15L   /*  625 */,
-        0x2B4BEE4AA08B9BD0L   /*  626 */,    0x6A56A63EC7B8894EL   /*  627 */,
-        0x02121359BA34FEF4L   /*  628 */,    0x4CBF99F8283703FCL   /*  629 */,
-        0x398071350CAF30C8L   /*  630 */,    0xD0A77A89F017687AL   /*  631 */,
-        0xF1C1A9EB9E423569L   /*  632 */,    0x8C7976282DEE8199L   /*  633 */,
-        0x5D1737A5DD1F7ABDL   /*  634 */,    0x4F53433C09A9FA80L   /*  635 */,
-        0xFA8B0C53DF7CA1D9L   /*  636 */,    0x3FD9DCBC886CCB77L   /*  637 */,
-        0xC040917CA91B4720L   /*  638 */,    0x7DD00142F9D1DCDFL   /*  639 */,
-        0x8476FC1D4F387B58L   /*  640 */,    0x23F8E7C5F3316503L   /*  641 */,
-        0x032A2244E7E37339L   /*  642 */,    0x5C87A5D750F5A74BL   /*  643 */,
-        0x082B4CC43698992EL   /*  644 */,    0xDF917BECB858F63CL   /*  645 */,
-        0x3270B8FC5BF86DDAL   /*  646 */,    0x10AE72BB29B5DD76L   /*  647 */,
-        0x576AC94E7700362BL   /*  648 */,    0x1AD112DAC61EFB8FL   /*  649 */,
-        0x691BC30EC5FAA427L   /*  650 */,    0xFF246311CC327143L   /*  651 */,
-        0x3142368E30E53206L   /*  652 */,    0x71380E31E02CA396L   /*  653 */,
-        0x958D5C960AAD76F1L   /*  654 */,    0xF8D6F430C16DA536L   /*  655 */,
-        0xC8FFD13F1BE7E1D2L   /*  656 */,    0x7578AE66004DDBE1L   /*  657 */,
-        0x05833F01067BE646L   /*  658 */,    0xBB34B5AD3BFE586DL   /*  659 */,
-        0x095F34C9A12B97F0L   /*  660 */,    0x247AB64525D60CA8L   /*  661 */,
-        0xDCDBC6F3017477D1L   /*  662 */,    0x4A2E14D4DECAD24DL   /*  663 */,
-        0xBDB5E6D9BE0A1EEBL   /*  664 */,    0x2A7E70F7794301ABL   /*  665 */,
-        0xDEF42D8A270540FDL   /*  666 */,    0x01078EC0A34C22C1L   /*  667 */,
-        0xE5DE511AF4C16387L   /*  668 */,    0x7EBB3A52BD9A330AL   /*  669 */,
-        0x77697857AA7D6435L   /*  670 */,    0x004E831603AE4C32L   /*  671 */,
-        0xE7A21020AD78E312L   /*  672 */,    0x9D41A70C6AB420F2L   /*  673 */,
-        0x28E06C18EA1141E6L   /*  674 */,    0xD2B28CBD984F6B28L   /*  675 */,
-        0x26B75F6C446E9D83L   /*  676 */,    0xBA47568C4D418D7FL   /*  677 */,
-        0xD80BADBFE6183D8EL   /*  678 */,    0x0E206D7F5F166044L   /*  679 */,
-        0xE258A43911CBCA3EL   /*  680 */,    0x723A1746B21DC0BCL   /*  681 */,
-        0xC7CAA854F5D7CDD3L   /*  682 */,    0x7CAC32883D261D9CL   /*  683 */,
-        0x7690C26423BA942CL   /*  684 */,    0x17E55524478042B8L   /*  685 */,
-        0xE0BE477656A2389FL   /*  686 */,    0x4D289B5E67AB2DA0L   /*  687 */,
-        0x44862B9C8FBBFD31L   /*  688 */,    0xB47CC8049D141365L   /*  689 */,
-        0x822C1B362B91C793L   /*  690 */,    0x4EB14655FB13DFD8L   /*  691 */,
-        0x1ECBBA0714E2A97BL   /*  692 */,    0x6143459D5CDE5F14L   /*  693 */,
-        0x53A8FBF1D5F0AC89L   /*  694 */,    0x97EA04D81C5E5B00L   /*  695 */,
-        0x622181A8D4FDB3F3L   /*  696 */,    0xE9BCD341572A1208L   /*  697 */,
-        0x1411258643CCE58AL   /*  698 */,    0x9144C5FEA4C6E0A4L   /*  699 */,
-        0x0D33D06565CF620FL   /*  700 */,    0x54A48D489F219CA1L   /*  701 */,
-        0xC43E5EAC6D63C821L   /*  702 */,    0xA9728B3A72770DAFL   /*  703 */,
-        0xD7934E7B20DF87EFL   /*  704 */,    0xE35503B61A3E86E5L   /*  705 */,
-        0xCAE321FBC819D504L   /*  706 */,    0x129A50B3AC60BFA6L   /*  707 */,
-        0xCD5E68EA7E9FB6C3L   /*  708 */,    0xB01C90199483B1C7L   /*  709 */,
-        0x3DE93CD5C295376CL   /*  710 */,    0xAED52EDF2AB9AD13L   /*  711 */,
-        0x2E60F512C0A07884L   /*  712 */,    0xBC3D86A3E36210C9L   /*  713 */,
-        0x35269D9B163951CEL   /*  714 */,    0x0C7D6E2AD0CDB5FAL   /*  715 */,
-        0x59E86297D87F5733L   /*  716 */,    0x298EF221898DB0E7L   /*  717 */,
-        0x55000029D1A5AA7EL   /*  718 */,    0x8BC08AE1B5061B45L   /*  719 */,
-        0xC2C31C2B6C92703AL   /*  720 */,    0x94CC596BAF25EF42L   /*  721 */,
-        0x0A1D73DB22540456L   /*  722 */,    0x04B6A0F9D9C4179AL   /*  723 */,
-        0xEFFDAFA2AE3D3C60L   /*  724 */,    0xF7C8075BB49496C4L   /*  725 */,
-        0x9CC5C7141D1CD4E3L   /*  726 */,    0x78BD1638218E5534L   /*  727 */,
-        0xB2F11568F850246AL   /*  728 */,    0xEDFABCFA9502BC29L   /*  729 */,
-        0x796CE5F2DA23051BL   /*  730 */,    0xAAE128B0DC93537CL   /*  731 */,
-        0x3A493DA0EE4B29AEL   /*  732 */,    0xB5DF6B2C416895D7L   /*  733 */,
-        0xFCABBD25122D7F37L   /*  734 */,    0x70810B58105DC4B1L   /*  735 */,
-        0xE10FDD37F7882A90L   /*  736 */,    0x524DCAB5518A3F5CL   /*  737 */,
-        0x3C9E85878451255BL   /*  738 */,    0x4029828119BD34E2L   /*  739 */,
-        0x74A05B6F5D3CECCBL   /*  740 */,    0xB610021542E13ECAL   /*  741 */,
-        0x0FF979D12F59E2ACL   /*  742 */,    0x6037DA27E4F9CC50L   /*  743 */,
-        0x5E92975A0DF1847DL   /*  744 */,    0xD66DE190D3E623FEL   /*  745 */,
-        0x5032D6B87B568048L   /*  746 */,    0x9A36B7CE8235216EL   /*  747 */,
-        0x80272A7A24F64B4AL   /*  748 */,    0x93EFED8B8C6916F7L   /*  749 */,
-        0x37DDBFF44CCE1555L   /*  750 */,    0x4B95DB5D4B99BD25L   /*  751 */,
-        0x92D3FDA169812FC0L   /*  752 */,    0xFB1A4A9A90660BB6L   /*  753 */,
-        0x730C196946A4B9B2L   /*  754 */,    0x81E289AA7F49DA68L   /*  755 */,
-        0x64669A0F83B1A05FL   /*  756 */,    0x27B3FF7D9644F48BL   /*  757 */,
-        0xCC6B615C8DB675B3L   /*  758 */,    0x674F20B9BCEBBE95L   /*  759 */,
-        0x6F31238275655982L   /*  760 */,    0x5AE488713E45CF05L   /*  761 */,
-        0xBF619F9954C21157L   /*  762 */,    0xEABAC46040A8EAE9L   /*  763 */,
-        0x454C6FE9F2C0C1CDL   /*  764 */,    0x419CF6496412691CL   /*  765 */,
-        0xD3DC3BEF265B0F70L   /*  766 */,    0x6D0E60F5C3578A9EL   /*  767 */,
-    };
-
-    private static final long[] t4 = {
-        0x5B0E608526323C55L   /*  768 */,    0x1A46C1A9FA1B59F5L   /*  769 */,
-        0xA9E245A17C4C8FFAL   /*  770 */,    0x65CA5159DB2955D7L   /*  771 */,
-        0x05DB0A76CE35AFC2L   /*  772 */,    0x81EAC77EA9113D45L   /*  773 */,
-        0x528EF88AB6AC0A0DL   /*  774 */,    0xA09EA253597BE3FFL   /*  775 */,
-        0x430DDFB3AC48CD56L   /*  776 */,    0xC4B3A67AF45CE46FL   /*  777 */,
-        0x4ECECFD8FBE2D05EL   /*  778 */,    0x3EF56F10B39935F0L   /*  779 */,
-        0x0B22D6829CD619C6L   /*  780 */,    0x17FD460A74DF2069L   /*  781 */,
-        0x6CF8CC8E8510ED40L   /*  782 */,    0xD6C824BF3A6ECAA7L   /*  783 */,
-        0x61243D581A817049L   /*  784 */,    0x048BACB6BBC163A2L   /*  785 */,
-        0xD9A38AC27D44CC32L   /*  786 */,    0x7FDDFF5BAAF410ABL   /*  787 */,
-        0xAD6D495AA804824BL   /*  788 */,    0xE1A6A74F2D8C9F94L   /*  789 */,
-        0xD4F7851235DEE8E3L   /*  790 */,    0xFD4B7F886540D893L   /*  791 */,
-        0x247C20042AA4BFDAL   /*  792 */,    0x096EA1C517D1327CL   /*  793 */,
-        0xD56966B4361A6685L   /*  794 */,    0x277DA5C31221057DL   /*  795 */,
-        0x94D59893A43ACFF7L   /*  796 */,    0x64F0C51CCDC02281L   /*  797 */,
-        0x3D33BCC4FF6189DBL   /*  798 */,    0xE005CB184CE66AF1L   /*  799 */,
-        0xFF5CCD1D1DB99BEAL   /*  800 */,    0xB0B854A7FE42980FL   /*  801 */,
-        0x7BD46A6A718D4B9FL   /*  802 */,    0xD10FA8CC22A5FD8CL   /*  803 */,
-        0xD31484952BE4BD31L   /*  804 */,    0xC7FA975FCB243847L   /*  805 */,
-        0x4886ED1E5846C407L   /*  806 */,    0x28CDDB791EB70B04L   /*  807 */,
-        0xC2B00BE2F573417FL   /*  808 */,    0x5C9590452180F877L   /*  809 */,
-        0x7A6BDDFFF370EB00L   /*  810 */,    0xCE509E38D6D9D6A4L   /*  811 */,
-        0xEBEB0F00647FA702L   /*  812 */,    0x1DCC06CF76606F06L   /*  813 */,
-        0xE4D9F28BA286FF0AL   /*  814 */,    0xD85A305DC918C262L   /*  815 */,
-        0x475B1D8732225F54L   /*  816 */,    0x2D4FB51668CCB5FEL   /*  817 */,
-        0xA679B9D9D72BBA20L   /*  818 */,    0x53841C0D912D43A5L   /*  819 */,
-        0x3B7EAA48BF12A4E8L   /*  820 */,    0x781E0E47F22F1DDFL   /*  821 */,
-        0xEFF20CE60AB50973L   /*  822 */,    0x20D261D19DFFB742L   /*  823 */,
-        0x16A12B03062A2E39L   /*  824 */,    0x1960EB2239650495L   /*  825 */,
-        0x251C16FED50EB8B8L   /*  826 */,    0x9AC0C330F826016EL   /*  827 */,
-        0xED152665953E7671L   /*  828 */,    0x02D63194A6369570L   /*  829 */,
-        0x5074F08394B1C987L   /*  830 */,    0x70BA598C90B25CE1L   /*  831 */,
-        0x794A15810B9742F6L   /*  832 */,    0x0D5925E9FCAF8C6CL   /*  833 */,
-        0x3067716CD868744EL   /*  834 */,    0x910AB077E8D7731BL   /*  835 */,
-        0x6A61BBDB5AC42F61L   /*  836 */,    0x93513EFBF0851567L   /*  837 */,
-        0xF494724B9E83E9D5L   /*  838 */,    0xE887E1985C09648DL   /*  839 */,
-        0x34B1D3C675370CFDL   /*  840 */,    0xDC35E433BC0D255DL   /*  841 */,
-        0xD0AAB84234131BE0L   /*  842 */,    0x08042A50B48B7EAFL   /*  843 */,
-        0x9997C4EE44A3AB35L   /*  844 */,    0x829A7B49201799D0L   /*  845 */,
-        0x263B8307B7C54441L   /*  846 */,    0x752F95F4FD6A6CA6L   /*  847 */,
-        0x927217402C08C6E5L   /*  848 */,    0x2A8AB754A795D9EEL   /*  849 */,
-        0xA442F7552F72943DL   /*  850 */,    0x2C31334E19781208L   /*  851 */,
-        0x4FA98D7CEAEE6291L   /*  852 */,    0x55C3862F665DB309L   /*  853 */,
-        0xBD0610175D53B1F3L   /*  854 */,    0x46FE6CB840413F27L   /*  855 */,
-        0x3FE03792DF0CFA59L   /*  856 */,    0xCFE700372EB85E8FL   /*  857 */,
-        0xA7BE29E7ADBCE118L   /*  858 */,    0xE544EE5CDE8431DDL   /*  859 */,
-        0x8A781B1B41F1873EL   /*  860 */,    0xA5C94C78A0D2F0E7L   /*  861 */,
-        0x39412E2877B60728L   /*  862 */,    0xA1265EF3AFC9A62CL   /*  863 */,
-        0xBCC2770C6A2506C5L   /*  864 */,    0x3AB66DD5DCE1CE12L   /*  865 */,
-        0xE65499D04A675B37L   /*  866 */,    0x7D8F523481BFD216L   /*  867 */,
-        0x0F6F64FCEC15F389L   /*  868 */,    0x74EFBE618B5B13C8L   /*  869 */,
-        0xACDC82B714273E1DL   /*  870 */,    0xDD40BFE003199D17L   /*  871 */,
-        0x37E99257E7E061F8L   /*  872 */,    0xFA52626904775AAAL   /*  873 */,
-        0x8BBBF63A463D56F9L   /*  874 */,    0xF0013F1543A26E64L   /*  875 */,
-        0xA8307E9F879EC898L   /*  876 */,    0xCC4C27A4150177CCL   /*  877 */,
-        0x1B432F2CCA1D3348L   /*  878 */,    0xDE1D1F8F9F6FA013L   /*  879 */,
-        0x606602A047A7DDD6L   /*  880 */,    0xD237AB64CC1CB2C7L   /*  881 */,
-        0x9B938E7225FCD1D3L   /*  882 */,    0xEC4E03708E0FF476L   /*  883 */,
-        0xFEB2FBDA3D03C12DL   /*  884 */,    0xAE0BCED2EE43889AL   /*  885 */,
-        0x22CB8923EBFB4F43L   /*  886 */,    0x69360D013CF7396DL   /*  887 */,
-        0x855E3602D2D4E022L   /*  888 */,    0x073805BAD01F784CL   /*  889 */,
-        0x33E17A133852F546L   /*  890 */,    0xDF4874058AC7B638L   /*  891 */,
-        0xBA92B29C678AA14AL   /*  892 */,    0x0CE89FC76CFAADCDL   /*  893 */,
-        0x5F9D4E0908339E34L   /*  894 */,    0xF1AFE9291F5923B9L   /*  895 */,
-        0x6E3480F60F4A265FL   /*  896 */,    0xEEBF3A2AB29B841CL   /*  897 */,
-        0xE21938A88F91B4ADL   /*  898 */,    0x57DFEFF845C6D3C3L   /*  899 */,
-        0x2F006B0BF62CAAF2L   /*  900 */,    0x62F479EF6F75EE78L   /*  901 */,
-        0x11A55AD41C8916A9L   /*  902 */,    0xF229D29084FED453L   /*  903 */,
-        0x42F1C27B16B000E6L   /*  904 */,    0x2B1F76749823C074L   /*  905 */,
-        0x4B76ECA3C2745360L   /*  906 */,    0x8C98F463B91691BDL   /*  907 */,
-        0x14BCC93CF1ADE66AL   /*  908 */,    0x8885213E6D458397L   /*  909 */,
-        0x8E177DF0274D4711L   /*  910 */,    0xB49B73B5503F2951L   /*  911 */,
-        0x10168168C3F96B6BL   /*  912 */,    0x0E3D963B63CAB0AEL   /*  913 */,
-        0x8DFC4B5655A1DB14L   /*  914 */,    0xF789F1356E14DE5CL   /*  915 */,
-        0x683E68AF4E51DAC1L   /*  916 */,    0xC9A84F9D8D4B0FD9L   /*  917 */,
-        0x3691E03F52A0F9D1L   /*  918 */,    0x5ED86E46E1878E80L   /*  919 */,
-        0x3C711A0E99D07150L   /*  920 */,    0x5A0865B20C4E9310L   /*  921 */,
-        0x56FBFC1FE4F0682EL   /*  922 */,    0xEA8D5DE3105EDF9BL   /*  923 */,
-        0x71ABFDB12379187AL   /*  924 */,    0x2EB99DE1BEE77B9CL   /*  925 */,
-        0x21ECC0EA33CF4523L   /*  926 */,    0x59A4D7521805C7A1L   /*  927 */,
-        0x3896F5EB56AE7C72L   /*  928 */,    0xAA638F3DB18F75DCL   /*  929 */,
-        0x9F39358DABE9808EL   /*  930 */,    0xB7DEFA91C00B72ACL   /*  931 */,
-        0x6B5541FD62492D92L   /*  932 */,    0x6DC6DEE8F92E4D5BL   /*  933 */,
-        0x353F57ABC4BEEA7EL   /*  934 */,    0x735769D6DA5690CEL   /*  935 */,
-        0x0A234AA642391484L   /*  936 */,    0xF6F9508028F80D9DL   /*  937 */,
-        0xB8E319A27AB3F215L   /*  938 */,    0x31AD9C1151341A4DL   /*  939 */,
-        0x773C22A57BEF5805L   /*  940 */,    0x45C7561A07968633L   /*  941 */,
-        0xF913DA9E249DBE36L   /*  942 */,    0xDA652D9B78A64C68L   /*  943 */,
-        0x4C27A97F3BC334EFL   /*  944 */,    0x76621220E66B17F4L   /*  945 */,
-        0x967743899ACD7D0BL   /*  946 */,    0xF3EE5BCAE0ED6782L   /*  947 */,
-        0x409F753600C879FCL   /*  948 */,    0x06D09A39B5926DB6L   /*  949 */,
-        0x6F83AEB0317AC588L   /*  950 */,    0x01E6CA4A86381F21L   /*  951 */,
-        0x66FF3462D19F3025L   /*  952 */,    0x72207C24DDFD3BFBL   /*  953 */,
-        0x4AF6B6D3E2ECE2EBL   /*  954 */,    0x9C994DBEC7EA08DEL   /*  955 */,
-        0x49ACE597B09A8BC4L   /*  956 */,    0xB38C4766CF0797BAL   /*  957 */,
-        0x131B9373C57C2A75L   /*  958 */,    0xB1822CCE61931E58L   /*  959 */,
-        0x9D7555B909BA1C0CL   /*  960 */,    0x127FAFDD937D11D2L   /*  961 */,
-        0x29DA3BADC66D92E4L   /*  962 */,    0xA2C1D57154C2ECBCL   /*  963 */,
-        0x58C5134D82F6FE24L   /*  964 */,    0x1C3AE3515B62274FL   /*  965 */,
-        0xE907C82E01CB8126L   /*  966 */,    0xF8ED091913E37FCBL   /*  967 */,
-        0x3249D8F9C80046C9L   /*  968 */,    0x80CF9BEDE388FB63L   /*  969 */,
-        0x1881539A116CF19EL   /*  970 */,    0x5103F3F76BD52457L   /*  971 */,
-        0x15B7E6F5AE47F7A8L   /*  972 */,    0xDBD7C6DED47E9CCFL   /*  973 */,
-        0x44E55C410228BB1AL   /*  974 */,    0xB647D4255EDB4E99L   /*  975 */,
-        0x5D11882BB8AAFC30L   /*  976 */,    0xF5098BBB29D3212AL   /*  977 */,
-        0x8FB5EA14E90296B3L   /*  978 */,    0x677B942157DD025AL   /*  979 */,
-        0xFB58E7C0A390ACB5L   /*  980 */,    0x89D3674C83BD4A01L   /*  981 */,
-        0x9E2DA4DF4BF3B93BL   /*  982 */,    0xFCC41E328CAB4829L   /*  983 */,
-        0x03F38C96BA582C52L   /*  984 */,    0xCAD1BDBD7FD85DB2L   /*  985 */,
-        0xBBB442C16082AE83L   /*  986 */,    0xB95FE86BA5DA9AB0L   /*  987 */,
-        0xB22E04673771A93FL   /*  988 */,    0x845358C9493152D8L   /*  989 */,
-        0xBE2A488697B4541EL   /*  990 */,    0x95A2DC2DD38E6966L   /*  991 */,
-        0xC02C11AC923C852BL   /*  992 */,    0x2388B1990DF2A87BL   /*  993 */,
-        0x7C8008FA1B4F37BEL   /*  994 */,    0x1F70D0C84D54E503L   /*  995 */,
-        0x5490ADEC7ECE57D4L   /*  996 */,    0x002B3C27D9063A3AL   /*  997 */,
-        0x7EAEA3848030A2BFL   /*  998 */,    0xC602326DED2003C0L   /*  999 */,
-        0x83A7287D69A94086L   /* 1000 */,    0xC57A5FCB30F57A8AL   /* 1001 */,
-        0xB56844E479EBE779L   /* 1002 */,    0xA373B40F05DCBCE9L   /* 1003 */,
-        0xD71A786E88570EE2L   /* 1004 */,    0x879CBACDBDE8F6A0L   /* 1005 */,
-        0x976AD1BCC164A32FL   /* 1006 */,    0xAB21E25E9666D78BL   /* 1007 */,
-        0x901063AAE5E5C33CL   /* 1008 */,    0x9818B34448698D90L   /* 1009 */,
-        0xE36487AE3E1E8ABBL   /* 1010 */,    0xAFBDF931893BDCB4L   /* 1011 */,
-        0x6345A0DC5FBBD519L   /* 1012 */,    0x8628FE269B9465CAL   /* 1013 */,
-        0x1E5D01603F9C51ECL   /* 1014 */,    0x4DE44006A15049B7L   /* 1015 */,
-        0xBF6C70E5F776CBB1L   /* 1016 */,    0x411218F2EF552BEDL   /* 1017 */,
-        0xCB0C0708705A36A3L   /* 1018 */,    0xE74D14754F986044L   /* 1019 */,
-        0xCD56D9430EA8280EL   /* 1020 */,    0xC12591D7535F5065L   /* 1021 */,
-        0xC83223F1720AEF96L   /* 1022 */,    0xC3A0396F7363A51FL   /* 1023 */
-    };
-
-    private static final int    DIGEST_LENGTH = 24;
-
-    //
-    // registers
-    //
-    private long    a, b, c;
-    private long    byteCount;
-
-    //
-    // buffers
-    //
-    private byte[]  buf = new byte[8];
-    private int     bOff = 0;
-
-    private long[]  x = new long[8];
-    private int     xOff = 0;
-
-    /**
-     * Standard constructor
-     */
-    public TigerDigest()
-    {
-        reset();
-    }
-
-    /**
-     * Copy constructor.  This will copy the state of the provided
-     * message digest.
-     */
-    public TigerDigest(TigerDigest t)
-    {
-        this.reset(t);
-    }
-
-    public String getAlgorithmName()
-    {
-        return "Tiger";
-    }
-
-    public int getDigestSize()
-    {
-        return DIGEST_LENGTH;
-    }
-
-    private void processWord(
-        byte[]  b,
-        int     off)
-    {
-        x[xOff++] = ((long)(b[off + 7] & 0xff) << 56)
-             | ((long)(b[off + 6] & 0xff) << 48)
-             | ((long)(b[off + 5] & 0xff) << 40)
-             | ((long)(b[off + 4] & 0xff) << 32)
-             | ((long)(b[off + 3] & 0xff) << 24)
-             | ((long)(b[off + 2] & 0xff) << 16)
-             | ((long)(b[off + 1] & 0xff) << 8)
-             | ((b[off + 0] & 0xff));
-
-        if (xOff == x.length)
-        {
-            processBlock();
-        }
-
-        bOff = 0;
-    }
-
-    public void update(
-        byte in)
-    {
-        buf[bOff++] = in;
-
-        if (bOff == buf.length)
-        {
-            processWord(buf, 0);
-        }
-
-        byteCount++;
-    }
-
-    public void update(
-        byte[]  in,
-        int     inOff,
-        int     len)
-    {
-        //
-        // fill the current word
-        //
-        while ((bOff != 0) && (len > 0))
-        {
-            update(in[inOff]);
-
-            inOff++;
-            len--;
-        }
-
-        //
-        // process whole words.
-        //
-        while (len > 8)
-        {
-            processWord(in, inOff);
-
-            inOff += 8;
-            len -= 8;
-            byteCount += 8;
-        }
-
-        //
-        // load in the remainder.
-        //
-        while (len > 0)
-        {
-            update(in[inOff]);
-
-            inOff++;
-            len--;
-        }
-    }
-
-    private void roundABC(
-        long    x,
-        long    mul)
-    {
-         c ^= x ;
-         a -= t1[(int)c & 0xff] ^ t2[(int)(c >> 16) & 0xff]
-                ^ t3[(int)(c >> 32) & 0xff] ^ t4[(int)(c >> 48) & 0xff];
-         b += t4[(int)(c >> 8) & 0xff] ^ t3[(int)(c >> 24) & 0xff]
-                ^ t2[(int)(c >> 40) & 0xff] ^ t1[(int)(c >> 56) & 0xff];
-         b *= mul;
-    }
-
-    private void roundBCA(
-        long    x,
-        long    mul)
-    {
-         a ^= x ;
-         b -= t1[(int)a & 0xff] ^ t2[(int)(a >> 16) & 0xff]
-                ^ t3[(int)(a >> 32) & 0xff] ^ t4[(int)(a >> 48) & 0xff];
-         c += t4[(int)(a >> 8) & 0xff] ^ t3[(int)(a >> 24) & 0xff]
-                ^ t2[(int)(a >> 40) & 0xff] ^ t1[(int)(a >> 56) & 0xff];
-         c *= mul;
-    }
-
-    private void roundCAB(
-        long    x,
-        long    mul)
-    {
-         b ^= x ;
-         c -= t1[(int)b & 0xff] ^ t2[(int)(b >> 16) & 0xff]
-                ^ t3[(int)(b >> 32) & 0xff] ^ t4[(int)(b >> 48) & 0xff];
-         a += t4[(int)(b >> 8) & 0xff] ^ t3[(int)(b >> 24) & 0xff]
-                ^ t2[(int)(b >> 40) & 0xff] ^ t1[(int)(b >> 56) & 0xff];
-         a *= mul;
-    }
-
-    private void keySchedule()
-    {
-        x[0] -= x[7] ^ 0xA5A5A5A5A5A5A5A5L; 
-        x[1] ^= x[0]; 
-        x[2] += x[1]; 
-        x[3] -= x[2] ^ ((~x[1]) << 19); 
-        x[4] ^= x[3]; 
-        x[5] += x[4]; 
-        x[6] -= x[5] ^ ((~x[4]) >>> 23); 
-        x[7] ^= x[6]; 
-        x[0] += x[7]; 
-        x[1] -= x[0] ^ ((~x[7]) << 19); 
-        x[2] ^= x[1]; 
-        x[3] += x[2]; 
-        x[4] -= x[3] ^ ((~x[2]) >>> 23); 
-        x[5] ^= x[4]; 
-        x[6] += x[5]; 
-        x[7] -= x[6] ^ 0x0123456789ABCDEFL;
-    }
-
-    private void processBlock()
-    {
-        //
-        // save abc
-        //
-        long aa = a;
-        long bb = b;
-        long cc = c;
-
-        //
-        // rounds and schedule
-        //
-        roundABC(x[0], 5);
-        roundBCA(x[1], 5);
-        roundCAB(x[2], 5);
-        roundABC(x[3], 5);
-        roundBCA(x[4], 5);
-        roundCAB(x[5], 5);
-        roundABC(x[6], 5);
-        roundBCA(x[7], 5);
-
-        keySchedule();
-
-        roundCAB(x[0], 7);
-        roundABC(x[1], 7);
-        roundBCA(x[2], 7);
-        roundCAB(x[3], 7);
-        roundABC(x[4], 7);
-        roundBCA(x[5], 7);
-        roundCAB(x[6], 7);
-        roundABC(x[7], 7);
-
-        keySchedule();
-
-        roundBCA(x[0], 9);
-        roundCAB(x[1], 9);
-        roundABC(x[2], 9);
-        roundBCA(x[3], 9);
-        roundCAB(x[4], 9);
-        roundABC(x[5], 9);
-        roundBCA(x[6], 9);
-        roundCAB(x[7], 9);
-
-        //
-        // feed forward
-        //
-        a ^= aa;
-        b -= bb;
-        c += cc;
-
-        //
-        // clear the x buffer
-        //
-        xOff = 0;
-        for (int i = 0; i != x.length; i++)
-        {
-            x[i] = 0;
-        }
-    }
-
-    public void unpackWord(
-        long    r,
-        byte[]  out,
-        int     outOff)
-    {
-        out[outOff + 7]     = (byte)(r >> 56);
-        out[outOff + 6] = (byte)(r >> 48);
-        out[outOff + 5] = (byte)(r >> 40);
-        out[outOff + 4] = (byte)(r >> 32);
-        out[outOff + 3] = (byte)(r >> 24);
-        out[outOff + 2] = (byte)(r >> 16);
-        out[outOff + 1] = (byte)(r >> 8);
-        out[outOff] = (byte)r;
-    }
-        
-    private void processLength(
-        long    bitLength)
-    {
-        x[7] = bitLength;
-    }
-
-    private void finish()
-    {
-        long    bitLength = (byteCount << 3);
-
-        update((byte)0x01);
-
-        while (bOff != 0)
-        {
-            update((byte)0);
-        }
-
-        processLength(bitLength);
-
-        processBlock();
-    }
-
-    public int doFinal(
-        byte[]  out,
-        int     outOff)
-    {
-        finish();
-
-        unpackWord(a, out, outOff);
-        unpackWord(b, out, outOff + 8);
-        unpackWord(c, out, outOff + 16);
-
-        reset();
-
-        return DIGEST_LENGTH;
-    }
-
-    /**
-     * reset the chaining variables
-     */
-    public void reset()
-    {
-        a = 0x0123456789ABCDEFL;
-        b = 0xFEDCBA9876543210L;
-        c = 0xF096A5B4C3B2E187L;
-
-        xOff = 0;
-        for (int i = 0; i != x.length; i++)
-        {
-            x[i] = 0;
-        }
-
-        bOff = 0;
-        for (int i = 0; i != buf.length; i++)
-        {
-            buf[i] = 0;
-        }
-
-        byteCount = 0;
-    }
-
-    public int getByteLength()
-    {
-        return BYTE_LENGTH;
-    }
-
-    public Memoable copy()
-    {
-        return new TigerDigest(this);
-    }
-
-    public void reset(Memoable other)
-    {
-        TigerDigest t = (TigerDigest)other;
-
-        a = t.a;
-        b = t.b;
-        c = t.c;
-
-        System.arraycopy(t.x, 0, x, 0, t.x.length);
-        xOff = t.xOff;
-
-        System.arraycopy(t.buf, 0, buf, 0, t.buf.length);
-        bOff = t.bOff;
-
-        byteCount = t.byteCount;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/digests/WhirlpoolDigest.java b/bcprov/src/main/java/org/bouncycastle/crypto/digests/WhirlpoolDigest.java
deleted file mode 100644
index 11e884c..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/digests/WhirlpoolDigest.java
+++ /dev/null
@@ -1,409 +0,0 @@
-package org.bouncycastle.crypto.digests;
-
-import org.bouncycastle.crypto.ExtendedDigest;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.Memoable;
-
-
-/**
- * Implementation of WhirlpoolDigest, based on Java source published by Barreto
- * and Rijmen.
- *  
- */
-public final class WhirlpoolDigest 
-    implements ExtendedDigest, Memoable
-{
-    private static final int BYTE_LENGTH = 64;
-    
-    private static final int DIGEST_LENGTH_BYTES = 512 / 8;
-    private static final int ROUNDS = 10;
-    private static final int REDUCTION_POLYNOMIAL = 0x011d; // 2^8 + 2^4 + 2^3 + 2 + 1;
-
-    private static final int[] SBOX = {
-        0x18, 0x23, 0xc6, 0xe8, 0x87, 0xb8, 0x01, 0x4f, 0x36, 0xa6, 0xd2, 0xf5, 0x79, 0x6f, 0x91, 0x52,
-        0x60, 0xbc, 0x9b, 0x8e, 0xa3, 0x0c, 0x7b, 0x35, 0x1d, 0xe0, 0xd7, 0xc2, 0x2e, 0x4b, 0xfe, 0x57,
-        0x15, 0x77, 0x37, 0xe5, 0x9f, 0xf0, 0x4a, 0xda, 0x58, 0xc9, 0x29, 0x0a, 0xb1, 0xa0, 0x6b, 0x85,
-        0xbd, 0x5d, 0x10, 0xf4, 0xcb, 0x3e, 0x05, 0x67, 0xe4, 0x27, 0x41, 0x8b, 0xa7, 0x7d, 0x95, 0xd8,
-        0xfb, 0xee, 0x7c, 0x66, 0xdd, 0x17, 0x47, 0x9e, 0xca, 0x2d, 0xbf, 0x07, 0xad, 0x5a, 0x83, 0x33,
-        0x63, 0x02, 0xaa, 0x71, 0xc8, 0x19, 0x49, 0xd9, 0xf2, 0xe3, 0x5b, 0x88, 0x9a, 0x26, 0x32, 0xb0,
-        0xe9, 0x0f, 0xd5, 0x80, 0xbe, 0xcd, 0x34, 0x48, 0xff, 0x7a, 0x90, 0x5f, 0x20, 0x68, 0x1a, 0xae,
-        0xb4, 0x54, 0x93, 0x22, 0x64, 0xf1, 0x73, 0x12, 0x40, 0x08, 0xc3, 0xec, 0xdb, 0xa1, 0x8d, 0x3d,
-        0x97, 0x00, 0xcf, 0x2b, 0x76, 0x82, 0xd6, 0x1b, 0xb5, 0xaf, 0x6a, 0x50, 0x45, 0xf3, 0x30, 0xef,
-        0x3f, 0x55, 0xa2, 0xea, 0x65, 0xba, 0x2f, 0xc0, 0xde, 0x1c, 0xfd, 0x4d, 0x92, 0x75, 0x06, 0x8a,
-        0xb2, 0xe6, 0x0e, 0x1f, 0x62, 0xd4, 0xa8, 0x96, 0xf9, 0xc5, 0x25, 0x59, 0x84, 0x72, 0x39, 0x4c,
-        0x5e, 0x78, 0x38, 0x8c, 0xd1, 0xa5, 0xe2, 0x61, 0xb3, 0x21, 0x9c, 0x1e, 0x43, 0xc7, 0xfc, 0x04,
-        0x51, 0x99, 0x6d, 0x0d, 0xfa, 0xdf, 0x7e, 0x24, 0x3b, 0xab, 0xce, 0x11, 0x8f, 0x4e, 0xb7, 0xeb,
-        0x3c, 0x81, 0x94, 0xf7, 0xb9, 0x13, 0x2c, 0xd3, 0xe7, 0x6e, 0xc4, 0x03, 0x56, 0x44, 0x7f, 0xa9,
-        0x2a, 0xbb, 0xc1, 0x53, 0xdc, 0x0b, 0x9d, 0x6c, 0x31, 0x74, 0xf6, 0x46, 0xac, 0x89, 0x14, 0xe1,
-        0x16, 0x3a, 0x69, 0x09, 0x70, 0xb6, 0xd0, 0xed, 0xcc, 0x42, 0x98, 0xa4, 0x28, 0x5c, 0xf8, 0x86
-    };
-    
-    private static final long[] C0 = new long[256];
-    private static final long[] C1 = new long[256];
-    private static final long[] C2 = new long[256];
-    private static final long[] C3 = new long[256];
-    private static final long[] C4 = new long[256];
-    private static final long[] C5 = new long[256];
-    private static final long[] C6 = new long[256];
-    private static final long[] C7 = new long[256];
-
-    private final long[] _rc = new long[ROUNDS + 1];
-        
-    public WhirlpoolDigest()
-    {
-        for (int i = 0; i < 256; i++)
-        {
-            int v1 = SBOX[i];
-            int v2 = maskWithReductionPolynomial(v1 << 1);
-            int v4 = maskWithReductionPolynomial(v2 << 1);
-            int v5 = v4 ^ v1;
-            int v8 = maskWithReductionPolynomial(v4 << 1);
-            int v9 = v8 ^ v1;
-            
-            C0[i] = packIntoLong(v1, v1, v4, v1, v8, v5, v2, v9);
-            C1[i] = packIntoLong(v9, v1, v1, v4, v1, v8, v5, v2);
-            C2[i] = packIntoLong(v2, v9, v1, v1, v4, v1, v8, v5);
-            C3[i] = packIntoLong(v5, v2, v9, v1, v1, v4, v1, v8);
-            C4[i] = packIntoLong(v8, v5, v2, v9, v1, v1, v4, v1);
-            C5[i] = packIntoLong(v1, v8, v5, v2, v9, v1, v1, v4);
-            C6[i] = packIntoLong(v4, v1, v8, v5, v2, v9, v1, v1);
-            C7[i] = packIntoLong(v1, v4, v1, v8, v5, v2, v9, v1);
-            
-        }
-        
-        _rc[0] = 0L;
-        for (int r = 1; r <= ROUNDS; r++)
-        {
-            int i = 8 * (r - 1);
-            _rc[r] =    (C0[i    ] & 0xff00000000000000L) ^ 
-                        (C1[i + 1] & 0x00ff000000000000L) ^ 
-                        (C2[i + 2] & 0x0000ff0000000000L) ^
-                        (C3[i + 3] & 0x000000ff00000000L) ^ 
-                        (C4[i + 4] & 0x00000000ff000000L) ^
-                        (C5[i + 5] & 0x0000000000ff0000L) ^
-                        (C6[i + 6] & 0x000000000000ff00L) ^ 
-                        (C7[i + 7] & 0x00000000000000ffL);
-        }
-        
-    }
-
-    private long packIntoLong(int b7, int b6, int b5, int b4, int b3, int b2, int b1, int b0)
-    {
-        return 
-                    ((long)b7 << 56) ^
-                    ((long)b6 << 48) ^
-                    ((long)b5 << 40) ^
-                    ((long)b4 << 32) ^
-                    ((long)b3 << 24) ^
-                    ((long)b2 << 16) ^
-                    ((long)b1 <<  8) ^
-                    b0;
-    }
-
-    /*
-     * int's are used to prevent sign extension.  The values that are really being used are
-     * actually just 0..255
-     */
-    private int maskWithReductionPolynomial(int input)
-    {
-        int rv = input;
-        if (rv >= 0x100L) // high bit set
-        {
-            rv ^= REDUCTION_POLYNOMIAL; // reduced by the polynomial
-        }
-        return rv;
-    }
-        
-    // --------------------------------------------------------------------------------------//
-    
-    // -- buffer information --
-    private static final int BITCOUNT_ARRAY_SIZE = 32;
-    private byte[]  _buffer    = new byte[64];
-    private int     _bufferPos = 0;
-    private short[] _bitCount  = new short[BITCOUNT_ARRAY_SIZE];
-    
-    // -- internal hash state --
-    private long[] _hash  = new long[8];
-    private long[] _K = new long[8]; // the round key
-    private long[] _L = new long[8];
-    private long[] _block = new long[8]; // mu (buffer)
-    private long[] _state = new long[8]; // the current "cipher" state
-    
-
-
-    /**
-     * Copy constructor. This will copy the state of the provided message
-     * digest.
-     */
-    public WhirlpoolDigest(WhirlpoolDigest originalDigest)
-    {
-        reset(originalDigest);
-    }
-
-    public String getAlgorithmName()
-    {
-        return "Whirlpool";
-    }
-
-    public int getDigestSize()
-    {
-        return DIGEST_LENGTH_BYTES;
-    }
-
-    public int doFinal(byte[] out, int outOff)
-    {
-        // sets out[outOff] .. out[outOff+DIGEST_LENGTH_BYTES]
-        finish();
-
-        for (int i = 0; i < 8; i++)
-        {
-            convertLongToByteArray(_hash[i], out, outOff + (i * 8));
-        }
-
-        reset();        
-        return getDigestSize();
-    }
-    
-    /**
-     * reset the chaining variables
-     */
-    public void reset()
-    {
-        // set variables to null, blank, whatever
-        _bufferPos = 0;
-        Arrays.fill(_bitCount, (short)0);
-        Arrays.fill(_buffer, (byte)0);
-        Arrays.fill(_hash, 0);
-        Arrays.fill(_K, 0);
-        Arrays.fill(_L, 0);
-        Arrays.fill(_block, 0);
-        Arrays.fill(_state, 0);
-    }
-
-    // this takes a buffer of information and fills the block
-    private void processFilledBuffer(byte[] in, int inOff)
-    {
-        // copies into the block...
-        for (int i = 0; i < _state.length; i++)
-        {
-            _block[i] = bytesToLongFromBuffer(_buffer, i * 8);
-        }
-        processBlock();
-        _bufferPos = 0;
-        Arrays.fill(_buffer, (byte)0);
-    }
-
-    private long bytesToLongFromBuffer(byte[] buffer, int startPos)
-    {
-        long rv = (((buffer[startPos + 0] & 0xffL) << 56) |
-                   ((buffer[startPos + 1] & 0xffL) << 48) |
-                   ((buffer[startPos + 2] & 0xffL) << 40) |
-                   ((buffer[startPos + 3] & 0xffL) << 32) |
-                   ((buffer[startPos + 4] & 0xffL) << 24) |
-                   ((buffer[startPos + 5] & 0xffL) << 16) |
-                   ((buffer[startPos + 6] & 0xffL) <<  8) |
-                   ((buffer[startPos + 7]) & 0xffL));
-        
-        return rv;
-    }
-
-    private void convertLongToByteArray(long inputLong, byte[] outputArray, int offSet)
-    {
-        for (int i = 0; i < 8; i++)
-        {
-            outputArray[offSet + i] = (byte)((inputLong >> (56 - (i * 8))) & 0xff);
-        }
-    }
-
-    protected void processBlock()
-    {
-        // buffer contents have been transferred to the _block[] array via
-        // processFilledBuffer
-        
-        // compute and apply K^0
-        for (int i = 0; i < 8; i++)
-        {
-            _state[i] = _block[i] ^ (_K[i] = _hash[i]);
-        }
-
-        // iterate over the rounds
-        for (int round = 1; round <= ROUNDS; round++)
-        {
-            for (int i = 0; i < 8; i++)
-            {
-                _L[i] = 0;
-                _L[i] ^= C0[(int)(_K[(i - 0) & 7] >>> 56) & 0xff];
-                _L[i] ^= C1[(int)(_K[(i - 1) & 7] >>> 48) & 0xff];
-                _L[i] ^= C2[(int)(_K[(i - 2) & 7] >>> 40) & 0xff];
-                _L[i] ^= C3[(int)(_K[(i - 3) & 7] >>> 32) & 0xff];
-                _L[i] ^= C4[(int)(_K[(i - 4) & 7] >>> 24) & 0xff];
-                _L[i] ^= C5[(int)(_K[(i - 5) & 7] >>> 16) & 0xff];
-                _L[i] ^= C6[(int)(_K[(i - 6) & 7] >>>  8) & 0xff];
-                _L[i] ^= C7[(int)(_K[(i - 7) & 7]) & 0xff];
-            }
-
-            System.arraycopy(_L, 0, _K, 0, _K.length);
-            
-            _K[0] ^= _rc[round];
-            
-            // apply the round transformation
-            for (int i = 0; i < 8; i++)
-            {
-                _L[i] = _K[i];
-                
-                _L[i] ^= C0[(int)(_state[(i - 0) & 7] >>> 56) & 0xff];
-                _L[i] ^= C1[(int)(_state[(i - 1) & 7] >>> 48) & 0xff];
-                _L[i] ^= C2[(int)(_state[(i - 2) & 7] >>> 40) & 0xff];
-                _L[i] ^= C3[(int)(_state[(i - 3) & 7] >>> 32) & 0xff];
-                _L[i] ^= C4[(int)(_state[(i - 4) & 7] >>> 24) & 0xff];
-                _L[i] ^= C5[(int)(_state[(i - 5) & 7] >>> 16) & 0xff];
-                _L[i] ^= C6[(int)(_state[(i - 6) & 7] >>> 8) & 0xff];
-                _L[i] ^= C7[(int)(_state[(i - 7) & 7]) & 0xff];
-            }
-            
-            // save the current state
-            System.arraycopy(_L, 0, _state, 0, _state.length);
-        }
-        
-        // apply Miuaguchi-Preneel compression
-        for (int i = 0; i < 8; i++)
-        {
-            _hash[i] ^= _state[i] ^ _block[i];
-        }
-        
-    }
-
-    public void update(byte in)
-    {
-        _buffer[_bufferPos] = in;
-
-        //System.out.println("adding to buffer = "+_buffer[_bufferPos]);
-        
-        ++_bufferPos;
-        
-        if (_bufferPos == _buffer.length)
-        {
-            processFilledBuffer(_buffer, 0);
-        }
-
-        increment();
-    }
-
-    /*
-     * increment() can be implemented in this way using 2 arrays or
-     * by having some temporary variables that are used to set the
-     * value provided by EIGHT[i] and carry within the loop.
-     * 
-     * not having done any timing, this seems likely to be faster
-     * at the slight expense of 32*(sizeof short) bytes
-     */
-    private static final short[] EIGHT = new short[BITCOUNT_ARRAY_SIZE];
-    static 
-    {
-        EIGHT[BITCOUNT_ARRAY_SIZE - 1] = 8;
-    }
-    
-    private void increment()
-    {
-        int carry = 0;
-        for (int i = _bitCount.length - 1; i >= 0; i--)
-        {
-            int sum = (_bitCount[i] & 0xff) + EIGHT[i] + carry;
-
-            carry = sum >>> 8;
-            _bitCount[i] = (short)(sum & 0xff);
-        }
-    }    
-    
-    public void update(byte[] in, int inOff, int len)
-    {
-        while (len > 0)
-        {
-            update(in[inOff]);
-            ++inOff;
-            --len;
-        }
-        
-    }
-    
-    private void finish()
-    {
-        /*
-         * this makes a copy of the current bit length. at the expense of an
-         * object creation of 32 bytes rather than providing a _stopCounting
-         * boolean which was the alternative I could think of.
-         */
-        byte[] bitLength = copyBitLength(); 
-        
-        _buffer[_bufferPos++] |= 0x80;
-
-        if (_bufferPos == _buffer.length)
-        {
-            processFilledBuffer(_buffer, 0);
-        }
-
-        /*
-         * Final block contains 
-         * [ ... data .... ][0][0][0][ length ]
-         * 
-         * if [ length ] cannot fit.  Need to create a new block.
-         */
-        if (_bufferPos > 32)
-        {
-            while (_bufferPos != 0)
-            {
-                update((byte)0);
-            }
-        }
-        
-        while (_bufferPos <= 32)
-        {
-            update((byte)0);
-        }
-        
-        // copy the length information to the final 32 bytes of the
-        // 64 byte block....
-        System.arraycopy(bitLength, 0, _buffer, 32, bitLength.length);
-        
-        processFilledBuffer(_buffer, 0);
-    }
-
-    private byte[] copyBitLength()
-    {
-        byte[] rv = new byte[BITCOUNT_ARRAY_SIZE];
-        for (int i = 0; i < rv.length; i++)
-        {
-            rv[i] = (byte)(_bitCount[i] & 0xff);
-        }
-        return rv;
-    }    
-    
-    public int getByteLength()
-    {
-        return BYTE_LENGTH;
-    }
-
-    public Memoable copy()
-    {
-        return new WhirlpoolDigest(this);
-    }
-
-    public void reset(Memoable other)
-    {
-        WhirlpoolDigest originalDigest = (WhirlpoolDigest)other;
-
-        System.arraycopy(originalDigest._rc, 0, _rc, 0, _rc.length);
-
-        System.arraycopy(originalDigest._buffer, 0, _buffer, 0, _buffer.length);
-
-        this._bufferPos = originalDigest._bufferPos;
-        System.arraycopy(originalDigest._bitCount, 0, _bitCount, 0, _bitCount.length);
-
-        // -- internal hash state --
-        System.arraycopy(originalDigest._hash, 0, _hash, 0, _hash.length);
-        System.arraycopy(originalDigest._K, 0, _K, 0, _K.length);
-        System.arraycopy(originalDigest._L, 0, _L, 0, _L.length);
-        System.arraycopy(originalDigest._block, 0, _block, 0, _block.length);
-        System.arraycopy(originalDigest._state, 0, _state, 0, _state.length);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/digests/package.html b/bcprov/src/main/java/org/bouncycastle/crypto/digests/package.html
deleted file mode 100644
index 0a0d95c..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/digests/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body bgcolor="#ffffff">
-Message digest classes.
-</body>
-</html>
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/ec/CustomNamedCurves.java b/bcprov/src/main/java/org/bouncycastle/crypto/ec/CustomNamedCurves.java
index c3d4f5b..3b4b2e6 100644
--- a/bcprov/src/main/java/org/bouncycastle/crypto/ec/CustomNamedCurves.java
+++ b/bcprov/src/main/java/org/bouncycastle/crypto/ec/CustomNamedCurves.java
@@ -10,7 +10,9 @@ import org.bouncycastle.asn1.x9.X9ECParameters;
 import org.bouncycastle.asn1.x9.X9ECParametersHolder;
 import org.bouncycastle.math.ec.ECCurve;
 import org.bouncycastle.math.ec.ECPoint;
-import org.bouncycastle.math.ec.custom.djb.Curve25519;
+// BEGIN android-removed
+// import org.bouncycastle.math.ec.custom.djb.Curve25519;
+// END android-removed
 import org.bouncycastle.math.ec.custom.sec.SecP192K1Curve;
 import org.bouncycastle.math.ec.custom.sec.SecP192R1Curve;
 import org.bouncycastle.math.ec.custom.sec.SecP224K1Curve;
@@ -36,32 +38,34 @@ public class CustomNamedCurves
         return c.configure().setEndomorphism(new GLVTypeBEndomorphism(c, p)).create();
     }
 
-    /*
-     * curve25519
-     */
-    static X9ECParametersHolder curve25519 = new X9ECParametersHolder()
-    {
-        protected X9ECParameters createParameters()
-        {
-            byte[] S = null;
-            ECCurve curve = configureCurve(new Curve25519());
-
-            /*
-             * NOTE: Curve25519 was specified in Montgomery form. Rewriting in Weierstrass form
-             * involves substitution of variables, so the base-point x coordinate is 9 + (486662 / 3).
-             * 
-             * The Curve25519 paper doesn't say which of the two possible y values the base
-             * point has. The choice here is guided by language in the Ed25519 paper.
-             * 
-             * (The other possible y value is 5F51E65E475F794B1FE122D388B72EB36DC2B28192839E4DD6163A5D81312C14) 
-             */
-            ECPoint G = curve.decodePoint(Hex.decode("04"
-                + "2AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD245A"
-                + "20AE19A1B8A086B4E01EDD2C7748D14C923D4D7E6D7C61B229E9C5A27ECED3D9"));
-
-            return new X9ECParameters(curve, G, curve.getOrder(), curve.getCofactor(), S);
-        }
-    };
+    // BEGIN android-removed
+    // /*
+    //  * curve25519
+    //  */
+    // static X9ECParametersHolder curve25519 = new X9ECParametersHolder()
+    // {
+    //     protected X9ECParameters createParameters()
+    //     {
+    //         byte[] S = null;
+    //         ECCurve curve = configureCurve(new Curve25519());
+    //
+    //         /*
+    //          * NOTE: Curve25519 was specified in Montgomery form. Rewriting in Weierstrass form
+    //          * involves substitution of variables, so the base-point x coordinate is 9 + (486662 / 3).
+    //          * 
+    //          * The Curve25519 paper doesn't say which of the two possible y values the base
+    //          * point has. The choice here is guided by language in the Ed25519 paper.
+    //          * 
+    //          * (The other possible y value is 5F51E65E475F794B1FE122D388B72EB36DC2B28192839E4DD6163A5D81312C14) 
+    //          */
+    //         ECPoint G = curve.decodePoint(Hex.decode("04"
+    //             + "2AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD245A"
+    //             + "20AE19A1B8A086B4E01EDD2C7748D14C923D4D7E6D7C61B229E9C5A27ECED3D9"));
+    //
+    //         return new X9ECParameters(curve, G, curve.getOrder(), curve.getCofactor(), S);
+    //     }
+    // };
+    // END android-removed
 
     /*
      * secp192k1
@@ -254,7 +258,9 @@ public class CustomNamedCurves
 
     static
     {
-        defineCurve("curve25519", curve25519);
+        // BEGIN android-removed
+        // defineCurve("curve25519", curve25519);
+        // END android-removed
 
         defineCurveWithOID("secp192k1", SECObjectIdentifiers.secp192k1, secp192k1);
         defineCurveWithOID("secp192r1", SECObjectIdentifiers.secp192r1, secp192r1);
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/ec/ECDecryptor.java b/bcprov/src/main/java/org/bouncycastle/crypto/ec/ECDecryptor.java
deleted file mode 100644
index c4faf4c..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/ec/ECDecryptor.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package org.bouncycastle.crypto.ec;
-
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.math.ec.ECPoint;
-
-public interface ECDecryptor
-{
-    void init(CipherParameters params);
-
-    ECPoint decrypt(ECPair cipherText);
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/ec/ECElGamalDecryptor.java b/bcprov/src/main/java/org/bouncycastle/crypto/ec/ECElGamalDecryptor.java
deleted file mode 100644
index 2f1c937..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/ec/ECElGamalDecryptor.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package org.bouncycastle.crypto.ec;
-
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.params.ECPrivateKeyParameters;
-import org.bouncycastle.math.ec.ECPoint;
-
-/**
- * this does your basic decryption ElGamal style using EC
- */
-public class ECElGamalDecryptor
-    implements ECDecryptor
-{
-    private ECPrivateKeyParameters key;
-
-    /**
-     * initialise the decryptor.
-     *
-     * @param param the necessary EC key parameters.
-     */
-    public void init(
-        CipherParameters param)
-    {
-        if (!(param instanceof ECPrivateKeyParameters))
-        {
-            throw new IllegalArgumentException("ECPrivateKeyParameters are required for decryption.");
-        }
-
-        this.key = (ECPrivateKeyParameters)param;
-    }
-
-    /**
-     * Decrypt an EC pair producing the original EC point.
-     *
-     * @param pair the EC point pair to process.
-     * @return the result of the Elgamal process.
-     */
-    public ECPoint decrypt(ECPair pair)
-    {
-        if (key == null)
-        {
-            throw new IllegalStateException("ECElGamalDecryptor not initialised");
-        }
-
-        ECPoint tmp = pair.getX().multiply(key.getD());
-
-        return pair.getY().subtract(tmp).normalize();
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/ec/ECElGamalEncryptor.java b/bcprov/src/main/java/org/bouncycastle/crypto/ec/ECElGamalEncryptor.java
deleted file mode 100644
index 48fc046..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/ec/ECElGamalEncryptor.java
+++ /dev/null
@@ -1,86 +0,0 @@
-package org.bouncycastle.crypto.ec;
-
-import java.math.BigInteger;
-import java.security.SecureRandom;
-
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.params.ECDomainParameters;
-import org.bouncycastle.crypto.params.ECPublicKeyParameters;
-import org.bouncycastle.crypto.params.ParametersWithRandom;
-import org.bouncycastle.math.ec.ECMultiplier;
-import org.bouncycastle.math.ec.ECPoint;
-import org.bouncycastle.math.ec.FixedPointCombMultiplier;
-
-/**
- * this does your basic ElGamal encryption algorithm using EC
- */
-public class ECElGamalEncryptor
-    implements ECEncryptor
-{
-    private ECPublicKeyParameters key;
-    private SecureRandom          random;
-
-    /**
-     * initialise the encryptor.
-     *
-     * @param param the necessary EC key parameters.
-     */
-    public void init(
-        CipherParameters    param)
-    {
-        if (param instanceof ParametersWithRandom)
-        {
-            ParametersWithRandom    p = (ParametersWithRandom)param;
-
-            if (!(p.getParameters() instanceof ECPublicKeyParameters))
-            {
-                throw new IllegalArgumentException("ECPublicKeyParameters are required for encryption.");
-            }
-            this.key = (ECPublicKeyParameters)p.getParameters();
-            this.random = p.getRandom();
-        }
-        else
-        {
-            if (!(param instanceof ECPublicKeyParameters))
-            {
-                throw new IllegalArgumentException("ECPublicKeyParameters are required for encryption.");
-            }
-
-            this.key = (ECPublicKeyParameters)param;
-            this.random = new SecureRandom();
-        }
-    }
-
-    /**
-     * Process a single EC point using the basic ElGamal algorithm.
-     *
-     * @param point the EC point to process.
-     * @return the result of the Elgamal process.
-     */
-    public ECPair encrypt(ECPoint point)
-    {
-        if (key == null)
-        {
-            throw new IllegalStateException("ECElGamalEncryptor not initialised");
-        }
-
-        ECDomainParameters ec = key.getParameters();
-        BigInteger k = ECUtil.generateK(ec.getN(), random);
-
-        ECMultiplier basePointMultiplier = createBasePointMultiplier();
-
-        ECPoint[] gamma_phi = new ECPoint[]{
-            basePointMultiplier.multiply(ec.getG(), k),
-            key.getQ().multiply(k).add(point)
-        };
-
-        ec.getCurve().normalizeAll(gamma_phi);
-
-        return new ECPair(gamma_phi[0], gamma_phi[1]);
-    }
-
-    protected ECMultiplier createBasePointMultiplier()
-    {
-        return new FixedPointCombMultiplier();
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/ec/ECEncryptor.java b/bcprov/src/main/java/org/bouncycastle/crypto/ec/ECEncryptor.java
deleted file mode 100644
index 39704b9..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/ec/ECEncryptor.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package org.bouncycastle.crypto.ec;
-
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.math.ec.ECPoint;
-
-public interface ECEncryptor
-{
-    void init(CipherParameters params);
-
-    ECPair encrypt(ECPoint point);
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/ec/ECFixedTransform.java b/bcprov/src/main/java/org/bouncycastle/crypto/ec/ECFixedTransform.java
deleted file mode 100644
index 2c6a920..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/ec/ECFixedTransform.java
+++ /dev/null
@@ -1,88 +0,0 @@
-package org.bouncycastle.crypto.ec;
-
-import java.math.BigInteger;
-
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.params.ECDomainParameters;
-import org.bouncycastle.crypto.params.ECPublicKeyParameters;
-import org.bouncycastle.math.ec.ECMultiplier;
-import org.bouncycastle.math.ec.ECPoint;
-import org.bouncycastle.math.ec.FixedPointCombMultiplier;
-
-/**
- * this transforms the original randomness used for an ElGamal encryption by a fixed value.
- */
-public class ECFixedTransform
-    implements ECPairFactorTransform
-{
-    private ECPublicKeyParameters key;
-
-    private BigInteger k;
-
-    public ECFixedTransform(BigInteger k)
-    {
-        this.k = k;
-    }
-
-    /**
-     * initialise the underlying EC ElGamal engine.
-     *
-     * @param param the necessary EC key parameters.
-     */
-    public void init(
-        CipherParameters    param)
-    {
-        if (!(param instanceof ECPublicKeyParameters))
-        {
-            throw new IllegalArgumentException("ECPublicKeyParameters are required for fixed transform.");
-        }
-
-        this.key = (ECPublicKeyParameters)param;
-    }
-
-    /**
-     * Transform an existing cipher text pair using the ElGamal algorithm. Note: it is assumed this
-     * transform has been initialised with the same public key that was used to create the original
-     * cipher text.
-     *
-     * @param cipherText the EC point to process.
-     * @return returns a new ECPair representing the result of the process.
-     */
-    public ECPair transform(ECPair cipherText)
-    {
-        if (key == null)
-        {
-            throw new IllegalStateException("ECFixedTransform not initialised");
-        }
-
-        ECDomainParameters ec = key.getParameters();
-        BigInteger n = ec.getN();
-
-        ECMultiplier basePointMultiplier = createBasePointMultiplier();
-        BigInteger k = this.k.mod(n);
-
-        ECPoint[] gamma_phi = new ECPoint[]{
-            basePointMultiplier.multiply(ec.getG(), k).add(cipherText.getX()),
-            key.getQ().multiply(k).add(cipherText.getY())
-        };
-
-        ec.getCurve().normalizeAll(gamma_phi);
-
-        return new ECPair(gamma_phi[0], gamma_phi[1]);
-    }
-
-    /**
-     * Return the last transform value used by the transform
-     *
-     * @return a BigInteger representing k value.
-     */
-    public BigInteger getTransformValue()
-    {
-        return k;
-    }
-
-    protected ECMultiplier createBasePointMultiplier()
-    {
-        return new FixedPointCombMultiplier();
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/ec/ECNewPublicKeyTransform.java b/bcprov/src/main/java/org/bouncycastle/crypto/ec/ECNewPublicKeyTransform.java
deleted file mode 100644
index 112d20c..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/ec/ECNewPublicKeyTransform.java
+++ /dev/null
@@ -1,88 +0,0 @@
-package org.bouncycastle.crypto.ec;
-
-import java.math.BigInteger;
-import java.security.SecureRandom;
-
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.params.ECDomainParameters;
-import org.bouncycastle.crypto.params.ECPublicKeyParameters;
-import org.bouncycastle.crypto.params.ParametersWithRandom;
-import org.bouncycastle.math.ec.ECMultiplier;
-import org.bouncycastle.math.ec.ECPoint;
-import org.bouncycastle.math.ec.FixedPointCombMultiplier;
-
-/**
- * this does your basic Elgamal encryption algorithm using EC
- */
-public class ECNewPublicKeyTransform
-    implements ECPairTransform
-{
-    private ECPublicKeyParameters key;
-    private SecureRandom          random;
-
-    /**
-     * initialise the EC Elgamal engine.
-     *
-     * @param param the necessary EC key parameters.
-     */
-    public void init(
-        CipherParameters    param)
-    {
-        if (param instanceof ParametersWithRandom)
-        {
-            ParametersWithRandom    p = (ParametersWithRandom)param;
-
-            if (!(p.getParameters() instanceof ECPublicKeyParameters))
-            {
-                throw new IllegalArgumentException("ECPublicKeyParameters are required for new public key transform.");
-            }
-            this.key = (ECPublicKeyParameters)p.getParameters();
-            this.random = p.getRandom();
-        }
-        else
-        {
-            if (!(param instanceof ECPublicKeyParameters))
-            {
-                throw new IllegalArgumentException("ECPublicKeyParameters are required for new public key transform.");
-            }
-
-            this.key = (ECPublicKeyParameters)param;
-            this.random = new SecureRandom();
-        }
-    }
-
-    /**
-     * Transform an existing cipher text pair using the ElGamal algorithm. Note: the input cipherText will
-     * need to be preserved in order to complete the transformation to the new public key.
-     *
-     * @param cipherText the EC point to process.
-     * @return returns a new ECPair representing the result of the process.
-     */
-    public ECPair transform(ECPair cipherText)
-    {
-        if (key == null)
-        {
-            throw new IllegalStateException("ECNewPublicKeyTransform not initialised");
-        }
-
-        ECDomainParameters ec = key.getParameters();
-        BigInteger n = ec.getN();
-
-        ECMultiplier basePointMultiplier = createBasePointMultiplier();
-        BigInteger k = ECUtil.generateK(n, random);
-
-        ECPoint[] gamma_phi = new ECPoint[]{
-            basePointMultiplier.multiply(ec.getG(), k),
-            key.getQ().multiply(k).add(cipherText.getY())
-        };
-
-        ec.getCurve().normalizeAll(gamma_phi);
-
-        return new ECPair(gamma_phi[0], gamma_phi[1]);
-    }
-
-    protected ECMultiplier createBasePointMultiplier()
-    {
-        return new FixedPointCombMultiplier();
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/ec/ECNewRandomnessTransform.java b/bcprov/src/main/java/org/bouncycastle/crypto/ec/ECNewRandomnessTransform.java
deleted file mode 100644
index 7bfc0b3..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/ec/ECNewRandomnessTransform.java
+++ /dev/null
@@ -1,105 +0,0 @@
-package org.bouncycastle.crypto.ec;
-
-import java.math.BigInteger;
-import java.security.SecureRandom;
-
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.params.ECDomainParameters;
-import org.bouncycastle.crypto.params.ECPublicKeyParameters;
-import org.bouncycastle.crypto.params.ParametersWithRandom;
-import org.bouncycastle.math.ec.ECMultiplier;
-import org.bouncycastle.math.ec.ECPoint;
-import org.bouncycastle.math.ec.FixedPointCombMultiplier;
-
-/**
- * this transforms the original randomness used for an ElGamal encryption.
- */
-public class ECNewRandomnessTransform
-    implements ECPairFactorTransform
-{
-    private ECPublicKeyParameters key;
-    private SecureRandom          random;
-
-    private BigInteger            lastK;
-
-    /**
-     * initialise the underlying EC ElGamal engine.
-     *
-     * @param param the necessary EC key parameters.
-     */
-    public void init(
-        CipherParameters    param)
-    {
-        if (param instanceof ParametersWithRandom)
-        {
-            ParametersWithRandom    p = (ParametersWithRandom)param;
-
-            if (!(p.getParameters() instanceof ECPublicKeyParameters))
-            {
-                throw new IllegalArgumentException("ECPublicKeyParameters are required for new randomness transform.");
-            }
-
-            this.key = (ECPublicKeyParameters)p.getParameters();
-            this.random = p.getRandom();
-        }
-        else
-        {
-            if (!(param instanceof ECPublicKeyParameters))
-            {
-                throw new IllegalArgumentException("ECPublicKeyParameters are required for new randomness transform.");
-            }
-
-            this.key = (ECPublicKeyParameters)param;
-            this.random = new SecureRandom();
-        }
-    }
-
-    /**
-     * Transform an existing cipher test pair using the ElGamal algorithm. Note: it is assumed this
-     * transform has been initialised with the same public key that was used to create the original
-     * cipher text.
-     *
-     * @param cipherText the EC point to process.
-     * @return returns a new ECPair representing the result of the process.
-     */
-    public ECPair transform(ECPair cipherText)
-    {
-        if (key == null)
-        {
-            throw new IllegalStateException("ECNewRandomnessTransform not initialised");
-        }
-
-
-        ECDomainParameters ec = key.getParameters();
-        BigInteger n = ec.getN();
-
-        ECMultiplier basePointMultiplier = createBasePointMultiplier();
-        BigInteger k = ECUtil.generateK(n, random);
-
-        ECPoint[] gamma_phi = new ECPoint[]{
-            basePointMultiplier.multiply(ec.getG(), k).add(cipherText.getX()),
-            key.getQ().multiply(k).add(cipherText.getY())
-        };
-
-        ec.getCurve().normalizeAll(gamma_phi);
-
-        lastK = k;
-
-        return new ECPair(gamma_phi[0], gamma_phi[1]);
-    }
-
-    /**
-     * Return the last random value generated for a transform
-     *
-     * @return a BigInteger representing the last random value.
-     */
-    public BigInteger getTransformValue()
-    {
-        return lastK;
-    }
-
-    protected ECMultiplier createBasePointMultiplier()
-    {
-        return new FixedPointCombMultiplier();
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/ec/ECPair.java b/bcprov/src/main/java/org/bouncycastle/crypto/ec/ECPair.java
deleted file mode 100644
index ea3b4b9..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/ec/ECPair.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package org.bouncycastle.crypto.ec;
-
-import org.bouncycastle.math.ec.ECPoint;
-
-public class ECPair
-{
-    private final ECPoint x;
-    private final ECPoint y;
-
-    public ECPair(ECPoint x, ECPoint y)
-    {
-        this.x = x;
-        this.y = y;
-    }
-
-    public ECPoint getX()
-    {
-        return x;
-    }
-
-    public ECPoint getY()
-    {
-        return y;
-    }
-
-    public boolean equals(ECPair other)
-    {
-        return other.getX().equals(getX()) && other.getY().equals(getY());
-    }
-
-    public boolean equals(Object other)
-    {
-        return other instanceof ECPair ? equals((ECPair)other) : false;
-    }
-
-    public int hashCode()
-    {
-        return x.hashCode() + 37 * y.hashCode();
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/ec/ECPairFactorTransform.java b/bcprov/src/main/java/org/bouncycastle/crypto/ec/ECPairFactorTransform.java
deleted file mode 100644
index be48551..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/ec/ECPairFactorTransform.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package org.bouncycastle.crypto.ec;
-
-import java.math.BigInteger;
-
-public interface ECPairFactorTransform
-    extends ECPairTransform
-{
-    /**
-     * Return the last value used to calculated a transform.
-     *
-     * @return a BigInteger representing the last transform value used.
-     */
-    BigInteger getTransformValue();
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/ec/ECPairTransform.java b/bcprov/src/main/java/org/bouncycastle/crypto/ec/ECPairTransform.java
deleted file mode 100644
index e3f1787..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/ec/ECPairTransform.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package org.bouncycastle.crypto.ec;
-
-import org.bouncycastle.crypto.CipherParameters;
-
-public interface ECPairTransform
-{
-    void init(CipherParameters params);
-
-    ECPair transform(ECPair cipherText);
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/ec/ECUtil.java b/bcprov/src/main/java/org/bouncycastle/crypto/ec/ECUtil.java
deleted file mode 100644
index 74921f0..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/ec/ECUtil.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package org.bouncycastle.crypto.ec;
-
-import java.math.BigInteger;
-import java.security.SecureRandom;
-
-import org.bouncycastle.math.ec.ECConstants;
-
-class ECUtil
-{
-    static BigInteger generateK(BigInteger n, SecureRandom random)
-    {
-        int nBitLength = n.bitLength();
-        BigInteger k;
-        do
-        {
-            k = new BigInteger(nBitLength, random);
-        }
-        while (k.equals(ECConstants.ZERO) || (k.compareTo(n) >= 0));
-        return k;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/ec/package.html b/bcprov/src/main/java/org/bouncycastle/crypto/ec/package.html
deleted file mode 100644
index 223823e..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/ec/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body bgcolor="#ffffff">
-Utility classes for support Elliptic Curve cryptographic transforms.
-</body>
-</html>
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/ec/test/AllTests.java b/bcprov/src/main/java/org/bouncycastle/crypto/ec/test/AllTests.java
deleted file mode 100644
index ba75c06..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/ec/test/AllTests.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package org.bouncycastle.crypto.ec.test;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import org.bouncycastle.util.test.SimpleTestResult;
-
-public class AllTests
-    extends TestCase
-{
-    public void testCrypto()
-    {
-        org.bouncycastle.util.test.Test[] tests = { new ECElGamalTest(), new ECTransformationTest() };
-
-        for (int i = 0; i != tests.length; i++)
-        {
-            SimpleTestResult result = (SimpleTestResult)tests[i].perform();
-
-            if (!result.isSuccessful())
-            {
-                fail(result.toString());
-            }
-        }
-    }
-
-    public static void main (String[] args)
-    {
-        junit.textui.TestRunner.run(suite());
-    }
-
-    public static Test suite()
-    {
-        TestSuite suite = new TestSuite("Lightweight EC ElGamal Tests");
-
-        suite.addTestSuite(AllTests.class);
-
-        return suite;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/ec/test/ECElGamalTest.java b/bcprov/src/main/java/org/bouncycastle/crypto/ec/test/ECElGamalTest.java
deleted file mode 100644
index 629c1a4..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/ec/test/ECElGamalTest.java
+++ /dev/null
@@ -1,88 +0,0 @@
-package org.bouncycastle.crypto.ec.test;
-
-import java.math.BigInteger;
-import java.security.SecureRandom;
-
-import org.bouncycastle.crypto.ec.ECDecryptor;
-import org.bouncycastle.crypto.ec.ECElGamalDecryptor;
-import org.bouncycastle.crypto.ec.ECElGamalEncryptor;
-import org.bouncycastle.crypto.ec.ECEncryptor;
-import org.bouncycastle.crypto.ec.ECPair;
-import org.bouncycastle.crypto.params.ECDomainParameters;
-import org.bouncycastle.crypto.params.ECPrivateKeyParameters;
-import org.bouncycastle.crypto.params.ECPublicKeyParameters;
-import org.bouncycastle.crypto.params.ParametersWithRandom;
-import org.bouncycastle.math.ec.ECConstants;
-import org.bouncycastle.math.ec.ECCurve;
-import org.bouncycastle.math.ec.ECPoint;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-
-public class ECElGamalTest
-    extends SimpleTest
-{
-    public String getName()
-    {
-        return "ECElGamal";
-    }
-
-    public void performTest()
-        throws Exception
-    {
-        BigInteger n = new BigInteger("6277101735386680763835789423176059013767194773182842284081");
-
-        ECCurve.Fp curve = new ECCurve.Fp(
-            new BigInteger("6277101735386680763835789423207666416083908700390324961279"), // q
-            new BigInteger("fffffffffffffffffffffffffffffffefffffffffffffffc", 16), // a
-            new BigInteger("64210519e59c80e70fa7e9ab72243049feb8deecc146b9b1", 16), // b
-            n, ECConstants.ONE);
-
-        ECDomainParameters params = new ECDomainParameters(
-                curve,
-                curve.decodePoint(Hex.decode("03188da80eb03090f67cbf20eb43a18800f4ff0afd82ff1012")), // G
-                n);
-
-        ECPublicKeyParameters pubKey = new ECPublicKeyParameters(
-                    curve.decodePoint(Hex.decode("0262b12d60690cdcf330babab6e69763b471f994dd702d16a5")), // Q
-                    params);
-
-        ECPrivateKeyParameters priKey = new ECPrivateKeyParameters(
-            new BigInteger("651056770906015076056810763456358567190100156695615665659"), // d
-            params);
-
-        ParametersWithRandom pRandom = new ParametersWithRandom(pubKey, new SecureRandom());
-
-        doTest(priKey, pRandom, BigInteger.valueOf(20));
-
-        BigInteger rand = new BigInteger(pubKey.getParameters().getN().bitLength() - 1, new SecureRandom());
-
-        doTest(priKey, pRandom, rand);
-    }
-
-    private void doTest(ECPrivateKeyParameters priKey, ParametersWithRandom pRandom, BigInteger value)
-    {
-        ECPoint data = priKey.getParameters().getG().multiply(value);
-
-        ECEncryptor encryptor = new ECElGamalEncryptor();
-
-        encryptor.init(pRandom);
-
-        ECPair pair = encryptor.encrypt(data);
-
-        ECDecryptor decryptor = new ECElGamalDecryptor();
-
-        decryptor.init(priKey);
-
-        ECPoint result = decryptor.decrypt(pair);
-
-        if (!data.equals(result))
-        {
-            fail("point pair failed to decrypt back to original");
-        }
-    }
-
-    public static void main(String[] args)
-    {
-        runTest(new ECElGamalTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/ec/test/ECTransformationTest.java b/bcprov/src/main/java/org/bouncycastle/crypto/ec/test/ECTransformationTest.java
deleted file mode 100644
index 96ada14..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/ec/test/ECTransformationTest.java
+++ /dev/null
@@ -1,149 +0,0 @@
-package org.bouncycastle.crypto.ec.test;
-
-import java.math.BigInteger;
-import java.security.SecureRandom;
-
-import org.bouncycastle.crypto.AsymmetricCipherKeyPair;
-import org.bouncycastle.crypto.ec.ECDecryptor;
-import org.bouncycastle.crypto.ec.ECElGamalDecryptor;
-import org.bouncycastle.crypto.ec.ECElGamalEncryptor;
-import org.bouncycastle.crypto.ec.ECEncryptor;
-import org.bouncycastle.crypto.ec.ECNewPublicKeyTransform;
-import org.bouncycastle.crypto.ec.ECNewRandomnessTransform;
-import org.bouncycastle.crypto.ec.ECPair;
-import org.bouncycastle.crypto.ec.ECPairTransform;
-import org.bouncycastle.crypto.generators.ECKeyPairGenerator;
-import org.bouncycastle.crypto.params.ECDomainParameters;
-import org.bouncycastle.crypto.params.ECKeyGenerationParameters;
-import org.bouncycastle.crypto.params.ECPrivateKeyParameters;
-import org.bouncycastle.crypto.params.ECPublicKeyParameters;
-import org.bouncycastle.crypto.params.ParametersWithRandom;
-import org.bouncycastle.math.ec.ECConstants;
-import org.bouncycastle.math.ec.ECCurve;
-import org.bouncycastle.math.ec.ECPoint;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-
-public class ECTransformationTest
-    extends SimpleTest
-{
-    public String getName()
-    {
-        return "ECTransformationTest";
-    }
-
-    public void performTest()
-        throws Exception
-    {
-        BigInteger n = new BigInteger("6277101735386680763835789423176059013767194773182842284081");
-
-        ECCurve.Fp curve = new ECCurve.Fp(
-            new BigInteger("6277101735386680763835789423207666416083908700390324961279"), // q
-            new BigInteger("fffffffffffffffffffffffffffffffefffffffffffffffc", 16), // a
-            new BigInteger("64210519e59c80e70fa7e9ab72243049feb8deecc146b9b1", 16), // b
-            n, ECConstants.ONE);
-
-        ECDomainParameters params = new ECDomainParameters(
-                curve,
-                curve.decodePoint(Hex.decode("03188da80eb03090f67cbf20eb43a18800f4ff0afd82ff1012")), // G
-                n);
-
-        ECPublicKeyParameters pubKey = new ECPublicKeyParameters(
-                    curve.decodePoint(Hex.decode("0262b12d60690cdcf330babab6e69763b471f994dd702d16a5")), // Q
-                    params);
-
-        ECPrivateKeyParameters priKey = new ECPrivateKeyParameters(
-            new BigInteger("651056770906015076056810763456358567190100156695615665659"), // d
-            params);
-
-
-        ParametersWithRandom pRandom = new ParametersWithRandom(pubKey, new SecureRandom());
-
-        doTest(priKey, pRandom, BigInteger.valueOf(20));
-
-        BigInteger rand = new BigInteger(pubKey.getParameters().getN().bitLength() - 1, new SecureRandom());
-
-        doTest(priKey, pRandom, rand);
-        doSameKeyTest(priKey, pRandom, rand);
-    }
-
-    private void doTest(ECPrivateKeyParameters priKey, ParametersWithRandom pRandom, BigInteger value)
-    {
-        ECPoint data = priKey.getParameters().getG().multiply(value);
-
-        ECEncryptor encryptor = new ECElGamalEncryptor();
-
-        encryptor.init(pRandom);
-
-        ECPair pair = encryptor.encrypt(data);
-
-        ECKeyPairGenerator ecGen = new ECKeyPairGenerator();
-
-        ecGen.init(new ECKeyGenerationParameters(priKey.getParameters(), new SecureRandom()));
-
-        AsymmetricCipherKeyPair reEncKP = ecGen.generateKeyPair();
-
-        ECPairTransform ecr = new ECNewPublicKeyTransform();
-
-        ecr.init(reEncKP.getPublic());
-
-        ECPair srcPair = pair;
-
-        // re-encrypt the message portion
-        pair = ecr.transform(srcPair);
-
-        ECDecryptor decryptor = new ECElGamalDecryptor();
-
-        decryptor.init(priKey);
-
-        // decrypt out the original private key
-        ECPoint p = decryptor.decrypt(new ECPair(srcPair.getX(), pair.getY()));
-
-        decryptor.init(reEncKP.getPrivate());
-
-        // decrypt the fully transformed point.
-        ECPoint result = decryptor.decrypt(new ECPair(pair.getX(), p));
-
-        if (!data.equals(result))
-        {
-            fail("point pair failed to decrypt back to original");
-        }
-    }
-
-    private void doSameKeyTest(ECPrivateKeyParameters priKey, ParametersWithRandom pRandom, BigInteger value)
-    {
-        ECPoint data = priKey.getParameters().getG().multiply(value);
-
-        ECEncryptor encryptor = new ECElGamalEncryptor();
-
-        encryptor.init(pRandom);
-
-        ECPair pair = encryptor.encrypt(data);
-
-        ECPairTransform ecr = new ECNewRandomnessTransform();
-
-        ecr.init(pRandom);
-
-        ECPair srcPair = pair;
-
-        // re-encrypt the message portion
-        pair = ecr.transform(srcPair);
-
-        ECDecryptor decryptor = new ECElGamalDecryptor();
-
-        decryptor.init(priKey);
-
-        // decrypt the fully transformed point.
-        ECPoint result = decryptor.decrypt(pair);
-
-        if (!data.equals(result))
-        {
-            fail("point pair failed to decrypt back to original");
-        }
-    }
-
-    public static void main(String[] args)
-    {
-        runTest(new ECTransformationTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/encodings/ISO9796d1Encoding.java b/bcprov/src/main/java/org/bouncycastle/crypto/encodings/ISO9796d1Encoding.java
deleted file mode 100644
index ec91e1a..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/encodings/ISO9796d1Encoding.java
+++ /dev/null
@@ -1,287 +0,0 @@
-package org.bouncycastle.crypto.encodings;
-
-import java.math.BigInteger;
-
-import org.bouncycastle.crypto.AsymmetricBlockCipher;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.InvalidCipherTextException;
-import org.bouncycastle.crypto.params.ParametersWithRandom;
-import org.bouncycastle.crypto.params.RSAKeyParameters;
-
-/**
- * ISO 9796-1 padding. Note in the light of recent results you should
- * only use this with RSA (rather than the "simpler" Rabin keys) and you
- * should never use it with anything other than a hash (ie. even if the
- * message is small don't sign the message, sign it's hash) or some "random"
- * value. See your favorite search engine for details.
- */
-public class ISO9796d1Encoding
-    implements AsymmetricBlockCipher
-{
-    private static final BigInteger SIXTEEN = BigInteger.valueOf(16L);
-    private static final BigInteger SIX     = BigInteger.valueOf(6L);
-
-    private static byte[]    shadows = { 0xe, 0x3, 0x5, 0x8, 0x9, 0x4, 0x2, 0xf,
-                                    0x0, 0xd, 0xb, 0x6, 0x7, 0xa, 0xc, 0x1 };
-    private static byte[]    inverse = { 0x8, 0xf, 0x6, 0x1, 0x5, 0x2, 0xb, 0xc,
-                                    0x3, 0x4, 0xd, 0xa, 0xe, 0x9, 0x0, 0x7 };
-
-    private AsymmetricBlockCipher   engine;
-    private boolean                 forEncryption;
-    private int                     bitSize;
-    private int                     padBits = 0;
-    private BigInteger              modulus;
-
-    public ISO9796d1Encoding(
-        AsymmetricBlockCipher   cipher)
-    {
-        this.engine = cipher;
-    }
-
-    public AsymmetricBlockCipher getUnderlyingCipher()
-    {
-        return engine;
-    }
-
-    public void init(
-        boolean             forEncryption,
-        CipherParameters    param)
-    {
-        RSAKeyParameters  kParam = null;
-
-        if (param instanceof ParametersWithRandom)
-        {
-            ParametersWithRandom    rParam = (ParametersWithRandom)param;
-
-            kParam = (RSAKeyParameters)rParam.getParameters();
-        }
-        else
-        {
-            kParam = (RSAKeyParameters)param;
-        }
-
-        engine.init(forEncryption, param);
-
-        modulus = kParam.getModulus();
-        bitSize = modulus.bitLength();
-
-        this.forEncryption = forEncryption;
-    }
-
-    /**
-     * return the input block size. The largest message we can process
-     * is (key_size_in_bits + 3)/16, which in our world comes to
-     * key_size_in_bytes / 2.
-     */
-    public int getInputBlockSize()
-    {
-        int     baseBlockSize = engine.getInputBlockSize();
-
-        if (forEncryption)
-        {
-            return (baseBlockSize + 1) / 2;
-        }
-        else
-        {
-            return baseBlockSize;
-        }
-    }
-
-    /**
-     * return the maximum possible size for the output.
-     */
-    public int getOutputBlockSize()
-    {
-        int     baseBlockSize = engine.getOutputBlockSize();
-
-        if (forEncryption)
-        {
-            return baseBlockSize;
-        }
-        else
-        {
-            return (baseBlockSize + 1) / 2;
-        }
-    }
-
-    /**
-     * set the number of bits in the next message to be treated as
-     * pad bits.
-     */
-    public void setPadBits(
-        int     padBits)
-    {
-        if (padBits > 7)
-        {
-            throw new IllegalArgumentException("padBits > 7");
-        }
-
-        this.padBits = padBits;
-    }
-
-    /**
-     * retrieve the number of pad bits in the last decoded message.
-     */
-    public int getPadBits()
-    {
-        return padBits;
-    }
-
-    public byte[] processBlock(
-        byte[]  in,
-        int     inOff,
-        int     inLen)
-        throws InvalidCipherTextException
-    {
-        if (forEncryption)
-        {
-            return encodeBlock(in, inOff, inLen);
-        }
-        else
-        {
-            return decodeBlock(in, inOff, inLen);
-        }
-    }
-
-    private byte[] encodeBlock(
-        byte[]  in,
-        int     inOff,
-        int     inLen)
-        throws InvalidCipherTextException
-    {
-        byte[]  block = new byte[(bitSize + 7) / 8];
-        int     r = padBits + 1;
-        int     z = inLen;
-        int     t = (bitSize + 13) / 16;
-
-        for (int i = 0; i < t; i += z)
-        {
-            if (i > t - z)
-            {
-                System.arraycopy(in, inOff + inLen - (t - i),
-                                    block, block.length - t, t - i);
-            }
-            else
-            {
-                System.arraycopy(in, inOff, block, block.length - (i + z), z);
-            }
-        }
-
-        for (int i = block.length - 2 * t; i != block.length; i += 2)
-        {
-            byte    val = block[block.length - t + i / 2];
-
-            block[i] = (byte)((shadows[(val & 0xff) >>> 4] << 4)
-                                                | shadows[val & 0x0f]);
-            block[i + 1] = val;
-        }
-
-        block[block.length - 2 * z] ^= r;
-        block[block.length - 1] = (byte)((block[block.length - 1] << 4) | 0x06);
-
-        int maxBit = (8 - (bitSize - 1) % 8);
-        int offSet = 0;
-
-        if (maxBit != 8)
-        {
-            block[0] &= 0xff >>> maxBit;
-            block[0] |= 0x80 >>> maxBit;
-        }
-        else
-        {
-            block[0] = 0x00;
-            block[1] |= 0x80;
-            offSet = 1;
-        }
-
-        return engine.processBlock(block, offSet, block.length - offSet);
-    }
-
-    /**
-     * @exception InvalidCipherTextException if the decrypted block is not a valid ISO 9796 bit string
-     */
-    private byte[] decodeBlock(
-        byte[]  in,
-        int     inOff,
-        int     inLen)
-        throws InvalidCipherTextException
-    {
-        byte[]  block = engine.processBlock(in, inOff, inLen);
-        int     r = 1;
-        int     t = (bitSize + 13) / 16;
-
-        BigInteger iS = new BigInteger(1, block);
-        BigInteger iR;
-        if (iS.mod(SIXTEEN).equals(SIX))
-        {
-            iR = iS;
-        }
-        else if ((modulus.subtract(iS)).mod(SIXTEEN).equals(SIX))
-        {
-            iR = modulus.subtract(iS);
-        }
-        else
-        {
-            throw new InvalidCipherTextException("resulting integer iS or (modulus - iS) is not congruent to 6 mod 16");
-        }
-
-        block = convertOutputDecryptOnly(iR);
-
-        if ((block[block.length - 1] & 0x0f) != 0x6 )
-        {
-            throw new InvalidCipherTextException("invalid forcing byte in block");
-        }
-
-        block[block.length - 1] = (byte)(((block[block.length - 1] & 0xff) >>> 4) | ((inverse[(block[block.length - 2] & 0xff) >> 4]) << 4));
-        block[0] = (byte)((shadows[(block[1] & 0xff) >>> 4] << 4)
-                                                | shadows[block[1] & 0x0f]);
-
-        boolean boundaryFound = false;
-        int     boundary = 0;
-
-        for (int i = block.length - 1; i >= block.length - 2 * t; i -= 2)
-        {
-            int val = ((shadows[(block[i] & 0xff) >>> 4] << 4)
-                                        | shadows[block[i] & 0x0f]);
-
-            if (((block[i - 1] ^ val) & 0xff) != 0)
-            {
-                if (!boundaryFound)
-                {
-                    boundaryFound = true;
-                    r = (block[i - 1] ^ val) & 0xff;
-                    boundary = i - 1;
-                }
-                else
-                {
-                    throw new InvalidCipherTextException("invalid tsums in block");
-                }
-            }
-        }
-
-        block[boundary] = 0;
-
-        byte[]  nblock = new byte[(block.length - boundary) / 2];
-
-        for (int i = 0; i < nblock.length; i++)
-        {
-            nblock[i] = block[2 * i + boundary + 1];
-        }
-
-        padBits = r - 1;
-
-        return nblock;
-    }
-
-    private static byte[] convertOutputDecryptOnly(BigInteger result)
-    {
-        byte[] output = result.toByteArray();
-        if (output[0] == 0) // have ended up with an extra zero byte, copy down.
-        {
-            byte[] tmp = new byte[output.length - 1];
-            System.arraycopy(output, 1, tmp, 0, tmp.length);
-            return tmp;
-        }
-        return output;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/encodings/OAEPEncoding.java b/bcprov/src/main/java/org/bouncycastle/crypto/encodings/OAEPEncoding.java
index 17d8e3b..4dbfbff 100644
--- a/bcprov/src/main/java/org/bouncycastle/crypto/encodings/OAEPEncoding.java
+++ b/bcprov/src/main/java/org/bouncycastle/crypto/encodings/OAEPEncoding.java
@@ -6,7 +6,9 @@ import org.bouncycastle.crypto.AsymmetricBlockCipher;
 import org.bouncycastle.crypto.CipherParameters;
 import org.bouncycastle.crypto.Digest;
 import org.bouncycastle.crypto.InvalidCipherTextException;
-import org.bouncycastle.crypto.digests.SHA1Digest;
+// BEGIN android-changed
+import org.bouncycastle.crypto.digests.AndroidDigestFactory;
+// END android-changed
 import org.bouncycastle.crypto.params.ParametersWithRandom;
 
 /**
@@ -25,7 +27,9 @@ public class OAEPEncoding
     public OAEPEncoding(
         AsymmetricBlockCipher   cipher)
     {
-        this(cipher, new SHA1Digest(), null);
+        // BEGIN android-changed
+        this(cipher, AndroidDigestFactory.getSHA1(), null);
+        // END android-changed
     }
     
     public OAEPEncoding(
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/encodings/PKCS1Encoding.java b/bcprov/src/main/java/org/bouncycastle/crypto/encodings/PKCS1Encoding.java
index f9acbd4..7ba71c7 100644
--- a/bcprov/src/main/java/org/bouncycastle/crypto/encodings/PKCS1Encoding.java
+++ b/bcprov/src/main/java/org/bouncycastle/crypto/encodings/PKCS1Encoding.java
@@ -378,6 +378,12 @@ public class PKCS1Encoding
                 throw new InvalidCipherTextException("unknown block type");
             }
         }
+        // BEGIN android-added
+        if ((type == 1 && forPrivateKey) || (type == 2 && !forPrivateKey))
+        {
+            throw new InvalidCipherTextException("invalid block type " + type);
+        }
+        // END android-added
 
         if (useStrictLength && block.length != engine.getOutputBlockSize())
         {
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/encodings/package.html b/bcprov/src/main/java/org/bouncycastle/crypto/encodings/package.html
deleted file mode 100644
index fc56f63..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/encodings/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body bgcolor="#ffffff">
-Block encodings for asymmetric ciphers.
-</body>
-</html>
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/engines/AESLightEngine.java b/bcprov/src/main/java/org/bouncycastle/crypto/engines/AESLightEngine.java
deleted file mode 100644
index 70a3f68..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/engines/AESLightEngine.java
+++ /dev/null
@@ -1,434 +0,0 @@
-package org.bouncycastle.crypto.engines;
-
-import org.bouncycastle.crypto.BlockCipher;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.DataLengthException;
-import org.bouncycastle.crypto.OutputLengthException;
-import org.bouncycastle.crypto.params.KeyParameter;
-
-/**
- * an implementation of the AES (Rijndael), from FIPS-197.
- * <p>
- * For further details see: <a href="http://csrc.nist.gov/encryption/aes/">http://csrc.nist.gov/encryption/aes/</a>.
- *
- * This implementation is based on optimizations from Dr. Brian Gladman's paper and C code at
- * <a href="http://fp.gladman.plus.com/cryptography_technology/rijndael/">http://fp.gladman.plus.com/cryptography_technology/rijndael/</a>
- *
- * There are three levels of tradeoff of speed vs memory
- * Because java has no preprocessor, they are written as three separate classes from which to choose
- *
- * The fastest uses 8Kbytes of static tables to precompute round calculations, 4 256 word tables for encryption
- * and 4 for decryption.
- *
- * The middle performance version uses only one 256 word table for each, for a total of 2Kbytes,
- * adding 12 rotate operations per round to compute the values contained in the other tables from
- * the contents of the first
- *
- * The slowest version uses no static tables at all and computes the values
- * in each round.
- * <p>
- * This file contains the slowest performance version with no static tables
- * for round precomputation, but it has the smallest foot print.
- *
- */
-public class AESLightEngine
-    implements BlockCipher
-{
-    // The S box
-    private static final byte[] S = {
-        (byte)99, (byte)124, (byte)119, (byte)123, (byte)242, (byte)107, (byte)111, (byte)197,
-        (byte)48,   (byte)1, (byte)103,  (byte)43, (byte)254, (byte)215, (byte)171, (byte)118,
-        (byte)202, (byte)130, (byte)201, (byte)125, (byte)250,  (byte)89,  (byte)71, (byte)240,
-        (byte)173, (byte)212, (byte)162, (byte)175, (byte)156, (byte)164, (byte)114, (byte)192,
-        (byte)183, (byte)253, (byte)147,  (byte)38,  (byte)54,  (byte)63, (byte)247, (byte)204,
-        (byte)52, (byte)165, (byte)229, (byte)241, (byte)113, (byte)216,  (byte)49,  (byte)21,
-        (byte)4, (byte)199,  (byte)35, (byte)195,  (byte)24, (byte)150,   (byte)5, (byte)154,
-        (byte)7,  (byte)18, (byte)128, (byte)226, (byte)235,  (byte)39, (byte)178, (byte)117,
-        (byte)9, (byte)131,  (byte)44,  (byte)26,  (byte)27, (byte)110,  (byte)90, (byte)160,
-        (byte)82,  (byte)59, (byte)214, (byte)179,  (byte)41, (byte)227,  (byte)47, (byte)132,
-        (byte)83, (byte)209,   (byte)0, (byte)237,  (byte)32, (byte)252, (byte)177,  (byte)91,
-        (byte)106, (byte)203, (byte)190,  (byte)57,  (byte)74,  (byte)76,  (byte)88, (byte)207,
-        (byte)208, (byte)239, (byte)170, (byte)251,  (byte)67,  (byte)77,  (byte)51, (byte)133,
-        (byte)69, (byte)249,   (byte)2, (byte)127,  (byte)80,  (byte)60, (byte)159, (byte)168,
-        (byte)81, (byte)163,  (byte)64, (byte)143, (byte)146, (byte)157,  (byte)56, (byte)245,
-        (byte)188, (byte)182, (byte)218,  (byte)33,  (byte)16, (byte)255, (byte)243, (byte)210,
-        (byte)205,  (byte)12,  (byte)19, (byte)236,  (byte)95, (byte)151,  (byte)68,  (byte)23,
-        (byte)196, (byte)167, (byte)126,  (byte)61, (byte)100,  (byte)93,  (byte)25, (byte)115,
-        (byte)96, (byte)129,  (byte)79, (byte)220,  (byte)34,  (byte)42, (byte)144, (byte)136,
-        (byte)70, (byte)238, (byte)184,  (byte)20, (byte)222,  (byte)94,  (byte)11, (byte)219,
-        (byte)224,  (byte)50,  (byte)58,  (byte)10,  (byte)73,   (byte)6,  (byte)36,  (byte)92,
-        (byte)194, (byte)211, (byte)172,  (byte)98, (byte)145, (byte)149, (byte)228, (byte)121,
-        (byte)231, (byte)200,  (byte)55, (byte)109, (byte)141, (byte)213,  (byte)78, (byte)169,
-        (byte)108,  (byte)86, (byte)244, (byte)234, (byte)101, (byte)122, (byte)174,   (byte)8,
-        (byte)186, (byte)120,  (byte)37,  (byte)46,  (byte)28, (byte)166, (byte)180, (byte)198,
-        (byte)232, (byte)221, (byte)116,  (byte)31,  (byte)75, (byte)189, (byte)139, (byte)138,
-        (byte)112,  (byte)62, (byte)181, (byte)102,  (byte)72,   (byte)3, (byte)246,  (byte)14,
-        (byte)97,  (byte)53,  (byte)87, (byte)185, (byte)134, (byte)193,  (byte)29, (byte)158,
-        (byte)225, (byte)248, (byte)152,  (byte)17, (byte)105, (byte)217, (byte)142, (byte)148,
-        (byte)155,  (byte)30, (byte)135, (byte)233, (byte)206,  (byte)85,  (byte)40, (byte)223,
-        (byte)140, (byte)161, (byte)137,  (byte)13, (byte)191, (byte)230,  (byte)66, (byte)104,
-        (byte)65, (byte)153,  (byte)45,  (byte)15, (byte)176,  (byte)84, (byte)187,  (byte)22,
-    };
-
-    // The inverse S-box
-    private static final byte[] Si = {
-        (byte)82,   (byte)9, (byte)106, (byte)213,  (byte)48,  (byte)54, (byte)165,  (byte)56,
-        (byte)191,  (byte)64, (byte)163, (byte)158, (byte)129, (byte)243, (byte)215, (byte)251,
-        (byte)124, (byte)227,  (byte)57, (byte)130, (byte)155,  (byte)47, (byte)255, (byte)135,
-        (byte)52, (byte)142,  (byte)67,  (byte)68, (byte)196, (byte)222, (byte)233, (byte)203,
-        (byte)84, (byte)123, (byte)148,  (byte)50, (byte)166, (byte)194,  (byte)35,  (byte)61,
-        (byte)238,  (byte)76, (byte)149,  (byte)11,  (byte)66, (byte)250, (byte)195,  (byte)78,
-        (byte)8,  (byte)46, (byte)161, (byte)102,  (byte)40, (byte)217,  (byte)36, (byte)178,
-        (byte)118,  (byte)91, (byte)162,  (byte)73, (byte)109, (byte)139, (byte)209,  (byte)37,
-        (byte)114, (byte)248, (byte)246, (byte)100, (byte)134, (byte)104, (byte)152,  (byte)22,
-        (byte)212, (byte)164,  (byte)92, (byte)204,  (byte)93, (byte)101, (byte)182, (byte)146,
-        (byte)108, (byte)112,  (byte)72,  (byte)80, (byte)253, (byte)237, (byte)185, (byte)218,
-        (byte)94,  (byte)21,  (byte)70,  (byte)87, (byte)167, (byte)141, (byte)157, (byte)132,
-        (byte)144, (byte)216, (byte)171,   (byte)0, (byte)140, (byte)188, (byte)211,  (byte)10,
-        (byte)247, (byte)228,  (byte)88,   (byte)5, (byte)184, (byte)179,  (byte)69,   (byte)6,
-        (byte)208,  (byte)44,  (byte)30, (byte)143, (byte)202,  (byte)63,  (byte)15,   (byte)2,
-        (byte)193, (byte)175, (byte)189,   (byte)3,   (byte)1,  (byte)19, (byte)138, (byte)107,
-        (byte)58, (byte)145,  (byte)17,  (byte)65,  (byte)79, (byte)103, (byte)220, (byte)234,
-        (byte)151, (byte)242, (byte)207, (byte)206, (byte)240, (byte)180, (byte)230, (byte)115,
-        (byte)150, (byte)172, (byte)116,  (byte)34, (byte)231, (byte)173,  (byte)53, (byte)133,
-        (byte)226, (byte)249,  (byte)55, (byte)232,  (byte)28, (byte)117, (byte)223, (byte)110,
-        (byte)71, (byte)241,  (byte)26, (byte)113,  (byte)29,  (byte)41, (byte)197, (byte)137,
-        (byte)111, (byte)183,  (byte)98,  (byte)14, (byte)170,  (byte)24, (byte)190,  (byte)27,
-        (byte)252,  (byte)86,  (byte)62,  (byte)75, (byte)198, (byte)210, (byte)121,  (byte)32,
-        (byte)154, (byte)219, (byte)192, (byte)254, (byte)120, (byte)205,  (byte)90, (byte)244,
-        (byte)31, (byte)221, (byte)168,  (byte)51, (byte)136,   (byte)7, (byte)199,  (byte)49,
-        (byte)177,  (byte)18,  (byte)16,  (byte)89,  (byte)39, (byte)128, (byte)236,  (byte)95,
-        (byte)96,  (byte)81, (byte)127, (byte)169,  (byte)25, (byte)181,  (byte)74,  (byte)13,
-        (byte)45, (byte)229, (byte)122, (byte)159, (byte)147, (byte)201, (byte)156, (byte)239,
-        (byte)160, (byte)224,  (byte)59,  (byte)77, (byte)174,  (byte)42, (byte)245, (byte)176,
-        (byte)200, (byte)235, (byte)187,  (byte)60, (byte)131,  (byte)83, (byte)153,  (byte)97,
-        (byte)23,  (byte)43,   (byte)4, (byte)126, (byte)186, (byte)119, (byte)214,  (byte)38,
-        (byte)225, (byte)105,  (byte)20,  (byte)99,  (byte)85,  (byte)33,  (byte)12, (byte)125,
-        };
-
-    // vector used in calculating key schedule (powers of x in GF(256))
-    private static final int[] rcon = {
-         0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x1b, 0x36, 0x6c, 0xd8, 0xab, 0x4d, 0x9a,
-         0x2f, 0x5e, 0xbc, 0x63, 0xc6, 0x97, 0x35, 0x6a, 0xd4, 0xb3, 0x7d, 0xfa, 0xef, 0xc5, 0x91 };
-
-    private static int shift(int r, int shift)
-    {
-        return (r >>> shift) | (r << -shift);
-    }
-
-    /* multiply four bytes in GF(2^8) by 'x' {02} in parallel */
-
-    private static final int m1 = 0x80808080;
-    private static final int m2 = 0x7f7f7f7f;
-    private static final int m3 = 0x0000001b;
-
-    private static int FFmulX(int x)
-    {
-        return (((x & m2) << 1) ^ (((x & m1) >>> 7) * m3));
-    }
-
-    /* 
-       The following defines provide alternative definitions of FFmulX that might
-       give improved performance if a fast 32-bit multiply is not available.
-       
-       private int FFmulX(int x) { int u = x & m1; u |= (u >> 1); return ((x & m2) << 1) ^ ((u >>> 3) | (u >>> 6)); } 
-       private static final int  m4 = 0x1b1b1b1b;
-       private int FFmulX(int x) { int u = x & m1; return ((x & m2) << 1) ^ ((u - (u >>> 7)) & m4); } 
-
-    */
-
-    private static int mcol(int x)
-    {
-        int f2 = FFmulX(x);
-        return f2 ^ shift(x ^ f2, 8) ^ shift(x, 16) ^ shift(x, 24);
-    }
-
-    private static int inv_mcol(int x)
-    {
-        int f2 = FFmulX(x);
-        int f4 = FFmulX(f2);
-        int f8 = FFmulX(f4);
-        int f9 = x ^ f8;
-        
-        return f2 ^ f4 ^ f8 ^ shift(f2 ^ f9, 8) ^ shift(f4 ^ f9, 16) ^ shift(f9, 24);
-    }
-
-
-    private static int subWord(int x)
-    {
-        return (S[x&255]&255 | ((S[(x>>8)&255]&255)<<8) | ((S[(x>>16)&255]&255)<<16) | S[(x>>24)&255]<<24);
-    }
-
-    /**
-     * Calculate the necessary round keys
-     * The number of calculations depends on key size and block size
-     * AES specified a fixed block size of 128 bits and key sizes 128/192/256 bits
-     * This code is written assuming those are the only possible values
-     */
-    private int[][] generateWorkingKey(
-                                    byte[] key,
-                                    boolean forEncryption)
-    {
-        int         KC = key.length / 4;  // key length in words
-        int         t;
-        
-        if (((KC != 4) && (KC != 6) && (KC != 8)) || ((KC * 4) != key.length))
-        {
-            throw new IllegalArgumentException("Key length not 128/192/256 bits.");
-        }
-
-        ROUNDS = KC + 6;  // This is not always true for the generalized Rijndael that allows larger block sizes
-        int[][] W = new int[ROUNDS+1][4];   // 4 words in a block
-        
-        //
-        // copy the key into the round key array
-        //
-        
-        t = 0;
-        int i = 0;
-        while (i < key.length)
-            {
-                W[t >> 2][t & 3] = (key[i]&0xff) | ((key[i+1]&0xff) << 8) | ((key[i+2]&0xff) << 16) | (key[i+3] << 24);
-                i+=4;
-                t++;
-            }
-        
-        //
-        // while not enough round key material calculated
-        // calculate new values
-        //
-        int k = (ROUNDS + 1) << 2;
-        for (i = KC; (i < k); i++)
-            {
-                int temp = W[(i-1)>>2][(i-1)&3];
-                if ((i % KC) == 0)
-                {
-                    temp = subWord(shift(temp, 8)) ^ rcon[(i / KC)-1];
-                }
-                else if ((KC > 6) && ((i % KC) == 4))
-                {
-                    temp = subWord(temp);
-                }
-                
-                W[i>>2][i&3] = W[(i - KC)>>2][(i-KC)&3] ^ temp;
-            }
-
-        if (!forEncryption)
-        {
-            for (int j = 1; j < ROUNDS; j++)
-            {
-                for (i = 0; i < 4; i++) 
-                {
-                    W[j][i] = inv_mcol(W[j][i]);
-                }
-            }
-        }
-
-        return W;
-    }
-
-    private int         ROUNDS;
-    private int[][]     WorkingKey = null;
-    private int         C0, C1, C2, C3;
-    private boolean     forEncryption;
-
-    private static final int BLOCK_SIZE = 16;
-
-    /**
-     * default constructor - 128 bit block size.
-     */
-    public AESLightEngine()
-    {
-    }
-
-    /**
-     * initialise an AES cipher.
-     *
-     * @param forEncryption whether or not we are for encryption.
-     * @param params the parameters required to set up the cipher.
-     * @exception IllegalArgumentException if the params argument is
-     * inappropriate.
-     */
-    public void init(
-        boolean           forEncryption,
-        CipherParameters  params)
-    {
-        if (params instanceof KeyParameter)
-        {
-            WorkingKey = generateWorkingKey(((KeyParameter)params).getKey(), forEncryption);
-            this.forEncryption = forEncryption;
-            return;
-        }
-
-        throw new IllegalArgumentException("invalid parameter passed to AES init - " + params.getClass().getName());
-    }
-
-    public String getAlgorithmName()
-    {
-        return "AES";
-    }
-
-    public int getBlockSize()
-    {
-        return BLOCK_SIZE;
-    }
-
-    public int processBlock(
-        byte[] in,
-        int inOff,
-        byte[] out,
-        int outOff)
-    {
-        if (WorkingKey == null)
-        {
-            throw new IllegalStateException("AES engine not initialised");
-        }
-
-        if ((inOff + (32 / 2)) > in.length)
-        {
-            throw new DataLengthException("input buffer too short");
-        }
-
-        if ((outOff + (32 / 2)) > out.length)
-        {
-            throw new OutputLengthException("output buffer too short");
-        }
-
-        if (forEncryption)
-        {
-            unpackBlock(in, inOff);
-            encryptBlock(WorkingKey);
-            packBlock(out, outOff);
-        }
-        else
-        {
-            unpackBlock(in, inOff);
-            decryptBlock(WorkingKey);
-            packBlock(out, outOff);
-        }
-
-        return BLOCK_SIZE;
-    }
-
-    public void reset()
-    {
-    }
-
-    private void unpackBlock(
-        byte[]      bytes,
-        int         off)
-    {
-        int     index = off;
-
-        C0 = (bytes[index++] & 0xff);
-        C0 |= (bytes[index++] & 0xff) << 8;
-        C0 |= (bytes[index++] & 0xff) << 16;
-        C0 |= bytes[index++] << 24;
-
-        C1 = (bytes[index++] & 0xff);
-        C1 |= (bytes[index++] & 0xff) << 8;
-        C1 |= (bytes[index++] & 0xff) << 16;
-        C1 |= bytes[index++] << 24;
-
-        C2 = (bytes[index++] & 0xff);
-        C2 |= (bytes[index++] & 0xff) << 8;
-        C2 |= (bytes[index++] & 0xff) << 16;
-        C2 |= bytes[index++] << 24;
-
-        C3 = (bytes[index++] & 0xff);
-        C3 |= (bytes[index++] & 0xff) << 8;
-        C3 |= (bytes[index++] & 0xff) << 16;
-        C3 |= bytes[index++] << 24;
-    }
-
-    private void packBlock(
-        byte[]      bytes,
-        int         off)
-    {
-        int     index = off;
-
-        bytes[index++] = (byte)C0;
-        bytes[index++] = (byte)(C0 >> 8);
-        bytes[index++] = (byte)(C0 >> 16);
-        bytes[index++] = (byte)(C0 >> 24);
-
-        bytes[index++] = (byte)C1;
-        bytes[index++] = (byte)(C1 >> 8);
-        bytes[index++] = (byte)(C1 >> 16);
-        bytes[index++] = (byte)(C1 >> 24);
-
-        bytes[index++] = (byte)C2;
-        bytes[index++] = (byte)(C2 >> 8);
-        bytes[index++] = (byte)(C2 >> 16);
-        bytes[index++] = (byte)(C2 >> 24);
-
-        bytes[index++] = (byte)C3;
-        bytes[index++] = (byte)(C3 >> 8);
-        bytes[index++] = (byte)(C3 >> 16);
-        bytes[index++] = (byte)(C3 >> 24);
-    }
-
-    private void encryptBlock(int[][] KW)
-    {
-        int t0 = this.C0 ^ KW[0][0];
-        int t1 = this.C1 ^ KW[0][1];
-        int t2 = this.C2 ^ KW[0][2];
-
-        int r = 1, r0, r1, r2, r3 = this.C3 ^ KW[0][3];
-        while (r < ROUNDS - 1)
-        {
-            r0 = mcol((S[t0&255]&255) ^ ((S[(t1>>8)&255]&255)<<8) ^ ((S[(t2>>16)&255]&255)<<16) ^ (S[(r3>>24)&255]<<24)) ^ KW[r][0];
-            r1 = mcol((S[t1&255]&255) ^ ((S[(t2>>8)&255]&255)<<8) ^ ((S[(r3>>16)&255]&255)<<16) ^ (S[(t0>>24)&255]<<24)) ^ KW[r][1];
-            r2 = mcol((S[t2&255]&255) ^ ((S[(r3>>8)&255]&255)<<8) ^ ((S[(t0>>16)&255]&255)<<16) ^ (S[(t1>>24)&255]<<24)) ^ KW[r][2];
-            r3 = mcol((S[r3&255]&255) ^ ((S[(t0>>8)&255]&255)<<8) ^ ((S[(t1>>16)&255]&255)<<16) ^ (S[(t2>>24)&255]<<24)) ^ KW[r++][3];
-            t0 = mcol((S[r0&255]&255) ^ ((S[(r1>>8)&255]&255)<<8) ^ ((S[(r2>>16)&255]&255)<<16) ^ (S[(r3>>24)&255]<<24)) ^ KW[r][0];
-            t1 = mcol((S[r1&255]&255) ^ ((S[(r2>>8)&255]&255)<<8) ^ ((S[(r3>>16)&255]&255)<<16) ^ (S[(r0>>24)&255]<<24)) ^ KW[r][1];
-            t2 = mcol((S[r2&255]&255) ^ ((S[(r3>>8)&255]&255)<<8) ^ ((S[(r0>>16)&255]&255)<<16) ^ (S[(r1>>24)&255]<<24)) ^ KW[r][2];
-            r3 = mcol((S[r3&255]&255) ^ ((S[(r0>>8)&255]&255)<<8) ^ ((S[(r1>>16)&255]&255)<<16) ^ (S[(r2>>24)&255]<<24)) ^ KW[r++][3];
-        }
-
-        r0 = mcol((S[t0&255]&255) ^ ((S[(t1>>8)&255]&255)<<8) ^ ((S[(t2>>16)&255]&255)<<16) ^ (S[(r3>>24)&255]<<24)) ^ KW[r][0];
-        r1 = mcol((S[t1&255]&255) ^ ((S[(t2>>8)&255]&255)<<8) ^ ((S[(r3>>16)&255]&255)<<16) ^ (S[(t0>>24)&255]<<24)) ^ KW[r][1];
-        r2 = mcol((S[t2&255]&255) ^ ((S[(r3>>8)&255]&255)<<8) ^ ((S[(t0>>16)&255]&255)<<16) ^ (S[(t1>>24)&255]<<24)) ^ KW[r][2];
-        r3 = mcol((S[r3&255]&255) ^ ((S[(t0>>8)&255]&255)<<8) ^ ((S[(t1>>16)&255]&255)<<16) ^ (S[(t2>>24)&255]<<24)) ^ KW[r++][3];
-
-        // the final round is a simple function of S
-
-        this.C0 = (S[r0&255]&255) ^ ((S[(r1>>8)&255]&255)<<8) ^ ((S[(r2>>16)&255]&255)<<16) ^ (S[(r3>>24)&255]<<24) ^ KW[r][0];
-        this.C1 = (S[r1&255]&255) ^ ((S[(r2>>8)&255]&255)<<8) ^ ((S[(r3>>16)&255]&255)<<16) ^ (S[(r0>>24)&255]<<24) ^ KW[r][1];
-        this.C2 = (S[r2&255]&255) ^ ((S[(r3>>8)&255]&255)<<8) ^ ((S[(r0>>16)&255]&255)<<16) ^ (S[(r1>>24)&255]<<24) ^ KW[r][2];
-        this.C3 = (S[r3&255]&255) ^ ((S[(r0>>8)&255]&255)<<8) ^ ((S[(r1>>16)&255]&255)<<16) ^ (S[(r2>>24)&255]<<24) ^ KW[r][3];
-    }
-
-    private void decryptBlock(int[][] KW)
-    {
-        int t0 = this.C0 ^ KW[ROUNDS][0];
-        int t1 = this.C1 ^ KW[ROUNDS][1];
-        int t2 = this.C2 ^ KW[ROUNDS][2];
-
-        int r = ROUNDS - 1, r0, r1, r2, r3 = this.C3 ^ KW[ROUNDS][3];
-        while (r > 1)
-        {
-            r0 = inv_mcol((Si[t0&255]&255) ^ ((Si[(r3>>8)&255]&255)<<8) ^ ((Si[(t2>>16)&255]&255)<<16) ^ (Si[(t1>>24)&255]<<24)) ^ KW[r][0];
-            r1 = inv_mcol((Si[t1&255]&255) ^ ((Si[(t0>>8)&255]&255)<<8) ^ ((Si[(r3>>16)&255]&255)<<16) ^ (Si[(t2>>24)&255]<<24)) ^ KW[r][1];
-            r2 = inv_mcol((Si[t2&255]&255) ^ ((Si[(t1>>8)&255]&255)<<8) ^ ((Si[(t0>>16)&255]&255)<<16) ^ (Si[(r3>>24)&255]<<24)) ^ KW[r][2];
-            r3 = inv_mcol((Si[r3&255]&255) ^ ((Si[(t2>>8)&255]&255)<<8) ^ ((Si[(t1>>16)&255]&255)<<16) ^ (Si[(t0>>24)&255]<<24)) ^ KW[r--][3];
-            t0 = inv_mcol((Si[r0&255]&255) ^ ((Si[(r3>>8)&255]&255)<<8) ^ ((Si[(r2>>16)&255]&255)<<16) ^ (Si[(r1>>24)&255]<<24)) ^ KW[r][0];
-            t1 = inv_mcol((Si[r1&255]&255) ^ ((Si[(r0>>8)&255]&255)<<8) ^ ((Si[(r3>>16)&255]&255)<<16) ^ (Si[(r2>>24)&255]<<24)) ^ KW[r][1];
-            t2 = inv_mcol((Si[r2&255]&255) ^ ((Si[(r1>>8)&255]&255)<<8) ^ ((Si[(r0>>16)&255]&255)<<16) ^ (Si[(r3>>24)&255]<<24)) ^ KW[r][2];
-            r3 = inv_mcol((Si[r3&255]&255) ^ ((Si[(r2>>8)&255]&255)<<8) ^ ((Si[(r1>>16)&255]&255)<<16) ^ (Si[(r0>>24)&255]<<24)) ^ KW[r--][3];
-        }
-
-        r0 = inv_mcol((Si[t0&255]&255) ^ ((Si[(r3>>8)&255]&255)<<8) ^ ((Si[(t2>>16)&255]&255)<<16) ^ (Si[(t1>>24)&255]<<24)) ^ KW[r][0];
-        r1 = inv_mcol((Si[t1&255]&255) ^ ((Si[(t0>>8)&255]&255)<<8) ^ ((Si[(r3>>16)&255]&255)<<16) ^ (Si[(t2>>24)&255]<<24)) ^ KW[r][1];
-        r2 = inv_mcol((Si[t2&255]&255) ^ ((Si[(t1>>8)&255]&255)<<8) ^ ((Si[(t0>>16)&255]&255)<<16) ^ (Si[(r3>>24)&255]<<24)) ^ KW[r][2];
-        r3 = inv_mcol((Si[r3&255]&255) ^ ((Si[(t2>>8)&255]&255)<<8) ^ ((Si[(t1>>16)&255]&255)<<16) ^ (Si[(t0>>24)&255]<<24)) ^ KW[r][3];
-
-        // the final round's table is a simple function of Si
-
-        this.C0 = (Si[r0&255]&255) ^ ((Si[(r3>>8)&255]&255)<<8) ^ ((Si[(r2>>16)&255]&255)<<16) ^ (Si[(r1>>24)&255]<<24) ^ KW[0][0];
-        this.C1 = (Si[r1&255]&255) ^ ((Si[(r0>>8)&255]&255)<<8) ^ ((Si[(r3>>16)&255]&255)<<16) ^ (Si[(r2>>24)&255]<<24) ^ KW[0][1];
-        this.C2 = (Si[r2&255]&255) ^ ((Si[(r1>>8)&255]&255)<<8) ^ ((Si[(r0>>16)&255]&255)<<16) ^ (Si[(r3>>24)&255]<<24) ^ KW[0][2];
-        this.C3 = (Si[r3&255]&255) ^ ((Si[(r2>>8)&255]&255)<<8) ^ ((Si[(r1>>16)&255]&255)<<16) ^ (Si[(r0>>24)&255]<<24) ^ KW[0][3];
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/engines/AESWrapPadEngine.java b/bcprov/src/main/java/org/bouncycastle/crypto/engines/AESWrapPadEngine.java
deleted file mode 100644
index 7776061..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/engines/AESWrapPadEngine.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package org.bouncycastle.crypto.engines;
-
-public class AESWrapPadEngine
-    extends RFC5649WrapEngine
-{
-    public AESWrapPadEngine()
-    {
-        super(new AESEngine());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/engines/CAST5Engine.java b/bcprov/src/main/java/org/bouncycastle/crypto/engines/CAST5Engine.java
deleted file mode 100644
index 5a8c780..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/engines/CAST5Engine.java
+++ /dev/null
@@ -1,831 +0,0 @@
-package org.bouncycastle.crypto.engines;
-
-import org.bouncycastle.crypto.BlockCipher;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.DataLengthException;
-import org.bouncycastle.crypto.OutputLengthException;
-import org.bouncycastle.crypto.params.KeyParameter;
-
-/**
- * A class that provides CAST key encryption operations,
- * such as encoding data and generating keys.
- *
- * All the algorithms herein are from the Internet RFC's
- *
- * RFC2144 - CAST5 (64bit block, 40-128bit key)
- * RFC2612 - CAST6 (128bit block, 128-256bit key)
- *
- * and implement a simplified cryptography interface.
- */
-public class CAST5Engine
-    implements BlockCipher
-{
-    protected final static int M32 = 0xffffffff;
-
-    protected final static int[] 
-        S1 = {
-0x30fb40d4, 0x9fa0ff0b, 0x6beccd2f, 0x3f258c7a, 0x1e213f2f, 0x9c004dd3, 0x6003e540, 0xcf9fc949,
-0xbfd4af27, 0x88bbbdb5, 0xe2034090, 0x98d09675, 0x6e63a0e0, 0x15c361d2, 0xc2e7661d, 0x22d4ff8e,
-0x28683b6f, 0xc07fd059, 0xff2379c8, 0x775f50e2, 0x43c340d3, 0xdf2f8656, 0x887ca41a, 0xa2d2bd2d,
-0xa1c9e0d6, 0x346c4819, 0x61b76d87, 0x22540f2f, 0x2abe32e1, 0xaa54166b, 0x22568e3a, 0xa2d341d0,
-0x66db40c8, 0xa784392f, 0x004dff2f, 0x2db9d2de, 0x97943fac, 0x4a97c1d8, 0x527644b7, 0xb5f437a7,
-0xb82cbaef, 0xd751d159, 0x6ff7f0ed, 0x5a097a1f, 0x827b68d0, 0x90ecf52e, 0x22b0c054, 0xbc8e5935,
-0x4b6d2f7f, 0x50bb64a2, 0xd2664910, 0xbee5812d, 0xb7332290, 0xe93b159f, 0xb48ee411, 0x4bff345d,
-0xfd45c240, 0xad31973f, 0xc4f6d02e, 0x55fc8165, 0xd5b1caad, 0xa1ac2dae, 0xa2d4b76d, 0xc19b0c50,
-0x882240f2, 0x0c6e4f38, 0xa4e4bfd7, 0x4f5ba272, 0x564c1d2f, 0xc59c5319, 0xb949e354, 0xb04669fe,
-0xb1b6ab8a, 0xc71358dd, 0x6385c545, 0x110f935d, 0x57538ad5, 0x6a390493, 0xe63d37e0, 0x2a54f6b3,
-0x3a787d5f, 0x6276a0b5, 0x19a6fcdf, 0x7a42206a, 0x29f9d4d5, 0xf61b1891, 0xbb72275e, 0xaa508167,
-0x38901091, 0xc6b505eb, 0x84c7cb8c, 0x2ad75a0f, 0x874a1427, 0xa2d1936b, 0x2ad286af, 0xaa56d291,
-0xd7894360, 0x425c750d, 0x93b39e26, 0x187184c9, 0x6c00b32d, 0x73e2bb14, 0xa0bebc3c, 0x54623779,
-0x64459eab, 0x3f328b82, 0x7718cf82, 0x59a2cea6, 0x04ee002e, 0x89fe78e6, 0x3fab0950, 0x325ff6c2,
-0x81383f05, 0x6963c5c8, 0x76cb5ad6, 0xd49974c9, 0xca180dcf, 0x380782d5, 0xc7fa5cf6, 0x8ac31511,
-0x35e79e13, 0x47da91d0, 0xf40f9086, 0xa7e2419e, 0x31366241, 0x051ef495, 0xaa573b04, 0x4a805d8d,
-0x548300d0, 0x00322a3c, 0xbf64cddf, 0xba57a68e, 0x75c6372b, 0x50afd341, 0xa7c13275, 0x915a0bf5,
-0x6b54bfab, 0x2b0b1426, 0xab4cc9d7, 0x449ccd82, 0xf7fbf265, 0xab85c5f3, 0x1b55db94, 0xaad4e324,
-0xcfa4bd3f, 0x2deaa3e2, 0x9e204d02, 0xc8bd25ac, 0xeadf55b3, 0xd5bd9e98, 0xe31231b2, 0x2ad5ad6c,
-0x954329de, 0xadbe4528, 0xd8710f69, 0xaa51c90f, 0xaa786bf6, 0x22513f1e, 0xaa51a79b, 0x2ad344cc,
-0x7b5a41f0, 0xd37cfbad, 0x1b069505, 0x41ece491, 0xb4c332e6, 0x032268d4, 0xc9600acc, 0xce387e6d,
-0xbf6bb16c, 0x6a70fb78, 0x0d03d9c9, 0xd4df39de, 0xe01063da, 0x4736f464, 0x5ad328d8, 0xb347cc96,
-0x75bb0fc3, 0x98511bfb, 0x4ffbcc35, 0xb58bcf6a, 0xe11f0abc, 0xbfc5fe4a, 0xa70aec10, 0xac39570a,
-0x3f04442f, 0x6188b153, 0xe0397a2e, 0x5727cb79, 0x9ceb418f, 0x1cacd68d, 0x2ad37c96, 0x0175cb9d,
-0xc69dff09, 0xc75b65f0, 0xd9db40d8, 0xec0e7779, 0x4744ead4, 0xb11c3274, 0xdd24cb9e, 0x7e1c54bd,
-0xf01144f9, 0xd2240eb1, 0x9675b3fd, 0xa3ac3755, 0xd47c27af, 0x51c85f4d, 0x56907596, 0xa5bb15e6,
-0x580304f0, 0xca042cf1, 0x011a37ea, 0x8dbfaadb, 0x35ba3e4a, 0x3526ffa0, 0xc37b4d09, 0xbc306ed9,
-0x98a52666, 0x5648f725, 0xff5e569d, 0x0ced63d0, 0x7c63b2cf, 0x700b45e1, 0xd5ea50f1, 0x85a92872,
-0xaf1fbda7, 0xd4234870, 0xa7870bf3, 0x2d3b4d79, 0x42e04198, 0x0cd0ede7, 0x26470db8, 0xf881814c,
-0x474d6ad7, 0x7c0c5e5c, 0xd1231959, 0x381b7298, 0xf5d2f4db, 0xab838653, 0x6e2f1e23, 0x83719c9e,
-0xbd91e046, 0x9a56456e, 0xdc39200c, 0x20c8c571, 0x962bda1c, 0xe1e696ff, 0xb141ab08, 0x7cca89b9,
-0x1a69e783, 0x02cc4843, 0xa2f7c579, 0x429ef47d, 0x427b169c, 0x5ac9f049, 0xdd8f0f00, 0x5c8165bf
-             },
-        S2 = {
-0x1f201094, 0xef0ba75b, 0x69e3cf7e, 0x393f4380, 0xfe61cf7a, 0xeec5207a, 0x55889c94, 0x72fc0651,
-0xada7ef79, 0x4e1d7235, 0xd55a63ce, 0xde0436ba, 0x99c430ef, 0x5f0c0794, 0x18dcdb7d, 0xa1d6eff3,
-0xa0b52f7b, 0x59e83605, 0xee15b094, 0xe9ffd909, 0xdc440086, 0xef944459, 0xba83ccb3, 0xe0c3cdfb,
-0xd1da4181, 0x3b092ab1, 0xf997f1c1, 0xa5e6cf7b, 0x01420ddb, 0xe4e7ef5b, 0x25a1ff41, 0xe180f806,
-0x1fc41080, 0x179bee7a, 0xd37ac6a9, 0xfe5830a4, 0x98de8b7f, 0x77e83f4e, 0x79929269, 0x24fa9f7b,
-0xe113c85b, 0xacc40083, 0xd7503525, 0xf7ea615f, 0x62143154, 0x0d554b63, 0x5d681121, 0xc866c359,
-0x3d63cf73, 0xcee234c0, 0xd4d87e87, 0x5c672b21, 0x071f6181, 0x39f7627f, 0x361e3084, 0xe4eb573b,
-0x602f64a4, 0xd63acd9c, 0x1bbc4635, 0x9e81032d, 0x2701f50c, 0x99847ab4, 0xa0e3df79, 0xba6cf38c,
-0x10843094, 0x2537a95e, 0xf46f6ffe, 0xa1ff3b1f, 0x208cfb6a, 0x8f458c74, 0xd9e0a227, 0x4ec73a34,
-0xfc884f69, 0x3e4de8df, 0xef0e0088, 0x3559648d, 0x8a45388c, 0x1d804366, 0x721d9bfd, 0xa58684bb,
-0xe8256333, 0x844e8212, 0x128d8098, 0xfed33fb4, 0xce280ae1, 0x27e19ba5, 0xd5a6c252, 0xe49754bd,
-0xc5d655dd, 0xeb667064, 0x77840b4d, 0xa1b6a801, 0x84db26a9, 0xe0b56714, 0x21f043b7, 0xe5d05860,
-0x54f03084, 0x066ff472, 0xa31aa153, 0xdadc4755, 0xb5625dbf, 0x68561be6, 0x83ca6b94, 0x2d6ed23b,
-0xeccf01db, 0xa6d3d0ba, 0xb6803d5c, 0xaf77a709, 0x33b4a34c, 0x397bc8d6, 0x5ee22b95, 0x5f0e5304,
-0x81ed6f61, 0x20e74364, 0xb45e1378, 0xde18639b, 0x881ca122, 0xb96726d1, 0x8049a7e8, 0x22b7da7b,
-0x5e552d25, 0x5272d237, 0x79d2951c, 0xc60d894c, 0x488cb402, 0x1ba4fe5b, 0xa4b09f6b, 0x1ca815cf,
-0xa20c3005, 0x8871df63, 0xb9de2fcb, 0x0cc6c9e9, 0x0beeff53, 0xe3214517, 0xb4542835, 0x9f63293c,
-0xee41e729, 0x6e1d2d7c, 0x50045286, 0x1e6685f3, 0xf33401c6, 0x30a22c95, 0x31a70850, 0x60930f13,
-0x73f98417, 0xa1269859, 0xec645c44, 0x52c877a9, 0xcdff33a6, 0xa02b1741, 0x7cbad9a2, 0x2180036f,
-0x50d99c08, 0xcb3f4861, 0xc26bd765, 0x64a3f6ab, 0x80342676, 0x25a75e7b, 0xe4e6d1fc, 0x20c710e6,
-0xcdf0b680, 0x17844d3b, 0x31eef84d, 0x7e0824e4, 0x2ccb49eb, 0x846a3bae, 0x8ff77888, 0xee5d60f6,
-0x7af75673, 0x2fdd5cdb, 0xa11631c1, 0x30f66f43, 0xb3faec54, 0x157fd7fa, 0xef8579cc, 0xd152de58,
-0xdb2ffd5e, 0x8f32ce19, 0x306af97a, 0x02f03ef8, 0x99319ad5, 0xc242fa0f, 0xa7e3ebb0, 0xc68e4906,
-0xb8da230c, 0x80823028, 0xdcdef3c8, 0xd35fb171, 0x088a1bc8, 0xbec0c560, 0x61a3c9e8, 0xbca8f54d,
-0xc72feffa, 0x22822e99, 0x82c570b4, 0xd8d94e89, 0x8b1c34bc, 0x301e16e6, 0x273be979, 0xb0ffeaa6,
-0x61d9b8c6, 0x00b24869, 0xb7ffce3f, 0x08dc283b, 0x43daf65a, 0xf7e19798, 0x7619b72f, 0x8f1c9ba4,
-0xdc8637a0, 0x16a7d3b1, 0x9fc393b7, 0xa7136eeb, 0xc6bcc63e, 0x1a513742, 0xef6828bc, 0x520365d6,
-0x2d6a77ab, 0x3527ed4b, 0x821fd216, 0x095c6e2e, 0xdb92f2fb, 0x5eea29cb, 0x145892f5, 0x91584f7f,
-0x5483697b, 0x2667a8cc, 0x85196048, 0x8c4bacea, 0x833860d4, 0x0d23e0f9, 0x6c387e8a, 0x0ae6d249,
-0xb284600c, 0xd835731d, 0xdcb1c647, 0xac4c56ea, 0x3ebd81b3, 0x230eabb0, 0x6438bc87, 0xf0b5b1fa,
-0x8f5ea2b3, 0xfc184642, 0x0a036b7a, 0x4fb089bd, 0x649da589, 0xa345415e, 0x5c038323, 0x3e5d3bb9,
-0x43d79572, 0x7e6dd07c, 0x06dfdf1e, 0x6c6cc4ef, 0x7160a539, 0x73bfbe70, 0x83877605, 0x4523ecf1
-            },
-        S3 = {
-0x8defc240, 0x25fa5d9f, 0xeb903dbf, 0xe810c907, 0x47607fff, 0x369fe44b, 0x8c1fc644, 0xaececa90,
-0xbeb1f9bf, 0xeefbcaea, 0xe8cf1950, 0x51df07ae, 0x920e8806, 0xf0ad0548, 0xe13c8d83, 0x927010d5,
-0x11107d9f, 0x07647db9, 0xb2e3e4d4, 0x3d4f285e, 0xb9afa820, 0xfade82e0, 0xa067268b, 0x8272792e,
-0x553fb2c0, 0x489ae22b, 0xd4ef9794, 0x125e3fbc, 0x21fffcee, 0x825b1bfd, 0x9255c5ed, 0x1257a240,
-0x4e1a8302, 0xbae07fff, 0x528246e7, 0x8e57140e, 0x3373f7bf, 0x8c9f8188, 0xa6fc4ee8, 0xc982b5a5,
-0xa8c01db7, 0x579fc264, 0x67094f31, 0xf2bd3f5f, 0x40fff7c1, 0x1fb78dfc, 0x8e6bd2c1, 0x437be59b,
-0x99b03dbf, 0xb5dbc64b, 0x638dc0e6, 0x55819d99, 0xa197c81c, 0x4a012d6e, 0xc5884a28, 0xccc36f71,
-0xb843c213, 0x6c0743f1, 0x8309893c, 0x0feddd5f, 0x2f7fe850, 0xd7c07f7e, 0x02507fbf, 0x5afb9a04,
-0xa747d2d0, 0x1651192e, 0xaf70bf3e, 0x58c31380, 0x5f98302e, 0x727cc3c4, 0x0a0fb402, 0x0f7fef82,
-0x8c96fdad, 0x5d2c2aae, 0x8ee99a49, 0x50da88b8, 0x8427f4a0, 0x1eac5790, 0x796fb449, 0x8252dc15,
-0xefbd7d9b, 0xa672597d, 0xada840d8, 0x45f54504, 0xfa5d7403, 0xe83ec305, 0x4f91751a, 0x925669c2,
-0x23efe941, 0xa903f12e, 0x60270df2, 0x0276e4b6, 0x94fd6574, 0x927985b2, 0x8276dbcb, 0x02778176,
-0xf8af918d, 0x4e48f79e, 0x8f616ddf, 0xe29d840e, 0x842f7d83, 0x340ce5c8, 0x96bbb682, 0x93b4b148,
-0xef303cab, 0x984faf28, 0x779faf9b, 0x92dc560d, 0x224d1e20, 0x8437aa88, 0x7d29dc96, 0x2756d3dc,
-0x8b907cee, 0xb51fd240, 0xe7c07ce3, 0xe566b4a1, 0xc3e9615e, 0x3cf8209d, 0x6094d1e3, 0xcd9ca341,
-0x5c76460e, 0x00ea983b, 0xd4d67881, 0xfd47572c, 0xf76cedd9, 0xbda8229c, 0x127dadaa, 0x438a074e,
-0x1f97c090, 0x081bdb8a, 0x93a07ebe, 0xb938ca15, 0x97b03cff, 0x3dc2c0f8, 0x8d1ab2ec, 0x64380e51,
-0x68cc7bfb, 0xd90f2788, 0x12490181, 0x5de5ffd4, 0xdd7ef86a, 0x76a2e214, 0xb9a40368, 0x925d958f,
-0x4b39fffa, 0xba39aee9, 0xa4ffd30b, 0xfaf7933b, 0x6d498623, 0x193cbcfa, 0x27627545, 0x825cf47a,
-0x61bd8ba0, 0xd11e42d1, 0xcead04f4, 0x127ea392, 0x10428db7, 0x8272a972, 0x9270c4a8, 0x127de50b,
-0x285ba1c8, 0x3c62f44f, 0x35c0eaa5, 0xe805d231, 0x428929fb, 0xb4fcdf82, 0x4fb66a53, 0x0e7dc15b,
-0x1f081fab, 0x108618ae, 0xfcfd086d, 0xf9ff2889, 0x694bcc11, 0x236a5cae, 0x12deca4d, 0x2c3f8cc5,
-0xd2d02dfe, 0xf8ef5896, 0xe4cf52da, 0x95155b67, 0x494a488c, 0xb9b6a80c, 0x5c8f82bc, 0x89d36b45,
-0x3a609437, 0xec00c9a9, 0x44715253, 0x0a874b49, 0xd773bc40, 0x7c34671c, 0x02717ef6, 0x4feb5536,
-0xa2d02fff, 0xd2bf60c4, 0xd43f03c0, 0x50b4ef6d, 0x07478cd1, 0x006e1888, 0xa2e53f55, 0xb9e6d4bc,
-0xa2048016, 0x97573833, 0xd7207d67, 0xde0f8f3d, 0x72f87b33, 0xabcc4f33, 0x7688c55d, 0x7b00a6b0,
-0x947b0001, 0x570075d2, 0xf9bb88f8, 0x8942019e, 0x4264a5ff, 0x856302e0, 0x72dbd92b, 0xee971b69,
-0x6ea22fde, 0x5f08ae2b, 0xaf7a616d, 0xe5c98767, 0xcf1febd2, 0x61efc8c2, 0xf1ac2571, 0xcc8239c2,
-0x67214cb8, 0xb1e583d1, 0xb7dc3e62, 0x7f10bdce, 0xf90a5c38, 0x0ff0443d, 0x606e6dc6, 0x60543a49,
-0x5727c148, 0x2be98a1d, 0x8ab41738, 0x20e1be24, 0xaf96da0f, 0x68458425, 0x99833be5, 0x600d457d,
-0x282f9350, 0x8334b362, 0xd91d1120, 0x2b6d8da0, 0x642b1e31, 0x9c305a00, 0x52bce688, 0x1b03588a,
-0xf7baefd5, 0x4142ed9c, 0xa4315c11, 0x83323ec5, 0xdfef4636, 0xa133c501, 0xe9d3531c, 0xee353783
-            },
-        S4 = {
-0x9db30420, 0x1fb6e9de, 0xa7be7bef, 0xd273a298, 0x4a4f7bdb, 0x64ad8c57, 0x85510443, 0xfa020ed1,
-0x7e287aff, 0xe60fb663, 0x095f35a1, 0x79ebf120, 0xfd059d43, 0x6497b7b1, 0xf3641f63, 0x241e4adf,
-0x28147f5f, 0x4fa2b8cd, 0xc9430040, 0x0cc32220, 0xfdd30b30, 0xc0a5374f, 0x1d2d00d9, 0x24147b15,
-0xee4d111a, 0x0fca5167, 0x71ff904c, 0x2d195ffe, 0x1a05645f, 0x0c13fefe, 0x081b08ca, 0x05170121,
-0x80530100, 0xe83e5efe, 0xac9af4f8, 0x7fe72701, 0xd2b8ee5f, 0x06df4261, 0xbb9e9b8a, 0x7293ea25,
-0xce84ffdf, 0xf5718801, 0x3dd64b04, 0xa26f263b, 0x7ed48400, 0x547eebe6, 0x446d4ca0, 0x6cf3d6f5,
-0x2649abdf, 0xaea0c7f5, 0x36338cc1, 0x503f7e93, 0xd3772061, 0x11b638e1, 0x72500e03, 0xf80eb2bb,
-0xabe0502e, 0xec8d77de, 0x57971e81, 0xe14f6746, 0xc9335400, 0x6920318f, 0x081dbb99, 0xffc304a5,
-0x4d351805, 0x7f3d5ce3, 0xa6c866c6, 0x5d5bcca9, 0xdaec6fea, 0x9f926f91, 0x9f46222f, 0x3991467d,
-0xa5bf6d8e, 0x1143c44f, 0x43958302, 0xd0214eeb, 0x022083b8, 0x3fb6180c, 0x18f8931e, 0x281658e6,
-0x26486e3e, 0x8bd78a70, 0x7477e4c1, 0xb506e07c, 0xf32d0a25, 0x79098b02, 0xe4eabb81, 0x28123b23,
-0x69dead38, 0x1574ca16, 0xdf871b62, 0x211c40b7, 0xa51a9ef9, 0x0014377b, 0x041e8ac8, 0x09114003,
-0xbd59e4d2, 0xe3d156d5, 0x4fe876d5, 0x2f91a340, 0x557be8de, 0x00eae4a7, 0x0ce5c2ec, 0x4db4bba6,
-0xe756bdff, 0xdd3369ac, 0xec17b035, 0x06572327, 0x99afc8b0, 0x56c8c391, 0x6b65811c, 0x5e146119,
-0x6e85cb75, 0xbe07c002, 0xc2325577, 0x893ff4ec, 0x5bbfc92d, 0xd0ec3b25, 0xb7801ab7, 0x8d6d3b24,
-0x20c763ef, 0xc366a5fc, 0x9c382880, 0x0ace3205, 0xaac9548a, 0xeca1d7c7, 0x041afa32, 0x1d16625a,
-0x6701902c, 0x9b757a54, 0x31d477f7, 0x9126b031, 0x36cc6fdb, 0xc70b8b46, 0xd9e66a48, 0x56e55a79,
-0x026a4ceb, 0x52437eff, 0x2f8f76b4, 0x0df980a5, 0x8674cde3, 0xedda04eb, 0x17a9be04, 0x2c18f4df,
-0xb7747f9d, 0xab2af7b4, 0xefc34d20, 0x2e096b7c, 0x1741a254, 0xe5b6a035, 0x213d42f6, 0x2c1c7c26,
-0x61c2f50f, 0x6552daf9, 0xd2c231f8, 0x25130f69, 0xd8167fa2, 0x0418f2c8, 0x001a96a6, 0x0d1526ab,
-0x63315c21, 0x5e0a72ec, 0x49bafefd, 0x187908d9, 0x8d0dbd86, 0x311170a7, 0x3e9b640c, 0xcc3e10d7,
-0xd5cad3b6, 0x0caec388, 0xf73001e1, 0x6c728aff, 0x71eae2a1, 0x1f9af36e, 0xcfcbd12f, 0xc1de8417,
-0xac07be6b, 0xcb44a1d8, 0x8b9b0f56, 0x013988c3, 0xb1c52fca, 0xb4be31cd, 0xd8782806, 0x12a3a4e2,
-0x6f7de532, 0x58fd7eb6, 0xd01ee900, 0x24adffc2, 0xf4990fc5, 0x9711aac5, 0x001d7b95, 0x82e5e7d2,
-0x109873f6, 0x00613096, 0xc32d9521, 0xada121ff, 0x29908415, 0x7fbb977f, 0xaf9eb3db, 0x29c9ed2a,
-0x5ce2a465, 0xa730f32c, 0xd0aa3fe8, 0x8a5cc091, 0xd49e2ce7, 0x0ce454a9, 0xd60acd86, 0x015f1919,
-0x77079103, 0xdea03af6, 0x78a8565e, 0xdee356df, 0x21f05cbe, 0x8b75e387, 0xb3c50651, 0xb8a5c3ef,
-0xd8eeb6d2, 0xe523be77, 0xc2154529, 0x2f69efdf, 0xafe67afb, 0xf470c4b2, 0xf3e0eb5b, 0xd6cc9876,
-0x39e4460c, 0x1fda8538, 0x1987832f, 0xca007367, 0xa99144f8, 0x296b299e, 0x492fc295, 0x9266beab,
-0xb5676e69, 0x9bd3ddda, 0xdf7e052f, 0xdb25701c, 0x1b5e51ee, 0xf65324e6, 0x6afce36c, 0x0316cc04,
-0x8644213e, 0xb7dc59d0, 0x7965291f, 0xccd6fd43, 0x41823979, 0x932bcdf6, 0xb657c34d, 0x4edfd282,
-0x7ae5290c, 0x3cb9536b, 0x851e20fe, 0x9833557e, 0x13ecf0b0, 0xd3ffb372, 0x3f85c5c1, 0x0aef7ed2
-            },
-        S5 = {
-0x7ec90c04, 0x2c6e74b9, 0x9b0e66df, 0xa6337911, 0xb86a7fff, 0x1dd358f5, 0x44dd9d44, 0x1731167f,
-0x08fbf1fa, 0xe7f511cc, 0xd2051b00, 0x735aba00, 0x2ab722d8, 0x386381cb, 0xacf6243a, 0x69befd7a,
-0xe6a2e77f, 0xf0c720cd, 0xc4494816, 0xccf5c180, 0x38851640, 0x15b0a848, 0xe68b18cb, 0x4caadeff,
-0x5f480a01, 0x0412b2aa, 0x259814fc, 0x41d0efe2, 0x4e40b48d, 0x248eb6fb, 0x8dba1cfe, 0x41a99b02,
-0x1a550a04, 0xba8f65cb, 0x7251f4e7, 0x95a51725, 0xc106ecd7, 0x97a5980a, 0xc539b9aa, 0x4d79fe6a,
-0xf2f3f763, 0x68af8040, 0xed0c9e56, 0x11b4958b, 0xe1eb5a88, 0x8709e6b0, 0xd7e07156, 0x4e29fea7,
-0x6366e52d, 0x02d1c000, 0xc4ac8e05, 0x9377f571, 0x0c05372a, 0x578535f2, 0x2261be02, 0xd642a0c9,
-0xdf13a280, 0x74b55bd2, 0x682199c0, 0xd421e5ec, 0x53fb3ce8, 0xc8adedb3, 0x28a87fc9, 0x3d959981,
-0x5c1ff900, 0xfe38d399, 0x0c4eff0b, 0x062407ea, 0xaa2f4fb1, 0x4fb96976, 0x90c79505, 0xb0a8a774,
-0xef55a1ff, 0xe59ca2c2, 0xa6b62d27, 0xe66a4263, 0xdf65001f, 0x0ec50966, 0xdfdd55bc, 0x29de0655,
-0x911e739a, 0x17af8975, 0x32c7911c, 0x89f89468, 0x0d01e980, 0x524755f4, 0x03b63cc9, 0x0cc844b2,
-0xbcf3f0aa, 0x87ac36e9, 0xe53a7426, 0x01b3d82b, 0x1a9e7449, 0x64ee2d7e, 0xcddbb1da, 0x01c94910,
-0xb868bf80, 0x0d26f3fd, 0x9342ede7, 0x04a5c284, 0x636737b6, 0x50f5b616, 0xf24766e3, 0x8eca36c1,
-0x136e05db, 0xfef18391, 0xfb887a37, 0xd6e7f7d4, 0xc7fb7dc9, 0x3063fcdf, 0xb6f589de, 0xec2941da,
-0x26e46695, 0xb7566419, 0xf654efc5, 0xd08d58b7, 0x48925401, 0xc1bacb7f, 0xe5ff550f, 0xb6083049,
-0x5bb5d0e8, 0x87d72e5a, 0xab6a6ee1, 0x223a66ce, 0xc62bf3cd, 0x9e0885f9, 0x68cb3e47, 0x086c010f,
-0xa21de820, 0xd18b69de, 0xf3f65777, 0xfa02c3f6, 0x407edac3, 0xcbb3d550, 0x1793084d, 0xb0d70eba,
-0x0ab378d5, 0xd951fb0c, 0xded7da56, 0x4124bbe4, 0x94ca0b56, 0x0f5755d1, 0xe0e1e56e, 0x6184b5be,
-0x580a249f, 0x94f74bc0, 0xe327888e, 0x9f7b5561, 0xc3dc0280, 0x05687715, 0x646c6bd7, 0x44904db3,
-0x66b4f0a3, 0xc0f1648a, 0x697ed5af, 0x49e92ff6, 0x309e374f, 0x2cb6356a, 0x85808573, 0x4991f840,
-0x76f0ae02, 0x083be84d, 0x28421c9a, 0x44489406, 0x736e4cb8, 0xc1092910, 0x8bc95fc6, 0x7d869cf4,
-0x134f616f, 0x2e77118d, 0xb31b2be1, 0xaa90b472, 0x3ca5d717, 0x7d161bba, 0x9cad9010, 0xaf462ba2,
-0x9fe459d2, 0x45d34559, 0xd9f2da13, 0xdbc65487, 0xf3e4f94e, 0x176d486f, 0x097c13ea, 0x631da5c7,
-0x445f7382, 0x175683f4, 0xcdc66a97, 0x70be0288, 0xb3cdcf72, 0x6e5dd2f3, 0x20936079, 0x459b80a5,
-0xbe60e2db, 0xa9c23101, 0xeba5315c, 0x224e42f2, 0x1c5c1572, 0xf6721b2c, 0x1ad2fff3, 0x8c25404e,
-0x324ed72f, 0x4067b7fd, 0x0523138e, 0x5ca3bc78, 0xdc0fd66e, 0x75922283, 0x784d6b17, 0x58ebb16e,
-0x44094f85, 0x3f481d87, 0xfcfeae7b, 0x77b5ff76, 0x8c2302bf, 0xaaf47556, 0x5f46b02a, 0x2b092801,
-0x3d38f5f7, 0x0ca81f36, 0x52af4a8a, 0x66d5e7c0, 0xdf3b0874, 0x95055110, 0x1b5ad7a8, 0xf61ed5ad,
-0x6cf6e479, 0x20758184, 0xd0cefa65, 0x88f7be58, 0x4a046826, 0x0ff6f8f3, 0xa09c7f70, 0x5346aba0,
-0x5ce96c28, 0xe176eda3, 0x6bac307f, 0x376829d2, 0x85360fa9, 0x17e3fe2a, 0x24b79767, 0xf5a96b20,
-0xd6cd2595, 0x68ff1ebf, 0x7555442c, 0xf19f06be, 0xf9e0659a, 0xeeb9491d, 0x34010718, 0xbb30cab8,
-0xe822fe15, 0x88570983, 0x750e6249, 0xda627e55, 0x5e76ffa8, 0xb1534546, 0x6d47de08, 0xefe9e7d4
-            },
-        S6 = {
-0xf6fa8f9d, 0x2cac6ce1, 0x4ca34867, 0xe2337f7c, 0x95db08e7, 0x016843b4, 0xeced5cbc, 0x325553ac,
-0xbf9f0960, 0xdfa1e2ed, 0x83f0579d, 0x63ed86b9, 0x1ab6a6b8, 0xde5ebe39, 0xf38ff732, 0x8989b138,
-0x33f14961, 0xc01937bd, 0xf506c6da, 0xe4625e7e, 0xa308ea99, 0x4e23e33c, 0x79cbd7cc, 0x48a14367,
-0xa3149619, 0xfec94bd5, 0xa114174a, 0xeaa01866, 0xa084db2d, 0x09a8486f, 0xa888614a, 0x2900af98,
-0x01665991, 0xe1992863, 0xc8f30c60, 0x2e78ef3c, 0xd0d51932, 0xcf0fec14, 0xf7ca07d2, 0xd0a82072,
-0xfd41197e, 0x9305a6b0, 0xe86be3da, 0x74bed3cd, 0x372da53c, 0x4c7f4448, 0xdab5d440, 0x6dba0ec3,
-0x083919a7, 0x9fbaeed9, 0x49dbcfb0, 0x4e670c53, 0x5c3d9c01, 0x64bdb941, 0x2c0e636a, 0xba7dd9cd,
-0xea6f7388, 0xe70bc762, 0x35f29adb, 0x5c4cdd8d, 0xf0d48d8c, 0xb88153e2, 0x08a19866, 0x1ae2eac8,
-0x284caf89, 0xaa928223, 0x9334be53, 0x3b3a21bf, 0x16434be3, 0x9aea3906, 0xefe8c36e, 0xf890cdd9,
-0x80226dae, 0xc340a4a3, 0xdf7e9c09, 0xa694a807, 0x5b7c5ecc, 0x221db3a6, 0x9a69a02f, 0x68818a54,
-0xceb2296f, 0x53c0843a, 0xfe893655, 0x25bfe68a, 0xb4628abc, 0xcf222ebf, 0x25ac6f48, 0xa9a99387,
-0x53bddb65, 0xe76ffbe7, 0xe967fd78, 0x0ba93563, 0x8e342bc1, 0xe8a11be9, 0x4980740d, 0xc8087dfc,
-0x8de4bf99, 0xa11101a0, 0x7fd37975, 0xda5a26c0, 0xe81f994f, 0x9528cd89, 0xfd339fed, 0xb87834bf,
-0x5f04456d, 0x22258698, 0xc9c4c83b, 0x2dc156be, 0x4f628daa, 0x57f55ec5, 0xe2220abe, 0xd2916ebf,
-0x4ec75b95, 0x24f2c3c0, 0x42d15d99, 0xcd0d7fa0, 0x7b6e27ff, 0xa8dc8af0, 0x7345c106, 0xf41e232f,
-0x35162386, 0xe6ea8926, 0x3333b094, 0x157ec6f2, 0x372b74af, 0x692573e4, 0xe9a9d848, 0xf3160289,
-0x3a62ef1d, 0xa787e238, 0xf3a5f676, 0x74364853, 0x20951063, 0x4576698d, 0xb6fad407, 0x592af950,
-0x36f73523, 0x4cfb6e87, 0x7da4cec0, 0x6c152daa, 0xcb0396a8, 0xc50dfe5d, 0xfcd707ab, 0x0921c42f,
-0x89dff0bb, 0x5fe2be78, 0x448f4f33, 0x754613c9, 0x2b05d08d, 0x48b9d585, 0xdc049441, 0xc8098f9b,
-0x7dede786, 0xc39a3373, 0x42410005, 0x6a091751, 0x0ef3c8a6, 0x890072d6, 0x28207682, 0xa9a9f7be,
-0xbf32679d, 0xd45b5b75, 0xb353fd00, 0xcbb0e358, 0x830f220a, 0x1f8fb214, 0xd372cf08, 0xcc3c4a13,
-0x8cf63166, 0x061c87be, 0x88c98f88, 0x6062e397, 0x47cf8e7a, 0xb6c85283, 0x3cc2acfb, 0x3fc06976,
-0x4e8f0252, 0x64d8314d, 0xda3870e3, 0x1e665459, 0xc10908f0, 0x513021a5, 0x6c5b68b7, 0x822f8aa0,
-0x3007cd3e, 0x74719eef, 0xdc872681, 0x073340d4, 0x7e432fd9, 0x0c5ec241, 0x8809286c, 0xf592d891,
-0x08a930f6, 0x957ef305, 0xb7fbffbd, 0xc266e96f, 0x6fe4ac98, 0xb173ecc0, 0xbc60b42a, 0x953498da,
-0xfba1ae12, 0x2d4bd736, 0x0f25faab, 0xa4f3fceb, 0xe2969123, 0x257f0c3d, 0x9348af49, 0x361400bc,
-0xe8816f4a, 0x3814f200, 0xa3f94043, 0x9c7a54c2, 0xbc704f57, 0xda41e7f9, 0xc25ad33a, 0x54f4a084,
-0xb17f5505, 0x59357cbe, 0xedbd15c8, 0x7f97c5ab, 0xba5ac7b5, 0xb6f6deaf, 0x3a479c3a, 0x5302da25,
-0x653d7e6a, 0x54268d49, 0x51a477ea, 0x5017d55b, 0xd7d25d88, 0x44136c76, 0x0404a8c8, 0xb8e5a121,
-0xb81a928a, 0x60ed5869, 0x97c55b96, 0xeaec991b, 0x29935913, 0x01fdb7f1, 0x088e8dfa, 0x9ab6f6f5,
-0x3b4cbf9f, 0x4a5de3ab, 0xe6051d35, 0xa0e1d855, 0xd36b4cf1, 0xf544edeb, 0xb0e93524, 0xbebb8fbd,
-0xa2d762cf, 0x49c92f54, 0x38b5f331, 0x7128a454, 0x48392905, 0xa65b1db8, 0x851c97bd, 0xd675cf2f 
-            },
-        S7 = {
-0x85e04019, 0x332bf567, 0x662dbfff, 0xcfc65693, 0x2a8d7f6f, 0xab9bc912, 0xde6008a1, 0x2028da1f,
-0x0227bce7, 0x4d642916, 0x18fac300, 0x50f18b82, 0x2cb2cb11, 0xb232e75c, 0x4b3695f2, 0xb28707de,
-0xa05fbcf6, 0xcd4181e9, 0xe150210c, 0xe24ef1bd, 0xb168c381, 0xfde4e789, 0x5c79b0d8, 0x1e8bfd43,
-0x4d495001, 0x38be4341, 0x913cee1d, 0x92a79c3f, 0x089766be, 0xbaeeadf4, 0x1286becf, 0xb6eacb19,
-0x2660c200, 0x7565bde4, 0x64241f7a, 0x8248dca9, 0xc3b3ad66, 0x28136086, 0x0bd8dfa8, 0x356d1cf2,
-0x107789be, 0xb3b2e9ce, 0x0502aa8f, 0x0bc0351e, 0x166bf52a, 0xeb12ff82, 0xe3486911, 0xd34d7516,
-0x4e7b3aff, 0x5f43671b, 0x9cf6e037, 0x4981ac83, 0x334266ce, 0x8c9341b7, 0xd0d854c0, 0xcb3a6c88,
-0x47bc2829, 0x4725ba37, 0xa66ad22b, 0x7ad61f1e, 0x0c5cbafa, 0x4437f107, 0xb6e79962, 0x42d2d816,
-0x0a961288, 0xe1a5c06e, 0x13749e67, 0x72fc081a, 0xb1d139f7, 0xf9583745, 0xcf19df58, 0xbec3f756,
-0xc06eba30, 0x07211b24, 0x45c28829, 0xc95e317f, 0xbc8ec511, 0x38bc46e9, 0xc6e6fa14, 0xbae8584a,
-0xad4ebc46, 0x468f508b, 0x7829435f, 0xf124183b, 0x821dba9f, 0xaff60ff4, 0xea2c4e6d, 0x16e39264,
-0x92544a8b, 0x009b4fc3, 0xaba68ced, 0x9ac96f78, 0x06a5b79a, 0xb2856e6e, 0x1aec3ca9, 0xbe838688,
-0x0e0804e9, 0x55f1be56, 0xe7e5363b, 0xb3a1f25d, 0xf7debb85, 0x61fe033c, 0x16746233, 0x3c034c28,
-0xda6d0c74, 0x79aac56c, 0x3ce4e1ad, 0x51f0c802, 0x98f8f35a, 0x1626a49f, 0xeed82b29, 0x1d382fe3,
-0x0c4fb99a, 0xbb325778, 0x3ec6d97b, 0x6e77a6a9, 0xcb658b5c, 0xd45230c7, 0x2bd1408b, 0x60c03eb7,
-0xb9068d78, 0xa33754f4, 0xf430c87d, 0xc8a71302, 0xb96d8c32, 0xebd4e7be, 0xbe8b9d2d, 0x7979fb06,
-0xe7225308, 0x8b75cf77, 0x11ef8da4, 0xe083c858, 0x8d6b786f, 0x5a6317a6, 0xfa5cf7a0, 0x5dda0033,
-0xf28ebfb0, 0xf5b9c310, 0xa0eac280, 0x08b9767a, 0xa3d9d2b0, 0x79d34217, 0x021a718d, 0x9ac6336a,
-0x2711fd60, 0x438050e3, 0x069908a8, 0x3d7fedc4, 0x826d2bef, 0x4eeb8476, 0x488dcf25, 0x36c9d566,
-0x28e74e41, 0xc2610aca, 0x3d49a9cf, 0xbae3b9df, 0xb65f8de6, 0x92aeaf64, 0x3ac7d5e6, 0x9ea80509,
-0xf22b017d, 0xa4173f70, 0xdd1e16c3, 0x15e0d7f9, 0x50b1b887, 0x2b9f4fd5, 0x625aba82, 0x6a017962,
-0x2ec01b9c, 0x15488aa9, 0xd716e740, 0x40055a2c, 0x93d29a22, 0xe32dbf9a, 0x058745b9, 0x3453dc1e,
-0xd699296e, 0x496cff6f, 0x1c9f4986, 0xdfe2ed07, 0xb87242d1, 0x19de7eae, 0x053e561a, 0x15ad6f8c,
-0x66626c1c, 0x7154c24c, 0xea082b2a, 0x93eb2939, 0x17dcb0f0, 0x58d4f2ae, 0x9ea294fb, 0x52cf564c,
-0x9883fe66, 0x2ec40581, 0x763953c3, 0x01d6692e, 0xd3a0c108, 0xa1e7160e, 0xe4f2dfa6, 0x693ed285,
-0x74904698, 0x4c2b0edd, 0x4f757656, 0x5d393378, 0xa132234f, 0x3d321c5d, 0xc3f5e194, 0x4b269301,
-0xc79f022f, 0x3c997e7e, 0x5e4f9504, 0x3ffafbbd, 0x76f7ad0e, 0x296693f4, 0x3d1fce6f, 0xc61e45be,
-0xd3b5ab34, 0xf72bf9b7, 0x1b0434c0, 0x4e72b567, 0x5592a33d, 0xb5229301, 0xcfd2a87f, 0x60aeb767,
-0x1814386b, 0x30bcc33d, 0x38a0c07d, 0xfd1606f2, 0xc363519b, 0x589dd390, 0x5479f8e6, 0x1cb8d647,
-0x97fd61a9, 0xea7759f4, 0x2d57539d, 0x569a58cf, 0xe84e63ad, 0x462e1b78, 0x6580f87e, 0xf3817914,
-0x91da55f4, 0x40a230f3, 0xd1988f35, 0xb6e318d2, 0x3ffa50bc, 0x3d40f021, 0xc3c0bdae, 0x4958c24c,
-0x518f36b2, 0x84b1d370, 0x0fedce83, 0x878ddada, 0xf2a279c7, 0x94e01be8, 0x90716f4b, 0x954b8aa3 
-            },
-        S8 = {
-0xe216300d, 0xbbddfffc, 0xa7ebdabd, 0x35648095, 0x7789f8b7, 0xe6c1121b, 0x0e241600, 0x052ce8b5,
-0x11a9cfb0, 0xe5952f11, 0xece7990a, 0x9386d174, 0x2a42931c, 0x76e38111, 0xb12def3a, 0x37ddddfc,
-0xde9adeb1, 0x0a0cc32c, 0xbe197029, 0x84a00940, 0xbb243a0f, 0xb4d137cf, 0xb44e79f0, 0x049eedfd,
-0x0b15a15d, 0x480d3168, 0x8bbbde5a, 0x669ded42, 0xc7ece831, 0x3f8f95e7, 0x72df191b, 0x7580330d,
-0x94074251, 0x5c7dcdfa, 0xabbe6d63, 0xaa402164, 0xb301d40a, 0x02e7d1ca, 0x53571dae, 0x7a3182a2,
-0x12a8ddec, 0xfdaa335d, 0x176f43e8, 0x71fb46d4, 0x38129022, 0xce949ad4, 0xb84769ad, 0x965bd862,
-0x82f3d055, 0x66fb9767, 0x15b80b4e, 0x1d5b47a0, 0x4cfde06f, 0xc28ec4b8, 0x57e8726e, 0x647a78fc,
-0x99865d44, 0x608bd593, 0x6c200e03, 0x39dc5ff6, 0x5d0b00a3, 0xae63aff2, 0x7e8bd632, 0x70108c0c,
-0xbbd35049, 0x2998df04, 0x980cf42a, 0x9b6df491, 0x9e7edd53, 0x06918548, 0x58cb7e07, 0x3b74ef2e,
-0x522fffb1, 0xd24708cc, 0x1c7e27cd, 0xa4eb215b, 0x3cf1d2e2, 0x19b47a38, 0x424f7618, 0x35856039,
-0x9d17dee7, 0x27eb35e6, 0xc9aff67b, 0x36baf5b8, 0x09c467cd, 0xc18910b1, 0xe11dbf7b, 0x06cd1af8,
-0x7170c608, 0x2d5e3354, 0xd4de495a, 0x64c6d006, 0xbcc0c62c, 0x3dd00db3, 0x708f8f34, 0x77d51b42,
-0x264f620f, 0x24b8d2bf, 0x15c1b79e, 0x46a52564, 0xf8d7e54e, 0x3e378160, 0x7895cda5, 0x859c15a5,
-0xe6459788, 0xc37bc75f, 0xdb07ba0c, 0x0676a3ab, 0x7f229b1e, 0x31842e7b, 0x24259fd7, 0xf8bef472,
-0x835ffcb8, 0x6df4c1f2, 0x96f5b195, 0xfd0af0fc, 0xb0fe134c, 0xe2506d3d, 0x4f9b12ea, 0xf215f225,
-0xa223736f, 0x9fb4c428, 0x25d04979, 0x34c713f8, 0xc4618187, 0xea7a6e98, 0x7cd16efc, 0x1436876c,
-0xf1544107, 0xbedeee14, 0x56e9af27, 0xa04aa441, 0x3cf7c899, 0x92ecbae6, 0xdd67016d, 0x151682eb,
-0xa842eedf, 0xfdba60b4, 0xf1907b75, 0x20e3030f, 0x24d8c29e, 0xe139673b, 0xefa63fb8, 0x71873054,
-0xb6f2cf3b, 0x9f326442, 0xcb15a4cc, 0xb01a4504, 0xf1e47d8d, 0x844a1be5, 0xbae7dfdc, 0x42cbda70,
-0xcd7dae0a, 0x57e85b7a, 0xd53f5af6, 0x20cf4d8c, 0xcea4d428, 0x79d130a4, 0x3486ebfb, 0x33d3cddc,
-0x77853b53, 0x37effcb5, 0xc5068778, 0xe580b3e6, 0x4e68b8f4, 0xc5c8b37e, 0x0d809ea2, 0x398feb7c,
-0x132a4f94, 0x43b7950e, 0x2fee7d1c, 0x223613bd, 0xdd06caa2, 0x37df932b, 0xc4248289, 0xacf3ebc3,
-0x5715f6b7, 0xef3478dd, 0xf267616f, 0xc148cbe4, 0x9052815e, 0x5e410fab, 0xb48a2465, 0x2eda7fa4,
-0xe87b40e4, 0xe98ea084, 0x5889e9e1, 0xefd390fc, 0xdd07d35b, 0xdb485694, 0x38d7e5b2, 0x57720101,
-0x730edebc, 0x5b643113, 0x94917e4f, 0x503c2fba, 0x646f1282, 0x7523d24a, 0xe0779695, 0xf9c17a8f,
-0x7a5b2121, 0xd187b896, 0x29263a4d, 0xba510cdf, 0x81f47c9f, 0xad1163ed, 0xea7b5965, 0x1a00726e,
-0x11403092, 0x00da6d77, 0x4a0cdd61, 0xad1f4603, 0x605bdfb0, 0x9eedc364, 0x22ebe6a8, 0xcee7d28a,
-0xa0e736a0, 0x5564a6b9, 0x10853209, 0xc7eb8f37, 0x2de705ca, 0x8951570f, 0xdf09822b, 0xbd691a6c,
-0xaa12e4f2, 0x87451c0f, 0xe0f6a27a, 0x3ada4819, 0x4cf1764f, 0x0d771c2b, 0x67cdb156, 0x350d8384,
-0x5938fa0f, 0x42399ef3, 0x36997b07, 0x0e84093d, 0x4aa93e61, 0x8360d87b, 0x1fa98b0c, 0x1149382c,
-0xe97625a5, 0x0614d1b7, 0x0e25244b, 0x0c768347, 0x589e8d82, 0x0d2059d1, 0xa466bb1e, 0xf8da0a82,
-0x04f19130, 0xba6e4ec0, 0x99265164, 0x1ee7230d, 0x50b2ad80, 0xeaee6801, 0x8db2a283, 0xea8bf59e 
-            };
-
-    //====================================
-    // Useful constants
-    //====================================
-
-    protected static final int    MAX_ROUNDS = 16;
-    protected static final int    RED_ROUNDS = 12;
-
-    protected static final int    BLOCK_SIZE = 8;  // bytes = 64 bits
-
-    protected int _Kr[] = new int[17];        // the rotating round key
-    protected int _Km[] = new int[17];        // the masking round key
-
-    private boolean _encrypting = false;
-
-    private byte[]  _workingKey = null;
-    private int     _rounds = MAX_ROUNDS;
-
-    public CAST5Engine()
-    {
-    }
-
-    /**
-     * initialise a CAST cipher.
-     *
-     * @param encrypting whether or not we are for encryption.
-     * @param params the parameters required to set up the cipher.
-     * @exception IllegalArgumentException if the params argument is
-     * inappropriate.
-     */
-    public void init(
-        boolean             encrypting,
-        CipherParameters    params)
-    {
-        if (params instanceof KeyParameter)
-        {
-            _encrypting = encrypting;
-            _workingKey = ((KeyParameter)params).getKey();
-
-            setKey(_workingKey);
-
-            return;
-        }
-
-        throw new IllegalArgumentException("Invalid parameter passed to "+getAlgorithmName()+" init - " + params.getClass().getName());
-    }
-
-    public String getAlgorithmName()
-    {
-        return "CAST5";
-    }
-
-    public int processBlock(
-        byte[] in,
-        int inOff,
-        byte[] out,
-        int outOff)
-    {
-        if (_workingKey == null)
-        {
-            throw new IllegalStateException(getAlgorithmName()+" not initialised");
-        }
-
-        int blockSize = getBlockSize();
-        if ((inOff + blockSize) > in.length)
-        {
-            throw new DataLengthException("Input buffer too short");
-        }
-
-        if ((outOff + blockSize) > out.length)
-        {
-            throw new OutputLengthException("Output buffer too short");
-        }
-
-        if (_encrypting)
-        {
-            return encryptBlock(in, inOff, out, outOff);
-        }
-        else
-        {    
-            return decryptBlock(in, inOff, out, outOff);
-        }
-    }
-
-    public void reset()
-    {
-    }
-
-    public int getBlockSize()
-    {
-        return BLOCK_SIZE;
-    }
-
-    //==================================
-    // Private Implementation
-    //==================================
-
-    /*
-     * Creates the subkeys using the same nomenclature
-     * as described in RFC2144.
-     *
-     * See section 2.4
-     */
-    protected void setKey(byte[] key)
-    {
-        /* 
-         * Determine the key size here, if required
-         *
-         * if keysize <= 80bits, use 12 rounds instead of 16
-         * if keysize < 128bits, pad with 0
-         *
-         * Typical key sizes => 40, 64, 80, 128
-         */
-
-        if (key.length < 11)
-        {
-            _rounds = RED_ROUNDS;
-        }
-
-        int z[] = new int[16];
-        int x[] = new int[16];
-
-        int z03, z47, z8B, zCF;
-        int x03, x47, x8B, xCF;
-
-        /* copy the key into x */
-        for (int i=0; i< key.length; i++) 
-        { 
-            x[i] = key[i] & 0xff; 
-        }
-
-        /*
-         * This will look different because the selection of
-         * bytes from the input key I've already chosen the
-         * correct int.
-         */
-        x03 = IntsTo32bits(x, 0x0);
-        x47 = IntsTo32bits(x, 0x4);
-        x8B = IntsTo32bits(x, 0x8);
-        xCF = IntsTo32bits(x, 0xC);
-
-        z03 = x03 ^S5[x[0xD]] ^S6[x[0xF]] ^S7[x[0xC]] ^S8[x[0xE]] ^S7[x[0x8]];
-
-        Bits32ToInts(z03, z, 0x0);
-        z47 = x8B ^S5[z[0x0]] ^S6[z[0x2]] ^S7[z[0x1]] ^S8[z[0x3]] ^S8[x[0xA]];
-        Bits32ToInts(z47, z, 0x4);
-        z8B = xCF ^S5[z[0x7]] ^S6[z[0x6]] ^S7[z[0x5]] ^S8[z[0x4]] ^S5[x[0x9]];
-        Bits32ToInts(z8B, z, 0x8);
-        zCF = x47 ^S5[z[0xA]] ^S6[z[0x9]] ^S7[z[0xB]] ^S8[z[0x8]] ^S6[x[0xB]];
-        Bits32ToInts(zCF, z, 0xC);
-        _Km[ 1]= S5[z[0x8]] ^ S6[z[0x9]] ^ S7[z[0x7]] ^ S8[z[0x6]] ^ S5[z[0x2]];
-        _Km[ 2]= S5[z[0xA]] ^ S6[z[0xB]] ^ S7[z[0x5]] ^ S8[z[0x4]] ^ S6[z[0x6]];
-        _Km[ 3]= S5[z[0xC]] ^ S6[z[0xD]] ^ S7[z[0x3]] ^ S8[z[0x2]] ^ S7[z[0x9]];
-        _Km[ 4]= S5[z[0xE]] ^ S6[z[0xF]] ^ S7[z[0x1]] ^ S8[z[0x0]] ^ S8[z[0xC]];
-
-        z03 = IntsTo32bits(z, 0x0);
-        z47 = IntsTo32bits(z, 0x4);
-        z8B = IntsTo32bits(z, 0x8);
-        zCF = IntsTo32bits(z, 0xC);
-        x03 = z8B ^S5[z[0x5]] ^S6[z[0x7]] ^S7[z[0x4]] ^S8[z[0x6]] ^S7[z[0x0]];
-        Bits32ToInts(x03, x, 0x0);
-        x47 = z03 ^S5[x[0x0]] ^S6[x[0x2]] ^S7[x[0x1]] ^S8[x[0x3]] ^S8[z[0x2]];
-        Bits32ToInts(x47, x, 0x4);
-        x8B = z47 ^S5[x[0x7]] ^S6[x[0x6]] ^S7[x[0x5]] ^S8[x[0x4]] ^S5[z[0x1]];
-        Bits32ToInts(x8B, x, 0x8);
-        xCF = zCF ^S5[x[0xA]] ^S6[x[0x9]] ^S7[x[0xB]] ^S8[x[0x8]] ^S6[z[0x3]];
-        Bits32ToInts(xCF, x, 0xC);
-        _Km[ 5]= S5[x[0x3]] ^ S6[x[0x2]] ^ S7[x[0xC]] ^ S8[x[0xD]] ^ S5[x[0x8]];
-        _Km[ 6]= S5[x[0x1]] ^ S6[x[0x0]] ^ S7[x[0xE]] ^ S8[x[0xF]] ^ S6[x[0xD]];
-        _Km[ 7]= S5[x[0x7]] ^ S6[x[0x6]] ^ S7[x[0x8]] ^ S8[x[0x9]] ^ S7[x[0x3]];
-        _Km[ 8]= S5[x[0x5]] ^ S6[x[0x4]] ^ S7[x[0xA]] ^ S8[x[0xB]] ^ S8[x[0x7]];
-
-        x03 = IntsTo32bits(x, 0x0);
-        x47 = IntsTo32bits(x, 0x4);
-        x8B = IntsTo32bits(x, 0x8);
-        xCF = IntsTo32bits(x, 0xC);
-        z03 = x03 ^S5[x[0xD]] ^S6[x[0xF]] ^S7[x[0xC]] ^S8[x[0xE]] ^S7[x[0x8]];
-        Bits32ToInts(z03, z, 0x0);
-        z47 = x8B ^S5[z[0x0]] ^S6[z[0x2]] ^S7[z[0x1]] ^S8[z[0x3]] ^S8[x[0xA]];
-        Bits32ToInts(z47, z, 0x4);
-        z8B = xCF ^S5[z[0x7]] ^S6[z[0x6]] ^S7[z[0x5]] ^S8[z[0x4]] ^S5[x[0x9]];
-        Bits32ToInts(z8B, z, 0x8);
-        zCF = x47 ^S5[z[0xA]] ^S6[z[0x9]] ^S7[z[0xB]] ^S8[z[0x8]] ^S6[x[0xB]];
-        Bits32ToInts(zCF, z, 0xC);
-        _Km[ 9]= S5[z[0x3]] ^ S6[z[0x2]] ^ S7[z[0xC]] ^ S8[z[0xD]] ^ S5[z[0x9]];
-        _Km[10]= S5[z[0x1]] ^ S6[z[0x0]] ^ S7[z[0xE]] ^ S8[z[0xF]] ^ S6[z[0xc]];
-        _Km[11]= S5[z[0x7]] ^ S6[z[0x6]] ^ S7[z[0x8]] ^ S8[z[0x9]] ^ S7[z[0x2]];
-        _Km[12]= S5[z[0x5]] ^ S6[z[0x4]] ^ S7[z[0xA]] ^ S8[z[0xB]] ^ S8[z[0x6]];
-
-        z03 = IntsTo32bits(z, 0x0);
-        z47 = IntsTo32bits(z, 0x4);
-        z8B = IntsTo32bits(z, 0x8);
-        zCF = IntsTo32bits(z, 0xC);
-        x03 = z8B ^S5[z[0x5]] ^S6[z[0x7]] ^S7[z[0x4]] ^S8[z[0x6]] ^S7[z[0x0]];
-        Bits32ToInts(x03, x, 0x0);
-        x47 = z03 ^S5[x[0x0]] ^S6[x[0x2]] ^S7[x[0x1]] ^S8[x[0x3]] ^S8[z[0x2]];
-        Bits32ToInts(x47, x, 0x4);
-        x8B = z47 ^S5[x[0x7]] ^S6[x[0x6]] ^S7[x[0x5]] ^S8[x[0x4]] ^S5[z[0x1]];
-        Bits32ToInts(x8B, x, 0x8);
-        xCF = zCF ^S5[x[0xA]] ^S6[x[0x9]] ^S7[x[0xB]] ^S8[x[0x8]] ^S6[z[0x3]];
-        Bits32ToInts(xCF, x, 0xC);
-        _Km[13]= S5[x[0x8]] ^ S6[x[0x9]] ^ S7[x[0x7]] ^ S8[x[0x6]] ^ S5[x[0x3]];
-        _Km[14]= S5[x[0xA]] ^ S6[x[0xB]] ^ S7[x[0x5]] ^ S8[x[0x4]] ^ S6[x[0x7]];
-        _Km[15]= S5[x[0xC]] ^ S6[x[0xD]] ^ S7[x[0x3]] ^ S8[x[0x2]] ^ S7[x[0x8]];
-        _Km[16]= S5[x[0xE]] ^ S6[x[0xF]] ^ S7[x[0x1]] ^ S8[x[0x0]] ^ S8[x[0xD]];
-
-        x03 = IntsTo32bits(x, 0x0);
-        x47 = IntsTo32bits(x, 0x4);
-        x8B = IntsTo32bits(x, 0x8);
-        xCF = IntsTo32bits(x, 0xC);
-        z03 = x03 ^S5[x[0xD]] ^S6[x[0xF]] ^S7[x[0xC]] ^S8[x[0xE]] ^S7[x[0x8]];
-        Bits32ToInts(z03, z, 0x0);
-        z47 = x8B ^S5[z[0x0]] ^S6[z[0x2]] ^S7[z[0x1]] ^S8[z[0x3]] ^S8[x[0xA]];
-        Bits32ToInts(z47, z, 0x4);
-        z8B = xCF ^S5[z[0x7]] ^S6[z[0x6]] ^S7[z[0x5]] ^S8[z[0x4]] ^S5[x[0x9]];
-        Bits32ToInts(z8B, z, 0x8);
-        zCF = x47 ^S5[z[0xA]] ^S6[z[0x9]] ^S7[z[0xB]] ^S8[z[0x8]] ^S6[x[0xB]];
-        Bits32ToInts(zCF, z, 0xC);
-        _Kr[ 1]=(S5[z[0x8]]^S6[z[0x9]]^S7[z[0x7]]^S8[z[0x6]] ^ S5[z[0x2]])&0x1f;
-        _Kr[ 2]=(S5[z[0xA]]^S6[z[0xB]]^S7[z[0x5]]^S8[z[0x4]] ^ S6[z[0x6]])&0x1f;
-        _Kr[ 3]=(S5[z[0xC]]^S6[z[0xD]]^S7[z[0x3]]^S8[z[0x2]] ^ S7[z[0x9]])&0x1f;
-        _Kr[ 4]=(S5[z[0xE]]^S6[z[0xF]]^S7[z[0x1]]^S8[z[0x0]] ^ S8[z[0xC]])&0x1f;
-
-        z03 = IntsTo32bits(z, 0x0);
-        z47 = IntsTo32bits(z, 0x4);
-        z8B = IntsTo32bits(z, 0x8);
-        zCF = IntsTo32bits(z, 0xC);
-        x03 = z8B ^S5[z[0x5]] ^S6[z[0x7]] ^S7[z[0x4]] ^S8[z[0x6]] ^S7[z[0x0]];
-        Bits32ToInts(x03, x, 0x0);
-        x47 = z03 ^S5[x[0x0]] ^S6[x[0x2]] ^S7[x[0x1]] ^S8[x[0x3]] ^S8[z[0x2]];
-        Bits32ToInts(x47, x, 0x4);
-        x8B = z47 ^S5[x[0x7]] ^S6[x[0x6]] ^S7[x[0x5]] ^S8[x[0x4]] ^S5[z[0x1]];
-        Bits32ToInts(x8B, x, 0x8);
-        xCF = zCF ^S5[x[0xA]] ^S6[x[0x9]] ^S7[x[0xB]] ^S8[x[0x8]] ^S6[z[0x3]];
-        Bits32ToInts(xCF, x, 0xC);
-        _Kr[ 5]=(S5[x[0x3]]^S6[x[0x2]]^S7[x[0xC]]^S8[x[0xD]]^S5[x[0x8]])&0x1f;
-        _Kr[ 6]=(S5[x[0x1]]^S6[x[0x0]]^S7[x[0xE]]^S8[x[0xF]]^S6[x[0xD]])&0x1f;
-        _Kr[ 7]=(S5[x[0x7]]^S6[x[0x6]]^S7[x[0x8]]^S8[x[0x9]]^S7[x[0x3]])&0x1f;
-        _Kr[ 8]=(S5[x[0x5]]^S6[x[0x4]]^S7[x[0xA]]^S8[x[0xB]]^S8[x[0x7]])&0x1f;
-
-        x03 = IntsTo32bits(x, 0x0);
-        x47 = IntsTo32bits(x, 0x4);
-        x8B = IntsTo32bits(x, 0x8);
-        xCF = IntsTo32bits(x, 0xC);
-        z03 = x03 ^S5[x[0xD]] ^S6[x[0xF]] ^S7[x[0xC]] ^S8[x[0xE]] ^S7[x[0x8]];
-        Bits32ToInts(z03, z, 0x0);
-        z47 = x8B ^S5[z[0x0]] ^S6[z[0x2]] ^S7[z[0x1]] ^S8[z[0x3]] ^S8[x[0xA]];
-        Bits32ToInts(z47, z, 0x4);
-        z8B = xCF ^S5[z[0x7]] ^S6[z[0x6]] ^S7[z[0x5]] ^S8[z[0x4]] ^S5[x[0x9]];
-        Bits32ToInts(z8B, z, 0x8);
-        zCF = x47 ^S5[z[0xA]] ^S6[z[0x9]] ^S7[z[0xB]] ^S8[z[0x8]] ^S6[x[0xB]];
-        Bits32ToInts(zCF, z, 0xC);
-        _Kr[ 9]=(S5[z[0x3]]^S6[z[0x2]]^S7[z[0xC]]^S8[z[0xD]]^S5[z[0x9]])&0x1f;
-        _Kr[10]=(S5[z[0x1]]^S6[z[0x0]]^S7[z[0xE]]^S8[z[0xF]]^S6[z[0xc]])&0x1f;
-        _Kr[11]=(S5[z[0x7]]^S6[z[0x6]]^S7[z[0x8]]^S8[z[0x9]]^S7[z[0x2]])&0x1f;
-        _Kr[12]=(S5[z[0x5]]^S6[z[0x4]]^S7[z[0xA]]^S8[z[0xB]]^S8[z[0x6]])&0x1f;
-
-        z03 = IntsTo32bits(z, 0x0);
-        z47 = IntsTo32bits(z, 0x4);
-        z8B = IntsTo32bits(z, 0x8);
-        zCF = IntsTo32bits(z, 0xC);
-        x03 = z8B ^S5[z[0x5]] ^S6[z[0x7]] ^S7[z[0x4]] ^S8[z[0x6]] ^S7[z[0x0]];
-        Bits32ToInts(x03, x, 0x0);
-        x47 = z03 ^S5[x[0x0]] ^S6[x[0x2]] ^S7[x[0x1]] ^S8[x[0x3]] ^S8[z[0x2]];
-        Bits32ToInts(x47, x, 0x4);
-        x8B = z47 ^S5[x[0x7]] ^S6[x[0x6]] ^S7[x[0x5]] ^S8[x[0x4]] ^S5[z[0x1]];
-        Bits32ToInts(x8B, x, 0x8);
-        xCF = zCF ^S5[x[0xA]] ^S6[x[0x9]] ^S7[x[0xB]] ^S8[x[0x8]] ^S6[z[0x3]];
-        Bits32ToInts(xCF, x, 0xC);
-        _Kr[13]=(S5[x[0x8]]^S6[x[0x9]]^S7[x[0x7]]^S8[x[0x6]]^S5[x[0x3]])&0x1f;
-        _Kr[14]=(S5[x[0xA]]^S6[x[0xB]]^S7[x[0x5]]^S8[x[0x4]]^S6[x[0x7]])&0x1f;
-        _Kr[15]=(S5[x[0xC]]^S6[x[0xD]]^S7[x[0x3]]^S8[x[0x2]]^S7[x[0x8]])&0x1f;
-        _Kr[16]=(S5[x[0xE]]^S6[x[0xF]]^S7[x[0x1]]^S8[x[0x0]]^S8[x[0xD]])&0x1f;
-    }
-
-    /**
-     * Encrypt the given input starting at the given offset and place
-     * the result in the provided buffer starting at the given offset.
-     *
-     * @param src        The plaintext buffer
-     * @param srcIndex    An offset into src
-     * @param dst        The ciphertext buffer
-     * @param dstIndex    An offset into dst
-     */
-    protected int encryptBlock(
-        byte[] src, 
-        int srcIndex,
-        byte[] dst,
-        int dstIndex)
-    {
-
-        int  result[] = new int[2];
-
-        // process the input block 
-        // batch the units up into a 32 bit chunk and go for it
-        // the array is in bytes, the increment is 8x8 bits = 64
-
-        int L0 = BytesTo32bits(src, srcIndex);
-        int R0 = BytesTo32bits(src, srcIndex + 4);
-
-        CAST_Encipher(L0, R0, result);
-
-        // now stuff them into the destination block
-        Bits32ToBytes(result[0], dst, dstIndex);
-        Bits32ToBytes(result[1], dst, dstIndex + 4);
-
-        return BLOCK_SIZE;
-    }
-
-    /**
-     * Decrypt the given input starting at the given offset and place
-     * the result in the provided buffer starting at the given offset.
-     *
-     * @param src        The plaintext buffer
-     * @param srcIndex    An offset into src
-     * @param dst        The ciphertext buffer
-     * @param dstIndex    An offset into dst
-     */
-    protected int decryptBlock(
-        byte[] src, 
-        int srcIndex,
-        byte[] dst,
-        int dstIndex)
-    {
-        int  result[] = new int[2];
-
-        // process the input block
-        // batch the units up into a 32 bit chunk and go for it
-        // the array is in bytes, the increment is 8x8 bits = 64
-        int L16 = BytesTo32bits(src, srcIndex);
-        int R16 = BytesTo32bits(src, srcIndex+4);
-
-        CAST_Decipher(L16, R16, result);
-
-        // now stuff them into the destination block
-        Bits32ToBytes(result[0], dst, dstIndex);
-        Bits32ToBytes(result[1], dst, dstIndex+4);
-
-        return BLOCK_SIZE;
-    }
-
-    /**
-     * The first of the three processing functions for the
-     * encryption and decryption.
-     *
-     * @param D            the input to be processed
-     * @param Kmi        the mask to be used from Km[n]
-     * @param Kri        the rotation value to be used
-     *
-     */
-    protected final int F1(int D, int Kmi, int Kri)
-    {
-        int I = Kmi + D;
-        I = I << Kri | I >>> (32-Kri);
-        return ((S1[(I>>>24)&0xff]^S2[(I>>>16)&0xff])-S3[(I>>> 8)&0xff])+
-                 S4[I & 0xff];
-    }
-
-    /**
-     * The second of the three processing functions for the
-     * encryption and decryption.
-     *
-     * @param D            the input to be processed
-     * @param Kmi        the mask to be used from Km[n]
-     * @param Kri        the rotation value to be used
-     *
-     */
-    protected final int F2(int D, int Kmi, int Kri)
-    {
-        int I = Kmi ^ D;
-        I = I << Kri | I >>> (32-Kri);
-        return ((S1[(I>>>24)&0xff]-S2[(I>>>16)&0xff])+S3[(I>>> 8)&0xff])^
-                 S4[I & 0xff];
-    }
-
-    /**
-     * The third of the three processing functions for the
-     * encryption and decryption.
-     *
-     * @param D            the input to be processed
-     * @param Kmi        the mask to be used from Km[n]
-     * @param Kri        the rotation value to be used
-     *
-     */
-    protected final int F3(int D, int Kmi, int Kri)
-    {
-        int I = Kmi - D;
-        I = I << Kri | I >>> (32-Kri);
-        return ((S1[(I>>>24)&0xff]+S2[(I>>>16)&0xff])^S3[(I>>> 8)&0xff])-
-                 S4[I & 0xff];
-    }
-
-    /**
-     * Does the 16 rounds to encrypt the block.
-     * 
-     * @param L0    the LH-32bits of the plaintext block
-     * @param R0    the RH-32bits of the plaintext block
-     */
-    protected final void CAST_Encipher(int L0, int R0, int result[])
-    {
-        int Lp = L0;        // the previous value, equiv to L[i-1]
-        int Rp = R0;        // equivalent to R[i-1]
-
-        /* 
-         * numbering consistent with paper to make
-         * checking and validating easier
-         */
-        int Li = L0, Ri = R0;
-
-        for (int i = 1; i<=_rounds ; i++)
-        {
-            Lp = Li;
-            Rp = Ri;
-
-            Li = Rp;
-            switch (i)
-            {
-                case  1:
-                case  4:
-                case  7:
-                case 10:
-                case 13:
-                case 16:
-                    Ri = Lp ^ F1(Rp, _Km[i], _Kr[i]);
-                    break;
-                case  2:
-                case  5:
-                case  8:
-                case 11:
-                case 14:
-                    Ri = Lp ^ F2(Rp, _Km[i], _Kr[i]);
-                    break;
-                case  3:
-                case  6:
-                case  9:
-                case 12:
-                case 15:
-                    Ri = Lp ^ F3(Rp, _Km[i], _Kr[i]);
-                    break;
-            }
-        }
-
-        result[0] = Ri;
-        result[1] = Li;
-
-        return;
-    }
-
-    protected final void CAST_Decipher(int L16, int R16, int result[])
-    {
-        int Lp = L16;        // the previous value, equiv to L[i-1]
-        int Rp = R16;        // equivalent to R[i-1]
-
-        /* 
-         * numbering consistent with paper to make
-         * checking and validating easier
-         */
-        int Li = L16, Ri = R16;
-
-        for (int i = _rounds; i > 0; i--)
-        {
-            Lp = Li;
-            Rp = Ri;
-
-            Li = Rp;
-            switch (i)
-            {
-                case  1:
-                case  4:
-                case  7:
-                case 10:
-                case 13:
-                case 16:
-                    Ri = Lp ^ F1(Rp, _Km[i], _Kr[i]);
-                    break;
-                case  2:
-                case  5:
-                case  8:
-                case 11:
-                case 14:
-                    Ri = Lp ^ F2(Rp, _Km[i], _Kr[i]);
-                    break;
-                case  3:
-                case  6:
-                case  9:
-                case 12:
-                case 15:
-                    Ri = Lp ^ F3(Rp, _Km[i], _Kr[i]);
-                    break;
-            }
-        }
-
-        result[0] = Ri;
-        result[1] = Li;
-
-        return;
-    }
-
-    protected final void Bits32ToInts(int in,  int[] b, int offset)
-    {
-        b[offset + 3] = (in & 0xff);
-        b[offset + 2] = ((in >>> 8) & 0xff);
-        b[offset + 1] = ((in >>> 16) & 0xff);
-        b[offset]     = ((in >>> 24) & 0xff);
-    }
-
-    protected final int IntsTo32bits(int[] b, int i)
-    {
-        int rv = 0;
-
-        rv = ((b[i]   & 0xff) << 24) | 
-             ((b[i+1] & 0xff) << 16) |
-             ((b[i+2] & 0xff) << 8) |
-             ((b[i+3] & 0xff));
-
-        return rv;
-    }
-
-    protected final void Bits32ToBytes(int in,  byte[] b, int offset)
-    {
-        b[offset + 3] = (byte)in;
-        b[offset + 2] = (byte)(in >>> 8);
-        b[offset + 1] = (byte)(in >>> 16);
-        b[offset]     = (byte)(in >>> 24);
-    }
-
-    protected final int BytesTo32bits(byte[] b, int i)
-    {
-        return ((b[i]   & 0xff) << 24) | 
-            ((b[i+1] & 0xff) << 16) |
-            ((b[i+2] & 0xff) << 8) |
-            ((b[i+3] & 0xff));
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/engines/CAST6Engine.java b/bcprov/src/main/java/org/bouncycastle/crypto/engines/CAST6Engine.java
deleted file mode 100644
index db57b50..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/engines/CAST6Engine.java
+++ /dev/null
@@ -1,296 +0,0 @@
-package org.bouncycastle.crypto.engines;
-
-
-/**
- * A class that provides CAST6 key encryption operations,
- * such as encoding data and generating keys.
- *
- * All the algorithms herein are from the Internet RFC
- *
- * RFC2612 - CAST6 (128bit block, 128-256bit key)
- *
- * and implement a simplified cryptography interface.
- */
-public final class CAST6Engine extends CAST5Engine
-{
-    //====================================
-    // Useful constants
-    //====================================
-
-    protected static final int    ROUNDS = 12;
-
-    protected static final int    BLOCK_SIZE = 16;  // bytes = 128 bits
-
-    /*
-     * Put the round and mask keys into an array.
-     * Kr0[i] => _Kr[i*4 + 0]
-     */
-    protected int _Kr[] = new int[ROUNDS*4]; // the rotating round key(s)
-    protected int _Km[] = new int[ROUNDS*4]; // the masking round key(s)
-
-    /*
-     * Key setup
-     */
-    protected int _Tr[] = new int[24 * 8];
-    protected int _Tm[] = new int[24 * 8];
-
-    private int[] _workingKey = new int[8];
-
-    public CAST6Engine()
-    {
-    }
-
-    public String getAlgorithmName()
-    {
-        return "CAST6";
-    }
-
-    public void reset()
-    {
-    }
-
-    public int getBlockSize()
-    {
-        return BLOCK_SIZE;
-    }
-
-    //==================================
-    // Private Implementation
-    //==================================
-
-    /*
-     * Creates the subkeys using the same nomenclature
-     * as described in RFC2612.
-     *
-     * See section 2.4
-     */
-    protected void setKey(byte[] key)
-    {
-        int Cm = 0x5a827999;
-        int Mm = 0x6ed9eba1;
-        int Cr = 19;
-        int Mr = 17;
-
-        /* 
-         * Determine the key size here, if required
-         *
-         * if keysize < 256 bytes, pad with 0
-         *
-         * Typical key sizes => 128, 160, 192, 224, 256
-         */
-        for (int i=0; i< 24; i++)
-        {
-            for (int j=0; j< 8; j++)
-            {
-                _Tm[i*8 + j] = Cm;
-                Cm = (Cm + Mm);    // mod 2^32;
-
-                _Tr[i*8 + j] = Cr;
-                Cr = (Cr + Mr) & 0x1f;            // mod 32
-            }
-        }
-
-        byte[] tmpKey = new byte[64];
-        int length = key.length;
-        System.arraycopy(key, 0, tmpKey, 0, length);
-
-        // now create ABCDEFGH
-        for (int i=0; i< 8; i++)
-        {
-            _workingKey[i] = BytesTo32bits(tmpKey, i*4);
-        }
-
-        // Generate the key schedule
-        for (int i=0; i< 12; i++)
-        {
-            // KAPPA <- W2i(KAPPA)
-            int i2 = i*2 *8;
-            _workingKey[6] ^= F1(_workingKey[7], _Tm[i2  ], _Tr[i2  ]);
-            _workingKey[5] ^= F2(_workingKey[6], _Tm[i2+1], _Tr[i2+1]);
-            _workingKey[4] ^= F3(_workingKey[5], _Tm[i2+2], _Tr[i2+2]);
-            _workingKey[3] ^= F1(_workingKey[4], _Tm[i2+3], _Tr[i2+3]);
-            _workingKey[2] ^= F2(_workingKey[3], _Tm[i2+4], _Tr[i2+4]);
-            _workingKey[1] ^= F3(_workingKey[2], _Tm[i2+5], _Tr[i2+5]);
-            _workingKey[0] ^= F1(_workingKey[1], _Tm[i2+6], _Tr[i2+6]);
-            _workingKey[7] ^= F2(_workingKey[0], _Tm[i2+7], _Tr[i2+7]);
-
-            // KAPPA <- W2i+1(KAPPA)
-            i2 = (i*2 + 1)*8;
-            _workingKey[6] ^= F1(_workingKey[7], _Tm[i2  ], _Tr[i2  ]);
-            _workingKey[5] ^= F2(_workingKey[6], _Tm[i2+1], _Tr[i2+1]);
-            _workingKey[4] ^= F3(_workingKey[5], _Tm[i2+2], _Tr[i2+2]);
-            _workingKey[3] ^= F1(_workingKey[4], _Tm[i2+3], _Tr[i2+3]);
-            _workingKey[2] ^= F2(_workingKey[3], _Tm[i2+4], _Tr[i2+4]);
-            _workingKey[1] ^= F3(_workingKey[2], _Tm[i2+5], _Tr[i2+5]);
-            _workingKey[0] ^= F1(_workingKey[1], _Tm[i2+6], _Tr[i2+6]);
-            _workingKey[7] ^= F2(_workingKey[0], _Tm[i2+7], _Tr[i2+7]);
-
-            // Kr_(i) <- KAPPA
-            _Kr[i*4    ] = _workingKey[0] & 0x1f;
-            _Kr[i*4 + 1] = _workingKey[2] & 0x1f;
-            _Kr[i*4 + 2] = _workingKey[4] & 0x1f;
-            _Kr[i*4 + 3] = _workingKey[6] & 0x1f;
-
-
-            // Km_(i) <- KAPPA
-            _Km[i*4    ] = _workingKey[7];
-            _Km[i*4 + 1] = _workingKey[5];
-            _Km[i*4 + 2] = _workingKey[3];
-            _Km[i*4 + 3] = _workingKey[1];
-        }
-        
-    }
-
-    /**
-     * Encrypt the given input starting at the given offset and place
-     * the result in the provided buffer starting at the given offset.
-     *
-     * @param src        The plaintext buffer
-     * @param srcIndex    An offset into src
-     * @param dst        The ciphertext buffer
-     * @param dstIndex    An offset into dst
-     */
-    protected int encryptBlock(
-        byte[] src, 
-        int srcIndex,
-        byte[] dst,
-        int dstIndex)
-    {
-
-        int  result[] = new int[4];
-
-        // process the input block 
-        // batch the units up into 4x32 bit chunks and go for it
-
-        int A = BytesTo32bits(src, srcIndex);
-        int B = BytesTo32bits(src, srcIndex + 4);
-        int C = BytesTo32bits(src, srcIndex + 8);
-        int D = BytesTo32bits(src, srcIndex + 12);
-
-        CAST_Encipher(A, B, C, D, result);
-
-        // now stuff them into the destination block
-        Bits32ToBytes(result[0], dst, dstIndex);
-        Bits32ToBytes(result[1], dst, dstIndex + 4);
-        Bits32ToBytes(result[2], dst, dstIndex + 8);
-        Bits32ToBytes(result[3], dst, dstIndex + 12);
-
-        return BLOCK_SIZE;
-    }
-
-    /**
-     * Decrypt the given input starting at the given offset and place
-     * the result in the provided buffer starting at the given offset.
-     *
-     * @param src        The plaintext buffer
-     * @param srcIndex    An offset into src
-     * @param dst        The ciphertext buffer
-     * @param dstIndex    An offset into dst
-     */
-    protected int decryptBlock(
-        byte[] src, 
-        int srcIndex,
-        byte[] dst,
-        int dstIndex)
-    {
-        int  result[] = new int[4];
-
-        // process the input block
-        // batch the units up into 4x32 bit chunks and go for it
-        int A = BytesTo32bits(src, srcIndex);
-        int B = BytesTo32bits(src, srcIndex + 4);
-        int C = BytesTo32bits(src, srcIndex + 8);
-        int D = BytesTo32bits(src, srcIndex + 12);
-
-        CAST_Decipher(A, B, C, D, result);
-
-        // now stuff them into the destination block
-        Bits32ToBytes(result[0], dst, dstIndex);
-        Bits32ToBytes(result[1], dst, dstIndex + 4);
-        Bits32ToBytes(result[2], dst, dstIndex + 8);
-        Bits32ToBytes(result[3], dst, dstIndex + 12);
-
-        return BLOCK_SIZE;
-    }
-
-    /**
-     * Does the 12 quad rounds rounds to encrypt the block.
-     * 
-     * @param A    the 00-31  bits of the plaintext block
-     * @param B    the 32-63  bits of the plaintext block
-     * @param C    the 64-95  bits of the plaintext block
-     * @param D    the 96-127 bits of the plaintext block
-     * @param result the resulting ciphertext
-     */
-    protected final void CAST_Encipher(int A, int B, int C, int D,int result[])
-    {
-        int x;
-        for (int i=0; i< 6; i++)
-        {
-            x = i*4;
-            // BETA <- Qi(BETA)
-            C ^= F1(D, _Km[x], _Kr[x]);
-            B ^= F2(C, _Km[x + 1], _Kr[x + 1]);
-            A ^= F3(B, _Km[x + 2], _Kr[x + 2]);
-            D ^= F1(A, _Km[x + 3], _Kr[x + 3]);
-
-        }
-
-        for (int i=6; i<12; i++)
-        {
-            x = i*4;
-            // BETA <- QBARi(BETA)
-            D ^= F1(A, _Km[x + 3], _Kr[x + 3]);
-            A ^= F3(B, _Km[x + 2], _Kr[x + 2]);
-            B ^= F2(C, _Km[x + 1], _Kr[x + 1]);
-            C ^= F1(D, _Km[x], _Kr[x]);
-
-        }
-
-        result[0] = A;
-        result[1] = B;
-        result[2] = C;
-        result[3] = D;
-    }
-
-    /**
-     * Does the 12 quad rounds rounds to decrypt the block.
-     * 
-     * @param A    the 00-31  bits of the ciphertext block
-     * @param B    the 32-63  bits of the ciphertext block
-     * @param C    the 64-95  bits of the ciphertext block
-     * @param D    the 96-127 bits of the ciphertext block
-     * @param result the resulting plaintext
-     */
-    protected final void CAST_Decipher(int A, int B, int C, int D,int result[])
-    {
-        int x;
-        for (int i=0; i< 6; i++)
-        {
-            x = (11-i)*4;
-            // BETA <- Qi(BETA)
-            C ^= F1(D, _Km[x], _Kr[x]);
-            B ^= F2(C, _Km[x + 1], _Kr[x + 1]);
-            A ^= F3(B, _Km[x + 2], _Kr[x + 2]);
-            D ^= F1(A, _Km[x + 3], _Kr[x + 3]);
-
-        }
-
-        for (int i=6; i<12; i++)
-        {
-            x = (11-i)*4;
-            // BETA <- QBARi(BETA)
-            D ^= F1(A, _Km[x + 3], _Kr[x + 3]);
-            A ^= F3(B, _Km[x + 2], _Kr[x + 2]);
-            B ^= F2(C, _Km[x + 1], _Kr[x + 1]);
-            C ^= F1(D, _Km[x], _Kr[x]);
-
-        }
-
-        result[0] = A;
-        result[1] = B;
-        result[2] = C;
-        result[3] = D;
-    }
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/engines/CamelliaEngine.java b/bcprov/src/main/java/org/bouncycastle/crypto/engines/CamelliaEngine.java
deleted file mode 100644
index a486e1b..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/engines/CamelliaEngine.java
+++ /dev/null
@@ -1,684 +0,0 @@
-package org.bouncycastle.crypto.engines;
-
-import org.bouncycastle.crypto.BlockCipher;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.DataLengthException;
-import org.bouncycastle.crypto.OutputLengthException;
-import org.bouncycastle.crypto.params.KeyParameter;
-
-/**
- * Camellia - based on RFC 3713.
- */
-public class CamelliaEngine
-    implements BlockCipher
-{
-    private boolean initialised = false;
-    private boolean _keyIs128;
-
-    private static final int BLOCK_SIZE = 16;
-    private static final int MASK8 = 0xff;
-
-    private int[] subkey = new int[24 * 4];
-    private int[] kw = new int[4 * 2]; // for whitening
-    private int[] ke = new int[6 * 2]; // for FL and FL^(-1)
-    private int[] state = new int[4]; // for encryption and decryption
-
-    private static final int SIGMA[] = {
-        0xa09e667f, 0x3bcc908b,
-        0xb67ae858, 0x4caa73b2,
-        0xc6ef372f, 0xe94f82be,
-        0x54ff53a5, 0xf1d36f1c,
-        0x10e527fa, 0xde682d1d,
-        0xb05688c2, 0xb3e6c1fd
-    };
-
-    /*
-    *
-    * S-box data
-    *
-    */
-    private static final int SBOX1_1110[] = {
-        0x70707000, 0x82828200, 0x2c2c2c00, 0xececec00, 0xb3b3b300, 0x27272700,
-        0xc0c0c000, 0xe5e5e500, 0xe4e4e400, 0x85858500, 0x57575700, 0x35353500,
-        0xeaeaea00, 0x0c0c0c00, 0xaeaeae00, 0x41414100, 0x23232300, 0xefefef00,
-        0x6b6b6b00, 0x93939300, 0x45454500, 0x19191900, 0xa5a5a500, 0x21212100,
-        0xededed00, 0x0e0e0e00, 0x4f4f4f00, 0x4e4e4e00, 0x1d1d1d00, 0x65656500,
-        0x92929200, 0xbdbdbd00, 0x86868600, 0xb8b8b800, 0xafafaf00, 0x8f8f8f00,
-        0x7c7c7c00, 0xebebeb00, 0x1f1f1f00, 0xcecece00, 0x3e3e3e00, 0x30303000,
-        0xdcdcdc00, 0x5f5f5f00, 0x5e5e5e00, 0xc5c5c500, 0x0b0b0b00, 0x1a1a1a00,
-        0xa6a6a600, 0xe1e1e100, 0x39393900, 0xcacaca00, 0xd5d5d500, 0x47474700,
-        0x5d5d5d00, 0x3d3d3d00, 0xd9d9d900, 0x01010100, 0x5a5a5a00, 0xd6d6d600,
-        0x51515100, 0x56565600, 0x6c6c6c00, 0x4d4d4d00, 0x8b8b8b00, 0x0d0d0d00,
-        0x9a9a9a00, 0x66666600, 0xfbfbfb00, 0xcccccc00, 0xb0b0b000, 0x2d2d2d00,
-        0x74747400, 0x12121200, 0x2b2b2b00, 0x20202000, 0xf0f0f000, 0xb1b1b100,
-        0x84848400, 0x99999900, 0xdfdfdf00, 0x4c4c4c00, 0xcbcbcb00, 0xc2c2c200,
-        0x34343400, 0x7e7e7e00, 0x76767600, 0x05050500, 0x6d6d6d00, 0xb7b7b700,
-        0xa9a9a900, 0x31313100, 0xd1d1d100, 0x17171700, 0x04040400, 0xd7d7d700,
-        0x14141400, 0x58585800, 0x3a3a3a00, 0x61616100, 0xdedede00, 0x1b1b1b00,
-        0x11111100, 0x1c1c1c00, 0x32323200, 0x0f0f0f00, 0x9c9c9c00, 0x16161600,
-        0x53535300, 0x18181800, 0xf2f2f200, 0x22222200, 0xfefefe00, 0x44444400,
-        0xcfcfcf00, 0xb2b2b200, 0xc3c3c300, 0xb5b5b500, 0x7a7a7a00, 0x91919100,
-        0x24242400, 0x08080800, 0xe8e8e800, 0xa8a8a800, 0x60606000, 0xfcfcfc00,
-        0x69696900, 0x50505000, 0xaaaaaa00, 0xd0d0d000, 0xa0a0a000, 0x7d7d7d00,
-        0xa1a1a100, 0x89898900, 0x62626200, 0x97979700, 0x54545400, 0x5b5b5b00,
-        0x1e1e1e00, 0x95959500, 0xe0e0e000, 0xffffff00, 0x64646400, 0xd2d2d200,
-        0x10101000, 0xc4c4c400, 0x00000000, 0x48484800, 0xa3a3a300, 0xf7f7f700,
-        0x75757500, 0xdbdbdb00, 0x8a8a8a00, 0x03030300, 0xe6e6e600, 0xdadada00,
-        0x09090900, 0x3f3f3f00, 0xdddddd00, 0x94949400, 0x87878700, 0x5c5c5c00,
-        0x83838300, 0x02020200, 0xcdcdcd00, 0x4a4a4a00, 0x90909000, 0x33333300,
-        0x73737300, 0x67676700, 0xf6f6f600, 0xf3f3f300, 0x9d9d9d00, 0x7f7f7f00,
-        0xbfbfbf00, 0xe2e2e200, 0x52525200, 0x9b9b9b00, 0xd8d8d800, 0x26262600,
-        0xc8c8c800, 0x37373700, 0xc6c6c600, 0x3b3b3b00, 0x81818100, 0x96969600,
-        0x6f6f6f00, 0x4b4b4b00, 0x13131300, 0xbebebe00, 0x63636300, 0x2e2e2e00,
-        0xe9e9e900, 0x79797900, 0xa7a7a700, 0x8c8c8c00, 0x9f9f9f00, 0x6e6e6e00,
-        0xbcbcbc00, 0x8e8e8e00, 0x29292900, 0xf5f5f500, 0xf9f9f900, 0xb6b6b600,
-        0x2f2f2f00, 0xfdfdfd00, 0xb4b4b400, 0x59595900, 0x78787800, 0x98989800,
-        0x06060600, 0x6a6a6a00, 0xe7e7e700, 0x46464600, 0x71717100, 0xbababa00,
-        0xd4d4d400, 0x25252500, 0xababab00, 0x42424200, 0x88888800, 0xa2a2a200,
-        0x8d8d8d00, 0xfafafa00, 0x72727200, 0x07070700, 0xb9b9b900, 0x55555500,
-        0xf8f8f800, 0xeeeeee00, 0xacacac00, 0x0a0a0a00, 0x36363600, 0x49494900,
-        0x2a2a2a00, 0x68686800, 0x3c3c3c00, 0x38383800, 0xf1f1f100, 0xa4a4a400,
-        0x40404000, 0x28282800, 0xd3d3d300, 0x7b7b7b00, 0xbbbbbb00, 0xc9c9c900,
-        0x43434300, 0xc1c1c100, 0x15151500, 0xe3e3e300, 0xadadad00, 0xf4f4f400,
-        0x77777700, 0xc7c7c700, 0x80808000, 0x9e9e9e00
-    };
-
-    private static final int SBOX4_4404[] = {
-        0x70700070, 0x2c2c002c, 0xb3b300b3, 0xc0c000c0, 0xe4e400e4, 0x57570057,
-        0xeaea00ea, 0xaeae00ae, 0x23230023, 0x6b6b006b, 0x45450045, 0xa5a500a5,
-        0xeded00ed, 0x4f4f004f, 0x1d1d001d, 0x92920092, 0x86860086, 0xafaf00af,
-        0x7c7c007c, 0x1f1f001f, 0x3e3e003e, 0xdcdc00dc, 0x5e5e005e, 0x0b0b000b,
-        0xa6a600a6, 0x39390039, 0xd5d500d5, 0x5d5d005d, 0xd9d900d9, 0x5a5a005a,
-        0x51510051, 0x6c6c006c, 0x8b8b008b, 0x9a9a009a, 0xfbfb00fb, 0xb0b000b0,
-        0x74740074, 0x2b2b002b, 0xf0f000f0, 0x84840084, 0xdfdf00df, 0xcbcb00cb,
-        0x34340034, 0x76760076, 0x6d6d006d, 0xa9a900a9, 0xd1d100d1, 0x04040004,
-        0x14140014, 0x3a3a003a, 0xdede00de, 0x11110011, 0x32320032, 0x9c9c009c,
-        0x53530053, 0xf2f200f2, 0xfefe00fe, 0xcfcf00cf, 0xc3c300c3, 0x7a7a007a,
-        0x24240024, 0xe8e800e8, 0x60600060, 0x69690069, 0xaaaa00aa, 0xa0a000a0,
-        0xa1a100a1, 0x62620062, 0x54540054, 0x1e1e001e, 0xe0e000e0, 0x64640064,
-        0x10100010, 0x00000000, 0xa3a300a3, 0x75750075, 0x8a8a008a, 0xe6e600e6,
-        0x09090009, 0xdddd00dd, 0x87870087, 0x83830083, 0xcdcd00cd, 0x90900090,
-        0x73730073, 0xf6f600f6, 0x9d9d009d, 0xbfbf00bf, 0x52520052, 0xd8d800d8,
-        0xc8c800c8, 0xc6c600c6, 0x81810081, 0x6f6f006f, 0x13130013, 0x63630063,
-        0xe9e900e9, 0xa7a700a7, 0x9f9f009f, 0xbcbc00bc, 0x29290029, 0xf9f900f9,
-        0x2f2f002f, 0xb4b400b4, 0x78780078, 0x06060006, 0xe7e700e7, 0x71710071,
-        0xd4d400d4, 0xabab00ab, 0x88880088, 0x8d8d008d, 0x72720072, 0xb9b900b9,
-        0xf8f800f8, 0xacac00ac, 0x36360036, 0x2a2a002a, 0x3c3c003c, 0xf1f100f1,
-        0x40400040, 0xd3d300d3, 0xbbbb00bb, 0x43430043, 0x15150015, 0xadad00ad,
-        0x77770077, 0x80800080, 0x82820082, 0xecec00ec, 0x27270027, 0xe5e500e5,
-        0x85850085, 0x35350035, 0x0c0c000c, 0x41410041, 0xefef00ef, 0x93930093,
-        0x19190019, 0x21210021, 0x0e0e000e, 0x4e4e004e, 0x65650065, 0xbdbd00bd,
-        0xb8b800b8, 0x8f8f008f, 0xebeb00eb, 0xcece00ce, 0x30300030, 0x5f5f005f,
-        0xc5c500c5, 0x1a1a001a, 0xe1e100e1, 0xcaca00ca, 0x47470047, 0x3d3d003d,
-        0x01010001, 0xd6d600d6, 0x56560056, 0x4d4d004d, 0x0d0d000d, 0x66660066,
-        0xcccc00cc, 0x2d2d002d, 0x12120012, 0x20200020, 0xb1b100b1, 0x99990099,
-        0x4c4c004c, 0xc2c200c2, 0x7e7e007e, 0x05050005, 0xb7b700b7, 0x31310031,
-        0x17170017, 0xd7d700d7, 0x58580058, 0x61610061, 0x1b1b001b, 0x1c1c001c,
-        0x0f0f000f, 0x16160016, 0x18180018, 0x22220022, 0x44440044, 0xb2b200b2,
-        0xb5b500b5, 0x91910091, 0x08080008, 0xa8a800a8, 0xfcfc00fc, 0x50500050,
-        0xd0d000d0, 0x7d7d007d, 0x89890089, 0x97970097, 0x5b5b005b, 0x95950095,
-        0xffff00ff, 0xd2d200d2, 0xc4c400c4, 0x48480048, 0xf7f700f7, 0xdbdb00db,
-        0x03030003, 0xdada00da, 0x3f3f003f, 0x94940094, 0x5c5c005c, 0x02020002,
-        0x4a4a004a, 0x33330033, 0x67670067, 0xf3f300f3, 0x7f7f007f, 0xe2e200e2,
-        0x9b9b009b, 0x26260026, 0x37370037, 0x3b3b003b, 0x96960096, 0x4b4b004b,
-        0xbebe00be, 0x2e2e002e, 0x79790079, 0x8c8c008c, 0x6e6e006e, 0x8e8e008e,
-        0xf5f500f5, 0xb6b600b6, 0xfdfd00fd, 0x59590059, 0x98980098, 0x6a6a006a,
-        0x46460046, 0xbaba00ba, 0x25250025, 0x42420042, 0xa2a200a2, 0xfafa00fa,
-        0x07070007, 0x55550055, 0xeeee00ee, 0x0a0a000a, 0x49490049, 0x68680068,
-        0x38380038, 0xa4a400a4, 0x28280028, 0x7b7b007b, 0xc9c900c9, 0xc1c100c1,
-        0xe3e300e3, 0xf4f400f4, 0xc7c700c7, 0x9e9e009e
-    };
-
-    private static final int SBOX2_0222[] = {
-        0x00e0e0e0, 0x00050505, 0x00585858, 0x00d9d9d9, 0x00676767, 0x004e4e4e,
-        0x00818181, 0x00cbcbcb, 0x00c9c9c9, 0x000b0b0b, 0x00aeaeae, 0x006a6a6a,
-        0x00d5d5d5, 0x00181818, 0x005d5d5d, 0x00828282, 0x00464646, 0x00dfdfdf,
-        0x00d6d6d6, 0x00272727, 0x008a8a8a, 0x00323232, 0x004b4b4b, 0x00424242,
-        0x00dbdbdb, 0x001c1c1c, 0x009e9e9e, 0x009c9c9c, 0x003a3a3a, 0x00cacaca,
-        0x00252525, 0x007b7b7b, 0x000d0d0d, 0x00717171, 0x005f5f5f, 0x001f1f1f,
-        0x00f8f8f8, 0x00d7d7d7, 0x003e3e3e, 0x009d9d9d, 0x007c7c7c, 0x00606060,
-        0x00b9b9b9, 0x00bebebe, 0x00bcbcbc, 0x008b8b8b, 0x00161616, 0x00343434,
-        0x004d4d4d, 0x00c3c3c3, 0x00727272, 0x00959595, 0x00ababab, 0x008e8e8e,
-        0x00bababa, 0x007a7a7a, 0x00b3b3b3, 0x00020202, 0x00b4b4b4, 0x00adadad,
-        0x00a2a2a2, 0x00acacac, 0x00d8d8d8, 0x009a9a9a, 0x00171717, 0x001a1a1a,
-        0x00353535, 0x00cccccc, 0x00f7f7f7, 0x00999999, 0x00616161, 0x005a5a5a,
-        0x00e8e8e8, 0x00242424, 0x00565656, 0x00404040, 0x00e1e1e1, 0x00636363,
-        0x00090909, 0x00333333, 0x00bfbfbf, 0x00989898, 0x00979797, 0x00858585,
-        0x00686868, 0x00fcfcfc, 0x00ececec, 0x000a0a0a, 0x00dadada, 0x006f6f6f,
-        0x00535353, 0x00626262, 0x00a3a3a3, 0x002e2e2e, 0x00080808, 0x00afafaf,
-        0x00282828, 0x00b0b0b0, 0x00747474, 0x00c2c2c2, 0x00bdbdbd, 0x00363636,
-        0x00222222, 0x00383838, 0x00646464, 0x001e1e1e, 0x00393939, 0x002c2c2c,
-        0x00a6a6a6, 0x00303030, 0x00e5e5e5, 0x00444444, 0x00fdfdfd, 0x00888888,
-        0x009f9f9f, 0x00656565, 0x00878787, 0x006b6b6b, 0x00f4f4f4, 0x00232323,
-        0x00484848, 0x00101010, 0x00d1d1d1, 0x00515151, 0x00c0c0c0, 0x00f9f9f9,
-        0x00d2d2d2, 0x00a0a0a0, 0x00555555, 0x00a1a1a1, 0x00414141, 0x00fafafa,
-        0x00434343, 0x00131313, 0x00c4c4c4, 0x002f2f2f, 0x00a8a8a8, 0x00b6b6b6,
-        0x003c3c3c, 0x002b2b2b, 0x00c1c1c1, 0x00ffffff, 0x00c8c8c8, 0x00a5a5a5,
-        0x00202020, 0x00898989, 0x00000000, 0x00909090, 0x00474747, 0x00efefef,
-        0x00eaeaea, 0x00b7b7b7, 0x00151515, 0x00060606, 0x00cdcdcd, 0x00b5b5b5,
-        0x00121212, 0x007e7e7e, 0x00bbbbbb, 0x00292929, 0x000f0f0f, 0x00b8b8b8,
-        0x00070707, 0x00040404, 0x009b9b9b, 0x00949494, 0x00212121, 0x00666666,
-        0x00e6e6e6, 0x00cecece, 0x00ededed, 0x00e7e7e7, 0x003b3b3b, 0x00fefefe,
-        0x007f7f7f, 0x00c5c5c5, 0x00a4a4a4, 0x00373737, 0x00b1b1b1, 0x004c4c4c,
-        0x00919191, 0x006e6e6e, 0x008d8d8d, 0x00767676, 0x00030303, 0x002d2d2d,
-        0x00dedede, 0x00969696, 0x00262626, 0x007d7d7d, 0x00c6c6c6, 0x005c5c5c,
-        0x00d3d3d3, 0x00f2f2f2, 0x004f4f4f, 0x00191919, 0x003f3f3f, 0x00dcdcdc,
-        0x00797979, 0x001d1d1d, 0x00525252, 0x00ebebeb, 0x00f3f3f3, 0x006d6d6d,
-        0x005e5e5e, 0x00fbfbfb, 0x00696969, 0x00b2b2b2, 0x00f0f0f0, 0x00313131,
-        0x000c0c0c, 0x00d4d4d4, 0x00cfcfcf, 0x008c8c8c, 0x00e2e2e2, 0x00757575,
-        0x00a9a9a9, 0x004a4a4a, 0x00575757, 0x00848484, 0x00111111, 0x00454545,
-        0x001b1b1b, 0x00f5f5f5, 0x00e4e4e4, 0x000e0e0e, 0x00737373, 0x00aaaaaa,
-        0x00f1f1f1, 0x00dddddd, 0x00595959, 0x00141414, 0x006c6c6c, 0x00929292,
-        0x00545454, 0x00d0d0d0, 0x00787878, 0x00707070, 0x00e3e3e3, 0x00494949,
-        0x00808080, 0x00505050, 0x00a7a7a7, 0x00f6f6f6, 0x00777777, 0x00939393,
-        0x00868686, 0x00838383, 0x002a2a2a, 0x00c7c7c7, 0x005b5b5b, 0x00e9e9e9,
-        0x00eeeeee, 0x008f8f8f, 0x00010101, 0x003d3d3d
-    };
-
-    private static final int SBOX3_3033[] = {
-        0x38003838, 0x41004141, 0x16001616, 0x76007676, 0xd900d9d9, 0x93009393,
-        0x60006060, 0xf200f2f2, 0x72007272, 0xc200c2c2, 0xab00abab, 0x9a009a9a,
-        0x75007575, 0x06000606, 0x57005757, 0xa000a0a0, 0x91009191, 0xf700f7f7,
-        0xb500b5b5, 0xc900c9c9, 0xa200a2a2, 0x8c008c8c, 0xd200d2d2, 0x90009090,
-        0xf600f6f6, 0x07000707, 0xa700a7a7, 0x27002727, 0x8e008e8e, 0xb200b2b2,
-        0x49004949, 0xde00dede, 0x43004343, 0x5c005c5c, 0xd700d7d7, 0xc700c7c7,
-        0x3e003e3e, 0xf500f5f5, 0x8f008f8f, 0x67006767, 0x1f001f1f, 0x18001818,
-        0x6e006e6e, 0xaf00afaf, 0x2f002f2f, 0xe200e2e2, 0x85008585, 0x0d000d0d,
-        0x53005353, 0xf000f0f0, 0x9c009c9c, 0x65006565, 0xea00eaea, 0xa300a3a3,
-        0xae00aeae, 0x9e009e9e, 0xec00ecec, 0x80008080, 0x2d002d2d, 0x6b006b6b,
-        0xa800a8a8, 0x2b002b2b, 0x36003636, 0xa600a6a6, 0xc500c5c5, 0x86008686,
-        0x4d004d4d, 0x33003333, 0xfd00fdfd, 0x66006666, 0x58005858, 0x96009696,
-        0x3a003a3a, 0x09000909, 0x95009595, 0x10001010, 0x78007878, 0xd800d8d8,
-        0x42004242, 0xcc00cccc, 0xef00efef, 0x26002626, 0xe500e5e5, 0x61006161,
-        0x1a001a1a, 0x3f003f3f, 0x3b003b3b, 0x82008282, 0xb600b6b6, 0xdb00dbdb,
-        0xd400d4d4, 0x98009898, 0xe800e8e8, 0x8b008b8b, 0x02000202, 0xeb00ebeb,
-        0x0a000a0a, 0x2c002c2c, 0x1d001d1d, 0xb000b0b0, 0x6f006f6f, 0x8d008d8d,
-        0x88008888, 0x0e000e0e, 0x19001919, 0x87008787, 0x4e004e4e, 0x0b000b0b,
-        0xa900a9a9, 0x0c000c0c, 0x79007979, 0x11001111, 0x7f007f7f, 0x22002222,
-        0xe700e7e7, 0x59005959, 0xe100e1e1, 0xda00dada, 0x3d003d3d, 0xc800c8c8,
-        0x12001212, 0x04000404, 0x74007474, 0x54005454, 0x30003030, 0x7e007e7e,
-        0xb400b4b4, 0x28002828, 0x55005555, 0x68006868, 0x50005050, 0xbe00bebe,
-        0xd000d0d0, 0xc400c4c4, 0x31003131, 0xcb00cbcb, 0x2a002a2a, 0xad00adad,
-        0x0f000f0f, 0xca00caca, 0x70007070, 0xff00ffff, 0x32003232, 0x69006969,
-        0x08000808, 0x62006262, 0x00000000, 0x24002424, 0xd100d1d1, 0xfb00fbfb,
-        0xba00baba, 0xed00eded, 0x45004545, 0x81008181, 0x73007373, 0x6d006d6d,
-        0x84008484, 0x9f009f9f, 0xee00eeee, 0x4a004a4a, 0xc300c3c3, 0x2e002e2e,
-        0xc100c1c1, 0x01000101, 0xe600e6e6, 0x25002525, 0x48004848, 0x99009999,
-        0xb900b9b9, 0xb300b3b3, 0x7b007b7b, 0xf900f9f9, 0xce00cece, 0xbf00bfbf,
-        0xdf00dfdf, 0x71007171, 0x29002929, 0xcd00cdcd, 0x6c006c6c, 0x13001313,
-        0x64006464, 0x9b009b9b, 0x63006363, 0x9d009d9d, 0xc000c0c0, 0x4b004b4b,
-        0xb700b7b7, 0xa500a5a5, 0x89008989, 0x5f005f5f, 0xb100b1b1, 0x17001717,
-        0xf400f4f4, 0xbc00bcbc, 0xd300d3d3, 0x46004646, 0xcf00cfcf, 0x37003737,
-        0x5e005e5e, 0x47004747, 0x94009494, 0xfa00fafa, 0xfc00fcfc, 0x5b005b5b,
-        0x97009797, 0xfe00fefe, 0x5a005a5a, 0xac00acac, 0x3c003c3c, 0x4c004c4c,
-        0x03000303, 0x35003535, 0xf300f3f3, 0x23002323, 0xb800b8b8, 0x5d005d5d,
-        0x6a006a6a, 0x92009292, 0xd500d5d5, 0x21002121, 0x44004444, 0x51005151,
-        0xc600c6c6, 0x7d007d7d, 0x39003939, 0x83008383, 0xdc00dcdc, 0xaa00aaaa,
-        0x7c007c7c, 0x77007777, 0x56005656, 0x05000505, 0x1b001b1b, 0xa400a4a4,
-        0x15001515, 0x34003434, 0x1e001e1e, 0x1c001c1c, 0xf800f8f8, 0x52005252,
-        0x20002020, 0x14001414, 0xe900e9e9, 0xbd00bdbd, 0xdd00dddd, 0xe400e4e4,
-        0xa100a1a1, 0xe000e0e0, 0x8a008a8a, 0xf100f1f1, 0xd600d6d6, 0x7a007a7a,
-        0xbb00bbbb, 0xe300e3e3, 0x40004040, 0x4f004f4f
-    };
-
-    private static int rightRotate(int x, int s)
-    {
-        return (((x) >>> (s)) + ((x) << (32 - s)));
-    }
-
-    private static int leftRotate(int x, int s)
-    {
-        return ((x) << (s)) + ((x) >>> (32 - s));
-    }
-
-    private static void roldq(int rot, int[] ki, int ioff,
-                                    int[] ko, int ooff)
-    {
-        ko[0 + ooff] = (ki[0 + ioff] << rot) | (ki[1 + ioff] >>> (32 - rot));
-        ko[1 + ooff] = (ki[1 + ioff] << rot) | (ki[2 + ioff] >>> (32 - rot));
-        ko[2 + ooff] = (ki[2 + ioff] << rot) | (ki[3 + ioff] >>> (32 - rot));
-        ko[3 + ooff] = (ki[3 + ioff] << rot) | (ki[0 + ioff] >>> (32 - rot));
-        ki[0 + ioff] = ko[0 + ooff];
-        ki[1 + ioff] = ko[1 + ooff];
-        ki[2 + ioff] = ko[2 + ooff];
-        ki[3 + ioff] = ko[3 + ooff];
-    }
-
-    private static void decroldq(int rot, int[] ki, int ioff,
-                                       int[] ko, int ooff)
-    {
-        ko[2 + ooff] = (ki[0 + ioff] << rot) | (ki[1 + ioff] >>> (32 - rot));
-        ko[3 + ooff] = (ki[1 + ioff] << rot) | (ki[2 + ioff] >>> (32 - rot));
-        ko[0 + ooff] = (ki[2 + ioff] << rot) | (ki[3 + ioff] >>> (32 - rot));
-        ko[1 + ooff] = (ki[3 + ioff] << rot) | (ki[0 + ioff] >>> (32 - rot));
-        ki[0 + ioff] = ko[2 + ooff];
-        ki[1 + ioff] = ko[3 + ooff];
-        ki[2 + ioff] = ko[0 + ooff];
-        ki[3 + ioff] = ko[1 + ooff];
-    }
-
-    private static void roldqo32(int rot, int[] ki, int ioff,
-                                       int[] ko, int ooff)
-    {
-        ko[0 + ooff] = (ki[1 + ioff] << (rot - 32)) | (ki[2 + ioff] >>> (64 - rot));
-        ko[1 + ooff] = (ki[2 + ioff] << (rot - 32)) | (ki[3 + ioff] >>> (64 - rot));
-        ko[2 + ooff] = (ki[3 + ioff] << (rot - 32)) | (ki[0 + ioff] >>> (64 - rot));
-        ko[3 + ooff] = (ki[0 + ioff] << (rot - 32)) | (ki[1 + ioff] >>> (64 - rot));
-        ki[0 + ioff] = ko[0 + ooff];
-        ki[1 + ioff] = ko[1 + ooff];
-        ki[2 + ioff] = ko[2 + ooff];
-        ki[3 + ioff] = ko[3 + ooff];
-    }
-
-    private static void decroldqo32(int rot, int[] ki, int ioff,
-                                          int[] ko, int ooff)
-    {
-        ko[2 + ooff] = (ki[1 + ioff] << (rot - 32)) | (ki[2 + ioff] >>> (64 - rot));
-        ko[3 + ooff] = (ki[2 + ioff] << (rot - 32)) | (ki[3 + ioff] >>> (64 - rot));
-        ko[0 + ooff] = (ki[3 + ioff] << (rot - 32)) | (ki[0 + ioff] >>> (64 - rot));
-        ko[1 + ooff] = (ki[0 + ioff] << (rot - 32)) | (ki[1 + ioff] >>> (64 - rot));
-        ki[0 + ioff] = ko[2 + ooff];
-        ki[1 + ioff] = ko[3 + ooff];
-        ki[2 + ioff] = ko[0 + ooff];
-        ki[3 + ioff] = ko[1 + ooff];
-    }
-
-    private int bytes2int(byte[] src, int offset)
-    {
-        int word = 0;
-
-        for (int i = 0; i < 4; i++)
-        {
-            word = (word << 8) + (src[i + offset] & MASK8);
-        }
-        return word;
-    }
-
-    private void int2bytes(int word, byte[] dst, int offset)
-    {
-        for (int i = 0; i < 4; i++)
-        {
-            dst[(3 - i) + offset] = (byte)word;
-            word >>>= 8;
-        }
-    }
-
-    private void camelliaF2(int[] s, int[] skey, int keyoff)
-    {
-        int t1, t2, u, v;
-
-        t1 = s[0] ^ skey[0 + keyoff];
-        u = SBOX4_4404[t1 & MASK8];
-        u ^= SBOX3_3033[(t1 >>> 8) & MASK8];
-        u ^= SBOX2_0222[(t1 >>> 16) & MASK8];
-        u ^= SBOX1_1110[(t1 >>> 24) & MASK8];
-        t2 = s[1] ^ skey[1 + keyoff];
-        v = SBOX1_1110[t2 & MASK8];
-        v ^= SBOX4_4404[(t2 >>> 8) & MASK8];
-        v ^= SBOX3_3033[(t2 >>> 16) & MASK8];
-        v ^= SBOX2_0222[(t2 >>> 24) & MASK8];
-
-        s[2] ^= u ^ v;
-        s[3] ^= u ^ v ^ rightRotate(u, 8);
-
-        t1 = s[2] ^ skey[2 + keyoff];
-        u = SBOX4_4404[t1 & MASK8];
-        u ^= SBOX3_3033[(t1 >>> 8) & MASK8];
-        u ^= SBOX2_0222[(t1 >>> 16) & MASK8];
-        u ^= SBOX1_1110[(t1 >>> 24) & MASK8];
-        t2 = s[3] ^ skey[3 + keyoff];
-        v = SBOX1_1110[t2 & MASK8];
-        v ^= SBOX4_4404[(t2 >>> 8) & MASK8];
-        v ^= SBOX3_3033[(t2 >>> 16) & MASK8];
-        v ^= SBOX2_0222[(t2 >>> 24) & MASK8];
-
-        s[0] ^= u ^ v;
-        s[1] ^= u ^ v ^ rightRotate(u, 8);
-    }
-
-    private void camelliaFLs(int[] s, int[] fkey, int keyoff)
-    {
-
-        s[1] ^= leftRotate(s[0] & fkey[0 + keyoff], 1);
-        s[0] ^= fkey[1 + keyoff] | s[1];
-
-        s[2] ^= fkey[3 + keyoff] | s[3];
-        s[3] ^= leftRotate(fkey[2 + keyoff] & s[2], 1);
-    }
-
-    private void setKey(boolean forEncryption, byte[] key)
-    {
-        int[] k = new int[8];
-        int[] ka = new int[4];
-        int[] kb = new int[4];
-        int[] t = new int[4];
-
-        switch (key.length)
-        {
-            case 16:
-                _keyIs128 = true;
-                k[0] = bytes2int(key, 0);
-                k[1] = bytes2int(key, 4);
-                k[2] = bytes2int(key, 8);
-                k[3] = bytes2int(key, 12);
-                k[4] = k[5] = k[6] = k[7] = 0;
-                break;
-            case 24:
-                k[0] = bytes2int(key, 0);
-                k[1] = bytes2int(key, 4);
-                k[2] = bytes2int(key, 8);
-                k[3] = bytes2int(key, 12);
-                k[4] = bytes2int(key, 16);
-                k[5] = bytes2int(key, 20);
-                k[6] = ~k[4];
-                k[7] = ~k[5];
-                _keyIs128 = false;
-                break;
-            case 32:
-                k[0] = bytes2int(key, 0);
-                k[1] = bytes2int(key, 4);
-                k[2] = bytes2int(key, 8);
-                k[3] = bytes2int(key, 12);
-                k[4] = bytes2int(key, 16);
-                k[5] = bytes2int(key, 20);
-                k[6] = bytes2int(key, 24);
-                k[7] = bytes2int(key, 28);
-                _keyIs128 = false;
-                break;
-            default:
-                throw new
-                    IllegalArgumentException("key sizes are only 16/24/32 bytes.");
-        }
-
-        for (int i = 0; i < 4; i++)
-        {
-            ka[i] = k[i] ^ k[i + 4];
-        }
-        /* compute KA */
-        camelliaF2(ka, SIGMA, 0);
-        for (int i = 0; i < 4; i++)
-        {
-            ka[i] ^= k[i];
-        }
-        camelliaF2(ka, SIGMA, 4);
-
-        if (_keyIs128)
-        {
-            if (forEncryption)
-            {
-                /* KL dependant keys */
-                kw[0] = k[0];
-                kw[1] = k[1];
-                kw[2] = k[2];
-                kw[3] = k[3];
-                roldq(15, k, 0, subkey, 4);
-                roldq(30, k, 0, subkey, 12);
-                roldq(15, k, 0, t, 0);
-                subkey[18] = t[2];
-                subkey[19] = t[3];
-                roldq(17, k, 0, ke, 4);
-                roldq(17, k, 0, subkey, 24);
-                roldq(17, k, 0, subkey, 32);
-                /* KA dependant keys */
-                subkey[0] = ka[0];
-                subkey[1] = ka[1];
-                subkey[2] = ka[2];
-                subkey[3] = ka[3];
-                roldq(15, ka, 0, subkey, 8);
-                roldq(15, ka, 0, ke, 0);
-                roldq(15, ka, 0, t, 0);
-                subkey[16] = t[0];
-                subkey[17] = t[1];
-                roldq(15, ka, 0, subkey, 20);
-                roldqo32(34, ka, 0, subkey, 28);
-                roldq(17, ka, 0, kw, 4);
-
-            }
-            else
-            { // decryption
-                /* KL dependant keys */
-                kw[4] = k[0];
-                kw[5] = k[1];
-                kw[6] = k[2];
-                kw[7] = k[3];
-                decroldq(15, k, 0, subkey, 28);
-                decroldq(30, k, 0, subkey, 20);
-                decroldq(15, k, 0, t, 0);
-                subkey[16] = t[0];
-                subkey[17] = t[1];
-                decroldq(17, k, 0, ke, 0);
-                decroldq(17, k, 0, subkey, 8);
-                decroldq(17, k, 0, subkey, 0);
-                /* KA dependant keys */
-                subkey[34] = ka[0];
-                subkey[35] = ka[1];
-                subkey[32] = ka[2];
-                subkey[33] = ka[3];
-                decroldq(15, ka, 0, subkey, 24);
-                decroldq(15, ka, 0, ke, 4);
-                decroldq(15, ka, 0, t, 0);
-                subkey[18] = t[2];
-                subkey[19] = t[3];
-                decroldq(15, ka, 0, subkey, 12);
-                decroldqo32(34, ka, 0, subkey, 4);
-                roldq(17, ka, 0, kw, 0);
-            }
-        }
-        else
-        { // 192bit or 256bit
-            /* compute KB */
-            for (int i = 0; i < 4; i++)
-            {
-                kb[i] = ka[i] ^ k[i + 4];
-            }
-            camelliaF2(kb, SIGMA, 8);
-
-            if (forEncryption)
-            {
-                /* KL dependant keys */
-                kw[0] = k[0];
-                kw[1] = k[1];
-                kw[2] = k[2];
-                kw[3] = k[3];
-                roldqo32(45, k, 0, subkey, 16);
-                roldq(15, k, 0, ke, 4);
-                roldq(17, k, 0, subkey, 32);
-                roldqo32(34, k, 0, subkey, 44);
-                /* KR dependant keys */
-                roldq(15, k, 4, subkey, 4);
-                roldq(15, k, 4, ke, 0);
-                roldq(30, k, 4, subkey, 24);
-                roldqo32(34, k, 4, subkey, 36);
-                /* KA dependant keys */
-                roldq(15, ka, 0, subkey, 8);
-                roldq(30, ka, 0, subkey, 20);
-                /* 32bit rotation */
-                ke[8] = ka[1];
-                ke[9] = ka[2];
-                ke[10] = ka[3];
-                ke[11] = ka[0];
-                roldqo32(49, ka, 0, subkey, 40);
-
-                /* KB dependant keys */
-                subkey[0] = kb[0];
-                subkey[1] = kb[1];
-                subkey[2] = kb[2];
-                subkey[3] = kb[3];
-                roldq(30, kb, 0, subkey, 12);
-                roldq(30, kb, 0, subkey, 28);
-                roldqo32(51, kb, 0, kw, 4);
-
-            }
-            else
-            { // decryption
-                /* KL dependant keys */
-                kw[4] = k[0];
-                kw[5] = k[1];
-                kw[6] = k[2];
-                kw[7] = k[3];
-                decroldqo32(45, k, 0, subkey, 28);
-                decroldq(15, k, 0, ke, 4);
-                decroldq(17, k, 0, subkey, 12);
-                decroldqo32(34, k, 0, subkey, 0);
-                /* KR dependant keys */
-                decroldq(15, k, 4, subkey, 40);
-                decroldq(15, k, 4, ke, 8);
-                decroldq(30, k, 4, subkey, 20);
-                decroldqo32(34, k, 4, subkey, 8);
-                /* KA dependant keys */
-                decroldq(15, ka, 0, subkey, 36);
-                decroldq(30, ka, 0, subkey, 24);
-                /* 32bit rotation */
-                ke[2] = ka[1];
-                ke[3] = ka[2];
-                ke[0] = ka[3];
-                ke[1] = ka[0];
-                decroldqo32(49, ka, 0, subkey, 4);
-
-                /* KB dependant keys */
-                subkey[46] = kb[0];
-                subkey[47] = kb[1];
-                subkey[44] = kb[2];
-                subkey[45] = kb[3];
-                decroldq(30, kb, 0, subkey, 32);
-                decroldq(30, kb, 0, subkey, 16);
-                roldqo32(51, kb, 0, kw, 0);
-            }
-        }
-    }
-
-    private int processBlock128(byte[] in, int inOff,
-                                      byte[] out, int outOff)
-    {
-        for (int i = 0; i < 4; i++)
-        {
-            state[i] = bytes2int(in, inOff + (i * 4));
-            state[i] ^= kw[i];
-        }
-
-        camelliaF2(state, subkey, 0);
-        camelliaF2(state, subkey, 4);
-        camelliaF2(state, subkey, 8);
-        camelliaFLs(state, ke, 0);
-        camelliaF2(state, subkey, 12);
-        camelliaF2(state, subkey, 16);
-        camelliaF2(state, subkey, 20);
-        camelliaFLs(state, ke, 4);
-        camelliaF2(state, subkey, 24);
-        camelliaF2(state, subkey, 28);
-        camelliaF2(state, subkey, 32);
-
-        state[2] ^= kw[4];
-        state[3] ^= kw[5];
-        state[0] ^= kw[6];
-        state[1] ^= kw[7];
-
-        int2bytes(state[2], out, outOff);
-        int2bytes(state[3], out, outOff + 4);
-        int2bytes(state[0], out, outOff + 8);
-        int2bytes(state[1], out, outOff + 12);
-
-        return BLOCK_SIZE;
-    }
-
-    private int processBlock192or256(byte[] in, int inOff,
-                                           byte[] out, int outOff)
-    {
-        for (int i = 0; i < 4; i++)
-        {
-            state[i] = bytes2int(in, inOff + (i * 4));
-            state[i] ^= kw[i];
-        }
-
-        camelliaF2(state, subkey, 0);
-        camelliaF2(state, subkey, 4);
-        camelliaF2(state, subkey, 8);
-        camelliaFLs(state, ke, 0);
-        camelliaF2(state, subkey, 12);
-        camelliaF2(state, subkey, 16);
-        camelliaF2(state, subkey, 20);
-        camelliaFLs(state, ke, 4);
-        camelliaF2(state, subkey, 24);
-        camelliaF2(state, subkey, 28);
-        camelliaF2(state, subkey, 32);
-        camelliaFLs(state, ke, 8);
-        camelliaF2(state, subkey, 36);
-        camelliaF2(state, subkey, 40);
-        camelliaF2(state, subkey, 44);
-
-        state[2] ^= kw[4];
-        state[3] ^= kw[5];
-        state[0] ^= kw[6];
-        state[1] ^= kw[7];
-
-        int2bytes(state[2], out, outOff);
-        int2bytes(state[3], out, outOff + 4);
-        int2bytes(state[0], out, outOff + 8);
-        int2bytes(state[1], out, outOff + 12);
-        return BLOCK_SIZE;
-    }
-
-    public CamelliaEngine()
-    {
-    }
-
-    public void init(boolean forEncryption, CipherParameters params)
-        throws IllegalArgumentException
-    {
-        if (!(params instanceof KeyParameter))
-        {
-            throw new IllegalArgumentException("only simple KeyParameter expected.");
-        }
-
-        setKey(forEncryption, ((KeyParameter)params).getKey());
-        initialised = true;
-    }
-
-    public String getAlgorithmName()
-    {
-        return "Camellia";
-    }
-
-    public int getBlockSize()
-    {
-        return BLOCK_SIZE;
-    }
-
-    public int processBlock(
-        byte[] in,
-        int inOff,
-        byte[] out,
-        int outOff)
-        throws DataLengthException, IllegalStateException
-    {
-        if (!initialised)
-        {
-            throw new IllegalStateException("Camellia engine not initialised");
-        }
-
-        if ((inOff + BLOCK_SIZE) > in.length)
-        {
-            throw new DataLengthException("input buffer too short");
-        }
-
-        if ((outOff + BLOCK_SIZE) > out.length)
-        {
-            throw new OutputLengthException("output buffer too short");
-        }
-
-        if (_keyIs128)
-        {
-            return processBlock128(in, inOff, out, outOff);
-        }
-        else
-        {
-            return processBlock192or256(in, inOff, out, outOff);
-        }
-    }
-
-    public void reset()
-    {
-        // nothing
-
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/engines/CamelliaLightEngine.java b/bcprov/src/main/java/org/bouncycastle/crypto/engines/CamelliaLightEngine.java
deleted file mode 100644
index 2b1e71b..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/engines/CamelliaLightEngine.java
+++ /dev/null
@@ -1,592 +0,0 @@
-package org.bouncycastle.crypto.engines;
-
-import org.bouncycastle.crypto.BlockCipher;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.DataLengthException;
-import org.bouncycastle.crypto.OutputLengthException;
-import org.bouncycastle.crypto.params.KeyParameter;
-
-/**
- * Camellia - based on RFC 3713, smaller implementation, about half the size of CamelliaEngine.
- */
-
-public class CamelliaLightEngine
-    implements BlockCipher
-{
-    private static final int BLOCK_SIZE = 16;
-    private static final int MASK8 = 0xff;
-    private boolean initialized;
-    private boolean _keyis128;
-
-    private int[] subkey = new int[24 * 4];
-    private int[] kw = new int[4 * 2]; // for whitening
-    private int[] ke = new int[6 * 2]; // for FL and FL^(-1)
-    private int[] state = new int[4]; // for encryption and decryption
-
-    private static final int SIGMA[] = {
-        0xa09e667f, 0x3bcc908b,
-        0xb67ae858, 0x4caa73b2,
-        0xc6ef372f, 0xe94f82be,
-        0x54ff53a5, 0xf1d36f1c,
-        0x10e527fa, 0xde682d1d,
-        0xb05688c2, 0xb3e6c1fd
-    };
-
-    /*
-    *
-    * S-box data
-    *
-    */
-    private static final byte SBOX1[] = {
-        (byte)112, (byte)130, (byte)44, (byte)236,
-        (byte)179, (byte)39, (byte)192, (byte)229,
-        (byte)228, (byte)133, (byte)87, (byte)53,
-        (byte)234, (byte)12, (byte)174, (byte)65,
-        (byte)35, (byte)239, (byte)107, (byte)147,
-        (byte)69, (byte)25, (byte)165, (byte)33,
-        (byte)237, (byte)14, (byte)79, (byte)78,
-        (byte)29, (byte)101, (byte)146, (byte)189,
-        (byte)134, (byte)184, (byte)175, (byte)143,
-        (byte)124, (byte)235, (byte)31, (byte)206,
-        (byte)62, (byte)48, (byte)220, (byte)95,
-        (byte)94, (byte)197, (byte)11, (byte)26,
-        (byte)166, (byte)225, (byte)57, (byte)202,
-        (byte)213, (byte)71, (byte)93, (byte)61,
-        (byte)217, (byte)1, (byte)90, (byte)214,
-        (byte)81, (byte)86, (byte)108, (byte)77,
-        (byte)139, (byte)13, (byte)154, (byte)102,
-        (byte)251, (byte)204, (byte)176, (byte)45,
-        (byte)116, (byte)18, (byte)43, (byte)32,
-        (byte)240, (byte)177, (byte)132, (byte)153,
-        (byte)223, (byte)76, (byte)203, (byte)194,
-        (byte)52, (byte)126, (byte)118, (byte)5,
-        (byte)109, (byte)183, (byte)169, (byte)49,
-        (byte)209, (byte)23, (byte)4, (byte)215,
-        (byte)20, (byte)88, (byte)58, (byte)97,
-        (byte)222, (byte)27, (byte)17, (byte)28,
-        (byte)50, (byte)15, (byte)156, (byte)22,
-        (byte)83, (byte)24, (byte)242, (byte)34,
-        (byte)254, (byte)68, (byte)207, (byte)178,
-        (byte)195, (byte)181, (byte)122, (byte)145,
-        (byte)36, (byte)8, (byte)232, (byte)168,
-        (byte)96, (byte)252, (byte)105, (byte)80,
-        (byte)170, (byte)208, (byte)160, (byte)125,
-        (byte)161, (byte)137, (byte)98, (byte)151,
-        (byte)84, (byte)91, (byte)30, (byte)149,
-        (byte)224, (byte)255, (byte)100, (byte)210,
-        (byte)16, (byte)196, (byte)0, (byte)72,
-        (byte)163, (byte)247, (byte)117, (byte)219,
-        (byte)138, (byte)3, (byte)230, (byte)218,
-        (byte)9, (byte)63, (byte)221, (byte)148,
-        (byte)135, (byte)92, (byte)131, (byte)2,
-        (byte)205, (byte)74, (byte)144, (byte)51,
-        (byte)115, (byte)103, (byte)246, (byte)243,
-        (byte)157, (byte)127, (byte)191, (byte)226,
-        (byte)82, (byte)155, (byte)216, (byte)38,
-        (byte)200, (byte)55, (byte)198, (byte)59,
-        (byte)129, (byte)150, (byte)111, (byte)75,
-        (byte)19, (byte)190, (byte)99, (byte)46,
-        (byte)233, (byte)121, (byte)167, (byte)140,
-        (byte)159, (byte)110, (byte)188, (byte)142,
-        (byte)41, (byte)245, (byte)249, (byte)182,
-        (byte)47, (byte)253, (byte)180, (byte)89,
-        (byte)120, (byte)152, (byte)6, (byte)106,
-        (byte)231, (byte)70, (byte)113, (byte)186,
-        (byte)212, (byte)37, (byte)171, (byte)66,
-        (byte)136, (byte)162, (byte)141, (byte)250,
-        (byte)114, (byte)7, (byte)185, (byte)85,
-        (byte)248, (byte)238, (byte)172, (byte)10,
-        (byte)54, (byte)73, (byte)42, (byte)104,
-        (byte)60, (byte)56, (byte)241, (byte)164,
-        (byte)64, (byte)40, (byte)211, (byte)123,
-        (byte)187, (byte)201, (byte)67, (byte)193,
-        (byte)21, (byte)227, (byte)173, (byte)244,
-        (byte)119, (byte)199, (byte)128, (byte)158
-    };
-
-    private static int rightRotate(int x, int s)
-    {
-        return (((x) >>> (s)) + ((x) << (32 - s)));
-    }
-
-    private static int leftRotate(int x, int s)
-    {
-        return ((x) << (s)) + ((x) >>> (32 - s));
-    }
-
-    private static void roldq(int rot, int[] ki, int ioff,
-                                    int[] ko, int ooff)
-    {
-        ko[0 + ooff] = (ki[0 + ioff] << rot) | (ki[1 + ioff] >>> (32 - rot));
-        ko[1 + ooff] = (ki[1 + ioff] << rot) | (ki[2 + ioff] >>> (32 - rot));
-        ko[2 + ooff] = (ki[2 + ioff] << rot) | (ki[3 + ioff] >>> (32 - rot));
-        ko[3 + ooff] = (ki[3 + ioff] << rot) | (ki[0 + ioff] >>> (32 - rot));
-        ki[0 + ioff] = ko[0 + ooff];
-        ki[1 + ioff] = ko[1 + ooff];
-        ki[2 + ioff] = ko[2 + ooff];
-        ki[3 + ioff] = ko[3 + ooff];
-    }
-
-    private static void decroldq(int rot, int[] ki, int ioff,
-                                       int[] ko, int ooff)
-    {
-        ko[2 + ooff] = (ki[0 + ioff] << rot) | (ki[1 + ioff] >>> (32 - rot));
-        ko[3 + ooff] = (ki[1 + ioff] << rot) | (ki[2 + ioff] >>> (32 - rot));
-        ko[0 + ooff] = (ki[2 + ioff] << rot) | (ki[3 + ioff] >>> (32 - rot));
-        ko[1 + ooff] = (ki[3 + ioff] << rot) | (ki[0 + ioff] >>> (32 - rot));
-        ki[0 + ioff] = ko[2 + ooff];
-        ki[1 + ioff] = ko[3 + ooff];
-        ki[2 + ioff] = ko[0 + ooff];
-        ki[3 + ioff] = ko[1 + ooff];
-    }
-
-    private static void roldqo32(int rot, int[] ki, int ioff,
-                                       int[] ko, int ooff)
-    {
-        ko[0 + ooff] = (ki[1 + ioff] << (rot - 32)) | (ki[2 + ioff] >>> (64 - rot));
-        ko[1 + ooff] = (ki[2 + ioff] << (rot - 32)) | (ki[3 + ioff] >>> (64 - rot));
-        ko[2 + ooff] = (ki[3 + ioff] << (rot - 32)) | (ki[0 + ioff] >>> (64 - rot));
-        ko[3 + ooff] = (ki[0 + ioff] << (rot - 32)) | (ki[1 + ioff] >>> (64 - rot));
-        ki[0 + ioff] = ko[0 + ooff];
-        ki[1 + ioff] = ko[1 + ooff];
-        ki[2 + ioff] = ko[2 + ooff];
-        ki[3 + ioff] = ko[3 + ooff];
-    }
-
-    private static void decroldqo32(int rot, int[] ki, int ioff,
-                                          int[] ko, int ooff)
-    {
-        ko[2 + ooff] = (ki[1 + ioff] << (rot - 32)) | (ki[2 + ioff] >>> (64 - rot));
-        ko[3 + ooff] = (ki[2 + ioff] << (rot - 32)) | (ki[3 + ioff] >>> (64 - rot));
-        ko[0 + ooff] = (ki[3 + ioff] << (rot - 32)) | (ki[0 + ioff] >>> (64 - rot));
-        ko[1 + ooff] = (ki[0 + ioff] << (rot - 32)) | (ki[1 + ioff] >>> (64 - rot));
-        ki[0 + ioff] = ko[2 + ooff];
-        ki[1 + ioff] = ko[3 + ooff];
-        ki[2 + ioff] = ko[0 + ooff];
-        ki[3 + ioff] = ko[1 + ooff];
-    }
-
-    private int bytes2int(byte[] src, int offset)
-    {
-        int word = 0;
-
-        for (int i = 0; i < 4; i++)
-        {
-            word = (word << 8) + (src[i + offset] & MASK8);
-        }
-        return word;
-    }
-
-    private void int2bytes(int word, byte[] dst, int offset)
-    {
-        for (int i = 0; i < 4; i++)
-        {
-            dst[(3 - i) + offset] = (byte)word;
-            word >>>= 8;
-        }
-    }
-
-    private byte lRot8(byte v, int rot)
-    {
-        return (byte)((v << rot) | ((v & 0xff) >>> (8 - rot)));
-    }
-
-    private int sbox2(int x)
-    {
-        return (lRot8(SBOX1[x], 1) & MASK8);
-    }
-
-    private int sbox3(int x)
-    {
-        return (lRot8(SBOX1[x], 7) & MASK8);
-    }
-
-    private int sbox4(int x)
-    {
-        return (SBOX1[((int)lRot8((byte)x, 1) & MASK8)] & MASK8);
-    }
-
-    private void camelliaF2(int[] s, int[] skey, int keyoff)
-    {
-        int t1, t2, u, v;
-
-        t1 = s[0] ^ skey[0 + keyoff];
-        u = sbox4((t1 & MASK8));
-        u |= (sbox3(((t1 >>> 8) & MASK8)) << 8);
-        u |= (sbox2(((t1 >>> 16) & MASK8)) << 16);
-        u |= ((int)(SBOX1[((t1 >>> 24) & MASK8)] & MASK8) << 24);
-
-        t2 = s[1] ^ skey[1 + keyoff];
-        v = (int)SBOX1[(t2 & MASK8)] & MASK8;
-        v |= (sbox4(((t2 >>> 8) & MASK8)) << 8);
-        v |= (sbox3(((t2 >>> 16) & MASK8)) << 16);
-        v |= (sbox2(((t2 >>> 24) & MASK8)) << 24);
-
-        v = leftRotate(v, 8);
-        u ^= v;
-        v = leftRotate(v, 8) ^ u;
-        u = rightRotate(u, 8) ^ v;
-        s[2] ^= leftRotate(v, 16) ^ u;
-        s[3] ^= leftRotate(u, 8);
-
-        t1 = s[2] ^ skey[2 + keyoff];
-        u = sbox4((t1 & MASK8));
-        u |= sbox3(((t1 >>> 8) & MASK8)) << 8;
-        u |= sbox2(((t1 >>> 16) & MASK8)) << 16;
-        u |= ((int)SBOX1[((t1 >>> 24) & MASK8)] & MASK8) << 24;
-
-        t2 = s[3] ^ skey[3 + keyoff];
-        v = ((int)SBOX1[(t2 & MASK8)] & MASK8);
-        v |= sbox4(((t2 >>> 8) & MASK8)) << 8;
-        v |= sbox3(((t2 >>> 16) & MASK8)) << 16;
-        v |= sbox2(((t2 >>> 24) & MASK8)) << 24;
-
-        v = leftRotate(v, 8);
-        u ^= v;
-        v = leftRotate(v, 8) ^ u;
-        u = rightRotate(u, 8) ^ v;
-        s[0] ^= leftRotate(v, 16) ^ u;
-        s[1] ^= leftRotate(u, 8);
-    }
-
-    private void camelliaFLs(int[] s, int[] fkey, int keyoff)
-    {
-
-        s[1] ^= leftRotate(s[0] & fkey[0 + keyoff], 1);
-        s[0] ^= fkey[1 + keyoff] | s[1];
-
-        s[2] ^= fkey[3 + keyoff] | s[3];
-        s[3] ^= leftRotate(fkey[2 + keyoff] & s[2], 1);
-    }
-
-    private void setKey(boolean forEncryption, byte[] key)
-    {
-        int[] k = new int[8];
-        int[] ka = new int[4];
-        int[] kb = new int[4];
-        int[] t = new int[4];
-
-        switch (key.length)
-        {
-            case 16:
-                _keyis128 = true;
-                k[0] = bytes2int(key, 0);
-                k[1] = bytes2int(key, 4);
-                k[2] = bytes2int(key, 8);
-                k[3] = bytes2int(key, 12);
-                k[4] = k[5] = k[6] = k[7] = 0;
-                break;
-            case 24:
-                k[0] = bytes2int(key, 0);
-                k[1] = bytes2int(key, 4);
-                k[2] = bytes2int(key, 8);
-                k[3] = bytes2int(key, 12);
-                k[4] = bytes2int(key, 16);
-                k[5] = bytes2int(key, 20);
-                k[6] = ~k[4];
-                k[7] = ~k[5];
-                _keyis128 = false;
-                break;
-            case 32:
-                k[0] = bytes2int(key, 0);
-                k[1] = bytes2int(key, 4);
-                k[2] = bytes2int(key, 8);
-                k[3] = bytes2int(key, 12);
-                k[4] = bytes2int(key, 16);
-                k[5] = bytes2int(key, 20);
-                k[6] = bytes2int(key, 24);
-                k[7] = bytes2int(key, 28);
-                _keyis128 = false;
-                break;
-            default:
-                throw new
-                    IllegalArgumentException("key sizes are only 16/24/32 bytes.");
-        }
-
-        for (int i = 0; i < 4; i++)
-        {
-            ka[i] = k[i] ^ k[i + 4];
-        }
-        /* compute KA */
-        camelliaF2(ka, SIGMA, 0);
-        for (int i = 0; i < 4; i++)
-        {
-            ka[i] ^= k[i];
-        }
-        camelliaF2(ka, SIGMA, 4);
-
-        if (_keyis128)
-        {
-            if (forEncryption)
-            {
-                /* KL dependant keys */
-                kw[0] = k[0];
-                kw[1] = k[1];
-                kw[2] = k[2];
-                kw[3] = k[3];
-                roldq(15, k, 0, subkey, 4);
-                roldq(30, k, 0, subkey, 12);
-                roldq(15, k, 0, t, 0);
-                subkey[18] = t[2];
-                subkey[19] = t[3];
-                roldq(17, k, 0, ke, 4);
-                roldq(17, k, 0, subkey, 24);
-                roldq(17, k, 0, subkey, 32);
-                /* KA dependant keys */
-                subkey[0] = ka[0];
-                subkey[1] = ka[1];
-                subkey[2] = ka[2];
-                subkey[3] = ka[3];
-                roldq(15, ka, 0, subkey, 8);
-                roldq(15, ka, 0, ke, 0);
-                roldq(15, ka, 0, t, 0);
-                subkey[16] = t[0];
-                subkey[17] = t[1];
-                roldq(15, ka, 0, subkey, 20);
-                roldqo32(34, ka, 0, subkey, 28);
-                roldq(17, ka, 0, kw, 4);
-
-            }
-            else
-            { // decryption
-                /* KL dependant keys */
-                kw[4] = k[0];
-                kw[5] = k[1];
-                kw[6] = k[2];
-                kw[7] = k[3];
-                decroldq(15, k, 0, subkey, 28);
-                decroldq(30, k, 0, subkey, 20);
-                decroldq(15, k, 0, t, 0);
-                subkey[16] = t[0];
-                subkey[17] = t[1];
-                decroldq(17, k, 0, ke, 0);
-                decroldq(17, k, 0, subkey, 8);
-                decroldq(17, k, 0, subkey, 0);
-                /* KA dependant keys */
-                subkey[34] = ka[0];
-                subkey[35] = ka[1];
-                subkey[32] = ka[2];
-                subkey[33] = ka[3];
-                decroldq(15, ka, 0, subkey, 24);
-                decroldq(15, ka, 0, ke, 4);
-                decroldq(15, ka, 0, t, 0);
-                subkey[18] = t[2];
-                subkey[19] = t[3];
-                decroldq(15, ka, 0, subkey, 12);
-                decroldqo32(34, ka, 0, subkey, 4);
-                roldq(17, ka, 0, kw, 0);
-            }
-        }
-        else
-        { // 192bit or 256bit
-            /* compute KB */
-            for (int i = 0; i < 4; i++)
-            {
-                kb[i] = ka[i] ^ k[i + 4];
-            }
-            camelliaF2(kb, SIGMA, 8);
-
-            if (forEncryption)
-            {
-                /* KL dependant keys */
-                kw[0] = k[0];
-                kw[1] = k[1];
-                kw[2] = k[2];
-                kw[3] = k[3];
-                roldqo32(45, k, 0, subkey, 16);
-                roldq(15, k, 0, ke, 4);
-                roldq(17, k, 0, subkey, 32);
-                roldqo32(34, k, 0, subkey, 44);
-                /* KR dependant keys */
-                roldq(15, k, 4, subkey, 4);
-                roldq(15, k, 4, ke, 0);
-                roldq(30, k, 4, subkey, 24);
-                roldqo32(34, k, 4, subkey, 36);
-                /* KA dependant keys */
-                roldq(15, ka, 0, subkey, 8);
-                roldq(30, ka, 0, subkey, 20);
-                /* 32bit rotation */
-                ke[8] = ka[1];
-                ke[9] = ka[2];
-                ke[10] = ka[3];
-                ke[11] = ka[0];
-                roldqo32(49, ka, 0, subkey, 40);
-
-                /* KB dependant keys */
-                subkey[0] = kb[0];
-                subkey[1] = kb[1];
-                subkey[2] = kb[2];
-                subkey[3] = kb[3];
-                roldq(30, kb, 0, subkey, 12);
-                roldq(30, kb, 0, subkey, 28);
-                roldqo32(51, kb, 0, kw, 4);
-
-            }
-            else
-            { // decryption
-                /* KL dependant keys */
-                kw[4] = k[0];
-                kw[5] = k[1];
-                kw[6] = k[2];
-                kw[7] = k[3];
-                decroldqo32(45, k, 0, subkey, 28);
-                decroldq(15, k, 0, ke, 4);
-                decroldq(17, k, 0, subkey, 12);
-                decroldqo32(34, k, 0, subkey, 0);
-                /* KR dependant keys */
-                decroldq(15, k, 4, subkey, 40);
-                decroldq(15, k, 4, ke, 8);
-                decroldq(30, k, 4, subkey, 20);
-                decroldqo32(34, k, 4, subkey, 8);
-                /* KA dependant keys */
-                decroldq(15, ka, 0, subkey, 36);
-                decroldq(30, ka, 0, subkey, 24);
-                /* 32bit rotation */
-                ke[2] = ka[1];
-                ke[3] = ka[2];
-                ke[0] = ka[3];
-                ke[1] = ka[0];
-                decroldqo32(49, ka, 0, subkey, 4);
-
-                /* KB dependant keys */
-                subkey[46] = kb[0];
-                subkey[47] = kb[1];
-                subkey[44] = kb[2];
-                subkey[45] = kb[3];
-                decroldq(30, kb, 0, subkey, 32);
-                decroldq(30, kb, 0, subkey, 16);
-                roldqo32(51, kb, 0, kw, 0);
-            }
-        }
-    }
-
-    private int processBlock128(byte[] in, int inOff,
-                                      byte[] out, int outOff)
-    {
-        for (int i = 0; i < 4; i++)
-        {
-            state[i] = bytes2int(in, inOff + (i * 4));
-            state[i] ^= kw[i];
-        }
-
-        camelliaF2(state, subkey, 0);
-        camelliaF2(state, subkey, 4);
-        camelliaF2(state, subkey, 8);
-        camelliaFLs(state, ke, 0);
-        camelliaF2(state, subkey, 12);
-        camelliaF2(state, subkey, 16);
-        camelliaF2(state, subkey, 20);
-        camelliaFLs(state, ke, 4);
-        camelliaF2(state, subkey, 24);
-        camelliaF2(state, subkey, 28);
-        camelliaF2(state, subkey, 32);
-
-        state[2] ^= kw[4];
-        state[3] ^= kw[5];
-        state[0] ^= kw[6];
-        state[1] ^= kw[7];
-
-        int2bytes(state[2], out, outOff);
-        int2bytes(state[3], out, outOff + 4);
-        int2bytes(state[0], out, outOff + 8);
-        int2bytes(state[1], out, outOff + 12);
-
-        return BLOCK_SIZE;
-    }
-
-    private int processBlock192or256(byte[] in, int inOff,
-                                           byte[] out, int outOff)
-    {
-        for (int i = 0; i < 4; i++)
-        {
-            state[i] = bytes2int(in, inOff + (i * 4));
-            state[i] ^= kw[i];
-        }
-
-        camelliaF2(state, subkey, 0);
-        camelliaF2(state, subkey, 4);
-        camelliaF2(state, subkey, 8);
-        camelliaFLs(state, ke, 0);
-        camelliaF2(state, subkey, 12);
-        camelliaF2(state, subkey, 16);
-        camelliaF2(state, subkey, 20);
-        camelliaFLs(state, ke, 4);
-        camelliaF2(state, subkey, 24);
-        camelliaF2(state, subkey, 28);
-        camelliaF2(state, subkey, 32);
-        camelliaFLs(state, ke, 8);
-        camelliaF2(state, subkey, 36);
-        camelliaF2(state, subkey, 40);
-        camelliaF2(state, subkey, 44);
-
-        state[2] ^= kw[4];
-        state[3] ^= kw[5];
-        state[0] ^= kw[6];
-        state[1] ^= kw[7];
-
-        int2bytes(state[2], out, outOff);
-        int2bytes(state[3], out, outOff + 4);
-        int2bytes(state[0], out, outOff + 8);
-        int2bytes(state[1], out, outOff + 12);
-        return BLOCK_SIZE;
-    }
-
-    public CamelliaLightEngine()
-    {
-    }
-
-    public String getAlgorithmName()
-    {
-        return "Camellia";
-    }
-
-    public int getBlockSize()
-    {
-        return BLOCK_SIZE;
-    }
-
-    public void init(boolean forEncryption, CipherParameters params)
-    {
-        if (!(params instanceof KeyParameter))
-        {
-            throw new IllegalArgumentException("only simple KeyParameter expected.");
-        }
-
-        setKey(forEncryption, ((KeyParameter)params).getKey());
-        initialized = true;
-    }
-
-    public int processBlock(byte[] in, int inOff,
-                            byte[] out, int outOff)
-        throws IllegalStateException
-    {
-
-        if (!initialized)
-        {
-            throw new IllegalStateException("Camellia is not initialized");
-        }
-
-        if ((inOff + BLOCK_SIZE) > in.length)
-        {
-            throw new DataLengthException("input buffer too short");
-        }
-
-        if ((outOff + BLOCK_SIZE) > out.length)
-        {
-            throw new OutputLengthException("output buffer too short");
-        }
-        
-        if (_keyis128)
-        {
-            return processBlock128(in, inOff, out, outOff);
-        }
-        else
-        {
-            return processBlock192or256(in, inOff, out, outOff);
-        }
-    }
-
-    public void reset()
-    {
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/engines/CamelliaWrapEngine.java b/bcprov/src/main/java/org/bouncycastle/crypto/engines/CamelliaWrapEngine.java
deleted file mode 100644
index 5ca239a..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/engines/CamelliaWrapEngine.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package org.bouncycastle.crypto.engines;
-
-/**
- * An implementation of the Camellia key wrapper based on RFC 3657/RFC 3394.
- * <p>
- * For further details see: <a href="http://www.ietf.org/rfc/rfc3657.txt">http://www.ietf.org/rfc/rfc3657.txt</a>.
- */
-public class CamelliaWrapEngine
-    extends RFC3394WrapEngine
-{
-    public CamelliaWrapEngine()
-    {
-        super(new CamelliaEngine());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/engines/ChaChaEngine.java b/bcprov/src/main/java/org/bouncycastle/crypto/engines/ChaChaEngine.java
deleted file mode 100644
index d4c4389..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/engines/ChaChaEngine.java
+++ /dev/null
@@ -1,259 +0,0 @@
-package org.bouncycastle.crypto.engines;
-
-import org.bouncycastle.util.Pack;
-
-/**
- * Implementation of Daniel J. Bernstein's ChaCha stream cipher.
- */
-public class ChaChaEngine extends Salsa20Engine
-{
-    /**
-     * Creates a 20 rounds ChaCha engine.
-     */
-    public ChaChaEngine()
-    {
-        super();
-    }
-
-    /**
-     * Creates a ChaCha engine with a specific number of rounds.
-     * @param rounds the number of rounds (must be an even number).
-     */
-    public ChaChaEngine(int rounds)
-    {
-        super(rounds);
-    }
-
-    public String getAlgorithmName()
-    {
-        return "ChaCha" + rounds;
-    }
-
-    protected void advanceCounter(long diff)
-    {
-        int hi = (int)(diff >>> 32);
-        int lo = (int)diff;
-
-        if (hi > 0)
-        {
-            engineState[13] += hi;
-        }
-
-        int oldState = engineState[12];
-
-        engineState[12] += lo;
-
-        if (oldState != 0 && engineState[12] < oldState)
-        {
-            engineState[13]++;
-        }
-    }
-
-    protected void advanceCounter()
-    {
-        if (++engineState[12] == 0)
-        {
-            ++engineState[13];
-        }
-    }
-
-    protected void retreatCounter(long diff)
-    {
-        int hi = (int)(diff >>> 32);
-        int lo = (int)diff;
-
-        if (hi != 0)
-        {
-            if ((engineState[13] & 0xffffffffL) >= (hi & 0xffffffffL))
-            {
-                engineState[13] -= hi;
-            }
-            else
-            {
-                throw new IllegalStateException("attempt to reduce counter past zero.");
-            }
-        }
-
-        if ((engineState[12] & 0xffffffffL) >= (lo & 0xffffffffL))
-        {
-            engineState[12] -= lo;
-        }
-        else
-        {
-            if (engineState[13] != 0)
-            {
-                --engineState[13];
-                engineState[12] -= lo;
-            }
-            else
-            {
-                throw new IllegalStateException("attempt to reduce counter past zero.");
-            }
-        }
-    }
-
-    protected void retreatCounter()
-    {
-        if (engineState[12] == 0 && engineState[13] == 0)
-        {
-            throw new IllegalStateException("attempt to reduce counter past zero.");
-        }
-
-        if (--engineState[12] == -1)
-        {
-            --engineState[13];
-        }
-    }
-
-    protected long getCounter()
-    {
-        return ((long)engineState[13] << 32) | (engineState[12] & 0xffffffffL);
-    }
-
-    protected void resetCounter()
-    {
-        engineState[12] = engineState[13] = 0;
-    }
-
-    protected void setKey(byte[] keyBytes, byte[] ivBytes)
-    {
-        if (keyBytes != null)
-        {
-            if ((keyBytes.length != 16) && (keyBytes.length != 32))
-            {
-                throw new IllegalArgumentException(getAlgorithmName() + " requires 128 bit or 256 bit key");
-            }
-
-            // Key
-            engineState[4] = Pack.littleEndianToInt(keyBytes, 0);
-            engineState[5] = Pack.littleEndianToInt(keyBytes, 4);
-            engineState[6] = Pack.littleEndianToInt(keyBytes, 8);
-            engineState[7] = Pack.littleEndianToInt(keyBytes, 12);
-
-            byte[] constants;
-            int offset;
-            if (keyBytes.length == 32)
-            {
-                constants = sigma;
-                offset = 16;
-            }
-            else
-            {
-                constants = tau;
-                offset = 0;
-            }
-
-            engineState[8] = Pack.littleEndianToInt(keyBytes, offset);
-            engineState[9] = Pack.littleEndianToInt(keyBytes, offset + 4);
-            engineState[10] = Pack.littleEndianToInt(keyBytes, offset + 8);
-            engineState[11] = Pack.littleEndianToInt(keyBytes, offset + 12);
-
-            engineState[0] = Pack.littleEndianToInt(constants, 0);
-            engineState[1] = Pack.littleEndianToInt(constants, 4);
-            engineState[2] = Pack.littleEndianToInt(constants, 8);
-            engineState[3] = Pack.littleEndianToInt(constants, 12);
-        }
-
-        // IV
-        engineState[14] = Pack.littleEndianToInt(ivBytes, 0);
-        engineState[15] = Pack.littleEndianToInt(ivBytes, 4);
-    }
-
-    protected void generateKeyStream(byte[] output)
-    {
-        chachaCore(rounds, engineState, x);
-        Pack.intToLittleEndian(x, output, 0);
-    }
-
-    /**
-     * ChacCha function
-     *
-     * @param   input   input data
-     */    
-    public static void chachaCore(int rounds, int[] input, int[] x)
-    {
-        if (input.length != 16)
-        {
-            throw new IllegalArgumentException();
-        }
-        if (x.length != 16)
-        {
-            throw new IllegalArgumentException();
-        }
-        if (rounds % 2 != 0)
-        {
-            throw new IllegalArgumentException("Number of rounds must be even");
-        }
-
-        int x00 = input[ 0];
-        int x01 = input[ 1];
-        int x02 = input[ 2];
-        int x03 = input[ 3];
-        int x04 = input[ 4];
-        int x05 = input[ 5];
-        int x06 = input[ 6];
-        int x07 = input[ 7];
-        int x08 = input[ 8];
-        int x09 = input[ 9];
-        int x10 = input[10];
-        int x11 = input[11];
-        int x12 = input[12];
-        int x13 = input[13];
-        int x14 = input[14];
-        int x15 = input[15];
-
-        for (int i = rounds; i > 0; i -= 2)
-        {
-            x00 += x04; x12 = rotl(x12 ^ x00, 16);
-            x08 += x12; x04 = rotl(x04 ^ x08, 12);
-            x00 += x04; x12 = rotl(x12 ^ x00, 8);
-            x08 += x12; x04 = rotl(x04 ^ x08, 7);
-            x01 += x05; x13 = rotl(x13 ^ x01, 16);
-            x09 += x13; x05 = rotl(x05 ^ x09, 12);
-            x01 += x05; x13 = rotl(x13 ^ x01, 8);
-            x09 += x13; x05 = rotl(x05 ^ x09, 7);
-            x02 += x06; x14 = rotl(x14 ^ x02, 16);
-            x10 += x14; x06 = rotl(x06 ^ x10, 12);
-            x02 += x06; x14 = rotl(x14 ^ x02, 8);
-            x10 += x14; x06 = rotl(x06 ^ x10, 7);
-            x03 += x07; x15 = rotl(x15 ^ x03, 16);
-            x11 += x15; x07 = rotl(x07 ^ x11, 12);
-            x03 += x07; x15 = rotl(x15 ^ x03, 8);
-            x11 += x15; x07 = rotl(x07 ^ x11, 7);
-            x00 += x05; x15 = rotl(x15 ^ x00, 16);
-            x10 += x15; x05 = rotl(x05 ^ x10, 12);
-            x00 += x05; x15 = rotl(x15 ^ x00, 8);
-            x10 += x15; x05 = rotl(x05 ^ x10, 7);
-            x01 += x06; x12 = rotl(x12 ^ x01, 16);
-            x11 += x12; x06 = rotl(x06 ^ x11, 12);
-            x01 += x06; x12 = rotl(x12 ^ x01, 8);
-            x11 += x12; x06 = rotl(x06 ^ x11, 7);
-            x02 += x07; x13 = rotl(x13 ^ x02, 16);
-            x08 += x13; x07 = rotl(x07 ^ x08, 12);
-            x02 += x07; x13 = rotl(x13 ^ x02, 8);
-            x08 += x13; x07 = rotl(x07 ^ x08, 7);
-            x03 += x04; x14 = rotl(x14 ^ x03, 16);
-            x09 += x14; x04 = rotl(x04 ^ x09, 12);
-            x03 += x04; x14 = rotl(x14 ^ x03, 8);
-            x09 += x14; x04 = rotl(x04 ^ x09, 7);
-
-        }
-
-        x[ 0] = x00 + input[ 0];
-        x[ 1] = x01 + input[ 1];
-        x[ 2] = x02 + input[ 2];
-        x[ 3] = x03 + input[ 3];
-        x[ 4] = x04 + input[ 4];
-        x[ 5] = x05 + input[ 5];
-        x[ 6] = x06 + input[ 6];
-        x[ 7] = x07 + input[ 7];
-        x[ 8] = x08 + input[ 8];
-        x[ 9] = x09 + input[ 9];
-        x[10] = x10 + input[10];
-        x[11] = x11 + input[11];
-        x[12] = x12 + input[12];
-        x[13] = x13 + input[13];
-        x[14] = x14 + input[14];
-        x[15] = x15 + input[15];
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/engines/CramerShoupCiphertext.java b/bcprov/src/main/java/org/bouncycastle/crypto/engines/CramerShoupCiphertext.java
deleted file mode 100644
index 5c4e608..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/engines/CramerShoupCiphertext.java
+++ /dev/null
@@ -1,147 +0,0 @@
-package org.bouncycastle.crypto.engines;
-
-import java.math.BigInteger;
-
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.Pack;
-
-/**
- * Class, holding Cramer Shoup ciphertexts (u1, u2, e, v)
- */
-public class CramerShoupCiphertext
-{
-    BigInteger u1, u2, e, v;
-
-    public CramerShoupCiphertext()
-    {
-    }
-
-    public CramerShoupCiphertext(BigInteger u1, BigInteger u2, BigInteger e, BigInteger v)
-    {
-        this.u1 = u1;
-        this.u2 = u2;
-        this.e = e;
-        this.v = v;
-    }
-
-    public CramerShoupCiphertext(byte[] c)
-    {
-        int off = 0, s;
-        byte[] tmp;
-
-        s = Pack.bigEndianToInt(c, off);
-        off += 4;
-        tmp = Arrays.copyOfRange(c, off, off + s);
-        off += s;
-        u1 = new BigInteger(tmp);
-
-        s = Pack.bigEndianToInt(c, off);
-        off += 4;
-        tmp = Arrays.copyOfRange(c, off, off + s);
-        off += s;
-        u2 = new BigInteger(tmp);
-
-        s = Pack.bigEndianToInt(c, off);
-        off += 4;
-        tmp = Arrays.copyOfRange(c, off, off + s);
-        off += s;
-        e = new BigInteger(tmp);
-
-        s = Pack.bigEndianToInt(c, off);
-        off += 4;
-        tmp = Arrays.copyOfRange(c, off, off + s);
-        off += s;
-        v = new BigInteger(tmp);
-    }
-
-    public BigInteger getU1()
-    {
-        return u1;
-    }
-
-    public void setU1(BigInteger u1)
-    {
-        this.u1 = u1;
-    }
-
-    public BigInteger getU2()
-    {
-        return u2;
-    }
-
-    public void setU2(BigInteger u2)
-    {
-        this.u2 = u2;
-    }
-
-    public BigInteger getE()
-    {
-        return e;
-    }
-
-    public void setE(BigInteger e)
-    {
-        this.e = e;
-    }
-
-    public BigInteger getV()
-    {
-        return v;
-    }
-
-    public void setV(BigInteger v)
-    {
-        this.v = v;
-    }
-
-    public String toString()
-    {
-        StringBuffer result = new StringBuffer();
-
-        result.append("u1: " + u1.toString());
-        result.append("\nu2: " + u2.toString());
-        result.append("\ne: " + e.toString());
-        result.append("\nv: " + v.toString());
-
-        return result.toString();
-    }
-
-    /**
-     * convert the cipher-text in a byte array,
-     * prepending them with 4 Bytes for their length
-     *
-     * @return
-     */
-    public byte[] toByteArray()
-    {
-        byte[] u1Bytes = u1.toByteArray();
-        int u1Length = u1Bytes.length;
-        byte[] u2Bytes = u2.toByteArray();
-        int u2Length = u2Bytes.length;
-        byte[] eBytes = e.toByteArray();
-        int eLength = eBytes.length;
-        byte[] vBytes = v.toByteArray();
-        int vLength = vBytes.length;
-
-        int off = 0;
-        byte[] result = new byte[u1Length + u2Length + eLength + vLength + 4 * 4];
-        Pack.intToBigEndian(u1Length, result, off);
-        off += 4;
-        System.arraycopy(u1Bytes, 0, result, off, u1Length);
-        off += u1Length;
-        Pack.intToBigEndian(u2Length, result, off);
-        off += 4;
-        System.arraycopy(u2Bytes, 0, result, off, u2Length);
-        off += u2Length;
-        Pack.intToBigEndian(eLength, result, off);
-        off += 4;
-        System.arraycopy(eBytes, 0, result, off, eLength);
-        off += eLength;
-        Pack.intToBigEndian(vLength, result, off);
-        off += 4;
-        System.arraycopy(vBytes, 0, result, off, vLength);
-        off += vLength;
-
-        return result;
-    }
-}
\ No newline at end of file
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/engines/CramerShoupCoreEngine.java b/bcprov/src/main/java/org/bouncycastle/crypto/engines/CramerShoupCoreEngine.java
deleted file mode 100644
index 5102f15..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/engines/CramerShoupCoreEngine.java
+++ /dev/null
@@ -1,309 +0,0 @@
-package org.bouncycastle.crypto.engines;
-
-import java.math.BigInteger;
-import java.security.SecureRandom;
-
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.DataLengthException;
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.params.CramerShoupKeyParameters;
-import org.bouncycastle.crypto.params.CramerShoupPrivateKeyParameters;
-import org.bouncycastle.crypto.params.CramerShoupPublicKeyParameters;
-import org.bouncycastle.crypto.params.ParametersWithRandom;
-import org.bouncycastle.util.BigIntegers;
-
-/**
- * Essentially the Cramer-Shoup encryption / decryption algorithms according to
- * "A practical public key cryptosystem provably secure against adaptive chosen ciphertext attack." (Crypto 1998)
- */
-public class CramerShoupCoreEngine
-{
-
-    private static final BigInteger ONE = BigInteger.valueOf(1);
-
-    private CramerShoupKeyParameters key;
-    private SecureRandom random;
-    private boolean forEncryption;
-    private String label = null;
-
-    /**
-     * initialise the CramerShoup engine.
-     *
-     * @param forEncryption whether this engine should encrypt or decrypt
-     * @param param         the necessary CramerShoup key parameters.
-     * @param label         the label for labelled CS as {@link String}
-     */
-    public void init(boolean forEncryption, CipherParameters param, String label)
-    {
-        init(forEncryption, param);
-
-        this.label = label;
-    }
-
-    /**
-     * initialise the CramerShoup engine.
-     *
-     * @param forEncryption whether this engine should encrypt or decrypt
-     * @param param         the necessary CramerShoup key parameters.
-     */
-    public void init(boolean forEncryption, CipherParameters param)
-    {
-        SecureRandom providedRandom = null;
-
-        if (param instanceof ParametersWithRandom)
-        {
-            ParametersWithRandom rParam = (ParametersWithRandom)param;
-
-            key = (CramerShoupKeyParameters)rParam.getParameters();
-            providedRandom = rParam.getRandom();
-        }
-        else
-        {
-            key = (CramerShoupKeyParameters)param;
-        }
-
-        this.random = initSecureRandom(forEncryption, providedRandom);
-        this.forEncryption = forEncryption;
-    }
-
-    /**
-     * Return the maximum size for an input block to this engine. For Cramer
-     * Shoup this is always one byte less than the key size on encryption, and
-     * the same length as the key size on decryption.
-     * TODO: correct?
-     * @return maximum size for an input block.
-     */
-    public int getInputBlockSize()
-    {
-        int bitSize = key.getParameters().getP().bitLength();
-
-        if (forEncryption)
-        {
-            return (bitSize + 7) / 8 - 1;
-        }
-        else
-        {
-            return (bitSize + 7) / 8;
-        }
-    }
-
-    /**
-     * Return the maximum size for an output block to this engine. For Cramer
-     * Shoup this is always one byte less than the key size on decryption, and
-     * the same length as the key size on encryption.
-     * TODO: correct?
-     * @return maximum size for an output block.
-     */
-    public int getOutputBlockSize()
-    {
-        int bitSize = key.getParameters().getP().bitLength();
-
-        if (forEncryption)
-        {
-            return (bitSize + 7) / 8;
-        }
-        else
-        {
-            return (bitSize + 7) / 8 - 1;
-        }
-    }
-
-    public BigInteger convertInput(byte[] in, int inOff, int inLen)
-    {
-        if (inLen > (getInputBlockSize() + 1))
-        {
-            throw new DataLengthException("input too large for Cramer Shoup cipher.");
-        }
-        else if (inLen == (getInputBlockSize() + 1) && forEncryption)
-        {
-            throw new DataLengthException("input too large for Cramer Shoup cipher.");
-        }
-
-        byte[] block;
-
-        if (inOff != 0 || inLen != in.length)
-        {
-            block = new byte[inLen];
-
-            System.arraycopy(in, inOff, block, 0, inLen);
-        }
-        else
-        {
-            block = in;
-        }
-
-        BigInteger res = new BigInteger(1, block);
-        if (res.compareTo(key.getParameters().getP()) >= 0)
-        {
-            throw new DataLengthException("input too large for Cramer Shoup cipher.");
-        }
-
-        return res;
-    }
-
-    public byte[] convertOutput(BigInteger result)
-    {
-        byte[] output = result.toByteArray();
-
-        if (!forEncryption)
-        {
-            if (output[0] == 0 && output.length > getOutputBlockSize())
-            { // have ended up with an extra zero byte, copy down.
-                byte[] tmp = new byte[output.length - 1];
-
-                System.arraycopy(output, 1, tmp, 0, tmp.length);
-
-                return tmp;
-            }
-
-            if (output.length < getOutputBlockSize())
-            {// have ended up with less bytes than normal, lengthen
-                byte[] tmp = new byte[getOutputBlockSize()];
-
-                System.arraycopy(output, 0, tmp, tmp.length - output.length, output.length);
-
-                return tmp;
-            }
-        }
-        else
-        {
-            if (output[0] == 0)
-            { // have ended up with an extra zero byte, copy down.
-                byte[] tmp = new byte[output.length - 1];
-
-                System.arraycopy(output, 1, tmp, 0, tmp.length);
-
-                return tmp;
-            }
-        }
-
-        return output;
-    }
-
-    public CramerShoupCiphertext encryptBlock(BigInteger input)
-    {
-
-        CramerShoupCiphertext result = null;
-
-        if (!key.isPrivate() && this.forEncryption && key instanceof CramerShoupPublicKeyParameters)
-        {
-            CramerShoupPublicKeyParameters pk = (CramerShoupPublicKeyParameters)key;
-            BigInteger p = pk.getParameters().getP();
-            BigInteger g1 = pk.getParameters().getG1();
-            BigInteger g2 = pk.getParameters().getG2();
-
-            BigInteger h = pk.getH();
-
-            if (!isValidMessage(input, p))
-            {
-                return result;
-            }
-
-            BigInteger r = generateRandomElement(p, random);
-
-            BigInteger u1, u2, v, e, a;
-
-            u1 = g1.modPow(r, p);
-            u2 = g2.modPow(r, p);
-            e = h.modPow(r, p).multiply(input).mod(p);
-
-            Digest digest = pk.getParameters().getH();
-            byte[] u1Bytes = u1.toByteArray();
-            digest.update(u1Bytes, 0, u1Bytes.length);
-            byte[] u2Bytes = u2.toByteArray();
-            digest.update(u2Bytes, 0, u2Bytes.length);
-            byte[] eBytes = e.toByteArray();
-            digest.update(eBytes, 0, eBytes.length);
-            if (this.label != null)
-            {
-                byte[] lBytes = this.label.getBytes();
-                digest.update(lBytes, 0, lBytes.length);
-            }
-            byte[] out = new byte[digest.getDigestSize()];
-            digest.doFinal(out, 0);
-            a = new BigInteger(1, out);
-
-            v = pk.getC().modPow(r, p).multiply(pk.getD().modPow(r.multiply(a), p)).mod(p);
-
-            result = new CramerShoupCiphertext(u1, u2, e, v);
-        }
-        return result;
-    }
-
-    public BigInteger decryptBlock(CramerShoupCiphertext input)
-        throws CramerShoupCiphertextException
-    {
-
-        BigInteger result = null;
-
-        if (key.isPrivate() && !this.forEncryption && key instanceof CramerShoupPrivateKeyParameters)
-        {
-            CramerShoupPrivateKeyParameters sk = (CramerShoupPrivateKeyParameters)key;
-
-            BigInteger p = sk.getParameters().getP();
-
-            Digest digest = sk.getParameters().getH();
-            byte[] u1Bytes = input.getU1().toByteArray();
-            digest.update(u1Bytes, 0, u1Bytes.length);
-            byte[] u2Bytes = input.getU2().toByteArray();
-            digest.update(u2Bytes, 0, u2Bytes.length);
-            byte[] eBytes = input.getE().toByteArray();
-            digest.update(eBytes, 0, eBytes.length);
-            if (this.label != null)
-            {
-                byte[] lBytes = this.label.getBytes();
-                digest.update(lBytes, 0, lBytes.length);
-            }
-            byte[] out = new byte[digest.getDigestSize()];
-            digest.doFinal(out, 0);
-
-            BigInteger a = new BigInteger(1, out);
-            BigInteger v = input.u1.modPow(sk.getX1().add(sk.getY1().multiply(a)), p).
-                multiply(input.u2.modPow(sk.getX2().add(sk.getY2().multiply(a)), p)).mod(p);
-
-            // check correctness of ciphertext
-            if (input.v.equals(v))
-            {
-                result = input.e.multiply(input.u1.modPow(sk.getZ(), p).modInverse(p)).mod(p);
-            }
-            else
-            {
-                throw new CramerShoupCiphertextException("Sorry, that ciphertext is not correct");
-            }
-        }
-        return result;
-    }
-
-    private BigInteger generateRandomElement(BigInteger p, SecureRandom random)
-    {
-        return BigIntegers.createRandomInRange(ONE, p.subtract(ONE), random);
-    }
-
-    /**
-     * just checking whether the message m is actually less than the group order p
-     */
-    private boolean isValidMessage(BigInteger m, BigInteger p)
-    {
-        return m.compareTo(p) < 0;
-    }
-
-    protected SecureRandom initSecureRandom(boolean needed, SecureRandom provided)
-    {
-        return !needed ? null : (provided != null) ? provided : new SecureRandom();
-    }
-
-    /**
-     * CS exception for wrong cipher-texts
-     */
-    public static class CramerShoupCiphertextException
-        extends Exception
-    {
-        private static final long serialVersionUID = -6360977166495345076L;
-
-        public CramerShoupCiphertextException(String msg)
-        {
-            super(msg);
-        }
-
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/engines/DESedeWrapEngine.java b/bcprov/src/main/java/org/bouncycastle/crypto/engines/DESedeWrapEngine.java
index 923a79c..197b151 100644
--- a/bcprov/src/main/java/org/bouncycastle/crypto/engines/DESedeWrapEngine.java
+++ b/bcprov/src/main/java/org/bouncycastle/crypto/engines/DESedeWrapEngine.java
@@ -6,7 +6,9 @@ import org.bouncycastle.crypto.CipherParameters;
 import org.bouncycastle.crypto.Digest;
 import org.bouncycastle.crypto.InvalidCipherTextException;
 import org.bouncycastle.crypto.Wrapper;
-import org.bouncycastle.crypto.digests.SHA1Digest;
+// BEGIN android-changed
+import org.bouncycastle.crypto.digests.AndroidDigestFactory;
+// END android-changed
 import org.bouncycastle.crypto.modes.CBCBlockCipher;
 import org.bouncycastle.crypto.params.KeyParameter;
 import org.bouncycastle.crypto.params.ParametersWithIV;
@@ -52,7 +54,9 @@ public class DESedeWrapEngine
     //
     // checksum digest
     //
-    Digest  sha1 = new SHA1Digest();
+    // BEGIN android-changed
+    Digest  sha1 = AndroidDigestFactory.getSHA1();
+    // END android-changed
     byte[]  digest = new byte[20];
 
    /**
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/engines/ElGamalEngine.java b/bcprov/src/main/java/org/bouncycastle/crypto/engines/ElGamalEngine.java
deleted file mode 100644
index ef8e799..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/engines/ElGamalEngine.java
+++ /dev/null
@@ -1,217 +0,0 @@
-package org.bouncycastle.crypto.engines;
-
-import java.math.BigInteger;
-import java.security.SecureRandom;
-
-import org.bouncycastle.crypto.AsymmetricBlockCipher;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.DataLengthException;
-import org.bouncycastle.crypto.params.ElGamalKeyParameters;
-import org.bouncycastle.crypto.params.ElGamalPrivateKeyParameters;
-import org.bouncycastle.crypto.params.ElGamalPublicKeyParameters;
-import org.bouncycastle.crypto.params.ParametersWithRandom;
-import org.bouncycastle.util.BigIntegers;
-
-/**
- * this does your basic ElGamal algorithm.
- */
-public class ElGamalEngine
-    implements AsymmetricBlockCipher
-{
-    private ElGamalKeyParameters    key;
-    private SecureRandom            random;
-    private boolean                 forEncryption;
-    private int                     bitSize;
-
-    private static final BigInteger ZERO = BigInteger.valueOf(0);
-    private static final BigInteger ONE = BigInteger.valueOf(1);
-    private static final BigInteger TWO = BigInteger.valueOf(2);
-
-    /**
-     * initialise the ElGamal engine.
-     *
-     * @param forEncryption true if we are encrypting, false otherwise.
-     * @param param the necessary ElGamal key parameters.
-     */
-    public void init(
-        boolean             forEncryption,
-        CipherParameters    param)
-    {
-        if (param instanceof ParametersWithRandom)
-        {
-            ParametersWithRandom    p = (ParametersWithRandom)param;
-
-            this.key = (ElGamalKeyParameters)p.getParameters();
-            this.random = p.getRandom();
-        }
-        else
-        {
-            this.key = (ElGamalKeyParameters)param;
-            this.random = new SecureRandom();
-        }
-
-        this.forEncryption = forEncryption;
-
-        BigInteger p = key.getParameters().getP();
-
-        bitSize = p.bitLength();
-
-        if (forEncryption)
-        {
-            if (!(key instanceof ElGamalPublicKeyParameters))
-            {
-                throw new IllegalArgumentException("ElGamalPublicKeyParameters are required for encryption.");
-            }
-        }
-        else
-        {
-            if (!(key instanceof ElGamalPrivateKeyParameters))
-            {
-                throw new IllegalArgumentException("ElGamalPrivateKeyParameters are required for decryption.");
-            }
-        }
-    }
-
-    /**
-     * Return the maximum size for an input block to this engine.
-     * For ElGamal this is always one byte less than the size of P on
-     * encryption, and twice the length as the size of P on decryption.
-     *
-     * @return maximum size for an input block.
-     */
-    public int getInputBlockSize()
-    {
-        if (forEncryption)
-        {
-            return (bitSize - 1) / 8;
-        }
-
-        return 2 * ((bitSize + 7) / 8);
-    }
-
-    /**
-     * Return the maximum size for an output block to this engine.
-     * For ElGamal this is always one byte less than the size of P on
-     * decryption, and twice the length as the size of P on encryption.
-     *
-     * @return maximum size for an output block.
-     */
-    public int getOutputBlockSize()
-    {
-        if (forEncryption)
-        {
-            return 2 * ((bitSize + 7) / 8);
-        }
-
-        return (bitSize - 1) / 8;
-    }
-
-    /**
-     * Process a single block using the basic ElGamal algorithm.
-     *
-     * @param in the input array.
-     * @param inOff the offset into the input buffer where the data starts.
-     * @param inLen the length of the data to be processed.
-     * @return the result of the ElGamal process.
-     * @exception DataLengthException the input block is too large.
-     */
-    public byte[] processBlock(
-        byte[]  in,
-        int     inOff,
-        int     inLen)
-    {
-        if (key == null)
-        {
-            throw new IllegalStateException("ElGamal engine not initialised");
-        }
-
-        int maxLength = forEncryption
-            ?   (bitSize - 1 + 7) / 8
-            :   getInputBlockSize();
-
-        if (inLen > maxLength)
-        {
-            throw new DataLengthException("input too large for ElGamal cipher.\n");
-        }
-
-        BigInteger  p = key.getParameters().getP();
-
-        if (key instanceof ElGamalPrivateKeyParameters) // decryption
-        {
-            byte[]  in1 = new byte[inLen / 2];
-            byte[]  in2 = new byte[inLen / 2];
-
-            System.arraycopy(in, inOff, in1, 0, in1.length);
-            System.arraycopy(in, inOff + in1.length, in2, 0, in2.length);
-
-            BigInteger  gamma = new BigInteger(1, in1);
-            BigInteger  phi = new BigInteger(1, in2);
-
-            ElGamalPrivateKeyParameters  priv = (ElGamalPrivateKeyParameters)key;
-            // a shortcut, which generally relies on p being prime amongst other things.
-            // if a problem with this shows up, check the p and g values!
-            BigInteger  m = gamma.modPow(p.subtract(ONE).subtract(priv.getX()), p).multiply(phi).mod(p);
-
-            return BigIntegers.asUnsignedByteArray(m);
-        }
-        else // encryption
-        {
-            byte[] block;
-            if (inOff != 0 || inLen != in.length)
-            {
-                block = new byte[inLen];
-
-                System.arraycopy(in, inOff, block, 0, inLen);
-            }
-            else
-            {
-                block = in;
-            }
-
-            BigInteger input = new BigInteger(1, block);
-
-            if (input.compareTo(p) >= 0)
-            {
-                throw new DataLengthException("input too large for ElGamal cipher.\n");
-            }
-
-            ElGamalPublicKeyParameters  pub = (ElGamalPublicKeyParameters)key;
-
-            int                         pBitLength = p.bitLength();
-            BigInteger                  k = new BigInteger(pBitLength, random);
-
-            while (k.equals(ZERO) || (k.compareTo(p.subtract(TWO)) > 0))
-            {
-                k = new BigInteger(pBitLength, random);
-            }
-
-            BigInteger  g = key.getParameters().getG();
-            BigInteger  gamma = g.modPow(k, p);
-            BigInteger  phi = input.multiply(pub.getY().modPow(k, p)).mod(p);
-
-            byte[]  out1 = gamma.toByteArray();
-            byte[]  out2 = phi.toByteArray();
-            byte[]  output = new byte[this.getOutputBlockSize()];
-
-            if (out1.length > output.length / 2)
-            {
-                System.arraycopy(out1, 1, output, output.length / 2 - (out1.length - 1), out1.length - 1);
-            }
-            else
-            {
-                System.arraycopy(out1, 0, output, output.length / 2 - out1.length, out1.length);
-            }
-
-            if (out2.length > output.length / 2)
-            {
-                System.arraycopy(out2, 1, output, output.length - (out2.length - 1), out2.length - 1);
-            }
-            else
-            {
-                System.arraycopy(out2, 0, output, output.length - out2.length, out2.length);
-            }
-
-            return output;
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/engines/GOST28147Engine.java b/bcprov/src/main/java/org/bouncycastle/crypto/engines/GOST28147Engine.java
deleted file mode 100644
index 5a88b7f..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/engines/GOST28147Engine.java
+++ /dev/null
@@ -1,372 +0,0 @@
-package org.bouncycastle.crypto.engines;
-
-import java.util.Hashtable;
-
-import org.bouncycastle.crypto.BlockCipher;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.DataLengthException;
-import org.bouncycastle.crypto.OutputLengthException;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.crypto.params.ParametersWithSBox;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.Strings;
-
-/**
- * implementation of GOST 28147-89
- */
-public class GOST28147Engine
-    implements BlockCipher
-{
-    protected static final int  BLOCK_SIZE = 8;
-    private int[]               workingKey = null;
-    private boolean forEncryption;
-
-    private byte[] S = Sbox_Default;
-
-    // these are the S-boxes given in Applied Cryptography 2nd Ed., p. 333
-    // This is default S-box!
-    private static byte Sbox_Default[] = {
-        0x4,0xA,0x9,0x2,0xD,0x8,0x0,0xE,0x6,0xB,0x1,0xC,0x7,0xF,0x5,0x3,
-        0xE,0xB,0x4,0xC,0x6,0xD,0xF,0xA,0x2,0x3,0x8,0x1,0x0,0x7,0x5,0x9,
-        0x5,0x8,0x1,0xD,0xA,0x3,0x4,0x2,0xE,0xF,0xC,0x7,0x6,0x0,0x9,0xB,
-        0x7,0xD,0xA,0x1,0x0,0x8,0x9,0xF,0xE,0x4,0x6,0xC,0xB,0x2,0x5,0x3,
-        0x6,0xC,0x7,0x1,0x5,0xF,0xD,0x8,0x4,0xA,0x9,0xE,0x0,0x3,0xB,0x2,
-        0x4,0xB,0xA,0x0,0x7,0x2,0x1,0xD,0x3,0x6,0x8,0x5,0x9,0xC,0xF,0xE,
-        0xD,0xB,0x4,0x1,0x3,0xF,0x5,0x9,0x0,0xA,0xE,0x7,0x6,0x8,0x2,0xC,
-        0x1,0xF,0xD,0x0,0x5,0x7,0xA,0x4,0x9,0x2,0x3,0xE,0x6,0xB,0x8,0xC
-    };
-    
-    /*
-     * class content S-box parameters for encrypting
-     * getting from, see: http://tools.ietf.org/id/draft-popov-cryptopro-cpalgs-01.txt
-     *                    http://tools.ietf.org/id/draft-popov-cryptopro-cpalgs-02.txt
-     */
-    private static byte[] ESbox_Test = {
-         0x4,0x2,0xF,0x5,0x9,0x1,0x0,0x8,0xE,0x3,0xB,0xC,0xD,0x7,0xA,0x6,
-         0xC,0x9,0xF,0xE,0x8,0x1,0x3,0xA,0x2,0x7,0x4,0xD,0x6,0x0,0xB,0x5,
-         0xD,0x8,0xE,0xC,0x7,0x3,0x9,0xA,0x1,0x5,0x2,0x4,0x6,0xF,0x0,0xB,
-         0xE,0x9,0xB,0x2,0x5,0xF,0x7,0x1,0x0,0xD,0xC,0x6,0xA,0x4,0x3,0x8,
-         0x3,0xE,0x5,0x9,0x6,0x8,0x0,0xD,0xA,0xB,0x7,0xC,0x2,0x1,0xF,0x4,
-         0x8,0xF,0x6,0xB,0x1,0x9,0xC,0x5,0xD,0x3,0x7,0xA,0x0,0xE,0x2,0x4,
-         0x9,0xB,0xC,0x0,0x3,0x6,0x7,0x5,0x4,0x8,0xE,0xF,0x1,0xA,0x2,0xD,
-         0xC,0x6,0x5,0x2,0xB,0x0,0x9,0xD,0x3,0xE,0x7,0xA,0xF,0x4,0x1,0x8
-    };
-    
-    private static byte[] ESbox_A = {
-         0x9,0x6,0x3,0x2,0x8,0xB,0x1,0x7,0xA,0x4,0xE,0xF,0xC,0x0,0xD,0x5,
-         0x3,0x7,0xE,0x9,0x8,0xA,0xF,0x0,0x5,0x2,0x6,0xC,0xB,0x4,0xD,0x1,
-         0xE,0x4,0x6,0x2,0xB,0x3,0xD,0x8,0xC,0xF,0x5,0xA,0x0,0x7,0x1,0x9,
-         0xE,0x7,0xA,0xC,0xD,0x1,0x3,0x9,0x0,0x2,0xB,0x4,0xF,0x8,0x5,0x6,
-         0xB,0x5,0x1,0x9,0x8,0xD,0xF,0x0,0xE,0x4,0x2,0x3,0xC,0x7,0xA,0x6,
-         0x3,0xA,0xD,0xC,0x1,0x2,0x0,0xB,0x7,0x5,0x9,0x4,0x8,0xF,0xE,0x6,
-         0x1,0xD,0x2,0x9,0x7,0xA,0x6,0x0,0x8,0xC,0x4,0x5,0xF,0x3,0xB,0xE,
-         0xB,0xA,0xF,0x5,0x0,0xC,0xE,0x8,0x6,0x2,0x3,0x9,0x1,0x7,0xD,0x4
-    };
-    
-    private static byte[] ESbox_B = {
-         0x8,0x4,0xB,0x1,0x3,0x5,0x0,0x9,0x2,0xE,0xA,0xC,0xD,0x6,0x7,0xF,
-         0x0,0x1,0x2,0xA,0x4,0xD,0x5,0xC,0x9,0x7,0x3,0xF,0xB,0x8,0x6,0xE,
-         0xE,0xC,0x0,0xA,0x9,0x2,0xD,0xB,0x7,0x5,0x8,0xF,0x3,0x6,0x1,0x4,
-         0x7,0x5,0x0,0xD,0xB,0x6,0x1,0x2,0x3,0xA,0xC,0xF,0x4,0xE,0x9,0x8,
-         0x2,0x7,0xC,0xF,0x9,0x5,0xA,0xB,0x1,0x4,0x0,0xD,0x6,0x8,0xE,0x3,
-         0x8,0x3,0x2,0x6,0x4,0xD,0xE,0xB,0xC,0x1,0x7,0xF,0xA,0x0,0x9,0x5,
-         0x5,0x2,0xA,0xB,0x9,0x1,0xC,0x3,0x7,0x4,0xD,0x0,0x6,0xF,0x8,0xE,
-         0x0,0x4,0xB,0xE,0x8,0x3,0x7,0x1,0xA,0x2,0x9,0x6,0xF,0xD,0x5,0xC
-    };
-    
-    private static byte[] ESbox_C = {
-         0x1,0xB,0xC,0x2,0x9,0xD,0x0,0xF,0x4,0x5,0x8,0xE,0xA,0x7,0x6,0x3,
-         0x0,0x1,0x7,0xD,0xB,0x4,0x5,0x2,0x8,0xE,0xF,0xC,0x9,0xA,0x6,0x3,
-         0x8,0x2,0x5,0x0,0x4,0x9,0xF,0xA,0x3,0x7,0xC,0xD,0x6,0xE,0x1,0xB,
-         0x3,0x6,0x0,0x1,0x5,0xD,0xA,0x8,0xB,0x2,0x9,0x7,0xE,0xF,0xC,0x4,
-         0x8,0xD,0xB,0x0,0x4,0x5,0x1,0x2,0x9,0x3,0xC,0xE,0x6,0xF,0xA,0x7,
-         0xC,0x9,0xB,0x1,0x8,0xE,0x2,0x4,0x7,0x3,0x6,0x5,0xA,0x0,0xF,0xD,
-         0xA,0x9,0x6,0x8,0xD,0xE,0x2,0x0,0xF,0x3,0x5,0xB,0x4,0x1,0xC,0x7,
-         0x7,0x4,0x0,0x5,0xA,0x2,0xF,0xE,0xC,0x6,0x1,0xB,0xD,0x9,0x3,0x8
-    };
-    
-    private static byte[] ESbox_D = {
-         0xF,0xC,0x2,0xA,0x6,0x4,0x5,0x0,0x7,0x9,0xE,0xD,0x1,0xB,0x8,0x3,
-         0xB,0x6,0x3,0x4,0xC,0xF,0xE,0x2,0x7,0xD,0x8,0x0,0x5,0xA,0x9,0x1,
-         0x1,0xC,0xB,0x0,0xF,0xE,0x6,0x5,0xA,0xD,0x4,0x8,0x9,0x3,0x7,0x2,
-         0x1,0x5,0xE,0xC,0xA,0x7,0x0,0xD,0x6,0x2,0xB,0x4,0x9,0x3,0xF,0x8,
-         0x0,0xC,0x8,0x9,0xD,0x2,0xA,0xB,0x7,0x3,0x6,0x5,0x4,0xE,0xF,0x1,
-         0x8,0x0,0xF,0x3,0x2,0x5,0xE,0xB,0x1,0xA,0x4,0x7,0xC,0x9,0xD,0x6,
-         0x3,0x0,0x6,0xF,0x1,0xE,0x9,0x2,0xD,0x8,0xC,0x4,0xB,0xA,0x5,0x7,
-         0x1,0xA,0x6,0x8,0xF,0xB,0x0,0x4,0xC,0x3,0x5,0x9,0x7,0xD,0x2,0xE
-    };
-    
-    //S-box for digest
-    private static byte DSbox_Test[] = {
-         0x4,0xA,0x9,0x2,0xD,0x8,0x0,0xE,0x6,0xB,0x1,0xC,0x7,0xF,0x5,0x3,
-         0xE,0xB,0x4,0xC,0x6,0xD,0xF,0xA,0x2,0x3,0x8,0x1,0x0,0x7,0x5,0x9,
-         0x5,0x8,0x1,0xD,0xA,0x3,0x4,0x2,0xE,0xF,0xC,0x7,0x6,0x0,0x9,0xB,
-         0x7,0xD,0xA,0x1,0x0,0x8,0x9,0xF,0xE,0x4,0x6,0xC,0xB,0x2,0x5,0x3,
-         0x6,0xC,0x7,0x1,0x5,0xF,0xD,0x8,0x4,0xA,0x9,0xE,0x0,0x3,0xB,0x2,
-         0x4,0xB,0xA,0x0,0x7,0x2,0x1,0xD,0x3,0x6,0x8,0x5,0x9,0xC,0xF,0xE,
-         0xD,0xB,0x4,0x1,0x3,0xF,0x5,0x9,0x0,0xA,0xE,0x7,0x6,0x8,0x2,0xC,
-         0x1,0xF,0xD,0x0,0x5,0x7,0xA,0x4,0x9,0x2,0x3,0xE,0x6,0xB,0x8,0xC
-    };
-    
-    private static byte DSbox_A[] = {
-         0xA,0x4,0x5,0x6,0x8,0x1,0x3,0x7,0xD,0xC,0xE,0x0,0x9,0x2,0xB,0xF,
-         0x5,0xF,0x4,0x0,0x2,0xD,0xB,0x9,0x1,0x7,0x6,0x3,0xC,0xE,0xA,0x8,
-         0x7,0xF,0xC,0xE,0x9,0x4,0x1,0x0,0x3,0xB,0x5,0x2,0x6,0xA,0x8,0xD,
-         0x4,0xA,0x7,0xC,0x0,0xF,0x2,0x8,0xE,0x1,0x6,0x5,0xD,0xB,0x9,0x3,
-         0x7,0x6,0x4,0xB,0x9,0xC,0x2,0xA,0x1,0x8,0x0,0xE,0xF,0xD,0x3,0x5,
-         0x7,0x6,0x2,0x4,0xD,0x9,0xF,0x0,0xA,0x1,0x5,0xB,0x8,0xE,0xC,0x3,
-         0xD,0xE,0x4,0x1,0x7,0x0,0x5,0xA,0x3,0xC,0x8,0xF,0x6,0x2,0x9,0xB,
-         0x1,0x3,0xA,0x9,0x5,0xB,0x4,0xF,0x8,0x6,0x7,0xE,0xD,0x0,0x2,0xC
-    };
-    
-    //
-    // pre-defined sbox table
-    //
-    private static Hashtable sBoxes = new Hashtable();
-    
-    static
-    {
-        addSBox("Default", Sbox_Default);
-        addSBox("E-TEST", ESbox_Test);
-        addSBox("E-A", ESbox_A);
-        addSBox("E-B", ESbox_B);
-        addSBox("E-C", ESbox_C);
-        addSBox("E-D", ESbox_D);
-        addSBox("D-TEST", DSbox_Test);
-        addSBox("D-A", DSbox_A);
-    }
-
-    private static void addSBox(String sBoxName, byte[] sBox)
-    {
-        sBoxes.put(Strings.toUpperCase(sBoxName), sBox);        
-    }
-    
-    /**
-     * standard constructor.
-     */
-    public GOST28147Engine()
-    {
-    }
-
-    /**
-     * initialise an GOST28147 cipher.
-     *
-     * @param forEncryption whether or not we are for encryption.
-     * @param params the parameters required to set up the cipher.
-     * @exception IllegalArgumentException if the params argument is
-     * inappropriate.
-     */
-    public void init(
-        boolean           forEncryption,
-        CipherParameters  params)
-    {
-        if (params instanceof ParametersWithSBox)
-        {
-            ParametersWithSBox   param = (ParametersWithSBox)params;
-
-            //
-            // Set the S-Box
-            //
-            byte[] sBox = param.getSBox();
-            if (sBox.length != Sbox_Default.length)
-            {
-                throw new IllegalArgumentException("invalid S-box passed to GOST28147 init");
-            }
-            this.S = Arrays.clone(sBox);
-
-            //
-            // set key if there is one
-            //
-            if (param.getParameters() != null)
-            {
-                workingKey = generateWorkingKey(forEncryption,
-                        ((KeyParameter)param.getParameters()).getKey());
-            }
-        }
-        else if (params instanceof KeyParameter)
-        {
-            workingKey = generateWorkingKey(forEncryption,
-                                  ((KeyParameter)params).getKey());
-        }
-        else if (params != null)
-        {
-           throw new IllegalArgumentException("invalid parameter passed to GOST28147 init - " + params.getClass().getName());
-        }
-    }
-
-    public String getAlgorithmName()
-    {
-        return "GOST28147";
-    }
-
-    public int getBlockSize()
-    {
-        return BLOCK_SIZE;
-    }
-
-    public int processBlock(
-        byte[] in,
-        int inOff,
-        byte[] out,
-        int outOff)
-    {
-        if (workingKey == null)
-        {
-            throw new IllegalStateException("GOST28147 engine not initialised");
-        }
-
-        if ((inOff + BLOCK_SIZE) > in.length)
-        {
-            throw new DataLengthException("input buffer too short");
-        }
-
-        if ((outOff + BLOCK_SIZE) > out.length)
-        {
-            throw new OutputLengthException("output buffer too short");
-        }
-
-        GOST28147Func(workingKey, in, inOff, out, outOff);
-
-        return BLOCK_SIZE;
-    }
-
-    public void reset()
-    {
-    }
-
-    private int[] generateWorkingKey(
-        boolean forEncryption,
-        byte[]  userKey)
-    {
-         this.forEncryption = forEncryption;
-
-        if (userKey.length != 32)
-        {
-            throw new IllegalArgumentException("Key length invalid. Key needs to be 32 byte - 256 bit!!!");
-        }
-
-        int key[] = new int[8];
-        for(int i=0; i!=8; i++)
-        {
-            key[i] = bytesToint(userKey,i*4);
-        }
-
-        return key;
-    }
-
-    private int GOST28147_mainStep(int n1, int key)
-    {
-        int cm = (key + n1); // CM1
-
-        // S-box replacing
-
-        int om = S[  0 + ((cm >> (0 * 4)) & 0xF)] << (0 * 4);
-           om += S[ 16 + ((cm >> (1 * 4)) & 0xF)] << (1 * 4);
-           om += S[ 32 + ((cm >> (2 * 4)) & 0xF)] << (2 * 4);
-           om += S[ 48 + ((cm >> (3 * 4)) & 0xF)] << (3 * 4);
-           om += S[ 64 + ((cm >> (4 * 4)) & 0xF)] << (4 * 4);
-           om += S[ 80 + ((cm >> (5 * 4)) & 0xF)] << (5 * 4);
-           om += S[ 96 + ((cm >> (6 * 4)) & 0xF)] << (6 * 4);
-           om += S[112 + ((cm >> (7 * 4)) & 0xF)] << (7 * 4);
-
-        return om << 11 | om >>> (32-11); // 11-leftshift
-    }
-
-    private void GOST28147Func(
-        int[]   workingKey,
-        byte[]  in,
-        int     inOff,
-        byte[]  out,
-        int     outOff)
-    {
-        int N1, N2, tmp;  //tmp -> for saving N1
-        N1 = bytesToint(in, inOff);
-        N2 = bytesToint(in, inOff + 4);
-
-        if (this.forEncryption)
-        {
-          for(int k = 0; k < 3; k++)  // 1-24 steps
-          {
-            for(int j = 0; j < 8; j++)
-            {
-                tmp = N1;
-                N1 = N2 ^ GOST28147_mainStep(N1, workingKey[j]); // CM2
-                N2 = tmp;
-            }
-          }
-          for(int j = 7; j > 0; j--)  // 25-31 steps
-          {
-              tmp = N1;
-              N1 = N2 ^ GOST28147_mainStep(N1, workingKey[j]); // CM2
-              N2 = tmp;
-          }
-        }
-        else //decrypt
-        {
-          for(int j = 0; j < 8; j++)  // 1-8 steps
-          {
-             tmp = N1;
-             N1 = N2 ^ GOST28147_mainStep(N1, workingKey[j]); // CM2
-             N2 = tmp;
-          }
-          for(int k = 0; k < 3; k++)  //9-31 steps
-          {
-            for(int j = 7; j >= 0; j--)
-            {
-                if ((k == 2) && (j==0))
-                {
-                    break; // break 32 step
-                }
-                tmp = N1;
-                N1 = N2 ^ GOST28147_mainStep(N1, workingKey[j]); // CM2
-                N2 = tmp;
-            }
-          }
-        }
-
-        N2 = N2 ^ GOST28147_mainStep(N1, workingKey[0]);  // 32 step (N1=N1)
-
-        intTobytes(N1, out, outOff);
-        intTobytes(N2, out, outOff + 4);
-    }
-
-    //array of bytes to type int
-    private int bytesToint(
-        byte[]  in,
-        int     inOff)
-    {
-        return  ((in[inOff + 3] << 24) & 0xff000000) + ((in[inOff + 2] << 16) & 0xff0000) +
-                ((in[inOff + 1] << 8) & 0xff00) + (in[inOff] & 0xff);
-    }
-
-    //int to array of bytes
-    private void intTobytes(
-            int     num,
-            byte[]  out,
-            int     outOff)
-    {
-            out[outOff + 3] = (byte)(num >>> 24);
-            out[outOff + 2] = (byte)(num >>> 16);
-            out[outOff + 1] = (byte)(num >>> 8);
-            out[outOff] =     (byte)num;
-    }
-    
-    /**
-     * Return the S-Box associated with SBoxName
-     * @param sBoxName name of the S-Box
-     * @return byte array representing the S-Box
-     */
-    public static byte[] getSBox(
-        String sBoxName)
-    {
-        byte[] sBox = (byte[])sBoxes.get(Strings.toUpperCase(sBoxName));
-
-        if (sBox == null)
-        {
-            throw new IllegalArgumentException("Unknown S-Box - possible types: "
-                + "\"Default\", \"E-Test\", \"E-A\", \"E-B\", \"E-C\", \"E-D\", \"D-Test\", \"D-A\".");
-        }
-
-        return Arrays.clone(sBox);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/engines/Grain128Engine.java b/bcprov/src/main/java/org/bouncycastle/crypto/engines/Grain128Engine.java
deleted file mode 100644
index f5ecb75..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/engines/Grain128Engine.java
+++ /dev/null
@@ -1,304 +0,0 @@
-package org.bouncycastle.crypto.engines;
-
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.DataLengthException;
-import org.bouncycastle.crypto.OutputLengthException;
-import org.bouncycastle.crypto.StreamCipher;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.crypto.params.ParametersWithIV;
-
-/**
- * Implementation of Martin Hell's, Thomas Johansson's and Willi Meier's stream
- * cipher, Grain-128.
- */
-public class Grain128Engine
-    implements StreamCipher
-{
-
-    /**
-     * Constants
-     */
-    private static final int STATE_SIZE = 4;
-
-    /**
-     * Variables to hold the state of the engine during encryption and
-     * decryption
-     */
-    private byte[] workingKey;
-    private byte[] workingIV;
-    private byte[] out;
-    private int[] lfsr;
-    private int[] nfsr;
-    private int output;
-    private int index = 4;
-
-    private boolean initialised = false;
-
-    public String getAlgorithmName()
-    {
-        return "Grain-128";
-    }
-
-    /**
-     * Initialize a Grain-128 cipher.
-     *
-     * @param forEncryption Whether or not we are for encryption.
-     * @param params        The parameters required to set up the cipher.
-     * @throws IllegalArgumentException If the params argument is inappropriate.
-     */
-    public void init(boolean forEncryption, CipherParameters params)
-        throws IllegalArgumentException
-    {
-        /**
-         * Grain encryption and decryption is completely symmetrical, so the
-         * 'forEncryption' is irrelevant.
-         */
-        if (!(params instanceof ParametersWithIV))
-        {
-            throw new IllegalArgumentException(
-                "Grain-128 Init parameters must include an IV");
-        }
-
-        ParametersWithIV ivParams = (ParametersWithIV)params;
-
-        byte[] iv = ivParams.getIV();
-
-        if (iv == null || iv.length != 12)
-        {
-            throw new IllegalArgumentException(
-                "Grain-128  requires exactly 12 bytes of IV");
-        }
-
-        if (!(ivParams.getParameters() instanceof KeyParameter))
-        {
-            throw new IllegalArgumentException(
-                "Grain-128 Init parameters must include a key");
-        }
-
-        KeyParameter key = (KeyParameter)ivParams.getParameters();
-
-        /**
-         * Initialize variables.
-         */
-        workingIV = new byte[key.getKey().length];
-        workingKey = new byte[key.getKey().length];
-        lfsr = new int[STATE_SIZE];
-        nfsr = new int[STATE_SIZE];
-        out = new byte[4];
-
-        System.arraycopy(iv, 0, workingIV, 0, iv.length);
-        System.arraycopy(key.getKey(), 0, workingKey, 0, key.getKey().length);
-
-        reset();
-    }
-
-    /**
-     * 256 clocks initialization phase.
-     */
-    private void initGrain()
-    {
-        for (int i = 0; i < 8; i++)
-        {
-            output = getOutput();
-            nfsr = shift(nfsr, getOutputNFSR() ^ lfsr[0] ^ output);
-            lfsr = shift(lfsr, getOutputLFSR() ^ output);
-        }
-        initialised = true;
-    }
-
-    /**
-     * Get output from non-linear function g(x).
-     *
-     * @return Output from NFSR.
-     */
-    private int getOutputNFSR()
-    {
-        int b0 = nfsr[0];
-        int b3 = nfsr[0] >>> 3 | nfsr[1] << 29;
-        int b11 = nfsr[0] >>> 11 | nfsr[1] << 21;
-        int b13 = nfsr[0] >>> 13 | nfsr[1] << 19;
-        int b17 = nfsr[0] >>> 17 | nfsr[1] << 15;
-        int b18 = nfsr[0] >>> 18 | nfsr[1] << 14;
-        int b26 = nfsr[0] >>> 26 | nfsr[1] << 6;
-        int b27 = nfsr[0] >>> 27 | nfsr[1] << 5;
-        int b40 = nfsr[1] >>> 8 | nfsr[2] << 24;
-        int b48 = nfsr[1] >>> 16 | nfsr[2] << 16;
-        int b56 = nfsr[1] >>> 24 | nfsr[2] << 8;
-        int b59 = nfsr[1] >>> 27 | nfsr[2] << 5;
-        int b61 = nfsr[1] >>> 29 | nfsr[2] << 3;
-        int b65 = nfsr[2] >>> 1 | nfsr[3] << 31;
-        int b67 = nfsr[2] >>> 3 | nfsr[3] << 29;
-        int b68 = nfsr[2] >>> 4 | nfsr[3] << 28;
-        int b84 = nfsr[2] >>> 20 | nfsr[3] << 12;
-        int b91 = nfsr[2] >>> 27 | nfsr[3] << 5;
-        int b96 = nfsr[3];
-
-        return b0 ^ b26 ^ b56 ^ b91 ^ b96 ^ b3 & b67 ^ b11 & b13 ^ b17 & b18
-            ^ b27 & b59 ^ b40 & b48 ^ b61 & b65 ^ b68 & b84;
-    }
-
-    /**
-     * Get output from linear function f(x).
-     *
-     * @return Output from LFSR.
-     */
-    private int getOutputLFSR()
-    {
-        int s0 = lfsr[0];
-        int s7 = lfsr[0] >>> 7 | lfsr[1] << 25;
-        int s38 = lfsr[1] >>> 6 | lfsr[2] << 26;
-        int s70 = lfsr[2] >>> 6 | lfsr[3] << 26;
-        int s81 = lfsr[2] >>> 17 | lfsr[3] << 15;
-        int s96 = lfsr[3];
-
-        return s0 ^ s7 ^ s38 ^ s70 ^ s81 ^ s96;
-    }
-
-    /**
-     * Get output from output function h(x).
-     *
-     * @return Output from h(x).
-     */
-    private int getOutput()
-    {
-        int b2 = nfsr[0] >>> 2 | nfsr[1] << 30;
-        int b12 = nfsr[0] >>> 12 | nfsr[1] << 20;
-        int b15 = nfsr[0] >>> 15 | nfsr[1] << 17;
-        int b36 = nfsr[1] >>> 4 | nfsr[2] << 28;
-        int b45 = nfsr[1] >>> 13 | nfsr[2] << 19;
-        int b64 = nfsr[2];
-        int b73 = nfsr[2] >>> 9 | nfsr[3] << 23;
-        int b89 = nfsr[2] >>> 25 | nfsr[3] << 7;
-        int b95 = nfsr[2] >>> 31 | nfsr[3] << 1;
-        int s8 = lfsr[0] >>> 8 | lfsr[1] << 24;
-        int s13 = lfsr[0] >>> 13 | lfsr[1] << 19;
-        int s20 = lfsr[0] >>> 20 | lfsr[1] << 12;
-        int s42 = lfsr[1] >>> 10 | lfsr[2] << 22;
-        int s60 = lfsr[1] >>> 28 | lfsr[2] << 4;
-        int s79 = lfsr[2] >>> 15 | lfsr[3] << 17;
-        int s93 = lfsr[2] >>> 29 | lfsr[3] << 3;
-        int s95 = lfsr[2] >>> 31 | lfsr[3] << 1;
-
-        return b12 & s8 ^ s13 & s20 ^ b95 & s42 ^ s60 & s79 ^ b12 & b95 & s95 ^ s93
-            ^ b2 ^ b15 ^ b36 ^ b45 ^ b64 ^ b73 ^ b89;
-    }
-
-    /**
-     * Shift array 32 bits and add val to index.length - 1.
-     *
-     * @param array The array to shift.
-     * @param val   The value to shift in.
-     * @return The shifted array with val added to index.length - 1.
-     */
-    private int[] shift(int[] array, int val)
-    {
-        array[0] = array[1];
-        array[1] = array[2];
-        array[2] = array[3];
-        array[3] = val;
-
-        return array;
-    }
-
-    /**
-     * Set keys, reset cipher.
-     *
-     * @param keyBytes The key.
-     * @param ivBytes  The IV.
-     */
-    private void setKey(byte[] keyBytes, byte[] ivBytes)
-    {
-        ivBytes[12] = (byte)0xFF;
-        ivBytes[13] = (byte)0xFF;
-        ivBytes[14] = (byte)0xFF;
-        ivBytes[15] = (byte)0xFF;
-        workingKey = keyBytes;
-        workingIV = ivBytes;
-
-        /**
-         * Load NFSR and LFSR
-         */
-        int j = 0;
-        for (int i = 0; i < nfsr.length; i++)
-        {
-            nfsr[i] = ((workingKey[j + 3]) << 24) | ((workingKey[j + 2]) << 16)
-                & 0x00FF0000 | ((workingKey[j + 1]) << 8) & 0x0000FF00
-                | ((workingKey[j]) & 0x000000FF);
-
-            lfsr[i] = ((workingIV[j + 3]) << 24) | ((workingIV[j + 2]) << 16)
-                & 0x00FF0000 | ((workingIV[j + 1]) << 8) & 0x0000FF00
-                | ((workingIV[j]) & 0x000000FF);
-            j += 4;
-        }
-    }
-
-    public int processBytes(byte[] in, int inOff, int len, byte[] out,
-                             int outOff)
-        throws DataLengthException
-    {
-        if (!initialised)
-        {
-            throw new IllegalStateException(getAlgorithmName()
-                + " not initialised");
-        }
-
-        if ((inOff + len) > in.length)
-        {
-            throw new DataLengthException("input buffer too short");
-        }
-
-        if ((outOff + len) > out.length)
-        {
-            throw new OutputLengthException("output buffer too short");
-        }
-
-        for (int i = 0; i < len; i++)
-        {
-            out[outOff + i] = (byte)(in[inOff + i] ^ getKeyStream());
-        }
-
-        return len;
-    }
-
-    public void reset()
-    {
-        index = 4;
-        setKey(workingKey, workingIV);
-        initGrain();
-    }
-
-    /**
-     * Run Grain one round(i.e. 32 bits).
-     */
-    private void oneRound()
-    {
-        output = getOutput();
-        out[0] = (byte)output;
-        out[1] = (byte)(output >> 8);
-        out[2] = (byte)(output >> 16);
-        out[3] = (byte)(output >> 24);
-
-        nfsr = shift(nfsr, getOutputNFSR() ^ lfsr[0]);
-        lfsr = shift(lfsr, getOutputLFSR());
-    }
-
-    public byte returnByte(byte in)
-    {
-        if (!initialised)
-        {
-            throw new IllegalStateException(getAlgorithmName()
-                + " not initialised");
-        }
-        return (byte)(in ^ getKeyStream());
-    }
-
-    private byte getKeyStream()
-    {
-        if (index > 3)
-        {
-            oneRound();
-            index = 0;
-        }
-        return out[index++];
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/engines/Grainv1Engine.java b/bcprov/src/main/java/org/bouncycastle/crypto/engines/Grainv1Engine.java
deleted file mode 100644
index 77f52d1..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/engines/Grainv1Engine.java
+++ /dev/null
@@ -1,290 +0,0 @@
-package org.bouncycastle.crypto.engines;
-
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.DataLengthException;
-import org.bouncycastle.crypto.OutputLengthException;
-import org.bouncycastle.crypto.StreamCipher;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.crypto.params.ParametersWithIV;
-
-/**
- * Implementation of Martin Hell's, Thomas Johansson's and Willi Meier's stream
- * cipher, Grain v1.
- */
-public class Grainv1Engine
-    implements StreamCipher
-{
-
-    /**
-     * Constants
-     */
-    private static final int STATE_SIZE = 5;
-
-    /**
-     * Variables to hold the state of the engine during encryption and
-     * decryption
-     */
-    private byte[] workingKey;
-    private byte[] workingIV;
-    private byte[] out;
-    private int[] lfsr;
-    private int[] nfsr;
-    private int output;
-    private int index = 2;
-
-    private boolean initialised = false;
-
-    public String getAlgorithmName()
-    {
-        return "Grain v1";
-    }
-
-    /**
-     * Initialize a Grain v1 cipher.
-     *
-     * @param forEncryption Whether or not we are for encryption.
-     * @param params        The parameters required to set up the cipher.
-     * @throws IllegalArgumentException If the params argument is inappropriate.
-     */
-    public void init(boolean forEncryption, CipherParameters params)
-        throws IllegalArgumentException
-    {
-        /**
-         * Grain encryption and decryption is completely symmetrical, so the
-         * 'forEncryption' is irrelevant.
-         */
-        if (!(params instanceof ParametersWithIV))
-        {
-            throw new IllegalArgumentException(
-                "Grain v1 Init parameters must include an IV");
-        }
-
-        ParametersWithIV ivParams = (ParametersWithIV)params;
-
-        byte[] iv = ivParams.getIV();
-
-        if (iv == null || iv.length != 8)
-        {
-            throw new IllegalArgumentException(
-                "Grain v1 requires exactly 8 bytes of IV");
-        }
-
-        if (!(ivParams.getParameters() instanceof KeyParameter))
-        {
-            throw new IllegalArgumentException(
-                "Grain v1 Init parameters must include a key");
-        }
-
-        KeyParameter key = (KeyParameter)ivParams.getParameters();
-
-        /**
-         * Initialize variables.
-         */
-        workingIV = new byte[key.getKey().length];
-        workingKey = new byte[key.getKey().length];
-        lfsr = new int[STATE_SIZE];
-        nfsr = new int[STATE_SIZE];
-        out = new byte[2];
-
-        System.arraycopy(iv, 0, workingIV, 0, iv.length);
-        System.arraycopy(key.getKey(), 0, workingKey, 0, key.getKey().length);
-
-        reset();
-    }
-
-    /**
-     * 160 clocks initialization phase.
-     */
-    private void initGrain()
-    {
-        for (int i = 0; i < 10; i++)
-        {
-            output = getOutput();
-            nfsr = shift(nfsr, getOutputNFSR() ^ lfsr[0] ^ output);
-            lfsr = shift(lfsr, getOutputLFSR() ^ output);
-        }
-        initialised = true;
-    }
-
-    /**
-     * Get output from non-linear function g(x).
-     *
-     * @return Output from NFSR.
-     */
-    private int getOutputNFSR()
-    {
-        int b0 = nfsr[0];
-        int b9 = nfsr[0] >>> 9 | nfsr[1] << 7;
-        int b14 = nfsr[0] >>> 14 | nfsr[1] << 2;
-        int b15 = nfsr[0] >>> 15 | nfsr[1] << 1;
-        int b21 = nfsr[1] >>> 5 | nfsr[2] << 11;
-        int b28 = nfsr[1] >>> 12 | nfsr[2] << 4;
-        int b33 = nfsr[2] >>> 1 | nfsr[3] << 15;
-        int b37 = nfsr[2] >>> 5 | nfsr[3] << 11;
-        int b45 = nfsr[2] >>> 13 | nfsr[3] << 3;
-        int b52 = nfsr[3] >>> 4 | nfsr[4] << 12;
-        int b60 = nfsr[3] >>> 12 | nfsr[4] << 4;
-        int b62 = nfsr[3] >>> 14 | nfsr[4] << 2;
-        int b63 = nfsr[3] >>> 15 | nfsr[4] << 1;
-
-        return (b62 ^ b60 ^ b52 ^ b45 ^ b37 ^ b33 ^ b28 ^ b21 ^ b14
-            ^ b9 ^ b0 ^ b63 & b60 ^ b37 & b33 ^ b15 & b9 ^ b60 & b52 & b45
-            ^ b33 & b28 & b21 ^ b63 & b45 & b28 & b9 ^ b60 & b52 & b37
-            & b33 ^ b63 & b60 & b21 & b15 ^ b63 & b60 & b52 & b45 & b37
-            ^ b33 & b28 & b21 & b15 & b9 ^ b52 & b45 & b37 & b33 & b28
-            & b21) & 0x0000FFFF;
-    }
-
-    /**
-     * Get output from linear function f(x).
-     *
-     * @return Output from LFSR.
-     */
-    private int getOutputLFSR()
-    {
-        int s0 = lfsr[0];
-        int s13 = lfsr[0] >>> 13 | lfsr[1] << 3;
-        int s23 = lfsr[1] >>> 7 | lfsr[2] << 9;
-        int s38 = lfsr[2] >>> 6 | lfsr[3] << 10;
-        int s51 = lfsr[3] >>> 3 | lfsr[4] << 13;
-        int s62 = lfsr[3] >>> 14 | lfsr[4] << 2;
-
-        return (s0 ^ s13 ^ s23 ^ s38 ^ s51 ^ s62) & 0x0000FFFF;
-    }
-
-    /**
-     * Get output from output function h(x).
-     *
-     * @return Output from h(x).
-     */
-    private int getOutput()
-    {
-        int b1 = nfsr[0] >>> 1 | nfsr[1] << 15;
-        int b2 = nfsr[0] >>> 2 | nfsr[1] << 14;
-        int b4 = nfsr[0] >>> 4 | nfsr[1] << 12;
-        int b10 = nfsr[0] >>> 10 | nfsr[1] << 6;
-        int b31 = nfsr[1] >>> 15 | nfsr[2] << 1;
-        int b43 = nfsr[2] >>> 11 | nfsr[3] << 5;
-        int b56 = nfsr[3] >>> 8 | nfsr[4] << 8;
-        int b63 = nfsr[3] >>> 15 | nfsr[4] << 1;
-        int s3 = lfsr[0] >>> 3 | lfsr[1] << 13;
-        int s25 = lfsr[1] >>> 9 | lfsr[2] << 7;
-        int s46 = lfsr[2] >>> 14 | lfsr[3] << 2;
-        int s64 = lfsr[4];
-
-        return (s25 ^ b63 ^ s3 & s64 ^ s46 & s64 ^ s64 & b63 ^ s3
-            & s25 & s46 ^ s3 & s46 & s64 ^ s3 & s46 & b63 ^ s25 & s46 & b63 ^ s46
-            & s64 & b63 ^ b1 ^ b2 ^ b4 ^ b10 ^ b31 ^ b43 ^ b56) & 0x0000FFFF;
-    }
-
-    /**
-     * Shift array 16 bits and add val to index.length - 1.
-     *
-     * @param array The array to shift.
-     * @param val   The value to shift in.
-     * @return The shifted array with val added to index.length - 1.
-     */
-    private int[] shift(int[] array, int val)
-    {
-        array[0] = array[1];
-        array[1] = array[2];
-        array[2] = array[3];
-        array[3] = array[4];
-        array[4] = val;
-
-        return array;
-    }
-
-    /**
-     * Set keys, reset cipher.
-     *
-     * @param keyBytes The key.
-     * @param ivBytes  The IV.
-     */
-    private void setKey(byte[] keyBytes, byte[] ivBytes)
-    {
-        ivBytes[8] = (byte)0xFF;
-        ivBytes[9] = (byte)0xFF;
-        workingKey = keyBytes;
-        workingIV = ivBytes;
-
-        /**
-         * Load NFSR and LFSR
-         */
-        int j = 0;
-        for (int i = 0; i < nfsr.length; i++)
-        {
-            nfsr[i] = (workingKey[j + 1] << 8 | workingKey[j] & 0xFF) & 0x0000FFFF;
-            lfsr[i] = (workingIV[j + 1] << 8 | workingIV[j] & 0xFF) & 0x0000FFFF;
-            j += 2;
-        }
-    }
-
-    public int processBytes(byte[] in, int inOff, int len, byte[] out,
-                             int outOff)
-        throws DataLengthException
-    {
-        if (!initialised)
-        {
-            throw new IllegalStateException(getAlgorithmName()
-                + " not initialised");
-        }
-
-        if ((inOff + len) > in.length)
-        {
-            throw new DataLengthException("input buffer too short");
-        }
-
-        if ((outOff + len) > out.length)
-        {
-            throw new OutputLengthException("output buffer too short");
-        }
-
-        for (int i = 0; i < len; i++)
-        {
-            out[outOff + i] = (byte)(in[inOff + i] ^ getKeyStream());
-        }
-
-        return len;
-    }
-
-    public void reset()
-    {
-        index = 2;
-        setKey(workingKey, workingIV);
-        initGrain();
-    }
-
-    /**
-     * Run Grain one round(i.e. 16 bits).
-     */
-    private void oneRound()
-    {
-        output = getOutput();
-        out[0] = (byte)output;
-        out[1] = (byte)(output >> 8);
-
-        nfsr = shift(nfsr, getOutputNFSR() ^ lfsr[0]);
-        lfsr = shift(lfsr, getOutputLFSR());
-    }
-
-    public byte returnByte(byte in)
-    {
-        if (!initialised)
-        {
-            throw new IllegalStateException(getAlgorithmName()
-                + " not initialised");
-        }
-        return (byte)(in ^ getKeyStream());
-    }
-
-    private byte getKeyStream()
-    {
-        if (index > 1)
-        {
-            oneRound();
-            index = 0;
-        }
-        return out[index++];
-    }
-}
\ No newline at end of file
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/engines/HC128Engine.java b/bcprov/src/main/java/org/bouncycastle/crypto/engines/HC128Engine.java
deleted file mode 100644
index 7d18d62..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/engines/HC128Engine.java
+++ /dev/null
@@ -1,259 +0,0 @@
-package org.bouncycastle.crypto.engines;
-
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.DataLengthException;
-import org.bouncycastle.crypto.OutputLengthException;
-import org.bouncycastle.crypto.StreamCipher;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.crypto.params.ParametersWithIV;
-
-/**
- * HC-128 is a software-efficient stream cipher created by Hongjun Wu. It
- * generates keystream from a 128-bit secret key and a 128-bit initialization
- * vector.
- * <p>
- * http://www.ecrypt.eu.org/stream/p3ciphers/hc/hc128_p3.pdf
- * </p><p>
- * It is a third phase candidate in the eStream contest, and is patent-free.
- * No attacks are known as of today (April 2007). See
- *
- * http://www.ecrypt.eu.org/stream/hcp3.html
- * </p>
- */
-public class HC128Engine
-    implements StreamCipher
-{
-    private int[] p = new int[512];
-    private int[] q = new int[512];
-    private int cnt = 0;
-
-    private static int f1(int x)
-    {
-        return rotateRight(x, 7) ^ rotateRight(x, 18)
-            ^ (x >>> 3);
-    }
-
-    private static int f2(int x)
-    {
-        return rotateRight(x, 17) ^ rotateRight(x, 19)
-            ^ (x >>> 10);
-    }
-
-    private int g1(int x, int y, int z)
-    {
-        return (rotateRight(x, 10) ^ rotateRight(z, 23))
-            + rotateRight(y, 8);
-    }
-
-    private int g2(int x, int y, int z)
-    {
-        return (rotateLeft(x, 10) ^ rotateLeft(z, 23)) + rotateLeft(y, 8);
-    }
-
-    private static int rotateLeft(
-        int     x,
-        int     bits)
-    {
-        return (x << bits) | (x >>> -bits);
-    }
-
-    private static int rotateRight(
-        int     x,
-        int     bits)
-    {
-        return (x >>> bits) | (x << -bits);
-    }
-
-    private int h1(int x)
-    {
-        return q[x & 0xFF] + q[((x >> 16) & 0xFF) + 256];
-    }
-
-    private int h2(int x)
-    {
-        return p[x & 0xFF] + p[((x >> 16) & 0xFF) + 256];
-    }
-
-    private static int mod1024(int x)
-    {
-        return x & 0x3FF;
-    }
-
-    private static int mod512(int x)
-    {
-        return x & 0x1FF;
-    }
-
-    private static int dim(int x, int y)
-    {
-        return mod512(x - y);
-    }
-
-    private int step()
-    {
-        int j = mod512(cnt);
-        int ret;
-        if (cnt < 512)
-        {
-            p[j] += g1(p[dim(j, 3)], p[dim(j, 10)], p[dim(j, 511)]);
-            ret = h1(p[dim(j, 12)]) ^ p[j];
-        }
-        else
-        {
-            q[j] += g2(q[dim(j, 3)], q[dim(j, 10)], q[dim(j, 511)]);
-            ret = h2(q[dim(j, 12)]) ^ q[j];
-        }
-        cnt = mod1024(cnt + 1);
-        return ret;
-    }
-
-    private byte[] key, iv;
-    private boolean initialised;
-
-    private void init()
-    {
-        if (key.length != 16)
-        {
-            throw new java.lang.IllegalArgumentException(
-                "The key must be 128 bits long");
-        }
-
-        idx = 0;
-        cnt = 0;
-
-        int[] w = new int[1280];
-
-        for (int i = 0; i < 16; i++)
-        {
-            w[i >> 2] |= (key[i] & 0xff) << (8 * (i & 0x3));
-        }
-        System.arraycopy(w, 0, w, 4, 4);
-
-        for (int i = 0; i < iv.length && i < 16; i++)
-        {
-            w[(i >> 2) + 8] |= (iv[i] & 0xff) << (8 * (i & 0x3));
-        }
-        System.arraycopy(w, 8, w, 12, 4);
-
-        for (int i = 16; i < 1280; i++)
-        {
-            w[i] = f2(w[i - 2]) + w[i - 7] + f1(w[i - 15]) + w[i - 16] + i;
-        }
-
-        System.arraycopy(w, 256, p, 0, 512);
-        System.arraycopy(w, 768, q, 0, 512);
-
-        for (int i = 0; i < 512; i++)
-        {
-            p[i] = step();
-        }
-        for (int i = 0; i < 512; i++)
-        {
-            q[i] = step();
-        }
-
-        cnt = 0;
-    }
-
-    public String getAlgorithmName()
-    {
-        return "HC-128";
-    }
-
-    /**
-     * Initialise a HC-128 cipher.
-     *
-     * @param forEncryption whether or not we are for encryption. Irrelevant, as
-     *                      encryption and decryption are the same.
-     * @param params        the parameters required to set up the cipher.
-     * @throws IllegalArgumentException if the params argument is
-     *                                  inappropriate (ie. the key is not 128 bit long).
-     */
-    public void init(boolean forEncryption, CipherParameters params)
-        throws IllegalArgumentException
-    {
-        CipherParameters keyParam = params;
-
-        if (params instanceof ParametersWithIV)
-        {
-            iv = ((ParametersWithIV)params).getIV();
-            keyParam = ((ParametersWithIV)params).getParameters();
-        }
-        else
-        {
-            iv = new byte[0];
-        }
-
-        if (keyParam instanceof KeyParameter)
-        {
-            key = ((KeyParameter)keyParam).getKey();
-            init();
-        }
-        else
-        {
-            throw new IllegalArgumentException(
-                "Invalid parameter passed to HC128 init - "
-                    + params.getClass().getName());
-        }
-
-        initialised = true;
-    }
-
-    private byte[] buf = new byte[4];
-    private int idx = 0;
-
-    private byte getByte()
-    {
-        if (idx == 0)
-        {
-            int step = step();
-            buf[0] = (byte)(step & 0xFF);
-            step >>= 8;
-            buf[1] = (byte)(step & 0xFF);
-            step >>= 8;
-            buf[2] = (byte)(step & 0xFF);
-            step >>= 8;
-            buf[3] = (byte)(step & 0xFF);
-        }
-        byte ret = buf[idx];
-        idx = idx + 1 & 0x3;
-        return ret;
-    }
-
-    public int processBytes(byte[] in, int inOff, int len, byte[] out,
-                             int outOff) throws DataLengthException
-    {
-        if (!initialised)
-        {
-            throw new IllegalStateException(getAlgorithmName()
-                + " not initialised");
-        }
-
-        if ((inOff + len) > in.length)
-        {
-            throw new DataLengthException("input buffer too short");
-        }
-
-        if ((outOff + len) > out.length)
-        {
-            throw new OutputLengthException("output buffer too short");
-        }
-
-        for (int i = 0; i < len; i++)
-        {
-            out[outOff + i] = (byte)(in[inOff + i] ^ getByte());
-        }
-
-        return len;
-    }
-
-    public void reset()
-    {
-        init();
-    }
-
-    public byte returnByte(byte in)
-    {
-        return (byte)(in ^ getByte());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/engines/HC256Engine.java b/bcprov/src/main/java/org/bouncycastle/crypto/engines/HC256Engine.java
deleted file mode 100644
index a74164a..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/engines/HC256Engine.java
+++ /dev/null
@@ -1,246 +0,0 @@
-package org.bouncycastle.crypto.engines;
-
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.DataLengthException;
-import org.bouncycastle.crypto.OutputLengthException;
-import org.bouncycastle.crypto.StreamCipher;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.crypto.params.ParametersWithIV;
-
-/**
- * HC-256 is a software-efficient stream cipher created by Hongjun Wu. It 
- * generates keystream from a 256-bit secret key and a 256-bit initialization 
- * vector.
- * <p>
- * http://www.ecrypt.eu.org/stream/p3ciphers/hc/hc256_p3.pdf
- * </p><p>
- * Its brother, HC-128, is a third phase candidate in the eStream contest.
- * The algorithm is patent-free. No attacks are known as of today (April 2007). 
- * See
- * 
- * http://www.ecrypt.eu.org/stream/hcp3.html
- * </p>
- */
-public class HC256Engine
-    implements StreamCipher
-{
-    private int[] p = new int[1024];
-    private int[] q = new int[1024];
-    private int cnt = 0;
-
-    private int step()
-    {
-        int j = cnt & 0x3FF;
-        int ret;
-        if (cnt < 1024)
-        {
-            int x = p[(j - 3 & 0x3FF)];
-            int y = p[(j - 1023 & 0x3FF)];
-            p[j] += p[(j - 10 & 0x3FF)]
-                + (rotateRight(x, 10) ^ rotateRight(y, 23))
-                + q[((x ^ y) & 0x3FF)];
-
-            x = p[(j - 12 & 0x3FF)];
-            ret = (q[x & 0xFF] + q[((x >> 8) & 0xFF) + 256]
-                + q[((x >> 16) & 0xFF) + 512] + q[((x >> 24) & 0xFF) + 768])
-                ^ p[j];
-        }
-        else
-        {
-            int x = q[(j - 3 & 0x3FF)];
-            int y = q[(j - 1023 & 0x3FF)];
-            q[j] += q[(j - 10 & 0x3FF)]
-                + (rotateRight(x, 10) ^ rotateRight(y, 23))
-                + p[((x ^ y) & 0x3FF)];
-
-            x = q[(j - 12 & 0x3FF)];
-            ret = (p[x & 0xFF] + p[((x >> 8) & 0xFF) + 256]
-                + p[((x >> 16) & 0xFF) + 512] + p[((x >> 24) & 0xFF) + 768])
-                ^ q[j];
-        }
-        cnt = cnt + 1 & 0x7FF;
-        return ret;
-    }
-
-    private byte[] key, iv;
-    private boolean initialised;
-
-    private void init()
-    {
-        if (key.length != 32 && key.length != 16)
-        {
-            throw new IllegalArgumentException(
-                "The key must be 128/256 bits long");
-        }
-
-        if (iv.length < 16)
-        {
-            throw new IllegalArgumentException(
-                "The IV must be at least 128 bits long");
-        }
-
-        if (key.length != 32)
-        {
-            byte[] k = new byte[32];
-
-            System.arraycopy(key, 0, k, 0, key.length);
-            System.arraycopy(key, 0, k, 16, key.length);
-
-            key = k;
-        }
-
-        if (iv.length < 32)
-        {
-            byte[] newIV = new byte[32];
-
-            System.arraycopy(iv, 0, newIV, 0, iv.length);
-            System.arraycopy(iv, 0, newIV, iv.length, newIV.length - iv.length);
-
-            iv = newIV;
-        }
-
-        idx = 0;
-        cnt = 0;
-
-        int[] w = new int[2560];
-
-        for (int i = 0; i < 32; i++)
-        {
-            w[i >> 2] |= (key[i] & 0xff) << (8 * (i & 0x3));
-        }
-
-        for (int i = 0; i < 32; i++)
-        {
-            w[(i >> 2) + 8] |= (iv[i] & 0xff) << (8 * (i & 0x3));
-        }
-
-        for (int i = 16; i < 2560; i++)
-        {
-            int x = w[i - 2];
-            int y = w[i - 15];
-            w[i] = (rotateRight(x, 17) ^ rotateRight(x, 19) ^ (x >>> 10))
-                + w[i - 7]
-                + (rotateRight(y, 7) ^ rotateRight(y, 18) ^ (y >>> 3))
-                + w[i - 16] + i;
-        }
-
-        System.arraycopy(w, 512, p, 0, 1024);
-        System.arraycopy(w, 1536, q, 0, 1024);
-
-        for (int i = 0; i < 4096; i++)
-        {
-            step();
-        }
-
-        cnt = 0;
-    }
-
-    public String getAlgorithmName()
-    {
-        return "HC-256";
-    }
-
-    /**
-     * Initialise a HC-256 cipher.
-     *
-     * @param forEncryption whether or not we are for encryption. Irrelevant, as
-     *                      encryption and decryption are the same.
-     * @param params        the parameters required to set up the cipher.
-     * @throws IllegalArgumentException if the params argument is
-     *                                  inappropriate (ie. the key is not 256 bit long).
-     */
-    public void init(boolean forEncryption, CipherParameters params)
-        throws IllegalArgumentException
-    {
-        CipherParameters keyParam = params;
-
-        if (params instanceof ParametersWithIV)
-        {
-            iv = ((ParametersWithIV)params).getIV();
-            keyParam = ((ParametersWithIV)params).getParameters();
-        }
-        else
-        {
-            iv = new byte[0];
-        }
-
-        if (keyParam instanceof KeyParameter)
-        {
-            key = ((KeyParameter)keyParam).getKey();
-            init();
-        }
-        else
-        {
-            throw new IllegalArgumentException(
-                "Invalid parameter passed to HC256 init - "
-                    + params.getClass().getName());
-        }
-
-        initialised = true;
-    }
-
-    private byte[] buf = new byte[4];
-    private int idx = 0;
-
-    private byte getByte()
-    {
-        if (idx == 0)
-        {
-            int step = step();
-            buf[0] = (byte)(step & 0xFF);
-            step >>= 8;
-            buf[1] = (byte)(step & 0xFF);
-            step >>= 8;
-            buf[2] = (byte)(step & 0xFF);
-            step >>= 8;
-            buf[3] = (byte)(step & 0xFF);
-        }
-        byte ret = buf[idx];
-        idx = idx + 1 & 0x3;
-        return ret;
-    }
-
-    public int processBytes(byte[] in, int inOff, int len, byte[] out,
-                             int outOff) throws DataLengthException
-    {
-        if (!initialised)
-        {
-            throw new IllegalStateException(getAlgorithmName()
-                + " not initialised");
-        }
-
-        if ((inOff + len) > in.length)
-        {
-            throw new DataLengthException("input buffer too short");
-        }
-
-        if ((outOff + len) > out.length)
-        {
-            throw new OutputLengthException("output buffer too short");
-        }
-
-        for (int i = 0; i < len; i++)
-        {
-            out[outOff + i] = (byte)(in[inOff + i] ^ getByte());
-        }
-
-        return len;
-    }
-
-    public void reset()
-    {
-        init();
-    }
-
-    public byte returnByte(byte in)
-    {
-        return (byte)(in ^ getByte());
-    }
-
-    private static int rotateRight(
-        int     x,
-        int     bits)
-    {
-        return (x >>> bits) | (x << -bits);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/engines/IDEAEngine.java b/bcprov/src/main/java/org/bouncycastle/crypto/engines/IDEAEngine.java
deleted file mode 100644
index 08cf738..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/engines/IDEAEngine.java
+++ /dev/null
@@ -1,357 +0,0 @@
-package org.bouncycastle.crypto.engines;
-
-import org.bouncycastle.crypto.BlockCipher;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.DataLengthException;
-import org.bouncycastle.crypto.OutputLengthException;
-import org.bouncycastle.crypto.params.KeyParameter;
-
-/**
- * A class that provides a basic International Data Encryption Algorithm (IDEA) engine.
- * <p>
- * This implementation is based on the "HOWTO: INTERNATIONAL DATA ENCRYPTION ALGORITHM"
- * implementation summary by Fauzan Mirza (F.U.Mirza@sheffield.ac.uk). (barring 1 typo at the
- * end of the mulinv function!).
- * <p>
- * It can be found at ftp://ftp.funet.fi/pub/crypt/cryptography/symmetric/idea/
- * <p>
- * Note: This algorithm was patented in the USA, Japan and Europe. These patents expired in 2011/2012. 
- */
-public class IDEAEngine
-    implements BlockCipher
-{
-    protected static final int  BLOCK_SIZE = 8;
-
-    private int[]               workingKey = null;
-
-    /**
-     * standard constructor.
-     */
-    public IDEAEngine()
-    {
-    }
-
-    /**
-     * initialise an IDEA cipher.
-     *
-     * @param forEncryption whether or not we are for encryption.
-     * @param params the parameters required to set up the cipher.
-     * @exception IllegalArgumentException if the params argument is
-     * inappropriate.
-     */
-    public void init(
-        boolean           forEncryption,
-        CipherParameters  params)
-    {
-        if (params instanceof KeyParameter)
-        {
-            workingKey = generateWorkingKey(forEncryption,
-                                  ((KeyParameter)params).getKey());
-            return;
-        }
-
-        throw new IllegalArgumentException("invalid parameter passed to IDEA init - " + params.getClass().getName());
-    }
-
-    public String getAlgorithmName()
-    {
-        return "IDEA";
-    }
-
-    public int getBlockSize()
-    {
-        return BLOCK_SIZE;
-    }
-
-    public int processBlock(
-        byte[] in,
-        int inOff,
-        byte[] out,
-        int outOff)
-    {
-        if (workingKey == null)
-        {
-            throw new IllegalStateException("IDEA engine not initialised");
-        }
-
-        if ((inOff + BLOCK_SIZE) > in.length)
-        {
-            throw new DataLengthException("input buffer too short");
-        }
-
-        if ((outOff + BLOCK_SIZE) > out.length)
-        {
-            throw new OutputLengthException("output buffer too short");
-        }
-
-        ideaFunc(workingKey, in, inOff, out, outOff);
-
-        return BLOCK_SIZE;
-    }
-
-    public void reset()
-    {
-    }
-
-    private static final int    MASK = 0xffff;
-    private static final int    BASE = 0x10001;
-
-    private int bytesToWord(
-        byte[]  in,
-        int     inOff)
-    {
-        return ((in[inOff] << 8) & 0xff00) + (in[inOff + 1] & 0xff);
-    }
-
-    private void wordToBytes(
-        int     word,
-        byte[]  out,
-        int     outOff)
-    {
-        out[outOff] = (byte)(word >>> 8);
-        out[outOff + 1] = (byte)word;
-    }
-
-    /**
-     * return x = x * y where the multiplication is done modulo
-     * 65537 (0x10001) (as defined in the IDEA specification) and
-     * a zero input is taken to be 65536 (0x10000).
-     *
-     * @param x the x value
-     * @param y the y value
-     * @return x = x * y
-     */
-    private int mul(
-        int x,
-        int y)
-    {
-        if (x == 0)
-        {
-            x = (BASE - y);
-        }
-        else if (y == 0)
-        {
-            x = (BASE - x);
-        }
-        else
-        {
-            int     p = x * y;
-
-            y = p & MASK;
-            x = p >>> 16;
-            x = y - x + ((y < x) ? 1 : 0);
-        }
-
-        return x & MASK;
-    }
-
-    private void ideaFunc(
-        int[]   workingKey,
-        byte[]  in,
-        int     inOff,
-        byte[]  out,
-        int     outOff)
-    {
-        int     x0, x1, x2, x3, t0, t1;
-        int     keyOff = 0;
-
-        x0 = bytesToWord(in, inOff);
-        x1 = bytesToWord(in, inOff + 2);
-        x2 = bytesToWord(in, inOff + 4);
-        x3 = bytesToWord(in, inOff + 6);
-
-        for (int round = 0; round < 8; round++)
-        {
-            x0 = mul(x0, workingKey[keyOff++]);
-            x1 += workingKey[keyOff++];
-            x1 &= MASK;
-            x2 += workingKey[keyOff++];
-            x2 &= MASK;
-            x3 = mul(x3, workingKey[keyOff++]);
-
-            t0 = x1;
-            t1 = x2;
-            x2 ^= x0;
-            x1 ^= x3;
-
-            x2 = mul(x2, workingKey[keyOff++]);
-            x1 += x2;
-            x1 &= MASK;
-
-            x1 = mul(x1, workingKey[keyOff++]);
-            x2 += x1;
-            x2 &= MASK;
-
-            x0 ^= x1;
-            x3 ^= x2;
-            x1 ^= t1;
-            x2 ^= t0;
-        }
-
-        wordToBytes(mul(x0, workingKey[keyOff++]), out, outOff);
-        wordToBytes(x2 + workingKey[keyOff++], out, outOff + 2);  /* NB: Order */
-        wordToBytes(x1 + workingKey[keyOff++], out, outOff + 4);
-        wordToBytes(mul(x3, workingKey[keyOff]), out, outOff + 6);
-    }
-
-    /**
-     * The following function is used to expand the user key to the encryption
-     * subkey. The first 16 bytes are the user key, and the rest of the subkey
-     * is calculated by rotating the previous 16 bytes by 25 bits to the left,
-     * and so on until the subkey is completed.
-     */
-    private int[] expandKey(
-        byte[]  uKey)
-    {
-        int[]   key = new int[52];
-
-        if (uKey.length < 16)
-        {
-            byte[]  tmp = new byte[16];
-
-            System.arraycopy(uKey, 0, tmp, tmp.length - uKey.length, uKey.length);
-
-            uKey = tmp;
-        }
-
-        for (int i = 0; i < 8; i++)
-        {
-            key[i] = bytesToWord(uKey, i * 2);
-        }
-
-        for (int i = 8; i < 52; i++)
-        {
-            if ((i & 7) < 6)
-            {
-                key[i] = ((key[i - 7] & 127) << 9 | key[i - 6] >> 7) & MASK;
-            }
-            else if ((i & 7) == 6)
-            {
-                key[i] = ((key[i - 7] & 127) << 9 | key[i - 14] >> 7) & MASK;
-            }
-            else
-            {
-                key[i] = ((key[i - 15] & 127) << 9 | key[i - 14] >> 7) & MASK;
-            }
-        }
-
-        return key;
-    }
-
-    /**
-     * This function computes multiplicative inverse using Euclid's Greatest
-     * Common Divisor algorithm. Zero and one are self inverse.
-     * <p>
-     * i.e. x * mulInv(x) == 1 (modulo BASE)
-     */
-    private int mulInv(
-        int x)
-    {
-        int t0, t1, q, y;
-        
-        if (x < 2)
-        {
-            return x;
-        }
-
-        t0 = 1;
-        t1 = BASE / x;
-        y  = BASE % x;
-
-        while (y != 1)
-        {
-            q = x / y;
-            x = x % y;
-            t0 = (t0 + (t1 * q)) & MASK;
-            if (x == 1)
-            {
-                return t0;
-            }
-            q = y / x;
-            y = y % x;
-            t1 = (t1 + (t0 * q)) & MASK;
-        }
-
-        return (1 - t1) & MASK;
-    }
-
-    /**
-     * Return the additive inverse of x.
-     * <p>
-     * i.e. x + addInv(x) == 0
-     */
-    int addInv(
-        int x)
-    {
-        return (0 - x) & MASK;
-    }
-    
-    /**
-     * The function to invert the encryption subkey to the decryption subkey.
-     * It also involves the multiplicative inverse and the additive inverse functions.
-     */
-    private int[] invertKey(
-        int[] inKey)
-    {
-        int     t1, t2, t3, t4;
-        int     p = 52;                 /* We work backwards */
-        int[]   key = new int[52];
-        int     inOff = 0;
-    
-        t1 = mulInv(inKey[inOff++]);
-        t2 = addInv(inKey[inOff++]);
-        t3 = addInv(inKey[inOff++]);
-        t4 = mulInv(inKey[inOff++]);
-        key[--p] = t4;
-        key[--p] = t3;
-        key[--p] = t2;
-        key[--p] = t1;
-    
-        for (int round = 1; round < 8; round++)
-        {
-            t1 = inKey[inOff++];
-            t2 = inKey[inOff++];
-            key[--p] = t2;
-            key[--p] = t1;
-    
-            t1 = mulInv(inKey[inOff++]);
-            t2 = addInv(inKey[inOff++]);
-            t3 = addInv(inKey[inOff++]);
-            t4 = mulInv(inKey[inOff++]);
-            key[--p] = t4;
-            key[--p] = t2; /* NB: Order */
-            key[--p] = t3;
-            key[--p] = t1;
-        }
-
-        t1 = inKey[inOff++];
-        t2 = inKey[inOff++];
-        key[--p] = t2;
-        key[--p] = t1;
-    
-        t1 = mulInv(inKey[inOff++]);
-        t2 = addInv(inKey[inOff++]);
-        t3 = addInv(inKey[inOff++]);
-        t4 = mulInv(inKey[inOff]);
-        key[--p] = t4;
-        key[--p] = t3;
-        key[--p] = t2;
-        key[--p] = t1;
-
-        return key;
-    }
-    
-    private int[] generateWorkingKey(
-        boolean forEncryption,
-        byte[]  userKey)
-    {
-        if (forEncryption)
-        {
-            return expandKey(userKey);
-        }
-        else
-        {
-            return invertKey(expandKey(userKey));
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/engines/IESEngine.java b/bcprov/src/main/java/org/bouncycastle/crypto/engines/IESEngine.java
deleted file mode 100644
index d2dee1c..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/engines/IESEngine.java
+++ /dev/null
@@ -1,438 +0,0 @@
-package org.bouncycastle.crypto.engines;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.math.BigInteger;
-
-import org.bouncycastle.crypto.BasicAgreement;
-import org.bouncycastle.crypto.BufferedBlockCipher;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.DerivationFunction;
-import org.bouncycastle.crypto.EphemeralKeyPair;
-import org.bouncycastle.crypto.InvalidCipherTextException;
-import org.bouncycastle.crypto.KeyParser;
-import org.bouncycastle.crypto.Mac;
-import org.bouncycastle.crypto.generators.EphemeralKeyPairGenerator;
-import org.bouncycastle.crypto.params.AsymmetricKeyParameter;
-import org.bouncycastle.crypto.params.IESParameters;
-import org.bouncycastle.crypto.params.IESWithCipherParameters;
-import org.bouncycastle.crypto.params.KDFParameters;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.crypto.params.ParametersWithIV;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.BigIntegers;
-import org.bouncycastle.util.Pack;
-
-/**
- * Support class for constructing integrated encryption ciphers
- * for doing basic message exchanges on top of key agreement ciphers.
- * Follows the description given in IEEE Std 1363a.
- */
-public class IESEngine
-{
-    BasicAgreement agree;
-    DerivationFunction kdf;
-    Mac mac;
-    BufferedBlockCipher cipher;
-    byte[] macBuf;
-
-    boolean forEncryption;
-    CipherParameters privParam, pubParam;
-    IESParameters param;
-
-    byte[] V;
-    private EphemeralKeyPairGenerator keyPairGenerator;
-    private KeyParser keyParser;
-    private byte[] IV;
-
-    /**
-     * set up for use with stream mode, where the key derivation function
-     * is used to provide a stream of bytes to xor with the message.
-     *
-     * @param agree the key agreement used as the basis for the encryption
-     * @param kdf   the key derivation function used for byte generation
-     * @param mac   the message authentication code generator for the message
-     */
-    public IESEngine(
-        BasicAgreement agree,
-        DerivationFunction kdf,
-        Mac mac)
-    {
-        this.agree = agree;
-        this.kdf = kdf;
-        this.mac = mac;
-        this.macBuf = new byte[mac.getMacSize()];
-        this.cipher = null;
-    }
-
-
-    /**
-     * set up for use in conjunction with a block cipher to handle the
-     * message.
-     *
-     * @param agree  the key agreement used as the basis for the encryption
-     * @param kdf    the key derivation function used for byte generation
-     * @param mac    the message authentication code generator for the message
-     * @param cipher the cipher to used for encrypting the message
-     */
-    public IESEngine(
-        BasicAgreement agree,
-        DerivationFunction kdf,
-        Mac mac,
-        BufferedBlockCipher cipher)
-    {
-        this.agree = agree;
-        this.kdf = kdf;
-        this.mac = mac;
-        this.macBuf = new byte[mac.getMacSize()];
-        this.cipher = cipher;
-    }
-
-    /**
-     * Initialise the encryptor.
-     *
-     * @param forEncryption whether or not this is encryption/decryption.
-     * @param privParam     our private key parameters
-     * @param pubParam      the recipient's/sender's public key parameters
-     * @param params        encoding and derivation parameters, may be wrapped to include an IV for an underlying block cipher.
-     */
-    public void init(
-        boolean forEncryption,
-        CipherParameters privParam,
-        CipherParameters pubParam,
-        CipherParameters params)
-    {
-        this.forEncryption = forEncryption;
-        this.privParam = privParam;
-        this.pubParam = pubParam;
-        this.V = new byte[0];
-
-        extractParams(params);
-    }
-
-    /**
-     * Initialise the decryptor.
-     *
-     * @param publicKey      the recipient's/sender's public key parameters
-     * @param params         encoding and derivation parameters, may be wrapped to include an IV for an underlying block cipher.
-     * @param ephemeralKeyPairGenerator             the ephemeral key pair generator to use.
-     */
-    public void init(AsymmetricKeyParameter publicKey, CipherParameters params, EphemeralKeyPairGenerator ephemeralKeyPairGenerator)
-    {
-        this.forEncryption = true;
-        this.pubParam = publicKey;
-        this.keyPairGenerator = ephemeralKeyPairGenerator;
-
-        extractParams(params);
-    }
-
-    /**
-     * Initialise the encryptor.
-     *
-     * @param privateKey      the recipient's private key.
-     * @param params          encoding and derivation parameters, may be wrapped to include an IV for an underlying block cipher.
-     * @param publicKeyParser the parser for reading the ephemeral public key.
-     */
-    public void init(AsymmetricKeyParameter privateKey, CipherParameters params, KeyParser publicKeyParser)
-    {
-        this.forEncryption = false;
-        this.privParam = privateKey;
-        this.keyParser = publicKeyParser;
-
-        extractParams(params);
-    }
-
-    private void extractParams(CipherParameters params)
-    {
-        if (params instanceof ParametersWithIV)
-        {
-            this.IV = ((ParametersWithIV)params).getIV();
-            this.param = (IESParameters)((ParametersWithIV)params).getParameters();
-        }
-        else
-        {
-            this.IV = null;
-            this.param = (IESParameters)params;
-        }
-    }
-
-    public BufferedBlockCipher getCipher()
-    {
-        return cipher;
-    }
-
-    public Mac getMac()
-    {
-        return mac;
-    }
-
-    private byte[] encryptBlock(
-        byte[] in,
-        int inOff,
-        int inLen)
-        throws InvalidCipherTextException
-    {
-        byte[] C = null, K = null, K1 = null, K2 = null;
-        int len;
-
-        if (cipher == null)
-        {
-            // Streaming mode.
-            K1 = new byte[inLen];
-            K2 = new byte[param.getMacKeySize() / 8];
-            K = new byte[K1.length + K2.length];
-
-            kdf.generateBytes(K, 0, K.length);
-
-            if (V.length != 0)
-            {
-                System.arraycopy(K, 0, K2, 0, K2.length);
-                System.arraycopy(K, K2.length, K1, 0, K1.length);
-            }
-            else
-            {
-                System.arraycopy(K, 0, K1, 0, K1.length);
-                System.arraycopy(K, inLen, K2, 0, K2.length);
-            }
-
-            C = new byte[inLen];
-
-            for (int i = 0; i != inLen; i++)
-            {
-                C[i] = (byte)(in[inOff + i] ^ K1[i]);
-            }
-            len = inLen;
-        }
-        else
-        {
-            // Block cipher mode.
-            K1 = new byte[((IESWithCipherParameters)param).getCipherKeySize() / 8];
-            K2 = new byte[param.getMacKeySize() / 8];
-            K = new byte[K1.length + K2.length];
-
-            kdf.generateBytes(K, 0, K.length);
-            System.arraycopy(K, 0, K1, 0, K1.length);
-            System.arraycopy(K, K1.length, K2, 0, K2.length);
-
-            // If iv provided use it to initialise the cipher
-            if (IV != null)
-            {
-                cipher.init(true, new ParametersWithIV(new KeyParameter(K1), IV));
-            }
-            else
-            {
-                cipher.init(true, new KeyParameter(K1));    
-            }
-            
-            C = new byte[cipher.getOutputSize(inLen)];
-            len = cipher.processBytes(in, inOff, inLen, C, 0);
-            len += cipher.doFinal(C, len);
-        }
-
-
-        // Convert the length of the encoding vector into a byte array.
-        byte[] P2 = param.getEncodingV();
-        byte[] L2 = new byte[4];
-        if (V.length != 0 && P2 != null)
-        {
-            Pack.intToBigEndian(P2.length * 8, L2, 0);
-        }
-
-
-        // Apply the MAC.
-        byte[] T = new byte[mac.getMacSize()];
-
-        mac.init(new KeyParameter(K2));
-        mac.update(C, 0, C.length);
-        if (P2 != null)
-        {
-            mac.update(P2, 0, P2.length);
-        }
-        if (V.length != 0)
-        {
-            mac.update(L2, 0, L2.length);
-        }
-        mac.doFinal(T, 0);
-
-
-        // Output the triple (V,C,T).
-        byte[] Output = new byte[V.length + len + T.length];
-        System.arraycopy(V, 0, Output, 0, V.length);
-        System.arraycopy(C, 0, Output, V.length, len);
-        System.arraycopy(T, 0, Output, V.length + len, T.length);
-        return Output;
-    }
-
-    private byte[] decryptBlock(
-        byte[] in_enc,
-        int inOff,
-        int inLen)
-        throws InvalidCipherTextException
-    {
-        byte[] M = null, K = null, K1 = null, K2 = null;
-        int len;
-
-        // Ensure that the length of the input is greater than the MAC in bytes
-        if (inLen <= (param.getMacKeySize() / 8))
-        {
-            throw new InvalidCipherTextException("Length of input must be greater than the MAC");
-        }
-
-        if (cipher == null)
-        {
-            // Streaming mode.
-            K1 = new byte[inLen - V.length - mac.getMacSize()];
-            K2 = new byte[param.getMacKeySize() / 8];
-            K = new byte[K1.length + K2.length];
-
-            kdf.generateBytes(K, 0, K.length);
-
-            if (V.length != 0)
-            {
-                System.arraycopy(K, 0, K2, 0, K2.length);
-                System.arraycopy(K, K2.length, K1, 0, K1.length);
-            }
-            else
-            {
-                System.arraycopy(K, 0, K1, 0, K1.length);
-                System.arraycopy(K, K1.length, K2, 0, K2.length);
-            }
-
-            M = new byte[K1.length];
-
-            for (int i = 0; i != K1.length; i++)
-            {
-                M[i] = (byte)(in_enc[inOff + V.length + i] ^ K1[i]);
-            }
-
-            len = K1.length;
-        }
-        else
-        {
-            // Block cipher mode.        
-            K1 = new byte[((IESWithCipherParameters)param).getCipherKeySize() / 8];
-            K2 = new byte[param.getMacKeySize() / 8];
-            K = new byte[K1.length + K2.length];
-
-            kdf.generateBytes(K, 0, K.length);
-            System.arraycopy(K, 0, K1, 0, K1.length);
-            System.arraycopy(K, K1.length, K2, 0, K2.length);
-
-            // If IV provide use it to initialize the cipher
-            if (IV != null)
-            {
-                cipher.init(false, new ParametersWithIV(new KeyParameter(K1), IV));
-            }
-            else
-            {
-                cipher.init(false, new KeyParameter(K1));    
-            }
-
-            M = new byte[cipher.getOutputSize(inLen - V.length - mac.getMacSize())];
-            len = cipher.processBytes(in_enc, inOff + V.length, inLen - V.length - mac.getMacSize(), M, 0);
-            len += cipher.doFinal(M, len);
-        }
-
-
-        // Convert the length of the encoding vector into a byte array.
-        byte[] P2 = param.getEncodingV();
-        byte[] L2 = new byte[4];
-        if (V.length != 0 && P2 != null)
-        {
-            Pack.intToBigEndian(P2.length * 8, L2, 0);
-        }
-
-
-        // Verify the MAC.
-        int end = inOff + inLen;
-        byte[] T1 = Arrays.copyOfRange(in_enc, end - mac.getMacSize(), end);
-
-        byte[] T2 = new byte[T1.length];
-        mac.init(new KeyParameter(K2));
-        mac.update(in_enc, inOff + V.length, inLen - V.length - T2.length);
-
-        if (P2 != null)
-        {
-            mac.update(P2, 0, P2.length);
-        }
-        if (V.length != 0)
-        {
-            mac.update(L2, 0, L2.length);
-        }
-        mac.doFinal(T2, 0);
-
-        if (!Arrays.constantTimeAreEqual(T1, T2))
-        {
-            throw new InvalidCipherTextException("Invalid MAC.");
-        }
-
-        // Output the message.
-        return Arrays.copyOfRange(M, 0, len);
-    }
-
-
-    public byte[] processBlock(
-        byte[] in,
-        int inOff,
-        int inLen)
-        throws InvalidCipherTextException
-    {
-        if (forEncryption)
-        {
-            if (keyPairGenerator != null)
-            {
-                EphemeralKeyPair ephKeyPair = keyPairGenerator.generate();
-
-                this.privParam = ephKeyPair.getKeyPair().getPrivate();
-                this.V = ephKeyPair.getEncodedPublicKey();
-            }
-        }
-        else
-        {
-            if (keyParser != null)
-            {
-                ByteArrayInputStream bIn = new ByteArrayInputStream(in, inOff, inLen);
-
-                try
-                {
-                    this.pubParam = keyParser.readKey(bIn);
-                }
-                catch (IOException e)
-                {
-                    throw new InvalidCipherTextException("unable to recover ephemeral public key: " + e.getMessage(), e);
-                }
-
-                int encLength = (inLen - bIn.available());
-                this.V = Arrays.copyOfRange(in, inOff, inOff + encLength);
-            }
-        }
-
-        // Compute the common value and convert to byte array. 
-        agree.init(privParam);
-        BigInteger z = agree.calculateAgreement(pubParam);
-        byte[] Z = BigIntegers.asUnsignedByteArray(agree.getFieldSize(), z);
-
-        // Create input to KDF.  
-        if (V.length != 0)
-        {
-            byte[] VZ = Arrays.concatenate(V, Z);
-            Arrays.fill(Z, (byte)0);
-            Z = VZ;
-        }
-
-        try
-        {
-            // Initialise the KDF.
-            KDFParameters kdfParam = new KDFParameters(Z, param.getDerivationV());
-            kdf.init(kdfParam);
-
-            return forEncryption
-                ? encryptBlock(in, inOff, inLen)
-                : decryptBlock(in, inOff, inLen);
-        }
-        finally
-        {
-            Arrays.fill(Z, (byte)0);
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/engines/ISAACEngine.java b/bcprov/src/main/java/org/bouncycastle/crypto/engines/ISAACEngine.java
deleted file mode 100644
index d2dd265..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/engines/ISAACEngine.java
+++ /dev/null
@@ -1,221 +0,0 @@
-package org.bouncycastle.crypto.engines;
-
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.DataLengthException;
-import org.bouncycastle.crypto.OutputLengthException;
-import org.bouncycastle.crypto.StreamCipher;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.util.Pack;
-
-/**
- * Implementation of Bob Jenkin's ISAAC (Indirection Shift Accumulate Add and Count).
- * see: http://www.burtleburtle.net/bob/rand/isaacafa.html
-*/
-public class ISAACEngine
-    implements StreamCipher
-{
-    // Constants
-    private final int sizeL          = 8,
-                      stateArraySize = sizeL<<5; // 256
-    
-    // Cipher's internal state
-    private int[]   engineState   = null, // mm                
-                    results       = null; // randrsl
-    private int     a = 0, b = 0, c = 0;
-    
-    // Engine state
-    private int     index         = 0;
-    private byte[]  keyStream     = new byte[stateArraySize<<2], // results expanded into bytes
-                    workingKey    = null;
-    private boolean initialised   = false;
-    
-    /**
-     * initialise an ISAAC cipher.
-     *
-     * @param forEncryption whether or not we are for encryption.
-     * @param params the parameters required to set up the cipher.
-     * @exception IllegalArgumentException if the params argument is
-     * inappropriate.
-     */
-    public void init(
-        boolean             forEncryption, 
-        CipherParameters    params)
-    {
-        if (!(params instanceof KeyParameter))
-        {
-            throw new IllegalArgumentException("invalid parameter passed to ISAAC init - " + params.getClass().getName());
-        }
-        /* 
-         * ISAAC encryption and decryption is completely
-         * symmetrical, so the 'forEncryption' is 
-         * irrelevant.
-         */
-        KeyParameter p = (KeyParameter)params;
-        setKey(p.getKey());
-        
-        return;
-    }
-                    
-    public byte returnByte(byte in)
-    {
-        if (index == 0) 
-        {
-            isaac();
-            keyStream = Pack.intToBigEndian(results);
-        }
-        byte out = (byte)(keyStream[index]^in);
-        index = (index + 1) & 1023;
-        
-        return out;
-    }
-    
-    public int processBytes(
-        byte[]  in, 
-        int     inOff, 
-        int     len, 
-        byte[]  out, 
-        int     outOff)
-    {
-        if (!initialised)
-        {
-            throw new IllegalStateException(getAlgorithmName()+" not initialised");
-        }
-        
-        if ((inOff + len) > in.length)
-        {
-            throw new DataLengthException("input buffer too short");
-        }
-        
-        if ((outOff + len) > out.length)
-        {
-            throw new OutputLengthException("output buffer too short");
-        }
-        
-        for (int i = 0; i < len; i++)
-        {
-            if (index == 0) 
-            {
-                isaac();
-                keyStream = Pack.intToBigEndian(results);
-            }
-            out[i+outOff] = (byte)(keyStream[index]^in[i+inOff]);
-            index = (index + 1) & 1023;
-        }
-
-        return len;
-    }
-    
-    public String getAlgorithmName()
-    {
-        return "ISAAC";
-    }
-    
-    public void reset()
-    {
-        setKey(workingKey);
-    }
-    
-    // Private implementation
-    private void setKey(byte[] keyBytes)
-    {
-        workingKey = keyBytes;
-        
-        if (engineState == null)
-        {
-            engineState = new int[stateArraySize];
-        }
-        
-        if (results == null)
-        {
-            results = new int[stateArraySize];
-        }
-        
-        int i, j, k;
-        
-        // Reset state
-        for (i = 0; i < stateArraySize; i++)
-        {
-            engineState[i] = results[i] = 0;
-        }
-        a = b = c = 0;
-        
-        // Reset index counter for output
-        index = 0;
-        
-        // Convert the key bytes to ints and put them into results[] for initialization
-        byte[] t = new byte[keyBytes.length + (keyBytes.length & 3)];
-        System.arraycopy(keyBytes, 0, t, 0, keyBytes.length);
-        for (i = 0; i < t.length; i+=4)
-        {
-            results[i >>> 2] = Pack.littleEndianToInt(t, i);
-        }
-
-        // It has begun?
-        int[] abcdefgh = new int[sizeL];
-        
-        for (i = 0; i < sizeL; i++)
-        {
-            abcdefgh[i] = 0x9e3779b9; // Phi (golden ratio)
-        }
-        
-        for (i = 0; i < 4; i++)
-        {
-            mix(abcdefgh);
-        }
-        
-        for (i = 0; i < 2; i++)
-        {
-            for (j = 0; j < stateArraySize; j+=sizeL)
-            {
-                for (k = 0; k < sizeL; k++)
-                {
-                    abcdefgh[k] += (i<1) ? results[j+k] : engineState[j+k];
-                }
-                
-                mix(abcdefgh);
-                
-                for (k = 0; k < sizeL; k++)
-                {
-                    engineState[j+k] = abcdefgh[k];
-                }
-            }
-        }
-        
-        isaac();
-        
-        initialised = true;
-    }    
-    
-    private void isaac()
-    {
-        int i, x, y;
-        
-        b += ++c;
-        for (i = 0; i < stateArraySize; i++)
-        {
-            x = engineState[i];
-            switch (i & 3)
-            {
-                case 0: a ^= (a <<  13); break;
-                case 1: a ^= (a >>>  6); break;
-                case 2: a ^= (a <<   2); break;
-                case 3: a ^= (a >>> 16); break;
-            }
-            a += engineState[(i+128) & 0xFF];
-            engineState[i] = y = engineState[(x >>> 2) & 0xFF] + a + b;
-            results[i] = b = engineState[(y >>> 10) & 0xFF] + x;
-        }
-    }
-    
-    private void mix(int[] x)
-    {
-        x[0]^=x[1]<< 11; x[3]+=x[0]; x[1]+=x[2];
-        x[1]^=x[2]>>> 2; x[4]+=x[1]; x[2]+=x[3];
-        x[2]^=x[3]<<  8; x[5]+=x[2]; x[3]+=x[4];
-        x[3]^=x[4]>>>16; x[6]+=x[3]; x[4]+=x[5];
-        x[4]^=x[5]<< 10; x[7]+=x[4]; x[5]+=x[6];
-        x[5]^=x[6]>>> 4; x[0]+=x[5]; x[6]+=x[7];
-        x[6]^=x[7]<<  8; x[1]+=x[6]; x[7]+=x[0];
-        x[7]^=x[0]>>> 9; x[2]+=x[7]; x[0]+=x[1];
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/engines/NaccacheSternEngine.java b/bcprov/src/main/java/org/bouncycastle/crypto/engines/NaccacheSternEngine.java
deleted file mode 100644
index a5403fa..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/engines/NaccacheSternEngine.java
+++ /dev/null
@@ -1,437 +0,0 @@
-package org.bouncycastle.crypto.engines;
-
-import java.math.BigInteger;
-import java.util.Vector;
-import org.bouncycastle.util.Arrays;
-
-import org.bouncycastle.crypto.AsymmetricBlockCipher;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.DataLengthException;
-import org.bouncycastle.crypto.InvalidCipherTextException;
-import org.bouncycastle.crypto.params.NaccacheSternKeyParameters;
-import org.bouncycastle.crypto.params.NaccacheSternPrivateKeyParameters;
-import org.bouncycastle.crypto.params.ParametersWithRandom;
-
-/**
- * NaccacheStern Engine. For details on this cipher, please see
- * http://www.gemplus.com/smart/rd/publications/pdf/NS98pkcs.pdf
- */
-public class NaccacheSternEngine
-    implements AsymmetricBlockCipher
-{
-    private boolean forEncryption;
-
-    private NaccacheSternKeyParameters key;
-
-    private Vector[] lookup = null;
-
-    private boolean debug = false;
-
-    private static BigInteger ZERO = BigInteger.valueOf(0);
-    private static BigInteger ONE = BigInteger.valueOf(1);
-
-    /**
-     * Initializes this algorithm. Must be called before all other Functions.
-     * 
-     * @see org.bouncycastle.crypto.AsymmetricBlockCipher#init(boolean,
-     *      org.bouncycastle.crypto.CipherParameters)
-     */
-    public void init(boolean forEncryption, CipherParameters param)
-    {
-        this.forEncryption = forEncryption;
-
-        if (param instanceof ParametersWithRandom)
-        {
-            param = ((ParametersWithRandom) param).getParameters();
-        }
-
-        key = (NaccacheSternKeyParameters)param;
-
-        // construct lookup table for faster decryption if necessary
-        if (!this.forEncryption)
-        {
-            if (debug)
-            {
-                System.out.println("Constructing lookup Array");
-            }
-            NaccacheSternPrivateKeyParameters priv = (NaccacheSternPrivateKeyParameters)key;
-            Vector primes = priv.getSmallPrimes();
-            lookup = new Vector[primes.size()];
-            for (int i = 0; i < primes.size(); i++)
-            {
-                BigInteger actualPrime = (BigInteger)primes.elementAt(i);
-                int actualPrimeValue = actualPrime.intValue();
-
-                lookup[i] = new Vector();
-                lookup[i].addElement(ONE);
-
-                if (debug)
-                {
-                    System.out.println("Constructing lookup ArrayList for " + actualPrimeValue);
-                }
-
-                BigInteger accJ = ZERO;
-
-                for (int j = 1; j < actualPrimeValue; j++)
-                {
-                    accJ = accJ.add(priv.getPhi_n());
-                    BigInteger comp = accJ.divide(actualPrime);
-                    lookup[i].addElement(priv.getG().modPow(comp, priv.getModulus()));
-                }
-            }
-        }
-    }
-
-    public void setDebug(boolean debug)
-    {
-        this.debug = debug;
-    }
-
-    /**
-     * Returns the input block size of this algorithm.
-     * 
-     * @see org.bouncycastle.crypto.AsymmetricBlockCipher#getInputBlockSize()
-     */
-    public int getInputBlockSize()
-    {
-        if (forEncryption)
-        {
-            // We can only encrypt values up to lowerSigmaBound
-            return (key.getLowerSigmaBound() + 7) / 8 - 1;
-        }
-        else
-        {
-            // We pad to modulus-size bytes for easier decryption.
-            return key.getModulus().toByteArray().length;
-        }
-    }
-
-    /**
-     * Returns the output block size of this algorithm.
-     * 
-     * @see org.bouncycastle.crypto.AsymmetricBlockCipher#getOutputBlockSize()
-     */
-    public int getOutputBlockSize()
-    {
-        if (forEncryption)
-        {
-            // encrypted Data is always padded up to modulus size
-            return key.getModulus().toByteArray().length;
-        }
-        else
-        {
-            // decrypted Data has upper limit lowerSigmaBound
-            return (key.getLowerSigmaBound() + 7) / 8 - 1;
-        }
-    }
-
-    /**
-     * Process a single Block using the Naccache-Stern algorithm.
-     * 
-     * @see org.bouncycastle.crypto.AsymmetricBlockCipher#processBlock(byte[],
-     *      int, int)
-     */
-    public byte[] processBlock(byte[] in, int inOff, int len) throws InvalidCipherTextException
-    {
-        if (key == null)
-        {
-            throw new IllegalStateException("NaccacheStern engine not initialised");
-        }
-        if (len > (getInputBlockSize() + 1))
-        {
-            throw new DataLengthException("input too large for Naccache-Stern cipher.\n");
-        }
-
-        if (!forEncryption)
-        {
-            // At decryption make sure that we receive padded data blocks
-            if (len < getInputBlockSize())
-            {
-                throw new InvalidCipherTextException("BlockLength does not match modulus for Naccache-Stern cipher.\n");
-            }
-        }
-
-        byte[] block;
-
-        if (inOff != 0 || len != in.length)
-        {
-            block = new byte[len];
-            System.arraycopy(in, inOff, block, 0, len);
-        }
-        else
-        {
-            block = in;
-        }
-
-        // transform input into BigInteger
-        BigInteger input = new BigInteger(1, block);
-        if (debug)
-        {
-            System.out.println("input as BigInteger: " + input);
-        }
-        byte[] output;
-        if (forEncryption)
-        {
-            output = encrypt(input);
-        }
-        else
-        {
-            Vector plain = new Vector();
-            NaccacheSternPrivateKeyParameters priv = (NaccacheSternPrivateKeyParameters)key;
-            Vector primes = priv.getSmallPrimes();
-            // Get Chinese Remainders of CipherText
-            for (int i = 0; i < primes.size(); i++)
-            {
-                BigInteger exp = input.modPow(priv.getPhi_n().divide((BigInteger)primes.elementAt(i)), priv.getModulus());
-                Vector al = lookup[i];
-                if (lookup[i].size() != ((BigInteger)primes.elementAt(i)).intValue())
-                {
-                    if (debug)
-                    {
-                        System.out.println("Prime is " + primes.elementAt(i) + ", lookup table has size " + al.size());
-                    }
-                    throw new InvalidCipherTextException("Error in lookup Array for "
-                                    + ((BigInteger)primes.elementAt(i)).intValue()
-                                    + ": Size mismatch. Expected ArrayList with length "
-                                    + ((BigInteger)primes.elementAt(i)).intValue() + " but found ArrayList of length "
-                                    + lookup[i].size());
-                }
-                int lookedup = al.indexOf(exp);
-
-                if (lookedup == -1)
-                {
-                    if (debug)
-                    {
-                        System.out.println("Actual prime is " + primes.elementAt(i));
-                        System.out.println("Decrypted value is " + exp);
-
-                        System.out.println("LookupList for " + primes.elementAt(i) + " with size " + lookup[i].size()
-                                        + " is: ");
-                        for (int j = 0; j < lookup[i].size(); j++)
-                        {
-                            System.out.println(lookup[i].elementAt(j));
-                        }
-                    }
-                    throw new InvalidCipherTextException("Lookup failed");
-                }
-                plain.addElement(BigInteger.valueOf(lookedup));
-            }
-            BigInteger test = chineseRemainder(plain, primes);
-
-            // Should not be used as an oracle, so reencrypt output to see
-            // if it corresponds to input
-
-            // this breaks probabilisic encryption, so disable it. Anyway, we do
-            // use the first n primes for key generation, so it is pretty easy
-            // to guess them. But as stated in the paper, this is not a security
-            // breach. So we can just work with the correct sigma.
-
-            // if (debug) {
-            //      System.out.println("Decryption is " + test);
-            // }
-            // if ((key.getG().modPow(test, key.getModulus())).equals(input)) {
-            //      output = test.toByteArray();
-            // } else {
-            //      if(debug){
-            //          System.out.println("Engine seems to be used as an oracle,
-            //          returning null");
-            //      }
-            //      output = null;
-            // }
-
-            output = test.toByteArray();
-
-        }
-
-        return output;
-    }
-
-    /**
-     * Encrypts a BigInteger aka Plaintext with the public key.
-     * 
-     * @param plain
-     *            The BigInteger to encrypt
-     * @return The byte[] representation of the encrypted BigInteger (i.e.
-     *         crypted.toByteArray())
-     */
-    public byte[] encrypt(BigInteger plain)
-    {
-        // Always return modulus size values 0-padded at the beginning
-        // 0-padding at the beginning is correctly parsed by BigInteger :)
-        byte[] output = key.getModulus().toByteArray();
-        Arrays.fill(output, (byte)0);
-        byte[] tmp = key.getG().modPow(plain, key.getModulus()).toByteArray();
-        System
-                .arraycopy(tmp, 0, output, output.length - tmp.length,
-                        tmp.length);
-        if (debug)
-        {
-            System.out
-                    .println("Encrypted value is:  " + new BigInteger(output));
-        }
-        return output;
-    }
-
-    /**
-     * Adds the contents of two encrypted blocks mod sigma
-     * 
-     * @param block1
-     *            the first encrypted block
-     * @param block2
-     *            the second encrypted block
-     * @return encrypt((block1 + block2) mod sigma)
-     * @throws InvalidCipherTextException
-     */
-    public byte[] addCryptedBlocks(byte[] block1, byte[] block2)
-            throws InvalidCipherTextException
-    {
-        // check for correct blocksize
-        if (forEncryption)
-        {
-            if ((block1.length > getOutputBlockSize())
-                    || (block2.length > getOutputBlockSize()))
-            {
-                throw new InvalidCipherTextException(
-                        "BlockLength too large for simple addition.\n");
-            }
-        }
-        else
-        {
-            if ((block1.length > getInputBlockSize())
-                    || (block2.length > getInputBlockSize()))
-            {
-                throw new InvalidCipherTextException(
-                        "BlockLength too large for simple addition.\n");
-            }
-        }
-
-        // calculate resulting block
-        BigInteger m1Crypt = new BigInteger(1, block1);
-        BigInteger m2Crypt = new BigInteger(1, block2);
-        BigInteger m1m2Crypt = m1Crypt.multiply(m2Crypt);
-        m1m2Crypt = m1m2Crypt.mod(key.getModulus());
-        if (debug)
-        {
-            System.out.println("c(m1) as BigInteger:....... " + m1Crypt);
-            System.out.println("c(m2) as BigInteger:....... " + m2Crypt);
-            System.out.println("c(m1)*c(m2)%n = c(m1+m2)%n: " + m1m2Crypt);
-        }
-
-        byte[] output = key.getModulus().toByteArray();
-        Arrays.fill(output, (byte)0);
-        System.arraycopy(m1m2Crypt.toByteArray(), 0, output, output.length
-                - m1m2Crypt.toByteArray().length,
-                m1m2Crypt.toByteArray().length);
-
-        return output;
-    }
-
-    /**
-     * Convenience Method for data exchange with the cipher.
-     * 
-     * Determines blocksize and splits data to blocksize.
-     *
-     * @param data the data to be processed
-     * @return the data after it went through the NaccacheSternEngine.
-     * @throws InvalidCipherTextException 
-     */
-    public byte[] processData(byte[] data) throws InvalidCipherTextException
-    {
-        if (debug)
-        {
-            System.out.println();
-        }
-        if (data.length > getInputBlockSize())
-        {
-            int inBlocksize = getInputBlockSize();
-            int outBlocksize = getOutputBlockSize();
-            if (debug)
-            {
-                System.out.println("Input blocksize is:  " + inBlocksize + " bytes");
-                System.out.println("Output blocksize is: " + outBlocksize + " bytes");
-                System.out.println("Data has length:.... " + data.length + " bytes");
-            }
-            int datapos = 0;
-            int retpos = 0;
-            byte[] retval = new byte[(data.length / inBlocksize + 1) * outBlocksize];
-            while (datapos < data.length)
-            {
-                byte[] tmp;
-                if (datapos + inBlocksize < data.length)
-                {
-                    tmp = processBlock(data, datapos, inBlocksize);
-                    datapos += inBlocksize;
-                }
-                else
-                {
-                    tmp = processBlock(data, datapos, data.length - datapos);
-                    datapos += data.length - datapos;
-                }
-                if (debug)
-                {
-                    System.out.println("new datapos is " + datapos);
-                }
-                if (tmp != null)
-                {
-                    System.arraycopy(tmp, 0, retval, retpos, tmp.length);
-                    
-                    retpos += tmp.length;
-                }
-                else
-                {
-                    if (debug)
-                    {
-                        System.out.println("cipher returned null");
-                    }
-                    throw new InvalidCipherTextException("cipher returned null");
-                }
-            }
-            byte[] ret = new byte[retpos];
-            System.arraycopy(retval, 0, ret, 0, retpos);
-            if (debug)
-            {
-                System.out.println("returning " + ret.length + " bytes");
-            }
-            return ret;
-        }
-        else
-        {
-            if (debug)
-            {
-                System.out.println("data size is less then input block size, processing directly");
-            }
-            return processBlock(data, 0, data.length);
-        }
-    }
-
-    /**
-     * Computes the integer x that is expressed through the given primes and the
-     * congruences with the chinese remainder theorem (CRT).
-     * 
-     * @param congruences
-     *            the congruences c_i
-     * @param primes
-     *            the primes p_i
-     * @return an integer x for that x % p_i == c_i
-     */
-    private static BigInteger chineseRemainder(Vector congruences, Vector primes)
-    {
-        BigInteger retval = ZERO;
-        BigInteger all = ONE;
-        for (int i = 0; i < primes.size(); i++)
-        {
-            all = all.multiply((BigInteger)primes.elementAt(i));
-        }
-        for (int i = 0; i < primes.size(); i++)
-        {
-            BigInteger a = (BigInteger)primes.elementAt(i);
-            BigInteger b = all.divide(a);
-            BigInteger b_ = b.modInverse(a);
-            BigInteger tmp = b.multiply(b_);
-            tmp = tmp.multiply((BigInteger)congruences.elementAt(i));
-            retval = retval.add(tmp);
-        }
-
-        return retval.mod(all);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/engines/NoekeonEngine.java b/bcprov/src/main/java/org/bouncycastle/crypto/engines/NoekeonEngine.java
deleted file mode 100644
index c4494c4..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/engines/NoekeonEngine.java
+++ /dev/null
@@ -1,263 +0,0 @@
-package org.bouncycastle.crypto.engines;
-
-import org.bouncycastle.crypto.BlockCipher;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.DataLengthException;
-import org.bouncycastle.crypto.OutputLengthException;
-import org.bouncycastle.crypto.params.KeyParameter;
-
-/**
- * A Noekeon engine, using direct-key mode.
- */
-
-public class NoekeonEngine
-    implements BlockCipher
-{
-    private static final int genericSize = 16; // Block and key size, as well as the amount of rounds.
-    
-    private static final int[] nullVector = 
-                               {
-                                    0x00, 0x00, 0x00, 0x00 // Used in decryption
-                               },
-        
-                               roundConstants = 
-                               {
-                                    0x80, 0x1b, 0x36, 0x6c,
-                                    0xd8, 0xab, 0x4d, 0x9a,
-                                    0x2f, 0x5e, 0xbc, 0x63,
-                                    0xc6, 0x97, 0x35, 0x6a,
-                                    0xd4
-                               };
-    
-    private int[] state   = new int[4], // a
-                  subKeys = new int[4], // k
-                  decryptKeys = new int[4];
-    
-    private boolean _initialised,
-                    _forEncryption;
-    
-    /**
-     * Create an instance of the Noekeon encryption algorithm
-     * and set some defaults
-     */
-    public NoekeonEngine()
-    {
-        _initialised = false;
-    }
-    
-    public String getAlgorithmName()
-    {
-        return "Noekeon";
-    }
-    
-    public int getBlockSize()
-    {
-        return genericSize;
-    }
-    
-    /**
-     * initialise
-     *
-     * @param forEncryption whether or not we are for encryption.
-     * @param params the parameters required to set up the cipher.
-     * @exception IllegalArgumentException if the params argument is
-     * inappropriate.
-     */
-    public void init(
-                     boolean             forEncryption,
-                     CipherParameters    params)
-    {
-        if (!(params instanceof KeyParameter))
-        {
-            throw new IllegalArgumentException("invalid parameter passed to Noekeon init - " + params.getClass().getName());
-        }
-        
-        _forEncryption = forEncryption;
-        _initialised = true;
-        
-        KeyParameter       p = (KeyParameter)params;
-        
-        setKey(p.getKey());
-    }
-    
-    public int processBlock(
-                            byte[]  in,
-                            int     inOff,
-                            byte[]  out,
-                            int     outOff)
-    {
-        if (!_initialised)
-        {
-            throw new IllegalStateException(getAlgorithmName()+" not initialised");
-        }
-        
-        if ((inOff + genericSize) > in.length)
-        {
-            throw new DataLengthException("input buffer too short");
-        }
-        
-        if ((outOff + genericSize) > out.length)
-        {
-            throw new OutputLengthException("output buffer too short");
-        }
-        
-        return (_forEncryption) ? encryptBlock(in, inOff, out, outOff)
-                                : decryptBlock(in, inOff, out, outOff);
-    }
-    
-    public void reset()
-    {
-    }
-    
-    /**
-     * Re-key the cipher.
-     * <p>
-     * @param  key  the key to be used
-     */
-    private void setKey(
-                        byte[]      key)
-    {
-        subKeys[0] = bytesToIntBig(key, 0);
-        subKeys[1] = bytesToIntBig(key, 4);
-        subKeys[2] = bytesToIntBig(key, 8);
-        subKeys[3] = bytesToIntBig(key, 12);
-    }
-    
-    private int encryptBlock(
-                             byte[]  in,
-                             int     inOff,
-                             byte[]  out,
-                             int     outOff)
-    {
-        state[0] = bytesToIntBig(in, inOff);
-        state[1] = bytesToIntBig(in, inOff+4);
-        state[2] = bytesToIntBig(in, inOff+8);
-        state[3] = bytesToIntBig(in, inOff+12);
-        
-        int i;
-        for (i = 0; i < genericSize; i++)
-        {
-            state[0] ^= roundConstants[i];
-            theta(state, subKeys);
-            pi1(state);
-            gamma(state);
-            pi2(state);            
-        }
-        
-        state[0] ^= roundConstants[i];
-        theta(state, subKeys);
-        
-        intToBytesBig(state[0], out, outOff);
-        intToBytesBig(state[1], out, outOff+4);
-        intToBytesBig(state[2], out, outOff+8);
-        intToBytesBig(state[3], out, outOff+12);
-        
-        return genericSize;
-    }
-    
-    private int decryptBlock(
-                             byte[]  in,
-                             int     inOff,
-                             byte[]  out,
-                             int     outOff)
-    {
-        state[0] = bytesToIntBig(in, inOff);
-        state[1] = bytesToIntBig(in, inOff+4);
-        state[2] = bytesToIntBig(in, inOff+8);
-        state[3] = bytesToIntBig(in, inOff+12);
-        
-        System.arraycopy(subKeys, 0, decryptKeys, 0, subKeys.length);
-        theta(decryptKeys, nullVector);
-        
-        int i;
-        for (i = genericSize; i > 0; i--)
-        {
-            theta(state, decryptKeys);
-            state[0] ^= roundConstants[i];
-            pi1(state);
-            gamma(state);
-            pi2(state);
-        }
-        
-        theta(state, decryptKeys);
-        state[0] ^= roundConstants[i];
-        
-        intToBytesBig(state[0], out, outOff);
-        intToBytesBig(state[1], out, outOff+4);
-        intToBytesBig(state[2], out, outOff+8);
-        intToBytesBig(state[3], out, outOff+12);
-        
-        return genericSize;
-    }
-        
-    private void gamma(int[] a)
-    {
-        a[1] ^= ~a[3] & ~a[2];
-        a[0] ^= a[2] & a[1];
-        
-        int tmp = a[3];
-        a[3]  = a[0];
-        a[0]  = tmp;
-        a[2] ^= a[0]^a[1]^a[3];
-        
-        a[1] ^= ~a[3] & ~a[2];
-        a[0] ^= a[2] & a[1];
-    }
-    
-    private void theta(int[] a, int[] k)
-    {
-        int tmp;
-        
-        tmp   = a[0]^a[2]; 
-        tmp  ^= rotl(tmp,8)^rotl(tmp,24); 
-        a[1] ^= tmp; 
-        a[3] ^= tmp; 
-        
-        for (int i = 0; i < 4; i++)
-        {
-            a[i] ^= k[i];
-        }
-        
-        tmp   = a[1]^a[3]; 
-        tmp  ^= rotl(tmp,8)^rotl(tmp,24); 
-        a[0] ^= tmp; 
-        a[2] ^= tmp;
-    }
-    
-    private void pi1(int[] a)
-    {
-        a[1] = rotl(a[1], 1);
-        a[2] = rotl(a[2], 5);
-        a[3] = rotl(a[3], 2);
-    }
-    
-    private void pi2(int[] a)
-    {
-        a[1] = rotl(a[1], 31);
-        a[2] = rotl(a[2], 27);
-        a[3] = rotl(a[3], 30);
-    }
-    
-    // Helpers
-    
-    private int bytesToIntBig(byte[] in, int off)
-    {
-        return ((in[off++]) << 24) |
-        ((in[off++] & 0xff) << 16) |
-        ((in[off++] & 0xff) <<  8) |
-         (in[off  ] & 0xff);
-    }
-    
-    private void intToBytesBig(int x, byte[] out, int off)
-    {
-        out[off++] = (byte)(x >>> 24);
-        out[off++] = (byte)(x >>> 16);
-        out[off++] = (byte)(x >>>  8);
-        out[off  ] = (byte)x;
-    }
-    
-    private int rotl(int x, int y)
-    {
-        return (x << y) | (x >>> (32-y));
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/engines/NullEngine.java b/bcprov/src/main/java/org/bouncycastle/crypto/engines/NullEngine.java
deleted file mode 100644
index 1ad2c9d..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/engines/NullEngine.java
+++ /dev/null
@@ -1,96 +0,0 @@
-package org.bouncycastle.crypto.engines;
-
-import org.bouncycastle.crypto.BlockCipher;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.DataLengthException;
-import org.bouncycastle.crypto.OutputLengthException;
-
-/**
- * The no-op engine that just copies bytes through, irrespective of whether encrypting and decrypting.
- * Provided for the sake of completeness.
- */
-public class NullEngine implements BlockCipher
-{
-    private boolean initialised;
-    protected static final int DEFAULT_BLOCK_SIZE = 1;
-    private final int blockSize;
-
-    /**
-     * Constructs a null engine with a block size of 1 byte.
-     */
-    public NullEngine()
-    {
-        this(DEFAULT_BLOCK_SIZE);
-    }
-
-    /**
-     * Constructs a null engine with a specific block size.
-     * 
-     * @param blockSize the block size in bytes.
-     */
-    public NullEngine(int blockSize)
-    {
-        this.blockSize = blockSize;
-    }
-
-    /* (non-Javadoc)
-     * @see org.bouncycastle.crypto.BlockCipher#init(boolean, org.bouncycastle.crypto.CipherParameters)
-     */
-    public void init(boolean forEncryption, CipherParameters params) throws IllegalArgumentException
-    {
-        // we don't mind any parameters that may come in
-        this.initialised = true;
-    }
-
-    /* (non-Javadoc)
-     * @see org.bouncycastle.crypto.BlockCipher#getAlgorithmName()
-     */
-    public String getAlgorithmName()
-    {
-        return "Null";
-    }
-
-    /* (non-Javadoc)
-     * @see org.bouncycastle.crypto.BlockCipher#getBlockSize()
-     */
-    public int getBlockSize()
-    {
-        return blockSize;
-    }
-
-    /* (non-Javadoc)
-     * @see org.bouncycastle.crypto.BlockCipher#processBlock(byte[], int, byte[], int)
-     */
-    public int processBlock(byte[] in, int inOff, byte[] out, int outOff)
-        throws DataLengthException, IllegalStateException
-    {
-        if (!initialised)
-        {
-            throw new IllegalStateException("Null engine not initialised");
-        }
-        if ((inOff + blockSize) > in.length)
-        {
-            throw new DataLengthException("input buffer too short");
-        }
-
-        if ((outOff + blockSize) > out.length)
-        {
-            throw new OutputLengthException("output buffer too short");
-        }
-
-        for (int i = 0; i < blockSize; ++i)
-        {
-            out[outOff + i] = in[inOff + i];
-        }
-
-        return blockSize;
-    }
-
-    /* (non-Javadoc)
-     * @see org.bouncycastle.crypto.BlockCipher#reset()
-     */
-    public void reset()
-    {
-        // nothing needs to be done
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/engines/RC2WrapEngine.java b/bcprov/src/main/java/org/bouncycastle/crypto/engines/RC2WrapEngine.java
deleted file mode 100644
index ec82b1a..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/engines/RC2WrapEngine.java
+++ /dev/null
@@ -1,385 +0,0 @@
-package org.bouncycastle.crypto.engines;
-
-import java.security.SecureRandom;
-
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.InvalidCipherTextException;
-import org.bouncycastle.crypto.Wrapper;
-import org.bouncycastle.crypto.digests.SHA1Digest;
-import org.bouncycastle.crypto.modes.CBCBlockCipher;
-import org.bouncycastle.crypto.params.ParametersWithIV;
-import org.bouncycastle.crypto.params.ParametersWithRandom;
-import org.bouncycastle.util.Arrays;
-
-/**
- * Wrap keys according to RFC 3217 - RC2 mechanism
- */
-public class RC2WrapEngine
-    implements Wrapper
-{
-   /** Field engine */
-   private CBCBlockCipher engine;
-
-   /** Field param */
-   private CipherParameters param;
-
-   /** Field paramPlusIV */
-   private ParametersWithIV paramPlusIV;
-
-   /** Field iv */
-   private byte[] iv;
-
-   /** Field forWrapping */
-   private boolean forWrapping;
-   
-   private SecureRandom sr;
-
-   /** Field IV2           */
-   private static final byte[] IV2 = { (byte) 0x4a, (byte) 0xdd, (byte) 0xa2,
-                                       (byte) 0x2c, (byte) 0x79, (byte) 0xe8,
-                                       (byte) 0x21, (byte) 0x05 };
-
-    //
-    // checksum digest
-    //
-    Digest  sha1 = new SHA1Digest();
-    byte[]  digest = new byte[20];
-
-   /**
-    * Method init
-    *
-    * @param forWrapping
-    * @param param
-    */
-   public void init(boolean forWrapping, CipherParameters param)
-   {
-        this.forWrapping = forWrapping;
-        this.engine = new CBCBlockCipher(new RC2Engine());
-
-        if (param instanceof ParametersWithRandom)
-        {
-            ParametersWithRandom pWithR = (ParametersWithRandom)param;
-            sr = pWithR.getRandom();
-            param = pWithR.getParameters();
-        }
-        else
-        {
-            sr = new SecureRandom();
-        }
-        
-        if (param instanceof ParametersWithIV)
-        {
-            this.paramPlusIV = (ParametersWithIV)param;
-            this.iv = this.paramPlusIV.getIV();
-            this.param = this.paramPlusIV.getParameters();
-
-            if (this.forWrapping)
-            {
-                if ((this.iv == null) || (this.iv.length != 8))
-                {
-                    throw new IllegalArgumentException("IV is not 8 octets");
-                }
-            }
-            else
-            {
-                throw new IllegalArgumentException(
-                        "You should not supply an IV for unwrapping");
-            }
-        }
-        else
-        {
-            this.param = param;
-
-            if (this.forWrapping)
-            {
-
-                // Hm, we have no IV but we want to wrap ?!?
-                // well, then we have to create our own IV.
-                this.iv = new byte[8];
-
-                sr.nextBytes(iv);
-
-                this.paramPlusIV = new ParametersWithIV(this.param, this.iv);
-            }
-        }
-
-   }
-
-   /**
-    * Method getAlgorithmName
-    *
-    * @return the algorithm name "RC2".
-    */
-   public String getAlgorithmName() 
-   {
-      return "RC2";
-   }
-
-   /**
-    * Method wrap
-    *
-    * @param in
-    * @param inOff
-    * @param inLen
-    * @return the wrapped bytes.
-    */
-   public byte[] wrap(byte[] in, int inOff, int inLen)
-    {
-
-        if (!forWrapping)
-        {
-            throw new IllegalStateException("Not initialized for wrapping");
-        }
-
-        int length = inLen + 1;
-        if ((length % 8) != 0)
-        {
-            length += 8 - (length % 8);
-        }
-
-        byte keyToBeWrapped[] = new byte[length];
-
-        keyToBeWrapped[0] = (byte)inLen;
-        System.arraycopy(in, inOff, keyToBeWrapped, 1, inLen);
-        
-        byte[] pad = new byte[keyToBeWrapped.length - inLen - 1];
-
-        if (pad.length > 0)
-        {
-            sr.nextBytes(pad);
-            System.arraycopy(pad, 0, keyToBeWrapped, inLen + 1, pad.length);
-        }
-
-        // Compute the CMS Key Checksum, (section 5.6.1), call this CKS.
-        byte[] CKS = calculateCMSKeyChecksum(keyToBeWrapped);
-
-        // Let WKCKS = WK || CKS where || is concatenation.
-        byte[] WKCKS = new byte[keyToBeWrapped.length + CKS.length];
-
-        System.arraycopy(keyToBeWrapped, 0, WKCKS, 0, keyToBeWrapped.length);
-        System.arraycopy(CKS, 0, WKCKS, keyToBeWrapped.length, CKS.length);
-
-        // Encrypt WKCKS in CBC mode using KEK as the key and IV as the
-        // initialization vector. Call the results TEMP1.
-        byte TEMP1[] = new byte[WKCKS.length];
-
-        System.arraycopy(WKCKS, 0, TEMP1, 0, WKCKS.length);
-
-        int noOfBlocks = WKCKS.length / engine.getBlockSize();
-        int extraBytes = WKCKS.length % engine.getBlockSize();
-
-        if (extraBytes != 0)
-        {
-            throw new IllegalStateException("Not multiple of block length");
-        }
-
-        engine.init(true, paramPlusIV);
-
-        for (int i = 0; i < noOfBlocks; i++)
-        {
-            int currentBytePos = i * engine.getBlockSize();
-
-            engine.processBlock(TEMP1, currentBytePos, TEMP1, currentBytePos);
-        }
-
-        // Left TEMP2 = IV || TEMP1.
-        byte[] TEMP2 = new byte[this.iv.length + TEMP1.length];
-
-        System.arraycopy(this.iv, 0, TEMP2, 0, this.iv.length);
-        System.arraycopy(TEMP1, 0, TEMP2, this.iv.length, TEMP1.length);
-
-        // Reverse the order of the octets in TEMP2 and call the result TEMP3.
-        byte[] TEMP3 = new byte[TEMP2.length];
-
-        for (int i = 0; i < TEMP2.length; i++)
-        {
-            TEMP3[i] = TEMP2[TEMP2.length - (i + 1)];
-        }
-
-        // Encrypt TEMP3 in CBC mode using the KEK and an initialization vector
-        // of 0x 4a dd a2 2c 79 e8 21 05. The resulting cipher text is the
-        // desired
-        // result. It is 40 octets long if a 168 bit key is being wrapped.
-        ParametersWithIV param2 = new ParametersWithIV(this.param, IV2);
-
-        this.engine.init(true, param2);
-
-        for (int i = 0; i < noOfBlocks + 1; i++)
-        {
-            int currentBytePos = i * engine.getBlockSize();
-
-            engine.processBlock(TEMP3, currentBytePos, TEMP3, currentBytePos);
-        }
-
-        return TEMP3;
-   }
-
-   /**
-    * Method unwrap
-    *
-    * @param in
-    * @param inOff
-    * @param inLen
-    * @return the unwrapped bytes.
-    * @throws InvalidCipherTextException
-    */
-   public byte[] unwrap(byte[] in, int inOff, int inLen)
-            throws InvalidCipherTextException
-    {
-
-        if (forWrapping)
-        {
-            throw new IllegalStateException("Not set for unwrapping");
-        }
-
-        if (in == null)
-        {
-            throw new InvalidCipherTextException("Null pointer as ciphertext");
-        }
-
-        if (inLen % engine.getBlockSize() != 0)
-        {
-            throw new InvalidCipherTextException("Ciphertext not multiple of "
-                    + engine.getBlockSize());
-        }
-
-        /*
-         * // Check if the length of the cipher text is reasonable given the key //
-         * type. It must be 40 bytes for a 168 bit key and either 32, 40, or //
-         * 48 bytes for a 128, 192, or 256 bit key. If the length is not
-         * supported // or inconsistent with the algorithm for which the key is
-         * intended, // return error. // // we do not accept 168 bit keys. it
-         * has to be 192 bit. int lengthA = (estimatedKeyLengthInBit / 8) + 16;
-         * int lengthB = estimatedKeyLengthInBit % 8;
-         * 
-         * if ((lengthA != keyToBeUnwrapped.length) || (lengthB != 0)) { throw
-         * new XMLSecurityException("empty"); }
-         */
-
-        // Decrypt the cipher text with TRIPLedeS in CBC mode using the KEK
-        // and an initialization vector (IV) of 0x4adda22c79e82105. Call the
-        // output TEMP3.
-        ParametersWithIV param2 = new ParametersWithIV(this.param, IV2);
-
-        this.engine.init(false, param2);
-
-        byte TEMP3[] = new byte[inLen];
-
-        System.arraycopy(in, inOff, TEMP3, 0, inLen);
-
-        for (int i = 0; i < (TEMP3.length / engine.getBlockSize()); i++)
-        {
-            int currentBytePos = i * engine.getBlockSize();
-
-            engine.processBlock(TEMP3, currentBytePos, TEMP3, currentBytePos);
-        }
-
-        // Reverse the order of the octets in TEMP3 and call the result TEMP2.
-        byte[] TEMP2 = new byte[TEMP3.length];
-
-        for (int i = 0; i < TEMP3.length; i++)
-        {
-            TEMP2[i] = TEMP3[TEMP3.length - (i + 1)];
-        }
-
-        // Decompose TEMP2 into IV, the first 8 octets, and TEMP1, the remaining
-        // octets.
-        this.iv = new byte[8];
-
-        byte[] TEMP1 = new byte[TEMP2.length - 8];
-
-        System.arraycopy(TEMP2, 0, this.iv, 0, 8);
-        System.arraycopy(TEMP2, 8, TEMP1, 0, TEMP2.length - 8);
-
-        // Decrypt TEMP1 using TRIPLedeS in CBC mode using the KEK and the IV
-        // found in the previous step. Call the result WKCKS.
-        this.paramPlusIV = new ParametersWithIV(this.param, this.iv);
-
-        this.engine.init(false, this.paramPlusIV);
-
-        byte[] LCEKPADICV = new byte[TEMP1.length];
-
-        System.arraycopy(TEMP1, 0, LCEKPADICV, 0, TEMP1.length);
-
-        for (int i = 0; i < (LCEKPADICV.length / engine.getBlockSize()); i++)
-        {
-            int currentBytePos = i * engine.getBlockSize();
-
-            engine.processBlock(LCEKPADICV, currentBytePos, LCEKPADICV,
-                    currentBytePos);
-        }
-
-        // Decompose LCEKPADICV. CKS is the last 8 octets and WK, the wrapped
-        // key, are
-        // those octets before the CKS.
-        byte[] result = new byte[LCEKPADICV.length - 8];
-        byte[] CKStoBeVerified = new byte[8];
-
-        System.arraycopy(LCEKPADICV, 0, result, 0, LCEKPADICV.length - 8);
-        System.arraycopy(LCEKPADICV, LCEKPADICV.length - 8, CKStoBeVerified, 0,
-                8);
-
-        // Calculate a CMS Key Checksum, (section 5.6.1), over the WK and
-        // compare
-        // with the CKS extracted in the above step. If they are not equal,
-        // return error.
-        if (!checkCMSKeyChecksum(result, CKStoBeVerified))
-        {
-            throw new InvalidCipherTextException(
-                    "Checksum inside ciphertext is corrupted");
-        }
-
-        if ((result.length - ((result[0] & 0xff) + 1)) > 7)
-        {
-            throw new InvalidCipherTextException("too many pad bytes ("
-                    + (result.length - ((result[0] & 0xff) + 1)) + ")");
-        }
-
-        // CEK is the wrapped key, now extracted for use in data decryption.
-        byte[] CEK = new byte[result[0]];
-        System.arraycopy(result, 1, CEK, 0, CEK.length);
-        return CEK;
-    }
-
-    /**
-     * Some key wrap algorithms make use of the Key Checksum defined
-     * in CMS [CMS-Algorithms]. This is used to provide an integrity
-     * check value for the key being wrapped. The algorithm is
-     *
-     * - Compute the 20 octet SHA-1 hash on the key being wrapped.
-     * - Use the first 8 octets of this hash as the checksum value.
-     *
-     * For details see  http://www.w3.org/TR/xmlenc-core/#sec-CMSKeyChecksum
-     * @param key
-     * @return
-     * @throws RuntimeException
-     *
-     */
-    private byte[] calculateCMSKeyChecksum(
-        byte[] key)
-    {
-        byte[]  result = new byte[8];
-
-        sha1.update(key, 0, key.length);
-        sha1.doFinal(digest, 0);
-
-        System.arraycopy(digest, 0, result, 0, 8);
-
-        return result;
-    }
-
-    /**
-     * For details see  http://www.w3.org/TR/xmlenc-core/#sec-CMSKeyChecksum
-     *
-     * @param key
-     * @param checksum
-     * @return
-     */
-    private boolean checkCMSKeyChecksum(
-        byte[] key,
-        byte[] checksum)
-    {
-        return Arrays.constantTimeAreEqual(calculateCMSKeyChecksum(key), checksum);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/engines/RC532Engine.java b/bcprov/src/main/java/org/bouncycastle/crypto/engines/RC532Engine.java
deleted file mode 100644
index 9fb6f55..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/engines/RC532Engine.java
+++ /dev/null
@@ -1,287 +0,0 @@
-package org.bouncycastle.crypto.engines;
-
-import org.bouncycastle.crypto.BlockCipher;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.crypto.params.RC5Parameters;
-
-/**
- * The specification for RC5 came from the <code>RC5 Encryption Algorithm</code>
- * publication in RSA CryptoBytes, Spring of 1995. 
- * <em>http://www.rsasecurity.com/rsalabs/cryptobytes</em>.
- * <p>
- * This implementation has a word size of 32 bits.
- * <p>
- * Implementation courtesy of Tito Pena.
- */
-public class RC532Engine
-    implements BlockCipher
-{
-    /*
-     * the number of rounds to perform
-     */
-    private int _noRounds;
-
-    /*
-     * the expanded key array of size 2*(rounds + 1)
-     */
-    private int _S[];
-
-    /*
-     * our "magic constants" for 32 32
-     *
-     * Pw = Odd((e-2) * 2^wordsize)
-     * Qw = Odd((o-2) * 2^wordsize)
-     *
-     * where e is the base of natural logarithms (2.718281828...)
-     * and o is the golden ratio (1.61803398...)
-     */
-    private static final int P32 = 0xb7e15163;
-    private static final int Q32 = 0x9e3779b9;
-
-    private boolean forEncryption;
-
-    /**
-     * Create an instance of the RC5 encryption algorithm
-     * and set some defaults
-     */
-    public RC532Engine()
-    {
-        _noRounds     = 12;         // the default
-        _S            = null;
-    }
-
-    public String getAlgorithmName()
-    {
-        return "RC5-32";
-    }
-
-    public int getBlockSize()
-    {
-        return 2 * 4;
-    }
-
-    /**
-     * initialise a RC5-32 cipher.
-     *
-     * @param forEncryption whether or not we are for encryption.
-     * @param params the parameters required to set up the cipher.
-     * @exception IllegalArgumentException if the params argument is
-     * inappropriate.
-     */
-    public void init(
-        boolean             forEncryption,
-        CipherParameters    params)
-    {
-        if (params instanceof RC5Parameters)
-        {
-            RC5Parameters       p = (RC5Parameters)params;
-
-            _noRounds     = p.getRounds();
-
-            setKey(p.getKey());
-        }
-        else if (params instanceof KeyParameter)
-        {
-            KeyParameter       p = (KeyParameter)params;
-
-            setKey(p.getKey());
-        }
-        else
-        {
-            throw new IllegalArgumentException("invalid parameter passed to RC532 init - " + params.getClass().getName());
-        }
-
-        this.forEncryption = forEncryption;
-    }
-
-    public int processBlock(
-        byte[]  in,
-        int     inOff,
-        byte[]  out,
-        int     outOff)
-    {
-        return (forEncryption) ? encryptBlock(in, inOff, out, outOff) 
-                                    : decryptBlock(in, inOff, out, outOff);
-    }
-
-    public void reset()
-    {
-    }
-
-    /**
-     * Re-key the cipher.
-     * <p>
-     * @param  key  the key to be used
-     */
-    private void setKey(
-        byte[]      key)
-    {
-        //
-        // KEY EXPANSION:
-        //
-        // There are 3 phases to the key expansion.
-        //
-        // Phase 1:
-        //   Copy the secret key K[0...b-1] into an array L[0..c-1] of
-        //   c = ceil(b/u), where u = 32/8 in little-endian order.
-        //   In other words, we fill up L using u consecutive key bytes
-        //   of K. Any unfilled byte positions in L are zeroed. In the
-        //   case that b = c = 0, set c = 1 and L[0] = 0.
-        //
-        int[]   L = new int[(key.length + (4 - 1)) / 4];
-
-        for (int i = 0; i != key.length; i++)
-        {
-            L[i / 4] += (key[i] & 0xff) << (8 * (i % 4));
-        }
-
-        //
-        // Phase 2:
-        //   Initialize S to a particular fixed pseudo-random bit pattern
-        //   using an arithmetic progression modulo 2^wordsize determined
-        //   by the magic numbers, Pw & Qw.
-        //
-        _S            = new int[2*(_noRounds + 1)];
-
-        _S[0] = P32;
-        for (int i=1; i < _S.length; i++)
-        {
-            _S[i] = (_S[i-1] + Q32);
-        }
-
-        //
-        // Phase 3:
-        //   Mix in the user's secret key in 3 passes over the arrays S & L.
-        //   The max of the arrays sizes is used as the loop control
-        //
-        int iter;
-
-        if (L.length > _S.length)
-        {
-            iter = 3 * L.length;
-        }
-        else
-        {
-            iter = 3 * _S.length;
-        }
-
-        int A = 0, B = 0;
-        int i = 0, j = 0;
-
-        for (int k = 0; k < iter; k++)
-        {
-            A = _S[i] = rotateLeft(_S[i] + A + B, 3);
-            B =  L[j] = rotateLeft(L[j] + A + B, A+B);
-            i = (i+1) % _S.length;
-            j = (j+1) %  L.length;
-        }
-    }
-
-    /**
-     * Encrypt the given block starting at the given offset and place
-     * the result in the provided buffer starting at the given offset.
-     * <p>
-     * @param  in     in byte buffer containing data to encrypt
-     * @param  inOff  offset into src buffer
-     * @param  out     out buffer where encrypted data is written
-     * @param  outOff  offset into out buffer
-     */
-    private int encryptBlock(
-        byte[]  in,
-        int     inOff,
-        byte[]  out,
-        int     outOff)
-    {
-        int A = bytesToWord(in, inOff) + _S[0];
-        int B = bytesToWord(in, inOff + 4) + _S[1];
-
-        for (int i = 1; i <= _noRounds; i++)
-        {
-            A = rotateLeft(A ^ B, B) + _S[2*i];
-            B = rotateLeft(B ^ A, A) + _S[2*i+1];
-        }
-        
-        wordToBytes(A, out, outOff);
-        wordToBytes(B, out, outOff + 4);
-        
-        return 2 * 4;
-    }
-
-    private int decryptBlock(
-        byte[]  in,
-        int     inOff,
-        byte[]  out,
-        int     outOff)
-    {
-        int A = bytesToWord(in, inOff);
-        int B = bytesToWord(in, inOff + 4);
-
-        for (int i = _noRounds; i >= 1; i--)
-        {
-            B = rotateRight(B - _S[2*i+1], A) ^ A;
-            A = rotateRight(A - _S[2*i],   B) ^ B;
-        }
-        
-        wordToBytes(A - _S[0], out, outOff);
-        wordToBytes(B - _S[1], out, outOff + 4);
-        
-        return 2 * 4;
-    }
-
-    
-    //////////////////////////////////////////////////////////////
-    //
-    // PRIVATE Helper Methods
-    //
-    //////////////////////////////////////////////////////////////
-
-    /**
-     * Perform a left "spin" of the word. The rotation of the given
-     * word <em>x</em> is rotated left by <em>y</em> bits.
-     * Only the <em>lg(32)</em> low-order bits of <em>y</em>
-     * are used to determine the rotation amount. Here it is 
-     * assumed that the wordsize used is a power of 2.
-     * <p>
-     * @param  x  word to rotate
-     * @param  y    number of bits to rotate % 32
-     */
-    private int rotateLeft(int x, int y)
-    {
-        return ((x << (y & (32-1))) | (x >>> (32 - (y & (32-1)))));
-    }
-
-    /**
-     * Perform a right "spin" of the word. The rotation of the given
-     * word <em>x</em> is rotated left by <em>y</em> bits.
-     * Only the <em>lg(32)</em> low-order bits of <em>y</em>
-     * are used to determine the rotation amount. Here it is 
-     * assumed that the wordsize used is a power of 2.
-     * <p>
-     * @param  x  word to rotate
-     * @param  y    number of bits to rotate % 32
-     */
-    private int rotateRight(int x, int y)
-    {
-        return ((x >>> (y & (32-1))) | (x << (32 - (y & (32-1)))));
-    }
-
-    private int bytesToWord(
-        byte[]  src,
-        int     srcOff)
-    {
-        return (src[srcOff] & 0xff) | ((src[srcOff + 1] & 0xff) << 8)
-            | ((src[srcOff + 2] & 0xff) << 16) | ((src[srcOff + 3] & 0xff) << 24);
-    }
-
-    private void wordToBytes(
-        int    word,
-        byte[]  dst,
-        int     dstOff)
-    {
-        dst[dstOff] = (byte)word;
-        dst[dstOff + 1] = (byte)(word >> 8);
-        dst[dstOff + 2] = (byte)(word >> 16);
-        dst[dstOff + 3] = (byte)(word >> 24);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/engines/RC564Engine.java b/bcprov/src/main/java/org/bouncycastle/crypto/engines/RC564Engine.java
deleted file mode 100644
index 2121a4b..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/engines/RC564Engine.java
+++ /dev/null
@@ -1,288 +0,0 @@
-package org.bouncycastle.crypto.engines;
-
-import org.bouncycastle.crypto.BlockCipher;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.params.RC5Parameters;
-
-/**
- * The specification for RC5 came from the <code>RC5 Encryption Algorithm</code>
- * publication in RSA CryptoBytes, Spring of 1995. 
- * <em>http://www.rsasecurity.com/rsalabs/cryptobytes</em>.
- * <p>
- * This implementation is set to work with a 64 bit word size.
- * <p>
- * Implementation courtesy of Tito Pena.
- */
-public class RC564Engine
-    implements BlockCipher
-{
-    private static final int wordSize = 64;
-    private static final int bytesPerWord = wordSize / 8;
-
-    /*
-     * the number of rounds to perform
-     */
-    private int _noRounds;
-
-    /*
-     * the expanded key array of size 2*(rounds + 1)
-     */
-    private long _S[];
-
-    /*
-     * our "magic constants" for wordSize 62
-     *
-     * Pw = Odd((e-2) * 2^wordsize)
-     * Qw = Odd((o-2) * 2^wordsize)
-     *
-     * where e is the base of natural logarithms (2.718281828...)
-     * and o is the golden ratio (1.61803398...)
-     */
-    private static final long P64 = 0xb7e151628aed2a6bL;
-    private static final long Q64 = 0x9e3779b97f4a7c15L;
-
-    private boolean forEncryption;
-
-    /**
-     * Create an instance of the RC5 encryption algorithm
-     * and set some defaults
-     */
-    public RC564Engine()
-    {
-        _noRounds     = 12;
-        _S            = null;
-    }
-
-    public String getAlgorithmName()
-    {
-        return "RC5-64";
-    }
-
-    public int getBlockSize()
-    {
-        return 2 * bytesPerWord;
-    }
-
-    /**
-     * initialise a RC5-64 cipher.
-     *
-     * @param forEncryption whether or not we are for encryption.
-     * @param params the parameters required to set up the cipher.
-     * @exception IllegalArgumentException if the params argument is
-     * inappropriate.
-     */
-    public void init(
-        boolean             forEncryption,
-        CipherParameters    params)
-    {
-        if (!(params instanceof RC5Parameters))
-        {
-            throw new IllegalArgumentException("invalid parameter passed to RC564 init - " + params.getClass().getName());
-        }
-
-        RC5Parameters       p = (RC5Parameters)params;
-
-        this.forEncryption = forEncryption;
-
-        _noRounds     = p.getRounds();
-
-        setKey(p.getKey());
-    }
-
-    public int processBlock(
-        byte[]  in,
-        int     inOff,
-        byte[]  out,
-        int     outOff)
-    {
-        return (forEncryption) ? encryptBlock(in, inOff, out, outOff) 
-                                    : decryptBlock(in, inOff, out, outOff);
-    }
-
-    public void reset()
-    {
-    }
-
-    /**
-     * Re-key the cipher.
-     * <p>
-     * @param  key  the key to be used
-     */
-    private void setKey(
-        byte[]      key)
-    {
-        //
-        // KEY EXPANSION:
-        //
-        // There are 3 phases to the key expansion.
-        //
-        // Phase 1:
-        //   Copy the secret key K[0...b-1] into an array L[0..c-1] of
-        //   c = ceil(b/u), where u = wordSize/8 in little-endian order.
-        //   In other words, we fill up L using u consecutive key bytes
-        //   of K. Any unfilled byte positions in L are zeroed. In the
-        //   case that b = c = 0, set c = 1 and L[0] = 0.
-        //
-        long[]   L = new long[(key.length + (bytesPerWord - 1)) / bytesPerWord];
-
-        for (int i = 0; i != key.length; i++)
-        {
-            L[i / bytesPerWord] += (long)(key[i] & 0xff) << (8 * (i % bytesPerWord));
-        }
-
-        //
-        // Phase 2:
-        //   Initialize S to a particular fixed pseudo-random bit pattern
-        //   using an arithmetic progression modulo 2^wordsize determined
-        //   by the magic numbers, Pw & Qw.
-        //
-        _S            = new long[2*(_noRounds + 1)];
-
-        _S[0] = P64;
-        for (int i=1; i < _S.length; i++)
-        {
-            _S[i] = (_S[i-1] + Q64);
-        }
-
-        //
-        // Phase 3:
-        //   Mix in the user's secret key in 3 passes over the arrays S & L.
-        //   The max of the arrays sizes is used as the loop control
-        //
-        int iter;
-
-        if (L.length > _S.length)
-        {
-            iter = 3 * L.length;
-        }
-        else
-        {
-            iter = 3 * _S.length;
-        }
-
-        long A = 0, B = 0;
-        int i = 0, j = 0;
-
-        for (int k = 0; k < iter; k++)
-        {
-            A = _S[i] = rotateLeft(_S[i] + A + B, 3);
-            B =  L[j] = rotateLeft(L[j] + A + B, A+B);
-            i = (i+1) % _S.length;
-            j = (j+1) %  L.length;
-        }
-    }
-
-    /**
-     * Encrypt the given block starting at the given offset and place
-     * the result in the provided buffer starting at the given offset.
-     * <p>
-     * @param  in      in byte buffer containing data to encrypt
-     * @param  inOff   offset into src buffer
-     * @param  out     out buffer where encrypted data is written
-     * @param  outOff  offset into out buffer
-     */
-    private int encryptBlock(
-        byte[]  in,
-        int     inOff,
-        byte[]  out,
-        int     outOff)
-    {
-        long A = bytesToWord(in, inOff) + _S[0];
-        long B = bytesToWord(in, inOff + bytesPerWord) + _S[1];
-
-        for (int i = 1; i <= _noRounds; i++)
-        {
-            A = rotateLeft(A ^ B, B) + _S[2*i];
-            B = rotateLeft(B ^ A, A) + _S[2*i+1];
-        }
-        
-        wordToBytes(A, out, outOff);
-        wordToBytes(B, out, outOff + bytesPerWord);
-        
-        return 2 * bytesPerWord;
-    }
-
-    private int decryptBlock(
-        byte[]  in,
-        int     inOff,
-        byte[]  out,
-        int     outOff)
-    {
-        long A = bytesToWord(in, inOff);
-        long B = bytesToWord(in, inOff + bytesPerWord);
-
-        for (int i = _noRounds; i >= 1; i--)
-        {
-            B = rotateRight(B - _S[2*i+1], A) ^ A;
-            A = rotateRight(A - _S[2*i],   B) ^ B;
-        }
-        
-        wordToBytes(A - _S[0], out, outOff);
-        wordToBytes(B - _S[1], out, outOff + bytesPerWord);
-        
-        return 2 * bytesPerWord;
-    }
-
-    
-    //////////////////////////////////////////////////////////////
-    //
-    // PRIVATE Helper Methods
-    //
-    //////////////////////////////////////////////////////////////
-
-    /**
-     * Perform a left "spin" of the word. The rotation of the given
-     * word <em>x</em> is rotated left by <em>y</em> bits.
-     * Only the <em>lg(wordSize)</em> low-order bits of <em>y</em>
-     * are used to determine the rotation amount. Here it is 
-     * assumed that the wordsize used is a power of 2.
-     * <p>
-     * @param  x  word to rotate
-     * @param  y    number of bits to rotate % wordSize
-     */
-    private long rotateLeft(long x, long y)
-    {
-        return ((x << (y & (wordSize-1))) | (x >>> (wordSize - (y & (wordSize-1)))));
-    }
-
-    /**
-     * Perform a right "spin" of the word. The rotation of the given
-     * word <em>x</em> is rotated left by <em>y</em> bits.
-     * Only the <em>lg(wordSize)</em> low-order bits of <em>y</em>
-     * are used to determine the rotation amount. Here it is 
-     * assumed that the wordsize used is a power of 2.
-     * <p>
-     * @param  x  word to rotate
-     * @param  y    number of bits to rotate % wordSize
-     */
-    private long rotateRight(long x, long y)
-    {
-        return ((x >>> (y & (wordSize-1))) | (x << (wordSize - (y & (wordSize-1)))));
-    }
-
-    private long bytesToWord(
-        byte[]  src,
-        int     srcOff)
-    {
-        long    word = 0;
-
-        for (int i = bytesPerWord - 1; i >= 0; i--)
-        {
-            word = (word << 8) + (src[i + srcOff] & 0xff);
-        }
-
-        return word;
-    }
-
-    private void wordToBytes(
-        long    word,
-        byte[]  dst,
-        int     dstOff)
-    {
-        for (int i = 0; i < bytesPerWord; i++)
-        {
-            dst[i + dstOff] = (byte)word;
-            word >>>= 8;
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/engines/RC6Engine.java b/bcprov/src/main/java/org/bouncycastle/crypto/engines/RC6Engine.java
deleted file mode 100644
index bbf5d30..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/engines/RC6Engine.java
+++ /dev/null
@@ -1,363 +0,0 @@
-package org.bouncycastle.crypto.engines;
-
-import org.bouncycastle.crypto.BlockCipher;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.DataLengthException;
-import org.bouncycastle.crypto.OutputLengthException;
-import org.bouncycastle.crypto.params.KeyParameter;
-
-/**
- * An RC6 engine.
- */
-public class RC6Engine
-    implements BlockCipher
-{
-    private static final int wordSize = 32;
-    private static final int bytesPerWord = wordSize / 8;
-
-    /*
-     * the number of rounds to perform
-     */
-    private static final int _noRounds = 20;
-
-    /*
-     * the expanded key array of size 2*(rounds + 1)
-     */
-    private int _S[];
-
-    /*
-     * our "magic constants" for wordSize 32
-     *
-     * Pw = Odd((e-2) * 2^wordsize)
-     * Qw = Odd((o-2) * 2^wordsize)
-     *
-     * where e is the base of natural logarithms (2.718281828...)
-     * and o is the golden ratio (1.61803398...)
-     */
-    private static final int    P32 = 0xb7e15163;
-    private static final int    Q32 = 0x9e3779b9;
-
-    private static final int    LGW = 5;        // log2(32)
-
-    private boolean forEncryption;
-
-    /**
-     * Create an instance of the RC6 encryption algorithm
-     * and set some defaults
-     */
-    public RC6Engine()
-    {
-        _S            = null;
-    }
-
-    public String getAlgorithmName()
-    {
-        return "RC6";
-    }
-
-    public int getBlockSize()
-    {
-        return 4 * bytesPerWord;
-    }
-
-    /**
-     * initialise a RC5-32 cipher.
-     *
-     * @param forEncryption whether or not we are for encryption.
-     * @param params the parameters required to set up the cipher.
-     * @exception IllegalArgumentException if the params argument is
-     * inappropriate.
-     */
-    public void init(
-        boolean             forEncryption,
-        CipherParameters    params)
-    {
-        if (!(params instanceof KeyParameter))
-        {
-            throw new IllegalArgumentException("invalid parameter passed to RC6 init - " + params.getClass().getName());
-        }
-
-        KeyParameter       p = (KeyParameter)params;
-        this.forEncryption = forEncryption;
-        setKey(p.getKey());
-    }
-
-    public int processBlock(
-        byte[]  in,
-        int     inOff,
-        byte[]  out,
-        int     outOff)
-    {
-        int blockSize = getBlockSize();
-        if (_S == null)
-        {
-            throw new IllegalStateException("RC6 engine not initialised");
-        }
-        if ((inOff + blockSize) > in.length)
-        {
-            throw new DataLengthException("input buffer too short");
-        }
-        if ((outOff + blockSize) > out.length)
-        {
-            throw new OutputLengthException("output buffer too short");
-        }
-
-        return (forEncryption)
-            ?   encryptBlock(in, inOff, out, outOff) 
-            :   decryptBlock(in, inOff, out, outOff);
-    }
-
-    public void reset()
-    {
-    }
-
-    /**
-     * Re-key the cipher.
-     * <p>
-     * @param  key  the key to be used
-     */
-    private void setKey(
-        byte[]      key)
-    {
-
-        //
-        // KEY EXPANSION:
-        //
-        // There are 3 phases to the key expansion.
-        //
-        // Phase 1:
-        //   Copy the secret key K[0...b-1] into an array L[0..c-1] of
-        //   c = ceil(b/u), where u = wordSize/8 in little-endian order.
-        //   In other words, we fill up L using u consecutive key bytes
-        //   of K. Any unfilled byte positions in L are zeroed. In the
-        //   case that b = c = 0, set c = 1 and L[0] = 0.
-        //
-        // compute number of dwords
-        int c = (key.length + (bytesPerWord - 1)) / bytesPerWord;
-        if (c == 0)
-        {
-            c = 1;
-        }
-        int[]   L = new int[(key.length + bytesPerWord - 1) / bytesPerWord];
-
-        // load all key bytes into array of key dwords
-        for (int i = key.length - 1; i >= 0; i--)
-        {
-            L[i / bytesPerWord] = (L[i / bytesPerWord] << 8) + (key[i] & 0xff);
-        }
-
-        //
-        // Phase 2:
-        //   Key schedule is placed in a array of 2+2*ROUNDS+2 = 44 dwords.
-        //   Initialize S to a particular fixed pseudo-random bit pattern
-        //   using an arithmetic progression modulo 2^wordsize determined
-        //   by the magic numbers, Pw & Qw.
-        //
-        _S            = new int[2+2*_noRounds+2];
-
-        _S[0] = P32;
-        for (int i=1; i < _S.length; i++)
-        {
-            _S[i] = (_S[i-1] + Q32);
-        }
-
-        //
-        // Phase 3:
-        //   Mix in the user's secret key in 3 passes over the arrays S & L.
-        //   The max of the arrays sizes is used as the loop control
-        //
-        int iter;
-
-        if (L.length > _S.length)
-        {
-            iter = 3 * L.length;
-        }
-        else
-        {
-            iter = 3 * _S.length;
-        }
-
-        int A = 0;
-        int B = 0;
-        int i = 0, j = 0;
-
-        for (int k = 0; k < iter; k++)
-        {
-            A = _S[i] = rotateLeft(_S[i] + A + B, 3);
-            B =  L[j] = rotateLeft(L[j] + A + B, A+B);
-            i = (i+1) % _S.length;
-            j = (j+1) %  L.length;
-        }
-    }
-
-    private int encryptBlock(
-        byte[]  in,
-        int     inOff,
-        byte[]  out,
-        int     outOff)
-    {
-        // load A,B,C and D registers from in.
-        int A = bytesToWord(in, inOff);
-        int B = bytesToWord(in, inOff + bytesPerWord);
-        int C = bytesToWord(in, inOff + bytesPerWord*2);
-        int D = bytesToWord(in, inOff + bytesPerWord*3);
-        
-        // Do pseudo-round #0: pre-whitening of B and D
-        B += _S[0];
-        D += _S[1];
-
-        // perform round #1,#2 ... #ROUNDS of encryption 
-        for (int i = 1; i <= _noRounds; i++)
-        {
-            int t = 0,u = 0;
-            
-            t = B*(2*B+1);
-            t = rotateLeft(t,5);
-            
-            u = D*(2*D+1);
-            u = rotateLeft(u,5);
-            
-            A ^= t;
-            A = rotateLeft(A,u);
-            A += _S[2*i];
-            
-            C ^= u;
-            C = rotateLeft(C,t);
-            C += _S[2*i+1];
-            
-            int temp = A;
-            A = B;
-            B = C;
-            C = D;
-            D = temp;            
-        }
-        // do pseudo-round #(ROUNDS+1) : post-whitening of A and C
-        A += _S[2*_noRounds+2];
-        C += _S[2*_noRounds+3];
-            
-        // store A, B, C and D registers to out        
-        wordToBytes(A, out, outOff);
-        wordToBytes(B, out, outOff + bytesPerWord);
-        wordToBytes(C, out, outOff + bytesPerWord*2);
-        wordToBytes(D, out, outOff + bytesPerWord*3);
-        
-        return 4 * bytesPerWord;
-    }
-
-    private int decryptBlock(
-        byte[]  in,
-        int     inOff,
-        byte[]  out,
-        int     outOff)
-    {
-        // load A,B,C and D registers from out.
-        int A = bytesToWord(in, inOff);
-        int B = bytesToWord(in, inOff + bytesPerWord);
-        int C = bytesToWord(in, inOff + bytesPerWord*2);
-        int D = bytesToWord(in, inOff + bytesPerWord*3);
-
-        // Undo pseudo-round #(ROUNDS+1) : post whitening of A and C 
-        C -= _S[2*_noRounds+3];
-        A -= _S[2*_noRounds+2];
-        
-        // Undo round #ROUNDS, .., #2,#1 of encryption 
-        for (int i = _noRounds; i >= 1; i--)
-        {
-            int t=0,u = 0;
-            
-            int temp = D;
-            D = C;
-            C = B;
-            B = A;
-            A = temp;
-            
-            t = B*(2*B+1);
-            t = rotateLeft(t, LGW);
-            
-            u = D*(2*D+1);
-            u = rotateLeft(u, LGW);
-            
-            C -= _S[2*i+1];
-            C = rotateRight(C,t);
-            C ^= u;
-            
-            A -= _S[2*i];
-            A = rotateRight(A,u);
-            A ^= t;
-            
-        }
-        // Undo pseudo-round #0: pre-whitening of B and D
-        D -= _S[1];
-        B -= _S[0];
-        
-        wordToBytes(A, out, outOff);
-        wordToBytes(B, out, outOff + bytesPerWord);
-        wordToBytes(C, out, outOff + bytesPerWord*2);
-        wordToBytes(D, out, outOff + bytesPerWord*3);
-        
-        return 4 * bytesPerWord;
-    }
-
-    
-    //////////////////////////////////////////////////////////////
-    //
-    // PRIVATE Helper Methods
-    //
-    //////////////////////////////////////////////////////////////
-
-    /**
-     * Perform a left "spin" of the word. The rotation of the given
-     * word <em>x</em> is rotated left by <em>y</em> bits.
-     * Only the <em>lg(wordSize)</em> low-order bits of <em>y</em>
-     * are used to determine the rotation amount. Here it is 
-     * assumed that the wordsize used is 32.
-     * <p>
-     * @param  x  word to rotate
-     * @param  y    number of bits to rotate % wordSize
-     */
-    private int rotateLeft(int x, int y)
-    {
-        return (x << y) | (x >>> -y);
-    }
-
-    /**
-     * Perform a right "spin" of the word. The rotation of the given
-     * word <em>x</em> is rotated left by <em>y</em> bits.
-     * Only the <em>lg(wordSize)</em> low-order bits of <em>y</em>
-     * are used to determine the rotation amount. Here it is 
-     * assumed that the wordsize used is a power of 2.
-     * <p>
-     * @param  x  word to rotate
-     * @param  y    number of bits to rotate % wordSize
-     */
-    private int rotateRight(int x, int y)
-    {
-        return (x >>> y) | (x << -y);
-    }
-
-    private int bytesToWord(
-        byte[]  src,
-        int     srcOff)
-    {
-        int    word = 0;
-
-        for (int i = bytesPerWord - 1; i >= 0; i--)
-        {
-            word = (word << 8) + (src[i + srcOff] & 0xff);
-        }
-
-        return word;
-    }
-
-    private void wordToBytes(
-        int    word,
-        byte[]  dst,
-        int     dstOff)
-    {
-        for (int i = 0; i < bytesPerWord; i++)
-        {
-            dst[i + dstOff] = (byte)word;
-            word >>>= 8;
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/engines/RFC3211WrapEngine.java b/bcprov/src/main/java/org/bouncycastle/crypto/engines/RFC3211WrapEngine.java
deleted file mode 100644
index 0d10eeb..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/engines/RFC3211WrapEngine.java
+++ /dev/null
@@ -1,175 +0,0 @@
-package org.bouncycastle.crypto.engines;
-
-import org.bouncycastle.crypto.BlockCipher;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.InvalidCipherTextException;
-import org.bouncycastle.crypto.Wrapper;
-import org.bouncycastle.crypto.modes.CBCBlockCipher;
-import org.bouncycastle.crypto.params.ParametersWithIV;
-import org.bouncycastle.crypto.params.ParametersWithRandom;
-
-import java.security.SecureRandom;
-
-/**
- * an implementation of the RFC 3211 Key Wrap
- * Specification.
- */
-public class RFC3211WrapEngine
-    implements Wrapper
-{
-    private CBCBlockCipher   engine;
-    private ParametersWithIV param;
-    private boolean          forWrapping;
-    private SecureRandom     rand;
-
-    public RFC3211WrapEngine(BlockCipher engine)
-    {
-        this.engine = new CBCBlockCipher(engine);
-    }
-
-    public void init(
-        boolean          forWrapping,
-        CipherParameters param)
-    {
-        this.forWrapping = forWrapping;
-
-        if (param instanceof ParametersWithRandom)
-        {
-            ParametersWithRandom p = (ParametersWithRandom)param;
-
-            rand = p.getRandom();
-            this.param = (ParametersWithIV)p.getParameters();
-        }
-        else
-        {
-            if (forWrapping)
-            {
-                rand = new SecureRandom();
-            }
-
-            this.param = (ParametersWithIV)param;
-        }
-    }
-
-    public String getAlgorithmName()
-    {
-        return engine.getUnderlyingCipher().getAlgorithmName() + "/RFC3211Wrap";
-    }
-
-    public byte[] wrap(
-        byte[]  in,
-        int     inOff,
-        int     inLen)
-    {
-        if (!forWrapping)
-        {
-            throw new IllegalStateException("not set for wrapping");
-        }
-
-        engine.init(true, param);
-
-        int blockSize = engine.getBlockSize();
-        byte[] cekBlock;
-
-        if (inLen + 4 < blockSize * 2)
-        {
-            cekBlock = new byte[blockSize * 2];
-        }
-        else
-        {
-            cekBlock = new byte[(inLen + 4) % blockSize == 0 ? inLen + 4 : ((inLen + 4) / blockSize + 1) * blockSize];
-        }
-
-        cekBlock[0] = (byte)inLen;
-        cekBlock[1] = (byte)~in[inOff];
-        cekBlock[2] = (byte)~in[inOff + 1];
-        cekBlock[3] = (byte)~in[inOff + 2];
-
-        System.arraycopy(in, inOff, cekBlock, 4, inLen);
-
-        for (int i = inLen + 4; i < cekBlock.length; i++)
-        {
-            cekBlock[i] = (byte)rand.nextInt();
-        }
-
-        for (int i = 0; i < cekBlock.length; i += blockSize)
-        {
-            engine.processBlock(cekBlock, i, cekBlock, i);
-        }
-
-        for (int i = 0; i < cekBlock.length; i += blockSize)
-        {
-            engine.processBlock(cekBlock, i, cekBlock, i);
-        }
-
-        return cekBlock;
-    }
-
-    public byte[] unwrap(
-        byte[]  in,
-        int     inOff,
-        int     inLen)
-        throws InvalidCipherTextException
-    {
-        if (forWrapping)
-        {
-            throw new IllegalStateException("not set for unwrapping");
-        }
-
-        int blockSize = engine.getBlockSize();
-
-        if (inLen < 2 * blockSize)
-        {
-            throw new InvalidCipherTextException("input too short");
-        }
-        
-        byte[] cekBlock = new byte[inLen];
-        byte[] iv = new byte[blockSize];
-
-        System.arraycopy(in, inOff, cekBlock, 0, inLen);
-        System.arraycopy(in, inOff, iv, 0, iv.length);
-        
-        engine.init(false, new ParametersWithIV(param.getParameters(), iv));
-
-        for (int i = blockSize; i < cekBlock.length; i += blockSize)
-        {
-            engine.processBlock(cekBlock, i, cekBlock, i);    
-        }
-
-        System.arraycopy(cekBlock, cekBlock.length - iv.length, iv, 0, iv.length);
-
-        engine.init(false, new ParametersWithIV(param.getParameters(), iv));
-
-        engine.processBlock(cekBlock, 0, cekBlock, 0);
-
-        engine.init(false, param);
-
-        for (int i = 0; i < cekBlock.length; i += blockSize)
-        {
-            engine.processBlock(cekBlock, i, cekBlock, i);
-        }
-
-        if ((cekBlock[0] & 0xff) > cekBlock.length - 4)
-        {
-            throw new InvalidCipherTextException("wrapped key corrupted");
-        }
-
-        byte[] key = new byte[cekBlock[0] & 0xff];
-
-        System.arraycopy(cekBlock, 4, key, 0, cekBlock[0]);
-
-        // Note: Using constant time comparison
-        int nonEqual = 0;
-        for (int i = 0; i != 3; i++)
-        {
-            byte check = (byte)~cekBlock[1 + i];
-            nonEqual |= (check ^ key[i]);
-        }
-        if (nonEqual != 0)
-        {
-            throw new InvalidCipherTextException("wrapped key fails checksum");
-        }
-
-        return key;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/engines/RFC5649WrapEngine.java b/bcprov/src/main/java/org/bouncycastle/crypto/engines/RFC5649WrapEngine.java
deleted file mode 100644
index 4506ac7..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/engines/RFC5649WrapEngine.java
+++ /dev/null
@@ -1,300 +0,0 @@
-package org.bouncycastle.crypto.engines;
-
-import org.bouncycastle.crypto.BlockCipher;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.InvalidCipherTextException;
-import org.bouncycastle.crypto.Wrapper;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.crypto.params.ParametersWithIV;
-import org.bouncycastle.crypto.params.ParametersWithRandom;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.Pack;
-
-/**
- * An implementation of the AES Key Wrap with Padding specification
- * as described in RFC 5649.
- * <p>
- * For details on the specification see:
- * <a href="https://tools.ietf.org/html/rfc5649">https://tools.ietf.org/html/rfc5649</a>
- * </p>
- */
-public class RFC5649WrapEngine
-    implements Wrapper
-{
-    private BlockCipher engine;
-    private KeyParameter param;
-    private boolean forWrapping;
-
-    // The AIV as defined in the RFC
-    private byte[] highOrderIV = {(byte)0xa6, (byte)0x59, (byte)0x59, (byte)0xa6};
-    private byte[] preIV = highOrderIV;
-
-    private byte[] extractedAIV = null;
-
-    public RFC5649WrapEngine(BlockCipher engine)
-    {
-        this.engine = engine;
-    }
-
-    public void init(boolean forWrapping, CipherParameters param)
-    {
-        this.forWrapping = forWrapping;
-
-        if (param instanceof ParametersWithRandom)
-        {
-            param = ((ParametersWithRandom)param).getParameters();
-        }
-
-        if (param instanceof KeyParameter)
-        {
-            this.param = (KeyParameter)param;
-        }
-        else if (param instanceof ParametersWithIV)
-        {
-            this.preIV = ((ParametersWithIV)param).getIV();
-            this.param = (KeyParameter)((ParametersWithIV)param).getParameters();
-            if (this.preIV.length != 4)
-            {
-                throw new IllegalArgumentException("IV length not equal to 4");
-            }
-        }
-    }
-
-    public String getAlgorithmName()
-    {
-        return engine.getAlgorithmName();
-    }
-
-    /**
-     * Pads the plaintext (i.e., the key to be wrapped)
-     * as per section 4.1 of RFC 5649.
-     *
-     * @param plaintext The key being wrapped.
-     * @return The padded key.
-     */
-    private byte[] padPlaintext(byte[] plaintext)
-    {
-        int plaintextLength = plaintext.length;
-        int numOfZerosToAppend = (8 - (plaintextLength % 8)) % 8;
-        byte[] paddedPlaintext = new byte[plaintextLength + numOfZerosToAppend];
-        System.arraycopy(plaintext, 0, paddedPlaintext, 0, plaintextLength);
-        if (numOfZerosToAppend != 0)
-        {
-            // plaintext (i.e., key to be wrapped) does not have
-            // a multiple of 8 octet blocks so it must be padded
-            byte[] zeros = new byte[numOfZerosToAppend];
-            System.arraycopy(zeros, 0, paddedPlaintext, plaintextLength, numOfZerosToAppend);
-        }
-        return paddedPlaintext;
-    }
-
-    public byte[] wrap(byte[] in, int inOff, int inLen)
-    {
-        if (!forWrapping)
-        {
-            throw new IllegalStateException("not set for wrapping");
-        }
-        byte[] iv = new byte[8];
-
-        // MLI = size of key to be wrapped
-        byte[] mli = Pack.intToBigEndian(inLen);
-        // copy in the fixed portion of the AIV
-        System.arraycopy(preIV, 0, iv, 0, preIV.length);
-        // copy in the MLI after the AIV
-        System.arraycopy(mli, 0, iv, preIV.length, mli.length);
-
-        // get the relevant plaintext to be wrapped
-        byte[] relevantPlaintext = new byte[inLen];
-        System.arraycopy(in, inOff, relevantPlaintext, 0, inLen);
-        byte[] paddedPlaintext = padPlaintext(relevantPlaintext);
-
-        if (paddedPlaintext.length == 8)
-        {
-            // if the padded plaintext contains exactly 8 octets,
-            // then prepend iv and encrypt using AES in ECB mode.
-
-            // prepend the IV to the plaintext
-            byte[] paddedPlainTextWithIV = new byte[paddedPlaintext.length + iv.length];
-            System.arraycopy(iv, 0, paddedPlainTextWithIV, 0, iv.length);
-            System.arraycopy(paddedPlaintext, 0, paddedPlainTextWithIV, iv.length, paddedPlaintext.length);
-
-            engine.init(true, param);
-            for (int i = 0; i < paddedPlainTextWithIV.length; i += engine.getBlockSize())
-            {
-                engine.processBlock(paddedPlainTextWithIV, i, paddedPlainTextWithIV, i);
-            }
-
-            return paddedPlainTextWithIV;
-        }
-        else
-        {
-            // otherwise, apply the RFC 3394 wrap to
-            // the padded plaintext with the new IV
-            Wrapper wrapper = new RFC3394WrapEngine(engine);
-            ParametersWithIV paramsWithIV = new ParametersWithIV(param, iv);
-            wrapper.init(true, paramsWithIV);
-            return wrapper.wrap(paddedPlaintext, inOff, paddedPlaintext.length);
-        }
-
-    }
-
-    public byte[] unwrap(byte[] in, int inOff, int inLen)
-        throws InvalidCipherTextException
-    {
-        if (forWrapping)
-        {
-            throw new IllegalStateException("not set for unwrapping");
-        }
-
-        int n = inLen / 8;
-
-        if ((n * 8) != inLen)
-        {
-            throw new InvalidCipherTextException("unwrap data must be a multiple of 8 bytes");
-        }
-
-        if (n == 1)
-        {
-            throw new InvalidCipherTextException("unwrap data must be at least 16 bytes");
-        }
-
-        byte[] relevantCiphertext = new byte[inLen];
-        System.arraycopy(in, inOff, relevantCiphertext, 0, inLen);
-        byte[] decrypted = new byte[inLen];
-        byte[] paddedPlaintext;
-
-        if (n == 2)
-        {
-            // When there are exactly two 64-bit blocks of ciphertext,
-            // they are decrypted as a single block using AES in ECB.
-            engine.init(false, param);
-            for (int i = 0; i < relevantCiphertext.length; i += engine.getBlockSize())
-            {
-                engine.processBlock(relevantCiphertext, i, decrypted, i);
-            }
-
-            // extract the AIV
-            extractedAIV = new byte[8];
-            System.arraycopy(decrypted, 0, extractedAIV, 0, extractedAIV.length);
-            paddedPlaintext = new byte[decrypted.length - extractedAIV.length];
-            System.arraycopy(decrypted, extractedAIV.length, paddedPlaintext, 0, paddedPlaintext.length);
-        }
-        else
-        {
-            // Otherwise, unwrap as per RFC 3394 but don't check IV the same way
-            decrypted = rfc3394UnwrapNoIvCheck(in, inOff, inLen);
-            paddedPlaintext = decrypted;
-        }
-
-        // Decompose the extracted AIV to the fixed portion and the MLI
-        byte[] extractedHighOrderAIV = new byte[4];
-        byte[] mliBytes = new byte[4];
-        System.arraycopy(extractedAIV, 0, extractedHighOrderAIV, 0, extractedHighOrderAIV.length);
-        System.arraycopy(extractedAIV, extractedHighOrderAIV.length, mliBytes, 0, mliBytes.length);
-        int mli = Pack.bigEndianToInt(mliBytes, 0);
-
-        // Even if a check fails we still continue and check everything 
-        // else in order to avoid certain timing based side-channel attacks.
-        boolean isValid = true;
-
-        // Check the fixed portion of the AIV
-        if (!Arrays.constantTimeAreEqual(extractedHighOrderAIV, preIV))
-        {
-            isValid = false;
-        }
-
-        // Check the MLI against the actual length
-        int upperBound = paddedPlaintext.length;
-        int lowerBound = upperBound - 8;
-        if (mli <= lowerBound)
-        {
-            isValid = false;
-        }
-        if (mli > upperBound)
-        {
-            isValid = false;
-        }
-
-        // Check the number of padded zeros
-        int expectedZeros = upperBound - mli;
-        if (expectedZeros >= paddedPlaintext.length)
-        {
-            isValid = false;
-            expectedZeros = paddedPlaintext.length;
-        }
-
-        byte[] zeros = new byte[expectedZeros];
-        byte[] pad = new byte[expectedZeros];
-        System.arraycopy(paddedPlaintext, paddedPlaintext.length - expectedZeros, pad, 0, expectedZeros);
-        if (!Arrays.constantTimeAreEqual(pad, zeros))
-        {
-            isValid = false;
-        }
-
-        if (!isValid)
-        {
-            throw new InvalidCipherTextException("checksum failed");
-        }
-
-        // Extract the plaintext from the padded plaintext
-        byte[] plaintext = new byte[mli];
-        System.arraycopy(paddedPlaintext, 0, plaintext, 0, plaintext.length);
-
-        return plaintext;
-    }
-
-    /**
-     * Performs steps 1 and 2 of the unwrap process defined in RFC 3394.
-     * This code is duplicated from RFC3394WrapEngine because that class
-     * will throw an error during unwrap because the IV won't match up.
-     *
-     * @param in
-     * @param inOff
-     * @param inLen
-     * @return Unwrapped data.
-     */
-    private byte[] rfc3394UnwrapNoIvCheck(byte[] in, int inOff, int inLen)
-    {
-        byte[] iv = new byte[8];
-        byte[] block = new byte[inLen - iv.length];
-        byte[] a = new byte[iv.length];
-        byte[] buf = new byte[8 + iv.length];
-
-        System.arraycopy(in, inOff, a, 0, iv.length);
-        System.arraycopy(in, inOff + iv.length, block, 0, inLen - iv.length);
-
-        engine.init(false, param);
-
-        int n = inLen / 8;
-        n = n - 1;
-
-        for (int j = 5; j >= 0; j--)
-        {
-            for (int i = n; i >= 1; i--)
-            {
-                System.arraycopy(a, 0, buf, 0, iv.length);
-                System.arraycopy(block, 8 * (i - 1), buf, iv.length, 8);
-
-                int t = n * j + i;
-                for (int k = 1; t != 0; k++)
-                {
-                    byte v = (byte)t;
-
-                    buf[iv.length - k] ^= v;
-
-                    t >>>= 8;
-                }
-
-                engine.processBlock(buf, 0, buf, 0);
-                System.arraycopy(buf, 0, a, 0, 8);
-                System.arraycopy(buf, 8, block, 8 * (i - 1), 8);
-            }
-        }
-
-        // set the extracted AIV
-        extractedAIV = a;
-
-        return block;
-    }
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/engines/RSABlindingEngine.java b/bcprov/src/main/java/org/bouncycastle/crypto/engines/RSABlindingEngine.java
deleted file mode 100644
index a8ecb9b..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/engines/RSABlindingEngine.java
+++ /dev/null
@@ -1,137 +0,0 @@
-package org.bouncycastle.crypto.engines;
-
-import org.bouncycastle.crypto.AsymmetricBlockCipher;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.DataLengthException;
-import org.bouncycastle.crypto.params.ParametersWithRandom;
-import org.bouncycastle.crypto.params.RSABlindingParameters;
-import org.bouncycastle.crypto.params.RSAKeyParameters;
-
-import java.math.BigInteger;
-
-/**
- * This does your basic RSA Chaum's blinding and unblinding as outlined in
- * "Handbook of Applied Cryptography", page 475. You need to use this if you are
- * trying to get another party to generate signatures without them being aware
- * of the message they are signing.
- */
-public class RSABlindingEngine
-    implements AsymmetricBlockCipher
-{
-    private RSACoreEngine core = new RSACoreEngine();
-
-    private RSAKeyParameters key;
-    private BigInteger blindingFactor;
-
-    private boolean forEncryption;
-
-    /**
-     * Initialise the blinding engine.
-     *
-     * @param forEncryption true if we are encrypting (blinding), false otherwise.
-     * @param param         the necessary RSA key parameters.
-     */
-    public void init(
-        boolean forEncryption,
-        CipherParameters param)
-    {
-        RSABlindingParameters p;
-
-        if (param instanceof ParametersWithRandom)
-        {
-            ParametersWithRandom rParam = (ParametersWithRandom)param;
-
-            p = (RSABlindingParameters)rParam.getParameters();
-        }
-        else
-        {
-            p = (RSABlindingParameters)param;
-        }
-
-        core.init(forEncryption, p.getPublicKey());
-
-        this.forEncryption = forEncryption;
-        this.key = p.getPublicKey();
-        this.blindingFactor = p.getBlindingFactor();
-    }
-
-    /**
-     * Return the maximum size for an input block to this engine.
-     * For RSA this is always one byte less than the key size on
-     * encryption, and the same length as the key size on decryption.
-     *
-     * @return maximum size for an input block.
-     */
-    public int getInputBlockSize()
-    {
-        return core.getInputBlockSize();
-    }
-
-    /**
-     * Return the maximum size for an output block to this engine.
-     * For RSA this is always one byte less than the key size on
-     * decryption, and the same length as the key size on encryption.
-     *
-     * @return maximum size for an output block.
-     */
-    public int getOutputBlockSize()
-    {
-        return core.getOutputBlockSize();
-    }
-
-    /**
-     * Process a single block using the RSA blinding algorithm.
-     *
-     * @param in    the input array.
-     * @param inOff the offset into the input buffer where the data starts.
-     * @param inLen the length of the data to be processed.
-     * @return the result of the RSA process.
-     * @throws DataLengthException the input block is too large.
-     */
-    public byte[] processBlock(
-        byte[] in,
-        int inOff,
-        int inLen)
-    {
-        BigInteger msg = core.convertInput(in, inOff, inLen);
-
-        if (forEncryption)
-        {
-            msg = blindMessage(msg);
-        }
-        else
-        {
-            msg = unblindMessage(msg);
-        }
-
-        return core.convertOutput(msg);
-    }
-
-    /*
-     * Blind message with the blind factor.
-     */
-    private BigInteger blindMessage(
-        BigInteger msg)
-    {
-        BigInteger blindMsg = blindingFactor;
-        blindMsg = msg.multiply(blindMsg.modPow(key.getExponent(), key.getModulus()));
-        blindMsg = blindMsg.mod(key.getModulus());
-
-        return blindMsg;
-    }
-
-    /*
-     * Unblind the message blinded with the blind factor.
-     */
-    private BigInteger unblindMessage(
-        BigInteger blindedMsg)
-    {
-        BigInteger m = key.getModulus();
-        BigInteger msg = blindedMsg;
-        BigInteger blindFactorInverse = blindingFactor.modInverse(m);
-        msg = msg.multiply(blindFactorInverse);
-        msg = msg.mod(m);
-
-        return msg;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/engines/RSAEngine.java b/bcprov/src/main/java/org/bouncycastle/crypto/engines/RSAEngine.java
deleted file mode 100644
index 009dcd4..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/engines/RSAEngine.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package org.bouncycastle.crypto.engines;
-
-import org.bouncycastle.crypto.AsymmetricBlockCipher;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.DataLengthException;
-
-/**
- * this does your basic RSA algorithm.
- */
-public class RSAEngine
-    implements AsymmetricBlockCipher
-{
-    private RSACoreEngine core;
-
-    /**
-     * initialise the RSA engine.
-     *
-     * @param forEncryption true if we are encrypting, false otherwise.
-     * @param param the necessary RSA key parameters.
-     */
-    public void init(
-        boolean             forEncryption,
-        CipherParameters    param)
-    {
-        if (core == null)
-        {
-            core = new RSACoreEngine();
-        }
-
-        core.init(forEncryption, param);
-    }
-
-    /**
-     * Return the maximum size for an input block to this engine.
-     * For RSA this is always one byte less than the key size on
-     * encryption, and the same length as the key size on decryption.
-     *
-     * @return maximum size for an input block.
-     */
-    public int getInputBlockSize()
-    {
-        return core.getInputBlockSize();
-    }
-
-    /**
-     * Return the maximum size for an output block to this engine.
-     * For RSA this is always one byte less than the key size on
-     * decryption, and the same length as the key size on encryption.
-     *
-     * @return maximum size for an output block.
-     */
-    public int getOutputBlockSize()
-    {
-        return core.getOutputBlockSize();
-    }
-
-    /**
-     * Process a single block using the basic RSA algorithm.
-     *
-     * @param in the input array.
-     * @param inOff the offset into the input buffer where the data starts.
-     * @param inLen the length of the data to be processed.
-     * @return the result of the RSA process.
-     * @exception DataLengthException the input block is too large.
-     */
-    public byte[] processBlock(
-        byte[]  in,
-        int     inOff,
-        int     inLen)
-    {
-        if (core == null)
-        {
-            throw new IllegalStateException("RSA engine not initialised");
-        }
-
-        return core.convertOutput(core.processBlock(core.convertInput(in, inOff, inLen)));
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/engines/RijndaelEngine.java b/bcprov/src/main/java/org/bouncycastle/crypto/engines/RijndaelEngine.java
deleted file mode 100644
index c80f665..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/engines/RijndaelEngine.java
+++ /dev/null
@@ -1,725 +0,0 @@
-package org.bouncycastle.crypto.engines;
-
-import org.bouncycastle.crypto.BlockCipher;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.DataLengthException;
-import org.bouncycastle.crypto.OutputLengthException;
-import org.bouncycastle.crypto.params.KeyParameter;
-
-/**
- * an implementation of Rijndael, based on the documentation and reference implementation
- * by Paulo Barreto, Vincent Rijmen, for v2.0 August '99.
- * <p>
- * Note: this implementation is based on information prior to final NIST publication.
- */
-public class RijndaelEngine
-    implements BlockCipher
-{
-    private static final int MAXROUNDS = 14;
-
-    private static final int MAXKC = (256/4);
-
-    private static final byte[] logtable = {
-        (byte)0,    (byte)0,    (byte)25,   (byte)1,    (byte)50,   (byte)2,    (byte)26,   (byte)198,
-        (byte)75,   (byte)199,  (byte)27,   (byte)104,  (byte)51,   (byte)238,  (byte)223,  (byte)3,
-        (byte)100,  (byte)4,    (byte)224,  (byte)14,   (byte)52,   (byte)141,  (byte)129,  (byte)239,
-        (byte)76,   (byte)113,  (byte)8,    (byte)200,  (byte)248,  (byte)105,  (byte)28,   (byte)193,
-        (byte)125,  (byte)194,  (byte)29,   (byte)181,  (byte)249,  (byte)185,  (byte)39,   (byte)106,
-        (byte)77,   (byte)228,  (byte)166,  (byte)114,  (byte)154,  (byte)201,  (byte)9,    (byte)120,
-        (byte)101,  (byte)47,   (byte)138,  (byte)5,    (byte)33,   (byte)15,   (byte)225,  (byte)36,
-        (byte)18,   (byte)240,  (byte)130,  (byte)69,   (byte)53,   (byte)147,  (byte)218,  (byte)142,
-        (byte)150,  (byte)143,  (byte)219,  (byte)189,  (byte)54,   (byte)208,  (byte)206,  (byte)148,
-        (byte)19,   (byte)92,   (byte)210,  (byte)241,  (byte)64,   (byte)70,   (byte)131,  (byte)56,
-        (byte)102,  (byte)221,  (byte)253,  (byte)48,   (byte)191,  (byte)6,    (byte)139,  (byte)98,
-        (byte)179,  (byte)37,   (byte)226,  (byte)152,  (byte)34,   (byte)136,  (byte)145,  (byte)16,
-        (byte)126,  (byte)110,  (byte)72,   (byte)195,  (byte)163,  (byte)182,  (byte)30,   (byte)66,
-        (byte)58,   (byte)107,  (byte)40,   (byte)84,   (byte)250,  (byte)133,  (byte)61,   (byte)186,
-        (byte)43,   (byte)121,  (byte)10,   (byte)21,   (byte)155,  (byte)159,  (byte)94,   (byte)202,
-        (byte)78,   (byte)212,  (byte)172,  (byte)229,  (byte)243,  (byte)115,  (byte)167,  (byte)87,
-        (byte)175,  (byte)88,   (byte)168,  (byte)80,   (byte)244,  (byte)234,  (byte)214,  (byte)116,
-        (byte)79,   (byte)174,  (byte)233,  (byte)213,  (byte)231,  (byte)230,  (byte)173,  (byte)232,
-        (byte)44,   (byte)215,  (byte)117,  (byte)122,  (byte)235,  (byte)22,   (byte)11,   (byte)245,
-        (byte)89,   (byte)203,  (byte)95,   (byte)176,  (byte)156,  (byte)169,  (byte)81,   (byte)160,
-        (byte)127,  (byte)12,   (byte)246,  (byte)111,  (byte)23,   (byte)196,  (byte)73,   (byte)236,
-        (byte)216,  (byte)67,   (byte)31,   (byte)45,   (byte)164,  (byte)118,  (byte)123,  (byte)183,
-        (byte)204,  (byte)187,  (byte)62,   (byte)90,   (byte)251,  (byte)96,   (byte)177,  (byte)134,
-        (byte)59,   (byte)82,   (byte)161,  (byte)108,  (byte)170,  (byte)85,   (byte)41,   (byte)157,
-        (byte)151,  (byte)178,  (byte)135,  (byte)144,  (byte)97,   (byte)190,  (byte)220,  (byte)252,
-        (byte)188,  (byte)149,  (byte)207,  (byte)205,  (byte)55,   (byte)63,   (byte)91,   (byte)209,
-        (byte)83,   (byte)57,   (byte)132,  (byte)60,   (byte)65,   (byte)162,  (byte)109,  (byte)71,
-        (byte)20,   (byte)42,   (byte)158,  (byte)93,   (byte)86,   (byte)242,  (byte)211,  (byte)171,
-        (byte)68,   (byte)17,   (byte)146,  (byte)217,  (byte)35,   (byte)32,   (byte)46,   (byte)137,
-        (byte)180,  (byte)124,  (byte)184,  (byte)38,   (byte)119,  (byte)153,  (byte)227,  (byte)165,
-        (byte)103,  (byte)74,   (byte)237,  (byte)222,  (byte)197,  (byte)49,   (byte)254,  (byte)24,
-        (byte)13,   (byte)99,   (byte)140,  (byte)128,  (byte)192,  (byte)247,  (byte)112,  (byte)7
-    };
-
-    private static final byte[] aLogtable = {
-          (byte)0,   (byte)3,   (byte)5,  (byte)15,  (byte)17,  (byte)51,  (byte)85, (byte)255,  (byte)26,  (byte)46, (byte)114, (byte)150, (byte)161, (byte)248,  (byte)19,  (byte)53,
-         (byte)95, (byte)225,  (byte)56,  (byte)72, (byte)216, (byte)115, (byte)149, (byte)164, (byte)247,   (byte)2,   (byte)6,  (byte)10,  (byte)30,  (byte)34, (byte)102, (byte)170,
-        (byte)229,  (byte)52,  (byte)92, (byte)228,  (byte)55,  (byte)89, (byte)235,  (byte)38, (byte)106, (byte)190, (byte)217, (byte)112, (byte)144, (byte)171, (byte)230,  (byte)49,
-         (byte)83, (byte)245,   (byte)4,  (byte)12,  (byte)20,  (byte)60,  (byte)68, (byte)204,  (byte)79, (byte)209, (byte)104, (byte)184, (byte)211, (byte)110, (byte)178, (byte)205,
-         (byte)76, (byte)212, (byte)103, (byte)169, (byte)224,  (byte)59,  (byte)77, (byte)215,  (byte)98, (byte)166, (byte)241,   (byte)8,  (byte)24,  (byte)40, (byte)120, (byte)136,
-        (byte)131, (byte)158, (byte)185, (byte)208, (byte)107, (byte)189, (byte)220, (byte)127, (byte)129, (byte)152, (byte)179, (byte)206,  (byte)73, (byte)219, (byte)118, (byte)154,
-        (byte)181, (byte)196,  (byte)87, (byte)249,  (byte)16,  (byte)48,  (byte)80, (byte)240,  (byte)11,  (byte)29,  (byte)39, (byte)105, (byte)187, (byte)214,  (byte)97, (byte)163,
-        (byte)254,  (byte)25,  (byte)43, (byte)125, (byte)135, (byte)146, (byte)173, (byte)236,  (byte)47, (byte)113, (byte)147, (byte)174, (byte)233,  (byte)32,  (byte)96, (byte)160,
-        (byte)251,  (byte)22,  (byte)58,  (byte)78, (byte)210, (byte)109, (byte)183, (byte)194,  (byte)93, (byte)231,  (byte)50,  (byte)86, (byte)250,  (byte)21,  (byte)63,  (byte)65,
-        (byte)195,  (byte)94, (byte)226,  (byte)61,  (byte)71, (byte)201,  (byte)64, (byte)192,  (byte)91, (byte)237,  (byte)44, (byte)116, (byte)156, (byte)191, (byte)218, (byte)117,
-        (byte)159, (byte)186, (byte)213, (byte)100, (byte)172, (byte)239,  (byte)42, (byte)126, (byte)130, (byte)157, (byte)188, (byte)223, (byte)122, (byte)142, (byte)137, (byte)128,
-        (byte)155, (byte)182, (byte)193,  (byte)88, (byte)232,  (byte)35, (byte)101, (byte)175, (byte)234,  (byte)37, (byte)111, (byte)177, (byte)200,  (byte)67, (byte)197,  (byte)84,
-        (byte)252,  (byte)31,  (byte)33,  (byte)99, (byte)165, (byte)244,   (byte)7,   (byte)9,  (byte)27,  (byte)45, (byte)119, (byte)153, (byte)176, (byte)203,  (byte)70, (byte)202,
-         (byte)69, (byte)207,  (byte)74, (byte)222, (byte)121, (byte)139, (byte)134, (byte)145, (byte)168, (byte)227,  (byte)62,  (byte)66, (byte)198,  (byte)81, (byte)243,  (byte)14,
-         (byte)18,  (byte)54,  (byte)90, (byte)238,  (byte)41, (byte)123, (byte)141, (byte)140, (byte)143, (byte)138, (byte)133, (byte)148, (byte)167, (byte)242,  (byte)13,  (byte)23,
-         (byte)57,  (byte)75, (byte)221, (byte)124, (byte)132, (byte)151, (byte)162, (byte)253,  (byte)28,  (byte)36, (byte)108, (byte)180, (byte)199,  (byte)82, (byte)246,   (byte)1,
-          (byte)3,   (byte)5,  (byte)15,  (byte)17,  (byte)51,  (byte)85, (byte)255,  (byte)26,  (byte)46, (byte)114, (byte)150, (byte)161, (byte)248,  (byte)19,  (byte)53,
-         (byte)95, (byte)225,  (byte)56,  (byte)72, (byte)216, (byte)115, (byte)149, (byte)164, (byte)247,   (byte)2,   (byte)6,  (byte)10,  (byte)30,  (byte)34, (byte)102, (byte)170,
-        (byte)229,  (byte)52,  (byte)92, (byte)228,  (byte)55,  (byte)89, (byte)235,  (byte)38, (byte)106, (byte)190, (byte)217, (byte)112, (byte)144, (byte)171, (byte)230,  (byte)49,
-         (byte)83, (byte)245,   (byte)4,  (byte)12,  (byte)20,  (byte)60,  (byte)68, (byte)204,  (byte)79, (byte)209, (byte)104, (byte)184, (byte)211, (byte)110, (byte)178, (byte)205,
-         (byte)76, (byte)212, (byte)103, (byte)169, (byte)224,  (byte)59,  (byte)77, (byte)215,  (byte)98, (byte)166, (byte)241,   (byte)8,  (byte)24,  (byte)40, (byte)120, (byte)136,
-        (byte)131, (byte)158, (byte)185, (byte)208, (byte)107, (byte)189, (byte)220, (byte)127, (byte)129, (byte)152, (byte)179, (byte)206,  (byte)73, (byte)219, (byte)118, (byte)154,
-        (byte)181, (byte)196,  (byte)87, (byte)249,  (byte)16,  (byte)48,  (byte)80, (byte)240,  (byte)11,  (byte)29,  (byte)39, (byte)105, (byte)187, (byte)214,  (byte)97, (byte)163,
-        (byte)254,  (byte)25,  (byte)43, (byte)125, (byte)135, (byte)146, (byte)173, (byte)236,  (byte)47, (byte)113, (byte)147, (byte)174, (byte)233,  (byte)32,  (byte)96, (byte)160,
-        (byte)251,  (byte)22,  (byte)58,  (byte)78, (byte)210, (byte)109, (byte)183, (byte)194,  (byte)93, (byte)231,  (byte)50,  (byte)86, (byte)250,  (byte)21,  (byte)63,  (byte)65,
-        (byte)195,  (byte)94, (byte)226,  (byte)61,  (byte)71, (byte)201,  (byte)64, (byte)192,  (byte)91, (byte)237,  (byte)44, (byte)116, (byte)156, (byte)191, (byte)218, (byte)117,
-        (byte)159, (byte)186, (byte)213, (byte)100, (byte)172, (byte)239,  (byte)42, (byte)126, (byte)130, (byte)157, (byte)188, (byte)223, (byte)122, (byte)142, (byte)137, (byte)128,
-        (byte)155, (byte)182, (byte)193,  (byte)88, (byte)232,  (byte)35, (byte)101, (byte)175, (byte)234,  (byte)37, (byte)111, (byte)177, (byte)200,  (byte)67, (byte)197,  (byte)84,
-        (byte)252,  (byte)31,  (byte)33,  (byte)99, (byte)165, (byte)244,   (byte)7,   (byte)9,  (byte)27,  (byte)45, (byte)119, (byte)153, (byte)176, (byte)203,  (byte)70, (byte)202,
-         (byte)69, (byte)207,  (byte)74, (byte)222, (byte)121, (byte)139, (byte)134, (byte)145, (byte)168, (byte)227,  (byte)62,  (byte)66, (byte)198,  (byte)81, (byte)243,  (byte)14,
-         (byte)18,  (byte)54,  (byte)90, (byte)238,  (byte)41, (byte)123, (byte)141, (byte)140, (byte)143, (byte)138, (byte)133, (byte)148, (byte)167, (byte)242,  (byte)13,  (byte)23,
-         (byte)57,  (byte)75, (byte)221, (byte)124, (byte)132, (byte)151, (byte)162, (byte)253,  (byte)28,  (byte)36, (byte)108, (byte)180, (byte)199,  (byte)82, (byte)246,   (byte)1,
-        };
-
-    private static final byte[] S = {
-         (byte)99, (byte)124, (byte)119, (byte)123, (byte)242, (byte)107, (byte)111, (byte)197,  (byte)48,   (byte)1, (byte)103,  (byte)43, (byte)254, (byte)215, (byte)171, (byte)118,
-        (byte)202, (byte)130, (byte)201, (byte)125, (byte)250,  (byte)89,  (byte)71, (byte)240, (byte)173, (byte)212, (byte)162, (byte)175, (byte)156, (byte)164, (byte)114, (byte)192,
-        (byte)183, (byte)253, (byte)147,  (byte)38,  (byte)54,  (byte)63, (byte)247, (byte)204,  (byte)52, (byte)165, (byte)229, (byte)241, (byte)113, (byte)216,  (byte)49,  (byte)21,
-          (byte)4, (byte)199,  (byte)35, (byte)195,  (byte)24, (byte)150,   (byte)5, (byte)154,   (byte)7,  (byte)18, (byte)128, (byte)226, (byte)235,  (byte)39, (byte)178, (byte)117,
-          (byte)9, (byte)131,  (byte)44,  (byte)26,  (byte)27, (byte)110,  (byte)90, (byte)160,  (byte)82,  (byte)59, (byte)214, (byte)179,  (byte)41, (byte)227,  (byte)47, (byte)132,
-         (byte)83, (byte)209,   (byte)0, (byte)237,  (byte)32, (byte)252, (byte)177,  (byte)91, (byte)106, (byte)203, (byte)190,  (byte)57,  (byte)74,  (byte)76,  (byte)88, (byte)207,
-        (byte)208, (byte)239, (byte)170, (byte)251,  (byte)67,  (byte)77,  (byte)51, (byte)133,  (byte)69, (byte)249,   (byte)2, (byte)127,  (byte)80,  (byte)60, (byte)159, (byte)168,
-         (byte)81, (byte)163,  (byte)64, (byte)143, (byte)146, (byte)157,  (byte)56, (byte)245, (byte)188, (byte)182, (byte)218,  (byte)33,  (byte)16, (byte)255, (byte)243, (byte)210,
-        (byte)205,  (byte)12,  (byte)19, (byte)236,  (byte)95, (byte)151,  (byte)68,  (byte)23, (byte)196, (byte)167, (byte)126,  (byte)61, (byte)100,  (byte)93,  (byte)25, (byte)115,
-         (byte)96, (byte)129,  (byte)79, (byte)220,  (byte)34,  (byte)42, (byte)144, (byte)136,  (byte)70, (byte)238, (byte)184,  (byte)20, (byte)222,  (byte)94,  (byte)11, (byte)219,
-        (byte)224,  (byte)50,  (byte)58,  (byte)10,  (byte)73,   (byte)6,  (byte)36,  (byte)92, (byte)194, (byte)211, (byte)172,  (byte)98, (byte)145, (byte)149, (byte)228, (byte)121,
-        (byte)231, (byte)200,  (byte)55, (byte)109, (byte)141, (byte)213,  (byte)78, (byte)169, (byte)108,  (byte)86, (byte)244, (byte)234, (byte)101, (byte)122, (byte)174,   (byte)8,
-        (byte)186, (byte)120,  (byte)37,  (byte)46,  (byte)28, (byte)166, (byte)180, (byte)198, (byte)232, (byte)221, (byte)116,  (byte)31,  (byte)75, (byte)189, (byte)139, (byte)138,
-        (byte)112,  (byte)62, (byte)181, (byte)102,  (byte)72,   (byte)3, (byte)246,  (byte)14,  (byte)97,  (byte)53,  (byte)87, (byte)185, (byte)134, (byte)193,  (byte)29, (byte)158,
-        (byte)225, (byte)248, (byte)152,  (byte)17, (byte)105, (byte)217, (byte)142, (byte)148, (byte)155,  (byte)30, (byte)135, (byte)233, (byte)206,  (byte)85,  (byte)40, (byte)223,
-        (byte)140, (byte)161, (byte)137,  (byte)13, (byte)191, (byte)230,  (byte)66, (byte)104,  (byte)65, (byte)153,  (byte)45,  (byte)15, (byte)176,  (byte)84, (byte)187,  (byte)22,
-    };
-
-    private static final byte[] Si = {
-         (byte)82,   (byte)9, (byte)106, (byte)213,  (byte)48,  (byte)54, (byte)165,  (byte)56, (byte)191,  (byte)64, (byte)163, (byte)158, (byte)129, (byte)243, (byte)215, (byte)251,
-        (byte)124, (byte)227,  (byte)57, (byte)130, (byte)155,  (byte)47, (byte)255, (byte)135,  (byte)52, (byte)142,  (byte)67,  (byte)68, (byte)196, (byte)222, (byte)233, (byte)203,
-         (byte)84, (byte)123, (byte)148,  (byte)50, (byte)166, (byte)194,  (byte)35,  (byte)61, (byte)238,  (byte)76, (byte)149,  (byte)11,  (byte)66, (byte)250, (byte)195,  (byte)78,
-          (byte)8,  (byte)46, (byte)161, (byte)102,  (byte)40, (byte)217,  (byte)36, (byte)178, (byte)118,  (byte)91, (byte)162,  (byte)73, (byte)109, (byte)139, (byte)209,  (byte)37,
-        (byte)114, (byte)248, (byte)246, (byte)100, (byte)134, (byte)104, (byte)152,  (byte)22, (byte)212, (byte)164,  (byte)92, (byte)204,  (byte)93, (byte)101, (byte)182, (byte)146,
-        (byte)108, (byte)112,  (byte)72,  (byte)80, (byte)253, (byte)237, (byte)185, (byte)218,  (byte)94,  (byte)21,  (byte)70,  (byte)87, (byte)167, (byte)141, (byte)157, (byte)132,
-        (byte)144, (byte)216, (byte)171,   (byte)0, (byte)140, (byte)188, (byte)211,  (byte)10, (byte)247, (byte)228,  (byte)88,   (byte)5, (byte)184, (byte)179,  (byte)69,   (byte)6,
-        (byte)208,  (byte)44,  (byte)30, (byte)143, (byte)202,  (byte)63,  (byte)15,   (byte)2, (byte)193, (byte)175, (byte)189,   (byte)3,   (byte)1,  (byte)19, (byte)138, (byte)107,
-         (byte)58, (byte)145,  (byte)17,  (byte)65,  (byte)79, (byte)103, (byte)220, (byte)234, (byte)151, (byte)242, (byte)207, (byte)206, (byte)240, (byte)180, (byte)230, (byte)115,
-        (byte)150, (byte)172, (byte)116,  (byte)34, (byte)231, (byte)173,  (byte)53, (byte)133, (byte)226, (byte)249,  (byte)55, (byte)232,  (byte)28, (byte)117, (byte)223, (byte)110,
-         (byte)71, (byte)241,  (byte)26, (byte)113,  (byte)29,  (byte)41, (byte)197, (byte)137, (byte)111, (byte)183,  (byte)98,  (byte)14, (byte)170,  (byte)24, (byte)190,  (byte)27,
-        (byte)252,  (byte)86,  (byte)62,  (byte)75, (byte)198, (byte)210, (byte)121,  (byte)32, (byte)154, (byte)219, (byte)192, (byte)254, (byte)120, (byte)205,  (byte)90, (byte)244,
-         (byte)31, (byte)221, (byte)168,  (byte)51, (byte)136,   (byte)7, (byte)199,  (byte)49, (byte)177,  (byte)18,  (byte)16,  (byte)89,  (byte)39, (byte)128, (byte)236,  (byte)95,
-         (byte)96,  (byte)81, (byte)127, (byte)169,  (byte)25, (byte)181,  (byte)74,  (byte)13,  (byte)45, (byte)229, (byte)122, (byte)159, (byte)147, (byte)201, (byte)156, (byte)239,
-        (byte)160, (byte)224,  (byte)59,  (byte)77, (byte)174,  (byte)42, (byte)245, (byte)176, (byte)200, (byte)235, (byte)187,  (byte)60, (byte)131,  (byte)83, (byte)153,  (byte)97,
-         (byte)23,  (byte)43,   (byte)4, (byte)126, (byte)186, (byte)119, (byte)214,  (byte)38, (byte)225, (byte)105,  (byte)20,  (byte)99,  (byte)85,  (byte)33,  (byte)12, (byte)125,
-        };
-
-    private static final int[] rcon = {
-          0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x1b, 0x36, 0x6c, 0xd8, 0xab, 0x4d, 0x9a, 0x2f, 0x5e, 0xbc, 0x63, 0xc6, 0x97, 0x35, 0x6a, 0xd4, 0xb3, 0x7d, 0xfa, 0xef, 0xc5, 0x91 };
-
-    static byte[][] shifts0 =
-    {
-       { 0, 8, 16, 24 },
-       { 0, 8, 16, 24 },
-       { 0, 8, 16, 24 },
-       { 0, 8, 16, 32 },
-       { 0, 8, 24, 32 }
-    };
-
-    static byte[][] shifts1 =
-    {
-       { 0, 24, 16, 8 },
-       { 0, 32, 24, 16 },
-       { 0, 40, 32, 24 },
-       { 0, 48, 40, 24 },
-       { 0, 56, 40, 32 }
-    };
-
-    /**
-     * multiply two elements of GF(2^m)
-     * needed for MixColumn and InvMixColumn
-     */
-    private byte mul0x2(
-        int b)
-    {
-        if (b != 0)
-        {
-            return aLogtable[25 + (logtable[b] & 0xff)];
-        }
-        else
-        {
-            return 0;
-        }
-    }
-
-    private byte mul0x3(
-        int b)
-    {
-        if (b != 0)
-        {
-            return aLogtable[1 + (logtable[b] & 0xff)];
-        }
-        else
-        {
-            return 0;
-        }
-    }
-
-    private byte mul0x9(
-        int b)
-    {
-        if (b >= 0)
-        {
-            return aLogtable[199 + b];
-        }
-        else
-        {
-            return 0;
-        }
-    }
-
-    private byte mul0xb(
-        int b)
-    {
-        if (b >= 0)
-        {
-            return aLogtable[104 + b];
-        }
-        else
-        {
-            return 0;
-        }
-    }
-
-    private byte mul0xd(
-        int b)
-    {
-        if (b >= 0)
-        {
-            return aLogtable[238 + b];
-        }
-        else
-        {
-            return 0;
-        }
-    }
-
-    private byte mul0xe(
-        int b)
-    {
-        if (b >= 0)
-        {
-            return aLogtable[223 + b];
-        }
-        else
-        {
-            return 0;
-        }
-    }
-
-    /**
-     * xor corresponding text input and round key input bytes
-     */
-    private void KeyAddition(
-        long[] rk)
-    {
-        A0 ^= rk[0];
-        A1 ^= rk[1];
-        A2 ^= rk[2];
-        A3 ^= rk[3];
-    }
-
-    private long shift(
-        long    r,
-        int     shift)
-    {
-        return (((r >>> shift) | (r << (BC - shift)))) & BC_MASK;
-    }
-
-    /**
-     * Row 0 remains unchanged
-     * The other three rows are shifted a variable amount
-     */
-    private void ShiftRow(
-        byte[]      shiftsSC)
-    {
-        A1 = shift(A1, shiftsSC[1]);
-        A2 = shift(A2, shiftsSC[2]);
-        A3 = shift(A3, shiftsSC[3]);
-    }
-
-    private long applyS(
-        long    r,
-        byte[]  box)
-    {
-        long    res = 0;
-
-        for (int j = 0; j < BC; j += 8)
-        {
-            res |= (long)(box[(int)((r >> j) & 0xff)] & 0xff) << j;
-        }
-
-        return res;
-    }
-
-    /**
-     * Replace every byte of the input by the byte at that place
-     * in the nonlinear S-box
-     */
-    private void Substitution(
-        byte[]      box)
-    {
-        A0 = applyS(A0, box);
-        A1 = applyS(A1, box);
-        A2 = applyS(A2, box);
-        A3 = applyS(A3, box);
-    }
-
-    /**
-     * Mix the bytes of every column in a linear way
-     */
-    private void MixColumn()
-    {
-        long r0, r1, r2, r3;
-
-        r0 = r1 = r2 = r3 = 0;
-
-        for (int j = 0; j < BC; j += 8)
-        {
-            int a0 = (int)((A0 >> j) & 0xff);
-            int a1 = (int)((A1 >> j) & 0xff);
-            int a2 = (int)((A2 >> j) & 0xff);
-            int a3 = (int)((A3 >> j) & 0xff);
-
-            r0 |= (long)((mul0x2(a0) ^ mul0x3(a1) ^ a2 ^ a3) & 0xff) << j;
-
-            r1 |= (long)((mul0x2(a1) ^ mul0x3(a2) ^ a3 ^ a0) & 0xff) << j;
-
-            r2 |= (long)((mul0x2(a2) ^ mul0x3(a3) ^ a0 ^ a1) & 0xff) << j;
-
-            r3 |= (long)((mul0x2(a3) ^ mul0x3(a0) ^ a1 ^ a2) & 0xff) << j;
-        }
-
-        A0 = r0;
-        A1 = r1;
-        A2 = r2;
-        A3 = r3;
-    }
-
-    /**
-     * Mix the bytes of every column in a linear way
-     * This is the opposite operation of Mixcolumn
-     */
-    private void InvMixColumn()
-    {
-        long r0, r1, r2, r3;
-
-        r0 = r1 = r2 = r3 = 0;
-        for (int j = 0; j < BC; j += 8)
-        {
-            int a0 = (int)((A0 >> j) & 0xff);
-            int a1 = (int)((A1 >> j) & 0xff);
-            int a2 = (int)((A2 >> j) & 0xff);
-            int a3 = (int)((A3 >> j) & 0xff);
-
-            //
-            // pre-lookup the log table
-            //
-            a0 = (a0 != 0) ? (logtable[a0 & 0xff] & 0xff) : -1;
-            a1 = (a1 != 0) ? (logtable[a1 & 0xff] & 0xff) : -1;
-            a2 = (a2 != 0) ? (logtable[a2 & 0xff] & 0xff) : -1;
-            a3 = (a3 != 0) ? (logtable[a3 & 0xff] & 0xff) : -1;
-
-            r0 |= (long)((mul0xe(a0) ^ mul0xb(a1) ^ mul0xd(a2) ^ mul0x9(a3)) & 0xff) << j;
-
-            r1 |= (long)((mul0xe(a1) ^ mul0xb(a2) ^ mul0xd(a3) ^ mul0x9(a0)) & 0xff) << j;
-
-            r2 |= (long)((mul0xe(a2) ^ mul0xb(a3) ^ mul0xd(a0) ^ mul0x9(a1)) & 0xff) << j;
-
-            r3 |= (long)((mul0xe(a3) ^ mul0xb(a0) ^ mul0xd(a1) ^ mul0x9(a2)) & 0xff) << j;
-        }
-
-        A0 = r0;
-        A1 = r1;
-        A2 = r2;
-        A3 = r3;
-    }
-
-    /**
-     * Calculate the necessary round keys
-     * The number of calculations depends on keyBits and blockBits
-     */
-    private long[][] generateWorkingKey(
-        byte[]      key)
-    {
-        int         KC;
-        int         t, rconpointer = 0;
-        int         keyBits = key.length * 8;
-        byte[][]    tk = new byte[4][MAXKC];
-        long[][]    W = new long[MAXROUNDS+1][4];
-
-        switch (keyBits)
-        {
-        case 128:
-            KC = 4;
-            break;
-        case 160:
-            KC = 5;
-            break;
-        case 192:
-            KC = 6;
-            break;
-        case 224:
-            KC = 7;
-            break;
-        case 256:
-            KC = 8;
-            break;
-        default :
-            throw new IllegalArgumentException("Key length not 128/160/192/224/256 bits.");
-        }
-
-        if (keyBits >= blockBits)
-        {
-            ROUNDS = KC + 6;
-        }
-        else
-        {
-            ROUNDS = (BC / 8) + 6;
-        }
-
-        //
-        // copy the key into the processing area
-        //
-        int index = 0;
-
-        for (int i = 0; i < key.length; i++)
-        {
-            tk[i % 4][i / 4] = key[index++];
-        }
-
-        t = 0;
-
-        //
-        // copy values into round key array
-        //
-        for (int j = 0; (j < KC) && (t < (ROUNDS+1)*(BC / 8)); j++, t++)
-        {
-            for (int i = 0; i < 4; i++)
-            {
-                W[t / (BC / 8)][i] |= (long)(tk[i][j] & 0xff) << ((t * 8) % BC);
-            }
-        }
-
-        //
-        // while not enough round key material calculated
-        // calculate new values
-        //
-        while (t < (ROUNDS+1)*(BC/8))
-        {
-            for (int i = 0; i < 4; i++)
-            {
-                tk[i][0] ^= S[tk[(i+1)%4][KC-1] & 0xff];
-            }
-            tk[0][0] ^= rcon[rconpointer++];
-
-            if (KC <= 6)
-            {
-                for (int j = 1; j < KC; j++)
-                {
-                    for (int i = 0; i < 4; i++)
-                    {
-                        tk[i][j] ^= tk[i][j-1];
-                    }
-                }
-            }
-            else
-            {
-                for (int j = 1; j < 4; j++)
-                {
-                    for (int i = 0; i < 4; i++)
-                    {
-                        tk[i][j] ^= tk[i][j-1];
-                    }
-                }
-                for (int i = 0; i < 4; i++)
-                {
-                    tk[i][4] ^= S[tk[i][3] & 0xff];
-                }
-                for (int j = 5; j < KC; j++)
-                {
-                    for (int i = 0; i < 4; i++)
-                    {
-                        tk[i][j] ^= tk[i][j-1];
-                    }
-                }
-            }
-
-            //
-            // copy values into round key array
-            //
-            for (int j = 0; (j < KC) && (t < (ROUNDS+1)*(BC/8)); j++, t++)
-            {
-                for (int i = 0; i < 4; i++)
-                {
-                    W[t / (BC/8)][i] |= (long)(tk[i][j] & 0xff) << ((t * 8) % (BC));
-                }
-            }
-        }
-
-        return W;
-    }
-
-    private int         BC;
-    private long        BC_MASK;
-    private int         ROUNDS;
-    private int         blockBits;
-    private long[][]    workingKey;
-    private long        A0, A1, A2, A3;
-    private boolean     forEncryption;
-    private byte[]      shifts0SC;
-    private byte[]      shifts1SC;
-
-    /**
-     * default constructor - 128 bit block size.
-     */
-    public RijndaelEngine()
-    {
-        this(128);
-    }
-
-    /**
-     * basic constructor - set the cipher up for a given blocksize
-     *
-     * @param blockBits the blocksize in bits, must be 128, 192, or 256.
-     */
-    public RijndaelEngine(
-        int blockBits)
-    {
-        switch (blockBits)
-        {
-        case 128:
-            BC = 32;
-            BC_MASK = 0xffffffffL;
-            shifts0SC = shifts0[0];
-            shifts1SC = shifts1[0];
-            break;
-        case 160:
-            BC = 40;
-            BC_MASK = 0xffffffffffL;
-            shifts0SC = shifts0[1];
-            shifts1SC = shifts1[1];
-            break;
-        case 192:
-            BC = 48;
-            BC_MASK = 0xffffffffffffL;
-            shifts0SC = shifts0[2];
-            shifts1SC = shifts1[2];
-            break;
-        case 224:
-            BC = 56;
-            BC_MASK = 0xffffffffffffffL;
-            shifts0SC = shifts0[3];
-            shifts1SC = shifts1[3];
-            break;
-        case 256:
-            BC = 64;
-            BC_MASK = 0xffffffffffffffffL;
-            shifts0SC = shifts0[4];
-            shifts1SC = shifts1[4];
-            break;
-        default:
-            throw new IllegalArgumentException("unknown blocksize to Rijndael");
-        }
-
-        this.blockBits = blockBits;
-    }
-
-    /**
-     * initialise a Rijndael cipher.
-     *
-     * @param forEncryption whether or not we are for encryption.
-     * @param params the parameters required to set up the cipher.
-     * @exception IllegalArgumentException if the params argument is
-     * inappropriate.
-     */
-    public void init(
-        boolean           forEncryption,
-        CipherParameters  params)
-    {
-        if (params instanceof KeyParameter)
-        {
-            workingKey = generateWorkingKey(((KeyParameter)params).getKey());
-            this.forEncryption = forEncryption;
-            return;
-        }
-
-        throw new IllegalArgumentException("invalid parameter passed to Rijndael init - " + params.getClass().getName());
-    }
-
-    public String getAlgorithmName()
-    {
-        return "Rijndael";
-    }
-
-    public int getBlockSize()
-    {
-        return BC / 2;
-    }
-
-    public int processBlock(
-        byte[] in,
-        int inOff,
-        byte[] out,
-        int outOff)
-    {
-        if (workingKey == null)
-        {
-            throw new IllegalStateException("Rijndael engine not initialised");
-        }
-
-        if ((inOff + (BC / 2)) > in.length)
-        {
-            throw new DataLengthException("input buffer too short");
-        }
-
-        if ((outOff + (BC / 2)) > out.length)
-        {
-            throw new OutputLengthException("output buffer too short");
-        }
-
-        if (forEncryption)
-        {
-            unpackBlock(in, inOff);
-            encryptBlock(workingKey);
-            packBlock(out, outOff);
-        }
-        else
-        {
-            unpackBlock(in, inOff);
-            decryptBlock(workingKey);
-            packBlock(out, outOff);
-        }
-
-        return BC / 2;
-    }
-
-    public void reset()
-    {
-    }
-
-    private void unpackBlock(
-        byte[]      bytes,
-        int         off)
-    {
-        int     index = off;
-
-        A0 = (bytes[index++] & 0xff);
-        A1 = (bytes[index++] & 0xff);
-        A2 = (bytes[index++] & 0xff);
-        A3 = (bytes[index++] & 0xff);
-
-        for (int j = 8; j != BC; j += 8)
-        {
-            A0 |= (long)(bytes[index++] & 0xff) << j;
-            A1 |= (long)(bytes[index++] & 0xff) << j;
-            A2 |= (long)(bytes[index++] & 0xff) << j;
-            A3 |= (long)(bytes[index++] & 0xff) << j;
-        }
-    }
-
-    private void packBlock(
-        byte[]      bytes,
-        int         off)
-    {
-        int     index = off;
-
-        for (int j = 0; j != BC; j += 8)
-        {
-            bytes[index++] = (byte)(A0 >> j);
-            bytes[index++] = (byte)(A1 >> j);
-            bytes[index++] = (byte)(A2 >> j);
-            bytes[index++] = (byte)(A3 >> j);
-        }
-    }
-
-    private void encryptBlock(
-        long[][] rk)
-    {
-        int r;
-
-        //
-        // begin with a key addition
-        //
-        KeyAddition(rk[0]);
-
-        //
-        // ROUNDS-1 ordinary rounds
-        //
-        for (r = 1; r < ROUNDS; r++)
-        {
-            Substitution(S);
-            ShiftRow(shifts0SC);
-            MixColumn();
-            KeyAddition(rk[r]);
-        }
-
-        //
-        // Last round is special: there is no MixColumn
-        //
-        Substitution(S);
-        ShiftRow(shifts0SC);
-        KeyAddition(rk[ROUNDS]);
-    }
-
-    private void decryptBlock(
-        long[][] rk)
-    {
-        int r;
-
-        // To decrypt: apply the inverse operations of the encrypt routine,
-        //             in opposite order
-        //
-        // (KeyAddition is an involution: it 's equal to its inverse)
-        // (the inverse of Substitution with table S is Substitution with the inverse table of S)
-        // (the inverse of Shiftrow is Shiftrow over a suitable distance)
-        //
-
-        // First the special round:
-        //   without InvMixColumn
-        //   with extra KeyAddition
-        //
-        KeyAddition(rk[ROUNDS]);
-        Substitution(Si);
-        ShiftRow(shifts1SC);
-
-        //
-        // ROUNDS-1 ordinary rounds
-        //
-        for (r = ROUNDS-1; r > 0; r--)
-        {
-            KeyAddition(rk[r]);
-            InvMixColumn();
-            Substitution(Si);
-            ShiftRow(shifts1SC);
-        }
-
-        //
-        // End with the extra key addition
-        //
-        KeyAddition(rk[0]);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/engines/SEEDEngine.java b/bcprov/src/main/java/org/bouncycastle/crypto/engines/SEEDEngine.java
deleted file mode 100644
index 43872ed..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/engines/SEEDEngine.java
+++ /dev/null
@@ -1,346 +0,0 @@
-package org.bouncycastle.crypto.engines;
-
-import org.bouncycastle.crypto.BlockCipher;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.DataLengthException;
-import org.bouncycastle.crypto.OutputLengthException;
-import org.bouncycastle.crypto.params.KeyParameter;
-
-/**
- * Implementation of the SEED algorithm as described in RFC 4009
- */
-public class SEEDEngine
-    implements BlockCipher
-{
-    private final int BLOCK_SIZE = 16;
-
-    private static final int[] SS0 =
-        {
-            0x2989a1a8, 0x05858184, 0x16c6d2d4, 0x13c3d3d0, 0x14445054, 0x1d0d111c, 0x2c8ca0ac, 0x25052124,
-            0x1d4d515c, 0x03434340, 0x18081018, 0x1e0e121c, 0x11415150, 0x3cccf0fc, 0x0acac2c8, 0x23436360,
-            0x28082028, 0x04444044, 0x20002020, 0x1d8d919c, 0x20c0e0e0, 0x22c2e2e0, 0x08c8c0c8, 0x17071314,
-            0x2585a1a4, 0x0f8f838c, 0x03030300, 0x3b4b7378, 0x3b8bb3b8, 0x13031310, 0x12c2d2d0, 0x2ecee2ec,
-            0x30407070, 0x0c8c808c, 0x3f0f333c, 0x2888a0a8, 0x32023230, 0x1dcdd1dc, 0x36c6f2f4, 0x34447074,
-            0x2ccce0ec, 0x15859194, 0x0b0b0308, 0x17475354, 0x1c4c505c, 0x1b4b5358, 0x3d8db1bc, 0x01010100,
-            0x24042024, 0x1c0c101c, 0x33437370, 0x18889098, 0x10001010, 0x0cccc0cc, 0x32c2f2f0, 0x19c9d1d8,
-            0x2c0c202c, 0x27c7e3e4, 0x32427270, 0x03838380, 0x1b8b9398, 0x11c1d1d0, 0x06868284, 0x09c9c1c8,
-            0x20406060, 0x10405050, 0x2383a3a0, 0x2bcbe3e8, 0x0d0d010c, 0x3686b2b4, 0x1e8e929c, 0x0f4f434c,
-            0x3787b3b4, 0x1a4a5258, 0x06c6c2c4, 0x38487078, 0x2686a2a4, 0x12021210, 0x2f8fa3ac, 0x15c5d1d4,
-            0x21416160, 0x03c3c3c0, 0x3484b0b4, 0x01414140, 0x12425250, 0x3d4d717c, 0x0d8d818c, 0x08080008,
-            0x1f0f131c, 0x19899198, 0x00000000, 0x19091118, 0x04040004, 0x13435350, 0x37c7f3f4, 0x21c1e1e0,
-            0x3dcdf1fc, 0x36467274, 0x2f0f232c, 0x27072324, 0x3080b0b0, 0x0b8b8388, 0x0e0e020c, 0x2b8ba3a8,
-            0x2282a2a0, 0x2e4e626c, 0x13839390, 0x0d4d414c, 0x29496168, 0x3c4c707c, 0x09090108, 0x0a0a0208,
-            0x3f8fb3bc, 0x2fcfe3ec, 0x33c3f3f0, 0x05c5c1c4, 0x07878384, 0x14041014, 0x3ecef2fc, 0x24446064,
-            0x1eced2dc, 0x2e0e222c, 0x0b4b4348, 0x1a0a1218, 0x06060204, 0x21012120, 0x2b4b6368, 0x26466264,
-            0x02020200, 0x35c5f1f4, 0x12829290, 0x0a8a8288, 0x0c0c000c, 0x3383b3b0, 0x3e4e727c, 0x10c0d0d0,
-            0x3a4a7278, 0x07474344, 0x16869294, 0x25c5e1e4, 0x26062224, 0x00808080, 0x2d8da1ac, 0x1fcfd3dc,
-            0x2181a1a0, 0x30003030, 0x37073334, 0x2e8ea2ac, 0x36063234, 0x15051114, 0x22022220, 0x38083038,
-            0x34c4f0f4, 0x2787a3a4, 0x05454144, 0x0c4c404c, 0x01818180, 0x29c9e1e8, 0x04848084, 0x17879394,
-            0x35053134, 0x0bcbc3c8, 0x0ecec2cc, 0x3c0c303c, 0x31417170, 0x11011110, 0x07c7c3c4, 0x09898188,
-            0x35457174, 0x3bcbf3f8, 0x1acad2d8, 0x38c8f0f8, 0x14849094, 0x19495158, 0x02828280, 0x04c4c0c4,
-            0x3fcff3fc, 0x09494148, 0x39093138, 0x27476364, 0x00c0c0c0, 0x0fcfc3cc, 0x17c7d3d4, 0x3888b0b8,
-            0x0f0f030c, 0x0e8e828c, 0x02424240, 0x23032320, 0x11819190, 0x2c4c606c, 0x1bcbd3d8, 0x2484a0a4,
-            0x34043034, 0x31c1f1f0, 0x08484048, 0x02c2c2c0, 0x2f4f636c, 0x3d0d313c, 0x2d0d212c, 0x00404040,
-            0x3e8eb2bc, 0x3e0e323c, 0x3c8cb0bc, 0x01c1c1c0, 0x2a8aa2a8, 0x3a8ab2b8, 0x0e4e424c, 0x15455154,
-            0x3b0b3338, 0x1cccd0dc, 0x28486068, 0x3f4f737c, 0x1c8c909c, 0x18c8d0d8, 0x0a4a4248, 0x16465254,
-            0x37477374, 0x2080a0a0, 0x2dcde1ec, 0x06464244, 0x3585b1b4, 0x2b0b2328, 0x25456164, 0x3acaf2f8,
-            0x23c3e3e0, 0x3989b1b8, 0x3181b1b0, 0x1f8f939c, 0x1e4e525c, 0x39c9f1f8, 0x26c6e2e4, 0x3282b2b0,
-            0x31013130, 0x2acae2e8, 0x2d4d616c, 0x1f4f535c, 0x24c4e0e4, 0x30c0f0f0, 0x0dcdc1cc, 0x08888088,
-            0x16061214, 0x3a0a3238, 0x18485058, 0x14c4d0d4, 0x22426260, 0x29092128, 0x07070304, 0x33033330,
-            0x28c8e0e8, 0x1b0b1318, 0x05050104, 0x39497178, 0x10809090, 0x2a4a6268, 0x2a0a2228, 0x1a8a9298
-        };
-
-    private static final int[] SS1 =
-        {
-
-            0x38380830, 0xe828c8e0, 0x2c2d0d21, 0xa42686a2, 0xcc0fcfc3, 0xdc1eced2, 0xb03383b3, 0xb83888b0,
-            0xac2f8fa3, 0x60204060, 0x54154551, 0xc407c7c3, 0x44044440, 0x6c2f4f63, 0x682b4b63, 0x581b4b53,
-            0xc003c3c3, 0x60224262, 0x30330333, 0xb43585b1, 0x28290921, 0xa02080a0, 0xe022c2e2, 0xa42787a3,
-            0xd013c3d3, 0x90118191, 0x10110111, 0x04060602, 0x1c1c0c10, 0xbc3c8cb0, 0x34360632, 0x480b4b43,
-            0xec2fcfe3, 0x88088880, 0x6c2c4c60, 0xa82888a0, 0x14170713, 0xc404c4c0, 0x14160612, 0xf434c4f0,
-            0xc002c2c2, 0x44054541, 0xe021c1e1, 0xd416c6d2, 0x3c3f0f33, 0x3c3d0d31, 0x8c0e8e82, 0x98188890,
-            0x28280820, 0x4c0e4e42, 0xf436c6f2, 0x3c3e0e32, 0xa42585a1, 0xf839c9f1, 0x0c0d0d01, 0xdc1fcfd3,
-            0xd818c8d0, 0x282b0b23, 0x64264662, 0x783a4a72, 0x24270723, 0x2c2f0f23, 0xf031c1f1, 0x70324272,
-            0x40024242, 0xd414c4d0, 0x40014141, 0xc000c0c0, 0x70334373, 0x64274763, 0xac2c8ca0, 0x880b8b83,
-            0xf437c7f3, 0xac2d8da1, 0x80008080, 0x1c1f0f13, 0xc80acac2, 0x2c2c0c20, 0xa82a8aa2, 0x34340430,
-            0xd012c2d2, 0x080b0b03, 0xec2ecee2, 0xe829c9e1, 0x5c1d4d51, 0x94148490, 0x18180810, 0xf838c8f0,
-            0x54174753, 0xac2e8ea2, 0x08080800, 0xc405c5c1, 0x10130313, 0xcc0dcdc1, 0x84068682, 0xb83989b1,
-            0xfc3fcff3, 0x7c3d4d71, 0xc001c1c1, 0x30310131, 0xf435c5f1, 0x880a8a82, 0x682a4a62, 0xb03181b1,
-            0xd011c1d1, 0x20200020, 0xd417c7d3, 0x00020202, 0x20220222, 0x04040400, 0x68284860, 0x70314171,
-            0x04070703, 0xd81bcbd3, 0x9c1d8d91, 0x98198991, 0x60214161, 0xbc3e8eb2, 0xe426c6e2, 0x58194951,
-            0xdc1dcdd1, 0x50114151, 0x90108090, 0xdc1cccd0, 0x981a8a92, 0xa02383a3, 0xa82b8ba3, 0xd010c0d0,
-            0x80018181, 0x0c0f0f03, 0x44074743, 0x181a0a12, 0xe023c3e3, 0xec2ccce0, 0x8c0d8d81, 0xbc3f8fb3,
-            0x94168692, 0x783b4b73, 0x5c1c4c50, 0xa02282a2, 0xa02181a1, 0x60234363, 0x20230323, 0x4c0d4d41,
-            0xc808c8c0, 0x9c1e8e92, 0x9c1c8c90, 0x383a0a32, 0x0c0c0c00, 0x2c2e0e22, 0xb83a8ab2, 0x6c2e4e62,
-            0x9c1f8f93, 0x581a4a52, 0xf032c2f2, 0x90128292, 0xf033c3f3, 0x48094941, 0x78384870, 0xcc0cccc0,
-            0x14150511, 0xf83bcbf3, 0x70304070, 0x74354571, 0x7c3f4f73, 0x34350531, 0x10100010, 0x00030303,
-            0x64244460, 0x6c2d4d61, 0xc406c6c2, 0x74344470, 0xd415c5d1, 0xb43484b0, 0xe82acae2, 0x08090901,
-            0x74364672, 0x18190911, 0xfc3ecef2, 0x40004040, 0x10120212, 0xe020c0e0, 0xbc3d8db1, 0x04050501,
-            0xf83acaf2, 0x00010101, 0xf030c0f0, 0x282a0a22, 0x5c1e4e52, 0xa82989a1, 0x54164652, 0x40034343,
-            0x84058581, 0x14140410, 0x88098981, 0x981b8b93, 0xb03080b0, 0xe425c5e1, 0x48084840, 0x78394971,
-            0x94178793, 0xfc3cccf0, 0x1c1e0e12, 0x80028282, 0x20210121, 0x8c0c8c80, 0x181b0b13, 0x5c1f4f53,
-            0x74374773, 0x54144450, 0xb03282b2, 0x1c1d0d11, 0x24250521, 0x4c0f4f43, 0x00000000, 0x44064642,
-            0xec2dcde1, 0x58184850, 0x50124252, 0xe82bcbe3, 0x7c3e4e72, 0xd81acad2, 0xc809c9c1, 0xfc3dcdf1,
-            0x30300030, 0x94158591, 0x64254561, 0x3c3c0c30, 0xb43686b2, 0xe424c4e0, 0xb83b8bb3, 0x7c3c4c70,
-            0x0c0e0e02, 0x50104050, 0x38390931, 0x24260622, 0x30320232, 0x84048480, 0x68294961, 0x90138393,
-            0x34370733, 0xe427c7e3, 0x24240420, 0xa42484a0, 0xc80bcbc3, 0x50134353, 0x080a0a02, 0x84078783,
-            0xd819c9d1, 0x4c0c4c40, 0x80038383, 0x8c0f8f83, 0xcc0ecec2, 0x383b0b33, 0x480a4a42, 0xb43787b3
-        };
-
-    private static final int[] SS2 =
-        {
-
-            0xa1a82989, 0x81840585, 0xd2d416c6, 0xd3d013c3, 0x50541444, 0x111c1d0d, 0xa0ac2c8c, 0x21242505,
-            0x515c1d4d, 0x43400343, 0x10181808, 0x121c1e0e, 0x51501141, 0xf0fc3ccc, 0xc2c80aca, 0x63602343,
-            0x20282808, 0x40440444, 0x20202000, 0x919c1d8d, 0xe0e020c0, 0xe2e022c2, 0xc0c808c8, 0x13141707,
-            0xa1a42585, 0x838c0f8f, 0x03000303, 0x73783b4b, 0xb3b83b8b, 0x13101303, 0xd2d012c2, 0xe2ec2ece,
-            0x70703040, 0x808c0c8c, 0x333c3f0f, 0xa0a82888, 0x32303202, 0xd1dc1dcd, 0xf2f436c6, 0x70743444,
-            0xe0ec2ccc, 0x91941585, 0x03080b0b, 0x53541747, 0x505c1c4c, 0x53581b4b, 0xb1bc3d8d, 0x01000101,
-            0x20242404, 0x101c1c0c, 0x73703343, 0x90981888, 0x10101000, 0xc0cc0ccc, 0xf2f032c2, 0xd1d819c9,
-            0x202c2c0c, 0xe3e427c7, 0x72703242, 0x83800383, 0x93981b8b, 0xd1d011c1, 0x82840686, 0xc1c809c9,
-            0x60602040, 0x50501040, 0xa3a02383, 0xe3e82bcb, 0x010c0d0d, 0xb2b43686, 0x929c1e8e, 0x434c0f4f,
-            0xb3b43787, 0x52581a4a, 0xc2c406c6, 0x70783848, 0xa2a42686, 0x12101202, 0xa3ac2f8f, 0xd1d415c5,
-            0x61602141, 0xc3c003c3, 0xb0b43484, 0x41400141, 0x52501242, 0x717c3d4d, 0x818c0d8d, 0x00080808,
-            0x131c1f0f, 0x91981989, 0x00000000, 0x11181909, 0x00040404, 0x53501343, 0xf3f437c7, 0xe1e021c1,
-            0xf1fc3dcd, 0x72743646, 0x232c2f0f, 0x23242707, 0xb0b03080, 0x83880b8b, 0x020c0e0e, 0xa3a82b8b,
-            0xa2a02282, 0x626c2e4e, 0x93901383, 0x414c0d4d, 0x61682949, 0x707c3c4c, 0x01080909, 0x02080a0a,
-            0xb3bc3f8f, 0xe3ec2fcf, 0xf3f033c3, 0xc1c405c5, 0x83840787, 0x10141404, 0xf2fc3ece, 0x60642444,
-            0xd2dc1ece, 0x222c2e0e, 0x43480b4b, 0x12181a0a, 0x02040606, 0x21202101, 0x63682b4b, 0x62642646,
-            0x02000202, 0xf1f435c5, 0x92901282, 0x82880a8a, 0x000c0c0c, 0xb3b03383, 0x727c3e4e, 0xd0d010c0,
-            0x72783a4a, 0x43440747, 0x92941686, 0xe1e425c5, 0x22242606, 0x80800080, 0xa1ac2d8d, 0xd3dc1fcf,
-            0xa1a02181, 0x30303000, 0x33343707, 0xa2ac2e8e, 0x32343606, 0x11141505, 0x22202202, 0x30383808,
-            0xf0f434c4, 0xa3a42787, 0x41440545, 0x404c0c4c, 0x81800181, 0xe1e829c9, 0x80840484, 0x93941787,
-            0x31343505, 0xc3c80bcb, 0xc2cc0ece, 0x303c3c0c, 0x71703141, 0x11101101, 0xc3c407c7, 0x81880989,
-            0x71743545, 0xf3f83bcb, 0xd2d81aca, 0xf0f838c8, 0x90941484, 0x51581949, 0x82800282, 0xc0c404c4,
-            0xf3fc3fcf, 0x41480949, 0x31383909, 0x63642747, 0xc0c000c0, 0xc3cc0fcf, 0xd3d417c7, 0xb0b83888,
-            0x030c0f0f, 0x828c0e8e, 0x42400242, 0x23202303, 0x91901181, 0x606c2c4c, 0xd3d81bcb, 0xa0a42484,
-            0x30343404, 0xf1f031c1, 0x40480848, 0xc2c002c2, 0x636c2f4f, 0x313c3d0d, 0x212c2d0d, 0x40400040,
-            0xb2bc3e8e, 0x323c3e0e, 0xb0bc3c8c, 0xc1c001c1, 0xa2a82a8a, 0xb2b83a8a, 0x424c0e4e, 0x51541545,
-            0x33383b0b, 0xd0dc1ccc, 0x60682848, 0x737c3f4f, 0x909c1c8c, 0xd0d818c8, 0x42480a4a, 0x52541646,
-            0x73743747, 0xa0a02080, 0xe1ec2dcd, 0x42440646, 0xb1b43585, 0x23282b0b, 0x61642545, 0xf2f83aca,
-            0xe3e023c3, 0xb1b83989, 0xb1b03181, 0x939c1f8f, 0x525c1e4e, 0xf1f839c9, 0xe2e426c6, 0xb2b03282,
-            0x31303101, 0xe2e82aca, 0x616c2d4d, 0x535c1f4f, 0xe0e424c4, 0xf0f030c0, 0xc1cc0dcd, 0x80880888,
-            0x12141606, 0x32383a0a, 0x50581848, 0xd0d414c4, 0x62602242, 0x21282909, 0x03040707, 0x33303303,
-            0xe0e828c8, 0x13181b0b, 0x01040505, 0x71783949, 0x90901080, 0x62682a4a, 0x22282a0a, 0x92981a8a
-        };
-
-
-    private static final int[] SS3 =
-        {
-
-            0x08303838, 0xc8e0e828, 0x0d212c2d, 0x86a2a426, 0xcfc3cc0f, 0xced2dc1e, 0x83b3b033, 0x88b0b838,
-            0x8fa3ac2f, 0x40606020, 0x45515415, 0xc7c3c407, 0x44404404, 0x4f636c2f, 0x4b63682b, 0x4b53581b,
-            0xc3c3c003, 0x42626022, 0x03333033, 0x85b1b435, 0x09212829, 0x80a0a020, 0xc2e2e022, 0x87a3a427,
-            0xc3d3d013, 0x81919011, 0x01111011, 0x06020406, 0x0c101c1c, 0x8cb0bc3c, 0x06323436, 0x4b43480b,
-            0xcfe3ec2f, 0x88808808, 0x4c606c2c, 0x88a0a828, 0x07131417, 0xc4c0c404, 0x06121416, 0xc4f0f434,
-            0xc2c2c002, 0x45414405, 0xc1e1e021, 0xc6d2d416, 0x0f333c3f, 0x0d313c3d, 0x8e828c0e, 0x88909818,
-            0x08202828, 0x4e424c0e, 0xc6f2f436, 0x0e323c3e, 0x85a1a425, 0xc9f1f839, 0x0d010c0d, 0xcfd3dc1f,
-            0xc8d0d818, 0x0b23282b, 0x46626426, 0x4a72783a, 0x07232427, 0x0f232c2f, 0xc1f1f031, 0x42727032,
-            0x42424002, 0xc4d0d414, 0x41414001, 0xc0c0c000, 0x43737033, 0x47636427, 0x8ca0ac2c, 0x8b83880b,
-            0xc7f3f437, 0x8da1ac2d, 0x80808000, 0x0f131c1f, 0xcac2c80a, 0x0c202c2c, 0x8aa2a82a, 0x04303434,
-            0xc2d2d012, 0x0b03080b, 0xcee2ec2e, 0xc9e1e829, 0x4d515c1d, 0x84909414, 0x08101818, 0xc8f0f838,
-            0x47535417, 0x8ea2ac2e, 0x08000808, 0xc5c1c405, 0x03131013, 0xcdc1cc0d, 0x86828406, 0x89b1b839,
-            0xcff3fc3f, 0x4d717c3d, 0xc1c1c001, 0x01313031, 0xc5f1f435, 0x8a82880a, 0x4a62682a, 0x81b1b031,
-            0xc1d1d011, 0x00202020, 0xc7d3d417, 0x02020002, 0x02222022, 0x04000404, 0x48606828, 0x41717031,
-            0x07030407, 0xcbd3d81b, 0x8d919c1d, 0x89919819, 0x41616021, 0x8eb2bc3e, 0xc6e2e426, 0x49515819,
-            0xcdd1dc1d, 0x41515011, 0x80909010, 0xccd0dc1c, 0x8a92981a, 0x83a3a023, 0x8ba3a82b, 0xc0d0d010,
-            0x81818001, 0x0f030c0f, 0x47434407, 0x0a12181a, 0xc3e3e023, 0xcce0ec2c, 0x8d818c0d, 0x8fb3bc3f,
-            0x86929416, 0x4b73783b, 0x4c505c1c, 0x82a2a022, 0x81a1a021, 0x43636023, 0x03232023, 0x4d414c0d,
-            0xc8c0c808, 0x8e929c1e, 0x8c909c1c, 0x0a32383a, 0x0c000c0c, 0x0e222c2e, 0x8ab2b83a, 0x4e626c2e,
-            0x8f939c1f, 0x4a52581a, 0xc2f2f032, 0x82929012, 0xc3f3f033, 0x49414809, 0x48707838, 0xccc0cc0c,
-            0x05111415, 0xcbf3f83b, 0x40707030, 0x45717435, 0x4f737c3f, 0x05313435, 0x00101010, 0x03030003,
-            0x44606424, 0x4d616c2d, 0xc6c2c406, 0x44707434, 0xc5d1d415, 0x84b0b434, 0xcae2e82a, 0x09010809,
-            0x46727436, 0x09111819, 0xcef2fc3e, 0x40404000, 0x02121012, 0xc0e0e020, 0x8db1bc3d, 0x05010405,
-            0xcaf2f83a, 0x01010001, 0xc0f0f030, 0x0a22282a, 0x4e525c1e, 0x89a1a829, 0x46525416, 0x43434003,
-            0x85818405, 0x04101414, 0x89818809, 0x8b93981b, 0x80b0b030, 0xc5e1e425, 0x48404808, 0x49717839,
-            0x87939417, 0xccf0fc3c, 0x0e121c1e, 0x82828002, 0x01212021, 0x8c808c0c, 0x0b13181b, 0x4f535c1f,
-            0x47737437, 0x44505414, 0x82b2b032, 0x0d111c1d, 0x05212425, 0x4f434c0f, 0x00000000, 0x46424406,
-            0xcde1ec2d, 0x48505818, 0x42525012, 0xcbe3e82b, 0x4e727c3e, 0xcad2d81a, 0xc9c1c809, 0xcdf1fc3d,
-            0x00303030, 0x85919415, 0x45616425, 0x0c303c3c, 0x86b2b436, 0xc4e0e424, 0x8bb3b83b, 0x4c707c3c,
-            0x0e020c0e, 0x40505010, 0x09313839, 0x06222426, 0x02323032, 0x84808404, 0x49616829, 0x83939013,
-            0x07333437, 0xc7e3e427, 0x04202424, 0x84a0a424, 0xcbc3c80b, 0x43535013, 0x0a02080a, 0x87838407,
-            0xc9d1d819, 0x4c404c0c, 0x83838003, 0x8f838c0f, 0xcec2cc0e, 0x0b33383b, 0x4a42480a, 0x87b3b437
-        };
-
-
-    private static final int[] KC =
-        {
-            0x9e3779b9, 0x3c6ef373, 0x78dde6e6, 0xf1bbcdcc,
-            0xe3779b99, 0xc6ef3733, 0x8dde6e67, 0x1bbcdccf,
-            0x3779b99e, 0x6ef3733c, 0xdde6e678, 0xbbcdccf1,
-            0x779b99e3, 0xef3733c6, 0xde6e678d, 0xbcdccf1b
-        };
-
-    private int[] wKey;
-    private boolean forEncryption;
-
-    public void init(boolean forEncryption, CipherParameters params) throws IllegalArgumentException
-    {
-        this.forEncryption = forEncryption;
-        wKey = createWorkingKey(((KeyParameter)params).getKey());
-    }
-
-    public String getAlgorithmName()
-    {
-        return "SEED";
-    }
-
-    public int getBlockSize()
-    {
-        return BLOCK_SIZE;
-    }
-
-    public int processBlock(byte[] in, int inOff, byte[] out, int outOff) throws DataLengthException, IllegalStateException
-    {
-        if (wKey == null)
-        {
-            throw new IllegalStateException("SEED engine not initialised");
-        }
-
-        if (inOff + BLOCK_SIZE > in.length)
-        {
-            throw new DataLengthException("input buffer too short");
-        }
-
-        if (outOff + BLOCK_SIZE > out.length)
-        {
-            throw new OutputLengthException("output buffer too short");
-        }
-
-        long l = bytesToLong(in, inOff + 0);
-        long r = bytesToLong(in, inOff + 8);
-
-        if (forEncryption)
-        {
-            for (int i = 0; i < 16; i++)
-            {
-               long nl = r;
-
-               r = l ^ F(wKey[2 * i], wKey[(2 * i) + 1], r);
-               l = nl;
-            }
-        }
-        else
-        {
-            for (int i = 15; i >= 0; i--)
-            {
-               long nl = r;
-
-               r = l ^ F(wKey[2 * i], wKey[(2 * i) + 1], r);
-               l = nl;
-            }
-        }
-
-        longToBytes(out, outOff + 0, r);
-        longToBytes(out, outOff + 8, l);
-
-        return BLOCK_SIZE;
-    }
-
-    public void reset()
-    {
-    }
-
-    private int[] createWorkingKey(byte[] inKey)
-    {
-        int[] key = new int[32];
-        long lower = bytesToLong(inKey, 0);
-        long upper = bytesToLong(inKey, 8);
-
-        int key0 = extractW0(lower);
-        int key1 = extractW1(lower);
-        int key2 = extractW0(upper);
-        int key3 = extractW1(upper);
-
-        for (int i = 0; i < 16; i++)
-        {
-            key[2 * i] = G(key0 + key2 - KC[i]);
-            key[2 * i + 1] = G(key1 - key3 + KC[i]);
-
-            if (i % 2 == 0)
-            {
-                lower = rotateRight8(lower);
-                key0 = extractW0(lower);
-                key1 = extractW1(lower);
-            }
-            else
-            {
-                upper = rotateLeft8(upper);
-                key2 = extractW0(upper);
-                key3 = extractW1(upper);
-            }
-        }
-
-        return key;
-    }
-
-    private int extractW1(long lVal)
-    {
-        return (int)lVal;
-    }
-
-    private int extractW0(long lVal)
-    {
-        return (int)(lVal >> 32);
-    }
-
-    private long rotateLeft8(long x)
-    {
-        return (x << 8) | (x >>> 56);
-    }
-
-    private long rotateRight8(long x)
-    {
-        return (x >>> 8) | (x << 56);
-    }
-
-    private long bytesToLong(
-        byte[]  src,
-        int     srcOff)
-    {
-        long    word = 0;
-
-        for (int i = 0; i <= 7; i++)
-        {
-            word = (word << 8) + (src[i + srcOff] & 0xff);
-        }
-
-        return word;
-    }
-
-    private void longToBytes(
-        byte[]  dest,
-        int     destOff,
-        long    value)
-    {
-        for (int i = 0; i < 8; i++)
-        {
-            dest[i + destOff] = (byte)(value >> ((7 - i) * 8));
-        }
-    }
-
-    private int G(int x)
-    {
-        return SS0[x & 0xff] ^ SS1[(x >> 8) & 0xff] ^ SS2[(x >> 16) & 0xff] ^ SS3[(x >> 24) & 0xff];
-    }
-
-    private long F(int ki0, int ki1, long r)
-    {
-        int r0 = (int)(r >> 32);
-        int r1 = (int)r;
-        int rd1 = phaseCalc2(r0, ki0, r1, ki1);
-        int rd0 = rd1 + phaseCalc1(r0, ki0, r1, ki1);
-
-        return ((long)rd0 << 32) | (rd1 & 0xffffffffL);
-    }
-
-    private int phaseCalc1(int r0, int ki0, int r1, int ki1)
-    {
-        return G(G((r0 ^ ki0) ^ (r1 ^ ki1)) + (r0 ^ ki0));
-    }
-
-    private int phaseCalc2(int r0, int ki0, int r1, int ki1)
-    {
-        return G(phaseCalc1(r0, ki0, r1, ki1) + G((r0 ^ ki0) ^ (r1 ^ ki1)));
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/engines/SEEDWrapEngine.java b/bcprov/src/main/java/org/bouncycastle/crypto/engines/SEEDWrapEngine.java
deleted file mode 100644
index 5b65b00..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/engines/SEEDWrapEngine.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package org.bouncycastle.crypto.engines;
-
-/**
- * An implementation of the SEED key wrapper based on RFC 4010/RFC 3394.
- * <p>
- * For further details see: <a href="http://www.ietf.org/rfc/rfc4010.txt">http://www.ietf.org/rfc/rfc4010.txt</a>.
- */
-public class SEEDWrapEngine
-    extends RFC3394WrapEngine
-{
-    public SEEDWrapEngine()
-    {
-        super(new SEEDEngine());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/engines/Salsa20Engine.java b/bcprov/src/main/java/org/bouncycastle/crypto/engines/Salsa20Engine.java
deleted file mode 100644
index 13aada9..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/engines/Salsa20Engine.java
+++ /dev/null
@@ -1,550 +0,0 @@
-package org.bouncycastle.crypto.engines;
-
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.DataLengthException;
-import org.bouncycastle.crypto.MaxBytesExceededException;
-import org.bouncycastle.crypto.OutputLengthException;
-import org.bouncycastle.crypto.SkippingStreamCipher;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.crypto.params.ParametersWithIV;
-import org.bouncycastle.util.Pack;
-import org.bouncycastle.util.Strings;
-
-/**
- * Implementation of Daniel J. Bernstein's Salsa20 stream cipher, Snuffle 2005
- */
-public class Salsa20Engine
-    implements SkippingStreamCipher
-{
-    public final static int DEFAULT_ROUNDS = 20;
-
-    /** Constants */
-    private final static int STATE_SIZE = 16; // 16, 32 bit ints = 64 bytes
-
-    protected final static byte[]
-        sigma = Strings.toByteArray("expand 32-byte k"),
-        tau   = Strings.toByteArray("expand 16-byte k");
-
-    protected int rounds;
-
-    /*
-     * variables to hold the state of the engine
-     * during encryption and decryption
-     */
-    private int         index = 0;
-    protected int[]     engineState = new int[STATE_SIZE]; // state
-    protected int[]     x = new int[STATE_SIZE] ; // internal buffer
-    private byte[]      keyStream   = new byte[STATE_SIZE * 4]; // expanded state, 64 bytes
-    private boolean     initialised = false;
-
-    /*
-     * internal counter
-     */
-    private int cW0, cW1, cW2;
-
-    /**
-     * Creates a 20 round Salsa20 engine.
-     */
-    public Salsa20Engine()
-    {
-        this(DEFAULT_ROUNDS);
-    }
-
-    /**
-     * Creates a Salsa20 engine with a specific number of rounds.
-     * @param rounds the number of rounds (must be an even number).
-     */
-    public Salsa20Engine(int rounds)
-    {
-        if (rounds <= 0 || (rounds & 1) != 0)
-        {
-            throw new IllegalArgumentException("'rounds' must be a positive, even number");
-        }
-
-        this.rounds = rounds;
-    }
-
-    /**
-     * initialise a Salsa20 cipher.
-     *
-     * @param forEncryption whether or not we are for encryption.
-     * @param params the parameters required to set up the cipher.
-     * @exception IllegalArgumentException if the params argument is
-     * inappropriate.
-     */
-    public void init(
-        boolean             forEncryption, 
-        CipherParameters     params)
-    {
-        /* 
-        * Salsa20 encryption and decryption is completely
-        * symmetrical, so the 'forEncryption' is 
-        * irrelevant. (Like 90% of stream ciphers)
-        */
-
-        if (!(params instanceof ParametersWithIV))
-        {
-            throw new IllegalArgumentException(getAlgorithmName() + " Init parameters must include an IV");
-        }
-
-        ParametersWithIV ivParams = (ParametersWithIV) params;
-
-        byte[] iv = ivParams.getIV();
-        if (iv == null || iv.length != getNonceSize())
-        {
-            throw new IllegalArgumentException(getAlgorithmName() + " requires exactly " + getNonceSize()
-                    + " bytes of IV");
-        }
-
-        CipherParameters keyParam = ivParams.getParameters();
-        if (keyParam == null)
-        {
-            if (!initialised)
-            {
-                throw new IllegalStateException(getAlgorithmName() + " KeyParameter can not be null for first initialisation");
-            }
-
-            setKey(null, iv);
-        }
-        else if (keyParam instanceof KeyParameter)
-        {
-            setKey(((KeyParameter)keyParam).getKey(), iv);
-        }
-        else
-        {
-            throw new IllegalArgumentException(getAlgorithmName() + " Init parameters must contain a KeyParameter (or null for re-init)");
-        }
-
-        reset();
-
-        initialised = true;
-    }
-
-    protected int getNonceSize()
-    {
-        return 8;
-    }
-
-    public String getAlgorithmName()
-    {
-        String name = "Salsa20";
-        if (rounds != DEFAULT_ROUNDS)
-        {
-            name += "/" + rounds;
-        }
-        return name;
-    }
-
-    public byte returnByte(byte in)
-    {
-        if (limitExceeded())
-        {
-            throw new MaxBytesExceededException("2^70 byte limit per IV; Change IV");
-        }
-
-        byte out = (byte)(keyStream[index]^in);
-        index = (index + 1) & 63;
-
-        if (index == 0)
-        {
-            advanceCounter();
-            generateKeyStream(keyStream);
-        }
-
-        return out;
-    }
-
-    protected void advanceCounter(long diff)
-    {
-        int hi = (int)(diff >>> 32);
-        int lo = (int)diff;
-
-        if (hi > 0)
-        {
-            engineState[9] += hi;
-        }
-
-        int oldState = engineState[8];
-
-        engineState[8] += lo;
-
-        if (oldState != 0 && engineState[8] < oldState)
-        {
-            engineState[9]++;
-        }
-    }
-
-    protected void advanceCounter()
-    {
-        if (++engineState[8] == 0)
-        {
-            ++engineState[9];
-        }
-    }
-
-    protected void retreatCounter(long diff)
-    {
-        int hi = (int)(diff >>> 32);
-        int lo = (int)diff;
-
-        if (hi != 0)
-        {
-            if ((engineState[9] & 0xffffffffL) >= (hi & 0xffffffffL))
-            {
-                engineState[9] -= hi;
-            }
-            else
-            {
-                throw new IllegalStateException("attempt to reduce counter past zero.");
-            }
-        }
-
-        if ((engineState[8] & 0xffffffffL) >= (lo & 0xffffffffL))
-        {
-            engineState[8] -= lo;
-        }
-        else
-        {
-            if (engineState[9] != 0)
-            {
-                --engineState[9];
-                engineState[8] -= lo;
-            }
-            else
-            {
-                throw new IllegalStateException("attempt to reduce counter past zero.");
-            }
-        }
-    }
-
-    protected void retreatCounter()
-    {
-        if (engineState[8] == 0 && engineState[9] == 0)
-        {
-            throw new IllegalStateException("attempt to reduce counter past zero.");
-        }
-
-        if (--engineState[8] == -1)
-        {
-            --engineState[9];
-        }
-    }
-
-    public int processBytes(
-        byte[]     in, 
-        int     inOff, 
-        int     len, 
-        byte[]     out, 
-        int     outOff)
-    {
-        if (!initialised)
-        {
-            throw new IllegalStateException(getAlgorithmName() + " not initialised");
-        }
-
-        if ((inOff + len) > in.length)
-        {
-            throw new DataLengthException("input buffer too short");
-        }
-
-        if ((outOff + len) > out.length)
-        {
-            throw new OutputLengthException("output buffer too short");
-        }
-
-        if (limitExceeded(len))
-        {
-            throw new MaxBytesExceededException("2^70 byte limit per IV would be exceeded; Change IV");
-        }
-
-        for (int i = 0; i < len; i++)
-        {
-            out[i + outOff] = (byte)(keyStream[index] ^ in[i + inOff]);
-            index = (index + 1) & 63;
-
-            if (index == 0)
-            {
-                advanceCounter();
-                generateKeyStream(keyStream);
-            }
-        }
-
-        return len;
-    }
-
-    public long skip(long numberOfBytes)
-    {
-        if (numberOfBytes >= 0)
-        {
-            long remaining = numberOfBytes;
-
-            if (remaining >= 64)
-            {
-                long count = remaining / 64;
-
-                advanceCounter(count);
-
-                remaining -= count * 64;
-            }
-
-            int oldIndex = index;
-
-            index = (index + (int)remaining) & 63;
-
-            if (index < oldIndex)
-            {
-                advanceCounter();
-            }
-        }
-        else
-        {
-            long remaining = -numberOfBytes;
-
-            if (remaining >= 64)
-            {
-                long count = remaining / 64;
-
-                retreatCounter(count);
-
-                remaining -= count * 64;
-            }
-
-            for (long i = 0; i < remaining; i++)
-            {
-                if (index == 0)
-                {
-                    retreatCounter();
-                }
-
-                index = (index - 1) & 63;
-            }
-        }
-
-        generateKeyStream(keyStream);
-
-        return numberOfBytes;
-    }
-
-    public long seekTo(long position)
-    {
-        reset();
-
-        return skip(position);
-    }
-
-    public long getPosition()
-    {
-        return getCounter() * 64 + index;
-    }
-
-    public void reset()
-    {
-        index = 0;
-        resetLimitCounter();
-        resetCounter();
-
-        generateKeyStream(keyStream);
-    }
-
-    protected long getCounter()
-    {
-        return ((long)engineState[9] << 32) | (engineState[8] & 0xffffffffL);
-    }
-
-    protected void resetCounter()
-    {
-        engineState[8] = engineState[9] = 0;
-    }
-
-    protected void setKey(byte[] keyBytes, byte[] ivBytes)
-    {
-        if (keyBytes != null)
-        {
-            if ((keyBytes.length != 16) && (keyBytes.length != 32))
-            {
-                throw new IllegalArgumentException(getAlgorithmName() + " requires 128 bit or 256 bit key");
-            }
-
-            // Key
-            engineState[1] = Pack.littleEndianToInt(keyBytes, 0);
-            engineState[2] = Pack.littleEndianToInt(keyBytes, 4);
-            engineState[3] = Pack.littleEndianToInt(keyBytes, 8);
-            engineState[4] = Pack.littleEndianToInt(keyBytes, 12);
-
-            byte[] constants;
-            int offset;
-            if (keyBytes.length == 32)
-            {
-                constants = sigma;
-                offset = 16;
-            }
-            else
-            {
-                constants = tau;
-                offset = 0;
-            }
-
-            engineState[11] = Pack.littleEndianToInt(keyBytes, offset);
-            engineState[12] = Pack.littleEndianToInt(keyBytes, offset + 4);
-            engineState[13] = Pack.littleEndianToInt(keyBytes, offset + 8);
-            engineState[14] = Pack.littleEndianToInt(keyBytes, offset + 12);
-    
-            engineState[0 ] = Pack.littleEndianToInt(constants, 0);
-            engineState[5 ] = Pack.littleEndianToInt(constants, 4);
-            engineState[10] = Pack.littleEndianToInt(constants, 8);
-            engineState[15] = Pack.littleEndianToInt(constants, 12);
-        }
-
-        // IV
-        engineState[6] = Pack.littleEndianToInt(ivBytes, 0);
-        engineState[7] = Pack.littleEndianToInt(ivBytes, 4);
-    }
-
-    protected void generateKeyStream(byte[] output)
-    {
-        salsaCore(rounds, engineState, x);
-        Pack.intToLittleEndian(x, output, 0);
-    }
-
-    /**
-     * Salsa20 function
-     *
-     * @param   input   input data
-     */    
-    public static void salsaCore(int rounds, int[] input, int[] x)
-    {
-        if (input.length != 16)
-        {
-            throw new IllegalArgumentException();
-        }
-        if (x.length != 16)
-        {
-            throw new IllegalArgumentException();
-        }
-        if (rounds % 2 != 0)
-        {
-            throw new IllegalArgumentException("Number of rounds must be even");
-        }
-
-        int x00 = input[ 0];
-        int x01 = input[ 1];
-        int x02 = input[ 2];
-        int x03 = input[ 3];
-        int x04 = input[ 4];
-        int x05 = input[ 5];
-        int x06 = input[ 6];
-        int x07 = input[ 7];
-        int x08 = input[ 8];
-        int x09 = input[ 9];
-        int x10 = input[10];
-        int x11 = input[11];
-        int x12 = input[12];
-        int x13 = input[13];
-        int x14 = input[14];
-        int x15 = input[15];
-
-        for (int i = rounds; i > 0; i -= 2)
-        {
-            x04 ^= rotl(x00 + x12, 7);
-            x08 ^= rotl(x04 + x00, 9);
-            x12 ^= rotl(x08 + x04, 13);
-            x00 ^= rotl(x12 + x08, 18);
-            x09 ^= rotl(x05 + x01, 7);
-            x13 ^= rotl(x09 + x05, 9);
-            x01 ^= rotl(x13 + x09, 13);
-            x05 ^= rotl(x01 + x13, 18);
-            x14 ^= rotl(x10 + x06, 7);
-            x02 ^= rotl(x14 + x10, 9);
-            x06 ^= rotl(x02 + x14, 13);
-            x10 ^= rotl(x06 + x02, 18);
-            x03 ^= rotl(x15 + x11, 7);
-            x07 ^= rotl(x03 + x15, 9);
-            x11 ^= rotl(x07 + x03, 13);
-            x15 ^= rotl(x11 + x07, 18);
-
-            x01 ^= rotl(x00 + x03, 7);
-            x02 ^= rotl(x01 + x00, 9);
-            x03 ^= rotl(x02 + x01, 13);
-            x00 ^= rotl(x03 + x02, 18);
-            x06 ^= rotl(x05 + x04, 7);
-            x07 ^= rotl(x06 + x05, 9);
-            x04 ^= rotl(x07 + x06, 13);
-            x05 ^= rotl(x04 + x07, 18);
-            x11 ^= rotl(x10 + x09, 7);
-            x08 ^= rotl(x11 + x10, 9);
-            x09 ^= rotl(x08 + x11, 13);
-            x10 ^= rotl(x09 + x08, 18);
-            x12 ^= rotl(x15 + x14, 7);
-            x13 ^= rotl(x12 + x15, 9);
-            x14 ^= rotl(x13 + x12, 13);
-            x15 ^= rotl(x14 + x13, 18);
-        }
-
-        x[ 0] = x00 + input[ 0];
-        x[ 1] = x01 + input[ 1];
-        x[ 2] = x02 + input[ 2];
-        x[ 3] = x03 + input[ 3];
-        x[ 4] = x04 + input[ 4];
-        x[ 5] = x05 + input[ 5];
-        x[ 6] = x06 + input[ 6];
-        x[ 7] = x07 + input[ 7];
-        x[ 8] = x08 + input[ 8];
-        x[ 9] = x09 + input[ 9];
-        x[10] = x10 + input[10];
-        x[11] = x11 + input[11];
-        x[12] = x12 + input[12];
-        x[13] = x13 + input[13];
-        x[14] = x14 + input[14];
-        x[15] = x15 + input[15];
-    }
-
-    /**
-     * Rotate left
-     *
-     * @param   x   value to rotate
-     * @param   y   amount to rotate x
-     *
-     * @return  rotated x
-     */
-    protected static int rotl(int x, int y)
-    {
-        return (x << y) | (x >>> -y);
-    }
-
-    private void resetLimitCounter()
-    {
-        cW0 = 0;
-        cW1 = 0;
-        cW2 = 0;
-    }
-
-    private boolean limitExceeded()
-    {
-        if (++cW0 == 0)
-        {
-            if (++cW1 == 0)
-            {
-                return (++cW2 & 0x20) != 0;          // 2^(32 + 32 + 6)
-            }
-        }
-
-        return false;
-    }
-
-    /*
-     * this relies on the fact len will always be positive.
-     */
-    private boolean limitExceeded(int len)
-    {
-        cW0 += len;
-        if (cW0 < len && cW0 >= 0)
-        {
-            if (++cW1 == 0)
-            {
-                return (++cW2 & 0x20) != 0;          // 2^(32 + 32 + 6)
-            }
-        }
-
-        return false;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/engines/SerpentEngine.java b/bcprov/src/main/java/org/bouncycastle/crypto/engines/SerpentEngine.java
deleted file mode 100644
index 8db5a6f..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/engines/SerpentEngine.java
+++ /dev/null
@@ -1,783 +0,0 @@
-package org.bouncycastle.crypto.engines;
-
-import org.bouncycastle.crypto.BlockCipher;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.DataLengthException;
-import org.bouncycastle.crypto.OutputLengthException;
-import org.bouncycastle.crypto.params.KeyParameter;
-
-/**
- * Serpent is a 128-bit 32-round block cipher with variable key lengths,
- * including 128, 192 and 256 bit keys conjectured to be at least as
- * secure as three-key triple-DES.
- * <p>
- * Serpent was designed by Ross Anderson, Eli Biham and Lars Knudsen as a
- * candidate algorithm for the NIST AES Quest.
- * <p>
- * For full details see the <a href="http://www.cl.cam.ac.uk/~rja14/serpent.html">The Serpent home page</a>
- */
-public class SerpentEngine
-    implements BlockCipher
-{
-    private static final int    BLOCK_SIZE = 16;
-
-    static final int ROUNDS = 32;
-    static final int PHI    = 0x9E3779B9;       // (sqrt(5) - 1) * 2**31
-
-    private boolean        encrypting;
-    private int[]          wKey;
-
-    private int           X0, X1, X2, X3;    // registers
-
-    /**
-     * initialise a Serpent cipher.
-     *
-     * @param encrypting whether or not we are for encryption.
-     * @param params the parameters required to set up the cipher.
-     * @exception IllegalArgumentException if the params argument is
-     * inappropriate.
-     */
-    public void init(
-        boolean             encrypting,
-        CipherParameters    params)
-    {
-        if (params instanceof KeyParameter)
-        {
-            this.encrypting = encrypting;
-            this.wKey = makeWorkingKey(((KeyParameter)params).getKey());
-            return;
-        }
-
-        throw new IllegalArgumentException("invalid parameter passed to Serpent init - " + params.getClass().getName());
-    }
-
-    public String getAlgorithmName()
-    {
-        return "Serpent";
-    }
-
-    public int getBlockSize()
-    {
-        return BLOCK_SIZE;
-    }
-
-    /**
-     * Process one block of input from the array in and write it to
-     * the out array.
-     *
-     * @param in the array containing the input data.
-     * @param inOff offset into the in array the data starts at.
-     * @param out the array the output data will be copied into.
-     * @param outOff the offset into the out array the output will start at.
-     * @exception DataLengthException if there isn't enough data in in, or
-     * space in out.
-     * @exception IllegalStateException if the cipher isn't initialised.
-     * @return the number of bytes processed and produced.
-     */
-    public final int processBlock(
-        byte[]  in,
-        int     inOff,
-        byte[]  out,
-        int     outOff)
-    {
-        if (wKey == null)
-        {
-            throw new IllegalStateException("Serpent not initialised");
-        }
-
-        if ((inOff + BLOCK_SIZE) > in.length)
-        {
-            throw new DataLengthException("input buffer too short");
-        }
-
-        if ((outOff + BLOCK_SIZE) > out.length)
-        {
-            throw new OutputLengthException("output buffer too short");
-        }
-
-        if (encrypting)
-        {
-            encryptBlock(in, inOff, out, outOff);
-        }
-        else
-        {
-            decryptBlock(in, inOff, out, outOff);
-        }
-
-        return BLOCK_SIZE;
-    }
-
-    public void reset()
-    {
-    }
-
-    /**
-     * Expand a user-supplied key material into a session key.
-     *
-     * @param key  The user-key bytes (multiples of 4) to use.
-     * @exception IllegalArgumentException
-     */
-    private int[] makeWorkingKey(
-        byte[] key)
-    throws  IllegalArgumentException
-    {
-        //
-        // pad key to 256 bits
-        //
-        int[]   kPad = new int[16];
-        int     off = 0;
-        int     length = 0;
-
-        for (off = key.length - 4; off > 0; off -= 4)
-        {
-            kPad[length++] = bytesToWord(key, off);
-        }
-
-        if (off == 0)
-        {
-            kPad[length++] = bytesToWord(key, 0);
-            if (length < 8)
-            {
-                kPad[length] = 1;
-            }
-        }
-        else
-        {
-            throw new IllegalArgumentException("key must be a multiple of 4 bytes");
-        }
-
-        //
-        // expand the padded key up to 33 x 128 bits of key material
-        //
-        int     amount = (ROUNDS + 1) * 4;
-        int[]   w = new int[amount];
-
-        //
-        // compute w0 to w7 from w-8 to w-1
-        //
-        for (int i = 8; i < 16; i++)
-        {
-            kPad[i] = rotateLeft(kPad[i - 8] ^ kPad[i - 5] ^ kPad[i - 3] ^ kPad[i - 1] ^ PHI ^ (i - 8), 11);
-        }
-
-        System.arraycopy(kPad, 8, w, 0, 8);
-
-        //
-        // compute w8 to w136
-        //
-        for (int i = 8; i < amount; i++)
-        {
-            w[i] = rotateLeft(w[i - 8] ^ w[i - 5] ^ w[i - 3] ^ w[i - 1] ^ PHI ^ i, 11);
-        }
-
-        //
-        // create the working keys by processing w with the Sbox and IP
-        //
-        sb3(w[0], w[1], w[2], w[3]);
-        w[0] = X0; w[1] = X1; w[2] = X2; w[3] = X3; 
-        sb2(w[4], w[5], w[6], w[7]);
-        w[4] = X0; w[5] = X1; w[6] = X2; w[7] = X3; 
-        sb1(w[8], w[9], w[10], w[11]);
-        w[8] = X0; w[9] = X1; w[10] = X2; w[11] = X3; 
-        sb0(w[12], w[13], w[14], w[15]);
-        w[12] = X0; w[13] = X1; w[14] = X2; w[15] = X3; 
-        sb7(w[16], w[17], w[18], w[19]);
-        w[16] = X0; w[17] = X1; w[18] = X2; w[19] = X3; 
-        sb6(w[20], w[21], w[22], w[23]);
-        w[20] = X0; w[21] = X1; w[22] = X2; w[23] = X3; 
-        sb5(w[24], w[25], w[26], w[27]);
-        w[24] = X0; w[25] = X1; w[26] = X2; w[27] = X3; 
-        sb4(w[28], w[29], w[30], w[31]);
-        w[28] = X0; w[29] = X1; w[30] = X2; w[31] = X3; 
-        sb3(w[32], w[33], w[34], w[35]);
-        w[32] = X0; w[33] = X1; w[34] = X2; w[35] = X3; 
-        sb2(w[36], w[37], w[38], w[39]);
-        w[36] = X0; w[37] = X1; w[38] = X2; w[39] = X3; 
-        sb1(w[40], w[41], w[42], w[43]);
-        w[40] = X0; w[41] = X1; w[42] = X2; w[43] = X3; 
-        sb0(w[44], w[45], w[46], w[47]);
-        w[44] = X0; w[45] = X1; w[46] = X2; w[47] = X3; 
-        sb7(w[48], w[49], w[50], w[51]);
-        w[48] = X0; w[49] = X1; w[50] = X2; w[51] = X3; 
-        sb6(w[52], w[53], w[54], w[55]);
-        w[52] = X0; w[53] = X1; w[54] = X2; w[55] = X3; 
-        sb5(w[56], w[57], w[58], w[59]);
-        w[56] = X0; w[57] = X1; w[58] = X2; w[59] = X3; 
-        sb4(w[60], w[61], w[62], w[63]);
-        w[60] = X0; w[61] = X1; w[62] = X2; w[63] = X3; 
-        sb3(w[64], w[65], w[66], w[67]);
-        w[64] = X0; w[65] = X1; w[66] = X2; w[67] = X3; 
-        sb2(w[68], w[69], w[70], w[71]);
-        w[68] = X0; w[69] = X1; w[70] = X2; w[71] = X3; 
-        sb1(w[72], w[73], w[74], w[75]);
-        w[72] = X0; w[73] = X1; w[74] = X2; w[75] = X3; 
-        sb0(w[76], w[77], w[78], w[79]);
-        w[76] = X0; w[77] = X1; w[78] = X2; w[79] = X3; 
-        sb7(w[80], w[81], w[82], w[83]);
-        w[80] = X0; w[81] = X1; w[82] = X2; w[83] = X3; 
-        sb6(w[84], w[85], w[86], w[87]);
-        w[84] = X0; w[85] = X1; w[86] = X2; w[87] = X3; 
-        sb5(w[88], w[89], w[90], w[91]);
-        w[88] = X0; w[89] = X1; w[90] = X2; w[91] = X3; 
-        sb4(w[92], w[93], w[94], w[95]);
-        w[92] = X0; w[93] = X1; w[94] = X2; w[95] = X3; 
-        sb3(w[96], w[97], w[98], w[99]);
-        w[96] = X0; w[97] = X1; w[98] = X2; w[99] = X3; 
-        sb2(w[100], w[101], w[102], w[103]);
-        w[100] = X0; w[101] = X1; w[102] = X2; w[103] = X3; 
-        sb1(w[104], w[105], w[106], w[107]);
-        w[104] = X0; w[105] = X1; w[106] = X2; w[107] = X3; 
-        sb0(w[108], w[109], w[110], w[111]);
-        w[108] = X0; w[109] = X1; w[110] = X2; w[111] = X3; 
-        sb7(w[112], w[113], w[114], w[115]);
-        w[112] = X0; w[113] = X1; w[114] = X2; w[115] = X3; 
-        sb6(w[116], w[117], w[118], w[119]);
-        w[116] = X0; w[117] = X1; w[118] = X2; w[119] = X3; 
-        sb5(w[120], w[121], w[122], w[123]);
-        w[120] = X0; w[121] = X1; w[122] = X2; w[123] = X3; 
-        sb4(w[124], w[125], w[126], w[127]);
-        w[124] = X0; w[125] = X1; w[126] = X2; w[127] = X3; 
-        sb3(w[128], w[129], w[130], w[131]);
-        w[128] = X0; w[129] = X1; w[130] = X2; w[131] = X3; 
-
-        return w;
-    }
-
-    private int rotateLeft(
-        int     x,
-        int     bits)
-    {
-        return (x << bits) | (x >>> -bits);
-    }
-
-    private int rotateRight(
-        int     x,
-        int     bits)
-    {
-        return (x >>> bits) | (x << -bits);
-    }
-
-    private int bytesToWord(
-        byte[]  src,
-        int     srcOff)
-    {
-        return (((src[srcOff] & 0xff) << 24) | ((src[srcOff + 1] & 0xff) <<  16) |
-          ((src[srcOff + 2] & 0xff) << 8) | ((src[srcOff + 3] & 0xff)));
-    }
-
-    private void wordToBytes(
-        int     word,
-        byte[]  dst,
-        int     dstOff)
-    {
-        dst[dstOff + 3] = (byte)(word);
-        dst[dstOff + 2] = (byte)(word >>> 8);
-        dst[dstOff + 1] = (byte)(word >>> 16);
-        dst[dstOff]     = (byte)(word >>> 24);
-    }
-
-    /**
-     * Encrypt one block of plaintext.
-     *
-     * @param in the array containing the input data.
-     * @param inOff offset into the in array the data starts at.
-     * @param out the array the output data will be copied into.
-     * @param outOff the offset into the out array the output will start at.
-     */
-    private void encryptBlock(
-        byte[]  in,
-        int     inOff,
-        byte[]  out,
-        int     outOff)
-    {
-        X3 = bytesToWord(in, inOff);
-        X2 = bytesToWord(in, inOff + 4);
-        X1 = bytesToWord(in, inOff + 8);
-        X0 = bytesToWord(in, inOff + 12);
-
-        sb0(wKey[0] ^ X0, wKey[1] ^ X1, wKey[2] ^ X2, wKey[3] ^ X3); LT();
-        sb1(wKey[4] ^ X0, wKey[5] ^ X1, wKey[6] ^ X2, wKey[7] ^ X3); LT();
-        sb2(wKey[8] ^ X0, wKey[9] ^ X1, wKey[10] ^ X2, wKey[11] ^ X3); LT();
-        sb3(wKey[12] ^ X0, wKey[13] ^ X1, wKey[14] ^ X2, wKey[15] ^ X3); LT();
-        sb4(wKey[16] ^ X0, wKey[17] ^ X1, wKey[18] ^ X2, wKey[19] ^ X3); LT();
-        sb5(wKey[20] ^ X0, wKey[21] ^ X1, wKey[22] ^ X2, wKey[23] ^ X3); LT();
-        sb6(wKey[24] ^ X0, wKey[25] ^ X1, wKey[26] ^ X2, wKey[27] ^ X3); LT();
-        sb7(wKey[28] ^ X0, wKey[29] ^ X1, wKey[30] ^ X2, wKey[31] ^ X3); LT();
-        sb0(wKey[32] ^ X0, wKey[33] ^ X1, wKey[34] ^ X2, wKey[35] ^ X3); LT();
-        sb1(wKey[36] ^ X0, wKey[37] ^ X1, wKey[38] ^ X2, wKey[39] ^ X3); LT();
-        sb2(wKey[40] ^ X0, wKey[41] ^ X1, wKey[42] ^ X2, wKey[43] ^ X3); LT();
-        sb3(wKey[44] ^ X0, wKey[45] ^ X1, wKey[46] ^ X2, wKey[47] ^ X3); LT();
-        sb4(wKey[48] ^ X0, wKey[49] ^ X1, wKey[50] ^ X2, wKey[51] ^ X3); LT();
-        sb5(wKey[52] ^ X0, wKey[53] ^ X1, wKey[54] ^ X2, wKey[55] ^ X3); LT();
-        sb6(wKey[56] ^ X0, wKey[57] ^ X1, wKey[58] ^ X2, wKey[59] ^ X3); LT();
-        sb7(wKey[60] ^ X0, wKey[61] ^ X1, wKey[62] ^ X2, wKey[63] ^ X3); LT();
-        sb0(wKey[64] ^ X0, wKey[65] ^ X1, wKey[66] ^ X2, wKey[67] ^ X3); LT();
-        sb1(wKey[68] ^ X0, wKey[69] ^ X1, wKey[70] ^ X2, wKey[71] ^ X3); LT();
-        sb2(wKey[72] ^ X0, wKey[73] ^ X1, wKey[74] ^ X2, wKey[75] ^ X3); LT();
-        sb3(wKey[76] ^ X0, wKey[77] ^ X1, wKey[78] ^ X2, wKey[79] ^ X3); LT();
-        sb4(wKey[80] ^ X0, wKey[81] ^ X1, wKey[82] ^ X2, wKey[83] ^ X3); LT();
-        sb5(wKey[84] ^ X0, wKey[85] ^ X1, wKey[86] ^ X2, wKey[87] ^ X3); LT();
-        sb6(wKey[88] ^ X0, wKey[89] ^ X1, wKey[90] ^ X2, wKey[91] ^ X3); LT();
-        sb7(wKey[92] ^ X0, wKey[93] ^ X1, wKey[94] ^ X2, wKey[95] ^ X3); LT();
-        sb0(wKey[96] ^ X0, wKey[97] ^ X1, wKey[98] ^ X2, wKey[99] ^ X3); LT();
-        sb1(wKey[100] ^ X0, wKey[101] ^ X1, wKey[102] ^ X2, wKey[103] ^ X3); LT();
-        sb2(wKey[104] ^ X0, wKey[105] ^ X1, wKey[106] ^ X2, wKey[107] ^ X3); LT();
-        sb3(wKey[108] ^ X0, wKey[109] ^ X1, wKey[110] ^ X2, wKey[111] ^ X3); LT();
-        sb4(wKey[112] ^ X0, wKey[113] ^ X1, wKey[114] ^ X2, wKey[115] ^ X3); LT();
-        sb5(wKey[116] ^ X0, wKey[117] ^ X1, wKey[118] ^ X2, wKey[119] ^ X3); LT();
-        sb6(wKey[120] ^ X0, wKey[121] ^ X1, wKey[122] ^ X2, wKey[123] ^ X3); LT();
-        sb7(wKey[124] ^ X0, wKey[125] ^ X1, wKey[126] ^ X2, wKey[127] ^ X3);
-
-        wordToBytes(wKey[131] ^ X3, out, outOff);
-        wordToBytes(wKey[130] ^ X2, out, outOff + 4);
-        wordToBytes(wKey[129] ^ X1, out, outOff + 8);
-        wordToBytes(wKey[128] ^ X0, out, outOff + 12);
-    }
-
-    /**
-     * Decrypt one block of ciphertext.
-     *
-     * @param in the array containing the input data.
-     * @param inOff offset into the in array the data starts at.
-     * @param out the array the output data will be copied into.
-     * @param outOff the offset into the out array the output will start at.
-     */
-    private void decryptBlock(
-        byte[]  in,
-        int     inOff,
-        byte[]  out,
-        int     outOff)
-    {
-        X3 = wKey[131] ^ bytesToWord(in, inOff);
-        X2 = wKey[130] ^ bytesToWord(in, inOff + 4);
-        X1 = wKey[129] ^ bytesToWord(in, inOff + 8);
-        X0 = wKey[128] ^ bytesToWord(in, inOff + 12);
-
-        ib7(X0, X1, X2, X3);
-        X0 ^= wKey[124]; X1 ^= wKey[125]; X2 ^= wKey[126]; X3 ^= wKey[127];
-        inverseLT(); ib6(X0, X1, X2, X3);
-        X0 ^= wKey[120]; X1 ^= wKey[121]; X2 ^= wKey[122]; X3 ^= wKey[123];
-        inverseLT(); ib5(X0, X1, X2, X3);
-        X0 ^= wKey[116]; X1 ^= wKey[117]; X2 ^= wKey[118]; X3 ^= wKey[119];
-        inverseLT(); ib4(X0, X1, X2, X3);
-        X0 ^= wKey[112]; X1 ^= wKey[113]; X2 ^= wKey[114]; X3 ^= wKey[115];
-        inverseLT(); ib3(X0, X1, X2, X3);
-        X0 ^= wKey[108]; X1 ^= wKey[109]; X2 ^= wKey[110]; X3 ^= wKey[111];
-        inverseLT(); ib2(X0, X1, X2, X3);
-        X0 ^= wKey[104]; X1 ^= wKey[105]; X2 ^= wKey[106]; X3 ^= wKey[107];
-        inverseLT(); ib1(X0, X1, X2, X3);
-        X0 ^= wKey[100]; X1 ^= wKey[101]; X2 ^= wKey[102]; X3 ^= wKey[103];
-        inverseLT(); ib0(X0, X1, X2, X3);
-        X0 ^= wKey[96]; X1 ^= wKey[97]; X2 ^= wKey[98]; X3 ^= wKey[99];
-        inverseLT(); ib7(X0, X1, X2, X3);
-        X0 ^= wKey[92]; X1 ^= wKey[93]; X2 ^= wKey[94]; X3 ^= wKey[95];
-        inverseLT(); ib6(X0, X1, X2, X3);
-        X0 ^= wKey[88]; X1 ^= wKey[89]; X2 ^= wKey[90]; X3 ^= wKey[91];
-        inverseLT(); ib5(X0, X1, X2, X3);
-        X0 ^= wKey[84]; X1 ^= wKey[85]; X2 ^= wKey[86]; X3 ^= wKey[87];
-        inverseLT(); ib4(X0, X1, X2, X3);
-        X0 ^= wKey[80]; X1 ^= wKey[81]; X2 ^= wKey[82]; X3 ^= wKey[83];
-        inverseLT(); ib3(X0, X1, X2, X3);
-        X0 ^= wKey[76]; X1 ^= wKey[77]; X2 ^= wKey[78]; X3 ^= wKey[79];
-        inverseLT(); ib2(X0, X1, X2, X3);
-        X0 ^= wKey[72]; X1 ^= wKey[73]; X2 ^= wKey[74]; X3 ^= wKey[75];
-        inverseLT(); ib1(X0, X1, X2, X3);
-        X0 ^= wKey[68]; X1 ^= wKey[69]; X2 ^= wKey[70]; X3 ^= wKey[71];
-        inverseLT(); ib0(X0, X1, X2, X3);
-        X0 ^= wKey[64]; X1 ^= wKey[65]; X2 ^= wKey[66]; X3 ^= wKey[67];
-        inverseLT(); ib7(X0, X1, X2, X3);
-        X0 ^= wKey[60]; X1 ^= wKey[61]; X2 ^= wKey[62]; X3 ^= wKey[63];
-        inverseLT(); ib6(X0, X1, X2, X3);
-        X0 ^= wKey[56]; X1 ^= wKey[57]; X2 ^= wKey[58]; X3 ^= wKey[59];
-        inverseLT(); ib5(X0, X1, X2, X3);
-        X0 ^= wKey[52]; X1 ^= wKey[53]; X2 ^= wKey[54]; X3 ^= wKey[55];
-        inverseLT(); ib4(X0, X1, X2, X3);
-        X0 ^= wKey[48]; X1 ^= wKey[49]; X2 ^= wKey[50]; X3 ^= wKey[51];
-        inverseLT(); ib3(X0, X1, X2, X3);
-        X0 ^= wKey[44]; X1 ^= wKey[45]; X2 ^= wKey[46]; X3 ^= wKey[47];
-        inverseLT(); ib2(X0, X1, X2, X3);
-        X0 ^= wKey[40]; X1 ^= wKey[41]; X2 ^= wKey[42]; X3 ^= wKey[43];
-        inverseLT(); ib1(X0, X1, X2, X3);
-        X0 ^= wKey[36]; X1 ^= wKey[37]; X2 ^= wKey[38]; X3 ^= wKey[39];
-        inverseLT(); ib0(X0, X1, X2, X3);
-        X0 ^= wKey[32]; X1 ^= wKey[33]; X2 ^= wKey[34]; X3 ^= wKey[35];
-        inverseLT(); ib7(X0, X1, X2, X3);
-        X0 ^= wKey[28]; X1 ^= wKey[29]; X2 ^= wKey[30]; X3 ^= wKey[31];
-        inverseLT(); ib6(X0, X1, X2, X3);
-        X0 ^= wKey[24]; X1 ^= wKey[25]; X2 ^= wKey[26]; X3 ^= wKey[27];
-        inverseLT(); ib5(X0, X1, X2, X3);
-        X0 ^= wKey[20]; X1 ^= wKey[21]; X2 ^= wKey[22]; X3 ^= wKey[23];
-        inverseLT(); ib4(X0, X1, X2, X3);
-        X0 ^= wKey[16]; X1 ^= wKey[17]; X2 ^= wKey[18]; X3 ^= wKey[19];
-        inverseLT(); ib3(X0, X1, X2, X3);
-        X0 ^= wKey[12]; X1 ^= wKey[13]; X2 ^= wKey[14]; X3 ^= wKey[15];
-        inverseLT(); ib2(X0, X1, X2, X3);
-        X0 ^= wKey[8]; X1 ^= wKey[9]; X2 ^= wKey[10]; X3 ^= wKey[11];
-        inverseLT(); ib1(X0, X1, X2, X3);
-        X0 ^= wKey[4]; X1 ^= wKey[5]; X2 ^= wKey[6]; X3 ^= wKey[7];
-        inverseLT(); ib0(X0, X1, X2, X3);
-
-        wordToBytes(X3 ^ wKey[3], out, outOff);
-        wordToBytes(X2 ^ wKey[2], out, outOff + 4);
-        wordToBytes(X1 ^ wKey[1], out, outOff + 8);
-        wordToBytes(X0 ^ wKey[0], out, outOff + 12);
-    }
-
-    /**
-     * The sboxes below are based on the work of Brian Gladman and
-     * Sam Simpson, whose original notice appears below.
-     * <p>
-     * For further details see:
-     *      http://fp.gladman.plus.com/cryptography_technology/serpent/
-     */
-
-    /* Partially optimised Serpent S Box boolean functions derived  */
-    /* using a recursive descent analyser but without a full search */
-    /* of all subtrees. This set of S boxes is the result of work    */
-    /* by Sam Simpson and Brian Gladman using the spare time on a    */
-    /* cluster of high capacity servers to search for S boxes with    */
-    /* this customised search engine. There are now an average of    */
-    /* 15.375 terms    per S box.                                        */
-    /*                                                              */
-    /* Copyright:   Dr B. R Gladman (gladman@seven77.demon.co.uk)   */
-    /*                and Sam Simpson (s.simpson@mia.co.uk)            */
-    /*              17th December 1998                                */
-    /*                                                              */
-    /* We hereby give permission for information in this file to be */
-    /* used freely subject only to acknowledgement of its origin.    */
-
-    /**
-     * S0 - { 3, 8,15, 1,10, 6, 5,11,14,13, 4, 2, 7, 0, 9,12 } - 15 terms.
-     */
-    private void sb0(int a, int b, int c, int d)    
-    {
-        int    t1 = a ^ d;        
-        int    t3 = c ^ t1;    
-        int    t4 = b ^ t3;    
-        X3 = (a & d) ^ t4;    
-        int    t7 = a ^ (b & t1);    
-        X2 = t4 ^ (c | t7);    
-        int    t12 = X3 & (t3 ^ t7);    
-        X1 = (~t3) ^ t12;    
-        X0 = t12 ^ (~t7);
-    }
-
-    /**
-     * InvSO - {13, 3,11, 0,10, 6, 5,12, 1,14, 4, 7,15, 9, 8, 2 } - 15 terms.
-     */
-    private void ib0(int a, int b, int c, int d)    
-    {
-        int    t1 = ~a;        
-        int    t2 = a ^ b;        
-        int    t4 = d ^ (t1 | t2);    
-        int    t5 = c ^ t4;    
-        X2 = t2 ^ t5;    
-        int    t8 = t1 ^ (d & t2);    
-        X1 = t4 ^ (X2 & t8);    
-        X3 = (a & t4) ^ (t5 | X1);    
-        X0 = X3 ^ (t5 ^ t8);
-    }
-
-    /**
-     * S1 - {15,12, 2, 7, 9, 0, 5,10, 1,11,14, 8, 6,13, 3, 4 } - 14 terms.
-     */
-    private void sb1(int a, int b, int c, int d)    
-    {
-        int    t2 = b ^ (~a);    
-        int    t5 = c ^ (a | t2);    
-        X2 = d ^ t5;        
-        int    t7 = b ^ (d | t2);    
-        int    t8 = t2 ^ X2;    
-        X3 = t8 ^ (t5 & t7);    
-        int    t11 = t5 ^ t7;    
-        X1 = X3 ^ t11;    
-        X0 = t5 ^ (t8 & t11);
-    }
-
-    /**
-     * InvS1 - { 5, 8, 2,14,15, 6,12, 3,11, 4, 7, 9, 1,13,10, 0 } - 14 steps.
-     */
-    private void ib1(int a, int b, int c, int d)    
-    {
-        int    t1 = b ^ d;        
-        int    t3 = a ^ (b & t1);    
-        int    t4 = t1 ^ t3;    
-        X3 = c ^ t4;        
-        int    t7 = b ^ (t1 & t3);    
-        int    t8 = X3 | t7;    
-        X1 = t3 ^ t8;    
-        int    t10 = ~X1;        
-        int    t11 = X3 ^ t7;    
-        X0 = t10 ^ t11;    
-        X2 = t4 ^ (t10 | t11);
-    }
-
-    /**
-     * S2 - { 8, 6, 7, 9, 3,12,10,15,13, 1,14, 4, 0,11, 5, 2 } - 16 terms.
-     */
-    private void sb2(int a, int b, int c, int d)    
-    {
-        int    t1 = ~a;        
-        int    t2 = b ^ d;
-        int    t3 = c & t1;
-        X0 = t2 ^ t3;
-        int    t5 = c ^ t1;
-        int    t6 = c ^ X0;
-        int    t7 = b & t6;
-        X3 = t5 ^ t7;
-        X2 = a ^ ((d | t7) & (X0 | t5));
-        X1 = (t2 ^ X3) ^ (X2 ^ (d | t1));
-    }
-
-    /**
-     * InvS2 - {12, 9,15, 4,11,14, 1, 2, 0, 3, 6,13, 5, 8,10, 7 } - 16 steps.
-     */
-    private void ib2(int a, int b, int c, int d)    
-    {
-        int    t1 = b ^ d;        
-        int    t2 = ~t1;        
-        int    t3 = a ^ c;
-        int    t4 = c ^ t1;
-        int    t5 = b & t4;
-        X0 = t3 ^ t5;
-        int    t7 = a | t2;
-        int    t8 = d ^ t7;
-        int    t9 = t3 | t8;
-        X3 = t1 ^ t9;
-        int    t11 = ~t4;        
-        int    t12 = X0 | X3;
-        X1 = t11 ^ t12;
-        X2 = (d & t11) ^ (t3 ^ t12);
-    }
-
-    /**
-     * S3 - { 0,15,11, 8,12, 9, 6, 3,13, 1, 2, 4,10, 7, 5,14 } - 16 terms.
-     */
-    private void sb3(int a, int b, int c, int d)    
-    {
-        int    t1 = a ^ b;        
-        int    t2 = a & c;        
-        int    t3 = a | d;        
-        int    t4 = c ^ d;        
-        int    t5 = t1 & t3;    
-        int    t6 = t2 | t5;    
-        X2 = t4 ^ t6;    
-        int    t8 = b ^ t3;    
-        int    t9 = t6 ^ t8;    
-        int    t10 = t4 & t9;    
-        X0 = t1 ^ t10;    
-        int    t12 = X2 & X0;    
-        X1 = t9 ^ t12;    
-        X3 = (b | d) ^ (t4 ^ t12);
-    }
-
-    /**
-     * InvS3 - { 0, 9,10, 7,11,14, 6,13, 3, 5,12, 2, 4, 8,15, 1 } - 15 terms
-     */
-    private void ib3(int a, int b, int c, int d)    
-    {
-        int    t1 = a | b;        
-        int    t2 = b ^ c;        
-        int    t3 = b & t2;    
-        int    t4 = a ^ t3;    
-        int    t5 = c ^ t4;    
-        int    t6 = d | t4;    
-        X0 = t2 ^ t6;    
-        int    t8 = t2 | t6;    
-        int    t9 = d ^ t8;    
-        X2 = t5 ^ t9;    
-        int    t11 = t1 ^ t9;    
-        int    t12 = X0 & t11;    
-        X3 = t4 ^ t12;    
-        X1 = X3 ^ (X0 ^ t11);
-    }
-
-    /**
-     * S4 - { 1,15, 8, 3,12, 0,11, 6, 2, 5, 4,10, 9,14, 7,13 } - 15 terms.
-     */
-    private void sb4(int a, int b, int c, int d)    
-    {
-        int    t1 = a ^ d;        
-        int    t2 = d & t1;    
-        int    t3 = c ^ t2;    
-        int    t4 = b | t3;    
-        X3 = t1 ^ t4;    
-        int    t6 = ~b;        
-        int    t7 = t1 | t6;    
-        X0 = t3 ^ t7;    
-        int    t9 = a & X0;        
-        int    t10 = t1 ^ t6;    
-        int    t11 = t4 & t10;    
-        X2 = t9 ^ t11;    
-        X1 = (a ^ t3) ^ (t10 & X2);
-    }
-
-    /**
-     * InvS4 - { 5, 0, 8, 3,10, 9, 7,14, 2,12,11, 6, 4,15,13, 1 } - 15 terms.
-     */
-    private void ib4(int a, int b, int c, int d)    
-    {
-        int    t1 = c | d;        
-        int    t2 = a & t1;    
-        int    t3 = b ^ t2;    
-        int    t4 = a & t3;    
-        int    t5 = c ^ t4;    
-        X1 = d ^ t5;        
-        int    t7 = ~a;        
-        int    t8 = t5 & X1;    
-        X3 = t3 ^ t8;    
-        int    t10 = X1 | t7;    
-        int    t11 = d ^ t10;    
-        X0 = X3 ^ t11;    
-        X2 = (t3 & t11) ^ (X1 ^ t7);
-    }
-
-    /**
-     * S5 - {15, 5, 2,11, 4,10, 9,12, 0, 3,14, 8,13, 6, 7, 1 } - 16 terms.
-     */
-    private void sb5(int a, int b, int c, int d)    
-    {
-        int    t1 = ~a;        
-        int    t2 = a ^ b;        
-        int    t3 = a ^ d;        
-        int    t4 = c ^ t1;    
-        int    t5 = t2 | t3;    
-        X0 = t4 ^ t5;    
-        int    t7 = d & X0;        
-        int    t8 = t2 ^ X0;    
-        X1 = t7 ^ t8;    
-        int    t10 = t1 | X0;    
-        int    t11 = t2 | t7;    
-        int    t12 = t3 ^ t10;    
-        X2 = t11 ^ t12;    
-        X3 = (b ^ t7) ^ (X1 & t12);
-    }
-
-    /**
-     * InvS5 - { 8,15, 2, 9, 4, 1,13,14,11, 6, 5, 3, 7,12,10, 0 } - 16 terms.
-     */
-    private void ib5(int a, int b, int c, int d)    
-    {
-        int    t1 = ~c;
-        int    t2 = b & t1;
-        int    t3 = d ^ t2;
-        int    t4 = a & t3;
-        int    t5 = b ^ t1;
-        X3 = t4 ^ t5;
-        int    t7 = b | X3;
-        int    t8 = a & t7;
-        X1 = t3 ^ t8;
-        int    t10 = a | d;
-        int    t11 = t1 ^ t7;
-        X0 = t10 ^ t11;
-        X2 = (b & t10) ^ (t4 | (a ^ c));
-    }
-
-    /**
-     * S6 - { 7, 2,12, 5, 8, 4, 6,11,14, 9, 1,15,13, 3,10, 0 } - 15 terms.
-     */
-    private void sb6(int a, int b, int c, int d)    
-    {
-        int    t1 = ~a;        
-        int    t2 = a ^ d;        
-        int    t3 = b ^ t2;    
-        int    t4 = t1 | t2;    
-        int    t5 = c ^ t4;    
-        X1 = b ^ t5;        
-        int    t7 = t2 | X1;    
-        int    t8 = d ^ t7;    
-        int    t9 = t5 & t8;    
-        X2 = t3 ^ t9;    
-        int    t11 = t5 ^ t8;    
-        X0 = X2 ^ t11;    
-        X3 = (~t5) ^ (t3 & t11);
-    }
-
-    /**
-     * InvS6 - {15,10, 1,13, 5, 3, 6, 0, 4, 9,14, 7, 2,12, 8,11 } - 15 terms.
-     */
-    private void ib6(int a, int b, int c, int d)    
-    {
-        int    t1 = ~a;        
-        int    t2 = a ^ b;        
-        int    t3 = c ^ t2;    
-        int    t4 = c | t1;    
-        int    t5 = d ^ t4;    
-        X1 = t3 ^ t5;    
-        int    t7 = t3 & t5;    
-        int    t8 = t2 ^ t7;    
-        int    t9 = b | t8;    
-        X3 = t5 ^ t9;    
-        int    t11 = b | X3;    
-        X0 = t8 ^ t11;    
-        X2 = (d & t1) ^ (t3 ^ t11);
-    }
-
-    /**
-     * S7 - { 1,13,15, 0,14, 8, 2,11, 7, 4,12,10, 9, 3, 5, 6 } - 16 terms.
-     */
-    private void sb7(int a, int b, int c, int d)    
-    {
-        int    t1 = b ^ c;        
-        int    t2 = c & t1;    
-        int    t3 = d ^ t2;    
-        int    t4 = a ^ t3;    
-        int    t5 = d | t1;    
-        int    t6 = t4 & t5;    
-        X1 = b ^ t6;        
-        int    t8 = t3 | X1;    
-        int    t9 = a & t4;    
-        X3 = t1 ^ t9;    
-        int    t11 = t4 ^ t8;    
-        int    t12 = X3 & t11;    
-        X2 = t3 ^ t12;    
-        X0 = (~t11) ^ (X3 & X2);
-    }
-
-    /**
-     * InvS7 - { 3, 0, 6,13, 9,14,15, 8, 5,12,11, 7,10, 1, 4, 2 } - 17 terms.
-     */
-    private void ib7(int a, int b, int c, int d)    
-    {
-        int t3 = c | (a & b);
-        int    t4 = d & (a | b);
-        X3 = t3 ^ t4;
-        int    t6 = ~d;
-        int    t7 = b ^ t4;
-        int    t9 = t7 | (X3 ^ t6);
-        X1 = a ^ t9;
-        X0 = (c ^ t7) ^ (d | X1);
-        X2 = (t3 ^ X1) ^ (X0 ^ (a & X3));
-    }
-
-    /**
-     * Apply the linear transformation to the register set.
-     */
-    private void LT()
-    {
-        int x0  = rotateLeft(X0, 13);
-        int x2  = rotateLeft(X2, 3);
-        int x1  = X1 ^ x0 ^ x2 ;
-        int x3  = X3 ^ x2 ^ x0 << 3;
-
-        X1  = rotateLeft(x1, 1);
-        X3  = rotateLeft(x3, 7);
-        X0  = rotateLeft(x0 ^ X1 ^ X3, 5);
-        X2  = rotateLeft(x2 ^ X3 ^ (X1 << 7), 22);
-    }
-
-    /**
-     * Apply the inverse of the linear transformation to the register set.
-     */
-    private void inverseLT()
-    {
-        int x2 = rotateRight(X2, 22) ^ X3 ^ (X1 << 7);
-        int x0 = rotateRight(X0, 5) ^ X1 ^ X3;
-        int x3 = rotateRight(X3, 7);
-        int x1 = rotateRight(X1, 1);
-        X3 = x3 ^ x2 ^ x0 << 3;
-        X1 = x1 ^ x0 ^ x2;
-        X2 = rotateRight(x2, 3);
-        X0 = rotateRight(x0, 13);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/engines/Shacal2Engine.java b/bcprov/src/main/java/org/bouncycastle/crypto/engines/Shacal2Engine.java
deleted file mode 100644
index 62e0510..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/engines/Shacal2Engine.java
+++ /dev/null
@@ -1,213 +0,0 @@
-package org.bouncycastle.crypto.engines;
-
-import org.bouncycastle.crypto.BlockCipher;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.DataLengthException;
-import org.bouncycastle.crypto.OutputLengthException;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.util.encoders.Hex;
-
-/**
- * Block cipher Shacal2, designed by Helena Handschuh and David Naccache,
- * based on hash function SHA-256,
- * using SHA-256-Initialization-Values as data and SHA-256-Data as key.
- * <p>
- * A description of Shacal can be found at:
- *    http://citeseerx.ist.psu.edu/viewdoc/summary?doi=10.1.1.3.4066
- * Best known cryptanalytic (Wikipedia 11.2013):
- *    Related-key rectangle attack on 44-rounds (Jiqiang Lu, Jongsung Kim).
- * Comments are related to SHA-256-Naming as described in FIPS PUB 180-2
- * </p>
- */
-public class Shacal2Engine 
-	implements BlockCipher 
-{
-	private final static int[] K = { // SHA-256-Constants
-			0x428a2f98, 0x71374491, 0xb5c0fbcf, 0xe9b5dba5, 0x3956c25b, 0x59f111f1, 0x923f82a4, 0xab1c5ed5, 
-			0xd807aa98, 0x12835b01, 0x243185be, 0x550c7dc3, 0x72be5d74, 0x80deb1fe, 0x9bdc06a7, 0xc19bf174, 
-			0xe49b69c1, 0xefbe4786, 0x0fc19dc6, 0x240ca1cc, 0x2de92c6f, 0x4a7484aa, 0x5cb0a9dc, 0x76f988da, 
-			0x983e5152,	0xa831c66d, 0xb00327c8, 0xbf597fc7, 0xc6e00bf3, 0xd5a79147, 0x06ca6351, 0x14292967, 
-			0x27b70a85, 0x2e1b2138, 0x4d2c6dfc,	0x53380d13, 0x650a7354, 0x766a0abb, 0x81c2c92e, 0x92722c85, 
-			0xa2bfe8a1, 0xa81a664b, 0xc24b8b70, 0xc76c51a3, 0xd192e819, 0xd6990624, 0xf40e3585, 0x106aa070, 
-			0x19a4c116, 0x1e376c08, 0x2748774c, 0x34b0bcb5, 0x391c0cb3, 0x4ed8aa4a, 0x5b9cca4f, 0x682e6ff3, 
-			0x748f82ee, 0x78a5636f, 0x84c87814, 0x8cc70208,	0x90befffa, 0xa4506ceb, 0xbef9a3f7, 0xc67178f2 
-	}; 
-	
-	private static final int BLOCK_SIZE = 32;
-	private boolean forEncryption = false;
-	private static final int ROUNDS = 64;
-	
-	private int[] workingKey = null; // expanded key: corresponds to the message block W in FIPS PUB 180-2
-	
-	public Shacal2Engine()
-	{		
-	}
-	
-	public void reset()
-	{
-	}
-	
-	public String getAlgorithmName()
-	{
-		return "Shacal2";
-	}
-
-	public int getBlockSize()
-	{
-	    return BLOCK_SIZE;
-	}
-
-	public void init(boolean _forEncryption, CipherParameters  params)
-		throws IllegalArgumentException
-	{
-		if (!(params instanceof KeyParameter))
-		{
-			throw new IllegalArgumentException("only simple KeyParameter expected.");
-		}
-		this.forEncryption = _forEncryption;
-		workingKey = new int[64];
-		setKey( ((KeyParameter)params).getKey() );
-	}
-
-	public void setKey(byte[] kb) 
-	{
-		if (kb.length == 0 || kb.length > 64 || kb.length < 16 || kb.length % 8 != 0)
-		{
-			throw new IllegalArgumentException("Shacal2-key must be 16 - 64 bytes and multiple of 8");
-		}
-
-		bytes2ints(kb, workingKey, 0, 0);
-
-		for ( int i = 16; i < 64; i++) 
-		{ // Key-Expansion, implicitly Zero-Padding for 16 > i > kb.length/4
-			workingKey[i] = 
-									( (workingKey[i-2] >>> 17 | workingKey[i-2] << -17) // corresponds to ROTL n(x) of FIPS PUB 180-2
-										^ (workingKey[i-2] >>> 19 | workingKey[i-2] << -19)
-										^ (workingKey[i-2] >>> 10) ) // corresponds to sigma1(x)-Function of FIPS PUB 180-2	    	  
-									+ workingKey[i-7] 		    				
-									+ ( (workingKey[i-15] >>> 7 | workingKey[i-15] << -7) 
-										^ (workingKey[i-15] >>> 18 | workingKey[i-15] << -18) 
-										^ (workingKey[i-15] >>> 3) ) // corresponds to sigma0(x)-Function of FIPS PUB 180-2	    
-									+ workingKey[i-16];
-		}
-	}
-	
-	private void encryptBlock(byte[] in, int inOffset, byte[] out, int outOffset)
-	{
-		int[] block = new int[BLOCK_SIZE / 4];// corresponds to working variables a,b,c,d,e,f,g,h of FIPS PUB 180-2
-		byteBlockToInts(in, block, inOffset, 0);
-		
-		for (int i = 0; i < ROUNDS; i++) 
-		{			
-			int tmp =
-                (((block[4] >>> 6) | (block[4] << -6))
-                    ^ ((block[4] >>> 11) | (block[4] << -11))
-                    ^ ((block[4] >>> 25) | (block[4] << -25)))
-                    + ((block[4] & block[5]) ^ ((~block[4]) & block[6]))
-                    + block[7] + K[i] + workingKey[i];  // corresponds to T1 of FIPS PUB 180-2
-			block[7] = block[6];
-			block[6] = block[5];
-			block[5] = block[4];			
-			block[4] = block[3] + tmp;
-			block[3] = block[2];
-			block[2] = block[1];
-			block[1] = block[0];
-			block[0] = tmp
-                + (((block[0] >>> 2) | (block[0] << -2))
-                ^ ((block[0] >>> 13) | (block[0] << -13))
-                ^ ((block[0] >>> 22) | (block[0] << -22)))
-                + ((block[0] & block[2]) ^ (block[0] & block[3]) ^ (block[2] & block[3]));
-			//corresponds to T2 of FIPS PUB 180-2, block[1] and block[2] replaced
-		}		
-		ints2bytes(block, out, outOffset);
-	}
-	
-	private void decryptBlock(byte[] in, int inOffset, byte[] out, int outOffset)
-	{
-		int[] block = new int[BLOCK_SIZE / 4];
-		byteBlockToInts(in, block, inOffset, 0);
-		for (int i = ROUNDS - 1; i >-1; i--) 
-		{
-            int tmp = block[0] - (((block[1] >>> 2) | (block[1] << -2))
-                ^ ((block[1] >>> 13) | (block[1] << -13))
-                ^ ((block[1] >>> 22) | (block[1] << -22)))
-                - ((block[1] & block[2]) ^ (block[1] & block[3]) ^ (block[2] & block[3]));    // T2
-            block[0] = block[1];
-            block[1] = block[2];
-            block[2] = block[3];
-            block[3] = block[4] - tmp;
-            block[4] = block[5];
-            block[5] = block[6];
-            block[6] = block[7];
-            block[7] = tmp - K[i] - workingKey[i]
-                - (((block[4] >>> 6) | (block[4] << -6))
-                ^ ((block[4] >>> 11) | (block[4] << -11))
-                ^ ((block[4] >>> 25) | (block[4] << -25)))
-                - ((block[4] & block[5]) ^ ((~block[4]) & block[6])); // T1
-        }
-		ints2bytes(block, out, outOffset);
-	}
-
-	public int processBlock(byte[] in, int inOffset, byte[] out, int outOffset)	    
-			throws DataLengthException, IllegalStateException 
-	{
-		if (workingKey == null)
-		{
-			throw new IllegalStateException("Shacal2 not initialised");
-		}
-
-		if ((inOffset + BLOCK_SIZE) > in.length)
-		{
-			throw new DataLengthException("input buffer too short");
-		}
-
-		if ((outOffset + BLOCK_SIZE) > out.length)
-		{
-			throw new OutputLengthException("output buffer too short");
-		}
-
-		if (forEncryption)
-		{
-			encryptBlock(in, inOffset, out, outOffset);
-		}
-		else
-		{    
-			decryptBlock(in, inOffset, out, outOffset);
-		}
-
-		return BLOCK_SIZE;
-	}
-
-    private void byteBlockToInts(byte[] bytes, int[] block, int bytesPos, int blockPos)
-    {
-        for (int i = blockPos; i <  BLOCK_SIZE / 4; i++)
-        {
-            block[i] = ((bytes[bytesPos++] & 0xFF) << 24)
-                | ((bytes[bytesPos++] & 0xFF) << 16)
-                | ((bytes[bytesPos++] & 0xFF) << 8)
-                | (bytes[bytesPos++] & 0xFF);
-        }
-    }
-
-    private void bytes2ints(byte[] bytes, int[] block, int bytesPos, int blockPos)
-    {
-        for (int i = blockPos; i < bytes.length / 4; i++)
-        {
-            block[i] = ((bytes[bytesPos++] & 0xFF) << 24)
-                | ((bytes[bytesPos++] & 0xFF) << 16)
-                | ((bytes[bytesPos++] & 0xFF) << 8)
-                | (bytes[bytesPos++] & 0xFF);
-        }
-    }
-
-    private void ints2bytes(int[] block, byte[] out, int pos)
-    {
-        for (int i = 0; i < block.length; i++)
-        {
-            out[pos++] = (byte)(block[i] >>> 24);
-            out[pos++] = (byte)(block[i] >>> 16);
-            out[pos++] = (byte)(block[i] >>> 8);
-            out[pos++] = (byte)block[i];
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/engines/SkipjackEngine.java b/bcprov/src/main/java/org/bouncycastle/crypto/engines/SkipjackEngine.java
deleted file mode 100644
index 1fac536..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/engines/SkipjackEngine.java
+++ /dev/null
@@ -1,260 +0,0 @@
-package org.bouncycastle.crypto.engines;
-
-import org.bouncycastle.crypto.BlockCipher;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.DataLengthException;
-import org.bouncycastle.crypto.OutputLengthException;
-import org.bouncycastle.crypto.params.KeyParameter;
-
-/**
- * a class that provides a basic SKIPJACK engine.
- */
-public class SkipjackEngine
-    implements BlockCipher
-{
-    static final int BLOCK_SIZE = 8;
-
-    static short ftable[] =
-    { 
-        0xa3, 0xd7, 0x09, 0x83, 0xf8, 0x48, 0xf6, 0xf4, 0xb3, 0x21, 0x15, 0x78, 0x99, 0xb1, 0xaf, 0xf9, 
-        0xe7, 0x2d, 0x4d, 0x8a, 0xce, 0x4c, 0xca, 0x2e, 0x52, 0x95, 0xd9, 0x1e, 0x4e, 0x38, 0x44, 0x28, 
-        0x0a, 0xdf, 0x02, 0xa0, 0x17, 0xf1, 0x60, 0x68, 0x12, 0xb7, 0x7a, 0xc3, 0xe9, 0xfa, 0x3d, 0x53, 
-        0x96, 0x84, 0x6b, 0xba, 0xf2, 0x63, 0x9a, 0x19, 0x7c, 0xae, 0xe5, 0xf5, 0xf7, 0x16, 0x6a, 0xa2, 
-        0x39, 0xb6, 0x7b, 0x0f, 0xc1, 0x93, 0x81, 0x1b, 0xee, 0xb4, 0x1a, 0xea, 0xd0, 0x91, 0x2f, 0xb8, 
-        0x55, 0xb9, 0xda, 0x85, 0x3f, 0x41, 0xbf, 0xe0, 0x5a, 0x58, 0x80, 0x5f, 0x66, 0x0b, 0xd8, 0x90, 
-        0x35, 0xd5, 0xc0, 0xa7, 0x33, 0x06, 0x65, 0x69, 0x45, 0x00, 0x94, 0x56, 0x6d, 0x98, 0x9b, 0x76, 
-        0x97, 0xfc, 0xb2, 0xc2, 0xb0, 0xfe, 0xdb, 0x20, 0xe1, 0xeb, 0xd6, 0xe4, 0xdd, 0x47, 0x4a, 0x1d, 
-        0x42, 0xed, 0x9e, 0x6e, 0x49, 0x3c, 0xcd, 0x43, 0x27, 0xd2, 0x07, 0xd4, 0xde, 0xc7, 0x67, 0x18, 
-        0x89, 0xcb, 0x30, 0x1f, 0x8d, 0xc6, 0x8f, 0xaa, 0xc8, 0x74, 0xdc, 0xc9, 0x5d, 0x5c, 0x31, 0xa4, 
-        0x70, 0x88, 0x61, 0x2c, 0x9f, 0x0d, 0x2b, 0x87, 0x50, 0x82, 0x54, 0x64, 0x26, 0x7d, 0x03, 0x40, 
-        0x34, 0x4b, 0x1c, 0x73, 0xd1, 0xc4, 0xfd, 0x3b, 0xcc, 0xfb, 0x7f, 0xab, 0xe6, 0x3e, 0x5b, 0xa5, 
-        0xad, 0x04, 0x23, 0x9c, 0x14, 0x51, 0x22, 0xf0, 0x29, 0x79, 0x71, 0x7e, 0xff, 0x8c, 0x0e, 0xe2, 
-        0x0c, 0xef, 0xbc, 0x72, 0x75, 0x6f, 0x37, 0xa1, 0xec, 0xd3, 0x8e, 0x62, 0x8b, 0x86, 0x10, 0xe8, 
-        0x08, 0x77, 0x11, 0xbe, 0x92, 0x4f, 0x24, 0xc5, 0x32, 0x36, 0x9d, 0xcf, 0xf3, 0xa6, 0xbb, 0xac, 
-        0x5e, 0x6c, 0xa9, 0x13, 0x57, 0x25, 0xb5, 0xe3, 0xbd, 0xa8, 0x3a, 0x01, 0x05, 0x59, 0x2a, 0x46
-    };
-
-    private int[]       key0, key1, key2, key3;
-    private boolean     encrypting;
-
-    /**
-     * initialise a SKIPJACK cipher.
-     *
-     * @param encrypting whether or not we are for encryption.
-     * @param params the parameters required to set up the cipher.
-     * @exception IllegalArgumentException if the params argument is
-     * inappropriate.
-     */
-    public void init(
-        boolean           encrypting,
-        CipherParameters  params)
-    {
-        if (!(params instanceof KeyParameter))
-        {
-        throw new IllegalArgumentException("invalid parameter passed to SKIPJACK init - " + params.getClass().getName());
-        }
-
-        byte[] keyBytes = ((KeyParameter)params).getKey();
-
-        this.encrypting = encrypting;
-        this.key0 = new int[32];
-        this.key1 = new int[32];
-        this.key2 = new int[32];
-        this.key3 = new int[32];
-
-        //
-        // expand the key to 128 bytes in 4 parts (saving us a modulo, multiply
-        // and an addition).
-        //
-        for (int i = 0; i < 32; i ++)
-        {
-            key0[i] = keyBytes[(i * 4) % 10] & 0xff;
-            key1[i] = keyBytes[(i * 4 + 1) % 10] & 0xff;
-            key2[i] = keyBytes[(i * 4 + 2) % 10] & 0xff;
-            key3[i] = keyBytes[(i * 4 + 3) % 10] & 0xff;
-        }
-    }
-
-    public String getAlgorithmName()
-    {
-        return "SKIPJACK";
-    }
-
-    public int getBlockSize()
-    {
-        return BLOCK_SIZE;
-    }
-
-    public int processBlock(
-        byte[] in,
-        int inOff,
-        byte[] out,
-        int outOff)
-    {
-        if (key1 == null)
-        {
-            throw new IllegalStateException("SKIPJACK engine not initialised");
-        }
-
-        if ((inOff + BLOCK_SIZE) > in.length)
-        {
-            throw new DataLengthException("input buffer too short");
-        }
-
-        if ((outOff + BLOCK_SIZE) > out.length)
-        {
-            throw new OutputLengthException("output buffer too short");
-        }
-
-        if (encrypting)
-        {
-            encryptBlock(in, inOff, out, outOff);
-        }
-        else
-        {
-            decryptBlock(in, inOff, out, outOff);
-        }
-
-        return BLOCK_SIZE;
-    }
-
-    public void reset()
-    {
-    }
-
-    /**
-     * The G permutation
-     */
-    private int g(
-        int     k,
-        int     w)
-    {
-        int g1, g2, g3, g4, g5, g6;
-
-        g1 = (w >> 8) & 0xff;
-        g2 = w & 0xff;
-
-        g3 = ftable[g2 ^ key0[k]] ^ g1;
-        g4 = ftable[g3 ^ key1[k]] ^ g2;
-        g5 = ftable[g4 ^ key2[k]] ^ g3;
-        g6 = ftable[g5 ^ key3[k]] ^ g4;
-
-        return ((g5 << 8) + g6);
-    }
-
-    public int encryptBlock(
-        byte[]      in,
-        int         inOff,
-        byte[]      out,
-        int         outOff)
-    {
-        int w1 = (in[inOff + 0] << 8) + (in[inOff + 1] & 0xff);
-        int w2 = (in[inOff + 2] << 8) + (in[inOff + 3] & 0xff);
-        int w3 = (in[inOff + 4] << 8) + (in[inOff + 5] & 0xff);
-        int w4 = (in[inOff + 6] << 8) + (in[inOff + 7] & 0xff);
-
-        int k = 0;
-
-        for (int t = 0; t < 2; t++)
-        {
-            for(int i = 0; i < 8; i++)
-            {
-                int tmp = w4;
-                w4 = w3;
-                w3 = w2;
-                w2 = g(k, w1);
-                w1 = w2 ^ tmp ^ (k + 1);
-                k++;
-            }
-
-            for(int i = 0; i < 8; i++)
-            {
-                int tmp = w4;
-                w4 = w3;
-                w3 = w1 ^ w2 ^ (k + 1);
-                w2 = g(k, w1);
-                w1 = tmp;
-                k++;
-            }
-        }
-
-        out[outOff + 0] = (byte)((w1 >> 8));
-        out[outOff + 1] = (byte)(w1);
-        out[outOff + 2] = (byte)((w2 >> 8));
-        out[outOff + 3] = (byte)(w2);
-        out[outOff + 4] = (byte)((w3 >> 8));
-        out[outOff + 5] = (byte)(w3);
-        out[outOff + 6] = (byte)((w4 >> 8));
-        out[outOff + 7] = (byte)(w4);
-
-        return BLOCK_SIZE;
-    }
-
-    /**
-     * the inverse of the G permutation.
-     */
-    private int h(
-        int     k,
-        int     w)
-    {
-        int h1, h2, h3, h4, h5, h6;
-
-        h1 = w & 0xff;
-        h2 = (w >> 8) & 0xff;
-
-        h3 = ftable[h2 ^ key3[k]] ^ h1;
-        h4 = ftable[h3 ^ key2[k]] ^ h2;
-        h5 = ftable[h4 ^ key1[k]] ^ h3;
-        h6 = ftable[h5 ^ key0[k]] ^ h4;
-
-        return ((h6 << 8) + h5);
-    }
-
-    public int decryptBlock(
-        byte[]      in,
-        int         inOff,
-        byte[]      out,
-        int         outOff)
-    {
-        int w2 = (in[inOff + 0] << 8) + (in[inOff + 1] & 0xff);
-        int w1 = (in[inOff + 2] << 8) + (in[inOff + 3] & 0xff);
-        int w4 = (in[inOff + 4] << 8) + (in[inOff + 5] & 0xff);
-        int w3 = (in[inOff + 6] << 8) + (in[inOff + 7] & 0xff);
-
-        int k = 31;
-
-        for (int t = 0; t < 2; t++)
-        {
-            for(int i = 0; i < 8; i++)
-            {
-                int tmp = w4;
-                w4 = w3;
-                w3 = w2;
-                w2 = h(k, w1);
-                w1 = w2 ^ tmp ^ (k + 1);
-                k--;
-            }
-
-            for(int i = 0; i < 8; i++)
-            {
-                int tmp = w4;
-                w4 = w3;
-                w3 = w1 ^ w2 ^ (k + 1);
-                w2 = h(k, w1);
-                w1 = tmp;
-                k--;
-            }
-        }
-
-        out[outOff + 0] = (byte)((w2 >> 8));
-        out[outOff + 1] = (byte)(w2);
-        out[outOff + 2] = (byte)((w1 >> 8));
-        out[outOff + 3] = (byte)(w1);
-        out[outOff + 4] = (byte)((w4 >> 8));
-        out[outOff + 5] = (byte)(w4);
-        out[outOff + 6] = (byte)((w3 >> 8));
-        out[outOff + 7] = (byte)(w3);
-
-        return BLOCK_SIZE;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/engines/TEAEngine.java b/bcprov/src/main/java/org/bouncycastle/crypto/engines/TEAEngine.java
deleted file mode 100644
index ac65443..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/engines/TEAEngine.java
+++ /dev/null
@@ -1,184 +0,0 @@
-package org.bouncycastle.crypto.engines;
-
-import org.bouncycastle.crypto.BlockCipher;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.DataLengthException;
-import org.bouncycastle.crypto.OutputLengthException;
-import org.bouncycastle.crypto.params.KeyParameter;
-
-/**
- * An TEA engine.
- */
-public class TEAEngine
-    implements BlockCipher
-{
-    private static final int rounds     = 32,
-                             block_size = 8,
-//                             key_size   = 16,
-                             delta      = 0x9E3779B9,
-                             d_sum      = 0xC6EF3720; // sum on decrypt
-    /*
-     * the expanded key array of 4 subkeys
-     */
-    private int _a, _b, _c, _d;
-    private boolean _initialised;
-    private boolean _forEncryption;
-
-    /**
-     * Create an instance of the TEA encryption algorithm
-     * and set some defaults
-     */
-    public TEAEngine()
-    {
-        _initialised = false;
-    }
-
-    public String getAlgorithmName()
-    {
-        return "TEA";
-    }
-
-    public int getBlockSize()
-    {
-        return block_size;
-    }
-
-    /**
-     * initialise
-     *
-     * @param forEncryption whether or not we are for encryption.
-     * @param params the parameters required to set up the cipher.
-     * @exception IllegalArgumentException if the params argument is
-     * inappropriate.
-     */
-    public void init(
-        boolean             forEncryption,
-        CipherParameters    params)
-    {
-        if (!(params instanceof KeyParameter))
-        {
-            throw new IllegalArgumentException("invalid parameter passed to TEA init - " + params.getClass().getName());
-        }
-
-        _forEncryption = forEncryption;
-        _initialised = true;
-
-        KeyParameter       p = (KeyParameter)params;
-
-        setKey(p.getKey());
-    }
-
-    public int processBlock(
-        byte[]  in,
-        int     inOff,
-        byte[]  out,
-        int     outOff)
-    {
-        if (!_initialised)
-        {
-            throw new IllegalStateException(getAlgorithmName()+" not initialised");
-        }
-        
-        if ((inOff + block_size) > in.length)
-        {
-            throw new DataLengthException("input buffer too short");
-        }
-        
-        if ((outOff + block_size) > out.length)
-        {
-            throw new OutputLengthException("output buffer too short");
-        }
-        
-        return (_forEncryption) ? encryptBlock(in, inOff, out, outOff)
-                                    : decryptBlock(in, inOff, out, outOff);
-    }
-
-    public void reset()
-    {
-    }
-
-    /**
-     * Re-key the cipher.
-     * <p>
-     * @param  key  the key to be used
-     */
-    private void setKey(
-        byte[]      key)
-    {
-        if (key.length != 16) 
-        {
-            throw new IllegalArgumentException("Key size must be 128 bits.");
-        }
-
-        _a = bytesToInt(key, 0);
-        _b = bytesToInt(key, 4);
-        _c = bytesToInt(key, 8);
-        _d = bytesToInt(key, 12);
-    }
-
-    private int encryptBlock(
-        byte[]  in,
-        int     inOff,
-        byte[]  out,
-        int     outOff)
-    {
-        // Pack bytes into integers
-        int v0 = bytesToInt(in, inOff);
-        int v1 = bytesToInt(in, inOff + 4);
-        
-        int sum = 0;
-        
-        for (int i = 0; i != rounds; i++)
-        {
-            sum += delta;
-            v0  += ((v1 << 4) + _a) ^ (v1 + sum) ^ ((v1 >>> 5) + _b);
-            v1  += ((v0 << 4) + _c) ^ (v0 + sum) ^ ((v0 >>> 5) + _d);
-        }
-
-        unpackInt(v0, out, outOff);
-        unpackInt(v1, out, outOff + 4);
-        
-        return block_size;
-    }
-
-    private int decryptBlock(
-        byte[]  in,
-        int     inOff,
-        byte[]  out,
-        int     outOff)
-    {
-        // Pack bytes into integers
-        int v0 = bytesToInt(in, inOff);
-        int v1 = bytesToInt(in, inOff + 4);
-        
-        int sum = d_sum;
-        
-        for (int i = 0; i != rounds; i++)
-        {
-            v1  -= ((v0 << 4) + _c) ^ (v0 + sum) ^ ((v0 >>> 5) + _d);
-            v0  -= ((v1 << 4) + _a) ^ (v1 + sum) ^ ((v1 >>> 5) + _b);
-            sum -= delta;
-        }
-        
-        unpackInt(v0, out, outOff);
-        unpackInt(v1, out, outOff + 4);
-        
-        return block_size;
-    }
-
-    private int bytesToInt(byte[] in, int inOff)
-    {
-        return ((in[inOff++]) << 24) |
-                 ((in[inOff++] & 255) << 16) |
-                 ((in[inOff++] & 255) <<  8) |
-                 ((in[inOff] & 255));
-    }
-
-    private void unpackInt(int v, byte[] out, int outOff)
-    {
-        out[outOff++] = (byte)(v >>> 24);
-        out[outOff++] = (byte)(v >>> 16);
-        out[outOff++] = (byte)(v >>>  8);
-        out[outOff  ] = (byte)v;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/engines/ThreefishEngine.java b/bcprov/src/main/java/org/bouncycastle/crypto/engines/ThreefishEngine.java
deleted file mode 100644
index 3366022..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/engines/ThreefishEngine.java
+++ /dev/null
@@ -1,1494 +0,0 @@
-package org.bouncycastle.crypto.engines;
-
-import org.bouncycastle.crypto.BlockCipher;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.DataLengthException;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.crypto.params.TweakableBlockCipherParameters;
-
-/**
- * Implementation of the Threefish tweakable large block cipher in 256, 512 and 1024 bit block
- * sizes.
- * <p>
- * This is the 1.3 version of Threefish defined in the Skein hash function submission to the NIST
- * SHA-3 competition in October 2010.
- * <p>
- * Threefish was designed by Niels Ferguson - Stefan Lucks - Bruce Schneier - Doug Whiting - Mihir
- * Bellare - Tadayoshi Kohno - Jon Callas - Jesse Walker.
- * <p>
- * This implementation inlines all round functions, unrolls 8 rounds, and uses 1.2k of static tables
- * to speed up key schedule injection. <br>
- * 2 x block size state is retained by each cipher instance.
- */
-public class ThreefishEngine
-    implements BlockCipher
-{
-    /**
-     * 256 bit block size - Threefish-256
-     */
-    public static final int BLOCKSIZE_256 = 256;
-    /**
-     * 512 bit block size - Threefish-512
-     */
-    public static final int BLOCKSIZE_512 = 512;
-    /**
-     * 1024 bit block size - Threefish-1024
-     */
-    public static final int BLOCKSIZE_1024 = 1024;
-
-    /**
-     * Size of the tweak in bytes (always 128 bit/16 bytes)
-     */
-    private static final int TWEAK_SIZE_BYTES = 16;
-    private static final int TWEAK_SIZE_WORDS = TWEAK_SIZE_BYTES / 8;
-
-    /**
-     * Rounds in Threefish-256
-     */
-    private static final int ROUNDS_256 = 72;
-    /**
-     * Rounds in Threefish-512
-     */
-    private static final int ROUNDS_512 = 72;
-    /**
-     * Rounds in Threefish-1024
-     */
-    private static final int ROUNDS_1024 = 80;
-
-    /**
-     * Max rounds of any of the variants
-     */
-    private static final int MAX_ROUNDS = ROUNDS_1024;
-
-    /**
-     * Key schedule parity constant
-     */
-    private static final long C_240 = 0x1BD11BDAA9FC1A22L;
-
-    /* Pre-calculated modulo arithmetic tables for key schedule lookups */
-    private static int[] MOD9 = new int[MAX_ROUNDS];
-    private static int[] MOD17 = new int[MOD9.length];
-    private static int[] MOD5 = new int[MOD9.length];
-    private static int[] MOD3 = new int[MOD9.length];
-
-    static
-    {
-        for (int i = 0; i < MOD9.length; i++)
-        {
-            MOD17[i] = i % 17;
-            MOD9[i] = i % 9;
-            MOD5[i] = i % 5;
-            MOD3[i] = i % 3;
-        }
-    }
-
-    /**
-     * Block size in bytes
-     */
-    private int blocksizeBytes;
-
-    /**
-     * Block size in 64 bit words
-     */
-    private int blocksizeWords;
-
-    /**
-     * Buffer for byte oriented processBytes to call internal word API
-     */
-    private long[] currentBlock;
-
-    /**
-     * Tweak bytes (2 byte t1,t2, calculated t3 and repeat of t1,t2 for modulo free lookup
-     */
-    private long[] t = new long[5];
-
-    /**
-     * Key schedule words
-     */
-    private long[] kw;
-
-    /**
-     * The internal cipher implementation (varies by blocksize)
-     */
-    private ThreefishCipher cipher;
-
-    private boolean forEncryption;
-
-    /**
-     * Constructs a new Threefish cipher, with a specified block size.
-     *
-     * @param blocksizeBits the block size in bits, one of {@link #BLOCKSIZE_256}, {@link #BLOCKSIZE_512},
-     *                      {@link #BLOCKSIZE_1024}.
-     */
-    public ThreefishEngine(final int blocksizeBits)
-    {
-        this.blocksizeBytes = (blocksizeBits / 8);
-        this.blocksizeWords = (this.blocksizeBytes / 8);
-        this.currentBlock = new long[blocksizeWords];
-
-        /*
-         * Provide room for original key words, extended key word and repeat of key words for modulo
-         * free lookup of key schedule words.
-         */
-        this.kw = new long[2 * blocksizeWords + 1];
-
-        switch (blocksizeBits)
-        {
-        case BLOCKSIZE_256:
-            cipher = new Threefish256Cipher(kw, t);
-            break;
-        case BLOCKSIZE_512:
-            cipher = new Threefish512Cipher(kw, t);
-            break;
-        case BLOCKSIZE_1024:
-            cipher = new Threefish1024Cipher(kw, t);
-            break;
-        default:
-            throw new IllegalArgumentException(
-                "Invalid blocksize - Threefish is defined with block size of 256, 512, or 1024 bits");
-        }
-    }
-
-    /**
-     * Initialise the engine.
-     *
-     * @param params an instance of {@link TweakableBlockCipherParameters}, or {@link KeyParameter} (to
-     *               use a 0 tweak)
-     */
-    public void init(boolean forEncryption, CipherParameters params)
-        throws IllegalArgumentException
-    {
-        final byte[] keyBytes;
-        final byte[] tweakBytes;
-
-        if (params instanceof TweakableBlockCipherParameters)
-        {
-            TweakableBlockCipherParameters tParams = (TweakableBlockCipherParameters)params;
-            keyBytes = tParams.getKey().getKey();
-            tweakBytes = tParams.getTweak();
-        }
-        else if (params instanceof KeyParameter)
-        {
-            keyBytes = ((KeyParameter)params).getKey();
-            tweakBytes = null;
-        }
-        else
-        {
-            throw new IllegalArgumentException("Invalid parameter passed to Threefish init - "
-                + params.getClass().getName());
-        }
-
-        long[] keyWords = null;
-        long[] tweakWords = null;
-
-        if (keyBytes != null)
-        {
-            if (keyBytes.length != this.blocksizeBytes)
-            {
-                throw new IllegalArgumentException("Threefish key must be same size as block (" + blocksizeBytes
-                    + " bytes)");
-            }
-            keyWords = new long[blocksizeWords];
-            for (int i = 0; i < keyWords.length; i++)
-            {
-                keyWords[i] = bytesToWord(keyBytes, i * 8);
-            }
-        }
-        if (tweakBytes != null)
-        {
-            if (tweakBytes.length != TWEAK_SIZE_BYTES)
-            {
-                throw new IllegalArgumentException("Threefish tweak must be " + TWEAK_SIZE_BYTES + " bytes");
-            }
-            tweakWords = new long[]{bytesToWord(tweakBytes, 0), bytesToWord(tweakBytes, 8)};
-        }
-        init(forEncryption, keyWords, tweakWords);
-    }
-
-    /**
-     * Initialise the engine, specifying the key and tweak directly.
-     *
-     * @param forEncryption the cipher mode.
-     * @param key           the words of the key, or <code>null</code> to use the current key.
-     * @param tweak         the 2 word (128 bit) tweak, or <code>null</code> to use the current tweak.
-     */
-    public void init(boolean forEncryption, final long[] key, final long[] tweak)
-    {
-        this.forEncryption = forEncryption;
-        if (key != null)
-        {
-            setKey(key);
-        }
-        if (tweak != null)
-        {
-            setTweak(tweak);
-        }
-    }
-
-    private void setKey(long[] key)
-    {
-        if (key.length != this.blocksizeWords)
-        {
-            throw new IllegalArgumentException("Threefish key must be same size as block (" + blocksizeWords
-                + " words)");
-        }
-
-        /*
-         * Full subkey schedule is deferred to execution to avoid per cipher overhead (10k for 512,
-         * 20k for 1024).
-         * 
-         * Key and tweak word sequences are repeated, and static MOD17/MOD9/MOD5/MOD3 calculations
-         * used, to avoid expensive mod computations during cipher operation.
-         */
-
-        long knw = C_240;
-        for (int i = 0; i < blocksizeWords; i++)
-        {
-            kw[i] = key[i];
-            knw = knw ^ kw[i];
-        }
-        kw[blocksizeWords] = knw;
-        System.arraycopy(kw, 0, kw, blocksizeWords + 1, blocksizeWords);
-    }
-
-    private void setTweak(long[] tweak)
-    {
-        if (tweak.length != TWEAK_SIZE_WORDS)
-        {
-            throw new IllegalArgumentException("Tweak must be " + TWEAK_SIZE_WORDS + " words.");
-        }
-
-        /*
-         * Tweak schedule partially repeated to avoid mod computations during cipher operation
-         */
-        t[0] = tweak[0];
-        t[1] = tweak[1];
-        t[2] = t[0] ^ t[1];
-        t[3] = t[0];
-        t[4] = t[1];
-    }
-
-    public String getAlgorithmName()
-    {
-        return "Threefish-" + (blocksizeBytes * 8);
-    }
-
-    public int getBlockSize()
-    {
-        return blocksizeBytes;
-    }
-
-    public void reset()
-    {
-    }
-
-    public int processBlock(byte[] in, int inOff, byte[] out, int outOff)
-        throws DataLengthException,
-        IllegalStateException
-    {
-        if ((outOff + blocksizeBytes) > out.length)
-        {
-            throw new DataLengthException("Output buffer too short");
-        }
-
-        if ((inOff + blocksizeBytes) > in.length)
-        {
-            throw new DataLengthException("Input buffer too short");
-        }
-
-        for (int i = 0; i < blocksizeBytes; i += 8)
-        {
-            currentBlock[i >> 3] = bytesToWord(in, inOff + i);
-        }
-        processBlock(this.currentBlock, this.currentBlock);
-        for (int i = 0; i < blocksizeBytes; i += 8)
-        {
-            wordToBytes(this.currentBlock[i >> 3], out, outOff + i);
-        }
-
-        return blocksizeBytes;
-    }
-
-    /**
-     * Process a block of data represented as 64 bit words.
-     *
-     * @param in  a block sized buffer of words to process.
-     * @param out a block sized buffer of words to receive the output of the operation.
-     * @return the number of 8 byte words processed (which will be the same as the block size).
-     * @throws DataLengthException if either the input or output is not block sized.
-     * @throws IllegalStateException if this engine is not initialised.
-     */
-    public int processBlock(long[] in, long[] out)
-        throws DataLengthException, IllegalStateException
-    {
-        if (kw[blocksizeWords] == 0)
-        {
-            throw new IllegalStateException("Threefish engine not initialised");
-        }
-
-        if (in.length != blocksizeWords)
-        {
-            throw new DataLengthException("Input buffer too short");
-        }
-        if (out.length != blocksizeWords)
-        {
-            throw new DataLengthException("Output buffer too short");
-        }
-
-        if (forEncryption)
-        {
-            cipher.encryptBlock(in, out);
-        }
-        else
-        {
-            cipher.decryptBlock(in, out);
-        }
-
-        return blocksizeWords;
-    }
-
-    /**
-     * Read a single 64 bit word from input in LSB first order.
-     */
-    // At least package protected for efficient access from inner class
-    public static long bytesToWord(final byte[] bytes, final int off)
-    {
-        if ((off + 8) > bytes.length)
-        {
-            // Help the JIT avoid index checks
-            throw new IllegalArgumentException();
-        }
-
-        long word = 0;
-        int index = off;
-
-        word = (bytes[index++] & 0xffL);
-        word |= (bytes[index++] & 0xffL) << 8;
-        word |= (bytes[index++] & 0xffL) << 16;
-        word |= (bytes[index++] & 0xffL) << 24;
-        word |= (bytes[index++] & 0xffL) << 32;
-        word |= (bytes[index++] & 0xffL) << 40;
-        word |= (bytes[index++] & 0xffL) << 48;
-        word |= (bytes[index++] & 0xffL) << 56;
-
-        return word;
-    }
-
-    /**
-     * Write a 64 bit word to output in LSB first order.
-     */
-    // At least package protected for efficient access from inner class
-    public static void wordToBytes(final long word, final byte[] bytes, final int off)
-    {
-        if ((off + 8) > bytes.length)
-        {
-            // Help the JIT avoid index checks
-            throw new IllegalArgumentException();
-        }
-        int index = off;
-
-        bytes[index++] = (byte)word;
-        bytes[index++] = (byte)(word >> 8);
-        bytes[index++] = (byte)(word >> 16);
-        bytes[index++] = (byte)(word >> 24);
-        bytes[index++] = (byte)(word >> 32);
-        bytes[index++] = (byte)(word >> 40);
-        bytes[index++] = (byte)(word >> 48);
-        bytes[index++] = (byte)(word >> 56);
-    }
-
-    /**
-     * Rotate left + xor part of the mix operation.
-     */
-    // Package protected for efficient access from inner class
-    static long rotlXor(long x, int n, long xor)
-    {
-        return ((x << n) | (x >>> -n)) ^ xor;
-    }
-
-    /**
-     * Rotate xor + rotate right part of the unmix operation.
-     */
-    // Package protected for efficient access from inner class
-    static long xorRotr(long x, int n, long xor)
-    {
-        long xored = x ^ xor;
-        return (xored >>> n) | (xored << -n);
-    }
-
-    private static abstract class ThreefishCipher
-    {
-        /**
-         * The extended + repeated tweak words
-         */
-        protected final long[] t;
-        /**
-         * The extended + repeated key words
-         */
-        protected final long[] kw;
-
-        protected ThreefishCipher(final long[] kw, final long[] t)
-        {
-            this.kw = kw;
-            this.t = t;
-        }
-
-        abstract void encryptBlock(long[] block, long[] out);
-
-        abstract void decryptBlock(long[] block, long[] out);
-
-    }
-
-    private static final class Threefish256Cipher
-        extends ThreefishCipher
-    {
-        /**
-         * Mix rotation constants defined in Skein 1.3 specification
-         */
-        private static final int ROTATION_0_0 = 14, ROTATION_0_1 = 16;
-        private static final int ROTATION_1_0 = 52, ROTATION_1_1 = 57;
-        private static final int ROTATION_2_0 = 23, ROTATION_2_1 = 40;
-        private static final int ROTATION_3_0 = 5, ROTATION_3_1 = 37;
-
-        private static final int ROTATION_4_0 = 25, ROTATION_4_1 = 33;
-        private static final int ROTATION_5_0 = 46, ROTATION_5_1 = 12;
-        private static final int ROTATION_6_0 = 58, ROTATION_6_1 = 22;
-        private static final int ROTATION_7_0 = 32, ROTATION_7_1 = 32;
-
-        public Threefish256Cipher(long[] kw, long[] t)
-        {
-            super(kw, t);
-        }
-
-        void encryptBlock(long[] block, long[] out)
-        {
-            final long[] kw = this.kw;
-            final long[] t = this.t;
-            final int[] mod5 = MOD5;
-            final int[] mod3 = MOD3;
-
-            /* Help the JIT avoid index bounds checks */
-            if (kw.length != 9)
-            {
-                throw new IllegalArgumentException();
-            }
-            if (t.length != 5)
-            {
-                throw new IllegalArgumentException();
-            }
-
-            /*
-             * Read 4 words of plaintext data, not using arrays for cipher state
-             */
-            long b0 = block[0];
-            long b1 = block[1];
-            long b2 = block[2];
-            long b3 = block[3];
-
-            /*
-             * First subkey injection.
-             */
-            b0 += kw[0];
-            b1 += kw[1] + t[0];
-            b2 += kw[2] + t[1];
-            b3 += kw[3];
-
-            /*
-             * Rounds loop, unrolled to 8 rounds per iteration.
-             * 
-             * Unrolling to multiples of 4 avoids the mod 4 check for key injection, and allows
-             * inlining of the permutations, which cycle every of 2 rounds (avoiding array
-             * index/lookup).
-             * 
-             * Unrolling to multiples of 8 avoids the mod 8 rotation constant lookup, and allows
-             * inlining constant rotation values (avoiding array index/lookup).
-             */
-
-            for (int d = 1; d < (ROUNDS_256 / 4); d += 2)
-            {
-                final int dm5 = mod5[d];
-                final int dm3 = mod3[d];
-
-                /*
-                 * 4 rounds of mix and permute.
-                 * 
-                 * Permute schedule has a 2 round cycle, so permutes are inlined in the mix
-                 * operations in each 4 round block.
-                 */
-                b1 = rotlXor(b1, ROTATION_0_0, b0 += b1);
-                b3 = rotlXor(b3, ROTATION_0_1, b2 += b3);
-
-                b3 = rotlXor(b3, ROTATION_1_0, b0 += b3);
-                b1 = rotlXor(b1, ROTATION_1_1, b2 += b1);
-
-                b1 = rotlXor(b1, ROTATION_2_0, b0 += b1);
-                b3 = rotlXor(b3, ROTATION_2_1, b2 += b3);
-
-                b3 = rotlXor(b3, ROTATION_3_0, b0 += b3);
-                b1 = rotlXor(b1, ROTATION_3_1, b2 += b1);
-
-                /*
-                 * Subkey injection for first 4 rounds.
-                 */
-                b0 += kw[dm5];
-                b1 += kw[dm5 + 1] + t[dm3];
-                b2 += kw[dm5 + 2] + t[dm3 + 1];
-                b3 += kw[dm5 + 3] + d;
-
-                /*
-                 * 4 more rounds of mix/permute
-                 */
-                b1 = rotlXor(b1, ROTATION_4_0, b0 += b1);
-                b3 = rotlXor(b3, ROTATION_4_1, b2 += b3);
-
-                b3 = rotlXor(b3, ROTATION_5_0, b0 += b3);
-                b1 = rotlXor(b1, ROTATION_5_1, b2 += b1);
-
-                b1 = rotlXor(b1, ROTATION_6_0, b0 += b1);
-                b3 = rotlXor(b3, ROTATION_6_1, b2 += b3);
-
-                b3 = rotlXor(b3, ROTATION_7_0, b0 += b3);
-                b1 = rotlXor(b1, ROTATION_7_1, b2 += b1);
-
-                /*
-                 * Subkey injection for next 4 rounds.
-                 */
-                b0 += kw[dm5 + 1];
-                b1 += kw[dm5 + 2] + t[dm3 + 1];
-                b2 += kw[dm5 + 3] + t[dm3 + 2];
-                b3 += kw[dm5 + 4] + d + 1;
-            }
-
-            /*
-             * Output cipher state.
-             */
-            out[0] = b0;
-            out[1] = b1;
-            out[2] = b2;
-            out[3] = b3;
-        }
-
-        void decryptBlock(long[] block, long[] state)
-        {
-            final long[] kw = this.kw;
-            final long[] t = this.t;
-            final int[] mod5 = MOD5;
-            final int[] mod3 = MOD3;
-
-            /* Help the JIT avoid index bounds checks */
-            if (kw.length != 9)
-            {
-                throw new IllegalArgumentException();
-            }
-            if (t.length != 5)
-            {
-                throw new IllegalArgumentException();
-            }
-
-            long b0 = block[0];
-            long b1 = block[1];
-            long b2 = block[2];
-            long b3 = block[3];
-
-            for (int d = (ROUNDS_256 / 4) - 1; d >= 1; d -= 2)
-            {
-                final int dm5 = mod5[d];
-                final int dm3 = mod3[d];
-
-                /* Reverse key injection for second 4 rounds */
-                b0 -= kw[dm5 + 1];
-                b1 -= kw[dm5 + 2] + t[dm3 + 1];
-                b2 -= kw[dm5 + 3] + t[dm3 + 2];
-                b3 -= kw[dm5 + 4] + d + 1;
-
-                /* Reverse second 4 mix/permute rounds */
-
-                b3 = xorRotr(b3, ROTATION_7_0, b0);
-                b0 -= b3;
-                b1 = xorRotr(b1, ROTATION_7_1, b2);
-                b2 -= b1;
-
-                b1 = xorRotr(b1, ROTATION_6_0, b0);
-                b0 -= b1;
-                b3 = xorRotr(b3, ROTATION_6_1, b2);
-                b2 -= b3;
-
-                b3 = xorRotr(b3, ROTATION_5_0, b0);
-                b0 -= b3;
-                b1 = xorRotr(b1, ROTATION_5_1, b2);
-                b2 -= b1;
-
-                b1 = xorRotr(b1, ROTATION_4_0, b0);
-                b0 -= b1;
-                b3 = xorRotr(b3, ROTATION_4_1, b2);
-                b2 -= b3;
-
-                /* Reverse key injection for first 4 rounds */
-                b0 -= kw[dm5];
-                b1 -= kw[dm5 + 1] + t[dm3];
-                b2 -= kw[dm5 + 2] + t[dm3 + 1];
-                b3 -= kw[dm5 + 3] + d;
-
-                /* Reverse first 4 mix/permute rounds */
-                b3 = xorRotr(b3, ROTATION_3_0, b0);
-                b0 -= b3;
-                b1 = xorRotr(b1, ROTATION_3_1, b2);
-                b2 -= b1;
-
-                b1 = xorRotr(b1, ROTATION_2_0, b0);
-                b0 -= b1;
-                b3 = xorRotr(b3, ROTATION_2_1, b2);
-                b2 -= b3;
-
-                b3 = xorRotr(b3, ROTATION_1_0, b0);
-                b0 -= b3;
-                b1 = xorRotr(b1, ROTATION_1_1, b2);
-                b2 -= b1;
-
-                b1 = xorRotr(b1, ROTATION_0_0, b0);
-                b0 -= b1;
-                b3 = xorRotr(b3, ROTATION_0_1, b2);
-                b2 -= b3;
-            }
-
-            /*
-             * First subkey uninjection.
-             */
-            b0 -= kw[0];
-            b1 -= kw[1] + t[0];
-            b2 -= kw[2] + t[1];
-            b3 -= kw[3];
-
-            /*
-             * Output cipher state.
-             */
-            state[0] = b0;
-            state[1] = b1;
-            state[2] = b2;
-            state[3] = b3;
-        }
-
-    }
-
-    private static final class Threefish512Cipher
-        extends ThreefishCipher
-    {
-        /**
-         * Mix rotation constants defined in Skein 1.3 specification
-         */
-        private static final int ROTATION_0_0 = 46, ROTATION_0_1 = 36, ROTATION_0_2 = 19, ROTATION_0_3 = 37;
-        private static final int ROTATION_1_0 = 33, ROTATION_1_1 = 27, ROTATION_1_2 = 14, ROTATION_1_3 = 42;
-        private static final int ROTATION_2_0 = 17, ROTATION_2_1 = 49, ROTATION_2_2 = 36, ROTATION_2_3 = 39;
-        private static final int ROTATION_3_0 = 44, ROTATION_3_1 = 9, ROTATION_3_2 = 54, ROTATION_3_3 = 56;
-
-        private static final int ROTATION_4_0 = 39, ROTATION_4_1 = 30, ROTATION_4_2 = 34, ROTATION_4_3 = 24;
-        private static final int ROTATION_5_0 = 13, ROTATION_5_1 = 50, ROTATION_5_2 = 10, ROTATION_5_3 = 17;
-        private static final int ROTATION_6_0 = 25, ROTATION_6_1 = 29, ROTATION_6_2 = 39, ROTATION_6_3 = 43;
-        private static final int ROTATION_7_0 = 8, ROTATION_7_1 = 35, ROTATION_7_2 = 56, ROTATION_7_3 = 22;
-
-        protected Threefish512Cipher(long[] kw, long[] t)
-        {
-            super(kw, t);
-        }
-
-        public void encryptBlock(long[] block, long[] out)
-        {
-            final long[] kw = this.kw;
-            final long[] t = this.t;
-            final int[] mod9 = MOD9;
-            final int[] mod3 = MOD3;
-
-            /* Help the JIT avoid index bounds checks */
-            if (kw.length != 17)
-            {
-                throw new IllegalArgumentException();
-            }
-            if (t.length != 5)
-            {
-                throw new IllegalArgumentException();
-            }
-
-            /*
-             * Read 8 words of plaintext data, not using arrays for cipher state
-             */
-            long b0 = block[0];
-            long b1 = block[1];
-            long b2 = block[2];
-            long b3 = block[3];
-            long b4 = block[4];
-            long b5 = block[5];
-            long b6 = block[6];
-            long b7 = block[7];
-
-            /*
-             * First subkey injection.
-             */
-            b0 += kw[0];
-            b1 += kw[1];
-            b2 += kw[2];
-            b3 += kw[3];
-            b4 += kw[4];
-            b5 += kw[5] + t[0];
-            b6 += kw[6] + t[1];
-            b7 += kw[7];
-
-            /*
-             * Rounds loop, unrolled to 8 rounds per iteration.
-             * 
-             * Unrolling to multiples of 4 avoids the mod 4 check for key injection, and allows
-             * inlining of the permutations, which cycle every of 4 rounds (avoiding array
-             * index/lookup).
-             * 
-             * Unrolling to multiples of 8 avoids the mod 8 rotation constant lookup, and allows
-             * inlining constant rotation values (avoiding array index/lookup).
-             */
-
-            for (int d = 1; d < (ROUNDS_512 / 4); d += 2)
-            {
-                final int dm9 = mod9[d];
-                final int dm3 = mod3[d];
-
-                /*
-                 * 4 rounds of mix and permute.
-                 * 
-                 * Permute schedule has a 4 round cycle, so permutes are inlined in the mix
-                 * operations in each 4 round block.
-                 */
-                b1 = rotlXor(b1, ROTATION_0_0, b0 += b1);
-                b3 = rotlXor(b3, ROTATION_0_1, b2 += b3);
-                b5 = rotlXor(b5, ROTATION_0_2, b4 += b5);
-                b7 = rotlXor(b7, ROTATION_0_3, b6 += b7);
-
-                b1 = rotlXor(b1, ROTATION_1_0, b2 += b1);
-                b7 = rotlXor(b7, ROTATION_1_1, b4 += b7);
-                b5 = rotlXor(b5, ROTATION_1_2, b6 += b5);
-                b3 = rotlXor(b3, ROTATION_1_3, b0 += b3);
-
-                b1 = rotlXor(b1, ROTATION_2_0, b4 += b1);
-                b3 = rotlXor(b3, ROTATION_2_1, b6 += b3);
-                b5 = rotlXor(b5, ROTATION_2_2, b0 += b5);
-                b7 = rotlXor(b7, ROTATION_2_3, b2 += b7);
-
-                b1 = rotlXor(b1, ROTATION_3_0, b6 += b1);
-                b7 = rotlXor(b7, ROTATION_3_1, b0 += b7);
-                b5 = rotlXor(b5, ROTATION_3_2, b2 += b5);
-                b3 = rotlXor(b3, ROTATION_3_3, b4 += b3);
-
-                /*
-                 * Subkey injection for first 4 rounds.
-                 */
-                b0 += kw[dm9];
-                b1 += kw[dm9 + 1];
-                b2 += kw[dm9 + 2];
-                b3 += kw[dm9 + 3];
-                b4 += kw[dm9 + 4];
-                b5 += kw[dm9 + 5] + t[dm3];
-                b6 += kw[dm9 + 6] + t[dm3 + 1];
-                b7 += kw[dm9 + 7] + d;
-
-                /*
-                 * 4 more rounds of mix/permute
-                 */
-                b1 = rotlXor(b1, ROTATION_4_0, b0 += b1);
-                b3 = rotlXor(b3, ROTATION_4_1, b2 += b3);
-                b5 = rotlXor(b5, ROTATION_4_2, b4 += b5);
-                b7 = rotlXor(b7, ROTATION_4_3, b6 += b7);
-
-                b1 = rotlXor(b1, ROTATION_5_0, b2 += b1);
-                b7 = rotlXor(b7, ROTATION_5_1, b4 += b7);
-                b5 = rotlXor(b5, ROTATION_5_2, b6 += b5);
-                b3 = rotlXor(b3, ROTATION_5_3, b0 += b3);
-
-                b1 = rotlXor(b1, ROTATION_6_0, b4 += b1);
-                b3 = rotlXor(b3, ROTATION_6_1, b6 += b3);
-                b5 = rotlXor(b5, ROTATION_6_2, b0 += b5);
-                b7 = rotlXor(b7, ROTATION_6_3, b2 += b7);
-
-                b1 = rotlXor(b1, ROTATION_7_0, b6 += b1);
-                b7 = rotlXor(b7, ROTATION_7_1, b0 += b7);
-                b5 = rotlXor(b5, ROTATION_7_2, b2 += b5);
-                b3 = rotlXor(b3, ROTATION_7_3, b4 += b3);
-
-                /*
-                 * Subkey injection for next 4 rounds.
-                 */
-                b0 += kw[dm9 + 1];
-                b1 += kw[dm9 + 2];
-                b2 += kw[dm9 + 3];
-                b3 += kw[dm9 + 4];
-                b4 += kw[dm9 + 5];
-                b5 += kw[dm9 + 6] + t[dm3 + 1];
-                b6 += kw[dm9 + 7] + t[dm3 + 2];
-                b7 += kw[dm9 + 8] + d + 1;
-            }
-
-            /*
-             * Output cipher state.
-             */
-            out[0] = b0;
-            out[1] = b1;
-            out[2] = b2;
-            out[3] = b3;
-            out[4] = b4;
-            out[5] = b5;
-            out[6] = b6;
-            out[7] = b7;
-        }
-
-        public void decryptBlock(long[] block, long[] state)
-        {
-            final long[] kw = this.kw;
-            final long[] t = this.t;
-            final int[] mod9 = MOD9;
-            final int[] mod3 = MOD3;
-
-            /* Help the JIT avoid index bounds checks */
-            if (kw.length != 17)
-            {
-                throw new IllegalArgumentException();
-            }
-            if (t.length != 5)
-            {
-                throw new IllegalArgumentException();
-            }
-
-            long b0 = block[0];
-            long b1 = block[1];
-            long b2 = block[2];
-            long b3 = block[3];
-            long b4 = block[4];
-            long b5 = block[5];
-            long b6 = block[6];
-            long b7 = block[7];
-
-            for (int d = (ROUNDS_512 / 4) - 1; d >= 1; d -= 2)
-            {
-                final int dm9 = mod9[d];
-                final int dm3 = mod3[d];
-
-                /* Reverse key injection for second 4 rounds */
-                b0 -= kw[dm9 + 1];
-                b1 -= kw[dm9 + 2];
-                b2 -= kw[dm9 + 3];
-                b3 -= kw[dm9 + 4];
-                b4 -= kw[dm9 + 5];
-                b5 -= kw[dm9 + 6] + t[dm3 + 1];
-                b6 -= kw[dm9 + 7] + t[dm3 + 2];
-                b7 -= kw[dm9 + 8] + d + 1;
-
-                /* Reverse second 4 mix/permute rounds */
-
-                b1 = xorRotr(b1, ROTATION_7_0, b6);
-                b6 -= b1;
-                b7 = xorRotr(b7, ROTATION_7_1, b0);
-                b0 -= b7;
-                b5 = xorRotr(b5, ROTATION_7_2, b2);
-                b2 -= b5;
-                b3 = xorRotr(b3, ROTATION_7_3, b4);
-                b4 -= b3;
-
-                b1 = xorRotr(b1, ROTATION_6_0, b4);
-                b4 -= b1;
-                b3 = xorRotr(b3, ROTATION_6_1, b6);
-                b6 -= b3;
-                b5 = xorRotr(b5, ROTATION_6_2, b0);
-                b0 -= b5;
-                b7 = xorRotr(b7, ROTATION_6_3, b2);
-                b2 -= b7;
-
-                b1 = xorRotr(b1, ROTATION_5_0, b2);
-                b2 -= b1;
-                b7 = xorRotr(b7, ROTATION_5_1, b4);
-                b4 -= b7;
-                b5 = xorRotr(b5, ROTATION_5_2, b6);
-                b6 -= b5;
-                b3 = xorRotr(b3, ROTATION_5_3, b0);
-                b0 -= b3;
-
-                b1 = xorRotr(b1, ROTATION_4_0, b0);
-                b0 -= b1;
-                b3 = xorRotr(b3, ROTATION_4_1, b2);
-                b2 -= b3;
-                b5 = xorRotr(b5, ROTATION_4_2, b4);
-                b4 -= b5;
-                b7 = xorRotr(b7, ROTATION_4_3, b6);
-                b6 -= b7;
-
-                /* Reverse key injection for first 4 rounds */
-                b0 -= kw[dm9];
-                b1 -= kw[dm9 + 1];
-                b2 -= kw[dm9 + 2];
-                b3 -= kw[dm9 + 3];
-                b4 -= kw[dm9 + 4];
-                b5 -= kw[dm9 + 5] + t[dm3];
-                b6 -= kw[dm9 + 6] + t[dm3 + 1];
-                b7 -= kw[dm9 + 7] + d;
-
-                /* Reverse first 4 mix/permute rounds */
-                b1 = xorRotr(b1, ROTATION_3_0, b6);
-                b6 -= b1;
-                b7 = xorRotr(b7, ROTATION_3_1, b0);
-                b0 -= b7;
-                b5 = xorRotr(b5, ROTATION_3_2, b2);
-                b2 -= b5;
-                b3 = xorRotr(b3, ROTATION_3_3, b4);
-                b4 -= b3;
-
-                b1 = xorRotr(b1, ROTATION_2_0, b4);
-                b4 -= b1;
-                b3 = xorRotr(b3, ROTATION_2_1, b6);
-                b6 -= b3;
-                b5 = xorRotr(b5, ROTATION_2_2, b0);
-                b0 -= b5;
-                b7 = xorRotr(b7, ROTATION_2_3, b2);
-                b2 -= b7;
-
-                b1 = xorRotr(b1, ROTATION_1_0, b2);
-                b2 -= b1;
-                b7 = xorRotr(b7, ROTATION_1_1, b4);
-                b4 -= b7;
-                b5 = xorRotr(b5, ROTATION_1_2, b6);
-                b6 -= b5;
-                b3 = xorRotr(b3, ROTATION_1_3, b0);
-                b0 -= b3;
-
-                b1 = xorRotr(b1, ROTATION_0_0, b0);
-                b0 -= b1;
-                b3 = xorRotr(b3, ROTATION_0_1, b2);
-                b2 -= b3;
-                b5 = xorRotr(b5, ROTATION_0_2, b4);
-                b4 -= b5;
-                b7 = xorRotr(b7, ROTATION_0_3, b6);
-                b6 -= b7;
-            }
-
-            /*
-             * First subkey uninjection.
-             */
-            b0 -= kw[0];
-            b1 -= kw[1];
-            b2 -= kw[2];
-            b3 -= kw[3];
-            b4 -= kw[4];
-            b5 -= kw[5] + t[0];
-            b6 -= kw[6] + t[1];
-            b7 -= kw[7];
-
-            /*
-             * Output cipher state.
-             */
-            state[0] = b0;
-            state[1] = b1;
-            state[2] = b2;
-            state[3] = b3;
-            state[4] = b4;
-            state[5] = b5;
-            state[6] = b6;
-            state[7] = b7;
-        }
-    }
-
-    private static final class Threefish1024Cipher
-        extends ThreefishCipher
-    {
-        /**
-         * Mix rotation constants defined in Skein 1.3 specification
-         */
-        private static final int ROTATION_0_0 = 24, ROTATION_0_1 = 13, ROTATION_0_2 = 8, ROTATION_0_3 = 47;
-        private static final int ROTATION_0_4 = 8, ROTATION_0_5 = 17, ROTATION_0_6 = 22, ROTATION_0_7 = 37;
-        private static final int ROTATION_1_0 = 38, ROTATION_1_1 = 19, ROTATION_1_2 = 10, ROTATION_1_3 = 55;
-        private static final int ROTATION_1_4 = 49, ROTATION_1_5 = 18, ROTATION_1_6 = 23, ROTATION_1_7 = 52;
-        private static final int ROTATION_2_0 = 33, ROTATION_2_1 = 4, ROTATION_2_2 = 51, ROTATION_2_3 = 13;
-        private static final int ROTATION_2_4 = 34, ROTATION_2_5 = 41, ROTATION_2_6 = 59, ROTATION_2_7 = 17;
-        private static final int ROTATION_3_0 = 5, ROTATION_3_1 = 20, ROTATION_3_2 = 48, ROTATION_3_3 = 41;
-        private static final int ROTATION_3_4 = 47, ROTATION_3_5 = 28, ROTATION_3_6 = 16, ROTATION_3_7 = 25;
-
-        private static final int ROTATION_4_0 = 41, ROTATION_4_1 = 9, ROTATION_4_2 = 37, ROTATION_4_3 = 31;
-        private static final int ROTATION_4_4 = 12, ROTATION_4_5 = 47, ROTATION_4_6 = 44, ROTATION_4_7 = 30;
-        private static final int ROTATION_5_0 = 16, ROTATION_5_1 = 34, ROTATION_5_2 = 56, ROTATION_5_3 = 51;
-        private static final int ROTATION_5_4 = 4, ROTATION_5_5 = 53, ROTATION_5_6 = 42, ROTATION_5_7 = 41;
-        private static final int ROTATION_6_0 = 31, ROTATION_6_1 = 44, ROTATION_6_2 = 47, ROTATION_6_3 = 46;
-        private static final int ROTATION_6_4 = 19, ROTATION_6_5 = 42, ROTATION_6_6 = 44, ROTATION_6_7 = 25;
-        private static final int ROTATION_7_0 = 9, ROTATION_7_1 = 48, ROTATION_7_2 = 35, ROTATION_7_3 = 52;
-        private static final int ROTATION_7_4 = 23, ROTATION_7_5 = 31, ROTATION_7_6 = 37, ROTATION_7_7 = 20;
-
-        public Threefish1024Cipher(long[] kw, long[] t)
-        {
-            super(kw, t);
-        }
-
-        void encryptBlock(long[] block, long[] out)
-        {
-            final long[] kw = this.kw;
-            final long[] t = this.t;
-            final int[] mod17 = MOD17;
-            final int[] mod3 = MOD3;
-
-            /* Help the JIT avoid index bounds checks */
-            if (kw.length != 33)
-            {
-                throw new IllegalArgumentException();
-            }
-            if (t.length != 5)
-            {
-                throw new IllegalArgumentException();
-            }
-
-            /*
-             * Read 16 words of plaintext data, not using arrays for cipher state
-             */
-            long b0 = block[0];
-            long b1 = block[1];
-            long b2 = block[2];
-            long b3 = block[3];
-            long b4 = block[4];
-            long b5 = block[5];
-            long b6 = block[6];
-            long b7 = block[7];
-            long b8 = block[8];
-            long b9 = block[9];
-            long b10 = block[10];
-            long b11 = block[11];
-            long b12 = block[12];
-            long b13 = block[13];
-            long b14 = block[14];
-            long b15 = block[15];
-
-            /*
-             * First subkey injection.
-             */
-            b0 += kw[0];
-            b1 += kw[1];
-            b2 += kw[2];
-            b3 += kw[3];
-            b4 += kw[4];
-            b5 += kw[5];
-            b6 += kw[6];
-            b7 += kw[7];
-            b8 += kw[8];
-            b9 += kw[9];
-            b10 += kw[10];
-            b11 += kw[11];
-            b12 += kw[12];
-            b13 += kw[13] + t[0];
-            b14 += kw[14] + t[1];
-            b15 += kw[15];
-
-            /*
-             * Rounds loop, unrolled to 8 rounds per iteration.
-             * 
-             * Unrolling to multiples of 4 avoids the mod 4 check for key injection, and allows
-             * inlining of the permutations, which cycle every of 4 rounds (avoiding array
-             * index/lookup).
-             * 
-             * Unrolling to multiples of 8 avoids the mod 8 rotation constant lookup, and allows
-             * inlining constant rotation values (avoiding array index/lookup).
-             */
-
-            for (int d = 1; d < (ROUNDS_1024 / 4); d += 2)
-            {
-                final int dm17 = mod17[d];
-                final int dm3 = mod3[d];
-
-                /*
-                 * 4 rounds of mix and permute.
-                 * 
-                 * Permute schedule has a 4 round cycle, so permutes are inlined in the mix
-                 * operations in each 4 round block.
-                 */
-                b1 = rotlXor(b1, ROTATION_0_0, b0 += b1);
-                b3 = rotlXor(b3, ROTATION_0_1, b2 += b3);
-                b5 = rotlXor(b5, ROTATION_0_2, b4 += b5);
-                b7 = rotlXor(b7, ROTATION_0_3, b6 += b7);
-                b9 = rotlXor(b9, ROTATION_0_4, b8 += b9);
-                b11 = rotlXor(b11, ROTATION_0_5, b10 += b11);
-                b13 = rotlXor(b13, ROTATION_0_6, b12 += b13);
-                b15 = rotlXor(b15, ROTATION_0_7, b14 += b15);
-
-                b9 = rotlXor(b9, ROTATION_1_0, b0 += b9);
-                b13 = rotlXor(b13, ROTATION_1_1, b2 += b13);
-                b11 = rotlXor(b11, ROTATION_1_2, b6 += b11);
-                b15 = rotlXor(b15, ROTATION_1_3, b4 += b15);
-                b7 = rotlXor(b7, ROTATION_1_4, b10 += b7);
-                b3 = rotlXor(b3, ROTATION_1_5, b12 += b3);
-                b5 = rotlXor(b5, ROTATION_1_6, b14 += b5);
-                b1 = rotlXor(b1, ROTATION_1_7, b8 += b1);
-
-                b7 = rotlXor(b7, ROTATION_2_0, b0 += b7);
-                b5 = rotlXor(b5, ROTATION_2_1, b2 += b5);
-                b3 = rotlXor(b3, ROTATION_2_2, b4 += b3);
-                b1 = rotlXor(b1, ROTATION_2_3, b6 += b1);
-                b15 = rotlXor(b15, ROTATION_2_4, b12 += b15);
-                b13 = rotlXor(b13, ROTATION_2_5, b14 += b13);
-                b11 = rotlXor(b11, ROTATION_2_6, b8 += b11);
-                b9 = rotlXor(b9, ROTATION_2_7, b10 += b9);
-
-                b15 = rotlXor(b15, ROTATION_3_0, b0 += b15);
-                b11 = rotlXor(b11, ROTATION_3_1, b2 += b11);
-                b13 = rotlXor(b13, ROTATION_3_2, b6 += b13);
-                b9 = rotlXor(b9, ROTATION_3_3, b4 += b9);
-                b1 = rotlXor(b1, ROTATION_3_4, b14 += b1);
-                b5 = rotlXor(b5, ROTATION_3_5, b8 += b5);
-                b3 = rotlXor(b3, ROTATION_3_6, b10 += b3);
-                b7 = rotlXor(b7, ROTATION_3_7, b12 += b7);
-
-                /*
-                 * Subkey injection for first 4 rounds.
-                 */
-                b0 += kw[dm17];
-                b1 += kw[dm17 + 1];
-                b2 += kw[dm17 + 2];
-                b3 += kw[dm17 + 3];
-                b4 += kw[dm17 + 4];
-                b5 += kw[dm17 + 5];
-                b6 += kw[dm17 + 6];
-                b7 += kw[dm17 + 7];
-                b8 += kw[dm17 + 8];
-                b9 += kw[dm17 + 9];
-                b10 += kw[dm17 + 10];
-                b11 += kw[dm17 + 11];
-                b12 += kw[dm17 + 12];
-                b13 += kw[dm17 + 13] + t[dm3];
-                b14 += kw[dm17 + 14] + t[dm3 + 1];
-                b15 += kw[dm17 + 15] + d;
-
-                /*
-                 * 4 more rounds of mix/permute
-                 */
-                b1 = rotlXor(b1, ROTATION_4_0, b0 += b1);
-                b3 = rotlXor(b3, ROTATION_4_1, b2 += b3);
-                b5 = rotlXor(b5, ROTATION_4_2, b4 += b5);
-                b7 = rotlXor(b7, ROTATION_4_3, b6 += b7);
-                b9 = rotlXor(b9, ROTATION_4_4, b8 += b9);
-                b11 = rotlXor(b11, ROTATION_4_5, b10 += b11);
-                b13 = rotlXor(b13, ROTATION_4_6, b12 += b13);
-                b15 = rotlXor(b15, ROTATION_4_7, b14 += b15);
-
-                b9 = rotlXor(b9, ROTATION_5_0, b0 += b9);
-                b13 = rotlXor(b13, ROTATION_5_1, b2 += b13);
-                b11 = rotlXor(b11, ROTATION_5_2, b6 += b11);
-                b15 = rotlXor(b15, ROTATION_5_3, b4 += b15);
-                b7 = rotlXor(b7, ROTATION_5_4, b10 += b7);
-                b3 = rotlXor(b3, ROTATION_5_5, b12 += b3);
-                b5 = rotlXor(b5, ROTATION_5_6, b14 += b5);
-                b1 = rotlXor(b1, ROTATION_5_7, b8 += b1);
-
-                b7 = rotlXor(b7, ROTATION_6_0, b0 += b7);
-                b5 = rotlXor(b5, ROTATION_6_1, b2 += b5);
-                b3 = rotlXor(b3, ROTATION_6_2, b4 += b3);
-                b1 = rotlXor(b1, ROTATION_6_3, b6 += b1);
-                b15 = rotlXor(b15, ROTATION_6_4, b12 += b15);
-                b13 = rotlXor(b13, ROTATION_6_5, b14 += b13);
-                b11 = rotlXor(b11, ROTATION_6_6, b8 += b11);
-                b9 = rotlXor(b9, ROTATION_6_7, b10 += b9);
-
-                b15 = rotlXor(b15, ROTATION_7_0, b0 += b15);
-                b11 = rotlXor(b11, ROTATION_7_1, b2 += b11);
-                b13 = rotlXor(b13, ROTATION_7_2, b6 += b13);
-                b9 = rotlXor(b9, ROTATION_7_3, b4 += b9);
-                b1 = rotlXor(b1, ROTATION_7_4, b14 += b1);
-                b5 = rotlXor(b5, ROTATION_7_5, b8 += b5);
-                b3 = rotlXor(b3, ROTATION_7_6, b10 += b3);
-                b7 = rotlXor(b7, ROTATION_7_7, b12 += b7);
-
-                /*
-                 * Subkey injection for next 4 rounds.
-                 */
-                b0 += kw[dm17 + 1];
-                b1 += kw[dm17 + 2];
-                b2 += kw[dm17 + 3];
-                b3 += kw[dm17 + 4];
-                b4 += kw[dm17 + 5];
-                b5 += kw[dm17 + 6];
-                b6 += kw[dm17 + 7];
-                b7 += kw[dm17 + 8];
-                b8 += kw[dm17 + 9];
-                b9 += kw[dm17 + 10];
-                b10 += kw[dm17 + 11];
-                b11 += kw[dm17 + 12];
-                b12 += kw[dm17 + 13];
-                b13 += kw[dm17 + 14] + t[dm3 + 1];
-                b14 += kw[dm17 + 15] + t[dm3 + 2];
-                b15 += kw[dm17 + 16] + d + 1;
-
-            }
-
-            /*
-             * Output cipher state.
-             */
-            out[0] = b0;
-            out[1] = b1;
-            out[2] = b2;
-            out[3] = b3;
-            out[4] = b4;
-            out[5] = b5;
-            out[6] = b6;
-            out[7] = b7;
-            out[8] = b8;
-            out[9] = b9;
-            out[10] = b10;
-            out[11] = b11;
-            out[12] = b12;
-            out[13] = b13;
-            out[14] = b14;
-            out[15] = b15;
-        }
-
-        void decryptBlock(long[] block, long[] state)
-        {
-            final long[] kw = this.kw;
-            final long[] t = this.t;
-            final int[] mod17 = MOD17;
-            final int[] mod3 = MOD3;
-
-            /* Help the JIT avoid index bounds checks */
-            if (kw.length != 33)
-            {
-                throw new IllegalArgumentException();
-            }
-            if (t.length != 5)
-            {
-                throw new IllegalArgumentException();
-            }
-
-            long b0 = block[0];
-            long b1 = block[1];
-            long b2 = block[2];
-            long b3 = block[3];
-            long b4 = block[4];
-            long b5 = block[5];
-            long b6 = block[6];
-            long b7 = block[7];
-            long b8 = block[8];
-            long b9 = block[9];
-            long b10 = block[10];
-            long b11 = block[11];
-            long b12 = block[12];
-            long b13 = block[13];
-            long b14 = block[14];
-            long b15 = block[15];
-
-            for (int d = (ROUNDS_1024 / 4) - 1; d >= 1; d -= 2)
-            {
-                final int dm17 = mod17[d];
-                final int dm3 = mod3[d];
-
-                /* Reverse key injection for second 4 rounds */
-                b0 -= kw[dm17 + 1];
-                b1 -= kw[dm17 + 2];
-                b2 -= kw[dm17 + 3];
-                b3 -= kw[dm17 + 4];
-                b4 -= kw[dm17 + 5];
-                b5 -= kw[dm17 + 6];
-                b6 -= kw[dm17 + 7];
-                b7 -= kw[dm17 + 8];
-                b8 -= kw[dm17 + 9];
-                b9 -= kw[dm17 + 10];
-                b10 -= kw[dm17 + 11];
-                b11 -= kw[dm17 + 12];
-                b12 -= kw[dm17 + 13];
-                b13 -= kw[dm17 + 14] + t[dm3 + 1];
-                b14 -= kw[dm17 + 15] + t[dm3 + 2];
-                b15 -= kw[dm17 + 16] + d + 1;
-
-                /* Reverse second 4 mix/permute rounds */
-                b15 = xorRotr(b15, ROTATION_7_0, b0);
-                b0 -= b15;
-                b11 = xorRotr(b11, ROTATION_7_1, b2);
-                b2 -= b11;
-                b13 = xorRotr(b13, ROTATION_7_2, b6);
-                b6 -= b13;
-                b9 = xorRotr(b9, ROTATION_7_3, b4);
-                b4 -= b9;
-                b1 = xorRotr(b1, ROTATION_7_4, b14);
-                b14 -= b1;
-                b5 = xorRotr(b5, ROTATION_7_5, b8);
-                b8 -= b5;
-                b3 = xorRotr(b3, ROTATION_7_6, b10);
-                b10 -= b3;
-                b7 = xorRotr(b7, ROTATION_7_7, b12);
-                b12 -= b7;
-
-                b7 = xorRotr(b7, ROTATION_6_0, b0);
-                b0 -= b7;
-                b5 = xorRotr(b5, ROTATION_6_1, b2);
-                b2 -= b5;
-                b3 = xorRotr(b3, ROTATION_6_2, b4);
-                b4 -= b3;
-                b1 = xorRotr(b1, ROTATION_6_3, b6);
-                b6 -= b1;
-                b15 = xorRotr(b15, ROTATION_6_4, b12);
-                b12 -= b15;
-                b13 = xorRotr(b13, ROTATION_6_5, b14);
-                b14 -= b13;
-                b11 = xorRotr(b11, ROTATION_6_6, b8);
-                b8 -= b11;
-                b9 = xorRotr(b9, ROTATION_6_7, b10);
-                b10 -= b9;
-
-                b9 = xorRotr(b9, ROTATION_5_0, b0);
-                b0 -= b9;
-                b13 = xorRotr(b13, ROTATION_5_1, b2);
-                b2 -= b13;
-                b11 = xorRotr(b11, ROTATION_5_2, b6);
-                b6 -= b11;
-                b15 = xorRotr(b15, ROTATION_5_3, b4);
-                b4 -= b15;
-                b7 = xorRotr(b7, ROTATION_5_4, b10);
-                b10 -= b7;
-                b3 = xorRotr(b3, ROTATION_5_5, b12);
-                b12 -= b3;
-                b5 = xorRotr(b5, ROTATION_5_6, b14);
-                b14 -= b5;
-                b1 = xorRotr(b1, ROTATION_5_7, b8);
-                b8 -= b1;
-
-                b1 = xorRotr(b1, ROTATION_4_0, b0);
-                b0 -= b1;
-                b3 = xorRotr(b3, ROTATION_4_1, b2);
-                b2 -= b3;
-                b5 = xorRotr(b5, ROTATION_4_2, b4);
-                b4 -= b5;
-                b7 = xorRotr(b7, ROTATION_4_3, b6);
-                b6 -= b7;
-                b9 = xorRotr(b9, ROTATION_4_4, b8);
-                b8 -= b9;
-                b11 = xorRotr(b11, ROTATION_4_5, b10);
-                b10 -= b11;
-                b13 = xorRotr(b13, ROTATION_4_6, b12);
-                b12 -= b13;
-                b15 = xorRotr(b15, ROTATION_4_7, b14);
-                b14 -= b15;
-
-                /* Reverse key injection for first 4 rounds */
-                b0 -= kw[dm17];
-                b1 -= kw[dm17 + 1];
-                b2 -= kw[dm17 + 2];
-                b3 -= kw[dm17 + 3];
-                b4 -= kw[dm17 + 4];
-                b5 -= kw[dm17 + 5];
-                b6 -= kw[dm17 + 6];
-                b7 -= kw[dm17 + 7];
-                b8 -= kw[dm17 + 8];
-                b9 -= kw[dm17 + 9];
-                b10 -= kw[dm17 + 10];
-                b11 -= kw[dm17 + 11];
-                b12 -= kw[dm17 + 12];
-                b13 -= kw[dm17 + 13] + t[dm3];
-                b14 -= kw[dm17 + 14] + t[dm3 + 1];
-                b15 -= kw[dm17 + 15] + d;
-
-                /* Reverse first 4 mix/permute rounds */
-                b15 = xorRotr(b15, ROTATION_3_0, b0);
-                b0 -= b15;
-                b11 = xorRotr(b11, ROTATION_3_1, b2);
-                b2 -= b11;
-                b13 = xorRotr(b13, ROTATION_3_2, b6);
-                b6 -= b13;
-                b9 = xorRotr(b9, ROTATION_3_3, b4);
-                b4 -= b9;
-                b1 = xorRotr(b1, ROTATION_3_4, b14);
-                b14 -= b1;
-                b5 = xorRotr(b5, ROTATION_3_5, b8);
-                b8 -= b5;
-                b3 = xorRotr(b3, ROTATION_3_6, b10);
-                b10 -= b3;
-                b7 = xorRotr(b7, ROTATION_3_7, b12);
-                b12 -= b7;
-
-                b7 = xorRotr(b7, ROTATION_2_0, b0);
-                b0 -= b7;
-                b5 = xorRotr(b5, ROTATION_2_1, b2);
-                b2 -= b5;
-                b3 = xorRotr(b3, ROTATION_2_2, b4);
-                b4 -= b3;
-                b1 = xorRotr(b1, ROTATION_2_3, b6);
-                b6 -= b1;
-                b15 = xorRotr(b15, ROTATION_2_4, b12);
-                b12 -= b15;
-                b13 = xorRotr(b13, ROTATION_2_5, b14);
-                b14 -= b13;
-                b11 = xorRotr(b11, ROTATION_2_6, b8);
-                b8 -= b11;
-                b9 = xorRotr(b9, ROTATION_2_7, b10);
-                b10 -= b9;
-
-                b9 = xorRotr(b9, ROTATION_1_0, b0);
-                b0 -= b9;
-                b13 = xorRotr(b13, ROTATION_1_1, b2);
-                b2 -= b13;
-                b11 = xorRotr(b11, ROTATION_1_2, b6);
-                b6 -= b11;
-                b15 = xorRotr(b15, ROTATION_1_3, b4);
-                b4 -= b15;
-                b7 = xorRotr(b7, ROTATION_1_4, b10);
-                b10 -= b7;
-                b3 = xorRotr(b3, ROTATION_1_5, b12);
-                b12 -= b3;
-                b5 = xorRotr(b5, ROTATION_1_6, b14);
-                b14 -= b5;
-                b1 = xorRotr(b1, ROTATION_1_7, b8);
-                b8 -= b1;
-
-                b1 = xorRotr(b1, ROTATION_0_0, b0);
-                b0 -= b1;
-                b3 = xorRotr(b3, ROTATION_0_1, b2);
-                b2 -= b3;
-                b5 = xorRotr(b5, ROTATION_0_2, b4);
-                b4 -= b5;
-                b7 = xorRotr(b7, ROTATION_0_3, b6);
-                b6 -= b7;
-                b9 = xorRotr(b9, ROTATION_0_4, b8);
-                b8 -= b9;
-                b11 = xorRotr(b11, ROTATION_0_5, b10);
-                b10 -= b11;
-                b13 = xorRotr(b13, ROTATION_0_6, b12);
-                b12 -= b13;
-                b15 = xorRotr(b15, ROTATION_0_7, b14);
-                b14 -= b15;
-            }
-
-            /*
-             * First subkey uninjection.
-             */
-            b0 -= kw[0];
-            b1 -= kw[1];
-            b2 -= kw[2];
-            b3 -= kw[3];
-            b4 -= kw[4];
-            b5 -= kw[5];
-            b6 -= kw[6];
-            b7 -= kw[7];
-            b8 -= kw[8];
-            b9 -= kw[9];
-            b10 -= kw[10];
-            b11 -= kw[11];
-            b12 -= kw[12];
-            b13 -= kw[13] + t[0];
-            b14 -= kw[14] + t[1];
-            b15 -= kw[15];
-
-            /*
-             * Output cipher state.
-             */
-            state[0] = b0;
-            state[1] = b1;
-            state[2] = b2;
-            state[3] = b3;
-            state[4] = b4;
-            state[5] = b5;
-            state[6] = b6;
-            state[7] = b7;
-            state[8] = b8;
-            state[9] = b9;
-            state[10] = b10;
-            state[11] = b11;
-            state[12] = b12;
-            state[13] = b13;
-            state[14] = b14;
-            state[15] = b15;
-        }
-
-    }
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/engines/VMPCEngine.java b/bcprov/src/main/java/org/bouncycastle/crypto/engines/VMPCEngine.java
deleted file mode 100644
index 364c5d8..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/engines/VMPCEngine.java
+++ /dev/null
@@ -1,142 +0,0 @@
-package org.bouncycastle.crypto.engines;
-
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.DataLengthException;
-import org.bouncycastle.crypto.OutputLengthException;
-import org.bouncycastle.crypto.StreamCipher;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.crypto.params.ParametersWithIV;
-
-public class VMPCEngine implements StreamCipher
-{
-    /*
-     * variables to hold the state of the VMPC engine during encryption and
-     * decryption
-     */
-    protected byte n = 0;
-    protected byte[] P = null;
-    protected byte s = 0;
-
-    protected byte[] workingIV;
-    protected byte[] workingKey;
-
-    public String getAlgorithmName()
-    {
-        return "VMPC";
-    }
-
-    /**
-     * initialise a VMPC cipher.
-     * 
-     * @param forEncryption
-     *    whether or not we are for encryption.
-     * @param params
-     *    the parameters required to set up the cipher.
-     * @exception IllegalArgumentException
-     *    if the params argument is inappropriate.
-     */
-    public void init(boolean forEncryption, CipherParameters params)
-    {
-        if (!(params instanceof ParametersWithIV))
-        {
-            throw new IllegalArgumentException(
-                "VMPC init parameters must include an IV");
-        }
-
-        ParametersWithIV ivParams = (ParametersWithIV) params;
-
-        if (!(ivParams.getParameters() instanceof KeyParameter))
-        {
-            throw new IllegalArgumentException(
-                "VMPC init parameters must include a key");
-        }
-
-        KeyParameter key = (KeyParameter) ivParams.getParameters();
-
-        this.workingIV = ivParams.getIV();
-
-        if (workingIV == null || workingIV.length < 1 || workingIV.length > 768)
-        {
-            throw new IllegalArgumentException("VMPC requires 1 to 768 bytes of IV");
-        }
-
-        this.workingKey = key.getKey();
-
-        initKey(this.workingKey, this.workingIV);
-    }
-
-    protected void initKey(byte[] keyBytes, byte[] ivBytes)
-    {
-        s = 0;
-        P = new byte[256];
-        for (int i = 0; i < 256; i++)
-        {
-            P[i] = (byte) i;
-        }
-
-        for (int m = 0; m < 768; m++)
-        {
-            s = P[(s + P[m & 0xff] + keyBytes[m % keyBytes.length]) & 0xff];
-            byte temp = P[m & 0xff];
-            P[m & 0xff] = P[s & 0xff];
-            P[s & 0xff] = temp;
-        }
-        for (int m = 0; m < 768; m++)
-        {
-            s = P[(s + P[m & 0xff] + ivBytes[m % ivBytes.length]) & 0xff];
-            byte temp = P[m & 0xff];
-            P[m & 0xff] = P[s & 0xff];
-            P[s & 0xff] = temp;
-        }
-        n = 0;
-    }
-
-    public int processBytes(byte[] in, int inOff, int len, byte[] out,
-        int outOff)
-    {
-        if ((inOff + len) > in.length)
-        {
-            throw new DataLengthException("input buffer too short");
-        }
-
-        if ((outOff + len) > out.length)
-        {
-            throw new OutputLengthException("output buffer too short");
-        }
-
-        for (int i = 0; i < len; i++)
-        {
-            s = P[(s + P[n & 0xff]) & 0xff];
-            byte z = P[(P[(P[s & 0xff]) & 0xff] + 1) & 0xff];
-            // encryption
-            byte temp = P[n & 0xff];
-            P[n & 0xff] = P[s & 0xff];
-            P[s & 0xff] = temp;
-            n = (byte) ((n + 1) & 0xff);
-
-            // xor
-            out[i + outOff] = (byte) (in[i + inOff] ^ z);
-        }
-
-        return len;
-    }
-
-    public void reset()
-    {
-        initKey(this.workingKey, this.workingIV);
-    }
-
-    public byte returnByte(byte in)
-    {
-        s = P[(s + P[n & 0xff]) & 0xff];
-        byte z = P[(P[(P[s & 0xff]) & 0xff] + 1) & 0xff];
-        // encryption
-        byte temp = P[n & 0xff];
-        P[n & 0xff] = P[s & 0xff];
-        P[s & 0xff] = temp;
-        n = (byte) ((n + 1) & 0xff);
-
-        // xor
-        return (byte) (in ^ z);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/engines/VMPCKSA3Engine.java b/bcprov/src/main/java/org/bouncycastle/crypto/engines/VMPCKSA3Engine.java
deleted file mode 100644
index 9e40272..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/engines/VMPCKSA3Engine.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package org.bouncycastle.crypto.engines;
-
-public class VMPCKSA3Engine extends VMPCEngine
-{
-    public String getAlgorithmName()
-    {
-        return "VMPC-KSA3";
-    }
-
-    protected void initKey(byte[] keyBytes, byte[] ivBytes)
-    {
-        s = 0;
-        P = new byte[256];
-        for (int i = 0; i < 256; i++)
-        {
-            P[i] = (byte) i;
-        }
-
-        for (int m = 0; m < 768; m++)
-        {
-            s = P[(s + P[m & 0xff] + keyBytes[m % keyBytes.length]) & 0xff];
-            byte temp = P[m & 0xff];
-            P[m & 0xff] = P[s & 0xff];
-            P[s & 0xff] = temp;
-        }
-
-        for (int m = 0; m < 768; m++)
-        {
-            s = P[(s + P[m & 0xff] + ivBytes[m % ivBytes.length]) & 0xff];
-            byte temp = P[m & 0xff];
-            P[m & 0xff] = P[s & 0xff];
-            P[s & 0xff] = temp;
-        }
-
-        for (int m = 0; m < 768; m++)
-        {
-            s = P[(s + P[m & 0xff] + keyBytes[m % keyBytes.length]) & 0xff];
-            byte temp = P[m & 0xff];
-            P[m & 0xff] = P[s & 0xff];
-            P[s & 0xff] = temp;
-        }
-
-        n = 0;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/engines/XSalsa20Engine.java b/bcprov/src/main/java/org/bouncycastle/crypto/engines/XSalsa20Engine.java
deleted file mode 100644
index 45cc478..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/engines/XSalsa20Engine.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package org.bouncycastle.crypto.engines;
-
-import org.bouncycastle.util.Pack;
-
-/**
- * Implementation of Daniel J. Bernstein's XSalsa20 stream cipher - Salsa20 with an extended nonce.
- * <p>
- * XSalsa20 requires a 256 bit key, and a 192 bit nonce.
- */
-public class XSalsa20Engine extends Salsa20Engine
-{
-    public String getAlgorithmName()
-    {
-        return "XSalsa20";
-    }
-
-    protected int getNonceSize()
-    {
-        return 24;
-    }
-
-    /**
-     * XSalsa20 key generation: process 256 bit input key and 128 bits of the input nonce
-     * using a core Salsa20 function without input addition to produce 256 bit working key
-     * and use that with the remaining 64 bits of nonce to initialize a standard Salsa20 engine state.
-     */
-    protected void setKey(byte[] keyBytes, byte[] ivBytes)
-    {
-        if (keyBytes == null)
-        {
-            throw new IllegalArgumentException(getAlgorithmName() + " doesn't support re-init with null key");
-        }
-
-        if (keyBytes.length != 32)
-        {
-            throw new IllegalArgumentException(getAlgorithmName() + " requires a 256 bit key");
-        }
-
-        // Set key for HSalsa20
-        super.setKey(keyBytes, ivBytes);
-
-        // Pack next 64 bits of IV into engine state instead of counter
-        engineState[8] = Pack.littleEndianToInt(ivBytes, 8);
-        engineState[9] = Pack.littleEndianToInt(ivBytes, 12);
-
-        // Process engine state to generate Salsa20 key
-        int[] hsalsa20Out = new int[engineState.length];
-        salsaCore(20, engineState, hsalsa20Out);
-
-        // Set new key, removing addition in last round of salsaCore
-        engineState[1] = hsalsa20Out[0] - engineState[0];
-        engineState[2] = hsalsa20Out[5] - engineState[5];
-        engineState[3] = hsalsa20Out[10] - engineState[10];
-        engineState[4] = hsalsa20Out[15] - engineState[15];
-
-        engineState[11] = hsalsa20Out[6] - engineState[6];
-        engineState[12] = hsalsa20Out[7] - engineState[7];
-        engineState[13] = hsalsa20Out[8] - engineState[8];
-        engineState[14] = hsalsa20Out[9] - engineState[9];
-
-        // Last 64 bits of input IV
-        engineState[6] = Pack.littleEndianToInt(ivBytes, 16);
-        engineState[7] = Pack.littleEndianToInt(ivBytes, 20);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/engines/XTEAEngine.java b/bcprov/src/main/java/org/bouncycastle/crypto/engines/XTEAEngine.java
deleted file mode 100644
index fb21bbc..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/engines/XTEAEngine.java
+++ /dev/null
@@ -1,188 +0,0 @@
-package org.bouncycastle.crypto.engines;
-
-import org.bouncycastle.crypto.BlockCipher;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.DataLengthException;
-import org.bouncycastle.crypto.OutputLengthException;
-import org.bouncycastle.crypto.params.KeyParameter;
-
-/**
- * An XTEA engine.
- */
-public class XTEAEngine
-    implements BlockCipher
-{
-    private static final int rounds     = 32,
-                             block_size = 8,
-//                             key_size   = 16,
-                             delta      = 0x9E3779B9;
-
-    /*
-     * the expanded key array of 4 subkeys
-     */
-    private int[]   _S    = new int[4],
-                    _sum0 = new int[32],
-                    _sum1 = new int[32];
-    private boolean _initialised,
-                    _forEncryption;
-
-    /**
-     * Create an instance of the TEA encryption algorithm
-     * and set some defaults
-     */
-    public XTEAEngine()
-    {
-        _initialised = false;
-    }
-
-    public String getAlgorithmName()
-    {
-        return "XTEA";
-    }
-
-    public int getBlockSize()
-    {
-        return block_size;
-    }
-
-    /**
-     * initialise
-     *
-     * @param forEncryption whether or not we are for encryption.
-     * @param params the parameters required to set up the cipher.
-     * @exception IllegalArgumentException if the params argument is
-     * inappropriate.
-     */
-    public void init(
-        boolean             forEncryption,
-        CipherParameters    params)
-    {
-        if (!(params instanceof KeyParameter))
-        {
-            throw new IllegalArgumentException("invalid parameter passed to TEA init - " + params.getClass().getName());
-        }
-
-        _forEncryption = forEncryption;
-        _initialised = true;
-
-        KeyParameter       p = (KeyParameter)params;
-
-        setKey(p.getKey());
-    }
-
-    public int processBlock(
-        byte[]  in,
-        int     inOff,
-        byte[]  out,
-        int     outOff)
-    {
-        if (!_initialised)
-        {
-            throw new IllegalStateException(getAlgorithmName()+" not initialised");
-        }
-
-        if ((inOff + block_size) > in.length)
-        {
-            throw new DataLengthException("input buffer too short");
-        }
-
-        if ((outOff + block_size) > out.length)
-        {
-            throw new OutputLengthException("output buffer too short");
-        }
-
-        return (_forEncryption) ? encryptBlock(in, inOff, out, outOff)
-                                    : decryptBlock(in, inOff, out, outOff);
-    }
-
-    public void reset()
-    {
-    }
-
-    /**
-     * Re-key the cipher.
-     * <p>
-     * @param  key  the key to be used
-     */
-    private void setKey(
-        byte[]      key)
-    {
-        if (key.length != 16) 
-        {
-            throw new IllegalArgumentException("Key size must be 128 bits.");
-        }
-
-        int i, j;
-        for (i = j = 0; i < 4; i++,j+=4)
-        {
-            _S[i] = bytesToInt(key, j);
-        }
-            
-        for (i = j = 0; i < rounds; i++)
-        {
-                _sum0[i] = (j + _S[j & 3]);
-                j += delta;
-                _sum1[i] = (j + _S[j >>> 11 & 3]);
-        }
-    }
-
-    private int encryptBlock(
-        byte[]  in,
-        int     inOff,
-        byte[]  out,
-        int     outOff)
-    {
-        // Pack bytes into integers
-        int v0 = bytesToInt(in, inOff);
-        int v1 = bytesToInt(in, inOff + 4);
-
-        for (int i = 0; i < rounds; i++)
-        {
-            v0    += ((v1 << 4 ^ v1 >>> 5) + v1) ^ _sum0[i];
-            v1    += ((v0 << 4 ^ v0 >>> 5) + v0) ^ _sum1[i];
-        }
-
-        unpackInt(v0, out, outOff);
-        unpackInt(v1, out, outOff + 4);
-
-        return block_size;
-    }
-
-    private int decryptBlock(
-        byte[]  in,
-        int     inOff,
-        byte[]  out,
-        int     outOff)
-    {
-        // Pack bytes into integers
-        int v0 = bytesToInt(in, inOff);
-        int v1 = bytesToInt(in, inOff + 4);
-
-        for (int i = rounds-1; i >= 0; i--)
-        {
-            v1  -= ((v0 << 4 ^ v0 >>> 5) + v0) ^ _sum1[i];
-            v0  -= ((v1 << 4 ^ v1 >>> 5) + v1) ^ _sum0[i];
-        }
-
-        unpackInt(v0, out, outOff);
-        unpackInt(v1, out, outOff + 4);
-
-        return block_size;
-    }
-
-    private int bytesToInt(byte[] in, int inOff)
-    {
-        return ((in[inOff++]) << 24) |
-                 ((in[inOff++] & 255) << 16) |
-                 ((in[inOff++] & 255) <<  8) |
-                 ((in[inOff] & 255));
-    }
-
-    private void unpackInt(int v, byte[] out, int outOff)
-    {
-        out[outOff++] = (byte)(v >>> 24);
-        out[outOff++] = (byte)(v >>> 16);
-        out[outOff++] = (byte)(v >>>  8);
-        out[outOff  ] = (byte)v;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/engines/package.html b/bcprov/src/main/java/org/bouncycastle/crypto/engines/package.html
deleted file mode 100644
index e945dac..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/engines/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body bgcolor="#ffffff">
-Basic cipher classes.
-</body>
-</html>
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/examples/DESExample.java b/bcprov/src/main/java/org/bouncycastle/crypto/examples/DESExample.java
deleted file mode 100644
index 90a21de..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/examples/DESExample.java
+++ /dev/null
@@ -1,421 +0,0 @@
-package org.bouncycastle.crypto.examples;
-
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.BufferedReader;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.security.SecureRandom;
-
-import org.bouncycastle.crypto.CryptoException;
-import org.bouncycastle.crypto.KeyGenerationParameters;
-import org.bouncycastle.crypto.engines.DESedeEngine;
-import org.bouncycastle.crypto.generators.DESedeKeyGenerator;
-import org.bouncycastle.crypto.modes.CBCBlockCipher;
-import org.bouncycastle.crypto.paddings.PaddedBufferedBlockCipher;
-import org.bouncycastle.crypto.params.DESedeParameters;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.util.encoders.Hex;
-
-/**
- * DESExample is a simple DES based encryptor/decryptor.
- * <p>
- * The program is command line driven, with the input
- * and output files specified on the command line.
- * <pre>
- * java org.bouncycastle.crypto.examples.DESExample infile outfile [keyfile]
- * </pre>
- * A new key is generated for each encryption, if key is not specified,
- * then the example will assume encryption is required, and as output
- * create deskey.dat in the current directory.  This key is a hex
- * encoded byte-stream that is used for the decryption.  The output
- * file is Hex encoded, 60 characters wide text file.
- * <p>
- * When encrypting;
- * <ul>
- *  <li>the infile is expected to be a byte stream (text or binary)
- *  <li>there is no keyfile specified on the input line
- * </ul>
- * <p>
- * When decrypting;
- * <ul>
- *  <li>the infile is expected to be the 60 character wide base64 
- *    encoded file
- *  <li>the keyfile is expected to be a base64 encoded file
- * </ul>
- * <p>
- * This example shows how to use the light-weight API, DES and
- * the filesystem for message encryption and decryption.
- *
- */
-public class DESExample extends Object
-{
-    // Encrypting or decrypting ?
-    private boolean encrypt = true;
-
-    // To hold the initialised DESede cipher
-    private PaddedBufferedBlockCipher cipher = null;
-
-    // The input stream of bytes to be processed for encryption
-    private BufferedInputStream in = null;
-
-    // The output stream of bytes to be procssed
-    private BufferedOutputStream out = null;
-
-    // The key
-    private byte[] key = null;
-
-    /*
-     * start the application
-     */
-    public static void main(String[] args)
-    {
-        boolean encrypt = true;
-        String infile = null;
-        String outfile = null;
-        String keyfile = null;
-
-        if (args.length < 2)
-        {
-            DESExample de = new DESExample();
-            System.err.println("Usage: java "+de.getClass().getName()+
-                                " infile outfile [keyfile]");
-            System.exit(1);
-        }
-
-        keyfile = "deskey.dat";
-        infile = args[0];
-        outfile = args[1];
-
-        if (args.length > 2)
-        {
-            encrypt = false;
-            keyfile = args[2];
-        }
-
-        DESExample de = new DESExample(infile, outfile, keyfile, encrypt);
-        de.process();
-    }
-
-    // Default constructor, used for the usage message
-    public DESExample()
-    {
-    }
-
-    /*
-     * Constructor, that takes the arguments appropriate for
-     * processing the command line directives.
-     */
-    public DESExample(
-                String infile,
-                String outfile,
-                String keyfile,
-                boolean encrypt)
-    {
-        /* 
-         * First, determine that infile & keyfile exist as appropriate.
-         *
-         * This will also create the BufferedInputStream as required
-         * for reading the input file.  All input files are treated
-         * as if they are binary, even if they contain text, it's the
-         * bytes that are encrypted.
-         */
-        this.encrypt = encrypt;
-        try
-        {
-            in = new BufferedInputStream(new FileInputStream(infile));
-        }
-        catch (FileNotFoundException fnf)
-        {
-            System.err.println("Input file not found ["+infile+"]");
-            System.exit(1);
-        }
-
-        try
-        {
-            out = new BufferedOutputStream(new FileOutputStream(outfile));
-        }
-        catch (IOException fnf)
-        {
-            System.err.println("Output file not created ["+outfile+"]");
-            System.exit(1);
-        }
-
-        if (encrypt)
-        {
-            try
-            {
-                /*
-                 * The process of creating a new key requires a 
-                 * number of steps.
-                 *
-                 * First, create the parameters for the key generator
-                 * which are a secure random number generator, and
-                 * the length of the key (in bits).
-                 */
-                SecureRandom sr = null;
-                try
-                {
-                    sr = new SecureRandom();
-                    /*
-                     * This following call to setSeed() makes the
-                     * initialisation of the SecureRandom object
-                     * _very_ fast, but not secure AT ALL.  
-                     *
-                     * Remove the line, recreate the class file and 
-                     * then run DESExample again to see the difference.
-                     *
-                     * The initialisation of a SecureRandom object
-                     * can take 5 or more seconds depending on the
-                     * CPU that the program is running on.  That can
-                     * be annoying during unit testing.
-                     *     -- jon
-                     */
-                    sr.setSeed("www.bouncycastle.org".getBytes());
-                }
-                catch (Exception nsa)
-                {
-                    System.err.println("Hmmm, no SHA1PRNG, you need the "+
-                                        "Sun implementation");
-                    System.exit(1);
-                }
-                KeyGenerationParameters kgp = new KeyGenerationParameters(
-                                    sr, 
-                                    DESedeParameters.DES_EDE_KEY_LENGTH*8);
-
-                /*
-                 * Second, initialise the key generator with the parameters
-                 */
-                DESedeKeyGenerator kg = new DESedeKeyGenerator();
-                kg.init(kgp);
-
-                /*
-                 * Third, and finally, generate the key
-                 */
-                key = kg.generateKey();
-
-                /*
-                 * We can now output the key to the file, but first
-                 * hex encode the key so that we can have a look
-                 * at it with a text editor if we so desire
-                 */
-                BufferedOutputStream keystream = 
-                    new BufferedOutputStream(new FileOutputStream(keyfile));
-                byte[] keyhex = Hex.encode(key);
-                keystream.write(keyhex, 0, keyhex.length);
-                keystream.flush();
-                keystream.close();
-            }
-            catch (IOException createKey)
-            {
-                System.err.println("Could not decryption create key file "+
-                                    "["+keyfile+"]");
-                System.exit(1);
-            }
-        }
-        else
-        {
-            try
-            {
-                // read the key, and decode from hex encoding
-                BufferedInputStream keystream = 
-                    new BufferedInputStream(new FileInputStream(keyfile));
-                int len = keystream.available();
-                byte[] keyhex = new byte[len];
-                keystream.read(keyhex, 0, len);
-                key = Hex.decode(keyhex);
-            }
-            catch (IOException ioe)
-            {
-                System.err.println("Decryption key file not found, "+
-                                    "or not valid ["+keyfile+"]");
-                System.exit(1);
-            }
-        }
-    }
-
-    private void process()
-    {
-        /* 
-         * Setup the DESede cipher engine, create a PaddedBufferedBlockCipher
-         * in CBC mode.
-         */
-        cipher = new PaddedBufferedBlockCipher(
-                                    new CBCBlockCipher(new DESedeEngine()));
-
-        /*
-         * The input and output streams are currently set up
-         * appropriately, and the key bytes are ready to be
-         * used.
-         *
-         */
-
-        if (encrypt)
-        {
-            performEncrypt(key);
-        }
-        else
-        {
-            performDecrypt(key);
-        }
-
-        // after processing clean up the files
-        try
-        {
-            in.close();
-            out.flush();
-            out.close();
-        }
-        catch (IOException closing)
-        {
-
-        }
-    }
-        
-    /*
-     * This method performs all the encryption and writes
-     * the cipher text to the buffered output stream created
-     * previously.
-     */
-    private void performEncrypt(byte[] key)
-    {
-        // initialise the cipher with the key bytes, for encryption
-        cipher.init(true, new KeyParameter(key));
-
-        /*
-         * Create some temporary byte arrays for use in
-         * encryption, make them a reasonable size so that
-         * we don't spend forever reading small chunks from
-         * a file.
-         *
-         * There is no particular reason for using getBlockSize()
-         * to determine the size of the input chunk.  It just
-         * was a convenient number for the example.  
-         */
-        // int inBlockSize = cipher.getBlockSize() * 5;
-        int inBlockSize = 47;
-        int outBlockSize = cipher.getOutputSize(inBlockSize);
-
-        byte[] inblock = new byte[inBlockSize];
-        byte[] outblock = new byte[outBlockSize];
-
-        /* 
-         * now, read the file, and output the chunks
-         */
-        try
-        {
-            int inL;
-            int outL;
-            byte[] rv = null;
-            while ((inL=in.read(inblock, 0, inBlockSize)) > 0)
-            {
-                outL = cipher.processBytes(inblock, 0, inL, outblock, 0);
-                /*
-                 * Before we write anything out, we need to make sure
-                 * that we've got something to write out. 
-                 */
-                if (outL > 0)
-                {
-                    rv = Hex.encode(outblock, 0, outL);
-                    out.write(rv, 0, rv.length);
-                    out.write('\n');
-                }
-            }
-
-            try
-            {
-                /*
-                 * Now, process the bytes that are still buffered
-                 * within the cipher.
-                 */
-                outL = cipher.doFinal(outblock, 0);
-                if (outL > 0)
-                {
-                    rv = Hex.encode(outblock, 0, outL);
-                    out.write(rv, 0, rv.length);
-                    out.write('\n');
-                }
-            }
-            catch (CryptoException ce)
-            {
-
-            }
-        }
-        catch (IOException ioeread)
-        {
-            ioeread.printStackTrace();
-        }
-    }
-
-    /*
-     * This method performs all the decryption and writes
-     * the plain text to the buffered output stream created
-     * previously.
-     */
-    private void performDecrypt(byte[] key)
-    {    
-        // initialise the cipher for decryption
-        cipher.init(false, new KeyParameter(key));
-
-        /* 
-         * As the decryption is from our preformatted file,
-         * and we know that it's a hex encoded format, then
-         * we wrap the InputStream with a BufferedReader
-         * so that we can read it easily.
-         */
-        BufferedReader br = new BufferedReader(new InputStreamReader(in));
-
-        /* 
-         * now, read the file, and output the chunks
-         */
-        try
-        {
-            int outL;
-            byte[] inblock = null;
-            byte[] outblock = null;
-            String rv = null;
-            while ((rv = br.readLine()) != null)
-            {
-                inblock = Hex.decode(rv);
-                outblock = new byte[cipher.getOutputSize(inblock.length)];
-
-                outL = cipher.processBytes(inblock, 0, inblock.length, 
-                                            outblock, 0);
-                /*
-                 * Before we write anything out, we need to make sure
-                 * that we've got something to write out. 
-                 */
-                if (outL > 0)
-                {
-                    out.write(outblock, 0, outL);
-                }
-            }
-
-            try
-            {
-                /*
-                 * Now, process the bytes that are still buffered
-                 * within the cipher.
-                 */
-                outL = cipher.doFinal(outblock, 0);
-                if (outL > 0)
-                {
-                    out.write(outblock, 0, outL);
-                }
-            }
-            catch (CryptoException ce)
-            {
-
-            }
-        }
-        catch (IOException ioeread)
-        {
-            ioeread.printStackTrace();
-        }
-    }
-
-}
-
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/examples/JPAKEExample.java b/bcprov/src/main/java/org/bouncycastle/crypto/examples/JPAKEExample.java
deleted file mode 100644
index f0065f4..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/examples/JPAKEExample.java
+++ /dev/null
@@ -1,214 +0,0 @@
-package org.bouncycastle.crypto.examples;
-
-import java.math.BigInteger;
-import java.security.SecureRandom;
-
-import org.bouncycastle.crypto.CryptoException;
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.agreement.jpake.JPAKEPrimeOrderGroup;
-import org.bouncycastle.crypto.agreement.jpake.JPAKEPrimeOrderGroups;
-import org.bouncycastle.crypto.agreement.jpake.JPAKEParticipant;
-import org.bouncycastle.crypto.agreement.jpake.JPAKERound1Payload;
-import org.bouncycastle.crypto.agreement.jpake.JPAKERound2Payload;
-import org.bouncycastle.crypto.agreement.jpake.JPAKERound3Payload;
-import org.bouncycastle.crypto.digests.SHA256Digest;
-
-/**
- * An example of a J-PAKE exchange.
- * <p>
- * 
- * In this example, both Alice and Bob are on the same computer (in the same JVM, in fact).
- * In reality, Alice and Bob would be in different locations,
- * and would be sending their generated payloads to each other.
- */
-public class JPAKEExample
-{
-
-    public static void main(String args[]) throws CryptoException
-    {
-        /*
-         * Initialization
-         * 
-         * Pick an appropriate prime order group to use throughout the exchange.
-         * Note that both participants must use the same group.
-         */
-        JPAKEPrimeOrderGroup group = JPAKEPrimeOrderGroups.NIST_3072;
-
-        BigInteger p = group.getP();
-        BigInteger q = group.getQ();
-        BigInteger g = group.getG();
-
-        String alicePassword = "password";
-        String bobPassword = "password";
-
-        System.out.println("********* Initialization **********");
-        System.out.println("Public parameters for the cyclic group:");
-        System.out.println("p (" + p.bitLength() + " bits): " + p.toString(16));
-        System.out.println("q (" + q.bitLength() + " bits): " + q.toString(16));
-        System.out.println("g (" + p.bitLength() + " bits): " + g.toString(16));
-        System.out.println("p mod q = " + p.mod(q).toString(16));
-        System.out.println("g^{q} mod p = " + g.modPow(q, p).toString(16));
-        System.out.println("");
-
-        System.out.println("(Secret passwords used by Alice and Bob: " +
-                "\"" + alicePassword + "\" and \"" + bobPassword + "\")\n");
-
-        /*
-         * Both participants must use the same hashing algorithm.
-         */
-        Digest digest = new SHA256Digest();
-        SecureRandom random = new SecureRandom();
-
-        JPAKEParticipant alice = new JPAKEParticipant("alice", alicePassword.toCharArray(), group, digest, random);
-        JPAKEParticipant bob = new JPAKEParticipant("bob", bobPassword.toCharArray(), group, digest, random);
-
-        /*
-         * Round 1
-         * 
-         * Alice and Bob each generate a round 1 payload, and send it to each other.
-         */
-
-        JPAKERound1Payload aliceRound1Payload = alice.createRound1PayloadToSend();
-        JPAKERound1Payload bobRound1Payload = bob.createRound1PayloadToSend();
-
-        System.out.println("************ Round 1 **************");
-        System.out.println("Alice sends to Bob: ");
-        System.out.println("g^{x1}=" + aliceRound1Payload.getGx1().toString(16));
-        System.out.println("g^{x2}=" + aliceRound1Payload.getGx2().toString(16));
-        System.out.println("KP{x1}={" + aliceRound1Payload.getKnowledgeProofForX1()[0].toString(16) + "};{" + aliceRound1Payload.getKnowledgeProofForX1()[1].toString(16) + "}");
-        System.out.println("KP{x2}={" + aliceRound1Payload.getKnowledgeProofForX2()[0].toString(16) + "};{" + aliceRound1Payload.getKnowledgeProofForX2()[1].toString(16) + "}");
-        System.out.println("");
-
-        System.out.println("Bob sends to Alice: ");
-        System.out.println("g^{x3}=" + bobRound1Payload.getGx1().toString(16));
-        System.out.println("g^{x4}=" + bobRound1Payload.getGx2().toString(16));
-        System.out.println("KP{x3}={" + bobRound1Payload.getKnowledgeProofForX1()[0].toString(16) + "};{" + bobRound1Payload.getKnowledgeProofForX1()[1].toString(16) + "}");
-        System.out.println("KP{x4}={" + bobRound1Payload.getKnowledgeProofForX2()[0].toString(16) + "};{" + bobRound1Payload.getKnowledgeProofForX2()[1].toString(16) + "}");
-        System.out.println("");
-
-        /*
-         * Each participant must then validate the received payload for round 1
-         */
-
-        alice.validateRound1PayloadReceived(bobRound1Payload);
-        System.out.println("Alice checks g^{x4}!=1: OK");
-        System.out.println("Alice checks KP{x3}: OK");
-        System.out.println("Alice checks KP{x4}: OK");
-        System.out.println("");
-
-        bob.validateRound1PayloadReceived(aliceRound1Payload);
-        System.out.println("Bob checks g^{x2}!=1: OK");
-        System.out.println("Bob checks KP{x1},: OK");
-        System.out.println("Bob checks KP{x2},: OK");
-        System.out.println("");
-
-        /*
-         * Round 2
-         * 
-         * Alice and Bob each generate a round 2 payload, and send it to each other.
-         */
-
-        JPAKERound2Payload aliceRound2Payload = alice.createRound2PayloadToSend();
-        JPAKERound2Payload bobRound2Payload = bob.createRound2PayloadToSend();
-
-        System.out.println("************ Round 2 **************");
-        System.out.println("Alice sends to Bob: ");
-        System.out.println("A=" + aliceRound2Payload.getA().toString(16));
-        System.out.println("KP{x2*s}={" + aliceRound2Payload.getKnowledgeProofForX2s()[0].toString(16) + "},{" + aliceRound2Payload.getKnowledgeProofForX2s()[1].toString(16) + "}");
-        System.out.println("");
-
-        System.out.println("Bob sends to Alice");
-        System.out.println("B=" + bobRound2Payload.getA().toString(16));
-        System.out.println("KP{x4*s}={" + bobRound2Payload.getKnowledgeProofForX2s()[0].toString(16) + "},{" + bobRound2Payload.getKnowledgeProofForX2s()[1].toString(16) + "}");
-        System.out.println("");
-
-        /*
-         * Each participant must then validate the received payload for round 2
-         */
-
-        alice.validateRound2PayloadReceived(bobRound2Payload);
-        System.out.println("Alice checks KP{x4*s}: OK\n");
-
-        bob.validateRound2PayloadReceived(aliceRound2Payload);
-        System.out.println("Bob checks KP{x2*s}: OK\n");
-
-        /*
-         * After round 2, each participant computes the keying material.
-         */
-
-        BigInteger aliceKeyingMaterial = alice.calculateKeyingMaterial();
-        BigInteger bobKeyingMaterial = bob.calculateKeyingMaterial();
-
-        System.out.println("********* After round 2 ***********");
-        System.out.println("Alice computes key material \t K=" + aliceKeyingMaterial.toString(16));
-        System.out.println("Bob computes key material \t K=" + bobKeyingMaterial.toString(16));
-        System.out.println();
-        
-        
-        /*
-         * You must derive a session key from the keying material applicable
-         * to whatever encryption algorithm you want to use.
-         */
-        
-        BigInteger aliceKey = deriveSessionKey(aliceKeyingMaterial);
-        BigInteger bobKey = deriveSessionKey(bobKeyingMaterial);
-        
-        /*
-         * At this point, you can stop and use the session keys if you want.
-         * This is implicit key confirmation.
-         * 
-         * If you want to explicitly confirm that the key material matches,
-         * you can continue on and perform round 3.
-         */
-        
-        /*
-         * Round 3
-         * 
-         * Alice and Bob each generate a round 3 payload, and send it to each other.
-         */
-
-        JPAKERound3Payload aliceRound3Payload = alice.createRound3PayloadToSend(aliceKeyingMaterial);
-        JPAKERound3Payload bobRound3Payload = bob.createRound3PayloadToSend(bobKeyingMaterial);
-
-        System.out.println("************ Round 3 **************");
-        System.out.println("Alice sends to Bob: ");
-        System.out.println("MacTag=" + aliceRound3Payload.getMacTag().toString(16));
-        System.out.println("");
-        System.out.println("Bob sends to Alice: ");
-        System.out.println("MacTag=" + bobRound3Payload.getMacTag().toString(16));
-        System.out.println("");
-
-        /*
-         * Each participant must then validate the received payload for round 3
-         */
-
-        alice.validateRound3PayloadReceived(bobRound3Payload, aliceKeyingMaterial);
-        System.out.println("Alice checks MacTag: OK\n");
-
-        bob.validateRound3PayloadReceived(aliceRound3Payload, bobKeyingMaterial);
-        System.out.println("Bob checks MacTag: OK\n");
-
-        System.out.println();
-        System.out.println("MacTags validated, therefore the keying material matches.");
-    }
-
-    private static BigInteger deriveSessionKey(BigInteger keyingMaterial)
-    {
-        /*
-         * You should use a secure key derivation function (KDF) to derive the session key.
-         * 
-         * For the purposes of this example, I'm just going to use a hash of the keying material.
-         */
-        SHA256Digest digest = new SHA256Digest();
-        
-        byte[] keyByteArray = keyingMaterial.toByteArray();
-        
-        byte[] output = new byte[digest.getDigestSize()];
-        
-        digest.update(keyByteArray, 0, keyByteArray.length);
-
-        digest.doFinal(output, 0);
-
-        return new BigInteger(output);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/examples/package.html b/bcprov/src/main/java/org/bouncycastle/crypto/examples/package.html
deleted file mode 100644
index 390a540..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/examples/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body bgcolor="#ffffff">
-Simple examples of light weight API usage.
-</body>
-</html>
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/generators/BCrypt.java b/bcprov/src/main/java/org/bouncycastle/crypto/generators/BCrypt.java
deleted file mode 100644
index 43d657d..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/generators/BCrypt.java
+++ /dev/null
@@ -1,660 +0,0 @@
-package org.bouncycastle.crypto.generators;
-
-import org.bouncycastle.crypto.DataLengthException;
-import org.bouncycastle.util.Arrays;
-
-/**
- * Core of password hashing scheme Bcrypt,
- * designed by Niels Provos and David Mazières,
- * corresponds to the C reference implementation.
- * <p>
- * This implementation does not correspondent to the 1999 published paper
- * "A Future-Adaptable Password Scheme" of Niels Provos and David Mazières,
- * see: https://www.usenix.org/legacy/events/usenix99/provos/provos_html/node1.html.
- * In contrast to the paper, the order of key setup and salt setup is reversed:
- * state <- ExpandKey(state, 0, key)
- * state <- ExpandKey(state, 0, salt)
- * This corresponds to the OpenBSD reference implementation of Bcrypt. 
- * </p><p>
- * Note: 
- * There is no successful cryptanalysis (status 2015), but
- * the amount of memory and the band width of Bcrypt
- * may be insufficient to effectively prevent attacks 
- * with custom hardware like FPGAs, ASICs
- * </p><p>
- * This implementation uses some parts of Bouncy Castle's BlowfishEngine.
- * </p>
- */
-public final class BCrypt
-{
-    private static final BCrypt INSTANCE = new BCrypt();
-
-    // magic String "OrpheanBeholderScryDoubt" is used as clear text for encryption
-    private static final int[] MAGIC_STRING =
-        {
-            0x4F727068, 0x65616E42, 0x65686F6C,
-            0x64657253, 0x63727944, 0x6F756274
-        };
-    final static int MAGIC_STRING_LENGTH = 6;
-
-
-    private final static int[]
-        KP = {
-        0x243F6A88, 0x85A308D3, 0x13198A2E, 0x03707344,
-        0xA4093822, 0x299F31D0, 0x082EFA98, 0xEC4E6C89,
-        0x452821E6, 0x38D01377, 0xBE5466CF, 0x34E90C6C,
-        0xC0AC29B7, 0xC97C50DD, 0x3F84D5B5, 0xB5470917,
-        0x9216D5D9, 0x8979FB1B
-    },
-
-    KS0 = {
-        0xD1310BA6, 0x98DFB5AC, 0x2FFD72DB, 0xD01ADFB7,
-        0xB8E1AFED, 0x6A267E96, 0xBA7C9045, 0xF12C7F99,
-        0x24A19947, 0xB3916CF7, 0x0801F2E2, 0x858EFC16,
-        0x636920D8, 0x71574E69, 0xA458FEA3, 0xF4933D7E,
-        0x0D95748F, 0x728EB658, 0x718BCD58, 0x82154AEE,
-        0x7B54A41D, 0xC25A59B5, 0x9C30D539, 0x2AF26013,
-        0xC5D1B023, 0x286085F0, 0xCA417918, 0xB8DB38EF,
-        0x8E79DCB0, 0x603A180E, 0x6C9E0E8B, 0xB01E8A3E,
-        0xD71577C1, 0xBD314B27, 0x78AF2FDA, 0x55605C60,
-        0xE65525F3, 0xAA55AB94, 0x57489862, 0x63E81440,
-        0x55CA396A, 0x2AAB10B6, 0xB4CC5C34, 0x1141E8CE,
-        0xA15486AF, 0x7C72E993, 0xB3EE1411, 0x636FBC2A,
-        0x2BA9C55D, 0x741831F6, 0xCE5C3E16, 0x9B87931E,
-        0xAFD6BA33, 0x6C24CF5C, 0x7A325381, 0x28958677,
-        0x3B8F4898, 0x6B4BB9AF, 0xC4BFE81B, 0x66282193,
-        0x61D809CC, 0xFB21A991, 0x487CAC60, 0x5DEC8032,
-        0xEF845D5D, 0xE98575B1, 0xDC262302, 0xEB651B88,
-        0x23893E81, 0xD396ACC5, 0x0F6D6FF3, 0x83F44239,
-        0x2E0B4482, 0xA4842004, 0x69C8F04A, 0x9E1F9B5E,
-        0x21C66842, 0xF6E96C9A, 0x670C9C61, 0xABD388F0,
-        0x6A51A0D2, 0xD8542F68, 0x960FA728, 0xAB5133A3,
-        0x6EEF0B6C, 0x137A3BE4, 0xBA3BF050, 0x7EFB2A98,
-        0xA1F1651D, 0x39AF0176, 0x66CA593E, 0x82430E88,
-        0x8CEE8619, 0x456F9FB4, 0x7D84A5C3, 0x3B8B5EBE,
-        0xE06F75D8, 0x85C12073, 0x401A449F, 0x56C16AA6,
-        0x4ED3AA62, 0x363F7706, 0x1BFEDF72, 0x429B023D,
-        0x37D0D724, 0xD00A1248, 0xDB0FEAD3, 0x49F1C09B,
-        0x075372C9, 0x80991B7B, 0x25D479D8, 0xF6E8DEF7,
-        0xE3FE501A, 0xB6794C3B, 0x976CE0BD, 0x04C006BA,
-        0xC1A94FB6, 0x409F60C4, 0x5E5C9EC2, 0x196A2463,
-        0x68FB6FAF, 0x3E6C53B5, 0x1339B2EB, 0x3B52EC6F,
-        0x6DFC511F, 0x9B30952C, 0xCC814544, 0xAF5EBD09,
-        0xBEE3D004, 0xDE334AFD, 0x660F2807, 0x192E4BB3,
-        0xC0CBA857, 0x45C8740F, 0xD20B5F39, 0xB9D3FBDB,
-        0x5579C0BD, 0x1A60320A, 0xD6A100C6, 0x402C7279,
-        0x679F25FE, 0xFB1FA3CC, 0x8EA5E9F8, 0xDB3222F8,
-        0x3C7516DF, 0xFD616B15, 0x2F501EC8, 0xAD0552AB,
-        0x323DB5FA, 0xFD238760, 0x53317B48, 0x3E00DF82,
-        0x9E5C57BB, 0xCA6F8CA0, 0x1A87562E, 0xDF1769DB,
-        0xD542A8F6, 0x287EFFC3, 0xAC6732C6, 0x8C4F5573,
-        0x695B27B0, 0xBBCA58C8, 0xE1FFA35D, 0xB8F011A0,
-        0x10FA3D98, 0xFD2183B8, 0x4AFCB56C, 0x2DD1D35B,
-        0x9A53E479, 0xB6F84565, 0xD28E49BC, 0x4BFB9790,
-        0xE1DDF2DA, 0xA4CB7E33, 0x62FB1341, 0xCEE4C6E8,
-        0xEF20CADA, 0x36774C01, 0xD07E9EFE, 0x2BF11FB4,
-        0x95DBDA4D, 0xAE909198, 0xEAAD8E71, 0x6B93D5A0,
-        0xD08ED1D0, 0xAFC725E0, 0x8E3C5B2F, 0x8E7594B7,
-        0x8FF6E2FB, 0xF2122B64, 0x8888B812, 0x900DF01C,
-        0x4FAD5EA0, 0x688FC31C, 0xD1CFF191, 0xB3A8C1AD,
-        0x2F2F2218, 0xBE0E1777, 0xEA752DFE, 0x8B021FA1,
-        0xE5A0CC0F, 0xB56F74E8, 0x18ACF3D6, 0xCE89E299,
-        0xB4A84FE0, 0xFD13E0B7, 0x7CC43B81, 0xD2ADA8D9,
-        0x165FA266, 0x80957705, 0x93CC7314, 0x211A1477,
-        0xE6AD2065, 0x77B5FA86, 0xC75442F5, 0xFB9D35CF,
-        0xEBCDAF0C, 0x7B3E89A0, 0xD6411BD3, 0xAE1E7E49,
-        0x00250E2D, 0x2071B35E, 0x226800BB, 0x57B8E0AF,
-        0x2464369B, 0xF009B91E, 0x5563911D, 0x59DFA6AA,
-        0x78C14389, 0xD95A537F, 0x207D5BA2, 0x02E5B9C5,
-        0x83260376, 0x6295CFA9, 0x11C81968, 0x4E734A41,
-        0xB3472DCA, 0x7B14A94A, 0x1B510052, 0x9A532915,
-        0xD60F573F, 0xBC9BC6E4, 0x2B60A476, 0x81E67400,
-        0x08BA6FB5, 0x571BE91F, 0xF296EC6B, 0x2A0DD915,
-        0xB6636521, 0xE7B9F9B6, 0xFF34052E, 0xC5855664,
-        0x53B02D5D, 0xA99F8FA1, 0x08BA4799, 0x6E85076A
-    },
-
-    KS1 = {
-        0x4B7A70E9, 0xB5B32944, 0xDB75092E, 0xC4192623,
-        0xAD6EA6B0, 0x49A7DF7D, 0x9CEE60B8, 0x8FEDB266,
-        0xECAA8C71, 0x699A17FF, 0x5664526C, 0xC2B19EE1,
-        0x193602A5, 0x75094C29, 0xA0591340, 0xE4183A3E,
-        0x3F54989A, 0x5B429D65, 0x6B8FE4D6, 0x99F73FD6,
-        0xA1D29C07, 0xEFE830F5, 0x4D2D38E6, 0xF0255DC1,
-        0x4CDD2086, 0x8470EB26, 0x6382E9C6, 0x021ECC5E,
-        0x09686B3F, 0x3EBAEFC9, 0x3C971814, 0x6B6A70A1,
-        0x687F3584, 0x52A0E286, 0xB79C5305, 0xAA500737,
-        0x3E07841C, 0x7FDEAE5C, 0x8E7D44EC, 0x5716F2B8,
-        0xB03ADA37, 0xF0500C0D, 0xF01C1F04, 0x0200B3FF,
-        0xAE0CF51A, 0x3CB574B2, 0x25837A58, 0xDC0921BD,
-        0xD19113F9, 0x7CA92FF6, 0x94324773, 0x22F54701,
-        0x3AE5E581, 0x37C2DADC, 0xC8B57634, 0x9AF3DDA7,
-        0xA9446146, 0x0FD0030E, 0xECC8C73E, 0xA4751E41,
-        0xE238CD99, 0x3BEA0E2F, 0x3280BBA1, 0x183EB331,
-        0x4E548B38, 0x4F6DB908, 0x6F420D03, 0xF60A04BF,
-        0x2CB81290, 0x24977C79, 0x5679B072, 0xBCAF89AF,
-        0xDE9A771F, 0xD9930810, 0xB38BAE12, 0xDCCF3F2E,
-        0x5512721F, 0x2E6B7124, 0x501ADDE6, 0x9F84CD87,
-        0x7A584718, 0x7408DA17, 0xBC9F9ABC, 0xE94B7D8C,
-        0xEC7AEC3A, 0xDB851DFA, 0x63094366, 0xC464C3D2,
-        0xEF1C1847, 0x3215D908, 0xDD433B37, 0x24C2BA16,
-        0x12A14D43, 0x2A65C451, 0x50940002, 0x133AE4DD,
-        0x71DFF89E, 0x10314E55, 0x81AC77D6, 0x5F11199B,
-        0x043556F1, 0xD7A3C76B, 0x3C11183B, 0x5924A509,
-        0xF28FE6ED, 0x97F1FBFA, 0x9EBABF2C, 0x1E153C6E,
-        0x86E34570, 0xEAE96FB1, 0x860E5E0A, 0x5A3E2AB3,
-        0x771FE71C, 0x4E3D06FA, 0x2965DCB9, 0x99E71D0F,
-        0x803E89D6, 0x5266C825, 0x2E4CC978, 0x9C10B36A,
-        0xC6150EBA, 0x94E2EA78, 0xA5FC3C53, 0x1E0A2DF4,
-        0xF2F74EA7, 0x361D2B3D, 0x1939260F, 0x19C27960,
-        0x5223A708, 0xF71312B6, 0xEBADFE6E, 0xEAC31F66,
-        0xE3BC4595, 0xA67BC883, 0xB17F37D1, 0x018CFF28,
-        0xC332DDEF, 0xBE6C5AA5, 0x65582185, 0x68AB9802,
-        0xEECEA50F, 0xDB2F953B, 0x2AEF7DAD, 0x5B6E2F84,
-        0x1521B628, 0x29076170, 0xECDD4775, 0x619F1510,
-        0x13CCA830, 0xEB61BD96, 0x0334FE1E, 0xAA0363CF,
-        0xB5735C90, 0x4C70A239, 0xD59E9E0B, 0xCBAADE14,
-        0xEECC86BC, 0x60622CA7, 0x9CAB5CAB, 0xB2F3846E,
-        0x648B1EAF, 0x19BDF0CA, 0xA02369B9, 0x655ABB50,
-        0x40685A32, 0x3C2AB4B3, 0x319EE9D5, 0xC021B8F7,
-        0x9B540B19, 0x875FA099, 0x95F7997E, 0x623D7DA8,
-        0xF837889A, 0x97E32D77, 0x11ED935F, 0x16681281,
-        0x0E358829, 0xC7E61FD6, 0x96DEDFA1, 0x7858BA99,
-        0x57F584A5, 0x1B227263, 0x9B83C3FF, 0x1AC24696,
-        0xCDB30AEB, 0x532E3054, 0x8FD948E4, 0x6DBC3128,
-        0x58EBF2EF, 0x34C6FFEA, 0xFE28ED61, 0xEE7C3C73,
-        0x5D4A14D9, 0xE864B7E3, 0x42105D14, 0x203E13E0,
-        0x45EEE2B6, 0xA3AAABEA, 0xDB6C4F15, 0xFACB4FD0,
-        0xC742F442, 0xEF6ABBB5, 0x654F3B1D, 0x41CD2105,
-        0xD81E799E, 0x86854DC7, 0xE44B476A, 0x3D816250,
-        0xCF62A1F2, 0x5B8D2646, 0xFC8883A0, 0xC1C7B6A3,
-        0x7F1524C3, 0x69CB7492, 0x47848A0B, 0x5692B285,
-        0x095BBF00, 0xAD19489D, 0x1462B174, 0x23820E00,
-        0x58428D2A, 0x0C55F5EA, 0x1DADF43E, 0x233F7061,
-        0x3372F092, 0x8D937E41, 0xD65FECF1, 0x6C223BDB,
-        0x7CDE3759, 0xCBEE7460, 0x4085F2A7, 0xCE77326E,
-        0xA6078084, 0x19F8509E, 0xE8EFD855, 0x61D99735,
-        0xA969A7AA, 0xC50C06C2, 0x5A04ABFC, 0x800BCADC,
-        0x9E447A2E, 0xC3453484, 0xFDD56705, 0x0E1E9EC9,
-        0xDB73DBD3, 0x105588CD, 0x675FDA79, 0xE3674340,
-        0xC5C43465, 0x713E38D8, 0x3D28F89E, 0xF16DFF20,
-        0x153E21E7, 0x8FB03D4A, 0xE6E39F2B, 0xDB83ADF7
-    },
-
-    KS2 = {
-        0xE93D5A68, 0x948140F7, 0xF64C261C, 0x94692934,
-        0x411520F7, 0x7602D4F7, 0xBCF46B2E, 0xD4A20068,
-        0xD4082471, 0x3320F46A, 0x43B7D4B7, 0x500061AF,
-        0x1E39F62E, 0x97244546, 0x14214F74, 0xBF8B8840,
-        0x4D95FC1D, 0x96B591AF, 0x70F4DDD3, 0x66A02F45,
-        0xBFBC09EC, 0x03BD9785, 0x7FAC6DD0, 0x31CB8504,
-        0x96EB27B3, 0x55FD3941, 0xDA2547E6, 0xABCA0A9A,
-        0x28507825, 0x530429F4, 0x0A2C86DA, 0xE9B66DFB,
-        0x68DC1462, 0xD7486900, 0x680EC0A4, 0x27A18DEE,
-        0x4F3FFEA2, 0xE887AD8C, 0xB58CE006, 0x7AF4D6B6,
-        0xAACE1E7C, 0xD3375FEC, 0xCE78A399, 0x406B2A42,
-        0x20FE9E35, 0xD9F385B9, 0xEE39D7AB, 0x3B124E8B,
-        0x1DC9FAF7, 0x4B6D1856, 0x26A36631, 0xEAE397B2,
-        0x3A6EFA74, 0xDD5B4332, 0x6841E7F7, 0xCA7820FB,
-        0xFB0AF54E, 0xD8FEB397, 0x454056AC, 0xBA489527,
-        0x55533A3A, 0x20838D87, 0xFE6BA9B7, 0xD096954B,
-        0x55A867BC, 0xA1159A58, 0xCCA92963, 0x99E1DB33,
-        0xA62A4A56, 0x3F3125F9, 0x5EF47E1C, 0x9029317C,
-        0xFDF8E802, 0x04272F70, 0x80BB155C, 0x05282CE3,
-        0x95C11548, 0xE4C66D22, 0x48C1133F, 0xC70F86DC,
-        0x07F9C9EE, 0x41041F0F, 0x404779A4, 0x5D886E17,
-        0x325F51EB, 0xD59BC0D1, 0xF2BCC18F, 0x41113564,
-        0x257B7834, 0x602A9C60, 0xDFF8E8A3, 0x1F636C1B,
-        0x0E12B4C2, 0x02E1329E, 0xAF664FD1, 0xCAD18115,
-        0x6B2395E0, 0x333E92E1, 0x3B240B62, 0xEEBEB922,
-        0x85B2A20E, 0xE6BA0D99, 0xDE720C8C, 0x2DA2F728,
-        0xD0127845, 0x95B794FD, 0x647D0862, 0xE7CCF5F0,
-        0x5449A36F, 0x877D48FA, 0xC39DFD27, 0xF33E8D1E,
-        0x0A476341, 0x992EFF74, 0x3A6F6EAB, 0xF4F8FD37,
-        0xA812DC60, 0xA1EBDDF8, 0x991BE14C, 0xDB6E6B0D,
-        0xC67B5510, 0x6D672C37, 0x2765D43B, 0xDCD0E804,
-        0xF1290DC7, 0xCC00FFA3, 0xB5390F92, 0x690FED0B,
-        0x667B9FFB, 0xCEDB7D9C, 0xA091CF0B, 0xD9155EA3,
-        0xBB132F88, 0x515BAD24, 0x7B9479BF, 0x763BD6EB,
-        0x37392EB3, 0xCC115979, 0x8026E297, 0xF42E312D,
-        0x6842ADA7, 0xC66A2B3B, 0x12754CCC, 0x782EF11C,
-        0x6A124237, 0xB79251E7, 0x06A1BBE6, 0x4BFB6350,
-        0x1A6B1018, 0x11CAEDFA, 0x3D25BDD8, 0xE2E1C3C9,
-        0x44421659, 0x0A121386, 0xD90CEC6E, 0xD5ABEA2A,
-        0x64AF674E, 0xDA86A85F, 0xBEBFE988, 0x64E4C3FE,
-        0x9DBC8057, 0xF0F7C086, 0x60787BF8, 0x6003604D,
-        0xD1FD8346, 0xF6381FB0, 0x7745AE04, 0xD736FCCC,
-        0x83426B33, 0xF01EAB71, 0xB0804187, 0x3C005E5F,
-        0x77A057BE, 0xBDE8AE24, 0x55464299, 0xBF582E61,
-        0x4E58F48F, 0xF2DDFDA2, 0xF474EF38, 0x8789BDC2,
-        0x5366F9C3, 0xC8B38E74, 0xB475F255, 0x46FCD9B9,
-        0x7AEB2661, 0x8B1DDF84, 0x846A0E79, 0x915F95E2,
-        0x466E598E, 0x20B45770, 0x8CD55591, 0xC902DE4C,
-        0xB90BACE1, 0xBB8205D0, 0x11A86248, 0x7574A99E,
-        0xB77F19B6, 0xE0A9DC09, 0x662D09A1, 0xC4324633,
-        0xE85A1F02, 0x09F0BE8C, 0x4A99A025, 0x1D6EFE10,
-        0x1AB93D1D, 0x0BA5A4DF, 0xA186F20F, 0x2868F169,
-        0xDCB7DA83, 0x573906FE, 0xA1E2CE9B, 0x4FCD7F52,
-        0x50115E01, 0xA70683FA, 0xA002B5C4, 0x0DE6D027,
-        0x9AF88C27, 0x773F8641, 0xC3604C06, 0x61A806B5,
-        0xF0177A28, 0xC0F586E0, 0x006058AA, 0x30DC7D62,
-        0x11E69ED7, 0x2338EA63, 0x53C2DD94, 0xC2C21634,
-        0xBBCBEE56, 0x90BCB6DE, 0xEBFC7DA1, 0xCE591D76,
-        0x6F05E409, 0x4B7C0188, 0x39720A3D, 0x7C927C24,
-        0x86E3725F, 0x724D9DB9, 0x1AC15BB4, 0xD39EB8FC,
-        0xED545578, 0x08FCA5B5, 0xD83D7CD3, 0x4DAD0FC4,
-        0x1E50EF5E, 0xB161E6F8, 0xA28514D9, 0x6C51133C,
-        0x6FD5C7E7, 0x56E14EC4, 0x362ABFCE, 0xDDC6C837,
-        0xD79A3234, 0x92638212, 0x670EFA8E, 0x406000E0
-    },
-
-    KS3 = {
-        0x3A39CE37, 0xD3FAF5CF, 0xABC27737, 0x5AC52D1B,
-        0x5CB0679E, 0x4FA33742, 0xD3822740, 0x99BC9BBE,
-        0xD5118E9D, 0xBF0F7315, 0xD62D1C7E, 0xC700C47B,
-        0xB78C1B6B, 0x21A19045, 0xB26EB1BE, 0x6A366EB4,
-        0x5748AB2F, 0xBC946E79, 0xC6A376D2, 0x6549C2C8,
-        0x530FF8EE, 0x468DDE7D, 0xD5730A1D, 0x4CD04DC6,
-        0x2939BBDB, 0xA9BA4650, 0xAC9526E8, 0xBE5EE304,
-        0xA1FAD5F0, 0x6A2D519A, 0x63EF8CE2, 0x9A86EE22,
-        0xC089C2B8, 0x43242EF6, 0xA51E03AA, 0x9CF2D0A4,
-        0x83C061BA, 0x9BE96A4D, 0x8FE51550, 0xBA645BD6,
-        0x2826A2F9, 0xA73A3AE1, 0x4BA99586, 0xEF5562E9,
-        0xC72FEFD3, 0xF752F7DA, 0x3F046F69, 0x77FA0A59,
-        0x80E4A915, 0x87B08601, 0x9B09E6AD, 0x3B3EE593,
-        0xE990FD5A, 0x9E34D797, 0x2CF0B7D9, 0x022B8B51,
-        0x96D5AC3A, 0x017DA67D, 0xD1CF3ED6, 0x7C7D2D28,
-        0x1F9F25CF, 0xADF2B89B, 0x5AD6B472, 0x5A88F54C,
-        0xE029AC71, 0xE019A5E6, 0x47B0ACFD, 0xED93FA9B,
-        0xE8D3C48D, 0x283B57CC, 0xF8D56629, 0x79132E28,
-        0x785F0191, 0xED756055, 0xF7960E44, 0xE3D35E8C,
-        0x15056DD4, 0x88F46DBA, 0x03A16125, 0x0564F0BD,
-        0xC3EB9E15, 0x3C9057A2, 0x97271AEC, 0xA93A072A,
-        0x1B3F6D9B, 0x1E6321F5, 0xF59C66FB, 0x26DCF319,
-        0x7533D928, 0xB155FDF5, 0x03563482, 0x8ABA3CBB,
-        0x28517711, 0xC20AD9F8, 0xABCC5167, 0xCCAD925F,
-        0x4DE81751, 0x3830DC8E, 0x379D5862, 0x9320F991,
-        0xEA7A90C2, 0xFB3E7BCE, 0x5121CE64, 0x774FBE32,
-        0xA8B6E37E, 0xC3293D46, 0x48DE5369, 0x6413E680,
-        0xA2AE0810, 0xDD6DB224, 0x69852DFD, 0x09072166,
-        0xB39A460A, 0x6445C0DD, 0x586CDECF, 0x1C20C8AE,
-        0x5BBEF7DD, 0x1B588D40, 0xCCD2017F, 0x6BB4E3BB,
-        0xDDA26A7E, 0x3A59FF45, 0x3E350A44, 0xBCB4CDD5,
-        0x72EACEA8, 0xFA6484BB, 0x8D6612AE, 0xBF3C6F47,
-        0xD29BE463, 0x542F5D9E, 0xAEC2771B, 0xF64E6370,
-        0x740E0D8D, 0xE75B1357, 0xF8721671, 0xAF537D5D,
-        0x4040CB08, 0x4EB4E2CC, 0x34D2466A, 0x0115AF84,
-        0xE1B00428, 0x95983A1D, 0x06B89FB4, 0xCE6EA048,
-        0x6F3F3B82, 0x3520AB82, 0x011A1D4B, 0x277227F8,
-        0x611560B1, 0xE7933FDC, 0xBB3A792B, 0x344525BD,
-        0xA08839E1, 0x51CE794B, 0x2F32C9B7, 0xA01FBAC9,
-        0xE01CC87E, 0xBCC7D1F6, 0xCF0111C3, 0xA1E8AAC7,
-        0x1A908749, 0xD44FBD9A, 0xD0DADECB, 0xD50ADA38,
-        0x0339C32A, 0xC6913667, 0x8DF9317C, 0xE0B12B4F,
-        0xF79E59B7, 0x43F5BB3A, 0xF2D519FF, 0x27D9459C,
-        0xBF97222C, 0x15E6FC2A, 0x0F91FC71, 0x9B941525,
-        0xFAE59361, 0xCEB69CEB, 0xC2A86459, 0x12BAA8D1,
-        0xB6C1075E, 0xE3056A0C, 0x10D25065, 0xCB03A442,
-        0xE0EC6E0E, 0x1698DB3B, 0x4C98A0BE, 0x3278E964,
-        0x9F1F9532, 0xE0D392DF, 0xD3A0342B, 0x8971F21E,
-        0x1B0A7441, 0x4BA3348C, 0xC5BE7120, 0xC37632D8,
-        0xDF359F8D, 0x9B992F2E, 0xE60B6F47, 0x0FE3F11D,
-        0xE54CDA54, 0x1EDAD891, 0xCE6279CF, 0xCD3E7E6F,
-        0x1618B166, 0xFD2C1D05, 0x848FD2C5, 0xF6FB2299,
-        0xF523F357, 0xA6327623, 0x93A83531, 0x56CCCD02,
-        0xACF08162, 0x5A75EBB5, 0x6E163697, 0x88D273CC,
-        0xDE966292, 0x81B949D0, 0x4C50901B, 0x71C65614,
-        0xE6C6C7BD, 0x327A140A, 0x45E1D006, 0xC3F27B9A,
-        0xC9AA53FD, 0x62A80F00, 0xBB25BFE2, 0x35BDD2F6,
-        0x71126905, 0xB2040222, 0xB6CBCF7C, 0xCD769C2B,
-        0x53113EC0, 0x1640E3D3, 0x38ABBD60, 0x2547ADF0,
-        0xBA38209C, 0xF746CE76, 0x77AFA1C5, 0x20756060,
-        0x85CBFE4E, 0x8AE88DD8, 0x7AAAF9B0, 0x4CF9AA7E,
-        0x1948C25C, 0x02FB8A8C, 0x01C36AE4, 0xD6EBE1F9,
-        0x90D4F869, 0xA65CDEA0, 0x3F09252D, 0xC208E69F,
-        0xB74E6132, 0xCE77E25B, 0x578FDFE3, 0x3AC372E6
-    };
-
-    //====================================
-    // Useful constants
-    //====================================
-
-    private static final int ROUNDS = 16;
-    private static final int SBOX_SK = 256;
-    private static final int SBOX_SK2 = SBOX_SK * 2;
-    private static final int SBOX_SK3 = SBOX_SK * 3;
-    private static final int P_SZ = ROUNDS + 2;
-
-
-    private final int[] S;    // the s-boxes
-    private final int[] P;    // the p-array
-
-    public BCrypt()
-    {
-        S = new int[SBOX_SK * 4];
-        P = new int[P_SZ];
-    }
-
-    //==================================
-    // Private Implementation
-    //==================================
-
-    private int F(int x)
-    {
-        return (((S[(x >>> 24)] + S[SBOX_SK + ((x >>> 16) & 0xff)])
-            ^ S[SBOX_SK2 + ((x >>> 8) & 0xff)]) + S[SBOX_SK3 + (x & 0xff)]);
-    }
-
-    /*
-     * apply the encryption cycle to each value pair in the table.
-     */
-    private void processTable(
-        int xl,
-        int xr,
-        int[] table)
-    {
-        int size = table.length;
-
-        for (int s = 0; s < size; s += 2)
-        {
-            xl ^= P[0];
-
-            for (int i = 1; i < ROUNDS; i += 2)
-            {
-                xr ^= F(xl) ^ P[i];
-                xl ^= F(xr) ^ P[i + 1];
-            }
-
-            xr ^= P[ROUNDS + 1];
-
-            table[s] = xr;
-            table[s + 1] = xl;
-
-            xr = xl;            // end of cycle swap
-            xl = table[s];
-        }
-    }
-
-    /*
-     * Initialize the S-boxes and the P-array, with a fixed string
-     * This string contains the hexadecimal digits of pi (3.141...)
-     */
-    private void initState()
-    {
-        System.arraycopy(KS0, 0, S, 0, SBOX_SK);
-        System.arraycopy(KS1, 0, S, SBOX_SK, SBOX_SK);
-        System.arraycopy(KS2, 0, S, SBOX_SK2, SBOX_SK);
-        System.arraycopy(KS3, 0, S, SBOX_SK3, SBOX_SK);
-
-        System.arraycopy(KP, 0, P, 0, P_SZ);
-
-    }
-
-    private int BytesTo32bits(byte[] b, int i)
-    {
-        return ((b[i] & 0xff) << 24) |
-            ((b[i + 1] & 0xff) << 16) |
-            ((b[i + 2] & 0xff) << 8) |
-            ((b[i + 3] & 0xff));
-    }
-
-    private void Bits32ToBytes(int in, byte[] b, int offset)
-    {
-        b[offset + 3] = (byte)in;
-        b[offset + 2] = (byte)(in >> 8);
-        b[offset + 1] = (byte)(in >> 16);
-        b[offset] = (byte)(in >> 24);
-    }
-
-    /*
-     * XOR P with key cyclic.
-     * This is the first part of ExpandKey function
-     */
-    private final void cyclicXorKey(byte[] key)
-    {
-        int keyLength = key.length;
-        int keyIndex = 0;
-
-        for (int i = 0; i < P_SZ; i++)
-        {
-            // get the 32 bits of the key, in 4 * 8 bit chunks
-            int data = 0x0000000;
-            for (int j = 0; j < 4; j++)
-            {
-                // create a 32 bit block
-                data = (data << 8) | (key[keyIndex++] & 0xff);
-
-                // wrap when we get to the end of the key
-                if (keyIndex >= keyLength)
-                {
-                    keyIndex = 0;
-                }
-            }
-            // XOR the newly created 32 bit chunk onto the P-array
-            P[i] ^= data;
-        }
-    }
-
-
-    /*
-     *  encrypt magic String 64 times in ECB
-     */
-    private byte[] encryptMagicString()
-    {
-        int[] text = {
-            MAGIC_STRING[0], MAGIC_STRING[1],
-            MAGIC_STRING[2], MAGIC_STRING[3],
-            MAGIC_STRING[4], MAGIC_STRING[5]
-        };
-        for (int i = 0; i < 64; i++)
-        {
-            for (int j = 0; j < MAGIC_STRING_LENGTH; j += 2)
-            {
-                int left = text[j];
-                int right = text[j + 1];
-
-                left ^= P[0];
-                for (int k = 1; k < ROUNDS; k += 2)
-                {
-                    right ^= F(left) ^ P[k];
-                    left ^= F(right) ^ P[k + 1];
-                }
-                right ^= P[ROUNDS + 1];
-                // swap values:
-                text[j] = right;
-                text[j + 1] = left;
-            }
-        }
-        byte[] result = new byte[24]; // holds 192 bit key
-        for (int i = 0; i < text.length; i++)
-        {
-            Bits32ToBytes(text[i], result, i * 4);
-        }
-        Arrays.fill(text, 0);
-        Arrays.fill(P, 0);
-        Arrays.fill(S, 0);
-
-        return result;
-    }
-
-    /*
-     * This is a part of Eksblowfish function
-     *
-     * @param 	table: sub-keys or working key
-     * @param 	salt32Bit: a 16 byte salt as two 32 bit words
-     * @param 	iv1: value from last proceeded table
-     * @param 	iv2: value from last proceeded table
-     */
-    private void processTableWithSalt(
-        int[] table,
-        int[] salt32Bit,
-        int iv1,
-        int iv2)
-    {
-        int xl = iv1 ^ salt32Bit[0];
-        int xr = iv2 ^ salt32Bit[1];
-
-        int yl;
-        int yr;
-        int size = table.length;
-
-        for (int s = 0; s < size; s += 4)
-        {
-            xl ^= P[0];
-            for (int i = 1; i < ROUNDS; i += 2)
-            {
-                xr ^= F(xl) ^ P[i];
-                xl ^= F(xr) ^ P[i + 1];
-            }
-            xr ^= P[ROUNDS + 1];
-
-            table[s] = xr;
-            table[s + 1] = xl;
-
-            yl = salt32Bit[2] ^ xr;
-            yr = salt32Bit[3] ^ xl;
-
-            if (s + 2 >= size) // P holds 18 values
-            {
-                break;
-            }
-
-            yl ^= P[0];
-            for (int i = 1; i < ROUNDS; i += 2)
-            {
-                yr ^= F(yl) ^ P[i];
-                yl ^= F(yr) ^ P[i + 1];
-            }
-            yr ^= P[ROUNDS + 1];
-
-            table[s + 2] = yr;
-            table[s + 3] = yl;
-
-            xl = salt32Bit[0] ^ yr;
-            xr = salt32Bit[1] ^ yl;
-        }
-    }
-
-    /**
-     * Derives a raw 192 bit Bcrypt key
-     *
-     * @param cost the cost factor, treated as an exponent of 2
-     * @param salt a 16 byte salt
-     * @param psw  the password
-     * @return a 192 bit key
-     */
-    private final byte[] deriveRawKey(
-        int cost,
-        byte[] salt,
-        byte[] psw)
-    {
-        if (salt.length != 16)
-        {
-            throw new DataLengthException("Invalid salt size: 16 bytes expected.");
-        }
-        if (cost < 4 || cost > 31)
-        {
-            throw new IllegalArgumentException("Illegal cost factor: 4 - 31 expected.");
-        }
-
-        if (psw.length == 0)
-        {
-            psw = new byte[4];
-        }
-
-        // state <- InitState()
-        initState();
-
-        int[] salt32Bit = new int[4]; // holds 16 byte salt
-        salt32Bit[0] = BytesTo32bits(salt, 0);
-        salt32Bit[1] = BytesTo32bits(salt, 4);
-        salt32Bit[2] = BytesTo32bits(salt, 8);
-        salt32Bit[3] = BytesTo32bits(salt, 12);
-
-        int[] salt32Bit2 = new int[salt.length]; // swapped values
-        salt32Bit2[0] = salt32Bit[2];
-        salt32Bit2[1] = salt32Bit[3];
-        salt32Bit2[2] = salt32Bit[0];
-        salt32Bit2[3] = salt32Bit[1];
-
-        // ExpandKey( state, salt, key):
-        cyclicXorKey(psw);
-        processTableWithSalt(P, salt32Bit, 0, 0);
-        Arrays.fill(salt32Bit, 0);
-        processTableWithSalt(S, salt32Bit2, P[P.length - 2], P[P.length - 1]);
-        Arrays.fill(salt32Bit2, 0);
-
-        int rounds = 1 << cost;
-        for (int i = 0; i != rounds; i++)        // rounds may be negative if cost is 31
-        {
-            // state <- ExpandKey(state, 0, key);
-            cyclicXorKey(psw);
-            processTable(0, 0, P);
-            processTable(P[P_SZ - 2], P[P_SZ - 1], S);
-
-            // state <- ExpandKey(state, 0, salt);
-            cyclicXorKey(salt);
-            processTable(0, 0, P);
-            processTable(P[P_SZ - 2], P[P_SZ - 1], S);
-        }
-
-        // encrypt magicString 64 times
-        return encryptMagicString();
-    }
-
-    /**
-     * Size of the salt parameter in bytes
-     */
-    static final int SALT_SIZE_BYTES = 16;
-
-    /**
-     * Minimum value of cost parameter, equal to log2(bytes of salt)
-     */
-    static final int MIN_COST = 4;
-
-    /**
-     * Maximum value of cost parameter (31 == 2,147,483,648)
-     */
-    static final int MAX_COST = 31;
-
-    /**
-     * Maximum size of password == max (unrestricted) size of Blowfish key
-     */
-    // Blowfish spec limits keys to 448bit/56 bytes to ensure all bits of key affect all ciphertext
-    // bits, but technically algorithm handles 72 byte keys and most implementations support this.
-    static final int MAX_PASSWORD_BYTES = 72;
-
-    /**
-     * Calculates the <b>bcrypt</b> hash of a password.
-     * <p>
-     * This implements the raw <b>bcrypt</b> function as defined in the bcrypt specification, not
-     * the crypt encoded version implemented in OpenBSD.
-     * </p>
-     * @param password the password bytes (up to 72 bytes) to use for this invocation.
-     * @param salt     the 128 bit salt to use for this invocation.
-     * @param cost     the bcrypt cost parameter. The cost of the bcrypt function grows as
-     *                 <code>2^cost</code>. Legal values are 4..31 inclusive.
-     * @return the output of the raw bcrypt operation: a 192 bit (24 byte) hash.
-     */
-    public static byte[] generate(byte[] password, byte[] salt, int cost)
-    {
-        if (password == null || salt == null)
-        {
-            throw new IllegalArgumentException("Password and salt are required");
-        }
-        if (salt.length != SALT_SIZE_BYTES)
-        {
-            throw new IllegalArgumentException("BCrypt salt must be 128 bits");
-        }
-        if (password.length > MAX_PASSWORD_BYTES)
-        {
-            throw new IllegalArgumentException("BCrypt password must be <= 72 bytes");
-        }
-        if (cost < MIN_COST || cost > MAX_COST)
-        {
-            throw new IllegalArgumentException("BCrypt cost must be from 4..31");
-        }
-
-        return INSTANCE.deriveRawKey(cost, salt, password);
-    }
-}
\ No newline at end of file
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/generators/BaseKDFBytesGenerator.java b/bcprov/src/main/java/org/bouncycastle/crypto/generators/BaseKDFBytesGenerator.java
deleted file mode 100644
index b284a93..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/generators/BaseKDFBytesGenerator.java
+++ /dev/null
@@ -1,143 +0,0 @@
-package org.bouncycastle.crypto.generators;
-
-import org.bouncycastle.crypto.DataLengthException;
-import org.bouncycastle.crypto.DerivationParameters;
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.DigestDerivationFunction;
-import org.bouncycastle.crypto.params.ISO18033KDFParameters;
-import org.bouncycastle.crypto.params.KDFParameters;
-import org.bouncycastle.util.Pack;
-
-/**
- * Basic KDF generator for derived keys and ivs as defined by IEEE P1363a/ISO
- * 18033 <br>
- * This implementation is based on ISO 18033/P1363a.
- */
-public class BaseKDFBytesGenerator
-    implements DigestDerivationFunction
-{
-    private int    counterStart;
-    private Digest digest;
-    private byte[] shared;
-    private byte[] iv;
-
-    /**
-     * Construct a KDF Parameters generator.
-     * <p>
-     * 
-     * @param counterStart
-     *            value of counter.
-     * @param digest
-     *            the digest to be used as the source of derived keys.
-     */
-    protected BaseKDFBytesGenerator(int counterStart, Digest digest)
-    {
-        this.counterStart = counterStart;
-        this.digest = digest;
-    }
-
-    public void init(DerivationParameters param)
-    {
-        if (param instanceof KDFParameters)
-        {
-            KDFParameters p = (KDFParameters)param;
-
-            shared = p.getSharedSecret();
-            iv = p.getIV();
-        }
-        else if (param instanceof ISO18033KDFParameters)
-        {
-            ISO18033KDFParameters p = (ISO18033KDFParameters)param;
-
-            shared = p.getSeed();
-            iv = null;
-        }
-        else
-        {
-            throw new IllegalArgumentException("KDF parameters required for KDF2Generator");
-        }
-    }
-
-    /**
-     * return the underlying digest.
-     */
-    public Digest getDigest()
-    {
-        return digest;
-    }
-
-    /**
-     * fill len bytes of the output buffer with bytes generated from the
-     * derivation function.
-     * 
-     * @throws IllegalArgumentException
-     *             if the size of the request will cause an overflow.
-     * @throws DataLengthException
-     *             if the out buffer is too small.
-     */
-    public int generateBytes(byte[] out, int outOff, int len) throws DataLengthException,
-            IllegalArgumentException
-    {
-        if ((out.length - len) < outOff)
-        {
-            throw new DataLengthException("output buffer too small");
-        }
-
-        long oBytes = len;
-        int outLen = digest.getDigestSize();
-
-        //
-        // this is at odds with the standard implementation, the
-        // maximum value should be hBits * (2^32 - 1) where hBits
-        // is the digest output size in bits. We can't have an
-        // array with a long index at the moment...
-        //
-        if (oBytes > ((2L << 32) - 1))
-        {
-            throw new IllegalArgumentException("Output length too large");
-        }
-
-        int cThreshold = (int)((oBytes + outLen - 1) / outLen);
-
-        byte[] dig = new byte[digest.getDigestSize()];
-
-        byte[] C = new byte[4];
-        Pack.intToBigEndian(counterStart, C, 0);
-
-        int counterBase = counterStart & ~0xFF;
-
-        for (int i = 0; i < cThreshold; i++)
-        {
-            digest.update(shared, 0, shared.length);
-            digest.update(C, 0, C.length);
-
-            if (iv != null)
-            {
-                digest.update(iv, 0, iv.length);
-            }
-
-            digest.doFinal(dig, 0);
-
-            if (len > outLen)
-            {
-                System.arraycopy(dig, 0, out, outOff, outLen);
-                outOff += outLen;
-                len -= outLen;
-            }
-            else
-            {
-                System.arraycopy(dig, 0, out, outOff, len);
-            }
-
-            if (++C[3] == 0)
-            {
-                counterBase += 0x100;
-                Pack.intToBigEndian(counterBase, C, 0);
-            }
-        }
-
-        digest.reset();
-
-        return (int)oBytes;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/generators/CramerShoupKeyPairGenerator.java b/bcprov/src/main/java/org/bouncycastle/crypto/generators/CramerShoupKeyPairGenerator.java
deleted file mode 100644
index 8fcdf85..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/generators/CramerShoupKeyPairGenerator.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package org.bouncycastle.crypto.generators;
-
-import java.math.BigInteger;
-import java.security.SecureRandom;
-
-import org.bouncycastle.crypto.AsymmetricCipherKeyPair;
-import org.bouncycastle.crypto.AsymmetricCipherKeyPairGenerator;
-import org.bouncycastle.crypto.KeyGenerationParameters;
-import org.bouncycastle.crypto.params.CramerShoupKeyGenerationParameters;
-import org.bouncycastle.crypto.params.CramerShoupParameters;
-import org.bouncycastle.crypto.params.CramerShoupPrivateKeyParameters;
-import org.bouncycastle.crypto.params.CramerShoupPublicKeyParameters;
-import org.bouncycastle.util.BigIntegers;
-
-/**
- * a Cramer Shoup key pair generator
- * 
- */
-public class CramerShoupKeyPairGenerator implements AsymmetricCipherKeyPairGenerator {
-	
-	private static final BigInteger ONE = BigInteger.valueOf(1);
-
-	private CramerShoupKeyGenerationParameters param;
-
-	public void init(KeyGenerationParameters param) {
-		this.param = (CramerShoupKeyGenerationParameters) param;
-	}
-
-	public AsymmetricCipherKeyPair generateKeyPair() {
-		CramerShoupParameters csParams = param.getParameters();
-
-		CramerShoupPrivateKeyParameters sk = generatePrivateKey(param.getRandom(), csParams);
-		CramerShoupPublicKeyParameters pk = calculatePublicKey(csParams, sk);
-		sk.setPk(pk);
-
-		return new AsymmetricCipherKeyPair(pk, sk);
-	}
-
-	private BigInteger generateRandomElement(BigInteger p, SecureRandom random) {
-		return BigIntegers.createRandomInRange(ONE, p.subtract(ONE), random);
-	}
-	
-	private CramerShoupPrivateKeyParameters generatePrivateKey(SecureRandom random, CramerShoupParameters csParams){
-		BigInteger p = csParams.getP();
-		CramerShoupPrivateKeyParameters key = new CramerShoupPrivateKeyParameters(csParams,
-				generateRandomElement(p, random), generateRandomElement(p, random),
-				generateRandomElement(p, random), generateRandomElement(p, random),
-				generateRandomElement(p, random));
-		return key;
-	}
-
-	private CramerShoupPublicKeyParameters calculatePublicKey(CramerShoupParameters csParams, CramerShoupPrivateKeyParameters sk) {
-		BigInteger g1 = csParams.getG1();
-		BigInteger g2 = csParams.getG2();
-		BigInteger p = csParams.getP();
-		
-		BigInteger c = g1.modPow(sk.getX1(), p).multiply(g2.modPow(sk.getX2(), p));
-		BigInteger d = g1.modPow(sk.getY1(), p).multiply(g2.modPow(sk.getY2(), p));
-		BigInteger h = g1.modPow(sk.getZ(), p);
-		
-		return new CramerShoupPublicKeyParameters(csParams, c, d, h);
-	}
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/generators/CramerShoupParametersGenerator.java b/bcprov/src/main/java/org/bouncycastle/crypto/generators/CramerShoupParametersGenerator.java
deleted file mode 100644
index 22dd34a..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/generators/CramerShoupParametersGenerator.java
+++ /dev/null
@@ -1,124 +0,0 @@
-package org.bouncycastle.crypto.generators;
-
-import java.math.BigInteger;
-import java.security.SecureRandom;
-
-import org.bouncycastle.crypto.digests.SHA256Digest;
-import org.bouncycastle.crypto.params.CramerShoupParameters;
-import org.bouncycastle.crypto.params.DHParameters;
-import org.bouncycastle.util.BigIntegers;
-
-public class CramerShoupParametersGenerator
-{
-    private static final BigInteger ONE = BigInteger.valueOf(1);
-
-    private int size;
-    private int certainty;
-    private SecureRandom random;
-
-    /**
-     * Initialise the parameters generator.
-     *
-     * @param size      bit length for the prime p
-     * @param certainty a measure of the uncertainty that the caller is willing to tolerate:
-     *                  the probability that the generated modulus is prime exceeds (1 - 1/2^certainty).
-     *                  The execution time of this method is proportional to the value of this parameter.
-     * @param random    a source of randomness
-     */
-    public void init(int size, int certainty, SecureRandom random)
-    {
-        this.size = size;
-        this.certainty = certainty;
-        this.random = random;
-    }
-
-    /**
-     * which generates the p and g values from the given parameters, returning
-     * the CramerShoupParameters object.
-     * <p>
-     * Note: can take a while...
-     * </p>
-     */
-    public CramerShoupParameters generateParameters()
-    {
-        //
-        // find a safe prime p where p = 2*q + 1, where p and q are prime.
-        //
-        BigInteger[] safePrimes = ParametersHelper.generateSafePrimes(size, certainty, random);
-
-//		BigInteger p = safePrimes[0];
-        BigInteger q = safePrimes[1];
-        BigInteger g1 = ParametersHelper.selectGenerator(q, random);
-        BigInteger g2 = ParametersHelper.selectGenerator(q, random);
-        while (g1.equals(g2))
-        {
-            g2 = ParametersHelper.selectGenerator(q, random);
-        }
-
-        return new CramerShoupParameters(q, g1, g2, new SHA256Digest());
-    }
-
-    public CramerShoupParameters generateParameters(DHParameters dhParams)
-    {
-        BigInteger p = dhParams.getP();
-        BigInteger g1 = dhParams.getG();
-
-        // now we just need a second generator
-        BigInteger g2 = ParametersHelper.selectGenerator(p, random);
-        while (g1.equals(g2))
-        {
-            g2 = ParametersHelper.selectGenerator(p, random);
-        }
-
-        return new CramerShoupParameters(p, g1, g2, new SHA256Digest());
-    }
-
-    private static class ParametersHelper
-    {
-
-        private static final BigInteger TWO = BigInteger.valueOf(2);
-
-        /*
-         * Finds a pair of prime BigInteger's {p, q: p = 2q + 1}
-         *
-         * (see: Handbook of Applied Cryptography 4.86)
-         */
-        static BigInteger[] generateSafePrimes(int size, int certainty, SecureRandom random)
-        {
-            BigInteger p, q;
-            int qLength = size - 1;
-
-            for (; ; )
-            {
-                q = new BigInteger(qLength, 2, random);
-                p = q.shiftLeft(1).add(ONE);
-                if (p.isProbablePrime(certainty) && (certainty <= 2 || q.isProbablePrime(certainty)))
-                {
-                    break;
-                }
-            }
-
-            return new BigInteger[]{p, q};
-        }
-
-        static BigInteger selectGenerator(BigInteger p, SecureRandom random)
-        {
-            BigInteger pMinusTwo = p.subtract(TWO);
-            BigInteger g;
-
-			/*
-             * RFC 2631 2.2.1.2 (and see: Handbook of Applied Cryptography 4.81)
-			 */
-            do
-            {
-                BigInteger h = BigIntegers.createRandomInRange(TWO, pMinusTwo, random);
-
-                g = h.modPow(TWO, p);
-            }
-            while (g.equals(ONE));
-
-            return g;
-        }
-    }
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/generators/DHKeyPairGenerator.java b/bcprov/src/main/java/org/bouncycastle/crypto/generators/DHKeyPairGenerator.java
deleted file mode 100644
index d07ca80..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/generators/DHKeyPairGenerator.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package org.bouncycastle.crypto.generators;
-
-import org.bouncycastle.crypto.AsymmetricCipherKeyPair;
-import org.bouncycastle.crypto.AsymmetricCipherKeyPairGenerator;
-import org.bouncycastle.crypto.KeyGenerationParameters;
-import org.bouncycastle.crypto.params.DHKeyGenerationParameters;
-import org.bouncycastle.crypto.params.DHParameters;
-import org.bouncycastle.crypto.params.DHPrivateKeyParameters;
-import org.bouncycastle.crypto.params.DHPublicKeyParameters;
-
-import java.math.BigInteger;
-
-/**
- * a Diffie-Hellman key pair generator.
- *
- * This generates keys consistent for use in the MTI/A0 key agreement protocol
- * as described in "Handbook of Applied Cryptography", Pages 516-519.
- */
-public class DHKeyPairGenerator
-    implements AsymmetricCipherKeyPairGenerator
-{
-    private DHKeyGenerationParameters param;
-
-    public void init(
-        KeyGenerationParameters param)
-    {
-        this.param = (DHKeyGenerationParameters)param;
-    }
-
-    public AsymmetricCipherKeyPair generateKeyPair()
-    {
-        DHKeyGeneratorHelper helper = DHKeyGeneratorHelper.INSTANCE;
-        DHParameters dhp = param.getParameters();
-
-        BigInteger x = helper.calculatePrivate(dhp, param.getRandom()); 
-        BigInteger y = helper.calculatePublic(dhp, x);
-
-        return new AsymmetricCipherKeyPair(
-            new DHPublicKeyParameters(y, dhp),
-            new DHPrivateKeyParameters(x, dhp));
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/generators/DHParametersHelper.java b/bcprov/src/main/java/org/bouncycastle/crypto/generators/DHParametersHelper.java
index dc0a5ae..a0728b2 100644
--- a/bcprov/src/main/java/org/bouncycastle/crypto/generators/DHParametersHelper.java
+++ b/bcprov/src/main/java/org/bouncycastle/crypto/generators/DHParametersHelper.java
@@ -3,11 +3,18 @@ package org.bouncycastle.crypto.generators;
 import java.math.BigInteger;
 import java.security.SecureRandom;
 
+// BEGIN android-added
+import java.util.logging.Logger;
+// END android-added
 import org.bouncycastle.math.ec.WNafUtil;
 import org.bouncycastle.util.BigIntegers;
 
 class DHParametersHelper
 {
+    // BEGIN android-added
+    private static final Logger logger = Logger.getLogger(DHParametersHelper.class.getName());
+    // END android-added
+
     private static final BigInteger ONE = BigInteger.valueOf(1);
     private static final BigInteger TWO = BigInteger.valueOf(2);
 
@@ -18,12 +25,20 @@ class DHParametersHelper
      */
     static BigInteger[] generateSafePrimes(int size, int certainty, SecureRandom random)
     {
+        // BEGIN android-added
+        logger.info("Generating safe primes. This may take a long time.");
+        long start = System.currentTimeMillis();
+        int tries = 0;
+        // END android-added
         BigInteger p, q;
         int qLength = size - 1;
         int minWeight = size >>> 2;
 
         for (;;)
         {
+            // BEGIN android-added
+            tries++;
+            // END android-added
             q = new BigInteger(qLength, 2, random);
 
             // p <- 2q + 1
@@ -52,6 +67,11 @@ class DHParametersHelper
 
             break;
         }
+        // BEGIN android-added
+        long end = System.currentTimeMillis();
+        long duration = end - start;
+        logger.info("Generated safe primes: " + tries + " tries took " + duration + "ms");
+        // END android-added
 
         return new BigInteger[] { p, q };
     }
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/generators/DSAParametersGenerator.java b/bcprov/src/main/java/org/bouncycastle/crypto/generators/DSAParametersGenerator.java
index fe98b7c..36b41cc 100644
--- a/bcprov/src/main/java/org/bouncycastle/crypto/generators/DSAParametersGenerator.java
+++ b/bcprov/src/main/java/org/bouncycastle/crypto/generators/DSAParametersGenerator.java
@@ -4,7 +4,9 @@ import java.math.BigInteger;
 import java.security.SecureRandom;
 
 import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.digests.SHA1Digest;
+// BEGIN android-changed
+import org.bouncycastle.crypto.digests.AndroidDigestFactory;
+// END android-changed
 import org.bouncycastle.crypto.params.DSAParameterGenerationParameters;
 import org.bouncycastle.crypto.params.DSAParameters;
 import org.bouncycastle.crypto.params.DSAValidationParameters;
@@ -31,7 +33,9 @@ public class DSAParametersGenerator
 
     public DSAParametersGenerator()
     {
-        this(new SHA1Digest());
+        // BEGIN android-changed
+        this(AndroidDigestFactory.getSHA1());
+        // END android-changed
     }
 
     public DSAParametersGenerator(Digest digest)
@@ -122,7 +126,9 @@ public class DSAParametersGenerator
         int             n = (L - 1) / 160;
         byte[]          w = new byte[L / 8];
 
-        if (!(digest instanceof SHA1Digest))
+        // BEGIN android-changed
+        if (!(digest.getAlgorithmName().equals("SHA-1")))
+        // END android-changed
         {
             throw new IllegalStateException("can only use SHA-1 for generating FIPS 186-2 parameters");
         }
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/generators/DSTU4145KeyPairGenerator.java b/bcprov/src/main/java/org/bouncycastle/crypto/generators/DSTU4145KeyPairGenerator.java
deleted file mode 100644
index 3f931b2..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/generators/DSTU4145KeyPairGenerator.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package org.bouncycastle.crypto.generators;
-
-import org.bouncycastle.crypto.AsymmetricCipherKeyPair;
-import org.bouncycastle.crypto.params.ECPrivateKeyParameters;
-import org.bouncycastle.crypto.params.ECPublicKeyParameters;
-
-public class DSTU4145KeyPairGenerator
-    extends ECKeyPairGenerator
-{
-    public AsymmetricCipherKeyPair generateKeyPair()
-    {
-        AsymmetricCipherKeyPair pair = super.generateKeyPair();
-
-        ECPublicKeyParameters pub = (ECPublicKeyParameters)pair.getPublic();
-        ECPrivateKeyParameters priv = (ECPrivateKeyParameters)pair.getPrivate();
-
-        pub = new ECPublicKeyParameters(pub.getQ().negate(), pub.getParameters());
-
-        return new AsymmetricCipherKeyPair(pub, priv);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/generators/ElGamalKeyPairGenerator.java b/bcprov/src/main/java/org/bouncycastle/crypto/generators/ElGamalKeyPairGenerator.java
deleted file mode 100644
index f23b697..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/generators/ElGamalKeyPairGenerator.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package org.bouncycastle.crypto.generators;
-
-import java.math.BigInteger;
-
-import org.bouncycastle.crypto.AsymmetricCipherKeyPair;
-import org.bouncycastle.crypto.AsymmetricCipherKeyPairGenerator;
-import org.bouncycastle.crypto.KeyGenerationParameters;
-import org.bouncycastle.crypto.params.DHParameters;
-import org.bouncycastle.crypto.params.ElGamalKeyGenerationParameters;
-import org.bouncycastle.crypto.params.ElGamalParameters;
-import org.bouncycastle.crypto.params.ElGamalPrivateKeyParameters;
-import org.bouncycastle.crypto.params.ElGamalPublicKeyParameters;
-
-/**
- * a ElGamal key pair generator.
- * <p>
- * This generates keys consistent for use with ElGamal as described in
- * page 164 of "Handbook of Applied Cryptography".
- */
-public class ElGamalKeyPairGenerator
-    implements AsymmetricCipherKeyPairGenerator
-{
-    private ElGamalKeyGenerationParameters param;
-
-    public void init(
-        KeyGenerationParameters param)
-    {
-        this.param = (ElGamalKeyGenerationParameters)param;
-    }
-
-    public AsymmetricCipherKeyPair generateKeyPair()
-    {
-        DHKeyGeneratorHelper helper = DHKeyGeneratorHelper.INSTANCE;
-        ElGamalParameters egp = param.getParameters();
-        DHParameters dhp = new DHParameters(egp.getP(), egp.getG(), null, egp.getL());  
-
-        BigInteger x = helper.calculatePrivate(dhp, param.getRandom()); 
-        BigInteger y = helper.calculatePublic(dhp, x);
-
-        return new AsymmetricCipherKeyPair(
-            new ElGamalPublicKeyParameters(y, egp),
-            new ElGamalPrivateKeyParameters(x, egp));
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/generators/ElGamalParametersGenerator.java b/bcprov/src/main/java/org/bouncycastle/crypto/generators/ElGamalParametersGenerator.java
deleted file mode 100644
index 21e8c2a..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/generators/ElGamalParametersGenerator.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package org.bouncycastle.crypto.generators;
-
-import org.bouncycastle.crypto.params.ElGamalParameters;
-
-import java.math.BigInteger;
-import java.security.SecureRandom;
-
-public class ElGamalParametersGenerator
-{
-    private int             size;
-    private int             certainty;
-    private SecureRandom    random;
-
-    public void init(
-        int             size,
-        int             certainty,
-        SecureRandom    random)
-    {
-        this.size = size;
-        this.certainty = certainty;
-        this.random = random;
-    }
-
-    /**
-     * which generates the p and g values from the given parameters,
-     * returning the ElGamalParameters object.
-     * <p>
-     * Note: can take a while...
-     */
-    public ElGamalParameters generateParameters()
-    {
-        //
-        // find a safe prime p where p = 2*q + 1, where p and q are prime.
-        //
-        BigInteger[] safePrimes = DHParametersHelper.generateSafePrimes(size, certainty, random);
-
-        BigInteger p = safePrimes[0];
-        BigInteger q = safePrimes[1];
-        BigInteger g = DHParametersHelper.selectGenerator(p, q, random);
-
-        return new ElGamalParameters(p, g);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/generators/EphemeralKeyPairGenerator.java b/bcprov/src/main/java/org/bouncycastle/crypto/generators/EphemeralKeyPairGenerator.java
deleted file mode 100644
index 1004f23..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/generators/EphemeralKeyPairGenerator.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package org.bouncycastle.crypto.generators;
-
-import org.bouncycastle.crypto.AsymmetricCipherKeyPair;
-import org.bouncycastle.crypto.AsymmetricCipherKeyPairGenerator;
-import org.bouncycastle.crypto.EphemeralKeyPair;
-import org.bouncycastle.crypto.KeyEncoder;
-
-public class EphemeralKeyPairGenerator
-{
-    private AsymmetricCipherKeyPairGenerator gen;
-    private KeyEncoder keyEncoder;
-
-    public EphemeralKeyPairGenerator(AsymmetricCipherKeyPairGenerator gen, KeyEncoder keyEncoder)
-    {
-        this.gen = gen;
-        this.keyEncoder = keyEncoder;
-    }
-
-    public EphemeralKeyPair generate()
-    {
-        AsymmetricCipherKeyPair eph = gen.generateKeyPair();
-
-        // Encode the ephemeral public key
-         return new EphemeralKeyPair(eph, keyEncoder);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/generators/GOST3410KeyPairGenerator.java b/bcprov/src/main/java/org/bouncycastle/crypto/generators/GOST3410KeyPairGenerator.java
deleted file mode 100644
index 8948f93..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/generators/GOST3410KeyPairGenerator.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package org.bouncycastle.crypto.generators;
-
-import org.bouncycastle.crypto.AsymmetricCipherKeyPair;
-import org.bouncycastle.crypto.AsymmetricCipherKeyPairGenerator;
-import org.bouncycastle.crypto.KeyGenerationParameters;
-import org.bouncycastle.crypto.params.GOST3410KeyGenerationParameters;
-import org.bouncycastle.crypto.params.GOST3410Parameters;
-import org.bouncycastle.crypto.params.GOST3410PrivateKeyParameters;
-import org.bouncycastle.crypto.params.GOST3410PublicKeyParameters;
-import org.bouncycastle.math.ec.WNafUtil;
-
-import java.math.BigInteger;
-import java.security.SecureRandom;
-
-/**
- * a GOST3410 key pair generator.
- * This generates GOST3410 keys in line with the method described
- * in GOST R 34.10-94.
- */
-public class GOST3410KeyPairGenerator
-        implements AsymmetricCipherKeyPairGenerator
-    {
-        private GOST3410KeyGenerationParameters param;
-
-        public void init(
-            KeyGenerationParameters param)
-        {
-            this.param = (GOST3410KeyGenerationParameters)param;
-        }
-
-        public AsymmetricCipherKeyPair generateKeyPair()
-        {
-            BigInteger      p, q, a, x, y;
-            GOST3410Parameters   GOST3410Params = param.getParameters();
-            SecureRandom    random = param.getRandom();
-
-            q = GOST3410Params.getQ();
-            p = GOST3410Params.getP();
-            a = GOST3410Params.getA();
-
-            int minWeight = 64;
-            for (;;)
-            {
-                x = new BigInteger(256, random);
-
-                if (x.signum() < 1 || x.compareTo(q) >= 0)
-                {
-                    continue;
-                }
-
-                /*
-                 * Require a minimum weight of the NAF representation, since low-weight primes may be
-                 * weak against a version of the number-field-sieve for the discrete-logarithm-problem.
-                 * 
-                 * See "The number field sieve for integers of low weight", Oliver Schirokauer.
-                 */
-                if (WNafUtil.getNafWeight(x) < minWeight)
-                {
-                    continue;
-                }
-
-                break;
-            }
-
-            //
-            // calculate the public key.
-            //
-            y = a.modPow(x, p);
-
-            return new AsymmetricCipherKeyPair(
-                    new GOST3410PublicKeyParameters(y, GOST3410Params),
-                    new GOST3410PrivateKeyParameters(x, GOST3410Params));
-        }
-    }
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/generators/GOST3410ParametersGenerator.java b/bcprov/src/main/java/org/bouncycastle/crypto/generators/GOST3410ParametersGenerator.java
deleted file mode 100644
index 1c7cecf..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/generators/GOST3410ParametersGenerator.java
+++ /dev/null
@@ -1,541 +0,0 @@
-package org.bouncycastle.crypto.generators;
-
-import org.bouncycastle.crypto.params.GOST3410Parameters;
-import org.bouncycastle.crypto.params.GOST3410ValidationParameters;
-
-import java.math.BigInteger;
-import java.security.SecureRandom;
-
-/**
- * generate suitable parameters for GOST3410.
- */
-public class GOST3410ParametersGenerator
-{
-    private int             size;
-    private int             typeproc;
-    private SecureRandom    init_random;
-
-    private static final BigInteger ONE = BigInteger.valueOf(1);
-    private static final BigInteger TWO = BigInteger.valueOf(2);
-
-    /**
-     * initialise the key generator.
-     *
-     * @param size size of the key
-     * @param typeproc type procedure A,B = 1;  A',B' - else
-     * @param random random byte source.
-     */
-    public void init(
-        int             size,
-        int             typeproc,
-        SecureRandom    random)
-    {
-        this.size = size;
-        this.typeproc = typeproc;
-        this.init_random = random;
-    }
-
-    //Procedure A
-    private int procedure_A(int x0, int c,  BigInteger[] pq, int size)
-    {
-        //Verify and perform condition: 0<x<2^16; 0<c<2^16; c - odd.
-        while(x0<0 || x0>65536)
-        {
-            x0 = init_random.nextInt()/32768;
-        }
-
-        while((c<0 || c>65536) || (c/2==0))
-        {
-            c = init_random.nextInt()/32768 + 1;
-        }
-
-        BigInteger C = new BigInteger(Integer.toString(c));
-        BigInteger constA16 = new BigInteger("19381");
-
-        //step1
-        BigInteger[] y = new BigInteger[1]; // begin length = 1
-        y[0] = new BigInteger(Integer.toString(x0));
-
-        //step 2
-        int[] t = new int[1]; // t - orders; begin length = 1
-        t[0] = size;
-        int s = 0;
-        for (int i=0; t[i]>=17; i++)
-        {
-            // extension array t
-            int tmp_t[] = new int[t.length + 1];             ///////////////
-            System.arraycopy(t,0,tmp_t,0,t.length);          //  extension
-            t = new int[tmp_t.length];                       //  array t
-            System.arraycopy(tmp_t, 0, t, 0, tmp_t.length);  ///////////////
-
-            t[i+1] = t[i]/2;
-            s = i+1;
-        }
-
-        //step3
-        BigInteger p[] = new BigInteger[s+1];
-        p[s] = new BigInteger("8003",16); //set min prime number length 16 bit
-
-        int m = s-1;  //step4
-
-        for (int i=0; i<s; i++)
-        {
-            int rm = t[m]/16;  //step5
-
-     step6: for(;;)
-            {
-                //step 6
-                BigInteger tmp_y[] = new BigInteger[y.length];  ////////////////
-                System.arraycopy(y,0,tmp_y,0,y.length);         //  extension
-                y = new BigInteger[rm+1];                       //  array y
-                System.arraycopy(tmp_y,0,y,0,tmp_y.length);     ////////////////
-
-                for (int j=0; j<rm; j++)
-                {
-                    y[j+1] = (y[j].multiply(constA16).add(C)).mod(TWO.pow(16));
-                }
-
-                //step 7
-                BigInteger Ym = new BigInteger("0");
-                for (int j=0; j<rm; j++)
-                {
-                    Ym = Ym.add(y[j].multiply(TWO.pow(16*j)));
-                }
-
-                y[0] = y[rm]; //step 8
-
-                //step 9
-                BigInteger N = TWO.pow(t[m]-1).divide(p[m+1]).
-                                   add((TWO.pow(t[m]-1).multiply(Ym)).
-                                       divide(p[m+1].multiply(TWO.pow(16*rm))));
-
-                if (N.mod(TWO).compareTo(ONE)==0) 
-                {
-                    N = N.add(ONE);
-                }
-
-                int k = 0; //step 10
-
-        step11: for(;;)
-                {
-                    //step 11
-                    p[m] = p[m+1].multiply(N.add(BigInteger.valueOf(k))).add(ONE);
-
-                    if (p[m].compareTo(TWO.pow(t[m]))==1)
-                    {
-                        continue step6; //step 12
-                    }
-
-                    //step13
-                    if ((TWO.modPow(p[m+1].multiply(N.add(BigInteger.valueOf(k))),p[m]).compareTo(ONE)==0) &&
-                        (TWO.modPow(N.add(BigInteger.valueOf(k)),p[m]).compareTo(ONE)!=0))
-                    {
-                        m -= 1;
-                        break;
-                    }
-                    else
-                    {
-                        k += 2;
-                        continue step11;
-                    }
-                }
-
-                if (m>=0) 
-                {
-                    break; //step 14
-                }
-                else
-                {
-                    pq[0] = p[0];
-                    pq[1] = p[1];
-                    return y[0].intValue(); //return for procedure B step 2
-                }
-            }
-        }
-        return y[0].intValue();
-    }
-
-    //Procedure A'
-    private long procedure_Aa(long x0, long c, BigInteger[] pq, int size)
-    {
-        //Verify and perform condition: 0<x<2^32; 0<c<2^32; c - odd.
-        while(x0<0 || x0>4294967296L)
-        {
-            x0 = init_random.nextInt()*2;
-        }
-
-        while((c<0 || c>4294967296L) || (c/2==0))
-        {
-            c = init_random.nextInt()*2+1;
-        }
-
-        BigInteger C = new BigInteger(Long.toString(c));
-        BigInteger constA32 = new BigInteger("97781173");
-
-        //step1
-        BigInteger[] y = new BigInteger[1]; // begin length = 1
-        y[0] = new BigInteger(Long.toString(x0));
-
-        //step 2
-        int[] t = new int[1]; // t - orders; begin length = 1
-        t[0] = size;
-        int s = 0;
-        for (int i=0; t[i]>=33; i++)
-        {
-            // extension array t
-            int tmp_t[] = new int[t.length + 1];             ///////////////
-            System.arraycopy(t,0,tmp_t,0,t.length);          //  extension
-            t = new int[tmp_t.length];                       //  array t
-            System.arraycopy(tmp_t, 0, t, 0, tmp_t.length);  ///////////////
-
-            t[i+1] = t[i]/2;
-            s = i+1;
-        }
-
-        //step3
-        BigInteger p[] = new BigInteger[s+1];
-        p[s] = new BigInteger("8000000B",16); //set min prime number length 32 bit
-
-        int m = s-1;  //step4
-
-        for (int i=0; i<s; i++)
-        {
-            int rm = t[m]/32;  //step5
-
-     step6: for(;;)
-            {
-                //step 6
-                BigInteger tmp_y[] = new BigInteger[y.length];  ////////////////
-                System.arraycopy(y,0,tmp_y,0,y.length);         //  extension
-                y = new BigInteger[rm+1];                       //  array y
-                System.arraycopy(tmp_y,0,y,0,tmp_y.length);     ////////////////
-
-                for (int j=0; j<rm; j++)
-                {
-                    y[j+1] = (y[j].multiply(constA32).add(C)).mod(TWO.pow(32));
-                }
-
-                //step 7
-                BigInteger Ym = new BigInteger("0");
-                for (int j=0; j<rm; j++)
-                {
-                    Ym = Ym.add(y[j].multiply(TWO.pow(32*j)));
-                }
-
-                y[0] = y[rm]; //step 8
-
-                //step 9
-                BigInteger N = TWO.pow(t[m]-1).divide(p[m+1]).
-                                   add((TWO.pow(t[m]-1).multiply(Ym)).
-                                       divide(p[m+1].multiply(TWO.pow(32*rm))));
-
-                if (N.mod(TWO).compareTo(ONE)==0) 
-                {
-                    N = N.add(ONE);
-                }
-
-                int k = 0; //step 10
-
-        step11: for(;;)
-                {
-                    //step 11
-                    p[m] = p[m+1].multiply(N.add(BigInteger.valueOf(k))).add(ONE);
-
-                    if (p[m].compareTo(TWO.pow(t[m]))==1)
-                    {
-                        continue step6; //step 12
-                    }
-
-                    //step13
-                    if ((TWO.modPow(p[m+1].multiply(N.add(BigInteger.valueOf(k))),p[m]).compareTo(ONE)==0) &&
-                        (TWO.modPow(N.add(BigInteger.valueOf(k)),p[m]).compareTo(ONE)!=0))
-                    {
-                        m -= 1;
-                        break;
-                    }
-                    else
-                    {
-                        k += 2;
-                        continue step11;
-                    }
-                }
-
-                if (m>=0)
-                {
-                    break; //step 14
-                }
-                else
-                {
-                    pq[0] = p[0];
-                    pq[1] = p[1];
-                    return y[0].longValue(); //return for procedure B' step 2
-                }
-            }
-        }
-        return y[0].longValue();
-    }
-
-    //Procedure B
-    private void procedure_B(int x0, int c, BigInteger[] pq)
-    {
-        //Verify and perform condition: 0<x<2^16; 0<c<2^16; c - odd.
-        while(x0<0 || x0>65536)
-        {
-            x0 = init_random.nextInt()/32768;
-        }
-
-        while((c<0 || c>65536) || (c/2==0))
-        {
-            c = init_random.nextInt()/32768 + 1;
-        }
-
-        BigInteger [] qp = new BigInteger[2];
-        BigInteger q = null, Q = null, p = null;
-        BigInteger C = new BigInteger(Integer.toString(c));
-        BigInteger constA16 = new BigInteger("19381");
-
-        //step1
-        x0 = procedure_A(x0, c, qp, 256);
-        q = qp[0];
-
-        //step2
-        x0 = procedure_A(x0, c, qp, 512);
-        Q = qp[0];
-
-        BigInteger[] y = new BigInteger[65];
-        y[0] = new BigInteger(Integer.toString(x0));
-
-        int tp = 1024;
-
- step3: for(;;)
-        {
-            //step 3
-            for (int j=0; j<64; j++)
-            {
-                y[j+1] = (y[j].multiply(constA16).add(C)).mod(TWO.pow(16));
-            }
-
-            //step 4
-            BigInteger Y = new BigInteger("0");
- 
-            for (int j=0; j<64; j++)
-            {
-                Y = Y.add(y[j].multiply(TWO.pow(16*j)));
-            }
-
-            y[0] = y[64]; //step 5
-
-            //step 6
-            BigInteger N = TWO.pow(tp-1).divide(q.multiply(Q)).
-                               add((TWO.pow(tp-1).multiply(Y)).
-                                   divide(q.multiply(Q).multiply(TWO.pow(1024))));
-
-            if (N.mod(TWO).compareTo(ONE)==0)
-            {
-                N = N.add(ONE);
-            }
-
-            int k = 0; //step 7
-
-     step8: for(;;)
-            {
-                //step 11
-                p = q.multiply(Q).multiply(N.add(BigInteger.valueOf(k))).add(ONE);
-
-                if (p.compareTo(TWO.pow(tp))==1)
-                {
-                    continue step3; //step 9
-                }
-
-                //step10
-                if ((TWO.modPow(q.multiply(Q).multiply(N.add(BigInteger.valueOf(k))),p).compareTo(ONE)==0) &&
-                    (TWO.modPow(q.multiply(N.add(BigInteger.valueOf(k))),p).compareTo(ONE)!=0))
-                {
-                    pq[0] = p;
-                    pq[1] = q;
-                    return;
-                }
-                else
-                {
-                    k += 2;
-                    continue step8;
-                }
-            }
-        }
-    }
-
-    //Procedure B'
-    private void procedure_Bb(long x0, long c, BigInteger[] pq)
-    {
-        //Verify and perform condition: 0<x<2^32; 0<c<2^32; c - odd.
-        while(x0<0 || x0>4294967296L)
-        {
-            x0 = init_random.nextInt()*2;
-        }
-
-        while((c<0 || c>4294967296L) || (c/2==0))
-        {
-            c = init_random.nextInt()*2+1;
-        }
-
-        BigInteger [] qp = new BigInteger[2];
-        BigInteger q = null, Q = null, p = null;
-        BigInteger C = new BigInteger(Long.toString(c));
-        BigInteger constA32 = new BigInteger("97781173");
-
-        //step1
-        x0 = procedure_Aa(x0, c, qp, 256);
-        q = qp[0];
-
-        //step2
-        x0 = procedure_Aa(x0, c, qp, 512);
-        Q = qp[0];
-
-        BigInteger[] y = new BigInteger[33];
-        y[0] = new BigInteger(Long.toString(x0));
-
-        int tp = 1024;
-
- step3: for(;;)
-        {
-            //step 3
-            for (int j=0; j<32; j++)
-            {
-                y[j+1] = (y[j].multiply(constA32).add(C)).mod(TWO.pow(32));
-            }
-
-            //step 4
-            BigInteger Y = new BigInteger("0");
-            for (int j=0; j<32; j++)
-            {
-                Y = Y.add(y[j].multiply(TWO.pow(32*j)));
-            }
-
-            y[0] = y[32]; //step 5
-
-            //step 6
-            BigInteger N = TWO.pow(tp-1).divide(q.multiply(Q)).
-                               add((TWO.pow(tp-1).multiply(Y)).
-                                   divide(q.multiply(Q).multiply(TWO.pow(1024))));
-
-            if (N.mod(TWO).compareTo(ONE)==0)
-            {
-                N = N.add(ONE);
-            }
-
-            int k = 0; //step 7
-
-     step8: for(;;)
-            {
-                //step 11
-                p = q.multiply(Q).multiply(N.add(BigInteger.valueOf(k))).add(ONE);
-
-                if (p.compareTo(TWO.pow(tp))==1)
-                {
-                    continue step3; //step 9
-                }
-
-                //step10
-                if ((TWO.modPow(q.multiply(Q).multiply(N.add(BigInteger.valueOf(k))),p).compareTo(ONE)==0) &&
-                    (TWO.modPow(q.multiply(N.add(BigInteger.valueOf(k))),p).compareTo(ONE)!=0))
-                {
-                    pq[0] = p;
-                    pq[1] = q;
-                    return;
-                }
-                else
-                {
-                    k += 2;
-                    continue step8;
-                }
-            }
-        }
-    }
-
-
-    /**
-     * Procedure C
-     * procedure generates the a value from the given p,q,
-     * returning the a value.
-     */
-    private BigInteger procedure_C(BigInteger p, BigInteger q)
-    {
-        BigInteger pSub1 = p.subtract(ONE);
-        BigInteger pSub1DivQ = pSub1.divide(q);
-        int length = p.bitLength();
-
-        for(;;)
-        {
-            BigInteger d = new BigInteger(length, init_random);
-
-            // 1 < d < p-1
-            if (d.compareTo(ONE) > 0 && d.compareTo(pSub1) < 0)
-            {
-                BigInteger a = d.modPow(pSub1DivQ, p);
-
-                if (a.compareTo(ONE) != 0)
-                {
-                    return a;
-                }
-            }
-        }
-    }
-
-    /**
-     * which generates the p , q and a values from the given parameters,
-     * returning the GOST3410Parameters object.
-     */
-    public GOST3410Parameters generateParameters()
-    {
-        BigInteger [] pq = new BigInteger[2];
-        BigInteger    q = null, p = null, a = null;
-
-        int  x0, c;
-        long  x0L, cL;
-
-        if (typeproc==1)
-        {
-            x0 = init_random.nextInt();
-            c  = init_random.nextInt();
-
-            switch(size)
-            {
-            case 512:  
-                procedure_A(x0, c, pq, 512); 
-                break;
-            case 1024: 
-                procedure_B(x0, c, pq); 
-                break;
-            default: 
-                throw new IllegalArgumentException("Ooops! key size 512 or 1024 bit.");
-            }
-            p = pq[0];  q = pq[1];
-            a = procedure_C(p, q);
-            //System.out.println("p:"+p.toString(16)+"\n"+"q:"+q.toString(16)+"\n"+"a:"+a.toString(16));
-            //System.out.println("p:"+p+"\n"+"q:"+q+"\n"+"a:"+a);
-            return new GOST3410Parameters(p, q, a, new GOST3410ValidationParameters(x0, c));
-        }
-        else
-        {
-            x0L = init_random.nextLong();
-            cL  = init_random.nextLong();
-
-            switch(size)
-            {
-            case 512:  
-                procedure_Aa(x0L, cL, pq, 512); 
-                break;
-            case 1024: 
-                procedure_Bb(x0L, cL, pq); 
-                break;
-            default: 
-                throw new IllegalStateException("Ooops! key size 512 or 1024 bit.");
-            }
-            p = pq[0];  q = pq[1];
-            a = procedure_C(p, q);
-            //System.out.println("p:"+p.toString(16)+"\n"+"q:"+q.toString(16)+"\n"+"a:"+a.toString(16));
-            //System.out.println("p:"+p+"\n"+"q:"+q+"\n"+"a:"+a);
-            return new GOST3410Parameters(p, q, a, new GOST3410ValidationParameters(x0L, cL));
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/generators/HKDFBytesGenerator.java b/bcprov/src/main/java/org/bouncycastle/crypto/generators/HKDFBytesGenerator.java
deleted file mode 100644
index 75915cf..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/generators/HKDFBytesGenerator.java
+++ /dev/null
@@ -1,161 +0,0 @@
-package org.bouncycastle.crypto.generators;
-
-import org.bouncycastle.crypto.DataLengthException;
-import org.bouncycastle.crypto.DerivationFunction;
-import org.bouncycastle.crypto.DerivationParameters;
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.macs.HMac;
-import org.bouncycastle.crypto.params.HKDFParameters;
-import org.bouncycastle.crypto.params.KeyParameter;
-
-/**
- * HMAC-based Extract-and-Expand Key Derivation Function (HKDF) implemented
- * according to IETF RFC 5869, May 2010 as specified by H. Krawczyk, IBM
- * Research &amp; P. Eronen, Nokia. It uses a HMac internally to compute de OKM
- * (output keying material) and is likely to have better security properties
- * than KDF's based on just a hash function.
- */
-public class HKDFBytesGenerator
-    implements DerivationFunction
-{
-
-    private HMac hMacHash;
-    private int hashLen;
-
-    private byte[] info;
-    private byte[] currentT;
-
-    private int generatedBytes;
-
-    /**
-     * Creates a HKDFBytesGenerator based on the given hash function.
-     *
-     * @param hash the digest to be used as the source of generatedBytes bytes
-     */
-    public HKDFBytesGenerator(Digest hash)
-    {
-        this.hMacHash = new HMac(hash);
-        this.hashLen = hash.getDigestSize();
-    }
-
-    public void init(DerivationParameters param)
-    {
-        if (!(param instanceof HKDFParameters))
-        {
-            throw new IllegalArgumentException(
-                "HKDF parameters required for HKDFBytesGenerator");
-        }
-
-        HKDFParameters params = (HKDFParameters)param;
-        if (params.skipExtract())
-        {
-            // use IKM directly as PRK
-            hMacHash.init(new KeyParameter(params.getIKM()));
-        }
-        else
-        {
-            hMacHash.init(extract(params.getSalt(), params.getIKM()));
-        }
-
-        info = params.getInfo();
-
-        generatedBytes = 0;
-        currentT = new byte[hashLen];
-    }
-
-    /**
-     * Performs the extract part of the key derivation function.
-     *
-     * @param salt the salt to use
-     * @param ikm  the input keying material
-     * @return the PRK as KeyParameter
-     */
-    private KeyParameter extract(byte[] salt, byte[] ikm)
-    {
-        hMacHash.init(new KeyParameter(ikm));
-        if (salt == null)
-        {
-            // TODO check if hashLen is indeed same as HMAC size
-            hMacHash.init(new KeyParameter(new byte[hashLen]));
-        }
-        else
-        {
-            hMacHash.init(new KeyParameter(salt));
-        }
-
-        hMacHash.update(ikm, 0, ikm.length);
-
-        byte[] prk = new byte[hashLen];
-        hMacHash.doFinal(prk, 0);
-        return new KeyParameter(prk);
-    }
-
-    /**
-     * Performs the expand part of the key derivation function, using currentT
-     * as input and output buffer.
-     *
-     * @throws DataLengthException if the total number of bytes generated is larger than the one
-     * specified by RFC 5869 (255 * HashLen)
-     */
-    private void expandNext()
-        throws DataLengthException
-    {
-        int n = generatedBytes / hashLen + 1;
-        if (n >= 256)
-        {
-            throw new DataLengthException(
-                "HKDF cannot generate more than 255 blocks of HashLen size");
-        }
-        // special case for T(0): T(0) is empty, so no update
-        if (generatedBytes != 0)
-        {
-            hMacHash.update(currentT, 0, hashLen);
-        }
-        hMacHash.update(info, 0, info.length);
-        hMacHash.update((byte)n);
-        hMacHash.doFinal(currentT, 0);
-    }
-
-    public Digest getDigest()
-    {
-        return hMacHash.getUnderlyingDigest();
-    }
-
-    public int generateBytes(byte[] out, int outOff, int len)
-        throws DataLengthException, IllegalArgumentException
-    {
-
-        if (generatedBytes + len > 255 * hashLen)
-        {
-            throw new DataLengthException(
-                "HKDF may only be used for 255 * HashLen bytes of output");
-        }
-
-        if (generatedBytes % hashLen == 0)
-        {
-            expandNext();
-        }
-
-        // copy what is left in the currentT (1..hash
-        int toGenerate = len;
-        int posInT = generatedBytes % hashLen;
-        int leftInT = hashLen - generatedBytes % hashLen;
-        int toCopy = Math.min(leftInT, toGenerate);
-        System.arraycopy(currentT, posInT, out, outOff, toCopy);
-        generatedBytes += toCopy;
-        toGenerate -= toCopy;
-        outOff += toCopy;
-
-        while (toGenerate > 0)
-        {
-            expandNext();
-            toCopy = Math.min(hashLen, toGenerate);
-            System.arraycopy(currentT, 0, out, outOff, toCopy);
-            generatedBytes += toCopy;
-            toGenerate -= toCopy;
-            outOff += toCopy;
-        }
-
-        return len;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/generators/KDF1BytesGenerator.java b/bcprov/src/main/java/org/bouncycastle/crypto/generators/KDF1BytesGenerator.java
deleted file mode 100644
index 7789b7b..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/generators/KDF1BytesGenerator.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package org.bouncycastle.crypto.generators;
-
-import org.bouncycastle.crypto.Digest;
-
-/**
- * KDF1 generator for derived keys and ivs as defined by IEEE P1363a/ISO 18033
- * <br>
- * This implementation is based on ISO 18033/IEEE P1363a.
- */
-public class KDF1BytesGenerator
-    extends BaseKDFBytesGenerator
-{
-    /**
-     * Construct a KDF1 byte generator.
-     * <p>
-     * @param digest the digest to be used as the source of derived keys.
-     */
-    public KDF1BytesGenerator(
-        Digest  digest)
-    {
-        super(0, digest);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/generators/KDF2BytesGenerator.java b/bcprov/src/main/java/org/bouncycastle/crypto/generators/KDF2BytesGenerator.java
deleted file mode 100644
index ac0c64a..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/generators/KDF2BytesGenerator.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.bouncycastle.crypto.generators;
-
-import org.bouncycastle.crypto.Digest;
-
-/**
- * KDF2 generator for derived keys and ivs as defined by IEEE P1363a/ISO 18033
- * <br>
- * This implementation is based on IEEE P1363/ISO 18033.
- */
-public class KDF2BytesGenerator
-    extends BaseKDFBytesGenerator
-{
-    /**
-     * Construct a KDF2 bytes generator. Generates key material
-     * according to IEEE P1363 or ISO 18033 depending on the initialisation.
-     * <p>
-     * @param digest the digest to be used as the source of derived keys.
-     */
-    public KDF2BytesGenerator(
-        Digest  digest)
-    {
-        super(1, digest);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/generators/KDFCounterBytesGenerator.java b/bcprov/src/main/java/org/bouncycastle/crypto/generators/KDFCounterBytesGenerator.java
deleted file mode 100644
index 7147add..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/generators/KDFCounterBytesGenerator.java
+++ /dev/null
@@ -1,180 +0,0 @@
-package org.bouncycastle.crypto.generators;
-
-import java.math.BigInteger;
-
-import org.bouncycastle.crypto.DataLengthException;
-import org.bouncycastle.crypto.DerivationParameters;
-import org.bouncycastle.crypto.Mac;
-import org.bouncycastle.crypto.MacDerivationFunction;
-import org.bouncycastle.crypto.params.KDFCounterParameters;
-import org.bouncycastle.crypto.params.KeyParameter;
-
-/**
- * This KDF has been defined by the publicly available NIST SP 800-108 specification.
- * NIST SP800-108 allows for alternative orderings of the input fields, meaning that the input can be formated in multiple ways.
- * There are 3 supported formats:  - Below [i]_2 is a counter of r-bits length concatenated to the fixedInputData.
- * <ul>
- * <li>1: K(i) := PRF( KI, [i]_2 || Label || 0x00 || Context || [L]_2 ) with the counter at the very beginning of the fixedInputData (The default implementation has this format)</li>
- * <li>2: K(i) := PRF( KI, Label || 0x00 || Context || [L]_2 || [i]_2 ) with the counter at the very end of the fixedInputData</li>
- * <li>3a: K(i) := PRF( KI, Label || 0x00 || [i]_2 || Context || [L]_2 ) OR:</li>
- * <li>3b: K(i) := PRF( KI, Label || 0x00 || [i]_2 || [L]_2 || Context ) OR:</li>
- * <li>3c: K(i) := PRF( KI, Label || [i]_2 || 0x00 || Context || [L]_2 ) etc... with the counter somewhere in the 'middle' of the fixedInputData.</li>
- * </ul>
- * </p>
- * <p>
- * This function must be called with the following KDFCounterParameters():
- *  - KI      <br/>
- *  - The part of the fixedInputData that comes BEFORE the counter OR null  <br/>
- *  - the part of the fixedInputData that comes AFTER the counter OR null <br/>
- *  - the length of the counter in bits (not bytes)
- *  </p>
- * Resulting function calls assuming an 8 bit counter.
- * <ul>
- * <li>1.  KDFCounterParameters(ki, 	null, 									"Label || 0x00 || Context || [L]_2]",	8);</li>
- * <li>2.  KDFCounterParameters(ki, 	"Label || 0x00 || Context || [L]_2]", 	null,									8);</li>
- * <li>3a. KDFCounterParameters(ki, 	"Label || 0x00",						"Context || [L]_2]",					8);</li>
- * <li>3b. KDFCounterParameters(ki, 	"Label || 0x00",						"[L]_2] || Context",					8);</li>
- * <li>3c. KDFCounterParameters(ki, 	"Label", 								"0x00 || Context || [L]_2]",			8);</li>
- * </ul>
- */
-public class KDFCounterBytesGenerator
-    implements MacDerivationFunction
-{
-
-    private static final BigInteger INTEGER_MAX = BigInteger.valueOf(Integer.MAX_VALUE);
-    private static final BigInteger TWO = BigInteger.valueOf(2);
-
-    // please refer to the standard for the meaning of the variable names
-    // all field lengths are in bytes, not in bits as specified by the standard
-
-    // fields set by the constructor
-    private final Mac prf;
-    private final int h;
-
-    // fields set by init
-    private byte[] fixedInputDataCtrPrefix;
-    private byte[] fixedInputData_afterCtr;
-    private int maxSizeExcl;
-    // ios is i defined as an octet string (the binary representation)
-    private byte[] ios;
-
-    // operational
-    private int generatedBytes;
-    // k is used as buffer for all K(i) values
-    private byte[] k;
-
-
-    public KDFCounterBytesGenerator(Mac prf)
-    {
-        this.prf = prf;
-        this.h = prf.getMacSize();
-        this.k = new byte[h];
-    }
-
-
-    public void init(DerivationParameters param)
-    {
-        if (!(param instanceof KDFCounterParameters))
-        {
-            throw new IllegalArgumentException("Wrong type of arguments given");
-        }
-
-        KDFCounterParameters kdfParams = (KDFCounterParameters)param;
-
-        // --- init mac based PRF ---
-
-        this.prf.init(new KeyParameter(kdfParams.getKI()));
-
-        // --- set arguments ---
-
-        this.fixedInputDataCtrPrefix = kdfParams.getFixedInputDataCounterPrefix();
-        this.fixedInputData_afterCtr = kdfParams.getFixedInputDataCounterSuffix();
-
-        int r = kdfParams.getR();
-        this.ios = new byte[r / 8];
-
-        BigInteger maxSize = TWO.pow(r).multiply(BigInteger.valueOf(h));
-        this.maxSizeExcl = maxSize.compareTo(INTEGER_MAX) == 1 ?
-            Integer.MAX_VALUE : maxSize.intValue();
-
-        // --- set operational state ---
-
-        generatedBytes = 0;
-    }
-
-
-    public Mac getMac()
-    {
-        return prf;
-    }
-
-    public int generateBytes(byte[] out, int outOff, int len)
-        throws DataLengthException, IllegalArgumentException
-    {
-
-        int generatedBytesAfter = generatedBytes + len;
-        if (generatedBytesAfter < 0 || generatedBytesAfter >= maxSizeExcl)
-        {
-            throw new DataLengthException(
-                "Current KDFCTR may only be used for " + maxSizeExcl + " bytes");
-        }
-
-        if (generatedBytes % h == 0)
-        {
-            generateNext();
-        }
-
-        // copy what is left in the currentT (1..hash
-        int toGenerate = len;
-        int posInK = generatedBytes % h;
-        int leftInK = h - generatedBytes % h;
-        int toCopy = Math.min(leftInK, toGenerate);
-        System.arraycopy(k, posInK, out, outOff, toCopy);
-        generatedBytes += toCopy;
-        toGenerate -= toCopy;
-        outOff += toCopy;
-
-        while (toGenerate > 0)
-        {
-            generateNext();
-            toCopy = Math.min(h, toGenerate);
-            System.arraycopy(k, 0, out, outOff, toCopy);
-            generatedBytes += toCopy;
-            toGenerate -= toCopy;
-            outOff += toCopy;
-        }
-
-        return len;
-    }
-
-    private void generateNext()
-    {
-        int i = generatedBytes / h + 1;
-
-        // encode i into counter buffer
-        switch (ios.length)
-        {
-        case 4:
-            ios[0] = (byte)(i >>> 24);
-            // fall through
-        case 3:
-            ios[ios.length - 3] = (byte)(i >>> 16);
-            // fall through
-        case 2:
-            ios[ios.length - 2] = (byte)(i >>> 8);
-            // fall through
-        case 1:
-            ios[ios.length - 1] = (byte)i;
-            break;
-        default:
-            throw new IllegalStateException("Unsupported size of counter i");
-        }
-
-
-        // special case for K(0): K(0) is empty, so no update
-        prf.update(fixedInputDataCtrPrefix, 0, fixedInputDataCtrPrefix.length);
-        prf.update(ios, 0, ios.length);
-        prf.update(fixedInputData_afterCtr, 0, fixedInputData_afterCtr.length);
-        prf.doFinal(k, 0);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/generators/KDFDoublePipelineIterationBytesGenerator.java b/bcprov/src/main/java/org/bouncycastle/crypto/generators/KDFDoublePipelineIterationBytesGenerator.java
deleted file mode 100644
index 6115a1a..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/generators/KDFDoublePipelineIterationBytesGenerator.java
+++ /dev/null
@@ -1,181 +0,0 @@
-package org.bouncycastle.crypto.generators;
-
-import java.math.BigInteger;
-
-import org.bouncycastle.crypto.DataLengthException;
-import org.bouncycastle.crypto.DerivationParameters;
-import org.bouncycastle.crypto.Mac;
-import org.bouncycastle.crypto.MacDerivationFunction;
-import org.bouncycastle.crypto.params.KDFDoublePipelineIterationParameters;
-import org.bouncycastle.crypto.params.KeyParameter;
-
-/**
- * This KDF has been defined by the publicly available NIST SP 800-108 specification.
- */
-public class KDFDoublePipelineIterationBytesGenerator
-    implements MacDerivationFunction
-{
-
-    private static final BigInteger INTEGER_MAX = BigInteger.valueOf(Integer.MAX_VALUE);
-    private static final BigInteger TWO = BigInteger.valueOf(2);
-
-    // please refer to the standard for the meaning of the variable names
-    // all field lengths are in bytes, not in bits as specified by the standard
-
-    // fields set by the constructor
-    private final Mac prf;
-    private final int h;
-
-    // fields set by init
-    private byte[] fixedInputData;
-    private int maxSizeExcl;
-    // ios is i defined as an octet string (the binary representation)
-    private byte[] ios;
-    private boolean useCounter;
-
-    // operational
-    private int generatedBytes;
-    // k is used as buffer for all K(i) values
-    private byte[] a;
-    private byte[] k;
-
-
-    public KDFDoublePipelineIterationBytesGenerator(Mac prf)
-    {
-        this.prf = prf;
-        this.h = prf.getMacSize();
-        this.a = new byte[h];
-        this.k = new byte[h];
-    }
-
-    public void init(DerivationParameters params)
-    {
-        if (!(params instanceof KDFDoublePipelineIterationParameters))
-        {
-            throw new IllegalArgumentException("Wrong type of arguments given");
-        }
-
-        KDFDoublePipelineIterationParameters dpiParams = (KDFDoublePipelineIterationParameters)params;
-
-        // --- init mac based PRF ---
-
-        this.prf.init(new KeyParameter(dpiParams.getKI()));
-
-        // --- set arguments ---
-
-        this.fixedInputData = dpiParams.getFixedInputData();
-
-        int r = dpiParams.getR();
-        this.ios = new byte[r / 8];
-
-        if (dpiParams.useCounter())
-        {
-            // this is more conservative than the spec
-            BigInteger maxSize = TWO.pow(r).multiply(BigInteger.valueOf(h));
-            this.maxSizeExcl = maxSize.compareTo(INTEGER_MAX) == 1 ?
-                Integer.MAX_VALUE : maxSize.intValue();
-        }
-        else
-        {
-            this.maxSizeExcl = Integer.MAX_VALUE;
-        }
-
-        this.useCounter = dpiParams.useCounter();
-
-        // --- set operational state ---
-
-        generatedBytes = 0;
-    }
-
-    public Mac getMac()
-    {
-        return prf;
-    }
-
-    public int generateBytes(byte[] out, int outOff, int len)
-        throws DataLengthException, IllegalArgumentException
-    {
-
-        int generatedBytesAfter = generatedBytes + len;
-        if (generatedBytesAfter < 0 || generatedBytesAfter >= maxSizeExcl)
-        {
-            throw new DataLengthException(
-                "Current KDFCTR may only be used for " + maxSizeExcl + " bytes");
-        }
-
-        if (generatedBytes % h == 0)
-        {
-            generateNext();
-        }
-
-        // copy what is left in the currentT (1..hash
-        int toGenerate = len;
-        int posInK = generatedBytes % h;
-        int leftInK = h - generatedBytes % h;
-        int toCopy = Math.min(leftInK, toGenerate);
-        System.arraycopy(k, posInK, out, outOff, toCopy);
-        generatedBytes += toCopy;
-        toGenerate -= toCopy;
-        outOff += toCopy;
-
-        while (toGenerate > 0)
-        {
-            generateNext();
-            toCopy = Math.min(h, toGenerate);
-            System.arraycopy(k, 0, out, outOff, toCopy);
-            generatedBytes += toCopy;
-            toGenerate -= toCopy;
-            outOff += toCopy;
-        }
-
-        return len;
-    }
-
-    private void generateNext()
-    {
-
-        if (generatedBytes == 0)
-        {
-            // --- step 4 ---
-            prf.update(fixedInputData, 0, fixedInputData.length);
-            prf.doFinal(a, 0);
-        }
-        else
-        {
-            // --- step 5a ---
-            prf.update(a, 0, a.length);
-            prf.doFinal(a, 0);
-        }
-
-        // --- step 5b ---
-        prf.update(a, 0, a.length);
-
-        if (useCounter)
-        {
-            int i = generatedBytes / h + 1;
-
-            // encode i into counter buffer
-            switch (ios.length)
-            {
-            case 4:
-                ios[0] = (byte)(i >>> 24);
-                // fall through
-            case 3:
-                ios[ios.length - 3] = (byte)(i >>> 16);
-                // fall through
-            case 2:
-                ios[ios.length - 2] = (byte)(i >>> 8);
-                // fall through
-            case 1:
-                ios[ios.length - 1] = (byte)i;
-                break;
-            default:
-                throw new IllegalStateException("Unsupported size of counter i");
-            }
-            prf.update(ios, 0, ios.length);
-        }
-
-        prf.update(fixedInputData, 0, fixedInputData.length);
-        prf.doFinal(k, 0);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/generators/KDFFeedbackBytesGenerator.java b/bcprov/src/main/java/org/bouncycastle/crypto/generators/KDFFeedbackBytesGenerator.java
deleted file mode 100644
index 6003037..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/generators/KDFFeedbackBytesGenerator.java
+++ /dev/null
@@ -1,175 +0,0 @@
-package org.bouncycastle.crypto.generators;
-
-import java.math.BigInteger;
-
-import org.bouncycastle.crypto.DataLengthException;
-import org.bouncycastle.crypto.DerivationParameters;
-import org.bouncycastle.crypto.Mac;
-import org.bouncycastle.crypto.MacDerivationFunction;
-import org.bouncycastle.crypto.params.KDFFeedbackParameters;
-import org.bouncycastle.crypto.params.KeyParameter;
-
-/**
- * This KDF has been defined by the publicly available NIST SP 800-108 specification.
- */
-public class KDFFeedbackBytesGenerator
-    implements MacDerivationFunction
-{
-
-    private static final BigInteger INTEGER_MAX = BigInteger.valueOf(Integer.MAX_VALUE);
-    private static final BigInteger TWO = BigInteger.valueOf(2);
-
-    // please refer to the standard for the meaning of the variable names
-    // all field lengths are in bytes, not in bits as specified by the standard
-
-    // fields set by the constructor
-    private final Mac prf;
-    private final int h;
-
-    // fields set by init
-    private byte[] fixedInputData;
-    private int maxSizeExcl;
-    // ios is i defined as an octet string (the binary representation)
-    private byte[] ios;
-    private byte[] iv;
-    private boolean useCounter;
-
-    // operational
-    private int generatedBytes;
-    // k is used as buffer for all K(i) values
-    private byte[] k;
-
-
-    public KDFFeedbackBytesGenerator(Mac prf)
-    {
-        this.prf = prf;
-        this.h = prf.getMacSize();
-        this.k = new byte[h];
-    }
-
-    public void init(DerivationParameters params)
-    {
-        if (!(params instanceof KDFFeedbackParameters))
-        {
-            throw new IllegalArgumentException("Wrong type of arguments given");
-        }
-
-        KDFFeedbackParameters feedbackParams = (KDFFeedbackParameters)params;
-
-        // --- init mac based PRF ---
-
-        this.prf.init(new KeyParameter(feedbackParams.getKI()));
-
-        // --- set arguments ---
-
-        this.fixedInputData = feedbackParams.getFixedInputData();
-
-        int r = feedbackParams.getR();
-        this.ios = new byte[r / 8];
-
-        if (feedbackParams.useCounter())
-        {
-            // this is more conservative than the spec
-            BigInteger maxSize = TWO.pow(r).multiply(BigInteger.valueOf(h));
-            this.maxSizeExcl = maxSize.compareTo(INTEGER_MAX) == 1 ?
-                Integer.MAX_VALUE : maxSize.intValue();
-        }
-        else
-        {
-            this.maxSizeExcl = Integer.MAX_VALUE;
-        }
-
-        this.iv = feedbackParams.getIV();
-        this.useCounter = feedbackParams.useCounter();
-
-        // --- set operational state ---
-
-        generatedBytes = 0;
-    }
-
-    public Mac getMac()
-    {
-        return prf;
-    }
-
-    public int generateBytes(byte[] out, int outOff, int len)
-        throws DataLengthException, IllegalArgumentException
-    {
-
-        int generatedBytesAfter = generatedBytes + len;
-        if (generatedBytesAfter < 0 || generatedBytesAfter >= maxSizeExcl)
-        {
-            throw new DataLengthException(
-                "Current KDFCTR may only be used for " + maxSizeExcl + " bytes");
-        }
-
-        if (generatedBytes % h == 0)
-        {
-            generateNext();
-        }
-
-        // copy what is left in the currentT (1..hash
-        int toGenerate = len;
-        int posInK = generatedBytes % h;
-        int leftInK = h - generatedBytes % h;
-        int toCopy = Math.min(leftInK, toGenerate);
-        System.arraycopy(k, posInK, out, outOff, toCopy);
-        generatedBytes += toCopy;
-        toGenerate -= toCopy;
-        outOff += toCopy;
-
-        while (toGenerate > 0)
-        {
-            generateNext();
-            toCopy = Math.min(h, toGenerate);
-            System.arraycopy(k, 0, out, outOff, toCopy);
-            generatedBytes += toCopy;
-            toGenerate -= toCopy;
-            outOff += toCopy;
-        }
-
-        return len;
-    }
-
-    private void generateNext()
-    {
-
-        // TODO enable IV
-        if (generatedBytes == 0)
-        {
-            prf.update(iv, 0, iv.length);
-        }
-        else
-        {
-            prf.update(k, 0, k.length);
-        }
-
-        if (useCounter)
-        {
-            int i = generatedBytes / h + 1;
-
-            // encode i into counter buffer
-            switch (ios.length)
-            {
-            case 4:
-                ios[0] = (byte)(i >>> 24);
-                // fall through
-            case 3:
-                ios[ios.length - 3] = (byte)(i >>> 16);
-                // fall through
-            case 2:
-                ios[ios.length - 2] = (byte)(i >>> 8);
-                // fall through
-            case 1:
-                ios[ios.length - 1] = (byte)i;
-                break;
-            default:
-                throw new IllegalStateException("Unsupported size of counter i");
-            }
-            prf.update(ios, 0, ios.length);
-        }
-
-        prf.update(fixedInputData, 0, fixedInputData.length);
-        prf.doFinal(k, 0);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/generators/MGF1BytesGenerator.java b/bcprov/src/main/java/org/bouncycastle/crypto/generators/MGF1BytesGenerator.java
deleted file mode 100644
index e93c0d7..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/generators/MGF1BytesGenerator.java
+++ /dev/null
@@ -1,114 +0,0 @@
-package org.bouncycastle.crypto.generators;
-
-import org.bouncycastle.crypto.DataLengthException;
-import org.bouncycastle.crypto.DerivationFunction;
-import org.bouncycastle.crypto.DerivationParameters;
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.params.MGFParameters;
-
-/**
- * Generator for MGF1 as defined in PKCS 1v2
- */
-public class MGF1BytesGenerator
-    implements DerivationFunction
-{
-    private Digest  digest;
-    private byte[]  seed;
-    private int     hLen;
-
-    /**
-     * @param digest the digest to be used as the source of generated bytes
-     */
-    public MGF1BytesGenerator(
-        Digest  digest)
-    {
-        this.digest = digest;
-        this.hLen = digest.getDigestSize();
-    }
-
-    public void init(
-        DerivationParameters    param)
-    {
-        if (!(param instanceof MGFParameters))
-        {
-            throw new IllegalArgumentException("MGF parameters required for MGF1Generator");
-        }
-
-        MGFParameters   p = (MGFParameters)param;
-
-        seed = p.getSeed();
-    }
-
-    /**
-     * return the underlying digest.
-     */
-    public Digest getDigest()
-    {
-        return digest;
-    }
-
-    /**
-     * int to octet string.
-     */
-    private void ItoOSP(
-        int     i,
-        byte[]  sp)
-    {
-        sp[0] = (byte)(i >>> 24);
-        sp[1] = (byte)(i >>> 16);
-        sp[2] = (byte)(i >>> 8);
-        sp[3] = (byte)(i >>> 0);
-    }
-
-    /**
-     * fill len bytes of the output buffer with bytes generated from
-     * the derivation function.
-     *
-     * @throws DataLengthException if the out buffer is too small.
-     */
-    public int generateBytes(
-        byte[]  out,
-        int     outOff,
-        int     len)
-        throws DataLengthException, IllegalArgumentException
-    {
-        if ((out.length - len) < outOff)
-        {
-            throw new DataLengthException("output buffer too small");
-        }
-        
-        byte[]  hashBuf = new byte[hLen];
-        byte[]  C = new byte[4];
-        int     counter = 0;
-
-        digest.reset();
-
-        if (len > hLen)
-        {
-            do
-            {
-                ItoOSP(counter, C);
-    
-                digest.update(seed, 0, seed.length);
-                digest.update(C, 0, C.length);
-                digest.doFinal(hashBuf, 0);
-    
-                System.arraycopy(hashBuf, 0, out, outOff + counter * hLen, hLen);
-            }
-            while (++counter < (len / hLen));
-        }
-
-        if ((counter * hLen) < len)
-        {
-            ItoOSP(counter, C);
-
-            digest.update(seed, 0, seed.length);
-            digest.update(C, 0, C.length);
-            digest.doFinal(hashBuf, 0);
-
-            System.arraycopy(hashBuf, 0, out, outOff + counter * hLen, len - (counter * hLen));
-        }
-
-        return len;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/generators/NaccacheSternKeyPairGenerator.java b/bcprov/src/main/java/org/bouncycastle/crypto/generators/NaccacheSternKeyPairGenerator.java
deleted file mode 100644
index ceb3940..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/generators/NaccacheSternKeyPairGenerator.java
+++ /dev/null
@@ -1,365 +0,0 @@
-package org.bouncycastle.crypto.generators;
-
-import org.bouncycastle.crypto.AsymmetricCipherKeyPair;
-import org.bouncycastle.crypto.AsymmetricCipherKeyPairGenerator;
-import org.bouncycastle.crypto.KeyGenerationParameters;
-import org.bouncycastle.crypto.params.NaccacheSternKeyGenerationParameters;
-import org.bouncycastle.crypto.params.NaccacheSternKeyParameters;
-import org.bouncycastle.crypto.params.NaccacheSternPrivateKeyParameters;
-
-import java.math.BigInteger;
-import java.security.SecureRandom;
-import java.util.Vector;
-
-/**
- * Key generation parameters for NaccacheStern cipher. For details on this cipher, please see
- * 
- * http://www.gemplus.com/smart/rd/publications/pdf/NS98pkcs.pdf
- */
-public class NaccacheSternKeyPairGenerator 
-    implements AsymmetricCipherKeyPairGenerator 
-{
-
-    private static int[] smallPrimes =
-    {
-        3, 5, 7, 11, 13, 17, 19, 23, 29, 31, 37, 41, 43, 47, 53, 59, 61, 67,
-        71, 73, 79, 83, 89, 97, 101, 103, 107, 109, 113, 127, 131, 137, 139, 149,
-        151, 157, 163, 167, 173, 179, 181, 191, 193, 197, 199, 211, 223, 227, 229, 233,
-        239, 241, 251, 257, 263, 269, 271, 277, 281, 283, 293, 307, 311, 313, 317, 331,
-        337, 347, 349, 353, 359, 367, 373, 379, 383, 389, 397, 401, 409, 419, 421, 431,
-        433, 439, 443, 449, 457, 461, 463, 467, 479, 487, 491, 499, 503, 509, 521, 523,
-        541, 547, 557
-    };
-    
-    private NaccacheSternKeyGenerationParameters param;
-
-    private static final BigInteger ONE = BigInteger.valueOf(1); // JDK 1.1 compatibility
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.bouncycastle.crypto.AsymmetricCipherKeyPairGenerator#init(org.bouncycastle.crypto.KeyGenerationParameters)
-     */
-    public void init(KeyGenerationParameters param)
-    {
-        this.param = (NaccacheSternKeyGenerationParameters)param;
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.bouncycastle.crypto.AsymmetricCipherKeyPairGenerator#generateKeyPair()
-     */
-    public AsymmetricCipherKeyPair generateKeyPair()
-    {
-        int strength = param.getStrength();
-        SecureRandom rand = param.getRandom();
-        int certainty = param.getCertainty();
-        boolean debug = param.isDebug();
-
-        if (debug)
-        {
-            System.out.println("Fetching first " + param.getCntSmallPrimes() + " primes.");
-        }
-
-        Vector smallPrimes = findFirstPrimes(param.getCntSmallPrimes());
-        smallPrimes = permuteList(smallPrimes, rand);
-
-        BigInteger u = ONE;
-        BigInteger v = ONE;
-
-        for (int i = 0; i < smallPrimes.size() / 2; i++)
-        {
-            u = u.multiply((BigInteger)smallPrimes.elementAt(i));
-        }
-        for (int i = smallPrimes.size() / 2; i < smallPrimes.size(); i++)
-        {
-            v = v.multiply((BigInteger)smallPrimes.elementAt(i));
-        }
-
-        BigInteger sigma = u.multiply(v);
-
-        // n = (2 a u p_ + 1 ) ( 2 b v q_ + 1)
-        // -> |n| = strength
-        // |2| = 1 in bits
-        // -> |a| * |b| = |n| - |u| - |v| - |p_| - |q_| - |2| -|2|
-        // remainingStrength = strength - sigma.bitLength() - p_.bitLength() -
-        // q_.bitLength() - 1 -1
-        int remainingStrength = strength - sigma.bitLength() - 48;
-        BigInteger a = generatePrime(remainingStrength / 2 + 1, certainty, rand);
-        BigInteger b = generatePrime(remainingStrength / 2 + 1, certainty, rand);
-
-        BigInteger p_;
-        BigInteger q_;
-        BigInteger p;
-        BigInteger q;
-        long tries = 0;
-        if (debug)
-        {
-            System.out.println("generating p and q");
-        }
-
-        BigInteger _2au = a.multiply(u).shiftLeft(1);
-        BigInteger _2bv = b.multiply(v).shiftLeft(1);
-
-        for (;;)
-        {
-            tries++;
-
-            p_ = generatePrime(24, certainty, rand);
-   
-            p = p_.multiply(_2au).add(ONE);
-
-            if (!p.isProbablePrime(certainty))
-            {
-                continue;
-            }
-
-            for (;;)
-            {
-                q_ = generatePrime(24, certainty, rand);
-
-                if (p_.equals(q_))
-                {
-                    continue;
-                }
-
-                q = q_.multiply(_2bv).add(ONE);
-
-                if (q.isProbablePrime(certainty))
-                {
-                    break;
-                }
-            }
-
-            if (!sigma.gcd(p_.multiply(q_)).equals(ONE))
-            {
-                // System.out.println("sigma.gcd(p_.mult(q_)) != 1!\n p_: " + p_
-                // +"\n q_: "+ q_ );
-                continue;
-            }
-
-            if (p.multiply(q).bitLength() < strength)
-            {
-                if (debug)
-                {
-                    System.out.println("key size too small. Should be " + strength + " but is actually "
-                                    + p.multiply(q).bitLength());
-                }
-                continue;
-            }
-            break;
-        }
-
-        if (debug)
-        {
-            System.out.println("needed " + tries + " tries to generate p and q.");
-        }
-
-        BigInteger n = p.multiply(q);
-        BigInteger phi_n = p.subtract(ONE).multiply(q.subtract(ONE));
-        BigInteger g;
-        tries = 0;
-        if (debug)
-        {
-            System.out.println("generating g");
-        }
-        for (;;)
-        {
-
-            Vector gParts = new Vector();
-            for (int ind = 0; ind != smallPrimes.size(); ind++)
-            {
-                BigInteger i = (BigInteger)smallPrimes.elementAt(ind);
-                BigInteger e = phi_n.divide(i);
-
-                for (;;)
-                {
-                    tries++;
-                    g = new BigInteger(strength, certainty, rand);
-                    if (g.modPow(e, n).equals(ONE))
-                    {
-                        continue;
-                    }
-                    gParts.addElement(g);
-                    break;
-                }
-            }
-            g = ONE;
-            for (int i = 0; i < smallPrimes.size(); i++)
-            {
-                g = g.multiply(((BigInteger)gParts.elementAt(i)).modPow(sigma.divide((BigInteger)smallPrimes.elementAt(i)), n)).mod(n);
-            }
-
-            // make sure that g is not divisible by p_i or q_i
-            boolean divisible = false;
-            for (int i = 0; i < smallPrimes.size(); i++)
-            {
-                if (g.modPow(phi_n.divide((BigInteger)smallPrimes.elementAt(i)), n).equals(ONE))
-                {
-                    if (debug)
-                    {
-                        System.out.println("g has order phi(n)/" + smallPrimes.elementAt(i) + "\n g: " + g);
-                    }
-                    divisible = true;
-                    break;
-                }
-            }
-            
-            if (divisible)
-            {
-                continue;
-            }
-
-            // make sure that g has order > phi_n/4
-
-            if (g.modPow(phi_n.divide(BigInteger.valueOf(4)), n).equals(ONE))
-            {
-                if (debug)
-                {
-                    System.out.println("g has order phi(n)/4\n g:" + g);
-                }
-                continue;
-            }
-
-            if (g.modPow(phi_n.divide(p_), n).equals(ONE))
-            {
-                if (debug)
-                {
-                    System.out.println("g has order phi(n)/p'\n g: " + g);
-                }
-                continue;
-            }
-            if (g.modPow(phi_n.divide(q_), n).equals(ONE))
-            {
-                if (debug)
-                {
-                    System.out.println("g has order phi(n)/q'\n g: " + g);
-                }
-                continue;
-            }
-            if (g.modPow(phi_n.divide(a), n).equals(ONE))
-            {
-                if (debug)
-                {
-                    System.out.println("g has order phi(n)/a\n g: " + g);
-                }
-                continue;
-            }
-            if (g.modPow(phi_n.divide(b), n).equals(ONE))
-            {
-                if (debug)
-                {
-                    System.out.println("g has order phi(n)/b\n g: " + g);
-                }
-                continue;
-            }
-            break;
-        }
-        if (debug)
-        {
-            System.out.println("needed " + tries + " tries to generate g");
-            System.out.println();
-            System.out.println("found new NaccacheStern cipher variables:");
-            System.out.println("smallPrimes: " + smallPrimes);
-            System.out.println("sigma:...... " + sigma + " (" + sigma.bitLength() + " bits)");
-            System.out.println("a:.......... " + a);
-            System.out.println("b:.......... " + b);
-            System.out.println("p':......... " + p_);
-            System.out.println("q':......... " + q_);
-            System.out.println("p:.......... " + p);
-            System.out.println("q:.......... " + q);
-            System.out.println("n:.......... " + n);
-            System.out.println("phi(n):..... " + phi_n);
-            System.out.println("g:.......... " + g);
-            System.out.println();
-        }
-
-        return new AsymmetricCipherKeyPair(new NaccacheSternKeyParameters(false, g, n, sigma.bitLength()),
-                        new NaccacheSternPrivateKeyParameters(g, n, sigma.bitLength(), smallPrimes, phi_n));
-    }
-
-    private static BigInteger generatePrime(
-            int bitLength, 
-            int certainty,
-            SecureRandom rand)
-    {
-        BigInteger p_ = new BigInteger(bitLength, certainty, rand);
-        while (p_.bitLength() != bitLength)
-        {
-            p_ = new BigInteger(bitLength, certainty, rand);
-        }
-        return p_;
-    }
-
-    /**
-     * Generates a permuted ArrayList from the original one. The original List
-     * is not modified
-     * 
-     * @param arr
-     *            the ArrayList to be permuted
-     * @param rand
-     *            the source of Randomness for permutation
-     * @return a new ArrayList with the permuted elements.
-     */
-    private static Vector permuteList(
-        Vector arr, 
-        SecureRandom rand) 
-    {
-        Vector retval = new Vector();
-        Vector tmp = new Vector();
-        for (int i = 0; i < arr.size(); i++) 
-        {
-            tmp.addElement(arr.elementAt(i));
-        }
-        retval.addElement(tmp.elementAt(0));
-        tmp.removeElementAt(0);
-        while (tmp.size() != 0) 
-        {
-            retval.insertElementAt(tmp.elementAt(0), getInt(rand, retval.size() + 1));
-            tmp.removeElementAt(0);
-        }
-        return retval;
-    }
-
-    private static int getInt(
-        SecureRandom rand,
-        int n)
-    {
-        if ((n & -n) == n) 
-        {
-            return (int)((n * (long)(rand.nextInt() & 0x7fffffff)) >> 31);
-        }
-
-        int bits, val;
-        do
-        {
-            bits = rand.nextInt() & 0x7fffffff;
-            val = bits % n;
-        }
-        while (bits - val + (n-1) < 0);
-
-        return val;
-    }
-
-    /**
-     * Finds the first 'count' primes starting with 3
-     * 
-     * @param count
-     *            the number of primes to find
-     * @return a vector containing the found primes as Integer
-     */
-    private static Vector findFirstPrimes(
-        int count) 
-    {
-        Vector primes = new Vector(count);
-
-        for (int i = 0; i != count; i++)
-        {
-            primes.addElement(BigInteger.valueOf(smallPrimes[i]));
-        }
-        
-        return primes;
-    }
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/generators/OpenBSDBCrypt.java b/bcprov/src/main/java/org/bouncycastle/crypto/generators/OpenBSDBCrypt.java
deleted file mode 100644
index b5f133f..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/generators/OpenBSDBCrypt.java
+++ /dev/null
@@ -1,315 +0,0 @@
-package org.bouncycastle.crypto.generators;
-
-import java.io.ByteArrayOutputStream;
-
-import org.bouncycastle.crypto.DataLengthException;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.Strings;
-
-/**
- * Password hashing scheme BCrypt,
- * designed by Niels Provos and David Mazières, using the
- * String format and the Base64 encoding
- * of the reference implementation on OpenBSD
- */
-public class OpenBSDBCrypt
-{
-    private static final byte[] encodingTable = // the Bcrypts encoding table for OpenBSD
-        {
-            (byte)'.', (byte)'/', (byte)'A', (byte)'B', (byte)'C', (byte)'D',
-            (byte)'E', (byte)'F', (byte)'G', (byte)'H', (byte)'I', (byte)'J',
-            (byte)'K', (byte)'L', (byte)'M', (byte)'N', (byte)'O', (byte)'P',
-            (byte)'Q', (byte)'R', (byte)'S', (byte)'T', (byte)'U', (byte)'V',
-            (byte)'W', (byte)'X', (byte)'Y', (byte)'Z', (byte)'a', (byte)'b',
-            (byte)'c', (byte)'d', (byte)'e', (byte)'f', (byte)'g', (byte)'h',
-            (byte)'i', (byte)'j', (byte)'k', (byte)'l', (byte)'m', (byte)'n',
-            (byte)'o', (byte)'p', (byte)'q', (byte)'r', (byte)'s', (byte)'t',
-            (byte)'u', (byte)'v', (byte)'w', (byte)'x', (byte)'y', (byte)'z',
-            (byte)'0', (byte)'1', (byte)'2', (byte)'3', (byte)'4', (byte)'5',
-            (byte)'6', (byte)'7', (byte)'8', (byte)'9'
-        };
-    /*
-     * set up the decoding table.
-     */
-    private static final byte[] decodingTable = new byte[128];
-    private static final String version = "2a"; // previous version was not UTF-8
-
-    static
-    {
-        for (int i = 0; i < decodingTable.length; i++)
-        {
-            decodingTable[i] = (byte)0xff;
-        }
-
-        for (int i = 0; i < encodingTable.length; i++)
-        {
-            decodingTable[encodingTable[i]] = (byte)i;
-        }
-    }
-
-    public OpenBSDBCrypt()
-    {
-
-    }
-
-    /**
-     * Creates a 60 character Bcrypt String, including
-     * version, cost factor, salt and hash, separated by '$'
-     *
-     * @param cost     the cost factor, treated as an exponent of 2
-     * @param salt     a 16 byte salt
-     * @param password the password
-     * @return a 60 character Bcrypt String
-     */
-    private static String createBcryptString(
-        byte[] password,
-        byte[] salt,
-        int cost)
-    {
-        StringBuffer sb = new StringBuffer(60);
-        sb.append('$');
-        sb.append(version);
-        sb.append('$');
-        sb.append(cost < 10 ? ("0" + cost) : Integer.toString(cost));
-        sb.append('$');
-        sb.append(encodeData(salt));
-
-        byte[] key = BCrypt.generate(password, salt, cost);
-
-        sb.append(encodeData(key));
-
-        return sb.toString();
-    }
-
-    /**
-     * Creates a 60 character Bcrypt String, including
-     * version, cost factor, salt and hash, separated by '$'
-     *
-     * @param cost     the cost factor, treated as an exponent of 2
-     * @param salt     a 16 byte salt
-     * @param password the password
-     * @return a 60 character Bcrypt String
-     */
-    public static String generate(
-        char[] password,
-        byte[] salt,
-        int cost)
-    {
-        if (password == null)
-        {
-            throw new IllegalArgumentException("Password required.");
-        }
-        if (salt == null)
-        {
-            throw new IllegalArgumentException("Salt required.");
-        }
-        else if (salt.length != 16)
-        {
-            throw new DataLengthException("16 byte salt required: " + salt.length);
-        }
-        if (cost < 4 || cost > 31) // Minimum rounds: 16, maximum 2^31
-        {
-            throw new IllegalArgumentException("Invalid cost factor.");
-        }
-
-        byte[] psw = Strings.toUTF8ByteArray(password);
-
-        // 0 termination:
-
-        byte[] tmp = new byte[psw.length >= 72 ? 72 : psw.length + 1];
-
-        if (tmp.length > psw.length)
-        {
-            System.arraycopy(psw, 0, tmp, 0, psw.length);
-        }
-        else
-        {
-            System.arraycopy(psw, 0, tmp, 0, tmp.length);
-        }
-
-        Arrays.fill(psw, (byte)0);
-
-        String rv = createBcryptString(tmp, salt, cost);
-
-        Arrays.fill(tmp, (byte)0);
-
-        return rv;
-    }
-
-    /**
-     * Checks if a password corresponds to a 60 character Bcrypt String
-     *
-     * @param bcryptString a 60 character Bcrypt String, including
-     *                     version, cost factor, salt and hash,
-     *                     separated by '$'
-     * @param password     the password as an array of chars
-     * @return true if the password corresponds to the
-     * Bcrypt String, otherwise false
-     */
-    public static boolean checkPassword(
-        String bcryptString,
-        char[] password)
-    {
-        // validate bcryptString:
-        if (bcryptString.length() != 60)
-        {
-            throw new DataLengthException("Bcrypt String length: "
-                + bcryptString.length() + ", 60 required.");
-        }
-        if (bcryptString.charAt(0) != '$'
-            || bcryptString.charAt(3) != '$'
-            || bcryptString.charAt(6) != '$')
-        {
-            throw new IllegalArgumentException("Invalid Bcrypt String format.");
-        }
-        if (!bcryptString.substring(1, 3).equals(version))
-        {
-            throw new IllegalArgumentException("Wrong Bcrypt version, 2a expected.");
-        }
-        int cost = 0;
-        try
-        {
-            cost = Integer.parseInt(bcryptString.substring(4, 6));
-        }
-        catch (NumberFormatException nfe)
-        {
-            throw new IllegalArgumentException("Invalid cost factor:"
-                + bcryptString.substring(4, 6));
-        }
-        if (cost < 4 || cost > 31)
-        {
-            throw new IllegalArgumentException("Invalid cost factor: "
-                + cost + ", 4 < cost < 31 expected.");
-        }
-        // check password:
-        if (password == null)
-        {
-            throw new IllegalArgumentException("Missing password.");
-        }
-        byte[] salt = decodeSaltString(
-            bcryptString.substring(bcryptString.lastIndexOf('$') + 1,
-                bcryptString.length() - 31));
-
-        String newBcryptString = generate(password, salt, cost);
-
-        return bcryptString.equals(newBcryptString);
-    }
-
-    /*
-     * encode the input data producing a Bcrypt base 64 String.
-     *
-     * @param 	a byte representation of the salt or the password
-     * @return 	the Bcrypt base64 String
-     */
-    private static String encodeData(
-        byte[] data)
-
-    {
-        if (data.length != 24 && data.length != 16) // 192 bit key or 128 bit salt expected
-        {
-            throw new DataLengthException("Invalid length: " + data.length + ", 24 for key or 16 for salt expected");
-        }
-        boolean salt = false;
-        if (data.length == 16)//salt
-        {
-            salt = true;
-            byte[] tmp = new byte[18];// zero padding
-            System.arraycopy(data, 0, tmp, 0, data.length);
-            data = tmp;
-        }
-        else // key
-        {
-            data[data.length - 1] = (byte)0;
-        }
-
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
-        int len = data.length;
-
-        int a1, a2, a3;
-        int i;
-        for (i = 0; i < len; i += 3)
-        {
-            a1 = data[i] & 0xff;
-            a2 = data[i + 1] & 0xff;
-            a3 = data[i + 2] & 0xff;
-
-            out.write(encodingTable[(a1 >>> 2) & 0x3f]);
-            out.write(encodingTable[((a1 << 4) | (a2 >>> 4)) & 0x3f]);
-            out.write(encodingTable[((a2 << 2) | (a3 >>> 6)) & 0x3f]);
-            out.write(encodingTable[a3 & 0x3f]);
-        }
-
-        String result = Strings.fromByteArray(out.toByteArray());
-        if (salt == true)// truncate padding
-        {
-            return result.substring(0, 22);
-        }
-        else
-        {
-            return result.substring(0, result.length() - 1);
-        }
-    }
-
-
-    /*
-     * decodes the bcrypt base 64 encoded SaltString
-     *
-     * @param 		a 22 character Bcrypt base 64 encoded String 
-     * @return 		the 16 byte salt
-     * @exception 	DataLengthException if the length 
-     * 				of parameter is not 22
-     * @exception 	InvalidArgumentException if the parameter
-     * 				contains a value other than from Bcrypts base 64 encoding table
-     */
-    private static byte[] decodeSaltString(
-        String saltString)
-    {
-        char[] saltChars = saltString.toCharArray();
-
-        ByteArrayOutputStream out = new ByteArrayOutputStream(16);
-        byte b1, b2, b3, b4;
-
-        if (saltChars.length != 22)// bcrypt salt must be 22 (16 bytes)
-        {
-            throw new DataLengthException("Invalid base64 salt length: " + saltChars.length + " , 22 required.");
-        }
-
-        // check String for invalid characters:
-        for (int i = 0; i < saltChars.length; i++)
-        {
-            int value = saltChars[i];
-            if (value > 122 || value < 46 || (value > 57 && value < 65))
-            {
-                throw new IllegalArgumentException("Salt string contains invalid character: " + value);
-            }
-        }
-
-        // Padding: add two '\u0000'
-        char[] tmp = new char[22 + 2];
-        System.arraycopy(saltChars, 0, tmp, 0, saltChars.length);
-        saltChars = tmp;
-
-        int len = saltChars.length;
-
-        for (int i = 0; i < len; i += 4)
-        {
-            b1 = decodingTable[saltChars[i]];
-            b2 = decodingTable[saltChars[i + 1]];
-            b3 = decodingTable[saltChars[i + 2]];
-            b4 = decodingTable[saltChars[i + 3]];
-
-            out.write((b1 << 2) | (b2 >> 4));
-            out.write((b2 << 4) | (b3 >> 2));
-            out.write((b3 << 6) | b4);
-        }
-
-        byte[] saltBytes = out.toByteArray();
-
-        // truncate:
-        byte[] tmpSalt = new byte[16];
-        System.arraycopy(saltBytes, 0, tmpSalt, 0, tmpSalt.length);
-        saltBytes = tmpSalt;
-
-        return saltBytes;
-    }
-}
\ No newline at end of file
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/generators/OpenSSLPBEParametersGenerator.java b/bcprov/src/main/java/org/bouncycastle/crypto/generators/OpenSSLPBEParametersGenerator.java
index 8a4d28a..79ec0f2 100644
--- a/bcprov/src/main/java/org/bouncycastle/crypto/generators/OpenSSLPBEParametersGenerator.java
+++ b/bcprov/src/main/java/org/bouncycastle/crypto/generators/OpenSSLPBEParametersGenerator.java
@@ -3,7 +3,9 @@ package org.bouncycastle.crypto.generators;
 import org.bouncycastle.crypto.CipherParameters;
 import org.bouncycastle.crypto.Digest;
 import org.bouncycastle.crypto.PBEParametersGenerator;
-import org.bouncycastle.crypto.digests.MD5Digest;
+// BEGIN android-changed
+import org.bouncycastle.crypto.digests.AndroidDigestFactory;
+// END android-changed
 import org.bouncycastle.crypto.params.KeyParameter;
 import org.bouncycastle.crypto.params.ParametersWithIV;
 
@@ -17,7 +19,9 @@ import org.bouncycastle.crypto.params.ParametersWithIV;
 public class OpenSSLPBEParametersGenerator
     extends PBEParametersGenerator
 {
-    private Digest  digest = new MD5Digest();
+    // BEGIN android-changed
+    private Digest  digest = AndroidDigestFactory.getMD5();
+    // END android-changed
 
     /**
      * Construct a OpenSSL Parameters generator. 
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/generators/PKCS5S2ParametersGenerator.java b/bcprov/src/main/java/org/bouncycastle/crypto/generators/PKCS5S2ParametersGenerator.java
index 0954d48..082a1c8 100644
--- a/bcprov/src/main/java/org/bouncycastle/crypto/generators/PKCS5S2ParametersGenerator.java
+++ b/bcprov/src/main/java/org/bouncycastle/crypto/generators/PKCS5S2ParametersGenerator.java
@@ -4,7 +4,9 @@ import org.bouncycastle.crypto.CipherParameters;
 import org.bouncycastle.crypto.Digest;
 import org.bouncycastle.crypto.Mac;
 import org.bouncycastle.crypto.PBEParametersGenerator;
-import org.bouncycastle.crypto.digests.SHA1Digest;
+// BEGIN android-changed
+import org.bouncycastle.crypto.digests.AndroidDigestFactory;
+// END android-changed
 import org.bouncycastle.crypto.macs.HMac;
 import org.bouncycastle.crypto.params.KeyParameter;
 import org.bouncycastle.crypto.params.ParametersWithIV;
@@ -28,7 +30,9 @@ public class PKCS5S2ParametersGenerator
      */
     public PKCS5S2ParametersGenerator()
     {
-        this(new SHA1Digest());
+        // BEGIN android-changed
+        this(AndroidDigestFactory.getSHA1());
+        // END android-changed
     }
 
     public PKCS5S2ParametersGenerator(Digest digest)
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/generators/Poly1305KeyGenerator.java b/bcprov/src/main/java/org/bouncycastle/crypto/generators/Poly1305KeyGenerator.java
deleted file mode 100644
index 59eee39..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/generators/Poly1305KeyGenerator.java
+++ /dev/null
@@ -1,117 +0,0 @@
-package org.bouncycastle.crypto.generators;
-
-import org.bouncycastle.crypto.CipherKeyGenerator;
-import org.bouncycastle.crypto.KeyGenerationParameters;
-import org.bouncycastle.crypto.macs.Poly1305;
-
-/**
- * Generates keys for the Poly1305 MAC.
- * <p>
- * Poly1305 keys are 256 bit keys consisting of a 128 bit secret key used for the underlying block
- * cipher followed by a 128 bit {@code r} value used for the polynomial portion of the Mac. <br>
- * The {@code r} value has a specific format with some bits required to be cleared, resulting in an
- * effective 106 bit key. <br>
- * A separately generated 256 bit key can be modified to fit the Poly1305 key format by using the
- * {@link #clamp(byte[])} method to clear the required bits.
- *
- * @see Poly1305
- */
-public class Poly1305KeyGenerator
-    extends CipherKeyGenerator
-{
-    private static final byte R_MASK_LOW_2 = (byte)0xFC;
-    private static final byte R_MASK_HIGH_4 = (byte)0x0F;
-
-    /**
-     * Initialises the key generator.<br>
-     * Poly1305 keys are always 256 bits, so the key length in the provided parameters is ignored.
-     */
-    public void init(KeyGenerationParameters param)
-    {
-        // Poly1305 keys are always 256 bits
-        super.init(new KeyGenerationParameters(param.getRandom(), 256));
-    }
-
-    /**
-     * Generates a 256 bit key in the format required for Poly1305 - e.g.
-     * <code>k[0] ... k[15], r[0] ... r[15]</code> with the required bits in <code>r</code> cleared
-     * as per {@link #clamp(byte[])}.
-     */
-    public byte[] generateKey()
-    {
-        final byte[] key = super.generateKey();
-        clamp(key);
-        return key;
-    }
-
-    /**
-     * Modifies an existing 32 byte key value to comply with the requirements of the Poly1305 key by
-     * clearing required bits in the <code>r</code> (second 16 bytes) portion of the key.<br>
-     * Specifically:
-     * <ul>
-     * <li>r[3], r[7], r[11], r[15] have top four bits clear (i.e., are {0, 1, . . . , 15})</li>
-     * <li>r[4], r[8], r[12] have bottom two bits clear (i.e., are in {0, 4, 8, . . . , 252})</li>
-     * </ul>
-     *
-     * @param key a 32 byte key value <code>k[0] ... k[15], r[0] ... r[15]</code>
-     */
-    public static void clamp(byte[] key)
-    {
-        /*
-         * Key is k[0] ... k[15], r[0] ... r[15] as per poly1305_aes_clamp in ref impl.
-         */
-        if (key.length != 32)
-        {
-            throw new IllegalArgumentException("Poly1305 key must be 256 bits.");
-        }
-
-        /*
-         * r[3], r[7], r[11], r[15] have top four bits clear (i.e., are {0, 1, . . . , 15})
-         */
-        key[19] &= R_MASK_HIGH_4;
-        key[23] &= R_MASK_HIGH_4;
-        key[27] &= R_MASK_HIGH_4;
-        key[31] &= R_MASK_HIGH_4;
-
-        /*
-         * r[4], r[8], r[12] have bottom two bits clear (i.e., are in {0, 4, 8, . . . , 252}).
-         */
-        key[20] &= R_MASK_LOW_2;
-        key[24] &= R_MASK_LOW_2;
-        key[28] &= R_MASK_LOW_2;
-    }
-
-    /**
-     * Checks a 32 byte key for compliance with the Poly1305 key requirements, e.g.
-     * <code>k[0] ... k[15], r[0] ... r[15]</code> with the required bits in <code>r</code> cleared
-     * as per {@link #clamp(byte[])}.
-     *
-     * @throws IllegalArgumentException if the key is of the wrong length, or has invalid bits set
-     *             in the <code>r</code> portion of the key.
-     */
-    public static void checkKey(byte[] key)
-    {
-        if (key.length != 32)
-        {
-            throw new IllegalArgumentException("Poly1305 key must be 256 bits.");
-        }
-
-        checkMask(key[19], R_MASK_HIGH_4);
-        checkMask(key[23], R_MASK_HIGH_4);
-        checkMask(key[27], R_MASK_HIGH_4);
-        checkMask(key[31], R_MASK_HIGH_4);
-
-        checkMask(key[20], R_MASK_LOW_2);
-        checkMask(key[24], R_MASK_LOW_2);
-        checkMask(key[28], R_MASK_LOW_2);
-    }
-
-    private static void checkMask(byte b, byte mask)
-    {
-        if ((b & (~mask)) != 0)
-        {
-            throw new IllegalArgumentException("Invalid format for r portion of Poly1305 key.");
-        }
-    }
-
-}
\ No newline at end of file
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/generators/RSABlindingFactorGenerator.java b/bcprov/src/main/java/org/bouncycastle/crypto/generators/RSABlindingFactorGenerator.java
deleted file mode 100644
index add6714..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/generators/RSABlindingFactorGenerator.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package org.bouncycastle.crypto.generators;
-
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.params.ParametersWithRandom;
-import org.bouncycastle.crypto.params.RSAKeyParameters;
-import org.bouncycastle.crypto.params.RSAPrivateCrtKeyParameters;
-
-import java.math.BigInteger;
-import java.security.SecureRandom;
-
-/**
- * Generate a random factor suitable for use with RSA blind signatures
- * as outlined in Chaum's blinding and unblinding as outlined in
- * "Handbook of Applied Cryptography", page 475.
- */
-public class RSABlindingFactorGenerator
-{
-    private static BigInteger ZERO = BigInteger.valueOf(0);
-    private static BigInteger ONE = BigInteger.valueOf(1);
-
-    private RSAKeyParameters key;
-    private SecureRandom random;
-
-    /**
-     * Initialise the factor generator
-     *
-     * @param param the necessary RSA key parameters.
-     */
-    public void init(
-        CipherParameters param)
-    {
-        if (param instanceof ParametersWithRandom)
-        {
-            ParametersWithRandom rParam = (ParametersWithRandom)param;
-
-            key = (RSAKeyParameters)rParam.getParameters();
-            random = rParam.getRandom();
-        }
-        else
-        {
-            key = (RSAKeyParameters)param;
-            random = new SecureRandom();
-        }
-
-        if (key instanceof RSAPrivateCrtKeyParameters)
-        {
-            throw new IllegalArgumentException("generator requires RSA public key");
-        }
-    }
-
-    /**
-     * Generate a suitable blind factor for the public key the generator was initialised with.
-     *
-     * @return a random blind factor
-     */
-    public BigInteger generateBlindingFactor()
-    {
-        if (key == null)
-        {
-            throw new IllegalStateException("generator not initialised");
-        }
-
-        BigInteger m = key.getModulus();
-        int length = m.bitLength() - 1; // must be less than m.bitLength()
-        BigInteger factor;
-        BigInteger gcd;
-
-        do
-        {
-            factor = new BigInteger(length, random);
-            gcd = factor.gcd(m);
-        }
-        while (factor.equals(ZERO) || factor.equals(ONE) || !gcd.equals(ONE));
-
-        return factor;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/generators/SCrypt.java b/bcprov/src/main/java/org/bouncycastle/crypto/generators/SCrypt.java
deleted file mode 100644
index 0b3dc14..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/generators/SCrypt.java
+++ /dev/null
@@ -1,198 +0,0 @@
-package org.bouncycastle.crypto.generators;
-
-import org.bouncycastle.crypto.PBEParametersGenerator;
-import org.bouncycastle.crypto.digests.SHA256Digest;
-import org.bouncycastle.crypto.engines.Salsa20Engine;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.Pack;
-
-/**
- * Implementation of the scrypt a password-based key derivation function.
- * <p>
- * Scrypt was created by Colin Percival and is specified in <a
- * href="http://tools.ietf.org/html/draft-josefsson-scrypt-kdf-01">draft-josefsson-scrypt-kd</a>
- *
- */
-public class SCrypt
-{
-    /**
-     * Generate a key using the scrypt key derivation function.
-     * 
-     * @param P the bytes of the pass phrase.
-     * @param S the salt to use for this invocation.
-     * @param N CPU/Memory cost parameter. Must be larger than 1, a power of 2 and less than
-     *            <code>2^(128 * r / 8)</code>.
-     * @param r the block size, must be >= 1.
-     * @param p Parallelization parameter. Must be a positive integer less than or equal to
-     *            <code>Integer.MAX_VALUE / (128 * r * 8)</code>.
-     * 
-     * @param dkLen the length of the key to generate.
-     * @return the generated key.
-     */
-    public static byte[] generate(byte[] P, byte[] S, int N, int r, int p, int dkLen)
-    {
-        if (P== null)
-        {
-            throw new IllegalArgumentException("Passphrase P must be provided.");
-        }
-        if (S == null)
-        {
-            throw new IllegalArgumentException("Salt S must be provided.");
-        }
-        if (N <= 1)
-        {
-            throw new IllegalArgumentException("Cost parameter N must be > 1.");
-        }
-        // Only value of r that cost (as an int) could be exceeded for is 1
-        if (r == 1 && N > 65536)
-        {
-            throw new IllegalArgumentException("Cost parameter N must be > 1 and < 65536.");
-        }
-        if (r < 1)
-        {
-            throw new IllegalArgumentException("Block size r must be >= 1.");
-        }
-        int maxParallel = Integer.MAX_VALUE / (128 * r * 8);
-        if (p < 1 || p > maxParallel)
-        {
-            throw new IllegalArgumentException("Parallelisation parameter p must be >= 1 and <= " + maxParallel
-                + " (based on block size r of " + r + ")");
-        }
-        if (dkLen < 1)
-        {
-            throw new IllegalArgumentException("Generated key length dkLen must be >= 1.");
-        }
-        return MFcrypt(P, S, N, r, p, dkLen);
-    }
-
-    private static byte[] MFcrypt(byte[] P, byte[] S, int N, int r, int p, int dkLen)
-    {
-        int MFLenBytes = r * 128;
-        byte[] bytes = SingleIterationPBKDF2(P, S, p * MFLenBytes);
-
-        int[] B = null;
-
-        try
-        {
-            int BLen = bytes.length >>> 2;
-            B = new int[BLen];
-
-            Pack.littleEndianToInt(bytes, 0, B);
-
-            int MFLenWords = MFLenBytes >>> 2;
-            for (int BOff = 0; BOff < BLen; BOff += MFLenWords)
-            {
-                // TODO These can be done in parallel threads
-                SMix(B, BOff, N, r);
-            }
-
-            Pack.intToLittleEndian(B, bytes, 0);
-
-            return SingleIterationPBKDF2(P, bytes, dkLen);
-        }
-        finally
-        {
-            Clear(bytes);
-            Clear(B);
-        }
-    }
-
-    private static byte[] SingleIterationPBKDF2(byte[] P, byte[] S, int dkLen)
-    {
-        PBEParametersGenerator pGen = new PKCS5S2ParametersGenerator(new SHA256Digest());
-        pGen.init(P, S, 1);
-        KeyParameter key = (KeyParameter) pGen.generateDerivedMacParameters(dkLen * 8);
-        return key.getKey();
-    }
-
-    private static void SMix(int[] B, int BOff, int N, int r)
-    {
-        int BCount = r * 32;
-
-        int[] blockX1 = new int[16];
-        int[] blockX2 = new int[16];
-        int[] blockY = new int[BCount];
-
-        int[] X = new int[BCount];
-        int[][] V = new int[N][];
-
-        try
-        {
-            System.arraycopy(B, BOff, X, 0, BCount);
-
-            for (int i = 0; i < N; ++i)
-            {
-                V[i] = Arrays.clone(X);
-                BlockMix(X, blockX1, blockX2, blockY, r);
-            }
-
-            int mask = N - 1;
-            for (int i = 0; i < N; ++i)
-            {
-                int j = X[BCount - 16] & mask;
-                Xor(X, V[j], 0, X);
-                BlockMix(X, blockX1, blockX2, blockY, r);
-            }
-
-            System.arraycopy(X, 0, B, BOff, BCount);
-        }
-        finally
-        {
-            ClearAll(V);
-            ClearAll(new int[][]{ X, blockX1, blockX2, blockY });
-        }
-    }
-
-    private static void BlockMix(int[] B, int[] X1, int[] X2, int[] Y, int r)
-    {
-        System.arraycopy(B, B.length - 16, X1, 0, 16);
-
-        int BOff = 0, YOff = 0, halfLen = B.length >>> 1;
-
-        for (int i = 2 * r; i > 0; --i)
-        {
-            Xor(X1, B, BOff, X2);
-
-            Salsa20Engine.salsaCore(8, X2, X1);
-            System.arraycopy(X1, 0, Y, YOff, 16);
-
-            YOff = halfLen + BOff - YOff;
-            BOff += 16;
-        }
-
-        System.arraycopy(Y, 0, B, 0, Y.length);
-    }
-
-    private static void Xor(int[] a, int[] b, int bOff, int[] output)
-    {
-        for (int i = output.length - 1; i >= 0; --i)
-        {
-            output[i] = a[i] ^ b[bOff + i];
-        }
-    }
-
-    private static void Clear(byte[] array)
-    {
-        if (array != null)
-        {
-            Arrays.fill(array, (byte)0);
-        }
-    }
-
-    private static void Clear(int[] array)
-    {
-        if (array != null)
-        {
-            Arrays.fill(array, 0);
-        }
-    }
-
-    private static void ClearAll(int[][] arrays)
-    {
-        for (int i = 0; i < arrays.length; ++i)
-        {
-            Clear(arrays[i]);
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/generators/package.html b/bcprov/src/main/java/org/bouncycastle/crypto/generators/package.html
deleted file mode 100644
index 9d73ce3..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/generators/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body bgcolor="#ffffff">
-Generators for keys, key pairs and password based encryption algorithms.
-</body>
-</html>
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/io/CipherIOException.java b/bcprov/src/main/java/org/bouncycastle/crypto/io/CipherIOException.java
deleted file mode 100644
index beeb60b..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/io/CipherIOException.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package org.bouncycastle.crypto.io;
-
-import java.io.IOException;
-
-/**
- * {@link IOException} wrapper around an exception indicating a problem with the use of a cipher.
- */
-public class CipherIOException
-    extends IOException
-{
-    private static final long serialVersionUID = 1L;
-
-    private final Throwable cause;
-
-    public CipherIOException(String message, Throwable cause)
-    {
-        super(message);
-
-        this.cause = cause;
-    }
-
-    public Throwable getCause()
-    {
-        return cause;
-    }
-}
\ No newline at end of file
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/io/CipherInputStream.java b/bcprov/src/main/java/org/bouncycastle/crypto/io/CipherInputStream.java
deleted file mode 100644
index b06d1f5..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/io/CipherInputStream.java
+++ /dev/null
@@ -1,477 +0,0 @@
-package org.bouncycastle.crypto.io;
-
-import java.io.FilterInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.bouncycastle.crypto.BufferedBlockCipher;
-import org.bouncycastle.crypto.InvalidCipherTextException;
-import org.bouncycastle.crypto.SkippingCipher;
-import org.bouncycastle.crypto.StreamCipher;
-import org.bouncycastle.crypto.modes.AEADBlockCipher;
-import org.bouncycastle.util.Arrays;
-
-/**
- * A CipherInputStream is composed of an InputStream and a cipher so that read() methods return data
- * that are read in from the underlying InputStream but have been additionally processed by the
- * Cipher. The cipher must be fully initialized before being used by a CipherInputStream.
- * <p>
- * For example, if the Cipher is initialized for decryption, the
- * CipherInputStream will attempt to read in data and decrypt them,
- * before returning the decrypted data.
- */
-public class CipherInputStream
-    extends FilterInputStream
-{
-    private static final int INPUT_BUF_SIZE = 2048;
-
-    private SkippingCipher skippingCipher;
-    private byte[] inBuf;
-
-    private BufferedBlockCipher bufferedBlockCipher;
-    private StreamCipher streamCipher;
-    private AEADBlockCipher aeadBlockCipher;
-
-    private byte[] buf;
-    private byte[] markBuf;
-
-
-    private int bufOff;
-    private int maxBuf;
-    private boolean finalized;
-    private long markPosition;
-    private int markBufOff;
-
-    /**
-     * Constructs a CipherInputStream from an InputStream and a
-     * BufferedBlockCipher.
-     */
-    public CipherInputStream(
-        InputStream is,
-        BufferedBlockCipher cipher)
-    {
-        this(is, cipher, INPUT_BUF_SIZE);
-    }
-
-    /**
-     * Constructs a CipherInputStream from an InputStream and a StreamCipher.
-     */
-    public CipherInputStream(
-        InputStream is,
-        StreamCipher cipher)
-    {
-        this(is, cipher, INPUT_BUF_SIZE);
-    }
-
-    /**
-     * Constructs a CipherInputStream from an InputStream and an AEADBlockCipher.
-     */
-    public CipherInputStream(
-        InputStream is,
-        AEADBlockCipher cipher)
-    {
-        this(is, cipher, INPUT_BUF_SIZE);
-    }
-
-    /**
-     * Constructs a CipherInputStream from an InputStream, a
-     * BufferedBlockCipher, and a specified internal buffer size.
-     */
-    public CipherInputStream(
-        InputStream is,
-        BufferedBlockCipher cipher,
-        int bufSize)
-    {
-        super(is);
-
-        this.bufferedBlockCipher = cipher;
-        this.inBuf = new byte[bufSize];
-        this.skippingCipher = (cipher instanceof SkippingCipher) ? (SkippingCipher)cipher : null;
-    }
-
-    /**
-     * Constructs a CipherInputStream from an InputStream, a StreamCipher, and a specified internal buffer size.
-     */
-    public CipherInputStream(
-        InputStream is,
-        StreamCipher cipher,
-        int bufSize)
-    {
-        super(is);
-
-        this.streamCipher = cipher;
-        this.inBuf = new byte[bufSize];
-        this.skippingCipher = (cipher instanceof SkippingCipher) ? (SkippingCipher)cipher : null;
-    }
-
-    /**
-     * Constructs a CipherInputStream from an InputStream, an AEADBlockCipher, and a specified internal buffer size.
-     */
-    public CipherInputStream(
-        InputStream is,
-        AEADBlockCipher cipher,
-        int bufSize)
-    {
-        super(is);
-
-        this.aeadBlockCipher = cipher;
-        this.inBuf = new byte[bufSize];
-        this.skippingCipher = (cipher instanceof SkippingCipher) ? (SkippingCipher)cipher : null;
-    }
-
-    /**
-     * Read data from underlying stream and process with cipher until end of stream or some data is
-     * available after cipher processing.
-     *
-     * @return -1 to indicate end of stream, or the number of bytes (> 0) available.
-     */
-    private int nextChunk()
-        throws IOException
-    {
-        if (finalized)
-        {
-            return -1;
-        }
-
-        bufOff = 0;
-        maxBuf = 0;
-
-        // Keep reading until EOF or cipher processing produces data
-        while (maxBuf == 0)
-        {
-            int read = in.read(inBuf);
-            if (read == -1)
-            {
-                finaliseCipher();
-                if (maxBuf == 0)
-                {
-                    return -1;
-                }
-                return maxBuf;
-            }
-
-            try
-            {
-                ensureCapacity(read, false);
-                if (bufferedBlockCipher != null)
-                {
-                    maxBuf = bufferedBlockCipher.processBytes(inBuf, 0, read, buf, 0);
-                }
-                else if (aeadBlockCipher != null)
-                {
-                    maxBuf = aeadBlockCipher.processBytes(inBuf, 0, read, buf, 0);
-                }
-                else
-                {
-                    streamCipher.processBytes(inBuf, 0, read, buf, 0);
-                    maxBuf = read;
-                }
-            }
-            catch (Exception e)
-            {
-                throw new CipherIOException("Error processing stream ", e);
-            }
-        }
-        return maxBuf;
-    }
-
-    private void finaliseCipher()
-        throws IOException
-    {
-        try
-        {
-            finalized = true;
-            ensureCapacity(0, true);
-            if (bufferedBlockCipher != null)
-            {
-                maxBuf = bufferedBlockCipher.doFinal(buf, 0);
-            }
-            else if (aeadBlockCipher != null)
-            {
-                maxBuf = aeadBlockCipher.doFinal(buf, 0);
-            }
-            else
-            {
-                maxBuf = 0; // a stream cipher
-            }
-        }
-        catch (final InvalidCipherTextException e)
-        {
-            throw new InvalidCipherTextIOException("Error finalising cipher", e);
-        }
-        catch (Exception e)
-        {
-            throw new IOException("Error finalising cipher " + e);
-        }
-    }
-
-    /**
-     * Reads data from the underlying stream and processes it with the cipher until the cipher
-     * outputs data, and returns the next available byte.
-     * <p>
-     * If the underlying stream is exhausted by this call, the cipher will be finalised.
-     * </p>
-     * @throws IOException if there was an error closing the input stream.
-     * @throws InvalidCipherTextIOException if the data read from the stream was invalid ciphertext
-     * (e.g. the cipher is an AEAD cipher and the ciphertext tag check fails).
-     */
-    public int read()
-        throws IOException
-    {
-        if (bufOff >= maxBuf)
-        {
-            if (nextChunk() < 0)
-            {
-                return -1;
-            }
-        }
-
-        return buf[bufOff++] & 0xff;
-    }
-
-    /**
-     * Reads data from the underlying stream and processes it with the cipher until the cipher
-     * outputs data, and then returns up to <code>b.length</code> bytes in the provided array.
-     * <p>
-     * If the underlying stream is exhausted by this call, the cipher will be finalised.
-     * </p>
-     * @param b the buffer into which the data is read.
-     * @return the total number of bytes read into the buffer, or <code>-1</code> if there is no
-     *         more data because the end of the stream has been reached.
-     * @throws IOException if there was an error closing the input stream.
-     * @throws InvalidCipherTextIOException if the data read from the stream was invalid ciphertext
-     * (e.g. the cipher is an AEAD cipher and the ciphertext tag check fails).
-     */
-    public int read(
-        byte[] b)
-        throws IOException
-    {
-        return read(b, 0, b.length);
-    }
-
-    /**
-     * Reads data from the underlying stream and processes it with the cipher until the cipher
-     * outputs data, and then returns up to <code>len</code> bytes in the provided array.
-     * <p>
-     * If the underlying stream is exhausted by this call, the cipher will be finalised.
-     * </p>
-     * @param b   the buffer into which the data is read.
-     * @param off the start offset in the destination array <code>b</code>
-     * @param len the maximum number of bytes read.
-     * @return the total number of bytes read into the buffer, or <code>-1</code> if there is no
-     *         more data because the end of the stream has been reached.
-     * @throws IOException if there was an error closing the input stream.
-     * @throws InvalidCipherTextIOException if the data read from the stream was invalid ciphertext
-     * (e.g. the cipher is an AEAD cipher and the ciphertext tag check fails).
-     */
-    public int read(
-        byte[] b,
-        int off,
-        int len)
-        throws IOException
-    {
-        if (bufOff >= maxBuf)
-        {
-            if (nextChunk() < 0)
-            {
-                return -1;
-            }
-        }
-
-        int toSupply = Math.min(len, available());
-        System.arraycopy(buf, bufOff, b, off, toSupply);
-        bufOff += toSupply;
-        return toSupply;
-    }
-
-    public long skip(
-        long n)
-        throws IOException
-    {
-        if (n <= 0)
-        {
-            return 0;
-        }
-
-        if (skippingCipher != null)
-        {
-            int avail = available();
-            if (n <= avail)
-            {
-                bufOff += n;
-
-                return n;
-            }
-
-            bufOff = maxBuf;
-
-            long skip = in.skip(n - avail);
-
-            long cSkip = skippingCipher.skip(skip);
-
-            if (skip != cSkip)
-            {
-                throw new IOException("Unable to skip cipher " + skip + " bytes.");
-            }
-
-            return skip + avail;
-        }
-        else
-        {
-            int skip = (int)Math.min(n, available());
-            bufOff += skip;
-
-            return skip;
-        }
-    }
-
-    public int available()
-        throws IOException
-    {
-        return maxBuf - bufOff;
-    }
-
-    /**
-     * Ensure the cipher text buffer has space sufficient to accept an upcoming output.
-     *
-     * @param updateSize the size of the pending update.
-     * @param finalOutput <code>true</code> iff this the cipher is to be finalised.
-     */
-    private void ensureCapacity(int updateSize, boolean finalOutput)
-    {
-        int bufLen = updateSize;
-        if (finalOutput)
-        {
-            if (bufferedBlockCipher != null)
-            {
-                bufLen = bufferedBlockCipher.getOutputSize(updateSize);
-            }
-            else if (aeadBlockCipher != null)
-            {
-                bufLen = aeadBlockCipher.getOutputSize(updateSize);
-            }
-        }
-        else
-        {
-            if (bufferedBlockCipher != null)
-            {
-                bufLen = bufferedBlockCipher.getUpdateOutputSize(updateSize);
-            }
-            else if (aeadBlockCipher != null)
-            {
-                bufLen = aeadBlockCipher.getUpdateOutputSize(updateSize);
-            }
-        }
-
-        if ((buf == null) || (buf.length < bufLen))
-        {
-            buf = new byte[bufLen];
-        }
-    }
-
-    /**
-     * Closes the underlying input stream and finalises the processing of the data by the cipher.
-     *
-     * @throws IOException if there was an error closing the input stream.
-     * @throws InvalidCipherTextIOException if the data read from the stream was invalid ciphertext
-     *             (e.g. the cipher is an AEAD cipher and the ciphertext tag check fails).
-     */
-    public void close()
-        throws IOException
-    {
-        try
-        {
-            in.close();
-        }
-        finally
-        {
-            if (!finalized)
-            {
-                // Reset the cipher, discarding any data buffered in it
-                // Errors in cipher finalisation trump I/O error closing input
-                finaliseCipher();
-            }
-        }
-        maxBuf = bufOff = 0;
-        markBufOff = 0;
-        markPosition = 0;
-        if (markBuf != null)
-        {
-            Arrays.fill(markBuf, (byte)0);
-            markBuf = null;
-        }
-        if (buf != null)
-        {
-            Arrays.fill(buf, (byte)0);
-            buf = null;
-        }
-        Arrays.fill(inBuf, (byte)0);
-    }
-
-    /**
-     * Mark the current position.
-     * <p>
-     * This method only works if markSupported() returns true - which means the underlying stream supports marking, and the cipher passed
-     * in to this stream's constructor is a SkippingCipher (so capable of being reset to an arbitrary point easily).
-     * </p>
-     * @param readlimit the maximum read ahead required before a reset() may be called.
-     */
-    public void mark(int readlimit)
-    {
-        in.mark(readlimit);
-        if (skippingCipher != null)
-        {
-            markPosition = skippingCipher.getPosition();
-        }
-
-        if (buf != null)
-        {
-            markBuf = new byte[buf.length];
-            System.arraycopy(buf, 0, markBuf, 0, buf.length);
-        }
-
-        markBufOff = bufOff;
-    }
-
-    /**
-     * Reset to the last marked position, if supported.
-     *
-     * @throws IOException if marking not supported by the cipher used, or the underlying stream.
-     */
-    public void reset()
-        throws IOException
-    {
-        if (skippingCipher == null)
-        {
-            throw new IOException("cipher must implement SkippingCipher to be used with reset()");
-        }
-
-        in.reset();
-
-        skippingCipher.seekTo(markPosition);
-
-        if (markBuf != null)
-        {
-            buf = markBuf;
-        }
-
-        bufOff = markBufOff;
-     }
-
-    /**
-     * Return true if mark(readlimit) is supported. This will be true if the underlying stream supports marking and the
-     * cipher used is a SkippingCipher,
-     *
-     * @return true if mark(readlimit) supported, false otherwise.
-     */
-    public boolean markSupported()
-    {
-        if (skippingCipher != null)
-        {
-            return in.markSupported();
-        }
-
-        return false;
-    }
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/io/CipherOutputStream.java b/bcprov/src/main/java/org/bouncycastle/crypto/io/CipherOutputStream.java
deleted file mode 100644
index 5d5f0d1..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/io/CipherOutputStream.java
+++ /dev/null
@@ -1,276 +0,0 @@
-package org.bouncycastle.crypto.io;
-
-import java.io.FilterOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-
-import org.bouncycastle.crypto.BufferedBlockCipher;
-import org.bouncycastle.crypto.InvalidCipherTextException;
-import org.bouncycastle.crypto.StreamCipher;
-import org.bouncycastle.crypto.modes.AEADBlockCipher;
-
-/**
- * A CipherOutputStream is composed of an OutputStream and a cipher so that write() methods process
- * the written data with the cipher, and the output of the cipher is in turn written to the
- * underlying OutputStream. The cipher must be fully initialized before being used by a
- * CipherInputStream.
- * <p>
- * For example, if the cipher is initialized for encryption, the CipherOutputStream will encrypt the
- * data before writing the encrypted data to the underlying stream.
- */
-public class CipherOutputStream
-    extends FilterOutputStream
-{
-    private BufferedBlockCipher bufferedBlockCipher;
-    private StreamCipher streamCipher;
-    private AEADBlockCipher aeadBlockCipher;
-
-    private final byte[] oneByte = new byte[1];
-    private byte[] buf;
-
-    /**
-     * Constructs a CipherOutputStream from an OutputStream and a
-     * BufferedBlockCipher.
-     */
-    public CipherOutputStream(
-        OutputStream os,
-        BufferedBlockCipher cipher)
-    {
-        super(os);
-        this.bufferedBlockCipher = cipher;
-    }
-
-    /**
-     * Constructs a CipherOutputStream from an OutputStream and a
-     * BufferedBlockCipher.
-     */
-    public CipherOutputStream(
-        OutputStream os,
-        StreamCipher cipher)
-    {
-        super(os);
-        this.streamCipher = cipher;
-    }
-
-    /**
-     * Constructs a CipherOutputStream from an OutputStream and a AEADBlockCipher.
-     */
-    public CipherOutputStream(OutputStream os, AEADBlockCipher cipher)
-    {
-        super(os);
-        this.aeadBlockCipher = cipher;
-    }
-
-    /**
-     * Writes the specified byte to this output stream.
-     *
-     * @param b the <code>byte</code>.
-     * @throws java.io.IOException if an I/O error occurs.
-     */
-    public void write(
-        int b)
-        throws IOException
-    {
-        oneByte[0] = (byte)b;
-
-        if (streamCipher != null)
-        {
-            out.write(streamCipher.returnByte((byte)b));
-        }
-        else
-        {
-            write(oneByte, 0, 1);
-        }
-    }
-
-    /**
-     * Writes <code>b.length</code> bytes from the specified byte array
-     * to this output stream.
-     * <p>
-     * The <code>write</code> method of
-     * <code>CipherOutputStream</code> calls the <code>write</code>
-     * method of three arguments with the three arguments
-     * <code>b</code>, <code>0</code>, and <code>b.length</code>.
-     *
-     * @param b the data.
-     * @throws java.io.IOException if an I/O error occurs.
-     * @see #write(byte[], int, int)
-     */
-    public void write(
-        byte[] b)
-        throws IOException
-    {
-        write(b, 0, b.length);
-    }
-
-    /**
-     * Writes <code>len</code> bytes from the specified byte array
-     * starting at offset <code>off</code> to this output stream.
-     *
-     * @param b   the data.
-     * @param off the start offset in the data.
-     * @param len the number of bytes to write.
-     * @throws java.io.IOException if an I/O error occurs.
-     */
-    public void write(
-        byte[] b,
-        int off,
-        int len)
-        throws IOException
-    {
-        ensureCapacity(len, false);
-
-        if (bufferedBlockCipher != null)
-        {
-            int outLen = bufferedBlockCipher.processBytes(b, off, len, buf, 0);
-
-            if (outLen != 0)
-            {
-                out.write(buf, 0, outLen);
-            }
-        }
-        else if (aeadBlockCipher != null)
-        {
-            int outLen = aeadBlockCipher.processBytes(b, off, len, buf, 0);
-
-            if (outLen != 0)
-            {
-                out.write(buf, 0, outLen);
-            }
-        }
-        else
-        {
-            streamCipher.processBytes(b, off, len, buf, 0);
-
-            out.write(buf, 0, len);
-        }
-    }
-
-    /**
-     * Ensure the ciphertext buffer has space sufficient to accept an upcoming output.
-     *
-     * @param updateSize the size of the pending update.
-     * @param finalOutput <code>true</code> iff this the cipher is to be finalised.
-     */
-    private void ensureCapacity(int updateSize, boolean finalOutput)
-    {
-        int bufLen = updateSize;
-        if (finalOutput)
-        {
-            if (bufferedBlockCipher != null)
-            {
-                bufLen = bufferedBlockCipher.getOutputSize(updateSize);
-            }
-            else if (aeadBlockCipher != null)
-            {
-                bufLen = aeadBlockCipher.getOutputSize(updateSize);
-            }
-        }
-        else
-        {
-            if (bufferedBlockCipher != null)
-            {
-                bufLen = bufferedBlockCipher.getUpdateOutputSize(updateSize);
-            }
-            else if (aeadBlockCipher != null)
-            {
-                bufLen = aeadBlockCipher.getUpdateOutputSize(updateSize);
-            }
-        }
-
-        if ((buf == null) || (buf.length < bufLen))
-        {
-            buf = new byte[bufLen];
-        }
-    }
-
-    /**
-     * Flushes this output stream by forcing any buffered output bytes
-     * that have already been processed by the encapsulated cipher object
-     * to be written out.
-     * <p>
-     * Any bytes buffered by the encapsulated cipher
-     * and waiting to be processed by it will not be written out. For example,
-     * if the encapsulated cipher is a block cipher, and the total number of
-     * bytes written using one of the <code>write</code> methods is less than
-     * the cipher's block size, no bytes will be written out.
-     *
-     * @throws java.io.IOException if an I/O error occurs.
-     */
-    public void flush()
-        throws IOException
-    {
-        out.flush();
-    }
-
-    /**
-     * Closes this output stream and releases any system resources
-     * associated with this stream.
-     * <p>
-     * This method invokes the <code>doFinal</code> method of the encapsulated
-     * cipher object, which causes any bytes buffered by the encapsulated
-     * cipher to be processed. The result is written out by calling the
-     * <code>flush</code> method of this output stream.
-     * <p>
-     * This method resets the encapsulated cipher object to its initial state
-     * and calls the <code>close</code> method of the underlying output
-     * stream.
-     *
-     * @throws java.io.IOException if an I/O error occurs.
-     * @throws InvalidCipherTextIOException if the data written to this stream was invalid ciphertext
-     * (e.g. the cipher is an AEAD cipher and the ciphertext tag check fails).
-     */
-    public void close()
-        throws IOException
-    {
-        ensureCapacity(0, true);
-        IOException error = null;
-        try
-        {
-            if (bufferedBlockCipher != null)
-            {
-                int outLen = bufferedBlockCipher.doFinal(buf, 0);
-
-                if (outLen != 0)
-                {
-                    out.write(buf, 0, outLen);
-                }
-            }
-            else if (aeadBlockCipher != null)
-            {
-                int outLen = aeadBlockCipher.doFinal(buf, 0);
-
-                if (outLen != 0)
-                {
-                    out.write(buf, 0, outLen);
-                }
-            }
-        }
-        catch (final InvalidCipherTextException e)
-        {
-            error = new InvalidCipherTextIOException("Error finalising cipher data", e);
-        }
-        catch (Exception e)
-        {
-            error = new CipherIOException("Error closing stream: ", e);
-        }
-
-        try
-        {
-            flush();
-            out.close();
-        }
-        catch (IOException e)
-        {
-            // Invalid ciphertext takes precedence over close error
-            if (error == null)
-            {
-                error = e;
-            }
-        }
-        if (error != null)
-        {
-            throw error;
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/io/InvalidCipherTextIOException.java b/bcprov/src/main/java/org/bouncycastle/crypto/io/InvalidCipherTextIOException.java
deleted file mode 100644
index 46561c6..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/io/InvalidCipherTextIOException.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package org.bouncycastle.crypto.io;
-
-import java.io.IOException;
-
-/**
- * {@link IOException} wrapper around an exception indicating an invalid ciphertext, such as in
- * authentication failure during finalisation of an AEAD cipher. For use in streams that need to
- * expose invalid ciphertext errors.
- */
-public class InvalidCipherTextIOException
-    extends CipherIOException
-{
-    private static final long serialVersionUID = 1L;
-
-    public InvalidCipherTextIOException(String message, Throwable cause)
-    {
-        super(message, cause);
-    }
-}
\ No newline at end of file
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/io/SignerInputStream.java b/bcprov/src/main/java/org/bouncycastle/crypto/io/SignerInputStream.java
deleted file mode 100644
index 9583e4c..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/io/SignerInputStream.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package org.bouncycastle.crypto.io;
-
-import java.io.FilterInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.bouncycastle.crypto.Signer;
-
-public class SignerInputStream
-    extends FilterInputStream
-{
-    protected Signer signer;
-
-    public SignerInputStream(
-        InputStream stream,
-        Signer      signer)
-    {
-        super(stream);
-        this.signer = signer;
-    }
-
-    public int read()
-        throws IOException
-    {
-        int b = in.read();
-
-        if (b >= 0)
-        {
-            signer.update((byte)b);
-        }
-        return b;
-    }
-
-    public int read(
-        byte[] b,
-        int off,
-        int len)
-        throws IOException
-    {
-        int n = in.read(b, off, len);
-        if (n > 0)
-        {
-            signer.update(b, off, n);
-        }
-        return n;
-    }
-
-    public Signer getSigner()
-    {
-        return signer;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/io/SignerOutputStream.java b/bcprov/src/main/java/org/bouncycastle/crypto/io/SignerOutputStream.java
deleted file mode 100644
index 1c21b5d..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/io/SignerOutputStream.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package org.bouncycastle.crypto.io;
-
-import java.io.IOException;
-import java.io.OutputStream;
-
-import org.bouncycastle.crypto.Signer;
-
-public class SignerOutputStream
-    extends OutputStream
-{
-    protected Signer signer;
-
-    public SignerOutputStream(
-        Signer          Signer)
-    {
-        this.signer = Signer;
-    }
-
-    public void write(int b)
-        throws IOException
-    {
-        signer.update((byte)b);
-    }
-
-    public void write(
-        byte[] b,
-        int off,
-        int len)
-        throws IOException
-    {
-        signer.update(b, off, len);
-    }
-
-    public Signer getSigner()
-    {
-        return signer;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/io/package.html b/bcprov/src/main/java/org/bouncycastle/crypto/io/package.html
deleted file mode 100644
index f2c9e40..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/io/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body bgcolor="#ffffff">
-Classes for doing "enhanced" I/O with Digests and MACs.
-</body>
-</html>
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/kems/ECIESKeyEncapsulation.java b/bcprov/src/main/java/org/bouncycastle/crypto/kems/ECIESKeyEncapsulation.java
deleted file mode 100644
index 3513198..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/kems/ECIESKeyEncapsulation.java
+++ /dev/null
@@ -1,254 +0,0 @@
-package org.bouncycastle.crypto.kems;
-
-import java.math.BigInteger;
-import java.security.SecureRandom;
-
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.DerivationFunction;
-import org.bouncycastle.crypto.KeyEncapsulation;
-import org.bouncycastle.crypto.params.ECDomainParameters;
-import org.bouncycastle.crypto.params.ECKeyParameters;
-import org.bouncycastle.crypto.params.ECPrivateKeyParameters;
-import org.bouncycastle.crypto.params.ECPublicKeyParameters;
-import org.bouncycastle.crypto.params.KDFParameters;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.math.ec.ECCurve;
-import org.bouncycastle.math.ec.ECMultiplier;
-import org.bouncycastle.math.ec.ECPoint;
-import org.bouncycastle.math.ec.FixedPointCombMultiplier;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.BigIntegers;
-
-/**
- * The ECIES Key Encapsulation Mechanism (ECIES-KEM) from ISO 18033-2.
- */
-public class ECIESKeyEncapsulation
-    implements KeyEncapsulation
-{
-    private static final BigInteger ONE = BigInteger.valueOf(1);
-
-    private DerivationFunction kdf;
-    private SecureRandom rnd;
-    private ECKeyParameters key;
-    private boolean CofactorMode;
-    private boolean OldCofactorMode;
-    private boolean SingleHashMode;
-
-    /**
-     * Set up the ECIES-KEM.
-     *
-     * @param kdf the key derivation function to be used.
-     * @param rnd the random source for the session key.
-     */
-    public ECIESKeyEncapsulation(
-        DerivationFunction kdf,
-        SecureRandom rnd)
-    {
-        this.kdf = kdf;
-        this.rnd = rnd;
-        this.CofactorMode = false;
-        this.OldCofactorMode = false;
-        this.SingleHashMode = false;
-    }
-
-    /**
-     * Set up the ECIES-KEM.
-     *
-     * @param kdf             the key derivation function to be used.
-     * @param rnd             the random source for the session key.
-     * @param cofactorMode    true to use the new cofactor ECDH.
-     * @param oldCofactorMode true to use the old cofactor ECDH.
-     * @param singleHashMode  true to use single hash mode.
-     */
-    public ECIESKeyEncapsulation(
-        DerivationFunction kdf,
-        SecureRandom rnd,
-        boolean cofactorMode,
-        boolean oldCofactorMode,
-        boolean singleHashMode)
-    {
-        this.kdf = kdf;
-        this.rnd = rnd;
-
-        // If both cofactorMode and oldCofactorMode are set to true
-        // then the implementation will use the new cofactor ECDH 
-        this.CofactorMode = cofactorMode;
-        this.OldCofactorMode = oldCofactorMode;
-        this.SingleHashMode = singleHashMode;
-    }
-
-    /**
-     * Initialise the ECIES-KEM.
-     *
-     * @param key the recipient's public (for encryption) or private (for decryption) key.
-     */
-    public void init(CipherParameters key)
-        throws IllegalArgumentException
-    {
-        if (!(key instanceof ECKeyParameters))
-        {
-            throw new IllegalArgumentException("EC key required");
-        }
-        else
-        {
-            this.key = (ECKeyParameters)key;
-        }
-    }
-
-    /**
-     * Generate and encapsulate a random session key.
-     *
-     * @param out    the output buffer for the encapsulated key.
-     * @param outOff the offset for the output buffer.
-     * @param keyLen the length of the session key.
-     * @return the random session key.
-     */
-    public CipherParameters encrypt(byte[] out, int outOff, int keyLen)
-        throws IllegalArgumentException
-    {
-        if (!(key instanceof ECPublicKeyParameters))
-        {
-            throw new IllegalArgumentException("Public key required for encryption");
-        }
-
-        ECPublicKeyParameters ecPubKey = (ECPublicKeyParameters)key;
-        ECDomainParameters ecParams = ecPubKey.getParameters();
-        ECCurve curve = ecParams.getCurve();
-        BigInteger n = ecParams.getN();
-        BigInteger h = ecParams.getH();
-
-        // Generate the ephemeral key pair    
-        BigInteger r = BigIntegers.createRandomInRange(ONE, n, rnd);
-
-        // Compute the static-ephemeral key agreement
-        BigInteger rPrime = CofactorMode ? r.multiply(h).mod(n) : r;
-
-        ECMultiplier basePointMultiplier = createBasePointMultiplier();
-
-        ECPoint[] ghTilde = new ECPoint[]{ 
-            basePointMultiplier.multiply(ecParams.getG(), r),
-            ecPubKey.getQ().multiply(rPrime)
-        };
-
-        // NOTE: More efficient than normalizing each individually
-        curve.normalizeAll(ghTilde);
-
-        ECPoint gTilde = ghTilde[0], hTilde = ghTilde[1];
-
-        // Encode the ephemeral public key
-        byte[] C = gTilde.getEncoded(false);
-        System.arraycopy(C, 0, out, outOff, C.length);
-
-        // Encode the shared secret value
-        byte[] PEH = hTilde.getAffineXCoord().getEncoded();
-
-        return deriveKey(keyLen, C, PEH);
-    }
-
-    /**
-     * Generate and encapsulate a random session key.
-     *
-     * @param out    the output buffer for the encapsulated key.
-     * @param keyLen the length of the session key.
-     * @return the random session key.
-     */
-    public CipherParameters encrypt(byte[] out, int keyLen)
-    {
-        return encrypt(out, 0, keyLen);
-    }
-
-    /**
-     * Decrypt an encapsulated session key.
-     *
-     * @param in     the input buffer for the encapsulated key.
-     * @param inOff  the offset for the input buffer.
-     * @param inLen  the length of the encapsulated key.
-     * @param keyLen the length of the session key.
-     * @return the session key.
-     */
-    public CipherParameters decrypt(byte[] in, int inOff, int inLen, int keyLen)
-        throws IllegalArgumentException
-    {
-        if (!(key instanceof ECPrivateKeyParameters))
-        {
-            throw new IllegalArgumentException("Private key required for encryption");
-        }
-
-        ECPrivateKeyParameters ecPrivKey = (ECPrivateKeyParameters)key;
-        ECDomainParameters ecParams = ecPrivKey.getParameters();
-        ECCurve curve = ecParams.getCurve();
-        BigInteger n = ecParams.getN();
-        BigInteger h = ecParams.getH();
-
-        // Decode the ephemeral public key
-        byte[] C = new byte[inLen];
-        System.arraycopy(in, inOff, C, 0, inLen);
-
-        // NOTE: Decoded points are already normalized (i.e in affine form)
-        ECPoint gTilde = curve.decodePoint(C);
-
-        // Compute the static-ephemeral key agreement
-        ECPoint gHat = gTilde;
-        if ((CofactorMode) || (OldCofactorMode))
-        {
-            gHat = gHat.multiply(h);
-        }
-
-        BigInteger xHat = ecPrivKey.getD();
-        if (CofactorMode)
-        {
-            xHat = xHat.multiply(h.modInverse(n)).mod(n);
-        }
-
-        ECPoint hTilde = gHat.multiply(xHat).normalize();
-
-        // Encode the shared secret value
-        byte[] PEH = hTilde.getAffineXCoord().getEncoded();
-
-        return deriveKey(keyLen, C, PEH);
-    }
-
-    /**
-     * Decrypt an encapsulated session key.
-     *
-     * @param in     the input buffer for the encapsulated key.
-     * @param keyLen the length of the session key.
-     * @return the session key.
-     */
-    public CipherParameters decrypt(byte[] in, int keyLen)
-    {
-        return decrypt(in, 0, in.length, keyLen);
-    }
-
-    protected ECMultiplier createBasePointMultiplier()
-    {
-        return new FixedPointCombMultiplier();
-    }
-
-    protected KeyParameter deriveKey(int keyLen, byte[] C, byte[] PEH)
-    {
-        byte[] kdfInput = PEH;
-        if (SingleHashMode)
-        {
-            kdfInput = Arrays.concatenate(C, PEH);
-            Arrays.fill(PEH, (byte)0);
-        }
-
-        try
-        {
-            // Initialise the KDF
-            kdf.init(new KDFParameters(kdfInput, null));
-    
-            // Generate the secret key
-            byte[] K = new byte[keyLen];
-            kdf.generateBytes(K, 0, K.length);
-
-            // Return the ciphertext
-            return new KeyParameter(K);
-        }
-        finally
-        {
-            Arrays.fill(kdfInput, (byte)0);
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/kems/RSAKeyEncapsulation.java b/bcprov/src/main/java/org/bouncycastle/crypto/kems/RSAKeyEncapsulation.java
deleted file mode 100644
index 42fc235..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/kems/RSAKeyEncapsulation.java
+++ /dev/null
@@ -1,155 +0,0 @@
-package org.bouncycastle.crypto.kems;
-
-import java.math.BigInteger;
-import java.security.SecureRandom;
-
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.DerivationFunction;
-import org.bouncycastle.crypto.KeyEncapsulation;
-import org.bouncycastle.crypto.params.KDFParameters;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.crypto.params.RSAKeyParameters;
-import org.bouncycastle.util.BigIntegers;
-
-/**
- * The RSA Key Encapsulation Mechanism (RSA-KEM) from ISO 18033-2.
- */
-public class RSAKeyEncapsulation
-    implements KeyEncapsulation
-{
-    private static final BigInteger ZERO = BigInteger.valueOf(0);
-    private static final BigInteger ONE = BigInteger.valueOf(1);
-
-    private DerivationFunction kdf;
-    private SecureRandom rnd;
-    private RSAKeyParameters key;
-
-    /**
-     * Set up the RSA-KEM.
-     *
-     * @param kdf the key derivation function to be used.
-     * @param rnd the random source for the session key.
-     */
-    public RSAKeyEncapsulation(
-        DerivationFunction kdf,
-        SecureRandom rnd)
-    {
-        this.kdf = kdf;
-        this.rnd = rnd;
-    }
-
-    /**
-     * Initialise the RSA-KEM.
-     *
-     * @param key the recipient's public (for encryption) or private (for decryption) key.
-     */
-    public void init(CipherParameters key)
-        throws IllegalArgumentException
-    {
-        if (!(key instanceof RSAKeyParameters))
-        {
-            throw new IllegalArgumentException("RSA key required");
-        }
-
-        this.key = (RSAKeyParameters)key;
-    }
-
-    /**
-     * Generate and encapsulate a random session key.
-     *
-     * @param out    the output buffer for the encapsulated key.
-     * @param outOff the offset for the output buffer.
-     * @param keyLen the length of the random session key.
-     * @return the random session key.
-     */
-    public CipherParameters encrypt(byte[] out, int outOff, int keyLen)
-        throws IllegalArgumentException
-    {
-        if (key.isPrivate())
-        {
-            throw new IllegalArgumentException("Public key required for encryption");
-        }
-
-        BigInteger n = key.getModulus();
-        BigInteger e = key.getExponent();
-
-        // Generate the ephemeral random and encode it    
-        BigInteger r = BigIntegers.createRandomInRange(ZERO, n.subtract(ONE), rnd);
-
-        // Encrypt the random and encode it     
-        BigInteger c = r.modPow(e, n);
-        byte[] C = BigIntegers.asUnsignedByteArray((n.bitLength() + 7) / 8, c);
-        System.arraycopy(C, 0, out, outOff, C.length);
-
-        return generateKey(n, r, keyLen);
-    }
-
-    /**
-     * Generate and encapsulate a random session key.
-     *
-     * @param out    the output buffer for the encapsulated key.
-     * @param keyLen the length of the random session key.
-     * @return the random session key.
-     */
-    public CipherParameters encrypt(byte[] out, int keyLen)
-    {
-        return encrypt(out, 0, keyLen);
-    }
-
-    /**
-     * Decrypt an encapsulated session key.
-     *
-     * @param in     the input buffer for the encapsulated key.
-     * @param inOff  the offset for the input buffer.
-     * @param inLen  the length of the encapsulated key.
-     * @param keyLen the length of the session key.
-     * @return the session key.
-     */
-    public CipherParameters decrypt(byte[] in, int inOff, int inLen, int keyLen)
-        throws IllegalArgumentException
-    {
-        if (!key.isPrivate())
-        {
-            throw new IllegalArgumentException("Private key required for decryption");
-        }
-
-        BigInteger n = key.getModulus();
-        BigInteger d = key.getExponent();
-
-        // Decode the input
-        byte[] C = new byte[inLen];
-        System.arraycopy(in, inOff, C, 0, C.length);
-        BigInteger c = new BigInteger(1, C);
-
-        // Decrypt the ephemeral random and encode it
-        BigInteger r = c.modPow(d, n);
-
-        return generateKey(n, r, keyLen);
-    }
-
-    /**
-     * Decrypt an encapsulated session key.
-     *
-     * @param in     the input buffer for the encapsulated key.
-     * @param keyLen the length of the session key.
-     * @return the session key.
-     */
-    public CipherParameters decrypt(byte[] in, int keyLen)
-    {
-        return decrypt(in, 0, in.length, keyLen);
-    }
-
-    protected KeyParameter generateKey(BigInteger n, BigInteger r, int keyLen)
-    {
-        byte[] R = BigIntegers.asUnsignedByteArray((n.bitLength() + 7) / 8, r);
-
-        // Initialise the KDF
-        kdf.init(new KDFParameters(R, null));
-
-        // Generate the secret key
-        byte[] K = new byte[keyLen];
-        kdf.generateBytes(K, 0, K.length);
-
-        return new KeyParameter(K);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/kems/package.html b/bcprov/src/main/java/org/bouncycastle/crypto/kems/package.html
deleted file mode 100644
index 88fddd0..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/kems/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body bgcolor="#ffffff">
-Key Encapsulation Mechanisms.
-</body>
-</html>
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/macs/BlockCipherMac.java b/bcprov/src/main/java/org/bouncycastle/crypto/macs/BlockCipherMac.java
deleted file mode 100644
index 6de39a8..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/macs/BlockCipherMac.java
+++ /dev/null
@@ -1,174 +0,0 @@
-package org.bouncycastle.crypto.macs;
-
-import org.bouncycastle.crypto.BlockCipher;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.Mac;
-import org.bouncycastle.crypto.modes.CBCBlockCipher;
-
-public class BlockCipherMac
-    implements Mac
-{
-    private byte[]          mac;
-
-    private byte[]          buf;
-    private int             bufOff;
-    private BlockCipher     cipher;
-
-    private int             macSize;
-
-    /**
-     * create a standard MAC based on a block cipher. This will produce an
-     * authentication code half the length of the block size of the cipher.
-     *
-     * @param cipher the cipher to be used as the basis of the MAC generation.
-     * @deprecated use CBCBlockCipherMac
-     */
-    public BlockCipherMac(
-        BlockCipher     cipher)
-    {
-        this(cipher, (cipher.getBlockSize() * 8) / 2);
-    }
-
-    /**
-     * create a standard MAC based on a block cipher with the size of the
-     * MAC been given in bits.
-     * <p>
-     * Note: the size of the MAC must be at least 16 bits (FIPS Publication 113),
-     * and in general should be less than the size of the block cipher as it reduces
-     * the chance of an exhaustive attack (see Handbook of Applied Cryptography).
-     *
-     * @param cipher the cipher to be used as the basis of the MAC generation.
-     * @param macSizeInBits the size of the MAC in bits, must be a multiple of 8.
-     * @deprecated use CBCBlockCipherMac
-     */
-    public BlockCipherMac(
-        BlockCipher     cipher,
-        int             macSizeInBits)
-    {
-        if ((macSizeInBits % 8) != 0)
-        {
-            throw new IllegalArgumentException("MAC size must be multiple of 8");
-        }
-
-        this.cipher = new CBCBlockCipher(cipher);
-        this.macSize = macSizeInBits / 8;
-
-        mac = new byte[cipher.getBlockSize()];
-
-        buf = new byte[cipher.getBlockSize()];
-        bufOff = 0;
-    }
-
-    public String getAlgorithmName()
-    {
-        return cipher.getAlgorithmName();
-    }
-
-    public void init(
-        CipherParameters    params)
-    {
-        reset();
-
-        cipher.init(true, params);
-    }
-
-    public int getMacSize()
-    {
-        return macSize;
-    }
-
-    public void update(
-        byte        in)
-    {
-        if (bufOff == buf.length)
-        {
-            cipher.processBlock(buf, 0, mac, 0);
-            bufOff = 0;
-        }
-
-        buf[bufOff++] = in;
-    }
-
-    public void update(
-        byte[]      in,
-        int         inOff,
-        int         len)
-    {
-        if (len < 0)
-        {
-            throw new IllegalArgumentException("Can't have a negative input length!");
-        }
-
-        int blockSize = cipher.getBlockSize();
-        int resultLen = 0;
-        int gapLen = blockSize - bufOff;
-
-        if (len > gapLen)
-        {
-            System.arraycopy(in, inOff, buf, bufOff, gapLen);
-
-            resultLen += cipher.processBlock(buf, 0, mac, 0);
-
-            bufOff = 0;
-            len -= gapLen;
-            inOff += gapLen;
-
-            while (len > blockSize)
-            {
-                resultLen += cipher.processBlock(in, inOff, mac, 0);
-
-                len -= blockSize;
-                inOff += blockSize;
-            }
-        }
-
-        System.arraycopy(in, inOff, buf, bufOff, len);
-
-        bufOff += len;
-    }
-
-    public int doFinal(
-        byte[]  out,
-        int     outOff)
-    {
-        int blockSize = cipher.getBlockSize();
-
-        //
-        // pad with zeroes
-        //
-        while (bufOff < blockSize)
-        {
-            buf[bufOff] = 0;
-            bufOff++;
-        }
-
-        cipher.processBlock(buf, 0, mac, 0);
-
-        System.arraycopy(mac, 0, out, outOff, macSize);
-
-        reset();
-
-        return macSize;
-    }
-
-    /**
-     * Reset the mac generator.
-     */
-    public void reset()
-    {
-        /*
-         * clean the buffer.
-         */
-        for (int i = 0; i < buf.length; i++)
-        {
-            buf[i] = 0;
-        }
-
-        bufOff = 0;
-
-        /*
-         * reset the underlying cipher.
-         */
-        cipher.reset();
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/macs/CFBBlockCipherMac.java b/bcprov/src/main/java/org/bouncycastle/crypto/macs/CFBBlockCipherMac.java
deleted file mode 100644
index d7ad612..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/macs/CFBBlockCipherMac.java
+++ /dev/null
@@ -1,388 +0,0 @@
-package org.bouncycastle.crypto.macs;
-
-import org.bouncycastle.crypto.BlockCipher;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.DataLengthException;
-import org.bouncycastle.crypto.Mac;
-import org.bouncycastle.crypto.paddings.BlockCipherPadding;
-import org.bouncycastle.crypto.params.ParametersWithIV;
-
-/**
- * implements a Cipher-FeedBack (CFB) mode on top of a simple cipher.
- */
-class MacCFBBlockCipher
-{
-    private byte[]          IV;
-    private byte[]          cfbV;
-    private byte[]          cfbOutV;
-
-    private int                 blockSize;
-    private BlockCipher         cipher = null;
-
-    /**
-     * Basic constructor.
-     *
-     * @param cipher the block cipher to be used as the basis of the
-     * feedback mode.
-     * @param blockSize the block size in bits (note: a multiple of 8)
-     */
-    public MacCFBBlockCipher(
-        BlockCipher         cipher,
-        int                 bitBlockSize)
-    {
-        this.cipher = cipher;
-        this.blockSize = bitBlockSize / 8;
-
-        this.IV = new byte[cipher.getBlockSize()];
-        this.cfbV = new byte[cipher.getBlockSize()];
-        this.cfbOutV = new byte[cipher.getBlockSize()];
-    }
-
-    /**
-     * Initialise the cipher and, possibly, the initialisation vector (IV).
-     * If an IV isn't passed as part of the parameter, the IV will be all zeros.
-     * An IV which is too short is handled in FIPS compliant fashion.
-     *
-     * @param param the key and other data required by the cipher.
-     * @exception IllegalArgumentException if the params argument is
-     * inappropriate.
-     */
-    public void init(
-        CipherParameters    params)
-        throws IllegalArgumentException
-    {
-        if (params instanceof ParametersWithIV)
-        {
-                ParametersWithIV ivParam = (ParametersWithIV)params;
-                byte[]      iv = ivParam.getIV();
-
-                if (iv.length < IV.length)
-                {
-                    System.arraycopy(iv, 0, IV, IV.length - iv.length, iv.length);
-                }
-                else
-                {
-                    System.arraycopy(iv, 0, IV, 0, IV.length);
-                }
-
-                reset();
-
-                cipher.init(true, ivParam.getParameters());
-        }
-        else
-        {
-                reset();
-
-                cipher.init(true, params);
-        }
-    }
-
-    /**
-     * return the algorithm name and mode.
-     *
-     * @return the name of the underlying algorithm followed by "/CFB"
-     * and the block size in bits.
-     */
-    public String getAlgorithmName()
-    {
-        return cipher.getAlgorithmName() + "/CFB" + (blockSize * 8);
-    }
-
-    /**
-     * return the block size we are operating at.
-     *
-     * @return the block size we are operating at (in bytes).
-     */
-    public int getBlockSize()
-    {
-        return blockSize;
-    }
-
-    /**
-     * Process one block of input from the array in and write it to
-     * the out array.
-     *
-     * @param in the array containing the input data.
-     * @param inOff offset into the in array the data starts at.
-     * @param out the array the output data will be copied into.
-     * @param outOff the offset into the out array the output will start at.
-     * @exception DataLengthException if there isn't enough data in in, or
-     * space in out.
-     * @exception IllegalStateException if the cipher isn't initialised.
-     * @return the number of bytes processed and produced.
-     */
-    public int processBlock(
-        byte[]      in,
-        int         inOff,
-        byte[]      out,
-        int         outOff)
-        throws DataLengthException, IllegalStateException
-    {
-        if ((inOff + blockSize) > in.length)
-        {
-            throw new DataLengthException("input buffer too short");
-        }
-
-        if ((outOff + blockSize) > out.length)
-        {
-            throw new DataLengthException("output buffer too short");
-        }
-
-        cipher.processBlock(cfbV, 0, cfbOutV, 0);
-
-        //
-        // XOR the cfbV with the plaintext producing the cipher text
-        //
-        for (int i = 0; i < blockSize; i++)
-        {
-            out[outOff + i] = (byte)(cfbOutV[i] ^ in[inOff + i]);
-        }
-
-        //
-        // change over the input block.
-        //
-        System.arraycopy(cfbV, blockSize, cfbV, 0, cfbV.length - blockSize);
-        System.arraycopy(out, outOff, cfbV, cfbV.length - blockSize, blockSize);
-
-        return blockSize;
-    }
-
-    /**
-     * reset the chaining vector back to the IV and reset the underlying
-     * cipher.
-     */
-    public void reset()
-    {
-        System.arraycopy(IV, 0, cfbV, 0, IV.length);
-
-        cipher.reset();
-    }
-
-    void getMacBlock(
-        byte[]  mac)
-    {
-        cipher.processBlock(cfbV, 0, mac, 0);
-    }
-}
-
-public class CFBBlockCipherMac
-    implements Mac
-{
-    private byte[]              mac;
-
-    private byte[]              buf;
-    private int                 bufOff;
-    private MacCFBBlockCipher   cipher;
-    private BlockCipherPadding  padding = null;
-
-
-    private int                 macSize;
-
-    /**
-     * create a standard MAC based on a CFB block cipher. This will produce an
-     * authentication code half the length of the block size of the cipher, with
-     * the CFB mode set to 8 bits.
-     *
-     * @param cipher the cipher to be used as the basis of the MAC generation.
-     */
-    public CFBBlockCipherMac(
-        BlockCipher     cipher)
-    {
-        this(cipher, 8, (cipher.getBlockSize() * 8) / 2, null);
-    }
-
-    /**
-     * create a standard MAC based on a CFB block cipher. This will produce an
-     * authentication code half the length of the block size of the cipher, with
-     * the CFB mode set to 8 bits.
-     *
-     * @param cipher the cipher to be used as the basis of the MAC generation.
-     * @param padding the padding to be used.
-     */
-    public CFBBlockCipherMac(
-        BlockCipher         cipher,
-        BlockCipherPadding  padding)
-    {
-        this(cipher, 8, (cipher.getBlockSize() * 8) / 2, padding);
-    }
-
-    /**
-     * create a standard MAC based on a block cipher with the size of the
-     * MAC been given in bits. This class uses CFB mode as the basis for the
-     * MAC generation.
-     * <p>
-     * Note: the size of the MAC must be at least 24 bits (FIPS Publication 81),
-     * or 16 bits if being used as a data authenticator (FIPS Publication 113),
-     * and in general should be less than the size of the block cipher as it reduces
-     * the chance of an exhaustive attack (see Handbook of Applied Cryptography).
-     *
-     * @param cipher the cipher to be used as the basis of the MAC generation.
-     * @param cfbBitSize the size of an output block produced by the CFB mode.
-     * @param macSizeInBits the size of the MAC in bits, must be a multiple of 8.
-     */
-    public CFBBlockCipherMac(
-        BlockCipher         cipher,
-        int                 cfbBitSize,
-        int                 macSizeInBits)
-    {
-        this(cipher, cfbBitSize, macSizeInBits, null);
-    }
-
-    /**
-     * create a standard MAC based on a block cipher with the size of the
-     * MAC been given in bits. This class uses CFB mode as the basis for the
-     * MAC generation.
-     * <p>
-     * Note: the size of the MAC must be at least 24 bits (FIPS Publication 81),
-     * or 16 bits if being used as a data authenticator (FIPS Publication 113),
-     * and in general should be less than the size of the block cipher as it reduces
-     * the chance of an exhaustive attack (see Handbook of Applied Cryptography).
-     *
-     * @param cipher the cipher to be used as the basis of the MAC generation.
-     * @param cfbBitSize the size of an output block produced by the CFB mode.
-     * @param macSizeInBits the size of the MAC in bits, must be a multiple of 8.
-     * @param padding a padding to be used.
-     */
-    public CFBBlockCipherMac(
-        BlockCipher         cipher,
-        int                 cfbBitSize,
-        int                 macSizeInBits,
-        BlockCipherPadding  padding)
-    {
-        if ((macSizeInBits % 8) != 0)
-        {
-            throw new IllegalArgumentException("MAC size must be multiple of 8");
-        }
-
-        mac = new byte[cipher.getBlockSize()];
-
-        this.cipher = new MacCFBBlockCipher(cipher, cfbBitSize);
-        this.padding = padding;
-        this.macSize = macSizeInBits / 8;
-
-        buf = new byte[this.cipher.getBlockSize()];
-        bufOff = 0;
-    }
-
-    public String getAlgorithmName()
-    {
-        return cipher.getAlgorithmName();
-    }
-
-    public void init(
-        CipherParameters    params)
-    {
-        reset();
-
-        cipher.init(params);
-    }
-
-    public int getMacSize()
-    {
-        return macSize;
-    }
-
-    public void update(
-        byte        in)
-    {
-        if (bufOff == buf.length)
-        {
-            cipher.processBlock(buf, 0, mac, 0);
-            bufOff = 0;
-        }
-
-        buf[bufOff++] = in;
-    }
-
-    public void update(
-        byte[]      in,
-        int         inOff,
-        int         len)
-    {
-        if (len < 0)
-        {
-            throw new IllegalArgumentException("Can't have a negative input length!");
-        }
-
-        int blockSize = cipher.getBlockSize();
-        int resultLen = 0;
-        int gapLen = blockSize - bufOff;
-
-        if (len > gapLen)
-        {
-            System.arraycopy(in, inOff, buf, bufOff, gapLen);
-
-            resultLen += cipher.processBlock(buf, 0, mac, 0);
-
-            bufOff = 0;
-            len -= gapLen;
-            inOff += gapLen;
-
-            while (len > blockSize)
-            {
-                resultLen += cipher.processBlock(in, inOff, mac, 0);
-
-                len -= blockSize;
-                inOff += blockSize;
-            }
-        }
-
-        System.arraycopy(in, inOff, buf, bufOff, len);
-
-        bufOff += len;
-    }
-
-    public int doFinal(
-        byte[]  out,
-        int     outOff)
-    {
-        int blockSize = cipher.getBlockSize();
-
-        //
-        // pad with zeroes
-        //
-        if (this.padding == null)
-        {
-            while (bufOff < blockSize)
-            {
-                buf[bufOff] = 0;
-                bufOff++;
-            }
-        }
-        else
-        {
-            padding.addPadding(buf, bufOff);
-        }
-
-        cipher.processBlock(buf, 0, mac, 0);
-
-        cipher.getMacBlock(mac);
-
-        System.arraycopy(mac, 0, out, outOff, macSize);
-
-        reset();
-
-        return macSize;
-    }
-
-    /**
-     * Reset the mac generator.
-     */
-    public void reset()
-    {
-        /*
-         * clean the buffer.
-         */
-        for (int i = 0; i < buf.length; i++)
-        {
-            buf[i] = 0;
-        }
-
-        bufOff = 0;
-
-        /*
-         * reset the underlying cipher.
-         */
-        cipher.reset();
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/macs/CMac.java b/bcprov/src/main/java/org/bouncycastle/crypto/macs/CMac.java
deleted file mode 100644
index 0492ae6..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/macs/CMac.java
+++ /dev/null
@@ -1,261 +0,0 @@
-package org.bouncycastle.crypto.macs;
-
-import org.bouncycastle.crypto.BlockCipher;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.Mac;
-import org.bouncycastle.crypto.modes.CBCBlockCipher;
-import org.bouncycastle.crypto.paddings.ISO7816d4Padding;
-import org.bouncycastle.crypto.params.KeyParameter;
-
-/**
- * CMAC - as specified at www.nuee.nagoya-u.ac.jp/labs/tiwata/omac/omac.html
- * <p>
- * CMAC is analogous to OMAC1 - see also en.wikipedia.org/wiki/CMAC
- * </p><p>
- * CMAC is a NIST recomendation - see 
- * csrc.nist.gov/CryptoToolkit/modes/800-38_Series_Publications/SP800-38B.pdf
- * </p><p>
- * CMAC/OMAC1 is a blockcipher-based message authentication code designed and
- * analyzed by Tetsu Iwata and Kaoru Kurosawa.
- * </p><p>
- * CMAC/OMAC1 is a simple variant of the CBC MAC (Cipher Block Chaining Message 
- * Authentication Code). OMAC stands for One-Key CBC MAC.
- * </p><p>
- * It supports 128- or 64-bits block ciphers, with any key size, and returns
- * a MAC with dimension less or equal to the block size of the underlying 
- * cipher.
- * </p>
- */
-public class CMac implements Mac
-{
-    private static final byte CONSTANT_128 = (byte)0x87;
-    private static final byte CONSTANT_64 = (byte)0x1b;
-
-    private byte[] ZEROES;
-
-    private byte[] mac;
-
-    private byte[] buf;
-    private int bufOff;
-    private BlockCipher cipher;
-
-    private int macSize;
-
-    private byte[] L, Lu, Lu2;
-
-    /**
-     * create a standard MAC based on a CBC block cipher (64 or 128 bit block).
-     * This will produce an authentication code the length of the block size
-     * of the cipher.
-     *
-     * @param cipher the cipher to be used as the basis of the MAC generation.
-     */
-    public CMac(BlockCipher cipher)
-    {
-        this(cipher, cipher.getBlockSize() * 8);
-    }
-
-    /**
-     * create a standard MAC based on a block cipher with the size of the
-     * MAC been given in bits.
-     * <p>
-     * Note: the size of the MAC must be at least 24 bits (FIPS Publication 81),
-     * or 16 bits if being used as a data authenticator (FIPS Publication 113),
-     * and in general should be less than the size of the block cipher as it reduces
-     * the chance of an exhaustive attack (see Handbook of Applied Cryptography).
-     *
-     * @param cipher        the cipher to be used as the basis of the MAC generation.
-     * @param macSizeInBits the size of the MAC in bits, must be a multiple of 8 and &lt;= 128.
-     */
-    public CMac(BlockCipher cipher, int macSizeInBits)
-    {
-        if ((macSizeInBits % 8) != 0)
-        {
-            throw new IllegalArgumentException("MAC size must be multiple of 8");
-        }
-
-        if (macSizeInBits > (cipher.getBlockSize() * 8))
-        {
-            throw new IllegalArgumentException(
-                "MAC size must be less or equal to "
-                    + (cipher.getBlockSize() * 8));
-        }
-
-        if (cipher.getBlockSize() != 8 && cipher.getBlockSize() != 16)
-        {
-            throw new IllegalArgumentException(
-                "Block size must be either 64 or 128 bits");
-        }
-
-        this.cipher = new CBCBlockCipher(cipher);
-        this.macSize = macSizeInBits / 8;
-
-        mac = new byte[cipher.getBlockSize()];
-
-        buf = new byte[cipher.getBlockSize()];
-
-        ZEROES = new byte[cipher.getBlockSize()];
-
-        bufOff = 0;
-    }
-
-    public String getAlgorithmName()
-    {
-        return cipher.getAlgorithmName();
-    }
-
-    private static int shiftLeft(byte[] block, byte[] output)
-    {
-        int i = block.length;
-        int bit = 0;
-        while (--i >= 0)
-        {
-            int b = block[i] & 0xff;
-            output[i] = (byte)((b << 1) | bit);
-            bit = (b >>> 7) & 1;
-        }
-        return bit;
-    }
-
-    private static byte[] doubleLu(byte[] in)
-    {
-        byte[] ret = new byte[in.length];
-        int carry = shiftLeft(in, ret);
-        int xor = 0xff & (in.length == 16 ? CONSTANT_128 : CONSTANT_64);
-
-        /*
-         * NOTE: This construction is an attempt at a constant-time implementation.
-         */
-        ret[in.length - 1] ^= (xor >>> ((1 - carry) << 3));
-
-        return ret;
-    }
-
-    public void init(CipherParameters params)
-    {
-        validate(params);
-
-        cipher.init(true, params);
-
-        //initializes the L, Lu, Lu2 numbers
-        L = new byte[ZEROES.length];
-        cipher.processBlock(ZEROES, 0, L, 0);
-        Lu = doubleLu(L);
-        Lu2 = doubleLu(Lu);
-
-        reset();
-    }
-
-    void validate(CipherParameters params)
-    {
-        if (params != null)
-        {
-            if (!(params instanceof KeyParameter))
-            {
-                // CMAC mode does not permit IV to underlying CBC mode
-                throw new IllegalArgumentException("CMac mode only permits key to be set.");
-            }
-        }
-    }
-
-    public int getMacSize()
-    {
-        return macSize;
-    }
-
-    public void update(byte in)
-    {
-        if (bufOff == buf.length)
-        {
-            cipher.processBlock(buf, 0, mac, 0);
-            bufOff = 0;
-        }
-
-        buf[bufOff++] = in;
-    }
-
-    public void update(byte[] in, int inOff, int len)
-    {
-        if (len < 0)
-        {
-            throw new IllegalArgumentException(
-                "Can't have a negative input length!");
-        }
-
-        int blockSize = cipher.getBlockSize();
-        int gapLen = blockSize - bufOff;
-
-        if (len > gapLen)
-        {
-            System.arraycopy(in, inOff, buf, bufOff, gapLen);
-
-            cipher.processBlock(buf, 0, mac, 0);
-
-            bufOff = 0;
-            len -= gapLen;
-            inOff += gapLen;
-
-            while (len > blockSize)
-            {
-                cipher.processBlock(in, inOff, mac, 0);
-
-                len -= blockSize;
-                inOff += blockSize;
-            }
-        }
-
-        System.arraycopy(in, inOff, buf, bufOff, len);
-
-        bufOff += len;
-    }
-
-    public int doFinal(byte[] out, int outOff)
-    {
-        int blockSize = cipher.getBlockSize();
-
-        byte[] lu;
-        if (bufOff == blockSize)
-        {
-            lu = Lu;
-        }
-        else
-        {
-            new ISO7816d4Padding().addPadding(buf, bufOff);
-            lu = Lu2;
-        }
-
-        for (int i = 0; i < mac.length; i++)
-        {
-            buf[i] ^= lu[i];
-        }
-
-        cipher.processBlock(buf, 0, mac, 0);
-
-        System.arraycopy(mac, 0, out, outOff, macSize);
-
-        reset();
-
-        return macSize;
-    }
-
-    /**
-     * Reset the mac generator.
-     */
-    public void reset()
-    {
-        /*
-         * clean the buffer.
-         */
-        for (int i = 0; i < buf.length; i++)
-        {
-            buf[i] = 0;
-        }
-
-        bufOff = 0;
-
-        /*
-         * reset the underlying cipher.
-         */
-        cipher.reset();
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/macs/CMacWithIV.java b/bcprov/src/main/java/org/bouncycastle/crypto/macs/CMacWithIV.java
deleted file mode 100644
index a0371d9..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/macs/CMacWithIV.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package org.bouncycastle.crypto.macs;
-
-import org.bouncycastle.crypto.BlockCipher;
-import org.bouncycastle.crypto.CipherParameters;
-
-/**
- * A non-NIST variant which allows passing of an IV to the underlying CBC cipher.
- * <p>Note: there isn't really a good reason to use an IV here, use the regular CMac where possible.</p>
- */
-public class CMacWithIV
-    extends CMac
-{
-    public CMacWithIV(BlockCipher cipher)
-    {
-        super(cipher);
-    }
-
-    public CMacWithIV(BlockCipher cipher, int macSizeInBits)
-    {
-        super(cipher, macSizeInBits);
-    }
-
-    void validate(CipherParameters params)
-    {
-        // accept all
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/macs/GMac.java b/bcprov/src/main/java/org/bouncycastle/crypto/macs/GMac.java
deleted file mode 100644
index b34f9ea..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/macs/GMac.java
+++ /dev/null
@@ -1,115 +0,0 @@
-package org.bouncycastle.crypto.macs;
-
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.DataLengthException;
-import org.bouncycastle.crypto.InvalidCipherTextException;
-import org.bouncycastle.crypto.Mac;
-import org.bouncycastle.crypto.modes.GCMBlockCipher;
-import org.bouncycastle.crypto.params.AEADParameters;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.crypto.params.ParametersWithIV;
-
-/**
- * The GMAC specialisation of Galois/Counter mode (GCM) detailed in NIST Special Publication
- * 800-38D.
- * <p>
- * GMac is an invocation of the GCM mode where no data is encrypted (i.e. all input data to the Mac
- * is processed as additional authenticated data with the underlying GCM block cipher).
- */
-public class GMac implements Mac
-{
-    private final GCMBlockCipher cipher;
-    private final int macSizeBits;
-
-    /**
-     * Creates a GMAC based on the operation of a block cipher in GCM mode.
-     * <p>
-     * This will produce an authentication code the length of the block size of the cipher.
-     * 
-     * @param cipher
-     *            the cipher to be used in GCM mode to generate the MAC.
-     */
-    public GMac(final GCMBlockCipher cipher)
-    {
-        // use of this confused flow analyser in some earlier JDKs
-        this.cipher = cipher;
-        this.macSizeBits = 128;
-    }
-
-    /**
-     * Creates a GMAC based on the operation of a 128 bit block cipher in GCM mode.
-     * 
-     * @param macSizeBits
-     *            the mac size to generate, in bits. Must be a multiple of 8 and &gt;= 32 and &lt;= 128.
-     *            Sizes less than 96 are not recommended, but are supported for specialized applications.
-     * @param cipher
-     *            the cipher to be used in GCM mode to generate the MAC.
-     */
-    public GMac(final GCMBlockCipher cipher, final int macSizeBits)
-    {
-        this.cipher = cipher;
-        this.macSizeBits = macSizeBits;
-    }
-
-    /**
-     * Initialises the GMAC - requires a {@link ParametersWithIV} providing a {@link KeyParameter}
-     * and a nonce.
-     */
-    public void init(final CipherParameters params) throws IllegalArgumentException
-    {
-        if (params instanceof ParametersWithIV)
-        {
-            final ParametersWithIV param = (ParametersWithIV)params;
-
-            final byte[] iv = param.getIV();
-            final KeyParameter keyParam = (KeyParameter)param.getParameters();
-
-            // GCM is always operated in encrypt mode to calculate MAC
-            cipher.init(true, new AEADParameters(keyParam, macSizeBits, iv));
-        }
-        else
-        {
-            throw new IllegalArgumentException("GMAC requires ParametersWithIV");
-        }
-    }
-
-    public String getAlgorithmName()
-    {
-        return cipher.getUnderlyingCipher().getAlgorithmName() + "-GMAC";
-    }
-
-    public int getMacSize()
-    {
-        return macSizeBits / 8;
-    }
-
-    public void update(byte in) throws IllegalStateException
-    {
-        cipher.processAADByte(in);
-    }
-
-    public void update(byte[] in, int inOff, int len)
-        throws DataLengthException, IllegalStateException
-    {
-        cipher.processAADBytes(in, inOff, len);
-    }
-
-    public int doFinal(byte[] out, int outOff)
-        throws DataLengthException, IllegalStateException
-    {
-        try
-        {
-            return cipher.doFinal(out, outOff);
-        }
-        catch (InvalidCipherTextException e)
-        {
-            // Impossible in encrypt mode
-            throw new IllegalStateException(e.toString());
-        }
-    }
-
-    public void reset()
-    {
-        cipher.reset();
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/macs/GOST28147Mac.java b/bcprov/src/main/java/org/bouncycastle/crypto/macs/GOST28147Mac.java
deleted file mode 100644
index b71975b..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/macs/GOST28147Mac.java
+++ /dev/null
@@ -1,298 +0,0 @@
-package org.bouncycastle.crypto.macs;
-
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.DataLengthException;
-import org.bouncycastle.crypto.Mac;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.crypto.params.ParametersWithSBox;
-
-/**
- * implementation of GOST 28147-89 MAC
- */
-public class GOST28147Mac
-    implements Mac
-{
-    private int                 blockSize = 8;
-    private int                 macSize = 4;
-    private int                 bufOff;
-    private byte[]              buf;
-    private byte[]              mac;
-    private boolean             firstStep = true;
-    private int[]               workingKey = null;
-
-    //
-    // This is default S-box - E_A.
-    private byte S[] = {
-            0x9,0x6,0x3,0x2,0x8,0xB,0x1,0x7,0xA,0x4,0xE,0xF,0xC,0x0,0xD,0x5,
-            0x3,0x7,0xE,0x9,0x8,0xA,0xF,0x0,0x5,0x2,0x6,0xC,0xB,0x4,0xD,0x1,
-            0xE,0x4,0x6,0x2,0xB,0x3,0xD,0x8,0xC,0xF,0x5,0xA,0x0,0x7,0x1,0x9,
-            0xE,0x7,0xA,0xC,0xD,0x1,0x3,0x9,0x0,0x2,0xB,0x4,0xF,0x8,0x5,0x6,
-            0xB,0x5,0x1,0x9,0x8,0xD,0xF,0x0,0xE,0x4,0x2,0x3,0xC,0x7,0xA,0x6,
-            0x3,0xA,0xD,0xC,0x1,0x2,0x0,0xB,0x7,0x5,0x9,0x4,0x8,0xF,0xE,0x6,
-            0x1,0xD,0x2,0x9,0x7,0xA,0x6,0x0,0x8,0xC,0x4,0x5,0xF,0x3,0xB,0xE,
-            0xB,0xA,0xF,0x5,0x0,0xC,0xE,0x8,0x6,0x2,0x3,0x9,0x1,0x7,0xD,0x4
-    };
-    
-    public GOST28147Mac()
-    {
-        mac = new byte[blockSize];
-
-        buf = new byte[blockSize];
-        bufOff = 0;
-    }
-
-    private int[] generateWorkingKey(
-        byte[]  userKey)
-    {
-        if (userKey.length != 32)
-        {
-            throw new IllegalArgumentException("Key length invalid. Key needs to be 32 byte - 256 bit!!!");
-        }
-
-        int key[] = new int[8];
-        for(int i=0; i!=8; i++)
-        {
-            key[i] = bytesToint(userKey,i*4);
-        }
-
-        return key;
-    }
-    
-    public void init(
-        CipherParameters params)
-        throws IllegalArgumentException
-    {
-        reset();
-        buf = new byte[blockSize];
-        if (params instanceof ParametersWithSBox)
-        {
-            ParametersWithSBox   param = (ParametersWithSBox)params;
-
-            //
-            // Set the S-Box
-            //
-            System.arraycopy(param.getSBox(), 0, this.S, 0, param.getSBox().length);
-
-            //
-            // set key if there is one
-            //
-            if (param.getParameters() != null)
-            {
-                workingKey = generateWorkingKey(((KeyParameter)param.getParameters()).getKey());
-            }
-        }
-        else if (params instanceof KeyParameter)
-        {
-            workingKey = generateWorkingKey(((KeyParameter)params).getKey());
-        }
-        else
-        {
-           throw new IllegalArgumentException("invalid parameter passed to GOST28147 init - " + params.getClass().getName());
-        }
-    }
-
-    public String getAlgorithmName()
-    {
-        return "GOST28147Mac";
-    }
-
-    public int getMacSize()
-    {
-        return macSize;
-    }
-
-    private int gost28147_mainStep(int n1, int key)
-    {
-        int cm = (key + n1); // CM1
-        
-        // S-box replacing
-        
-        int om = S[  0 + ((cm >> (0 * 4)) & 0xF)] << (0 * 4);
-        om += S[ 16 + ((cm >> (1 * 4)) & 0xF)] << (1 * 4);
-        om += S[ 32 + ((cm >> (2 * 4)) & 0xF)] << (2 * 4);
-        om += S[ 48 + ((cm >> (3 * 4)) & 0xF)] << (3 * 4);
-        om += S[ 64 + ((cm >> (4 * 4)) & 0xF)] << (4 * 4);
-        om += S[ 80 + ((cm >> (5 * 4)) & 0xF)] << (5 * 4);
-        om += S[ 96 + ((cm >> (6 * 4)) & 0xF)] << (6 * 4);
-        om += S[112 + ((cm >> (7 * 4)) & 0xF)] << (7 * 4);
-        
-        return om << 11 | om >>> (32-11); // 11-leftshift
-    }
-    
-    private void gost28147MacFunc(
-            int[]   workingKey,
-            byte[]  in,
-            int     inOff,
-            byte[]  out,
-            int     outOff)
-    {
-        int N1, N2, tmp;  //tmp -> for saving N1
-        N1 = bytesToint(in, inOff);
-        N2 = bytesToint(in, inOff + 4);
-        
-        for(int k = 0; k < 2; k++)  // 1-16 steps
-        {
-            for(int j = 0; j < 8; j++)
-            {
-                tmp = N1;
-                N1 = N2 ^ gost28147_mainStep(N1, workingKey[j]); // CM2
-                N2 = tmp;
-            }
-        }
-        
-        intTobytes(N1, out, outOff);
-        intTobytes(N2, out, outOff + 4);
-    }
-    
-    //array of bytes to type int
-    private int bytesToint(
-            byte[]  in,
-            int     inOff)
-    {
-        return  ((in[inOff + 3] << 24) & 0xff000000) + ((in[inOff + 2] << 16) & 0xff0000) +
-        ((in[inOff + 1] << 8) & 0xff00) + (in[inOff] & 0xff);
-    }
-    
-    //int to array of bytes
-    private void intTobytes(
-            int     num,
-            byte[]  out,
-            int     outOff)
-    {
-        out[outOff + 3] = (byte)(num >>> 24);
-        out[outOff + 2] = (byte)(num >>> 16);
-        out[outOff + 1] = (byte)(num >>> 8);
-        out[outOff] =     (byte)num;
-    }
-        
-    private byte[] CM5func(byte[] buf, int bufOff, byte[] mac)
-    {
-        byte[] sum = new byte[buf.length - bufOff];
-
-        System.arraycopy(buf, bufOff, sum, 0, mac.length);
-
-        for (int i = 0; i != mac.length; i++)
-        {
-            sum[i] = (byte)(sum[i] ^ mac[i]);
-        }
-
-        return sum;
-    }
-
-    public void update(byte in)
-            throws IllegalStateException
-    {
-        if (bufOff == buf.length)
-        {
-            byte[] sumbuf = new byte[buf.length];
-            System.arraycopy(buf, 0, sumbuf, 0, mac.length);
-
-            if (firstStep)
-            {
-                firstStep = false;
-            }
-            else
-            {
-                sumbuf = CM5func(buf, 0, mac);
-            }
-
-            gost28147MacFunc(workingKey, sumbuf, 0, mac, 0);
-            bufOff = 0;
-        }
-
-        buf[bufOff++] = in;
-    }
-
-    public void update(byte[] in, int inOff, int len)
-        throws DataLengthException, IllegalStateException
-    {
-            if (len < 0)
-            {
-                throw new IllegalArgumentException("Can't have a negative input length!");
-            }
-
-            int gapLen = blockSize - bufOff;
-
-            if (len > gapLen)
-            {
-                System.arraycopy(in, inOff, buf, bufOff, gapLen);
-
-                byte[] sumbuf = new byte[buf.length];
-                System.arraycopy(buf, 0, sumbuf, 0, mac.length);
-
-                if (firstStep)
-                {
-                    firstStep = false;
-                }
-                else
-                {
-                    sumbuf = CM5func(buf, 0, mac);
-                }
-
-                gost28147MacFunc(workingKey, sumbuf, 0, mac, 0);
-
-                bufOff = 0;
-                len -= gapLen;
-                inOff += gapLen;
-
-                while (len > blockSize)
-                {
-                    sumbuf = CM5func(in, inOff, mac);
-                    gost28147MacFunc(workingKey, sumbuf, 0, mac, 0);
-
-                    len -= blockSize;
-                    inOff += blockSize;
-                }
-            }
-
-            System.arraycopy(in, inOff, buf, bufOff, len);
-
-            bufOff += len;    
-    }     
-
-    public int doFinal(byte[] out, int outOff)
-        throws DataLengthException, IllegalStateException
-    {
-        //padding with zero
-        while (bufOff < blockSize)
-        {
-            buf[bufOff] = 0;
-            bufOff++;
-        }
-
-        byte[] sumbuf = new byte[buf.length];
-        System.arraycopy(buf, 0, sumbuf, 0, mac.length);
-
-        if (firstStep)
-        {
-            firstStep = false;
-        }
-        else
-        {
-            sumbuf = CM5func(buf, 0, mac);
-        }
-
-        gost28147MacFunc(workingKey, sumbuf, 0, mac, 0);
-
-        System.arraycopy(mac, (mac.length/2)-macSize, out, outOff, macSize);
-
-        reset();
-
-        return macSize;
-    }
-
-    public void reset()
-    {
-        /*
-         * clean the buffer.
-         */
-        for (int i = 0; i < buf.length; i++)
-        {
-            buf[i] = 0;
-        }
-
-        bufOff = 0;
-
-        firstStep = true;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/macs/HMac.java b/bcprov/src/main/java/org/bouncycastle/crypto/macs/HMac.java
index d4345d9..600a317 100644
--- a/bcprov/src/main/java/org/bouncycastle/crypto/macs/HMac.java
+++ b/bcprov/src/main/java/org/bouncycastle/crypto/macs/HMac.java
@@ -36,14 +36,18 @@ public class HMac
     {
         blockLengths = new Hashtable();
         
-        blockLengths.put("GOST3411", Integers.valueOf(32));
-        
-        blockLengths.put("MD2", Integers.valueOf(16));
-        blockLengths.put("MD4", Integers.valueOf(64));
+        // BEGIN android-removed
+        // blockLengths.put("GOST3411", Integers.valueOf(32));
+        //
+        // blockLengths.put("MD2", Integers.valueOf(16));
+        // blockLengths.put("MD4", Integers.valueOf(64));
+        // END android-removed
         blockLengths.put("MD5", Integers.valueOf(64));
         
-        blockLengths.put("RIPEMD128", Integers.valueOf(64));
-        blockLengths.put("RIPEMD160", Integers.valueOf(64));
+        // BEGIN android-removed
+        // blockLengths.put("RIPEMD128", Integers.valueOf(64));
+        // blockLengths.put("RIPEMD160", Integers.valueOf(64));
+        // END android-removed
         
         blockLengths.put("SHA-1", Integers.valueOf(64));
         blockLengths.put("SHA-224", Integers.valueOf(64));
@@ -51,8 +55,10 @@ public class HMac
         blockLengths.put("SHA-384", Integers.valueOf(128));
         blockLengths.put("SHA-512", Integers.valueOf(128));
         
-        blockLengths.put("Tiger", Integers.valueOf(64));
-        blockLengths.put("Whirlpool", Integers.valueOf(64));
+        // BEGIN android-removed
+        // blockLengths.put("Tiger", Integers.valueOf(64));
+        // blockLengths.put("Whirlpool", Integers.valueOf(64));
+        // END android-removed
     }
     
     private static int getByteLength(
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/macs/ISO9797Alg3Mac.java b/bcprov/src/main/java/org/bouncycastle/crypto/macs/ISO9797Alg3Mac.java
deleted file mode 100644
index 330b39e..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/macs/ISO9797Alg3Mac.java
+++ /dev/null
@@ -1,305 +0,0 @@
-package org.bouncycastle.crypto.macs;
-
-import org.bouncycastle.crypto.BlockCipher;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.Mac;
-import org.bouncycastle.crypto.engines.DESEngine;
-import org.bouncycastle.crypto.modes.CBCBlockCipher;
-import org.bouncycastle.crypto.paddings.BlockCipherPadding;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.crypto.params.ParametersWithIV;
-
-/**
- * DES based CBC Block Cipher MAC according to ISO9797, algorithm 3 (ANSI X9.19 Retail MAC)
- *
- * This could as well be derived from CBCBlockCipherMac, but then the property mac in the base
- * class must be changed to protected  
- */
-
-public class ISO9797Alg3Mac 
-    implements Mac 
-{
-    private byte[]              mac;
-    
-    private byte[]              buf;
-    private int                 bufOff;
-    private BlockCipher         cipher;
-    private BlockCipherPadding  padding;
-    
-    private int                 macSize;
-    private KeyParameter        lastKey2;
-    private KeyParameter        lastKey3;
-    
-    /**
-     * create a Retail-MAC based on a CBC block cipher. This will produce an
-     * authentication code of the length of the block size of the cipher.
-     *
-     * @param cipher the cipher to be used as the basis of the MAC generation. This must
-     * be DESEngine.
-     */
-    public ISO9797Alg3Mac(
-            BlockCipher     cipher)
-    {
-        this(cipher, cipher.getBlockSize() * 8, null);
-    }
-    
-    /**
-     * create a Retail-MAC based on a CBC block cipher. This will produce an
-     * authentication code of the length of the block size of the cipher.
-     *
-     * @param cipher the cipher to be used as the basis of the MAC generation.
-     * @param padding the padding to be used to complete the last block.
-     */
-    public ISO9797Alg3Mac(
-        BlockCipher         cipher,
-        BlockCipherPadding  padding)
-    {
-        this(cipher, cipher.getBlockSize() * 8, padding);
-    }
-
-    /**
-     * create a Retail-MAC based on a block cipher with the size of the
-     * MAC been given in bits. This class uses single DES CBC mode as the basis for the
-     * MAC generation.
-     * <p>
-     * Note: the size of the MAC must be at least 24 bits (FIPS Publication 81),
-     * or 16 bits if being used as a data authenticator (FIPS Publication 113),
-     * and in general should be less than the size of the block cipher as it reduces
-     * the chance of an exhaustive attack (see Handbook of Applied Cryptography).
-     *
-     * @param cipher the cipher to be used as the basis of the MAC generation.
-     * @param macSizeInBits the size of the MAC in bits, must be a multiple of 8.
-     */
-    public ISO9797Alg3Mac(
-        BlockCipher     cipher,
-        int             macSizeInBits)
-    {
-        this(cipher, macSizeInBits, null);
-    }
-
-    /**
-     * create a standard MAC based on a block cipher with the size of the
-     * MAC been given in bits. This class uses single DES CBC mode as the basis for the
-     * MAC generation. The final block is decrypted and then encrypted using the
-     * middle and right part of the key.
-     * <p>
-     * Note: the size of the MAC must be at least 24 bits (FIPS Publication 81),
-     * or 16 bits if being used as a data authenticator (FIPS Publication 113),
-     * and in general should be less than the size of the block cipher as it reduces
-     * the chance of an exhaustive attack (see Handbook of Applied Cryptography).
-     *
-     * @param cipher the cipher to be used as the basis of the MAC generation.
-     * @param macSizeInBits the size of the MAC in bits, must be a multiple of 8.
-     * @param padding the padding to be used to complete the last block.
-     */
-    public ISO9797Alg3Mac(
-        BlockCipher         cipher,
-        int                 macSizeInBits,
-        BlockCipherPadding  padding)
-    {
-        if ((macSizeInBits % 8) != 0)
-        {
-            throw new IllegalArgumentException("MAC size must be multiple of 8");
-        }
-
-        if (!(cipher instanceof DESEngine))
-        {
-            throw new IllegalArgumentException("cipher must be instance of DESEngine");
-        }
-
-        this.cipher = new CBCBlockCipher(cipher);
-        this.padding = padding;
-        this.macSize = macSizeInBits / 8;
-
-        mac = new byte[cipher.getBlockSize()];
-
-        buf = new byte[cipher.getBlockSize()];
-        bufOff = 0;
-    }
-    
-    public String getAlgorithmName()
-    {
-        return "ISO9797Alg3";
-    }
-
-    public void init(CipherParameters params)
-    {
-        reset();
-
-        if (!(params instanceof KeyParameter || params instanceof ParametersWithIV))
-        {
-            throw new IllegalArgumentException(
-                    "params must be an instance of KeyParameter or ParametersWithIV");
-        }
-
-        // KeyParameter must contain a double or triple length DES key,
-        // however the underlying cipher is a single DES. The middle and
-        // right key are used only in the final step.
-
-        KeyParameter kp;
-
-        if (params instanceof KeyParameter)
-        {
-            kp = (KeyParameter)params;
-        }
-        else
-        {
-            kp = (KeyParameter)((ParametersWithIV)params).getParameters();
-        }
-
-        KeyParameter key1;
-        byte[] keyvalue = kp.getKey();
-
-        if (keyvalue.length == 16)
-        { // Double length DES key
-            key1 = new KeyParameter(keyvalue, 0, 8);
-            this.lastKey2 = new KeyParameter(keyvalue, 8, 8);
-            this.lastKey3 = key1;
-        }
-        else if (keyvalue.length == 24)
-        { // Triple length DES key
-            key1 = new KeyParameter(keyvalue, 0, 8);
-            this.lastKey2 = new KeyParameter(keyvalue, 8, 8);
-            this.lastKey3 = new KeyParameter(keyvalue, 16, 8);
-        }
-        else
-        {
-            throw new IllegalArgumentException(
-                    "Key must be either 112 or 168 bit long");
-        }
-
-        if (params instanceof ParametersWithIV)
-        {
-            cipher.init(true, new ParametersWithIV(key1, ((ParametersWithIV)params).getIV()));
-        }
-        else
-        {
-            cipher.init(true, key1);
-        }
-    }
-    
-    public int getMacSize()
-    {
-        return macSize;
-    }
-    
-    public void update(
-            byte        in)
-    {
-        if (bufOff == buf.length)
-        {
-            cipher.processBlock(buf, 0, mac, 0);
-            bufOff = 0;
-        }
-        
-        buf[bufOff++] = in;
-    }
-    
-    
-    public void update(
-            byte[]      in,
-            int         inOff,
-            int         len)
-    {
-        if (len < 0)
-        {
-            throw new IllegalArgumentException("Can't have a negative input length!");
-        }
-        
-        int blockSize = cipher.getBlockSize();
-        int resultLen = 0;
-        int gapLen = blockSize - bufOff;
-        
-        if (len > gapLen)
-        {
-            System.arraycopy(in, inOff, buf, bufOff, gapLen);
-            
-            resultLen += cipher.processBlock(buf, 0, mac, 0);
-            
-            bufOff = 0;
-            len -= gapLen;
-            inOff += gapLen;
-            
-            while (len > blockSize)
-            {
-                resultLen += cipher.processBlock(in, inOff, mac, 0);
-                
-                len -= blockSize;
-                inOff += blockSize;
-            }
-        }
-        
-        System.arraycopy(in, inOff, buf, bufOff, len);
-        
-        bufOff += len;
-    }
-    
-    public int doFinal(
-            byte[]  out,
-            int     outOff)
-    {
-        int blockSize = cipher.getBlockSize();
-        
-        if (padding == null)
-        {
-            //
-            // pad with zeroes
-            //
-            while (bufOff < blockSize)
-            {
-                buf[bufOff] = 0;
-                bufOff++;
-            }
-        }
-        else
-        {
-            if (bufOff == blockSize)
-            {
-                cipher.processBlock(buf, 0, mac, 0);
-                bufOff = 0;
-            }
-            
-            padding.addPadding(buf, bufOff);
-        }
-        
-        cipher.processBlock(buf, 0, mac, 0);
-
-        // Added to code from base class
-        DESEngine deseng = new DESEngine();
-        
-        deseng.init(false, this.lastKey2);
-        deseng.processBlock(mac, 0, mac, 0);
-        
-        deseng.init(true, this.lastKey3);
-        deseng.processBlock(mac, 0, mac, 0);
-        // ****
-        
-        System.arraycopy(mac, 0, out, outOff, macSize);
-        
-        reset();
-        
-        return macSize;
-    }
-
-    
-    /**
-     * Reset the mac generator.
-     */
-    public void reset()
-    {
-        /*
-         * clean the buffer.
-         */
-        for (int i = 0; i < buf.length; i++)
-        {
-            buf[i] = 0;
-        }
-        
-        bufOff = 0;
-        
-        /*
-         * reset the underlying cipher.
-         */
-        cipher.reset();
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/macs/OldHMac.java b/bcprov/src/main/java/org/bouncycastle/crypto/macs/OldHMac.java
deleted file mode 100644
index 7463afd..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/macs/OldHMac.java
+++ /dev/null
@@ -1,138 +0,0 @@
-package org.bouncycastle.crypto.macs;
-
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.Mac;
-import org.bouncycastle.crypto.params.KeyParameter;
-
-/**
- * HMAC implementation based on RFC2104
- *
- * H(K XOR opad, H(K XOR ipad, text))
- */
-public class OldHMac
-implements Mac
-{
-    private final static int BLOCK_LENGTH = 64;
-
-    private final static byte IPAD = (byte)0x36;
-    private final static byte OPAD = (byte)0x5C;
-
-    private Digest digest;
-    private int digestSize;
-    private byte[] inputPad = new byte[BLOCK_LENGTH];
-    private byte[] outputPad = new byte[BLOCK_LENGTH];
-
-    /**
-     * @deprecated uses incorrect pad for SHA-512 and SHA-384 use HMac.
-     */
-    public OldHMac(
-        Digest digest)
-    {
-        this.digest = digest;
-        digestSize = digest.getDigestSize();
-    }
-
-    public String getAlgorithmName()
-    {
-        return digest.getAlgorithmName() + "/HMAC";
-    }
-
-    public Digest getUnderlyingDigest()
-    {
-        return digest;
-    }
-
-    public void init(
-        CipherParameters params)
-    {
-        digest.reset();
-
-        byte[] key = ((KeyParameter)params).getKey();
-
-        if (key.length > BLOCK_LENGTH)
-        {
-            digest.update(key, 0, key.length);
-            digest.doFinal(inputPad, 0);
-            for (int i = digestSize; i < inputPad.length; i++)
-            {
-                inputPad[i] = 0;
-            }
-        }
-        else
-        {
-            System.arraycopy(key, 0, inputPad, 0, key.length);
-            for (int i = key.length; i < inputPad.length; i++)
-            {
-                inputPad[i] = 0;
-            }
-        }
-
-        outputPad = new byte[inputPad.length];
-        System.arraycopy(inputPad, 0, outputPad, 0, inputPad.length);
-
-        for (int i = 0; i < inputPad.length; i++)
-        {
-            inputPad[i] ^= IPAD;
-        }
-
-        for (int i = 0; i < outputPad.length; i++)
-        {
-            outputPad[i] ^= OPAD;
-        }
-
-        digest.update(inputPad, 0, inputPad.length);
-    }
-
-    public int getMacSize()
-    {
-        return digestSize;
-    }
-
-    public void update(
-        byte in)
-    {
-        digest.update(in);
-    }
-
-    public void update(
-        byte[] in,
-        int inOff,
-        int len)
-    {
-        digest.update(in, inOff, len);
-    }
-
-    public int doFinal(
-        byte[] out,
-        int outOff)
-    {
-        byte[] tmp = new byte[digestSize];
-        digest.doFinal(tmp, 0);
-
-        digest.update(outputPad, 0, outputPad.length);
-        digest.update(tmp, 0, tmp.length);
-
-        int     len = digest.doFinal(out, outOff);
-
-        reset();
-
-        return len;
-    }
-
-    /**
-     * Reset the mac generator.
-     */
-    public void reset()
-    {
-        /*
-         * reset the underlying digest.
-         */
-        digest.reset();
-
-        /*
-         * reinitialize the digest.
-         */
-        digest.update(inputPad, 0, inputPad.length);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/macs/Poly1305.java b/bcprov/src/main/java/org/bouncycastle/crypto/macs/Poly1305.java
deleted file mode 100644
index 7a346f1..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/macs/Poly1305.java
+++ /dev/null
@@ -1,306 +0,0 @@
-package org.bouncycastle.crypto.macs;
-
-import org.bouncycastle.crypto.BlockCipher;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.DataLengthException;
-import org.bouncycastle.crypto.Mac;
-import org.bouncycastle.crypto.generators.Poly1305KeyGenerator;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.crypto.params.ParametersWithIV;
-import org.bouncycastle.util.Pack;
-
-/**
- * Poly1305 message authentication code, designed by D. J. Bernstein.
- * <p>
- * Poly1305 computes a 128-bit (16 bytes) authenticator, using a 128 bit nonce and a 256 bit key
- * consisting of a 128 bit key applied to an underlying cipher, and a 128 bit key (with 106
- * effective key bits) used in the authenticator.
- * <p>
- * The polynomial calculation in this implementation is adapted from the public domain <a
- * href="https://github.com/floodyberry/poly1305-donna">poly1305-donna-unrolled</a> C implementation
- * by Andrew M (@floodyberry).
- * @see Poly1305KeyGenerator
- */
-public class Poly1305
-    implements Mac
-{
-    private static final int BLOCK_SIZE = 16;
-
-    private final BlockCipher cipher;
-
-    private final byte[] singleByte = new byte[1];
-
-    // Initialised state
-
-    /** Polynomial key */
-    private int r0, r1, r2, r3, r4;
-
-    /** Precomputed 5 * r[1..4] */
-    private int s1, s2, s3, s4;
-
-    /** Encrypted nonce */
-    private int k0, k1, k2, k3;
-
-    // Accumulating state
-
-    /** Current block of buffered input */
-    private final byte[] currentBlock = new byte[BLOCK_SIZE];
-
-    /** Current offset in input buffer */
-    private int currentBlockOffset = 0;
-
-    /** Polynomial accumulator */
-    private int h0, h1, h2, h3, h4;
-
-    /**
-     * Constructs a Poly1305 MAC, where the key passed to init() will be used directly.
-     */
-    public Poly1305()
-    {
-        this.cipher = null;
-    }
-
-    /**
-     * Constructs a Poly1305 MAC, using a 128 bit block cipher.
-     */
-    public Poly1305(final BlockCipher cipher)
-    {
-        if (cipher.getBlockSize() != BLOCK_SIZE)
-        {
-            throw new IllegalArgumentException("Poly1305 requires a 128 bit block cipher.");
-        }
-        this.cipher = cipher;
-    }
-
-    /**
-     * Initialises the Poly1305 MAC.
-     * 
-     * @param params if used with a block cipher, then a {@link ParametersWithIV} containing a 128 bit
-     *        nonce and a {@link KeyParameter} with a 256 bit key complying to the
-     *        {@link Poly1305KeyGenerator Poly1305 key format}, otherwise just the
-     *        {@link KeyParameter}.
-     */
-    public void init(CipherParameters params)
-        throws IllegalArgumentException
-    {
-        byte[] nonce = null;
-
-        if (cipher != null)
-        {
-            if (!(params instanceof ParametersWithIV))
-            {
-                throw new IllegalArgumentException("Poly1305 requires an IV when used with a block cipher.");
-            }
-            
-            ParametersWithIV ivParams = (ParametersWithIV)params;
-            nonce = ivParams.getIV();
-            params = ivParams.getParameters();
-        }
-
-        if (!(params instanceof KeyParameter))
-        {
-            throw new IllegalArgumentException("Poly1305 requires a key.");
-        }
-
-        KeyParameter keyParams = (KeyParameter)params;
-
-        setKey(keyParams.getKey(), nonce);
-
-        reset();
-    }
-
-    private void setKey(final byte[] key, final byte[] nonce)
-    {
-        if (cipher != null && (nonce == null || nonce.length != BLOCK_SIZE))
-        {
-            throw new IllegalArgumentException("Poly1305 requires a 128 bit IV.");
-        }
-
-        Poly1305KeyGenerator.checkKey(key);
-
-        // Extract r portion of key
-        int t0 = Pack.littleEndianToInt(key, BLOCK_SIZE + 0);
-        int t1 = Pack.littleEndianToInt(key, BLOCK_SIZE + 4);
-        int t2 = Pack.littleEndianToInt(key, BLOCK_SIZE + 8);
-        int t3 = Pack.littleEndianToInt(key, BLOCK_SIZE + 12);
-
-        r0 = t0 & 0x3ffffff; t0 >>>= 26; t0 |= t1 << 6;
-        r1 = t0 & 0x3ffff03; t1 >>>= 20; t1 |= t2 << 12;
-        r2 = t1 & 0x3ffc0ff; t2 >>>= 14; t2 |= t3 << 18;
-        r3 = t2 & 0x3f03fff; t3 >>>= 8;
-        r4 = t3 & 0x00fffff;
-
-        // Precompute multipliers
-        s1 = r1 * 5;
-        s2 = r2 * 5;
-        s3 = r3 * 5;
-        s4 = r4 * 5;
-
-        final byte[] kBytes;
-        if (cipher == null)
-        {
-            kBytes = key;
-        }
-        else
-        {
-            // Compute encrypted nonce
-            kBytes = new byte[BLOCK_SIZE];
-            cipher.init(true, new KeyParameter(key, 0, BLOCK_SIZE));
-            cipher.processBlock(nonce, 0, kBytes, 0);
-        }
-
-        k0 = Pack.littleEndianToInt(kBytes, 0);
-        k1 = Pack.littleEndianToInt(kBytes, 4);
-        k2 = Pack.littleEndianToInt(kBytes, 8);
-        k3 = Pack.littleEndianToInt(kBytes, 12);
-    }
-
-    public String getAlgorithmName()
-    {
-        return cipher == null ? "Poly1305" : "Poly1305-" + cipher.getAlgorithmName();
-    }
-
-    public int getMacSize()
-    {
-        return BLOCK_SIZE;
-    }
-
-    public void update(final byte in)
-        throws IllegalStateException
-    {
-        singleByte[0] = in;
-        update(singleByte, 0, 1);
-    }
-
-    public void update(final byte[] in, final int inOff, final int len)
-        throws DataLengthException,
-        IllegalStateException
-    {
-        int copied = 0;
-        while (len > copied)
-        {
-            if (currentBlockOffset == BLOCK_SIZE)
-            {
-                processBlock();
-                currentBlockOffset = 0;
-            }
-
-            int toCopy = Math.min((len - copied), BLOCK_SIZE - currentBlockOffset);
-            System.arraycopy(in, copied + inOff, currentBlock, currentBlockOffset, toCopy);
-            copied += toCopy;
-            currentBlockOffset += toCopy;
-        }
-
-    }
-
-    private void processBlock()
-    {
-        if (currentBlockOffset < BLOCK_SIZE)
-        {
-            currentBlock[currentBlockOffset] = 1;
-            for (int i = currentBlockOffset + 1; i < BLOCK_SIZE; i++)
-            {
-                currentBlock[i] = 0;
-            }
-        }
-
-        final long t0 = 0xffffffffL & Pack.littleEndianToInt(currentBlock, 0);
-        final long t1 = 0xffffffffL & Pack.littleEndianToInt(currentBlock, 4);
-        final long t2 = 0xffffffffL & Pack.littleEndianToInt(currentBlock, 8);
-        final long t3 = 0xffffffffL & Pack.littleEndianToInt(currentBlock, 12);
-
-        h0 += t0 & 0x3ffffff;
-        h1 += (((t1 << 32) | t0) >>> 26) & 0x3ffffff;
-        h2 += (((t2 << 32) | t1) >>> 20) & 0x3ffffff;
-        h3 += (((t3 << 32) | t2) >>> 14) & 0x3ffffff;
-        h4 += (t3 >>> 8);
-
-        if (currentBlockOffset == BLOCK_SIZE)
-        {
-            h4 += (1 << 24);
-        }
-
-        long tp0 = mul32x32_64(h0,r0) + mul32x32_64(h1,s4) + mul32x32_64(h2,s3) + mul32x32_64(h3,s2) + mul32x32_64(h4,s1);
-        long tp1 = mul32x32_64(h0,r1) + mul32x32_64(h1,r0) + mul32x32_64(h2,s4) + mul32x32_64(h3,s3) + mul32x32_64(h4,s2);
-        long tp2 = mul32x32_64(h0,r2) + mul32x32_64(h1,r1) + mul32x32_64(h2,r0) + mul32x32_64(h3,s4) + mul32x32_64(h4,s3);
-        long tp3 = mul32x32_64(h0,r3) + mul32x32_64(h1,r2) + mul32x32_64(h2,r1) + mul32x32_64(h3,r0) + mul32x32_64(h4,s4);
-        long tp4 = mul32x32_64(h0,r4) + mul32x32_64(h1,r3) + mul32x32_64(h2,r2) + mul32x32_64(h3,r1) + mul32x32_64(h4,r0);
-
-        long b;
-        h0 = (int)tp0 & 0x3ffffff; b = (tp0 >>> 26);
-        tp1 += b; h1 = (int)tp1 & 0x3ffffff; b = ((tp1 >>> 26) & 0xffffffff);
-        tp2 += b; h2 = (int)tp2 & 0x3ffffff; b = ((tp2 >>> 26) & 0xffffffff);
-        tp3 += b; h3 = (int)tp3 & 0x3ffffff; b = (tp3 >>> 26);
-        tp4 += b; h4 = (int)tp4 & 0x3ffffff; b = (tp4 >>> 26);
-        h0 += b * 5;
-    }
-
-    public int doFinal(final byte[] out, final int outOff)
-        throws DataLengthException,
-        IllegalStateException
-    {
-        if (outOff + BLOCK_SIZE > out.length)
-        {
-            throw new DataLengthException("Output buffer is too short.");
-        }
-
-        if (currentBlockOffset > 0)
-        {
-            // Process padded final block
-            processBlock();
-        }
-
-        long f0, f1, f2, f3;
-
-        int b = h0 >>> 26;
-        h0 = h0 & 0x3ffffff;
-        h1 += b; b = h1 >>> 26; h1 = h1 & 0x3ffffff;
-        h2 += b; b = h2 >>> 26; h2 = h2 & 0x3ffffff;
-        h3 += b; b = h3 >>> 26; h3 = h3 & 0x3ffffff;
-        h4 += b; b = h4 >>> 26; h4 = h4 & 0x3ffffff;
-        h0 += b * 5;
-
-        int g0, g1, g2, g3, g4;
-        g0 = h0 + 5; b = g0 >>> 26; g0 &= 0x3ffffff;
-        g1 = h1 + b; b = g1 >>> 26; g1 &= 0x3ffffff;
-        g2 = h2 + b; b = g2 >>> 26; g2 &= 0x3ffffff;
-        g3 = h3 + b; b = g3 >>> 26; g3 &= 0x3ffffff;
-        g4 = h4 + b - (1 << 26);
-
-        b = (g4 >>> 31) - 1;
-        int nb = ~b;
-        h0 = (h0 & nb) | (g0 & b);
-        h1 = (h1 & nb) | (g1 & b);
-        h2 = (h2 & nb) | (g2 & b);
-        h3 = (h3 & nb) | (g3 & b);
-        h4 = (h4 & nb) | (g4 & b);
-
-        f0 = (((h0       ) | (h1 << 26)) & 0xffffffffl) + (0xffffffffL & k0);
-        f1 = (((h1 >>> 6 ) | (h2 << 20)) & 0xffffffffl) + (0xffffffffL & k1);
-        f2 = (((h2 >>> 12) | (h3 << 14)) & 0xffffffffl) + (0xffffffffL & k2);
-        f3 = (((h3 >>> 18) | (h4 << 8 )) & 0xffffffffl) + (0xffffffffL & k3);
-
-        Pack.intToLittleEndian((int)f0, out, outOff);
-        f1 += (f0 >>> 32);
-        Pack.intToLittleEndian((int)f1, out, outOff + 4);
-        f2 += (f1 >>> 32);
-        Pack.intToLittleEndian((int)f2, out, outOff + 8);
-        f3 += (f2 >>> 32);
-        Pack.intToLittleEndian((int)f3, out, outOff + 12);
-
-        reset();
-        return BLOCK_SIZE;
-    }
-
-    public void reset()
-    {
-        currentBlockOffset = 0;
-
-        h0 = h1 = h2 = h3 = h4 = 0;
-    }
-
-    private static final long mul32x32_64(int i1, int i2)
-    {
-        return ((long)i1) * i2;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/macs/SipHash.java b/bcprov/src/main/java/org/bouncycastle/crypto/macs/SipHash.java
deleted file mode 100644
index d6b9dbb..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/macs/SipHash.java
+++ /dev/null
@@ -1,216 +0,0 @@
-package org.bouncycastle.crypto.macs;
-
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.DataLengthException;
-import org.bouncycastle.crypto.Mac;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.util.Pack;
-
-/**
- * Implementation of SipHash as specified in "SipHash: a fast short-input PRF", by Jean-Philippe
- * Aumasson and Daniel J. Bernstein (https://131002.net/siphash/siphash.pdf).
- * <p>
- * "SipHash is a family of PRFs SipHash-c-d where the integer parameters c and d are the number of
- * compression rounds and the number of finalization rounds. A compression round is identical to a
- * finalization round and this round function is called SipRound. Given a 128-bit key k and a
- * (possibly empty) byte string m, SipHash-c-d returns a 64-bit value..."
- */
-public class SipHash
-    implements Mac
-{
-    protected final int c, d;
-
-    protected long k0, k1;
-    protected long v0, v1, v2, v3;
-
-    protected long m = 0;
-    protected int wordPos = 0;
-    protected int wordCount = 0;
-
-    /**
-     * SipHash-2-4
-     */
-    public SipHash()
-    {
-        // use of 'this' confuses the flow analyser on earlier JDKs.
-        this.c = 2;
-        this.d = 4;
-    }
-
-    /**
-     * SipHash-c-d
-     *
-     * @param c the number of compression rounds
-     * @param d the number of finalization rounds
-     */
-    public SipHash(int c, int d)
-    {
-        this.c = c;
-        this.d = d;
-    }
-
-    public String getAlgorithmName()
-    {
-        return "SipHash-" + c + "-" + d;
-    }
-
-    public int getMacSize()
-    {
-        return 8;
-    }
-
-    public void init(CipherParameters params)
-        throws IllegalArgumentException
-    {
-        if (!(params instanceof KeyParameter))
-        {
-            throw new IllegalArgumentException("'params' must be an instance of KeyParameter");
-        }
-        KeyParameter keyParameter = (KeyParameter)params;
-        byte[] key = keyParameter.getKey();
-        if (key.length != 16)
-        {
-            throw new IllegalArgumentException("'params' must be a 128-bit key");
-        }
-
-        this.k0 = Pack.littleEndianToLong(key, 0);
-        this.k1 = Pack.littleEndianToLong(key, 8);
-
-        reset();
-    }
-
-    public void update(byte input)
-        throws IllegalStateException
-    {
-        m >>>= 8;
-        m |= (input & 0xffL) << 56;
-
-        if (++wordPos == 8)
-        {
-            processMessageWord();
-            wordPos = 0;
-        }
-    }
-
-    public void update(byte[] input, int offset, int length)
-        throws DataLengthException,
-        IllegalStateException
-    {
-        int i = 0, fullWords = length & ~7;
-        if (wordPos == 0)
-        {
-            for (; i < fullWords; i += 8)
-            {
-                m = Pack.littleEndianToLong(input, offset + i);
-                processMessageWord();
-            }
-            for (; i < length; ++i)
-            {
-                m >>>= 8;
-                m |= (input[offset + i] & 0xffL) << 56;
-            }
-            wordPos = length - fullWords;
-        }
-        else
-        {
-            int bits = wordPos << 3;
-            for (; i < fullWords; i += 8)
-            {
-                long n = Pack.littleEndianToLong(input, offset + i);
-                m = (n << bits) | (m >>> -bits);
-                processMessageWord();
-                m = n;
-            }
-            for (; i < length; ++i)
-            {
-                m >>>= 8;
-                m |= (input[offset + i] & 0xffL) << 56;
-
-                if (++wordPos == 8)
-                {
-                    processMessageWord();
-                    wordPos = 0;
-                }
-            }
-        }
-    }
-
-    public long doFinal()
-        throws DataLengthException, IllegalStateException
-    {
-        // NOTE: 2 distinct shifts to avoid "64-bit shift" when wordPos == 0
-        m >>>= ((7 - wordPos) << 3);
-        m >>>= 8;
-        m |= (((wordCount << 3) + wordPos) & 0xffL) << 56;
-
-        processMessageWord();
-
-        v2 ^= 0xffL;
-
-        applySipRounds(d);
-
-        long result = v0 ^ v1 ^ v2 ^ v3;
-
-        reset();
-
-        return result;
-    }
-
-    public int doFinal(byte[] out, int outOff)
-        throws DataLengthException, IllegalStateException
-    {
-        long result = doFinal();
-        Pack.longToLittleEndian(result, out, outOff);
-        return 8;
-    }
-
-    public void reset()
-    {
-        v0 = k0 ^ 0x736f6d6570736575L;
-        v1 = k1 ^ 0x646f72616e646f6dL;
-        v2 = k0 ^ 0x6c7967656e657261L;
-        v3 = k1 ^ 0x7465646279746573L;
-
-        m = 0;
-        wordPos = 0;
-        wordCount = 0;
-    }
-
-    protected void processMessageWord()
-    {
-        ++wordCount;
-        v3 ^= m;
-        applySipRounds(c);
-        v0 ^= m;
-    }
-
-    protected void applySipRounds(int n)
-    {
-        long r0 = v0, r1 = v1, r2 = v2, r3 = v3;
-
-        for (int r = 0; r < n; ++r)
-        {
-            r0 += r1;
-            r2 += r3;
-            r1 = rotateLeft(r1, 13);
-            r3 = rotateLeft(r3, 16);
-            r1 ^= r0;
-            r3 ^= r2;
-            r0 = rotateLeft(r0, 32);
-            r2 += r1;
-            r0 += r3;
-            r1 = rotateLeft(r1, 17);
-            r3 = rotateLeft(r3, 21);
-            r1 ^= r2;
-            r3 ^= r0;
-            r2 = rotateLeft(r2, 32);
-        }
-
-        v0 = r0; v1 = r1; v2 = r2; v3 = r3;
-    }
-
-    protected static long rotateLeft(long x, int n)
-    {
-        return (x << n) | (x >>> -n);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/macs/SkeinMac.java b/bcprov/src/main/java/org/bouncycastle/crypto/macs/SkeinMac.java
deleted file mode 100644
index 7115b51..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/macs/SkeinMac.java
+++ /dev/null
@@ -1,118 +0,0 @@
-package org.bouncycastle.crypto.macs;
-
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.Mac;
-import org.bouncycastle.crypto.digests.SkeinEngine;
-import org.bouncycastle.crypto.engines.ThreefishEngine;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.crypto.params.SkeinParameters;
-
-/**
- * Implementation of the Skein parameterised MAC function in 256, 512 and 1024 bit block sizes,
- * based on the {@link ThreefishEngine Threefish} tweakable block cipher.
- * <p>
- * This is the 1.3 version of Skein defined in the Skein hash function submission to the NIST SHA-3
- * competition in October 2010.
- * <p>
- * Skein was designed by Niels Ferguson - Stefan Lucks - Bruce Schneier - Doug Whiting - Mihir
- * Bellare - Tadayoshi Kohno - Jon Callas - Jesse Walker.
- *
- * @see SkeinEngine
- * @see SkeinParameters
- */
-public class SkeinMac
-    implements Mac
-{
-    /**
-     * 256 bit block size - Skein MAC-256
-     */
-    public static final int SKEIN_256 = SkeinEngine.SKEIN_256;
-    /**
-     * 512 bit block size - Skein MAC-512
-     */
-    public static final int SKEIN_512 = SkeinEngine.SKEIN_512;
-    /**
-     * 1024 bit block size - Skein MAC-1024
-     */
-    public static final int SKEIN_1024 = SkeinEngine.SKEIN_1024;
-
-    private SkeinEngine engine;
-
-    /**
-     * Constructs a Skein MAC with an internal state size and output size.
-     *
-     * @param stateSizeBits  the internal state size in bits - one of {@link #SKEIN_256}, {@link #SKEIN_512} or
-     *                       {@link #SKEIN_1024}.
-     * @param digestSizeBits the output/MAC size to produce in bits, which must be an integral number of bytes.
-     */
-    public SkeinMac(int stateSizeBits, int digestSizeBits)
-    {
-        this.engine = new SkeinEngine(stateSizeBits, digestSizeBits);
-    }
-
-    public SkeinMac(SkeinMac mac)
-    {
-        this.engine = new SkeinEngine(mac.engine);
-    }
-
-    public String getAlgorithmName()
-    {
-        return "Skein-MAC-" + (engine.getBlockSize() * 8) + "-" + (engine.getOutputSize() * 8);
-    }
-
-    /**
-     * Initialises the Skein digest with the provided parameters.<br>
-     * See {@link SkeinParameters} for details on the parameterisation of the Skein hash function.
-     *
-     * @param params an instance of {@link SkeinParameters} or {@link KeyParameter}.
-     */
-    public void init(CipherParameters params)
-        throws IllegalArgumentException
-    {
-        SkeinParameters skeinParameters;
-        if (params instanceof SkeinParameters)
-        {
-            skeinParameters = (SkeinParameters)params;
-        }
-        else if (params instanceof KeyParameter)
-        {
-            skeinParameters = new SkeinParameters.Builder().setKey(((KeyParameter)params).getKey()).build();
-        }
-        else
-        {
-            throw new IllegalArgumentException("Invalid parameter passed to Skein MAC init - "
-                + params.getClass().getName());
-        }
-        if (skeinParameters.getKey() == null)
-        {
-            throw new IllegalArgumentException("Skein MAC requires a key parameter.");
-        }
-        engine.init(skeinParameters);
-    }
-
-    public int getMacSize()
-    {
-        return engine.getOutputSize();
-    }
-
-    public void reset()
-    {
-        engine.reset();
-    }
-
-    public void update(byte in)
-    {
-        engine.update(in);
-    }
-
-    public void update(byte[] in, int inOff, int len)
-    {
-        engine.update(in, inOff, len);
-    }
-
-    public int doFinal(byte[] out, int outOff)
-    {
-        return engine.doFinal(out, outOff);
-    }
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/macs/VMPCMac.java b/bcprov/src/main/java/org/bouncycastle/crypto/macs/VMPCMac.java
deleted file mode 100644
index 58d06d0..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/macs/VMPCMac.java
+++ /dev/null
@@ -1,186 +0,0 @@
-package org.bouncycastle.crypto.macs;
-
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.DataLengthException;
-import org.bouncycastle.crypto.Mac;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.crypto.params.ParametersWithIV;
-
-public class VMPCMac implements Mac
-{
-    private byte g;
-
-    private byte n = 0;
-    private byte[] P = null;
-    private byte s = 0;
-
-    private byte[] T;
-    private byte[] workingIV;
-
-    private byte[] workingKey;
-
-    private byte x1, x2, x3, x4;
-
-    public int doFinal(byte[] out, int outOff)
-        throws DataLengthException, IllegalStateException
-    {
-        // Execute the Post-Processing Phase
-        for (int r = 1; r < 25; r++)
-        {
-            s = P[(s + P[n & 0xff]) & 0xff];
-
-            x4 = P[(x4 + x3 + r) & 0xff];
-            x3 = P[(x3 + x2 + r) & 0xff];
-            x2 = P[(x2 + x1 + r) & 0xff];
-            x1 = P[(x1 + s + r) & 0xff];
-            T[g & 0x1f] = (byte) (T[g & 0x1f] ^ x1);
-            T[(g + 1) & 0x1f] = (byte) (T[(g + 1) & 0x1f] ^ x2);
-            T[(g + 2) & 0x1f] = (byte) (T[(g + 2) & 0x1f] ^ x3);
-            T[(g + 3) & 0x1f] = (byte) (T[(g + 3) & 0x1f] ^ x4);
-            g = (byte) ((g + 4) & 0x1f);
-
-            byte temp = P[n & 0xff];
-            P[n & 0xff] = P[s & 0xff];
-            P[s & 0xff] = temp;
-            n = (byte) ((n + 1) & 0xff);
-        }
-
-        // Input T to the IV-phase of the VMPC KSA
-        for (int m = 0; m < 768; m++)
-        {
-            s = P[(s + P[m & 0xff] + T[m & 0x1f]) & 0xff];
-            byte temp = P[m & 0xff];
-            P[m & 0xff] = P[s & 0xff];
-            P[s & 0xff] = temp;
-        }
-
-        // Store 20 new outputs of the VMPC Stream Cipher in table M
-        byte[] M = new byte[20];
-        for (int i = 0; i < 20; i++)
-        {
-            s = P[(s + P[i & 0xff]) & 0xff];
-            M[i] = P[(P[(P[s & 0xff]) & 0xff] + 1) & 0xff];
-
-            byte temp = P[i & 0xff];
-            P[i & 0xff] = P[s & 0xff];
-            P[s & 0xff] = temp;
-        }
-
-        System.arraycopy(M, 0, out, outOff, M.length);
-        reset();
-
-        return M.length;
-    }
-
-    public String getAlgorithmName()
-    {
-        return "VMPC-MAC";
-    }
-
-    public int getMacSize()
-    {
-        return 20;
-    }
-
-    public void init(CipherParameters params) throws IllegalArgumentException
-    {
-        if (!(params instanceof ParametersWithIV))
-        {
-            throw new IllegalArgumentException(
-                "VMPC-MAC Init parameters must include an IV");
-        }
-
-        ParametersWithIV ivParams = (ParametersWithIV) params;
-        KeyParameter key = (KeyParameter) ivParams.getParameters();
-
-        if (!(ivParams.getParameters() instanceof KeyParameter))
-        {
-            throw new IllegalArgumentException(
-                "VMPC-MAC Init parameters must include a key");
-        }
-
-        this.workingIV = ivParams.getIV();
-
-        if (workingIV == null || workingIV.length < 1 || workingIV.length > 768)
-        {
-            throw new IllegalArgumentException(
-                "VMPC-MAC requires 1 to 768 bytes of IV");
-        }
-
-        this.workingKey = key.getKey();
-
-        reset();
-
-    }
-
-    private void initKey(byte[] keyBytes, byte[] ivBytes)
-    {
-        s = 0;
-        P = new byte[256];
-        for (int i = 0; i < 256; i++)
-        {
-            P[i] = (byte) i;
-        }
-        for (int m = 0; m < 768; m++)
-        {
-            s = P[(s + P[m & 0xff] + keyBytes[m % keyBytes.length]) & 0xff];
-            byte temp = P[m & 0xff];
-            P[m & 0xff] = P[s & 0xff];
-            P[s & 0xff] = temp;
-        }
-        for (int m = 0; m < 768; m++)
-        {
-            s = P[(s + P[m & 0xff] + ivBytes[m % ivBytes.length]) & 0xff];
-            byte temp = P[m & 0xff];
-            P[m & 0xff] = P[s & 0xff];
-            P[s & 0xff] = temp;
-        }
-        n = 0;
-    }
-
-    public void reset()
-    {
-        initKey(this.workingKey, this.workingIV);
-        g = x1 = x2 = x3 = x4 = n = 0;
-        T = new byte[32];
-        for (int i = 0; i < 32; i++)
-        {
-            T[i] = 0;
-        }
-    }
-
-    public void update(byte in) throws IllegalStateException
-    {
-        s = P[(s + P[n & 0xff]) & 0xff];
-        byte c = (byte) (in ^ P[(P[(P[s & 0xff]) & 0xff] + 1) & 0xff]);
-
-        x4 = P[(x4 + x3) & 0xff];
-        x3 = P[(x3 + x2) & 0xff];
-        x2 = P[(x2 + x1) & 0xff];
-        x1 = P[(x1 + s + c) & 0xff];
-        T[g & 0x1f] = (byte) (T[g & 0x1f] ^ x1);
-        T[(g + 1) & 0x1f] = (byte) (T[(g + 1) & 0x1f] ^ x2);
-        T[(g + 2) & 0x1f] = (byte) (T[(g + 2) & 0x1f] ^ x3);
-        T[(g + 3) & 0x1f] = (byte) (T[(g + 3) & 0x1f] ^ x4);
-        g = (byte) ((g + 4) & 0x1f);
-
-        byte temp = P[n & 0xff];
-        P[n & 0xff] = P[s & 0xff];
-        P[s & 0xff] = temp;
-        n = (byte) ((n + 1) & 0xff);
-    }
-
-    public void update(byte[] in, int inOff, int len)
-        throws DataLengthException, IllegalStateException
-    {
-        if ((inOff + len) > in.length)
-        {
-            throw new DataLengthException("input buffer too short");
-        }
-
-        for (int i = 0; i < len; i++)
-        {
-            update(in[i]);
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/macs/package.html b/bcprov/src/main/java/org/bouncycastle/crypto/macs/package.html
deleted file mode 100644
index 0b1f86d..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/macs/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body bgcolor="#ffffff">
-Classes for creating MACs and HMACs.
-</body>
-</html>
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/modes/EAXBlockCipher.java b/bcprov/src/main/java/org/bouncycastle/crypto/modes/EAXBlockCipher.java
deleted file mode 100644
index 209d5cd..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/modes/EAXBlockCipher.java
+++ /dev/null
@@ -1,387 +0,0 @@
-package org.bouncycastle.crypto.modes;
-
-import org.bouncycastle.crypto.BlockCipher;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.DataLengthException;
-import org.bouncycastle.crypto.InvalidCipherTextException;
-import org.bouncycastle.crypto.Mac;
-import org.bouncycastle.crypto.OutputLengthException;
-import org.bouncycastle.crypto.macs.CMac;
-import org.bouncycastle.crypto.params.AEADParameters;
-import org.bouncycastle.crypto.params.ParametersWithIV;
-import org.bouncycastle.util.Arrays;
-
-/**
- * A Two-Pass Authenticated-Encryption Scheme Optimized for Simplicity and
- * Efficiency - by M. Bellare, P. Rogaway, D. Wagner.
- *
- * http://www.cs.ucdavis.edu/~rogaway/papers/eax.pdf
- *
- * EAX is an AEAD scheme based on CTR and OMAC1/CMAC, that uses a single block
- * cipher to encrypt and authenticate data. It's on-line (the length of a
- * message isn't needed to begin processing it), has good performances, it's
- * simple and provably secure (provided the underlying block cipher is secure).
- *
- * Of course, this implementations is NOT thread-safe.
- */
-public class EAXBlockCipher
-    implements AEADBlockCipher
-{
-    private static final byte nTAG = 0x0;
-
-    private static final byte hTAG = 0x1;
-
-    private static final byte cTAG = 0x2;
-
-    private SICBlockCipher cipher;
-
-    private boolean forEncryption;
-
-    private int blockSize;
-
-    private Mac mac;
-
-    private byte[] nonceMac;
-    private byte[] associatedTextMac;
-    private byte[] macBlock;
-
-    private int macSize;
-    private byte[] bufBlock;
-    private int bufOff;
-
-    private boolean cipherInitialized;
-    private byte[] initialAssociatedText;
-
-    /**
-     * Constructor that accepts an instance of a block cipher engine.
-     *
-     * @param cipher the engine to use
-     */
-    public EAXBlockCipher(BlockCipher cipher)
-    {
-        blockSize = cipher.getBlockSize();
-        mac = new CMac(cipher);
-        macBlock = new byte[blockSize];
-        associatedTextMac = new byte[mac.getMacSize()];
-        nonceMac = new byte[mac.getMacSize()];
-        this.cipher = new SICBlockCipher(cipher);
-    }
-
-    public String getAlgorithmName()
-    {
-        return cipher.getUnderlyingCipher().getAlgorithmName() + "/EAX";
-    }
-
-    public BlockCipher getUnderlyingCipher()
-    {
-        return cipher.getUnderlyingCipher();
-    }
-
-    public int getBlockSize()
-    {
-        return cipher.getBlockSize();
-    }
-
-    public void init(boolean forEncryption, CipherParameters params)
-        throws IllegalArgumentException
-    {
-        this.forEncryption = forEncryption;
-
-        byte[] nonce;
-        CipherParameters keyParam;
-
-        if (params instanceof AEADParameters)
-        {
-            AEADParameters param = (AEADParameters)params;
-
-            nonce = param.getNonce();
-            initialAssociatedText = param.getAssociatedText();
-            macSize = param.getMacSize() / 8;
-            keyParam = param.getKey();
-        }
-        else if (params instanceof ParametersWithIV)
-        {
-            ParametersWithIV param = (ParametersWithIV)params;
-
-            nonce = param.getIV();
-            initialAssociatedText = null;
-            macSize = mac.getMacSize() / 2;
-            keyParam = param.getParameters();
-        }
-        else
-        {
-            throw new IllegalArgumentException("invalid parameters passed to EAX");
-        }
-
-        bufBlock = new byte[forEncryption ? blockSize : (blockSize + macSize)];
-
-        byte[] tag = new byte[blockSize];
-
-        // Key reuse implemented in CBC mode of underlying CMac
-        mac.init(keyParam);
-
-        tag[blockSize - 1] = nTAG;
-        mac.update(tag, 0, blockSize);
-        mac.update(nonce, 0, nonce.length);
-        mac.doFinal(nonceMac, 0);
-
-        // Same BlockCipher underlies this and the mac, so reuse last key on cipher
-        cipher.init(true, new ParametersWithIV(null, nonceMac));
-
-        reset();
-    }
-
-    private void initCipher()
-    {
-        if (cipherInitialized)
-        {
-            return;
-        }
-
-        cipherInitialized = true;
-
-        mac.doFinal(associatedTextMac, 0);
-
-        byte[] tag = new byte[blockSize];
-        tag[blockSize - 1] = cTAG;
-        mac.update(tag, 0, blockSize);
-    }
-
-    private void calculateMac()
-    {
-        byte[] outC = new byte[blockSize];
-        mac.doFinal(outC, 0);
-
-        for (int i = 0; i < macBlock.length; i++)
-        {
-            macBlock[i] = (byte)(nonceMac[i] ^ associatedTextMac[i] ^ outC[i]);
-        }
-    }
-
-    public void reset()
-    {
-        reset(true);
-    }
-
-    private void reset(
-        boolean clearMac)
-    {
-        cipher.reset(); // TODO Redundant since the mac will reset it?
-        mac.reset();
-
-        bufOff = 0;
-        Arrays.fill(bufBlock, (byte)0);
-
-        if (clearMac)
-        {
-            Arrays.fill(macBlock, (byte)0);
-        }
-
-        byte[] tag = new byte[blockSize];
-        tag[blockSize - 1] = hTAG;
-        mac.update(tag, 0, blockSize);
-
-        cipherInitialized = false;
-
-        if (initialAssociatedText != null)
-        {
-           processAADBytes(initialAssociatedText, 0, initialAssociatedText.length);
-        }
-    }
-
-    public void processAADByte(byte in)
-    {
-        if (cipherInitialized)
-        {
-            throw new IllegalStateException("AAD data cannot be added after encryption/decription processing has begun.");
-        }
-        mac.update(in);
-    }
-
-    public void processAADBytes(byte[] in, int inOff, int len)
-    {
-        if (cipherInitialized)
-        {
-            throw new IllegalStateException("AAD data cannot be added after encryption/decryption processing has begun.");
-        }
-        mac.update(in, inOff, len);
-    }
-
-    public int processByte(byte in, byte[] out, int outOff)
-        throws DataLengthException
-    {
-        initCipher();
-
-        return process(in, out, outOff);
-    }
-
-    public int processBytes(byte[] in, int inOff, int len, byte[] out, int outOff)
-        throws DataLengthException
-    {
-        initCipher();
-
-        if (in.length < (inOff + len))
-        {
-            throw new DataLengthException("Input buffer too short");
-        }
-
-        int resultLen = 0;
-
-        for (int i = 0; i != len; i++)
-        {
-            resultLen += process(in[inOff + i], out, outOff + resultLen);
-        }
-
-        return resultLen;
-    }
-
-    public int doFinal(byte[] out, int outOff)
-        throws IllegalStateException, InvalidCipherTextException
-    {
-        initCipher();
-
-        int extra = bufOff;
-        byte[] tmp = new byte[bufBlock.length];
-
-        bufOff = 0;
-
-        if (forEncryption)
-        {
-            if (out.length < (outOff + extra + macSize))
-            {
-                throw new OutputLengthException("Output buffer too short");
-            }
-            cipher.processBlock(bufBlock, 0, tmp, 0);
-
-            System.arraycopy(tmp, 0, out, outOff, extra);
-
-            mac.update(tmp, 0, extra);
-
-            calculateMac();
-
-            System.arraycopy(macBlock, 0, out, outOff + extra, macSize);
-
-            reset(false);
-
-            return extra + macSize;
-        }
-        else
-        {
-            if (out.length < (outOff + extra - macSize))
-            {
-                throw new OutputLengthException("Output buffer too short");
-            }
-            if (extra < macSize)
-            {
-                throw new InvalidCipherTextException("data too short");
-            }
-            if (extra > macSize)
-            {
-                mac.update(bufBlock, 0, extra - macSize);
-
-                cipher.processBlock(bufBlock, 0, tmp, 0);
-
-                System.arraycopy(tmp, 0, out, outOff, extra - macSize);
-            }
-
-            calculateMac();
-
-            if (!verifyMac(bufBlock, extra - macSize))
-            {
-                throw new InvalidCipherTextException("mac check in EAX failed");
-            }
-
-            reset(false);
-
-            return extra - macSize;
-        }
-    }
-
-    public byte[] getMac()
-    {
-        byte[] mac = new byte[macSize];
-
-        System.arraycopy(macBlock, 0, mac, 0, macSize);
-
-        return mac;
-    }
-
-    public int getUpdateOutputSize(int len)
-    {
-        int totalData = len + bufOff;
-        if (!forEncryption)
-        {
-            if (totalData < macSize)
-            {
-                return 0;
-            }
-            totalData -= macSize;
-        }
-        return totalData - totalData % blockSize;
-    }
-
-    public int getOutputSize(int len)
-    {
-        int totalData = len + bufOff;
-
-        if (forEncryption)
-        {
-            return totalData + macSize;
-        }
-
-        return totalData < macSize ? 0 : totalData - macSize;
-    }
-
-    private int process(byte b, byte[] out, int outOff)
-    {
-        bufBlock[bufOff++] = b;
-
-        if (bufOff == bufBlock.length)
-        {
-            if (out.length < (outOff + blockSize))
-            {
-                throw new OutputLengthException("Output buffer is too short");
-            }
-            // TODO Could move the processByte(s) calls to here
-//            initCipher();
-
-            int size;
-
-            if (forEncryption)
-            {
-                size = cipher.processBlock(bufBlock, 0, out, outOff);
-
-                mac.update(out, outOff, blockSize);
-            }
-            else
-            {
-                mac.update(bufBlock, 0, blockSize);
-
-                size = cipher.processBlock(bufBlock, 0, out, outOff);
-            }
-
-            bufOff = 0;
-            if (!forEncryption)
-            {
-                System.arraycopy(bufBlock, blockSize, bufBlock, 0, macSize);
-                bufOff = macSize;
-            }
-
-            return size;
-        }
-
-        return 0;
-    }
-
-    private boolean verifyMac(byte[] mac, int off)
-    {
-        int nonEqual = 0;
-
-        for (int i = 0; i < macSize; i++)
-        {
-            nonEqual |= (macBlock[i] ^ mac[off + i]);
-        }
-
-        return nonEqual == 0;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/modes/GCFBBlockCipher.java b/bcprov/src/main/java/org/bouncycastle/crypto/modes/GCFBBlockCipher.java
deleted file mode 100644
index 5791e89..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/modes/GCFBBlockCipher.java
+++ /dev/null
@@ -1,120 +0,0 @@
-package org.bouncycastle.crypto.modes;
-
-import org.bouncycastle.crypto.BlockCipher;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.DataLengthException;
-import org.bouncycastle.crypto.StreamBlockCipher;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.crypto.params.ParametersWithIV;
-import org.bouncycastle.crypto.params.ParametersWithRandom;
-import org.bouncycastle.crypto.params.ParametersWithSBox;
-
-/**
- * An implementation of the GOST CFB mode with CryptoPro key meshing as described in RFC 4357.
- */
-public class GCFBBlockCipher
-    extends StreamBlockCipher
-{
-    private static final byte[] C =
-        {
-            0x69, 0x00, 0x72, 0x22, 0x64, (byte)0xC9, 0x04, 0x23,
-            (byte)0x8D, 0x3A, (byte)0xDB, (byte)0x96, 0x46, (byte)0xE9, 0x2A, (byte)0xC4,
-            0x18, (byte)0xFE, (byte)0xAC, (byte)0x94, 0x00, (byte)0xED, 0x07, 0x12,
-            (byte)0xC0, (byte)0x86, (byte)0xDC, (byte)0xC2, (byte)0xEF, 0x4C, (byte)0xA9, 0x2B
-        };
-
-    private final CFBBlockCipher cfbEngine;
-
-    private KeyParameter key;
-    private long         counter = 0;
-    private boolean      forEncryption;
-
-    public GCFBBlockCipher(BlockCipher engine)
-    {
-        super(engine);
-
-        this.cfbEngine = new CFBBlockCipher(engine, engine.getBlockSize() * 8);
-    }
-
-    public void init(boolean forEncryption, CipherParameters params)
-        throws IllegalArgumentException
-    {
-        counter = 0;
-        cfbEngine.init(forEncryption, params);
-
-        this.forEncryption = forEncryption;
-
-        if (params instanceof ParametersWithIV)
-        {
-            params = ((ParametersWithIV)params).getParameters();
-        }
-
-        if (params instanceof ParametersWithRandom)
-        {
-            params = ((ParametersWithRandom)params).getParameters();
-        }
-
-        if (params instanceof ParametersWithSBox)
-        {
-            params = ((ParametersWithSBox)params).getParameters();
-        }
-
-        key = (KeyParameter)params;
-    }
-
-    public String getAlgorithmName()
-    {
-        String name = cfbEngine.getAlgorithmName();
-        return name.substring(0, name.indexOf('/') - 1) + "/G" + name.substring(name.indexOf('/') + 1);
-    }
-
-    public int getBlockSize()
-    {
-        return cfbEngine.getBlockSize();
-    }
-
-    public int processBlock(byte[] in, int inOff, byte[] out, int outOff)
-        throws DataLengthException, IllegalStateException
-    {
-        this.processBytes(in, inOff, cfbEngine.getBlockSize(), out, outOff);
-
-        return cfbEngine.getBlockSize();
-    }
-
-    protected byte calculateByte(byte b)
-    {
-        if (counter > 0 && counter % 1024 == 0)
-        {
-            BlockCipher  base = cfbEngine.getUnderlyingCipher();
-
-            base.init(false, key);
-
-            byte[] nextKey = new byte[32];
-
-            base.processBlock(C, 0, nextKey, 0);
-            base.processBlock(C, 8, nextKey, 8);
-            base.processBlock(C, 16, nextKey, 16);
-            base.processBlock(C, 24, nextKey, 24);
-
-            key = new KeyParameter(nextKey);
-
-            base.init(true, key);
-
-            byte[] iv = cfbEngine.getCurrentIV();
-
-            base.processBlock(iv, 0, iv, 0);
-
-            cfbEngine.init(forEncryption, new ParametersWithIV(key, iv));
-        }
-
-        counter++;
-
-        return cfbEngine.calculateByte(b);
-    }
-
-    public void reset()
-    {
-        counter = 0;
-        cfbEngine.reset();
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/modes/GOFBBlockCipher.java b/bcprov/src/main/java/org/bouncycastle/crypto/modes/GOFBBlockCipher.java
deleted file mode 100644
index b025a1b..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/modes/GOFBBlockCipher.java
+++ /dev/null
@@ -1,228 +0,0 @@
-package org.bouncycastle.crypto.modes;
-
-import org.bouncycastle.crypto.BlockCipher;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.DataLengthException;
-import org.bouncycastle.crypto.StreamBlockCipher;
-import org.bouncycastle.crypto.params.ParametersWithIV;
-
-/**
- * implements the GOST 28147 OFB counter mode (GCTR).
- */
-public class GOFBBlockCipher
-    extends StreamBlockCipher
-{
-    private byte[]          IV;
-    private byte[]          ofbV;
-    private byte[]          ofbOutV;
-    private int             byteCount;
-
-    private final int             blockSize;
-    private final BlockCipher     cipher;
-
-    boolean firstStep = true;
-    int N3;
-    int N4;
-    static final int C1 = 16843012; //00000001000000010000000100000100
-    static final int C2 = 16843009; //00000001000000010000000100000001
-
-
-    /**
-     * Basic constructor.
-     *
-     * @param cipher the block cipher to be used as the basis of the
-     * counter mode (must have a 64 bit block size).
-     */
-    public GOFBBlockCipher(
-        BlockCipher cipher)
-    {
-        super(cipher);
-
-        this.cipher = cipher;
-        this.blockSize = cipher.getBlockSize();
-        
-        if (blockSize != 8)
-        {
-            throw new IllegalArgumentException("GCTR only for 64 bit block ciphers");
-        }
-
-        this.IV = new byte[cipher.getBlockSize()];
-        this.ofbV = new byte[cipher.getBlockSize()];
-        this.ofbOutV = new byte[cipher.getBlockSize()];
-    }
-
-    /**
-     * Initialise the cipher and, possibly, the initialisation vector (IV).
-     * If an IV isn't passed as part of the parameter, the IV will be all zeros.
-     * An IV which is too short is handled in FIPS compliant fashion.
-     *
-     * @param encrypting if true the cipher is initialised for
-     *  encryption, if false for decryption.
-     * @param params the key and other data required by the cipher.
-     * @exception IllegalArgumentException if the params argument is
-     * inappropriate.
-     */
-    public void init(
-        boolean             encrypting, //ignored by this CTR mode
-        CipherParameters    params)
-        throws IllegalArgumentException
-    {
-        firstStep = true;
-        N3 = 0;
-        N4 = 0;
-
-        if (params instanceof ParametersWithIV)
-        {
-            ParametersWithIV ivParam = (ParametersWithIV)params;
-            byte[] iv = ivParam.getIV();
-
-            if (iv.length < IV.length)
-            {
-                // prepend the supplied IV with zeros (per FIPS PUB 81)
-                System.arraycopy(iv, 0, IV, IV.length - iv.length, iv.length);
-                for (int i = 0; i < IV.length - iv.length; i++)
-                {
-                    IV[i] = 0;
-                }
-            }
-            else
-            {
-                System.arraycopy(iv, 0, IV, 0, IV.length);
-            }
-
-            reset();
-
-            // if params is null we reuse the current working key.
-            if (ivParam.getParameters() != null)
-            {
-                cipher.init(true, ivParam.getParameters());
-            }
-        }
-        else
-        {
-            reset();
-
-            // if params is null we reuse the current working key.
-            if (params != null)
-            {
-                cipher.init(true, params);
-            }
-        }
-    }
-
-    /**
-     * return the algorithm name and mode.
-     *
-     * @return the name of the underlying algorithm followed by "/GCTR"
-     * and the block size in bits
-     */
-    public String getAlgorithmName()
-    {
-        return cipher.getAlgorithmName() + "/GCTR";
-    }
-
-    /**
-     * return the block size we are operating at (in bytes).
-     *
-     * @return the block size we are operating at (in bytes).
-     */
-    public int getBlockSize()
-    {
-        return blockSize;
-    }
-
-    /**
-     * Process one block of input from the array in and write it to
-     * the out array.
-     *
-     * @param in the array containing the input data.
-     * @param inOff offset into the in array the data starts at.
-     * @param out the array the output data will be copied into.
-     * @param outOff the offset into the out array the output will start at.
-     * @exception DataLengthException if there isn't enough data in in, or
-     * space in out.
-     * @exception IllegalStateException if the cipher isn't initialised.
-     * @return the number of bytes processed and produced.
-     */
-    public int processBlock(
-        byte[]      in,
-        int         inOff,
-        byte[]      out,
-        int         outOff)
-        throws DataLengthException, IllegalStateException
-    {
-        processBytes(in, inOff, blockSize, out, outOff);
-
-        return blockSize;
-    }
-
-    /**
-     * reset the feedback vector back to the IV and reset the underlying
-     * cipher.
-     */
-    public void reset()
-    {
-        firstStep = true;
-        N3 = 0;
-        N4 = 0;
-        System.arraycopy(IV, 0, ofbV, 0, IV.length);
-        byteCount = 0;
-        cipher.reset();
-    }
-
-    //array of bytes to type int
-    private int bytesToint(
-        byte[]  in,
-        int     inOff)
-    {
-        return  ((in[inOff + 3] << 24) & 0xff000000) + ((in[inOff + 2] << 16) & 0xff0000) +
-                ((in[inOff + 1] << 8) & 0xff00) + (in[inOff] & 0xff);
-    }
-
-    //int to array of bytes
-    private void intTobytes(
-            int     num,
-            byte[]  out,
-            int     outOff)
-    {
-            out[outOff + 3] = (byte)(num >>> 24);
-            out[outOff + 2] = (byte)(num >>> 16);
-            out[outOff + 1] = (byte)(num >>> 8);
-            out[outOff] =     (byte)num;
-    }
-
-    protected byte calculateByte(byte b)
-    {
-        if (byteCount == 0)
-        {
-            if (firstStep)
-            {
-                firstStep = false;
-                cipher.processBlock(ofbV, 0, ofbOutV, 0);
-                N3 = bytesToint(ofbOutV, 0);
-                N4 = bytesToint(ofbOutV, 4);
-            }
-            N3 += C2;
-            N4 += C1;
-            intTobytes(N3, ofbV, 0);
-            intTobytes(N4, ofbV, 4);
-
-            cipher.processBlock(ofbV, 0, ofbOutV, 0);
-        }
-
-        byte rv = (byte)(ofbOutV[byteCount++] ^ b);
-
-        if (byteCount == blockSize)
-        {
-            byteCount = 0;
-
-            //
-            // change over the input block.
-            //
-            System.arraycopy(ofbV, blockSize, ofbV, 0, ofbV.length - blockSize);
-            System.arraycopy(ofbOutV, 0, ofbV, ofbV.length - blockSize, blockSize);
-        }
-
-        return rv;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/modes/NISTCTSBlockCipher.java b/bcprov/src/main/java/org/bouncycastle/crypto/modes/NISTCTSBlockCipher.java
deleted file mode 100644
index fe7bf97..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/modes/NISTCTSBlockCipher.java
+++ /dev/null
@@ -1,337 +0,0 @@
-/**
- * A Cipher Text Stealing (CTS) mode cipher. CTS allows block ciphers to
- * be used to produce cipher text which is the same length as the plain text.
- */
-package org.bouncycastle.crypto.modes;
-
-import org.bouncycastle.crypto.BlockCipher;
-import org.bouncycastle.crypto.BufferedBlockCipher;
-import org.bouncycastle.crypto.DataLengthException;
-import org.bouncycastle.crypto.InvalidCipherTextException;
-import org.bouncycastle.crypto.StreamBlockCipher;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.encoders.Hex;
-
-/**
- * A Cipher Text Stealing (CTS) mode cipher. CTS allows block ciphers to
- * be used to produce cipher text which is the same length as the plain text.
- * <p>
- *     This class implements the NIST version as documented in "Addendum to NIST SP 800-38A, Recommendation for Block Cipher Modes of Operation: Three Variants of Ciphertext Stealing for CBC Mode"
- * </p>
- */
-public class NISTCTSBlockCipher
-    extends BufferedBlockCipher
-{
-    public static final int CS1 = 1;
-    public static final int CS2 = 2;
-    public static final int CS3 = 3;
-
-    private final int type;
-    private final int blockSize;
-
-    /**
-     * Create a buffered block cipher that uses NIST Cipher Text Stealing
-     *
-     * @param type type of CTS mode (CS1, CS2, or CS3)
-     * @param cipher the underlying block cipher used to create the CBC block cipher this cipher uses..
-     */
-    public NISTCTSBlockCipher(
-        int type,
-        BlockCipher cipher)
-    {
-        this.type = type;
-        this.cipher = new CBCBlockCipher(cipher);
-
-        blockSize = cipher.getBlockSize();
-
-        buf = new byte[blockSize * 2];
-        bufOff = 0;
-    }
-
-    /**
-     * return the size of the output buffer required for an update
-     * an input of len bytes.
-     *
-     * @param len the length of the input.
-     * @return the space required to accommodate a call to update
-     * with len bytes of input.
-     */
-    public int getUpdateOutputSize(
-        int len)
-    {
-        int total       = len + bufOff;
-        int leftOver    = total % buf.length;
-
-        if (leftOver == 0)
-        {
-            return total - buf.length;
-        }
-
-        return total - leftOver;
-    }
-
-    /**
-     * return the size of the output buffer required for an update plus a
-     * doFinal with an input of len bytes.
-     *
-     * @param len the length of the input.
-     * @return the space required to accommodate a call to update and doFinal
-     * with len bytes of input.
-     */
-    public int getOutputSize(
-        int len)
-    {
-        return len + bufOff;
-    }
-
-    /**
-     * process a single byte, producing an output block if necessary.
-     *
-     * @param in the input byte.
-     * @param out the space for any output that might be produced.
-     * @param outOff the offset from which the output will be copied.
-     * @return the number of output bytes copied to out.
-     * @exception org.bouncycastle.crypto.DataLengthException if there isn't enough space in out.
-     * @exception IllegalStateException if the cipher isn't initialised.
-     */
-    public int processByte(
-        byte        in,
-        byte[]      out,
-        int         outOff)
-        throws DataLengthException, IllegalStateException
-    {
-        int         resultLen = 0;
-
-        if (bufOff == buf.length)
-        {
-            resultLen = cipher.processBlock(buf, 0, out, outOff);
-            System.arraycopy(buf, blockSize, buf, 0, blockSize);
-
-            bufOff = blockSize;
-        }
-
-        buf[bufOff++] = in;
-
-        return resultLen;
-    }
-
-    /**
-     * process an array of bytes, producing output if necessary.
-     *
-     * @param in the input byte array.
-     * @param inOff the offset at which the input data starts.
-     * @param len the number of bytes to be copied out of the input array.
-     * @param out the space for any output that might be produced.
-     * @param outOff the offset from which the output will be copied.
-     * @return the number of output bytes copied to out.
-     * @exception org.bouncycastle.crypto.DataLengthException if there isn't enough space in out.
-     * @exception IllegalStateException if the cipher isn't initialised.
-     */
-    public int processBytes(
-        byte[]      in,
-        int         inOff,
-        int         len,
-        byte[]      out,
-        int         outOff)
-        throws DataLengthException, IllegalStateException
-    {
-        if (len < 0)
-        {
-            throw new IllegalArgumentException("Can't have a negative input length!");
-        }
-
-        int blockSize   = getBlockSize();
-        int length      = getUpdateOutputSize(len);
-
-        if (length > 0)
-        {
-            if ((outOff + length) > out.length)
-            {
-                throw new DataLengthException("output buffer too short");
-            }
-        }
-
-        int resultLen = 0;
-        int gapLen = buf.length - bufOff;
-
-        if (len > gapLen)
-        {
-            System.arraycopy(in, inOff, buf, bufOff, gapLen);
-
-            resultLen += cipher.processBlock(buf, 0, out, outOff);
-            System.arraycopy(buf, blockSize, buf, 0, blockSize);
-
-            bufOff = blockSize;
-
-            len -= gapLen;
-            inOff += gapLen;
-
-            while (len > blockSize)
-            {
-                System.arraycopy(in, inOff, buf, bufOff, blockSize);
-                resultLen += cipher.processBlock(buf, 0, out, outOff + resultLen);
-                System.arraycopy(buf, blockSize, buf, 0, blockSize);
-
-                len -= blockSize;
-                inOff += blockSize;
-            }
-        }
-
-        System.arraycopy(in, inOff, buf, bufOff, len);
-
-        bufOff += len;
-
-        return resultLen;
-    }
-
-    /**
-     * Process the last block in the buffer.
-     *
-     * @param out the array the block currently being held is copied into.
-     * @param outOff the offset at which the copying starts.
-     * @return the number of output bytes copied to out.
-     * @exception org.bouncycastle.crypto.DataLengthException if there is insufficient space in out for
-     * the output.
-     * @exception IllegalStateException if the underlying cipher is not
-     * initialised.
-     * @exception org.bouncycastle.crypto.InvalidCipherTextException if cipher text decrypts wrongly (in
-     * case the exception will never get thrown).
-     */
-    public int doFinal(
-        byte[]  out,
-        int     outOff)
-        throws DataLengthException, IllegalStateException, InvalidCipherTextException
-    {
-        if (bufOff + outOff > out.length)
-        {
-            throw new DataLengthException("output buffer to small in doFinal");
-        }
-
-        int     blockSize = cipher.getBlockSize();
-        int     len = bufOff - blockSize;
-        byte[]  block = new byte[blockSize];
-
-        if (forEncryption)
-        {
-            if (bufOff < blockSize)
-            {
-                throw new DataLengthException("need at least one block of input for NISTCTS");
-            }
-
-            if (bufOff > blockSize)
-            {
-                byte[]  lastBlock = new byte[blockSize];
-
-                if (this.type == CS2 || this.type == CS3)
-                {
-                    cipher.processBlock(buf, 0, block, 0);
-
-                    System.arraycopy(buf, blockSize, lastBlock, 0, len);
-
-                    cipher.processBlock(lastBlock, 0, lastBlock, 0);
-
-                    if (this.type == CS2 && len == blockSize)
-                    {
-                        System.arraycopy(block, 0, out, outOff, blockSize);
-
-                        System.arraycopy(lastBlock, 0, out, outOff + blockSize, len);
-                    }
-                    else
-                    {
-                        System.arraycopy(lastBlock, 0, out, outOff, blockSize);
-
-                        System.arraycopy(block, 0, out, outOff + blockSize, len);
-                    }
-                }
-                else
-                {
-                    System.arraycopy(buf, 0, block, 0, blockSize);
-                    cipher.processBlock(block, 0, block, 0);
-                    System.arraycopy(block, 0, out, outOff, len);
-
-                    System.arraycopy(buf, bufOff - len, lastBlock, 0, len);
-                    cipher.processBlock(lastBlock, 0, lastBlock, 0);
-                    System.arraycopy(lastBlock, 0, out, outOff + len, blockSize);
-                }
-            }
-            else
-            {
-                cipher.processBlock(buf, 0, block, 0);
-
-                System.arraycopy(block, 0, out, outOff, blockSize);
-            }
-        }
-        else
-        {
-            if (bufOff < blockSize)
-            {
-                throw new DataLengthException("need at least one block of input for CTS");
-            }
-
-            byte[]  lastBlock = new byte[blockSize];
-
-            if (bufOff > blockSize)
-            {
-                if (this.type == CS3 || (this.type == CS2 && ((buf.length - bufOff) % blockSize) != 0))
-                {
-                    if (cipher instanceof CBCBlockCipher)
-                    {
-                        BlockCipher c = ((CBCBlockCipher)cipher).getUnderlyingCipher();
-
-                        c.processBlock(buf, 0, block, 0);
-                    }
-                    else
-                    {
-                        cipher.processBlock(buf, 0, block, 0);
-                    }
-
-                    for (int i = blockSize; i != bufOff; i++)
-                    {
-                        lastBlock[i - blockSize] = (byte)(block[i - blockSize] ^ buf[i]);
-                    }
-
-                    System.arraycopy(buf, blockSize, block, 0, len);
-
-                    cipher.processBlock(block, 0, out, outOff);
-                    System.arraycopy(lastBlock, 0, out, outOff + blockSize, len);
-                }
-                else
-                {
-                    BlockCipher c = ((CBCBlockCipher)cipher).getUnderlyingCipher();
-
-                    c.processBlock(buf, bufOff - blockSize, lastBlock, 0);
-
-                    System.arraycopy(buf, 0, block, 0, blockSize);
-
-                    if (len != blockSize)
-                    {
-                        System.arraycopy(lastBlock, len, block, len, blockSize - len);
-                    }
-
-                    cipher.processBlock(block, 0, block, 0);
-
-                    System.arraycopy(block, 0, out, outOff, blockSize);
-
-                    for (int i = 0; i != len; i++)
-                    {
-                        lastBlock[i] ^= buf[i];
-                    }
-
-                    System.arraycopy(lastBlock, 0, out, outOff + blockSize, len);
-                }
-            }
-            else
-            {
-                cipher.processBlock(buf, 0, block, 0);
-
-                System.arraycopy(block, 0, out, outOff, blockSize);
-            }
-        }
-
-        int offset = bufOff;
-
-        reset();
-
-        return offset;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/modes/OCBBlockCipher.java b/bcprov/src/main/java/org/bouncycastle/crypto/modes/OCBBlockCipher.java
deleted file mode 100644
index 8626391..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/modes/OCBBlockCipher.java
+++ /dev/null
@@ -1,598 +0,0 @@
-package org.bouncycastle.crypto.modes;
-
-import java.util.Vector;
-
-import org.bouncycastle.crypto.BlockCipher;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.DataLengthException;
-import org.bouncycastle.crypto.InvalidCipherTextException;
-import org.bouncycastle.crypto.OutputLengthException;
-import org.bouncycastle.crypto.params.AEADParameters;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.crypto.params.ParametersWithIV;
-import org.bouncycastle.util.Arrays;
-
-/**
- * An implementation of <a href="http://tools.ietf.org/html/rfc7253">RFC 7253 on The OCB
- * Authenticated-Encryption Algorithm</a>, licensed per:
- * <p>
- * <blockquote> <a href="http://www.cs.ucdavis.edu/~rogaway/ocb/license1.pdf">License for
- * Open-Source Software Implementations of OCB</a> (Jan 9, 2013) &mdash; &ldquo;License 1&rdquo; <br>
- * Under this license, you are authorized to make, use, and distribute open-source software
- * implementations of OCB. This license terminates for you if you sue someone over their open-source
- * software implementation of OCB claiming that you have a patent covering their implementation.
- * <p>
- * This is a non-binding summary of a legal document (the link above). The parameters of the license
- * are specified in the license document and that document is controlling. </blockquote>
- */
-public class OCBBlockCipher
-    implements AEADBlockCipher
-{
-    private static final int BLOCK_SIZE = 16;
-
-    private BlockCipher hashCipher;
-    private BlockCipher mainCipher;
-
-    /*
-     * CONFIGURATION
-     */
-    private boolean forEncryption;
-    private int macSize;
-    private byte[] initialAssociatedText;
-
-    /*
-     * KEY-DEPENDENT
-     */
-    // NOTE: elements are lazily calculated
-    private Vector L;
-    private byte[] L_Asterisk, L_Dollar;
-
-    /*
-     * NONCE-DEPENDENT
-     */
-    private byte[] KtopInput = null;
-    private byte[] Stretch = new byte[24];
-    private byte[] OffsetMAIN_0 = new byte[16];
-
-    /*
-     * PER-ENCRYPTION/DECRYPTION
-     */
-    private byte[] hashBlock, mainBlock;
-    private int hashBlockPos, mainBlockPos;
-    private long hashBlockCount, mainBlockCount;
-    private byte[] OffsetHASH;
-    private byte[] Sum;
-    private byte[] OffsetMAIN = new byte[16];
-    private byte[] Checksum;
-
-    // NOTE: The MAC value is preserved after doFinal
-    private byte[] macBlock;
-
-    public OCBBlockCipher(BlockCipher hashCipher, BlockCipher mainCipher)
-    {
-        if (hashCipher == null)
-        {
-            throw new IllegalArgumentException("'hashCipher' cannot be null");
-        }
-        if (hashCipher.getBlockSize() != BLOCK_SIZE)
-        {
-            throw new IllegalArgumentException("'hashCipher' must have a block size of "
-                + BLOCK_SIZE);
-        }
-        if (mainCipher == null)
-        {
-            throw new IllegalArgumentException("'mainCipher' cannot be null");
-        }
-        if (mainCipher.getBlockSize() != BLOCK_SIZE)
-        {
-            throw new IllegalArgumentException("'mainCipher' must have a block size of "
-                + BLOCK_SIZE);
-        }
-
-        if (!hashCipher.getAlgorithmName().equals(mainCipher.getAlgorithmName()))
-        {
-            throw new IllegalArgumentException(
-                "'hashCipher' and 'mainCipher' must be the same algorithm");
-        }
-
-        this.hashCipher = hashCipher;
-        this.mainCipher = mainCipher;
-    }
-
-    public BlockCipher getUnderlyingCipher()
-    {
-        return mainCipher;
-    }
-
-    public String getAlgorithmName()
-    {
-        return mainCipher.getAlgorithmName() + "/OCB";
-    }
-
-    public void init(boolean forEncryption, CipherParameters parameters)
-        throws IllegalArgumentException
-    {
-        boolean oldForEncryption = this.forEncryption;
-        this.forEncryption = forEncryption;
-        this.macBlock = null;
-
-        KeyParameter keyParameter;
-
-        byte[] N;
-        if (parameters instanceof AEADParameters)
-        {
-            AEADParameters aeadParameters = (AEADParameters)parameters;
-
-            N = aeadParameters.getNonce();
-            initialAssociatedText = aeadParameters.getAssociatedText();
-
-            int macSizeBits = aeadParameters.getMacSize();
-            if (macSizeBits < 64 || macSizeBits > 128 || macSizeBits % 8 != 0)
-            {
-                throw new IllegalArgumentException("Invalid value for MAC size: " + macSizeBits);
-            }
-
-            macSize = macSizeBits / 8;
-            keyParameter = aeadParameters.getKey();
-        }
-        else if (parameters instanceof ParametersWithIV)
-        {
-            ParametersWithIV parametersWithIV = (ParametersWithIV)parameters;
-
-            N = parametersWithIV.getIV();
-            initialAssociatedText = null;
-            macSize = 16;
-            keyParameter = (KeyParameter)parametersWithIV.getParameters();
-        }
-        else
-        {
-            throw new IllegalArgumentException("invalid parameters passed to OCB");
-        }
-
-        this.hashBlock = new byte[16];
-        this.mainBlock = new byte[forEncryption ? BLOCK_SIZE : (BLOCK_SIZE + macSize)];
-
-        if (N == null)
-        {
-            N = new byte[0];
-        }
-
-        if (N.length > 15)
-        {
-            throw new IllegalArgumentException("IV must be no more than 15 bytes");
-        }
-
-        /*
-         * KEY-DEPENDENT INITIALISATION
-         */
-
-        if (keyParameter != null)
-        {
-            // hashCipher always used in forward mode
-            hashCipher.init(true, keyParameter);
-            mainCipher.init(forEncryption, keyParameter);
-            KtopInput = null;
-        }
-        else if (oldForEncryption != forEncryption)
-        {
-            throw new IllegalArgumentException("cannot change encrypting state without providing key.");
-        }
-
-        this.L_Asterisk = new byte[16];
-        hashCipher.processBlock(L_Asterisk, 0, L_Asterisk, 0);
-
-        this.L_Dollar = OCB_double(L_Asterisk);
-
-        this.L = new Vector();
-        this.L.addElement(OCB_double(L_Dollar));
-
-        /*
-         * NONCE-DEPENDENT AND PER-ENCRYPTION/DECRYPTION INITIALISATION
-         */
-
-        int bottom = processNonce(N);
-
-        int bits = bottom % 8, bytes = bottom / 8;
-        if (bits == 0)
-        {
-            System.arraycopy(Stretch, bytes, OffsetMAIN_0, 0, 16);
-        }
-        else
-        {
-            for (int i = 0; i < 16; ++i)
-            {
-                int b1 = Stretch[bytes] & 0xff;
-                int b2 = Stretch[++bytes] & 0xff;
-                this.OffsetMAIN_0[i] = (byte)((b1 << bits) | (b2 >>> (8 - bits)));
-            }
-        }
-
-        this.hashBlockPos = 0;
-        this.mainBlockPos = 0;
-
-        this.hashBlockCount = 0;
-        this.mainBlockCount = 0;
-
-        this.OffsetHASH = new byte[16];
-        this.Sum = new byte[16];
-        System.arraycopy(this.OffsetMAIN_0, 0, this.OffsetMAIN, 0, 16);
-        this.Checksum = new byte[16];
-
-        if (initialAssociatedText != null)
-        {
-            processAADBytes(initialAssociatedText, 0, initialAssociatedText.length);
-        }
-    }
-
-    protected int processNonce(byte[] N)
-    {
-        byte[] nonce = new byte[16];
-        System.arraycopy(N, 0, nonce, nonce.length - N.length, N.length);
-        nonce[0] = (byte)(macSize << 4);
-        nonce[15 - N.length] |= 1;
-
-        int bottom = nonce[15] & 0x3F;
-        nonce[15] &= 0xC0;
-
-        /*
-         * When used with incrementing nonces, the cipher is only applied once every 64 inits.
-         */
-        if (KtopInput == null || !Arrays.areEqual(nonce, KtopInput))
-        {
-            byte[] Ktop = new byte[16];
-            KtopInput = nonce;
-            hashCipher.processBlock(KtopInput, 0, Ktop, 0);
-            System.arraycopy(Ktop, 0, Stretch, 0, 16);
-            for (int i = 0; i < 8; ++i)
-            {
-                Stretch[16 + i] = (byte)(Ktop[i] ^ Ktop[i + 1]);
-            }
-        }
-
-        return bottom;
-    }
-
-    public byte[] getMac()
-    {
-        return Arrays.clone(macBlock);
-    }
-
-    public int getOutputSize(int len)
-    {
-        int totalData = len + mainBlockPos;
-        if (forEncryption)
-        {
-            return totalData + macSize;
-        }
-        return totalData < macSize ? 0 : totalData - macSize;
-    }
-
-    public int getUpdateOutputSize(int len)
-    {
-        int totalData = len + mainBlockPos;
-        if (!forEncryption)
-        {
-            if (totalData < macSize)
-            {
-                return 0;
-            }
-            totalData -= macSize;
-        }
-        return totalData - totalData % BLOCK_SIZE;
-    }
-
-    public void processAADByte(byte input)
-    {
-        hashBlock[hashBlockPos] = input;
-        if (++hashBlockPos == hashBlock.length)
-        {
-            processHashBlock();
-        }
-    }
-
-    public void processAADBytes(byte[] input, int off, int len)
-    {
-        for (int i = 0; i < len; ++i)
-        {
-            hashBlock[hashBlockPos] = input[off + i];
-            if (++hashBlockPos == hashBlock.length)
-            {
-                processHashBlock();
-            }
-        }
-    }
-
-    public int processByte(byte input, byte[] output, int outOff)
-        throws DataLengthException
-    {
-        mainBlock[mainBlockPos] = input;
-        if (++mainBlockPos == mainBlock.length)
-        {
-            processMainBlock(output, outOff);
-            return BLOCK_SIZE;
-        }
-        return 0;
-    }
-
-    public int processBytes(byte[] input, int inOff, int len, byte[] output, int outOff)
-        throws DataLengthException
-    {
-        if (input.length < (inOff + len))
-        {
-            throw new DataLengthException("Input buffer too short");
-        }
-        int resultLen = 0;
-
-        for (int i = 0; i < len; ++i)
-        {
-            mainBlock[mainBlockPos] = input[inOff + i];
-            if (++mainBlockPos == mainBlock.length)
-            {
-                processMainBlock(output, outOff + resultLen);
-                resultLen += BLOCK_SIZE;
-            }
-        }
-
-        return resultLen;
-    }
-
-    public int doFinal(byte[] output, int outOff)
-        throws IllegalStateException,
-        InvalidCipherTextException
-    {
-        /*
-         * For decryption, get the tag from the end of the message
-         */
-        byte[] tag = null;
-        if (!forEncryption)
-        {
-            if (mainBlockPos < macSize)
-            {
-                throw new InvalidCipherTextException("data too short");
-            }
-            mainBlockPos -= macSize;
-            tag = new byte[macSize];
-            System.arraycopy(mainBlock, mainBlockPos, tag, 0, macSize);
-        }
-
-        /*
-         * HASH: Process any final partial block; compute final hash value
-         */
-        if (hashBlockPos > 0)
-        {
-            OCB_extend(hashBlock, hashBlockPos);
-            updateHASH(L_Asterisk);
-        }
-
-        /*
-         * OCB-ENCRYPT/OCB-DECRYPT: Process any final partial block
-         */
-        if (mainBlockPos > 0)
-        {
-            if (forEncryption)
-            {
-                OCB_extend(mainBlock, mainBlockPos);
-                xor(Checksum, mainBlock);
-            }
-
-            xor(OffsetMAIN, L_Asterisk);
-
-            byte[] Pad = new byte[16];
-            hashCipher.processBlock(OffsetMAIN, 0, Pad, 0);
-
-            xor(mainBlock, Pad);
-
-            if (output.length < (outOff + mainBlockPos))
-            {
-                throw new OutputLengthException("Output buffer too short");
-            }
-            System.arraycopy(mainBlock, 0, output, outOff, mainBlockPos);
-
-            if (!forEncryption)
-            {
-                OCB_extend(mainBlock, mainBlockPos);
-                xor(Checksum, mainBlock);
-            }
-        }
-
-        /*
-         * OCB-ENCRYPT/OCB-DECRYPT: Compute raw tag
-         */
-        xor(Checksum, OffsetMAIN);
-        xor(Checksum, L_Dollar);
-        hashCipher.processBlock(Checksum, 0, Checksum, 0);
-        xor(Checksum, Sum);
-
-        this.macBlock = new byte[macSize];
-        System.arraycopy(Checksum, 0, macBlock, 0, macSize);
-
-        /*
-         * Validate or append tag and reset this cipher for the next run
-         */
-        int resultLen = mainBlockPos;
-
-        if (forEncryption)
-        {
-            if (output.length < (outOff + resultLen + macSize))
-            {
-                throw new OutputLengthException("Output buffer too short");
-            }
-            // Append tag to the message
-            System.arraycopy(macBlock, 0, output, outOff + resultLen, macSize);
-            resultLen += macSize;
-        }
-        else
-        {
-            // Compare the tag from the message with the calculated one
-            if (!Arrays.constantTimeAreEqual(macBlock, tag))
-            {
-                throw new InvalidCipherTextException("mac check in OCB failed");
-            }
-        }
-
-        reset(false);
-
-        return resultLen;
-    }
-
-    public void reset()
-    {
-        reset(true);
-    }
-
-    protected void clear(byte[] bs)
-    {
-        if (bs != null)
-        {
-            Arrays.fill(bs, (byte)0);
-        }
-    }
-
-    protected byte[] getLSub(int n)
-    {
-        while (n >= L.size())
-        {
-            L.addElement(OCB_double((byte[])L.lastElement()));
-        }
-        return (byte[])L.elementAt(n);
-    }
-
-    protected void processHashBlock()
-    {
-        /*
-         * HASH: Process any whole blocks
-         */
-        updateHASH(getLSub(OCB_ntz(++hashBlockCount)));
-        hashBlockPos = 0;
-    }
-
-    protected void processMainBlock(byte[] output, int outOff)
-    {
-        if (output.length < (outOff + BLOCK_SIZE))
-        {
-            throw new OutputLengthException("Output buffer too short");
-        }
-
-        /*
-         * OCB-ENCRYPT/OCB-DECRYPT: Process any whole blocks
-         */
-
-        if (forEncryption)
-        {
-            xor(Checksum, mainBlock);
-            mainBlockPos = 0;
-        }
-
-        xor(OffsetMAIN, getLSub(OCB_ntz(++mainBlockCount)));
-
-        xor(mainBlock, OffsetMAIN);
-        mainCipher.processBlock(mainBlock, 0, mainBlock, 0);
-        xor(mainBlock, OffsetMAIN);
-
-        System.arraycopy(mainBlock, 0, output, outOff, 16);
-
-        if (!forEncryption)
-        {
-            xor(Checksum, mainBlock);
-            System.arraycopy(mainBlock, BLOCK_SIZE, mainBlock, 0, macSize);
-            mainBlockPos = macSize;
-        }
-    }
-
-    protected void reset(boolean clearMac)
-    {
-        hashCipher.reset();
-        mainCipher.reset();
-
-        clear(hashBlock);
-        clear(mainBlock);
-
-        hashBlockPos = 0;
-        mainBlockPos = 0;
-
-        hashBlockCount = 0;
-        mainBlockCount = 0;
-
-        clear(OffsetHASH);
-        clear(Sum);
-        System.arraycopy(OffsetMAIN_0, 0, OffsetMAIN, 0, 16);
-        clear(Checksum);
-
-        if (clearMac)
-        {
-            macBlock = null;
-        }
-
-        if (initialAssociatedText != null)
-        {
-            processAADBytes(initialAssociatedText, 0, initialAssociatedText.length);
-        }
-    }
-
-    protected void updateHASH(byte[] LSub)
-    {
-        xor(OffsetHASH, LSub);
-        xor(hashBlock, OffsetHASH);
-        hashCipher.processBlock(hashBlock, 0, hashBlock, 0);
-        xor(Sum, hashBlock);
-    }
-
-    protected static byte[] OCB_double(byte[] block)
-    {
-        byte[] result = new byte[16];
-        int carry = shiftLeft(block, result);
-
-        /*
-         * NOTE: This construction is an attempt at a constant-time implementation.
-         */
-        result[15] ^= (0x87 >>> ((1 - carry) << 3));
-
-        return result;
-    }
-
-    protected static void OCB_extend(byte[] block, int pos)
-    {
-        block[pos] = (byte)0x80;
-        while (++pos < 16)
-        {
-            block[pos] = 0;
-        }
-    }
-
-    protected static int OCB_ntz(long x)
-    {
-        if (x == 0)
-        {
-            return 64;
-        }
-
-        int n = 0;
-        while ((x & 1L) == 0L)
-        {
-            ++n;
-            x >>>= 1;
-        }
-        return n;
-    }
-
-    protected static int shiftLeft(byte[] block, byte[] output)
-    {
-        int i = 16;
-        int bit = 0;
-        while (--i >= 0)
-        {
-            int b = block[i] & 0xff;
-            output[i] = (byte)((b << 1) | bit);
-            bit = (b >>> 7) & 1;
-        }
-        return bit;
-    }
-
-    protected static void xor(byte[] block, byte[] val)
-    {
-        for (int i = 15; i >= 0; --i)
-        {
-            block[i] ^= val[i];
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/modes/OldCTSBlockCipher.java b/bcprov/src/main/java/org/bouncycastle/crypto/modes/OldCTSBlockCipher.java
deleted file mode 100644
index b34432a..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/modes/OldCTSBlockCipher.java
+++ /dev/null
@@ -1,269 +0,0 @@
-package org.bouncycastle.crypto.modes;
-
-import org.bouncycastle.crypto.BlockCipher;
-import org.bouncycastle.crypto.BufferedBlockCipher;
-import org.bouncycastle.crypto.DataLengthException;
-import org.bouncycastle.crypto.InvalidCipherTextException;
-
-/**
- * A Cipher Text Stealing (CTS) mode cipher. CTS allows block ciphers to
- * be used to produce cipher text which is the same length as the plain text.
- * <p>
- * This version applies the CTS algorithm from one block up, rather than following the errata update issued in 2004, where CTS mode is applied
- * from greater than 1 block up and the first block is processed using CBC mode.
- * </p>
- */
-public class OldCTSBlockCipher
-    extends BufferedBlockCipher
-{
-    private int     blockSize;
-
-    /**
-     * Create a buffered block cipher that uses Cipher Text Stealing
-     *
-     * @param cipher the underlying block cipher this buffering object wraps.
-     */
-    public OldCTSBlockCipher(
-        BlockCipher cipher)
-    {
-        if ((cipher instanceof OFBBlockCipher) || (cipher instanceof CFBBlockCipher))
-        {
-            throw new IllegalArgumentException("CTSBlockCipher can only accept ECB, or CBC ciphers");
-        }
-
-        this.cipher = cipher;
-
-        blockSize = cipher.getBlockSize();
-
-        buf = new byte[blockSize * 2];
-        bufOff = 0;
-    }
-
-    /**
-     * return the size of the output buffer required for an update
-     * an input of len bytes.
-     *
-     * @param len the length of the input.
-     * @return the space required to accommodate a call to update
-     * with len bytes of input.
-     */
-    public int getUpdateOutputSize(
-        int len)
-    {
-        int total       = len + bufOff;
-        int leftOver    = total % buf.length;
-
-        if (leftOver == 0)
-        {
-            return total - buf.length;
-        }
-
-        return total - leftOver;
-    }
-
-    /**
-     * return the size of the output buffer required for an update plus a
-     * doFinal with an input of len bytes.
-     *
-     * @param len the length of the input.
-     * @return the space required to accommodate a call to update and doFinal
-     * with len bytes of input.
-     */
-    public int getOutputSize(
-        int len)
-    {
-        return len + bufOff;
-    }
-
-    /**
-     * process a single byte, producing an output block if necessary.
-     *
-     * @param in the input byte.
-     * @param out the space for any output that might be produced.
-     * @param outOff the offset from which the output will be copied.
-     * @return the number of output bytes copied to out.
-     * @exception org.bouncycastle.crypto.DataLengthException if there isn't enough space in out.
-     * @exception IllegalStateException if the cipher isn't initialised.
-     */
-    public int processByte(
-        byte        in,
-        byte[]      out,
-        int         outOff)
-        throws DataLengthException, IllegalStateException
-    {
-        int         resultLen = 0;
-
-        if (bufOff == buf.length)
-        {
-            resultLen = cipher.processBlock(buf, 0, out, outOff);
-            System.arraycopy(buf, blockSize, buf, 0, blockSize);
-
-            bufOff = blockSize;
-        }
-
-        buf[bufOff++] = in;
-
-        return resultLen;
-    }
-
-    /**
-     * process an array of bytes, producing output if necessary.
-     *
-     * @param in the input byte array.
-     * @param inOff the offset at which the input data starts.
-     * @param len the number of bytes to be copied out of the input array.
-     * @param out the space for any output that might be produced.
-     * @param outOff the offset from which the output will be copied.
-     * @return the number of output bytes copied to out.
-     * @exception org.bouncycastle.crypto.DataLengthException if there isn't enough space in out.
-     * @exception IllegalStateException if the cipher isn't initialised.
-     */
-    public int processBytes(
-        byte[]      in,
-        int         inOff,
-        int         len,
-        byte[]      out,
-        int         outOff)
-        throws DataLengthException, IllegalStateException
-    {
-        if (len < 0)
-        {
-            throw new IllegalArgumentException("Can't have a negative input length!");
-        }
-
-        int blockSize   = getBlockSize();
-        int length      = getUpdateOutputSize(len);
-
-        if (length > 0)
-        {
-            if ((outOff + length) > out.length)
-            {
-                throw new DataLengthException("output buffer too short");
-            }
-        }
-
-        int resultLen = 0;
-        int gapLen = buf.length - bufOff;
-
-        if (len > gapLen)
-        {
-            System.arraycopy(in, inOff, buf, bufOff, gapLen);
-
-            resultLen += cipher.processBlock(buf, 0, out, outOff);
-            System.arraycopy(buf, blockSize, buf, 0, blockSize);
-
-            bufOff = blockSize;
-
-            len -= gapLen;
-            inOff += gapLen;
-
-            while (len > blockSize)
-            {
-                System.arraycopy(in, inOff, buf, bufOff, blockSize);
-                resultLen += cipher.processBlock(buf, 0, out, outOff + resultLen);
-                System.arraycopy(buf, blockSize, buf, 0, blockSize);
-
-                len -= blockSize;
-                inOff += blockSize;
-            }
-        }
-
-        System.arraycopy(in, inOff, buf, bufOff, len);
-
-        bufOff += len;
-
-        return resultLen;
-    }
-
-    /**
-     * Process the last block in the buffer.
-     *
-     * @param out the array the block currently being held is copied into.
-     * @param outOff the offset at which the copying starts.
-     * @return the number of output bytes copied to out.
-     * @exception org.bouncycastle.crypto.DataLengthException if there is insufficient space in out for
-     * the output.
-     * @exception IllegalStateException if the underlying cipher is not
-     * initialised.
-     * @exception org.bouncycastle.crypto.InvalidCipherTextException if cipher text decrypts wrongly (in
-     * case the exception will never get thrown).
-     */
-    public int doFinal(
-        byte[]  out,
-        int     outOff)
-        throws DataLengthException, IllegalStateException, InvalidCipherTextException
-    {
-        if (bufOff + outOff > out.length)
-        {
-            throw new DataLengthException("output buffer to small in doFinal");
-        }
-
-        int     blockSize = cipher.getBlockSize();
-        int     len = bufOff - blockSize;
-        byte[]  block = new byte[blockSize];
-
-        if (forEncryption)
-        {
-            cipher.processBlock(buf, 0, block, 0);
-            
-            if (bufOff < blockSize)
-            {
-                throw new DataLengthException("need at least one block of input for CTS");
-            }
-
-            for (int i = bufOff; i != buf.length; i++)
-            {
-                buf[i] = block[i - blockSize];
-            }
-
-            for (int i = blockSize; i != bufOff; i++)
-            {
-                buf[i] ^= block[i - blockSize];
-            }
-
-            if (cipher instanceof CBCBlockCipher)
-            {
-                BlockCipher c = ((CBCBlockCipher)cipher).getUnderlyingCipher();
-
-                c.processBlock(buf, blockSize, out, outOff);
-            }
-            else
-            {
-                cipher.processBlock(buf, blockSize, out, outOff);
-            }
-
-            System.arraycopy(block, 0, out, outOff + blockSize, len);
-        }
-        else
-        {
-            byte[]  lastBlock = new byte[blockSize];
-
-            if (cipher instanceof CBCBlockCipher)
-            {
-                BlockCipher c = ((CBCBlockCipher)cipher).getUnderlyingCipher();
-
-                c.processBlock(buf, 0, block, 0);
-            }
-            else
-            {
-                cipher.processBlock(buf, 0, block, 0);
-            }
-
-            for (int i = blockSize; i != bufOff; i++)
-            {
-                lastBlock[i - blockSize] = (byte)(block[i - blockSize] ^ buf[i]);
-            }
-
-            System.arraycopy(buf, blockSize, block, 0, len);
-
-            cipher.processBlock(block, 0, out, outOff);
-            System.arraycopy(lastBlock, 0, out, outOff + blockSize, len);
-        }
-
-        int offset = bufOff;
-
-        reset();
-
-        return offset;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/modes/OpenPGPCFBBlockCipher.java b/bcprov/src/main/java/org/bouncycastle/crypto/modes/OpenPGPCFBBlockCipher.java
deleted file mode 100644
index e48731b..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/modes/OpenPGPCFBBlockCipher.java
+++ /dev/null
@@ -1,312 +0,0 @@
-package org.bouncycastle.crypto.modes;
-
-import org.bouncycastle.crypto.BlockCipher;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.DataLengthException;
-
-/**
- * Implements OpenPGP's rather strange version of Cipher-FeedBack (CFB) mode
- * on top of a simple cipher. This class assumes the IV has been prepended
- * to the data stream already, and just accomodates the reset after
- * (blockSize + 2) bytes have been read.
- * <p>
- * For further info see <a href="http://www.ietf.org/rfc/rfc2440.html">RFC 2440</a>.
- */
-public class OpenPGPCFBBlockCipher
-    implements BlockCipher
-{
-    private byte[] IV;
-    private byte[] FR;
-    private byte[] FRE;
-
-    private BlockCipher cipher;
-
-    private int count;
-    private int blockSize;
-    private boolean forEncryption;
-    
-    /**
-     * Basic constructor.
-     *
-     * @param cipher the block cipher to be used as the basis of the
-     * feedback mode.
-     */
-    public OpenPGPCFBBlockCipher(
-        BlockCipher cipher)
-    {
-        this.cipher = cipher;
-
-        this.blockSize = cipher.getBlockSize();
-        this.IV = new byte[blockSize];
-        this.FR = new byte[blockSize];
-        this.FRE = new byte[blockSize];
-    }
-
-    /**
-     * return the underlying block cipher that we are wrapping.
-     *
-     * @return the underlying block cipher that we are wrapping.
-     */
-    public BlockCipher getUnderlyingCipher()
-    {
-        return cipher;
-    }
-    
-    /**
-     * return the algorithm name and mode.
-     *
-     * @return the name of the underlying algorithm followed by "/PGPCFB"
-     * and the block size in bits.
-     */
-    public String getAlgorithmName()
-    {
-        return cipher.getAlgorithmName() + "/OpenPGPCFB";
-    }
-    
-    /**
-     * return the block size we are operating at.
-     *
-     * @return the block size we are operating at (in bytes).
-     */
-    public int getBlockSize()
-    {
-        return cipher.getBlockSize();
-    }
-
-    /**
-     * Process one block of input from the array in and write it to
-     * the out array.
-     *
-     * @param in the array containing the input data.
-     * @param inOff offset into the in array the data starts at.
-     * @param out the array the output data will be copied into.
-     * @param outOff the offset into the out array the output will start at.
-     * @exception DataLengthException if there isn't enough data in in, or
-     * space in out.
-     * @exception IllegalStateException if the cipher isn't initialised.
-     * @return the number of bytes processed and produced.
-     */
-    public int processBlock(
-        byte[] in,
-        int inOff,
-        byte[] out,
-        int outOff)
-        throws DataLengthException, IllegalStateException
-    {
-        return (forEncryption) ? encryptBlock(in, inOff, out, outOff) : decryptBlock(in, inOff, out, outOff);
-    }
-    
-    /**
-     * reset the chaining vector back to the IV and reset the underlying
-     * cipher.
-     */
-    public void reset()
-    {
-        count = 0;
-
-        System.arraycopy(IV, 0, FR, 0, FR.length);
-
-        cipher.reset();
-    }
-
-    /**
-     * Initialise the cipher and, possibly, the initialisation vector (IV).
-     * If an IV isn't passed as part of the parameter, the IV will be all zeros.
-     * An IV which is too short is handled in FIPS compliant fashion.
-     *
-     * @param forEncryption if true the cipher is initialised for
-     *  encryption, if false for decryption.
-     * @param params the key and other data required by the cipher.
-     * @exception IllegalArgumentException if the params argument is
-     * inappropriate.
-     */
-    public void init(
-        boolean forEncryption,
-        CipherParameters params)
-        throws IllegalArgumentException
-    {
-        this.forEncryption = forEncryption;
-     
-        reset();
-
-        cipher.init(true, params);
-    }
-    
-    /**
-     * Encrypt one byte of data according to CFB mode.
-     * @param data the byte to encrypt
-     * @param blockOff offset in the current block
-     * @return the encrypted byte
-     */
-    private byte encryptByte(byte data, int blockOff)
-    {
-        return (byte)(FRE[blockOff] ^ data);
-    }
-    
-    /**
-     * Do the appropriate processing for CFB IV mode encryption.
-     *
-     * @param in the array containing the data to be encrypted.
-     * @param inOff offset into the in array the data starts at.
-     * @param out the array the encrypted data will be copied into.
-     * @param outOff the offset into the out array the output will start at.
-     * @exception DataLengthException if there isn't enough data in in, or
-     * space in out.
-     * @exception IllegalStateException if the cipher isn't initialised.
-     * @return the number of bytes processed and produced.
-     */
-    private int encryptBlock(
-        byte[] in,
-        int inOff,
-        byte[] out,
-        int outOff)
-        throws DataLengthException, IllegalStateException
-    {
-        if ((inOff + blockSize) > in.length)
-        {
-            throw new DataLengthException("input buffer too short");
-        }
-
-        if ((outOff + blockSize) > out.length)
-        {
-            throw new DataLengthException("output buffer too short");
-        }
-        
-        if (count > blockSize)
-        {
-            FR[blockSize - 2] = out[outOff] = encryptByte(in[inOff], blockSize - 2);
-            FR[blockSize - 1] = out[outOff + 1] = encryptByte(in[inOff + 1], blockSize - 1);
-
-            cipher.processBlock(FR, 0, FRE, 0);
-
-            for (int n = 2; n < blockSize; n++) 
-            {
-                FR[n - 2] = out[outOff + n] = encryptByte(in[inOff + n], n - 2);
-            }
-        }
-        else if (count == 0)
-        {
-            cipher.processBlock(FR, 0, FRE, 0);
-
-            for (int n = 0; n < blockSize; n++) 
-            {
-                FR[n] = out[outOff + n] = encryptByte(in[inOff + n], n);
-            }
-            
-            count += blockSize;
-        }
-        else if (count == blockSize)
-        {
-            cipher.processBlock(FR, 0, FRE, 0);
-
-            out[outOff] = encryptByte(in[inOff], 0);
-            out[outOff + 1] = encryptByte(in[inOff + 1], 1);
-
-            //
-            // do reset
-            //
-            System.arraycopy(FR, 2, FR, 0, blockSize - 2);
-            System.arraycopy(out, outOff, FR, blockSize - 2, 2);
-
-            cipher.processBlock(FR, 0, FRE, 0);
-
-            for (int n = 2; n < blockSize; n++) 
-            {
-                FR[n - 2] = out[outOff + n] = encryptByte(in[inOff + n], n - 2);
-            }
-
-            count += blockSize;
-        }
-        
-        return blockSize;
-    }
-
-    /**
-     * Do the appropriate processing for CFB IV mode decryption.
-     *
-     * @param in the array containing the data to be decrypted.
-     * @param inOff offset into the in array the data starts at.
-     * @param out the array the encrypted data will be copied into.
-     * @param outOff the offset into the out array the output will start at.
-     * @exception DataLengthException if there isn't enough data in in, or
-     * space in out.
-     * @exception IllegalStateException if the cipher isn't initialised.
-     * @return the number of bytes processed and produced.
-     */
-    private int decryptBlock(
-        byte[] in,
-        int inOff,
-        byte[] out,
-        int outOff)
-        throws DataLengthException, IllegalStateException
-    {
-        if ((inOff + blockSize) > in.length)
-        {
-            throw new DataLengthException("input buffer too short");
-        }
-
-        if ((outOff + blockSize) > out.length)
-        {
-            throw new DataLengthException("output buffer too short");
-        }
-        
-        if (count > blockSize)
-        {
-            byte inVal = in[inOff];
-            FR[blockSize - 2] = inVal;
-            out[outOff] = encryptByte(inVal, blockSize - 2);
-
-            inVal = in[inOff + 1];
-            FR[blockSize - 1] = inVal;
-            out[outOff + 1] = encryptByte(inVal, blockSize - 1);
-
-            cipher.processBlock(FR, 0, FRE, 0);
-            
-            for (int n = 2; n < blockSize; n++) 
-            {
-                inVal = in[inOff + n];
-                FR[n - 2] = inVal;
-                out[outOff + n] = encryptByte(inVal, n - 2);
-            }
-        } 
-        else if (count == 0)
-        {
-            cipher.processBlock(FR, 0, FRE, 0);
-            
-            for (int n = 0; n < blockSize; n++) 
-            {
-                FR[n] = in[inOff + n];
-                out[n] = encryptByte(in[inOff + n], n);
-            }
-            
-            count += blockSize;
-        }
-        else if (count == blockSize)
-        {
-            cipher.processBlock(FR, 0, FRE, 0);
-
-            byte inVal1 = in[inOff];
-            byte inVal2 = in[inOff + 1];
-            out[outOff    ] = encryptByte(inVal1, 0);
-            out[outOff + 1] = encryptByte(inVal2, 1);
-            
-            System.arraycopy(FR, 2, FR, 0, blockSize - 2);
-
-            FR[blockSize - 2] = inVal1;
-            FR[blockSize - 1] = inVal2;
-
-            cipher.processBlock(FR, 0, FRE, 0);
-
-            for (int n = 2; n < blockSize; n++) 
-            {
-                byte inVal = in[inOff + n];
-                FR[n - 2] = inVal;
-                out[outOff + n] = encryptByte(inVal, n - 2);
-            }
-
-            count += blockSize;
-        }
-        
-        return blockSize;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/modes/PGPCFBBlockCipher.java b/bcprov/src/main/java/org/bouncycastle/crypto/modes/PGPCFBBlockCipher.java
deleted file mode 100644
index 4dee63a..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/modes/PGPCFBBlockCipher.java
+++ /dev/null
@@ -1,455 +0,0 @@
-package org.bouncycastle.crypto.modes;
-
-import org.bouncycastle.crypto.BlockCipher;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.DataLengthException;
-import org.bouncycastle.crypto.params.ParametersWithIV;
-
-/**
- * Implements OpenPGP's rather strange version of Cipher-FeedBack (CFB) mode on top of a simple cipher. For further info see <a href="http://www.ietf.org/rfc/rfc2440.html">RFC 2440</a>.
- */
-public class PGPCFBBlockCipher
-    implements BlockCipher
-{
-    private byte[] IV;
-    private byte[] FR;
-    private byte[] FRE;
-    private byte[] tmp;
-
-    private BlockCipher cipher;
-
-    private int count;
-    private int blockSize;
-    private boolean forEncryption;
-    
-    private boolean inlineIv; // if false we don't need to prepend an IV
-
-    /**
-     * Basic constructor.
-     *
-     * @param cipher the block cipher to be used as the basis of the
-     * feedback mode.
-     * @param inlineIv if true this is for PGP CFB with a prepended iv.
-     */
-    public PGPCFBBlockCipher(
-        BlockCipher cipher,
-        boolean     inlineIv)
-    {
-        this.cipher = cipher;
-        this.inlineIv = inlineIv;
-
-        this.blockSize = cipher.getBlockSize();
-        this.IV = new byte[blockSize];
-        this.FR = new byte[blockSize];
-        this.FRE = new byte[blockSize];
-        this.tmp = new byte[blockSize];
-    }
-
-    /**
-     * return the underlying block cipher that we are wrapping.
-     *
-     * @return the underlying block cipher that we are wrapping.
-     */
-    public BlockCipher getUnderlyingCipher()
-    {
-        return cipher;
-    }
-    
-    /**
-     * return the algorithm name and mode.
-     *
-     * @return the name of the underlying algorithm followed by "/PGPCFB"
-     * and the block size in bits.
-     */
-    public String getAlgorithmName()
-    {
-        if (inlineIv)
-        {
-            return cipher.getAlgorithmName() + "/PGPCFBwithIV";
-        }
-        else
-        {
-            return cipher.getAlgorithmName() + "/PGPCFB";
-        }
-    }
-    
-    /**
-     * return the block size we are operating at.
-     *
-     * @return the block size we are operating at (in bytes).
-     */
-    public int getBlockSize()
-    {
-        return cipher.getBlockSize();
-    }
-
-    /**
-     * Process one block of input from the array in and write it to
-     * the out array.
-     *
-     * @param in the array containing the input data.
-     * @param inOff offset into the in array the data starts at.
-     * @param out the array the output data will be copied into.
-     * @param outOff the offset into the out array the output will start at.
-     * @exception DataLengthException if there isn't enough data in in, or
-     * space in out.
-     * @exception IllegalStateException if the cipher isn't initialised.
-     * @return the number of bytes processed and produced.
-     */
-    public int processBlock(
-        byte[] in,
-        int inOff,
-        byte[] out,
-        int outOff)
-        throws DataLengthException, IllegalStateException
-    {
-        if (inlineIv)
-        {
-            return (forEncryption) ? encryptBlockWithIV(in, inOff, out, outOff) : decryptBlockWithIV(in, inOff, out, outOff);
-        }
-        else
-        {
-            return (forEncryption) ? encryptBlock(in, inOff, out, outOff) : decryptBlock(in, inOff, out, outOff);
-        }
-    }
-    
-    /**
-     * reset the chaining vector back to the IV and reset the underlying
-     * cipher.
-     */
-    public void reset()
-    {
-        count = 0;
-
-        for (int i = 0; i != FR.length; i++)
-        {
-            if (inlineIv)
-            {
-                FR[i] = 0;
-            }
-            else
-            {
-                FR[i] = IV[i]; // if simple mode, key is IV (even if this is zero)
-            }
-        }
-
-        cipher.reset();
-    }
-
-    /**
-     * Initialise the cipher and, possibly, the initialisation vector (IV).
-     * If an IV isn't passed as part of the parameter, the IV will be all zeros.
-     * An IV which is too short is handled in FIPS compliant fashion.
-     *
-     * @param forEncryption if true the cipher is initialised for
-     *  encryption, if false for decryption.
-     * @param params the key and other data required by the cipher.
-     * @exception IllegalArgumentException if the params argument is
-     * inappropriate.
-     */
-    public void init(
-        boolean forEncryption,
-        CipherParameters params)
-        throws IllegalArgumentException
-    {
-        this.forEncryption = forEncryption;
-     
-        if (params instanceof ParametersWithIV)
-        {
-                ParametersWithIV ivParam = (ParametersWithIV)params;
-                byte[]      iv = ivParam.getIV();
-
-                if (iv.length < IV.length)
-                {
-                    // prepend the supplied IV with zeros (per FIPS PUB 81)
-                    System.arraycopy(iv, 0, IV, IV.length - iv.length, iv.length);
-                    for (int i = 0; i < IV.length - iv.length; i++)
-                    {
-                            IV[i] = 0;
-                    }
-                }
-                else
-                {
-                    System.arraycopy(iv, 0, IV, 0, IV.length);
-                }
-
-                reset();
-
-                cipher.init(true, ivParam.getParameters());
-        }
-        else
-        {
-                reset();
-
-                cipher.init(true, params);
-        }
-    }
-    
-    /**
-     * Encrypt one byte of data according to CFB mode.
-     * @param data the byte to encrypt
-     * @param blockOff where am i in the current block, determines when to resync the block
-     * @returns the encrypted byte
-     */
-    private byte encryptByte(byte data, int blockOff)
-    {
-        return (byte)(FRE[blockOff] ^ data);
-    }
-    
-    /**
-     * Do the appropriate processing for CFB IV mode encryption.
-     *
-     * @param in the array containing the data to be encrypted.
-     * @param inOff offset into the in array the data starts at.
-     * @param out the array the encrypted data will be copied into.
-     * @param outOff the offset into the out array the output will start at.
-     * @exception DataLengthException if there isn't enough data in in, or
-     * space in out.
-     * @exception IllegalStateException if the cipher isn't initialised.
-     * @return the number of bytes processed and produced.
-     */
-    private int encryptBlockWithIV(
-        byte[] in,
-        int inOff,
-        byte[] out,
-        int outOff)
-        throws DataLengthException, IllegalStateException
-    {
-        if ((inOff + blockSize) > in.length)
-        {
-            throw new DataLengthException("input buffer too short");
-        }
-
-        if (count == 0)
-        {
-            if ((outOff + 2 * blockSize + 2) > out.length)
-            {
-                throw new DataLengthException("output buffer too short");
-            }
-
-            cipher.processBlock(FR, 0, FRE, 0);
-
-            for (int n = 0; n < blockSize; n++) 
-            {
-                out[outOff + n] = encryptByte(IV[n], n);
-            }
-            
-            System.arraycopy(out, outOff, FR, 0, blockSize);
-
-            cipher.processBlock(FR, 0, FRE, 0);
-
-            out[outOff + blockSize] = encryptByte(IV[blockSize - 2], 0);
-            out[outOff + blockSize + 1] = encryptByte(IV[blockSize - 1], 1);
-
-            System.arraycopy(out, outOff + 2, FR, 0, blockSize);
-            
-            cipher.processBlock(FR, 0, FRE, 0);
-
-            for (int n = 0; n < blockSize; n++) 
-            {
-                out[outOff + blockSize + 2 + n] = encryptByte(in[inOff + n], n);
-            }
-
-            System.arraycopy(out, outOff + blockSize + 2, FR, 0, blockSize);
-
-            count += 2 * blockSize + 2;
-
-            return 2 * blockSize + 2;
-        }
-        else if (count >= blockSize + 2)
-        {
-            if ((outOff + blockSize) > out.length)
-            {
-                throw new DataLengthException("output buffer too short");
-            }
-
-            cipher.processBlock(FR, 0, FRE, 0);
-
-            for (int n = 0; n < blockSize; n++) 
-            {
-                out[outOff + n] = encryptByte(in[inOff + n], n);
-            }
-            
-            System.arraycopy(out, outOff, FR, 0, blockSize);
-        }
-        
-        return blockSize;
-    }
-
-    /**
-     * Do the appropriate processing for CFB IV mode decryption.
-     *
-     * @param in the array containing the data to be decrypted.
-     * @param inOff offset into the in array the data starts at.
-     * @param out the array the encrypted data will be copied into.
-     * @param outOff the offset into the out array the output will start at.
-     * @exception DataLengthException if there isn't enough data in in, or
-     * space in out.
-     * @exception IllegalStateException if the cipher isn't initialised.
-     * @return the number of bytes processed and produced.
-     */
-    private int decryptBlockWithIV(
-        byte[] in,
-        int inOff,
-        byte[] out,
-        int outOff)
-        throws DataLengthException, IllegalStateException
-    {
-        if ((inOff + blockSize) > in.length)
-        {
-            throw new DataLengthException("input buffer too short");
-        }
-
-        if ((outOff + blockSize) > out.length)
-        {
-            throw new DataLengthException("output buffer too short");
-        }
-        
-        if (count == 0)
-        {
-            for (int n = 0; n < blockSize; n++) 
-            {
-                FR[n] = in[inOff + n];
-            }
-            
-            cipher.processBlock(FR, 0, FRE, 0);
-
-            count += blockSize;
-
-            return 0;
-        }
-        else if (count == blockSize)
-        {
-            // copy in buffer so that this mode works if in and out are the same 
-            System.arraycopy(in, inOff, tmp, 0, blockSize);
-        
-            System.arraycopy(FR, 2, FR, 0, blockSize - 2);
-            
-            FR[blockSize - 2] = tmp[0];
-            FR[blockSize - 1] = tmp[1];
-
-            cipher.processBlock(FR, 0, FRE, 0);
-
-            for (int n = 0; n < blockSize - 2; n++) 
-            {
-                out[outOff + n] = encryptByte(tmp[n + 2], n);
-            }
-
-            System.arraycopy(tmp, 2, FR, 0, blockSize - 2);
-
-            count += 2;
-
-            return blockSize - 2;
-        }
-        else if (count >= blockSize + 2)
-        {
-            // copy in buffer so that this mode works if in and out are the same 
-            System.arraycopy(in, inOff, tmp, 0, blockSize);
-
-            out[outOff + 0] = encryptByte(tmp[0], blockSize - 2);
-            out[outOff + 1] = encryptByte(tmp[1], blockSize - 1);
-
-            System.arraycopy(tmp, 0, FR, blockSize - 2, 2);
-
-            cipher.processBlock(FR, 0, FRE, 0);
-            
-            for (int n = 0; n < blockSize - 2; n++) 
-            {
-                out[outOff + n + 2] = encryptByte(tmp[n + 2], n);
-            }
-            
-            System.arraycopy(tmp, 2, FR, 0, blockSize - 2);
-            
-        } 
-        
-        return blockSize;
-    }
-    
-    /**
-     * Do the appropriate processing for CFB mode encryption.
-     *
-     * @param in the array containing the data to be encrypted.
-     * @param inOff offset into the in array the data starts at.
-     * @param out the array the encrypted data will be copied into.
-     * @param outOff the offset into the out array the output will start at.
-     * @exception DataLengthException if there isn't enough data in in, or
-     * space in out.
-     * @exception IllegalStateException if the cipher isn't initialised.
-     * @return the number of bytes processed and produced.
-     */
-    private int encryptBlock(
-        byte[] in,
-        int inOff,
-        byte[] out,
-        int outOff)
-        throws DataLengthException, IllegalStateException
-    {        
-        if ((inOff + blockSize) > in.length)
-        {
-            throw new DataLengthException("input buffer too short");
-        }
-
-        if ((outOff + blockSize) > out.length)
-        {
-            throw new DataLengthException("output buffer too short");
-        }
-        
-        cipher.processBlock(FR, 0, FRE, 0);
-        for (int n = 0; n < blockSize; n++) 
-        {
-            out[outOff + n] = encryptByte(in[inOff + n], n);
-        }
-        
-        for (int n = 0; n < blockSize; n++) 
-        {
-            FR[n] = out[outOff + n];
-        }
-        
-        return blockSize;
-        
-    }
-    
-    /**
-     * Do the appropriate processing for CFB mode decryption.
-     *
-     * @param in the array containing the data to be decrypted.
-     * @param inOff offset into the in array the data starts at.
-     * @param out the array the encrypted data will be copied into.
-     * @param outOff the offset into the out array the output will start at.
-     * @exception DataLengthException if there isn't enough data in in, or
-     * space in out.
-     * @exception IllegalStateException if the cipher isn't initialised.
-     * @return the number of bytes processed and produced.
-     */
-    private int decryptBlock(
-        byte[] in,
-        int inOff,
-        byte[] out,
-        int outOff)
-        throws DataLengthException, IllegalStateException
-    {
-        if ((inOff + blockSize) > in.length)
-        {
-            throw new DataLengthException("input buffer too short");
-        }
-
-        if ((outOff + blockSize) > out.length)
-        {
-            throw new DataLengthException("output buffer too short");
-        }
-        
-        cipher.processBlock(FR, 0, FRE, 0);
-        for (int n = 0; n < blockSize; n++) 
-        {
-            out[outOff + n] = encryptByte(in[inOff + n], n);
-        }
-        
-        for (int n = 0; n < blockSize; n++) 
-        {
-            FR[n] = in[inOff + n];
-        }
-        
-        return blockSize;
-        
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/modes/PaddedBlockCipher.java b/bcprov/src/main/java/org/bouncycastle/crypto/modes/PaddedBlockCipher.java
deleted file mode 100644
index f15ed67..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/modes/PaddedBlockCipher.java
+++ /dev/null
@@ -1,253 +0,0 @@
-package org.bouncycastle.crypto.modes;
-
-import org.bouncycastle.crypto.BlockCipher;
-import org.bouncycastle.crypto.BufferedBlockCipher;
-import org.bouncycastle.crypto.DataLengthException;
-import org.bouncycastle.crypto.InvalidCipherTextException;
-
-/**
- * A wrapper class that allows block ciphers to be used to process data in
- * a piecemeal fashion with PKCS5/PKCS7 padding. The PaddedBlockCipher
- * outputs a block only when the buffer is full and more data is being added,
- * or on a doFinal (unless the current block in the buffer is a pad block).
- * The padding mechanism used is the one outlined in PKCS5/PKCS7.
- *
- * @deprecated use org.bouncycastle.crypto.paddings.PaddedBufferedBlockCipher instead.
- */
-public class PaddedBlockCipher
-    extends BufferedBlockCipher
-{
-    /**
-     * Create a buffered block cipher with, or without, padding.
-     *
-     * @param cipher the underlying block cipher this buffering object wraps.
-     */
-    public PaddedBlockCipher(
-        BlockCipher     cipher)
-    {
-        this.cipher = cipher;
-
-        buf = new byte[cipher.getBlockSize()];
-        bufOff = 0;
-    }
-
-    /**
-     * return the size of the output buffer required for an update plus a
-     * doFinal with an input of len bytes.
-     *
-     * @param len the length of the input.
-     * @return the space required to accommodate a call to update and doFinal
-     * with len bytes of input.
-     */
-    public int getOutputSize(
-        int len)
-    {
-        int total       = len + bufOff;
-        int leftOver    = total % buf.length;
-
-        if (leftOver == 0)
-        {
-            if (forEncryption)
-            {
-                return total + buf.length;
-            }
-
-            return total;
-        }
-
-        return total - leftOver + buf.length;
-    }
-
-    /**
-     * return the size of the output buffer required for an update 
-     * an input of len bytes.
-     *
-     * @param len the length of the input.
-     * @return the space required to accommodate a call to update
-     * with len bytes of input.
-     */
-    public int getUpdateOutputSize(
-        int len)
-    {
-        int total       = len + bufOff;
-        int leftOver    = total % buf.length;
-
-        if (leftOver == 0)
-        {
-            return total - buf.length;
-        }
-
-        return total - leftOver;
-    }
-
-    /**
-     * process a single byte, producing an output block if neccessary.
-     *
-     * @param in the input byte.
-     * @param out the space for any output that might be produced.
-     * @param outOff the offset from which the output will be copied.
-     * @exception DataLengthException if there isn't enough space in out.
-     * @exception IllegalStateException if the cipher isn't initialised.
-     */
-    public int processByte(
-        byte        in,
-        byte[]      out,
-        int         outOff)
-        throws DataLengthException, IllegalStateException
-    {
-        int         resultLen = 0;
-
-        if (bufOff == buf.length)
-        {
-            resultLen = cipher.processBlock(buf, 0, out, outOff);
-            bufOff = 0;
-        }
-
-        buf[bufOff++] = in;
-
-        return resultLen;
-    }
-
-    /**
-     * process an array of bytes, producing output if necessary.
-     *
-     * @param in the input byte array.
-     * @param inOff the offset at which the input data starts.
-     * @param len the number of bytes to be copied out of the input array.
-     * @param out the space for any output that might be produced.
-     * @param outOff the offset from which the output will be copied.
-     * @exception DataLengthException if there isn't enough space in out.
-     * @exception IllegalStateException if the cipher isn't initialised.
-     */
-    public int processBytes(
-        byte[]      in,
-        int         inOff,
-        int         len,
-        byte[]      out,
-        int         outOff)
-        throws DataLengthException, IllegalStateException
-    {
-        if (len < 0)
-        {
-            throw new IllegalArgumentException("Can't have a negative input length!");
-        }
-
-        int blockSize   = getBlockSize();
-        int length      = getUpdateOutputSize(len);
-        
-        if (length > 0)
-        {
-            if ((outOff + length) > out.length)
-            {
-                throw new DataLengthException("output buffer too short");
-            }
-        }
-
-        int resultLen = 0;
-        int gapLen = buf.length - bufOff;
-
-        if (len > gapLen)
-        {
-            System.arraycopy(in, inOff, buf, bufOff, gapLen);
-
-            resultLen += cipher.processBlock(buf, 0, out, outOff);
-
-            bufOff = 0;
-            len -= gapLen;
-            inOff += gapLen;
-
-            while (len > buf.length)
-            {
-                resultLen += cipher.processBlock(in, inOff, out, outOff + resultLen);
-
-                len -= blockSize;
-                inOff += blockSize;
-            }
-        }
-
-        System.arraycopy(in, inOff, buf, bufOff, len);
-
-        bufOff += len;
-
-        return resultLen;
-    }
-
-    /**
-     * Process the last block in the buffer. If the buffer is currently
-     * full and padding needs to be added a call to doFinal will produce
-     * 2 * getBlockSize() bytes.
-     *
-     * @param out the array the block currently being held is copied into.
-     * @param outOff the offset at which the copying starts.
-     * @exception DataLengthException if there is insufficient space in out for
-     * the output or we are decrypting and the input is not block size aligned.
-     * @exception IllegalStateException if the underlying cipher is not
-     * initialised.
-     * @exception InvalidCipherTextException if padding is expected and not found.
-     */
-    public int doFinal(
-        byte[]  out,
-        int     outOff)
-        throws DataLengthException, IllegalStateException, InvalidCipherTextException
-    {
-        int blockSize = cipher.getBlockSize();
-        int resultLen = 0;
-
-        if (forEncryption)
-        {
-            if (bufOff == blockSize)
-            {
-                if ((outOff + 2 * blockSize) > out.length)
-                {
-                    throw new DataLengthException("output buffer too short");
-                }
-
-                resultLen = cipher.processBlock(buf, 0, out, outOff);
-                bufOff = 0;
-            }
-
-            //
-            // add PKCS7 padding
-            //
-            byte code = (byte)(blockSize - bufOff);
-
-            while (bufOff < blockSize)
-            {
-                buf[bufOff] = code;
-                bufOff++;
-            }
-
-            resultLen += cipher.processBlock(buf, 0, out, outOff + resultLen);
-        }
-        else
-        {
-            if (bufOff == blockSize)
-            {
-                resultLen = cipher.processBlock(buf, 0, buf, 0);
-                bufOff = 0;
-            }
-            else
-            {
-                throw new DataLengthException("last block incomplete in decryption");
-            }
-
-            //
-            // remove PKCS7 padding
-            //
-            int count = buf[blockSize - 1] & 0xff;
-
-            if ((count < 0) || (count > blockSize))
-            {
-                throw new InvalidCipherTextException("pad block corrupted");
-            }
-
-            resultLen -= count;
-
-            System.arraycopy(buf, 0, out, outOff, resultLen);
-        }
-
-        reset();
-
-        return resultLen;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/modes/gcm/BasicGCMExponentiator.java b/bcprov/src/main/java/org/bouncycastle/crypto/modes/gcm/BasicGCMExponentiator.java
deleted file mode 100644
index fc25810..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/modes/gcm/BasicGCMExponentiator.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package org.bouncycastle.crypto.modes.gcm;
-
-import org.bouncycastle.util.Arrays;
-
-public class BasicGCMExponentiator implements GCMExponentiator
-{
-    private int[] x;
-
-    public void init(byte[] x)
-    {
-        this.x = GCMUtil.asInts(x);
-    }
-
-    public void exponentiateX(long pow, byte[] output)
-    {
-        // Initial value is little-endian 1
-        int[] y = GCMUtil.oneAsInts();
-
-        if (pow > 0)
-        {
-            int[] powX = Arrays.clone(x);
-            do
-            {
-                if ((pow & 1L) != 0)
-                {
-                    GCMUtil.multiply(y, powX);
-                }
-                GCMUtil.multiply(powX, powX);
-                pow >>>= 1;
-            }
-            while (pow > 0);
-        }
-
-        GCMUtil.asBytes(y, output);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/modes/gcm/BasicGCMMultiplier.java b/bcprov/src/main/java/org/bouncycastle/crypto/modes/gcm/BasicGCMMultiplier.java
deleted file mode 100644
index 2afb18f..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/modes/gcm/BasicGCMMultiplier.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package org.bouncycastle.crypto.modes.gcm;
-
-public class BasicGCMMultiplier implements GCMMultiplier
-{
-    private int[] H;
-
-    public void init(byte[] H)
-    {
-        this.H = GCMUtil.asInts(H);
-    }
-
-    public void multiplyH(byte[] x)
-    {
-        int[] t = GCMUtil.asInts(x);
-        GCMUtil.multiply(t, H);
-        GCMUtil.asBytes(t, x);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/modes/gcm/Tables64kGCMMultiplier.java b/bcprov/src/main/java/org/bouncycastle/crypto/modes/gcm/Tables64kGCMMultiplier.java
deleted file mode 100644
index 4f32a0d..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/modes/gcm/Tables64kGCMMultiplier.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package org.bouncycastle.crypto.modes.gcm;
-
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.Pack;
-
-public class Tables64kGCMMultiplier implements GCMMultiplier
-{
-    private byte[] H;
-    private int[][][] M;
-
-    public void init(byte[] H)
-    {
-        if (M == null)
-        {
-            M = new int[16][256][4];
-        }
-        else if (Arrays.areEqual(this.H, H))
-        {
-            return;
-        }
-
-        this.H = Arrays.clone(H);
-
-        // M[0][0] is ZEROES;
-        GCMUtil.asInts(H, M[0][128]);
-
-        for (int j = 64; j >= 1; j >>= 1)
-        {
-            GCMUtil.multiplyP(M[0][j + j], M[0][j]);
-        }
-
-        int i = 0;
-        for (;;)
-        {
-            for (int j = 2; j < 256; j += j)
-            {
-                for (int k = 1; k < j; ++k)
-                {
-                    GCMUtil.xor(M[i][j], M[i][k], M[i][j + k]);
-                }
-            }
-
-            if (++i == 16)
-            {
-                return;
-            }
-
-            // M[i][0] is ZEROES;
-            for (int j = 128; j > 0; j >>= 1)
-            {
-                GCMUtil.multiplyP8(M[i - 1][j], M[i][j]);
-            }
-        }
-    }
-
-    public void multiplyH(byte[] x)
-    {
-//      assert x.Length == 16;
-
-        int[] z = new int[4];
-        for (int i = 15; i >= 0; --i)
-        {
-//            GCMUtil.xor(z, M[i][x[i] & 0xff]);
-            int[] m = M[i][x[i] & 0xff];
-            z[0] ^= m[0];
-            z[1] ^= m[1];
-            z[2] ^= m[2];
-            z[3] ^= m[3];
-        }
-
-        Pack.intToBigEndian(z, x, 0);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/modes/gcm/package.html b/bcprov/src/main/java/org/bouncycastle/crypto/modes/gcm/package.html
deleted file mode 100644
index 09c42f0..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/modes/gcm/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body bgcolor="#ffffff">
-GCM mode support classes.
-</body>
-</html>
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/modes/package.html b/bcprov/src/main/java/org/bouncycastle/crypto/modes/package.html
deleted file mode 100644
index 5402df4..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/modes/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body bgcolor="#ffffff">
-Modes for symmetric ciphers.
-</body>
-</html>
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/package.html b/bcprov/src/main/java/org/bouncycastle/crypto/package.html
deleted file mode 100644
index ee5487f..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body bgcolor="#ffffff">
-Base classes for the lightweight API.
-</body>
-</html>
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/paddings/package.html b/bcprov/src/main/java/org/bouncycastle/crypto/paddings/package.html
deleted file mode 100644
index 2b82e60..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/paddings/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body bgcolor="#ffffff">
-Paddings for symmetric ciphers.
-</body>
-</html>
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/params/CCMParameters.java b/bcprov/src/main/java/org/bouncycastle/crypto/params/CCMParameters.java
deleted file mode 100644
index 4924dcc..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/params/CCMParameters.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package org.bouncycastle.crypto.params;
-
-/**
- * @deprecated use AEADParameters
- */
-public class CCMParameters
-    extends AEADParameters
-{
-    /**
-     * Base constructor.
-     * 
-     * @param key key to be used by underlying cipher
-     * @param macSize macSize in bits
-     * @param nonce nonce to be used
-     * @param associatedText associated text, if any
-     */
-    public CCMParameters(KeyParameter key, int macSize, byte[] nonce, byte[] associatedText)
-    {
-        super(key, macSize, nonce, associatedText);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/params/CramerShoupKeyGenerationParameters.java b/bcprov/src/main/java/org/bouncycastle/crypto/params/CramerShoupKeyGenerationParameters.java
deleted file mode 100644
index 001cd59..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/params/CramerShoupKeyGenerationParameters.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package org.bouncycastle.crypto.params;
-
-import java.security.SecureRandom;
-
-import org.bouncycastle.crypto.KeyGenerationParameters;
-
-public class CramerShoupKeyGenerationParameters
-	extends KeyGenerationParameters
-{
-
-	private CramerShoupParameters params;
-
-	public CramerShoupKeyGenerationParameters(SecureRandom random, CramerShoupParameters params)
-	{
-		super(random, getStrength(params));
-
-		this.params = params;
-	}
-
-	public CramerShoupParameters getParameters()
-	{
-		return params;
-	}
-
-	static int getStrength(CramerShoupParameters params)
-	{
-		return params.getP().bitLength();
-	}
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/params/CramerShoupKeyParameters.java b/bcprov/src/main/java/org/bouncycastle/crypto/params/CramerShoupKeyParameters.java
deleted file mode 100644
index 9e4219c..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/params/CramerShoupKeyParameters.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package org.bouncycastle.crypto.params;
-
-public class CramerShoupKeyParameters extends AsymmetricKeyParameter {
-	
-	private CramerShoupParameters params;
-
-	protected CramerShoupKeyParameters(boolean isPrivate, CramerShoupParameters params) {
-		super(isPrivate);
-
-		this.params = params;
-	}
-
-	public CramerShoupParameters getParameters() {
-		return params;
-	}
-
-	public boolean equals(Object obj) {
-		if (!(obj instanceof CramerShoupKeyParameters)) {
-			return false;
-		}
-
-		CramerShoupKeyParameters csKey = (CramerShoupKeyParameters) obj;
-
-		if (params == null) {
-			return csKey.getParameters() == null;
-		} else {
-			return params.equals(csKey.getParameters());
-		}
-	}
-
-	public int hashCode() {
-		int code = isPrivate() ? 0 : 1;
-
-		if (params != null) {
-			code ^= params.hashCode();
-		}
-
-		return code;
-	}
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/params/CramerShoupParameters.java b/bcprov/src/main/java/org/bouncycastle/crypto/params/CramerShoupParameters.java
deleted file mode 100644
index 24264b6..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/params/CramerShoupParameters.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package org.bouncycastle.crypto.params;
-
-import java.math.BigInteger;
-
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.Digest;
-
-public class CramerShoupParameters implements CipherParameters {
-
-	private BigInteger p; // prime order of G
-	private BigInteger g1, g2; // generate G
-	
-	private Digest H; // hash function
-
-	public CramerShoupParameters(BigInteger p, BigInteger g1, BigInteger g2, Digest H) {
-		this.p = p;
-		this.g1 = g1;
-		this.g2 = g2;
-		this.H = H;
-	}
-
-	public boolean equals(Object obj) {
-		if (!(obj instanceof DSAParameters)) {
-			return false;
-		}
-
-		CramerShoupParameters pm = (CramerShoupParameters) obj;
-
-		return (pm.getP().equals(p) && pm.getG1().equals(g1) && pm.getG2().equals(g2));
-	}
-
-	public int hashCode() {
-		return getP().hashCode() ^ getG1().hashCode() ^ getG2().hashCode();
-	}
-	
-	public BigInteger getG1() {
-		return g1;
-	}
-	
-	public BigInteger getG2() {
-		return g2;
-	}
-	
-	public BigInteger getP() {
-		return p;
-	}
-	
-	public Digest getH() {
-		H.reset();
-		return H;
-	}
-	
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/params/CramerShoupPrivateKeyParameters.java b/bcprov/src/main/java/org/bouncycastle/crypto/params/CramerShoupPrivateKeyParameters.java
deleted file mode 100644
index 79de46a..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/params/CramerShoupPrivateKeyParameters.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package org.bouncycastle.crypto.params;
-
-import java.math.BigInteger;
-
-public class CramerShoupPrivateKeyParameters extends CramerShoupKeyParameters {
-	
-	private BigInteger x1, x2, y1, y2, z; // Z_p
-	private CramerShoupPublicKeyParameters pk; // public key
-
-	public CramerShoupPrivateKeyParameters(CramerShoupParameters params, BigInteger x1, BigInteger x2, BigInteger y1, BigInteger y2, BigInteger z) {
-		super(true, params);
-
-		this.x1 = x1;
-		this.x2 = x2;
-		this.y1 = y1;
-		this.y2 = y2;
-		this.z = z;
-	}
-
-	public BigInteger getX1() {
-		return x1;
-	}
-	
-	public BigInteger getX2() {
-		return x2;
-	}
-	
-	public BigInteger getY1() {
-		return y1;
-	}
-	
-	public BigInteger getY2() {
-		return y2;
-	}
-	
-	public BigInteger getZ() {
-		return z;
-	}
-	
-	public void setPk(CramerShoupPublicKeyParameters pk) {
-		this.pk = pk;
-	}
-	
-	public CramerShoupPublicKeyParameters getPk() {
-		return pk;
-	}
-
-	public int hashCode() {
-		return x1.hashCode() ^ x2.hashCode() ^ y1.hashCode() ^ y2.hashCode() ^ z.hashCode() ^ super.hashCode();
-	}
-
-	public boolean equals(Object obj) {
-		if (!(obj instanceof CramerShoupPrivateKeyParameters)) {
-			return false;
-		}
-
-		CramerShoupPrivateKeyParameters other = (CramerShoupPrivateKeyParameters) obj;
-
-		return other.getX1().equals(this.x1) && other.getX2().equals(this.x2) && other.getY1().equals(this.y1) && other.getY2().equals(this.y2) && other.getZ().equals(this.z) && super.equals(obj);
-	}
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/params/CramerShoupPublicKeyParameters.java b/bcprov/src/main/java/org/bouncycastle/crypto/params/CramerShoupPublicKeyParameters.java
deleted file mode 100644
index 341149c..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/params/CramerShoupPublicKeyParameters.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package org.bouncycastle.crypto.params;
-
-import java.math.BigInteger;
-
-public class CramerShoupPublicKeyParameters extends CramerShoupKeyParameters {
-	
-	private BigInteger c, d, h; // public key group elements
-
-	public CramerShoupPublicKeyParameters(CramerShoupParameters params, BigInteger c, BigInteger d, BigInteger h) {
-		super(false, params);
-
-		this.c = c;
-		this.d = d;
-		this.h = h;
-	}
-
-	public BigInteger getC() {
-		return c;
-	}
-	
-	public BigInteger getD() {
-		return d;
-	}
-	
-	public BigInteger getH() {
-		return h;
-	}
-
-	public int hashCode() {
-		return c.hashCode() ^ d.hashCode() ^ h.hashCode() ^ super.hashCode();
-	}
-
-	public boolean equals(Object obj) {
-		if (!(obj instanceof CramerShoupPublicKeyParameters)) {
-			return false;
-		}
-
-		CramerShoupPublicKeyParameters other = (CramerShoupPublicKeyParameters) obj;
-
-		return other.getC().equals(c) && other.getD().equals(d) && other.getH().equals(h) && super.equals(obj);
-	}
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/params/ElGamalKeyGenerationParameters.java b/bcprov/src/main/java/org/bouncycastle/crypto/params/ElGamalKeyGenerationParameters.java
deleted file mode 100644
index f5fbabd..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/params/ElGamalKeyGenerationParameters.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package org.bouncycastle.crypto.params;
-
-import java.security.SecureRandom;
-
-import org.bouncycastle.crypto.KeyGenerationParameters;
-
-public class ElGamalKeyGenerationParameters
-    extends KeyGenerationParameters
-{
-    private ElGamalParameters    params;
-
-    public ElGamalKeyGenerationParameters(
-        SecureRandom        random,
-        ElGamalParameters   params)
-    {
-        super(random, getStrength(params));
-
-        this.params = params;
-    }
-
-    public ElGamalParameters getParameters()
-    {
-        return params;
-    }
-
-    static int getStrength(ElGamalParameters params)
-    {
-        return params.getL() != 0 ? params.getL() : params.getP().bitLength();
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/params/ElGamalKeyParameters.java b/bcprov/src/main/java/org/bouncycastle/crypto/params/ElGamalKeyParameters.java
deleted file mode 100644
index 7250693..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/params/ElGamalKeyParameters.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package org.bouncycastle.crypto.params;
-
-
-public class ElGamalKeyParameters
-    extends AsymmetricKeyParameter
-{
-    private ElGamalParameters    params;
-
-    protected ElGamalKeyParameters(
-        boolean         isPrivate,
-        ElGamalParameters    params)
-    {
-        super(isPrivate);
-
-        this.params = params;
-    }   
-
-    public ElGamalParameters getParameters()
-    {
-        return params;
-    }
-
-    public int hashCode()
-    {
-        return (params != null) ? params.hashCode() : 0;
-    }
-
-    public boolean equals(
-        Object  obj)
-    {
-        if (!(obj instanceof ElGamalKeyParameters))
-        {
-            return false;
-        }
-
-        ElGamalKeyParameters    dhKey = (ElGamalKeyParameters)obj;
-
-        if (params == null)
-        {
-            return dhKey.getParameters() == null;
-        }
-        else
-        { 
-            return params.equals(dhKey.getParameters());
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/params/ElGamalParameters.java b/bcprov/src/main/java/org/bouncycastle/crypto/params/ElGamalParameters.java
deleted file mode 100644
index 166eff3..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/params/ElGamalParameters.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package org.bouncycastle.crypto.params;
-
-import java.math.BigInteger;
-
-import org.bouncycastle.crypto.CipherParameters;
-
-public class ElGamalParameters
-    implements CipherParameters
-{
-    private BigInteger              g;
-    private BigInteger              p;
-    private int                     l;
-
-    public ElGamalParameters(
-        BigInteger  p,
-        BigInteger  g)
-    {
-        this(p, g, 0);
-    }
-
-    public ElGamalParameters(
-        BigInteger  p,
-        BigInteger  g,
-        int         l)
-    {
-        this.g = g;
-        this.p = p;
-        this.l = l;
-    }
-
-    public BigInteger getP()
-    {
-        return p;
-    }
-
-    /**
-     * return the generator - g
-     */
-    public BigInteger getG()
-    {
-        return g;
-    }
-
-    /**
-     * return private value limit - l
-     */
-    public int getL()
-    {
-        return l;
-    }
-
-    public boolean equals(
-        Object  obj)
-    {
-        if (!(obj instanceof ElGamalParameters))
-        {
-            return false;
-        }
-
-        ElGamalParameters    pm = (ElGamalParameters)obj;
-
-        return pm.getP().equals(p) && pm.getG().equals(g) && pm.getL() == l;
-    }
-    
-    public int hashCode()
-    {
-        return (getP().hashCode() ^ getG().hashCode()) + l;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/params/ElGamalPrivateKeyParameters.java b/bcprov/src/main/java/org/bouncycastle/crypto/params/ElGamalPrivateKeyParameters.java
deleted file mode 100644
index b8fb529..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/params/ElGamalPrivateKeyParameters.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package org.bouncycastle.crypto.params;
-
-import java.math.BigInteger;
-
-public class ElGamalPrivateKeyParameters
-    extends ElGamalKeyParameters
-{
-    private BigInteger      x;
-
-    public ElGamalPrivateKeyParameters(
-        BigInteger      x,
-        ElGamalParameters    params)
-    {
-        super(true, params);
-
-        this.x = x;
-    }   
-
-    public BigInteger getX()
-    {
-        return x;
-    }
-
-    public boolean equals(
-        Object  obj)
-    {
-        if (!(obj instanceof ElGamalPrivateKeyParameters))
-        {
-            return false;
-        }
-
-        ElGamalPrivateKeyParameters  pKey = (ElGamalPrivateKeyParameters)obj;
-
-        if (!pKey.getX().equals(x))
-        {
-            return false;
-        }
-
-        return super.equals(obj);
-    }
-    
-    public int hashCode()
-    {
-        return getX().hashCode();
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/params/ElGamalPublicKeyParameters.java b/bcprov/src/main/java/org/bouncycastle/crypto/params/ElGamalPublicKeyParameters.java
deleted file mode 100644
index d7da7a9..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/params/ElGamalPublicKeyParameters.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package org.bouncycastle.crypto.params;
-
-import java.math.BigInteger;
-
-public class ElGamalPublicKeyParameters
-    extends ElGamalKeyParameters
-{
-    private BigInteger      y;
-
-    public ElGamalPublicKeyParameters(
-        BigInteger      y,
-        ElGamalParameters    params)
-    {
-        super(false, params);
-
-        this.y = y;
-    }   
-
-    public BigInteger getY()
-    {
-        return y;
-    }
-
-    public int hashCode()
-    {
-        return y.hashCode() ^ super.hashCode();
-    }
-
-    public boolean equals(
-        Object  obj)
-    {
-        if (!(obj instanceof ElGamalPublicKeyParameters))
-        {
-            return false;
-        }
-
-        ElGamalPublicKeyParameters   other = (ElGamalPublicKeyParameters)obj;
-
-        return other.getY().equals(y) && super.equals(obj);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/params/GOST3410KeyGenerationParameters.java b/bcprov/src/main/java/org/bouncycastle/crypto/params/GOST3410KeyGenerationParameters.java
deleted file mode 100644
index 74e05a9..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/params/GOST3410KeyGenerationParameters.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package org.bouncycastle.crypto.params;
-
-import org.bouncycastle.crypto.KeyGenerationParameters;
-
-import java.security.SecureRandom;
-
-public class GOST3410KeyGenerationParameters
-        extends KeyGenerationParameters
-{
-        private GOST3410Parameters    params;
-
-        public GOST3410KeyGenerationParameters(
-            SecureRandom    random,
-            GOST3410Parameters   params)
-        {
-            super(random, params.getP().bitLength() - 1);
-
-            this.params = params;
-        }
-
-        public GOST3410Parameters getParameters()
-        {
-            return params;
-        }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/params/GOST3410KeyParameters.java b/bcprov/src/main/java/org/bouncycastle/crypto/params/GOST3410KeyParameters.java
deleted file mode 100644
index 6716924..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/params/GOST3410KeyParameters.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package org.bouncycastle.crypto.params;
-
-public class GOST3410KeyParameters
-        extends AsymmetricKeyParameter
-{
-    private GOST3410Parameters    params;
-
-    public GOST3410KeyParameters(
-        boolean         isPrivate,
-        GOST3410Parameters   params)
-    {
-        super(isPrivate);
-
-        this.params = params;
-    }
-
-    public GOST3410Parameters getParameters()
-    {
-        return params;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/params/GOST3410Parameters.java b/bcprov/src/main/java/org/bouncycastle/crypto/params/GOST3410Parameters.java
deleted file mode 100644
index 07450f6..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/params/GOST3410Parameters.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package org.bouncycastle.crypto.params;
-
-import org.bouncycastle.crypto.CipherParameters;
-
-import java.math.BigInteger;
-
-public class GOST3410Parameters
-   implements CipherParameters
-{
-    private BigInteger              p;
-    private BigInteger              q;
-    private BigInteger              a;
-    private GOST3410ValidationParameters validation;
-
-    public GOST3410Parameters(
-        BigInteger  p,
-        BigInteger  q,
-        BigInteger  a)
-    {
-        this.p = p;
-        this.q = q;
-        this.a = a;
-    }
-
-    public GOST3410Parameters(
-        BigInteger              p,
-        BigInteger              q,
-        BigInteger              a,
-        GOST3410ValidationParameters params)
-    {
-        this.a = a;
-        this.p = p;
-        this.q = q;
-        this.validation = params;
-    }
-
-    public BigInteger getP()
-    {
-        return p;
-    }
-
-    public BigInteger getQ()
-    {
-        return q;
-    }
-
-    public BigInteger getA()
-    {
-        return a;
-    }
-
-    public GOST3410ValidationParameters getValidationParameters()
-    {
-        return validation;
-    }
-
-    public int hashCode()
-    {
-        return p.hashCode() ^ q.hashCode() ^ a.hashCode();
-    }
-
-    public boolean equals(
-        Object  obj)
-    {
-        if (!(obj instanceof GOST3410Parameters))
-        {
-            return false;
-        }
-
-        GOST3410Parameters    pm = (GOST3410Parameters)obj;
-
-        return (pm.getP().equals(p) && pm.getQ().equals(q) && pm.getA().equals(a));
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/params/GOST3410PrivateKeyParameters.java b/bcprov/src/main/java/org/bouncycastle/crypto/params/GOST3410PrivateKeyParameters.java
deleted file mode 100644
index 408e065..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/params/GOST3410PrivateKeyParameters.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package org.bouncycastle.crypto.params;
-
-import java.math.BigInteger;
-
-public class GOST3410PrivateKeyParameters
-        extends GOST3410KeyParameters
-{
-    private BigInteger      x;
-
-    public GOST3410PrivateKeyParameters(
-        BigInteger      x,
-        GOST3410Parameters   params)
-    {
-        super(true, params);
-
-        this.x = x;
-    }
-
-    public BigInteger getX()
-    {
-        return x;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/params/GOST3410PublicKeyParameters.java b/bcprov/src/main/java/org/bouncycastle/crypto/params/GOST3410PublicKeyParameters.java
deleted file mode 100644
index 9dfd2d9..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/params/GOST3410PublicKeyParameters.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package org.bouncycastle.crypto.params;
-
-import java.math.BigInteger;
-
-public class GOST3410PublicKeyParameters
-        extends GOST3410KeyParameters
-{
-    private BigInteger      y;
-
-    public GOST3410PublicKeyParameters(
-        BigInteger      y,
-        GOST3410Parameters   params)
-    {
-        super(false, params);
-
-        this.y = y;
-    }
-
-    public BigInteger getY()
-    {
-        return y;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/params/GOST3410ValidationParameters.java b/bcprov/src/main/java/org/bouncycastle/crypto/params/GOST3410ValidationParameters.java
deleted file mode 100644
index c2a4fb5..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/params/GOST3410ValidationParameters.java
+++ /dev/null
@@ -1,84 +0,0 @@
-package org.bouncycastle.crypto.params;
-
-public class GOST3410ValidationParameters
-{
-    private int x0;
-    private int c;
-    private long x0L;
-    private long cL;
-
-
-    public GOST3410ValidationParameters(
-        int  x0,
-        int  c)
-    {
-        this.x0 = x0;
-        this.c = c;
-    }
-
-    public GOST3410ValidationParameters(
-        long  x0L,
-        long  cL)
-    {
-        this.x0L = x0L;
-        this.cL = cL;
-    }
-
-    public int getC()
-    {
-        return c;
-    }
-
-    public int getX0()
-    {
-        return x0;
-    }
-
-    public long getCL()
-    {
-        return cL;
-    }
-
-    public long getX0L()
-    {
-        return x0L;
-    }
-
-    public boolean equals(
-        Object o)
-    {
-        if (!(o instanceof GOST3410ValidationParameters))
-        {
-            return false;
-        }
-
-        GOST3410ValidationParameters  other = (GOST3410ValidationParameters)o;
-
-        if (other.c != this.c)
-        {
-            return false;
-        }
-
-        if (other.x0 != this.x0)
-        {
-            return false;
-        }
-
-        if (other.cL != this.cL)
-        {
-            return false;
-        }
-
-        if (other.x0L != this.x0L)
-        {
-            return false;
-        }
-
-        return true;
-    }
-
-    public int hashCode()
-    {
-        return x0 ^ c ^ (int) x0L ^ (int)(x0L >> 32) ^ (int) cL ^ (int)(cL >> 32);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/params/HKDFParameters.java b/bcprov/src/main/java/org/bouncycastle/crypto/params/HKDFParameters.java
deleted file mode 100644
index 2db3ce6..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/params/HKDFParameters.java
+++ /dev/null
@@ -1,123 +0,0 @@
-package org.bouncycastle.crypto.params;
-
-import org.bouncycastle.crypto.DerivationParameters;
-import org.bouncycastle.util.Arrays;
-
-/**
- * Parameter class for the HKDFBytesGenerator class.
- */
-public class HKDFParameters
-    implements DerivationParameters
-{
-    private final byte[] ikm;
-    private final boolean skipExpand;
-    private final byte[] salt;
-    private final byte[] info;
-
-    private HKDFParameters(final byte[] ikm, final boolean skip,
-                           final byte[] salt, final byte[] info)
-    {
-        if (ikm == null)
-        {
-            throw new IllegalArgumentException(
-                "IKM (input keying material) should not be null");
-        }
-
-        this.ikm = Arrays.clone(ikm);
-
-        this.skipExpand = skip;
-
-        if (salt == null || salt.length == 0)
-        {
-            this.salt = null;
-        }
-        else
-        {
-            this.salt = Arrays.clone(salt);
-        }
-
-        if (info == null)
-        {
-            this.info = new byte[0];
-        }
-        else
-        {
-            this.info = Arrays.clone(info);
-        }
-    }
-
-    /**
-     * Generates parameters for HKDF, specifying both the optional salt and
-     * optional info. Step 1: Extract won't be skipped.
-     *
-     * @param ikm  the input keying material or seed
-     * @param salt the salt to use, may be null for a salt for hashLen zeros
-     * @param info the info to use, may be null for an info field of zero bytes
-     */
-    public HKDFParameters(final byte[] ikm, final byte[] salt, final byte[] info)
-    {
-        this(ikm, false, salt, info);
-    }
-
-    /**
-     * Factory method that makes the HKDF skip the extract part of the key
-     * derivation function.
-     *
-     * @param ikm  the input keying material or seed, directly used for step 2:
-     *             Expand
-     * @param info the info to use, may be null for an info field of zero bytes
-     * @return HKDFParameters that makes the implementation skip step 1
-     */
-    public static HKDFParameters skipExtractParameters(final byte[] ikm,
-                                                       final byte[] info)
-    {
-
-        return new HKDFParameters(ikm, true, null, info);
-    }
-
-    public static HKDFParameters defaultParameters(final byte[] ikm)
-    {
-        return new HKDFParameters(ikm, false, null, null);
-    }
-
-    /**
-     * Returns the input keying material or seed.
-     *
-     * @return the keying material
-     */
-    public byte[] getIKM()
-    {
-        return Arrays.clone(ikm);
-    }
-
-    /**
-     * Returns if step 1: extract has to be skipped or not
-     *
-     * @return true for skipping, false for no skipping of step 1
-     */
-    public boolean skipExtract()
-    {
-        return skipExpand;
-    }
-
-    /**
-     * Returns the salt, or null if the salt should be generated as a byte array
-     * of HashLen zeros.
-     *
-     * @return the salt, or null
-     */
-    public byte[] getSalt()
-    {
-        return Arrays.clone(salt);
-    }
-
-    /**
-     * Returns the info field, which may be empty (null is converted to empty).
-     *
-     * @return the info field, never null
-     */
-    public byte[] getInfo()
-    {
-        return Arrays.clone(info);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/params/IESParameters.java b/bcprov/src/main/java/org/bouncycastle/crypto/params/IESParameters.java
deleted file mode 100644
index 0600b34..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/params/IESParameters.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package org.bouncycastle.crypto.params;
-
-import org.bouncycastle.crypto.CipherParameters;
-
-/**
- * parameters for using an integrated cipher in stream mode.
- */
-public class IESParameters
-    implements CipherParameters
-{
-    private byte[]  derivation;
-    private byte[]  encoding;
-    private int     macKeySize;
-
-    /**
-     * @param derivation the derivation parameter for the KDF function.
-     * @param encoding the encoding parameter for the KDF function.
-     * @param macKeySize the size of the MAC key (in bits).
-     */
-    public IESParameters(
-        byte[]  derivation,
-        byte[]  encoding,
-        int     macKeySize)
-    {
-        this.derivation = derivation;
-        this.encoding = encoding;
-        this.macKeySize = macKeySize;
-    }
-
-    public byte[] getDerivationV()
-    {
-        return derivation;
-    }
-
-    public byte[] getEncodingV()
-    {
-        return encoding;
-    }
-
-    public int getMacKeySize()
-    {
-        return macKeySize;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/params/IESWithCipherParameters.java b/bcprov/src/main/java/org/bouncycastle/crypto/params/IESWithCipherParameters.java
deleted file mode 100644
index ef61b2c..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/params/IESWithCipherParameters.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package org.bouncycastle.crypto.params;
-
-
-public class IESWithCipherParameters
-    extends IESParameters
-{
-    private int cipherKeySize;
-
-    /**
-     * @param derivation the derivation parameter for the KDF function.
-     * @param encoding the encoding parameter for the KDF function.
-     * @param macKeySize the size of the MAC key (in bits).
-     * @param cipherKeySize the size of the associated Cipher key (in bits).
-     */
-    public IESWithCipherParameters(
-        byte[]  derivation,
-        byte[]  encoding,
-        int     macKeySize,
-        int     cipherKeySize)
-    {
-        super(derivation, encoding, macKeySize);
-
-        this.cipherKeySize = cipherKeySize;
-    }
-
-    public int getCipherKeySize()
-    {
-        return cipherKeySize;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/params/ISO18033KDFParameters.java b/bcprov/src/main/java/org/bouncycastle/crypto/params/ISO18033KDFParameters.java
deleted file mode 100644
index 8dffe2e..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/params/ISO18033KDFParameters.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package org.bouncycastle.crypto.params;
-
-import org.bouncycastle.crypto.DerivationParameters;
-
-/**
- * parameters for Key derivation functions for ISO-18033
- */
-public class ISO18033KDFParameters
-    implements DerivationParameters
-{
-    byte[]  seed;
-
-    public ISO18033KDFParameters(
-        byte[]  seed)
-    {
-        this.seed = seed;
-    }
-
-    public byte[] getSeed()
-    {
-        return seed;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/params/KDFCounterParameters.java b/bcprov/src/main/java/org/bouncycastle/crypto/params/KDFCounterParameters.java
deleted file mode 100644
index 29d8b36..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/params/KDFCounterParameters.java
+++ /dev/null
@@ -1,120 +0,0 @@
-package org.bouncycastle.crypto.params;
-
-import org.bouncycastle.crypto.DerivationParameters;
-import org.bouncycastle.util.Arrays;
-
-/**
- * This KDF has been defined by the publicly available NIST SP 800-108 specification.
- * NIST SP800-108 allows for alternative orderings of the input fields, meaning that the input can be formated in multiple ways.
- * There are 3 supported formats:  - Below [i]_2 is a counter of r-bits length concatenated to the fixedInputData.
- * <ul>
- * <li>1: K(i) := PRF( KI, [i]_2 || Label || 0x00 || Context || [L]_2 ) with the counter at the very beginning of the fixedInputData (The default implementation has this format)</li>
- * <li>2: K(i) := PRF( KI, Label || 0x00 || Context || [L]_2 || [i]_2 ) with the counter at the very end of the fixedInputData</li>
- * <li>3a: K(i) := PRF( KI, Label || 0x00 || [i]_2 || Context || [L]_2 ) OR:</li>
- * <li>3b: K(i) := PRF( KI, Label || 0x00 || [i]_2 || [L]_2 || Context ) OR:</li>
- * <li>3c: K(i) := PRF( KI, Label || [i]_2 || 0x00 || Context || [L]_2 ) etc... with the counter somewhere in the 'middle' of the fixedInputData.</li>
- * </ul>
- * <p>
- * This function must be called with the following KDFCounterParameters():
- *  - KI     <br/>
- *  - The part of the fixedInputData that comes BEFORE the counter OR null  <br/>
- *  - the part of the fixedInputData that comes AFTER the counter OR null  <br/>
- *  - the length of the counter in bits (not bytes) <br/>
- * </p>
- * Resulting function calls assuming an 8 bit counter.
- * <ul>
- * <li>1.  KDFCounterParameters(ki, 	null, 									"Label || 0x00 || Context || [L]_2]",	8); </li>
- * <li>2.  KDFCounterParameters(ki, 	"Label || 0x00 || Context || [L]_2]", 	null,									8); </li>
- * <li>3a. KDFCounterParameters(ki, 	"Label || 0x00",						"Context || [L]_2]",					8);  </li>
- * <li>3b. KDFCounterParameters(ki, 	"Label || 0x00",						"[L]_2] || Context",					8);</li>
- * <li>3c. KDFCounterParameters(ki, 	"Label", 								"0x00 || Context || [L]_2]",			8); </li>
- * </ul>
- */
-public final class KDFCounterParameters
-    implements DerivationParameters
-{
-
-    private byte[] ki;
-    private byte[] fixedInputDataCounterPrefix;
-    private byte[] fixedInputDataCounterSuffix;
-    private int r;
-
-    /**
-     * Base constructor - suffix fixed input data only.
-     *
-     * @param ki the KDF seed
-     * @param fixedInputDataCounterSuffix  fixed input data to follow counter.
-     * @param r length of the counter in bits.
-     */
-    public KDFCounterParameters(byte[] ki, byte[] fixedInputDataCounterSuffix, int r)
-    {
-    	this(ki, null, fixedInputDataCounterSuffix, r);
-    }
-
-    /**
-     * Base constructor - prefix and suffix fixed input data.
-     *
-     * @param ki the KDF seed
-     * @param fixedInputDataCounterPrefix fixed input data to precede counter
-     * @param fixedInputDataCounterSuffix fixed input data to follow counter.
-     * @param r length of the counter in bits.
-     */
-    public KDFCounterParameters(byte[] ki, byte[] fixedInputDataCounterPrefix, byte[] fixedInputDataCounterSuffix, int r)
-    {
-        if (ki == null)
-        {
-            throw new IllegalArgumentException("A KDF requires Ki (a seed) as input");
-        }
-        this.ki = Arrays.clone(ki);
-
-        if (fixedInputDataCounterPrefix == null)
-        {
-            this.fixedInputDataCounterPrefix = new byte[0];
-        }
-        else
-        {
-            this.fixedInputDataCounterPrefix = Arrays.clone(fixedInputDataCounterPrefix);
-        }
-        
-        if (fixedInputDataCounterSuffix == null)
-        {
-            this.fixedInputDataCounterSuffix = new byte[0];
-        }
-        else
-        {
-            this.fixedInputDataCounterSuffix = Arrays.clone(fixedInputDataCounterSuffix);
-        }
-
-        if (r != 8 && r != 16 && r != 24 && r != 32)
-        {
-            throw new IllegalArgumentException("Length of counter should be 8, 16, 24 or 32");
-        }
-        this.r = r;
-    }
-    
-    public byte[] getKI()
-    {
-        return ki;
-    }
-
-    public byte[] getFixedInputData()
-    {
-    	//Retained for backwards compatibility
-        return Arrays.clone(fixedInputDataCounterSuffix);
-    }
-
-    public byte[] getFixedInputDataCounterPrefix()
-    {
-        return Arrays.clone(fixedInputDataCounterPrefix);
-    }
-    
-    public byte[] getFixedInputDataCounterSuffix()
-    {
-        return Arrays.clone(fixedInputDataCounterSuffix);
-    }
-
-    public int getR()
-    {
-        return r;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/params/KDFDoublePipelineIterationParameters.java b/bcprov/src/main/java/org/bouncycastle/crypto/params/KDFDoublePipelineIterationParameters.java
deleted file mode 100644
index 383678a..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/params/KDFDoublePipelineIterationParameters.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package org.bouncycastle.crypto.params;
-
-import org.bouncycastle.crypto.DerivationParameters;
-import org.bouncycastle.util.Arrays;
-
-/**
- * Note that counter is only supported at the location presented in the
- * NIST SP 800-108 specification, not in the additional locations present
- * in the CAVP test vectors.
- */
-public final class KDFDoublePipelineIterationParameters
-    implements DerivationParameters
-{
-
-    // could be any valid value, using 32, don't know why
-    private static final int UNUSED_R = 32;
-
-    private final byte[] ki;
-    private final boolean useCounter;
-    private final int r;
-    private final byte[] fixedInputData;
-
-    private KDFDoublePipelineIterationParameters(byte[] ki, byte[] fixedInputData, int r, boolean useCounter)
-    {
-        if (ki == null)
-        {
-            throw new IllegalArgumentException("A KDF requires Ki (a seed) as input");
-        }
-        this.ki = Arrays.clone(ki);
-
-        if (fixedInputData == null)
-        {
-            this.fixedInputData = new byte[0];
-        }
-        else
-        {
-            this.fixedInputData = Arrays.clone(fixedInputData);
-        }
-
-        if (r != 8 && r != 16 && r != 24 && r != 32)
-        {
-            throw new IllegalArgumentException("Length of counter should be 8, 16, 24 or 32");
-        }
-        this.r = r;
-
-        this.useCounter = useCounter;
-    }
-
-    public static KDFDoublePipelineIterationParameters createWithCounter(
-        byte[] ki, byte[] fixedInputData, int r)
-    {
-        return new KDFDoublePipelineIterationParameters(ki, fixedInputData, r, true);
-    }
-
-    public static KDFDoublePipelineIterationParameters createWithoutCounter(
-        byte[] ki, byte[] fixedInputData)
-    {
-        return new KDFDoublePipelineIterationParameters(ki, fixedInputData, UNUSED_R, false);
-    }
-
-    public byte[] getKI()
-    {
-        return ki;
-    }
-
-    public boolean useCounter()
-    {
-        return useCounter;
-    }
-
-    public int getR()
-    {
-        return r;
-    }
-
-    public byte[] getFixedInputData()
-    {
-        return Arrays.clone(fixedInputData);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/params/KDFFeedbackParameters.java b/bcprov/src/main/java/org/bouncycastle/crypto/params/KDFFeedbackParameters.java
deleted file mode 100644
index 8a6e7f5..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/params/KDFFeedbackParameters.java
+++ /dev/null
@@ -1,96 +0,0 @@
-package org.bouncycastle.crypto.params;
-
-import org.bouncycastle.crypto.DerivationParameters;
-import org.bouncycastle.util.Arrays;
-
-/**
- * Note that counter is only supported at the location presented in the
- * NIST SP 800-108 specification, not in the additional locations present
- * in the CAVP test vectors.
- */
-public final class KDFFeedbackParameters
-    implements DerivationParameters
-{
-
-    // could be any valid value, using 32, don't know why
-    private static final int UNUSED_R = -1;
-
-    private final byte[] ki;
-    private final byte[] iv;
-    private final boolean useCounter;
-    private final int r;
-    private final byte[] fixedInputData;
-
-    private KDFFeedbackParameters(byte[] ki, byte[] iv, byte[] fixedInputData, int r, boolean useCounter)
-    {
-        if (ki == null)
-        {
-            throw new IllegalArgumentException("A KDF requires Ki (a seed) as input");
-        }
-        this.ki = Arrays.clone(ki);
-
-        if (fixedInputData == null)
-        {
-            this.fixedInputData = new byte[0];
-        }
-        else
-        {
-            this.fixedInputData = Arrays.clone(fixedInputData);
-        }
-
-        this.r = r;
-
-        if (iv == null)
-        {
-            this.iv = new byte[0];
-        }
-        else
-        {
-            this.iv = Arrays.clone(iv);
-        }
-
-        this.useCounter = useCounter;
-    }
-
-    public static KDFFeedbackParameters createWithCounter(
-        byte[] ki, final byte[] iv, byte[] fixedInputData, int r)
-    {
-        if (r != 8 && r != 16 && r != 24 && r != 32)
-        {
-            throw new IllegalArgumentException("Length of counter should be 8, 16, 24 or 32");
-        }
-
-        return new KDFFeedbackParameters(ki, iv, fixedInputData, r, true);
-    }
-
-    public static KDFFeedbackParameters createWithoutCounter(
-        byte[] ki, final byte[] iv, byte[] fixedInputData)
-    {
-        return new KDFFeedbackParameters(ki, iv, fixedInputData, UNUSED_R, false);
-    }
-
-    public byte[] getKI()
-    {
-        return ki;
-    }
-
-    public byte[] getIV()
-    {
-        return iv;
-    }
-
-    public boolean useCounter()
-    {
-        return useCounter;
-    }
-
-    public int getR()
-    {
-        return r;
-    }
-
-    public byte[] getFixedInputData()
-    {
-        return Arrays.clone(fixedInputData);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/params/KDFParameters.java b/bcprov/src/main/java/org/bouncycastle/crypto/params/KDFParameters.java
deleted file mode 100644
index f3bac64..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/params/KDFParameters.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package org.bouncycastle.crypto.params;
-
-import org.bouncycastle.crypto.DerivationParameters;
-
-/**
- * parameters for Key derivation functions for IEEE P1363a
- */
-public class KDFParameters
-    implements DerivationParameters
-{
-    byte[]  iv;
-    byte[]  shared;
-
-    public KDFParameters(
-        byte[]  shared,
-        byte[]  iv)
-    {
-        this.shared = shared;
-        this.iv = iv;
-    }
-
-    public byte[] getSharedSecret()
-    {
-        return shared;
-    }
-
-    public byte[] getIV()
-    {
-        return iv;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/params/MGFParameters.java b/bcprov/src/main/java/org/bouncycastle/crypto/params/MGFParameters.java
deleted file mode 100644
index 847bd98..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/params/MGFParameters.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package org.bouncycastle.crypto.params;
-
-import org.bouncycastle.crypto.DerivationParameters;
-
-/**
- * parameters for mask derivation functions.
- */
-public class MGFParameters
-    implements DerivationParameters
-{
-    byte[]  seed;
-
-    public MGFParameters(
-        byte[]  seed)
-    {
-        this(seed, 0, seed.length);
-    }
-
-    public MGFParameters(
-        byte[]  seed,
-        int     off,
-        int     len)
-    {
-        this.seed = new byte[len];
-        System.arraycopy(seed, off, this.seed, 0, len);
-    }
-
-    public byte[] getSeed()
-    {
-        return seed;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/params/MQVPrivateParameters.java b/bcprov/src/main/java/org/bouncycastle/crypto/params/MQVPrivateParameters.java
deleted file mode 100644
index 832c07f..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/params/MQVPrivateParameters.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package org.bouncycastle.crypto.params;
-
-import org.bouncycastle.crypto.CipherParameters;
-
-public class MQVPrivateParameters
-    implements CipherParameters
-{
-    private ECPrivateKeyParameters staticPrivateKey;
-    private ECPrivateKeyParameters ephemeralPrivateKey;
-    private ECPublicKeyParameters ephemeralPublicKey;
-
-    public MQVPrivateParameters(
-        ECPrivateKeyParameters  staticPrivateKey,
-        ECPrivateKeyParameters  ephemeralPrivateKey)
-    {
-        this(staticPrivateKey, ephemeralPrivateKey, null);
-    }
-
-    public MQVPrivateParameters(
-        ECPrivateKeyParameters  staticPrivateKey,
-        ECPrivateKeyParameters  ephemeralPrivateKey,
-        ECPublicKeyParameters   ephemeralPublicKey)
-    {
-        this.staticPrivateKey = staticPrivateKey;
-        this.ephemeralPrivateKey = ephemeralPrivateKey;
-        this.ephemeralPublicKey = ephemeralPublicKey;
-    }
-
-    public ECPrivateKeyParameters getStaticPrivateKey()
-    {
-        return staticPrivateKey;
-    }
-
-    public ECPrivateKeyParameters getEphemeralPrivateKey()
-    {
-        return ephemeralPrivateKey;
-    }
-
-    public ECPublicKeyParameters getEphemeralPublicKey()
-    {
-        return ephemeralPublicKey;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/params/MQVPublicParameters.java b/bcprov/src/main/java/org/bouncycastle/crypto/params/MQVPublicParameters.java
deleted file mode 100644
index b3b2467..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/params/MQVPublicParameters.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package org.bouncycastle.crypto.params;
-
-import org.bouncycastle.crypto.CipherParameters;
-
-public class MQVPublicParameters
-    implements CipherParameters
-{
-    private ECPublicKeyParameters staticPublicKey;
-    private ECPublicKeyParameters ephemeralPublicKey;
-
-    public MQVPublicParameters(
-        ECPublicKeyParameters   staticPublicKey,
-        ECPublicKeyParameters   ephemeralPublicKey)
-    {
-        this.staticPublicKey = staticPublicKey;
-        this.ephemeralPublicKey = ephemeralPublicKey;
-    }
-
-    public ECPublicKeyParameters getStaticPublicKey()
-    {
-        return staticPublicKey;
-    }
-
-    public ECPublicKeyParameters getEphemeralPublicKey()
-    {
-        return ephemeralPublicKey;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/params/NaccacheSternKeyGenerationParameters.java b/bcprov/src/main/java/org/bouncycastle/crypto/params/NaccacheSternKeyGenerationParameters.java
deleted file mode 100644
index 758fcd7..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/params/NaccacheSternKeyGenerationParameters.java
+++ /dev/null
@@ -1,97 +0,0 @@
-package org.bouncycastle.crypto.params;
-
-import java.security.SecureRandom;
-
-import org.bouncycastle.crypto.KeyGenerationParameters;
-
-/**
- * Parameters for NaccacheStern public private key generation. For details on
- * this cipher, please see
- * 
- * http://www.gemplus.com/smart/rd/publications/pdf/NS98pkcs.pdf
- */
-public class NaccacheSternKeyGenerationParameters extends KeyGenerationParameters
-{
-
-    // private BigInteger publicExponent;
-    private int certainty;
-
-    private int cntSmallPrimes;
-
-    private boolean debug = false;
-
-    /**
-     * Parameters for generating a NaccacheStern KeyPair.
-     * 
-     * @param random
-     *            The source of randomness
-     * @param strength
-     *            The desired strength of the Key in Bits
-     * @param certainty
-     *            the probability that the generated primes are not really prime
-     *            as integer: 2^(-certainty) is then the probability
-     * @param cntSmallPrimes
-     *            How many small key factors are desired
-     */
-    public NaccacheSternKeyGenerationParameters(SecureRandom random, int strength, int certainty, int cntSmallPrimes)
-    {
-        this(random, strength, certainty, cntSmallPrimes, false);
-    }
-
-    /**
-     * Parameters for a NaccacheStern KeyPair.
-     * 
-     * @param random
-     *            The source of randomness
-     * @param strength
-     *            The desired strength of the Key in Bits
-     * @param certainty
-     *            the probability that the generated primes are not really prime
-     *            as integer: 2^(-certainty) is then the probability
-     * @param cntSmallPrimes
-     *            How many small key factors are desired
-     * @param debug
-     *            Turn debugging on or off (reveals secret information, use with
-     *            caution)
-     */
-    public NaccacheSternKeyGenerationParameters(SecureRandom random,
-            int strength, int certainty, int cntSmallPrimes, boolean debug)
-    {
-        super(random, strength);
-
-        this.certainty = certainty;
-        if (cntSmallPrimes % 2 == 1)
-        {
-            throw new IllegalArgumentException("cntSmallPrimes must be a multiple of 2");
-        }
-        if (cntSmallPrimes < 30)
-        {
-            throw new IllegalArgumentException("cntSmallPrimes must be >= 30 for security reasons");
-        }
-        this.cntSmallPrimes = cntSmallPrimes;
-
-        this.debug = debug;
-    }
-
-    /**
-     * @return Returns the certainty.
-     */
-    public int getCertainty()
-    {
-        return certainty;
-    }
-
-    /**
-     * @return Returns the cntSmallPrimes.
-     */
-    public int getCntSmallPrimes()
-    {
-        return cntSmallPrimes;
-    }
-
-    public boolean isDebug()
-    {
-        return debug;
-    }
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/params/NaccacheSternKeyParameters.java b/bcprov/src/main/java/org/bouncycastle/crypto/params/NaccacheSternKeyParameters.java
deleted file mode 100644
index 21b6a28..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/params/NaccacheSternKeyParameters.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package org.bouncycastle.crypto.params;
-
-import java.math.BigInteger;
-
-/**
- * Public key parameters for NaccacheStern cipher. For details on this cipher,
- * please see
- * 
- * http://www.gemplus.com/smart/rd/publications/pdf/NS98pkcs.pdf
- */
-public class NaccacheSternKeyParameters extends AsymmetricKeyParameter
-{
-
-    private BigInteger g, n;
-
-    int lowerSigmaBound;
-
-    /**
-     * @param privateKey
-     */
-    public NaccacheSternKeyParameters(boolean privateKey, BigInteger g, BigInteger n, int lowerSigmaBound)
-    {
-        super(privateKey);
-        this.g = g;
-        this.n = n;
-        this.lowerSigmaBound = lowerSigmaBound;
-    }
-
-    /**
-     * @return Returns the g.
-     */
-    public BigInteger getG()
-    {
-        return g;
-    }
-
-    /**
-     * @return Returns the lowerSigmaBound.
-     */
-    public int getLowerSigmaBound()
-    {
-        return lowerSigmaBound;
-    }
-
-    /**
-     * @return Returns the n.
-     */
-    public BigInteger getModulus()
-    {
-        return n;
-    }
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/params/NaccacheSternPrivateKeyParameters.java b/bcprov/src/main/java/org/bouncycastle/crypto/params/NaccacheSternPrivateKeyParameters.java
deleted file mode 100644
index 6d0ec48..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/params/NaccacheSternPrivateKeyParameters.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package org.bouncycastle.crypto.params;
-
-import java.math.BigInteger;
-import java.util.Vector;
-
-/**
- * Private key parameters for NaccacheStern cipher. For details on this cipher,
- * please see
- * 
- * http://www.gemplus.com/smart/rd/publications/pdf/NS98pkcs.pdf
- */
-public class NaccacheSternPrivateKeyParameters extends NaccacheSternKeyParameters 
-{
-    private BigInteger phi_n;
-    private Vector     smallPrimes;
-
-    /**
-     * Constructs a NaccacheSternPrivateKey
-     * 
-     * @param g
-     *            the public enryption parameter g
-     * @param n
-     *            the public modulus n = p*q
-     * @param lowerSigmaBound
-     *            the public lower sigma bound up to which data can be encrypted
-     * @param smallPrimes
-     *            the small primes, of which sigma is constructed in the right
-     *            order
-     * @param phi_n
-     *            the private modulus phi(n) = (p-1)(q-1)
-     */
-    public NaccacheSternPrivateKeyParameters(BigInteger g, BigInteger n,
-            int lowerSigmaBound, Vector smallPrimes,
-            BigInteger phi_n)
-    {
-        super(true, g, n, lowerSigmaBound);
-        this.smallPrimes = smallPrimes;
-        this.phi_n = phi_n;
-    }
-
-    public BigInteger getPhi_n()
-    {
-        return phi_n;
-    }
-
-    public Vector getSmallPrimes()
-    {
-        return smallPrimes;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/params/ParametersWithSBox.java b/bcprov/src/main/java/org/bouncycastle/crypto/params/ParametersWithSBox.java
deleted file mode 100644
index b226a9d..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/params/ParametersWithSBox.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package org.bouncycastle.crypto.params;
-
-import org.bouncycastle.crypto.CipherParameters;
-
-public class ParametersWithSBox
-    implements CipherParameters
-{
-    private CipherParameters  parameters;
-    private byte[]            sBox;
-
-    public ParametersWithSBox(
-        CipherParameters parameters,
-        byte[]           sBox)
-    {
-        this.parameters = parameters;
-        this.sBox = sBox;
-    }
-
-    public byte[] getSBox()
-    {
-        return sBox;
-    }
-
-    public CipherParameters getParameters()
-    {
-        return parameters;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/params/ParametersWithSalt.java b/bcprov/src/main/java/org/bouncycastle/crypto/params/ParametersWithSalt.java
deleted file mode 100644
index 73765dd..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/params/ParametersWithSalt.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package org.bouncycastle.crypto.params;
-
-import org.bouncycastle.crypto.CipherParameters;
-
-/**
- * Cipher parameters with a fixed salt value associated with them.
- */
-public class ParametersWithSalt
-    implements CipherParameters
-{
-    private byte[]              salt;
-    private CipherParameters    parameters;
-
-    public ParametersWithSalt(
-        CipherParameters    parameters,
-        byte[]              salt)
-    {
-        this(parameters, salt, 0, salt.length);
-    }
-
-    public ParametersWithSalt(
-        CipherParameters    parameters,
-        byte[]              salt,
-        int                 saltOff,
-        int                 saltLen)
-    {
-        this.salt = new byte[saltLen];
-        this.parameters = parameters;
-
-        System.arraycopy(salt, saltOff, this.salt, 0, saltLen);
-    }
-
-    public byte[] getSalt()
-    {
-        return salt;
-    }
-
-    public CipherParameters getParameters()
-    {
-        return parameters;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/params/RC5Parameters.java b/bcprov/src/main/java/org/bouncycastle/crypto/params/RC5Parameters.java
deleted file mode 100644
index 6cbd57f..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/params/RC5Parameters.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package org.bouncycastle.crypto.params;
-
-import org.bouncycastle.crypto.CipherParameters;
-
-public class RC5Parameters
-    implements CipherParameters
-{
-    private byte[]  key;
-    private int     rounds;
-
-    public RC5Parameters(
-        byte[]  key,
-        int     rounds)
-    {
-        if (key.length > 255)
-        {
-            throw new IllegalArgumentException("RC5 key length can be no greater than 255");
-        }
-
-        this.key = new byte[key.length];
-        this.rounds = rounds;
-
-        System.arraycopy(key, 0, this.key, 0, key.length);
-    }
-
-    public byte[] getKey()
-    {
-        return key;
-    }
-
-    public int getRounds()
-    {
-        return rounds;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/params/RSABlindingParameters.java b/bcprov/src/main/java/org/bouncycastle/crypto/params/RSABlindingParameters.java
deleted file mode 100644
index c7fa6ba..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/params/RSABlindingParameters.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package org.bouncycastle.crypto.params;
-
-import org.bouncycastle.crypto.CipherParameters;
-
-import java.math.BigInteger;
-
-public class RSABlindingParameters
-    implements CipherParameters
-{
-    private RSAKeyParameters publicKey;
-    private BigInteger       blindingFactor;
-
-    public RSABlindingParameters(
-        RSAKeyParameters publicKey,
-        BigInteger       blindingFactor)
-    {
-        if (publicKey instanceof RSAPrivateCrtKeyParameters)
-        {
-            throw new IllegalArgumentException("RSA parameters should be for a public key");
-        }
-        
-        this.publicKey = publicKey;
-        this.blindingFactor = blindingFactor;
-    }
-
-    public RSAKeyParameters getPublicKey()
-    {
-        return publicKey;
-    }
-
-    public BigInteger getBlindingFactor()
-    {
-        return blindingFactor;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/params/SRP6GroupParameters.java b/bcprov/src/main/java/org/bouncycastle/crypto/params/SRP6GroupParameters.java
deleted file mode 100644
index 506560e..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/params/SRP6GroupParameters.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.bouncycastle.crypto.params;
-
-import java.math.BigInteger;
-
-public class SRP6GroupParameters
-{
-    private BigInteger N, g;
-
-    public SRP6GroupParameters(BigInteger N, BigInteger g)
-    {
-        this.N = N;
-        this.g = g;
-    }
-
-    public BigInteger getG()
-    {
-        return g;
-    }
-
-    public BigInteger getN()
-    {
-        return N;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/params/SkeinParameters.java b/bcprov/src/main/java/org/bouncycastle/crypto/params/SkeinParameters.java
deleted file mode 100644
index 326e106..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/params/SkeinParameters.java
+++ /dev/null
@@ -1,329 +0,0 @@
-package org.bouncycastle.crypto.params;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.OutputStreamWriter;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Locale;
-
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.digests.SkeinDigest;
-import org.bouncycastle.crypto.digests.SkeinEngine;
-import org.bouncycastle.crypto.macs.SkeinMac;
-import org.bouncycastle.util.Integers;
-
-/**
- * Parameters for the Skein hash function - a series of byte[] strings identified by integer tags.
- * <p>
- * Parameterised Skein can be used for:
- * <ul>
- * <li>MAC generation, by providing a {@link SkeinParameters.Builder#setKey(byte[]) key}.</li>
- * <li>Randomised hashing, by providing a {@link SkeinParameters.Builder#setNonce(byte[]) nonce}.</li>
- * <li>A hash function for digital signatures, associating a
- * {@link SkeinParameters.Builder#setPublicKey(byte[]) public key} with the message digest.</li>
- * <li>A key derivation function, by providing a
- * {@link SkeinParameters.Builder#setKeyIdentifier(byte[]) key identifier}.</li>
- * <li>Personalised hashing, by providing a
- * {@link SkeinParameters.Builder#setPersonalisation(Date, String, String) recommended format} or
- * {@link SkeinParameters.Builder#setPersonalisation(byte[]) arbitrary} personalisation string.</li>
- * </ul>
- *
- * @see SkeinEngine
- * @see SkeinDigest
- * @see SkeinMac
- */
-public class SkeinParameters
-    implements CipherParameters
-{
-    /**
-     * The parameter type for a secret key, supporting MAC or KDF functions: {@value
-     * #PARAM_TYPE_KEY}.
-     */
-    public static final int PARAM_TYPE_KEY = 0;
-
-    /**
-     * The parameter type for the Skein configuration block: {@value #PARAM_TYPE_CONFIG}.
-     */
-    public static final int PARAM_TYPE_CONFIG = 4;
-
-    /**
-     * The parameter type for a personalisation string: {@value #PARAM_TYPE_PERSONALISATION}.
-     */
-    public static final int PARAM_TYPE_PERSONALISATION = 8;
-
-    /**
-     * The parameter type for a public key: {@value #PARAM_TYPE_PUBLIC_KEY}.
-     */
-    public static final int PARAM_TYPE_PUBLIC_KEY = 12;
-
-    /**
-     * The parameter type for a key identifier string: {@value #PARAM_TYPE_KEY_IDENTIFIER}.
-     */
-    public static final int PARAM_TYPE_KEY_IDENTIFIER = 16;
-
-    /**
-     * The parameter type for a nonce: {@value #PARAM_TYPE_NONCE}.
-     */
-    public static final int PARAM_TYPE_NONCE = 20;
-
-    /**
-     * The parameter type for the message: {@value #PARAM_TYPE_MESSAGE}.
-     */
-    public static final int PARAM_TYPE_MESSAGE = 48;
-
-    /**
-     * The parameter type for the output transformation: {@value #PARAM_TYPE_OUTPUT}.
-     */
-    public static final int PARAM_TYPE_OUTPUT = 63;
-
-    private Hashtable parameters;
-
-    public SkeinParameters()
-    {
-        this(new Hashtable());
-    }
-
-    private SkeinParameters(final Hashtable parameters)
-    {
-        this.parameters = parameters;
-    }
-
-    /**
-     * Obtains a map of type (Integer) to value (byte[]) for the parameters tracked in this object.
-     */
-    public Hashtable getParameters()
-    {
-        return parameters;
-    }
-
-    /**
-     * Obtains the value of the {@link #PARAM_TYPE_KEY key parameter}, or <code>null</code> if not
-     * set.
-     */
-    public byte[] getKey()
-    {
-        return (byte[])parameters.get(Integers.valueOf(PARAM_TYPE_KEY));
-    }
-
-    /**
-     * Obtains the value of the {@link #PARAM_TYPE_PERSONALISATION personalisation parameter}, or
-     * <code>null</code> if not set.
-     */
-    public byte[] getPersonalisation()
-    {
-        return (byte[])parameters.get(Integers.valueOf(PARAM_TYPE_PERSONALISATION));
-    }
-
-    /**
-     * Obtains the value of the {@link #PARAM_TYPE_PUBLIC_KEY public key parameter}, or
-     * <code>null</code> if not set.
-     */
-    public byte[] getPublicKey()
-    {
-        return (byte[])parameters.get(Integers.valueOf(PARAM_TYPE_PUBLIC_KEY));
-    }
-
-    /**
-     * Obtains the value of the {@link #PARAM_TYPE_KEY_IDENTIFIER key identifier parameter}, or
-     * <code>null</code> if not set.
-     */
-    public byte[] getKeyIdentifier()
-    {
-        return (byte[])parameters.get(Integers.valueOf(PARAM_TYPE_KEY_IDENTIFIER));
-    }
-
-    /**
-     * Obtains the value of the {@link #PARAM_TYPE_NONCE nonce parameter}, or <code>null</code> if
-     * not set.
-     */
-    public byte[] getNonce()
-    {
-        return (byte[])parameters.get(Integers.valueOf(PARAM_TYPE_NONCE));
-    }
-
-    /**
-     * A builder for {@link SkeinParameters}.
-     */
-    public static class Builder
-    {
-        private Hashtable parameters = new Hashtable();
-
-        public Builder()
-        {
-        }
-
-        public Builder(Hashtable paramsMap)
-        {
-            Enumeration keys = paramsMap.keys();
-            while (keys.hasMoreElements())
-            {
-                Integer key = (Integer)keys.nextElement();
-                parameters.put(key, paramsMap.get(key));
-            }
-        }
-
-        public Builder(SkeinParameters params)
-        {
-            Enumeration keys = params.parameters.keys();
-            while (keys.hasMoreElements())
-            {
-                Integer key = (Integer)keys.nextElement();
-                parameters.put(key, params.parameters.get(key));
-            }
-        }
-
-        /**
-         * Sets a parameters to apply to the Skein hash function.<br>
-         * Parameter types must be in the range 0,5..62, and cannot use the value {@value
-         * SkeinParameters#PARAM_TYPE_MESSAGE} (reserved for message body).
-         * <p>
-         * Parameters with type &lt; {@value SkeinParameters#PARAM_TYPE_MESSAGE} are processed before
-         * the message content, parameters with type &gt; {@value SkeinParameters#PARAM_TYPE_MESSAGE}
-         * are processed after the message and prior to output.
-         *
-         * @param type  the type of the parameter, in the range 5..62.
-         * @param value the byte sequence of the parameter.
-         * @return
-         */
-        public Builder set(int type, byte[] value)
-        {
-            if (value == null)
-            {
-                throw new IllegalArgumentException("Parameter value must not be null.");
-            }
-            if ((type != PARAM_TYPE_KEY)
-                && (type <= PARAM_TYPE_CONFIG || type >= PARAM_TYPE_OUTPUT || type == PARAM_TYPE_MESSAGE))
-            {
-                throw new IllegalArgumentException("Parameter types must be in the range 0,5..47,49..62.");
-            }
-            if (type == PARAM_TYPE_CONFIG)
-            {
-                throw new IllegalArgumentException("Parameter type " + PARAM_TYPE_CONFIG
-                    + " is reserved for internal use.");
-            }
-            this.parameters.put(Integers.valueOf(type), value);
-            return this;
-        }
-
-        /**
-         * Sets the {@link SkeinParameters#PARAM_TYPE_KEY} parameter.
-         */
-        public Builder setKey(byte[] key)
-        {
-            return set(PARAM_TYPE_KEY, key);
-        }
-
-        /**
-         * Sets the {@link SkeinParameters#PARAM_TYPE_PERSONALISATION} parameter.
-         */
-        public Builder setPersonalisation(byte[] personalisation)
-        {
-            return set(PARAM_TYPE_PERSONALISATION, personalisation);
-        }
-
-        /**
-         * Implements the recommended personalisation format for Skein defined in Section 4.11 of
-         * the Skein 1.3 specification.
-         * <p>
-         * The format is <code>YYYYMMDD email@address distinguisher</code>, encoded to a byte
-         * sequence using UTF-8 encoding.
-         *
-         * @param date          the date the personalised application of the Skein was defined.
-         * @param emailAddress  the email address of the creation of the personalised application.
-         * @param distinguisher an arbitrary personalisation string distinguishing the application.
-         * @return the current builder.
-         */
-        public Builder setPersonalisation(Date date, String emailAddress, String distinguisher)
-        {
-            try
-            {
-                final ByteArrayOutputStream bout = new ByteArrayOutputStream();
-                final OutputStreamWriter out = new OutputStreamWriter(bout, "UTF-8");
-                final DateFormat format = new SimpleDateFormat("YYYYMMDD");
-                out.write(format.format(date));
-                out.write(" ");
-                out.write(emailAddress);
-                out.write(" ");
-                out.write(distinguisher);
-                out.close();
-                return set(PARAM_TYPE_PERSONALISATION, bout.toByteArray());
-            }
-            catch (IOException e)
-            {
-                throw new IllegalStateException("Byte I/O failed: " + e);
-            }
-        }
-
-        /**
-          * Implements the recommended personalisation format for Skein defined in Section 4.11 of
-          * the Skein 1.3 specification. You may need to use this method if the default locale
-          * doesn't use a Gregorian calender so that the GeneralizedTime produced is compatible implementations.
-          * <p>
-          * The format is <code>YYYYMMDD email@address distinguisher</code>, encoded to a byte
-          * sequence using UTF-8 encoding.
-          *
-          * @param date          the date the personalised application of the Skein was defined.
-          * @param dateLocale    locale to be used for date interpretation.
-          * @param emailAddress  the email address of the creation of the personalised application.
-          * @param distinguisher an arbitrary personalisation string distinguishing the application.
-          * @return the current builder.
-          */
-         public Builder setPersonalisation(Date date, Locale dateLocale, String emailAddress, String distinguisher)
-         {
-             try
-             {
-                 final ByteArrayOutputStream bout = new ByteArrayOutputStream();
-                 final OutputStreamWriter out = new OutputStreamWriter(bout, "UTF-8");
-                 final DateFormat format = new SimpleDateFormat("YYYYMMDD", dateLocale);
-                 out.write(format.format(date));
-                 out.write(" ");
-                 out.write(emailAddress);
-                 out.write(" ");
-                 out.write(distinguisher);
-                 out.close();
-                 return set(PARAM_TYPE_PERSONALISATION, bout.toByteArray());
-             }
-             catch (IOException e)
-             {
-                 throw new IllegalStateException("Byte I/O failed: " + e);
-             }
-         }
-
-        /**
-         * Sets the {@link SkeinParameters#PARAM_TYPE_KEY_IDENTIFIER} parameter.
-         */
-        public Builder setPublicKey(byte[] publicKey)
-        {
-            return set(PARAM_TYPE_PUBLIC_KEY, publicKey);
-        }
-
-        /**
-         * Sets the {@link SkeinParameters#PARAM_TYPE_KEY_IDENTIFIER} parameter.
-         */
-        public Builder setKeyIdentifier(byte[] keyIdentifier)
-        {
-            return set(PARAM_TYPE_KEY_IDENTIFIER, keyIdentifier);
-        }
-
-        /**
-         * Sets the {@link SkeinParameters#PARAM_TYPE_NONCE} parameter.
-         */
-        public Builder setNonce(byte[] nonce)
-        {
-            return set(PARAM_TYPE_NONCE, nonce);
-        }
-
-        /**
-         * Constructs a new {@link SkeinParameters} instance with the parameters provided to this
-         * builder.
-         */
-        public SkeinParameters build()
-        {
-            return new SkeinParameters(parameters);
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/params/TweakableBlockCipherParameters.java b/bcprov/src/main/java/org/bouncycastle/crypto/params/TweakableBlockCipherParameters.java
deleted file mode 100644
index fa16fac..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/params/TweakableBlockCipherParameters.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package org.bouncycastle.crypto.params;
-
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.util.Arrays;
-
-/**
- * Parameters for tweakable block ciphers.
- */
-public class TweakableBlockCipherParameters
-    implements CipherParameters
-{
-    private final byte[] tweak;
-    private final KeyParameter key;
-
-    public TweakableBlockCipherParameters(final KeyParameter key, final byte[] tweak)
-    {
-        this.key = key;
-        this.tweak = Arrays.clone(tweak);
-    }
-
-    /**
-     * Gets the key.
-     *
-     * @return the key to use, or <code>null</code> to use the current key.
-     */
-    public KeyParameter getKey()
-    {
-        return key;
-    }
-
-    /**
-     * Gets the tweak value.
-     *
-     * @return the tweak to use, or <code>null</code> to use the current tweak.
-     */
-    public byte[] getTweak()
-    {
-        return tweak;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/params/package.html b/bcprov/src/main/java/org/bouncycastle/crypto/params/package.html
deleted file mode 100644
index 4e00a75..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/params/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body bgcolor="#ffffff">
-Classes for parameter objects for ciphers and generators.
-</body>
-</html>
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/parsers/DHIESPublicKeyParser.java b/bcprov/src/main/java/org/bouncycastle/crypto/parsers/DHIESPublicKeyParser.java
deleted file mode 100644
index 44f5b57..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/parsers/DHIESPublicKeyParser.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package org.bouncycastle.crypto.parsers;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.math.BigInteger;
-
-import org.bouncycastle.crypto.KeyParser;
-import org.bouncycastle.crypto.params.AsymmetricKeyParameter;
-import org.bouncycastle.crypto.params.DHParameters;
-import org.bouncycastle.crypto.params.DHPublicKeyParameters;
-
-public class DHIESPublicKeyParser
-    implements KeyParser
-{
-    private DHParameters dhParams;
-
-    public DHIESPublicKeyParser(DHParameters dhParams)
-    {
-        this.dhParams = dhParams;
-    }
-
-    public AsymmetricKeyParameter readKey(InputStream stream)
-        throws IOException
-    {
-        byte[] V = new byte[(dhParams.getP().bitLength() + 7) / 8];
-
-        stream.read(V, 0, V.length);
-
-        return new DHPublicKeyParameters(new BigInteger(1, V), dhParams);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/parsers/ECIESPublicKeyParser.java b/bcprov/src/main/java/org/bouncycastle/crypto/parsers/ECIESPublicKeyParser.java
deleted file mode 100644
index 1880a50..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/parsers/ECIESPublicKeyParser.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package org.bouncycastle.crypto.parsers;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.bouncycastle.crypto.KeyParser;
-import org.bouncycastle.crypto.params.AsymmetricKeyParameter;
-import org.bouncycastle.crypto.params.ECDomainParameters;
-import org.bouncycastle.crypto.params.ECPublicKeyParameters;
-
-public class ECIESPublicKeyParser
-    implements KeyParser
-{
-    private ECDomainParameters ecParams;
-
-    public ECIESPublicKeyParser(ECDomainParameters ecParams)
-    {
-        this.ecParams = ecParams;
-    }
-
-    public AsymmetricKeyParameter readKey(InputStream stream)
-        throws IOException
-    {
-        byte[] V;
-        int    first = stream.read();
-
-        // Decode the public ephemeral key
-        switch (first)
-        {
-        case 0x00: // infinity
-            throw new IOException("Sender's public key invalid.");
-
-        case 0x02: // compressed
-        case 0x03: // Byte length calculated as in ECPoint.getEncoded();
-            V = new byte[1 + (ecParams.getCurve().getFieldSize()+7)/8];
-            break;
-
-        case 0x04: // uncompressed or
-        case 0x06: // hybrid
-        case 0x07: // Byte length calculated as in ECPoint.getEncoded();
-            V = new byte[1 + 2*((ecParams.getCurve().getFieldSize()+7)/8)];
-            break;
-
-        default:
-            throw new IOException("Sender's public key has invalid point encoding 0x" + Integer.toString(first, 16));
-        }
-
-        V[0] = (byte)first;
-        stream.read(V, 1, V.length - 1);
-
-        return new ECPublicKeyParameters(ecParams.getCurve().decodePoint(V), ecParams);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/parsers/package.html b/bcprov/src/main/java/org/bouncycastle/crypto/parsers/package.html
deleted file mode 100644
index 03d05c7..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/parsers/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body bgcolor="#ffffff">
-Helper classes for parsing "on the wire" public keys.
-</body>
-</html>
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/prng/BasicEntropySourceProvider.java b/bcprov/src/main/java/org/bouncycastle/crypto/prng/BasicEntropySourceProvider.java
deleted file mode 100644
index 9f1d042..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/prng/BasicEntropySourceProvider.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package org.bouncycastle.crypto.prng;
-
-import java.security.SecureRandom;
-
-/**
- * An EntropySourceProvider where entropy generation is based on a SecureRandom output using SecureRandom.generateSeed().
- */
-public class BasicEntropySourceProvider
-    implements EntropySourceProvider
-{
-    private final SecureRandom _sr;
-    private final boolean      _predictionResistant;
-
-    /**
-     * Create a entropy source provider based on the passed in SecureRandom.
-     *
-     * @param random the SecureRandom to base EntropySource construction on.
-     * @param isPredictionResistant boolean indicating if the SecureRandom is based on prediction resistant entropy or not (true if it is).
-     */
-    public BasicEntropySourceProvider(SecureRandom random, boolean isPredictionResistant)
-    {
-        _sr = random;
-        _predictionResistant = isPredictionResistant;
-    }
-
-    /**
-     * Return an entropy source that will create bitsRequired bits of entropy on
-     * each invocation of getEntropy().
-     *
-     * @param bitsRequired size (in bits) of entropy to be created by the provided source.
-     * @return an EntropySource that generates bitsRequired bits of entropy on each call to its getEntropy() method.
-     */
-    public EntropySource get(final int bitsRequired)
-    {
-        return new EntropySource()
-        {
-            public boolean isPredictionResistant()
-            {
-                return _predictionResistant;
-            }
-
-            public byte[] getEntropy()
-            {
-                return _sr.generateSeed((bitsRequired + 7) / 8);
-            }
-
-            public int entropySize()
-            {
-                return bitsRequired;
-            }
-        };
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/prng/DRBGProvider.java b/bcprov/src/main/java/org/bouncycastle/crypto/prng/DRBGProvider.java
deleted file mode 100644
index c39760c..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/prng/DRBGProvider.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package org.bouncycastle.crypto.prng;
-
-import org.bouncycastle.crypto.prng.drbg.SP80090DRBG;
-
-interface DRBGProvider
-{
-    SP80090DRBG get(EntropySource entropySource);
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/prng/DigestRandomGenerator.java b/bcprov/src/main/java/org/bouncycastle/crypto/prng/DigestRandomGenerator.java
deleted file mode 100644
index f36b62c..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/prng/DigestRandomGenerator.java
+++ /dev/null
@@ -1,123 +0,0 @@
-package org.bouncycastle.crypto.prng;
-
-import org.bouncycastle.crypto.Digest;
-
-/**
- * Random generation based on the digest with counter. Calling addSeedMaterial will
- * always increase the entropy of the hash.
- * <p>
- * Internal access to the digest is synchronized so a single one of these can be shared.
- * </p>
- */
-public class DigestRandomGenerator
-    implements RandomGenerator
-{
-    private static long         CYCLE_COUNT = 10;
-
-    private long                stateCounter;
-    private long                seedCounter;
-    private Digest              digest;
-    private byte[]              state;
-    private byte[]              seed;
-
-    // public constructors
-    public DigestRandomGenerator(
-        Digest digest)
-    {
-        this.digest = digest;
-
-        this.seed = new byte[digest.getDigestSize()];
-        this.seedCounter = 1;
-
-        this.state = new byte[digest.getDigestSize()];
-        this.stateCounter = 1;
-    }
-
-    public void addSeedMaterial(byte[] inSeed)
-    {
-        synchronized (this)
-        {
-            digestUpdate(inSeed);
-            digestUpdate(seed);
-            digestDoFinal(seed);
-        }
-    }
-
-    public void addSeedMaterial(long rSeed)
-    {
-        synchronized (this)
-        {
-            digestAddCounter(rSeed);
-            digestUpdate(seed);
-
-            digestDoFinal(seed);
-        }
-    }
-
-    public void nextBytes(byte[] bytes)
-    {
-        nextBytes(bytes, 0, bytes.length);
-    }
-
-    public void nextBytes(byte[] bytes, int start, int len)
-    {
-        synchronized (this)
-        {
-            int stateOff = 0;
-
-            generateState();
-
-            int end = start + len;
-            for (int i = start; i != end; i++)
-            {
-                if (stateOff == state.length)
-                {
-                    generateState();
-                    stateOff = 0;
-                }
-                bytes[i] = state[stateOff++];
-            }
-        }
-    }
-
-    private void cycleSeed()
-    {
-        digestUpdate(seed);
-        digestAddCounter(seedCounter++);
-
-        digestDoFinal(seed);
-    }
-
-    private void generateState()
-    {
-        digestAddCounter(stateCounter++);
-        digestUpdate(state);
-        digestUpdate(seed);
-
-        digestDoFinal(state);
-
-        if ((stateCounter % CYCLE_COUNT) == 0)
-        {
-            cycleSeed();
-        }
-    }
-
-    private void digestAddCounter(long seed)
-    {
-        for (int i = 0; i != 8; i++)
-        {
-            digest.update((byte)seed);
-            seed >>>= 8;
-        }
-    }
-
-    private void digestUpdate(byte[] inSeed)
-    {
-        digest.update(inSeed, 0, inSeed.length);
-    }
-
-    private void digestDoFinal(byte[] result)
-    {
-        digest.doFinal(result, 0);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/prng/EntropySource.java b/bcprov/src/main/java/org/bouncycastle/crypto/prng/EntropySource.java
deleted file mode 100644
index 53bc549..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/prng/EntropySource.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package org.bouncycastle.crypto.prng;
-
-public interface EntropySource
-{
-    /**
-     * Return whether or not this entropy source is regarded as prediction resistant.
-     *
-     * @return true if it is, false otherwise.
-     */
-    boolean isPredictionResistant();
-
-    /**
-     * Return a byte array of entropy.
-     *
-     * @return  entropy bytes.
-     */
-    byte[] getEntropy();
-
-    /**
-     * Return the number of bits of entropy this source can produce.
-     *
-     * @return size in bits of the return value of getEntropy.
-     */
-    int entropySize();
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/prng/EntropySourceProvider.java b/bcprov/src/main/java/org/bouncycastle/crypto/prng/EntropySourceProvider.java
deleted file mode 100644
index 190bf62..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/prng/EntropySourceProvider.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package org.bouncycastle.crypto.prng;
-
-public interface EntropySourceProvider
-{
-    EntropySource get(final int bitsRequired);
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/prng/FixedSecureRandom.java b/bcprov/src/main/java/org/bouncycastle/crypto/prng/FixedSecureRandom.java
deleted file mode 100644
index 3245eab..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/prng/FixedSecureRandom.java
+++ /dev/null
@@ -1,147 +0,0 @@
-package org.bouncycastle.crypto.prng;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.security.SecureRandom;
-
-/**
- * A secure random that returns pre-seeded data to calls of nextBytes() or generateSeed().
- */
-public class FixedSecureRandom
-    extends SecureRandom
-{
-    private byte[]       _data;
-    
-    private int          _index;
-    private int          _intPad;
-    
-    public FixedSecureRandom(byte[] value)
-    {
-        this(false, new byte[][] { value });
-    }
-    
-    public FixedSecureRandom(
-        byte[][] values)
-    {
-        this(false, values);
-    }
-    
-    /**
-     * Pad the data on integer boundaries. This is necessary for the classpath project's BigInteger
-     * implementation.
-     */
-    public FixedSecureRandom(
-        boolean intPad,
-        byte[] value)
-    {
-        this(intPad, new byte[][] { value });
-    }
-    
-    /**
-     * Pad the data on integer boundaries. This is necessary for the classpath project's BigInteger
-     * implementation.
-     */
-    public FixedSecureRandom(
-        boolean intPad,
-        byte[][] values)
-    {
-        ByteArrayOutputStream bOut = new ByteArrayOutputStream();
-        
-        for (int i = 0; i != values.length; i++)
-        {
-            try
-            {
-                bOut.write(values[i]);
-            }
-            catch (IOException e)
-            {
-                throw new IllegalArgumentException("can't save value array.");
-            }
-        }
-        
-        _data = bOut.toByteArray();
-        
-        if (intPad)
-        {
-            _intPad = _data.length % 4;
-        }
-    }
-
-    public void nextBytes(byte[] bytes)
-    {
-        System.arraycopy(_data, _index, bytes, 0, bytes.length);
-        
-        _index += bytes.length;
-    }
-
-    public byte[] generateSeed(int numBytes)
-    {
-        byte[] bytes = new byte[numBytes];
-
-        this.nextBytes(bytes);
-
-        return bytes;
-    }
-
-    //
-    // classpath's implementation of SecureRandom doesn't currently go back to nextBytes
-    // when next is called. We can't override next as it's a final method.
-    //
-    public int nextInt()
-    {
-        int val = 0;
-        
-        val |= nextValue() << 24;
-        val |= nextValue() << 16;
-        
-        if (_intPad == 2)
-        {
-            _intPad--;
-        }
-        else
-        {
-            val |= nextValue() << 8;
-        }
-        
-        if (_intPad == 1)
-        {
-            _intPad--;
-        }
-        else
-        {
-            val |= nextValue();
-        }
-        
-        return val;
-    }
-    
-    //
-    // classpath's implementation of SecureRandom doesn't currently go back to nextBytes
-    // when next is called. We can't override next as it's a final method.
-    //
-    public long nextLong()
-    {
-        long val = 0;
-        
-        val |= (long)nextValue() << 56;
-        val |= (long)nextValue() << 48;
-        val |= (long)nextValue() << 40;
-        val |= (long)nextValue() << 32;
-        val |= (long)nextValue() << 24;
-        val |= (long)nextValue() << 16;
-        val |= (long)nextValue() << 8;
-        val |= (long)nextValue();
-        
-        return val;
-    }
-
-    public boolean isExhausted()
-    {
-        return _index == _data.length;
-    }
-
-    private int nextValue()
-    {
-        return _data[_index++] & 0xff;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/prng/RandomGenerator.java b/bcprov/src/main/java/org/bouncycastle/crypto/prng/RandomGenerator.java
deleted file mode 100644
index 47ff68e..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/prng/RandomGenerator.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package org.bouncycastle.crypto.prng;
-
-/**
- * Generic interface for objects generating random bytes.
- */
-public interface RandomGenerator
-{
-    /**
-     * Add more seed material to the generator.
-     *
-     * @param seed a byte array to be mixed into the generator's state.
-     */
-    void addSeedMaterial(byte[] seed);
-
-    /**
-     * Add more seed material to the generator.
-     *
-     * @param seed a long value to be mixed into the generator's state.
-     */
-    void addSeedMaterial(long seed);
-
-    /**
-     * Fill bytes with random values.
-     *
-     * @param bytes byte array to be filled.
-     */
-    void nextBytes(byte[] bytes);
-
-    /**
-     * Fill part of bytes with random values.
-     *
-     * @param bytes byte array to be filled.
-     * @param start index to start filling at.
-     * @param len length of segment to fill.
-     */
-    void nextBytes(byte[] bytes, int start, int len);
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/prng/ReversedWindowGenerator.java b/bcprov/src/main/java/org/bouncycastle/crypto/prng/ReversedWindowGenerator.java
deleted file mode 100644
index fbb2639..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/prng/ReversedWindowGenerator.java
+++ /dev/null
@@ -1,111 +0,0 @@
-package org.bouncycastle.crypto.prng;
-
-/**
- * Takes bytes generated by an underling RandomGenerator and reverses the order in
- * each small window (of configurable size).
- * <p>
- * Access to internals is synchronized so a single one of these can be shared.
- * </p>
- */
-public class ReversedWindowGenerator
-    implements RandomGenerator
-{
-    private final RandomGenerator generator;
-
-    private byte[] window;
-    private int windowCount;
-
-    public ReversedWindowGenerator(
-        RandomGenerator generator,
-        int             windowSize)
-    {
-        if (generator == null)
-        {
-            throw new IllegalArgumentException("generator cannot be null");
-        }
-        if (windowSize < 2)
-        {
-            throw new IllegalArgumentException("windowSize must be at least 2");
-        }
-
-        this.generator = generator;
-        this.window = new byte[windowSize];
-    }
-
-    /**
-     * Add more seed material to the generator.
-     *
-     * @param seed a byte array to be mixed into the generator's state.
-     */
-    public void addSeedMaterial(
-        byte[] seed)
-    {
-        synchronized (this)
-        {
-            windowCount = 0;
-            generator.addSeedMaterial(seed);
-        }
-    }
-
-    /**
-     * Add more seed material to the generator.
-     *
-     * @param seed a long value to be mixed into the generator's state.
-     */
-    public void addSeedMaterial(
-        long seed)
-    {
-        synchronized (this)
-        {
-            windowCount = 0;
-            generator.addSeedMaterial(seed);
-        }
-    }
-
-    /**
-     * Fill bytes with random values.
-     *
-     * @param bytes byte array to be filled.
-     */
-    public void nextBytes(
-        byte[] bytes)
-    {
-        doNextBytes(bytes, 0, bytes.length);
-    }
-
-    /**
-     * Fill part of bytes with random values.
-     *
-     * @param bytes byte array to be filled.
-     * @param start index to start filling at.
-     * @param len length of segment to fill.
-     */
-    public void nextBytes(
-        byte[]  bytes,
-        int     start,
-        int     len)
-    {
-        doNextBytes(bytes, start, len);
-    }
-
-    private void doNextBytes(
-        byte[]  bytes,
-        int     start,
-        int     len)
-    {
-        synchronized (this)
-        {
-            int done = 0;
-            while (done < len)
-            {
-                if (windowCount < 1)
-                {
-                    generator.nextBytes(window, 0, window.length);
-                    windowCount = window.length;
-                }
-
-                bytes[start + done++] = window[--windowCount];
-            }
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/prng/SP800SecureRandom.java b/bcprov/src/main/java/org/bouncycastle/crypto/prng/SP800SecureRandom.java
deleted file mode 100644
index 9481782..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/prng/SP800SecureRandom.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package org.bouncycastle.crypto.prng;
-
-import java.security.SecureRandom;
-
-import org.bouncycastle.crypto.prng.drbg.SP80090DRBG;
-
-public class SP800SecureRandom
-    extends SecureRandom
-{
-    private final DRBGProvider drbgProvider;
-    private final boolean predictionResistant;
-    private final SecureRandom randomSource;
-    private final EntropySource entropySource;
-
-    private SP80090DRBG drbg;
-
-    SP800SecureRandom(SecureRandom randomSource, EntropySource entropySource, DRBGProvider drbgProvider, boolean predictionResistant)
-    {
-        this.randomSource = randomSource;
-        this.entropySource = entropySource;
-        this.drbgProvider = drbgProvider;
-        this.predictionResistant = predictionResistant;
-    }
-
-    public void setSeed(byte[] seed)
-    {
-        synchronized (this)
-        {
-            if (randomSource != null)
-            {
-                this.randomSource.setSeed(seed);
-            }
-        }
-    }
-
-    public void setSeed(long seed)
-    {
-        synchronized (this)
-        {
-            // this will happen when SecureRandom() is created
-            if (randomSource != null)
-            {
-                this.randomSource.setSeed(seed);
-            }
-        }
-    }
-
-    public void nextBytes(byte[] bytes)
-    {
-        synchronized (this)
-        {
-            if (drbg == null)
-            {
-                drbg = drbgProvider.get(entropySource);
-            }
-
-            // check if a reseed is required...
-            if (drbg.generate(bytes, null, predictionResistant) < 0)
-            {
-                drbg.reseed(null);
-                drbg.generate(bytes, null, predictionResistant);
-            }
-        }
-    }
-
-    public byte[] generateSeed(int numBytes)
-    {
-        byte[] bytes = new byte[numBytes];
-
-        this.nextBytes(bytes);
-
-        return bytes;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/prng/SP800SecureRandomBuilder.java b/bcprov/src/main/java/org/bouncycastle/crypto/prng/SP800SecureRandomBuilder.java
deleted file mode 100644
index 59ea101..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/prng/SP800SecureRandomBuilder.java
+++ /dev/null
@@ -1,290 +0,0 @@
-package org.bouncycastle.crypto.prng;
-
-import java.security.SecureRandom;
-
-import org.bouncycastle.crypto.BlockCipher;
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.Mac;
-import org.bouncycastle.crypto.prng.drbg.CTRSP800DRBG;
-import org.bouncycastle.crypto.prng.drbg.DualECPoints;
-import org.bouncycastle.crypto.prng.drbg.DualECSP800DRBG;
-import org.bouncycastle.crypto.prng.drbg.HMacSP800DRBG;
-import org.bouncycastle.crypto.prng.drbg.HashSP800DRBG;
-import org.bouncycastle.crypto.prng.drbg.SP80090DRBG;
-
-/**
- * Builder class for making SecureRandom objects based on SP 800-90A Deterministic Random Bit Generators (DRBG).
- */
-public class SP800SecureRandomBuilder
-{
-    private final SecureRandom random;
-    private final EntropySourceProvider entropySourceProvider;
-
-    private byte[] personalizationString;
-    private int securityStrength = 256;
-    private int entropyBitsRequired = 256;
-
-    /**
-     * Basic constructor, creates a builder using an EntropySourceProvider based on the default SecureRandom with
-     * predictionResistant set to false.
-     * <p>
-     * Any SecureRandom created from a builder constructed like this will make use of input passed to SecureRandom.setSeed() if
-     * the default SecureRandom does for its generateSeed() call.
-     * </p>
-     */
-    public SP800SecureRandomBuilder()
-    {
-        this(new SecureRandom(), false);
-    }
-
-    /**
-     * Construct a builder with an EntropySourceProvider based on the passed in SecureRandom and the passed in value
-     * for prediction resistance.
-     * <p>
-     * Any SecureRandom created from a builder constructed like this will make use of input passed to SecureRandom.setSeed() if
-     * the passed in SecureRandom does for its generateSeed() call.
-     * </p>
-     * @param entropySource
-     * @param predictionResistant
-     */
-    public SP800SecureRandomBuilder(SecureRandom entropySource, boolean predictionResistant)
-    {
-        this.random = entropySource;
-        this.entropySourceProvider = new BasicEntropySourceProvider(random, predictionResistant);
-    }
-
-    /**
-     * Create a builder which makes creates the SecureRandom objects from a specified entropy source provider.
-     * <p>
-     * <b>Note:</b> If this constructor is used any calls to setSeed() in the resulting SecureRandom will be ignored.
-     * </p>
-     * @param entropySourceProvider a provider of EntropySource objects.
-     */
-    public SP800SecureRandomBuilder(EntropySourceProvider entropySourceProvider)
-    {
-        this.random = null;
-        this.entropySourceProvider = entropySourceProvider;
-    }
-
-    /**
-     * Set the personalization string for DRBG SecureRandoms created by this builder
-     * @param personalizationString  the personalisation string for the underlying DRBG.
-     * @return the current builder.
-     */
-    public SP800SecureRandomBuilder setPersonalizationString(byte[] personalizationString)
-    {
-        this.personalizationString = personalizationString;
-
-        return this;
-    }
-
-    /**
-     * Set the security strength required for DRBGs used in building SecureRandom objects.
-     *
-     * @param securityStrength the security strength (in bits)
-     * @return the current builder.
-     */
-    public SP800SecureRandomBuilder setSecurityStrength(int securityStrength)
-    {
-        this.securityStrength = securityStrength;
-
-        return this;
-    }
-
-    /**
-     * Set the amount of entropy bits required for seeding and reseeding DRBGs used in building SecureRandom objects.
-     *
-     * @param entropyBitsRequired the number of bits of entropy to be requested from the entropy source on each seed/reseed.
-     * @return the current builder.
-     */
-    public SP800SecureRandomBuilder setEntropyBitsRequired(int entropyBitsRequired)
-    {
-        this.entropyBitsRequired = entropyBitsRequired;
-
-        return this;
-    }
-
-    /**
-     * Build a SecureRandom based on a SP 800-90A Hash DRBG.
-     *
-     * @param digest digest algorithm to use in the DRBG underneath the SecureRandom.
-     * @param nonce  nonce value to use in DRBG construction.
-     * @param predictionResistant specify whether the underlying DRBG in the resulting SecureRandom should reseed on each request for bytes.
-     * @return a SecureRandom supported by a Hash DRBG.
-     */
-    public SP800SecureRandom buildHash(Digest digest, byte[] nonce, boolean predictionResistant)
-    {
-        return new SP800SecureRandom(random, entropySourceProvider.get(entropyBitsRequired), new HashDRBGProvider(digest, nonce, personalizationString, securityStrength), predictionResistant);
-    }
-
-    /**
-     * Build a SecureRandom based on a SP 800-90A CTR DRBG.
-     *
-     * @param cipher the block cipher to base the DRBG on.
-     * @param keySizeInBits key size in bits to be used with the block cipher.
-     * @param nonce nonce value to use in DRBG construction.
-     * @param predictionResistant  specify whether the underlying DRBG in the resulting SecureRandom should reseed on each request for bytes.
-     * @return  a SecureRandom supported by a CTR DRBG.
-     */
-    public SP800SecureRandom buildCTR(BlockCipher cipher, int keySizeInBits, byte[] nonce, boolean predictionResistant)
-    {
-        return new SP800SecureRandom(random, entropySourceProvider.get(entropyBitsRequired), new CTRDRBGProvider(cipher, keySizeInBits, nonce, personalizationString, securityStrength), predictionResistant);
-    }
-
-    /**
-     * Build a SecureRandom based on a SP 800-90A HMAC DRBG.
-     *
-     * @param hMac HMAC algorithm to use in the DRBG underneath the SecureRandom.
-     * @param nonce  nonce value to use in DRBG construction.
-     * @param predictionResistant specify whether the underlying DRBG in the resulting SecureRandom should reseed on each request for bytes.
-     * @return a SecureRandom supported by a HMAC DRBG.
-     */
-    public SP800SecureRandom buildHMAC(Mac hMac, byte[] nonce, boolean predictionResistant)
-    {
-        return new SP800SecureRandom(random, entropySourceProvider.get(entropyBitsRequired), new HMacDRBGProvider(hMac, nonce, personalizationString, securityStrength), predictionResistant);
-    }
-
-    /**
-     * Build a SecureRandom based on a SP 800-90A Dual EC DRBG using the NIST point set.
-     *
-     * @param digest digest algorithm to use in the DRBG underneath the SecureRandom.
-     * @param nonce  nonce value to use in DRBG construction.
-     * @param predictionResistant specify whether the underlying DRBG in the resulting SecureRandom should reseed on each request for bytes.
-     * @return a SecureRandom supported by a Dual EC DRBG.
-     */
-    public SP800SecureRandom buildDualEC(Digest digest, byte[] nonce, boolean predictionResistant)
-    {
-        return new SP800SecureRandom(random, entropySourceProvider.get(entropyBitsRequired), new DualECDRBGProvider(digest, nonce, personalizationString, securityStrength), predictionResistant);
-    }
-
-    /**
-     * Build a SecureRandom based on a SP 800-90A Dual EC DRBG according to a defined point set.
-     *
-     * @param pointSet an array of DualECPoints to use for DRB generation.
-     * @param digest digest algorithm to use in the DRBG underneath the SecureRandom.
-     * @param nonce  nonce value to use in DRBG construction.
-     * @param predictionResistant specify whether the underlying DRBG in the resulting SecureRandom should reseed on each request for bytes.
-     * @return a SecureRandom supported by a Dual EC DRBG.
-     */
-    public SP800SecureRandom buildDualEC(DualECPoints[] pointSet, Digest digest, byte[] nonce, boolean predictionResistant)
-    {
-        return new SP800SecureRandom(random, entropySourceProvider.get(entropyBitsRequired), new ConfigurableDualECDRBGProvider(pointSet, digest, nonce, personalizationString, securityStrength), predictionResistant);
-    }
-
-
-    private static class HashDRBGProvider
-        implements DRBGProvider
-    {
-        private final Digest digest;
-        private final byte[] nonce;
-        private final byte[] personalizationString;
-        private final int securityStrength;
-
-        public HashDRBGProvider(Digest digest, byte[] nonce, byte[] personalizationString, int securityStrength)
-        {
-            this.digest = digest;
-            this.nonce = nonce;
-            this.personalizationString = personalizationString;
-            this.securityStrength = securityStrength;
-        }
-
-        public SP80090DRBG get(EntropySource entropySource)
-        {
-            return new HashSP800DRBG(digest, securityStrength, entropySource, personalizationString, nonce);
-        }
-    }
-
-    private static class DualECDRBGProvider
-        implements DRBGProvider
-    {
-        private final Digest digest;
-        private final byte[] nonce;
-        private final byte[] personalizationString;
-        private final int securityStrength;
-
-        public DualECDRBGProvider(Digest digest, byte[] nonce, byte[] personalizationString, int securityStrength)
-        {
-            this.digest = digest;
-            this.nonce = nonce;
-            this.personalizationString = personalizationString;
-            this.securityStrength = securityStrength;
-        }
-
-        public SP80090DRBG get(EntropySource entropySource)
-        {
-            return new DualECSP800DRBG(digest, securityStrength, entropySource, personalizationString, nonce);
-        }
-    }
-
-    private static class ConfigurableDualECDRBGProvider
-        implements DRBGProvider
-    {
-        private final DualECPoints[] pointSet;
-        private final Digest digest;
-        private final byte[] nonce;
-        private final byte[] personalizationString;
-        private final int securityStrength;
-
-        public ConfigurableDualECDRBGProvider(DualECPoints[] pointSet, Digest digest, byte[] nonce, byte[] personalizationString, int securityStrength)
-        {
-            this.pointSet = new DualECPoints[pointSet.length];
-            System.arraycopy(pointSet, 0, this.pointSet, 0, pointSet.length);
-            this.digest = digest;
-            this.nonce = nonce;
-            this.personalizationString = personalizationString;
-            this.securityStrength = securityStrength;
-        }
-
-        public SP80090DRBG get(EntropySource entropySource)
-        {
-            return new DualECSP800DRBG(pointSet, digest, securityStrength, entropySource, personalizationString, nonce);
-        }
-    }
-
-    private static class HMacDRBGProvider
-        implements DRBGProvider
-    {
-        private final Mac hMac;
-        private final byte[] nonce;
-        private final byte[] personalizationString;
-        private final int securityStrength;
-
-        public HMacDRBGProvider(Mac hMac, byte[] nonce, byte[] personalizationString, int securityStrength)
-        {
-            this.hMac = hMac;
-            this.nonce = nonce;
-            this.personalizationString = personalizationString;
-            this.securityStrength = securityStrength;
-        }
-
-        public SP80090DRBG get(EntropySource entropySource)
-        {
-            return new HMacSP800DRBG(hMac, securityStrength, entropySource, personalizationString, nonce);
-        }
-    }
-
-    private static class CTRDRBGProvider
-        implements DRBGProvider
-    {
-
-        private final BlockCipher blockCipher;
-        private final int keySizeInBits;
-        private final byte[] nonce;
-        private final byte[] personalizationString;
-        private final int securityStrength;
-
-        public CTRDRBGProvider(BlockCipher blockCipher, int keySizeInBits, byte[] nonce, byte[] personalizationString, int securityStrength)
-        {
-            this.blockCipher = blockCipher;
-            this.keySizeInBits = keySizeInBits;
-            this.nonce = nonce;
-            this.personalizationString = personalizationString;
-            this.securityStrength = securityStrength;
-        }
-
-        public SP80090DRBG get(EntropySource entropySource)
-        {
-            return new CTRSP800DRBG(blockCipher, keySizeInBits, securityStrength, entropySource, personalizationString, nonce);
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/prng/ThreadedSeedGenerator.java b/bcprov/src/main/java/org/bouncycastle/crypto/prng/ThreadedSeedGenerator.java
deleted file mode 100644
index 6b2d5ec..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/prng/ThreadedSeedGenerator.java
+++ /dev/null
@@ -1,95 +0,0 @@
-package org.bouncycastle.crypto.prng;
-
-/**
- * A thread based seed generator - one source of randomness.
- * <p>
- * Based on an idea from Marcus Lippert.
- * </p>
- */
-public class ThreadedSeedGenerator
-{
-    private class SeedGenerator
-        implements Runnable
-    {
-        private volatile int counter = 0;
-        private volatile boolean stop = false;
-
-        public void run()
-        {
-            while (!this.stop)
-            {
-                this.counter++;
-            }
-
-        }
-
-        public byte[] generateSeed(
-            int numbytes,
-            boolean fast)
-        {
-            Thread t = new Thread(this);
-            byte[] result = new byte[numbytes];
-            this.counter = 0;
-            this.stop = false;
-            int last = 0;
-            int end;
-
-            t.start();
-            if(fast)
-            {
-                end = numbytes;
-            }
-            else
-            {
-                end = numbytes * 8;
-            }
-            for (int i = 0; i < end; i++)
-            {
-                while (this.counter == last)
-                {
-                    try
-                    {
-                        Thread.sleep(1);
-                    }
-                    catch (InterruptedException e)
-                    {
-                        // ignore
-                    }
-                }
-                last = this.counter;
-                if (fast)
-                {
-                    result[i] = (byte) (last & 0xff);
-                }
-                else
-                {
-                    int bytepos = i/8;
-                    result[bytepos] = (byte) ((result[bytepos] << 1) | (last & 1));
-                }
-
-            }
-            stop = true;
-            return result;
-        }
-    }
-
-    /**
-     * Generate seed bytes. Set fast to false for best quality.
-     * <p>
-     * If fast is set to true, the code should be round about 8 times faster when
-     * generating a long sequence of random bytes. 20 bytes of random values using
-     * the fast mode take less than half a second on a Nokia e70. If fast is set to false,
-     * it takes round about 2500 ms.
-     * </p>
-     * @param numBytes the number of bytes to generate
-     * @param fast true if fast mode should be used
-     */
-    public byte[] generateSeed(
-        int numBytes,
-        boolean fast)
-    {
-        SeedGenerator gen = new SeedGenerator();
-
-        return gen.generateSeed(numBytes, fast);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/prng/VMPCRandomGenerator.java b/bcprov/src/main/java/org/bouncycastle/crypto/prng/VMPCRandomGenerator.java
deleted file mode 100644
index c7e420d..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/prng/VMPCRandomGenerator.java
+++ /dev/null
@@ -1,127 +0,0 @@
-package org.bouncycastle.crypto.prng;
-
-import org.bouncycastle.util.Pack;
-
-public class VMPCRandomGenerator implements RandomGenerator
-{
-    private byte n = 0;
-
-    /**
-     * Permutation generated by code: <code>
-     * // First 1850 fractional digit of Pi number. 
-     * byte[] key = new BigInteger("14159265358979323846...5068006422512520511").toByteArray();
-     * s = 0;
-     * P = new byte[256];
-     * for (int i = 0; i < 256; i++) {
-     *     P[i] = (byte) i;
-     * }
-     * for (int m = 0; m < 768; m++) {
-     *     s = P[(s + P[m & 0xff] + key[m % key.length]) & 0xff];
-     *     byte temp = P[m & 0xff];
-     *     P[m & 0xff] = P[s & 0xff];
-     *     P[s & 0xff] = temp;
-     * } </code>
-     */
-    private byte[] P =
-    {
-        (byte) 0xbb, (byte) 0x2c, (byte) 0x62, (byte) 0x7f,
-        (byte) 0xb5, (byte) 0xaa, (byte) 0xd4, (byte) 0x0d, (byte) 0x81,
-        (byte) 0xfe, (byte) 0xb2, (byte) 0x82, (byte) 0xcb, (byte) 0xa0,
-        (byte) 0xa1, (byte) 0x08, (byte) 0x18, (byte) 0x71, (byte) 0x56,
-        (byte) 0xe8, (byte) 0x49, (byte) 0x02, (byte) 0x10, (byte) 0xc4,
-        (byte) 0xde, (byte) 0x35, (byte) 0xa5, (byte) 0xec, (byte) 0x80,
-        (byte) 0x12, (byte) 0xb8, (byte) 0x69, (byte) 0xda, (byte) 0x2f,
-        (byte) 0x75, (byte) 0xcc, (byte) 0xa2, (byte) 0x09, (byte) 0x36,
-        (byte) 0x03, (byte) 0x61, (byte) 0x2d, (byte) 0xfd, (byte) 0xe0,
-        (byte) 0xdd, (byte) 0x05, (byte) 0x43, (byte) 0x90, (byte) 0xad,
-        (byte) 0xc8, (byte) 0xe1, (byte) 0xaf, (byte) 0x57, (byte) 0x9b,
-        (byte) 0x4c, (byte) 0xd8, (byte) 0x51, (byte) 0xae, (byte) 0x50,
-        (byte) 0x85, (byte) 0x3c, (byte) 0x0a, (byte) 0xe4, (byte) 0xf3,
-        (byte) 0x9c, (byte) 0x26, (byte) 0x23, (byte) 0x53, (byte) 0xc9,
-        (byte) 0x83, (byte) 0x97, (byte) 0x46, (byte) 0xb1, (byte) 0x99,
-        (byte) 0x64, (byte) 0x31, (byte) 0x77, (byte) 0xd5, (byte) 0x1d,
-        (byte) 0xd6, (byte) 0x78, (byte) 0xbd, (byte) 0x5e, (byte) 0xb0,
-        (byte) 0x8a, (byte) 0x22, (byte) 0x38, (byte) 0xf8, (byte) 0x68,
-        (byte) 0x2b, (byte) 0x2a, (byte) 0xc5, (byte) 0xd3, (byte) 0xf7,
-        (byte) 0xbc, (byte) 0x6f, (byte) 0xdf, (byte) 0x04, (byte) 0xe5,
-        (byte) 0x95, (byte) 0x3e, (byte) 0x25, (byte) 0x86, (byte) 0xa6,
-        (byte) 0x0b, (byte) 0x8f, (byte) 0xf1, (byte) 0x24, (byte) 0x0e,
-        (byte) 0xd7, (byte) 0x40, (byte) 0xb3, (byte) 0xcf, (byte) 0x7e,
-        (byte) 0x06, (byte) 0x15, (byte) 0x9a, (byte) 0x4d, (byte) 0x1c,
-        (byte) 0xa3, (byte) 0xdb, (byte) 0x32, (byte) 0x92, (byte) 0x58,
-        (byte) 0x11, (byte) 0x27, (byte) 0xf4, (byte) 0x59, (byte) 0xd0,
-        (byte) 0x4e, (byte) 0x6a, (byte) 0x17, (byte) 0x5b, (byte) 0xac,
-        (byte) 0xff, (byte) 0x07, (byte) 0xc0, (byte) 0x65, (byte) 0x79,
-        (byte) 0xfc, (byte) 0xc7, (byte) 0xcd, (byte) 0x76, (byte) 0x42,
-        (byte) 0x5d, (byte) 0xe7, (byte) 0x3a, (byte) 0x34, (byte) 0x7a,
-        (byte) 0x30, (byte) 0x28, (byte) 0x0f, (byte) 0x73, (byte) 0x01,
-        (byte) 0xf9, (byte) 0xd1, (byte) 0xd2, (byte) 0x19, (byte) 0xe9,
-        (byte) 0x91, (byte) 0xb9, (byte) 0x5a, (byte) 0xed, (byte) 0x41,
-        (byte) 0x6d, (byte) 0xb4, (byte) 0xc3, (byte) 0x9e, (byte) 0xbf,
-        (byte) 0x63, (byte) 0xfa, (byte) 0x1f, (byte) 0x33, (byte) 0x60,
-        (byte) 0x47, (byte) 0x89, (byte) 0xf0, (byte) 0x96, (byte) 0x1a,
-        (byte) 0x5f, (byte) 0x93, (byte) 0x3d, (byte) 0x37, (byte) 0x4b,
-        (byte) 0xd9, (byte) 0xa8, (byte) 0xc1, (byte) 0x1b, (byte) 0xf6,
-        (byte) 0x39, (byte) 0x8b, (byte) 0xb7, (byte) 0x0c, (byte) 0x20,
-        (byte) 0xce, (byte) 0x88, (byte) 0x6e, (byte) 0xb6, (byte) 0x74,
-        (byte) 0x8e, (byte) 0x8d, (byte) 0x16, (byte) 0x29, (byte) 0xf2,
-        (byte) 0x87, (byte) 0xf5, (byte) 0xeb, (byte) 0x70, (byte) 0xe3,
-        (byte) 0xfb, (byte) 0x55, (byte) 0x9f, (byte) 0xc6, (byte) 0x44,
-        (byte) 0x4a, (byte) 0x45, (byte) 0x7d, (byte) 0xe2, (byte) 0x6b,
-        (byte) 0x5c, (byte) 0x6c, (byte) 0x66, (byte) 0xa9, (byte) 0x8c,
-        (byte) 0xee, (byte) 0x84, (byte) 0x13, (byte) 0xa7, (byte) 0x1e,
-        (byte) 0x9d, (byte) 0xdc, (byte) 0x67, (byte) 0x48, (byte) 0xba,
-        (byte) 0x2e, (byte) 0xe6, (byte) 0xa4, (byte) 0xab, (byte) 0x7c,
-        (byte) 0x94, (byte) 0x00, (byte) 0x21, (byte) 0xef, (byte) 0xea,
-        (byte) 0xbe, (byte) 0xca, (byte) 0x72, (byte) 0x4f, (byte) 0x52,
-        (byte) 0x98, (byte) 0x3f, (byte) 0xc2, (byte) 0x14, (byte) 0x7b,
-        (byte) 0x3b, (byte) 0x54 };
-
-    /**
-     * Value generated in the same way as {@link VMPCRandomGenerator#P};
-     */
-    private byte s = (byte) 0xbe;
-
-    public VMPCRandomGenerator()
-    {
-    }
-
-    public void addSeedMaterial(byte[] seed)
-    {
-        for (int m = 0; m < seed.length; m++)
-        {
-            s = P[(s + P[n & 0xff] + seed[m]) & 0xff];
-            byte temp = P[n & 0xff];
-            P[n & 0xff] = P[s & 0xff];
-            P[s & 0xff] = temp;
-            n = (byte) ((n + 1) & 0xff);
-        }
-    }
-
-    public void addSeedMaterial(long seed)
-    {
-        addSeedMaterial(Pack.longToBigEndian(seed));
-    }
-
-    public void nextBytes(byte[] bytes)
-    {
-        nextBytes(bytes, 0, bytes.length);
-    }
-
-    public void nextBytes(byte[] bytes, int start, int len)
-    {
-        synchronized (P)
-        {
-            int end = start + len;
-            for (int i = start; i != end; i++)
-            {
-                s = P[(s + P[n & 0xff]) & 0xff];
-                bytes[i] = P[(P[(P[s & 0xff]) & 0xff] + 1) & 0xff];
-                byte temp = P[n & 0xff];
-                P[n & 0xff] = P[s & 0xff];
-                P[s & 0xff] = temp;
-                n = (byte) ((n + 1) & 0xff);
-            }
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/prng/X931RNG.java b/bcprov/src/main/java/org/bouncycastle/crypto/prng/X931RNG.java
deleted file mode 100644
index f86dc2d..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/prng/X931RNG.java
+++ /dev/null
@@ -1,146 +0,0 @@
-package org.bouncycastle.crypto.prng;
-
-import org.bouncycastle.crypto.BlockCipher;
-
-public class X931RNG
-{
-    private static final long       BLOCK64_RESEED_MAX = 1L << (16 - 1);
-    private static final long       BLOCK128_RESEED_MAX = 1L << (24 - 1);
-    private static final int        BLOCK64_MAX_BITS_REQUEST = 1 << (13 - 1);
-    private static final int        BLOCK128_MAX_BITS_REQUEST = 1 << (19 - 1);
-    
-    private final BlockCipher engine;
-    private final EntropySource entropySource;
-
-    private final byte[] DT;
-    private final byte[] I;
-    private final byte[] R;;
-
-    private byte[] V;
-
-    private long reseedCounter = 1;
-
-    /**
-     *
-     * @param engine
-     * @param entropySource
-     */
-    public X931RNG(BlockCipher engine, byte[] dateTimeVector, EntropySource entropySource)
-    {
-        this.engine = engine;
-        this.entropySource = entropySource;
-
-        this.DT = new byte[engine.getBlockSize()];
-
-        System.arraycopy(dateTimeVector, 0, DT, 0, DT.length);
-
-        this.I = new byte[engine.getBlockSize()];
-        this.R = new byte[engine.getBlockSize()];
-    }
-
-    /**
-     * Populate a passed in array with random data.
-     *
-     * @param output output array for generated bits.
-     * @param predictionResistant true if a reseed should be forced, false otherwise.
-     *
-     * @return number of bits generated, -1 if a reseed required.
-     */
-    int generate(byte[] output, boolean predictionResistant)
-    {
-        if (R.length == 8) // 64 bit block size
-        {
-            if (reseedCounter > BLOCK64_RESEED_MAX)
-            {
-                return -1;
-            }
-
-            if (isTooLarge(output, BLOCK64_MAX_BITS_REQUEST / 8))
-            {
-                throw new IllegalArgumentException("Number of bits per request limited to " + BLOCK64_MAX_BITS_REQUEST);
-            }
-        }
-        else
-        {
-            if (reseedCounter > BLOCK128_RESEED_MAX)
-            {
-                return -1;
-            }
-
-            if (isTooLarge(output, BLOCK128_MAX_BITS_REQUEST / 8))
-            {
-                throw new IllegalArgumentException("Number of bits per request limited to " + BLOCK128_MAX_BITS_REQUEST);
-            }
-        }
-        
-        if (predictionResistant || V == null)
-        {
-            V = entropySource.getEntropy();
-        }
-
-        int m = output.length / R.length;
-
-        for (int i = 0; i < m; i++)
-        {
-            engine.processBlock(DT, 0, I, 0);
-            process(R, I, V);
-            process(V, R, I);
-
-            System.arraycopy(R, 0, output, i * R.length, R.length);
-
-            increment(DT);
-        }
-
-        int bytesToCopy = (output.length - m * R.length);
-
-        if (bytesToCopy > 0)
-        {
-            engine.processBlock(DT, 0, I, 0);
-            process(R, I, V);
-            process(V, R, I);
-
-            System.arraycopy(R, 0, output, m * R.length, bytesToCopy);
-
-            increment(DT);
-        }
-
-        reseedCounter++;
-
-        return output.length;
-    }
-
-    /**
-     * Reseed the RNG.
-     */
-    void reseed()
-    {
-        V = entropySource.getEntropy();
-        reseedCounter = 1;
-    }
-
-    private void process(byte[] res, byte[] a, byte[] b)
-    {
-        for (int i = 0; i != res.length; i++)
-        {
-            res[i] = (byte)(a[i] ^ b[i]);
-        }
-
-        engine.processBlock(res, 0, res, 0);
-    }
-
-    private void increment(byte[] val)
-    {
-        for (int i = val.length - 1; i >= 0; i--)
-        {
-            if (++val[i] != 0)
-            {
-                break;
-            }
-        }
-    }
-    
-    private static boolean isTooLarge(byte[] bytes, int maxBytes)
-    {
-        return bytes != null && bytes.length > maxBytes;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/prng/X931SecureRandom.java b/bcprov/src/main/java/org/bouncycastle/crypto/prng/X931SecureRandom.java
deleted file mode 100644
index e51e6f0..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/prng/X931SecureRandom.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package org.bouncycastle.crypto.prng;
-
-import java.security.SecureRandom;
-
-public class X931SecureRandom
-    extends SecureRandom
-{
-    private final boolean predictionResistant;
-    private final SecureRandom randomSource;
-    private final X931RNG drbg;
-
-    X931SecureRandom(SecureRandom randomSource, X931RNG drbg, boolean predictionResistant)
-    {
-        this.randomSource = randomSource;
-        this.drbg = drbg;
-        this.predictionResistant = predictionResistant;
-    }
-
-    public void setSeed(byte[] seed)
-    {
-        synchronized (this)
-        {
-            if (randomSource != null)
-            {
-                this.randomSource.setSeed(seed);
-            }
-        }
-    }
-
-    public void setSeed(long seed)
-    {
-        synchronized (this)
-        {
-            // this will happen when SecureRandom() is created
-            if (randomSource != null)
-            {
-                this.randomSource.setSeed(seed);
-            }
-        }
-    }
-
-    public void nextBytes(byte[] bytes)
-    {
-        synchronized (this)
-        {
-            // check if a reseed is required...
-            if (drbg.generate(bytes, predictionResistant) < 0)
-            {
-                drbg.reseed();
-                drbg.generate(bytes, predictionResistant);
-            }
-        }
-    }
-
-    public byte[] generateSeed(int numBytes)
-    {
-        byte[] bytes = new byte[numBytes];
-
-        this.nextBytes(bytes);
-
-        return bytes;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/prng/X931SecureRandomBuilder.java b/bcprov/src/main/java/org/bouncycastle/crypto/prng/X931SecureRandomBuilder.java
deleted file mode 100644
index 89c2905..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/prng/X931SecureRandomBuilder.java
+++ /dev/null
@@ -1,97 +0,0 @@
-package org.bouncycastle.crypto.prng;
-
-import java.security.SecureRandom;
-
-import org.bouncycastle.crypto.BlockCipher;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.util.Pack;
-
-public class X931SecureRandomBuilder
-{
-    private SecureRandom random;          // JDK 1.1 complains on final.
-    private EntropySourceProvider entropySourceProvider;
-
-    private BlockCipher engine;
-    private byte[] dateTimeVector;
-
-    /**
-     * Basic constructor, creates a builder using an EntropySourceProvider based on the default SecureRandom with
-     * predictionResistant set to false.
-     * <p>
-     * Any SecureRandom created from a builder constructed like this will make use of input passed to SecureRandom.setSeed() if
-     * the default SecureRandom does for its generateSeed() call.
-     * </p>
-     */
-    public X931SecureRandomBuilder()
-    {
-        this(new SecureRandom(), false);
-    }
-
-    /**
-     * Construct a builder with an EntropySourceProvider based on the passed in SecureRandom and the passed in value
-     * for prediction resistance.
-     * <p>
-     * Any SecureRandom created from a builder constructed like this will make use of input passed to SecureRandom.setSeed() if
-     * the passed in SecureRandom does for its generateSeed() call.
-     * </p>
-     * @param entropySource
-     * @param predictionResistant
-     */
-    public X931SecureRandomBuilder(SecureRandom entropySource, boolean predictionResistant)
-    {
-        this.random = entropySource;
-        this.entropySourceProvider = new BasicEntropySourceProvider(random, predictionResistant);
-    }
-
-    /**
-     * Create a builder which makes creates the SecureRandom objects from a specified entropy source provider.
-     * <p>
-     * <b>Note:</b> If this constructor is used any calls to setSeed() in the resulting SecureRandom will be ignored.
-     * </p>
-     * @param entropySourceProvider a provider of EntropySource objects.
-     */
-    public X931SecureRandomBuilder(EntropySourceProvider entropySourceProvider)
-    {
-        this.random = null;
-        this.entropySourceProvider = entropySourceProvider;
-    }
-
-    public X931SecureRandomBuilder setDateTimeVector(byte[] dateTimeVector)
-    {
-        this.dateTimeVector = dateTimeVector;
-
-        return this;
-    }
-
-    /**
-     * Construct a X9.31 secure random generator using the passed in engine and key. If predictionResistant is true the
-     * generator will be reseeded on each request.
-     *
-     * @param engine a block cipher to use as the operator.
-     * @param key the block cipher key to initialise engine with.
-     * @param predictionResistant true if engine to be reseeded on each use, false otherwise.
-     * @return a SecureRandom.
-     */
-    public X931SecureRandom build(BlockCipher engine, KeyParameter key, boolean predictionResistant)
-    {
-        this.engine = engine;
-
-        if (dateTimeVector == null)
-        {
-            if (engine.getBlockSize() == 8)
-            {
-                dateTimeVector = Pack.longToBigEndian(System.currentTimeMillis());
-            }
-            else
-            {
-                dateTimeVector = new byte[engine.getBlockSize()];
-                byte[] date = Pack.longToBigEndian(System.currentTimeMillis());
-                System.arraycopy(date, 0, dateTimeVector, 0, date.length);
-            }
-        }
-
-        engine.init(true, key);
-
-        return new X931SecureRandom(random, new X931RNG(engine, dateTimeVector, entropySourceProvider.get(engine.getBlockSize() * 8)), predictionResistant);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/prng/drbg/CTRSP800DRBG.java b/bcprov/src/main/java/org/bouncycastle/crypto/prng/drbg/CTRSP800DRBG.java
deleted file mode 100644
index 5701199..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/prng/drbg/CTRSP800DRBG.java
+++ /dev/null
@@ -1,481 +0,0 @@
-package org.bouncycastle.crypto.prng.drbg;
-
-import org.bouncycastle.crypto.BlockCipher;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.crypto.prng.EntropySource;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.encoders.Hex;
-
-/**
- * A SP800-90A CTR DRBG.
- */
-public class CTRSP800DRBG
-    implements SP80090DRBG
-{
-    private static final long       TDEA_RESEED_MAX = 1L << (32 - 1);
-    private static final long       AES_RESEED_MAX = 1L << (48 - 1);
-    private static final int        TDEA_MAX_BITS_REQUEST = 1 << (13 - 1);
-    private static final int        AES_MAX_BITS_REQUEST = 1 << (19 - 1);
-
-    private EntropySource          _entropySource;
-    private BlockCipher           _engine;
-    private int                   _keySizeInBits;
-    private int                   _seedLength;
-    
-    // internal state
-    private byte[]                _Key;
-    private byte[]                _V;
-    private long                  _reseedCounter = 0;
-    private boolean               _isTDEA = false;
-
-    /**
-     * Construct a SP800-90A CTR DRBG.
-     * <p>
-     * Minimum entropy requirement is the security strength requested.
-     * </p>
-     * @param engine underlying block cipher to use to support DRBG
-     * @param keySizeInBits size of the key to use with the block cipher.
-     * @param securityStrength security strength required (in bits)
-     * @param entropySource source of entropy to use for seeding/reseeding.
-     * @param personalizationString personalization string to distinguish this DRBG (may be null).
-     * @param nonce nonce to further distinguish this DRBG (may be null).
-     */
-    public CTRSP800DRBG(BlockCipher engine, int keySizeInBits, int securityStrength, EntropySource entropySource, byte[] personalizationString, byte[] nonce)
-    {
-        _entropySource = entropySource;
-        _engine = engine;     
-        
-        _keySizeInBits = keySizeInBits;
-        _seedLength = keySizeInBits + engine.getBlockSize() * 8;
-        _isTDEA = isTDEA(engine);
-
-        if (securityStrength > 256)
-        {
-            throw new IllegalArgumentException("Requested security strength is not supported by the derivation function");
-        }
-
-        if (getMaxSecurityStrength(engine, keySizeInBits) < securityStrength)
-        {
-            throw new IllegalArgumentException("Requested security strength is not supported by block cipher and key size");
-        }
-
-        if (entropySource.entropySize() < securityStrength)
-        {
-            throw new IllegalArgumentException("Not enough entropy for security strength required");
-        }
-
-        byte[] entropy = entropySource.getEntropy();  // Get_entropy_input
-
-        CTR_DRBG_Instantiate_algorithm(entropy, nonce, personalizationString);
-    }
-
-    private void CTR_DRBG_Instantiate_algorithm(byte[] entropy, byte[] nonce,
-            byte[] personalisationString)
-    {
-        byte[] seedMaterial = Arrays.concatenate(entropy, nonce, personalisationString);
-        byte[] seed = Block_Cipher_df(seedMaterial, _seedLength);
-
-        int outlen = _engine.getBlockSize();
-
-        _Key = new byte[(_keySizeInBits + 7) / 8];
-        _V = new byte[outlen];
-
-         // _Key & _V are modified by this call
-        CTR_DRBG_Update(seed, _Key, _V); 
-
-        _reseedCounter = 1;
-    }
-
-    private void CTR_DRBG_Update(byte[] seed, byte[] key, byte[] v)
-    {
-        byte[] temp = new byte[seed.length];
-        byte[] outputBlock = new byte[_engine.getBlockSize()];
-        
-        int i=0;
-        int outLen = _engine.getBlockSize();
-
-        _engine.init(true, new KeyParameter(expandKey(key)));
-        while (i*outLen < seed.length)
-        {
-            addOneTo(v);
-            _engine.processBlock(v, 0, outputBlock, 0);
-
-            int bytesToCopy = ((temp.length - i * outLen) > outLen)
-                    ? outLen : (temp.length - i * outLen);
-            
-            System.arraycopy(outputBlock, 0, temp, i * outLen, bytesToCopy);
-            ++i;
-        }
-
-        XOR(temp, seed, temp, 0);
-
-        System.arraycopy(temp, 0, key, 0, key.length);
-        System.arraycopy(temp, key.length, v, 0, v.length);
-    }
-    
-    private void CTR_DRBG_Reseed_algorithm(EntropySource entropy, byte[] additionalInput) 
-    {
-        byte[] seedMaterial = Arrays.concatenate(entropy.getEntropy(), additionalInput);
-
-        seedMaterial = Block_Cipher_df(seedMaterial, _seedLength);
-
-        CTR_DRBG_Update(seedMaterial, _Key, _V);
-
-        _reseedCounter = 1;
-    }
-
-    private void XOR(byte[] out, byte[] a, byte[] b, int bOff)
-    {
-        for (int i=0; i< out.length; i++) 
-        {
-            out[i] = (byte)(a[i] ^ b[i+bOff]);
-        }
-    }
-    
-    private void addOneTo(byte[] longer)
-    {
-        int carry = 1;
-        for (int i = 1; i <= longer.length; i++) // warning
-        {
-            int res = (longer[longer.length - i] & 0xff) + carry;
-            carry = (res > 0xff) ? 1 : 0;
-            longer[longer.length - i] = (byte)res;
-        }
-    } 
-    
-    // -- Internal state migration ---
-    
-    private static final byte[] K_BITS = Hex.decode("000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F");
-
-    // 1. If (number_of_bits_to_return > max_number_of_bits), then return an
-    // ERROR_FLAG.
-    // 2. L = len (input_string)/8.
-    // 3. N = number_of_bits_to_return/8.
-    // Comment: L is the bitstring represention of
-    // the integer resulting from len (input_string)/8.
-    // L shall be represented as a 32-bit integer.
-    //
-    // Comment : N is the bitstring represention of
-    // the integer resulting from
-    // number_of_bits_to_return/8. N shall be
-    // represented as a 32-bit integer.
-    //
-    // 4. S = L || N || input_string || 0x80.
-    // 5. While (len (S) mod outlen)
-    // Comment : Pad S with zeros, if necessary.
-    // 0, S = S || 0x00.
-    //
-    // Comment : Compute the starting value.
-    // 6. temp = the Null string.
-    // 7. i = 0.
-    // 8. K = Leftmost keylen bits of 0x00010203...1D1E1F.
-    // 9. While len (temp) < keylen + outlen, do
-    //
-    // IV = i || 0outlen - len (i).
-    //
-    // 9.1
-    //
-    // temp = temp || BCC (K, (IV || S)).
-    //
-    // 9.2
-    //
-    // i = i + 1.
-    //
-    // 9.3
-    //
-    // Comment : i shall be represented as a 32-bit
-    // integer, i.e., len (i) = 32.
-    //
-    // Comment: The 32-bit integer represenation of
-    // i is padded with zeros to outlen bits.
-    //
-    // Comment: Compute the requested number of
-    // bits.
-    //
-    // 10. K = Leftmost keylen bits of temp.
-    //
-    // 11. X = Next outlen bits of temp.
-    //
-    // 12. temp = the Null string.
-    //
-    // 13. While len (temp) < number_of_bits_to_return, do
-    //
-    // 13.1 X = Block_Encrypt (K, X).
-    //
-    // 13.2 temp = temp || X.
-    //
-    // 14. requested_bits = Leftmost number_of_bits_to_return of temp.
-    //
-    // 15. Return SUCCESS and requested_bits.
-    private byte[] Block_Cipher_df(byte[] inputString, int bitLength)
-    {
-        int outLen = _engine.getBlockSize();
-        int L = inputString.length; // already in bytes
-        int N = bitLength / 8;
-        // 4 S = L || N || inputstring || 0x80
-        int sLen = 4 + 4 + L + 1;
-        int blockLen = ((sLen + outLen - 1) / outLen) * outLen;
-        byte[] S = new byte[blockLen];
-        copyIntToByteArray(S, L, 0);
-        copyIntToByteArray(S, N, 4);
-        System.arraycopy(inputString, 0, S, 8, L);
-        S[8 + L] = (byte)0x80;
-        // S already padded with zeros
-
-        byte[] temp = new byte[_keySizeInBits / 8 + outLen];
-        byte[] bccOut = new byte[outLen];
-
-        byte[] IV = new byte[outLen]; 
-        
-        int i = 0;
-        byte[] K = new byte[_keySizeInBits / 8];
-        System.arraycopy(K_BITS, 0, K, 0, K.length);
-
-        while (i*outLen*8 < _keySizeInBits + outLen *8)
-        {
-            copyIntToByteArray(IV, i, 0);
-            BCC(bccOut, K, IV, S);
-
-            int bytesToCopy = ((temp.length - i * outLen) > outLen)
-                    ? outLen
-                    : (temp.length - i * outLen);
-            
-            System.arraycopy(bccOut, 0, temp, i * outLen, bytesToCopy);
-            ++i;
-        }
-
-        byte[] X = new byte[outLen];
-        System.arraycopy(temp, 0, K, 0, K.length);
-        System.arraycopy(temp, K.length, X, 0, X.length);
-
-        temp = new byte[bitLength / 2];
-
-        i = 0;
-        _engine.init(true, new KeyParameter(expandKey(K)));
-
-        while (i * outLen < temp.length)
-        {
-            _engine.processBlock(X, 0, X, 0);
-
-            int bytesToCopy = ((temp.length - i * outLen) > outLen)
-                    ? outLen
-                    : (temp.length - i * outLen);
-
-            System.arraycopy(X, 0, temp, i * outLen, bytesToCopy);
-            i++;
-        }
-
-        return temp;
-    }
-
-    /*
-    * 1. chaining_value = 0^outlen    
-    *    . Comment: Set the first chaining value to outlen zeros.
-    * 2. n = len (data)/outlen.
-    * 3. Starting with the leftmost bits of data, split the data into n blocks of outlen bits 
-    *    each, forming block(1) to block(n). 
-    * 4. For i = 1 to n do
-    * 4.1 input_block = chaining_value ^ block(i) .
-    * 4.2 chaining_value = Block_Encrypt (Key, input_block).
-    * 5. output_block = chaining_value.
-    * 6. Return output_block. 
-     */
-    private void BCC(byte[] bccOut, byte[] k, byte[] iV, byte[] data)
-    {
-        int outlen = _engine.getBlockSize();
-        byte[] chainingValue = new byte[outlen]; // initial values = 0
-        int n = data.length / outlen;
-
-        byte[] inputBlock = new byte[outlen];
-
-        _engine.init(true, new KeyParameter(expandKey(k)));
-
-        _engine.processBlock(iV, 0, chainingValue, 0);
-
-        for (int i = 0; i < n; i++)
-        {
-            XOR(inputBlock, chainingValue, data, i*outlen);
-            _engine.processBlock(inputBlock, 0, chainingValue, 0);
-        }
-
-        System.arraycopy(chainingValue, 0, bccOut, 0, bccOut.length);
-    }
-
-    private void copyIntToByteArray(byte[] buf, int value, int offSet)
-    {
-        buf[offSet + 0] = ((byte)(value >> 24));
-        buf[offSet + 1] = ((byte)(value >> 16));
-        buf[offSet + 2] = ((byte)(value >> 8));
-        buf[offSet + 3] = ((byte)(value));
-    }
-
-    /**
-     * Return the block size (in bits) of the DRBG.
-     *
-     * @return the number of bits produced on each internal round of the DRBG.
-     */
-    public int getBlockSize()
-    {
-        return _V.length * 8;
-    }
-
-    /**
-     * Populate a passed in array with random data.
-     *
-     * @param output output array for generated bits.
-     * @param additionalInput additional input to be added to the DRBG in this step.
-     * @param predictionResistant true if a reseed should be forced, false otherwise.
-     *
-     * @return number of bits generated, -1 if a reseed required.
-     */
-    public int generate(byte[] output, byte[] additionalInput, boolean predictionResistant)
-    {
-        if (_isTDEA)
-        {
-            if (_reseedCounter > TDEA_RESEED_MAX)
-            {
-                return -1;
-            }
-
-            if (Utils.isTooLarge(output, TDEA_MAX_BITS_REQUEST / 8))
-            {
-                throw new IllegalArgumentException("Number of bits per request limited to " + TDEA_MAX_BITS_REQUEST);
-            }
-        }
-        else
-        {
-            if (_reseedCounter > AES_RESEED_MAX)
-            {
-                return -1;
-            }
-
-            if (Utils.isTooLarge(output, AES_MAX_BITS_REQUEST / 8))
-            {
-                throw new IllegalArgumentException("Number of bits per request limited to " + AES_MAX_BITS_REQUEST);
-            }
-        }
-
-        if (predictionResistant)
-        {
-            CTR_DRBG_Reseed_algorithm(_entropySource, additionalInput);
-            additionalInput = null;
-        }
-
-        if (additionalInput != null)
-        {
-            additionalInput = Block_Cipher_df(additionalInput, _seedLength);
-            CTR_DRBG_Update(additionalInput, _Key, _V);
-        }
-        else
-        {
-            additionalInput = new byte[_seedLength];
-        }
-
-        byte[] out = new byte[_V.length];
-
-        _engine.init(true, new KeyParameter(expandKey(_Key)));
-
-        for (int i = 0; i <= output.length / out.length; i++)
-        {
-            int bytesToCopy = ((output.length - i * out.length) > out.length)
-                    ? out.length
-                    : (output.length - i * _V.length);
-
-            if (bytesToCopy != 0)
-            {
-                addOneTo(_V);
-
-                _engine.processBlock(_V, 0, out, 0);
-
-                System.arraycopy(out, 0, output, i * out.length, bytesToCopy);
-            }
-        }
-
-        CTR_DRBG_Update(additionalInput, _Key, _V);
-
-        _reseedCounter++;
-
-        return output.length * 8;
-    }
-
-    /**
-      * Reseed the DRBG.
-      *
-      * @param additionalInput additional input to be added to the DRBG in this step.
-      */
-    public void reseed(byte[] additionalInput)
-    {
-        CTR_DRBG_Reseed_algorithm(_entropySource, additionalInput);
-    }
-
-    private boolean isTDEA(BlockCipher cipher)
-    {
-        return cipher.getAlgorithmName().equals("DESede") || cipher.getAlgorithmName().equals("TDEA");
-    }
-
-    private int getMaxSecurityStrength(BlockCipher cipher, int keySizeInBits)
-    {
-        if (isTDEA(cipher) && keySizeInBits == 168)
-        {
-            return 112;
-        }
-        if (cipher.getAlgorithmName().equals("AES"))
-        {
-            return keySizeInBits;
-        }
-
-        return -1;
-    }
-
-    byte[] expandKey(byte[] key)
-    {
-        if (_isTDEA)
-        {
-            // expand key to 192 bits.
-            byte[] tmp = new byte[24];
-
-            padKey(key, 0, tmp, 0);
-            padKey(key, 7, tmp, 8);
-            padKey(key, 14, tmp, 16);
-
-            return tmp;
-        }
-        else
-        {
-            return key;
-        }
-    }
-
-    /**
-     * Pad out a key for TDEA, setting odd parity for each byte.
-     *
-     * @param keyMaster
-     * @param keyOff
-     * @param tmp
-     * @param tmpOff
-     */
-    private void padKey(byte[] keyMaster, int keyOff, byte[] tmp, int tmpOff)
-    {
-        tmp[tmpOff + 0] = (byte)(keyMaster[keyOff + 0] & 0xfe);
-        tmp[tmpOff + 1] = (byte)((keyMaster[keyOff + 0] << 7) | ((keyMaster[keyOff + 1] & 0xfc) >>> 1));
-        tmp[tmpOff + 2] = (byte)((keyMaster[keyOff + 1] << 6) | ((keyMaster[keyOff + 2] & 0xf8) >>> 2));
-        tmp[tmpOff + 3] = (byte)((keyMaster[keyOff + 2] << 5) | ((keyMaster[keyOff + 3] & 0xf0) >>> 3));
-        tmp[tmpOff + 4] = (byte)((keyMaster[keyOff + 3] << 4) | ((keyMaster[keyOff + 4] & 0xe0) >>> 4));
-        tmp[tmpOff + 5] = (byte)((keyMaster[keyOff + 4] << 3) | ((keyMaster[keyOff + 5] & 0xc0) >>> 5));
-        tmp[tmpOff + 6] = (byte)((keyMaster[keyOff + 5] << 2) | ((keyMaster[keyOff + 6] & 0x80) >>> 6));
-        tmp[tmpOff + 7] = (byte)(keyMaster[keyOff + 6] << 1);
-
-        for (int i = tmpOff; i <= tmpOff + 7; i++)
-        {
-            int b = tmp[i];
-            tmp[i] = (byte)((b & 0xfe) |
-                            ((((b >> 1) ^
-                            (b >> 2) ^
-                            (b >> 3) ^
-                            (b >> 4) ^
-                            (b >> 5) ^
-                            (b >> 6) ^
-                            (b >> 7)) ^ 0x01) & 0x01));
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/prng/drbg/DualECPoints.java b/bcprov/src/main/java/org/bouncycastle/crypto/prng/drbg/DualECPoints.java
deleted file mode 100644
index 7dcfa94..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/prng/drbg/DualECPoints.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package org.bouncycastle.crypto.prng.drbg;
-
-import org.bouncycastle.math.ec.ECPoint;
-
-/**
- * General class for providing point pairs for use with DualEC DRBG. See NIST SP 800-90A for further details.
- */
-public class DualECPoints
-{
-    private final ECPoint p;
-    private final ECPoint q;
-    private final int securityStrength;
-    private final int cofactor;
-
-    /**
-     * Base Constructor.
-     * <p>
-     * The cofactor is used to calculate the output block length (maxOutlen) according to
-     * <pre>
-     *     max_outlen = largest multiple of 8 less than ((field size in bits) - (13 + log2(cofactor))
-     * </pre>
-     *
-     * @param securityStrength maximum security strength to be associated with these parameters
-     * @param p the P point.
-     * @param q the Q point.
-     * @param cofactor cofactor associated with the domain parameters for the point generation.
-     */
-    public DualECPoints(int securityStrength, ECPoint p, ECPoint q, int cofactor)
-    {
-        if (!p.getCurve().equals(q.getCurve()))
-        {
-            throw new IllegalArgumentException("points need to be on the same curve");
-        }
-
-        this.securityStrength = securityStrength;
-        this.p = p;
-        this.q = q;
-        this.cofactor = cofactor;
-    }
-
-    public int getSeedLen()
-    {
-        return p.getCurve().getFieldSize();
-    }
-
-    public int getMaxOutlen()
-    {
-        return ((p.getCurve().getFieldSize() - (13 + log2(cofactor))) / 8) * 8;
-    }
-
-    public ECPoint getP()
-    {
-        return p;
-    }
-
-    public ECPoint getQ()
-    {
-        return q;
-    }
-
-    public int getSecurityStrength()
-    {
-        return securityStrength;
-    }
-
-    public int getCofactor()
-    {
-        return cofactor;
-    }
-
-    private static int log2(int value)
-    {
-        int log = 0;
-
-        while ((value >>= 1) != 0)
-        {
-            log++;
-        }
-
-        return log;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/prng/drbg/DualECSP800DRBG.java b/bcprov/src/main/java/org/bouncycastle/crypto/prng/drbg/DualECSP800DRBG.java
deleted file mode 100644
index 4e1b881..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/prng/drbg/DualECSP800DRBG.java
+++ /dev/null
@@ -1,320 +0,0 @@
-package org.bouncycastle.crypto.prng.drbg;
-
-import java.math.BigInteger;
-
-import org.bouncycastle.asn1.nist.NISTNamedCurves;
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.prng.EntropySource;
-import org.bouncycastle.math.ec.ECCurve;
-import org.bouncycastle.math.ec.ECMultiplier;
-import org.bouncycastle.math.ec.ECPoint;
-import org.bouncycastle.math.ec.FixedPointCombMultiplier;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.BigIntegers;
-
-/**
- * A SP800-90A Dual EC DRBG.
- */
-public class DualECSP800DRBG
-    implements SP80090DRBG
-{
-    /*
-     * Default P, Q values for each curve
-     */
-    private static final BigInteger p256_Px = new BigInteger("6b17d1f2e12c4247f8bce6e563a440f277037d812deb33a0f4a13945d898c296", 16);
-    private static final BigInteger p256_Py = new BigInteger("4fe342e2fe1a7f9b8ee7eb4a7c0f9e162bce33576b315ececbb6406837bf51f5", 16);
-    private static final BigInteger p256_Qx = new BigInteger("c97445f45cdef9f0d3e05e1e585fc297235b82b5be8ff3efca67c59852018192", 16);
-    private static final BigInteger p256_Qy = new BigInteger("b28ef557ba31dfcbdd21ac46e2a91e3c304f44cb87058ada2cb815151e610046", 16);
-
-    private static final BigInteger p384_Px = new BigInteger("aa87ca22be8b05378eb1c71ef320ad746e1d3b628ba79b9859f741e082542a385502f25dbf55296c3a545e3872760ab7", 16);
-    private static final BigInteger p384_Py = new BigInteger("3617de4a96262c6f5d9e98bf9292dc29f8f41dbd289a147ce9da3113b5f0b8c00a60b1ce1d7e819d7a431d7c90ea0e5f", 16);
-    private static final BigInteger p384_Qx = new BigInteger("8e722de3125bddb05580164bfe20b8b432216a62926c57502ceede31c47816edd1e89769124179d0b695106428815065", 16);
-    private static final BigInteger p384_Qy = new BigInteger("023b1660dd701d0839fd45eec36f9ee7b32e13b315dc02610aa1b636e346df671f790f84c5e09b05674dbb7e45c803dd", 16);
-
-    private static final BigInteger p521_Px = new BigInteger("c6858e06b70404e9cd9e3ecb662395b4429c648139053fb521f828af606b4d3dbaa14b5e77efe75928fe1dc127a2ffa8de3348b3c1856a429bf97e7e31c2e5bd66", 16);
-    private static final BigInteger p521_Py = new BigInteger("11839296a789a3bc0045c8a5fb42c7d1bd998f54449579b446817afbd17273e662c97ee72995ef42640c550b9013fad0761353c7086a272c24088be94769fd16650", 16);
-    private static final BigInteger p521_Qx = new BigInteger("1b9fa3e518d683c6b65763694ac8efbaec6fab44f2276171a42726507dd08add4c3b3f4c1ebc5b1222ddba077f722943b24c3edfa0f85fe24d0c8c01591f0be6f63", 16);
-    private static final BigInteger p521_Qy = new BigInteger("1f3bdba585295d9a1110d1df1f9430ef8442c5018976ff3437ef91b81dc0b8132c8d5c39c32d0e004a3092b7d327c0e7a4d26d2c7b69b58f9066652911e457779de", 16);
-
-    private static final DualECPoints[] nistPoints;
-
-    static
-    {
-        nistPoints = new DualECPoints[3];
-
-        ECCurve.Fp curve = (ECCurve.Fp)NISTNamedCurves.getByName("P-256").getCurve();
-
-        nistPoints[0] = new DualECPoints(128, curve.createPoint(p256_Px, p256_Py), curve.createPoint(p256_Qx, p256_Qy), 1);
-
-        curve = (ECCurve.Fp)NISTNamedCurves.getByName("P-384").getCurve();
-
-        nistPoints[1] = new DualECPoints(192, curve.createPoint(p384_Px, p384_Py), curve.createPoint(p384_Qx, p384_Qy), 1);
-
-        curve = (ECCurve.Fp)NISTNamedCurves.getByName("P-521").getCurve();
-
-        nistPoints[2] = new DualECPoints(256, curve.createPoint(p521_Px, p521_Py), curve.createPoint(p521_Qx, p521_Qy), 1);
-    }
-
-
-    private static final long       RESEED_MAX = 1L << (32 - 1);
-    private static final int        MAX_ADDITIONAL_INPUT = 1 << (13 - 1);
-    private static final int        MAX_ENTROPY_LENGTH = 1 << (13 - 1);
-    private static final int        MAX_PERSONALIZATION_STRING = 1 << (13 -1);
-
-    private Digest                 _digest;
-    private long                   _reseedCounter;
-    private EntropySource          _entropySource;
-    private int                    _securityStrength;
-    private int                    _seedlen;
-    private int                    _outlen;
-    private ECCurve.Fp             _curve;
-    private ECPoint                _P;
-    private ECPoint                _Q;
-    private byte[]                 _s;
-    private int                    _sLength;
-    private ECMultiplier           _fixedPointMultiplier = new FixedPointCombMultiplier();
-
-    /**
-     * Construct a SP800-90A Dual EC DRBG.
-     * <p>
-     * Minimum entropy requirement is the security strength requested.
-     * </p>
-     * @param digest source digest to use with the DRB stream.
-     * @param securityStrength security strength required (in bits)
-     * @param entropySource source of entropy to use for seeding/reseeding.
-     * @param personalizationString personalization string to distinguish this DRBG (may be null).
-     * @param nonce nonce to further distinguish this DRBG (may be null).
-     */
-    public DualECSP800DRBG(Digest digest, int securityStrength, EntropySource entropySource, byte[] personalizationString, byte[] nonce)
-    {
-        this(nistPoints, digest, securityStrength, entropySource, personalizationString, nonce);
-    }
-
-    /**
-     * Construct a SP800-90A Dual EC DRBG.
-     * <p>
-     * Minimum entropy requirement is the security strength requested.
-     * </p>
-     * @param pointSet an array of points to choose from, in order of increasing security strength
-     * @param digest source digest to use with the DRB stream.
-     * @param securityStrength security strength required (in bits)
-     * @param entropySource source of entropy to use for seeding/reseeding.
-     * @param personalizationString personalization string to distinguish this DRBG (may be null).
-     * @param nonce nonce to further distinguish this DRBG (may be null).
-     */
-    public DualECSP800DRBG(DualECPoints[] pointSet, Digest digest, int securityStrength, EntropySource entropySource, byte[] personalizationString, byte[] nonce)
-    {
-        _digest = digest;
-        _entropySource = entropySource;
-        _securityStrength = securityStrength;
-
-        if (Utils.isTooLarge(personalizationString, MAX_PERSONALIZATION_STRING / 8))
-        {
-            throw new IllegalArgumentException("Personalization string too large");
-        }
-
-        if (entropySource.entropySize() < securityStrength || entropySource.entropySize() > MAX_ENTROPY_LENGTH)
-        {
-            throw new IllegalArgumentException("EntropySource must provide between " + securityStrength + " and " + MAX_ENTROPY_LENGTH + " bits");
-        }
-
-        byte[] entropy = entropySource.getEntropy();
-        byte[] seedMaterial = Arrays.concatenate(entropy, nonce, personalizationString);
-
-        for (int i = 0; i != pointSet.length; i++)
-        {
-            if (securityStrength <= pointSet[i].getSecurityStrength())
-            {
-                if (Utils.getMaxSecurityStrength(digest) < pointSet[i].getSecurityStrength())
-                {
-                    throw new IllegalArgumentException("Requested security strength is not supported by digest");
-                }
-                _seedlen = pointSet[i].getSeedLen();
-                _outlen =  pointSet[i].getMaxOutlen() / 8;
-                _P = pointSet[i].getP();
-                _Q = pointSet[i].getQ();
-                break;
-            }
-        }
-
-        if (_P == null)
-        {
-            throw new IllegalArgumentException("security strength cannot be greater than 256 bits");
-        }
-
-        _s = Utils.hash_df(_digest, seedMaterial, _seedlen);
-        _sLength = _s.length;
-
-        _reseedCounter = 0;
-    }
-
-    /**
-     * Return the block size (in bits) of the DRBG.
-     *
-     * @return the number of bits produced on each internal round of the DRBG.
-     */
-    public int getBlockSize()
-    {
-        return _outlen * 8;
-    }
-
-    /**
-     * Populate a passed in array with random data.
-     *
-     * @param output output array for generated bits.
-     * @param additionalInput additional input to be added to the DRBG in this step.
-     * @param predictionResistant true if a reseed should be forced, false otherwise.
-     *
-     * @return number of bits generated, -1 if a reseed required.
-     */
-    public int generate(byte[] output, byte[] additionalInput, boolean predictionResistant)
-    {
-        int numberOfBits = output.length*8;
-        int m = output.length / _outlen;
-
-        if (Utils.isTooLarge(additionalInput, MAX_ADDITIONAL_INPUT / 8))
-        {
-            throw new IllegalArgumentException("Additional input too large");
-        }
-
-        if (_reseedCounter + m > RESEED_MAX)
-        {
-            return -1;
-        }
-
-        if (predictionResistant)
-        {   
-            reseed(additionalInput);
-            additionalInput = null;
-        }
-
-        BigInteger s;
-
-        if (additionalInput != null)
-        {
-            // Note: we ignore the use of pad8 on the additional input as we mandate byte arrays for it.
-            additionalInput = Utils.hash_df(_digest, additionalInput, _seedlen);
-            s = new BigInteger(1, xor(_s, additionalInput));
-        }
-        else
-        {
-            s = new BigInteger(1, _s);
-        }
-
-        // make sure we start with a clean output array.
-        Arrays.fill(output, (byte)0);
-
-        int outOffset = 0;
-
-        for (int i = 0; i < m; i++)
-        {
-            s = getScalarMultipleXCoord(_P, s);
-
-            //System.err.println("S: " + new String(Hex.encode(_s)));
-
-            byte[] r = getScalarMultipleXCoord(_Q, s).toByteArray();
-
-            if (r.length > _outlen)
-            {
-                System.arraycopy(r, r.length - _outlen, output, outOffset, _outlen);
-            }
-            else
-            {
-                System.arraycopy(r, 0, output, outOffset + (_outlen - r.length), r.length);
-            }
-
-            //System.err.println("R: " + new String(Hex.encode(r)));
-            outOffset += _outlen;
-
-            _reseedCounter++;
-        }
-
-        if (outOffset < output.length)
-        {
-            s = getScalarMultipleXCoord(_P, s);
-
-            byte[] r = getScalarMultipleXCoord(_Q, s).toByteArray();
-
-            int required = output.length - outOffset;
-
-            if (r.length > _outlen)
-            {
-                System.arraycopy(r, r.length - _outlen, output, outOffset, required);
-            }
-            else
-            {
-                System.arraycopy(r, 0, output, outOffset + (_outlen - r.length), required);
-            }
-
-            _reseedCounter++;
-        }
-
-        // Need to preserve length of S as unsigned int.
-        _s = BigIntegers.asUnsignedByteArray(_sLength, getScalarMultipleXCoord(_P, s));
-
-        return numberOfBits;
-    }
-
-    /**
-      * Reseed the DRBG.
-      *
-      * @param additionalInput additional input to be added to the DRBG in this step.
-      */
-    public void reseed(byte[] additionalInput)
-    {
-        if (Utils.isTooLarge(additionalInput, MAX_ADDITIONAL_INPUT / 8))
-        {
-            throw new IllegalArgumentException("Additional input string too large");
-        }
-
-        byte[] entropy = _entropySource.getEntropy();
-        byte[] seedMaterial = Arrays.concatenate(pad8(_s, _seedlen), entropy, additionalInput);
-
-        _s = Utils.hash_df(_digest, seedMaterial, _seedlen);
-
-        _reseedCounter = 0;
-    }
-
-    private byte[] xor(byte[] a, byte[] b)
-    {
-        if (b == null)
-        {
-            return a;
-        }
-
-        byte[] rv = new byte[a.length];
-
-        for (int i = 0; i != rv.length; i++)
-        {
-            rv[i] = (byte)(a[i] ^ b[i]);
-        }
-
-        return rv;
-    }
-
-    // Note: works in place
-    private byte[] pad8(byte[] s, int seedlen)
-    {
-        if (seedlen % 8 == 0)
-        {
-            return s;
-        }
-
-        int shift = 8 - (seedlen % 8);
-        int carry = 0;
-
-        for (int i = s.length - 1; i >= 0; i--)
-        {
-            int b = s[i] & 0xff;
-            s[i] = (byte)((b << shift) | (carry >> (8 - shift)));
-            carry = b;
-        }
-
-        return s;
-    }
-
-    private BigInteger getScalarMultipleXCoord(ECPoint p, BigInteger s)
-    {
-        return _fixedPointMultiplier.multiply(p, s).normalize().getAffineXCoord().toBigInteger();
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/prng/drbg/HMacSP800DRBG.java b/bcprov/src/main/java/org/bouncycastle/crypto/prng/drbg/HMacSP800DRBG.java
deleted file mode 100644
index f4ef2c4..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/prng/drbg/HMacSP800DRBG.java
+++ /dev/null
@@ -1,181 +0,0 @@
-package org.bouncycastle.crypto.prng.drbg;
-
-import org.bouncycastle.crypto.Mac;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.crypto.prng.EntropySource;
-import org.bouncycastle.util.Arrays;
-
-/**
- * A SP800-90A HMAC DRBG.
- */
-public class HMacSP800DRBG
-    implements SP80090DRBG
-{
-    private final static long       RESEED_MAX = 1L << (48 - 1);
-    private final static int        MAX_BITS_REQUEST = 1 << (19 - 1);
-
-    private byte[] _K;
-    private byte[] _V;
-    private long   _reseedCounter;
-    private EntropySource _entropySource;
-    private Mac _hMac;
-
-    /**
-     * Construct a SP800-90A Hash DRBG.
-     * <p>
-     * Minimum entropy requirement is the security strength requested.
-     * </p>
-     * @param hMac Hash MAC to base the DRBG on.
-     * @param securityStrength security strength required (in bits)
-     * @param entropySource source of entropy to use for seeding/reseeding.
-     * @param personalizationString personalization string to distinguish this DRBG (may be null).
-     * @param nonce nonce to further distinguish this DRBG (may be null).
-     */
-    public HMacSP800DRBG(Mac hMac, int securityStrength, EntropySource entropySource, byte[] personalizationString, byte[] nonce)
-    {
-        if (securityStrength > Utils.getMaxSecurityStrength(hMac))
-        {
-            throw new IllegalArgumentException("Requested security strength is not supported by the derivation function");
-        }
-
-        if (entropySource.entropySize() < securityStrength)
-        {
-            throw new IllegalArgumentException("Not enough entropy for security strength required");
-        }
-
-        _entropySource = entropySource;
-        _hMac = hMac;
-
-        byte[] entropy = entropySource.getEntropy();
-        byte[] seedMaterial = Arrays.concatenate(entropy, nonce, personalizationString);
-
-        _K = new byte[hMac.getMacSize()];
-        _V = new byte[_K.length];
-        Arrays.fill(_V, (byte)1);
-
-        hmac_DRBG_Update(seedMaterial);
-
-        _reseedCounter = 1;
-    }
-
-    private void hmac_DRBG_Update(byte[] seedMaterial)
-    {
-        hmac_DRBG_Update_Func(seedMaterial, (byte)0x00);
-        if (seedMaterial != null)
-        {
-            hmac_DRBG_Update_Func(seedMaterial, (byte)0x01);
-        }
-    }
-
-    private void hmac_DRBG_Update_Func(byte[] seedMaterial, byte vValue)
-    {
-        _hMac.init(new KeyParameter(_K));
-
-        _hMac.update(_V, 0, _V.length);
-        _hMac.update(vValue);
-
-        if (seedMaterial != null)
-        {
-            _hMac.update(seedMaterial, 0, seedMaterial.length);
-        }
-
-        _hMac.doFinal(_K, 0);
-
-        _hMac.init(new KeyParameter(_K));
-        _hMac.update(_V, 0, _V.length);
-
-        _hMac.doFinal(_V, 0);
-    }
-
-    /**
-     * Return the block size (in bits) of the DRBG.
-     *
-     * @return the number of bits produced on each round of the DRBG.
-     */
-    public int getBlockSize()
-    {
-        return _V.length * 8;
-    }
-
-    /**
-     * Populate a passed in array with random data.
-     *
-     * @param output output array for generated bits.
-     * @param additionalInput additional input to be added to the DRBG in this step.
-     * @param predictionResistant true if a reseed should be forced, false otherwise.
-     *
-     * @return number of bits generated, -1 if a reseed required.
-     */
-    public int generate(byte[] output, byte[] additionalInput, boolean predictionResistant)
-    {
-        int numberOfBits = output.length * 8;
-
-        if (numberOfBits > MAX_BITS_REQUEST)
-        {
-            throw new IllegalArgumentException("Number of bits per request limited to " + MAX_BITS_REQUEST);
-        }
-
-        if (_reseedCounter > RESEED_MAX)
-        {
-            return -1;
-        }
-
-        if (predictionResistant)
-        {
-            reseed(additionalInput);
-            additionalInput = null;
-        }
-
-        // 2.
-        if (additionalInput != null)
-        {
-            hmac_DRBG_Update(additionalInput);
-        }
-
-        // 3.
-        byte[] rv = new byte[output.length];
-
-        int m = output.length / _V.length;
-
-        _hMac.init(new KeyParameter(_K));
-
-        for (int i = 0; i < m; i++)
-        {
-            _hMac.update(_V, 0, _V.length);
-            _hMac.doFinal(_V, 0);
-
-            System.arraycopy(_V, 0, rv, i * _V.length, _V.length);
-        }
-
-        if (m * _V.length < rv.length)
-        {
-            _hMac.update(_V, 0, _V.length);
-            _hMac.doFinal(_V, 0);
-
-            System.arraycopy(_V, 0, rv, m * _V.length, rv.length - (m * _V.length));
-        }
-
-        hmac_DRBG_Update(additionalInput);
-
-        _reseedCounter++;
-
-        System.arraycopy(rv, 0, output, 0, output.length);
-
-        return numberOfBits;
-    }
-
-    /**
-      * Reseed the DRBG.
-      *
-      * @param additionalInput additional input to be added to the DRBG in this step.
-      */
-    public void reseed(byte[] additionalInput)
-    {
-        byte[] entropy = _entropySource.getEntropy();
-        byte[] seedMaterial = Arrays.concatenate(entropy, additionalInput);
-
-        hmac_DRBG_Update(seedMaterial);
-
-        _reseedCounter = 1;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/prng/drbg/HashSP800DRBG.java b/bcprov/src/main/java/org/bouncycastle/crypto/prng/drbg/HashSP800DRBG.java
deleted file mode 100644
index d6ab4f5..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/prng/drbg/HashSP800DRBG.java
+++ /dev/null
@@ -1,284 +0,0 @@
-package org.bouncycastle.crypto.prng.drbg;
-
-import java.util.Hashtable;
-
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.prng.EntropySource;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.Integers;
-
-/**
- * A SP800-90A Hash DRBG.
- */
-public class HashSP800DRBG
-    implements SP80090DRBG
-{
-    private final static byte[]     ONE = { 0x01 };
-
-    private final static long       RESEED_MAX = 1L << (48 - 1);
-    private final static int        MAX_BITS_REQUEST = 1 << (19 - 1);
-
-    private final static Hashtable  seedlens = new Hashtable();
-
-    static
-    {
-        seedlens.put("SHA-1", Integers.valueOf(440));
-        seedlens.put("SHA-224", Integers.valueOf(440));
-        seedlens.put("SHA-256", Integers.valueOf(440));
-        seedlens.put("SHA-512/256", Integers.valueOf(440));
-        seedlens.put("SHA-512/224", Integers.valueOf(440));
-        seedlens.put("SHA-384", Integers.valueOf(888));
-        seedlens.put("SHA-512", Integers.valueOf(888));
-    }
-
-    private Digest        _digest;
-    private byte[]        _V;
-    private byte[]        _C;
-    private long          _reseedCounter;
-    private EntropySource _entropySource;
-    private int           _securityStrength;
-    private int           _seedLength;
-
-    /**
-     * Construct a SP800-90A Hash DRBG.
-     * <p>
-     * Minimum entropy requirement is the security strength requested.
-     * </p>
-     * @param digest  source digest to use for DRB stream.
-     * @param securityStrength security strength required (in bits)
-     * @param entropySource source of entropy to use for seeding/reseeding.
-     * @param personalizationString personalization string to distinguish this DRBG (may be null).
-     * @param nonce nonce to further distinguish this DRBG (may be null).
-     */
-    public HashSP800DRBG(Digest digest, int securityStrength, EntropySource entropySource, byte[] personalizationString, byte[] nonce)
-    {
-        if (securityStrength > Utils.getMaxSecurityStrength(digest))
-        {
-            throw new IllegalArgumentException("Requested security strength is not supported by the derivation function");
-        }
-
-        if (entropySource.entropySize() < securityStrength)
-        {
-            throw new IllegalArgumentException("Not enough entropy for security strength required");
-        }
-
-        _digest = digest;
-        _entropySource = entropySource;
-        _securityStrength = securityStrength;
-        _seedLength = ((Integer)seedlens.get(digest.getAlgorithmName())).intValue();
-
-        // 1. seed_material = entropy_input || nonce || personalization_string.
-        // 2. seed = Hash_df (seed_material, seedlen).
-        // 3. V = seed.
-        // 4. C = Hash_df ((0x00 || V), seedlen). Comment: Preceed V with a byte
-        // of zeros.
-        // 5. reseed_counter = 1.
-        // 6. Return V, C, and reseed_counter as the initial_working_state
-
-        byte[] entropy = entropySource.getEntropy();
-        byte[] seedMaterial = Arrays.concatenate(entropy, nonce, personalizationString);
-        byte[] seed = Utils.hash_df(_digest, seedMaterial, _seedLength);
-
-        _V = seed;
-        byte[] subV = new byte[_V.length + 1];
-        System.arraycopy(_V, 0, subV, 1, _V.length);
-        _C = Utils.hash_df(_digest, subV, _seedLength);
-
-        _reseedCounter = 1;
-    }
-
-    /**
-     * Return the block size (in bits) of the DRBG.
-     *
-     * @return the number of bits produced on each internal round of the DRBG.
-     */
-    public int getBlockSize()
-    {
-        return _digest.getDigestSize() * 8;
-    }
-
-    /**
-     * Populate a passed in array with random data.
-     *
-     * @param output output array for generated bits.
-     * @param additionalInput additional input to be added to the DRBG in this step.
-     * @param predictionResistant true if a reseed should be forced, false otherwise.
-     *
-     * @return number of bits generated, -1 if a reseed required.
-     */
-    public int generate(byte[] output, byte[] additionalInput, boolean predictionResistant)
-    {
-        // 1. If reseed_counter > reseed_interval, then return an indication that a
-        // reseed is required.
-        // 2. If (additional_input != Null), then do
-        // 2.1 w = Hash (0x02 || V || additional_input).
-        // 2.2 V = (V + w) mod 2^seedlen
-        // .
-        // 3. (returned_bits) = Hashgen (requested_number_of_bits, V).
-        // 4. H = Hash (0x03 || V).
-        // 5. V = (V + H + C + reseed_counter) mod 2^seedlen
-        // .
-        // 6. reseed_counter = reseed_counter + 1.
-        // 7. Return SUCCESS, returned_bits, and the new values of V, C, and
-        // reseed_counter for the new_working_state.
-        int numberOfBits = output.length*8;
-
-        if (numberOfBits > MAX_BITS_REQUEST)
-        {
-            throw new IllegalArgumentException("Number of bits per request limited to " + MAX_BITS_REQUEST);
-        }
-
-        if (_reseedCounter > RESEED_MAX)
-        {
-            return -1;
-        }
-
-        if (predictionResistant)
-        {   
-            reseed(additionalInput);
-            additionalInput = null;
-        }
-
-        // 2.
-        if (additionalInput != null)
-        {
-            byte[] newInput = new byte[1 + _V.length + additionalInput.length];
-            newInput[0] = 0x02;
-            System.arraycopy(_V, 0, newInput, 1, _V.length);
-            // TODO: inOff / inLength
-            System.arraycopy(additionalInput, 0, newInput, 1 + _V.length, additionalInput.length);
-            byte[] w = hash(newInput);
-
-            addTo(_V, w);
-        }
-        
-        // 3.
-        byte[] rv = hashgen(_V, numberOfBits);
-        
-        // 4.
-        byte[] subH = new byte[_V.length + 1];
-        System.arraycopy(_V, 0, subH, 1, _V.length);
-        subH[0] = 0x03;
-        
-        byte[] H = hash(subH);
-        
-        // 5.
-        addTo(_V, H);
-        addTo(_V, _C);
-        byte[] c = new byte[4];
-        c[0] = (byte)(_reseedCounter >> 24);
-        c[1] = (byte)(_reseedCounter >> 16);
-        c[2] = (byte)(_reseedCounter >> 8);
-        c[3] = (byte)_reseedCounter;
-        
-        addTo(_V, c);
-
-        _reseedCounter++;
-
-        System.arraycopy(rv, 0, output, 0, output.length);
-
-        return numberOfBits;
-    }
-
-    // this will always add the shorter length byte array mathematically to the
-    // longer length byte array.
-    // be careful....
-    private void addTo(byte[] longer, byte[] shorter)
-    {
-        int carry = 0;
-        for (int i=1;i <= shorter.length; i++) // warning
-        {
-            int res = (longer[longer.length-i] & 0xff) + (shorter[shorter.length-i] & 0xff) + carry;
-            carry = (res > 0xff) ? 1 : 0;
-            longer[longer.length-i] = (byte)res;
-        }
-        
-        for (int i=shorter.length+1;i <= longer.length; i++) // warning
-        {
-            int res = (longer[longer.length-i] & 0xff) + carry;
-            carry = (res > 0xff) ? 1 : 0;
-            longer[longer.length-i] = (byte)res;
-        }
-    }
-
-    /**
-      * Reseed the DRBG.
-      *
-      * @param additionalInput additional input to be added to the DRBG in this step.
-      */
-    public void reseed(byte[] additionalInput)
-    {
-        // 1. seed_material = 0x01 || V || entropy_input || additional_input.
-        //
-        // 2. seed = Hash_df (seed_material, seedlen).
-        //
-        // 3. V = seed.
-        //
-        // 4. C = Hash_df ((0x00 || V), seedlen).
-        //
-        // 5. reseed_counter = 1.
-        //
-        // 6. Return V, C, and reseed_counter for the new_working_state.
-        //
-        // Comment: Precede with a byte of all zeros.
-        byte[] entropy = _entropySource.getEntropy();
-        byte[] seedMaterial = Arrays.concatenate(ONE, _V, entropy, additionalInput);
-        byte[] seed = Utils.hash_df(_digest, seedMaterial, _seedLength);
-
-        _V = seed;
-        byte[] subV = new byte[_V.length + 1];
-        subV[0] = 0x00;
-        System.arraycopy(_V, 0, subV, 1, _V.length);
-        _C = Utils.hash_df(_digest, subV, _seedLength);
-
-        _reseedCounter = 1;
-    }
-    
-    private byte[] hash(byte[] input)
-    {
-        byte[] hash = new byte[_digest.getDigestSize()];
-        doHash(input, hash);
-        return hash;
-    }
-
-    private void doHash(byte[] input, byte[] output)
-    {
-        _digest.update(input, 0, input.length);
-        _digest.doFinal(output, 0);
-    }
-
-    // 1. m = [requested_number_of_bits / outlen]
-    // 2. data = V.
-    // 3. W = the Null string.
-    // 4. For i = 1 to m
-    // 4.1 wi = Hash (data).
-    // 4.2 W = W || wi.
-    // 4.3 data = (data + 1) mod 2^seedlen
-    // .
-    // 5. returned_bits = Leftmost (requested_no_of_bits) bits of W.
-    private byte[] hashgen(byte[] input, int lengthInBits)
-    {
-        int digestSize = _digest.getDigestSize();
-        int m = (lengthInBits / 8) / digestSize;
-
-        byte[] data = new byte[input.length];
-        System.arraycopy(input, 0, data, 0, input.length);
-
-        byte[] W = new byte[lengthInBits / 8];
-
-        byte[] dig = new byte[_digest.getDigestSize()];
-        for (int i = 0; i <= m; i++)
-        {
-            doHash(data, dig);
-
-            int bytesToCopy = ((W.length - i * dig.length) > dig.length)
-                    ? dig.length
-                    : (W.length - i * dig.length);
-            System.arraycopy(dig, 0, W, i * dig.length, bytesToCopy);
-
-            addTo(data, ONE);
-        }
-
-        return W;
-    }    
-}
\ No newline at end of file
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/prng/drbg/SP80090DRBG.java b/bcprov/src/main/java/org/bouncycastle/crypto/prng/drbg/SP80090DRBG.java
deleted file mode 100644
index 7a919f3..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/prng/drbg/SP80090DRBG.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package org.bouncycastle.crypto.prng.drbg;
-
-/**
- * Interface to SP800-90A deterministic random bit generators.
- */
-public interface SP80090DRBG
-{
-    /**
-     * Return the block size of the DRBG.
-     *
-     * @return the block size (in bits) produced by each round of the DRBG.
-     */
-    int getBlockSize();
-
-    /**
-     * Populate a passed in array with random data.
-     *
-     * @param output output array for generated bits.
-     * @param additionalInput additional input to be added to the DRBG in this step.
-     * @param predictionResistant true if a reseed should be forced, false otherwise.
-     *
-     * @return number of bits generated, -1 if a reseed required.
-     */
-    int generate(byte[] output, byte[] additionalInput, boolean predictionResistant);
-
-    /**
-     * Reseed the DRBG.
-     *
-     * @param additionalInput additional input to be added to the DRBG in this step.
-     */
-    void reseed(byte[] additionalInput);
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/prng/drbg/Utils.java b/bcprov/src/main/java/org/bouncycastle/crypto/prng/drbg/Utils.java
deleted file mode 100644
index f7a4117..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/prng/drbg/Utils.java
+++ /dev/null
@@ -1,103 +0,0 @@
-package org.bouncycastle.crypto.prng.drbg;
-
-import java.util.Hashtable;
-
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.Mac;
-import org.bouncycastle.util.Integers;
-
-class Utils
-{
-    static final Hashtable maxSecurityStrengths = new Hashtable();
-
-    static
-    {
-        maxSecurityStrengths.put("SHA-1", Integers.valueOf(128));
-
-        maxSecurityStrengths.put("SHA-224", Integers.valueOf(192));
-        maxSecurityStrengths.put("SHA-256", Integers.valueOf(256));
-        maxSecurityStrengths.put("SHA-384", Integers.valueOf(256));
-        maxSecurityStrengths.put("SHA-512", Integers.valueOf(256));
-
-        maxSecurityStrengths.put("SHA-512/224", Integers.valueOf(192));
-        maxSecurityStrengths.put("SHA-512/256", Integers.valueOf(256));
-    }
-
-    static int getMaxSecurityStrength(Digest d)
-    {
-        return ((Integer)maxSecurityStrengths.get(d.getAlgorithmName())).intValue();
-    }
-
-    static int getMaxSecurityStrength(Mac m)
-    {
-        String name = m.getAlgorithmName();
-
-        return ((Integer)maxSecurityStrengths.get(name.substring(0, name.indexOf("/")))).intValue();
-    }
-
-    /**
-     * Used by both Dual EC and Hash.
-     */
-    static byte[] hash_df(Digest digest, byte[] seedMaterial, int seedLength)
-    {
-         // 1. temp = the Null string.
-        // 2. .
-        // 3. counter = an 8-bit binary value representing the integer "1".
-        // 4. For i = 1 to len do
-        // Comment : In step 4.1, no_of_bits_to_return
-        // is used as a 32-bit string.
-        // 4.1 temp = temp || Hash (counter || no_of_bits_to_return ||
-        // input_string).
-        // 4.2 counter = counter + 1.
-        // 5. requested_bits = Leftmost (no_of_bits_to_return) of temp.
-        // 6. Return SUCCESS and requested_bits.
-        byte[] temp = new byte[(seedLength + 7) / 8];
-
-        int len = temp.length / digest.getDigestSize();
-        int counter = 1;
-
-        byte[] dig = new byte[digest.getDigestSize()];
-
-        for (int i = 0; i <= len; i++)
-        {
-            digest.update((byte)counter);
-
-            digest.update((byte)(seedLength >> 24));
-            digest.update((byte)(seedLength >> 16));
-            digest.update((byte)(seedLength >> 8));
-            digest.update((byte)seedLength);
-
-            digest.update(seedMaterial, 0, seedMaterial.length);
-
-            digest.doFinal(dig, 0);
-
-            int bytesToCopy = ((temp.length - i * dig.length) > dig.length)
-                    ? dig.length
-                    : (temp.length - i * dig.length);
-            System.arraycopy(dig, 0, temp, i * dig.length, bytesToCopy);
-
-            counter++;
-        }
-
-        // do a left shift to get rid of excess bits.
-        if (seedLength % 8 != 0)
-        {
-            int shift = 8 - (seedLength % 8);
-            int carry = 0;
-
-            for (int i = 0; i != temp.length; i++)
-            {
-                int b = temp[i] & 0xff;
-                temp[i] = (byte)((b >>> shift) | (carry << (8 - shift)));
-                carry = b;
-            }
-        }
-
-        return temp;
-    }
-
-    static boolean isTooLarge(byte[] bytes, int maxBytes)
-    {
-        return bytes != null && bytes.length > maxBytes;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/prng/drbg/package.html b/bcprov/src/main/java/org/bouncycastle/crypto/prng/drbg/package.html
deleted file mode 100644
index c006166..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/prng/drbg/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body bgcolor="#ffffff">
-SP800-90A deterministic random bit generators, can be used stand alone or in conjunction with SP800SecureRandomBuilder class.
-</body>
-</html>
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/prng/package.html b/bcprov/src/main/java/org/bouncycastle/crypto/prng/package.html
deleted file mode 100644
index bb583ab..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/prng/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body bgcolor="#ffffff">
-Lightweight psuedo-random number generators and SecureRandom builders.
-</body>
-</html>
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/prng/test/AllTests.java b/bcprov/src/main/java/org/bouncycastle/crypto/prng/test/AllTests.java
deleted file mode 100644
index 4c0504f..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/prng/test/AllTests.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package org.bouncycastle.crypto.prng.test;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import org.bouncycastle.util.test.SimpleTestResult;
-
-public class AllTests
-    extends TestCase
-{   
-    public void testCrypto()
-    {   
-        org.bouncycastle.util.test.Test[] tests = RegressionTest.tests;
-        
-        for (int i = 0; i != tests.length; i++)
-        {
-            SimpleTestResult  result = (SimpleTestResult)tests[i].perform();
-  
-            if (!result.isSuccessful())
-            {
-                fail(result.toString());
-            }
-        }
-    }
-    
-    public static void main (String[] args)
-    {
-        junit.textui.TestRunner.run(suite());
-    }
-    
-    public static Test suite()
-    {
-        TestSuite suite = new TestSuite("Lightweight Crypto PRNG Tests");
-        
-        suite.addTestSuite(AllTests.class);
-        
-        return suite;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/prng/test/CTRDRBGTest.java b/bcprov/src/main/java/org/bouncycastle/crypto/prng/test/CTRDRBGTest.java
deleted file mode 100644
index 3d37a78..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/prng/test/CTRDRBGTest.java
+++ /dev/null
@@ -1,528 +0,0 @@
-package org.bouncycastle.crypto.prng.test;
-
-import org.bouncycastle.crypto.BlockCipher;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.DataLengthException;
-import org.bouncycastle.crypto.engines.AESEngine;
-import org.bouncycastle.crypto.engines.AESFastEngine;
-import org.bouncycastle.crypto.engines.DESedeEngine;
-import org.bouncycastle.crypto.params.DESedeParameters;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.crypto.prng.drbg.CTRSP800DRBG;
-import org.bouncycastle.crypto.prng.drbg.SP80090DRBG;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-
-/**
- * CTR DRBG Test
- */
-public class CTRDRBGTest
-    extends SimpleTest
-{
-    public String getName()
-    {
-        return "CTRDRBGTest";
-    }
-
-    public static void main(String[] args)
-    {
-        runTest(new CTRDRBGTest());
-    }
-    
-    private DRBGTestVector[] createTestVectorData()
-    {
-        return new DRBGTestVector[]
-            {
-                new DRBGTestVector(
-                            new DESedeEngine(), 168,
-                            new Bit232EntropyProvider().get(232),
-                            false,
-                            "20212223242526",
-                            112,
-                            new String[]
-                                {
-                                    "ABC88224514D0316EA3D48AEE3C9A2B4",
-                                    "D3D3F372E43E7ABDC4FA293743EED076"
-                                }
-                        ),
-                new DRBGTestVector(
-                            new DESedeEngine(), 168,
-                            new Bit232EntropyProvider().get(232),
-                            false,
-                            "20212223242526",
-                            112,
-                            new String[]
-                                {
-                                    "D4564EE072ACA5BD279536E14F94CB12",
-                                    "1CCD9AFEF15A9679BA75E35225585DEA"
-                                }
-                        )
-                .addAdditionalInput("606162636465666768696A6B6C6D6E6F707172737475767778797A7B7C")
-                .addAdditionalInput("A0A1A2A3A4A5A6A7A8A9AAABACADAEAFB0B1B2B3B4B5B6B7B8B9BABBBC"),
-                new DRBGTestVector(
-                            new DESedeEngine(), 168,
-                            new Bit232EntropyProvider().get(232),
-                            false,
-                            "20212223242526",
-                            112,
-                            new String[]
-                                {
-                                    "760BED7D92B083B10AF31CF0656081EB",
-                                    "FD1AC41482384D823CF3FD6F0E6C88B3"
-                                }
-                        )
-                .setPersonalizationString("404142434445464748494A4B4C4D4E4F505152535455565758595A5B5C"),
-                new DRBGTestVector(
-                            new DESedeEngine(), 168,
-                            new Bit232EntropyProvider().get(232),
-                            false,
-                            "20212223242526",
-                            112,
-                            new String[]
-                                {
-                                    "7A4C1D7ADC8A67FDB50100ED23583A2C",
-                                    "43044D311C0E07541CA5C8B0916976B2"
-                                }
-                        )
-                .setPersonalizationString("404142434445464748494A4B4C4D4E4F505152535455565758595A5B5C")
-                .addAdditionalInput("606162636465666768696A6B6C6D6E6F707172737475767778797A7B7C")
-                .addAdditionalInput("A0A1A2A3A4A5A6A7A8A9AAABACADAEAFB0B1B2B3B4B5B6B7B8B9BABBBC"),
-                new DRBGTestVector(
-                            new DESedeEngine(), 168,
-                            new Bit232EntropyProvider().get(232),
-                            true,
-                            "20212223242526",
-                            112,
-                            new String[]
-                                {
-                                    "8FB78ABCA75C9F284E974E36141866BC",
-                                    "9D9745FF31C42A4488CBB771B13B5D86"
-                                }
-                        ),
-                new DRBGTestVector(
-                            new DESedeEngine(), 168,
-                            new Bit232EntropyProvider().get(232),
-                            true,
-                            "20212223242526",
-                            112,
-                            new String[]
-                                {
-                                    "0E389920A09B485AA4ABD0CA7E60D89C",
-                                    "F4478EC6659A0D3577625B0C73A211DD"
-                                }
-                        )
-                .addAdditionalInput("606162636465666768696A6B6C6D6E6F707172737475767778797A7B7C")
-                .addAdditionalInput("A0A1A2A3A4A5A6A7A8A9AAABACADAEAFB0B1B2B3B4B5B6B7B8B9BABBBC"),
-                new DRBGTestVector(
-                            new DESedeEngine(), 168,
-                            new Bit232EntropyProvider().get(232),
-                            true,
-                            "20212223242526",
-                            112,
-                            new String[]
-                                {
-                                    "64983055D014550B39DE699E43130B64",
-                                    "035FDDA8582A2214EC722C410A8D95D3"
-                                }
-                        )
-                .setPersonalizationString("404142434445464748494A4B4C4D4E4F505152535455565758595A5B5C"),
-                new DRBGTestVector(
-                            new DESedeEngine(), 168,
-                            new Bit232EntropyProvider().get(232),
-                            true,
-                            "20212223242526",
-                            112,
-                            new String[]
-                                {
-                                    "A29C1A8C42FBC562D7D1DBA7DC541FFE",
-                                    "0BDA66B049429061C013E4228C2F44C6"
-                                }
-                        )
-                .setPersonalizationString("404142434445464748494A4B4C4D4E4F505152535455565758595A5B5C")
-                .addAdditionalInput("606162636465666768696A6B6C6D6E6F707172737475767778797A7B7C")
-                .addAdditionalInput("A0A1A2A3A4A5A6A7A8A9AAABACADAEAFB0B1B2B3B4B5B6B7B8B9BABBBC"),
-                new DRBGTestVector(
-                            new AESFastEngine(), 128,
-                            new Bit256EntropyProvider().get(256),
-                            false,
-                            "2021222324252627",
-                            128,
-                            new String[]
-                                {
-                                    "8CF59C8CF6888B96EB1C1E3E79D82387AF08A9E5FF75E23F1FBCD4559B6B997E",
-                                    "69CDEF912C692D61B1DA4C05146B52EB7B8849BD87937835328254EC25A9180E"
-                                }
-                        ),
-                new DRBGTestVector(
-                            new AESFastEngine(), 128,
-                            new Bit256EntropyProvider().get(256),
-                            false,
-                            "2021222324252627",
-                            128,
-                            new String[]
-                                {
-                                    "E8C74A4B7BFFB53BEB80E78CA86BB6DF70E2032AEB473E0DD54D2339CEFCE9D0",
-                                    "26B3F823B4DBAFC23B141375E10B3AEB7A0B5DEF1C7D760B6F827D01ECD17AC7"
-                                }
-                        )
-                .addAdditionalInput("606162636465666768696A6B6C6D6E6F707172737475767778797A7B7C7D7E7F")
-                .addAdditionalInput("A0A1A2A3A4A5A6A7A8A9AAABACADAEAFB0B1B2B3B4B5B6B7B8B9BABBBCBDBEBF"),
-                new DRBGTestVector(
-                           new AESFastEngine(), 128,
-                           new Bit256EntropyProvider().get(256),
-                           false,
-                           "2021222324252627",
-                           128,
-                           new String[]
-                               {
-                                   "18FDEFBDC43D7A36D5D6D862205765D1D701C9F237007030DF1B8E70EE4EEE29",
-                                   "9888F1D38BB1CCE31B363AA1BD9B39616876C30DEE1FF0B7BD8C4C441715C833"
-                               }
-                       )
-               .setPersonalizationString("404142434445464748494A4B4C4D4E4F505152535455565758595A5B5C5D5E5F"),
-                new DRBGTestVector(
-                            new AESFastEngine(), 128,
-                            new Bit256EntropyProvider().get(256),
-                            true,
-                            "2021222324252627",
-                            128,
-                            new String[]
-                                {
-                                    "BFF4B85D68C84529F24F69F9ACF1756E29BA648DDEB825C225FA32BA490EF4A9",
-                                    "9BD2635137A52AF7D0FCBEFEFB97EA93A0F4C438BD98956C0DACB04F15EE25B3"
-                                }
-                        ),
-                new DRBGTestVector(
-                            new AESFastEngine(), 128,
-                            new Bit256EntropyProvider().get(256),
-                            true,
-                            "2021222324252627",
-                            128,
-                            new String[]
-                                {
-                                    "4573AC8BBB33D7CC4DBEF3EEDF6EAE748B536C3A1082CEE4948CDB51C83A7F9C",
-                                    "99C628CDD87BD8C2F1FE443AA7F761DA16886436326323354DA6311FFF5BC678"
-                                }
-                        )
-                .addAdditionalInput("606162636465666768696A6B6C6D6E6F707172737475767778797A7B7C7D7E7F")
-                .addAdditionalInput("A0A1A2A3A4A5A6A7A8A9AAABACADAEAFB0B1B2B3B4B5B6B7B8B9BABBBCBDBEBF"),
-                new DRBGTestVector(
-                           new AESFastEngine(), 128,
-                           new Bit256EntropyProvider().get(256),
-                           true,
-                           "2021222324252627",
-                           128,
-                           new String[]
-                               {
-                                   "F324104E2FA14F79D8AA60DF06B93B3BC157324958F0A7EE1E193677A70E0250",
-                                   "78F4C840134F40DC001BFAD3A90B5EF4DEBDBFAC3CFDF0CD69A89DC4FD34713F"
-                               }
-                       )
-               .setPersonalizationString("404142434445464748494A4B4C4D4E4F505152535455565758595A5B5C5D5E5F"),
-                new DRBGTestVector(
-                            new AESFastEngine(), 192,
-                            new Bit320EntropyProvider().get(320),
-                            false,
-                            "202122232425262728292A2B",
-                            192,
-                            new String[]
-                                {
-                                    "E231244B3235B085C81604424357E85201E3828B5C45568679A5555F867AAC8C",
-                                    "DDD0F7BCCADADAA31A67652259CE569A271DD85CF66C3D6A7E9FAED61F38D219"
-                                }
-                        )
-                .setPersonalizationString("404142434445464748494A4B4C4D4E4F505152535455565758595A5B5C5D5E5F6061626364656667"),
-                new DRBGTestVector(
-                        new AESFastEngine(), 192,
-                        new Bit320EntropyProvider().get(320),
-                        true,
-                        "202122232425262728292A2B",
-                        192,
-                        new String[]
-                            {
-                                "F780D4A2C25CF8EE7407D948EC0B724A4235D8B20E65081392755CA7912AD7C0",
-                                "BA14617F915BA964CB79276BDADC840C14B631BBD1A59097054FA6DFF863B238"
-                            }
-                    )
-            .setPersonalizationString("404142434445464748494A4B4C4D4E4F505152535455565758595A5B5C5D5E5F6061626364656667"),
-                new DRBGTestVector(
-                            new AESFastEngine(), 256,
-                            new Bit384EntropyProvider().get(384),
-                            false,
-                            "202122232425262728292A2B2C2D2E2F",
-                            256,
-                            new String[]
-                                {
-                                    "47111E146562E9AA2FB2A1B095D37A8165AF8FC7CA611D632BE7D4C145C83900",
-                                    "98A28E3B1BA363C9DAF0F6887A1CF52B833D3354D77A7C10837DD63DD2E645F8"
-                                }
-                        )
-                .setPersonalizationString("404142434445464748494A4B4C4D4E4F505152535455565758595A5B5C5D5E5F606162636465666768696A6B6C6D6E6F")
-                .addAdditionalInput("606162636465666768696A6B6C6D6E6F707172737475767778797A7B7C7D7E7F808182838485868788898A8B8C8D8E8F")
-                .addAdditionalInput("A0A1A2A3A4A5A6A7A8A9AAABACADAEAFB0B1B2B3B4B5B6B7B8B9BABBBCBDBEBFC0C1C2C3C4C5C6C7C8C9CACBCCCDCECF"),
-                new DRBGTestVector(
-                            new AESFastEngine(), 256,
-                            new Bit384EntropyProvider().get(384),
-                            true,
-                            "202122232425262728292A2B2C2D2E2F",
-                            256,
-                            new String[]
-                                {
-                                    "71BB3F9C9CEAF4E6C92A83EB4C7225010EE150AC75E23F5F77AD5073EF24D88A",
-                                    "386DEBBBF091BBF0502957B0329938FB836B82E594A2F5FDD5EB28D4E35528F4"
-                                }
-                        )
-                .addAdditionalInput("606162636465666768696A6B6C6D6E6F707172737475767778797A7B7C7D7E7F808182838485868788898A8B8C8D8E8F")
-                .addAdditionalInput("A0A1A2A3A4A5A6A7A8A9AAABACADAEAFB0B1B2B3B4B5B6B7B8B9BABBBCBDBEBFC0C1C2C3C4C5C6C7C8C9CACBCCCDCECF"),
-                new DRBGTestVector(
-                            new AESFastEngine(), 256,
-                            new Bit384EntropyProvider().get(384),
-                            true,
-                            "202122232425262728292A2B2C2D2E2F",
-                            256,
-                            new String[]
-                                {
-                                    "1A2E3FEE9056E98D375525FDC2B63B95B47CE51FCF594D804BD5A17F2E01139B",
-                                    "601F95384F0D85946301D1EACE8F645A825CE38F1E2565B0C0C439448E9CA8AC"
-                                }
-                        )
-                .setPersonalizationString("404142434445464748494A4B4C4D4E4F505152535455565758595A5B5C5D5E5F606162636465666768696A6B6C6D6E6F"),
-                new DRBGTestVector(
-                            new AESFastEngine(), 256,
-                            new Bit384EntropyProvider().get(384),
-                            true,
-                            "202122232425262728292A2B2C2D2E2F",
-                            256,
-                            new String[]
-                                {
-                                    "EAE6BCE781807E524D26605EA198077932D01EEB445B9AC6C5D99C101D29F46E",
-                                    "738E99C95AF59519AAD37FF3D5180986ADEBAB6E95836725097E50A8D1D0BD28"
-                                }
-                        )
-                .setPersonalizationString("404142434445464748494A4B4C4D4E4F505152535455565758595A5B5C5D5E5F606162636465666768696A6B6C6D6E6F")
-                .addAdditionalInput("606162636465666768696A6B6C6D6E6F707172737475767778797A7B7C7D7E7F808182838485868788898A8B8C8D8E8F")
-                .addAdditionalInput("A0A1A2A3A4A5A6A7A8A9AAABACADAEAFB0B1B2B3B4B5B6B7B8B9BABBBCBDBEBFC0C1C2C3C4C5C6C7C8C9CACBCCCDCECF"),
-                new DRBGTestVector(
-                            new AESFastEngine(), 256,
-                            new Bit384EntropyProvider().get(384),
-                            true,
-                            "202122232425262728292A2B2C2D2E2F",
-                            256,
-                            new String[]
-                                {
-                                    "eae6bce781807e524d26605ea198077932d01eeb445b9ac6c5d99c101d29f46e30b27377",
-                                    "ec51b55b49904c3ff9e13939f1cf27398993e1b3acb2b0be0be8761261428f0aa8ba2657"
-                                }
-                        )
-                .setPersonalizationString("404142434445464748494A4B4C4D4E4F505152535455565758595A5B5C5D5E5F606162636465666768696A6B6C6D6E6F")
-                .addAdditionalInput("606162636465666768696A6B6C6D6E6F707172737475767778797A7B7C7D7E7F808182838485868788898A8B8C8D8E8F")
-                .addAdditionalInput("A0A1A2A3A4A5A6A7A8A9AAABACADAEAFB0B1B2B3B4B5B6B7B8B9BABBBCBDBEBFC0C1C2C3C4C5C6C7C8C9CACBCCCDCECF")
-            };
-    }
-
-    public void performTest()
-        throws Exception
-    {
-        DRBGTestVector[] tests = createTestVectorData();
-
-        for (int i = 0; i != tests.length; i++)
-        {
-            DRBGTestVector tv = tests[i];
-
-            byte[] nonce = tv.nonce();
-            byte[] personalisationString = tv.personalizationString();
-
-            SP80090DRBG d = new CTRSP800DRBG(tv.getCipher(), tv.keySizeInBits(), tv.securityStrength(), tv.entropySource(), personalisationString, nonce);
-
-            byte[] output = new byte[tv.expectedValue(0).length];
-
-            d.generate(output, tv.additionalInput(0), tv.predictionResistance());
-
-            byte[] expected = tv.expectedValue(0);
-
-            if (!areEqual(expected, output))
-            {
-                fail("Test #" + (i + 1) + ".1 failed, expected " + new String(Hex.encode(tv.expectedValue(0))) + " got " + new String(Hex.encode(output)));
-            }
-
-            output = new byte[tv.expectedValue(0).length];
-
-            d.generate(output, tv.additionalInput(1), tv.predictionResistance());
-
-            expected = tv.expectedValue(1);
-            if (!areEqual(expected, output))
-            {
-                fail("Test #" + (i + 1) + ".2 failed, expected " + new String(Hex.encode(tv.expectedValue(1))) + " got " + new String(Hex.encode(output)));
-            }
-        }
-
-        // DESede/TDEA key parity test
-        DRBGTestVector tv = tests[0];
-
-        SP80090DRBG drbg = new CTRSP800DRBG(new KeyParityCipher(tv.getCipher()), tv.keySizeInBits(), tv.securityStrength(), tv.entropySource(), tv.personalizationString(), tv.nonce());
-
-        byte[] output = new byte[tv.expectedValue(0).length];
-
-        drbg.generate(output, tv.additionalInput(0), tv.predictionResistance());
-
-        // Exception tests
-        SP80090DRBG d;
-        try
-        {
-            d = new CTRSP800DRBG(new AESEngine(), 256, 256, new Bit232EntropyProvider().get(128), null, null);
-            fail("no exception thrown");
-        }
-        catch (IllegalArgumentException e)
-        {
-            if (!e.getMessage().equals("Not enough entropy for security strength required"))
-            {
-                fail("Wrong exception", e);
-            }
-        }
-
-        try
-        {
-            d = new CTRSP800DRBG(new DESedeEngine(), 256, 256, new Bit232EntropyProvider().get(232), null, null);
-            fail("no exception thrown");
-        }
-        catch (IllegalArgumentException e)
-        {
-            if (!e.getMessage().equals("Requested security strength is not supported by block cipher and key size"))
-            {
-                fail("Wrong exception", e);
-            }
-        }
-
-        try
-        {
-            d = new CTRSP800DRBG(new DESedeEngine(), 168, 256, new Bit232EntropyProvider().get(232), null, null);
-            fail("no exception thrown");
-        }
-        catch (IllegalArgumentException e)
-        {
-            if (!e.getMessage().equals("Requested security strength is not supported by block cipher and key size"))
-            {
-                fail("Wrong exception", e);
-            }
-        }
-
-        try
-        {
-            d = new CTRSP800DRBG(new AESEngine(), 192, 256, new Bit232EntropyProvider().get(232), null, null);
-            fail("no exception thrown");
-        }
-        catch (IllegalArgumentException e)
-        {
-            if (!e.getMessage().equals("Requested security strength is not supported by block cipher and key size"))
-            {
-                fail("Wrong exception", e);
-            }
-        }
-    }
-
-    private class Bit232EntropyProvider
-        extends TestEntropySourceProvider
-    {
-        Bit232EntropyProvider()
-        {
-            super(Hex.decode(
-               "000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C" +
-               "808182838485868788898A8B8C8D8E8F909192939495969798999A9B9C" +
-               "C0C1C2C3C4C5C6C7C8C9CACBCCCDCECFD0D1D2D3D4D5D6D7D8D9DADBDC"), true);
-        }
-    }
-
-    private class Bit256EntropyProvider
-        extends TestEntropySourceProvider
-    {
-        Bit256EntropyProvider()
-        {
-            super(Hex.decode(
-                "0001020304050607"+
-                "08090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F"+
-                "8081828384858687"+
-                "88898A8B8C8D8E8F909192939495969798999A9B9C9D9E9F"+
-                "C0C1C2C3C4C5C6C7"+
-                "C8C9CACBCCCDCECFD0D1D2D3D4D5D6D7D8D9DADBDCDDDEDF"), true);
-        }
-    }
-
-    private class Bit320EntropyProvider
-        extends TestEntropySourceProvider
-    {
-        Bit320EntropyProvider()
-        {
-            super(Hex.decode(
-            "000102030405060708090A0B0C0D0E0F"+
-            "101112131415161718191A1B1C1D1E1F2021222324252627"+
-            "808182838485868788898A8B8C8D8E8F"+
-            "909192939495969798999A9B9C9D9E9FA0A1A2A3A4A5A6A7"+
-            "C0C1C2C3C4C5C6C7C8C9CACBCCCDCECF"+
-            "D0D1D2D3D4D5D6D7D8D9DADBDCDDDEDFE0E1E2E3E4E5E6E7"), true);
-        }
-    }
-
-    private class Bit384EntropyProvider
-        extends TestEntropySourceProvider
-    {
-        Bit384EntropyProvider()
-        {
-            super(Hex.decode(
-            "000102030405060708090A0B0C0D0E0F1011121314151617" +
-            "18191A1B1C1D1E1F202122232425262728292A2B2C2D2E2F" +
-            "808182838485868788898A8B8C8D8E8F9091929394959697" +
-            "98999A9B9C9D9E9FA0A1A2A3A4A5A6A7A8A9AAABACADAEAF" +
-            "C0C1C2C3C4C5C6C7C8C9CACBCCCDCECFD0D1D2D3D4D5D6D7" +
-            "D8D9DADBDCDDDEDFE0E1E2E3E4E5E6E7E8E9EAEBECEDEEEF"), true);
-        }
-    }
-
-    private class KeyParityCipher
-        implements BlockCipher
-    {
-        private BlockCipher cipher;
-
-        KeyParityCipher(BlockCipher cipher)
-        {
-            this.cipher = cipher;
-        }
-
-        public void init(boolean forEncryption, CipherParameters params)
-            throws IllegalArgumentException
-        {
-            byte[] k = Arrays.clone(((KeyParameter)params).getKey());
-
-            DESedeParameters.setOddParity(k);
-
-            if (!Arrays.areEqual(((KeyParameter)params).getKey(), k))
-            {
-                fail("key not odd parity");
-            }
-
-            cipher.init(forEncryption, params);
-        }
-
-        public String getAlgorithmName()
-        {
-            return cipher.getAlgorithmName();
-        }
-
-        public int getBlockSize()
-        {
-            return cipher.getBlockSize();
-        }
-
-        public int processBlock(byte[] in, int inOff, byte[] out, int outOff)
-            throws DataLengthException, IllegalStateException
-        {
-            return cipher.processBlock(in, inOff, out, outOff);
-        }
-
-        public void reset()
-        {
-            cipher.reset();
-        }
-    }
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/prng/test/DRBGTestVector.java b/bcprov/src/main/java/org/bouncycastle/crypto/prng/test/DRBGTestVector.java
deleted file mode 100644
index dd6801c..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/prng/test/DRBGTestVector.java
+++ /dev/null
@@ -1,131 +0,0 @@
-package org.bouncycastle.crypto.prng.test;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.bouncycastle.crypto.BlockCipher;
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.prng.EntropySource;
-import org.bouncycastle.util.encoders.Hex;
-
-public class DRBGTestVector
-{
-        private Digest _digest;
-        private BlockCipher _cipher;
-        private int _keySizeInBits;
-        private EntropySource _eSource;
-        private boolean _pr;
-        private String _nonce;
-        private String _personalisation;
-        private int _ss;
-        private String[] _ev;
-        private List _ai = new ArrayList();
-
-        public DRBGTestVector(Digest digest, EntropySource eSource, boolean predictionResistance, String nonce, int securityStrength, String[] expected)
-        {
-            _digest = digest;
-            _eSource = eSource;
-            _pr = predictionResistance;
-            _nonce = nonce;
-            _ss = securityStrength;
-            _ev = expected;
-            _personalisation = null;
-        }
-
-        public DRBGTestVector(BlockCipher cipher, int keySizeInBits, EntropySource eSource, boolean predictionResistance, String nonce, int securityStrength, String[] expected)
-        {
-            _cipher = cipher;
-            _keySizeInBits = keySizeInBits;
-            _eSource = eSource;
-            _pr = predictionResistance;
-            _nonce = nonce;
-            _ss = securityStrength;
-            _ev = expected;
-            _personalisation = null;
-        }
-
-        public Digest getDigest()
-        {
-            return _digest;
-        }
-
-        public BlockCipher getCipher()
-        {
-            return _cipher;
-        }
-
-        public int keySizeInBits()
-        {
-            return _keySizeInBits;
-        }
-
-        public DRBGTestVector addAdditionalInput(String input)
-        {
-            _ai.add(input);
-
-            return this;
-        }
-
-        public DRBGTestVector setPersonalizationString(String p)
-        {
-            _personalisation = p;
-
-            return this;
-        }
-
-        public EntropySource entropySource()
-        {
-            return _eSource;
-        }
-
-        public boolean predictionResistance()
-        {
-            return _pr;
-        }
-
-        public byte[] nonce()
-        {
-            if (_nonce == null)
-            {
-                return null;
-            }
-
-            return Hex.decode(_nonce);
-        }
-
-        public byte[] personalizationString()
-        {
-            if (_personalisation == null)
-            {
-                return null;
-            }
-
-            return Hex.decode(_personalisation);
-        }
-
-        public int securityStrength()
-        {
-            return _ss;
-        }
-
-        public byte[] expectedValue(int index)
-        {
-            return Hex.decode(_ev[index]);
-        }
-
-        public byte[] additionalInput(int position)
-        {
-            int len = _ai.size();
-            byte[] rv;
-            if (position >= len)
-            {
-                rv = null;
-            }
-            else
-            {
-                rv = Hex.decode((String)(_ai.get(position)));
-            }
-            return rv;
-        }
-
-    }
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/prng/test/DualECDRBGTest.java b/bcprov/src/main/java/org/bouncycastle/crypto/prng/test/DualECDRBGTest.java
deleted file mode 100644
index d6c2630..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/prng/test/DualECDRBGTest.java
+++ /dev/null
@@ -1,415 +0,0 @@
-package org.bouncycastle.crypto.prng.test;
-
-import org.bouncycastle.crypto.digests.SHA1Digest;
-import org.bouncycastle.crypto.digests.SHA256Digest;
-import org.bouncycastle.crypto.digests.SHA384Digest;
-import org.bouncycastle.crypto.digests.SHA512Digest;
-import org.bouncycastle.crypto.prng.drbg.DualECSP800DRBG;
-import org.bouncycastle.crypto.prng.drbg.SP80090DRBG;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-
-/**
- * Dual EC SP800-90 DRBG test
- */
-public class DualECDRBGTest
-    extends SimpleTest
-{
-    public String getName()
-    {
-        return "DualECDRBG";
-    }
-
-    public static void main(String[] args)
-    {
-        runTest(new DualECDRBGTest());
-    }
-
-    private DRBGTestVector[] createTestVectorData()
-    {
-        return new DRBGTestVector[]
-            {
-                new DRBGTestVector(
-                    new SHA256Digest(),
-                    new SHA256EntropyProvider().get(128),
-                    false,
-                    "2021222324252627",
-                    128,
-                    new String[]
-                        {
-                            "FF5163C388F791E96F1052D5C8F0BD6FBF7144839C4890FF85487C5C12702E4C9849AF518AE68DEB14D3A62702BBDE4B98AB211765FD87ACA12FC2A6",
-                            "9A0A11F2DFB88F7260559DD8DA6134EB2B34CC0415FA8FD0474DB6B85E1A08385F41B435DF81296B1B4EDF66E0107C0844E3D28A89B05046B89177F2"
-                        }),
-                new DRBGTestVector(
-                    new SHA256Digest(),
-                    new SHA256EntropyProvider().get(128),
-                    false,
-                    "2021222324252627",
-                    128,
-                    new String[]
-                        {
-                            "C08E954FCD486D0B0934A0236692AC705A835D1A3C94D2ACD4684AB26E978D7D42E73CC06D6EC1472C63E51BED7F71518395836E2052BBD73A20CABB",
-                            "1D76DEE36FCC5F9478C112EAFA1C4CCD0635435A6F3A247A3BA3849790B5245070E95C1A67BE7A39BFB213F2C0EFCC171A3253DA6D54DA4362EA2099"
-                        })
-                .addAdditionalInput("606162636465666768696A6B6C6D6E6F")
-                .addAdditionalInput("A0A1A2A3A4A5A6A7A8A9AAABACADAEAF"),
-                new DRBGTestVector(
-                    new SHA256Digest(),
-                    new SHA256EntropyProvider().get(128),
-                    false,
-                    "2021222324252627",
-                    128,
-                    new String[]
-                        {
-                            "3AB095CC493A8730D70DE923108B2E4710799044FFC27D0A1156250DDF97E8B05ACE055E49F3E3F5B928CCD18317A3E68FCB0B6F0459ADF9ECF79C87",
-                            "7B902FC35B0AF50F57F8822936D08A96E41B16967C6B1AA0BC05032F0D53919DC587B664C883E2FE8F3948002FCD8BCBFC4706BCAA2075EF6BF41167"
-                        })
-                .setPersonalizationString("404142434445464748494A4B4C4D4E4F"),
-                new DRBGTestVector(
-                    new SHA256Digest(),
-                    new SHA256EntropyProvider().get(128),
-                    false,
-                    "2021222324252627",
-                    128,
-                    new String[]
-                        {
-                            "3B68A1D95ED0312150AC1991189780F37EC50E75249F915CD806BBA0C44F9E3A919B2390805E1E90C1D2D1C823B17B96DB44535B72E0CFB62723529D",
-                            "250B933475E3BD4FC85D97FD797834B599DEDEDF8B6F15474E1F31B4AF215CFA7A8C0A0296A2E374B3886BB0CC7E49DBB19324564B451E64F12864F9"
-                        })
-                .setPersonalizationString("404142434445464748494A4B4C4D4E4F")
-                .addAdditionalInput("606162636465666768696A6B6C6D6E6F")
-                .addAdditionalInput("A0A1A2A3A4A5A6A7A8A9AAABACADAEAF"),
-                new DRBGTestVector(
-                    new SHA256Digest(),
-                    new SHA256EntropyProvider().get(128),
-                    true,
-                    "2021222324252627",
-                    128,
-                    new String[]
-                        {
-                            "8C77288EDBEA9A742464F78D55E33593C1BF5F9D8CD8609D6D53BAC4E4B42252A227A99BAD0F2358B05955CD35723B549401C71C9C1F32F8A2018E24",
-                            "56ECA61C64F69C1C232E992623C71418BD0B96D783118FAAD94A09E3A9DB74D15E805BA7F14625995CA77612B2EF7A05863699ECBABF70D3D422C014"
-                        }),
-                new DRBGTestVector(
-                    new SHA256Digest(),
-                    new SHA256EntropyProvider().get(128),
-                    true,
-                    "2021222324252627",
-                    128,
-                    new String[]
-                        {
-                            "A5C397DFEB540E86F0470E9625D5C5AC2D50016FB201E8DF574F2201DFBB42A799FEB9E238AAD301A493382250EEE60D2E2927E500E848E57535ABD1",
-                            "BF9894630BEBAF0A0EDFE726285EB055FD2ED678B76673803DD327F49DBEDE87D3E447A6EB73B5D5C52A40078132677F412E9E7DE32B9B1CB32421B9"
-                        })
-                    .addAdditionalInput("606162636465666768696A6B6C6D6E6F")
-                    .addAdditionalInput("A0A1A2A3A4A5A6A7A8A9AAABACADAEAF"),
-                new DRBGTestVector(
-                    new SHA384Digest(),
-                    new SHA384EntropyProvider().get(192),
-                    false,
-                    "202122232425262728292A2B",
-                    192,
-                    new String[]
-                        {
-                            "1F858858B65357D6360E1ED8F8475767B08DAB30718CCA01C6FAE77A4BDCE2702C76D0FB4758EA1ED6AA587CFD26B9011DC8A75D0B4154193BB2C1798FFA52BCAB208310" +
-                            "3CD2AAD44BEED56D042FC2B8915D7D9BED6437EFEB1582EE",
-                            "6E4AAB63938212C870F24BB067A32CA9E7FC2343" +
-                            "5D411729268C8BA6F90E87074D04888CE2CC5A916B7AC93F" +
-                            "EDE85E2995645DFCC4CE44B9FB41F1BFCC5E9F59EE3A8E1B" +
-                            "8F85247F741B7C480521EE6BF8BA319B59048E65F08FAA76"
-                        }),
-                new DRBGTestVector(
-                    new SHA384Digest(),
-                    new SHA384EntropyProvider().get(192),
-                    false,
-                    "202122232425262728292A2B",
-                    192,
-                    new String[]
-                        {
-                            "E6A30AB0C9AFCBA673E4F1C94B3DB1F0C7D78B3D" +
-                            "87B967281BE1E7B3CAF5200AED502C26B84FC169FE8336BD" +
-                            "23271CB299812F2CF1955AA63FC362044ABA246EF1610F9E" +
-                            "DC613924A84A00F8DB3FC65C13373F3171EB20848FA9A70E",
-                            "8585764DF1C86EA12ACCB882525BF6217B447486" +
-                            "5EBFDA367B8657FA80471139BAC626172B9F219DF2CE9099" +
-                            "F65833E07CD1A8DD80468779EA3C26620A2C9C9F5C7EFCDD" +
-                            "C036E6F6C8BF70316D3C37FC246A4CC79B3F1DB971D72ED0"
-                        })
-                .setPersonalizationString("404142434445464748494A4B4C4D4E4F5051525354555657"),
-                new DRBGTestVector(
-                    new SHA384Digest(),
-                    new SHA384EntropyProvider().get(192),
-                    false,
-                    "202122232425262728292A2B",
-                    192,
-                    new String[]
-                        {
-                            "13F6EA9BBA7BABDC2A52A3B9FD73D65ECAA638A0" +
-                            "4C74BCCA2ACDE6FD29FEA4B5D884E095E87D1B7C0DEB9D37" +
-                            "7AD81FBFEEA2D5EF82C0F6F52B9FCC359E769AC9DF2A876C" +
-                            "58BAF21657814F3E66D1680B1D4EBD65581E42534F85197D",
-                            "FC0A36F4D20F8F83BE3430AA3C36A49191821A82" +
-                            "072BBC3D5AFF8D7EC39484D646277CE87599B6FE8CCA9862" +
-                            "559703A10F4DE1066BFD30B80C325E774B512525BC6D3734" +
-                            "4C93906368243D31F89E99C4D2A6E9BEB24D5F7267360DCA"
-                        })
-                .setPersonalizationString("404142434445464748494A4B4C4D4E4F5051525354555657")
-                .addAdditionalInput("606162636465666768696A6B6C6D6E6F7071727374757677")
-                .addAdditionalInput("A0A1A2A3A4A5A6A7A8A9AAABACADAEAFB0B1B2B3B4B5B6B7"),
-                new DRBGTestVector(
-                    new SHA384Digest(),
-                    new SHA384EntropyProvider().get(192),
-                    true,
-                    "202122232425262728292A2B",
-                    192,
-                    new String[]
-                        {
-                            "FE55601BF734493013705CCEB76E44AAD48373F7" +
-                            "42E72B83D4701FA6549255F1CDE6217953522FF973BA4F6E" +
-                            "C96D2BDCF14A76BE7DEB61781E34B99335BD714F17C91739" +
-                            "B4E2AB57E36E9C3116E215D3D94FCFAD532636874875CAC7",
-                            "F5E59D0ABADE81F62FFAB9D4A6A26FF200016608" +
-                            "A7215E389858FFED83FBC75CFD33DBA6688C89AA32AD22E4" +
-                            "80EA3D04EADFB35567B67564207E64B77844E8E4A87502D5" +
-                            "02DBBB6D8277F1CACDB7CF8D293D09DB7DD59A950821507A"
-                        })
-                .addAdditionalInput("606162636465666768696A6B6C6D6E6F7071727374757677")
-                .addAdditionalInput("A0A1A2A3A4A5A6A7A8A9AAABACADAEAFB0B1B2B3B4B5B6B7"),
-                new DRBGTestVector(
-                    new SHA384Digest(),
-                    new SHA384EntropyProvider().get(192),
-                    true,
-                    "202122232425262728292A2B",
-                    192,
-                    new String[]
-                        {
-                            "CC788F70FB08F256D9604333630D85936D400F45" +
-                            "718DC3F939A8B9F6F75D3E4EC17D68FBB924AEACB7021295" +
-                            "48FA63CE9BCB82176639B64DE890A47025B5582312FE934E" +
-                            "F0D0A12697C0F05D2DA108CCADB511BA0EB62F4051BB2354",
-                            "2C922EA620D76E4137B315EBC29E518F80951B3F" +
-                            "0E6173FA2BFD94A230EE513EE2E4EB330D802F620DD24911" +
-                            "534EC0F95A1F1D44A2125F5D57476A666FC372092B55D0D6" +
-                            "8B49738F5BC466EC206AB3CF6A972B38BCFAE5FCD53C7E21 "
-                        }),
-                new DRBGTestVector(
-                    new SHA512Digest(),
-                    new SHA512EntropyProvider().get(256),
-                    false,
-                    "202122232425262728292A2B2C2D2E2F",
-                    256,
-                    new String[]
-                        {
-                            "7A8313798EE1" +
-                            "D1898712683F2D0B0DEE5804146ABA64FDA8DB4E539CC8D1" +
-                            "E59C74EE5AA48E73E958C8EC85DD529D42E68B4F7E02FFAF" +
-                            "3E3EF8312AEA68BC08A414885E60A7DF0B55F9D90210B319" +
-                            "E9B8FD23E078A4153636F29AA3CAC8198CB1D5D846151653" +
-                            "ECE275A591089261238014E5058410065AB8229EB9115E8E",
-                            "918B5D79E646" +
-                            "64966D954BC5E2946BF48F061BF0C2701C3C2D1F75EA821E" +
-                            "1DA05D5B3C2C4EEA246E806B53BF6BDB3F3D53A3AE756C2A" +
-                            "45C72603973A3DE1BC367C283CA124A5589CEAB30E5D2D74" +
-                            "8A40DD874FF15B032CF4F4B2AAD590B0DB91A0D38FCE93C5" +
-                            "AAD4E55AC482F86FF06FAE66B7C7CCA7E45557E1A5A3B85D"
-                        }),
-                new DRBGTestVector(
-                    new SHA512Digest(),
-                    new SHA512EntropyProvider().get(256),
-                    true,
-                    "202122232425262728292A2B2C2D2E2F",
-                    256,
-                    new String[]
-                        {
-                            "C7ED88A2C690" +
-                            "1C04802BA2BB04262921B19664835A4A3C002CB9F13E35E3" +
-                            "DEB3698A436BF1C85B070E9E6977CA78A5130905AA0C01A9" +
-                            "4130F5133DF904A4ACF59A7DD01227E8FCA1C8D51F093839" +
-                            "46ECD950113104760D7E216CAF581FE9D3AACE6FC4CDDC4C" +
-                            "CD736D26A60BE8BE2A6A78CD752D1EC7CCC802638B177307",
-                            "83B78B206785" +
-                            "4412EEB24AEA86064D510C68FD96DBF94EAC1BC2022752D7" +
-                            "558AEB9F97B9CBC1B9648FE4D88E2C82A6F530675E1DB92D" +
-                            "396D6D85BDAD2A23CBD10AD808ECCCFBFC811EB68AE835E4" +
-                            "912E011DD10A4399C8DE2D9D88F81B6168B05D282B9DAC1E" +
-                            "65E0A45F61043E1FA047870DD582295E6C50DD1185B13594 "
-                        })
-                .setPersonalizationString("404142434445464748494A4B4C4D4E4F505152535455565758595A5B5C5D5E5F")
-                .addAdditionalInput("606162636465666768696A6B6C6D6E6F707172737475767778797A7B7C7D7E7F")
-                .addAdditionalInput("A0A1A2A3A4A5A6A7A8A9AAABACADAEAFB0B1B2B3B4B5B6B7B8B9BABBBCBDBEBF"),
-                new DRBGTestVector(
-                    new SHA512Digest(),
-                    new SHA512EntropyProvider().get(256),
-                    true,
-                    "202122232425262728292A2B2C2D2E2F",
-                    256,
-                    new String[]
-                        {
-                            "CC7035C73040" +
-                            "5CF5DF7137ED9E10744B75B540AFFC68EB564B71C0F737E8" +
-                            "F656B6171940497FA90D8F383EFB6FC6717BA14AAA164EF5" +
-                            "6641C0F513312551DCD21D0A5B0DBDCD97F627E968DFD752" +
-                            "56C11CF2BCCA5822EAACE796A34CB7D2F8CD8CC6DBE76274" +
-                            "498289BBC4C2F1CADA6185D82605CF992EC285BC4945EE9E",
-                            "0E6C329AD1BE" +
-                            "681EB1E6F5E03A89E3D80153D6CCDD5A3ECF865003EE4A2D" +
-                            "E5A23B7F43681361CFAFC3A3FEF17777E75CF9D6685573C8" +
-                            "87A3962CB955076D45D6F1E45EE4B8CB31A4731CDA031FA2" +
-                            "815B6D34E29F2603526CE186576F4CCA3FEDF7F8ACDB37C9" +
-                            "9D762706ABE4967D44739C8CFCFCC76C58B1ED243AC394C0"
-                        }),
-                // From http://csrc.nist.gov/groups/STM/cavp/documents/drbg/drbgtestvectors.zip
-                // modified to test partial block processing.
-                new DRBGTestVector(
-                    new SHA256Digest(),
-                    new TestEntropySourceProvider(Hex.decode("a826f1cd3fa24b9e71c316e5bf2bafff"), false).get(128),
-                    false,
-                    "82bc3bf050614b34",
-                    128,
-                    new String[]
-                        {
-                            "14949b876e30f832331f59f2e687350bea9ba22b78549521a70748ca916c74ebff0b638266aa" +
-                            "d81e089545eb60bfe332f7d134d91ed3c104f975fae0f71391add71e3380a725251ed5552a84" +
-                            "650637eddfc88b5ab26311277cbc429aa152b2cfac61c67846512d7564114177a622f25e870a" +
-                            "acec37c0977d",
-                            "7050bf74a887809673ecd295071f7a457d1e2e227f68ef4b4445e34f3904b95d4833180ee522" +
-                            "104bfc996234063e2c76173937b883c66b0e64a56643877228cad5212cddbf839270ef80889b" +
-                            "c83424c141c2419f2231004c8860f8fd95435e2c9f8ac7409fcbfb6a74851fadc7d99bf5d68b" +
-                            "591892f0e3a1"
-                        }),
-                new DRBGTestVector(
-                    new SHA256Digest(),
-                    new TestEntropySourceProvider(Hex.decode("a826f1cd3fa24b9e71c316e5bf2bafff"), false).get(128),
-                    false,
-                    "82bc3bf050614b34",
-                    128,
-                    new String[]
-                        {
-                            "14949b876e30f832331f59f2e687350bea9ba22b78549521a70748ca916c74ebff0b638266aa" +
-                            "d81e089545eb60bfe332f7d134d91ed3c104f975fae0f71391add71e3380a725251ed5552a84" +
-                            "650637eddfc88b5ab26311277cbc429aa152b2cfac61c67846512d7564114177a622f25e870a" +
-                            "acec37c0977d",
-                            "7050bf74a887809673ecd295071f7a457d1e2e227f68ef4b4445e34f3904b95d4833180ee522" +
-                            "104bfc996234063e2c76173937b883c66b0e64a56643877228cad5212cddbf839270ef80889b" +
-                            "c83424c141c2419f2231004c8860f8fd95435e2c9f8ac7409fcbfb6a74851fadc7d99bf5d68b" +
-                            "591892f0e3"
-                        })
-            };
-    }
-
-    public void performTest()
-        throws Exception
-    {
-        DRBGTestVector[] tests = createTestVectorData();
-
-        for (int i = 0; i != tests.length; i++)
-        {
-            DRBGTestVector tv = tests[i];
-
-            byte[] nonce = tv.nonce();
-            byte[] personalisationString = tv.personalizationString();
-
-            SP80090DRBG d = new DualECSP800DRBG(tv.getDigest(), tv.securityStrength(), tv.entropySource(), personalisationString, nonce);
-
-            byte[] output = new byte[tv.expectedValue(0).length];
-
-            d.generate(output, tv.additionalInput(0), tv.predictionResistance());
-
-            byte[] expected = tv.expectedValue(0);
-
-            if (!areEqual(expected, output))
-            {
-                fail("Test #" + (i + 1) + ".1 failed, expected " + new String(Hex.encode(tv.expectedValue(0))) + " got " + new String(Hex.encode(output)));
-            }
-
-            output = new byte[tv.expectedValue(1).length];
-
-            d.generate(output, tv.additionalInput(1), tv.predictionResistance());
-
-            expected = tv.expectedValue(1);
-            if (!areEqual(expected, output))
-            {
-                fail("Test #" + (i + 1) + ".2 failed, expected " + new String(Hex.encode(tv.expectedValue(1))) + " got " + new String(Hex.encode(output)));
-            }
-        }
-
-        // Exception tests
-        //
-        SP80090DRBG d;
-
-        try
-        {
-            d = new DualECSP800DRBG(new SHA256Digest(), 256, new SHA256EntropyProvider().get(128), null, null);
-            fail("no exception thrown");
-        }
-        catch (IllegalArgumentException e)
-        {
-            if (!e.getMessage().equals("EntropySource must provide between 256 and 4096 bits"))
-            {
-                fail("Wrong exception", e);
-            }
-        }
-
-        try
-        {
-            d = new DualECSP800DRBG(new SHA256Digest(), 256, new SHA256EntropyProvider().get(1 << (13 - 1) + 1), null, null);
-            fail("no exception thrown");
-        }
-        catch (IllegalArgumentException e)
-        {
-            if (!e.getMessage().equals("EntropySource must provide between 256 and 4096 bits"))
-            {
-                fail("Wrong exception", e);
-            }
-        }
-
-        try
-        {
-            d = new DualECSP800DRBG(new SHA1Digest(), 256, new SHA256EntropyProvider().get(256), null, null);
-            fail("no exception thrown");
-        }
-        catch (IllegalArgumentException e)
-        {
-            if (!e.getMessage().equals("Requested security strength is not supported by digest"))
-            {
-                fail("Wrong exception", e);
-            }
-        }
-    }
-
-    private class SHA256EntropyProvider
-        extends TestEntropySourceProvider
-    {
-        SHA256EntropyProvider()
-        {
-            super(Hex.decode(
-                "000102030405060708090A0B0C0D0E0F " +
-                    "808182838485868788898A8B8C8D8E8F" +
-                    "C0C1C2C3C4C5C6C7C8C9CACBCCCDCECF"), true);
-        }
-    }
-
-    private class SHA384EntropyProvider
-        extends TestEntropySourceProvider
-    {
-        SHA384EntropyProvider()
-        {
-            super(Hex.decode(
-                "000102030405060708090A0B0C0D0E0F1011121314151617" +
-                "808182838485868788898A8B8C8D8E8F9091929394959697" +
-                "C0C1C2C3C4C5C6C7C8C9CACBCCCDCECFD0D1D2D3D4D5D6D7"), true);
-        }
-    }
-
-    private class SHA512EntropyProvider
-        extends TestEntropySourceProvider
-    {
-        SHA512EntropyProvider()
-        {
-            super(Hex.decode(
-                "000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F" +
-                "808182838485868788898A8B8C8D8E8F909192939495969798999A9B9C9D9E9F" +
-                "C0C1C2C3C4C5C6C7C8C9CACBCCCDCECFD0D1D2D3D4D5D6D7D8D9DADBDCDDDEDF"), true);
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/prng/test/FixedSecureRandomTest.java b/bcprov/src/main/java/org/bouncycastle/crypto/prng/test/FixedSecureRandomTest.java
deleted file mode 100644
index 24fc238..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/prng/test/FixedSecureRandomTest.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package org.bouncycastle.crypto.prng.test;
-
-import org.bouncycastle.crypto.prng.FixedSecureRandom;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-
-public class FixedSecureRandomTest
-    extends SimpleTest
-{
-    byte[]  base = Hex.decode("deadbeefdeadbeef");
-    byte[]  r1 = Hex.decode("cafebabecafebabe");
-    byte[]  r2 = Hex.decode("ffffffffcafebabedeadbeef");
-
-    public String getName()
-    {
-        return "FixedSecureRandom";
-    }
-
-    public void performTest()
-        throws Exception
-    {
-        FixedSecureRandom fixed = new FixedSecureRandom(base);
-        byte[]       buf = new byte[8];
-
-        fixed.nextBytes(buf);
-
-        if (!Arrays.areEqual(buf, base))
-        {
-            fail("wrong data returned");
-        }
-
-        fixed = new FixedSecureRandom(base);
-
-        byte[] seed = fixed.generateSeed(8);
-
-        if (!Arrays.areEqual(seed, base))
-        {
-            fail("wrong seed data returned");
-        }
-
-        if (!fixed.isExhausted())
-        {
-            fail("not exhausted");
-        }
-
-        fixed = new FixedSecureRandom(new byte[][] { r1, r2 });
-
-        seed = fixed.generateSeed(12);
-
-        if (!Arrays.areEqual(seed, Hex.decode("cafebabecafebabeffffffff")))
-        {
-            fail("wrong seed data returned - composite");
-        }
-
-        fixed.nextBytes(buf);
-
-        if (!Arrays.areEqual(buf, Hex.decode("cafebabedeadbeef")))
-        {
-            fail("wrong data returned");
-        }
-    }
-
-    public static void main(String[] args)
-    {
-        runTest(new FixedSecureRandomTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/prng/test/HMacDRBGTest.java b/bcprov/src/main/java/org/bouncycastle/crypto/prng/test/HMacDRBGTest.java
deleted file mode 100644
index add77d5..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/prng/test/HMacDRBGTest.java
+++ /dev/null
@@ -1,508 +0,0 @@
-package org.bouncycastle.crypto.prng.test;
-
-import org.bouncycastle.crypto.digests.SHA1Digest;
-import org.bouncycastle.crypto.digests.SHA256Digest;
-import org.bouncycastle.crypto.digests.SHA384Digest;
-import org.bouncycastle.crypto.digests.SHA512Digest;
-import org.bouncycastle.crypto.macs.HMac;
-import org.bouncycastle.crypto.prng.drbg.HMacSP800DRBG;
-import org.bouncycastle.crypto.prng.drbg.SP80090DRBG;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-
-/**
- * HMAC SP800-90 DRBG
- */
-public class HMacDRBGTest
-    extends SimpleTest
-{
-    public String getName()
-    {
-        return "HMacDRBG";
-    }
-
-    public static void main(String[] args)
-    {
-        runTest(new HMacDRBGTest());
-    }
-
-    private DRBGTestVector[] createTestVectorData()
-    {
-        return new DRBGTestVector[]
-            {
-                new DRBGTestVector(
-                    new SHA1Digest(),
-                    new SHA1EntropyProvider().get(440),
-                    false,
-                    "2021222324",
-                    80,
-                    new String[]
-                        {
-                            "5A7D3B449F481CB38DF79AD2B1FCC01E57F8135E8C0B22CD0630BFB0127FB5408C8EFC17A929896E",
-                            "82cf772ec3e84b00fc74f5df104efbfb2428554e9ce367d03aeade37827fa8e9cb6a08196115d948"
-                        }),
-                new DRBGTestVector(
-                    new SHA1Digest(),
-                    new SHA1EntropyProvider().get(440),
-                    false,
-                    "2021222324",
-                    80,
-                    new String[]
-                        {
-                            "B3BD05246CBA12A64735A4E3FDE599BC1BE30F439BD060208EEA7D71F9D123DF47B3CE069D98EDE6",
-                            "B5DADA380E2872DF935BCA55B882C8C9376902AB639765472B71ACEBE2EA8B1B6B49629CB67317E0"
-                        })
-                .setPersonalizationString("404142434445464748494A4B4C4D4E4F505152535455565758595A5B5C5D5E5F606162636465666768696A6B6C6D6E6F70717273747576"),
-                new DRBGTestVector(
-                    new SHA1Digest(),
-                    new SHA1EntropyProvider().get(440),
-                    false,
-                    "2021222324",
-                    80,
-                    new String[]
-                        {
-                            "C7AAAC583C6EF6300714C2CC5D06C148CFFB40449AD0BB26FAC0497B5C57E161E36681BCC930CE80",
-                            "6EBD2B7B5E0A2AD7A24B1BF9A1DBA47D43271719B9C37B7FE81BA94045A14A7CB514B446666EA5A7"
-                        })
-                .addAdditionalInput("606162636465666768696A6B6C6D6E6F707172737475767778797A7B7C7D7E7F808182838485868788898A8B8C8D8E8F90919293949596")
-                .addAdditionalInput("A0A1A2A3A4A5A6A7A8A9AAABACADAEAFB0B1B2B3B4B5B6B7B8B9BABBBCBDBEBFC0C1C2C3C4C5C6C7C8C9CACBCCCDCECFD0D1D2D3D4D5D6"),
-                new DRBGTestVector(
-                    new SHA1Digest(),
-                    new SHA1EntropyProvider().get(440),
-                    true,
-                    "2021222324",
-                    80,
-                    new String[]
-                        {
-                            "FEC4597F06A3A8CC8529D59557B9E661053809C0BC0EFC282ABD87605CC90CBA9B8633DCB1DAE02E",
-                            "84ADD5E2D2041C01723A4DE4335B13EFDF16B0E51A0AD39BD15E862E644F31E4A2D7D843E57C5968"
-                        }),
-                new DRBGTestVector(
-                    new SHA1Digest(),
-                    new SHA1EntropyProvider().get(440),
-                    true,
-                    "2021222324",
-                    80,
-                    new String[]
-                        {
-                            "6C37FDD729AA40F80BC6AB08CA7CC649794F6998B57081E4220F22C5C283E2C91B8E305AB869C625",
-                            "CAF57DCFEA393B9236BF691FA456FEA7FDF1DF8361482CA54D5FA723F4C88B4FA504BF03277FA783"
-                        })
-                .setPersonalizationString("404142434445464748494A4B4C4D4E4F505152535455565758595A5B5C5D5E5F606162636465666768696A6B6C6D6E6F70717273747576"),
-                new DRBGTestVector(
-                    new SHA1Digest(),
-                    new SHA1EntropyProvider().get(440),
-                    true,
-                    "2021222324",
-                    80,
-                    new String[]
-                        {
-                            "A1BA8FA58BB5013F43F7B6ED52B4539FA16DC77957AEE815B9C07004C7E992EB8C7E591964AFEEA2",
-                            "84264A73A818C95C2F424B37D3CC990B046FB50C2DC64A164211889A010F2471A0912FFEA1BF0195"
-                        })
-                    .addAdditionalInput("606162636465666768696A6B6C6D6E6F707172737475767778797A7B7C7D7E7F808182838485868788898A8B8C8D8E8F90919293949596")
-                    .addAdditionalInput("A0A1A2A3A4A5A6A7A8A9AAABACADAEAFB0B1B2B3B4B5B6B7B8B9BABBBCBDBEBFC0C1C2C3C4C5C6C7C8C9CACBCCCDCECFD0D1D2D3D4D5D6"),
-                new DRBGTestVector(
-                    new SHA256Digest(),
-                    new SHA256EntropyProvider().get(440),
-                    false,
-                    "2021222324252627",
-                    128,
-                    new String[]
-                        {
-                            "D67B8C1734F46FA3F763CF57C6F9F4F2" +
-                                "DC1089BD8BC1F6F023950BFC5617635208C8501238AD7A44" +
-                                "00DEFEE46C640B61AF77C2D1A3BFAA90EDE5D207406E5403",
-                            "8FDAEC20F8B421407059E3588920DA7E" +
-                                "DA9DCE3CF8274DFA1C59C108C1D0AA9B0FA38DA5C792037C" +
-                                "4D33CD070CA7CD0C5608DBA8B885654639DE2187B74CB263"
-                        }),
-                new DRBGTestVector(
-                    new SHA256Digest(),
-                    new SHA256EntropyProvider().get(440),
-                    true,
-                    "2021222324252627",
-                    128,
-                    new String[]
-                        {
-                            "FABD0AE25C69DC2EFDEFB7F20C5A31B5" +
-                            "7AC938AB771AA19BF8F5F1468F665C938C9A1A5DF0628A56" +
-                            "90F15A1AD8A613F31BBD65EEAD5457D5D26947F29FE91AA7",
-                            "6BD925B0E1C232EFD67CCD84F722E927" +
-                            "ECB46AB2B740014777AF14BA0BBF53A45BDBB62B3F7D0B9C" +
-                            "8EEAD057C0EC754EF8B53E60A1F434F05946A8B686AFBC7A"
-                        }),
-                new DRBGTestVector(
-                    new SHA384Digest(),
-                    new SHA384EntropyProvider().get(888),
-                    false,
-                    "202122232425262728292A2B",
-                    192,
-                    new String[]{
-                        "03AB8BCE4D1DBBB636C5C5B7E1C58499FEB1C619CDD11D35" +
-                        "CD6CF6BB8F20EF27B6F5F9054FF900DB9EBF7BF30ED4DCBB" +
-                        "BC8D5B51C965EA226FFEE2CA5AB2EFD00754DC32F357BF7A" +
-                        "E42275E0F7704DC44E50A5220AD05AB698A22640AC634829",
-                        "B907E77144FD55A54E9BA1A6A0EED0AAC780020C41A15DD8" +
-                        "9A6C163830BA1D094E6A17100FF71EE30A96E1EE04D2A966" +
-                        "03832A4E404F1966C2B5F4CB61B9927E8D12AC1E1A24CF23" +
-                        "88C14E8EC96C35181EAEE32AAA46330DEAAFE5E7CE783C74"})
-                    .setPersonalizationString(
-                        "404142434445464748494A4B4C4D4E" +
-                        "4F505152535455565758595A5B5C5D5E5F60616263646566" +
-                        "6768696A6B6C6D6E6F707172737475767778797A7B7C7D7E" +
-                        "7F808182838485868788898A8B8C8D8E8F90919293949596" +
-                        "9798999A9B9C9D9E9FA0A1A2A3A4A5A6A7A8A9AAABACADAE"),
-                new DRBGTestVector(
-                    new SHA384Digest(),
-                    new SHA384EntropyProvider().get(888),
-                    true,
-                    "202122232425262728292A2B",
-                    192,
-                    new String[]{
-                        "804A3AD720F4FCE8738D0632514FEF16430CB7D63A8DF1A5" +
-                        "F02A3CE3BD7ED6A668B69E63E2BB93F096EE753D6194A0F1" +
-                        "A32711063653009636337D22167CC4402D019AC216FA574F" +
-                        "091CF6EA283568D737A77BE38E8F09382C69E76B142ABC3A",
-                        "73B8E55C753202176A17B9B9754A9FE6F23B01861FCD4059" +
-                        "6AEAA301AF1AEF8AF0EAF22FBF34541EFFAB1431666ACACC" +
-                        "759338C7E28672819D53CFEF10A3E19DAFBD53295F1980A9" +
-                        "F491504A2725506784B7AC826D92C838A8668171CAAA86E7"})
-                    .setPersonalizationString(
-                        "404142434445464748494A4B4C4D4E" +
-                            "4F505152535455565758595A5B5C5D5E5F60616263646566" +
-                            "6768696A6B6C6D6E6F707172737475767778797A7B7C7D7E" +
-                            "7F808182838485868788898A8B8C8D8E8F90919293949596" +
-                            "9798999A9B9C9D9E9FA0A1A2A3A4A5A6A7A8A9AAABACADAE"),
-                new DRBGTestVector(
-                    new SHA512Digest(),
-                    new SHA512EntropyProvider().get(888),
-                    false,
-                    "202122232425262728292A2B2C2D2E2F",
-                    256,
-                    new String[]{
-                        "2A5FF6520C20F66E" +
-                            "D5EA431BD4AEAC58F975EEC9A015137D5C94B73AA09CB8B5" +
-                            "9D611DDEECEB34A52BB999424009EB9EAC5353F92A6699D2" +
-                            "0A02164EEBBC6492941E10426323898465DFD731C7E04730" +
-                            "60A5AA8973841FDF3446FB6E72A58DA8BDA2A57A36F3DD98" +
-                            "6DF85C8A5C6FF31CDE660BF8A841B21DD6AA9D3AC356B87B",
-                        "0EDC8D7D7CEEC7FE" +
-                            "36333FB30C0A9A4B27AA0BECBF075568B006C1C3693B1C29" +
-                            "0F84769C213F98EB5880909EDF068FDA6BFC43503987BBBD" +
-                            "4FC23AFBE982FE4B4B007910CC4874EEC217405421C8D8A1" +
-                            "BA87EC684D0AF9A6101D9DB787AE82C3A6A25ED478DF1B12" +
-                            "212CEC325466F3AC7C48A56166DD0B119C8673A1A9D54F67"})
-                    .setPersonalizationString(
-                        "404142434445464748494A4B4C4D4E" +
-                            "4F505152535455565758595A5B5C5D5E5F60616263646566" +
-                            "6768696A6B6C6D6E6F707172737475767778797A7B7C7D7E" +
-                            "7F808182838485868788898A8B8C8D8E8F90919293949596" +
-                            "9798999A9B9C9D9E9FA0A1A2A3A4A5A6A7A8A9AAABACADAE"),
-                new DRBGTestVector(
-                    new SHA512Digest(),
-                    new SHA512EntropyProvider().get(888),
-                    true,
-                    "202122232425262728292A2B2C2D2E2F",
-                    256,
-                    new String[]{
-                        "AAE4DC3C9ECC74D9" +
-                        "061DD527117EF3D29E1E52B26853C539D6CA797E8DA3D0BB" +
-                        "171D8E30B8B194D8C28F7F6BE3B986B88506DC6A01B294A7" +
-                        "165DD1C3470F7BE7B396AA0DB7D50C4051E7C7E1C8A7D21A" +
-                        "2B5878C0BCB163CAA79366E7A1162FDC88429616CD3E6977" +
-                        "8D327520A6BBBF71D8AA2E03EC4A9DAA0E77CF93E1EE30D2 ",
-                        "129FF6D31A23FFBC" +
-                        "870632B35EE477C2280DDD2ECDABEDB900C78418BE2D243B" +
-                        "B9D8E5093ECE7B6BF48638D8F704D134ADDEB7F4E9D5C142" +
-                        "CD05683E72B516486AF24AEC15D61E81E270DD4EBED91B62" +
-                        "12EB8896A6250D5C8BC3A4A12F7E3068FBDF856F47EB23D3" +
-                        "79F82C1EBCD1585FB260B9C0C42625FBCEE68CAD773CD5B1"})
-                .setPersonalizationString(
-                    "404142434445464748494A4B4C4D4E" +
-                        "4F505152535455565758595A5B5C5D5E5F60616263646566" +
-                        "6768696A6B6C6D6E6F707172737475767778797A7B7C7D7E" +
-                        "7F808182838485868788898A8B8C8D8E8F90919293949596" +
-                        "9798999A9B9C9D9E9FA0A1A2A3A4A5A6A7A8A9AAABACADAE"),
-                new DRBGTestVector(
-                    new SHA512Digest(),
-                    new SHA512EntropyProvider().get(888),
-                    false,
-                    "202122232425262728292A2B2C2D2E2F",
-                    256,
-                    new String[]{
-                        "7AE31A2DEC31075F" +
-                        "E5972660C16D22ECC0D415C5693001BE5A468B590BC1AE2C" +
-                        "43F647F8D681AEEA0D87B79B0B4E5D089CA2C9D327534234" +
-                        "0254E6B04690D77A71A294DA9568479EEF8BB2A2110F18B6" +
-                        "22F60F35235DE0E8F9D7E98105D84AA24AF0757AF005DFD5" +
-                        "2FA51DE3F44FCE0C5F3A27FCE8B0F6E4A3F7C7B53CE34A3D",
-                        "D83A8084630F286D" +
-                        "A4DB49B9F6F608C8993F7F1397EA0D6F4A72CF3EF2733A11" +
-                        "AB823C29F2EBDEC3EDE962F93D920A1DB59C84E1E879C29F" +
-                        "5F9995FC3A6A3AF9B587CA7C13EA197D423E81E1D6469942" +
-                        "B6E2CA83A97E91F6B298266AC148A1809776C26AF5E239A5" +
-                        "5A2BEB9E752203A694E1F3FE2B3E6A0C9C314421CDB55FBD "})
-                .setPersonalizationString(
-                    "404142434445464748494A4B4C4D4E" +
-                    "4F505152535455565758595A5B5C5D5E5F60616263646566" +
-                    "6768696A6B6C6D6E6F707172737475767778797A7B7C7D7E" +
-                    "7F808182838485868788898A8B8C8D8E8F90919293949596" +
-                    "9798999A9B9C9D9E9FA0A1A2A3A4A5A6A7A8A9AAABACADAE")
-                .addAdditionalInput(
-                    "606162636465666768696A6B6C6D6E" +
-                    "6F707172737475767778797A7B7C7D7E7F80818283848586" +
-                    "8788898A8B8C8D8E8F909192939495969798999A9B9C9D9E" +
-                    "9FA0A1A2A3A4A5A6A7A8A9AAABACADAEAFB0B1B2B3B4B5B6" +
-                    "B7B8B9BABBBCBDBEBFC0C1C2C3C4C5C6C7C8C9CACBCCCDCE")
-                .addAdditionalInput(
-                    "A0A1A2A3A4A5A6A7A8A9AAABACADAE" +
-                    "AFB0B1B2B3B4B5B6B7B8B9BABBBCBDBEBFC0C1C2C3C4C5C6" +
-                    "C7C8C9CACBCCCDCECFD0D1D2D3D4D5D6D7D8D9DADBDCDDDE" +
-                    "DFE0E1E2E3E4E5E6E7E8E9EAEBECEDEEEFF0F1F2F3F4F5F6" +
-                    "F7F8F9FAFBFCFDFEFF000102030405060708090A0B0C0D0E"),
-                new DRBGTestVector(
-                    new SHA512Digest(),
-                    new SHA512EntropyProvider().get(888),
-                    true,
-                    "202122232425262728292A2B2C2D2E2F",
-                    256,
-                    new String[]{
-                        "28FD6060C4F35F4D" +
-                            "317AB2060EE32019E0DAA330F3F5650BBCA57CB67EE6AF1C" +
-                            "6F25D1B01F3601EDA85DC2ED29A9B2BA4C85CF491CE7185F" +
-                            "1A2BD9378AE3C655BD1CEC2EE108AE7FC382989F6D4FEA8A" +
-                            "B01499697C2F07945CE02C5ED617D04287FEAF3BA638A4CE" +
-                            "F3BB6B827E40AF16279580FCF1FDAD830930F7FDE341E2AF",
-                        "C0B1601AFE39338B" +
-                            "58DC2BE7C256AEBE3C21C5A939BEEC7E97B3528AC420F0C6" +
-                            "341847187666E0FF578A8EB0A37809F877365A28DF2FA0F0" +
-                            "6354A6F02496747369375B9A9D6B756FDC4A8FB308E08256" +
-                            "9D79A85BB960F747256626389A3B45B0ABE7ECBC39D5CD7B" +
-                            "2C18DF2E5FDE8C9B8D43474C54B6F9839468445929B438C7"}),
-                new DRBGTestVector(
-                    new SHA512Digest(),
-                    new SHA512EntropyProvider().get(888),
-                    true,
-                    "202122232425262728292A2B2C2D2E2F",
-                    256,
-                    new String[]{
-                        "72691D2103FB567C" +
-                        "CD30370715B36666F63430087B1C688281CA0974DB456BDB" +
-                        "A7EB5C48CFF62EA05F9508F3B530CE995A272B11EC079C13" +
-                        "923EEF8E011A93C19B58CC6716BC7CB8BD886CAA60C14D85" +
-                        "C023348BD77738C475D6C7E1D9BFF4B12C43D8CC73F838DC" +
-                        "4F8BD476CF8328EEB71B3D873D6B7B859C9B21065638FF95",
-                        "8570DA3D47E1E160" +
-                        "5CF3E44B8D328B995EFC64107B6292D1B1036B5F88CE3160" +
-                        "2F12BEB71D801C0942E7C0864B3DB67A9356DB203490D881" +
-                        "24FE86BCE38AC2269B4FDA6ABAA884039DF80A0336A24D79" +
-                        "1EB3067C8F5F0CF0F18DD73B66A7B316FB19E02835CC6293" +
-                        "65FCD1D3BE640178ED9093B91B36E1D68135F2785BFF505C"})
-                .addAdditionalInput(
-                    "606162636465666768696A6B6C6D6E" +
-                    "6F707172737475767778797A7B7C7D7E7F80818283848586" +
-                    "8788898A8B8C8D8E8F909192939495969798999A9B9C9D9E" +
-                    "9FA0A1A2A3A4A5A6A7A8A9AAABACADAEAFB0B1B2B3B4B5B6" +
-                    "B7B8B9BABBBCBDBEBFC0C1C2C3C4C5C6C7C8C9CACBCCCDCE")
-                .addAdditionalInput(
-                    "A0A1A2A3A4A5A6A7A8A9AAABACADAE" +
-                    "AFB0B1B2B3B4B5B6B7B8B9BABBBCBDBEBFC0C1C2C3C4C5C6" +
-                    "C7C8C9CACBCCCDCECFD0D1D2D3D4D5D6D7D8D9DADBDCDDDE" +
-                    "DFE0E1E2E3E4E5E6E7E8E9EAEBECEDEEEFF0F1F2F3F4F5F6" +
-                    "F7F8F9FAFBFCFDFEFF000102030405060708090A0B0C0D0E"),
-                new DRBGTestVector(
-                    new SHA512Digest(),
-                    new SHA512EntropyProvider().get(888),
-                    true,
-                    "202122232425262728292A2B2C2D2E2F",
-                    256,
-                    new String[]{
-                        "AAE4DC3C9ECC74D9" +
-                        "061DD527117EF3D29E1E52B26853C539D6CA797E8DA3D0BB" +
-                        "171D8E30B8B194D8C28F7F6BE3B986B88506DC6A01B294A7" +
-                        "165DD1C3470F7BE7B396AA0DB7D50C4051E7C7E1C8A7D21A" +
-                        "2B5878C0BCB163CAA79366E7A1162FDC88429616CD3E6977" +
-                        "8D327520A6BBBF71D8AA2E03EC4A9DAA0E77CF93E1EE30D2 ",
-                        "129FF6D31A23FFBC" +
-                        "870632B35EE477C2280DDD2ECDABEDB900C78418BE2D243B" +
-                        "B9D8E5093ECE7B6BF48638D8F704D134ADDEB7F4E9D5C142" +
-                        "CD05683E72B516486AF24AEC15D61E81E270DD4EBED91B62" +
-                        "12EB8896A6250D5C8BC3A4A12F7E3068FBDF856F47EB23D3" +
-                        "79F82C1EBCD1585FB260B9C0C42625FBCEE68CAD773CD5B1"})
-                .setPersonalizationString(
-                    "404142434445464748494A4B4C4D4E" +
-                        "4F505152535455565758595A5B5C5D5E5F60616263646566" +
-                        "6768696A6B6C6D6E6F707172737475767778797A7B7C7D7E" +
-                        "7F808182838485868788898A8B8C8D8E8F90919293949596" +
-                        "9798999A9B9C9D9E9FA0A1A2A3A4A5A6A7A8A9AAABACADAE"),
-                new DRBGTestVector(
-                    new SHA512Digest(),
-                    new SHA512EntropyProvider().get(888),
-                    true,
-                    "202122232425262728292A2B2C2D2E2F",
-                    256,
-                    new String[]{
-                        "B8E827652175E6E0" +
-                        "6E513C7BE94B5810C14ED94AD903647940CAEB7EE014C848" +
-                        "8DCBBE6D4D6616D06656A3DC707CDAC4F02EE6D8408C065F" +
-                        "CB068C0760DA47C5D60E5D70D09DC3929B6979615D117F7B" +
-                        "EDCC661A98514B3A1F55B2CBABDCA59F11823E4838065F1F" +
-                        "8431CBF28A577738234AF3F188C7190CC19739E72E9BBFFF",
-                        "7ED41B9CFDC8C256" +
-                        "83BBB4C553CC2DC61F690E62ABC9F038A16B8C519690CABE" +
-                        "BD1B5C196C57CF759BB9871BE0C163A57315EA96F615136D" +
-                        "064572F09F26D659D24211F9610FFCDFFDA8CE23FFA96735" +
-                        "7595182660877766035EED800B05364CE324A75EB63FD9B3" +
-                        "EED956D147480B1D0A42DF8AA990BB628666F6F61D60CBE2"})
-                .setPersonalizationString(
-                    "404142434445464748494A4B4C4D4E" +
-                        "4F505152535455565758595A5B5C5D5E5F60616263646566" +
-                        "6768696A6B6C6D6E6F707172737475767778797A7B7C7D7E" +
-                        "7F808182838485868788898A8B8C8D8E8F90919293949596" +
-                        "9798999A9B9C9D9E9FA0A1A2A3A4A5A6A7A8A9AAABACADAE")
-                .addAdditionalInput(
-                    "606162636465666768696A6B6C6D6E" +
-                        "6F707172737475767778797A7B7C7D7E7F80818283848586" +
-                        "8788898A8B8C8D8E8F909192939495969798999A9B9C9D9E" +
-                        "9FA0A1A2A3A4A5A6A7A8A9AAABACADAEAFB0B1B2B3B4B5B6" +
-                        "B7B8B9BABBBCBDBEBFC0C1C2C3C4C5C6C7C8C9CACBCCCDCE")
-                .addAdditionalInput(
-                    "A0A1A2A3A4A5A6A7A8A9AAABACADAE" +
-                    "AFB0B1B2B3B4B5B6B7B8B9BABBBCBDBEBFC0C1C2C3C4C5C6" +
-                    "C7C8C9CACBCCCDCECFD0D1D2D3D4D5D6D7D8D9DADBDCDDDE" +
-                    "DFE0E1E2E3E4E5E6E7E8E9EAEBECEDEEEFF0F1F2F3F4F5F6" +
-                    "F7F8F9FAFBFCFDFEFF000102030405060708090A0B0C0D0E")
-            };
-    }
-
-    public void performTest()
-        throws Exception
-    {
-        DRBGTestVector[] tests = createTestVectorData();
-
-        for (int i = 0; i != tests.length; i++)
-        {
-            DRBGTestVector tv = tests[i];
-
-            byte[] nonce = tv.nonce();
-            byte[] personalisationString = tv.personalizationString();
-
-            SP80090DRBG d = new HMacSP800DRBG(new HMac(tv.getDigest()), tv.securityStrength(), tv.entropySource(), personalisationString, nonce);
-
-            byte[] output = new byte[tv.expectedValue(0).length];
-
-            d.generate(output, tv.additionalInput(0), tv.predictionResistance());
-
-            byte[] expected = tv.expectedValue(0);
-
-            if (!areEqual(expected, output))
-            {
-                fail("Test #" + (i + 1) + ".1 failed, expected " + new String(Hex.encode(tv.expectedValue(0))) + " got " + new String(Hex.encode(output)));
-            }
-
-            output = new byte[tv.expectedValue(0).length];
-
-            d.generate(output, tv.additionalInput(1), tv.predictionResistance());
-
-            expected = tv.expectedValue(1);
-            if (!areEqual(expected, output))
-            {
-                fail("Test #" + (i + 1) + ".2 failed, expected " + new String(Hex.encode(tv.expectedValue(1))) + " got " + new String(Hex.encode(output)));
-            }
-        }
-
-        // Exception tests
-        //
-        SP80090DRBG d;
-        try
-        {
-            d = new HMacSP800DRBG(new HMac(new SHA256Digest()), 256, new SHA256EntropyProvider().get(128), null, null);
-            fail("no exception thrown");
-        }
-        catch (IllegalArgumentException e)
-        {
-            if (!e.getMessage().equals("Not enough entropy for security strength required"))
-            {
-                fail("Wrong exception", e);
-            }
-        }
-    }
-
-    private class SHA1EntropyProvider
-        extends TestEntropySourceProvider
-    {
-        SHA1EntropyProvider()
-        {
-            super(
-                Hex.decode(
-                    "000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F202122232425262728292A2B2C2D2E2F30313233343536"
-                        + "808182838485868788898A8B8C8D8E8F909192939495969798999A9B9C9D9E9FA0A1A2A3A4A5A6A7A8A9AAABACADAEAFB0B1B2B3B4B5B6"
-                        + "C0C1C2C3C4C5C6C7C8C9CACBCCCDCECFD0D1D2D3D4D5D6D7D8D9DADBDCDDDEDFE0E1E2E3E4E5E6E7E8E9EAEBECEDEEEFF0F1F2F3F4F5F6"), true);
-        }
-    }
-
-    private class SHA256EntropyProvider
-        extends TestEntropySourceProvider
-    {
-        SHA256EntropyProvider()
-        {
-            super(Hex.decode(
-                "00010203040506" +
-                    "0708090A0B0C0D0E0F101112131415161718191A1B1C1D1E" +
-                    "1F202122232425262728292A2B2C2D2E2F30313233343536" +
-                    "80818283848586" +
-                    "8788898A8B8C8D8E8F909192939495969798999A9B9C9D9E" +
-                    "9FA0A1A2A3A4A5A6A7A8A9AAABACADAEAFB0B1B2B3B4B5B6" +
-                    "C0C1C2C3C4C5C6" +
-                    "C7C8C9CACBCCCDCECFD0D1D2D3D4D5D6D7D8D9DADBDCDDDE" +
-                    "DFE0E1E2E3E4E5E6E7E8E9EAEBECEDEEEFF0F1F2F3F4F5F6"), true);
-        }
-    }
-
-    private class SHA384EntropyProvider
-        extends TestEntropySourceProvider
-    {
-        SHA384EntropyProvider()
-        {
-            super(Hex.decode(
-                "000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F20212223242526"
-                    + "2728292A2B2C2D2E2F303132333435363738393A3B3C3D3E3F404142434445464748494A4B4C4D4E4F50515253545556"
-                    + "5758595A5B5C5D5E5F606162636465666768696A6B6C6D6E" +
-                    "808182838485868788898A8B8C8D8E" +
-                    "8F909192939495969798999A9B9C9D9E9FA0A1A2A3A4A5A6" +
-                    "A7A8A9AAABACADAEAFB0B1B2B3B4B5B6B7B8B9BABBBCBDBE" +
-                    "BFC0C1C2C3C4C5C6C7C8C9CACBCCCDCECFD0D1D2D3D4D5D6" +
-                    "D7D8D9DADBDCDDDEDFE0E1E2E3E4E5E6E7E8E9EAEBECEDEE" +
-                    "C0C1C2C3C4C5C6C7C8C9CACBCCCDCE" +
-                    "CFD0D1D2D3D4D5D6D7D8D9DADBDCDDDEDFE0E1E2E3E4E5E6" +
-                    "E7E8E9EAEBECEDEEEFF0F1F2F3F4F5F6F7F8F9FAFBFCFDFE" +
-                    "FF000102030405060708090A0B0C0D0E0F10111213141516" +
-                    "1718191A1B1C1D1E1F202122232425262728292A2B2C2D2E"), true);
-        }
-    }
-
-    private class SHA512EntropyProvider
-        extends TestEntropySourceProvider
-    {
-        SHA512EntropyProvider()
-        {
-            super(Hex.decode(
-                "000102030405060708090A0B0C0D0E" +
-                    "0F101112131415161718191A1B1C1D1E1F20212223242526" +
-                    "2728292A2B2C2D2E2F303132333435363738393A3B3C3D3E" +
-                    "3F404142434445464748494A4B4C4D4E4F50515253545556" +
-                    "5758595A5B5C5D5E5F606162636465666768696A6B6C6D6E" +
-                    "808182838485868788898A8B8C8D8E" +
-                    "8F909192939495969798999A9B9C9D9E9FA0A1A2A3A4A5A6" +
-                    "A7A8A9AAABACADAEAFB0B1B2B3B4B5B6B7B8B9BABBBCBDBE" +
-                    "BFC0C1C2C3C4C5C6C7C8C9CACBCCCDCECFD0D1D2D3D4D5D6" +
-                    "D7D8D9DADBDCDDDEDFE0E1E2E3E4E5E6E7E8E9EAEBECEDEE" +
-                    "C0C1C2C3C4C5C6C7C8C9CACBCCCDCE" +
-                    "CFD0D1D2D3D4D5D6D7D8D9DADBDCDDDEDFE0E1E2E3E4E5E6" +
-                    "E7E8E9EAEBECEDEEEFF0F1F2F3F4F5F6F7F8F9FAFBFCFDFE" +
-                    "FF000102030405060708090A0B0C0D0E0F10111213141516" +
-                    "1718191A1B1C1D1E1F202122232425262728292A2B2C2D2E"), true);
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/prng/test/HashDRBGTest.java b/bcprov/src/main/java/org/bouncycastle/crypto/prng/test/HashDRBGTest.java
deleted file mode 100644
index ee63203..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/prng/test/HashDRBGTest.java
+++ /dev/null
@@ -1,481 +0,0 @@
-package org.bouncycastle.crypto.prng.test;
-
-import org.bouncycastle.crypto.digests.SHA1Digest;
-import org.bouncycastle.crypto.digests.SHA256Digest;
-import org.bouncycastle.crypto.digests.SHA384Digest;
-import org.bouncycastle.crypto.digests.SHA512Digest;
-import org.bouncycastle.crypto.prng.drbg.HashSP800DRBG;
-import org.bouncycastle.crypto.prng.drbg.SP80090DRBG;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-
-/**
- * DRBG Test
- */
-public class HashDRBGTest
-    extends SimpleTest
-{
-    public String getName()
-    {
-        return "HashDRBG";
-    }
-
-    public static void main(String[] args)
-    {
-        runTest(new HashDRBGTest());
-    }
-
-    private DRBGTestVector[] createTestVectorData()
-    {
-        return new DRBGTestVector[]
-            {
-                new DRBGTestVector(
-                            new SHA1Digest(),
-                            new SHA1EntropyProvider().get(440),
-                            false,
-                            "2021222324",
-                            80,
-                            new String[]
-                                {
-                                    "9F7CFF1ECA23E750F66326969F11800F12088BA68E441D15D888B3FE12BF66FE057494F4546DE2F1",
-                                    "B77AA5C0CD55BBCEED7574AF223AFD988C7EEC8EFF4A94E5E89D26A04F58FA79F5E0D3702D7A9A6A"
-                                }
-                        ),
-                new DRBGTestVector(
-                    new SHA1Digest(),
-                    new SHA1EntropyProvider().get(440),
-                    false,
-                    "2021222324",
-                    80,
-                    new String[]
-                        {
-                            "AB438BD3B01A0AF85CFEE29F7D7B71621C4908B909124D430E7B406FB1086EA994C582E0D656D989",
-                            "29D9098F987E7005314A0F51B3DD2B8122F4AED706735DE6AD5DDBF223177C1E5F3AEBC52FAB90B9"
-                        })
-                    .setPersonalizationString("404142434445464748494A4B4C4D4E4F505152535455565758595A5B5C5D5E5F606162636465666768696A6B6C6D6E6F70717273747576"),
-                new DRBGTestVector(
-                    new SHA1Digest(),
-                    new SHA1EntropyProvider().get(440),
-                    false,
-                    "2021222324",
-                    80,
-                    new String[]
-                        {
-                            "E76B4EDD5C865BC8AFD809A59B69B429AC7F4352A579BCF3F75E56249A3491F87C3CA6848B0FAB25",
-                            "6577B6B4F87A93240B199FE51A3B335313683103DECE171E3256FB7E803586CA4E45DD242EB01F70"
-                        })
-                    .addAdditionalInput("606162636465666768696A6B6C6D6E6F707172737475767778797A7B7C7D7E7F808182838485868788898A8B8C8D8E8F90919293949596")
-                    .addAdditionalInput("A0A1A2A3A4A5A6A7A8A9AAABACADAEAFB0B1B2B3B4B5B6B7B8B9BABBBCBDBEBFC0C1C2C3C4C5C6C7C8C9CACBCCCDCECFD0D1D2D3D4D5D6"),
-                new DRBGTestVector(
-                    new SHA1Digest(),
-                    new SHA1EntropyProvider().get(440),
-                    true,
-                    "2021222324",
-                    80,
-                    new String[]
-                        {
-                            "56EF4913373994D5539F4D7D17AFE7448CDF5E72416CC6A71A340059FA0D5AE526B23250C46C0944",
-                            "575B37A2739814F966C63B60A2C4F149CA9ACC84FC4B25493289B085C67B2E30F5F0B99A2C349E2A"
-                        }),
-                new DRBGTestVector(
-                    new SHA1Digest(),
-                    new SHA1EntropyProvider().get(440),
-                    true,
-                    "2021222324",
-                    80,
-                    new String[]
-                        {
-                            "532CA1165DCFF21C55592687639884AF4BC4B057DF8F41DE653AB44E2ADEC7C9303E75ABE277EDBF",
-                            "73C2C67C696D686D0C4DBCEB5C2AF7DDF6F020B6874FAE4390F102117ECAAFF54418529A367005A0"
-                        })
-                .setPersonalizationString("404142434445464748494A4B4C4D4E4F505152535455565758595A5B5C5D5E5F606162636465666768696A6B6C6D6E6F70717273747576"),
-                new DRBGTestVector(
-                    new SHA1Digest(),
-                    new SHA1EntropyProvider().get(440),
-                    true,
-                    "2021222324",
-                    80,
-                    new String[]
-                        {
-                            "183C242A1430E46C4ED70B4DBE1BF9AB0AB8721CDCA2A2D1820AD6F6C956858543B2AA191D8D1287",
-                            "F196F9BD021C745CBD5AC7BFCE48EAAF0D0E7C091FBF436940E63A198EE770D9A4F0718669AF2BC9"
-                        })
-                    .addAdditionalInput("606162636465666768696A6B6C6D6E6F707172737475767778797A7B7C7D7E7F808182838485868788898A8B8C8D8E8F90919293949596")
-                    .addAdditionalInput("A0A1A2A3A4A5A6A7A8A9AAABACADAEAFB0B1B2B3B4B5B6B7B8B9BABBBCBDBEBFC0C1C2C3C4C5C6C7C8C9CACBCCCDCECFD0D1D2D3D4D5D6"),
-                new DRBGTestVector(
-                    new SHA256Digest(),
-                    new SHA256EntropyProvider().get(440),
-                    false,
-                    "2021222324252627",
-                    128,
-                    new String[]
-                        {
-                            "77E05A0E7DC78AB5D8934D5E93E82C06" +
-                            "A07C04CEE6C9C53045EEB485872777CF3B3E35C474F976B8" +
-                            "94BF301A86FA651F463970E89D4A0534B2ECAD29EC044E7E",
-                            "5FF4BA493C40CFFF3B01E472C575668C" +
-                            "CE3880B9290B05BFEDE5EC96ED5E9B2898508B09BC800EEE" +
-                            "099A3C90602ABD4B1D4F343D497C6055C87BB956D53BF351"
-                        }
-                ),
-                new DRBGTestVector(
-                    new SHA256Digest(),
-                    new SHA256EntropyProvider().get(440),
-                    true,
-                    "2021222324252627",
-                    128,
-                    new String[]
-                        {
-                            "92275523C70E567BCF9B35EC50B933F8" +
-                            "12616DF586B7F72EE1BC7735A5C2654373CBBC72316DFF84" +
-                            "20A33BF02B97AC8D1952583F270ACD7005CC027F4CF1187E",
-                            "681A46B2AA8694A0FE4DEEA720927A84" +
-                            "EAAA985E59C19F8BE0984D8CBEF8C69B754167641946E040" +
-                            "EE2043E1CCB29DCF063C0A50830E428E6DCA262ECD77C542"
-                        }),
-                new DRBGTestVector(
-                            new SHA384Digest(),
-                            new SHA384EntropyProvider().get(888),
-                            false,
-                            "202122232425262728292A2B",
-                            192,
-                            new String[]
-                                {
-                                    "04FF23AD15E78790ADD36B438BBC097C7A11747CC2CCEEDE" +
-                                    "2C978B23B3DC63B732C953061D7764990ABFEFC47A581B92" +
-                                    "1BC0428C4F12212460E406A0F0651E7F0CB9A90ABFDB07B5" +
-                                    "25565C74F0AA085082F6CF213AAFAD0C0646895078F1E1FE",
-                                    "4F35B85F95DEE3E873054905CFD02341653E18F529930CBE" +
-                                    "14D909F37FEAF2C790D22FAE7516B4590BE35D53E2FE1A35" +
-                                    "AFE4B6607CB358589C3B4D094A1D81FE0717F1DF5BDDEB3E" +
-                                    "114F130BB781E66C22B5B770E8AE115FF39F8ADAF66DEEDF"
-                                }
-                        ),
-                new DRBGTestVector(
-                        new SHA384Digest(),
-                        new SHA384EntropyProvider().get(888),
-                        true,
-                        "202122232425262728292A2B",
-                        192,
-                        new String[]
-                            {
-                                "97993B78F7C31C0E876DC92EB7D6C408E09D608AD6B99D0E" +
-                                "A2229B05A578C426334FCC8A1C7E676ED2D89A5B4CDF5B3F" +
-                                "4ADF11936BF14F4E10909DBA9C24F4FDFFDE72351DA8E2CC" +
-                                "3B135A395373899E5F1A5955B880CA9B9E9DD4C9CA7FA4D4",
-                                "F5983946320E36C64EF283CA1F65D197CF81624EC6778E77" +
-                                "0E78949D84EF21A45CDD62D1DB76920D4C2836FC6AE5299F" +
-                                "AF1357D9701FAD10FBD88D1E2832239436D76EB271BDC3CA" +
-                                "04425EC88BC0E89A4D5C37FFCE7C6C3ABDE9C413AE6D3FEA"
-                            }
-                    ),
-                new DRBGTestVector(
-                            new SHA512Digest(),
-                            new SHA512EntropyProvider().get(888),
-                            false,
-                            "202122232425262728292A2B2C2D2E2F",
-                            256,
-                            new String[]
-                            {
-                                "DA126CF95C6BF97E" +
-                                "2F731F2137A907ACC70FD7AC9EBACD1C6E31C74029B052E3" +
-                                "AABC48F3B00993F2B2381F7650A55322A968C86E05DE88E6" +
-                                "367F6EF89A601DB4342E9086C7AC13B5E56C32E9E668040B" +
-                                "73847893C5BFD38A1CF44F348B4EEE4CD68ADB7E7B8C837F" +
-                                "19BC4F902761F7CFF24AB1D704FD11C4E929D8553753B55D",
-                                "400B977CE8A2BB6A" +
-                                "84C6FD1CF901459685ABF5408CFF4588CEDF52E2D2DC300A" +
-                                "A9B4FAED8CD0161C2172B1FD269253195883D6EBF21020F2" +
-                                "C20E5F2C81AE60C8595B834A229B1F5B726C1125717E6207" +
-                                "8886EF38E61E32707AD5F8116C6393DFB6E7C7AE0E8E92BB" +
-                                "D7E0C3D04BBA02F5169F2F569A58158915FEE4C9D28D45DB"
-                            }
-                        )
-                    .setPersonalizationString(
-                        "404142434445464748494A4B4C4D4E" +
-                        "4F505152535455565758595A5B5C5D5E5F60616263646566" +
-                        "6768696A6B6C6D6E6F707172737475767778797A7B7C7D7E" +
-                        "7F808182838485868788898A8B8C8D8E8F90919293949596" +
-                        "9798999A9B9C9D9E9FA0A1A2A3A4A5A6A7A8A9AAABACADAE")
-                    .addAdditionalInput(
-                        "606162636465666768696A6B6C6D6E" +
-                        "6F707172737475767778797A7B7C7D7E7F80818283848586" +
-                        "8788898A8B8C8D8E8F909192939495969798999A9B9C9D9E" +
-                        "9FA0A1A2A3A4A5A6A7A8A9AAABACADAEAFB0B1B2B3B4B5B6" +
-                        "B7B8B9BABBBCBDBEBFC0C1C2C3C4C5C6C7C8C9CACBCCCDCE")
-                    .addAdditionalInput(
-                        "A0A1A2A3A4A5A6A7A8A9AAABACADAE" +
-                        "AFB0B1B2B3B4B5B6B7B8B9BABBBCBDBEBFC0C1C2C3C4C5C6" +
-                        "C7C8C9CACBCCCDCECFD0D1D2D3D4D5D6D7D8D9DADBDCDDDE" +
-                        "DFE0E1E2E3E4E5E6E7E8E9EAEBECEDEEEFF0F1F2F3F4F5F6" +
-                        "F7F8F9FAFBFCFDFEFF000102030405060708090A0B0C0D0E"),
-                new DRBGTestVector(
-                        new SHA512Digest(),
-                        new SHA512EntropyProvider().get(888),
-                        true,
-                        "202122232425262728292A2B2C2D2E2F",
-                        256,
-                        new String[]
-                        {
-                            "F93CA6855590A77F" +
-                            "07354097E90E026648B6115DF008FFEDBD9D9811F54E8286" +
-                            "EF00FDD6BA1E58DF2535E3FBDD9A9BA3754A97F36EE83322" +
-                            "1582060A1F37FCE4EE8826636B28EAD589593F4CA8B64738" +
-                            "8F24EB3F0A34796968D21BDEE6F81FD5DF93536F935937B8" +
-                            "025EC8CBF57DDB0C61F2E41463CC1516D657DA2829C6BF90",
-                            "4817618F48C60FB1" +
-                            "CE5BFBDA0CAF4591882A31F6EE3FE0F78779992A06EC60F3" +
-                            "7FB9A8D6108C231F0A927754B0599FA4FA27A4E25E065EF0" +
-                            "3085B892979DC0E7A1080883CAEBFDFD3665A8F2D061C521" +
-                            "F7D6E3DA2AF8B97B6B43B6EC831AF515070A83BBB9AC95ED" +
-                            "4EF49B756A2377A5F0833D847E27A88DDB0C2CE4AD782E7B "
-                        }
-                    ),
-                new DRBGTestVector(
-                        new SHA512Digest(),
-                        new SHA512EntropyProvider().get(888),
-                        true,
-                        "202122232425262728292A2B2C2D2E2F",
-                        256,
-                        new String[]
-                        {
-                            "0455DD4AD7DBACB2" +
-                            "410BE58DF7248D765A4547ABAEE1743B0BCAD37EBD06DA7C" +
-                            "F7CE5E2216E525327E9E2005EBEF2CE53BD733B18128627D" +
-                            "3FD6153089373AF2606A1584646A0EA488BFEF45228699A0" +
-                            "89CEA8AEC44502D86D9591F3552C688B7F7B45FCB0C3C2B9" +
-                            "43C1CD8A6FC63DF4D81C3DA543C9CF2843855EA84E4F959C",
-                            "C047D46D7F614E4E" +
-                            "4A7952C79A451F8F7ACA379967E2977C401C626A2ED70D74" +
-                            "A63660579A354115BC8C8C8CC3AEA3050686A0CFCDB6FA9C" +
-                            "F78D4C2165BAF851C6F9B1CD16A2E14C15C6DAAC56C16E75" +
-                            "FC84A14D58B41622E88B0F1B1995587FD8BAA999CBA98025" +
-                            "4C8AB9A9691DF7B84D88B639A9A3106DEABEB63748B99C09"
-                        }
-                    )
-                .addAdditionalInput(
-                    "606162636465666768696A6B6C6D6E" +
-                    "6F707172737475767778797A7B7C7D7E7F80818283848586" +
-                    "8788898A8B8C8D8E8F909192939495969798999A9B9C9D9E" +
-                    "9FA0A1A2A3A4A5A6A7A8A9AAABACADAEAFB0B1B2B3B4B5B6" +
-                    "B7B8B9BABBBCBDBEBFC0C1C2C3C4C5C6C7C8C9CACBCCCDCE")
-                .addAdditionalInput(
-                    "A0A1A2A3A4A5A6A7A8A9AAABACADAE" +
-                    "AFB0B1B2B3B4B5B6B7B8B9BABBBCBDBEBFC0C1C2C3C4C5C6" +
-                    "C7C8C9CACBCCCDCECFD0D1D2D3D4D5D6D7D8D9DADBDCDDDE" +
-                    "DFE0E1E2E3E4E5E6E7E8E9EAEBECEDEEEFF0F1F2F3F4F5F6" +
-                    "F7F8F9FAFBFCFDFEFF000102030405060708090A0B0C0D0E"),
-                new DRBGTestVector(
-                            new SHA512Digest(),
-                            new SHA512EntropyProvider().get(888),
-                            true,
-                            "202122232425262728292A2B2C2D2E2F",
-                            256,
-                            new String[]
-                            {
-                                "22EB93A67911DA73" +
-                                "85D9180C78127DE1A04FF713114C07C9C615F7CC5EF72744" +
-                                "A2DDCD7C3CB85E65DED8EF5F240FBDCBEBBDE2BAAC8ECF7D" +
-                                "CBC8AC333E54607AD41DC495D83DF72A05EF55B127C1441C" +
-                                "9A0EFFDA2C7954DB6C2D04342EB812E5E0B11D6C395F41ED" +
-                                "A2702ECE5BA479E2DFA18F953097492636C12FE30CE5C968",
-                                "E66698CFBF1B3F2E" +
-                                "919C03036E584EAA81CF1C6666240AF05F70637043733954" +
-                                "D8A1E5A66A04C53C6900FDC145D4A3A80A31F5868ACE9AC9" +
-                                "4E14E2051F624A05EEA1F8B684AA5410BCE315E76EA07C71" +
-                                "5D6F34731320FF0DCF78D795E6EFA2DF92B98BE636CDFBA2" +
-                                "9008DD392112AEC202F2E481CB9D83F987FEA69CD1B368BB"
-                            }
-                        )
-                    .setPersonalizationString(
-                        "404142434445464748494A4B4C4D4E" +
-                            "4F505152535455565758595A5B5C5D5E5F60616263646566" +
-                            "6768696A6B6C6D6E6F707172737475767778797A7B7C7D7E" +
-                            "7F808182838485868788898A8B8C8D8E8F90919293949596" +
-                            "9798999A9B9C9D9E9FA0A1A2A3A4A5A6A7A8A9AAABACADAE"),
-                new DRBGTestVector(
-                            new SHA512Digest(),
-                            new SHA512EntropyProvider().get(888),
-                            true,
-                            "202122232425262728292A2B2C2D2E2F",
-                            256,
-                            new String[]
-                            {
-                                "7596A76372308BD5" +
-                                "A5613439934678B35521A94D81ABFE63A21ACF61ABB88B61" +
-                                "E86A12C37F308F2BBBE32BE4B38D03AE808386494D70EF52" +
-                                "E9E1365DD18B7784CAB826F31D47579E4D57F69D8BF3152B" +
-                                "95741946CEBE58571DF58ED39980D9AF44E69F01E8989759" +
-                                "8E40171101A0E3302838E0AD9E849C01988993CF9F6E5263",
-                                "DBE5EE36FCD85301" +
-                                "303E1C3617C1AC5E23C08885D0BEFAAD0C85A0D89F85B9F1" +
-                                "6ECE3D88A24EB96504F2F13EFA7049621782F5DE2C416A0D" +
-                                "294CCFE53545C4E309C48E1E285A2B829A574B72B3C2FBE1" +
-                                "34D01E3706B486F2401B9820E17298A342666918E15B8462" +
-                                "87F8C5AF2D96B20FAF3D0BB392E15F4A06CDB0DECD1B6AD7"
-                            }
-                        )
-                    .setPersonalizationString(
-                        "404142434445464748494A4B4C4D4E" +
-                            "4F505152535455565758595A5B5C5D5E5F60616263646566" +
-                            "6768696A6B6C6D6E6F707172737475767778797A7B7C7D7E" +
-                            "7F808182838485868788898A8B8C8D8E8F90919293949596" +
-                            "9798999A9B9C9D9E9FA0A1A2A3A4A5A6A7A8A9AAABACADAE")
-                    .addAdditionalInput(
-                        "606162636465666768696A6B6C6D6E" +
-                            "6F707172737475767778797A7B7C7D7E7F80818283848586" +
-                            "8788898A8B8C8D8E8F909192939495969798999A9B9C9D9E" +
-                            "9FA0A1A2A3A4A5A6A7A8A9AAABACADAEAFB0B1B2B3B4B5B6" +
-                            "B7B8B9BABBBCBDBEBFC0C1C2C3C4C5C6C7C8C9CACBCCCDCE")
-                    .addAdditionalInput(
-                        "A0A1A2A3A4A5A6A7A8A9AAABACADAE" +
-                            "AFB0B1B2B3B4B5B6B7B8B9BABBBCBDBEBFC0C1C2C3C4C5C6" +
-                            "C7C8C9CACBCCCDCECFD0D1D2D3D4D5D6D7D8D9DADBDCDDDE" +
-                            "DFE0E1E2E3E4E5E6E7E8E9EAEBECEDEEEFF0F1F2F3F4F5F6" +
-                            "F7F8F9FAFBFCFDFEFF000102030405060708090A0B0C0D0E")
-            };
-    }
-
-    public void performTest()
-        throws Exception
-    {
-        DRBGTestVector[] tests = createTestVectorData();
-
-        for (int i = 0; i != tests.length; i++)
-        {
-            DRBGTestVector tv = tests[i];
-
-            byte[] nonce = tv.nonce();
-            byte[] personalisationString = tv.personalizationString();
-
-            SP80090DRBG d = new HashSP800DRBG(tv.getDigest(), tv.securityStrength(), tv.entropySource(), personalisationString, nonce);
-
-            byte[] output = new byte[tv.expectedValue(0).length];
-
-            d.generate(output, tv.additionalInput(0), tv.predictionResistance());
-
-            byte[] expected = tv.expectedValue(0);
-
-            if (!areEqual(expected, output))
-            {
-                fail("Test #" + (i + 1) + ".1 failed, expected " + new String(Hex.encode(tv.expectedValue(0))) + " got " + new String(Hex.encode(output)));
-            }
-
-            output = new byte[tv.expectedValue(0).length];
-
-            d.generate(output, tv.additionalInput(1), tv.predictionResistance());
-
-            expected = tv.expectedValue(1);
-            if (!areEqual(expected, output))
-            {
-                fail("Test #" + (i + 1) + ".2 failed, expected " + new String(Hex.encode(tv.expectedValue(1))) + " got " + new String(Hex.encode(output)));
-            }
-        }
-
-        // Exception tests
-        //
-        SP80090DRBG d;
-        try
-        {
-            d = new HashSP800DRBG(new SHA256Digest(), 256, new SHA256EntropyProvider().get(128), null, null);
-            fail("no exception thrown");
-        }
-        catch (IllegalArgumentException e)
-        {
-            if (!e.getMessage().equals("Not enough entropy for security strength required"))
-            {
-                fail("Wrong exception", e);
-            }
-        }
-
-        try
-        {
-            d = new HashSP800DRBG(new SHA1Digest(), 256, new SHA256EntropyProvider().get(256), null, null);
-            fail("no exception thrown");
-        }
-        catch (IllegalArgumentException e)
-        {
-            if (!e.getMessage().equals("Requested security strength is not supported by the derivation function"))
-            {
-                fail("Wrong exception", e);
-            }
-        }
-    }
-
-    private class SHA1EntropyProvider
-        extends TestEntropySourceProvider
-    {
-        SHA1EntropyProvider()
-        {
-            super(
-                Hex.decode(
-                    "000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F202122232425262728292A2B2C2D2E2F30313233343536"
-                        + "808182838485868788898A8B8C8D8E8F909192939495969798999A9B9C9D9E9FA0A1A2A3A4A5A6A7A8A9AAABACADAEAFB0B1B2B3B4B5B6"
-                        + "C0C1C2C3C4C5C6C7C8C9CACBCCCDCECFD0D1D2D3D4D5D6D7D8D9DADBDCDDDEDFE0E1E2E3E4E5E6E7E8E9EAEBECEDEEEFF0F1F2F3F4F5F6"), true);
-        }
-    }
-
-    private class SHA256EntropyProvider
-        extends TestEntropySourceProvider
-    {
-        SHA256EntropyProvider()
-        {
-            super(Hex.decode(
-                "00010203040506" +
-                    "0708090A0B0C0D0E0F101112131415161718191A1B1C1D1E" +
-                    "1F202122232425262728292A2B2C2D2E2F30313233343536" +
-                    "80818283848586" +
-                    "8788898A8B8C8D8E8F909192939495969798999A9B9C9D9E" +
-                    "9FA0A1A2A3A4A5A6A7A8A9AAABACADAEAFB0B1B2B3B4B5B6" +
-                    "C0C1C2C3C4C5C6" +
-                    "C7C8C9CACBCCCDCECFD0D1D2D3D4D5D6D7D8D9DADBDCDDDE" +
-                    "DFE0E1E2E3E4E5E6E7E8E9EAEBECEDEEEFF0F1F2F3F4F5F6"), true);
-        }
-    }
-
-    private class SHA384EntropyProvider
-        extends TestEntropySourceProvider
-    {
-        SHA384EntropyProvider()
-        {
-            super(Hex.decode(
-                "000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F20212223242526"
-                    + "2728292A2B2C2D2E2F303132333435363738393A3B3C3D3E3F404142434445464748494A4B4C4D4E4F50515253545556"
-                    + "5758595A5B5C5D5E5F606162636465666768696A6B6C6D6E" +
-                    "808182838485868788898A8B8C8D8E" +
-                    "8F909192939495969798999A9B9C9D9E9FA0A1A2A3A4A5A6" +
-                    "A7A8A9AAABACADAEAFB0B1B2B3B4B5B6B7B8B9BABBBCBDBE" +
-                    "BFC0C1C2C3C4C5C6C7C8C9CACBCCCDCECFD0D1D2D3D4D5D6" +
-                    "D7D8D9DADBDCDDDEDFE0E1E2E3E4E5E6E7E8E9EAEBECEDEE" +
-                    "C0C1C2C3C4C5C6C7C8C9CACBCCCDCE" +
-                    "CFD0D1D2D3D4D5D6D7D8D9DADBDCDDDEDFE0E1E2E3E4E5E6" +
-                    "E7E8E9EAEBECEDEEEFF0F1F2F3F4F5F6F7F8F9FAFBFCFDFE" +
-                    "FF000102030405060708090A0B0C0D0E0F10111213141516" +
-                    "1718191A1B1C1D1E1F202122232425262728292A2B2C2D2E"), true);
-        }
-    }
-
-    private class SHA512EntropyProvider
-        extends TestEntropySourceProvider
-    {
-        SHA512EntropyProvider()
-        {
-            super(Hex.decode(
-                "000102030405060708090A0B0C0D0E" +
-                    "0F101112131415161718191A1B1C1D1E1F20212223242526" +
-                    "2728292A2B2C2D2E2F303132333435363738393A3B3C3D3E" +
-                    "3F404142434445464748494A4B4C4D4E4F50515253545556" +
-                    "5758595A5B5C5D5E5F606162636465666768696A6B6C6D6E" +
-                    "808182838485868788898A8B8C8D8E" +
-                    "8F909192939495969798999A9B9C9D9E9FA0A1A2A3A4A5A6" +
-                    "A7A8A9AAABACADAEAFB0B1B2B3B4B5B6B7B8B9BABBBCBDBE" +
-                    "BFC0C1C2C3C4C5C6C7C8C9CACBCCCDCECFD0D1D2D3D4D5D6" +
-                    "D7D8D9DADBDCDDDEDFE0E1E2E3E4E5E6E7E8E9EAEBECEDEE" +
-                    "C0C1C2C3C4C5C6C7C8C9CACBCCCDCE" +
-                    "CFD0D1D2D3D4D5D6D7D8D9DADBDCDDDEDFE0E1E2E3E4E5E6" +
-                    "E7E8E9EAEBECEDEEEFF0F1F2F3F4F5F6F7F8F9FAFBFCFDFE" +
-                    "FF000102030405060708090A0B0C0D0E0F10111213141516" +
-                    "1718191A1B1C1D1E1F202122232425262728292A2B2C2D2E"), true);
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/prng/test/RegressionTest.java b/bcprov/src/main/java/org/bouncycastle/crypto/prng/test/RegressionTest.java
deleted file mode 100644
index 9b03637..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/prng/test/RegressionTest.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package org.bouncycastle.crypto.prng.test;
-
-import org.bouncycastle.util.test.Test;
-import org.bouncycastle.util.test.TestResult;
-
-public class RegressionTest
-{
-    public static Test[]    tests = {
-        new CTRDRBGTest(),
-        new DualECDRBGTest(),
-        new HashDRBGTest(),
-        new HMacDRBGTest(),
-        new SP800RandomTest(),
-        new X931Test(),
-        new FixedSecureRandomTest()
-    };
-
-    public static void main(
-        String[]    args)
-    {
-        for (int i = 0; i != tests.length; i++)
-        {
-            TestResult  result = tests[i].perform();
-            
-            if (result.getException() != null)
-            {
-                result.getException().printStackTrace();
-            }
-            
-            System.out.println(result);
-        }
-    }
-}
-
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/prng/test/SP800RandomTest.java b/bcprov/src/main/java/org/bouncycastle/crypto/prng/test/SP800RandomTest.java
deleted file mode 100644
index a164f8f..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/prng/test/SP800RandomTest.java
+++ /dev/null
@@ -1,319 +0,0 @@
-package org.bouncycastle.crypto.prng.test;
-
-import java.security.SecureRandom;
-
-import org.bouncycastle.crypto.digests.SHA1Digest;
-import org.bouncycastle.crypto.digests.SHA256Digest;
-import org.bouncycastle.crypto.engines.DESedeEngine;
-import org.bouncycastle.crypto.macs.HMac;
-import org.bouncycastle.crypto.prng.SP800SecureRandomBuilder;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-
-public class SP800RandomTest
-    extends SimpleTest
-{
-
-    public String getName()
-    {
-        return "SP800RandomTest";
-    }
-
-    private void testHashRandom()
-    {
-        DRBGTestVector tv = new DRBGTestVector(
-                            new SHA1Digest(),
-                            new SHA1EntropyProvider().get(440),
-                            true,
-                            "2021222324",
-                            80,
-                            new String[]
-                                {
-                                    "532CA1165DCFF21C55592687639884AF4BC4B057DF8F41DE653AB44E2ADEC7C9303E75ABE277EDBF",
-                                    "73C2C67C696D686D0C4DBCEB5C2AF7DDF6F020B6874FAE4390F102117ECAAFF54418529A367005A0"
-                                })
-                        .setPersonalizationString("404142434445464748494A4B4C4D4E4F505152535455565758595A5B5C5D5E5F606162636465666768696A6B6C6D6E6F70717273747576");
-
-        doHashTest(0, tv);
-
-        tv =  new DRBGTestVector(
-                            new SHA1Digest(),
-                            new SHA1EntropyProvider().get(440),
-                            false,
-                            "2021222324",
-                            80,
-                            new String[]
-                                {
-                                    "AB438BD3B01A0AF85CFEE29F7D7B71621C4908B909124D430E7B406FB1086EA994C582E0D656D989",
-                                    "29D9098F987E7005314A0F51B3DD2B8122F4AED706735DE6AD5DDBF223177C1E5F3AEBC52FAB90B9"
-                                })
-                            .setPersonalizationString("404142434445464748494A4B4C4D4E4F505152535455565758595A5B5C5D5E5F606162636465666768696A6B6C6D6E6F70717273747576");
-
-        doHashTest(1, tv);
-    }
-
-    private void doHashTest(int index, DRBGTestVector tv)
-    {
-        SP800SecureRandomBuilder rBuild = new SP800SecureRandomBuilder(new SHA1EntropyProvider());
-
-        rBuild.setPersonalizationString(tv.personalizationString());
-        rBuild.setSecurityStrength(tv.securityStrength());
-        rBuild.setEntropyBitsRequired(tv.entropySource().getEntropy().length * 8);
-
-        SecureRandom random = rBuild.buildHash(tv.getDigest(), tv.nonce(), tv.predictionResistance());
-
-        byte[] expected = tv.expectedValue(0);
-        byte[] produced = new byte[expected.length];
-
-        random.nextBytes(produced);
-
-        if (!Arrays.areEqual(expected, produced))
-        {
-            fail(index + " SP800 Hash SecureRandom produced incorrect result (1)");
-        }
-
-        random.nextBytes(produced);
-        expected = tv.expectedValue(1);
-
-        if (!Arrays.areEqual(expected, produced))
-        {
-            fail(index + " SP800 Hash SecureRandom produced incorrect result (2)");
-        }
-    }
-
-    private void testHMACRandom()
-    {
-        DRBGTestVector tv = new DRBGTestVector(
-            new SHA1Digest(),
-            new SHA1EntropyProvider().get(440),
-            true,
-            "2021222324",
-            80,
-            new String[]
-                {
-                    "6C37FDD729AA40F80BC6AB08CA7CC649794F6998B57081E4220F22C5C283E2C91B8E305AB869C625",
-                    "CAF57DCFEA393B9236BF691FA456FEA7FDF1DF8361482CA54D5FA723F4C88B4FA504BF03277FA783"
-                })
-            .setPersonalizationString("404142434445464748494A4B4C4D4E4F505152535455565758595A5B5C5D5E5F606162636465666768696A6B6C6D6E6F70717273747576");
-
-        doHMACTest(tv);
-
-        tv = new DRBGTestVector(
-                new SHA1Digest(),
-                new SHA1EntropyProvider().get(440),
-                false,
-                "2021222324",
-                80,
-                new String[]
-                    {
-                        "5A7D3B449F481CB38DF79AD2B1FCC01E57F8135E8C0B22CD0630BFB0127FB5408C8EFC17A929896E",
-                        "82cf772ec3e84b00fc74f5df104efbfb2428554e9ce367d03aeade37827fa8e9cb6a08196115d948"
-                    });
-
-        doHMACTest(tv);
-    }
-
-    private void doHMACTest(DRBGTestVector tv)
-    {
-        SP800SecureRandomBuilder rBuild = new SP800SecureRandomBuilder(new SHA1EntropyProvider());
-
-        rBuild.setPersonalizationString(tv.personalizationString());
-        rBuild.setSecurityStrength(tv.securityStrength());
-        rBuild.setEntropyBitsRequired(tv.entropySource().getEntropy().length * 8);
-
-        SecureRandom random = rBuild.buildHMAC(new HMac(tv.getDigest()), tv.nonce(), tv.predictionResistance());
-
-        byte[] expected = tv.expectedValue(0);
-        byte[] produced = new byte[expected.length];
-
-        random.nextBytes(produced);
-        if (!Arrays.areEqual(expected, produced))
-        {
-            fail("SP800 HMAC SecureRandom produced incorrect result (1)");
-        }
-
-        random.nextBytes(produced);
-        expected = tv.expectedValue(1);
-
-        if (!Arrays.areEqual(expected, produced))
-        {
-            fail("SP800 HMAC SecureRandom produced incorrect result (2)");
-        }
-    }
-
-    private void testDualECRandom()
-    {
-        DRBGTestVector tv = new DRBGTestVector(
-                            new SHA256Digest(),
-                            new SHA256EntropyProvider().get(128),
-                            false,
-                            "2021222324252627",
-                            128,
-                            new String[]
-                                {
-                                    "3AB095CC493A8730D70DE923108B2E4710799044FFC27D0A1156250DDF97E8B05ACE055E49F3E3F5B928CCD18317A3E68FCB0B6F0459ADF9ECF79C87",
-                                    "7B902FC35B0AF50F57F8822936D08A96E41B16967C6B1AA0BC05032F0D53919DC587B664C883E2FE8F3948002FCD8BCBFC4706BCAA2075EF6BF41167"
-                                })
-                        .setPersonalizationString("404142434445464748494A4B4C4D4E4F");
-
-        doDualECTest(1, tv);
-
-        tv = new DRBGTestVector(
-                            new SHA256Digest(),
-                            new SHA256EntropyProvider().get(128),
-                            true,
-                            "2021222324252627",
-                            128,
-                            new String[]
-                                {
-                                    "8C77288EDBEA9A742464F78D55E33593C1BF5F9D8CD8609D6D53BAC4E4B42252A227A99BAD0F2358B05955CD35723B549401C71C9C1F32F8A2018E24",
-                                    "56ECA61C64F69C1C232E992623C71418BD0B96D783118FAAD94A09E3A9DB74D15E805BA7F14625995CA77612B2EF7A05863699ECBABF70D3D422C014"
-                                });
-
-        doDualECTest(2, tv);
-    }
-
-    private void doDualECTest(int index, DRBGTestVector tv)
-    {
-        SP800SecureRandomBuilder rBuild = new SP800SecureRandomBuilder(new SHA256EntropyProvider());
-
-        rBuild.setPersonalizationString(tv.personalizationString());
-        rBuild.setSecurityStrength(tv.securityStrength());
-        rBuild.setEntropyBitsRequired(tv.securityStrength());
-
-        SecureRandom random = rBuild.buildDualEC(tv.getDigest(), tv.nonce(), tv.predictionResistance());
-
-        byte[] expected = tv.expectedValue(0);
-        byte[] produced = new byte[expected.length];
-
-        random.nextBytes(produced);
-        if (!Arrays.areEqual(expected, produced))
-        {
-            fail(index + " SP800 Dual EC SecureRandom produced incorrect result (1)");
-        }
-
-        random.nextBytes(produced);
-        expected = tv.expectedValue(1);
-
-        if (!Arrays.areEqual(expected, produced))
-        {
-            fail(index + " SP800 Dual EC SecureRandom produced incorrect result (2)");
-        }
-    }
-
-    private void testCTRRandom()
-    {
-        DRBGTestVector tv = new DRBGTestVector(
-                                    new DESedeEngine(), 168,
-                                    new Bit232EntropyProvider().get(232),
-                                    false,
-                                    "20212223242526",
-                                    112,
-                                    new String[]
-                                        {
-                                            "ABC88224514D0316EA3D48AEE3C9A2B4",
-                                            "D3D3F372E43E7ABDC4FA293743EED076"
-                                        }
-                                );
-
-        doCTRTest(tv);
-
-        tv = new DRBGTestVector(
-                    new DESedeEngine(), 168,
-                    new Bit232EntropyProvider().get(232),
-                    true,
-                    "20212223242526",
-                    112,
-                    new String[]
-                        {
-                            "64983055D014550B39DE699E43130B64",
-                            "035FDDA8582A2214EC722C410A8D95D3"
-                        }
-                )
-        .setPersonalizationString("404142434445464748494A4B4C4D4E4F505152535455565758595A5B5C");
-
-        doCTRTest(tv);
-    }
-
-    private void doCTRTest(DRBGTestVector tv)
-    {
-        SP800SecureRandomBuilder rBuild = new SP800SecureRandomBuilder(new Bit232EntropyProvider());
-
-        rBuild.setPersonalizationString(tv.personalizationString());
-        rBuild.setSecurityStrength(tv.securityStrength());
-        rBuild.setEntropyBitsRequired(tv.entropySource().getEntropy().length * 8);
-
-        SecureRandom random = rBuild.buildCTR(tv.getCipher(), tv.keySizeInBits(), tv.nonce(), tv.predictionResistance());
-
-        byte[] expected = tv.expectedValue(0);
-        byte[] produced = new byte[expected.length];
-
-        random.nextBytes(produced);
-        if (!Arrays.areEqual(expected, produced))
-        {
-            fail("SP800 CTR SecureRandom produced incorrect result (1)");
-        }
-
-        random.nextBytes(produced);
-        expected = tv.expectedValue(1);
-
-        if (!Arrays.areEqual(expected, produced))
-        {
-            fail("SP800 CTR SecureRandom produced incorrect result (2)");
-        }
-    }
-
-    public void performTest()
-        throws Exception
-    {
-        testHashRandom();
-        testHMACRandom();
-        testCTRRandom();
-        testDualECRandom();
-    }
-
-    public static void main(String[] args)
-    {
-        runTest(new SP800RandomTest());
-    }
-
-    // for HMAC/Hash
-    private class SHA1EntropyProvider
-        extends TestEntropySourceProvider
-    {
-        SHA1EntropyProvider()
-        {
-            super(
-                Hex.decode(
-                    "000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F202122232425262728292A2B2C2D2E2F30313233343536"
-                        + "808182838485868788898A8B8C8D8E8F909192939495969798999A9B9C9D9E9FA0A1A2A3A4A5A6A7A8A9AAABACADAEAFB0B1B2B3B4B5B6"
-                        + "C0C1C2C3C4C5C6C7C8C9CACBCCCDCECFD0D1D2D3D4D5D6D7D8D9DADBDCDDDEDFE0E1E2E3E4E5E6E7E8E9EAEBECEDEEEFF0F1F2F3F4F5F6"), true);
-        }
-    }
-
-    // for Dual EC
-    private class SHA256EntropyProvider
-        extends TestEntropySourceProvider
-    {
-        SHA256EntropyProvider()
-        {
-            super(Hex.decode(
-                "000102030405060708090A0B0C0D0E0F " +
-                    "808182838485868788898A8B8C8D8E8F" +
-                    "C0C1C2C3C4C5C6C7C8C9CACBCCCDCECF"), true);
-        }
-    }
-
-    private class Bit232EntropyProvider
-        extends TestEntropySourceProvider
-    {
-        Bit232EntropyProvider()
-        {
-            super(Hex.decode(
-               "000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C" +
-               "808182838485868788898A8B8C8D8E8F909192939495969798999A9B9C" +
-               "C0C1C2C3C4C5C6C7C8C9CACBCCCDCECFD0D1D2D3D4D5D6D7D8D9DADBDC"), true);
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/prng/test/TestEntropySourceProvider.java b/bcprov/src/main/java/org/bouncycastle/crypto/prng/test/TestEntropySourceProvider.java
deleted file mode 100644
index 64e7595..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/prng/test/TestEntropySourceProvider.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package org.bouncycastle.crypto.prng.test;
-
-import org.bouncycastle.crypto.prng.EntropySource;
-import org.bouncycastle.crypto.prng.EntropySourceProvider;
-
-public class TestEntropySourceProvider
-    implements EntropySourceProvider
-{
-    private final byte[] data;
-    private final boolean isPredictionResistant;
-
-    protected TestEntropySourceProvider(byte[] data, boolean isPredictionResistant)
-    {
-        this.data = data;
-        this.isPredictionResistant = isPredictionResistant;
-    }
-
-    public EntropySource get(final int bitsRequired)
-    {
-        return new EntropySource()
-        {
-            int index = 0;
-
-            public boolean isPredictionResistant()
-            {
-                return isPredictionResistant;
-            }
-
-            public byte[] getEntropy()
-            {
-                byte[] rv = new byte[bitsRequired / 8];
-
-                System.arraycopy(data, index, rv, 0, rv.length);
-
-                index += bitsRequired / 8;
-
-                return rv;
-            }
-
-            public int entropySize()
-            {
-                return bitsRequired;
-            }
-        };
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/prng/test/X931Test.java b/bcprov/src/main/java/org/bouncycastle/crypto/prng/test/X931Test.java
deleted file mode 100644
index 26ed67f..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/prng/test/X931Test.java
+++ /dev/null
@@ -1,124 +0,0 @@
-package org.bouncycastle.crypto.prng.test;
-
-import java.security.SecureRandom;
-
-import org.bouncycastle.crypto.engines.AESEngine;
-import org.bouncycastle.crypto.engines.DESedeEngine;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.crypto.prng.X931SecureRandomBuilder;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.Strings;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-
-/**
- * HMAC SP800-90 DRBG
- */
-public class X931Test
-    extends SimpleTest
-{
-    public String getName()
-    {
-        return "X931";
-    }
-
-    public static void main(String[] args)
-    {
-        runTest(new X931Test());
-    }
-
-    private X931TestVector[] createTestVectorData()
-    {
-        return new X931TestVector[]
-            {
-                new X931TestVector(
-                    new AESEngine(),
-                    new AES128EntropyProvider(),
-                    "f7d36762b9915f1ed585eb8e91700eb2",
-                    "259e67249288597a4d61e7c0e690afae",
-                    false,
-                    new String[] {
-                        "15f013af5a8e9df9a8e37500edaeac43",
-                        "a9d74bb1c90a222adc398546d64879cf",
-                        "0379e404042d58180764fb9e6c5d94bb",
-                        "3c74603e036d28c79947ffb56fee4e51",
-                        "e872101a4df81ebbe1e632fc87195d52",
-                        "26a6b3d33b8e7e68b75d9630ec036314" }),
-                new X931TestVector(
-                    new DESedeEngine(),
-                    new TDESEntropyProvider(),
-                    "ef16ec643e5db5892cbc6eabba310b3410e6f8759e3e382c",
-                    "55df103deaf68dc4",
-                    false,
-                    new String[] {
-                        "9c960bb9662ce6de",
-                        "d9d0e527fd0931da",
-                        "3e2db9994e9e6995",
-                        "0e3868aef8218cf7",
-                        "7b0b0ca137f8fd81",
-                        "f657df270ad12265" })
-            };
-    }
-
-    public void performTest()
-        throws Exception
-    {
-        X931TestVector[] vectors = createTestVectorData();
-
-        for (int i = 0; i != vectors.length; i++)
-        {
-            X931TestVector tv = vectors[i];
-            X931SecureRandomBuilder bld = new X931SecureRandomBuilder(tv.getEntropyProvider());
-
-            bld.setDateTimeVector(Hex.decode(tv.getDateTimeVector()));
-
-            SecureRandom rand = bld.build(tv.getEngine(), new KeyParameter(Hex.decode(tv.getKey())), tv.isPredictionResistant());
-
-            for (int j = 0; j != tv.getExpected().length - 1; j++)
-            {
-                byte[] expected = Hex.decode(tv.getExpected()[j]);
-                byte[] res = new byte[expected.length];
-
-                rand.nextBytes(res);
-
-                if (!Arrays.areEqual(expected, res))
-                {
-                    fail("expected output wrong [" + j + "] got : " + Strings.fromByteArray(Hex.encode(res)));
-                }
-            }
-
-            byte[] expected = Hex.decode(tv.getExpected()[tv.getExpected().length - 1]);
-            byte[] res = new byte[expected.length];
-
-            for (int j = tv.getExpected().length - 1; j != 10000; j++)
-            {
-                rand.nextBytes(res);
-            }
-
-            if (!Arrays.areEqual(expected, res))
-            {
-                fail("expected output wrong [" + 10000 + "] got : " + Strings.fromByteArray(Hex.encode(res)));
-            }
-        }
-    }
-
-    private class AES128EntropyProvider
-        extends TestEntropySourceProvider
-    {
-        AES128EntropyProvider()
-        {
-            super(Hex.decode(
-                "35cc0ea481fc8a4f5f05c7d4667233b2"), true);
-        }
-    }
-
-    private class TDESEntropyProvider
-        extends TestEntropySourceProvider
-    {
-        TDESEntropyProvider()
-        {
-            super(Hex.decode(
-                "96d872b9122c5e74"), true);
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/prng/test/X931TestVector.java b/bcprov/src/main/java/org/bouncycastle/crypto/prng/test/X931TestVector.java
deleted file mode 100644
index ce57a96..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/prng/test/X931TestVector.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package org.bouncycastle.crypto.prng.test;
-
-import org.bouncycastle.crypto.BlockCipher;
-import org.bouncycastle.crypto.prng.EntropySourceProvider;
-
-public class X931TestVector
-{
-    private final BlockCipher engine;
-    private final EntropySourceProvider entropyProvider;
-    private final String key;
-    private final String dateTimeVector;
-    private final boolean predictionResistant;
-    private final String[] expected;
-
-    public X931TestVector(BlockCipher engine, EntropySourceProvider entropyProvider, String key, String dateTimeVector, boolean predictionResistant, String[] expected)
-    {
-        this.engine = engine;
-        this.entropyProvider = entropyProvider;
-        this.key = key;
-
-
-        this.dateTimeVector = dateTimeVector;
-        this.predictionResistant = predictionResistant;
-        this.expected = expected;
-    }
-
-    public String getDateTimeVector()
-    {
-        return dateTimeVector;
-    }
-
-    public BlockCipher getEngine()
-    {
-        return engine;
-    }
-
-    public EntropySourceProvider getEntropyProvider()
-    {
-        return entropyProvider;
-    }
-
-    public String[] getExpected()
-    {
-        return expected;
-    }
-
-    public String getKey()
-    {
-        return key;
-    }
-
-    public boolean isPredictionResistant()
-    {
-        return predictionResistant;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/signers/DSADigestSigner.java b/bcprov/src/main/java/org/bouncycastle/crypto/signers/DSADigestSigner.java
deleted file mode 100644
index 684eb9c..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/signers/DSADigestSigner.java
+++ /dev/null
@@ -1,163 +0,0 @@
-package org.bouncycastle.crypto.signers;
-
-import java.io.IOException;
-import java.math.BigInteger;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Encoding;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.DSA;
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.Signer;
-import org.bouncycastle.crypto.params.AsymmetricKeyParameter;
-import org.bouncycastle.crypto.params.ParametersWithRandom;
-
-public class DSADigestSigner
-    implements Signer
-{
-    private final Digest digest;
-    private final DSA dsaSigner;
-    private boolean forSigning;
-
-    public DSADigestSigner(
-        DSA    signer,
-        Digest digest)
-    {
-        this.digest = digest;
-        this.dsaSigner = signer;
-    }
-
-    public void init(
-        boolean           forSigning,
-        CipherParameters   parameters)
-    {
-        this.forSigning = forSigning;
-
-        AsymmetricKeyParameter k;
-
-        if (parameters instanceof ParametersWithRandom)
-        {
-            k = (AsymmetricKeyParameter)((ParametersWithRandom)parameters).getParameters();
-        }
-        else
-        {
-            k = (AsymmetricKeyParameter)parameters;
-        }
-
-        if (forSigning && !k.isPrivate())
-        {
-            throw new IllegalArgumentException("Signing Requires Private Key.");
-        }
-
-        if (!forSigning && k.isPrivate())
-        {
-            throw new IllegalArgumentException("Verification Requires Public Key.");
-        }
-
-        reset();
-
-        dsaSigner.init(forSigning, parameters);
-    }
-
-    /**
-     * update the internal digest with the byte b
-     */
-    public void update(
-        byte input)
-    {
-        digest.update(input);
-    }
-
-    /**
-     * update the internal digest with the byte array in
-     */
-    public void update(
-        byte[]  input,
-        int     inOff,
-        int     length)
-    {
-        digest.update(input, inOff, length);
-    }
-
-    /**
-     * Generate a signature for the message we've been loaded with using
-     * the key we were initialised with.
-     */
-    public byte[] generateSignature()
-    {
-        if (!forSigning)
-        {
-            throw new IllegalStateException("DSADigestSigner not initialised for signature generation.");
-        }
-
-        byte[] hash = new byte[digest.getDigestSize()];
-        digest.doFinal(hash, 0);
-
-        BigInteger[] sig = dsaSigner.generateSignature(hash);
-
-        try
-        {
-            return derEncode(sig[0], sig[1]);
-        }
-        catch (IOException e)
-        {
-            throw new IllegalStateException("unable to encode signature");
-        }
-    }
-
-    public boolean verifySignature(
-        byte[] signature)
-    {
-        if (forSigning)
-        {
-            throw new IllegalStateException("DSADigestSigner not initialised for verification");
-        }
-
-        byte[] hash = new byte[digest.getDigestSize()];
-        digest.doFinal(hash, 0);
-
-        try
-        {
-            BigInteger[] sig = derDecode(signature);
-            return dsaSigner.verifySignature(hash, sig[0], sig[1]);
-        }
-        catch (IOException e)
-        {
-            return false;
-        }
-    }
-
-    public void reset()
-    {
-        digest.reset();
-    }
-
-    private byte[] derEncode(
-        BigInteger  r,
-        BigInteger  s)
-        throws IOException
-    {
-        ASN1EncodableVector v = new ASN1EncodableVector();
-        v.add(new ASN1Integer(r));
-        v.add(new ASN1Integer(s));
-
-        return new DERSequence(v).getEncoded(ASN1Encoding.DER);
-    }
-
-    private BigInteger[] derDecode(
-        byte[] encoding)
-        throws IOException
-    {
-        ASN1Sequence s = (ASN1Sequence)ASN1Primitive.fromByteArray(encoding);
-
-        return new BigInteger[]
-        {
-            ((ASN1Integer)s.getObjectAt(0)).getValue(),
-            ((ASN1Integer)s.getObjectAt(1)).getValue()
-        };
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/signers/DSTU4145Signer.java b/bcprov/src/main/java/org/bouncycastle/crypto/signers/DSTU4145Signer.java
deleted file mode 100644
index bceb822..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/signers/DSTU4145Signer.java
+++ /dev/null
@@ -1,170 +0,0 @@
-package org.bouncycastle.crypto.signers;
-
-import java.math.BigInteger;
-import java.security.SecureRandom;
-
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.DSA;
-import org.bouncycastle.crypto.params.ECDomainParameters;
-import org.bouncycastle.crypto.params.ECKeyParameters;
-import org.bouncycastle.crypto.params.ECPrivateKeyParameters;
-import org.bouncycastle.crypto.params.ECPublicKeyParameters;
-import org.bouncycastle.crypto.params.ParametersWithRandom;
-import org.bouncycastle.math.ec.ECAlgorithms;
-import org.bouncycastle.math.ec.ECCurve;
-import org.bouncycastle.math.ec.ECFieldElement;
-import org.bouncycastle.math.ec.ECMultiplier;
-import org.bouncycastle.math.ec.ECPoint;
-import org.bouncycastle.math.ec.FixedPointCombMultiplier;
-import org.bouncycastle.util.Arrays;
-
-/**
- * DSTU 4145-2002
- * <p>
- * National Ukrainian standard of digital signature based on elliptic curves (DSTU 4145-2002).
- * </p>
- */
-public class DSTU4145Signer
-    implements DSA
-{
-    private static final BigInteger ONE = BigInteger.valueOf(1);
-
-    private ECKeyParameters key;
-    private SecureRandom random;
-
-    public void init(boolean forSigning, CipherParameters param)
-    {
-        if (forSigning)
-        {
-            if (param instanceof ParametersWithRandom)
-            {
-                ParametersWithRandom rParam = (ParametersWithRandom)param;
-
-                this.random = rParam.getRandom();
-                param = rParam.getParameters();
-            }
-            else
-            {
-                this.random = new SecureRandom();
-            }
-
-            this.key = (ECPrivateKeyParameters)param;
-        }
-        else
-        {
-            this.key = (ECPublicKeyParameters)param;
-        }
-
-    }
-
-    public BigInteger[] generateSignature(byte[] message)
-    {
-        ECDomainParameters ec = key.getParameters();
-
-        ECCurve curve = ec.getCurve();
-
-        ECFieldElement h = hash2FieldElement(curve, message);
-        if (h.isZero())
-        {
-            h = curve.fromBigInteger(ONE);
-        }
-
-        BigInteger n = ec.getN();
-        BigInteger e, r, s;
-        ECFieldElement Fe, y;
-
-        BigInteger d = ((ECPrivateKeyParameters)key).getD();
-
-        ECMultiplier basePointMultiplier = createBasePointMultiplier();
-
-        do
-        {
-            do
-            {
-                do
-                {
-                    e = generateRandomInteger(n, random);
-                    Fe = basePointMultiplier.multiply(ec.getG(), e).normalize().getAffineXCoord();
-                }
-                while (Fe.isZero());
-
-                y = h.multiply(Fe);
-                r = fieldElement2Integer(n, y);
-            }
-            while (r.signum() == 0);
-
-            s = r.multiply(d).add(e).mod(n);
-        }
-        while (s.signum() == 0);
-
-        return new BigInteger[]{r, s};
-    }
-
-    public boolean verifySignature(byte[] message, BigInteger r, BigInteger s)
-    {
-        if (r.signum() <= 0 || s.signum() <= 0)
-        {
-            return false;
-        }
-
-        ECDomainParameters parameters = key.getParameters();
-
-        BigInteger n = parameters.getN();
-        if (r.compareTo(n) >= 0 || s.compareTo(n) >= 0)
-        {
-            return false;
-        }
-
-        ECCurve curve = parameters.getCurve();
-
-        ECFieldElement h = hash2FieldElement(curve, message);
-        if (h.isZero())
-        {
-            h = curve.fromBigInteger(ONE);
-        }
-
-        ECPoint R = ECAlgorithms.sumOfTwoMultiplies(parameters.getG(), s, ((ECPublicKeyParameters)key).getQ(), r).normalize();
-
-        // components must be bogus.
-        if (R.isInfinity())
-        {
-            return false;
-        }
-
-        ECFieldElement y = h.multiply(R.getAffineXCoord());
-        return fieldElement2Integer(n, y).compareTo(r) == 0;
-    }
-
-    protected ECMultiplier createBasePointMultiplier()
-    {
-        return new FixedPointCombMultiplier();
-    }
-
-    /**
-     * Generates random integer such, than its bit length is less than that of n
-     */
-    private static BigInteger generateRandomInteger(BigInteger n, SecureRandom random)
-    {
-        return new BigInteger(n.bitLength() - 1, random);
-    }
-
-    private static ECFieldElement hash2FieldElement(ECCurve curve, byte[] hash)
-    {
-        byte[] data = Arrays.reverse(hash);
-        return curve.fromBigInteger(truncate(new BigInteger(1, data), curve.getFieldSize()));
-    }
-
-    private static BigInteger fieldElement2Integer(BigInteger n, ECFieldElement fe)
-    {
-        return truncate(fe.toBigInteger(), n.bitLength() - 1);
-    }
-
-    private static BigInteger truncate(BigInteger x, int bitLength)
-    {
-        if (x.bitLength() > bitLength)
-        {
-            x = x.mod(ONE.shiftLeft(bitLength));
-        }
-        return x;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/signers/ECGOST3410Signer.java b/bcprov/src/main/java/org/bouncycastle/crypto/signers/ECGOST3410Signer.java
deleted file mode 100644
index 0ef8876..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/signers/ECGOST3410Signer.java
+++ /dev/null
@@ -1,160 +0,0 @@
-package org.bouncycastle.crypto.signers;
-
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.DSA;
-import org.bouncycastle.crypto.params.ECDomainParameters;
-import org.bouncycastle.crypto.params.ECKeyParameters;
-import org.bouncycastle.crypto.params.ECPrivateKeyParameters;
-import org.bouncycastle.crypto.params.ECPublicKeyParameters;
-import org.bouncycastle.crypto.params.ParametersWithRandom;
-import org.bouncycastle.math.ec.ECAlgorithms;
-import org.bouncycastle.math.ec.ECConstants;
-import org.bouncycastle.math.ec.ECMultiplier;
-import org.bouncycastle.math.ec.ECPoint;
-import org.bouncycastle.math.ec.FixedPointCombMultiplier;
-
-import java.math.BigInteger;
-import java.security.SecureRandom;
-
-/**
- * GOST R 34.10-2001 Signature Algorithm
- */
-public class ECGOST3410Signer
-    implements DSA
-{
-    ECKeyParameters key;
-
-    SecureRandom    random;
-
-    public void init(
-        boolean                 forSigning,
-        CipherParameters        param)
-    {
-        if (forSigning)
-        {
-            if (param instanceof ParametersWithRandom)
-            {
-                ParametersWithRandom    rParam = (ParametersWithRandom)param;
-
-                this.random = rParam.getRandom();
-                this.key = (ECPrivateKeyParameters)rParam.getParameters();
-            }
-            else
-            {
-                this.random = new SecureRandom();
-                this.key = (ECPrivateKeyParameters)param;
-            }
-        }
-        else
-        {
-            this.key = (ECPublicKeyParameters)param;
-        }
-    }
-
-    /**
-     * generate a signature for the given message using the key we were
-     * initialised with. For conventional GOST3410 the message should be a GOST3411
-     * hash of the message of interest.
-     *
-     * @param message the message that will be verified later.
-     */
-    public BigInteger[] generateSignature(
-        byte[] message)
-    {
-        byte[] mRev = new byte[message.length]; // conversion is little-endian
-        for (int i = 0; i != mRev.length; i++)
-        {
-            mRev[i] = message[mRev.length - 1 - i];
-        }
-
-        BigInteger e = new BigInteger(1, mRev);
-
-        ECDomainParameters ec = key.getParameters();
-        BigInteger n = ec.getN();
-        BigInteger d = ((ECPrivateKeyParameters)key).getD();
-
-        BigInteger r, s;
-
-        ECMultiplier basePointMultiplier = createBasePointMultiplier();
-
-        do // generate s
-        {
-            BigInteger k;
-            do // generate r
-            {
-                do
-                {
-                    k = new BigInteger(n.bitLength(), random);
-                }
-                while (k.equals(ECConstants.ZERO));
-
-                ECPoint p = basePointMultiplier.multiply(ec.getG(), k).normalize();
-
-                r = p.getAffineXCoord().toBigInteger().mod(n);
-            }
-            while (r.equals(ECConstants.ZERO));
-
-            s = (k.multiply(e)).add(d.multiply(r)).mod(n);
-        }
-        while (s.equals(ECConstants.ZERO));
-
-        return new BigInteger[]{ r, s };
-    }
-
-    /**
-     * return true if the value r and s represent a GOST3410 signature for
-     * the passed in message (for standard GOST3410 the message should be
-     * a GOST3411 hash of the real message to be verified).
-     */
-    public boolean verifySignature(
-        byte[]      message,
-        BigInteger  r,
-        BigInteger  s)
-    {
-        byte[] mRev = new byte[message.length]; // conversion is little-endian
-        for (int i = 0; i != mRev.length; i++)
-        {
-            mRev[i] = message[mRev.length - 1 - i];
-        }
-        
-        BigInteger e = new BigInteger(1, mRev);
-        BigInteger n = key.getParameters().getN();
-
-        // r in the range [1,n-1]
-        if (r.compareTo(ECConstants.ONE) < 0 || r.compareTo(n) >= 0)
-        {
-            return false;
-        }
-
-        // s in the range [1,n-1]
-        if (s.compareTo(ECConstants.ONE) < 0 || s.compareTo(n) >= 0)
-        {
-            return false;
-        }
-
-        BigInteger v = e.modInverse(n);
-
-        BigInteger z1 = s.multiply(v).mod(n);
-        BigInteger z2 = (n.subtract(r)).multiply(v).mod(n);
-
-        ECPoint G = key.getParameters().getG(); // P
-        ECPoint Q = ((ECPublicKeyParameters)key).getQ();
-
-        ECPoint point = ECAlgorithms.sumOfTwoMultiplies(G, z1, Q, z2).normalize();
-
-        // components must be bogus.
-        if (point.isInfinity())
-        {
-            return false;
-        }
-
-        BigInteger R = point.getAffineXCoord().toBigInteger().mod(n);
-
-        return R.equals(r);
-    }
-
-    protected ECMultiplier createBasePointMultiplier()
-    {
-        return new FixedPointCombMultiplier();
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/signers/ECNRSigner.java b/bcprov/src/main/java/org/bouncycastle/crypto/signers/ECNRSigner.java
deleted file mode 100644
index 3e83916..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/signers/ECNRSigner.java
+++ /dev/null
@@ -1,188 +0,0 @@
-package org.bouncycastle.crypto.signers;
-
-import org.bouncycastle.crypto.AsymmetricCipherKeyPair;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.DSA;
-import org.bouncycastle.crypto.DataLengthException;
-import org.bouncycastle.crypto.generators.ECKeyPairGenerator;
-import org.bouncycastle.crypto.params.ECKeyGenerationParameters;
-import org.bouncycastle.crypto.params.ECKeyParameters;
-import org.bouncycastle.crypto.params.ECPrivateKeyParameters;
-import org.bouncycastle.crypto.params.ECPublicKeyParameters;
-import org.bouncycastle.crypto.params.ParametersWithRandom;
-import org.bouncycastle.math.ec.ECAlgorithms;
-import org.bouncycastle.math.ec.ECConstants;
-import org.bouncycastle.math.ec.ECPoint;
-
-import java.math.BigInteger;
-import java.security.SecureRandom;
-
-/**
- * EC-NR as described in IEEE 1363-2000
- */
-public class ECNRSigner
-    implements DSA
-{
-    private boolean             forSigning;
-    private ECKeyParameters     key;
-    private SecureRandom        random;
-
-    public void init(
-        boolean          forSigning, 
-        CipherParameters param) 
-    {
-        this.forSigning = forSigning;
-        
-        if (forSigning)
-        {
-            if (param instanceof ParametersWithRandom)
-            {
-                ParametersWithRandom    rParam = (ParametersWithRandom)param;
-
-                this.random = rParam.getRandom();
-                this.key = (ECPrivateKeyParameters)rParam.getParameters();
-            }
-            else
-            {
-                this.random = new SecureRandom();
-                this.key = (ECPrivateKeyParameters)param;
-            }
-        }
-        else
-        {
-            this.key = (ECPublicKeyParameters)param;
-        }
-    }
-
-    // Section 7.2.5 ECSP-NR, pg 34
-    /**
-     * generate a signature for the given message using the key we were
-     * initialised with.  Generally, the order of the curve should be at 
-     * least as long as the hash of the message of interest, and with 
-     * ECNR it *must* be at least as long.  
-     *
-     * @param digest  the digest to be signed.
-     * @exception DataLengthException if the digest is longer than the key allows
-     */
-    public BigInteger[] generateSignature(
-        byte[] digest)
-    {
-        if (! this.forSigning) 
-        {
-            throw new IllegalStateException("not initialised for signing");
-        }
-        
-        BigInteger n = ((ECPrivateKeyParameters)this.key).getParameters().getN();
-        int nBitLength = n.bitLength();
-        
-        BigInteger e = new BigInteger(1, digest);
-        int eBitLength = e.bitLength();
-        
-        ECPrivateKeyParameters  privKey = (ECPrivateKeyParameters)key;
-               
-        if (eBitLength > nBitLength) 
-        {
-            throw new DataLengthException("input too large for ECNR key.");
-        }
-
-        BigInteger r = null;
-        BigInteger s = null;
-
-        AsymmetricCipherKeyPair tempPair;
-        do // generate r
-        {
-            // generate another, but very temporary, key pair using 
-            // the same EC parameters
-            ECKeyPairGenerator keyGen = new ECKeyPairGenerator();
-            
-            keyGen.init(new ECKeyGenerationParameters(privKey.getParameters(), this.random));
-            
-            tempPair = keyGen.generateKeyPair();
-
-            //    BigInteger Vx = tempPair.getPublic().getW().getAffineX();
-            ECPublicKeyParameters V = (ECPublicKeyParameters)tempPair.getPublic();        // get temp's public key
-            BigInteger Vx = V.getQ().getAffineXCoord().toBigInteger();                    // get the point's x coordinate
-
-            r = Vx.add(e).mod(n);
-        }
-        while (r.equals(ECConstants.ZERO));
-
-        // generate s
-        BigInteger x = privKey.getD();                // private key value
-        BigInteger u = ((ECPrivateKeyParameters)tempPair.getPrivate()).getD();    // temp's private key value
-        s = u.subtract(r.multiply(x)).mod(n);
-
-        BigInteger[]  res = new BigInteger[2];
-        res[0] = r;
-        res[1] = s;
-
-        return res;
-    }
-
-    // Section 7.2.6 ECVP-NR, pg 35
-    /**
-     * return true if the value r and s represent a signature for the 
-     * message passed in. Generally, the order of the curve should be at 
-     * least as long as the hash of the message of interest, and with 
-     * ECNR, it *must* be at least as long.  But just in case the signer
-     * applied mod(n) to the longer digest, this implementation will
-     * apply mod(n) during verification.
-     *
-     * @param digest  the digest to be verified.
-     * @param r       the r value of the signature.
-     * @param s       the s value of the signature.
-     * @exception DataLengthException if the digest is longer than the key allows
-     */
-    public boolean verifySignature(
-        byte[]      digest,
-        BigInteger  r,
-        BigInteger  s)
-    {
-        if (this.forSigning) 
-        {
-            throw new IllegalStateException("not initialised for verifying");
-        }
-
-        ECPublicKeyParameters pubKey = (ECPublicKeyParameters)key;
-        BigInteger n = pubKey.getParameters().getN();
-        int nBitLength = n.bitLength();
-        
-        BigInteger e = new BigInteger(1, digest);
-        int eBitLength = e.bitLength();
-        
-        if (eBitLength > nBitLength) 
-        {
-            throw new DataLengthException("input too large for ECNR key.");
-        }
-        
-        // r in the range [1,n-1]
-        if (r.compareTo(ECConstants.ONE) < 0 || r.compareTo(n) >= 0) 
-        {
-            return false;
-        }
-
-        // s in the range [0,n-1]           NB: ECNR spec says 0
-        if (s.compareTo(ECConstants.ZERO) < 0 || s.compareTo(n) >= 0) 
-        {
-            return false;
-        }
-
-        // compute P = sG + rW
-
-        ECPoint G = pubKey.getParameters().getG();
-        ECPoint W = pubKey.getQ();
-        // calculate P using Bouncy math
-        ECPoint P = ECAlgorithms.sumOfTwoMultiplies(G, s, W, r).normalize();
-
-        // components must be bogus.
-        if (P.isInfinity())
-        {
-            return false;
-        }
-
-        BigInteger x = P.getAffineXCoord().toBigInteger();
-        BigInteger t = r.subtract(x).mod(n);
-
-        return t.equals(e);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/signers/GOST3410Signer.java b/bcprov/src/main/java/org/bouncycastle/crypto/signers/GOST3410Signer.java
deleted file mode 100644
index 135f185..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/signers/GOST3410Signer.java
+++ /dev/null
@@ -1,131 +0,0 @@
-package org.bouncycastle.crypto.signers;
-
-import java.math.BigInteger;
-import java.security.SecureRandom;
-
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.DSA;
-import org.bouncycastle.crypto.params.GOST3410KeyParameters;
-import org.bouncycastle.crypto.params.GOST3410Parameters;
-import org.bouncycastle.crypto.params.GOST3410PrivateKeyParameters;
-import org.bouncycastle.crypto.params.GOST3410PublicKeyParameters;
-import org.bouncycastle.crypto.params.ParametersWithRandom;
-
-/**
- * GOST R 34.10-94 Signature Algorithm
- */
-public class GOST3410Signer
-        implements DSA
-{
-        GOST3410KeyParameters key;
-
-        SecureRandom    random;
-
-        public void init(
-            boolean                 forSigning,
-            CipherParameters        param)
-        {
-            if (forSigning)
-            {
-                if (param instanceof ParametersWithRandom)
-                {
-                    ParametersWithRandom rParam = (ParametersWithRandom)param;
-
-                    this.random = rParam.getRandom();
-                    this.key = (GOST3410PrivateKeyParameters)rParam.getParameters();
-                }
-                else
-                {
-                    this.random = new SecureRandom();
-                    this.key = (GOST3410PrivateKeyParameters)param;
-                }
-            }
-            else
-            {
-                this.key = (GOST3410PublicKeyParameters)param;
-            }
-        }
-
-        /**
-         * generate a signature for the given message using the key we were
-         * initialised with. For conventional GOST3410 the message should be a GOST3411
-         * hash of the message of interest.
-         *
-         * @param message the message that will be verified later.
-         */
-        public BigInteger[] generateSignature(
-            byte[] message)
-        {
-            byte[] mRev = new byte[message.length]; // conversion is little-endian
-            for (int i = 0; i != mRev.length; i++)
-            {
-                mRev[i] = message[mRev.length - 1 - i];
-            }
-            
-            BigInteger      m = new BigInteger(1, mRev);
-            GOST3410Parameters   params = key.getParameters();
-            BigInteger      k;
-
-            do
-            {
-                k = new BigInteger(params.getQ().bitLength(), random);
-            }
-            while (k.compareTo(params.getQ()) >= 0);
-
-            BigInteger  r = params.getA().modPow(k, params.getP()).mod(params.getQ());
-
-            BigInteger  s = k.multiply(m).
-                                add(((GOST3410PrivateKeyParameters)key).getX().multiply(r)).
-                                    mod(params.getQ());
-
-            BigInteger[]  res = new BigInteger[2];
-
-            res[0] = r;
-            res[1] = s;
-
-            return res;
-        }
-
-        /**
-         * return true if the value r and s represent a GOST3410 signature for
-         * the passed in message for standard GOST3410 the message should be a
-         * GOST3411 hash of the real message to be verified.
-         */
-        public boolean verifySignature(
-            byte[]      message,
-            BigInteger  r,
-            BigInteger  s)
-        {
-            byte[] mRev = new byte[message.length]; // conversion is little-endian
-            for (int i = 0; i != mRev.length; i++)
-            {
-                mRev[i] = message[mRev.length - 1 - i];
-            }
-            
-            BigInteger           m = new BigInteger(1, mRev);
-            GOST3410Parameters params = key.getParameters();
-            BigInteger           zero = BigInteger.valueOf(0);
-
-            if (zero.compareTo(r) >= 0 || params.getQ().compareTo(r) <= 0)
-            {
-                return false;
-            }
-
-            if (zero.compareTo(s) >= 0 || params.getQ().compareTo(s) <= 0)
-            {
-                return false;
-            }
-
-            BigInteger  v = m.modPow(params.getQ().subtract(new BigInteger("2")),params.getQ());
-
-            BigInteger  z1 = s.multiply(v).mod(params.getQ());
-            BigInteger  z2 = (params.getQ().subtract(r)).multiply(v).mod(params.getQ());
-            
-            z1 = params.getA().modPow(z1, params.getP());
-            z2 = ((GOST3410PublicKeyParameters)key).getY().modPow(z2, params.getP());
-
-            BigInteger  u = z1.multiply(z2).mod(params.getP()).mod(params.getQ());
-
-            return u.equals(r);
-        }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/signers/GenericSigner.java b/bcprov/src/main/java/org/bouncycastle/crypto/signers/GenericSigner.java
deleted file mode 100644
index add087e..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/signers/GenericSigner.java
+++ /dev/null
@@ -1,144 +0,0 @@
-package org.bouncycastle.crypto.signers;
-
-import org.bouncycastle.crypto.AsymmetricBlockCipher;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.CryptoException;
-import org.bouncycastle.crypto.DataLengthException;
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.Signer;
-import org.bouncycastle.crypto.params.AsymmetricKeyParameter;
-import org.bouncycastle.crypto.params.ParametersWithRandom;
-import org.bouncycastle.util.Arrays;
-
-public class GenericSigner
-    implements Signer
-{
-    private final AsymmetricBlockCipher engine;
-    private final Digest digest;
-    private boolean forSigning;
-
-    public GenericSigner(
-        AsymmetricBlockCipher engine,
-        Digest                digest)
-    {
-        this.engine = engine;
-        this.digest = digest;
-    }
-
-    /**
-     * initialise the signer for signing or verification.
-     *
-     * @param forSigning
-     *            true if for signing, false otherwise
-     * @param parameters
-     *            necessary parameters.
-     */
-    public void init(
-        boolean          forSigning,
-        CipherParameters parameters)
-    {
-        this.forSigning = forSigning;
-        AsymmetricKeyParameter k;
-
-        if (parameters instanceof ParametersWithRandom)
-        {
-            k = (AsymmetricKeyParameter)((ParametersWithRandom)parameters).getParameters();
-        }
-        else
-        {
-            k = (AsymmetricKeyParameter)parameters;
-        }
-
-        if (forSigning && !k.isPrivate())
-        {
-            throw new IllegalArgumentException("signing requires private key");
-        }
-
-        if (!forSigning && k.isPrivate())
-        {
-            throw new IllegalArgumentException("verification requires public key");
-        }
-
-        reset();
-
-        engine.init(forSigning, parameters);
-    }
-
-    /**
-     * update the internal digest with the byte b
-     */
-    public void update(
-        byte input)
-    {
-        digest.update(input);
-    }
-
-    /**
-     * update the internal digest with the byte array in
-     */
-    public void update(
-        byte[]  input,
-        int     inOff,
-        int     length)
-    {
-        digest.update(input, inOff, length);
-    }
-
-    /**
-     * Generate a signature for the message we've been loaded with using the key
-     * we were initialised with.
-     */
-    public byte[] generateSignature()
-        throws CryptoException, DataLengthException
-    {
-        if (!forSigning)
-        {
-            throw new IllegalStateException("GenericSigner not initialised for signature generation.");
-        }
-
-        byte[] hash = new byte[digest.getDigestSize()];
-        digest.doFinal(hash, 0);
-
-        return engine.processBlock(hash, 0, hash.length);
-    }
-
-    /**
-     * return true if the internal state represents the signature described in
-     * the passed in array.
-     */
-    public boolean verifySignature(
-        byte[] signature)
-    {
-        if (forSigning)
-        {
-            throw new IllegalStateException("GenericSigner not initialised for verification");
-        }
-
-        byte[] hash = new byte[digest.getDigestSize()];
-        digest.doFinal(hash, 0);
-
-        try
-        {
-            byte[] sig = engine.processBlock(signature, 0, signature.length);
-
-            // Extend with leading zeroes to match the digest size, if necessary.
-            if (sig.length < hash.length)
-            {
-                byte[] tmp = new byte[hash.length];
-                System.arraycopy(sig, 0, tmp, tmp.length - sig.length, sig.length);
-                sig = tmp;
-            }
-
-            return Arrays.constantTimeAreEqual(sig, hash);
-        }
-        catch (Exception e)
-        {
-            return false;
-        }
-    }
-
-    public void reset()
-    {
-        digest.reset();
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/signers/HMacDSAKCalculator.java b/bcprov/src/main/java/org/bouncycastle/crypto/signers/HMacDSAKCalculator.java
deleted file mode 100644
index 0fb7375..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/signers/HMacDSAKCalculator.java
+++ /dev/null
@@ -1,152 +0,0 @@
-package org.bouncycastle.crypto.signers;
-
-import java.math.BigInteger;
-import java.security.SecureRandom;
-
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.macs.HMac;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.BigIntegers;
-
-/**
- * A deterministic K calculator based on the algorithm in section 3.2 of RFC 6979.
- */
-public class HMacDSAKCalculator
-    implements DSAKCalculator
-{
-    private static final BigInteger ZERO = BigInteger.valueOf(0);
-
-    private final HMac hMac;
-    private final byte[] K;
-    private final byte[] V;
-
-    private BigInteger n;
-
-    /**
-     * Base constructor.
-     *
-     * @param digest digest to build the HMAC on.
-     */
-    public HMacDSAKCalculator(Digest digest)
-    {
-        this.hMac = new HMac(digest);
-        this.V = new byte[hMac.getMacSize()];
-        this.K = new byte[hMac.getMacSize()];
-    }
-
-    public boolean isDeterministic()
-    {
-        return true;
-    }
-
-    public void init(BigInteger n, SecureRandom random)
-    {
-        throw new IllegalStateException("Operation not supported");
-    }
-
-    public void init(BigInteger n, BigInteger d, byte[] message)
-    {
-        this.n = n;
-
-        Arrays.fill(V, (byte)0x01);
-        Arrays.fill(K, (byte)0);
-
-        byte[] x = new byte[(n.bitLength() + 7) / 8];
-        byte[] dVal = BigIntegers.asUnsignedByteArray(d);
-
-        System.arraycopy(dVal, 0, x, x.length - dVal.length, dVal.length);
-
-        byte[] m = new byte[(n.bitLength() + 7) / 8];
-
-        BigInteger mInt = bitsToInt(message);
-
-        if (mInt.compareTo(n) >= 0)
-        {
-            mInt = mInt.subtract(n);
-        }
-
-        byte[] mVal = BigIntegers.asUnsignedByteArray(mInt);
-
-        System.arraycopy(mVal, 0, m, m.length - mVal.length, mVal.length);
-
-        hMac.init(new KeyParameter(K));
-
-        hMac.update(V, 0, V.length);
-        hMac.update((byte)0x00);
-        hMac.update(x, 0, x.length);
-        hMac.update(m, 0, m.length);
-
-        hMac.doFinal(K, 0);
-
-        hMac.init(new KeyParameter(K));
-
-        hMac.update(V, 0, V.length);
-
-        hMac.doFinal(V, 0);
-
-        hMac.update(V, 0, V.length);
-        hMac.update((byte)0x01);
-        hMac.update(x, 0, x.length);
-        hMac.update(m, 0, m.length);
-
-        hMac.doFinal(K, 0);
-
-        hMac.init(new KeyParameter(K));
-
-        hMac.update(V, 0, V.length);
-
-        hMac.doFinal(V, 0);
-    }
-
-    public BigInteger nextK()
-    {
-        byte[] t = new byte[((n.bitLength() + 7) / 8)];
-
-        for (;;)
-        {
-            int tOff = 0;
-
-            while (tOff < t.length)
-            {
-                hMac.update(V, 0, V.length);
-
-                hMac.doFinal(V, 0);
-
-                int len = Math.min(t.length - tOff, V.length);
-                System.arraycopy(V, 0, t, tOff, len);
-                tOff += len;
-            }
-
-            BigInteger k = bitsToInt(t);
-
-            if (k.compareTo(ZERO) > 0 && k.compareTo(n) < 0)
-            {
-                return k;
-            }
-
-            hMac.update(V, 0, V.length);
-            hMac.update((byte)0x00);
-
-            hMac.doFinal(K, 0);
-
-            hMac.init(new KeyParameter(K));
-
-            hMac.update(V, 0, V.length);
-
-            hMac.doFinal(V, 0);
-        }
-    }
-
-    private BigInteger bitsToInt(byte[] t)
-    {
-        BigInteger v = new BigInteger(1, t);
-
-        if (t.length * 8 > n.bitLength())
-        {
-            v = v.shiftRight(t.length * 8 - n.bitLength());
-        }
-
-        return v;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/signers/ISO9796d2PSSSigner.java b/bcprov/src/main/java/org/bouncycastle/crypto/signers/ISO9796d2PSSSigner.java
deleted file mode 100644
index fcd5816..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/signers/ISO9796d2PSSSigner.java
+++ /dev/null
@@ -1,668 +0,0 @@
-package org.bouncycastle.crypto.signers;
-
-import java.security.SecureRandom;
-import java.util.Hashtable;
-
-import org.bouncycastle.crypto.AsymmetricBlockCipher;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.CryptoException;
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.InvalidCipherTextException;
-import org.bouncycastle.crypto.SignerWithRecovery;
-import org.bouncycastle.crypto.params.ParametersWithRandom;
-import org.bouncycastle.crypto.params.ParametersWithSalt;
-import org.bouncycastle.crypto.params.RSAKeyParameters;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.Integers;
-
-/**
- * ISO9796-2 - mechanism using a hash function with recovery (scheme 2 and 3).
- * <p>
- * Note: the usual length for the salt is the length of the hash
- * function used in bytes.
- */
-public class ISO9796d2PSSSigner
-    implements SignerWithRecovery
-{
-    static final public int   TRAILER_IMPLICIT    = 0xBC;
-    static final public int   TRAILER_RIPEMD160   = 0x31CC;
-    static final public int   TRAILER_RIPEMD128   = 0x32CC;
-    static final public int   TRAILER_SHA1        = 0x33CC;
-    static final public int   TRAILER_SHA256      = 0x34CC;
-    static final public int   TRAILER_SHA512      = 0x35CC;
-    static final public int   TRAILER_SHA384      = 0x36CC;
-    static final public int   TRAILER_WHIRLPOOL   = 0x37CC;
-
-    private static Hashtable trailerMap          = new Hashtable();
-
-    static
-    {
-        trailerMap.put("RIPEMD128", Integers.valueOf(TRAILER_RIPEMD128));
-        trailerMap.put("RIPEMD160", Integers.valueOf(TRAILER_RIPEMD160));
-
-        trailerMap.put("SHA-1", Integers.valueOf(TRAILER_SHA1));
-        trailerMap.put("SHA-256", Integers.valueOf(TRAILER_SHA256));
-        trailerMap.put("SHA-384", Integers.valueOf(TRAILER_SHA384));
-        trailerMap.put("SHA-512", Integers.valueOf(TRAILER_SHA512));
-
-        trailerMap.put("Whirlpool", Integers.valueOf(TRAILER_WHIRLPOOL));
-    }
-
-    private Digest digest;
-    private AsymmetricBlockCipher cipher;
-
-    private SecureRandom random;
-    private byte[] standardSalt;
-
-    private int hLen;
-    private int trailer;
-    private int keyBits;
-    private byte[] block;
-    private byte[] mBuf;
-    private int messageLength;
-    private int saltLength;
-    private boolean fullMessage;
-    private byte[] recoveredMessage;
-
-    private byte[] preSig;
-    private byte[] preBlock;
-    private int preMStart;
-    private int preTLength;
-
-    /**
-     * Generate a signer for the with either implicit or explicit trailers
-     * for ISO9796-2, scheme 2 or 3.
-     *
-     * @param cipher     base cipher to use for signature creation/verification
-     * @param digest     digest to use.
-     * @param saltLength length of salt in bytes.
-     * @param implicit   whether or not the trailer is implicit or gives the hash.
-     */
-    public ISO9796d2PSSSigner(
-        AsymmetricBlockCipher cipher,
-        Digest digest,
-        int saltLength,
-        boolean implicit)
-    {
-        this.cipher = cipher;
-        this.digest = digest;
-        this.hLen = digest.getDigestSize();
-        this.saltLength = saltLength;
-
-        if (implicit)
-        {
-            trailer = TRAILER_IMPLICIT;
-        }
-        else
-        {
-            Integer trailerObj = (Integer)trailerMap.get(digest.getAlgorithmName());
-
-            if (trailerObj != null)
-            {
-                trailer = trailerObj.intValue();
-            }
-            else
-            {
-                throw new IllegalArgumentException("no valid trailer for digest");
-            }
-        }
-    }
-
-    /**
-     * Constructor for a signer with an explicit digest trailer.
-     *
-     * @param cipher     cipher to use.
-     * @param digest     digest to sign with.
-     * @param saltLength length of salt in bytes.
-     */
-    public ISO9796d2PSSSigner(
-        AsymmetricBlockCipher cipher,
-        Digest digest,
-        int saltLength)
-    {
-        this(cipher, digest, saltLength, false);
-    }
-
-    /**
-     * Initialise the signer.
-     *
-     * @param forSigning true if for signing, false if for verification.
-     * @param param      parameters for signature generation/verification. If the
-     *                   parameters are for generation they should be a ParametersWithRandom,
-     *                   a ParametersWithSalt, or just an RSAKeyParameters object. If RSAKeyParameters
-     *                   are passed in a SecureRandom will be created.
-     * @throws IllegalArgumentException if wrong parameter type or a fixed
-     * salt is passed in which is the wrong length.
-     */
-    public void init(
-        boolean forSigning,
-        CipherParameters param)
-    {
-        RSAKeyParameters kParam;
-        int lengthOfSalt = saltLength;
-
-        if (param instanceof ParametersWithRandom)
-        {
-            ParametersWithRandom p = (ParametersWithRandom)param;
-
-            kParam = (RSAKeyParameters)p.getParameters();
-            if (forSigning)
-            {
-                random = p.getRandom();
-            }
-        }
-        else if (param instanceof ParametersWithSalt)
-        {
-            ParametersWithSalt p = (ParametersWithSalt)param;
-
-            kParam = (RSAKeyParameters)p.getParameters();
-            standardSalt = p.getSalt();
-            lengthOfSalt = standardSalt.length;
-            if (standardSalt.length != saltLength)
-            {
-                throw new IllegalArgumentException("Fixed salt is of wrong length");
-            }
-        }
-        else
-        {
-            kParam = (RSAKeyParameters)param;
-            if (forSigning)
-            {
-                random = new SecureRandom();
-            }
-        }
-
-        cipher.init(forSigning, kParam);
-
-        keyBits = kParam.getModulus().bitLength();
-
-        block = new byte[(keyBits + 7) / 8];
-
-        if (trailer == TRAILER_IMPLICIT)
-        {
-            mBuf = new byte[block.length - digest.getDigestSize() - lengthOfSalt - 1 - 1];
-        }
-        else
-        {
-            mBuf = new byte[block.length - digest.getDigestSize() - lengthOfSalt - 1 - 2];
-        }
-
-        reset();
-    }
-
-    /**
-     * compare two byte arrays - constant time
-     */
-    private boolean isSameAs(
-        byte[] a,
-        byte[] b)
-    {
-        boolean isOkay = true;
-
-        if (messageLength != b.length)
-        {
-            isOkay = false;
-        }
-
-        for (int i = 0; i != b.length; i++)
-        {
-            if (a[i] != b[i])
-            {
-                isOkay = false;
-            }
-        }
-
-        return isOkay;
-    }
-
-    /**
-     * clear possible sensitive data
-     */
-    private void clearBlock(
-        byte[] block)
-    {
-        for (int i = 0; i != block.length; i++)
-        {
-            block[i] = 0;
-        }
-    }
-
-    public void updateWithRecoveredMessage(byte[] signature)
-        throws InvalidCipherTextException
-    {
-        byte[] block = cipher.processBlock(signature, 0, signature.length);
-
-        //
-        // adjust block size for leading zeroes if necessary
-        //
-        if (block.length < (keyBits + 7) / 8)
-        {
-            byte[] tmp = new byte[(keyBits + 7) / 8];
-
-            System.arraycopy(block, 0, tmp, tmp.length - block.length, block.length);
-            clearBlock(block);
-            block = tmp;
-        }
-
-        int tLength;
-
-        if (((block[block.length - 1] & 0xFF) ^ 0xBC) == 0)
-        {
-            tLength = 1;
-        }
-        else
-        {
-            int sigTrail = ((block[block.length - 2] & 0xFF) << 8) | (block[block.length - 1] & 0xFF);
-
-            Integer trailerObj = (Integer)trailerMap.get(digest.getAlgorithmName());
-
-            if (trailerObj != null)
-            {
-                if (sigTrail != trailerObj.intValue())
-                {
-                    throw new IllegalStateException("signer initialised with wrong digest for trailer " + sigTrail);
-                }
-            }
-            else
-            {
-                throw new IllegalArgumentException("unrecognised hash in signature");
-            }
-
-            tLength = 2;
-        }
-
-        //
-        // calculate H(m2)
-        //
-        byte[] m2Hash = new byte[hLen];
-        digest.doFinal(m2Hash, 0);
-
-        //
-        // remove the mask
-        //
-        byte[] dbMask = maskGeneratorFunction1(block, block.length - hLen - tLength, hLen, block.length - hLen - tLength);
-        for (int i = 0; i != dbMask.length; i++)
-        {
-            block[i] ^= dbMask[i];
-        }
-
-        block[0] &= 0x7f;
-
-        //
-        // find out how much padding we've got
-        //
-        int mStart = 0;
-        for (; mStart != block.length; mStart++)
-        {
-            if (block[mStart] == 0x01)
-            {
-                break;
-            }
-        }
-
-        mStart++;
-
-        if (mStart >= block.length)
-        {
-            clearBlock(block);
-        }
-
-        fullMessage = (mStart > 1);
-
-        recoveredMessage = new byte[dbMask.length - mStart - saltLength];
-
-        System.arraycopy(block, mStart, recoveredMessage, 0, recoveredMessage.length);
-        System.arraycopy(recoveredMessage, 0, mBuf, 0, recoveredMessage.length);
-
-        preSig = signature;
-        preBlock = block;
-        preMStart = mStart;
-        preTLength = tLength;
-    }
-
-    /**
-     * update the internal digest with the byte b
-     */
-    public void update(
-        byte b)
-    {
-        if (preSig == null && messageLength < mBuf.length)
-        {
-            mBuf[messageLength++] = b;
-        }
-        else
-        {
-            digest.update(b);
-        }
-    }
-
-    /**
-     * update the internal digest with the byte array in
-     */
-    public void update(
-        byte[] in,
-        int off,
-        int len)
-    {
-        if (preSig == null)
-        {
-            while (len > 0 && messageLength < mBuf.length)
-            {
-                this.update(in[off]);
-                off++;
-                len--;
-            }
-        }
-
-        if (len > 0)
-        {
-            digest.update(in, off, len);
-        }
-    }
-
-    /**
-     * reset the internal state
-     */
-    public void reset()
-    {
-        digest.reset();
-        messageLength = 0;
-        if (mBuf != null)
-        {
-            clearBlock(mBuf);
-        }
-        if (recoveredMessage != null)
-        {
-            clearBlock(recoveredMessage);
-            recoveredMessage = null;
-        }
-        fullMessage = false;
-        if (preSig != null)
-        {
-            preSig = null;
-            clearBlock(preBlock);
-            preBlock = null;
-        }
-    }
-
-    /**
-     * generate a signature for the loaded message using the key we were
-     * initialised with.
-     */
-    public byte[] generateSignature()
-        throws CryptoException
-    {
-        int digSize = digest.getDigestSize();
-
-        byte[] m2Hash = new byte[digSize];
-
-        digest.doFinal(m2Hash, 0);
-
-        byte[] C = new byte[8];
-        LtoOSP(messageLength * 8, C);
-
-        digest.update(C, 0, C.length);
-
-        digest.update(mBuf, 0, messageLength);
-
-        digest.update(m2Hash, 0, m2Hash.length);
-
-        byte[] salt;
-
-        if (standardSalt != null)
-        {
-            salt = standardSalt;
-        }
-        else
-        {
-            salt = new byte[saltLength];
-            random.nextBytes(salt);
-        }
-
-        digest.update(salt, 0, salt.length);
-
-        byte[] hash = new byte[digest.getDigestSize()];
-
-        digest.doFinal(hash, 0);
-
-        int tLength = 2;
-        if (trailer == TRAILER_IMPLICIT)
-        {
-            tLength = 1;
-        }
-
-        int off = block.length - messageLength - salt.length - hLen - tLength - 1;
-
-        block[off] = 0x01;
-
-        System.arraycopy(mBuf, 0, block, off + 1, messageLength);
-        System.arraycopy(salt, 0, block, off + 1 + messageLength, salt.length);
-
-        byte[] dbMask = maskGeneratorFunction1(hash, 0, hash.length, block.length - hLen - tLength);
-        for (int i = 0; i != dbMask.length; i++)
-        {
-            block[i] ^= dbMask[i];
-        }
-
-        System.arraycopy(hash, 0, block, block.length - hLen - tLength, hLen);
-
-        if (trailer == TRAILER_IMPLICIT)
-        {
-            block[block.length - 1] = (byte)TRAILER_IMPLICIT;
-        }
-        else
-        {
-            block[block.length - 2] = (byte)(trailer >>> 8);
-            block[block.length - 1] = (byte)trailer;
-        }
-
-        block[0] &= 0x7f;
-
-        byte[] b = cipher.processBlock(block, 0, block.length);
-
-        clearBlock(mBuf);
-        clearBlock(block);
-        messageLength = 0;
-
-        return b;
-    }
-
-    /**
-     * return true if the signature represents a ISO9796-2 signature
-     * for the passed in message.
-     */
-    public boolean verifySignature(
-        byte[] signature)
-    {
-        //
-        // calculate H(m2)
-        //
-        byte[] m2Hash = new byte[hLen];
-        digest.doFinal(m2Hash, 0);
-
-        byte[] block;
-        int tLength;
-        int mStart = 0;
-
-        if (preSig == null)
-        {
-            try
-            {
-                updateWithRecoveredMessage(signature);
-            }
-            catch (Exception e)
-            {
-                return false;
-            }
-        }
-        else
-        {
-            if (!Arrays.areEqual(preSig, signature))
-            {
-                throw new IllegalStateException("updateWithRecoveredMessage called on different signature");
-            }
-        }
-
-        block = preBlock;
-        mStart = preMStart;
-        tLength = preTLength;
-
-        preSig = null;
-        preBlock = null;
-
-        //
-        // check the hashes
-        //
-        byte[] C = new byte[8];
-        LtoOSP(recoveredMessage.length * 8, C);
-
-        digest.update(C, 0, C.length);
-
-        if (recoveredMessage.length != 0)
-        {
-            digest.update(recoveredMessage, 0, recoveredMessage.length);
-        }
-
-        digest.update(m2Hash, 0, m2Hash.length);
-
-        // Update for the salt
-        digest.update(block, mStart + recoveredMessage.length, saltLength);
-
-        byte[] hash = new byte[digest.getDigestSize()];
-        digest.doFinal(hash, 0);
-
-        int off = block.length - tLength - hash.length;
-
-        boolean isOkay = true;
-
-        for (int i = 0; i != hash.length; i++)
-        {
-            if (hash[i] != block[off + i])
-            {
-                isOkay = false;
-            }
-        }
-
-        clearBlock(block);
-        clearBlock(hash);
-
-        if (!isOkay)
-        {
-            fullMessage = false;
-            clearBlock(recoveredMessage);
-            return false;
-        }
-
-        //
-        // if they've input a message check what we've recovered against
-        // what was input.
-        //
-        if (messageLength != 0)
-        {
-            if (!isSameAs(mBuf, recoveredMessage))
-            {
-                clearBlock(mBuf);
-                return false;
-            }
-            messageLength = 0;
-        }
-
-        clearBlock(mBuf);
-        return true;
-    }
-
-    /**
-     * Return true if the full message was recoveredMessage.
-     *
-     * @return true on full message recovery, false otherwise, or if not sure.
-     * @see org.bouncycastle.crypto.SignerWithRecovery#hasFullMessage()
-     */
-    public boolean hasFullMessage()
-    {
-        return fullMessage;
-    }
-
-    /**
-     * Return a reference to the recoveredMessage message.
-     *
-     * @return the full/partial recoveredMessage message.
-     * @see org.bouncycastle.crypto.SignerWithRecovery#getRecoveredMessage()
-     */
-    public byte[] getRecoveredMessage()
-    {
-        return recoveredMessage;
-    }
-
-    /**
-     * int to octet string.
-     */
-    private void ItoOSP(
-        int i,
-        byte[] sp)
-    {
-        sp[0] = (byte)(i >>> 24);
-        sp[1] = (byte)(i >>> 16);
-        sp[2] = (byte)(i >>> 8);
-        sp[3] = (byte)(i >>> 0);
-    }
-
-    /**
-     * long to octet string.
-     */
-    private void LtoOSP(
-        long l,
-        byte[] sp)
-    {
-        sp[0] = (byte)(l >>> 56);
-        sp[1] = (byte)(l >>> 48);
-        sp[2] = (byte)(l >>> 40);
-        sp[3] = (byte)(l >>> 32);
-        sp[4] = (byte)(l >>> 24);
-        sp[5] = (byte)(l >>> 16);
-        sp[6] = (byte)(l >>> 8);
-        sp[7] = (byte)(l >>> 0);
-    }
-
-    /**
-     * mask generator function, as described in PKCS1v2.
-     */
-    private byte[] maskGeneratorFunction1(
-        byte[] Z,
-        int zOff,
-        int zLen,
-        int length)
-    {
-        byte[] mask = new byte[length];
-        byte[] hashBuf = new byte[hLen];
-        byte[] C = new byte[4];
-        int counter = 0;
-
-        digest.reset();
-
-        while (counter < (length / hLen))
-        {
-            ItoOSP(counter, C);
-
-            digest.update(Z, zOff, zLen);
-            digest.update(C, 0, C.length);
-            digest.doFinal(hashBuf, 0);
-
-            System.arraycopy(hashBuf, 0, mask, counter * hLen, hLen);
-
-            counter++;
-        }
-
-        if ((counter * hLen) < length)
-        {
-            ItoOSP(counter, C);
-
-            digest.update(Z, zOff, zLen);
-            digest.update(C, 0, C.length);
-            digest.doFinal(hashBuf, 0);
-
-            System.arraycopy(hashBuf, 0, mask, counter * hLen, mask.length - (counter * hLen));
-        }
-
-        return mask;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/signers/ISO9796d2Signer.java b/bcprov/src/main/java/org/bouncycastle/crypto/signers/ISO9796d2Signer.java
deleted file mode 100644
index 563fae6..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/signers/ISO9796d2Signer.java
+++ /dev/null
@@ -1,618 +0,0 @@
-package org.bouncycastle.crypto.signers;
-
-import java.util.Hashtable;
-
-import org.bouncycastle.crypto.AsymmetricBlockCipher;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.CryptoException;
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.InvalidCipherTextException;
-import org.bouncycastle.crypto.SignerWithRecovery;
-import org.bouncycastle.crypto.params.RSAKeyParameters;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.Integers;
-
-/**
- * ISO9796-2 - mechanism using a hash function with recovery (scheme 1)
- */
-public class ISO9796d2Signer
-    implements SignerWithRecovery
-{
-    static final public int   TRAILER_IMPLICIT    = 0xBC;
-    static final public int   TRAILER_RIPEMD160   = 0x31CC;
-    static final public int   TRAILER_RIPEMD128   = 0x32CC;
-    static final public int   TRAILER_SHA1        = 0x33CC;
-    static final public int   TRAILER_SHA256      = 0x34CC;
-    static final public int   TRAILER_SHA512      = 0x35CC;
-    static final public int   TRAILER_SHA384      = 0x36CC;
-    static final public int   TRAILER_WHIRLPOOL   = 0x37CC;
-
-    private static Hashtable  trailerMap          = new Hashtable();
-
-    static
-    {
-        trailerMap.put("RIPEMD128", Integers.valueOf(TRAILER_RIPEMD128));
-        trailerMap.put("RIPEMD160", Integers.valueOf(TRAILER_RIPEMD160));
-
-        trailerMap.put("SHA-1", Integers.valueOf(TRAILER_SHA1));
-        trailerMap.put("SHA-256", Integers.valueOf(TRAILER_SHA256));
-        trailerMap.put("SHA-384", Integers.valueOf(TRAILER_SHA384));
-        trailerMap.put("SHA-512", Integers.valueOf(TRAILER_SHA512));
-
-        trailerMap.put("Whirlpool", Integers.valueOf(TRAILER_WHIRLPOOL));
-    }
-
-    private Digest                      digest;
-    private AsymmetricBlockCipher       cipher;
-
-    private int         trailer;
-    private int         keyBits;
-    private byte[]      block;
-    private byte[]      mBuf;
-    private int         messageLength;
-    private boolean     fullMessage;
-    private byte[]      recoveredMessage;
-
-    private byte[]      preSig;
-    private byte[]      preBlock;
-
-    /**
-     * Generate a signer for the with either implicit or explicit trailers
-     * for ISO9796-2.
-     * 
-     * @param cipher base cipher to use for signature creation/verification
-     * @param digest digest to use.
-     * @param implicit whether or not the trailer is implicit or gives the hash.
-     */
-    public ISO9796d2Signer(
-        AsymmetricBlockCipher   cipher,
-        Digest                  digest,
-        boolean                 implicit)
-    {
-        this.cipher = cipher;
-        this.digest = digest;
-
-        if (implicit)
-        {
-            trailer = TRAILER_IMPLICIT;
-        }
-        else
-        {
-            Integer trailerObj = (Integer)trailerMap.get(digest.getAlgorithmName());
-
-            if (trailerObj != null)
-            {
-                trailer = trailerObj.intValue();
-            }
-            else
-            {
-                throw new IllegalArgumentException("no valid trailer for digest");
-            }
-        }
-    }
-
-    /**
-     * Constructor for a signer with an explicit digest trailer.
-     * 
-     * @param cipher cipher to use.
-     * @param digest digest to sign with.
-     */
-    public ISO9796d2Signer(
-        AsymmetricBlockCipher   cipher,
-        Digest                  digest)
-    {
-        this(cipher, digest, false);
-    }
-    
-    public void init(
-        boolean                 forSigning,
-        CipherParameters        param)
-    {
-        RSAKeyParameters  kParam = (RSAKeyParameters)param;
-
-        cipher.init(forSigning, kParam);
-
-        keyBits = kParam.getModulus().bitLength();
-
-        block = new byte[(keyBits + 7) / 8];
-        
-        if (trailer == TRAILER_IMPLICIT)
-        {
-            mBuf = new byte[block.length - digest.getDigestSize() - 2];
-        }
-        else
-        {
-            mBuf = new byte[block.length - digest.getDigestSize() - 3];
-        }
-
-        reset();
-    }
-
-    /**
-     * compare two byte arrays - constant time
-     */
-    private boolean isSameAs(
-        byte[]    a,
-        byte[]    b)
-    {
-        boolean isOkay = true;
-
-        if (messageLength > mBuf.length)
-        {
-            if (mBuf.length > b.length)
-            {
-                isOkay = false;
-            }
-            
-            for (int i = 0; i != mBuf.length; i++)
-            {
-                if (a[i] != b[i])
-                {
-                    isOkay = false;
-                }
-            }
-        }
-        else
-        {
-            if (messageLength != b.length)
-            {
-                isOkay = false;
-            }
-            
-            for (int i = 0; i != b.length; i++)
-            {
-                if (a[i] != b[i])
-                {
-                    isOkay = false;
-                }
-            }
-        }
-        
-        return isOkay;
-    }
-    
-    /**
-     * clear possible sensitive data
-     */
-    private void clearBlock(
-        byte[]  block)
-    {
-        for (int i = 0; i != block.length; i++)
-        {
-            block[i] = 0;
-        }
-    }
-
-    public void updateWithRecoveredMessage(byte[] signature)
-        throws InvalidCipherTextException
-    {
-        byte[]      block = cipher.processBlock(signature, 0, signature.length);
-
-        if (((block[0] & 0xC0) ^ 0x40) != 0)
-        {
-            throw new InvalidCipherTextException("malformed signature");
-        }
-
-        if (((block[block.length - 1] & 0xF) ^ 0xC) != 0)
-        {
-            throw new InvalidCipherTextException("malformed signature");
-        }
-
-        int     delta = 0;
-
-        if (((block[block.length - 1] & 0xFF) ^ 0xBC) == 0)
-        {
-            delta = 1;
-        }
-        else
-        {
-            int sigTrail = ((block[block.length - 2] & 0xFF) << 8) | (block[block.length - 1] & 0xFF);
-            Integer trailerObj = (Integer)trailerMap.get(digest.getAlgorithmName());
-
-            if (trailerObj != null)
-            {
-                if (sigTrail != trailerObj.intValue())
-                {
-                    throw new IllegalStateException("signer initialised with wrong digest for trailer " + sigTrail);
-                }
-            }
-            else
-            {
-                throw new IllegalArgumentException("unrecognised hash in signature");
-            }
-
-            delta = 2;
-        }
-
-        //
-        // find out how much padding we've got
-        //
-        int mStart = 0;
-
-        for (mStart = 0; mStart != block.length; mStart++)
-        {
-            if (((block[mStart] & 0x0f) ^ 0x0a) == 0)
-            {
-                break;
-            }
-        }
-
-        mStart++;
-
-        int off = block.length - delta - digest.getDigestSize();
-
-        //
-        // there must be at least one byte of message string
-        //
-        if ((off - mStart) <= 0)
-        {
-            throw new InvalidCipherTextException("malformed block");
-        }
-
-        //
-        // if we contain the whole message as well, check the hash of that.
-        //
-        if ((block[0] & 0x20) == 0)
-        {
-            fullMessage = true;
-
-            recoveredMessage = new byte[off - mStart];
-            System.arraycopy(block, mStart, recoveredMessage, 0, recoveredMessage.length);
-        }
-        else
-        {
-            fullMessage = false;
-
-            recoveredMessage = new byte[off - mStart];
-            System.arraycopy(block, mStart, recoveredMessage, 0, recoveredMessage.length);
-        }
-
-        preSig = signature;
-        preBlock = block;
-
-        digest.update(recoveredMessage, 0, recoveredMessage.length);
-        messageLength = recoveredMessage.length;
-        System.arraycopy(recoveredMessage, 0, mBuf, 0, recoveredMessage.length);
-    }
-    
-    /**
-     * update the internal digest with the byte b
-     */
-    public void update(
-        byte    b)
-    {
-        digest.update(b);
-
-        if (messageLength < mBuf.length)
-        {
-            mBuf[messageLength] = b;
-        }
-
-        messageLength++;
-    }
-
-    /**
-     * update the internal digest with the byte array in
-     */
-    public void update(
-        byte[]  in,
-        int     off,
-        int     len)
-    {
-        while (len > 0 && messageLength < mBuf.length)
-        {
-            this.update(in[off]);
-            off++;
-            len--;
-        }
-
-        digest.update(in, off, len);
-        messageLength += len;
-    }
-
-    /**
-     * reset the internal state
-     */
-    public void reset()
-    {
-        digest.reset();
-        messageLength = 0;
-        clearBlock(mBuf);
-        
-        if (recoveredMessage != null)
-        {
-            clearBlock(recoveredMessage);
-        }
-        
-        recoveredMessage = null;
-        fullMessage = false;
-
-        if (preSig != null)
-        {
-            preSig = null;
-            clearBlock(preBlock);
-            preBlock = null;
-        }
-    }
-
-    /**
-     * generate a signature for the loaded message using the key we were
-     * initialised with.
-     */
-    public byte[] generateSignature()
-        throws CryptoException
-    {
-        int     digSize = digest.getDigestSize();
-
-        int t = 0;
-        int delta = 0;
-
-        if (trailer == TRAILER_IMPLICIT)
-        {
-            t = 8;
-            delta = block.length - digSize - 1;
-            digest.doFinal(block, delta);
-            block[block.length - 1] = (byte)TRAILER_IMPLICIT;
-        }
-        else
-        {
-            t = 16;
-            delta = block.length - digSize - 2;
-            digest.doFinal(block, delta);
-            block[block.length - 2] = (byte)(trailer >>> 8);
-            block[block.length - 1] = (byte)trailer;
-        }
-
-        byte    header = 0;
-        int     x = (digSize + messageLength) * 8 + t + 4 - keyBits;
-
-        if (x > 0)
-        {
-            int mR = messageLength - ((x + 7) / 8);
-            header = 0x60;
-
-            delta -= mR;
-            
-            System.arraycopy(mBuf, 0, block, delta, mR);
-        }
-        else
-        {
-            header = 0x40;
-            delta -= messageLength;
-            
-            System.arraycopy(mBuf, 0, block, delta, messageLength);
-        }
-        
-        if ((delta - 1) > 0)
-        {
-            for (int i = delta - 1; i != 0; i--)
-            {
-                block[i] = (byte)0xbb;
-            }
-            block[delta - 1] ^= (byte)0x01;
-            block[0] = (byte)0x0b;
-            block[0] |= header;
-        }
-        else
-        {
-            block[0] = (byte)0x0a;
-            block[0] |= header;
-        }
-
-        byte[]  b = cipher.processBlock(block, 0, block.length);
-
-        clearBlock(mBuf);
-        clearBlock(block);
-
-        return b;
-    }
-
-    /**
-     * return true if the signature represents a ISO9796-2 signature
-     * for the passed in message.
-     */
-    public boolean verifySignature(
-        byte[]      signature)
-    {
-        byte[]      block = null;
-
-        if (preSig == null)
-        {
-            try
-            {
-                block = cipher.processBlock(signature, 0, signature.length);
-            }
-            catch (Exception e)
-            {
-                return false;
-            }
-        }
-        else
-        {
-            if (!Arrays.areEqual(preSig, signature))
-            {
-                throw new IllegalStateException("updateWithRecoveredMessage called on different signature");
-            }
-
-            block = preBlock;
-
-            preSig = null;
-            preBlock = null;
-        }
-
-        if (((block[0] & 0xC0) ^ 0x40) != 0)
-        {
-            return returnFalse(block);
-        }
-
-        if (((block[block.length - 1] & 0xF) ^ 0xC) != 0)
-        {
-            return returnFalse(block);
-        }
-
-        int     delta = 0;
-
-        if (((block[block.length - 1] & 0xFF) ^ 0xBC) == 0)
-        {
-            delta = 1;
-        }
-        else
-        {
-            int sigTrail = ((block[block.length - 2] & 0xFF) << 8) | (block[block.length - 1] & 0xFF);
-            Integer trailerObj = (Integer)trailerMap.get(digest.getAlgorithmName());
-
-            if (trailerObj != null)
-            {
-                if (sigTrail != trailerObj.intValue())
-                {
-                    throw new IllegalStateException("signer initialised with wrong digest for trailer " + sigTrail);
-                }
-            }
-            else
-            {
-                throw new IllegalArgumentException("unrecognised hash in signature");
-            }
-
-            delta = 2;
-        }
-
-        //
-        // find out how much padding we've got
-        //
-        int mStart = 0;
-
-        for (mStart = 0; mStart != block.length; mStart++)
-        {
-            if (((block[mStart] & 0x0f) ^ 0x0a) == 0)
-            {
-                break;
-            }
-        }
-
-        mStart++;
-
-        //
-        // check the hashes
-        //
-        byte[]  hash = new byte[digest.getDigestSize()];
-
-        int off = block.length - delta - hash.length;
-
-        //
-        // there must be at least one byte of message string
-        //
-        if ((off - mStart) <= 0)
-        {
-            return returnFalse(block);
-        }
-
-        //
-        // if we contain the whole message as well, check the hash of that.
-        //
-        if ((block[0] & 0x20) == 0)
-        {
-            fullMessage = true;
-
-            // check right number of bytes passed in.
-            if (messageLength > off - mStart)
-            {
-                return returnFalse(block);
-            }
-            
-            digest.reset();
-            digest.update(block, mStart, off - mStart);
-            digest.doFinal(hash, 0);
-
-            boolean isOkay = true;
-
-            for (int i = 0; i != hash.length; i++)
-            {
-                block[off + i] ^= hash[i];
-                if (block[off + i] != 0)
-                {
-                    isOkay = false;
-                }
-            }
-
-            if (!isOkay)
-            {
-                return returnFalse(block);
-            }
-
-            recoveredMessage = new byte[off - mStart];
-            System.arraycopy(block, mStart, recoveredMessage, 0, recoveredMessage.length);
-        }
-        else
-        {
-            fullMessage = false;
-            
-            digest.doFinal(hash, 0);
-
-            boolean isOkay = true;
-
-            for (int i = 0; i != hash.length; i++)
-            {
-                block[off + i] ^= hash[i];
-                if (block[off + i] != 0)
-                {
-                    isOkay = false;
-                }
-            }
-
-            if (!isOkay)
-            {
-                return returnFalse(block);
-            }
-
-            recoveredMessage = new byte[off - mStart];
-            System.arraycopy(block, mStart, recoveredMessage, 0, recoveredMessage.length);
-        }
-
-        //
-        // if they've input a message check what we've recovered against
-        // what was input.
-        //
-        if (messageLength != 0)
-        {
-            if (!isSameAs(mBuf, recoveredMessage))
-            {
-                return returnFalse(block);
-            }
-        }
-        
-        clearBlock(mBuf);
-        clearBlock(block);
-
-        return true;
-    }
-
-    private boolean returnFalse(byte[] block)
-    {
-        clearBlock(mBuf);
-        clearBlock(block);
-
-        return false;
-    }
-
-    /**
-     * Return true if the full message was recoveredMessage.
-     * 
-     * @return true on full message recovery, false otherwise.
-     * @see org.bouncycastle.crypto.SignerWithRecovery#hasFullMessage()
-     */
-    public boolean hasFullMessage()
-    {
-        return fullMessage;
-    }
-
-    /**
-     * Return a reference to the recoveredMessage message.
-     * 
-     * @return the full/partial recoveredMessage message.
-     * @see org.bouncycastle.crypto.SignerWithRecovery#getRecoveredMessage()
-     */
-    public byte[] getRecoveredMessage()
-    {
-        return recoveredMessage;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/signers/PSSSigner.java b/bcprov/src/main/java/org/bouncycastle/crypto/signers/PSSSigner.java
deleted file mode 100644
index 8c9eb94..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/signers/PSSSigner.java
+++ /dev/null
@@ -1,348 +0,0 @@
-package org.bouncycastle.crypto.signers;
-
-import java.security.SecureRandom;
-
-import org.bouncycastle.crypto.AsymmetricBlockCipher;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.CryptoException;
-import org.bouncycastle.crypto.DataLengthException;
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.Signer;
-import org.bouncycastle.crypto.params.ParametersWithRandom;
-import org.bouncycastle.crypto.params.RSABlindingParameters;
-import org.bouncycastle.crypto.params.RSAKeyParameters;
-
-/**
- * RSA-PSS as described in PKCS# 1 v 2.1.
- * <p>
- * Note: the usual value for the salt length is the number of
- * bytes in the hash function.
- */
-public class PSSSigner
-    implements Signer
-{
-    static final public byte   TRAILER_IMPLICIT    = (byte)0xBC;
-
-    private Digest                      contentDigest;
-    private Digest                      mgfDigest;
-    private AsymmetricBlockCipher       cipher;
-    private SecureRandom                random;
-
-    private int                         hLen;
-    private int                         mgfhLen;
-    private int                         sLen;
-    private int                         emBits;
-    private byte[]                      salt;
-    private byte[]                      mDash;
-    private byte[]                      block;
-    private byte                        trailer;
-
-    /**
-     * basic constructor
-     *
-     * @param cipher the asymmetric cipher to use.
-     * @param digest the digest to use.
-     * @param sLen the length of the salt to use (in bytes).
-     */
-    public PSSSigner(
-        AsymmetricBlockCipher   cipher,
-        Digest                  digest,
-        int                     sLen)
-    {
-        this(cipher, digest, sLen, TRAILER_IMPLICIT);
-    }
-
-    public PSSSigner(
-        AsymmetricBlockCipher   cipher,
-        Digest                  contentDigest,
-        Digest                  mgfDigest,
-        int                     sLen)
-    {
-        this(cipher, contentDigest, mgfDigest, sLen, TRAILER_IMPLICIT);
-    }
-
-    public PSSSigner(
-            AsymmetricBlockCipher   cipher,
-            Digest                  digest,
-            int                     sLen,
-            byte                    trailer)
-    {
-        this(cipher, digest, digest, sLen, trailer);
-    }
-
-    public PSSSigner(
-        AsymmetricBlockCipher   cipher,
-        Digest                  contentDigest,
-        Digest                  mgfDigest,
-        int                     sLen,
-        byte                    trailer)
-    {
-        this.cipher = cipher;
-        this.contentDigest = contentDigest;
-        this.mgfDigest = mgfDigest;
-        this.hLen = contentDigest.getDigestSize();
-        this.mgfhLen = mgfDigest.getDigestSize();
-        this.sLen = sLen;
-        this.salt = new byte[sLen];
-        this.mDash = new byte[8 + sLen + hLen];
-        this.trailer = trailer;
-    }
-
-    public void init(
-        boolean                 forSigning,
-        CipherParameters        param)
-    {
-        CipherParameters  params;
-
-        if (param instanceof ParametersWithRandom)
-        {
-            ParametersWithRandom    p = (ParametersWithRandom)param;
-
-            params = p.getParameters();
-            random = p.getRandom();
-        }
-        else
-        {
-            params = param;
-            if (forSigning)
-            {
-                random = new SecureRandom();
-            }
-        }
-
-        cipher.init(forSigning, params);
-
-        RSAKeyParameters kParam;
-
-        if (params instanceof RSABlindingParameters)
-        {
-            kParam = ((RSABlindingParameters)params).getPublicKey();
-        }
-        else
-        {
-            kParam = (RSAKeyParameters)params;
-        }
-        
-        emBits = kParam.getModulus().bitLength() - 1;
-
-        if (emBits < (8 * hLen + 8 * sLen + 9))
-        {
-            throw new IllegalArgumentException("key too small for specified hash and salt lengths");
-        }
-
-        block = new byte[(emBits + 7) / 8];
-
-        reset();
-    }
-
-    /**
-     * clear possible sensitive data
-     */
-    private void clearBlock(
-        byte[]  block)
-    {
-        for (int i = 0; i != block.length; i++)
-        {
-            block[i] = 0;
-        }
-    }
-
-    /**
-     * update the internal digest with the byte b
-     */
-    public void update(
-        byte    b)
-    {
-        contentDigest.update(b);
-    }
-
-    /**
-     * update the internal digest with the byte array in
-     */
-    public void update(
-        byte[]  in,
-        int     off,
-        int     len)
-    {
-        contentDigest.update(in, off, len);
-    }
-
-    /**
-     * reset the internal state
-     */
-    public void reset()
-    {
-        contentDigest.reset();
-    }
-
-    /**
-     * generate a signature for the message we've been loaded with using
-     * the key we were initialised with.
-     */
-    public byte[] generateSignature()
-        throws CryptoException, DataLengthException
-    {
-        contentDigest.doFinal(mDash, mDash.length - hLen - sLen);
-
-        if (sLen != 0)
-        {
-            random.nextBytes(salt);
-
-            System.arraycopy(salt, 0, mDash, mDash.length - sLen, sLen);
-        }
-
-        byte[]  h = new byte[hLen];
-
-        contentDigest.update(mDash, 0, mDash.length);
-
-        contentDigest.doFinal(h, 0);
-
-        block[block.length - sLen - 1 - hLen - 1] = 0x01;
-        System.arraycopy(salt, 0, block, block.length - sLen - hLen - 1, sLen);
-
-        byte[] dbMask = maskGeneratorFunction1(h, 0, h.length, block.length - hLen - 1);
-        for (int i = 0; i != dbMask.length; i++)
-        {
-            block[i] ^= dbMask[i];
-        }
-
-        block[0] &= (0xff >> ((block.length * 8) - emBits));
-
-        System.arraycopy(h, 0, block, block.length - hLen - 1, hLen);
-
-        block[block.length - 1] = trailer;
-
-        byte[]  b = cipher.processBlock(block, 0, block.length);
-
-        clearBlock(block);
-
-        return b;
-    }
-
-    /**
-     * return true if the internal state represents the signature described
-     * in the passed in array.
-     */
-    public boolean verifySignature(
-        byte[]      signature)
-    {
-        contentDigest.doFinal(mDash, mDash.length - hLen - sLen);
-
-        try
-        {
-            byte[] b = cipher.processBlock(signature, 0, signature.length);
-            System.arraycopy(b, 0, block, block.length - b.length, b.length);
-        }
-        catch (Exception e)
-        {
-            return false;
-        }
-
-        if (block[block.length - 1] != trailer)
-        {
-            clearBlock(block);
-            return false;
-        }
-
-        byte[] dbMask = maskGeneratorFunction1(block, block.length - hLen - 1, hLen, block.length - hLen - 1);
-
-        for (int i = 0; i != dbMask.length; i++)
-        {
-            block[i] ^= dbMask[i];
-        }
-
-        block[0] &= (0xff >> ((block.length * 8) - emBits));
-
-        for (int i = 0; i != block.length - hLen - sLen - 2; i++)
-        {
-            if (block[i] != 0)
-            {
-                clearBlock(block);
-                return false;
-            }
-        }
-
-        if (block[block.length - hLen - sLen - 2] != 0x01)
-        {
-            clearBlock(block);
-            return false;
-        }
-
-        System.arraycopy(block, block.length - sLen - hLen - 1, mDash, mDash.length - sLen, sLen);
-
-        contentDigest.update(mDash, 0, mDash.length);
-        contentDigest.doFinal(mDash, mDash.length - hLen);
-
-        for (int i = block.length - hLen - 1, j = mDash.length - hLen;
-                                                 j != mDash.length; i++, j++)
-        {
-            if ((block[i] ^ mDash[j]) != 0)
-            {
-                clearBlock(mDash);
-                clearBlock(block);
-                return false;
-            }
-        }
-
-        clearBlock(mDash);
-        clearBlock(block);
-
-        return true;
-    }
-
-    /**
-     * int to octet string.
-     */
-    private void ItoOSP(
-        int     i,
-        byte[]  sp)
-    {
-        sp[0] = (byte)(i >>> 24);
-        sp[1] = (byte)(i >>> 16);
-        sp[2] = (byte)(i >>> 8);
-        sp[3] = (byte)(i >>> 0);
-    }
-
-    /**
-     * mask generator function, as described in PKCS1v2.
-     */
-    private byte[] maskGeneratorFunction1(
-        byte[]  Z,
-        int     zOff,
-        int     zLen,
-        int     length)
-    {
-        byte[]  mask = new byte[length];
-        byte[]  hashBuf = new byte[mgfhLen];
-        byte[]  C = new byte[4];
-        int     counter = 0;
-
-        mgfDigest.reset();
-
-        while (counter < (length / mgfhLen))
-        {
-            ItoOSP(counter, C);
-
-            mgfDigest.update(Z, zOff, zLen);
-            mgfDigest.update(C, 0, C.length);
-            mgfDigest.doFinal(hashBuf, 0);
-
-            System.arraycopy(hashBuf, 0, mask, counter * mgfhLen, mgfhLen);
-
-            counter++;
-        }
-
-        if ((counter * mgfhLen) < length)
-        {
-            ItoOSP(counter, C);
-
-            mgfDigest.update(Z, zOff, zLen);
-            mgfDigest.update(C, 0, C.length);
-            mgfDigest.doFinal(hashBuf, 0);
-
-            System.arraycopy(hashBuf, 0, mask, counter * mgfhLen, mask.length - (counter * mgfhLen));
-        }
-
-        return mask;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/signers/RSADigestSigner.java b/bcprov/src/main/java/org/bouncycastle/crypto/signers/RSADigestSigner.java
index 69d9918..a8ef959 100644
--- a/bcprov/src/main/java/org/bouncycastle/crypto/signers/RSADigestSigner.java
+++ b/bcprov/src/main/java/org/bouncycastle/crypto/signers/RSADigestSigner.java
@@ -39,9 +39,11 @@ public class RSADigestSigner
      */
     static
     {
-        oidMap.put("RIPEMD128", TeleTrusTObjectIdentifiers.ripemd128);
-        oidMap.put("RIPEMD160", TeleTrusTObjectIdentifiers.ripemd160);
-        oidMap.put("RIPEMD256", TeleTrusTObjectIdentifiers.ripemd256);
+        // BEGIN android-removed
+        // oidMap.put("RIPEMD128", TeleTrusTObjectIdentifiers.ripemd128);
+        // oidMap.put("RIPEMD160", TeleTrusTObjectIdentifiers.ripemd160);
+        // oidMap.put("RIPEMD256", TeleTrusTObjectIdentifiers.ripemd256);
+        // END android-removed
 
         oidMap.put("SHA-1", X509ObjectIdentifiers.id_SHA1);
         oidMap.put("SHA-224", NISTObjectIdentifiers.id_sha224);
@@ -51,8 +53,10 @@ public class RSADigestSigner
         oidMap.put("SHA-512/224", NISTObjectIdentifiers.id_sha512_224);
         oidMap.put("SHA-512/256", NISTObjectIdentifiers.id_sha512_256);
 
-        oidMap.put("MD2", PKCSObjectIdentifiers.md2);
-        oidMap.put("MD4", PKCSObjectIdentifiers.md4);
+        // BEGIN android-removed
+        // oidMap.put("MD2", PKCSObjectIdentifiers.md2);
+        // oidMap.put("MD4", PKCSObjectIdentifiers.md4);
+        // END android-removed
         oidMap.put("MD5", PKCSObjectIdentifiers.md5);
     }
 
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/signers/X931Signer.java b/bcprov/src/main/java/org/bouncycastle/crypto/signers/X931Signer.java
deleted file mode 100644
index 7197404..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/signers/X931Signer.java
+++ /dev/null
@@ -1,269 +0,0 @@
-package org.bouncycastle.crypto.signers;
-
-import java.math.BigInteger;
-import java.util.Hashtable;
-
-import org.bouncycastle.crypto.AsymmetricBlockCipher;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.CryptoException;
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.InvalidCipherTextException;
-import org.bouncycastle.crypto.Signer;
-import org.bouncycastle.crypto.SignerWithRecovery;
-import org.bouncycastle.crypto.params.RSAKeyParameters;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.BigIntegers;
-import org.bouncycastle.util.Integers;
-import org.bouncycastle.util.encoders.Hex;
-
-/**
- * X9.31-1998 - signing using a hash.
- * <p>
- * The message digest hash, H, is encapsulated to form a byte string as follows
- * <pre>
- * EB = 06 || PS || 0xBA || H || TRAILER
- * </pre>
- * where PS is a string of bytes all of value 0xBB of length such that |EB|=|n|, and TRAILER is the ISO/IEC 10118 part number† for the digest. The byte string, EB, is converted to an integer value, the message representative, f.
- */
-public class X931Signer
-    implements Signer
-{
-    static final public int   TRAILER_IMPLICIT    = 0xBC;
-    static final public int   TRAILER_RIPEMD160   = 0x31CC;
-    static final public int   TRAILER_RIPEMD128   = 0x32CC;
-    static final public int   TRAILER_SHA1        = 0x33CC;
-    static final public int   TRAILER_SHA256      = 0x34CC;
-    static final public int   TRAILER_SHA512      = 0x35CC;
-    static final public int   TRAILER_SHA384      = 0x36CC;
-    static final public int   TRAILER_WHIRLPOOL   = 0x37CC;
-    static final public int   TRAILER_SHA224      = 0x38CC;
-
-    private static Hashtable  trailerMap          = new Hashtable();
-
-    static
-    {
-        trailerMap.put("RIPEMD128", Integers.valueOf(TRAILER_RIPEMD128));
-        trailerMap.put("RIPEMD160", Integers.valueOf(TRAILER_RIPEMD160));
-
-        trailerMap.put("SHA-1", Integers.valueOf(TRAILER_SHA1));
-        trailerMap.put("SHA-224", Integers.valueOf(TRAILER_SHA224));
-        trailerMap.put("SHA-256", Integers.valueOf(TRAILER_SHA256));
-        trailerMap.put("SHA-384", Integers.valueOf(TRAILER_SHA384));
-        trailerMap.put("SHA-512", Integers.valueOf(TRAILER_SHA512));
-
-        trailerMap.put("Whirlpool", Integers.valueOf(TRAILER_WHIRLPOOL));
-    }
-
-    private Digest                      digest;
-    private AsymmetricBlockCipher       cipher;
-    private RSAKeyParameters            kParam;
-
-    private int         trailer;
-    private int         keyBits;
-    private byte[]      block;
-
-    /**
-     * Generate a signer for the with either implicit or explicit trailers
-     * for ISO9796-2.
-     *
-     * @param cipher base cipher to use for signature creation/verification
-     * @param digest digest to use.
-     * @param implicit whether or not the trailer is implicit or gives the hash.
-     */
-    public X931Signer(
-        AsymmetricBlockCipher cipher,
-        Digest digest,
-        boolean implicit)
-    {
-        this.cipher = cipher;
-        this.digest = digest;
-
-        if (implicit)
-        {
-            trailer = TRAILER_IMPLICIT;
-        }
-        else
-        {
-            Integer trailerObj = (Integer)trailerMap.get(digest.getAlgorithmName());
-
-            if (trailerObj != null)
-            {
-                trailer = trailerObj.intValue();
-            }
-            else
-            {
-                throw new IllegalArgumentException("no valid trailer for digest");
-            }
-        }
-    }
-
-    /**
-     * Constructor for a signer with an explicit digest trailer.
-     *
-     * @param cipher cipher to use.
-     * @param digest digest to sign with.
-     */
-    public X931Signer(
-        AsymmetricBlockCipher cipher,
-        Digest digest)
-    {
-        this(cipher, digest, false);
-    }
-    
-    public void init(
-        boolean                 forSigning,
-        CipherParameters        param)
-    {
-        kParam = (RSAKeyParameters)param;
-
-        cipher.init(forSigning, kParam);
-
-        keyBits = kParam.getModulus().bitLength();
-
-        block = new byte[(keyBits + 7) / 8];
-
-        reset();
-    }
-    
-    /**
-     * clear possible sensitive data
-     */
-    private void clearBlock(
-        byte[]  block)
-    {
-        for (int i = 0; i != block.length; i++)
-        {
-            block[i] = 0;
-        }
-    }
-
-    /**
-     * update the internal digest with the byte b
-     */
-    public void update(
-        byte    b)
-    {
-        digest.update(b);
-    }
-
-    /**
-     * update the internal digest with the byte array in
-     */
-    public void update(
-        byte[]  in,
-        int     off,
-        int     len)
-    {
-        digest.update(in, off, len);
-    }
-
-    /**
-     * reset the internal state
-     */
-    public void reset()
-    {
-        digest.reset();
-    }
-
-    /**
-     * generate a signature for the loaded message using the key we were
-     * initialised with.
-     */
-    public byte[] generateSignature()
-        throws CryptoException
-    {
-        createSignatureBlock();
-
-        BigInteger t = new BigInteger(1, cipher.processBlock(block, 0, block.length));
-        BigInteger nSubT = kParam.getModulus().subtract(t);
-
-        clearBlock(block);
-
-        BigInteger v = kParam.getModulus().shiftRight(2);
-
-        if (t.compareTo(nSubT) > 0)
-        {
-            return BigIntegers.asUnsignedByteArray((kParam.getModulus().bitLength() + 7) / 8, nSubT);
-        }
-        else
-        {
-            return BigIntegers.asUnsignedByteArray((kParam.getModulus().bitLength() + 7) / 8, t);
-        }
-    }
-
-    private void createSignatureBlock()
-    {
-        int     digSize = digest.getDigestSize();
-
-        int delta;
-
-        if (trailer == TRAILER_IMPLICIT)
-        {
-            delta = block.length - digSize - 1;
-            digest.doFinal(block, delta);
-            block[block.length - 1] = (byte)TRAILER_IMPLICIT;
-        }
-        else
-        {
-            delta = block.length - digSize - 2;
-            digest.doFinal(block, delta);
-            block[block.length - 2] = (byte)(trailer >>> 8);
-            block[block.length - 1] = (byte)trailer;
-        }
-
-        block[0] = 0x6b;
-        for (int i = delta - 2; i != 0; i--)
-        {
-            block[i] = (byte)0xbb;
-        }
-        block[delta - 1] = (byte)0xba;
-    }
-
-    /**
-     * return true if the signature represents a ISO9796-2 signature
-     * for the passed in message.
-     */
-    public boolean verifySignature(
-        byte[]      signature)
-    {
-        try
-        {
-            block = cipher.processBlock(signature, 0, signature.length);
-        }
-        catch (Exception e)
-        {
-            return false;
-        }
-
-        BigInteger t = new BigInteger(block);
-        BigInteger f;
-
-        if (t.mod(BigInteger.valueOf(16)).equals(BigInteger.valueOf(12)))
-        {
-             f = t;
-        }
-        else
-        {
-            t = kParam.getModulus().subtract(t);
-            if (t.mod(BigInteger.valueOf(16)).equals(BigInteger.valueOf(12)))
-            {
-                 f = t;
-            }
-            else
-            {
-                return false;
-            }
-        }
-
-        createSignatureBlock();
-
-        byte[] fBlock = BigIntegers.asUnsignedByteArray(block.length, f);
-
-        boolean rv = Arrays.constantTimeAreEqual(block, fBlock);
-
-        clearBlock(block);
-        clearBlock(fBlock);
-
-        return rv;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/signers/package.html b/bcprov/src/main/java/org/bouncycastle/crypto/signers/package.html
deleted file mode 100644
index 151d3d5..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/signers/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body bgcolor="#ffffff">
-Basic signers.
-</body>
-</html>
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/AEADTestUtil.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/AEADTestUtil.java
deleted file mode 100644
index 5ffa72a..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/AEADTestUtil.java
+++ /dev/null
@@ -1,474 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.DataLengthException;
-import org.bouncycastle.crypto.InvalidCipherTextException;
-import org.bouncycastle.crypto.OutputLengthException;
-import org.bouncycastle.crypto.modes.AEADBlockCipher;
-import org.bouncycastle.crypto.params.AEADParameters;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTestResult;
-import org.bouncycastle.util.test.Test;
-import org.bouncycastle.util.test.TestFailedException;
-
-public class AEADTestUtil
-{
-    public static void testTampering(Test test, AEADBlockCipher cipher, CipherParameters params)
-        throws InvalidCipherTextException
-    {
-        byte[] plaintext = new byte[1000];
-        for (int i = 0; i < plaintext.length; i++)
-        {
-            plaintext[i] = (byte)i;
-        }
-        cipher.init(true, params);
-
-        byte[] ciphertext = new byte[cipher.getOutputSize(plaintext.length)];
-        int len = cipher.processBytes(plaintext, 0, plaintext.length, ciphertext, 0);
-        cipher.doFinal(ciphertext, len);
-
-        int macLength = cipher.getMac().length;
-
-        // Test tampering with a single byte
-        cipher.init(false, params);
-        byte[] tampered = new byte[ciphertext.length];
-        byte[] output = new byte[plaintext.length];
-        System.arraycopy(ciphertext, 0, tampered, 0, tampered.length);
-        tampered[0] += 1;
-
-        cipher.processBytes(tampered, 0, tampered.length, output, 0);
-        try
-        {
-            cipher.doFinal(output, 0);
-            throw new TestFailedException(
-                new SimpleTestResult(false, test + " : tampering of ciphertext not detected."));
-        }
-        catch (InvalidCipherTextException e)
-        {
-            // Expected
-        }
-
-        // Test truncation of ciphertext to < tag length
-        cipher.init(false, params);
-        byte[] truncated = new byte[macLength - 1];
-        System.arraycopy(ciphertext, 0, truncated, 0, truncated.length);
-
-        cipher.processBytes(truncated, 0, truncated.length, output, 0);
-        try
-        {
-            cipher.doFinal(output, 0);
-            fail(test, "tampering of ciphertext not detected.");
-        }
-        catch (InvalidCipherTextException e)
-        {
-            // Expected
-        }
-    }
-
-    private static void fail(Test test, String message)
-    {
-        throw new TestFailedException(SimpleTestResult.failed(test, message));
-    }
-
-    private static void fail(Test test, String message, String expected, String result)
-    {
-        throw new TestFailedException(SimpleTestResult.failed(test, message, expected, result));
-    }
-
-    public static void testReset(Test test, AEADBlockCipher cipher1, AEADBlockCipher cipher2, CipherParameters params)
-        throws InvalidCipherTextException
-    {
-        cipher1.init(true, params);
-
-        byte[] plaintext = new byte[1000];
-        byte[] ciphertext = new byte[cipher1.getOutputSize(plaintext.length)];
-
-        // Establish baseline answer
-        crypt(cipher1, plaintext, ciphertext);
-
-        // Test encryption resets
-        checkReset(test, cipher1, params, true, plaintext, ciphertext);
-
-        // Test decryption resets with fresh instance
-        cipher2.init(false, params);
-        checkReset(test, cipher2, params, false, ciphertext, plaintext);
-    }
-
-    private static void checkReset(Test test,
-                                   AEADBlockCipher cipher,
-                                   CipherParameters params,
-                                   boolean encrypt,
-                                   byte[] pretext,
-                                   byte[] posttext)
-        throws InvalidCipherTextException
-    {
-        // Do initial run
-        byte[] output = new byte[posttext.length];
-        crypt(cipher, pretext, output);
-
-        // Check encrypt resets cipher
-        crypt(cipher, pretext, output);
-        if (!Arrays.areEqual(output, posttext))
-        {
-            fail(test, (encrypt ? "Encrypt" : "Decrypt") + " did not reset cipher.");
-        }
-
-        // Check init resets data
-        cipher.processBytes(pretext, 0, 100, output, 0);
-        cipher.init(encrypt, params);
-
-        try
-        {
-            crypt(cipher, pretext, output);
-        }
-        catch (DataLengthException e)
-        {
-            fail(test, "Init did not reset data.");
-        }
-        if (!Arrays.areEqual(output, posttext))
-        {
-            fail(test, "Init did not reset data.", new String(Hex.encode(posttext)), new String(Hex.encode(output)));
-        }
-
-        // Check init resets AD
-        cipher.processAADBytes(pretext, 0, 100);
-        cipher.init(encrypt, params);
-
-        try
-        {
-            crypt(cipher, pretext, output);
-        }
-        catch (DataLengthException e)
-        {
-            fail(test, "Init did not reset additional data.");
-        }
-        if (!Arrays.areEqual(output, posttext))
-        {
-            fail(test, "Init did not reset additional data.");
-        }
-
-        // Check reset resets data
-        cipher.processBytes(pretext, 0, 100, output, 0);
-        cipher.reset();
-
-        try
-        {
-            crypt(cipher, pretext, output);
-        }
-        catch (DataLengthException e)
-        {
-            fail(test, "Init did not reset data.");
-        }
-        if (!Arrays.areEqual(output, posttext))
-        {
-            fail(test, "Reset did not reset data.");
-        }
-
-        // Check reset resets AD
-        cipher.processAADBytes(pretext, 0, 100);
-        cipher.reset();
-
-        try
-        {
-            crypt(cipher, pretext, output);
-        }
-        catch (DataLengthException e)
-        {
-            fail(test, "Init did not reset data.");
-        }
-        if (!Arrays.areEqual(output, posttext))
-        {
-            fail(test, "Reset did not reset additional data.");
-        }
-    }
-
-    private static void crypt(AEADBlockCipher cipher, byte[] plaintext, byte[] output)
-        throws InvalidCipherTextException
-    {
-        int len = cipher.processBytes(plaintext, 0, plaintext.length, output, 0);
-        cipher.doFinal(output, len);
-    }
-
-    public static void testOutputSizes(Test test, AEADBlockCipher cipher, AEADParameters params)
-        throws IllegalStateException,
-        InvalidCipherTextException
-    {
-        int maxPlaintext = cipher.getUnderlyingCipher().getBlockSize() * 10;
-        byte[] plaintext = new byte[maxPlaintext];
-        byte[] ciphertext = new byte[maxPlaintext * 2];
-
-        // Check output size calculations for truncated ciphertext lengths
-        cipher.init(true, params);
-        cipher.doFinal(ciphertext, 0);
-        int macLength = cipher.getMac().length;
-
-        cipher.init(false, params);
-        for (int i = 0; i < macLength; i++)
-        {
-            cipher.reset();
-            if (cipher.getUpdateOutputSize(i) != 0)
-            {
-                fail(test, "AE cipher should not produce update output with ciphertext length <= macSize");
-            }
-            if (cipher.getOutputSize(i) != 0)
-            {
-                fail(test, "AE cipher should not produce output with ciphertext length <= macSize");
-            }
-        }
-
-        for (int i = 0; i < plaintext.length; i++)
-        {
-            cipher.init(true, params);
-            int expectedCTUpdateSize = cipher.getUpdateOutputSize(i);
-            int expectedCTOutputSize = cipher.getOutputSize(i);
-
-            if (expectedCTUpdateSize < 0)
-            {
-                fail(test, "Encryption update output size should not be < 0 for size " + i);
-            }
-
-            if (expectedCTOutputSize < 0)
-            {
-                fail(test, "Encryption update output size should not be < 0 for size " + i);
-            }
-
-            int actualCTSize = cipher.processBytes(plaintext, 0, i, ciphertext, 0);
-
-            if (expectedCTUpdateSize != actualCTSize)
-            {
-                fail(test, "Encryption update output size did not match calculated for plaintext length " + i,
-                        String.valueOf(expectedCTUpdateSize), String.valueOf(actualCTSize));
-            }
-
-            actualCTSize += cipher.doFinal(ciphertext, actualCTSize);
-
-            if (expectedCTOutputSize != actualCTSize)
-            {
-                fail(test, "Encryption actual final output size did not match calculated for plaintext length " + i,
-                        String.valueOf(expectedCTOutputSize), String.valueOf(actualCTSize));
-            }
-
-            cipher.init(false, params);
-            int expectedPTUpdateSize = cipher.getUpdateOutputSize(actualCTSize);
-            int expectedPTOutputSize = cipher.getOutputSize(actualCTSize);
-
-            if (expectedPTOutputSize != i)
-            {
-                fail(test, "Decryption update output size did not original plaintext length " + i,
-                        String.valueOf(expectedPTUpdateSize), String.valueOf(i));
-            }
-
-            int actualPTSize = cipher.processBytes(ciphertext, 0, actualCTSize, plaintext, 0);
-
-            if (expectedPTUpdateSize != actualPTSize)
-            {
-                fail(test, "Decryption update output size did not match calculated for plaintext length " + i,
-                        String.valueOf(expectedPTUpdateSize), String.valueOf(actualPTSize));
-            }
-
-            actualPTSize += cipher.doFinal(plaintext, actualPTSize);
-
-            if (expectedPTOutputSize != actualPTSize)
-            {
-                fail(test, "Decryption update output size did not match calculated for plaintext length " + i,
-                        String.valueOf(expectedPTOutputSize), String.valueOf(actualPTSize));
-            }
-
-        }
-    }
-
-    public static void testBufferSizeChecks(Test test, AEADBlockCipher cipher, AEADParameters params)
-        throws IllegalStateException,
-        InvalidCipherTextException
-    {
-        int blockSize = cipher.getUnderlyingCipher().getBlockSize();
-        int maxPlaintext = (blockSize * 10);
-        byte[] plaintext = new byte[maxPlaintext];
-
-
-        cipher.init(true, params);
-
-        int expectedUpdateOutputSize = cipher.getUpdateOutputSize(plaintext.length);
-        byte[] ciphertext = new byte[cipher.getOutputSize(plaintext.length)];
-
-        try
-        {
-            cipher.processBytes(new byte[maxPlaintext - 1], 0, maxPlaintext, new byte[expectedUpdateOutputSize], 0);
-            fail(test, "processBytes should validate input buffer length");
-        }
-        catch (DataLengthException e)
-        {
-            // Expected
-        }
-        cipher.reset();
-
-        if (expectedUpdateOutputSize > 0)
-        {
-            int outputTrigger = 0;
-            // Process bytes until output would be produced
-            for(int i = 0; i < plaintext.length; i++) {
-                if (cipher.getUpdateOutputSize(1) != 0)
-                {
-                    outputTrigger = i + 1;
-                    break;
-                }
-                cipher.processByte(plaintext[i], ciphertext, 0);
-            }
-            if (outputTrigger == 0)
-            {
-                fail(test, "Failed to find output trigger size");
-            }
-            try
-            {
-                cipher.processByte(plaintext[0], new byte[cipher.getUpdateOutputSize(1) - 1], 0);
-                fail(test, "Encrypt processByte should validate output buffer length");
-            }
-            catch (OutputLengthException e)
-            {
-                // Expected
-            }
-            cipher.reset();
-
-            // Repeat checking with entire input at once
-            try
-            {
-                cipher.processBytes(plaintext, 0, outputTrigger,
-                        new byte[cipher.getUpdateOutputSize(outputTrigger) - 1], 0);
-                fail(test, "Encrypt processBytes should validate output buffer length");
-            }
-            catch (OutputLengthException e)
-            {
-                // Expected
-            }
-            cipher.reset();
-
-        }
-
-        // Remember the actual ciphertext for later
-        int actualOutputSize = cipher.processBytes(plaintext, 0, plaintext.length, ciphertext, 0);
-        actualOutputSize += cipher.doFinal(ciphertext, actualOutputSize);
-        int macSize = cipher.getMac().length;
-
-        cipher.reset();
-        try
-        {
-            cipher.processBytes(plaintext, 0, plaintext.length, ciphertext, 0);
-            cipher.doFinal(new byte[cipher.getOutputSize(0) - 1], 0);
-            fail(test, "Encrypt doFinal should validate output buffer length");
-        }
-        catch (OutputLengthException e)
-        {
-            // Expected
-        }
-
-        // Decryption tests
-
-        cipher.init(false, params);
-        expectedUpdateOutputSize = cipher.getUpdateOutputSize(actualOutputSize);
-
-        if (expectedUpdateOutputSize > 0)
-        {
-            // Process bytes until output would be produced
-            int outputTrigger = 0;
-            for (int i = 0; i < plaintext.length; i++)
-            {
-                if (cipher.getUpdateOutputSize(1) != 0)
-                {
-                    outputTrigger = i + 1;
-                    break;
-                }
-                cipher.processByte(ciphertext[i], plaintext, 0);
-            }
-            if (outputTrigger == 0)
-            {
-                fail(test, "Failed to find output trigger size");
-            }
-
-            try
-            {
-                cipher.processByte(ciphertext[0], new byte[cipher.getUpdateOutputSize(1) - 1], 0);
-                fail(test, "Decrypt processByte should validate output buffer length");
-            }
-            catch (OutputLengthException e)
-            {
-                // Expected
-            }
-            cipher.reset();
-
-            // Repeat test with processBytes
-            try
-            {
-                cipher.processBytes(ciphertext, 0, outputTrigger,
-                        new byte[cipher.getUpdateOutputSize(outputTrigger) - 1], 0);
-                fail(test, "Decrypt processBytes should validate output buffer length");
-            }
-            catch (OutputLengthException e)
-            {
-                // Expected
-            }
-        }
-
-        cipher.reset();
-        // Data less than mac length should fail before output length check
-        try
-        {
-            // Assumes AE cipher on decrypt can't return any data until macSize bytes are received
-            if (cipher.processBytes(ciphertext, 0, macSize - 1, plaintext, 0) != 0)
-            {
-                fail(test, "AE cipher unexpectedly produced output");
-            }
-            cipher.doFinal(new byte[0], 0);
-            fail(test, "Decrypt doFinal should check ciphertext length");
-        }
-        catch (InvalidCipherTextException e)
-        {
-            // Expected
-        }
-
-        try
-        {
-            // Search through plaintext lengths until one is found that creates >= 1 buffered byte
-            // during decryption of ciphertext for doFinal to handle
-            for (int i = 2; i < plaintext.length; i++)
-            {
-                cipher.init(true, params);
-                int encrypted = cipher.processBytes(plaintext, 0, i, ciphertext, 0);
-                encrypted += cipher.doFinal(ciphertext, encrypted);
-
-                cipher.init(false, params);
-                cipher.processBytes(ciphertext, 0, encrypted - 1, plaintext, 0);
-                if (cipher.processByte(ciphertext[encrypted - 1], plaintext, 0) == 0)
-                {
-                    cipher.doFinal(new byte[cipher.getOutputSize(0) - 1], 0);
-                    fail(test, "Decrypt doFinal should check output length");
-                    cipher.reset();
-
-                    // Truncated Mac should be reported in preference to inability to output
-                    // buffered plaintext byte
-                    try
-                    {
-                        cipher.processBytes(ciphertext, 0, actualOutputSize - 1, plaintext, 0);
-                        cipher.doFinal(new byte[cipher.getOutputSize(0) - 1], 0);
-                        fail(test, "Decrypt doFinal should check ciphertext length");
-                    }
-                    catch (InvalidCipherTextException e)
-                    {
-                        // Expected
-                    }
-                    cipher.reset();
-                }
-            }
-            fail(test, "Decrypt doFinal test couldn't find a ciphertext length that buffered for doFinal");
-        }
-        catch (OutputLengthException e)
-        {
-            // Expected
-        }
-    }
-
-    static AEADParameters reuseKey(AEADParameters p)
-    {
-        return new AEADParameters(null, p.getMacSize(), p.getNonce(), p.getAssociatedText());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/AESFastTest.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/AESFastTest.java
deleted file mode 100644
index c94b118..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/AESFastTest.java
+++ /dev/null
@@ -1,150 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import org.bouncycastle.crypto.BlockCipher;
-import org.bouncycastle.crypto.engines.AESFastEngine;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.crypto.params.ParametersWithIV;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-
-/**
- * Test vectors from the NIST standard tests and Brian Gladman's vector set
- * <a href="http://fp.gladman.plus.com/cryptography_technology/rijndael/">
- * http://fp.gladman.plus.com/cryptography_technology/rijndael/</a>
- */
-public class AESFastTest
-    extends CipherTest
-{
-    static SimpleTest[]  tests = 
-            {
-                new BlockCipherVectorTest(0, new AESFastEngine(),
-                        new KeyParameter(Hex.decode("80000000000000000000000000000000")),
-                        "00000000000000000000000000000000", "0EDD33D3C621E546455BD8BA1418BEC8"),
-                new BlockCipherVectorTest(1, new AESFastEngine(),
-                        new KeyParameter(Hex.decode("00000000000000000000000000000080")),
-                        "00000000000000000000000000000000", "172AEAB3D507678ECAF455C12587ADB7"),
-                new BlockCipherMonteCarloTest(2, 10000, new AESFastEngine(),
-                        new KeyParameter(Hex.decode("00000000000000000000000000000000")),
-                        "00000000000000000000000000000000", "C34C052CC0DA8D73451AFE5F03BE297F"),
-                new BlockCipherMonteCarloTest(3, 10000, new AESFastEngine(),
-                        new KeyParameter(Hex.decode("5F060D3716B345C253F6749ABAC10917")),
-                        "355F697E8B868B65B25A04E18D782AFA", "ACC863637868E3E068D2FD6E3508454A"),
-                new BlockCipherVectorTest(4, new AESFastEngine(),
-                        new KeyParameter(Hex.decode("000000000000000000000000000000000000000000000000")),
-                        "80000000000000000000000000000000", "6CD02513E8D4DC986B4AFE087A60BD0C"),
-                new BlockCipherMonteCarloTest(5, 10000, new AESFastEngine(),
-                        new KeyParameter(Hex.decode("AAFE47EE82411A2BF3F6752AE8D7831138F041560631B114")),
-                        "F3F6752AE8D7831138F041560631B114", "77BA00ED5412DFF27C8ED91F3C376172"),
-                new BlockCipherVectorTest(6, new AESFastEngine(),
-                        new KeyParameter(Hex.decode("0000000000000000000000000000000000000000000000000000000000000000")),
-                        "80000000000000000000000000000000", "DDC6BF790C15760D8D9AEB6F9A75FD4E"),
-                new BlockCipherMonteCarloTest(7, 10000, new AESFastEngine(),
-                        new KeyParameter(Hex.decode("28E79E2AFC5F7745FCCABE2F6257C2EF4C4EDFB37324814ED4137C288711A386")),
-                        "C737317FE0846F132B23C8C2A672CE22", "E58B82BFBA53C0040DC610C642121168"),
-                new BlockCipherVectorTest(8, new AESFastEngine(),
-                        new KeyParameter(Hex.decode("80000000000000000000000000000000")),
-                        "00000000000000000000000000000000", "0EDD33D3C621E546455BD8BA1418BEC8"),
-                new BlockCipherVectorTest(9, new AESFastEngine(),
-                        new KeyParameter(Hex.decode("00000000000000000000000000000080")),
-                        "00000000000000000000000000000000", "172AEAB3D507678ECAF455C12587ADB7"),
-                new BlockCipherMonteCarloTest(10, 10000, new AESFastEngine(),
-                        new KeyParameter(Hex.decode("00000000000000000000000000000000")),
-                        "00000000000000000000000000000000", "C34C052CC0DA8D73451AFE5F03BE297F"),
-                new BlockCipherMonteCarloTest(11, 10000, new AESFastEngine(),
-                        new KeyParameter(Hex.decode("5F060D3716B345C253F6749ABAC10917")),
-                        "355F697E8B868B65B25A04E18D782AFA", "ACC863637868E3E068D2FD6E3508454A"),
-                new BlockCipherVectorTest(12, new AESFastEngine(),
-                        new KeyParameter(Hex.decode("000000000000000000000000000000000000000000000000")),
-                        "80000000000000000000000000000000", "6CD02513E8D4DC986B4AFE087A60BD0C"),
-                new BlockCipherMonteCarloTest(13, 10000, new AESFastEngine(),
-                        new KeyParameter(Hex.decode("AAFE47EE82411A2BF3F6752AE8D7831138F041560631B114")),
-                        "F3F6752AE8D7831138F041560631B114", "77BA00ED5412DFF27C8ED91F3C376172"),
-                new BlockCipherVectorTest(14, new AESFastEngine(),
-                        new KeyParameter(Hex.decode("0000000000000000000000000000000000000000000000000000000000000000")),
-                        "80000000000000000000000000000000", "DDC6BF790C15760D8D9AEB6F9A75FD4E"),
-                new BlockCipherMonteCarloTest(15, 10000, new AESFastEngine(),
-                        new KeyParameter(Hex.decode("28E79E2AFC5F7745FCCABE2F6257C2EF4C4EDFB37324814ED4137C288711A386")),
-                        "C737317FE0846F132B23C8C2A672CE22", "E58B82BFBA53C0040DC610C642121168"),
-                new BlockCipherVectorTest(16, new AESFastEngine(),
-                        new KeyParameter(Hex.decode("80000000000000000000000000000000")),
-                        "00000000000000000000000000000000", "0EDD33D3C621E546455BD8BA1418BEC8"),
-                new BlockCipherVectorTest(17, new AESFastEngine(),
-                        new KeyParameter(Hex.decode("00000000000000000000000000000080")),
-                        "00000000000000000000000000000000", "172AEAB3D507678ECAF455C12587ADB7"),
-                new BlockCipherMonteCarloTest(18, 10000, new AESFastEngine(),
-                        new KeyParameter(Hex.decode("00000000000000000000000000000000")),
-                        "00000000000000000000000000000000", "C34C052CC0DA8D73451AFE5F03BE297F"),
-                new BlockCipherMonteCarloTest(19, 10000, new AESFastEngine(),
-                        new KeyParameter(Hex.decode("5F060D3716B345C253F6749ABAC10917")),
-                        "355F697E8B868B65B25A04E18D782AFA", "ACC863637868E3E068D2FD6E3508454A"),
-                new BlockCipherVectorTest(20, new AESFastEngine(),
-                        new KeyParameter(Hex.decode("000000000000000000000000000000000000000000000000")),
-                        "80000000000000000000000000000000", "6CD02513E8D4DC986B4AFE087A60BD0C"),
-                new BlockCipherMonteCarloTest(21, 10000, new AESFastEngine(),
-                        new KeyParameter(Hex.decode("AAFE47EE82411A2BF3F6752AE8D7831138F041560631B114")),
-                        "F3F6752AE8D7831138F041560631B114", "77BA00ED5412DFF27C8ED91F3C376172"),
-                new BlockCipherVectorTest(22, new AESFastEngine(),
-                        new KeyParameter(Hex.decode("0000000000000000000000000000000000000000000000000000000000000000")),
-                        "80000000000000000000000000000000", "DDC6BF790C15760D8D9AEB6F9A75FD4E"),
-                new BlockCipherMonteCarloTest(23, 10000, new AESFastEngine(),
-                        new KeyParameter(Hex.decode("28E79E2AFC5F7745FCCABE2F6257C2EF4C4EDFB37324814ED4137C288711A386")),
-                        "C737317FE0846F132B23C8C2A672CE22", "E58B82BFBA53C0040DC610C642121168")
-            };
-    
-    private BlockCipher _engine = new AESFastEngine();
-
-    AESFastTest()
-    {
-        super(tests, new AESFastEngine(), new KeyParameter(new byte[16]));
-    }
-
-    public String getName()
-    {
-        return "AESFast";
-    }
-
-    public void performTest()
-        throws Exception
-    {
-        super.performTest();
-
-        byte[] keyBytes = new byte[16];
-        
-        _engine.init(true, new KeyParameter(keyBytes));
-        
-        //
-        // init tests
-        //
-        try
-        {
-            byte[]      dudKey = new byte[6];
-            
-            _engine.init(true, new KeyParameter(dudKey));
-            
-            fail("failed key length check");
-        }
-        catch (IllegalArgumentException e)
-        {
-            // expected 
-        }
-        
-        try
-        {
-            byte[]      iv = new byte[16];
-
-            _engine.init(true, new ParametersWithIV(null, iv));
-            
-            fail("failed parameter check");
-        }
-        catch (IllegalArgumentException e)
-        {
-            // expected 
-        }
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        runTest(new AESFastTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/AESLightTest.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/AESLightTest.java
deleted file mode 100644
index 5e989f4..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/AESLightTest.java
+++ /dev/null
@@ -1,150 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import org.bouncycastle.crypto.BlockCipher;
-import org.bouncycastle.crypto.engines.AESLightEngine;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.crypto.params.ParametersWithIV;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-
-/**
- * Test vectors from the NIST standard tests and Brian Gladman's vector set
- * <a href="http://fp.gladman.plus.com/cryptography_technology/rijndael/">
- * http://fp.gladman.plus.com/cryptography_technology/rijndael/</a>
- */
-public class AESLightTest
-    extends CipherTest
-{
-    static SimpleTest[]  tests = 
-            {
-                new BlockCipherVectorTest(0, new AESLightEngine(),
-                        new KeyParameter(Hex.decode("80000000000000000000000000000000")),
-                        "00000000000000000000000000000000", "0EDD33D3C621E546455BD8BA1418BEC8"),
-                new BlockCipherVectorTest(1, new AESLightEngine(),
-                        new KeyParameter(Hex.decode("00000000000000000000000000000080")),
-                        "00000000000000000000000000000000", "172AEAB3D507678ECAF455C12587ADB7"),
-                new BlockCipherMonteCarloTest(2, 10000, new AESLightEngine(),
-                        new KeyParameter(Hex.decode("00000000000000000000000000000000")),
-                        "00000000000000000000000000000000", "C34C052CC0DA8D73451AFE5F03BE297F"),
-                new BlockCipherMonteCarloTest(3, 10000, new AESLightEngine(),
-                        new KeyParameter(Hex.decode("5F060D3716B345C253F6749ABAC10917")),
-                        "355F697E8B868B65B25A04E18D782AFA", "ACC863637868E3E068D2FD6E3508454A"),
-                new BlockCipherVectorTest(4, new AESLightEngine(),
-                        new KeyParameter(Hex.decode("000000000000000000000000000000000000000000000000")),
-                        "80000000000000000000000000000000", "6CD02513E8D4DC986B4AFE087A60BD0C"),
-                new BlockCipherMonteCarloTest(5, 10000, new AESLightEngine(),
-                        new KeyParameter(Hex.decode("AAFE47EE82411A2BF3F6752AE8D7831138F041560631B114")),
-                        "F3F6752AE8D7831138F041560631B114", "77BA00ED5412DFF27C8ED91F3C376172"),
-                new BlockCipherVectorTest(6, new AESLightEngine(),
-                        new KeyParameter(Hex.decode("0000000000000000000000000000000000000000000000000000000000000000")),
-                        "80000000000000000000000000000000", "DDC6BF790C15760D8D9AEB6F9A75FD4E"),
-                new BlockCipherMonteCarloTest(7, 10000, new AESLightEngine(),
-                        new KeyParameter(Hex.decode("28E79E2AFC5F7745FCCABE2F6257C2EF4C4EDFB37324814ED4137C288711A386")),
-                        "C737317FE0846F132B23C8C2A672CE22", "E58B82BFBA53C0040DC610C642121168"),
-                new BlockCipherVectorTest(8, new AESLightEngine(),
-                        new KeyParameter(Hex.decode("80000000000000000000000000000000")),
-                        "00000000000000000000000000000000", "0EDD33D3C621E546455BD8BA1418BEC8"),
-                new BlockCipherVectorTest(9, new AESLightEngine(),
-                        new KeyParameter(Hex.decode("00000000000000000000000000000080")),
-                        "00000000000000000000000000000000", "172AEAB3D507678ECAF455C12587ADB7"),
-                new BlockCipherMonteCarloTest(10, 10000, new AESLightEngine(),
-                        new KeyParameter(Hex.decode("00000000000000000000000000000000")),
-                        "00000000000000000000000000000000", "C34C052CC0DA8D73451AFE5F03BE297F"),
-                new BlockCipherMonteCarloTest(11, 10000, new AESLightEngine(),
-                        new KeyParameter(Hex.decode("5F060D3716B345C253F6749ABAC10917")),
-                        "355F697E8B868B65B25A04E18D782AFA", "ACC863637868E3E068D2FD6E3508454A"),
-                new BlockCipherVectorTest(12, new AESLightEngine(),
-                        new KeyParameter(Hex.decode("000000000000000000000000000000000000000000000000")),
-                        "80000000000000000000000000000000", "6CD02513E8D4DC986B4AFE087A60BD0C"),
-                new BlockCipherMonteCarloTest(13, 10000, new AESLightEngine(),
-                        new KeyParameter(Hex.decode("AAFE47EE82411A2BF3F6752AE8D7831138F041560631B114")),
-                        "F3F6752AE8D7831138F041560631B114", "77BA00ED5412DFF27C8ED91F3C376172"),
-                new BlockCipherVectorTest(14, new AESLightEngine(),
-                        new KeyParameter(Hex.decode("0000000000000000000000000000000000000000000000000000000000000000")),
-                        "80000000000000000000000000000000", "DDC6BF790C15760D8D9AEB6F9A75FD4E"),
-                new BlockCipherMonteCarloTest(15, 10000, new AESLightEngine(),
-                        new KeyParameter(Hex.decode("28E79E2AFC5F7745FCCABE2F6257C2EF4C4EDFB37324814ED4137C288711A386")),
-                        "C737317FE0846F132B23C8C2A672CE22", "E58B82BFBA53C0040DC610C642121168"),
-                new BlockCipherVectorTest(16, new AESLightEngine(),
-                        new KeyParameter(Hex.decode("80000000000000000000000000000000")),
-                        "00000000000000000000000000000000", "0EDD33D3C621E546455BD8BA1418BEC8"),
-                new BlockCipherVectorTest(17, new AESLightEngine(),
-                        new KeyParameter(Hex.decode("00000000000000000000000000000080")),
-                        "00000000000000000000000000000000", "172AEAB3D507678ECAF455C12587ADB7"),
-                new BlockCipherMonteCarloTest(18, 10000, new AESLightEngine(),
-                        new KeyParameter(Hex.decode("00000000000000000000000000000000")),
-                        "00000000000000000000000000000000", "C34C052CC0DA8D73451AFE5F03BE297F"),
-                new BlockCipherMonteCarloTest(19, 10000, new AESLightEngine(),
-                        new KeyParameter(Hex.decode("5F060D3716B345C253F6749ABAC10917")),
-                        "355F697E8B868B65B25A04E18D782AFA", "ACC863637868E3E068D2FD6E3508454A"),
-                new BlockCipherVectorTest(20, new AESLightEngine(),
-                        new KeyParameter(Hex.decode("000000000000000000000000000000000000000000000000")),
-                        "80000000000000000000000000000000", "6CD02513E8D4DC986B4AFE087A60BD0C"),
-                new BlockCipherMonteCarloTest(21, 10000, new AESLightEngine(),
-                        new KeyParameter(Hex.decode("AAFE47EE82411A2BF3F6752AE8D7831138F041560631B114")),
-                        "F3F6752AE8D7831138F041560631B114", "77BA00ED5412DFF27C8ED91F3C376172"),
-                new BlockCipherVectorTest(22, new AESLightEngine(),
-                        new KeyParameter(Hex.decode("0000000000000000000000000000000000000000000000000000000000000000")),
-                        "80000000000000000000000000000000", "DDC6BF790C15760D8D9AEB6F9A75FD4E"),
-                new BlockCipherMonteCarloTest(23, 10000, new AESLightEngine(),
-                        new KeyParameter(Hex.decode("28E79E2AFC5F7745FCCABE2F6257C2EF4C4EDFB37324814ED4137C288711A386")),
-                        "C737317FE0846F132B23C8C2A672CE22", "E58B82BFBA53C0040DC610C642121168")
-            };
-    
-    private BlockCipher _engine = new AESLightEngine();
-
-    AESLightTest()
-    {
-        super(tests, new AESLightEngine(), new KeyParameter(new byte[16]));
-    }
-
-    public String getName()
-    {
-        return "AESLight";
-    }
-
-    public void performTest()
-        throws Exception
-    {
-        super.performTest();
-
-        byte[] keyBytes = new byte[16];
-        
-        _engine.init(true, new KeyParameter(keyBytes));
-        
-        //
-        // init tests
-        //
-        try
-        {
-            byte[]      dudKey = new byte[6];
-            
-            _engine.init(true, new KeyParameter(dudKey));
-            
-            fail("failed key length check");
-        }
-        catch (IllegalArgumentException e)
-        {
-            // expected 
-        }
-        
-        try
-        {
-            byte[]      iv = new byte[16];
-
-            _engine.init(true, new ParametersWithIV(null, iv));
-            
-            fail("failed parameter check");
-        }
-        catch (IllegalArgumentException e)
-        {
-            // expected 
-        }
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        runTest(new AESLightTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/AESTest.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/AESTest.java
deleted file mode 100644
index 5585d8c..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/AESTest.java
+++ /dev/null
@@ -1,442 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import java.security.SecureRandom;
-
-import org.bouncycastle.crypto.BlockCipher;
-import org.bouncycastle.crypto.BufferedBlockCipher;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.InvalidCipherTextException;
-import org.bouncycastle.crypto.engines.AESEngine;
-import org.bouncycastle.crypto.modes.CBCBlockCipher;
-import org.bouncycastle.crypto.modes.CFBBlockCipher;
-import org.bouncycastle.crypto.modes.OFBBlockCipher;
-import org.bouncycastle.crypto.modes.SICBlockCipher;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.crypto.params.ParametersWithIV;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-
-/**
- * Test vectors from the NIST standard tests and Brian Gladman's vector set
- * <a href="http://fp.gladman.plus.com/cryptography_technology/rijndael/">
- * http://fp.gladman.plus.com/cryptography_technology/rijndael/</a>
- */
-public class AESTest
-    extends CipherTest
-{
-    private static final byte[] tData   = Hex.decode("AAFE47EE82411A2BF3F6752AE8D7831138F041560631B114F3F6752AE8D7831138F041560631B1145A01020304050607");
-    private static final byte[] outCBC1 = Hex.decode("a444a9a4d46eb30cb7ed34d62873a89f8fdf2bf8a54e1aeadd06fd85c9cb46f021ee7cd4f418fa0bb72e9d07c70d5d20");
-    private static final byte[] outCBC2 = Hex.decode("585681354f0e01a86b32f94ebb6a675045d923cf201263c2aaecca2b4de82da0edd74ca5efd654c688f8a58e61955b11");
-    private static final byte[] outSIC1 = Hex.decode("82a1744e8ebbd053ca72362d5e570326e0b6fdaf824ab673fbf029042886b23c75129a015852913790f81f94447475a0");
-    private static final byte[] outSIC2 = Hex.decode("146cbb581d9e12c3333dd9c736fbb93043c92019f78580da48f81f80b3f551d58ea836fed480fc6912fefa9c5c89cc24");
-    private static final byte[] outCFB1 = Hex.decode("82a1744e8ebbd053ca72362d5e5703264b4182de3208c374b8ac4fa36af9c5e5f4f87d1e3b67963d06acf5eb13914c90");
-    private static final byte[] outCFB2 = Hex.decode("146cbb581d9e12c3333dd9c736fbb9303c8a3eb5185e2809e9d3c28e25cc2d2b6f5c11ee28d6530f72c412b1438a816a");
-    private static final byte[] outOFB1 = Hex.decode("82a1744e8ebbd053ca72362d5e5703261ebf1fdbec05e57b3465b583132f84b43bf95b2c89040ad1677b22d42db69a7a");
-    private static final byte[] outOFB2 = Hex.decode("146cbb581d9e12c3333dd9c736fbb9309ea4c2a7696c84959a2dada49f2f1c5905db1f0cec3a31acbc4701e74ab05e1f");
-
-    static SimpleTest[]  tests = 
-            {
-                new BlockCipherVectorTest(0, new AESEngine(),
-                        new KeyParameter(Hex.decode("80000000000000000000000000000000")),
-                        "00000000000000000000000000000000", "0EDD33D3C621E546455BD8BA1418BEC8"),
-                new BlockCipherVectorTest(1, new AESEngine(),
-                        new KeyParameter(Hex.decode("00000000000000000000000000000080")),
-                        "00000000000000000000000000000000", "172AEAB3D507678ECAF455C12587ADB7"),
-                new BlockCipherMonteCarloTest(2, 10000, new AESEngine(),
-                        new KeyParameter(Hex.decode("00000000000000000000000000000000")),
-                        "00000000000000000000000000000000", "C34C052CC0DA8D73451AFE5F03BE297F"),
-                new BlockCipherMonteCarloTest(3, 10000, new AESEngine(),
-                        new KeyParameter(Hex.decode("5F060D3716B345C253F6749ABAC10917")),
-                        "355F697E8B868B65B25A04E18D782AFA", "ACC863637868E3E068D2FD6E3508454A"),
-                new BlockCipherVectorTest(4, new AESEngine(),
-                        new KeyParameter(Hex.decode("000000000000000000000000000000000000000000000000")),
-                        "80000000000000000000000000000000", "6CD02513E8D4DC986B4AFE087A60BD0C"),
-                new BlockCipherMonteCarloTest(5, 10000, new AESEngine(),
-                        new KeyParameter(Hex.decode("AAFE47EE82411A2BF3F6752AE8D7831138F041560631B114")),
-                        "F3F6752AE8D7831138F041560631B114", "77BA00ED5412DFF27C8ED91F3C376172"),
-                new BlockCipherVectorTest(6, new AESEngine(),
-                        new KeyParameter(Hex.decode("0000000000000000000000000000000000000000000000000000000000000000")),
-                        "80000000000000000000000000000000", "DDC6BF790C15760D8D9AEB6F9A75FD4E"),
-                new BlockCipherMonteCarloTest(7, 10000, new AESEngine(),
-                        new KeyParameter(Hex.decode("28E79E2AFC5F7745FCCABE2F6257C2EF4C4EDFB37324814ED4137C288711A386")),
-                        "C737317FE0846F132B23C8C2A672CE22", "E58B82BFBA53C0040DC610C642121168"),
-                new BlockCipherVectorTest(8, new AESEngine(),
-                        new KeyParameter(Hex.decode("80000000000000000000000000000000")),
-                        "00000000000000000000000000000000", "0EDD33D3C621E546455BD8BA1418BEC8"),
-                new BlockCipherVectorTest(9, new AESEngine(),
-                        new KeyParameter(Hex.decode("00000000000000000000000000000080")),
-                        "00000000000000000000000000000000", "172AEAB3D507678ECAF455C12587ADB7"),
-                new BlockCipherMonteCarloTest(10, 10000, new AESEngine(),
-                        new KeyParameter(Hex.decode("00000000000000000000000000000000")),
-                        "00000000000000000000000000000000", "C34C052CC0DA8D73451AFE5F03BE297F"),
-                new BlockCipherMonteCarloTest(11, 10000, new AESEngine(),
-                        new KeyParameter(Hex.decode("5F060D3716B345C253F6749ABAC10917")),
-                        "355F697E8B868B65B25A04E18D782AFA", "ACC863637868E3E068D2FD6E3508454A"),
-                new BlockCipherVectorTest(12, new AESEngine(),
-                        new KeyParameter(Hex.decode("000000000000000000000000000000000000000000000000")),
-                        "80000000000000000000000000000000", "6CD02513E8D4DC986B4AFE087A60BD0C"),
-                new BlockCipherMonteCarloTest(13, 10000, new AESEngine(),
-                        new KeyParameter(Hex.decode("AAFE47EE82411A2BF3F6752AE8D7831138F041560631B114")),
-                        "F3F6752AE8D7831138F041560631B114", "77BA00ED5412DFF27C8ED91F3C376172"),
-                new BlockCipherVectorTest(14, new AESEngine(),
-                        new KeyParameter(Hex.decode("0000000000000000000000000000000000000000000000000000000000000000")),
-                        "80000000000000000000000000000000", "DDC6BF790C15760D8D9AEB6F9A75FD4E"),
-                new BlockCipherMonteCarloTest(15, 10000, new AESEngine(),
-                        new KeyParameter(Hex.decode("28E79E2AFC5F7745FCCABE2F6257C2EF4C4EDFB37324814ED4137C288711A386")),
-                        "C737317FE0846F132B23C8C2A672CE22", "E58B82BFBA53C0040DC610C642121168"),
-                new BlockCipherVectorTest(16, new AESEngine(),
-                        new KeyParameter(Hex.decode("80000000000000000000000000000000")),
-                        "00000000000000000000000000000000", "0EDD33D3C621E546455BD8BA1418BEC8"),
-                new BlockCipherVectorTest(17, new AESEngine(),
-                        new KeyParameter(Hex.decode("00000000000000000000000000000080")),
-                        "00000000000000000000000000000000", "172AEAB3D507678ECAF455C12587ADB7"),
-                new BlockCipherMonteCarloTest(18, 10000, new AESEngine(),
-                        new KeyParameter(Hex.decode("00000000000000000000000000000000")),
-                        "00000000000000000000000000000000", "C34C052CC0DA8D73451AFE5F03BE297F"),
-                new BlockCipherMonteCarloTest(19, 10000, new AESEngine(),
-                        new KeyParameter(Hex.decode("5F060D3716B345C253F6749ABAC10917")),
-                        "355F697E8B868B65B25A04E18D782AFA", "ACC863637868E3E068D2FD6E3508454A"),
-                new BlockCipherVectorTest(20, new AESEngine(),
-                        new KeyParameter(Hex.decode("000000000000000000000000000000000000000000000000")),
-                        "80000000000000000000000000000000", "6CD02513E8D4DC986B4AFE087A60BD0C"),
-                new BlockCipherMonteCarloTest(21, 10000, new AESEngine(),
-                        new KeyParameter(Hex.decode("AAFE47EE82411A2BF3F6752AE8D7831138F041560631B114")),
-                        "F3F6752AE8D7831138F041560631B114", "77BA00ED5412DFF27C8ED91F3C376172"),
-                new BlockCipherVectorTest(22, new AESEngine(),
-                        new KeyParameter(Hex.decode("0000000000000000000000000000000000000000000000000000000000000000")),
-                        "80000000000000000000000000000000", "DDC6BF790C15760D8D9AEB6F9A75FD4E"),
-                new BlockCipherMonteCarloTest(23, 10000, new AESEngine(),
-                        new KeyParameter(Hex.decode("28E79E2AFC5F7745FCCABE2F6257C2EF4C4EDFB37324814ED4137C288711A386")),
-                        "C737317FE0846F132B23C8C2A672CE22", "E58B82BFBA53C0040DC610C642121168")
-            };
-    
-    private BlockCipher _engine = new AESEngine();
-
-    public AESTest()
-    {
-        super(tests, new AESEngine(), new KeyParameter(new byte[16]));
-    }
-
-    public String getName()
-    {
-        return "AES";
-    }
-
-    private void testNullSIC()
-        throws InvalidCipherTextException
-    {
-        BufferedBlockCipher b = new BufferedBlockCipher(new SICBlockCipher(new AESEngine()));
-        KeyParameter kp = new KeyParameter(Hex.decode("5F060D3716B345C253F6749ABAC10917"));
-
-        b.init(true, new ParametersWithIV(kp, new byte[16]));
-
-        byte[] out = new byte[b.getOutputSize(tData.length)];
-
-        int len = b.processBytes(tData, 0, tData.length, out, 0);
-
-        len += b.doFinal(out, len);
-
-        if (!areEqual(outSIC1, out))
-        {
-            fail("no match on first nullSIC check");
-        }
-
-        b.init(true, new ParametersWithIV(null, Hex.decode("000102030405060708090a0b0c0d0e0f")));
-
-        len = b.processBytes(tData, 0, tData.length, out, 0);
-
-        len += b.doFinal(out, len);
-
-        if (!areEqual(outSIC2, out))
-        {
-            fail("no match on second nullSIC check");
-        }
-    }
-
-    private void testNullCBC()
-        throws InvalidCipherTextException
-    {
-        BufferedBlockCipher b = new BufferedBlockCipher(new CBCBlockCipher(new AESEngine()));
-        KeyParameter kp = new KeyParameter(Hex.decode("5F060D3716B345C253F6749ABAC10917"));
-
-        b.init(true, new ParametersWithIV(kp, new byte[16]));
-
-        byte[] out = new byte[b.getOutputSize(tData.length)];
-
-        int len = b.processBytes(tData, 0, tData.length, out, 0);
-
-        len += b.doFinal(out, len);
-
-        if (!areEqual(outCBC1, out))
-        {
-            fail("no match on first nullCBC check");
-        }
-
-        b.init(true, new ParametersWithIV(null, Hex.decode("000102030405060708090a0b0c0d0e0f")));
-
-        len = b.processBytes(tData, 0, tData.length, out, 0);
-
-        len += b.doFinal(out, len);
-
-        if (!areEqual(outCBC2, out))
-        {
-            fail("no match on second nullCBC check");
-        }
-    }
-
-    private void testNullOFB()
-        throws InvalidCipherTextException
-    {
-        BufferedBlockCipher b = new BufferedBlockCipher(new OFBBlockCipher(new AESEngine(), 128));
-        KeyParameter kp = new KeyParameter(Hex.decode("5F060D3716B345C253F6749ABAC10917"));
-
-        b.init(true, new ParametersWithIV(kp, new byte[16]));
-
-        byte[] out = new byte[b.getOutputSize(tData.length)];
-
-        int len = b.processBytes(tData, 0, tData.length, out, 0);
-
-        len += b.doFinal(out, len);
-
-        if (!areEqual(outOFB1, out))
-        {
-            fail("no match on first nullOFB check");
-        }
-
-        b.init(true, new ParametersWithIV(null, Hex.decode("000102030405060708090a0b0c0d0e0f")));
-
-        len = b.processBytes(tData, 0, tData.length, out, 0);
-
-        len += b.doFinal(out, len);
-
-        if (!areEqual(outOFB2, out))
-        {
-            fail("no match on second nullOFB check");
-        }
-    }
-
-    private void testNullCFB()
-        throws InvalidCipherTextException
-    {
-        BufferedBlockCipher b = new BufferedBlockCipher(new CFBBlockCipher(new AESEngine(), 128));
-        KeyParameter kp = new KeyParameter(Hex.decode("5F060D3716B345C253F6749ABAC10917"));
-
-        b.init(true, new ParametersWithIV(kp, new byte[16]));
-
-        byte[] out = new byte[b.getOutputSize(tData.length)];
-
-        int len = b.processBytes(tData, 0, tData.length, out, 0);
-
-        len += b.doFinal(out, len);
-
-        if (!areEqual(outCFB1, out))
-        {
-            fail("no match on first nullCFB check");
-        }
-
-        b.init(true, new ParametersWithIV(null, Hex.decode("000102030405060708090a0b0c0d0e0f")));
-
-        len = b.processBytes(tData, 0, tData.length, out, 0);
-
-        len += b.doFinal(out, len);
-
-        if (!areEqual(outCFB2, out))
-        {
-            fail("no match on second nullCFB check");
-        }
-    }
-
-    private boolean areEqual(byte[] a, int aOff, byte[] b, int bOff)
-    {
-        for (int i = bOff; i != b.length; i++)
-        {
-            if (a[aOff + i - bOff] != b[i])
-            {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    private void skipTest()
-    {
-        CipherParameters params = new ParametersWithIV(new KeyParameter(Hex.decode("5F060D3716B345C253F6749ABAC10917")), Hex.decode("00000000000000000000000000000000"));
-        SICBlockCipher engine = new SICBlockCipher(new AESEngine());
-
-        engine.init(true, params);
-
-        SecureRandom rand = new SecureRandom();
-        byte[]       plain = new byte[50000];
-        byte[]       cipher = new byte[50000];
-
-        rand.nextBytes(plain);
-        engine.processBytes(plain, 0, plain.length, cipher, 0);
-
-        byte[]      fragment = new byte[20];
-
-        engine.init(true, params);
-
-        engine.skip(10);
-
-        if (engine.getPosition() != 10)
-        {
-            fail("skip position incorrect - 10 got " + engine.getPosition());
-        }
-
-        engine.processBytes(plain, 10, fragment.length, fragment, 0);
-
-        if (!areEqual(cipher, 10, fragment, 0))
-        {
-            fail("skip forward 10 failed");
-        }
-
-        engine.skip(1000);
-
-        if (engine.getPosition() != 1010 + fragment.length)
-        {
-            fail("skip position incorrect - " + (1010 + fragment.length) + " got " + engine.getPosition());
-        }
-
-        engine.processBytes(plain, 1010 + fragment.length, fragment.length, fragment, 0);
-
-        if (!areEqual(cipher, 1010 + fragment.length, fragment, 0))
-        {
-            fail("skip forward 1000 failed");
-        }
-
-        engine.skip(-10);
-
-        if (engine.getPosition() != 1010 + 2 * fragment.length - 10)
-        {
-            fail("skip position incorrect - " + (1010 + 2 * fragment.length - 10) + " got " + engine.getPosition());
-        }
-
-        engine.processBytes(plain, 1010 + 2 * fragment.length - 10, fragment.length, fragment, 0);
-
-        if (!areEqual(cipher, 1010 + 2 * fragment.length - 10, fragment, 0))
-        {
-            fail("skip back 10 failed");
-        }
-
-        engine.skip(-1000);
-
-        if (engine.getPosition() != 60)
-        {
-            fail("skip position incorrect - " + 60 + " got " + engine.getPosition());
-        }
-
-        engine.processBytes(plain, 60, fragment.length, fragment, 0);
-
-        if (!areEqual(cipher, 60, fragment, 0))
-        {
-            fail("skip back 1000 failed");
-        }
-
-        long pos = engine.seekTo(1010);
-
-        if (pos != 1010)
-        {
-            fail("position incorrect - " + 1010 + " got " + pos);
-        }
-
-        engine.processBytes(plain, 1010, fragment.length, fragment, 0);
-
-        if (!areEqual(cipher, 1010, fragment, 0))
-        {
-            fail("seek to 1010 failed");
-        }
-
-        engine.reset();
-
-        for (int i = 0; i != 5000; i++)
-        {
-            engine.skip(i);
-
-            if (engine.getPosition() != i)
-            {
-                fail("skip forward at wrong position");
-            }
-
-            engine.processBytes(plain, i, fragment.length, fragment, 0);
-
-            if (!areEqual(cipher, i, fragment, 0))
-            {
-                fail("skip forward i failed: " + i);
-            }
-
-            if (engine.getPosition() != i + fragment.length)
-            {
-                fail("cipher at wrong position: " + engine.getPosition() + " [" + i + "]");
-            }
-
-            engine.skip(-fragment.length);
-
-            if (engine.getPosition() != i)
-            {
-                fail("skip back at wrong position");
-            }
-
-            engine.processBytes(plain, i, fragment.length, fragment, 0);
-
-            if (!areEqual(cipher, i, fragment, 0))
-            {
-                fail("skip back i failed: " + i);
-            }
-
-            engine.reset();
-        }
-    }
-
-    public void performTest()
-        throws Exception
-    {
-        super.performTest();
-
-        byte[] keyBytes = new byte[16];
-        
-        _engine.init(true, new KeyParameter(keyBytes));
-        
-        //
-        // init tests
-        //
-        try
-        {
-            byte[]      dudKey = new byte[6];
-            
-            _engine.init(true, new KeyParameter(dudKey));
-            
-            fail("failed key length check");
-        }
-        catch (IllegalArgumentException e)
-        {
-            // expected 
-        }
-        
-        try
-        {
-            byte[]      iv = new byte[16];
-
-            _engine.init(true, new ParametersWithIV(null, iv));
-            
-            fail("failed parameter check");
-        }
-        catch (IllegalArgumentException e)
-        {
-            // expected 
-        }
-
-        testNullCBC();
-        testNullSIC();
-        testNullOFB();
-        testNullCFB();
-
-        skipTest();
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        runTest(new AESTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/AESVectorFileTest.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/AESVectorFileTest.java
deleted file mode 100644
index cfd4843..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/AESVectorFileTest.java
+++ /dev/null
@@ -1,258 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.List;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipFile;
-
-import org.bouncycastle.crypto.BlockCipher;
-import org.bouncycastle.crypto.engines.AESEngine;
-import org.bouncycastle.crypto.engines.AESFastEngine;
-import org.bouncycastle.crypto.engines.AESLightEngine;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTestResult;
-import org.bouncycastle.util.test.Test;
-import org.bouncycastle.util.test.TestResult;
-
-/**
- * Test vectors from the NIST standard tests and Brian Gladman's vector set
- * <a href="http://fp.gladman.plus.com/cryptography_technology/rijndael/">
- * http://fp.gladman.plus.com/cryptography_technology/rijndael/</a>
- */
-public class AESVectorFileTest
-    implements Test
-{
-
-    private int countOfTests = 0;
-    private int testNum = 0;
-
-    protected BlockCipher createNewEngineForTest()
-    {
-        return new AESEngine();
-    }
-
-    private Test[] readTestVectors(InputStream inStream)
-    {
-        // initialize key, plaintext, ciphertext = null
-        // read until find BLOCKSIZE=
-        // return if not 128
-        // read KEYSIZE= or ignore
-        // loop
-        // read a line
-        // if starts with BLOCKSIZE=
-        // parse the rest. return if not 128
-        // if starts with KEY=
-        // parse the rest and set KEY
-        // if starts with PT=
-        // parse the rest and set plaintext
-        // if starts with CT=
-        // parse the rest and set ciphertext
-        // if starts with TEST= or end of file
-        // if key, plaintext, ciphertext are all not null
-        // save away their values as the next test
-        // until end of file
-        List   tests = new ArrayList();
-        String key = null;
-        String plaintext = null;
-        String ciphertext = null;
-
-        BufferedReader in = new BufferedReader(new InputStreamReader(inStream));
-
-        try
-        {
-            String line = in.readLine();
-
-            while (line != null)
-            {
-                line = line.trim().toLowerCase();
-                if (line.startsWith("blocksize="))
-                {
-                    int i = 0;
-                    try
-                    {
-                        i = Integer.parseInt(line.substring(10).trim());
-                    }
-                    catch (Exception e)
-                    {
-                    }
-                    if (i != 128)
-                    {
-                        return null;
-                    }
-                }
-                else if (line.startsWith("keysize="))
-                {
-                    int i = 0;
-                    try
-                    {
-                        i = Integer.parseInt(line.substring(10).trim());
-                    }
-                    catch (Exception e)
-                    {
-                    }
-                    if ((i != 128) && (i != 192) && (i != 256))
-                    {
-                        return null;
-                    }
-                }
-                else if (line.startsWith("key="))
-                {
-                    key = line.substring(4).trim();
-                }
-                else if (line.startsWith("pt="))
-                {
-                    plaintext = line.substring(3).trim();
-                }
-                else if (line.startsWith("ct="))
-                {
-                    ciphertext = line.substring(3).trim();
-                }
-                else if (line.startsWith("test="))
-                {
-                    if ((key != null) && (plaintext != null)
-                            && (ciphertext != null))
-                    {
-                        tests.add(new BlockCipherVectorTest(testNum++,
-                                createNewEngineForTest(), new KeyParameter(Hex
-                                        .decode(key)), plaintext, ciphertext));
-                    }
-                }
-
-                line = in.readLine();
-            }
-            try
-            {
-                in.close();
-            }
-            catch (IOException e)
-            {
-            }
-        }
-        catch (IOException e)
-        {
-        }
-        if ((key != null) && (plaintext != null) && (ciphertext != null))
-        {
-            tests.add(new BlockCipherVectorTest(testNum++,
-                    createNewEngineForTest(),
-                    new KeyParameter(Hex.decode(key)), plaintext, ciphertext));
-        }
-        return (Test[])(tests.toArray(new Test[tests.size()]));
-    }
-
-    public String getName()
-    {
-        return "AES";
-    }
-
-    private TestResult performTestsFromZipFile(File zfile)
-    {
-        try
-        {
-            ZipFile inZip = new ZipFile(zfile);
-            for (Enumeration files = inZip.entries(); files.hasMoreElements();)
-            {
-                Test[] tests = null;
-                try
-                {
-                    tests = readTestVectors(inZip
-                            .getInputStream((ZipEntry)(files.nextElement())));
-                }
-                catch (Exception e)
-                {
-                    return new SimpleTestResult(false, getName() + ": threw "
-                            + e);
-                }
-                if (tests != null)
-                {
-                    for (int i = 0; i != tests.length; i++)
-                    {
-                        TestResult res = tests[i].perform();
-                        countOfTests++;
-
-                        if (!res.isSuccessful())
-                        {
-                            return res;
-                        }
-                    }
-                }
-            }
-            inZip.close();
-            return new SimpleTestResult(true, getName() + ": Okay");
-        }
-        catch (Exception e)
-        {
-            return new SimpleTestResult(false, getName() + ": threw " + e);
-        }
-    }
-
-    private static final String[] zipFileNames = { "rijn.tv.ecbnk.zip",
-            "rijn.tv.ecbnt.zip", "rijn.tv.ecbvk.zip", "rijn.tv.ecbvt.zip" };
-
-    public TestResult perform()
-    {
-        countOfTests = 0;
-        for (int i = 0; i < zipFileNames.length; i++)
-        {
-            File inf = new File(zipFileNames[i]);
-            TestResult res = performTestsFromZipFile(inf);
-            if (!res.isSuccessful())
-            {
-                return res;
-            }
-        }
-        return new SimpleTestResult(true, getName() + ": " + countOfTests
-                + " performed Okay");
-    }
-
-    public static void main(String[] args)
-    {
-        AESVectorFileTest test = new AESVectorFileTest();
-        TestResult result = test.perform();
-        System.out.println(result);
-
-        test = new AESLightVectorFileTest();
-        result = test.perform();
-        System.out.println(result);
-
-        test = new AESFastVectorFileTest();
-        result = test.perform();
-        System.out.println(result);
-
-    }
-
-    private static class AESLightVectorFileTest extends AESVectorFileTest
-    {
-        protected BlockCipher createNewEngineForTest()
-        {
-            return new AESLightEngine();
-        }
-
-        public String getName()
-        {
-            return "AESLight";
-        }
-
-    }
-
-    private static class AESFastVectorFileTest extends AESVectorFileTest
-    {
-        protected BlockCipher createNewEngineForTest()
-        {
-            return new AESFastEngine();
-        }
-
-        public String getName()
-        {
-            return "AESFast";
-        }
-
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/AESWrapPadTest.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/AESWrapPadTest.java
deleted file mode 100644
index 75ac525..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/AESWrapPadTest.java
+++ /dev/null
@@ -1,146 +0,0 @@
-package org.bouncycastle.crypto.test;

-

-import java.security.SecureRandom;

-

-import org.bouncycastle.crypto.Wrapper;

-import org.bouncycastle.crypto.engines.AESWrapPadEngine;

-import org.bouncycastle.crypto.params.KeyParameter;

-import org.bouncycastle.util.Arrays;

-import org.bouncycastle.util.encoders.Hex;

-import org.bouncycastle.util.test.SimpleTest;

-

-/**

- * This is a test harness I use because I cannot modify the BC test harness without

- * invalidating the signature on their signed provider library. The code here is not

- * high quality but it does test the RFC vectors as well as randomly generated values.

- * The RFC test vectors are tested by making sure both the ciphertext and decrypted

- * values match the expected values whereas the random values are just checked to make

- * sure that:

- * <p>unwrap(wrap(random_value, random_kek), random_kek) == random_value.</p>

- */

-

-public class AESWrapPadTest

-    extends SimpleTest

-{

-

-    private final int numOfRandomIterations = 100;

-

-    public AESWrapPadTest()

-    {

-

-    }

-

-    private void wrapAndUnwrap(byte[] kek, byte[] key, byte[] expected)

-        throws Exception

-    {

-        Wrapper wrapper = new AESWrapPadEngine();

-

-        wrapper.init(true, new KeyParameter(kek));

-

-        byte[] cipherText = wrapper.wrap(key, 0, key.length);

-        if (!areEqual(cipherText, expected))

-        {

-            fail("Wrapped value does not match expected.");

-        }

-        wrapper.init(false, new KeyParameter(kek));

-        byte[] plainText = wrapper.unwrap(cipherText, 0, cipherText.length);

-

-        if (!areEqual(key, plainText))

-        {

-            fail("Unwrapped value does not match original.");

-        }

-    }

-

-    private void wrapAndUnwrap(byte[] kek, byte[] key)

-        throws Exception

-    {

-        Wrapper wrapper = new AESWrapPadEngine();

-

-        wrapper.init(true, new KeyParameter(kek));

-

-        byte[] cipherText = wrapper.wrap(key, 0, key.length);

-

-        wrapper.init(false, new KeyParameter(kek));

-        byte[] plainText = wrapper.unwrap(cipherText, 0, cipherText.length);

-

-        if (!areEqual(key, plainText))

-        {

-            fail("Unwrapped value does not match original.");

-        }

-    }

-

-    public String getName()

-    {

-        return "AESWrapPad";

-    }

-

-    public void performTest()

-        throws Exception

-    {

-        // test RFC 5649 test vectors

-        byte[] kek = Hex.decode("5840df6e29b02af1ab493b705bf16ea1ae8338f4dcc176a8");

-        byte[] key = Hex.decode("c37b7e6492584340bed12207808941155068f738");

-        byte[] wrap = Hex.decode("138bdeaa9b8fa7fc61f97742e72248ee5ae6ae5360d1ae6a5f54f373fa543b6a");

-

-        wrapAndUnwrap(kek, key, wrap);

-

-        wrap = Hex.decode("afbeb0f07dfbf5419200f2ccb50bb24f");

-        key = Hex.decode("466f7250617369");

-        wrapAndUnwrap(kek, key, wrap);

-

-

-        //

-        // offset test

-        //

-        Wrapper wrapper = new AESWrapPadEngine();

-

-        byte[] pText = new byte[5 + key.length];

-        byte[]  cText;

-

-        System.arraycopy(key, 0, pText, 5, key.length);

-

-        wrapper.init(true, new KeyParameter(kek));

-

-        cText = wrapper.wrap(pText, 5, key.length);

-        if (!Arrays.areEqual(cText, wrap))

-        {

-            fail("failed offset wrap test expected " + new String(Hex.encode(wrap)) + " got " + new String(Hex.encode(cText)));

-        }

-

-        wrapper.init(false, new KeyParameter(kek));

-

-        cText = new byte[6 + wrap.length];

-        System.arraycopy(wrap, 0, cText, 6, wrap.length);

-

-        pText = wrapper.unwrap(cText, 6, wrap.length);

-        if (!Arrays.areEqual(pText, key))

-        {

-            fail("failed offset unwrap test expected " + new String(Hex.encode(key)) + " got " + new String(Hex.encode(pText)));

-        }

-

-        // test random values

-        SecureRandom rnd = new SecureRandom();

-        for (int i = 0; i < numOfRandomIterations; i++)

-        {

-            int kekLength = 128;

-            boolean shouldIncrease = (rnd.nextInt() & 0x01) != 0;

-            if (shouldIncrease)

-            {

-                kekLength = 256;

-            }

-            kek = new byte[kekLength / 8];

-            rnd.nextBytes(kek);

-            int keyToWrapSize = rnd.nextInt(256 / 8 - 8) + 8;

-            byte[] keyToWrap = new byte[keyToWrapSize];

-            rnd.nextBytes(keyToWrap);

-            wrapAndUnwrap(kek, keyToWrap);

-        }

-    }

-

-    public static void main(

-        String[]    args)

-    {

-        runTest(new AESWrapPadTest());

-    }

-}

-

diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/AESWrapTest.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/AESWrapTest.java
deleted file mode 100644
index 7bd1e4b..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/AESWrapTest.java
+++ /dev/null
@@ -1,260 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import org.bouncycastle.crypto.DataLengthException;
-import org.bouncycastle.crypto.InvalidCipherTextException;
-import org.bouncycastle.crypto.Wrapper;
-import org.bouncycastle.crypto.engines.AESWrapEngine;
-import org.bouncycastle.crypto.engines.AESWrapPadEngine;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-import org.bouncycastle.util.test.SimpleTestResult;
-import org.bouncycastle.util.test.Test;
-import org.bouncycastle.util.test.TestFailedException;
-import org.bouncycastle.util.test.TestResult;
-
-/**
- * Wrap Test
- */
-public class AESWrapTest
-    extends SimpleTest
-{
-    public String getName()
-    {
-        return "AESWrap";
-    }
-
-    private void wrapTest(
-        int     id,
-        byte[]  kek,
-        byte[]  in,
-        byte[]  out)
-    {
-        wrapTest(id, kek, in, out, false);
-    }
-
-    private void wrapTest(
-        int     id,
-        byte[]  kek,
-        byte[]  in,
-        byte[]  out,
-        boolean useReverseDirection)
-    {
-        Wrapper wrapper = new AESWrapEngine(useReverseDirection);
-
-        wrapper.init(true, new KeyParameter(kek));
-
-        try
-        {
-            byte[]  cText = wrapper.wrap(in, 0, in.length);
-            if (!Arrays.areEqual(cText, out))
-            {
-                fail("failed wrap test " + id  + " expected " + new String(Hex.encode(out)) + " got " + new String(Hex.encode(cText)));
-            }
-        }
-        catch (TestFailedException e)
-        {
-            throw e;
-        }
-        catch (Exception e)
-        {
-            fail("failed wrap test exception " + e.toString());
-        }
-
-        wrapper.init(false, new KeyParameter(kek));
-
-        try
-        {
-            byte[]  pText = wrapper.unwrap(out, 0, out.length);
-            if (!Arrays.areEqual(pText, in))
-            {
-                fail("failed unwrap test " + id  + " expected " + new String(Hex.encode(in)) + " got " + new String(Hex.encode(pText)));
-            }
-        }
-        catch (TestFailedException e)
-        {
-            throw e;
-        }
-        catch (Exception e)
-        {
-            fail("failed unwrap test exception.", e);
-        }
-
-        //
-        // offset test
-        //
-        byte[] pText = new byte[5 + in.length];
-        byte[]  cText;
-
-        System.arraycopy(in, 0, pText, 5, in.length);
-
-        wrapper.init(true, new KeyParameter(kek));
-
-        try
-        {
-            cText = wrapper.wrap(pText, 5, in.length);
-            if (!Arrays.areEqual(cText, out))
-            {
-                fail("failed wrap test " + id  + " expected " + new String(Hex.encode(out)) + " got " + new String(Hex.encode(cText)));
-            }
-        }
-        catch (Exception e)
-        {
-            fail("failed wrap test exception " + e.toString());
-        }
-
-        wrapper.init(false, new KeyParameter(kek));
-
-        cText = new byte[6 + out.length];
-        System.arraycopy(out, 0, cText, 6, out.length);
-
-        try
-        {
-            pText = wrapper.unwrap(cText, 6, out.length);
-            if (!Arrays.areEqual(pText, in))
-            {
-                fail("failed unwrap test " + id  + " expected " + new String(Hex.encode(in)) + " got " + new String(Hex.encode(pText)));
-            }
-        }
-        catch (Exception e)
-        {
-            fail("failed unwrap test exception.", e);
-        }
-    }
-
-    private void heapIssueTest()
-    {
-   		byte[] key = Hex.decode("d305ef52a6b9e72c810b821261d2d678");
-   		byte[] ciphertext = Hex.decode("d2b2906d209a46261d8f6794eca3179d");
-
-   		Wrapper aes = new AESWrapPadEngine();
-   		aes.init(false, new KeyParameter(key));
-        try
-        {
-            byte[] result = aes.unwrap(ciphertext, 0, ciphertext.length);
-
-            fail("incorrect pad not detected");
-        }
-        catch (InvalidCipherTextException e)
-        {
-            // ignore
-        }
-    }
-
-    public void performTest()
-        throws Exception
-    {
-        byte[]  kek1 = Hex.decode("000102030405060708090a0b0c0d0e0f");
-        byte[]  in1 = Hex.decode("00112233445566778899aabbccddeeff");
-        byte[]  out1 = Hex.decode("1fa68b0a8112b447aef34bd8fb5a7b829d3e862371d2cfe5");
-
-        wrapTest(1, kek1, in1, out1);
-
-        byte[]  kek2 = Hex.decode("000102030405060708090a0b0c0d0e0f1011121314151617");
-        byte[]  in2 = Hex.decode("00112233445566778899aabbccddeeff");
-        byte[]  out2 = Hex.decode("96778b25ae6ca435f92b5b97c050aed2468ab8a17ad84e5d");
-
-        wrapTest(2, kek2, in2, out2);
-
-        byte[]  kek3 = Hex.decode("000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f");
-        byte[]  in3 = Hex.decode("00112233445566778899aabbccddeeff");
-        byte[]  out3 = Hex.decode("64e8c3f9ce0f5ba263e9777905818a2a93c8191e7d6e8ae7");
-
-        wrapTest(3, kek3, in3, out3);
-
-        byte[]  kek4 = Hex.decode("000102030405060708090a0b0c0d0e0f1011121314151617");
-        byte[]  in4 = Hex.decode("00112233445566778899aabbccddeeff0001020304050607");
-        byte[]  out4 = Hex.decode("031d33264e15d33268f24ec260743edce1c6c7ddee725a936ba814915c6762d2");
-        wrapTest(4, kek4, in4, out4);
-
-        byte[]  kek5 = Hex.decode("000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f");
-        byte[]  in5 = Hex.decode("00112233445566778899aabbccddeeff0001020304050607");
-        byte[]  out5 = Hex.decode("a8f9bc1612c68b3ff6e6f4fbe30e71e4769c8b80a32cb8958cd5d17d6b254da1");
-        wrapTest(5, kek5, in5, out5);
-
-        byte[]  kek6 = Hex.decode("000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f");
-        byte[]  in6 = Hex.decode("00112233445566778899aabbccddeeff000102030405060708090a0b0c0d0e0f");
-        byte[]  out6 = Hex.decode("28c9f404c4b810f4cbccb35cfb87f8263f5786e2d80ed326cbc7f0e71a99f43bfb988b9b7a02dd21");
-        wrapTest(6, kek6, in6, out6);
-
-        byte[]  kek7 = Hex.decode("000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f");
-        byte[]  in7 = Hex.decode("00112233445566778899aabbccddeeff000102030405060708090a0b0c0d0e0f");
-        byte[]  out7 = Hex.decode("cba01acbdb4c7c39fa59babb383c485f318837208731a81c735b5be6ba710375a1159e26a9b57228");
-        wrapTest(7, kek7, in7, out7, true);
-
-        Wrapper      wrapper = new AESWrapEngine();
-        KeyParameter key = new KeyParameter(new byte[16]);
-        byte[]       buf = new byte[16];
-
-        try
-        {
-            wrapper.init(true, key);
-
-            wrapper.unwrap(buf, 0, buf.length);
-
-            fail("failed unwrap state test.");
-        }
-        catch (IllegalStateException e)
-        {
-            // expected
-        }
-        catch (InvalidCipherTextException e)
-        {
-            fail("unexpected exception: " + e, e);
-        }
-
-        try
-        {
-            wrapper.init(false, key);
-
-            wrapper.wrap(buf, 0, buf.length);
-
-            fail("failed unwrap state test.");
-        }
-        catch (IllegalStateException e)
-        {
-            // expected
-        }
-
-        //
-        // short test
-        //
-        try
-        {
-            wrapper.init(false, key);
-
-            wrapper.unwrap(buf, 0, buf.length / 2);
-
-            fail("failed unwrap short test.");
-        }
-        catch (InvalidCipherTextException e)
-        {
-            // expected
-        }
-
-        try
-        {
-            wrapper.init(true, key);
-
-            wrapper.wrap(buf, 0, 15);
-
-            fail("ailed wrap length test.");
-        }
-        catch (DataLengthException e)
-        {
-            // expected
-        }
-
-        heapIssueTest();
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        AESWrapTest     test = new AESWrapTest();
-        TestResult      result = test.perform();
-
-        System.out.println(result);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/AllTests.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/AllTests.java
deleted file mode 100644
index 35bf235..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/AllTests.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.bouncycastle.util.test.SimpleTestResult;
-
-public class AllTests
-    extends TestCase
-{   
-    public void testCrypto()
-    {   
-        org.bouncycastle.util.test.Test[] tests = RegressionTest.tests;
-        
-        for (int i = 0; i != tests.length; i++)
-        {
-            SimpleTestResult  result = (SimpleTestResult)tests[i].perform();
-  
-            if (!result.isSuccessful())
-            {
-                fail(result.toString());
-            }
-        }
-    }
-    
-    public static void main (String[] args)
-    {
-        junit.textui.TestRunner.run(suite());
-    }
-    
-    public static Test suite()
-    {
-        TestSuite suite = new TestSuite("Lightweight Crypto Tests");
-        
-        suite.addTestSuite(AllTests.class);
-        suite.addTestSuite(GCMReorderTest.class);
-        
-        return suite;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/BCryptTest.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/BCryptTest.java
deleted file mode 100644
index 6a4f777..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/BCryptTest.java
+++ /dev/null
@@ -1,151 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import org.bouncycastle.crypto.generators.BCrypt;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.Integers;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-
-/*
- * bcrypt test vectors
- */
-public class BCryptTest
-    extends SimpleTest
-{
-    // Raw test vectors based on crypt style test vectors
-    // Cross checked with JBCrypt
-    private static final Object[][] testVectors = {
-        {"", "144b3d691a7b4ecf39cf735c7fa7a79c", Integers.valueOf(6), "557e94f34bf286e8719a26be94ac1e16d95ef9f819dee092"},
-        {"00", "144b3d691a7b4ecf39cf735c7fa7a79c", Integers.valueOf(6), "557e94f34bf286e8719a26be94ac1e16d95ef9f819dee092"},
-        {"00", "26c63033c04f8bcba2fe24b574db6274", Integers.valueOf(8), "56701b26164d8f1bc15225f46234ac8ac79bf5bc16bf48ba"},
-        {"00", "9b7c9d2ada0fd07091c915d1517701d6", Integers.valueOf(10), "7b2e03106a43c9753821db688b5cc7590b18fdf9ba544632"},
-        {"6100", "a3612d8c9a37dac2f99d94da03bd4521", Integers.valueOf(6), "e6d53831f82060dc08a2e8489ce850ce48fbf976978738f3"},
-        {"6100", "7a17b15dfe1c4be10ec6a3ab47818386", Integers.valueOf(8), "a9f3469a61cbff0a0f1a1445dfe023587f38b2c9c40570e1"},
-        {"6100", "9bef4d04e1f8f92f3de57323f8179190", Integers.valueOf(10), "5169fd39606d630524285147734b4c981def0ee512c3ace1"},
-        {"61626300", "2a1f1dc70a3d147956a46febe3016017", Integers.valueOf(6), "d9a275b493bcbe1024b0ff80d330253cfdca34687d8f69e5"},
-        {"61626300", "4ead845a142c9bc79918c8797f470ef5", Integers.valueOf(8), "8d4131a723bfbbac8a67f2e035cae08cc33b69f37331ea91"},
-        {"61626300", "631c554493327c32f9c26d9be7d18e4c", Integers.valueOf(10), "8cd0b863c3ff0860e31a2b42427974e0283b3af7142969a6"},
-        {"6162636465666768696a6b6c6d6e6f707172737475767778797a00", "02d1176d74158ee29cffdac6150cf123", Integers.valueOf(6), "4d38b523ce9dc6f2f6ff9fb3c2cd71dfe7f96eb4a3baf19f"},
-        {"6162636465666768696a6b6c6d6e6f707172737475767778797a00", "715b96caed2ac92c354ed16c1e19e38a", Integers.valueOf(8), "98bf9ffc1f5be485f959e8b1d526392fbd4ed2d5719f506b"},
-        {"6162636465666768696a6b6c6d6e6f707172737475767778797a00", "85727e838f9049397fbec90566ede0df", Integers.valueOf(10), "cebba53f67bd28af5a44c6707383c231ac4ef244a6f5fb2b"},
-        {"7e21402324255e262a28292020202020207e21402324255e262a2829504e4246524400", "8512ae0d0fac4ec9a5978f79b6171028", Integers.valueOf(6), "26f517fe5345ad575ba7dfb8144f01bfdb15f3d47c1e146a"},
-        {"7e21402324255e262a28292020202020207e21402324255e262a2829504e4246524400", "1ace2de8807df18c79fced54678f388f", Integers.valueOf(8), "d51d7cdf839b91a25758b80141e42c9f896ae80fd6cd561f"},
-        {"7e21402324255e262a28292020202020207e21402324255e262a2829504e4246524400", "36285a6267751b14ba2dc989f6d43126", Integers.valueOf(10), "db4fab24c1ff41c1e2c966f8b3d6381c76e86f52da9e15a9"},
-        {"c2a300", "144b3d691a7b4ecf39cf735c7fa7a79c", Integers.valueOf(6), "5a6c4fedb23980a7da9217e0442565ac6145b687c7313339"},
-    };
-
-    public String getName()
-    {
-        return "BCrypt";
-    }
-
-    public void performTest()
-        throws Exception
-    {
-        testParameters();
-        testShortKeys();
-        testVectors();
-    }
-
-    private void testShortKeys()
-    {
-        byte[] salt = new byte[16];
-
-        // Check BCrypt with empty key pads to zero byte key
-        byte[] hashEmpty = BCrypt.generate(new byte[0], salt, 4);
-        byte[] hashZero1 = BCrypt.generate(new byte[1], salt, 4);
-
-        if (!Arrays.areEqual(hashEmpty, hashZero1))
-        {
-            fail("Hash for empty password should equal zeroed key", new String(Hex.encode(hashEmpty)),
-                new String(Hex.encode(hashZero1)));
-        }
-
-        // Check zeroed byte key of min Blowfish length is equivalent
-        byte[] hashZero4 = BCrypt.generate(new byte[4], salt, 4);
-        if (!Arrays.areEqual(hashEmpty, hashZero4))
-        {
-            fail("Hash for empty password should equal zeroed key[4]", new String(Hex.encode(hashEmpty)), new String(
-                Hex.encode(hashZero4)));
-        }
-
-        // Check BCrypt isn't padding too small (32 bit) keys
-        byte[] hashA = BCrypt.generate(new byte[]{(byte)'a'}, salt, 4);
-        byte[] hashA0 = BCrypt.generate(new byte[]{(byte)'a', (byte)0}, salt, 4);
-        if (Arrays.areEqual(hashA, hashA0))
-        {
-            fail("Small keys should not be 0 padded.");
-        }
-    }
-
-    public void testParameters()
-    {
-        checkOK("Empty key", new byte[0], new byte[16], 4);
-        checkOK("Minimal values", new byte[1], new byte[16], 4);
-        // checkOK("Max cost", new byte[1], new byte[16], 31);
-        checkOK("Max passcode", new byte[72], new byte[16], 4);
-        checkIllegal("Null password", null, new byte[16], 4);
-        checkIllegal("Null salt", new byte[1], null, 4);
-        checkIllegal("Salt too small", new byte[1], new byte[15], 4);
-        checkIllegal("Salt too big", new byte[1], new byte[17], 4);
-        checkIllegal("Cost too low", new byte[16], new byte[16], 3);
-        checkIllegal("Cost too high", new byte[16], new byte[16], 32);
-        checkIllegal("Passcode too long", new byte[73], new byte[16], 32);
-    }
-
-    private void checkOK(String msg, byte[] pass, byte[] salt, int cost)
-    {
-        try
-        {
-            BCrypt.generate(pass, salt, cost);
-        }
-        catch (IllegalArgumentException e)
-        {
-            e.printStackTrace();
-            fail(msg);
-        }
-    }
-
-    private void checkIllegal(String msg, byte[] pass, byte[] salt, int cost)
-    {
-        try
-        {
-            BCrypt.generate(pass, salt, cost);
-            fail(msg);
-        }
-        catch (IllegalArgumentException e)
-        {
-            // e.printStackTrace();
-        }
-    }
-
-    public void testVectors()
-        throws Exception
-    {
-        for (int i = 0; i < testVectors.length; i++)
-        {
-            byte[] password = Hex.decode((String)testVectors[i][0]);
-            byte[] salt = Hex.decode((String)testVectors[i][1]);
-            int cost = ((Integer)testVectors[i][2]).intValue();
-            byte[] expected = Hex.decode((String)testVectors[i][3]);
-
-            test(password, salt, cost, expected);
-        }
-
-    }
-
-    private void test(byte[] password, byte[] salt, int cost, byte[] expected)
-    {
-        byte[] hash = BCrypt.generate(password, salt, cost);
-        if (!Arrays.areEqual(hash, expected))
-        {
-            fail("Hash for " + new String(Hex.encode(password)), new String(Hex.encode(expected)),
-                new String(Hex.encode(hash)));
-        }
-    }
-
-    public static void main(String[] args)
-    {
-        runTest(new BCryptTest());
-    }
-}
\ No newline at end of file
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/BigSkippingCipherTest.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/BigSkippingCipherTest.java
deleted file mode 100644
index 695a009..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/BigSkippingCipherTest.java
+++ /dev/null
@@ -1,223 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import java.util.Random;
-
-import junit.framework.TestCase;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.SkippingStreamCipher;
-import org.bouncycastle.crypto.engines.AESEngine;
-import org.bouncycastle.crypto.engines.ChaChaEngine;
-import org.bouncycastle.crypto.engines.Salsa20Engine;
-import org.bouncycastle.crypto.modes.SICBlockCipher;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.crypto.params.ParametersWithIV;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.encoders.Base64;
-import org.bouncycastle.util.encoders.Hex;
-
-public class BigSkippingCipherTest
-    extends TestCase
-{
-    public void testAESCTR()
-        throws Exception
-    {
-        CipherParameters params = new ParametersWithIV(new KeyParameter(Hex.decode("5F060D3716B345C253F6749ABAC10917")), Hex.decode("00000000000000000000000000000000"));
-        SICBlockCipher linearEngine = new SICBlockCipher(new AESEngine());
-        SICBlockCipher skippingEngine = new SICBlockCipher(new AESEngine());
-        Random random = new Random();
-
-        linearEngine.init(true, params);
-        skippingEngine.init(false, params);
-
-        testCipher(random, linearEngine, skippingEngine);
-
-        byte[] in = Base64.decode("pzVbCyj5JntIYN2Kvzf64/po+gTu/jvnZwU33F7UsfxpWRUDEGIQbArxqCQzEkGAwa4omXJ28WJveJNUQbQ5cBxS2aTt3sV0mrP+cneJ3OZkzo5Lhz0vuXs7Mav9uUzQFrU0DuMyGr1QJnKO0BUal0gLJ0v6YAo2SObDS5A4CTrsAgo0C2UXQmnuGzyYlhm4VoSNotD8auqyQXUrT8c2B/tLIcjyyl8ug1BabL2gAxN7oKbpvW5j2z3IZNZh+AKR4OR47RfjtYglOfgGQB1L5yiL9reuWEsRjbZmcEFfLmAAK0gtcP+0KDXV/DS4NxRx0sC7NkBzSC3uq2RbQOdjygFZ5qrmvwQZgLqlXs2cGiNzqx5CRjAvl83aAWAAerR5T2sHadRckW01oE2ivQixpgdPCGFHLeXoPMlkZ/r1cECYFAGPjMGSG2qnQZ/ZJbStEAZye/11r/dyoUgP+XTc6FDCCQHSdmyQljPHDQm7ioMTTkCf15YWv0kSuKOd4nBlLrGjSl9dsJsVU9TDRCqNExmk+lN3f0p8vr8TVNnir+OtEabOXzjOv6i3PHQZP27ML3Hy9TU1MHx1Q0bLdgi6yIw8lmzzBzok8j5VrCpNf2HmBqtRm1WDeTO9R62OWyaMT/dCT7AzEzP8ClBSq57p69OrlEDoaLXrYvNS3hEw1Lo=");
-        byte[] exp = Base64.decode("JD0KPwMaKvqYZnDgI0rFTCbexg+RRj3UbEPtsf5IDeM3lb5OJ5EMLHXrfknu//XNLE6dV/Jaoz3LuylkfRlMg2/Vvgo6KwXNV3VsUgkEmTpy74NAd9DCh+1EgJYCNbHkT/haaKpPWLqHEIp1/LVKZZgRXc+C4kH02GzqwYkjUZCSrE8GBpiILlHhN+2A14Ltmxe7XZrlnOQx62sBoh+QR2ZCSAhQjMayhnkrIC1qpM8S4vcZbAYOGuVRcmBhGZdvQg+YXUKrx3FS6XS+xF3yMld5iVx2aEzjkmXuDoULLzrppD/5Ed0I2CCFZigBZ3ZFsOGIZw1yTBXLRVroM/xksYaGgQs9arKB3rEBpUV4yUMuYokqz9A4k7jg/6loTFU8SntBzXptrPuKPbEMT/FvJqEsI3yKCndYiRAkTRmHWhNmdjLH9Pw32VYlpbjYzQjPP6Iy055VujucBofsP3/ENK32XNs1I6PzcVrjjRJaBy3dbAB0e7/P7cqnUvKu+dSR7N92VnuDtCaS5ksVMWJOlfLhqLq8umz8+3aIsTj20bfNGzf4aeqkUzv+AezQedVY3gmYBgwv/1ZR3Y9bUATE4ieIwK+gkZBgtANOs2abY+8+of5sQhyfYiWpUrSb+L/7MjaFgBz+b69bD5xl0kes/ySVGBqaqG4jcOr01qGfaLw=");
-        byte[] buf = new byte[512];
-
-        skippingEngine.seekTo(1L << 38);
-
-        skippingEngine.processBytes(in, 0, in.length, buf, 0);
-
-        if (!Arrays.areEqual(buf, exp))
-        {
-            fail("long seek failed");
-        }
-
-        skippingEngine.skip(-(1L << 38) - 512);
-
-        if (skippingEngine.getPosition() != 0)
-        {
-            fail("zero position came back as: " + skippingEngine.getPosition());
-        }
-
-        random.nextBytes(buf);
-
-        byte[] linOut = new byte[512];
-        byte[] skipOut = new byte[512];
-
-        linearEngine.init(true, params);
-
-        linearEngine.processBytes(buf, 0, buf.length, linOut, 0);
-        skippingEngine.processBytes(buf, 0, buf.length, skipOut, 0);
-
-        if (!Arrays.areEqual(linOut, skipOut))
-        {
-            fail("long output mismatch");
-        }
-    }
-
-    public void testSalsa20()
-        throws Exception
-    {
-        CipherParameters params = new ParametersWithIV(new KeyParameter(Hex.decode("0053A6F94C9FF24598EB3E91E4378ADD3083D6297CCF2275C81B6EC11467BA0D")), Hex.decode("0D74DB42A91077DE"));
-        Salsa20Engine linearEngine = new Salsa20Engine();
-        Salsa20Engine skippingEngine = new Salsa20Engine();
-        Random random = new Random();
-
-        linearEngine.init(true, params);
-        skippingEngine.init(false, params);
-
-        testCipher(random, linearEngine, skippingEngine);
-
-        byte[] in = Base64.decode("pzVbCyj5JntIYN2Kvzf64/po+gTu/jvnZwU33F7UsfxpWRUDEGIQbArxqCQzEkGAwa4omXJ28WJveJNUQbQ5cBxS2aTt3sV0mrP+cneJ3OZkzo5Lhz0vuXs7Mav9uUzQFrU0DuMyGr1QJnKO0BUal0gLJ0v6YAo2SObDS5A4CTrsAgo0C2UXQmnuGzyYlhm4VoSNotD8auqyQXUrT8c2B/tLIcjyyl8ug1BabL2gAxN7oKbpvW5j2z3IZNZh+AKR4OR47RfjtYglOfgGQB1L5yiL9reuWEsRjbZmcEFfLmAAK0gtcP+0KDXV/DS4NxRx0sC7NkBzSC3uq2RbQOdjygFZ5qrmvwQZgLqlXs2cGiNzqx5CRjAvl83aAWAAerR5T2sHadRckW01oE2ivQixpgdPCGFHLeXoPMlkZ/r1cECYFAGPjMGSG2qnQZ/ZJbStEAZye/11r/dyoUgP+XTc6FDCCQHSdmyQljPHDQm7ioMTTkCf15YWv0kSuKOd4nBlLrGjSl9dsJsVU9TDRCqNExmk+lN3f0p8vr8TVNnir+OtEabOXzjOv6i3PHQZP27ML3Hy9TU1MHx1Q0bLdgi6yIw8lmzzBzok8j5VrCpNf2HmBqtRm1WDeTO9R62OWyaMT/dCT7AzEzP8ClBSq57p69OrlEDoaLXrYvNS3hEw1Lo=");
-        byte[] exp = Base64.decode("e0bdyXVHsxzA9pZ/htVVPAsAgief6pEyLmdayG09N3GkBZFulTze/He524ETzTGtV7c1yGypTwjwVr+rNWmZs9YeXtYljySAQUbv1il5spmn7+iiwN6H21Keg6r4ciwzR7jhm7Wc0A1GGkh8OLmb2ZAh/fNDXHyL8mbEmLYh5C9n+DCTruTEjtS5TwueaRsUSNkexUgemqOVHxeOD0nZcVARr2AzMW6btNrQycol3+WTvLmbCeAZwcZnfPvZeU3r2UF73o8lP0vOUrOi095H2WZkJIVrAiV/+i4Sb76XXRgFlvWP6RbX9mYApIBhs69+yxp8lmVI0AABAwwV7PNXo+1UK6kzNi5spa32MRDMogP+wDHMyu8nHzLpIv9OTx0CmkZ0XO4Lla3d3UsPGq8g50a6gfrSOa9JHYFjfMzqIY/6SdZxr39Z8jVYiCfWGYplMTSDvfj3whk2J0DnSSdf6k6JstCjIXeMagKjwpcf9r0kq1Q9mAGhdJLqkM2LYHz3CP6GiWbGy5477GKnrhFDOeG1PtLv4YaTLrrjnNngIeeMK0tgkwBhsobVCD1hSs26I9/V+rdFhFb3/a/ob37cfnPmflbC0oOpSKoY6tZEaDp9u2ulNCpLYV6zrn3k9soP4q+sfsmXKMuWU2+rJGvBOEPh9Jo8Z+u7r+1PG+8VgAs=");
-        byte[] buf = new byte[512];
-
-        skippingEngine.seekTo(1L << 38);
-
-        skippingEngine.processBytes(in, 0, in.length, buf, 0);
-
-        if (!Arrays.areEqual(buf, exp))
-        {
-            fail("long seek failed");
-        }
-
-        skippingEngine.skip(-(1L << 38) - 512);
-
-        if (skippingEngine.getPosition() != 0)
-        {
-            fail("zero position came back as: " + skippingEngine.getPosition());
-        }
-
-        random.nextBytes(buf);
-
-        byte[] linOut = new byte[512];
-        byte[] skipOut = new byte[512];
-
-        linearEngine.init(true, params);
-
-        linearEngine.processBytes(buf, 0, buf.length, linOut, 0);
-        skippingEngine.processBytes(buf, 0, buf.length, skipOut, 0);
-
-        if (!Arrays.areEqual(linOut, skipOut))
-        {
-            fail("long output mismatch");
-        }
-    }
-
-    public void testChaCha()
-        throws Exception
-    {
-        CipherParameters params = new ParametersWithIV(new KeyParameter(Hex.decode("0053A6F94C9FF24598EB3E91E4378ADD3083D6297CCF2275C81B6EC11467BA0D")), Hex.decode("0D74DB42A91077DE"));
-        ChaChaEngine linearEngine = new ChaChaEngine();
-        ChaChaEngine skippingEngine = new ChaChaEngine();
-        Random random = new Random();
-
-        linearEngine.init(true, params);
-        skippingEngine.init(false, params);
-
-        testCipher(random, linearEngine, skippingEngine);
-
-        byte[] in = Base64.decode("pzVbCyj5JntIYN2Kvzf64/po+gTu/jvnZwU33F7UsfxpWRUDEGIQbArxqCQzEkGAwa4omXJ28WJveJNUQbQ5cBxS2aTt3sV0mrP+cneJ3OZkzo5Lhz0vuXs7Mav9uUzQFrU0DuMyGr1QJnKO0BUal0gLJ0v6YAo2SObDS5A4CTrsAgo0C2UXQmnuGzyYlhm4VoSNotD8auqyQXUrT8c2B/tLIcjyyl8ug1BabL2gAxN7oKbpvW5j2z3IZNZh+AKR4OR47RfjtYglOfgGQB1L5yiL9reuWEsRjbZmcEFfLmAAK0gtcP+0KDXV/DS4NxRx0sC7NkBzSC3uq2RbQOdjygFZ5qrmvwQZgLqlXs2cGiNzqx5CRjAvl83aAWAAerR5T2sHadRckW01oE2ivQixpgdPCGFHLeXoPMlkZ/r1cECYFAGPjMGSG2qnQZ/ZJbStEAZye/11r/dyoUgP+XTc6FDCCQHSdmyQljPHDQm7ioMTTkCf15YWv0kSuKOd4nBlLrGjSl9dsJsVU9TDRCqNExmk+lN3f0p8vr8TVNnir+OtEabOXzjOv6i3PHQZP27ML3Hy9TU1MHx1Q0bLdgi6yIw8lmzzBzok8j5VrCpNf2HmBqtRm1WDeTO9R62OWyaMT/dCT7AzEzP8ClBSq57p69OrlEDoaLXrYvNS3hEw1Lo=");
-        byte[] exp = Base64.decode("FACFDKSYxFYEOknCBPdfy5elbrDu8FzOImwpczlIk1HWlcbBPHXwHEnVaKrGtmthC7gA1DQJSeobO83KW3YZVkT8fcGnMFbeee6ISs9R4KqekE+Fs8uNWYlqsgT5xrErOC/cmz4B5envQx7EZK5h+fJupYO3vHqVk5/Q6c/v8ndDeBKSDTKA6eyybOwFVIjwJKPfuliu4mJGHphUIsp/OgRPs+VhlMrWXMVwsGzGHy9xZvTz6Xv6GJvrIoONMHh24YGOSt+83cFTepU7ur8anyDaoWzMz/n04eopnQd9TlREwYOZWdF0ZAJ0VZQYEixopmH+mlEZ/Nyw6IDswvyX3Zf/7lyDsM8bv2kz1gXvmQgUMqr6wXrOuJtxaH8aUvLVswCeNZEGFl17FHgwdD2MRzkmhfPRFlTgicd02D/ateBs5B0ORu5CKu3p/RGjU4YE68ONPNEkwkBRm5uGzdezTJmUzdJAEtoIxv1XfE1tytP7U+BpWdP5LY5NlEUo6sNR4O2nlSQJkAOzhoz821hnn1IL6r9DLDHIW40IhStDqc5Hy/8rEZgnnFhIE6pAD1PAGV5oJk/Z/V64bFvGkpD7xuhN5U2Eic7UheB8D227JtQQWTc8GhynlOWbmkYm/koKw+ieraN5IWE/KD2HFqJhxasB9lb3lMGh3zfgBKck5Lo=");
-        byte[] buf = new byte[512];
-
-        skippingEngine.seekTo(1L << 38);
-
-        skippingEngine.processBytes(in, 0, in.length, buf, 0);
-
-        if (!Arrays.areEqual(buf, exp))
-        {
-            fail("long seek failed");
-        }
-
-        skippingEngine.skip(-(1L << 38) - 512);
-
-        if (skippingEngine.getPosition() != 0)
-        {
-            fail("zero position came back as: " + skippingEngine.getPosition());
-        }
-
-        random.nextBytes(buf);
-
-        byte[] linOut = new byte[512];
-        byte[] skipOut = new byte[512];
-
-        linearEngine.init(true, params);
-
-        linearEngine.processBytes(buf, 0, buf.length, linOut, 0);
-        skippingEngine.processBytes(buf, 0, buf.length, skipOut, 0);
-
-        if (!Arrays.areEqual(linOut, skipOut))
-        {
-            fail("long output mismatch");
-        }
-    }
-
-    public void testCipher(Random random, SkippingStreamCipher linearEngine, SkippingStreamCipher skippingEngine)
-        throws Exception
-    {
-        byte[] startDataBuf = new byte[1 << 16];
-        byte[] startEncBuf = new byte[1 << 16];
-        byte[] startSeekBuf = new byte[1 << 16];
-
-        random.nextBytes(startDataBuf);
-
-        linearEngine.processBytes(startDataBuf, 0, startDataBuf.length, startEncBuf, 0);
-
-        byte[] incBuf = new byte[1 << 12];
-        byte[] linearOutBuf = new byte[1 << 12];
-        byte[] seekOutBuf = new byte[1 << 12];
-
-        for (long i = 0; i != 1L << 20; i++)
-        {
-            random.nextBytes(incBuf);
-
-            linearEngine.processBytes(incBuf, 0, incBuf.length, linearOutBuf, 0);
-
-            skippingEngine.seekTo(startDataBuf.length + i * incBuf.length);
-
-            if (skippingEngine.getPosition() != startDataBuf.length + i * incBuf.length)
-            {
-                fail(i + "th position came back as: " + skippingEngine.getPosition());
-            }
-
-            skippingEngine.processBytes(incBuf, 0, incBuf.length, seekOutBuf, 0);
-
-            if (!Arrays.areEqual(linearOutBuf, seekOutBuf))
-            {
-                fail("output mismatch");
-            }
-
-            if (skippingEngine.getPosition() != startDataBuf.length + (i + 1) * incBuf.length)
-            {
-                fail(i + "th + 1 position came back as: " + skippingEngine.getPosition());
-            }
-
-            skippingEngine.skip(-skippingEngine.getPosition());
-
-            if (skippingEngine.getPosition() != 0)
-            {
-                fail("zero position came back as: " + skippingEngine.getPosition());
-            }
-
-            skippingEngine.processBytes(startEncBuf, 0, startEncBuf.length, startSeekBuf, 0);
-
-            if (!Arrays.areEqual(startDataBuf, startSeekBuf))
-            {
-                fail("output mismatch");
-            }
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/BlockCipherMonteCarloTest.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/BlockCipherMonteCarloTest.java
deleted file mode 100644
index 72242c5..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/BlockCipherMonteCarloTest.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import org.bouncycastle.crypto.BlockCipher;
-import org.bouncycastle.crypto.BufferedBlockCipher;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-
-/**
- * a basic test that takes a cipher, key parameter, and an input
- * and output string. This test wraps the engine in a buffered block
- * cipher with padding disabled.
- */
-public class BlockCipherMonteCarloTest
-    extends SimpleTest
-{
-    int                 id;
-    int                 iterations;
-    BlockCipher         engine;
-    CipherParameters    param;
-    byte[]              input;
-    byte[]              output;
-
-    public BlockCipherMonteCarloTest(
-        int                 id,
-        int                 iterations,
-        BlockCipher         engine,
-        CipherParameters    param,
-        String              input,
-        String              output)
-    {
-        this.id = id;
-        this.iterations = iterations;
-        this.engine = engine;
-        this.param = param;
-        this.input = Hex.decode(input);
-        this.output = Hex.decode(output);
-    }
-
-    public String getName()
-    {
-        return engine.getAlgorithmName() + " Monte Carlo Test " + id;
-    }
-
-    public void performTest()
-        throws Exception
-    {
-        BufferedBlockCipher cipher = new BufferedBlockCipher(engine);
-
-        cipher.init(true, param);
-
-        byte[]  out = new byte[input.length];
-
-        System.arraycopy(input, 0, out, 0, out.length);
-
-        for (int i = 0; i != iterations; i++)
-        {
-            int len1 = cipher.processBytes(out, 0, out.length, out, 0);
-
-            cipher.doFinal(out, len1);
-        }
-
-        if (!areEqual(out, output))
-        {
-            fail("failed - " + "expected " + new String(Hex.encode(output)) + " got " + new String(Hex.encode(out)));
-        }
-
-        cipher.init(false, param);
-
-        for (int i = 0; i != iterations; i++)
-        {
-            int len1 = cipher.processBytes(out, 0, out.length, out, 0);
-
-            cipher.doFinal(out, len1);
-        }
-
-        if (!areEqual(input, out))
-        {
-            fail("failed reversal");
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/BlockCipherResetTest.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/BlockCipherResetTest.java
deleted file mode 100644
index a35835b..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/BlockCipherResetTest.java
+++ /dev/null
@@ -1,206 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import org.bouncycastle.crypto.BlockCipher;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.DataLengthException;
-import org.bouncycastle.crypto.InvalidCipherTextException;
-import org.bouncycastle.crypto.engines.AESEngine;
-import org.bouncycastle.crypto.engines.AESFastEngine;
-import org.bouncycastle.crypto.engines.AESLightEngine;
-import org.bouncycastle.crypto.engines.BlowfishEngine;
-import org.bouncycastle.crypto.engines.CAST5Engine;
-import org.bouncycastle.crypto.engines.CAST6Engine;
-import org.bouncycastle.crypto.engines.DESEngine;
-import org.bouncycastle.crypto.engines.DESedeEngine;
-import org.bouncycastle.crypto.engines.NoekeonEngine;
-import org.bouncycastle.crypto.engines.RC6Engine;
-import org.bouncycastle.crypto.engines.SEEDEngine;
-import org.bouncycastle.crypto.engines.SerpentEngine;
-import org.bouncycastle.crypto.engines.TEAEngine;
-import org.bouncycastle.crypto.engines.TwofishEngine;
-import org.bouncycastle.crypto.engines.XTEAEngine;
-import org.bouncycastle.crypto.modes.CBCBlockCipher;
-import org.bouncycastle.crypto.modes.CFBBlockCipher;
-import org.bouncycastle.crypto.modes.GOFBBlockCipher;
-import org.bouncycastle.crypto.modes.OFBBlockCipher;
-import org.bouncycastle.crypto.modes.OpenPGPCFBBlockCipher;
-import org.bouncycastle.crypto.modes.PGPCFBBlockCipher;
-import org.bouncycastle.crypto.modes.SICBlockCipher;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.crypto.params.ParametersWithIV;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-
-/**
- * Test whether block ciphers implement reset contract on init, encrypt/decrypt and reset.
- */
-public class BlockCipherResetTest
-    extends SimpleTest
-{
-
-    public String getName()
-    {
-        return "Block Cipher Reset";
-    }
-
-    public void performTest()
-        throws Exception
-    {
-        // 128 bit block ciphers
-        testReset("AESFastEngine", new AESFastEngine(), new AESFastEngine(), new KeyParameter(new byte[16]));
-        testReset("AESEngine", new AESEngine(), new AESEngine(), new KeyParameter(new byte[16]));
-        testReset("AESLightEngine", new AESLightEngine(), new AESLightEngine(), new KeyParameter(new byte[16]));
-        testReset("Twofish", new TwofishEngine(), new TwofishEngine(), new KeyParameter(new byte[16]));
-        testReset("NoekeonEngine", new NoekeonEngine(), new NoekeonEngine(), new KeyParameter(new byte[16]));
-        testReset("SerpentEngine", new SerpentEngine(), new SerpentEngine(), new KeyParameter(new byte[16]));
-        testReset("SEEDEngine", new SEEDEngine(), new SEEDEngine(), new KeyParameter(new byte[16]));
-        testReset("CAST6Engine", new CAST6Engine(), new CAST6Engine(), new KeyParameter(new byte[16]));
-        testReset("RC6Engine", new RC6Engine(), new RC6Engine(), new KeyParameter(new byte[16]));
-
-        // 64 bit block ciphers
-        testReset("DESEngine", new DESEngine(), new DESEngine(), new KeyParameter(new byte[8]));
-        testReset("BlowfishEngine", new BlowfishEngine(), new BlowfishEngine(), new KeyParameter(new byte[8]));
-        testReset("CAST5Engine", new CAST5Engine(), new CAST5Engine(), new KeyParameter(new byte[8]));
-        testReset("DESedeEngine", new DESedeEngine(), new DESedeEngine(), new KeyParameter(new byte[24]));
-        testReset("TEAEngine", new TEAEngine(), new TEAEngine(), new KeyParameter(new byte[16]));
-        testReset("XTEAEngine", new XTEAEngine(), new XTEAEngine(), new KeyParameter(new byte[16]));
-
-        // primitive block cipher modes (don't reset on processBlock)
-        testModeReset("AES/CBC", new CBCBlockCipher(new AESEngine()), new CBCBlockCipher(new AESEngine()),
-            new ParametersWithIV(new KeyParameter(new byte[16]), new byte[16]));
-        testModeReset("AES/SIC", new SICBlockCipher(new AESEngine()), new SICBlockCipher(new AESEngine()),
-            new ParametersWithIV(new KeyParameter(new byte[16]), new byte[16]));
-        testModeReset("AES/CFB", new CFBBlockCipher(new AESEngine(), 128), new CFBBlockCipher(new AESEngine(), 128),
-            new ParametersWithIV(new KeyParameter(new byte[16]), new byte[16]));
-        testModeReset("AES/OFB", new OFBBlockCipher(new AESEngine(), 128), new OFBBlockCipher(new AESEngine(), 128),
-            new ParametersWithIV(new KeyParameter(new byte[16]), new byte[16]));
-        testModeReset("AES/GCTR", new GOFBBlockCipher(new DESEngine()), new GOFBBlockCipher(new DESEngine()),
-            new ParametersWithIV(new KeyParameter(new byte[8]), new byte[8]));
-        testModeReset("AES/OpenPGPCFB", new OpenPGPCFBBlockCipher(new AESEngine()), new OpenPGPCFBBlockCipher(
-            new AESEngine()), new KeyParameter(new byte[16]));
-        testModeReset("AES/PGPCFB", new PGPCFBBlockCipher(new AESEngine(), false), new PGPCFBBlockCipher(
-            new AESEngine(), false), new KeyParameter(new byte[16]));
-
-        // PGPCFB with IV is broken (it's also not a PRP, so probably shouldn't be a BlockCipher)
-        // testModeReset("AES/PGPCFBwithIV", new PGPCFBBlockCipher(new AESEngine(), true), new
-        // PGPCFBBlockCipher(
-        // new AESEngine(), true), new ParametersWithIV(new KeyParameter(new byte[16]), new
-        // byte[16]));
-        // testModeReset("AES/PGPCFBwithIV_NoIV", new PGPCFBBlockCipher(new AESEngine(), true), new
-        // PGPCFBBlockCipher(
-        // new AESEngine(), true), new KeyParameter(new byte[16]));
-
-    }
-
-    private void testModeReset(String test, BlockCipher cipher1, BlockCipher cipher2, CipherParameters params)
-        throws InvalidCipherTextException
-    {
-        testReset(test, false, cipher1, cipher2, params);
-    }
-
-    private void testReset(String test, BlockCipher cipher1, BlockCipher cipher2, CipherParameters params)
-        throws InvalidCipherTextException
-    {
-        testReset(test, true, cipher1, cipher2, params);
-    }
-
-    private void testReset(String test,
-                           boolean testCryptReset,
-                           BlockCipher cipher1,
-                           BlockCipher cipher2,
-                           CipherParameters params)
-        throws InvalidCipherTextException
-    {
-        cipher1.init(true, params);
-
-        byte[] plaintext = new byte[cipher1.getBlockSize()];
-        byte[] ciphertext = new byte[(cipher1.getAlgorithmName().indexOf("PGPCFBwithIV")) > -1 ? 2 * cipher1.getBlockSize() + 2
-            : cipher1.getBlockSize()];
-
-        // Establish baseline answer
-        crypt(cipher1, true, plaintext, ciphertext);
-
-        // Test encryption resets
-        checkReset(test, testCryptReset, cipher1, params, true, plaintext, ciphertext);
-
-        // Test decryption resets with fresh instance
-        cipher2.init(false, params);
-        checkReset(test, testCryptReset, cipher2, params, false, ciphertext, plaintext);
-    }
-
-    private void checkReset(String test,
-                            boolean testCryptReset,
-                            BlockCipher cipher,
-                            CipherParameters params,
-                            boolean encrypt,
-                            byte[] pretext,
-                            byte[] posttext)
-        throws InvalidCipherTextException
-    {
-        // Do initial run
-        byte[] output = new byte[posttext.length];
-        crypt(cipher, encrypt, pretext, output);
-
-        // Check encrypt resets cipher
-        if (testCryptReset)
-        {
-            crypt(cipher, encrypt, pretext, output);
-            if (!Arrays.areEqual(output, posttext))
-            {
-                fail(test + (encrypt ? " encrypt" : " decrypt") + " did not reset cipher.");
-            }
-        }
-
-        // Check init resets data
-        cipher.processBlock(pretext, 0, output, 0);
-        cipher.init(encrypt, params);
-
-        try
-        {
-            crypt(cipher, encrypt, pretext, output);
-        }
-        catch (DataLengthException e)
-        {
-            fail(test + " init did not reset data.");
-        }
-        if (!Arrays.areEqual(output, posttext))
-        {
-            fail(test + " init did not reset data.", new String(Hex.encode(posttext)), new String(Hex.encode(output)));
-        }
-
-        // Check reset resets data
-        cipher.processBlock(pretext, 0, output, 0);
-        cipher.reset();
-
-        try
-        {
-            crypt(cipher, encrypt, pretext, output);
-        }
-        catch (DataLengthException e)
-        {
-            fail(test + " reset did not reset data.");
-        }
-        if (!Arrays.areEqual(output, posttext))
-        {
-            fail(test + " reset did not reset data.");
-        }
-    }
-
-    private static void crypt(BlockCipher cipher1, boolean encrypt, byte[] plaintext, byte[] output)
-        throws InvalidCipherTextException
-    {
-        cipher1.processBlock(plaintext, 0, output, 0);
-        if ((cipher1.getAlgorithmName().indexOf("PGPCFBwithIV") > -1) && !encrypt)
-        {
-            // Process past IV in first block
-            cipher1.processBlock(plaintext, cipher1.getBlockSize(), output, 0);
-        }
-    }
-
-    public static void main(String[] args)
-    {
-        runTest(new BlockCipherResetTest());
-    }
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/BlockCipherVectorTest.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/BlockCipherVectorTest.java
deleted file mode 100644
index 36b729c..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/BlockCipherVectorTest.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import org.bouncycastle.crypto.BlockCipher;
-import org.bouncycastle.crypto.BufferedBlockCipher;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-
-/**
- * a basic test that takes a cipher, key parameter, and an input
- * and output string. This test wraps the engine in a buffered block
- * cipher with padding disabled.
- */
-public class BlockCipherVectorTest
-    extends SimpleTest
-{
-    int                 id;
-    BlockCipher         engine;
-    CipherParameters    param;
-    byte[]              input;
-    byte[]              output;
-
-    public BlockCipherVectorTest(
-        int                 id,
-        BlockCipher         engine,
-        CipherParameters    param,
-        String              input,
-        String              output)
-    {
-        this.id = id;
-        this.engine = engine;
-        this.param = param;
-        this.input = Hex.decode(input);
-        this.output = Hex.decode(output);
-    }
-
-    public String getName()
-    {
-        return engine.getAlgorithmName() + " Vector Test " + id;
-    }
-
-    public void performTest()
-        throws Exception
-    {
-        BufferedBlockCipher cipher = new BufferedBlockCipher(engine);
-
-        cipher.init(true, param);
-
-        byte[]  out = new byte[input.length];
-
-        int len1 = cipher.processBytes(input, 0, input.length, out, 0);
-
-        cipher.doFinal(out, len1);
-
-        if (!areEqual(out, output))
-        {
-            fail("failed - " + "expected " + new String(Hex.encode(output)) + " got " + new String(Hex.encode(out)));
-        }
-
-        cipher.init(false, param);
-
-        int len2 = cipher.processBytes(output, 0, output.length, out, 0);
-
-        cipher.doFinal(out, len2);
-
-        if (!areEqual(input, out))
-        {
-            fail("failed reversal got " + new String(Hex.encode(out)));
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/BlowfishTest.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/BlowfishTest.java
deleted file mode 100644
index 757788e..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/BlowfishTest.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import org.bouncycastle.crypto.engines.BlowfishEngine;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-
-/**
- * blowfish tester - vectors from http://www.counterpane.com/vectors.txt
- */
-public class BlowfishTest
-    extends CipherTest
-{
-    static SimpleTest[]  tests = 
-            {
-                new BlockCipherVectorTest(0, new BlowfishEngine(),
-                        new KeyParameter(Hex.decode("0000000000000000")),
-                        "0000000000000000", "4EF997456198DD78"),
-                new BlockCipherVectorTest(1, new BlowfishEngine(),
-                        new KeyParameter(Hex.decode("FFFFFFFFFFFFFFFF")),
-                        "FFFFFFFFFFFFFFFF", "51866FD5B85ECB8A"),
-                new BlockCipherVectorTest(2, new BlowfishEngine(),
-                        new KeyParameter(Hex.decode("3000000000000000")),
-                        "1000000000000001", "7D856F9A613063F2"),
-                new BlockCipherVectorTest(3, new BlowfishEngine(),
-                        new KeyParameter(Hex.decode("1111111111111111")),
-                        "1111111111111111", "2466DD878B963C9D"),
-                new BlockCipherVectorTest(4, new BlowfishEngine(),
-                        new KeyParameter(Hex.decode("0123456789ABCDEF")),
-                        "1111111111111111", "61F9C3802281B096"),
-                new BlockCipherVectorTest(5, new BlowfishEngine(),
-                        new KeyParameter(Hex.decode("FEDCBA9876543210")),
-                        "0123456789ABCDEF", "0ACEAB0FC6A0A28D"),
-                new BlockCipherVectorTest(6, new BlowfishEngine(),
-                        new KeyParameter(Hex.decode("7CA110454A1A6E57")),
-                        "01A1D6D039776742", "59C68245EB05282B"),
-                new BlockCipherVectorTest(7, new BlowfishEngine(),
-                        new KeyParameter(Hex.decode("0131D9619DC1376E")),
-                        "5CD54CA83DEF57DA", "B1B8CC0B250F09A0"),
-            };
-
-    BlowfishTest()
-    {
-        super(tests, new BlowfishEngine(), new KeyParameter(new byte[16]));
-    }
-
-    public String getName()
-    {
-        return "Blowfish";
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        runTest(new BlowfishTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/CAST5Test.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/CAST5Test.java
deleted file mode 100644
index c651d87..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/CAST5Test.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import org.bouncycastle.crypto.engines.CAST5Engine;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-
-/**
- * cast tester - vectors from http://www.ietf.org/rfc/rfc2144.txt
- */
-public class CAST5Test
-    extends CipherTest
-{
-    static SimpleTest[]  tests = {
-        new BlockCipherVectorTest(0, new CAST5Engine(),
-            new KeyParameter(Hex.decode("0123456712345678234567893456789A")),
-            "0123456789ABCDEF", 
-            "238B4FE5847E44B2"),
-        new BlockCipherVectorTest(0, new CAST5Engine(),
-            new KeyParameter(Hex.decode("01234567123456782345")),
-            "0123456789ABCDEF", 
-            "EB6A711A2C02271B"),
-        new BlockCipherVectorTest(0, new CAST5Engine(),
-            new KeyParameter(Hex.decode("0123456712")),
-            "0123456789ABCDEF", 
-            "7Ac816d16E9B302E"),
-            };
-
-    CAST5Test()
-    {
-        super(tests, new CAST5Engine(), new KeyParameter(new byte[16]));
-    }
-
-    public String getName()
-    {
-        return "CAST5";
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        runTest(new CAST5Test());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/CAST6Test.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/CAST6Test.java
deleted file mode 100644
index ef035a5..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/CAST6Test.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import org.bouncycastle.crypto.engines.CAST6Engine;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-
-/**
- * cast6 tester - vectors from http://www.ietf.org/rfc/rfc2612.txt
- */
-public class CAST6Test
-    extends CipherTest
-{
-    static SimpleTest[]  tests = {
-        new BlockCipherVectorTest(0, new CAST6Engine(),
-            new KeyParameter(Hex.decode("2342bb9efa38542c0af75647f29f615d")),
-            "00000000000000000000000000000000", 
-            "c842a08972b43d20836c91d1b7530f6b"),
-        new BlockCipherVectorTest(0, new CAST6Engine(),
-            new KeyParameter(Hex.decode("2342bb9efa38542cbed0ac83940ac298bac77a7717942863")),
-            "00000000000000000000000000000000", 
-            "1b386c0210dcadcbdd0e41aa08a7a7e8"),
-        new BlockCipherVectorTest(0, new CAST6Engine(),
-            new KeyParameter(Hex.decode("2342bb9efa38542cbed0ac83940ac2988d7c47ce264908461cc1b5137ae6b604")),
-            "00000000000000000000000000000000", 
-            "4f6a2038286897b9c9870136553317fa")
-            };
-
-    CAST6Test()
-    {
-        super(tests, new CAST6Engine(), new KeyParameter(new byte[16]));
-    }
-
-    public String getName()
-    {
-        return "CAST6";
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        runTest(new CAST6Test());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/CCMTest.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/CCMTest.java
deleted file mode 100644
index 2bbfe2a..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/CCMTest.java
+++ /dev/null
@@ -1,305 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import org.bouncycastle.crypto.InvalidCipherTextException;
-import org.bouncycastle.crypto.engines.AESEngine;
-import org.bouncycastle.crypto.engines.DESEngine;
-import org.bouncycastle.crypto.modes.CCMBlockCipher;
-import org.bouncycastle.crypto.params.AEADParameters;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.crypto.params.ParametersWithIV;
-import org.bouncycastle.util.Strings;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-
-/**
- * First four test vectors from
- * NIST Special Publication 800-38C.
- */
-public class CCMTest
-    extends SimpleTest
-{
-    private byte[] K1 = Hex.decode("404142434445464748494a4b4c4d4e4f");
-    private byte[] N1 = Hex.decode("10111213141516");
-    private byte[] A1 = Hex.decode("0001020304050607");
-    private byte[] P1 = Hex.decode("20212223");
-    private byte[] C1 = Hex.decode("7162015b4dac255d");
-    private byte[] T1 = Hex.decode("6084341b");
-
-    private byte[] K2 = Hex.decode("404142434445464748494a4b4c4d4e4f");
-    private byte[] N2 = Hex.decode("1011121314151617");
-    private byte[] A2 = Hex.decode("000102030405060708090a0b0c0d0e0f");
-    private byte[] P2 = Hex.decode("202122232425262728292a2b2c2d2e2f");
-    private byte[] C2 = Hex.decode("d2a1f0e051ea5f62081a7792073d593d1fc64fbfaccd");
-    private byte[] T2 = Hex.decode("7f479ffca464");
-
-    private byte[] K3 = Hex.decode("404142434445464748494a4b4c4d4e4f");
-    private byte[] N3 = Hex.decode("101112131415161718191a1b");
-    private byte[] A3 = Hex.decode("000102030405060708090a0b0c0d0e0f10111213");
-    private byte[] P3 = Hex.decode("202122232425262728292a2b2c2d2e2f3031323334353637");
-    private byte[] C3 = Hex.decode("e3b201a9f5b71a7a9b1ceaeccd97e70b6176aad9a4428aa5484392fbc1b09951");
-    private byte[] T3 = Hex.decode("67c99240c7d51048");
-
-    private byte[] K4 = Hex.decode("404142434445464748494a4b4c4d4e4f");
-    private byte[] N4 = Hex.decode("101112131415161718191a1b1c");
-    private byte[] A4 = Hex.decode("000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f404142434445464748494a4b4c4d4e4f505152535455565758595a5b5c5d5e5f606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f808182838485868788898a8b8c8d8e8f909192939495969798999a9b9c9d9e9fa0a1a2a3a4a5a6a7a8a9aaabacadaeafb0b1b2b3b4b5b6b7b8b9babbbcbdbebfc0c1c2c3c4c5c6c7c8c9cacbcccdcecfd0d1d2d3d4d5d6d7d8d9dadbdcdddedfe0e1e2e3e4e5e6e7e8e9eaebecedeeeff0f1f2f3f4f5f6f7f8f9fafbfcfdfeff");
-    private byte[] P4 = Hex.decode("202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f");
-    private byte[] C4 = Hex.decode("69915dad1e84c6376a68c2967e4dab615ae0fd1faec44cc484828529463ccf72b4ac6bec93e8598e7f0dadbcea5b");
-    private byte[] T4 = Hex.decode("f4dd5d0ee404617225ffe34fce91");
-
-    //
-    // long data vector
-    //
-    private byte[] C5 = Hex.decode("49b17d8d3ea4e6174a48e2b65e6d8b417ac0dd3f8ee46ce4a4a2a509661cef52528c1cd9805333a5cfd482fa3f095a3c2fdd1cc47771c5e55fddd60b5c8d6d3fa5c8dd79d08b16242b6642106e7c0c28bd1064b31e6d7c9800c8397dbc3fa8071e6a38278b386c18d65d39c6ad1ef9501a5c8f68d38eb6474799f3cc898b4b9b97e87f9c95ce5c51bc9d758f17119586663a5684e0a0daf6520ec572b87473eb141d10471e4799ded9e607655402eca5176bbf792ef39dd135ac8d710da8e9e854fd3b95c681023f36b5ebe2fb213d0b62dd6e9e3cfe190b792ccb20c53423b2dca128f861a61d306910e1af418839467e466f0ec361d2539eedd99d4724f1b51c07beb40e875a87491ec8b27cd1");
-    private byte[] T5 = Hex.decode("5c768856796b627b13ec8641581b");
-
-    public void performTest()
-        throws Exception
-    {
-        CCMBlockCipher ccm = new CCMBlockCipher(new AESEngine());
-
-        checkVectors(0, ccm, K1, 32, N1, A1, P1, T1, C1);
-        checkVectors(1, ccm, K2, 48, N2, A2, P2, T2, C2);
-        checkVectors(2, ccm, K3, 64, N3, A3, P3, T3, C3);
-
-        ivParamTest(0, ccm, K1, N1);
-
-        //
-        // 4 has a reduced associated text which needs to be replicated
-        //
-        byte[] a4 = new byte[65536]; // 524288 / 8
-
-        for (int i = 0; i < a4.length; i += A4.length)
-        {
-            System.arraycopy(A4, 0, a4, i, A4.length);
-        }
-
-        checkVectors(3, ccm, K4, 112, N4, a4, P4, T4, C4);
-
-        //
-        // long data test
-        //
-        checkVectors(4, ccm, K4, 112, N4, A4, A4, T5, C5);
-
-        // decryption with output specified, non-zero offset.
-        ccm.init(false, new AEADParameters(new KeyParameter(K2), 48, N2, A2));
-
-        byte[] inBuf = new byte[C2.length + 10];
-        byte[] outBuf = new byte[ccm.getOutputSize(C2.length) + 10];
-
-        System.arraycopy(C2, 0, inBuf, 10, C2.length);
-
-        int len = ccm.processPacket(inBuf, 10, C2.length, outBuf, 10);
-        byte[] out = ccm.processPacket(C2, 0, C2.length);
-
-        if (len != out.length || !isEqual(out, outBuf, 10))
-        {
-            fail("decryption output incorrect");
-        }
-
-        // encryption with output specified, non-zero offset.
-        ccm.init(true, new AEADParameters(new KeyParameter(K2), 48, N2, A2));
-
-        int inLen = len;
-        inBuf = outBuf;
-        outBuf = new byte[ccm.getOutputSize(inLen) + 10];
-
-        len = ccm.processPacket(inBuf, 10, inLen, outBuf, 10);
-        out = ccm.processPacket(inBuf, 10, inLen);
-
-        if (len != out.length || !isEqual(out, outBuf, 10))
-        {
-            fail("encryption output incorrect");
-        }
-
-        //
-        // exception tests
-        //
-
-        try
-        {
-            ccm.init(false, new AEADParameters(new KeyParameter(K1), 32, N2, A2));
-
-            ccm.processPacket(C2, 0, C2.length);
-
-            fail("invalid cipher text not picked up");
-        }
-        catch (InvalidCipherTextException e)
-        {
-            // expected
-        }
-
-        try
-        {
-            ccm = new CCMBlockCipher(new DESEngine());
-
-            fail("incorrect block size not picked up");
-        }
-        catch (IllegalArgumentException e)
-        {
-            // expected
-        }
-
-        try
-        {
-            ccm.init(false, new KeyParameter(K1));
-
-            fail("illegal argument not picked up");
-        }
-        catch (IllegalArgumentException e)
-        {
-            // expected
-        }
-
-        AEADTestUtil.testReset(this, new CCMBlockCipher(new AESEngine()), new CCMBlockCipher(new AESEngine()), new AEADParameters(new KeyParameter(K1), 32, N2));
-        AEADTestUtil.testTampering(this, ccm, new AEADParameters(new KeyParameter(K1), 32, N2));
-        AEADTestUtil.testOutputSizes(this, new CCMBlockCipher(new AESEngine()), new AEADParameters(
-                new KeyParameter(K1), 32, N2));
-        AEADTestUtil.testBufferSizeChecks(this, new CCMBlockCipher(new AESEngine()), new AEADParameters(
-                new KeyParameter(K1), 32, N2));
-    }
-
-    private boolean isEqual(byte[] exp, byte[] other, int off)
-    {
-        for (int i = 0; i != exp.length; i++)
-        {
-            if (exp[i] != other[off + i])
-            {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    private void checkVectors(
-        int count,
-        CCMBlockCipher ccm,
-        byte[] k,
-        int macSize,
-        byte[] n,
-        byte[] a,
-        byte[] p,
-        byte[] t,
-        byte[] c)
-        throws InvalidCipherTextException
-    {
-        byte[] fa = new byte[a.length / 2];
-        byte[] la = new byte[a.length - (a.length / 2)];
-        System.arraycopy(a, 0, fa, 0, fa.length);
-        System.arraycopy(a, fa.length, la, 0, la.length);
-
-        checkVectors(count, ccm, "all initial associated data", k, macSize, n, a, null, p, t, c);
-        checkVectors(count, ccm, "subsequent associated data", k, macSize, n, null, a, p, t, c);
-        checkVectors(count, ccm, "split associated data", k, macSize, n, fa, la, p, t, c);
-        checkVectors(count, ccm, "reuse key", null, macSize, n, fa, la, p, t, c);
-    }
-
-    private void checkVectors(
-        int count,
-        CCMBlockCipher ccm,
-        String additionalDataType,
-        byte[] k,
-        int macSize,
-        byte[] n,
-        byte[] a,
-        byte[] sa,
-        byte[] p,
-        byte[] t,
-        byte[] c)
-        throws InvalidCipherTextException
-    {
-        KeyParameter keyParam = (k == null) ? null : new KeyParameter(k);
-
-        ccm.init(true, new AEADParameters(keyParam, macSize, n, a));
-
-        byte[] enc = new byte[c.length];
-
-        if (sa != null)
-        {
-            ccm.processAADBytes(sa, 0, sa.length);
-        }
-
-        int len = ccm.processBytes(p, 0, p.length, enc, 0);
-
-        len += ccm.doFinal(enc, len);
-
-        if (!areEqual(c, enc))
-        {
-            fail("encrypted stream fails to match in test " + count + " with " + additionalDataType);
-        }
-
-        ccm.init(false, new AEADParameters(keyParam, macSize, n, a));
-
-        byte[] tmp = new byte[enc.length];
-
-        if (sa != null)
-        {
-            ccm.processAADBytes(sa, 0, sa.length);
-        }
-
-        len = ccm.processBytes(enc, 0, enc.length, tmp, 0);
-
-        len += ccm.doFinal(tmp, len);
-
-        byte[] dec = new byte[len];
-
-        System.arraycopy(tmp, 0, dec, 0, len);
-
-        if (!areEqual(p, dec))
-        {
-            fail("decrypted stream fails to match in test " + count + " with " + additionalDataType,
-                    new String(Hex.encode(p)), new String(Hex.encode(dec)));
-        }
-
-        if (!areEqual(t, ccm.getMac()))
-        {
-            fail("MAC fails to match in test " + count + " with " + additionalDataType);
-        }
-    }
-
-    private void ivParamTest(
-        int count,
-        CCMBlockCipher ccm,
-        byte[] k,
-        byte[] n)
-        throws InvalidCipherTextException
-    {
-        byte[] p = Strings.toByteArray("hello world!!");
-
-        ccm.init(true, new ParametersWithIV(new KeyParameter(k), n));
-
-        byte[] enc = new byte[p.length + 8];
-
-        int len = ccm.processBytes(p, 0, p.length, enc, 0);
-
-        len += ccm.doFinal(enc, len);
-
-        ccm.init(false, new ParametersWithIV(new KeyParameter(k), n));
-
-        byte[] tmp = new byte[enc.length];
-
-        len = ccm.processBytes(enc, 0, enc.length, tmp, 0);
-
-        len += ccm.doFinal(tmp, len);
-
-        byte[] dec = new byte[len];
-
-        System.arraycopy(tmp, 0, dec, 0, len);
-
-        if (!areEqual(p, dec))
-        {
-            fail("decrypted stream fails to match in test " + count);
-        }
-    }
-
-    public String getName()
-    {
-        return "CCM";
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        runTest(new CCMTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/CMacTest.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/CMacTest.java
deleted file mode 100644
index 720f8ea..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/CMacTest.java
+++ /dev/null
@@ -1,321 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import org.bouncycastle.crypto.BlockCipher;
-import org.bouncycastle.crypto.Mac;
-import org.bouncycastle.crypto.engines.AESEngine;
-import org.bouncycastle.crypto.engines.AESFastEngine;
-import org.bouncycastle.crypto.macs.CMac;
-import org.bouncycastle.crypto.macs.CMacWithIV;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.crypto.params.ParametersWithIV;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-
-/**
- * CMAC tester - <a href="http://www.nuee.nagoya-u.ac.jp/labs/tiwata/omac/tv/omac1-tv.txt">Official Test Vectors</a>.
- */
-public class CMacTest
-    extends SimpleTest
-{
-    private static final byte[] keyBytes128 = Hex.decode("2b7e151628aed2a6abf7158809cf4f3c");
-    private static final byte[] keyBytes192 = Hex.decode(
-              "8e73b0f7da0e6452c810f32b809079e5"
-            + "62f8ead2522c6b7b");
-    private static final byte[] keyBytes256 = Hex.decode(
-              "603deb1015ca71be2b73aef0857d7781"
-            + "1f352c073b6108d72d9810a30914dff4");
-
-    private static final byte[] input0 = Hex.decode("");
-    private static final byte[] input16 = Hex.decode("6bc1bee22e409f96e93d7e117393172a");
-    private static final byte[] input40 = Hex.decode(
-              "6bc1bee22e409f96e93d7e117393172a"
-            + "ae2d8a571e03ac9c9eb76fac45af8e5130c81c46a35ce411");
-    private static final byte[] input64 = Hex.decode(
-              "6bc1bee22e409f96e93d7e117393172a"
-            + "ae2d8a571e03ac9c9eb76fac45af8e51"
-            + "30c81c46a35ce411e5fbc1191a0a52ef"
-            + "f69f2445df4f9b17ad2b417be66c3710");
-
-    private static final byte[] output_k128_m0 = Hex.decode("bb1d6929e95937287fa37d129b756746");
-    private static final byte[] output_k128_m16 = Hex.decode("070a16b46b4d4144f79bdd9dd04a287c");
-    private static final byte[] output_k128_m40 = Hex.decode("dfa66747de9ae63030ca32611497c827");
-    private static final byte[] output_k128_m64 = Hex.decode("51f0bebf7e3b9d92fc49741779363cfe");
-
-    private static final byte[] output_k192_m0 = Hex.decode("d17ddf46adaacde531cac483de7a9367");
-    private static final byte[] output_k192_m16 = Hex.decode("9e99a7bf31e710900662f65e617c5184");
-    private static final byte[] output_k192_m40 = Hex.decode("8a1de5be2eb31aad089a82e6ee908b0e");
-    private static final byte[] output_k192_m64 = Hex.decode("a1d5df0eed790f794d77589659f39a11");
-
-    private static final byte[] output_k256_m0 = Hex.decode("028962f61b7bf89efc6b551f4667d983");
-    private static final byte[] output_k256_m16 = Hex.decode("28a7023f452e8f82bd4bf28d8c37c35c");
-    private static final byte[] output_k256_m40 = Hex.decode("aaf3d8f1de5640c232f5b169b9c911e6");
-    private static final byte[] output_k256_m64 = Hex.decode("e1992190549f6ed5696a2c056c315410");
-
-    public CMacTest()
-    {
-    }
-
-    public void performTest()
-    {
-        BlockCipher cipher = new AESFastEngine();
-        Mac mac = new CMac(cipher, 128);
-
-        //128 bytes key
-
-        KeyParameter key = new KeyParameter(keyBytes128);
-
-        // 0 bytes message - 128 bytes key
-        mac.init(key);
-
-        mac.update(input0, 0, input0.length);
-
-        byte[] out = new byte[16];
-
-        mac.doFinal(out, 0);
-
-        if (!areEqual(out, output_k128_m0))
-        {
-            fail("Failed - expected " + new String(Hex.encode(output_k128_m0))
-                + " got " + new String(Hex.encode(out)));
-        }
-
-        // 16 bytes message - 128 bytes key
-        mac.init(key);
-
-        mac.update(input16, 0, input16.length);
-
-        out = new byte[16];
-
-        mac.doFinal(out, 0);
-
-        if (!areEqual(out, output_k128_m16))
-        {
-            fail("Failed - expected " + new String(Hex.encode(output_k128_m16))
-                + " got " + new String(Hex.encode(out)));
-        }
-
-        // 40 bytes message - 128 bytes key
-        mac.init(key);
-
-        mac.update(input40, 0, input40.length);
-
-        out = new byte[16];
-
-        mac.doFinal(out, 0);
-
-        if (!areEqual(out, output_k128_m40))
-        {
-            fail("Failed - expected " + new String(Hex.encode(output_k128_m40))
-                + " got " + new String(Hex.encode(out)));
-        }
-
-        // 64 bytes message - 128 bytes key
-        mac.init(key);
-
-        mac.update(input64, 0, input64.length);
-
-        out = new byte[16];
-
-        mac.doFinal(out, 0);
-
-        if (!areEqual(out, output_k128_m64))
-        {
-            fail("Failed - expected " + new String(Hex.encode(output_k128_m64))
-                + " got " + new String(Hex.encode(out)));
-        }
-
-        //192 bytes key
-
-        key = new KeyParameter(keyBytes192);
-
-        // 0 bytes message - 192 bytes key
-        mac.init(key);
-
-        mac.update(input0, 0, input0.length);
-
-        out = new byte[16];
-
-        mac.doFinal(out, 0);
-
-        if (!areEqual(out, output_k192_m0))
-        {
-            fail("Failed - expected " + new String(Hex.encode(output_k192_m0))
-                + " got " + new String(Hex.encode(out)));
-        }
-
-        // 16 bytes message - 192 bytes key
-        mac.init(key);
-
-        mac.update(input16, 0, input16.length);
-
-        out = new byte[16];
-
-        mac.doFinal(out, 0);
-
-        if (!areEqual(out, output_k192_m16))
-        {
-            fail("Failed - expected " + new String(Hex.encode(output_k192_m16))
-                + " got " + new String(Hex.encode(out)));
-        }
-
-        // 40 bytes message - 192 bytes key
-        mac.init(key);
-
-        mac.update(input40, 0, input40.length);
-
-        out = new byte[16];
-
-        mac.doFinal(out, 0);
-
-        if (!areEqual(out, output_k192_m40))
-        {
-            fail("Failed - expected " + new String(Hex.encode(output_k192_m40))
-                + " got " + new String(Hex.encode(out)));
-        }
-
-        // 64 bytes message - 192 bytes key
-        mac.init(key);
-
-        mac.update(input64, 0, input64.length);
-
-        out = new byte[16];
-
-        mac.doFinal(out, 0);
-
-        if (!areEqual(out, output_k192_m64))
-        {
-            fail("Failed - expected " + new String(Hex.encode(output_k192_m64))
-                + " got " + new String(Hex.encode(out)));
-        }
-
-        //256 bytes key
-
-        key = new KeyParameter(keyBytes256);
-
-        // 0 bytes message - 256 bytes key
-        mac.init(key);
-
-        mac.update(input0, 0, input0.length);
-
-        out = new byte[16];
-
-        mac.doFinal(out, 0);
-
-        if (!areEqual(out, output_k256_m0))
-        {
-            fail("Failed - expected " + new String(Hex.encode(output_k256_m0))
-                + " got " + new String(Hex.encode(out)));
-        }
-
-        // 16 bytes message - 256 bytes key
-        mac.init(key);
-
-        mac.update(input16, 0, input16.length);
-
-        out = new byte[16];
-
-        mac.doFinal(out, 0);
-
-        if (!areEqual(out, output_k256_m16))
-        {
-            fail("Failed - expected " + new String(Hex.encode(output_k256_m16))
-                + " got " + new String(Hex.encode(out)));
-        }
-
-        // 40 bytes message - 256 bytes key
-        mac.init(key);
-
-        mac.update(input40, 0, input40.length);
-
-        out = new byte[16];
-
-        mac.doFinal(out, 0);
-
-        if (!areEqual(out, output_k256_m40))
-        {
-            fail("Failed - expected " + new String(Hex.encode(output_k256_m40))
-                + " got " + new String(Hex.encode(out)));
-        }
-
-        // 64 bytes message - 256 bytes key
-        mac.init(key);
-
-        mac.update(input64, 0, input64.length);
-
-        out = new byte[16];
-
-        mac.doFinal(out, 0);
-
-        if (!areEqual(out, output_k256_m64))
-        {
-            fail("Failed - expected " + new String(Hex.encode(output_k256_m64))
-                + " got " + new String(Hex.encode(out)));
-        }
-
-        // CMAC with IV
-        // 16 bytes message - 256 bytes key
-        mac = new CMacWithIV(new AESFastEngine());
-
-        mac.init(key);
-
-        mac.update(input16, 0, input16.length);
-
-        out = new byte[16];
-
-        mac.doFinal(out, 0);
-
-        if (!areEqual(out, output_k256_m16))
-        {
-            fail("Failed - expected " + new String(Hex.encode(output_k256_m16))
-                + " got " + new String(Hex.encode(out)));
-        }
-
-                // CMAC with IV
-        // 16 bytes message - 256 bytes key
-        mac = new CMacWithIV(new AESFastEngine());
-
-        mac.init(new ParametersWithIV(key, Hex.decode("000102030405060708090a0b0c0d0e0f")));
-
-        mac.update(input16, 0, input16.length);
-
-        out = new byte[16];
-
-        mac.doFinal(out, 0);
-
-        if (areEqual(out, output_k256_m16))
-        {
-            fail("Failed - got " + new String(Hex.encode(output_k256_m16)));
-        }
-
-        if (!areEqual(out, Hex.decode("9347a60c64061b9ff2a92522ca8e08fc")))
-        {
-            fail("Failed - expected " + "9347a60c64061b9ff2a92522ca8e08fc"
-                + " got " + new String(Hex.encode(out)));
-        }
-
-        testExceptions();
-    }
-
-    private void testExceptions()
-    {
-        try 
-        {
-            CMac mac = new CMac(new AESEngine());
-            mac.init(new ParametersWithIV(new KeyParameter(new byte[16]), new byte[16]));
-            fail("CMac does not accept IV");
-        } catch(IllegalArgumentException e)
-        {
-            // Expected
-        }
-    }
-
-    public String getName()
-    {
-        return "CMac";
-    }
-
-    public static void main(String[] args)
-    {
-        runTest(new CMacTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/CTSTest.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/CTSTest.java
deleted file mode 100644
index 28fcc20..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/CTSTest.java
+++ /dev/null
@@ -1,212 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import org.bouncycastle.crypto.BlockCipher;
-import org.bouncycastle.crypto.BufferedBlockCipher;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.DataLengthException;
-import org.bouncycastle.crypto.InvalidCipherTextException;
-import org.bouncycastle.crypto.engines.AESEngine;
-import org.bouncycastle.crypto.engines.DESEngine;
-import org.bouncycastle.crypto.engines.SkipjackEngine;
-import org.bouncycastle.crypto.modes.CBCBlockCipher;
-import org.bouncycastle.crypto.modes.CTSBlockCipher;
-import org.bouncycastle.crypto.modes.OldCTSBlockCipher;
-import org.bouncycastle.crypto.modes.SICBlockCipher;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.crypto.params.ParametersWithIV;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-
-/**
- * CTS tester
- */
-public class CTSTest
-    extends SimpleTest
-{
-    static byte[]   in1 = Hex.decode("4e6f7720697320746865207420");
-    static byte[]   in2 = Hex.decode("000102030405060708090a0b0c0d0e0fff0102030405060708090a0b0c0d0e0f0aaa");
-    static byte[]   out1 = Hex.decode("9952f131588465033fa40e8a98");
-    static byte[]   out2 = Hex.decode("358f84d01eb42988dc34efb994");
-    static byte[]   out3 = Hex.decode("170171cfad3f04530c509b0c1f0be0aefbd45a8e3755a873bff5ea198504b71683c6");
-    
-    private void testCTS(
-        int                 id,
-        BlockCipher         cipher,
-        CipherParameters    params,
-        byte[]              input,
-        byte[]              output)
-        throws Exception
-    {
-        byte[]                  out = new byte[input.length];
-        BufferedBlockCipher     engine = new CTSBlockCipher(cipher);
-
-        engine.init(true, params);
-
-        int len = engine.processBytes(input, 0, input.length, out, 0);
-
-        engine.doFinal(out, len);
-
-        if (!areEqual(output, out))
-        {
-            fail("failed encryption expected " + new String(Hex.encode(output)) + " got " + new String(Hex.encode(out)));
-        }
-
-        engine.init(false, params);
-
-        len = engine.processBytes(output, 0, output.length, out, 0);
-
-        engine.doFinal(out, len);
-
-        if (!areEqual(input, out))
-        {
-            fail("failed decryption expected " + new String(Hex.encode(input)) + " got " + new String(Hex.encode(out)));
-        }
-    }
-
-    private void testOldCTS(
-            int                 id,
-            BlockCipher         cipher,
-            CipherParameters    params,
-            byte[]              input,
-            byte[]              output)
-    throws Exception
-    {
-        byte[]                  out = new byte[input.length];
-        BufferedBlockCipher     engine = new OldCTSBlockCipher(cipher);
-
-        engine.init(true, params);
-
-        int len = engine.processBytes(input, 0, input.length, out, 0);
-
-        engine.doFinal(out, len);
-
-        if (!areEqual(output, out))
-        {
-            fail("failed encryption expected " + new String(Hex.encode(output)) + " got " + new String(Hex.encode(out)));
-        }
-
-        engine.init(false, params);
-
-        len = engine.processBytes(output, 0, output.length, out, 0);
-
-        engine.doFinal(out, len);
-
-        if (!areEqual(input, out))
-        {
-            fail("failed decryption expected " + new String(Hex.encode(input)) + " got " + new String(Hex.encode(out)));
-        }
-    }
-
-    private void testExceptions() throws InvalidCipherTextException
-    {
-        BufferedBlockCipher engine = new CTSBlockCipher(new DESEngine());
-        CipherParameters params = new KeyParameter(new byte[engine.getBlockSize()]);
-        engine.init(true, params);
-
-        byte[] out = new byte[engine.getOutputSize(engine.getBlockSize())];
-        
-        engine.processBytes(new byte[engine.getBlockSize() - 1], 0, engine.getBlockSize() - 1, out, 0);
-        try 
-        {
-            engine.doFinal(out, 0);
-            fail("Expected CTS encrypt error on < 1 block input");
-        } catch(DataLengthException e)
-        {
-            // Expected
-        }
-
-        engine.init(true, params);
-        engine.processBytes(new byte[engine.getBlockSize()], 0, engine.getBlockSize(), out, 0);
-        try 
-        {
-            engine.doFinal(out, 0);
-        } catch(DataLengthException e)
-        {
-            fail("Unexpected CTS encrypt error on == 1 block input");
-        }
-
-        engine.init(false, params);
-        engine.processBytes(new byte[engine.getBlockSize() - 1], 0, engine.getBlockSize() - 1, out, 0);
-        try 
-        {
-            engine.doFinal(out, 0);
-            fail("Expected CTS decrypt error on < 1 block input");
-        } catch(DataLengthException e)
-        {
-            // Expected
-        }
-
-        engine.init(false, params);
-        engine.processBytes(new byte[engine.getBlockSize()], 0, engine.getBlockSize(), out, 0);
-        try 
-        {
-            engine.doFinal(out, 0);
-        } catch(DataLengthException e)
-        {
-            fail("Unexpected CTS decrypt error on == 1 block input");
-        }
-
-        try 
-        {
-            new CTSBlockCipher(new SICBlockCipher(new AESEngine()));
-            fail("Expected CTS construction error - only ECB/CBC supported.");
-        } catch(IllegalArgumentException e)
-        {
-            // Expected
-        }
-
-    }
-
-    public String getName()
-    {
-        return "CTS";
-    }
-
-    public void performTest() 
-        throws Exception
-    {
-        byte[]  key1 = { (byte)0x01, (byte)0x23, (byte)0x45, (byte)0x67, (byte)0x89, (byte)0xAB, (byte)0xCD, (byte)0xEF };
-        byte[]  key2 = { (byte)0x01, (byte)0x23, (byte)0x45, (byte)0x67, (byte)0x89, (byte)0xAB, (byte)0xCD, (byte)0xEF, (byte)0xee, (byte)0xff  };
-        byte[]  iv = { 1, 2, 3, 4, 5, 6, 7, 8 };
-
-        testCTS(1, new DESEngine(), new KeyParameter(key1), in1, out1);
-        testCTS(2, new CBCBlockCipher(new DESEngine()), new ParametersWithIV(new KeyParameter(key1), iv), in1, out2);
-        testCTS(3, new CBCBlockCipher(new SkipjackEngine()), new ParametersWithIV(new KeyParameter(key2), iv), in2, out3);
-
-        //
-        // test vectors from rfc3962
-        //
-        byte[] aes128 = Hex.decode("636869636b656e207465726979616b69");
-        byte[] aesIn1  = Hex.decode("4920776f756c64206c696b652074686520");
-        byte[] aesOut1 = Hex.decode("c6353568f2bf8cb4d8a580362da7ff7f97");
-        byte[] aesIn2  = Hex.decode("4920776f756c64206c696b65207468652047656e6572616c20476175277320");
-        byte[] aesOut2 = Hex.decode("fc00783e0efdb2c1d445d4c8eff7ed2297687268d6ecccc0c07b25e25ecfe5");
-        byte[] aesIn3  = Hex.decode("4920776f756c64206c696b65207468652047656e6572616c2047617527732043");
-        byte[] aesOut3 = Hex.decode("39312523a78662d5be7fcbcc98ebf5a897687268d6ecccc0c07b25e25ecfe584");
-
-        testCTS(4, new CBCBlockCipher(new AESEngine()), new ParametersWithIV(new KeyParameter(aes128), new byte[16]), aesIn1, aesOut1);
-        testCTS(5, new CBCBlockCipher(new AESEngine()), new ParametersWithIV(new KeyParameter(aes128), new byte[16]), aesIn2, aesOut2);
-        testCTS(6, new CBCBlockCipher(new AESEngine()), new ParametersWithIV(new KeyParameter(aes128), new byte[16]), aesIn3, aesOut3);
-
-        testOldCTS(4, new CBCBlockCipher(new AESEngine()), new ParametersWithIV(new KeyParameter(aes128), new byte[16]), aesIn1, aesOut1);
-        testOldCTS(5, new CBCBlockCipher(new AESEngine()), new ParametersWithIV(new KeyParameter(aes128), new byte[16]), aesIn2, aesOut2);
-        testOldCTS(6, new CBCBlockCipher(new AESEngine()), new ParametersWithIV(new KeyParameter(aes128), new byte[16]), aesIn3, aesOut3);
-
-        byte[] aes1Block = Hex.decode("4920776f756c64206c696b6520746865");
-        byte[] preErrata = Hex.decode("e7664c13ff28c965b0d2a0e7ec353706");   // CTS style one block
-        byte[] pstErrata = Hex.decode("97687268d6ecccc0c07b25e25ecfe584");   // CBC style one block
-        byte[] pstErrataNonZeroIV = Hex.decode("571f5108c53fe95ab52df783df933fa3");
-
-        testCTS(7, new CBCBlockCipher(new AESEngine()), new ParametersWithIV(new KeyParameter(aes128), new byte[16]), aes1Block, pstErrata);
-        testCTS(8, new CBCBlockCipher(new AESEngine()), new ParametersWithIV(new KeyParameter(aes128), aes1Block), aes1Block, pstErrataNonZeroIV);
-        testOldCTS(7, new CBCBlockCipher(new AESEngine()), new ParametersWithIV(new KeyParameter(aes128), new byte[16]), aes1Block, preErrata);
-
-        testExceptions();
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        runTest(new CTSTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/CamelliaLightTest.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/CamelliaLightTest.java
deleted file mode 100644
index 6198ce6..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/CamelliaLightTest.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import org.bouncycastle.crypto.engines.CamelliaLightEngine;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-
-/**
- * Camellia tester - vectors from https://www.cosic.esat.kuleuven.be/nessie/testvectors/ and RFC 3713
- */
-public class CamelliaLightTest
-    extends CipherTest
-{
-    static SimpleTest[] tests =
-        {
-            new BlockCipherVectorTest(0, new CamelliaLightEngine(),
-                new KeyParameter(Hex.decode("00000000000000000000000000000000")),
-                "80000000000000000000000000000000", "07923A39EB0A817D1C4D87BDB82D1F1C"),
-            new BlockCipherVectorTest(1, new CamelliaLightEngine(),
-                new KeyParameter(Hex.decode("80000000000000000000000000000000")),
-                "00000000000000000000000000000000", "6C227F749319A3AA7DA235A9BBA05A2C"),
-            new BlockCipherVectorTest(2, new CamelliaLightEngine(),
-                new KeyParameter(Hex.decode("0123456789abcdeffedcba9876543210")),
-                "0123456789abcdeffedcba9876543210", "67673138549669730857065648eabe43"),
-            //
-            // 192 bit
-            //
-            new BlockCipherVectorTest(3, new CamelliaLightEngine(),
-                new KeyParameter(Hex.decode("0123456789abcdeffedcba98765432100011223344556677")),
-                "0123456789abcdeffedcba9876543210", "b4993401b3e996f84ee5cee7d79b09b9"),
-            new BlockCipherVectorTest(4, new CamelliaLightEngine(),
-                new KeyParameter(Hex.decode("000000000000000000000000000000000000000000000000")),
-                "00040000000000000000000000000000", "9BCA6C88B928C1B0F57F99866583A9BC"),
-            new BlockCipherVectorTest(5, new CamelliaLightEngine(),
-                new KeyParameter(Hex.decode("949494949494949494949494949494949494949494949494")),
-                "636EB22D84B006381235641BCF0308D2", "94949494949494949494949494949494"),
-            //
-            // 256 bit
-            //
-            new BlockCipherVectorTest(6, new CamelliaLightEngine(),
-                new KeyParameter(Hex.decode("0123456789abcdeffedcba987654321000112233445566778899aabbccddeeff")),
-                "0123456789abcdeffedcba9876543210", "9acc237dff16d76c20ef7c919e3a7509"),
-            new BlockCipherVectorTest(7, new CamelliaLightEngine(),
-                new KeyParameter(Hex.decode("4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A")),
-                "057764FE3A500EDBD988C5C3B56CBA9A", "4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A"),
-            new BlockCipherVectorTest(8, new CamelliaLightEngine(),
-                new KeyParameter(Hex.decode("0303030303030303030303030303030303030303030303030303030303030303")),
-                "7968B08ABA92193F2295121EF8D75C8A", "03030303030303030303030303030303"),
-        };
-
-    CamelliaLightTest()
-    {
-        super(tests, new CamelliaLightEngine(), new KeyParameter(new byte[32]));
-    }
-
-    public String getName()
-    {
-        return "CamelliaLight";
-    }
-
-    public static void main(
-        String[] args)
-    {
-        runTest(new CamelliaLightTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/CamelliaTest.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/CamelliaTest.java
deleted file mode 100644
index e69a82a..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/CamelliaTest.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import org.bouncycastle.crypto.engines.CamelliaEngine;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-import org.bouncycastle.util.test.TestResult;
-
-/**
- * Camellia tester - vectors from https://www.cosic.esat.kuleuven.be/nessie/testvectors/ and RFC 3713
- */
-public class CamelliaTest
-    extends CipherTest
-{
-    static SimpleTest[]  tests = 
-            {
-                new BlockCipherVectorTest(0, new CamelliaEngine(),
-                    new KeyParameter(Hex.decode("00000000000000000000000000000000")),
-                    "80000000000000000000000000000000", "07923A39EB0A817D1C4D87BDB82D1F1C"),
-                new BlockCipherVectorTest(1, new CamelliaEngine(),
-                    new KeyParameter(Hex.decode("80000000000000000000000000000000")),
-                    "00000000000000000000000000000000", "6C227F749319A3AA7DA235A9BBA05A2C"),
-                new BlockCipherVectorTest(2, new CamelliaEngine(),
-                        new KeyParameter(Hex.decode("0123456789abcdeffedcba9876543210")),
-                        "0123456789abcdeffedcba9876543210", "67673138549669730857065648eabe43"),
-                //
-                // 192 bit
-                //
-                new BlockCipherVectorTest(3, new CamelliaEngine(),
-                        new KeyParameter(Hex.decode("0123456789abcdeffedcba98765432100011223344556677")),
-                        "0123456789abcdeffedcba9876543210", "b4993401b3e996f84ee5cee7d79b09b9"),
-                new BlockCipherVectorTest(4, new CamelliaEngine(),
-                        new KeyParameter(Hex.decode("000000000000000000000000000000000000000000000000")),
-                        "00040000000000000000000000000000", "9BCA6C88B928C1B0F57F99866583A9BC"),
-                new BlockCipherVectorTest(5, new CamelliaEngine(),
-                        new KeyParameter(Hex.decode("949494949494949494949494949494949494949494949494")),
-                        "636EB22D84B006381235641BCF0308D2", "94949494949494949494949494949494"),
-                //
-                // 256 bit
-                //
-                new BlockCipherVectorTest(6, new CamelliaEngine(),
-                    new KeyParameter(Hex.decode("0123456789abcdeffedcba987654321000112233445566778899aabbccddeeff")),
-                    "0123456789abcdeffedcba9876543210", "9acc237dff16d76c20ef7c919e3a7509"),
-                new BlockCipherVectorTest(7, new CamelliaEngine(),
-                        new KeyParameter(Hex.decode("4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A")),
-                        "057764FE3A500EDBD988C5C3B56CBA9A", "4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A"),
-                new BlockCipherVectorTest(8, new CamelliaEngine(),
-                        new KeyParameter(Hex.decode("0303030303030303030303030303030303030303030303030303030303030303")),
-                        "7968B08ABA92193F2295121EF8D75C8A", "03030303030303030303030303030303"),
-            };
-
-    CamelliaTest()
-    {
-        super(tests, new CamelliaEngine(), new KeyParameter(new byte[32]));
-    }
-
-    public String getName()
-    {
-        return "Camellia";
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        CamelliaTest    test = new CamelliaTest();
-        TestResult      result = test.perform();
-
-        System.out.println(result);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/ChaChaTest.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/ChaChaTest.java
deleted file mode 100644
index 45c063f..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/ChaChaTest.java
+++ /dev/null
@@ -1,403 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import java.security.SecureRandom;
-
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.StreamCipher;
-import org.bouncycastle.crypto.engines.ChaChaEngine;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.crypto.params.ParametersWithIV;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-
-/**
- * ChaCha Test
- * <p>
- * Test cases generated using ref version of ChaCha20 in estreambench-20080905.
- */
-public class ChaChaTest
-    extends SimpleTest
-{
-    byte[] zeroes = Hex.decode(
-          "00000000000000000000000000000000"
-        + "00000000000000000000000000000000"
-        + "00000000000000000000000000000000"
-        + "00000000000000000000000000000000");
-
-    String set1v0_0 = "FBB87FBB8395E05DAA3B1D683C422046"
-        + "F913985C2AD9B23CFC06C1D8D04FF213"
-        + "D44A7A7CDB84929F915420A8A3DC58BF"
-        + "0F7ECB4B1F167BB1A5E6153FDAF4493D";
-
-    String set1v0_192 = "D9485D55B8B82D792ED1EEA8E93E9BC1"
-        + "E2834AD0D9B11F3477F6E106A2F6A5F2"
-        + "EA8244D5B925B8050EAB038F58D4DF57"
-        + "7FAFD1B89359DAE508B2B10CBD6B488E";
-
-    String set1v0_256 = "08661A35D6F02D3D9ACA8087F421F7C8"
-        + "A42579047D6955D937925BA21396DDD4"
-        + "74B1FC4ACCDCAA33025B4BCE817A4FBF"
-        + "3E5D07D151D7E6FE04934ED466BA4779";
-
-    String set1v0_448 = "A7E16DD38BA48CCB130E5BE9740CE359"
-        + "D631E91600F85C8A5D0785A612D1D987"
-        + "90780ACDDC26B69AB106CCF6D866411D"
-        + "10637483DBF08CC5591FD8B3C87A3AE0";
-
-    String set1v9_0 = "A276339F99316A913885A0A4BE870F06"
-        + "91E72B00F1B3F2239F714FE81E88E00C"
-        + "BBE52B4EBBE1EA15894E29658C4CB145"
-        + "E6F89EE4ABB045A78514482CE75AFB7C";
-
-    String set1v9_192 = "0DFB9BD4F87F68DE54FBC1C6428FDEB0"
-        + "63E997BE8490C9B7A4694025D6EBA2B1"
-        + "5FE429DB82A7CAE6AAB22918E8D00449"
-        + "6FB6291467B5AE81D4E85E81D8795EBB";
-
-    String set1v9_256 = "546F5BB315E7F71A46E56D4580F90889"
-        + "639A2BA528F757CF3B048738BA141AF3"
-        + "B31607CB21561BAD94721048930364F4"
-        + "B1227CFEB7CDECBA881FB44903550E68";
-
-    String set1v9_448 = "6F813586E76691305A0CF048C0D8586D"
-        + "C89460207D8B230CD172398AA33D19E9"
-        + "2D24883C3A9B0BB7CD8C6B2668DB142E"
-        + "37A97948A7A01498A21110297984CD20";
-
-    String set6v0_0 = "57459975BC46799394788DE80B928387"
-        + "862985A269B9E8E77801DE9D874B3F51"
-        + "AC4610B9F9BEE8CF8CACD8B5AD0BF17D"
-        + "3DDF23FD7424887EB3F81405BD498CC3";
-
-    String set6v0_65472 = "EF9AEC58ACE7DB427DF012B2B91A0C1E"
-        + "8E4759DCE9CDB00A2BD59207357BA06C"
-        + "E02D327C7719E83D6348A6104B081DB0"
-        + "3908E5186986AE41E3AE95298BB7B713";
-
-    String set6v0_65536 = "17EF5FF454D85ABBBA280F3A94F1D26E"
-        + "950C7D5B05C4BB3A78326E0DC5731F83"
-        + "84205C32DB867D1B476CE121A0D7074B"
-        + "AA7EE90525D15300F48EC0A6624BD0AF";
-
-    String set6v1_0 = "92A2508E2C4084567195F2A1005E552B"
-        + "4874EC0504A9CD5E4DAF739AB553D2E7"
-        + "83D79C5BA11E0653BEBB5C116651302E"
-        + "8D381CB728CA627B0B246E83942A2B99";
-
-    String set6v1_65472 = "E1974EC3063F7BD0CBA58B1CE34BC874"
-        + "67AAF5759B05EA46682A5D4306E5A76B"
-        + "D99A448DB8DE73AF97A73F5FBAE2C776"
-        + "35040464524CF14D7F08D4CE1220FD84";
-
-    String set6v1_65536 = "BE3436141CFD62D12FF7D852F80C1344"
-        + "81F152AD0235ECF8CA172C55CA8C031B"
-        + "2E785D773A988CA8D4BDA6FAE0E493AA"
-        + "71DCCC4C894D1F106CAC62A9FC0A9607";
-
-    // ChaCha12
-    String chacha12_set1v0_0 = "36CF0D56E9F7FBF287BC5460D95FBA94"
-            + "AA6CBF17D74E7C784DDCF7E0E882DDAE"
-            + "3B5A58243EF32B79A04575A8E2C2B73D"
-            + "C64A52AA15B9F88305A8F0CA0B5A1A25";
-
-    String chacha12_set1v0_192 = "83496792AB68FEC75ADB16D3044420A4"
-        + "A00A6E9ADC41C3A63DBBF317A8258C85"
-        + "A9BC08B4F76B413A4837324AEDF8BC2A"
-        + "67D53C9AB9E1C5BC5F379D48DF9AF730";
-
-    String chacha12_set1v0_256 = "BAA28ED593690FD760ADA07C95E3B888"
-        + "4B4B64E488CA7A2D9BDC262243AB9251"
-        + "394C5037E255F8BCCDCD31306C508FFB"
-        + "C9E0161380F7911FCB137D46D9269250";
-
-    String chacha12_set1v0_448 = "B7ECFB6AE0B51915762FE1FD03A14D0C"
-        + "9E54DA5DC76EB16EBA5313BC535DE63D"
-        + "C72D7F9F1874E301E99C8531819F4E37"
-        + "75793F6A5D19C717FA5C78A39EB804A6";
-
-    // ChaCha8
-    String chacha8_set1v0_0 = "BEB1E81E0F747E43EE51922B3E87FB38"
-            + "D0163907B4ED49336032AB78B67C2457"
-            + "9FE28F751BD3703E51D876C017FAA435"
-            + "89E63593E03355A7D57B2366F30047C5";
-    
-    String chacha8_set1v0_192 = "33B8B7CA8F8E89F0095ACE75A379C651"
-            + "FD6BDD55703C90672E44C6BAB6AACDD8"
-            + "7C976A87FD264B906E749429284134C2"
-            + "38E3B88CF74A68245B860D119A8BDF43";
-    
-    String chacha8_set1v0_256 = "F7CA95BF08688BD3BE8A27724210F9DC"
-            + "16F32AF974FBFB09E9F757C577A245AB"
-            + "F35F824B70A4C02CB4A8D7191FA8A5AD"
-            + "6A84568743844703D353B7F00A8601F4";
-    
-    String chacha8_set1v0_448 = "7B4117E8BFFD595CD8482270B08920FB"
-            + "C9B97794E1809E07BB271BF07C861003"
-            + "4C38DBA6ECA04E5474F399A284CBF6E2"
-            + "7F70142E604D0977797DE5B58B6B25E0";
-    
-
-
-    public String getName()
-    {
-        return "ChaCha";
-    }
-
-    public void performTest()
-    {
-        chachaTest1(20, new ParametersWithIV(new KeyParameter(Hex.decode("80000000000000000000000000000000")), Hex.decode("0000000000000000")),
-                  set1v0_0, set1v0_192,  set1v0_256,  set1v0_448);
-        chachaTest1(20, new ParametersWithIV(new KeyParameter(Hex.decode("00400000000000000000000000000000")), Hex.decode("0000000000000000")),
-                  set1v9_0, set1v9_192,  set1v9_256,  set1v9_448);
-        chachaTest1(12, new ParametersWithIV(new KeyParameter(Hex.decode("80000000000000000000000000000000")), Hex.decode("0000000000000000")),
-                chacha12_set1v0_0, chacha12_set1v0_192,  chacha12_set1v0_256,  chacha12_set1v0_448);
-        chachaTest1(8, new ParametersWithIV(new KeyParameter(Hex.decode("80000000000000000000000000000000")), Hex.decode("0000000000000000")),
-                chacha8_set1v0_0, chacha8_set1v0_192,  chacha8_set1v0_256,  chacha8_set1v0_448);
-        chachaTest2(new ParametersWithIV(new KeyParameter(Hex.decode("0053A6F94C9FF24598EB3E91E4378ADD3083D6297CCF2275C81B6EC11467BA0D")), Hex.decode("0D74DB42A91077DE")),
-                  set6v0_0, set6v0_65472, set6v0_65536);
-        chachaTest2(new ParametersWithIV(new KeyParameter(Hex.decode("0558ABFE51A4F74A9DF04396E93C8FE23588DB2E81D4277ACD2073C6196CBF12")), Hex.decode("167DE44BB21980E7")),
-                  set6v1_0, set6v1_65472, set6v1_65536);
-        reinitBug();
-        skipTest();
-    }
-
-    private void chachaTest1(int rounds, CipherParameters params, String v0, String v192, String v256, String v448)
-    {
-        StreamCipher chaCha = new ChaChaEngine(rounds);
-        byte[]       buf = new byte[64];
-
-        chaCha.init(true, params);
-
-        for (int i = 0; i != 7; i++)
-        {
-            chaCha.processBytes(zeroes, 0, 64, buf, 0);
-            switch (i)
-            {
-            case 0:
-                if (!areEqual(buf, Hex.decode(v0)))
-                {
-                    mismatch("v0/" + rounds, v0, buf);
-                }
-                break;
-            case 3:
-                if (!areEqual(buf, Hex.decode(v192)))
-                {
-                    mismatch("v192/" + rounds, v192, buf);
-                }
-                break;
-            case 4:
-                if (!areEqual(buf, Hex.decode(v256)))
-                {
-                    mismatch("v256/" + rounds, v256, buf);
-                }
-                break;
-            default:
-                // ignore
-            }
-        }
-
-        for (int i = 0; i != 64; i++)
-        {
-            buf[i] = chaCha.returnByte(zeroes[i]);
-        }
-
-        if (!areEqual(buf, Hex.decode(v448)))
-        {
-            mismatch("v448", v448, buf);
-        }       
-    }
-
-    private void chachaTest2(CipherParameters params, String v0, String v65472, String v65536)
-    {
-        StreamCipher chaCha = new ChaChaEngine();
-        byte[]       buf = new byte[64];
-
-        chaCha.init(true, params);
-
-        for (int i = 0; i != 1025; i++)
-        {
-            chaCha.processBytes(zeroes, 0, 64, buf, 0);
-            switch (i)
-            {
-            case 0:
-                if (!areEqual(buf, Hex.decode(v0)))
-                {
-                    mismatch("v0", v0, buf);
-                }
-                break;
-            case 1023:
-                if (!areEqual(buf, Hex.decode(v65472)))
-                {
-                    mismatch("v65472", v65472, buf);
-                }
-                break;
-            case 1024:
-                if (!areEqual(buf, Hex.decode(v65536)))
-                {
-                    mismatch("v65536", v65536, buf);
-                }
-                break;
-            default:
-                // ignore
-            }
-        }
-    }
-
-    private void mismatch(String name, String expected, byte[] found)
-    {
-        fail("mismatch on " + name, expected, new String(Hex.encode(found)));
-    }
-
-
-    private void reinitBug()
-    {
-        KeyParameter key = new KeyParameter(Hex.decode("80000000000000000000000000000000"));
-        ParametersWithIV parameters = new ParametersWithIV(key, Hex.decode("0000000000000000"));
-
-        StreamCipher salsa = new ChaChaEngine();
-
-        salsa.init(true, parameters);
-
-        try
-        {
-            salsa.init(true, key);
-            fail("Salsa20 should throw exception if no IV in Init");
-        }
-        catch (IllegalArgumentException e)
-        {
-        }
-    }
-
-    private boolean areEqual(byte[] a, int aOff, byte[] b, int bOff)
-    {
-        for (int i = bOff; i != b.length; i++)
-        {
-            if (a[aOff + i - bOff] != b[i])
-            {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    private void skipTest()
-    {
-        SecureRandom rand = new SecureRandom();
-        byte[]       plain = new byte[5000];
-        byte[]       cipher = new byte[5000];
-
-        rand.nextBytes(plain);
-
-        CipherParameters params = new ParametersWithIV(new KeyParameter(Hex.decode("0053A6F94C9FF24598EB3E91E4378ADD3083D6297CCF2275C81B6EC11467BA0D")), Hex.decode("0D74DB42A91077DE"));
-        ChaChaEngine    engine = new ChaChaEngine();
-
-        engine.init(true, params);
-
-        engine.processBytes(plain, 0, plain.length, cipher, 0);
-
-        byte[]      fragment = new byte[20];
-
-        engine.init(true, params);
-
-        engine.skip(10);
-
-        engine.processBytes(plain, 10, fragment.length, fragment, 0);
-
-        if (!areEqual(cipher, 10, fragment, 0))
-        {
-            fail("skip forward 10 failed");
-        }
-
-        engine.skip(1000);
-
-        engine.processBytes(plain, 1010 + fragment.length, fragment.length, fragment, 0);
-
-        if (!areEqual(cipher, 1010 + fragment.length, fragment, 0))
-        {
-            fail("skip forward 1000 failed");
-        }
-
-        engine.skip(-10);
-
-        engine.processBytes(plain, 1010 + 2 * fragment.length - 10, fragment.length, fragment, 0);
-
-        if (!areEqual(cipher, 1010 + 2 * fragment.length - 10, fragment, 0))
-        {
-            fail("skip back 10 failed");
-        }
-
-        engine.skip(-1000);
-
-        if (engine.getPosition() != 60)
-        {
-            fail("skip position incorrect - " + 60 + " got " + engine.getPosition());
-        }
-
-        engine.processBytes(plain, 60, fragment.length, fragment, 0);
-
-        if (!areEqual(cipher, 60, fragment, 0))
-        {
-            fail("skip back 1000 failed");
-        }
-
-        long pos = engine.seekTo(1010);
-        if (pos != 1010)
-        {
-            fail("position wrong");
-        }
-
-        engine.processBytes(plain, 1010, fragment.length, fragment, 0);
-
-        if (!areEqual(cipher, 1010, fragment, 0))
-        {
-            fail("seek to 1010 failed");
-        }
-
-        engine.reset();
-
-        for (int i = 0; i != 1000; i++)
-        {
-            engine.skip(i);
-
-            if (engine.getPosition() != i)
-            {
-                fail("skip forward at wrong position");
-            }
-
-            engine.processBytes(plain, i, fragment.length, fragment, 0);
-
-            if (!areEqual(cipher, i, fragment, 0))
-            {
-                fail("skip forward i failed: " + i);
-            }
-
-            if (engine.getPosition() != i + fragment.length)
-            {
-                fail("cipher at wrong position: " + engine.getPosition() + " [" + i + "]");
-            }
-
-            engine.skip(-fragment.length);
-
-            if (engine.getPosition() != i)
-            {
-                fail("skip back at wrong position");
-            }
-
-            engine.processBytes(plain, i, fragment.length, fragment, 0);
-
-            if (!areEqual(cipher, i, fragment, 0))
-            {
-                fail("skip back i failed: " + i);
-            }
-
-            engine.reset();
-        }
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        runTest(new ChaChaTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/CipherStreamTest.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/CipherStreamTest.java
deleted file mode 100644
index 089e4ed..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/CipherStreamTest.java
+++ /dev/null
@@ -1,706 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.security.SecureRandom;
-
-import org.bouncycastle.crypto.BlockCipher;
-import org.bouncycastle.crypto.BufferedBlockCipher;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.StreamCipher;
-import org.bouncycastle.crypto.engines.AESEngine;
-import org.bouncycastle.crypto.engines.BlowfishEngine;
-import org.bouncycastle.crypto.engines.CAST5Engine;
-import org.bouncycastle.crypto.engines.CAST6Engine;
-import org.bouncycastle.crypto.engines.CamelliaEngine;
-import org.bouncycastle.crypto.engines.ChaChaEngine;
-import org.bouncycastle.crypto.engines.DESEngine;
-import org.bouncycastle.crypto.engines.DESedeEngine;
-import org.bouncycastle.crypto.engines.Grain128Engine;
-import org.bouncycastle.crypto.engines.Grainv1Engine;
-import org.bouncycastle.crypto.engines.HC128Engine;
-import org.bouncycastle.crypto.engines.HC256Engine;
-import org.bouncycastle.crypto.engines.NoekeonEngine;
-import org.bouncycastle.crypto.engines.RC2Engine;
-import org.bouncycastle.crypto.engines.RC4Engine;
-import org.bouncycastle.crypto.engines.RC6Engine;
-import org.bouncycastle.crypto.engines.SEEDEngine;
-import org.bouncycastle.crypto.engines.Salsa20Engine;
-import org.bouncycastle.crypto.engines.SerpentEngine;
-import org.bouncycastle.crypto.engines.TEAEngine;
-import org.bouncycastle.crypto.engines.ThreefishEngine;
-import org.bouncycastle.crypto.engines.TwofishEngine;
-import org.bouncycastle.crypto.engines.XSalsa20Engine;
-import org.bouncycastle.crypto.engines.XTEAEngine;
-import org.bouncycastle.crypto.io.CipherInputStream;
-import org.bouncycastle.crypto.io.CipherOutputStream;
-import org.bouncycastle.crypto.io.InvalidCipherTextIOException;
-import org.bouncycastle.crypto.modes.AEADBlockCipher;
-import org.bouncycastle.crypto.modes.CBCBlockCipher;
-import org.bouncycastle.crypto.modes.CCMBlockCipher;
-import org.bouncycastle.crypto.modes.CFBBlockCipher;
-import org.bouncycastle.crypto.modes.CTSBlockCipher;
-import org.bouncycastle.crypto.modes.EAXBlockCipher;
-import org.bouncycastle.crypto.modes.GCMBlockCipher;
-import org.bouncycastle.crypto.modes.NISTCTSBlockCipher;
-import org.bouncycastle.crypto.modes.OCBBlockCipher;
-import org.bouncycastle.crypto.modes.OFBBlockCipher;
-import org.bouncycastle.crypto.modes.SICBlockCipher;
-import org.bouncycastle.crypto.paddings.PKCS7Padding;
-import org.bouncycastle.crypto.paddings.PaddedBufferedBlockCipher;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.crypto.params.ParametersWithIV;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.test.SimpleTest;
-
-public class CipherStreamTest
-    extends SimpleTest
-{
-    private int streamSize;
-
-    public String getName()
-    {
-        return "CipherStreamTest";
-    }
-
-    private void testMode(Object cipher, CipherParameters params)
-        throws Exception
-    {
-        testWriteRead(cipher, params, false);
-        testWriteRead(cipher, params, true);
-        testReadWrite(cipher, params, false);
-        testReadWrite(cipher, params, true);
-
-        if (!(cipher instanceof CTSBlockCipher || cipher instanceof NISTCTSBlockCipher))
-        {
-            testWriteReadEmpty(cipher, params, false);
-            testWriteReadEmpty(cipher, params, true);
-        }
-
-        if (cipher instanceof AEADBlockCipher)
-        {
-            testTamperedRead((AEADBlockCipher)cipher, params);
-            testTruncatedRead((AEADBlockCipher)cipher, params);
-            testTamperedWrite((AEADBlockCipher)cipher, params);
-        }
-    }
-
-    private OutputStream createCipherOutputStream(OutputStream output, Object cipher)
-    {
-        if (cipher instanceof BufferedBlockCipher)
-        {
-            return new CipherOutputStream(output, (BufferedBlockCipher)cipher);
-        }
-        else if (cipher instanceof AEADBlockCipher)
-        {
-            return new CipherOutputStream(output, (AEADBlockCipher)cipher);
-        }
-        else
-        {
-            return new CipherOutputStream(output, (StreamCipher)cipher);
-        }
-    }
-
-    private InputStream createCipherInputStream(byte[] data, Object cipher)
-    {
-        ByteArrayInputStream input = new ByteArrayInputStream(data);
-        if (cipher instanceof BufferedBlockCipher)
-        {
-            return new CipherInputStream(input, (BufferedBlockCipher)cipher);
-        }
-        else if (cipher instanceof AEADBlockCipher)
-        {
-            return new CipherInputStream(input, (AEADBlockCipher)cipher);
-        }
-        else
-        {
-            return new CipherInputStream(input, (StreamCipher)cipher);
-        }
-    }
-
-    /**
-     * Test tampering of ciphertext followed by read from decrypting CipherInputStream
-     */
-    private void testTamperedRead(AEADBlockCipher cipher, CipherParameters params)
-        throws Exception
-    {
-        cipher.init(true, params);
-
-        byte[] ciphertext = new byte[cipher.getOutputSize(streamSize)];
-        cipher.doFinal(ciphertext, cipher.processBytes(new byte[streamSize], 0, streamSize, ciphertext, 0));
-
-        // Tamper
-        ciphertext[0] += 1;
-
-        cipher.init(false, params);
-        InputStream input = createCipherInputStream(ciphertext, cipher);
-        try
-        {
-            while (input.read() >= 0)
-            {
-            }
-            fail("Expected invalid ciphertext after tamper and read : " + cipher.getAlgorithmName());
-        }
-        catch (InvalidCipherTextIOException e)
-        {
-            // Expected
-        }
-        try
-        {
-            input.close();
-        }
-        catch (Exception e)
-        {
-            fail("Unexpected exception after tamper and read : " + cipher.getAlgorithmName());
-        }
-    }
-
-    /**
-     * Test truncation of ciphertext to make tag calculation impossible, followed by read from
-     * decrypting CipherInputStream
-     */
-    private void testTruncatedRead(AEADBlockCipher cipher, CipherParameters params)
-        throws Exception
-    {
-        cipher.init(true, params);
-
-        byte[] ciphertext = new byte[cipher.getOutputSize(streamSize)];
-        cipher.doFinal(ciphertext, cipher.processBytes(new byte[streamSize], 0, streamSize, ciphertext, 0));
-
-        // Truncate to just smaller than complete tag
-        byte[] truncated = new byte[ciphertext.length - streamSize - 1];
-        System.arraycopy(ciphertext, 0, truncated, 0, truncated.length);
-
-        cipher.init(false, params);
-        InputStream input = createCipherInputStream(truncated, cipher);
-        while (true)
-        {
-            int read = 0;
-            try
-            {
-                read = input.read();
-            }
-            catch (InvalidCipherTextIOException e)
-            {
-                // Expected
-                break;
-            }
-            catch (Exception e)
-            {
-                fail("Unexpected exception  on truncated read : " + cipher.getAlgorithmName());
-                break;
-            }
-            if (read < 0)
-            {
-                fail("Expected invalid ciphertext after truncate and read : " + cipher.getAlgorithmName());
-                break;
-            }
-        }
-        try
-        {
-            input.close();
-        }
-        catch (Exception e)
-        {
-            fail("Unexpected exception after truncate and read : " + cipher.getAlgorithmName());
-        }
-    }
-
-    /**
-     * Test tampering of ciphertext followed by write to decrypting CipherOutputStream
-     */
-    private void testTamperedWrite(AEADBlockCipher cipher, CipherParameters params)
-        throws Exception
-    {
-        cipher.init(true, params);
-
-        byte[] ciphertext = new byte[cipher.getOutputSize(streamSize)];
-        cipher.doFinal(ciphertext, cipher.processBytes(new byte[streamSize], 0, streamSize, ciphertext, 0));
-
-        // Tamper
-        ciphertext[0] += 1;
-
-        cipher.init(false, params);
-        ByteArrayOutputStream plaintext = new ByteArrayOutputStream();
-        OutputStream output = createCipherOutputStream(plaintext, cipher);
-
-        for (int i = 0; i < ciphertext.length; i++)
-        {
-            output.write(ciphertext[i]);
-        }
-        try
-        {
-            output.close();
-            fail("Expected invalid ciphertext after tamper and write : " + cipher.getAlgorithmName());
-        }
-        catch (InvalidCipherTextIOException e)
-        {
-            // Expected
-        }
-    }
-
-    /**
-     * Test CipherOutputStream in ENCRYPT_MODE, CipherInputStream in DECRYPT_MODE
-     */
-    private void testWriteRead(Object cipher, CipherParameters params, boolean blocks)
-        throws Exception
-    {
-        byte[] data = new byte[streamSize];
-        for (int i = 0; i < data.length; i++)
-        {
-            data[i] = (byte)(i % 255);
-        }
-
-        testWriteRead(cipher, params, blocks, data);
-    }
-
-    /**
-     * Test CipherOutputStream in ENCRYPT_MODE, CipherInputStream in DECRYPT_MODE
-     */
-    private void testWriteReadEmpty(Object cipher, CipherParameters params, boolean blocks)
-        throws Exception
-    {
-        byte[] data = new byte[0];
-
-        testWriteRead(cipher, params, blocks, data);
-    }
-
-    private void testWriteRead(Object cipher, CipherParameters params, boolean blocks, byte[] data)
-    {
-        ByteArrayOutputStream bOut = new ByteArrayOutputStream();
-
-        try
-        {
-            init(cipher, true, params);
-
-            OutputStream cOut = createCipherOutputStream(bOut, cipher);
-            if (blocks)
-            {
-                int chunkSize = Math.max(1, data.length / 8);
-                for (int i = 0; i < data.length; i += chunkSize)
-                {
-                    cOut.write(data, i, Math.min(chunkSize, data.length - i));
-                }
-            }
-            else
-            {
-                for (int i = 0; i < data.length; i++)
-                {
-                    cOut.write(data[i]);
-                }
-            }
-            cOut.close();
-
-            byte[] cipherText = bOut.toByteArray();
-            bOut.reset();
-            init(cipher, false, params);
-            InputStream cIn = createCipherInputStream(cipherText, cipher);
-
-            if (blocks)
-            {
-                byte[] block = new byte[getBlockSize(cipher) + 1];
-                int c;
-                while ((c = cIn.read(block)) >= 0)
-                {
-                    bOut.write(block, 0, c);
-                }
-            }
-            else
-            {
-                int c;
-                while ((c = cIn.read()) >= 0)
-                {
-                    bOut.write(c);
-                }
-
-            }
-            cIn.close();
-
-        }
-        catch (Exception e)
-        {
-            fail("Unexpected exception " + getName(cipher), e);
-        }
-
-        byte[] decrypted = bOut.toByteArray();
-        if (!Arrays.areEqual(data, decrypted))
-        {
-            fail("Failed - decrypted data doesn't match: " + getName(cipher));
-        }
-    }
-
-    private String getName(Object cipher)
-    {
-        if (cipher instanceof BufferedBlockCipher)
-        {
-            return ((BufferedBlockCipher)cipher).getUnderlyingCipher().getAlgorithmName();
-        }
-        else if (cipher instanceof AEADBlockCipher)
-        {
-            return ((AEADBlockCipher)cipher).getUnderlyingCipher().getAlgorithmName();
-        }
-        else if (cipher instanceof StreamCipher)
-        {
-            return ((StreamCipher)cipher).getAlgorithmName();
-        }
-        return null;
-    }
-
-    private int getBlockSize(Object cipher)
-    {
-        if (cipher instanceof BlockCipher)
-        {
-            return ((BlockCipher)cipher).getBlockSize();
-        }
-        else if (cipher instanceof BufferedBlockCipher)
-        {
-            return ((BufferedBlockCipher)cipher).getBlockSize();
-        }
-        else if (cipher instanceof AEADBlockCipher)
-        {
-            return ((AEADBlockCipher)cipher).getUnderlyingCipher().getBlockSize();
-        }
-        else if (cipher instanceof StreamCipher)
-        {
-            return 1;
-        }
-        return 0;
-    }
-
-    private void init(Object cipher, boolean forEncrypt, CipherParameters params)
-    {
-        if (cipher instanceof BufferedBlockCipher)
-        {
-            ((BufferedBlockCipher)cipher).init(forEncrypt, params);
-        }
-        else if (cipher instanceof AEADBlockCipher)
-        {
-            ((AEADBlockCipher)cipher).init(forEncrypt, params);
-        }
-        else if (cipher instanceof StreamCipher)
-        {
-            ((StreamCipher)cipher).init(forEncrypt, params);
-        }
-    }
-
-    protected void fail(String message, boolean authenticated, boolean bc)
-    {
-        if (bc || !authenticated)
-        {
-            super.fail(message);
-        }
-        else
-        {
-            // javax.crypto.CipherInputStream/CipherOutputStream
-            // are broken wrt handling AEAD failures
-            System.err.println("Broken JCE Streams: " + message);
-        }
-    }
-
-    /**
-     * Test CipherInputStream in ENCRYPT_MODE, CipherOutputStream in DECRYPT_MODE
-     */
-    private void testReadWrite(Object cipher, CipherParameters params, boolean blocks)
-        throws Exception
-    {
-        String lCode = "ABCDEFGHIJKLMNOPQRSTU";
-
-        ByteArrayOutputStream bOut = new ByteArrayOutputStream();
-
-        try
-        {
-            init(cipher, true, params);
-
-            InputStream cIn = createCipherInputStream(lCode.getBytes(), cipher);
-            ByteArrayOutputStream ct = new ByteArrayOutputStream();
-
-            if (blocks)
-            {
-                byte[] block = new byte[getBlockSize(cipher) + 1];
-                int c;
-                while ((c = cIn.read(block)) >= 0)
-                {
-                    ct.write(block, 0, c);
-                }
-            }
-            else
-            {
-                int c;
-                while ((c = cIn.read()) >= 0)
-                {
-                    ct.write(c);
-                }
-            }
-            cIn.close();
-
-            init(cipher, false, params);
-            ByteArrayInputStream dataIn = new ByteArrayInputStream(ct.toByteArray());
-            OutputStream cOut = createCipherOutputStream(bOut, cipher);
-
-            if (blocks)
-            {
-                byte[] block = new byte[getBlockSize(cipher) + 1];
-                int c;
-                while ((c = dataIn.read(block)) >= 0)
-                {
-                    cOut.write(block, 0, c);
-                }
-            }
-            else
-            {
-                int c;
-                while ((c = dataIn.read()) >= 0)
-                {
-                    cOut.write(c);
-                }
-            }
-            cOut.flush();
-            cOut.close();
-
-        }
-        catch (Exception e)
-        {
-            fail("Unexpected exception " + getName(cipher), e);
-        }
-
-        String res = new String(bOut.toByteArray());
-        if (!res.equals(lCode))
-        {
-            fail("Failed read/write - decrypted data doesn't match: " + getName(cipher), lCode, res);
-        }
-    }
-
-    public void performTest()
-        throws Exception
-    {
-        int[] testSizes = new int[]{0, 1, 7, 8, 9, 15, 16, 17, 1023, 1024, 1025, 2047, 2048, 2049, 4095, 4096, 4097};
-        for (int i = 0; i < testSizes.length; i++)
-        {
-            this.streamSize = testSizes[i];
-            performTests();
-        }
-    }
-
-    private void performTests()
-        throws Exception
-    {
-        testModes(new BlowfishEngine(), new BlowfishEngine(), 16);
-        testModes(new DESEngine(), new DESEngine(), 8);
-        testModes(new DESedeEngine(), new DESedeEngine(), 24);
-        testModes(new TEAEngine(), new TEAEngine(), 16);
-        testModes(new CAST5Engine(), new CAST5Engine(), 16);
-        testModes(new RC2Engine(), new RC2Engine(), 16);
-        testModes(new XTEAEngine(), new XTEAEngine(), 16);
-
-        testModes(new AESEngine(), new AESEngine(), 16);
-        testModes(new NoekeonEngine(), new NoekeonEngine(), 16);
-        testModes(new TwofishEngine(), new TwofishEngine(), 16);
-        testModes(new CAST6Engine(), new CAST6Engine(), 16);
-        testModes(new SEEDEngine(), new SEEDEngine(), 16);
-        testModes(new SerpentEngine(), new SerpentEngine(), 16);
-        testModes(new RC6Engine(), new RC6Engine(), 16);
-        testModes(new CamelliaEngine(), new CamelliaEngine(), 16);
-        testModes(new ThreefishEngine(ThreefishEngine.BLOCKSIZE_512),
-            new ThreefishEngine(ThreefishEngine.BLOCKSIZE_512), 64);
-
-        testMode(new RC4Engine(), new KeyParameter(new byte[16]));
-        testMode(new Salsa20Engine(), new ParametersWithIV(new KeyParameter(new byte[16]), new byte[8]));
-        testMode(new XSalsa20Engine(), new ParametersWithIV(new KeyParameter(new byte[32]), new byte[24]));
-        testMode(new ChaChaEngine(), new ParametersWithIV(new KeyParameter(new byte[16]), new byte[8]));
-        testMode(new Grainv1Engine(), new ParametersWithIV(new KeyParameter(new byte[16]), new byte[8]));
-        testMode(new Grain128Engine(), new ParametersWithIV(new KeyParameter(new byte[16]), new byte[12]));
-        testMode(new HC128Engine(), new KeyParameter(new byte[16]));
-        testMode(new HC256Engine(), new ParametersWithIV(new KeyParameter(new byte[16]), new byte[16]));
-
-        testSkipping(new Salsa20Engine(), new ParametersWithIV(new KeyParameter(new byte[16]), new byte[8]));
-        testSkipping(new SICBlockCipher(new AESEngine()), new ParametersWithIV(new KeyParameter(new byte[16]), new byte[16]));
-    }
-
-    private void testModes(BlockCipher cipher1, BlockCipher cipher2, int keySize)
-        throws Exception
-    {
-        final KeyParameter key = new KeyParameter(new byte[keySize]);
-        final int blockSize = getBlockSize(cipher1);
-        final CipherParameters withIv = new ParametersWithIV(key, new byte[blockSize]);
-
-        if (blockSize > 1)
-        {
-            testMode(new PaddedBufferedBlockCipher(cipher1, new PKCS7Padding()), key);
-
-            testMode(new PaddedBufferedBlockCipher(new CBCBlockCipher(cipher1), new PKCS7Padding()), withIv);
-
-            testMode(new BufferedBlockCipher(new OFBBlockCipher(cipher1, blockSize)), withIv);
-            testMode(new BufferedBlockCipher(new CFBBlockCipher(cipher1, blockSize)), withIv);
-            testMode(new BufferedBlockCipher(new SICBlockCipher(cipher1)), withIv);
-        }
-        // CTS requires at least one block
-        if (blockSize <= 16 && streamSize >= blockSize)
-        {
-            testMode(new CTSBlockCipher(cipher1), key);
-        }
-        if (blockSize <= 16 && streamSize >= blockSize)
-        {
-            testMode(new NISTCTSBlockCipher(NISTCTSBlockCipher.CS1, cipher1), key);
-            testMode(new NISTCTSBlockCipher(NISTCTSBlockCipher.CS2, cipher1), key);
-            testMode(new NISTCTSBlockCipher(NISTCTSBlockCipher.CS3, cipher1), key);
-        }
-        if (blockSize == 8 || blockSize == 16)
-        {
-            testMode(new EAXBlockCipher(cipher1), withIv);
-        }
-        if (blockSize == 16)
-        {
-            testMode(new CCMBlockCipher(cipher1), new ParametersWithIV(key, new byte[7]));
-            testMode(new GCMBlockCipher(cipher1), withIv);
-            testMode(new OCBBlockCipher(cipher1, cipher2), new ParametersWithIV(key, new byte[15]));
-        }
-    }
-
-    private void testSkipping(StreamCipher cipher, CipherParameters params)
-        throws Exception
-    {
-        ByteArrayOutputStream bOut = new ByteArrayOutputStream();
-
-        init(cipher, true, params);
-
-        OutputStream cOut = createCipherOutputStream(bOut, cipher);
-        byte[] data = new byte[5000];
-
-        new SecureRandom().nextBytes(data);
-
-        cOut.write(data);
-
-        cOut.close();
-
-        init(cipher, false, params);
-
-        InputStream cIn = createCipherInputStream(bOut.toByteArray(), cipher);
-
-        long skip = cIn.skip(50);
-        if (skip != 50)
-        {
-            fail("wrong number of bytes skipped: " + skip);
-        }
-
-        byte[] block = new byte[50];
-
-        cIn.read(block);
-
-        if (!areEqual(data, 50, block, 0))
-        {
-            fail("initial skip mismatch");
-        }
-
-        skip = cIn.skip(3000);
-        if (skip != 3000)
-        {
-            fail("wrong number of bytes skipped: " + skip);
-        }
-
-        cIn.read(block);
-
-        if (!areEqual(data, 3100, block, 0))
-        {
-            fail("second skip mismatch");
-        }
-
-        cipher.reset();
-
-        cIn = createCipherInputStream(bOut.toByteArray(), cipher);
-        if (!cIn.markSupported())
-        {
-            fail("marking not supported");
-        }
-
-        cIn.mark(100);
-
-        cIn.read(block);
-
-        if (!areEqual(data, 0, block, 0))
-        {
-            fail("initial mark read failed");
-        }
-
-        cIn.reset();
-
-        cIn.read(block);
-
-        if (!areEqual(data, 0, block, 0))
-        {
-            fail(cipher.getAlgorithmName() + " initial reset read failed");
-        }
-
-        cIn.reset();
-
-        cIn.read(block);
-
-        cIn.mark(100);
-
-        cIn.read(block);
-
-        if (!areEqual(data, 50, block, 0))
-        {
-            fail("second mark read failed");
-        }
-
-        cIn.reset();
-
-        cIn.read(block);
-
-        if (!areEqual(data, 50, block, 0))
-        {
-            fail(cipher.getAlgorithmName() + " second reset read failed");
-        }
-
-        cIn.mark(3000);
-
-        skip = cIn.skip(2050);
-        if (skip != 2050)
-        {
-            fail("wrong number of bytes skipped: " + skip);
-        }
-
-        cIn.reset();
-
-        cIn.read(block);
-
-        if (!areEqual(data, 100, block, 0))
-        {
-            fail(cipher.getAlgorithmName() + " third reset read failed");
-        }
-
-        cIn.read(new byte[2150]);
-
-        cIn.reset();
-
-        cIn.read(block);
-
-        if (!areEqual(data, 100, block, 0))
-        {
-            fail(cipher.getAlgorithmName() + " fourth reset read failed");
-        }
-
-        cIn.close();
-    }
-
-    private boolean areEqual(byte[] a, int aOff, byte[] b, int bOff)
-    {
-        for (int i = bOff; i != b.length; i++)
-        {
-            if (a[aOff + i - bOff] != b[i])
-            {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    public static void main(String[] args)
-    {
-        runTest(new CipherStreamTest());
-    }
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/CipherTest.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/CipherTest.java
deleted file mode 100644
index 407a044..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/CipherTest.java
+++ /dev/null
@@ -1,117 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import org.bouncycastle.crypto.BlockCipher;
-import org.bouncycastle.crypto.DataLengthException;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.util.test.SimpleTest;
-
-public abstract class CipherTest
-    extends SimpleTest
-{
-    private SimpleTest[]      _tests;
-    private BlockCipher _engine;
-    private KeyParameter _validKey;
-
-//    protected CipherTest(
-//        SimpleTest[]  tests)
-//    {
-//        _tests = tests;
-//    }
-
-    protected CipherTest(
-        SimpleTest[]   tests,
-        BlockCipher  engine,
-        KeyParameter validKey)
-    {
-        _tests = tests;
-        _engine = engine;
-        _validKey = validKey;
-    }
-    
-    public abstract String getName();
-
-    public void performTest()
-        throws Exception
-    {
-        for (int i = 0; i != _tests.length; i++)
-        {
-            _tests[i].performTest();
-        }
-
-        if (_engine != null)
-        {
-            //
-            // state tests
-            //
-            byte[]      buf = new byte[128];
-            
-            try
-            {   
-                _engine.processBlock(buf, 0, buf, 0);
-                
-                fail("failed initialisation check");
-            }
-            catch (IllegalStateException e)
-            {
-                // expected 
-            }
-            
-            bufferSizeCheck((_engine));
-        }
-    }
-    
-    private void bufferSizeCheck(
-        BlockCipher engine)
-    {
-        byte[] correctBuf = new byte[engine.getBlockSize()];
-        byte[] shortBuf = new byte[correctBuf.length / 2];
-        
-        engine.init(true, _validKey);
-        
-        try
-        {   
-            engine.processBlock(shortBuf, 0, correctBuf, 0);
-            
-            fail("failed short input check");
-        }
-        catch (DataLengthException e)
-        {
-            // expected 
-        }
-        
-        try
-        {   
-            engine.processBlock(correctBuf, 0, shortBuf, 0);
-            
-            fail("failed short output check");
-        }
-        catch (DataLengthException e)
-        {
-            // expected 
-        }
-        
-        engine.init(false, _validKey);
-        
-        try
-        {   
-            engine.processBlock(shortBuf, 0, correctBuf, 0);
-            
-            fail("failed short input check");
-        }
-        catch (DataLengthException e)
-        {
-            // expected 
-        }
-        
-        try
-        {   
-            engine.processBlock(correctBuf, 0, shortBuf, 0);
-            
-            fail("failed short output check");
-        }
-        catch (DataLengthException e)
-        {
-            // expected 
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/CramerShoupTest.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/CramerShoupTest.java
deleted file mode 100644
index e963357..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/CramerShoupTest.java
+++ /dev/null
@@ -1,147 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import java.math.BigInteger;
-import java.security.SecureRandom;
-
-import org.bouncycastle.crypto.AsymmetricCipherKeyPair;
-import org.bouncycastle.crypto.agreement.DHStandardGroups;
-import org.bouncycastle.crypto.engines.CramerShoupCiphertext;
-import org.bouncycastle.crypto.engines.CramerShoupCoreEngine;
-import org.bouncycastle.crypto.engines.CramerShoupCoreEngine.CramerShoupCiphertextException;
-import org.bouncycastle.crypto.generators.CramerShoupKeyPairGenerator;
-import org.bouncycastle.crypto.generators.CramerShoupParametersGenerator;
-import org.bouncycastle.crypto.params.CramerShoupKeyGenerationParameters;
-import org.bouncycastle.crypto.params.CramerShoupParameters;
-import org.bouncycastle.util.BigIntegers;
-import org.bouncycastle.util.test.SimpleTest;
-
-public class CramerShoupTest
-    extends SimpleTest
-{
-    private static final BigInteger ONE = BigInteger.valueOf(1);
-
-    private static final SecureRandom RND = new SecureRandom();
-
-    private AsymmetricCipherKeyPair keyPair;
-
-    public static void main(String[] args)
-    {
-        runTest(new CramerShoupTest());
-    }
-
-    public String getName()
-    {
-        return "CramerShoup";
-    }
-
-
-    public void performTest()
-        throws Exception
-    {
-        BigInteger pSubOne = DHStandardGroups.rfc3526_2048.getP().subtract(ONE);
-        for (int i = 0; i < 10; ++i)
-        {
-            BigInteger message = BigIntegers.createRandomInRange(ONE, pSubOne, RND);
-
-            BigInteger m1 = encDecTest(message);
-            BigInteger m2 = labelledEncDecTest(message, "myRandomLabel");
-            BigInteger m3 = encDecEncodingTest(message);
-            BigInteger m4 = labelledEncDecEncodingTest(message, "myOtherCoolLabel");
-
-            if (!message.equals(m1) || !message.equals(m2) || !message.equals(m3) || !message.equals(m4))
-            {
-                fail("decrypted message != original message");
-            }
-        }
-    }
-
-    private BigInteger encDecEncodingTest(BigInteger m)
-    {
-        CramerShoupCiphertext ciphertext = encrypt(m);
-        byte[] c = ciphertext.toByteArray();
-        CramerShoupCiphertext decC = new CramerShoupCiphertext(c);
-        return decrypt(decC);
-    }
-
-    private BigInteger labelledEncDecEncodingTest(BigInteger m, String l)
-    {
-        byte[] c = encrypt(m, l).toByteArray();
-        return decrypt(new CramerShoupCiphertext(c), l);
-    }
-
-    private BigInteger encDecTest(BigInteger m)
-    {
-        CramerShoupCiphertext c = encrypt(m);
-        return decrypt(c);
-    }
-
-    private BigInteger labelledEncDecTest(BigInteger m, String l)
-    {
-        CramerShoupCiphertext c = encrypt(m, l);
-        return decrypt(c, l);
-    }
-
-
-    private BigInteger decrypt(CramerShoupCiphertext ciphertext)
-    {
-        return decrypt(ciphertext, null);
-    }
-
-    private BigInteger decrypt(CramerShoupCiphertext ciphertext, String label)
-    {
-
-        CramerShoupCoreEngine engine = new CramerShoupCoreEngine();
-        if (label != null)
-        {
-            engine.init(false, keyPair.getPrivate(), label);
-        }
-        else
-        {
-            engine.init(false, keyPair.getPrivate());
-        }
-        try
-        {
-            BigInteger m = engine.decryptBlock(ciphertext);
-
-            return m;
-        }
-        catch (CramerShoupCiphertextException e)
-        {
-            e.printStackTrace();
-        }
-
-        return null;
-    }
-
-    private CramerShoupCiphertext encrypt(BigInteger message)
-    {
-        return encrypt(message, null);
-    }
-
-    private CramerShoupCiphertext encrypt(BigInteger message, String label)
-    {
-        CramerShoupKeyPairGenerator kpGen = new CramerShoupKeyPairGenerator();
-        CramerShoupParametersGenerator pGen = new CramerShoupParametersGenerator();
-
-        pGen.init(2048, 1, RND);
-        CramerShoupParameters params = pGen.generateParameters(DHStandardGroups.rfc3526_2048);
-        CramerShoupKeyGenerationParameters param = new CramerShoupKeyGenerationParameters(RND, params);
-
-        kpGen.init(param);
-        keyPair = kpGen.generateKeyPair();
-
-        CramerShoupCoreEngine engine = new CramerShoupCoreEngine();
-        if (label != null)
-        {
-            engine.init(true, keyPair.getPublic(), label);
-        }
-        else
-        {
-            engine.init(true, keyPair.getPublic());
-        }
-
-        CramerShoupCiphertext ciphertext = engine.encryptBlock(message);
-
-        return ciphertext;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/DESTest.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/DESTest.java
deleted file mode 100644
index 08056fc..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/DESTest.java
+++ /dev/null
@@ -1,206 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import org.bouncycastle.crypto.KeyGenerationParameters;
-import org.bouncycastle.crypto.engines.DESEngine;
-import org.bouncycastle.crypto.generators.DESKeyGenerator;
-import org.bouncycastle.crypto.modes.CBCBlockCipher;
-import org.bouncycastle.crypto.modes.CFBBlockCipher;
-import org.bouncycastle.crypto.modes.OFBBlockCipher;
-import org.bouncycastle.crypto.params.DESParameters;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.crypto.params.ParametersWithIV;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-
-import java.security.SecureRandom;
-
-class DESParityTest
-    extends SimpleTest
-{
-    public String getName()
-    {
-        return "DESParityTest";
-    }
-
-    public void performTest()
-    {
-        byte[]  k1In = { (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff,
-                        (byte)0xff, (byte)0xff, (byte)0xff, (byte)0xff };
-        byte[]  k1Out = { (byte)0xfe, (byte)0xfe, (byte)0xfe, (byte)0xfe,
-                        (byte)0xfe, (byte)0xfe, (byte)0xfe, (byte)0xfe };
-
-        byte[]  k2In = { (byte)0xef, (byte)0xcb, (byte)0xda, (byte)0x4f,
-                        (byte)0xaa, (byte)0x99, (byte)0x7f, (byte)0x63 };
-        byte[]  k2Out = { (byte)0xef, (byte)0xcb, (byte)0xda, (byte)0x4f,
-                        (byte)0xab, (byte)0x98, (byte)0x7f, (byte)0x62 };
-
-        DESParameters.setOddParity(k1In);
-
-        for (int i = 0; i != k1In.length; i++)
-        {
-            if (k1In[i] != k1Out[i])
-            {
-                fail("Failed " 
-                    + "got " + new String(Hex.encode(k1In))
-                    + " expected " + new String(Hex.encode(k1Out)));
-            }
-        }
-
-        DESParameters.setOddParity(k2In);
-
-        for (int i = 0; i != k2In.length; i++)
-        {
-            if (k2In[i] != k2Out[i])
-            {
-                fail("Failed " 
-                    + "got " + new String(Hex.encode(k2In))
-                    + " expected " + new String(Hex.encode(k2Out)));
-            }
-        }
-    }
-}
-
-class KeyGenTest
-    extends SimpleTest
-{
-    public String getName()
-    {
-        return "KeyGenTest";
-    }
-
-    public void performTest()
-    {
-        DESKeyGenerator keyGen = new DESKeyGenerator();
-        
-        keyGen.init(new KeyGenerationParameters(new SecureRandom(), 56));
-        
-        byte[] kB = keyGen.generateKey();
-        
-        if (kB.length != 8)
-        {
-            fail("DES bit key wrong length.");
-        }
-    }
-}
-
-class DESParametersTest
-    extends SimpleTest
-{
-    static private byte[] weakKeys =
-     {
-         (byte)0x01,(byte)0x01,(byte)0x01,(byte)0x01, (byte)0x01,(byte)0x01,(byte)0x01,(byte)0x01,
-         (byte)0x1f,(byte)0x1f,(byte)0x1f,(byte)0x1f, (byte)0x0e,(byte)0x0e,(byte)0x0e,(byte)0x0e,
-         (byte)0xe0,(byte)0xe0,(byte)0xe0,(byte)0xe0, (byte)0xf1,(byte)0xf1,(byte)0xf1,(byte)0xf1,
-         (byte)0xfe,(byte)0xfe,(byte)0xfe,(byte)0xfe, (byte)0xfe,(byte)0xfe,(byte)0xfe,(byte)0xfe,
-         /* semi-weak keys */
-         (byte)0x01,(byte)0xfe,(byte)0x01,(byte)0xfe, (byte)0x01,(byte)0xfe,(byte)0x01,(byte)0xfe,
-         (byte)0x1f,(byte)0xe0,(byte)0x1f,(byte)0xe0, (byte)0x0e,(byte)0xf1,(byte)0x0e,(byte)0xf1,
-         (byte)0x01,(byte)0xe0,(byte)0x01,(byte)0xe0, (byte)0x01,(byte)0xf1,(byte)0x01,(byte)0xf1,
-         (byte)0x1f,(byte)0xfe,(byte)0x1f,(byte)0xfe, (byte)0x0e,(byte)0xfe,(byte)0x0e,(byte)0xfe,
-         (byte)0x01,(byte)0x1f,(byte)0x01,(byte)0x1f, (byte)0x01,(byte)0x0e,(byte)0x01,(byte)0x0e,
-         (byte)0xe0,(byte)0xfe,(byte)0xe0,(byte)0xfe, (byte)0xf1,(byte)0xfe,(byte)0xf1,(byte)0xfe,
-         (byte)0xfe,(byte)0x01,(byte)0xfe,(byte)0x01, (byte)0xfe,(byte)0x01,(byte)0xfe,(byte)0x01,
-         (byte)0xe0,(byte)0x1f,(byte)0xe0,(byte)0x1f, (byte)0xf1,(byte)0x0e,(byte)0xf1,(byte)0x0e,
-         (byte)0xe0,(byte)0x01,(byte)0xe0,(byte)0x01, (byte)0xf1,(byte)0x01,(byte)0xf1,(byte)0x01,
-         (byte)0xfe,(byte)0x1f,(byte)0xfe,(byte)0x1f, (byte)0xfe,(byte)0x0e,(byte)0xfe,(byte)0x0e,
-         (byte)0x1f,(byte)0x01,(byte)0x1f,(byte)0x01, (byte)0x0e,(byte)0x01,(byte)0x0e,(byte)0x01,
-         (byte)0xfe,(byte)0xe0,(byte)0xfe,(byte)0xe0, (byte)0xfe,(byte)0xf1,(byte)0xfe,(byte)0xf1
-     };
-
-    public String getName()
-    {
-        return "DESParameters";
-    }
-
-    public void performTest() throws Exception
-    {
-        try
-        {
-            DESParameters.isWeakKey(new byte[4], 0);
-            fail("no exception on small key");
-        }
-        catch (IllegalArgumentException e)
-        {
-            if (!e.getMessage().equals("key material too short."))
-            {
-                fail("wrong exception");
-            }
-        }
-
-        try
-        {
-            new DESParameters(weakKeys);
-            fail("no exception on weak key");
-        }
-        catch (IllegalArgumentException e)
-        {
-            if (!e.getMessage().equals("attempt to create weak DES key"))
-            {
-                fail("wrong exception");
-            }
-        }
-
-        for (int i = 0; i != weakKeys.length; i += 8)
-        {
-            if (!DESParameters.isWeakKey(weakKeys, i))
-            {
-                fail("weakKey test failed");
-            }
-        }
-    }
-}
-
-/**
- * DES tester - vectors from <a href=http://www.itl.nist.gov/fipspubs/fip81.htm>FIPS 81</a>
- */
-public class DESTest
-    extends CipherTest
-{
-    static String   input1 = "4e6f77206973207468652074696d6520666f7220616c6c20";
-    static String   input2 = "4e6f7720697320746865";
-    static String   input3 = "4e6f7720697320746865aabbcc";
-
-    static SimpleTest[]   tests = 
-            {
-                new BlockCipherVectorTest(0, new DESEngine(),
-                        new KeyParameter(Hex.decode("0123456789abcdef")),
-                        input1, "3fa40e8a984d48156a271787ab8883f9893d51ec4b563b53"),
-                new BlockCipherVectorTest(1, new CBCBlockCipher(new DESEngine()),
-                        new ParametersWithIV(new KeyParameter(Hex.decode("0123456789abcdef")), Hex.decode("1234567890abcdef")),
-                        input1, "e5c7cdde872bf27c43e934008c389c0f683788499a7c05f6"),
-                new BlockCipherVectorTest(2, new CFBBlockCipher(new DESEngine(), 8),
-                        new ParametersWithIV(new KeyParameter(Hex.decode("0123456789abcdef")), Hex.decode("1234567890abcdef")),
-                        input2, "f31fda07011462ee187f"),
-                new BlockCipherVectorTest(3, new CFBBlockCipher(new DESEngine(), 64),
-                        new ParametersWithIV(new KeyParameter(Hex.decode("0123456789abcdef")), Hex.decode("1234567890abcdef")),
-                        input1, "f3096249c7f46e51a69e839b1a92f78403467133898ea622"),
-                new BlockCipherVectorTest(4, new OFBBlockCipher(new DESEngine(), 8),
-                        new ParametersWithIV(new KeyParameter(Hex.decode("0123456789abcdef")), Hex.decode("1234567890abcdef")),
-                        input2, "f34a2850c9c64985d684"),
-                new BlockCipherVectorTest(5, new CFBBlockCipher(new DESEngine(), 64),
-                        new ParametersWithIV(new KeyParameter(Hex.decode("0123456789abcdef")), Hex.decode("1234567890abcdef")),
-                        input3, "f3096249c7f46e51a69e0954bf"),
-                new BlockCipherVectorTest(6, new OFBBlockCipher(new DESEngine(), 64),
-                        new ParametersWithIV(new KeyParameter(Hex.decode("0123456789abcdef")), Hex.decode("1234567890abcdef")),
-                        input3, "f3096249c7f46e5135f2c0eb8b"),
-                new DESParityTest(),
-                new DESParametersTest(),
-                new KeyGenTest()
-            };
-
-    public DESTest()
-    {
-        super(tests, new DESEngine(), new KeyParameter(new byte[8]));
-    }
-
-    public String getName()
-    {
-        return "DES";
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        runTest(new DESTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/DESedeTest.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/DESedeTest.java
deleted file mode 100644
index b14897f..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/DESedeTest.java
+++ /dev/null
@@ -1,177 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import org.bouncycastle.crypto.KeyGenerationParameters;
-import org.bouncycastle.crypto.Wrapper;
-import org.bouncycastle.crypto.engines.DESedeEngine;
-import org.bouncycastle.crypto.engines.DESedeWrapEngine;
-import org.bouncycastle.crypto.generators.DESedeKeyGenerator;
-import org.bouncycastle.crypto.params.DESedeParameters;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.crypto.params.ParametersWithIV;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-
-import java.security.SecureRandom;
-
-/**
- * DESede tester
- */
-public class DESedeTest
-    extends CipherTest
-{
-    static private byte[] weakKey =     // first 8 bytes non-weak
-         {
-             (byte)0x06,(byte)0x01,(byte)0x01,(byte)0x01, (byte)0x01,(byte)0x01,(byte)0x01,(byte)0x01,
-             (byte)0x1f,(byte)0x1f,(byte)0x1f,(byte)0x1f, (byte)0x0e,(byte)0x0e,(byte)0x0e,(byte)0x0e,
-             (byte)0xe0,(byte)0xe0,(byte)0xe0,(byte)0xe0, (byte)0xf1,(byte)0xf1,(byte)0xf1,(byte)0xf1,
-         };
-
-    static String   input1 = "4e6f77206973207468652074696d6520666f7220616c6c20";
-    static String   input2 = "4e6f7720697320746865";
-
-    static SimpleTest[]  tests =
-            {
-                new BlockCipherVectorTest(0, new DESedeEngine(),
-                        new DESedeParameters(Hex.decode("0123456789abcdef0123456789abcdef")),
-                        input1, "3fa40e8a984d48156a271787ab8883f9893d51ec4b563b53"),
-                new BlockCipherVectorTest(1, new DESedeEngine(),
-                        new DESedeParameters(Hex.decode("0123456789abcdeffedcba9876543210")),
-                        input1, "d80a0d8b2bae5e4e6a0094171abcfc2775d2235a706e232c"),
-                new BlockCipherVectorTest(2, new DESedeEngine(),
-                        new DESedeParameters(Hex.decode("0123456789abcdef0123456789abcdef0123456789abcdef")),
-                        input1, "3fa40e8a984d48156a271787ab8883f9893d51ec4b563b53"),
-                new BlockCipherVectorTest(3, new DESedeEngine(),
-                        new DESedeParameters(Hex.decode("0123456789abcdeffedcba98765432100123456789abcdef")),
-                        input1, "d80a0d8b2bae5e4e6a0094171abcfc2775d2235a706e232c")
-            };
-
-    DESedeTest()
-    {
-        super(tests, new DESedeEngine(), new KeyParameter(new byte[16]));
-    }
-
-    private void wrapTest(
-        int     id,
-        byte[]  kek,
-        byte[]  iv,
-        byte[]  in,
-        byte[]  out)
-    {
-        Wrapper wrapper = new DESedeWrapEngine();
-
-        wrapper.init(true, new ParametersWithIV(new KeyParameter(kek), iv));
-
-        try
-        {
-            byte[]  cText = wrapper.wrap(in, 0, in.length);
-            if (!areEqual(cText, out))
-            {
-                fail(": failed wrap test " + id  + " expected " + new String(Hex.encode(out)) + " got " + new String(Hex.encode(cText)));
-            }
-        }
-        catch (Exception e)
-        {
-            fail("failed wrap test exception: " + e.toString(), e);
-        }
-
-        wrapper.init(false, new KeyParameter(kek));
-
-        try
-        {
-            byte[]  pText = wrapper.unwrap(out, 0, out.length);
-            if (!areEqual(pText, in))
-            {
-                fail("failed unwrap test " + id  + " expected " + new String(Hex.encode(in)) + " got " + new String(Hex.encode(pText)));
-            }
-        }
-        catch (Exception e)
-        {
-            fail("failed unwrap test exception: " + e.toString(), e);
-        }
-    }
-
-    public void performTest()
-        throws Exception
-    {
-        super.performTest();
-
-        byte[]  kek1 = Hex.decode("255e0d1c07b646dfb3134cc843ba8aa71f025b7c0838251f");
-        byte[]  iv1 = Hex.decode("5dd4cbfc96f5453b");
-        byte[]  in1 = Hex.decode("2923bf85e06dd6ae529149f1f1bae9eab3a7da3d860d3e98");
-        byte[]  out1 = Hex.decode("690107618ef092b3b48ca1796b234ae9fa33ebb4159604037db5d6a84eb3aac2768c632775a467d4");
-        
-        wrapTest(1, kek1, iv1, in1, out1);
-
-        //
-        // key generation
-        //
-        SecureRandom       random = new SecureRandom();
-        DESedeKeyGenerator keyGen = new DESedeKeyGenerator();
-        
-        keyGen.init(new KeyGenerationParameters(random, 112));
-        
-        byte[] kB = keyGen.generateKey();
-        
-        if (kB.length != 16)
-        {
-            fail("112 bit key wrong length.");
-        }
-        
-        keyGen.init(new KeyGenerationParameters(random, 168));
-        
-        kB = keyGen.generateKey();
-        
-        if (kB.length != 24)
-        {
-            fail("168 bit key wrong length.");
-        }
-        
-        try
-        {
-            keyGen.init(new KeyGenerationParameters(random, 200));
-            
-            fail("invalid key length not detected.");
-        }
-        catch (IllegalArgumentException e)
-        {
-            // expected
-        }
-
-        try
-        {
-            DESedeParameters.isWeakKey(new byte[4], 0);
-            fail("no exception on small key");
-        }
-        catch (IllegalArgumentException e)
-        {
-            if (!e.getMessage().equals("key material too short."))
-            {
-                fail("wrong exception");
-            }
-        }
-
-        try
-        {
-            new DESedeParameters(weakKey);
-            fail("no exception on weak key");
-        }
-        catch (IllegalArgumentException e)
-        {
-            if (!e.getMessage().equals("attempt to create weak DESede key"))
-            {
-                fail("wrong exception");
-            }
-        }
-    }
-
-    public String getName()
-    {
-        return "DESede";
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        runTest(new DESedeTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/DHKEKGeneratorTest.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/DHKEKGeneratorTest.java
deleted file mode 100644
index 8a83d2a..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/DHKEKGeneratorTest.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.crypto.DerivationFunction;
-import org.bouncycastle.crypto.DerivationParameters;
-import org.bouncycastle.crypto.agreement.kdf.DHKDFParameters;
-import org.bouncycastle.crypto.agreement.kdf.DHKEKGenerator;
-import org.bouncycastle.crypto.digests.SHA1Digest;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-
-/**
- * DHKEK Generator tests - from RFC 2631.
- */
-public class DHKEKGeneratorTest
-    extends SimpleTest
-{
-    private byte[] seed1 = Hex.decode("000102030405060708090a0b0c0d0e0f10111213");
-    private ASN1ObjectIdentifier alg1 = PKCSObjectIdentifiers.id_alg_CMS3DESwrap;
-    private byte[] result1 = Hex.decode("a09661392376f7044d9052a397883246b67f5f1ef63eb5fb");
-
-    private byte[] seed2 = Hex.decode("000102030405060708090a0b0c0d0e0f10111213");
-    private ASN1ObjectIdentifier alg2 = PKCSObjectIdentifiers.id_alg_CMSRC2wrap;
-    private byte[] partyAInfo = Hex.decode(
-                                     "0123456789abcdeffedcba9876543201"
-                                   + "0123456789abcdeffedcba9876543201"
-                                   + "0123456789abcdeffedcba9876543201"
-                                   + "0123456789abcdeffedcba9876543201");
-    private byte[] result2 = Hex.decode("48950c46e0530075403cce72889604e0");
-
-    public DHKEKGeneratorTest()
-    {
-    }
-
-    public void performTest()
-    {
-        checkMask(1, new DHKEKGenerator(new SHA1Digest()), new DHKDFParameters(alg1, 192, seed1), result1);
-        checkMask(2, new DHKEKGenerator(new SHA1Digest()), new DHKDFParameters(alg2, 128, seed2, partyAInfo), result2);
-    }
-
-    private void checkMask(
-        int                count,
-        DerivationFunction kdf,
-        DerivationParameters params,
-        byte[]             result)
-    {
-        byte[]             data = new byte[result.length];
-
-        kdf.init(params);
-
-        kdf.generateBytes(data, 0, data.length);
-
-        if (!areEqual(result, data))
-        {
-            fail("DHKEKGenerator failed generator test " + count);
-        }
-    }
-
-    public String getName()
-    {
-        return "DHKEKGenerator";
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        runTest(new DHKEKGeneratorTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/DHTest.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/DHTest.java
deleted file mode 100644
index 862b9f2..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/DHTest.java
+++ /dev/null
@@ -1,414 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import java.math.BigInteger;
-import java.security.SecureRandom;
-
-import org.bouncycastle.crypto.AsymmetricCipherKeyPair;
-import org.bouncycastle.crypto.agreement.DHAgreement;
-import org.bouncycastle.crypto.agreement.DHBasicAgreement;
-import org.bouncycastle.crypto.generators.DHBasicKeyPairGenerator;
-import org.bouncycastle.crypto.generators.DHKeyPairGenerator;
-import org.bouncycastle.crypto.generators.DHParametersGenerator;
-import org.bouncycastle.crypto.params.DHKeyGenerationParameters;
-import org.bouncycastle.crypto.params.DHParameters;
-import org.bouncycastle.crypto.params.DHPrivateKeyParameters;
-import org.bouncycastle.crypto.params.DHPublicKeyParameters;
-import org.bouncycastle.crypto.params.ParametersWithRandom;
-import org.bouncycastle.util.test.SimpleTest;
-
-public class DHTest
-    extends SimpleTest
-{
-    private BigInteger g512 = new BigInteger("153d5d6172adb43045b68ae8e1de1070b6137005686d29d3d73a7749199681ee5b212c9b96bfdcfa5b20cd5e3fd2044895d609cf9b410b7a0f12ca1cb9a428cc", 16);
-    private BigInteger p512 = new BigInteger("9494fec095f3b85ee286542b3836fc81a5dd0a0349b4c239dd38744d488cf8e31db8bcb7d33b41abb9e5a33cca9144b1cef332c94bf0573bf047a3aca98cdf3b", 16);
-
-    private BigInteger g768 = new BigInteger("7c240073c1316c621df461b71ebb0cdcc90a6e5527e5e126633d131f87461c4dc4afc60c2cb0f053b6758871489a69613e2a8b4c8acde23954c08c81cbd36132cfd64d69e4ed9f8e51ed6e516297206672d5c0a69135df0a5dcf010d289a9ca1", 16);
-    private BigInteger p768 = new BigInteger("8c9dd223debed1b80103b8b309715be009d48860ed5ae9b9d5d8159508efd802e3ad4501a7f7e1cfec78844489148cd72da24b21eddd01aa624291c48393e277cfc529e37075eccef957f3616f962d15b44aeab4039d01b817fde9eaa12fd73f", 16);
-
-    private BigInteger  g1024 = new BigInteger("1db17639cdf96bc4eabba19454f0b7e5bd4e14862889a725c96eb61048dcd676ceb303d586e30f060dbafd8a571a39c4d823982117da5cc4e0f89c77388b7a08896362429b94a18a327604eb7ff227bffbc83459ade299e57b5f77b50fb045250934938efa145511166e3197373e1b5b1e52de713eb49792bedde722c6717abf", 16);
-    private BigInteger  p1024 = new BigInteger("a00e283b3c624e5b2b4d9fbc2653b5185d99499b00fd1bf244c6f0bb817b4d1c451b2958d62a0f8a38caef059fb5ecd25d75ed9af403f5b5bdab97a642902f824e3c13789fed95fa106ddfe0ff4a707c85e2eb77d49e68f2808bcea18ce128b178cd287c6bc00efa9a1ad2a673fe0dceace53166f75b81d6709d5f8af7c66bb7", 16);
-
-    public String getName()
-    {
-        return "DH";
-    }
-
-    private void testDH(
-        int         size,
-        BigInteger  g,
-        BigInteger  p)
-    {
-        DHKeyPairGenerator kpGen = getDHKeyPairGenerator(g, p);
-
-        //
-        // generate first pair
-        //
-        AsymmetricCipherKeyPair     pair = kpGen.generateKeyPair();
-
-        DHPublicKeyParameters       pu1 = (DHPublicKeyParameters)pair.getPublic();
-        DHPrivateKeyParameters      pv1 = (DHPrivateKeyParameters)pair.getPrivate();
-        //
-        // generate second pair
-        //
-        pair = kpGen.generateKeyPair();
-
-        DHPublicKeyParameters       pu2 = (DHPublicKeyParameters)pair.getPublic();
-        DHPrivateKeyParameters      pv2 = (DHPrivateKeyParameters)pair.getPrivate();
-
-        //
-        // two way
-        //
-        DHAgreement    e1 = new DHAgreement();
-        DHAgreement    e2 = new DHAgreement();
-
-        e1.init(pv1);
-        e2.init(pv2);
-
-        BigInteger  m1 = e1.calculateMessage();
-        BigInteger  m2 = e2.calculateMessage();
-
-        BigInteger   k1 = e1.calculateAgreement(pu2, m2);
-        BigInteger   k2 = e2.calculateAgreement(pu1, m1);
-
-        if (!k1.equals(k2))
-        {
-            fail(size + " bit 2-way test failed");
-        }
-    }
-
-    private void testDHBasic(
-        int         size,
-        int         privateValueSize,
-        BigInteger  g,
-        BigInteger  p)
-    {
-        DHBasicKeyPairGenerator kpGen = getDHBasicKeyPairGenerator(g, p, privateValueSize);
-
-        //
-        // generate first pair
-        //
-        AsymmetricCipherKeyPair     pair = kpGen.generateKeyPair();
-
-        DHPublicKeyParameters       pu1 = (DHPublicKeyParameters)pair.getPublic();
-        DHPrivateKeyParameters      pv1 = (DHPrivateKeyParameters)pair.getPrivate();
-
-        checkKeySize(privateValueSize, pv1);
-        //
-        // generate second pair
-        //
-        pair = kpGen.generateKeyPair();
-
-        DHPublicKeyParameters       pu2 = (DHPublicKeyParameters)pair.getPublic();
-        DHPrivateKeyParameters      pv2 = (DHPrivateKeyParameters)pair.getPrivate();
-
-        checkKeySize(privateValueSize, pv2);
-        //
-        // two way
-        //
-        DHBasicAgreement    e1 = new DHBasicAgreement();
-        DHBasicAgreement    e2 = new DHBasicAgreement();
-
-        e1.init(pv1);
-        e2.init(pv2);
-
-        BigInteger   k1 = e1.calculateAgreement(pu2);
-        BigInteger   k2 = e2.calculateAgreement(pu1);
-
-        if (!k1.equals(k2))
-        {
-            fail("basic " + size + " bit 2-way test failed");
-        }
-    }
-
-    private void checkKeySize(
-        int privateValueSize,
-        DHPrivateKeyParameters priv)
-    {
-        if (privateValueSize != 0)
-        {
-            if (priv.getX().bitLength() != privateValueSize)
-            {
-                fail("limited key check failed for key size " + privateValueSize);
-            }
-        }
-    }
-
-    private void testGPWithRandom(
-        DHKeyPairGenerator kpGen)
-    {
-        //
-        // generate first pair
-        //
-        AsymmetricCipherKeyPair     pair = kpGen.generateKeyPair();
-
-        DHPublicKeyParameters       pu1 = (DHPublicKeyParameters)pair.getPublic();
-        DHPrivateKeyParameters      pv1 = (DHPrivateKeyParameters)pair.getPrivate();
-        //
-        // generate second pair
-        //
-        pair = kpGen.generateKeyPair();
-
-        DHPublicKeyParameters       pu2 = (DHPublicKeyParameters)pair.getPublic();
-        DHPrivateKeyParameters      pv2 = (DHPrivateKeyParameters)pair.getPrivate();
-
-        //
-        // two way
-        //
-        DHAgreement    e1 = new DHAgreement();
-        DHAgreement    e2 = new DHAgreement();
-
-        e1.init(new ParametersWithRandom(pv1, new SecureRandom()));
-        e2.init(new ParametersWithRandom(pv2, new SecureRandom()));
-
-        BigInteger   m1 = e1.calculateMessage();
-        BigInteger   m2 = e2.calculateMessage();
-
-        BigInteger   k1 = e1.calculateAgreement(pu2, m2);
-        BigInteger   k2 = e2.calculateAgreement(pu1, m1);
-        
-        if (!k1.equals(k2))
-        {
-            fail("basic with random 2-way test failed");
-        }
-    }
-    
-    private void testSimpleWithRandom(
-        DHBasicKeyPairGenerator kpGen)
-    {
-        //
-        // generate first pair
-        //
-        AsymmetricCipherKeyPair     pair = kpGen.generateKeyPair();
-
-        DHPublicKeyParameters       pu1 = (DHPublicKeyParameters)pair.getPublic();
-        DHPrivateKeyParameters      pv1 = (DHPrivateKeyParameters)pair.getPrivate();
-        //
-        // generate second pair
-        //
-        pair = kpGen.generateKeyPair();
-
-        DHPublicKeyParameters       pu2 = (DHPublicKeyParameters)pair.getPublic();
-        DHPrivateKeyParameters      pv2 = (DHPrivateKeyParameters)pair.getPrivate();
-
-        //
-        // two way
-        //
-        DHBasicAgreement    e1 = new DHBasicAgreement();
-        DHBasicAgreement    e2 = new DHBasicAgreement();
-
-        e1.init(new ParametersWithRandom(pv1, new SecureRandom()));
-        e2.init(new ParametersWithRandom(pv2, new SecureRandom()));
-
-        BigInteger   k1 = e1.calculateAgreement(pu2);
-        BigInteger   k2 = e2.calculateAgreement(pu1);
-
-        if (!k1.equals(k2))
-        {
-            fail("basic with random 2-way test failed");
-        }
-    }
-
-    private DHBasicKeyPairGenerator getDHBasicKeyPairGenerator(
-        BigInteger g,
-        BigInteger p,
-        int        privateValueSize)
-    {
-        DHParameters                dhParams = new DHParameters(p, g, null, privateValueSize);
-        DHKeyGenerationParameters   params = new DHKeyGenerationParameters(new SecureRandom(), dhParams);
-        DHBasicKeyPairGenerator     kpGen = new DHBasicKeyPairGenerator();
-
-        kpGen.init(params);
-        
-        return kpGen;
-    }
-    
-    private DHKeyPairGenerator getDHKeyPairGenerator(
-        BigInteger g,
-        BigInteger p)
-    {
-        DHParameters                dhParams = new DHParameters(p, g);
-        DHKeyGenerationParameters   params = new DHKeyGenerationParameters(new SecureRandom(), dhParams);
-        DHKeyPairGenerator          kpGen = new DHKeyPairGenerator();
-
-        kpGen.init(params);
-        
-        return kpGen;
-    }
-    
-    /**
-     * this test is can take quiet a while
-     */
-    private void testGeneration(
-        int         size)
-    {
-        DHParametersGenerator       pGen = new DHParametersGenerator();
-
-        pGen.init(size, 10, new SecureRandom());
-
-        DHParameters                dhParams = pGen.generateParameters();
-
-        if (dhParams.getL() != 0)
-        {
-            fail("DHParametersGenerator failed to set J to 0 in generated DHParameters");
-        }
-
-        DHKeyGenerationParameters   params = new DHKeyGenerationParameters(new SecureRandom(), dhParams);
-
-        DHBasicKeyPairGenerator     kpGen = new DHBasicKeyPairGenerator();
-
-        kpGen.init(params);
-
-        //
-        // generate first pair
-        //
-        AsymmetricCipherKeyPair     pair = kpGen.generateKeyPair();
-
-        DHPublicKeyParameters       pu1 = (DHPublicKeyParameters)pair.getPublic();
-        DHPrivateKeyParameters      pv1 = (DHPrivateKeyParameters)pair.getPrivate();
-        
-        //
-        // generate second pair
-        //
-        params = new DHKeyGenerationParameters(new SecureRandom(), pu1.getParameters());
-
-        kpGen.init(params);
-
-        pair = kpGen.generateKeyPair();
-
-        DHPublicKeyParameters       pu2 = (DHPublicKeyParameters)pair.getPublic();
-        DHPrivateKeyParameters      pv2 = (DHPrivateKeyParameters)pair.getPrivate();
-
-        //
-        // two way
-        //
-        DHBasicAgreement    e1 = new DHBasicAgreement();
-        DHBasicAgreement    e2 = new DHBasicAgreement();
-
-        e1.init(new ParametersWithRandom(pv1, new SecureRandom()));
-        e2.init(new ParametersWithRandom(pv2, new SecureRandom()));
-
-        BigInteger   k1 = e1.calculateAgreement(pu2);
-        BigInteger   k2 = e2.calculateAgreement(pu1);
-
-        if (!k1.equals(k2))
-        {
-            fail("basic with " + size + " bit 2-way test failed");
-        }
-    }
-    private void testBounds()
-    {
-         BigInteger p1 = new BigInteger("00C8028E9151C6B51BCDB35C1F6B2527986A72D8546AE7A4BF41DC4289FF9837EE01592D36C324A0F066149B8B940C86C87D194206A39038AE3396F8E12435BB74449B70222D117B8A2BB77CB0D67A5D664DDE7B75E0FEC13CE0CAF258DAF3ADA0773F6FF0F2051D1859929AAA53B07809E496B582A89C3D7DA8B6E38305626621", 16);
-         BigInteger g1 = new BigInteger("1F869713181464577FE4026B47102FA0D7675503A4FCDA810881FAEC3524E6DBAEA9B96561EF7F8BEA76466DF11C2F3EB1A90CC5851735BF860606481257EECE6418C0204E61004E85D7131CE54BCBC7AD67E53C79DCB715E7C8D083DCD85D728283EC8F96839B4C9FA7C0727C472BEB94E4613CAFA8D580119C0AF4BF8AF252", 16);
-         int l1 = 1023;
-
-         BigInteger p2 = new BigInteger("00B333C98720220CC3946F494E25231B3E19F9AD5F6B19F4E7ABF80D8826C491C3224D4F7415A14A7C11D1BE584405FED12C3554F103E56A72D986CA5E325BB9DE07AC37D1EAE5E5AC724D32EF638F0E4462D4C1FC7A45B9FD3A5DF5EC36A1FA4DAA3FBB66AA42B1B71DF416AB547E987513426C7BB8634F5F4D37705514FDC1E1", 16);
-         BigInteger g2 = new BigInteger("2592F5A99FE46313650CCE66C94C15DBED9F4A45BD05C329986CF5D3E12139F0405A47C6385FEA27BFFEDC4CBABC5BB151F3BEE7CC3D51567F1E2B12A975AA9F48A70BDAAE7F5B87E70ADCF902490A3CBEFEDA41EBA8E12E02B56120B5FDEFBED07F5EAD3AE020DF3C8233216F8F0D35E13A7AE4DA5CBCC0D91EADBF20C281C6", 16);
-         int l2 = 1024;
-
-        DHKeyGenerationParameters   params1 = new DHKeyGenerationParameters(new SecureRandom(), new DHParameters(p1, g1, null, l1));
-        DHKeyGenerationParameters   params2 = new DHKeyGenerationParameters(new SecureRandom(), new DHParameters(p2, g2, null, l2));
-
-        DHBasicKeyPairGenerator     kpGen = new DHBasicKeyPairGenerator();
-
-        kpGen.init(params1);
-        kpGen.init(params2);
-    }
-
-    public void performTest()
-    {
-        testDHBasic(512, 0, g512, p512);
-        testDHBasic(768, 0, g768, p768);
-        testDHBasic(1024, 0, g1024, p1024);
-
-        testDHBasic(512, 64, g512, p512);
-        testDHBasic(768, 128, g768, p768);
-        testDHBasic(1024, 256, g1024, p1024);
-
-        testDH(512, g512, p512);
-        testDH(768, g768, p768);
-        testDH(1024, g1024, p1024);
-
-        testBounds();
-
-        //
-        // generation test.
-        //
-        testGeneration(256);
-        
-        //
-        // with random test
-        //
-        DHBasicKeyPairGenerator     kpBasicGen = getDHBasicKeyPairGenerator(g512, p512, 0);
-        
-        testSimpleWithRandom(kpBasicGen);
-        
-        DHKeyPairGenerator          kpGen = getDHKeyPairGenerator(g512, p512);
-        
-        testGPWithRandom(kpGen);
-        
-        //
-        // parameter tests
-        //
-        DHAgreement             dh = new DHAgreement();
-        AsymmetricCipherKeyPair dhPair = kpGen.generateKeyPair();
-        
-        try
-        {
-            dh.init(dhPair.getPublic());
-            fail("DHAgreement key check failed");
-        }
-        catch (IllegalArgumentException e)
-        {
-            // ignore
-        }
-        
-        DHKeyPairGenerator      kpGen768 = getDHKeyPairGenerator(g768, p768);
-        
-        try
-        {
-            dh.init(dhPair.getPrivate());
-            
-            dh.calculateAgreement((DHPublicKeyParameters)kpGen768.generateKeyPair().getPublic(), BigInteger.valueOf(100));
-            
-            fail("DHAgreement agreement check failed");
-        }
-        catch (IllegalArgumentException e)
-        {
-            // ignore
-        }
-        
-        DHBasicAgreement        dhBasic = new DHBasicAgreement();
-        AsymmetricCipherKeyPair dhBasicPair = kpBasicGen.generateKeyPair();
- 
-        try
-        {
-            dhBasic.init(dhBasicPair.getPublic());
-            fail("DHBasicAgreement key check failed");
-        }
-        catch (IllegalArgumentException e)
-        {
-            // expected
-        }
-        
-        DHBasicKeyPairGenerator      kpBasicGen768 = getDHBasicKeyPairGenerator(g768, p768, 0);
-        
-        try
-        {
-            dhBasic.init(dhPair.getPrivate());
-            
-            dhBasic.calculateAgreement((DHPublicKeyParameters)kpBasicGen768.generateKeyPair().getPublic());
-            
-            fail("DHBasicAgreement agreement check failed");
-        }
-        catch (IllegalArgumentException e)
-        {
-            // expected
-        }
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        runTest(new DHTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/DSATest.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/DSATest.java
deleted file mode 100644
index 02c748f..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/DSATest.java
+++ /dev/null
@@ -1,602 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import java.math.BigInteger;
-import java.security.SecureRandom;
-
-import org.bouncycastle.crypto.AsymmetricCipherKeyPair;
-import org.bouncycastle.crypto.digests.SHA224Digest;
-import org.bouncycastle.crypto.digests.SHA256Digest;
-import org.bouncycastle.crypto.generators.DSAKeyPairGenerator;
-import org.bouncycastle.crypto.generators.DSAParametersGenerator;
-import org.bouncycastle.crypto.params.DSAKeyGenerationParameters;
-import org.bouncycastle.crypto.params.DSAParameterGenerationParameters;
-import org.bouncycastle.crypto.params.DSAParameters;
-import org.bouncycastle.crypto.params.DSAPrivateKeyParameters;
-import org.bouncycastle.crypto.params.DSAPublicKeyParameters;
-import org.bouncycastle.crypto.params.DSAValidationParameters;
-import org.bouncycastle.crypto.params.ParametersWithRandom;
-import org.bouncycastle.crypto.signers.DSASigner;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.BigIntegers;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.FixedSecureRandom;
-import org.bouncycastle.util.test.SimpleTest;
-
-/**
- * Test based on FIPS 186-2, Appendix 5, an example of DSA, and FIPS 168-3 test vectors.
- */
-public class DSATest
-    extends SimpleTest
-{
-    byte[] k1 = Hex.decode("d5014e4b60ef2ba8b6211b4062ba3224e0427dd3");
-    byte[] k2 = Hex.decode("345e8d05c075c3a508df729a1685690e68fcfb8c8117847e89063bca1f85d968fd281540b6e13bd1af989a1fbf17e06462bf511f9d0b140fb48ac1b1baa5bded");
-
-    SecureRandom    random = new FixedSecureRandom(new byte[][] { k1, k2});
-
-    byte[] keyData = Hex.decode("b5014e4b60ef2ba8b6211b4062ba3224e0427dd3");
-    
-    SecureRandom    keyRandom = new FixedSecureRandom(new byte[][] { keyData, keyData });
-    
-    BigInteger  pValue = new BigInteger("8df2a494492276aa3d25759bb06869cbeac0d83afb8d0cf7cbb8324f0d7882e5d0762fc5b7210eafc2e9adac32ab7aac49693dfbf83724c2ec0736ee31c80291", 16);
-    BigInteger  qValue = new BigInteger("c773218c737ec8ee993b4f2ded30f48edace915f", 16);
-
-    public String getName()
-    {
-        return "DSA";
-    }
-
-    public void performTest()
-    {
-        BigInteger              r = new BigInteger("68076202252361894315274692543577577550894681403");
-        BigInteger              s = new BigInteger("1089214853334067536215539335472893651470583479365");
-        DSAParametersGenerator  pGen = new DSAParametersGenerator();
-
-        pGen.init(512, 80, random);
-
-        DSAParameters           params = pGen.generateParameters();
-        DSAValidationParameters pValid = params.getValidationParameters();
-
-        if (pValid.getCounter() != 105)
-        {
-            fail("Counter wrong");
-        }
-
-        if (!pValue.equals(params.getP()) || !qValue.equals(params.getQ()))
-        {
-            fail("p or q wrong");
-        }
-
-        DSAKeyPairGenerator         dsaKeyGen = new DSAKeyPairGenerator();
-        DSAKeyGenerationParameters  genParam = new DSAKeyGenerationParameters(keyRandom, params);
-
-        dsaKeyGen.init(genParam);
-
-        AsymmetricCipherKeyPair  pair = dsaKeyGen.generateKeyPair();
-
-        ParametersWithRandom param = new ParametersWithRandom(pair.getPrivate(), keyRandom);
-
-        DSASigner dsa = new DSASigner();
-
-        dsa.init(true, param);
-
-        byte[] message = BigIntegers.asUnsignedByteArray(new BigInteger("968236873715988614170569073515315707566766479517"));
-        BigInteger[] sig = dsa.generateSignature(message);
-
-        if (!r.equals(sig[0]))
-        {
-            fail("r component wrong.", r, sig[0]);
-        }
-
-        if (!s.equals(sig[1]))
-        {
-            fail("s component wrong.", s, sig[1]);
-        }
-
-        dsa.init(false, pair.getPublic());
-
-        if (!dsa.verifySignature(message, sig[0], sig[1]))
-        {
-            fail("verification fails");
-        }
-
-        dsa2Test1();
-        dsa2Test2();
-        dsa2Test3();
-        dsa2Test4();
-    }
-
-    private void dsa2Test1()
-    {
-        byte[] seed = Hex.decode("ED8BEE8D1CB89229D2903CBF0E51EE7377F48698");
-
-        DSAParametersGenerator pGen = new DSAParametersGenerator();
-
-        pGen.init(new DSAParameterGenerationParameters(1024, 160, 80, new DSATestSecureRandom(seed)));
-
-        DSAParameters params = pGen.generateParameters();
-
-        DSAValidationParameters pv = params.getValidationParameters();
-
-        if (pv.getCounter() != 5)
-        {
-            fail("counter incorrect");
-        }
-
-        if (!Arrays.areEqual(seed, pv.getSeed()))
-        {
-            fail("seed incorrect");
-        }
-
-        if (!params.getQ().equals(new BigInteger("E950511EAB424B9A19A2AEB4E159B7844C589C4F", 16)))
-        {
-            fail("Q incorrect");
-        }
-
-        if (!params.getP().equals(new BigInteger(
-            "E0A67598CD1B763B" +
-            "C98C8ABB333E5DDA0CD3AA0E5E1FB5BA8A7B4EABC10BA338" +
-            "FAE06DD4B90FDA70D7CF0CB0C638BE3341BEC0AF8A7330A3" +
-            "307DED2299A0EE606DF035177A239C34A912C202AA5F83B9" +
-            "C4A7CF0235B5316BFC6EFB9A248411258B30B839AF172440" +
-            "F32563056CB67A861158DDD90E6A894C72A5BBEF9E286C6B", 16)))
-        {
-            fail("P incorrect");
-        }
-
-        if (!params.getG().equals(new BigInteger(
-            "D29D5121B0423C27" +
-            "69AB21843E5A3240FF19CACC792264E3BB6BE4F78EDD1B15" +
-            "C4DFF7F1D905431F0AB16790E1F773B5CE01C804E509066A" +
-            "9919F5195F4ABC58189FD9FF987389CB5BEDF21B4DAB4F8B" +
-            "76A055FFE2770988FE2EC2DE11AD92219F0B351869AC24DA" +
-            "3D7BA87011A701CE8EE7BFE49486ED4527B7186CA4610A75", 16)))
-        {
-            fail("G incorrect");
-        }
-
-        DSAKeyPairGenerator kpGen = new DSAKeyPairGenerator();
-
-        kpGen.init(new DSAKeyGenerationParameters(new FixedSecureRandom(Hex.decode("D0EC4E50BB290A42E9E355C73D8809345DE2E139")), params));
-
-        AsymmetricCipherKeyPair kp = kpGen.generateKeyPair();
-
-        DSAPublicKeyParameters pub = (DSAPublicKeyParameters)kp.getPublic();
-        DSAPrivateKeyParameters priv = (DSAPrivateKeyParameters)kp.getPrivate();
-
-        if (!pub.getY().equals(new BigInteger(
-            "25282217F5730501" +
-            "DD8DBA3EDFCF349AAFFEC20921128D70FAC44110332201BB" +
-            "A3F10986140CBB97C726938060473C8EC97B4731DB004293" +
-            "B5E730363609DF9780F8D883D8C4D41DED6A2F1E1BBBDC97" +
-            "9E1B9D6D3C940301F4E978D65B19041FCF1E8B518F5C0576" +
-            "C770FE5A7A485D8329EE2914A2DE1B5DA4A6128CEAB70F79", 16)))
-        {
-            fail("Y value incorrect");
-        }
-
-        if (!priv.getX().equals(
-            new BigInteger("D0EC4E50BB290A42E9E355C73D8809345DE2E139", 16)))
-        {
-            fail("X value incorrect");
-        }
-
-        DSASigner signer = new DSASigner();
-
-        signer.init(true, new ParametersWithRandom(kp.getPrivate(), new FixedSecureRandom(Hex.decode("349C55648DCF992F3F33E8026CFAC87C1D2BA075"))));
-
-        byte[] msg = Hex.decode("A9993E364706816ABA3E25717850C26C9CD0D89D");
-
-        BigInteger[] sig = signer.generateSignature(msg);
-
-        if (!sig[0].equals(new BigInteger("636155AC9A4633B4665D179F9E4117DF68601F34", 16)))
-        {
-            fail("R value incorrect");
-        }
-
-        if (!sig[1].equals(new BigInteger("6C540B02D9D4852F89DF8CFC99963204F4347704", 16)))
-        {
-            fail("S value incorrect");
-        }
-
-        signer.init(false, kp.getPublic());
-
-        if (!signer.verifySignature(msg, sig[0], sig[1]))
-        {
-            fail("signature not verified");
-        }
-
-    }
-
-    private void dsa2Test2()
-        {
-            byte[] seed = Hex.decode("5AFCC1EFFC079A9CCA6ECA86D6E3CC3B18642D9BE1CC6207C84002A9");
-
-            DSAParametersGenerator pGen = new DSAParametersGenerator(new SHA224Digest());
-
-            pGen.init(new DSAParameterGenerationParameters(2048, 224, 80, new DSATestSecureRandom(seed)));
-
-            DSAParameters params = pGen.generateParameters();
-
-            DSAValidationParameters pv = params.getValidationParameters();
-
-            if (pv.getCounter() != 21)
-            {
-                fail("counter incorrect");
-            }
-
-            if (!Arrays.areEqual(seed, pv.getSeed()))
-            {
-                fail("seed incorrect");
-            }
-
-            if (!params.getQ().equals(new BigInteger("90EAF4D1AF0708B1B612FF35E0A2997EB9E9D263C9CE659528945C0D", 16)))
-            {
-                fail("Q incorrect");
-            }
-
-            if (!params.getP().equals(new BigInteger(
-                "C196BA05AC29E1F9C3C72D56DFFC6154" +
-                "A033F1477AC88EC37F09BE6C5BB95F51C296DD20D1A28A06" +
-                "7CCC4D4316A4BD1DCA55ED1066D438C35AEBAABF57E7DAE4" +
-                "28782A95ECA1C143DB701FD48533A3C18F0FE23557EA7AE6" +
-                "19ECACC7E0B51652A8776D02A425567DED36EABD90CA33A1" +
-                "E8D988F0BBB92D02D1D20290113BB562CE1FC856EEB7CDD9" +
-                "2D33EEA6F410859B179E7E789A8F75F645FAE2E136D252BF" +
-                "FAFF89528945C1ABE705A38DBC2D364AADE99BE0D0AAD82E" +
-                "5320121496DC65B3930E38047294FF877831A16D5228418D" +
-                "E8AB275D7D75651CEFED65F78AFC3EA7FE4D79B35F62A040" +
-                "2A1117599ADAC7B269A59F353CF450E6982D3B1702D9CA83", 16)))
-            {
-                fail("P incorrect");
-            }
-
-            if (!params.getG().equals(new BigInteger(
-                "A59A749A11242C58C894E9E5A91804E8"+
-                "FA0AC64B56288F8D47D51B1EDC4D65444FECA0111D78F35F"+
-                "C9FDD4CB1F1B79A3BA9CBEE83A3F811012503C8117F98E50"+
-                "48B089E387AF6949BF8784EBD9EF45876F2E6A5A495BE64B"+
-                "6E770409494B7FEE1DBB1E4B2BC2A53D4F893D418B715959"+
-                "2E4FFFDF6969E91D770DAEBD0B5CB14C00AD68EC7DC1E574"+
-                "5EA55C706C4A1C5C88964E34D09DEB753AD418C1AD0F4FDF"+
-                "D049A955E5D78491C0B7A2F1575A008CCD727AB376DB6E69"+
-                "5515B05BD412F5B8C2F4C77EE10DA48ABD53F5DD498927EE"+
-                "7B692BBBCDA2FB23A516C5B4533D73980B2A3B60E384ED20"+
-                "0AE21B40D273651AD6060C13D97FD69AA13C5611A51B9085", 16)))
-            {
-                fail("G incorrect");
-            }
-
-            DSAKeyPairGenerator kpGen = new DSAKeyPairGenerator();
-
-            kpGen.init(new DSAKeyGenerationParameters(new FixedSecureRandom(Hex.decode("00D0F09ED3E2568F6CADF9224117DA2AEC5A4300E009DE1366023E17")), params));
-
-            AsymmetricCipherKeyPair kp = kpGen.generateKeyPair();
-
-            DSAPublicKeyParameters pub = (DSAPublicKeyParameters)kp.getPublic();
-            DSAPrivateKeyParameters priv = (DSAPrivateKeyParameters)kp.getPrivate();
-
-            if (!pub.getY().equals(new BigInteger(
-                "70035C9A3B225B258F16741F3941FBF0" +
-                "6F3D056CD7BD864604CBB5EE9DD85304EE8E8E4ABD5E9032" +
-                "11DDF25CE149075510ACE166970AFDC7DF552B7244F342FA" +
-                "02F7A621405B754909D757F97290E1FE5036E904CF593446" +
-                "0C046D95659821E1597ED9F2B1F0E20863A6BBD0CE74DACB" +
-                "A5D8C68A90B29C2157CDEDB82EC12B81EE3068F9BF5F7F34" +
-                "6ECA41ED174CCCD7D154FA4F42F80FFE1BF46AE9D8125DEB" +
-                "5B4BA08A72BDD86596DBEDDC9550FDD650C58F5AE5133509" +
-                "A702F79A31ECB490F7A3C5581631F7C5BE4FF7F9E9F27FA3" +
-                "90E47347AD1183509FED6FCF198BA9A71AB3335B4F38BE8D" +
-                "15496A00B6DC2263E20A5F6B662320A3A1EC033AA61E3B68", 16)))
-            {
-                fail("Y value incorrect");
-            }
-
-            if (!priv.getX().equals(
-                new BigInteger("00D0F09ED3E2568F6CADF9224117DA2AEC5A4300E009DE1366023E17", 16)))
-            {
-                fail("X value incorrect");
-            }
-
-            DSASigner signer = new DSASigner();
-
-            signer.init(true, new ParametersWithRandom(kp.getPrivate(), new FixedSecureRandom(Hex.decode("735959CC4463B8B440E407EECA8A473BF6A6D1FE657546F67D401F05"))));
-
-            byte[] msg = Hex.decode("23097D223405D8228642A477BDA255B32AADBCE4BDA0B3F7E36C9DA7");
-
-            BigInteger[] sig = signer.generateSignature(msg);
-
-            if (!sig[0].equals(new BigInteger("4400138D05F9639CAF54A583CAAF25D2B76D0C3EAD752CE17DBC85FE", 16)))
-            {
-                fail("R value incorrect");
-            }
-
-            if (!sig[1].equals(new BigInteger("874D4F12CB13B61732D398445698CFA9D92381D938AA57EE2C9327B3", 16)))
-            {
-                fail("S value incorrect");
-            }
-
-            signer.init(false, kp.getPublic());
-
-            if (!signer.verifySignature(msg, sig[0], sig[1]))
-            {
-                fail("signature not verified");
-            }
-        }
-
-    private void dsa2Test3()
-    {
-        byte[] seed = Hex.decode("4783081972865EA95D43318AB2EAF9C61A2FC7BBF1B772A09017BDF5A58F4FF0");
-
-        DSAParametersGenerator pGen = new DSAParametersGenerator(new SHA256Digest());
-
-        pGen.init(new DSAParameterGenerationParameters(2048, 256, 80, new DSATestSecureRandom(seed)));
-
-        DSAParameters params = pGen.generateParameters();
-
-        DSAValidationParameters pv = params.getValidationParameters();
-
-        if (pv.getCounter() != 12)
-        {
-            fail("counter incorrect");
-        }
-
-        if (!Arrays.areEqual(seed, pv.getSeed()))
-        {
-            fail("seed incorrect");
-        }
-
-        if (!params.getQ().equals(new BigInteger("C24ED361870B61E0D367F008F99F8A1F75525889C89DB1B673C45AF5867CB467", 16)))
-        {
-            fail("Q incorrect");
-        }
-
-        if (!params.getP().equals(new BigInteger(
-            "F56C2A7D366E3EBDEAA1891FD2A0D099" +
-            "436438A673FED4D75F594959CFFEBCA7BE0FC72E4FE67D91" +
-            "D801CBA0693AC4ED9E411B41D19E2FD1699C4390AD27D94C" +
-            "69C0B143F1DC88932CFE2310C886412047BD9B1C7A67F8A2" +
-            "5909132627F51A0C866877E672E555342BDF9355347DBD43" +
-            "B47156B2C20BAD9D2B071BC2FDCF9757F75C168C5D9FC431" +
-            "31BE162A0756D1BDEC2CA0EB0E3B018A8B38D3EF2487782A" +
-            "EB9FBF99D8B30499C55E4F61E5C7DCEE2A2BB55BD7F75FCD" +
-            "F00E48F2E8356BDB59D86114028F67B8E07B127744778AFF" +
-            "1CF1399A4D679D92FDE7D941C5C85C5D7BFF91BA69F9489D" +
-            "531D1EBFA727CFDA651390F8021719FA9F7216CEB177BD75", 16)))
-        {
-            fail("P incorrect");
-        }
-
-        if (!params.getG().equals(new BigInteger(
-            "8DC6CC814CAE4A1C05A3E186A6FE27EA" +
-            "BA8CDB133FDCE14A963A92E809790CBA096EAA26140550C1" +
-            "29FA2B98C16E84236AA33BF919CD6F587E048C52666576DB" +
-            "6E925C6CBE9B9EC5C16020F9A44C9F1C8F7A8E611C1F6EC2" +
-            "513EA6AA0B8D0F72FED73CA37DF240DB57BBB27431D61869" +
-            "7B9E771B0B301D5DF05955425061A30DC6D33BB6D2A32BD0" +
-            "A75A0A71D2184F506372ABF84A56AEEEA8EB693BF29A6403" +
-            "45FA1298A16E85421B2208D00068A5A42915F82CF0B858C8" +
-            "FA39D43D704B6927E0B2F916304E86FB6A1B487F07D8139E" +
-            "428BB096C6D67A76EC0B8D4EF274B8A2CF556D279AD267CC" +
-            "EF5AF477AFED029F485B5597739F5D0240F67C2D948A6279", 16)))
-        {
-            fail("G incorrect");
-        }
-
-        DSAKeyPairGenerator kpGen = new DSAKeyPairGenerator();
-
-        kpGen.init(new DSAKeyGenerationParameters(new FixedSecureRandom(Hex.decode("0CAF2EF547EC49C4F3A6FE6DF4223A174D01F2C115D49A6F73437C29A2A8458C")), params));
-
-        AsymmetricCipherKeyPair kp = kpGen.generateKeyPair();
-
-        DSAPublicKeyParameters pub = (DSAPublicKeyParameters)kp.getPublic();
-        DSAPrivateKeyParameters priv = (DSAPrivateKeyParameters)kp.getPrivate();
-
-        if (!pub.getY().equals(new BigInteger(
-            "2828003D7C747199143C370FDD07A286" +
-            "1524514ACC57F63F80C38C2087C6B795B62DE1C224BF8D1D" +
-            "1424E60CE3F5AE3F76C754A2464AF292286D873A7A30B7EA" +
-            "CBBC75AAFDE7191D9157598CDB0B60E0C5AA3F6EBE425500" +
-            "C611957DBF5ED35490714A42811FDCDEB19AF2AB30BEADFF" +
-            "2907931CEE7F3B55532CFFAEB371F84F01347630EB227A41" +
-            "9B1F3F558BC8A509D64A765D8987D493B007C4412C297CAF" +
-            "41566E26FAEE475137EC781A0DC088A26C8804A98C23140E" +
-            "7C936281864B99571EE95C416AA38CEEBB41FDBFF1EB1D1D" +
-            "C97B63CE1355257627C8B0FD840DDB20ED35BE92F08C49AE" +
-            "A5613957D7E5C7A6D5A5834B4CB069E0831753ECF65BA02B", 16)))
-        {
-            fail("Y value incorrect");
-        }
-
-        if (!priv.getX().equals(
-            new BigInteger("0CAF2EF547EC49C4F3A6FE6DF4223A174D01F2C115D49A6F73437C29A2A8458C", 16)))
-        {
-            fail("X value incorrect");
-        }
-
-        DSASigner signer = new DSASigner();
-
-        signer.init(true, new ParametersWithRandom(kp.getPrivate(), new FixedSecureRandom(Hex.decode("0CAF2EF547EC49C4F3A6FE6DF4223A174D01F2C115D49A6F73437C29A2A8458C"))));
-
-        byte[] msg = Hex.decode("BA7816BF8F01CFEA414140DE5DAE2223B00361A396177A9CB410FF61F20015AD");
-
-        BigInteger[] sig = signer.generateSignature(msg);
-
-        if (!sig[0].equals(new BigInteger("315C875DCD4850E948B8AC42824E9483A32D5BA5ABE0681B9B9448D444F2BE3C", 16)))
-        {
-            fail("R value incorrect");
-        }
-
-        if (!sig[1].equals(new BigInteger("89718D12E54A8D9ED066E4A55F7ED5A2229CD23B9A3CEE78F83ED6AA61F6BCB9", 16)))
-        {
-            fail("S value incorrect");
-        }
-
-        signer.init(false, kp.getPublic());
-
-        if (!signer.verifySignature(msg, sig[0], sig[1]))
-        {
-            fail("signature not verified");
-        }
-    }
-
-    private void dsa2Test4()
-    {
-        byte[] seed = Hex.decode("193AFCA7C1E77B3C1ECC618C81322E47B8B8B997C9C83515C59CC446C2D9BD47");
-
-        DSAParametersGenerator pGen = new DSAParametersGenerator(new SHA256Digest());
-
-        pGen.init(new DSAParameterGenerationParameters(3072, 256, 80, new DSATestSecureRandom(seed)));
-
-        DSAParameters params = pGen.generateParameters();
-
-        DSAValidationParameters pv = params.getValidationParameters();
-
-        if (pv.getCounter() != 20)
-        {
-            fail("counter incorrect");
-        }
-
-        if (!Arrays.areEqual(seed, pv.getSeed()))
-        {
-            fail("seed incorrect");
-        }
-
-        if (!params.getQ().equals(new BigInteger("CFA0478A54717B08CE64805B76E5B14249A77A4838469DF7F7DC987EFCCFB11D", 16)))
-        {
-            fail("Q incorrect");
-        }
-
-        if (!params.getP().equals(new BigInteger(
-            "90066455B5CFC38F9CAA4A48B4281F292C260FEEF01FD610" +
-            "37E56258A7795A1C7AD46076982CE6BB956936C6AB4DCFE0" +
-            "5E6784586940CA544B9B2140E1EB523F009D20A7E7880E4E" +
-            "5BFA690F1B9004A27811CD9904AF70420EEFD6EA11EF7DA1" +
-            "29F58835FF56B89FAA637BC9AC2EFAAB903402229F491D8D" +
-            "3485261CD068699B6BA58A1DDBBEF6DB51E8FE34E8A78E54" +
-            "2D7BA351C21EA8D8F1D29F5D5D15939487E27F4416B0CA63" +
-            "2C59EFD1B1EB66511A5A0FBF615B766C5862D0BD8A3FE7A0" +
-            "E0DA0FB2FE1FCB19E8F9996A8EA0FCCDE538175238FC8B0E" +
-            "E6F29AF7F642773EBE8CD5402415A01451A840476B2FCEB0" +
-            "E388D30D4B376C37FE401C2A2C2F941DAD179C540C1C8CE0" +
-            "30D460C4D983BE9AB0B20F69144C1AE13F9383EA1C08504F" +
-            "B0BF321503EFE43488310DD8DC77EC5B8349B8BFE97C2C56" +
-            "0EA878DE87C11E3D597F1FEA742D73EEC7F37BE43949EF1A" +
-            "0D15C3F3E3FC0A8335617055AC91328EC22B50FC15B941D3" +
-            "D1624CD88BC25F3E941FDDC6200689581BFEC416B4B2CB73", 16)))
-        {
-            fail("P incorrect");
-        }
-
-        if (!params.getG().equals(new BigInteger(
-            "5E5CBA992E0A680D885EB903AEA78E4A45A469103D448EDE" +
-            "3B7ACCC54D521E37F84A4BDD5B06B0970CC2D2BBB715F7B8" +
-            "2846F9A0C393914C792E6A923E2117AB805276A975AADB52" +
-            "61D91673EA9AAFFEECBFA6183DFCB5D3B7332AA19275AFA1" +
-            "F8EC0B60FB6F66CC23AE4870791D5982AAD1AA9485FD8F4A" +
-            "60126FEB2CF05DB8A7F0F09B3397F3937F2E90B9E5B9C9B6" +
-            "EFEF642BC48351C46FB171B9BFA9EF17A961CE96C7E7A7CC" +
-            "3D3D03DFAD1078BA21DA425198F07D2481622BCE45969D9C" +
-            "4D6063D72AB7A0F08B2F49A7CC6AF335E08C4720E31476B6" +
-            "7299E231F8BD90B39AC3AE3BE0C6B6CACEF8289A2E2873D5" +
-            "8E51E029CAFBD55E6841489AB66B5B4B9BA6E2F784660896" +
-            "AFF387D92844CCB8B69475496DE19DA2E58259B090489AC8" +
-            "E62363CDF82CFD8EF2A427ABCD65750B506F56DDE3B98856" +
-            "7A88126B914D7828E2B63A6D7ED0747EC59E0E0A23CE7D8A" +
-            "74C1D2C2A7AFB6A29799620F00E11C33787F7DED3B30E1A2" +
-            "2D09F1FBDA1ABBBFBF25CAE05A13F812E34563F99410E73B", 16)))
-        {
-            fail("G incorrect");
-        }
-
-        DSAKeyPairGenerator kpGen = new DSAKeyPairGenerator();
-
-        kpGen.init(new DSAKeyGenerationParameters(new FixedSecureRandom(Hex.decode("3ABC1587297CE7B9EA1AD6651CF2BC4D7F92ED25CABC8553F567D1B40EBB8764")), params));
-
-        AsymmetricCipherKeyPair kp = kpGen.generateKeyPair();
-
-        DSAPublicKeyParameters pub = (DSAPublicKeyParameters)kp.getPublic();
-        DSAPrivateKeyParameters priv = (DSAPrivateKeyParameters)kp.getPrivate();
-
-        if (!pub.getY().equals(new BigInteger(
-            "8B891C8692D3DE875879390F2698B26FBECCA6B075535DCE" +
-            "6B0C862577F9FA0DEF6074E7A7624121224A595896ABD4CD" +
-            "A56B2CEFB942E025D2A4282FFAA98A48CDB47E1A6FCB5CFB" +
-            "393EF35AF9DF913102BB303C2B5C36C3F8FC04ED7B8B69FE" +
-            "FE0CF3E1FC05CFA713B3435B2656E913BA8874AEA9F93600" +
-            "6AEB448BCD005D18EC3562A33D04CF25C8D3D69844343442" +
-            "FA3DB7DE618C5E2DA064573E61E6D5581BFB694A23AC87FD" +
-            "5B52D62E954E1376DB8DDB524FFC0D469DF978792EE44173" +
-            "8E5DB05A7DC43E94C11A2E7A4FBE383071FA36D2A7EC8A93" +
-            "88FE1C4F79888A99D3B6105697C2556B79BB4D7E781CEBB3" +
-            "D4866AD825A5E830846072289FDBC941FA679CA82F5F78B7" +
-            "461B2404DB883D215F4E0676CF5493950AC5591697BFEA8D" +
-            "1EE6EC016B89BA51CAFB5F9C84C989FA117375E94578F28B" +
-            "E0B34CE0545DA46266FD77F62D8F2CEE92AB77012AFEBC11" +
-            "008985A821CD2D978C7E6FE7499D1AAF8DE632C21BB48CA5" +
-            "CBF9F31098FD3FD3854C49A65D9201744AACE540354974F9", 16)))
-        {
-            fail("Y value incorrect");
-        }
-
-        if (!priv.getX().equals(
-            new BigInteger("3ABC1587297CE7B9EA1AD6651CF2BC4D7F92ED25CABC8553F567D1B40EBB8764", 16)))
-        {
-            fail("X value incorrect");
-        }
-
-        DSASigner signer = new DSASigner();
-
-        signer.init(true, new ParametersWithRandom(kp.getPrivate(), new FixedSecureRandom(Hex.decode("A6902C1E6E3943C5628061588A8B007BCCEA91DBF12915483F04B24AB0678BEE"))));
-
-        byte[] msg = Hex.decode("BA7816BF8F01CFEA414140DE5DAE2223B00361A396177A9CB410FF61F20015AD");
-
-        BigInteger[] sig = signer.generateSignature(msg);
-
-        if (!sig[0].equals(new BigInteger("5F184E645A38BE8FB4A6871B6503A9D12924C7ABE04B71410066C2ECA6E3BE3E", 16)))
-        {
-            fail("R value incorrect");
-        }
-
-        if (!sig[1].equals(new BigInteger("91EB0C7BA3D4B9B60B825C3D9F2CADA8A2C9D7723267B033CBCDCF8803DB9C18", 16)))
-        {
-            fail("S value incorrect");
-        }
-
-        signer.init(false, kp.getPublic());
-
-        if (!signer.verifySignature(msg, sig[0], sig[1]))
-        {
-            fail("signature not verified");
-        }
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        runTest(new DSATest());
-    }
-
-    private class DSATestSecureRandom
-        extends FixedSecureRandom
-    {
-        private boolean first = true;
-
-        public DSATestSecureRandom(byte[] value)
-        {
-            super(value);
-        }
-
-       public void nextBytes(byte[] bytes)
-       {
-           if (first)
-           {
-               super.nextBytes(bytes);
-               first = false;
-           }
-           else
-           {
-               bytes[bytes.length - 1] = 2;
-           }
-       }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/DSTU4145Test.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/DSTU4145Test.java
deleted file mode 100644
index 2d3013d..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/DSTU4145Test.java
+++ /dev/null
@@ -1,278 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import java.math.BigInteger;
-import java.security.SecureRandom;
-
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.params.ECDomainParameters;
-import org.bouncycastle.crypto.params.ECPrivateKeyParameters;
-import org.bouncycastle.crypto.params.ECPublicKeyParameters;
-import org.bouncycastle.crypto.params.ParametersWithRandom;
-import org.bouncycastle.crypto.signers.DSTU4145Signer;
-import org.bouncycastle.math.ec.ECCurve;
-import org.bouncycastle.math.ec.ECPoint;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.FixedSecureRandom;
-import org.bouncycastle.util.test.SimpleTest;
-
-public class DSTU4145Test
-    extends SimpleTest
-{
-    private static final BigInteger ZERO = BigInteger.valueOf(0);
-    private static final BigInteger ONE = BigInteger.valueOf(1);
-
-    public static void main(String[] args)
-    {
-        runTest(new DSTU4145Test());
-    }
-
-    public String getName()
-    {
-        return "DSTU4145";
-    }
-
-    private void test163()
-        throws Exception
-    {
-        SecureRandom random = new FixedSecureRandom(Hex.decode("01025e40bd97db012b7a1d79de8e12932d247f61c6"));
-
-        byte[] hash = Hex.decode("09c9c44277910c9aaee486883a2eb95b7180166ddf73532eeb76edaef52247ff");
-        for (int i = 0; i < hash.length / 2; i++)
-        {
-            byte tmp = hash[i];
-            hash[i] = hash[hash.length - 1 - i];
-            hash[hash.length - 1 - i] = tmp;
-        }
-
-        BigInteger r = new BigInteger("274ea2c0caa014a0d80a424f59ade7a93068d08a7", 16);
-        BigInteger s = new BigInteger("2100d86957331832b8e8c230f5bd6a332b3615aca", 16);
-
-        ECCurve.F2m curve = new ECCurve.F2m(163, 3, 6, 7, ONE, new BigInteger("5FF6108462A2DC8210AB403925E638A19C1455D21", 16));
-        ECPoint P = curve.createPoint(new BigInteger("72d867f93a93ac27df9ff01affe74885c8c540420", 16), new BigInteger("0224a9c3947852b97c5599d5f4ab81122adc3fd9b", 16));
-        BigInteger n = new BigInteger("400000000000000000002BEC12BE2262D39BCF14D", 16);
-
-        BigInteger d = new BigInteger("183f60fdf7951ff47d67193f8d073790c1c9b5a3e", 16);
-        ECPoint Q = P.multiply(d).negate();
-
-        ECDomainParameters domain = new ECDomainParameters(curve, P, n);
-        CipherParameters privKey = new ParametersWithRandom(new ECPrivateKeyParameters(d, domain), random);
-        ECPublicKeyParameters pubKey = new ECPublicKeyParameters(Q, domain);
-
-        DSTU4145Signer dstuSigner = new DSTU4145Signer();
-        dstuSigner.init(true, privKey);
-        BigInteger[] rs = dstuSigner.generateSignature(hash);
-
-        if (rs[0].compareTo(r) != 0)
-        {
-            fail("r component wrong");
-        }
-
-        if (rs[1].compareTo(s) != 0)
-        {
-            fail("s component wrong");
-        }
-
-        dstuSigner.init(false, pubKey);
-        if (!dstuSigner.verifySignature(hash, r, s))
-        {
-            fail("verification fails");
-        }
-    }
-
-    private void test173()
-        throws Exception
-    {
-        SecureRandom random = new FixedSecureRandom(Hex.decode("0000137449348C1249971759D99C252FFE1E14D8B31F"));
-
-        byte[] hash = Hex.decode("0137187EA862117EF1484289470ECAC802C5A651FDA8");
-        for (int i = 0; i < hash.length / 2; i++)
-        {
-            byte tmp = hash[i];
-            hash[i] = hash[hash.length - 1 - i];
-            hash[hash.length - 1 - i] = tmp;
-        }
-
-        BigInteger r = new BigInteger("13ae89746386709cdbd237cc5ec20ca30004a82ead8", 16);
-        BigInteger s = new BigInteger("3597912cdd093b3e711ccb74a79d3c4ab4c7cccdc60", 16);
-
-        ECCurve.F2m curve = new ECCurve.F2m(173, 1, 2, 10, ZERO, new BigInteger("108576C80499DB2FC16EDDF6853BBB278F6B6FB437D9", 16));
-        ECPoint P = curve.createPoint(new BigInteger("BE6628EC3E67A91A4E470894FBA72B52C515F8AEE9", 16), new BigInteger("D9DEEDF655CF5412313C11CA566CDC71F4DA57DB45C", 16));
-        BigInteger n = new BigInteger("800000000000000000000189B4E67606E3825BB2831", 16);
-
-        BigInteger d = new BigInteger("955CD7E344303D1034E66933DC21C8044D42ADB8", 16);
-        ECPoint Q = P.multiply(d).negate();
-
-        ECDomainParameters domain = new ECDomainParameters(curve, P, n);
-        CipherParameters privKey = new ParametersWithRandom(new ECPrivateKeyParameters(d, domain), random);
-        ECPublicKeyParameters pubKey = new ECPublicKeyParameters(Q, domain);
-
-        DSTU4145Signer dstuSigner = new DSTU4145Signer();
-        dstuSigner.init(true, privKey);
-        BigInteger[] rs = dstuSigner.generateSignature(hash);
-
-        if (rs[0].compareTo(r) != 0)
-        {
-            fail("r component wrong");
-        }
-
-        if (rs[1].compareTo(s) != 0)
-        {
-            fail("s component wrong");
-        }
-
-        dstuSigner.init(false, pubKey);
-        if (!dstuSigner.verifySignature(hash, r, s))
-        {
-            fail("verification fails");
-        }
-    }
-
-    private void test283()
-        throws Exception
-    {
-        SecureRandom random = new FixedSecureRandom(Hex.decode("00000000245383CB3AD41BF30F5F7E8FBA858509B2D5558C92D539A6D994BFA98BC6940E"));
-
-        byte[] hash = Hex.decode("0137187EA862117EF1484289470ECAC802C5A651FDA8");
-        for (int i = 0; i < hash.length / 2; i++)
-        {
-            byte tmp = hash[i];
-            hash[i] = hash[hash.length - 1 - i];
-            hash[hash.length - 1 - i] = tmp;
-        }
-
-        BigInteger r = new BigInteger("12a5edcc38d92208ff23036d75b000c7e4bc0f9af2d40b35f15d6fd15e01234e67781a8", 16);
-        BigInteger s = new BigInteger("2de0775577f75b643cf5afc80d4fe10b21100690f17e2cab7bdc9b50ec87c5727aeb515", 16);
-
-        ECCurve.F2m curve = new ECCurve.F2m(283, 5, 7, 12, ONE, new BigInteger("27B680AC8B8596DA5A4AF8A19A0303FCA97FD7645309FA2A581485AF6263E313B79A2F5", 16));
-        ECPoint P = curve.createPoint(new BigInteger("4D95820ACE761110824CE425C8089129487389B7F0E0A9D043DDC0BB0A4CC9EB25", 16), new BigInteger("954C9C4029B2C62DE35C2B9C2A164984BF1101951E3A68ED03DF234DDE5BB2013152F2", 16));
-        BigInteger n = new BigInteger("3FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEF90399660FC938A90165B042A7CEFADB307", 16);
-
-        BigInteger d = new BigInteger("B844EEAF15213E4BAD4FB84796D68F2448DB8EB7B4621EC0D51929874892C43E", 16);
-        ECPoint Q = P.multiply(d).negate();
-
-        ECDomainParameters domain = new ECDomainParameters(curve, P, n);
-        CipherParameters privKey = new ParametersWithRandom(new ECPrivateKeyParameters(d, domain), random);
-        ECPublicKeyParameters pubKey = new ECPublicKeyParameters(Q, domain);
-
-        DSTU4145Signer dstuSigner = new DSTU4145Signer();
-        dstuSigner.init(true, privKey);
-        BigInteger[] rs = dstuSigner.generateSignature(hash);
-
-        if (rs[0].compareTo(r) != 0)
-        {
-            fail("r component wrong");
-        }
-
-        if (rs[1].compareTo(s) != 0)
-        {
-            fail("s component wrong");
-        }
-
-        dstuSigner.init(false, pubKey);
-        if (!dstuSigner.verifySignature(hash, r, s))
-        {
-            fail("verification fails");
-        }
-    }
-
-    private void test431()
-        throws Exception
-    {
-        SecureRandom random = new FixedSecureRandom(Hex.decode("0000C4224DBBD800988DBAA39DE838294C345CDA5F5929D1174AA8D9340A5E79D10ACADE6B53CF873E7301A3871C2073AD75AB530457"));
-
-        byte[] hash = Hex.decode("0137187EA862117EF1484289470ECAC802C5A651FDA8");
-        for (int i = 0; i < hash.length / 2; i++)
-        {
-            byte tmp = hash[i];
-            hash[i] = hash[hash.length - 1 - i];
-            hash[hash.length - 1 - i] = tmp;
-        }
-
-        BigInteger r = new BigInteger("1911fefb1f494bebcf8dffdf5276946ff9c9f662192ee18c718db47310a439c784fe07577b16e1edbe16179876e0792a634f1c9c3a2e", 16);
-        BigInteger s = new BigInteger("3852170ee801c2083c52f1ea77b987a5432acecd9c654f064e87bf179e0a397151edbca430082e43bd38a67b55424b5bbc7f2713f620", 16);
-
-        ECCurve.F2m curve = new ECCurve.F2m(431, 1, 3, 5, ONE, new BigInteger("3CE10490F6A708FC26DFE8C3D27C4F94E690134D5BFF988D8D28AAEAEDE975936C66BAC536B18AE2DC312CA493117DAA469C640CAF3", 16));
-        ECPoint P = curve.createPoint(new BigInteger("9548BCDF314CEEEAF099C780FFEFBF93F9FE5B5F55547603C9C8FC1A2774170882B3BE35E892C6D4296B8DEA282EC30FB344272791", 16), new BigInteger("4C6CBD7C62A8EEEFDE17A8B5E196E49A22CE6DE128ABD9FBD81FA4411AD5A38E2A810BEDE09A7C6226BCDCB4A4A5DA37B4725E00AA74", 16));
-        BigInteger n = new BigInteger("3FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFBA3175458009A8C0A724F02F81AA8A1FCBAF80D90C7A95110504CF", 16);
-
-        BigInteger d = new BigInteger("D0F97354E314191FD773E2404F478C8AEE0FF5109F39E6F37D1FEEC8B2ED1691D84C9882CC729E716A71CC013F66CAC60E29E22C", 16);
-        ECPoint Q = P.multiply(d).negate();
-
-        ECDomainParameters domain = new ECDomainParameters(curve, P, n);
-        CipherParameters privKey = new ParametersWithRandom(new ECPrivateKeyParameters(d, domain), random);
-        ECPublicKeyParameters pubKey = new ECPublicKeyParameters(Q, domain);
-
-        DSTU4145Signer dstuSigner = new DSTU4145Signer();
-        dstuSigner.init(true, privKey);
-        BigInteger[] rs = dstuSigner.generateSignature(hash);
-
-        if (rs[0].compareTo(r) != 0)
-        {
-            fail("r component wrong");
-        }
-
-        if (rs[1].compareTo(s) != 0)
-        {
-            fail("s component wrong");
-        }
-
-        dstuSigner.init(false, pubKey);
-        if (!dstuSigner.verifySignature(hash, r, s))
-        {
-            fail("verification fails");
-        }
-    }
-
-    private void testTruncation()
-    {
-        SecureRandom random = new FixedSecureRandom(Hex.decode("0000C4224DBBD800988DBAA39DE838294C345CDA5F5929D1174AA8D9340A5E79D10ACADE6B53CF873E7301A3871C2073AD75AB530457"));
-
-        // use extra long "hash" with set bits...
-        byte[] hash = Hex.decode("FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF");
-
-        ECCurve.F2m curve = new ECCurve.F2m(173, 1, 2, 10, ZERO, new BigInteger("108576C80499DB2FC16EDDF6853BBB278F6B6FB437D9", 16));
-        ECPoint P = curve.createPoint(new BigInteger("BE6628EC3E67A91A4E470894FBA72B52C515F8AEE9", 16), new BigInteger("D9DEEDF655CF5412313C11CA566CDC71F4DA57DB45C", 16));
-        BigInteger n = new BigInteger("800000000000000000000189B4E67606E3825BB2831", 16);
-
-        BigInteger d = new BigInteger("955CD7E344303D1034E66933DC21C8044D42ADB8", 16);
-        ECPoint Q = P.multiply(d).negate();
-
-        ECDomainParameters domain = new ECDomainParameters(curve, P, n);
-        CipherParameters privKey = new ParametersWithRandom(new ECPrivateKeyParameters(d, domain), random);
-        ECPublicKeyParameters pubKey = new ECPublicKeyParameters(Q, domain);
-
-        DSTU4145Signer dstuSigner = new DSTU4145Signer();
-        dstuSigner.init(true, privKey);
-        BigInteger[] rs = dstuSigner.generateSignature(hash);
-
-        BigInteger r = new BigInteger("6bb5c0cb82e5067485458ebfe81025f03b687c63a27", 16);
-        BigInteger s = new BigInteger("34d6b1868969b86ecf934167c8fe352c63d1074bd", 16);
-
-        if (rs[0].compareTo(r) != 0)
-        {
-            fail("r component wrong");
-        }
-
-        if (rs[1].compareTo(s) != 0)
-        {
-            fail("s component wrong");
-        }
-
-        dstuSigner.init(false, pubKey);
-        if (!dstuSigner.verifySignature(hash, rs[0], rs[1]))
-        {
-            fail("verification fails");
-        }
-    }
-
-    public void performTest()
-        throws Exception
-    {
-        test163();
-        test173();
-        test283();
-        test431();
-        testTruncation();
-    }
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/DeterministicDSATest.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/DeterministicDSATest.java
deleted file mode 100644
index c47cf8e..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/DeterministicDSATest.java
+++ /dev/null
@@ -1,513 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import java.math.BigInteger;
-
-import org.bouncycastle.asn1.nist.NISTNamedCurves;
-import org.bouncycastle.asn1.x9.X9ECParameters;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.DSA;
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.digests.SHA1Digest;
-import org.bouncycastle.crypto.digests.SHA224Digest;
-import org.bouncycastle.crypto.digests.SHA256Digest;
-import org.bouncycastle.crypto.digests.SHA384Digest;
-import org.bouncycastle.crypto.digests.SHA512Digest;
-import org.bouncycastle.crypto.params.DSAParameters;
-import org.bouncycastle.crypto.params.DSAPrivateKeyParameters;
-import org.bouncycastle.crypto.params.ECDomainParameters;
-import org.bouncycastle.crypto.params.ECPrivateKeyParameters;
-import org.bouncycastle.crypto.signers.DSASigner;
-import org.bouncycastle.crypto.signers.ECDSASigner;
-import org.bouncycastle.crypto.signers.HMacDSAKCalculator;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-
-/**
- * Tests are taken from RFC 6979 - "Deterministic Usage of the Digital Signature Algorithm (DSA) and Elliptic Curve Digital Signature Algorithm (ECDSA)"
- */
-public class DeterministicDSATest
-    extends SimpleTest
-{
-
-    public static final byte[] SAMPLE = Hex.decode("73616d706c65"); // "sample"
-    public static final byte[] TEST = Hex.decode("74657374"); // "test"
-
-    // test vectors from appendix in RFC 6979
-    private void testHMacDeterministic()
-    {
-        DSAParameters dsaParameters = new DSAParameters(
-            new BigInteger("86F5CA03DCFEB225063FF830A0C769B9DD9D6153AD91D7CE27F787C43278B447" +
-                           "E6533B86B18BED6E8A48B784A14C252C5BE0DBF60B86D6385BD2F12FB763ED88" +
-                           "73ABFD3F5BA2E0A8C0A59082EAC056935E529DAF7C610467899C77ADEDFC846C" +
-                           "881870B7B19B2B58F9BE0521A17002E3BDD6B86685EE90B3D9A1B02B782B1779", 16),
-            new BigInteger("996F967F6C8E388D9E28D01E205FBA957A5698B1", 16),
-            new BigInteger("07B0F92546150B62514BB771E2A0C0CE387F03BDA6C56B505209FF25FD3C133D" +
-                           "89BBCD97E904E09114D9A7DEFDEADFC9078EA544D2E401AEECC40BB9FBBF78FD" +
-                           "87995A10A1C27CB7789B594BA7EFB5C4326A9FE59A070E136DB77175464ADCA4" +
-                           "17BE5DCE2F40D10A46A3A3943F26AB7FD9C0398FF8C76EE0A56826A8A88F1DBD", 16));
-
-        DSAPrivateKeyParameters privKey = new DSAPrivateKeyParameters(new BigInteger("411602CB19A6CCC34494D79D98EF1E7ED5AF25F7", 16), dsaParameters);
-
-        doTestHMACDetDSASample(new SHA1Digest(), privKey, new BigInteger("2E1A0C2562B2912CAAF89186FB0F42001585DA55", 16), new BigInteger("29EFB6B0AFF2D7A68EB70CA313022253B9A88DF5", 16));
-        doTestHMACDetDSASample(new SHA224Digest(), privKey, new BigInteger("4BC3B686AEA70145856814A6F1BB53346F02101E", 16), new BigInteger("410697B92295D994D21EDD2F4ADA85566F6F94C1", 16));
-        doTestHMACDetDSASample(new SHA256Digest(), privKey, new BigInteger("81F2F5850BE5BC123C43F71A3033E9384611C545", 16), new BigInteger("4CDD914B65EB6C66A8AAAD27299BEE6B035F5E89", 16));
-        doTestHMACDetDSASample(new SHA384Digest(), privKey, new BigInteger("07F2108557EE0E3921BC1774F1CA9B410B4CE65A", 16), new BigInteger("54DF70456C86FAC10FAB47C1949AB83F2C6F7595", 16));
-        doTestHMACDetDSASample(new SHA512Digest(), privKey, new BigInteger("16C3491F9B8C3FBBDD5E7A7B667057F0D8EE8E1B", 16), new BigInteger("02C36A127A7B89EDBB72E4FFBC71DABC7D4FC69C", 16));
-
-        doTestHMACDetDSATest(new SHA1Digest(), privKey, new BigInteger("42AB2052FD43E123F0607F115052A67DCD9C5C77", 16), new BigInteger("183916B0230D45B9931491D4C6B0BD2FB4AAF088", 16));
-        doTestHMACDetDSATest(new SHA224Digest(), privKey, new BigInteger("6868E9964E36C1689F6037F91F28D5F2C30610F2", 16), new BigInteger("49CEC3ACDC83018C5BD2674ECAAD35B8CD22940F", 16));
-        doTestHMACDetDSATest(new SHA256Digest(), privKey, new BigInteger("22518C127299B0F6FDC9872B282B9E70D0790812", 16), new BigInteger("6837EC18F150D55DE95B5E29BE7AF5D01E4FE160", 16));
-        doTestHMACDetDSATest(new SHA384Digest(), privKey, new BigInteger("854CF929B58D73C3CBFDC421E8D5430CD6DB5E66", 16), new BigInteger("91D0E0F53E22F898D158380676A871A157CDA622", 16));
-        doTestHMACDetDSATest(new SHA512Digest(), privKey, new BigInteger("8EA47E475BA8AC6F2D821DA3BD212D11A3DEB9A0", 16), new BigInteger("7C670C7AD72B6C050C109E1790008097125433E8", 16));
-
-        dsaParameters = new DSAParameters(
-                                new BigInteger("9DB6FB5951B66BB6FE1E140F1D2CE5502374161FD6538DF1648218642F0B5C48" +
-                                    "C8F7A41AADFA187324B87674FA1822B00F1ECF8136943D7C55757264E5A1A44F" +
-                                    "FE012E9936E00C1D3E9310B01C7D179805D3058B2A9F4BB6F9716BFE6117C6B5" +
-                                    "B3CC4D9BE341104AD4A80AD6C94E005F4B993E14F091EB51743BF33050C38DE2" +
-                                    "35567E1B34C3D6A5C0CEAA1A0F368213C3D19843D0B4B09DCB9FC72D39C8DE41" +
-                                    "F1BF14D4BB4563CA28371621CAD3324B6A2D392145BEBFAC748805236F5CA2FE" +
-                                    "92B871CD8F9C36D3292B5509CA8CAA77A2ADFC7BFD77DDA6F71125A7456FEA15" +
-                                    "3E433256A2261C6A06ED3693797E7995FAD5AABBCFBE3EDA2741E375404AE25B", 16),
-                                new BigInteger("F2C3119374CE76C9356990B465374A17F23F9ED35089BD969F61C6DDE9998C1F", 16),
-                                new BigInteger("5C7FF6B06F8F143FE8288433493E4769C4D988ACE5BE25A0E24809670716C613" +
-                                    "D7B0CEE6932F8FAA7C44D2CB24523DA53FBE4F6EC3595892D1AA58C4328A06C4" +
-                                    "6A15662E7EAA703A1DECF8BBB2D05DBE2EB956C142A338661D10461C0D135472" +
-                                    "085057F3494309FFA73C611F78B32ADBB5740C361C9F35BE90997DB2014E2EF5" +
-                                    "AA61782F52ABEB8BD6432C4DD097BC5423B285DAFB60DC364E8161F4A2A35ACA" +
-                                    "3A10B1C4D203CC76A470A33AFDCBDD92959859ABD8B56E1725252D78EAC66E71" +
-                                    "BA9AE3F1DD2487199874393CD4D832186800654760E1E34C09E4D155179F9EC0" +
-                                    "DC4473F996BDCE6EED1CABED8B6F116F7AD9CF505DF0F998E34AB27514B0FFE7", 16));
-
-        privKey = new DSAPrivateKeyParameters(new BigInteger("69C7548C21D0DFEA6B9A51C9EAD4E27C33D3B3F180316E5BCAB92C933F0E4DBC", 16), dsaParameters);
-
-        doTestHMACDetDSASample(new SHA1Digest(), privKey, new BigInteger("3A1B2DBD7489D6ED7E608FD036C83AF396E290DBD602408E8677DAABD6E7445A", 16), new BigInteger("D26FCBA19FA3E3058FFC02CA1596CDBB6E0D20CB37B06054F7E36DED0CDBBCCF", 16));
-        doTestHMACDetDSASample(new SHA224Digest(), privKey, new BigInteger("DC9F4DEADA8D8FF588E98FED0AB690FFCE858DC8C79376450EB6B76C24537E2C", 16), new BigInteger("A65A9C3BC7BABE286B195D5DA68616DA8D47FA0097F36DD19F517327DC848CEC", 16));
-        doTestHMACDetDSASample(new SHA256Digest(), privKey, new BigInteger("EACE8BDBBE353C432A795D9EC556C6D021F7A03F42C36E9BC87E4AC7932CC809", 16), new BigInteger("7081E175455F9247B812B74583E9E94F9EA79BD640DC962533B0680793A38D53", 16));
-        doTestHMACDetDSASample(new SHA384Digest(), privKey, new BigInteger("B2DA945E91858834FD9BF616EBAC151EDBC4B45D27D0DD4A7F6A22739F45C00B", 16), new BigInteger("19048B63D9FD6BCA1D9BAE3664E1BCB97F7276C306130969F63F38FA8319021B", 16));
-        doTestHMACDetDSASample(new SHA512Digest(), privKey, new BigInteger("2016ED092DC5FB669B8EFB3D1F31A91EECB199879BE0CF78F02BA062CB4C942E", 16), new BigInteger("D0C76F84B5F091E141572A639A4FB8C230807EEA7D55C8A154A224400AFF2351", 16));
-
-        doTestHMACDetDSATest(new SHA1Digest(), privKey, new BigInteger("C18270A93CFC6063F57A4DFA86024F700D980E4CF4E2CB65A504397273D98EA0", 16), new BigInteger("414F22E5F31A8B6D33295C7539C1C1BA3A6160D7D68D50AC0D3A5BEAC2884FAA", 16));
-        doTestHMACDetDSATest(new SHA224Digest(), privKey, new BigInteger("272ABA31572F6CC55E30BF616B7A265312018DD325BE031BE0CC82AA17870EA3", 16), new BigInteger("E9CC286A52CCE201586722D36D1E917EB96A4EBDB47932F9576AC645B3A60806", 16));
-        doTestHMACDetDSATest(new SHA256Digest(), privKey, new BigInteger("8190012A1969F9957D56FCCAAD223186F423398D58EF5B3CEFD5A4146A4476F0", 16), new BigInteger("7452A53F7075D417B4B013B278D1BB8BBD21863F5E7B1CEE679CF2188E1AB19E", 16));
-        doTestHMACDetDSATest(new SHA384Digest(), privKey, new BigInteger("239E66DDBE8F8C230A3D071D601B6FFBDFB5901F94D444C6AF56F732BEB954BE", 16), new BigInteger("6BD737513D5E72FE85D1C750E0F73921FE299B945AAD1C802F15C26A43D34961", 16));
-        doTestHMACDetDSATest(new SHA512Digest(), privKey, new BigInteger("89EC4BB1400ECCFF8E7D9AA515CD1DE7803F2DAFF09693EE7FD1353E90A68307", 16), new BigInteger("C9F0BDABCC0D880BB137A994CC7F3980CE91CC10FAF529FC46565B15CEA854E1", 16));
-    }
-
-    private void doTestHMACDetDSASample(Digest digest, DSAPrivateKeyParameters privKey, BigInteger r, BigInteger s)
-    {
-        doTestHMACDetECDSA(new DSASigner(new HMacDSAKCalculator(digest)), digest, SAMPLE, privKey, r, s);
-    }
-
-    private void doTestHMACDetDSATest(Digest digest, DSAPrivateKeyParameters privKey, BigInteger r, BigInteger s)
-    {
-        doTestHMACDetECDSA(new DSASigner(new HMacDSAKCalculator(digest)), digest, TEST, privKey, r, s);
-    }
-
-    // test vectors from appendix in RFC 6979
-    private void testECHMacDeterministic()
-    {
-        X9ECParameters x9ECParameters = NISTNamedCurves.getByName("P-192");
-        ECDomainParameters ecDomainParameters = new ECDomainParameters(x9ECParameters.getCurve(), x9ECParameters.getG(), x9ECParameters.getN());
-
-        ECPrivateKeyParameters privKey = new ECPrivateKeyParameters(new BigInteger("6FAB034934E4C0FC9AE67F5B5659A9D7D1FEFD187EE09FD4", 16), ecDomainParameters);
-
-        doTestHMACDetECDSASample(new SHA1Digest(), privKey,   new BigInteger("98C6BD12B23EAF5E2A2045132086BE3EB8EBD62ABF6698FF", 16), new BigInteger("57A22B07DEA9530F8DE9471B1DC6624472E8E2844BC25B64", 16));
-        doTestHMACDetECDSASample(new SHA224Digest(), privKey, new BigInteger("A1F00DAD97AEEC91C95585F36200C65F3C01812AA60378F5", 16), new BigInteger("E07EC1304C7C6C9DEBBE980B9692668F81D4DE7922A0F97A", 16));
-        doTestHMACDetECDSASample(new SHA256Digest(), privKey, new BigInteger("4B0B8CE98A92866A2820E20AA6B75B56382E0F9BFD5ECB55", 16), new BigInteger("CCDB006926EA9565CBADC840829D8C384E06DE1F1E381B85", 16));
-        doTestHMACDetECDSASample(new SHA384Digest(), privKey, new BigInteger("DA63BF0B9ABCF948FBB1E9167F136145F7A20426DCC287D5", 16), new BigInteger("C3AA2C960972BD7A2003A57E1C4C77F0578F8AE95E31EC5E", 16));
-        doTestHMACDetECDSASample(new SHA512Digest(), privKey, new BigInteger("4D60C5AB1996BD848343B31C00850205E2EA6922DAC2E4B8", 16), new BigInteger("3F6E837448F027A1BF4B34E796E32A811CBB4050908D8F67", 16));
-
-        doTestHMACDetECDSATest(new SHA1Digest(), privKey,   new BigInteger("0F2141A0EBBC44D2E1AF90A50EBCFCE5E197B3B7D4DE036D", 16), new BigInteger("EB18BC9E1F3D7387500CB99CF5F7C157070A8961E38700B7", 16));
-        doTestHMACDetECDSATest(new SHA224Digest(), privKey, new BigInteger("6945A1C1D1B2206B8145548F633BB61CEF04891BAF26ED34", 16), new BigInteger("B7FB7FDFC339C0B9BD61A9F5A8EAF9BE58FC5CBA2CB15293", 16));
-        doTestHMACDetECDSATest(new SHA256Digest(), privKey, new BigInteger("3A718BD8B4926C3B52EE6BBE67EF79B18CB6EB62B1AD97AE", 16), new BigInteger("5662E6848A4A19B1F1AE2F72ACD4B8BBE50F1EAC65D9124F", 16));
-        doTestHMACDetECDSATest(new SHA384Digest(), privKey, new BigInteger("B234B60B4DB75A733E19280A7A6034BD6B1EE88AF5332367", 16), new BigInteger("7994090B2D59BB782BE57E74A44C9A1C700413F8ABEFE77A", 16));
-        doTestHMACDetECDSATest(new SHA512Digest(), privKey, new BigInteger("FE4F4AE86A58B6507946715934FE2D8FF9D95B6B098FE739", 16), new BigInteger("74CF5605C98FBA0E1EF34D4B5A1577A7DCF59457CAE52290", 16));
-
-        x9ECParameters = NISTNamedCurves.getByName("P-224");
-        ecDomainParameters = new ECDomainParameters(x9ECParameters.getCurve(), x9ECParameters.getG(), x9ECParameters.getN());
-
-        privKey = new ECPrivateKeyParameters(new BigInteger("F220266E1105BFE3083E03EC7A3A654651F45E37167E88600BF257C1", 16), ecDomainParameters);
-
-        doTestHMACDetECDSASample(new SHA1Digest(), privKey,   new BigInteger("22226F9D40A96E19C4A301CE5B74B115303C0F3A4FD30FC257FB57AC", 16), new BigInteger("66D1CDD83E3AF75605DD6E2FEFF196D30AA7ED7A2EDF7AF475403D69", 16));
-        doTestHMACDetECDSASample(new SHA224Digest(), privKey, new BigInteger("1CDFE6662DDE1E4A1EC4CDEDF6A1F5A2FB7FBD9145C12113E6ABFD3E", 16), new BigInteger("A6694FD7718A21053F225D3F46197CA699D45006C06F871808F43EBC", 16));
-        doTestHMACDetECDSASample(new SHA256Digest(), privKey, new BigInteger("61AA3DA010E8E8406C656BC477A7A7189895E7E840CDFE8FF42307BA", 16), new BigInteger("BC814050DAB5D23770879494F9E0A680DC1AF7161991BDE692B10101", 16));
-        doTestHMACDetECDSASample(new SHA384Digest(), privKey, new BigInteger("0B115E5E36F0F9EC81F1325A5952878D745E19D7BB3EABFABA77E953", 16), new BigInteger("830F34CCDFE826CCFDC81EB4129772E20E122348A2BBD889A1B1AF1D", 16));
-        doTestHMACDetECDSASample(new SHA512Digest(), privKey, new BigInteger("074BD1D979D5F32BF958DDC61E4FB4872ADCAFEB2256497CDAC30397", 16), new BigInteger("A4CECA196C3D5A1FF31027B33185DC8EE43F288B21AB342E5D8EB084", 16));
-
-        doTestHMACDetECDSATest(new SHA1Digest(), privKey,   new BigInteger("DEAA646EC2AF2EA8AD53ED66B2E2DDAA49A12EFD8356561451F3E21C", 16), new BigInteger("95987796F6CF2062AB8135271DE56AE55366C045F6D9593F53787BD2", 16));
-        doTestHMACDetECDSATest(new SHA224Digest(), privKey, new BigInteger("C441CE8E261DED634E4CF84910E4C5D1D22C5CF3B732BB204DBEF019", 16), new BigInteger("902F42847A63BDC5F6046ADA114953120F99442D76510150F372A3F4", 16));
-        doTestHMACDetECDSATest(new SHA256Digest(), privKey, new BigInteger("AD04DDE87B84747A243A631EA47A1BA6D1FAA059149AD2440DE6FBA6", 16), new BigInteger("178D49B1AE90E3D8B629BE3DB5683915F4E8C99FDF6E666CF37ADCFD", 16));
-        doTestHMACDetECDSATest(new SHA384Digest(), privKey, new BigInteger("389B92682E399B26518A95506B52C03BC9379A9DADF3391A21FB0EA4", 16), new BigInteger("414A718ED3249FF6DBC5B50C27F71F01F070944DA22AB1F78F559AAB", 16));
-        doTestHMACDetECDSATest(new SHA512Digest(), privKey, new BigInteger("049F050477C5ADD858CAC56208394B5A55BAEBBE887FDF765047C17C", 16), new BigInteger("077EB13E7005929CEFA3CD0403C7CDCC077ADF4E44F3C41B2F60ECFF", 16));
-
-        x9ECParameters = NISTNamedCurves.getByName("P-256");
-        ecDomainParameters = new ECDomainParameters(x9ECParameters.getCurve(), x9ECParameters.getG(), x9ECParameters.getN());
-
-        privKey = new ECPrivateKeyParameters(new BigInteger("C9AFA9D845BA75166B5C215767B1D6934E50C3DB36E89B127B8A622B120F6721", 16), ecDomainParameters);
-
-        doTestHMACDetECDSASample(new SHA1Digest(), privKey,   new BigInteger("61340C88C3AAEBEB4F6D667F672CA9759A6CCAA9FA8811313039EE4A35471D32", 16), new BigInteger("6D7F147DAC089441BB2E2FE8F7A3FA264B9C475098FDCF6E00D7C996E1B8B7EB", 16));
-        doTestHMACDetECDSASample(new SHA224Digest(), privKey, new BigInteger("53B2FFF5D1752B2C689DF257C04C40A587FABABB3F6FC2702F1343AF7CA9AA3F", 16), new BigInteger("B9AFB64FDC03DC1A131C7D2386D11E349F070AA432A4ACC918BEA988BF75C74C", 16));
-        doTestHMACDetECDSASample(new SHA256Digest(), privKey, new BigInteger("EFD48B2AACB6A8FD1140DD9CD45E81D69D2C877B56AAF991C34D0EA84EAF3716", 16), new BigInteger("F7CB1C942D657C41D436C7A1B6E29F65F3E900DBB9AFF4064DC4AB2F843ACDA8", 16));
-        doTestHMACDetECDSASample(new SHA384Digest(), privKey, new BigInteger("0EAFEA039B20E9B42309FB1D89E213057CBF973DC0CFC8F129EDDDC800EF7719", 16), new BigInteger("4861F0491E6998B9455193E34E7B0D284DDD7149A74B95B9261F13ABDE940954", 16));
-        doTestHMACDetECDSASample(new SHA512Digest(), privKey, new BigInteger("8496A60B5E9B47C825488827E0495B0E3FA109EC4568FD3F8D1097678EB97F00", 16), new BigInteger("2362AB1ADBE2B8ADF9CB9EDAB740EA6049C028114F2460F96554F61FAE3302FE", 16));
-
-        doTestHMACDetECDSATest(new SHA1Digest(), privKey,   new BigInteger("0CBCC86FD6ABD1D99E703E1EC50069EE5C0B4BA4B9AC60E409E8EC5910D81A89", 16), new BigInteger("01B9D7B73DFAA60D5651EC4591A0136F87653E0FD780C3B1BC872FFDEAE479B1", 16));
-        doTestHMACDetECDSATest(new SHA224Digest(), privKey, new BigInteger("C37EDB6F0AE79D47C3C27E962FA269BB4F441770357E114EE511F662EC34A692", 16), new BigInteger("C820053A05791E521FCAAD6042D40AEA1D6B1A540138558F47D0719800E18F2D", 16));
-        doTestHMACDetECDSATest(new SHA256Digest(), privKey, new BigInteger("F1ABB023518351CD71D881567B1EA663ED3EFCF6C5132B354F28D3B0B7D38367", 16), new BigInteger("019F4113742A2B14BD25926B49C649155F267E60D3814B4C0CC84250E46F0083", 16));
-        doTestHMACDetECDSATest(new SHA384Digest(), privKey, new BigInteger("83910E8B48BB0C74244EBDF7F07A1C5413D61472BD941EF3920E623FBCCEBEB6", 16), new BigInteger("8DDBEC54CF8CD5874883841D712142A56A8D0F218F5003CB0296B6B509619F2C", 16));
-        doTestHMACDetECDSATest(new SHA512Digest(), privKey, new BigInteger("461D93F31B6540894788FD206C07CFA0CC35F46FA3C91816FFF1040AD1581A04", 16), new BigInteger("39AF9F15DE0DB8D97E72719C74820D304CE5226E32DEDAE67519E840D1194E55", 16));
-
-        x9ECParameters = NISTNamedCurves.getByName("P-384");
-        ecDomainParameters = new ECDomainParameters(x9ECParameters.getCurve(), x9ECParameters.getG(), x9ECParameters.getN());
-
-        privKey = new ECPrivateKeyParameters(new BigInteger("6B9D3DAD2E1B8C1C05B19875B6659F4DE23C3B667BF297BA9AA47740787137D8" +
-                                                            "96D5724E4C70A825F872C9EA60D2EDF5", 16), ecDomainParameters);
-
-        doTestHMACDetECDSASample(new SHA1Digest(), privKey, new BigInteger("EC748D839243D6FBEF4FC5C4859A7DFFD7F3ABDDF72014540C16D73309834FA3" +
-                                                                    "7B9BA002899F6FDA3A4A9386790D4EB2", 16),
-                                                            new BigInteger("A3BCFA947BEEF4732BF247AC17F71676CB31A847B9FF0CBC9C9ED4C1A5B3FACF" +
-                                                                    "26F49CA031D4857570CCB5CA4424A443", 16));
-        doTestHMACDetECDSASample(new SHA224Digest(), privKey, new BigInteger("42356E76B55A6D9B4631C865445DBE54E056D3B3431766D0509244793C3F9366" +
-                                                                        "450F76EE3DE43F5A125333A6BE060122", 16),
-                                                              new BigInteger("9DA0C81787064021E78DF658F2FBB0B042BF304665DB721F077A4298B095E483" +
-                                                                        "4C082C03D83028EFBF93A3C23940CA8D", 16));
-        doTestHMACDetECDSASample(new SHA256Digest(), privKey, new BigInteger("21B13D1E013C7FA1392D03C5F99AF8B30C570C6F98D4EA8E354B63A21D3DAA33" +
-                                                                        "BDE1E888E63355D92FA2B3C36D8FB2CD", 16),
-                                                                new BigInteger("F3AA443FB107745BF4BD77CB3891674632068A10CA67E3D45DB2266FA7D1FEEB" +
-                                                                        "EFDC63ECCD1AC42EC0CB8668A4FA0AB0", 16));
-        doTestHMACDetECDSASample(new SHA384Digest(), privKey, new BigInteger("94EDBB92A5ECB8AAD4736E56C691916B3F88140666CE9FA73D64C4EA95AD133C" +
-                                                                        "81A648152E44ACF96E36DD1E80FABE46", 16),
-                                                                new BigInteger("99EF4AEB15F178CEA1FE40DB2603138F130E740A19624526203B6351D0A3A94F" +
-                                                                        "A329C145786E679E7B82C71A38628AC8", 16));
-        doTestHMACDetECDSASample(new SHA512Digest(), privKey, new BigInteger("ED0959D5880AB2D869AE7F6C2915C6D60F96507F9CB3E047C0046861DA4A799C" +
-                                                                        "FE30F35CC900056D7C99CD7882433709", 16),
-                                                                new BigInteger("512C8CCEEE3890A84058CE1E22DBC2198F42323CE8ACA9135329F03C068E5112" +
-                                                                        "DC7CC3EF3446DEFCEB01A45C2667FDD5", 16));
-
-        doTestHMACDetECDSATest(new SHA1Digest(), privKey, new BigInteger("4BC35D3A50EF4E30576F58CD96CE6BF638025EE624004A1F7789A8B8E43D0678" +
-                                                                    "ACD9D29876DAF46638645F7F404B11C7", 16),
-                                                            new BigInteger("D5A6326C494ED3FF614703878961C0FDE7B2C278F9A65FD8C4B7186201A29916" +
-                                                                    "95BA1C84541327E966FA7B50F7382282", 16));
-        doTestHMACDetECDSATest(new SHA224Digest(), privKey, new BigInteger("E8C9D0B6EA72A0E7837FEA1D14A1A9557F29FAA45D3E7EE888FC5BF954B5E624" +
-                                                                    "64A9A817C47FF78B8C11066B24080E72", 16),
-                                                            new BigInteger("07041D4A7A0379AC7232FF72E6F77B6DDB8F09B16CCE0EC3286B2BD43FA8C614" +
-                                                                    "1C53EA5ABEF0D8231077A04540A96B66", 16));
-        doTestHMACDetECDSATest(new SHA256Digest(), privKey, new BigInteger("6D6DEFAC9AB64DABAFE36C6BF510352A4CC27001263638E5B16D9BB51D451559" +
-                                                                    "F918EEDAF2293BE5B475CC8F0188636B", 16),
-                                                            new BigInteger("2D46F3BECBCC523D5F1A1256BF0C9B024D879BA9E838144C8BA6BAEB4B53B47D" +
-                                                                    "51AB373F9845C0514EEFB14024787265", 16));
-        doTestHMACDetECDSATest(new SHA384Digest(), privKey, new BigInteger("8203B63D3C853E8D77227FB377BCF7B7B772E97892A80F36AB775D509D7A5FEB" +
-                                                                    "0542A7F0812998DA8F1DD3CA3CF023DB", 16),
-                                                            new BigInteger("DDD0760448D42D8A43AF45AF836FCE4DE8BE06B485E9B61B827C2F13173923E0" +
-                                                                    "6A739F040649A667BF3B828246BAA5A5", 16));
-        doTestHMACDetECDSATest(new SHA512Digest(), privKey, new BigInteger("A0D5D090C9980FAF3C2CE57B7AE951D31977DD11C775D314AF55F76C676447D0" +
-                                                                    "6FB6495CD21B4B6E340FC236584FB277", 16),
-                                                            new BigInteger("976984E59B4C77B0E8E4460DCA3D9F20E07B9BB1F63BEEFAF576F6B2E8B22463" +
-                                                                    "4A2092CD3792E0159AD9CEE37659C736", 16));
-
-        x9ECParameters = NISTNamedCurves.getByName("P-521");
-        ecDomainParameters = new ECDomainParameters(x9ECParameters.getCurve(), x9ECParameters.getG(), x9ECParameters.getN());
-
-        privKey = new ECPrivateKeyParameters(new BigInteger("0FAD06DAA62BA3B25D2FB40133DA757205DE67F5BB0018FEE8C86E1B68C7E75C" +
-                                                            "AA896EB32F1F47C70855836A6D16FCC1466F6D8FBEC67DB89EC0C08B0E996B83" +
-                                                            "538", 16), ecDomainParameters);
-
-        doTestHMACDetECDSASample(new SHA1Digest(), privKey,   new BigInteger("0343B6EC45728975EA5CBA6659BBB6062A5FF89EEA58BE3C80B619F322C87910" +
-                                                                             "FE092F7D45BB0F8EEE01ED3F20BABEC079D202AE677B243AB40B5431D497C55D" +
-                                                                             "75D", 16),
-                                                              new BigInteger("0E7B0E675A9B24413D448B8CC119D2BF7B2D2DF032741C096634D6D65D0DBE3D" +
-                                                                             "5694625FB9E8104D3B842C1B0E2D0B98BEA19341E8676AEF66AE4EBA3D5475D5" +
-                                                                             "D16", 16));
-        doTestHMACDetECDSASample(new SHA224Digest(), privKey, new BigInteger("1776331CFCDF927D666E032E00CF776187BC9FDD8E69D0DABB4109FFE1B5E2A3" +
-                                                                            "0715F4CC923A4A5E94D2503E9ACFED92857B7F31D7152E0F8C00C15FF3D87E2E" +
-                                                                            "D2E", 16),
-                                                              new BigInteger("050CB5265417FE2320BBB5A122B8E1A32BD699089851128E360E620A30C7E17B" +
-                                                                            "A41A666AF126CE100E5799B153B60528D5300D08489CA9178FB610A2006C254B" +
-                                                                            "41F", 16));
-        doTestHMACDetECDSASample(new SHA256Digest(), privKey, new BigInteger("1511BB4D675114FE266FC4372B87682BAECC01D3CC62CF2303C92B3526012659" +
-                                                                             "D16876E25C7C1E57648F23B73564D67F61C6F14D527D54972810421E7D87589E" +
-                                                                             "1A7", 16),
-                                                              new BigInteger("04A171143A83163D6DF460AAF61522695F207A58B95C0644D87E52AA1A347916" +
-                                                                              "E4F7A72930B1BC06DBE22CE3F58264AFD23704CBB63B29B931F7DE6C9D949A7E" +
-                                                                              "CFC", 16));
-        doTestHMACDetECDSASample(new SHA384Digest(), privKey, new BigInteger("1EA842A0E17D2DE4F92C15315C63DDF72685C18195C2BB95E572B9C5136CA4B4" +
-                                                                            "B576AD712A52BE9730627D16054BA40CC0B8D3FF035B12AE75168397F5D50C67" +
-                                                                            "451", 16),
-                                                              new BigInteger("1F21A3CEE066E1961025FB048BD5FE2B7924D0CD797BABE0A83B66F1E35EEAF5" +
-                                                                              "FDE143FA85DC394A7DEE766523393784484BDF3E00114A1C857CDE1AA203DB65" +
-                                                                              "D61", 16));
-        doTestHMACDetECDSASample(new SHA512Digest(), privKey, new BigInteger("0C328FAFCBD79DD77850370C46325D987CB525569FB63C5D3BC53950E6D4C5F1" +
-                                                                            "74E25A1EE9017B5D450606ADD152B534931D7D4E8455CC91F9B15BF05EC36E37" +
-                                                                            "7FA", 16),
-                                                              new BigInteger("0617CCE7CF5064806C467F678D3B4080D6F1CC50AF26CA209417308281B68AF2" +
-                                                                              "82623EAA63E5B5C0723D8B8C37FF0777B1A20F8CCB1DCCC43997F1EE0E44DA4A" +
-                                                                              "67A", 16));
-
-        doTestHMACDetECDSATest(new SHA1Digest(), privKey,   new BigInteger("13BAD9F29ABE20DE37EBEB823C252CA0F63361284015A3BF430A46AAA80B87B0" +
-                                                                    "693F0694BD88AFE4E661FC33B094CD3B7963BED5A727ED8BD6A3A202ABE009D0" +
-                                                                    "367", 16),
-                                                              new BigInteger("1E9BB81FF7944CA409AD138DBBEE228E1AFCC0C890FC78EC8604639CB0DBDC90" +
-                                                                  "F717A99EAD9D272855D00162EE9527567DD6A92CBD629805C0445282BBC91679" +
-                                                                  "7FF", 16));
-        doTestHMACDetECDSATest(new SHA224Digest(), privKey, new BigInteger("1C7ED902E123E6815546065A2C4AF977B22AA8EADDB68B2C1110E7EA44D42086" +
-                                                                    "BFE4A34B67DDC0E17E96536E358219B23A706C6A6E16BA77B65E1C595D43CAE1" +
-                                                                    "7FB", 16),
-                                                              new BigInteger("177336676304FCB343CE028B38E7B4FBA76C1C1B277DA18CAD2A8478B2A9A9F5" +
-                                                                  "BEC0F3BA04F35DB3E4263569EC6AADE8C92746E4C82F8299AE1B8F1739F8FD51" +
-                                                                  "9A4", 16));
-        doTestHMACDetECDSATest(new SHA256Digest(), privKey, new BigInteger("00E871C4A14F993C6C7369501900C4BC1E9C7B0B4BA44E04868B30B41D807104" +
-                                                                    "2EB28C4C250411D0CE08CD197E4188EA4876F279F90B3D8D74A3C76E6F1E4656" +
-                                                                    "AA8", 16),
-                                                              new BigInteger("0CD52DBAA33B063C3A6CD8058A1FB0A46A4754B034FCC644766CA14DA8CA5CA9" +
-                                                                  "FDE00E88C1AD60CCBA759025299079D7A427EC3CC5B619BFBC828E7769BCD694" +
-                                                                  "E86", 16));
-        doTestHMACDetECDSATest(new SHA384Digest(), privKey, new BigInteger("14BEE21A18B6D8B3C93FAB08D43E739707953244FDBE924FA926D76669E7AC8C" +
-                                                                    "89DF62ED8975C2D8397A65A49DCC09F6B0AC62272741924D479354D74FF60755" +
-                                                                    "78C", 16),
-                                                              new BigInteger("133330865C067A0EAF72362A65E2D7BC4E461E8C8995C3B6226A21BD1AA78F0E" +
-                                                                  "D94FE536A0DCA35534F0CD1510C41525D163FE9D74D134881E35141ED5E8E95B" +
-                                                                  "979", 16));
-        doTestHMACDetECDSATest(new SHA512Digest(), privKey, new BigInteger("13E99020ABF5CEE7525D16B69B229652AB6BDF2AFFCAEF38773B4B7D08725F10" +
-                                                                    "CDB93482FDCC54EDCEE91ECA4166B2A7C6265EF0CE2BD7051B7CEF945BABD47E" +
-                                                                    "E6D", 16),
-                                                              new BigInteger("1FBD0013C674AA79CB39849527916CE301C66EA7CE8B80682786AD60F98F7E78" +
-                                                                  "A19CA69EFF5C57400E3B3A0AD66CE0978214D13BAF4E9AC60752F7B155E2DE4D" +
-                                                                  "CE3", 16));
-
-        x9ECParameters = NISTNamedCurves.getByName("B-163");
-        ecDomainParameters = new ECDomainParameters(x9ECParameters.getCurve(), x9ECParameters.getG(), x9ECParameters.getN());
-
-        privKey = new ECPrivateKeyParameters(new BigInteger("35318FC447D48D7E6BC93B48617DDDEDF26AA658F", 16), ecDomainParameters);
-
-        doTestHMACDetECDSASample(new SHA1Digest(), privKey,   new BigInteger("153FEBD179A69B6122DEBF5BC61EB947B24C93526", 16), new BigInteger("37AC9C670F8CF18045049BAE7DD35553545C19E49", 16));
-        doTestHMACDetECDSASample(new SHA224Digest(), privKey, new BigInteger("0A379E69C44F9C16EA3215EA39EB1A9B5D58CC955", 16), new BigInteger("04BAFF5308DA2A7FE2C1742769265AD3ED1D24E74", 16));
-        doTestHMACDetECDSASample(new SHA256Digest(), privKey, new BigInteger("134E00F78FC1CB9501675D91C401DE20DDF228CDC", 16), new BigInteger("373273AEC6C36CB7BAFBB1903A5F5EA6A1D50B624", 16));
-        doTestHMACDetECDSASample(new SHA384Digest(), privKey, new BigInteger("29430B935AF8E77519B0CA4F6903B0B82E6A21A66", 16), new BigInteger("1EA1415306E9353FA5AA54BC7C2581DFBB888440D", 16));
-        doTestHMACDetECDSASample(new SHA512Digest(), privKey, new BigInteger("0B2F177A99F9DF2D51CCAF55F015F326E4B65E7A0", 16), new BigInteger("0DF1FB4487E9B120C5E970EFE48F55E406306C3A1", 16));
-
-        doTestHMACDetECDSATest(new SHA1Digest(), privKey,   new BigInteger("256D4079C6C7169B8BC92529D701776A269D56308", 16), new BigInteger("341D3FFEC9F1EB6A6ACBE88E3C86A1C8FDEB8B8E1", 16));
-        doTestHMACDetECDSATest(new SHA224Digest(), privKey, new BigInteger("28ECC6F1272CE80EA59DCF32F7AC2D861BA803393", 16), new BigInteger("0AD4AE2C06E60183C1567D2B82F19421FE3053CE2", 16));
-        doTestHMACDetECDSATest(new SHA256Digest(), privKey, new BigInteger("227DF377B3FA50F90C1CB3CDCBBDBA552C1D35104", 16), new BigInteger("1F7BEAD92583FE920D353F368C1960D0E88B46A56", 16));
-        doTestHMACDetECDSATest(new SHA384Digest(), privKey, new BigInteger("11811DAFEEA441845B6118A0DFEE8A0061231337D", 16), new BigInteger("36258301865EE48C5C6F91D63F62695002AB55B57", 16));
-        doTestHMACDetECDSATest(new SHA512Digest(), privKey, new BigInteger("3B6BB95CA823BE2ED8E3972FF516EB8972D765571", 16), new BigInteger("13DC6F420628969DF900C3FCC48220B38BE24A541", 16));
-
-        x9ECParameters = NISTNamedCurves.getByName("B-233");
-        ecDomainParameters = new ECDomainParameters(x9ECParameters.getCurve(), x9ECParameters.getG(), x9ECParameters.getN());
-
-        privKey = new ECPrivateKeyParameters(new BigInteger("07ADC13DD5BF34D1DDEEB50B2CE23B5F5E6D18067306D60C5F6FF11E5D3", 16), ecDomainParameters);
-
-        doTestHMACDetECDSASample(new SHA1Digest(), privKey,   new BigInteger("015CC6FD78BB06E0878E71465515EA5A21A2C18E6FC77B4B158DBEB3944", 16), new BigInteger("0822A4A6C2EB2DF213A5E90BF40377956365EE8C4B4A5A4E2EB9270CB6A", 16));
-        doTestHMACDetECDSASample(new SHA224Digest(), privKey, new BigInteger("05D9920B53471148E10502AB49AB7A3F11084820A074FD89883CF51BC1A", 16), new BigInteger("04D3938900C0A9AAA7080D1DFEB56CFB0FADABE4214536C7ED5117ED13A", 16));
-        doTestHMACDetECDSASample(new SHA256Digest(), privKey, new BigInteger("0A797F3B8AEFCE7456202DF1E46CCC291EA5A49DA3D4BDDA9A4B62D5E0D", 16), new BigInteger("01F6F81DA55C22DA4152134C661588F4BD6F82FDBAF0C5877096B070DC2", 16));
-        doTestHMACDetECDSASample(new SHA384Digest(), privKey, new BigInteger("015E85A8D46225DD7E314A1C4289731FC14DECE949349FE535D11043B85", 16), new BigInteger("03F189D37F50493EFD5111A129443A662AB3C6B289129AD8C0CAC85119C", 16));
-        doTestHMACDetECDSASample(new SHA512Digest(), privKey, new BigInteger("03B62A4BF783919098B1E42F496E65F7621F01D1D466C46940F0F132A95", 16), new BigInteger("0F4BE031C6E5239E7DAA014CBBF1ED19425E49DAEB426EC9DF4C28A2E30", 16));
-
-        doTestHMACDetECDSATest(new SHA1Digest(), privKey,   new BigInteger("02F1FEDC57BE203E4C8C6B8C1CEB35E13C1FCD956AB41E3BD4C8A6EFB1F", 16), new BigInteger("05738EC8A8EDEA8E435EE7266AD3EDE1EEFC2CEBE2BE1D614008D5D2951", 16));
-        doTestHMACDetECDSATest(new SHA224Digest(), privKey, new BigInteger("0CCE175124D3586BA7486F7146894C65C2A4A5A1904658E5C7F9DF5FA5D", 16), new BigInteger("08804B456D847ACE5CA86D97BF79FD6335E5B17F6C0D964B5D0036C867E", 16));
-        doTestHMACDetECDSATest(new SHA256Digest(), privKey, new BigInteger("035C3D6DFEEA1CFB29B93BE3FDB91A7B130951770C2690C16833A159677", 16), new BigInteger("0600F7301D12AB376B56D4459774159ADB51F97E282FF384406AFD53A02", 16));
-        doTestHMACDetECDSATest(new SHA384Digest(), privKey, new BigInteger("061602FC8068BFD5FB86027B97455D200EC603057446CCE4D76DB8EF42C", 16), new BigInteger("03396DD0D59C067BB999B422D9883736CF9311DFD6951F91033BD03CA8D", 16));
-        doTestHMACDetECDSATest(new SHA512Digest(), privKey, new BigInteger("07E12CB60FDD614958E8E34B3C12DDFF35D85A9C5800E31EA2CC2EF63B1", 16), new BigInteger("0E8970FD99D836F3CC1C807A2C58760DE6EDAA23705A82B9CB1CE93FECC", 16));
-
-        x9ECParameters = NISTNamedCurves.getByName("B-283");
-        ecDomainParameters = new ECDomainParameters(x9ECParameters.getCurve(), x9ECParameters.getG(), x9ECParameters.getN());
-
-        privKey = new ECPrivateKeyParameters(new BigInteger("14510D4BC44F2D26F4553942C98073C1BD35545CEABB5CC138853C5158D2729EA408836", 16), ecDomainParameters);
-
-        doTestHMACDetECDSASample(new SHA1Digest(), privKey,   new BigInteger("201E18D48C6DB3D5D097C4DCE1E25587E1501FC3CF47BDB5B4289D79E273D6A9" +
-            "ACB8285", 16), new BigInteger("151AE05712B024CE617358260774C8CA8B0E7A7E72EF8229BF2ACE7609560CB3" +
-            "0322C4F", 16));
-        doTestHMACDetECDSASample(new SHA224Digest(), privKey, new BigInteger("143E878DDFD4DF40D97B8CD638B3C4706501C2201CF7108F2FB91478C11D6947" +
-            "3246925", 16), new BigInteger("0CBF1B9717FEEA3AABB09D9654110144267098E0E1E8D0289A6211BE0EEDFDD8" +
-            "6A3DB79", 16));
-        doTestHMACDetECDSASample(new SHA256Digest(), privKey, new BigInteger("29FD82497FB3E5CEF65579272138DE59E2B666B8689466572B3B69A172CEE83B" +
-            "E145659", 16), new BigInteger("05A89D9166B40795AF0FE5958201B9C0523E500013CA12B4840EA2BC53F25F9B" +
-            "3CE87C0", 16));
-        doTestHMACDetECDSASample(new SHA384Digest(), privKey, new BigInteger("2F00689C1BFCD2A8C7A41E0DE55AE182E6463A152828EF89FE3525139B660329" +
-            "4E69353", 16), new BigInteger("1744514FE0A37447250C8A329EAAADA81572226CABA16F39270EE5DD03F27B1F" +
-            "665EB5D", 16));
-        doTestHMACDetECDSASample(new SHA512Digest(), privKey, new BigInteger("0DA43A9ADFAA6AD767998A054C6A8F1CF77A562924628D73C62761847AD8286E" +
-            "0D91B47", 16), new BigInteger("1D118733AE2C88357827CAFC6F68ABC25C80C640532925E95CFE66D40F8792F3" +
-            "AC44C42", 16));
-
-        doTestHMACDetECDSATest(new SHA1Digest(), privKey,   new BigInteger("05A408133919F2CDCDBE5E4C14FBC706C1F71BADAFEF41F5DE4EC27272FC1CA9" +
-            "366FBB2", 16), new BigInteger("012966272872C097FEA7BCE64FAB1A81982A773E26F6E4EF7C99969846E67CA9" +
-            "CBE1692", 16));
-        doTestHMACDetECDSATest(new SHA224Digest(), privKey, new BigInteger("08F3824E40C16FF1DDA8DC992776D26F4A5981AB5092956C4FDBB4F1AE0A711E" +
-            "EAA10E5", 16), new BigInteger("0A64B91EFADB213E11483FB61C73E3EF63D3B44EEFC56EA401B99DCC60CC28E9" +
-            "9F0F1FA", 16));
-        doTestHMACDetECDSATest(new SHA256Digest(), privKey, new BigInteger("3597B406F5329D11A79E887847E5EC60861CCBB19EC61F252DB7BD549C699951" +
-            "C182796", 16), new BigInteger("0A6A100B997BC622D91701D9F5C6F6D3815517E577622DA69D3A0E8917C1CBE6" +
-            "3ACD345", 16));
-        doTestHMACDetECDSATest(new SHA384Digest(), privKey, new BigInteger("1BB490926E5A1FDC7C5AA86D0835F9B994EDA315CA408002AF54A298728D422E" +
-            "BF59E4C", 16), new BigInteger("36C682CFC9E2C89A782BFD3A191609D1F0C1910D5FD6981442070393159D65FB" +
-            "CC0A8BA", 16));
-        doTestHMACDetECDSATest(new SHA512Digest(), privKey, new BigInteger("19944AA68F9778C2E3D6E240947613E6DA60EFCE9B9B2C063FF5466D72745B5A" +
-            "0B25BA2", 16), new BigInteger("03F1567B3C5B02DF15C874F0EE22850824693D5ADC4663BAA19E384E550B1DD4" +
-            "1F31EE6", 16));
-
-        x9ECParameters = NISTNamedCurves.getByName("B-409");
-        ecDomainParameters = new ECDomainParameters(x9ECParameters.getCurve(), x9ECParameters.getG(), x9ECParameters.getN());
-
-        privKey = new ECPrivateKeyParameters(new BigInteger("0494994CC325B08E7B4CE038BD9436F90B5E59A2C13C3140CD3AE07C04A01FC489F572CE0569A6DB7B8060393DE76330C624177", 16), ecDomainParameters);
-
-        doTestHMACDetECDSASample(new SHA1Digest(), privKey,   new BigInteger("0D8783188E1A540E2022D389E1D35B32F56F8C2BB5636B8ABF7718806B27A713" +
-            "EBAE37F63ECD4B61445CEF5801B62594EF3E982", 16), new BigInteger("03A6B4A80E204DB0DE12E7415C13C9EC091C52935658316B4A0C591216A38791" +
-            "54BEB1712560E346E7EF26517707435B55C3141", 16));
-        doTestHMACDetECDSASample(new SHA224Digest(), privKey, new BigInteger("0EE4F39ACC2E03CE96C3D9FCBAFA5C22C89053662F8D4117752A9B10F09ADFDA" +
-            "59DB061E247FE5321D6B170EE758ACE1BE4D157", 16), new BigInteger("00A2B83265B456A430A8BF27DCC8A9488B3F126C10F0D6D64BF7B8A218FAAF20" +
-            "E51A295A3AE78F205E5A4A6AE224C3639F1BB34", 16));
-        doTestHMACDetECDSASample(new SHA256Digest(), privKey, new BigInteger("02D8B1B31E33E74D7EB46C30FDE5AD2CA04EC8FE08FBA0E73BA5E568953AC5EA" +
-            "307C072942238DFC07F4A4D7C7C6A9F86436D17", 16), new BigInteger("079F7D471E6CB73234AF7F7C381D2CE15DE35BAF8BB68393B73235B3A26EC2DF" +
-            "4842CE433FB492D6E074E604D4870024D42189A", 16));
-        doTestHMACDetECDSASample(new SHA384Digest(), privKey, new BigInteger("07BC638B7E7CE6FEE5E9C64A0F966D722D01BB4BC3F3A35F30D4CDDA92DFC5F7" +
-            "F0B4BBFE8065D9AD452FD77A1914BE3A2440C18", 16), new BigInteger("06D904429850521B28A32CBF55C7C0FDF35DC4E0BDA2552C7BF68A171E970E67" +
-            "88ACC0B9521EACB4796E057C70DD9B95FED5BFB", 16));
-        doTestHMACDetECDSASample(new SHA512Digest(), privKey, new BigInteger("05D178DECAFD2D02A3DA0D8BA1C4C1D95EE083C760DF782193A9F7B4A8BE6FC5" +
-            "C21FD60613BCA65C063A61226E050A680B3ABD4", 16), new BigInteger("013B7581E98F6A63FBBCB3E49BCDA60F816DB230B888506D105DC229600497C3" +
-            "B46588C784BE3AA9343BEF82F7C9C80AEB63C3B", 16));
-
-        doTestHMACDetECDSATest(new SHA1Digest(), privKey, new BigInteger("049F54E7C10D2732B4638473053782C6919218BBEFCEC8B51640FC193E832291" +
-            "F05FA12371E9B448417B3290193F08EE9319195", 16), new BigInteger("0499E267DEC84E02F6F108B10E82172C414F15B1B7364BE8BFD66ADC0C5DE23F" +
-            "EE3DF0D811134C25AFE0E05A6672F98889F28F1", 16));
-        doTestHMACDetECDSATest(new SHA224Digest(), privKey, new BigInteger("0B1527FFAA7DD7C7E46B628587A5BEC0539A2D04D3CF27C54841C2544E1BBDB4" +
-            "2FDBDAAF8671A4CA86DFD619B1E3732D7BB56F2", 16), new BigInteger("0442C68C044868DF4832C807F1EDDEBF7F5052A64B826FD03451440794063F52" +
-            "B022DF304F47403D4069234CA9EB4C964B37C02", 16));
-        doTestHMACDetECDSATest(new SHA256Digest(), privKey, new BigInteger("0BB27755B991D6D31757BCBF68CB01225A38E1CFA20F775E861055DD108ED7EA" +
-            "455E4B96B2F6F7CD6C6EC2B3C70C3EDDEB9743B", 16), new BigInteger("0C5BE90980E7F444B5F7A12C9E9AC7A04CA81412822DD5AD1BE7C45D5032555E" +
-            "A070864245CF69266871FEB8CD1B7EDC30EF6D5", 16));
-        doTestHMACDetECDSATest(new SHA384Digest(), privKey, new BigInteger("04EFEB7098772187907C87B33E0FBBA4584226C50C11E98CA7AAC6986F8D3BE0" +
-            "44E5B52D201A410B852536527724CA5F8CE6549", 16), new BigInteger("09574102FEB3EF87E6D66B94119F5A6062950FF4F902EA1E6BD9E2037F33FF99" +
-            "1E31F5956C23AFE48FCDC557FD6F088C7C9B2B3", 16));
-        doTestHMACDetECDSATest(new SHA512Digest(), privKey, new BigInteger("07E0249C68536AE2AEC2EC30090340DA49E6DC9E9EEC8F85E5AABFB234B6DA7D" +
-            "2E9524028CF821F21C6019770474CC40B01FAF6", 16), new BigInteger("08125B5A03FB44AE81EA46D446130C2A415ECCA265910CA69D55F2453E16CD7B" +
-            "2DFA4E28C50FA8137F9C0C6CEE4CD37ABCCF6D8", 16));
-
-        x9ECParameters = NISTNamedCurves.getByName("B-571");
-        ecDomainParameters = new ECDomainParameters(x9ECParameters.getCurve(), x9ECParameters.getG(), x9ECParameters.getN());
-
-        privKey = new ECPrivateKeyParameters(new BigInteger("028A04857F24C1C082DF0D909C0E72F453F2E2340CCB071F0E389BCA2575DA19" +
-                                                            "124198C57174929AD26E348CF63F78D28021EF5A9BF2D5CBEAF6B7CCB6C4DA82" +
-                                                            "4DD5C82CFB24E11", 16), ecDomainParameters);
-
-        doTestHMACDetECDSASample(new SHA1Digest(), privKey, new BigInteger("147D3EB0EDA9F2152DFD014363D6A9CE816D7A1467D326A625FC4AB0C786E1B7" +
-                                                                            "4DDF7CD4D0E99541391B266C704BB6B6E8DCCD27B460802E0867143727AA4155" +
-                                                                            "55454321EFE5CB6", 16),
-                                                              new BigInteger("17319571CAF533D90D2E78A64060B9C53169AB7FC908947B3EDADC54C79CCF0A" +
-                                                                              "7920B4C64A4EAB6282AFE9A459677CDA37FD6DD50BEF18709590FE18B923BDF7" +
-                                                                              "4A66B189A850819", 16));
-
-        doTestHMACDetECDSASample(new SHA224Digest(), privKey, new BigInteger("10F4B63E79B2E54E4F4F6A2DBC786D8F4A143ECA7B2AD97810F6472AC6AE2085" +
-                                                                            "3222854553BE1D44A7974599DB7061AE8560DF57F2675BE5F9DD94ABAF3D47F1" +
-                                                                            "582B318E459748B", 16),
-                                                              new BigInteger("3BBEA07C6B269C2B7FE9AE4DDB118338D0C2F0022920A7F9DCFCB7489594C03B" +
-                                                                              "536A9900C4EA6A10410007222D3DAE1A96F291C4C9275D75D98EB290DC0EEF17" +
-                                                                              "6037B2C7A7A39A3", 16));
-
-        doTestHMACDetECDSASample(new SHA256Digest(), privKey, new BigInteger("213EF9F3B0CFC4BF996B8AF3A7E1F6CACD2B87C8C63820000800AC787F17EC99" +
-                                                                            "C04BCEDF29A8413CFF83142BB88A50EF8D9A086AF4EB03E97C567500C21D8657" +
-                                                                            "14D832E03C6D054", 16),
-                                                              new BigInteger("3D32322559B094E20D8935E250B6EC139AC4AAB77920812C119AF419FB62B332" +
-                                                                              "C8D226C6C9362AE3C1E4AABE19359B8428EA74EC8FBE83C8618C2BCCB6B43FBA" +
-                                                                              "A0F2CCB7D303945", 16));
-
-        doTestHMACDetECDSASample(new SHA384Digest(), privKey, new BigInteger("375D8F49C656A0BBD21D3F54CDA287D853C4BB1849983CD891EF6CD6BB56A62B" +
-                                                                            "687807C16685C2C9BCA2663C33696ACCE344C45F3910B1DF806204FF731ECB28" +
-                                                                            "9C100EF4D1805EC", 16),
-                                                              new BigInteger("1CDEC6F46DFEEE44BCE71D41C60550DC67CF98D6C91363625AC2553E4368D2DF" +
-                                                                            "B734A8E8C72E118A76ACDB0E58697940A0F3DF49E72894BD799450FC9E550CC0" +
-                                                                            "4B9FF9B0380021C", 16));
-        doTestHMACDetECDSASample(new SHA512Digest(), privKey, new BigInteger("1C26F40D940A7EAA0EB1E62991028057D91FEDA0366B606F6C434C361F04E545" +
-                                                                            "A6A51A435E26416F6838FFA260C617E798E946B57215284182BE55F29A355E60" +
-                                                                            "24FE32A47289CF0", 16),
-                                                              new BigInteger("3691DE4369D921FE94EDDA67CB71FBBEC9A436787478063EB1CC778B3DCDC1C4" +
-                                                                            "162662752D28DEEDF6F32A269C82D1DB80C87CE4D3B662E03AC347806E3F19D1" +
-                                                                            "8D6D4DE7358DF7E", 16));
-
-        doTestHMACDetECDSATest(new SHA1Digest(), privKey, new BigInteger("133F5414F2A9BC41466D339B79376038A64D045E5B0F792A98E5A7AA87E0AD01" +
-            "6419E5F8D176007D5C9C10B5FD9E2E0AB8331B195797C0358BA05ECBF24ACE59" +
-            "C5F368A6C0997CC", 16),
-            new BigInteger("3D16743AE9F00F0B1A500F738719C5582550FEB64689DA241665C4CE4F328BA0" +
-                "E34A7EF527ED13BFA5889FD2D1D214C11EB17D6BC338E05A56F41CAFF1AF7B8D" +
-                "574DB62EF0D0F21", 16));
-
-        doTestHMACDetECDSATest(new SHA224Digest(), privKey, new BigInteger("3048E76506C5C43D92B2E33F62B33E3111CEEB87F6C7DF7C7C01E3CDA28FA5E8" +
-            "BE04B5B23AA03C0C70FEF8F723CBCEBFF0B7A52A3F5C8B84B741B4F6157E69A5" +
-            "FB0524B48F31828", 16),
-            new BigInteger("2C99078CCFE5C82102B8D006E3703E020C46C87C75163A2CD839C885550BA5CB" +
-                "501AC282D29A1C26D26773B60FBE05AAB62BFA0BA32127563D42F7669C97784C" +
-                "8897C22CFB4B8FA", 16));
-
-        doTestHMACDetECDSATest(new SHA256Digest(), privKey, new BigInteger("184BC808506E11A65D628B457FDA60952803C604CC7181B59BD25AEE1411A66D" +
-                                                                    "12A777F3A0DC99E1190C58D0037807A95E5080FA1B2E5CCAA37B50D401CFFC34" +
-                                                                    "17C005AEE963469", 16),
-                                                              new BigInteger("27280D45F81B19334DBDB07B7E63FE8F39AC7E9AE14DE1D2A6884D2101850289" +
-                                                                  "D70EE400F26ACA5E7D73F534A14568478E59D00594981ABE6A1BA18554C13EB5" +
-                                                                  "E03921E4DC98333", 16));
-
-        doTestHMACDetECDSATest(new SHA384Digest(), privKey, new BigInteger("319EE57912E7B0FAA1FBB145B0505849A89C6DB1EC06EA20A6A7EDE072A6268A" +
-            "F6FD9C809C7E422A5F33C6C3326EAD7402467DF3272A1B2726C1C20975950F0F" +
-            "50D8324578F13EC", 16),
-            new BigInteger("2CF3EA27EADD0612DD2F96F46E89AB894B01A10DF985C5FC099CFFE0EA083EB4" +
-                "4BE682B08BFE405DAD5F37D0A2C59015BA41027E24B99F8F75A70B6B7385BF39" +
-                "BBEA02513EB880C", 16));
-        doTestHMACDetECDSATest(new SHA512Digest(), privKey, new BigInteger("2AA1888EAB05F7B00B6A784C4F7081D2C833D50794D9FEAF6E22B8BE728A2A90" +
-            "BFCABDC803162020AA629718295A1489EE7ED0ECB8AAA197B9BDFC49D18DDD78" +
-            "FC85A48F9715544", 16),
-            new BigInteger("0AA5371FE5CA671D6ED9665849C37F394FED85D51FEF72DA2B5F28EDFB2C6479" +
-                "CA63320C19596F5E1101988E2C619E302DD05112F47E8823040CE540CD3E90DC" +
-                "F41DBC461744EE9", 16));
-
-    }
-
-    private void doTestHMACDetECDSASample(Digest digest, ECPrivateKeyParameters privKey, BigInteger r, BigInteger s)
-    {
-        doTestHMACDetECDSA(new ECDSASigner(new HMacDSAKCalculator(digest)), digest, SAMPLE, privKey, r, s);
-    }
-
-    private void doTestHMACDetECDSATest(Digest digest, ECPrivateKeyParameters privKey, BigInteger r, BigInteger s)
-    {
-        doTestHMACDetECDSA(new ECDSASigner(new HMacDSAKCalculator(digest)), digest, TEST, privKey, r, s);
-    }
-
-    private void doTestHMACDetECDSA(DSA detSigner, Digest digest, byte[] data, CipherParameters privKey, BigInteger r, BigInteger s)
-    {
-        byte[] m = new byte[digest.getDigestSize()];
-
-        digest.update(data, 0, data.length);
-
-        digest.doFinal(m, 0);
-
-        detSigner.init(true, privKey);
-
-        BigInteger[] rs = detSigner.generateSignature(m);
-
-        if (!r.equals(rs[0]))
-        {
-            fail("r value wrong");
-        }
-        if (!s.equals(rs[1]))
-        {
-            fail("s value wrong");
-        }
-    }
-
-    public String getName()
-    {
-        return "DeterministicDSA";
-    }
-
-    public void performTest()
-    {
-        testHMacDeterministic();
-        testECHMacDeterministic();
-    }
-
-
-    public static void main(
-        String[] args)
-    {
-        runTest(new DeterministicDSATest());
-    }
-}
-
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/DigestRandomNumberTest.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/DigestRandomNumberTest.java
deleted file mode 100644
index 7bcaea8..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/DigestRandomNumberTest.java
+++ /dev/null
@@ -1,152 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import org.bouncycastle.util.test.SimpleTest;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.crypto.prng.DigestRandomGenerator;
-import org.bouncycastle.crypto.digests.SHA1Digest;
-import org.bouncycastle.crypto.digests.SHA256Digest;
-import org.bouncycastle.crypto.Digest;
-
-public class DigestRandomNumberTest
-    extends SimpleTest
-{
-    private static final byte[] ZERO_SEED = { 0, 0, 0, 0, 0, 0, 0, 0 };
-
-    private static final byte[] TEST_SEED = Hex.decode("81dcfafc885914057876");
-
-    private static final byte[] expected0SHA1 = Hex.decode("95bca677b3d4ff793213c00892d2356ec729ee02");
-    private static final byte[] noCycle0SHA1 = Hex.decode("d57ccd0eb12c3938d59226412bc1268037b6b846");
-    private static final byte[] expected0SHA256 = Hex.decode("587e2dfd597d086e47ddcd343eac983a5c913bef8c6a1a560a5c1bc3a74b0991");
-    private static final byte[] noCycle0SHA256 = Hex.decode("e5776c4483486ba7be081f4e1b9dafbab25c8fae290fd5474c1ceda2c16f9509");
-    private static final byte[] expected100SHA1 = Hex.decode("b9d924092546e0876cafd4937d7364ebf9efa4be");
-    private static final byte[] expected100SHA256 = Hex.decode("fbc4aa54b948b99de104c44563a552899d718bb75d1941cc62a2444b0506abaf");
-    private static final byte[] expectedTestSHA1 = Hex.decode("e9ecef9f5306daf1ac51a89a211a64cb24415649");
-    private static final byte[] expectedTestSHA256 = Hex.decode("bdab3ca831b472a2fa09bd1bade541ef16c96640a91fcec553679a136061de98");
-
-    private static final byte[] sha1Xors = Hex.decode("7edcc1216934f3891b03ffa65821611a3e2b1f79");
-    private static final byte[] sha256Xors = Hex.decode("5ec48189cc0aa71e79c707bc3c33ffd47bbba368a83d6cfebf3cd3969d7f3eed");
-
-    public String getName()
-    {
-        return "DigestRandomNumber";
-    }
-
-    private void doExpectedTest(Digest digest, int seed, byte[] expected)
-    {
-        doExpectedTest(digest, seed, expected, null);
-    }
-    
-    private void doExpectedTest(Digest digest, int seed, byte[] expected, byte[] noCycle)
-    {
-        DigestRandomGenerator rGen = new DigestRandomGenerator(digest);
-        byte[] output = new byte[digest.getDigestSize()];
-
-        rGen.addSeedMaterial(seed);
-
-        for (int i = 0; i != 1024; i++)
-        {
-             rGen.nextBytes(output);
-        }
-
-        if (noCycle != null)
-        {
-            if (Arrays.areEqual(noCycle, output))
-            {
-                fail("seed not being cycled!");
-            }
-        }
-
-        if (!Arrays.areEqual(expected, output))
-        {
-            fail("expected output doesn't match");
-        }
-    }
-
-    private void doExpectedTest(Digest digest, byte[] seed, byte[] expected)
-    {
-        DigestRandomGenerator rGen = new DigestRandomGenerator(digest);
-        byte[] output = new byte[digest.getDigestSize()];
-
-        rGen.addSeedMaterial(seed);
-
-        for (int i = 0; i != 1024; i++)
-        {
-             rGen.nextBytes(output);
-        }
-
-        if (!Arrays.areEqual(expected, output))
-        {
-            fail("expected output doesn't match");
-        }
-    }
-
-    private void doCountTest(Digest digest, byte[] seed, byte[] expectedXors)
-    {
-        DigestRandomGenerator rGen = new DigestRandomGenerator(digest);
-        byte[] output = new byte[digest.getDigestSize()];
-        int[] averages = new int[digest.getDigestSize()];
-        byte[] ands = new byte[digest.getDigestSize()];
-        byte[] xors = new byte[digest.getDigestSize()];
-        byte[] ors = new byte[digest.getDigestSize()];
-
-        rGen.addSeedMaterial(seed);
-
-        for (int i = 0; i != 1000000; i++)
-        {
-             rGen.nextBytes(output);
-             for (int j = 0; j != output.length; j++)
-             {
-                 averages[j] += output[j] & 0xff;
-                 ands[j] &= output[j];
-                 xors[j] ^= output[j];
-                 ors[j] |= output[j];
-             }
-        }
-               
-        for (int i = 0; i != output.length; i++)
-        {
-            if ((averages[i] / 1000000) != 127)
-            {
-                fail("average test failed for " + digest.getAlgorithmName());
-            }
-            if (ands[i] != 0)
-            {
-                fail("and test failed for " + digest.getAlgorithmName());
-            }
-            if ((ors[i] & 0xff) != 0xff)
-            {
-                fail("or test failed for " + digest.getAlgorithmName());
-            }
-            if (xors[i] != expectedXors[i])
-            {
-                fail("xor test failed for " + digest.getAlgorithmName());
-            }
-        }
-    }
-
-    public void performTest()
-        throws Exception
-    {
-        doExpectedTest(new SHA1Digest(), 0, expected0SHA1, noCycle0SHA1);
-        doExpectedTest(new SHA256Digest(), 0, expected0SHA256, noCycle0SHA256);
-
-        doExpectedTest(new SHA1Digest(), 100, expected100SHA1);
-        doExpectedTest(new SHA256Digest(), 100, expected100SHA256);
-
-        doExpectedTest(new SHA1Digest(), ZERO_SEED, expected0SHA1);
-        doExpectedTest(new SHA256Digest(), ZERO_SEED, expected0SHA256);
-
-        doExpectedTest(new SHA1Digest(), TEST_SEED, expectedTestSHA1);
-        doExpectedTest(new SHA256Digest(), TEST_SEED, expectedTestSHA256);
-
-        doCountTest(new SHA1Digest(), TEST_SEED, sha1Xors);
-        doCountTest(new SHA256Digest(), TEST_SEED, sha256Xors);
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        runTest(new DigestRandomNumberTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/DigestTest.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/DigestTest.java
deleted file mode 100644
index db9b490..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/DigestTest.java
+++ /dev/null
@@ -1,226 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.digests.EncodableDigest;
-import org.bouncycastle.util.Memoable;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-
-public abstract class DigestTest
-    extends SimpleTest
-{
-    private Digest digest;
-    private String[] input;
-    private String[] results;
-
-    DigestTest(
-        Digest digest,
-        String[] input,
-        String[] results)
-    {
-        this.digest = digest;
-        this.input = input;
-        this.results = results;
-    }
-    
-    public String getName()
-    {
-        return digest.getAlgorithmName();
-    }
-    
-    public void performTest()
-    {
-        byte[] resBuf = new byte[digest.getDigestSize()];
-    
-        for (int i = 0; i < input.length - 1; i++)
-        {
-            byte[] m = toByteArray(input[i]);
-            
-            vectorTest(digest, i, resBuf, m, Hex.decode(results[i]));
-        }
-        
-        byte[] lastV = toByteArray(input[input.length - 1]);
-        byte[] lastDigest = Hex.decode(results[input.length - 1]);
-        
-        vectorTest(digest, input.length - 1, resBuf, lastV, Hex.decode(results[input.length - 1]));
-
-        testClone(resBuf, lastV, lastDigest);
-        testMemo(resBuf, lastV, lastDigest);
-        if (digest instanceof EncodableDigest)
-        {
-            testEncodedState(resBuf, lastV, lastDigest);
-        }
-    }
-
-    private void testEncodedState(byte[] resBuf, byte[] input, byte[] expected)
-    {
-        // test state encoding;
-        digest.update(input, 0, input.length / 2);
-
-        // copy the Digest
-        Digest copy1 = cloneDigest(((EncodableDigest)digest).getEncodedState());
-        Digest copy2 = cloneDigest(((EncodableDigest)copy1).getEncodedState());
-
-        digest.update(input, input.length / 2, input.length - input.length / 2);
-
-        digest.doFinal(resBuf, 0);
-
-        if (!areEqual(expected, resBuf))
-        {
-            fail("failing state vector test", expected, new String(Hex.encode(resBuf)));
-        }
-
-        copy1.update(input, input.length / 2, input.length - input.length / 2);
-        copy1.doFinal(resBuf, 0);
-
-        if (!areEqual(expected, resBuf))
-        {
-            fail("failing state copy1 vector test", expected, new String(Hex.encode(resBuf)));
-        }
-
-        copy2.update(input, input.length / 2, input.length - input.length / 2);
-        copy2.doFinal(resBuf, 0);
-
-        if (!areEqual(expected, resBuf))
-        {
-            fail("failing state copy2 vector test", expected, new String(Hex.encode(resBuf)));
-        }
-    }
-
-    private void testMemo(byte[] resBuf, byte[] input, byte[] expected)
-    {
-        Memoable m = (Memoable)digest;
-
-        digest.update(input, 0, input.length/2);
-
-        // copy the Digest
-        Memoable copy1 = m.copy();
-        Memoable copy2 = copy1.copy();
-
-        digest.update(input, input.length/2, input.length - input.length/2);
-        digest.doFinal(resBuf, 0);
-
-        if (!areEqual(expected, resBuf))
-        {
-            fail("failing memo vector test", results[results.length - 1], new String(Hex.encode(resBuf)));
-        }
-
-        m.reset(copy1);
-
-        digest.update(input, input.length/2, input.length - input.length/2);
-        digest.doFinal(resBuf, 0);
-
-        if (!areEqual(expected, resBuf))
-        {
-            fail("failing memo reset vector test", results[results.length - 1], new String(Hex.encode(resBuf)));
-        }
-
-        Digest md = (Digest)copy2;
-
-        md.update(input, input.length/2, input.length - input.length/2);
-        md.doFinal(resBuf, 0);
-
-        if (!areEqual(expected, resBuf))
-        {
-            fail("failing memo copy vector test", results[results.length - 1], new String(Hex.encode(resBuf)));
-        }
-    }
-
-    private void testClone(byte[] resBuf, byte[] input, byte[] expected)
-    {
-        digest.update(input, 0, input.length/2);
-
-        // clone the Digest
-        Digest d = cloneDigest(digest);
-
-        digest.update(input, input.length/2, input.length - input.length/2);
-        digest.doFinal(resBuf, 0);
-
-        if (!areEqual(expected, resBuf))
-        {
-            fail("failing clone vector test", results[results.length - 1], new String(Hex.encode(resBuf)));
-        }
-
-        d.update(input, input.length/2, input.length - input.length/2);
-        d.doFinal(resBuf, 0);
-
-        if (!areEqual(expected, resBuf))
-        {
-            fail("failing second clone vector test", results[results.length - 1], new String(Hex.encode(resBuf)));
-        }
-    }
-
-    protected byte[] toByteArray(String input)
-    {
-        byte[] bytes = new byte[input.length()];
-        
-        for (int i = 0; i != bytes.length; i++)
-        {
-            bytes[i] = (byte)input.charAt(i);
-        }
-        
-        return bytes;
-    }
-    
-    private void vectorTest(
-        Digest digest,
-        int count,
-        byte[] resBuf,
-        byte[] input,
-        byte[] expected)
-    {
-        digest.update(input, 0, input.length);
-        digest.doFinal(resBuf, 0);
-
-        if (!areEqual(resBuf, expected))
-        {
-            fail("Vector " + count + " failed got " + new String(Hex.encode(resBuf)));
-        }
-    }
-    
-    protected abstract Digest cloneDigest(Digest digest);
-
-    protected Digest cloneDigest(byte[] encodedState)
-    {
-        throw new IllegalStateException("Unsupported");
-    }
-
-    //
-    // optional tests
-    //
-    protected void millionATest(
-        String expected)
-    {
-        byte[] resBuf = new byte[digest.getDigestSize()];
-        
-        for (int i = 0; i < 1000000; i++)
-        {
-            digest.update((byte)'a');
-        }
-        
-        digest.doFinal(resBuf, 0);
-
-        if (!areEqual(resBuf, Hex.decode(expected)))
-        {
-            fail("Million a's failed", expected, new String(Hex.encode(resBuf)));
-        }
-    }
-    
-    protected void sixtyFourKTest(
-        String expected)
-    {
-        byte[] resBuf = new byte[digest.getDigestSize()];
-        
-        for (int i = 0; i < 65536; i++)
-        {
-            digest.update((byte)(i & 0xff));
-        }
-        
-        digest.doFinal(resBuf, 0);
-
-        if (!areEqual(resBuf, Hex.decode(expected)))
-        {
-            fail("64k test failed", expected, new String(Hex.encode(resBuf)));
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/EAXTest.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/EAXTest.java
deleted file mode 100644
index 401d9fa..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/EAXTest.java
+++ /dev/null
@@ -1,355 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import java.security.SecureRandom;
-
-import org.bouncycastle.crypto.InvalidCipherTextException;
-import org.bouncycastle.crypto.engines.AESEngine;
-import org.bouncycastle.crypto.engines.AESFastEngine;
-import org.bouncycastle.crypto.modes.AEADBlockCipher;
-import org.bouncycastle.crypto.modes.EAXBlockCipher;
-import org.bouncycastle.crypto.params.AEADParameters;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.crypto.params.ParametersWithIV;
-import org.bouncycastle.util.Strings;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-
-public class EAXTest
-    extends SimpleTest
-{
-    private byte[] K1 = Hex.decode("233952DEE4D5ED5F9B9C6D6FF80FF478");
-    private byte[] N1 = Hex.decode("62EC67F9C3A4A407FCB2A8C49031A8B3");
-    private byte[] A1 = Hex.decode("6BFB914FD07EAE6B");
-    private byte[] P1 = Hex.decode("");
-    private byte[] C1 = Hex.decode("E037830E8389F27B025A2D6527E79D01");
-    private byte[] T1 = Hex.decode("E037830E8389F27B025A2D6527E79D01");
-
-    private byte[] K2 = Hex.decode("91945D3F4DCBEE0BF45EF52255F095A4");
-    private byte[] N2 = Hex.decode("BECAF043B0A23D843194BA972C66DEBD");
-    private byte[] A2 = Hex.decode("FA3BFD4806EB53FA");
-    private byte[] P2 = Hex.decode("F7FB");
-    private byte[] C2 = Hex.decode("19DD5C4C9331049D0BDAB0277408F67967E5");
-    private byte[] T2 = Hex.decode("5C4C9331049D0BDAB0277408F67967E5");
-
-    private byte[] K3 = Hex.decode("01F74AD64077F2E704C0F60ADA3DD523");
-    private byte[] N3 = Hex.decode("70C3DB4F0D26368400A10ED05D2BFF5E");
-    private byte[] A3 = Hex.decode("234A3463C1264AC6");
-    private byte[] P3 = Hex.decode("1A47CB4933");
-    private byte[] C3 = Hex.decode("D851D5BAE03A59F238A23E39199DC9266626C40F80");
-    private byte[] T3 = Hex.decode("3A59F238A23E39199DC9266626C40F80");
-
-    private byte[] K4 = Hex.decode("D07CF6CBB7F313BDDE66B727AFD3C5E8");
-    private byte[] N4 = Hex.decode("8408DFFF3C1A2B1292DC199E46B7D617");
-    private byte[] A4 = Hex.decode("33CCE2EABFF5A79D");
-    private byte[] P4 = Hex.decode("481C9E39B1");
-    private byte[] C4 = Hex.decode("632A9D131AD4C168A4225D8E1FF755939974A7BEDE");
-    private byte[] T4 = Hex.decode("D4C168A4225D8E1FF755939974A7BEDE");
-
-    private byte[] K5 = Hex.decode("35B6D0580005BBC12B0587124557D2C2");
-    private byte[] N5 = Hex.decode("FDB6B06676EEDC5C61D74276E1F8E816");
-    private byte[] A5 = Hex.decode("AEB96EAEBE2970E9");
-    private byte[] P5 = Hex.decode("40D0C07DA5E4");
-    private byte[] C5 = Hex.decode("071DFE16C675CB0677E536F73AFE6A14B74EE49844DD");
-    private byte[] T5 = Hex.decode("CB0677E536F73AFE6A14B74EE49844DD");
-
-    private byte[] K6 = Hex.decode("BD8E6E11475E60B268784C38C62FEB22");
-    private byte[] N6 = Hex.decode("6EAC5C93072D8E8513F750935E46DA1B");
-    private byte[] A6 = Hex.decode("D4482D1CA78DCE0F");
-    private byte[] P6 = Hex.decode("4DE3B35C3FC039245BD1FB7D");
-    private byte[] C6 = Hex.decode("835BB4F15D743E350E728414ABB8644FD6CCB86947C5E10590210A4F");
-    private byte[] T6 = Hex.decode("ABB8644FD6CCB86947C5E10590210A4F");
-
-    private byte[] K7 = Hex.decode("7C77D6E813BED5AC98BAA417477A2E7D");
-    private byte[] N7 = Hex.decode("1A8C98DCD73D38393B2BF1569DEEFC19");
-    private byte[] A7 = Hex.decode("65D2017990D62528");
-    private byte[] P7 = Hex.decode("8B0A79306C9CE7ED99DAE4F87F8DD61636");
-    private byte[] C7 = Hex.decode("02083E3979DA014812F59F11D52630DA30137327D10649B0AA6E1C181DB617D7F2");
-    private byte[] T7 = Hex.decode("137327D10649B0AA6E1C181DB617D7F2");
-
-    private byte[] K8 = Hex.decode("5FFF20CAFAB119CA2FC73549E20F5B0D");
-    private byte[] N8 = Hex.decode("DDE59B97D722156D4D9AFF2BC7559826");
-    private byte[] A8 = Hex.decode("54B9F04E6A09189A");
-    private byte[] P8 = Hex.decode("1BDA122BCE8A8DBAF1877D962B8592DD2D56");
-    private byte[] C8 = Hex.decode("2EC47B2C4954A489AFC7BA4897EDCDAE8CC33B60450599BD02C96382902AEF7F832A");
-    private byte[] T8 = Hex.decode("3B60450599BD02C96382902AEF7F832A");
-
-    private byte[] K9 = Hex.decode("A4A4782BCFFD3EC5E7EF6D8C34A56123");
-    private byte[] N9 = Hex.decode("B781FCF2F75FA5A8DE97A9CA48E522EC");
-    private byte[] A9 = Hex.decode("899A175897561D7E");
-    private byte[] P9 = Hex.decode("6CF36720872B8513F6EAB1A8A44438D5EF11");
-    private byte[] C9 = Hex.decode("0DE18FD0FDD91E7AF19F1D8EE8733938B1E8E7F6D2231618102FDB7FE55FF1991700");
-    private byte[] T9 = Hex.decode("E7F6D2231618102FDB7FE55FF1991700");
-
-    private byte[] K10 = Hex.decode("8395FCF1E95BEBD697BD010BC766AAC3");
-    private byte[] N10 = Hex.decode("22E7ADD93CFC6393C57EC0B3C17D6B44");
-    private byte[] A10 = Hex.decode("126735FCC320D25A");
-    private byte[] P10 = Hex.decode("CA40D7446E545FFAED3BD12A740A659FFBBB3CEAB7");
-    private byte[] C10 = Hex.decode("CB8920F87A6C75CFF39627B56E3ED197C552D295A7CFC46AFC253B4652B1AF3795B124AB6E");
-    private byte[] T10 = Hex.decode("CFC46AFC253B4652B1AF3795B124AB6E");
-
-    private byte[] K11 = Hex.decode("8395FCF1E95BEBD697BD010BC766AAC3");
-    private byte[] N11 = Hex.decode("22E7ADD93CFC6393C57EC0B3C17D6B44");
-    private byte[] A11 = Hex.decode("126735FCC320D25A");
-    private byte[] P11 = Hex.decode("CA40D7446E545FFAED3BD12A740A659FFBBB3CEAB7");
-    private byte[] C11 = Hex.decode("CB8920F87A6C75CFF39627B56E3ED197C552D295A7CFC46AFC");
-    private byte[] T11 = Hex.decode("CFC46AFC");
-
-    private static final int NONCE_LEN = 8;
-    private static final int MAC_LEN = 8;
-    private static final int AUTHEN_LEN = 20;
-
-    public String getName()
-    {
-        return "EAX";
-    }
-
-    public void performTest()
-        throws Exception
-    {
-        checkVectors(1, K1, 128, N1, A1, P1, T1, C1);
-        checkVectors(2, K2, 128, N2, A2, P2, T2, C2);
-        checkVectors(3, K3, 128, N3, A3, P3, T3, C3);
-        checkVectors(4, K4, 128, N4, A4, P4, T4, C4);
-        checkVectors(5, K5, 128, N5, A5, P5, T5, C5);
-        checkVectors(6, K6, 128, N6, A6, P6, T6, C6);
-        checkVectors(7, K7, 128, N7, A7, P7, T7, C7);
-        checkVectors(8, K8, 128, N8, A8, P8, T8, C8);
-        checkVectors(9, K9, 128, N9, A9, P9, T9, C9);
-        checkVectors(10, K10, 128, N10, A10, P10, T10, C10);
-        checkVectors(11, K11, 32, N11, A11, P11, T11, C11);
-
-        EAXBlockCipher eax = new EAXBlockCipher(new AESFastEngine());
-        ivParamTest(1, eax, K1, N1);
-
-        //
-        // exception tests
-        //
-
-        try
-        {
-            eax.init(false, new AEADParameters(new KeyParameter(K1), 32, N2, A2));
-
-            byte[] enc = new byte[C2.length];
-            int len = eax.processBytes(C2, 0, C2.length, enc, 0);
-
-            len += eax.doFinal(enc, len);
-
-            fail("invalid cipher text not picked up");
-        }
-        catch (InvalidCipherTextException e)
-        {
-            // expected
-        }
-
-        try
-        {
-            eax.init(false, new KeyParameter(K1));
-
-            fail("illegal argument not picked up");
-        }
-        catch (IllegalArgumentException e)
-        {
-            // expected
-        }
-
-        randomTests();
-        AEADTestUtil.testReset(this, new EAXBlockCipher(new AESEngine()), new EAXBlockCipher(new AESEngine()), new AEADParameters(new KeyParameter(K1), 32, N2));
-        AEADTestUtil.testTampering(this, eax, new AEADParameters(new KeyParameter(K1), 32, N2));
-        AEADTestUtil.testOutputSizes(this, new EAXBlockCipher(new AESEngine()), new AEADParameters(
-                new KeyParameter(K1), 32, N2));
-        AEADTestUtil.testBufferSizeChecks(this, new EAXBlockCipher(new AESEngine()), new AEADParameters(
-                new KeyParameter(K1), 32, N2));
-    }
-
-    private void checkVectors(
-        int count,
-        byte[] k,
-        int macSize,
-        byte[] n,
-        byte[] a,
-        byte[] p,
-        byte[] t,
-        byte[] c)
-        throws InvalidCipherTextException
-    {
-        byte[] fa = new byte[a.length / 2];
-        byte[] la = new byte[a.length - (a.length / 2)];
-        System.arraycopy(a, 0, fa, 0, fa.length);
-        System.arraycopy(a, fa.length, la, 0, la.length);
-
-        checkVectors(count, "all initial associated data", k, macSize, n, a, null, p, t, c);
-        checkVectors(count, "subsequent associated data", k, macSize, n, null, a, p, t, c);
-        checkVectors(count, "split associated data", k, macSize, n, fa, la, p, t, c);
-    }
-
-    private void checkVectors(
-        int count,
-        String additionalDataType,
-        byte[] k,
-        int macSize,
-        byte[] n,
-        byte[] a,
-        byte[] sa,
-        byte[] p,
-        byte[] t,
-        byte[] c)
-        throws InvalidCipherTextException
-    {
-        EAXBlockCipher encEax = new EAXBlockCipher(new AESFastEngine());
-        EAXBlockCipher decEax = new EAXBlockCipher(new AESFastEngine());
-
-        AEADParameters parameters = new AEADParameters(new KeyParameter(k), macSize, n, a);
-        encEax.init(true, parameters);
-        decEax.init(false, parameters);
-
-        runCheckVectors(count, encEax, decEax, additionalDataType, sa, p, t, c);
-        runCheckVectors(count, encEax, decEax, additionalDataType, sa, p, t, c);
-
-        // key reuse test
-        parameters = new AEADParameters(null, macSize, n, a);
-        encEax.init(true, parameters);
-        decEax.init(false, parameters);
-
-        runCheckVectors(count, encEax, decEax, additionalDataType, sa, p, t, c);
-        runCheckVectors(count, encEax, decEax, additionalDataType, sa, p, t, c);
-    }
-
-    private void runCheckVectors(
-        int count,
-        EAXBlockCipher encEax,
-        EAXBlockCipher decEax,
-        String additionalDataType,
-        byte[] sa,
-        byte[] p,
-        byte[] t,
-        byte[] c)
-        throws InvalidCipherTextException
-    {
-        byte[] enc = new byte[c.length];
-
-        if (sa != null)
-        {
-            encEax.processAADBytes(sa, 0, sa.length);
-        }
-
-        int len = encEax.processBytes(p, 0, p.length, enc, 0);
-
-        len += encEax.doFinal(enc, len);
-
-        if (!areEqual(c, enc))
-        {
-            fail("encrypted stream fails to match in test " + count + " with " + additionalDataType);
-        }
-
-        byte[] tmp = new byte[enc.length];
-
-        if (sa != null)
-        {
-            decEax.processAADBytes(sa, 0, sa.length);
-        }
-
-        len = decEax.processBytes(enc, 0, enc.length, tmp, 0);
-
-        len += decEax.doFinal(tmp, len);
-
-        byte[] dec = new byte[len];
-
-        System.arraycopy(tmp, 0, dec, 0, len);
-
-        if (!areEqual(p, dec))
-        {
-            fail("decrypted stream fails to match in test " + count + " with " + additionalDataType);
-        }
-
-        if (!areEqual(t, decEax.getMac()))
-        {
-            fail("MAC fails to match in test " + count + " with " + additionalDataType);
-        }
-    }
-
-    private void ivParamTest(
-        int count,
-        AEADBlockCipher eax,
-        byte[] k,
-        byte[] n)
-        throws InvalidCipherTextException
-    {
-        byte[] p = Strings.toByteArray("hello world!!");
-
-        eax.init(true, new ParametersWithIV(new KeyParameter(k), n));
-
-        byte[] enc = new byte[p.length + 8];
-
-        int len = eax.processBytes(p, 0, p.length, enc, 0);
-
-        len += eax.doFinal(enc, len);
-
-        eax.init(false, new ParametersWithIV(new KeyParameter(k), n));
-
-        byte[] tmp = new byte[enc.length];
-
-        len = eax.processBytes(enc, 0, enc.length, tmp, 0);
-
-        len += eax.doFinal(tmp, len);
-
-        byte[] dec = new byte[len];
-
-        System.arraycopy(tmp, 0, dec, 0, len);
-
-        if (!areEqual(p, dec))
-        {
-            fail("decrypted stream fails to match in test " + count);
-        }
-    }
-
-    private void randomTests()
-        throws InvalidCipherTextException
-    {
-        SecureRandom srng = new SecureRandom();
-        for (int i = 0; i < 10; ++i)
-        {
-            randomTest(srng);
-        }
-    }
-
-    private void randomTest(
-        SecureRandom srng)
-        throws InvalidCipherTextException
-    {
-        int DAT_LEN = srng.nextInt() >>> 22; // Note: JDK1.0 compatibility
-        byte[] nonce = new byte[NONCE_LEN];
-        byte[] authen = new byte[AUTHEN_LEN];
-        byte[] datIn = new byte[DAT_LEN];
-        byte[] key = new byte[16];
-        srng.nextBytes(nonce);
-        srng.nextBytes(authen);
-        srng.nextBytes(datIn);
-        srng.nextBytes(key);
-
-        AESFastEngine engine = new AESFastEngine();
-        KeyParameter sessKey = new KeyParameter(key);
-        EAXBlockCipher eaxCipher = new EAXBlockCipher(engine);
-
-        AEADParameters params = new AEADParameters(sessKey, MAC_LEN * 8, nonce, authen);
-        eaxCipher.init(true, params);
-
-        byte[] intrDat = new byte[eaxCipher.getOutputSize(datIn.length)];
-        int outOff = eaxCipher.processBytes(datIn, 0, DAT_LEN, intrDat, 0);
-        outOff += eaxCipher.doFinal(intrDat, outOff);
-
-        eaxCipher.init(false, params);
-        byte[] datOut = new byte[eaxCipher.getOutputSize(outOff)];
-        int resultLen = eaxCipher.processBytes(intrDat, 0, outOff, datOut, 0);
-        eaxCipher.doFinal(datOut, resultLen);
-
-        if (!areEqual(datIn, datOut))
-        {
-            fail("EAX roundtrip failed to match");
-        }
-    }
-
-    public static void main(String[] args)
-    {
-        runTest(new EAXTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/ECDHKEKGeneratorTest.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/ECDHKEKGeneratorTest.java
deleted file mode 100644
index d75b139..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/ECDHKEKGeneratorTest.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.nist.NISTObjectIdentifiers;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.crypto.DerivationFunction;
-import org.bouncycastle.crypto.DerivationParameters;
-import org.bouncycastle.crypto.agreement.kdf.DHKDFParameters;
-import org.bouncycastle.crypto.agreement.kdf.ECDHKEKGenerator;
-import org.bouncycastle.crypto.digests.SHA1Digest;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-
-/**
- * ECDHKEK Generator tests.
- */
-public class ECDHKEKGeneratorTest
-    extends SimpleTest
-{
-    private byte[] seed1 = Hex.decode("db4a8daba1f98791d54e940175dd1a5f3a0826a1066aa9b668d4dc1e1e0790158dcad1533c03b44214d1b61fefa8b579");
-    private ASN1ObjectIdentifier alg1 = NISTObjectIdentifiers.id_aes256_wrap;
-    private byte[] result1 = Hex.decode("8ecc6d85caf25eaba823a7d620d4ab0d33e4c645f2");
-
-    private byte[] seed2 = Hex.decode("75d7487b5d3d2bfb3c69ce0365fe64e3bfab5d0d63731628a9f47eb8fddfa28c65decaf228a0b38f0c51c6a3356d7c56");
-    private ASN1ObjectIdentifier alg2 = NISTObjectIdentifiers.id_aes128_wrap;
-    private byte[] result2 = Hex.decode("042be1faca3a4a8fc859241bfb87ba35");
-
-    private byte[] seed3 = Hex.decode("fdeb6d809f997e8ac174d638734dc36d37aaf7e876e39967cd82b1cada3de772449788461ee7f856bad9305627f8e48b");
-    private ASN1ObjectIdentifier alg3 = PKCSObjectIdentifiers.id_alg_CMS3DESwrap;
-    private byte[] result3 = Hex.decode("bcd701fc92109b1b9d6f3b6497ad5ca9627fa8a597010305");
-
-    public ECDHKEKGeneratorTest()
-    {
-    }
-
-    public void performTest()
-    {
-        checkMask(1, new ECDHKEKGenerator(new SHA1Digest()), new DHKDFParameters(alg1, 256, seed1), result1);
-        checkMask(2, new ECDHKEKGenerator(new SHA1Digest()), new DHKDFParameters(alg2, 128, seed2), result2);
-        checkMask(3, new ECDHKEKGenerator(new SHA1Digest()), new DHKDFParameters(alg3, 192, seed3), result3);
-    }
-
-    private void checkMask(
-        int                count,
-        DerivationFunction kdf,
-        DerivationParameters params,
-        byte[]             result)
-    {
-        byte[]             data = new byte[result.length];
-
-        kdf.init(params);
-
-        kdf.generateBytes(data, 0, data.length);
-
-        if (!areEqual(result, data))
-        {
-            fail("ECDHKEKGenerator failed generator test " + count);
-        }
-    }
-
-    public String getName()
-    {
-        return "ECDHKEKGenerator";
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        runTest(new ECDHKEKGeneratorTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/ECGOST3410Test.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/ECGOST3410Test.java
deleted file mode 100644
index 175835c..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/ECGOST3410Test.java
+++ /dev/null
@@ -1,327 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import java.math.BigInteger;
-import java.security.SecureRandom;
-
-import org.bouncycastle.crypto.AsymmetricCipherKeyPair;
-import org.bouncycastle.crypto.digests.GOST3411Digest;
-import org.bouncycastle.crypto.generators.ECKeyPairGenerator;
-import org.bouncycastle.crypto.params.ECDomainParameters;
-import org.bouncycastle.crypto.params.ECKeyGenerationParameters;
-import org.bouncycastle.crypto.params.ECPrivateKeyParameters;
-import org.bouncycastle.crypto.params.ECPublicKeyParameters;
-import org.bouncycastle.crypto.params.ParametersWithRandom;
-import org.bouncycastle.crypto.signers.ECGOST3410Signer;
-import org.bouncycastle.math.ec.ECConstants;
-import org.bouncycastle.math.ec.ECCurve;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.FixedSecureRandom;
-import org.bouncycastle.util.test.SimpleTest;
-
-/**
- *  ECGOST3410 tests are taken from GOST R 34.10-2001.
- */
-public class ECGOST3410Test
-    extends SimpleTest
- {
-    byte[] hashmessage = Hex.decode("3042453136414534424341374533364339313734453431443642453241453435");
-    
-     /**
-     * ECGOST3410 over the field Fp<br>
-     */
-    BigInteger r = new BigInteger("29700980915817952874371204983938256990422752107994319651632687982059210933395");
-    BigInteger s = new BigInteger("574973400270084654178925310019147038455227042649098563933718999175515839552");
-
-    byte[] kData = new BigInteger("53854137677348463731403841147996619241504003434302020712960838528893196233395").toByteArray();
-
-    SecureRandom    k = new FixedSecureRandom(kData);
-
-    private void ecGOST3410_TEST()
-    {
-        BigInteger mod_p = new BigInteger("57896044618658097711785492504343953926634992332820282019728792003956564821041"); //p
-        BigInteger mod_q = new BigInteger("57896044618658097711785492504343953927082934583725450622380973592137631069619");
-
-        ECCurve.Fp curve = new ECCurve.Fp(
-            mod_p, // p
-            new BigInteger("7"), // a
-            new BigInteger("43308876546767276905765904595650931995942111794451039583252968842033849580414"), // b
-            mod_q, ECConstants.ONE);
-
-        ECDomainParameters params = new ECDomainParameters(
-            curve,
-            curve.createPoint(
-                new BigInteger("2"), // x
-                new BigInteger("4018974056539037503335449422937059775635739389905545080690979365213431566280")), // y
-            mod_q);
-
-        ECPrivateKeyParameters priKey = new ECPrivateKeyParameters(
-            new BigInteger("55441196065363246126355624130324183196576709222340016572108097750006097525544"), // d
-            params);
-
-        ParametersWithRandom param = new ParametersWithRandom(priKey, k);
-
-        ECGOST3410Signer ecgost3410 = new ECGOST3410Signer();
-
-        ecgost3410.init(true, param);
-
-        byte[] mVal = new BigInteger("20798893674476452017134061561508270130637142515379653289952617252661468872421").toByteArray();
-        byte[] message = new byte[mVal.length];
-        
-        for (int i = 0; i != mVal.length; i++)
-        {
-            message[i] = mVal[mVal.length - 1 - i];
-        }
-        
-        BigInteger[] sig = ecgost3410.generateSignature(message);
-
-        if (!r.equals(sig[0]))
-        {
-            fail("r component wrong.", r, sig[0]);
-        }
-
-        if (!s.equals(sig[1]))
-        {
-            fail("s component wrong.", s, sig[1]);
-        }
-
-        // Verify the signature
-        ECPublicKeyParameters pubKey = new ECPublicKeyParameters(
-            curve.createPoint(
-                new BigInteger("57520216126176808443631405023338071176630104906313632182896741342206604859403"), // x
-                new BigInteger("17614944419213781543809391949654080031942662045363639260709847859438286763994")), // y
-            params);
-
-        ecgost3410.init(false, pubKey);
-        if (!ecgost3410.verifySignature(message, sig[0], sig[1]))
-        {
-            fail("verification fails");
-        }
-    }
-
-    /**
-     * Test Sign & Verify with test parameters
-     * see: http://www.ietf.org/internet-drafts/draft-popov-cryptopro-cpalgs-01.txt
-     * gostR3410-2001-TestParamSet  P.46
-     */
-    private void ecGOST3410_TestParam()
-    {
-        SecureRandom    random = new SecureRandom();
-
-        BigInteger mod_p = new BigInteger("57896044618658097711785492504343953926634992332820282019728792003956564821041"); //p
-        BigInteger mod_q = new BigInteger("57896044618658097711785492504343953927082934583725450622380973592137631069619");
-
-        ECCurve.Fp curve = new ECCurve.Fp(
-            mod_p, // p
-            new BigInteger("7"), // a
-            new BigInteger("43308876546767276905765904595650931995942111794451039583252968842033849580414"), // b
-            mod_q, ECConstants.ONE);
-
-        ECDomainParameters params = new ECDomainParameters(
-            curve,
-            curve.createPoint(
-                new BigInteger("2"), // x
-                new BigInteger("4018974056539037503335449422937059775635739389905545080690979365213431566280")), // y
-            mod_q);
-
-        ECKeyPairGenerator          pGen = new ECKeyPairGenerator();
-        ECKeyGenerationParameters   genParam = new ECKeyGenerationParameters(
-                                        params,
-                                        random);
-
-        pGen.init(genParam);
-
-        AsymmetricCipherKeyPair  pair = pGen.generateKeyPair();
-
-        ParametersWithRandom param = new ParametersWithRandom(pair.getPrivate(), random);
-
-        ECGOST3410Signer ecgost3410 = new ECGOST3410Signer();
-
-        ecgost3410.init(true, param);
-
-        //get hash message using the digest GOST3411.
-        byte[] message = "Message for sign".getBytes();
-        GOST3411Digest  gost3411 = new GOST3411Digest();
-        gost3411.update(message, 0, message.length);
-        byte[] hashmessage = new byte[gost3411.getDigestSize()];
-        gost3411.doFinal(hashmessage, 0);
-
-        BigInteger[] sig = ecgost3410.generateSignature(hashmessage);
-
-        ecgost3410.init(false, pair.getPublic());
-
-        if (!ecgost3410.verifySignature(hashmessage, sig[0], sig[1]))
-        {
-            fail("signature fails");
-        }
-    }
-
-    /**
-     * Test Sign & Verify with A parameters
-     * see: http://www.ietf.org/internet-drafts/draft-popov-cryptopro-cpalgs-01.txt
-     * gostR3410-2001-CryptoPro-A-ParamSet  P.47
-     */
-    public void ecGOST3410_AParam()
-    {
-        SecureRandom random = new SecureRandom();
-
-        BigInteger mod_p = new BigInteger("115792089237316195423570985008687907853269984665640564039457584007913129639319"); //p
-        BigInteger mod_q = new BigInteger("115792089237316195423570985008687907853073762908499243225378155805079068850323");
-
-        ECCurve.Fp curve = new ECCurve.Fp(
-            mod_p, // p
-            new BigInteger("115792089237316195423570985008687907853269984665640564039457584007913129639316"), // a
-            new BigInteger("166"), // b
-            mod_q, ECConstants.ONE);
-
-        ECDomainParameters params = new ECDomainParameters(
-            curve,
-            curve.createPoint(
-                new BigInteger("1"), // x
-                new BigInteger("64033881142927202683649881450433473985931760268884941288852745803908878638612")), // y
-            mod_q);
-
-        ECKeyPairGenerator          pGen = new ECKeyPairGenerator();
-        ECKeyGenerationParameters   genParam = new ECKeyGenerationParameters(
-                                        params,
-                                        random);
-
-        pGen.init(genParam);
-
-        AsymmetricCipherKeyPair  pair = pGen.generateKeyPair();
-
-        ParametersWithRandom param = new ParametersWithRandom(pair.getPrivate(), random);
-
-        ECGOST3410Signer ecgost3410 = new ECGOST3410Signer();
-
-        ecgost3410.init(true, param);
-
-        BigInteger[] sig = ecgost3410.generateSignature(hashmessage);
-
-        ecgost3410.init(false, pair.getPublic());
-
-        if (!ecgost3410.verifySignature(hashmessage, sig[0], sig[1]))
-        {
-            fail("signature fails");
-        }
-    }
-
-    /**
-     * Test Sign & Verify with B parameters
-     * see: http://www.ietf.org/internet-drafts/draft-popov-cryptopro-cpalgs-01.txt
-     * gostR3410-2001-CryptoPro-B-ParamSet  P.47-48
-     */
-    private void ecGOST3410_BParam()
-    {
-        SecureRandom    random = new SecureRandom();
-
-        BigInteger mod_p = new BigInteger("57896044618658097711785492504343953926634992332820282019728792003956564823193"); //p
-        BigInteger mod_q = new BigInteger("57896044618658097711785492504343953927102133160255826820068844496087732066703");
-
-        ECCurve.Fp curve = new ECCurve.Fp(
-            mod_p, // p
-            new BigInteger("57896044618658097711785492504343953926634992332820282019728792003956564823190"), // a
-            new BigInteger("28091019353058090096996979000309560759124368558014865957655842872397301267595"), // b
-            mod_q, ECConstants.ONE);
-
-        ECDomainParameters params = new ECDomainParameters(
-            curve,
-            curve.createPoint(
-                new BigInteger("1"), // x
-                new BigInteger("28792665814854611296992347458380284135028636778229113005756334730996303888124")), // y
-            mod_q);
-
-        ECKeyPairGenerator          pGen = new ECKeyPairGenerator();
-        ECKeyGenerationParameters   genParam = new ECKeyGenerationParameters(
-                                        params,
-                                        random);
-
-        pGen.init(genParam);
-
-        AsymmetricCipherKeyPair  pair = pGen.generateKeyPair();
-
-        ParametersWithRandom param = new ParametersWithRandom(pair.getPrivate(), random);
-
-        ECGOST3410Signer ecgost3410 = new ECGOST3410Signer();
-
-        ecgost3410.init(true, param);
-
-        BigInteger[] sig = ecgost3410.generateSignature(hashmessage);
-
-        ecgost3410.init(false, pair.getPublic());
-
-        if (!ecgost3410.verifySignature(hashmessage, sig[0], sig[1]))
-        {
-            fail("signature fails");
-        }
-    }
-
-    /**
-     * Test Sign & Verify with C parameters
-     * see: http://www.ietf.org/internet-drafts/draft-popov-cryptopro-cpalgs-01.txt
-     * gostR3410-2001-CryptoPro-C-ParamSet  P.48
-     */
-    private void ecGOST3410_CParam()
-    {
-        SecureRandom    random = new SecureRandom();
-
-        BigInteger mod_p = new BigInteger("70390085352083305199547718019018437841079516630045180471284346843705633502619"); //p
-        BigInteger mod_q = new BigInteger("70390085352083305199547718019018437840920882647164081035322601458352298396601");
-
-        ECCurve.Fp curve = new ECCurve.Fp(
-            mod_p, // p
-            new BigInteger("70390085352083305199547718019018437841079516630045180471284346843705633502616"), // a
-            new BigInteger("32858"), // b
-            mod_q, ECConstants.ONE);
-
-        ECDomainParameters params = new ECDomainParameters(
-            curve,
-            curve.createPoint(
-                new BigInteger("0"), // x
-                new BigInteger("29818893917731240733471273240314769927240550812383695689146495261604565990247")), // y
-            mod_q);
-
-        ECKeyPairGenerator          pGen = new ECKeyPairGenerator();
-        ECKeyGenerationParameters   genParam = new ECKeyGenerationParameters(
-                                        params,
-                                        random);
-
-        pGen.init(genParam);
-
-        AsymmetricCipherKeyPair  pair = pGen.generateKeyPair();
-
-        ParametersWithRandom param = new ParametersWithRandom(pair.getPrivate(), random);
-
-        ECGOST3410Signer ecgost3410 = new ECGOST3410Signer();
-
-        ecgost3410.init(true, param);
-
-        BigInteger[] sig = ecgost3410.generateSignature(hashmessage);
-
-        ecgost3410.init(false, pair.getPublic());
-
-        if (!ecgost3410.verifySignature(hashmessage, sig[0], sig[1]))
-        {
-            fail("signature fails");
-        }
-    }
-
-    public String getName()
-    {
-        return "ECGOST3410";
-    }
-
-    public void performTest()
-    {
-        ecGOST3410_TEST();
-        ecGOST3410_TestParam();
-        ecGOST3410_AParam();
-        ecGOST3410_BParam();
-        ecGOST3410_CParam();
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        runTest(new ECGOST3410Test());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/ECIESKeyEncapsulationTest.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/ECIESKeyEncapsulationTest.java
deleted file mode 100644
index 64d19f5..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/ECIESKeyEncapsulationTest.java
+++ /dev/null
@@ -1,138 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import java.security.SecureRandom;
-
-import org.bouncycastle.asn1.sec.SECNamedCurves;
-import org.bouncycastle.asn1.x9.X9ECParameters;
-import org.bouncycastle.crypto.AsymmetricCipherKeyPair;
-import org.bouncycastle.crypto.digests.SHA1Digest;
-import org.bouncycastle.crypto.generators.ECKeyPairGenerator;
-import org.bouncycastle.crypto.generators.KDF2BytesGenerator;
-import org.bouncycastle.crypto.kems.ECIESKeyEncapsulation;
-import org.bouncycastle.crypto.params.ECDomainParameters;
-import org.bouncycastle.crypto.params.ECKeyGenerationParameters;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.util.test.SimpleTest;
-
-/**
- * Tests for the ECIES Key Encapsulation Mechanism
- */
-public class ECIESKeyEncapsulationTest
-    extends SimpleTest
-{
-    public String getName()
-    {
-        return "ECIESKeyEncapsulation";
-    }
-
-    public void performTest()
-        throws Exception
-    {
-        
-        // Set EC domain parameters and generate key pair
-        X9ECParameters            spec     = SECNamedCurves.getByName("secp224r1");
-        ECDomainParameters        ecDomain = new ECDomainParameters(spec.getCurve(), spec.getG(), spec.getN());
-        ECKeyPairGenerator        ecGen    = new ECKeyPairGenerator();
-
-        ecGen.init(new ECKeyGenerationParameters(ecDomain, new SecureRandom()));
-
-        AsymmetricCipherKeyPair    keys      = ecGen.generateKeyPair();
-        
-        // Set ECIES-KEM parameters
-        ECIESKeyEncapsulation     kem;
-        KDF2BytesGenerator        kdf = new KDF2BytesGenerator(new SHA1Digest());
-        SecureRandom            rnd = new SecureRandom();
-        byte[]                    out = new byte[57];
-        KeyParameter            key1, key2;
-        
-        // Test basic ECIES-KEM
-        kem = new ECIESKeyEncapsulation(kdf, rnd);
-        
-        kem.init(keys.getPublic());
-        key1 = (KeyParameter)kem.encrypt(out, 128);
-        
-        kem.init(keys.getPrivate());
-        key2 = (KeyParameter)kem.decrypt(out, 128);
-
-        if (!areEqual(key1.getKey(), key2.getKey()))
-        {
-            fail("failed basic test");
-        }
-
-        // Test ECIES-KEM using new cofactor mode
-        kem = new ECIESKeyEncapsulation(kdf, rnd, true, false, false);
-        
-        kem.init(keys.getPublic());
-        key1 = (KeyParameter)kem.encrypt(out, 128);
-        
-        kem.init(keys.getPrivate());
-        key2 = (KeyParameter)kem.decrypt(out, 128);
-
-        if (!areEqual(key1.getKey(), key2.getKey()))
-        {
-            fail("failed cofactor test");
-        }
-
-        // Test ECIES-KEM using old cofactor mode
-        kem = new ECIESKeyEncapsulation(kdf, rnd, false, true, false);
-        
-        kem.init(keys.getPublic());
-        key1 = (KeyParameter)kem.encrypt(out, 128);
-    
-        kem.init(keys.getPrivate());
-        key2 = (KeyParameter)kem.decrypt(out, 128);
-
-        if (!areEqual(key1.getKey(), key2.getKey()))
-        {
-            fail("failed old cofactor test");
-        }
-
-        // Test ECIES-KEM using single hash mode
-        kem = new ECIESKeyEncapsulation(kdf, rnd, false, false, true);
-        
-        kem.init(keys.getPublic());
-        key1 = (KeyParameter)kem.encrypt(out, 128);
-        
-        kem.init(keys.getPrivate());
-        key2 = (KeyParameter)kem.decrypt(out, 128);
-
-        if (!areEqual(key1.getKey(), key2.getKey()))
-        {
-            fail("failed single hash test");
-        }
-
-        // Test ECIES-KEM using new cofactor mode and single hash mode
-        kem = new ECIESKeyEncapsulation(kdf, rnd, true, false, true);
-        
-        kem.init(keys.getPublic());
-        key1 = (KeyParameter)kem.encrypt(out, 128);
-        
-        kem.init(keys.getPrivate());
-        key2 = (KeyParameter)kem.decrypt(out, 128);
-
-        if (!areEqual(key1.getKey(), key2.getKey()))
-        {
-            fail("failed cofactor and single hash test");
-        }
-
-        // Test ECIES-KEM using old cofactor mode and single hash mode
-        kem = new ECIESKeyEncapsulation(kdf, rnd, false, true, true);
-        
-        kem.init(keys.getPublic());
-        key1 = (KeyParameter)kem.encrypt(out, 128);
-        
-        kem.init(keys.getPrivate());
-        key2 = (KeyParameter)kem.decrypt(out, 128);
-
-        if (!areEqual(key1.getKey(), key2.getKey()))
-        {
-            fail("failed old cofactor and single hash test");
-        }
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        runTest(new ECIESKeyEncapsulationTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/ECIESTest.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/ECIESTest.java
deleted file mode 100644
index 8cf100b..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/ECIESTest.java
+++ /dev/null
@@ -1,379 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import java.math.BigInteger;
-import java.security.SecureRandom;
-
-import org.bouncycastle.crypto.AsymmetricCipherKeyPair;
-import org.bouncycastle.crypto.BufferedBlockCipher;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.KeyEncoder;
-import org.bouncycastle.crypto.KeyGenerationParameters;
-import org.bouncycastle.crypto.agreement.ECDHBasicAgreement;
-import org.bouncycastle.crypto.digests.SHA1Digest;
-import org.bouncycastle.crypto.engines.IESEngine;
-import org.bouncycastle.crypto.engines.TwofishEngine;
-import org.bouncycastle.crypto.generators.ECKeyPairGenerator;
-import org.bouncycastle.crypto.generators.EphemeralKeyPairGenerator;
-import org.bouncycastle.crypto.generators.KDF2BytesGenerator;
-import org.bouncycastle.crypto.macs.HMac;
-import org.bouncycastle.crypto.modes.CBCBlockCipher;
-import org.bouncycastle.crypto.paddings.PaddedBufferedBlockCipher;
-import org.bouncycastle.crypto.params.AsymmetricKeyParameter;
-import org.bouncycastle.crypto.params.ECDomainParameters;
-import org.bouncycastle.crypto.params.ECKeyGenerationParameters;
-import org.bouncycastle.crypto.params.ECPrivateKeyParameters;
-import org.bouncycastle.crypto.params.ECPublicKeyParameters;
-import org.bouncycastle.crypto.params.IESParameters;
-import org.bouncycastle.crypto.params.IESWithCipherParameters;
-import org.bouncycastle.crypto.params.ParametersWithIV;
-import org.bouncycastle.crypto.parsers.ECIESPublicKeyParser;
-import org.bouncycastle.math.ec.ECConstants;
-import org.bouncycastle.math.ec.ECCurve;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-
-/**
- * test for ECIES - Elliptic Curve Integrated Encryption Scheme
- */
-public class ECIESTest
-    extends SimpleTest
-{
-    private static byte[] TWOFISH_IV = Hex.decode("000102030405060708090a0b0c0d0e0f");
-
-    ECIESTest()
-    {
-    }
-
-    public String getName()
-    {
-        return "ECIES";
-    }
-
-    private void doStaticTest(byte[] iv)
-        throws Exception
-    {
-        BigInteger n = new BigInteger("6277101735386680763835789423176059013767194773182842284081");
-
-        ECCurve.Fp curve = new ECCurve.Fp(
-            new BigInteger("6277101735386680763835789423207666416083908700390324961279"), // q
-            new BigInteger("fffffffffffffffffffffffffffffffefffffffffffffffc", 16), // a
-            new BigInteger("64210519e59c80e70fa7e9ab72243049feb8deecc146b9b1", 16), // b
-            n, ECConstants.ONE);
-
-        ECDomainParameters params = new ECDomainParameters(
-                curve,
-                curve.decodePoint(Hex.decode("03188da80eb03090f67cbf20eb43a18800f4ff0afd82ff1012")), // G
-                n);
-
-        ECPrivateKeyParameters priKey = new ECPrivateKeyParameters(
-            new BigInteger("651056770906015076056810763456358567190100156695615665659"), // d
-            params);
-
-        ECPublicKeyParameters pubKey = new ECPublicKeyParameters(
-            curve.decodePoint(Hex.decode("0262b12d60690cdcf330babab6e69763b471f994dd702d16a5")), // Q
-            params);
-
-        AsymmetricCipherKeyPair  p1 = new AsymmetricCipherKeyPair(pubKey, priKey);
-        AsymmetricCipherKeyPair  p2 = new AsymmetricCipherKeyPair(pubKey, priKey);
-
-        //
-        // stream test
-        //
-        IESEngine i1 = new IESEngine(
-                                   new ECDHBasicAgreement(),
-                                   new KDF2BytesGenerator(new SHA1Digest()),
-                                   new HMac(new SHA1Digest()));
-        IESEngine i2 = new IESEngine(
-                                   new ECDHBasicAgreement(),
-                                   new KDF2BytesGenerator(new SHA1Digest()),
-                                   new HMac(new SHA1Digest()));
-        byte[]         d = new byte[] { 1, 2, 3, 4, 5, 6, 7, 8 };
-        byte[]         e = new byte[] { 8, 7, 6, 5, 4, 3, 2, 1 };
-        CipherParameters p = new IESParameters(d, e, 64);
-
-        i1.init(true, p1.getPrivate(), p2.getPublic(), p);
-        i2.init(false, p2.getPrivate(), p1.getPublic(), p);
-
-        byte[] message = Hex.decode("1234567890abcdef");
-
-        byte[]   out1 = i1.processBlock(message, 0, message.length);
-
-        if (!areEqual(out1, Hex.decode("468d89877e8238802403ec4cb6b329faeccfa6f3a730f2cdb3c0a8e8")))
-        {
-            fail("stream cipher test failed on enc");
-        }
-
-        byte[]   out2 = i2.processBlock(out1, 0, out1.length);
-
-        if (!areEqual(out2, message))
-        {
-            fail("stream cipher test failed");
-        }
-
-        //
-        // twofish with CBC
-        //
-        BufferedBlockCipher c1 = new PaddedBufferedBlockCipher(
-                                    new CBCBlockCipher(new TwofishEngine()));
-        BufferedBlockCipher c2 = new PaddedBufferedBlockCipher(
-                                    new CBCBlockCipher(new TwofishEngine()));
-        i1 = new IESEngine(
-                       new ECDHBasicAgreement(),
-                       new KDF2BytesGenerator(new SHA1Digest()),
-                       new HMac(new SHA1Digest()),
-                       c1);
-        i2 = new IESEngine(
-                       new ECDHBasicAgreement(),
-                       new KDF2BytesGenerator(new SHA1Digest()),
-                       new HMac(new SHA1Digest()),
-                       c2);
-        d = new byte[] { 1, 2, 3, 4, 5, 6, 7, 8 };
-        e = new byte[] { 8, 7, 6, 5, 4, 3, 2, 1 };
-        p = new IESWithCipherParameters(d, e, 64, 128);
-
-        if (iv != null)
-        {
-            p = new ParametersWithIV(p, iv);
-        }
-
-        i1.init(true, p1.getPrivate(), p2.getPublic(), p);
-        i2.init(false, p2.getPrivate(), p1.getPublic(), p);
-
-        message = Hex.decode("1234567890abcdef");
-
-        out1 = i1.processBlock(message, 0, message.length);
-
-        if (!areEqual(out1, (iv == null) ?
-                                  Hex.decode("b8a06ea5c2b9df28b58a0a90a734cde8c9c02903e5c220021fe4417410d1e53a32a71696")
-                                : Hex.decode("f246b0e26a2711992cac9c590d08e45c5e730b7c0f4218bb064e27b7dd7c8a3bd8bf01c3")))
-        {
-            fail("twofish cipher test failed on enc");
-        }
-
-        out2 = i2.processBlock(out1, 0, out1.length);
-
-        if (!areEqual(out2, message))
-        {
-            fail("twofish cipher test failed");
-        }
-    }
-
-    private void doEphemeralTest(byte[] iv, final boolean usePointCompression)
-        throws Exception
-    {
-        BigInteger n = new BigInteger("6277101735386680763835789423176059013767194773182842284081");
-
-        ECCurve.Fp curve = new ECCurve.Fp(
-            new BigInteger("6277101735386680763835789423207666416083908700390324961279"), // q
-            new BigInteger("fffffffffffffffffffffffffffffffefffffffffffffffc", 16), // a
-            new BigInteger("64210519e59c80e70fa7e9ab72243049feb8deecc146b9b1", 16), // b
-            n, ECConstants.ONE);
-
-        ECDomainParameters params = new ECDomainParameters(
-                curve,
-                curve.decodePoint(Hex.decode("03188da80eb03090f67cbf20eb43a18800f4ff0afd82ff1012")), // G
-                n);
-
-        ECPrivateKeyParameters priKey = new ECPrivateKeyParameters(
-            new BigInteger("651056770906015076056810763456358567190100156695615665659"), // d
-            params);
-
-        ECPublicKeyParameters pubKey = new ECPublicKeyParameters(
-            curve.decodePoint(Hex.decode("0262b12d60690cdcf330babab6e69763b471f994dd702d16a5")), // Q
-            params);
-
-        AsymmetricCipherKeyPair  p1 = new AsymmetricCipherKeyPair(pubKey, priKey);
-        AsymmetricCipherKeyPair  p2 = new AsymmetricCipherKeyPair(pubKey, priKey);
-
-        // Generate the ephemeral key pair
-        ECKeyPairGenerator gen = new ECKeyPairGenerator();
-        gen.init(new ECKeyGenerationParameters(params, new SecureRandom()));
-
-        EphemeralKeyPairGenerator ephKeyGen = new EphemeralKeyPairGenerator(gen, new KeyEncoder()
-        {
-            public byte[] getEncoded(AsymmetricKeyParameter keyParameter)
-            {
-                return ((ECPublicKeyParameters)keyParameter).getQ().getEncoded(usePointCompression);
-            }
-        });
-
-        //
-        // stream test
-        //
-        IESEngine i1 = new IESEngine(
-                                   new ECDHBasicAgreement(),
-                                   new KDF2BytesGenerator(new SHA1Digest()),
-                                   new HMac(new SHA1Digest()));
-        IESEngine i2 = new IESEngine(
-                                   new ECDHBasicAgreement(),
-                                   new KDF2BytesGenerator(new SHA1Digest()),
-                                   new HMac(new SHA1Digest()));
-
-        byte[]            d = new byte[] { 1, 2, 3, 4, 5, 6, 7, 8 };
-        byte[]            e = new byte[] { 8, 7, 6, 5, 4, 3, 2, 1 };
-        CipherParameters  p = new IESParameters(d, e, 64);
-
-        i1.init(p2.getPublic(), p, ephKeyGen);
-        i2.init(p2.getPrivate(), p, new ECIESPublicKeyParser(params));
-
-        byte[] message = Hex.decode("1234567890abcdef");
-
-        byte[]   out1 = i1.processBlock(message, 0, message.length);
-
-        byte[]   out2 = i2.processBlock(out1, 0, out1.length);
-
-        if (!areEqual(out2, message))
-        {
-            fail("stream cipher test failed");
-        }
-
-        //
-        // twofish with CBC
-        //
-        BufferedBlockCipher c1 = new PaddedBufferedBlockCipher(
-                                    new CBCBlockCipher(new TwofishEngine()));
-        BufferedBlockCipher c2 = new PaddedBufferedBlockCipher(
-                                    new CBCBlockCipher(new TwofishEngine()));
-        i1 = new IESEngine(
-                       new ECDHBasicAgreement(),
-                       new KDF2BytesGenerator(new SHA1Digest()),
-                       new HMac(new SHA1Digest()),
-                       c1);
-        i2 = new IESEngine(
-                       new ECDHBasicAgreement(),
-                       new KDF2BytesGenerator(new SHA1Digest()),
-                       new HMac(new SHA1Digest()),
-                       c2);
-        d = new byte[] { 1, 2, 3, 4, 5, 6, 7, 8 };
-        e = new byte[] { 8, 7, 6, 5, 4, 3, 2, 1 };
-        p = new IESWithCipherParameters(d, e, 64, 128);
-
-        if (iv != null)
-        {
-            p = new ParametersWithIV(p, iv);
-        }
-
-        i1.init(p2.getPublic(), p, ephKeyGen);
-        i2.init(p2.getPrivate(), p, new ECIESPublicKeyParser(params));
-
-        message = Hex.decode("1234567890abcdef");
-
-        out1 = i1.processBlock(message, 0, message.length);
-
-        out2 = i2.processBlock(out1, 0, out1.length);
-
-        if (!areEqual(out2, message))
-        {
-            fail("twofish cipher test failed");
-        }
-    }
-
-    private void doTest(AsymmetricCipherKeyPair p1, AsymmetricCipherKeyPair p2)
-        throws Exception
-    {
-        //
-        // stream test
-        //
-        IESEngine i1 = new IESEngine(
-                                   new ECDHBasicAgreement(),
-                                   new KDF2BytesGenerator(new SHA1Digest()),
-                                   new HMac(new SHA1Digest()));
-        IESEngine i2 = new IESEngine(
-                                   new ECDHBasicAgreement(),
-                                   new KDF2BytesGenerator(new SHA1Digest()),
-                                   new HMac(new SHA1Digest()));
-        byte[]         d = new byte[] { 1, 2, 3, 4, 5, 6, 7, 8 };
-        byte[]         e = new byte[] { 8, 7, 6, 5, 4, 3, 2, 1 };
-        IESParameters  p = new IESParameters(d, e, 64);
-
-        i1.init(true, p1.getPrivate(), p2.getPublic(), p);
-        i2.init(false, p2.getPrivate(), p1.getPublic(), p);
-
-        byte[] message = Hex.decode("1234567890abcdef");
-
-        byte[]   out1 = i1.processBlock(message, 0, message.length);
- 
-        byte[]   out2 = i2.processBlock(out1, 0, out1.length);
-
-        if (!areEqual(out2, message))
-        {
-            fail("stream cipher test failed");
-        }
-
-        //
-        // twofish with CBC
-        //
-        BufferedBlockCipher c1 = new PaddedBufferedBlockCipher(
-                                    new CBCBlockCipher(new TwofishEngine()));
-        BufferedBlockCipher c2 = new PaddedBufferedBlockCipher(
-                                    new CBCBlockCipher(new TwofishEngine()));
-        i1 = new IESEngine(
-                       new ECDHBasicAgreement(),
-                       new KDF2BytesGenerator(new SHA1Digest()),
-                       new HMac(new SHA1Digest()),
-                       c1);
-        i2 = new IESEngine(
-                       new ECDHBasicAgreement(),
-                       new KDF2BytesGenerator(new SHA1Digest()),
-                       new HMac(new SHA1Digest()),
-                       c2);
-        d = new byte[] { 1, 2, 3, 4, 5, 6, 7, 8 };
-        e = new byte[] { 8, 7, 6, 5, 4, 3, 2, 1 };
-        p = new IESWithCipherParameters(d, e, 64, 128);
-
-        i1.init(true, p1.getPrivate(), p2.getPublic(), p);
-        i2.init(false, p2.getPrivate(), p1.getPublic(), p);
-
-        message = Hex.decode("1234567890abcdef");
-
-        out1 = i1.processBlock(message, 0, message.length);
-
-        out2 = i2.processBlock(out1, 0, out1.length);
-
-        if (!areEqual(out2, message))
-        {
-            fail("twofish cipher test failed");
-        }
-    }
-
-    public void performTest()
-        throws Exception
-    {
-        doStaticTest(null);
-        doStaticTest(TWOFISH_IV);
-
-        BigInteger n = new BigInteger("6277101735386680763835789423176059013767194773182842284081");
-
-        ECCurve.Fp curve = new ECCurve.Fp(
-            new BigInteger("6277101735386680763835789423207666416083908700390324961279"), // q
-            new BigInteger("fffffffffffffffffffffffffffffffefffffffffffffffc", 16), // a
-            new BigInteger("64210519e59c80e70fa7e9ab72243049feb8deecc146b9b1", 16), // b
-            n, ECConstants.ONE);
-
-        ECDomainParameters params = new ECDomainParameters(
-                curve,
-                curve.decodePoint(Hex.decode("03188da80eb03090f67cbf20eb43a18800f4ff0afd82ff1012")), // G
-                n);
-
-        ECKeyPairGenerator eGen = new ECKeyPairGenerator();
-        KeyGenerationParameters gParam = new ECKeyGenerationParameters(params, new SecureRandom());
-
-        eGen.init(gParam);
-
-        AsymmetricCipherKeyPair p1 = eGen.generateKeyPair();
-        AsymmetricCipherKeyPair p2 = eGen.generateKeyPair();
-
-        doTest(p1, p2);
-
-        doEphemeralTest(null, false);
-        doEphemeralTest(null, true);
-        doEphemeralTest(TWOFISH_IV, false);
-        doEphemeralTest(TWOFISH_IV, true);
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        runTest(new ECIESTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/ECNRTest.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/ECNRTest.java
deleted file mode 100644
index d4cf741..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/ECNRTest.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import java.math.BigInteger;
-import java.security.SecureRandom;
-
-import org.bouncycastle.crypto.params.ECDomainParameters;
-import org.bouncycastle.crypto.params.ECPrivateKeyParameters;
-import org.bouncycastle.crypto.params.ECPublicKeyParameters;
-import org.bouncycastle.crypto.params.ParametersWithRandom;
-import org.bouncycastle.crypto.signers.ECNRSigner;
-import org.bouncycastle.math.ec.ECConstants;
-import org.bouncycastle.math.ec.ECCurve;
-import org.bouncycastle.util.BigIntegers;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.FixedSecureRandom;
-import org.bouncycastle.util.test.SimpleTest;
-
-/**
- * ECNR tests.
- */
-public class ECNRTest
-    extends SimpleTest
-{
-    /**
-     * a basic regression test with 239 bit prime
-     */
-    BigInteger r = new BigInteger("308636143175167811492623515537541734843573549327605293463169625072911693");
-    BigInteger s = new BigInteger("852401710738814635664888632022555967400445256405412579597015412971797143");
-
-    byte[] kData = BigIntegers.asUnsignedByteArray(new BigInteger("700000017569056646655505781757157107570501575775705779575555657156756655"));
-
-    SecureRandom    k = new FixedSecureRandom(true, kData);
-
-    private void ecNR239bitPrime()
-    {
-        BigInteger n = new BigInteger("883423532389192164791648750360308884807550341691627752275345424702807307");
-
-        ECCurve.Fp curve = new ECCurve.Fp(
-            new BigInteger("883423532389192164791648750360308885314476597252960362792450860609699839"), // q
-            new BigInteger("7fffffffffffffffffffffff7fffffffffff8000000000007ffffffffffc", 16), // a
-            new BigInteger("6b016c3bdcf18941d0d654921475ca71a9db2fb27d1d37796185c2942c0a", 16), // b
-            n, ECConstants.ONE);
-
-        ECDomainParameters params = new ECDomainParameters(
-            curve,
-            curve.decodePoint(Hex.decode("020ffa963cdca8816ccc33b8642bedf905c3d358573d3f27fbbd3b3cb9aaaf")), // G
-            n);
-
-        ECPrivateKeyParameters priKey = new ECPrivateKeyParameters(
-            new BigInteger("876300101507107567501066130761671078357010671067781776716671676178726717"), // d
-            params);
-
-        ECNRSigner ecnr = new ECNRSigner();
-        ParametersWithRandom param = new ParametersWithRandom(priKey, k);
-
-        ecnr.init(true, param);
-
-        byte[] message = new BigInteger("968236873715988614170569073515315707566766479517").toByteArray();
-        BigInteger[] sig = ecnr.generateSignature(message);
-
-        if (!r.equals(sig[0]))
-        {
-            fail("r component wrong.", r, sig[0]);
-        }
-
-        if (!s.equals(sig[1]))
-        {
-            fail("s component wrong.", s, sig[1]);
-        }
-
-        // Verify the signature
-        ECPublicKeyParameters pubKey = new ECPublicKeyParameters(
-            curve.decodePoint(Hex.decode("025b6dc53bc61a2548ffb0f671472de6c9521a9d2d2534e65abfcbd5fe0c70")), // Q
-            params);
-
-        ecnr.init(false, pubKey);
-        if (!ecnr.verifySignature(message, sig[0], sig[1]))
-        {
-            fail("signature fails");
-        }
-    }
-
-    public String getName()
-    {
-        return "ECNR";
-    }
-
-    public void performTest()
-    {
-        ecNR239bitPrime();
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        runTest(new ECNRTest());
-    }
-}
-
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/ECTest.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/ECTest.java
deleted file mode 100644
index fc11276..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/ECTest.java
+++ /dev/null
@@ -1,926 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import java.math.BigInteger;
-import java.security.SecureRandom;
-
-import org.bouncycastle.asn1.nist.NISTNamedCurves;
-import org.bouncycastle.asn1.sec.SECNamedCurves;
-import org.bouncycastle.asn1.x9.X9ECParameters;
-import org.bouncycastle.crypto.AsymmetricCipherKeyPair;
-import org.bouncycastle.crypto.BasicAgreement;
-import org.bouncycastle.crypto.agreement.ECDHBasicAgreement;
-import org.bouncycastle.crypto.agreement.ECDHCBasicAgreement;
-import org.bouncycastle.crypto.agreement.ECMQVBasicAgreement;
-import org.bouncycastle.crypto.generators.ECKeyPairGenerator;
-import org.bouncycastle.crypto.params.ECDomainParameters;
-import org.bouncycastle.crypto.params.ECKeyGenerationParameters;
-import org.bouncycastle.crypto.params.ECPrivateKeyParameters;
-import org.bouncycastle.crypto.params.ECPublicKeyParameters;
-import org.bouncycastle.crypto.params.MQVPrivateParameters;
-import org.bouncycastle.crypto.params.MQVPublicParameters;
-import org.bouncycastle.crypto.params.ParametersWithRandom;
-import org.bouncycastle.crypto.signers.ECDSASigner;
-import org.bouncycastle.math.ec.ECConstants;
-import org.bouncycastle.math.ec.ECCurve;
-import org.bouncycastle.math.ec.ECPoint;
-import org.bouncycastle.util.BigIntegers;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.FixedSecureRandom;
-import org.bouncycastle.util.test.SimpleTest;
-
-/**
- * ECDSA tests are taken from X9.62.
- */
-public class ECTest
-    extends SimpleTest
-{   
-    /**
-     * X9.62 - 1998,<br>
-     * J.3.1, Page 152, ECDSA over the field Fp<br>
-     * an example with 192 bit prime
-     */
-    private void testECDSA192bitPrime()
-    {
-        BigInteger r = new BigInteger("3342403536405981729393488334694600415596881826869351677613");
-        BigInteger s = new BigInteger("5735822328888155254683894997897571951568553642892029982342");
-
-        byte[] kData = BigIntegers.asUnsignedByteArray(new BigInteger("6140507067065001063065065565667405560006161556565665656654"));
-
-        SecureRandom k = new FixedSecureRandom(kData);
-
-        BigInteger n = new BigInteger("6277101735386680763835789423176059013767194773182842284081");
-
-        ECCurve.Fp curve = new ECCurve.Fp(
-            new BigInteger("6277101735386680763835789423207666416083908700390324961279"), // q
-            new BigInteger("fffffffffffffffffffffffffffffffefffffffffffffffc", 16), // a
-            new BigInteger("64210519e59c80e70fa7e9ab72243049feb8deecc146b9b1", 16), // b
-            n, ECConstants.ONE);
-
-        ECDomainParameters params = new ECDomainParameters(
-                curve,
-                curve.decodePoint(Hex.decode("03188da80eb03090f67cbf20eb43a18800f4ff0afd82ff1012")), // G
-                n);
-
-        ECPrivateKeyParameters priKey = new ECPrivateKeyParameters(
-            new BigInteger("651056770906015076056810763456358567190100156695615665659"), // d
-            params);
-
-        ParametersWithRandom param = new ParametersWithRandom(priKey, k);
-
-        ECDSASigner ecdsa = new ECDSASigner();
-
-        ecdsa.init(true, param);
-
-        byte[] message = new BigInteger("968236873715988614170569073515315707566766479517").toByteArray();
-        BigInteger[] sig = ecdsa.generateSignature(message);
-
-        if (!r.equals(sig[0]))
-        {
-            fail("r component wrong." + System.getProperty("line.separator")
-                + " expecting: " + r + System.getProperty("line.separator")
-                + " got      : " + sig[0]);
-        }
-
-        if (!s.equals(sig[1]))
-        {
-            fail("s component wrong." + System.getProperty("line.separator")
-                + " expecting: " + s + System.getProperty("line.separator")
-                + " got      : " + sig[1]);
-        }
-
-        // Verify the signature
-        ECPublicKeyParameters pubKey = new ECPublicKeyParameters(
-            curve.decodePoint(Hex.decode("0262b12d60690cdcf330babab6e69763b471f994dd702d16a5")), // Q
-            params);
-
-        ecdsa.init(false, pubKey);
-        if (!ecdsa.verifySignature(message, sig[0], sig[1]))
-        {
-            fail("verification fails");
-        }
-    }
-
-    private void decodeTest()
-    {
-        ECCurve.Fp curve = new ECCurve.Fp(
-                new BigInteger("6277101735386680763835789423207666416083908700390324961279"), // q
-                new BigInteger("fffffffffffffffffffffffffffffffefffffffffffffffc", 16), // a
-                new BigInteger("64210519e59c80e70fa7e9ab72243049feb8deecc146b9b1", 16)); // b
-        
-        ECPoint p = curve.decodePoint(Hex.decode("03188da80eb03090f67cbf20eb43a18800f4ff0afd82ff1012")).normalize();
-
-        if (!p.getAffineXCoord().toBigInteger().equals(new BigInteger("188da80eb03090f67cbf20eb43a18800f4ff0afd82ff1012", 16)))
-        {
-            fail("x uncompressed incorrectly");
-        }
-
-        if (!p.getAffineYCoord().toBigInteger().equals(new BigInteger("7192b95ffc8da78631011ed6b24cdd573f977a11e794811", 16)))
-        {
-            fail("y uncompressed incorrectly");
-        }
-
-        byte[] encoding = p.getEncoded();
-
-        if (!areEqual(encoding, Hex.decode("03188da80eb03090f67cbf20eb43a18800f4ff0afd82ff1012")))
-        {
-            fail("point compressed incorrectly");
-        }
-    }
-    
-    /**
-     * X9.62 - 1998,<br>
-     * J.3.2, Page 155, ECDSA over the field Fp<br>
-     * an example with 239 bit prime
-     */
-    private void testECDSA239bitPrime()
-    {
-        BigInteger r = new BigInteger("308636143175167811492622547300668018854959378758531778147462058306432176");
-        BigInteger s = new BigInteger("323813553209797357708078776831250505931891051755007842781978505179448783");
-
-        byte[] kData = BigIntegers.asUnsignedByteArray(new BigInteger("700000017569056646655505781757157107570501575775705779575555657156756655"));
-
-        SecureRandom k = new FixedSecureRandom(true, kData);
-
-        BigInteger n = new BigInteger("883423532389192164791648750360308884807550341691627752275345424702807307");
-
-        ECCurve.Fp curve = new ECCurve.Fp(
-            new BigInteger("883423532389192164791648750360308885314476597252960362792450860609699839"), // q
-            new BigInteger("7fffffffffffffffffffffff7fffffffffff8000000000007ffffffffffc", 16), // a
-            new BigInteger("6b016c3bdcf18941d0d654921475ca71a9db2fb27d1d37796185c2942c0a", 16), // b
-            n, ECConstants.ONE);
-
-        ECDomainParameters params = new ECDomainParameters(
-            curve,
-            curve.decodePoint(Hex.decode("020ffa963cdca8816ccc33b8642bedf905c3d358573d3f27fbbd3b3cb9aaaf")), // G
-            n);
-
-        ECPrivateKeyParameters priKey = new ECPrivateKeyParameters(
-            new BigInteger("876300101507107567501066130761671078357010671067781776716671676178726717"), // d
-            params);
-
-        ECDSASigner ecdsa = new ECDSASigner();
-        ParametersWithRandom param = new ParametersWithRandom(priKey, k);
-
-        ecdsa.init(true, param);
-
-        byte[] message = new BigInteger("968236873715988614170569073515315707566766479517").toByteArray();
-        BigInteger[] sig = ecdsa.generateSignature(message);
-
-        if (!r.equals(sig[0]))
-        {
-            fail("r component wrong." + System.getProperty("line.separator")
-                + " expecting: " + r + System.getProperty("line.separator")
-                + " got      : " + sig[0]);
-        }
-
-        if (!s.equals(sig[1]))
-        {
-            fail("s component wrong." + System.getProperty("line.separator")
-                + " expecting: " + s + System.getProperty("line.separator")
-                + " got      : " + sig[1]);
-        }
-
-        // Verify the signature
-        ECPublicKeyParameters pubKey = new ECPublicKeyParameters(
-            curve.decodePoint(Hex.decode("025b6dc53bc61a2548ffb0f671472de6c9521a9d2d2534e65abfcbd5fe0c70")), // Q
-            params);
-
-        ecdsa.init(false, pubKey);
-        if (!ecdsa.verifySignature(message, sig[0], sig[1]))
-        {
-            fail("signature fails");
-        }
-    }
-
-
-    /**
-     * X9.62 - 1998,<br>
-     * J.2.1, Page 100, ECDSA over the field F2m<br>
-     * an example with 191 bit binary field
-     */
-    private void testECDSA191bitBinary()
-    {
-        BigInteger r = new BigInteger("87194383164871543355722284926904419997237591535066528048");
-        BigInteger s = new BigInteger("308992691965804947361541664549085895292153777025772063598");
-    
-        byte[] kData = BigIntegers.asUnsignedByteArray(new BigInteger("1542725565216523985789236956265265265235675811949404040041"));
-        
-        SecureRandom k = new FixedSecureRandom(kData);
-
-        BigInteger n = new BigInteger("1569275433846670190958947355803350458831205595451630533029");
-        BigInteger h = BigInteger.valueOf(2);
-
-        ECCurve.F2m curve = new ECCurve.F2m(
-            191, // m
-            9, //k
-            new BigInteger("2866537B676752636A68F56554E12640276B649EF7526267", 16), // a
-            new BigInteger("2E45EF571F00786F67B0081B9495A3D95462F5DE0AA185EC", 16), // b
-            n, h);
-
-        ECDomainParameters params = new ECDomainParameters(
-            curve,
-            curve.decodePoint(Hex.decode("0436B3DAF8A23206F9C4F299D7B21A9C369137F2C84AE1AA0D765BE73433B3F95E332932E70EA245CA2418EA0EF98018FB")), // G
-            n, h);
-
-        ECPrivateKeyParameters priKey = new ECPrivateKeyParameters(
-            new BigInteger("1275552191113212300012030439187146164646146646466749494799"), // d
-            params);
-    
-        ECDSASigner ecdsa = new ECDSASigner();
-        ParametersWithRandom param = new ParametersWithRandom(priKey, k);
-    
-        ecdsa.init(true, param);
-    
-        byte[] message = new BigInteger("968236873715988614170569073515315707566766479517").toByteArray();
-        BigInteger[] sig = ecdsa.generateSignature(message);
-    
-        if (!r.equals(sig[0]))
-        {
-            fail("r component wrong." + System.getProperty("line.separator")
-                + " expecting: " + r + System.getProperty("line.separator")
-                + " got      : " + sig[0]);
-        }
-    
-        if (!s.equals(sig[1]))
-        {
-            fail("s component wrong." + System.getProperty("line.separator")
-                + " expecting: " + s + System.getProperty("line.separator")
-                + " got      : " + sig[1]);
-        }
-    
-        // Verify the signature
-        ECPublicKeyParameters pubKey = new ECPublicKeyParameters(
-            curve.decodePoint(Hex.decode("045DE37E756BD55D72E3768CB396FFEB962614DEA4CE28A2E755C0E0E02F5FB132CAF416EF85B229BBB8E1352003125BA1")), // Q
-            params);
-
-        ecdsa.init(false, pubKey);
-        if (!ecdsa.verifySignature(message, sig[0], sig[1]))
-        {
-            fail("signature fails");
-        }
-    }
-
-
-    /**
-     * X9.62 - 1998,<br>
-     * J.2.1, Page 100, ECDSA over the field F2m<br>
-     * an example with 191 bit binary field
-     */
-    private void testECDSA239bitBinary()
-    {
-        BigInteger r = new BigInteger("21596333210419611985018340039034612628818151486841789642455876922391552");
-        BigInteger s = new BigInteger("197030374000731686738334997654997227052849804072198819102649413465737174");
-    
-        byte[] kData = BigIntegers.asUnsignedByteArray(new BigInteger("171278725565216523967285789236956265265265235675811949404040041670216363"));
-        
-        SecureRandom k = new FixedSecureRandom(kData);
-
-        BigInteger n = new BigInteger("220855883097298041197912187592864814557886993776713230936715041207411783");
-        BigInteger h = BigInteger.valueOf(4);
-
-        ECCurve.F2m curve = new ECCurve.F2m(
-            239, // m
-            36, //k
-            new BigInteger("32010857077C5431123A46B808906756F543423E8D27877578125778AC76", 16), // a
-            new BigInteger("790408F2EEDAF392B012EDEFB3392F30F4327C0CA3F31FC383C422AA8C16", 16), // b
-            n, h);
-
-        ECDomainParameters params = new ECDomainParameters(
-            curve,
-            curve.decodePoint(Hex.decode("0457927098FA932E7C0A96D3FD5B706EF7E5F5C156E16B7E7C86038552E91D61D8EE5077C33FECF6F1A16B268DE469C3C7744EA9A971649FC7A9616305")), // G
-            n, h);
-
-        ECPrivateKeyParameters priKey = new ECPrivateKeyParameters(
-            new BigInteger("145642755521911534651321230007534120304391871461646461466464667494947990"), // d
-            params);
-    
-        ECDSASigner ecdsa = new ECDSASigner();
-        ParametersWithRandom param = new ParametersWithRandom(priKey, k);
-    
-        ecdsa.init(true, param);
-    
-        byte[] message = new BigInteger("968236873715988614170569073515315707566766479517").toByteArray();
-        BigInteger[] sig = ecdsa.generateSignature(message);
-    
-        if (!r.equals(sig[0]))
-        {
-            fail("r component wrong." + System.getProperty("line.separator")
-                + " expecting: " + r + System.getProperty("line.separator")
-                + " got      : " + sig[0]);
-        }
-    
-        if (!s.equals(sig[1]))
-        {
-            fail("s component wrong." + System.getProperty("line.separator")
-                + " expecting: " + s + System.getProperty("line.separator")
-                + " got      : " + sig[1]);
-        }
-    
-        // Verify the signature
-        ECPublicKeyParameters pubKey = new ECPublicKeyParameters(
-            curve.decodePoint(Hex.decode("045894609CCECF9A92533F630DE713A958E96C97CCB8F5ABB5A688A238DEED6DC2D9D0C94EBFB7D526BA6A61764175B99CB6011E2047F9F067293F57F5")), // Q
-            params);
-
-        ecdsa.init(false, pubKey);
-        if (!ecdsa.verifySignature(message, sig[0], sig[1]))
-        {
-            fail("signature fails");
-        }
-    }
-
-    // L 4.1  X9.62 2005
-    private void testECDSAP224sha224()
-    {
-        X9ECParameters p = NISTNamedCurves.getByName("P-224");
-        ECDomainParameters params = new ECDomainParameters(p.getCurve(), p.getG(), p.getN(), p.getH());
-        ECPrivateKeyParameters priKey = new ECPrivateKeyParameters(
-            new BigInteger("6081831502424510080126737029209236539191290354021104541805484120491"), // d
-            params);
-        SecureRandom    k = new FixedSecureRandom(BigIntegers.asUnsignedByteArray(new BigInteger("15456715103636396133226117016818339719732885723579037388121116732601")));
-        
-        byte[] M = Hex.decode("8797A3C693CC292441039A4E6BAB7387F3B4F2A63D00ED384B378C79");
-
-        ECDSASigner dsa = new ECDSASigner();
-
-        dsa.init(true, new ParametersWithRandom(priKey, k));
-
-        BigInteger[] sig = dsa.generateSignature(M);
-
-        BigInteger r = new BigInteger("26477406756127720855365980332052585411804331993436302005017227573742");
-        BigInteger s = new BigInteger("17694958233103667059888193972742186995283044672015112738919822429978");
-        
-        if (!r.equals(sig[0]))
-        {
-            fail("r component wrong." + System.getProperty("line.separator")
-                + " expecting: " + r + System.getProperty("line.separator")
-                + " got      : " + sig[0]);
-        }
-
-        if (!s.equals(sig[1]))
-        {
-            fail("s component wrong." + System.getProperty("line.separator")
-                + " expecting: " + s + System.getProperty("line.separator")
-                + " got      : " + sig[1]);
-        }
-
-                // Verify the signature
-        ECPublicKeyParameters pubKey = new ECPublicKeyParameters(
-            params.getCurve().decodePoint(Hex.decode("03FD44EC11F9D43D9D23B1E1D1C9ED6519B40ECF0C79F48CF476CC43F1")), // Q
-            params);
-
-        dsa.init(false, pubKey);
-        if (!dsa.verifySignature(M, sig[0], sig[1]))
-        {
-            fail("signature fails");
-        }
-    }
-
-    private void testECDSASecP224k1sha256()
-    {
-        X9ECParameters p = SECNamedCurves.getByName("secp224k1");
-        ECDomainParameters params = new ECDomainParameters(p.getCurve(), p.getG(), p.getN(), p.getH());
-        ECPrivateKeyParameters priKey = new ECPrivateKeyParameters(
-            new BigInteger("BE6F6E91FE96840A6518B56F3FE21689903A64FA729057AB872A9F51", 16), // d
-            params);
-        SecureRandom    k = new FixedSecureRandom(Hex.decode("00c39beac93db21c3266084429eb9b846b787c094f23a4de66447efbb3"));
-       
-        byte[] M = Hex.decode("E5D5A7ADF73C5476FAEE93A2C76CE94DC0557DB04CDC189504779117920B896D");
-
-        ECDSASigner dsa = new ECDSASigner();
-
-        dsa.init(true, new ParametersWithRandom(priKey, k));
-
-        BigInteger[] sig = dsa.generateSignature(M);
-
-        BigInteger r = new BigInteger("8163E5941BED41DA441B33E653C632A55A110893133351E20CE7CB75", 16);
-        BigInteger s = new BigInteger("D12C3FC289DDD5F6890DCE26B65792C8C50E68BF551D617D47DF15A8", 16);
-
-        if (!r.equals(sig[0]))
-        {
-            fail("r component wrong." + System.getProperty("line.separator")
-                + " expecting: " + r + System.getProperty("line.separator")
-                + " got      : " + sig[0]);
-        }
-
-        if (!s.equals(sig[1]))
-        {
-            fail("s component wrong." + System.getProperty("line.separator")
-                + " expecting: " + s + System.getProperty("line.separator")
-                + " got      : " + sig[1]);
-        }
-
-                // Verify the signature
-        ECPublicKeyParameters pubKey = new ECPublicKeyParameters(
-            params.getCurve().decodePoint(Hex.decode("04C5C9B38D3603FCCD6994CBB9594E152B658721E483669BB42728520F484B537647EC816E58A8284D3B89DFEDB173AFDC214ECA95A836FA7C")), // Q
-            params);
-
-        dsa.init(false, pubKey);
-        if (!dsa.verifySignature(M, sig[0], sig[1]))
-        {
-            fail("signature fails");
-        }
-    }
-
-    // L4.2  X9.62 2005
-    private void testECDSAP256sha256()
-    {
-        X9ECParameters p = NISTNamedCurves.getByName("P-256");
-        ECDomainParameters params = new ECDomainParameters(p.getCurve(), p.getG(), p.getN(), p.getH());
-        ECPrivateKeyParameters priKey = new ECPrivateKeyParameters(
-            new BigInteger("20186677036482506117540275567393538695075300175221296989956723148347484984008"), // d
-            params);
-        SecureRandom    k = new FixedSecureRandom(BigIntegers.asUnsignedByteArray(new BigInteger("72546832179840998877302529996971396893172522460793442785601695562409154906335")));
-
-        byte[] M = Hex.decode("1BD4ED430B0F384B4E8D458EFF1A8A553286D7AC21CB2F6806172EF5F94A06AD");
-
-        ECDSASigner dsa = new ECDSASigner();
-
-        dsa.init(true, new ParametersWithRandom(priKey, k));
-
-        BigInteger[] sig = dsa.generateSignature(M);
-
-        BigInteger r = new BigInteger("97354732615802252173078420023658453040116611318111190383344590814578738210384");
-        BigInteger s = new BigInteger("98506158880355671805367324764306888225238061309262649376965428126566081727535");
-
-        if (!r.equals(sig[0]))
-        {
-            fail("r component wrong." + System.getProperty("line.separator")
-                + " expecting: " + r + System.getProperty("line.separator")
-                + " got      : " + sig[0]);
-        }
-
-        if (!s.equals(sig[1]))
-        {
-            fail("s component wrong." + System.getProperty("line.separator")
-                + " expecting: " + s + System.getProperty("line.separator")
-                + " got      : " + sig[1]);
-        }
-
-                // Verify the signature
-        ECPublicKeyParameters pubKey = new ECPublicKeyParameters(
-            params.getCurve().decodePoint(Hex.decode("03596375E6CE57E0F20294FC46BDFCFD19A39F8161B58695B3EC5B3D16427C274D")), // Q
-            params);
-
-        dsa.init(false, pubKey);
-        if (!dsa.verifySignature(M, sig[0], sig[1]))
-        {
-            fail("signature fails");
-        }
-    }
-
-    private void testECDSAP224OneByteOver()
-    {
-        X9ECParameters p = NISTNamedCurves.getByName("P-224");
-        ECDomainParameters params = new ECDomainParameters(p.getCurve(), p.getG(), p.getN(), p.getH());
-        ECPrivateKeyParameters priKey = new ECPrivateKeyParameters(
-            new BigInteger("6081831502424510080126737029209236539191290354021104541805484120491"), // d
-            params);
-        SecureRandom    k = new FixedSecureRandom(BigIntegers.asUnsignedByteArray(new BigInteger("15456715103636396133226117016818339719732885723579037388121116732601")));
-
-        byte[] M = Hex.decode("8797A3C693CC292441039A4E6BAB7387F3B4F2A63D00ED384B378C79FF");
-
-        ECDSASigner dsa = new ECDSASigner();
-
-        dsa.init(true, new ParametersWithRandom(priKey, k));
-
-        BigInteger[] sig = dsa.generateSignature(M);
-
-        BigInteger r = new BigInteger("26477406756127720855365980332052585411804331993436302005017227573742");
-        BigInteger s = new BigInteger("17694958233103667059888193972742186995283044672015112738919822429978");
-
-        if (!r.equals(sig[0]))
-        {
-            fail("r component wrong." + System.getProperty("line.separator")
-                + " expecting: " + r + System.getProperty("line.separator")
-                + " got      : " + sig[0]);
-        }
-
-        if (!s.equals(sig[1]))
-        {
-            fail("s component wrong." + System.getProperty("line.separator")
-                + " expecting: " + s + System.getProperty("line.separator")
-                + " got      : " + sig[1]);
-        }
-
-                // Verify the signature
-        ECPublicKeyParameters pubKey = new ECPublicKeyParameters(
-            params.getCurve().decodePoint(Hex.decode("03FD44EC11F9D43D9D23B1E1D1C9ED6519B40ECF0C79F48CF476CC43F1")), // Q
-            params);
-
-        dsa.init(false, pubKey);
-        if (!dsa.verifySignature(M, sig[0], sig[1]))
-        {
-            fail("signature fails");
-        }
-    }
-
-    // L4.3  X9.62 2005
-    private void testECDSAP521sha512()
-    {
-        X9ECParameters p = NISTNamedCurves.getByName("P-521");
-        ECDomainParameters params = new ECDomainParameters(p.getCurve(), p.getG(), p.getN(), p.getH());
-        ECPrivateKeyParameters priKey = new ECPrivateKeyParameters(
-            new BigInteger("617573726813476282316253885608633222275541026607493641741273231656161177732180358888434629562647985511298272498852936680947729040673640492310550142822667389"), // d
-            params);
-        SecureRandom    k = new FixedSecureRandom(BigIntegers.asUnsignedByteArray(new BigInteger("6806532878215503520845109818432174847616958675335397773700324097584974639728725689481598054743894544060040710846048585856076812050552869216017728862957612913")));
-
-        byte[] M = Hex.decode("6893B64BD3A9615C39C3E62DDD269C2BAAF1D85915526083183CE14C2E883B48B193607C1ED871852C9DF9C3147B574DC1526C55DE1FE263A676346A20028A66");
-
-        ECDSASigner dsa = new ECDSASigner();
-
-        dsa.init(true, new ParametersWithRandom(priKey, k));
-
-        BigInteger[] sig = dsa.generateSignature(M);
-
-        BigInteger r = new BigInteger("1368926195812127407956140744722257403535864168182534321188553460365652865686040549247096155740756318290773648848859639978618869784291633651685766829574104630");
-        BigInteger s = new BigInteger("1624754720348883715608122151214003032398685415003935734485445999065609979304811509538477657407457976246218976767156629169821116579317401249024208611945405790");
-
-        if (!r.equals(sig[0]))
-        {
-            fail("r component wrong." + System.getProperty("line.separator")
-                + " expecting: " + r + System.getProperty("line.separator")
-                + " got      : " + sig[0]);
-        }
-
-        if (!s.equals(sig[1]))
-        {
-            fail("s component wrong." + System.getProperty("line.separator")
-                + " expecting: " + s + System.getProperty("line.separator")
-                + " got      : " + sig[1]);
-        }
-
-                // Verify the signature
-        ECPublicKeyParameters pubKey = new ECPublicKeyParameters(
-            params.getCurve().decodePoint(Hex.decode("020145E221AB9F71C5FE740D8D2B94939A09E2816E2167A7D058125A06A80C014F553E8D6764B048FB6F2B687CEC72F39738F223D4CE6AFCBFF2E34774AA5D3C342CB3")), // Q
-            params);
-
-        dsa.init(false, pubKey);
-        if (!dsa.verifySignature(M, sig[0], sig[1]))
-        {
-            fail("signature fails");
-        }
-    }
-
-    /**
-     * General test for long digest.
-     */
-    private void testECDSA239bitBinaryAndLargeDigest()
-    {
-        BigInteger r = new BigInteger("21596333210419611985018340039034612628818151486841789642455876922391552");
-        BigInteger s = new BigInteger("144940322424411242416373536877786566515839911620497068645600824084578597");
-
-        byte[] kData = BigIntegers.asUnsignedByteArray(new BigInteger("171278725565216523967285789236956265265265235675811949404040041670216363"));
-        
-        SecureRandom    k = new FixedSecureRandom(kData);
-
-        BigInteger n = new BigInteger("220855883097298041197912187592864814557886993776713230936715041207411783");
-        BigInteger h = BigInteger.valueOf(4);
-
-        ECCurve.F2m curve = new ECCurve.F2m(
-            239, // m
-            36, //k
-            new BigInteger("32010857077C5431123A46B808906756F543423E8D27877578125778AC76", 16), // a
-            new BigInteger("790408F2EEDAF392B012EDEFB3392F30F4327C0CA3F31FC383C422AA8C16", 16), // b
-            n, h);
-
-        ECDomainParameters params = new ECDomainParameters(
-            curve,
-            curve.decodePoint(Hex.decode("0457927098FA932E7C0A96D3FD5B706EF7E5F5C156E16B7E7C86038552E91D61D8EE5077C33FECF6F1A16B268DE469C3C7744EA9A971649FC7A9616305")), // G
-            n, h);
-
-        ECPrivateKeyParameters priKey = new ECPrivateKeyParameters(
-            new BigInteger("145642755521911534651321230007534120304391871461646461466464667494947990"), // d
-            params);
-    
-        ECDSASigner ecdsa = new ECDSASigner();
-        ParametersWithRandom param = new ParametersWithRandom(priKey, k);
-    
-        ecdsa.init(true, param);
-    
-        byte[] message = new BigInteger("968236873715988614170569073515315707566766479517968236873715988614170569073515315707566766479517968236873715988614170569073515315707566766479517").toByteArray();
-        BigInteger[] sig = ecdsa.generateSignature(message);
-    
-        if (!r.equals(sig[0]))
-        {
-            fail("r component wrong." + System.getProperty("line.separator")
-                + " expecting: " + r + System.getProperty("line.separator")
-                + " got      : " + sig[0]);
-        }
-    
-        if (!s.equals(sig[1]))
-        {
-            fail("s component wrong." + System.getProperty("line.separator")
-                + " expecting: " + s + System.getProperty("line.separator")
-                + " got      : " + sig[1]);
-        }
-    
-        // Verify the signature
-        ECPublicKeyParameters pubKey = new ECPublicKeyParameters(
-            curve.decodePoint(Hex.decode("045894609CCECF9A92533F630DE713A958E96C97CCB8F5ABB5A688A238DEED6DC2D9D0C94EBFB7D526BA6A61764175B99CB6011E2047F9F067293F57F5")), // Q
-            params);
-
-        ecdsa.init(false, pubKey);
-        if (!ecdsa.verifySignature(message, sig[0], sig[1]))
-        {
-            fail("signature fails");
-        }
-    }
-
-    /**
-     * key generation test
-     */
-    private void testECDSAKeyGenTest()
-    {
-        SecureRandom random = new SecureRandom();
-
-        BigInteger n = new BigInteger("883423532389192164791648750360308884807550341691627752275345424702807307");
-
-        ECCurve.Fp curve = new ECCurve.Fp(
-            new BigInteger("883423532389192164791648750360308885314476597252960362792450860609699839"), // q
-            new BigInteger("7fffffffffffffffffffffff7fffffffffff8000000000007ffffffffffc", 16), // a
-            new BigInteger("6b016c3bdcf18941d0d654921475ca71a9db2fb27d1d37796185c2942c0a", 16), // b
-            n, ECConstants.ONE);
-
-        ECDomainParameters params = new ECDomainParameters(
-            curve,
-            curve.decodePoint(Hex.decode("020ffa963cdca8816ccc33b8642bedf905c3d358573d3f27fbbd3b3cb9aaaf")), // G
-            n);
-
-        ECKeyPairGenerator          pGen = new ECKeyPairGenerator();
-        ECKeyGenerationParameters   genParam = new ECKeyGenerationParameters(
-                                        params,
-                                        random);
-
-        pGen.init(genParam);
-
-        AsymmetricCipherKeyPair  pair = pGen.generateKeyPair();
-    
-        ParametersWithRandom param = new ParametersWithRandom(pair.getPrivate(), random);
-
-        ECDSASigner ecdsa = new ECDSASigner();
-
-        ecdsa.init(true, param);
-
-        byte[] message = new BigInteger("968236873715988614170569073515315707566766479517").toByteArray();
-        BigInteger[] sig = ecdsa.generateSignature(message);
-
-        ecdsa.init(false, pair.getPublic());
-
-        if (!ecdsa.verifySignature(message, sig[0], sig[1]))
-        {
-            fail("signature fails");
-        }
-    }
-
-    /**
-     * Basic Key Agreement Test
-     */
-    private void testECBasicAgreementTest()
-    {
-        SecureRandom random = new SecureRandom();
-
-        BigInteger n = new BigInteger("883423532389192164791648750360308884807550341691627752275345424702807307");
-
-        ECCurve.Fp curve = new ECCurve.Fp(
-            new BigInteger("883423532389192164791648750360308885314476597252960362792450860609699839"), // q
-            new BigInteger("7fffffffffffffffffffffff7fffffffffff8000000000007ffffffffffc", 16), // a
-            new BigInteger("6b016c3bdcf18941d0d654921475ca71a9db2fb27d1d37796185c2942c0a", 16), // b
-            n, ECConstants.ONE);
-
-        ECDomainParameters params = new ECDomainParameters(
-            curve,
-            curve.decodePoint(Hex.decode("020ffa963cdca8816ccc33b8642bedf905c3d358573d3f27fbbd3b3cb9aaaf")), // G
-            n);
-
-        ECKeyPairGenerator          pGen = new ECKeyPairGenerator();
-        ECKeyGenerationParameters   genParam = new ECKeyGenerationParameters(
-                                        params,
-                                        random);
-
-        pGen.init(genParam);
-
-        AsymmetricCipherKeyPair  p1 = pGen.generateKeyPair();
-        AsymmetricCipherKeyPair  p2 = pGen.generateKeyPair();
-    
-        //
-        // two way
-        //
-        BasicAgreement    e1 = new ECDHBasicAgreement();
-        BasicAgreement    e2 = new ECDHBasicAgreement();
-
-        e1.init(p1.getPrivate());
-        e2.init(p2.getPrivate());
-
-        BigInteger   k1 = e1.calculateAgreement(p2.getPublic());
-        BigInteger   k2 = e2.calculateAgreement(p1.getPublic());
-
-        if (!k1.equals(k2))
-        {
-            fail("calculated agreement test failed");
-        }
-
-        //
-        // two way
-        //
-        e1 = new ECDHCBasicAgreement();
-        e2 = new ECDHCBasicAgreement();
-
-        e1.init(p1.getPrivate());
-        e2.init(p2.getPrivate());
-
-        k1 = e1.calculateAgreement(p2.getPublic());
-        k2 = e2.calculateAgreement(p1.getPublic());
-
-        if (!k1.equals(k2))
-        {
-            fail("calculated agreement test failed");
-        }
-    }
-
-     private void testECMQVTestVector1()
-     {
-         // Test Vector from GEC-2
-
-         X9ECParameters x9 = SECNamedCurves.getByName("secp160r1");
-         ECDomainParameters p = new ECDomainParameters(
-             x9.getCurve(), x9.getG(), x9.getN(), x9.getH(), x9.getSeed());
-
-         AsymmetricCipherKeyPair U1 = new AsymmetricCipherKeyPair(
-             new ECPublicKeyParameters(
-                 p.getCurve().decodePoint(Hex.decode("0251B4496FECC406ED0E75A24A3C03206251419DC0")), p),
-             new ECPrivateKeyParameters(
-                 new BigInteger("AA374FFC3CE144E6B073307972CB6D57B2A4E982", 16), p));
-
-         AsymmetricCipherKeyPair U2 = new AsymmetricCipherKeyPair(
-             new ECPublicKeyParameters(
-                 p.getCurve().decodePoint(Hex.decode("03D99CE4D8BF52FA20BD21A962C6556B0F71F4CA1F")), p),
-             new ECPrivateKeyParameters(
-                 new BigInteger("149EC7EA3A220A887619B3F9E5B4CA51C7D1779C", 16), p));
-
-         AsymmetricCipherKeyPair V1 = new AsymmetricCipherKeyPair(
-             new ECPublicKeyParameters(
-                 p.getCurve().decodePoint(Hex.decode("0349B41E0E9C0369C2328739D90F63D56707C6E5BC")), p),
-             new ECPrivateKeyParameters(
-                 new BigInteger("45FB58A92A17AD4B15101C66E74F277E2B460866", 16), p));
-
-         AsymmetricCipherKeyPair V2 = new AsymmetricCipherKeyPair(
-             new ECPublicKeyParameters(
-                 p.getCurve().decodePoint(Hex.decode("02706E5D6E1F640C6E9C804E75DBC14521B1E5F3B5")), p),
-             new ECPrivateKeyParameters(
-                 new BigInteger("18C13FCED9EADF884F7C595C8CB565DEFD0CB41E", 16), p));
-
-         BigInteger x = calculateAgreement(U1, U2, V1, V2);
-
-         if (x == null
-             || !x.equals(new BigInteger("5A6955CEFDB4E43255FB7FCF718611E4DF8E05AC", 16)))
-         {
-             fail("MQV Test Vector #1 agreement failed");
-         }
-     }
-
-     private void testECMQVTestVector2()
-     {
-         // Test Vector from GEC-2
-
-         X9ECParameters x9 = SECNamedCurves.getByName("sect163k1");
-         ECDomainParameters p = new ECDomainParameters(
-             x9.getCurve(), x9.getG(), x9.getN(), x9.getH(), x9.getSeed());
-
-         AsymmetricCipherKeyPair U1 = new AsymmetricCipherKeyPair(
-             new ECPublicKeyParameters(
-                 p.getCurve().decodePoint(Hex.decode("03037D529FA37E42195F10111127FFB2BB38644806BC")), p),
-             new ECPrivateKeyParameters(
-                 new BigInteger("03A41434AA99C2EF40C8495B2ED9739CB2155A1E0D", 16), p));
-
-         AsymmetricCipherKeyPair U2 = new AsymmetricCipherKeyPair(
-             new ECPublicKeyParameters(
-                 p.getCurve().decodePoint(Hex.decode("02015198E74BC2F1E5C9A62B80248DF0D62B9ADF8429")), p),
-             new ECPrivateKeyParameters(
-                 new BigInteger("032FC4C61A8211E6A7C4B8B0C03CF35F7CF20DBD52", 16), p));
-
-         AsymmetricCipherKeyPair V1 = new AsymmetricCipherKeyPair(
-             new ECPublicKeyParameters(
-                 p.getCurve().decodePoint(Hex.decode("03072783FAAB9549002B4F13140B88132D1C75B3886C")), p),
-             new ECPrivateKeyParameters(
-                 new BigInteger("57E8A78E842BF4ACD5C315AA0569DB1703541D96", 16), p));
-
-         AsymmetricCipherKeyPair V2 = new AsymmetricCipherKeyPair(
-             new ECPublicKeyParameters(
-                 p.getCurve().decodePoint(Hex.decode("03067E3AEA3510D69E8EDD19CB2A703DDC6CF5E56E32")), p),
-             new ECPrivateKeyParameters(
-                 new BigInteger("02BD198B83A667A8D908EA1E6F90FD5C6D695DE94F", 16), p));
-
-         BigInteger x = calculateAgreement(U1, U2, V1, V2);
-
-         if (x == null
-             || !x.equals(new BigInteger("038359FFD30C0D5FC1E6154F483B73D43E5CF2B503", 16)))
-         {
-             fail("MQV Test Vector #2 agreement failed");
-         }
-     }
-
-     private void testECMQVRandom()
-     {
-         SecureRandom random = new SecureRandom();
-
-         BigInteger n = new BigInteger("883423532389192164791648750360308884807550341691627752275345424702807307");
-
-         ECCurve.Fp curve = new ECCurve.Fp(
-             new BigInteger("883423532389192164791648750360308885314476597252960362792450860609699839"), // q
-             new BigInteger("7fffffffffffffffffffffff7fffffffffff8000000000007ffffffffffc", 16), // a
-             new BigInteger("6b016c3bdcf18941d0d654921475ca71a9db2fb27d1d37796185c2942c0a", 16), // b
-             n, ECConstants.ONE);
-
-         ECDomainParameters parameters = new ECDomainParameters(
-             curve,
-             curve.decodePoint(Hex.decode("020ffa963cdca8816ccc33b8642bedf905c3d358573d3f27fbbd3b3cb9aaaf")), // G
-             n);
-
-         ECKeyPairGenerator pGen = new ECKeyPairGenerator();
-
-         pGen.init(new ECKeyGenerationParameters(parameters, random));
-
-
-         // Pre-established key pairs
-         AsymmetricCipherKeyPair U1 = pGen.generateKeyPair();
-         AsymmetricCipherKeyPair V1 = pGen.generateKeyPair();
-
-         // Ephemeral key pairs
-         AsymmetricCipherKeyPair U2 = pGen.generateKeyPair();
-         AsymmetricCipherKeyPair V2 = pGen.generateKeyPair();
-
-         BigInteger x = calculateAgreement(U1, U2, V1, V2);
-
-         if (x == null)
-         {
-             fail("MQV Test Vector (random) agreement failed");
-         }
-     }
-
-     private static BigInteger calculateAgreement(
-         AsymmetricCipherKeyPair U1,
-         AsymmetricCipherKeyPair U2,
-         AsymmetricCipherKeyPair V1,
-         AsymmetricCipherKeyPair V2)
-     {
-         ECMQVBasicAgreement u = new ECMQVBasicAgreement();
-         u.init(new MQVPrivateParameters(
-             (ECPrivateKeyParameters)U1.getPrivate(),
-             (ECPrivateKeyParameters)U2.getPrivate(),
-             (ECPublicKeyParameters)U2.getPublic()));
-         BigInteger ux = u.calculateAgreement(new MQVPublicParameters(
-             (ECPublicKeyParameters)V1.getPublic(),
-             (ECPublicKeyParameters)V2.getPublic()));
-
-         ECMQVBasicAgreement v = new ECMQVBasicAgreement();
-         v.init(new MQVPrivateParameters(
-             (ECPrivateKeyParameters)V1.getPrivate(),
-             (ECPrivateKeyParameters)V2.getPrivate(),
-             (ECPublicKeyParameters)V2.getPublic()));
-         BigInteger vx = v.calculateAgreement(new MQVPublicParameters(
-             (ECPublicKeyParameters)U1.getPublic(),
-             (ECPublicKeyParameters)U2.getPublic()));
-
-         if (ux.equals(vx))
-         {
-             return ux;
-         }
-
-         return null;
-     }
-
-    public String getName()
-    {
-        return "EC";
-    }
-
-    public void performTest()
-    {
-        decodeTest();
-        testECDSA192bitPrime();
-        testECDSA239bitPrime();
-        testECDSA191bitBinary();
-        testECDSA239bitBinary();
-        testECDSAKeyGenTest();
-        testECBasicAgreementTest();
-
-        testECDSAP224sha224();
-        testECDSAP224OneByteOver();
-        testECDSAP256sha256();
-        testECDSAP521sha512();
-        testECDSASecP224k1sha256();
-        testECDSA239bitBinaryAndLargeDigest();
-        
-        testECMQVTestVector1();
-        testECMQVTestVector2();
-        testECMQVRandom();
-    }
-
-
-    public static void main(
-        String[]    args)
-    {
-        runTest(new ECTest());
-    }
-}
-
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/ElGamalTest.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/ElGamalTest.java
deleted file mode 100644
index fb93699..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/ElGamalTest.java
+++ /dev/null
@@ -1,285 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import java.math.BigInteger;
-import java.security.SecureRandom;
-
-import org.bouncycastle.crypto.AsymmetricCipherKeyPair;
-import org.bouncycastle.crypto.DataLengthException;
-import org.bouncycastle.crypto.engines.ElGamalEngine;
-import org.bouncycastle.crypto.generators.ElGamalKeyPairGenerator;
-import org.bouncycastle.crypto.generators.ElGamalParametersGenerator;
-import org.bouncycastle.crypto.params.ElGamalKeyGenerationParameters;
-import org.bouncycastle.crypto.params.ElGamalParameters;
-import org.bouncycastle.crypto.params.ElGamalPrivateKeyParameters;
-import org.bouncycastle.crypto.params.ElGamalPublicKeyParameters;
-import org.bouncycastle.crypto.params.ParametersWithRandom;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.BigIntegers;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-
-public class ElGamalTest
-    extends SimpleTest
-{
-    private BigInteger g512 = new BigInteger("153d5d6172adb43045b68ae8e1de1070b6137005686d29d3d73a7749199681ee5b212c9b96bfdcfa5b20cd5e3fd2044895d609cf9b410b7a0f12ca1cb9a428cc", 16);
-    private BigInteger p512 = new BigInteger("9494fec095f3b85ee286542b3836fc81a5dd0a0349b4c239dd38744d488cf8e31db8bcb7d33b41abb9e5a33cca9144b1cef332c94bf0573bf047a3aca98cdf3b", 16);
-
-    private BigInteger g768 = new BigInteger("7c240073c1316c621df461b71ebb0cdcc90a6e5527e5e126633d131f87461c4dc4afc60c2cb0f053b6758871489a69613e2a8b4c8acde23954c08c81cbd36132cfd64d69e4ed9f8e51ed6e516297206672d5c0a69135df0a5dcf010d289a9ca1", 16);
-    private BigInteger p768 = new BigInteger("8c9dd223debed1b80103b8b309715be009d48860ed5ae9b9d5d8159508efd802e3ad4501a7f7e1cfec78844489148cd72da24b21eddd01aa624291c48393e277cfc529e37075eccef957f3616f962d15b44aeab4039d01b817fde9eaa12fd73f", 16);
-
-    private BigInteger  g1024 = new BigInteger("1db17639cdf96bc4eabba19454f0b7e5bd4e14862889a725c96eb61048dcd676ceb303d586e30f060dbafd8a571a39c4d823982117da5cc4e0f89c77388b7a08896362429b94a18a327604eb7ff227bffbc83459ade299e57b5f77b50fb045250934938efa145511166e3197373e1b5b1e52de713eb49792bedde722c6717abf", 16);
-    private BigInteger  p1024 = new BigInteger("a00e283b3c624e5b2b4d9fbc2653b5185d99499b00fd1bf244c6f0bb817b4d1c451b2958d62a0f8a38caef059fb5ecd25d75ed9af403f5b5bdab97a642902f824e3c13789fed95fa106ddfe0ff4a707c85e2eb77d49e68f2808bcea18ce128b178cd287c6bc00efa9a1ad2a673fe0dceace53166f75b81d6709d5f8af7c66bb7", 16);
-
-    private BigInteger yPgpBogusPSamp = new BigInteger("de4688497cc05b45fe8559bc9918c45afcad69b74123a7236eba409fd9de8ea34c7869839ee9df35e3d97576145d089841aa65b5b4e061fae52c37e430354269a02496b8ed8456f2d0d7c9b0db985fbcb21ae9f78507ed6e3a29db595b201b1a4f931c7d791eede65ccf918e8a61cf146859151c78c41ad48853694623467d78", 16);
-    private BigInteger xPgpBogusPSamp = new BigInteger("cbaf780f2cfe4f987bbc5fcb0738bbd7912060ccfdf37cbfeea65c0fd857e74a8df6cc359375f28cf5725d081813c614410a78cbe4b06d677beea9ff0fa10b1dbc47a6ed8c5b8466d6a95d6574029dbdf72596392e1b6b230faf9916dc8455821c10527a375a4d1c8a54947d1fe714d321aca25ad486b4b456506999fd2fd11a", 16);
-    private BigInteger gPgpBogusPSamp = new BigInteger("153ffe9522076d1cbd6e75f0816a0fc2ebd8b0e0091406587387a1763022088a03b411eed07ff50efb82b21f1608c352d10f63ba7e7e981a2f3387cec8af2915953d00493857663ae8919f517fe90f1d2abe7af4305a344b10d1a25d75f65902cd7fd775853d3ac43d7c5253ad666e1e63ee98cdcb10af81273d4ff053ff07d51", 16);
-    private BigInteger pPgpBogusPSamp = new BigInteger("15061b26cdab4e865098a01c86f13b03220104c5443e950658b36b85245aa0c616a0c0d8d99c454bea087c172315e45b3bc9b925443948a2b6ba47608a6035b9a79a4ef34a78d7274a12ede8364f02d5030db864988643d7e92753df603bd69fbd2682ab0af64d1a866d1131a2cb13333cedb0a9e6eefddd9fff8154d34c2daab", 16);
-    private int lPgpBogusPSamp = 0;
-
-    public String getName()
-    {
-        return "ElGamal";
-    }
-
-    private void testEnc(
-        int         size,
-        int         privateValueSize,
-        BigInteger  g,
-        BigInteger  p)
-    {
-        ElGamalParameters                dhParams = new ElGamalParameters(p, g, privateValueSize);
-        ElGamalKeyGenerationParameters   params = new ElGamalKeyGenerationParameters(new SecureRandom(), dhParams);
-        ElGamalKeyPairGenerator          kpGen = new ElGamalKeyPairGenerator();
-
-        kpGen.init(params);
-
-        //
-        // generate pair
-        //
-        AsymmetricCipherKeyPair         pair = kpGen.generateKeyPair();
-
-        ElGamalPublicKeyParameters      pu = (ElGamalPublicKeyParameters)pair.getPublic();
-        ElGamalPrivateKeyParameters     pv = (ElGamalPrivateKeyParameters)pair.getPrivate();
-
-        checkKeySize(privateValueSize, pv);
-
-        ElGamalEngine    e = new ElGamalEngine();
-
-        e.init(true, pu);
-        
-        if (e.getOutputBlockSize() != size / 4)
-        {
-            fail(size + " getOutputBlockSize() on encryption failed.");
-        }
-
-        byte[]  message = Hex.decode("5468697320697320612074657374");
-
-        byte[]  pText = message;
-        byte[]  cText = e.processBlock(pText, 0, pText.length);
-
-        e.init(false, pv);
-
-        if (e.getOutputBlockSize() != (size / 8) - 1)
-        {
-            fail(size + " getOutputBlockSize() on decryption failed.");
-        }
-        
-        pText = e.processBlock(cText, 0, cText.length);
-
-        if (!Arrays.areEqual(message, pText))
-        {
-            fail(size + " bit test failed");
-        }
-        
-        e.init(true, pu);
-
-        byte[] bytes = new byte[e.getInputBlockSize() + 2];
-        
-        try
-        {
-            e.processBlock(bytes, 0, bytes.length);
-            
-            fail("out of range block not detected");
-        }
-        catch (DataLengthException ex)
-        {
-            // expected
-        }
-        
-        try
-        {
-            bytes[0] = (byte)0xff;
-            
-            e.processBlock(bytes, 0, bytes.length - 1);
-            
-            fail("out of range block not detected");
-        }
-        catch (DataLengthException ex)
-        {
-            // expected
-        }
-        
-        try
-        {
-            bytes[0] = (byte)0x7f;
-
-            e.processBlock(bytes, 0, bytes.length - 1);
-        }
-        catch (DataLengthException ex)
-        {
-            fail("in range block failed");
-        }
-
-        try
-        {
-            bytes = BigIntegers.asUnsignedByteArray(p);
-
-            e.processBlock(bytes, 0, bytes.length);
-
-            fail("out of range block not detected");
-        }
-        catch (DataLengthException ex)
-        {
-            // expected
-        }
-
-        try
-        {
-            bytes = BigIntegers.asUnsignedByteArray(p.subtract(BigInteger.valueOf(1)));
-
-            e.processBlock(bytes, 0, bytes.length);
-        }
-        catch (DataLengthException ex)
-        {
-            fail("boundary block rejected");
-        }
-    }
-
-    private void checkKeySize(
-        int privateValueSize,
-        ElGamalPrivateKeyParameters priv)
-    {
-        if (privateValueSize != 0)
-        {
-            if (priv.getX().bitLength() != privateValueSize)
-            {
-                fail("limited key check failed for key size " + privateValueSize);
-            }
-        }
-    }
-
-    /**
-     * this test is can take quiet a while
-     *
-     * @param size size of key in bits.
-     */
-    private void testGeneration(
-        int         size)
-    {
-        ElGamalParametersGenerator       pGen = new ElGamalParametersGenerator();
-
-        pGen.init(size, 10, new SecureRandom());
-
-        ElGamalParameters                elParams = pGen.generateParameters();
-
-        if (elParams.getL() != 0)
-        {
-            fail("ElGamalParametersGenerator failed to set L to 0 in generated ElGamalParameters");
-        }
-
-        ElGamalKeyGenerationParameters   params = new ElGamalKeyGenerationParameters(new SecureRandom(), elParams);
-
-        ElGamalKeyPairGenerator          kpGen = new ElGamalKeyPairGenerator();
-
-        kpGen.init(params);
-
-        //
-        // generate first pair
-        //
-        AsymmetricCipherKeyPair         pair = kpGen.generateKeyPair();
-
-        ElGamalPublicKeyParameters      pu = (ElGamalPublicKeyParameters)pair.getPublic();
-        ElGamalPrivateKeyParameters     pv = (ElGamalPrivateKeyParameters)pair.getPrivate();
-
-        ElGamalEngine    e = new ElGamalEngine();
-
-        e.init(true, new ParametersWithRandom(pu, new SecureRandom()));
-
-        byte[]  message = Hex.decode("5468697320697320612074657374");
-
-        byte[]  pText = message;
-        byte[]  cText = e.processBlock(pText, 0, pText.length);
-
-        e.init(false, pv);
-
-        pText = e.processBlock(cText, 0, cText.length);
-
-        if (!Arrays.areEqual(message, pText))
-        {
-            fail("generation test failed");
-        }
-    }
-
-    private void testInitCheck()
-    {
-        try
-        {
-            new ElGamalEngine().processBlock(new byte[]{ 1 }, 0, 1);
-            fail("failed initialisation check");
-        }
-        catch (IllegalStateException e)
-        {
-            // expected
-        }
-    }
-
-    private void testInvalidP()
-    {
-        ElGamalParameters               dhParams = new ElGamalParameters(pPgpBogusPSamp, gPgpBogusPSamp, lPgpBogusPSamp);
-        ElGamalPublicKeyParameters      pu = new ElGamalPublicKeyParameters(yPgpBogusPSamp, dhParams);
-        ElGamalPrivateKeyParameters     pv = new ElGamalPrivateKeyParameters(xPgpBogusPSamp, dhParams);
-
-        ElGamalEngine    e = new ElGamalEngine();
-
-        e.init(true, pu);
-
-        byte[]  message = Hex.decode("5468697320697320612074657374");
-
-        byte[]  pText = message;
-        byte[]  cText = e.processBlock(pText, 0, pText.length);
-
-        e.init(false, pv);
-
-        pText = e.processBlock(cText, 0, cText.length);
-
-        if (Arrays.areEqual(message, pText))
-        {
-            fail("invalid test failed");
-        }
-    }
-
-    public void performTest()
-    {
-        testInvalidP();
-
-        testEnc(512, 0, g512, p512);
-        testEnc(768, 0, g768, p768);
-        testEnc(1024, 0, g1024, p1024);
-
-        testEnc(512, 64, g512, p512);
-        testEnc(768, 128, g768, p768);
-
-        //
-        // generation test.
-        //
-        testGeneration(258);
-
-        testInitCheck();
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        runTest(new ElGamalTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/EqualsHashCodeTest.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/EqualsHashCodeTest.java
deleted file mode 100644
index 1ab7cc4..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/EqualsHashCodeTest.java
+++ /dev/null
@@ -1,261 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import org.bouncycastle.crypto.AsymmetricCipherKeyPair;
-import org.bouncycastle.crypto.generators.DHKeyPairGenerator;
-import org.bouncycastle.crypto.generators.ElGamalKeyPairGenerator;
-import org.bouncycastle.crypto.params.DHKeyGenerationParameters;
-import org.bouncycastle.crypto.params.DHKeyParameters;
-import org.bouncycastle.crypto.params.DHParameters;
-import org.bouncycastle.crypto.params.DHPrivateKeyParameters;
-import org.bouncycastle.crypto.params.DHPublicKeyParameters;
-import org.bouncycastle.crypto.params.DHValidationParameters;
-import org.bouncycastle.crypto.params.DSAParameters;
-import org.bouncycastle.crypto.params.DSAValidationParameters;
-import org.bouncycastle.crypto.params.ElGamalKeyGenerationParameters;
-import org.bouncycastle.crypto.params.ElGamalKeyParameters;
-import org.bouncycastle.crypto.params.ElGamalParameters;
-import org.bouncycastle.crypto.params.ElGamalPrivateKeyParameters;
-import org.bouncycastle.crypto.params.ElGamalPublicKeyParameters;
-import org.bouncycastle.crypto.params.GOST3410Parameters;
-import org.bouncycastle.crypto.params.GOST3410ValidationParameters;
-import org.bouncycastle.util.test.SimpleTest;
-
-import java.math.BigInteger;
-import java.security.SecureRandom;
-
-class DHTestKeyParameters
-    extends DHKeyParameters
-{
-    protected DHTestKeyParameters(boolean isPrivate, DHParameters params)
-    {
-        super(isPrivate, params);
-    }
-}
-
-class ElGamalTestKeyParameters
-    extends ElGamalKeyParameters
-{
-    protected ElGamalTestKeyParameters(boolean isPrivate, ElGamalParameters params)
-    {
-        super(isPrivate, params);
-    }
-}
-
-public class EqualsHashCodeTest
-        extends SimpleTest
-{
-    private static Object OTHER = new Object();
-
-    public String getName()
-    {
-        return "EqualsHashCode";
-    }
-
-    private void doTest(Object a, Object equalsA, Object notEqualsA)
-    {
-        if (a.equals(null))
-        {
-            fail("a equaled null");
-        }
-
-        if (!a.equals(equalsA) || !equalsA.equals(a))
-        {
-            fail("equality failed");
-        }
-
-        if (a.equals(OTHER))
-        {
-            fail("other inequality failed");
-        }
-
-        if (a.equals(notEqualsA) || notEqualsA.equals(a))
-        {
-            fail("inequality failed");
-        }
-
-        if (a.hashCode() != equalsA.hashCode())
-        {
-            fail("hashCode equality failed");
-        }
-    }
-
-    private void dhTest()
-    {
-        BigInteger g512 = new BigInteger("153d5d6172adb43045b68ae8e1de1070b6137005686d29d3d73a7749199681ee5b212c9b96bfdcfa5b20cd5e3fd2044895d609cf9b410b7a0f12ca1cb9a428cc", 16);
-        BigInteger p512 = new BigInteger("9494fec095f3b85ee286542b3836fc81a5dd0a0349b4c239dd38744d488cf8e31db8bcb7d33b41abb9e5a33cca9144b1cef332c94bf0573bf047a3aca98cdf3b", 16);
-
-        DHParameters                dhParams = new DHParameters(p512, g512);
-        DHKeyGenerationParameters   params = new DHKeyGenerationParameters(new SecureRandom(), dhParams);         DHKeyPairGenerator          kpGen = new DHKeyPairGenerator();
-
-        kpGen.init(params);
-
-        AsymmetricCipherKeyPair     pair = kpGen.generateKeyPair();
-        DHPublicKeyParameters       pu1 = (DHPublicKeyParameters)pair.getPublic();
-        DHPrivateKeyParameters      pv1 = (DHPrivateKeyParameters)pair.getPrivate();
-
-        DHPublicKeyParameters       pu2 = new DHPublicKeyParameters(pu1.getY(), pu1.getParameters());
-        DHPrivateKeyParameters      pv2 = new DHPrivateKeyParameters(pv1.getX(), pv1.getParameters());
-        DHPublicKeyParameters       pu3 = new DHPublicKeyParameters(pv1.getX(), pu1.getParameters());
-        DHPrivateKeyParameters      pv3 = new DHPrivateKeyParameters(pu1.getY(), pu1.getParameters());
-
-        doTest(pu1, pu2, pu3);
-        doTest(pv1, pv2, pv3);
-
-        DHParameters                pr1 = pu1.getParameters();
-        DHParameters                pr2 = new DHParameters(pr1.getP(), pr1.getG(), pr1.getQ(), pr1.getM(), pr1.getL(), pr1.getJ(), pr1.getValidationParameters());
-        DHParameters                pr3 = new DHParameters(pr1.getG(), pr1.getP(), pr1.getQ(), pr1.getM(), pr1.getL(), pr1.getJ(), pr1.getValidationParameters());
-
-        doTest(pr1, pr2, pr3);
-
-        pr3 = new DHParameters(pr1.getG(), pr1.getP(), null, pr1.getM(), pr1.getL(), pr1.getJ(), pr1.getValidationParameters());
-
-        doTest(pr1, pr2, pr3);        
-
-        pu2 = new DHPublicKeyParameters(pu1.getY(), pr2);
-        pv2 = new DHPrivateKeyParameters(pv1.getX(), pr2);
-
-        doTest(pu1, pu2, pu3);
-        doTest(pv1, pv2, pv3);
-
-        DHValidationParameters vp1 = new DHValidationParameters(new byte[20], 1024);
-        DHValidationParameters vp2 = new DHValidationParameters(new byte[20], 1024);
-        DHValidationParameters vp3 = new DHValidationParameters(new byte[24], 1024);
-
-        doTest(vp1, vp1, vp3);
-        doTest(vp1, vp2, vp3);
-
-        byte[] bytes = new byte[20];
-        bytes[0] = 1;
-
-        vp3 = new DHValidationParameters(bytes, 1024);
-
-        doTest(vp1, vp2, vp3);
-
-        vp3 = new DHValidationParameters(new byte[20], 2048);
-
-        doTest(vp1, vp2, vp3);
-
-        DHTestKeyParameters k1 = new DHTestKeyParameters(false, null);
-        DHTestKeyParameters k2 = new DHTestKeyParameters(false, null);
-        DHTestKeyParameters k3 = new DHTestKeyParameters(false, pu1.getParameters());
-
-        doTest(k1, k2, k3);
-    }
-
-    private void elGamalTest()
-    {
-        BigInteger g512 = new BigInteger("153d5d6172adb43045b68ae8e1de1070b6137005686d29d3d73a7749199681ee5b212c9b96bfdcfa5b20cd5e3fd2044895d609cf9b410b7a0f12ca1cb9a428cc", 16);
-        BigInteger p512 = new BigInteger("9494fec095f3b85ee286542b3836fc81a5dd0a0349b4c239dd38744d488cf8e31db8bcb7d33b41abb9e5a33cca9144b1cef332c94bf0573bf047a3aca98cdf3b", 16);
-
-        ElGamalParameters dhParams = new ElGamalParameters(p512, g512);
-        ElGamalKeyGenerationParameters params = new ElGamalKeyGenerationParameters(new SecureRandom(), dhParams);         ElGamalKeyPairGenerator kpGen = new ElGamalKeyPairGenerator();
-
-        kpGen.init(params);
-
-        AsymmetricCipherKeyPair     pair = kpGen.generateKeyPair();
-        ElGamalPublicKeyParameters       pu1 = (ElGamalPublicKeyParameters)pair.getPublic();
-        ElGamalPrivateKeyParameters      pv1 = (ElGamalPrivateKeyParameters)pair.getPrivate();
-
-        ElGamalPublicKeyParameters       pu2 = new ElGamalPublicKeyParameters(pu1.getY(), pu1.getParameters());
-        ElGamalPrivateKeyParameters      pv2 = new ElGamalPrivateKeyParameters(pv1.getX(), pv1.getParameters());
-        ElGamalPublicKeyParameters       pu3 = new ElGamalPublicKeyParameters(pv1.getX(), pu1.getParameters());
-        ElGamalPrivateKeyParameters      pv3 = new ElGamalPrivateKeyParameters(pu1.getY(), pu1.getParameters());
-
-        doTest(pu1, pu2, pu3);
-        doTest(pv1, pv2, pv3);
-
-        ElGamalParameters                pr1 = pu1.getParameters();
-        ElGamalParameters                pr2 = new ElGamalParameters(pr1.getP(), pr1.getG());
-        ElGamalParameters                pr3 = new ElGamalParameters(pr1.getG(), pr1.getP());
-
-        doTest(pr1, pr2, pr3);
-
-        pu2 = new ElGamalPublicKeyParameters(pu1.getY(), pr2);
-        pv2 = new ElGamalPrivateKeyParameters(pv1.getX(), pr2);
-
-        doTest(pu1, pu2, pu3);
-        doTest(pv1, pv2, pv3);
-
-        ElGamalTestKeyParameters k1 = new ElGamalTestKeyParameters(false, null);
-        ElGamalTestKeyParameters k2 = new ElGamalTestKeyParameters(false, null);
-        ElGamalTestKeyParameters k3 = new ElGamalTestKeyParameters(false, pu1.getParameters());
-
-        doTest(k1, k2, k3);
-    }
-
-    private void dsaTest()
-    {
-        BigInteger a = BigInteger.valueOf(1), b = BigInteger.valueOf(2), c = BigInteger.valueOf(3);
-
-        DSAParameters dsaP1 = new DSAParameters(a, b, c);
-        DSAParameters dsaP2 = new DSAParameters(a, b, c);
-        DSAParameters dsaP3 = new DSAParameters(b, c, a);
-
-        doTest(dsaP1, dsaP2, dsaP3);
-
-        DSAValidationParameters vp1 = new DSAValidationParameters(new byte[20], 1024);
-        DSAValidationParameters vp2 = new DSAValidationParameters(new byte[20], 1024);
-        DSAValidationParameters vp3 = new DSAValidationParameters(new byte[24], 1024);
-
-        doTest(vp1, vp1, vp3);
-        doTest(vp1, vp2, vp3);
-
-        byte[] bytes = new byte[20];
-        bytes[0] = 1;
-
-        vp3 = new DSAValidationParameters(bytes, 1024);
-
-        doTest(vp1, vp2, vp3);
-
-        vp3 = new DSAValidationParameters(new byte[20], 2048);
-
-        doTest(vp1, vp2, vp3);
-    }
-
-    private void gost3410Test()
-    {
-        BigInteger a = BigInteger.valueOf(1), b = BigInteger.valueOf(2), c = BigInteger.valueOf(3);
-
-        GOST3410Parameters g1 = new GOST3410Parameters(a, b, c);
-        GOST3410Parameters g2 = new GOST3410Parameters(a, b, c);
-        GOST3410Parameters g3 = new GOST3410Parameters(a, c, c);
-
-        doTest(g1, g2, g3);
-
-        GOST3410ValidationParameters v1 = new GOST3410ValidationParameters(100, 1);
-        GOST3410ValidationParameters v2 = new GOST3410ValidationParameters(100, 1);
-        GOST3410ValidationParameters v3 = new GOST3410ValidationParameters(101, 1);
-
-        doTest(v1, v2, v3);
-
-        v3 = new GOST3410ValidationParameters(100, 2);
-
-        doTest(v1, v2, v3);
-
-        v1 = new GOST3410ValidationParameters(100L, 1L);
-        v2 = new GOST3410ValidationParameters(100L, 1L);
-        v3 = new GOST3410ValidationParameters(101L, 1L);
-
-        doTest(v1, v2, v3);
-
-        v3 = new GOST3410ValidationParameters(100L, 2L);
-
-        doTest(v1, v2, v3);
-
-    }
-
-    public void performTest()
-        throws Exception
-    {
-        dhTest();
-        elGamalTest();
-        gost3410Test();
-        dsaTest();
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        runTest(new EqualsHashCodeTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/GCMReorderTest.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/GCMReorderTest.java
deleted file mode 100644
index efac338..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/GCMReorderTest.java
+++ /dev/null
@@ -1,347 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import java.io.IOException;
-import java.security.SecureRandom;
-
-import junit.framework.TestCase;
-import org.bouncycastle.crypto.modes.gcm.GCMExponentiator;
-import org.bouncycastle.crypto.modes.gcm.GCMMultiplier;
-import org.bouncycastle.crypto.modes.gcm.Tables1kGCMExponentiator;
-import org.bouncycastle.crypto.modes.gcm.Tables64kGCMMultiplier;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.Pack;
-import org.bouncycastle.util.encoders.Hex;
-
-public class GCMReorderTest
-    extends TestCase
-{
-    private static final byte[] H;
-    private static final SecureRandom random = new SecureRandom(); 
-    private static final GCMMultiplier mul = new Tables64kGCMMultiplier();
-    private static final GCMExponentiator exp = new Tables1kGCMExponentiator();
-    private static final byte[] EMPTY = new byte[0];
-
-    static
-    {
-        H = new byte[16];
-        random.nextBytes(H);
-        mul.init(Arrays.clone(H));
-        exp.init(Arrays.clone(H));
-    }
-
-    public void testCombine() throws Exception
-    {
-        for (int count = 0; count < 10; ++count)
-        {
-            byte[] A = randomBytes(1000);
-            byte[] C = randomBytes(1000);
-
-            byte[] ghashA_ = GHASH(A, EMPTY);
-            byte[] ghash_C = GHASH(EMPTY, C);
-            byte[] ghashAC = GHASH(A, C);
-
-            byte[] ghashCombine = combine_GHASH(ghashA_, (long)A.length * 8, ghash_C, (long)C.length * 8);
-
-            assertTrue(Arrays.areEqual(ghashAC, ghashCombine));
-        }
-    }
-
-    public void testConcatAuth() throws Exception
-    {
-        for (int count = 0; count < 10; ++count)
-        {
-            byte[] P = randomBlocks(100);
-            byte[] A = randomBytes(1000);
-            byte[] PA = concatArrays(P, A);
-
-            byte[] ghashP_ = GHASH(P, EMPTY);
-            byte[] ghashA_ = GHASH(A, EMPTY);
-            byte[] ghashPA_ = GHASH(PA, EMPTY);
-            byte[] ghashConcat = concatAuth_GHASH(ghashP_, (long)P.length * 8, ghashA_, (long)A.length * 8);
-
-            assertTrue(Arrays.areEqual(ghashPA_, ghashConcat));
-        }
-    }
-
-    public void testConcatCrypt() throws Exception
-    {
-        for (int count = 0; count < 10; ++count)
-        {
-            byte[] P = randomBlocks(100);
-            byte[] A = randomBytes(1000);
-            byte[] PA = concatArrays(P, A);
-    
-            byte[] ghash_P = GHASH(EMPTY, P);
-            byte[] ghash_A = GHASH(EMPTY, A);
-            byte[] ghash_PA = GHASH(EMPTY, PA);
-            byte[] ghashConcat = concatCrypt_GHASH(ghash_P, (long)P.length * 8, ghash_A, (long)A.length * 8);
-
-            assertTrue(Arrays.areEqual(ghash_PA, ghashConcat));
-        }
-    }
-
-    public void testExp()
-    {
-        {
-            byte[] buf1 = new byte[16];
-            buf1[0] = (byte)0x80;
-    
-            byte[] buf2 = new byte[16];
-    
-            for (int pow = 0; pow != 100; ++pow)
-            {
-                exp.exponentiateX(pow, buf2);
-    
-                assertTrue(Arrays.areEqual(buf1, buf2));
-
-                mul.multiplyH(buf1);
-            }
-        }
-
-        long[] testPow = new long[]{ 10, 1, 8, 17, 24, 13, 2, 13, 2, 3 };
-        byte[][] testData = new byte[][]{
-            Hex.decode("9185848a877bd87ba071e281f476e8e7"),
-            Hex.decode("697ce3052137d80745d524474fb6b290"),
-            Hex.decode("2696fc47198bb23b11296e4f88720a17"),
-            Hex.decode("01f2f0ead011a4ae0cf3572f1b76dd8e"),
-            Hex.decode("a53060694a044e4b7fa1e661c5a7bb6b"),
-            Hex.decode("39c0392e8b6b0e04a7565c85394c2c4c"),
-            Hex.decode("519c362d502e07f2d8b7597a359a5214"),
-            Hex.decode("5a527a393675705e19b2117f67695af4"),
-            Hex.decode("27fc0901d1d332a53ba4d4386c2109d2"),
-            Hex.decode("93ca9b57174aabedf8220e83366d7df6"),
-        };
-
-        for (int i = 0; i != 10; ++i)
-        {
-            long pow = testPow[i];
-            byte[] data = Arrays.clone(testData[i]);
-
-            byte[] expected = Arrays.clone(data);
-            for (int j = 0; j < pow; ++j)
-            {
-                mul.multiplyH(expected);
-            }
-
-            byte[] H_a = new byte[16];
-            exp.exponentiateX(pow, H_a);
-            byte[] actual = multiply(data, H_a);
-
-            assertTrue(Arrays.areEqual(expected, actual));
-        }
-    }
-
-    public void testMultiply()
-    {
-        byte[] expected = Arrays.clone(H);
-        mul.multiplyH(expected);
-
-        assertTrue(Arrays.areEqual(expected, multiply(H, H)));
-
-        for (int count = 0; count < 10; ++count)
-        {
-            byte[] a = new byte[16];
-            random.nextBytes(a);
-
-            byte[] b = new byte[16];
-            random.nextBytes(b);
-
-            expected = Arrays.clone(a);
-            mul.multiplyH(expected);
-            assertTrue(Arrays.areEqual(expected, multiply(a, H)));
-            assertTrue(Arrays.areEqual(expected, multiply(H, a)));
-
-            expected = Arrays.clone(b);
-            mul.multiplyH(expected);
-            assertTrue(Arrays.areEqual(expected, multiply(b, H)));
-            assertTrue(Arrays.areEqual(expected, multiply(H, b)));
-
-            assertTrue(Arrays.areEqual(multiply(a, b), multiply(b, a)));
-        }
-    }
-
-    private byte[] randomBlocks(int upper)
-    {
-        byte[] bs = new byte[16 * random.nextInt(upper)];
-        random.nextBytes(bs);
-        return bs;
-    }
-
-    private byte[] randomBytes(int upper)
-    {
-        byte[] bs = new byte[random.nextInt(upper)];
-        random.nextBytes(bs);
-        return bs;
-    }
-
-    private byte[] concatArrays(byte[] a, byte[] b) throws IOException
-    {
-        byte[] ab = new byte[a.length + b.length];
-        System.arraycopy(a, 0, ab, 0, a.length);
-        System.arraycopy(b, 0, ab, a.length, b.length);
-        return ab;
-    }
-
-    private byte[] combine_GHASH(byte[] ghashA_, long bitlenA, byte[] ghash_C, long bitlenC)
-    {
-        // Note: bitlenA must be aligned to the block size
-
-        long c = (bitlenC + 127) >>> 7;
-
-        byte[] H_c = new byte[16];
-        exp.exponentiateX(c, H_c);
-
-        byte[] tmp1 = lengthBlock(bitlenA, 0);
-        mul.multiplyH(tmp1);
-
-        byte[] ghashAC = Arrays.clone(ghashA_);
-        xor(ghashAC, tmp1);
-        ghashAC = multiply(ghashAC, H_c);
-        // No need to touch the len(C) part (second 8 bytes)
-        xor(ghashAC, tmp1);
-        xor(ghashAC, ghash_C);
-
-        return ghashAC;
-    }
-
-    private byte[] concatAuth_GHASH(byte[] ghashP, long bitlenP, byte[] ghashA, long bitlenA)
-    {
-        // Note: bitlenP must be aligned to the block size
-
-        long a = (bitlenA + 127) >>> 7;
-
-        byte[] tmp1 = lengthBlock(bitlenP, 0);
-        mul.multiplyH(tmp1);
-
-        byte[] tmp2 = lengthBlock(bitlenA ^ (bitlenP + bitlenA), 0);
-        mul.multiplyH(tmp2);
-
-        byte[] H_a = new byte[16];
-        exp.exponentiateX(a, H_a);
-        
-        byte[] ghashC = Arrays.clone(ghashP);
-        xor(ghashC, tmp1);
-        ghashC = multiply(ghashC, H_a);
-        xor(ghashC, tmp2);
-        xor(ghashC, ghashA);
-        return ghashC;
-    }
-
-    private byte[] concatCrypt_GHASH(byte[] ghashP, long bitlenP, byte[] ghashA, long bitlenA)
-    {
-        // Note: bitlenP must be aligned to the block size
-
-        long a = (bitlenA + 127) >>> 7;
-
-        byte[] tmp1 = lengthBlock(0, bitlenP);
-        mul.multiplyH(tmp1);
-
-        byte[] tmp2 = lengthBlock(0, bitlenA ^ (bitlenP + bitlenA));
-        mul.multiplyH(tmp2);
-
-        byte[] H_a = new byte[16];
-        exp.exponentiateX(a, H_a);
-        
-        byte[] ghashC = Arrays.clone(ghashP);
-        xor(ghashC, tmp1);
-        ghashC = multiply(ghashC, H_a);
-        xor(ghashC, tmp2);
-        xor(ghashC, ghashA);
-        return ghashC;
-    }
-
-    private byte[] GHASH(byte[] A, byte[] C)
-    {
-        byte[] X = new byte[16];
-
-        {
-            for (int pos = 0; pos < A.length; pos += 16)
-            {
-                byte[] tmp = new byte[16];
-                int num = Math.min(A.length - pos, 16);
-                System.arraycopy(A, pos, tmp, 0, num);
-                xor(X, tmp);
-                mul.multiplyH(X);
-            }
-        }
-
-        {
-            for (int pos = 0; pos < C.length; pos += 16)
-            {
-                byte[] tmp = new byte[16];
-                int num = Math.min(C.length - pos, 16);
-                System.arraycopy(C, pos, tmp, 0, num);
-                xor(X, tmp);
-                mul.multiplyH(X);
-            }
-        }
-
-        {
-            xor(X, lengthBlock((long)A.length * 8, (long)C.length * 8));
-            mul.multiplyH(X);
-        }
-
-        return X;
-    }
-
-    private static byte[] lengthBlock(long bitlenA, long bitlenC)
-    {
-        byte[] tmp = new byte[16];
-        Pack.longToBigEndian(bitlenA, tmp, 0);
-        Pack.longToBigEndian(bitlenC, tmp, 8);
-        return tmp;
-    }
-
-    private static void xor(byte[] block, byte[] val)
-    {
-        for (int i = 15; i >= 0; --i)
-        {
-            block[i] ^= val[i];
-        }
-    }
-
-    private static byte[] multiply(byte[] a, byte[] b)
-    {
-        byte[] c = new byte[16];
-        byte[] tmp = Arrays.clone(b);
-
-        for (int i = 0; i < 16; ++i)
-        {
-            byte bits = a[i];
-            for (int j = 7; j >= 0; --j)
-            {
-                if ((bits & (1 << j)) != 0)
-                {
-                    xor(c, tmp);
-                }
-
-                boolean lsb = (tmp[15] & 1) != 0;
-                shiftRight(tmp);
-                if (lsb)
-                {
-                    // R = new byte[]{ 0xe1, ... };
-//                    GCMUtil.xor(v, R);
-                    tmp[0] ^= (byte)0xe1;
-                }
-            }
-        }
-
-        return c;
-    }
-
-    private static void shiftRight(byte[] block)
-    {
-        int i = 0;
-        int bit = 0;
-        for (;;)
-        {
-            int b = block[i] & 0xff;
-            block[i] = (byte) ((b >>> 1) | bit);
-            if (++i == 16)
-            {
-                break;
-            }
-            bit = (b & 1) << 7;
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/GCMTest.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/GCMTest.java
deleted file mode 100644
index b34cc4e..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/GCMTest.java
+++ /dev/null
@@ -1,687 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import java.security.SecureRandom;
-
-import org.bouncycastle.crypto.BlockCipher;
-import org.bouncycastle.crypto.InvalidCipherTextException;
-import org.bouncycastle.crypto.engines.AESFastEngine;
-import org.bouncycastle.crypto.engines.DESEngine;
-import org.bouncycastle.crypto.modes.GCMBlockCipher;
-import org.bouncycastle.crypto.modes.gcm.BasicGCMMultiplier;
-import org.bouncycastle.crypto.modes.gcm.GCMMultiplier;
-import org.bouncycastle.crypto.modes.gcm.Tables64kGCMMultiplier;
-import org.bouncycastle.crypto.modes.gcm.Tables8kGCMMultiplier;
-import org.bouncycastle.crypto.params.AEADParameters;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.util.Times;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-
-/**
- * Test vectors from "The Galois/Counter Mode of Operation (GCM)", McGrew/Viega, Appendix B
- */
-public class GCMTest
-    extends SimpleTest
-{
-    private static final String[][] TEST_VECTORS = new String[][] {
-        {
-            "Test Case 1",
-            "00000000000000000000000000000000",
-            "",
-            "",
-            "000000000000000000000000",
-            "",
-            "58e2fccefa7e3061367f1d57a4e7455a",
-        },
-        {
-            "Test Case 2",
-            "00000000000000000000000000000000",
-            "00000000000000000000000000000000",
-            "",
-            "000000000000000000000000",
-            "0388dace60b6a392f328c2b971b2fe78",
-            "ab6e47d42cec13bdf53a67b21257bddf",
-        },
-        {
-            "Test Case 3",
-            "feffe9928665731c6d6a8f9467308308",
-            "d9313225f88406e5a55909c5aff5269a"
-            + "86a7a9531534f7da2e4c303d8a318a72"
-            + "1c3c0c95956809532fcf0e2449a6b525"
-            + "b16aedf5aa0de657ba637b391aafd255",
-            "",
-            "cafebabefacedbaddecaf888",
-            "42831ec2217774244b7221b784d0d49c"
-            + "e3aa212f2c02a4e035c17e2329aca12e"
-            + "21d514b25466931c7d8f6a5aac84aa05"
-            + "1ba30b396a0aac973d58e091473f5985",
-            "4d5c2af327cd64a62cf35abd2ba6fab4",
-        },
-        {
-            "Test Case 4",
-            "feffe9928665731c6d6a8f9467308308",
-            "d9313225f88406e5a55909c5aff5269a"
-            + "86a7a9531534f7da2e4c303d8a318a72"
-            + "1c3c0c95956809532fcf0e2449a6b525"
-            + "b16aedf5aa0de657ba637b39",
-            "feedfacedeadbeeffeedfacedeadbeef"
-            + "abaddad2",
-            "cafebabefacedbaddecaf888",
-            "42831ec2217774244b7221b784d0d49c"
-            + "e3aa212f2c02a4e035c17e2329aca12e"
-            + "21d514b25466931c7d8f6a5aac84aa05"
-            + "1ba30b396a0aac973d58e091",
-            "5bc94fbc3221a5db94fae95ae7121a47",
-        },
-        {
-            "Test Case 5",
-            "feffe9928665731c6d6a8f9467308308",
-            "d9313225f88406e5a55909c5aff5269a"
-            + "86a7a9531534f7da2e4c303d8a318a72"
-            + "1c3c0c95956809532fcf0e2449a6b525"
-            + "b16aedf5aa0de657ba637b39",
-            "feedfacedeadbeeffeedfacedeadbeef"
-            + "abaddad2",
-            "cafebabefacedbad",
-            "61353b4c2806934a777ff51fa22a4755"
-            + "699b2a714fcdc6f83766e5f97b6c7423"
-            + "73806900e49f24b22b097544d4896b42"
-            + "4989b5e1ebac0f07c23f4598",
-            "3612d2e79e3b0785561be14aaca2fccb",
-        },
-        {
-            "Test Case 6",
-            "feffe9928665731c6d6a8f9467308308",
-            "d9313225f88406e5a55909c5aff5269a"
-            + "86a7a9531534f7da2e4c303d8a318a72"
-            + "1c3c0c95956809532fcf0e2449a6b525"
-            + "b16aedf5aa0de657ba637b39",
-            "feedfacedeadbeeffeedfacedeadbeef"
-            + "abaddad2",
-            "9313225df88406e555909c5aff5269aa"
-            + "6a7a9538534f7da1e4c303d2a318a728"
-            + "c3c0c95156809539fcf0e2429a6b5254"
-            + "16aedbf5a0de6a57a637b39b",
-            "8ce24998625615b603a033aca13fb894"
-            + "be9112a5c3a211a8ba262a3cca7e2ca7"
-            + "01e4a9a4fba43c90ccdcb281d48c7c6f"
-            + "d62875d2aca417034c34aee5",
-            "619cc5aefffe0bfa462af43c1699d050",
-        },
-        {
-            "Test Case 7",
-            "00000000000000000000000000000000"
-            + "0000000000000000",
-            "",
-            "",
-            "000000000000000000000000",
-            "",
-            "cd33b28ac773f74ba00ed1f312572435",
-        },
-        {
-            "Test Case 8",
-            "00000000000000000000000000000000"
-            + "0000000000000000",
-            "00000000000000000000000000000000",
-            "",
-            "000000000000000000000000",
-            "98e7247c07f0fe411c267e4384b0f600",
-            "2ff58d80033927ab8ef4d4587514f0fb",
-        },
-        {
-            "Test Case 9",
-            "feffe9928665731c6d6a8f9467308308"
-            + "feffe9928665731c",
-            "d9313225f88406e5a55909c5aff5269a"
-            + "86a7a9531534f7da2e4c303d8a318a72"
-            + "1c3c0c95956809532fcf0e2449a6b525"
-            + "b16aedf5aa0de657ba637b391aafd255",
-            "",
-            "cafebabefacedbaddecaf888",
-            "3980ca0b3c00e841eb06fac4872a2757"
-            + "859e1ceaa6efd984628593b40ca1e19c"
-            + "7d773d00c144c525ac619d18c84a3f47"
-            + "18e2448b2fe324d9ccda2710acade256",
-            "9924a7c8587336bfb118024db8674a14",
-        },
-        {
-            "Test Case 10",
-            "feffe9928665731c6d6a8f9467308308"
-            + "feffe9928665731c",
-            "d9313225f88406e5a55909c5aff5269a"
-            + "86a7a9531534f7da2e4c303d8a318a72"
-            + "1c3c0c95956809532fcf0e2449a6b525"
-            + "b16aedf5aa0de657ba637b39",
-            "feedfacedeadbeeffeedfacedeadbeef"
-            + "abaddad2",
-            "cafebabefacedbaddecaf888",
-            "3980ca0b3c00e841eb06fac4872a2757"
-            + "859e1ceaa6efd984628593b40ca1e19c"
-            + "7d773d00c144c525ac619d18c84a3f47"
-            + "18e2448b2fe324d9ccda2710",
-            "2519498e80f1478f37ba55bd6d27618c",
-        },
-        {
-            "Test Case 11",
-            "feffe9928665731c6d6a8f9467308308"
-            + "feffe9928665731c",
-            "d9313225f88406e5a55909c5aff5269a"
-            + "86a7a9531534f7da2e4c303d8a318a72"
-            + "1c3c0c95956809532fcf0e2449a6b525"
-            + "b16aedf5aa0de657ba637b39",
-            "feedfacedeadbeeffeedfacedeadbeef"
-            + "abaddad2",
-            "cafebabefacedbad",
-            "0f10f599ae14a154ed24b36e25324db8"
-            + "c566632ef2bbb34f8347280fc4507057"
-            + "fddc29df9a471f75c66541d4d4dad1c9"
-            + "e93a19a58e8b473fa0f062f7",
-            "65dcc57fcf623a24094fcca40d3533f8",
-        },
-        {
-            "Test Case 12",
-            "feffe9928665731c6d6a8f9467308308"
-            + "feffe9928665731c",
-            "d9313225f88406e5a55909c5aff5269a"
-            + "86a7a9531534f7da2e4c303d8a318a72"
-            + "1c3c0c95956809532fcf0e2449a6b525"
-            + "b16aedf5aa0de657ba637b39",
-            "feedfacedeadbeeffeedfacedeadbeef"
-            + "abaddad2",
-            "9313225df88406e555909c5aff5269aa"
-            + "6a7a9538534f7da1e4c303d2a318a728"
-            + "c3c0c95156809539fcf0e2429a6b5254"
-            + "16aedbf5a0de6a57a637b39b",
-            "d27e88681ce3243c4830165a8fdcf9ff"
-            + "1de9a1d8e6b447ef6ef7b79828666e45"
-            + "81e79012af34ddd9e2f037589b292db3"
-            + "e67c036745fa22e7e9b7373b",
-            "dcf566ff291c25bbb8568fc3d376a6d9",
-        },
-        {
-            "Test Case 13",
-            "00000000000000000000000000000000"
-            + "00000000000000000000000000000000",
-            "",
-            "",
-            "000000000000000000000000",
-            "",
-            "530f8afbc74536b9a963b4f1c4cb738b",
-        },
-        {
-            "Test Case 14",
-            "00000000000000000000000000000000"
-            + "00000000000000000000000000000000",
-            "00000000000000000000000000000000",
-            "",
-            "000000000000000000000000",
-            "cea7403d4d606b6e074ec5d3baf39d18",
-            "d0d1c8a799996bf0265b98b5d48ab919",
-        },
-        {
-            "Test Case 15",
-            "feffe9928665731c6d6a8f9467308308"
-            + "feffe9928665731c6d6a8f9467308308",
-            "d9313225f88406e5a55909c5aff5269a"
-            + "86a7a9531534f7da2e4c303d8a318a72"
-            + "1c3c0c95956809532fcf0e2449a6b525"
-            + "b16aedf5aa0de657ba637b391aafd255",
-            "",
-            "cafebabefacedbaddecaf888",
-            "522dc1f099567d07f47f37a32a84427d"
-            + "643a8cdcbfe5c0c97598a2bd2555d1aa"
-            + "8cb08e48590dbb3da7b08b1056828838"
-            + "c5f61e6393ba7a0abcc9f662898015ad",
-            "b094dac5d93471bdec1a502270e3cc6c",
-        },
-        {
-            "Test Case 16",
-            "feffe9928665731c6d6a8f9467308308"
-            + "feffe9928665731c6d6a8f9467308308",
-            "d9313225f88406e5a55909c5aff5269a"
-            + "86a7a9531534f7da2e4c303d8a318a72"
-            + "1c3c0c95956809532fcf0e2449a6b525"
-            + "b16aedf5aa0de657ba637b39",
-            "feedfacedeadbeeffeedfacedeadbeef"
-            + "abaddad2",
-            "cafebabefacedbaddecaf888",
-            "522dc1f099567d07f47f37a32a84427d"
-            + "643a8cdcbfe5c0c97598a2bd2555d1aa"
-            + "8cb08e48590dbb3da7b08b1056828838"
-            + "c5f61e6393ba7a0abcc9f662",
-            "76fc6ece0f4e1768cddf8853bb2d551b",
-        },
-        {
-            "Test Case 17",
-            "feffe9928665731c6d6a8f9467308308"
-            + "feffe9928665731c6d6a8f9467308308",
-            "d9313225f88406e5a55909c5aff5269a"
-            + "86a7a9531534f7da2e4c303d8a318a72"
-            + "1c3c0c95956809532fcf0e2449a6b525"
-            + "b16aedf5aa0de657ba637b39",
-            "feedfacedeadbeeffeedfacedeadbeef"
-            + "abaddad2",
-            "cafebabefacedbad",
-            "c3762df1ca787d32ae47c13bf19844cb"
-            + "af1ae14d0b976afac52ff7d79bba9de0"
-            + "feb582d33934a4f0954cc2363bc73f78"
-            + "62ac430e64abe499f47c9b1f",
-            "3a337dbf46a792c45e454913fe2ea8f2",
-        },
-        {
-            "Test Case 18",
-            "feffe9928665731c6d6a8f9467308308"
-            + "feffe9928665731c6d6a8f9467308308",
-            "d9313225f88406e5a55909c5aff5269a"
-            + "86a7a9531534f7da2e4c303d8a318a72"
-            + "1c3c0c95956809532fcf0e2449a6b525"
-            + "b16aedf5aa0de657ba637b39",
-            "feedfacedeadbeeffeedfacedeadbeef"
-            + "abaddad2",
-            "9313225df88406e555909c5aff5269aa"
-            + "6a7a9538534f7da1e4c303d2a318a728"
-            + "c3c0c95156809539fcf0e2429a6b5254"
-            + "16aedbf5a0de6a57a637b39b",
-            "5a8def2f0c9e53f1f75d7853659e2a20"
-            + "eeb2b22aafde6419a058ab4f6f746bf4"
-            + "0fc0c3b780f244452da3ebf1c5d82cde"
-            + "a2418997200ef82e44ae7e3f",
-            "a44a8266ee1c8eb0c8b5d4cf5ae9f19a",
-        },
-    };
-
-    public String getName()
-    {
-        return "GCM";
-    }
-
-    public void performTest() throws Exception
-    {
-        for (int i = 0; i < TEST_VECTORS.length; ++i)
-        {
-            runTestCase(TEST_VECTORS[i]);
-        }
-
-        randomTests();
-        outputSizeTests();
-        testExceptions();
-    }
-
-    protected BlockCipher createAESEngine()
-    {
-        return new AESFastEngine();
-    }
-
-    private void testExceptions() throws InvalidCipherTextException
-    {
-        GCMBlockCipher gcm = new GCMBlockCipher(createAESEngine());
-
-        try
-        {
-            gcm = new GCMBlockCipher(new DESEngine());
-
-            fail("incorrect block size not picked up");
-        }
-        catch (IllegalArgumentException e)
-        {
-            // expected
-        }
-
-        try
-        {
-            gcm.init(false, new KeyParameter(new byte[16]));
-
-            fail("illegal argument not picked up");
-        }
-        catch (IllegalArgumentException e)
-        {
-            // expected
-        }
-
-        AEADTestUtil.testReset(this, new GCMBlockCipher(createAESEngine()), new GCMBlockCipher(createAESEngine()), new AEADParameters(new KeyParameter(new byte[16]), 128, new byte[16]));
-        AEADTestUtil.testTampering(this, gcm, new AEADParameters(new KeyParameter(new byte[16]), 128, new byte[16]));
-        AEADTestUtil.testOutputSizes(this, new GCMBlockCipher(createAESEngine()), new AEADParameters(new KeyParameter(
-                new byte[16]), 128, new byte[16]));
-        AEADTestUtil.testBufferSizeChecks(this, new GCMBlockCipher(createAESEngine()), new AEADParameters(
-                new KeyParameter(new byte[16]), 128, new byte[16]));
-    }
-
-    private void runTestCase(String[] testVector)
-        throws InvalidCipherTextException
-    {
-        for (int macLength = 12; macLength <= 16; ++macLength)
-        {
-            runTestCase(testVector, macLength);
-        }
-    }
-
-    private void runTestCase(String[] testVector, int macLength)
-        throws InvalidCipherTextException
-    {
-        int pos = 0;
-        String testName = testVector[pos++];
-        byte[] K = Hex.decode(testVector[pos++]);
-        byte[] P = Hex.decode(testVector[pos++]);
-        byte[] A = Hex.decode(testVector[pos++]);
-        byte[] IV = Hex.decode(testVector[pos++]);
-        byte[] C = Hex.decode(testVector[pos++]);
-
-        // For short MAC, take leading bytes
-        byte[] t = Hex.decode(testVector[pos++]);
-        byte[] T = new byte[macLength];
-        System.arraycopy(t, 0, T, 0, T.length);
-
-        // Default multiplier
-        runTestCase(null, null, testName, K, IV, A, P, C, T);
-
-        runTestCase(new BasicGCMMultiplier(), new BasicGCMMultiplier(), testName, K, IV, A, P, C, T);
-        runTestCase(new Tables8kGCMMultiplier(), new Tables8kGCMMultiplier(), testName, K, IV, A, P, C, T);
-        runTestCase(new Tables64kGCMMultiplier(), new Tables64kGCMMultiplier(), testName, K, IV, A, P, C, T);
-    }
-
-    private void runTestCase(
-        GCMMultiplier   encM,
-        GCMMultiplier   decM,
-        String          testName,
-        byte[]          K,
-        byte[]          IV,
-        byte[]          A,
-        byte[]          P,
-        byte[]          C,
-        byte[]          T)
-        throws InvalidCipherTextException
-    {
-        byte[] fa = new byte[A.length / 2];
-        byte[] la = new byte[A.length - (A.length / 2)];
-        System.arraycopy(A, 0, fa, 0, fa.length);
-        System.arraycopy(A, fa.length, la, 0, la.length);
-
-        runTestCase(encM, decM, testName + " all initial associated data", K, IV, A, null, P, C, T);
-        runTestCase(encM, decM, testName + " all subsequent associated data", K, IV, null, A, P, C, T);
-        runTestCase(encM, decM, testName + " split associated data", K, IV, fa, la, P, C, T);
-    }
-
-    private void runTestCase(
-        GCMMultiplier   encM,
-        GCMMultiplier   decM,
-        String          testName,
-        byte[]          K,
-        byte[]          IV,
-        byte[]          A,
-        byte[]          SA,
-        byte[]          P,
-        byte[]          C,
-        byte[]          T)
-        throws InvalidCipherTextException
-    {
-        AEADParameters parameters = new AEADParameters(new KeyParameter(K), T.length * 8, IV, A);
-        GCMBlockCipher encCipher = initCipher(encM, true, parameters);
-        GCMBlockCipher decCipher = initCipher(decM, false, parameters);
-        checkTestCase(encCipher, decCipher, testName, SA, P, C, T);
-        checkTestCase(encCipher, decCipher, testName + " (reused)", SA, P, C, T);
-
-        // Key reuse
-        AEADParameters keyReuseParams = AEADTestUtil.reuseKey(parameters);
-        encCipher.init(true, keyReuseParams);
-        decCipher.init(false, keyReuseParams);
-        checkTestCase(encCipher, decCipher, testName + " (key reuse)", SA, P, C, T);
-    }
-
-    private GCMBlockCipher initCipher(GCMMultiplier m, boolean forEncryption, AEADParameters parameters)
-    {
-        GCMBlockCipher c = new GCMBlockCipher(createAESEngine(), m);
-        c.init(forEncryption, parameters);
-        return c;
-    }
-
-    private void checkTestCase(
-        GCMBlockCipher  encCipher,
-        GCMBlockCipher  decCipher,
-        String          testName,
-        byte[]          SA,
-        byte[]          P,
-        byte[]          C,
-        byte[]          T)
-        throws InvalidCipherTextException
-    {
-        byte[] enc = new byte[encCipher.getOutputSize(P.length)];
-        if (SA != null)
-        {
-            encCipher.processAADBytes(SA, 0, SA.length);
-        }
-        int len = encCipher.processBytes(P, 0, P.length, enc, 0);
-        len += encCipher.doFinal(enc, len);
-
-        if (enc.length != len)
-        {
-//            System.out.println("" + enc.length + "/" + len);
-            fail("encryption reported incorrect length: " + testName);
-        }
-
-        byte[] mac = encCipher.getMac();
-
-        byte[] data = new byte[P.length];
-        System.arraycopy(enc, 0, data, 0, data.length);
-        byte[] tail = new byte[enc.length - P.length];
-        System.arraycopy(enc, P.length, tail, 0, tail.length);
-
-        if (!areEqual(C, data))
-        {
-            fail("incorrect encrypt in: " + testName);
-        }
-
-        if (!areEqual(T, mac))
-        {
-            fail("getMac() returned wrong mac in: " + testName);
-        }
-
-        if (!areEqual(T, tail))
-        {
-            fail("stream contained wrong mac in: " + testName);
-        }
-
-        byte[] dec = new byte[decCipher.getOutputSize(enc.length)];
-        if (SA != null)
-        {
-            decCipher.processAADBytes(SA, 0, SA.length);
-        }
-        len = decCipher.processBytes(enc, 0, enc.length, dec, 0);
-        len += decCipher.doFinal(dec, len);
-        mac = decCipher.getMac();
-
-        data = new byte[C.length];
-        System.arraycopy(dec, 0, data, 0, data.length);
-
-        if (!areEqual(P, data))
-        {
-            fail("incorrect decrypt in: " + testName);
-        }
-    }
-
-    private void randomTests()
-        throws InvalidCipherTextException
-    {
-        SecureRandom srng = new SecureRandom();
-        srng.setSeed(Times.nanoTime());
-        randomTests(srng, null);
-        randomTests(srng, new BasicGCMMultiplier());
-        randomTests(srng, new Tables8kGCMMultiplier());
-        randomTests(srng, new Tables64kGCMMultiplier());
-    }
-
-    private void randomTests(SecureRandom srng, GCMMultiplier m)
-        throws InvalidCipherTextException
-    {
-        for (int i = 0; i < 10; ++i)
-        {
-            randomTest(srng, m);
-        }
-    }
-
-    private void randomTest(SecureRandom srng, GCMMultiplier m)
-        throws InvalidCipherTextException
-    {
-        int kLength = 16 + 8 * (Math.abs(srng.nextInt()) % 3);
-        byte[] K = new byte[kLength];
-        srng.nextBytes(K);
-
-        int pLength = srng.nextInt() >>> 16;
-        byte[] P = new byte[pLength];
-        srng.nextBytes(P);
-
-        int aLength = srng.nextInt() >>> 24;
-        byte[] A = new byte[aLength];
-        srng.nextBytes(A);
-
-        int saLength = srng.nextInt() >>> 24;
-        byte[] SA = new byte[saLength];
-        srng.nextBytes(SA);
-
-        int ivLength = 1 + (srng.nextInt() >>> 24);
-        byte[] IV = new byte[ivLength];
-        srng.nextBytes(IV);
-
-        AEADParameters parameters = new AEADParameters(new KeyParameter(K), 16 * 8, IV, A);
-        GCMBlockCipher cipher = initCipher(m, true, parameters);
-        byte[] C = new byte[cipher.getOutputSize(P.length)];
-        int predicted = cipher.getUpdateOutputSize(P.length);
-
-        int split = nextInt(srng, SA.length + 1);
-        cipher.processAADBytes(SA, 0, split);
-        int len = cipher.processBytes(P, 0, P.length, C, 0);
-        cipher.processAADBytes(SA, split, SA.length - split);
-
-        if (predicted != len)
-        {
-            fail("encryption reported incorrect update length in randomised test");
-        }
-
-        len += cipher.doFinal(C, len);
-
-        if (C.length != len)
-        {
-            fail("encryption reported incorrect length in randomised test");
-        }
-
-        byte[] encT = cipher.getMac();
-        byte[] tail = new byte[C.length - P.length];
-        System.arraycopy(C, P.length, tail, 0, tail.length);
-
-        if (!areEqual(encT, tail))
-        {
-            fail("stream contained wrong mac in randomised test");
-        }
-
-        cipher.init(false, parameters);
-        byte[] decP = new byte[cipher.getOutputSize(C.length)];
-        predicted = cipher.getUpdateOutputSize(C.length);
-
-        split = nextInt(srng, SA.length + 1);
-        cipher.processAADBytes(SA, 0, split);
-        len = cipher.processBytes(C, 0, C.length, decP, 0);
-        cipher.processAADBytes(SA, split, SA.length - split);
-
-        if (predicted != len)
-        {
-            fail("decryption reported incorrect update length in randomised test");
-        }
-
-        len += cipher.doFinal(decP, len);
-
-        if (!areEqual(P, decP))
-        {
-            fail("incorrect decrypt in randomised test");
-        }
-
-        byte[] decT = cipher.getMac();
-        if (!areEqual(encT, decT))
-        {
-            fail("decryption produced different mac from encryption");
-        }
-
-        //
-        // key reuse test
-        //
-        cipher.init(false, AEADTestUtil.reuseKey(parameters));
-        decP = new byte[cipher.getOutputSize(C.length)];
-
-        split = nextInt(srng, SA.length + 1);
-        cipher.processAADBytes(SA, 0, split);
-        len = cipher.processBytes(C, 0, C.length, decP, 0);
-        cipher.processAADBytes(SA, split, SA.length - split);
-
-        len += cipher.doFinal(decP, len);
-
-        if (!areEqual(P, decP))
-        {
-            fail("incorrect decrypt in randomised test");
-        }
-
-        decT = cipher.getMac();
-        if (!areEqual(encT, decT))
-        {
-            fail("decryption produced different mac from encryption");
-        }
-    }
-
-    private void outputSizeTests()
-    {
-        byte[] K = new byte[16];
-        byte[] A = null;
-        byte[] IV = new byte[16];
-
-        AEADParameters parameters = new AEADParameters(new KeyParameter(K), 16 * 8, IV, A);
-        GCMBlockCipher cipher = initCipher(null, true, parameters);
-
-        if (cipher.getUpdateOutputSize(0) != 0)
-        {
-            fail("incorrect getUpdateOutputSize for initial 0 bytes encryption");
-        }
-
-        if (cipher.getOutputSize(0) != 16)
-        {
-            fail("incorrect getOutputSize for initial 0 bytes encryption");
-        }
-
-        cipher.init(false, parameters);
-
-        if (cipher.getUpdateOutputSize(0) != 0)
-        {
-            fail("incorrect getUpdateOutputSize for initial 0 bytes decryption");
-        }
-
-        // NOTE: 0 bytes would be truncated data, but we want it to fail in the doFinal, not here
-        if (cipher.getOutputSize(0) != 0)
-        {
-            fail("fragile getOutputSize for initial 0 bytes decryption");
-        }
-
-        if (cipher.getOutputSize(16) != 0)
-        {
-            fail("incorrect getOutputSize for initial MAC-size bytes decryption");
-        }
-    }
-
-    private static int nextInt(SecureRandom rand, int n)
-    {
-        if ((n & -n) == n)  // i.e., n is a power of 2
-        {
-            return (int)((n * (long)(rand.nextInt() >>> 1)) >> 31);
-        }
-
-        int bits, value;
-        do
-        {
-            bits = rand.nextInt() >>> 1;
-            value = bits % n;
-        }
-        while (bits - value + (n - 1) < 0);
-
-        return value;
-    }
-
-    public static void main(String[] args)
-    {
-        runTest(new GCMTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/GMacTest.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/GMacTest.java
deleted file mode 100644
index 082aac6..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/GMacTest.java
+++ /dev/null
@@ -1,174 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.Mac;
-import org.bouncycastle.crypto.engines.AESFastEngine;
-import org.bouncycastle.crypto.macs.GMac;
-import org.bouncycastle.crypto.modes.GCMBlockCipher;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.crypto.params.ParametersWithIV;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-
-/**
- * Test vectors for AES-GMAC, extracted from <a
- * href="http://csrc.nist.gov/groups/STM/cavp/documents/mac/gcmtestvectors.zip">NIST CAVP GCM test
- * vectors</a>.
- *
- */
-public class GMacTest extends SimpleTest
-{
-    private static class TestCase
-    {
-        private byte[] key;
-        private byte[] iv;
-        private byte[] ad;
-        private byte[] tag;
-        private String name;
-
-        private TestCase(final String name, final String key, final String iv, final String ad, final String tag)
-        {
-            this.name = name;
-            this.key = Hex.decode(key);
-            this.iv = Hex.decode(iv);
-            this.ad = Hex.decode(ad);
-            this.tag = Hex.decode(tag);
-        }
-
-        public String getName()
-        {
-            return name;
-        }
-
-        public byte[] getKey()
-        {
-            return key;
-        }
-
-        public byte[] getIv()
-        {
-            return iv;
-        }
-
-        public byte[] getAd()
-        {
-            return ad;
-        }
-
-        public byte[] getTag()
-        {
-            return tag;
-        }
-    }
-
-    private static TestCase[] TEST_VECTORS = new TestCase[] {
-            // Count = 0, from each of the PTlen = 0 test vector sequences
-            new TestCase("128/96/0/128", "11754cd72aec309bf52f7687212e8957", "3c819d9a9bed087615030b65", "",
-                    "250327c674aaf477aef2675748cf6971"),
-            new TestCase("128/96/0/120", "272f16edb81a7abbea887357a58c1917", "794ec588176c703d3d2a7a07", "",
-                    "b6e6f197168f5049aeda32dafbdaeb"),
-            new TestCase("128/96/0/112", "81b6844aab6a568c4556a2eb7eae752f", "ce600f59618315a6829bef4d", "",
-                    "89b43e9dbc1b4f597dbbc7655bb5"),
-            new TestCase("128/96/0/104", "cde2f9a9b1a004165ef9dc981f18651b", "29512c29566c7322e1e33e8e", "",
-                    "2e58ce7dabd107c82759c66a75"),
-            new TestCase("128/96/0/96", "b01e45cc3088aaba9fa43d81d481823f", "5a2c4a66468713456a4bd5e1", "",
-                    "014280f944f53c681164b2ff"),
-
-            new TestCase("128/96/128/128", "77be63708971c4e240d1cb79e8d77feb", "e0e00f19fed7ba0136a797f3",
-                    "7a43ec1d9c0a5a78a0b16533a6213cab", "209fcc8d3675ed938e9c7166709dd946"),
-            new TestCase("128/96/128/96", "bea48ae4980d27f357611014d4486625", "32bddb5c3aa998a08556454c",
-                    "8a50b0b8c7654bced884f7f3afda2ead", "8e0f6d8bf05ffebe6f500eb1"),
-
-            new TestCase("128/96/384/128", "99e3e8793e686e571d8285c564f75e2b", "c2dd0ab868da6aa8ad9c0d23",
-                    "b668e42d4e444ca8b23cfdd95a9fedd5178aa521144890b093733cf5cf22526c5917ee476541809ac6867a8c399309fc",
-                    "3f4fba100eaf1f34b0baadaae9995d85"),
-            new TestCase("128/96/384/96", "c77acd1b0918e87053cb3e51651e7013", "39ff857a81745d10f718ac00",
-                    "407992f82ea23b56875d9a3cb843ceb83fd27cb954f7c5534d58539fe96fb534502a1b38ea4fac134db0a42de4be1137",
-                    "2a5dc173285375dc82835876"),
-
-            new TestCase(
-                    "128/1024/0/128",
-                    "d0f1f4defa1e8c08b4b26d576392027c",
-                    "42b4f01eb9f5a1ea5b1eb73b0fb0baed54f387ecaa0393c7d7dffc6af50146ecc021abf7eb9038d4303d91f8d741a11743166c0860208bcc02c6258fd9511a2fa626f96d60b72fcff773af4e88e7a923506e4916ecbd814651e9f445adef4ad6a6b6c7290cc13b956130eef5b837c939fcac0cbbcc9656cd75b13823ee5acdac",
-                    "", "7ab49b57ddf5f62c427950111c5c4f0d"),
-            new TestCase(
-                    "128/1024/384/96",
-                    "3cce72d37933394a8cac8a82deada8f0",
-                    "aa2f0d676d705d9733c434e481972d4888129cf7ea55c66511b9c0d25a92a174b1e28aa072f27d4de82302828955aadcb817c4907361869bd657b45ff4a6f323871987fcf9413b0702d46667380cd493ed24331a28b9ce5bbfa82d3a6e7679fcce81254ba64abcad14fd18b22c560a9d2c1cd1d3c42dac44c683edf92aced894",
-                    "5686b458e9c176f4de8428d9ebd8e12f569d1c7595cf49a4b0654ab194409f86c0dd3fdb8eb18033bb4338c70f0b97d1",
-                    "a3a9444b21f330c3df64c8b6"), };
-
-    public void performTest()
-    {
-        for (int i = 0; i < TEST_VECTORS.length; i++)
-        {
-            TestCase testCase = TEST_VECTORS[i];
-
-            Mac mac = new GMac(new GCMBlockCipher(new AESFastEngine()), testCase.getTag().length * 8);
-            CipherParameters key = new KeyParameter(testCase.getKey());
-            mac.init(new ParametersWithIV(key, testCase.getIv()));
-
-            testSingleByte(mac, testCase);
-            testMultibyte(mac, testCase);
-        }
-
-        // Invalid mac size
-        testInvalidMacSize(97);
-        testInvalidMacSize(136);
-        testInvalidMacSize(24);
-    }
-
-    private void testInvalidMacSize(int size)
-    {
-        try
-        {
-            GMac mac = new GMac(new GCMBlockCipher(new AESFastEngine()), size);
-            mac.init(new ParametersWithIV(null, new byte[16]));
-            fail("Expected failure for illegal mac size " + size);
-        }
-        catch (IllegalArgumentException e)
-        {
-            if (!e.getMessage().startsWith("Invalid value for MAC size"))
-            {
-                fail("Illegal mac size failed with unexpected message");
-            }
-        }
-    }
-
-    private void testMultibyte(Mac mac, TestCase testCase)
-    {
-        mac.update(testCase.getAd(), 0, testCase.getAd().length);
-        checkMac(mac, testCase);
-    }
-
-    private void testSingleByte(Mac mac, TestCase testCase)
-    {
-        final byte[] ad = testCase.getAd();
-        for (int i = 0; i < ad.length; i++)
-        {
-            mac.update(ad[i]);
-        }
-        checkMac(mac, testCase);
-    }
-
-    private void checkMac(Mac mac, TestCase testCase)
-    {
-        final byte[] generatedMac = new byte[mac.getMacSize()];
-        mac.doFinal(generatedMac, 0);
-        if (!areEqual(testCase.getTag(), generatedMac))
-        {
-            fail("Failed " + testCase.getName() + " - expected " + new String(Hex.encode(testCase.getTag())) + " got "
-                + new String(Hex.encode(generatedMac)));
-        }
-    }
-
-    public String getName()
-    {
-        return "GMac";
-    }
-
-    public static void main(String[] args)
-    {
-        runTest(new GMacTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/GOST28147MacTest.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/GOST28147MacTest.java
deleted file mode 100644
index 8faaca1..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/GOST28147MacTest.java
+++ /dev/null
@@ -1,89 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import org.bouncycastle.crypto.Mac;
-import org.bouncycastle.crypto.engines.GOST28147Engine;
-import org.bouncycastle.crypto.macs.GOST28147Mac;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.crypto.params.ParametersWithSBox;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTestResult;
-import org.bouncycastle.util.test.Test;
-import org.bouncycastle.util.test.TestResult;
-
-/**
- * GOST 28147 MAC tester 
- */
-public class GOST28147MacTest
-    implements Test
-{
-    //
-    // these GOSTMac for testing.
-    //
-    static byte[]   gkeyBytes1 = Hex.decode("6d145dc993f4019e104280df6fcd8cd8e01e101e4c113d7ec4f469ce6dcd9e49");
-    static byte[]   gkeyBytes2 = Hex.decode("6d145dc993f4019e104280df6fcd8cd8e01e101e4c113d7ec4f469ce6dcd9e49");
-
-    static byte[]   input3 = Hex.decode("7768617420646f2079612077616e7420666f72206e6f7468696e673f");
-    static byte[]   input4 = Hex.decode("7768617420646f2079612077616e7420666f72206e6f7468696e673f");
-
-    static byte[]   output7 = Hex.decode("93468a46");
-    static byte[]   output8 = Hex.decode("93468a46");
-
-    public GOST28147MacTest()
-    {
-    }
-
-    public TestResult perform()
-    {
-        // test1
-        Mac          mac = new GOST28147Mac();
-        KeyParameter key = new KeyParameter(gkeyBytes1);
-
-        mac.init(key);
-
-        mac.update(input3, 0, input3.length);
-
-        byte[] out = new byte[4];
-
-        mac.doFinal(out, 0);
-
-        if (!Arrays.areEqual(out, output7))
-        {
-            return new SimpleTestResult(false, getName() + ": Failed test 1 - expected " + new String(Hex.encode(output7)) + " got " + new String(Hex.encode(out)));
-        }
-
-        // test2
-        key = new KeyParameter(gkeyBytes2);
-
-        ParametersWithSBox gparam = new ParametersWithSBox(key, GOST28147Engine.getSBox("E-A"));
-
-        mac.init(gparam);
-
-        mac.update(input4, 0, input4.length);
-
-        out = new byte[4];
-
-        mac.doFinal(out, 0);
-
-        if (!Arrays.areEqual(out, output8))
-        {
-            return new SimpleTestResult(false, getName() + ": Failed test 2 - expected " + new String(Hex.encode(output8)) + " got " + new String(Hex.encode(out)));
-        }
-
-        return new SimpleTestResult(true, getName() + ": Okay");
-    }
-
-    public String getName()
-    {
-        return "GOST28147Mac";
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        GOST28147MacTest    test = new GOST28147MacTest();
-        TestResult result = test.perform();
-
-        System.out.println(result);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/GOST28147Test.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/GOST28147Test.java
deleted file mode 100644
index 8de8440..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/GOST28147Test.java
+++ /dev/null
@@ -1,328 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import org.bouncycastle.crypto.BufferedBlockCipher;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.CryptoException;
-import org.bouncycastle.crypto.digests.GOST3411Digest;
-import org.bouncycastle.crypto.engines.GOST28147Engine;
-import org.bouncycastle.crypto.modes.CBCBlockCipher;
-import org.bouncycastle.crypto.modes.CFBBlockCipher;
-import org.bouncycastle.crypto.modes.GOFBBlockCipher;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.crypto.params.ParametersWithIV;
-import org.bouncycastle.crypto.params.ParametersWithSBox;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-
-public class GOST28147Test
-     extends CipherTest
-{
-    static String   input1 =  "0000000000000000";
-    static String   output1 = "1b0bbc32cebcab42";
-    static String   input2 =  "bc350e71aac5f5c2";
-    static String   output2 = "d35ab653493b49f5";
-    static String   input3 =  "bc350e71aa11345709acde";
-    static String   output3 = "8824c124c4fd14301fb1e8";
-    static String   input4 =  "000102030405060708090a0b0c0d0e0fff0102030405060708090a0b0c0d0e0f";
-    static String   output4 = "29b7083e0a6d955ca0ec5b04fdb4ea41949f1dd2efdf17baffc1780b031f3934";
-
-    static byte TestSBox[] = {
-            0x0,0x1,0x2,0x3,0x4,0x5,0x6,0x7,0x8,0x9,0xA,0xB,0xC,0xD,0xE,0xF,
-            0xF,0xE,0xD,0xC,0xB,0xA,0x9,0x8,0x7,0x6,0x5,0x4,0x3,0x2,0x1,0x0,
-            0x0,0x1,0x2,0x3,0x4,0x5,0x6,0x7,0x8,0x9,0xA,0xB,0xC,0xD,0xE,0xF,
-            0xF,0xE,0xD,0xC,0xB,0xA,0x9,0x8,0x7,0x6,0x5,0x4,0x3,0x2,0x1,0x0,
-            0x0,0x1,0x2,0x3,0x4,0x5,0x6,0x7,0x8,0x9,0xA,0xB,0xC,0xD,0xE,0xF,
-            0xF,0xE,0xD,0xC,0xB,0xA,0x9,0x8,0x7,0x6,0x5,0x4,0x3,0x2,0x1,0x0,
-            0x0,0x1,0x2,0x3,0x4,0x5,0x6,0x7,0x8,0x9,0xA,0xB,0xC,0xD,0xE,0xF,
-            0xF,0xE,0xD,0xC,0xB,0xA,0x9,0x8,0x7,0x6,0x5,0x4,0x3,0x2,0x1,0x0
-    };
-
-    static SimpleTest[]   tests =
-    {   new BlockCipherVectorTest(1, new GOST28147Engine(),
-            new KeyParameter(Hex.decode("546d203368656c326973652073736e62206167796967747473656865202c3d73")),
-                input1, output1),
-        new BlockCipherVectorTest(2, new CBCBlockCipher(new GOST28147Engine()),
-            new ParametersWithIV(new KeyParameter(Hex.decode("00112233445566778899AABBCCDDEEFF00112233445566778899AABBCCDDEEFF")),
-                                 Hex.decode("1234567890abcdef")), input2, output2),
-        new BlockCipherVectorTest(3, new GOFBBlockCipher(new GOST28147Engine()),
-            new ParametersWithIV(new KeyParameter(Hex.decode("0011223344556677889900112233445566778899001122334455667788990011")),
-                                     Hex.decode("1234567890abcdef")), //IV
-                                     input3, output3),
-        new BlockCipherVectorTest(4, new CFBBlockCipher(new GOST28147Engine(), 64),
-            new ParametersWithIV(new KeyParameter(Hex.decode("aafd12f659cae63489b479e5076ddec2f06cb58faafd12f659cae63489b479e5")),
-                                 Hex.decode("aafd12f659cae634")), input4, output4),
-
-        //tests with parameters, set S-box.
-        new BlockCipherVectorTest(5, new GOST28147Engine(),
-            new KeyParameter(Hex.decode("546d203368656c326973652073736e62206167796967747473656865202c3d73")),//key , default parameter S-box set to D-Test
-                input1, output1),
-        new BlockCipherVectorTest(6, new CFBBlockCipher(new GOST28147Engine(), 64),
-            new ParametersWithIV(
-                new ParametersWithSBox(
-                       new KeyParameter(Hex.decode("546d203368656c326973652073736e62206167796967747473656865202c3d73")), //key
-                       GOST28147Engine.getSBox("D-Test")), //type S-box
-                Hex.decode("1234567890abcdef")), //IV
-                "0000000000000000", //input message
-                "b587f7a0814c911d"), //encrypt message
-        new BlockCipherVectorTest(7, new CFBBlockCipher(new GOST28147Engine(), 64),
-            new ParametersWithIV(
-                new ParametersWithSBox(
-                       new KeyParameter(Hex.decode("546d203368656c326973652073736e62206167796967747473656865202c3d73")), //key
-                       GOST28147Engine.getSBox("E-Test")), //type S-box
-                Hex.decode("1234567890abcdef")), //IV
-                "0000000000000000", //input message
-                "e8287f53f991d52b"), //encrypt message
-        new BlockCipherVectorTest(8, new CFBBlockCipher(new GOST28147Engine(), 64),
-            new ParametersWithIV(
-                new ParametersWithSBox(
-                       new KeyParameter(Hex.decode("546d203368656c326973652073736e62206167796967747473656865202c3d73")), //key
-                       GOST28147Engine.getSBox("E-A")), //type S-box
-                Hex.decode("1234567890abcdef")), //IV
-                "0000000000000000", //input message
-                "c41009dba22ebe35"), //encrypt message
-        new BlockCipherVectorTest(9, new CFBBlockCipher(new GOST28147Engine(), 8),
-            new ParametersWithIV(
-                new ParametersWithSBox(
-                       new KeyParameter(Hex.decode("546d203368656c326973652073736e62206167796967747473656865202c3d73")), //key
-                       GOST28147Engine.getSBox("E-B")), //type S-box
-                Hex.decode("1234567890abcdef")), //IV
-                "0000000000000000", //input message
-                "80d8723fcd3aba28"), //encrypt message
-        new BlockCipherVectorTest(10, new CFBBlockCipher(new GOST28147Engine(), 8),
-            new ParametersWithIV(
-                new ParametersWithSBox(
-                       new KeyParameter(Hex.decode("546d203368656c326973652073736e62206167796967747473656865202c3d73")), //key
-                       GOST28147Engine.getSBox("E-C")), //type S-box
-                Hex.decode("1234567890abcdef")), //IV
-                "0000000000000000", //input message
-                "739f6f95068499b5"), //encrypt message
-        new BlockCipherVectorTest(11, new CFBBlockCipher(new GOST28147Engine(), 8),
-            new ParametersWithIV(
-                new ParametersWithSBox(
-                       new KeyParameter(Hex.decode("546d203368656c326973652073736e62206167796967747473656865202c3d73")), //key
-                       GOST28147Engine.getSBox("E-D")), //type S-box
-                Hex.decode("1234567890abcdef")), //IV
-                "0000000000000000", //input message
-                "4663f720f4340f57"), //encrypt message
-        new BlockCipherVectorTest(12, new CFBBlockCipher(new GOST28147Engine(), 8),
-            new ParametersWithIV(
-                new ParametersWithSBox(
-                       new KeyParameter(Hex.decode("546d203368656c326973652073736e62206167796967747473656865202c3d73")), //key
-                       GOST28147Engine.getSBox("D-A")), //type S-box
-                Hex.decode("1234567890abcdef")), //IV
-                "0000000000000000", //input message
-                "5bb0a31d218ed564"), //encrypt message
-        new BlockCipherVectorTest(13, new CFBBlockCipher(new GOST28147Engine(), 8),
-            new ParametersWithIV(
-                new ParametersWithSBox(
-                       new KeyParameter(Hex.decode("546d203368656c326973652073736e62206167796967747473656865202c3d73")), //key
-                       TestSBox), //set own S-box
-                Hex.decode("1234567890abcdef")), //IV
-                "0000000000000000", //input message
-                "c3af96ef788667c5"), //encrypt message
-        new BlockCipherVectorTest(14, new GOFBBlockCipher(new GOST28147Engine()),
-            new ParametersWithIV(
-                new ParametersWithSBox(
-                        new KeyParameter(Hex.decode("4ef72b778f0b0bebeef4f077551cb74a927b470ad7d7f2513454569a247e989d")), //key
-                        GOST28147Engine.getSBox("E-A")), //type S-box
-                Hex.decode("1234567890abcdef")), //IV
-                "bc350e71aa11345709acde",  //input message
-                "1bcc2282707c676fb656dc"), //encrypt message
-
-    };
-
-    static private final int GOST28147_KEY_LENGTH = 32;
-    
-    private byte[] generateKey(byte[] startkey)
-    {
-        byte[]  newKey = new byte[GOST28147_KEY_LENGTH];
-
-        GOST3411Digest digest = new GOST3411Digest();
-        
-        digest.update(startkey, 0, startkey.length);
-        digest.doFinal(newKey, 0);
-
-        return newKey;
-    }
-    
-    GOST28147Test()
-    {
-        super(tests, new GOST28147Engine(), new KeyParameter(new byte[32]));
-    }
-    
-    public void performTest()
-        throws Exception
-    {
-        super.performTest();
-
-        //advanced tests with GOST28147KeyGenerator:
-        //encrypt on hesh message; ECB mode:
-        byte[] in     = Hex.decode("4e6f77206973207468652074696d6520666f7220616c6c20");
-        byte[] output = Hex.decode("8ad3c8f56b27ff1fbd46409359bdc796bc350e71aac5f5c0");
-        byte[] out    = new byte[in.length];
-
-        byte[] key = generateKey(Hex.decode("0123456789abcdef"));  //!!! heshing start_key - get 256 bits !!!
-//        System.out.println(new String(Hex.encode(key)));
-        CipherParameters  param = new ParametersWithSBox(new KeyParameter(key), GOST28147Engine.getSBox("E-A"));
-        //CipherParameters  param = new GOST28147Parameters(key,"D-Test");
-        BufferedBlockCipher cipher = new BufferedBlockCipher(new GOST28147Engine());
-
-        cipher.init(true, param);
-        int len1 = cipher.processBytes(in, 0, in.length, out, 0);
-        try
-        {
-            cipher.doFinal(out, len1);
-        }
-        catch (CryptoException e)
-        {
-            fail("failed - exception " + e.toString(), e);
-        }
-        if (out.length != output.length)
-        {
-            fail("failed - "
-                    + "expected " + new String(Hex.encode(output)) + " got "
-                    + new String(Hex.encode(out)));
-        }
-        for (int i = 0; i != out.length; i++)
-        {
-            if (out[i] != output[i])
-            {
-                fail("failed - " + "expected " + new String(Hex.encode(output)) + " got " + new String(Hex.encode(out)));
-            }
-        }
-
-
-        //encrypt on hesh message; CFB mode:
-        in     = Hex.decode("bc350e71aac5f5c2");
-        output = Hex.decode("0ebbbafcf38f14a5");
-        out    = new byte[in.length];
-
-        key = generateKey(Hex.decode("0123456789abcdef"));  //!!! heshing start_key - get 256 bits !!!
-        param = new ParametersWithIV(new ParametersWithSBox(
-                                                             new KeyParameter(key), //key
-                                                             GOST28147Engine.getSBox("E-A")), //type S-box
-                                     Hex.decode("1234567890abcdef")); //IV
-
-        cipher = new BufferedBlockCipher(new CFBBlockCipher(new GOST28147Engine(), 64));
-
-        cipher.init(true, param);
-        len1 = cipher.processBytes(in, 0, in.length, out, 0);
-        try
-        {
-            cipher.doFinal(out, len1);
-        }
-        catch (CryptoException e)
-        {
-            fail("failed - exception " + e.toString(), e);
-        }
-        if (out.length != output.length)
-        {
-            fail("failed - " + "expected " + new String(Hex.encode(output)) + " got " + new String(Hex.encode(out)));
-        }
-        for (int i = 0; i != out.length; i++)
-        {
-            if (out[i] != output[i])
-            {
-                fail("failed - " + "expected " + new String(Hex.encode(output)) + " got " + new String(Hex.encode(out)));
-            }
-        }
-
-
-        //encrypt on hesh message; CFB mode:
-        in     = Hex.decode("000102030405060708090a0b0c0d0e0fff0102030405060708090a0b0c0d0e0f");
-        output = Hex.decode("64988982819f0a1655e226e19ecad79d10cc73bac95c5d7da034786c12294225");
-        out    = new byte[in.length];
-
-        key = generateKey(Hex.decode("aafd12f659cae63489b479e5076ddec2f06cb58faafd12f659cae63489b479e5"));  //!!! heshing start_key - get 256 bits !!!
-        param = new ParametersWithIV(new ParametersWithSBox(
-                                                             new KeyParameter(key), //key
-                                                             GOST28147Engine.getSBox("E-A")), //type S-box
-                                     Hex.decode("aafd12f659cae634")); //IV
-
-        cipher = new BufferedBlockCipher(new CFBBlockCipher(new GOST28147Engine(), 64));
-
-        cipher.init(true, param);
-        len1 = cipher.processBytes(in, 0, in.length, out, 0);
-
-        cipher.doFinal(out, len1);
-
-        if (out.length != output.length)
-        {
-            fail("failed - " + "expected " + new String(Hex.encode(output)) + " got " + new String(Hex.encode(out)));
-        }
-        
-        for (int i = 0; i != out.length; i++)
-        {
-            if (out[i] != output[i])
-            {
-                fail("failed - " + "expected " + new String(Hex.encode(output)) + " got " + new String(Hex.encode(out)));
-            }
-        }
-
-        //encrypt on hesh message; OFB mode:
-        in     = Hex.decode("bc350e71aa11345709acde");
-        output = Hex.decode("1bcc2282707c676fb656dc");
-        out    = new byte[in.length];
-
-        key = generateKey(Hex.decode("0123456789abcdef"));  //!!! heshing start_key - get 256 bits !!!
-        param = new ParametersWithIV(new ParametersWithSBox(
-                                                             new KeyParameter(key), //key
-                                                             GOST28147Engine.getSBox("E-A")), //type S-box
-                                     Hex.decode("1234567890abcdef")); //IV
-
-        cipher = new BufferedBlockCipher(new GOFBBlockCipher(new GOST28147Engine()));
-
-        cipher.init(true, param);
-        len1 = cipher.processBytes(in, 0, in.length, out, 0);
-
-        cipher.doFinal(out, len1);
-
-        if (out.length != output.length)
-        {
-            fail("failed - " + "expected "
-                    + new String(Hex.encode(output)) + " got "
-                    + new String(Hex.encode(out)));
-        }
-        for (int i = 0; i != out.length; i++)
-        {
-            if (out[i] != output[i])
-            {
-                fail("failed - " + "expected " + new String(Hex.encode(output)) + " got " + new String(Hex.encode(out)));
-            }
-        }
-
-        // key reuse test
-        param = new ParametersWithIV(null, // key and sbox reused
-                           Hex.decode("1234567890abcdef")); //IV
-
-        cipher.init(true, param);
-        len1 = cipher.processBytes(in, 0, in.length, out, 0);
-
-        cipher.doFinal(out, len1);
-
-        if (out.length != output.length)
-        {
-            fail("failed - " + "expected "
-                    + new String(Hex.encode(output)) + " got "
-                    + new String(Hex.encode(out)));
-        }
-        for (int i = 0; i != out.length; i++)
-        {
-            if (out[i] != output[i])
-            {
-                fail("failed - " + "expected " + new String(Hex.encode(output)) + " got " + new String(Hex.encode(out)));
-            }
-        }
-    }
-
-    public String getName()
-    {
-        return "GOST28147";
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        runTest(new GOST28147Test());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/GOST3410Test.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/GOST3410Test.java
deleted file mode 100644
index 17de3fe..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/GOST3410Test.java
+++ /dev/null
@@ -1,1570 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import org.bouncycastle.crypto.AsymmetricCipherKeyPair;
-import org.bouncycastle.crypto.generators.GOST3410KeyPairGenerator;
-import org.bouncycastle.crypto.generators.GOST3410ParametersGenerator;
-import org.bouncycastle.crypto.params.GOST3410KeyGenerationParameters;
-import org.bouncycastle.crypto.params.GOST3410Parameters;
-import org.bouncycastle.crypto.params.ParametersWithRandom;
-import org.bouncycastle.crypto.signers.GOST3410Signer;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.FixedSecureRandom;
-import org.bouncycastle.util.test.NumberParsing;
-import org.bouncycastle.util.test.SimpleTestResult;
-import org.bouncycastle.util.test.Test;
-import org.bouncycastle.util.test.TestResult;
-
-import java.math.BigInteger;
-import java.security.SecureRandom;
-
-public class GOST3410Test
-        implements Test
-{
-    byte[] hashmessage = Hex.decode("3042453136414534424341374533364339313734453431443642453241453435");
-    
-    private byte[] zeroTwo(int length)
-    {
-        byte[] data = new byte[length];
-        data[data.length - 1] = 0x02;
-        return data;
-    }
-    
-    private class GOST3410_TEST1_512
-        implements Test
-    {
-        public String getName()
-        {
-            return "GOST3410-TEST1-512";
-        }
-
-        FixedSecureRandom    init_random = new FixedSecureRandom(new byte[][] { Hex.decode("00005EC900007341"), zeroTwo(64) });
-        FixedSecureRandom    random = new FixedSecureRandom(Hex.decode("90F3A564439242F5186EBB224C8E223811B7105C64E4F5390807E6362DF4C72A"));
-        FixedSecureRandom    keyRandom = new FixedSecureRandom(Hex.decode("3036314538303830343630454235324435324234314132373832433138443046"));
-
-        BigInteger  pValue = new BigInteger("EE8172AE8996608FB69359B89EB82A69854510E2977A4D63BC97322CE5DC3386EA0A12B343E9190F23177539845839786BB0C345D165976EF2195EC9B1C379E3", 16);
-        BigInteger  qValue = new BigInteger("98915E7EC8265EDFCDA31E88F24809DDB064BDC7285DD50D7289F0AC6F49DD2D", 16);
-
-        public TestResult perform()
-        {
-            BigInteger              r = new BigInteger("3e5f895e276d81d2d52c0763270a458157b784c57abdbd807bc44fd43a32ac06",16);
-            BigInteger              s = new BigInteger("3f0dd5d4400d47c08e4ce505ff7434b6dbf729592e37c74856dab85115a60955",16);
-            GOST3410ParametersGenerator  pGen = new GOST3410ParametersGenerator();
-
-            pGen.init(512, 1, init_random);
-
-            GOST3410Parameters           params = pGen.generateParameters();
-
-            if (params.getValidationParameters() == null)
-            {
-                return new SimpleTestResult(false, getName() + "validation parameters wrong");
-            }
-            if (params.getValidationParameters().getC() != 29505
-                ||  params.getValidationParameters().getX0() != 24265)
-            {
-                return new SimpleTestResult(false, getName() + "validation parameters values wrong");
-            }
-            if (!init_random.isExhausted())
-            {
-                return new SimpleTestResult(false, getName()
-                        + ": unexpected number of bytes used from 'init_random'.");
-            }
-
-            if (!pValue.equals(params.getP()) || !qValue.equals(params.getQ()))
-            {
-                return new SimpleTestResult(false, getName() + ": p or q wrong");
-            }
-
-            GOST3410KeyPairGenerator         GOST3410KeyGen = new GOST3410KeyPairGenerator();
-            GOST3410KeyGenerationParameters  genParam = new GOST3410KeyGenerationParameters(keyRandom, params);
-
-            GOST3410KeyGen.init(genParam);
-
-            AsymmetricCipherKeyPair  pair = GOST3410KeyGen.generateKeyPair();
-
-            if (!keyRandom.isExhausted())
-            {
-                return new SimpleTestResult(false, getName()
-                        + ": unexpected number of bytes used from 'keyRandom'.");
-            }
-
-            ParametersWithRandom param = new ParametersWithRandom(pair.getPrivate(), random);
-
-            GOST3410Signer gost3410 = new GOST3410Signer();
-
-            gost3410.init(true, param);
-            
-            BigInteger[] sig = gost3410.generateSignature(hashmessage);
-
-            if (!random.isExhausted())
-            {
-                return new SimpleTestResult(false, getName()
-                        + ": unexpected number of bytes used from 'random'.");
-            }
-
-            if (!r.equals(sig[0]))
-            {
-                return new SimpleTestResult(false, getName()
-                    + ": r component wrong." + System.getProperty("line.separator")
-                    + " expecting: " + r.toString(16) + System.getProperty("line.separator")
-                    + " got      : " + sig[0].toString(16));
-            }
-
-            if (!s.equals(sig[1]))
-            {
-                return new SimpleTestResult(false, getName()
-                    + ": s component wrong." + System.getProperty("line.separator")
-                    + " expecting: " + s.toString(16) + System.getProperty("line.separator")
-                    + " got      : " + sig[1].toString(16));
-            }
-
-            gost3410.init(false, pair.getPublic());
-
-            if (gost3410.verifySignature(hashmessage, sig[0], sig[1]))
-            {
-                return new SimpleTestResult(true, getName() + ": Okay");
-            }
-            else
-            {
-                return new SimpleTestResult(false, getName() + ": verification fails");
-            }
-        }
-    }
-
-    private class GOST3410_TEST2_512
-        implements Test
-    {
-        public String getName()
-        {
-            return "GOST3410-TEST2-512";
-        }
-
-        FixedSecureRandom    init_random = new FixedSecureRandom(new byte[][] { Hex.decode("000000003DFC46F1000000000000000D"), zeroTwo(64) });
-        FixedSecureRandom    random = new FixedSecureRandom(Hex.decode("90F3A564439242F5186EBB224C8E223811B7105C64E4F5390807E6362DF4C72A"));
-        FixedSecureRandom    keyRandom = new FixedSecureRandom(Hex.decode("3036314538303830343630454235324435324234314132373832433138443046"));
-
-        BigInteger  pValue = new BigInteger("8b08eb135af966aab39df294538580c7da26765d6d38d30cf1c06aae0d1228c3316a0e29198460fad2b19dc381c15c888c6dfd0fc2c565abb0bf1faff9518f85", 16);
-        BigInteger  qValue = new BigInteger("931a58fb6f0dcdf2fe7549bc3f19f4724b56898f7f921a076601edb18c93dc75", 16);
-
-        public TestResult perform()
-        {
-            BigInteger              r = new BigInteger("7c07c8cf035c2a1cb2b7fae5807ac7cd623dfca7a1a68f6d858317822f1ea00d",16);
-            BigInteger              s = new BigInteger("7e9e036a6ff87dbf9b004818252b1f6fc310bdd4d17cb8c37d9c36c7884de60c",16);
-            GOST3410ParametersGenerator  pGen = new GOST3410ParametersGenerator();
-
-            pGen.init(512, 2, init_random);
-
-            GOST3410Parameters           params = pGen.generateParameters();
-
-            if (!init_random.isExhausted())
-            {
-                return new SimpleTestResult(false, getName()
-                        + ": unexpected number of bytes used from 'init_random'.");
-            }
-
-            if (params.getValidationParameters() == null)
-            {
-                return new SimpleTestResult(false, getName() + ": validation parameters wrong");
-            }
-
-            if (params.getValidationParameters().getCL() != 13
-                ||  params.getValidationParameters().getX0L() != 1039943409)
-            {
-                return new SimpleTestResult(false, getName() + ": validation parameters values wrong");
-            }
-
-            if (!pValue.equals(params.getP()) || !qValue.equals(params.getQ()))
-            {
-                return new SimpleTestResult(false, getName() + ": p or q wrong");
-            }
-
-            GOST3410KeyPairGenerator         GOST3410KeyGen = new GOST3410KeyPairGenerator();
-            GOST3410KeyGenerationParameters  genParam = new GOST3410KeyGenerationParameters(keyRandom, params);
-
-            GOST3410KeyGen.init(genParam);
-
-            AsymmetricCipherKeyPair  pair = GOST3410KeyGen.generateKeyPair();
-
-            if (!keyRandom.isExhausted())
-            {
-                return new SimpleTestResult(false, getName()
-                        + ": unexpected number of bytes used from 'keyRandom'.");
-            }
-
-            ParametersWithRandom param = new ParametersWithRandom(pair.getPrivate(), random);
-
-            GOST3410Signer GOST3410 = new GOST3410Signer();
-
-            GOST3410.init(true, param);
-            
-            BigInteger[] sig = GOST3410.generateSignature(hashmessage);
-
-            if (!random.isExhausted())
-            {
-                return new SimpleTestResult(false, getName()
-                        + ": unexpected number of bytes used from 'random'.");
-            }
-
-            if (!r.equals(sig[0]))
-            {
-                return new SimpleTestResult(false, getName()
-                    + ": r component wrong." + System.getProperty("line.separator")
-                    + " expecting: " + r.toString(16) + System.getProperty("line.separator")
-                    + " got      : " + sig[0].toString(16));
-            }
-
-            if (!s.equals(sig[1]))
-            {
-                return new SimpleTestResult(false, getName()
-                    + ": s component wrong." + System.getProperty("line.separator")
-                    + " expecting: " + s.toString(16) + System.getProperty("line.separator")
-                    + " got      : " + sig[1].toString(16));
-            }
-
-            GOST3410.init(false, pair.getPublic());
-
-            if (GOST3410.verifySignature(hashmessage, sig[0], sig[1]))
-            {
-                return new SimpleTestResult(true, getName() + ": Okay");
-            }
-            else
-            {
-                return new SimpleTestResult(false, getName() + ": verification fails");
-            }
-        }
-    }
-
-    private class GOST3410_TEST1_1024
-        implements Test
-    {
-        public String getName()
-        {
-            return "GOST3410-TEST1-1024";
-        }
-
-        SecureRandom    init_random = new SecureRandom()
-        {
-            boolean firstInt = true;
-
-            public int nextInt()
-            {
-                String x0 = "0xA565";
-                String c =  "0x538B";
-
-                if (firstInt)
-                {
-                    firstInt = false;
-                    return NumberParsing.decodeIntFromHex(x0);
-                }
-                return NumberParsing.decodeIntFromHex(c);
-            }
-
-            public void nextBytes(byte[] bytes)
-            {
-
-                byte[] d = Hex.decode("02");
-
-                System.arraycopy(d, 0, bytes, bytes.length-d.length, d.length);
-            }
-        };
-
-        SecureRandom    random = new SecureRandom()
-        {
-            public void nextBytes(byte[] bytes)
-            {
-                byte[] k = Hex.decode("90F3A564439242F5186EBB224C8E223811B7105C64E4F5390807E6362DF4C72A");
-
-                int i;
-
-                for (i = 0; i < (bytes.length - k.length); i += k.length)
-                {
-                    System.arraycopy(k, 0, bytes, i, k.length);
-                }
-
-                if (i > bytes.length)
-                {
-                    System.arraycopy(k, 0, bytes, i - k.length, bytes.length - (i - k.length));
-                }
-                else
-                {
-                    System.arraycopy(k, 0, bytes, i, bytes.length - i);
-                }
-            }
-        };
-
-        SecureRandom    keyRandom = new SecureRandom()
-        {
-            public void nextBytes(byte[] bytes)
-            {
-                byte[] x = Hex.decode("3036314538303830343630454235324435324234314132373832433138443046");
-
-                int i;
-
-                for (i = 0; i < (bytes.length - x.length); i += x.length)
-                {
-                    System.arraycopy(x, 0, bytes, i, x.length);
-                }
-
-                if (i > bytes.length)
-                {
-                    System.arraycopy(x, 0, bytes, i - x.length, bytes.length - (i - x.length));
-                }
-                else
-                {
-                    System.arraycopy(x, 0, bytes, i, bytes.length - i);
-                }
-            }
-        };
-
-        BigInteger  pValue = new BigInteger("ab8f37938356529e871514c1f48c5cbce77b2f4fc9a2673ac2c1653da8984090c0ac73775159a26bef59909d4c9846631270e16653a6234668f2a52a01a39b921490e694c0f104b58d2e14970fccb478f98d01e975a1028b9536d912de5236d2dd2fc396b77153594d4178780e5f16f718471e2111c8ce64a7d7e196fa57142d", 16);
-        BigInteger  qValue = new BigInteger("bcc02ca0ce4f0753ec16105ee5d530aa00d39f3171842ab2c334a26b5f576e0f", 16);
-
-        public TestResult perform()
-        {
-            BigInteger              r = new BigInteger("a8790aabbd5a998ff524bad048ac69cd1faff2dab048265c8d60d1471c44a9ee",16);
-            BigInteger              s = new BigInteger("30df5ba32ac77170b9632559bef7d37620017756dff3fea1088b4267db0944b8",16);
-            GOST3410ParametersGenerator  pGen = new GOST3410ParametersGenerator();
-
-            pGen.init(1024, 1, init_random);
-
-            GOST3410Parameters           params = pGen.generateParameters();
-
-            if (!pValue.equals(params.getP()) || !qValue.equals(params.getQ()))
-            {
-                return new SimpleTestResult(false, getName() + ": p or q wrong");
-            }
-
-            GOST3410KeyPairGenerator         GOST3410KeyGen = new GOST3410KeyPairGenerator();
-            GOST3410KeyGenerationParameters  genParam = new GOST3410KeyGenerationParameters(keyRandom, params);
-
-            GOST3410KeyGen.init(genParam);
-
-            AsymmetricCipherKeyPair  pair = GOST3410KeyGen.generateKeyPair();
-
-            ParametersWithRandom param = new ParametersWithRandom(pair.getPrivate(), random);
-
-            GOST3410Signer GOST3410 = new GOST3410Signer();
-
-            GOST3410.init(true, param);
-            
-            BigInteger[] sig = GOST3410.generateSignature(hashmessage);
-
-            if (!r.equals(sig[0]))
-            {
-                return new SimpleTestResult(false, getName()
-                    + ": r component wrong." + System.getProperty("line.separator")
-                    + " expecting: " + r.toString(16) + System.getProperty("line.separator")
-                    + " got      : " + sig[0].toString(16));
-            }
-
-            if (!s.equals(sig[1]))
-            {
-                return new SimpleTestResult(false, getName()
-                    + ": s component wrong." + System.getProperty("line.separator")
-                    + " expecting: " + s.toString(16) + System.getProperty("line.separator")
-                    + " got      : " + sig[1].toString(16));
-            }
-
-            GOST3410.init(false, pair.getPublic());
-
-            if (GOST3410.verifySignature(hashmessage, sig[0], sig[1]))
-            {
-                return new SimpleTestResult(true, getName() + ": Okay");
-            }
-            else
-            {
-                return new SimpleTestResult(false, getName() + ": verification fails");
-            }
-        }
-    }
-
-    private class GOST3410_TEST2_1024
-        implements Test
-    {
-        public String getName()
-        {
-            return "GOST3410-TEST2-1024";
-        }
-
-        SecureRandom    init_random = new SecureRandom()
-        {
-            boolean firstLong = true;
-
-            public long nextLong()
-            {
-                String x0 = "0x3DFC46F1";
-                String c =  "0xD";
-
-                if (firstLong)
-                {
-                    firstLong = false;
-                    return NumberParsing.decodeLongFromHex(x0);
-                }
-                return NumberParsing.decodeLongFromHex(c);
-            }
-
-            public void nextBytes(byte[] bytes)
-            {
-
-                byte[] d = Hex.decode("02");
-
-                System.arraycopy(d, 0, bytes, bytes.length-d.length, d.length);
-            }
-        };
-
-        SecureRandom    random = new SecureRandom()
-        {
-            public void nextBytes(byte[] bytes)
-            {
-                byte[] k = Hex.decode("90F3A564439242F5186EBB224C8E223811B7105C64E4F5390807E6362DF4C72A");
-
-                int i;
-
-                for (i = 0; i < (bytes.length - k.length); i += k.length)
-                {
-                    System.arraycopy(k, 0, bytes, i, k.length);
-                }
-
-                if (i > bytes.length)
-                {
-                    System.arraycopy(k, 0, bytes, i - k.length, bytes.length - (i - k.length));
-                }
-                else
-                {
-                    System.arraycopy(k, 0, bytes, i, bytes.length - i);
-                }
-            }
-        };
-
-        SecureRandom    keyRandom = new SecureRandom()
-        {
-            public void nextBytes(byte[] bytes)
-            {
-                byte[] x = Hex.decode("3036314538303830343630454235324435324234314132373832433138443046");
-
-                int i;
-
-                for (i = 0; i < (bytes.length - x.length); i += x.length)
-                {
-                    System.arraycopy(x, 0, bytes, i, x.length);
-                }
-
-                if (i > bytes.length)
-                {
-                    System.arraycopy(x, 0, bytes, i - x.length, bytes.length - (i - x.length));
-                }
-                else
-                {
-                    System.arraycopy(x, 0, bytes, i, bytes.length - i);
-                }
-            }
-        };
-
-        BigInteger  pValue = new BigInteger("e2c4191c4b5f222f9ac2732562f6d9b4f18e7fb67a290ea1e03d750f0b9806755fc730d975bf3faa606d05c218b35a6c3706919aab92e0c58b1de4531c8fa8e7af43c2bff016251e21b2870897f6a27ac4450bca235a5b748ad386e4a0e4dfcb09152435abcfe48bd0b126a8122c7382f285a9864615c66decddf6afd355dfb7", 16);
-        BigInteger  qValue = new BigInteger("931a58fb6f0dcdf2fe7549bc3f19f4724b56898f7f921a076601edb18c93dc75", 16);
-
-        public TestResult perform()
-        {
-            BigInteger              r = new BigInteger("81d69a192e9c7ac21fc07da41bd07e230ba6a94eb9f3c1fd104c7bd976733ca5",16);
-            BigInteger              s = new BigInteger("315c879c8414f35feb4deb15e7cc0278c48e6ca1596325d6959338d860b0c47a",16);
-            GOST3410ParametersGenerator  pGen = new GOST3410ParametersGenerator();
-
-            pGen.init(1024, 2, init_random);
-
-            GOST3410Parameters           params = pGen.generateParameters();
-
-            if (!pValue.equals(params.getP()) || !qValue.equals(params.getQ()))
-            {
-                return new SimpleTestResult(false, getName() + ": p or q wrong");
-            }
-
-            GOST3410KeyPairGenerator         GOST3410KeyGen = new GOST3410KeyPairGenerator();
-            GOST3410KeyGenerationParameters  genParam = new GOST3410KeyGenerationParameters(keyRandom, params);
-
-            GOST3410KeyGen.init(genParam);
-
-            AsymmetricCipherKeyPair  pair = GOST3410KeyGen.generateKeyPair();
-
-            ParametersWithRandom param = new ParametersWithRandom(pair.getPrivate(), random);
-
-            GOST3410Signer GOST3410 = new GOST3410Signer();
-
-            GOST3410.init(true, param);
-           
-            BigInteger[] sig = GOST3410.generateSignature(hashmessage);
-
-            if (!r.equals(sig[0]))
-            {
-                return new SimpleTestResult(false, getName()
-                    + ": r component wrong." + System.getProperty("line.separator")
-                    + " expecting: " + r.toString(16) + System.getProperty("line.separator")
-                    + " got      : " + sig[0].toString(16));
-            }
-
-            if (!s.equals(sig[1]))
-            {
-                return new SimpleTestResult(false, getName()
-                    + ": s component wrong." + System.getProperty("line.separator")
-                    + " expecting: " + s.toString(16) + System.getProperty("line.separator")
-                    + " got      : " + sig[1].toString(16));
-            }
-
-            GOST3410.init(false, pair.getPublic());
-
-            if (GOST3410.verifySignature(hashmessage, sig[0], sig[1]))
-            {
-                return new SimpleTestResult(true, getName() + ": Okay");
-            }
-            else
-            {
-                return new SimpleTestResult(false, getName() + ": verification fails");
-            }
-        }
-    }
-
-    private class GOST3410_AParam
-        implements Test
-    {
-        public String getName()
-        {
-            return "GOST3410-AParam";
-        }
-
-        SecureRandom    init_random = new SecureRandom()
-        {
-            boolean firstLong = true;
-
-            public long nextLong()
-            {
-                String x0 = "0x520874F5";
-                String c =  "0xEE39ADB3";
-
-                if (firstLong)
-                {
-                    firstLong = false;
-                    return NumberParsing.decodeLongFromHex(x0);
-                }
-                return NumberParsing.decodeLongFromHex(c);
-            }
-
-            public void nextBytes(byte[] bytes)
-            {
-
-                byte[] d = Hex.decode("02");
-
-                System.arraycopy(d, 0, bytes, bytes.length-d.length, d.length);
-            }
-        };
-
-        SecureRandom    random = new SecureRandom()
-        {
-            public void nextBytes(byte[] bytes)
-            {
-                byte[] k = Hex.decode("90F3A564439242F5186EBB224C8E223811B7105C64E4F5390807E6362DF4C72A");
-
-                int i;
-
-                for (i = 0; i < (bytes.length - k.length); i += k.length)
-                {
-                    System.arraycopy(k, 0, bytes, i, k.length);
-                }
-
-                if (i > bytes.length)
-                {
-                    System.arraycopy(k, 0, bytes, i - k.length, bytes.length - (i - k.length));
-                }
-                else
-                {
-                    System.arraycopy(k, 0, bytes, i, bytes.length - i);
-                }
-            }
-        };
-
-        SecureRandom    keyRandom = new SecureRandom()
-        {
-            public void nextBytes(byte[] bytes)
-            {
-                byte[] x = Hex.decode("3036314538303830343630454235324435324234314132373832433138443046");
-
-                int i;
-
-                for (i = 0; i < (bytes.length - x.length); i += x.length)
-                {
-                    System.arraycopy(x, 0, bytes, i, x.length);
-                }
-
-                if (i > bytes.length)
-                {
-                    System.arraycopy(x, 0, bytes, i - x.length, bytes.length - (i - x.length));
-                }
-                else
-                {
-                    System.arraycopy(x, 0, bytes, i, bytes.length - i);
-                }
-            }
-        };
-
-        BigInteger  pValue = new BigInteger("b4e25efb018e3c8b87505e2a67553c5edc56c2914b7e4f89d23f03f03377e70a2903489dd60e78418d3d851edb5317c4871e40b04228c3b7902963c4b7d85d52b9aa88f2afdbeb28da8869d6df846a1d98924e925561bd69300b9ddd05d247b5922d967cbb02671881c57d10e5ef72d3e6dad4223dc82aa1f7d0294651a480df", 16);
-        BigInteger  qValue = new BigInteger("972432a437178b30bd96195b773789ab2fff15594b176dd175b63256ee5af2cf", 16);
-
-        public TestResult perform()
-        {
-            BigInteger              r = new BigInteger("64a8856628e5669d85f62cd763dd4a99bc56d33dc0e1859122855d141e9e4774",16);
-            BigInteger              s = new BigInteger("319ebac97092b288d469a4b988248794f60c865bc97858d9a3135c6d1a1bf2dd",16);
-            GOST3410ParametersGenerator  pGen = new GOST3410ParametersGenerator();
-
-            pGen.init(1024, 2, init_random);
-
-            GOST3410Parameters           params = pGen.generateParameters();
-
-            if (!pValue.equals(params.getP()) || !qValue.equals(params.getQ()))
-            {
-                return new SimpleTestResult(false, getName() + ": p or q wrong");
-            }
-
-            GOST3410KeyPairGenerator         GOST3410KeyGen = new GOST3410KeyPairGenerator();
-            GOST3410KeyGenerationParameters  genParam = new GOST3410KeyGenerationParameters(keyRandom, params);
-
-            GOST3410KeyGen.init(genParam);
-
-            AsymmetricCipherKeyPair  pair = GOST3410KeyGen.generateKeyPair();
-
-            ParametersWithRandom param = new ParametersWithRandom(pair.getPrivate(), random);
-
-            GOST3410Signer GOST3410 = new GOST3410Signer();
-
-            GOST3410.init(true, param);
-
-            BigInteger[] sig = GOST3410.generateSignature(hashmessage);
-
-            if (!r.equals(sig[0]))
-            {
-                return new SimpleTestResult(false, getName()
-                    + ": r component wrong." + System.getProperty("line.separator")
-                    + " expecting: " + r.toString(16) + System.getProperty("line.separator")
-                    + " got      : " + sig[0].toString(16));
-            }
-
-            if (!s.equals(sig[1]))
-            {
-                return new SimpleTestResult(false, getName()
-                    + ": s component wrong." + System.getProperty("line.separator")
-                    + " expecting: " + s.toString(16) + System.getProperty("line.separator")
-                    + " got      : " + sig[1].toString(16));
-            }
-
-            GOST3410.init(false, pair.getPublic());
-
-            if (GOST3410.verifySignature(hashmessage, sig[0], sig[1]))
-            {
-                return new SimpleTestResult(true, getName() + ": Okay");
-            }
-            else
-            {
-                return new SimpleTestResult(false, getName() + ": verification fails");
-            }
-        }
-    }
-
-    private class GOST3410_BParam
-        implements Test
-    {
-        public String getName()
-        {
-            return "GOST3410-BParam";
-        }
-
-        SecureRandom    init_random = new SecureRandom()
-        {
-            boolean firstLong = true;
-
-            public long nextLong()
-            {
-                String x0 = "0x5B977CDB";
-                String c =  "0x6E9692DD";
-
-                if (firstLong)
-                {
-                    firstLong = false;
-                    return NumberParsing.decodeLongFromHex(x0);
-                }
-                return NumberParsing.decodeLongFromHex(c);
-            }
-
-            public void nextBytes(byte[] bytes)
-            {
-                byte[] d = Hex.decode("bc3cbbdb7e6f848286e19ad9a27a8e297e5b71c53dd974cdf60f937356df69cbc97a300ccc71685c553046147f11568c4fddf363d9d886438345a62c3b75963d6546adfabf31b31290d12cae65ecb8309ef66782");
-
-                System.arraycopy(d, 0, bytes, bytes.length-d.length, d.length);
-            }
-        };
-
-        SecureRandom    random = new SecureRandom()
-        {
-            public void nextBytes(byte[] bytes)
-            {
-                byte[] k = Hex.decode("90F3A564439242F5186EBB224C8E223811B7105C64E4F5390807E6362DF4C72A");
-
-                int i;
-
-                for (i = 0; i < (bytes.length - k.length); i += k.length)
-                {
-                    System.arraycopy(k, 0, bytes, i, k.length);
-                }
-
-                if (i > bytes.length)
-                {
-                    System.arraycopy(k, 0, bytes, i - k.length, bytes.length - (i - k.length));
-                }
-                else
-                {
-                    System.arraycopy(k, 0, bytes, i, bytes.length - i);
-                }
-            }
-        };
-
-        SecureRandom    keyRandom = new SecureRandom()
-        {
-            public void nextBytes(byte[] bytes)
-            {
-                byte[] x = Hex.decode("3036314538303830343630454235324435324234314132373832433138443046");
-
-                int i;
-
-                for (i = 0; i < (bytes.length - x.length); i += x.length)
-                {
-                    System.arraycopy(x, 0, bytes, i, x.length);
-                }
-
-                if (i > bytes.length)
-                {
-                    System.arraycopy(x, 0, bytes, i - x.length, bytes.length - (i - x.length));
-                }
-                else
-                {
-                    System.arraycopy(x, 0, bytes, i, bytes.length - i);
-                }
-            }
-        };
-
-        BigInteger  pValue = new BigInteger("c6971fc57524b30c9018c5e621de15499736854f56a6f8aee65a7a404632b3540f09020f67f04dc2e6783b141dceffd21a703035b7d0187c6e12cb4229922bafdb2225b73e6b23a0de36e20047065aea000c1a374283d0ad8dc1981e3995f0bb8c72526041fcb98ae6163e1e71a669d8364e9c4c3188f673c5f8ee6fadb41abf", 16);
-        BigInteger  qValue = new BigInteger("b09d634c10899cd7d4c3a7657403e05810b07c61a688bab2c37f475e308b0607", 16);
-
-        public TestResult perform()
-        {
-            BigInteger              r = new BigInteger("860d82c60e9502cd00c0e9e1f6563feafec304801974d745c5e02079946f729e",16);
-            BigInteger              s = new BigInteger("7ef49264ef022801aaa03033cd97915235fbab4c823ed936b0f360c22114688a",16);
-            GOST3410ParametersGenerator  pGen = new GOST3410ParametersGenerator();
-
-            pGen.init(1024, 2, init_random);
-
-            GOST3410Parameters           params = pGen.generateParameters();
-
-            if (!pValue.equals(params.getP()) || !qValue.equals(params.getQ()))
-            {
-                return new SimpleTestResult(false, getName() + ": p or q wrong");
-            }
-
-            GOST3410KeyPairGenerator         GOST3410KeyGen = new GOST3410KeyPairGenerator();
-            GOST3410KeyGenerationParameters  genParam = new GOST3410KeyGenerationParameters(keyRandom, params);
-
-            GOST3410KeyGen.init(genParam);
-
-            AsymmetricCipherKeyPair  pair = GOST3410KeyGen.generateKeyPair();
-
-            ParametersWithRandom param = new ParametersWithRandom(pair.getPrivate(), random);
-
-            GOST3410Signer GOST3410 = new GOST3410Signer();
-
-            GOST3410.init(true, param);
-
-            BigInteger[] sig = GOST3410.generateSignature(hashmessage);
-
-            if (!r.equals(sig[0]))
-            {
-                return new SimpleTestResult(false, getName()
-                    + ": r component wrong." + System.getProperty("line.separator")
-                    + " expecting: " + r.toString(16) + System.getProperty("line.separator")
-                    + " got      : " + sig[0].toString(16));
-            }
-
-            if (!s.equals(sig[1]))
-            {
-                return new SimpleTestResult(false, getName()
-                    + ": s component wrong." + System.getProperty("line.separator")
-                    + " expecting: " + s.toString(16) + System.getProperty("line.separator")
-                    + " got      : " + sig[1].toString(16));
-            }
-
-            GOST3410.init(false, pair.getPublic());
-
-            if (GOST3410.verifySignature(hashmessage, sig[0], sig[1]))
-            {
-                return new SimpleTestResult(true, getName() + ": Okay");
-            }
-            else
-            {
-                return new SimpleTestResult(false, getName() + ": verification fails");
-            }
-        }
-    }
-
-    private class GOST3410_CParam
-        implements Test
-    {
-        public String getName()
-        {
-            return "GOST3410-CParam";
-        }
-
-        SecureRandom    init_random = new SecureRandom()
-        {
-            boolean firstLong = true;
-
-            public long nextLong()
-            {
-                String x0 = "0x43848744";
-                String c =  "0xB50A826D";
-
-                if (firstLong)
-                {
-                    firstLong = false;
-                    return NumberParsing.decodeLongFromHex(x0);
-                }
-                return NumberParsing.decodeLongFromHex(c);
-            }
-
-            public void nextBytes(byte[] bytes)
-            {
-                byte[] d = Hex.decode("7F575E8194BC5BDF");
-
-                System.arraycopy(d, 0, bytes, bytes.length-d.length, d.length);
-            }
-        };
-
-        SecureRandom    random = new SecureRandom()
-        {
-            public void nextBytes(byte[] bytes)
-            {
-                byte[] k = Hex.decode("90F3A564439242F5186EBB224C8E223811B7105C64E4F5390807E6362DF4C72A");
-
-                int i;
-
-                for (i = 0; i < (bytes.length - k.length); i += k.length)
-                {
-                    System.arraycopy(k, 0, bytes, i, k.length);
-                }
-
-                if (i > bytes.length)
-                {
-                    System.arraycopy(k, 0, bytes, i - k.length, bytes.length - (i - k.length));
-                }
-                else
-                {
-                    System.arraycopy(k, 0, bytes, i, bytes.length - i);
-                }
-            }
-        };
-
-        SecureRandom    keyRandom = new SecureRandom()
-        {
-            public void nextBytes(byte[] bytes)
-            {
-                byte[] x = Hex.decode("3036314538303830343630454235324435324234314132373832433138443046");
-
-                int i;
-
-                for (i = 0; i < (bytes.length - x.length); i += x.length)
-                {
-                    System.arraycopy(x, 0, bytes, i, x.length);
-                }
-
-                if (i > bytes.length)
-                {
-                    System.arraycopy(x, 0, bytes, i - x.length, bytes.length - (i - x.length));
-                }
-                else
-                {
-                    System.arraycopy(x, 0, bytes, i, bytes.length - i);
-                }
-            }
-        };
-
-        BigInteger  pValue = new BigInteger("9d88e6d7fe3313bd2e745c7cdd2ab9ee4af3c8899e847de74a33783ea68bc30588ba1f738c6aaf8ab350531f1854c3837cc3c860ffd7e2e106c3f63b3d8a4c034ce73942a6c3d585b599cf695ed7a3c4a93b2b947b7157bb1a1c043ab41ec8566c6145e938a611906de0d32e562494569d7e999a0dda5c879bdd91fe124df1e9", 16);
-        BigInteger  qValue = new BigInteger("fadd197abd19a1b4653eecf7eca4d6a22b1f7f893b641f901641fbb555354faf", 16);
-
-        public TestResult perform()
-        {
-            BigInteger              r = new BigInteger("4deb95a0b35e7ed7edebe9bef5a0f93739e16b7ff27fe794d989d0c13159cfbc",16);
-            BigInteger              s = new BigInteger("e1d0d30345c24cfeb33efde3deee5fbbda78ddc822b719d860cd0ba1fb6bd43b",16);
-            GOST3410ParametersGenerator  pGen = new GOST3410ParametersGenerator();
-
-            pGen.init(1024, 2, init_random);
-
-            GOST3410Parameters           params = pGen.generateParameters();
-
-            if (!pValue.equals(params.getP()) || !qValue.equals(params.getQ()))
-            {
-                return new SimpleTestResult(false, getName() + ": p or q wrong");
-            }
-
-            GOST3410KeyPairGenerator         GOST3410KeyGen = new GOST3410KeyPairGenerator();
-            GOST3410KeyGenerationParameters  genParam = new GOST3410KeyGenerationParameters(keyRandom, params);
-
-            GOST3410KeyGen.init(genParam);
-
-            AsymmetricCipherKeyPair  pair = GOST3410KeyGen.generateKeyPair();
-
-            ParametersWithRandom param = new ParametersWithRandom(pair.getPrivate(), random);
-
-            GOST3410Signer GOST3410 = new GOST3410Signer();
-
-            GOST3410.init(true, param);
-
-            BigInteger[] sig = GOST3410.generateSignature(hashmessage);
-
-            if (!r.equals(sig[0]))
-            {
-                return new SimpleTestResult(false, getName()
-                    + ": r component wrong." + System.getProperty("line.separator")
-                    + " expecting: " + r.toString(16) + System.getProperty("line.separator")
-                    + " got      : " + sig[0].toString(16));
-            }
-
-            if (!s.equals(sig[1]))
-            {
-                return new SimpleTestResult(false, getName()
-                    + ": s component wrong." + System.getProperty("line.separator")
-                    + " expecting: " + s.toString(16) + System.getProperty("line.separator")
-                    + " got      : " + sig[1].toString(16));
-            }
-
-            GOST3410.init(false, pair.getPublic());
-
-            if (GOST3410.verifySignature(hashmessage, sig[0], sig[1]))
-            {
-                return new SimpleTestResult(true, getName() + ": Okay");
-            }
-            else
-            {
-                return new SimpleTestResult(false, getName() + ": verification fails");
-            }
-        }
-    }
-
-    private class GOST3410_DParam
-        implements Test
-    {
-        public String getName()
-        {
-            return "GOST3410-DParam";
-        }
-
-        SecureRandom    init_random = new SecureRandom()
-        {
-            boolean firstLong = true;
-
-            public long nextLong()
-            {
-                String x0 = "0x13DA8B9D";
-                String c =  "0xA0E9DE4B";
-
-                if (firstLong)
-                {
-                    firstLong = false;
-                    return NumberParsing.decodeLongFromHex(x0);
-                }
-                return NumberParsing.decodeLongFromHex(c);
-            }
-
-            public void nextBytes(byte[] bytes)
-            {
-
-                byte[] d = Hex.decode("41ab97857f42614355d32db0b1069f109a4da283676c7c53a68185b4");
-
-                System.arraycopy(d, 0, bytes, bytes.length-d.length, d.length);
-            }
-        };
-
-        SecureRandom    random = new SecureRandom()
-        {
-            public void nextBytes(byte[] bytes)
-            {
-                byte[] k = Hex.decode("90F3A564439242F5186EBB224C8E223811B7105C64E4F5390807E6362DF4C72A");
-
-                int i;
-
-                for (i = 0; i < (bytes.length - k.length); i += k.length)
-                {
-                    System.arraycopy(k, 0, bytes, i, k.length);
-                }
-
-                if (i > bytes.length)
-                {
-                    System.arraycopy(k, 0, bytes, i - k.length, bytes.length - (i - k.length));
-                }
-                else
-                {
-                    System.arraycopy(k, 0, bytes, i, bytes.length - i);
-                }
-            }
-        };
-
-        SecureRandom    keyRandom = new SecureRandom()
-        {
-            public void nextBytes(byte[] bytes)
-            {
-                byte[] x = Hex.decode("3036314538303830343630454235324435324234314132373832433138443046");
-
-                int i;
-
-                for (i = 0; i < (bytes.length - x.length); i += x.length)
-                {
-                    System.arraycopy(x, 0, bytes, i, x.length);
-                }
-
-                if (i > bytes.length)
-                {
-                    System.arraycopy(x, 0, bytes, i - x.length, bytes.length - (i - x.length));
-                }
-                else
-                {
-                    System.arraycopy(x, 0, bytes, i, bytes.length - i);
-                }
-            }
-        };
-
-        BigInteger  pValue = new BigInteger("80f102d32b0fd167d069c27a307adad2c466091904dbaa55d5b8cc7026f2f7a1919b890cb652c40e054e1e9306735b43d7b279eddf9102001cd9e1a831fe8a163eed89ab07cf2abe8242ac9dedddbf98d62cddd1ea4f5f15d3a42a6677bdd293b24260c0f27c0f1d15948614d567b66fa902baa11a69ae3bceadbb83e399c9b5", 16);
-        BigInteger  qValue = new BigInteger("f0f544c418aac234f683f033511b65c21651a6078bda2d69bb9f732867502149", 16);
-
-        public TestResult perform()
-        {
-            BigInteger              r = new BigInteger("712592d285b792e33b8a9a11e8e6c4f512ddf0042972bbfd1abb0a93e8fc6f54",16);
-            BigInteger              s = new BigInteger("2cf26758321258b130d5612111339f09ceb8668241f3482e38baa56529963f07",16);
-            GOST3410ParametersGenerator  pGen = new GOST3410ParametersGenerator();
-
-            pGen.init(1024, 2, init_random);
-
-            GOST3410Parameters           params = pGen.generateParameters();
-
-            if (!pValue.equals(params.getP()) || !qValue.equals(params.getQ()))
-            {
-                return new SimpleTestResult(false, getName() + ": p or q wrong");
-            }
-
-            GOST3410KeyPairGenerator         GOST3410KeyGen = new GOST3410KeyPairGenerator();
-            GOST3410KeyGenerationParameters  genParam = new GOST3410KeyGenerationParameters(keyRandom, params);
-
-            GOST3410KeyGen.init(genParam);
-
-            AsymmetricCipherKeyPair  pair = GOST3410KeyGen.generateKeyPair();
-
-            ParametersWithRandom param = new ParametersWithRandom(pair.getPrivate(), random);
-
-            GOST3410Signer GOST3410 = new GOST3410Signer();
-
-            GOST3410.init(true, param);
-
-            BigInteger[] sig = GOST3410.generateSignature(hashmessage);
-
-            if (!r.equals(sig[0]))
-            {
-                return new SimpleTestResult(false, getName()
-                    + ": r component wrong." + System.getProperty("line.separator")
-                    + " expecting: " + r.toString(16) + System.getProperty("line.separator")
-                    + " got      : " + sig[0].toString(16));
-            }
-
-            if (!s.equals(sig[1]))
-            {
-                return new SimpleTestResult(false, getName()
-                    + ": s component wrong." + System.getProperty("line.separator")
-                    + " expecting: " + s.toString(16) + System.getProperty("line.separator")
-                    + " got      : " + sig[1].toString(16));
-            }
-
-            GOST3410.init(false, pair.getPublic());
-
-            if (GOST3410.verifySignature(hashmessage, sig[0], sig[1]))
-            {
-                return new SimpleTestResult(true, getName() + ": Okay");
-            }
-            else
-            {
-                return new SimpleTestResult(false, getName() + ": verification fails");
-            }
-        }
-    }
-
-    private class GOST3410_AExParam
-        implements Test
-    {
-        public String getName()
-        {
-            return "GOST3410-AExParam";
-        }
-
-        SecureRandom    init_random = new SecureRandom()
-        {
-            boolean firstLong = true;
-
-            public long nextLong()
-            {
-                String x0 = "0xD05E9F14";
-                String c =  "0x46304C5F";
-
-                if (firstLong)
-                {
-                    firstLong = false;
-                    return NumberParsing.decodeLongFromHex(x0);
-                }
-                return NumberParsing.decodeLongFromHex(c);
-            }
-
-            public void nextBytes(byte[] bytes)
-            {
-                byte[] d = Hex.decode("35ab875399cda33c146ca629660e5a5e5c07714ca326db032dd6751995cdb90a612b9228932d8302704ec24a5def7739c5813d83");
-
-                System.arraycopy(d, 0, bytes, bytes.length-d.length, d.length);
-            }
-        };
-
-        SecureRandom    random = new SecureRandom()
-        {
-            public void nextBytes(byte[] bytes)
-            {
-                byte[] k = Hex.decode("90F3A564439242F5186EBB224C8E223811B7105C64E4F5390807E6362DF4C72A");
-
-                int i;
-
-                for (i = 0; i < (bytes.length - k.length); i += k.length)
-                {
-                    System.arraycopy(k, 0, bytes, i, k.length);
-                }
-
-                if (i > bytes.length)
-                {
-                    System.arraycopy(k, 0, bytes, i - k.length, bytes.length - (i - k.length));
-                }
-                else
-                {
-                    System.arraycopy(k, 0, bytes, i, bytes.length - i);
-                }
-            }
-        };
-
-        SecureRandom    keyRandom = new SecureRandom()
-        {
-            public void nextBytes(byte[] bytes)
-            {
-                byte[] x = Hex.decode("3036314538303830343630454235324435324234314132373832433138443046");
-
-                int i;
-
-                for (i = 0; i < (bytes.length - x.length); i += x.length)
-                {
-                    System.arraycopy(x, 0, bytes, i, x.length);
-                }
-
-                if (i > bytes.length)
-                {
-                    System.arraycopy(x, 0, bytes, i - x.length, bytes.length - (i - x.length));
-                }
-                else
-                {
-                    System.arraycopy(x, 0, bytes, i, bytes.length - i);
-                }
-            }
-        };
-
-        BigInteger  pValue = new BigInteger("ca3b3f2eee9fd46317d49595a9e7518e6c63d8f4eb4d22d10d28af0b8839f079f8289e603b03530784b9bb5a1e76859e4850c670c7b71c0df84ca3e0d6c177fe9f78a9d8433230a883cd82a2b2b5c7a3306980278570cdb79bf01074a69c9623348824b0c53791d53c6a78cab69e1cfb28368611a397f50f541e16db348dbe5f", 16);
-        BigInteger  qValue = new BigInteger("cae4d85f80c147704b0ca48e85fb00a9057aa4acc44668e17f1996d7152690d9", 16);
-
-        public TestResult perform()
-        {
-            BigInteger              r = new BigInteger("90892707282f433398488f19d31ac48523a8e2ded68944e0da91c6895ee7045e",16);
-            BigInteger              s = new BigInteger("3be4620ee88f1ee8f9dd63c7d145b7e554839feeca125049118262ea4651e9de",16);
-            GOST3410ParametersGenerator  pGen = new GOST3410ParametersGenerator();
-
-            pGen.init(1024, 2, init_random);
-
-            GOST3410Parameters           params = pGen.generateParameters();
-
-            if (!pValue.equals(params.getP()) || !qValue.equals(params.getQ()))
-            {
-                return new SimpleTestResult(false, getName() + ": p or q wrong");
-            }
-
-            GOST3410KeyPairGenerator         GOST3410KeyGen = new GOST3410KeyPairGenerator();
-            GOST3410KeyGenerationParameters  genParam = new GOST3410KeyGenerationParameters(keyRandom, params);
-
-            GOST3410KeyGen.init(genParam);
-
-            AsymmetricCipherKeyPair  pair = GOST3410KeyGen.generateKeyPair();
-
-            ParametersWithRandom param = new ParametersWithRandom(pair.getPrivate(), random);
-
-            GOST3410Signer GOST3410 = new GOST3410Signer();
-
-            GOST3410.init(true, param);
-
-            BigInteger[] sig = GOST3410.generateSignature(hashmessage);
-
-            if (!r.equals(sig[0]))
-            {
-                return new SimpleTestResult(false, getName()
-                    + ": r component wrong." + System.getProperty("line.separator")
-                    + " expecting: " + r.toString(16) + System.getProperty("line.separator")
-                    + " got      : " + sig[0].toString(16));
-            }
-
-            if (!s.equals(sig[1]))
-            {
-                return new SimpleTestResult(false, getName()
-                    + ": s component wrong." + System.getProperty("line.separator")
-                    + " expecting: " + s.toString(16) + System.getProperty("line.separator")
-                    + " got      : " + sig[1].toString(16));
-            }
-
-            GOST3410.init(false, pair.getPublic());
-
-            if (GOST3410.verifySignature(hashmessage, sig[0], sig[1]))
-            {
-                return new SimpleTestResult(true, getName() + ": Okay");
-            }
-            else
-            {
-                return new SimpleTestResult(false, getName() + ": verification fails");
-            }
-        }
-    }
-
-    private class GOST3410_BExParam
-        implements Test
-    {
-        public String getName()
-        {
-            return "GOST3410-BExParam";
-        }
-
-        SecureRandom    init_random = new SecureRandom()
-        {
-            boolean firstLong = true;
-
-            public long nextLong()
-            {
-                String x0 = "0x7A007804";
-                String c =  "0xD31A4FF7";
-
-                if (firstLong)
-                {
-                    firstLong = false;
-                    return NumberParsing.decodeLongFromHex(x0);
-                }
-                return NumberParsing.decodeLongFromHex(c);
-            }
-
-            public void nextBytes(byte[] bytes)
-            {
-                byte[] d = Hex.decode("7ec123d161477762838c2bea9dbdf33074af6d41d108a066a1e7a07ab3048de2");
-
-                System.arraycopy(d, 0, bytes, bytes.length-d.length, d.length);
-            }
-        };
-
-        SecureRandom    random = new SecureRandom()
-        {
-            public void nextBytes(byte[] bytes)
-            {
-                byte[] k = Hex.decode("90F3A564439242F5186EBB224C8E223811B7105C64E4F5390807E6362DF4C72A");
-
-                int i;
-
-                for (i = 0; i < (bytes.length - k.length); i += k.length)
-                {
-                    System.arraycopy(k, 0, bytes, i, k.length);
-                }
-
-                if (i > bytes.length)
-                {
-                    System.arraycopy(k, 0, bytes, i - k.length, bytes.length - (i - k.length));
-                }
-                else
-                {
-                    System.arraycopy(k, 0, bytes, i, bytes.length - i);
-                }
-            }
-        };
-
-        SecureRandom    keyRandom = new SecureRandom()
-        {
-            public void nextBytes(byte[] bytes)
-            {
-                byte[] x = Hex.decode("3036314538303830343630454235324435324234314132373832433138443046");
-
-                int i;
-
-                for (i = 0; i < (bytes.length - x.length); i += x.length)
-                {
-                    System.arraycopy(x, 0, bytes, i, x.length);
-                }
-
-                if (i > bytes.length)
-                {
-                    System.arraycopy(x, 0, bytes, i - x.length, bytes.length - (i - x.length));
-                }
-                else
-                {
-                    System.arraycopy(x, 0, bytes, i, bytes.length - i);
-                }
-            }
-        };
-
-        BigInteger  pValue = new BigInteger("9286dbda91eccfc3060aa5598318e2a639f5ba90a4ca656157b2673fb191cd0589ee05f4cef1bd13508408271458c30851ce7a4ef534742bfb11f4743c8f787b11193ba304c0e6bca25701bf88af1cb9b8fd4711d89f88e32b37d95316541bf1e5dbb4989b3df13659b88c0f97a3c1087b9f2d5317d557dcd4afc6d0a754e279", 16);
-        BigInteger  qValue = new BigInteger("c966e9b3b8b7cdd82ff0f83af87036c38f42238ec50a876cd390e43d67b6013f", 16);
-
-        public TestResult perform()
-        {
-            BigInteger              r = new BigInteger("8f79a582513df84dc247bcb624340cc0e5a34c4324a20ce7fe3ab8ff38a9db71",16);
-            BigInteger              s = new BigInteger("7508d22fd6cbb45efd438cb875e43f137247088d0f54b29a7c91f68a65b5fa85",16);
-            GOST3410ParametersGenerator  pGen = new GOST3410ParametersGenerator();
-
-            pGen.init(1024, 2, init_random);
-
-            GOST3410Parameters           params = pGen.generateParameters();
-
-            if (!pValue.equals(params.getP()) || !qValue.equals(params.getQ()))
-            {
-                return new SimpleTestResult(false, getName() + ": p or q wrong");
-            }
-
-            GOST3410KeyPairGenerator         GOST3410KeyGen = new GOST3410KeyPairGenerator();
-            GOST3410KeyGenerationParameters  genParam = new GOST3410KeyGenerationParameters(keyRandom, params);
-
-            GOST3410KeyGen.init(genParam);
-
-            AsymmetricCipherKeyPair  pair = GOST3410KeyGen.generateKeyPair();
-
-            ParametersWithRandom param = new ParametersWithRandom(pair.getPrivate(), random);
-
-            GOST3410Signer GOST3410 = new GOST3410Signer();
-
-            GOST3410.init(true, param);
-
-            BigInteger[] sig = GOST3410.generateSignature(hashmessage);
-
-            if (!r.equals(sig[0]))
-            {
-                return new SimpleTestResult(false, getName()
-                    + ": r component wrong." + System.getProperty("line.separator")
-                    + " expecting: " + r.toString(16) + System.getProperty("line.separator")
-                    + " got      : " + sig[0].toString(16));
-            }
-
-            if (!s.equals(sig[1]))
-            {
-                return new SimpleTestResult(false, getName()
-                    + ": s component wrong." + System.getProperty("line.separator")
-                    + " expecting: " + s.toString(16) + System.getProperty("line.separator")
-                    + " got      : " + sig[1].toString(16));
-            }
-
-            GOST3410.init(false, pair.getPublic());
-
-            if (GOST3410.verifySignature(hashmessage, sig[0], sig[1]))
-            {
-                return new SimpleTestResult(true, getName() + ": Okay");
-            }
-            else
-            {
-                return new SimpleTestResult(false, getName() + ": verification fails");
-            }
-        }
-    }
-
-    private class GOST3410_CExParam
-        implements Test
-    {
-        public String getName()
-        {
-            return "GOST3410-CExParam";
-        }
-
-        SecureRandom    init_random = new SecureRandom()
-        {
-            boolean firstLong = true;
-
-            public long nextLong()
-            {
-                String x0 = "0x162AB910";
-                String c =  "0x93F828D3";
-
-                if (firstLong)
-                {
-                    firstLong = false;
-                    return NumberParsing.decodeLongFromHex(x0);
-                }
-                return NumberParsing.decodeLongFromHex(c);
-            }
-
-            public void nextBytes(byte[] bytes)
-            {
-                byte[] d = Hex.decode("ca82cce78a738bc46f103d53b9bf809745ec845e4f6da462606c51f60ecf302e31204b81");
-
-                System.arraycopy(d, 0, bytes, bytes.length-d.length, d.length);
-            }
-        };
-
-        SecureRandom    random = new SecureRandom()
-        {
-            public void nextBytes(byte[] bytes)
-            {
-                byte[] k = Hex.decode("90F3A564439242F5186EBB224C8E223811B7105C64E4F5390807E6362DF4C72A");
-
-                int i;
-
-                for (i = 0; i < (bytes.length - k.length); i += k.length)
-                {
-                    System.arraycopy(k, 0, bytes, i, k.length);
-                }
-
-                if (i > bytes.length)
-                {
-                    System.arraycopy(k, 0, bytes, i - k.length, bytes.length - (i - k.length));
-                }
-                else
-                {
-                    System.arraycopy(k, 0, bytes, i, bytes.length - i);
-                }
-            }
-        };
-
-        SecureRandom    keyRandom = new SecureRandom()
-        {
-            public void nextBytes(byte[] bytes)
-            {
-                byte[] x = Hex.decode("3036314538303830343630454235324435324234314132373832433138443046");
-
-                int i;
-
-                for (i = 0; i < (bytes.length - x.length); i += x.length)
-                {
-                    System.arraycopy(x, 0, bytes, i, x.length);
-                }
-
-                if (i > bytes.length)
-                {
-                    System.arraycopy(x, 0, bytes, i - x.length, bytes.length - (i - x.length));
-                }
-                else
-                {
-                    System.arraycopy(x, 0, bytes, i, bytes.length - i);
-                }
-            }
-        };
-
-        BigInteger  pValue = new BigInteger("b194036ace14139d36d64295ae6c50fc4b7d65d8b340711366ca93f383653908ee637be428051d86612670ad7b402c09b820fa77d9da29c8111a8496da6c261a53ed252e4d8a69a20376e6addb3bdcd331749a491a184b8fda6d84c31cf05f9119b5ed35246ea4562d85928ba1136a8d0e5a7e5c764ba8902029a1336c631a1d", 16);
-        BigInteger  qValue = new BigInteger("96120477df0f3896628e6f4a88d83c93204c210ff262bccb7dae450355125259", 16);
-
-        public TestResult perform()
-        {
-            BigInteger              r = new BigInteger("169fdb2dc09f690b71332432bfec806042e258fa9a21dafe73c6abfbc71407d9",16);
-            BigInteger              s = new BigInteger("9002551808ae40d19f6f31fb67e4563101243cf07cffd5f2f8ff4c537b0c9866",16);
-            GOST3410ParametersGenerator  pGen = new GOST3410ParametersGenerator();
-
-            pGen.init(1024, 2, init_random);
-
-            GOST3410Parameters           params = pGen.generateParameters();
-
-            if (!pValue.equals(params.getP()) || !qValue.equals(params.getQ()))
-            {
-                return new SimpleTestResult(false, getName() + ": p or q wrong");
-            }
-
-            GOST3410KeyPairGenerator         GOST3410KeyGen = new GOST3410KeyPairGenerator();
-            GOST3410KeyGenerationParameters  genParam = new GOST3410KeyGenerationParameters(keyRandom, params);
-
-            GOST3410KeyGen.init(genParam);
-
-            AsymmetricCipherKeyPair  pair = GOST3410KeyGen.generateKeyPair();
-
-            ParametersWithRandom param = new ParametersWithRandom(pair.getPrivate(), random);
-
-            GOST3410Signer GOST3410 = new GOST3410Signer();
-
-            GOST3410.init(true, param);
-
-            BigInteger[] sig = GOST3410.generateSignature(hashmessage);
-
-            if (!r.equals(sig[0]))
-            {
-                return new SimpleTestResult(false, getName()
-                    + ": r component wrong." + System.getProperty("line.separator")
-                    + " expecting: " + r.toString(16) + System.getProperty("line.separator")
-                    + " got      : " + sig[0].toString(16));
-            }
-
-            if (!s.equals(sig[1]))
-            {
-                return new SimpleTestResult(false, getName()
-                    + ": s component wrong." + System.getProperty("line.separator")
-                    + " expecting: " + s.toString(16) + System.getProperty("line.separator")
-                    + " got      : " + sig[1].toString(16));
-            }
-
-            GOST3410.init(false, pair.getPublic());
-
-            if (GOST3410.verifySignature(hashmessage, sig[0], sig[1]))
-            {
-                return new SimpleTestResult(true, getName() + ": Okay");
-            }
-            else
-            {
-                return new SimpleTestResult(false, getName() + ": verification fails");
-            }
-        }
-    }
-
-    Test tests[] =
-    {
-        new GOST3410_TEST1_512(),
-        new GOST3410_TEST2_512(),
-//        new GOST3410_TEST1_1024(),
-//        new GOST3410_TEST2_1024(),
-//        new GOST3410_AParam(),
-//        new GOST3410_BParam(),
-//        new GOST3410_CParam(),
-//        new GOST3410_DParam(),
-//        new GOST3410_AExParam(),
-//        new GOST3410_BExParam(),
-//        new GOST3410_CExParam()
-    };
-
-    public String getName()
-    {
-        return "GOST3410";
-    }
-
-    public TestResult perform()
-    {
-        for (int i = 0; i != tests.length; i++)
-        {
-            TestResult  result = tests[i].perform();
-
-            if (!result.isSuccessful())
-            {
-                return result;
-            }
-        }
-
-        return new SimpleTestResult(true, "GOST3410: Okay");
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        GOST3410Test         test = new GOST3410Test();
-        TestResult      result = test.perform();
-
-        System.out.println(result);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/GOST3411DigestTest.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/GOST3411DigestTest.java
deleted file mode 100644
index 45962fe..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/GOST3411DigestTest.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.digests.GOST3411Digest;
-import org.bouncycastle.crypto.generators.PKCS5S1ParametersGenerator;
-import org.bouncycastle.crypto.macs.HMac;
-import org.bouncycastle.crypto.params.KeyParameter;
-
-public class GOST3411DigestTest
-    extends DigestTest
-{
-    private static final String[] messages =
-    {
-        "",
-        "This is message, length=32 bytes",
-        "Suppose the original message has length = 50 bytes",
-        "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"
-    };
-    
-//  If S-box = D-A (see: digest/GOST3411Digest.java; function: E(byte[] in, byte[] key); string: CipherParameters  param = new GOST28147Parameters(key,"D-A");)
-    private static final String[] digests =
-    {
-        "981e5f3ca30c841487830f84fb433e13ac1101569b9c13584ac483234cd656c0",
-        "2cefc2f7b7bdc514e18ea57fa74ff357e7fa17d652c75f69cb1be7893ede48eb",
-        "c3730c5cbccacf915ac292676f21e8bd4ef75331d9405e5f1a61dc3130a65011",
-        "73b70a39497de53a6e08c67b6d4db853540f03e9389299d9b0156ef7e85d0f61"
-    };
-
-//  If S-box = D-Test (see: digest/GOST3411Digest.java; function:E(byte[] in, byte[] key); string: CipherParameters  param = new GOST28147Parameters(key,"D-Test");)
-//    private static final String[] digests =
-//    {
-//        "ce85b99cc46752fffee35cab9a7b0278abb4c2d2055cff685af4912c49490f8d",
-//        "b1c466d37519b82e8319819ff32595e047a28cb6f83eff1c6916a815a637fffa",
-//        "471aba57a60a770d3a76130635c1fbea4ef14de51f78b4ae57dd893b62f55208",
-//        "95c1af627c356496d80274330b2cff6a10c67b5f597087202f94d06d2338cf8e"
-//    };
-    
-    // 1 million 'a'
-    static private String  million_a_digest = "8693287aa62f9478f7cb312ec0866b6c4e4a0f11160441e8f4ffcd2715dd554f";
-
-    GOST3411DigestTest()
-    {
-        super(new GOST3411Digest(), messages, digests);
-    }
-
-    public void performTest()
-    {
-        super.performTest();
-        
-        millionATest(million_a_digest);
-
-        HMac gMac = new HMac(new GOST3411Digest());
-
-        gMac.init(new KeyParameter(PKCS5S1ParametersGenerator.PKCS5PasswordToUTF8Bytes("1".toCharArray())));
-
-        byte[] data = "fred".getBytes();
-
-        gMac.update(data, 0, data.length);
-        byte[] mac = new byte[gMac.getMacSize()];
-
-        gMac.doFinal(mac, 0);
-    }
-
-    protected Digest cloneDigest(Digest digest)
-    {
-        return new GOST3411Digest((GOST3411Digest)digest);
-    }
-    
-    public static void main(
-        String[]    args)
-    {
-        runTest(new GOST3411DigestTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/Grain128Test.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/Grain128Test.java
deleted file mode 100644
index afac2e0..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/Grain128Test.java
+++ /dev/null
@@ -1,117 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.StreamCipher;
-import org.bouncycastle.crypto.engines.Grain128Engine;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.crypto.params.ParametersWithIV;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-
-/**
- * Grain-128 Test
- */
-public class Grain128Test
-    extends SimpleTest
-{
-
-    String keyStream1 = "f09b7bf7d7f6b5c2de2ffc73ac21397f";
-    String keyStream2 = "afb5babfa8de896b4b9c6acaf7c4fbfd";
-
-    public String getName()
-    {
-        return "Grain-128";
-    }
-
-    public void performTest()
-    {
-        Grain128Test1(new ParametersWithIV(new KeyParameter(Hex
-            .decode("00000000000000000000000000000000")), Hex
-            .decode("000000000000000000000000")));
-        Grain128Test2(new ParametersWithIV(new KeyParameter(Hex
-            .decode("0123456789abcdef123456789abcdef0")), Hex
-            .decode("0123456789abcdef12345678")));
-        Grain128Test3(new ParametersWithIV(new KeyParameter(Hex
-            .decode("0123456789abcdef123456789abcdef0")), Hex
-            .decode("0123456789abcdef12345678")));
-    }
-
-    private void Grain128Test1(CipherParameters params)
-    {
-        StreamCipher grain = new Grain128Engine();
-        byte[] in = new byte[16];
-        byte[] out = new byte[16];
-
-        grain.init(true, params);
-
-        grain.processBytes(in, 0, in.length, out, 0);
-
-        if (!areEqual(out, Hex.decode(keyStream1)))
-        {
-            mismatch("Keystream 1", keyStream1, out);
-        }
-
-        grain.reset();
-
-        grain.processBytes(in, 0, in.length, out, 0);
-
-        if (!areEqual(out, Hex.decode(keyStream1)))
-        {
-            mismatch("Keystream 1", keyStream1, out);
-        }
-    }
-
-    private void Grain128Test2(CipherParameters params)
-    {
-        StreamCipher grain = new Grain128Engine();
-        byte[] in = new byte[16];
-        byte[] out = new byte[16];
-
-        grain.init(true, params);
-
-        grain.processBytes(in, 0, in.length, out, 0);
-
-        if (!areEqual(out, Hex.decode(keyStream2)))
-        {
-            mismatch("Keystream 2", keyStream2, out);
-        }
-
-        grain.reset();
-
-        grain.processBytes(in, 0, in.length, out, 0);
-
-        if (!areEqual(out, Hex.decode(keyStream2)))
-        {
-            mismatch("Keystream 2", keyStream2, out);
-        }
-    }
-
-    private void Grain128Test3(CipherParameters params)
-    {
-        StreamCipher grain = new Grain128Engine();
-        byte[] in = "Encrypt me!".getBytes();
-        byte[] cipher = new byte[in.length];
-        byte[] clear = new byte[in.length];
-
-        grain.init(true, params);
-
-        grain.processBytes(in, 0, in.length, cipher, 0);
-        grain.reset();
-        grain.processBytes(cipher, 0, cipher.length, clear, 0);
-
-        if (!areEqual(in, clear))
-        {
-            mismatch("Test 3", new String(Hex.encode(in)), clear);
-        }
-    }
-
-    private void mismatch(String name, String expected, byte[] found)
-    {
-        fail("mismatch on " + name, expected, new String(Hex.encode(found)));
-    }
-
-    public static void main(String[] args)
-    {
-        runTest(new Grain128Test());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/Grainv1Test.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/Grainv1Test.java
deleted file mode 100644
index b76c1f2..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/Grainv1Test.java
+++ /dev/null
@@ -1,140 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.StreamCipher;
-import org.bouncycastle.crypto.engines.Grainv1Engine;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.crypto.params.ParametersWithIV;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-
-/**
- * Grain v1 Test
- */
-public class Grainv1Test
-    extends SimpleTest
-{
-
-    String keyStream1 = "dee931cf1662a72f77d0";
-    String keyStream2 = "7f362bd3f7abae203664";
-    String keyStream4 = "017D13ECB20AE0C9ACF784CB06525F72"
-        + "CE6D52BEBB948F124668C35064559024"
-        + "49EEA505C19F3EE4D052C3D19DA9C4D1"
-        + "B92DBC7F07AFEA6A3D845DE60D8471FD";
-
-    public String getName()
-    {
-        return "Grain v1";
-    }
-
-    public void performTest()
-    {
-        Grainv1Test1(new ParametersWithIV(new KeyParameter(Hex
-            .decode("00000000000000000000")), Hex
-            .decode("0000000000000000")));
-        Grainv1Test2(new ParametersWithIV(new KeyParameter(Hex
-            .decode("0123456789abcdef1234")), Hex
-            .decode("0123456789abcdef")));
-        Grainv1Test3(new ParametersWithIV(new KeyParameter(Hex
-            .decode("0123456789abcdef1234")), Hex
-            .decode("0123456789abcdef")));
-        Grainv1Test4(new ParametersWithIV(new KeyParameter(Hex
-            .decode("0F62B5085BAE0154A7FA")), Hex
-            .decode("288FF65DC42B92F9")));
-    }
-
-    private void Grainv1Test1(CipherParameters params)
-    {
-        StreamCipher grain = new Grainv1Engine();
-        byte[] in = new byte[10];
-        byte[] out = new byte[10];
-
-        grain.init(true, params);
-
-        grain.processBytes(in, 0, in.length, out, 0);
-
-        if (!areEqual(out, Hex.decode(keyStream1)))
-        {
-            mismatch("Keystream 1", keyStream1, out);
-        }
-
-        grain.reset();
-
-        grain.processBytes(in, 0, in.length, out, 0);
-
-        if (!areEqual(out, Hex.decode(keyStream1)))
-        {
-            mismatch("Keystream 1", keyStream1, out);
-        }
-    }
-
-    private void Grainv1Test2(CipherParameters params)
-    {
-        StreamCipher grain = new Grainv1Engine();
-        byte[] in = new byte[10];
-        byte[] out = new byte[10];
-
-        grain.init(true, params);
-
-        grain.processBytes(in, 0, in.length, out, 0);
-
-        if (!areEqual(out, Hex.decode(keyStream2)))
-        {
-            mismatch("Keystream 2", keyStream2, out);
-        }
-
-        grain.reset();
-
-        grain.processBytes(in, 0, in.length, out, 0);
-
-        if (!areEqual(out, Hex.decode(keyStream2)))
-        {
-            mismatch("Keystream 2", keyStream2, out);
-        }
-    }
-
-    private void Grainv1Test3(CipherParameters params)
-    {
-        StreamCipher grain = new Grainv1Engine();
-        byte[] in = "Encrypt me!".getBytes();
-        byte[] cipher = new byte[in.length];
-        byte[] clear = new byte[in.length];
-
-        grain.init(true, params);
-
-        grain.processBytes(in, 0, in.length, cipher, 0);
-        grain.reset();
-        grain.processBytes(cipher, 0, cipher.length, clear, 0);
-
-        if (!areEqual(in, clear))
-        {
-            mismatch("Test 3", new String(Hex.encode(in)), clear);
-        }
-    }
-
-    private void Grainv1Test4(CipherParameters params)
-    {
-        StreamCipher grain = new Grainv1Engine();
-        byte[] in = new byte[keyStream4.length() / 2];
-        byte[] out = new byte[in.length];
-
-        grain.init(true, params);
-
-        grain.processBytes(in, 0, in.length, out, 0);
-
-        if (!areEqual(out, Hex.decode(keyStream4)))
-        {
-            mismatch("Keystream 4", keyStream4, out);
-        }
-    }
-
-    private void mismatch(String name, String expected, byte[] found)
-    {
-        fail("mismatch on " + name, expected, new String(Hex.encode(found)));
-    }
-
-    public static void main(String[] args)
-    {
-        runTest(new Grainv1Test());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/HCFamilyTest.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/HCFamilyTest.java
deleted file mode 100644
index 5604d9c..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/HCFamilyTest.java
+++ /dev/null
@@ -1,192 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import org.bouncycastle.crypto.StreamCipher;
-import org.bouncycastle.crypto.engines.HC128Engine;
-import org.bouncycastle.crypto.engines.HC256Engine;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.crypto.params.ParametersWithIV;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-
-/**
- * HC-128 and HC-256 Tests. Based on the test vectors in the official reference
- * papers, respectively:
- * <pre>
- * http://www.ecrypt.eu.org/stream/p3ciphers/hc/hc128_p3.pdf
- * http://www.ecrypt.eu.org/stream/p3ciphers/hc/hc256_p3.pdf
- * </pre>
- * See HCFamilyVecTest for a more exhaustive test based on the ecrypt vectors.
- */
-public class HCFamilyTest
-    extends SimpleTest
-{
-    private static final byte[] MSG = new byte[64];
-
-    private static String[][] HC128_VerifiedTest =
-        {
-            {
-                "Set 2, vector#  0",
-                "00000000000000000000000000000000",
-                "00000000000000000000000000000000",
-                "82001573A003FD3B7FD72FFB0EAF63AA" +
-                "C62F12DEB629DCA72785A66268EC758B" +
-                "1EDB36900560898178E0AD009ABF1F49" +
-                "1330DC1C246E3D6CB264F6900271D59C"
-            },
-            {
-                "Set 6, vector#  0",
-                "0053A6F94C9FF24598EB3E91E4378ADD",
-                "0D74DB42A91077DE45AC137AE148AF16",
-                "2E1ED12A8551C05AF41FF39D8F9DF933" +
-                "122B5235D48FC2A6F20037E69BDBBCE8" +
-                "05782EFC16C455A4B3FF06142317535E" +
-                "F876104C32445138CB26EBC2F88A684C"
-            },
-            {
-                "Set 6, vector#  1",
-                "0558ABFE51A4F74A9DF04396E93C8FE2",
-                "167DE44BB21980E74EB51C83EA51B81F",
-                "4F864BF3C96D0363B1903F0739189138" +
-                "F6ED2BC0AF583FEEA0CEA66BA7E06E63" +
-                "FB28BF8B3CA0031D24ABB511C57DD17B" +
-                "FC2861C32400072CB680DF2E58A5CECC"
-            },
-            {
-                "Set 6, vector#  2",
-                "0A5DB00356A9FC4FA2F5489BEE4194E7",
-                "1F86ED54BB2289F057BE258CF35AC128",
-                "82168AB0023B79AAF1E6B4D823855E14" +
-                "A7084378036A951B1CFEF35173875ED8" +
-                "6CB66AB8410491A08582BE40080C3102" +
-                "193BA567F9E95D096C3CC60927DD7901"
-            },
-            {
-                "Set 6, vector#  3",
-                "0F62B5085BAE0154A7FA4DA0F34699EC",
-                "288FF65DC42B92F960C72E95FC63CA31",
-                "1CD8AEDDFE52E217E835D0B7E84E2922" +
-                "D04B1ADBCA53C4522B1AA604C42856A9" +
-                "0AF83E2614BCE65C0AECABDD8975B557" +
-                "00D6A26D52FFF0888DA38F1DE20B77B7"
-            }
-        };
-
-    private static String[][] HC256_VerifiedTest =
-        {
-            {
-                "Set 2, vector#  0",
-                "00000000000000000000000000000000",
-                "00000000000000000000000000000000",
-                "5B078985D8F6F30D42C5C02FA6B67951" +
-                "53F06534801F89F24E74248B720B4818" +
-                "CD9227ECEBCF4DBF8DBF6977E4AE14FA" +
-                "E8504C7BC8A9F3EA6C0106F5327E6981"
-            },
-            {
-                "Set 2, vector#  9",
-                "09090909090909090909090909090909",
-                "00000000000000000000000000000000",
-                "F5C2926651AEED9AF1A9C2F04C03D081" +
-                "2145B56AEA46EB283A25A4C9E3D8BEB4" +
-                "821B418F06F2B9DCDF1A85AB8C02CD14" +
-                "62E1BBCAEC9AB0E99AA6AFF918BA627C"
-            },
-            {
-                "Set 2, vector#135",
-                "87878787878787878787878787878787",
-                "00000000000000000000000000000000",
-                "CEC0C3852E3B98233EBCB975C10B1191" +
-                "3C69F2275EB97A1402EDF16C6FBE19BE" +
-                "79D65360445BCB63676E6553B609A065" +
-                "0155C3B22DD1975AC0F3F65063A2E16E"
-            },
-            {
-                "Set 6, vector#  0",
-                "0053A6F94C9FF24598EB3E91E4378ADD" +
-                "3083D6297CCF2275C81B6EC11467BA0D",
-                "0D74DB42A91077DE45AC137AE148AF16" +
-                "7DE44BB21980E74EB51C83EA51B81F86",
-                "23D9E70A45EB0127884D66D9F6F23C01" +
-                "D1F88AFD629270127247256C1FFF91E9" +
-                "1A797BD98ADD23AE15BEE6EEA3CEFDBF" +
-                "A3ED6D22D9C4F459DB10C40CDF4F4DFF"
-            },
-            {
-                "Set 6, vector#  1",
-                "0558ABFE51A4F74A9DF04396E93C8FE2" +
-                "3588DB2E81D4277ACD2073C6196CBF12",
-                "167DE44BB21980E74EB51C83EA51B81F" +
-                "86ED54BB2289F057BE258CF35AC1288F",
-                "C44B5262F2EAD9C018213127686DB742" +
-                "A72D3F2D61D18F0F4E7DE5B4F7ADABE0" +
-                "7E0C82033B139F02BAACB4E2F2D0BE30" +
-                "110C3A8A2B621523756692877C905DD0"
-            },
-            {
-                "Set 6, vector#  2",
-                "0A5DB00356A9FC4FA2F5489BEE4194E7" +
-                "3A8DE03386D92C7FD22578CB1E71C417",
-                "1F86ED54BB2289F057BE258CF35AC128" +
-                "8FF65DC42B92F960C72E95FC63CA3198",
-                "9D13AA06122F4F03AE60D507701F1ED0" +
-                "63D7530FF35EE76CAEDCBFB01D8A239E" +
-                "FA4A44B272DE9B4092E2AD56E87C3A60" +
-                "89F5A074D1F6E5B8FC6FABEE0C936F06"
-            },
-            {
-                "Set 6, vector#  3",
-                "0F62B5085BAE0154A7FA4DA0F34699EC" +
-                "3F92E5388BDE3184D72A7DD02376C91C",
-                "288FF65DC42B92F960C72E95FC63CA31" +
-                "98FF66CD349B0269D0379E056CD33AA1",
-                "C8632038DA61679C4685288B37D3E232" +
-                "7BC2D28C266B041FE0CA0D3CFEED8FD5" +
-                "753259BAB757168F85EA96ADABD823CA" +
-                "4684E918423E091565713FEDDE2CCFE0"
-            }
-        };
-
-    public String getName()
-    {
-        return "HC-128 and HC-256";
-    }
-
-    public void performTest()
-    {
-        StreamCipher hc = new HC256Engine();
-
-        for (int i = 0; i != HC256_VerifiedTest.length; i++)
-        {
-            String[] test = HC256_VerifiedTest[i];
-            HCTest(hc, "HC-256 - " + test[0], Hex.decode(test[1]), Hex.decode(test[2]), Hex.decode(test[3]));
-        }
-
-        hc = new HC128Engine();
-
-        for (int i = 0; i != HC128_VerifiedTest.length; i++)
-        {
-            String[] test = HC128_VerifiedTest[i];
-            HCTest(hc, "HC-128 - " + test[0], Hex.decode(test[1]), Hex.decode(test[2]), Hex.decode(test[3]));
-        }
-    }
-
-    private void HCTest(StreamCipher hc, String test, byte[] key, byte[] IV, byte[] expected)
-    {
-        KeyParameter kp = new KeyParameter(key);
-        ParametersWithIV ivp = new ParametersWithIV(kp, IV);
-
-        hc.init(true, ivp);
-        for (int i = 0; i < 64; i++)
-        {
-            if (hc.returnByte(MSG[i]) != expected[i])
-            {
-                fail(test + " failure at byte " + i);
-            }
-        }
-    }
-
-    public static void main(String[] args)
-    {
-        runTest(new HCFamilyTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/HCFamilyVecTest.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/HCFamilyVecTest.java
deleted file mode 100644
index 51247e6..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/HCFamilyVecTest.java
+++ /dev/null
@@ -1,199 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.Reader;
-
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.StreamCipher;
-import org.bouncycastle.crypto.engines.HC128Engine;
-import org.bouncycastle.crypto.engines.HC256Engine;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.crypto.params.ParametersWithIV;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-
-/**
- * HC-128 and HC-256 Tests. Based on the test vectors in the official reference
- * papers, respectively:
- * 
- * http://www.ecrypt.eu.org/stream/p3ciphers/hc/hc128_p3.pdf
- * http://www.ecrypt.eu.org/stream/p3ciphers/hc/hc256_p3.pdf
- */
-public class HCFamilyVecTest
-    extends SimpleTest
-{
-    private static class PeekableLineReader extends BufferedReader
-    {
-        public PeekableLineReader(Reader r) throws IOException
-        {
-            super(r);
-
-            peek = super.readLine();
-        }
-
-        public String peekLine()
-        {
-            return peek;
-        }
-
-        public String readLine() throws IOException
-        {
-            String tmp = peek;
-            peek = super.readLine();
-            return tmp;
-        }
-
-        private String peek; 
-    }
-
-    public String getName()
-    {
-        return "HC-128 and HC-256 (ecrypt)";
-    }
-
-    public void performTest() throws Exception
-    {
-        runTests(new HC128Engine(), "ecrypt_HC-128.txt");
-        runTests(new HC256Engine(), "ecrypt_HC-256_128K_128IV.txt");
-        runTests(new HC256Engine(), "ecrypt_HC-256_256K_128IV.txt");
-        runTests(new HC256Engine(), "ecrypt_HC-256_128K_256IV.txt");
-        runTests(new HC256Engine(), "ecrypt_HC-256_256K_256IV.txt");
-    }
-
-    private void runTests(StreamCipher hc, String fileName) throws IOException
-    {
-        Reader resource = new InputStreamReader(getClass().getResourceAsStream(fileName));
-        PeekableLineReader r = new PeekableLineReader(resource);
-        runAllVectors(hc, fileName, r);
-    }
-
-    private void runAllVectors(StreamCipher hc, String fileName, PeekableLineReader r)
-        throws IOException
-    {
-        for (;;)
-        {
-            String line = r.readLine();
-            if (line == null)
-            {
-                break;
-            }
-
-            line = line.trim();
-
-            if (line.startsWith("Set "))
-            {
-                runVector(hc, fileName, r, dellChar(line, ':'));
-            }
-        }
-    }
-
-    private String dellChar(String s, char c)
-    {
-        StringBuffer b = new StringBuffer();
-
-        for (int i = 0; i != s.length(); i++)
-        {
-            if (s.charAt(i) != c)
-            {
-                b.append(s.charAt(i));
-            }
-        }
-
-        return b.toString();
-    }
-
-    private void runVector(StreamCipher hc, String fileName, PeekableLineReader r, String vectorName)
-        throws IOException
-    {
-//        System.out.println(fileName + " => " + vectorName);
-        String hexKey = readBlock(r);
-        String hexIV = readBlock(r);
-
-        CipherParameters cp = new KeyParameter(Hex.decode(hexKey));
-        cp = new ParametersWithIV(cp, Hex.decode(hexIV));
-        hc.init(true, cp);
-
-        byte[] input = new byte[64];
-        byte[] output = new byte[64];
-        byte[] digest = new byte[64];
-        int pos = 0;
-
-        for (;;)
-        {
-            String line1 = r.peekLine().trim();
-            int equalsPos = line1.indexOf('=');
-            String lead = line1.substring(0, equalsPos - 1);
-
-            String hexData = readBlock(r);
-            byte[] data = Hex.decode(hexData);
-
-            if (lead.equals("xor-digest"))
-            {
-                if (!Arrays.areEqual(data, digest))
-                {
-                    fail("Failed in " + fileName + " for test vector: " + vectorName + " at " + lead);
-//                  System.out.println(fileName + " => " + vectorName + " failed at " + lead); return;
-                }
-                break;
-            }
-
-            int posA = lead.indexOf('[');
-            int posB = lead.indexOf("..");
-            int posC = lead.indexOf(']');
-            int start = Integer.parseInt(lead.substring(posA + 1, posB));
-            int end = Integer.parseInt(lead.substring(posB + 2, posC));
-
-            if (start % 64 != 0 || (end - start != 63))
-            {
-                throw new IllegalStateException(vectorName + ": " + lead + " not on 64 byte boundaries");
-            }
-
-            while (pos < end)
-            {
-                hc.processBytes(input, 0, input.length, output, 0);
-                xor(digest, output);
-                pos += 64;
-            }
-
-            if (!Arrays.areEqual(data, output))
-            {
-                fail("Failed in " + fileName + " for test vector: " + vectorName + " at " + lead);
-//              System.out.println(fileName + " => " + vectorName + " failed at " + lead); return;
-            }
-        }
-    }
-
-    private static String readBlock(PeekableLineReader r) throws IOException
-    {
-        String first = r.readLine().trim();
-        String result = first.substring(first.lastIndexOf(' ') + 1);
-
-        for (;;)
-        {
-            String peek = r.peekLine().trim();
-            if (peek.length() < 1 || peek.indexOf('=') >= 0)
-            {
-                break;
-            }
-            result += r.readLine().trim();
-        }
-
-        return result;
-    }
-
-    private static void xor(byte[] digest, byte[] block)
-    {
-        for (int i = 0; i < digest.length; ++i)
-        {
-            digest[i] ^= block[i];
-        }
-    }
-
-    public static void main(String[] args)
-    {
-        runTest(new HCFamilyVecTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/HKDFGeneratorTest.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/HKDFGeneratorTest.java
deleted file mode 100644
index 9513517..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/HKDFGeneratorTest.java
+++ /dev/null
@@ -1,304 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.digests.SHA1Digest;
-import org.bouncycastle.crypto.digests.SHA256Digest;
-import org.bouncycastle.crypto.generators.HKDFBytesGenerator;
-import org.bouncycastle.crypto.params.HKDFParameters;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-
-/**
- * HKDF tests - vectors from RFC 5869, + 2 more, 101 and 102
- */
-public class HKDFGeneratorTest
-    extends SimpleTest
-{
-
-    public HKDFGeneratorTest()
-    {
-    }
-
-    private void compareOKM(int test, byte[] calculatedOKM, byte[] testOKM)
-    {
-
-        if (!areEqual(calculatedOKM, testOKM))
-        {
-            fail("HKDF failed generator test " + test);
-        }
-    }
-
-    public void performTest()
-    {
-        {
-            // === A.1. Test Case 1 - Basic test case with SHA-256 ===
-
-            Digest hash = new SHA256Digest();
-            byte[] ikm = Hex
-                .decode("0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b");
-            byte[] salt = Hex.decode("000102030405060708090a0b0c");
-            byte[] info = Hex.decode("f0f1f2f3f4f5f6f7f8f9");
-            int l = 42;
-            byte[] okm = new byte[l];
-
-            HKDFParameters params = new HKDFParameters(ikm, salt, info);
-
-            HKDFBytesGenerator hkdf = new HKDFBytesGenerator(hash);
-            hkdf.init(params);
-            hkdf.generateBytes(okm, 0, l);
-
-            compareOKM(1, okm, Hex.decode(
-                "3cb25f25faacd57a90434f64d0362f2a" +
-                    "2d2d0a90cf1a5a4c5db02d56ecc4c5bf" +
-                    "34007208d5b887185865"));
-        }
-
-        // === A.2. Test Case 2 - Test with SHA-256 and longer inputs/outputs
-        // ===
-        {
-            Digest hash = new SHA256Digest();
-            byte[] ikm = Hex.decode("000102030405060708090a0b0c0d0e0f"
-                + "101112131415161718191a1b1c1d1e1f"
-                + "202122232425262728292a2b2c2d2e2f"
-                + "303132333435363738393a3b3c3d3e3f"
-                + "404142434445464748494a4b4c4d4e4f");
-            byte[] salt = Hex.decode("606162636465666768696a6b6c6d6e6f"
-                + "707172737475767778797a7b7c7d7e7f"
-                + "808182838485868788898a8b8c8d8e8f"
-                + "909192939495969798999a9b9c9d9e9f"
-                + "a0a1a2a3a4a5a6a7a8a9aaabacadaeaf");
-            byte[] info = Hex.decode("b0b1b2b3b4b5b6b7b8b9babbbcbdbebf"
-                + "c0c1c2c3c4c5c6c7c8c9cacbcccdcecf"
-                + "d0d1d2d3d4d5d6d7d8d9dadbdcdddedf"
-                + "e0e1e2e3e4e5e6e7e8e9eaebecedeeef"
-                + "f0f1f2f3f4f5f6f7f8f9fafbfcfdfeff");
-            int l = 82;
-            byte[] okm = new byte[l];
-
-            HKDFParameters params = new HKDFParameters(ikm, salt, info);
-
-            HKDFBytesGenerator hkdf = new HKDFBytesGenerator(hash);
-            hkdf.init(params);
-            hkdf.generateBytes(okm, 0, l);
-
-            compareOKM(2, okm, Hex.decode(
-                "b11e398dc80327a1c8e7f78c596a4934" +
-                    "4f012eda2d4efad8a050cc4c19afa97c" +
-                    "59045a99cac7827271cb41c65e590e09" +
-                    "da3275600c2f09b8367793a9aca3db71" +
-                    "cc30c58179ec3e87c14c01d5c1f3434f" +
-                    "1d87"));
-        }
-
-        {
-            // === A.3. Test Case 3 - Test with SHA-256 and zero-length
-            // salt/info ===
-
-            // setting salt to an empty byte array means that the salt is set to
-            // HashLen zero valued bytes
-            // setting info to null generates an empty byte array as info
-            // structure
-
-            Digest hash = new SHA256Digest();
-            byte[] ikm = Hex
-                .decode("0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b");
-            byte[] salt = new byte[0];
-            byte[] info = null;
-            int l = 42;
-            byte[] okm = new byte[l];
-
-            HKDFParameters params = new HKDFParameters(ikm, salt, info);
-
-            HKDFBytesGenerator hkdf = new HKDFBytesGenerator(hash);
-            hkdf.init(params);
-            hkdf.generateBytes(okm, 0, l);
-
-            compareOKM(3, okm, Hex.decode(
-                "8da4e775a563c18f715f802a063c5a31" +
-                    "b8a11f5c5ee1879ec3454e5f3c738d2d" +
-                    "9d201395faa4b61a96c8"));
-        }
-
-        {
-            // === A.4. Test Case 4 - Basic test case with SHA-1 ===
-
-            Digest hash = new SHA1Digest();
-            byte[] ikm = Hex.decode("0b0b0b0b0b0b0b0b0b0b0b");
-            byte[] salt = Hex.decode("000102030405060708090a0b0c");
-            byte[] info = Hex.decode("f0f1f2f3f4f5f6f7f8f9");
-            int l = 42;
-            byte[] okm = new byte[l];
-
-            HKDFParameters params = new HKDFParameters(ikm, salt, info);
-
-            HKDFBytesGenerator hkdf = new HKDFBytesGenerator(hash);
-            hkdf.init(params);
-            hkdf.generateBytes(okm, 0, l);
-
-            compareOKM(4, okm, Hex.decode(
-                "085a01ea1b10f36933068b56efa5ad81" +
-                    "a4f14b822f5b091568a9cdd4f155fda2" +
-                    "c22e422478d305f3f896"));
-        }
-
-        // === A.5. Test Case 5 - Test with SHA-1 and longer inputs/outputs ===
-        {
-            Digest hash = new SHA1Digest();
-            byte[] ikm = Hex.decode("000102030405060708090a0b0c0d0e0f"
-                + "101112131415161718191a1b1c1d1e1f"
-                + "202122232425262728292a2b2c2d2e2f"
-                + "303132333435363738393a3b3c3d3e3f"
-                + "404142434445464748494a4b4c4d4e4f");
-            byte[] salt = Hex.decode("606162636465666768696a6b6c6d6e6f"
-                + "707172737475767778797a7b7c7d7e7f"
-                + "808182838485868788898a8b8c8d8e8f"
-                + "909192939495969798999a9b9c9d9e9f"
-                + "a0a1a2a3a4a5a6a7a8a9aaabacadaeaf");
-            byte[] info = Hex.decode("b0b1b2b3b4b5b6b7b8b9babbbcbdbebf"
-                + "c0c1c2c3c4c5c6c7c8c9cacbcccdcecf"
-                + "d0d1d2d3d4d5d6d7d8d9dadbdcdddedf"
-                + "e0e1e2e3e4e5e6e7e8e9eaebecedeeef"
-                + "f0f1f2f3f4f5f6f7f8f9fafbfcfdfeff");
-            int l = 82;
-            byte[] okm = new byte[l];
-
-            HKDFParameters params = new HKDFParameters(ikm, salt, info);
-
-            HKDFBytesGenerator hkdf = new HKDFBytesGenerator(hash);
-            hkdf.init(params);
-            hkdf.generateBytes(okm, 0, l);
-
-            compareOKM(5, okm, Hex.decode(
-                "0bd770a74d1160f7c9f12cd5912a06eb" +
-                    "ff6adcae899d92191fe4305673ba2ffe" +
-                    "8fa3f1a4e5ad79f3f334b3b202b2173c" +
-                    "486ea37ce3d397ed034c7f9dfeb15c5e" +
-                    "927336d0441f4c4300e2cff0d0900b52" +
-                    "d3b4"));
-        }
-
-        {
-            // === A.6. Test Case 6 - Test with SHA-1 and zero-length salt/info
-            // ===
-
-            // setting salt to null should generate a new salt of HashLen zero
-            // valued bytes
-
-            Digest hash = new SHA1Digest();
-            byte[] ikm = Hex
-                .decode("0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b");
-            byte[] salt = null;
-            byte[] info = new byte[0];
-            int l = 42;
-            byte[] okm = new byte[l];
-
-            HKDFParameters params = new HKDFParameters(ikm, salt, info);
-
-            HKDFBytesGenerator hkdf = new HKDFBytesGenerator(hash);
-            hkdf.init(params);
-            hkdf.generateBytes(okm, 0, l);
-
-            compareOKM(6, okm, Hex.decode(
-                "0ac1af7002b3d761d1e55298da9d0506" +
-                    "b9ae52057220a306e07b6b87e8df21d0" +
-                    "ea00033de03984d34918"));
-        }
-
-        {
-            // === A.7. Test Case 7 - Test with SHA-1, salt not provided,
-            // zero-length info ===
-            // (salt defaults to HashLen zero octets)
-
-            // this test is identical to test 6 in all ways bar the IKM value
-
-            Digest hash = new SHA1Digest();
-            byte[] ikm = Hex
-                .decode("0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c");
-            byte[] salt = null;
-            byte[] info = new byte[0];
-            int l = 42;
-            byte[] okm = new byte[l];
-
-            HKDFParameters params = new HKDFParameters(ikm, salt, info);
-
-            HKDFBytesGenerator hkdf = new HKDFBytesGenerator(hash);
-            hkdf.init(params);
-            hkdf.generateBytes(okm, 0, l);
-
-            compareOKM(7, okm, Hex.decode(
-                "2c91117204d745f3500d636a62f64f0a" +
-                    "b3bae548aa53d423b0d1f27ebba6f5e5" +
-                    "673a081d70cce7acfc48"));
-        }
-
-        {
-            // === A.101. Additional Test Case - Test with SHA-1, skipping extract
-            // zero-length info ===
-            // (salt defaults to HashLen zero octets)
-
-            // this test is identical to test 7 in all ways bar the IKM value
-            // which is set to the PRK value
-
-            Digest hash = new SHA1Digest();
-            byte[] ikm = Hex
-                .decode("2adccada18779e7c2077ad2eb19d3f3e731385dd");
-            byte[] info = new byte[0];
-            int l = 42;
-            byte[] okm = new byte[l];
-
-            HKDFParameters params = HKDFParameters.skipExtractParameters(ikm, info);
-
-            HKDFBytesGenerator hkdf = new HKDFBytesGenerator(hash);
-            hkdf.init(params);
-            hkdf.generateBytes(okm, 0, l);
-
-            compareOKM(101, okm, Hex.decode(
-                "2c91117204d745f3500d636a62f64f0a" +
-                    "b3bae548aa53d423b0d1f27ebba6f5e5" +
-                    "673a081d70cce7acfc48"));
-        }
-
-        // === A.102. Additional Test Case - Test with SHA-1, maximum output ===
-        // (salt defaults to HashLen zero octets)
-
-        // this test is identical to test 7 in all ways bar the IKM value
-
-        Digest hash = new SHA1Digest();
-        byte[] ikm = Hex
-            .decode("2adccada18779e7c2077ad2eb19d3f3e731385dd");
-        byte[] info = new byte[0];
-        int l = 255 * hash.getDigestSize();
-        byte[] okm = new byte[l];
-
-        HKDFParameters params = HKDFParameters.skipExtractParameters(ikm, info);
-
-        HKDFBytesGenerator hkdf = new HKDFBytesGenerator(hash);
-        hkdf.init(params);
-        hkdf.generateBytes(okm, 0, l);
-
-        int zeros = 0;
-        for (int i = 0; i < hash.getDigestSize(); i++)
-        {
-            if (okm[i] == 0)
-            {
-                zeros++;
-            }
-        }
-
-        if (zeros == hash.getDigestSize())
-        {
-            fail("HKDF failed generator test " + 102);
-        }
-    }
-
-    public String getName()
-    {
-        return "HKDF";
-    }
-
-    public static void main(
-        String[] args)
-    {
-        runTest(new HKDFGeneratorTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/HashCommitmentTest.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/HashCommitmentTest.java
deleted file mode 100644
index ed83c64..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/HashCommitmentTest.java
+++ /dev/null
@@ -1,152 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import java.security.SecureRandom;
-
-import org.bouncycastle.crypto.Commitment;
-import org.bouncycastle.crypto.Committer;
-import org.bouncycastle.crypto.DataLengthException;
-import org.bouncycastle.crypto.commitments.GeneralHashCommitter;
-import org.bouncycastle.crypto.commitments.HashCommitter;
-import org.bouncycastle.crypto.digests.SHA1Digest;
-import org.bouncycastle.crypto.digests.SHA256Digest;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-
-public class HashCommitmentTest
-    extends SimpleTest
-{
-    public String getName()
-    {
-        return "HashCommitmentTest";
-    }
-
-    public void performBasicTest()
-        throws Exception
-    {
-        byte[] data = Hex.decode("4e6f77206973207468652074696d6520666f7220616c6c20");
-
-        Committer committer = new HashCommitter(new SHA256Digest(), new SecureRandom());
-
-        Commitment c = committer.commit(data);
-
-        committer = new HashCommitter(new SHA256Digest(), new SecureRandom());
-
-        if (!committer.isRevealed(c, data))
-        {
-            fail("commitment failed to validate");
-        }
-
-        committer = new HashCommitter(new SHA1Digest(), new SecureRandom());
-
-        if (committer.isRevealed(c, data))
-        {
-            fail("commitment validated!!");
-        }
-
-        try
-        {
-            committer.isRevealed(c, new byte[data.length + 1]);
-        }
-        catch (Exception e)
-        {
-            if (!e.getMessage().equals("Message and witness secret lengths do not match."))
-            {
-                fail("exception thrown but wrong message");
-            }
-        }
-
-        // SHA1 has a block size of 512 bits, try a message that's too big
-
-        try
-        {
-            c = committer.commit(new byte[33]);
-        }
-        catch (DataLengthException e)
-        {
-            if (!e.getMessage().equals("Message to be committed to too large for digest."))
-            {
-                fail("exception thrown but wrong message");
-            }
-        }
-    }
-
-    public void performGeneralTest()
-        throws Exception
-    {
-        byte[] data = Hex.decode("4e6f77206973207468652074696d6520666f7220616c6c20");
-
-        Committer committer = new GeneralHashCommitter(new SHA256Digest(), new SecureRandom());
-
-        Commitment c = committer.commit(data);
-
-        committer = new GeneralHashCommitter(new SHA256Digest(), new SecureRandom());
-
-        if (!committer.isRevealed(c, data))
-        {
-            fail("general commitment failed to validate");
-        }
-
-        committer = new GeneralHashCommitter(new SHA1Digest(), new SecureRandom());
-
-        if (committer.isRevealed(c, data))
-        {
-            fail("general commitment validated!!");
-        }
-
-        c = committer.commit(data);
-
-        // try and fool it.
-        byte[] s = c.getSecret();
-        byte[] newS = Arrays.copyOfRange(s, 0, s.length - 1);
-        byte[] newData = new byte[data.length + 1];
-
-        newData[0] = s[s.length - 1];
-        System.arraycopy(data, 0, newData, 1, data.length);
-
-        c = new Commitment(newS, c.getCommitment());
-
-        if (committer.isRevealed(c, newData))
-        {
-            fail("general commitment validated!!");
-        }
-
-        try
-        {
-            committer.isRevealed(c, new byte[data.length + 1]);
-        }
-        catch (Exception e)
-        {
-            if (!e.getMessage().equals("Message and witness secret lengths do not match."))
-            {
-                fail("exception thrown but wrong message");
-            }
-        }
-
-        // SHA1 has a block size of 512 bits, try a message that's too big
-
-        try
-        {
-            c = committer.commit(new byte[33]);
-        }
-        catch (DataLengthException e)
-        {
-            if (!e.getMessage().equals("Message to be committed to too large for digest."))
-            {
-                fail("exception thrown but wrong message");
-            }
-        }
-    }
-
-    public void performTest()
-        throws Exception
-    {
-        performBasicTest();
-        performGeneralTest();
-    }
-
-    public static void main(String[] args)
-    {
-        runTest(new HashCommitmentTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/IDEATest.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/IDEATest.java
deleted file mode 100644
index 64c673e..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/IDEATest.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import org.bouncycastle.crypto.engines.IDEAEngine;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-
-/**
- */
-public class IDEATest
-    extends CipherTest
-{
-    static SimpleTest[] tests =
-            {
-                new BlockCipherVectorTest(0, new IDEAEngine(),
-                        new KeyParameter(Hex.decode("00112233445566778899AABBCCDDEEFF")),
-                        "000102030405060708090a0b0c0d0e0f", "ed732271a7b39f475b4b2b6719f194bf"),
-                new BlockCipherVectorTest(0, new IDEAEngine(),
-                        new KeyParameter(Hex.decode("00112233445566778899AABBCCDDEEFF")),
-                        "f0f1f2f3f4f5f6f7f8f9fafbfcfdfeff", "b8bc6ed5c899265d2bcfad1fc6d4287d")
-            };
-
-    IDEATest()
-    {
-        super(tests, new IDEAEngine(), new KeyParameter(new byte[32]));
-    }
-
-    public String getName()
-    {
-        return "IDEA";
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        runTest(new IDEATest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/ISAACTest.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/ISAACTest.java
deleted file mode 100644
index 02319a3..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/ISAACTest.java
+++ /dev/null
@@ -1,180 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import org.bouncycastle.crypto.engines.ISAACEngine;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-
-/**
- * ISAAC Test - see http://www.burtleburtle.net/bob/rand/isaacafa.html
- */
-public class ISAACTest
-    extends SimpleTest
-{
-    byte[] out = Hex.decode(
-        "f650e4c8e448e96d98db2fb4f5fad54f433f1afbedec154ad837048746ca4f9a" +
-        "5de3743e88381097f1d444eb823cedb66a83e1e04a5f6355c744243325890e2e" +
-        "7452e31957161df638a824f3002ed71329f5544951c08d83d78cb99ea0cc74f3" +
-        "8f651659cbc8b7c2f5f71c6912ad6419e5792e1b860536b809b3ce98d45d6d81" +
-        "f3b2612917e38f8529cf72ce349947b0c998f9ffb5e13dae32ae2a2bf7cf814c" +
-        "8ebfa303cf22e0640b923200eca4d58aef53cec4d0f7b37d9c411a2affdf8a80" +
-        "b40e27bcb4d2f97644b89b08f37c71d51a70e7e90bdb9c3060dc5207b3c3f24b" +
-        "d7386806229749b54e232cd091dabc65a70e11018b87437e5781414fcdbc62e2" +
-        "8107c9ff69d2e4ae3b18e752b143b6886f4e077295138769943c3c74afc17a97" +
-        "0fd439636a529b0bd8c58a6aa8bcc22d2db35dfea7a2f4026cb167db538e1f4e" +
-        "7275e2771d3b8e97ecc5dc9115e3a5b90369661430ab93ecac9fe69d7bc76811" +
-        "60eda8da28833522d5295ebc5adb60e7f7e1cdd097166d14b67ec13a210f3925" +
-        "64af0fef0d0286843aea3decb058bafbb8b0ccfcf2b5cc05e3a662d9814bc24c" +
-        "2364a1aa37c0ed052b36505c451e7ec85d2a542fe43d0fbb91c8d92560d4d5f8" +
-        "12a0594b9e8a51dacd49ebdb1b0dcdc1cd57c7f7e63444517ded386f2f36fa86" +
-        "a6d1210133bc405db388d96cdb6dbe96fe29661c13edc0cbcb0eee4a70cc94ae" +
-        "de11ed340606cf9f3a6ce38923d74f4ea37f63ff917bdec2d73f72d40e7e0e67" +
-        "3d77d9a213add9228891b3db01a9bd7056a001e3d51f093dcc033ce35ad0d3b0" +
-        "34105a8c6a123f57bd2e50247364944be89b1a3b21835c4d9f39e2d9d405ded8" +
-        "294d37e5bccaaeed35a124b56708a2bcb00960ba2a98121a4d8fae820bb3263f" +
-        "12595a196a1075890809e49421c171ec884d682514c8009bb0b84e7b03fb88f4" +
-        "28e7cb789388b13bdd2dc1d5848f520a07c28cd168a3935872c9137d127dd430" +
-        "c613f1578c2f0d55f7d3f39f309bfb788406b13746c0a6f53718d59708607f04" +
-        "76904b6d04db4e13cd7411a7b510ce0ebfc7f7ccb83f957afdfef62dc35e4580" +
-        "3ff1e5244112d96c02c9b944d5990dfbe7e265810d9c7e7e826dfa8966f1e0ab" +
-        "30bcc764eadebeaced35e5ee0c571a7de4f3a26af7f58f7badf6bc235d023e65" +
-        "1ed3ff4eec46b0b6d2a93b51e75b41c97e315aeb61119a5a53245b7933f6d7b1" +
-        "cae8deba50fc8194afa92a6dc87c80064188bfcd8bace62e78ffa5685597ec0f" +
-        "b4415f7d08294766ad56764309c36f903dde9f394a0a283c18080c8e080c79ec" +
-        "79ae4c10cb9e15637cdd662f62d31911a4ca0cf15cf824cd3b708f991e16614c" +
-        "b6b9d7665de87abb7229ea81d5b2d75056e6cd21fe1e42d596da2655c2b9aa36" +
-        "b8f6fd4a6a158d1001913fd3af7d1fb80b5e435f90c107576554abda7a68710f" +
-        "82ac484fd7e1c7be95c85eaa94a302f44d3cfbda786b29081010b27582d53d12" +
-        "21e2a51c3d1e9150b059261dd0638e1a31860f0581f2864dff4cfc350451516d" +
-        "bd086f26bc5654c165dfa427a82427f5582e3014b8d2486dc79a17499a1d7745" +
-        "8766bb541e04a7f73d3dff8ad5ec6bf4dbef7d9f36ec0ea31feb2e4f15cfcc5c" +
-        "d8c423fbd0ef3cc9eb244925ba5590c8a5f48ac433c5321c613b67b2479c3a22" +
-        "e21339cc10d210aa931dd7e2ef05ee06b82f2703a385cb2c5d67133c877eb7b4" +
-        "1e3437f75afb43ae53c078f394d904811d96458908063a85e13222281956b1e5" +
-        "31860f132e7b022f21182ca396f703ac46819e2e0d28fe523724d4dca0eabe6b" +
-        "c66699fdc6112fdd19c1e69c04d3658a4b55dd9931907d62f854b5224d678f26" +
-        "22ae0582eafed133e4a51d2184bd6dd6c1a513753f28ee63fb737b1a70a1660e" +
-        "8a8dfaa31be79937f7476978513c1764531ac6bf12c06908001cdb951a4b6a53" +
-        "d067fce512b2cfb69ddb477f740e006639ddf25acc8bfa2df1b20eaf64f2632c" +
-        "9783cdee63bfd4d80084cfe575f4e9e219b48fd06c48ddd87a36af9371865c4c" +
-        "9ce0199d867027d72cb7b77f84ef01da72f5972f040f7074df9afa29c921f94e" +
-        "75c08a3618c1ef9ad649a428c5b719378a30738ad97cd348858129a6239e3b0a" +
-        "bbb8abc480fac4c2ecfcf20bd9d711f9e2a4ef71b5fe87c0be8b06b2aafef5a7" +
-        "9c15db3b0aeb81654389a84a253b1d7a19047c797cdc78a2d20adf0356f55a71" +
-        "3e730fa8fd8650d8959e234eb7546681dad1b22a142a6e858ef4bce668235b9d" +
-        "85a13f8574096ae7a949bea229322d0dd568385882846526403dae086dd1943a" +
-        "e1279bff9e7e4f041c3a4524484525e481d4cc5fe24124c0037464c0bf1bd691" +
-        "26ceb003275ead3ac5bde90826414ff3a30519add7b43abe2ce5d3d588412761" +
-        "97ca2070e5fbb9c7276df0b4308f751f37a97df6c9cd808cfe4cb3803d469303" +
-        "aee19096c0d5d42a4e823ad3f5f9cc3b4286619c9ca45e1c66c97340891aec49" +
-        "45bae606c798f04752649d6cce86fdfc80c6e402d6ec2f2b27c822821fe26ce0" +
-        "92f57ea7de462f4d07497cae5a48755c721502dd6cbe7935836d80039ead7f70" +
-        "9ab3a42f4c8652d632e39273e8fa38601da4f25a0cd6ef8102503f7d8854a0a1" +
-        "9a30c4e88815715305efe29457c4c9252887d96fc1a71e3ce9f841632d0985de" +
-        "d21e796c6fb5ce5602614abfc3c7be2cb54fed6fa617a083c3142d8f6079e4ce" +
-        "ceffc1471d0cb81bdc153e5fe36ef5bbd531161a165b10157aa114ed3f7579b3" +
-        "f7f395f1bc6172c7a86f875e0e6c51b3cdfec2af73c0e762824c2009c5a87748" +
-        "94d401258aba3ffbd32be0608c17eff021e2547e07cffad905340e15f3310c92" +
-        "9d8d190886ba527ff943f672ef73fbf046d95ca5c54cd95b9d855e894bb5af29");
-
-        byte[] outFFFFFFFF = Hex.decode(
-            "de3b3f3c19e0629c1fc8b7836695d523e7804edd86ff7ce9b106f52caebae9d9" +
-            "72f845d49ce17d7da44e49bae954aac0d0b1284b98a88eec1524fb6bc91a16b5" +
-            "1192ac5334131446ac2442de9ff3d5867b9b9148881ee30a6e87dd88e5d1f7cd" +
-            "98db31ff36f70d9850cfefaef42abb00ecc39ed308bf4b8030cdc2b6b7e42f0e" +
-            "908030dd282f96edacc888b3a986e109c129998f89baa1b5da8970b07a6ab012" +
-            "f10264f23c315c9c8e0c164955c68517b6a4f982b2626db70787f869ac6d551b" +
-            "e34931627c7058e965c502e18d2cd370e6db3b70d947d61aa9717cf8394f48c6" +
-            "3c796f3a154950846badb28b70d982f29bc670254e3e5e0f8e36b0a5f6da0a04" +
-            "6b235ed6a42988c012bde74d879fa8eb5d59f5f40ed5e76601c9847b3edb2690");
-
-        byte[] outFFFF0000 = Hex.decode(
-            "26c54b1f8c4e3fc582e9e8180f7aba5380463dcf58b03cbeda0ecc8ba90ccff8" +
-            "5bd50896313d7efed44015faeac6964b241a7fb8a2e37127a7cbea0fd7c020f2" +
-            "406371b87ef5185089504751e5e44352eff63e00e5c28f5dff0616a9a3a00f1f" +
-            "4a1350e3a17be9abddfc2c94571450a0dc4c3c0c7c7f98e80c95f607d50c676a" +
-            "9a3006f9d279a79a4d66b2ab0c52930c9ee84bc09895e70fa041b1a3a2966f11" +
-            "6a47fd09705124b1f5c7ae055e54536e66584b1608f3612d81b72f109a385831" +
-            "121945b207b90ac72437a248f27a121c2801f4153a8699fb047e193f7ba69e1b" +
-            "b117869675d4c963e6070c2ca3d332ce830cb5e3d9ed2eee7faf0acc20fbe154" +
-            "188ae789e95bd5c1f459dbd150aab6eb833170257084bc5d44e9df09f5624f9d" +
-            "afecd0c9340ac8587f8625d343f7efd1cc8abcf7a6f90eabd4e8e2d906278d6e" +
-            "431fcade165c8c467887fbf5c26d341557b064b98c60dd40ab262dc046d69647" +
-            "56f3ddc1a07ae5f87be878b9334fcde40add68d2ca1dc05fb1670f998c7c4607" +
-            "9a6e48bdb330ad8d30b61b5cc8dc156f5733905931949783f89ac396b65aa4b8" +
-            "51f746b53ed8ea66130e1d75e8eab136e60450e3e600226bc8e17d03744ce94c" +
-            "0eec9234fea5f18eef65d81f2f10cfbc0b112b8cde17c32eb33ed81d7356eac3" +
-            "eb1cb9cefa6604c2d707949b6e5a83e60705bf6aae76dcc7d35d68ff149c1ac5" +
-            "424bb4a39e2f496f886637fce3db4ba4ad12c1a32d25e1606f6635ff636486f6" +
-            "714997b45477f38813c02afce4bebf196b813332f0decd567c745f441e736364");
-
-       byte[] out0000FFFF = Hex.decode(
-        "bc31712f2a2f467a5abc737c57ce0f8d49d2f775eb850fc8f856daf19310fee2"+
-        "5bab40e78403c9ef4ccd971418992faf4e85ca643fa6b482f30c4659066158a6"+
-        "5bc3e620ba7ea5c34dd0eac5aabb2cf078d915fd1f8c437ed00423076c10f701"+
-        "eefa7fc7c461aca5db8a87be29d925c4212d4adcfa71ff5b06af15c048aa0dfd"+
-        "f0e645bc09fea200c430a88eb38c466ff358b836f1159656a078f6fc752f6db1"+
-        "6680bb30fc771a6a785bbb2298e947d7b3500e557775962248bedf4e82c16e66"+
-        "f39283ccb95e5399061056a11c4a280f00f7487888199487905273c7aa13012b"+
-        "4849eca626cbf071c782e084f9fded57de92313e5f61a6e81117fb1115eff275"+
-        "66fd5c755bb3b01bba69aeb8f1b1b1cc9709734be31b35bc707d372ba6fe70d1"+
-        "e2c3b0e5e74a7058faff6b11d3a168f19fecc9fcb36b3e6a5f828c01c22ac0c2"+
-        "5da2a3a9eec7e0ebbbf51472e430ed4cf1c7ab57ef9aea511e40250846d260b6"+
-        "17a3fdeba16cf4afaf700144d3296b58b22a3c79ed96f3e2fc8d9e3c660ae153"+
-        "8e0c285ccdc48b59117e80413bd0ad24c6a8d4f133fe1496f14351bb89904fa5"+
-        "e10c4b8d50e0604578389c336a9ab3d292beb90ce640fc028e697cf54e021e2f"+
-        "c0ca3fe0471fde5e5462f221739a74f5a13ae0621fe2a82e752bc294f63de48d"+
-        "e85430af71307a30441b861ab5380e6a6dbe1251c9baa567da14e38e5a0ccddf"+
-        "0127205c38fc3b77065e98101d219246103438d223ec7f8f533d4bb3a3d3407a"+
-        "944910f11e8e5492e86de7a0471250eca32f0838b3db02fffe71898712af3261");
-
-    public String getName()
-    {
-        return "ISAAC";
-    }
-
-    public void performTest()
-    {
-        ISAACEngine engine = new ISAACEngine();
-
-        doTest(engine, Hex.decode("00000000"), out);
-        doTest(engine, Hex.decode("ffffffff"), outFFFFFFFF);
-
-        byte[] k = new byte[256 * 4];
-        for (int i = 0; i != k.length; i++)
-        {
-            k[i] = (byte)((i % 4 == 0 || i % 4 == 1) ? 0xff : 0x00);
-        }
-        doTest(engine, k, outFFFF0000);
-        k = new byte[256 * 4];
-        for (int i = 0; i != k.length; i++)
-        {
-            k[i] = (byte)((i % 4 == 2 || i % 4 == 3) ? 0xff : 0x00);
-        }
-        doTest(engine, k, out0000FFFF);
-    }
-
-    private void doTest(ISAACEngine engine, byte[] key, byte[] output)
-    {
-        byte[] in = new byte[output.length];
-        byte[] enc = new byte[output.length];
-        engine.init(true, new KeyParameter(key));
-        engine.processBytes(in, 0, in.length, enc, 0);
-        if (!areEqual(enc, output))
-        {
-            fail("ciphertext mismatch");
-        }
-        engine.init(false, new KeyParameter(key));
-        engine.processBytes(enc, 0, enc.length, enc, 0);
-        if (!areEqual(enc, in))
-        {
-            fail("plaintext mismatch");
-        }
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        runTest(new ISAACTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/ISO9796Test.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/ISO9796Test.java
deleted file mode 100644
index 88d41aa..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/ISO9796Test.java
+++ /dev/null
@@ -1,972 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import java.math.BigInteger;
-import java.security.SecureRandom;
-
-import org.bouncycastle.crypto.AsymmetricBlockCipher;
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.digests.RIPEMD128Digest;
-import org.bouncycastle.crypto.digests.RIPEMD160Digest;
-import org.bouncycastle.crypto.digests.SHA1Digest;
-import org.bouncycastle.crypto.digests.SHA256Digest;
-import org.bouncycastle.crypto.encodings.ISO9796d1Encoding;
-import org.bouncycastle.crypto.engines.RSABlindedEngine;
-import org.bouncycastle.crypto.engines.RSAEngine;
-import org.bouncycastle.crypto.params.AsymmetricKeyParameter;
-import org.bouncycastle.crypto.params.ParametersWithSalt;
-import org.bouncycastle.crypto.params.RSAKeyParameters;
-import org.bouncycastle.crypto.signers.ISO9796d2PSSSigner;
-import org.bouncycastle.crypto.signers.ISO9796d2Signer;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.encoders.Base64;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-
-/**
- * test vectors from ISO 9796-1 and ISO 9796-2 edition 1.
- */
-public class ISO9796Test
-    extends SimpleTest
-{
-    static BigInteger mod1 = new BigInteger("0100000000000000000000000000000000bba2d15dbb303c8a21c5ebbcbae52b7125087920dd7cdf358ea119fd66fb064012ec8ce692f0a0b8e8321b041acd40b7", 16);
-
-    static BigInteger pub1 = new BigInteger("03", 16);
-
-    static BigInteger pri1 = new BigInteger("2aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaac9f0783a49dd5f6c5af651f4c9d0dc9281c96a3f16a85f9572d7cc3f2d0f25a9dbf1149e4cdc32273faadd3fda5dcda7", 16);
-
-    static BigInteger mod2 = new BigInteger("ffffff7fa27087c35ebead78412d2bdffe0301edd494df13458974ea89b364708f7d0f5a00a50779ddf9f7d4cb80b8891324da251a860c4ec9ef288104b3858d", 16);
-
-    static BigInteger pub2 = new BigInteger("03", 16);
-
-    static BigInteger pri2 = new BigInteger("2aaaaa9545bd6bf5e51fc7940adcdca5550080524e18cfd88b96e8d1c19de6121b13fac0eb0495d47928e047724d91d1740f6968457ce53ec8e24c9362ce84b5", 16);
-
-    static byte msg1[] = Hex.decode("0cbbaa99887766554433221100");
-
-    //
-    // you'll need to see the ISO 9796 to make sense of this
-    //
-    static byte sig1[] = mod1.subtract(new BigInteger("309f873d8ded8379490f6097eaafdabc137d3ebfd8f25ab5f138d56a719cdc526bdd022ea65dabab920a81013a85d092e04d3e421caab717c90d89ea45a8d23a", 16)).toByteArray();
-
-    static byte msg2[] = Hex.decode("fedcba9876543210fedcba9876543210fedcba9876543210fedcba9876543210");
-
-    static byte sig2[] = new BigInteger("319bb9becb49f3ed1bca26d0fcf09b0b0a508e4d0bd43b350f959b72cd25b3af47d608fdcd248eada74fbe19990dbeb9bf0da4b4e1200243a14e5cab3f7e610c", 16).toByteArray();
-
-    static byte msg3[] = Hex.decode("0112233445566778899aabbccd");
-
-    static byte sig3[] = mod2.subtract(new BigInteger("58e59ffb4b1fb1bcdbf8d1fe9afa3730c78a318a1134f5791b7313d480ff07ac319b068edf8f212945cb09cf33df30ace54f4a063fcca0b732f4b662dc4e2454", 16)).toByteArray();
-
-    //
-    // ISO 9796-2
-    //
-    static BigInteger mod3 = new BigInteger("ffffffff78f6c55506c59785e871211ee120b0b5dd644aa796d82413a47b24573f1be5745b5cd9950f6b389b52350d4e01e90009669a8720bf265a2865994190a661dea3c7828e2e7ca1b19651adc2d5", 16);
-
-    static BigInteger pub3 = new BigInteger("03", 16);
-
-    static BigInteger pri3 = new BigInteger("2aaaaaaa942920e38120ee965168302fd0301d73a4e60c7143ceb0adf0bf30b9352f50e8b9e4ceedd65343b2179005b2f099915e4b0c37e41314bb0821ad8330d23cba7f589e0f129b04c46b67dfce9d", 16);
-
-    static BigInteger mod4 = new BigInteger("FFFFFFFF45f1903ebb83d4d363f70dc647b839f2a84e119b8830b2dec424a1ce0c9fd667966b81407e89278283f27ca8857d40979407fc6da4cc8a20ecb4b8913b5813332409bc1f391a94c9c328dfe46695daf922259174544e2bfbe45cc5cd", 16);
-    static BigInteger pub4 = new BigInteger("02", 16);
-    static BigInteger pri4 = new BigInteger("1fffffffe8be3207d7707a9a6c7ee1b8c8f7073e5509c2337106165bd8849439c193faccf2cd70280fd124f0507e4f94cb66447680c6b87b6599d1b61c8f3600854a618262e9c1cb1438e485e47437be036d94b906087a61ee74ab0d9a1accd8", 16);
-
-    static byte msg4[] = Hex.decode("6162636462636465636465666465666765666768666768696768696a68696a6b696a6b6c6a6b6c6d6b6c6d6e6c6d6e6f6d6e6f706e6f7071");
-    static byte sig4[] = Hex.decode("374695b7ee8b273925b4656cc2e008d41463996534aa5aa5afe72a52ffd84e118085f8558f36631471d043ad342de268b94b080bee18a068c10965f581e7f32899ad378835477064abed8ef3bd530fce");
-
-    static byte msg5[] = Hex.decode("fedcba9876543210fedcba9876543210fedcba9876543210fedcba9876543210fedcba9876543210fedcba9876543210fedcba9876543210fedcba9876543210fedcba9876543210fedcba9876543210fedcba9876543210fedcba9876543210fedcba9876543210fedcba9876543210");
-    static byte sig5[] = Hex.decode("5cf9a01854dbacaec83aae8efc563d74538192e95466babacd361d7c86000fe42dcb4581e48e4feb862d04698da9203b1803b262105104d510b365ee9c660857ba1c001aa57abfd1c8de92e47c275cae");
-
-    //
-    // scheme 2 data
-    //
-    static BigInteger mod6 = new BigInteger("b259d2d6e627a768c94be36164c2d9fc79d97aab9253140e5bf17751197731d6f7540d2509e7b9ffee0a70a6e26d56e92d2edd7f85aba85600b69089f35f6bdbf3c298e05842535d9f064e6b0391cb7d306e0a2d20c4dfb4e7b49a9640bdea26c10ad69c3f05007ce2513cee44cfe01998e62b6c3637d3fc0391079b26ee36d5", 16);
-    static BigInteger pub6 = new BigInteger("11", 16);
-    static BigInteger pri6 = new BigInteger("92e08f83cc9920746989ca5034dcb384a094fb9c5a6288fcc4304424ab8f56388f72652d8fafc65a4b9020896f2cde297080f2a540e7b7ce5af0b3446e1258d1dd7f245cf54124b4c6e17da21b90a0ebd22605e6f45c9f136d7a13eaac1c0f7487de8bd6d924972408ebb58af71e76fd7b012a8d0e165f3ae2e5077a8648e619", 16);
-
-    static byte sig6[] = new BigInteger("0073FEAF13EB12914A43FE635022BB4AB8188A8F3ABD8D8A9E4AD6C355EE920359C7F237AE36B1212FE947F676C68FE362247D27D1F298CA9302EB21F4A64C26CE44471EF8C0DFE1A54606F0BA8E63E87CDACA993BFA62973B567473B4D38FAE73AB228600934A9CC1D3263E632E21FD52D2B95C5F7023DA63DE9509C01F6C7BBC", 16).modPow(pri6, mod6).toByteArray();
-
-    static byte msg7[] = Hex.decode("6162636462636465636465666465666765666768666768696768696A68696A6B696A6B6C6A6B6C6D6B6C6D6E6C6D6E6F6D6E6F706E6F70716F70717270717273");
-    static byte sig7[] = new BigInteger("296B06224010E1EC230D4560A5F88F03550AAFCE31C805CE81E811E5E53E5F71AE64FC2A2A486B193E87972D90C54B807A862F21A21919A43ECF067240A8C8C641DE8DCDF1942CF790D136728FFC0D98FB906E7939C1EC0E64C0E067F0A7443D6170E411DF91F797D1FFD74009C4638462E69D5923E7433AEC028B9A90E633CC", 16).modPow(pri6, mod6).toByteArray();
-
-    static byte msg8[] = Hex.decode("FEDCBA9876543210FEDCBA9876543210FEDCBA9876543210FEDCBA9876543210FEDCBA9876543210FEDCBA9876543210FEDCBA9876543210FEDCBA9876543210FEDCBA9876543210FEDCBA9876543210FEDCBA9876543210FEDCBA9876543210FEDCBA9876543210FEDCBA9876543210FEDCBA9876543210FEDCBA9876543210FEDCBA98");
-    static byte sig8[] = new BigInteger("01402B29ABA104079677CE7FC3D5A84DB24494D6F9508B4596484F5B3CC7E8AFCC4DDE7081F21CAE9D4F94D6D2CCCB43FCEDA0988FFD4EF2EAE72CFDEB4A2638F0A34A0C49664CD9DB723315759D758836C8BA26AC4348B66958AC94AE0B5A75195B57ABFB9971E21337A4B517F2E820B81F26BCE7C66F48A2DB12A8F3D731CC", 16).modPow(pri6, mod6).toByteArray();
-
-    static byte msg9[] = Hex.decode("6162636462636465636465666465666765666768666768696768696A68696A6B696A6B6C6A6B6C6D6B6C6D6E6C6D6E6F6D6E6F706E6F70716F707172707172737172737472737475737475767475767775767778767778797778797A78797A61797A61627A6162636162636462636465");
-    static byte sig9[] = new BigInteger("6F2BB97571FE2EF205B66000E9DD06656655C1977F374E8666D636556A5FEEEEAF645555B25F45567C4EE5341F96FED86508C90A9E3F11B26E8D496139ED3E55ECE42860A6FB3A0817DAFBF13019D93E1D382DA07264FE99D9797D2F0B7779357CA7E74EE440D8855B7DDF15F000AC58EE3FFF144845E771907C0C83324A6FBC", 16).modPow(pri6, mod6).toByteArray();
-
-    public String getName()
-    {
-        return "ISO9796";
-    }
-
-    private boolean isSameAs(
-        byte[] a,
-        int off,
-        byte[] b)
-    {
-        if ((a.length - off) != b.length)
-        {
-            return false;
-        }
-
-        for (int i = 0; i != b.length; i++)
-        {
-            if (a[i + off] != b[i])
-            {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    private boolean startsWith(
-        byte[] a,
-        byte[] b)
-    {
-        if (a.length < b.length)
-        {
-            return false;
-        }
-
-        for (int i = 0; i != b.length; i++)
-        {
-            if (a[i] != b[i])
-            {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    private void doTest1()
-        throws Exception
-    {
-        RSAKeyParameters pubParameters = new RSAKeyParameters(false, mod1, pub1);
-        RSAKeyParameters privParameters = new RSAKeyParameters(true, mod1, pri1);
-        RSAEngine rsa = new RSAEngine();
-        byte[] data;
-
-        //
-        // ISO 9796-1 - public encrypt, private decrypt
-        //
-        ISO9796d1Encoding eng = new ISO9796d1Encoding(rsa);
-
-        eng.init(true, privParameters);
-
-        eng.setPadBits(4);
-
-        data = eng.processBlock(msg1, 0, msg1.length);
-
-        eng.init(false, pubParameters);
-
-        if (!areEqual(sig1, data))
-        {
-            fail("failed ISO9796-1 generation Test 1");
-        }
-
-        data = eng.processBlock(data, 0, data.length);
-
-        if (!areEqual(msg1, data))
-        {
-            fail("failed ISO9796-1 retrieve Test 1");
-        }
-    }
-
-    private void doTest2()
-        throws Exception
-    {
-        RSAKeyParameters pubParameters = new RSAKeyParameters(false, mod1, pub1);
-        RSAKeyParameters privParameters = new RSAKeyParameters(true, mod1, pri1);
-        RSAEngine rsa = new RSAEngine();
-        byte[] data;
-
-        //
-        // ISO 9796-1 - public encrypt, private decrypt
-        //
-        ISO9796d1Encoding eng = new ISO9796d1Encoding(rsa);
-
-        eng.init(true, privParameters);
-
-        data = eng.processBlock(msg2, 0, msg2.length);
-
-        eng.init(false, pubParameters);
-
-        if (!isSameAs(data, 1, sig2))
-        {
-            fail("failed ISO9796-1 generation Test 2");
-        }
-
-        data = eng.processBlock(data, 0, data.length);
-
-
-        if (!areEqual(msg2, data))
-        {
-            fail("failed ISO9796-1 retrieve Test 2");
-        }
-    }
-
-    public void doTest3()
-        throws Exception
-    {
-        RSAKeyParameters pubParameters = new RSAKeyParameters(false, mod2, pub2);
-        RSAKeyParameters privParameters = new RSAKeyParameters(true, mod2, pri2);
-        RSAEngine rsa = new RSAEngine();
-        byte[] data;
-
-        //
-        // ISO 9796-1 - public encrypt, private decrypt
-        //
-        ISO9796d1Encoding eng = new ISO9796d1Encoding(rsa);
-
-        eng.init(true, privParameters);
-
-        eng.setPadBits(4);
-
-        data = eng.processBlock(msg3, 0, msg3.length);
-
-        eng.init(false, pubParameters);
-
-        if (!isSameAs(sig3, 1, data))
-        {
-            fail("failed ISO9796-1 generation Test 3");
-        }
-
-        data = eng.processBlock(data, 0, data.length);
-
-        if (!isSameAs(msg3, 0, data))
-        {
-            fail("failed ISO9796-1 retrieve Test 3");
-        }
-    }
-
-    public void doTest4()
-        throws Exception
-    {
-        RSAKeyParameters pubParameters = new RSAKeyParameters(false, mod3, pub3);
-        RSAKeyParameters privParameters = new RSAKeyParameters(true, mod3, pri3);
-        RSAEngine rsa = new RSAEngine();
-        byte[] data;
-
-        //
-        // ISO 9796-2 - Signing
-        //
-        ISO9796d2Signer eng = new ISO9796d2Signer(rsa, new RIPEMD128Digest());
-
-        eng.init(true, privParameters);
-
-        eng.update(msg4[0]);
-        eng.update(msg4, 1, msg4.length - 1);
-
-        data = eng.generateSignature();
-
-        eng.init(false, pubParameters);
-
-        if (!isSameAs(sig4, 0, data))
-        {
-            fail("failed ISO9796-2 generation Test 4");
-        }
-
-        eng.update(msg4[0]);
-        eng.update(msg4, 1, msg4.length - 1);
-
-        if (!eng.verifySignature(sig4))
-        {
-            fail("failed ISO9796-2 verify Test 4");
-        }
-
-        if (eng.hasFullMessage())
-        {
-            eng = new ISO9796d2Signer(rsa, new RIPEMD128Digest());
-
-            eng.init(false, pubParameters);
-
-            if (!eng.verifySignature(sig4))
-            {
-                fail("failed ISO9796-2 verify and recover Test 4");
-            }
-
-            if (!isSameAs(eng.getRecoveredMessage(), 0, msg4))
-            {
-                fail("failed ISO9796-2 recovered message Test 4");
-            }
-
-            // try update with recovered
-            eng.updateWithRecoveredMessage(sig4);
-
-            if (!isSameAs(eng.getRecoveredMessage(), 0, msg4))
-            {
-                fail("failed ISO9796-2 updateWithRecovered recovered message Test 4");
-            }
-
-            if (!eng.verifySignature(sig4))
-            {
-                fail("failed ISO9796-2 updateWithRecovered verify and recover Test 4");
-            }
-
-            if (!isSameAs(eng.getRecoveredMessage(), 0, msg4))
-            {
-                fail("failed ISO9796-2 updateWithRecovered recovered verify message Test 4");
-            }
-
-            // should fail
-            eng.updateWithRecoveredMessage(sig4);
-
-            eng.update(msg4, 0, msg4.length);
-
-            if (eng.verifySignature(sig4))
-            {
-                fail("failed ISO9796-2 updateWithRecovered verify and recover Test 4");
-            }
-        }
-        else
-        {
-            fail("full message flag false - Test 4");
-        }
-    }
-
-    public void doTest5()
-        throws Exception
-    {
-        RSAKeyParameters pubParameters = new RSAKeyParameters(false, mod3, pub3);
-        RSAKeyParameters privParameters = new RSAKeyParameters(true, mod3, pri3);
-        RSAEngine rsa = new RSAEngine();
-        byte[] data;
-
-        //
-        // ISO 9796-2 - Signing
-        //
-        ISO9796d2Signer eng = new ISO9796d2Signer(rsa, new RIPEMD160Digest(), true);
-
-        eng.init(true, privParameters);
-
-        eng.update(msg5[0]);
-        eng.update(msg5, 1, msg5.length - 1);
-
-        data = eng.generateSignature();
-
-        eng.init(false, pubParameters);
-
-        if (!isSameAs(sig5, 0, data))
-        {
-            fail("failed ISO9796-2 generation Test 5");
-        }
-
-        eng.update(msg5[0]);
-        eng.update(msg5, 1, msg5.length - 1);
-
-        if (!eng.verifySignature(sig5))
-        {
-            fail("failed ISO9796-2 verify Test 5");
-        }
-
-        if (eng.hasFullMessage())
-        {
-            fail("fullMessage true - Test 5");
-        }
-
-        if (!startsWith(msg5, eng.getRecoveredMessage()))
-        {
-            fail("failed ISO9796-2 partial recovered message Test 5");
-        }
-
-        int length = eng.getRecoveredMessage().length;
-
-        if (length >= msg5.length)
-        {
-            fail("Test 5 recovered message too long");
-        }
-
-        eng = new ISO9796d2Signer(rsa, new RIPEMD160Digest(), true);
-
-        eng.init(false, pubParameters);
-
-        eng.updateWithRecoveredMessage(sig5);
-
-        if (!startsWith(msg5, eng.getRecoveredMessage()))
-        {
-            fail("failed ISO9796-2 updateWithRecovered partial recovered message Test 5");
-        }
-
-        if (eng.hasFullMessage())
-        {
-            fail("fullMessage updateWithRecovered true - Test 5");
-        }
-
-        for (int i = length; i != msg5.length; i++)
-        {
-            eng.update(msg5[i]);
-        }
-
-        if (!eng.verifySignature(sig5))
-        {
-            fail("failed ISO9796-2 verify Test 5");
-        }
-
-        if (eng.hasFullMessage())
-        {
-            fail("fullMessage updateWithRecovered true - Test 5");
-        }
-
-        // should fail
-        eng.updateWithRecoveredMessage(sig5);
-
-        eng.update(msg5, 0, msg5.length);
-
-        if (eng.verifySignature(sig5))
-        {
-            fail("failed ISO9796-2 updateWithRecovered verify fail Test 5");
-        }
-    }
-
-    //
-    // against a zero length string
-    //
-
-    public void doTest6()
-        throws Exception
-    {
-        byte[] salt = Hex.decode("61DF870C4890FE85D6E3DD87C3DCE3723F91DB49");
-        RSAKeyParameters pubParameters = new RSAKeyParameters(false, mod6, pub6);
-        RSAKeyParameters privParameters = new RSAKeyParameters(true, mod6, pri6);
-        ParametersWithSalt sigParameters = new ParametersWithSalt(privParameters, salt);
-        RSAEngine rsa = new RSAEngine();
-        byte[] data;
-
-        //
-        // ISO 9796-2 - PSS Signing
-        //
-        ISO9796d2PSSSigner eng = new ISO9796d2PSSSigner(rsa, new RIPEMD160Digest(), 20, true);
-
-        eng.init(true, sigParameters);
-
-        data = eng.generateSignature();
-
-        eng.init(false, pubParameters);
-
-        if (!isSameAs(sig6, 1, data))
-        {
-            fail("failed ISO9796-2 generation Test 6");
-        }
-
-        if (!eng.verifySignature(data))
-        {
-            fail("failed ISO9796-2 verify Test 6");
-        }
-    }
-
-    public void doTest7()
-        throws Exception
-    {
-        byte[] salt = new byte[0];
-        RSAKeyParameters pubParameters = new RSAKeyParameters(false, mod6, pub6);
-        RSAKeyParameters privParameters = new RSAKeyParameters(true, mod6, pri6);
-        ParametersWithSalt sigParameters = new ParametersWithSalt(privParameters, salt);
-        RSAEngine rsa = new RSAEngine();
-        byte[] data;
-
-        //
-        // ISO 9796-2 - PSS Signing
-        //
-        ISO9796d2PSSSigner eng = new ISO9796d2PSSSigner(rsa, new SHA1Digest(), 0, false);
-
-        eng.init(true, sigParameters);
-
-        eng.update(msg7[0]);
-        eng.update(msg7, 1, msg7.length - 1);
-
-        data = eng.generateSignature();
-
-        eng.init(false, pubParameters);
-
-        if (!isSameAs(sig7, 0, data))
-        {
-            fail("failed ISO9796-2 generation Test 7");
-        }
-
-        eng.update(msg7[0]);
-        eng.update(msg7, 1, msg7.length - 1);
-
-        if (!eng.verifySignature(sig7))
-        {
-            fail("failed ISO9796-2 verify Test 7");
-        }
-
-        if (!isSameAs(msg7, 0, eng.getRecoveredMessage()))
-        {
-            fail("failed ISO9796-2 recovery Test 7");
-        }
-    }
-
-    public void doTest8()
-        throws Exception
-    {
-        byte[] salt = Hex.decode("78E293203CBA1B7F92F05F4D171FF8CA3E738FF8");
-        RSAKeyParameters pubParameters = new RSAKeyParameters(false, mod6, pub6);
-        RSAKeyParameters privParameters = new RSAKeyParameters(true, mod6, pri6);
-        ParametersWithSalt sigParameters = new ParametersWithSalt(privParameters, salt);
-        RSAEngine rsa = new RSAEngine();
-        byte[] data;
-
-        //
-        // ISO 9796-2 - PSS Signing
-        //
-        ISO9796d2PSSSigner eng = new ISO9796d2PSSSigner(rsa, new RIPEMD160Digest(), 20, false);
-
-        eng.init(true, sigParameters);
-
-        eng.update(msg8[0]);
-        eng.update(msg8, 1, msg8.length - 1);
-
-        data = eng.generateSignature();
-
-        eng.init(false, pubParameters);
-
-        if (!isSameAs(sig8, 0, data))
-        {
-            fail("failed ISO9796-2 generation Test 8");
-        }
-
-        eng.update(msg8[0]);
-        eng.update(msg8, 1, msg8.length - 1);
-
-        if (!eng.verifySignature(sig8))
-        {
-            fail("failed ISO9796-2 verify Test 8");
-        }
-    }
-
-    public void doTest9()
-        throws Exception
-    {
-        RSAKeyParameters pubParameters = new RSAKeyParameters(false, mod6, pub6);
-        RSAKeyParameters privParameters = new RSAKeyParameters(true, mod6, pri6);
-        RSAEngine rsa = new RSAEngine();
-        byte[] data;
-
-        //
-        // ISO 9796-2 - PSS Signing
-        //
-        ISO9796d2PSSSigner eng = new ISO9796d2PSSSigner(rsa, new RIPEMD160Digest(), 0, true);
-
-        eng.init(true, privParameters);
-
-        eng.update(msg9[0]);
-        eng.update(msg9, 1, msg9.length - 1);
-
-        data = eng.generateSignature();
-
-        eng.init(false, pubParameters);
-
-        if (!isSameAs(sig9, 0, data))
-        {
-            fail("failed ISO9796-2 generation Test 9");
-        }
-
-        eng.update(msg9[0]);
-        eng.update(msg9, 1, msg9.length - 1);
-
-        if (!eng.verifySignature(sig9))
-        {
-            fail("failed ISO9796-2 verify Test 9");
-        }
-    }
-
-    public void doTest10()
-        throws Exception
-    {
-        BigInteger mod = new BigInteger("B3ABE6D91A4020920F8B3847764ECB34C4EB64151A96FDE7B614DC986C810FF2FD73575BDF8532C06004C8B4C8B64F700A50AEC68C0701ED10E8D211A4EA554D", 16);
-        BigInteger pubExp = new BigInteger("65537", 10);
-        BigInteger priExp = new BigInteger("AEE76AE4716F77C5782838F328327012C097BD67E5E892E75C1356E372CCF8EE1AA2D2CBDFB4DA19F703743F7C0BA42B2D69202BA7338C294D1F8B6A5771FF41", 16);
-        RSAKeyParameters pubParameters = new RSAKeyParameters(false, mod, pubExp);
-        RSAKeyParameters privParameters = new RSAKeyParameters(true, mod, priExp);
-        RSAEngine rsa = new RSAEngine();
-        byte[] data;
-
-        //
-        // ISO 9796-2 - PSS Signing
-        //
-        Digest dig = new SHA1Digest();
-        ISO9796d2PSSSigner eng = new ISO9796d2PSSSigner(rsa, dig, dig.getDigestSize());
-
-        //
-        // as the padding is random this test needs to repeat a few times to
-        // make sure
-        //
-        for (int i = 0; i != 500; i++)
-        {
-            eng.init(true, privParameters);
-
-            eng.update(msg9[0]);
-            eng.update(msg9, 1, msg9.length - 1);
-
-            data = eng.generateSignature();
-
-            eng.init(false, pubParameters);
-
-            eng.update(msg9[0]);
-            eng.update(msg9, 1, msg9.length - 1);
-
-            if (!eng.verifySignature(data))
-            {
-                fail("failed ISO9796-2 verify Test 10");
-            }
-        }
-    }
-
-    public void doTest11()
-        throws Exception
-    {
-        BigInteger mod = new BigInteger("B3ABE6D91A4020920F8B3847764ECB34C4EB64151A96FDE7B614DC986C810FF2FD73575BDF8532C06004C8B4C8B64F700A50AEC68C0701ED10E8D211A4EA554D", 16);
-        BigInteger pubExp = new BigInteger("65537", 10);
-        BigInteger priExp = new BigInteger("AEE76AE4716F77C5782838F328327012C097BD67E5E892E75C1356E372CCF8EE1AA2D2CBDFB4DA19F703743F7C0BA42B2D69202BA7338C294D1F8B6A5771FF41", 16);
-        RSAKeyParameters pubParameters = new RSAKeyParameters(false, mod, pubExp);
-        RSAKeyParameters privParameters = new RSAKeyParameters(true, mod, priExp);
-        RSAEngine rsa = new RSAEngine();
-        byte[] data;
-        byte[] m1 = {1, 2, 3, 4, 5, 6, 7, 8, 9};
-        byte[] m2 = {1, 2, 3, 4, 5, 6, 7, 8, 9, 0};
-        byte[] m3 = {1, 2, 3, 4, 5, 6, 7, 8};
-
-        //
-        // ISO 9796-2 - PSS Signing
-        //
-        Digest dig = new SHA1Digest();
-        ISO9796d2PSSSigner eng = new ISO9796d2PSSSigner(rsa, dig, dig.getDigestSize());
-
-        //
-        // check message bounds
-        //
-        eng.init(true, privParameters);
-
-        eng.update(m1, 0, m1.length);
-
-        data = eng.generateSignature();
-
-        eng.init(false, pubParameters);
-
-        eng.update(m2, 0, m2.length);
-
-        if (eng.verifySignature(data))
-        {
-            fail("failed ISO9796-2 m2 verify Test 11");
-        }
-
-        eng.init(false, pubParameters);
-
-        eng.update(m3, 0, m3.length);
-
-        if (eng.verifySignature(data))
-        {
-            fail("failed ISO9796-2 m3 verify Test 11");
-        }
-
-        eng.init(false, pubParameters);
-
-        eng.update(m1, 0, m1.length);
-
-        if (!eng.verifySignature(data))
-        {
-            fail("failed ISO9796-2 verify Test 11");
-        }
-    }
-
-    public void doTest12()
-        throws Exception
-    {
-        BigInteger mod = new BigInteger("B3ABE6D91A4020920F8B3847764ECB34C4EB64151A96FDE7B614DC986C810FF2FD73575BDF8532C06004C8B4C8B64F700A50AEC68C0701ED10E8D211A4EA554D", 16);
-        BigInteger pubExp = new BigInteger("65537", 10);
-        BigInteger priExp = new BigInteger("AEE76AE4716F77C5782838F328327012C097BD67E5E892E75C1356E372CCF8EE1AA2D2CBDFB4DA19F703743F7C0BA42B2D69202BA7338C294D1F8B6A5771FF41", 16);
-        RSAKeyParameters pubParameters = new RSAKeyParameters(false, mod, pubExp);
-        RSAKeyParameters privParameters = new RSAKeyParameters(true, mod, priExp);
-        RSAEngine rsa = new RSAEngine();
-        byte[] data;
-        byte[] m1 = {1, 2, 3, 4, 5, 6, 7, 8, 9};
-        byte[] m2 = {1, 2, 3, 4, 5, 6, 7, 8, 9, 0};
-        byte[] m3 = {1, 2, 3, 4, 5, 6, 7, 8};
-
-        //
-        // ISO 9796-2 - Signing
-        //
-        Digest dig = new SHA1Digest();
-        ISO9796d2Signer eng = new ISO9796d2Signer(rsa, dig);
-
-        //
-        // check message bounds
-        //
-        eng.init(true, privParameters);
-
-        eng.update(m1, 0, m1.length);
-
-        data = eng.generateSignature();
-
-        eng.init(false, pubParameters);
-
-        eng.update(m2, 0, m2.length);
-
-        if (eng.verifySignature(data))
-        {
-            fail("failed ISO9796-2 m2 verify Test 12");
-        }
-
-        eng.init(false, pubParameters);
-
-        eng.update(m3, 0, m3.length);
-
-        if (eng.verifySignature(data))
-        {
-            fail("failed ISO9796-2 m3 verify Test 12");
-        }
-
-        eng.init(false, pubParameters);
-
-        eng.update(m1, 0, m1.length);
-
-        if (!eng.verifySignature(data))
-        {
-            fail("failed ISO9796-2 verify Test 12");
-        }
-    }
-
-    private void doTest13()
-        throws Exception
-    {
-        BigInteger modulus = new BigInteger(1, Hex.decode("CDCBDABBF93BE8E8294E32B055256BBD0397735189BF75816341BB0D488D05D627991221DF7D59835C76A4BB4808ADEEB779E7794504E956ADC2A661B46904CDC71337DD29DDDD454124EF79CFDD7BC2C21952573CEFBA485CC38C6BD2428809B5A31A898A6B5648CAA4ED678D9743B589134B7187478996300EDBA16271A861"));
-        BigInteger pubExp = new BigInteger(1, Hex.decode("010001"));
-        BigInteger privExp = new BigInteger(1, Hex.decode("4BA6432AD42C74AA5AFCB6DF60FD57846CBC909489994ABD9C59FE439CC6D23D6DE2F3EA65B8335E796FD7904CA37C248367997257AFBD82B26F1A30525C447A236C65E6ADE43ECAAF7283584B2570FA07B340D9C9380D88EAACFFAEEFE7F472DBC9735C3FF3A3211E8A6BBFD94456B6A33C17A2C4EC18CE6335150548ED126D"));
-
-        RSAKeyParameters pubParams = new RSAKeyParameters(false, modulus, pubExp);
-        RSAKeyParameters privParams = new RSAKeyParameters(true, modulus, privExp);
-
-        AsymmetricBlockCipher rsaEngine = new RSABlindedEngine();
-        Digest digest = new SHA256Digest();
-
-        // set challenge to all zero's for verification
-        byte[] challenge = new byte[8];
-
-        // DOES NOT USE FINAL BOOLEAN TO INDICATE RECOVERY
-        ISO9796d2Signer signer = new ISO9796d2Signer(rsaEngine, digest, false);
-
-        // sign
-        signer.init(true, privParams);
-        signer.update(challenge, 0, challenge.length);
-
-        byte[]  sig = signer.generateSignature();
-
-        // verify
-        signer.init(false, pubParams);
-        signer.update(challenge, 0, challenge.length);
-
-        if (!signer.verifySignature(sig))
-        {
-            fail("basic verification failed");
-        }
-
-        // === LETS ACTUALLY DO SOME RECOVERY, USING INPUT FROM INTERNAL AUTHENTICATE ===
-
-        signer.reset();
-
-        final String args0 = "482E20D1EDDED34359C38F5E7C01203F9D6B2641CDCA5C404D49ADAEDE034C7481D781D043722587761C90468DE69C6585A1E8B9C322F90E1B580EEDAB3F6007D0C366CF92B4DB8B41C8314929DCE2BE889C0129123484D2FD3D12763D2EBFD12AC8E51D7061AFCA1A53DEDEC7B9A617472A78C952CCC72467AE008E5F132994";
-
-        digest = new SHA1Digest();
-
-        signer = new ISO9796d2Signer(rsaEngine, digest, true);
-
-
-        signer.init(false, pubParams);
-        final byte[] signature = Hex.decode(args0);
-        signer.updateWithRecoveredMessage(signature);
-        signer.update(challenge, 0, challenge.length);
-
-        if (!signer.verifySignature(signature))
-        {
-            fail("recovered + challenge signature failed");
-        }
-
-        // === FINALLY, USING SHA-256 ===
-
-        signer.reset();
-
-        digest = new SHA256Digest();
-
-        // NOTE setting implit to false does not actually do anything for verification !!!
-        signer = new ISO9796d2Signer(rsaEngine, digest, false);
-
-
-        signer.init(true, privParams);
-        // generate NONCE of correct length using some inner knowledge
-        int nonceLength = modulus.bitLength() / 8 - 1 - digest.getDigestSize() - 2;
-        final byte[] nonce = new byte[nonceLength];
-        SecureRandom rnd = new SecureRandom();
-
-        rnd.nextBytes(nonce);
-
-        signer.update(nonce, 0, nonce.length);
-        signer.update(challenge, 0, challenge.length);
-        byte[] sig3 = signer.generateSignature();
-
-        signer.init(false, pubParams);
-        signer.updateWithRecoveredMessage(sig3);
-        signer.update(challenge, 0, challenge.length);
-        if (signer.verifySignature(sig3))
-        {
-            if (signer.hasFullMessage())
-            {
-                fail("signer indicates full message");
-            }
-            byte[] recoverableMessage = signer.getRecoveredMessage();
-
-            // sanity check, normally the nonce is ignored in eMRTD specs (PKI Technical Report)
-            if (!Arrays.areEqual(nonce, recoverableMessage))
-            {
-                fail("Nonce compare with recoverable part of message failed");
-            }
-        }
-        else
-        {
-            fail("recoverable + nonce failed.");
-        }
-    }
-
-    private static final byte[] longMessage = Base64.decode(
-        "VVNIKzErU0U2ODAxNTMyOTcxOSsyKzErNisyKzErMTo6OTk5OTk5OTk5OTk5"
-      + "OTo6OSsyOjo3Nzc3Nzc3Nzc3Nzc3Ojo5Kys1OjIwMTMwNDA1OjExMzUyMCdV"
-      + "U0ErMTo6OjE2OjEnVVNDKzRmYjk3YzFhNDI5ZGIyZDYnVVNBKzY6MTY6MTox"
-      + "MDoxKzE0OjIwNDgrMTI6/vn3S0h96eNhfmPN6OZUxXhd815h0tP871Hl+V1r"
-      + "fHHUXvrPXmjHV0vdb8fYY1zxwvnQUcFBWXT43PFi7Xbow0/9e9l6/mhs1UJq"
-      + "VPvp+ELbeXfn4Nj02ttk0e3H5Hfa69NYRuHv1WBO6lfizNnM9m9XYmh9TOrg"
-      + "f9rDRtd+ZNbf4lz9fPTt9OXyxOJWRPr/0FLzxUVsddplfHxM3ndETFD7ffjI"
-      + "/mhRYuL8WXZ733LeWFRCeOzKzmDz/HvT3GZx/XJMbFpqyOZjedzh6vZr1vrD"
-      + "615TQfN7wtJJ29bN2Hvzb2f1xGHaXl7af0/w9dpR2dr7/HzuZEJKYc7JSkv4"
-      + "/k37yERIbcrfbVTeVtR+dcVoeeRT41fmzMfzf8RnWOX4YMNifl0rMTM68EFA"
-      + "QSdCR00rMzgwKzk5OTk5OTk5J0RUTSsxMzc6MjAxMzA0MDU6MTAyJ0ZUWCtB"
-      + "QUkrKytJTlZPSUNFIFRFU1QnUkZGK09OOjEyMzQ1NidSRkYrRFE6MjIyMjIy"
-      + "MjIyJ0RUTSsxNzE6MjAxMzA0MDE6MTAyJ05BRCtTVSs5OTk5OTk5OTk5OTk5"
-      + "Ojo5KytURVNUIFNVUFBMSUVSOjpUcmFzZSByZWdpc3RlciBYWFhYWFhYK1Rl"
-      + "c3QgYWRkcmVzcyBzdXBwbGllcitDaXR5KysxMjM0NStERSdSRkYrVkE6QTEy"
-      + "MzQ1Njc4J05BRCtTQ08rOTk5OTk5OTk5OTk5OTo6OSsrVEVTVCBTVVBQTElF"
-      + "Ujo6VHJhc2UgcmVnaXN0ZXIgWFhYWFhYWCtUZXN0IGFkZHJlc3Mgc3VwcGxp"
-      + "ZXIrQ2l0eSsrMTIzNDUrREUnUkZGK1ZBOkExMjM0NTY3OCdOQUQrQlkrODg4"
-      + "ODg4ODg4ODg4ODo6OSdOQUQrSVYrNzc3Nzc3Nzc3Nzc3Nzo6OSsrVEVTVCBC"
-      + "VVlFUitUZXN0IGFkZHJlc3MgYnV5ZXIrQ2l0eTIrKzU0MzIxK0RFJ1JGRitW"
-      + "QTpKODc2NTQzMjEnTkFEK0JDTys3Nzc3Nzc3Nzc3Nzc3Ojo5KytURVNUIEJV"
-      + "WUVSK1Rlc3QgYWRkcmVzcyBidXllcitDaXR5MisrNTQzMjErREUnUkZGK1ZB"
-      + "Oko4NzY1NDMyMSdOQUQrRFArODg4ODg4ODg4ODg4ODo6OSdOQUQrUFIrNzc3"
-      + "Nzc3Nzc3Nzc3Nzo6OSdDVVgrMjpFVVI6NCdQQVQrMzUnRFRNKzEzOjIwMTMw"
-      + "NjI0OjEwMidMSU4rMSsrMTExMTExMTExMTExMTpFTidQSUErMStBQUFBQUFB"
-      + "OlNBJ0lNRCtGK00rOjo6UFJPRFVDVCBURVNUIDEnUVRZKzQ3OjEwLjAwMCdN"
-      + "T0ErNjY6Ny4wMCdQUkkrQUFCOjEuMDAnUFJJK0FBQTowLjcwJ1JGRitPTjox"
-      + "MjM0NTYnUkZGK0RROjIyMjIyMjIyMidUQVgrNytWQVQrKys6OjoyMS4wMDAn"
-      + "QUxDK0ErKysxK1REJ1BDRCsxOjMwLjAwMCdNT0ErMjA0OjMuMDAnTElOKzIr"
-      + "KzIyMjIyMjIyMjIyMjI6RU4nUElBKzErQkJCQkJCQjpTQSdJTUQrRitNKzo6"
-      + "OlBST0RVQ1QgVEVTVCAyJ1FUWSs0NzoyMC4wMDAnTU9BKzY2OjgwLjAwJ1BS"
-      + "SStBQUI6NS4wMCdQUkkrQUFBOjQuMDAnUkZGK09OOjEyMzQ1NidSRkYrRFE6"
-      + "MjIyMjIyMjIyJ1RBWCs3K1ZBVCsrKzo6OjIxLjAwMCdBTEMrQSsrKzErVEQn"
-      + "UENEKzE6MjAuMDAwJ01PQSsyMDQ6MjAuMDAnVU5TK1MnQ05UKzI6MidNT0Er"
-      + "Nzk6ODcuMDAnTU9BKzEzOToxMDUuMjcnTU9BKzEyNTo4Ny4wMCdNT0ErMjYw"
-      + "OjAuMDAnTU9BKzI1OTowLjAwJ01PQSsxNzY6MTguMjcnVEFYKzcrVkFUKysr"
-      + "Ojo6MjEuMDAwJ01PQSsxNzY6MTguMjcnTU9BKzEyNTo4Ny4wMCc=");
-
-    private static final byte[] shortPartialSig = Base64.decode(
-        "sb8yyKk6HM1cJhICScMx7QRQunRyrZ1fbI42+T+TBGNjOknvzKuvG7aftGX7"
-      + "O/RXuYgk6LTxpXv7+O5noUhMBsR2PKaHveuylU1WSPmDxDCui3kp4frqVH0w"
-      + "8Vjpl5CsKqBsmKkbGCKE+smM0xFXhYxV8QUTB2XsWNCQiFiHPgwbpfWzZUNY"
-      + "QPWd0A99P64EuUIYz1tkkDnLFmwQ19/PJu1a8orIQInmkVYWSsBsZ/7Ks6lx"
-      + "nDHpAvgiRe+OXmJ/yuQy1O3FJYdyoqvjYRPBu3qYeBK9+9L3lExLilImH5aD"
-      + "nJznaXcO8QFOxVPbrF2s4GdPIMDonEyAHdrnzoghlg==");
-
-    private void doShortPartialTest()
-        throws Exception
-    {
-        byte[]     recovered = Hex.decode("5553482b312b534536383031353332393731392b322b312b362b322b312b313a3a393939393939393939393939393a3a392b323a3a373737373737373737373737373a3a392b2b353a32303133303430353a313133");
-        BigInteger exp = new BigInteger("10001", 16);
-        BigInteger mod = new BigInteger("b9b70b083da9e37e23cde8e654855db31e21d2d3fc11a5f91d2b3c311efa8f5e28c757dd6fc798631cb1b9d051c14119749cb122ad76e8c3fd7bd93abe282c026a14fba9f8023977a7a0d8b49a24d1ad87e4379a931846a1ef9520ea57e28c998cf65722683d0caaa0da8306973e2496a25cbd3cb4adb4b284e25604fabf12f385456c75da7c3c4cde37440cfb7db8c8fe6851e2bc59767b9f7218540238ac8acef3bc7bd3dc6671320c2c1a2ac8a6799ce1eaf62b9683ab1e1341b37b9249dbd6cd987b2f27b5c4619a1eda7f0fb0b59a519afbbc3cee640261cec90a4bb8fefbc844082dca9f549e56943e758579a453a357e6ccb37fc46718a5b8c3227e5d", 16);
-
-        AsymmetricKeyParameter pubKey = new RSAKeyParameters(false, mod, exp);
-
-        ISO9796d2PSSSigner pssSign = new ISO9796d2PSSSigner(new RSAEngine(), new SHA1Digest(), 20);
-
-        pssSign.init(false, pubKey);
-
-        pssSign.updateWithRecoveredMessage(shortPartialSig);
-
-        pssSign.update(longMessage, pssSign.getRecoveredMessage().length, longMessage.length - pssSign.getRecoveredMessage().length);
-
-        if (!pssSign.verifySignature(shortPartialSig))
-        {
-            fail("short partial PSS sig verification failed.");
-        }
-
-        byte[] mm = pssSign.getRecoveredMessage();
-
-        if (!Arrays.areEqual(recovered, mm))
-        {
-            fail("short partial PSS recovery failed");
-        }
-    }
-
-    private void doFullMessageTest()
-        throws Exception
-    {
-        BigInteger modulus = new BigInteger(1, Hex.decode("CDCBDABBF93BE8E8294E32B055256BBD0397735189BF75816341BB0D488D05D627991221DF7D59835C76A4BB4808ADEEB779E7794504E956ADC2A661B46904CDC71337DD29DDDD454124EF79CFDD7BC2C21952573CEFBA485CC38C6BD2428809B5A31A898A6B5648CAA4ED678D9743B589134B7187478996300EDBA16271A861"));
-        BigInteger pubExp = new BigInteger(1, Hex.decode("010001"));
-        BigInteger privExp = new BigInteger(1, Hex.decode("4BA6432AD42C74AA5AFCB6DF60FD57846CBC909489994ABD9C59FE439CC6D23D6DE2F3EA65B8335E796FD7904CA37C248367997257AFBD82B26F1A30525C447A236C65E6ADE43ECAAF7283584B2570FA07B340D9C9380D88EAACFFAEEFE7F472DBC9735C3FF3A3211E8A6BBFD94456B6A33C17A2C4EC18CE6335150548ED126D"));
-
-        RSAKeyParameters pubParams = new RSAKeyParameters(false, modulus, pubExp);
-        RSAKeyParameters privParams = new RSAKeyParameters(true, modulus, privExp);
-
-        AsymmetricBlockCipher rsaEngine = new RSABlindedEngine();
-
-        // set challenge to all zero's for verification
-        byte[] challenge = new byte[8];
-
-        ISO9796d2PSSSigner pssSign = new ISO9796d2PSSSigner(new RSAEngine(), new SHA256Digest(), 20, true);
-
-        pssSign.init(true, privParams);
-
-        pssSign.update(challenge, 0, challenge.length);
-
-        byte[] sig = pssSign.generateSignature();
-
-        pssSign.init(false, pubParams);
-
-        pssSign.updateWithRecoveredMessage(sig);
-
-        if (!pssSign.verifySignature(sig))
-        {
-            fail("challenge PSS sig verification failed.");
-        }
-
-        byte[] mm = pssSign.getRecoveredMessage();
-
-        if (!Arrays.areEqual(challenge, mm))
-        {
-            fail("challenge partial PSS recovery failed");
-        }
-    }
-
-    public void performTest()
-        throws Exception
-    {
-        doTest1();
-        doTest2();
-        doTest3();
-        doTest4();
-        doTest5();
-        doTest6();
-        doTest7();
-        doTest8();
-        doTest9();
-        doTest10();
-        doTest11();
-        doTest12();
-        doTest13();
-        doShortPartialTest();
-        doFullMessageTest();
-    }
-
-    public static void main(
-        String[] args)
-    {
-        runTest(new ISO9796Test());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/ISO9797Alg3MacTest.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/ISO9797Alg3MacTest.java
deleted file mode 100644
index 96b5fc4..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/ISO9797Alg3MacTest.java
+++ /dev/null
@@ -1,126 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import org.bouncycastle.crypto.BlockCipher;
-import org.bouncycastle.crypto.Mac;
-import org.bouncycastle.crypto.engines.DESEngine;
-import org.bouncycastle.crypto.macs.ISO9797Alg3Mac;
-import org.bouncycastle.crypto.paddings.ISO7816d4Padding;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.crypto.params.ParametersWithIV;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-
-public class ISO9797Alg3MacTest
-    extends SimpleTest
-{
-    static byte[] keyBytes = Hex.decode("7CA110454A1A6E570131D9619DC1376E");
-
-    static byte[] input1 = "Hello World !!!!".getBytes();
-
-    static byte[] output1 = Hex.decode("F09B856213BAB83B");
-
-    public ISO9797Alg3MacTest()
-    {
-    }
-
-    public void performTest()
-    {
-        KeyParameter key = new KeyParameter(keyBytes);
-        BlockCipher cipher = new DESEngine();
-        Mac mac = new ISO9797Alg3Mac(cipher);
-
-        //
-        // standard DAC - zero IV
-        //
-        mac.init(key);
-
-        mac.update(input1, 0, input1.length);
-
-        byte[] out = new byte[8];
-
-        mac.doFinal(out, 0);
-
-        if (!areEqual(out, output1))
-        {
-            fail("Failed - expected " + new String(Hex.encode(output1)) + " got " + new String(Hex.encode(out)));
-        }
-
-        //
-        //  reset
-        //
-        mac.reset();
-
-        mac.init(key);
-
-        for (int i = 0; i != input1.length / 2; i++)
-        {
-            mac.update(input1[i]);
-        }
-
-        mac.update(input1, input1.length / 2, input1.length - (input1.length / 2));
-
-        mac.doFinal(out, 0);
-
-        if (!areEqual(out, output1))
-        {
-            fail("Reset failed - expected " + new String(Hex.encode(output1)) + " got " + new String(Hex.encode(out)));
-        }
-
-        testMacWithIv();
-    }
-
-    private void testMacWithIv()
-    {
-        byte[] inputData = new byte[]{0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7, 0x8};
-        byte[] key = new byte[]{0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7, 0x8, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7, 0x8};
-        byte[] zeroIv = new byte[8];
-        byte[] nonZeroIv = new byte[]{0x5, 0x6, 0x7, 0x8, 0x1, 0x2, 0x3, 0x4};
-
-        KeyParameter simpleParameter = new KeyParameter(key);
-        ParametersWithIV zeroIvParameter = new ParametersWithIV(new KeyParameter(key), zeroIv);
-
-        ISO9797Alg3Mac mac1 = new ISO9797Alg3Mac(new DESEngine(), new ISO7816d4Padding());
-
-        // we calculate a reference MAC with a null IV
-        mac1.init(simpleParameter);
-        mac1.update(inputData, 0, inputData.length);
-        byte[] output1 = new byte[mac1.getMacSize()];
-        mac1.doFinal(output1, 0);
-
-        // we then check that passing a vector of 0s is the same as not using any IV
-        ISO9797Alg3Mac mac2 = new ISO9797Alg3Mac(new DESEngine(), new ISO7816d4Padding());
-        mac2.init(zeroIvParameter);
-        mac2.update(inputData, 0, inputData.length);
-        byte[] output2 = new byte[mac2.getMacSize()];
-        mac2.doFinal(output2, 0);
-        if (!Arrays.areEqual(output1, output2))
-        {
-            fail("zero IV test failed");
-        }
-
-        // and then check that a non zero IV parameter produces a different results.
-        ParametersWithIV nonZeroIvParameter = new ParametersWithIV(new KeyParameter(key), nonZeroIv);
-        mac2 = new ISO9797Alg3Mac(new DESEngine(), new ISO7816d4Padding());
-        mac2.init(nonZeroIvParameter);
-        mac2.update(inputData, 0, inputData.length);
-        output2 = new byte[mac2.getMacSize()];
-        mac2.doFinal(output2, 0);
-        if (Arrays.areEqual(output1, output2))
-        {
-            fail("non-zero IV test failed");
-        }
-    }
-
-    public String getName()
-    {
-        return "ISO9797Alg3Mac";
-    }
-
-    public static void main(
-        String[] args)
-    {
-        runTest(new ISO9797Alg3MacTest());
-    }
-}
-
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/KDF1GeneratorTest.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/KDF1GeneratorTest.java
deleted file mode 100644
index 62f9997..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/KDF1GeneratorTest.java
+++ /dev/null
@@ -1,93 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import org.bouncycastle.crypto.DataLengthException;
-import org.bouncycastle.crypto.DerivationFunction;
-import org.bouncycastle.crypto.digests.ShortenedDigest;
-import org.bouncycastle.crypto.digests.SHA1Digest;
-import org.bouncycastle.crypto.digests.SHA256Digest;
-import org.bouncycastle.crypto.generators.KDF1BytesGenerator;
-import org.bouncycastle.crypto.params.ISO18033KDFParameters;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-
-/**
- * KDF1 tests - vectors from ISO 18033.
- */
-public class KDF1GeneratorTest
-    extends SimpleTest
-{
-    private byte[] seed1 = Hex.decode("d6e168c5f256a2dcff7ef12facd390f393c7a88d");
-    private byte[] mask1 = Hex.decode(
-            "0742ba966813af75536bb6149cc44fc256fd6406df79665bc31dc5"
-          + "a62f70535e52c53015b9d37d412ff3c1193439599e1b628774c50d9c"
-          + "cb78d82c425e4521ee47b8c36a4bcffe8b8112a89312fc04420a39de"
-          + "99223890e74ce10378bc515a212b97b8a6447ba6a8870278");
-
-    private byte[] seed2 = Hex.decode(
-             "032e45326fa859a72ec235acff929b15d1372e30b207255f0611b8f785d7643741" 
-           + "52e0ac009e509e7ba30cd2f1778e113b64e135cf4e2292c75efe5288edfda4");
-    private byte[] mask2 = Hex.decode(
-             "5f8de105b5e96b2e490ddecbd147dd1def7e3b8e0e6a26eb7b956ccb8b3bdc1ca9" 
-           + "75bc57c3989e8fbad31a224655d800c46954840ff32052cdf0d640562bdfadfa263c" 
-           + "fccf3c52b29f2af4a1869959bc77f854cf15bd7a25192985a842dbff8e13efee5b7e" 
-           + "7e55bbe4d389647c686a9a9ab3fb889b2d7767d3837eea4e0a2f04");
-    
-    private byte[] seed3 = seed2;
-    private byte[] mask3= Hex.decode(
-             "09e2decf2a6e1666c2f6071ff4298305e2643fd510a2403db42a8743cb989de86e"
-           + "668d168cbe604611ac179f819a3d18412e9eb45668f2923c087c12fee0c5a0d2a8aa"
-           + "70185401fbbd99379ec76c663e875a60b4aacb1319fa11c3365a8b79a44669f26fb5"
-           + "55c80391847b05eca1cb5cf8c2d531448d33fbaca19f6410ee1fcb");
-
-
-    public KDF1GeneratorTest()
-    {
-    }
-    
-    public void performTest()
-    {
-        checkMask(1, new KDF1BytesGenerator(new ShortenedDigest(new SHA256Digest(), 20)), seed1, mask1);
-        checkMask(2, new KDF1BytesGenerator(new SHA1Digest()), seed2, mask2);
-        checkMask(3, new KDF1BytesGenerator(new ShortenedDigest(new SHA256Digest(), 20)), seed3, mask3);
-        
-        try
-        {
-            new KDF1BytesGenerator(new SHA1Digest()).generateBytes(new byte[10], 0, 20);
-            
-            fail("short input array not caught");
-        }
-        catch (DataLengthException e)
-        {
-            // expected 
-        }
-    }
-    
-    private void checkMask(
-        int                count,
-        DerivationFunction kdf,
-        byte[]             seed,
-        byte[]             result)
-    {
-        byte[]             data = new byte[result.length];
-        
-        kdf.init(new ISO18033KDFParameters(seed));
-        
-        kdf.generateBytes(data, 0, data.length);
-        
-        if (!areEqual(result, data))
-        {
-            fail("KDF1 failed generator test " + count);
-        }
-    }
-
-    public String getName()
-    {
-        return "KDF1";
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        runTest(new KDF1GeneratorTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/KDF2GeneratorTest.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/KDF2GeneratorTest.java
deleted file mode 100644
index 84a435a..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/KDF2GeneratorTest.java
+++ /dev/null
@@ -1,105 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import org.bouncycastle.crypto.DataLengthException;
-import org.bouncycastle.crypto.DerivationFunction;
-import org.bouncycastle.crypto.digests.SHA1Digest;
-import org.bouncycastle.crypto.digests.SHA256Digest;
-import org.bouncycastle.crypto.digests.ShortenedDigest;
-import org.bouncycastle.crypto.generators.KDF2BytesGenerator;
-import org.bouncycastle.crypto.params.KDFParameters;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-
-/**
- * KDF2 tests - vectors from ISO 18033.
- */
-public class KDF2GeneratorTest
-    extends SimpleTest
-{
-    private byte[] seed1 = Hex.decode("d6e168c5f256a2dcff7ef12facd390f393c7a88d");
-    private byte[] mask1 = Hex.decode(
-            "df79665bc31dc5a62f70535e52c53015b9d37d412ff3c119343959"
-          + "9e1b628774c50d9ccb78d82c425e4521ee47b8c36a4bcffe8b8112a8"
-          + "9312fc04420a39de99223890e74ce10378bc515a212b97b8a6447ba6"
-          + "a8870278f0262727ca041fa1aa9f7b5d1cf7f308232fe861");
-    
-    private byte[] seed2 = Hex.decode(
-             "032e45326fa859a72ec235acff929b15d1372e30b207255f0611b8f785d7643741" 
-           + "52e0ac009e509e7ba30cd2f1778e113b64e135cf4e2292c75efe5288edfda4");
-    private byte[] mask2 = Hex.decode(
-             "10a2403db42a8743cb989de86e668d168cbe604611ac179f819a3d18412e9eb456" 
-           + "68f2923c087c12fee0c5a0d2a8aa70185401fbbd99379ec76c663e875a60b4aacb13"
-           + "19fa11c3365a8b79a44669f26fb555c80391847b05eca1cb5cf8c2d531448d33fbac"
-           + "a19f6410ee1fcb260892670e0814c348664f6a7248aaf998a3acc6");
-    private byte[] adjustedMask2 = Hex.decode(
-             "10a2403db42a8743cb989de86e668d168cbe6046e23ff26f741e87949a3bba1311ac1"
-           + "79f819a3d18412e9eb45668f2923c087c1299005f8d5fd42ca257bc93e8fee0c5a0d2"
-           + "a8aa70185401fbbd99379ec76c663e9a29d0b70f3fe261a59cdc24875a60b4aacb131"
-           + "9fa11c3365a8b79a44669f26fba933d012db213d7e3b16349");
-
-    private byte[] sha1Mask = Hex.decode(
-             "0e6a26eb7b956ccb8b3bdc1ca975bc57c3989e8fbad31a224655d800c46954840ff32"
-           + "052cdf0d640562bdfadfa263cfccf3c52b29f2af4a1869959bc77f854cf15bd7a2519"
-           + "2985a842dbff8e13efee5b7e7e55bbe4d389647c686a9a9ab3fb889b2d7767d3837ee"
-           + "a4e0a2f04b53ca8f50fb31225c1be2d0126c8c7a4753b0807");
-
-    private byte[] seed3 = Hex.decode("CA7C0F8C3FFA87A96E1B74AC8E6AF594347BB40A");
-    private byte[] mask3 = Hex.decode("744AB703F5BC082E59185F6D049D2D367DB245C2");
-
-    private byte[] seed4 = Hex.decode("0499B502FC8B5BAFB0F4047E731D1F9FD8CD0D8881");
-    private byte[] mask4 = Hex.decode("03C62280C894E103C680B13CD4B4AE740A5EF0C72547292F82DC6B1777F47D63BA9D1EA732DBF386");
-
-    public KDF2GeneratorTest()
-    {
-    }
-    
-    public void performTest()
-    {
-        checkMask(1, new KDF2BytesGenerator(new ShortenedDigest(new SHA256Digest(), 20)), seed1, mask1);
-        checkMask(2, new KDF2BytesGenerator(new ShortenedDigest(new SHA256Digest(), 20)), seed2, mask2);
-        checkMask(3, new KDF2BytesGenerator(new SHA256Digest()), seed2, adjustedMask2);
-        checkMask(4, new KDF2BytesGenerator(new SHA1Digest()), seed2, sha1Mask);
-        checkMask(5, new KDF2BytesGenerator(new SHA1Digest()), seed3, mask3);
-        checkMask(6, new KDF2BytesGenerator(new SHA1Digest()), seed4, mask4);
-        
-        try
-        {
-            new KDF2BytesGenerator(new SHA1Digest()).generateBytes(new byte[10], 0, 20);
-            
-            fail("short input array not caught");
-        }
-        catch (DataLengthException e)
-        {
-            // expected 
-        }
-    }
-    
-    private void checkMask(
-        int                count,
-        DerivationFunction kdf,
-        byte[]             seed,
-        byte[]             result)
-    {
-        byte[]             data = new byte[result.length];
-        
-        kdf.init(new KDFParameters(seed, new byte[0]));
-        
-        kdf.generateBytes(data, 0, data.length);
-        
-        if (!areEqual(result, data))
-        {
-            fail("KDF2 failed generator test " + count);
-        }
-    }
-
-    public String getName()
-    {
-        return "KDF2";
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        runTest(new KDF2GeneratorTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/KDFCounterGeneratorTest.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/KDFCounterGeneratorTest.java
deleted file mode 100644
index 7078da2..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/KDFCounterGeneratorTest.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.nio.charset.Charset;
-
-import org.bouncycastle.crypto.test.cavp.CAVPReader;
-import org.bouncycastle.crypto.test.cavp.KDFCounterTests;
-import org.bouncycastle.util.test.SimpleTest;
-
-public class KDFCounterGeneratorTest
-    extends SimpleTest
-{
-
-    private static void testCounter()
-    {
-
-        CAVPReader cavpReader = new CAVPReader(new KDFCounterTests());
-
-        final InputStream stream = CAVPReader.class.getResourceAsStream("KDFCTR_gen.rsp");
-        final Reader reader = new InputStreamReader(stream, Charset.forName("UTF-8"));
-        cavpReader.setInput("KDFCounter", reader);
-
-        try
-        {
-            cavpReader.readAll();
-        }
-        catch (IOException e)
-        {
-            throw new IllegalStateException("Something is rotten in the state of Denmark", e);
-        }
-    }
-
-    public String getName()
-    {
-        return this.getClass().getSimpleName();
-    }
-
-    public void performTest()
-        throws Exception
-    {
-        testCounter();
-    }
-
-    public static void main(String[] args)
-    {
-        runTest(new KDFCounterGeneratorTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/KDFDoublePipelineIteratorGeneratorTest.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/KDFDoublePipelineIteratorGeneratorTest.java
deleted file mode 100644
index 37aaf66..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/KDFDoublePipelineIteratorGeneratorTest.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.nio.charset.Charset;
-
-import org.bouncycastle.crypto.test.cavp.CAVPReader;
-import org.bouncycastle.crypto.test.cavp.KDFDoublePipelineCounterTests;
-import org.bouncycastle.crypto.test.cavp.KDFDoublePipelineIterationNoCounterTests;
-import org.bouncycastle.util.test.SimpleTest;
-
-public class KDFDoublePipelineIteratorGeneratorTest
-    extends SimpleTest
-{
-    public String getName()
-    {
-        return this.getClass().getSimpleName();
-    }
-
-    public void performTest()
-        throws Exception
-    {
-        testDoublePipelineIterationCounter();
-        testDoublePipelineIterationNoCounter();
-    }
-
-    private static void testDoublePipelineIterationCounter()
-    {
-
-        CAVPReader cavpReader = new CAVPReader(new KDFDoublePipelineCounterTests());
-
-        final InputStream stream = CAVPReader.class.getResourceAsStream("KDFDblPipelineCounter_gen.rsp");
-        final Reader reader = new InputStreamReader(stream, Charset.forName("UTF-8"));
-        cavpReader.setInput("KDFDoublePipelineIterationCounter", reader);
-
-        try
-        {
-            cavpReader.readAll();
-        }
-        catch (IOException e)
-        {
-            throw new IllegalStateException("Something is rotten in the state of Denmark", e);
-        }
-    }
-
-    private static void testDoublePipelineIterationNoCounter()
-    {
-
-        CAVPReader cavpReader = new CAVPReader(new KDFDoublePipelineIterationNoCounterTests());
-
-        final InputStream stream = CAVPReader.class.getResourceAsStream("KDFDblPipelineNoCounter_gen.rsp");
-        final Reader reader = new InputStreamReader(stream, Charset.forName("UTF-8"));
-        cavpReader.setInput("KDFDblPipelineIterationNoCounter", reader);
-
-        try
-        {
-            cavpReader.readAll();
-        }
-        catch (IOException e)
-        {
-            throw new IllegalStateException("Something is rotten in the state of Denmark", e);
-        }
-    }
-
-    public static void main(String[] args)
-    {
-        runTest(new KDFDoublePipelineIteratorGeneratorTest());
-    }
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/KDFFeedbackGeneratorTest.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/KDFFeedbackGeneratorTest.java
deleted file mode 100644
index 0eba706..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/KDFFeedbackGeneratorTest.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.nio.charset.Charset;
-
-import org.bouncycastle.crypto.test.cavp.CAVPReader;
-import org.bouncycastle.crypto.test.cavp.KDFFeedbackCounterTests;
-import org.bouncycastle.crypto.test.cavp.KDFFeedbackNoCounterTests;
-import org.bouncycastle.util.test.SimpleTest;
-
-public class KDFFeedbackGeneratorTest
-    extends SimpleTest
-{
-    public String getName()
-    {
-        return this.getClass().getSimpleName();
-    }
-
-    public void performTest()
-        throws Exception
-    {
-        testFeedbackCounter();
-        testFeedbackNoCounter();
-    }
-
-    private static void testFeedbackCounter()
-    {
-
-        CAVPReader cavpReader = new CAVPReader(new KDFFeedbackCounterTests());
-
-        final InputStream stream = CAVPReader.class.getResourceAsStream("KDFFeedbackCounter_gen.rsp");
-        final Reader reader = new InputStreamReader(stream, Charset.forName("UTF-8"));
-        cavpReader.setInput("KDFFeedbackCounter", reader);
-
-        try
-        {
-            cavpReader.readAll();
-        }
-        catch (IOException e)
-        {
-            throw new IllegalStateException("Something is rotten in the state of Denmark ", e);
-        }
-    }
-
-    private static void testFeedbackNoCounter()
-    {
-
-        CAVPReader cavpReader = new CAVPReader(new KDFFeedbackNoCounterTests());
-
-        final InputStream stream = CAVPReader.class.getResourceAsStream("KDFFeedbackNoCounter_gen.rsp");
-        final Reader reader = new InputStreamReader(stream, Charset.forName("UTF-8"));
-        cavpReader.setInput("KDFFeedbackNoCounter", reader);
-
-        try
-        {
-            cavpReader.readAll();
-        }
-        catch (IOException e)
-        {
-            throw new IllegalStateException("Something is rotten in the state of Denmark", e);
-        }
-    }
-
-    public static void main(String[] args)
-    {
-        runTest(new KDFDoublePipelineIteratorGeneratorTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/MD2DigestTest.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/MD2DigestTest.java
deleted file mode 100644
index 443ec2e..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/MD2DigestTest.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.digests.MD2Digest;
-
-/**
- * standard vector test for MD2
- * from RFC1319 by B.Kaliski of RSA Laboratories April 1992
- *
- */
-public class MD2DigestTest
-    extends DigestTest
-{
-    static final String messages[] =
-    {
-        "",
-        "a",
-        "abc",
-        "message digest",
-        "abcdefghijklmnopqrstuvwxyz",
-        "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789",
-        "12345678901234567890123456789012345678901234567890123456789012345678901234567890"
-    };
-    
-    static final String digests[] =
-    { 
-        "8350e5a3e24c153df2275c9f80692773",
-        "32ec01ec4a6dac72c0ab96fb34c0b5d1",
-        "da853b0d3f88d99b30283a69e6ded6bb",
-        "ab4f496bfb2a530b219ff33031fe06b0",
-        "4e8ddff3650292ab5a4108c3aa47940b",
-        "da33def2a42df13975352846c30338cd",
-        "d5976f79d83d3a0dc9806c3c66f3efd8" 
-    };
-    
-    MD2DigestTest()
-    {
-        super(new MD2Digest(), messages, digests);
-    }
- 
-    protected Digest cloneDigest(
-        Digest digest)
-    {
-        return new MD2Digest((MD2Digest)digest);
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        runTest(new MD2DigestTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/MD4DigestTest.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/MD4DigestTest.java
deleted file mode 100644
index d57a29c..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/MD4DigestTest.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.digests.MD4Digest;
-
-/**
- * standard vector test for MD4 from RFC 1320.
- */
-public class MD4DigestTest
-    extends DigestTest
-{
-    static private String[] messages =
-    {
-        "",
-        "a",
-        "abc",
-        "12345678901234567890123456789012345678901234567890123456789012345678901234567890"
-    };
-    
-    static private String[] digests =
-    {
-        "31d6cfe0d16ae931b73c59d7e0c089c0",
-        "bde52cb31de33e46245e05fbdbd6fb24",
-        "a448017aaf21d8525fc10ae87aa6729d",
-        "e33b4ddc9c38f2199c3e7b164fcc0536"
-    };
-
-    MD4DigestTest()
-    {
-        super(new MD4Digest(), messages, digests);
-    }
-
-    protected Digest cloneDigest(Digest digest)
-    {
-        return new MD4Digest((MD4Digest)digest);
-    }
-    
-    public static void main(
-        String[]    args)
-    {
-        runTest(new MD4DigestTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/MD5DigestTest.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/MD5DigestTest.java
deleted file mode 100644
index ab9cab2..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/MD5DigestTest.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.digests.MD5Digest;
-
-/**
- * standard vector test for MD5 from "Handbook of Applied Cryptography", page 345.
- */
-public class MD5DigestTest
-    extends DigestTest
-{
-    static final String[] messages =
-    {
-        "",
-        "a",
-        "abc",
-        "abcdefghijklmnopqrstuvwxyz"
-    };
-    
-    static final String[] digests =
-    {
-        "d41d8cd98f00b204e9800998ecf8427e",
-        "0cc175b9c0f1b6a831c399e269772661",
-        "900150983cd24fb0d6963f7d28e17f72",
-        "c3fcd3d76192e4007dfb496cca67e13b"
-    };
-
-    MD5DigestTest()
-    {
-        super(new MD5Digest(), messages, digests);
-    }
-
-    protected Digest cloneDigest(Digest digest)
-    {
-        return new MD5Digest((MD5Digest)digest);
-    }
-    
-    public static void main(
-        String[]    args)
-    {
-        runTest(new MD5DigestTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/MD5HMacTest.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/MD5HMacTest.java
deleted file mode 100644
index cfce1d9..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/MD5HMacTest.java
+++ /dev/null
@@ -1,98 +0,0 @@
-
-package org.bouncycastle.crypto.test;
-
-import org.bouncycastle.crypto.digests.MD5Digest;
-import org.bouncycastle.crypto.macs.HMac;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-
-/**
- * MD5 HMac Test, test vectors from RFC 2202
- */
-public class MD5HMacTest
-    extends SimpleTest
-{
-    final static String[] keys = {
-        "0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b",
-        "4a656665",
-        "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
-        "0102030405060708090a0b0c0d0e0f10111213141516171819",
-        "0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c",
-        "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
-        "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
-    };
-
-    final static String[] digests = {
-        "9294727a3638bb1c13f48ef8158bfc9d",
-        "750c783e6ab0b503eaa86e310a5db738",
-        "56be34521d144c88dbb8c733f0e8b3f6",
-        "697eaf0aca3a3aea3a75164746ffaa79",
-        "56461ef2342edc00f9bab995690efd4c",
-        "6b1ab7fe4bd7bf8f0b62e6ce61b9d0cd",
-        "6f630fad67cda0ee1fb1f562db3aa53e"
-    };
-
-    final static String[] messages = {
-        "Hi There",
-        "what do ya want for nothing?",
-        "0xdddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd",
-        "0xcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcd",
-        "Test With Truncation",
-        "Test Using Larger Than Block-Size Key - Hash Key First",
-        "Test Using Larger Than Block-Size Key and Larger Than One Block-Size Data"
-    };
-        
-    public String getName()
-    {
-        return "MD5HMac";
-    }
-
-    public void performTest()
-    {
-        HMac hmac = new HMac(new MD5Digest());
-        byte[] resBuf = new byte[hmac.getMacSize()];
-
-        for (int i = 0; i < messages.length; i++)
-        {
-            byte[] m = messages[i].getBytes();
-            if (messages[i].startsWith("0x"))
-            {
-                m = Hex.decode(messages[i].substring(2));
-            }
-            hmac.init(new KeyParameter(Hex.decode(keys[i])));
-            hmac.update(m, 0, m.length);
-            hmac.doFinal(resBuf, 0);
-
-            if (!areEqual(resBuf, Hex.decode(digests[i])))
-            {
-                fail("Vector " + i + " failed");
-            }
-        }
-
-        // test reset
-        int vector = 0; // vector used for test
-        byte[] m = messages[vector].getBytes();
-        if (messages[vector].startsWith("0x"))
-        {
-            m = Hex.decode(messages[vector].substring(2));
-        }
-        hmac.init(new KeyParameter(Hex.decode(keys[vector])));
-        hmac.update(m, 0, m.length);
-        hmac.doFinal(resBuf, 0);
-        hmac.reset();
-        hmac.update(m, 0, m.length);
-        hmac.doFinal(resBuf, 0);
-
-        if (!areEqual(resBuf, Hex.decode(digests[vector])))
-        {
-            fail("Reset with vector " + vector + " failed");
-        }
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        runTest(new MD5HMacTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/MGF1GeneratorTest.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/MGF1GeneratorTest.java
deleted file mode 100644
index e7e99fe..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/MGF1GeneratorTest.java
+++ /dev/null
@@ -1,88 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import org.bouncycastle.crypto.DataLengthException;
-import org.bouncycastle.crypto.DerivationFunction;
-import org.bouncycastle.crypto.digests.SHA1Digest;
-import org.bouncycastle.crypto.digests.SHA256Digest;
-import org.bouncycastle.crypto.digests.ShortenedDigest;
-import org.bouncycastle.crypto.generators.MGF1BytesGenerator;
-import org.bouncycastle.crypto.params.MGFParameters;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-
-/**
- * MGF1 tests - vectors from ISO 18033 for KDF1 (equivalent).
- */
-public class MGF1GeneratorTest
-    extends SimpleTest
-{
-    private byte[] seed1 = Hex.decode("d6e168c5f256a2dcff7ef12facd390f393c7a88d");
-    private byte[] mask1 = Hex.decode(
-            "0742ba966813af75536bb6149cc44fc256fd6406df79665bc31dc5"
-          + "a62f70535e52c53015b9d37d412ff3c1193439599e1b628774c50d9c"
-          + "cb78d82c425e4521ee47b8c36a4bcffe8b8112a89312fc04420a39de"
-          + "99223890e74ce10378bc515a212b97b8a6447ba6a8870278");
-
-    private byte[] seed2 = Hex.decode(
-             "032e45326fa859a72ec235acff929b15d1372e30b207255f0611b8f785d7643741" 
-           + "52e0ac009e509e7ba30cd2f1778e113b64e135cf4e2292c75efe5288edfda4");
-    private byte[] mask2 = Hex.decode(
-             "5f8de105b5e96b2e490ddecbd147dd1def7e3b8e0e6a26eb7b956ccb8b3bdc1ca9" 
-           + "75bc57c3989e8fbad31a224655d800c46954840ff32052cdf0d640562bdfadfa263c" 
-           + "fccf3c52b29f2af4a1869959bc77f854cf15bd7a25192985a842dbff8e13efee5b7e" 
-           + "7e55bbe4d389647c686a9a9ab3fb889b2d7767d3837eea4e0a2f04");
-    
-    private byte[] seed3 = seed2;
-    private byte[] mask3= Hex.decode(
-             "09e2decf2a6e1666c2f6071ff4298305e2643fd510a2403db42a8743cb989de86e"
-           + "668d168cbe604611ac179f819a3d18412e9eb45668f2923c087c12fee0c5a0d2a8aa"
-           + "70185401fbbd99379ec76c663e875a60b4aacb1319fa11c3365a8b79a44669f26fb5"
-           + "55c80391847b05eca1cb5cf8c2d531448d33fbaca19f6410ee1fcb");
-    
-    public void performTest()
-    {
-        checkMask(1, new MGF1BytesGenerator(new ShortenedDigest(new SHA256Digest(), 20)), seed1, mask1);
-        checkMask(2, new MGF1BytesGenerator(new SHA1Digest()), seed2, mask2);
-        checkMask(3, new MGF1BytesGenerator(new ShortenedDigest(new SHA256Digest(), 20)), seed3, mask3);
-        
-        try
-        {
-            new MGF1BytesGenerator(new SHA1Digest()).generateBytes(new byte[10], 0, 20);
-            
-            fail("short input array not caught");
-        }
-        catch (DataLengthException e)
-        {
-            // expected 
-        }
-    }
-    
-    private void checkMask(
-        int                count,
-        DerivationFunction kdf,
-        byte[]             seed,
-        byte[]             result)
-    {
-        byte[]             data = new byte[result.length];
-        
-        kdf.init(new MGFParameters(seed));
-        
-        kdf.generateBytes(data, 0, data.length);
-        
-        if (!areEqual(result, data))
-        {
-            fail("MGF1 failed generator test " + count);
-        }
-    }
-
-    public String getName()
-    {
-        return "MGF1";
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        runTest(new MGF1GeneratorTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/MacTest.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/MacTest.java
deleted file mode 100644
index 5b05a60..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/MacTest.java
+++ /dev/null
@@ -1,181 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import org.bouncycastle.crypto.BlockCipher;
-import org.bouncycastle.crypto.Mac;
-import org.bouncycastle.crypto.engines.DESEngine;
-import org.bouncycastle.crypto.macs.CBCBlockCipherMac;
-import org.bouncycastle.crypto.macs.CFBBlockCipherMac;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.crypto.params.ParametersWithIV;
-import org.bouncycastle.crypto.paddings.PKCS7Padding;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-
-/**
- * MAC tester - vectors from 
- * <a href=http://www.itl.nist.gov/fipspubs/fip81.htm>FIP 81</a> and 
- * <a href=http://www.itl.nist.gov/fipspubs/fip113.htm>FIP 113</a>.
- */
-public class MacTest
-    extends SimpleTest
-{
-    static byte[]   keyBytes = Hex.decode("0123456789abcdef");
-    static byte[]   ivBytes = Hex.decode("1234567890abcdef");
-
-    static byte[]   input1 = Hex.decode("37363534333231204e6f77206973207468652074696d6520666f7220");
-
-    static byte[]   output1 = Hex.decode("f1d30f68");
-    static byte[]   output2 = Hex.decode("58d2e77e");
-    static byte[]   output3 = Hex.decode("cd647403");
-
-    //
-    // these aren't NIST vectors, just for regression testing.
-    //
-    static byte[]   input2 = Hex.decode("3736353433323120");
-
-    static byte[]   output4 = Hex.decode("3af549c9");
-    static byte[]   output5 = Hex.decode("188fbdd5");
-    static byte[]   output6 = Hex.decode("7045eecd");
-
-    public MacTest()
-    {
-    }
-
-    public void performTest()
-    {
-        KeyParameter        key = new KeyParameter(keyBytes);
-        BlockCipher         cipher = new DESEngine();
-        Mac                 mac = new CBCBlockCipherMac(cipher);
-
-        //
-        // standard DAC - zero IV
-        //
-        mac.init(key);
-
-        mac.update(input1, 0, input1.length);
-
-        byte[]  out = new byte[4];
-
-        mac.doFinal(out, 0);
-
-        if (!areEqual(out, output1))
-        {
-            fail("Failed - expected " + new String(Hex.encode(output1)) + " got " + new String(Hex.encode(out)));
-        }
-        
-        //
-        // mac with IV.
-        //
-        ParametersWithIV    param = new ParametersWithIV(key, ivBytes);
-
-        mac.init(param);
-
-        mac.update(input1, 0, input1.length);
-
-        out = new byte[4];
-
-        mac.doFinal(out, 0);
-
-        if (!areEqual(out, output2))
-        {
-            fail("Failed - expected " + new String(Hex.encode(output2)) + " got " + new String(Hex.encode(out)));
-        }
-        
-        //
-        // CFB mac with IV - 8 bit CFB mode
-        //
-        param = new ParametersWithIV(key, ivBytes);
-
-        mac = new CFBBlockCipherMac(cipher);
-
-        mac.init(param);
-
-        mac.update(input1, 0, input1.length);
-
-        out = new byte[4];
-
-        mac.doFinal(out, 0);
-
-        if (!areEqual(out, output3))
-        {
-            fail("Failed - expected " + new String(Hex.encode(output3)) + " got " + new String(Hex.encode(out)));
-        }
-
-        //
-        // word aligned data - zero IV
-        //
-        mac.init(key);
-
-        mac.update(input2, 0, input2.length);
-
-        out = new byte[4];
-
-        mac.doFinal(out, 0);
-
-        if (!areEqual(out, output4))
-        {
-            fail("Failed - expected " + new String(Hex.encode(output4)) + " got " + new String(Hex.encode(out)));
-        }
-
-        //
-        // word aligned data - zero IV - CBC padding
-        //
-        mac = new CBCBlockCipherMac(cipher, new PKCS7Padding());
-
-        mac.init(key);
-
-        mac.update(input2, 0, input2.length);
-
-        out = new byte[4];
-
-        mac.doFinal(out, 0);
-
-        if (!areEqual(out, output5))
-        {
-            fail("Failed - expected " + new String(Hex.encode(output5)) + " got " + new String(Hex.encode(out)));
-        }
-
-        //
-        // non-word aligned data - zero IV - CBC padding
-        //
-        mac.reset();
-
-        mac.update(input1, 0, input1.length);
-
-        out = new byte[4];
-
-        mac.doFinal(out, 0);
-
-        if (!areEqual(out, output6))
-        {
-            fail("Failed - expected " + new String(Hex.encode(output6)) + " got " + new String(Hex.encode(out)));
-        }
-
-        //
-        // non-word aligned data - zero IV - CBC padding
-        //
-        mac.init(key);
-
-        mac.update(input1, 0, input1.length);
-
-        out = new byte[4];
-
-        mac.doFinal(out, 0);
-
-        if (!areEqual(out, output6))
-        {
-            fail("Failed - expected " + new String(Hex.encode(output6)) + " got " + new String(Hex.encode(out)));
-        }
-    }
-
-    public String getName()
-    {
-        return "Mac";
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        runTest(new MacTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/ModeTest.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/ModeTest.java
deleted file mode 100644
index 6619b65..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/ModeTest.java
+++ /dev/null
@@ -1,115 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import org.bouncycastle.crypto.BlockCipher;
-import org.bouncycastle.crypto.engines.DESEngine;
-import org.bouncycastle.crypto.modes.CFBBlockCipher;
-import org.bouncycastle.crypto.modes.OFBBlockCipher;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.crypto.params.ParametersWithIV;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTestResult;
-import org.bouncycastle.util.test.Test;
-import org.bouncycastle.util.test.TestResult;
-
-/**
- * CFB/OFB Mode test of IV padding.
- */
-public class ModeTest
-    implements Test
-{
-    public ModeTest()
-    {
-    }
-
-    private boolean isEqualTo(
-        byte[]  a,
-        byte[]  b)
-    {
-        for (int i = 0; i != a.length; i++)
-        {
-            if (a[i] != b[i])
-            {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    public TestResult perform()
-    {
-        KeyParameter    key = new KeyParameter(Hex.decode("0011223344556677"));
-        byte[]          input = Hex.decode("4e6f7720");
-        byte[]          out1 = new byte[4];
-        byte[]          out2 = new byte[4];
-
-
-        BlockCipher ofb = new OFBBlockCipher(new DESEngine(), 32);
-
-        ofb.init(true, new ParametersWithIV(key, Hex.decode("1122334455667788")));
-
-        ofb.processBlock(input, 0, out1, 0);
-
-        ofb.init(false, new ParametersWithIV(key, Hex.decode("1122334455667788")));
-        ofb.processBlock(out1, 0, out2, 0);
-
-        if (!isEqualTo(out2, input))
-        {
-            return new SimpleTestResult(false, getName() + ": test 1 - in != out");
-        }
-
-        ofb.init(true, new ParametersWithIV(key, Hex.decode("11223344")));
-
-        ofb.processBlock(input, 0, out1, 0);
-
-        ofb.init(false, new ParametersWithIV(key, Hex.decode("0000000011223344")));
-        ofb.processBlock(out1, 0, out2, 0);
-
-        if (!isEqualTo(out2, input))
-        {
-            return new SimpleTestResult(false, getName() + ": test 2 - in != out");
-        }
-
-        BlockCipher cfb = new CFBBlockCipher(new DESEngine(), 32);
-
-        cfb.init(true, new ParametersWithIV(key, Hex.decode("1122334455667788")));
-
-        cfb.processBlock(input, 0, out1, 0);
-
-        cfb.init(false, new ParametersWithIV(key, Hex.decode("1122334455667788")));
-        cfb.processBlock(out1, 0, out2, 0);
-
-        if (!isEqualTo(out2, input))
-        {
-            return new SimpleTestResult(false, getName() + ": test 3 - in != out");
-        }
-
-        cfb.init(true, new ParametersWithIV(key, Hex.decode("11223344")));
-
-        cfb.processBlock(input, 0, out1, 0);
-
-        cfb.init(false, new ParametersWithIV(key, Hex.decode("0000000011223344")));
-        cfb.processBlock(out1, 0, out2, 0);
-
-        if (!isEqualTo(out2, input))
-        {
-            return new SimpleTestResult(false, getName() + ": test 4 - in != out");
-        }
-
-        return new SimpleTestResult(true, getName() + ": Okay");
-    }
-
-    public String getName()
-    {
-        return "ModeTest";
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        ModeTest    test = new ModeTest();
-        TestResult result = test.perform();
-
-        System.out.println(result);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/NISTCTSTest.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/NISTCTSTest.java
deleted file mode 100644
index 8e3df1c..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/NISTCTSTest.java
+++ /dev/null
@@ -1,160 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import org.bouncycastle.crypto.BlockCipher;
-import org.bouncycastle.crypto.BufferedBlockCipher;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.DataLengthException;
-import org.bouncycastle.crypto.InvalidCipherTextException;
-import org.bouncycastle.crypto.engines.AESEngine;
-import org.bouncycastle.crypto.modes.NISTCTSBlockCipher;
-import org.bouncycastle.crypto.modes.SICBlockCipher;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.crypto.params.ParametersWithIV;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-
-/**
- * CTS tester
- */
-public class NISTCTSTest
-    extends SimpleTest
-{
-    private static KeyParameter key = new KeyParameter(Hex.decode("000102030405060708090a0b0c0d0e0f"));
-    private static byte[] iv = Hex.decode("101112131415161718191a1b1c1d1e1f");
-
-    private static byte[] singleBlock = Hex.decode("4920616d206f6e6520626c6f636b2e2e");
-    private static byte[] singleOut = Hex.decode("8aad2098847a2d74ac87de22745d2537");
-
-    private static byte[] twoBlock = Hex.decode("4920616d206174206c656173742074776f20626c6f636b73206c6f6e672e2e2e");
-
-    private static byte[] cs1TwoBlockOut = Hex.decode("3f07fd5816c3b96349eb9f6a074909d67237eb8aa9a7467b8a388c61d0e8f35a");
-    private static byte[] cs2TwoBlockOut = Hex.decode("3f07fd5816c3b96349eb9f6a074909d67237eb8aa9a7467b8a388c61d0e8f35a");
-    private static byte[] cs3TwoBlockOut = Hex.decode("7237eb8aa9a7467b8a388c61d0e8f35a3f07fd5816c3b96349eb9f6a074909d6");
-
-    private static byte[] notQuiteTwo = Hex.decode("4920616d206e6f742071756974652074776f2e2e2e");
-
-    private static byte[] cs1NotQuiteTwoBlockOut = Hex.decode("22ecf2ac77f098097ca69b72e3a46e9ca21bb5ebbc");
-    private static byte[] cs2NotQuiteTwoBlockOut = Hex.decode("f098097ca69b72e3a46e9ca21bb5ebbc22ecf2ac77");
-    private static byte[] cs3NotQuiteTwoBlockOut = Hex.decode("f098097ca69b72e3a46e9ca21bb5ebbc22ecf2ac77");
-
-    static byte[]   in1 = Hex.decode("4e6f7720697320746865207420");
-    static byte[]   in2 = Hex.decode("000102030405060708090a0b0c0d0e0fff0102030405060708090a0b0c0d0e0f0aaa");
-    static byte[]   out1 = Hex.decode("9952f131588465033fa40e8a98");
-    static byte[]   out2 = Hex.decode("358f84d01eb42988dc34efb994");
-    static byte[]   out3 = Hex.decode("170171cfad3f04530c509b0c1f0be0aefbd45a8e3755a873bff5ea198504b71683c6");
-    
-    private void testCTS(
-        int                 id,
-        int                 type,
-        BlockCipher         cipher,
-        CipherParameters    params,
-        byte[]              input,
-        byte[]              output)
-        throws Exception
-    {
-        byte[]                  out = new byte[input.length];
-        BufferedBlockCipher     engine = new NISTCTSBlockCipher(type, cipher);
-
-        engine.init(true, params);
-
-        int len = engine.processBytes(input, 0, input.length, out, 0);
-
-        engine.doFinal(out, len);
-
-        if (!areEqual(output, out))
-        {
-            fail(id + " failed encryption expected " + new String(Hex.encode(output)) + " got " + new String(Hex.encode(out)));
-        }
-
-        engine.init(false, params);
-
-        len = engine.processBytes(output, 0, output.length, out, 0);
-
-        engine.doFinal(out, len);
-
-        if (!areEqual(input, out))
-        {
-            fail(id + " failed decryption expected " + new String(Hex.encode(input)) + " got " + new String(Hex.encode(out)));
-        }
-    }
-
-    private void testExceptions() throws InvalidCipherTextException
-    {
-        BufferedBlockCipher engine = new NISTCTSBlockCipher(NISTCTSBlockCipher.CS1, new AESEngine());
-        CipherParameters params = new KeyParameter(new byte[engine.getBlockSize()]);
-        engine.init(true, params);
-
-        byte[] out = new byte[engine.getOutputSize(engine.getBlockSize())];
-        
-        engine.processBytes(new byte[engine.getBlockSize() - 1], 0, engine.getBlockSize() - 1, out, 0);
-        try 
-        {
-            engine.doFinal(out, 0);
-            fail("Expected CTS encrypt error on < 1 block input");
-        } catch(DataLengthException e)
-        {
-            // Expected
-        }
-
-        engine.init(true, params);
-        engine.processBytes(new byte[engine.getBlockSize()], 0, engine.getBlockSize(), out, 0);
-        try 
-        {
-            engine.doFinal(out, 0);
-        } catch(DataLengthException e)
-        {
-            fail("Unexpected CTS encrypt error on == 1 block input");
-        }
-
-        engine.init(false, params);
-        engine.processBytes(new byte[engine.getBlockSize() - 1], 0, engine.getBlockSize() - 1, out, 0);
-        try 
-        {
-            engine.doFinal(out, 0);
-            fail("Expected CTS decrypt error on < 1 block input");
-        } catch(DataLengthException e)
-        {
-            // Expected
-        }
-
-        engine.init(false, params);
-        engine.processBytes(new byte[engine.getBlockSize()], 0, engine.getBlockSize(), out, 0);
-        try 
-        {
-            engine.doFinal(out, 0);
-        } catch(DataLengthException e)
-        {
-            fail("Unexpected CTS decrypt error on == 1 block input");
-        }
-
-    }
-
-    public String getName()
-    {
-        return "CTS";
-    }
-
-    public void performTest() 
-        throws Exception
-    {
-        testCTS(1, NISTCTSBlockCipher.CS1, new AESEngine(), new ParametersWithIV(key, iv), singleBlock, singleOut);
-        testCTS(2, NISTCTSBlockCipher.CS2, new AESEngine(), new ParametersWithIV(key, iv), singleBlock, singleOut);
-        testCTS(3, NISTCTSBlockCipher.CS3, new AESEngine(), new ParametersWithIV(key, iv), singleBlock, singleOut);
-
-        testCTS(4, NISTCTSBlockCipher.CS1, new AESEngine(), new ParametersWithIV(key, iv), twoBlock, cs1TwoBlockOut);
-        testCTS(5, NISTCTSBlockCipher.CS2, new AESEngine(), new ParametersWithIV(key, iv), twoBlock, cs2TwoBlockOut);
-        testCTS(6, NISTCTSBlockCipher.CS3, new AESEngine(), new ParametersWithIV(key, iv), twoBlock, cs3TwoBlockOut);
-
-        testCTS(7, NISTCTSBlockCipher.CS1, new AESEngine(), new ParametersWithIV(key, iv), notQuiteTwo, cs1NotQuiteTwoBlockOut);
-        testCTS(8, NISTCTSBlockCipher.CS2, new AESEngine(), new ParametersWithIV(key, iv), notQuiteTwo, cs2NotQuiteTwoBlockOut);
-        testCTS(9, NISTCTSBlockCipher.CS3, new AESEngine(), new ParametersWithIV(key, iv), notQuiteTwo, cs3NotQuiteTwoBlockOut);
-
-        testExceptions();
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        runTest(new NISTCTSTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/NaccacheSternTest.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/NaccacheSternTest.java
deleted file mode 100644
index 9055855..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/NaccacheSternTest.java
+++ /dev/null
@@ -1,354 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import java.math.BigInteger;
-import java.security.SecureRandom;
-import java.util.Vector;
-
-import org.bouncycastle.crypto.AsymmetricCipherKeyPair;
-import org.bouncycastle.crypto.InvalidCipherTextException;
-import org.bouncycastle.crypto.engines.NaccacheSternEngine;
-import org.bouncycastle.crypto.generators.NaccacheSternKeyPairGenerator;
-import org.bouncycastle.crypto.params.NaccacheSternKeyGenerationParameters;
-import org.bouncycastle.crypto.params.NaccacheSternKeyParameters;
-import org.bouncycastle.crypto.params.NaccacheSternPrivateKeyParameters;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-
-/**
- * Test case for NaccacheStern cipher. For details on this cipher, please see
- * 
- * http://www.gemplus.com/smart/rd/publications/pdf/NS98pkcs.pdf
- *
- * Performs the following tests: 
- *  <ul>
- *  <li> Toy example from the NaccacheSternPaper </li>
- *  <li> 768 bit test with text "Now is the time for all good men." (ripped from RSA test) and
- *     the same test with the first byte replaced by 0xFF </li>
- *  <li> 1024 bit test analog to 768 bit test </li>
- *  </ul>
- */
-public class NaccacheSternTest
-    extends SimpleTest
-{
-    static final boolean debug = false;
-
-    static final NaccacheSternEngine cryptEng = new NaccacheSternEngine();
-
-    static final NaccacheSternEngine decryptEng = new NaccacheSternEngine();
-
-    static
-    {
-        cryptEng.setDebug(debug);
-        decryptEng.setDebug(debug);
-    }
-
-    // Values from NaccacheStern paper
-    static final BigInteger a = BigInteger.valueOf(101);
-
-    static final BigInteger u1 = BigInteger.valueOf(3);
-
-    static final BigInteger u2 = BigInteger.valueOf(5);
-
-    static final BigInteger u3 = BigInteger.valueOf(7);
-
-    static final BigInteger b = BigInteger.valueOf(191);
-
-    static final BigInteger v1 = BigInteger.valueOf(11);
-
-    static final BigInteger v2 = BigInteger.valueOf(13);
-
-    static final BigInteger v3 = BigInteger.valueOf(17);
-
-    static final BigInteger ONE = BigInteger.valueOf(1);
-
-    static final BigInteger TWO = BigInteger.valueOf(2);
-
-    static final BigInteger sigma = u1.multiply(u2).multiply(u3).multiply(v1)
-            .multiply(v2).multiply(v3);
-
-    static final BigInteger p = TWO.multiply(a).multiply(u1).multiply(u2)
-            .multiply(u3).add(ONE);
-
-    static final BigInteger q = TWO.multiply(b).multiply(v1).multiply(v2)
-            .multiply(v3).add(ONE);
-
-    static final BigInteger n = p.multiply(q);
-
-    static final BigInteger phi_n = p.subtract(ONE).multiply(q.subtract(ONE));
-
-    static final BigInteger g = BigInteger.valueOf(131);
-
-    static final Vector smallPrimes = new Vector();
-
-    // static final BigInteger paperTest = BigInteger.valueOf(202);
-
-    static final String input = "4e6f77206973207468652074696d6520666f7220616c6c20676f6f64206d656e";
-
-    static final BigInteger paperTest = BigInteger.valueOf(202);
-
-    //
-    // to check that we handling byte extension by big number correctly.
-    //
-    static final String edgeInput = "ff6f77206973207468652074696d6520666f7220616c6c20676f6f64206d656e";
-
-    public String getName()
-    {
-        return "NaccacheStern";
-    }
-
-    public void performTest()
-    {
-        // Test with given key from NaccacheSternPaper (totally insecure)
-
-        // First the Parameters from the NaccacheStern Paper
-        // (see http://www.gemplus.com/smart/rd/publications/pdf/NS98pkcs.pdf )
-
-        smallPrimes.addElement(u1);
-        smallPrimes.addElement(u2);
-        smallPrimes.addElement(u3);
-        smallPrimes.addElement(v1);
-        smallPrimes.addElement(v2);
-        smallPrimes.addElement(v3);
-
-        NaccacheSternKeyParameters pubParameters = new NaccacheSternKeyParameters(false, g, n, sigma.bitLength());
-
-        NaccacheSternPrivateKeyParameters privParameters = new NaccacheSternPrivateKeyParameters(g, n, sigma.bitLength(), smallPrimes, phi_n);
-
-        AsymmetricCipherKeyPair pair = new AsymmetricCipherKeyPair(pubParameters, privParameters);
-
-        // Initialize Engines with KeyPair
-
-        if (debug)
-        {
-            System.out.println("initializing encryption engine");
-        }
-        cryptEng.init(true, pair.getPublic());
-
-        if (debug)
-        {
-            System.out.println("initializing decryption engine");
-        }
-        decryptEng.init(false, pair.getPrivate());
-
-        byte[] data = paperTest.toByteArray();
-
-        if (!new BigInteger(data).equals(new BigInteger(enDeCrypt(data))))
-        {
-            fail("failed NaccacheStern paper test");
-        }
-
-        //
-        // key generation test
-        //
-
-        // 
-        // 768 Bit test
-        //
-
-        if (debug)
-        {
-            System.out.println();
-            System.out.println("768 Bit TEST");
-        }
-
-        // specify key generation parameters
-        NaccacheSternKeyGenerationParameters genParam
-            = new NaccacheSternKeyGenerationParameters(new SecureRandom(), 768, 8, 30, debug);
-
-        // Initialize Key generator and generate key pair
-        NaccacheSternKeyPairGenerator pGen = new NaccacheSternKeyPairGenerator();
-        pGen.init(genParam);
-
-        pair = pGen.generateKeyPair();
-
-        if (((NaccacheSternKeyParameters)pair.getPublic()).getModulus().bitLength() < 768)
-        {
-            System.out.println("FAILED: key size is <786 bit, exactly "
-                            + ((NaccacheSternKeyParameters)pair.getPublic()).getModulus().bitLength() + " bit");
-            fail("failed key generation (768) length test");
-        }
-
-        // Initialize Engines with KeyPair
-
-        if (debug)
-        {
-            System.out.println("initializing " + genParam.getStrength() + " bit encryption engine");
-        }
-        cryptEng.init(true, pair.getPublic());
-
-        if (debug)
-        {
-            System.out.println("initializing " + genParam.getStrength() + " bit decryption engine");
-        }
-        decryptEng.init(false, pair.getPrivate());
-
-        // Basic data input
-        data = Hex.decode(input);
-
-        if (!new BigInteger(1, data).equals(new BigInteger(1, enDeCrypt(data))))
-        {
-            fail("failed encryption decryption (" + genParam.getStrength() + ") basic test");
-        }
-
-        // Data starting with FF byte (would be interpreted as negative
-        // BigInteger)
-
-        data = Hex.decode(edgeInput);
-
-        if (!new BigInteger(1, data).equals(new BigInteger(1, enDeCrypt(data))))
-        {
-            fail("failed encryption decryption (" + genParam.getStrength() + ") edgeInput test");
-        }
-
-        // 
-        // 1024 Bit Test
-        // 
-/*
-        if (debug)
-        {
-            System.out.println();
-            System.out.println("1024 Bit TEST");
-        }
-
-        // specify key generation parameters
-        genParam = new NaccacheSternKeyGenerationParameters(new SecureRandom(), 1024, 8, 40);
-
-        pGen.init(genParam);
-        pair = pGen.generateKeyPair();
-
-        if (((NaccacheSternKeyParameters)pair.getPublic()).getModulus().bitLength() < 1024)
-        {
-            if (debug)
-            {
-                System.out.println("FAILED: key size is <1024 bit, exactly "
-                                + ((NaccacheSternKeyParameters)pair.getPublic()).getModulus().bitLength() + " bit");
-            }
-            fail("failed key generation (1024) length test");
-        }
-
-        // Initialize Engines with KeyPair
-
-        if (debug)
-        {
-            System.out.println("initializing " + genParam.getStrength() + " bit encryption engine");
-        }
-        cryptEng.init(true, pair.getPublic());
-
-        if (debug)
-        {
-            System.out.println("initializing " + genParam.getStrength() + " bit decryption engine");
-        }
-        decryptEng.init(false, pair.getPrivate());
-
-        if (debug)
-        {
-            System.out.println("Data is           " + new BigInteger(1, data));
-        }
-
-        // Basic data input
-        data = Hex.decode(input);
-
-        if (!new BigInteger(1, data).equals(new BigInteger(1, enDeCrypt(data))))
-        {
-            fail("failed encryption decryption (" + genParam.getStrength() + ") basic test");
-        }
-
-        // Data starting with FF byte (would be interpreted as negative
-        // BigInteger)
-
-        data = Hex.decode(edgeInput);
-
-        if (!new BigInteger(1, data).equals(new BigInteger(1, enDeCrypt(data))))
-        {
-            fail("failed encryption decryption (" + genParam.getStrength() + ") edgeInput test");
-        }
-*/
-        // END OF TEST CASE
-
-        try
-        {
-            new NaccacheSternEngine().processBlock(new byte[]{ 1 }, 0, 1);
-            fail("failed initialisation check");
-        }
-        catch (IllegalStateException e)
-        {
-            // expected
-        }
-        catch (InvalidCipherTextException e)
-        {
-            fail("failed initialisation check");
-        }
-
-        if (debug)
-        {
-            System.out.println("All tests successful");
-        }
-    }
-
-    private byte[] enDeCrypt(byte[] input)
-    {
-
-        // create work array
-        byte[] data = new byte[input.length];
-        System.arraycopy(input, 0, data, 0, data.length);
-
-        // Perform encryption like in the paper from Naccache-Stern
-        if (debug)
-        {
-            System.out.println("encrypting data. Data representation\n"
-            //                    + "As String:.... " + new String(data) + "\n"
-                            + "As BigInteger: " + new BigInteger(1, data));
-            System.out.println("data length is " + data.length);
-        }
-
-        try
-        {
-            data = cryptEng.processData(data);
-        }
-        catch (InvalidCipherTextException e)
-        {
-            if (debug)
-            {
-                System.out.println("failed - exception " + e.toString() + "\n" + e.getMessage());
-            }
-            fail("failed - exception " + e.toString() + "\n" + e.getMessage());
-        }
-
-        if (debug)
-        {
-            System.out.println("enrypted data representation\n"
-            //                    + "As String:.... " + new String(data) + "\n"
-                            + "As BigInteger: " + new BigInteger(1, data));
-            System.out.println("data length is " + data.length);
-        }
-
-        try
-        {
-            data = decryptEng.processData(data);
-        }
-        catch (InvalidCipherTextException e)
-        {
-            if (debug)
-            {
-                System.out.println("failed - exception " + e.toString() + "\n" + e.getMessage());
-            }
-            fail("failed - exception " + e.toString() + "\n" + e.getMessage());
-        }
-
-        if (debug)
-        {
-            System.out.println("decrypted data representation\n"
-            //                    + "As String:.... " + new String(data) + "\n"
-                            + "As BigInteger: " + new BigInteger(1, data));
-            System.out.println("data length is " + data.length);
-        }
-
-        return data;
-
-    }
-
-    public static void main(String[] args)
-    {
-        runTest(new NaccacheSternTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/NoekeonTest.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/NoekeonTest.java
deleted file mode 100644
index ebebbd6..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/NoekeonTest.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import org.bouncycastle.crypto.engines.NoekeonEngine;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-
-/**
- * Noekeon tester
- */
-public class NoekeonTest
-    extends CipherTest
-{
-    static SimpleTest[]  tests =
-    {
-        new BlockCipherVectorTest(0, new NoekeonEngine(),
-            new KeyParameter(Hex.decode("00000000000000000000000000000000")),
-            "00000000000000000000000000000000",
-            "b1656851699e29fa24b70148503d2dfc"),
-        new BlockCipherVectorTest(1, new NoekeonEngine(),
-            new KeyParameter(Hex.decode("ffffffffffffffffffffffffffffffff")),
-            "ffffffffffffffffffffffffffffffff",
-            "2a78421b87c7d0924f26113f1d1349b2"),
-        new BlockCipherVectorTest(2, new NoekeonEngine(),
-            new KeyParameter(Hex.decode("b1656851699e29fa24b70148503d2dfc")),
-            "2a78421b87c7d0924f26113f1d1349b2",
-            "e2f687e07b75660ffc372233bc47532c")
-    };
-
-    NoekeonTest()
-    {
-        super(tests, new NoekeonEngine(), new KeyParameter(new byte[16]));
-    }
-
-    public String getName()
-    {
-        return "Noekeon";
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        runTest(new NoekeonTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/NonMemoableDigestTest.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/NonMemoableDigestTest.java
deleted file mode 100644
index d332393..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/NonMemoableDigestTest.java
+++ /dev/null
@@ -1,112 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import org.bouncycastle.crypto.digests.NonMemoableDigest;
-import org.bouncycastle.crypto.digests.SHA1Digest;
-import org.bouncycastle.crypto.macs.HMac;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTestResult;
-import org.bouncycastle.util.test.Test;
-import org.bouncycastle.util.test.TestResult;
-
-/**
- * SHA1 HMac Test, test vectors from RFC 2202
- */
-public class NonMemoableDigestTest
-    implements Test
-{
-    final static String[] keys = {
-        "0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b",
-        "4a656665",
-        "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
-        "0102030405060708090a0b0c0d0e0f10111213141516171819",
-        "0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c",
-        "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
-        "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
-    };
-
-    final static String[] digests = {
-        "b617318655057264e28bc0b6fb378c8ef146be00",
-        "effcdf6ae5eb2fa2d27416d5f184df9c259a7c79",
-        "125d7342b9ac11cd91a39af48aa17b4f63f175d3",
-        "4c9007f4026250c6bc8414f9bf50c86c2d7235da",
-        "4c1a03424b55e07fe7f27be1d58bb9324a9a5a04",
-        "aa4ae5e15272d00e95705637ce8a3b55ed402112",
-        "e8e99d0f45237d786d6bbaa7965c7808bbff1a91",
-        "4c1a03424b55e07fe7f27be1d58bb9324a9a5a04",
-        "aa4ae5e15272d00e95705637ce8a3b55ed402112",
-        "e8e99d0f45237d786d6bbaa7965c7808bbff1a91"
-    };
-
-    final static String[] messages = {
-        "Hi There",
-        "what do ya want for nothing?",
-        "0xdddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd",
-        "0xcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcd",
-        "Test With Truncation",
-        "Test Using Larger Than Block-Size Key - Hash Key First",
-        "Test Using Larger Than Block-Size Key and Larger Than One Block-Size Data"
-    };
-        
-    public String getName()
-    {
-        return "NonMemoableDigest";
-    }
-
-    public TestResult perform()
-    {
-        HMac hmac = new HMac(new NonMemoableDigest(new SHA1Digest()));
-        byte[] resBuf = new byte[hmac.getMacSize()];
-
-        for (int i = 0; i < messages.length; i++)
-        {
-            byte[] m = messages[i].getBytes();
-            if (messages[i].startsWith("0x"))
-            {
-                m = Hex.decode(messages[i].substring(2));
-            }
-            hmac.init(new KeyParameter(Hex.decode(keys[i])));
-            hmac.update(m, 0, m.length);
-            hmac.doFinal(resBuf, 0);
-
-            if (!Arrays.areEqual(resBuf, Hex.decode(digests[i])))
-            {
-                return new SimpleTestResult(false, getName() + ": Vector " + i + " failed");
-            }
-        }
-
-        //
-        // test reset
-        //
-        int vector = 0; // vector used for test
-        byte[] m = messages[vector].getBytes();
-        if (messages[vector].startsWith("0x"))
-        {
-            m = Hex.decode(messages[vector].substring(2));
-        }
-        hmac.init(new KeyParameter(Hex.decode(keys[vector])));
-        hmac.update(m, 0, m.length);
-        hmac.doFinal(resBuf, 0);
-        hmac.reset();
-        hmac.update(m, 0, m.length);
-        hmac.doFinal(resBuf, 0);
-
-        if (!Arrays.areEqual(resBuf, Hex.decode(digests[vector])))
-        {
-            return new SimpleTestResult(false, getName() +
-                    "Reset with vector " + vector + " failed");
-        }
-
-        return new SimpleTestResult(true, getName() + ": Okay");
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        NonMemoableDigestTest test = new NonMemoableDigestTest();
-        TestResult      result = test.perform();
-
-        System.out.println(result);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/NullTest.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/NullTest.java
deleted file mode 100644
index ef8ff4b..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/NullTest.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import org.bouncycastle.crypto.BlockCipher;
-import org.bouncycastle.crypto.DataLengthException;
-import org.bouncycastle.crypto.engines.NullEngine;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-
-public class NullTest 
-    extends CipherTest
-{
-    static SimpleTest[]  tests = 
-    {
-        new BlockCipherVectorTest(0, new NullEngine(),
-                new KeyParameter(Hex.decode("00")), "00", "00")
-    };
-    
-    NullTest()
-    {
-        super(tests, new NullEngine(), new KeyParameter(new byte[2]));
-    }
-
-    public String getName()
-    {
-        return "Null";
-    }
-
-    public void performTest()
-        throws Exception
-    {
-        super.performTest();
-        
-        BlockCipher engine = new NullEngine();
-        
-        engine.init(true, null);
-        
-        byte[] buf = new byte[1];
-        
-        engine.processBlock(buf, 0, buf, 0);
-        
-        if (buf[0] != 0)
-        {
-            fail("NullCipher changed data!");
-        }
-        
-        byte[] shortBuf = new byte[0];
-        
-        try
-        {   
-            engine.processBlock(shortBuf, 0, buf, 0);
-            
-            fail("failed short input check");
-        }
-        catch (DataLengthException e)
-        {
-            // expected 
-        }
-        
-        try
-        {   
-            engine.processBlock(buf, 0, shortBuf, 0);
-            
-            fail("failed short output check");
-        }
-        catch (DataLengthException e)
-        {
-            // expected 
-        }
-    }
-    
-    public static void main(
-        String[]    args)
-    {
-        runTest(new NullTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/OAEPTest.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/OAEPTest.java
deleted file mode 100644
index 9d6b0cb..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/OAEPTest.java
+++ /dev/null
@@ -1,830 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import java.io.ByteArrayInputStream;
-import java.math.BigInteger;
-import java.security.SecureRandom;
-
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
-import org.bouncycastle.asn1.pkcs.RSAPrivateKey;
-import org.bouncycastle.asn1.pkcs.RSAPublicKey;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.bouncycastle.crypto.AsymmetricBlockCipher;
-import org.bouncycastle.crypto.InvalidCipherTextException;
-import org.bouncycastle.crypto.digests.SHA1Digest;
-import org.bouncycastle.crypto.digests.SHA256Digest;
-import org.bouncycastle.crypto.encodings.OAEPEncoding;
-import org.bouncycastle.crypto.engines.RSAEngine;
-import org.bouncycastle.crypto.params.ParametersWithRandom;
-import org.bouncycastle.crypto.params.RSAKeyParameters;
-import org.bouncycastle.crypto.params.RSAPrivateCrtKeyParameters;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-
-public class OAEPTest
-    extends SimpleTest
-{
-    static byte[] pubKeyEnc1 =
-        {
-          (byte)0x30, (byte)0x5a, (byte)0x30, (byte)0x0d, (byte)0x06, (byte)0x09, (byte)0x2a, (byte)0x86,
-          (byte)0x48, (byte)0x86, (byte)0xf7, (byte)0x0d, (byte)0x01, (byte)0x01, (byte)0x01, (byte)0x05,
-          (byte)0x00, (byte)0x03, (byte)0x49, (byte)0x00, (byte)0x30, (byte)0x46, (byte)0x02, (byte)0x41,
-          (byte)0x00, (byte)0xaa, (byte)0x36, (byte)0xab, (byte)0xce, (byte)0x88, (byte)0xac, (byte)0xfd,
-          (byte)0xff, (byte)0x55, (byte)0x52, (byte)0x3c, (byte)0x7f, (byte)0xc4, (byte)0x52, (byte)0x3f,
-          (byte)0x90, (byte)0xef, (byte)0xa0, (byte)0x0d, (byte)0xf3, (byte)0x77, (byte)0x4a, (byte)0x25,
-          (byte)0x9f, (byte)0x2e, (byte)0x62, (byte)0xb4, (byte)0xc5, (byte)0xd9, (byte)0x9c, (byte)0xb5,
-          (byte)0xad, (byte)0xb3, (byte)0x00, (byte)0xa0, (byte)0x28, (byte)0x5e, (byte)0x53, (byte)0x01,
-          (byte)0x93, (byte)0x0e, (byte)0x0c, (byte)0x70, (byte)0xfb, (byte)0x68, (byte)0x76, (byte)0x93,
-          (byte)0x9c, (byte)0xe6, (byte)0x16, (byte)0xce, (byte)0x62, (byte)0x4a, (byte)0x11, (byte)0xe0,
-          (byte)0x08, (byte)0x6d, (byte)0x34, (byte)0x1e, (byte)0xbc, (byte)0xac, (byte)0xa0, (byte)0xa1,
-          (byte)0xf5, (byte)0x02, (byte)0x01, (byte)0x11
-        };
-
-    static byte[] privKeyEnc1 =
-        {
-          (byte)0x30, (byte)0x82, (byte)0x01, (byte)0x52, (byte)0x02, (byte)0x01, (byte)0x00, (byte)0x30,
-          (byte)0x0d, (byte)0x06, (byte)0x09, (byte)0x2a, (byte)0x86, (byte)0x48, (byte)0x86, (byte)0xf7,
-          (byte)0x0d, (byte)0x01, (byte)0x01, (byte)0x01, (byte)0x05, (byte)0x00, (byte)0x04, (byte)0x82,
-          (byte)0x01, (byte)0x3c, (byte)0x30, (byte)0x82, (byte)0x01, (byte)0x38, (byte)0x02, (byte)0x01,
-          (byte)0x00, (byte)0x02, (byte)0x41, (byte)0x00, (byte)0xaa, (byte)0x36, (byte)0xab, (byte)0xce,
-          (byte)0x88, (byte)0xac, (byte)0xfd, (byte)0xff, (byte)0x55, (byte)0x52, (byte)0x3c, (byte)0x7f,
-          (byte)0xc4, (byte)0x52, (byte)0x3f, (byte)0x90, (byte)0xef, (byte)0xa0, (byte)0x0d, (byte)0xf3,
-          (byte)0x77, (byte)0x4a, (byte)0x25, (byte)0x9f, (byte)0x2e, (byte)0x62, (byte)0xb4, (byte)0xc5,
-          (byte)0xd9, (byte)0x9c, (byte)0xb5, (byte)0xad, (byte)0xb3, (byte)0x00, (byte)0xa0, (byte)0x28,
-          (byte)0x5e, (byte)0x53, (byte)0x01, (byte)0x93, (byte)0x0e, (byte)0x0c, (byte)0x70, (byte)0xfb,
-          (byte)0x68, (byte)0x76, (byte)0x93, (byte)0x9c, (byte)0xe6, (byte)0x16, (byte)0xce, (byte)0x62,
-          (byte)0x4a, (byte)0x11, (byte)0xe0, (byte)0x08, (byte)0x6d, (byte)0x34, (byte)0x1e, (byte)0xbc,
-          (byte)0xac, (byte)0xa0, (byte)0xa1, (byte)0xf5, (byte)0x02, (byte)0x01, (byte)0x11, (byte)0x02,
-          (byte)0x40, (byte)0x0a, (byte)0x03, (byte)0x37, (byte)0x48, (byte)0x62, (byte)0x64, (byte)0x87,
-          (byte)0x69, (byte)0x5f, (byte)0x5f, (byte)0x30, (byte)0xbc, (byte)0x38, (byte)0xb9, (byte)0x8b,
-          (byte)0x44, (byte)0xc2, (byte)0xcd, (byte)0x2d, (byte)0xff, (byte)0x43, (byte)0x40, (byte)0x98,
-          (byte)0xcd, (byte)0x20, (byte)0xd8, (byte)0xa1, (byte)0x38, (byte)0xd0, (byte)0x90, (byte)0xbf,
-          (byte)0x64, (byte)0x79, (byte)0x7c, (byte)0x3f, (byte)0xa7, (byte)0xa2, (byte)0xcd, (byte)0xcb,
-          (byte)0x3c, (byte)0xd1, (byte)0xe0, (byte)0xbd, (byte)0xba, (byte)0x26, (byte)0x54, (byte)0xb4,
-          (byte)0xf9, (byte)0xdf, (byte)0x8e, (byte)0x8a, (byte)0xe5, (byte)0x9d, (byte)0x73, (byte)0x3d,
-          (byte)0x9f, (byte)0x33, (byte)0xb3, (byte)0x01, (byte)0x62, (byte)0x4a, (byte)0xfd, (byte)0x1d,
-          (byte)0x51, (byte)0x02, (byte)0x21, (byte)0x00, (byte)0xd8, (byte)0x40, (byte)0xb4, (byte)0x16,
-          (byte)0x66, (byte)0xb4, (byte)0x2e, (byte)0x92, (byte)0xea, (byte)0x0d, (byte)0xa3, (byte)0xb4,
-          (byte)0x32, (byte)0x04, (byte)0xb5, (byte)0xcf, (byte)0xce, (byte)0x33, (byte)0x52, (byte)0x52,
-          (byte)0x4d, (byte)0x04, (byte)0x16, (byte)0xa5, (byte)0xa4, (byte)0x41, (byte)0xe7, (byte)0x00,
-          (byte)0xaf, (byte)0x46, (byte)0x12, (byte)0x0d, (byte)0x02, (byte)0x21, (byte)0x00, (byte)0xc9,
-          (byte)0x7f, (byte)0xb1, (byte)0xf0, (byte)0x27, (byte)0xf4, (byte)0x53, (byte)0xf6, (byte)0x34,
-          (byte)0x12, (byte)0x33, (byte)0xea, (byte)0xaa, (byte)0xd1, (byte)0xd9, (byte)0x35, (byte)0x3f,
-          (byte)0x6c, (byte)0x42, (byte)0xd0, (byte)0x88, (byte)0x66, (byte)0xb1, (byte)0xd0, (byte)0x5a,
-          (byte)0x0f, (byte)0x20, (byte)0x35, (byte)0x02, (byte)0x8b, (byte)0x9d, (byte)0x89, (byte)0x02,
-          (byte)0x20, (byte)0x59, (byte)0x0b, (byte)0x95, (byte)0x72, (byte)0xa2, (byte)0xc2, (byte)0xa9,
-          (byte)0xc4, (byte)0x06, (byte)0x05, (byte)0x9d, (byte)0xc2, (byte)0xab, (byte)0x2f, (byte)0x1d,
-          (byte)0xaf, (byte)0xeb, (byte)0x7e, (byte)0x8b, (byte)0x4f, (byte)0x10, (byte)0xa7, (byte)0x54,
-          (byte)0x9e, (byte)0x8e, (byte)0xed, (byte)0xf5, (byte)0xb4, (byte)0xfc, (byte)0xe0, (byte)0x9e,
-          (byte)0x05, (byte)0x02, (byte)0x21, (byte)0x00, (byte)0x8e, (byte)0x3c, (byte)0x05, (byte)0x21,
-          (byte)0xfe, (byte)0x15, (byte)0xe0, (byte)0xea, (byte)0x06, (byte)0xa3, (byte)0x6f, (byte)0xf0,
-          (byte)0xf1, (byte)0x0c, (byte)0x99, (byte)0x52, (byte)0xc3, (byte)0x5b, (byte)0x7a, (byte)0x75,
-          (byte)0x14, (byte)0xfd, (byte)0x32, (byte)0x38, (byte)0xb8, (byte)0x0a, (byte)0xad, (byte)0x52,
-          (byte)0x98, (byte)0x62, (byte)0x8d, (byte)0x51, (byte)0x02, (byte)0x20, (byte)0x36, (byte)0x3f,
-          (byte)0xf7, (byte)0x18, (byte)0x9d, (byte)0xa8, (byte)0xe9, (byte)0x0b, (byte)0x1d, (byte)0x34,
-          (byte)0x1f, (byte)0x71, (byte)0xd0, (byte)0x9b, (byte)0x76, (byte)0xa8, (byte)0xa9, (byte)0x43,
-          (byte)0xe1, (byte)0x1d, (byte)0x10, (byte)0xb2, (byte)0x4d, (byte)0x24, (byte)0x9f, (byte)0x2d,
-          (byte)0xea, (byte)0xfe, (byte)0xf8, (byte)0x0c, (byte)0x18, (byte)0x26
-        };
-
-    static byte[] output1 = 
-    { 
-        (byte)0x1b, (byte)0x8f, (byte)0x05, (byte)0xf9, (byte)0xca, (byte)0x1a, (byte)0x79, (byte)0x52,
-        (byte)0x6e, (byte)0x53, (byte)0xf3, (byte)0xcc, (byte)0x51, (byte)0x4f, (byte)0xdb, (byte)0x89,
-        (byte)0x2b, (byte)0xfb, (byte)0x91, (byte)0x93, (byte)0x23, (byte)0x1e, (byte)0x78, (byte)0xb9,
-        (byte)0x92, (byte)0xe6, (byte)0x8d, (byte)0x50, (byte)0xa4, (byte)0x80, (byte)0xcb, (byte)0x52,
-        (byte)0x33, (byte)0x89, (byte)0x5c, (byte)0x74, (byte)0x95, (byte)0x8d, (byte)0x5d, (byte)0x02,
-        (byte)0xab, (byte)0x8c, (byte)0x0f, (byte)0xd0, (byte)0x40, (byte)0xeb, (byte)0x58, (byte)0x44,
-        (byte)0xb0, (byte)0x05, (byte)0xc3, (byte)0x9e, (byte)0xd8, (byte)0x27, (byte)0x4a, (byte)0x9d,
-        (byte)0xbf, (byte)0xa8, (byte)0x06, (byte)0x71, (byte)0x40, (byte)0x94, (byte)0x39, (byte)0xd2
-    };
-
-    static byte[] pubKeyEnc2 =
-        {
-        (byte)0x30, (byte)0x4c, (byte)0x30, (byte)0x0d, (byte)0x06, (byte)0x09, (byte)0x2a, (byte)0x86,
-        (byte)0x48, (byte)0x86, (byte)0xf7, (byte)0x0d, (byte)0x01, (byte)0x01, (byte)0x01, (byte)0x05,
-        (byte)0x00, (byte)0x03, (byte)0x3b, (byte)0x00, (byte)0x30, (byte)0x38, (byte)0x02, (byte)0x33,
-        (byte)0x00, (byte)0xa3, (byte)0x07, (byte)0x9a, (byte)0x90, (byte)0xdf, (byte)0x0d, (byte)0xfd,
-        (byte)0x72, (byte)0xac, (byte)0x09, (byte)0x0c, (byte)0xcc, (byte)0x2a, (byte)0x78, (byte)0xb8,
-        (byte)0x74, (byte)0x13, (byte)0x13, (byte)0x3e, (byte)0x40, (byte)0x75, (byte)0x9c, (byte)0x98,
-        (byte)0xfa, (byte)0xf8, (byte)0x20, (byte)0x4f, (byte)0x35, (byte)0x8a, (byte)0x0b, (byte)0x26,
-        (byte)0x3c, (byte)0x67, (byte)0x70, (byte)0xe7, (byte)0x83, (byte)0xa9, (byte)0x3b, (byte)0x69,
-        (byte)0x71, (byte)0xb7, (byte)0x37, (byte)0x79, (byte)0xd2, (byte)0x71, (byte)0x7b, (byte)0xe8,
-        (byte)0x34, (byte)0x77, (byte)0xcf, (byte)0x02, (byte)0x01, (byte)0x03
-        };
-
-    static byte[] privKeyEnc2 =
-        {
-        (byte)0x30, (byte)0x82, (byte)0x01, (byte)0x13, (byte)0x02, (byte)0x01, (byte)0x00, (byte)0x30,
-        (byte)0x0d, (byte)0x06, (byte)0x09, (byte)0x2a, (byte)0x86, (byte)0x48, (byte)0x86, (byte)0xf7,
-        (byte)0x0d, (byte)0x01, (byte)0x01, (byte)0x01, (byte)0x05, (byte)0x00, (byte)0x04, (byte)0x81,
-        (byte)0xfe, (byte)0x30, (byte)0x81, (byte)0xfb, (byte)0x02, (byte)0x01, (byte)0x00, (byte)0x02,
-        (byte)0x33, (byte)0x00, (byte)0xa3, (byte)0x07, (byte)0x9a, (byte)0x90, (byte)0xdf, (byte)0x0d,
-        (byte)0xfd, (byte)0x72, (byte)0xac, (byte)0x09, (byte)0x0c, (byte)0xcc, (byte)0x2a, (byte)0x78,
-        (byte)0xb8, (byte)0x74, (byte)0x13, (byte)0x13, (byte)0x3e, (byte)0x40, (byte)0x75, (byte)0x9c,
-        (byte)0x98, (byte)0xfa, (byte)0xf8, (byte)0x20, (byte)0x4f, (byte)0x35, (byte)0x8a, (byte)0x0b,
-        (byte)0x26, (byte)0x3c, (byte)0x67, (byte)0x70, (byte)0xe7, (byte)0x83, (byte)0xa9, (byte)0x3b,
-        (byte)0x69, (byte)0x71, (byte)0xb7, (byte)0x37, (byte)0x79, (byte)0xd2, (byte)0x71, (byte)0x7b,
-        (byte)0xe8, (byte)0x34, (byte)0x77, (byte)0xcf, (byte)0x02, (byte)0x01, (byte)0x03, (byte)0x02,
-        (byte)0x32, (byte)0x6c, (byte)0xaf, (byte)0xbc, (byte)0x60, (byte)0x94, (byte)0xb3, (byte)0xfe,
-        (byte)0x4c, (byte)0x72, (byte)0xb0, (byte)0xb3, (byte)0x32, (byte)0xc6, (byte)0xfb, (byte)0x25,
-        (byte)0xa2, (byte)0xb7, (byte)0x62, (byte)0x29, (byte)0x80, (byte)0x4e, (byte)0x68, (byte)0x65,
-        (byte)0xfc, (byte)0xa4, (byte)0x5a, (byte)0x74, (byte)0xdf, (byte)0x0f, (byte)0x8f, (byte)0xb8,
-        (byte)0x41, (byte)0x3b, (byte)0x52, (byte)0xc0, (byte)0xd0, (byte)0xe5, (byte)0x3d, (byte)0x9b,
-        (byte)0x59, (byte)0x0f, (byte)0xf1, (byte)0x9b, (byte)0xe7, (byte)0x9f, (byte)0x49, (byte)0xdd,
-        (byte)0x21, (byte)0xe5, (byte)0xeb, (byte)0x02, (byte)0x1a, (byte)0x00, (byte)0xcf, (byte)0x20,
-        (byte)0x35, (byte)0x02, (byte)0x8b, (byte)0x9d, (byte)0x86, (byte)0x98, (byte)0x40, (byte)0xb4,
-        (byte)0x16, (byte)0x66, (byte)0xb4, (byte)0x2e, (byte)0x92, (byte)0xea, (byte)0x0d, (byte)0xa3,
-        (byte)0xb4, (byte)0x32, (byte)0x04, (byte)0xb5, (byte)0xcf, (byte)0xce, (byte)0x91, (byte)0x02,
-        (byte)0x1a, (byte)0x00, (byte)0xc9, (byte)0x7f, (byte)0xb1, (byte)0xf0, (byte)0x27, (byte)0xf4,
-        (byte)0x53, (byte)0xf6, (byte)0x34, (byte)0x12, (byte)0x33, (byte)0xea, (byte)0xaa, (byte)0xd1,
-        (byte)0xd9, (byte)0x35, (byte)0x3f, (byte)0x6c, (byte)0x42, (byte)0xd0, (byte)0x88, (byte)0x66,
-        (byte)0xb1, (byte)0xd0, (byte)0x5f, (byte)0x02, (byte)0x1a, (byte)0x00, (byte)0x8a, (byte)0x15,
-        (byte)0x78, (byte)0xac, (byte)0x5d, (byte)0x13, (byte)0xaf, (byte)0x10, (byte)0x2b, (byte)0x22,
-        (byte)0xb9, (byte)0x99, (byte)0xcd, (byte)0x74, (byte)0x61, (byte)0xf1, (byte)0x5e, (byte)0x6d,
-        (byte)0x22, (byte)0xcc, (byte)0x03, (byte)0x23, (byte)0xdf, (byte)0xdf, (byte)0x0b, (byte)0x02,
-        (byte)0x1a, (byte)0x00, (byte)0x86, (byte)0x55, (byte)0x21, (byte)0x4a, (byte)0xc5, (byte)0x4d,
-        (byte)0x8d, (byte)0x4e, (byte)0xcd, (byte)0x61, (byte)0x77, (byte)0xf1, (byte)0xc7, (byte)0x36,
-        (byte)0x90, (byte)0xce, (byte)0x2a, (byte)0x48, (byte)0x2c, (byte)0x8b, (byte)0x05, (byte)0x99,
-        (byte)0xcb, (byte)0xe0, (byte)0x3f, (byte)0x02, (byte)0x1a, (byte)0x00, (byte)0x83, (byte)0xef,
-        (byte)0xef, (byte)0xb8, (byte)0xa9, (byte)0xa4, (byte)0x0d, (byte)0x1d, (byte)0xb6, (byte)0xed,
-        (byte)0x98, (byte)0xad, (byte)0x84, (byte)0xed, (byte)0x13, (byte)0x35, (byte)0xdc, (byte)0xc1,
-        (byte)0x08, (byte)0xf3, (byte)0x22, (byte)0xd0, (byte)0x57, (byte)0xcf, (byte)0x8d
-        };
-
-    static byte[] output2 =
-    {
-          (byte)0x14, (byte)0xbd, (byte)0xdd, (byte)0x28, (byte)0xc9, (byte)0x83, (byte)0x35, (byte)0x19,
-          (byte)0x23, (byte)0x80, (byte)0xe8, (byte)0xe5, (byte)0x49, (byte)0xb1, (byte)0x58, (byte)0x2a,
-          (byte)0x8b, (byte)0x40, (byte)0xb4, (byte)0x48, (byte)0x6d, (byte)0x03, (byte)0xa6, (byte)0xa5,
-          (byte)0x31, (byte)0x1f, (byte)0x1f, (byte)0xd5, (byte)0xf0, (byte)0xa1, (byte)0x80, (byte)0xe4,
-          (byte)0x17, (byte)0x53, (byte)0x03, (byte)0x29, (byte)0xa9, (byte)0x34, (byte)0x90, (byte)0x74,
-          (byte)0xb1, (byte)0x52, (byte)0x13, (byte)0x54, (byte)0x29, (byte)0x08, (byte)0x24, (byte)0x52,
-          (byte)0x62, (byte)0x51
-    };
-
-    static byte[] pubKeyEnc3 =
-    {
-          (byte)0x30, (byte)0x81, (byte)0x9d, (byte)0x30, (byte)0x0d, (byte)0x06, (byte)0x09, (byte)0x2a,
-          (byte)0x86, (byte)0x48, (byte)0x86, (byte)0xf7, (byte)0x0d, (byte)0x01, (byte)0x01, (byte)0x01,
-          (byte)0x05, (byte)0x00, (byte)0x03, (byte)0x81, (byte)0x8b, (byte)0x00, (byte)0x30, (byte)0x81,
-          (byte)0x87, (byte)0x02, (byte)0x81, (byte)0x81, (byte)0x00, (byte)0xbb, (byte)0xf8, (byte)0x2f,
-          (byte)0x09, (byte)0x06, (byte)0x82, (byte)0xce, (byte)0x9c, (byte)0x23, (byte)0x38, (byte)0xac,
-          (byte)0x2b, (byte)0x9d, (byte)0xa8, (byte)0x71, (byte)0xf7, (byte)0x36, (byte)0x8d, (byte)0x07,
-          (byte)0xee, (byte)0xd4, (byte)0x10, (byte)0x43, (byte)0xa4, (byte)0x40, (byte)0xd6, (byte)0xb6,
-          (byte)0xf0, (byte)0x74, (byte)0x54, (byte)0xf5, (byte)0x1f, (byte)0xb8, (byte)0xdf, (byte)0xba,
-          (byte)0xaf, (byte)0x03, (byte)0x5c, (byte)0x02, (byte)0xab, (byte)0x61, (byte)0xea, (byte)0x48,
-          (byte)0xce, (byte)0xeb, (byte)0x6f, (byte)0xcd, (byte)0x48, (byte)0x76, (byte)0xed, (byte)0x52,
-          (byte)0x0d, (byte)0x60, (byte)0xe1, (byte)0xec, (byte)0x46, (byte)0x19, (byte)0x71, (byte)0x9d,
-          (byte)0x8a, (byte)0x5b, (byte)0x8b, (byte)0x80, (byte)0x7f, (byte)0xaf, (byte)0xb8, (byte)0xe0,
-          (byte)0xa3, (byte)0xdf, (byte)0xc7, (byte)0x37, (byte)0x72, (byte)0x3e, (byte)0xe6, (byte)0xb4,
-          (byte)0xb7, (byte)0xd9, (byte)0x3a, (byte)0x25, (byte)0x84, (byte)0xee, (byte)0x6a, (byte)0x64,
-          (byte)0x9d, (byte)0x06, (byte)0x09, (byte)0x53, (byte)0x74, (byte)0x88, (byte)0x34, (byte)0xb2,
-          (byte)0x45, (byte)0x45, (byte)0x98, (byte)0x39, (byte)0x4e, (byte)0xe0, (byte)0xaa, (byte)0xb1,
-          (byte)0x2d, (byte)0x7b, (byte)0x61, (byte)0xa5, (byte)0x1f, (byte)0x52, (byte)0x7a, (byte)0x9a,
-          (byte)0x41, (byte)0xf6, (byte)0xc1, (byte)0x68, (byte)0x7f, (byte)0xe2, (byte)0x53, (byte)0x72,
-          (byte)0x98, (byte)0xca, (byte)0x2a, (byte)0x8f, (byte)0x59, (byte)0x46, (byte)0xf8, (byte)0xe5,
-          (byte)0xfd, (byte)0x09, (byte)0x1d, (byte)0xbd, (byte)0xcb, (byte)0x02, (byte)0x01, (byte)0x11
-    };
-
-    static byte[] privKeyEnc3 =
-    {
-        (byte)0x30, (byte)0x82, (byte)0x02, (byte)0x75, (byte)0x02, (byte)0x01, (byte)0x00, (byte)0x30,
-        (byte)0x0d, (byte)0x06, (byte)0x09, (byte)0x2a, (byte)0x86, (byte)0x48, (byte)0x86, (byte)0xf7,
-        (byte)0x0d, (byte)0x01, (byte)0x01, (byte)0x01, (byte)0x05, (byte)0x00, (byte)0x04, (byte)0x82,
-        (byte)0x02, (byte)0x5f, (byte)0x30, (byte)0x82, (byte)0x02, (byte)0x5b, (byte)0x02, (byte)0x01,
-        (byte)0x00, (byte)0x02, (byte)0x81, (byte)0x81, (byte)0x00, (byte)0xbb, (byte)0xf8, (byte)0x2f,
-        (byte)0x09, (byte)0x06, (byte)0x82, (byte)0xce, (byte)0x9c, (byte)0x23, (byte)0x38, (byte)0xac,
-        (byte)0x2b, (byte)0x9d, (byte)0xa8, (byte)0x71, (byte)0xf7, (byte)0x36, (byte)0x8d, (byte)0x07,
-        (byte)0xee, (byte)0xd4, (byte)0x10, (byte)0x43, (byte)0xa4, (byte)0x40, (byte)0xd6, (byte)0xb6,
-        (byte)0xf0, (byte)0x74, (byte)0x54, (byte)0xf5, (byte)0x1f, (byte)0xb8, (byte)0xdf, (byte)0xba,
-        (byte)0xaf, (byte)0x03, (byte)0x5c, (byte)0x02, (byte)0xab, (byte)0x61, (byte)0xea, (byte)0x48,
-        (byte)0xce, (byte)0xeb, (byte)0x6f, (byte)0xcd, (byte)0x48, (byte)0x76, (byte)0xed, (byte)0x52,
-        (byte)0x0d, (byte)0x60, (byte)0xe1, (byte)0xec, (byte)0x46, (byte)0x19, (byte)0x71, (byte)0x9d,
-        (byte)0x8a, (byte)0x5b, (byte)0x8b, (byte)0x80, (byte)0x7f, (byte)0xaf, (byte)0xb8, (byte)0xe0,
-        (byte)0xa3, (byte)0xdf, (byte)0xc7, (byte)0x37, (byte)0x72, (byte)0x3e, (byte)0xe6, (byte)0xb4,
-        (byte)0xb7, (byte)0xd9, (byte)0x3a, (byte)0x25, (byte)0x84, (byte)0xee, (byte)0x6a, (byte)0x64,
-        (byte)0x9d, (byte)0x06, (byte)0x09, (byte)0x53, (byte)0x74, (byte)0x88, (byte)0x34, (byte)0xb2,
-        (byte)0x45, (byte)0x45, (byte)0x98, (byte)0x39, (byte)0x4e, (byte)0xe0, (byte)0xaa, (byte)0xb1,
-        (byte)0x2d, (byte)0x7b, (byte)0x61, (byte)0xa5, (byte)0x1f, (byte)0x52, (byte)0x7a, (byte)0x9a,
-        (byte)0x41, (byte)0xf6, (byte)0xc1, (byte)0x68, (byte)0x7f, (byte)0xe2, (byte)0x53, (byte)0x72,
-        (byte)0x98, (byte)0xca, (byte)0x2a, (byte)0x8f, (byte)0x59, (byte)0x46, (byte)0xf8, (byte)0xe5,
-        (byte)0xfd, (byte)0x09, (byte)0x1d, (byte)0xbd, (byte)0xcb, (byte)0x02, (byte)0x01, (byte)0x11,
-        (byte)0x02, (byte)0x81, (byte)0x81, (byte)0x00, (byte)0xa5, (byte)0xda, (byte)0xfc, (byte)0x53,
-        (byte)0x41, (byte)0xfa, (byte)0xf2, (byte)0x89, (byte)0xc4, (byte)0xb9, (byte)0x88, (byte)0xdb,
-        (byte)0x30, (byte)0xc1, (byte)0xcd, (byte)0xf8, (byte)0x3f, (byte)0x31, (byte)0x25, (byte)0x1e,
-        (byte)0x06, (byte)0x68, (byte)0xb4, (byte)0x27, (byte)0x84, (byte)0x81, (byte)0x38, (byte)0x01,
-        (byte)0x57, (byte)0x96, (byte)0x41, (byte)0xb2, (byte)0x94, (byte)0x10, (byte)0xb3, (byte)0xc7,
-        (byte)0x99, (byte)0x8d, (byte)0x6b, (byte)0xc4, (byte)0x65, (byte)0x74, (byte)0x5e, (byte)0x5c,
-        (byte)0x39, (byte)0x26, (byte)0x69, (byte)0xd6, (byte)0x87, (byte)0x0d, (byte)0xa2, (byte)0xc0,
-        (byte)0x82, (byte)0xa9, (byte)0x39, (byte)0xe3, (byte)0x7f, (byte)0xdc, (byte)0xb8, (byte)0x2e,
-        (byte)0xc9, (byte)0x3e, (byte)0xda, (byte)0xc9, (byte)0x7f, (byte)0xf3, (byte)0xad, (byte)0x59,
-        (byte)0x50, (byte)0xac, (byte)0xcf, (byte)0xbc, (byte)0x11, (byte)0x1c, (byte)0x76, (byte)0xf1,
-        (byte)0xa9, (byte)0x52, (byte)0x94, (byte)0x44, (byte)0xe5, (byte)0x6a, (byte)0xaf, (byte)0x68,
-        (byte)0xc5, (byte)0x6c, (byte)0x09, (byte)0x2c, (byte)0xd3, (byte)0x8d, (byte)0xc3, (byte)0xbe,
-        (byte)0xf5, (byte)0xd2, (byte)0x0a, (byte)0x93, (byte)0x99, (byte)0x26, (byte)0xed, (byte)0x4f,
-        (byte)0x74, (byte)0xa1, (byte)0x3e, (byte)0xdd, (byte)0xfb, (byte)0xe1, (byte)0xa1, (byte)0xce,
-        (byte)0xcc, (byte)0x48, (byte)0x94, (byte)0xaf, (byte)0x94, (byte)0x28, (byte)0xc2, (byte)0xb7,
-        (byte)0xb8, (byte)0x88, (byte)0x3f, (byte)0xe4, (byte)0x46, (byte)0x3a, (byte)0x4b, (byte)0xc8,
-        (byte)0x5b, (byte)0x1c, (byte)0xb3, (byte)0xc1, (byte)0x02, (byte)0x41, (byte)0x00, (byte)0xee,
-        (byte)0xcf, (byte)0xae, (byte)0x81, (byte)0xb1, (byte)0xb9, (byte)0xb3, (byte)0xc9, (byte)0x08,
-        (byte)0x81, (byte)0x0b, (byte)0x10, (byte)0xa1, (byte)0xb5, (byte)0x60, (byte)0x01, (byte)0x99,
-        (byte)0xeb, (byte)0x9f, (byte)0x44, (byte)0xae, (byte)0xf4, (byte)0xfd, (byte)0xa4, (byte)0x93,
-        (byte)0xb8, (byte)0x1a, (byte)0x9e, (byte)0x3d, (byte)0x84, (byte)0xf6, (byte)0x32, (byte)0x12,
-        (byte)0x4e, (byte)0xf0, (byte)0x23, (byte)0x6e, (byte)0x5d, (byte)0x1e, (byte)0x3b, (byte)0x7e,
-        (byte)0x28, (byte)0xfa, (byte)0xe7, (byte)0xaa, (byte)0x04, (byte)0x0a, (byte)0x2d, (byte)0x5b,
-        (byte)0x25, (byte)0x21, (byte)0x76, (byte)0x45, (byte)0x9d, (byte)0x1f, (byte)0x39, (byte)0x75,
-        (byte)0x41, (byte)0xba, (byte)0x2a, (byte)0x58, (byte)0xfb, (byte)0x65, (byte)0x99, (byte)0x02,
-        (byte)0x41, (byte)0x00, (byte)0xc9, (byte)0x7f, (byte)0xb1, (byte)0xf0, (byte)0x27, (byte)0xf4,
-        (byte)0x53, (byte)0xf6, (byte)0x34, (byte)0x12, (byte)0x33, (byte)0xea, (byte)0xaa, (byte)0xd1,
-        (byte)0xd9, (byte)0x35, (byte)0x3f, (byte)0x6c, (byte)0x42, (byte)0xd0, (byte)0x88, (byte)0x66,
-        (byte)0xb1, (byte)0xd0, (byte)0x5a, (byte)0x0f, (byte)0x20, (byte)0x35, (byte)0x02, (byte)0x8b,
-        (byte)0x9d, (byte)0x86, (byte)0x98, (byte)0x40, (byte)0xb4, (byte)0x16, (byte)0x66, (byte)0xb4,
-        (byte)0x2e, (byte)0x92, (byte)0xea, (byte)0x0d, (byte)0xa3, (byte)0xb4, (byte)0x32, (byte)0x04,
-        (byte)0xb5, (byte)0xcf, (byte)0xce, (byte)0x33, (byte)0x52, (byte)0x52, (byte)0x4d, (byte)0x04,
-        (byte)0x16, (byte)0xa5, (byte)0xa4, (byte)0x41, (byte)0xe7, (byte)0x00, (byte)0xaf, (byte)0x46,
-        (byte)0x15, (byte)0x03, (byte)0x02, (byte)0x40, (byte)0x54, (byte)0x49, (byte)0x4c, (byte)0xa6,
-        (byte)0x3e, (byte)0xba, (byte)0x03, (byte)0x37, (byte)0xe4, (byte)0xe2, (byte)0x40, (byte)0x23,
-        (byte)0xfc, (byte)0xd6, (byte)0x9a, (byte)0x5a, (byte)0xeb, (byte)0x07, (byte)0xdd, (byte)0xdc,
-        (byte)0x01, (byte)0x83, (byte)0xa4, (byte)0xd0, (byte)0xac, (byte)0x9b, (byte)0x54, (byte)0xb0,
-        (byte)0x51, (byte)0xf2, (byte)0xb1, (byte)0x3e, (byte)0xd9, (byte)0x49, (byte)0x09, (byte)0x75,
-        (byte)0xea, (byte)0xb7, (byte)0x74, (byte)0x14, (byte)0xff, (byte)0x59, (byte)0xc1, (byte)0xf7,
-        (byte)0x69, (byte)0x2e, (byte)0x9a, (byte)0x2e, (byte)0x20, (byte)0x2b, (byte)0x38, (byte)0xfc,
-        (byte)0x91, (byte)0x0a, (byte)0x47, (byte)0x41, (byte)0x74, (byte)0xad, (byte)0xc9, (byte)0x3c,
-        (byte)0x1f, (byte)0x67, (byte)0xc9, (byte)0x81, (byte)0x02, (byte)0x40, (byte)0x47, (byte)0x1e,
-        (byte)0x02, (byte)0x90, (byte)0xff, (byte)0x0a, (byte)0xf0, (byte)0x75, (byte)0x03, (byte)0x51,
-        (byte)0xb7, (byte)0xf8, (byte)0x78, (byte)0x86, (byte)0x4c, (byte)0xa9, (byte)0x61, (byte)0xad,
-        (byte)0xbd, (byte)0x3a, (byte)0x8a, (byte)0x7e, (byte)0x99, (byte)0x1c, (byte)0x5c, (byte)0x05,
-        (byte)0x56, (byte)0xa9, (byte)0x4c, (byte)0x31, (byte)0x46, (byte)0xa7, (byte)0xf9, (byte)0x80,
-        (byte)0x3f, (byte)0x8f, (byte)0x6f, (byte)0x8a, (byte)0xe3, (byte)0x42, (byte)0xe9, (byte)0x31,
-        (byte)0xfd, (byte)0x8a, (byte)0xe4, (byte)0x7a, (byte)0x22, (byte)0x0d, (byte)0x1b, (byte)0x99,
-        (byte)0xa4, (byte)0x95, (byte)0x84, (byte)0x98, (byte)0x07, (byte)0xfe, (byte)0x39, (byte)0xf9,
-        (byte)0x24, (byte)0x5a, (byte)0x98, (byte)0x36, (byte)0xda, (byte)0x3d, (byte)0x02, (byte)0x41,
-        (byte)0x00, (byte)0xb0, (byte)0x6c, (byte)0x4f, (byte)0xda, (byte)0xbb, (byte)0x63, (byte)0x01,
-        (byte)0x19, (byte)0x8d, (byte)0x26, (byte)0x5b, (byte)0xdb, (byte)0xae, (byte)0x94, (byte)0x23,
-        (byte)0xb3, (byte)0x80, (byte)0xf2, (byte)0x71, (byte)0xf7, (byte)0x34, (byte)0x53, (byte)0x88,
-        (byte)0x50, (byte)0x93, (byte)0x07, (byte)0x7f, (byte)0xcd, (byte)0x39, (byte)0xe2, (byte)0x11,
-        (byte)0x9f, (byte)0xc9, (byte)0x86, (byte)0x32, (byte)0x15, (byte)0x4f, (byte)0x58, (byte)0x83,
-        (byte)0xb1, (byte)0x67, (byte)0xa9, (byte)0x67, (byte)0xbf, (byte)0x40, (byte)0x2b, (byte)0x4e,
-        (byte)0x9e, (byte)0x2e, (byte)0x0f, (byte)0x96, (byte)0x56, (byte)0xe6, (byte)0x98, (byte)0xea,
-        (byte)0x36, (byte)0x66, (byte)0xed, (byte)0xfb, (byte)0x25, (byte)0x79, (byte)0x80, (byte)0x39,
-        (byte)0xf7
-    };
-
-    static byte[] output3 = Hex.decode(
-        "b8246b56a6ed5881aeb585d9a25b2ad790c417e080681bf1ac2bc3deb69d8bce"
-      + "f0c4366fec400af052a72e9b0effb5b3f2f192dbeaca03c12740057113bf1f06"
-      + "69ac22e9f3a7852e3c15d913cab0b8863a95c99294ce8674214954610346f4d4"
-      + "74b26f7c48b42ee68e1f572a1fc4026ac456b4f59f7b621ea1b9d88f64202fb1");
-
-    byte[]  seed = {
-                (byte)0xaa, (byte)0xfd, (byte)0x12, (byte)0xf6, (byte)0x59,
-                (byte)0xca, (byte)0xe6, (byte)0x34, (byte)0x89, (byte)0xb4,
-                (byte)0x79, (byte)0xe5, (byte)0x07, (byte)0x6d, (byte)0xde,
-                (byte)0xc2, (byte)0xf0, (byte)0x6c, (byte)0xb5, (byte)0x8f
-    };
-
-    private class VecRand extends SecureRandom
-    {
-        byte[] seed;
-
-        VecRand(byte[] seed)
-        {
-            this.seed = seed;
-        }
-
-        public void nextBytes(
-            byte[]  bytes)
-        {
-            System.arraycopy(seed, 0, bytes, 0, bytes.length);
-        }
-    }
-
-    private void baseOaepTest(
-        int     id,
-        byte[]  pubKeyEnc,
-        byte[]  privKeyEnc,
-        byte[]  output)
-        throws Exception
-    {
-        ByteArrayInputStream    bIn = new ByteArrayInputStream(pubKeyEnc);
-        ASN1InputStream         dIn = new ASN1InputStream(bIn);
-
-        //
-        // extract the public key info.
-        //
-        RSAPublicKey pubStruct;
-
-        pubStruct = RSAPublicKey.getInstance(new SubjectPublicKeyInfo((ASN1Sequence)dIn.readObject()).parsePublicKey());
-
-
-        bIn = new ByteArrayInputStream(privKeyEnc);
-        dIn = new ASN1InputStream(bIn);
-
-        //
-        // extract the private key info.
-        //
-        RSAPrivateKey privStruct;
-
-        privStruct = RSAPrivateKey.getInstance(new PrivateKeyInfo((ASN1Sequence)dIn.readObject()).parsePrivateKey());
-
-        RSAKeyParameters    pubParameters = new RSAKeyParameters(
-                                                    false,
-                                                    pubStruct.getModulus(),
-                                                    pubStruct.getPublicExponent());
-
-        RSAKeyParameters    privParameters = new RSAPrivateCrtKeyParameters(
-                                                    privStruct.getModulus(),
-                                                    privStruct.getPublicExponent(),
-                                                    privStruct.getPrivateExponent(),
-                                                    privStruct.getPrime1(),
-                                                    privStruct.getPrime2(),
-                                                    privStruct.getExponent1(),
-                                                    privStruct.getExponent2(),
-                                                    privStruct.getCoefficient());
-
-        byte[]  input = new byte[]
-                    { (byte)0x54, (byte)0x85, (byte)0x9b, (byte)0x34, (byte)0x2c, (byte)0x49, (byte)0xea, (byte)0x2a };
-
-        encDec("id(" + id + ")", pubParameters, privParameters, seed, input, output);
-
-    }
-
-    private void encDec(
-        String label,
-        RSAKeyParameters pubParameters,
-        RSAKeyParameters privParameters,
-        byte[] seed,
-        byte[] input,
-        byte[] output)
-        throws InvalidCipherTextException
-    {
-        AsymmetricBlockCipher cipher = new OAEPEncoding(new RSAEngine());
-
-        cipher.init(true, new ParametersWithRandom(pubParameters, new VecRand(seed)));
-
-        byte[]  out;
-
-        out = cipher.processBlock(input, 0, input.length);
-
-        for (int i = 0; i != output.length; i++)
-        {
-            if (out[i] != output[i])
-            {
-                fail(label + " failed encryption");
-            }
-        }
-
-        cipher.init(false, privParameters);
-
-        out = cipher.processBlock(output, 0, output.length);
-
-        for (int i = 0; i != input.length; i++)
-        {
-            if (out[i] != input[i])
-            {
-                fail(label + " failed decoding");
-            }
-        }
-    }
-
-    /*
-     * RSA vector tests from PKCS#1 page
-     */
-    byte[] modulus_1024 = Hex.decode(
-       "a8b3b284af8eb50b387034a860f146c4"
-     + "919f318763cd6c5598c8ae4811a1e0ab"
-     + "c4c7e0b082d693a5e7fced675cf46685"
-     + "12772c0cbc64a742c6c630f533c8cc72"
-     + "f62ae833c40bf25842e984bb78bdbf97"
-     + "c0107d55bdb662f5c4e0fab9845cb514"
-     + "8ef7392dd3aaff93ae1e6b667bb3d424"
-     + "7616d4f5ba10d4cfd226de88d39f16fb");
-
-    byte[] pubExp_1024 = Hex.decode(
-       "010001");
-
-    byte[] privExp_1024 = Hex.decode(
-       "53339cfdb79fc8466a655c7316aca85c"
-     + "55fd8f6dd898fdaf119517ef4f52e8fd"
-     + "8e258df93fee180fa0e4ab29693cd83b"
-     + "152a553d4ac4d1812b8b9fa5af0e7f55"
-     + "fe7304df41570926f3311f15c4d65a73"
-     + "2c483116ee3d3d2d0af3549ad9bf7cbf"
-     + "b78ad884f84d5beb04724dc7369b31de"
-     + "f37d0cf539e9cfcdd3de653729ead5d1");
-
-    byte[] prime1_1024 = Hex.decode(
-       "d32737e7267ffe1341b2d5c0d150a81b"
-     + "586fb3132bed2f8d5262864a9cb9f30a"
-     + "f38be448598d413a172efb802c21acf1"
-     + "c11c520c2f26a471dcad212eac7ca39d");
-
-    byte[] prime2_1024 = Hex.decode(
-       "cc8853d1d54da630fac004f471f281c7"
-     + "b8982d8224a490edbeb33d3e3d5cc93c"
-     + "4765703d1dd791642f1f116a0dd852be"
-     + "2419b2af72bfe9a030e860b0288b5d77");
-
-    byte[] primeExp1_1024 = Hex.decode(
-       "0e12bf1718e9cef5599ba1c3882fe804"
-     + "6a90874eefce8f2ccc20e4f2741fb0a3"
-     + "3a3848aec9c9305fbecbd2d76819967d"
-     + "4671acc6431e4037968db37878e695c1");
-
-    byte[] primeExp2_1024 = Hex.decode(
-        "95297b0f95a2fa67d00707d609dfd4fc"
-     +  "05c89dafc2ef6d6ea55bec771ea33373"
-     +  "4d9251e79082ecda866efef13c459e1a"
-     +  "631386b7e354c899f5f112ca85d71583");
-
-    byte[] crtCoef_1024 = Hex.decode(
-        "4f456c502493bdc0ed2ab756a3a6ed4d"
-     +  "67352a697d4216e93212b127a63d5411"
-     +  "ce6fa98d5dbefd73263e372814274381"
-     +  "8166ed7dd63687dd2a8ca1d2f4fbd8e1");
-
-    byte[] input_1024_1 = Hex.decode(
-        "6628194e12073db03ba94cda9ef95323"
-      + "97d50dba79b987004afefe34");
-
-    byte[] seed_1024_1 = Hex.decode(
-        "18b776ea21069d69776a33e96bad48e1"
-      + "dda0a5ef");
-
-    byte[] output_1024_1 = Hex.decode(
-        "354fe67b4a126d5d35fe36c777791a3f"
-      + "7ba13def484e2d3908aff722fad468fb"
-      + "21696de95d0be911c2d3174f8afcc201"
-      + "035f7b6d8e69402de5451618c21a535f"
-      + "a9d7bfc5b8dd9fc243f8cf927db31322"
-      + "d6e881eaa91a996170e657a05a266426"
-      + "d98c88003f8477c1227094a0d9fa1e8c"
-      + "4024309ce1ecccb5210035d47ac72e8a");
-
-    byte[] input_1024_2 = Hex.decode(
-        "750c4047f547e8e41411856523298ac9"
-      +  "bae245efaf1397fbe56f9dd5");
-
-    byte[] seed_1024_2 = Hex.decode(
-        "0cc742ce4a9b7f32f951bcb251efd925"
-      + "fe4fe35f");
-
-    byte[] output_1024_2 = Hex.decode(
-        "640db1acc58e0568fe5407e5f9b701df"
-      + "f8c3c91e716c536fc7fcec6cb5b71c11"
-      + "65988d4a279e1577d730fc7a29932e3f"
-      + "00c81515236d8d8e31017a7a09df4352"
-      + "d904cdeb79aa583adcc31ea698a4c052"
-      + "83daba9089be5491f67c1a4ee48dc74b"
-      + "bbe6643aef846679b4cb395a352d5ed1"
-      + "15912df696ffe0702932946d71492b44");
-
-    byte[] input_1024_3 = Hex.decode(
-        "d94ae0832e6445ce42331cb06d531a82"
-      + "b1db4baad30f746dc916df24d4e3c245"
-      + "1fff59a6423eb0e1d02d4fe646cf699d"
-      + "fd818c6e97b051");
-
-    byte[] seed_1024_3 = Hex.decode(
-        "2514df4695755a67b288eaf4905c36ee"
-      + "c66fd2fd");
-
-    byte[] output_1024_3 = Hex.decode(
-        "423736ed035f6026af276c35c0b3741b"
-      + "365e5f76ca091b4e8c29e2f0befee603"
-      + "595aa8322d602d2e625e95eb81b2f1c9"
-      + "724e822eca76db8618cf09c5343503a4"
-      + "360835b5903bc637e3879fb05e0ef326"
-      + "85d5aec5067cd7cc96fe4b2670b6eac3"
-      + "066b1fcf5686b68589aafb7d629b02d8"
-      + "f8625ca3833624d4800fb081b1cf94eb");
-
-    byte[] input_1024_4 = Hex.decode(
-        "52e650d98e7f2a048b4f86852153b97e"
-      + "01dd316f346a19f67a85");
-
-    byte[] seed_1024_4 = Hex.decode(
-        "c4435a3e1a18a68b6820436290a37cef"
-      + "b85db3fb");
-
-    byte[] output_1024_4 = Hex.decode(
-        "45ead4ca551e662c9800f1aca8283b05"
-      + "25e6abae30be4b4aba762fa40fd3d38e"
-      + "22abefc69794f6ebbbc05ddbb1121624"
-      + "7d2f412fd0fba87c6e3acd888813646f"
-      + "d0e48e785204f9c3f73d6d8239562722"
-      + "dddd8771fec48b83a31ee6f592c4cfd4"
-      + "bc88174f3b13a112aae3b9f7b80e0fc6"
-      + "f7255ba880dc7d8021e22ad6a85f0755");
-
-    byte[] input_1024_5 = Hex.decode(
-        "8da89fd9e5f974a29feffb462b49180f"
-      + "6cf9e802");
-
-    byte[] seed_1024_5 = Hex.decode(
-        "b318c42df3be0f83fea823f5a7b47ed5"
-      + "e425a3b5");
-
-    byte[] output_1024_5 = Hex.decode(
-        "36f6e34d94a8d34daacba33a2139d00a"
-      + "d85a9345a86051e73071620056b920e2"
-      + "19005855a213a0f23897cdcd731b4525"
-      + "7c777fe908202befdd0b58386b1244ea"
-      + "0cf539a05d5d10329da44e13030fd760"
-      + "dcd644cfef2094d1910d3f433e1c7c6d"
-      + "d18bc1f2df7f643d662fb9dd37ead905"
-      + "9190f4fa66ca39e869c4eb449cbdc439");
-
-    byte[] input_1024_6 = Hex.decode(
-        "26521050844271");
-
-    byte[] seed_1024_6 = Hex.decode(
-        "e4ec0982c2336f3a677f6a356174eb0c"
-      + "e887abc2");
-
-    byte[] output_1024_6 = Hex.decode(
-        "42cee2617b1ecea4db3f4829386fbd61"
-      + "dafbf038e180d837c96366df24c097b4"
-      + "ab0fac6bdf590d821c9f10642e681ad0"
-      + "5b8d78b378c0f46ce2fad63f74e0ad3d"
-      + "f06b075d7eb5f5636f8d403b9059ca76"
-      + "1b5c62bb52aa45002ea70baace08ded2"
-      + "43b9d8cbd62a68ade265832b56564e43"
-      + "a6fa42ed199a099769742df1539e8255");
-
-    byte[] modulus_1027 = Hex.decode(
-        "051240b6cc0004fa48d0134671c078c7"
-      + "c8dec3b3e2f25bc2564467339db38853"
-      + "d06b85eea5b2de353bff42ac2e46bc97"
-      + "fae6ac9618da9537a5c8f553c1e35762"
-      + "5991d6108dcd7885fb3a25413f53efca"
-      + "d948cb35cd9b9ae9c1c67626d113d57d"
-      + "de4c5bea76bb5bb7de96c00d07372e96"
-      + "85a6d75cf9d239fa148d70931b5f3fb0"
-      + "39");
-
-    byte[] pubExp_1027 = Hex.decode(
-        "010001");
-
-    byte[] privExp_1027 = Hex.decode(
-        "0411ffca3b7ca5e9e9be7fe38a85105e"
-      + "353896db05c5796aecd2a725161eb365"
-      + "1c8629a9b862b904d7b0c7b37f8cb5a1"
-      + "c2b54001018a00a1eb2cafe4ee4e9492"
-      + "c348bc2bedab4b9ebbf064e8eff322b9"
-      + "009f8eec653905f40df88a3cdc49d456"
-      + "7f75627d41aca624129b46a0b7c698e5"
-      + "e65f2b7ba102c749a10135b6540d0401");
-
-    byte[] prime1_1027 = Hex.decode(
-        "027458c19ec1636919e736c9af25d609"
-      + "a51b8f561d19c6bf6943dd1ee1ab8a4a"
-      + "3f232100bd40b88decc6ba235548b6ef"
-      + "792a11c9de823d0a7922c7095b6eba57"
-      + "01");
-
-    byte[] prime2_1027 = Hex.decode(
-        "0210ee9b33ab61716e27d251bd465f4b"
-      + "35a1a232e2da00901c294bf22350ce49"
-      + "0d099f642b5375612db63ba1f2038649"
-      + "2bf04d34b3c22bceb909d13441b53b51"
-      + "39");
-
-    byte[] primeExp1_1027 = Hex.decode(
-        "39fa028b826e88c1121b750a8b242fa9"
-      + "a35c5b66bdfd1fa637d3cc48a84a4f45"
-      + "7a194e7727e49f7bcc6e5a5a412657fc"
-      + "470c7322ebc37416ef458c307a8c0901");
-
-    byte[] primeExp2_1027 = Hex.decode(
-        "015d99a84195943979fa9e1be2c3c1b6"
-      + "9f432f46fd03e47d5befbbbfd6b1d137"
-      + "1d83efb330a3e020942b2fed115e5d02"
-      + "be24fd92c9019d1cecd6dd4cf1e54cc8"
-      + "99");
-
-    byte[] crtCoef_1027 = Hex.decode(
-        "01f0b7015170b3f5e42223ba30301c41"
-      + "a6d87cbb70e30cb7d3c67d25473db1f6"
-      + "cbf03e3f9126e3e97968279a865b2c2b"
-      + "426524cfc52a683d31ed30eb984be412"
-      + "ba");
-
-    byte[] input_1027_1 = Hex.decode(
-        "4a86609534ee434a6cbca3f7e962e76d"
-      + "455e3264c19f605f6e5ff6137c65c56d"
-      + "7fb344cd52bc93374f3d166c9f0c6f9c"
-      + "506bad19330972d2");
-
-    byte[] seed_1027_1 = Hex.decode(
-        "1cac19ce993def55f98203f6852896c9"
-      + "5ccca1f3");
-
-    byte[] output_1027_1 = Hex.decode(
-        "04cce19614845e094152a3fe18e54e33"
-      + "30c44e5efbc64ae16886cb1869014cc5"
-      + "781b1f8f9e045384d0112a135ca0d12e"
-      + "9c88a8e4063416deaae3844f60d6e96f"
-      + "e155145f4525b9a34431ca3766180f70"
-      + "e15a5e5d8e8b1a516ff870609f13f896"
-      + "935ced188279a58ed13d07114277d75c"
-      + "6568607e0ab092fd803a223e4a8ee0b1"
-      + "a8");
-
-    byte[] input_1027_2 = Hex.decode(
-        "b0adc4f3fe11da59ce992773d9059943"
-      + "c03046497ee9d9f9a06df1166db46d98"
-      + "f58d27ec074c02eee6cbe2449c8b9fc5"
-      + "080c5c3f4433092512ec46aa793743c8");
-
-    byte[] seed_1027_2 = Hex.decode(
-        "f545d5897585e3db71aa0cb8da76c51d"
-      + "032ae963");
-
-    byte[] output_1027_2 = Hex.decode(
-        "0097b698c6165645b303486fbf5a2a44"
-      + "79c0ee85889b541a6f0b858d6b6597b1"
-      + "3b854eb4f839af03399a80d79bda6578"
-      + "c841f90d645715b280d37143992dd186"
-      + "c80b949b775cae97370e4ec97443136c"
-      + "6da484e970ffdb1323a20847821d3b18"
-      + "381de13bb49aaea66530c4a4b8271f3e"
-      + "ae172cd366e07e6636f1019d2a28aed1"
-      + "5e");
-
-    byte[] input_1027_3 = Hex.decode(
-        "bf6d42e701707b1d0206b0c8b45a1c72"
-      + "641ff12889219a82bdea965b5e79a96b"
-      + "0d0163ed9d578ec9ada20f2fbcf1ea3c"
-      + "4089d83419ba81b0c60f3606da99");
-
-    byte[] seed_1027_3 = Hex.decode(
-        "ad997feef730d6ea7be60d0dc52e72ea"
-      + "cbfdd275");
-
-    byte[] output_1027_3 = Hex.decode(
-        "0301f935e9c47abcb48acbbe09895d9f"
-      + "5971af14839da4ff95417ee453d1fd77"
-      + "319072bb7297e1b55d7561cd9d1bb24c"
-      + "1a9a37c619864308242804879d86ebd0"
-      + "01dce5183975e1506989b70e5a834341"
-      + "54d5cbfd6a24787e60eb0c658d2ac193"
-      + "302d1192c6e622d4a12ad4b53923bca2"
-      + "46df31c6395e37702c6a78ae081fb9d0"
-      + "65");
-
-    byte[] input_1027_4 = Hex.decode(
-        "fb2ef112f5e766eb94019297934794f7"
-      + "be2f6fc1c58e");
-
-    byte[] seed_1027_4 = Hex.decode(
-        "136454df5730f73c807a7e40d8c1a312"
-      + "ac5b9dd3");
-
-    byte[] output_1027_4 = Hex.decode(
-        "02d110ad30afb727beb691dd0cf17d0a"
-      + "f1a1e7fa0cc040ec1a4ba26a42c59d0a"
-      + "796a2e22c8f357ccc98b6519aceb682e"
-      + "945e62cb734614a529407cd452bee3e4"
-      + "4fece8423cc19e55548b8b994b849c7e"
-      + "cde4933e76037e1d0ce44275b08710c6"
-      + "8e430130b929730ed77e09b015642c55"
-      + "93f04e4ffb9410798102a8e96ffdfe11"
-      + "e4");
-
-    byte[] input_1027_5 = Hex.decode(
-        "28ccd447bb9e85166dabb9e5b7d1adad"
-      + "c4b9d39f204e96d5e440ce9ad928bc1c"
-      + "2284");
-
-    byte[] seed_1027_5 = Hex.decode(
-        "bca8057f824b2ea257f2861407eef63d"
-      + "33208681");
-
-    byte[] output_1027_5 = Hex.decode(
-        "00dbb8a7439d90efd919a377c54fae8f"
-      + "e11ec58c3b858362e23ad1b8a4431079"
-      + "9066b99347aa525691d2adc58d9b06e3"
-      + "4f288c170390c5f0e11c0aa3645959f1"
-      + "8ee79e8f2be8d7ac5c23d061f18dd74b"
-      + "8c5f2a58fcb5eb0c54f99f01a8324756"
-      + "8292536583340948d7a8c97c4acd1e98"
-      + "d1e29dc320e97a260532a8aa7a758a1e"
-      + "c2");
-
-    byte[] input_1027_6 = Hex.decode(
-        "f22242751ec6b1");
-
-    byte[] seed_1027_6 = Hex.decode(
-        "2e7e1e17f647b5ddd033e15472f90f68"
-      + "12f3ac4e");
-
-    byte[] output_1027_6 = Hex.decode(
-        "00a5ffa4768c8bbecaee2db77e8f2eec"
-      + "99595933545520835e5ba7db9493d3e1"
-      + "7cddefe6a5f567624471908db4e2d83a"
-      + "0fbee60608fc84049503b2234a07dc83"
-      + "b27b22847ad8920ff42f674ef79b7628"
-      + "0b00233d2b51b8cb2703a9d42bfbc825"
-      + "0c96ec32c051e57f1b4ba528db89c37e"
-      + "4c54e27e6e64ac69635ae887d9541619"
-      + "a9");
-
-    private void oaepVecTest(
-        int keySize,
-        int no,
-        RSAKeyParameters pubParam,
-        RSAKeyParameters privParam,
-        byte[] seed,
-        byte[] input,
-        byte[] output)
-        throws Exception
-    {
-        encDec(keySize + " " + no, pubParam, privParam, seed, input, output);
-    }
-
-    public OAEPTest()
-    {
-    }
-
-    public String getName()
-    {
-        return "OAEP";
-    }
-
-    public void performTest() throws Exception
-    {
-        baseOaepTest(1, pubKeyEnc1, privKeyEnc1, output1);
-        baseOaepTest(2, pubKeyEnc2, privKeyEnc2, output2);
-        baseOaepTest(3, pubKeyEnc3, privKeyEnc3, output3);
-
-        RSAKeyParameters pubParam = new RSAKeyParameters(false, new BigInteger(1, modulus_1024), new BigInteger(1, pubExp_1024));
-        RSAKeyParameters privParam = new RSAPrivateCrtKeyParameters(pubParam.getModulus(), pubParam.getExponent(), new BigInteger(1, privExp_1024), new BigInteger(1, prime1_1024), new BigInteger(1, prime2_1024), new BigInteger(1, primeExp1_1024), new BigInteger(1, primeExp2_1024), new BigInteger(1, crtCoef_1024));
-
-        oaepVecTest(1024, 1, pubParam, privParam, seed_1024_1, input_1024_1, output_1024_1);
-        oaepVecTest(1024, 2, pubParam, privParam, seed_1024_2, input_1024_2, output_1024_2);
-        oaepVecTest(1024, 3, pubParam, privParam, seed_1024_3, input_1024_3, output_1024_3);
-        oaepVecTest(1024, 4, pubParam, privParam, seed_1024_4, input_1024_4, output_1024_4);
-        oaepVecTest(1024, 5, pubParam, privParam, seed_1024_5, input_1024_5, output_1024_5);
-        oaepVecTest(1024, 6, pubParam, privParam, seed_1024_6, input_1024_6, output_1024_6);
-
-        pubParam = new RSAKeyParameters(false, new BigInteger(1, modulus_1027), new BigInteger(1, pubExp_1027));
-        privParam = new RSAPrivateCrtKeyParameters(pubParam.getModulus(), pubParam.getExponent(), new BigInteger(1, privExp_1027), new BigInteger(1, prime1_1027), new BigInteger(1, prime2_1027), new BigInteger(1, primeExp1_1027), new BigInteger(1, primeExp2_1027), new BigInteger(1, crtCoef_1027));
-
-        oaepVecTest(1027, 1, pubParam, privParam, seed_1027_1, input_1027_1, output_1027_1);
-        oaepVecTest(1027, 2, pubParam, privParam, seed_1027_2, input_1027_2, output_1027_2);
-        oaepVecTest(1027, 3, pubParam, privParam, seed_1027_3, input_1027_3, output_1027_3);
-        oaepVecTest(1027, 4, pubParam, privParam, seed_1027_4, input_1027_4, output_1027_4);
-        oaepVecTest(1027, 5, pubParam, privParam, seed_1027_5, input_1027_5, output_1027_5);
-        oaepVecTest(1027, 6, pubParam, privParam, seed_1027_6, input_1027_6, output_1027_6);
-
-        //
-        // OAEP - public encrypt, private decrypt  differring hashes
-        //
-        AsymmetricBlockCipher cipher = new OAEPEncoding(new RSAEngine(), new SHA256Digest(), new SHA1Digest(), new byte[10]);
-
-        cipher.init(true, new ParametersWithRandom(pubParam, new SecureRandom()));
-
-        byte[] input = new byte[10];
-
-        byte[] out = cipher.processBlock(input, 0, input.length);
-
-        cipher.init(false, privParam);
-
-        out = cipher.processBlock(out, 0, out.length);
-
-        for (int i = 0; i != input.length; i++)
-        {
-            if (out[i] != input[i])
-            {
-                fail("mixed digest failed decoding");
-            }
-        }
-
-        cipher = new OAEPEncoding(new RSAEngine(), new SHA1Digest(), new SHA256Digest(), new byte[10]);
-
-        cipher.init(true, new ParametersWithRandom(pubParam, new SecureRandom()));
-
-        out = cipher.processBlock(input, 0, input.length);
-
-        cipher.init(false, privParam);
-
-        out = cipher.processBlock(out, 0, out.length);
-
-        for (int i = 0; i != input.length; i++)
-        {
-            if (out[i] != input[i])
-            {
-                fail("mixed digest failed decoding");
-            }
-        }
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        runTest(new OAEPTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/OCBTest.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/OCBTest.java
deleted file mode 100644
index 26d7d12..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/OCBTest.java
+++ /dev/null
@@ -1,520 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import java.security.SecureRandom;
-
-import org.bouncycastle.crypto.BlockCipher;
-import org.bouncycastle.crypto.InvalidCipherTextException;
-import org.bouncycastle.crypto.engines.AESEngine;
-import org.bouncycastle.crypto.engines.DESEngine;
-import org.bouncycastle.crypto.modes.AEADBlockCipher;
-import org.bouncycastle.crypto.modes.OCBBlockCipher;
-import org.bouncycastle.crypto.params.AEADParameters;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.Times;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-
-/**
- * Test vectors from <a href="http://tools.ietf.org/html/rfc7253">RFC 7253 on The OCB
- * Authenticated-Encryption Algorithm</a>
- */
-public class OCBTest
-    extends SimpleTest
-{
-    private static final String KEY_128 = "000102030405060708090A0B0C0D0E0F";
-    private static final String KEY_96 = "0F0E0D0C0B0A09080706050403020100";
-
-    /*
-     * Test vectors from Appendix A of the specification, containing the strings N, A, P, C in order
-     */
-
-    private static final String[][] TEST_VECTORS_128 = new String[][]{
-        { "BBAA99887766554433221100",
-          "",
-          "",
-          "785407BFFFC8AD9EDCC5520AC9111EE6" },
-        { "BBAA99887766554433221101",
-          "0001020304050607",
-          "0001020304050607",
-          "6820B3657B6F615A5725BDA0D3B4EB3A257C9AF1F8F03009" },
-        { "BBAA99887766554433221102",
-          "0001020304050607",
-          "",
-          "81017F8203F081277152FADE694A0A00" },
-        { "BBAA99887766554433221103",
-          "",
-          "0001020304050607",
-          "45DD69F8F5AAE72414054CD1F35D82760B2CD00D2F99BFA9" },
-        { "BBAA99887766554433221104",
-          "000102030405060708090A0B0C0D0E0F",
-          "000102030405060708090A0B0C0D0E0F",
-          "571D535B60B277188BE5147170A9A22C3AD7A4FF3835B8C5701C1CCEC8FC3358" },
-        { "BBAA99887766554433221105",
-          "000102030405060708090A0B0C0D0E0F",
-          "",
-          "8CF761B6902EF764462AD86498CA6B97" },
-        { "BBAA99887766554433221106",
-          "",
-          "000102030405060708090A0B0C0D0E0F",
-          "5CE88EC2E0692706A915C00AEB8B2396F40E1C743F52436BDF06D8FA1ECA343D" },
-        { "BBAA99887766554433221107",
-          "000102030405060708090A0B0C0D0E0F1011121314151617",
-          "000102030405060708090A0B0C0D0E0F1011121314151617",
-          "1CA2207308C87C010756104D8840CE1952F09673A448A122C92C62241051F57356D7F3C90BB0E07F" },
-        { "BBAA99887766554433221108",
-          "000102030405060708090A0B0C0D0E0F1011121314151617",
-          "",
-          "6DC225A071FC1B9F7C69F93B0F1E10DE" },
-        { "BBAA99887766554433221109",
-          "",
-          "000102030405060708090A0B0C0D0E0F1011121314151617",
-          "221BD0DE7FA6FE993ECCD769460A0AF2D6CDED0C395B1C3CE725F32494B9F914D85C0B1EB38357FF" },
-        { "BBAA9988776655443322110A",
-          "000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F",
-          "000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F",
-          "BD6F6C496201C69296C11EFD138A467ABD3C707924B964DEAFFC40319AF5A48540FBBA186C5553C68AD9F592A79A4240" },
-        { "BBAA9988776655443322110B",
-          "000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F",
-          "",
-          "FE80690BEE8A485D11F32965BC9D2A32" },
-        { "BBAA9988776655443322110C",
-          "",
-          "000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F",
-          "2942BFC773BDA23CABC6ACFD9BFD5835BD300F0973792EF46040C53F1432BCDFB5E1DDE3BC18A5F840B52E653444D5DF" },
-        { "BBAA9988776655443322110D",
-          "000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F2021222324252627",
-          "000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F2021222324252627",
-          "D5CA91748410C1751FF8A2F618255B68A0A12E093FF454606E59F9C1D0DDC54B65E8628E568BAD7AED07BA06A4A69483A7035490C5769E60" },
-        { "BBAA9988776655443322110E",
-          "000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F2021222324252627",
-          "",
-          "C5CD9D1850C141E358649994EE701B68" },
-        { "BBAA9988776655443322110F",
-          "",
-          "000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F2021222324252627",
-          "4412923493C57D5DE0D700F753CCE0D1D2D95060122E9F15A5DDBFC5787E50B5CC55EE507BCB084E479AD363AC366B95A98CA5F3000B1479" },
-    };
-
-    private static final String[][] TEST_VECTORS_96 = new String[][]{
-        { "BBAA9988776655443322110D",
-          "000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F2021222324252627",
-          "000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F2021222324252627",
-          "1792A4E31E0755FB03E31B22116E6C2DDF9EFD6E33D536F1A0124B0A55BAE884ED93481529C76B6AD0C515F4D1CDD4FDAC4F02AA" },
-    };
-
-    public String getName()
-    {
-        return "OCB";
-    }
-
-    public void performTest()
-        throws Exception
-    {
-        byte[] K128 = Hex.decode(KEY_128);
-        for (int i = 0; i < TEST_VECTORS_128.length; ++i)
-        {
-            runTestCase("Test Case " + i, TEST_VECTORS_128[i], 128, K128);
-        }
-
-        byte[] K96 = Hex.decode(KEY_96);
-        for (int i = 0; i < TEST_VECTORS_96.length; ++i)
-        {
-            runTestCase("Test Case " + i, TEST_VECTORS_96[i], 96, K96);
-        }
-
-        runLongerTestCase(128, 128, "67E944D23256C5E0B6C61FA22FDF1EA2");
-        runLongerTestCase(192, 128, "F673F2C3E7174AAE7BAE986CA9F29E17");
-        runLongerTestCase(256, 128, "D90EB8E9C977C88B79DD793D7FFA161C");
-        runLongerTestCase(128, 96, "77A3D8E73589158D25D01209");
-        runLongerTestCase(192, 96, "05D56EAD2752C86BE6932C5E");
-        runLongerTestCase(256, 96, "5458359AC23B0CBA9E6330DD");
-        runLongerTestCase(128, 64, "192C9B7BD90BA06A");
-        runLongerTestCase(192, 64, "0066BC6E0EF34E24");
-        runLongerTestCase(256, 64, "7D4EA5D445501CBE");
-
-        randomTests();
-        outputSizeTests();
-        testExceptions();
-    }
-
-    private void testExceptions() throws InvalidCipherTextException
-    {
-        AEADBlockCipher ocb = createOCBCipher();
-
-        try
-        {
-            ocb = new OCBBlockCipher(new DESEngine(), new DESEngine());
-
-            fail("incorrect block size not picked up");
-        }
-        catch (IllegalArgumentException e)
-        {
-            // expected
-        }
-
-        try
-        {
-            ocb.init(false, new KeyParameter(new byte[16]));
-
-            fail("illegal argument not picked up");
-        }
-        catch (IllegalArgumentException e)
-        {
-            // expected
-        }
-
-        AEADTestUtil.testReset(this, createOCBCipher(), createOCBCipher(), new AEADParameters(new KeyParameter(new byte[16]), 128, new byte[15]));
-        AEADTestUtil.testTampering(this, ocb, new AEADParameters(new KeyParameter(new byte[16]), 128, new byte[15]));
-        AEADTestUtil.testOutputSizes(this, createOCBCipher(), new AEADParameters(new KeyParameter(new byte[16]), 128,
-                new byte[15]));
-        AEADTestUtil.testBufferSizeChecks(this, createOCBCipher(), new AEADParameters(new KeyParameter(new byte[16]),
-                128, new byte[15]));
-    }
-
-    private void runTestCase(String testName, String[] testVector, int macLengthBits, byte[] K)
-        throws InvalidCipherTextException
-    {
-        int pos = 0;
-        byte[] N = Hex.decode(testVector[pos++]);
-        byte[] A = Hex.decode(testVector[pos++]);
-        byte[] P = Hex.decode(testVector[pos++]);
-        byte[] C = Hex.decode(testVector[pos++]);
-
-        int macLengthBytes = macLengthBits / 8;
-
-        KeyParameter keyParameter = new KeyParameter(K);
-        AEADParameters parameters = new AEADParameters(keyParameter, macLengthBits, N, A);
-
-        AEADBlockCipher encCipher = initOCBCipher(true, parameters);
-        AEADBlockCipher decCipher = initOCBCipher(false, parameters);
-
-        checkTestCase(encCipher, decCipher, testName, macLengthBytes, P, C);
-        checkTestCase(encCipher, decCipher, testName + " (reused)", macLengthBytes, P, C);
-
-        // Key reuse
-        AEADParameters keyReuseParams = AEADTestUtil.reuseKey(parameters);
-        encCipher.init(true, keyReuseParams);
-        decCipher.init(false, keyReuseParams);
-        checkTestCase(encCipher, decCipher, testName + " (key reuse)", macLengthBytes, P, C);
-    }
-
-    private BlockCipher createUnderlyingCipher()
-    {
-        return new AESEngine();
-    }
-
-    private AEADBlockCipher createOCBCipher()
-    {
-        return new OCBBlockCipher(createUnderlyingCipher(), createUnderlyingCipher());
-    }
-
-    private AEADBlockCipher initOCBCipher(boolean forEncryption, AEADParameters parameters)
-    {
-        AEADBlockCipher c = createOCBCipher();
-        c.init(forEncryption, parameters);
-        return c;
-    }
-
-    private void checkTestCase(AEADBlockCipher encCipher, AEADBlockCipher decCipher, String testName,
-        int macLengthBytes, byte[] P, byte[] C)
-        throws InvalidCipherTextException
-    {
-        byte[] tag = Arrays.copyOfRange(C, C.length - macLengthBytes, C.length);
-
-        {
-            byte[] enc = new byte[encCipher.getOutputSize(P.length)];
-            int len = encCipher.processBytes(P, 0, P.length, enc, 0);
-            len += encCipher.doFinal(enc, len);
-
-            if (enc.length != len)
-            {
-                fail("encryption reported incorrect length: " + testName);
-            }
-
-            if (!areEqual(C, enc))
-            {
-                fail("incorrect encrypt in: " + testName);
-            }
-
-            if (!areEqual(tag, encCipher.getMac()))
-            {
-                fail("getMac() not the same as the appended tag: " + testName);
-            }
-        }
-
-        {
-            byte[] dec = new byte[decCipher.getOutputSize(C.length)];
-            int len = decCipher.processBytes(C, 0, C.length, dec, 0);
-            len += decCipher.doFinal(dec, len);
-
-            if (dec.length != len)
-            {
-                fail("decryption reported incorrect length: " + testName);
-            }
-
-            if (!areEqual(P, dec))
-            {
-                fail("incorrect decrypt in: " + testName);
-            }
-
-            if (!areEqual(tag, decCipher.getMac()))
-            {
-                fail("getMac() not the same as the appended tag: " + testName);
-            }
-        }
-    }
-
-    private void runLongerTestCase(int keyLen, int tagLen, String expectedOutputHex)
-        throws InvalidCipherTextException
-    {
-        byte[] expectedOutput = Hex.decode(expectedOutputHex);
-        byte[] keyBytes = new byte[keyLen / 8];
-        keyBytes[keyBytes.length - 1] = (byte)tagLen;
-        KeyParameter key = new KeyParameter(keyBytes);
-
-        AEADBlockCipher c1 = initOCBCipher(true, new AEADParameters(key, tagLen, createNonce(385)));
-        AEADBlockCipher c2 = createOCBCipher();
-
-        long total = 0;
-
-        byte[] S = new byte[128];
-
-        int n = 0;
-        for (int i = 0; i < 128; ++i)
-        {
-            c2.init(true, new AEADParameters(key, tagLen, createNonce(++n)));
-            total += updateCiphers(c1, c2, S, i, true, true);
-            c2.init(true, new AEADParameters(key, tagLen, createNonce(++n)));
-            total += updateCiphers(c1, c2, S, i, false, true);
-            c2.init(true, new AEADParameters(key, tagLen, createNonce(++n)));
-            total += updateCiphers(c1, c2, S, i, true, false);
-        }
-
-        long expectedTotal = 16256 + (48 * tagLen);
-
-        if (total != expectedTotal)
-        {
-            fail("test generated the wrong amount of input: " + total);
-        }
-
-        byte[] output = new byte[c1.getOutputSize(0)];
-        c1.doFinal(output, 0);
-
-        if (!areEqual(expectedOutput, output))
-        {
-            fail("incorrect encrypt in long-form test");
-        }
-    }
-
-    private byte[] createNonce(int n)
-    {
-        return new byte[]{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, (byte)(n >>> 8), (byte)n };
-    }
-
-    private int updateCiphers(AEADBlockCipher c1, AEADBlockCipher c2, byte[] S, int i,
-        boolean includeAAD, boolean includePlaintext)
-        throws InvalidCipherTextException
-    {
-        int inputLen = includePlaintext ? i : 0;
-        int outputLen = c2.getOutputSize(inputLen);
-
-        byte[] output = new byte[outputLen];
-
-        int len = 0;
-
-        if (includeAAD)
-        {
-            c2.processAADBytes(S, 0, i);
-        }
-
-        if (includePlaintext)
-        {
-            len += c2.processBytes(S, 0, i, output, len);
-        }
-
-        len += c2.doFinal(output, len);
-
-        c1.processAADBytes(output, 0, len);
-
-        return len;
-    }
-
-    private void randomTests()
-        throws InvalidCipherTextException
-    {
-        SecureRandom srng = new SecureRandom();
-        srng.setSeed(Times.nanoTime());
-        for (int i = 0; i < 10; ++i)
-        {
-            randomTest(srng);
-        }
-    }
-
-    private void randomTest(SecureRandom srng)
-        throws InvalidCipherTextException
-    {
-        int kLength = 16 + 8 * (Math.abs(srng.nextInt()) % 3);
-        byte[] K = new byte[kLength];
-        srng.nextBytes(K);
-
-        int pLength = srng.nextInt() >>> 16;
-        byte[] P = new byte[pLength];
-        srng.nextBytes(P);
-
-        int aLength = srng.nextInt() >>> 24;
-        byte[] A = new byte[aLength];
-        srng.nextBytes(A);
-
-        int saLength = srng.nextInt() >>> 24;
-        byte[] SA = new byte[saLength];
-        srng.nextBytes(SA);
-
-        int ivLength = 1 + nextInt(srng, 15);
-        byte[] IV = new byte[ivLength];
-        srng.nextBytes(IV);
-
-        AEADParameters parameters = new AEADParameters(new KeyParameter(K), 16 * 8, IV, A);
-        AEADBlockCipher cipher = initOCBCipher(true, parameters);
-        byte[] C = new byte[cipher.getOutputSize(P.length)];
-        int predicted = cipher.getUpdateOutputSize(P.length);
-
-        int split = nextInt(srng, SA.length + 1);
-        cipher.processAADBytes(SA, 0, split);
-        int len = cipher.processBytes(P, 0, P.length, C, 0);
-        cipher.processAADBytes(SA, split, SA.length - split);
-
-        if (predicted != len)
-        {
-            fail("encryption reported incorrect update length in randomised test");
-        }
-
-        len += cipher.doFinal(C, len);
-
-        if (C.length != len)
-        {
-            fail("encryption reported incorrect length in randomised test");
-        }
-
-        byte[] encT = cipher.getMac();
-        byte[] tail = new byte[C.length - P.length];
-        System.arraycopy(C, P.length, tail, 0, tail.length);
-
-        if (!areEqual(encT, tail))
-        {
-            fail("stream contained wrong mac in randomised test");
-        }
-
-        cipher.init(false, parameters);
-        byte[] decP = new byte[cipher.getOutputSize(C.length)];
-        predicted = cipher.getUpdateOutputSize(C.length);
-
-        split = nextInt(srng, SA.length + 1);
-        cipher.processAADBytes(SA, 0, split);
-        len = cipher.processBytes(C, 0, C.length, decP, 0);
-        cipher.processAADBytes(SA, split, SA.length - split);
-
-        if (predicted != len)
-        {
-            fail("decryption reported incorrect update length in randomised test");
-        }
-
-        len += cipher.doFinal(decP, len);
-
-        if (!areEqual(P, decP))
-        {
-            fail("incorrect decrypt in randomised test");
-        }
-
-        byte[] decT = cipher.getMac();
-        if (!areEqual(encT, decT))
-        {
-            fail("decryption produced different mac from encryption");
-        }
-
-        //
-        // key reuse test
-        //
-        cipher.init(false, AEADTestUtil.reuseKey(parameters));
-        decP = new byte[cipher.getOutputSize(C.length)];
-
-        split = nextInt(srng, SA.length + 1);
-        cipher.processAADBytes(SA, 0, split);
-        len = cipher.processBytes(C, 0, C.length, decP, 0);
-        cipher.processAADBytes(SA, split, SA.length - split);
-
-        len += cipher.doFinal(decP, len);
-
-        if (!areEqual(P, decP))
-        {
-            fail("incorrect decrypt in randomised test");
-        }
-
-        decT = cipher.getMac();
-        if (!areEqual(encT, decT))
-        {
-            fail("decryption produced different mac from encryption");
-        }
-    }
-
-    private void outputSizeTests()
-    {
-        byte[] K = new byte[16];
-        byte[] A = null;
-        byte[] IV = new byte[15];
-
-        AEADParameters parameters = new AEADParameters(new KeyParameter(K), 16 * 8, IV, A);
-        AEADBlockCipher cipher = initOCBCipher(true, parameters);
-
-        if (cipher.getUpdateOutputSize(0) != 0)
-        {
-            fail("incorrect getUpdateOutputSize for initial 0 bytes encryption");
-        }
-
-        if (cipher.getOutputSize(0) != 16)
-        {
-            fail("incorrect getOutputSize for initial 0 bytes encryption");
-        }
-
-        cipher.init(false, parameters);
-
-        if (cipher.getUpdateOutputSize(0) != 0)
-        {
-            fail("incorrect getUpdateOutputSize for initial 0 bytes decryption");
-        }
-
-        // NOTE: 0 bytes would be truncated data, but we want it to fail in the doFinal, not here
-        if (cipher.getOutputSize(0) != 0)
-        {
-            fail("fragile getOutputSize for initial 0 bytes decryption");
-        }
-
-        if (cipher.getOutputSize(16) != 0)
-        {
-            fail("incorrect getOutputSize for initial MAC-size bytes decryption");
-        }
-    }
-
-    private static int nextInt(SecureRandom rand, int n)
-    {
-        if ((n & -n) == n)  // i.e., n is a power of 2
-        {
-            return (int)((n * (long)(rand.nextInt() >>> 1)) >> 31);
-        }
-
-        int bits, value;
-        do
-        {
-            bits = rand.nextInt() >>> 1;
-            value = bits % n;
-        }
-        while (bits - value + (n - 1) < 0);
-
-        return value;
-    }
-
-    public static void main(String[] args)
-    {
-        runTest(new OCBTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/OpenBSDBCryptTest.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/OpenBSDBCryptTest.java
deleted file mode 100644
index 1355f3a..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/OpenBSDBCryptTest.java
+++ /dev/null
@@ -1,141 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import org.bouncycastle.crypto.generators.OpenBSDBCrypt;
-import org.bouncycastle.util.test.SimpleTest;
-
-public class OpenBSDBCryptTest
-    extends SimpleTest
-{
-
-    private final static String[][] bcryptTest1 = // vectors from http://cvsweb.openwall.com/cgi/cvsweb.cgi/Owl/packages/glibc/crypt_blowfish/wrapper.c?rev=HEAD
-        {
-            {"$2a$05$CCCCCCCCCCCCCCCCCCCCC.E5YPO9kmyuRGyh0XouQYb4YMJKvyOeW",
-                "U*U"},
-            {"$2a$05$CCCCCCCCCCCCCCCCCCCCC.VGOzA784oUp/Z0DY336zx7pLYAy0lwK",
-                "U*U*"},
-            {"$2a$05$XXXXXXXXXXXXXXXXXXXXXOAcXxm9kjPGEMsLznoKqmqw7tc8WCx4a",
-                "U*U*U"},
-            {"$2a$05$CCCCCCCCCCCCCCCCCCCCC.7uG0VCzI2bS7j6ymqJi9CdcdxiRTWNy",
-                ""},
-            {"$2a$05$abcdefghijklmnopqrstuu5s2v8.iXieOjg/.AySBTTZIIVFJeBui",
-                "0123456789abcdefghijklmnopqrstuvwxyz"
-                    + "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
-                    + "chars after 72 are ignored"},
-        };
-
-    private final static String[] bcryptTest2 = { // from: http://openwall.info/wiki/john/sample-hashes
-        "$2a$05$bvIG6Nmid91Mu9RcmmWZfO5HJIMCT8riNW0hEp8f6/FuA2/mHZFpe", "password"
-    };
-
-    private final static String[] bcryptTest2b = { // from: http://stackoverflow.com/questions/11654684/verifying-a-bcrypt-hash
-        "$2a$10$.TtQJ4Jr6isd4Hp.mVfZeuh6Gws4rOQ/vdBczhDx.19NFK0Y84Dle", "ππππππππ"
-    };
-
-    private final static String[][] bcryptTest3 = // from: https://bitbucket.org/vadim/bcrypt.net/src/464c41416dc9/BCrypt.Net.Test/TestBCrypt.cs - plain - salt - expected
-        {
-            {"", "$2a$06$DCq7YPn5Rq63x1Lad4cll.", "$2a$06$DCq7YPn5Rq63x1Lad4cll.TV4S6ytwfsfvkgY8jIucDrjc8deX1s."},
-            {"", "$2a$08$HqWuK6/Ng6sg9gQzbLrgb.", "$2a$08$HqWuK6/Ng6sg9gQzbLrgb.Tl.ZHfXLhvt/SgVyWhQqgqcZ7ZuUtye"},
-            {"", "$2a$10$k1wbIrmNyFAPwPVPSVa/ze", "$2a$10$k1wbIrmNyFAPwPVPSVa/zecw2BCEnBwVS2GbrmgzxFUOqW9dk4TCW"},
-            {"", "$2a$12$k42ZFHFWqBp3vWli.nIn8u", "$2a$12$k42ZFHFWqBp3vWli.nIn8uYyIkbvYRvodzbfbK18SSsY.CsIQPlxO"},
-            {"a", "$2a$06$m0CrhHm10qJ3lXRY.5zDGO", "$2a$06$m0CrhHm10qJ3lXRY.5zDGO3rS2KdeeWLuGmsfGlMfOxih58VYVfxe"},
-            {"a", "$2a$08$cfcvVd2aQ8CMvoMpP2EBfe", "$2a$08$cfcvVd2aQ8CMvoMpP2EBfeodLEkkFJ9umNEfPD18.hUF62qqlC/V."},
-            {"a", "$2a$10$k87L/MF28Q673VKh8/cPi.", "$2a$10$k87L/MF28Q673VKh8/cPi.SUl7MU/rWuSiIDDFayrKk/1tBsSQu4u"},
-            {"a", "$2a$12$8NJH3LsPrANStV6XtBakCe", "$2a$12$8NJH3LsPrANStV6XtBakCez0cKHXVxmvxIlcz785vxAIZrihHZpeS"},
-            {"abc", "$2a$06$If6bvum7DFjUnE9p2uDeDu", "$2a$06$If6bvum7DFjUnE9p2uDeDu0YHzrHM6tf.iqN8.yx.jNN1ILEf7h0i"},
-            {"abc", "$2a$08$Ro0CUfOqk6cXEKf3dyaM7O", "$2a$08$Ro0CUfOqk6cXEKf3dyaM7OhSCvnwM9s4wIX9JeLapehKK5YdLxKcm"},
-            {"abc", "$2a$10$WvvTPHKwdBJ3uk0Z37EMR.", "$2a$10$WvvTPHKwdBJ3uk0Z37EMR.hLA2W6N9AEBhEgrAOljy2Ae5MtaSIUi"},
-            {"abc", "$2a$12$EXRkfkdmXn2gzds2SSitu.", "$2a$12$EXRkfkdmXn2gzds2SSitu.MW9.gAVqa9eLS1//RYtYCmB1eLHg.9q"},
-            {"abcdefghijklmnopqrstuvwxyz", "$2a$06$.rCVZVOThsIa97pEDOxvGu", "$2a$06$.rCVZVOThsIa97pEDOxvGuRRgzG64bvtJ0938xuqzv18d3ZpQhstC"},
-            {"abcdefghijklmnopqrstuvwxyz", "$2a$08$aTsUwsyowQuzRrDqFflhge", "$2a$08$aTsUwsyowQuzRrDqFflhgekJ8d9/7Z3GV3UcgvzQW3J5zMyrTvlz."},
-            {"abcdefghijklmnopqrstuvwxyz", "$2a$10$fVH8e28OQRj9tqiDXs1e1u", "$2a$10$fVH8e28OQRj9tqiDXs1e1uxpsjN0c7II7YPKXua2NAKYvM6iQk7dq"},
-            {"abcdefghijklmnopqrstuvwxyz", "$2a$12$D4G5f18o7aMMfwasBL7Gpu", "$2a$12$D4G5f18o7aMMfwasBL7GpuQWuP3pkrZrOAnqP.bmezbMng.QwJ/pG"},
-            {"~!@#$%^&*()      ~!@#$%^&*()PNBFRD", "$2a$06$fPIsBO8qRqkjj273rfaOI.", "$2a$06$fPIsBO8qRqkjj273rfaOI.HtSV9jLDpTbZn782DC6/t7qT67P6FfO"},
-            {"~!@#$%^&*()      ~!@#$%^&*()PNBFRD", "$2a$08$Eq2r4G/76Wv39MzSX262hu", "$2a$08$Eq2r4G/76Wv39MzSX262huzPz612MZiYHVUJe/OcOql2jo4.9UxTW"},
-            {"~!@#$%^&*()      ~!@#$%^&*()PNBFRD", "$2a$10$LgfYWkbzEvQ4JakH7rOvHe", "$2a$10$LgfYWkbzEvQ4JakH7rOvHe0y8pHKF9OaFgwUZ2q7W2FFZmZzJYlfS"},
-            {"~!@#$%^&*()      ~!@#$%^&*()PNBFRD", "$2a$12$WApznUOJfkEGSmYRfnkrPO", "$2a$12$WApznUOJfkEGSmYRfnkrPOr466oFDCaj4b6HY3EXGvfxm43seyhgC"},
-        };
-
-    private static final String[][] bcryptTest4 = { // from: https://github.com/ChrisMcKee/cryptsharp/blob/master/Tests/vectors/BCrypt.txt
-        {"n6HyjrYTo/r4lgjvM7L<`iM", "$2a$07$XPrYfnqc5ankSHnRfmPVu.A0trKq3VdczdbJjKaWIksKF.GfFCxv."},
-        {"~s0quB/K8zRtRT:QtZr`s|^O", "$2a$07$5zzz8omiaStXwOetWwlmuePPRwUt0jhNBPYGGgAMcUDvqsGVqv9Cy"},
-        {"r>8y3uE}6<7nI34?Q2rR0JEw", "$2a$07$k5AH9bO9aplPYdZMZ155qOcY1FewMXcupWewW6fViUtsVQ2Umg6LS"},
-        {">l_7}xxH3|Cr{dCR[HTUN@k~", "$2a$05$24xz81ZZsMUMm940bbWMCeHsO.s6A3MG0JZzm4y3.Ti6P96bz6RN6"},
-        {"D`lCFYTe9_8IW6nEB:oPjEk/S", "$2a$05$bA1xkp4NqFvDmtQJtDO9CugW0INxQLpMZha8AaHmBj9Zg9HlfQtBa"},
-        {"UBGYU6|a|RpA:bp[;}p.ZY4f1", "$2a$08$gu4KBnkla.bEqHiwaJ8.z.0ixfzE1Q0/iPfmpfRmUA.NUhUdZboxa"},
-        {"O9X[kP6{63F3rXKtN>n?zh2_", "$2a$04$yRZW9xEsqN9DL19jveqFyO1bljZ0r5KNCYqQzMqYpDB7XHWqDWNGC"},
-        {":Sa:BknepsG}\\5dOj>kh0KAk", "$2a$04$KhDTFUlakUsPNuLQSgyr7.xQZxkTSIvo0nFw0XyjvrH6n5kZkYDLG"},// extra escape sequence added
-        {"2_9J6k:{z?SSjCzL/GT/5CMgc", "$2a$05$eN1jCXDxN9HmuIARJlwH4ewsEyYbAmq7Cw99gEHqGRXtWyrRNLScy"},
-
-        {"2KNy`Kodau14?s8XVru<IIw0eDw|.64MM^Wtv;3sfZt~3`2QN6/U]0^1HtETqWHt<lMfD-LX::zo7AcNLQ.Q.@.g5kX`j7hRi", "$2a$04$xUNE1aUuNlpNwSOuz1VpjuBgW95ImLccIquQxyGLeinucvokg2Ale"},
-        {"0yWE>E;h/kdCRd@T]fQiv`Vz]KC0zaIAIeyY4zcooQ0^DfP{hHsw9?atO}CxbkbnK-LxUe;|FiBEluVqO@ysHhXQDdXPt0p", "$2a$07$pNHi/IxrSUohtsD5/eIv4O324ZPGfJE7mUAaNpIPkpyxjW9kqIk76"},
-        {"ilWj~2mLBa1Pq`sxrW8fNNq:XF0@KP5RLW9u?[E_wwkROmCSWudYoS5I2HGI-1-?Pd0zVxTIeNbF;nLDUGtce{8dHmx90:;N<8", "$2a$07$ePVgkQl8QKSG2Xv6o0bnOe4SZp4ejag5CP44tjxfmY17F5VzRgwF6"},
-        {"dj~OsXmQGj6FXnPGgwg9]G@75~L@G[|e<hgh2vaNqIyYZPh@M;I1DTgZS/~Q:i[6d]oei:hBw4}{}y7k9K^4SoN}wb8mrg[", "$2a$04$BZT7YoAYAgtNkD0/BOl.jOi0dDni7WtmB8.wAebHeHkOs.TpRgml."},
-        {"7;PjW]RYJoZXf.r2M^Mm1jVIe0wJ=Kdd2iUBuu1v3HGI1-S[TB6yg{0~:nbpeA08dysS5d}@Oxbrpj[~i-60mpq1WZqQmSVpnR", "$2a$07$fa9NDzoPKiSWC67cP/tj2OqE0PqvGwzRoJiCKj.czyqKyvpdtVpKe"},
-        {"8nv;PAN~-FQ]Emh@.TKG=^.t8R0EQC0T?x9|9g4xzxYmSbBO1qDx8kv-ehh0IBv>3KWhz.Z~jUF0tt8[5U@8;5:=[v6pf.IEJ", "$2a$08$eXo9KDc1BZyybBgMurpcD.GA1/ch3XhgBnIH10Xvjc2ogZaGg3t/m"},
-    };
-
-    public String getName()
-    {
-        return "OpenBSDBCrypt";
-    }
-
-    public void performTest()
-        throws Exception
-    {
-        for (int i = 0; i < bcryptTest1.length; i++)
-        {
-            String[] testString = bcryptTest1[i];
-            String encoded = testString[0];
-            String password = testString[1];
-            if (!OpenBSDBCrypt.checkPassword(encoded, password.toCharArray()))
-            {
-                fail("test1 mismatch: " + "[" + i + "] " + password);
-            }
-        }
-
-        String encoded = bcryptTest2[0];
-        String password = bcryptTest2[1];
-        if (!OpenBSDBCrypt.checkPassword(encoded, password.toCharArray()))
-        {
-            fail("bcryptTest2 mismatch: " + password);
-        }
-
-
-        encoded = bcryptTest2b[0];
-        password = bcryptTest2b[1];
-        if (!OpenBSDBCrypt.checkPassword(encoded, password.toCharArray()))
-        {
-            fail("bcryptTest2b mismatch: " + password);
-        }
-
-
-        for (int i = 0; i < bcryptTest3.length; i++)
-        {
-            String[] testString = bcryptTest3[i];
-            encoded = testString[2];
-            password = testString[0];
-            if (!OpenBSDBCrypt.checkPassword(encoded, password.toCharArray()))
-            {
-                fail("test3 mismatch: " + "[" + i + "] " + password);
-            }
-        }
-
-
-        for (int i = 0; i < bcryptTest4.length; i++)
-        {
-            String[] testString = bcryptTest4[i];
-            encoded = testString[1];
-            password = testString[0];
-            if (!OpenBSDBCrypt.checkPassword(encoded, password.toCharArray()))
-            {
-                fail("test4 mismatch: " + "[" + i + "] " + password);
-            }
-        }
-    }
-
-    public static void main(String[] args)
-    {
-        runTest(new OpenBSDBCryptTest());
-    }
-}
-
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/PKCS12Test.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/PKCS12Test.java
deleted file mode 100644
index c5c7aa3..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/PKCS12Test.java
+++ /dev/null
@@ -1,206 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.PBEParametersGenerator;
-import org.bouncycastle.crypto.digests.SHA1Digest;
-import org.bouncycastle.crypto.generators.PKCS12ParametersGenerator;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.crypto.params.ParametersWithIV;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTestResult;
-import org.bouncycastle.util.test.Test;
-import org.bouncycastle.util.test.TestResult;
-
-/**
- * test for PKCS12 key generation - vectors from 
- * <a href=http://www.drh-consultancy.demon.co.uk/test.txt>
- * http://www.drh-consultancy.demon.co.uk/test.txt</a>
- */
-public class PKCS12Test
-    implements Test
-{
-    char[]  password1 = { 's', 'm', 'e', 'g' };
-    char[]  password2 = { 'q', 'u', 'e', 'e', 'g' };
-
-    private boolean isEqual(
-        byte[]  a,
-        byte[]  b)
-    {
-        if (a.length != b.length)
-        {
-            return false;
-        }
-
-        for (int i = 0; i != a.length; i++)
-        {
-            if (a[i] != b[i])
-            {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    private TestResult run1(
-        int     id,
-        char[]  password,
-        byte[]  salt,
-        int     iCount,
-        byte[]  result)
-    {
-        PBEParametersGenerator  generator = new PKCS12ParametersGenerator(
-                                                    new SHA1Digest());
-
-        generator.init(
-                PBEParametersGenerator.PKCS12PasswordToBytes(password),
-                salt,
-                iCount);
-
-        CipherParameters  key = generator.generateDerivedParameters(24 * 8);
-
-        if (isEqual(result, ((KeyParameter)key).getKey()))
-        {
-            return new SimpleTestResult(true, "PKCS12Test: Okay");
-        }
-        else
-        {
-            return new SimpleTestResult(false, "PKCS12Test: id "
-                                                    + id + " Failed");
-        }
-    }
-
-    private TestResult run2(
-        int     id,
-        char[]  password,
-        byte[]  salt,
-        int     iCount,
-        byte[]  result)
-    {
-        PBEParametersGenerator  generator = new PKCS12ParametersGenerator(
-                                                    new SHA1Digest());
-
-        generator.init(
-                PBEParametersGenerator.PKCS12PasswordToBytes(password),
-                salt,
-                iCount);
-
-        ParametersWithIV params = (ParametersWithIV)generator.generateDerivedParameters(64, 64);
-
-        if (isEqual(result, params.getIV()))
-        {
-            return new SimpleTestResult(true, "PKCS12Test: Okay");
-        }
-        else
-        {
-            return new SimpleTestResult(false, "PKCS12Test: id "
-                                                    + id + " Failed");
-        }
-    }
-
-    private TestResult run3(
-        int     id,
-        char[]  password,
-        byte[]  salt,
-        int     iCount,
-        byte[]  result)
-    {
-        PBEParametersGenerator  generator = new PKCS12ParametersGenerator(
-                                                    new SHA1Digest());
-
-        generator.init(
-                PBEParametersGenerator.PKCS12PasswordToBytes(password),
-                salt,
-                iCount);
-
-        CipherParameters  key = generator.generateDerivedMacParameters(160);
-
-        if (isEqual(result, ((KeyParameter)key).getKey()))
-        {
-            return new SimpleTestResult(true, "PKCS12Test: Okay");
-        }
-        else
-        {
-            return new SimpleTestResult(false, "PKCS12Test: id "
-                                                    + id + " Failed");
-        }
-    }
-
-    public String getName()
-    {
-        return "PKCS12Test";
-    }
-
-    public TestResult perform()
-    {
-        TestResult  result;
-
-        result = run1(1, password1, Hex.decode("0A58CF64530D823F"), 1,
-                Hex.decode("8AAAE6297B6CB04642AB5B077851284EB7128F1A2A7FBCA3"));
-
-        if (result.isSuccessful())
-        {
-            result = run2(2, password1, Hex.decode("0A58CF64530D823F"), 1,
-                Hex.decode("79993DFE048D3B76"));
-        }
-
-        if (result.isSuccessful())
-        {
-            result = run1(3, password1, Hex.decode("642B99AB44FB4B1F"), 1,
-                Hex.decode("F3A95FEC48D7711E985CFE67908C5AB79FA3D7C5CAA5D966"));
-        }
-
-        if (result.isSuccessful())
-        {
-            result = run2(4, password1, Hex.decode("642B99AB44FB4B1F"), 1,
-                Hex.decode("C0A38D64A79BEA1D"));
-        }
-
-        if (result.isSuccessful())
-        {
-            result = run3(5, password1, Hex.decode("3D83C0E4546AC140"), 1,
-                Hex.decode("8D967D88F6CAA9D714800AB3D48051D63F73A312"));
-        }
-
-        if (result.isSuccessful())
-        {
-            result = run1(6, password2, Hex.decode("05DEC959ACFF72F7"), 1000,
-                Hex.decode("ED2034E36328830FF09DF1E1A07DD357185DAC0D4F9EB3D4"));
-        }
-
-        if (result.isSuccessful())
-        {
-            result = run2(7, password2, Hex.decode("05DEC959ACFF72F7"), 1000,
-                Hex.decode("11DEDAD7758D4860"));
-        }
-
-        if (result.isSuccessful())
-        {
-            result = run1(8, password2, Hex.decode("1682C0FC5B3F7EC5"), 1000,
-                Hex.decode("483DD6E919D7DE2E8E648BA8F862F3FBFBDC2BCB2C02957F"));
-        }
-
-        if (result.isSuccessful())
-        {
-            result = run2(9, password2, Hex.decode("1682C0FC5B3F7EC5"), 1000,
-                Hex.decode("9D461D1B00355C50"));
-        }
-
-        if (result.isSuccessful())
-        {
-            result = run3(10, password2, Hex.decode("263216FCC2FAB31C"), 1000,
-                Hex.decode("5EC4C7A80DF652294C3925B6489A7AB857C83476"));
-        }
-
-        return result;
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        PKCS12Test      test = new PKCS12Test();
-        TestResult      result = test.perform();
-
-        System.out.println(result);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/PKCS5Test.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/PKCS5Test.java
deleted file mode 100644
index 6145114..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/PKCS5Test.java
+++ /dev/null
@@ -1,265 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import java.io.ByteArrayInputStream;
-
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.pkcs.EncryptedPrivateKeyInfo;
-import org.bouncycastle.asn1.pkcs.EncryptionScheme;
-import org.bouncycastle.asn1.pkcs.KeyDerivationFunc;
-import org.bouncycastle.asn1.pkcs.PBES2Parameters;
-import org.bouncycastle.asn1.pkcs.PBKDF2Params;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.asn1.pkcs.RC2CBCParameter;
-import org.bouncycastle.crypto.BufferedBlockCipher;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.PBEParametersGenerator;
-import org.bouncycastle.crypto.engines.DESEngine;
-import org.bouncycastle.crypto.engines.DESedeEngine;
-import org.bouncycastle.crypto.engines.RC2Engine;
-import org.bouncycastle.crypto.generators.PKCS5S2ParametersGenerator;
-import org.bouncycastle.crypto.modes.CBCBlockCipher;
-import org.bouncycastle.crypto.paddings.PaddedBufferedBlockCipher;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.crypto.params.ParametersWithIV;
-import org.bouncycastle.util.encoders.Base64;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-
-/**
- * A test class for PKCS5 PBES2 with PBKDF2 (PKCS5 v2.0) using
- * test vectors provider at 
- * <a href=http://www.rsasecurity.com/rsalabs/pkcs/pkcs-5/index.html>
- * RSA's PKCS5 Page</a>
- * <br>
- * The vectors are Base 64 encoded and encrypted using the password "password"
- * (without quotes). They should all yield the same PrivateKeyInfo object.
- */
-public class PKCS5Test
-    extends SimpleTest
-{
-    /**
-     * encrypted using des-cbc.
-     */
-    static byte[] sample1 = Base64.decode(
-        "MIIBozA9BgkqhkiG9w0BBQ0wMDAbBgkqhkiG9w0BBQwwDgQIfWBDXwLp4K4CAggA"
-      + "MBEGBSsOAwIHBAiaCF/AvOgQ6QSCAWDWX4BdAzCRNSQSANSuNsT5X8mWYO27mr3Y"
-      + "9c9LoBVXGNmYWKA77MI4967f7SmjNcgXj3xNE/jmnVz6hhsjS8E5VPT3kfyVkpdZ"
-      + "0lr5e9Yk2m3JWpPU7++v5zBkZmC4V/MwV/XuIs6U+vykgzMgpxQg0oZKS9zgmiZo"
-      + "f/4dOCL0UtCDnyOSvqT7mCVIcMDIEKu8QbVlgZYBop08l60EuEU3gARUo8WsYQmO"
-      + "Dz/ldx0Z+znIT0SXVuOwc+RVItC5T/Qx+aijmmpt+9l14nmaGBrEkmuhmtdvU/4v"
-      + "aptewGRgmjOfD6cqK+zs0O5NrrJ3P/6ZSxXj91CQgrThGfOv72bUncXEMNtc8pks"
-      + "2jpHFjGMdKufnadAD7XuMgzkkaklEXZ4f5tU6heIIwr51g0GBEGF96gYPFnjnSQM"
-      + "75JE02Clo+DfcfXpcybPTwwFg2jd6JTTOfkdf6OdSlA/1XNK43FA");
-
-    /**
-     * encrypted using des-ede3-cbc.
-     */
-    static byte[] sample2 = Base64.decode(
-        "MIIBpjBABgkqhkiG9w0BBQ0wMzAbBgkqhkiG9w0BBQwwDgQIeFeOWl1jywYCAggA"
-      + "MBQGCCqGSIb3DQMHBAjUJ5eGBhQGtQSCAWBrHrRgqO8UUMLcWzZEtpk1l3mjxiF/"
-      + "koCMkHsFwowgyWhEbgIkTgbSViK54LVK8PskekcGNLph+rB6bGZ7pPbL5pbXASJ8"
-      + "+MkQcG3FZdlS4Ek9tTJDApj3O1UubZGFG4uvTlJJFbF1BOJ3MkY3XQ9Gl1qwv7j5"
-      + "6e103Da7Cq9+oIDKmznza78XXQYrUsPo8mJGjUxPskEYlzwvHjKubRnYm/K6RKhi"
-      + "5f4zX4BQ/Dt3H812ZjRXrsjAJP0KrD/jyD/jCT7zNBVPH1izBds+RwizyQAHwfNJ"
-      + "BFR78TH4cgzB619X47FDVOnT0LqQNVd0O3cSwnPrXE9XR3tPayE+iOB15llFSmi8"
-      + "z0ByOXldEpkezCn92Umk++suzIVj1qfsK+bv2phZWJPbLEIWPDRHUbYf76q5ArAr"
-      + "u4xtxT/hoK3krEs/IN3d70qjlUJ36SEw1UaZ82PWhakQbdtu39ZraMJB");
-
-    /**
-     * encrypted using rc2-cbc.
-     */
-    static byte[] sample3 = Base64.decode(
-        "MIIBrjBIBgkqhkiG9w0BBQ0wOzAeBgkqhkiG9w0BBQwwEQQIrHyQPBZqWLUCAggA"
-      + "AgEQMBkGCCqGSIb3DQMCMA0CAToECEhbh7YZKiPSBIIBYCT1zp6o5jpFlIkgwPop"
-      + "7bW1+8ACr4exqzkeb3WflQ8cWJ4cURxzVdvxUnXeW1VJdaQZtjS/QHs5GhPTG/0f"
-      + "wtvnaPfwrIJ3FeGaZfcg2CrYhalOFmEb4xrE4KyoEQmUN8tb/Cg94uzd16BOPw21"
-      + "RDnE8bnPdIGY7TyL95kbkqH23mK53pi7h+xWIgduW+atIqDyyt55f7WMZcvDvlj6"
-      + "VpN/V0h+qxBHL274WA4dj6GYgeyUFpi60HdGCK7By2TBy8h1ZvKGjmB9h8jZvkx1"
-      + "MkbRumXxyFsowTZawyYvO8Um6lbfEDP9zIEUq0IV8RqH2MRyblsPNSikyYhxX/cz"
-      + "tdDxRKhilySbSBg5Kr8OfcwKp9bpinN96nmG4xr3Tch1bnVvqJzOQ5+Vva2WwVvH"
-      + "2JkWvYm5WaANg4Q6bRxu9vz7DuhbJjQdZbxFezIAgrJdSe92B00jO/0Kny1WjiVO"
-      + "6DA=");
-
-    static byte[] result = Hex.decode(
-        "30820155020100300d06092a864886f70d01010105000482013f3082013b020100024100"
-      + "debbfc2c09d61bada2a9462f24224e54cc6b3cc0755f15ce318ef57e79df17026b6a85cc"
-      + "a12428027245045df2052a329a2f9ad3d17b78a10572ad9b22bf343b020301000102402d"
-      + "90a96adcec472743527bc023153d8f0d6e96b40c8ed228276d467d843306429f8670559b"
-      + "f376dd41857f6397c2fc8d95e0e53ed62de420b855430ee4a1b8a1022100ffcaf0838239"
-      + "31e073ff534f06a5d415b3d414bc614a4544a3dff7ed271817eb022100deea30242117db"
-      + "2d3b8837f58f1da530ff83cf9283680da33683ec4e583610f1022100e6026381adb0a683"
-      + "f16a8f4c096b462979b9e4277cc89f3ed8a905b46fa9ff9f02210097c146d4d1d2b3dbaf"
-      + "53a504ff51674c5c271800de84d003f4f10ac6ab36e38102202bfa141f10bda874e1017d"
-      + "845e82767c1c38e82745daf421f0c8cd09d7652387");
-
-    private class PBETest
-        extends SimpleTest
-    {
-        int                 id;
-        BufferedBlockCipher cipher;
-        byte[]              sample;
-        int                 keySize;
-
-        PBETest(
-            int                 id,
-            BufferedBlockCipher cipher,
-            byte[]              sample,
-            int                 keySize)
-        {
-            this.id = id;
-            this.cipher = cipher;
-            this.sample = sample;
-            this.keySize = keySize;
-        }
-
-        public String getName()
-        {
-            return cipher.getUnderlyingCipher().getAlgorithmName() + " PKCS5S2 Test " + id;
-        }
-
-        public void performTest()
-        {
-            char[]                  password = { 'p', 'a', 's', 's', 'w', 'o', 'r', 'd' };
-            PBEParametersGenerator  generator = new PKCS5S2ParametersGenerator();
-            ByteArrayInputStream    bIn = new ByteArrayInputStream(sample);
-            ASN1InputStream         dIn = new ASN1InputStream(bIn);
-            EncryptedPrivateKeyInfo info = null;
-
-            try
-            {
-                info = EncryptedPrivateKeyInfo.getInstance(dIn.readObject());
-            }
-            catch (Exception e)
-            {
-                fail("failed construction - exception " + e.toString(), e);
-            }
-
-            PBES2Parameters         alg = PBES2Parameters.getInstance(info.getEncryptionAlgorithm().getParameters());
-            PBKDF2Params            func = PBKDF2Params.getInstance(alg.getKeyDerivationFunc().getParameters());
-            EncryptionScheme        scheme = alg.getEncryptionScheme();
-    
-            if (func.getKeyLength() != null)
-            {
-                keySize = func.getKeyLength().intValue() * 8;
-            }
-    
-            int     iterationCount = func.getIterationCount().intValue();
-            byte[]  salt = func.getSalt();
-    
-            generator.init(
-                PBEParametersGenerator.PKCS5PasswordToBytes(password),
-                salt,
-                iterationCount);
-    
-            CipherParameters    param;
-    
-            if (scheme.getAlgorithm().equals(PKCSObjectIdentifiers.RC2_CBC))
-            {
-                RC2CBCParameter rc2Params = RC2CBCParameter.getInstance(scheme.getParameters());
-                byte[]  iv = rc2Params.getIV();
-    
-                param = new ParametersWithIV(generator.generateDerivedParameters(keySize), iv);
-            }
-            else
-            {
-                byte[]  iv = ASN1OctetString.getInstance(scheme.getParameters()).getOctets();
-
-                param = new ParametersWithIV(generator.generateDerivedParameters(keySize), iv);
-            }
-    
-            cipher.init(false, param);
-    
-            byte[]  data = info.getEncryptedData();
-            byte[]  out = new byte[cipher.getOutputSize(data.length)];
-            int     len = cipher.processBytes(data, 0, data.length, out, 0);
-        
-            try
-            {
-                len += cipher.doFinal(out, len);
-            }
-            catch (Exception e)
-            {
-                fail("failed doFinal - exception " + e.toString());
-            }
-
-            if (result.length != len)
-            {
-                fail("failed length");
-            }
-
-            for (int i = 0; i != len; i++)
-            {
-                if (out[i] != result[i])
-                {
-                    fail("failed comparison");
-                }
-            }
-        }
-    }
-
-    public String getName()
-    {
-        return "PKCS5S2";
-    }
-
-    public void performTest()
-        throws Exception
-    {
-        BufferedBlockCipher cipher = new PaddedBufferedBlockCipher(new CBCBlockCipher(new DESEngine()));
-        SimpleTest          test = new PBETest(0, cipher, sample1, 64);
-
-        test.performTest();
-
-        cipher = new PaddedBufferedBlockCipher(new CBCBlockCipher(new DESedeEngine()));
-        test = new PBETest(1, cipher, sample2, 192);
-
-        test.performTest();
-
-        cipher = new PaddedBufferedBlockCipher(new CBCBlockCipher(new RC2Engine()));
-        test = new PBETest(2, cipher, sample3, 0);
-        test.performTest();
-
-        //
-        // RFC 3211 tests
-        //
-        char[]                  password = { 'p', 'a', 's', 's', 'w', 'o', 'r', 'd' };
-        PBEParametersGenerator  generator = new PKCS5S2ParametersGenerator();
-
-        byte[]  salt = Hex.decode("1234567878563412");
-
-        generator.init(
-                PBEParametersGenerator.PKCS5PasswordToBytes(password),
-                salt,
-                5);
-
-        if (!areEqual(((KeyParameter)generator.generateDerivedParameters(64)).getKey(), Hex.decode("d1daa78615f287e6")))
-        {
-            fail("64 test failed");
-        }
-
-        password = "All n-entities must communicate with other n-entities via n-1 entiteeheehees".toCharArray();
-
-        generator.init(
-                PBEParametersGenerator.PKCS5PasswordToBytes(password),
-                salt,
-                500);
-
-        if (!areEqual(((KeyParameter)generator.generateDerivedParameters(192)).getKey(), Hex.decode("6a8970bf68c92caea84a8df28510858607126380cc47ab2d")))
-        {
-            fail("192 test failed");
-        }
-
-        generator.init(PBEParametersGenerator.PKCS5PasswordToBytes(password), salt, 60000);
-        if (!areEqual(((KeyParameter)generator.generateDerivedParameters(192)).getKey(), Hex.decode("29aaef810c12ecd2236bbcfb55407f9852b5573dc1c095bb")))
-        {
-            fail("192 (60000) test failed");
-        }
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        runTest(new PKCS5Test());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/PSSBlindTest.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/PSSBlindTest.java
deleted file mode 100644
index 5e391ae..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/PSSBlindTest.java
+++ /dev/null
@@ -1,398 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import org.bouncycastle.crypto.AsymmetricCipherKeyPair;
-import org.bouncycastle.crypto.digests.SHA1Digest;
-import org.bouncycastle.crypto.engines.RSABlindingEngine;
-import org.bouncycastle.crypto.engines.RSAEngine;
-import org.bouncycastle.crypto.generators.RSABlindingFactorGenerator;
-import org.bouncycastle.crypto.generators.RSAKeyPairGenerator;
-import org.bouncycastle.crypto.params.ParametersWithRandom;
-import org.bouncycastle.crypto.params.RSABlindingParameters;
-import org.bouncycastle.crypto.params.RSAKeyGenerationParameters;
-import org.bouncycastle.crypto.params.RSAKeyParameters;
-import org.bouncycastle.crypto.params.RSAPrivateCrtKeyParameters;
-import org.bouncycastle.crypto.signers.PSSSigner;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-
-import java.math.BigInteger;
-import java.security.SecureRandom;
-
-/*
- * RSA PSS test vectors for PKCS#1 V2.1 with blinding
- */
-public class PSSBlindTest
-    extends SimpleTest
-{
-    private final int DATA_LENGTH = 1000;
-    private final int NUM_TESTS = 50;
-    private final int NUM_TESTS_WITH_KEY_GENERATION = 10;
-
-    private class FixedRandom
-        extends SecureRandom
-    {
-        byte[]  vals;
-
-        FixedRandom(
-            byte[]  vals)
-        {
-            this.vals = vals;
-        }
-
-        public void nextBytes(
-            byte[]  bytes)
-        {
-            System.arraycopy(vals, 0, bytes, 0, vals.length);
-        }
-    }
-
-    //
-    // Example 1: A 1024-bit RSA keypair
-    //
-    private RSAKeyParameters pub1 = new RSAKeyParameters(false,
-                new BigInteger("a56e4a0e701017589a5187dc7ea841d156f2ec0e36ad52a44dfeb1e61f7ad991d8c51056ffedb162b4c0f283a12a88a394dff526ab7291cbb307ceabfce0b1dfd5cd9508096d5b2b8b6df5d671ef6377c0921cb23c270a70e2598e6ff89d19f105acc2d3f0cb35f29280e1386b6f64c4ef22e1e1f20d0ce8cffb2249bd9a2137",16),
-                new BigInteger("010001",16));
-
-    private RSAKeyParameters prv1 = new RSAPrivateCrtKeyParameters(
-                new BigInteger("a56e4a0e701017589a5187dc7ea841d156f2ec0e36ad52a44dfeb1e61f7ad991d8c51056ffedb162b4c0f283a12a88a394dff526ab7291cbb307ceabfce0b1dfd5cd9508096d5b2b8b6df5d671ef6377c0921cb23c270a70e2598e6ff89d19f105acc2d3f0cb35f29280e1386b6f64c4ef22e1e1f20d0ce8cffb2249bd9a2137",16),
-                new BigInteger("010001",16),
-                new BigInteger("33a5042a90b27d4f5451ca9bbbd0b44771a101af884340aef9885f2a4bbe92e894a724ac3c568c8f97853ad07c0266c8c6a3ca0929f1e8f11231884429fc4d9ae55fee896a10ce707c3ed7e734e44727a39574501a532683109c2abacaba283c31b4bd2f53c3ee37e352cee34f9e503bd80c0622ad79c6dcee883547c6a3b325",16),
-                new BigInteger("e7e8942720a877517273a356053ea2a1bc0c94aa72d55c6e86296b2dfc967948c0a72cbccca7eacb35706e09a1df55a1535bd9b3cc34160b3b6dcd3eda8e6443",16),
-                new BigInteger("b69dca1cf7d4d7ec81e75b90fcca874abcde123fd2700180aa90479b6e48de8d67ed24f9f19d85ba275874f542cd20dc723e6963364a1f9425452b269a6799fd",16),
-                new BigInteger("28fa13938655be1f8a159cbaca5a72ea190c30089e19cd274a556f36c4f6e19f554b34c077790427bbdd8dd3ede2448328f385d81b30e8e43b2fffa027861979",16),
-                new BigInteger("1a8b38f398fa712049898d7fb79ee0a77668791299cdfa09efc0e507acb21ed74301ef5bfd48be455eaeb6e1678255827580a8e4e8e14151d1510a82a3f2e729",16),
-                new BigInteger("27156aba4126d24a81f3a528cbfb27f56886f840a9f6e86e17a44b94fe9319584b8e22fdde1e5a2e3bd8aa5ba8d8584194eb2190acf832b847f13a3d24a79f4d",16));
-
-    // PSSExample1.1
-
-    private byte[] msg1a = Hex.decode("cdc87da223d786df3b45e0bbbc721326d1ee2af806cc315475cc6f0d9c66e1b62371d45ce2392e1ac92844c310102f156a0d8d52c1f4c40ba3aa65095786cb769757a6563ba958fed0bcc984e8b517a3d5f515b23b8a41e74aa867693f90dfb061a6e86dfaaee64472c00e5f20945729cbebe77f06ce78e08f4098fba41f9d6193c0317e8b60d4b6084acb42d29e3808a3bc372d85e331170fcbf7cc72d0b71c296648b3a4d10f416295d0807aa625cab2744fd9ea8fd223c42537029828bd16be02546f130fd2e33b936d2676e08aed1b73318b750a0167d0");
-
-    private byte[] slt1a = Hex.decode("dee959c7e06411361420ff80185ed57f3e6776af");
-
-    private byte[] sig1a = Hex.decode("9074308fb598e9701b2294388e52f971faac2b60a5145af185df5287b5ed2887e57ce7fd44dc8634e407c8e0e4360bc226f3ec227f9d9e54638e8d31f5051215df6ebb9c2f9579aa77598a38f914b5b9c1bd83c4e2f9f382a0d0aa3542ffee65984a601bc69eb28deb27dca12c82c2d4c3f66cd500f1ff2b994d8a4e30cbb33c");
-
-    // PSSExample1.2
-
-    private byte[] msg1b = Hex.decode("851384cdfe819c22ed6c4ccb30daeb5cf059bc8e1166b7e3530c4c233e2b5f8f71a1cca582d43ecc72b1bca16dfc7013226b9e");
-
-    private byte[] slt1b = Hex.decode("ef2869fa40c346cb183dab3d7bffc98fd56df42d");
-
-    private byte[] sig1b = Hex.decode("3ef7f46e831bf92b32274142a585ffcefbdca7b32ae90d10fb0f0c729984f04ef29a9df0780775ce43739b97838390db0a5505e63de927028d9d29b219ca2c4517832558a55d694a6d25b9dab66003c4cccd907802193be5170d26147d37b93590241be51c25055f47ef62752cfbe21418fafe98c22c4d4d47724fdb5669e843");
-
-    //
-    // Example 2: A 1025-bit RSA keypair
-    //
-
-    private RSAKeyParameters pub2 = new RSAKeyParameters(false,
-                new BigInteger("01d40c1bcf97a68ae7cdbd8a7bf3e34fa19dcca4ef75a47454375f94514d88fed006fb829f8419ff87d6315da68a1ff3a0938e9abb3464011c303ad99199cf0c7c7a8b477dce829e8844f625b115e5e9c4a59cf8f8113b6834336a2fd2689b472cbb5e5cabe674350c59b6c17e176874fb42f8fc3d176a017edc61fd326c4b33c9", 16),
-                new BigInteger("010001", 16));
-
-    private RSAKeyParameters prv2 = new RSAPrivateCrtKeyParameters(
-                new BigInteger("01d40c1bcf97a68ae7cdbd8a7bf3e34fa19dcca4ef75a47454375f94514d88fed006fb829f8419ff87d6315da68a1ff3a0938e9abb3464011c303ad99199cf0c7c7a8b477dce829e8844f625b115e5e9c4a59cf8f8113b6834336a2fd2689b472cbb5e5cabe674350c59b6c17e176874fb42f8fc3d176a017edc61fd326c4b33c9", 16),
-                new BigInteger("010001", 16),
-                new BigInteger("027d147e4673057377fd1ea201565772176a7dc38358d376045685a2e787c23c15576bc16b9f444402d6bfc5d98a3e88ea13ef67c353eca0c0ddba9255bd7b8bb50a644afdfd1dd51695b252d22e7318d1b6687a1c10ff75545f3db0fe602d5f2b7f294e3601eab7b9d1cecd767f64692e3e536ca2846cb0c2dd486a39fa75b1", 16),
-                new BigInteger("016601e926a0f8c9e26ecab769ea65a5e7c52cc9e080ef519457c644da6891c5a104d3ea7955929a22e7c68a7af9fcad777c3ccc2b9e3d3650bce404399b7e59d1", 16),
-                new BigInteger("014eafa1d4d0184da7e31f877d1281ddda625664869e8379e67ad3b75eae74a580e9827abd6eb7a002cb5411f5266797768fb8e95ae40e3e8a01f35ff89e56c079", 16),
-                new BigInteger("e247cce504939b8f0a36090de200938755e2444b29539a7da7a902f6056835c0db7b52559497cfe2c61a8086d0213c472c78851800b171f6401de2e9c2756f31", 16),
-                new BigInteger("b12fba757855e586e46f64c38a70c68b3f548d93d787b399999d4c8f0bbd2581c21e19ed0018a6d5d3df86424b3abcad40199d31495b61309f27c1bf55d487c1", 16),
-                new BigInteger("564b1e1fa003bda91e89090425aac05b91da9ee25061e7628d5f51304a84992fdc33762bd378a59f030a334d532bd0dae8f298ea9ed844636ad5fb8cbdc03cad", 16));
-
-    // PSS Example 2.1
-
-    private byte[] msg2a = Hex.decode("daba032066263faedb659848115278a52c44faa3a76f37515ed336321072c40a9d9b53bc05014078adf520875146aae70ff060226dcb7b1f1fc27e9360");
-    private byte[] slt2a = Hex.decode("57bf160bcb02bb1dc7280cf0458530b7d2832ff7");
-    private byte[] sig2a = Hex.decode("014c5ba5338328ccc6e7a90bf1c0ab3fd606ff4796d3c12e4b639ed9136a5fec6c16d8884bdd99cfdc521456b0742b736868cf90de099adb8d5ffd1deff39ba4007ab746cefdb22d7df0e225f54627dc65466131721b90af445363a8358b9f607642f78fab0ab0f43b7168d64bae70d8827848d8ef1e421c5754ddf42c2589b5b3");
-
-    // PSS Example 2.2
-
-    private byte[] msg2b = Hex.decode("e4f8601a8a6da1be34447c0959c058570c3668cfd51dd5f9ccd6ad4411fe8213486d78a6c49f93efc2ca2288cebc2b9b60bd04b1e220d86e3d4848d709d032d1e8c6a070c6af9a499fcf95354b14ba6127c739de1bb0fd16431e46938aec0cf8ad9eb72e832a7035de9b7807bdc0ed8b68eb0f5ac2216be40ce920c0db0eddd3860ed788efaccaca502d8f2bd6d1a7c1f41ff46f1681c8f1f818e9c4f6d91a0c7803ccc63d76a6544d843e084e363b8acc55aa531733edb5dee5b5196e9f03e8b731b3776428d9e457fe3fbcb3db7274442d785890e9cb0854b6444dace791d7273de1889719338a77fe");
-    private byte[] slt2b = Hex.decode("7f6dd359e604e60870e898e47b19bf2e5a7b2a90");
-    private byte[] sig2b = Hex.decode("010991656cca182b7f29d2dbc007e7ae0fec158eb6759cb9c45c5ff87c7635dd46d150882f4de1e9ae65e7f7d9018f6836954a47c0a81a8a6b6f83f2944d6081b1aa7c759b254b2c34b691da67cc0226e20b2f18b42212761dcd4b908a62b371b5918c5742af4b537e296917674fb914194761621cc19a41f6fb953fbcbb649dea");
-
-    //
-    //  Example 4: A 1027-bit RSA key pair
-    //
-
-    private RSAKeyParameters pub4 = new RSAKeyParameters(false,
-                new BigInteger("054adb7886447efe6f57e0368f06cf52b0a3370760d161cef126b91be7f89c421b62a6ec1da3c311d75ed50e0ab5fff3fd338acc3aa8a4e77ee26369acb81ba900fa83f5300cf9bb6c53ad1dc8a178b815db4235a9a9da0c06de4e615ea1277ce559e9c108de58c14a81aa77f5a6f8d1335494498848c8b95940740be7bf7c3705", 16),
-                new BigInteger("010001", 16));
-
-    private RSAKeyParameters prv4 = new RSAPrivateCrtKeyParameters(
-                new BigInteger("054adb7886447efe6f57e0368f06cf52b0a3370760d161cef126b91be7f89c421b62a6ec1da3c311d75ed50e0ab5fff3fd338acc3aa8a4e77ee26369acb81ba900fa83f5300cf9bb6c53ad1dc8a178b815db4235a9a9da0c06de4e615ea1277ce559e9c108de58c14a81aa77f5a6f8d1335494498848c8b95940740be7bf7c3705", 16),
-                new BigInteger("010001", 16),
-                new BigInteger("fa041f8cd9697ceed38ec8caa275523b4dd72b09a301d3541d72f5d31c05cbce2d6983b36183af10690bd46c46131e35789431a556771dd0049b57461bf060c1f68472e8a67c25f357e5b6b4738fa541a730346b4a07649a2dfa806a69c975b6aba64678acc7f5913e89c622f2d8abb1e3e32554e39df94ba60c002e387d9011", 16),
-                new BigInteger("029232336d2838945dba9dd7723f4e624a05f7375b927a87abe6a893a1658fd49f47f6c7b0fa596c65fa68a23f0ab432962d18d4343bd6fd671a5ea8d148413995", 16),
-                new BigInteger("020ef5efe7c5394aed2272f7e81a74f4c02d145894cb1b3cab23a9a0710a2afc7e3329acbb743d01f680c4d02afb4c8fde7e20930811bb2b995788b5e872c20bb1", 16),
-                new BigInteger("026e7e28010ecf2412d9523ad704647fb4fe9b66b1a681581b0e15553a89b1542828898f27243ebab45ff5e1acb9d4df1b051fbc62824dbc6f6c93261a78b9a759", 16),
-                new BigInteger("012ddcc86ef655998c39ddae11718669e5e46cf1495b07e13b1014cd69b3af68304ad2a6b64321e78bf3bbca9bb494e91d451717e2d97564c6549465d0205cf421", 16),
-                new BigInteger("010600c4c21847459fe576703e2ebecae8a5094ee63f536bf4ac68d3c13e5e4f12ac5cc10ab6a2d05a199214d1824747d551909636b774c22cac0b837599abcc75", 16));
-
-    // PSS Example 4.1
-
-    private byte[] msg4a = Hex.decode("9fb03b827c8217d9");
-
-    private byte[] slt4a = Hex.decode("ed7c98c95f30974fbe4fbddcf0f28d6021c0e91d");
-
-    private byte[] sig4a = Hex.decode("0323d5b7bf20ba4539289ae452ae4297080feff4518423ff4811a817837e7d82f1836cdfab54514ff0887bddeebf40bf99b047abc3ecfa6a37a3ef00f4a0c4a88aae0904b745c846c4107e8797723e8ac810d9e3d95dfa30ff4966f4d75d13768d20857f2b1406f264cfe75e27d7652f4b5ed3575f28a702f8c4ed9cf9b2d44948");
-
-    // PSS Example 4.2
-
-    private byte[] msg4b = Hex.decode("0ca2ad77797ece86de5bf768750ddb5ed6a3116ad99bbd17edf7f782f0db1cd05b0f677468c5ea420dc116b10e80d110de2b0461ea14a38be68620392e7e893cb4ea9393fb886c20ff790642305bf302003892e54df9f667509dc53920df583f50a3dd61abb6fab75d600377e383e6aca6710eeea27156e06752c94ce25ae99fcbf8592dbe2d7e27453cb44de07100ebb1a2a19811a478adbeab270f94e8fe369d90b3ca612f9f");
-
-    private byte[] slt4b = Hex.decode("22d71d54363a4217aa55113f059b3384e3e57e44");
-
-    private byte[] sig4b = Hex.decode("049d0185845a264d28feb1e69edaec090609e8e46d93abb38371ce51f4aa65a599bdaaa81d24fba66a08a116cb644f3f1e653d95c89db8bbd5daac2709c8984000178410a7c6aa8667ddc38c741f710ec8665aa9052be929d4e3b16782c1662114c5414bb0353455c392fc28f3db59054b5f365c49e1d156f876ee10cb4fd70598");
-
-
-    //
-    // Example 8: A 1031-bit RSA key pair
-    //
-
-    private RSAKeyParameters pub8 = new RSAKeyParameters(false,
-                new BigInteger("495370a1fb18543c16d3631e3163255df62be6eee890d5f25509e4f778a8ea6fbbbcdf85dff64e0d972003ab3681fbba6dd41fd541829b2e582de9f2a4a4e0a2d0900bef4753db3cee0ee06c7dfae8b1d53b5953218f9cceea695b08668edeaadced9463b1d790d5ebf27e9115b46cad4d9a2b8efab0561b0810344739ada0733f", 16),
-                new BigInteger("010001", 16));
-
-    private RSAKeyParameters prv8 = new RSAPrivateCrtKeyParameters(
-                new BigInteger("495370a1fb18543c16d3631e3163255df62be6eee890d5f25509e4f778a8ea6fbbbcdf85dff64e0d972003ab3681fbba6dd41fd541829b2e582de9f2a4a4e0a2d0900bef4753db3cee0ee06c7dfae8b1d53b5953218f9cceea695b08668edeaadced9463b1d790d5ebf27e9115b46cad4d9a2b8efab0561b0810344739ada0733f", 16),
-                new BigInteger("010001", 16),
-                new BigInteger("6c66ffe98980c38fcdeab5159898836165f4b4b817c4f6a8d486ee4ea9130fe9b9092bd136d184f95f504a607eac565846d2fdd6597a8967c7396ef95a6eeebb4578a643966dca4d8ee3de842de63279c618159c1ab54a89437b6a6120e4930afb52a4ba6ced8a4947ac64b30a3497cbe701c2d6266d517219ad0ec6d347dbe9", 16),
-                new BigInteger("08dad7f11363faa623d5d6d5e8a319328d82190d7127d2846c439b0ab72619b0a43a95320e4ec34fc3a9cea876422305bd76c5ba7be9e2f410c8060645a1d29edb", 16),
-                new BigInteger("0847e732376fc7900f898ea82eb2b0fc418565fdae62f7d9ec4ce2217b97990dd272db157f99f63c0dcbb9fbacdbd4c4dadb6df67756358ca4174825b48f49706d", 16),
-                new BigInteger("05c2a83c124b3621a2aa57ea2c3efe035eff4560f33ddebb7adab81fce69a0c8c2edc16520dda83d59a23be867963ac65f2cc710bbcfb96ee103deb771d105fd85", 16),
-                new BigInteger("04cae8aa0d9faa165c87b682ec140b8ed3b50b24594b7a3b2c220b3669bb819f984f55310a1ae7823651d4a02e99447972595139363434e5e30a7e7d241551e1b9", 16),
-                new BigInteger("07d3e47bf686600b11ac283ce88dbb3f6051e8efd04680e44c171ef531b80b2b7c39fc766320e2cf15d8d99820e96ff30dc69691839c4b40d7b06e45307dc91f3f", 16));
-
-    // PSS Example 8.1
-
-    private byte[] msg8a = Hex.decode("81332f4be62948415ea1d899792eeacf6c6e1db1da8be13b5cea41db2fed467092e1ff398914c714259775f595f8547f735692a575e6923af78f22c6997ddb90fb6f72d7bb0dd5744a31decd3dc3685849836ed34aec596304ad11843c4f88489f209735f5fb7fdaf7cec8addc5818168f880acbf490d51005b7a8e84e43e54287977571dd99eea4b161eb2df1f5108f12a4142a83322edb05a75487a3435c9a78ce53ed93bc550857d7a9fb");
-
-    private byte[] slt8a = Hex.decode("1d65491d79c864b373009be6f6f2467bac4c78fa");
-
-    private byte[] sig8a = Hex.decode("0262ac254bfa77f3c1aca22c5179f8f040422b3c5bafd40a8f21cf0fa5a667ccd5993d42dbafb409c520e25fce2b1ee1e716577f1efa17f3da28052f40f0419b23106d7845aaf01125b698e7a4dfe92d3967bb00c4d0d35ba3552ab9a8b3eef07c7fecdbc5424ac4db1e20cb37d0b2744769940ea907e17fbbca673b20522380c5");
-
-    // PSS Example 8.2
-
-    private byte[] msg8b = Hex.decode("e2f96eaf0e05e7ba326ecca0ba7fd2f7c02356f3cede9d0faabf4fcc8e60a973e5595fd9ea08");
-
-    private byte[] slt8b = Hex.decode("435c098aa9909eb2377f1248b091b68987ff1838");
-
-    private byte[] sig8b = Hex.decode("2707b9ad5115c58c94e932e8ec0a280f56339e44a1b58d4ddcff2f312e5f34dcfe39e89c6a94dcee86dbbdae5b79ba4e0819a9e7bfd9d982e7ee6c86ee68396e8b3a14c9c8f34b178eb741f9d3f121109bf5c8172fada2e768f9ea1433032c004a8aa07eb990000a48dc94c8bac8aabe2b09b1aa46c0a2aa0e12f63fbba775ba7e");
-
-    //
-    // Example 9: A 1536-bit RSA key pair
-    //
-
-    private RSAKeyParameters pub9 = new RSAKeyParameters(false,
-                new BigInteger("e6bd692ac96645790403fdd0f5beb8b9bf92ed10007fc365046419dd06c05c5b5b2f48ecf989e4ce269109979cbb40b4a0ad24d22483d1ee315ad4ccb1534268352691c524f6dd8e6c29d224cf246973aec86c5bf6b1401a850d1b9ad1bb8cbcec47b06f0f8c7f45d3fc8f319299c5433ddbc2b3053b47ded2ecd4a4caefd614833dc8bb622f317ed076b8057fe8de3f84480ad5e83e4a61904a4f248fb397027357e1d30e463139815c6fd4fd5ac5b8172a45230ecb6318a04f1455d84e5a8b", 16),
-                new BigInteger("010001", 16));
-
-    private RSAKeyParameters prv9 = new RSAPrivateCrtKeyParameters(
-                new BigInteger("e6bd692ac96645790403fdd0f5beb8b9bf92ed10007fc365046419dd06c05c5b5b2f48ecf989e4ce269109979cbb40b4a0ad24d22483d1ee315ad4ccb1534268352691c524f6dd8e6c29d224cf246973aec86c5bf6b1401a850d1b9ad1bb8cbcec47b06f0f8c7f45d3fc8f319299c5433ddbc2b3053b47ded2ecd4a4caefd614833dc8bb622f317ed076b8057fe8de3f84480ad5e83e4a61904a4f248fb397027357e1d30e463139815c6fd4fd5ac5b8172a45230ecb6318a04f1455d84e5a8b", 16),
-                new BigInteger("010001", 16),
-                new BigInteger("6a7fd84fb85fad073b34406db74f8d61a6abc12196a961dd79565e9da6e5187bce2d980250f7359575359270d91590bb0e427c71460b55d51410b191bcf309fea131a92c8e702738fa719f1e0041f52e40e91f229f4d96a1e6f172e15596b4510a6daec26105f2bebc53316b87bdf21311666070e8dfee69d52c71a976caae79c72b68d28580dc686d9f5129d225f82b3d615513a882b3db91416b48ce08888213e37eeb9af800d81cab328ce420689903c00c7b5fd31b75503a6d419684d629", 16),
-                new BigInteger("f8eb97e98df12664eefdb761596a69ddcd0e76daece6ed4bf5a1b50ac086f7928a4d2f8726a77e515b74da41988f220b1cc87aa1fc810ce99a82f2d1ce821edced794c6941f42c7a1a0b8c4d28c75ec60b652279f6154a762aed165d47dee367", 16),
-                new BigInteger("ed4d71d0a6e24b93c2e5f6b4bbe05f5fb0afa042d204fe3378d365c2f288b6a8dad7efe45d153eef40cacc7b81ff934002d108994b94a5e4728cd9c963375ae49965bda55cbf0efed8d6553b4027f2d86208a6e6b489c176128092d629e49d3d", 16),
-                new BigInteger("2bb68bddfb0c4f56c8558bffaf892d8043037841e7fa81cfa61a38c5e39b901c8ee71122a5da2227bd6cdeeb481452c12ad3d61d5e4f776a0ab556591befe3e59e5a7fddb8345e1f2f35b9f4cee57c32414c086aec993e9353e480d9eec6289f", 16),
-                new BigInteger("4ff897709fad079746494578e70fd8546130eeab5627c49b080f05ee4ad9f3e4b7cba9d6a5dff113a41c3409336833f190816d8a6bc42e9bec56b7567d0f3c9c696db619b245d901dd856db7c8092e77e9a1cccd56ee4dba42c5fdb61aec2669", 16),
-                new BigInteger("77b9d1137b50404a982729316efafc7dfe66d34e5a182600d5f30a0a8512051c560d081d4d0a1835ec3d25a60f4e4d6aa948b2bf3dbb5b124cbbc3489255a3a948372f6978496745f943e1db4f18382ceaa505dfc65757bb3f857a58dce52156", 16));
-
-    // PSS Example 9.1
-
-    private byte[] msg9a = Hex.decode("a88e265855e9d7ca36c68795f0b31b591cd6587c71d060a0b3f7f3eaef43795922028bc2b6ad467cfc2d7f659c5385aa70ba3672cdde4cfe4970cc7904601b278872bf51321c4a972f3c95570f3445d4f57980e0f20df54846e6a52c668f1288c03f95006ea32f562d40d52af9feb32f0fa06db65b588a237b34e592d55cf979f903a642ef64d2ed542aa8c77dc1dd762f45a59303ed75e541ca271e2b60ca709e44fa0661131e8d5d4163fd8d398566ce26de8730e72f9cca737641c244159420637028df0a18079d6208ea8b4711a2c750f5");
-
-    private byte[] slt9a = Hex.decode("c0a425313df8d7564bd2434d311523d5257eed80");
-
-    private byte[] sig9a = Hex.decode("586107226c3ce013a7c8f04d1a6a2959bb4b8e205ba43a27b50f124111bc35ef589b039f5932187cb696d7d9a32c0c38300a5cdda4834b62d2eb240af33f79d13dfbf095bf599e0d9686948c1964747b67e89c9aba5cd85016236f566cc5802cb13ead51bc7ca6bef3b94dcbdbb1d570469771df0e00b1a8a06777472d2316279edae86474668d4e1efff95f1de61c6020da32ae92bbf16520fef3cf4d88f61121f24bbd9fe91b59caf1235b2a93ff81fc403addf4ebdea84934a9cdaf8e1a9e");
-
-    // PSS Example 9.2
-
-    private byte[] msg9b = Hex.decode("c8c9c6af04acda414d227ef23e0820c3732c500dc87275e95b0d095413993c2658bc1d988581ba879c2d201f14cb88ced153a01969a7bf0a7be79c84c1486bc12b3fa6c59871b6827c8ce253ca5fefa8a8c690bf326e8e37cdb96d90a82ebab69f86350e1822e8bd536a2e");
-
-    private byte[] slt9b = Hex.decode("b307c43b4850a8dac2f15f32e37839ef8c5c0e91");
-
-    private byte[] sig9b = Hex.decode("80b6d643255209f0a456763897ac9ed259d459b49c2887e5882ecb4434cfd66dd7e1699375381e51cd7f554f2c271704b399d42b4be2540a0eca61951f55267f7c2878c122842dadb28b01bd5f8c025f7e228418a673c03d6bc0c736d0a29546bd67f786d9d692ccea778d71d98c2063b7a71092187a4d35af108111d83e83eae46c46aa34277e06044589903788f1d5e7cee25fb485e92949118814d6f2c3ee361489016f327fb5bc517eb50470bffa1afa5f4ce9aa0ce5b8ee19bf5501b958");
-
-
-    public String getName()
-    {
-        return "PSSBlindTest";
-    }
-
-    private void testSig(
-        int                 id,
-        RSAKeyParameters    pub,
-        RSAKeyParameters    prv,
-        byte[]              slt,
-        byte[]              msg,
-        byte[]              sig)
-        throws Exception
-    {
-        RSABlindingFactorGenerator blindFactorGen = new RSABlindingFactorGenerator();
-        RSABlindingEngine blindingEngine = new RSABlindingEngine();
-        PSSSigner blindSigner = new PSSSigner(blindingEngine, new SHA1Digest(), 20);
-        PSSSigner signer = new PSSSigner(new RSAEngine(), new SHA1Digest(), 20);
-
-        blindFactorGen.init(pub);
-
-        BigInteger blindFactor = blindFactorGen.generateBlindingFactor();
-        RSABlindingParameters params = new RSABlindingParameters(pub, blindFactor);
-
-        // generate a blind signature
-        blindSigner.init(true, new ParametersWithRandom(params, new FixedRandom(slt)));
-
-        blindSigner.update(msg, 0, msg.length);
-
-        byte[] blindedData = blindSigner.generateSignature();
-
-        RSAEngine signerEngine = new RSAEngine();
-
-        signerEngine.init(true, prv);
-
-        byte[] blindedSig = signerEngine.processBlock(blindedData, 0, blindedData.length);
-
-        // unblind the signature
-        blindingEngine.init(false, params);
-
-        byte[] s = blindingEngine.processBlock(blindedSig, 0, blindedSig.length);
-
-        //signature verification
-        if (!areEqual(s, sig))
-        {
-            fail("test " + id + " failed generation");
-        }
-        
-        //verify signature with PSSSigner
-        signer.init(false, pub);
-        signer.update(msg, 0, msg.length);
-
-        if (!signer.verifySignature(s))
-        {
-            fail("test " + id + " failed PSSSigner verification");
-        }
-    }
-
-    private boolean isProcessingOkay(
-        RSAKeyParameters    pub,
-        RSAKeyParameters    prv,
-        byte[]              data,
-        SecureRandom        random)
-        throws Exception
-    {
-        RSABlindingFactorGenerator blindFactorGen = new RSABlindingFactorGenerator();
-        RSABlindingEngine blindingEngine = new RSABlindingEngine();
-        PSSSigner blindSigner = new PSSSigner(blindingEngine, new SHA1Digest(), 20);
-        PSSSigner pssEng = new PSSSigner(new RSAEngine(), new SHA1Digest(), 20);
-
-        random.nextBytes(data);
-
-        blindFactorGen.init(pub);
-
-        BigInteger blindFactor = blindFactorGen.generateBlindingFactor();
-        RSABlindingParameters params = new RSABlindingParameters(pub, blindFactor);
-
-        // generate a blind signature
-        blindSigner.init(true, new ParametersWithRandom(params, random));
-
-        blindSigner.update(data, 0, data.length);
-
-        byte[] blindedData = blindSigner.generateSignature();
-
-        RSAEngine signerEngine = new RSAEngine();
-
-        signerEngine.init(true, prv);
-
-        byte[] blindedSig = signerEngine.processBlock(blindedData, 0, blindedData.length);
-
-        // unblind the signature
-        blindingEngine.init(false, params);
-
-        byte[] s = blindingEngine.processBlock(blindedSig, 0, blindedSig.length);
-
-        //verify signature with PSSSigner
-        pssEng.init(false, pub);
-        pssEng.update(data, 0, data.length);
-
-        return pssEng.verifySignature(s);
-    }
-
-    public void performTest()
-        throws Exception
-    {
-        testSig(1, pub1, prv1, slt1a, msg1a, sig1a);
-        testSig(2, pub1, prv1, slt1b, msg1b, sig1b);
-        testSig(3, pub2, prv2, slt2a, msg2a, sig2a);
-        testSig(4, pub2, prv2, slt2b, msg2b, sig2b);
-        testSig(5, pub4, prv4, slt4a, msg4a, sig4a);
-        testSig(6, pub4, prv4, slt4b, msg4b, sig4b);
-        testSig(7, pub8, prv8, slt8a, msg8a, sig8a);
-        testSig(8, pub8, prv8, slt8b, msg8b, sig8b);
-        testSig(9, pub9, prv9, slt9a, msg9a, sig9a);
-        testSig(10, pub9, prv9, slt9b, msg9b, sig9b);
-        
-        //
-        // loop test
-        //
-        int failed = 0;
-        byte[] data = new byte[DATA_LENGTH];
-
-        SecureRandom    random = new SecureRandom();
-
-
-        RSAKeyParameters[] kprv ={prv1, prv2, prv4, prv8, prv9};
-        RSAKeyParameters[] kpub ={pub1, pub2, pub4, pub8, pub9};
-
-        int i = 0;
-        for (int j = 0; j < NUM_TESTS; j++, i++)
-        {
-            if (i == kprv.length)
-            {
-                i = 0;
-            }
-
-            if (!isProcessingOkay(kpub[i], kprv[i], data, random))
-            {
-                failed++;
-            }
-        }
-
-        if (failed != 0)
-        {
-            fail("loop test failed - failures: " + failed);
-        }
-
-        //
-        // key generation test
-        //
-        RSAKeyPairGenerator  pGen = new RSAKeyPairGenerator();
-        RSAKeyGenerationParameters  genParam = new RSAKeyGenerationParameters(
-                                            BigInteger.valueOf(0x11), new SecureRandom(), 1024, 25);
-
-        pGen.init(genParam);
-        failed = 0;
-
-        for (int k = 0; k < NUM_TESTS_WITH_KEY_GENERATION; k++)
-        {
-            AsymmetricCipherKeyPair pair = pGen.generateKeyPair();
-
-            for (int j = 0; j < NUM_TESTS; j++)
-            {
-                if (!isProcessingOkay((RSAKeyParameters)pair.getPublic(), (RSAKeyParameters)pair.getPrivate(), data, random))
-                {
-                    failed++;
-                }
-            }
-
-        }
-        
-        if (failed != 0)
-        {
-            fail("loop test with key generation failed - failures: " + failed);
-        }
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        runTest(new PSSBlindTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/PSSTest.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/PSSTest.java
deleted file mode 100644
index a718f8c..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/PSSTest.java
+++ /dev/null
@@ -1,332 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import java.math.BigInteger;
-import java.security.SecureRandom;
-
-import org.bouncycastle.crypto.digests.SHA1Digest;
-import org.bouncycastle.crypto.digests.SHA256Digest;
-import org.bouncycastle.crypto.engines.RSAEngine;
-import org.bouncycastle.crypto.params.ParametersWithRandom;
-import org.bouncycastle.crypto.params.RSAKeyParameters;
-import org.bouncycastle.crypto.params.RSAPrivateCrtKeyParameters;
-import org.bouncycastle.crypto.signers.PSSSigner;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-
-/*
- * RSA PSS test vectors for PKCS#1 V2.1
- */
-public class PSSTest
-    extends SimpleTest
-{
-    private final int DATA_LENGTH = 1000;
-    private final int NUM_TESTS = 500;
-
-    private class FixedRandom
-        extends SecureRandom
-    {
-        byte[]  vals;
-
-        FixedRandom(
-            byte[]  vals)
-        {
-            this.vals = vals;
-        }
-
-        public void nextBytes(
-            byte[]  bytes)
-        {
-            System.arraycopy(vals, 0, bytes, 0, vals.length);
-        }
-    }
-
-    //
-    // Example 1: A 1024-bit RSA keypair
-    //
-    private RSAKeyParameters pub1 = new RSAKeyParameters(false,
-                new BigInteger("a56e4a0e701017589a5187dc7ea841d156f2ec0e36ad52a44dfeb1e61f7ad991d8c51056ffedb162b4c0f283a12a88a394dff526ab7291cbb307ceabfce0b1dfd5cd9508096d5b2b8b6df5d671ef6377c0921cb23c270a70e2598e6ff89d19f105acc2d3f0cb35f29280e1386b6f64c4ef22e1e1f20d0ce8cffb2249bd9a2137",16),
-                new BigInteger("010001",16));
-
-    private RSAKeyParameters prv1 = new RSAPrivateCrtKeyParameters(
-                new BigInteger("a56e4a0e701017589a5187dc7ea841d156f2ec0e36ad52a44dfeb1e61f7ad991d8c51056ffedb162b4c0f283a12a88a394dff526ab7291cbb307ceabfce0b1dfd5cd9508096d5b2b8b6df5d671ef6377c0921cb23c270a70e2598e6ff89d19f105acc2d3f0cb35f29280e1386b6f64c4ef22e1e1f20d0ce8cffb2249bd9a2137",16),
-                new BigInteger("010001",16),
-                new BigInteger("33a5042a90b27d4f5451ca9bbbd0b44771a101af884340aef9885f2a4bbe92e894a724ac3c568c8f97853ad07c0266c8c6a3ca0929f1e8f11231884429fc4d9ae55fee896a10ce707c3ed7e734e44727a39574501a532683109c2abacaba283c31b4bd2f53c3ee37e352cee34f9e503bd80c0622ad79c6dcee883547c6a3b325",16),
-                new BigInteger("e7e8942720a877517273a356053ea2a1bc0c94aa72d55c6e86296b2dfc967948c0a72cbccca7eacb35706e09a1df55a1535bd9b3cc34160b3b6dcd3eda8e6443",16),
-                new BigInteger("b69dca1cf7d4d7ec81e75b90fcca874abcde123fd2700180aa90479b6e48de8d67ed24f9f19d85ba275874f542cd20dc723e6963364a1f9425452b269a6799fd",16),
-                new BigInteger("28fa13938655be1f8a159cbaca5a72ea190c30089e19cd274a556f36c4f6e19f554b34c077790427bbdd8dd3ede2448328f385d81b30e8e43b2fffa027861979",16),
-                new BigInteger("1a8b38f398fa712049898d7fb79ee0a77668791299cdfa09efc0e507acb21ed74301ef5bfd48be455eaeb6e1678255827580a8e4e8e14151d1510a82a3f2e729",16),
-                new BigInteger("27156aba4126d24a81f3a528cbfb27f56886f840a9f6e86e17a44b94fe9319584b8e22fdde1e5a2e3bd8aa5ba8d8584194eb2190acf832b847f13a3d24a79f4d",16));
-
-    // PSSExample1.1
-
-    private byte[] msg1a = Hex.decode("cdc87da223d786df3b45e0bbbc721326d1ee2af806cc315475cc6f0d9c66e1b62371d45ce2392e1ac92844c310102f156a0d8d52c1f4c40ba3aa65095786cb769757a6563ba958fed0bcc984e8b517a3d5f515b23b8a41e74aa867693f90dfb061a6e86dfaaee64472c00e5f20945729cbebe77f06ce78e08f4098fba41f9d6193c0317e8b60d4b6084acb42d29e3808a3bc372d85e331170fcbf7cc72d0b71c296648b3a4d10f416295d0807aa625cab2744fd9ea8fd223c42537029828bd16be02546f130fd2e33b936d2676e08aed1b73318b750a0167d0");
-
-    private byte[] slt1a = Hex.decode("dee959c7e06411361420ff80185ed57f3e6776af");
-
-    private byte[] sig1a = Hex.decode("9074308fb598e9701b2294388e52f971faac2b60a5145af185df5287b5ed2887e57ce7fd44dc8634e407c8e0e4360bc226f3ec227f9d9e54638e8d31f5051215df6ebb9c2f9579aa77598a38f914b5b9c1bd83c4e2f9f382a0d0aa3542ffee65984a601bc69eb28deb27dca12c82c2d4c3f66cd500f1ff2b994d8a4e30cbb33c");
-
-    // PSSExample1.2
-
-    private byte[] msg1b = Hex.decode("851384cdfe819c22ed6c4ccb30daeb5cf059bc8e1166b7e3530c4c233e2b5f8f71a1cca582d43ecc72b1bca16dfc7013226b9e");
-
-    private byte[] slt1b = Hex.decode("ef2869fa40c346cb183dab3d7bffc98fd56df42d");
-
-    private byte[] sig1b = Hex.decode("3ef7f46e831bf92b32274142a585ffcefbdca7b32ae90d10fb0f0c729984f04ef29a9df0780775ce43739b97838390db0a5505e63de927028d9d29b219ca2c4517832558a55d694a6d25b9dab66003c4cccd907802193be5170d26147d37b93590241be51c25055f47ef62752cfbe21418fafe98c22c4d4d47724fdb5669e843");
-
-    //
-    // Example 2: A 1025-bit RSA keypair
-    //
-
-    private RSAKeyParameters pub2 = new RSAKeyParameters(false,
-                new BigInteger("01d40c1bcf97a68ae7cdbd8a7bf3e34fa19dcca4ef75a47454375f94514d88fed006fb829f8419ff87d6315da68a1ff3a0938e9abb3464011c303ad99199cf0c7c7a8b477dce829e8844f625b115e5e9c4a59cf8f8113b6834336a2fd2689b472cbb5e5cabe674350c59b6c17e176874fb42f8fc3d176a017edc61fd326c4b33c9", 16),
-                new BigInteger("010001", 16));
-
-    private RSAKeyParameters prv2 = new RSAPrivateCrtKeyParameters(
-                new BigInteger("01d40c1bcf97a68ae7cdbd8a7bf3e34fa19dcca4ef75a47454375f94514d88fed006fb829f8419ff87d6315da68a1ff3a0938e9abb3464011c303ad99199cf0c7c7a8b477dce829e8844f625b115e5e9c4a59cf8f8113b6834336a2fd2689b472cbb5e5cabe674350c59b6c17e176874fb42f8fc3d176a017edc61fd326c4b33c9", 16),
-                new BigInteger("010001", 16),
-                new BigInteger("027d147e4673057377fd1ea201565772176a7dc38358d376045685a2e787c23c15576bc16b9f444402d6bfc5d98a3e88ea13ef67c353eca0c0ddba9255bd7b8bb50a644afdfd1dd51695b252d22e7318d1b6687a1c10ff75545f3db0fe602d5f2b7f294e3601eab7b9d1cecd767f64692e3e536ca2846cb0c2dd486a39fa75b1", 16),
-                new BigInteger("016601e926a0f8c9e26ecab769ea65a5e7c52cc9e080ef519457c644da6891c5a104d3ea7955929a22e7c68a7af9fcad777c3ccc2b9e3d3650bce404399b7e59d1", 16),
-                new BigInteger("014eafa1d4d0184da7e31f877d1281ddda625664869e8379e67ad3b75eae74a580e9827abd6eb7a002cb5411f5266797768fb8e95ae40e3e8a01f35ff89e56c079", 16),
-                new BigInteger("e247cce504939b8f0a36090de200938755e2444b29539a7da7a902f6056835c0db7b52559497cfe2c61a8086d0213c472c78851800b171f6401de2e9c2756f31", 16),
-                new BigInteger("b12fba757855e586e46f64c38a70c68b3f548d93d787b399999d4c8f0bbd2581c21e19ed0018a6d5d3df86424b3abcad40199d31495b61309f27c1bf55d487c1", 16),
-                new BigInteger("564b1e1fa003bda91e89090425aac05b91da9ee25061e7628d5f51304a84992fdc33762bd378a59f030a334d532bd0dae8f298ea9ed844636ad5fb8cbdc03cad", 16));
-
-    // PSS Example 2.1
-
-    private byte[] msg2a = Hex.decode("daba032066263faedb659848115278a52c44faa3a76f37515ed336321072c40a9d9b53bc05014078adf520875146aae70ff060226dcb7b1f1fc27e9360");
-    private byte[] slt2a = Hex.decode("57bf160bcb02bb1dc7280cf0458530b7d2832ff7");
-    private byte[] sig2a = Hex.decode("014c5ba5338328ccc6e7a90bf1c0ab3fd606ff4796d3c12e4b639ed9136a5fec6c16d8884bdd99cfdc521456b0742b736868cf90de099adb8d5ffd1deff39ba4007ab746cefdb22d7df0e225f54627dc65466131721b90af445363a8358b9f607642f78fab0ab0f43b7168d64bae70d8827848d8ef1e421c5754ddf42c2589b5b3");
-
-    // PSS Example 2.2
-
-    private byte[] msg2b = Hex.decode("e4f8601a8a6da1be34447c0959c058570c3668cfd51dd5f9ccd6ad4411fe8213486d78a6c49f93efc2ca2288cebc2b9b60bd04b1e220d86e3d4848d709d032d1e8c6a070c6af9a499fcf95354b14ba6127c739de1bb0fd16431e46938aec0cf8ad9eb72e832a7035de9b7807bdc0ed8b68eb0f5ac2216be40ce920c0db0eddd3860ed788efaccaca502d8f2bd6d1a7c1f41ff46f1681c8f1f818e9c4f6d91a0c7803ccc63d76a6544d843e084e363b8acc55aa531733edb5dee5b5196e9f03e8b731b3776428d9e457fe3fbcb3db7274442d785890e9cb0854b6444dace791d7273de1889719338a77fe");
-    private byte[] slt2b = Hex.decode("7f6dd359e604e60870e898e47b19bf2e5a7b2a90");
-    private byte[] sig2b = Hex.decode("010991656cca182b7f29d2dbc007e7ae0fec158eb6759cb9c45c5ff87c7635dd46d150882f4de1e9ae65e7f7d9018f6836954a47c0a81a8a6b6f83f2944d6081b1aa7c759b254b2c34b691da67cc0226e20b2f18b42212761dcd4b908a62b371b5918c5742af4b537e296917674fb914194761621cc19a41f6fb953fbcbb649dea");
-
-    //
-    //  Example 4: A 1027-bit RSA key pair
-    //
-
-    private RSAKeyParameters pub4 = new RSAKeyParameters(false,
-                new BigInteger("054adb7886447efe6f57e0368f06cf52b0a3370760d161cef126b91be7f89c421b62a6ec1da3c311d75ed50e0ab5fff3fd338acc3aa8a4e77ee26369acb81ba900fa83f5300cf9bb6c53ad1dc8a178b815db4235a9a9da0c06de4e615ea1277ce559e9c108de58c14a81aa77f5a6f8d1335494498848c8b95940740be7bf7c3705", 16),
-                new BigInteger("010001", 16));
-
-    private RSAKeyParameters prv4 = new RSAPrivateCrtKeyParameters(
-                new BigInteger("054adb7886447efe6f57e0368f06cf52b0a3370760d161cef126b91be7f89c421b62a6ec1da3c311d75ed50e0ab5fff3fd338acc3aa8a4e77ee26369acb81ba900fa83f5300cf9bb6c53ad1dc8a178b815db4235a9a9da0c06de4e615ea1277ce559e9c108de58c14a81aa77f5a6f8d1335494498848c8b95940740be7bf7c3705", 16),
-                new BigInteger("010001", 16),
-                new BigInteger("fa041f8cd9697ceed38ec8caa275523b4dd72b09a301d3541d72f5d31c05cbce2d6983b36183af10690bd46c46131e35789431a556771dd0049b57461bf060c1f68472e8a67c25f357e5b6b4738fa541a730346b4a07649a2dfa806a69c975b6aba64678acc7f5913e89c622f2d8abb1e3e32554e39df94ba60c002e387d9011", 16),
-                new BigInteger("029232336d2838945dba9dd7723f4e624a05f7375b927a87abe6a893a1658fd49f47f6c7b0fa596c65fa68a23f0ab432962d18d4343bd6fd671a5ea8d148413995", 16),
-                new BigInteger("020ef5efe7c5394aed2272f7e81a74f4c02d145894cb1b3cab23a9a0710a2afc7e3329acbb743d01f680c4d02afb4c8fde7e20930811bb2b995788b5e872c20bb1", 16),
-                new BigInteger("026e7e28010ecf2412d9523ad704647fb4fe9b66b1a681581b0e15553a89b1542828898f27243ebab45ff5e1acb9d4df1b051fbc62824dbc6f6c93261a78b9a759", 16),
-                new BigInteger("012ddcc86ef655998c39ddae11718669e5e46cf1495b07e13b1014cd69b3af68304ad2a6b64321e78bf3bbca9bb494e91d451717e2d97564c6549465d0205cf421", 16),
-                new BigInteger("010600c4c21847459fe576703e2ebecae8a5094ee63f536bf4ac68d3c13e5e4f12ac5cc10ab6a2d05a199214d1824747d551909636b774c22cac0b837599abcc75", 16));
-
-    // PSS Example 4.1
-
-    private byte[] msg4a = Hex.decode("9fb03b827c8217d9");
-
-    private byte[] slt4a = Hex.decode("ed7c98c95f30974fbe4fbddcf0f28d6021c0e91d");
-
-    private byte[] sig4a = Hex.decode("0323d5b7bf20ba4539289ae452ae4297080feff4518423ff4811a817837e7d82f1836cdfab54514ff0887bddeebf40bf99b047abc3ecfa6a37a3ef00f4a0c4a88aae0904b745c846c4107e8797723e8ac810d9e3d95dfa30ff4966f4d75d13768d20857f2b1406f264cfe75e27d7652f4b5ed3575f28a702f8c4ed9cf9b2d44948");
-
-    // PSS Example 4.2
-
-    private byte[] msg4b = Hex.decode("0ca2ad77797ece86de5bf768750ddb5ed6a3116ad99bbd17edf7f782f0db1cd05b0f677468c5ea420dc116b10e80d110de2b0461ea14a38be68620392e7e893cb4ea9393fb886c20ff790642305bf302003892e54df9f667509dc53920df583f50a3dd61abb6fab75d600377e383e6aca6710eeea27156e06752c94ce25ae99fcbf8592dbe2d7e27453cb44de07100ebb1a2a19811a478adbeab270f94e8fe369d90b3ca612f9f");
-
-    private byte[] slt4b = Hex.decode("22d71d54363a4217aa55113f059b3384e3e57e44");
-
-    private byte[] sig4b = Hex.decode("049d0185845a264d28feb1e69edaec090609e8e46d93abb38371ce51f4aa65a599bdaaa81d24fba66a08a116cb644f3f1e653d95c89db8bbd5daac2709c8984000178410a7c6aa8667ddc38c741f710ec8665aa9052be929d4e3b16782c1662114c5414bb0353455c392fc28f3db59054b5f365c49e1d156f876ee10cb4fd70598");
-
-
-    //
-    // Example 8: A 1031-bit RSA key pair
-    //
-
-    private RSAKeyParameters pub8 = new RSAKeyParameters(false,
-                new BigInteger("495370a1fb18543c16d3631e3163255df62be6eee890d5f25509e4f778a8ea6fbbbcdf85dff64e0d972003ab3681fbba6dd41fd541829b2e582de9f2a4a4e0a2d0900bef4753db3cee0ee06c7dfae8b1d53b5953218f9cceea695b08668edeaadced9463b1d790d5ebf27e9115b46cad4d9a2b8efab0561b0810344739ada0733f", 16),
-                new BigInteger("010001", 16));
-
-    private RSAKeyParameters prv8 = new RSAPrivateCrtKeyParameters(
-                new BigInteger("495370a1fb18543c16d3631e3163255df62be6eee890d5f25509e4f778a8ea6fbbbcdf85dff64e0d972003ab3681fbba6dd41fd541829b2e582de9f2a4a4e0a2d0900bef4753db3cee0ee06c7dfae8b1d53b5953218f9cceea695b08668edeaadced9463b1d790d5ebf27e9115b46cad4d9a2b8efab0561b0810344739ada0733f", 16),
-                new BigInteger("010001", 16),
-                new BigInteger("6c66ffe98980c38fcdeab5159898836165f4b4b817c4f6a8d486ee4ea9130fe9b9092bd136d184f95f504a607eac565846d2fdd6597a8967c7396ef95a6eeebb4578a643966dca4d8ee3de842de63279c618159c1ab54a89437b6a6120e4930afb52a4ba6ced8a4947ac64b30a3497cbe701c2d6266d517219ad0ec6d347dbe9", 16),
-                new BigInteger("08dad7f11363faa623d5d6d5e8a319328d82190d7127d2846c439b0ab72619b0a43a95320e4ec34fc3a9cea876422305bd76c5ba7be9e2f410c8060645a1d29edb", 16),
-                new BigInteger("0847e732376fc7900f898ea82eb2b0fc418565fdae62f7d9ec4ce2217b97990dd272db157f99f63c0dcbb9fbacdbd4c4dadb6df67756358ca4174825b48f49706d", 16),
-                new BigInteger("05c2a83c124b3621a2aa57ea2c3efe035eff4560f33ddebb7adab81fce69a0c8c2edc16520dda83d59a23be867963ac65f2cc710bbcfb96ee103deb771d105fd85", 16),
-                new BigInteger("04cae8aa0d9faa165c87b682ec140b8ed3b50b24594b7a3b2c220b3669bb819f984f55310a1ae7823651d4a02e99447972595139363434e5e30a7e7d241551e1b9", 16),
-                new BigInteger("07d3e47bf686600b11ac283ce88dbb3f6051e8efd04680e44c171ef531b80b2b7c39fc766320e2cf15d8d99820e96ff30dc69691839c4b40d7b06e45307dc91f3f", 16));
-
-    // PSS Example 8.1
-
-    private byte[] msg8a = Hex.decode("81332f4be62948415ea1d899792eeacf6c6e1db1da8be13b5cea41db2fed467092e1ff398914c714259775f595f8547f735692a575e6923af78f22c6997ddb90fb6f72d7bb0dd5744a31decd3dc3685849836ed34aec596304ad11843c4f88489f209735f5fb7fdaf7cec8addc5818168f880acbf490d51005b7a8e84e43e54287977571dd99eea4b161eb2df1f5108f12a4142a83322edb05a75487a3435c9a78ce53ed93bc550857d7a9fb");
-
-    private byte[] slt8a = Hex.decode("1d65491d79c864b373009be6f6f2467bac4c78fa");
-
-    private byte[] sig8a = Hex.decode("0262ac254bfa77f3c1aca22c5179f8f040422b3c5bafd40a8f21cf0fa5a667ccd5993d42dbafb409c520e25fce2b1ee1e716577f1efa17f3da28052f40f0419b23106d7845aaf01125b698e7a4dfe92d3967bb00c4d0d35ba3552ab9a8b3eef07c7fecdbc5424ac4db1e20cb37d0b2744769940ea907e17fbbca673b20522380c5");
-
-    // PSS Example 8.2
-
-    private byte[] msg8b = Hex.decode("e2f96eaf0e05e7ba326ecca0ba7fd2f7c02356f3cede9d0faabf4fcc8e60a973e5595fd9ea08");
-
-    private byte[] slt8b = Hex.decode("435c098aa9909eb2377f1248b091b68987ff1838");
-
-    private byte[] sig8b = Hex.decode("2707b9ad5115c58c94e932e8ec0a280f56339e44a1b58d4ddcff2f312e5f34dcfe39e89c6a94dcee86dbbdae5b79ba4e0819a9e7bfd9d982e7ee6c86ee68396e8b3a14c9c8f34b178eb741f9d3f121109bf5c8172fada2e768f9ea1433032c004a8aa07eb990000a48dc94c8bac8aabe2b09b1aa46c0a2aa0e12f63fbba775ba7e");
-
-    //
-    // Example 9: A 1536-bit RSA key pair
-    //
-
-    private RSAKeyParameters pub9 = new RSAKeyParameters(false,
-                new BigInteger("e6bd692ac96645790403fdd0f5beb8b9bf92ed10007fc365046419dd06c05c5b5b2f48ecf989e4ce269109979cbb40b4a0ad24d22483d1ee315ad4ccb1534268352691c524f6dd8e6c29d224cf246973aec86c5bf6b1401a850d1b9ad1bb8cbcec47b06f0f8c7f45d3fc8f319299c5433ddbc2b3053b47ded2ecd4a4caefd614833dc8bb622f317ed076b8057fe8de3f84480ad5e83e4a61904a4f248fb397027357e1d30e463139815c6fd4fd5ac5b8172a45230ecb6318a04f1455d84e5a8b", 16),
-                new BigInteger("010001", 16));
-
-    private RSAKeyParameters prv9 = new RSAPrivateCrtKeyParameters(
-                new BigInteger("e6bd692ac96645790403fdd0f5beb8b9bf92ed10007fc365046419dd06c05c5b5b2f48ecf989e4ce269109979cbb40b4a0ad24d22483d1ee315ad4ccb1534268352691c524f6dd8e6c29d224cf246973aec86c5bf6b1401a850d1b9ad1bb8cbcec47b06f0f8c7f45d3fc8f319299c5433ddbc2b3053b47ded2ecd4a4caefd614833dc8bb622f317ed076b8057fe8de3f84480ad5e83e4a61904a4f248fb397027357e1d30e463139815c6fd4fd5ac5b8172a45230ecb6318a04f1455d84e5a8b", 16),
-                new BigInteger("010001", 16),
-                new BigInteger("6a7fd84fb85fad073b34406db74f8d61a6abc12196a961dd79565e9da6e5187bce2d980250f7359575359270d91590bb0e427c71460b55d51410b191bcf309fea131a92c8e702738fa719f1e0041f52e40e91f229f4d96a1e6f172e15596b4510a6daec26105f2bebc53316b87bdf21311666070e8dfee69d52c71a976caae79c72b68d28580dc686d9f5129d225f82b3d615513a882b3db91416b48ce08888213e37eeb9af800d81cab328ce420689903c00c7b5fd31b75503a6d419684d629", 16),
-                new BigInteger("f8eb97e98df12664eefdb761596a69ddcd0e76daece6ed4bf5a1b50ac086f7928a4d2f8726a77e515b74da41988f220b1cc87aa1fc810ce99a82f2d1ce821edced794c6941f42c7a1a0b8c4d28c75ec60b652279f6154a762aed165d47dee367", 16),
-                new BigInteger("ed4d71d0a6e24b93c2e5f6b4bbe05f5fb0afa042d204fe3378d365c2f288b6a8dad7efe45d153eef40cacc7b81ff934002d108994b94a5e4728cd9c963375ae49965bda55cbf0efed8d6553b4027f2d86208a6e6b489c176128092d629e49d3d", 16),
-                new BigInteger("2bb68bddfb0c4f56c8558bffaf892d8043037841e7fa81cfa61a38c5e39b901c8ee71122a5da2227bd6cdeeb481452c12ad3d61d5e4f776a0ab556591befe3e59e5a7fddb8345e1f2f35b9f4cee57c32414c086aec993e9353e480d9eec6289f", 16),
-                new BigInteger("4ff897709fad079746494578e70fd8546130eeab5627c49b080f05ee4ad9f3e4b7cba9d6a5dff113a41c3409336833f190816d8a6bc42e9bec56b7567d0f3c9c696db619b245d901dd856db7c8092e77e9a1cccd56ee4dba42c5fdb61aec2669", 16),
-                new BigInteger("77b9d1137b50404a982729316efafc7dfe66d34e5a182600d5f30a0a8512051c560d081d4d0a1835ec3d25a60f4e4d6aa948b2bf3dbb5b124cbbc3489255a3a948372f6978496745f943e1db4f18382ceaa505dfc65757bb3f857a58dce52156", 16));
-
-    // PSS Example 9.1
-
-    private byte[] msg9a = Hex.decode("a88e265855e9d7ca36c68795f0b31b591cd6587c71d060a0b3f7f3eaef43795922028bc2b6ad467cfc2d7f659c5385aa70ba3672cdde4cfe4970cc7904601b278872bf51321c4a972f3c95570f3445d4f57980e0f20df54846e6a52c668f1288c03f95006ea32f562d40d52af9feb32f0fa06db65b588a237b34e592d55cf979f903a642ef64d2ed542aa8c77dc1dd762f45a59303ed75e541ca271e2b60ca709e44fa0661131e8d5d4163fd8d398566ce26de8730e72f9cca737641c244159420637028df0a18079d6208ea8b4711a2c750f5");
-
-    private byte[] slt9a = Hex.decode("c0a425313df8d7564bd2434d311523d5257eed80");
-
-    private byte[] sig9a = Hex.decode("586107226c3ce013a7c8f04d1a6a2959bb4b8e205ba43a27b50f124111bc35ef589b039f5932187cb696d7d9a32c0c38300a5cdda4834b62d2eb240af33f79d13dfbf095bf599e0d9686948c1964747b67e89c9aba5cd85016236f566cc5802cb13ead51bc7ca6bef3b94dcbdbb1d570469771df0e00b1a8a06777472d2316279edae86474668d4e1efff95f1de61c6020da32ae92bbf16520fef3cf4d88f61121f24bbd9fe91b59caf1235b2a93ff81fc403addf4ebdea84934a9cdaf8e1a9e");
-
-    // PSS Example 9.2
-
-    private byte[] msg9b = Hex.decode("c8c9c6af04acda414d227ef23e0820c3732c500dc87275e95b0d095413993c2658bc1d988581ba879c2d201f14cb88ced153a01969a7bf0a7be79c84c1486bc12b3fa6c59871b6827c8ce253ca5fefa8a8c690bf326e8e37cdb96d90a82ebab69f86350e1822e8bd536a2e");
-
-    private byte[] slt9b = Hex.decode("b307c43b4850a8dac2f15f32e37839ef8c5c0e91");
-
-    private byte[] sig9b = Hex.decode("80b6d643255209f0a456763897ac9ed259d459b49c2887e5882ecb4434cfd66dd7e1699375381e51cd7f554f2c271704b399d42b4be2540a0eca61951f55267f7c2878c122842dadb28b01bd5f8c025f7e228418a673c03d6bc0c736d0a29546bd67f786d9d692ccea778d71d98c2063b7a71092187a4d35af108111d83e83eae46c46aa34277e06044589903788f1d5e7cee25fb485e92949118814d6f2c3ee361489016f327fb5bc517eb50470bffa1afa5f4ce9aa0ce5b8ee19bf5501b958");
-
-
-    public String getName()
-    {
-        return "PSSTest";
-    }
-
-    private void testSig(
-        int                 id,
-        RSAKeyParameters    pub,
-        RSAKeyParameters    prv,
-        byte[]              slt,
-        byte[]              msg,
-        byte[]              sig)
-        throws Exception
-    {
-        PSSSigner           eng = new PSSSigner(new RSAEngine(), new SHA1Digest(), 20);
-
-        eng.init(true, new ParametersWithRandom(prv, new FixedRandom(slt)));
-
-        eng.update(msg, 0, msg.length);
-
-        byte[]  s = eng.generateSignature();
-
-        if (!areEqual(s, sig))
-        {
-            fail("test " + id + " failed generation");
-        }
-
-        eng.init(false, pub);
-
-        eng.update(msg, 0, msg.length);
-
-        if (!eng.verifySignature(s))
-        {
-            fail("test " + id + " failed verification");
-        }
-    }
-        
-    public void performTest()
-        throws Exception
-    {
-        testSig(1, pub1, prv1, slt1a, msg1a, sig1a);
-        testSig(2, pub1, prv1, slt1b, msg1b, sig1b);
-        testSig(3, pub2, prv2, slt2a, msg2a, sig2a);
-        testSig(4, pub2, prv2, slt2b, msg2b, sig2b);
-        testSig(5, pub4, prv4, slt4a, msg4a, sig4a);
-        testSig(6, pub4, prv4, slt4b, msg4b, sig4b);
-        testSig(7, pub8, prv8, slt8a, msg8a, sig8a);
-        testSig(8, pub8, prv8, slt8b, msg8b, sig8b);
-        testSig(9, pub9, prv9, slt9a, msg9a, sig9a);
-        testSig(10, pub9, prv9, slt9b, msg9b, sig9b);
-
-        //
-        // loop test  - sha-1 only
-        //
-        PSSSigner           eng = new PSSSigner(new RSAEngine(), new SHA1Digest(), 20);
-        int failed = 0;
-        byte[] data = new byte[DATA_LENGTH];
-
-        SecureRandom    random = new SecureRandom();
-        random.nextBytes(data);
-        
-        for (int j = 0; j < NUM_TESTS; j++)
-        {
-            eng.init(true, new ParametersWithRandom(prv8, random));
-
-            eng.update(data, 0, data.length);
-
-            byte[] s = eng.generateSignature();
-
-            eng.init(false, pub8);
-
-            eng.update(data, 0, data.length);
-
-            if (!eng.verifySignature(s))
-            {
-                failed++;
-            }
-        }
-        
-        if (failed != 0)
-        {
-            fail("loop test failed - failures: " + failed);
-        }
-
-         //
-        // loop test - sha-256 and sha-1
-        //
-        eng = new PSSSigner(new RSAEngine(), new SHA256Digest(), new SHA1Digest(), 20);
-        failed = 0;
-        data = new byte[DATA_LENGTH];
-
-        random.nextBytes(data);
-
-        for (int j = 0; j < NUM_TESTS; j++)
-        {
-            eng.init(true, new ParametersWithRandom(prv8, random));
-
-            eng.update(data, 0, data.length);
-
-            byte[] s = eng.generateSignature();
-
-            eng.init(false, pub8);
-
-            eng.update(data, 0, data.length);
-
-            if (!eng.verifySignature(s))
-            {
-                failed++;
-            }
-        }
-
-        if (failed != 0)
-        {
-            fail("loop test failed - failures: " + failed);
-        }
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        runTest(new PSSTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/PaddingTest.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/PaddingTest.java
deleted file mode 100644
index c963b26..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/PaddingTest.java
+++ /dev/null
@@ -1,200 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import java.security.SecureRandom;
-
-import org.bouncycastle.crypto.engines.DESEngine;
-import org.bouncycastle.crypto.paddings.BlockCipherPadding;
-import org.bouncycastle.crypto.paddings.ISO10126d2Padding;
-import org.bouncycastle.crypto.paddings.ISO7816d4Padding;
-import org.bouncycastle.crypto.paddings.PKCS7Padding;
-import org.bouncycastle.crypto.paddings.PaddedBufferedBlockCipher;
-import org.bouncycastle.crypto.paddings.TBCPadding;
-import org.bouncycastle.crypto.paddings.X923Padding;
-import org.bouncycastle.crypto.paddings.ZeroBytePadding;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.crypto.InvalidCipherTextException;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-
-/**
- * General Padding tests.
- */
-public class PaddingTest
-    extends SimpleTest
-{
-    public PaddingTest()
-    {
-    }
-
-    private void blockCheck(
-        PaddedBufferedBlockCipher   cipher,
-        BlockCipherPadding          padding,
-        KeyParameter                key,
-        byte[]                      data)
-    {
-        byte[]  out = new byte[data.length + 8];
-        byte[]  dec = new byte[data.length];
-        
-        try
-        {                
-            cipher.init(true, key);
-            
-            int    len = cipher.processBytes(data, 0, data.length, out, 0);
-            
-            len += cipher.doFinal(out, len);
-            
-            cipher.init(false, key);
-            
-            int    decLen = cipher.processBytes(out, 0, len, dec, 0);
-            
-            decLen += cipher.doFinal(dec, decLen);
-            
-            if (!areEqual(data, dec))
-            {
-                fail("failed to decrypt - i = " + data.length + ", padding = " + padding.getPaddingName());
-            }
-        }
-        catch (Exception e)
-        {
-            fail("Exception - " + e.toString(), e);
-        }
-    }
-    
-    public void testPadding(
-        BlockCipherPadding  padding,
-        SecureRandom        rand,
-        byte[]              ffVector,
-        byte[]              ZeroVector)
-    {
-        PaddedBufferedBlockCipher    cipher = new PaddedBufferedBlockCipher(new DESEngine(), padding);
-        KeyParameter                 key = new KeyParameter(Hex.decode("0011223344556677"));
-        
-        //
-        // ff test
-        //
-        byte[]    data = { (byte)0xff, (byte)0xff, (byte)0xff, (byte)0, (byte)0, (byte)0, (byte)0, (byte)0 };
-        
-        if (ffVector != null)
-        {
-            padding.addPadding(data, 3);
-            
-            if (!areEqual(data, ffVector))
-            {
-                fail("failed ff test for " + padding.getPaddingName());
-            }
-        }
-        
-        //
-        // zero test
-        //
-        if (ZeroVector != null)
-        {
-            data = new byte[8];
-            padding.addPadding(data, 4);
-            
-            if (!areEqual(data, ZeroVector))
-            {
-                fail("failed zero test for " + padding.getPaddingName());
-            }
-        }
-        
-        for (int i = 1; i != 200; i++)
-        {
-            data = new byte[i];
-            
-            rand.nextBytes(data);
-
-            blockCheck(cipher, padding, key, data);
-        }
-    }
-    
-    private void testOutputSizes()
-    {
-        PaddedBufferedBlockCipher bc = new PaddedBufferedBlockCipher(new DESEngine(), new PKCS7Padding());
-        KeyParameter key = new KeyParameter(Hex.decode("0011223344556677"));
-
-        for (int i = 0; i < bc.getBlockSize() * 2; i++)
-        {
-            bc.init(true, key);
-            if (bc.getUpdateOutputSize(i) < 0)
-            {
-                fail("Padded cipher encrypt negative update output size for input size " + i);
-            }
-            if (bc.getOutputSize(i) < 0)
-            {
-                fail("Padded cipher encrypt negative output size for input size " + i);
-            }
-
-            bc.init(false, key);
-            if (bc.getUpdateOutputSize(i) < 0)
-            {
-                fail("Padded cipher decrypt negative update output size for input size " + i);
-            }
-            if (bc.getOutputSize(i) < 0)
-            {
-                fail("Padded cipher decrypt negative output size for input size " + i);
-            }
-
-        }
-    }
-
-    public void performTest()
-    {
-        SecureRandom    rand = new SecureRandom(new byte[20]);
-        
-        rand.setSeed(System.currentTimeMillis());
-        
-        testPadding(new PKCS7Padding(), rand,
-                                    Hex.decode("ffffff0505050505"),
-                                    Hex.decode("0000000004040404"));
-
-        PKCS7Padding padder = new PKCS7Padding();
-        try
-        {
-            padder.padCount(new byte[8]);
-
-            fail("invalid padding not detected");
-        }
-        catch (InvalidCipherTextException e)
-        {
-            if (!"pad block corrupted".equals(e.getMessage()))
-            {
-                fail("wrong exception for corrupt padding: " + e);
-            }
-        } 
-
-        testPadding(new ISO10126d2Padding(), rand,
-                                    null,
-                                    null);
-        
-        testPadding(new X923Padding(), rand,
-                                    null,
-                                    null);
-
-        testPadding(new TBCPadding(), rand,
-                                    Hex.decode("ffffff0000000000"),
-                                    Hex.decode("00000000ffffffff"));
-
-        testPadding(new ZeroBytePadding(), rand,
-                                    Hex.decode("ffffff0000000000"),
-                                    null);
-        
-        testPadding(new ISO7816d4Padding(), rand,
-                                    Hex.decode("ffffff8000000000"),
-                                    Hex.decode("0000000080000000"));
-
-        testOutputSizes();
-
-    }
-
-    public String getName()
-    {
-        return "PaddingTest";
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        runTest(new PaddingTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/Poly1305Test.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/Poly1305Test.java
deleted file mode 100644
index 08ee8e1..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/Poly1305Test.java
+++ /dev/null
@@ -1,388 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import java.security.SecureRandom;
-
-import org.bouncycastle.crypto.BlockCipher;
-import org.bouncycastle.crypto.CipherKeyGenerator;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.DataLengthException;
-import org.bouncycastle.crypto.KeyGenerationParameters;
-import org.bouncycastle.crypto.Mac;
-import org.bouncycastle.crypto.engines.AESFastEngine;
-import org.bouncycastle.crypto.generators.Poly1305KeyGenerator;
-import org.bouncycastle.crypto.macs.Poly1305;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.crypto.params.ParametersWithIV;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-
-/*
- */
-public class Poly1305Test
-    extends SimpleTest
-{
-    private static final int MAXLEN = 1000;
-
-    private static class KeyEngine
-        implements BlockCipher
-    {
-
-        private byte[] key;
-        private final int blockSize;
-
-        public KeyEngine(int blockSize)
-        {
-            this.blockSize = blockSize;
-        }
-
-        public void init(boolean forEncryption, CipherParameters params)
-            throws IllegalArgumentException
-        {
-            if (params instanceof KeyParameter)
-            {
-                this.key = ((KeyParameter)params).getKey();
-            }
-        }
-
-        public String getAlgorithmName()
-        {
-            return "Key";
-        }
-
-        public int getBlockSize()
-        {
-            return blockSize;
-        }
-
-        public int processBlock(byte[] in, int inOff, byte[] out, int outOff)
-            throws DataLengthException,
-            IllegalStateException
-        {
-            System.arraycopy(key, 0, out, outOff, key.length);
-            return key.length;
-        }
-
-        public void reset()
-        {
-        }
-
-    }
-
-    private static class TestCase
-    {
-        private final byte[] key;
-        private final byte[] nonce;
-        private final byte[] message;
-        private final byte[] expectedMac;
-
-        public TestCase(String key, String nonce, String message, String expectedMac)
-        {
-            this.key = Hex.decode(key);
-            // nacl test case keys are not pre-clamped
-            Poly1305KeyGenerator.clamp(this.key);
-            this.nonce = (nonce == null) ? null : Hex.decode(nonce);
-            this.message = Hex.decode(message);
-            this.expectedMac = Hex.decode(expectedMac);
-        }
-    }
-
-    private static TestCase[] CASES = {
-            // Raw Poly1305
-            // onetimeauth.c from nacl-20110221
-            new TestCase("2539121d8e234e652d651fa4c8cff880eea6a7251c1e72916d11c2cb214d3c25", null,
-                    "8e993b9f48681273c29650ba32fc76ce48332ea7164d96a4476fb8c531a1186a"
-                        + "c0dfc17c98dce87b4da7f011ec48c97271d2c20f9b928fe2270d6fb863d51738"
-                        + "b48eeee314a7cc8ab932164548e526ae90224368517acfeabd6bb3732bc0e9da"
-                        + "99832b61ca01b6de56244a9e88d5f9b37973f622a43d14a6599b1f654cb45a74e355a5",
-                    "f3ffc7703f9400e52a7dfb4b3d3305d9"),
-
-            // Poly1305-AES
-            // Loop 1 of test-poly1305aes from poly1305aes-20050218
-            new TestCase("0000000000000000000000000000000000000000000000000000000000000000",
-                    "00000000000000000000000000000000", "", "66e94bd4ef8a2c3b884cfa59ca342b2e"),
-            new TestCase("f795bd4a52e29ed713d313fa20e98dbcf795bd0a50e29e0710d3130a20e98d0c",
-                    "917cf69ebd68b2ec9b9fe9a3eadda692", "66f7", "5ca585c75e8f8f025e710cabc9a1508b"),
-            new TestCase("e69dae0aab9f91c03a325dcc9436fa903ef49901c8e11c000430d90ad45e7603",
-                    "166450152e2394835606a9d1dd2cdc8b", "66f75c0e0c7a406586", "2924f51b9c2eff5df09db61dd03a9ca1"),
-            new TestCase("85a4ea91a7de0b0d96eed0d4bf6ecf1cda4afc035087d90e503f8f0ea08c3e0d",
-                    "0b6ef7a0b8f8c738b0f8d5995415271f",
-                    "66f75c0e0c7a40658629e3392f7f8e3349a02191ffd49f39879a8d9d1d0e23ea",
-                    "3c5a13adb18d31c64cc29972030c917d"),
-            new TestCase(
-                    "25eb69bac5cdf7d6bfcee4d9d5507b82ca3c6a0da0a864024ca3090628c28e0d",
-                    "046772a4f0a8de92e4f0d628cdb04484",
-                    "66f75c0e0c7a40658629e3392f7f8e3349a02191ffd49f39879a8d9d1d0e23ea3caa4d240bd2ab8a8c4a6bb8d3288d9de4b793f05e97646dd4d98055de",
-                    "fc5fb58dc65daf19b14d1d05da1064e8"),
-
-            // Specific test cases generated from test-poly1305aes from poly1305aes-20050218 that
-            // expose Java unsigned integer problems
-            new TestCase(
-                    "95cc0e44d0b79a8856afcae1bec4fe3c" + "01bcb20bfc8b6e03609ddd09f44b060f",
-                    null,
-                    "66f75c0e0c7a40658629e3392f7f8e3349a02191ffd49f39879a8d9d1d0e23ea3caa4d240bd2ab8a8c4a6bb8d3288d9de4b793f05e97646dd4d98055de"
-                        + "fc3e0677d956b4c62664bac15962ab15d93ccbbc03aafdbde779162ed93b55361f0f8acaa41d50ef5175927fe79ea316186516eef15001cd04d3524a55"
-                        + "e4fa3c5ca479d3aaa8a897c21807f721b6270ffc68b6889d81a116799f6aaa35d8e04c7a7dd5e6da2519e8759f54e906696f5772fee093283bcef7b930"
-                        + "aed50323bcbc8c820c67422c1e16bdc022a9c0277c9d95fef0ea4ee11e2b27276da811523c5acb80154989f8a67ee9e3fa30b73b0c1c34bf46e3464d97"
-                        + "7cd7fcd0ac3b82721080bb0d9b982ee2c77feee983d7ba35da88ce86955002940652ab63bc56fb16f994da2b01d74356509d7d1b6d7956b0e5a557757b"
-                        + "d1ced2eef8650bc5b6d426108c1518abcbd0befb6a0d5fd57a3e2dbf31458eab63df66613653d4beae73f5c40eb438fbcfdcf4a4ba46320184b9ca0da4"
-                        + "dfae77de7ccc910356caea3243f33a3c81b064b3b7cedc7435c223f664227215715980e6e0bb570d459ba80d7512dbe458c8f0f3f52d659b6e8eef19ee"
-                        + "71aea2ced85c7a42ffca6522a62db49a2a46eff72bd7f7e0883acd087183f0627f3537a4d558754ed63358e8182bee196735b361dc9bd64d5e34e1074a"
-                        + "855655d2974cc6fa1653754cf40f561d8c7dc526aab2908ec2d2b977cde1a1fb1071e32f40e049ea20f30368ba1592b4fe57fb51595d23acbdace324cd"
-                        + "d78060a17187c662368854e915402d9b52fb21e984663e41c26a109437e162cfaf071b53f77e50000a5388ff183b82ce7a1af476c416d7d204157b3633"
-                        + "b2f4ec077b699b032816997e37bceded8d4a04976fd7d0c0b029f290794c3be504c5242287ea2f831f11ed5690d92775cd6e863d7731fd4da687ebfb13"
-                        + "df4c41dc0fb8", "ae345d555eb04d6947bb95c0965237e2"),
-            new TestCase(
-                    "76fb3635a2dc92a1f768163ab12f2187" + "cd07fd0ef8c0be0afcbdb30af4af0009",
-                    null,
-                    "f05204a74f0f88a7fa1a95b84ec3d8ffb36fcdc7723ea65dfe7cd464e86e0abf6b9d51db3220cfd8496ad6e6d36ebee8d990f9ce0d3bb7f72b7ab5b3ab0a73240d11efe772c857021ae859db4933cdde4387b471d2ce700fef4b81087f8f47c307881fd83017afcd15b8d21edf9b704677f46df97b07e5b83f87c8abd90af9b1d0f9e2710e8ebd0d4d1c6a055abea861f42368bed94d9373e909c1d3715b221c16bc524c55c31ec3eab204850bb2474a84f9917038eff9d921130951391b5c54f09b5e1de833ea2cd7d3b306740abb7096d1e173da83427da2adddd3631eda30b54dbf487f2b082e8646f07d6e0a87e97522ca38d4ace4954bf3db6dd3a93b06fa18eb56856627ed6cffcd7ae26374554ca18ab8905f26331d323fe10e6e70624c7bc07a70f06ecd804b48f8f7e75e910165e1beb554f1f0ec7949c9c8d429a206b4d5c0653102249b6098e6b45fac2a07ff0220b0b8ae8f4c6bcc0c813a7cd141fa8b398b42575fc395747c5a0257ac41d6c1f434cfbf5dfe8349f5347ef6b60e611f5d6c3cbc20ca2555274d1934325824cef4809da293ea13f181929e2af025bbd1c9abdc3af93afd4c50a2854ade3887f4d2c8c225168052c16e74d76d2dd3e9467a2c5b8e15c06ffbffa42b8536384139f07e195a8c9f70f514f31dca4eb2cf262c0dcbde53654b6250a29efe21d54e83c80e005a1cad36d5934ff01c32e4bc5fe06d03064ff4a268517df4a94c759289f323734318cfa5d859d4ce9c16e63d02dff0896976f521607638535d2ee8dd3312e1ddc80a55d34fe829ab954c1ebd54d929954770f1be9d32b4c05003c5c9e97943b6431e2afe820b1e967b19843e5985a131b1100517cdc363799104af91e2cf3f53cb8fd003653a6dd8a31a3f9d566a7124b0ffe9695bcb87c482eb60106f88198f766a40bc0f4873c23653c5f9e7a8e446f770beb8034cf01d21028ba15ccee21a8db918c4829d61c88bfa927bc5def831501796c5b401a60a6b1b433c9fb905c8cd40412fffee81ab",
-                    "045be28cc52009f506bdbfabedacf0b4"),
-
-    };
-
-    public String getName()
-    {
-        return "Poly1305";
-    }
-
-    public void performTest()
-        throws Exception
-    {
-        testKeyGenerator();
-        testInit();
-        for (int i = 0; i < CASES.length; i++)
-        {
-            testCase(i);
-        }
-        testSequential();
-        testReset();
-    }
-
-    private void testCase(int i)
-    {
-        byte[] out = new byte[16];
-        TestCase tc = CASES[i];
-
-        final Mac mac;
-        if (tc.nonce == null)
-        {
-            // Raw Poly1305 test - don't do any transform on AES key part
-            mac = new Poly1305(new KeyEngine(16));
-            mac.init(new ParametersWithIV(new KeyParameter(tc.key), new byte[16]));
-        }
-        else
-        {
-            mac = new Poly1305(new AESFastEngine());
-            mac.init(new ParametersWithIV(new KeyParameter(tc.key), tc.nonce));
-        }
-        mac.update(tc.message, 0, tc.message.length);
-        mac.doFinal(out, 0);
-
-        if (!Arrays.areEqual(out, tc.expectedMac))
-        {
-            fail("Mismatched output " + i, new String(Hex.encode(tc.expectedMac)), new String(Hex.encode(out)));
-        }
-    }
-
-    private void testSequential()
-    {
-        // Sequential test, adapted from test-poly1305aes
-        int len;
-        byte[] kr = new byte[32];
-        byte[] m = new byte[MAXLEN];
-        byte[] n = new byte[16];
-        byte[] out = new byte[16];
-
-        int c = 0;
-        final Mac mac = new Poly1305(new AESFastEngine());
-        for (int loop = 0; loop < 13; loop++)
-        {
-            len = 0;
-            for (;;)
-            {
-                c++;
-                mac.init(new ParametersWithIV(new KeyParameter(kr), n));
-                mac.update(m, 0, len);
-                mac.doFinal(out, 0);
-
-                // if (c == 678)
-                // {
-                // TestCase tc = CASES[0];
-                //
-                // if (!Arrays.areEqual(tc.key, kr))
-                // {
-                // System.err.println("Key bad");
-                // System.err.println(new String(Hex.encode(tc.key)));
-                // System.err.println(new String(Hex.encode(kr)));
-                // System.exit(1);
-                // }
-                // if (!Arrays.areEqual(tc.nonce, n))
-                // {
-                // System.err.println("Nonce bad");
-                // System.exit(1);
-                // }
-                // System.out.printf("[%d] m: %s\n", c, new String(Hex.encode(m, 0, len)));
-                // System.out.printf("[%d] K: %s\n", c, new String(Hex.encodje(kr)));
-                // System.out.printf("[%d] N: %s\n", c, new String(Hex.encode(n)));
-                // System.out.printf("[%d] M: ", c);
-                // }
-                // System.out.printf("%d/%s\n", c, new String(Hex.encode(out)));
-
-                if (len >= MAXLEN)
-                    break;
-                n[0] ^= loop;
-                for (int i = 0; i < 16; ++i)
-                    n[i] ^= out[i];
-                if (len % 2 != 0)
-                    for (int i = 0; i < 16; ++i)
-                        kr[i] ^= out[i];
-                if (len % 3 != 0)
-                    for (int i = 0; i < 16; ++i)
-                        kr[i + 16] ^= out[i];
-                Poly1305KeyGenerator.clamp(kr);
-                m[len++] ^= out[0];
-            }
-        }
-        // Output after 13 loops as generated by poly1305 ref
-        if (c != 13013 || !Arrays.areEqual(out, Hex.decode("c96f60a23701a5b0fd2016f58cbe4f7e")))
-        {
-            fail("Sequential Poly1305 " + c, "c96f60a23701a5b0fd2016f58cbe4f7e", new String(Hex.encode(out)));
-        }
-    }
-
-    private void testReset()
-    {
-        CipherKeyGenerator gen = new Poly1305KeyGenerator();
-        gen.init(new KeyGenerationParameters(new SecureRandom(), 256));
-        byte[] k = gen.generateKey();
-
-        byte[] m = new byte[10000];
-        byte[] check = new byte[16];
-        byte[] out = new byte[16];
-
-        // Generate baseline
-        Mac poly = new Poly1305(new AESFastEngine());
-        poly.init(new ParametersWithIV(new KeyParameter(k), new byte[16]));
-
-        poly.update(m, 0, m.length);
-        poly.doFinal(check, 0);
-
-        // Check reset after doFinal
-        poly.update(m, 0, m.length);
-        poly.doFinal(out, 0);
-
-        if (!Arrays.areEqual(check, out))
-        {
-            fail("Mac not reset after doFinal");
-        }
-
-        // Check reset
-        poly.update((byte)1);
-        poly.update((byte)2);
-        poly.reset();
-        poly.update(m, 0, m.length);
-        poly.doFinal(out, 0);
-
-        if (!Arrays.areEqual(check, out))
-        {
-            fail("Mac not reset after doFinal");
-        }
-
-        // Check init resets
-        poly.update((byte)1);
-        poly.update((byte)2);
-        poly.init(new ParametersWithIV(new KeyParameter(k), new byte[16]));
-        poly.update(m, 0, m.length);
-        poly.doFinal(out, 0);
-
-        if (!Arrays.areEqual(check, out))
-        {
-            fail("Mac not reset after doFinal");
-        }
-    }
-
-    private void testInit()
-    {
-        CipherKeyGenerator gen = new Poly1305KeyGenerator();
-        gen.init(new KeyGenerationParameters(new SecureRandom(), 256));
-        byte[] k = gen.generateKey();
-
-        Mac poly = new Poly1305(new AESFastEngine());
-        poly.init(new ParametersWithIV(new KeyParameter(k), new byte[16]));
-
-        try
-        {
-            poly.init(new ParametersWithIV(new KeyParameter(k), new byte[15]));
-            fail("16 byte nonce required");
-        } catch (IllegalArgumentException e)
-        {
-            // Expected
-        }
-
-        try
-        {
-            byte[] k2 = new byte[k.length - 1];
-            System.arraycopy(k, 0, k2, 0, k2.length);
-            poly.init(new ParametersWithIV(new KeyParameter(k2), new byte[16]));
-            fail("32 byte key required");
-        } catch (IllegalArgumentException e)
-        {
-            // Expected
-        }
-
-        try
-        {
-            k[19] = (byte)0xFF;
-            poly.init(new ParametersWithIV(new KeyParameter(k), new byte[16]));
-            fail("Unclamped key should not be accepted.");
-        } catch (IllegalArgumentException e)
-        {
-            // Expected
-        }
-
-    }
-
-    private void testKeyGenerator()
-    {
-        CipherKeyGenerator gen = new Poly1305KeyGenerator();
-        gen.init(new KeyGenerationParameters(new SecureRandom(), 256));
-        byte[] k = gen.generateKey();
-
-        if (k.length != 32)
-        {
-            fail("Poly1305 key should be 256 bits.");
-        }
-
-        try
-        {
-            Poly1305KeyGenerator.checkKey(k);
-        } catch (IllegalArgumentException e)
-        {
-            fail("Poly1305 key should be clamped on generation.");
-        }
-
-        byte[] k2 = new byte[k.length];
-        System.arraycopy(k, 0, k2, 0, k2.length);
-        Poly1305KeyGenerator.clamp(k);
-        if (!Arrays.areEqual(k, k2))
-        {
-            fail("Poly1305 key should be clamped on generation.");
-        }
-
-        try
-        {
-            k2[19] = (byte)0xff;
-            Poly1305KeyGenerator.checkKey(k2);
-            fail("Unclamped key should fail check.");
-        } catch (IllegalArgumentException e)
-        {
-            // Expected
-        }
-    }
-
-    public static void main(String[] args)
-        throws Exception
-    {
-        runTest(new Poly1305Test());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/RC2Test.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/RC2Test.java
deleted file mode 100644
index 3c4e569..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/RC2Test.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import org.bouncycastle.crypto.engines.RC2Engine;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.crypto.params.RC2Parameters;
-import org.bouncycastle.util.encoders.Hex;
-
-/**
- * RC2 tester - vectors from  ftp://ftp.isi.edu/in-notes/rfc2268.txt
- *
- * RFC 2268 "A Description of the RC2(r) Encryption Algorithm"
- */
-public class RC2Test
-    extends CipherTest
-{
-    static BlockCipherVectorTest[] tests =
-    {
-        new BlockCipherVectorTest(0, new RC2Engine(),
-                new RC2Parameters(Hex.decode("0000000000000000"), 63),
-                "0000000000000000", "ebb773f993278eff"),
-
-        new BlockCipherVectorTest(1, new RC2Engine(),
-                new RC2Parameters(Hex.decode("ffffffffffffffff"), 64),
-                "ffffffffffffffff", "278b27e42e2f0d49"),
-
-        new BlockCipherVectorTest(2, new RC2Engine(),
-                new RC2Parameters(Hex.decode("3000000000000000"), 64),
-                "1000000000000001", "30649edf9be7d2c2"),
-
-        new BlockCipherVectorTest(3, new RC2Engine(),
-                new RC2Parameters(Hex.decode("88"), 64),
-                "0000000000000000", "61a8a244adacccf0"),
-
-        new BlockCipherVectorTest(4, new RC2Engine(),
-                new RC2Parameters(Hex.decode("88bca90e90875a"), 64),
-                "0000000000000000", "6ccf4308974c267f"),
-
-        new BlockCipherVectorTest(5, new RC2Engine(),
-                new RC2Parameters(Hex.decode("88bca90e90875a7f0f79c384627bafb2"), 64),
-                "0000000000000000", "1a807d272bbe5db1"),
-
-        new BlockCipherVectorTest(6, new RC2Engine(),
-                new RC2Parameters(Hex.decode("88bca90e90875a7f0f79c384627bafb2"), 128),
-                "0000000000000000", "2269552ab0f85ca6"),
-
-        new BlockCipherVectorTest(7, new RC2Engine(),
-                new RC2Parameters(Hex.decode("88bca90e90875a7f0f79c384627bafb216f80a6f85920584c42fceb0be255daf1e"), 129),
-                "0000000000000000", "5b78d3a43dfff1f1")
-    };
-
-    RC2Test()
-    {
-        super(tests, new RC2Engine(), new KeyParameter(new byte[16]));
-    }
-
-    public String getName()
-    {
-        return "RC2";
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        runTest(new RC2Test());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/RC2WrapTest.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/RC2WrapTest.java
deleted file mode 100644
index 0b52a60..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/RC2WrapTest.java
+++ /dev/null
@@ -1,111 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import java.security.SecureRandom;
-
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.Wrapper;
-import org.bouncycastle.crypto.engines.RC2WrapEngine;
-import org.bouncycastle.crypto.params.ParametersWithIV;
-import org.bouncycastle.crypto.params.ParametersWithRandom;
-import org.bouncycastle.crypto.params.RC2Parameters;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTestResult;
-import org.bouncycastle.util.test.Test;
-import org.bouncycastle.util.test.TestResult;
-
-/**
- * RC2 wrap tester
- */
-public class RC2WrapTest
-    implements Test
-{
-    private class RFCRandom
-        extends SecureRandom
-    {
-        public void nextBytes(
-            byte[] nextBytes)
-        {
-            System.arraycopy(Hex.decode("4845cce7fd1250"), 0, nextBytes, 0, nextBytes.length);
-        }
-    }
-    
-    private TestResult wrapTest(
-        int     id,
-        CipherParameters paramsWrap,
-        CipherParameters paramsUnwrap,
-        byte[]  in,
-        byte[]  out)
-    {
-        Wrapper wrapper = new RC2WrapEngine();
-
-        wrapper.init(true, paramsWrap);
-
-        try
-        {
-            byte[]  cText = wrapper.wrap(in, 0, in.length);
-            if (!Arrays.areEqual(cText, out))
-            {
-                return new SimpleTestResult(false, getName() + ": failed wrap test " + id  + " expected " + new String(Hex.encode(out)) + " got " + new String(Hex.encode(cText)));
-            }
-        }
-        catch (Exception e)
-        {
-            return new SimpleTestResult(false, getName() + ": failed wrap test exception " + e.toString(), e);
-        }
-
-        wrapper.init(false, paramsUnwrap);
-
-        try
-        {
-            byte[]  pText = wrapper.unwrap(out, 0, out.length);
-            if (!Arrays.areEqual(pText, in))
-            {
-                return new SimpleTestResult(false, getName() + ": failed unwrap test " + id  + " expected " + new String(Hex.encode(in)) + " got " + new String(Hex.encode(pText)));
-            }
-        }
-        catch (Exception e)
-        {
-            return new SimpleTestResult(false, getName() + ": failed unwrap test exception " + e.toString(), e);
-        }
-
-        return new SimpleTestResult(true, getName() + ": Okay");
-    }
-
-    public TestResult perform()
-    {
-        byte[]  kek1 = Hex.decode("fd04fd08060707fb0003fefffd02fe05");
-        byte[]  iv1 = Hex.decode("c7d90059b29e97f7");
-        byte[]  in1 = Hex.decode("b70a25fbc9d86a86050ce0d711ead4d9");
-        byte[]  out1 = Hex.decode("70e699fb5701f7833330fb71e87c85a420bdc99af05d22af5a0e48d35f3138986cbaafb4b28d4f35");
-        // 
-        // note the RFC 3217 test specifies a key to be used with an effective key size of
-        // 40 bits which is why it is done here - in practice nothing less than 128 bits should be used.
-        //
-        CipherParameters paramWrap = new ParametersWithRandom(new ParametersWithIV(new RC2Parameters(kek1, 40), iv1), new RFCRandom());
-        CipherParameters paramUnwrap = new RC2Parameters(kek1, 40);
-        
-        TestResult result = wrapTest(1, paramWrap, paramUnwrap, in1, out1);
-        
-        if (!result.isSuccessful())
-        {
-            return result;
-        }
-
-        return new SimpleTestResult(true, getName() + ": Okay");
-    }
-
-    public String getName()
-    {
-        return "RC2Wrap";
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        RC2WrapTest test = new RC2WrapTest();
-        TestResult result = test.perform();
-
-        System.out.println(result);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/RC4Test.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/RC4Test.java
deleted file mode 100644
index e4d3974..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/RC4Test.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import org.bouncycastle.crypto.engines.RC4Engine;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-
-/**
- * RC4 Test
- */
-public class RC4Test
-    extends SimpleTest
-{
-    StreamCipherVectorTest[] tests =
-    {
-        new StreamCipherVectorTest(0, new RC4Engine(),
-                new KeyParameter(Hex.decode("0123456789ABCDEF")),
-                "4e6f772069732074", "3afbb5c77938280d"),
-        new StreamCipherVectorTest(0, new RC4Engine(),
-                new KeyParameter(Hex.decode("0123456789ABCDEF")),
-                "68652074696d6520", "1cf1e29379266d59"),
-        new StreamCipherVectorTest(0, new RC4Engine(),
-                new KeyParameter(Hex.decode("0123456789ABCDEF")),
-                "666f7220616c6c20", "12fbb0c771276459")
-    };
-
-    public String getName()
-    {
-        return "RC4";
-    }
-
-    public void performTest()
-    {
-        for (int i = 0; i != tests.length; i++)
-        {
-            tests[i].performTest();
-        }
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        runTest(new RC4Test());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/RC5Test.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/RC5Test.java
deleted file mode 100644
index 0ffdc89..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/RC5Test.java
+++ /dev/null
@@ -1,188 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import org.bouncycastle.crypto.engines.RC532Engine;
-import org.bouncycastle.crypto.engines.RC564Engine;
-import org.bouncycastle.crypto.modes.CBCBlockCipher;
-import org.bouncycastle.crypto.params.ParametersWithIV;
-import org.bouncycastle.crypto.params.RC5Parameters;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTestResult;
-import org.bouncycastle.util.test.Test;
-import org.bouncycastle.util.test.TestResult;
-
-/**
- * RC5 tester - vectors from ftp://ftp.nordu.net/rfc/rfc2040.txt
- *
- * RFC 2040 "The RC5, RC5-CBC, RC5-CBC-Pad, and RC5-CTS Algorithms"
- */
-public class RC5Test
-    implements Test
-{
-    BlockCipherVectorTest[] tests =
-    {
-        new BlockCipherVectorTest(0, new CBCBlockCipher(new RC532Engine()),
-                new ParametersWithIV(
-                    new RC5Parameters(Hex.decode("00"), 0),
-                    Hex.decode("0000000000000000")),
-                "0000000000000000", "7a7bba4d79111d1e"), 
-        new BlockCipherVectorTest(1, new CBCBlockCipher(new RC532Engine()),
-                new ParametersWithIV(
-                    new RC5Parameters(Hex.decode("00"), 0),
-                    Hex.decode("0000000000000000")),
-                "ffffffffffffffff", "797bba4d78111d1e"), 
-        new BlockCipherVectorTest(2, new CBCBlockCipher(new RC532Engine()),
-                new ParametersWithIV(
-                    new RC5Parameters(Hex.decode("00"), 0),
-                    Hex.decode("0000000000000001")),
-                "0000000000000000", "7a7bba4d79111d1f"), 
-        new BlockCipherVectorTest(3, new CBCBlockCipher(new RC532Engine()),
-                new ParametersWithIV(
-                    new RC5Parameters(Hex.decode("00"), 0),
-                    Hex.decode("0000000000000000")),
-                "0000000000000001", "7a7bba4d79111d1f"), 
-        new BlockCipherVectorTest(4, new CBCBlockCipher(new RC532Engine()),
-                new ParametersWithIV(
-                    new RC5Parameters(Hex.decode("00"), 0),
-                    Hex.decode("0102030405060708")),
-                "1020304050607080", "8b9ded91ce7794a6"),
-        new BlockCipherVectorTest(5, new CBCBlockCipher(new RC532Engine()),
-                new ParametersWithIV(
-                    new RC5Parameters(Hex.decode("11"), 1),
-                    Hex.decode("0000000000000000")),
-                "0000000000000000", "2f759fe7ad86a378"),
-        new BlockCipherVectorTest(6, new CBCBlockCipher(new RC532Engine()),
-                new ParametersWithIV(
-                    new RC5Parameters(Hex.decode("00"), 2),
-                    Hex.decode("0000000000000000")),
-                "0000000000000000", "dca2694bf40e0788"),
-        new BlockCipherVectorTest(7, new CBCBlockCipher(new RC532Engine()),
-                new ParametersWithIV(
-                    new RC5Parameters(Hex.decode("00000000"), 2),
-                    Hex.decode("0000000000000000")),
-                "0000000000000000", "dca2694bf40e0788"),
-        new BlockCipherVectorTest(8, new CBCBlockCipher(new RC532Engine()),
-                new ParametersWithIV(
-                    new RC5Parameters(Hex.decode("00000000"), 8),
-                    Hex.decode("0000000000000000")),
-                "0000000000000000", "dcfe098577eca5ff"),
-        new BlockCipherVectorTest(9, new CBCBlockCipher(new RC532Engine()),
-                new ParametersWithIV(
-                    new RC5Parameters(Hex.decode("00"), 8),
-                    Hex.decode("0102030405060708")),
-                "1020304050607080", "9646fb77638f9ca8"),
-        new BlockCipherVectorTest(10, new CBCBlockCipher(new RC532Engine()),
-                new ParametersWithIV(
-                    new RC5Parameters(Hex.decode("00"), 12),
-                    Hex.decode("0102030405060708")),
-                "1020304050607080", "b2b3209db6594da4"),
-        new BlockCipherVectorTest(11, new CBCBlockCipher(new RC532Engine()),
-                new ParametersWithIV(
-                    new RC5Parameters(Hex.decode("00"), 16),
-                    Hex.decode("0102030405060708")),
-                "1020304050607080", "545f7f32a5fc3836"),
-        new BlockCipherVectorTest(12, new CBCBlockCipher(new RC532Engine()),
-                new ParametersWithIV(
-                    new RC5Parameters(Hex.decode("01020304"), 8),
-                    Hex.decode("0000000000000000")),
-                "ffffffffffffffff", "8285e7c1b5bc7402"),
-        new BlockCipherVectorTest(13, new CBCBlockCipher(new RC532Engine()),
-                new ParametersWithIV(
-                    new RC5Parameters(Hex.decode("01020304"), 12),
-                    Hex.decode("0000000000000000")),
-                "ffffffffffffffff", "fc586f92f7080934"),
-        new BlockCipherVectorTest(14, new CBCBlockCipher(new RC532Engine()),
-                new ParametersWithIV(
-                    new RC5Parameters(Hex.decode("01020304"), 16),
-                    Hex.decode("0000000000000000")),
-                "ffffffffffffffff", "cf270ef9717ff7c4"),
-        new BlockCipherVectorTest(15, new CBCBlockCipher(new RC532Engine()),
-                new ParametersWithIV(
-                    new RC5Parameters(Hex.decode("0102030405060708"), 12),
-                    Hex.decode("0000000000000000")),
-                "ffffffffffffffff", "e493f1c1bb4d6e8c"),
-        new BlockCipherVectorTest(16, new CBCBlockCipher(new RC532Engine()),
-                new ParametersWithIV(
-                    new RC5Parameters(Hex.decode("0102030405060708"), 8),
-                    Hex.decode("0102030405060708")),
-                "1020304050607080", "5c4c041e0f217ac3"),
-        new BlockCipherVectorTest(17, new CBCBlockCipher(new RC532Engine()),
-                new ParametersWithIV(
-                    new RC5Parameters(Hex.decode("0102030405060708"), 12),
-                    Hex.decode("0102030405060708")),
-                "1020304050607080", "921f12485373b4f7"),
-        new BlockCipherVectorTest(18, new CBCBlockCipher(new RC532Engine()),
-                new ParametersWithIV(
-                    new RC5Parameters(Hex.decode("0102030405060708"), 16),
-                    Hex.decode("0102030405060708")),
-                "1020304050607080", "5ba0ca6bbe7f5fad"),
-        new BlockCipherVectorTest(19, new CBCBlockCipher(new RC532Engine()),
-                new ParametersWithIV(
-                    new RC5Parameters(Hex.decode("01020304050607081020304050607080"), 8),
-                    Hex.decode("0102030405060708")),
-                "1020304050607080", "c533771cd0110e63"),
-        new BlockCipherVectorTest(20, new CBCBlockCipher(new RC532Engine()),
-                new ParametersWithIV(
-                    new RC5Parameters(Hex.decode("01020304050607081020304050607080"), 12),
-                    Hex.decode("0102030405060708")),
-                "1020304050607080", "294ddb46b3278d60"),
-        new BlockCipherVectorTest(21, new CBCBlockCipher(new RC532Engine()),
-                new ParametersWithIV(
-                    new RC5Parameters(Hex.decode("01020304050607081020304050607080"), 16),
-                    Hex.decode("0102030405060708")),
-                "1020304050607080", "dad6bda9dfe8f7e8"),
-        new BlockCipherVectorTest(22, new CBCBlockCipher(new RC532Engine()),
-                new ParametersWithIV(
-                    new RC5Parameters(Hex.decode("0102030405"), 12),
-                    Hex.decode("0000000000000000")),
-                "ffffffffffffffff", "97e0787837ed317f"),
-        new BlockCipherVectorTest(23, new CBCBlockCipher(new RC532Engine()),
-                new ParametersWithIV(
-                    new RC5Parameters(Hex.decode("0102030405"), 8),
-                    Hex.decode("0000000000000000")),
-                "ffffffffffffffff", "7875dbf6738c6478"),
-        new BlockCipherVectorTest(23, new CBCBlockCipher(new RC532Engine()),
-                new ParametersWithIV(
-                    new RC5Parameters(Hex.decode("0102030405"), 8),
-                    Hex.decode("7875dbf6738c6478")),
-                "0808080808080808", "8f34c3c681c99695"),
-        new BlockCipherVectorTest(640, new CBCBlockCipher(new RC564Engine()),
-                new ParametersWithIV(
-                    new RC5Parameters(Hex.decode("00"), 0),
-                    Hex.decode("00000000000000000000000000000000")),
-                "00000000000000000000000000000000", "9f09b98d3f6062d9d4d59973d00e0e63"),
-        new BlockCipherVectorTest(641, new CBCBlockCipher(new RC564Engine()),
-                new ParametersWithIV(
-                    new RC5Parameters(Hex.decode("00"), 0),
-                    Hex.decode("00000000000000000000000000000000")),
-                "ffffffffffffffffffffffffffffffff", "9e09b98d3f6062d9d3d59973d00e0e63")
-    };
-
-    public String getName()
-    {
-        return "RC5";
-    }
-
-    public TestResult perform()
-    {
-        for (int i = 0; i != tests.length; i++)
-        {
-            TestResult  res = tests[i].perform();
-
-            if (!res.isSuccessful())
-            {
-                return res;
-            }
-        }
-
-        return new SimpleTestResult(true, getName() + ": Okay");
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        RC5Test     test = new RC5Test();
-        TestResult  result = test.perform();
-
-        System.out.println(result);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/RC6Test.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/RC6Test.java
deleted file mode 100644
index 254c137..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/RC6Test.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import org.bouncycastle.crypto.engines.RC6Engine;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-
-/**
- * RC6 Test - test vectors from AES Submitted RSA Reference implementation.
- * ftp://ftp.funet.fi/pub/crypt/cryptography/symmetric/aes/rc6-unix-refc.tar
- */
-public class RC6Test
-    extends CipherTest
-{
-    static SimpleTest[]  tests = 
-            {
-                new BlockCipherVectorTest(0, new RC6Engine(),
-                        new KeyParameter(
-                            Hex.decode("00000000000000000000000000000000")),
-                        "80000000000000000000000000000000",
-                        "f71f65e7b80c0c6966fee607984b5cdf"),
-                new BlockCipherVectorTest(1, new RC6Engine(),
-                        new KeyParameter(
-                            Hex.decode("000000000000000000000000000000008000000000000000")),
-                        "00000000000000000000000000000000",
-                        "dd04c176440bbc6686c90aee775bd368"),
-                new BlockCipherVectorTest(2, new RC6Engine(),
-                        new KeyParameter(
-                            Hex.decode("000000000000000000000000000000000000001000000000")),
-                        "00000000000000000000000000000000",
-                        "937fe02d20fcb72f0f57201012b88ba4"),
-                new BlockCipherVectorTest(3, new RC6Engine(),
-                        new KeyParameter(
-                            Hex.decode("00000001000000000000000000000000")),
-                        "00000000000000000000000000000000",
-                        "8a380594d7396453771a1dfbe2914c8e"),
-                new BlockCipherVectorTest(4, new RC6Engine(),
-                        new KeyParameter(
-                            Hex.decode("1000000000000000000000000000000000000000000000000000000000000000")),
-                        "00000000000000000000000000000000",
-                        "11395d4bfe4c8258979ee2bf2d24dff4"),
-                new BlockCipherVectorTest(5, new RC6Engine(),
-                        new KeyParameter(
-                            Hex.decode("0000000000000000000000000000000000080000000000000000000000000000")),
-                        "00000000000000000000000000000000",
-                        "3d6f7e99f6512553bb983e8f75672b97")
-            };
-
-    RC6Test()
-    {
-        super(tests, new RC6Engine(), new KeyParameter(new byte[32]));
-    }
-
-    public String getName()
-    {
-        return "RC6";
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        runTest(new RC6Test());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/RFC3211WrapTest.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/RFC3211WrapTest.java
deleted file mode 100644
index f556cff..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/RFC3211WrapTest.java
+++ /dev/null
@@ -1,220 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import org.bouncycastle.crypto.BlockCipher;
-import org.bouncycastle.crypto.InvalidCipherTextException;
-import org.bouncycastle.crypto.Wrapper;
-import org.bouncycastle.crypto.engines.DESEngine;
-import org.bouncycastle.crypto.engines.DESedeEngine;
-import org.bouncycastle.crypto.engines.RFC3211WrapEngine;
-import org.bouncycastle.crypto.modes.CBCBlockCipher;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.crypto.params.ParametersWithIV;
-import org.bouncycastle.crypto.params.ParametersWithRandom;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-
-import java.security.SecureRandom;
-
-/**
- * Wrap Test based on RFC3211 test vectors
- */
-public class RFC3211WrapTest
-    extends SimpleTest
-{
-    SecureRandom r1 = new SecureRandom()
-    {
-        int[] ints = { 0xC4, 0x36, 0xF5, 0x41 };
-        int count = 0;
-
-        public int nextInt()
-        {
-            return ints[count++];
-        }
-    };
-
-    SecureRandom r2 = new SecureRandom()
-    {
-        int[] ints = { 0xFA, 0x06, 0x0A, 0x45 };
-        int count = 0;
-
-        public int nextInt()
-        {
-            return ints[count++];
-        }
-    };
-
-    public String getName()
-    {
-        return "RFC3211Wrap";
-    }
-
-    private void wrapTest(
-        int          id,
-        BlockCipher  engine,
-        byte[]       kek,
-        byte[]       iv,
-        SecureRandom rand,
-        byte[]       in,
-        byte[]       out)
-        throws Exception
-    {
-        Wrapper wrapper = new RFC3211WrapEngine(engine);
-
-        wrapper.init(true, new ParametersWithRandom(new ParametersWithIV(new KeyParameter(kek), iv), rand));
-
-        byte[]  cText = wrapper.wrap(in, 0, in.length);
-        if (!Arrays.areEqual(cText, out))
-        {
-            fail("failed wrap test " + id  + " expected " + new String(Hex.encode(out)) + " got " + new String(Hex.encode(cText)));
-        }
-
-        wrapper.init(false, new ParametersWithIV(new KeyParameter(kek), iv));
-
-        byte[]  pText = wrapper.unwrap(out, 0, out.length);
-        if (!Arrays.areEqual(pText, in))
-        {
-            fail("rfailed unwrap test " + id  + " expected " + new String(Hex.encode(in)) + " got " + new String(Hex.encode(pText)));
-        }
-    }
-
-    private void testCorruption()
-        throws InvalidCipherTextException
-    {
-        byte[] kek = Hex.decode("D1DAA78615F287E6");
-        byte[] iv = Hex.decode("EFE598EF21B33D6D");
-
-        Wrapper wrapper = new RFC3211WrapEngine(new DESEngine());
-
-        wrapper.init(false, new ParametersWithIV(new KeyParameter(kek), iv));
-
-        byte[] block = Hex.decode("ff739D838C627C897323A2F8C436F541");
-        encryptBlock(kek, iv, block);
-
-        try
-        {
-            wrapper.unwrap(block, 0, block.length);
-
-            fail("bad length not detected");
-        }
-        catch (InvalidCipherTextException e)
-        {
-            if (!e.getMessage().equals("wrapped key corrupted"))
-            {
-                fail("wrong exception on length");
-            }
-        }
-
-        block = Hex.decode("08639D838C627C897323A2F8C436F541");
-        testChecksum(kek, iv, block, wrapper);
-
-        block = Hex.decode("08736D838C627C897323A2F8C436F541");
-        testChecksum(kek, iv, block, wrapper);
-        
-        block = Hex.decode("08739D638C627C897323A2F8C436F541");
-        testChecksum(kek, iv, block, wrapper);
-    }
-
-    private void testChecksum(byte[] kek, byte[] iv, byte[] block, Wrapper wrapper)
-    {
-        encryptBlock(kek, iv, block);
-
-        try
-        {
-            wrapper.unwrap(block, 0, block.length);
-
-            fail("bad checksum not detected");
-        }
-        catch (InvalidCipherTextException e)
-        {
-            if (!e.getMessage().equals("wrapped key fails checksum"))
-            {
-                fail("wrong exception");
-            }
-        }
-    }
-
-    private void encryptBlock(byte[] key, byte[] iv, byte[] cekBlock)
-    {
-        BlockCipher engine = new CBCBlockCipher(new DESEngine());
-
-        engine.init(true, new ParametersWithIV(new KeyParameter(key), iv));
-
-        for (int i = 0; i < cekBlock.length; i += 8)
-        {
-            engine.processBlock(cekBlock, i, cekBlock, i);
-        }
-
-        for (int i = 0; i < cekBlock.length; i += 8)
-        {
-            engine.processBlock(cekBlock, i, cekBlock, i);
-        }
-    }
-
-    public void performTest()
-        throws Exception
-    {
-        wrapTest(1, new DESEngine(), Hex.decode("D1DAA78615F287E6"), Hex.decode("EFE598EF21B33D6D"), r1, Hex.decode("8C627C897323A2F8"), Hex.decode("B81B2565EE373CA6DEDCA26A178B0C10"));
-        wrapTest(2, new DESedeEngine(), Hex.decode("6A8970BF68C92CAEA84A8DF28510858607126380CC47AB2D"), Hex.decode("BAF1CA7931213C4E"), r2,
-                    Hex.decode("8C637D887223A2F965B566EB014B0FA5D52300A3F7EA40FFFC577203C71BAF3B"),
-                    Hex.decode("C03C514ABDB9E2C5AAC038572B5E24553876B377AAFB82ECA5A9D73F8AB143D9EC74E6CAD7DB260C"));
-
-        testCorruption();
-        
-        Wrapper          wrapper = new RFC3211WrapEngine(new DESEngine());
-        ParametersWithIV params = new ParametersWithIV(new KeyParameter(new byte[16]), new byte[16]);
-        byte[]           buf = new byte[16];
-
-        try
-        {
-            wrapper.init(true, params);
-
-            wrapper.unwrap(buf, 0, buf.length);
-
-            fail("failed unwrap state test.");
-        }
-        catch (IllegalStateException e)
-        {
-            // expected
-        }
-        catch (InvalidCipherTextException e)
-        {
-            fail("unexpected exception: " + e, e);
-        }
-
-        try
-        {
-            wrapper.init(false, params);
-
-            wrapper.wrap(buf, 0, buf.length);
-
-            fail("failed unwrap state test.");
-        }
-        catch (IllegalStateException e)
-        {
-            // expected
-        }
-
-        //
-        // short test
-        //
-        try
-        {
-            wrapper.init(false, params);
-
-            wrapper.unwrap(buf, 0, buf.length / 2);
-
-            fail("failed unwrap short test.");
-        }
-        catch (InvalidCipherTextException e)
-        {
-            // expected
-        }
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        runTest(new RFC3211WrapTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/RIPEMD128DigestTest.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/RIPEMD128DigestTest.java
deleted file mode 100644
index bdd622c..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/RIPEMD128DigestTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.digests.RIPEMD128Digest;
-
-/**
- * RIPEMD128 Digest Test
- */
-public class RIPEMD128DigestTest
-    extends DigestTest
-{
-    final static String[] messages = {
-        "",
-        "a",
-        "abc",
-        "message digest",
-        "abcdefghijklmnopqrstuvwxyz",
-        "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq",
-        "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789",
-        "12345678901234567890123456789012345678901234567890123456789012345678901234567890"
-    };
-
-    final static String[] digests = {
-        "cdf26213a150dc3ecb610f18f6b38b46",
-        "86be7afa339d0fc7cfc785e72f578d33",
-        "c14a12199c66e4ba84636b0f69144c77",
-        "9e327b3d6e523062afc1132d7df9d1b8",
-        "fd2aa607f71dc8f510714922b371834e",
-        "a1aa0689d0fafa2ddc22e88b49133a06",
-        "d1e959eb179c911faea4624c60c5c702",
-        "3f45ef194732c2dbb2c4a2c769795fa3"
-    };
-
-    final static String million_a_digest = "4a7f5723f954eba1216c9d8f6320431f";
-        
-    RIPEMD128DigestTest()
-    {
-        super(new RIPEMD128Digest(), messages, digests);
-    }
-
-    public void performTest()
-    {
-        super.performTest();
-        
-        millionATest(million_a_digest);
-    }
-
-    protected Digest cloneDigest(Digest digest)
-    {
-        return new RIPEMD128Digest((RIPEMD128Digest)digest);
-    }
-    
-    public static void main(
-        String[]    args)
-    {
-        runTest(new RIPEMD128DigestTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/RIPEMD128HMacTest.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/RIPEMD128HMacTest.java
deleted file mode 100644
index cc042c9..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/RIPEMD128HMacTest.java
+++ /dev/null
@@ -1,86 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import org.bouncycastle.crypto.digests.RIPEMD128Digest;
-import org.bouncycastle.crypto.macs.HMac;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTestResult;
-import org.bouncycastle.util.test.Test;
-import org.bouncycastle.util.test.TestResult;
-
-/**
- * RIPEMD128 HMac Test, test vectors from RFC 2286
- */
-public class RIPEMD128HMacTest
-    implements Test
-{
-    final static String[] keys = {
-        "0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b",
-        "4a656665",
-        "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
-        "0102030405060708090a0b0c0d0e0f10111213141516171819",
-        "0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c",
-        "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
-        "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
-    };
-
-    final static String[] digests = {
-        "fbf61f9492aa4bbf81c172e84e0734db",
-        "875f828862b6b334b427c55f9f7ff09b",
-        "09f0b2846d2f543da363cbec8d62a38d",
-        "bdbbd7cf03e44b5aa60af815be4d2294",
-        "e79808f24b25fd031c155f0d551d9a3a",
-        "dc732928de98104a1f59d373c150acbb",
-        "5c6bec96793e16d40690c237635f30c5"
-    };
-
-    final static String[] messages = {
-        "Hi There",
-        "what do ya want for nothing?",
-        "0xdddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd",
-        "0xcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcd",
-        "Test With Truncation",
-        "Test Using Larger Than Block-Size Key - Hash Key First",
-        "Test Using Larger Than Block-Size Key and Larger Than One Block-Size Data"
-    };
-        
-    public String getName()
-    {
-        return "RIPEMD128HMac";
-    }
-
-    public TestResult perform()
-    {
-        HMac hmac = new HMac(new RIPEMD128Digest());
-        byte[] resBuf = new byte[hmac.getMacSize()];
-
-        for (int i = 0; i < messages.length; i++)
-        {
-            byte[] m = messages[i].getBytes();
-            if (messages[i].startsWith("0x"))
-            {
-                m = Hex.decode(messages[i].substring(2));
-            }
-            hmac.init(new KeyParameter(Hex.decode(keys[i])));
-            hmac.update(m, 0, m.length);
-            hmac.doFinal(resBuf, 0);
-
-            if (!Arrays.areEqual(resBuf, Hex.decode(digests[i])))
-            {
-                return new SimpleTestResult(false, getName() + ": Vector " + i + " failed");
-            }
-        }
-
-        return new SimpleTestResult(true, getName() + ": Okay");
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        RIPEMD128HMacTest   test = new RIPEMD128HMacTest();
-        TestResult          result = test.perform();
-
-        System.out.println(result);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/RIPEMD160DigestTest.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/RIPEMD160DigestTest.java
deleted file mode 100644
index e92693d..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/RIPEMD160DigestTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.digests.RIPEMD160Digest;
-
-/**
- * RIPEMD160 Digest Test
- */
-public class RIPEMD160DigestTest
-    extends DigestTest
-{
-    final static String[] messages = {
-        "",
-        "a",
-        "abc",
-        "message digest",
-        "abcdefghijklmnopqrstuvwxyz",
-        "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq",
-        "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789",
-        "12345678901234567890123456789012345678901234567890123456789012345678901234567890"
-    };
-
-    final static String[] digests = {
-        "9c1185a5c5e9fc54612808977ee8f548b2258d31",
-        "0bdc9d2d256b3ee9daae347be6f4dc835a467ffe",
-        "8eb208f7e05d987a9b044a8e98c6b087f15a0bfc",
-        "5d0689ef49d2fae572b881b123a85ffa21595f36",
-        "f71c27109c692c1b56bbdceb5b9d2865b3708dbc",
-        "12a053384a9c0c88e405a06c27dcf49ada62eb2b",
-        "b0e20b6e3116640286ed3a87a5713079b21f5189",
-        "9b752e45573d4b39f4dbd3323cab82bf63326bfb"
-    };
-
-    final static String million_a_digest = "52783243c1697bdbe16d37f97f68f08325dc1528";
-
-    RIPEMD160DigestTest()
-    {
-        super(new RIPEMD160Digest(), messages, digests);
-    }
-
-    public void performTest()
-    {
-        super.performTest();
-        
-        millionATest(million_a_digest);
-    }
-
-    protected Digest cloneDigest(Digest digest)
-    {
-        return new RIPEMD160Digest((RIPEMD160Digest)digest);
-    }
-    
-    public static void main(
-        String[]    args)
-    {
-        runTest(new RIPEMD160DigestTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/RIPEMD160HMacTest.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/RIPEMD160HMacTest.java
deleted file mode 100644
index 7e6e813..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/RIPEMD160HMacTest.java
+++ /dev/null
@@ -1,86 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import org.bouncycastle.crypto.digests.RIPEMD160Digest;
-import org.bouncycastle.crypto.macs.HMac;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTestResult;
-import org.bouncycastle.util.test.Test;
-import org.bouncycastle.util.test.TestResult;
-
-/**
- * RIPEMD160 HMac Test, test vectors from RFC 2286
- */
-public class RIPEMD160HMacTest
-    implements Test
-{
-    final static String[] keys = {
-        "0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b",
-        "4a656665",
-        "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
-        "0102030405060708090a0b0c0d0e0f10111213141516171819",
-        "0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c",
-        "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
-        "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
-    };
-
-    final static String[] digests = {
-        "24cb4bd67d20fc1a5d2ed7732dcc39377f0a5668",
-        "dda6c0213a485a9e24f4742064a7f033b43c4069",
-        "b0b105360de759960ab4f35298e116e295d8e7c1",
-        "d5ca862f4d21d5e610e18b4cf1beb97a4365ecf4",
-        "7619693978f91d90539ae786500ff3d8e0518e39",
-        "6466ca07ac5eac29e1bd523e5ada7605b791fd8b",
-        "69ea60798d71616cce5fd0871e23754cd75d5a0a"
-    };
-
-    final static String[] messages = {
-        "Hi There",
-        "what do ya want for nothing?",
-        "0xdddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd",
-        "0xcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcd",
-        "Test With Truncation",
-        "Test Using Larger Than Block-Size Key - Hash Key First",
-        "Test Using Larger Than Block-Size Key and Larger Than One Block-Size Data"
-    };
-
-    public String getName()
-    {
-        return "RIPEMD160HMac";
-    }
-
-    public TestResult perform()
-    {
-        HMac hmac = new HMac(new RIPEMD160Digest());
-        byte[] resBuf = new byte[hmac.getMacSize()];
-
-        for (int i = 0; i < messages.length; i++)
-        {
-            byte[] m = messages[i].getBytes();
-            if (messages[i].startsWith("0x"))
-            {
-                m = Hex.decode(messages[i].substring(2));
-            }
-            hmac.init(new KeyParameter(Hex.decode(keys[i])));
-            hmac.update(m, 0, m.length);
-            hmac.doFinal(resBuf, 0);
-
-            if (!Arrays.areEqual(resBuf, Hex.decode(digests[i])))
-            {
-                return new SimpleTestResult(false, getName() + ": Vector " + i + " failed");
-            }
-        }
-
-        return new SimpleTestResult(true, getName() + ": Okay");
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        RIPEMD160HMacTest   test = new RIPEMD160HMacTest();
-        TestResult          result = test.perform();
-
-        System.out.println(result);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/RIPEMD256DigestTest.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/RIPEMD256DigestTest.java
deleted file mode 100644
index 4de70d8..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/RIPEMD256DigestTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.digests.RIPEMD256Digest;
-
-/**
- * RIPEMD128 Digest Test
- */
-public class RIPEMD256DigestTest
-    extends DigestTest
-{
-    final static String[] messages = {
-        "",
-        "a",
-        "abc",
-        "message digest",
-        "abcdefghijklmnopqrstuvwxyz",
-        "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq",
-        "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789",
-        "12345678901234567890123456789012345678901234567890123456789012345678901234567890"
-    };
-
-    final static String[] digests = {
-        "02ba4c4e5f8ecd1877fc52d64d30e37a2d9774fb1e5d026380ae0168e3c5522d",
-        "f9333e45d857f5d90a91bab70a1eba0cfb1be4b0783c9acfcd883a9134692925",
-        "afbd6e228b9d8cbbcef5ca2d03e6dba10ac0bc7dcbe4680e1e42d2e975459b65",
-        "87e971759a1ce47a514d5c914c392c9018c7c46bc14465554afcdf54a5070c0e",
-        "649d3034751ea216776bf9a18acc81bc7896118a5197968782dd1fd97d8d5133",
-        "3843045583aac6c8c8d9128573e7a9809afb2a0f34ccc36ea9e72f16f6368e3f",
-        "5740a408ac16b720b84424ae931cbb1fe363d1d0bf4017f1a89f7ea6de77a0b8",
-        "06fdcc7a409548aaf91368c06a6275b553e3f099bf0ea4edfd6778df89a890dd"
-    };
-
-    final static String million_a_digest = "ac953744e10e31514c150d4d8d7b677342e33399788296e43ae4850ce4f97978";
-
-    RIPEMD256DigestTest()
-    {
-        super(new RIPEMD256Digest(), messages, digests);
-    }
-
-    public void performTest()
-    {
-        super.performTest();
-        
-        millionATest(million_a_digest);
-    }
-
-    protected Digest cloneDigest(Digest digest)
-    {
-        return new RIPEMD256Digest((RIPEMD256Digest)digest);
-    }
-    
-    public static void main(
-        String[]    args)
-    {
-        runTest(new RIPEMD256DigestTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/RIPEMD320DigestTest.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/RIPEMD320DigestTest.java
deleted file mode 100644
index 351b1b7..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/RIPEMD320DigestTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.digests.RIPEMD320Digest;
-
-/**
- * RIPEMD320 Digest Test
- */
-public class RIPEMD320DigestTest
-    extends DigestTest
-{
-    final static String[] messages = {
-        "",
-        "a",
-        "abc",
-        "message digest",
-        "abcdefghijklmnopqrstuvwxyz",
-        "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq",
-        "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789",
-        "12345678901234567890123456789012345678901234567890123456789012345678901234567890"
-    };
-
-    final static String[] digests = {
-        "22d65d5661536cdc75c1fdf5c6de7b41b9f27325ebc61e8557177d705a0ec880151c3a32a00899b8",
-        "ce78850638f92658a5a585097579926dda667a5716562cfcf6fbe77f63542f99b04705d6970dff5d",
-        "de4c01b3054f8930a79d09ae738e92301e5a17085beffdc1b8d116713e74f82fa942d64cdbc4682d",
-        "3a8e28502ed45d422f68844f9dd316e7b98533fa3f2a91d29f84d425c88d6b4eff727df66a7c0197",
-        "cabdb1810b92470a2093aa6bce05952c28348cf43ff60841975166bb40ed234004b8824463e6b009",
-        "d034a7950cf722021ba4b84df769a5de2060e259df4c9bb4a4268c0e935bbc7470a969c9d072a1ac",
-        "ed544940c86d67f250d232c30b7b3e5770e0c60c8cb9a4cafe3b11388af9920e1b99230b843c86a4",
-        "557888af5f6d8ed62ab66945c6d2a0a47ecd5341e915eb8fea1d0524955f825dc717e4a008ab2d42"
-    };
-
-    final static String million_a_digest = "bdee37f4371e20646b8b0d862dda16292ae36f40965e8c8509e63d1dbddecc503e2b63eb9245bb66";
-        
-    RIPEMD320DigestTest()
-    {
-        super(new RIPEMD320Digest(), messages, digests);
-    }
-
-    public void performTest()
-    {
-        super.performTest();
-        
-        millionATest(million_a_digest);
-    }
-
-    protected Digest cloneDigest(Digest digest)
-    {
-        return new RIPEMD320Digest((RIPEMD320Digest)digest);
-    }
-    
-    public static void main(
-        String[]    args)
-    {
-        runTest(new RIPEMD320DigestTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/RSABlindedTest.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/RSABlindedTest.java
deleted file mode 100644
index 7cb6e98..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/RSABlindedTest.java
+++ /dev/null
@@ -1,437 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import org.bouncycastle.crypto.AsymmetricBlockCipher;
-import org.bouncycastle.crypto.AsymmetricCipherKeyPair;
-import org.bouncycastle.crypto.InvalidCipherTextException;
-import org.bouncycastle.crypto.encodings.OAEPEncoding;
-import org.bouncycastle.crypto.encodings.PKCS1Encoding;
-import org.bouncycastle.crypto.engines.RSABlindedEngine;
-import org.bouncycastle.crypto.generators.RSAKeyPairGenerator;
-import org.bouncycastle.crypto.params.RSAKeyGenerationParameters;
-import org.bouncycastle.crypto.params.RSAKeyParameters;
-import org.bouncycastle.crypto.params.RSAPrivateCrtKeyParameters;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-
-import java.math.BigInteger;
-import java.security.SecureRandom;
-
-public class RSABlindedTest
-    extends SimpleTest
-{
-    static BigInteger mod = new BigInteger("b259d2d6e627a768c94be36164c2d9fc79d97aab9253140e5bf17751197731d6f7540d2509e7b9ffee0a70a6e26d56e92d2edd7f85aba85600b69089f35f6bdbf3c298e05842535d9f064e6b0391cb7d306e0a2d20c4dfb4e7b49a9640bdea26c10ad69c3f05007ce2513cee44cfe01998e62b6c3637d3fc0391079b26ee36d5", 16);
-    static BigInteger  pubExp = new BigInteger("11", 16);
-    static BigInteger  privExp = new BigInteger("92e08f83cc9920746989ca5034dcb384a094fb9c5a6288fcc4304424ab8f56388f72652d8fafc65a4b9020896f2cde297080f2a540e7b7ce5af0b3446e1258d1dd7f245cf54124b4c6e17da21b90a0ebd22605e6f45c9f136d7a13eaac1c0f7487de8bd6d924972408ebb58af71e76fd7b012a8d0e165f3ae2e5077a8648e619", 16);
-    static BigInteger  p = new BigInteger("f75e80839b9b9379f1cf1128f321639757dba514642c206bbbd99f9a4846208b3e93fbbe5e0527cc59b1d4b929d9555853004c7c8b30ee6a213c3d1bb7415d03", 16);
-    static BigInteger  q = new BigInteger("b892d9ebdbfc37e397256dd8a5d3123534d1f03726284743ddc6be3a709edb696fc40c7d902ed804c6eee730eee3d5b20bf6bd8d87a296813c87d3b3cc9d7947", 16);
-    static BigInteger  pExp = new BigInteger("1d1a2d3ca8e52068b3094d501c9a842fec37f54db16e9a67070a8b3f53cc03d4257ad252a1a640eadd603724d7bf3737914b544ae332eedf4f34436cac25ceb5", 16);
-    static BigInteger  qExp = new BigInteger("6c929e4e81672fef49d9c825163fec97c4b7ba7acb26c0824638ac22605d7201c94625770984f78a56e6e25904fe7db407099cad9b14588841b94f5ab498dded", 16);
-    static BigInteger  crtCoef = new BigInteger("dae7651ee69ad1d081ec5e7188ae126f6004ff39556bde90e0b870962fa7b926d070686d8244fe5a9aa709a95686a104614834b0ada4b10f53197a5cb4c97339", 16);
-
-    static String input = "4e6f77206973207468652074696d6520666f7220616c6c20676f6f64206d656e";
-
-    //
-    // to check that we handling byte extension by big number correctly.
-    //
-    static String edgeInput = "ff6f77206973207468652074696d6520666f7220616c6c20676f6f64206d656e";
-
-    static byte[] oversizedSig = Hex.decode("01ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff004e6f77206973207468652074696d6520666f7220616c6c20676f6f64206d656e");
-    static byte[] dudBlock = Hex.decode("000fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff004e6f77206973207468652074696d6520666f7220616c6c20676f6f64206d656e");
-    static byte[] truncatedDataBlock = Hex.decode("0001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff004e6f77206973207468652074696d6520666f7220616c6c20676f6f64206d656e");
-    static byte[] incorrectPadding = Hex.decode("0001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff4e6f77206973207468652074696d6520666f7220616c6c20676f6f64206d656e");
-    static byte[] missingDataBlock = Hex.decode("0001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff");
-
-    public String getName()
-    {
-        return "RSABlinded";
-    }
-
-    private void testStrictPKCS1Length(RSAKeyParameters pubParameters, RSAKeyParameters privParameters)
-    {
-        AsymmetricBlockCipher eng = new RSABlindedEngine();
-
-        eng.init(true, privParameters);
-
-        byte[] data = null;
-
-        try
-        {
-            data = eng.processBlock(oversizedSig, 0, oversizedSig.length);
-        }
-        catch (Exception e)
-        {
-            fail("RSA: failed - exception " + e.toString(), e);
-        }
-
-        eng = new PKCS1Encoding(eng);
-
-        eng.init(false, pubParameters);
-
-        try
-        {
-            data = eng.processBlock(data, 0, data.length);
-
-            fail("oversized signature block not recognised");
-        }
-        catch (InvalidCipherTextException e)
-        {
-            if (!e.getMessage().equals("block incorrect size"))
-            {
-                fail("RSA: failed - exception " + e.toString(), e);
-            }
-        }
-
-        //System.setProperty(PKCS1Encoding.STRICT_LENGTH_ENABLED_PROPERTY, "false");
-
-        System.getProperties().put(PKCS1Encoding.STRICT_LENGTH_ENABLED_PROPERTY, "false");
-        eng = new PKCS1Encoding(new RSABlindedEngine());
-
-        eng.init(false, pubParameters);
-
-        try
-        {
-            data = eng.processBlock(data, 0, data.length);
-        }
-        catch (InvalidCipherTextException e)
-        {
-            fail("RSA: failed - exception " + e.toString(), e);
-        }
-
-        System.getProperties().remove(PKCS1Encoding.STRICT_LENGTH_ENABLED_PROPERTY);
-    }
-
-    private void testTruncatedPKCS1Block(RSAKeyParameters pubParameters, RSAKeyParameters privParameters)
-    {
-        checkForPKCS1Exception(pubParameters, privParameters, truncatedDataBlock, "block truncated");
-    }
-
-    private void testDudPKCS1Block(RSAKeyParameters pubParameters, RSAKeyParameters privParameters)
-    {
-        checkForPKCS1Exception(pubParameters, privParameters, dudBlock, "unknown block type");
-    }
-
-    private void testWrongPaddingPKCS1Block(RSAKeyParameters pubParameters, RSAKeyParameters privParameters)
-    {
-        checkForPKCS1Exception(pubParameters, privParameters, incorrectPadding, "block padding incorrect");
-    }
-
-    private void testMissingDataPKCS1Block(RSAKeyParameters pubParameters, RSAKeyParameters privParameters)
-    {
-        checkForPKCS1Exception(pubParameters, privParameters, missingDataBlock, "no data in block");
-    }
-
-    private void checkForPKCS1Exception(RSAKeyParameters pubParameters, RSAKeyParameters privParameters, byte[] inputData, String expectedMessage)
-    {
-        AsymmetricBlockCipher   eng = new RSABlindedEngine();
-
-        eng.init(true, privParameters);
-
-        byte[] data = null;
-
-        try
-        {
-            data = eng.processBlock(inputData, 0, inputData.length);
-        }
-        catch (Exception e)
-        {
-            fail("RSA: failed - exception " + e.toString(), e);
-        }
-
-        eng = new PKCS1Encoding(eng);
-
-        eng.init(false, pubParameters);
-
-        try
-        {
-            data = eng.processBlock(data, 0, data.length);
-
-            fail("missing data block not recognised");
-        }
-        catch (InvalidCipherTextException e)
-        {
-            if (!e.getMessage().equals(expectedMessage))
-            {
-                fail("RSA: failed - exception " + e.toString(), e);
-            }
-        }
-    }
-
-    private void testOAEP(RSAKeyParameters pubParameters, RSAKeyParameters privParameters)
-    {
-        //
-        // OAEP - public encrypt, private decrypt
-        //
-        AsymmetricBlockCipher eng = new OAEPEncoding(new RSABlindedEngine());
-        byte[] data = Hex.decode(input);
-
-        eng.init(true, pubParameters);
-
-        try
-        {
-            data = eng.processBlock(data, 0, data.length);
-        }
-        catch (Exception e)
-        {
-            fail("failed - exception " + e.toString(), e);
-        }
-
-        eng.init(false, privParameters);
-
-        try
-        {
-            data = eng.processBlock(data, 0, data.length);
-        }
-        catch (Exception e)
-        {
-            fail("failed - exception " + e.toString(), e);
-        }
-
-        if (!input.equals(new String(Hex.encode(data))))
-        {
-            fail("failed OAEP Test");
-        }
-    }
-
-    public void performTest()
-    {
-        RSAKeyParameters    pubParameters = new RSAKeyParameters(false, mod, pubExp);
-        RSAKeyParameters    privParameters = new RSAPrivateCrtKeyParameters(mod, pubExp, privExp, p, q, pExp, qExp, crtCoef);
-        byte[]              data = Hex.decode(edgeInput);
-
-        //
-        // RAW
-        //
-        AsymmetricBlockCipher   eng = new RSABlindedEngine();
-
-        eng.init(true, pubParameters);
-
-        try
-        {
-            data = eng.processBlock(data, 0, data.length);
-        }
-        catch (Exception e)
-        {
-            fail("RSA: failed - exception " + e.toString(), e);
-        }
-
-        eng.init(false, privParameters);
-
-        try
-        {
-            data = eng.processBlock(data, 0, data.length);
-        }
-        catch (Exception e)
-        {
-            fail("failed - exception " + e.toString(), e);
-        }
-
-        if (!edgeInput.equals(new String(Hex.encode(data))))
-        {
-            fail("failed RAW edge Test");
-        }
-
-        data = Hex.decode(input);
-
-        eng.init(true, pubParameters);
-
-        try
-        {
-            data = eng.processBlock(data, 0, data.length);
-        }
-        catch (Exception e)
-        {
-            fail("failed - exception " + e.toString(), e);
-        }
-
-        eng.init(false, privParameters);
-
-        try
-        {
-            data = eng.processBlock(data, 0, data.length);
-        }
-        catch (Exception e)
-        {
-            fail("failed - exception " + e.toString(), e);
-        }
-
-        if (!input.equals(new String(Hex.encode(data))))
-        {
-            fail("failed RAW Test");
-        }
-
-        //
-        // PKCS1 - public encrypt, private decrypt
-        //
-        eng = new PKCS1Encoding(eng);
-
-        eng.init(true, pubParameters);
-
-        if (eng.getOutputBlockSize() != ((PKCS1Encoding)eng).getUnderlyingCipher().getOutputBlockSize())
-        {
-            fail("PKCS1 output block size incorrect");
-        }
-
-        try
-        {
-            data = eng.processBlock(data, 0, data.length);
-        }
-        catch (Exception e)
-        {
-            fail("failed - exception " + e.toString(), e);
-        }
-
-        eng.init(false, privParameters);
-
-        try
-        {
-            data = eng.processBlock(data, 0, data.length);
-        }
-        catch (Exception e)
-        {
-            fail("failed - exception " + e.toString(), e);
-        }
-
-        if (!input.equals(new String(Hex.encode(data))))
-        {
-            fail("failed PKCS1 public/private Test");
-        }
-
-        //
-        // PKCS1 - private encrypt, public decrypt
-        //
-        eng = new PKCS1Encoding(((PKCS1Encoding)eng).getUnderlyingCipher());
-
-        eng.init(true, privParameters);
-
-        try
-        {
-            data = eng.processBlock(data, 0, data.length);
-        }
-        catch (Exception e)
-        {
-            fail("failed - exception " + e.toString(), e);
-        }
-
-        eng.init(false, pubParameters);
-
-        try
-        {
-            data = eng.processBlock(data, 0, data.length);
-        }
-        catch (Exception e)
-        {
-            fail("failed - exception " + e.toString(), e);
-        }
-
-        if (!input.equals(new String(Hex.encode(data))))
-        {
-            fail("failed PKCS1 private/public Test");
-        }
-
-        //
-        // key generation test
-        //
-        RSAKeyPairGenerator pGen = new RSAKeyPairGenerator();
-        RSAKeyGenerationParameters genParam = new RSAKeyGenerationParameters(
-                                            BigInteger.valueOf(0x11), new SecureRandom(), 768, 25);
-
-        pGen.init(genParam);
-
-        AsymmetricCipherKeyPair pair = pGen.generateKeyPair();
-
-        eng = new RSABlindedEngine();
-
-        if (((RSAKeyParameters)pair.getPublic()).getModulus().bitLength() < 768)
-        {
-            fail("failed key generation (768) length test");
-        }
-
-        eng.init(true, pair.getPublic());
-
-        try
-        {
-            data = eng.processBlock(data, 0, data.length);
-        }
-        catch (Exception e)
-        {
-            fail("failed - exception " + e.toString(), e);
-        }
-
-        eng.init(false, pair.getPrivate());
-
-        try
-        {
-            data = eng.processBlock(data, 0, data.length);
-        }
-        catch (Exception e)
-        {
-            fail("failed - exception " + e.toString(), e);
-        }
-
-        if (!input.equals(new String(Hex.encode(data))))
-        {
-            fail("failed key generation (768) Test");
-        }
-
-        genParam = new RSAKeyGenerationParameters(BigInteger.valueOf(0x11), new SecureRandom(), 1024, 25);
-
-        pGen.init(genParam);
-        pair = pGen.generateKeyPair();
-
-        eng.init(true, pair.getPublic());
-
-        if (((RSAKeyParameters)pair.getPublic()).getModulus().bitLength() < 1024)
-        {
-            fail("failed key generation (1024) length test");
-        }
-
-        try
-        {
-            data = eng.processBlock(data, 0, data.length);
-        }
-        catch (Exception e)
-        {
-            fail("failed - exception " + e.toString(), e);
-        }
-
-        eng.init(false, pair.getPrivate());
-
-        try
-        {
-            data = eng.processBlock(data, 0, data.length);
-        }
-        catch (Exception e)
-        {
-            fail("failed - exception " + e.toString(), e);
-        }
-
-        if (!input.equals(new String(Hex.encode(data))))
-        {
-            fail("failed key generation (1024) test");
-        }
-
-        testOAEP(pubParameters, privParameters);
-        testStrictPKCS1Length(pubParameters, privParameters);
-        testDudPKCS1Block(pubParameters, privParameters);
-        testMissingDataPKCS1Block(pubParameters, privParameters);
-        testTruncatedPKCS1Block(pubParameters, privParameters);
-        testWrongPaddingPKCS1Block(pubParameters, privParameters);
-
-        try
-        {
-            new RSABlindedEngine().processBlock(new byte[]{ 1 }, 0, 1);
-            fail("failed initialisation check");
-        }
-        catch (IllegalStateException e)
-        {
-            // expected
-        }
-    }
-
-
-    public static void main(
-        String[]    args)
-    {
-        runTest(new RSABlindedTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/RSADigestSignerTest.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/RSADigestSignerTest.java
deleted file mode 100644
index 605a2ca..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/RSADigestSignerTest.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import org.bouncycastle.asn1.x509.X509ObjectIdentifiers;
-import org.bouncycastle.crypto.digests.SHA1Digest;
-import org.bouncycastle.crypto.params.RSAKeyParameters;
-import org.bouncycastle.crypto.params.RSAPrivateCrtKeyParameters;
-import org.bouncycastle.crypto.signers.RSADigestSigner;
-import org.bouncycastle.util.encoders.Base64;
-import org.bouncycastle.util.test.SimpleTest;
-
-import java.math.BigInteger;
-
-public class RSADigestSignerTest
-    extends SimpleTest
-{
-    public String getName()
-    {
-        return "RSADigestSigner";
-    }
-
-    public void performTest() throws Exception
-    {
-        BigInteger rsaPubMod = new BigInteger(Base64.decode("AIASoe2PQb1IP7bTyC9usjHP7FvnUMVpKW49iuFtrw/dMpYlsMMoIU2jupfifDpdFxIktSB4P+6Ymg5WjvHKTIrvQ7SR4zV4jaPTu56Ys0pZ9EDA6gb3HLjtU+8Bb1mfWM+yjKxcPDuFjwEtjGlPHg1Vq+CA9HNcMSKNn2+tW6qt"));
-        BigInteger rsaPubExp = new BigInteger(Base64.decode("EQ=="));
-        BigInteger rsaPrivMod = new BigInteger(Base64.decode("AIASoe2PQb1IP7bTyC9usjHP7FvnUMVpKW49iuFtrw/dMpYlsMMoIU2jupfifDpdFxIktSB4P+6Ymg5WjvHKTIrvQ7SR4zV4jaPTu56Ys0pZ9EDA6gb3HLjtU+8Bb1mfWM+yjKxcPDuFjwEtjGlPHg1Vq+CA9HNcMSKNn2+tW6qt"));
-        BigInteger rsaPrivDP = new BigInteger(Base64.decode("JXzfzG5v+HtLJIZqYMUefJfFLu8DPuJGaLD6lI3cZ0babWZ/oPGoJa5iHpX4Ul/7l3s1PFsuy1GhzCdOdlfRcQ=="));
-        BigInteger rsaPrivDQ = new BigInteger(Base64.decode("YNdJhw3cn0gBoVmMIFRZzflPDNthBiWy/dUMSRfJCxoZjSnr1gysZHK01HteV1YYNGcwPdr3j4FbOfri5c6DUQ=="));
-        BigInteger rsaPrivExp = new BigInteger(Base64.decode("DxFAOhDajr00rBjqX+7nyZ/9sHWRCCp9WEN5wCsFiWVRPtdB+NeLcou7mWXwf1Y+8xNgmmh//fPV45G2dsyBeZbXeJwB7bzx9NMEAfedchyOwjR8PYdjK3NpTLKtZlEJ6Jkh4QihrXpZMO4fKZWUm9bid3+lmiq43FwW+Hof8/E="));
-        BigInteger rsaPrivP = new BigInteger(Base64.decode("AJ9StyTVW+AL/1s7RBtFwZGFBgd3zctBqzzwKPda6LbtIFDznmwDCqAlIQH9X14X7UPLokCDhuAa76OnDXb1OiE="));
-        BigInteger rsaPrivQ = new BigInteger(Base64.decode("AM3JfD79dNJ5A3beScSzPtWxx/tSLi0QHFtkuhtSizeXdkv5FSba7lVzwEOGKHmW829bRoNxThDy4ds1IihW1w0="));
-        BigInteger rsaPrivQinv = new BigInteger(Base64.decode("Lt0g7wrsNsQxuDdB8q/rH8fSFeBXMGLtCIqfOec1j7FEIuYA/ACiRDgXkHa0WgN7nLXSjHoy630wC5Toq8vvUg=="));
-        RSAKeyParameters rsaPublic = new RSAKeyParameters(false, rsaPubMod, rsaPubExp);
-        RSAPrivateCrtKeyParameters rsaPrivate = new RSAPrivateCrtKeyParameters(rsaPrivMod, rsaPubExp, rsaPrivExp, rsaPrivP, rsaPrivQ, rsaPrivDP, rsaPrivDQ, rsaPrivQinv);
-
-        byte[] msg = new byte[] { 1, 6, 3, 32, 7, 43, 2, 5, 7, 78, 4, 23 };
-
-        RSADigestSigner signer = new RSADigestSigner(new SHA1Digest());
-        signer.init(true, rsaPrivate);
-        signer.update(msg, 0, msg.length);
-        byte[] sig = signer.generateSignature();
-
-        signer = new RSADigestSigner(new SHA1Digest(), X509ObjectIdentifiers.id_SHA1);
-        signer.init(false, rsaPublic);
-        signer.update(msg, 0, msg.length);
-        if (!signer.verifySignature(sig))
-        {
-            fail("RSA Digest Signer failed.");
-        }
-    }
-
-    public static void main(String[] args)
-    {
-        runTest(new RSADigestSignerTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/RSAKeyEncapsulationTest.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/RSAKeyEncapsulationTest.java
deleted file mode 100644
index 058f468..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/RSAKeyEncapsulationTest.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import java.math.BigInteger;
-import java.security.SecureRandom;
-
-import org.bouncycastle.crypto.AsymmetricCipherKeyPair;
-import org.bouncycastle.crypto.digests.SHA1Digest;
-import org.bouncycastle.crypto.generators.KDF2BytesGenerator;
-import org.bouncycastle.crypto.generators.RSAKeyPairGenerator;
-import org.bouncycastle.crypto.kems.RSAKeyEncapsulation;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.crypto.params.RSAKeyGenerationParameters;
-import org.bouncycastle.util.test.SimpleTest;
-
-/**
- * Tests for the RSA Key Encapsulation Mechanism
- */
-public class RSAKeyEncapsulationTest
-    extends SimpleTest
-{
-    public String getName()
-    {
-        return "RSAKeyEncapsulation";
-    }
-
-    public void performTest()
-        throws Exception
-    {
-        // Generate RSA key pair
-        RSAKeyPairGenerator        rsaGen = new RSAKeyPairGenerator();
-        rsaGen.init(new RSAKeyGenerationParameters(BigInteger.valueOf(65537), new SecureRandom(), 1024, 5));
-        AsymmetricCipherKeyPair    keys   = rsaGen.generateKeyPair();
-        
-        // Set RSA-KEM parameters
-        RSAKeyEncapsulation     kem;
-        KDF2BytesGenerator        kdf = new KDF2BytesGenerator(new SHA1Digest());
-        SecureRandom            rnd = new SecureRandom();
-        byte[]                    out = new byte[128];
-        KeyParameter            key1, key2;
-        
-        // Test RSA-KEM
-        kem = new RSAKeyEncapsulation(kdf, rnd);
-        
-        kem.init(keys.getPublic());
-        key1 = (KeyParameter)kem.encrypt(out, 128);
-        
-        kem.init(keys.getPrivate());
-        key2 = (KeyParameter)kem.decrypt(out, 128);
-
-        if (!areEqual(key1.getKey(), key2.getKey()))
-        {
-            fail("failed test");
-        }
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        runTest(new RSAKeyEncapsulationTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/RSATest.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/RSATest.java
deleted file mode 100644
index a1ea399..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/RSATest.java
+++ /dev/null
@@ -1,498 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import java.math.BigInteger;
-import java.security.SecureRandom;
-
-import org.bouncycastle.crypto.AsymmetricBlockCipher;
-import org.bouncycastle.crypto.AsymmetricCipherKeyPair;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.InvalidCipherTextException;
-import org.bouncycastle.crypto.encodings.OAEPEncoding;
-import org.bouncycastle.crypto.encodings.PKCS1Encoding;
-import org.bouncycastle.crypto.engines.RSAEngine;
-import org.bouncycastle.crypto.generators.RSAKeyPairGenerator;
-import org.bouncycastle.crypto.params.RSAKeyGenerationParameters;
-import org.bouncycastle.crypto.params.RSAKeyParameters;
-import org.bouncycastle.crypto.params.RSAPrivateCrtKeyParameters;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-
-public class RSATest
-    extends SimpleTest
-{
-    static BigInteger  mod = new BigInteger("b259d2d6e627a768c94be36164c2d9fc79d97aab9253140e5bf17751197731d6f7540d2509e7b9ffee0a70a6e26d56e92d2edd7f85aba85600b69089f35f6bdbf3c298e05842535d9f064e6b0391cb7d306e0a2d20c4dfb4e7b49a9640bdea26c10ad69c3f05007ce2513cee44cfe01998e62b6c3637d3fc0391079b26ee36d5", 16);
-    static BigInteger  pubExp = new BigInteger("11", 16);
-    static BigInteger  privExp = new BigInteger("92e08f83cc9920746989ca5034dcb384a094fb9c5a6288fcc4304424ab8f56388f72652d8fafc65a4b9020896f2cde297080f2a540e7b7ce5af0b3446e1258d1dd7f245cf54124b4c6e17da21b90a0ebd22605e6f45c9f136d7a13eaac1c0f7487de8bd6d924972408ebb58af71e76fd7b012a8d0e165f3ae2e5077a8648e619", 16);
-    static BigInteger  p = new BigInteger("f75e80839b9b9379f1cf1128f321639757dba514642c206bbbd99f9a4846208b3e93fbbe5e0527cc59b1d4b929d9555853004c7c8b30ee6a213c3d1bb7415d03", 16);
-    static BigInteger  q = new BigInteger("b892d9ebdbfc37e397256dd8a5d3123534d1f03726284743ddc6be3a709edb696fc40c7d902ed804c6eee730eee3d5b20bf6bd8d87a296813c87d3b3cc9d7947", 16);
-    static BigInteger  pExp = new BigInteger("1d1a2d3ca8e52068b3094d501c9a842fec37f54db16e9a67070a8b3f53cc03d4257ad252a1a640eadd603724d7bf3737914b544ae332eedf4f34436cac25ceb5", 16);
-    static BigInteger  qExp = new BigInteger("6c929e4e81672fef49d9c825163fec97c4b7ba7acb26c0824638ac22605d7201c94625770984f78a56e6e25904fe7db407099cad9b14588841b94f5ab498dded", 16);
-    static BigInteger  crtCoef = new BigInteger("dae7651ee69ad1d081ec5e7188ae126f6004ff39556bde90e0b870962fa7b926d070686d8244fe5a9aa709a95686a104614834b0ada4b10f53197a5cb4c97339", 16);
-
-    static String input = "4e6f77206973207468652074696d6520666f7220616c6c20676f6f64206d656e";
-
-    //
-    // to check that we handling byte extension by big number correctly.
-    //
-    static String edgeInput = "ff6f77206973207468652074696d6520666f7220616c6c20676f6f64206d656e";
-    
-    static byte[] oversizedSig = Hex.decode("01ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff004e6f77206973207468652074696d6520666f7220616c6c20676f6f64206d656e");
-    static byte[] dudBlock = Hex.decode("000fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff004e6f77206973207468652074696d6520666f7220616c6c20676f6f64206d656e");
-    static byte[] truncatedDataBlock = Hex.decode("0001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff004e6f77206973207468652074696d6520666f7220616c6c20676f6f64206d656e");
-    static byte[] incorrectPadding = Hex.decode("0001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff4e6f77206973207468652074696d6520666f7220616c6c20676f6f64206d656e");
-    static byte[] missingDataBlock = Hex.decode("0001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff");
-
-    public String getName()
-    {
-        return "RSA";
-    }
-
-    private void testStrictPKCS1Length(RSAKeyParameters pubParameters, RSAKeyParameters privParameters)
-    {
-        AsymmetricBlockCipher   eng = new RSAEngine();
-
-        eng.init(true, privParameters);
-        
-        byte[] data = null;
-        
-        try
-        {
-            data = eng.processBlock(oversizedSig, 0, oversizedSig.length);
-        }
-        catch (Exception e)
-        {
-            fail("RSA: failed - exception " + e.toString(), e);
-        }
-        
-        eng = new PKCS1Encoding(eng);
-        
-        eng.init(false, pubParameters);
-        
-        try
-        {
-            data = eng.processBlock(data, 0, data.length);
-            
-            fail("oversized signature block not recognised");
-        }
-        catch (InvalidCipherTextException e)
-        {
-            if (!e.getMessage().equals("block incorrect size"))
-            {
-                fail("RSA: failed - exception " + e.toString(), e);
-            }
-        }
-        
-        //System.setProperty(PKCS1Encoding.STRICT_LENGTH_ENABLED_PROPERTY, "false");
-        
-        System.getProperties().put(PKCS1Encoding.STRICT_LENGTH_ENABLED_PROPERTY, "false");
-        eng = new PKCS1Encoding(new RSAEngine());
-        
-        eng.init(false, pubParameters);
-        
-        try
-        {
-            data = eng.processBlock(data, 0, data.length);
-        }
-        catch (InvalidCipherTextException e)
-        {
-            fail("RSA: failed - exception " + e.toString(), e);
-        }
-        
-        System.getProperties().remove(PKCS1Encoding.STRICT_LENGTH_ENABLED_PROPERTY);
-    }
-        
-    private void testTruncatedPKCS1Block(RSAKeyParameters pubParameters, RSAKeyParameters privParameters)
-    {
-        checkForPKCS1Exception(pubParameters, privParameters, truncatedDataBlock, "block truncated");
-    }
-    
-    private void testDudPKCS1Block(RSAKeyParameters pubParameters, RSAKeyParameters privParameters)
-    {
-        checkForPKCS1Exception(pubParameters, privParameters, dudBlock, "unknown block type");
-    }
-
-    private void testWrongPaddingPKCS1Block(RSAKeyParameters pubParameters, RSAKeyParameters privParameters)
-    {
-        checkForPKCS1Exception(pubParameters, privParameters, incorrectPadding, "block padding incorrect");
-    }
-    
-    private void testMissingDataPKCS1Block(RSAKeyParameters pubParameters, RSAKeyParameters privParameters)
-    {
-        checkForPKCS1Exception(pubParameters, privParameters, missingDataBlock, "no data in block");
-    }
-
-    private void checkForPKCS1Exception(RSAKeyParameters pubParameters, RSAKeyParameters privParameters, byte[] inputData, String expectedMessage)
-    {
-        AsymmetricBlockCipher   eng = new RSAEngine();
-
-        eng.init(true, privParameters);
-        
-        byte[] data = null;
-        
-        try
-        {
-            data = eng.processBlock(inputData, 0, inputData.length);
-        }
-        catch (Exception e)
-        {
-            fail("RSA: failed - exception " + e.toString(), e);
-        }
-        
-        eng = new PKCS1Encoding(eng);
-        
-        eng.init(false, pubParameters);
-        
-        try
-        {
-            data = eng.processBlock(data, 0, data.length);
-            
-            fail("missing data block not recognised");
-        }
-        catch (InvalidCipherTextException e)
-        {
-            if (!e.getMessage().equals(expectedMessage))
-            {
-                fail("RSA: failed - exception " + e.toString(), e);
-            }
-        }
-    }
-    
-    private void testOAEP(RSAKeyParameters pubParameters, RSAKeyParameters privParameters)
-    {
-        //
-        // OAEP - public encrypt, private decrypt
-        //
-        AsymmetricBlockCipher eng = new OAEPEncoding(new RSAEngine());
-        byte[] data = Hex.decode(input);
-
-        eng.init(true, pubParameters);
-
-        try
-        {
-            data = eng.processBlock(data, 0, data.length);
-        }
-        catch (Exception e)
-        {
-            fail("failed - exception " + e.toString(), e);
-        }
-
-        eng.init(false, privParameters);
-
-        try
-        {
-            data = eng.processBlock(data, 0, data.length);
-        }
-        catch (Exception e)
-        {
-            fail("failed - exception " + e.toString(), e);
-        }
-
-        if (!input.equals(new String(Hex.encode(data))))
-        {
-            fail("failed OAEP Test");
-        }
-    }
-
-    private void zeroBlockTest(CipherParameters encParameters, CipherParameters decParameters)
-    {
-        AsymmetricBlockCipher eng = new PKCS1Encoding(new RSAEngine());
-
-        eng.init(true, encParameters);
-
-        if (eng.getOutputBlockSize() != ((PKCS1Encoding)eng).getUnderlyingCipher().getOutputBlockSize())
-        {
-            fail("PKCS1 output block size incorrect");
-        }
-
-        byte[] zero = new byte[0];
-        byte[] data = null;
-
-        try
-        {
-            data = eng.processBlock(zero, 0, zero.length);
-        }
-        catch (Exception e)
-        {
-            fail("failed - exception " + e.toString(), e);
-        }
-
-        eng.init(false, decParameters);
-
-        try
-        {
-            data = eng.processBlock(data, 0, data.length);
-        }
-        catch (Exception e)
-        {
-            fail("failed - exception " + e.toString(), e);
-        }
-
-        if (!Arrays.areEqual(zero, data))
-        {
-            fail("failed PKCS1 zero Test");
-        }
-    }
-
-    public void performTest()
-    {
-        RSAKeyParameters    pubParameters = new RSAKeyParameters(false, mod, pubExp);
-        RSAKeyParameters    privParameters = new RSAPrivateCrtKeyParameters(mod, pubExp, privExp, p, q, pExp, qExp, crtCoef);
-        byte[]              data = Hex.decode(edgeInput);
-
-        //
-        // RAW
-        //
-        AsymmetricBlockCipher   eng = new RSAEngine();
-
-        eng.init(true, pubParameters);
-
-        try
-        {
-            data = eng.processBlock(data, 0, data.length);
-        }
-        catch (Exception e)
-        {
-            fail("RSA: failed - exception " + e.toString(), e);
-        }
-
-        eng.init(false, privParameters);
-
-        try
-        {
-            data = eng.processBlock(data, 0, data.length);
-        }
-        catch (Exception e)
-        {
-            fail("failed - exception " + e.toString(), e);
-        }
-
-        if (!edgeInput.equals(new String(Hex.encode(data))))
-        {
-            fail("failed RAW edge Test");
-        }
-
-        data = Hex.decode(input);
-
-        eng.init(true, pubParameters);
-
-        try
-        {
-            data = eng.processBlock(data, 0, data.length);
-        }
-        catch (Exception e)
-        {
-            fail("failed - exception " + e.toString(), e);
-        }
-
-        eng.init(false, privParameters);
-
-        try
-        {
-            data = eng.processBlock(data, 0, data.length);
-        }
-        catch (Exception e)
-        {
-            fail("failed - exception " + e.toString(), e);
-        }
-
-        if (!input.equals(new String(Hex.encode(data))))
-        {
-            fail("failed RAW Test");
-        }
-
-        //
-        // PKCS1 - public encrypt, private decrypt
-        //
-        eng = new PKCS1Encoding(eng);
-
-        eng.init(true, pubParameters);
-        
-        if (eng.getOutputBlockSize() != ((PKCS1Encoding)eng).getUnderlyingCipher().getOutputBlockSize())
-        {
-            fail("PKCS1 output block size incorrect");
-        }
-
-        try
-        {
-            data = eng.processBlock(data, 0, data.length);
-        }
-        catch (Exception e)
-        {
-            fail("failed - exception " + e.toString(), e);
-        }
-
-        eng.init(false, privParameters);
-
-        try
-        {
-            data = eng.processBlock(data, 0, data.length);
-        }
-        catch (Exception e)
-        {
-            fail("failed - exception " + e.toString(), e);
-        }
-
-        if (!input.equals(new String(Hex.encode(data))))
-        {
-            fail("failed PKCS1 public/private Test");
-        }
-
-        //
-        // PKCS1 - private encrypt, public decrypt
-        //
-        eng = new PKCS1Encoding(((PKCS1Encoding)eng).getUnderlyingCipher());
-
-        eng.init(true, privParameters);
-
-        try
-        {
-            data = eng.processBlock(data, 0, data.length);
-        }
-        catch (Exception e)
-        {
-            fail("failed - exception " + e.toString(), e);
-        }
-
-        eng.init(false, pubParameters);
-
-        try
-        {
-            data = eng.processBlock(data, 0, data.length);
-        }
-        catch (Exception e)
-        {
-            fail("failed - exception " + e.toString(), e);
-        }
-
-        if (!input.equals(new String(Hex.encode(data))))
-        {
-            fail("failed PKCS1 private/public Test");
-        }
-
-        zeroBlockTest(pubParameters, privParameters);
-        zeroBlockTest(privParameters, pubParameters);
-
-        //
-        // key generation test
-        //
-        RSAKeyPairGenerator  pGen = new RSAKeyPairGenerator();
-        RSAKeyGenerationParameters  genParam = new RSAKeyGenerationParameters(
-                                            BigInteger.valueOf(0x11), new SecureRandom(), 768, 25);
-
-        pGen.init(genParam);
-
-        AsymmetricCipherKeyPair  pair = pGen.generateKeyPair();
-        
-        eng = new RSAEngine();
-
-        if (((RSAKeyParameters)pair.getPublic()).getModulus().bitLength() < 768)
-        {
-            fail("failed key generation (768) length test");
-        }
-
-        eng.init(true, pair.getPublic());
-
-        try
-        {
-            data = eng.processBlock(data, 0, data.length);
-        }
-        catch (Exception e)
-        {
-            fail("failed - exception " + e.toString(), e);
-        }
-
-        eng.init(false, pair.getPrivate());
-
-        try
-        {
-            data = eng.processBlock(data, 0, data.length);
-        }
-        catch (Exception e)
-        {
-            fail("failed - exception " + e.toString(), e);
-        }
-
-        if (!input.equals(new String(Hex.encode(data))))
-        {
-            fail("failed key generation (768) Test");
-        }
-
-        genParam = new RSAKeyGenerationParameters(BigInteger.valueOf(0x11), new SecureRandom(), 1024, 25);
-
-        pGen.init(genParam);
-        pair = pGen.generateKeyPair();
-
-        eng.init(true, pair.getPublic());
-
-        if (((RSAKeyParameters)pair.getPublic()).getModulus().bitLength() < 1024)
-        {
-            fail("failed key generation (1024) length test");
-        }
-
-        try
-        {
-            data = eng.processBlock(data, 0, data.length);
-        }
-        catch (Exception e)
-        {
-            fail("failed - exception " + e.toString(), e);
-        }
-
-        eng.init(false, pair.getPrivate());
-
-        try
-        {
-            data = eng.processBlock(data, 0, data.length);
-        }
-        catch (Exception e)
-        {
-            fail("failed - exception " + e.toString(), e);
-        }
-
-        if (!input.equals(new String(Hex.encode(data))))
-        {
-            fail("failed key generation (1024) test");
-        }
-
-        genParam = new RSAKeyGenerationParameters(
-            BigInteger.valueOf(0x11), new SecureRandom(), 16, 25);
-        pGen.init(genParam);
-
-        for (int i = 0; i < 100; ++i)
-        {
-            pair = pGen.generateKeyPair();
-            RSAPrivateCrtKeyParameters privKey = (RSAPrivateCrtKeyParameters) pair.getPrivate();
-            BigInteger pqDiff = privKey.getP().subtract(privKey.getQ()).abs();
-
-            if (pqDiff.bitLength() < 5)
-            {
-                fail("P and Q too close in RSA key pair");
-            }
-        }
-        
-        testOAEP(pubParameters, privParameters);
-        testStrictPKCS1Length(pubParameters, privParameters);
-        testDudPKCS1Block(pubParameters, privParameters);
-        testMissingDataPKCS1Block(pubParameters, privParameters);
-        testTruncatedPKCS1Block(pubParameters, privParameters);
-        testWrongPaddingPKCS1Block(pubParameters, privParameters);
-
-        try
-        {
-            new RSAEngine().processBlock(new byte[]{ 1 }, 0, 1);
-            fail("failed initialisation check");
-        }
-        catch (IllegalStateException e)
-        {
-            // expected
-        }
-    }
-
-
-    public static void main(
-        String[]    args)
-    {
-        runTest(new RSATest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/RegressionTest.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/RegressionTest.java
deleted file mode 100644
index ea02a8f..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/RegressionTest.java
+++ /dev/null
@@ -1,161 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import org.bouncycastle.util.test.Test;
-import org.bouncycastle.util.test.TestResult;
-
-public class RegressionTest
-{
-    public static Test[]    tests = 
-    {
-        new AESTest(),
-        new AESLightTest(),
-        new AESFastTest(),
-        new AESWrapTest(),
-        new AESWrapPadTest(),
-        new DESTest(),
-        new DESedeTest(),
-        new ModeTest(),
-        new PaddingTest(),
-        new DHTest(),
-        new ElGamalTest(),
-        new DSATest(),
-        new ECTest(),
-        new DeterministicDSATest(),
-        new GOST3410Test(),
-        new ECGOST3410Test(),
-        new ECIESTest(),
-        new ECNRTest(),
-        new MacTest(),
-        new GOST28147MacTest(),
-        new RC2Test(),
-        new RC2WrapTest(),
-        new RC4Test(),
-        new RC5Test(),
-        new RC6Test(),
-        new RijndaelTest(),
-        new SerpentTest(),
-        new CamelliaTest(),
-        new CamelliaLightTest(),
-        new DigestRandomNumberTest(),
-        new SkipjackTest(),
-        new BlowfishTest(),
-        new TwofishTest(),
-        new Threefish256Test(),
-        new Threefish512Test(),
-        new Threefish1024Test(),
-        new SkeinDigestTest(),
-        new SkeinMacTest(),
-        new CAST5Test(),
-        new CAST6Test(),
-        new GOST28147Test(),
-        new IDEATest(),
-        new RSATest(),
-        new RSABlindedTest(),
-        new RSADigestSignerTest(),
-        new PSSBlindTest(),
-        new ISO9796Test(),
-        new ISO9797Alg3MacTest(),
-        new MD2DigestTest(),
-        new MD4DigestTest(),
-        new MD5DigestTest(),
-        new SHA1DigestTest(),
-        new SHA224DigestTest(),
-        new SHA256DigestTest(),
-        new SHA384DigestTest(),
-        new SHA512DigestTest(),
-        new SHA512t224DigestTest(),
-        new SHA512t256DigestTest(),
-        new SHA3DigestTest(),
-        new RIPEMD128DigestTest(),
-        new RIPEMD160DigestTest(),
-        new RIPEMD256DigestTest(),
-        new RIPEMD320DigestTest(),
-        new TigerDigestTest(),
-        new GOST3411DigestTest(),
-        new WhirlpoolDigestTest(),
-        new MD5HMacTest(),
-        new SHA1HMacTest(),
-        new SHA224HMacTest(),
-        new SHA256HMacTest(),
-        new SHA384HMacTest(),
-        new SHA512HMacTest(),
-        new RIPEMD128HMacTest(),
-        new RIPEMD160HMacTest(),
-        new OAEPTest(),
-        new PSSTest(),
-        new CTSTest(),
-        new NISTCTSTest(),
-        new CCMTest(),
-        new PKCS5Test(),
-        new PKCS12Test(),
-        new KDF1GeneratorTest(),
-        new KDF2GeneratorTest(),
-        new MGF1GeneratorTest(),
-        new HKDFGeneratorTest(),
-        new DHKEKGeneratorTest(),
-        new ECDHKEKGeneratorTest(),
-        new ShortenedDigestTest(),
-        new EqualsHashCodeTest(),
-        new TEATest(),
-        new XTEATest(),
-        new RFC3211WrapTest(),
-        new SEEDTest(),
-        new Salsa20Test(),
-        new XSalsa20Test(),
-        new ChaChaTest(),
-        new CMacTest(),
-        new EAXTest(),
-        new GCMTest(),
-        new GMacTest(),
-        new HCFamilyTest(),
-        new HCFamilyVecTest(),
-        new ISAACTest(),
-        new NoekeonTest(),
-        new VMPCKSA3Test(),
-        new VMPCMacTest(),
-        new VMPCTest(),
-        new Grainv1Test(),
-        new Grain128Test(),
-        //new NaccacheSternTest(),
-        new SRP6Test(),
-        new SCryptTest(),
-        new ResetTest(),
-        new NullTest(),
-        new DSTU4145Test(),
-        new SipHashTest(),
-        new Poly1305Test(),
-        new OCBTest(),
-        new NonMemoableDigestTest(),
-        new RSAKeyEncapsulationTest(),
-        new ECIESKeyEncapsulationTest(),
-        new HashCommitmentTest(),
-        new CipherStreamTest(),
-        new BlockCipherResetTest(),
-        new StreamCipherResetTest(),
-        new SM3DigestTest(),
-        new Shacal2Test(),
-        new KDFCounterGeneratorTest(),
-        new KDFDoublePipelineIteratorGeneratorTest(),
-        new KDFFeedbackGeneratorTest(),
-        new CramerShoupTest(),
-        new BCryptTest(),
-        new OpenBSDBCryptTest(),
-        new X931SignerTest()
-    };
-
-    public static void main(
-        String[]    args)
-    {
-        for (int i = 0; i != tests.length; i++)
-        {
-            TestResult  result = tests[i].perform();
-            
-            if (result.getException() != null)
-            {
-                result.getException().printStackTrace();
-            }
-            
-            System.out.println(result);
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/ResetTest.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/ResetTest.java
deleted file mode 100644
index efd0e06..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/ResetTest.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import org.bouncycastle.crypto.BufferedBlockCipher;
-import org.bouncycastle.crypto.DataLengthException;
-import org.bouncycastle.crypto.InvalidCipherTextException;
-import org.bouncycastle.crypto.engines.DESEngine;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-
-public class ResetTest
-    extends SimpleTest
-{
-    private static final byte[]   input = Hex.decode("4e6f77206973207468652074696d6520666f7220616c6c20");
-    private static final byte[]   output = Hex.decode("3fa40e8a984d48156a271787ab8883f9893d51ec4b563b53");
-    public String getName()
-    {
-        return "Reset";
-    }
-
-    public void performTest()
-        throws Exception
-    {
-        BufferedBlockCipher cipher = new BufferedBlockCipher(new DESEngine());
-
-        KeyParameter param = new KeyParameter(Hex.decode("0123456789abcdef"));
-
-        basicTrial(cipher, param);
-
-        cipher.init(false, param);
-
-        byte[] out = new byte[input.length];
-        
-        int len2 = cipher.processBytes(output, 0, output.length - 1, out, 0);
-
-        try
-        {
-            cipher.doFinal(out, len2);
-            fail("no DataLengthException - short input");
-        }
-        catch (DataLengthException e)
-        {
-            // ignore
-        }
-
-        len2 = cipher.processBytes(output, 0, output.length, out, 0);
-
-        cipher.doFinal(out, len2);
-
-        if (!areEqual(input, out))
-        {
-            fail("failed reversal one got " + new String(Hex.encode(out)));
-        }
-
-        len2 = cipher.processBytes(output, 0, output.length - 1, out, 0);
-
-        try
-        {
-            cipher.doFinal(out, len2);
-            fail("no DataLengthException - short output");
-        }
-        catch (DataLengthException e)
-        {
-            // ignore
-        }
-
-        len2 = cipher.processBytes(output, 0, output.length, out, 0);
-
-        cipher.doFinal(out, len2);
-
-        if (!areEqual(input, out))
-        {
-            fail("failed reversal two got " + new String(Hex.encode(out)));
-        }
-    }
-
-    private void basicTrial(BufferedBlockCipher cipher, KeyParameter param)
-        throws InvalidCipherTextException
-    {
-        cipher.init(true, param);
-
-        byte[]  out = new byte[input.length];
-
-        int len1 = cipher.processBytes(input, 0, input.length, out, 0);
-
-        cipher.doFinal(out, len1);
-
-        if (!areEqual(out, output))
-        {
-            fail("failed - " + "expected " + new String(Hex.encode(output)) + " got " + new String(Hex.encode(out)));
-        }
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        runTest(new ResetTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/RijndaelTest.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/RijndaelTest.java
deleted file mode 100644
index ca81dfb..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/RijndaelTest.java
+++ /dev/null
@@ -1,116 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import org.bouncycastle.crypto.engines.RijndaelEngine;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-
-/**
- * Test vectors from the NIST standard tests and Brian Gladman's vector set
- * <a href="http://fp.gladman.plus.com/cryptography_technology/rijndael/">
- * http://fp.gladman.plus.com/cryptography_technology/rijndael/</a>
- */
-public class RijndaelTest
-    extends CipherTest
-{
-    static SimpleTest[]  tests = 
-            {
-                new BlockCipherVectorTest(0, new RijndaelEngine(128),
-                        new KeyParameter(Hex.decode("80000000000000000000000000000000")),
-                        "00000000000000000000000000000000", "0EDD33D3C621E546455BD8BA1418BEC8"),
-                new BlockCipherVectorTest(1, new RijndaelEngine(128),
-                        new KeyParameter(Hex.decode("00000000000000000000000000000080")),
-                        "00000000000000000000000000000000", "172AEAB3D507678ECAF455C12587ADB7"),
-                new BlockCipherMonteCarloTest(2, 10000, new RijndaelEngine(128),
-                        new KeyParameter(Hex.decode("00000000000000000000000000000000")),
-                        "00000000000000000000000000000000", "C34C052CC0DA8D73451AFE5F03BE297F"),
-                new BlockCipherMonteCarloTest(3, 10000, new RijndaelEngine(128),
-                        new KeyParameter(Hex.decode("5F060D3716B345C253F6749ABAC10917")),
-                        "355F697E8B868B65B25A04E18D782AFA", "ACC863637868E3E068D2FD6E3508454A"),
-                new BlockCipherVectorTest(4, new RijndaelEngine(128),
-                        new KeyParameter(Hex.decode("000000000000000000000000000000000000000000000000")),
-                        "80000000000000000000000000000000", "6CD02513E8D4DC986B4AFE087A60BD0C"),
-                new BlockCipherMonteCarloTest(5, 10000, new RijndaelEngine(128),
-                        new KeyParameter(Hex.decode("AAFE47EE82411A2BF3F6752AE8D7831138F041560631B114")),
-                        "F3F6752AE8D7831138F041560631B114", "77BA00ED5412DFF27C8ED91F3C376172"),
-                new BlockCipherVectorTest(6, new RijndaelEngine(128),
-                        new KeyParameter(Hex.decode("0000000000000000000000000000000000000000000000000000000000000000")),
-                        "80000000000000000000000000000000", "DDC6BF790C15760D8D9AEB6F9A75FD4E"),
-                new BlockCipherMonteCarloTest(7, 10000, new RijndaelEngine(128),
-                        new KeyParameter(Hex.decode("28E79E2AFC5F7745FCCABE2F6257C2EF4C4EDFB37324814ED4137C288711A386")),
-                        "C737317FE0846F132B23C8C2A672CE22", "E58B82BFBA53C0040DC610C642121168"),
-                new BlockCipherVectorTest(8, new RijndaelEngine(160),
-                        new KeyParameter(Hex.decode("2b7e151628aed2a6abf7158809cf4f3c")),
-                        "3243f6a8885a308d313198a2e03707344a409382", "16e73aec921314c29df905432bc8968ab64b1f51"),
-                new BlockCipherVectorTest(8, new RijndaelEngine(160),
-                        new KeyParameter(Hex.decode("2b7e151628aed2a6abf7158809cf4f3c762e7160")),
-                        "3243f6a8885a308d313198a2e03707344a409382", "0553eb691670dd8a5a5b5addf1aa7450f7a0e587"),
-                new BlockCipherVectorTest(8, new RijndaelEngine(160),
-                        new KeyParameter(Hex.decode("2b7e151628aed2a6abf7158809cf4f3c762e7160f38b4da5")),
-                        "3243f6a8885a308d313198a2e03707344a409382", "73cd6f3423036790463aa9e19cfcde894ea16623"),
-                new BlockCipherVectorTest(8, new RijndaelEngine(160),
-                        new KeyParameter(Hex.decode("2b7e151628aed2a6abf7158809cf4f3c762e7160f38b4da56a784d90")),
-                        "3243f6a8885a308d313198a2e03707344a409382", "601b5dcd1cf4ece954c740445340bf0afdc048df"),
-                new BlockCipherVectorTest(8, new RijndaelEngine(160),
-                        new KeyParameter(Hex.decode("2b7e151628aed2a6abf7158809cf4f3c762e7160f38b4da56a784d9045190cfe")),
-                        "3243f6a8885a308d313198a2e03707344a409382", "579e930b36c1529aa3e86628bacfe146942882cf"),
-                new BlockCipherVectorTest(8, new RijndaelEngine(192),
-                        new KeyParameter(Hex.decode("2b7e151628aed2a6abf7158809cf4f3c")),
-                        "3243f6a8885a308d313198a2e03707344a4093822299f31d", "b24d275489e82bb8f7375e0d5fcdb1f481757c538b65148a"),
-                new BlockCipherVectorTest(9, new RijndaelEngine(192),
-                        new KeyParameter(Hex.decode("2b7e151628aed2a6abf7158809cf4f3c762e7160f38b4da5")),
-                        "3243f6a8885a308d313198a2e03707344a4093822299f31d", "725ae43b5f3161de806a7c93e0bca93c967ec1ae1b71e1cf"),
-                new BlockCipherVectorTest(10, new RijndaelEngine(192),
-                        new KeyParameter(Hex.decode("2b7e151628aed2a6abf7158809cf4f3c762e7160f38b4da56a784d90")),
-                        "3243f6a8885a308d313198a2e03707344a4093822299f31d", "bbfc14180afbf6a36382a061843f0b63e769acdc98769130"),
-                new BlockCipherVectorTest(11, new RijndaelEngine(192),
-                        new KeyParameter(Hex.decode("2b7e151628aed2a6abf7158809cf4f3c762e7160f38b4da56a784d9045190cfe")),
-                        "3243f6a8885a308d313198a2e03707344a4093822299f31d", "0ebacf199e3315c2e34b24fcc7c46ef4388aa475d66c194c"),
-                new BlockCipherVectorTest(12, new RijndaelEngine(224),
-                        new KeyParameter(Hex.decode("2b7e151628aed2a6abf7158809cf4f3c")),
-                        "3243f6a8885a308d313198a2e03707344a4093822299f31d0082efa9", "b0a8f78f6b3c66213f792ffd2a61631f79331407a5e5c8d3793aceb1"),
-                new BlockCipherVectorTest(13, new RijndaelEngine(224),
-                        new KeyParameter(Hex.decode("2b7e151628aed2a6abf7158809cf4f3c762e7160")),
-                        "3243f6a8885a308d313198a2e03707344a4093822299f31d0082efa9", "08b99944edfce33a2acb131183ab0168446b2d15e958480010f545e3"),
-                new BlockCipherVectorTest(14, new RijndaelEngine(224),
-                        new KeyParameter(Hex.decode("2b7e151628aed2a6abf7158809cf4f3c762e7160f38b4da5")),
-                        "3243f6a8885a308d313198a2e03707344a4093822299f31d0082efa9", "be4c597d8f7efe22a2f7e5b1938e2564d452a5bfe72399c7af1101e2"),
-                new BlockCipherVectorTest(15, new RijndaelEngine(224),
-                        new KeyParameter(Hex.decode("2b7e151628aed2a6abf7158809cf4f3c762e7160f38b4da56a784d90")),
-                        "3243f6a8885a308d313198a2e03707344a4093822299f31d0082efa9", "ef529598ecbce297811b49bbed2c33bbe1241d6e1a833dbe119569e8"),
-                new BlockCipherVectorTest(16, new RijndaelEngine(224),
-                        new KeyParameter(Hex.decode("2b7e151628aed2a6abf7158809cf4f3c762e7160f38b4da56a784d9045190cfe")),
-                        "3243f6a8885a308d313198a2e03707344a4093822299f31d0082efa9", "02fafc200176ed05deb8edb82a3555b0b10d47a388dfd59cab2f6c11"),
-                new BlockCipherVectorTest(17, new RijndaelEngine(256),
-                        new KeyParameter(Hex.decode("2b7e151628aed2a6abf7158809cf4f3c")),
-                        "3243f6a8885a308d313198a2e03707344a4093822299f31d0082efa98ec4e6c8", "7d15479076b69a46ffb3b3beae97ad8313f622f67fedb487de9f06b9ed9c8f19"),
-                new BlockCipherVectorTest(18, new RijndaelEngine(256),
-                        new KeyParameter(Hex.decode("2b7e151628aed2a6abf7158809cf4f3c762e7160")),
-                        "3243f6a8885a308d313198a2e03707344a4093822299f31d0082efa98ec4e6c8", "514f93fb296b5ad16aa7df8b577abcbd484decacccc7fb1f18dc567309ceeffd"),
-                new BlockCipherVectorTest(19, new RijndaelEngine(256),
-                        new KeyParameter(Hex.decode("2b7e151628aed2a6abf7158809cf4f3c762e7160f38b4da5")),
-                        "3243f6a8885a308d313198a2e03707344a4093822299f31d0082efa98ec4e6c8", "5d7101727bb25781bf6715b0e6955282b9610e23a43c2eb062699f0ebf5887b2"),
-                new BlockCipherVectorTest(20, new RijndaelEngine(256),
-                        new KeyParameter(Hex.decode("2b7e151628aed2a6abf7158809cf4f3c762e7160f38b4da56a784d90")),
-                        "3243f6a8885a308d313198a2e03707344a4093822299f31d0082efa98ec4e6c8", "d56c5a63627432579e1dd308b2c8f157b40a4bfb56fea1377b25d3ed3d6dbf80"),
-                new BlockCipherVectorTest(21, new RijndaelEngine(256),
-                        new KeyParameter(Hex.decode("2b7e151628aed2a6abf7158809cf4f3c762e7160f38b4da56a784d9045190cfe")),
-                        "3243f6a8885a308d313198a2e03707344a4093822299f31d0082efa98ec4e6c8", "a49406115dfb30a40418aafa4869b7c6a886ff31602a7dd19c889dc64f7e4e7a")
-            };
-
-    RijndaelTest()
-    {
-        super(tests, new RijndaelEngine(128), new KeyParameter(new byte[16]));
-    }
-
-    public String getName()
-    {
-        return "Rijndael";
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        runTest(new RijndaelTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/SCryptTest.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/SCryptTest.java
deleted file mode 100644
index b017a1d..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/SCryptTest.java
+++ /dev/null
@@ -1,144 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
-
-import org.bouncycastle.crypto.generators.SCrypt;
-import org.bouncycastle.util.Strings;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-
-/*
- * scrypt test vectors from "Stronger Key Derivation Via Sequential Memory-hard Functions" Appendix B.
- * (http://www.tarsnap.com/scrypt/scrypt.pdf)
- */
-public class SCryptTest extends SimpleTest
-{
-    public String getName()
-    {
-        return "SCrypt";
-    }
-
-    public void performTest() throws Exception
-    {
-        testParameters();
-        testVectors();
-    }
-
-    public void testParameters()
-    {
-        checkOK("Minimal values", new byte[0], new byte[0], 2, 1, 1, 1);
-        checkIllegal("Cost parameter must be > 1", new byte[0], new byte[0], 1, 1, 1, 1);
-        checkOK("Cost parameter 65536 OK for r == 1", new byte[0], new byte[0], 65536, 1, 1, 1);
-        checkIllegal("Cost parameter must <= 65536 for r == 1", new byte[0], new byte[0], 65537, 1, 1, 1);
-        checkIllegal("Block size must be >= 1", new byte[0], new byte[0], 2, 0, 2, 1);
-        checkIllegal("Parallelisation parameter must be >= 1", new byte[0], new byte[0], 2, 1, 0, 1);
-        // checkOK("Parallelisation parameter 65535 OK for r = 4", new byte[0], new byte[0], 2, 32,
-        // 65535, 1);
-        checkIllegal("Parallelisation parameter must be < 65535 for r = 4", new byte[0], new byte[0], 2, 32, 65536, 1);
-
-        checkIllegal("Len parameter must be > 1", new byte[0], new byte[0], 2, 1, 1, 0);
-       }
-
-    private void checkOK(String msg, byte[] pass, byte[] salt, int N, int r, int p, int len)
-    {
-        try
-        {
-            SCrypt.generate(pass, salt, N, r, p, len);
-        }
-        catch (IllegalArgumentException e)
-        {
-            e.printStackTrace();
-            fail(msg);
-        }
-    }
-
-    private void checkIllegal(String msg, byte[] pass, byte[] salt, int N, int r, int p, int len)
-    {
-        try
-        {
-            SCrypt.generate(pass, salt, N, r, p, len);
-            fail(msg);
-        }
-        catch (IllegalArgumentException e)
-        {
-            // e.printStackTrace();
-        }
-    }
-
-    public void testVectors()
-        throws Exception
-    {
-        BufferedReader br = new BufferedReader(new InputStreamReader(
-            getClass().getResourceAsStream("SCryptTestVectors.txt")));
-
-        int count = 0;
-        String line = br.readLine();
-
-        while (line != null)
-        {
-            ++count;
-            String header = line;
-            StringBuffer data = new StringBuffer();
-
-            while (!isEndData(line = br.readLine()))
-            {
-                for (int i = 0; i != line.length(); i++)
-                {
-                    if (line.charAt(i) != ' ')
-                    {
-                        data.append(line.charAt(i));
-                    }
-                }
-            }
-
-            int start = header.indexOf('(') + 1;
-            int limit = header.lastIndexOf(')');
-            String argStr = header.substring(start, limit);
-            String[] args = Strings.split(argStr, ',');
-
-            byte[] P = extractQuotedString(args[0]);
-            byte[] S = extractQuotedString(args[1]);
-            int N = extractInteger(args[2]);
-            int r = extractInteger(args[3]);
-            int p = extractInteger(args[4]);
-            int dkLen = extractInteger(args[5]);
-            byte[] expected = Hex.decode(data.toString());
-
-            // This skips very expensive test case(s), remove check to re-enable
-            if (N <= 16384)
-            {
-                byte[] result = SCrypt.generate(P, S, N, r, p, dkLen);
-
-                if (!areEqual(expected, result))
-                {
-                    fail("Result does not match expected value in test case " + count);
-                }
-            }
-        }
-
-        br.close();
-    }
-
-    private static boolean isEndData(String line)
-    {
-        return line == null || line.startsWith("scrypt");
-    }
-
-    private static byte[] extractQuotedString(String arg)
-    {
-        arg = arg.trim();
-        arg = arg.substring(1, arg.length() - 1);
-        return Strings.toByteArray(arg);
-    }
-
-    private static int extractInteger(String arg)
-    {
-        return Integer.parseInt(arg.trim());
-    }
-
-    public static void main(String[] args)
-    {
-        runTest(new SCryptTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/SEEDTest.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/SEEDTest.java
deleted file mode 100644
index 4aa955b..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/SEEDTest.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import org.bouncycastle.crypto.engines.SEEDEngine;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-
-/**
- * SEED tester - vectors http://www.ietf.org/rfc/rfc4009.txt
- */
-public class SEEDTest
-    extends CipherTest
-{
-    static SimpleTest[]  tests =
-    {
-        new BlockCipherVectorTest(0, new SEEDEngine(),
-            new KeyParameter(Hex.decode("00000000000000000000000000000000")),
-            "000102030405060708090a0b0c0d0e0f",
-            "5EBAC6E0054E166819AFF1CC6D346CDB"),
-        new BlockCipherVectorTest(0, new SEEDEngine(),
-            new KeyParameter(Hex.decode("000102030405060708090a0b0c0d0e0f")),
-            "00000000000000000000000000000000",
-            "c11f22f20140505084483597e4370f43"),
-        new BlockCipherVectorTest(0, new SEEDEngine(),
-            new KeyParameter(Hex.decode("4706480851E61BE85D74BFB3FD956185")),
-            "83A2F8A288641FB9A4E9A5CC2F131C7D",
-            "EE54D13EBCAE706D226BC3142CD40D4A"),
-        new BlockCipherVectorTest(0, new SEEDEngine(),
-            new KeyParameter(Hex.decode("28DBC3BC49FFD87DCFA509B11D422BE7")),
-            "B41E6BE2EBA84A148E2EED84593C5EC7",
-            "9B9B7BFCD1813CB95D0B3618F40F5122"),
-        new BlockCipherVectorTest(0, new SEEDEngine(),
-            new KeyParameter(Hex.decode("0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E")),
-            "0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E0E",
-            "8296F2F1B007AB9D533FDEE35A9AD850"),
-    };
-
-    SEEDTest()
-    {
-        super(tests, new SEEDEngine(), new KeyParameter(new byte[16]));
-    }
-
-    public String getName()
-    {
-        return "SEED";
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        runTest(new SEEDTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/SHA1DigestTest.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/SHA1DigestTest.java
deleted file mode 100644
index 38b9b80..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/SHA1DigestTest.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.digests.SHA1Digest;
-
-/**
- * standard vector test for SHA-1 from "Handbook of Applied Cryptography", page 345.
- */
-public class SHA1DigestTest
-    extends DigestTest
-{
-    private static String[] messages =
-    {
-         "",
-         "a",
-         "abc",
-         "abcdefghijklmnopqrstuvwxyz"
-    };
-    
-    private static String[] digests =
-    {
-        "da39a3ee5e6b4b0d3255bfef95601890afd80709",
-        "86f7e437faa5a7fce15d1ddcb9eaeaea377667b8",
-        "a9993e364706816aba3e25717850c26c9cd0d89d",
-        "32d10c7b8cf96570ca04ce37f2a19d84240d3a89"
-    };
-    
-    SHA1DigestTest()
-    {
-        super(new SHA1Digest(), messages, digests);
-    }
-
-    protected Digest cloneDigest(Digest digest)
-    {
-        return new SHA1Digest((SHA1Digest)digest);
-    }
-
-    protected Digest cloneDigest(byte[] encodedState)
-    {
-        return new SHA1Digest(encodedState);
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        runTest(new SHA1DigestTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/SHA1HMacTest.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/SHA1HMacTest.java
deleted file mode 100644
index 72a5fdc..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/SHA1HMacTest.java
+++ /dev/null
@@ -1,111 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import org.bouncycastle.crypto.digests.SHA1Digest;
-import org.bouncycastle.crypto.macs.HMac;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTestResult;
-import org.bouncycastle.util.test.Test;
-import org.bouncycastle.util.test.TestResult;
-
-/**
- * SHA1 HMac Test, test vectors from RFC 2202
- */
-public class SHA1HMacTest
-    implements Test
-{
-    final static String[] keys = {
-        "0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b",
-        "4a656665",
-        "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
-        "0102030405060708090a0b0c0d0e0f10111213141516171819",
-        "0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c",
-        "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
-        "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
-        "000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F202122232425262728292A2B2C2D2E2F303132333435363738393A3B3C3D3E3F"
-    };
-
-    final static String[] digests = {
-        "b617318655057264e28bc0b6fb378c8ef146be00",
-        "effcdf6ae5eb2fa2d27416d5f184df9c259a7c79",
-        "125d7342b9ac11cd91a39af48aa17b4f63f175d3",
-        "4c9007f4026250c6bc8414f9bf50c86c2d7235da",
-        "4c1a03424b55e07fe7f27be1d58bb9324a9a5a04",
-        "aa4ae5e15272d00e95705637ce8a3b55ed402112",
-        "e8e99d0f45237d786d6bbaa7965c7808bbff1a91",
-        "5FD596EE78D5553C8FF4E72D266DFD192366DA29"
-    };
-
-    final static String[] messages = {
-        "Hi There",
-        "what do ya want for nothing?",
-        "0xdddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd",
-        "0xcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcd",
-        "Test With Truncation",
-        "Test Using Larger Than Block-Size Key - Hash Key First",
-        "Test Using Larger Than Block-Size Key and Larger Than One Block-Size Data",
-        "Sample message for keylen=blocklen"
-    };
-        
-    public String getName()
-    {
-        return "SHA1HMac";
-    }
-
-    public TestResult perform()
-    {
-        HMac hmac = new HMac(new SHA1Digest());
-        byte[] resBuf = new byte[hmac.getMacSize()];
-
-        for (int i = 0; i < messages.length; i++)
-        {
-            byte[] m = messages[i].getBytes();
-            if (messages[i].startsWith("0x"))
-            {
-                m = Hex.decode(messages[i].substring(2));
-            }
-            hmac.init(new KeyParameter(Hex.decode(keys[i])));
-            hmac.update(m, 0, m.length);
-            hmac.doFinal(resBuf, 0);
-
-            if (!Arrays.areEqual(resBuf, Hex.decode(digests[i])))
-            {
-                return new SimpleTestResult(false, getName() + ": Vector " + i + " failed");
-            }
-        }
-
-        //
-        // test reset
-        //
-        int vector = 0; // vector used for test
-        byte[] m = messages[vector].getBytes();
-        if (messages[vector].startsWith("0x"))
-        {
-            m = Hex.decode(messages[vector].substring(2));
-        }
-        hmac.init(new KeyParameter(Hex.decode(keys[vector])));
-        hmac.update(m, 0, m.length);
-        hmac.doFinal(resBuf, 0);
-        hmac.reset();
-        hmac.update(m, 0, m.length);
-        hmac.doFinal(resBuf, 0);
-
-        if (!Arrays.areEqual(resBuf, Hex.decode(digests[vector])))
-        {
-            return new SimpleTestResult(false, getName() +
-                    "Reset with vector " + vector + " failed");
-        }
-
-        return new SimpleTestResult(true, getName() + ": Okay");
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        SHA1HMacTest    test = new SHA1HMacTest();
-        TestResult      result = test.perform();
-
-        System.out.println(result);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/SHA224DigestTest.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/SHA224DigestTest.java
deleted file mode 100644
index d14f87d..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/SHA224DigestTest.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.digests.SHA224Digest;
-
-/**
- * standard vector test for SHA-224 from RFC 3874 - only the last three are in
- * the RFC.
- */
-public class SHA224DigestTest
-    extends DigestTest
-{
-    private static String[] messages =
-    {
-        "",
-        "a",
-        "abc",
-        "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq"
-    };
-    
-    private static String[] digests =
-    {
-        "d14a028c2a3a2bc9476102bb288234c415a2b01f828ea62ac5b3e42f",
-        "abd37534c7d9a2efb9465de931cd7055ffdb8879563ae98078d6d6d5",
-        "23097d223405d8228642a477bda255b32aadbce4bda0b3f7e36c9da7",
-        "75388b16512776cc5dba5da1fd890150b0c6455cb4f58b1952522525"
-    };
-    
-    // 1 million 'a'
-    static private String  million_a_digest = "20794655980c91d8bbb4c1ea97618a4bf03f42581948b2ee4ee7ad67";
-
-    SHA224DigestTest()
-    {
-        super(new SHA224Digest(), messages, digests);
-    }
-
-    public void performTest()
-    {
-        super.performTest();
-
-        millionATest(million_a_digest);
-    }
-
-    protected Digest cloneDigest(Digest digest)
-    {
-        return new SHA224Digest((SHA224Digest)digest);
-    }
-
-    protected Digest cloneDigest(byte[] encodedState)
-    {
-        return new SHA224Digest(encodedState);
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        runTest(new SHA224DigestTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/SHA224HMacTest.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/SHA224HMacTest.java
deleted file mode 100644
index 52abb16..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/SHA224HMacTest.java
+++ /dev/null
@@ -1,108 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import org.bouncycastle.crypto.digests.SHA224Digest;
-import org.bouncycastle.crypto.macs.HMac;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTestResult;
-import org.bouncycastle.util.test.Test;
-import org.bouncycastle.util.test.TestResult;
-
-/**
- * SHA224 HMac Test
- */
-public class SHA224HMacTest
-    implements Test
-{
-    final static String[] keys = {
-        "0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b",
-        "4a656665",
-        "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
-        "0102030405060708090a0b0c0d0e0f10111213141516171819",
-        "0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c",
-        "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
-        "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
-    };
-
-    final static String[] digests = {
-        "896fb1128abbdf196832107cd49df33f47b4b1169912ba4f53684b22",
-        "a30e01098bc6dbbf45690f3a7e9e6d0f8bbea2a39e6148008fd05e44",
-        "7fb3cb3588c6c1f6ffa9694d7d6ad2649365b0c1f65d69d1ec8333ea",
-        "6c11506874013cac6a2abc1bb382627cec6a90d86efc012de7afec5a",
-        "0e2aea68a90c8d37c988bcdb9fca6fa8099cd857c7ec4a1815cac54c",
-        "95e9a0db962095adaebe9b2d6f0dbce2d499f112f2d2b7273fa6870e",
-        "3a854166ac5d9f023f54d517d0b39dbd946770db9c2b95c9f6f565d1"
-    };
-
-    final static String[] messages = {
-        "Hi There",
-        "what do ya want for nothing?",
-        "0xdddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd",
-        "0xcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcd",
-        "Test With Truncation",
-        "Test Using Larger Than Block-Size Key - Hash Key First",
-        "This is a test using a larger than block-size key and a larger than block-size data. The key needs to be hashed before being used by the HMAC algorithm."
-    };
-
-    public String getName()
-    {
-        return "SHA224HMac";
-    }
-
-    public TestResult perform()
-    {
-        HMac hmac = new HMac(new SHA224Digest());
-        byte[] resBuf = new byte[hmac.getMacSize()];
-
-        for (int i = 0; i < messages.length; i++)
-        {
-            byte[] m = messages[i].getBytes();
-            if (messages[i].startsWith("0x"))
-            {
-                m = Hex.decode(messages[i].substring(2));
-            }
-            hmac.init(new KeyParameter(Hex.decode(keys[i])));
-            hmac.update(m, 0, m.length);
-            hmac.doFinal(resBuf, 0);
-
-            if (!Arrays.areEqual(resBuf, Hex.decode(digests[i])))
-            {
-                return new SimpleTestResult(false, getName() + ": Vector " + i + " failed got -" + new String(Hex.encode(resBuf)));
-            }
-        }
-
-        //
-        // test reset
-        //
-        int vector = 0; // vector used for test
-        byte[] m = messages[vector].getBytes();
-        if (messages[vector].startsWith("0x"))
-        {
-            m = Hex.decode(messages[vector].substring(2));
-        }
-        hmac.init(new KeyParameter(Hex.decode(keys[vector])));
-        hmac.update(m, 0, m.length);
-        hmac.doFinal(resBuf, 0);
-        hmac.reset();
-        hmac.update(m, 0, m.length);
-        hmac.doFinal(resBuf, 0);
-
-        if (!Arrays.areEqual(resBuf, Hex.decode(digests[vector])))
-        {
-            return new SimpleTestResult(false, getName() +
-                    "Reset with vector " + vector + " failed");
-        }
-
-        return new SimpleTestResult(true, getName() + ": Okay");
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        SHA224HMacTest    test = new SHA224HMacTest();
-        TestResult      result = test.perform();
-
-        System.out.println(result);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/SHA256DigestTest.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/SHA256DigestTest.java
deleted file mode 100644
index 8a35ce4..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/SHA256DigestTest.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.digests.SHA256Digest;
-
-/**
- * standard vector test for SHA-256 from FIPS Draft 180-2.
- *
- * Note, the first two vectors are _not_ from the draft, the last three are.
- */
-public class SHA256DigestTest
-    extends DigestTest
-{
-    private static String[] messages =
-    {
-        "",
-        "a",
-        "abc",
-        "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq"
-    };
-    
-    private static String[] digests =
-    {
-        "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
-        "ca978112ca1bbdcafac231b39a23dc4da786eff8147c4e72b9807785afee48bb",
-        "ba7816bf8f01cfea414140de5dae2223b00361a396177a9cb410ff61f20015ad",
-        "248d6a61d20638b8e5c026930c3e6039a33ce45964ff2167f6ecedd419db06c1"
-    };
-    
-    // 1 million 'a'
-    static private String  million_a_digest = "cdc76e5c9914fb9281a1c7e284d73e67f1809a48a497200e046d39ccc7112cd0";
-
-    SHA256DigestTest()
-    {
-        super(new SHA256Digest(), messages, digests);
-    }
-
-    public void performTest()
-    {
-        super.performTest();
-
-        millionATest(million_a_digest);
-    }
-
-    protected Digest cloneDigest(Digest digest)
-    {
-        return new SHA256Digest((SHA256Digest)digest);
-    }
-
-    protected Digest cloneDigest(byte[] encodedState)
-    {
-        return new SHA256Digest(encodedState);
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        runTest(new SHA256DigestTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/SHA256HMacTest.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/SHA256HMacTest.java
deleted file mode 100644
index 82ab1dc..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/SHA256HMacTest.java
+++ /dev/null
@@ -1,108 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import org.bouncycastle.crypto.digests.SHA256Digest;
-import org.bouncycastle.crypto.macs.HMac;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTestResult;
-import org.bouncycastle.util.test.Test;
-import org.bouncycastle.util.test.TestResult;
-
-/**
- * SHA256 HMac Test
- */
-public class SHA256HMacTest
-    implements Test
-{
-    final static String[] keys = {
-        "0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b",
-        "4a656665",
-        "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
-        "0102030405060708090a0b0c0d0e0f10111213141516171819",
-        "0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c",
-        "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
-        "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
-    };
-
-    final static String[] digests = {
-        "b0344c61d8db38535ca8afceaf0bf12b881dc200c9833da726e9376c2e32cff7",
-        "5bdcc146bf60754e6a042426089575c75a003f089d2739839dec58b964ec3843",
-        "773ea91e36800e46854db8ebd09181a72959098b3ef8c122d9635514ced565fe",
-        "82558a389a443c0ea4cc819899f2083a85f0faa3e578f8077a2e3ff46729665b",
-        "a3b6167473100ee06e0c796c2955552bfa6f7c0a6a8aef8b93f860aab0cd20c5",
-        "60e431591ee0b67f0d8a26aacbf5b77f8e0bc6213728c5140546040f0ee37f54",
-        "9b09ffa71b942fcb27635fbcd5b0e944bfdc63644f0713938a7f51535c3a35e2"
-    };
-
-    final static String[] messages = {
-        "Hi There",
-        "what do ya want for nothing?",
-        "0xdddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd",
-        "0xcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcd",
-        "Test With Truncation",
-        "Test Using Larger Than Block-Size Key - Hash Key First",
-        "This is a test using a larger than block-size key and a larger than block-size data. The key needs to be hashed before being used by the HMAC algorithm."
-    };
-  
-    public String getName()
-    {
-        return "SHA256HMac";
-    }
-
-    public TestResult perform()
-    {
-        HMac hmac = new HMac(new SHA256Digest());
-        byte[] resBuf = new byte[hmac.getMacSize()];
-
-        for (int i = 0; i < messages.length; i++)
-        {
-            byte[] m = messages[i].getBytes();
-            if (messages[i].startsWith("0x"))
-            {
-                m = Hex.decode(messages[i].substring(2));
-            }
-            hmac.init(new KeyParameter(Hex.decode(keys[i])));
-            hmac.update(m, 0, m.length);
-            hmac.doFinal(resBuf, 0);
-
-            if (!Arrays.areEqual(resBuf, Hex.decode(digests[i])))
-            {
-                return new SimpleTestResult(false, getName() + ": Vector " + i + " failed got -" + new String(Hex.encode(resBuf)));
-            }
-        }
-
-        //
-        // test reset
-        //
-        int vector = 0; // vector used for test
-        byte[] m = messages[vector].getBytes();
-        if (messages[vector].startsWith("0x"))
-        {
-            m = Hex.decode(messages[vector].substring(2));
-        }
-        hmac.init(new KeyParameter(Hex.decode(keys[vector])));
-        hmac.update(m, 0, m.length);
-        hmac.doFinal(resBuf, 0);
-        hmac.reset();
-        hmac.update(m, 0, m.length);
-        hmac.doFinal(resBuf, 0);
-
-        if (!Arrays.areEqual(resBuf, Hex.decode(digests[vector])))
-        {
-            return new SimpleTestResult(false, getName() +
-                    "Reset with vector " + vector + " failed");
-        }
-
-        return new SimpleTestResult(true, getName() + ": Okay");
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        SHA256HMacTest    test = new SHA256HMacTest();
-        TestResult      result = test.perform();
-
-        System.out.println(result);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/SHA384DigestTest.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/SHA384DigestTest.java
deleted file mode 100644
index 7b5f149..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/SHA384DigestTest.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.digests.SHA384Digest;
-
-/**
- * standard vector test for SHA-384 from FIPS Draft 180-2.
- *
- * Note, the first two vectors are _not_ from the draft, the last three are.
- */
-public class SHA384DigestTest
-    extends DigestTest
-{
-    private static String[] messages =
-    {
-        "",
-        "a",
-        "abc",
-        "abcdefghbcdefghicdefghijdefghijkefghijklfghijklmghijklmnhijklmnoijklmnopjklmnopqklmnopqrlmnopqrsmnopqrstnopqrstu"
-    };
-
-    private static String[] digests =
-    {
-        "38b060a751ac96384cd9327eb1b1e36a21fdb71114be07434c0cc7bf63f6e1da274edebfe76f65fbd51ad2f14898b95b",
-        "54a59b9f22b0b80880d8427e548b7c23abd873486e1f035dce9cd697e85175033caa88e6d57bc35efae0b5afd3145f31",
-        "cb00753f45a35e8bb5a03d699ac65007272c32ab0eded1631a8b605a43ff5bed8086072ba1e7cc2358baeca134c825a7",
-        "09330c33f71147e83d192fc782cd1b4753111b173b3b05d22fa08086e3b0f712fcc7c71a557e2db966c3e9fa91746039"
-    };
-
-    static private String  million_a_digest = "9d0e1809716474cb086e834e310a4a1ced149e9c00f248527972cec5704c2a5b07b8b3dc38ecc4ebae97ddd87f3d8985";
-
-    SHA384DigestTest()
-    {
-        super(new SHA384Digest(), messages, digests);
-    }
-
-    public void performTest()
-    {
-        super.performTest();
-
-        millionATest(million_a_digest);
-    }
-
-    protected Digest cloneDigest(Digest digest)
-    {
-        return new SHA384Digest((SHA384Digest)digest);
-    }
-
-    protected Digest cloneDigest(byte[] encodedState)
-    {
-        return new SHA384Digest(encodedState);
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        runTest(new SHA384DigestTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/SHA384HMacTest.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/SHA384HMacTest.java
deleted file mode 100644
index fe903a3..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/SHA384HMacTest.java
+++ /dev/null
@@ -1,108 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import org.bouncycastle.crypto.digests.SHA384Digest;
-import org.bouncycastle.crypto.macs.HMac;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTestResult;
-import org.bouncycastle.util.test.Test;
-import org.bouncycastle.util.test.TestResult;
-
-/**
- * SHA384 HMac Test
- */
-public class SHA384HMacTest
-    implements Test
-{
-    final static String[] keys = {
-        "0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b",
-        "4a656665",
-        "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
-        "0102030405060708090a0b0c0d0e0f10111213141516171819",
-        "0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c",
-        "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
-        "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
-    };
-
-    final static String[] digests = {
-        "afd03944d84895626b0825f4ab46907f15f9dadbe4101ec682aa034c7cebc59cfaea9ea9076ede7f4af152e8b2fa9cb6",
-        "af45d2e376484031617f78d2b58a6b1b9c7ef464f5a01b47e42ec3736322445e8e2240ca5e69e2c78b3239ecfab21649",
-        "88062608d3e6ad8a0aa2ace014c8a86f0aa635d947ac9febe83ef4e55966144b2a5ab39dc13814b94e3ab6e101a34f27",
-        "3e8a69b7783c25851933ab6290af6ca77a9981480850009cc5577c6e1f573b4e6801dd23c4a7d679ccf8a386c674cffb",
-        "3abf34c3503b2a23a46efc619baef897f4c8e42c934ce55ccbae9740fcbc1af4ca62269e2a37cd88ba926341efe4aeea",
-        "4ece084485813e9088d2c63a041bc5b44f9ef1012a2b588f3cd11f05033ac4c60c2ef6ab4030fe8296248df163f44952",
-        "6617178e941f020d351e2f254e8fd32c602420feb0b8fb9adccebb82461e99c5a678cc31e799176d3860e6110c46523e"
-    };
-
-    final static String[] messages = {
-        "Hi There",
-        "what do ya want for nothing?",
-        "0xdddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd",
-        "0xcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcd",
-        "Test With Truncation",
-        "Test Using Larger Than Block-Size Key - Hash Key First",
-        "This is a test using a larger than block-size key and a larger than block-size data. The key needs to be hashed before being used by the HMAC algorithm."
-    };
-   
-    public String getName()
-    {
-        return "SHA384HMac";
-    }
-
-    public TestResult perform()
-    {
-        HMac hmac = new HMac(new SHA384Digest());
-        byte[] resBuf = new byte[hmac.getMacSize()];
-
-        for (int i = 0; i < messages.length; i++)
-        {
-            byte[] m = messages[i].getBytes();
-            if (messages[i].startsWith("0x"))
-            {
-                m = Hex.decode(messages[i].substring(2));
-            }
-            hmac.init(new KeyParameter(Hex.decode(keys[i])));
-            hmac.update(m, 0, m.length);
-            hmac.doFinal(resBuf, 0);
-
-            if (!Arrays.areEqual(resBuf, Hex.decode(digests[i])))
-            {
-                return new SimpleTestResult(false, getName() + ": Vector " + i + " failed got -" + new String(Hex.encode(resBuf)));
-            }
-        }
-
-        //
-        // test reset
-        //
-        int vector = 0; // vector used for test
-        byte[] m = messages[vector].getBytes();
-        if (messages[vector].startsWith("0x"))
-        {
-            m = Hex.decode(messages[vector].substring(2));
-        }
-        hmac.init(new KeyParameter(Hex.decode(keys[vector])));
-        hmac.update(m, 0, m.length);
-        hmac.doFinal(resBuf, 0);
-        hmac.reset();
-        hmac.update(m, 0, m.length);
-        hmac.doFinal(resBuf, 0);
-
-        if (!Arrays.areEqual(resBuf, Hex.decode(digests[vector])))
-        {
-            return new SimpleTestResult(false, getName() +
-                    "Reset with vector " + vector + " failed");
-        }
-
-        return new SimpleTestResult(true, getName() + ": Okay");
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        SHA384HMacTest    test = new SHA384HMacTest();
-        TestResult      result = test.perform();
-
-        System.out.println(result);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/SHA3DigestTest.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/SHA3DigestTest.java
deleted file mode 100644
index 260d457..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/SHA3DigestTest.java
+++ /dev/null
@@ -1,363 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.Mac;
-import org.bouncycastle.crypto.digests.SHA3Digest;
-import org.bouncycastle.crypto.macs.HMac;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-
-/**
- * SHA3 Digest Test
- */
-public class SHA3DigestTest
-    extends SimpleTest
-{
-    final static String[] messages = {
-        "",
-        "54686520717569636b2062726f776e20666f78206a756d7073206f76657220746865206c617a7920646f67",
-        "54686520717569636b2062726f776e20666f78206a756d7073206f76657220746865206c617a7920646f672e"
-    };
-
-    final static String[] digests288 = { // the default settings
-        "6753e3380c09e385d0339eb6b050a68f66cfd60a73476e6fd6adeb72f5edd7c6f04a5d01",  // message[0]    
-        "0bbe6afae0d7e89054085c1cc47b1689772c89a41796891e197d1ca1b76f288154933ded",  // message[1]
-        "82558a209b960ddeb531e6dcb281885b2400ca160472462486e79f071e88a3330a8a303d",  // message[2]
-        "94049e1ad7ef5d5b0df2b880489e7ab09ec937c3bfc1b04470e503e1ac7b1133c18f86da",  // 64k a-test
-        "a9cb5a75b5b81b7528301e72553ed6770214fa963956e790528afe420de33c074e6f4220",  // random alphabet test
-        "eadaf5ba2ad6a2f6f338fce0e1efdad2a61bb38f6be6068b01093977acf99e97a5d5827c"   // extremely long data test
-    };
-
-    final static String[] digests224 = {
-        "f71837502ba8e10837bdd8d365adb85591895602fc552b48b7390abd",
-        "310aee6b30c47350576ac2873fa89fd190cdc488442f3ef654cf23fe",
-        "c59d4eaeac728671c635ff645014e2afa935bebffdb5fbd207ffdeab",
-        "f621e11c142fbf35fa8c22841c3a812ba1e0151be4f38d80b9f1ff53",
-        "68b5fc8c87193155bba68a2485377e809ee4f81a85ef023b9e64add0",
-        "c42e4aee858e1a8ad2976896b9d23dd187f64436ee15969afdbc68c5"
-    };
-
-    final static String[] digests256 = {
-        "c5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470",
-        "4d741b6f1eb29cb2a9b9911c82f56fa8d73b04959d3d9d222895df6c0b28aa15",
-        "578951e24efd62a3d63a86f7cd19aaa53c898fe287d2552133220370240b572d",
-        "0047a916daa1f92130d870b542e22d3108444f5a7e4429f05762fb647e6ed9ed",
-        "db368762253ede6d4f1db87e0b799b96e554eae005747a2ea687456ca8bcbd03",
-        "5f313c39963dcf792b5470d4ade9f3a356a3e4021748690a958372e2b06f82a4"
-    };
-
-    final static String[] digests384 = {
-        "2c23146a63a29acf99e73b88f8c24eaa7dc60aa771780ccc006afbfa8fe2479b2dd2b21362337441ac12b515911957ff",
-        "283990fa9d5fb731d786c5bbee94ea4db4910f18c62c03d173fc0a5e494422e8a0b3da7574dae7fa0baf005e504063b3",
-        "9ad8e17325408eddb6edee6147f13856ad819bb7532668b605a24a2d958f88bd5c169e56dc4b2f89ffd325f6006d820b",
-        "c704cfe7a1a53208ca9526cd24251e0acdc252ecd978eee05acd16425cfb404ea81f5a9e2e5e97784d63ee6a0618a398",
-        "d4fe8586fd8f858dd2e4dee0bafc19b4c12b4e2a856054abc4b14927354931675cdcaf942267f204ea706c19f7beefc4",
-        "9b7168b4494a80a86408e6b9dc4e5a1837c85dd8ff452ed410f2832959c08c8c0d040a892eb9a755776372d4a8732315"
-    };
-
-    final static String[] digests512 = {
-        "0eab42de4c3ceb9235fc91acffe746b29c29a8c366b7c60e4e67c466f36a4304c00fa9caf9d87976ba469bcbe06713b435f091ef2769fb160cdab33d3670680e",
-        "d135bb84d0439dbac432247ee573a23ea7d3c9deb2a968eb31d47c4fb45f1ef4422d6c531b5b9bd6f449ebcc449ea94d0a8f05f62130fda612da53c79659f609",
-        "ab7192d2b11f51c7dd744e7b3441febf397ca07bf812cceae122ca4ded6387889064f8db9230f173f6d1ab6e24b6e50f065b039f799f5592360a6558eb52d760",
-        "34341ead153aa1d1fdcf6cf624c2b4f6894b6fd16dc38bd4ec971ac0385ad54fafcb2e0ed86a1e509456f4246fdcb02c3172824cd649d9ad54c51f7fb49ea67c",
-        "dc44d4f4d36b07ab5fc04016cbe53548e5a7778671c58a43cb379fd00c06719b8073141fc22191ffc3db5f8b8983ae8341fa37f18c1c969664393aa5ceade64e",
-        "3e122edaf37398231cfaca4c7c216c9d66d5b899ec1d7ac617c40c7261906a45fc01617a021e5da3bd8d4182695b5cb785a28237cbb167590e34718e56d8aab8"
-    };
-
-    // test vectors from  http://www.di-mgt.com.au/hmac_sha3_testvectors.html
-    final static byte[][] macKeys =
-    {
-        Hex.decode("0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b"),
-        Hex.decode("4a656665"),
-        Hex.decode("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"),
-        Hex.decode("0102030405060708090a0b0c0d0e0f10111213141516171819"),
-        Hex.decode("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" +
-                   "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" +
-                   "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" +
-                   "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" +
-                   "aaaaaa"),
-        Hex.decode("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" +
-                   "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" +
-                   "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" +
-                   "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" +
-                   "aaaaaa"),
-        Hex.decode("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" +
-                   "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" +
-                   "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" +
-                   "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" +
-                   "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa")
-    };
-
-    final static String[] macData =
-    {
-        "4869205468657265",
-        "7768617420646f2079612077616e7420666f72206e6f7468696e673f",
-        "dddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd" +
-            "dddddddddddddddddddddddddddddddddddd",
-        "cdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcd" +
-            "cdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcd",
-        "54657374205573696e67204c6172676572205468616e20426c6f636b2d53697a" +
-            "65204b6579202d2048617368204b6579204669727374",
-        "5468697320697320612074657374207573696e672061206c6172676572207468" +
-            "616e20626c6f636b2d73697a65206b657920616e642061206c61726765722074" +
-            "68616e20626c6f636b2d73697a6520646174612e20546865206b6579206e6565" +
-            "647320746f20626520686173686564206265666f7265206265696e6720757365" +
-            "642062792074686520484d414320616c676f726974686d2e",
-        "5468697320697320612074657374207573696e672061206c6172676572207468" +
-            "616e20626c6f636b2d73697a65206b657920616e642061206c61726765722074" +
-            "68616e20626c6f636b2d73697a6520646174612e20546865206b6579206e6565" +
-            "647320746f20626520686173686564206265666f7265206265696e6720757365\n" +
-            "642062792074686520484d414320616c676f726974686d2e"
-    };
-
-    final static String[] mac224 =
-    {
-        "b73d595a2ba9af815e9f2b4e53e78581ebd34a80b3bbaac4e702c4cc",
-        "e824fec96c074f22f99235bb942da1982664ab692ca8501053cbd414",
-        "770df38c99d6e2bacd68056dcfe07d4c89ae20b2686a6185e1faa449",
-        "305a8f2dfb94bad28861a03cbc4d590febe775c58cb4961c28428a0b",
-        "e7a52dfa45f95a217c100066b239aa8ad519be9b35d667268b1b57ff",
-        "ba13009405a929f398b348885caa5419191bb948ada32194afc84104",
-        "92649468be236c3c72c189909c063b13f994be05749dc91310db639e"
-    };
-
-    final static String[] mac256 =
-    {
-        "9663d10c73ee294054dc9faf95647cb99731d12210ff7075fb3d3395abfb9821",
-        "aa9aed448c7abc8b5e326ffa6a01cdedf7b4b831881468c044ba8dd4566369a1",
-        "95f43e50f8df80a21977d51a8db3ba572dcd71db24687e6f86f47c1139b26260",
-        "6331ba9b4af5804a68725b3663eb74814494b63c6093e35fb320a85d507936fd",
-        "b4d0cdee7ec2ba81a88b86918958312300a15622377929a054a9ce3ae1fac2b6",
-        "1fdc8cb4e27d07c10d897dec39c217792a6e64fa9c63a77ce42ad106ef284e02",
-        "fdaa10a0299aecff9bb411cf2d7748a4022e4a26be3fb5b11b33d8c2b7ef5484"
-    };
-
-    final static String[] mac384 =
-    {
-        "892dfdf5d51e4679bf320cd16d4c9dc6f749744608e003add7fba894acff87361efa4e5799be06b6461f43b60ae97048",
-        "5af5c9a77a23a6a93d80649e562ab77f4f3552e3c5caffd93bdf8b3cfc6920e3023fc26775d9df1f3c94613146ad2c9d",
-        "4243c29f2201992ff96441e3b91ff81d8c601d706fbc83252684a4bc51101ca9b2c06ddd03677303c502ac5331752a3c",
-        "b730724d3d4090cda1be799f63acbbe389fef7792fc18676fa5453aab398664650ed029c3498bbe8056f06c658e1e693",
-        "d62482ef601d7847439b55236e9679388ffcd53c62cd126f39be6ea63de762e26cd5974cb9a8de401b786b5555040f6f",
-        "4860ea191ac34994cf88957afe5a836ef36e4cc1a66d75bf77defb7576122d75f60660e4cf731c6effac06402787e2b9",
-        "fe9357e3cfa538eb0373a2ce8f1e26ad6590afdaf266f1300522e8896d27e73f654d0631c8fa598d4bb82af6b744f4f5"
-    };
-
-    final static String[] mac512 =
-    {
-        "8852c63be8cfc21541a4ee5e5a9a852fc2f7a9adec2ff3a13718ab4ed81aaea0b87b7eb397323548e261a64e7fc75198f6663a11b22cd957f7c8ec858a1c7755",
-        "c2962e5bbe1238007852f79d814dbbecd4682e6f097d37a363587c03bfa2eb0859d8d9c701e04cececfd3dd7bfd438f20b8b648e01bf8c11d26824b96cebbdcb",
-        "eb0ed9580e0ec11fc66cbb646b1be904eaff6da4556d9334f65ee4b2c85739157bae9027c51505e49d1bb81cfa55e6822db55262d5a252c088a29a5e95b84a66",
-        "b46193bb59f4f696bf702597616da91e2a4558a593f4b015e69141ba81e1e50ea580834c2b87f87baa25a3a03bfc9bb389847f2dc820beae69d30c4bb75369cb",
-        "d05888a6ebf8460423ea7bc85ea4ffda847b32df32291d2ce115fd187707325c7ce4f71880d91008084ce24a38795d20e6a28328a0f0712dc38253370da3ebb5",
-        "2c6b9748d35c4c8db0b4407dd2ed2381f133bdbd1dfaa69e30051eb6badfcca64299b88ae05fdbd3dd3dd7fe627e42e39e48b0fe8c7f1e85f2dbd52c2d753572",
-        "6adc502f14e27812402fc81a807b28bf8a53c87bea7a1df6256bf66f5de1a4cb741407ad15ab8abc136846057f881969fbb159c321c904bfb557b77afb7778c8"
-    };
-
-    final static KeyParameter truncKey = new KeyParameter(Hex.decode("0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c"));
-    final static byte[]       truncData = Hex.decode("546573742057697468205472756e636174696f6e");
-
-    final static byte[]       trunc224 = Hex.decode("f52bbcfd654264e7133085c5e69b72c3");
-    final static byte[]       trunc256 = Hex.decode("745e7e687f8335280d54202ef13cecc6");
-    final static byte[]       trunc384 = Hex.decode("fa9aea2bc1e181e47cbb8c3df243814d");
-    final static byte[]       trunc512 = Hex.decode("04c929fead434bba190dacfa554ce3f5");
-
-    final static byte[]       xtremeData = Hex.decode("61626364656667686263646566676869636465666768696a6465666768696a6b65666768696a6b6c666768696a6b6c6d6768696a6b6c6d6e68696a6b6c6d6e6f");
-
-    SHA3DigestTest()
-    {
-    }
-
-    public String getName()
-    {
-        return "SHA3";
-    }
-
-    private void testDigest(Digest digest, String[] expected)
-    {
-        byte[] hash = new byte[digest.getDigestSize()];
-
-        for (int i = 0; i != messages.length; i++)
-        {
-            if (messages.length != 0)
-            {
-                byte[] data = Hex.decode(messages[i]);
-
-                digest.update(data, 0, data.length);
-            }
-
-            digest.doFinal(hash, 0);
-
-            if (!Arrays.areEqual(Hex.decode(expected[i]), hash))
-            {
-                fail("sha3 mismatch on " + digest.getAlgorithmName() + " index " + i);
-            }
-        }
-
-        byte[] k64 = new byte[1024 * 64];
-
-        for (int i = 0; i != k64.length; i++)
-        {
-            k64[i] = (byte)'a';
-        }
-
-        digest.update(k64, 0, k64.length);
-
-        digest.doFinal(hash, 0);
-
-        if (!Arrays.areEqual(Hex.decode(expected[messages.length]), hash))
-        {
-            fail("sha3 mismatch on " + digest.getAlgorithmName() + " 64k a");
-        }
-
-        for (int i = 0; i != k64.length; i++)
-        {
-            digest.update((byte)'a');
-        }
-
-        digest.doFinal(hash, 0);
-
-        if (!Arrays.areEqual(Hex.decode(expected[messages.length]), hash))
-        {
-            fail("sha3 mismatch on " + digest.getAlgorithmName() + " 64k a single");
-        }
-
-
-        for (int i = 0; i != k64.length; i++)
-        {
-            k64[i] = (byte)('a' + (i % 26));
-        }
-
-        digest.update(k64, 0, k64.length);
-
-        digest.doFinal(hash, 0);
-
-        if (!Arrays.areEqual(Hex.decode(expected[messages.length + 1]), hash))
-        {
-            fail("sha3 mismatch on " + digest.getAlgorithmName() + " 64k alpha");
-        }
-
-        for (int i = 0; i != 64; i++)
-        {
-            digest.update(k64[i * 1024]);
-            digest.update(k64, i * 1024 + 1, 1023);
-        }
-
-        digest.doFinal(hash, 0);
-
-        if (!Arrays.areEqual(Hex.decode(expected[messages.length + 1]), hash))
-        {
-            fail("sha3 mismatch on " + digest.getAlgorithmName() + " 64k chunked alpha");
-        }
-
-        testDigestDoFinal(digest);
-        
-        //
-        // extremely long data test
-        //
-//        System.out.println("Starting very long");
-//        for (int i = 0; i != 16384; i++)
-//        {
-//            for (int j = 0; j != 1024; j++)
-//            {
-//                digest.update(xtremeData, 0, xtremeData.length);
-//            }
-//        }
-//
-//        digest.doFinal(hash, 0);
-//
-//        if (!Arrays.areEqual(Hex.decode(expected[messages.length + 2]), hash))
-//        {
-//            fail("sha3 mismatch on " + digest.getAlgorithmName() + " extreme data test");
-//        }
-//        System.out.println("Done");
-    }
-
-    private void testDigestDoFinal(Digest digest)
-    {
-        byte[] hash = new byte[digest.getDigestSize()];
-        digest.doFinal(hash, 0);
-
-        for (int i = 0; i <= digest.getDigestSize(); ++i)
-        {
-            byte[] cmp = new byte[2 * digest.getDigestSize()];
-            System.arraycopy(hash, 0, cmp, i, hash.length);
-
-            byte[] buf = new byte[2 * digest.getDigestSize()];
-            digest.doFinal(buf, i);
-
-            if (!Arrays.areEqual(cmp, buf))
-            {
-                fail("sha3 offset doFinal on " + digest.getAlgorithmName());
-            }
-        }
-    }
-
-    private void testMac(Digest digest, byte[][] keys, String[] data, String[] expected, byte[] truncExpected)
-    {
-        Mac mac = new HMac(digest);
-
-        for (int i = 0; i != keys.length; i++)
-        {
-            mac.init(new KeyParameter(keys[i]));
-
-            byte[] mData = Hex.decode(data[i]);
-
-            mac.update(mData, 0, mData.length);
-
-            byte[] macV = new byte[mac.getMacSize()];
-
-            mac.doFinal(macV, 0);
-
-            if (!Arrays.areEqual(Hex.decode(expected[i]), macV))
-            {
-                fail("sha3 HMAC mismatch on " + digest.getAlgorithmName());
-            }
-        }
-
-        mac = new HMac(digest);
-
-        mac.init(truncKey);
-
-        mac.update(truncData, 0, truncData.length);
-
-        byte[] macV = new byte[mac.getMacSize()];
-
-        mac.doFinal(macV, 0);
-
-        for (int i = 0; i != truncExpected.length; i++)
-        {
-            if (macV[i] != truncExpected[i])
-            {
-                fail("mismatch on truncated HMAC for " + digest.getAlgorithmName());
-            }
-        }
-    }
-
-    public void performTest()
-    {
-        testDigest(new SHA3Digest(), digests288);
-        testDigest(new SHA3Digest(224), digests224);
-        testDigest(new SHA3Digest(256), digests256);
-        testDigest(new SHA3Digest(384), digests384);
-        testDigest(new SHA3Digest(512), digests512);
-
-        testMac(new SHA3Digest(224), macKeys, macData, mac224, trunc224);
-        testMac(new SHA3Digest(256), macKeys, macData, mac256, trunc256);
-        testMac(new SHA3Digest(384), macKeys, macData, mac384, trunc384);
-        testMac(new SHA3Digest(512), macKeys, macData, mac512, trunc512);
-    }
-
-    protected Digest cloneDigest(Digest digest)
-    {
-        return new SHA3Digest((SHA3Digest)digest);
-    }
-    
-    public static void main(
-        String[]    args)
-    {
-        runTest(new SHA3DigestTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/SHA512DigestTest.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/SHA512DigestTest.java
deleted file mode 100644
index ffebaee..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/SHA512DigestTest.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.digests.SHA512Digest;
-
-/**
- * standard vector test for SHA-512 from FIPS Draft 180-2.
- *
- * Note, the first two vectors are _not_ from the draft, the last three are.
- */
-public class SHA512DigestTest
-    extends DigestTest
-{
-    private static String[] messages =
-    {
-        "",
-        "a",
-        "abc",
-        "abcdefghbcdefghicdefghijdefghijkefghijklfghijklmghijklmnhijklmnoijklmnopjklmnopqklmnopqrlmnopqrsmnopqrstnopqrstu"
-    };
-
-    private static String[] digests =
-    {
-        "cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e",
-        "1f40fc92da241694750979ee6cf582f2d5d7d28e18335de05abc54d0560e0f5302860c652bf08d560252aa5e74210546f369fbbbce8c12cfc7957b2652fe9a75",
-        "ddaf35a193617abacc417349ae20413112e6fa4e89a97ea20a9eeee64b55d39a2192992a274fc1a836ba3c23a3feebbd454d4423643ce80e2a9ac94fa54ca49f",
-        "8e959b75dae313da8cf4f72814fc143f8f7779c6eb9f7fa17299aeadb6889018501d289e4900f7e4331b99dec4b5433ac7d329eeb6dd26545e96e55b874be909"
-    };
-
-    // 1 million 'a'
-    static private String  million_a_digest = "e718483d0ce769644e2e42c7bc15b4638e1f98b13b2044285632a803afa973ebde0ff244877ea60a4cb0432ce577c31beb009c5c2c49aa2e4eadb217ad8cc09b";
-
-    SHA512DigestTest()
-    {
-        super(new SHA512Digest(), messages, digests);
-    }
-
-    public void performTest()
-    {
-        super.performTest();
-
-        millionATest(million_a_digest);
-    }
-
-    protected Digest cloneDigest(Digest digest)
-    {
-        return new SHA512Digest((SHA512Digest)digest);
-    }
-
-    protected Digest cloneDigest(byte[] encodedState)
-    {
-        return new SHA512Digest(encodedState);
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        runTest(new SHA512DigestTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/SHA512HMacTest.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/SHA512HMacTest.java
deleted file mode 100644
index ee163eb..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/SHA512HMacTest.java
+++ /dev/null
@@ -1,108 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import org.bouncycastle.crypto.digests.SHA512Digest;
-import org.bouncycastle.crypto.macs.HMac;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTestResult;
-import org.bouncycastle.util.test.Test;
-import org.bouncycastle.util.test.TestResult;
-
-/**
- * SHA512 HMac Test
- */
-public class SHA512HMacTest
-    implements Test
-{
-    final static String[] keys = {
-        "0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b",
-        "4a656665",
-        "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
-        "0102030405060708090a0b0c0d0e0f10111213141516171819",
-        "0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c",
-        "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
-        "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
-    };
-
-    final static String[] digests = {
-        "87aa7cdea5ef619d4ff0b4241a1d6cb02379f4e2ce4ec2787ad0b30545e17cdedaa833b7d6b8a702038b274eaea3f4e4be9d914eeb61f1702e696c203a126854",
-        "164b7a7bfcf819e2e395fbe73b56e0a387bd64222e831fd610270cd7ea2505549758bf75c05a994a6d034f65f8f0e6fdcaeab1a34d4a6b4b636e070a38bce737",
-        "fa73b0089d56a284efb0f0756c890be9b1b5dbdd8ee81a3655f83e33b2279d39bf3e848279a722c806b485a47e67c807b946a337bee8942674278859e13292fb",
-        "b0ba465637458c6990e5a8c5f61d4af7e576d97ff94b872de76f8050361ee3dba91ca5c11aa25eb4d679275cc5788063a5f19741120c4f2de2adebeb10a298dd",
-        "415fad6271580a531d4179bc891d87a650188707922a4fbb36663a1eb16da008711c5b50ddd0fc235084eb9d3364a1454fb2ef67cd1d29fe6773068ea266e96b",
-        "80b24263c7c1a3ebb71493c1dd7be8b49b46d1f41b4aeec1121b013783f8f3526b56d037e05f2598bd0fd2215d6a1e5295e64f73f63f0aec8b915a985d786598",
-        "e37b6a775dc87dbaa4dfa9f96e5e3ffddebd71f8867289865df5a32d20cdc944b6022cac3c4982b10d5eeb55c3e4de15134676fb6de0446065c97440fa8c6a58"
-    };
-
-    final static String[] messages = {
-        "Hi There",
-        "what do ya want for nothing?",
-        "0xdddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd",
-        "0xcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcdcd",
-        "Test With Truncation",
-        "Test Using Larger Than Block-Size Key - Hash Key First",
-        "This is a test using a larger than block-size key and a larger than block-size data. The key needs to be hashed before being used by the HMAC algorithm."
-    };
-
-    public String getName()
-    {
-        return "SHA512HMac";
-    }
-
-    public TestResult perform()
-    {
-        HMac hmac = new HMac(new SHA512Digest());
-        byte[] resBuf = new byte[hmac.getMacSize()];
-
-        for (int i = 0; i < messages.length; i++)
-        {
-            byte[] m = messages[i].getBytes();
-            if (messages[i].startsWith("0x"))
-            {
-                m = Hex.decode(messages[i].substring(2));
-            }
-            hmac.init(new KeyParameter(Hex.decode(keys[i])));
-            hmac.update(m, 0, m.length);
-            hmac.doFinal(resBuf, 0);
-
-            if (!Arrays.areEqual(resBuf, Hex.decode(digests[i])))
-            {
-                return new SimpleTestResult(false, getName() + ": Vector " + i + " failed got -" + new String(Hex.encode(resBuf)));
-            }
-        }
-
-        //
-        // test reset
-        //
-        int vector = 0; // vector used for test
-        byte[] m = messages[vector].getBytes();
-        if (messages[vector].startsWith("0x"))
-        {
-            m = Hex.decode(messages[vector].substring(2));
-        }
-        hmac.init(new KeyParameter(Hex.decode(keys[vector])));
-        hmac.update(m, 0, m.length);
-        hmac.doFinal(resBuf, 0);
-        hmac.reset();
-        hmac.update(m, 0, m.length);
-        hmac.doFinal(resBuf, 0);
-
-        if (!Arrays.areEqual(resBuf, Hex.decode(digests[vector])))
-        {
-            return new SimpleTestResult(false, getName() +
-                    "Reset with vector " + vector + " failed");
-        }
-
-        return new SimpleTestResult(true, getName() + ": Okay");
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        SHA512HMacTest    test = new SHA512HMacTest();
-        TestResult      result = test.perform();
-
-        System.out.println(result);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/SHA512t224DigestTest.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/SHA512t224DigestTest.java
deleted file mode 100644
index 0c7bc95..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/SHA512t224DigestTest.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.digests.SHA512tDigest;
-
-/**
- * standard vector test for SHA-512/224 from FIPS 180-4.
- *
- * Note, only the last 2 message entries are FIPS originated..
- */
-public class SHA512t224DigestTest
-    extends DigestTest
-{
-    private static String[] messages =
-    {
-        "",
-        "a",
-        "abc",
-        "abcdefghbcdefghicdefghijdefghijkefghijklfghijklmghijklmnhijklmnoijklmnopjklmnopqklmnopqrlmnopqrsmnopqrstnopqrstu"
-    };
-
-    private static String[] digests =
-    {
-        "6ed0dd02806fa89e25de060c19d3ac86cabb87d6a0ddd05c333b84f4",
-        "d5cdb9ccc769a5121d4175f2bfdd13d6310e0d3d361ea75d82108327",
-        "4634270F707B6A54DAAE7530460842E20E37ED265CEEE9A43E8924AA",
-        "23FEC5BB94D60B23308192640B0C453335D664734FE40E7268674AF9"
-    };
-
-    // 1 million 'a'
-    static private String  million_a_digest = "37ab331d76f0d36de422bd0edeb22a28accd487b7a8453ae965dd287";
-
-    SHA512t224DigestTest()
-    {
-        super(new SHA512tDigest(224), messages, digests);
-    }
-
-    public void performTest()
-    {
-        super.performTest();
-
-        millionATest(million_a_digest);
-    }
-
-    protected Digest cloneDigest(Digest digest)
-    {
-        return new SHA512tDigest((SHA512tDigest)digest);
-    }
-
-    protected Digest cloneDigest(byte[] encodedState)
-    {
-        return new SHA512tDigest(encodedState);
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        runTest(new SHA512t224DigestTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/SHA512t256DigestTest.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/SHA512t256DigestTest.java
deleted file mode 100644
index db019ae..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/SHA512t256DigestTest.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.digests.SHA512tDigest;
-
-/**
- * standard vector test for SHA-512/256 from FIPS 180-4.
- *
- * Note, only the last 2 message entries are FIPS originated..
- */
-public class SHA512t256DigestTest
-    extends DigestTest
-{
-    private static String[] messages =
-    {
-        "",
-        "a",
-        "abc",
-        "abcdefghbcdefghicdefghijdefghijkefghijklfghijklmghijklmnhijklmnoijklmnopjklmnopqklmnopqrlmnopqrsmnopqrstnopqrstu"
-    };
-
-    private static String[] digests =
-    {
-        "c672b8d1ef56ed28ab87c3622c5114069bdd3ad7b8f9737498d0c01ecef0967a",
-        "455e518824bc0601f9fb858ff5c37d417d67c2f8e0df2babe4808858aea830f8",
-        "53048E2681941EF99B2E29B76B4C7DABE4C2D0C634FC6D46E0E2F13107E7AF23",
-        "3928E184FB8690F840DA3988121D31BE65CB9D3EF83EE6146FEAC861E19B563A"
-    };
-
-    // 1 million 'a'
-    static private String  million_a_digest = "9a59a052930187a97038cae692f30708aa6491923ef5194394dc68d56c74fb21";
-
-    SHA512t256DigestTest()
-    {
-        super(new SHA512tDigest(256), messages, digests);
-    }
-
-    public void performTest()
-    {
-        super.performTest();
-
-        millionATest(million_a_digest);
-    }
-
-    protected Digest cloneDigest(Digest digest)
-    {
-        return new SHA512tDigest((SHA512tDigest)digest);
-    }
-
-    protected Digest cloneDigest(byte[] encodedState)
-    {
-        return new SHA512tDigest(encodedState);
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        runTest(new SHA512t256DigestTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/SM3DigestTest.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/SM3DigestTest.java
deleted file mode 100644
index 2d418cb..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/SM3DigestTest.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.digests.SM3Digest;
-
-/**
- * standard vector test for SM3 digest from chinese specification
- */
-public class SM3DigestTest
-    extends DigestTest
-{
-    private static String[] messages = {
-        // Standard test vectors
-        "abc",
-        "abcdabcdabcdabcdabcdabcdabcdabcdabcdabcdabcdabcdabcdabcdabcdabcd",
-        // Non-standard test vectors
-        "",
-        "a",
-        "abcdefghijklmnopqrstuvwxyz",
-    };
-
-    private static String[] digests = {
-        // Standard test vectors
-        "66c7f0f462eeedd9d1f2d46bdc10e4e24167c4875cf2f7a2297da02b8f4ba8e0",
-        "debe9ff92275b8a138604889c18e5a4d6fdb70e5387e5765293dcba39c0c5732",
-        // Non-standard test vectors
-        "1ab21d8355cfa17f8e61194831e81a8f22bec8c728fefb747ed035eb5082aa2b",
-        "623476ac18f65a2909e43c7fec61b49c7e764a91a18ccb82f1917a29c86c5e88",
-        "b80fe97a4da24afc277564f66a359ef440462ad28dcc6d63adb24d5c20a61595",
-    };
-
-    final static String sixtyFourKdigest = "97049bdc8f0736bc7300eafa9980aeb9cf00f24f7ec3a8f1f8884954d7655c1d";
-    final static String million_a_digest = "c8aaf89429554029e231941a2acc0ad61ff2a5acd8fadd25847a3a732b3b02c3";
-
-    SM3DigestTest()
-    {
-        super(new SM3Digest(), messages, digests);
-    }
-
-    public void performTest()
-    {
-        super.performTest();
-
-        sixtyFourKTest(sixtyFourKdigest);
-        millionATest(million_a_digest);
-    }
-
-    protected Digest cloneDigest(Digest digest)
-    {
-        return new SM3Digest((SM3Digest)digest);
-    }
-
-    public static void main(String[] args)
-    {
-        runTest(new SM3DigestTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/SRP6Test.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/SRP6Test.java
deleted file mode 100644
index 2409faf..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/SRP6Test.java
+++ /dev/null
@@ -1,267 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import java.math.BigInteger;
-import java.security.SecureRandom;
-
-import org.bouncycastle.crypto.CryptoException;
-import org.bouncycastle.crypto.agreement.srp.SRP6Client;
-import org.bouncycastle.crypto.agreement.srp.SRP6Server;
-import org.bouncycastle.crypto.agreement.srp.SRP6StandardGroups;
-import org.bouncycastle.crypto.agreement.srp.SRP6Util;
-import org.bouncycastle.crypto.agreement.srp.SRP6VerifierGenerator;
-import org.bouncycastle.crypto.digests.SHA1Digest;
-import org.bouncycastle.crypto.digests.SHA256Digest;
-import org.bouncycastle.crypto.generators.DHParametersGenerator;
-import org.bouncycastle.crypto.params.DHParameters;
-import org.bouncycastle.crypto.params.SRP6GroupParameters;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-
-public class SRP6Test extends SimpleTest
-{
-    private static final BigInteger ZERO = BigInteger.valueOf(0);
-
-    private static BigInteger fromHex(String hex)
-    {
-        return new BigInteger(1, Hex.decode(hex));
-    }
-
-    private final SecureRandom random = new SecureRandom();
-
-    public String getName()
-    {
-        return "SRP6";
-    }
-
-    public void performTest() throws Exception
-    {
-        rfc5054AppendixBTestVectors();
-
-        testMutualVerification(SRP6StandardGroups.rfc5054_1024);
-        testClientCatchesBadB(SRP6StandardGroups.rfc5054_1024);
-        testServerCatchesBadA(SRP6StandardGroups.rfc5054_1024);
-
-        testWithRandomParams(256);
-        testWithRandomParams(384);
-        testWithRandomParams(512);
-    }
-
-    private void rfc5054AppendixBTestVectors() throws Exception
-    {
-        byte[] I = "alice".getBytes("UTF8");
-        byte[] P = "password123".getBytes("UTF8");
-        byte[] s = Hex.decode("BEB25379D1A8581EB5A727673A2441EE");
-        BigInteger N = SRP6StandardGroups.rfc5054_1024.getN();
-        BigInteger g = SRP6StandardGroups.rfc5054_1024.getG();
-        BigInteger a = fromHex("60975527035CF2AD1989806F0407210BC81EDC04E2762A56AFD529DDDA2D4393");
-        BigInteger b = fromHex("E487CB59D31AC550471E81F00F6928E01DDA08E974A004F49E61F5D105284D20");
-
-        BigInteger expect_k = fromHex("7556AA045AEF2CDD07ABAF0F665C3E818913186F");
-        BigInteger expect_x = fromHex("94B7555AABE9127CC58CCF4993DB6CF84D16C124");
-        BigInteger expect_v = fromHex("7E273DE8696FFC4F4E337D05B4B375BEB0DDE1569E8FA00A9886D812"
-            + "9BADA1F1822223CA1A605B530E379BA4729FDC59F105B4787E5186F5"
-            + "C671085A1447B52A48CF1970B4FB6F8400BBF4CEBFBB168152E08AB5"
-            + "EA53D15C1AFF87B2B9DA6E04E058AD51CC72BFC9033B564E26480D78"
-            + "E955A5E29E7AB245DB2BE315E2099AFB");
-        BigInteger expect_A = fromHex("61D5E490F6F1B79547B0704C436F523DD0E560F0C64115BB72557EC4"
-            + "4352E8903211C04692272D8B2D1A5358A2CF1B6E0BFCF99F921530EC"
-            + "8E39356179EAE45E42BA92AEACED825171E1E8B9AF6D9C03E1327F44"
-            + "BE087EF06530E69F66615261EEF54073CA11CF5858F0EDFDFE15EFEA"
-            + "B349EF5D76988A3672FAC47B0769447B");
-        BigInteger expect_B = fromHex("BD0C61512C692C0CB6D041FA01BB152D4916A1E77AF46AE105393011"
-            + "BAF38964DC46A0670DD125B95A981652236F99D9B681CBF87837EC99"
-            + "6C6DA04453728610D0C6DDB58B318885D7D82C7F8DEB75CE7BD4FBAA"
-            + "37089E6F9C6059F388838E7A00030B331EB76840910440B1B27AAEAE"
-            + "EB4012B7D7665238A8E3FB004B117B58");
-        BigInteger expect_u = fromHex("CE38B9593487DA98554ED47D70A7AE5F462EF019");
-        BigInteger expect_S = fromHex("B0DC82BABCF30674AE450C0287745E7990A3381F63B387AAF271A10D"
-            + "233861E359B48220F7C4693C9AE12B0A6F67809F0876E2D013800D6C"
-            + "41BB59B6D5979B5C00A172B4A2A5903A0BDCAF8A709585EB2AFAFA8F"
-            + "3499B200210DCC1F10EB33943CD67FC88A2F39A4BE5BEC4EC0A3212D"
-            + "C346D7E474B29EDE8A469FFECA686E5A");
-
-        BigInteger k = SRP6Util.calculateK(new SHA1Digest(), N, g);
-        if (!k.equals(expect_k))
-        {
-            fail("wrong value of 'k'");
-        }
-
-        BigInteger x = SRP6Util.calculateX(new SHA1Digest(), N, s, I, P);
-        if (!x.equals(expect_x))
-        {
-            fail("wrong value of 'x'");
-        }
-
-        SRP6VerifierGenerator gen = new SRP6VerifierGenerator();
-        gen.init(N, g, new SHA1Digest());
-        BigInteger v = gen.generateVerifier(s, I, P);
-        if (!v.equals(expect_v))
-        {
-            fail("wrong value of 'v'");
-        }
-
-        final BigInteger aVal = a;
-        SRP6Client client = new SRP6Client()
-        {
-            protected BigInteger selectPrivateValue()
-            {
-                return aVal;
-            }
-        };
-        client.init(N, g, new SHA1Digest(), random);
-
-        BigInteger A = client.generateClientCredentials(s, I, P);
-        if (!A.equals(expect_A))
-        {
-            fail("wrong value of 'A'");
-        }
-
-        final BigInteger bVal = b;
-        SRP6Server server = new SRP6Server()
-        {
-            protected BigInteger selectPrivateValue()
-            {
-                return bVal;
-            }
-        };
-        server.init(N, g, v, new SHA1Digest(), random);
-
-        BigInteger B = server.generateServerCredentials();
-        if (!B.equals(expect_B))
-        {
-            fail("wrong value of 'B'");
-        }
-
-        BigInteger u = SRP6Util.calculateU(new SHA1Digest(), N, A, B);
-        if (!u.equals(expect_u))
-        {
-            fail("wrong value of 'u'");
-        }
-
-        BigInteger clientS = client.calculateSecret(B);
-        if (!clientS.equals(expect_S))
-        {
-            fail("wrong value of 'S' (client)");
-        }
-
-        BigInteger serverS = server.calculateSecret(A);
-        if (!serverS.equals(expect_S))
-        {
-            fail("wrong value of 'S' (server)");
-        }
-    }
-
-    private void testWithRandomParams(int bits) throws CryptoException
-    {
-        DHParametersGenerator paramGen = new DHParametersGenerator();
-        paramGen.init(bits, 25, random);
-        DHParameters parameters = paramGen.generateParameters();
-
-        testMutualVerification(new SRP6GroupParameters(parameters.getP(), parameters.getG()));
-    }
-
-    private void testMutualVerification(SRP6GroupParameters group) throws CryptoException
-    {
-        byte[] I = "username".getBytes();
-        byte[] P = "password".getBytes();
-        byte[] s = new byte[16];
-        random.nextBytes(s);
-
-        SRP6VerifierGenerator gen = new SRP6VerifierGenerator();
-        gen.init(group, new SHA256Digest());
-        BigInteger v = gen.generateVerifier(s, I, P);
-
-        SRP6Client client = new SRP6Client();
-        client.init(group, new SHA256Digest(), random);
-
-        SRP6Server server = new SRP6Server();
-        server.init(group, v, new SHA256Digest(), random);
-
-        BigInteger A = client.generateClientCredentials(s, I, P);
-        BigInteger B = server.generateServerCredentials();
-
-        BigInteger clientS = client.calculateSecret(B);
-        BigInteger serverS = server.calculateSecret(A);
-
-        if (!clientS.equals(serverS))
-        {
-            fail("SRP agreement failed - client/server calculated different secrets");
-        }
-    }
-
-    private void testClientCatchesBadB(SRP6GroupParameters group)
-    {
-        byte[] I = "username".getBytes();
-        byte[] P = "password".getBytes();
-        byte[] s = new byte[16];
-        random.nextBytes(s);
-
-        SRP6Client client = new SRP6Client();
-        client.init(group, new SHA256Digest(), random);
-
-        client.generateClientCredentials(s, I, P);
-
-        try
-        {
-            client.calculateSecret(ZERO);
-            fail("Client failed to detect invalid value for 'B'");
-        }
-        catch (CryptoException e)
-        {
-            // Expected
-        }
-
-        try
-        {
-            client.calculateSecret(group.getN());
-            fail("Client failed to detect invalid value for 'B'");
-        }
-        catch (CryptoException e)
-        {
-            // Expected
-        }
-    }
-
-    private void testServerCatchesBadA(SRP6GroupParameters group)
-    {
-        byte[] I = "username".getBytes();
-        byte[] P = "password".getBytes();
-        byte[] s = new byte[16];
-        random.nextBytes(s);
-
-        SRP6VerifierGenerator gen = new SRP6VerifierGenerator();
-        gen.init(group, new SHA256Digest());
-        BigInteger v = gen.generateVerifier(s, I, P);
-
-        SRP6Server server = new SRP6Server();
-        server.init(group, v, new SHA256Digest(), random);
-
-        server.generateServerCredentials();
-
-        try
-        {
-            server.calculateSecret(ZERO);
-            fail("Client failed to detect invalid value for 'A'");
-        }
-        catch (CryptoException e)
-        {
-            // Expected
-        }
-
-        try
-        {
-            server.calculateSecret(group.getN());
-            fail("Client failed to detect invalid value for 'A'");
-        }
-        catch (CryptoException e)
-        {
-            // Expected
-        }
-    }
-
-    public static void main(String[] args)
-    {
-        runTest(new SRP6Test());
-    }
-}
-
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/Salsa20Test.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/Salsa20Test.java
deleted file mode 100644
index 2b73818..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/Salsa20Test.java
+++ /dev/null
@@ -1,400 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import java.security.SecureRandom;
-
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.StreamCipher;
-import org.bouncycastle.crypto.engines.Salsa20Engine;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.crypto.params.ParametersWithIV;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-
-/**
- * Salsa20 Test
- */
-public class Salsa20Test
-    extends SimpleTest
-{
-    byte[] zeroes = Hex.decode(
-                    "00000000000000000000000000000000"
-                  + "00000000000000000000000000000000"
-                  + "00000000000000000000000000000000"
-                  + "00000000000000000000000000000000");
-
-    String set1v0_0 = "4DFA5E481DA23EA09A31022050859936"
-        + "DA52FCEE218005164F267CB65F5CFD7F"
-        + "2B4F97E0FF16924A52DF269515110A07"
-        + "F9E460BC65EF95DA58F740B7D1DBB0AA";
-
-    String set1v0_192 = "DA9C1581F429E0A00F7D67E23B730676"
-        + "783B262E8EB43A25F55FB90B3E753AEF"
-        + "8C6713EC66C51881111593CCB3E8CB8F"
-        + "8DE124080501EEEB389C4BCB6977CF95";
-
-    String set1v0_256 = "7D5789631EB4554400E1E025935DFA7B"
-        + "3E9039D61BDC58A8697D36815BF1985C"
-        + "EFDF7AE112E5BB81E37ECF0616CE7147"
-        + "FC08A93A367E08631F23C03B00A8DA2F";
-
-    String set1v0_448 = "B375703739DACED4DD4059FD71C3C47F"
-        + "C2F9939670FAD4A46066ADCC6A564578"
-        + "3308B90FFB72BE04A6B147CBE38CC0C3"
-        + "B9267C296A92A7C69873F9F263BE9703";
-
-    String set1v9_0 = "0471076057830FB99202291177FBFE5D"
-        + "38C888944DF8917CAB82788B91B53D1C"
-        + "FB06D07A304B18BB763F888A61BB6B75"
-        + "5CD58BEC9C4CFB7569CB91862E79C459";
-
-    String set1v9_192 = "D1D7E97556426E6CFC21312AE3811425"
-        + "9E5A6FB10DACBD88E4354B0472556935"
-        + "2B6DA5ACAFACD5E266F9575C2ED8E6F2"
-        + "EFE4B4D36114C3A623DD49F4794F865B";
-
-    String set1v9_256 = "AF06FAA82C73291231E1BD916A773DE1"
-        + "52FD2126C40A10C3A6EB40F22834B8CC"
-        + "68BD5C6DBD7FC1EC8F34165C517C0B63"
-        + "9DB0C60506D3606906B8463AA0D0EC2F";
-
-    String set1v9_448 = "AB3216F1216379EFD5EC589510B8FD35"
-        + "014D0AA0B613040BAE63ECAB90A9AF79"
-        + "661F8DA2F853A5204B0F8E72E9D9EB4D"
-        + "BA5A4690E73A4D25F61EE7295215140C";
-
-    String set6v0_0 = "F5FAD53F79F9DF58C4AEA0D0ED9A9601"
-        + "F278112CA7180D565B420A48019670EA"
-        + "F24CE493A86263F677B46ACE1924773D"
-        + "2BB25571E1AA8593758FC382B1280B71";
-
-    String set6v0_65472 = "B70C50139C63332EF6E77AC54338A407"
-        + "9B82BEC9F9A403DFEA821B83F7860791"
-        + "650EF1B2489D0590B1DE772EEDA4E3BC"
-        + "D60FA7CE9CD623D9D2FD5758B8653E70";
-
-    String set6v0_65536 = "81582C65D7562B80AEC2F1A673A9D01C"
-        + "9F892A23D4919F6AB47B9154E08E699B"
-        + "4117D7C666477B60F8391481682F5D95"
-        + "D96623DBC489D88DAA6956B9F0646B6E";
-
-    String set6v1_0 = "3944F6DC9F85B128083879FDF190F7DE"
-        + "E4053A07BC09896D51D0690BD4DA4AC1"
-        + "062F1E47D3D0716F80A9B4D85E6D6085"
-        + "EE06947601C85F1A27A2F76E45A6AA87";
-
-    String set6v1_65472 = "36E03B4B54B0B2E04D069E690082C8C5"
-        + "92DF56E633F5D8C7682A02A65ECD1371"
-        + "8CA4352AACCB0DA20ED6BBBA62E177F2"
-        + "10E3560E63BB822C4158CAA806A88C82";
-
-    String set6v1_65536 = "1B779E7A917C8C26039FFB23CF0EF8E0"
-        + "8A1A13B43ACDD9402CF5DF38501098DF"
-        + "C945A6CC69A6A17367BC03431A86B3ED"
-        + "04B0245B56379BF997E25800AD837D7D";
-
-    // Salsa20/12
-    String salsa12_set1v0_0 = "FC207DBFC76C5E1774961E7A5AAD0906"
-            + "9B2225AC1CE0FE7A0CE77003E7E5BDF8"
-            + "B31AF821000813E6C56B8C1771D6EE70"
-            + "39B2FBD0A68E8AD70A3944B677937897";
-
-    String salsa12_set1v0_192 = "4B62A4881FA1AF9560586510D5527ED4"
-        + "8A51ECAFA4DECEEBBDDC10E9918D44AB"
-        + "26B10C0A31ED242F146C72940C6E9C37"
-        + "53F641DA84E9F68B4F9E76B6C48CA5AC";
-
-    String salsa12_set1v0_256 = "F52383D9DEFB20810325F7AEC9EADE34"
-        + "D9D883FEE37E05F74BF40875B2D0BE79"
-        + "ED8886E5BFF556CEA8D1D9E86B1F68A9"
-        + "64598C34F177F8163E271B8D2FEB5996";
-
-    String salsa12_set1v0_448 = "A52ED8C37014B10EC0AA8E05B5CEEE12"
-        + "3A1017557FB3B15C53E6C5EA8300BF74"
-        + "264A73B5315DC821AD2CAB0F3BB2F152"
-        + "BDAEA3AEE97BA04B8E72A7B40DCC6BA4";
-
-    // Salsa20/8
-    String salsa8_set1v0_0 = "A9C9F888AB552A2D1BBFF9F36BEBEB33"
-            + "7A8B4B107C75B63BAE26CB9A235BBA9D"
-            + "784F38BEFC3ADF4CD3E266687EA7B9F0"
-            + "9BA650AE81EAC6063AE31FF12218DDC5";
-    
-    String salsa8_set1v0_192 = "BB5B6BB2CC8B8A0222DCCC1753ED4AEB"
-            + "23377ACCBD5D4C0B69A8A03BB115EF71"
-            + "871BC10559080ACA7C68F0DEF32A80DD"
-            + "BAF497259BB76A3853A7183B51CC4B9F";
-    
-    String salsa8_set1v0_256 = "4436CDC0BE39559F5E5A6B79FBDB2CAE"
-            + "4782910F27FFC2391E05CFC78D601AD8"
-            + "CD7D87B074169361D997D1BED9729C0D"
-            + "EB23418E0646B7997C06AA84E7640CE3";
-    
-    String salsa8_set1v0_448 = "BEE85903BEA506B05FC04795836FAAAC"
-            + "7F93F785D473EB762576D96B4A65FFE4"
-            + "63B34AAE696777FC6351B67C3753B89B"
-            + "A6B197BD655D1D9CA86E067F4D770220";
-    
-
-    public String getName()
-    {
-        return "Salsa20";
-    }
-
-    public void performTest()
-    {
-        salsa20Test1(20, new ParametersWithIV(new KeyParameter(Hex.decode("80000000000000000000000000000000")), Hex.decode("0000000000000000")),
-                  set1v0_0, set1v0_192,  set1v0_256,  set1v0_448);
-        salsa20Test1(20, new ParametersWithIV(new KeyParameter(Hex.decode("00400000000000000000000000000000")), Hex.decode("0000000000000000")),
-                  set1v9_0, set1v9_192,  set1v9_256,  set1v9_448);
-        salsa20Test1(12, new ParametersWithIV(new KeyParameter(Hex.decode("80000000000000000000000000000000")), Hex.decode("0000000000000000")),
-                salsa12_set1v0_0, salsa12_set1v0_192,  salsa12_set1v0_256,  salsa12_set1v0_448);
-        salsa20Test1(8, new ParametersWithIV(new KeyParameter(Hex.decode("80000000000000000000000000000000")), Hex.decode("0000000000000000")),
-                salsa8_set1v0_0, salsa8_set1v0_192,  salsa8_set1v0_256,  salsa8_set1v0_448);
-        salsa20Test2(new ParametersWithIV(new KeyParameter(Hex.decode("0053A6F94C9FF24598EB3E91E4378ADD3083D6297CCF2275C81B6EC11467BA0D")), Hex.decode("0D74DB42A91077DE")),
-                  set6v0_0, set6v0_65472, set6v0_65536);
-        salsa20Test2(new ParametersWithIV(new KeyParameter(Hex.decode("0558ABFE51A4F74A9DF04396E93C8FE23588DB2E81D4277ACD2073C6196CBF12")), Hex.decode("167DE44BB21980E7")),
-                  set6v1_0, set6v1_65472, set6v1_65536);
-        reinitBug();
-        skipTest();
-    }
-
-    private void salsa20Test1(int rounds, CipherParameters params, String v0, String v192, String v256, String v448)
-    {
-        StreamCipher salsa = new Salsa20Engine(rounds);
-        byte[]       buf = new byte[64];
-
-        salsa.init(true, params);
-
-        for (int i = 0; i != 7; i++)
-        {
-            salsa.processBytes(zeroes, 0, 64, buf, 0);
-            switch (i)
-            {
-            case 0:
-                if (!areEqual(buf, Hex.decode(v0)))
-                {
-                    mismatch("v0/" + rounds, v0, buf);
-                }
-                break;
-            case 3:
-                if (!areEqual(buf, Hex.decode(v192)))
-                {
-                    mismatch("v192/" + rounds, v192, buf);
-                }
-                break;
-            case 4:
-                if (!areEqual(buf, Hex.decode(v256)))
-                {
-                    mismatch("v256/" + rounds, v256, buf);
-                }
-                break;
-            default:
-                // ignore
-            }
-        }
-
-        for (int i = 0; i != 64; i++)
-        {
-            buf[i] = salsa.returnByte(zeroes[i]);
-        }
-
-        if (!areEqual(buf, Hex.decode(v448)))
-        {
-            mismatch("v448", v448, buf);
-        }       
-    }
-
-    private void salsa20Test2(CipherParameters params, String v0, String v65472, String v65536)
-    {
-        StreamCipher salsa = new Salsa20Engine();
-        byte[]       buf = new byte[64];
-
-        salsa.init(true, params);
-
-        for (int i = 0; i != 1025; i++)
-        {
-            salsa.processBytes(zeroes, 0, 64, buf, 0);
-            switch (i)
-            {
-            case 0:
-                if (!areEqual(buf, Hex.decode(v0)))
-                {
-                    mismatch("v0", v0, buf);
-                }
-                break;
-            case 1023:
-                if (!areEqual(buf, Hex.decode(v65472)))
-                {
-                    mismatch("v65472", v65472, buf);
-                }
-                break;
-            case 1024:
-                if (!areEqual(buf, Hex.decode(v65536)))
-                {
-                    mismatch("v65536", v65536, buf);
-                }
-                break;
-            default:
-                // ignore
-            }
-        }
-    }
-
-    private void mismatch(String name, String expected, byte[] found)
-    {
-        fail("mismatch on " + name, expected, new String(Hex.encode(found)));
-    }
-
-
-    private void reinitBug()
-    {
-        KeyParameter key = new KeyParameter(Hex.decode("80000000000000000000000000000000"));
-        ParametersWithIV parameters = new ParametersWithIV(key, Hex.decode("0000000000000000"));
-
-        StreamCipher salsa = new Salsa20Engine();
-
-        salsa.init(true, parameters);
-
-        try
-        {
-            salsa.init(true, key);
-            fail("Salsa20 should throw exception if no IV in Init");
-        }
-        catch (IllegalArgumentException e)
-        {
-        }
-    }
-
-    private boolean areEqual(byte[] a, int aOff, byte[] b, int bOff)
-    {
-        for (int i = bOff; i != b.length; i++)
-        {
-            if (a[aOff + i - bOff] != b[i])
-            {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    private void skipTest()
-    {
-        SecureRandom rand = new SecureRandom();
-        byte[]       plain = new byte[50000];
-        byte[]       cipher = new byte[50000];
-
-        rand.nextBytes(plain);
-
-        CipherParameters params = new ParametersWithIV(new KeyParameter(Hex.decode("0053A6F94C9FF24598EB3E91E4378ADD3083D6297CCF2275C81B6EC11467BA0D")), Hex.decode("0D74DB42A91077DE"));
-        Salsa20Engine    engine = new Salsa20Engine();
-
-        engine.init(true, params);
-
-        engine.processBytes(plain, 0, plain.length, cipher, 0);
-
-        byte[]      fragment = new byte[20];
-
-        engine.init(true, params);
-
-        engine.skip(10);
-
-        engine.processBytes(plain, 10, fragment.length, fragment, 0);
-
-        if (!areEqual(cipher, 10, fragment, 0))
-        {
-            fail("skip forward 10 failed");
-        }
-
-        engine.skip(1000);
-
-        engine.processBytes(plain, 1010 + fragment.length, fragment.length, fragment, 0);
-
-        if (!areEqual(cipher, 1010 + fragment.length, fragment, 0))
-        {
-            fail("skip forward 1000 failed");
-        }
-
-        engine.skip(-10);
-
-        engine.processBytes(plain, 1010 + 2 * fragment.length - 10, fragment.length, fragment, 0);
-
-        if (!areEqual(cipher, 1010 + 2 * fragment.length - 10, fragment, 0))
-        {
-            fail("skip back 10 failed");
-        }
-
-        engine.skip(-1000);
-
-        if (engine.getPosition() != 60)
-        {
-            fail("skip position incorrect - " + 60 + " got " + engine.getPosition());
-        }
-
-        engine.processBytes(plain, 60, fragment.length, fragment, 0);
-
-        if (!areEqual(cipher, 60, fragment, 0))
-        {
-            fail("skip back 1000 failed");
-        }
-
-        long pos = engine.seekTo(1010);
-        if (pos != 1010)
-        {
-            fail("position wrong");
-        }
-
-        engine.processBytes(plain, 1010, fragment.length, fragment, 0);
-
-        if (!areEqual(cipher, 1010, fragment, 0))
-        {
-            fail("seek to 1010 failed");
-        }
-
-        engine.reset();
-
-        for (int i = 0; i != 5000; i++)
-        {
-            engine.skip(i);
-
-            if (engine.getPosition() != i)
-            {
-                fail("skip forward at wrong position");
-            }
-
-            engine.processBytes(plain, i, fragment.length, fragment, 0);
-
-            if (!areEqual(cipher, i, fragment, 0))
-            {
-                fail("skip forward i failed: " + i);
-            }
-
-            if (engine.getPosition() != i + fragment.length)
-            {
-                fail("cipher at wrong position: " + engine.getPosition() + " [" + i + "]");
-            }
-
-            engine.skip(-fragment.length);
-
-            if (engine.getPosition() != i)
-            {
-                fail("skip back at wrong position");
-            }
-
-            engine.processBytes(plain, i, fragment.length, fragment, 0);
-
-            if (!areEqual(cipher, i, fragment, 0))
-            {
-                fail("skip back i failed: " + i);
-            }
-
-            engine.reset();
-        }
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        runTest(new Salsa20Test());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/SerpentTest.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/SerpentTest.java
deleted file mode 100644
index 3eac33a..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/SerpentTest.java
+++ /dev/null
@@ -1,103 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import org.bouncycastle.crypto.engines.SerpentEngine;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-
-/**
- */
-public class SerpentTest
-    extends CipherTest
-{
-    static SimpleTest[]  tests = 
-            {
-               new BlockCipherVectorTest(0, new SerpentEngine(),
-                       new KeyParameter(Hex.decode("0000000000000000000000000000000000000000000000000000000000000000")),
-                      "00000000000000000000000000000000", "8910494504181950f98dd998a82b6749"),
-                new BlockCipherVectorTest(1, new SerpentEngine(),
-                       new KeyParameter(Hex.decode("00000000000000000000000000000000")),
-                      "80000000000000000000000000000000", "10b5ffb720b8cb9002a1142b0ba2e94a"),
-                new BlockCipherVectorTest(2, new SerpentEngine(),
-                        new KeyParameter(Hex.decode("00000000000000000000000000000000")),
-                        "00000000008000000000000000000000", "4f057a42d8d5bd9746e434680ddcd5e5"),
-                new BlockCipherVectorTest(3, new SerpentEngine(),
-                        new KeyParameter(Hex.decode("00000000000000000000000000000000")),
-                        "00000000000000000000400000000000", "99407bf8582ef12550886ef5b6f169b9"),
-                new BlockCipherVectorTest(4, new SerpentEngine(),
-                        new KeyParameter(Hex.decode("000000000000000000000000000000000000000000000000")),
-                        "40000000000000000000000000000000", "d522a3b8d6d89d4d2a124fdd88f36896"),
-                new BlockCipherVectorTest(5, new SerpentEngine(),
-                        new KeyParameter(Hex.decode("000000000000000000000000000000000000000000000000")),
-                        "00000000000200000000000000000000", "189b8ec3470085b3da97e82ca8964e32"),
-                new BlockCipherVectorTest(6, new SerpentEngine(),
-                        new KeyParameter(Hex.decode("000000000000000000000000000000000000000000000000")),
-                        "00000000000000000000008000000000", "f77d868cf760b9143a89809510ccb099"),
-                new BlockCipherVectorTest(7, new SerpentEngine(),
-                        new KeyParameter(Hex.decode("0000000000000000000000000000000000000000000000000000000000000000")),
-                        "08000000000000000000000000000000", "d43b7b981b829342fce0e3ec6f5f4c82"),
-                new BlockCipherVectorTest(8, new SerpentEngine(),
-                        new KeyParameter(Hex.decode("0000000000000000000000000000000000000000000000000000000000000000")),
-                        "00000000000000000100000000000000", "0bf30e1a0c33ccf6d5293177886912a7"),
-                new BlockCipherVectorTest(9, new SerpentEngine(),
-                        new KeyParameter(Hex.decode("0000000000000000000000000000000000000000000000000000000000000000")),
-                        "00000000000000000000000000000001", "6a7f3b805d2ddcba49b89770ade5e507"),
-                new BlockCipherVectorTest(10, new SerpentEngine(),
-                        new KeyParameter(Hex.decode("80000000000000000000000000000000")),
-                        "00000000000000000000000000000000", "49afbfad9d5a34052cd8ffa5986bd2dd"),
-                new BlockCipherVectorTest(11, new SerpentEngine(),
-                        new KeyParameter(Hex.decode("000000000000000000000000004000000000000000000000")),
-                        "00000000000000000000000000000000", "ba8829b1de058c4b48615d851fc74f17"),
-                new BlockCipherVectorTest(12, new SerpentEngine(),
-                        new KeyParameter(Hex.decode("0000000000000000000000000000000000000000000000000000000100000000")),
-                        "00000000000000000000000000000000", "89f64377bf1e8a46c8247044e8056a98"),
-/*
-                new BlockCipherMonteCarloTest(13, 10000, new SerpentEngine(),
-                        new KeyParameter(Hex.decode("47f5f881daab9b67b43bd1342e339c19")),
-                        "7a4f7db38c52a8b711b778a38d203b6b", "003380e19f10065740394f48e2fe80b7"),
-*/
-                new BlockCipherMonteCarloTest(13, 100, new SerpentEngine(),
-                        new KeyParameter(Hex.decode("47f5f881daab9b67b43bd1342e339c19")),
-                        "7a4f7db38c52a8b711b778a38d203b6b", "4db75303d815c2f7cc6ca935d1c5a046"),
-/*
-                new BlockCipherMonteCarloTest(14, 10000, new SerpentEngine(),
-                        new KeyParameter(Hex.decode("31fba879ebc5e80df35e6fa33eaf92d6")),
-                        "70a05e12f74589009692a337f53ff614", "afb5425426906db26b70bdf842ac5400"),
-*/
-                new BlockCipherMonteCarloTest(14, 100, new SerpentEngine(),
-                        new KeyParameter(Hex.decode("31fba879ebc5e80df35e6fa33eaf92d6")),
-                        "70a05e12f74589009692a337f53ff614", "fc53a50f4d3bc9836001893d2f41742d"),
-/*
-                new BlockCipherMonteCarloTest(15, 10000, new SerpentEngine(),
-                        new KeyParameter(Hex.decode("bde6dd392307984695aee80e574f9977caae9aa78eda53e8")),
-                        "9cc523d034a93740a0aa4e2054bb34d8", "1949d506ada7de1f1344986e8ea049b2"),
-*/
-                new BlockCipherMonteCarloTest(15, 100, new SerpentEngine(),
-                        new KeyParameter(Hex.decode("bde6dd392307984695aee80e574f9977caae9aa78eda53e8")),
-                        "9cc523d034a93740a0aa4e2054bb34d8", "77117e6a9e80f40b2a36b7d755573c2d"),
-/*
-                new BlockCipherMonteCarloTest(16, 10000, new SerpentEngine(),
-                        new KeyParameter(Hex.decode("60f6f8ad4290699dc50921a1bbcca92da914e7d9cf01a9317c79c0af8f2487a1")),
-                        "ee1a61106fae2d381d686cbf854bab65", "e57f45559027cb1f2ed9603d814e1c34"),
-*/
-                new BlockCipherMonteCarloTest(16, 100, new SerpentEngine(),
-                        new KeyParameter(Hex.decode("60f6f8ad4290699dc50921a1bbcca92da914e7d9cf01a9317c79c0af8f2487a1")),
-                        "ee1a61106fae2d381d686cbf854bab65", "dcd7f13ea0dcdfd0139d1a42e2ffb84b")
-            };
-
-    SerpentTest()
-    {
-        super(tests, new SerpentEngine(), new KeyParameter(new byte[32]));
-    }
-
-    public String getName()
-    {
-        return "Serpent";
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        runTest(new SerpentTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/Shacal2Test.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/Shacal2Test.java
deleted file mode 100644
index bd7a815..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/Shacal2Test.java
+++ /dev/null
@@ -1,200 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import org.bouncycastle.crypto.BlockCipher;
-import org.bouncycastle.crypto.engines.Shacal2Engine;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-
-/**
- * Shacal2 tester - vectors from https://www.cosic.esat.kuleuven.be/nessie/testvectors/
- */
-public class Shacal2Test
-    extends CipherTest
-{
-    static SimpleTest[]  tests =
-            {
-                // set 8.0
-                new BlockCipherVectorTest(0, new Shacal2Engine(),
-                        new KeyParameter(Hex.decode("000102030405060708090A0B0C0D0E0F" +
-                            "101112131415161718191A1B1C1D1E1F" +
-                            "202122232425262728292A2B2C2D2E2F" +
-                            "303132333435363738393A3B3C3D3E3F")),
-                        "98BCC10405AB0BFC686BECECAAD01AC1" +
-                        "9B452511BCEB9CB094F905C51CA45430",
-                        "00112233445566778899AABBCCDDEEFF" +
-                        "102132435465768798A9BACBDCEDFE0F"),
-                // set 8.1
-                new BlockCipherVectorTest(1, new Shacal2Engine(),
-                        new KeyParameter(Hex.decode("2BD6459F82C5B300952C49104881FF48" +
-                            "2BD6459F82C5B300952C49104881FF48" +
-                            "2BD6459F82C5B300952C49104881FF48" +
-                            "2BD6459F82C5B300952C49104881FF48")),
-                            "481F122A75F2C4C3395140B5A951EBBA" +
-                            "06D96BDFD9D8FF4FB59CBD1287808D5A",
-                            "EA024714AD5C4D84EA024714AD5C4D84" +
-                            "EA024714AD5C4D84EA024714AD5C4D84"),
-                 // 7.255
-                new BlockCipherVectorTest(2, new Shacal2Engine(),
-                        new KeyParameter(Hex.decode("FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF" +
-                            "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF" +
-                            "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF" +
-                            "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF")),
-                            "94FEDFF2A0CFE3C983D340C88D73F8CF" +
-                            "4B79FC581797EC10B27D4DA1B51E1BC7",
-                            "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF" +
-                            "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"),
-                // 7.100
-                new BlockCipherVectorTest(3, new Shacal2Engine(),
-                        new KeyParameter(Hex.decode("64646464646464646464646464646464" +
-                            "64646464646464646464646464646464" +
-                            "64646464646464646464646464646464" +
-                            "64646464646464646464646464646464")),
-                            "6643CB84B3B3F126F5E50959EF4CE73D" +
-                            "B8500918ABE1056368DB06CA8C1C0D45",
-                            "64646464646464646464646464646464" +
-                            "64646464646464646464646464646464"),
-                // 7.50
-                new BlockCipherVectorTest(4, new Shacal2Engine(),
-                        new KeyParameter(Hex.decode("32323232323232323232323232323232" +
-                            "32323232323232323232323232323232" +
-                            "32323232323232323232323232323232" +
-                            "32323232323232323232323232323232")),
-                            "92E937285AB11FE3561542C43C918966" +
-                            "971DE722E9B9D38BD69EAC77899DCF81",
-                            "32323232323232323232323232323232" +
-                            "32323232323232323232323232323232"),
-                // 7.0
-                new BlockCipherVectorTest(5, new Shacal2Engine(),
-                        new KeyParameter(Hex.decode("00000000000000000000000000000000" +
-                            "00000000000000000000000000000000" +
-                            "00000000000000000000000000000000" +
-                            "00000000000000000000000000000000")),
-                            "F8C9259FA4F5D787B570AFA9219166A6" +
-                            "3636FC5C30AC289155D0CC4FFCB4B03D",
-                            "00000000000000000000000000000000" +
-                            "00000000000000000000000000000000"),
-                // 6.255
-                new BlockCipherVectorTest(6, new Shacal2Engine(),
-                        new KeyParameter(Hex.decode("00000000000000000000000000000000" +
-                            "00000000000000000000000000000000" +
-                            "00000000000000000000000000000000" +
-                            "00000000000000000000000000000000")),
-                            "F4E976DF0172CD961D4C8D466A12F676" +
-                            "5B9089046E747CD2A41BF43C18A8328E",
-                            "00000000000000000000000000000000" +
-                            "00000000000000000000000000000001"),
-                // 6.100
-                new BlockCipherVectorTest(7, new Shacal2Engine(),
-                    new KeyParameter(Hex.decode("00000000000000000000000000000000" +
-                        "00000000000000000000000000000000" +
-                        "00000000000000000000000000000000" +
-                        "00000000000000000000000000000000")),
-                        "3B929F0597E21D0076EC399D21B67713" +
-                        "B40E3AD559704219A26A3380212D5AD6",
-                        "00000000000000000000000008000000" +
-                        "00000000000000000000000000000000"),
-
-                // 6.0
-                new BlockCipherVectorTest(8, new Shacal2Engine(),
-                    new KeyParameter(Hex.decode("00000000000000000000000000000000" +
-                        "00000000000000000000000000000000" +
-                        "00000000000000000000000000000000" +
-                        "00000000000000000000000000000000")),
-                        "43A0DAD8307F19FBBCF166FE20BAC075" +
-                        "C56FF14042550E472094B042BE5963EE",
-                        "80000000000000000000000000000000" +
-                        "00000000000000000000000000000000"),
-            };
-
-    Shacal2Test()
-    {
-        super(tests, new Shacal2Engine(), new KeyParameter(new byte[16]));
-    }
-
-    public void performTest()
-        throws Exception
-    {
-        super.performTest();
-
-        // 1.0
-        iteratedTest(0,
-            Hex.decode("80000000000000000000000000000000" +
-            "00000000000000000000000000000000" +
-            "00000000000000000000000000000000" +
-            "00000000000000000000000000000000"),
-            Hex.decode("00000000000000000000000000000000" +
-            "00000000000000000000000000000000"),
-            Hex.decode("361AB6322FA9E7A7BB23818D839E01BD" +
-                "DAFDF47305426EDD297AEDB9F6202BAE"),
-            Hex.decode("226A582DE04383D0F3E7DE655DD848AC" +
-            "3E14CCFB4E76F7B7069879F67C4D5420"),
-            Hex.decode("B05D5A18C0712082CFF5BA9DBBCD7269" +
-            "114FC3DF83B42DAC306D95BBC473D839"));
-
-        // 1.100
-        iteratedTest(1,
-            Hex.decode("00000000000000000000000008000000" +
-                "00000000000000000000000000000000" +
-                "00000000000000000000000000000000" +
-                "00000000000000000000000000000000"),
-            Hex.decode("00000000000000000000000000000000" +
-            "00000000000000000000000000000000"),
-            Hex.decode("F703282E54592A5617E10618027BB67F" +
-                "639E43A90767150D8B7F5E83054B3CBD"),
-            Hex.decode("3B442692B579485B8BA2F92CE3B90DE7" +
-                "D2EA03D8B3C8E7BE7BF6415F798EED90"),
-            Hex.decode("331B9B65F06230380BBEECFBFBA94BCF" +
-                "92AF6341F815D7651F996144A5377263"));
-    }
-
-    private void iteratedTest(int index, byte[] key, byte[] plain, byte[] cipher, byte[] cipher100, byte[] cipher1000)
-    {
-        BlockCipher engine = new Shacal2Engine();
-
-        engine.init(true, new KeyParameter(key));
-
-        byte[] buf = new byte[plain.length];
-
-        System.arraycopy(plain, 0, buf, 0, plain.length);
-
-        engine.processBlock(buf, 0, buf, 0);
-
-        if (!Arrays.areEqual(cipher, buf))
-        {
-            fail(index + " single count failed");
-        }
-
-        for (int i = 1; i != 100; i++)
-        {
-            engine.processBlock(buf, 0, buf, 0);
-        }
-
-        if (!Arrays.areEqual(cipher100, buf))
-        {
-            fail(index + " 100 count failed");
-        }
-
-        for (int i = 100; i != 1000; i++)
-        {
-            engine.processBlock(buf, 0, buf, 0);
-        }
-
-        if (!Arrays.areEqual(cipher1000, buf))
-        {
-            fail(index + " 1000 count failed");
-        }
-    }
-
-    public String getName()
-    {
-        return "Shacal2";
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        runTest(new Shacal2Test());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/ShortenedDigestTest.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/ShortenedDigestTest.java
deleted file mode 100644
index 20510c9..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/ShortenedDigestTest.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Created on 6/05/2006
- *
- * To change the template for this generated file go to
- * Window&gt;Preferences&gt;Java&gt;Code Generation&gt;Code and Comments
- */
-package org.bouncycastle.crypto.test;
-
-import org.bouncycastle.crypto.ExtendedDigest;
-import org.bouncycastle.crypto.digests.SHA1Digest;
-import org.bouncycastle.crypto.digests.SHA512Digest;
-import org.bouncycastle.crypto.digests.ShortenedDigest;
-import org.bouncycastle.util.test.SimpleTest;
-
-public class ShortenedDigestTest
-    extends SimpleTest
-{
-    public void performTest()
-    {
-        ExtendedDigest  d = new SHA1Digest();
-        ShortenedDigest sd = new ShortenedDigest(new SHA1Digest(), 10);
-        
-        if (sd.getDigestSize() != 10)
-        {
-            fail("size check wrong for SHA-1");
-        }
-        
-        if (sd.getByteLength() != d.getByteLength())
-        {
-            fail("byte length check wrong for SHA-1");
-        }
-        
-        //
-        // check output fits
-        //
-        sd.doFinal(new byte[10], 0);
-        
-        d = new SHA512Digest();
-        sd = new ShortenedDigest(new SHA512Digest(), 20);
-        
-        if (sd.getDigestSize() != 20)
-        {
-            fail("size check wrong for SHA-512");
-        }
-        
-        if (sd.getByteLength() != d.getByteLength())
-        {
-            fail("byte length check wrong for SHA-512");
-        }
-        
-        //
-        // check output fits
-        //
-        sd.doFinal(new byte[20], 0);
-        
-        try
-        {
-            new ShortenedDigest(null, 20);
-            
-            fail("null parameter not caught");
-        }
-        catch (IllegalArgumentException e)
-        {
-            // expected
-        }
-        
-        try
-        {
-            new ShortenedDigest(new SHA1Digest(), 50);
-            
-            fail("short digest not caught");
-        }
-        catch (IllegalArgumentException e)
-        {
-            // expected
-        }
-    }
-    
-    public String getName()
-    {
-        return "ShortenedDigest";
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        runTest(new ShortenedDigestTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/SipHashTest.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/SipHashTest.java
deleted file mode 100644
index 1c55411..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/SipHashTest.java
+++ /dev/null
@@ -1,143 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import java.security.SecureRandom;
-
-import org.bouncycastle.crypto.macs.SipHash;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.util.Pack;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-
-/*
- * SipHash test values from "SipHash: a fast short-input PRF", by Jean-Philippe
- * Aumasson and Daniel J. Bernstein (https://131002.net/siphash/siphash.pdf), Appendix A.
- */
-public class SipHashTest
-    extends SimpleTest
-{
-    private static final int UPDATE_BYTES = 0;
-    private static final int UPDATE_FULL = 1;
-    private static final int UPDATE_MIX = 2;
-
-    public String getName()
-    {
-        return "SipHash";
-    }
-
-    public void performTest()
-        throws Exception
-    {
-        byte[] key = Hex.decode("000102030405060708090a0b0c0d0e0f");
-        byte[] input = Hex.decode("000102030405060708090a0b0c0d0e");
-
-        runMAC(key, input, UPDATE_BYTES);
-        runMAC(key, input, UPDATE_FULL);
-        runMAC(key, input, UPDATE_MIX);
-        
-        SecureRandom random = new SecureRandom();
-        for (int i = 0; i < 100; ++i)
-        {
-            randomTest(random);
-        }
-    }
-
-    private void runMAC(byte[] key, byte[] input, int updateType)
-        throws Exception
-    {
-        long expected = 0xa129ca6149be45e5L;
-
-        SipHash mac = new SipHash();
-        mac.init(new KeyParameter(key));
-
-        updateMAC(mac, input, updateType);
-
-        long result = mac.doFinal();
-        if (expected != result)
-        {
-            fail("Result does not match expected value for doFinal()");
-        }
-
-        byte[] expectedBytes = new byte[8];
-        Pack.longToLittleEndian(expected, expectedBytes, 0);
-
-        updateMAC(mac, input, updateType);
-
-        byte[] output = new byte[mac.getMacSize()];
-        int len = mac.doFinal(output, 0);
-        if (len != output.length)
-        {
-            fail("Result length does not equal getMacSize() for doFinal(byte[],int)");
-        }
-        if (!areEqual(expectedBytes, output))
-        {
-            fail("Result does not match expected value for doFinal(byte[],int)");
-        }
-    }
-
-    private void randomTest(SecureRandom random)
-    {
-        byte[] key = new byte[16];
-        random.nextBytes(key);
-
-        int length = 1 + random.nextInt(1024);
-        byte[] input = new byte[length];
-        random.nextBytes(input);
-
-        SipHash mac = new SipHash();
-        mac.init(new KeyParameter(key));
-
-        updateMAC(mac, input, UPDATE_BYTES);
-        long result1 = mac.doFinal();
-
-        updateMAC(mac, input, UPDATE_FULL);
-        long result2 = mac.doFinal();
-
-        updateMAC(mac, input, UPDATE_MIX);
-        long result3 = mac.doFinal();
-
-        if (result1 != result2 || result1 != result3)
-        {
-            fail("Inconsistent results in random test");
-        }
-    }
-
-    private void updateMAC(SipHash mac, byte[] input, int updateType)
-    {
-        switch (updateType)
-        {
-        case UPDATE_BYTES:
-        {
-            for (int i = 0; i < input.length; ++i)
-            {
-                mac.update(input[i]);
-            }
-            break;
-        }
-        case UPDATE_FULL:
-        {
-            mac.update(input, 0, input.length);
-            break;
-        }
-        case UPDATE_MIX:
-        {
-            int step = Math.max(1, input.length / 3);
-            int pos = 0;
-            while (pos < input.length)
-            {
-                mac.update(input[pos++]);
-                int len = Math.min(input.length - pos, step);
-                mac.update(input, pos, len);
-                pos += len;
-            }
-            break;
-        }
-        default:
-            throw new IllegalStateException();
-        }
-    }
-
-    public static void main(String[] args)
-    {
-        runTest(new SipHashTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/SkeinDigestTest.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/SkeinDigestTest.java
deleted file mode 100644
index 1a7dff6..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/SkeinDigestTest.java
+++ /dev/null
@@ -1,294 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import java.io.IOException;
-
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.digests.SkeinDigest;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.Memoable;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-
-public class SkeinDigestTest
-    extends SimpleTest
-{
-    private static class Case
-    {
-        private byte[] message;
-        private byte[] digest;
-        private int blockSize;
-        private int outputSize;
-
-        public Case(int blockSize, int outputSize, String message, String digest)
-        {
-            this.blockSize = blockSize;
-            this.outputSize = outputSize;
-            this.message = Hex.decode(message);
-            this.digest = Hex.decode(digest);
-        }
-
-        public int getOutputSize()
-        {
-            return outputSize;
-        }
-
-        public int getBlockSize()
-        {
-            return blockSize;
-        }
-
-        public byte[] getMessage()
-        {
-            return message;
-        }
-
-        public byte[] getDigest()
-        {
-            return digest;
-        }
-
-    }
-
-    // Test cases from skein_golden_kat.txt and skein_golden_kat_short.txt in Skein 1.3 NIST CD
-    private static final Case[] TEST_CASES = {
-        new Case(256, 256, "", "c8877087da56e072870daa843f176e9453115929094c3a40c463a196c29bf7ba"),
-        new Case(256, 256, "fb", "088eb23cc2bccfb8171aa64e966d4af937325167dfcd170700ffd21f8a4cbdac"),
-        new Case(256, 256, "fbd17c26b61a82e12e125f0d459b96c91ab4837dff22b39b78439430cdfc5dc8",
-            "5c3002ff57a627089ea2f97a5000d5678416389019e80e45a3bbcab118315d26"),
-        new Case(256, 256, "fbd17c26b61a82e12e125f0d459b96c91ab4837dff22b39b78439430cdfc5dc8"
-            + "78bb393a1a5f79bef30995a85a129233",
-            "640c894a4bba6574c83e920ddf7dd2982fc634881bbbcb9d774eae0a285e89ce"),
-        new Case(256, 160, "fbd17c26b61a82e12e125f0d459b96c91ab4837dff22b39b78439430cdfc5dc8"
-            + "78bb393a1a5f79bef30995a85a12923339ba8ab7d8fc6dc5fec6f4ed22c122bb"
-            + "e7eb61981892966de5cef576f71fc7a80d14dab2d0c03940b95b9fb3a727c66a"
-            + "6e1ff0dc311b9aa21a3054484802154c1826c2a27a0914152aeb76f1168d4410",
-            "0cd491b7715704c3a15a45a1ca8d93f8f646d3a1"),
-        new Case(256, 224, "fbd17c26b61a82e12e125f0d459b96c91ab4837dff22b39b78439430cdfc5dc8"
-            + "78bb393a1a5f79bef30995a85a12923339ba8ab7d8fc6dc5fec6f4ed22c122bb"
-            + "e7eb61981892966de5cef576f71fc7a80d14dab2d0c03940b95b9fb3a727c66a"
-            + "6e1ff0dc311b9aa21a3054484802154c1826c2a27a0914152aeb76f1168d4410",
-            "afd1e2d0f5b6cd4e1f8b3935fa2497d27ee97e72060adac099543487"),
-        new Case(256, 256, "fbd17c26b61a82e12e125f0d459b96c91ab4837dff22b39b78439430cdfc5dc8"
-            + "78bb393a1a5f79bef30995a85a12923339ba8ab7d8fc6dc5fec6f4ed22c122bb"
-            + "e7eb61981892966de5cef576f71fc7a80d14dab2d0c03940b95b9fb3a727c66a"
-            + "6e1ff0dc311b9aa21a3054484802154c1826c2a27a0914152aeb76f1168d4410",
-            "4de6fe2bfdaa3717a4261030ef0e044ced9225d066354610842a24a3eafd1dcf"),
-        new Case(256, 384, "fbd17c26b61a82e12e125f0d459b96c91ab4837dff22b39b78439430cdfc5dc8"
-            + "78bb393a1a5f79bef30995a85a12923339ba8ab7d8fc6dc5fec6f4ed22c122bb"
-            + "e7eb61981892966de5cef576f71fc7a80d14dab2d0c03940b95b9fb3a727c66a"
-            + "6e1ff0dc311b9aa21a3054484802154c1826c2a27a0914152aeb76f1168d4410",
-            "954620fb31e8b782a2794c6542827026fe069d715df04261629fcbe81d7d529b"
-                + "95ba021fa4239fb00afaa75f5fd8e78b"),
-        new Case(256, 512, "fbd17c26b61a82e12e125f0d459b96c91ab4837dff22b39b78439430cdfc5dc8"
-            + "78bb393a1a5f79bef30995a85a12923339ba8ab7d8fc6dc5fec6f4ed22c122bb"
-            + "e7eb61981892966de5cef576f71fc7a80d14dab2d0c03940b95b9fb3a727c66a"
-            + "6e1ff0dc311b9aa21a3054484802154c1826c2a27a0914152aeb76f1168d4410",
-            "51347e27c7eabba514959f899a6715ef6ad5cf01c23170590e6a8af399470bf9"
-                + "0ea7409960a708c1dbaa90e86389df254abc763639bb8cdf7fb663b29d9557c3"),
-        new Case(256, 1024, "fbd17c26b61a82e12e125f0d459b96c91ab4837dff22b39b78439430cdfc5dc8"
-            + "78bb393a1a5f79bef30995a85a12923339ba8ab7d8fc6dc5fec6f4ed22c122bb"
-            + "e7eb61981892966de5cef576f71fc7a80d14dab2d0c03940b95b9fb3a727c66a"
-            + "6e1ff0dc311b9aa21a3054484802154c1826c2a27a0914152aeb76f1168d4410",
-            "6c9b6facbaf116b538aa655e0be0168084aa9f1be445f7e06714585e5999a6c9"
-                + "84fffa9d41a316028692d4aad18f573fbf27cf78e84de26da1928382b023987d"
-                + "cfe002b6201ea33713c54a8a5d9eb346f0365e04330d2faaf7bc8aba92a5d7fb"
-                + "6345c6fb26750bce65ab2045c233627679ac6e9acb33602e26fe3526063ecc8b"),
-
-        new Case(512, 512, "", "bc5b4c50925519c290cc634277ae3d6257212395cba733bbad37a4af0fa06af4"
-            + "1fca7903d06564fea7a2d3730dbdb80c1f85562dfcc070334ea4d1d9e72cba7a"),
-        new Case(512, 512, "fb", "c49e03d50b4b2cc46bd3b7ef7014c8a45b016399fd1714467b7596c86de98240"
-            + "e35bf7f9772b7d65465cd4cffab14e6bc154c54fc67b8bc340abf08eff572b9e"),
-        new Case(512, 512, "fbd17c26b61a82e12e125f0d459b96c91ab4837dff22b39b78439430cdfc5dc8",
-            "abefb179d52f68f86941acbbe014cc67ec66ad78b7ba9508eb1400ee2cbdb06f"
-                + "9fe7c2a260a0272d0d80e8ef5e8737c0c6a5f1c02ceb00fb2746f664b85fcef5"),
-        new Case(512, 512, "fbd17c26b61a82e12e125f0d459b96c91ab4837dff22b39b78439430cdfc5dc8"
-            + "78bb393a1a5f79bef30995a85a129233",
-            "5c5b7956f9d973c0989aa40a71aa9c48a65af2757590e9a758343c7e23ea2df4"
-                + "057ce0b49f9514987feff97f648e1dd065926e2c371a0211ca977c213f14149f"),
-        new Case(512, 160, "fbd17c26b61a82e12e125f0d459b96c91ab4837dff22b39b78439430cdfc5dc8"
-            + "78bb393a1a5f79bef30995a85a12923339ba8ab7d8fc6dc5fec6f4ed22c122bb"
-            + "e7eb61981892966de5cef576f71fc7a80d14dab2d0c03940b95b9fb3a727c66a"
-            + "6e1ff0dc311b9aa21a3054484802154c1826c2a27a0914152aeb76f1168d4410",
-            "ef03079d61b57c6047e15fa2b35b46fa24279539"),
-        new Case(512, 224, "fbd17c26b61a82e12e125f0d459b96c91ab4837dff22b39b78439430cdfc5dc8"
-            + "78bb393a1a5f79bef30995a85a12923339ba8ab7d8fc6dc5fec6f4ed22c122bb"
-            + "e7eb61981892966de5cef576f71fc7a80d14dab2d0c03940b95b9fb3a727c66a"
-            + "6e1ff0dc311b9aa21a3054484802154c1826c2a27a0914152aeb76f1168d4410",
-            "d9e3219b214e15246a2038f76a573e018ef69b385b3bd0576b558231"),
-        new Case(512, 256, "fbd17c26b61a82e12e125f0d459b96c91ab4837dff22b39b78439430cdfc5dc8"
-            + "78bb393a1a5f79bef30995a85a12923339ba8ab7d8fc6dc5fec6f4ed22c122bb"
-            + "e7eb61981892966de5cef576f71fc7a80d14dab2d0c03940b95b9fb3a727c66a"
-            + "6e1ff0dc311b9aa21a3054484802154c1826c2a27a0914152aeb76f1168d4410",
-            "809dd3f763a11af90912bbb92bc0d94361cbadab10142992000c88b4ceb88648"),
-        new Case(512, 384, "fbd17c26b61a82e12e125f0d459b96c91ab4837dff22b39b78439430cdfc5dc8"
-            + "78bb393a1a5f79bef30995a85a12923339ba8ab7d8fc6dc5fec6f4ed22c122bb"
-            + "e7eb61981892966de5cef576f71fc7a80d14dab2d0c03940b95b9fb3a727c66a"
-            + "6e1ff0dc311b9aa21a3054484802154c1826c2a27a0914152aeb76f1168d4410",
-            "825f5cbd5da8807a7b4d3e7bd9cd089ca3a256bcc064cd73a9355bf3ae67f2bf"
-                + "93ac7074b3b19907a0665ba3a878b262"),
-        new Case(512, 512, "fbd17c26b61a82e12e125f0d459b96c91ab4837dff22b39b78439430cdfc5dc8"
-            + "78bb393a1a5f79bef30995a85a12923339ba8ab7d8fc6dc5fec6f4ed22c122bb"
-            + "e7eb61981892966de5cef576f71fc7a80d14dab2d0c03940b95b9fb3a727c66a"
-            + "6e1ff0dc311b9aa21a3054484802154c1826c2a27a0914152aeb76f1168d4410",
-            "1a0d5abf4432e7c612d658f8dcfa35b0d1ab68b8d6bd4dd115c23cc57b5c5bcd"
-                + "de9bff0ece4208596e499f211bc07594d0cb6f3c12b0e110174b2a9b4b2cb6a9"),
-
-        new Case(1024, 1024, "", "0fff9563bb3279289227ac77d319b6fff8d7e9f09da1247b72a0a265cd6d2a62"
-            + "645ad547ed8193db48cff847c06494a03f55666d3b47eb4c20456c9373c86297"
-            + "d630d5578ebd34cb40991578f9f52b18003efa35d3da6553ff35db91b81ab890"
-            + "bec1b189b7f52cb2a783ebb7d823d725b0b4a71f6824e88f68f982eefc6d19c6"),
-        new Case(1024, 1024, "fb", "6426bdc57b2771a6ef1b0dd39f8096a9a07554565743ac3de851d28258fcff22"
-            + "9993e11c4e6bebc8b6ecb0ad1b140276081aa390ec3875960336119427827473"
-            + "4770671b79f076771e2cfdaaf5adc9b10cbae43d8e6cd2b1c1f5d6c82dc96618"
-            + "00ddc476f25865b8748253173187d81da971c027d91d32fb390301c2110d2db2"),
-        new Case(1024, 1024, "fbd17c26b61a82e12e125f0d459b96c91ab4837dff22b39b78439430cdfc5dc8",
-            "140e93726ab0b0467c0b8a834ad8cda4d1769d273661902b70db0dcb5ee692ac"
-                + "b3f852d03b11f857850f2428432811309c1dcbe5724f00267ea3667e89fadb4e"
-                + "4911da6b0ba8a7eddf87c1c67152ef0f07b7fead3557318478bdef5ad1e5926d"
-                + "7071fdd4bfa5076d4b3253f8de479ebdf5357676f1641b2f097e9b785e9e528e"),
-        new Case(1024, 1024, "fbd17c26b61a82e12e125f0d459b96c91ab4837dff22b39b78439430cdfc5dc8"
-            + "78bb393a1a5f79bef30995a85a129233",
-            "31105e1ef042c30b95b16e0f6e6a1a19172bb7d54a0597dd0c711194888efe1d"
-                + "bce82d47416df9577ca387219f06e45cd10964ff36f6711edbbea0e9595b0f66"
-                + "f72b755d70a46857e0aec98561a743d49370d8e572e212811273125f66cc30bf"
-                + "117d3221894c48012bf6e2219de91e064b01523517420a1e00f71c4cc04bab62"),
-        new Case(1024, 160, "fbd17c26b61a82e12e125f0d459b96c91ab4837dff22b39b78439430cdfc5dc8"
-            + "78bb393a1a5f79bef30995a85a12923339ba8ab7d8fc6dc5fec6f4ed22c122bb"
-            + "e7eb61981892966de5cef576f71fc7a80d14dab2d0c03940b95b9fb3a727c66a"
-            + "6e1ff0dc311b9aa21a3054484802154c1826c2a27a0914152aeb76f1168d4410",
-            "2e6a4cbf2ef05ea9c24b93e8d1de732ddf2739eb"),
-        new Case(1024, 224, "fbd17c26b61a82e12e125f0d459b96c91ab4837dff22b39b78439430cdfc5dc8"
-            + "78bb393a1a5f79bef30995a85a12923339ba8ab7d8fc6dc5fec6f4ed22c122bb"
-            + "e7eb61981892966de5cef576f71fc7a80d14dab2d0c03940b95b9fb3a727c66a"
-            + "6e1ff0dc311b9aa21a3054484802154c1826c2a27a0914152aeb76f1168d4410",
-            "1d6de19f37f7a3c265440eecb4b9fbd3300bb5ac60895cfc0d4d3c72"),
-        new Case(1024, 256, "fbd17c26b61a82e12e125f0d459b96c91ab4837dff22b39b78439430cdfc5dc8"
-            + "78bb393a1a5f79bef30995a85a12923339ba8ab7d8fc6dc5fec6f4ed22c122bb"
-            + "e7eb61981892966de5cef576f71fc7a80d14dab2d0c03940b95b9fb3a727c66a"
-            + "6e1ff0dc311b9aa21a3054484802154c1826c2a27a0914152aeb76f1168d4410",
-            "986a4d472b123e8148731a8eac9db23325f0058c4ccbc44a5bb6fe3a8db672d7"),
-        new Case(1024, 384, "fbd17c26b61a82e12e125f0d459b96c91ab4837dff22b39b78439430cdfc5dc8"
-            + "78bb393a1a5f79bef30995a85a12923339ba8ab7d8fc6dc5fec6f4ed22c122bb"
-            + "e7eb61981892966de5cef576f71fc7a80d14dab2d0c03940b95b9fb3a727c66a"
-            + "6e1ff0dc311b9aa21a3054484802154c1826c2a27a0914152aeb76f1168d4410",
-            "9c3d0648c11f31c18395d5e6c8ebd73f43d189843fc45235e2c35e345e12d62b"
-                + "c21a41f65896ddc6a04969654c2e2ce9"),
-        new Case(1024, 512, "fbd17c26b61a82e12e125f0d459b96c91ab4837dff22b39b78439430cdfc5dc8"
-            + "78bb393a1a5f79bef30995a85a12923339ba8ab7d8fc6dc5fec6f4ed22c122bb"
-            + "e7eb61981892966de5cef576f71fc7a80d14dab2d0c03940b95b9fb3a727c66a"
-            + "6e1ff0dc311b9aa21a3054484802154c1826c2a27a0914152aeb76f1168d4410",
-            "5d0416f49c2d08dfd40a1446169dc6a1d516e23b8b853be4933513051de8d5c2"
-                + "6baccffb08d3b16516ba3c6ccf3e9a6c78fff6ef955f2dbc56e1459a7cdba9a5"),
-        new Case(1024, 1024, "fbd17c26b61a82e12e125f0d459b96c91ab4837dff22b39b78439430cdfc5dc8"
-            + "78bb393a1a5f79bef30995a85a12923339ba8ab7d8fc6dc5fec6f4ed22c122bb"
-            + "e7eb61981892966de5cef576f71fc7a80d14dab2d0c03940b95b9fb3a727c66a"
-            + "6e1ff0dc311b9aa21a3054484802154c1826c2a27a0914152aeb76f1168d4410",
-            "96ca81f586c825d0360aef5acaec49ad55289e1797072eee198b64f349ce65b6"
-                + "e6ed804fe38f05135fe769cc56240ddda5098f620865ce4a4278c77fa2ec6bc3"
-                + "1c0f354ca78c7ca81665bfcc5dc54258c3b8310ed421d9157f36c093814d9b25"
-                + "103d83e0ddd89c52d0050e13a64c6140e6388431961685734b1f138fe2243086"),
-
-    };
-
-    public String getName()
-    {
-        return "SkeinDigest";
-    }
-
-    public void performTest()
-        throws Exception
-    {
-        runTest(TEST_CASES[7]);
-        for (int i = 0; i < TEST_CASES.length; i++)
-        {
-            Case test = TEST_CASES[i];
-            runTest(test);
-        }
-    }
-
-    private void runTest(Case dc)
-    {
-        SkeinDigest digest = new SkeinDigest(dc.getBlockSize(), dc.getOutputSize());
-
-        byte[] message = dc.getMessage();
-        digest.update(message, 0, message.length);
-
-        byte[] output = new byte[digest.getDigestSize()];
-        digest.doFinal(output, 0);
-
-        if (!Arrays.areEqual(output, dc.getDigest()))
-        {
-            fail(digest.getAlgorithmName() + " message mismatch.\n Message " + new String(Hex.encode(dc.getMessage())),
-                new String(Hex.encode(dc.getDigest())), new String(Hex.encode(output)));
-        }
-
-        // Clone test
-        digest.update(message, 0, message.length / 2);
-
-        // clone the Digest
-        Digest d = new SkeinDigest(digest);
-
-        digest.update(message, message.length / 2, message.length - message.length / 2);
-        digest.doFinal(output, 0);
-
-        if (!areEqual(dc.getDigest(), output))
-        {
-            fail("failing clone vector test", new String(Hex.encode(dc.getDigest())), new String(Hex.encode(output)));
-        }
-
-        d.update(message, message.length / 2, message.length - message.length / 2);
-        d.doFinal(output, 0);
-
-        if (!areEqual(dc.getDigest(), output))
-        {
-            fail("failing second clone vector test", new String(Hex.encode(dc.getDigest())), new String(Hex.encode(output)));
-        }
-
-        //
-        // memo test
-        //
-        Memoable m = (Memoable)digest;
-
-        digest.update(message, 0, message.length / 2);
-
-        // copy the Digest
-        Memoable copy1 = m.copy();
-        Memoable copy2 = copy1.copy();
-
-        digest.update(message, message.length / 2, message.length - message.length / 2);
-        digest.doFinal(output, 0);
-
-        if (!areEqual(dc.getDigest(), output))
-        {
-            fail("failing memo vector test", new String(Hex.encode(dc.getDigest())), new String(Hex.encode(output)));
-        }
-
-        m.reset(copy1);
-
-        digest.update(message, message.length / 2, message.length - message.length / 2);
-        digest.doFinal(output, 0);
-
-        if (!areEqual(dc.getDigest(), output))
-        {
-            fail("failing memo reset vector test", new String(Hex.encode(dc.getDigest())), new String(Hex.encode(output)));
-        }
-
-        Digest md = (Digest)copy2;
-
-        md.update(message, message.length / 2, message.length - message.length / 2);
-        md.doFinal(output, 0);
-
-        if (!areEqual(dc.getDigest(), output))
-        {
-            fail("failing memo copy vector test", new String(Hex.encode(dc.getDigest())), new String(Hex.encode(output)));
-        }
-    }
-
-    public static void main(String[] args)
-        throws IOException
-    {
-        // generateTests();
-        runTest(new SkeinDigestTest());
-    }
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/SkeinMacTest.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/SkeinMacTest.java
deleted file mode 100644
index 68008b7..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/SkeinMacTest.java
+++ /dev/null
@@ -1,162 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import java.io.IOException;
-
-import org.bouncycastle.crypto.Mac;
-import org.bouncycastle.crypto.macs.SkeinMac;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-
-public class SkeinMacTest
-    extends SimpleTest
-{
-    private static class Case
-    {
-        private byte[] message;
-        private byte[] digest;
-        private byte[] key;
-        private int blockSize;
-        private int outputSize;
-
-        public Case(int blockSize, int outputSize, String message, String key, String digest)
-        {
-            this.blockSize = blockSize;
-            this.outputSize = outputSize;
-            this.message = Hex.decode(message);
-            this.key = Hex.decode(key);
-            this.digest = Hex.decode(digest);
-        }
-
-        public int getOutputSize()
-        {
-            return outputSize;
-        }
-
-        public int getBlockSize()
-        {
-            return blockSize;
-        }
-
-        public byte[] getMessage()
-        {
-            return message;
-        }
-
-        public byte[] getKey()
-        {
-            return key;
-        }
-
-        public byte[] getDigest()
-        {
-            return digest;
-        }
-
-        public String toString()
-        {
-            return "new Case(" + blockSize + ", " + outputSize + ", \"" + new String(Hex.encode(message)) + "\", \""
-                + new String(Hex.encode(key)) + "\", \"" + new String(Hex.encode(digest)) + "\"";
-        }
-
-    }
-
-    // Test cases from skein_golden_kat.txt in Skein 1.3 NIST CD
-    // Excludes empty '(none)' key 'random+MAC' tests, which are in effect digest 
-    private static final Case[] TEST_CASES = {
-        new Case(256, 256, "", "cb41f1706cde09651203c2d0efbaddf8", "886e4efefc15f06aa298963971d7a25398fffe5681c84db39bd00851f64ae29d"),
-        new Case(256, 256, "d3", "cb41f1706cde09651203c2d0efbaddf847a0d315cb2e53ff8bac41da0002672e920244c66e02d5f0dad3e94c42bb65f0d14157decf4105ef5609d5b0984457c193", "979422a94e3afaa46664124d4e5e8b9422b1d8baf11c6ae6725992ac72a112ca"),
-        new Case(256, 256, "d3090c72", "cb41f1706cde09651203c2d0efbaddf847a0d315cb2e53ff8bac41da0002672e", "1d658372cbea2f9928493cc47599d6f4ad8ce33536bedfa20b739f07516519d5"),
-        new Case(256, 256, "d3090c72167517f7", "cb41f1706cde09651203c2d0efbaddf847a0d315cb2e53ff8bac41da0002672e92", "41ef6b0f0fad81c040284f3b1a91e9c44e4c26a6d7207f3aac4362856ef12aca"),
-        new Case(256, 256, "d3090c72167517f7c7ad82a70c2fd3f6", "cb41f1706cde09651203c2d0efbaddf847a0d315cb2e53ff8bac41da0002672e920244c66e02d5f0dad3e94c42bb65f0d14157decf4105ef5609d5b0984457c193", "ca8208119b9e4e4057631ab31015cfd256f6763a0a34381633d97f640899b84f"),
-        new Case(256, 256, "d3090c72167517f7c7ad82a70c2fd3f6443f608301591e598eadb195e8357135", "cb41f1706cde09651203c2d0efbaddf847a0d315cb2e53ff8bac41da0002672e", "9e9980fcc16ee082cf164a5147d0e0692aeffe3dcb8d620e2bb542091162e2e9"),
-        new Case(256, 256, "d3090c72167517f7c7ad82a70c2fd3f6443f608301591e598eadb195e8357135ba26fede2ee187417f816048d00fc235", "cb41f1706cde09651203c2d0efbaddf847a0d315cb2e53ff8bac41da0002672e920244c66e02d5f0dad3e94c42bb65f0d14157decf4105ef5609d5b0984457c193", "c353a316558ec34f8245dd2f9c2c4961fbc7decc3b69053c103e4b8aaaf20394"),
-        new Case(256, 256, "d3090c72167517f7c7ad82a70c2fd3f6443f608301591e598eadb195e8357135ba26fede2ee187417f816048d00fc23512737a2113709a77e4170c49a94b7fdf", "cb41f1706cde09651203c2d0efbaddf8", "b1b8c18188e69a6ecae0b6018e6b638c6a91e6de6881e32a60858468c17b520d"),
-        new Case(256, 256, "d3090c72167517f7c7ad82a70c2fd3f6443f608301591e598eadb195e8357135ba26fede2ee187417f816048d00fc23512737a2113709a77e4170c49a94b7fdff45ff579a72287743102e7766c35ca5abc5dfe2f63a1e726ce5fbd2926db03a2", "cb41f1706cde09651203c2d0efbaddf847a0d315cb2e53ff8bac41da0002672e92", "1dfd2515a412e78852cd81a7f2167711b4ca19b2891c2ea36ba94f8451944793"),
-        new Case(256, 224, "d3090c72167517f7c7ad82a70c2fd3f6443f608301591e598eadb195e8357135ba26fede2ee187417f816048d00fc23512737a2113709a77e4170c49a94b7fdff45ff579a72287743102e7766c35ca5abc5dfe2f63a1e726ce5fbd2926db03a2dd18b03fc1508a9aac45eb362440203a323e09edee6324ee2e37b4432c1867ed", "cb41f1706cde09651203c2d0efbaddf8", "a097340709b443ed2c0a921f5dcefef3ead65c4f0bcd5f13da54d7ed"),
-        new Case(256, 256, "d3090c72167517f7c7ad82a70c2fd3f6443f608301591e598eadb195e8357135ba26fede2ee187417f816048d00fc23512737a2113709a77e4170c49a94b7fdff45ff579a72287743102e7766c35ca5abc5dfe2f63a1e726ce5fbd2926db03a2dd18b03fc1508a9aac45eb362440203a323e09edee6324ee2e37b4432c1867ed", "cb41f1706cde09651203c2d0efbaddf847a0d315cb2e53ff8bac41da0002672e", "ac1b4fab6561c92d0c487e082daec53e0db4f505e08bf51cae4fd5375e37fc04"),
-        new Case(256, 384, "d3090c72167517f7c7ad82a70c2fd3f6443f608301591e598eadb195e8357135ba26fede2ee187417f816048d00fc23512737a2113709a77e4170c49a94b7fdff45ff579a72287743102e7766c35ca5abc5dfe2f63a1e726ce5fbd2926db03a2dd18b03fc1508a9aac45eb362440203a323e09edee6324ee2e37b4432c1867ed", "cb41f1706cde09651203c2d0efbaddf847a0d315cb2e53ff8bac41da0002672e92", "96e6cebb23573d0a70ce36a67aa05d2403148093f25c695e1254887cc97f9771d2518413af4286bf2a06b61a53f7fcec"),
-        new Case(256, 512, "d3090c72167517f7c7ad82a70c2fd3f6443f608301591e598eadb195e8357135ba26fede2ee187417f816048d00fc23512737a2113709a77e4170c49a94b7fdff45ff579a72287743102e7766c35ca5abc5dfe2f63a1e726ce5fbd2926db03a2dd18b03fc1508a9aac45eb362440203a323e09edee6324ee2e37b4432c1867ed", "cb41f1706cde09651203c2d0efbaddf847a0d315cb2e53ff8bac41da0002672e920244c66e02d5f0dad3e94c42bb65f0d14157decf4105ef5609d5b0984457c193", "0e95e597e71d6350f20b99c4179f54f43a4722705c06ba765a82cb0a314fe2fe87ef8090063b757e53182706ed18737dadc0da1e1c66518f08334052702c5ed7"),
-        new Case(256, 264, "d3090c72167517f7c7ad82a70c2fd3f6443f608301591e598eadb195e8357135ba26fede2ee187417f816048d00fc23512737a2113709a77e4170c49a94b7fdff45ff579a72287743102e7766c35ca5abc5dfe2f63a1e726ce5fbd2926db03a2dd18b03fc1508a9aac45eb362440203a323e09edee6324ee2e37b4432c1867ed", "cb41f1706cde09651203c2d0efbaddf8", "064abd4896f460b1953f5a357e7f7c5256e29cdb62b8740d0b52295cfa2ef4c7a2"),
-        new Case(256, 520, "d3090c72167517f7c7ad82a70c2fd3f6443f608301591e598eadb195e8357135ba26fede2ee187417f816048d00fc23512737a2113709a77e4170c49a94b7fdff45ff579a72287743102e7766c35ca5abc5dfe2f63a1e726ce5fbd2926db03a2dd18b03fc1508a9aac45eb362440203a323e09edee6324ee2e37b4432c1867ed", "cb41f1706cde09651203c2d0efbaddf847a0d315cb2e53ff8bac41da0002672e", "edf220e43e048603bd16197d59b673b9974de5b8bcf7cb1558a4799f6fd3743eb5fb400cd6129afc0c60e7b741b7e5806f0e0b93eb8429fbc7efa222175a9c80fd"),
-        new Case(256, 1032, "d3090c72167517f7c7ad82a70c2fd3f6443f608301591e598eadb195e8357135ba26fede2ee187417f816048d00fc23512737a2113709a77e4170c49a94b7fdff45ff579a72287743102e7766c35ca5abc5dfe2f63a1e726ce5fbd2926db03a2dd18b03fc1508a9aac45eb362440203a323e09edee6324ee2e37b4432c1867ed", "cb41f1706cde09651203c2d0efbaddf847a0d315cb2e53ff8bac41da0002672e92", "f3f59fb07399c7b73aae02a8590883cb2fdfde75c55654e71846522301bde48d267169adcc559e038e8c2f28faa552b550d51874055384adea93c036c71a1f0af0c7bcc3bc923738d5307b9da7cb423d4e615c629c4aba71f70d4c9d1fa008176825e51bfa0203445a4083947ec19f6a0fbd082b5b970f2396fb67420639410447"),
-        new Case(256, 2056, "d3090c72167517f7c7ad82a70c2fd3f6443f608301591e598eadb195e8357135ba26fede2ee187417f816048d00fc23512737a2113709a77e4170c49a94b7fdff45ff579a72287743102e7766c35ca5abc5dfe2f63a1e726ce5fbd2926db03a2dd18b03fc1508a9aac45eb362440203a323e09edee6324ee2e37b4432c1867ed", "cb41f1706cde09651203c2d0efbaddf847a0d315cb2e53ff8bac41da0002672e920244c66e02d5f0dad3e94c42bb65f0d14157decf4105ef5609d5b0984457c193", "80eb80d9b8836b32fa576fc84ba08edfbdfd6979123d61914e610a70a372b37f560a10909484f9f4a377c93e29ba681dfe522c41dc83b5ee0567e5370007c7bbe4df0b2b4a25e088f80d72fc30734cdcd76d817b42fbd44dca881019afb25306f19d4e91848778af306517d2072cef72caa327e877c5b6554f83cec3d00877131b47c4d3b557f5a13541c4d5080ee3ce7a658993d083efd0db3496a8752060c3c8552f44b290cabdcc867f691ad605836c08dbd59c9528d885b600b85fdfc8a9d0e636ac3ad8b4295bcb0169e78dc358e77eacc8c4b61bddfa9e5f32d2268a006cfe05c57150fe8e68cabd21cf6cf6035aa1fe4db36c922b765aad0b64e82a2c37"),
-        new Case(256, 256, "d3090c72167517f7c7ad82a70c2fd3f6443f608301591e598eadb195e8357135ba26fede2ee187417f816048d00fc23512737a2113709a77e4170c49a94b7fdff45ff579a72287743102e7766c35ca5abc5dfe2f63a1e726ce5fbd2926db03a2dd18b03fc1508a9aac45eb362440203a323e09edee6324ee2e37b4432c1867ed696e6c9db1e6abea026288954a9c2d5758d7c5db7c9e48aa3d21cae3d977a7c3926066aa393dbd538dd0c30da8916c8757f24c18488014668a2627163a37b261833dc2f8c3c56b1b2e0be21fd3fbdb507b2950b77a6cc02efb393e57419383a920767bca2c972107aa61384542d47cbfb82cfe5c415389d1b0a2d74e2c5da851", "cb41f1706cde09651203c2d0efbaddf847a0d315cb2e53ff8bac41da0002672e", "8f88de68f03cd2f396ccdd49c3a0f4ff15bcda7eb357da9753f6116b124de91d"),
-        new Case(512, 512, "", "cb41f1706cde09651203c2d0efbaddf847a0d315cb2e53ff8bac41da0002672e920244c66e02d5f0dad3e94c42bb65f0d14157decf4105ef5609d5b0984457c1935df3061ff06e9f204192ba11e5bb2cac0430c1c370cb3d113fea5ec1021eb875e5946d7a96ac69a1626c6206b7252736f24253c9ee9b85eb852dfc814631346c", "9bd43d2a2fcfa92becb9f69faab3936978f1b865b7e44338fc9c8f16aba949ba340291082834a1fc5aa81649e13d50cd98641a1d0883062bfe2c16d1faa7e3aa"),
-        new Case(512, 512, "d3", "cb41f1706cde09651203c2d0efbaddf847a0d315cb2e53ff8bac41da0002672e920244c66e02d5f0dad3e94c42bb65f0d14157decf4105ef5609d5b0984457c1", "f0c0a10f031c8fc69cfabcd54154c318b5d6cd95d06b12cf20264402492211ee010d5cecc2dc37fd772afac0596b2bf71e6020ef2dee7c860628b6e643ed9ff6"),
-        new Case(512, 512, "d3090c72167517f7", "cb41f1706cde09651203c2d0efbaddf847a0d315cb2e53ff8bac41da0002672e", "0c1f1921253dd8e5c2d4c5f4099f851042d91147892705829161f5fc64d89785226eb6e187068493ee4c78a4b7c0f55a8cbbb1a5982c2daf638fc6a74b16b0d7"),
-        new Case(512, 512, "d3090c72167517f7c7ad82a70c2fd3f6", "cb41f1706cde09651203c2d0efbaddf847a0d315cb2e53ff8bac41da0002672e920244c66e02d5f0dad3e94c42bb65f0d14157decf4105ef5609d5b0984457c1", "478d7b6c0cc6e35d9ebbdedf39128e5a36585db6222891692d1747d401de34ce3db6fcbab6c968b7f2620f4a844a2903b547775579993736d2493a75ff6752a1"),
-        new Case(512, 512, "d3090c72167517f7c7ad82a70c2fd3f6443f608301591e59", "cb41f1706cde09651203c2d0efbaddf847a0d315cb2e53ff8bac41da0002672e920244c66e02d5f0dad3e94c42bb65f0d14157decf4105ef5609d5b0984457c193", "13c170bac1de35e5fb843f65fabecf214a54a6e0458a4ff6ea5df91915468f4efcd371effa8965a9e82c5388d84730490dcf3976af157b8baf550655a5a6ab78"),
-        new Case(512, 512, "d3090c72167517f7c7ad82a70c2fd3f6443f608301591e598eadb195e8357135ba26fede2ee187417f816048d00fc235", "cb41f1706cde09651203c2d0efbaddf847a0d315cb2e53ff8bac41da0002672e920244c66e02d5f0dad3e94c42bb65f0d14157decf4105ef5609d5b0984457c1", "a947812529a72fd3b8967ec391b298bee891babc8487a1ec4ea3d88f6b2b5be09ac6a780f30f8e8c3bbb4f18bc302a28f3e87d170ba0f858a8fefe3487478cca"),
-        new Case(512, 512, "d3090c72167517f7c7ad82a70c2fd3f6443f608301591e598eadb195e8357135ba26fede2ee187417f816048d00fc23512737a2113709a77e4170c49a94b7fdf", "cb41f1706cde09651203c2d0efbaddf847a0d315cb2e53ff8bac41da0002672e920244c66e02d5f0dad3e94c42bb65f0d14157decf4105ef5609d5b0984457c1935df3061ff06e9f204192ba11e5bb2cac0430c1c370cb3d113fea5ec1021eb875e5946d7a96ac69a1626c6206b7252736f24253c9ee9b85eb852dfc814631346c", "7690ba61f10e0bba312980b0212e6a9a51b0e9aadfde7ca535754a706e042335b29172aae29d8bad18efaf92d43e6406f3098e253f41f2931eda5911dc740352"),
-        new Case(512, 512, "d3090c72167517f7c7ad82a70c2fd3f6443f608301591e598eadb195e8357135ba26fede2ee187417f816048d00fc23512737a2113709a77e4170c49a94b7fdff45ff579a72287743102e7766c35ca5abc5dfe2f63a1e726ce5fbd2926db03a2", "cb41f1706cde09651203c2d0efbaddf847a0d315cb2e53ff8bac41da0002672e", "d10e3ba81855ac087fbf5a3bc1f99b27d05f98ba22441138026225d34a418b93fd9e8dfaf5120757451adabe050d0eb59d271b0fe1bbf04badbcf9ba25a8791b"),
-        new Case(512, 160, "d3090c72167517f7c7ad82a70c2fd3f6443f608301591e598eadb195e8357135ba26fede2ee187417f816048d00fc23512737a2113709a77e4170c49a94b7fdff45ff579a72287743102e7766c35ca5abc5dfe2f63a1e726ce5fbd2926db03a2dd18b03fc1508a9aac45eb362440203a323e09edee6324ee2e37b4432c1867ed", "cb41f1706cde09651203c2d0efbaddf847a0d315cb2e53ff8bac41da0002672e920244c66e02d5f0dad3e94c42bb65f0d14157decf4105ef5609d5b0984457c193", "5670b226156570dff3efe16661ab86eb24982cdf"),
-        new Case(512, 224, "d3090c72167517f7c7ad82a70c2fd3f6443f608301591e598eadb195e8357135ba26fede2ee187417f816048d00fc23512737a2113709a77e4170c49a94b7fdff45ff579a72287743102e7766c35ca5abc5dfe2f63a1e726ce5fbd2926db03a2dd18b03fc1508a9aac45eb362440203a323e09edee6324ee2e37b4432c1867ed", "cb41f1706cde09651203c2d0efbaddf847a0d315cb2e53ff8bac41da0002672e920244c66e02d5f0dad3e94c42bb65f0d14157decf4105ef5609d5b0984457c1935df3061ff06e9f204192ba11e5bb2cac0430c1c370cb3d113fea5ec1021eb875e5946d7a96ac69a1626c6206b7252736f24253c9ee9b85eb852dfc814631346c", "c41b9ff9753e6c0f8ed88866e320535e927fe4da552c289841a920db"),
-        new Case(512, 384, "d3090c72167517f7c7ad82a70c2fd3f6443f608301591e598eadb195e8357135ba26fede2ee187417f816048d00fc23512737a2113709a77e4170c49a94b7fdff45ff579a72287743102e7766c35ca5abc5dfe2f63a1e726ce5fbd2926db03a2dd18b03fc1508a9aac45eb362440203a323e09edee6324ee2e37b4432c1867ed", "cb41f1706cde09651203c2d0efbaddf847a0d315cb2e53ff8bac41da0002672e", "dfbf5c1319a1d9d70efb2f1600fbcf694f935907f31d24a16d6cd2fb2d7855a769681766c0a29da778eed346cd1d740f"),
-        new Case(512, 512, "d3090c72167517f7c7ad82a70c2fd3f6443f608301591e598eadb195e8357135ba26fede2ee187417f816048d00fc23512737a2113709a77e4170c49a94b7fdff45ff579a72287743102e7766c35ca5abc5dfe2f63a1e726ce5fbd2926db03a2dd18b03fc1508a9aac45eb362440203a323e09edee6324ee2e37b4432c1867ed", "cb41f1706cde09651203c2d0efbaddf847a0d315cb2e53ff8bac41da0002672e920244c66e02d5f0dad3e94c42bb65f0d14157decf4105ef5609d5b0984457c1", "04d8cddb0ad931d54d195899a094684344e902286037272890bce98a41813edc37a3cee190a693fcca613ee30049ce7ec2bdff9613f56778a13f8c28a21d167a"),
-        new Case(512, 1024, "d3090c72167517f7c7ad82a70c2fd3f6443f608301591e598eadb195e8357135ba26fede2ee187417f816048d00fc23512737a2113709a77e4170c49a94b7fdff45ff579a72287743102e7766c35ca5abc5dfe2f63a1e726ce5fbd2926db03a2dd18b03fc1508a9aac45eb362440203a323e09edee6324ee2e37b4432c1867ed", "cb41f1706cde09651203c2d0efbaddf847a0d315cb2e53ff8bac41da0002672e920244c66e02d5f0dad3e94c42bb65f0d14157decf4105ef5609d5b0984457c193", "08fca368b3b14ac406676adf37ac9be2dbb8704e694055a0c6331184d4f0070098f23f0963ee29002495771bf56fb4d3d9ff3506abcd80be927379f7880d5d7703919fbf92184f498ac44f47f015ce676eded9165d47d53733f5a27abbc05f45acd98b97cc15ffdced641defd1a5119ef841b452a1b8f94ee69004466ccdc143"),
-        new Case(512, 264, "d3090c72167517f7c7ad82a70c2fd3f6443f608301591e598eadb195e8357135ba26fede2ee187417f816048d00fc23512737a2113709a77e4170c49a94b7fdff45ff579a72287743102e7766c35ca5abc5dfe2f63a1e726ce5fbd2926db03a2dd18b03fc1508a9aac45eb362440203a323e09edee6324ee2e37b4432c1867ed", "cb41f1706cde09651203c2d0efbaddf847a0d315cb2e53ff8bac41da0002672e920244c66e02d5f0dad3e94c42bb65f0d14157decf4105ef5609d5b0984457c1935df3061ff06e9f204192ba11e5bb2cac0430c1c370cb3d113fea5ec1021eb875e5946d7a96ac69a1626c6206b7252736f24253c9ee9b85eb852dfc814631346c", "669e770ebe7eacc2b64caaf049923ad297a5b37cfa61c283392d81ccfcb9bbbc09"),
-        new Case(512, 1032, "d3090c72167517f7c7ad82a70c2fd3f6443f608301591e598eadb195e8357135ba26fede2ee187417f816048d00fc23512737a2113709a77e4170c49a94b7fdff45ff579a72287743102e7766c35ca5abc5dfe2f63a1e726ce5fbd2926db03a2dd18b03fc1508a9aac45eb362440203a323e09edee6324ee2e37b4432c1867ed", "cb41f1706cde09651203c2d0efbaddf847a0d315cb2e53ff8bac41da0002672e", "acc2e03f07f33e9820a6038421089429adcd6a7a83f733beec048c05bf37531a170a5537fcb565c348a70a83217f8be768ff6f95fd2b3d89cb7d8a3dc849505e3710eb4e65a8e7134bbf580d92fe18c9aa987563669b1f014aa5e092519089355534eaa9f0bdc99f6839f54080ffe74623254c906ecb8896b4346c3178a0bc2898"),
-        new Case(512, 2056, "d3090c72167517f7c7ad82a70c2fd3f6443f608301591e598eadb195e8357135ba26fede2ee187417f816048d00fc23512737a2113709a77e4170c49a94b7fdff45ff579a72287743102e7766c35ca5abc5dfe2f63a1e726ce5fbd2926db03a2dd18b03fc1508a9aac45eb362440203a323e09edee6324ee2e37b4432c1867ed", "cb41f1706cde09651203c2d0efbaddf847a0d315cb2e53ff8bac41da0002672e920244c66e02d5f0dad3e94c42bb65f0d14157decf4105ef5609d5b0984457c1", "9f3e082223c43090a4a3ffbdcd469cbabfe0c1399d1edf45a5dfc18f4db5428928a76e979b8d0d5dffec0e6a59ada448c1ffbc06cc80a2006f002adc0c6dbf458563762228dce4381944e460ebebfe06f1237093634625107469a22a189a47f8b025899265d8890a1b39df64552394377e88ba2ad44a8c8d174f884ac8c3ae24ddb0affca5fceb6aa76e09706881e8371774b9b050a69b96ef5e97e81043f8b7e9479e287ab441bacd62caf768a82c8c3e3107be70eb8799a39856fe29842a04e25de0ef9de1b7e65bd0f1f7306835287fc957388e2035b7d22d3aa9c06a9fefbca16f3f60e1c4def89038d918942152a069aa2e0be8ae7475d859031adec84583"),
-        new Case(1024, 1024, "", "cb41f1706cde09651203c2d0efbaddf847a0d315cb2e53ff8bac41da0002672e920244c66e02d5f0dad3e94c42bb65f0d14157decf4105ef5609d5b0984457c1935df3061ff06e9f204192ba11e5bb2cac0430c1c370cb3d113fea5ec1021eb875e5946d7a96ac69a1626c6206b7252736f24253c9ee9b85eb852dfc81463134", "bcf37b3459c88959d6b6b58b2bfe142cef60c6f4ec56b0702480d7893a2b0595aa354e87102a788b61996b9cbc1eade7dafbf6581135572c09666d844c90f066b800fc4f5fd1737644894ef7d588afc5c38f5d920bdbd3b738aea3a3267d161ed65284d1f57da73b68817e17e381ca169115152b869c66b812bb9a84275303f0"),
-        new Case(1024, 1024, "d3090c72", "cb41f1706cde09651203c2d0efbaddf847a0d315cb2e53ff8bac41da0002672e920244c66e02d5f0dad3e94c42bb65f0d14157decf4105ef5609d5b0984457c1935df3061ff06e9f204192ba11e5bb2cac0430c1c370cb3d113fea5ec1021eb875e5946d7a96ac69a1626c6206b7252736f24253c9ee9b85eb852dfc814631346c", "df0596e5808835a3e304aa27923db05f61dac57c0696a1d19abf188e70aa9dbcc659e9510f7c9a37fbc025bd4e5ea293e78ed7838dd0b08864e8ad40ddb3a88031ebefc21572a89960d1916107a7da7ac0c067e34ec46a86a29ca63fa250bd398eb32ec1ed0f8ac8329f26da018b029e41e2e58d1dfc44de81615e6c987ed9c9"),
-        new Case(1024, 1024, "d3090c72167517f7", "cb41f1706cde09651203c2d0efbaddf847a0d315cb2e53ff8bac41da0002672e920244c66e02d5f0dad3e94c42bb65f0d14157decf4105ef5609d5b0984457c1935df3061ff06e9f204192ba11e5bb2cac0430c1c370cb3d113fea5ec1021eb875e5946d7a96ac69a1626c6206b7252736f24253c9ee9b85eb852dfc814631346c042eb4187aa1c015a4767032c0bb28f076b66485f51531c12e948f47dbc2cb904a4b75d1e8a6d931dab4a07e0a54d1bb5b55e602141746bd09fb15e8f01a8d74e9e63959cb37336bc1b896ec78da734c15e362db04368fbba280f20a043e0d0941e9f5193e1b360a33c43b266524880125222e648f05f28be34ba3cabfc9c544", "3cfbb79cd88af8ee09c7670bcbab6907a31f80fa31d9d7c9d50826c9568f307a78bd254961398c76b6e338fd9ca5f351059350d30963c3320659b223b991fc46d1307686fe2b4763d9f593c57ad5adbc45caf2ea3dc6090f5a74fa5fa6d9e9838964ea0a2aa216831ab069b00629a1a9b037083403bdb25d3d06a21c430c87dd"),
-        new Case(1024, 1024, "d3090c72167517f7c7ad82a70c2fd3f6443f608301591e59", "cb41f1706cde09651203c2d0efbaddf847a0d315cb2e53ff8bac41da0002672e920244c66e02d5f0dad3e94c42bb65f0d14157decf4105ef5609d5b0984457c1", "0a1b960099fc9d653b0fd1f5b6b972fb366907b772cbce5a59b6171d7935506f70c212bd169d68c5cfd8618343611b7eb2e686ff1dc7c03a57e1a55ed10726848161eea903d53b58459be42d95df989c66c2eea4e51cde272c2d8be67bf3bca2aee633777eb8486781eaa060d0f538abd6c93dbd2d1bf66e6f50bfdcac3725a4"),
-        new Case(1024, 1024, "d3090c72167517f7c7ad82a70c2fd3f6443f608301591e598eadb195e8357135", "cb41f1706cde09651203c2d0efbaddf847a0d315cb2e53ff8bac41da0002672e920244c66e02d5f0dad3e94c42bb65f0d14157decf4105ef5609d5b0984457c1935df3061ff06e9f204192ba11e5bb2cac0430c1c370cb3d113fea5ec1021eb875e5946d7a96ac69a1626c6206b7252736f24253c9ee9b85eb852dfc814631346c", "3e0cd7938d71c39ffbb08a6ba7995ade3ad140e2c0c45cdbafb099247e08e4c20b61c1f885ced5ed2f816680925034918236e5807f0eecf3f27e9cfca36675eb75873efa1fb41f17541dc2f7c2469eaecb35cc7ca58e489804caf56f09fb97c9f689c64ad49c6888f86c483e901bd3d25798b394ef93faf9154900f92f31f433"),
-        new Case(1024, 1024, "d3090c72167517f7c7ad82a70c2fd3f6443f608301591e598eadb195e8357135ba26fede2ee187417f816048d00fc23512737a2113709a77e4170c49a94b7fdf", "cb41f1706cde09651203c2d0efbaddf847a0d315cb2e53ff8bac41da0002672e920244c66e02d5f0dad3e94c42bb65f0d14157decf4105ef5609d5b0984457c1935df3061ff06e9f204192ba11e5bb2cac0430c1c370cb3d113fea5ec1021eb875e5946d7a96ac69a1626c6206b7252736f24253c9ee9b85eb852dfc81463134", "7266752f7e9aa04bd7d8a1b16030677de6021301f6a62473c76bae2b98bbf8aad73bd00a4b5035f741caf2317ab80e4e97f5c5bbe8acc0e8b424bcb13c7c6740a985801fba54addde8d4f13f69d2bfc98ae104d46a211145217e51d510ea846cec9581d14fda079f775c8b18d66cb31bf7060996ee8a69eee7f107909ce59a97"),
-        new Case(1024, 1024, "d3090c72167517f7c7ad82a70c2fd3f6443f608301591e598eadb195e8357135ba26fede2ee187417f816048d00fc23512737a2113709a77e4170c49a94b7fdff45ff579a72287743102e7766c35ca5abc5dfe2f63a1e726ce5fbd2926db03a2", "cb41f1706cde09651203c2d0efbaddf847a0d315cb2e53ff8bac41da0002672e920244c66e02d5f0dad3e94c42bb65f0d14157decf4105ef5609d5b0984457c1935df3061ff06e9f204192ba11e5bb2cac0430c1c370cb3d113fea5ec1021eb875e5946d7a96ac69a1626c6206b7252736f24253c9ee9b85eb852dfc814631346c042eb4187aa1c015a4767032c0bb28f076b66485f51531c12e948f47dbc2cb904a4b75d1e8a6d931dab4a07e0a54d1bb5b55e602141746bd09fb15e8f01a8d74e9e63959cb37336bc1b896ec78da734c15e362db04368fbba280f20a043e0d0941e9f5193e1b360a33c43b266524880125222e648f05f28be34ba3cabfc9c544", "71f40bf2aa635125ef83c8df0d4e9ea18b73b56be4f45e89b910a7c68d396b65b09d18abc7d1b6de3f53fd5de583e6f22e612dd17b292068af6027daaf8b4cd60acf5bc85044741e9f7a1f423f5827f5e360930a2e71912239af9fc6343604fdcf3f3569854f2bb8d25a81e3b3f5261a02fe8292aaaa50c324101ab2c7a2f349"),
-        new Case(1024, 160, "d3090c72167517f7c7ad82a70c2fd3f6443f608301591e598eadb195e8357135ba26fede2ee187417f816048d00fc23512737a2113709a77e4170c49a94b7fdff45ff579a72287743102e7766c35ca5abc5dfe2f63a1e726ce5fbd2926db03a2dd18b03fc1508a9aac45eb362440203a323e09edee6324ee2e37b4432c1867ed", "cb41f1706cde09651203c2d0efbaddf847a0d315cb2e53ff8bac41da0002672e920244c66e02d5f0dad3e94c42bb65f0d14157decf4105ef5609d5b0984457c1", "17c3c533b27d666da556ae586e641b7a3a0bcc45"),
-        new Case(1024, 224, "d3090c72167517f7c7ad82a70c2fd3f6443f608301591e598eadb195e8357135ba26fede2ee187417f816048d00fc23512737a2113709a77e4170c49a94b7fdff45ff579a72287743102e7766c35ca5abc5dfe2f63a1e726ce5fbd2926db03a2dd18b03fc1508a9aac45eb362440203a323e09edee6324ee2e37b4432c1867ed", "cb41f1706cde09651203c2d0efbaddf847a0d315cb2e53ff8bac41da0002672e920244c66e02d5f0dad3e94c42bb65f0d14157decf4105ef5609d5b0984457c1935df3061ff06e9f204192ba11e5bb2cac0430c1c370cb3d113fea5ec1021eb875e5946d7a96ac69a1626c6206b7252736f24253c9ee9b85eb852dfc81463134", "6625df9801581009125ea4e5c94ad6f1a2d692c278822ccb6eb67235"),
-        new Case(1024, 256, "d3090c72167517f7c7ad82a70c2fd3f6443f608301591e598eadb195e8357135ba26fede2ee187417f816048d00fc23512737a2113709a77e4170c49a94b7fdff45ff579a72287743102e7766c35ca5abc5dfe2f63a1e726ce5fbd2926db03a2dd18b03fc1508a9aac45eb362440203a323e09edee6324ee2e37b4432c1867ed", "cb41f1706cde09651203c2d0efbaddf847a0d315cb2e53ff8bac41da0002672e920244c66e02d5f0dad3e94c42bb65f0d14157decf4105ef5609d5b0984457c1935df3061ff06e9f204192ba11e5bb2cac0430c1c370cb3d113fea5ec1021eb875e5946d7a96ac69a1626c6206b7252736f24253c9ee9b85eb852dfc814631346c", "6c5b671c1766f6eecea6d24b641d4a6bf84bba13a1976f8f80b3f30ee2f93de6"),
-        new Case(1024, 384, "d3090c72167517f7c7ad82a70c2fd3f6443f608301591e598eadb195e8357135ba26fede2ee187417f816048d00fc23512737a2113709a77e4170c49a94b7fdff45ff579a72287743102e7766c35ca5abc5dfe2f63a1e726ce5fbd2926db03a2dd18b03fc1508a9aac45eb362440203a323e09edee6324ee2e37b4432c1867ed", "cb41f1706cde09651203c2d0efbaddf847a0d315cb2e53ff8bac41da0002672e920244c66e02d5f0dad3e94c42bb65f0d14157decf4105ef5609d5b0984457c1935df3061ff06e9f204192ba11e5bb2cac0430c1c370cb3d113fea5ec1021eb875e5946d7a96ac69a1626c6206b7252736f24253c9ee9b85eb852dfc814631346c042eb4187aa1c015a4767032c0bb28f076b66485f51531c12e948f47dbc2cb904a4b75d1e8a6d931dab4a07e0a54d1bb5b55e602141746bd09fb15e8f01a8d74e9e63959cb37336bc1b896ec78da734c15e362db04368fbba280f20a043e0d0941e9f5193e1b360a33c43b266524880125222e648f05f28be34ba3cabfc9c544", "98af454d7fa3706dfaafbf58c3f9944868b57f68f493987347a69fce19865febba0407a16b4e82065035651f0b1e0327"),
-        new Case(1024, 1024, "d3090c72167517f7c7ad82a70c2fd3f6443f608301591e598eadb195e8357135ba26fede2ee187417f816048d00fc23512737a2113709a77e4170c49a94b7fdff45ff579a72287743102e7766c35ca5abc5dfe2f63a1e726ce5fbd2926db03a2dd18b03fc1508a9aac45eb362440203a323e09edee6324ee2e37b4432c1867ed", "cb41f1706cde09651203c2d0efbaddf847a0d315cb2e53ff8bac41da0002672e920244c66e02d5f0dad3e94c42bb65f0d14157decf4105ef5609d5b0984457c1", "211ac479e9961141da3aac19d320a1dbbbfad55d2dce87e6a345fcd58e36827597378432b482d89bad44dddb13e6ad86e0ee1e0882b4eb0cd6a181e9685e18dd302ebb3aa74502c06254dcadfb2bd45d288f82366b7afc3bc0f6b1a3c2e8f84d37fbedd07a3f8fcff84faf24c53c11da600aaa118e76cfdcb366d0b3f7729dce"),
-        new Case(1024, 264, "d3090c72167517f7c7ad82a70c2fd3f6443f608301591e598eadb195e8357135ba26fede2ee187417f816048d00fc23512737a2113709a77e4170c49a94b7fdff45ff579a72287743102e7766c35ca5abc5dfe2f63a1e726ce5fbd2926db03a2dd18b03fc1508a9aac45eb362440203a323e09edee6324ee2e37b4432c1867ed", "cb41f1706cde09651203c2d0efbaddf847a0d315cb2e53ff8bac41da0002672e920244c66e02d5f0dad3e94c42bb65f0d14157decf4105ef5609d5b0984457c1935df3061ff06e9f204192ba11e5bb2cac0430c1c370cb3d113fea5ec1021eb875e5946d7a96ac69a1626c6206b7252736f24253c9ee9b85eb852dfc81463134", "dc1d253b7cadbdaef18503b1809a7f1d4f8c323b7f6f8ca50b76d3864649ce1c7d"),
-        new Case(1024, 520, "d3090c72167517f7c7ad82a70c2fd3f6443f608301591e598eadb195e8357135ba26fede2ee187417f816048d00fc23512737a2113709a77e4170c49a94b7fdff45ff579a72287743102e7766c35ca5abc5dfe2f63a1e726ce5fbd2926db03a2dd18b03fc1508a9aac45eb362440203a323e09edee6324ee2e37b4432c1867ed", "cb41f1706cde09651203c2d0efbaddf847a0d315cb2e53ff8bac41da0002672e920244c66e02d5f0dad3e94c42bb65f0d14157decf4105ef5609d5b0984457c1935df3061ff06e9f204192ba11e5bb2cac0430c1c370cb3d113fea5ec1021eb875e5946d7a96ac69a1626c6206b7252736f24253c9ee9b85eb852dfc814631346c", "decd79578d12bf6806530c382230a2c7836429c70cac941179e1dd982938bab91fb6f3638df1cc1ef615ecfc4249e5aca8a73c4c1eebef662a836d0be903b00146"),
-        new Case(1024, 1032, "d3090c72167517f7c7ad82a70c2fd3f6443f608301591e598eadb195e8357135ba26fede2ee187417f816048d00fc23512737a2113709a77e4170c49a94b7fdff45ff579a72287743102e7766c35ca5abc5dfe2f63a1e726ce5fbd2926db03a2dd18b03fc1508a9aac45eb362440203a323e09edee6324ee2e37b4432c1867ed", "cb41f1706cde09651203c2d0efbaddf847a0d315cb2e53ff8bac41da0002672e920244c66e02d5f0dad3e94c42bb65f0d14157decf4105ef5609d5b0984457c1935df3061ff06e9f204192ba11e5bb2cac0430c1c370cb3d113fea5ec1021eb875e5946d7a96ac69a1626c6206b7252736f24253c9ee9b85eb852dfc814631346c042eb4187aa1c015a4767032c0bb28f076b66485f51531c12e948f47dbc2cb904a4b75d1e8a6d931dab4a07e0a54d1bb5b55e602141746bd09fb15e8f01a8d74e9e63959cb37336bc1b896ec78da734c15e362db04368fbba280f20a043e0d0941e9f5193e1b360a33c43b266524880125222e648f05f28be34ba3cabfc9c544", "440fe691e04f1fed8c253d6c4670646156f33fffaea702de9445df5739eb960cecf85d56e2e6860a610211a5c909932ab774b978aa0b0d5bbce82775172ab12dceddd51d1eb030057ce61bea6c18f6bb368d26ae76a9e44a962eb132e6c42c25d9fecc4f13348300ca55c78e0990de96c1ae24eb3ee3324782c93dd628260a2c8d"),
-        new Case(1024, 1024, "d3090c72167517f7c7ad82a70c2fd3f6443f608301591e598eadb195e8357135ba26fede2ee187417f816048d00fc23512737a2113709a77e4170c49a94b7fdff45ff579a72287743102e7766c35ca5abc5dfe2f63a1e726ce5fbd2926db03a2dd18b03fc1508a9aac45eb362440203a323e09edee6324ee2e37b4432c1867ed696e6c9db1e6abea026288954a9c2d5758d7c5db7c9e48aa3d21cae3d977a7c3926066aa393dbd538dd0c30da8916c8757f24c18488014668a2627163a37b261833dc2f8c3c56b1b2e0be21fd3fbdb507b2950b77a6cc02efb393e57419383a920767bca2c972107aa61384542d47cbfb82cfe5c415389d1b0a2d74e2c5da851", "cb41f1706cde09651203c2d0efbaddf847a0d315cb2e53ff8bac41da0002672e920244c66e02d5f0dad3e94c42bb65f0d14157decf4105ef5609d5b0984457c1935df3061ff06e9f204192ba11e5bb2cac0430c1c370cb3d113fea5ec1021eb875e5946d7a96ac69a1626c6206b7252736f24253c9ee9b85eb852dfc814631346c", "46a42b0d7b8679f8fcea156c072cf9833c468a7d59ac5e5d326957d60dfe1cdfb27eb54c760b9e049fda47f0b847ac68d6b340c02c39d4a18c1bdfece3f405fae8aa848bdbefe3a4c277a095e921228618d3be8bd1999a071682810de748440ad416a97742cc9e8a9b85455b1d76472cf562f525116698d5cd0a35ddf86e7f8a"),
-
-    };
-
-    public String getName()
-    {
-        return "SkeinMac";
-    }
-
-    public void performTest()
-        throws Exception
-    {
-        for (int i = 0; i < TEST_CASES.length; i++)
-        {
-            Case test = TEST_CASES[i];
-            runTest(test);
-        }
-    }
-
-    private void runTest(Case dc)
-    {
-        Mac digest = new SkeinMac(dc.getBlockSize(), dc.getOutputSize());
-        digest.init(new KeyParameter(dc.getKey()));
-
-        byte[] message = dc.getMessage();
-        digest.update(message, 0, message.length);
-
-        byte[] output = new byte[digest.getMacSize()];
-        digest.doFinal(output, 0);
-
-        if (!Arrays.areEqual(output, dc.getDigest()))
-        {
-            fail(digest.getAlgorithmName() + " message " + (dc.getMessage().length * 8) + " mismatch.\n Message  " + new String(Hex.encode(dc.getMessage()))
-                + "\n Key      " + new String(Hex.encode(dc.getKey())) + "\n Expected "
-                + new String(Hex.encode(dc.getDigest())) + "\n Actual   " + new String(Hex.encode(output)));
-        }
-
-    }
-
-    public static void main(String[] args)
-        throws IOException
-    {
-        runTest(new SkeinMacTest());
-    }
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/SkipjackTest.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/SkipjackTest.java
deleted file mode 100644
index 455e10b..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/SkipjackTest.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import org.bouncycastle.crypto.engines.SkipjackEngine;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-
-/**
- */
-public class SkipjackTest
-    extends CipherTest
-{
-    static SimpleTest[]  tests = 
-            {
-                new BlockCipherVectorTest(0, new SkipjackEngine(),
-                        new KeyParameter(Hex.decode("00998877665544332211")),
-                        "33221100ddccbbaa", "2587cae27a12d300")
-            };
-
-    SkipjackTest()
-    {
-        super(tests, new SkipjackEngine(), new KeyParameter(Hex.decode("00998877665544332211")));
-    }
-
-    public String getName()
-    {
-        return "SKIPJACK";
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        runTest(new SkipjackTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/StreamCipherResetTest.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/StreamCipherResetTest.java
deleted file mode 100644
index 092de5f..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/StreamCipherResetTest.java
+++ /dev/null
@@ -1,133 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import java.security.SecureRandom;
-
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.InvalidCipherTextException;
-import org.bouncycastle.crypto.StreamCipher;
-import org.bouncycastle.crypto.engines.ChaChaEngine;
-import org.bouncycastle.crypto.engines.Grain128Engine;
-import org.bouncycastle.crypto.engines.Grainv1Engine;
-import org.bouncycastle.crypto.engines.HC128Engine;
-import org.bouncycastle.crypto.engines.HC256Engine;
-import org.bouncycastle.crypto.engines.ISAACEngine;
-import org.bouncycastle.crypto.engines.RC4Engine;
-import org.bouncycastle.crypto.engines.Salsa20Engine;
-import org.bouncycastle.crypto.engines.XSalsa20Engine;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.crypto.params.ParametersWithIV;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-
-/**
- * Test whether block ciphers implement reset contract on init, encrypt/decrypt and reset.
- */
-public class StreamCipherResetTest
-    extends SimpleTest
-{
-    public String getName()
-    {
-        return "Stream Cipher Reset";
-    }
-
-    public void performTest()
-        throws Exception
-    {
-        testReset(new Salsa20Engine(), new Salsa20Engine(), new ParametersWithIV(new KeyParameter(random(32)),
-            random(8)));
-        testReset(new Salsa20Engine(), new Salsa20Engine(), new ParametersWithIV(new KeyParameter(random(16)),
-            random(8)));
-        testReset(new XSalsa20Engine(), new XSalsa20Engine(), new ParametersWithIV(new KeyParameter(random(32)),
-            random(24)));
-        testReset(new ChaChaEngine(), new ChaChaEngine(), new ParametersWithIV(new KeyParameter(random(32)), random(8)));
-        testReset(new ChaChaEngine(), new ChaChaEngine(), new ParametersWithIV(new KeyParameter(random(16)), random(8)));
-        testReset(new RC4Engine(), new RC4Engine(), new KeyParameter(random(16)));
-        testReset(new ISAACEngine(), new ISAACEngine(), new KeyParameter(random(16)));
-        testReset(new HC128Engine(), new HC128Engine(), new ParametersWithIV(new KeyParameter(random(16)), random(16)));
-        testReset(new HC256Engine(), new HC256Engine(), new ParametersWithIV(new KeyParameter(random(16)), random(16)));
-        testReset(new Grainv1Engine(), new Grainv1Engine(), new ParametersWithIV(new KeyParameter(random(16)),
-            random(8)));
-        testReset(new Grain128Engine(), new Grain128Engine(), new ParametersWithIV(new KeyParameter(random(16)),
-            random(12)));
-    }
-
-    private static final SecureRandom RAND = new SecureRandom();
-
-    private byte[] random(int size)
-    {
-        final byte[] data = new byte[size];
-        RAND.nextBytes(data);
-        return data;
-    }
-
-    private void testReset(StreamCipher cipher1, StreamCipher cipher2, CipherParameters params)
-        throws InvalidCipherTextException
-    {
-        cipher1.init(true, params);
-
-        byte[] plaintext = new byte[1023];
-        byte[] ciphertext = new byte[plaintext.length];
-
-        // Establish baseline answer
-        cipher1.processBytes(plaintext, 0, plaintext.length, ciphertext, 0);
-
-        // Test encryption resets
-        checkReset(cipher1, params, true, plaintext, ciphertext);
-
-        // Test decryption resets with fresh instance
-        cipher2.init(false, params);
-        checkReset(cipher2, params, false, ciphertext, plaintext);
-    }
-
-    private void checkReset(StreamCipher cipher,
-                            CipherParameters params,
-                            boolean encrypt,
-                            byte[] pretext,
-                            byte[] posttext)
-        throws InvalidCipherTextException
-    {
-        // Do initial run
-        byte[] output = new byte[posttext.length];
-        cipher.processBytes(pretext, 0, pretext.length, output, 0);
-
-        // Check encrypt resets cipher
-        cipher.init(encrypt, params);
-
-        try
-        {
-            cipher.processBytes(pretext, 0, pretext.length, output, 0);
-        }
-        catch (Exception e)
-        {
-            fail(cipher.getAlgorithmName() + " init did not reset: " + e.getMessage());
-        }
-        if (!Arrays.areEqual(output, posttext))
-        {
-            fail(cipher.getAlgorithmName() + " init did not reset.", new String(Hex.encode(posttext)),
-                new String(Hex.encode(output)));
-        }
-
-        // Check reset resets data
-        cipher.reset();
-
-        try
-        {
-            cipher.processBytes(pretext, 0, pretext.length, output, 0);
-        }
-        catch (Exception e)
-        {
-            fail(cipher.getAlgorithmName() + " reset did not reset: " + e.getMessage());
-        }
-        if (!Arrays.areEqual(output, posttext))
-        {
-            fail(cipher.getAlgorithmName() + " reset did not reset.");
-        }
-    }
-
-    public static void main(String[] args)
-    {
-        runTest(new StreamCipherResetTest());
-    }
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/StreamCipherVectorTest.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/StreamCipherVectorTest.java
deleted file mode 100644
index 7b78828..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/StreamCipherVectorTest.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.StreamCipher;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-
-/**
- * a basic test that takes a stream cipher, key parameter, and an input
- * and output string.
- */
-public class StreamCipherVectorTest
-    extends SimpleTest
-{
-    int                 id;
-    StreamCipher        cipher;
-    CipherParameters    param;
-    byte[]              input;
-    byte[]              output;
-
-    public StreamCipherVectorTest(
-        int                 id,
-        StreamCipher        cipher,
-        CipherParameters    param,
-        String              input,
-        String              output)
-    {
-        this.id = id;
-        this.cipher = cipher;
-        this.param = param;
-        this.input = Hex.decode(input);
-        this.output = Hex.decode(output);
-    }
-
-    public String getName()
-    {
-        return cipher.getAlgorithmName() + " Vector Test " + id;
-    }
-
-    public void performTest()
-    {
-        cipher.init(true, param);
-
-        byte[]  out = new byte[input.length];
-
-        cipher.processBytes(input, 0, input.length, out, 0);
-
-        if (!areEqual(out, output))
-        {
-            fail("failed.", new String(Hex.encode(output)) , new String(Hex.encode(out)));
-        }
-
-        cipher.init(false, param);
-
-        cipher.processBytes(output, 0, output.length, out, 0);
-
-        if (!areEqual(input, out))
-        {
-            fail("failed reversal");
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/TEATest.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/TEATest.java
deleted file mode 100644
index 98b0ec9..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/TEATest.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import org.bouncycastle.crypto.engines.TEAEngine;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-
-/**
- * TEA tester - based on C implementation results from http://www.simonshepherd.supanet.com/tea.htm
- */
-public class TEATest
-    extends CipherTest
-{
-    static SimpleTest[]  tests = {
-        new BlockCipherVectorTest(0, new TEAEngine(),
-            new KeyParameter(Hex.decode("00000000000000000000000000000000")),
-            "0000000000000000",
-            "41ea3a0a94baa940"),
-        new BlockCipherVectorTest(1, new TEAEngine(),
-            new KeyParameter(Hex.decode("00000000000000000000000000000000")),
-            "0102030405060708",
-            "6a2f9cf3fccf3c55"),
-        new BlockCipherVectorTest(2, new TEAEngine(),
-            new KeyParameter(Hex.decode("0123456712345678234567893456789A")),
-            "0000000000000000",
-            "34e943b0900f5dcb"),
-        new BlockCipherVectorTest(3, new TEAEngine(),
-            new KeyParameter(Hex.decode("0123456712345678234567893456789A")),
-            "0102030405060708",
-            "773dc179878a81c0"),
-            };
-
-    TEATest()
-    {
-        super(tests, new TEAEngine(), new KeyParameter(new byte[16]));
-    }
-
-    public String getName()
-    {
-        return "TEA";
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        runTest(new TEATest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/Threefish1024Test.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/Threefish1024Test.java
deleted file mode 100644
index a580a15..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/Threefish1024Test.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import org.bouncycastle.crypto.engines.ThreefishEngine;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.crypto.params.TweakableBlockCipherParameters;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-
-public class Threefish1024Test
-    extends CipherTest
-{
-    // Test cases from skein_golden_kat_internals.txt in Skein 1.3 NIST CD
-    static SimpleTest[] tests =
-        {
-            new BlockCipherVectorTest(0, new ThreefishEngine(ThreefishEngine.BLOCKSIZE_1024),
-                new TweakableBlockCipherParameters(
-                    new KeyParameter(new byte[128]),
-                    new byte[16]),
-                "0000000000000000000000000000000000000000000000000000000000000000" +
-                    "0000000000000000000000000000000000000000000000000000000000000000" +
-                    "0000000000000000000000000000000000000000000000000000000000000000" +
-                    "0000000000000000000000000000000000000000000000000000000000000000",
-                "f05c3d0a3d05b304f785ddc7d1e036015c8aa76e2f217b06c6e1544c0bc1a90d" +
-                    "f0accb9473c24e0fd54fea68057f43329cb454761d6df5cf7b2e9b3614fbd5a2" +
-                    "0b2e4760b40603540d82eabc5482c171c832afbe68406bc39500367a592943fa" +
-                    "9a5b4a43286ca3c4cf46104b443143d560a4b230488311df4feef7e1dfe8391e"),
-            new BlockCipherVectorTest(1, new ThreefishEngine(ThreefishEngine.BLOCKSIZE_1024),
-                new TweakableBlockCipherParameters(
-                    new KeyParameter(Hex.decode(
-                        "101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f" +
-                            "303132333435363738393a3b3c3d3e3f404142434445464748494a4b4c4d4e4f" +
-                            "505152535455565758595a5b5c5d5e5f606162636465666768696a6b6c6d6e6f" +
-                            "707172737475767778797a7b7c7d7e7f808182838485868788898a8b8c8d8e8f")),
-                    Hex.decode("000102030405060708090a0b0c0d0e0f")),
-                "fffefdfcfbfaf9f8f7f6f5f4f3f2f1f0efeeedecebeae9e8e7e6e5e4e3e2e1e0" +
-                    "dfdedddcdbdad9d8d7d6d5d4d3d2d1d0cfcecdcccbcac9c8c7c6c5c4c3c2c1c0" +
-                    "bfbebdbcbbbab9b8b7b6b5b4b3b2b1b0afaeadacabaaa9a8a7a6a5a4a3a2a1a0" +
-                    "9f9e9d9c9b9a999897969594939291908f8e8d8c8b8a89888786858483828180",
-                "a6654ddbd73cc3b05dd777105aa849bce49372eaaffc5568d254771bab85531c" +
-                    "94f780e7ffaae430d5d8af8c70eebbe1760f3b42b737a89cb363490d670314bd" +
-                    "8aa41ee63c2e1f45fbd477922f8360b388d6125ea6c7af0ad7056d01796e90c8" +
-                    "3313f4150a5716b30ed5f569288ae974ce2b4347926fce57de44512177dd7cde")
-        };
-
-    Threefish1024Test()
-    {
-        super(tests, new ThreefishEngine(ThreefishEngine.BLOCKSIZE_1024), new KeyParameter(new byte[128]));
-    }
-
-    public String getName()
-    {
-        return "Threefish-1024";
-    }
-
-    public static void main(
-        String[] args)
-    {
-        runTest(new Threefish1024Test());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/Threefish256Test.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/Threefish256Test.java
deleted file mode 100644
index 10bd608..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/Threefish256Test.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import org.bouncycastle.crypto.engines.ThreefishEngine;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.crypto.params.TweakableBlockCipherParameters;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-
-public class Threefish256Test
-    extends CipherTest
-{
-    // Test cases from skein_golden_kat_internals.txt in Skein 1.3 NIST CD
-    static SimpleTest[] tests =
-        {
-            new BlockCipherVectorTest(0, new ThreefishEngine(ThreefishEngine.BLOCKSIZE_256),
-                new TweakableBlockCipherParameters(
-                    new KeyParameter(new byte[32]),
-                    new byte[16]),
-                "0000000000000000000000000000000000000000000000000000000000000000",
-                "84da2a1f8beaee947066ae3e3103f1ad536db1f4a1192495116b9f3ce6133fd8"),
-            new BlockCipherVectorTest(1, new ThreefishEngine(ThreefishEngine.BLOCKSIZE_256),
-                new TweakableBlockCipherParameters(
-                    new KeyParameter(Hex.decode(
-                        "101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f")),
-                    Hex.decode("000102030405060708090a0b0c0d0e0f")),
-                "FFFEFDFCFBFAF9F8F7F6F5F4F3F2F1F0EFEEEDECEBEAE9E8E7E6E5E4E3E2E1E0",
-                "e0d091ff0eea8fdfc98192e62ed80ad59d865d08588df476657056b5955e97df")
-        };
-
-    Threefish256Test()
-    {
-        super(tests, new ThreefishEngine(ThreefishEngine.BLOCKSIZE_256), new KeyParameter(new byte[32]));
-    }
-
-    public String getName()
-    {
-        return "Threefish-256";
-    }
-
-    public static void main(
-        String[] args)
-    {
-        runTest(new Threefish256Test());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/Threefish512Test.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/Threefish512Test.java
deleted file mode 100644
index 1eb4e85..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/Threefish512Test.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import org.bouncycastle.crypto.engines.ThreefishEngine;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.crypto.params.TweakableBlockCipherParameters;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-
-public class Threefish512Test
-    extends CipherTest
-{
-    // Test cases from skein_golden_kat_internals.txt in Skein 1.3 NIST CD
-    static SimpleTest[] tests =
-        {
-            new BlockCipherVectorTest(0, new ThreefishEngine(ThreefishEngine.BLOCKSIZE_512),
-                new TweakableBlockCipherParameters(
-                    new KeyParameter(new byte[64]),
-                    new byte[16]),
-                "0000000000000000000000000000000000000000000000000000000000000000" +
-                    "0000000000000000000000000000000000000000000000000000000000000000",
-                "b1a2bbc6ef6025bc40eb3822161f36e375d1bb0aee3186fbd19e47c5d479947b" +
-                    "7bc2f8586e35f0cff7e7f03084b0b7b1f1ab3961a580a3e97eb41ea14a6d7bbe"),
-            new BlockCipherVectorTest(1, new ThreefishEngine(ThreefishEngine.BLOCKSIZE_512),
-                new TweakableBlockCipherParameters(
-                    new KeyParameter(Hex.decode(
-                        "101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f" +
-                            "303132333435363738393a3b3c3d3e3f404142434445464748494a4b4c4d4e4f")),
-                    Hex.decode("000102030405060708090a0b0c0d0e0f")),
-                "fffefdfcfbfaf9f8f7f6f5f4f3f2f1f0efeeedecebeae9e8e7e6e5e4e3e2e1e0" +
-                    "dfdedddcdbdad9d8d7d6d5d4d3d2d1d0cfcecdcccbcac9c8c7c6c5c4c3c2c1c0",
-                "e304439626d45a2cb401cad8d636249a6338330eb06d45dd8b36b90e97254779" +
-                    "272a0a8d99463504784420ea18c9a725af11dffea10162348927673d5c1caf3d")
-        };
-
-    Threefish512Test()
-    {
-        super(tests, new ThreefishEngine(ThreefishEngine.BLOCKSIZE_512), new KeyParameter(new byte[64]));
-    }
-
-    public String getName()
-    {
-        return "Threefish-512";
-    }
-
-    public static void main(
-        String[] args)
-    {
-        runTest(new Threefish512Test());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/TigerDigestTest.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/TigerDigestTest.java
deleted file mode 100644
index deb838f..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/TigerDigestTest.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.digests.TigerDigest;
-
-/**
- * Tiger Digest Test
- */
-public class TigerDigestTest
-    extends DigestTest
-{
-    final static String[] messages = {
-        "",
-        "abc",
-        "Tiger",
-        "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+-",
-        "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvw",
-        "ABCDEFGHIJKLMNOPQRSTUVWXYZ=abcdefghijklmnopqrstuvwxyz+0123456789",
-        "Tiger - A Fast New Hash Function, by Ross Anderson and Eli Biham, proceedings of Fast Software Encryption 3, Cambridge, 1996.",
-        "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+-ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+-"
-    };
-
-    final static String[] digests = {
-        "3293AC630C13F0245F92BBB1766E16167A4E58492DDE73F3",
-        "2AAB1484E8C158F2BFB8C5FF41B57A525129131C957B5F93",
-        "DD00230799F5009FEC6DEBC838BB6A27DF2B9D6F110C7937",
-        "F71C8583902AFB879EDFE610F82C0D4786A3A534504486B5",
-        "38F41D9D9A710A10C3727AC0DEEAA270727D9F926EC10139",
-        "48CEEB6308B87D46E95D656112CDF18D97915F9765658957",
-        "631ABDD103EB9A3D245B6DFD4D77B257FC7439501D1568DD",
-        "C54034E5B43EB8005848A7E0AE6AAC76E4FF590AE715FD25",
-        "C54034E5B43EB8005848A7E0AE6AAC76E4FF590AE715FD25"
-    };
-
-    final static String hash64k = "FDF4F5B35139F48E710E421BE5AF411DE1A8AAC333F26204";
-    
-    TigerDigestTest()
-    {
-        super(new TigerDigest(), messages, digests);
-    }
-
-    public void performTest()
-    {
-        super.performTest();
-        
-        sixtyFourKTest(hash64k);
-    }
-
-    protected Digest cloneDigest(Digest digest)
-    {
-        return new TigerDigest((TigerDigest)digest);
-    }
-    
-    public static void main(
-        String[]    args)
-    {
-        runTest(new TigerDigestTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/TwofishTest.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/TwofishTest.java
deleted file mode 100644
index 50a41c8..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/TwofishTest.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import org.bouncycastle.crypto.engines.TwofishEngine;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-
-public class TwofishTest
-    extends CipherTest
-{
-    static String key1 = "000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f";
-    static String key2 = "000102030405060708090a0b0c0d0e0f1011121314151617";
-    static String key3 = "000102030405060708090a0b0c0d0e0f";
-
-    static String input = "000102030405060708090A0B0C0D0E0F";
-
-    static SimpleTest[]  tests =
-    {
-        new BlockCipherVectorTest(0, new TwofishEngine(),
-                new KeyParameter(Hex.decode(key1)),
-                input, "8ef0272c42db838bcf7b07af0ec30f38"),
-        new BlockCipherVectorTest(1, new TwofishEngine(),
-                new KeyParameter(Hex.decode(key2)),
-                input, "95accc625366547617f8be4373d10cd7"),
-        new BlockCipherVectorTest(2, new TwofishEngine(),
-                new KeyParameter(Hex.decode(key3)),
-                input, "9fb63337151be9c71306d159ea7afaa4")
-    };
-
-    TwofishTest()
-    {
-        super(tests, new TwofishEngine(), new KeyParameter(new byte[32]));
-    }
-    
-    public String getName()
-    {
-        return "Twofish";
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        runTest(new TwofishTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/VMPCKSA3Test.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/VMPCKSA3Test.java
deleted file mode 100644
index 65fdfc2..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/VMPCKSA3Test.java
+++ /dev/null
@@ -1,97 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.engines.VMPCKSA3Engine;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.crypto.params.ParametersWithIV;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-
-/**
- * VMPC Test
- */
-public class VMPCKSA3Test extends SimpleTest
-{
-    private static final byte[] input = new byte[1000000];
-
-    public String getName()
-    {
-        return "VMPC-KSA3";
-    }
-
-    private void checkByte(byte[] array, int position, byte b)
-    {
-        if (array[position] != b)
-        {
-            fail("Fail on position " + position,
-                new String(Hex.encode(new byte[] { b })),
-                new String(Hex.encode(new byte[] { array[position] })));
-        }
-    }
-
-    public void performTest()
-    {
-        byte[] key = Hex.decode("9661410AB797D8A9EB767C21172DF6C7");
-        byte[] iv = Hex.decode("4B5C2F003E67F39557A8D26F3DA2B155");
-        CipherParameters kp = new KeyParameter(key);
-        CipherParameters kpwiv = new ParametersWithIV(kp, iv);
-
-        VMPCKSA3Engine engine = new VMPCKSA3Engine();
-
-        try
-        {
-            engine.init(true, kp);
-            fail("init failed to throw expected exception");
-        }
-        catch (IllegalArgumentException e)
-        {
-            // Expected
-        }
-
-        engine.init(true, kpwiv);
-        checkEngine(engine);
-
-        engine.reset();
-        byte[] output = checkEngine(engine);
-
-        engine.init(false, kpwiv);
-        byte[] recovered = new byte[output.length];
-        engine.processBytes(output, 0, output.length, recovered, 0);
-
-        if (!Arrays.areEqual(input, recovered))
-        {
-            fail("decrypted bytes differ from original bytes");
-        }
-    }
-
-    private byte[] checkEngine(VMPCKSA3Engine engine)
-    {
-        byte[] output = new byte[input.length];
-        engine.processBytes(input, 0, output.length, output, 0);
-
-        checkByte(output, 0, (byte) 0xB6);
-        checkByte(output, 1, (byte) 0xEB);
-        checkByte(output, 2, (byte) 0xAE);
-        checkByte(output, 3, (byte) 0xFE);
-        checkByte(output, 252, (byte) 0x48);
-        checkByte(output, 253, (byte) 0x17);
-        checkByte(output, 254, (byte) 0x24);
-        checkByte(output, 255, (byte) 0x73);
-        checkByte(output, 1020, (byte) 0x1D);
-        checkByte(output, 1021, (byte) 0xAE);
-        checkByte(output, 1022, (byte) 0xC3);
-        checkByte(output, 1023, (byte) 0x5A);
-        checkByte(output, 102396, (byte) 0x1D);
-        checkByte(output, 102397, (byte) 0xA7);
-        checkByte(output, 102398, (byte) 0xE1);
-        checkByte(output, 102399, (byte) 0xDC);
-
-        return output;
-    }
-
-    public static void main(String[] args)
-    {
-        runTest(new VMPCKSA3Test());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/VMPCMacTest.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/VMPCMacTest.java
deleted file mode 100644
index 50a0410..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/VMPCMacTest.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.macs.VMPCMac;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.crypto.params.ParametersWithIV;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-
-public class VMPCMacTest extends SimpleTest
-{
-    public String getName()
-    {
-        return "VMPC-MAC";
-    }
-
-    public static void main(String[] args)
-    {
-        runTest(new VMPCMacTest());
-    }
-
-    static byte[] output1 = Hex.decode("9BDA16E2AD0E284774A3ACBC8835A8326C11FAAD");
-
-    public void performTest() throws Exception
-    {
-        CipherParameters kp = new KeyParameter(
-            Hex.decode("9661410AB797D8A9EB767C21172DF6C7"));
-        CipherParameters kpwiv = new ParametersWithIV(kp,
-            Hex.decode("4B5C2F003E67F39557A8D26F3DA2B155"));
-
-        byte[] m = new byte[256];
-        for (int i = 0; i < 256; i++)
-        {
-            m[i] = (byte) i;
-        }
-
-        VMPCMac mac = new VMPCMac();
-        mac.init(kpwiv);
-
-        mac.update(m, 0, m.length);
-
-        byte[] out = new byte[20];
-        mac.doFinal(out, 0);
-
-        if (!Arrays.areEqual(out, output1))
-        {
-            fail("Fail", new String(Hex.encode(output1)), new String(Hex.encode(out)));
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/VMPCTest.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/VMPCTest.java
deleted file mode 100644
index cedffa4..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/VMPCTest.java
+++ /dev/null
@@ -1,97 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.engines.VMPCEngine;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.crypto.params.ParametersWithIV;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-
-/**
- * VMPC Test
- */
-public class VMPCTest extends SimpleTest
-{
-    private static final byte[] input = new byte[1000000];
-
-    public String getName()
-    {
-        return "VMPC";
-    }
-
-    private void checkByte(byte[] array, int position, byte b)
-    {
-        if (array[position] != b)
-        {
-            fail("Fail on position " + position,
-                new String(Hex.encode(new byte[] { b })),
-                new String(Hex.encode(new byte[] { array[position] })));
-        }
-    }
-
-    public void performTest()
-    {
-        byte[] key = Hex.decode("9661410AB797D8A9EB767C21172DF6C7");
-        byte[] iv = Hex.decode("4B5C2F003E67F39557A8D26F3DA2B155");
-        CipherParameters kp = new KeyParameter(key);
-        CipherParameters kpwiv = new ParametersWithIV(kp, iv);
-
-        VMPCEngine engine = new VMPCEngine();
-
-        try
-        {
-            engine.init(true, kp);
-            fail("init failed to throw expected exception");
-        }
-        catch (IllegalArgumentException e)
-        {
-            // Expected
-        }
-
-        engine.init(true, kpwiv);
-        checkEngine(engine);
-
-        engine.reset();
-        byte[] output = checkEngine(engine);
-
-        engine.init(false, kpwiv);
-        byte[] recovered = new byte[output.length];
-        engine.processBytes(output, 0, output.length, recovered, 0);
-
-        if (!Arrays.areEqual(input, recovered))
-        {
-            fail("decrypted bytes differ from original bytes");
-        }
-    }
-
-    private byte[] checkEngine(VMPCEngine engine)
-    {
-        byte[] output = new byte[input.length];
-        engine.processBytes(input, 0, output.length, output, 0);
-
-        checkByte(output, 0, (byte) 0xA8);
-        checkByte(output, 1, (byte) 0x24);
-        checkByte(output, 2, (byte) 0x79);
-        checkByte(output, 3, (byte) 0xF5);
-        checkByte(output, 252, (byte) 0xB8);
-        checkByte(output, 253, (byte) 0xFC);
-        checkByte(output, 254, (byte) 0x66);
-        checkByte(output, 255, (byte) 0xA4);
-        checkByte(output, 1020, (byte) 0xE0);
-        checkByte(output, 1021, (byte) 0x56);
-        checkByte(output, 1022, (byte) 0x40);
-        checkByte(output, 1023, (byte) 0xA5);
-        checkByte(output, 102396, (byte) 0x81);
-        checkByte(output, 102397, (byte) 0xCA);
-        checkByte(output, 102398, (byte) 0x49);
-        checkByte(output, 102399, (byte) 0x9A);
-
-        return output;
-    }
-
-    public static void main(String[] args)
-    {
-        runTest(new VMPCTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/WhirlpoolDigestTest.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/WhirlpoolDigestTest.java
deleted file mode 100644
index 542e6e6..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/WhirlpoolDigestTest.java
+++ /dev/null
@@ -1,105 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.digests.SHA1Digest;
-import org.bouncycastle.crypto.digests.WhirlpoolDigest;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-
-/**
- * ISO vector test for Whirlpool
- *  
- */
-public class WhirlpoolDigestTest 
-    extends DigestTest
-{
-    private static String[] messages =
-    {
-         "",
-         "a",
-         "abc",
-         "message digest",
-         "abcdefghijklmnopqrstuvwxyz",
-        "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789",
-        "12345678901234567890123456789012345678901234567890123456789012345678901234567890",
-        "abcdbcdecdefdefgefghfghighijhijk"
-    };
-
-    private static String[] digests =
-    {
-        "19FA61D75522A4669B44E39C1D2E1726C530232130D407F89AFEE0964997F7A73E83BE698B288FEBCF88E3E03C4F0757EA8964E59B63D93708B138CC42A66EB3",
-        "8ACA2602792AEC6F11A67206531FB7D7F0DFF59413145E6973C45001D0087B42D11BC645413AEFF63A42391A39145A591A92200D560195E53B478584FDAE231A",
-        "4E2448A4C6F486BB16B6562C73B4020BF3043E3A731BCE721AE1B303D97E6D4C7181EEBDB6C57E277D0E34957114CBD6C797FC9D95D8B582D225292076D4EEF5",
-        "378C84A4126E2DC6E56DCC7458377AAC838D00032230F53CE1F5700C0FFB4D3B8421557659EF55C106B4B52AC5A4AAA692ED920052838F3362E86DBD37A8903E",
-        "F1D754662636FFE92C82EBB9212A484A8D38631EAD4238F5442EE13B8054E41B08BF2A9251C30B6A0B8AAE86177AB4A6F68F673E7207865D5D9819A3DBA4EB3B",
-        "DC37E008CF9EE69BF11F00ED9ABA26901DD7C28CDEC066CC6AF42E40F82F3A1E08EBA26629129D8FB7CB57211B9281A65517CC879D7B962142C65F5A7AF01467",
-        "466EF18BABB0154D25B9D38A6414F5C08784372BCCB204D6549C4AFADB6014294D5BD8DF2A6C44E538CD047B2681A51A2C60481E88C5A20B2C2A80CF3A9A083B",
-        "2A987EA40F917061F5D6F0A0E4644F488A7A5A52DEEE656207C562F988E95C6916BDC8031BC5BE1B7B947639FE050B56939BAAA0ADFF9AE6745B7B181C3BE3FD"
-    };
-
-    WhirlpoolDigestTest()
-    {
-        super(new WhirlpoolDigest(), messages, digests);
-    }
-
-    protected Digest cloneDigest(Digest digest)
-    {
-        return new WhirlpoolDigest((WhirlpoolDigest)digest);
-    }
-
-    private static String _millionAResultVector = "0C99005BEB57EFF50A7CF005560DDF5D29057FD86B20BFD62DECA0F1CCEA4AF51FC15490EDDC47AF32BB2B66C34FF9AD8C6008AD677F77126953B226E4ED8B01";
-    
-    private static String _thirtyOneZeros = "3E3F188F8FEBBEB17A933FEAF7FE53A4858D80C915AD6A1418F0318E68D49B4E459223CD414E0FBC8A57578FD755D86E827ABEF4070FC1503E25D99E382F72BA";
-
-    public String getName()
-    {
-        return "Whirlpool";
-    }
-
-    public void performTest()
-    {
-        super.performTest();
-
-        byte[] thirtyOneZeros = new byte[31];
-        performStandardVectorTest("31 zeroes test", 
-                    thirtyOneZeros, _thirtyOneZeros);
-
-        byte[] millionAInByteArray = new byte[1000000];
-        Arrays.fill(millionAInByteArray, (byte)'a');
-
-        performStandardVectorTest("Million 'a' test", 
-                    millionAInByteArray, _millionAResultVector);
-    }
-
-    private void performStandardVectorTest(String testTitle, byte[] inputBytes,
-            String resultsAsHex)
-    {
-        doPerformTest(testTitle, inputBytes, resultsAsHex);        
-    }
-
-    private void doPerformTest(String testTitle, byte[] inputBytes, String resultsAsHex)
-    {
-        String resStr = createHexOutputFromDigest(inputBytes);
-        if (!resultsAsHex.equals(resStr.toUpperCase()))
-        {
-            fail(testTitle, resultsAsHex, resStr);
-        }
-    }
-
-    private String createHexOutputFromDigest(byte[] digestBytes)
-    {
-        String resStr;
-        Digest digest = new WhirlpoolDigest();
-        byte[] resBuf = new byte[digest.getDigestSize()];
-        digest.update(digestBytes, 0, digestBytes.length);
-        digest.doFinal(resBuf, 0);
-        resStr = new String(Hex.encode(resBuf));
-        return resStr;
-    }
-
-    public static void main(String[] args)
-    {
-        runTest(new WhirlpoolDigestTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/X931SignerTest.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/X931SignerTest.java
deleted file mode 100644
index a77e760..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/X931SignerTest.java
+++ /dev/null
@@ -1,138 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import java.math.BigInteger;
-
-import org.bouncycastle.crypto.digests.SHA1Digest;
-import org.bouncycastle.crypto.digests.SHA224Digest;
-import org.bouncycastle.crypto.engines.RSAEngine;
-import org.bouncycastle.crypto.params.RSAKeyParameters;
-import org.bouncycastle.crypto.params.RSAPrivateCrtKeyParameters;
-import org.bouncycastle.crypto.signers.X931Signer;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.encoders.Base64;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-
-public class X931SignerTest
-    extends SimpleTest
-{
-    public String getName()
-    {
-        return "X931Signer";
-    }
-
-    public void performTest() throws Exception
-    {
-        BigInteger rsaPubMod = new BigInteger(Base64.decode("AIASoe2PQb1IP7bTyC9usjHP7FvnUMVpKW49iuFtrw/dMpYlsMMoIU2jupfifDpdFxIktSB4P+6Ymg5WjvHKTIrvQ7SR4zV4jaPTu56Ys0pZ9EDA6gb3HLjtU+8Bb1mfWM+yjKxcPDuFjwEtjGlPHg1Vq+CA9HNcMSKNn2+tW6qt"));
-        BigInteger rsaPubExp = new BigInteger(Base64.decode("EQ=="));
-        BigInteger rsaPrivMod = new BigInteger(Base64.decode("AIASoe2PQb1IP7bTyC9usjHP7FvnUMVpKW49iuFtrw/dMpYlsMMoIU2jupfifDpdFxIktSB4P+6Ymg5WjvHKTIrvQ7SR4zV4jaPTu56Ys0pZ9EDA6gb3HLjtU+8Bb1mfWM+yjKxcPDuFjwEtjGlPHg1Vq+CA9HNcMSKNn2+tW6qt"));
-        BigInteger rsaPrivDP = new BigInteger(Base64.decode("JXzfzG5v+HtLJIZqYMUefJfFLu8DPuJGaLD6lI3cZ0babWZ/oPGoJa5iHpX4Ul/7l3s1PFsuy1GhzCdOdlfRcQ=="));
-        BigInteger rsaPrivDQ = new BigInteger(Base64.decode("YNdJhw3cn0gBoVmMIFRZzflPDNthBiWy/dUMSRfJCxoZjSnr1gysZHK01HteV1YYNGcwPdr3j4FbOfri5c6DUQ=="));
-        BigInteger rsaPrivExp = new BigInteger(Base64.decode("DxFAOhDajr00rBjqX+7nyZ/9sHWRCCp9WEN5wCsFiWVRPtdB+NeLcou7mWXwf1Y+8xNgmmh//fPV45G2dsyBeZbXeJwB7bzx9NMEAfedchyOwjR8PYdjK3NpTLKtZlEJ6Jkh4QihrXpZMO4fKZWUm9bid3+lmiq43FwW+Hof8/E="));
-        BigInteger rsaPrivP = new BigInteger(Base64.decode("AJ9StyTVW+AL/1s7RBtFwZGFBgd3zctBqzzwKPda6LbtIFDznmwDCqAlIQH9X14X7UPLokCDhuAa76OnDXb1OiE="));
-        BigInteger rsaPrivQ = new BigInteger(Base64.decode("AM3JfD79dNJ5A3beScSzPtWxx/tSLi0QHFtkuhtSizeXdkv5FSba7lVzwEOGKHmW829bRoNxThDy4ds1IihW1w0="));
-        BigInteger rsaPrivQinv = new BigInteger(Base64.decode("Lt0g7wrsNsQxuDdB8q/rH8fSFeBXMGLtCIqfOec1j7FEIuYA/ACiRDgXkHa0WgN7nLXSjHoy630wC5Toq8vvUg=="));
-        RSAKeyParameters rsaPublic = new RSAKeyParameters(false, rsaPubMod, rsaPubExp);
-        RSAPrivateCrtKeyParameters rsaPrivate = new RSAPrivateCrtKeyParameters(rsaPrivMod, rsaPubExp, rsaPrivExp, rsaPrivP, rsaPrivQ, rsaPrivDP, rsaPrivDQ, rsaPrivQinv);
-
-        byte[] msg = new byte[] { 1, 6, 3, 32, 7, 43, 2, 5, 7, 78, 4, 23 };
-
-        X931Signer signer = new X931Signer(new RSAEngine(), new SHA1Digest());
-        signer.init(true, rsaPrivate);
-        signer.update(msg, 0, msg.length);
-        byte[] sig = signer.generateSignature();
-
-        signer = new X931Signer(new RSAEngine(), new SHA1Digest());
-        signer.init(false, rsaPublic);
-        signer.update(msg, 0, msg.length);
-        if (!signer.verifySignature(sig))
-        {
-            fail("X9.31 Signer failed.");
-        }
-
-        shouldPassSignatureTest1();
-        shouldPassSignatureTest2();
-        shouldPassSignatureTest3();
-    }
-
-    private void shouldPassSignatureTest1()
-        throws Exception
-    {
-        BigInteger n = new BigInteger("c9be1b28f8caccca65d86cc3c9bbcc13eccc059df3b80bd2292b811eff3aa0dd75e1e85c333b8e3fa9bed53bb20f5359ff4e6900c5e9a388e3a4772a583a79e2299c76582c2b27694b65e9ba22e66bfb817f8b70b22206d7d8ae488c86dbb7137c26d5eff9b33c90e6cee640630313b7a715802e15142fef498c404a8de19674974785f0f852e2d470fe85a2e54ffca9f5851f672b71df691785a5cdabe8f14aa628942147de7593b2cf962414a5b59c632c4e14f1768c0ab2e9250824beea60a3529f11bf5e070ce90a47686eb0be1086fb21f0827f55295b4a48307db0b048c05a4aec3f488c576ca6f1879d354224c7e84cbcd8e76dd217a3de54dba73c35", 16);
-        BigInteger e = new BigInteger("e75b1b", 16);
-        byte[] msg = Hex.decode("5bb0d1c0ef9b5c7af2477fe08d45523d3842a4b2db943f7033126c2a7829bacb3d2cfc6497ec91688189e81b7f8742488224ba320ce983ce9480722f2cc5bc42611f00bb6311884f660ccc244788378673532edb05284fd92e83f6f6dab406209032e6af9a33c998677933e32d6fb95fd27408940d7728f9c9c40267ca1d20ce");
-        byte[] sig = Hex.decode("0fe8bb8e3109a1eb7489ef35bf4c1a0780071da789c8bd226a4170538eafefdd30b732d628f0e87a0b9450051feae9754d4fb61f57862d10f0bacc4f660d13281d0cd1141c006ade5186ff7d961a4c6cd0a4b352fc1295c5afd088f80ac1f8e192ef116a010a442655fe8ff5eeacea15807906fb0f0dfa86e680d4c005872357f7ece9aa4e20b15d5f709b30f08648ecaa34f2fbf54eb6b414fa2ff6f87561f70163235e69ccb4ac82a2e46d3be214cc2ef5263b569b2d8fd839b21a9e102665105ea762bda25bb446cfd831487a6b846100dee113ae95ae64f4af22c428c87bab809541c962bb3a56d4c86588e0af4ebc7fcc66dadced311051356d3ea745f7");
-
-        RSAKeyParameters rsaPublic = new RSAKeyParameters(false, n, e);
-        X931Signer signer = new X931Signer(new RSAEngine(), new SHA1Digest());
-
-        signer.init(false, rsaPublic);
-
-        signer.update(msg, 0, msg.length);
-
-        if (!signer.verifySignature(sig))
-        {
-            fail("RSA X931 verify test 1 failed.");
-        }
-    }
-
-    private void shouldPassSignatureTest2()
-        throws Exception
-    {
-        BigInteger n = new BigInteger("b746ba6c3c0be64bbe33aa55b2929b0af4e86d773d44bfe5914db9287788c4663984b61a418d2eecca30d752ff6b620a07ec72eeb2b422d2429da352407b99982800b9dd7697be6a7b1baa98ca5f4fc2fe33400f20b9dba337ac25c987804165d4a6e0ee4d18eabd6de5abdfe578cae6713ff91d16c80a5bb20217fe614d9509e75a43e1825327b9da8f0a9f6eeaa1c04b69fb4bacc073569fff4ab491becbe6d0441d437fc3fa823239c4a0f75321666b68dd3f66e2dd394089a15bcc288a68a4eb0a48e17d639743b9dea0a91cc35820544732aff253f8ca9967c609dc01c2f8cd0313a7a91cfa94ff74289a1d2b6f19d1811f4b9a65f4cce9e5759b4cc64f", 16);
-        BigInteger e = new BigInteger("dcbbdb", 16);
-        byte[] msg = Hex.decode("a5d3c8a060f897bbbc20ae0955052f37fbc70986b6e11c65075c9f457142bfa93856897c69020aa81a91b5e4f39e05cdeecc63395ab849c8262ca8bc5c96870aecb8edb0aba0024a9bdb71e06de6100344e5c318bc979ef32b8a49a8278ba99d4861bce42ebbc5c8c666aaa6cac39aff8779f2cae367620f9edd4cb1d80b6c8c");
-        byte[] sig = Hex.decode("39fbbd1804c689a533b0043f84da0f06081038c0fbf31e443e46a05e58f50de5198bbca40522afefaba3aed7082a6cb93b1da39f1f5a42246bf64930781948d300549bef0f8d554ecfca60a1b1ecba95a7014ee4545ad4f0c4e3a31942c6738b4ccd6244b6a21267dadf0826a5f713f13b1f5a9ab8501d957a26d4948278ac67851071a315674bdab173bfef2c2690c8373da6bf3d69f30c0e5da8883de872f59521b40793854085641adf98d13db991c5d0a8aaa0222934fa33332e90ef0b954e195cb267d6ffb36c96e14d1ec7b915a87598b4461a3146566354dc2ae748c84ee0cd46543b53ebff8cdf47725b280a1f799fb6ebb4a31ad2bdd5178250f83a");
-
-        RSAKeyParameters rsaPublic = new RSAKeyParameters(false, n, e);
-        X931Signer signer = new X931Signer(new RSAEngine(), new SHA224Digest());
-
-        signer.init(false, rsaPublic);
-
-        signer.update(msg, 0, msg.length);
-
-        if (!signer.verifySignature(sig))
-        {
-            fail("RSA X931 verify test 2 failed.");
-        }
-    }
-
-    private void shouldPassSignatureTest3()
-        throws Exception
-    {
-        BigInteger n = new BigInteger("dcb5686a3d2063a3f9cf7b9b32d2d3765b4c449b09b4960245a9111cd3b0cbd3260496885b8e1fa5db33b03efcc759d9c1afe29d93c6faebc7e0efada334b5b9a29655e2da2c8f11103d8203be311feab7ae88e9f1b2ec7d8fc655d77202b1681dd9717ec0f525b35584987e19539635a1ed23ca482a00149c609a23dc1645fd", 16);
-        BigInteger e = new BigInteger("00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000dc9f7", 16);
-        BigInteger d = new BigInteger("189d6345099098992e0c9ca5f281e1338092342fa0acc85cc2a111f30f9bd2fb4753cd1a48ef0ddca9bf1af33ec76fb2e23a9fb4896c26f2235b516f7c05ef7ae81e70f4b491a5fedba9b935e9c76d761a813ce7776ff8a1e5efe1166ff2eca26aa900da88c908d51af9de26977fe39719cc781df32216fa41b838f0c63803c3", 16);
-
-        byte[] msg = Hex.decode("911475c6e210ef4ac65b6fe8d2bfe5e01b959771b137c4ef69b88716e0d2ff9ebc1fad0f358c1dd7d50cc99a7b893ac9a6207076f08d8467d9e48c69c683bfe64a44dabaa3f7c243880f6ab7229bf7bb587822314fc5de5131983bfb2eef8b4bc1eac36f353724b567cd1ae8cddd64ddb7057549d5c81ad5fa3b5e751f00abf5");
-        byte[] sig = Hex.decode("02c50ec0ac8a7f38ef5630c396964d6a6daaa7e3083ab5b57fa2a2632f3b70e2e85c8456cd774d45d7e44fcb063f0f04fff9f1e3adfda11272535a92cb59320b190b5ee4261f23d6ceaa925df3a7bfa42e26bf61ea9645d9d64b3c90a820802768a6e209c9f83705375a3867afccc037e8242a98fa4c3db6b2d9877754d47289");
-
-        RSAKeyParameters rsaPublic = new RSAKeyParameters(false, n, e);
-        X931Signer signer = new X931Signer(new RSAEngine(), new SHA1Digest());
-
-        signer.init(true, new RSAKeyParameters(true, n, d));
-
-        signer.update(msg, 0, msg.length);
-
-        byte[] s = signer.generateSignature();
-
-        if (!Arrays.areEqual(sig, s))
-        {
-            fail("RSA X931 sig test 3 failed.");
-        }
-
-        signer.init(false, rsaPublic);
-
-        signer.update(msg, 0, msg.length);
-
-        if (!signer.verifySignature(sig))
-        {
-            fail("RSA X931 verify test 3 failed.");
-        }
-    }
-
-    public static void main(String[] args)
-    {
-        runTest(new X931SignerTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/XSalsa20Test.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/XSalsa20Test.java
deleted file mode 100644
index efbd5ec..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/XSalsa20Test.java
+++ /dev/null
@@ -1,166 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import org.bouncycastle.crypto.engines.XSalsa20Engine;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.crypto.params.ParametersWithIV;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-
-public class XSalsa20Test extends SimpleTest
-{
-    private static class TestCase
-    {
-
-        private byte[] key;
-        private byte[] iv;
-        private byte[] plaintext;
-        private byte[] ciphertext;
-
-        public TestCase(String key, String iv, String plaintext, String ciphertext)
-        {
-            this.key = Hex.decode(key);
-            this.iv = Hex.decode(iv);
-            this.plaintext = Hex.decode(plaintext);
-            this.ciphertext = Hex.decode(ciphertext);
-        }
-
-        public byte[] getKey()
-        {
-            return key;
-        }
-
-        public byte[] getIv()
-        {
-            return iv;
-        }
-
-        public byte[] getPlaintext()
-        {
-            return plaintext;
-        }
-
-        public byte[] getCiphertext()
-        {
-            return ciphertext;
-        }
-    }
-
-    // Test cases generated by naclcrypto-20090308, as used by cryptopp
-    private static final TestCase[] TEST_CASES = new TestCase[] {
-            new TestCase(
-                    "a6a7251c1e72916d11c2cb214d3c252539121d8e234e652d651fa4c8cff88030",
-                    "9e645a74e9e0a60d8243acd9177ab51a1beb8d5a2f5d700c",
-                    "093c5e5585579625337bd3ab619d615760d8c5b224a85b1d0efe0eb8a7ee163abb0376529fcc09bab506c618e13ce777d82c3ae9d1a6f972d4160287cbfe60bf2130fc0a6ff6049d0a5c8a82f429231f008082e845d7e189d37f9ed2b464e6b919e6523a8c1210bd52a02a4c3fe406d3085f5068d1909eeeca6369abc981a42e87fe665583f0ab85ae71f6f84f528e6b397af86f6917d9754b7320dbdc2fea81496f2732f532ac78c4e9c6cfb18f8e9bdf74622eb126141416776971a84f94d156beaf67aecbf2ad412e76e66e8fad7633f5b6d7f3d64b5c6c69ce29003c6024465ae3b89be78e915d88b4b5621d",
-                    "b2af688e7d8fc4b508c05cc39dd583d6714322c64d7f3e63147aede2d9534934b04ff6f337b031815cd094bdbc6d7a92077dce709412286822ef0737ee47f6b7ffa22f9d53f11dd2b0a3bb9fc01d9a88f9d53c26e9365c2c3c063bc4840bfc812e4b80463e69d179530b25c158f543191cff993106511aa036043bbc75866ab7e34afc57e2cce4934a5faae6eabe4f221770183dd060467827c27a354159a081275a291f69d946d6fe28ed0b9ce08206cf484925a51b9498dbde178ddd3ae91a8581b91682d860f840782f6eea49dbb9bd721501d2c67122dea3b7283848c5f13e0c0de876bd227a856e4de593a3"),
-            new TestCase(
-                    "9e1da239d155f52ad37f75c7368a536668b051952923ad44f57e75ab588e475a",
-                    "af06f17859dffa799891c4288f6635b5c5a45eee9017fd72",
-                    "feac9d54fc8c115ae247d9a7e919dd76cfcbc72d32cae4944860817cbdfb8c04e6b1df76a16517cd33ccf1acda9206389e9e318f5966c093cfb3ec2d9ee2de856437ed581f552f26ac2907609df8c613b9e33d44bfc21ff79153e9ef81a9d66cc317857f752cc175fd8891fefebb7d041e6517c3162d197e2112837d3bc4104312ad35b75ea686e7c70d4ec04746b52ff09c421451459fb59f",
-                    "2c261a2f4e61a62e1b27689916bf03453fcbc97bb2af6f329391ef063b5a219bf984d07d70f602d85f6db61474e9d9f5a2deecb4fcd90184d16f3b5b5e168ee03ea8c93f3933a22bc3d1a5ae8c2d8b02757c87c073409052a2a8a41e7f487e041f9a49a0997b540e18621cad3a24f0a56d9b19227929057ab3ba950f6274b121f193e32e06e5388781a1cb57317c0ba6305e910961d01002f0"),
-            new TestCase("d5c7f6797b7e7e9c1d7fd2610b2abf2bc5a7885fb3ff78092fb3abe8986d35e2",
-                    "744e17312b27969d826444640e9c4a378ae334f185369c95",
-                    "7758298c628eb3a4b6963c5445ef66971222be5d1a4ad839715d1188071739b77cc6e05d5410f963a64167629757",
-                    "27b8cfe81416a76301fd1eec6a4d99675069b2da2776c360db1bdfea7c0aa613913e10f7a60fec04d11e65f2d64e"),
-            new TestCase(
-                    "737d7811ce96472efed12258b78122f11deaec8759ccbd71eac6bbefa627785c",
-                    "6fb2ee3dda6dbd12f1274f126701ec75c35c86607adb3edd",
-                    "501325fb2645264864df11faa17bbd58312b77cad3d94ac8fb8542f0eb653ad73d7fce932bb874cb89ac39fc47f8267cf0f0c209f204b2d8578a3bdf461cb6a271a468bebaccd9685014ccbc9a73618c6a5e778a21cc8416c60ad24ddc417a130d53eda6dfbfe47d09170a7be1a708b7b5f3ad464310be36d9a2a95dc39e83d38667e842eb6411e8a23712297b165f690c2d7ca1b1346e3c1fccf5cafd4f8be0",
-                    "6724c372d2e9074da5e27a6c54b2d703dc1d4c9b1f8d90f00c122e692ace7700eadca942544507f1375b6581d5a8fb39981c1c0e6e1ff2140b082e9ec016fce141d5199647d43b0b68bfd0fea5e00f468962c7384dd6129aea6a3fdfe75abb210ed5607cef8fa0e152833d5ac37d52e557b91098a322e76a45bbbcf4899e790618aa3f4c2e5e0fc3de93269a577d77a5502e8ea02f717b1dd2df1ec69d8b61ca"),
-            new TestCase(
-                    "760158da09f89bbab2c99e6997f9523a95fcef10239bcca2573b7105f6898d34",
-                    "43636b2cc346fc8b7c85a19bf507bdc3dafe953b88c69dba",
-                    "d30a6d42dff49f0ed039a306bae9dec8d9e88366cc19e8c3642fd58fa0794ebf8029d949730339b0823a51f0f49f0d2c71f1051c1e0e2c86941f172789cdb1b0107413e70f982ff9761877bb526ef1c3eb1106a948d60ef21bd35d32cfd64f89b79ed63ecc5cca56246af736766f285d8e6b0da9cb1cd21020223ffacc5a32",
-                    "c815b6b79b64f9369aec8dce8c753df8a50f2bc97c70ce2f014db33a65ac5816bac9e30ac08bdded308c65cb87e28e2e71b677dc25c5a6499c1553555daf1f55270a56959dffa0c66f24e0af00951ec4bb59ccc3a6c5f52e0981647e53e439313a52c40fa7004c855b6e6eb25b212a138e843a9ba46edb2a039ee82a263abe"),
-            new TestCase(
-                    "27ba7e81e7edd4e71be53c07ce8e633138f287e155c7fa9e84c4ad804b7fa1b9",
-                    "ea05f4ebcd2fb6b000da0612861ba54ff5c176fb601391aa",
-                    "e09ff5d2cb050d69b2d42494bde5825238c756d6991d99d7a20d1ef0b83c371c89872690b2fc11d5369f4fc4971b6d3d6c078aef9b0f05c0e61ab89c025168054defeb03fef633858700c58b1262ce011300012673e893e44901dc18eee3105699c44c805897bdaf776af1833162a21a",
-                    "a23e7ef93c5d0667c96d9e404dcbe6be62026fa98f7a3ff9ba5d458643a16a1cef7272dc6097a9b52f35983557c77a11b314b4f7d5dc2cca15ee47616f861873cbfed1d32372171a61e38e447f3cf362b3abbb2ed4170d89dcb28187b7bfd206a3e026f084a7e0ed63d319de6bc9afc0"),
-            new TestCase("6799d76e5ffb5b4920bc2768bafd3f8c16554e65efcf9a16f4683a7a06927c11",
-                    "61ab951921e54ff06d9b77f313a4e49df7a057d5fd627989", "472766", "8fd7df"),
-            new TestCase(
-                    "f68238c08365bb293d26980a606488d09c2f109edafa0bbae9937b5cc219a49c",
-                    "5190b51e9b708624820b5abdf4e40fad1fb950ad1adc2d26",
-                    "47ec6b1f73c4b7ff5274a0bfd7f45f864812c85a12fbcb3c2cf8a3e90cf66ccf2eacb521e748363c77f52eb426ae57a0c6c78f75af71284569e79d1a92f949a9d69c4efc0b69902f1e36d7562765543e2d3942d9f6ff5948d8a312cff72c1afd9ea3088aff7640bfd265f7a9946e606abc77bcedae6bddc75a0dba0bd917d73e3bd1268f727e0096345da1ed25cf553ea7a98fea6b6f285732de37431561ee1b3064887fbcbd71935e02",
-                    "36160e88d3500529ba4edba17bc24d8cfaca9a0680b3b1fc97cf03f3675b7ac301c883a68c071bc54acdd3b63af4a2d72f985e51f9d60a4c7fd481af10b2fc75e252fdee7ea6b6453190617dcc6e2fe1cd56585fc2f0b0e97c5c3f8ad7eb4f31bc4890c03882aac24cc53acc1982296526690a220271c2f6e326750d3fbda5d5b63512c831f67830f59ac49aae330b3e0e02c9ea0091d19841f1b0e13d69c9fbfe8a12d6f30bb734d9d2"),
-            new TestCase(
-                    "45b2bd0de4ed9293ec3e26c4840faaf64b7d619d51e9d7a2c7e36c83d584c3df",
-                    "546c8c5d6be8f90952cab3f36d7c1957baaa7a59abe3d7e5",
-                    "5007c8cd5b3c40e17d7fe423a87ae0ced86bec1c39dc07a25772f3e96dabd56cd3fd7319f6c9654925f2d87087a700e1b130da796895d1c9b9acd62b266144067d373ed51e787498b03c52faad16bb3826fa511b0ed2a19a8663f5ba2d6ea7c38e7212e9697d91486c49d8a000b9a1935d6a7ff7ef23e720a45855481440463b4ac8c4f6e7062adc1f1e1e25d3d65a31812f58a71160",
-                    "8eacfba568898b10c0957a7d44100685e8763a71a69a8d16bc7b3f88085bb9a2f09642e4d09a9f0ad09d0aad66b22610c8bd02ff6679bb92c2c026a216bf425c6be35fb8dae7ff0c72b0efd6a18037c70eed0ca90062a49a3c97fdc90a8f9c2ea536bfdc41918a7582c9927fae47efaa3dc87967b7887dee1bf071734c7665901d9105dae2fdf66b4918e51d8f4a48c60d19fbfbbcba"),
-            new TestCase(
-                    "fe559c9a282beb40814d016d6bfcb2c0c0d8bf077b1110b8703a3ce39d70e0e1",
-                    "b076200cc7011259805e18b304092754002723ebec5d6200",
-                    "6db65b9ec8b114a944137c821fd606be75478d928366d5284096cdef782fcff7e8f59cb8ffcda979757902c5ffa6bc477ceaa4cb5d5ea76f94d91e833f823a6bc78f1055dfa6a97bea8965c1cde67a668e001257334a585727d9e0f7c1a06e88d3d25a4e6d9096c968bf138e116a3ebeffd4bb4808adb1fd698164ba0a35c709a47f16f1f4435a2345a9194a00b95abd51851d505809a6077da9baca5831afff31578c487ee68f2767974a98a7e803aac788da98319c4ea8eaa3d394855651f484cef543f537e35158ee29",
-                    "4dce9c8f97a028051b0727f34e1b9ef21f06f0760f36e71713204027902090ba2bb6b13436ee778d9f50530efbd7a32b0d41443f58ccaee781c7b716d3a96fdec0e3764ed7959f34c3941278591ea033b5cbadc0f1916032e9bebbd1a8395b83fb63b1454bd775bd20b3a2a96f951246ac14daf68166ba62f6cbff8bd121ac9498ff8852fd2be975df52b5daef3829d18eda42e715022dcbf930d0a789ee6a146c2c7088c35773c63c06b4af4559856ac199ced86863e4294707825337c5857970eb7fddeb263781309011"),
-            new TestCase(
-                    "0ae10012d7e56614b03dcc89b14bae9242ffe630f3d7e35ce8bbb97bbc2c92c3",
-                    "f96b025d6cf46a8a12ac2af1e2aef1fb83590adadaa5c5ea",
-                    "ea0f354e96f12bc72bbaa3d12b4a8ed879b042f0689878f46b651cc4116d6f78409b11430b3aaa30b2076891e8e1fa528f2fd169ed93dc9f84e24409eec2101daf4d057be2492d11de640cbd7b355ad29fb70400fffd7cd6d425abeeb732a0eaa4330af4c656252c4173deab653eb85c58462d7ab0f35fd12b613d29d473d330310dc323d3c66348bbdbb68a326324657cae7b77a9e34358f2cec50c85609e73056856796e3be8d62b6e2fe9f953",
-                    "e8abd48924b54e5b80866be7d4ebe5cf4274cafff08b39cb2d40a8f0b472398aedc776e0793812fbf1f60078635d2ed86b15efcdba60411ee23b07233592a44ec31b1013ce8964236675f8f183aef885e864f2a72edf4215b5338fa2b54653dfa1a8c55ce5d95cc605b9b311527f2e3463ffbec78a9d1d65dabad2f338769c9f43f133a791a11c7eca9af0b771a4ac32963dc8f631a2c11217ac6e1b9430c1aae1ceebe22703f429998a8fb8c641"),
-            new TestCase(
-                    "082c539bc5b20f97d767cd3f229eda80b2adc4fe49c86329b5cd6250a9877450",
-                    "845543502e8b64912d8f2c8d9fffb3c69365686587c08d0c",
-                    "a96bb7e910281a6dfad7c8a9c370674f0ceec1ad8d4f0de32f9ae4a23ed329e3d6bc708f876640a229153ac0e7281a8188dd77695138f01cda5f41d5215fd5c6bdd46d982cb73b1efe2997970a9fdbdb1e768d7e5db712068d8ba1af6067b5753495e23e6e1963af012f9c7ce450bf2de619d3d59542fb55f3",
-                    "835da74fc6de08cbda277a7966a07c8dcd627e7b17adde6d930b6581e3124b8baad096f693991fedb1572930601fc7709541839b8e3ffd5f033d2060d999c6c6e3048276613e648000acb5212cc632a916afce290e20ebdf612d08a6aa4c79a74b070d3f872a861f8dc6bb07614db515d363349d3a8e3336a3"),
-            new TestCase("3d02bff3375d403027356b94f514203737ee9a85d2052db3e4e5a217c259d18a",
-                    "74216c95031895f48c1dba651555ebfa3ca326a755237025",
-                    "0d4b0f54fd09ae39baa5fa4baccf2e6682e61b257e01f42b8f",
-                    "16c4006c28365190411eb1593814cf15e74c22238f210afc3d"),
-            new TestCase(
-                    "ad1a5c47688874e6663a0f3fa16fa7efb7ecadc175c468e5432914bdb480ffc6",
-                    "e489eed440f1aae1fac8fb7a9825635454f8f8f1f52e2fcc",
-                    "aa6c1e53580f03a9abb73bfdadedfecada4c6b0ebe020ef10db745e54ba861caf65f0e40dfc520203bb54d29e0a8f78f16b3f1aa525d6bfa33c54726e59988cfbec78056",
-                    "02fe84ce81e178e7aabdd3ba925a766c3c24756eefae33942af75e8b464556b5997e616f3f2dfc7fce91848afd79912d9fb55201b5813a5a074d2c0d4292c1fd441807c5"),
-            new TestCase(
-                    "053a02bedd6368c1fb8afc7a1b199f7f7ea2220c9a4b642a6850091c9d20ab9c",
-                    "c713eea5c26dad75ad3f52451e003a9cb0d649f917c89dde",
-                    "8f0a8a164760426567e388840276de3f95cb5e3fadc6ed3f3e4fe8bc169d9388804dcb94b6587dbb66cb0bd5f87b8e98b52af37ba290629b858e0e2aa7378047a26602",
-                    "516710e59843e6fbd4f25d0d8ca0ec0d47d39d125e9dad987e0518d49107014cb0ae405e30c2eb3794750bca142ce95e290cf95abe15e822823e2e7d3ab21bc8fbd445"),
-            new TestCase(
-                    "5b14ab0fbed4c58952548a6cb1e0000cf4481421f41288ea0aa84add9f7deb96",
-                    "54bf52b911231b952ba1a6af8e45b1c5a29d97e2abad7c83",
-                    "37fb44a675978b560ff9a4a87011d6f3ad2d37a2c3815b45a3c0e6d1b1d8b1784cd468927c2ee39e1dccd4765e1c3d676a335be1ccd6900a45f5d41a317648315d8a8c24adc64eb285f6aeba05b9029586353d303f17a807658b9ff790474e1737bd5fdc604aeff8dfcaf1427dcc3aacbb0256badcd183ed75a2dc52452f87d3c1ed2aa583472b0ab91cda20614e9b6fdbda3b49b098c95823cc72d8e5b717f2314b0324e9ce",
-                    "ae6deb5d6ce43d4b09d0e6b1c0e9f46157bcd8ab50eaa3197ff9fa2bf7af649eb52c68544fd3adfe6b1eb316f1f23538d470c30dbfec7e57b60cbcd096c782e7736b669199c8253e70214cf2a098fda8eac5da79a9496a3aae754d03b17c6d70d1027f42bf7f95ce3d1d9c338854e158fcc803e4d6262fb639521e47116ef78a7a437ca9427ba645cd646832feab822a208278e45e93e118d780b988d65397eddfd7a819526e"),
-            new TestCase(
-                    "d74636e3413a88d85f322ca80fb0bd650bd0bf0134e2329160b69609cd58a4b0",
-                    "efb606aa1d9d9f0f465eaa7f8165f1ac09f5cb46fecf2a57",
-                    "f85471b75f6ec81abac2799ec09e98e280b2ffd64ca285e5a0109cfb31ffab2d617b2c2952a2a8a788fc0da2af7f530758f74f1ab56391ab5ff2adbcc5be2d6c7f49fbe8118104c6ff9a23c6dfe52f57954e6a69dcee5db06f514f4a0a572a9a8525d961dae72269b987189d465df6107119c7fa790853e063cba0fab7800ca932e258880fd74c33c784675bedad0e7c09e9cc4d63dd5e9713d5d4a0196e6b562226ac31b4f57c04f90a181973737ddc7e80f364112a9fbb435ebdbcabf7d490ce52",
-                    "b2b795fe6c1d4c83c1327e015a67d4465fd8e32813575cbab263e20ef05864d2dc17e0e4eb81436adfe9f638dcc1c8d78f6b0306baf938e5d2ab0b3e05e735cc6fff2d6e02e3d60484bea7c7a8e13e23197fea7b04d47d48f4a4e5944174539492800d3ef51e2ee5e4c8a0bdf050c2dd3dd74fce5e7e5c37364f7547a11480a3063b9a0a157b15b10a5a954de2731ced055aa2e2767f0891d4329c426f3808ee867bed0dc75b5922b7cfb895700fda016105a4c7b7f0bb90f029f6bbcb04ac36ac16") };
-
-    public String getName()
-    {
-        return "XSalsa20";
-    }
-
-    public void performTest() throws Exception
-    {
-        for (int i = 0; i < TEST_CASES.length; i++)
-        {
-            performTest(i, TEST_CASES[i]);
-        }
-    }
-
-    private void performTest(int number, TestCase testCase)
-    {
-        final byte[] plaintext = testCase.getPlaintext();
-        byte[] output = new byte[plaintext.length];
-
-        XSalsa20Engine engine = new XSalsa20Engine();
-        engine.init(false, new ParametersWithIV(new KeyParameter(testCase.getKey()), testCase.getIv()));
-
-        engine.processBytes(testCase.getPlaintext(), 0, testCase.getPlaintext().length, output, 0);
-
-        if (!Arrays.areEqual(testCase.getCiphertext(), output))
-        {
-            fail("mismatch on " + number, new String(Hex.encode(testCase.getCiphertext())),
-                    new String(Hex.encode(output)));
-        }
-    }
-
-    public static void main(String[] args)
-    {
-        runTest(new XSalsa20Test());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/XTEATest.java b/bcprov/src/main/java/org/bouncycastle/crypto/test/XTEATest.java
deleted file mode 100644
index 2b5279e..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/XTEATest.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package org.bouncycastle.crypto.test;
-
-import org.bouncycastle.crypto.engines.XTEAEngine;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-
-/**
- * TEA tester - based on C implementation results from http://www.simonshepherd.supanet.com/tea.htm
- */
-public class XTEATest
-    extends CipherTest
-{
-    static SimpleTest[]  tests = {
-        new BlockCipherVectorTest(0, new XTEAEngine(),
-            new KeyParameter(Hex.decode("00000000000000000000000000000000")),
-            "0000000000000000",
-            "dee9d4d8f7131ed9"),
-        new BlockCipherVectorTest(1, new XTEAEngine(),
-            new KeyParameter(Hex.decode("00000000000000000000000000000000")),
-            "0102030405060708",
-            "065c1b8975c6a816"),
-        new BlockCipherVectorTest(2, new XTEAEngine(),
-            new KeyParameter(Hex.decode("0123456712345678234567893456789A")),
-            "0000000000000000",
-            "1ff9a0261ac64264"),
-        new BlockCipherVectorTest(3, new XTEAEngine(),
-            new KeyParameter(Hex.decode("0123456712345678234567893456789A")),
-            "0102030405060708",
-            "8c67155b2ef91ead"),
-            };
-
-    XTEATest()
-    {
-        super(tests, new XTEAEngine(), new KeyParameter(new byte[16]));
-    }
-
-    public String getName()
-    {
-        return "XTEA";
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        runTest(new XTEATest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/test/package.html b/bcprov/src/main/java/org/bouncycastle/crypto/test/package.html
deleted file mode 100644
index 7bb5e6b..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/test/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body bgcolor="#ffffff">
-Example code and test classes for the lightweight API.
-</body>
-</html>
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/AbstractTlsAgreementCredentials.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/AbstractTlsAgreementCredentials.java
deleted file mode 100644
index ef7f4fb..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/AbstractTlsAgreementCredentials.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-public abstract class AbstractTlsAgreementCredentials
-    extends AbstractTlsCredentials
-    implements TlsAgreementCredentials
-{
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/AbstractTlsCipherFactory.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/AbstractTlsCipherFactory.java
deleted file mode 100644
index 71a2cab..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/AbstractTlsCipherFactory.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-import java.io.IOException;
-
-public class AbstractTlsCipherFactory
-    implements TlsCipherFactory
-{
-    public TlsCipher createCipher(TlsContext context, int encryptionAlgorithm, int macAlgorithm)
-        throws IOException
-    {
-        throw new TlsFatalAlert(AlertDescription.internal_error);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/AbstractTlsClient.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/AbstractTlsClient.java
deleted file mode 100644
index a433b95..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/AbstractTlsClient.java
+++ /dev/null
@@ -1,249 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-import java.io.IOException;
-import java.util.Hashtable;
-import java.util.Vector;
-
-public abstract class AbstractTlsClient
-    extends AbstractTlsPeer
-    implements TlsClient
-{
-    protected TlsCipherFactory cipherFactory;
-
-    protected TlsClientContext context;
-
-    protected Vector supportedSignatureAlgorithms;
-    protected int[] namedCurves;
-    protected short[] clientECPointFormats, serverECPointFormats;
-
-    protected int selectedCipherSuite;
-    protected short selectedCompressionMethod;
-
-    public AbstractTlsClient()
-    {
-        this(new DefaultTlsCipherFactory());
-    }
-
-    public AbstractTlsClient(TlsCipherFactory cipherFactory)
-    {
-        this.cipherFactory = cipherFactory;
-    }
-
-    protected boolean allowUnexpectedServerExtension(Integer extensionType, byte[] extensionData)
-        throws IOException
-    {
-        switch (extensionType.intValue())
-        {
-        case ExtensionType.elliptic_curves:
-            /*
-             * Exception added based on field reports that some servers do send this, although the
-             * Supported Elliptic Curves Extension is clearly intended to be client-only. If
-             * present, we still require that it is a valid EllipticCurveList.
-             */
-            TlsECCUtils.readSupportedEllipticCurvesExtension(extensionData);
-            return true;
-        default:
-            return false;
-        }
-    }
-
-    protected void checkForUnexpectedServerExtension(Hashtable serverExtensions, Integer extensionType)
-        throws IOException
-    {
-        byte[] extensionData = TlsUtils.getExtensionData(serverExtensions, extensionType);
-        if (extensionData != null && !allowUnexpectedServerExtension(extensionType, extensionData))
-        {
-            throw new TlsFatalAlert(AlertDescription.illegal_parameter);
-        }
-    }
-
-    public void init(TlsClientContext context)
-    {
-        this.context = context;
-    }
-
-    public TlsSession getSessionToResume()
-    {
-        return null;
-    }
-
-    /**
-     * RFC 5246 E.1. "TLS clients that wish to negotiate with older servers MAY send any value
-     * {03,XX} as the record layer version number. Typical values would be {03,00}, the lowest
-     * version number supported by the client, and the value of ClientHello.client_version. No
-     * single value will guarantee interoperability with all old servers, but this is a complex
-     * topic beyond the scope of this document."
-     */
-    public ProtocolVersion getClientHelloRecordLayerVersion()
-    {
-        // "{03,00}"
-        // return ProtocolVersion.SSLv3;
-
-        // "the lowest version number supported by the client"
-        // return getMinimumVersion();
-
-        // "the value of ClientHello.client_version"
-        return getClientVersion();
-    }
-
-    public ProtocolVersion getClientVersion()
-    {
-        return ProtocolVersion.TLSv12;
-    }
-
-    public boolean isFallback()
-    {
-        /*
-         * draft-ietf-tls-downgrade-scsv-00 4. [..] is meant for use by clients that repeat a
-         * connection attempt with a downgraded protocol in order to avoid interoperability problems
-         * with legacy servers.
-         */
-        return false;
-    }
-
-    public Hashtable getClientExtensions()
-        throws IOException
-    {
-        Hashtable clientExtensions = null;
-
-        ProtocolVersion clientVersion = context.getClientVersion();
-
-        /*
-         * RFC 5246 7.4.1.4.1. Note: this extension is not meaningful for TLS versions prior to 1.2.
-         * Clients MUST NOT offer it if they are offering prior versions.
-         */
-        if (TlsUtils.isSignatureAlgorithmsExtensionAllowed(clientVersion))
-        {
-            // TODO Provide a way for the user to specify the acceptable hash/signature algorithms.
-
-            this.supportedSignatureAlgorithms = TlsUtils.getDefaultSupportedSignatureAlgorithms();
-
-            clientExtensions = TlsExtensionsUtils.ensureExtensionsInitialised(clientExtensions);
-
-            TlsUtils.addSignatureAlgorithmsExtension(clientExtensions, supportedSignatureAlgorithms);
-        }
-
-        if (TlsECCUtils.containsECCCipherSuites(getCipherSuites()))
-        {
-            /*
-             * RFC 4492 5.1. A client that proposes ECC cipher suites in its ClientHello message
-             * appends these extensions (along with any others), enumerating the curves it supports
-             * and the point formats it can parse. Clients SHOULD send both the Supported Elliptic
-             * Curves Extension and the Supported Point Formats Extension.
-             */
-            /*
-             * TODO Could just add all the curves since we support them all, but users may not want
-             * to use unnecessarily large fields. Need configuration options.
-             */
-            this.namedCurves = new int[]{ NamedCurve.secp256r1, NamedCurve.secp384r1 };
-            this.clientECPointFormats = new short[]{ ECPointFormat.uncompressed,
-                ECPointFormat.ansiX962_compressed_prime, ECPointFormat.ansiX962_compressed_char2, };
-
-            clientExtensions = TlsExtensionsUtils.ensureExtensionsInitialised(clientExtensions);
-
-            TlsECCUtils.addSupportedEllipticCurvesExtension(clientExtensions, namedCurves);
-            TlsECCUtils.addSupportedPointFormatsExtension(clientExtensions, clientECPointFormats);
-        }
-
-        return clientExtensions;
-    }
-
-    public ProtocolVersion getMinimumVersion()
-    {
-        return ProtocolVersion.TLSv10;
-    }
-
-    public void notifyServerVersion(ProtocolVersion serverVersion)
-        throws IOException
-    {
-        if (!getMinimumVersion().isEqualOrEarlierVersionOf(serverVersion))
-        {
-            throw new TlsFatalAlert(AlertDescription.protocol_version);
-        }
-    }
-
-    public short[] getCompressionMethods()
-    {
-        return new short[]{CompressionMethod._null};
-    }
-
-    public void notifySessionID(byte[] sessionID)
-    {
-        // Currently ignored
-    }
-
-    public void notifySelectedCipherSuite(int selectedCipherSuite)
-    {
-        this.selectedCipherSuite = selectedCipherSuite;
-    }
-
-    public void notifySelectedCompressionMethod(short selectedCompressionMethod)
-    {
-        this.selectedCompressionMethod = selectedCompressionMethod;
-    }
-
-    public void processServerExtensions(Hashtable serverExtensions)
-        throws IOException
-    {
-        /*
-         * TlsProtocol implementation validates that any server extensions received correspond to
-         * client extensions sent. By default, we don't send any, and this method is not called.
-         */
-        if (serverExtensions != null)
-        {
-            /*
-             * RFC 5246 7.4.1.4.1. Servers MUST NOT send this extension.
-             */
-            checkForUnexpectedServerExtension(serverExtensions, TlsUtils.EXT_signature_algorithms);
-
-            checkForUnexpectedServerExtension(serverExtensions, TlsECCUtils.EXT_elliptic_curves);
-
-            if (TlsECCUtils.isECCCipherSuite(this.selectedCipherSuite))
-            {
-                this.serverECPointFormats = TlsECCUtils.getSupportedPointFormatsExtension(serverExtensions);
-            }
-            else
-            {
-                checkForUnexpectedServerExtension(serverExtensions, TlsECCUtils.EXT_ec_point_formats);
-            }
-        }
-    }
-
-    public void processServerSupplementalData(Vector serverSupplementalData)
-        throws IOException
-    {
-        if (serverSupplementalData != null)
-        {
-            throw new TlsFatalAlert(AlertDescription.unexpected_message);
-        }
-    }
-
-    public Vector getClientSupplementalData()
-        throws IOException
-    {
-        return null;
-    }
-
-    public TlsCompression getCompression()
-        throws IOException
-    {
-        switch (selectedCompressionMethod)
-        {
-        case CompressionMethod._null:
-            return new TlsNullCompression();
-
-        default:
-            /*
-             * Note: internal error here; the TlsProtocol implementation verifies that the
-             * server-selected compression method was in the list of client-offered compression
-             * methods, so if we now can't produce an implementation, we shouldn't have offered it!
-             */
-            throw new TlsFatalAlert(AlertDescription.internal_error);
-        }
-    }
-
-    public void notifyNewSessionTicket(NewSessionTicket newSessionTicket)
-        throws IOException
-    {
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/AbstractTlsContext.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/AbstractTlsContext.java
deleted file mode 100644
index 4205725..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/AbstractTlsContext.java
+++ /dev/null
@@ -1,137 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-import java.security.SecureRandom;
-
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.prng.DigestRandomGenerator;
-import org.bouncycastle.crypto.prng.RandomGenerator;
-import org.bouncycastle.util.Times;
-
-abstract class AbstractTlsContext
-    implements TlsContext
-{
-    private static long counter = Times.nanoTime();
-
-    private synchronized static long nextCounterValue()
-    {
-        return ++counter;
-    }
-
-    private RandomGenerator nonceRandom;
-    private SecureRandom secureRandom;
-    private SecurityParameters securityParameters;
-
-    private ProtocolVersion clientVersion = null;
-    private ProtocolVersion serverVersion = null;
-    private TlsSession session = null;
-    private Object userObject = null;
-
-    AbstractTlsContext(SecureRandom secureRandom, SecurityParameters securityParameters)
-    {
-        Digest d = TlsUtils.createHash(HashAlgorithm.sha256);
-        byte[] seed = new byte[d.getDigestSize()];
-        secureRandom.nextBytes(seed);
-
-        this.nonceRandom = new DigestRandomGenerator(d);
-        nonceRandom.addSeedMaterial(nextCounterValue());
-        nonceRandom.addSeedMaterial(Times.nanoTime());
-        nonceRandom.addSeedMaterial(seed);
-
-        this.secureRandom = secureRandom;
-        this.securityParameters = securityParameters;
-    }
-
-    public RandomGenerator getNonceRandomGenerator()
-    {
-        return nonceRandom;
-    }
-
-    public SecureRandom getSecureRandom()
-    {
-        return secureRandom;
-    }
-
-    public SecurityParameters getSecurityParameters()
-    {
-        return securityParameters;
-    }
-
-    public ProtocolVersion getClientVersion()
-    {
-        return clientVersion;
-    }
-
-    void setClientVersion(ProtocolVersion clientVersion)
-    {
-        this.clientVersion = clientVersion;
-    }
-
-    public ProtocolVersion getServerVersion()
-    {
-        return serverVersion;
-    }
-
-    void setServerVersion(ProtocolVersion serverVersion)
-    {
-        this.serverVersion = serverVersion;
-    }
-
-    public TlsSession getResumableSession()
-    {
-        return session;
-    }
-
-    void setResumableSession(TlsSession session)
-    {
-        this.session = session;
-    }
-
-    public Object getUserObject()
-    {
-        return userObject;
-    }
-
-    public void setUserObject(Object userObject)
-    {
-        this.userObject = userObject;
-    }
-
-    public byte[] exportKeyingMaterial(String asciiLabel, byte[] context_value, int length)
-    {
-        if (context_value != null && !TlsUtils.isValidUint16(context_value.length))
-        {
-            throw new IllegalArgumentException("'context_value' must have length less than 2^16 (or be null)");
-        }
-
-        SecurityParameters sp = getSecurityParameters();
-        byte[] cr = sp.getClientRandom(), sr = sp.getServerRandom();
-
-        int seedLength = cr.length + sr.length;
-        if (context_value != null)
-        {
-            seedLength += (2 + context_value.length);
-        }
-
-        byte[] seed = new byte[seedLength];
-        int seedPos = 0;
-
-        System.arraycopy(cr, 0, seed, seedPos, cr.length);
-        seedPos += cr.length;
-        System.arraycopy(sr, 0, seed, seedPos, sr.length);
-        seedPos += sr.length;
-        if (context_value != null)
-        {
-            TlsUtils.writeUint16(context_value.length, seed, seedPos);
-            seedPos += 2;
-            System.arraycopy(context_value, 0, seed, seedPos, context_value.length);
-            seedPos += context_value.length;
-        }
-
-        if (seedPos != seedLength)
-        {
-            throw new IllegalStateException("error in calculation of seed for export");
-        }
-
-        return TlsUtils.PRF(this, sp.getMasterSecret(), asciiLabel, seed, length);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/AbstractTlsCredentials.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/AbstractTlsCredentials.java
deleted file mode 100644
index b98743f..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/AbstractTlsCredentials.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-public abstract class AbstractTlsCredentials
-    implements TlsCredentials
-{
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/AbstractTlsEncryptionCredentials.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/AbstractTlsEncryptionCredentials.java
deleted file mode 100644
index e6ff39b..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/AbstractTlsEncryptionCredentials.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-public abstract class AbstractTlsEncryptionCredentials
-    extends AbstractTlsCredentials
-    implements TlsEncryptionCredentials
-{
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/AbstractTlsKeyExchange.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/AbstractTlsKeyExchange.java
deleted file mode 100644
index 43e80e6..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/AbstractTlsKeyExchange.java
+++ /dev/null
@@ -1,166 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Vector;
-
-public abstract class AbstractTlsKeyExchange
-    implements TlsKeyExchange
-{
-    protected int keyExchange;
-    protected Vector supportedSignatureAlgorithms;
-
-    protected TlsContext context;
-
-    protected AbstractTlsKeyExchange(int keyExchange, Vector supportedSignatureAlgorithms)
-    {
-        this.keyExchange = keyExchange;
-        this.supportedSignatureAlgorithms = supportedSignatureAlgorithms;
-    }
-
-    public void init(TlsContext context)
-    {
-        this.context = context;
-
-        ProtocolVersion clientVersion = context.getClientVersion();
-
-        if (TlsUtils.isSignatureAlgorithmsExtensionAllowed(clientVersion))
-        {
-            /*
-             * RFC 5264 7.4.1.4.1. If the client does not send the signature_algorithms extension,
-             * the server MUST do the following:
-             * 
-             * - If the negotiated key exchange algorithm is one of (RSA, DHE_RSA, DH_RSA, RSA_PSK,
-             * ECDH_RSA, ECDHE_RSA), behave as if client had sent the value {sha1,rsa}.
-             * 
-             * - If the negotiated key exchange algorithm is one of (DHE_DSS, DH_DSS), behave as if
-             * the client had sent the value {sha1,dsa}.
-             * 
-             * - If the negotiated key exchange algorithm is one of (ECDH_ECDSA, ECDHE_ECDSA),
-             * behave as if the client had sent value {sha1,ecdsa}.
-             */
-            if (this.supportedSignatureAlgorithms == null)
-            {
-                switch (keyExchange)
-                {
-                case KeyExchangeAlgorithm.DH_DSS:
-                case KeyExchangeAlgorithm.DHE_DSS:
-                case KeyExchangeAlgorithm.SRP_DSS:
-                {
-                    this.supportedSignatureAlgorithms = TlsUtils.getDefaultDSSSignatureAlgorithms();
-                    break;
-                }
-
-                case KeyExchangeAlgorithm.ECDH_ECDSA:
-                case KeyExchangeAlgorithm.ECDHE_ECDSA:
-                {
-                    this.supportedSignatureAlgorithms = TlsUtils.getDefaultECDSASignatureAlgorithms();
-                    break;
-                }
-
-                case KeyExchangeAlgorithm.DH_RSA:
-                case KeyExchangeAlgorithm.DHE_RSA:
-                case KeyExchangeAlgorithm.ECDH_RSA:
-                case KeyExchangeAlgorithm.ECDHE_RSA:
-                case KeyExchangeAlgorithm.RSA:
-                case KeyExchangeAlgorithm.RSA_PSK:
-                case KeyExchangeAlgorithm.SRP_RSA:
-                {
-                    this.supportedSignatureAlgorithms = TlsUtils.getDefaultRSASignatureAlgorithms();
-                    break;
-                }
-
-                case KeyExchangeAlgorithm.DHE_PSK:
-                case KeyExchangeAlgorithm.ECDHE_PSK:
-                case KeyExchangeAlgorithm.PSK:
-                case KeyExchangeAlgorithm.SRP:
-                    break;
-
-                default:
-                    throw new IllegalStateException("unsupported key exchange algorithm");
-                }
-            }
-
-        }
-        else if (this.supportedSignatureAlgorithms != null)
-        {
-            throw new IllegalStateException("supported_signature_algorithms not allowed for " + clientVersion);
-        }
-    }
-
-    public void processServerCertificate(Certificate serverCertificate)
-        throws IOException
-    {
-        if (supportedSignatureAlgorithms == null)
-        {
-            /*
-             * TODO RFC 2264 7.4.2. Unless otherwise specified, the signing algorithm for the
-             * certificate must be the same as the algorithm for the certificate key.
-             */
-        }
-        else
-        {
-            /*
-             * TODO RFC 5264 7.4.2. If the client provided a "signature_algorithms" extension, then
-             * all certificates provided by the server MUST be signed by a hash/signature algorithm
-             * pair that appears in that extension.
-             */
-        }
-    }
-
-    public void processServerCredentials(TlsCredentials serverCredentials)
-        throws IOException
-    {
-        processServerCertificate(serverCredentials.getCertificate());
-    }
-
-    public boolean requiresServerKeyExchange()
-    {
-        return false;
-    }
-
-    public byte[] generateServerKeyExchange()
-        throws IOException
-    {
-        if (requiresServerKeyExchange())
-        {
-            throw new TlsFatalAlert(AlertDescription.internal_error);
-        }
-        return null;
-    }
-
-    public void skipServerKeyExchange()
-        throws IOException
-    {
-        if (requiresServerKeyExchange())
-        {
-            throw new TlsFatalAlert(AlertDescription.unexpected_message);
-        }
-    }
-
-    public void processServerKeyExchange(InputStream input)
-        throws IOException
-    {
-        if (!requiresServerKeyExchange())
-        {
-            throw new TlsFatalAlert(AlertDescription.unexpected_message);
-        }
-    }
-
-    public void skipClientCredentials()
-        throws IOException
-    {
-    }
-
-    public void processClientCertificate(Certificate clientCertificate)
-        throws IOException
-    {
-    }
-
-    public void processClientKeyExchange(InputStream input)
-        throws IOException
-    {
-        // Key exchange implementation MUST support client key exchange
-        throw new TlsFatalAlert(AlertDescription.internal_error);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/AbstractTlsPeer.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/AbstractTlsPeer.java
deleted file mode 100644
index a4c9c05..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/AbstractTlsPeer.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-import java.io.IOException;
-
-public abstract class AbstractTlsPeer
-    implements TlsPeer
-{
-    public boolean shouldUseGMTUnixTime()
-    {
-        /*
-         * draft-mathewson-no-gmtunixtime-00 2. For the reasons we discuss above, we recommend that
-         * TLS implementors MUST by default set the entire value the ClientHello.Random and
-         * ServerHello.Random fields, including gmt_unix_time, to a cryptographically random
-         * sequence.
-         */
-        return false;
-    }
-
-    public void notifySecureRenegotiation(boolean secureRenegotiation) throws IOException
-    {
-        if (!secureRenegotiation)
-        {
-            /*
-             * RFC 5746 3.4/3.6. In this case, some clients/servers may want to terminate the handshake instead
-             * of continuing; see Section 4.1/4.3 for discussion.
-             */
-            throw new TlsFatalAlert(AlertDescription.handshake_failure);
-        }
-    }
-
-    public void notifyAlertRaised(short alertLevel, short alertDescription, String message, Throwable cause)
-    {
-    }
-
-    public void notifyAlertReceived(short alertLevel, short alertDescription)
-    {
-    }
-
-    public void notifyHandshakeComplete() throws IOException
-    {
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/AbstractTlsServer.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/AbstractTlsServer.java
deleted file mode 100644
index 9ba0ce6..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/AbstractTlsServer.java
+++ /dev/null
@@ -1,350 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-import java.io.IOException;
-import java.util.Hashtable;
-import java.util.Vector;
-
-import org.bouncycastle.util.Arrays;
-
-public abstract class AbstractTlsServer
-    extends AbstractTlsPeer
-    implements TlsServer
-{
-    protected TlsCipherFactory cipherFactory;
-
-    protected TlsServerContext context;
-
-    protected ProtocolVersion clientVersion;
-    protected int[] offeredCipherSuites;
-    protected short[] offeredCompressionMethods;
-    protected Hashtable clientExtensions;
-
-    protected boolean encryptThenMACOffered;
-    protected short maxFragmentLengthOffered;
-    protected boolean truncatedHMacOffered;
-    protected Vector supportedSignatureAlgorithms;
-    protected boolean eccCipherSuitesOffered;
-    protected int[] namedCurves;
-    protected short[] clientECPointFormats, serverECPointFormats;
-
-    protected ProtocolVersion serverVersion;
-    protected int selectedCipherSuite;
-    protected short selectedCompressionMethod;
-    protected Hashtable serverExtensions;
-
-    public AbstractTlsServer()
-    {
-        this(new DefaultTlsCipherFactory());
-    }
-
-    public AbstractTlsServer(TlsCipherFactory cipherFactory)
-    {
-        this.cipherFactory = cipherFactory;
-    }
-
-    protected boolean allowEncryptThenMAC()
-    {
-        return true;
-    }
-
-    protected boolean allowTruncatedHMac()
-    {
-        return false;
-    }
-
-    protected Hashtable checkServerExtensions()
-    {
-        return this.serverExtensions = TlsExtensionsUtils.ensureExtensionsInitialised(this.serverExtensions);
-    }
-
-    protected abstract int[] getCipherSuites();
-
-    protected short[] getCompressionMethods()
-    {
-        return new short[]{CompressionMethod._null};
-    }
-
-    protected ProtocolVersion getMaximumVersion()
-    {
-        return ProtocolVersion.TLSv11;
-    }
-
-    protected ProtocolVersion getMinimumVersion()
-    {
-        return ProtocolVersion.TLSv10;
-    }
-
-    protected boolean supportsClientECCCapabilities(int[] namedCurves, short[] ecPointFormats)
-    {
-        // NOTE: BC supports all the current set of point formats so we don't check them here
-
-        if (namedCurves == null)
-        {
-            /*
-             * RFC 4492 4. A client that proposes ECC cipher suites may choose not to include these
-             * extensions. In this case, the server is free to choose any one of the elliptic curves
-             * or point formats [...].
-             */
-            return TlsECCUtils.hasAnySupportedNamedCurves();
-        }
-
-        for (int i = 0; i < namedCurves.length; ++i)
-        {
-            int namedCurve = namedCurves[i];
-            if (NamedCurve.isValid(namedCurve)
-                && (!NamedCurve.refersToASpecificNamedCurve(namedCurve) || TlsECCUtils.isSupportedNamedCurve(namedCurve)))
-            {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    public void init(TlsServerContext context)
-    {
-        this.context = context;
-    }
-
-    public void notifyClientVersion(ProtocolVersion clientVersion)
-        throws IOException
-    {
-        this.clientVersion = clientVersion;
-    }
-
-    public void notifyFallback(boolean isFallback) throws IOException
-    {
-        /*
-         * draft-ietf-tls-downgrade-scsv-00 3. If TLS_FALLBACK_SCSV appears in
-         * ClientHello.cipher_suites and the highest protocol version supported by the server is
-         * higher than the version indicated in ClientHello.client_version, the server MUST respond
-         * with an inappropriate_fallback alert.
-         */
-        if (isFallback && getMaximumVersion().isLaterVersionOf(clientVersion))
-        {
-            throw new TlsFatalAlert(AlertDescription.inappropriate_fallback);
-        }
-    }
-
-    public void notifyOfferedCipherSuites(int[] offeredCipherSuites)
-        throws IOException
-    {
-        this.offeredCipherSuites = offeredCipherSuites;
-        this.eccCipherSuitesOffered = TlsECCUtils.containsECCCipherSuites(this.offeredCipherSuites);
-    }
-
-    public void notifyOfferedCompressionMethods(short[] offeredCompressionMethods)
-        throws IOException
-    {
-        this.offeredCompressionMethods = offeredCompressionMethods;
-    }
-
-    public void processClientExtensions(Hashtable clientExtensions)
-        throws IOException
-    {
-        this.clientExtensions = clientExtensions;
-
-        if (clientExtensions != null)
-        {
-            this.encryptThenMACOffered = TlsExtensionsUtils.hasEncryptThenMACExtension(clientExtensions);
-            this.maxFragmentLengthOffered = TlsExtensionsUtils.getMaxFragmentLengthExtension(clientExtensions);
-            this.truncatedHMacOffered = TlsExtensionsUtils.hasTruncatedHMacExtension(clientExtensions);
-
-            this.supportedSignatureAlgorithms = TlsUtils.getSignatureAlgorithmsExtension(clientExtensions);
-            if (this.supportedSignatureAlgorithms != null)
-            {
-                /*
-                 * RFC 5246 7.4.1.4.1. Note: this extension is not meaningful for TLS versions prior
-                 * to 1.2. Clients MUST NOT offer it if they are offering prior versions.
-                 */
-                if (!TlsUtils.isSignatureAlgorithmsExtensionAllowed(clientVersion))
-                {
-                    throw new TlsFatalAlert(AlertDescription.illegal_parameter);
-                }
-            }
-
-            this.namedCurves = TlsECCUtils.getSupportedEllipticCurvesExtension(clientExtensions);
-            this.clientECPointFormats = TlsECCUtils.getSupportedPointFormatsExtension(clientExtensions);
-        }
-
-        /*
-         * RFC 4429 4. The client MUST NOT include these extensions in the ClientHello message if it
-         * does not propose any ECC cipher suites.
-         */
-        if (!this.eccCipherSuitesOffered && (this.namedCurves != null || this.clientECPointFormats != null))
-        {
-            throw new TlsFatalAlert(AlertDescription.illegal_parameter);
-        }
-    }
-
-    public ProtocolVersion getServerVersion()
-        throws IOException
-    {
-        if (getMinimumVersion().isEqualOrEarlierVersionOf(clientVersion))
-        {
-            ProtocolVersion maximumVersion = getMaximumVersion();
-            if (clientVersion.isEqualOrEarlierVersionOf(maximumVersion))
-            {
-                return serverVersion = clientVersion;
-            }
-            if (clientVersion.isLaterVersionOf(maximumVersion))
-            {
-                return serverVersion = maximumVersion;
-            }
-        }
-        throw new TlsFatalAlert(AlertDescription.protocol_version);
-    }
-
-    public int getSelectedCipherSuite()
-        throws IOException
-    {
-        /*
-         * TODO RFC 5246 7.4.3. In order to negotiate correctly, the server MUST check any candidate
-         * cipher suites against the "signature_algorithms" extension before selecting them. This is
-         * somewhat inelegant but is a compromise designed to minimize changes to the original
-         * cipher suite design.
-         */
-
-        /*
-         * RFC 4429 5.1. A server that receives a ClientHello containing one or both of these
-         * extensions MUST use the client's enumerated capabilities to guide its selection of an
-         * appropriate cipher suite. One of the proposed ECC cipher suites must be negotiated only
-         * if the server can successfully complete the handshake while using the curves and point
-         * formats supported by the client [...].
-         */
-        boolean eccCipherSuitesEnabled = supportsClientECCCapabilities(this.namedCurves, this.clientECPointFormats);
-
-        int[] cipherSuites = getCipherSuites();
-        for (int i = 0; i < cipherSuites.length; ++i)
-        {
-            int cipherSuite = cipherSuites[i];
-
-            if (Arrays.contains(this.offeredCipherSuites, cipherSuite)
-                && (eccCipherSuitesEnabled || !TlsECCUtils.isECCCipherSuite(cipherSuite))
-                && TlsUtils.isValidCipherSuiteForVersion(cipherSuite, serverVersion))
-            {
-                return this.selectedCipherSuite = cipherSuite;
-            }
-        }
-        throw new TlsFatalAlert(AlertDescription.handshake_failure);
-    }
-
-    public short getSelectedCompressionMethod()
-        throws IOException
-    {
-        short[] compressionMethods = getCompressionMethods();
-        for (int i = 0; i < compressionMethods.length; ++i)
-        {
-            if (Arrays.contains(offeredCompressionMethods, compressionMethods[i]))
-            {
-                return this.selectedCompressionMethod = compressionMethods[i];
-            }
-        }
-        throw new TlsFatalAlert(AlertDescription.handshake_failure);
-    }
-
-    // Hashtable is (Integer -> byte[])
-    public Hashtable getServerExtensions()
-        throws IOException
-    {
-        if (this.encryptThenMACOffered && allowEncryptThenMAC())
-        {
-            /*
-             * RFC 7366 3. If a server receives an encrypt-then-MAC request extension from a client
-             * and then selects a stream or Authenticated Encryption with Associated Data (AEAD)
-             * ciphersuite, it MUST NOT send an encrypt-then-MAC response extension back to the
-             * client.
-             */
-            if (TlsUtils.isBlockCipherSuite(this.selectedCipherSuite))
-            {
-                TlsExtensionsUtils.addEncryptThenMACExtension(checkServerExtensions());
-            }
-        }
-
-        if (this.maxFragmentLengthOffered >= 0 && MaxFragmentLength.isValid(maxFragmentLengthOffered))
-        {
-            TlsExtensionsUtils.addMaxFragmentLengthExtension(checkServerExtensions(), this.maxFragmentLengthOffered);
-        }
-
-        if (this.truncatedHMacOffered && allowTruncatedHMac())
-        {
-            TlsExtensionsUtils.addTruncatedHMacExtension(checkServerExtensions());
-        }
-
-        if (this.clientECPointFormats != null && TlsECCUtils.isECCCipherSuite(this.selectedCipherSuite))
-        {
-            /*
-             * RFC 4492 5.2. A server that selects an ECC cipher suite in response to a ClientHello
-             * message including a Supported Point Formats Extension appends this extension (along
-             * with others) to its ServerHello message, enumerating the point formats it can parse.
-             */
-            this.serverECPointFormats = new short[]{ ECPointFormat.uncompressed,
-                ECPointFormat.ansiX962_compressed_prime, ECPointFormat.ansiX962_compressed_char2, };
-
-            TlsECCUtils.addSupportedPointFormatsExtension(checkServerExtensions(), serverECPointFormats);
-        }
-
-        return serverExtensions;
-    }
-
-    public Vector getServerSupplementalData()
-        throws IOException
-    {
-        return null;
-    }
-
-    public CertificateStatus getCertificateStatus()
-        throws IOException
-    {
-        return null;
-    }
-
-    public CertificateRequest getCertificateRequest()
-        throws IOException
-    {
-        return null;
-    }
-
-    public void processClientSupplementalData(Vector clientSupplementalData)
-        throws IOException
-    {
-        if (clientSupplementalData != null)
-        {
-            throw new TlsFatalAlert(AlertDescription.unexpected_message);
-        }
-    }
-
-    public void notifyClientCertificate(Certificate clientCertificate)
-        throws IOException
-    {
-        throw new TlsFatalAlert(AlertDescription.internal_error);
-    }
-
-    public TlsCompression getCompression()
-        throws IOException
-    {
-        switch (selectedCompressionMethod)
-        {
-        case CompressionMethod._null:
-            return new TlsNullCompression();
-
-        default:
-            /*
-             * Note: internal error here; we selected the compression method, so if we now can't
-             * produce an implementation, we shouldn't have chosen it!
-             */
-            throw new TlsFatalAlert(AlertDescription.internal_error);
-        }
-    }
-
-    public NewSessionTicket getNewSessionTicket()
-        throws IOException
-    {
-        /*
-         * RFC 5077 3.3. If the server determines that it does not want to include a ticket after it
-         * has included the SessionTicket extension in the ServerHello, then it sends a zero-length
-         * ticket in the NewSessionTicket handshake message.
-         */
-        return new NewSessionTicket(0L, TlsUtils.EMPTY_BYTES);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/AbstractTlsSigner.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/AbstractTlsSigner.java
deleted file mode 100644
index 3a1d631..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/AbstractTlsSigner.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-import org.bouncycastle.crypto.CryptoException;
-import org.bouncycastle.crypto.Signer;
-import org.bouncycastle.crypto.params.AsymmetricKeyParameter;
-
-public abstract class AbstractTlsSigner
-    implements TlsSigner
-{
-    protected TlsContext context;
-
-    public void init(TlsContext context)
-    {
-        this.context = context;
-    }
-
-    public byte[] generateRawSignature(AsymmetricKeyParameter privateKey, byte[] md5AndSha1)
-        throws CryptoException
-    {
-        return generateRawSignature(null, privateKey, md5AndSha1);
-    }
-
-    public boolean verifyRawSignature(byte[] sigBytes, AsymmetricKeyParameter publicKey, byte[] md5AndSha1)
-        throws CryptoException
-    {
-        return verifyRawSignature(null, sigBytes, publicKey, md5AndSha1);
-    }
-
-    public Signer createSigner(AsymmetricKeyParameter privateKey)
-    {
-        return createSigner(null, privateKey);
-    }
-
-    public Signer createVerifyer(AsymmetricKeyParameter publicKey)
-    {
-        return createVerifyer(null, publicKey);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/AbstractTlsSignerCredentials.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/AbstractTlsSignerCredentials.java
deleted file mode 100644
index 3452f52..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/AbstractTlsSignerCredentials.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-public abstract class AbstractTlsSignerCredentials
-    extends AbstractTlsCredentials
-    implements TlsSignerCredentials
-{
-    public SignatureAndHashAlgorithm getSignatureAndHashAlgorithm()
-    {
-        throw new IllegalStateException("TlsSignerCredentials implementation does not support (D)TLS 1.2+");
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/AlertDescription.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/AlertDescription.java
deleted file mode 100644
index 3db267e..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/AlertDescription.java
+++ /dev/null
@@ -1,303 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-/**
- * RFC 5246 7.2.
- */
-public class AlertDescription
-{
-    /**
-     * This message notifies the recipient that the sender will not send any more messages on this
-     * connection. Note that as of TLS 1.1, failure to properly close a connection no longer
-     * requires that a session not be resumed. This is a change from TLS 1.0 ("The session becomes
-     * unresumable if any connection is terminated without proper close_notify messages with level
-     * equal to warning.") to conform with widespread implementation practice.
-     */
-    public static final short close_notify = 0;
-
-    /**
-     * An inappropriate message was received. This alert is always fatal and should never be
-     * observed in communication between proper implementations.
-     */
-    public static final short unexpected_message = 10;
-
-    /**
-     * This alert is returned if a record is received with an incorrect MAC. This alert also MUST be
-     * returned if an alert is sent because a TLSCiphertext decrypted in an invalid way: either it
-     * wasn't an even multiple of the block length, or its padding values, when checked, weren't
-     * correct. This message is always fatal and should never be observed in communication between
-     * proper implementations (except when messages were corrupted in the network).
-     */
-    public static final short bad_record_mac = 20;
-
-    /**
-     * This alert was used in some earlier versions of TLS, and may have permitted certain attacks
-     * against the CBC mode [CBCATT]. It MUST NOT be sent by compliant implementations.
-     */
-    public static final short decryption_failed = 21;
-
-    /**
-     * A TLSCiphertext record was received that had a length more than 2^14+2048 bytes, or a record
-     * decrypted to a TLSCompressed record with more than 2^14+1024 bytes. This message is always
-     * fatal and should never be observed in communication between proper implementations (except
-     * when messages were corrupted in the network).
-     */
-    public static final short record_overflow = 22;
-
-    /**
-     * The decompression function received improper input (e.g., data that would expand to excessive
-     * length). This message is always fatal and should never be observed in communication between
-     * proper implementations.
-     */
-    public static final short decompression_failure = 30;
-
-    /**
-     * Reception of a handshake_failure alert message indicates that the sender was unable to
-     * negotiate an acceptable set of security parameters given the options available. This is a
-     * fatal error.
-     */
-    public static final short handshake_failure = 40;
-
-    /**
-     * This alert was used in SSLv3 but not any version of TLS. It MUST NOT be sent by compliant
-     * implementations.
-     */
-    public static final short no_certificate = 41;
-
-    /**
-     * A certificate was corrupt, contained signatures that did not verify correctly, etc.
-     */
-    public static final short bad_certificate = 42;
-
-    /**
-     * A certificate was of an unsupported type.
-     */
-    public static final short unsupported_certificate = 43;
-
-    /**
-     * A certificate was revoked by its signer.
-     */
-    public static final short certificate_revoked = 44;
-
-    /**
-     * A certificate has expired or is not currently valid.
-     */
-    public static final short certificate_expired = 45;
-
-    /**
-     * Some other (unspecified) issue arose in processing the certificate, rendering it
-     * unacceptable.
-     */
-    public static final short certificate_unknown = 46;
-
-    /**
-     * A field in the handshake was out of range or inconsistent with other fields. This message is
-     * always fatal.
-     */
-    public static final short illegal_parameter = 47;
-
-    /**
-     * A valid certificate chain or partial chain was received, but the certificate was not accepted
-     * because the CA certificate could not be located or couldn't be matched with a known, trusted
-     * CA. This message is always fatal.
-     */
-    public static final short unknown_ca = 48;
-
-    /**
-     * A valid certificate was received, but when access control was applied, the sender decided not
-     * to proceed with negotiation. This message is always fatal.
-     */
-    public static final short access_denied = 49;
-
-    /**
-     * A message could not be decoded because some field was out of the specified range or the
-     * length of the message was incorrect. This message is always fatal and should never be
-     * observed in communication between proper implementations (except when messages were corrupted
-     * in the network).
-     */
-    public static final short decode_error = 50;
-
-    /**
-     * A handshake cryptographic operation failed, including being unable to correctly verify a
-     * signature or validate a Finished message. This message is always fatal.
-     */
-    public static final short decrypt_error = 51;
-
-    /**
-     * This alert was used in some earlier versions of TLS. It MUST NOT be sent by compliant
-     * implementations.
-     */
-    public static final short export_restriction = 60;
-
-    /**
-     * The protocol version the client has attempted to negotiate is recognized but not supported.
-     * (For example, old protocol versions might be avoided for security reasons.) This message is
-     * always fatal.
-     */
-    public static final short protocol_version = 70;
-
-    /**
-     * Returned instead of handshake_failure when a negotiation has failed specifically because the
-     * server requires ciphers more secure than those supported by the client. This message is
-     * always fatal.
-     */
-    public static final short insufficient_security = 71;
-
-    /**
-     * An internal error unrelated to the peer or the correctness of the protocol (such as a memory
-     * allocation failure) makes it impossible to continue. This message is always fatal.
-     */
-    public static final short internal_error = 80;
-
-    /**
-     * This handshake is being canceled for some reason unrelated to a protocol failure. If the user
-     * cancels an operation after the handshake is complete, just closing the connection by sending
-     * a close_notify is more appropriate. This alert should be followed by a close_notify. This
-     * message is generally a warning.
-     */
-    public static final short user_canceled = 90;
-
-    /**
-     * Sent by the client in response to a hello request or by the server in response to a client
-     * hello after initial handshaking. Either of these would normally lead to renegotiation; when
-     * that is not appropriate, the recipient should respond with this alert. At that point, the
-     * original requester can decide whether to proceed with the connection. One case where this
-     * would be appropriate is where a server has spawned a process to satisfy a request; the
-     * process might receive security parameters (key length, authentication, etc.) at startup, and
-     * it might be difficult to communicate changes to these parameters after that point. This
-     * message is always a warning.
-     */
-    public static final short no_renegotiation = 100;
-
-    /**
-     * Sent by clients that receive an extended server hello containing an extension that they did
-     * not put in the corresponding client hello. This message is always fatal.
-     */
-    public static final short unsupported_extension = 110;
-
-    /*
-     * RFC 3546
-     */
-
-    /**
-     * This alert is sent by servers who are unable to retrieve a certificate chain from the URL
-     * supplied by the client (see Section 3.3). This message MAY be fatal - for example if client
-     * authentication is required by the server for the handshake to continue and the server is
-     * unable to retrieve the certificate chain, it may send a fatal alert.
-     */
-    public static final short certificate_unobtainable = 111;
-
-    /**
-     * This alert is sent by servers that receive a server_name extension request, but do not
-     * recognize the server name. This message MAY be fatal.
-     */
-    public static final short unrecognized_name = 112;
-
-    /**
-     * This alert is sent by clients that receive an invalid certificate status response (see
-     * Section 3.6). This message is always fatal.
-     */
-    public static final short bad_certificate_status_response = 113;
-
-    /**
-     * This alert is sent by servers when a certificate hash does not match a client provided
-     * certificate_hash. This message is always fatal.
-     */
-    public static final short bad_certificate_hash_value = 114;
-
-    /*
-     * RFC 4279
-     */
-
-    /**
-     * If the server does not recognize the PSK identity, it MAY respond with an
-     * "unknown_psk_identity" alert message.
-     */
-    public static final short unknown_psk_identity = 115;
-
-    /*
-     * draft-ietf-tls-downgrade-scsv-00
-     */
-
-    /**
-     * If TLS_FALLBACK_SCSV appears in ClientHello.cipher_suites and the highest protocol version
-     * supported by the server is higher than the version indicated in ClientHello.client_version,
-     * the server MUST respond with an inappropriate_fallback alert.
-     */
-    public static final short inappropriate_fallback = 86;
-
-    public static String getName(short alertDescription)
-    {
-        switch (alertDescription)
-        {
-        case close_notify:
-            return "close_notify";
-        case unexpected_message:
-            return "unexpected_message";
-        case bad_record_mac:
-            return "bad_record_mac";
-        case decryption_failed:
-            return "decryption_failed";
-        case record_overflow:
-            return "record_overflow";
-        case decompression_failure:
-            return "decompression_failure";
-        case handshake_failure:
-            return "handshake_failure";
-        case no_certificate:
-            return "no_certificate";
-        case bad_certificate:
-            return "bad_certificate";
-        case unsupported_certificate:
-            return "unsupported_certificate";
-        case certificate_revoked:
-            return "certificate_revoked";
-        case certificate_expired:
-            return "certificate_expired";
-        case certificate_unknown:
-            return "certificate_unknown";
-        case illegal_parameter:
-            return "illegal_parameter";
-        case unknown_ca:
-            return "unknown_ca";
-        case access_denied:
-            return "access_denied";
-        case decode_error:
-            return "decode_error";
-        case decrypt_error:
-            return "decrypt_error";
-        case export_restriction:
-            return "export_restriction";
-        case protocol_version:
-            return "protocol_version";
-        case insufficient_security:
-            return "insufficient_security";
-        case internal_error:
-            return "internal_error";
-        case user_canceled:
-            return "user_canceled";
-        case no_renegotiation:
-            return "no_renegotiation";
-        case unsupported_extension:
-            return "unsupported_extension";
-        case certificate_unobtainable:
-            return "certificate_unobtainable";
-        case unrecognized_name:
-            return "unrecognized_name";
-        case bad_certificate_status_response:
-            return "bad_certificate_status_response";
-        case bad_certificate_hash_value:
-            return "bad_certificate_hash_value";
-        case unknown_psk_identity:
-            return "unknown_psk_identity";
-        case inappropriate_fallback:
-            return "inappropriate_fallback";
-        default:
-            return "UNKNOWN";
-        }
-    }
-
-    public static String getText(short alertDescription)
-    {
-        return getName(alertDescription) + "(" + alertDescription + ")";
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/AlertLevel.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/AlertLevel.java
deleted file mode 100644
index cd46830..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/AlertLevel.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-/**
- * RFC 5246 7.2
- */
-public class AlertLevel
-{
-    public static final short warning = 1;
-    public static final short fatal = 2;
-
-    public static String getName(short alertDescription)
-    {
-        switch (alertDescription)
-        {
-        case warning:
-            return "warning";
-        case fatal:
-            return "fatal";
-        default:
-            return "UNKNOWN";
-        }
-    }
-
-    public static String getText(short alertDescription)
-    {
-        return getName(alertDescription) + "(" + alertDescription + ")";
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/BasicTlsPSKIdentity.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/BasicTlsPSKIdentity.java
deleted file mode 100644
index fa65d54..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/BasicTlsPSKIdentity.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.Strings;
-
-public class BasicTlsPSKIdentity
-    implements TlsPSKIdentity
-{
-    protected byte[] identity;
-    protected byte[] psk;
-
-    public BasicTlsPSKIdentity(byte[] identity, byte[] psk)
-    {
-        this.identity = Arrays.clone(identity);
-        this.psk = Arrays.clone(psk);
-    }
-
-    public BasicTlsPSKIdentity(String identity, byte[] psk)
-    {
-        this.identity = Strings.toUTF8ByteArray(identity);
-        this.psk = Arrays.clone(psk);
-    }
-
-    public void skipIdentityHint()
-    {
-    }
-
-    public void notifyIdentityHint(byte[] psk_identity_hint)
-    {
-    }
-
-    public byte[] getPSKIdentity()
-    {
-        return identity;
-    }
-
-    public byte[] getPSK()
-    {
-        return psk;
-    }
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/BulkCipherAlgorithm.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/BulkCipherAlgorithm.java
deleted file mode 100644
index 7f013b3..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/BulkCipherAlgorithm.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-/**
- * RFC 2246
- * <p>
- * Note that the values here are implementation-specific and arbitrary. It is recommended not to
- * depend on the particular values (e.g. serialization).
- */
-public class BulkCipherAlgorithm
-{
-    public static final int _null = 0;
-    public static final int rc4 = 1;
-    public static final int rc2 = 2;
-    public static final int des = 3;
-    public static final int _3des = 4;
-    public static final int des40 = 5;
-
-    /*
-     * RFC 4346
-     */
-    public static final int aes = 6;
-    public static final int idea = 7;
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/ByteQueue.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/ByteQueue.java
deleted file mode 100644
index cfa72df..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/ByteQueue.java
+++ /dev/null
@@ -1,161 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-/**
- * A queue for bytes. This file could be more optimized.
- */
-public class ByteQueue
-{
-    /**
-     * @return The smallest number which can be written as 2^x which is bigger than i.
-     */
-    public static int nextTwoPow(int i)
-    {
-        /*
-         * This code is based of a lot of code I found on the Internet which mostly
-         * referenced a book called "Hacking delight".
-         */
-        i |= (i >> 1);
-        i |= (i >> 2);
-        i |= (i >> 4);
-        i |= (i >> 8);
-        i |= (i >> 16);
-        return i + 1;
-    }
-
-    /**
-     * The initial size for our buffer.
-     */
-    private static final int DEFAULT_CAPACITY = 1024;
-
-    /**
-     * The buffer where we store our data.
-     */
-    private byte[] databuf;
-
-    /**
-     * How many bytes at the beginning of the buffer are skipped.
-     */
-    private int skipped = 0;
-
-    /**
-     * How many bytes in the buffer are valid data.
-     */
-    private int available = 0;
-
-    public ByteQueue()
-    {
-        this(DEFAULT_CAPACITY);
-    }
-
-    public ByteQueue(int capacity)
-    {
-        databuf = new byte[capacity];
-    }
-
-    /**
-     * Read data from the buffer.
-     *
-     * @param buf    The buffer where the read data will be copied to.
-     * @param offset How many bytes to skip at the beginning of buf.
-     * @param len    How many bytes to read at all.
-     * @param skip   How many bytes from our data to skip.
-     */
-    public void read(byte[] buf, int offset, int len, int skip)
-    {
-        if ((buf.length - offset) < len)
-        {
-            throw new IllegalArgumentException("Buffer size of " + buf.length
-                + " is too small for a read of " + len + " bytes");
-        }
-        if ((available - skip) < len)
-        {
-            throw new IllegalStateException("Not enough data to read");
-        }
-        System.arraycopy(databuf, skipped + skip, buf, offset, len);
-    }
-
-    /**
-     * Add some data to our buffer.
-     *
-     * @param buf A byte-array to read data from.
-     * @param off How many bytes to skip at the beginning of the array.
-     * @param len How many bytes to read from the array.
-     */
-    public void addData(byte[] buf, int off, int len)
-    {
-        if ((skipped + available + len) > databuf.length)
-        {
-            int desiredSize = ByteQueue.nextTwoPow(available + len);
-            if (desiredSize > databuf.length)
-            {
-                byte[] tmp = new byte[desiredSize];
-                System.arraycopy(databuf, skipped, tmp, 0, available);
-                databuf = tmp;
-            }
-            else
-            {
-                System.arraycopy(databuf, skipped, databuf, 0, available);
-            }
-            skipped = 0;
-        }
-
-        System.arraycopy(buf, off, databuf, skipped + available, len);
-        available += len;
-    }
-
-    /**
-     * Remove some bytes from our data from the beginning.
-     *
-     * @param i How many bytes to remove.
-     */
-    public void removeData(int i)
-    {
-        if (i > available)
-        {
-            throw new IllegalStateException("Cannot remove " + i + " bytes, only got " + available);
-        }
-
-        /*
-         * Skip the data.
-         */
-        available -= i;
-        skipped += i;
-    }
-
-    /**
-     * Remove data from the buffer.
-     *
-     * @param buf The buffer where the removed data will be copied to.
-     * @param off How many bytes to skip at the beginning of buf.
-     * @param len How many bytes to read at all.
-     * @param skip How many bytes from our data to skip.
-     */
-    public void removeData(byte[] buf, int off, int len, int skip)
-    {
-        read(buf, off, len, skip);
-        removeData(skip + len);
-    }
-
-    public byte[] removeData(int len, int skip)
-    {
-        byte[] buf = new byte[len];
-        removeData(buf, 0, len, skip);
-        return buf;
-    }
-    
-    /**
-     * @deprecated Use 'available' instead
-     */
-    public int size()
-    {
-        return available;
-    }
-
-    /**
-     * @return The number of bytes which are available in this buffer.
-     */
-    public int available()
-    {
-        return available;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/CertChainType.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/CertChainType.java
deleted file mode 100644
index 8902ed7..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/CertChainType.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-/*
- * RFC 3546 3.3.
- */
-public class CertChainType
-{
-    public static final short individual_certs = 0;
-    public static final short pkipath = 1;
-
-    public static boolean isValid(short certChainType)
-    {
-        return certChainType >= individual_certs && certChainType <= pkipath;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/Certificate.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/Certificate.java
deleted file mode 100644
index 38f7d5b..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/Certificate.java
+++ /dev/null
@@ -1,140 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.Vector;
-
-import org.bouncycastle.asn1.ASN1Encoding;
-import org.bouncycastle.asn1.ASN1Primitive;
-
-/**
- * Parsing and encoding of a <i>Certificate</i> struct from RFC 4346.
- * <pre>
- * opaque ASN.1Cert&lt;2^24-1&gt;;
- *
- * struct {
- *     ASN.1Cert certificate_list&lt;0..2^24-1&gt;;
- * } Certificate;
- * </pre>
- *
- * @see org.bouncycastle.asn1.x509.Certificate
- */
-public class Certificate
-{
-    public static final Certificate EMPTY_CHAIN = new Certificate(
-        new org.bouncycastle.asn1.x509.Certificate[0]);
-
-    protected org.bouncycastle.asn1.x509.Certificate[] certificateList;
-
-    public Certificate(org.bouncycastle.asn1.x509.Certificate[] certificateList)
-    {
-        if (certificateList == null)
-        {
-            throw new IllegalArgumentException("'certificateList' cannot be null");
-        }
-
-        this.certificateList = certificateList;
-    }
-
-    /**
-     * @return an array of {@link org.bouncycastle.asn1.x509.Certificate} representing a certificate
-     *         chain.
-     */
-    public org.bouncycastle.asn1.x509.Certificate[] getCertificateList()
-    {
-        return cloneCertificateList();
-    }
-
-    public org.bouncycastle.asn1.x509.Certificate getCertificateAt(int index)
-    {
-        return certificateList[index];
-    }
-
-    public int getLength()
-    {
-        return certificateList.length;
-    }
-
-    /**
-     * @return <code>true</code> if this certificate chain contains no certificates, or
-     *         <code>false</code> otherwise.
-     */
-    public boolean isEmpty()
-    {
-        return certificateList.length == 0;
-    }
-
-    /**
-     * Encode this {@link Certificate} to an {@link OutputStream}.
-     *
-     * @param output the {@link OutputStream} to encode to.
-     * @throws IOException
-     */
-    public void encode(OutputStream output)
-        throws IOException
-    {
-        Vector derEncodings = new Vector(this.certificateList.length);
-
-        int totalLength = 0;
-        for (int i = 0; i < this.certificateList.length; ++i)
-        {
-            byte[] derEncoding = certificateList[i].getEncoded(ASN1Encoding.DER);
-            derEncodings.addElement(derEncoding);
-            totalLength += derEncoding.length + 3;
-        }
-
-        TlsUtils.checkUint24(totalLength);
-        TlsUtils.writeUint24(totalLength, output);
-
-        for (int i = 0; i < derEncodings.size(); ++i)
-        {
-            byte[] derEncoding = (byte[])derEncodings.elementAt(i);
-            TlsUtils.writeOpaque24(derEncoding, output);
-        }
-    }
-
-    /**
-     * Parse a {@link Certificate} from an {@link InputStream}.
-     *
-     * @param input the {@link InputStream} to parse from.
-     * @return a {@link Certificate} object.
-     * @throws IOException
-     */
-    public static Certificate parse(InputStream input)
-        throws IOException
-    {
-        int totalLength = TlsUtils.readUint24(input);
-        if (totalLength == 0)
-        {
-            return EMPTY_CHAIN;
-        }
-
-        byte[] certListData = TlsUtils.readFully(totalLength, input);
-
-        ByteArrayInputStream buf = new ByteArrayInputStream(certListData);
-
-        Vector certificate_list = new Vector();
-        while (buf.available() > 0)
-        {
-            byte[] derEncoding = TlsUtils.readOpaque24(buf);
-            ASN1Primitive asn1Cert = TlsUtils.readDERObject(derEncoding);
-            certificate_list.addElement(org.bouncycastle.asn1.x509.Certificate.getInstance(asn1Cert));
-        }
-
-        org.bouncycastle.asn1.x509.Certificate[] certificateList = new org.bouncycastle.asn1.x509.Certificate[certificate_list.size()];
-        for (int i = 0; i < certificate_list.size(); i++)
-        {
-            certificateList[i] = (org.bouncycastle.asn1.x509.Certificate)certificate_list.elementAt(i);
-        }
-        return new Certificate(certificateList);
-    }
-
-    protected org.bouncycastle.asn1.x509.Certificate[] cloneCertificateList()
-    {
-        org.bouncycastle.asn1.x509.Certificate[] result = new org.bouncycastle.asn1.x509.Certificate[certificateList.length];
-        System.arraycopy(certificateList, 0, result, 0, result.length);
-        return result;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/CertificateRequest.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/CertificateRequest.java
deleted file mode 100644
index 68e051e..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/CertificateRequest.java
+++ /dev/null
@@ -1,158 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.Vector;
-
-import org.bouncycastle.asn1.ASN1Encoding;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.x500.X500Name;
-
-/**
- * Parsing and encoding of a <i>CertificateRequest</i> struct from RFC 4346.
- * <pre>
- * struct {
- *     ClientCertificateType certificate_types&lt;1..2^8-1&gt;;
- *     DistinguishedName certificate_authorities&lt;3..2^16-1&gt;;
- * } CertificateRequest;
- * </pre>
- *
- * @see ClientCertificateType
- * @see X500Name
- */
-public class CertificateRequest
-{
-    protected short[] certificateTypes;
-    protected Vector supportedSignatureAlgorithms;
-    protected Vector certificateAuthorities;
-
-    /**
-     * @param certificateTypes       see {@link ClientCertificateType} for valid constants.
-     * @param certificateAuthorities a {@link Vector} of {@link X500Name}.
-     */
-    public CertificateRequest(short[] certificateTypes, Vector supportedSignatureAlgorithms, Vector certificateAuthorities)
-    {
-        this.certificateTypes = certificateTypes;
-        this.supportedSignatureAlgorithms = supportedSignatureAlgorithms;
-        this.certificateAuthorities = certificateAuthorities;
-    }
-
-    /**
-     * @return an array of certificate types
-     * @see ClientCertificateType
-     */
-    public short[] getCertificateTypes()
-    {
-        return certificateTypes;
-    }
-
-    /**
-     * @return a {@link Vector} of {@link SignatureAndHashAlgorithm} (or null before TLS 1.2).
-     */
-    public Vector getSupportedSignatureAlgorithms()
-    {
-        return supportedSignatureAlgorithms;
-    }
-
-    /**
-     * @return a {@link Vector} of {@link X500Name}
-     */
-    public Vector getCertificateAuthorities()
-    {
-        return certificateAuthorities;
-    }
-
-    /**
-     * Encode this {@link CertificateRequest} to an {@link OutputStream}.
-     *
-     * @param output the {@link OutputStream} to encode to.
-     * @throws IOException
-     */
-    public void encode(OutputStream output)
-        throws IOException
-    {
-        if (certificateTypes == null || certificateTypes.length == 0)
-        {
-            TlsUtils.writeUint8(0, output);
-        }
-        else
-        {
-            TlsUtils.writeUint8ArrayWithUint8Length(certificateTypes, output);
-        }
-
-        if (supportedSignatureAlgorithms != null)
-        {
-            // TODO Check whether SignatureAlgorithm.anonymous is allowed here
-            TlsUtils.encodeSupportedSignatureAlgorithms(supportedSignatureAlgorithms, false, output);
-        }
-
-        if (certificateAuthorities == null || certificateAuthorities.isEmpty())
-        {
-            TlsUtils.writeUint16(0, output);
-        }
-        else
-        {
-            Vector derEncodings = new Vector(certificateAuthorities.size());
-
-            int totalLength = 0;
-            for (int i = 0; i < certificateAuthorities.size(); ++i)
-            {
-                X500Name certificateAuthority = (X500Name)certificateAuthorities.elementAt(i);
-                byte[] derEncoding = certificateAuthority.getEncoded(ASN1Encoding.DER);
-                derEncodings.addElement(derEncoding);
-                totalLength += derEncoding.length + 2;
-            }
-
-            TlsUtils.checkUint16(totalLength);
-            TlsUtils.writeUint16(totalLength, output);
-
-            for (int i = 0; i < derEncodings.size(); ++i)
-            {
-                byte[] derEncoding = (byte[])derEncodings.elementAt(i);
-                TlsUtils.writeOpaque16(derEncoding, output);
-            }
-        }
-    }
-
-    /**
-     * Parse a {@link CertificateRequest} from an {@link InputStream}.
-     * 
-     * @param context
-     *            the {@link TlsContext} of the current connection.
-     * @param input
-     *            the {@link InputStream} to parse from.
-     * @return a {@link CertificateRequest} object.
-     * @throws IOException
-     */
-    public static CertificateRequest parse(TlsContext context, InputStream input)
-        throws IOException
-    {
-        int numTypes = TlsUtils.readUint8(input);
-        short[] certificateTypes = new short[numTypes];
-        for (int i = 0; i < numTypes; ++i)
-        {
-            certificateTypes[i] = TlsUtils.readUint8(input);
-        }
-
-        Vector supportedSignatureAlgorithms = null;
-        if (TlsUtils.isTLSv12(context))
-        {
-            // TODO Check whether SignatureAlgorithm.anonymous is allowed here
-            supportedSignatureAlgorithms = TlsUtils.parseSupportedSignatureAlgorithms(false, input);
-        }
-
-        Vector certificateAuthorities = new Vector();
-        byte[] certAuthData = TlsUtils.readOpaque16(input);
-        ByteArrayInputStream bis = new ByteArrayInputStream(certAuthData);
-        while (bis.available() > 0)
-        {
-            byte[] derEncoding = TlsUtils.readOpaque16(bis);
-            ASN1Primitive asn1 = TlsUtils.readDERObject(derEncoding);
-            certificateAuthorities.addElement(X500Name.getInstance(asn1));
-        }
-
-        return new CertificateRequest(certificateTypes, supportedSignatureAlgorithms, certificateAuthorities);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/CertificateStatus.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/CertificateStatus.java
deleted file mode 100644
index 34a0284..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/CertificateStatus.java
+++ /dev/null
@@ -1,105 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-import org.bouncycastle.asn1.ASN1Encoding;
-import org.bouncycastle.asn1.ocsp.OCSPResponse;
-
-public class CertificateStatus
-{
-    protected short statusType;
-    protected Object response;
-
-    public CertificateStatus(short statusType, Object response)
-    {
-        if (!isCorrectType(statusType, response))
-        {
-            throw new IllegalArgumentException("'response' is not an instance of the correct type");
-        }
-        
-        this.statusType = statusType;
-        this.response = response;
-    }
-
-    public short getStatusType()
-    {
-        return statusType;
-    }
-
-    public Object getResponse()
-    {
-        return response;
-    }
-
-    public OCSPResponse getOCSPResponse()
-    {
-        if (!isCorrectType(CertificateStatusType.ocsp, response))
-        {
-            throw new IllegalStateException("'response' is not an OCSPResponse");
-        }
-        return (OCSPResponse)response;
-    }
-
-    /**
-     * Encode this {@link CertificateStatus} to an {@link OutputStream}.
-     * 
-     * @param output
-     *            the {@link OutputStream} to encode to.
-     * @throws IOException
-     */
-    public void encode(OutputStream output) throws IOException
-    {
-        TlsUtils.writeUint8(statusType, output);
-
-        switch (statusType)
-        {
-        case CertificateStatusType.ocsp:
-            byte[] derEncoding = ((OCSPResponse) response).getEncoded(ASN1Encoding.DER);
-            TlsUtils.writeOpaque24(derEncoding, output);
-            break;
-        default:
-            throw new TlsFatalAlert(AlertDescription.internal_error);
-        }
-    }
-
-    /**
-     * Parse a {@link CertificateStatus} from an {@link InputStream}.
-     * 
-     * @param input
-     *            the {@link InputStream} to parse from.
-     * @return a {@link CertificateStatus} object.
-     * @throws IOException
-     */
-    public static CertificateStatus parse(InputStream input) throws IOException
-    {
-        short status_type = TlsUtils.readUint8(input);
-        Object response;
-
-        switch (status_type)
-        {
-        case CertificateStatusType.ocsp:
-        {
-            byte[] derEncoding = TlsUtils.readOpaque24(input);
-            response = OCSPResponse.getInstance(TlsUtils.readDERObject(derEncoding));
-            break;
-        }
-        default:
-            throw new TlsFatalAlert(AlertDescription.decode_error);
-        }
-
-        return new CertificateStatus(status_type, response);
-    }
-
-    protected static boolean isCorrectType(short statusType, Object response)
-    {
-        switch (statusType)
-        {
-        case CertificateStatusType.ocsp:
-            return response instanceof OCSPResponse;
-        default:
-            throw new IllegalArgumentException("'statusType' is an unsupported value");
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/CertificateStatusRequest.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/CertificateStatusRequest.java
deleted file mode 100644
index b947c48..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/CertificateStatusRequest.java
+++ /dev/null
@@ -1,98 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-public class CertificateStatusRequest
-{
-    protected short statusType;
-    protected Object request;
-
-    public CertificateStatusRequest(short statusType, Object request)
-    {
-        if (!isCorrectType(statusType, request))
-        {
-            throw new IllegalArgumentException("'request' is not an instance of the correct type");
-        }
-        
-        this.statusType = statusType;
-        this.request = request;
-    }
-
-    public short getStatusType()
-    {
-        return statusType;
-    }
-
-    public Object getRequest()
-    {
-        return request;
-    }
-
-    public OCSPStatusRequest getOCSPStatusRequest()
-    {
-        if (!isCorrectType(CertificateStatusType.ocsp, request))
-        {
-            throw new IllegalStateException("'request' is not an OCSPStatusRequest");
-        }
-        return (OCSPStatusRequest)request;
-    }
-
-    /**
-     * Encode this {@link CertificateStatusRequest} to an {@link OutputStream}.
-     * 
-     * @param output
-     *            the {@link OutputStream} to encode to.
-     * @throws IOException
-     */
-    public void encode(OutputStream output) throws IOException
-    {
-        TlsUtils.writeUint8(statusType, output);
-
-        switch (statusType)
-        {
-        case CertificateStatusType.ocsp:
-            ((OCSPStatusRequest) request).encode(output);
-            break;
-        default:
-            throw new TlsFatalAlert(AlertDescription.internal_error);
-        }
-    }
-
-    /**
-     * Parse a {@link CertificateStatusRequest} from an {@link InputStream}.
-     * 
-     * @param input
-     *            the {@link InputStream} to parse from.
-     * @return a {@link CertificateStatusRequest} object.
-     * @throws IOException
-     */
-    public static CertificateStatusRequest parse(InputStream input) throws IOException
-    {
-        short status_type = TlsUtils.readUint8(input);
-        Object result;
-
-        switch (status_type)
-        {
-        case CertificateStatusType.ocsp:
-            result = OCSPStatusRequest.parse(input);
-            break;
-        default:
-            throw new TlsFatalAlert(AlertDescription.decode_error);
-        }
-
-        return new CertificateStatusRequest(status_type, result);
-    }
-
-    protected static boolean isCorrectType(short statusType, Object request)
-    {
-        switch (statusType)
-        {
-        case CertificateStatusType.ocsp:
-            return request instanceof OCSPStatusRequest;
-        default:
-            throw new IllegalArgumentException("'statusType' is an unsupported value");
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/CertificateStatusType.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/CertificateStatusType.java
deleted file mode 100644
index bfe8298..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/CertificateStatusType.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-public class CertificateStatusType
-{
-    /*
-     *  RFC 3546 3.6
-     */
-    public static final short ocsp = 1;
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/CertificateURL.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/CertificateURL.java
deleted file mode 100644
index aab8908..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/CertificateURL.java
+++ /dev/null
@@ -1,133 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.Vector;
-
-/*
- * RFC 3546 3.3
- */
-public class CertificateURL
-{
-    protected short type;
-    protected Vector urlAndHashList;
-
-    /**
-     * @param type
-     *            see {@link CertChainType} for valid constants.
-     * @param urlAndHashList
-     *            a {@link Vector} of {@link URLAndHash}.
-     */
-    public CertificateURL(short type, Vector urlAndHashList)
-    {
-        if (!CertChainType.isValid(type))
-        {
-            throw new IllegalArgumentException("'type' is not a valid CertChainType value");
-        }
-        if (urlAndHashList == null || urlAndHashList.isEmpty())
-        {
-            throw new IllegalArgumentException("'urlAndHashList' must have length > 0");
-        }
-
-        this.type = type;
-        this.urlAndHashList = urlAndHashList;
-    }
-
-    /**
-     * @return {@link CertChainType}
-     */
-    public short getType()
-    {
-        return type;
-    }
-
-    /**
-     * @return a {@link Vector} of {@link URLAndHash} 
-     */
-    public Vector getURLAndHashList()
-    {
-        return urlAndHashList;
-    }
-
-    /**
-     * Encode this {@link CertificateURL} to an {@link OutputStream}.
-     *
-     * @param output the {@link OutputStream} to encode to.
-     * @throws IOException
-     */
-    public void encode(OutputStream output)
-        throws IOException
-    {
-        TlsUtils.writeUint8(this.type, output);
-
-        ListBuffer16 buf = new ListBuffer16();
-        for (int i = 0; i < this.urlAndHashList.size(); ++i)
-        {
-            URLAndHash urlAndHash = (URLAndHash)this.urlAndHashList.elementAt(i);
-            urlAndHash.encode(buf);
-        }
-        buf.encodeTo(output);
-    }
-
-    /**
-     * Parse a {@link CertificateURL} from an {@link InputStream}.
-     * 
-     * @param context
-     *            the {@link TlsContext} of the current connection.
-     * @param input
-     *            the {@link InputStream} to parse from.
-     * @return a {@link CertificateURL} object.
-     * @throws IOException
-     */
-    public static CertificateURL parse(TlsContext context, InputStream input)
-        throws IOException
-    {
-        short type = TlsUtils.readUint8(input);
-        if (!CertChainType.isValid(type))
-        {
-            throw new TlsFatalAlert(AlertDescription.decode_error);
-        }
-
-        int totalLength = TlsUtils.readUint16(input);
-        if (totalLength < 1)
-        {
-            throw new TlsFatalAlert(AlertDescription.decode_error);
-        }
-
-        byte[] urlAndHashListData = TlsUtils.readFully(totalLength, input);
-
-        ByteArrayInputStream buf = new ByteArrayInputStream(urlAndHashListData);
-
-        Vector url_and_hash_list = new Vector();
-        while (buf.available() > 0)
-        {
-            URLAndHash url_and_hash = URLAndHash.parse(context, buf);
-            url_and_hash_list.addElement(url_and_hash);
-        }
-
-        return new CertificateURL(type, url_and_hash_list);
-    }
-
-    // TODO Could be more generally useful
-    class ListBuffer16 extends ByteArrayOutputStream
-    {
-        ListBuffer16() throws IOException
-        {
-            // Reserve space for length
-            TlsUtils.writeUint16(0,  this);
-        }
-
-        void encodeTo(OutputStream output) throws IOException
-        {
-            // Patch actual length back in
-            int length = count - 2;
-            TlsUtils.checkUint16(length);
-            TlsUtils.writeUint16(length, buf, 0);
-            output.write(buf, 0, count);
-            buf = null;
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/Chacha20Poly1305.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/Chacha20Poly1305.java
deleted file mode 100644
index a82045b..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/Chacha20Poly1305.java
+++ /dev/null
@@ -1,156 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-import java.io.IOException;
-
-import org.bouncycastle.crypto.Mac;
-import org.bouncycastle.crypto.engines.ChaChaEngine;
-import org.bouncycastle.crypto.generators.Poly1305KeyGenerator;
-import org.bouncycastle.crypto.macs.Poly1305;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.crypto.params.ParametersWithIV;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.Pack;
-
-public class Chacha20Poly1305 implements TlsCipher
-{
-    protected TlsContext context;
-
-    protected ChaChaEngine encryptCipher;
-    protected ChaChaEngine decryptCipher;
-
-    public Chacha20Poly1305(TlsContext context) throws IOException
-    {
-        if (!TlsUtils.isTLSv12(context))
-        {
-            throw new TlsFatalAlert(AlertDescription.internal_error);
-        }
-
-        this.context = context;
-
-        byte[] key_block = TlsUtils.calculateKeyBlock(context, 64);
-
-        KeyParameter client_write_key = new KeyParameter(key_block, 0, 32);
-        KeyParameter server_write_key = new KeyParameter(key_block, 32, 32);
-
-        this.encryptCipher = new ChaChaEngine(20);
-        this.decryptCipher = new ChaChaEngine(20);
-
-        KeyParameter encryptKey, decryptKey;
-        if (context.isServer())
-        {
-            encryptKey = server_write_key;
-            decryptKey = client_write_key;
-        }
-        else
-        {
-            encryptKey = client_write_key;
-            decryptKey = server_write_key;
-        }
-
-        byte[] dummyNonce = new byte[8];
-
-        this.encryptCipher.init(true, new ParametersWithIV(encryptKey, dummyNonce));
-        this.decryptCipher.init(false, new ParametersWithIV(decryptKey, dummyNonce));
-    }
-
-    public int getPlaintextLimit(int ciphertextLimit)
-    {
-        return ciphertextLimit - 16;
-    }
-
-    public byte[] encodePlaintext(long seqNo, short type, byte[] plaintext, int offset, int len) throws IOException
-    {
-        int ciphertextLength = len + 16;
-
-        KeyParameter macKey = initRecordMAC(encryptCipher, true, seqNo);
-
-        byte[] output = new byte[ciphertextLength];
-        encryptCipher.processBytes(plaintext, offset, len, output, 0);
-
-        byte[] additionalData = getAdditionalData(seqNo, type, len);
-        byte[] mac = calculateRecordMAC(macKey, additionalData, output, 0, len);
-        System.arraycopy(mac, 0, output, len, mac.length);
-
-        return output;
-    }
-
-    public byte[] decodeCiphertext(long seqNo, short type, byte[] ciphertext, int offset, int len) throws IOException
-    {
-        if (getPlaintextLimit(len) < 0)
-        {
-            throw new TlsFatalAlert(AlertDescription.decode_error);
-        }
-
-        int plaintextLength = len - 16;
-
-        byte[] receivedMAC = Arrays.copyOfRange(ciphertext, offset + plaintextLength, offset + len);
-
-        KeyParameter macKey = initRecordMAC(decryptCipher, false, seqNo);
-
-        byte[] additionalData = getAdditionalData(seqNo, type, plaintextLength);
-        byte[] calculatedMAC = calculateRecordMAC(macKey, additionalData, ciphertext, offset, plaintextLength);
-
-        if (!Arrays.constantTimeAreEqual(calculatedMAC, receivedMAC))
-        {
-            throw new TlsFatalAlert(AlertDescription.bad_record_mac);
-        }
-
-        byte[] output = new byte[plaintextLength];
-        decryptCipher.processBytes(ciphertext, offset, plaintextLength, output, 0);
-
-        return output;
-    }
-
-    protected KeyParameter initRecordMAC(ChaChaEngine cipher, boolean forEncryption, long seqNo)
-    {
-        byte[] nonce = new byte[8];
-        TlsUtils.writeUint64(seqNo, nonce, 0);
-
-        cipher.init(forEncryption, new ParametersWithIV(null, nonce));
-
-        byte[] firstBlock = new byte[64];
-        cipher.processBytes(firstBlock, 0, firstBlock.length, firstBlock, 0);
-
-        // NOTE: The BC implementation puts 'r' after 'k'
-        System.arraycopy(firstBlock, 0, firstBlock, 32, 16);
-        KeyParameter macKey = new KeyParameter(firstBlock, 16, 32);
-        Poly1305KeyGenerator.clamp(macKey.getKey());
-        return macKey;
-    }
-
-    protected byte[] calculateRecordMAC(KeyParameter macKey, byte[] additionalData, byte[] buf, int off, int len)
-    {
-        Mac mac = new Poly1305();
-        mac.init(macKey);
-
-        updateRecordMAC(mac, additionalData, 0, additionalData.length);
-        updateRecordMAC(mac, buf, off, len);
-
-        byte[] output = new byte[mac.getMacSize()];
-        mac.doFinal(output, 0);
-        return output;
-    }
-
-    protected void updateRecordMAC(Mac mac, byte[] buf, int off, int len)
-    {
-        mac.update(buf, off, len);
-
-        byte[] longLen = Pack.longToLittleEndian(len & 0xFFFFFFFFL);
-        mac.update(longLen, 0, longLen.length);
-    }
-
-    protected byte[] getAdditionalData(long seqNo, short type, int len) throws IOException
-    {
-        /*
-         * additional_data = seq_num + TLSCompressed.type + TLSCompressed.version +
-         * TLSCompressed.length
-         */
-        byte[] additional_data = new byte[13];
-        TlsUtils.writeUint64(seqNo, additional_data, 0);
-        TlsUtils.writeUint8(type, additional_data, 8);
-        TlsUtils.writeVersion(context.getServerVersion(), additional_data, 9);
-        TlsUtils.writeUint16(len, additional_data, 11);
-
-        return additional_data;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/ChangeCipherSpec.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/ChangeCipherSpec.java
deleted file mode 100644
index a858ded..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/ChangeCipherSpec.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-public class ChangeCipherSpec
-{
-    public static final short change_cipher_spec = 1;
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/CipherSuite.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/CipherSuite.java
deleted file mode 100644
index 9374cec..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/CipherSuite.java
+++ /dev/null
@@ -1,376 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-/**
- * RFC 2246 A.5
- */
-public class CipherSuite
-{
-    public static final int TLS_NULL_WITH_NULL_NULL = 0x0000;
-    public static final int TLS_RSA_WITH_NULL_MD5 = 0x0001;
-    public static final int TLS_RSA_WITH_NULL_SHA = 0x0002;
-    public static final int TLS_RSA_EXPORT_WITH_RC4_40_MD5 = 0x0003;
-    public static final int TLS_RSA_WITH_RC4_128_MD5 = 0x0004;
-    public static final int TLS_RSA_WITH_RC4_128_SHA = 0x0005;
-    public static final int TLS_RSA_EXPORT_WITH_RC2_CBC_40_MD5 = 0x0006;
-    public static final int TLS_RSA_WITH_IDEA_CBC_SHA = 0x0007;
-    public static final int TLS_RSA_EXPORT_WITH_DES40_CBC_SHA = 0x0008;
-    public static final int TLS_RSA_WITH_DES_CBC_SHA = 0x0009;
-    public static final int TLS_RSA_WITH_3DES_EDE_CBC_SHA = 0x000A;
-    public static final int TLS_DH_DSS_EXPORT_WITH_DES40_CBC_SHA = 0x000B;
-    public static final int TLS_DH_DSS_WITH_DES_CBC_SHA = 0x000C;
-    public static final int TLS_DH_DSS_WITH_3DES_EDE_CBC_SHA = 0x000D;
-    public static final int TLS_DH_RSA_EXPORT_WITH_DES40_CBC_SHA = 0x000E;
-    public static final int TLS_DH_RSA_WITH_DES_CBC_SHA = 0x000F;
-    public static final int TLS_DH_RSA_WITH_3DES_EDE_CBC_SHA = 0x0010;
-    public static final int TLS_DHE_DSS_EXPORT_WITH_DES40_CBC_SHA = 0x0011;
-    public static final int TLS_DHE_DSS_WITH_DES_CBC_SHA = 0x0012;
-    public static final int TLS_DHE_DSS_WITH_3DES_EDE_CBC_SHA = 0x0013;
-    public static final int TLS_DHE_RSA_EXPORT_WITH_DES40_CBC_SHA = 0x0014;
-    public static final int TLS_DHE_RSA_WITH_DES_CBC_SHA = 0x0015;
-    public static final int TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA = 0x0016;
-    public static final int TLS_DH_anon_EXPORT_WITH_RC4_40_MD5 = 0x0017;
-    public static final int TLS_DH_anon_WITH_RC4_128_MD5 = 0x0018;
-    public static final int TLS_DH_anon_EXPORT_WITH_DES40_CBC_SHA = 0x0019;
-    public static final int TLS_DH_anon_WITH_DES_CBC_SHA = 0x001A;
-    public static final int TLS_DH_anon_WITH_3DES_EDE_CBC_SHA = 0x001B;
-
-    /*
-     * Note: The cipher suite values { 0x00, 0x1C } and { 0x00, 0x1D } are reserved to avoid
-     * collision with Fortezza-based cipher suites in SSL 3.
-     */
-
-    /*
-     * RFC 3268
-     */
-    public static final int TLS_RSA_WITH_AES_128_CBC_SHA = 0x002F;
-    public static final int TLS_DH_DSS_WITH_AES_128_CBC_SHA = 0x0030;
-    public static final int TLS_DH_RSA_WITH_AES_128_CBC_SHA = 0x0031;
-    public static final int TLS_DHE_DSS_WITH_AES_128_CBC_SHA = 0x0032;
-    public static final int TLS_DHE_RSA_WITH_AES_128_CBC_SHA = 0x0033;
-    public static final int TLS_DH_anon_WITH_AES_128_CBC_SHA = 0x0034;
-    public static final int TLS_RSA_WITH_AES_256_CBC_SHA = 0x0035;
-    public static final int TLS_DH_DSS_WITH_AES_256_CBC_SHA = 0x0036;
-    public static final int TLS_DH_RSA_WITH_AES_256_CBC_SHA = 0x0037;
-    public static final int TLS_DHE_DSS_WITH_AES_256_CBC_SHA = 0x0038;
-    public static final int TLS_DHE_RSA_WITH_AES_256_CBC_SHA = 0x0039;
-    public static final int TLS_DH_anon_WITH_AES_256_CBC_SHA = 0x003A;
-
-    /*
-     * RFC 5932
-     */
-    public static final int TLS_RSA_WITH_CAMELLIA_128_CBC_SHA = 0x0041;
-    public static final int TLS_DH_DSS_WITH_CAMELLIA_128_CBC_SHA = 0x0042;
-    public static final int TLS_DH_RSA_WITH_CAMELLIA_128_CBC_SHA = 0x0043;
-    public static final int TLS_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA = 0x0044;
-    public static final int TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA = 0x0045;
-    public static final int TLS_DH_anon_WITH_CAMELLIA_128_CBC_SHA = 0x0046;
-
-    public static final int TLS_RSA_WITH_CAMELLIA_256_CBC_SHA = 0x0084;
-    public static final int TLS_DH_DSS_WITH_CAMELLIA_256_CBC_SHA = 0x0085;
-    public static final int TLS_DH_RSA_WITH_CAMELLIA_256_CBC_SHA = 0x0086;
-    public static final int TLS_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA = 0x0087;
-    public static final int TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA = 0x0088;
-    public static final int TLS_DH_anon_WITH_CAMELLIA_256_CBC_SHA = 0x0089;
-
-    public static final int TLS_RSA_WITH_CAMELLIA_128_CBC_SHA256 = 0x00BA;
-    public static final int TLS_DH_DSS_WITH_CAMELLIA_128_CBC_SHA256 = 0x00BB;
-    public static final int TLS_DH_RSA_WITH_CAMELLIA_128_CBC_SHA256 = 0x00BC;
-    public static final int TLS_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA256 = 0x00BD;
-    public static final int TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA256 = 0x00BE;
-    public static final int TLS_DH_anon_WITH_CAMELLIA_128_CBC_SHA256 = 0x00BF;
-
-    public static final int TLS_RSA_WITH_CAMELLIA_256_CBC_SHA256 = 0x00C0;
-    public static final int TLS_DH_DSS_WITH_CAMELLIA_256_CBC_SHA256 = 0x00C1;
-    public static final int TLS_DH_RSA_WITH_CAMELLIA_256_CBC_SHA256 = 0x00C2;
-    public static final int TLS_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA256 = 0x00C3;
-    public static final int TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA256 = 0x00C4;
-    public static final int TLS_DH_anon_WITH_CAMELLIA_256_CBC_SHA256 = 0x00C5;
-
-    /*
-     * RFC 4162
-     */
-    public static final int TLS_RSA_WITH_SEED_CBC_SHA = 0x0096;
-    public static final int TLS_DH_DSS_WITH_SEED_CBC_SHA = 0x0097;
-    public static final int TLS_DH_RSA_WITH_SEED_CBC_SHA = 0x0098;
-    public static final int TLS_DHE_DSS_WITH_SEED_CBC_SHA = 0x0099;
-    public static final int TLS_DHE_RSA_WITH_SEED_CBC_SHA = 0x009A;
-    public static final int TLS_DH_anon_WITH_SEED_CBC_SHA = 0x009B;
-
-    /*
-     * RFC 4279
-     */
-    public static final int TLS_PSK_WITH_RC4_128_SHA = 0x008A;
-    public static final int TLS_PSK_WITH_3DES_EDE_CBC_SHA = 0x008B;
-    public static final int TLS_PSK_WITH_AES_128_CBC_SHA = 0x008C;
-    public static final int TLS_PSK_WITH_AES_256_CBC_SHA = 0x008D;
-    public static final int TLS_DHE_PSK_WITH_RC4_128_SHA = 0x008E;
-    public static final int TLS_DHE_PSK_WITH_3DES_EDE_CBC_SHA = 0x008F;
-    public static final int TLS_DHE_PSK_WITH_AES_128_CBC_SHA = 0x0090;
-    public static final int TLS_DHE_PSK_WITH_AES_256_CBC_SHA = 0x0091;
-    public static final int TLS_RSA_PSK_WITH_RC4_128_SHA = 0x0092;
-    public static final int TLS_RSA_PSK_WITH_3DES_EDE_CBC_SHA = 0x0093;
-    public static final int TLS_RSA_PSK_WITH_AES_128_CBC_SHA = 0x0094;
-    public static final int TLS_RSA_PSK_WITH_AES_256_CBC_SHA = 0x0095;
-
-    /*
-     * RFC 4492
-     */
-    public static final int TLS_ECDH_ECDSA_WITH_NULL_SHA = 0xC001;
-    public static final int TLS_ECDH_ECDSA_WITH_RC4_128_SHA = 0xC002;
-    public static final int TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA = 0xC003;
-    public static final int TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA = 0xC004;
-    public static final int TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA = 0xC005;
-    public static final int TLS_ECDHE_ECDSA_WITH_NULL_SHA = 0xC006;
-    public static final int TLS_ECDHE_ECDSA_WITH_RC4_128_SHA = 0xC007;
-    public static final int TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA = 0xC008;
-    public static final int TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA = 0xC009;
-    public static final int TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA = 0xC00A;
-    public static final int TLS_ECDH_RSA_WITH_NULL_SHA = 0xC00B;
-    public static final int TLS_ECDH_RSA_WITH_RC4_128_SHA = 0xC00C;
-    public static final int TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA = 0xC00D;
-    public static final int TLS_ECDH_RSA_WITH_AES_128_CBC_SHA = 0xC00E;
-    public static final int TLS_ECDH_RSA_WITH_AES_256_CBC_SHA = 0xC00F;
-    public static final int TLS_ECDHE_RSA_WITH_NULL_SHA = 0xC010;
-    public static final int TLS_ECDHE_RSA_WITH_RC4_128_SHA = 0xC011;
-    public static final int TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA = 0xC012;
-    public static final int TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA = 0xC013;
-    public static final int TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA = 0xC014;
-    public static final int TLS_ECDH_anon_WITH_NULL_SHA = 0xC015;
-    public static final int TLS_ECDH_anon_WITH_RC4_128_SHA = 0xC016;
-    public static final int TLS_ECDH_anon_WITH_3DES_EDE_CBC_SHA = 0xC017;
-    public static final int TLS_ECDH_anon_WITH_AES_128_CBC_SHA = 0xC018;
-    public static final int TLS_ECDH_anon_WITH_AES_256_CBC_SHA = 0xC019;
-
-    /*
-     * RFC 4785
-     */
-    public static final int TLS_PSK_WITH_NULL_SHA = 0x002C;
-    public static final int TLS_DHE_PSK_WITH_NULL_SHA = 0x002D;
-    public static final int TLS_RSA_PSK_WITH_NULL_SHA = 0x002E;
-
-    /*
-     * RFC 5054
-     */
-    public static final int TLS_SRP_SHA_WITH_3DES_EDE_CBC_SHA = 0xC01A;
-    public static final int TLS_SRP_SHA_RSA_WITH_3DES_EDE_CBC_SHA = 0xC01B;
-    public static final int TLS_SRP_SHA_DSS_WITH_3DES_EDE_CBC_SHA = 0xC01C;
-    public static final int TLS_SRP_SHA_WITH_AES_128_CBC_SHA = 0xC01D;
-    public static final int TLS_SRP_SHA_RSA_WITH_AES_128_CBC_SHA = 0xC01E;
-    public static final int TLS_SRP_SHA_DSS_WITH_AES_128_CBC_SHA = 0xC01F;
-    public static final int TLS_SRP_SHA_WITH_AES_256_CBC_SHA = 0xC020;
-    public static final int TLS_SRP_SHA_RSA_WITH_AES_256_CBC_SHA = 0xC021;
-    public static final int TLS_SRP_SHA_DSS_WITH_AES_256_CBC_SHA = 0xC022;
-
-    /*
-     * RFC 5246
-     */
-    public static final int TLS_RSA_WITH_NULL_SHA256 = 0x003B;
-    public static final int TLS_RSA_WITH_AES_128_CBC_SHA256 = 0x003C;
-    public static final int TLS_RSA_WITH_AES_256_CBC_SHA256 = 0x003D;
-    public static final int TLS_DH_DSS_WITH_AES_128_CBC_SHA256 = 0x003E;
-    public static final int TLS_DH_RSA_WITH_AES_128_CBC_SHA256 = 0x003F;
-    public static final int TLS_DHE_DSS_WITH_AES_128_CBC_SHA256 = 0x0040;
-    public static final int TLS_DHE_RSA_WITH_AES_128_CBC_SHA256 = 0x0067;
-    public static final int TLS_DH_DSS_WITH_AES_256_CBC_SHA256 = 0x0068;
-    public static final int TLS_DH_RSA_WITH_AES_256_CBC_SHA256 = 0x0069;
-    public static final int TLS_DHE_DSS_WITH_AES_256_CBC_SHA256 = 0x006A;
-    public static final int TLS_DHE_RSA_WITH_AES_256_CBC_SHA256 = 0x006B;
-    public static final int TLS_DH_anon_WITH_AES_128_CBC_SHA256 = 0x006C;
-    public static final int TLS_DH_anon_WITH_AES_256_CBC_SHA256 = 0x006D;
-
-    /*
-     * RFC 5288
-     */
-    public static final int TLS_RSA_WITH_AES_128_GCM_SHA256 = 0x009C;
-    public static final int TLS_RSA_WITH_AES_256_GCM_SHA384 = 0x009D;
-    public static final int TLS_DHE_RSA_WITH_AES_128_GCM_SHA256 = 0x009E;
-    public static final int TLS_DHE_RSA_WITH_AES_256_GCM_SHA384 = 0x009F;
-    public static final int TLS_DH_RSA_WITH_AES_128_GCM_SHA256 = 0x00A0;
-    public static final int TLS_DH_RSA_WITH_AES_256_GCM_SHA384 = 0x00A1;
-    public static final int TLS_DHE_DSS_WITH_AES_128_GCM_SHA256 = 0x00A2;
-    public static final int TLS_DHE_DSS_WITH_AES_256_GCM_SHA384 = 0x00A3;
-    public static final int TLS_DH_DSS_WITH_AES_128_GCM_SHA256 = 0x00A4;
-    public static final int TLS_DH_DSS_WITH_AES_256_GCM_SHA384 = 0x00A5;
-    public static final int TLS_DH_anon_WITH_AES_128_GCM_SHA256 = 0x00A6;
-    public static final int TLS_DH_anon_WITH_AES_256_GCM_SHA384 = 0x00A7;
-
-    /*
-     * RFC 5289
-     */
-    public static final int TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256 = 0xC023;
-    public static final int TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384 = 0xC024;
-    public static final int TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA256 = 0xC025;
-    public static final int TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA384 = 0xC026;
-    public static final int TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256 = 0xC027;
-    public static final int TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384 = 0xC028;
-    public static final int TLS_ECDH_RSA_WITH_AES_128_CBC_SHA256 = 0xC029;
-    public static final int TLS_ECDH_RSA_WITH_AES_256_CBC_SHA384 = 0xC02A;
-    public static final int TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256 = 0xC02B;
-    public static final int TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384 = 0xC02C;
-    public static final int TLS_ECDH_ECDSA_WITH_AES_128_GCM_SHA256 = 0xC02D;
-    public static final int TLS_ECDH_ECDSA_WITH_AES_256_GCM_SHA384 = 0xC02E;
-    public static final int TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 = 0xC02F;
-    public static final int TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 = 0xC030;
-    public static final int TLS_ECDH_RSA_WITH_AES_128_GCM_SHA256 = 0xC031;
-    public static final int TLS_ECDH_RSA_WITH_AES_256_GCM_SHA384 = 0xC032;
-
-    /*
-     * RFC 5487
-     */
-    public static final int TLS_PSK_WITH_AES_128_GCM_SHA256 = 0x00A8;
-    public static final int TLS_PSK_WITH_AES_256_GCM_SHA384 = 0x00A9;
-    public static final int TLS_DHE_PSK_WITH_AES_128_GCM_SHA256 = 0x00AA;
-    public static final int TLS_DHE_PSK_WITH_AES_256_GCM_SHA384 = 0x00AB;
-    public static final int TLS_RSA_PSK_WITH_AES_128_GCM_SHA256 = 0x00AC;
-    public static final int TLS_RSA_PSK_WITH_AES_256_GCM_SHA384 = 0x00AD;
-    public static final int TLS_PSK_WITH_AES_128_CBC_SHA256 = 0x00AE;
-    public static final int TLS_PSK_WITH_AES_256_CBC_SHA384 = 0x00AF;
-    public static final int TLS_PSK_WITH_NULL_SHA256 = 0x00B0;
-    public static final int TLS_PSK_WITH_NULL_SHA384 = 0x00B1;
-    public static final int TLS_DHE_PSK_WITH_AES_128_CBC_SHA256 = 0x00B2;
-    public static final int TLS_DHE_PSK_WITH_AES_256_CBC_SHA384 = 0x00B3;
-    public static final int TLS_DHE_PSK_WITH_NULL_SHA256 = 0x00B4;
-    public static final int TLS_DHE_PSK_WITH_NULL_SHA384 = 0x00B5;
-    public static final int TLS_RSA_PSK_WITH_AES_128_CBC_SHA256 = 0x00B6;
-    public static final int TLS_RSA_PSK_WITH_AES_256_CBC_SHA384 = 0x00B7;
-    public static final int TLS_RSA_PSK_WITH_NULL_SHA256 = 0x00B8;
-    public static final int TLS_RSA_PSK_WITH_NULL_SHA384 = 0x00B9;
-
-    /*
-     * RFC 5489
-     */
-    public static final int TLS_ECDHE_PSK_WITH_RC4_128_SHA = 0xC033;
-    public static final int TLS_ECDHE_PSK_WITH_3DES_EDE_CBC_SHA = 0xC034;
-    public static final int TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA = 0xC035;
-    public static final int TLS_ECDHE_PSK_WITH_AES_256_CBC_SHA = 0xC036;
-    public static final int TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA256 = 0xC037;
-    public static final int TLS_ECDHE_PSK_WITH_AES_256_CBC_SHA384 = 0xC038;
-    public static final int TLS_ECDHE_PSK_WITH_NULL_SHA = 0xC039;
-    public static final int TLS_ECDHE_PSK_WITH_NULL_SHA256 = 0xC03A;
-    public static final int TLS_ECDHE_PSK_WITH_NULL_SHA384 = 0xC03B;
-
-    /*
-     * RFC 5746
-     */
-    public static final int TLS_EMPTY_RENEGOTIATION_INFO_SCSV = 0x00FF;
-
-    /*
-     * RFC 6367
-     */
-    public static final int TLS_ECDHE_ECDSA_WITH_CAMELLIA_128_CBC_SHA256 = 0xC072;
-    public static final int TLS_ECDHE_ECDSA_WITH_CAMELLIA_256_CBC_SHA384 = 0xC073;
-    public static final int TLS_ECDH_ECDSA_WITH_CAMELLIA_128_CBC_SHA256 = 0xC074;
-    public static final int TLS_ECDH_ECDSA_WITH_CAMELLIA_256_CBC_SHA384 = 0xC075;
-    public static final int TLS_ECDHE_RSA_WITH_CAMELLIA_128_CBC_SHA256 = 0xC076;
-    public static final int TLS_ECDHE_RSA_WITH_CAMELLIA_256_CBC_SHA384 = 0xC077;
-    public static final int TLS_ECDH_RSA_WITH_CAMELLIA_128_CBC_SHA256 = 0xC078;
-    public static final int TLS_ECDH_RSA_WITH_CAMELLIA_256_CBC_SHA384 = 0xC079;
-
-    public static final int TLS_RSA_WITH_CAMELLIA_128_GCM_SHA256 = 0xC07A;
-    public static final int TLS_RSA_WITH_CAMELLIA_256_GCM_SHA384 = 0xC07B;
-    public static final int TLS_DHE_RSA_WITH_CAMELLIA_128_GCM_SHA256 = 0xC07C;
-    public static final int TLS_DHE_RSA_WITH_CAMELLIA_256_GCM_SHA384 = 0xC07D;
-    public static final int TLS_DH_RSA_WITH_CAMELLIA_128_GCM_SHA256 = 0xC07E;
-    public static final int TLS_DH_RSA_WITH_CAMELLIA_256_GCM_SHA384 = 0xC07F;
-    public static final int TLS_DHE_DSS_WITH_CAMELLIA_128_GCM_SHA256 = 0xC080;
-    public static final int TLS_DHE_DSS_WITH_CAMELLIA_256_GCM_SHA384 = 0xC081;
-    public static final int TLS_DH_DSS_WITH_CAMELLIA_128_GCM_SHA256 = 0xC082;
-    public static final int TLS_DH_DSS_WITH_CAMELLIA_256_GCM_SHA384 = 0xC083;
-    public static final int TLS_DH_anon_WITH_CAMELLIA_128_GCM_SHA256 = 0xC084;
-    public static final int TLS_DH_anon_WITH_CAMELLIA_256_GCM_SHA384 = 0xC085;
-    public static final int TLS_ECDHE_ECDSA_WITH_CAMELLIA_128_GCM_SHA256 = 0xC086;
-    public static final int TLS_ECDHE_ECDSA_WITH_CAMELLIA_256_GCM_SHA384 = 0xC087;
-    public static final int TLS_ECDH_ECDSA_WITH_CAMELLIA_128_GCM_SHA256 = 0xC088;
-    public static final int TLS_ECDH_ECDSA_WITH_CAMELLIA_256_GCM_SHA384 = 0xC089;
-    public static final int TLS_ECDHE_RSA_WITH_CAMELLIA_128_GCM_SHA256 = 0xC08A;
-    public static final int TLS_ECDHE_RSA_WITH_CAMELLIA_256_GCM_SHA384 = 0xC08B;
-    public static final int TLS_ECDH_RSA_WITH_CAMELLIA_128_GCM_SHA256 = 0xC08C;
-    public static final int TLS_ECDH_RSA_WITH_CAMELLIA_256_GCM_SHA384 = 0xC08D;
-
-    public static final int TLS_PSK_WITH_CAMELLIA_128_GCM_SHA256 = 0xC08E;
-    public static final int TLS_PSK_WITH_CAMELLIA_256_GCM_SHA384 = 0xC08F;
-    public static final int TLS_DHE_PSK_WITH_CAMELLIA_128_GCM_SHA256 = 0xC090;
-    public static final int TLS_DHE_PSK_WITH_CAMELLIA_256_GCM_SHA384 = 0xC091;
-    public static final int TLS_RSA_PSK_WITH_CAMELLIA_128_GCM_SHA256 = 0xC092;
-    public static final int TLS_RSA_PSK_WITH_CAMELLIA_256_GCM_SHA384 = 0xC093;
-    public static final int TLS_PSK_WITH_CAMELLIA_128_CBC_SHA256 = 0xC094;
-    public static final int TLS_PSK_WITH_CAMELLIA_256_CBC_SHA384 = 0xC095;
-    public static final int TLS_DHE_PSK_WITH_CAMELLIA_128_CBC_SHA256 = 0xC096;
-    public static final int TLS_DHE_PSK_WITH_CAMELLIA_256_CBC_SHA384 = 0xC097;
-    public static final int TLS_RSA_PSK_WITH_CAMELLIA_128_CBC_SHA256 = 0xC098;
-    public static final int TLS_RSA_PSK_WITH_CAMELLIA_256_CBC_SHA384 = 0xC099;
-    public static final int TLS_ECDHE_PSK_WITH_CAMELLIA_128_CBC_SHA256 = 0xC09A;
-    public static final int TLS_ECDHE_PSK_WITH_CAMELLIA_256_CBC_SHA384 = 0xC09B;
-
-    /*
-     * RFC 6655
-     */
-    public static final int TLS_RSA_WITH_AES_128_CCM = 0xC09C;
-    public static final int TLS_RSA_WITH_AES_256_CCM = 0xC09D;
-    public static final int TLS_DHE_RSA_WITH_AES_128_CCM = 0xC09E;
-    public static final int TLS_DHE_RSA_WITH_AES_256_CCM = 0xC09F;
-    public static final int TLS_RSA_WITH_AES_128_CCM_8 = 0xC0A0;
-    public static final int TLS_RSA_WITH_AES_256_CCM_8 = 0xC0A1;
-    public static final int TLS_DHE_RSA_WITH_AES_128_CCM_8 = 0xC0A2;
-    public static final int TLS_DHE_RSA_WITH_AES_256_CCM_8 = 0xC0A3;
-    public static final int TLS_PSK_WITH_AES_128_CCM = 0xC0A4;
-    public static final int TLS_PSK_WITH_AES_256_CCM = 0xC0A5;
-    public static final int TLS_DHE_PSK_WITH_AES_128_CCM = 0xC0A6;
-    public static final int TLS_DHE_PSK_WITH_AES_256_CCM = 0xC0A7;
-    public static final int TLS_PSK_WITH_AES_128_CCM_8 = 0xC0A8;
-    public static final int TLS_PSK_WITH_AES_256_CCM_8 = 0xC0A9;
-    public static final int TLS_PSK_DHE_WITH_AES_128_CCM_8 = 0xC0AA;
-    public static final int TLS_PSK_DHE_WITH_AES_256_CCM_8 = 0xC0AB;
-
-    /*
-     * RFC 7251
-     */
-    public static final int TLS_ECDHE_ECDSA_WITH_AES_128_CCM = 0xC0AC;
-    public static final int TLS_ECDHE_ECDSA_WITH_AES_256_CCM = 0xC0AD;
-    public static final int TLS_ECDHE_ECDSA_WITH_AES_128_CCM_8 = 0xC0AE;
-    public static final int TLS_ECDHE_ECDSA_WITH_AES_256_CCM_8 = 0xC0AF;
-
-    /*
-     * draft-agl-tls-chacha20poly1305-04
-     */
-    public static final int TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256 = 0xCC13;
-    public static final int TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256 = 0xCC14;
-    public static final int TLS_DHE_RSA_WITH_CHACHA20_POLY1305_SHA256 = 0xCC15;
-
-    /*
-     * draft-josefsson-salsa20-tls-04
-     */
-    public static final int TLS_RSA_WITH_ESTREAM_SALSA20_SHA1 = 0xE410;
-    public static final int TLS_RSA_WITH_SALSA20_SHA1 = 0xE411;
-    public static final int TLS_ECDHE_RSA_WITH_ESTREAM_SALSA20_SHA1 = 0xE412;
-    public static final int TLS_ECDHE_RSA_WITH_SALSA20_SHA1 = 0xE413;
-    public static final int TLS_ECDHE_ECDSA_WITH_ESTREAM_SALSA20_SHA1 = 0xE414;
-    public static final int TLS_ECDHE_ECDSA_WITH_SALSA20_SHA1 = 0xE415;
-    public static final int TLS_PSK_WITH_ESTREAM_SALSA20_SHA1 = 0xE416;
-    public static final int TLS_PSK_WITH_SALSA20_SHA1 = 0xE417;
-    public static final int TLS_ECDHE_PSK_WITH_ESTREAM_SALSA20_SHA1 = 0xE418;
-    public static final int TLS_ECDHE_PSK_WITH_SALSA20_SHA1 = 0xE419;
-    public static final int TLS_RSA_PSK_WITH_ESTREAM_SALSA20_SHA1 = 0xE41A;
-    public static final int TLS_RSA_PSK_WITH_SALSA20_SHA1 = 0xE41B;
-    public static final int TLS_DHE_PSK_WITH_ESTREAM_SALSA20_SHA1 = 0xE41C;
-    public static final int TLS_DHE_PSK_WITH_SALSA20_SHA1 = 0xE41D;
-    public static final int TLS_DHE_RSA_WITH_ESTREAM_SALSA20_SHA1 = 0xE41E;
-    public static final int TLS_DHE_RSA_WITH_SALSA20_SHA1 = 0xE41F;
-
-    /*
-     * draft-ietf-tls-downgrade-scsv-00
-     */
-    public static final int TLS_FALLBACK_SCSV = 0x5600;
-
-    public static boolean isSCSV(int cipherSuite)
-    {
-        switch (cipherSuite)
-        {
-        case TLS_EMPTY_RENEGOTIATION_INFO_SCSV:
-        case TLS_FALLBACK_SCSV:
-            return true;
-        default:
-            return false;
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/CipherType.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/CipherType.java
deleted file mode 100644
index c6d845a..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/CipherType.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-/**
- * RFC 2246
- * <p>
- * Note that the values here are implementation-specific and arbitrary. It is recommended not to
- * depend on the particular values (e.g. serialization).
- */
-public class CipherType
-{
-    public static final int stream = 0;
-    public static final int block = 1;
-
-    /*
-     * RFC 5246
-     */
-    public static final int aead = 2;
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/ClientAuthenticationType.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/ClientAuthenticationType.java
deleted file mode 100644
index 77e6460..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/ClientAuthenticationType.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-public class ClientAuthenticationType
-{
-    /*
-     * RFC 5077 4
-     */
-    public static final short anonymous = 0;
-    public static final short certificate_based = 1;
-    public static final short psk = 2;
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/ClientCertificateType.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/ClientCertificateType.java
deleted file mode 100644
index 6bddfc0..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/ClientCertificateType.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-public class ClientCertificateType
-{
-    /*
-     *  RFC 4346 7.4.4
-     */
-    public static final short rsa_sign = 1;
-    public static final short dss_sign = 2;
-    public static final short rsa_fixed_dh = 3;
-    public static final short dss_fixed_dh = 4;
-    public static final short rsa_ephemeral_dh_RESERVED = 5;
-    public static final short dss_ephemeral_dh_RESERVED = 6;
-    public static final short fortezza_dms_RESERVED = 20;
-
-    /*
-     * RFC 4492 5.5
-     */
-    public static final short ecdsa_sign = 64;
-    public static final short rsa_fixed_ecdh = 65;
-    public static final short ecdsa_fixed_ecdh = 66;
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/CombinedHash.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/CombinedHash.java
deleted file mode 100644
index 70c81a0..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/CombinedHash.java
+++ /dev/null
@@ -1,135 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-import org.bouncycastle.crypto.Digest;
-
-/**
- * A combined hash, which implements md5(m) || sha1(m).
- */
-class CombinedHash
-    implements TlsHandshakeHash
-{
-    protected TlsContext context;
-    protected Digest md5;
-    protected Digest sha1;
-
-    CombinedHash()
-    {
-        this.md5 = TlsUtils.createHash(HashAlgorithm.md5);
-        this.sha1 = TlsUtils.createHash(HashAlgorithm.sha1);
-    }
-
-    CombinedHash(CombinedHash t)
-    {
-        this.context = t.context;
-        this.md5 = TlsUtils.cloneHash(HashAlgorithm.md5, t.md5);
-        this.sha1 = TlsUtils.cloneHash(HashAlgorithm.sha1, t.sha1);
-    }
-
-    public void init(TlsContext context)
-    {
-        this.context = context;
-    }
-
-    public TlsHandshakeHash notifyPRFDetermined()
-    {
-        return this;
-    }
-
-    public void trackHashAlgorithm(short hashAlgorithm)
-    {
-        throw new IllegalStateException("CombinedHash only supports calculating the legacy PRF for handshake hash");
-    }
-
-    public void sealHashAlgorithms()
-    {
-    }
-
-    public TlsHandshakeHash stopTracking()
-    {
-        return new CombinedHash(this);
-    }
-
-    public Digest forkPRFHash()
-    {
-        return new CombinedHash(this);
-    }
-
-    public byte[] getFinalHash(short hashAlgorithm)
-    {
-        throw new IllegalStateException("CombinedHash doesn't support multiple hashes");
-    }
-
-    /**
-     * @see org.bouncycastle.crypto.Digest#getAlgorithmName()
-     */
-    public String getAlgorithmName()
-    {
-        return md5.getAlgorithmName() + " and " + sha1.getAlgorithmName();
-    }
-
-    /**
-     * @see org.bouncycastle.crypto.Digest#getDigestSize()
-     */
-    public int getDigestSize()
-    {
-        return md5.getDigestSize() + sha1.getDigestSize();
-    }
-
-    /**
-     * @see org.bouncycastle.crypto.Digest#update(byte)
-     */
-    public void update(byte input)
-    {
-        md5.update(input);
-        sha1.update(input);
-    }
-
-    /**
-     * @see org.bouncycastle.crypto.Digest#update(byte[], int, int)
-     */
-    public void update(byte[] input, int inOff, int len)
-    {
-        md5.update(input, inOff, len);
-        sha1.update(input, inOff, len);
-    }
-
-    /**
-     * @see org.bouncycastle.crypto.Digest#doFinal(byte[], int)
-     */
-    public int doFinal(byte[] output, int outOff)
-    {
-        if (context != null && TlsUtils.isSSL(context))
-        {
-            ssl3Complete(md5, SSL3Mac.IPAD, SSL3Mac.OPAD, 48);
-            ssl3Complete(sha1, SSL3Mac.IPAD, SSL3Mac.OPAD, 40);
-        }
-
-        int i1 = md5.doFinal(output, outOff);
-        int i2 = sha1.doFinal(output, outOff + i1);
-        return i1 + i2;
-    }
-
-    /**
-     * @see org.bouncycastle.crypto.Digest#reset()
-     */
-    public void reset()
-    {
-        md5.reset();
-        sha1.reset();
-    }
-
-    protected void ssl3Complete(Digest d, byte[] ipad, byte[] opad, int padLength)
-    {
-        byte[] master_secret = context.getSecurityParameters().masterSecret;
-
-        d.update(master_secret, 0, master_secret.length);
-        d.update(ipad, 0, padLength);
-
-        byte[] tmp = new byte[d.getDigestSize()];
-        d.doFinal(tmp, 0);
-
-        d.update(master_secret, 0, master_secret.length);
-        d.update(opad, 0, padLength);
-        d.update(tmp, 0, tmp.length);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/CompressionMethod.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/CompressionMethod.java
deleted file mode 100644
index 5c3a4fb..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/CompressionMethod.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-/**
- * RFC 2246 6.1
- */
-public class CompressionMethod
-{
-    public static final short _null = 0;
-
-    /*
-     * RFC 3749 2
-     */
-    public static final short DEFLATE = 1;
-
-    /*
-     * Values from 224 decimal (0xE0) through 255 decimal (0xFF)
-     * inclusive are reserved for private use.
-     */
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/ConnectionEnd.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/ConnectionEnd.java
deleted file mode 100644
index bcbf607..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/ConnectionEnd.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-/**
- * RFC 2246
- * <p>
- * Note that the values here are implementation-specific and arbitrary. It is recommended not to
- * depend on the particular values (e.g. serialization).
- */
-public class ConnectionEnd
-{
-    public static final int server = 0;
-    public static final int client = 1;
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/ContentType.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/ContentType.java
deleted file mode 100644
index 65ed9b6..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/ContentType.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-/**
- * RFC 2246 6.2.1
- */
-public class ContentType
-{
-    public static final short change_cipher_spec = 20;
-    public static final short alert = 21;
-    public static final short handshake = 22;
-    public static final short application_data = 23;
-    public static final short heartbeat = 24;
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/DTLSClientProtocol.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/DTLSClientProtocol.java
deleted file mode 100644
index 5d9d459..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/DTLSClientProtocol.java
+++ /dev/null
@@ -1,889 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.security.SecureRandom;
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Vector;
-
-import org.bouncycastle.util.Arrays;
-
-public class DTLSClientProtocol
-    extends DTLSProtocol
-{
-    public DTLSClientProtocol(SecureRandom secureRandom)
-    {
-        super(secureRandom);
-    }
-
-    public DTLSTransport connect(TlsClient client, DatagramTransport transport)
-        throws IOException
-    {
-        if (client == null)
-        {
-            throw new IllegalArgumentException("'client' cannot be null");
-        }
-        if (transport == null)
-        {
-            throw new IllegalArgumentException("'transport' cannot be null");
-        }
-
-        SecurityParameters securityParameters = new SecurityParameters();
-        securityParameters.entity = ConnectionEnd.client;
-
-        ClientHandshakeState state = new ClientHandshakeState();
-        state.client = client;
-        state.clientContext = new TlsClientContextImpl(secureRandom, securityParameters);
-
-        securityParameters.clientRandom = TlsProtocol.createRandomBlock(client.shouldUseGMTUnixTime(),
-            state.clientContext.getNonceRandomGenerator());
-
-        client.init(state.clientContext);
-
-        DTLSRecordLayer recordLayer = new DTLSRecordLayer(transport, state.clientContext, client, ContentType.handshake);
-
-        TlsSession sessionToResume = state.client.getSessionToResume();
-        if (sessionToResume != null)
-        {
-            SessionParameters sessionParameters = sessionToResume.exportSessionParameters();
-            if (sessionParameters != null)
-            {
-                state.tlsSession = sessionToResume;
-                state.sessionParameters = sessionParameters;
-            }
-        }
-
-        try
-        {
-            return clientHandshake(state, recordLayer);
-        }
-        catch (TlsFatalAlert fatalAlert)
-        {
-            recordLayer.fail(fatalAlert.getAlertDescription());
-            throw fatalAlert;
-        }
-        catch (IOException e)
-        {
-            recordLayer.fail(AlertDescription.internal_error);
-            throw e;
-        }
-        catch (RuntimeException e)
-        {
-            recordLayer.fail(AlertDescription.internal_error);
-            throw new TlsFatalAlert(AlertDescription.internal_error, e);
-        }
-    }
-
-    protected DTLSTransport clientHandshake(ClientHandshakeState state, DTLSRecordLayer recordLayer)
-        throws IOException
-    {
-        SecurityParameters securityParameters = state.clientContext.getSecurityParameters();
-        DTLSReliableHandshake handshake = new DTLSReliableHandshake(state.clientContext, recordLayer);
-
-        byte[] clientHelloBody = generateClientHello(state, state.client);
-        handshake.sendMessage(HandshakeType.client_hello, clientHelloBody);
-
-        DTLSReliableHandshake.Message serverMessage = handshake.receiveMessage();
-
-        while (serverMessage.getType() == HandshakeType.hello_verify_request)
-        {
-            ProtocolVersion recordLayerVersion = recordLayer.resetDiscoveredPeerVersion();
-            ProtocolVersion client_version = state.clientContext.getClientVersion();
-
-            /*
-             * RFC 6347 4.2.1 DTLS 1.2 server implementations SHOULD use DTLS version 1.0 regardless of
-             * the version of TLS that is expected to be negotiated. DTLS 1.2 and 1.0 clients MUST use
-             * the version solely to indicate packet formatting (which is the same in both DTLS 1.2 and
-             * 1.0) and not as part of version negotiation.
-             */
-            if (!recordLayerVersion.isEqualOrEarlierVersionOf(client_version))
-            {
-                throw new TlsFatalAlert(AlertDescription.illegal_parameter);
-            }
-
-            byte[] cookie = processHelloVerifyRequest(state, serverMessage.getBody());
-            byte[] patched = patchClientHelloWithCookie(clientHelloBody, cookie);
-
-            handshake.resetHandshakeMessagesDigest();
-            handshake.sendMessage(HandshakeType.client_hello, patched);
-
-            serverMessage = handshake.receiveMessage();
-        }
-
-        if (serverMessage.getType() == HandshakeType.server_hello)
-        {
-            reportServerVersion(state, recordLayer.getDiscoveredPeerVersion());
-
-            processServerHello(state, serverMessage.getBody());
-        }
-        else
-        {
-            throw new TlsFatalAlert(AlertDescription.unexpected_message);
-        }
-
-        if (state.maxFragmentLength >= 0)
-        {
-            int plainTextLimit = 1 << (8 + state.maxFragmentLength);
-            recordLayer.setPlaintextLimit(plainTextLimit);
-        }
-
-        securityParameters.cipherSuite = state.selectedCipherSuite;
-        securityParameters.compressionAlgorithm = state.selectedCompressionMethod;
-        securityParameters.prfAlgorithm = TlsProtocol.getPRFAlgorithm(state.clientContext, state.selectedCipherSuite);
-
-        /*
-         * RFC 5264 7.4.9. Any cipher suite which does not explicitly specify verify_data_length has
-         * a verify_data_length equal to 12. This includes all existing cipher suites.
-         */
-        securityParameters.verifyDataLength = 12;
-
-        handshake.notifyHelloComplete();
-
-        boolean resumedSession = state.selectedSessionID.length > 0 && state.tlsSession != null
-            && Arrays.areEqual(state.selectedSessionID, state.tlsSession.getSessionID());
-
-        if (resumedSession)
-        {
-            if (securityParameters.getCipherSuite() != state.sessionParameters.getCipherSuite()
-                || securityParameters.getCompressionAlgorithm() != state.sessionParameters.getCompressionAlgorithm())
-            {
-                throw new TlsFatalAlert(AlertDescription.illegal_parameter);
-            }
-
-            Hashtable sessionServerExtensions = state.sessionParameters.readServerExtensions();
-
-            securityParameters.extendedMasterSecret = TlsExtensionsUtils.hasExtendedMasterSecretExtension(sessionServerExtensions);
-
-            securityParameters.masterSecret = Arrays.clone(state.sessionParameters.getMasterSecret());
-            recordLayer.initPendingEpoch(state.client.getCipher());
-
-            // NOTE: Calculated exclusive of the actual Finished message from the server
-            byte[] expectedServerVerifyData = TlsUtils.calculateVerifyData(state.clientContext, ExporterLabel.server_finished,
-                TlsProtocol.getCurrentPRFHash(state.clientContext, handshake.getHandshakeHash(), null));
-            processFinished(handshake.receiveMessageBody(HandshakeType.finished), expectedServerVerifyData);
-
-            // NOTE: Calculated exclusive of the Finished message itself
-            byte[] clientVerifyData = TlsUtils.calculateVerifyData(state.clientContext, ExporterLabel.client_finished,
-                TlsProtocol.getCurrentPRFHash(state.clientContext, handshake.getHandshakeHash(), null));
-            handshake.sendMessage(HandshakeType.finished, clientVerifyData);
-
-            handshake.finish();
-
-            state.clientContext.setResumableSession(state.tlsSession);
-
-            state.client.notifyHandshakeComplete();
-
-            return new DTLSTransport(recordLayer);
-        }
-
-        invalidateSession(state);
-
-        if (state.selectedSessionID.length > 0)
-        {
-            state.tlsSession = new TlsSessionImpl(state.selectedSessionID, null);
-        }
-
-        serverMessage = handshake.receiveMessage();
-
-        if (serverMessage.getType() == HandshakeType.supplemental_data)
-        {
-            processServerSupplementalData(state, serverMessage.getBody());
-            serverMessage = handshake.receiveMessage();
-        }
-        else
-        {
-            state.client.processServerSupplementalData(null);
-        }
-
-        state.keyExchange = state.client.getKeyExchange();
-        state.keyExchange.init(state.clientContext);
-
-        Certificate serverCertificate = null;
-
-        if (serverMessage.getType() == HandshakeType.certificate)
-        {
-            serverCertificate = processServerCertificate(state, serverMessage.getBody());
-            serverMessage = handshake.receiveMessage();
-        }
-        else
-        {
-            // Okay, Certificate is optional
-            state.keyExchange.skipServerCredentials();
-        }
-
-        // TODO[RFC 3546] Check whether empty certificates is possible, allowed, or excludes CertificateStatus
-        if (serverCertificate == null || serverCertificate.isEmpty())
-        {
-            state.allowCertificateStatus = false;
-        }
-
-        if (serverMessage.getType() == HandshakeType.certificate_status)
-        {
-            processCertificateStatus(state, serverMessage.getBody());
-            serverMessage = handshake.receiveMessage();
-        }
-        else
-        {
-            // Okay, CertificateStatus is optional
-        }
-
-        if (serverMessage.getType() == HandshakeType.server_key_exchange)
-        {
-            processServerKeyExchange(state, serverMessage.getBody());
-            serverMessage = handshake.receiveMessage();
-        }
-        else
-        {
-            // Okay, ServerKeyExchange is optional
-            state.keyExchange.skipServerKeyExchange();
-        }
-
-        if (serverMessage.getType() == HandshakeType.certificate_request)
-        {
-            processCertificateRequest(state, serverMessage.getBody());
-
-            /*
-             * TODO Give the client a chance to immediately select the CertificateVerify hash
-             * algorithm here to avoid tracking the other hash algorithms unnecessarily?
-             */
-            TlsUtils.trackHashAlgorithms(handshake.getHandshakeHash(),
-                state.certificateRequest.getSupportedSignatureAlgorithms());
-
-            serverMessage = handshake.receiveMessage();
-        }
-        else
-        {
-            // Okay, CertificateRequest is optional
-        }
-
-        if (serverMessage.getType() == HandshakeType.server_hello_done)
-        {
-            if (serverMessage.getBody().length != 0)
-            {
-                throw new TlsFatalAlert(AlertDescription.decode_error);
-            }
-        }
-        else
-        {
-            throw new TlsFatalAlert(AlertDescription.unexpected_message);
-        }
-
-        handshake.getHandshakeHash().sealHashAlgorithms();
-
-        Vector clientSupplementalData = state.client.getClientSupplementalData();
-        if (clientSupplementalData != null)
-        {
-            byte[] supplementalDataBody = generateSupplementalData(clientSupplementalData);
-            handshake.sendMessage(HandshakeType.supplemental_data, supplementalDataBody);
-        }
-
-        if (state.certificateRequest != null)
-        {
-            state.clientCredentials = state.authentication.getClientCredentials(state.certificateRequest);
-
-            /*
-             * RFC 5246 If no suitable certificate is available, the client MUST send a certificate
-             * message containing no certificates.
-             * 
-             * NOTE: In previous RFCs, this was SHOULD instead of MUST.
-             */
-            Certificate clientCertificate = null;
-            if (state.clientCredentials != null)
-            {
-                clientCertificate = state.clientCredentials.getCertificate();
-            }
-            if (clientCertificate == null)
-            {
-                clientCertificate = Certificate.EMPTY_CHAIN;
-            }
-
-            byte[] certificateBody = generateCertificate(clientCertificate);
-            handshake.sendMessage(HandshakeType.certificate, certificateBody);
-        }
-
-        if (state.clientCredentials != null)
-        {
-            state.keyExchange.processClientCredentials(state.clientCredentials);
-        }
-        else
-        {
-            state.keyExchange.skipClientCredentials();
-        }
-
-        byte[] clientKeyExchangeBody = generateClientKeyExchange(state);
-        handshake.sendMessage(HandshakeType.client_key_exchange, clientKeyExchangeBody);
-
-        TlsHandshakeHash prepareFinishHash = handshake.prepareToFinish();
-        securityParameters.sessionHash = TlsProtocol.getCurrentPRFHash(state.clientContext, prepareFinishHash, null);
-
-        TlsProtocol.establishMasterSecret(state.clientContext, state.keyExchange);
-        recordLayer.initPendingEpoch(state.client.getCipher());
-
-        if (state.clientCredentials != null && state.clientCredentials instanceof TlsSignerCredentials)
-        {
-            TlsSignerCredentials signerCredentials = (TlsSignerCredentials)state.clientCredentials;
-
-            /*
-             * RFC 5246 4.7. digitally-signed element needs SignatureAndHashAlgorithm from TLS 1.2
-             */
-            SignatureAndHashAlgorithm signatureAndHashAlgorithm = TlsUtils.getSignatureAndHashAlgorithm(
-                state.clientContext, signerCredentials);
-
-            byte[] hash;
-            if (signatureAndHashAlgorithm == null)
-            {
-                hash = securityParameters.getSessionHash();
-            }
-            else
-            {
-                hash = prepareFinishHash.getFinalHash(signatureAndHashAlgorithm.getHash());
-            }
-
-            byte[] signature = signerCredentials.generateCertificateSignature(hash);
-            DigitallySigned certificateVerify = new DigitallySigned(signatureAndHashAlgorithm, signature);
-            byte[] certificateVerifyBody = generateCertificateVerify(state, certificateVerify);
-            handshake.sendMessage(HandshakeType.certificate_verify, certificateVerifyBody);
-        }
-
-        // NOTE: Calculated exclusive of the Finished message itself
-        byte[] clientVerifyData = TlsUtils.calculateVerifyData(state.clientContext, ExporterLabel.client_finished,
-            TlsProtocol.getCurrentPRFHash(state.clientContext, handshake.getHandshakeHash(), null));
-        handshake.sendMessage(HandshakeType.finished, clientVerifyData);
-
-        if (state.expectSessionTicket)
-        {
-            serverMessage = handshake.receiveMessage();
-            if (serverMessage.getType() == HandshakeType.session_ticket)
-            {
-                processNewSessionTicket(state, serverMessage.getBody());
-            }
-            else
-            {
-                throw new TlsFatalAlert(AlertDescription.unexpected_message);
-            }
-        }
-
-        // NOTE: Calculated exclusive of the actual Finished message from the server
-        byte[] expectedServerVerifyData = TlsUtils.calculateVerifyData(state.clientContext, ExporterLabel.server_finished,
-            TlsProtocol.getCurrentPRFHash(state.clientContext, handshake.getHandshakeHash(), null));
-        processFinished(handshake.receiveMessageBody(HandshakeType.finished), expectedServerVerifyData);
-
-        handshake.finish();
-
-        if (state.tlsSession != null)
-        {
-            state.sessionParameters = new SessionParameters.Builder()
-                .setCipherSuite(securityParameters.cipherSuite)
-                .setCompressionAlgorithm(securityParameters.compressionAlgorithm)
-                .setMasterSecret(securityParameters.masterSecret)
-                .setPeerCertificate(serverCertificate)
-                .setPSKIdentity(securityParameters.pskIdentity)
-                .setSRPIdentity(securityParameters.srpIdentity)
-                .build();
-
-            state.tlsSession = TlsUtils.importSession(state.tlsSession.getSessionID(), state.sessionParameters);
-
-            state.clientContext.setResumableSession(state.tlsSession);
-        }
-
-        state.client.notifyHandshakeComplete();
-
-        return new DTLSTransport(recordLayer);
-    }
-
-    protected byte[] generateCertificateVerify(ClientHandshakeState state, DigitallySigned certificateVerify)
-        throws IOException
-    {
-        ByteArrayOutputStream buf = new ByteArrayOutputStream();
-        certificateVerify.encode(buf);
-        return buf.toByteArray();
-    }
-
-    protected byte[] generateClientHello(ClientHandshakeState state, TlsClient client)
-        throws IOException
-    {
-        ByteArrayOutputStream buf = new ByteArrayOutputStream();
-
-        ProtocolVersion client_version = client.getClientVersion();
-        if (!client_version.isDTLS())
-        {
-            throw new TlsFatalAlert(AlertDescription.internal_error);
-        }
-
-        TlsClientContextImpl context = state.clientContext;
-
-        context.setClientVersion(client_version);
-        TlsUtils.writeVersion(client_version, buf);
-
-        SecurityParameters securityParameters = context.getSecurityParameters();
-        buf.write(securityParameters.getClientRandom());
-
-        // Session ID
-        byte[] session_id = TlsUtils.EMPTY_BYTES;
-        if (state.tlsSession != null)
-        {
-            session_id = state.tlsSession.getSessionID();
-            if (session_id == null || session_id.length > 32)
-            {
-                session_id = TlsUtils.EMPTY_BYTES;
-            }
-        }
-        TlsUtils.writeOpaque8(session_id, buf);
-
-        // Cookie
-        TlsUtils.writeOpaque8(TlsUtils.EMPTY_BYTES, buf);
-
-        boolean fallback = client.isFallback();
-
-        /*
-         * Cipher suites
-         */
-        state.offeredCipherSuites = client.getCipherSuites();
-
-        // Integer -> byte[]
-        state.clientExtensions = client.getClientExtensions();
-
-        securityParameters.extendedMasterSecret = TlsExtensionsUtils.hasExtendedMasterSecretExtension(state.clientExtensions);
-
-        // Cipher Suites (and SCSV)
-        {
-            /*
-             * RFC 5746 3.4. The client MUST include either an empty "renegotiation_info" extension,
-             * or the TLS_EMPTY_RENEGOTIATION_INFO_SCSV signaling cipher suite value in the
-             * ClientHello. Including both is NOT RECOMMENDED.
-             */
-            byte[] renegExtData = TlsUtils.getExtensionData(state.clientExtensions, TlsProtocol.EXT_RenegotiationInfo);
-            boolean noRenegExt = (null == renegExtData);
-
-            boolean noRenegSCSV = !Arrays.contains(state.offeredCipherSuites, CipherSuite.TLS_EMPTY_RENEGOTIATION_INFO_SCSV);
-
-            if (noRenegExt && noRenegSCSV)
-            {
-                // TODO Consider whether to default to a client extension instead
-                state.offeredCipherSuites = Arrays.append(state.offeredCipherSuites, CipherSuite.TLS_EMPTY_RENEGOTIATION_INFO_SCSV);
-            }
-
-            /*
-             * draft-ietf-tls-downgrade-scsv-00 4. If a client sends a ClientHello.client_version
-             * containing a lower value than the latest (highest-valued) version supported by the
-             * client, it SHOULD include the TLS_FALLBACK_SCSV cipher suite value in
-             * ClientHello.cipher_suites.
-             */
-            if (fallback && !Arrays.contains(state.offeredCipherSuites, CipherSuite.TLS_FALLBACK_SCSV))
-            {
-                state.offeredCipherSuites = Arrays.append(state.offeredCipherSuites, CipherSuite.TLS_FALLBACK_SCSV);
-            }
-
-            TlsUtils.writeUint16ArrayWithUint16Length(state.offeredCipherSuites, buf);
-        }
-
-        // TODO Add support for compression
-        // Compression methods
-        // state.offeredCompressionMethods = client.getCompressionMethods();
-        state.offeredCompressionMethods = new short[]{ CompressionMethod._null };
-
-        TlsUtils.writeUint8ArrayWithUint8Length(state.offeredCompressionMethods, buf);
-
-        // Extensions
-        if (state.clientExtensions != null)
-        {
-            TlsProtocol.writeExtensions(buf, state.clientExtensions);
-        }
-
-        return buf.toByteArray();
-    }
-
-    protected byte[] generateClientKeyExchange(ClientHandshakeState state)
-        throws IOException
-    {
-        ByteArrayOutputStream buf = new ByteArrayOutputStream();
-        state.keyExchange.generateClientKeyExchange(buf);
-        return buf.toByteArray();
-    }
-
-    protected void invalidateSession(ClientHandshakeState state)
-    {
-        if (state.sessionParameters != null)
-        {
-            state.sessionParameters.clear();
-            state.sessionParameters = null;
-        }
-
-        if (state.tlsSession != null)
-        {
-            state.tlsSession.invalidate();
-            state.tlsSession = null;
-        }
-    }
-
-    protected void processCertificateRequest(ClientHandshakeState state, byte[] body)
-        throws IOException
-    {
-        if (state.authentication == null)
-        {
-            /*
-             * RFC 2246 7.4.4. It is a fatal handshake_failure alert for an anonymous server to
-             * request client identification.
-             */
-            throw new TlsFatalAlert(AlertDescription.handshake_failure);
-        }
-
-        ByteArrayInputStream buf = new ByteArrayInputStream(body);
-
-        state.certificateRequest = CertificateRequest.parse(state.clientContext, buf);
-
-        TlsProtocol.assertEmpty(buf);
-
-        state.keyExchange.validateCertificateRequest(state.certificateRequest);
-    }
-
-    protected void processCertificateStatus(ClientHandshakeState state, byte[] body)
-        throws IOException
-    {
-        if (!state.allowCertificateStatus)
-        {
-            /*
-             * RFC 3546 3.6. If a server returns a "CertificateStatus" message, then the
-             * server MUST have included an extension of type "status_request" with empty
-             * "extension_data" in the extended server hello..
-             */
-            throw new TlsFatalAlert(AlertDescription.unexpected_message);
-        }
-
-        ByteArrayInputStream buf = new ByteArrayInputStream(body);
-
-        state.certificateStatus = CertificateStatus.parse(buf);
-
-        TlsProtocol.assertEmpty(buf);
-
-        // TODO[RFC 3546] Figure out how to provide this to the client/authentication.
-    }
-
-    protected byte[] processHelloVerifyRequest(ClientHandshakeState state, byte[] body)
-        throws IOException
-    {
-        ByteArrayInputStream buf = new ByteArrayInputStream(body);
-
-        ProtocolVersion server_version = TlsUtils.readVersion(buf);
-        byte[] cookie = TlsUtils.readOpaque8(buf);
-
-        TlsProtocol.assertEmpty(buf);
-
-        // TODO Seems this behaviour is not yet in line with OpenSSL for DTLS 1.2
-//        reportServerVersion(state, server_version);
-        if (!server_version.isEqualOrEarlierVersionOf(state.clientContext.getClientVersion()))
-        {
-            throw new TlsFatalAlert(AlertDescription.illegal_parameter);
-        }
-
-        /*
-         * RFC 6347 This specification increases the cookie size limit to 255 bytes for greater
-         * future flexibility. The limit remains 32 for previous versions of DTLS.
-         */
-        if (!ProtocolVersion.DTLSv12.isEqualOrEarlierVersionOf(server_version) && cookie.length > 32)
-        {
-            throw new TlsFatalAlert(AlertDescription.illegal_parameter);
-        }
-
-        return cookie;
-    }
-
-    protected void processNewSessionTicket(ClientHandshakeState state, byte[] body)
-        throws IOException
-    {
-        ByteArrayInputStream buf = new ByteArrayInputStream(body);
-
-        NewSessionTicket newSessionTicket = NewSessionTicket.parse(buf);
-
-        TlsProtocol.assertEmpty(buf);
-
-        state.client.notifyNewSessionTicket(newSessionTicket);
-    }
-
-    protected Certificate processServerCertificate(ClientHandshakeState state, byte[] body)
-        throws IOException
-    {
-        ByteArrayInputStream buf = new ByteArrayInputStream(body);
-
-        Certificate serverCertificate = Certificate.parse(buf);
-
-        TlsProtocol.assertEmpty(buf);
-
-        state.keyExchange.processServerCertificate(serverCertificate);
-        state.authentication = state.client.getAuthentication();
-        state.authentication.notifyServerCertificate(serverCertificate);
-
-        return serverCertificate;
-    }
-
-    protected void processServerHello(ClientHandshakeState state, byte[] body)
-        throws IOException
-    {
-        SecurityParameters securityParameters = state.clientContext.getSecurityParameters();
-
-        ByteArrayInputStream buf = new ByteArrayInputStream(body);
-
-        ProtocolVersion server_version = TlsUtils.readVersion(buf);
-        reportServerVersion(state, server_version);
-
-        securityParameters.serverRandom = TlsUtils.readFully(32, buf);
-
-        state.selectedSessionID = TlsUtils.readOpaque8(buf);
-        if (state.selectedSessionID.length > 32)
-        {
-            throw new TlsFatalAlert(AlertDescription.illegal_parameter);
-        }
-        state.client.notifySessionID(state.selectedSessionID);
-
-        state.selectedCipherSuite = TlsUtils.readUint16(buf);
-        if (!Arrays.contains(state.offeredCipherSuites, state.selectedCipherSuite)
-            || state.selectedCipherSuite == CipherSuite.TLS_NULL_WITH_NULL_NULL
-            || CipherSuite.isSCSV(state.selectedCipherSuite)
-            || !TlsUtils.isValidCipherSuiteForVersion(state.selectedCipherSuite, server_version))
-        {
-            throw new TlsFatalAlert(AlertDescription.illegal_parameter);
-        }
-
-        validateSelectedCipherSuite(state.selectedCipherSuite, AlertDescription.illegal_parameter);
-
-        state.client.notifySelectedCipherSuite(state.selectedCipherSuite);
-
-        state.selectedCompressionMethod = TlsUtils.readUint8(buf);
-        if (!Arrays.contains(state.offeredCompressionMethods, state.selectedCompressionMethod))
-        {
-            throw new TlsFatalAlert(AlertDescription.illegal_parameter);
-        }
-        state.client.notifySelectedCompressionMethod(state.selectedCompressionMethod);
-
-        /*
-         * RFC3546 2.2 The extended server hello message format MAY be sent in place of the server
-         * hello message when the client has requested extended functionality via the extended
-         * client hello message specified in Section 2.1. ... Note that the extended server hello
-         * message is only sent in response to an extended client hello message. This prevents the
-         * possibility that the extended server hello message could "break" existing TLS 1.0
-         * clients.
-         */
-
-        /*
-         * TODO RFC 3546 2.3 If [...] the older session is resumed, then the server MUST ignore
-         * extensions appearing in the client hello, and send a server hello containing no
-         * extensions.
-         */
-
-        // Integer -> byte[]
-        Hashtable serverExtensions = TlsProtocol.readExtensions(buf);
-
-        /*
-         * draft-ietf-tls-session-hash-01 5.2. If a server receives the "extended_master_secret"
-         * extension, it MUST include the "extended_master_secret" extension in its ServerHello
-         * message.
-         */
-        boolean serverSentExtendedMasterSecret = TlsExtensionsUtils.hasExtendedMasterSecretExtension(serverExtensions);
-        if (serverSentExtendedMasterSecret != securityParameters.extendedMasterSecret)
-        {
-            throw new TlsFatalAlert(AlertDescription.handshake_failure);
-        }
-
-        /*
-         * RFC 3546 2.2 Note that the extended server hello message is only sent in response to an
-         * extended client hello message. However, see RFC 5746 exception below. We always include
-         * the SCSV, so an Extended Server Hello is always allowed.
-         */
-        if (serverExtensions != null)
-        {
-            Enumeration e = serverExtensions.keys();
-            while (e.hasMoreElements())
-            {
-                Integer extType = (Integer)e.nextElement();
-
-                /*
-                 * RFC 5746 3.6. Note that sending a "renegotiation_info" extension in response to a
-                 * ClientHello containing only the SCSV is an explicit exception to the prohibition
-                 * in RFC 5246, Section 7.4.1.4, on the server sending unsolicited extensions and is
-                 * only allowed because the client is signaling its willingness to receive the
-                 * extension via the TLS_EMPTY_RENEGOTIATION_INFO_SCSV SCSV.
-                 */
-                if (extType.equals(TlsProtocol.EXT_RenegotiationInfo))
-                {
-                    continue;
-                }
-
-                /*
-                 * RFC 5246 7.4.1.4 An extension type MUST NOT appear in the ServerHello unless the
-                 * same extension type appeared in the corresponding ClientHello. If a client
-                 * receives an extension type in ServerHello that it did not request in the
-                 * associated ClientHello, it MUST abort the handshake with an unsupported_extension
-                 * fatal alert.
-                 */
-                if (null == TlsUtils.getExtensionData(state.clientExtensions, extType))
-                {
-                    throw new TlsFatalAlert(AlertDescription.unsupported_extension);
-                }
-
-                /*
-                 * draft-ietf-tls-session-hash-01 5.2. Implementation note: if the server decides to
-                 * proceed with resumption, the extension does not have any effect. Requiring the
-                 * extension to be included anyway makes the extension negotiation logic easier,
-                 * because it does not depend on whether resumption is accepted or not.
-                 */
-                if (extType.equals(TlsExtensionsUtils.EXT_extended_master_secret))
-                {
-                    continue;
-                }
-
-                /*
-                 * RFC 3546 2.3. If [...] the older session is resumed, then the server MUST ignore
-                 * extensions appearing in the client hello, and send a server hello containing no
-                 * extensions[.]
-                 */
-                // TODO[sessions]
-//                if (this.resumedSession)
-//                {
-//                    // TODO[compat-gnutls] GnuTLS test server sends server extensions e.g. ec_point_formats
-//                    // TODO[compat-openssl] OpenSSL test server sends server extensions e.g. ec_point_formats
-//                    // TODO[compat-polarssl] PolarSSL test server sends server extensions e.g. ec_point_formats
-////                    throw new TlsFatalAlert(AlertDescription.illegal_parameter);
-//                }
-            }
-
-            /*
-             * RFC 5746 3.4. Client Behavior: Initial Handshake
-             */
-            {
-                /*
-                 * When a ServerHello is received, the client MUST check if it includes the
-                 * "renegotiation_info" extension:
-                 */
-                byte[] renegExtData = (byte[])serverExtensions.get(TlsProtocol.EXT_RenegotiationInfo);
-                if (renegExtData != null)
-                {
-                    /*
-                     * If the extension is present, set the secure_renegotiation flag to TRUE. The
-                     * client MUST then verify that the length of the "renegotiated_connection"
-                     * field is zero, and if it is not, MUST abort the handshake (by sending a fatal
-                     * handshake_failure alert).
-                     */
-                    state.secure_renegotiation = true;
-
-                    if (!Arrays.constantTimeAreEqual(renegExtData,
-                        TlsProtocol.createRenegotiationInfo(TlsUtils.EMPTY_BYTES)))
-                    {
-                        throw new TlsFatalAlert(AlertDescription.handshake_failure);
-                    }
-                }
-            }
-
-            /*
-             * RFC 7366 3. If a server receives an encrypt-then-MAC request extension from a client
-             * and then selects a stream or Authenticated Encryption with Associated Data (AEAD)
-             * ciphersuite, it MUST NOT send an encrypt-then-MAC response extension back to the
-             * client.
-             */
-            boolean serverSentEncryptThenMAC = TlsExtensionsUtils.hasEncryptThenMACExtension(serverExtensions);
-            if (serverSentEncryptThenMAC && !TlsUtils.isBlockCipherSuite(state.selectedCipherSuite))
-            {
-                throw new TlsFatalAlert(AlertDescription.illegal_parameter);
-            }
-
-            securityParameters.encryptThenMAC = serverSentEncryptThenMAC;
-
-            state.maxFragmentLength = evaluateMaxFragmentLengthExtension(state.clientExtensions, serverExtensions,
-                AlertDescription.illegal_parameter);
-
-            securityParameters.truncatedHMac = TlsExtensionsUtils.hasTruncatedHMacExtension(serverExtensions);
-
-            state.allowCertificateStatus = TlsUtils.hasExpectedEmptyExtensionData(serverExtensions,
-                TlsExtensionsUtils.EXT_status_request, AlertDescription.illegal_parameter);
-
-            state.expectSessionTicket = TlsUtils.hasExpectedEmptyExtensionData(serverExtensions,
-                TlsProtocol.EXT_SessionTicket, AlertDescription.illegal_parameter);
-        }
-
-        state.client.notifySecureRenegotiation(state.secure_renegotiation);
-
-        if (state.clientExtensions != null)
-        {
-            state.client.processServerExtensions(serverExtensions);
-        }
-    }
-
-    protected void processServerKeyExchange(ClientHandshakeState state, byte[] body)
-        throws IOException
-    {
-        ByteArrayInputStream buf = new ByteArrayInputStream(body);
-
-        state.keyExchange.processServerKeyExchange(buf);
-
-        TlsProtocol.assertEmpty(buf);
-    }
-
-    protected void processServerSupplementalData(ClientHandshakeState state, byte[] body)
-        throws IOException
-    {
-        ByteArrayInputStream buf = new ByteArrayInputStream(body);
-        Vector serverSupplementalData = TlsProtocol.readSupplementalDataMessage(buf);
-        state.client.processServerSupplementalData(serverSupplementalData);
-    }
-
-    protected void reportServerVersion(ClientHandshakeState state, ProtocolVersion server_version)
-        throws IOException
-    {
-        TlsClientContextImpl clientContext = state.clientContext;
-        ProtocolVersion currentServerVersion = clientContext.getServerVersion();
-        if (null == currentServerVersion)
-        {
-            clientContext.setServerVersion(server_version);
-            state.client.notifyServerVersion(server_version);
-        }
-        else if (!currentServerVersion.equals(server_version))
-        {
-            throw new TlsFatalAlert(AlertDescription.illegal_parameter);
-        }
-    }
-
-    protected static byte[] patchClientHelloWithCookie(byte[] clientHelloBody, byte[] cookie)
-        throws IOException
-    {
-        int sessionIDPos = 34;
-        int sessionIDLength = TlsUtils.readUint8(clientHelloBody, sessionIDPos);
-
-        int cookieLengthPos = sessionIDPos + 1 + sessionIDLength;
-        int cookiePos = cookieLengthPos + 1;
-
-        byte[] patched = new byte[clientHelloBody.length + cookie.length];
-        System.arraycopy(clientHelloBody, 0, patched, 0, cookieLengthPos);
-        TlsUtils.checkUint8(cookie.length);
-        TlsUtils.writeUint8(cookie.length, patched, cookieLengthPos);
-        System.arraycopy(cookie, 0, patched, cookiePos, cookie.length);
-        System.arraycopy(clientHelloBody, cookiePos, patched, cookiePos + cookie.length, clientHelloBody.length
-            - cookiePos);
-
-        return patched;
-    }
-
-    protected static class ClientHandshakeState
-    {
-        TlsClient client = null;
-        TlsClientContextImpl clientContext = null;
-        TlsSession tlsSession = null;
-        SessionParameters sessionParameters = null;
-        SessionParameters.Builder sessionParametersBuilder = null;
-        int[] offeredCipherSuites = null;
-        short[] offeredCompressionMethods = null;
-        Hashtable clientExtensions = null;
-        byte[] selectedSessionID = null;
-        int selectedCipherSuite = -1;
-        short selectedCompressionMethod = -1;
-        boolean secure_renegotiation = false;
-        short maxFragmentLength = -1;
-        boolean allowCertificateStatus = false;
-        boolean expectSessionTicket = false;
-        TlsKeyExchange keyExchange = null;
-        TlsAuthentication authentication = null;
-        CertificateStatus certificateStatus = null;
-        CertificateRequest certificateRequest = null;
-        TlsCredentials clientCredentials = null;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/DTLSEpoch.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/DTLSEpoch.java
deleted file mode 100644
index aec96ce..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/DTLSEpoch.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-class DTLSEpoch
-{
-    private final DTLSReplayWindow replayWindow = new DTLSReplayWindow();
-
-    private final int epoch;
-    private final TlsCipher cipher;
-
-    private long sequenceNumber = 0;
-
-    DTLSEpoch(int epoch, TlsCipher cipher)
-    {
-        if (epoch < 0)
-        {
-            throw new IllegalArgumentException("'epoch' must be >= 0");
-        }
-        if (cipher == null)
-        {
-            throw new IllegalArgumentException("'cipher' cannot be null");
-        }
-
-        this.epoch = epoch;
-        this.cipher = cipher;
-    }
-
-    long allocateSequenceNumber()
-    {
-        // TODO Check for overflow
-        return sequenceNumber++;
-    }
-
-    TlsCipher getCipher()
-    {
-        return cipher;
-    }
-
-    int getEpoch()
-    {
-        return epoch;
-    }
-
-    DTLSReplayWindow getReplayWindow()
-    {
-        return replayWindow;
-    }
-
-    long getSequenceNumber()
-    {
-        return sequenceNumber;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/DTLSHandshakeRetransmit.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/DTLSHandshakeRetransmit.java
deleted file mode 100644
index 251d3a2..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/DTLSHandshakeRetransmit.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-import java.io.IOException;
-
-interface DTLSHandshakeRetransmit
-{
-    void receivedHandshakeRecord(int epoch, byte[] buf, int off, int len)
-        throws IOException;
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/DTLSProtocol.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/DTLSProtocol.java
deleted file mode 100644
index db43011..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/DTLSProtocol.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.security.SecureRandom;
-import java.util.Hashtable;
-import java.util.Vector;
-
-import org.bouncycastle.util.Arrays;
-
-public abstract class DTLSProtocol
-{
-    protected final SecureRandom secureRandom;
-
-    protected DTLSProtocol(SecureRandom secureRandom)
-    {
-        if (secureRandom == null)
-        {
-            throw new IllegalArgumentException("'secureRandom' cannot be null");
-        }
-
-        this.secureRandom = secureRandom;
-    }
-
-    protected void processFinished(byte[] body, byte[] expected_verify_data)
-        throws IOException
-    {
-        ByteArrayInputStream buf = new ByteArrayInputStream(body);
-
-        byte[] verify_data = TlsUtils.readFully(expected_verify_data.length, buf);
-
-        TlsProtocol.assertEmpty(buf);
-
-        if (!Arrays.constantTimeAreEqual(expected_verify_data, verify_data))
-        {
-            throw new TlsFatalAlert(AlertDescription.handshake_failure);
-        }
-    }
-
-    protected static short evaluateMaxFragmentLengthExtension(Hashtable clientExtensions, Hashtable serverExtensions,
-        short alertDescription) throws IOException
-    {
-        short maxFragmentLength = TlsExtensionsUtils.getMaxFragmentLengthExtension(serverExtensions);
-        if (maxFragmentLength >= 0 && maxFragmentLength != TlsExtensionsUtils.getMaxFragmentLengthExtension(clientExtensions))
-        {
-            throw new TlsFatalAlert(alertDescription);
-        }
-        return maxFragmentLength;
-    }
-
-    protected static byte[] generateCertificate(Certificate certificate)
-        throws IOException
-    {
-        ByteArrayOutputStream buf = new ByteArrayOutputStream();
-        certificate.encode(buf);
-        return buf.toByteArray();
-    }
-
-    protected static byte[] generateSupplementalData(Vector supplementalData)
-        throws IOException
-    {
-        ByteArrayOutputStream buf = new ByteArrayOutputStream();
-        TlsProtocol.writeSupplementalData(buf, supplementalData);
-        return buf.toByteArray();
-    }
-
-    protected static void validateSelectedCipherSuite(int selectedCipherSuite, short alertDescription)
-        throws IOException
-    {
-        switch (TlsUtils.getEncryptionAlgorithm(selectedCipherSuite))
-        {
-        case EncryptionAlgorithm.RC4_40:
-        case EncryptionAlgorithm.RC4_128:
-            throw new TlsFatalAlert(alertDescription);
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/DTLSReassembler.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/DTLSReassembler.java
deleted file mode 100644
index c052dcd..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/DTLSReassembler.java
+++ /dev/null
@@ -1,129 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-import java.util.Vector;
-
-class DTLSReassembler
-{
-    private final short msg_type;
-    private final byte[] body;
-
-    private Vector missing = new Vector();
-
-    DTLSReassembler(short msg_type, int length)
-    {
-        this.msg_type = msg_type;
-        this.body = new byte[length];
-        this.missing.addElement(new Range(0, length));
-    }
-
-    short getMsgType()
-    {
-        return msg_type;
-    }
-
-    byte[] getBodyIfComplete()
-    {
-        return missing.isEmpty() ? body : null;
-    }
-
-    void contributeFragment(short msg_type, int length, byte[] buf, int off, int fragment_offset,
-        int fragment_length)
-    {
-        int fragment_end = fragment_offset + fragment_length;
-
-        if (this.msg_type != msg_type || this.body.length != length || fragment_end > length)
-        {
-            return;
-        }
-
-        if (fragment_length == 0)
-        {
-            // NOTE: Empty messages still require an empty fragment to complete it
-            if (fragment_offset == 0 && !missing.isEmpty())
-            {
-                Range firstRange = (Range)missing.firstElement();
-                if (firstRange.getEnd() == 0)
-                {
-                    missing.removeElementAt(0);
-                }
-            }
-            return;
-        }
-
-        for (int i = 0; i < missing.size(); ++i)
-        {
-            Range range = (Range)missing.elementAt(i);
-            if (range.getStart() >= fragment_end)
-            {
-                break;
-            }
-            if (range.getEnd() > fragment_offset)
-            {
-
-                int copyStart = Math.max(range.getStart(), fragment_offset);
-                int copyEnd = Math.min(range.getEnd(), fragment_end);
-                int copyLength = copyEnd - copyStart;
-
-                System.arraycopy(buf, off + copyStart - fragment_offset, body, copyStart,
-                    copyLength);
-
-                if (copyStart == range.getStart())
-                {
-                    if (copyEnd == range.getEnd())
-                    {
-                        missing.removeElementAt(i--);
-                    }
-                    else
-                    {
-                        range.setStart(copyEnd);
-                    }
-                }
-                else
-                {
-                    if (copyEnd != range.getEnd())
-                    {
-                        missing.insertElementAt(new Range(copyEnd, range.getEnd()), ++i);
-                    }
-                    range.setEnd(copyStart);
-                }
-            }
-        }
-    }
-
-    void reset()
-    {
-        this.missing.removeAllElements();
-        this.missing.addElement(new Range(0, body.length));
-    }
-
-    private static class Range
-    {
-        private int start, end;
-
-        Range(int start, int end)
-        {
-            this.start = start;
-            this.end = end;
-        }
-
-        public int getStart()
-        {
-            return start;
-        }
-
-        public void setStart(int start)
-        {
-            this.start = start;
-        }
-
-        public int getEnd()
-        {
-            return end;
-        }
-
-        public void setEnd(int end)
-        {
-            this.end = end;
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/DTLSRecordLayer.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/DTLSRecordLayer.java
deleted file mode 100644
index 5abd86e..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/DTLSRecordLayer.java
+++ /dev/null
@@ -1,516 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-import java.io.IOException;
-
-class DTLSRecordLayer
-    implements DatagramTransport
-{
-    private static final int RECORD_HEADER_LENGTH = 13;
-    private static final int MAX_FRAGMENT_LENGTH = 1 << 14;
-    private static final long TCP_MSL = 1000L * 60 * 2;
-    private static final long RETRANSMIT_TIMEOUT = TCP_MSL * 2;
-
-    private final DatagramTransport transport;
-    private final TlsContext context;
-    private final TlsPeer peer;
-
-    private final ByteQueue recordQueue = new ByteQueue();
-
-    private volatile boolean closed = false;
-    private volatile boolean failed = false;
-    private volatile ProtocolVersion discoveredPeerVersion = null;
-    private volatile boolean inHandshake;
-    private volatile int plaintextLimit;
-    private DTLSEpoch currentEpoch, pendingEpoch;
-    private DTLSEpoch readEpoch, writeEpoch;
-
-    private DTLSHandshakeRetransmit retransmit = null;
-    private DTLSEpoch retransmitEpoch = null;
-    private long retransmitExpiry = 0;
-
-    DTLSRecordLayer(DatagramTransport transport, TlsContext context, TlsPeer peer, short contentType)
-    {
-        this.transport = transport;
-        this.context = context;
-        this.peer = peer;
-
-        this.inHandshake = true;
-
-        this.currentEpoch = new DTLSEpoch(0, new TlsNullCipher(context));
-        this.pendingEpoch = null;
-        this.readEpoch = currentEpoch;
-        this.writeEpoch = currentEpoch;
-
-        setPlaintextLimit(MAX_FRAGMENT_LENGTH);
-    }
-
-    void setPlaintextLimit(int plaintextLimit)
-    {
-        this.plaintextLimit = plaintextLimit;
-    }
-
-    ProtocolVersion getDiscoveredPeerVersion()
-    {
-        return discoveredPeerVersion;
-    }
-
-    ProtocolVersion resetDiscoveredPeerVersion()
-    {
-        ProtocolVersion result = discoveredPeerVersion; 
-        discoveredPeerVersion = null;
-        return result;
-    }
-
-    void initPendingEpoch(TlsCipher pendingCipher)
-    {
-        if (pendingEpoch != null)
-        {
-            throw new IllegalStateException();
-        }
-
-        /*
-         * TODO "In order to ensure that any given sequence/epoch pair is unique, implementations
-         * MUST NOT allow the same epoch value to be reused within two times the TCP maximum segment
-         * lifetime."
-         */
-
-        // TODO Check for overflow
-        this.pendingEpoch = new DTLSEpoch(writeEpoch.getEpoch() + 1, pendingCipher);
-    }
-
-    void handshakeSuccessful(DTLSHandshakeRetransmit retransmit)
-    {
-        if (readEpoch == currentEpoch || writeEpoch == currentEpoch)
-        {
-            // TODO
-            throw new IllegalStateException();
-        }
-
-        if (retransmit != null)
-        {
-            this.retransmit = retransmit;
-            this.retransmitEpoch = currentEpoch;
-            this.retransmitExpiry = System.currentTimeMillis() + RETRANSMIT_TIMEOUT;
-        }
-
-        this.inHandshake = false;
-        this.currentEpoch = pendingEpoch;
-        this.pendingEpoch = null;
-    }
-
-    void resetWriteEpoch()
-    {
-        if (retransmitEpoch != null)
-        {
-            this.writeEpoch = retransmitEpoch;
-        }
-        else
-        {
-            this.writeEpoch = currentEpoch;
-        }
-    }
-
-    public int getReceiveLimit()
-        throws IOException
-    {
-        return Math.min(this.plaintextLimit,
-            readEpoch.getCipher().getPlaintextLimit(transport.getReceiveLimit() - RECORD_HEADER_LENGTH));
-    }
-
-    public int getSendLimit()
-        throws IOException
-    {
-        return Math.min(this.plaintextLimit,
-            writeEpoch.getCipher().getPlaintextLimit(transport.getSendLimit() - RECORD_HEADER_LENGTH));
-    }
-
-    public int receive(byte[] buf, int off, int len, int waitMillis)
-        throws IOException
-    {
-        byte[] record = null;
-
-        for (;;)
-        {
-            int receiveLimit = Math.min(len, getReceiveLimit()) + RECORD_HEADER_LENGTH;
-            if (record == null || record.length < receiveLimit)
-            {
-                record = new byte[receiveLimit];
-            }
-
-            try
-            {
-                if (retransmit != null && System.currentTimeMillis() > retransmitExpiry)
-                {
-                    retransmit = null;
-                    retransmitEpoch = null;
-                }
-
-                int received = receiveRecord(record, 0, receiveLimit, waitMillis);
-                if (received < 0)
-                {
-                    return received;
-                }
-                if (received < RECORD_HEADER_LENGTH)
-                {
-                    continue;
-                }
-                int length = TlsUtils.readUint16(record, 11);
-                if (received != (length + RECORD_HEADER_LENGTH))
-                {
-                    continue;
-                }
-
-                short type = TlsUtils.readUint8(record, 0);
-
-                // TODO Support user-specified custom protocols?
-                switch (type)
-                {
-                case ContentType.alert:
-                case ContentType.application_data:
-                case ContentType.change_cipher_spec:
-                case ContentType.handshake:
-                case ContentType.heartbeat:
-                    break;
-                default:
-                    // TODO Exception?
-                    continue;
-                }
-
-                int epoch = TlsUtils.readUint16(record, 3);
-
-                DTLSEpoch recordEpoch = null;
-                if (epoch == readEpoch.getEpoch())
-                {
-                    recordEpoch = readEpoch;
-                }
-                else if (type == ContentType.handshake && retransmitEpoch != null
-                    && epoch == retransmitEpoch.getEpoch())
-                {
-                    recordEpoch = retransmitEpoch;
-                }
-
-                if (recordEpoch == null)
-                {
-                    continue;
-                }
-
-                long seq = TlsUtils.readUint48(record, 5);
-                if (recordEpoch.getReplayWindow().shouldDiscard(seq))
-                {
-                    continue;
-                }
-
-                ProtocolVersion version = TlsUtils.readVersion(record, 1);
-                if (discoveredPeerVersion != null && !discoveredPeerVersion.equals(version))
-                {
-                    continue;
-                }
-
-                byte[] plaintext = recordEpoch.getCipher().decodeCiphertext(
-                    getMacSequenceNumber(recordEpoch.getEpoch(), seq), type, record, RECORD_HEADER_LENGTH,
-                    received - RECORD_HEADER_LENGTH);
-
-                recordEpoch.getReplayWindow().reportAuthenticated(seq);
-
-                if (plaintext.length > this.plaintextLimit)
-                {
-                    continue;
-                }
-
-                if (discoveredPeerVersion == null)
-                {
-                    discoveredPeerVersion = version;
-                }
-
-                switch (type)
-                {
-                case ContentType.alert:
-                {
-                    if (plaintext.length == 2)
-                    {
-                        short alertLevel = plaintext[0];
-                        short alertDescription = plaintext[1];
-
-                        peer.notifyAlertReceived(alertLevel, alertDescription);
-
-                        if (alertLevel == AlertLevel.fatal)
-                        {
-                            fail(alertDescription);
-                            throw new TlsFatalAlert(alertDescription);
-                        }
-
-                        // TODO Can close_notify be a fatal alert?
-                        if (alertDescription == AlertDescription.close_notify)
-                        {
-                            closeTransport();
-                        }
-                    }
-
-                    continue;
-                }
-                case ContentType.application_data:
-                {
-                    if (inHandshake)
-                    {
-                        // TODO Consider buffering application data for new epoch that arrives
-                        // out-of-order with the Finished message
-                        continue;
-                    }
-                    break;
-                }
-                case ContentType.change_cipher_spec:
-                {
-                    // Implicitly receive change_cipher_spec and change to pending cipher state
-
-                    for (int i = 0; i < plaintext.length; ++i)
-                    {
-                        short message = TlsUtils.readUint8(plaintext, i);
-                        if (message != ChangeCipherSpec.change_cipher_spec)
-                        {
-                            continue;
-                        }
-
-                        if (pendingEpoch != null)
-                        {
-                            readEpoch = pendingEpoch;
-                        }
-                    }
-
-                    continue;
-                }
-                case ContentType.handshake:
-                {
-                    if (!inHandshake)
-                    {
-                        if (retransmit != null)
-                        {
-                            retransmit.receivedHandshakeRecord(epoch, plaintext, 0, plaintext.length);
-                        }
-
-                        // TODO Consider support for HelloRequest
-                        continue;
-                    }
-                    break;
-                }
-                case ContentType.heartbeat:
-                {
-                    // TODO[RFC 6520]
-                    continue;
-                }
-                }
-
-                /*
-                 * NOTE: If we receive any non-handshake data in the new epoch implies the peer has
-                 * received our final flight.
-                 */
-                if (!inHandshake && retransmit != null)
-                {
-                    this.retransmit = null;
-                    this.retransmitEpoch = null;
-                }
-
-                System.arraycopy(plaintext, 0, buf, off, plaintext.length);
-                return plaintext.length;
-            }
-            catch (IOException e)
-            {
-                // NOTE: Assume this is a timeout for the moment
-                throw e;
-            }
-        }
-    }
-
-    public void send(byte[] buf, int off, int len)
-        throws IOException
-    {
-        short contentType = ContentType.application_data;
-
-        if (this.inHandshake || this.writeEpoch == this.retransmitEpoch)
-        {
-            contentType = ContentType.handshake;
-
-            short handshakeType = TlsUtils.readUint8(buf, off);
-            if (handshakeType == HandshakeType.finished)
-            {
-                DTLSEpoch nextEpoch = null;
-                if (this.inHandshake)
-                {
-                    nextEpoch = pendingEpoch;
-                }
-                else if (this.writeEpoch == this.retransmitEpoch)
-                {
-                    nextEpoch = currentEpoch;
-                }
-
-                if (nextEpoch == null)
-                {
-                    // TODO
-                    throw new IllegalStateException();
-                }
-
-                // Implicitly send change_cipher_spec and change to pending cipher state
-
-                // TODO Send change_cipher_spec and finished records in single datagram?
-                byte[] data = new byte[]{ 1 };
-                sendRecord(ContentType.change_cipher_spec, data, 0, data.length);
-
-                writeEpoch = nextEpoch;
-            }
-        }
-
-        sendRecord(contentType, buf, off, len);
-    }
-
-    public void close()
-        throws IOException
-    {
-        if (!closed)
-        {
-            if (inHandshake)
-            {
-                warn(AlertDescription.user_canceled, "User canceled handshake");
-            }
-            closeTransport();
-        }
-    }
-
-    void fail(short alertDescription)
-    {
-        if (!closed)
-        {
-            try
-            {
-                raiseAlert(AlertLevel.fatal, alertDescription, null, null);
-            }
-            catch (Exception e)
-            {
-                // Ignore
-            }
-
-            failed = true;
-
-            closeTransport();
-        }
-    }
-
-    void warn(short alertDescription, String message)
-        throws IOException
-    {
-        raiseAlert(AlertLevel.warning, alertDescription, message, null);
-    }
-
-    private void closeTransport()
-    {
-        if (!closed)
-        {
-            /*
-             * RFC 5246 7.2.1. Unless some other fatal alert has been transmitted, each party is
-             * required to send a close_notify alert before closing the write side of the
-             * connection. The other party MUST respond with a close_notify alert of its own and
-             * close down the connection immediately, discarding any pending writes.
-             */
-
-            try
-            {
-                if (!failed)
-                {
-                    warn(AlertDescription.close_notify, null);
-                }
-                transport.close();
-            }
-            catch (Exception e)
-            {
-                // Ignore
-            }
-
-            closed = true;
-        }
-    }
-
-    private void raiseAlert(short alertLevel, short alertDescription, String message, Throwable cause)
-        throws IOException
-    {
-        peer.notifyAlertRaised(alertLevel, alertDescription, message, cause);
-
-        byte[] error = new byte[2];
-        error[0] = (byte)alertLevel;
-        error[1] = (byte)alertDescription;
-
-        sendRecord(ContentType.alert, error, 0, 2);
-    }
-
-    private int receiveRecord(byte[] buf, int off, int len, int waitMillis)
-        throws IOException
-    {
-        if (recordQueue.available() > 0)
-        {
-            int length = 0;
-            if (recordQueue.available() >= RECORD_HEADER_LENGTH)
-            {
-                byte[] lengthBytes = new byte[2];
-                recordQueue.read(lengthBytes, 0, 2, 11);
-                length = TlsUtils.readUint16(lengthBytes, 0);
-            }
-
-            int received = Math.min(recordQueue.available(), RECORD_HEADER_LENGTH + length);
-            recordQueue.removeData(buf, off, received, 0);
-            return received;
-        }
-
-        int received = transport.receive(buf, off, len, waitMillis);
-        if (received >= RECORD_HEADER_LENGTH)
-        {
-            int fragmentLength = TlsUtils.readUint16(buf, off + 11);
-            int recordLength = RECORD_HEADER_LENGTH + fragmentLength;
-            if (received > recordLength)
-            {
-                recordQueue.addData(buf, off + recordLength, received - recordLength);
-                received = recordLength;
-            }
-        }
-
-        return received;
-    }
-
-    private void sendRecord(short contentType, byte[] buf, int off, int len)
-        throws IOException
-    {
-        if (len > this.plaintextLimit)
-        {
-            throw new TlsFatalAlert(AlertDescription.internal_error);
-        }
-
-        /*
-         * RFC 5264 6.2.1 Implementations MUST NOT send zero-length fragments of Handshake, Alert,
-         * or ChangeCipherSpec content types.
-         */
-        if (len < 1 && contentType != ContentType.application_data)
-        {
-            throw new TlsFatalAlert(AlertDescription.internal_error);
-        }
-
-        int recordEpoch = writeEpoch.getEpoch();
-        long recordSequenceNumber = writeEpoch.allocateSequenceNumber();
-
-        byte[] ciphertext = writeEpoch.getCipher().encodePlaintext(
-            getMacSequenceNumber(recordEpoch, recordSequenceNumber), contentType, buf, off, len);
-
-        // TODO Check the ciphertext length?
-
-        byte[] record = new byte[ciphertext.length + RECORD_HEADER_LENGTH];
-        TlsUtils.writeUint8(contentType, record, 0);
-        ProtocolVersion version = discoveredPeerVersion != null ? discoveredPeerVersion : context.getClientVersion();
-        TlsUtils.writeVersion(version, record, 1);
-        TlsUtils.writeUint16(recordEpoch, record, 3);
-        TlsUtils.writeUint48(recordSequenceNumber, record, 5);
-        TlsUtils.writeUint16(ciphertext.length, record, 11);
-        System.arraycopy(ciphertext, 0, record, RECORD_HEADER_LENGTH, ciphertext.length);
-
-        transport.send(record, 0, record.length);
-    }
-
-    private static long getMacSequenceNumber(int epoch, long sequence_number)
-    {
-        return ((epoch & 0xFFFFFFFFL) << 48) | sequence_number;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/DTLSReliableHandshake.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/DTLSReliableHandshake.java
deleted file mode 100644
index 9218d19..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/DTLSReliableHandshake.java
+++ /dev/null
@@ -1,453 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Vector;
-
-import org.bouncycastle.util.Integers;
-
-class DTLSReliableHandshake
-{
-    private final static int MAX_RECEIVE_AHEAD = 10;
-
-    private final DTLSRecordLayer recordLayer;
-
-    private TlsHandshakeHash handshakeHash;
-
-    private Hashtable currentInboundFlight = new Hashtable();
-    private Hashtable previousInboundFlight = null;
-    private Vector outboundFlight = new Vector();
-    private boolean sending = true;
-
-    private int message_seq = 0, next_receive_seq = 0;
-
-    DTLSReliableHandshake(TlsContext context, DTLSRecordLayer transport)
-    {
-        this.recordLayer = transport;
-        this.handshakeHash = new DeferredHash();
-        this.handshakeHash.init(context);
-    }
-
-    void notifyHelloComplete()
-    {
-        this.handshakeHash = handshakeHash.notifyPRFDetermined();
-    }
-
-    TlsHandshakeHash getHandshakeHash()
-    {
-        return handshakeHash;
-    }
-
-    TlsHandshakeHash prepareToFinish()
-    {
-        TlsHandshakeHash result = handshakeHash;
-        this.handshakeHash = handshakeHash.stopTracking();
-        return result;
-    }
-
-    void sendMessage(short msg_type, byte[] body)
-        throws IOException
-    {
-        TlsUtils.checkUint24(body.length);
-
-        if (!sending)
-        {
-            checkInboundFlight();
-            sending = true;
-            outboundFlight.removeAllElements();
-        }
-
-        Message message = new Message(message_seq++, msg_type, body);
-
-        outboundFlight.addElement(message);
-
-        writeMessage(message);
-        updateHandshakeMessagesDigest(message);
-    }
-
-    byte[] receiveMessageBody(short msg_type)
-        throws IOException
-    {
-        Message message = receiveMessage();
-        if (message.getType() != msg_type)
-        {
-            throw new TlsFatalAlert(AlertDescription.unexpected_message);
-        }
-
-        return message.getBody();
-    }
-
-    Message receiveMessage()
-        throws IOException
-    {
-        if (sending)
-        {
-            sending = false;
-            prepareInboundFlight();
-        }
-
-        // Check if we already have the next message waiting
-        {
-            DTLSReassembler next = (DTLSReassembler)currentInboundFlight.get(Integers.valueOf(next_receive_seq));
-            if (next != null)
-            {
-                byte[] body = next.getBodyIfComplete();
-                if (body != null)
-                {
-                    previousInboundFlight = null;
-                    return updateHandshakeMessagesDigest(new Message(next_receive_seq++, next.getMsgType(), body));
-                }
-            }
-        }
-
-        byte[] buf = null;
-
-        // TODO Check the conditions under which we should reset this
-        int readTimeoutMillis = 1000;
-
-        for (;;)
-        {
-            int receiveLimit = recordLayer.getReceiveLimit();
-            if (buf == null || buf.length < receiveLimit)
-            {
-                buf = new byte[receiveLimit];
-            }
-
-            // TODO Handle records containing multiple handshake messages
-
-            try
-            {
-                for (; ; )
-                {
-                    int received = recordLayer.receive(buf, 0, receiveLimit, readTimeoutMillis);
-                    if (received < 0)
-                    {
-                        break;
-                    }
-                    if (received < 12)
-                    {
-                        continue;
-                    }
-                    int fragment_length = TlsUtils.readUint24(buf, 9);
-                    if (received != (fragment_length + 12))
-                    {
-                        continue;
-                    }
-                    int seq = TlsUtils.readUint16(buf, 4);
-                    if (seq > (next_receive_seq + MAX_RECEIVE_AHEAD))
-                    {
-                        continue;
-                    }
-                    short msg_type = TlsUtils.readUint8(buf, 0);
-                    int length = TlsUtils.readUint24(buf, 1);
-                    int fragment_offset = TlsUtils.readUint24(buf, 6);
-                    if (fragment_offset + fragment_length > length)
-                    {
-                        continue;
-                    }
-
-                    if (seq < next_receive_seq)
-                    {
-                        /*
-                         * NOTE: If we receive the previous flight of incoming messages in full
-                         * again, retransmit our last flight
-                         */
-                        if (previousInboundFlight != null)
-                        {
-                            DTLSReassembler reassembler = (DTLSReassembler)previousInboundFlight.get(Integers
-                                .valueOf(seq));
-                            if (reassembler != null)
-                            {
-                                reassembler.contributeFragment(msg_type, length, buf, 12, fragment_offset,
-                                    fragment_length);
-
-                                if (checkAll(previousInboundFlight))
-                                {
-                                    resendOutboundFlight();
-
-                                    /*
-                                     * TODO[DTLS] implementations SHOULD back off handshake packet
-                                     * size during the retransmit backoff.
-                                     */
-                                    readTimeoutMillis = Math.min(readTimeoutMillis * 2, 60000);
-
-                                    resetAll(previousInboundFlight);
-                                }
-                            }
-                        }
-                    }
-                    else
-                    {
-                        DTLSReassembler reassembler = (DTLSReassembler)currentInboundFlight.get(Integers.valueOf(seq));
-                        if (reassembler == null)
-                        {
-                            reassembler = new DTLSReassembler(msg_type, length);
-                            currentInboundFlight.put(Integers.valueOf(seq), reassembler);
-                        }
-
-                        reassembler.contributeFragment(msg_type, length, buf, 12, fragment_offset, fragment_length);
-
-                        if (seq == next_receive_seq)
-                        {
-                            byte[] body = reassembler.getBodyIfComplete();
-                            if (body != null)
-                            {
-                                previousInboundFlight = null;
-                                return updateHandshakeMessagesDigest(new Message(next_receive_seq++,
-                                    reassembler.getMsgType(), body));
-                            }
-                        }
-                    }
-                }
-            }
-            catch (IOException e)
-            {
-                // NOTE: Assume this is a timeout for the moment
-            }
-
-            resendOutboundFlight();
-
-            /*
-             * TODO[DTLS] implementations SHOULD back off handshake packet size during the
-             * retransmit backoff.
-             */
-            readTimeoutMillis = Math.min(readTimeoutMillis * 2, 60000);
-        }
-    }
-
-    void finish()
-    {
-        DTLSHandshakeRetransmit retransmit = null;
-        if (!sending)
-        {
-            checkInboundFlight();
-        }
-        else if (currentInboundFlight != null)
-        {
-            /*
-             * RFC 6347 4.2.4. In addition, for at least twice the default MSL defined for [TCP],
-             * when in the FINISHED state, the node that transmits the last flight (the server in an
-             * ordinary handshake or the client in a resumed handshake) MUST respond to a retransmit
-             * of the peer's last flight with a retransmit of the last flight.
-             */
-            retransmit = new DTLSHandshakeRetransmit()
-            {
-                public void receivedHandshakeRecord(int epoch, byte[] buf, int off, int len)
-                    throws IOException
-                {
-                    /*
-                     * TODO Need to handle the case where the previous inbound flight contains
-                     * messages from two epochs.
-                     */
-                    if (len < 12)
-                    {
-                        return;
-                    }
-                    int fragment_length = TlsUtils.readUint24(buf, off + 9);
-                    if (len != (fragment_length + 12))
-                    {
-                        return;
-                    }
-                    int seq = TlsUtils.readUint16(buf, off + 4);
-                    if (seq >= next_receive_seq)
-                    {
-                        return;
-                    }
-
-                    short msg_type = TlsUtils.readUint8(buf, off);
-
-                    // TODO This is a hack that only works until we try to support renegotiation
-                    int expectedEpoch = msg_type == HandshakeType.finished ? 1 : 0;
-                    if (epoch != expectedEpoch)
-                    {
-                        return;
-                    }
-
-                    int length = TlsUtils.readUint24(buf, off + 1);
-                    int fragment_offset = TlsUtils.readUint24(buf, off + 6);
-                    if (fragment_offset + fragment_length > length)
-                    {
-                        return;
-                    }
-
-                    DTLSReassembler reassembler = (DTLSReassembler)currentInboundFlight.get(Integers.valueOf(seq));
-                    if (reassembler != null)
-                    {
-                        reassembler.contributeFragment(msg_type, length, buf, off + 12, fragment_offset,
-                            fragment_length);
-                        if (checkAll(currentInboundFlight))
-                        {
-                            resendOutboundFlight();
-                            resetAll(currentInboundFlight);
-                        }
-                    }
-                }
-            };
-        }
-
-        recordLayer.handshakeSuccessful(retransmit);
-    }
-
-    void resetHandshakeMessagesDigest()
-    {
-        handshakeHash.reset();
-    }
-
-    /**
-     * Check that there are no "extra" messages left in the current inbound flight
-     */
-    private void checkInboundFlight()
-    {
-        Enumeration e = currentInboundFlight.keys();
-        while (e.hasMoreElements())
-        {
-            Integer key = (Integer)e.nextElement();
-            if (key.intValue() >= next_receive_seq)
-            {
-                // TODO Should this be considered an error?
-            }
-        }
-    }
-
-    private void prepareInboundFlight()
-    {
-        resetAll(currentInboundFlight);
-        previousInboundFlight = currentInboundFlight;
-        currentInboundFlight = new Hashtable();
-    }
-
-    private void resendOutboundFlight()
-        throws IOException
-    {
-        recordLayer.resetWriteEpoch();
-        for (int i = 0; i < outboundFlight.size(); ++i)
-        {
-            writeMessage((Message)outboundFlight.elementAt(i));
-        }
-    }
-
-    private Message updateHandshakeMessagesDigest(Message message)
-        throws IOException
-    {
-        if (message.getType() != HandshakeType.hello_request)
-        {
-            byte[] body = message.getBody();
-            byte[] buf = new byte[12];
-            TlsUtils.writeUint8(message.getType(), buf, 0);
-            TlsUtils.writeUint24(body.length, buf, 1);
-            TlsUtils.writeUint16(message.getSeq(), buf, 4);
-            TlsUtils.writeUint24(0, buf, 6);
-            TlsUtils.writeUint24(body.length, buf, 9);
-            handshakeHash.update(buf, 0, buf.length);
-            handshakeHash.update(body, 0, body.length);
-        }
-        return message;
-    }
-
-    private void writeMessage(Message message)
-        throws IOException
-    {
-        int sendLimit = recordLayer.getSendLimit();
-        int fragmentLimit = sendLimit - 12;
-
-        // TODO Support a higher minimum fragment size?
-        if (fragmentLimit < 1)
-        {
-            // TODO Should we be throwing an exception here?
-            throw new TlsFatalAlert(AlertDescription.internal_error);
-        }
-
-        int length = message.getBody().length;
-
-        // NOTE: Must still send a fragment if body is empty
-        int fragment_offset = 0;
-        do
-        {
-            int fragment_length = Math.min(length - fragment_offset, fragmentLimit);
-            writeHandshakeFragment(message, fragment_offset, fragment_length);
-            fragment_offset += fragment_length;
-        }
-        while (fragment_offset < length);
-    }
-
-    private void writeHandshakeFragment(Message message, int fragment_offset, int fragment_length)
-        throws IOException
-    {
-        RecordLayerBuffer fragment = new RecordLayerBuffer(12 + fragment_length);
-        TlsUtils.writeUint8(message.getType(), fragment);
-        TlsUtils.writeUint24(message.getBody().length, fragment);
-        TlsUtils.writeUint16(message.getSeq(), fragment);
-        TlsUtils.writeUint24(fragment_offset, fragment);
-        TlsUtils.writeUint24(fragment_length, fragment);
-        fragment.write(message.getBody(), fragment_offset, fragment_length);
-
-        fragment.sendToRecordLayer(recordLayer);
-    }
-
-    private static boolean checkAll(Hashtable inboundFlight)
-    {
-        Enumeration e = inboundFlight.elements();
-        while (e.hasMoreElements())
-        {
-            if (((DTLSReassembler)e.nextElement()).getBodyIfComplete() == null)
-            {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    private static void resetAll(Hashtable inboundFlight)
-    {
-        Enumeration e = inboundFlight.elements();
-        while (e.hasMoreElements())
-        {
-            ((DTLSReassembler)e.nextElement()).reset();
-        }
-    }
-
-    static class Message
-    {
-        private final int message_seq;
-        private final short msg_type;
-        private final byte[] body;
-
-        private Message(int message_seq, short msg_type, byte[] body)
-        {
-            this.message_seq = message_seq;
-            this.msg_type = msg_type;
-            this.body = body;
-        }
-
-        public int getSeq()
-        {
-            return message_seq;
-        }
-
-        public short getType()
-        {
-            return msg_type;
-        }
-
-        public byte[] getBody()
-        {
-            return body;
-        }
-    }
-
-    static class RecordLayerBuffer extends ByteArrayOutputStream
-    {
-        RecordLayerBuffer(int size)
-        {
-            super(size);
-        }
-
-        void sendToRecordLayer(DTLSRecordLayer recordLayer) throws IOException
-        {
-            recordLayer.send(buf, 0, count);
-            buf = null;
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/DTLSReplayWindow.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/DTLSReplayWindow.java
deleted file mode 100644
index 06537aa..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/DTLSReplayWindow.java
+++ /dev/null
@@ -1,91 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-/**
- * RFC 4347 4.1.2.5 Anti-replay
- * <p>
- * Support fast rejection of duplicate records by maintaining a sliding receive window
- * </p>
- */
-class DTLSReplayWindow
-{
-    private static final long VALID_SEQ_MASK = 0x0000FFFFFFFFFFFFL;
-
-    private static final long WINDOW_SIZE = 64L;
-
-    private long latestConfirmedSeq = -1;
-    private long bitmap = 0;
-
-    /**
-     * Check whether a received record with the given sequence number should be rejected as a duplicate.
-     *
-     * @param seq the 48-bit DTLSPlainText.sequence_number field of a received record.
-     * @return true if the record should be discarded without further processing.
-     */
-    boolean shouldDiscard(long seq)
-    {
-        if ((seq & VALID_SEQ_MASK) != seq)
-        {
-            return true;
-        }
-
-        if (seq <= latestConfirmedSeq)
-        {
-            long diff = latestConfirmedSeq - seq;
-            if (diff >= WINDOW_SIZE)
-            {
-                return true;
-            }
-            if ((bitmap & (1L << diff)) != 0)
-            {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Report that a received record with the given sequence number passed authentication checks.
-     *
-     * @param seq the 48-bit DTLSPlainText.sequence_number field of an authenticated record.
-     */
-    void reportAuthenticated(long seq)
-    {
-        if ((seq & VALID_SEQ_MASK) != seq)
-        {
-            throw new IllegalArgumentException("'seq' out of range");
-        }
-
-        if (seq <= latestConfirmedSeq)
-        {
-            long diff = latestConfirmedSeq - seq;
-            if (diff < WINDOW_SIZE)
-            {
-                bitmap |= (1L << diff);
-            }
-        }
-        else
-        {
-            long diff = seq - latestConfirmedSeq;
-            if (diff >= WINDOW_SIZE)
-            {
-                bitmap = 1;
-            }
-            else
-            {
-                bitmap <<= (int)diff;        // for earlier JDKs
-                bitmap |= 1;
-            }
-            latestConfirmedSeq = seq;
-        }
-    }
-
-    /**
-     * When a new epoch begins, sequence numbers begin again at 0
-     */
-    void reset()
-    {
-        latestConfirmedSeq = -1;
-        bitmap = 0;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/DTLSServerProtocol.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/DTLSServerProtocol.java
deleted file mode 100644
index 2d36788..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/DTLSServerProtocol.java
+++ /dev/null
@@ -1,681 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.security.SecureRandom;
-import java.util.Hashtable;
-import java.util.Vector;
-
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.bouncycastle.crypto.params.AsymmetricKeyParameter;
-import org.bouncycastle.crypto.util.PublicKeyFactory;
-import org.bouncycastle.util.Arrays;
-
-public class DTLSServerProtocol
-    extends DTLSProtocol
-{
-    protected boolean verifyRequests = true;
-
-    public DTLSServerProtocol(SecureRandom secureRandom)
-    {
-        super(secureRandom);
-    }
-
-    public boolean getVerifyRequests()
-    {
-        return verifyRequests;
-    }
-
-    public void setVerifyRequests(boolean verifyRequests)
-    {
-        this.verifyRequests = verifyRequests;
-    }
-
-    public DTLSTransport accept(TlsServer server, DatagramTransport transport)
-        throws IOException
-    {
-        if (server == null)
-        {
-            throw new IllegalArgumentException("'server' cannot be null");
-        }
-        if (transport == null)
-        {
-            throw new IllegalArgumentException("'transport' cannot be null");
-        }
-
-        SecurityParameters securityParameters = new SecurityParameters();
-        securityParameters.entity = ConnectionEnd.server;
-
-        ServerHandshakeState state = new ServerHandshakeState();
-        state.server = server;
-        state.serverContext = new TlsServerContextImpl(secureRandom, securityParameters);
-
-        securityParameters.serverRandom = TlsProtocol.createRandomBlock(server.shouldUseGMTUnixTime(),
-            state.serverContext.getNonceRandomGenerator());
-
-        server.init(state.serverContext);
-
-        DTLSRecordLayer recordLayer = new DTLSRecordLayer(transport, state.serverContext, server, ContentType.handshake);
-
-        // TODO Need to handle sending of HelloVerifyRequest without entering a full connection
-
-        try
-        {
-            return serverHandshake(state, recordLayer);
-        }
-        catch (TlsFatalAlert fatalAlert)
-        {
-            recordLayer.fail(fatalAlert.getAlertDescription());
-            throw fatalAlert;
-        }
-        catch (IOException e)
-        {
-            recordLayer.fail(AlertDescription.internal_error);
-            throw e;
-        }
-        catch (RuntimeException e)
-        {
-            recordLayer.fail(AlertDescription.internal_error);
-            throw new TlsFatalAlert(AlertDescription.internal_error, e);
-        }
-    }
-
-    protected DTLSTransport serverHandshake(ServerHandshakeState state, DTLSRecordLayer recordLayer)
-        throws IOException
-    {
-        SecurityParameters securityParameters = state.serverContext.getSecurityParameters();
-        DTLSReliableHandshake handshake = new DTLSReliableHandshake(state.serverContext, recordLayer);
-
-        DTLSReliableHandshake.Message clientMessage = handshake.receiveMessage();
-
-        {
-            // NOTE: After receiving a record from the client, we discover the record layer version
-            ProtocolVersion client_version = recordLayer.getDiscoveredPeerVersion();
-            // TODO Read RFCs for guidance on the expected record layer version number
-            state.serverContext.setClientVersion(client_version);
-        }
-
-        if (clientMessage.getType() == HandshakeType.client_hello)
-        {
-            processClientHello(state, clientMessage.getBody());
-        }
-        else
-        {
-            throw new TlsFatalAlert(AlertDescription.unexpected_message);
-        }
-
-        {
-            byte[] serverHelloBody = generateServerHello(state);
-    
-            if (state.maxFragmentLength >= 0)
-            {
-                int plainTextLimit = 1 << (8 + state.maxFragmentLength);
-                recordLayer.setPlaintextLimit(plainTextLimit);
-            }
-    
-            securityParameters.cipherSuite = state.selectedCipherSuite;
-            securityParameters.compressionAlgorithm = state.selectedCompressionMethod;
-            securityParameters.prfAlgorithm = TlsProtocol.getPRFAlgorithm(state.serverContext,
-                state.selectedCipherSuite);
-    
-            /*
-             * RFC 5264 7.4.9. Any cipher suite which does not explicitly specify verify_data_length
-             * has a verify_data_length equal to 12. This includes all existing cipher suites.
-             */
-            securityParameters.verifyDataLength = 12;
-    
-            handshake.sendMessage(HandshakeType.server_hello, serverHelloBody);
-        }
-
-        handshake.notifyHelloComplete();
-
-        Vector serverSupplementalData = state.server.getServerSupplementalData();
-        if (serverSupplementalData != null)
-        {
-            byte[] supplementalDataBody = generateSupplementalData(serverSupplementalData);
-            handshake.sendMessage(HandshakeType.supplemental_data, supplementalDataBody);
-        }
-
-        state.keyExchange = state.server.getKeyExchange();
-        state.keyExchange.init(state.serverContext);
-
-        state.serverCredentials = state.server.getCredentials();
-
-        Certificate serverCertificate = null;
-
-        if (state.serverCredentials == null)
-        {
-            state.keyExchange.skipServerCredentials();
-        }
-        else
-        {
-            state.keyExchange.processServerCredentials(state.serverCredentials);
-
-            serverCertificate = state.serverCredentials.getCertificate();
-            byte[] certificateBody = generateCertificate(serverCertificate);
-            handshake.sendMessage(HandshakeType.certificate, certificateBody);
-        }
-
-        // TODO[RFC 3546] Check whether empty certificates is possible, allowed, or excludes CertificateStatus
-        if (serverCertificate == null || serverCertificate.isEmpty())
-        {
-            state.allowCertificateStatus = false;
-        }
-
-        if (state.allowCertificateStatus)
-        {
-            CertificateStatus certificateStatus = state.server.getCertificateStatus();
-            if (certificateStatus != null)
-            {
-                byte[] certificateStatusBody = generateCertificateStatus(state, certificateStatus);
-                handshake.sendMessage(HandshakeType.certificate_status, certificateStatusBody);
-            }
-        }
-
-        byte[] serverKeyExchange = state.keyExchange.generateServerKeyExchange();
-        if (serverKeyExchange != null)
-        {
-            handshake.sendMessage(HandshakeType.server_key_exchange, serverKeyExchange);
-        }
-
-        if (state.serverCredentials != null)
-        {
-            state.certificateRequest = state.server.getCertificateRequest();
-            if (state.certificateRequest != null)
-            {
-                state.keyExchange.validateCertificateRequest(state.certificateRequest);
-
-                byte[] certificateRequestBody = generateCertificateRequest(state, state.certificateRequest);
-                handshake.sendMessage(HandshakeType.certificate_request, certificateRequestBody);
-
-                TlsUtils.trackHashAlgorithms(handshake.getHandshakeHash(),
-                    state.certificateRequest.getSupportedSignatureAlgorithms());
-            }
-        }
-
-        handshake.sendMessage(HandshakeType.server_hello_done, TlsUtils.EMPTY_BYTES);
-
-        handshake.getHandshakeHash().sealHashAlgorithms();
-
-        clientMessage = handshake.receiveMessage();
-
-        if (clientMessage.getType() == HandshakeType.supplemental_data)
-        {
-            processClientSupplementalData(state, clientMessage.getBody());
-            clientMessage = handshake.receiveMessage();
-        }
-        else
-        {
-            state.server.processClientSupplementalData(null);
-        }
-
-        if (state.certificateRequest == null)
-        {
-            state.keyExchange.skipClientCredentials();
-        }
-        else
-        {
-            if (clientMessage.getType() == HandshakeType.certificate)
-            {
-                processClientCertificate(state, clientMessage.getBody());
-                clientMessage = handshake.receiveMessage();
-            }
-            else
-            {
-                if (TlsUtils.isTLSv12(state.serverContext))
-                {
-                    /*
-                     * RFC 5246 If no suitable certificate is available, the client MUST send a
-                     * certificate message containing no certificates.
-                     * 
-                     * NOTE: In previous RFCs, this was SHOULD instead of MUST.
-                     */
-                    throw new TlsFatalAlert(AlertDescription.unexpected_message);
-                }
-
-                notifyClientCertificate(state, Certificate.EMPTY_CHAIN);
-            }
-        }
-
-        if (clientMessage.getType() == HandshakeType.client_key_exchange)
-        {
-            processClientKeyExchange(state, clientMessage.getBody());
-        }
-        else
-        {
-            throw new TlsFatalAlert(AlertDescription.unexpected_message);
-        }
-
-        TlsHandshakeHash prepareFinishHash = handshake.prepareToFinish();
-        securityParameters.sessionHash = TlsProtocol.getCurrentPRFHash(state.serverContext, prepareFinishHash, null);
-
-        TlsProtocol.establishMasterSecret(state.serverContext, state.keyExchange);
-        recordLayer.initPendingEpoch(state.server.getCipher());
-
-        /*
-         * RFC 5246 7.4.8 This message is only sent following a client certificate that has signing
-         * capability (i.e., all certificates except those containing fixed Diffie-Hellman
-         * parameters).
-         */
-        if (expectCertificateVerifyMessage(state))
-        {
-            byte[] certificateVerifyBody = handshake.receiveMessageBody(HandshakeType.certificate_verify);
-            processCertificateVerify(state, certificateVerifyBody, prepareFinishHash);
-        }
-
-        // NOTE: Calculated exclusive of the actual Finished message from the client
-        byte[] expectedClientVerifyData = TlsUtils.calculateVerifyData(state.serverContext, ExporterLabel.client_finished,
-            TlsProtocol.getCurrentPRFHash(state.serverContext, handshake.getHandshakeHash(), null));
-        processFinished(handshake.receiveMessageBody(HandshakeType.finished), expectedClientVerifyData);
-
-        if (state.expectSessionTicket)
-        {
-            NewSessionTicket newSessionTicket = state.server.getNewSessionTicket();
-            byte[] newSessionTicketBody = generateNewSessionTicket(state, newSessionTicket);
-            handshake.sendMessage(HandshakeType.session_ticket, newSessionTicketBody);
-        }
-
-        // NOTE: Calculated exclusive of the Finished message itself
-        byte[] serverVerifyData = TlsUtils.calculateVerifyData(state.serverContext, ExporterLabel.server_finished,
-            TlsProtocol.getCurrentPRFHash(state.serverContext, handshake.getHandshakeHash(), null));
-        handshake.sendMessage(HandshakeType.finished, serverVerifyData);
-
-        handshake.finish();
-
-        state.server.notifyHandshakeComplete();
-
-        return new DTLSTransport(recordLayer);
-    }
-
-    protected byte[] generateCertificateRequest(ServerHandshakeState state, CertificateRequest certificateRequest)
-        throws IOException
-    {
-        ByteArrayOutputStream buf = new ByteArrayOutputStream();
-        certificateRequest.encode(buf);
-        return buf.toByteArray();
-    }
-
-    protected byte[] generateCertificateStatus(ServerHandshakeState state, CertificateStatus certificateStatus)
-        throws IOException
-    {
-        ByteArrayOutputStream buf = new ByteArrayOutputStream();
-        certificateStatus.encode(buf);
-        return buf.toByteArray();
-    }
-
-    protected byte[] generateNewSessionTicket(ServerHandshakeState state, NewSessionTicket newSessionTicket)
-        throws IOException
-    {
-        ByteArrayOutputStream buf = new ByteArrayOutputStream();
-        newSessionTicket.encode(buf);
-        return buf.toByteArray();
-    }
-
-    protected byte[] generateServerHello(ServerHandshakeState state)
-        throws IOException
-    {
-        SecurityParameters securityParameters = state.serverContext.getSecurityParameters();
-
-        ByteArrayOutputStream buf = new ByteArrayOutputStream();
-
-        ProtocolVersion server_version = state.server.getServerVersion();
-        if (!server_version.isEqualOrEarlierVersionOf(state.serverContext.getClientVersion()))
-        {
-            throw new TlsFatalAlert(AlertDescription.internal_error);
-        }
-
-        // TODO Read RFCs for guidance on the expected record layer version number
-        // recordStream.setReadVersion(server_version);
-        // recordStream.setWriteVersion(server_version);
-        // recordStream.setRestrictReadVersion(true);
-        state.serverContext.setServerVersion(server_version);
-
-        TlsUtils.writeVersion(state.serverContext.getServerVersion(), buf);
-
-        buf.write(securityParameters.getServerRandom());
-
-        /*
-         * The server may return an empty session_id to indicate that the session will not be cached
-         * and therefore cannot be resumed.
-         */
-        TlsUtils.writeOpaque8(TlsUtils.EMPTY_BYTES, buf);
-
-        state.selectedCipherSuite = state.server.getSelectedCipherSuite();
-        if (!Arrays.contains(state.offeredCipherSuites, state.selectedCipherSuite)
-            || state.selectedCipherSuite == CipherSuite.TLS_NULL_WITH_NULL_NULL
-            || CipherSuite.isSCSV(state.selectedCipherSuite)
-            || !TlsUtils.isValidCipherSuiteForVersion(state.selectedCipherSuite, server_version))
-        {
-            throw new TlsFatalAlert(AlertDescription.internal_error);
-        }
-
-        validateSelectedCipherSuite(state.selectedCipherSuite, AlertDescription.internal_error);
-
-        state.selectedCompressionMethod = state.server.getSelectedCompressionMethod();
-        if (!Arrays.contains(state.offeredCompressionMethods, state.selectedCompressionMethod))
-        {
-            throw new TlsFatalAlert(AlertDescription.internal_error);
-        }
-
-        TlsUtils.writeUint16(state.selectedCipherSuite, buf);
-        TlsUtils.writeUint8(state.selectedCompressionMethod, buf);
-
-        state.serverExtensions = state.server.getServerExtensions();
-
-        /*
-         * RFC 5746 3.6. Server Behavior: Initial Handshake
-         */
-        if (state.secure_renegotiation)
-        {
-            byte[] renegExtData = TlsUtils.getExtensionData(state.serverExtensions, TlsProtocol.EXT_RenegotiationInfo);
-            boolean noRenegExt = (null == renegExtData);
-
-            if (noRenegExt)
-            {
-                /*
-                 * Note that sending a "renegotiation_info" extension in response to a ClientHello
-                 * containing only the SCSV is an explicit exception to the prohibition in RFC 5246,
-                 * Section 7.4.1.4, on the server sending unsolicited extensions and is only allowed
-                 * because the client is signaling its willingness to receive the extension via the
-                 * TLS_EMPTY_RENEGOTIATION_INFO_SCSV SCSV.
-                 */
-
-                /*
-                 * If the secure_renegotiation flag is set to TRUE, the server MUST include an empty
-                 * "renegotiation_info" extension in the ServerHello message.
-                 */
-                state.serverExtensions = TlsExtensionsUtils.ensureExtensionsInitialised(state.serverExtensions);
-                state.serverExtensions.put(TlsProtocol.EXT_RenegotiationInfo,
-                    TlsProtocol.createRenegotiationInfo(TlsUtils.EMPTY_BYTES));
-            }
-        }
-
-        if (securityParameters.extendedMasterSecret)
-        {
-            state.serverExtensions = TlsExtensionsUtils.ensureExtensionsInitialised(state.serverExtensions);
-            TlsExtensionsUtils.addExtendedMasterSecretExtension(state.serverExtensions);
-        }
-
-        if (state.serverExtensions != null)
-        {
-            securityParameters.encryptThenMAC = TlsExtensionsUtils.hasEncryptThenMACExtension(state.serverExtensions);
-
-            state.maxFragmentLength = evaluateMaxFragmentLengthExtension(state.clientExtensions, state.serverExtensions,
-                AlertDescription.internal_error);
-
-            securityParameters.truncatedHMac = TlsExtensionsUtils.hasTruncatedHMacExtension(state.serverExtensions);
-
-            state.allowCertificateStatus = TlsUtils.hasExpectedEmptyExtensionData(state.serverExtensions,
-                TlsExtensionsUtils.EXT_status_request, AlertDescription.internal_error);
-
-            state.expectSessionTicket = TlsUtils.hasExpectedEmptyExtensionData(state.serverExtensions,
-                TlsProtocol.EXT_SessionTicket, AlertDescription.internal_error);
-
-            TlsProtocol.writeExtensions(buf, state.serverExtensions);
-        }
-
-        return buf.toByteArray();
-    }
-
-    protected void notifyClientCertificate(ServerHandshakeState state, Certificate clientCertificate)
-        throws IOException
-    {
-        if (state.certificateRequest == null)
-        {
-            throw new IllegalStateException();
-        }
-
-        if (state.clientCertificate != null)
-        {
-            throw new TlsFatalAlert(AlertDescription.unexpected_message);
-        }
-
-        state.clientCertificate = clientCertificate;
-
-        if (clientCertificate.isEmpty())
-        {
-            state.keyExchange.skipClientCredentials();
-        }
-        else
-        {
-
-            /*
-             * TODO RFC 5246 7.4.6. If the certificate_authorities list in the certificate request
-             * message was non-empty, one of the certificates in the certificate chain SHOULD be
-             * issued by one of the listed CAs.
-             */
-
-            state.clientCertificateType = TlsUtils.getClientCertificateType(clientCertificate,
-                state.serverCredentials.getCertificate());
-
-            state.keyExchange.processClientCertificate(clientCertificate);
-        }
-
-        /*
-         * RFC 5246 7.4.6. If the client does not send any certificates, the server MAY at its
-         * discretion either continue the handshake without client authentication, or respond with a
-         * fatal handshake_failure alert. Also, if some aspect of the certificate chain was
-         * unacceptable (e.g., it was not signed by a known, trusted CA), the server MAY at its
-         * discretion either continue the handshake (considering the client unauthenticated) or send
-         * a fatal alert.
-         */
-        state.server.notifyClientCertificate(clientCertificate);
-    }
-
-    protected void processClientCertificate(ServerHandshakeState state, byte[] body)
-        throws IOException
-    {
-        ByteArrayInputStream buf = new ByteArrayInputStream(body);
-
-        Certificate clientCertificate = Certificate.parse(buf);
-
-        TlsProtocol.assertEmpty(buf);
-
-        notifyClientCertificate(state, clientCertificate);
-    }
-
-    protected void processCertificateVerify(ServerHandshakeState state, byte[] body, TlsHandshakeHash prepareFinishHash)
-        throws IOException
-    {
-        ByteArrayInputStream buf = new ByteArrayInputStream(body);
-
-        TlsServerContextImpl context = state.serverContext;
-        DigitallySigned clientCertificateVerify = DigitallySigned.parse(context, buf);
-
-        TlsProtocol.assertEmpty(buf);
-
-        // Verify the CertificateVerify message contains a correct signature.
-        boolean verified = false;
-        try
-        {
-            byte[] hash;
-            if (TlsUtils.isTLSv12(context))
-            {
-                hash = prepareFinishHash.getFinalHash(clientCertificateVerify.getAlgorithm().getHash());
-            }
-            else
-            {
-                hash = context.getSecurityParameters().getSessionHash();
-            }
-
-            org.bouncycastle.asn1.x509.Certificate x509Cert = state.clientCertificate.getCertificateAt(0);
-            SubjectPublicKeyInfo keyInfo = x509Cert.getSubjectPublicKeyInfo();
-            AsymmetricKeyParameter publicKey = PublicKeyFactory.createKey(keyInfo);
-
-            TlsSigner tlsSigner = TlsUtils.createTlsSigner(state.clientCertificateType);
-            tlsSigner.init(context);
-            verified = tlsSigner.verifyRawSignature(clientCertificateVerify.getAlgorithm(),
-                clientCertificateVerify.getSignature(), publicKey, hash);
-        }
-        catch (Exception e)
-        {
-        }
-
-        if (!verified)
-        {
-            throw new TlsFatalAlert(AlertDescription.decrypt_error);
-        }
-    }
-
-    protected void processClientHello(ServerHandshakeState state, byte[] body)
-        throws IOException
-    {
-        ByteArrayInputStream buf = new ByteArrayInputStream(body);
-
-        // TODO Read RFCs for guidance on the expected record layer version number
-        ProtocolVersion client_version = TlsUtils.readVersion(buf);
-        if (!client_version.isDTLS())
-        {
-            throw new TlsFatalAlert(AlertDescription.illegal_parameter);
-        }
-
-        /*
-         * Read the client random
-         */
-        byte[] client_random = TlsUtils.readFully(32, buf);
-
-        byte[] sessionID = TlsUtils.readOpaque8(buf);
-        if (sessionID.length > 32)
-        {
-            throw new TlsFatalAlert(AlertDescription.illegal_parameter);
-        }
-
-        // TODO RFC 4347 has the cookie length restricted to 32, but not in RFC 6347
-        byte[] cookie = TlsUtils.readOpaque8(buf);
-
-        int cipher_suites_length = TlsUtils.readUint16(buf);
-        if (cipher_suites_length < 2 || (cipher_suites_length & 1) != 0)
-        {
-            throw new TlsFatalAlert(AlertDescription.decode_error);
-        }
-
-        /*
-         * NOTE: "If the session_id field is not empty (implying a session resumption request) this
-         * vector must include at least the cipher_suite from that session."
-         */
-        state.offeredCipherSuites = TlsUtils.readUint16Array(cipher_suites_length / 2, buf);
-
-        int compression_methods_length = TlsUtils.readUint8(buf);
-        if (compression_methods_length < 1)
-        {
-            throw new TlsFatalAlert(AlertDescription.illegal_parameter);
-        }
-
-        state.offeredCompressionMethods = TlsUtils.readUint8Array(compression_methods_length, buf);
-
-        /*
-         * TODO RFC 3546 2.3 If [...] the older session is resumed, then the server MUST ignore
-         * extensions appearing in the client hello, and send a server hello containing no
-         * extensions.
-         */
-        state.clientExtensions = TlsProtocol.readExtensions(buf);
-
-        TlsServerContextImpl context = state.serverContext;
-        SecurityParameters securityParameters = context.getSecurityParameters();
-
-        securityParameters.extendedMasterSecret = TlsExtensionsUtils.hasExtendedMasterSecretExtension(state.clientExtensions);
-
-        context.setClientVersion(client_version);
-
-        state.server.notifyClientVersion(client_version);
-        state.server.notifyFallback(Arrays.contains(state.offeredCipherSuites, CipherSuite.TLS_FALLBACK_SCSV));
-
-        securityParameters.clientRandom = client_random;
-
-        state.server.notifyOfferedCipherSuites(state.offeredCipherSuites);
-        state.server.notifyOfferedCompressionMethods(state.offeredCompressionMethods);
-
-        /*
-         * RFC 5746 3.6. Server Behavior: Initial Handshake
-         */
-        {
-            /*
-             * RFC 5746 3.4. The client MUST include either an empty "renegotiation_info" extension,
-             * or the TLS_EMPTY_RENEGOTIATION_INFO_SCSV signaling cipher suite value in the
-             * ClientHello. Including both is NOT RECOMMENDED.
-             */
-
-            /*
-             * When a ClientHello is received, the server MUST check if it includes the
-             * TLS_EMPTY_RENEGOTIATION_INFO_SCSV SCSV. If it does, set the secure_renegotiation flag
-             * to TRUE.
-             */
-            if (Arrays.contains(state.offeredCipherSuites, CipherSuite.TLS_EMPTY_RENEGOTIATION_INFO_SCSV))
-            {
-                state.secure_renegotiation = true;
-            }
-
-            /*
-             * The server MUST check if the "renegotiation_info" extension is included in the
-             * ClientHello.
-             */
-            byte[] renegExtData = TlsUtils.getExtensionData(state.clientExtensions, TlsProtocol.EXT_RenegotiationInfo);
-            if (renegExtData != null)
-            {
-                /*
-                 * If the extension is present, set secure_renegotiation flag to TRUE. The
-                 * server MUST then verify that the length of the "renegotiated_connection"
-                 * field is zero, and if it is not, MUST abort the handshake.
-                 */
-                state.secure_renegotiation = true;
-
-                if (!Arrays.constantTimeAreEqual(renegExtData, TlsProtocol.createRenegotiationInfo(TlsUtils.EMPTY_BYTES)))
-                {
-                    throw new TlsFatalAlert(AlertDescription.handshake_failure);
-                }
-            }
-        }
-
-        state.server.notifySecureRenegotiation(state.secure_renegotiation);
-
-        if (state.clientExtensions != null)
-        {
-            state.server.processClientExtensions(state.clientExtensions);
-        }
-    }
-
-    protected void processClientKeyExchange(ServerHandshakeState state, byte[] body)
-        throws IOException
-    {
-        ByteArrayInputStream buf = new ByteArrayInputStream(body);
-
-        state.keyExchange.processClientKeyExchange(buf);
-
-        TlsProtocol.assertEmpty(buf);
-    }
-
-    protected void processClientSupplementalData(ServerHandshakeState state, byte[] body)
-        throws IOException
-    {
-        ByteArrayInputStream buf = new ByteArrayInputStream(body);
-        Vector clientSupplementalData = TlsProtocol.readSupplementalDataMessage(buf);
-        state.server.processClientSupplementalData(clientSupplementalData);
-    }
-
-    protected boolean expectCertificateVerifyMessage(ServerHandshakeState state)
-    {
-        return state.clientCertificateType >= 0 && TlsUtils.hasSigningCapability(state.clientCertificateType);
-    }
-
-    protected static class ServerHandshakeState
-    {
-        TlsServer server = null;
-        TlsServerContextImpl serverContext = null;
-        int[] offeredCipherSuites;
-        short[] offeredCompressionMethods;
-        Hashtable clientExtensions;
-        int selectedCipherSuite = -1;
-        short selectedCompressionMethod = -1;
-        boolean secure_renegotiation = false;
-        short maxFragmentLength = -1;
-        boolean allowCertificateStatus = false;
-        boolean expectSessionTicket = false;
-        Hashtable serverExtensions = null;
-        TlsKeyExchange keyExchange = null;
-        TlsCredentials serverCredentials = null;
-        CertificateRequest certificateRequest = null;
-        short clientCertificateType = -1;
-        Certificate clientCertificate = null;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/DTLSTransport.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/DTLSTransport.java
deleted file mode 100644
index ea790aa..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/DTLSTransport.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-import java.io.IOException;
-
-public class DTLSTransport
-    implements DatagramTransport
-{
-    private final DTLSRecordLayer recordLayer;
-
-    DTLSTransport(DTLSRecordLayer recordLayer)
-    {
-        this.recordLayer = recordLayer;
-    }
-
-    public int getReceiveLimit()
-        throws IOException
-    {
-        return recordLayer.getReceiveLimit();
-    }
-
-    public int getSendLimit()
-        throws IOException
-    {
-        return recordLayer.getSendLimit();
-    }
-
-    public int receive(byte[] buf, int off, int len, int waitMillis)
-        throws IOException
-    {
-        try
-        {
-            return recordLayer.receive(buf, off, len, waitMillis);
-        }
-        catch (TlsFatalAlert fatalAlert)
-        {
-            recordLayer.fail(fatalAlert.getAlertDescription());
-            throw fatalAlert;
-        }
-        catch (IOException e)
-        {
-            recordLayer.fail(AlertDescription.internal_error);
-            throw e;
-        }
-        catch (RuntimeException e)
-        {
-            recordLayer.fail(AlertDescription.internal_error);
-            throw new TlsFatalAlert(AlertDescription.internal_error, e);
-        }
-    }
-
-    public void send(byte[] buf, int off, int len)
-        throws IOException
-    {
-        try
-        {
-            recordLayer.send(buf, off, len);
-        }
-        catch (TlsFatalAlert fatalAlert)
-        {
-            recordLayer.fail(fatalAlert.getAlertDescription());
-            throw fatalAlert;
-        }
-        catch (IOException e)
-        {
-            recordLayer.fail(AlertDescription.internal_error);
-            throw e;
-        }
-        catch (RuntimeException e)
-        {
-            recordLayer.fail(AlertDescription.internal_error);
-            throw new TlsFatalAlert(AlertDescription.internal_error, e);
-        }
-    }
-
-    public void close()
-        throws IOException
-    {
-        recordLayer.close();
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/DatagramTransport.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/DatagramTransport.java
deleted file mode 100644
index 1497214..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/DatagramTransport.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-import java.io.IOException;
-
-public interface DatagramTransport
-{
-    int getReceiveLimit()
-        throws IOException;
-
-    int getSendLimit()
-        throws IOException;
-
-    int receive(byte[] buf, int off, int len, int waitMillis)
-        throws IOException;
-
-    void send(byte[] buf, int off, int len)
-        throws IOException;
-
-    void close()
-        throws IOException;
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/DefaultTlsAgreementCredentials.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/DefaultTlsAgreementCredentials.java
deleted file mode 100644
index 78afb41..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/DefaultTlsAgreementCredentials.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-import java.math.BigInteger;
-
-import org.bouncycastle.crypto.BasicAgreement;
-import org.bouncycastle.crypto.agreement.DHBasicAgreement;
-import org.bouncycastle.crypto.agreement.ECDHBasicAgreement;
-import org.bouncycastle.crypto.params.AsymmetricKeyParameter;
-import org.bouncycastle.crypto.params.DHPrivateKeyParameters;
-import org.bouncycastle.crypto.params.ECPrivateKeyParameters;
-import org.bouncycastle.util.BigIntegers;
-
-public class DefaultTlsAgreementCredentials
-    extends AbstractTlsAgreementCredentials
-{
-    protected Certificate certificate;
-    protected AsymmetricKeyParameter privateKey;
-
-    protected BasicAgreement basicAgreement;
-    protected boolean truncateAgreement;
-
-    public DefaultTlsAgreementCredentials(Certificate certificate, AsymmetricKeyParameter privateKey)
-    {
-        if (certificate == null)
-        {
-            throw new IllegalArgumentException("'certificate' cannot be null");
-        }
-        if (certificate.isEmpty())
-        {
-            throw new IllegalArgumentException("'certificate' cannot be empty");
-        }
-        if (privateKey == null)
-        {
-            throw new IllegalArgumentException("'privateKey' cannot be null");
-        }
-        if (!privateKey.isPrivate())
-        {
-            throw new IllegalArgumentException("'privateKey' must be private");
-        }
-
-        if (privateKey instanceof DHPrivateKeyParameters)
-        {
-            basicAgreement = new DHBasicAgreement();
-            truncateAgreement = true;
-        }
-        else if (privateKey instanceof ECPrivateKeyParameters)
-        {
-            basicAgreement = new ECDHBasicAgreement();
-            truncateAgreement = false;
-        }
-        else
-        {
-            throw new IllegalArgumentException("'privateKey' type not supported: "
-                + privateKey.getClass().getName());
-        }
-
-        this.certificate = certificate;
-        this.privateKey = privateKey;
-    }
-
-    public Certificate getCertificate()
-    {
-        return certificate;
-    }
-
-    public byte[] generateAgreement(AsymmetricKeyParameter peerPublicKey)
-    {
-        basicAgreement.init(privateKey);
-        BigInteger agreementValue = basicAgreement.calculateAgreement(peerPublicKey);
-
-        if (truncateAgreement)
-        {
-            return BigIntegers.asUnsignedByteArray(agreementValue);
-        }
-
-        return BigIntegers.asUnsignedByteArray(basicAgreement.getFieldSize(), agreementValue);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/DefaultTlsCipherFactory.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/DefaultTlsCipherFactory.java
deleted file mode 100644
index f320943..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/DefaultTlsCipherFactory.java
+++ /dev/null
@@ -1,232 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-import java.io.IOException;
-
-import org.bouncycastle.crypto.BlockCipher;
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.StreamCipher;
-import org.bouncycastle.crypto.engines.AESEngine;
-import org.bouncycastle.crypto.engines.CamelliaEngine;
-import org.bouncycastle.crypto.engines.DESedeEngine;
-import org.bouncycastle.crypto.engines.RC4Engine;
-import org.bouncycastle.crypto.engines.SEEDEngine;
-import org.bouncycastle.crypto.engines.Salsa20Engine;
-import org.bouncycastle.crypto.modes.AEADBlockCipher;
-import org.bouncycastle.crypto.modes.CBCBlockCipher;
-import org.bouncycastle.crypto.modes.CCMBlockCipher;
-import org.bouncycastle.crypto.modes.GCMBlockCipher;
-
-public class DefaultTlsCipherFactory
-    extends AbstractTlsCipherFactory
-{
-    public TlsCipher createCipher(TlsContext context, int encryptionAlgorithm, int macAlgorithm)
-        throws IOException
-    {
-        switch (encryptionAlgorithm)
-        {
-        case EncryptionAlgorithm._3DES_EDE_CBC:
-            return createDESedeCipher(context, macAlgorithm);
-        case EncryptionAlgorithm.AEAD_CHACHA20_POLY1305:
-            // NOTE: Ignores macAlgorithm
-            return createChaCha20Poly1305(context);
-        case EncryptionAlgorithm.AES_128_CBC:
-            return createAESCipher(context, 16, macAlgorithm);
-        case EncryptionAlgorithm.AES_128_CCM:
-            // NOTE: Ignores macAlgorithm
-            return createCipher_AES_CCM(context, 16, 16);
-        case EncryptionAlgorithm.AES_128_CCM_8:
-            // NOTE: Ignores macAlgorithm
-            return createCipher_AES_CCM(context, 16, 8);
-        case EncryptionAlgorithm.AES_256_CCM:
-            // NOTE: Ignores macAlgorithm
-            return createCipher_AES_CCM(context, 32, 16);
-        case EncryptionAlgorithm.AES_256_CCM_8:
-            // NOTE: Ignores macAlgorithm
-            return createCipher_AES_CCM(context, 32, 8);
-        case EncryptionAlgorithm.AES_128_GCM:
-            // NOTE: Ignores macAlgorithm
-            return createCipher_AES_GCM(context, 16, 16);
-        case EncryptionAlgorithm.AES_256_CBC:
-            return createAESCipher(context, 32, macAlgorithm);
-        case EncryptionAlgorithm.AES_256_GCM:
-            // NOTE: Ignores macAlgorithm
-            return createCipher_AES_GCM(context, 32, 16);
-        case EncryptionAlgorithm.CAMELLIA_128_CBC:
-            return createCamelliaCipher(context, 16, macAlgorithm);
-        case EncryptionAlgorithm.CAMELLIA_128_GCM:
-            // NOTE: Ignores macAlgorithm
-            return createCipher_Camellia_GCM(context, 16, 16);
-        case EncryptionAlgorithm.CAMELLIA_256_CBC:
-            return createCamelliaCipher(context, 32, macAlgorithm);
-        case EncryptionAlgorithm.CAMELLIA_256_GCM:
-            // NOTE: Ignores macAlgorithm
-            return createCipher_Camellia_GCM(context, 32, 16);
-        case EncryptionAlgorithm.ESTREAM_SALSA20:
-            return createSalsa20Cipher(context, 12, 32, macAlgorithm);
-        case EncryptionAlgorithm.NULL:
-            return createNullCipher(context, macAlgorithm);
-        case EncryptionAlgorithm.RC4_128:
-            return createRC4Cipher(context, 16, macAlgorithm);
-        case EncryptionAlgorithm.SALSA20:
-            return createSalsa20Cipher(context, 20, 32, macAlgorithm);
-        case EncryptionAlgorithm.SEED_CBC:
-            return createSEEDCipher(context, macAlgorithm);
-        default:
-            throw new TlsFatalAlert(AlertDescription.internal_error);
-        }
-    }
-
-    protected TlsBlockCipher createAESCipher(TlsContext context, int cipherKeySize, int macAlgorithm)
-        throws IOException
-    {
-        return new TlsBlockCipher(context, createAESBlockCipher(), createAESBlockCipher(),
-            createHMACDigest(macAlgorithm), createHMACDigest(macAlgorithm), cipherKeySize);
-    }
-
-    protected TlsBlockCipher createCamelliaCipher(TlsContext context, int cipherKeySize, int macAlgorithm)
-        throws IOException
-    {
-        return new TlsBlockCipher(context, createCamelliaBlockCipher(),
-            createCamelliaBlockCipher(), createHMACDigest(macAlgorithm),
-            createHMACDigest(macAlgorithm), cipherKeySize);
-    }
-
-    protected TlsCipher createChaCha20Poly1305(TlsContext context) throws IOException
-    {
-        return new Chacha20Poly1305(context);
-    }
-
-    protected TlsAEADCipher createCipher_AES_CCM(TlsContext context, int cipherKeySize, int macSize)
-        throws IOException
-    {
-        return new TlsAEADCipher(context, createAEADBlockCipher_AES_CCM(),
-            createAEADBlockCipher_AES_CCM(), cipherKeySize, macSize);
-    }
-
-    protected TlsAEADCipher createCipher_AES_GCM(TlsContext context, int cipherKeySize, int macSize)
-        throws IOException
-    {
-        return new TlsAEADCipher(context, createAEADBlockCipher_AES_GCM(),
-            createAEADBlockCipher_AES_GCM(), cipherKeySize, macSize);
-    }
-
-    protected TlsAEADCipher createCipher_Camellia_GCM(TlsContext context, int cipherKeySize, int macSize)
-        throws IOException
-    {
-        return new TlsAEADCipher(context, createAEADBlockCipher_Camellia_GCM(),
-            createAEADBlockCipher_Camellia_GCM(), cipherKeySize, macSize);
-    }
-
-    protected TlsBlockCipher createDESedeCipher(TlsContext context, int macAlgorithm)
-        throws IOException
-    {
-        return new TlsBlockCipher(context, createDESedeBlockCipher(), createDESedeBlockCipher(),
-            createHMACDigest(macAlgorithm), createHMACDigest(macAlgorithm), 24);
-    }
-
-    protected TlsNullCipher createNullCipher(TlsContext context, int macAlgorithm)
-        throws IOException
-    {
-        return new TlsNullCipher(context, createHMACDigest(macAlgorithm),
-            createHMACDigest(macAlgorithm));
-    }
-
-    protected TlsStreamCipher createRC4Cipher(TlsContext context, int cipherKeySize, int macAlgorithm)
-        throws IOException
-    {
-        return new TlsStreamCipher(context, createRC4StreamCipher(), createRC4StreamCipher(),
-            createHMACDigest(macAlgorithm), createHMACDigest(macAlgorithm), cipherKeySize, false);
-    }
-
-    protected TlsStreamCipher createSalsa20Cipher(TlsContext context, int rounds, int cipherKeySize, int macAlgorithm)
-        throws IOException
-    {
-        return new TlsStreamCipher(context, createSalsa20StreamCipher(rounds), createSalsa20StreamCipher(rounds),
-            createHMACDigest(macAlgorithm), createHMACDigest(macAlgorithm), cipherKeySize, true);
-    }
-
-    protected TlsBlockCipher createSEEDCipher(TlsContext context, int macAlgorithm)
-        throws IOException
-    {
-        return new TlsBlockCipher(context, createSEEDBlockCipher(), createSEEDBlockCipher(),
-            createHMACDigest(macAlgorithm), createHMACDigest(macAlgorithm), 16);
-    }
-
-    protected BlockCipher createAESEngine()
-    {
-        return new AESEngine();
-    }
-
-    protected BlockCipher createCamelliaEngine()
-    {
-        return new CamelliaEngine();
-    }
-
-    protected BlockCipher createAESBlockCipher()
-    {
-        return new CBCBlockCipher(createAESEngine());
-    }
-
-    protected AEADBlockCipher createAEADBlockCipher_AES_CCM()
-    {
-        return new CCMBlockCipher(createAESEngine());
-    }
-
-    protected AEADBlockCipher createAEADBlockCipher_AES_GCM()
-    {
-        // TODO Consider allowing custom configuration of multiplier
-        return new GCMBlockCipher(createAESEngine());
-    }
-
-    protected AEADBlockCipher createAEADBlockCipher_Camellia_GCM()
-    {
-        // TODO Consider allowing custom configuration of multiplier
-        return new GCMBlockCipher(createCamelliaEngine());
-    }
-
-    protected BlockCipher createCamelliaBlockCipher()
-    {
-        return new CBCBlockCipher(createCamelliaEngine());
-    }
-
-    protected BlockCipher createDESedeBlockCipher()
-    {
-        return new CBCBlockCipher(new DESedeEngine());
-    }
-
-    protected StreamCipher createRC4StreamCipher()
-    {
-        return new RC4Engine();
-    }
-
-    protected StreamCipher createSalsa20StreamCipher(int rounds)
-    {
-        return new Salsa20Engine(rounds);
-    }
-
-    protected BlockCipher createSEEDBlockCipher()
-    {
-        return new CBCBlockCipher(new SEEDEngine());
-    }
-
-    protected Digest createHMACDigest(int macAlgorithm) throws IOException
-    {
-        switch (macAlgorithm)
-        {
-        case MACAlgorithm._null:
-            return null;
-        case MACAlgorithm.hmac_md5:
-            return TlsUtils.createHash(HashAlgorithm.md5);
-        case MACAlgorithm.hmac_sha1:
-            return TlsUtils.createHash(HashAlgorithm.sha1);
-        case MACAlgorithm.hmac_sha256:
-            return TlsUtils.createHash(HashAlgorithm.sha256);
-        case MACAlgorithm.hmac_sha384:
-            return TlsUtils.createHash(HashAlgorithm.sha384);
-        case MACAlgorithm.hmac_sha512:
-            return TlsUtils.createHash(HashAlgorithm.sha512);
-        default:
-            throw new TlsFatalAlert(AlertDescription.internal_error);
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/DefaultTlsClient.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/DefaultTlsClient.java
deleted file mode 100644
index 0ed8ea0..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/DefaultTlsClient.java
+++ /dev/null
@@ -1,467 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-import java.io.IOException;
-
-public abstract class DefaultTlsClient
-    extends AbstractTlsClient
-{
-    public DefaultTlsClient()
-    {
-        super();
-    }
-
-    public DefaultTlsClient(TlsCipherFactory cipherFactory)
-    {
-        super(cipherFactory);
-    }
-
-    public int[] getCipherSuites()
-    {
-        return new int[]
-        {
-            CipherSuite.TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,
-            CipherSuite.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256,
-            CipherSuite.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA,
-            CipherSuite.TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,
-            CipherSuite.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256,
-            CipherSuite.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA,
-            CipherSuite.TLS_DHE_DSS_WITH_AES_128_GCM_SHA256,
-            CipherSuite.TLS_DHE_DSS_WITH_AES_128_CBC_SHA256,
-            CipherSuite.TLS_DHE_DSS_WITH_AES_128_CBC_SHA,
-            CipherSuite.TLS_RSA_WITH_AES_128_GCM_SHA256,
-            CipherSuite.TLS_RSA_WITH_AES_128_CBC_SHA256,
-            CipherSuite.TLS_RSA_WITH_AES_128_CBC_SHA,
-        };
-    }
-
-    public TlsKeyExchange getKeyExchange()
-        throws IOException
-    {
-        switch (selectedCipherSuite)
-        {
-        case CipherSuite.TLS_DH_DSS_WITH_3DES_EDE_CBC_SHA:
-        case CipherSuite.TLS_DH_DSS_WITH_AES_128_CBC_SHA:
-        case CipherSuite.TLS_DH_DSS_WITH_AES_128_CBC_SHA256:
-        case CipherSuite.TLS_DH_DSS_WITH_AES_128_GCM_SHA256:
-        case CipherSuite.TLS_DH_DSS_WITH_AES_256_CBC_SHA:
-        case CipherSuite.TLS_DH_DSS_WITH_AES_256_CBC_SHA256:
-        case CipherSuite.TLS_DH_DSS_WITH_AES_256_GCM_SHA384:
-        case CipherSuite.TLS_DH_DSS_WITH_CAMELLIA_128_CBC_SHA:
-        case CipherSuite.TLS_DH_DSS_WITH_CAMELLIA_128_CBC_SHA256:
-        case CipherSuite.TLS_DH_DSS_WITH_CAMELLIA_128_GCM_SHA256:
-        case CipherSuite.TLS_DH_DSS_WITH_CAMELLIA_256_CBC_SHA:
-        case CipherSuite.TLS_DH_DSS_WITH_CAMELLIA_256_CBC_SHA256:
-        case CipherSuite.TLS_DH_DSS_WITH_CAMELLIA_256_GCM_SHA384:
-        case CipherSuite.TLS_DH_DSS_WITH_SEED_CBC_SHA:
-            return createDHKeyExchange(KeyExchangeAlgorithm.DH_DSS);
-
-        case CipherSuite.TLS_DH_RSA_WITH_3DES_EDE_CBC_SHA:
-        case CipherSuite.TLS_DH_RSA_WITH_AES_128_CBC_SHA:
-        case CipherSuite.TLS_DH_RSA_WITH_AES_128_CBC_SHA256:
-        case CipherSuite.TLS_DH_RSA_WITH_AES_128_GCM_SHA256:
-        case CipherSuite.TLS_DH_RSA_WITH_AES_256_CBC_SHA:
-        case CipherSuite.TLS_DH_RSA_WITH_AES_256_CBC_SHA256:
-        case CipherSuite.TLS_DH_RSA_WITH_AES_256_GCM_SHA384:
-        case CipherSuite.TLS_DH_RSA_WITH_CAMELLIA_128_CBC_SHA:
-        case CipherSuite.TLS_DH_RSA_WITH_CAMELLIA_128_CBC_SHA256:
-        case CipherSuite.TLS_DH_RSA_WITH_CAMELLIA_128_GCM_SHA256:
-        case CipherSuite.TLS_DH_RSA_WITH_CAMELLIA_256_CBC_SHA:
-        case CipherSuite.TLS_DH_RSA_WITH_CAMELLIA_256_CBC_SHA256:
-        case CipherSuite.TLS_DH_RSA_WITH_CAMELLIA_256_GCM_SHA384:
-        case CipherSuite.TLS_DH_RSA_WITH_SEED_CBC_SHA:
-            return createDHKeyExchange(KeyExchangeAlgorithm.DH_RSA);
-
-        case CipherSuite.TLS_DHE_DSS_WITH_3DES_EDE_CBC_SHA:
-        case CipherSuite.TLS_DHE_DSS_WITH_AES_128_CBC_SHA:
-        case CipherSuite.TLS_DHE_DSS_WITH_AES_128_CBC_SHA256:
-        case CipherSuite.TLS_DHE_DSS_WITH_AES_128_GCM_SHA256:
-        case CipherSuite.TLS_DHE_DSS_WITH_AES_256_CBC_SHA:
-        case CipherSuite.TLS_DHE_DSS_WITH_AES_256_CBC_SHA256:
-        case CipherSuite.TLS_DHE_DSS_WITH_AES_256_GCM_SHA384:
-        case CipherSuite.TLS_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA:
-        case CipherSuite.TLS_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA256:
-        case CipherSuite.TLS_DHE_DSS_WITH_CAMELLIA_128_GCM_SHA256:
-        case CipherSuite.TLS_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA:
-        case CipherSuite.TLS_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA256:
-        case CipherSuite.TLS_DHE_DSS_WITH_CAMELLIA_256_GCM_SHA384:
-        case CipherSuite.TLS_DHE_DSS_WITH_SEED_CBC_SHA:
-            return createDHEKeyExchange(KeyExchangeAlgorithm.DHE_DSS);
-
-        case CipherSuite.TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA:
-        case CipherSuite.TLS_DHE_RSA_WITH_AES_128_CBC_SHA:
-        case CipherSuite.TLS_DHE_RSA_WITH_AES_128_CBC_SHA256:
-        case CipherSuite.TLS_DHE_RSA_WITH_AES_128_CCM:
-        case CipherSuite.TLS_DHE_RSA_WITH_AES_128_CCM_8:
-        case CipherSuite.TLS_DHE_RSA_WITH_AES_128_GCM_SHA256:
-        case CipherSuite.TLS_DHE_RSA_WITH_AES_256_CBC_SHA:
-        case CipherSuite.TLS_DHE_RSA_WITH_AES_256_CBC_SHA256:
-        case CipherSuite.TLS_DHE_RSA_WITH_AES_256_CCM:
-        case CipherSuite.TLS_DHE_RSA_WITH_AES_256_CCM_8:
-        case CipherSuite.TLS_DHE_RSA_WITH_AES_256_GCM_SHA384:
-        case CipherSuite.TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA:
-        case CipherSuite.TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA256:
-        case CipherSuite.TLS_DHE_RSA_WITH_CAMELLIA_128_GCM_SHA256:
-        case CipherSuite.TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA:
-        case CipherSuite.TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA256:
-        case CipherSuite.TLS_DHE_RSA_WITH_CAMELLIA_256_GCM_SHA384:
-        case CipherSuite.TLS_DHE_RSA_WITH_CHACHA20_POLY1305_SHA256:
-        case CipherSuite.TLS_DHE_RSA_WITH_ESTREAM_SALSA20_SHA1:
-        case CipherSuite.TLS_DHE_RSA_WITH_SALSA20_SHA1:
-        case CipherSuite.TLS_DHE_RSA_WITH_SEED_CBC_SHA:
-            return createDHEKeyExchange(KeyExchangeAlgorithm.DHE_RSA);
-
-        case CipherSuite.TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA:
-        case CipherSuite.TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA:
-        case CipherSuite.TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA256:
-        case CipherSuite.TLS_ECDH_ECDSA_WITH_AES_128_GCM_SHA256:
-        case CipherSuite.TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA:
-        case CipherSuite.TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA384:
-        case CipherSuite.TLS_ECDH_ECDSA_WITH_AES_256_GCM_SHA384:
-        case CipherSuite.TLS_ECDH_ECDSA_WITH_CAMELLIA_128_CBC_SHA256:
-        case CipherSuite.TLS_ECDH_ECDSA_WITH_CAMELLIA_128_GCM_SHA256:
-        case CipherSuite.TLS_ECDH_ECDSA_WITH_CAMELLIA_256_CBC_SHA384:
-        case CipherSuite.TLS_ECDH_ECDSA_WITH_CAMELLIA_256_GCM_SHA384:
-        case CipherSuite.TLS_ECDH_ECDSA_WITH_NULL_SHA:
-        case CipherSuite.TLS_ECDH_ECDSA_WITH_RC4_128_SHA:
-            return createECDHKeyExchange(KeyExchangeAlgorithm.ECDH_ECDSA);
-
-        case CipherSuite.TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA:
-        case CipherSuite.TLS_ECDH_RSA_WITH_AES_128_CBC_SHA:
-        case CipherSuite.TLS_ECDH_RSA_WITH_AES_128_CBC_SHA256:
-        case CipherSuite.TLS_ECDH_RSA_WITH_AES_128_GCM_SHA256:
-        case CipherSuite.TLS_ECDH_RSA_WITH_AES_256_CBC_SHA:
-        case CipherSuite.TLS_ECDH_RSA_WITH_AES_256_CBC_SHA384:
-        case CipherSuite.TLS_ECDH_RSA_WITH_AES_256_GCM_SHA384:
-        case CipherSuite.TLS_ECDH_RSA_WITH_CAMELLIA_128_CBC_SHA256:
-        case CipherSuite.TLS_ECDH_RSA_WITH_CAMELLIA_128_GCM_SHA256:
-        case CipherSuite.TLS_ECDH_RSA_WITH_CAMELLIA_256_CBC_SHA384:
-        case CipherSuite.TLS_ECDH_RSA_WITH_CAMELLIA_256_GCM_SHA384:
-        case CipherSuite.TLS_ECDH_RSA_WITH_NULL_SHA:
-        case CipherSuite.TLS_ECDH_RSA_WITH_RC4_128_SHA:
-            return createECDHKeyExchange(KeyExchangeAlgorithm.ECDH_RSA);
-
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_AES_128_CCM:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_AES_128_CCM_8:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_AES_256_CCM:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_AES_256_CCM_8:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_CAMELLIA_128_CBC_SHA256:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_CAMELLIA_128_GCM_SHA256:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_CAMELLIA_256_CBC_SHA384:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_CAMELLIA_256_GCM_SHA384:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_ESTREAM_SALSA20_SHA1:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_NULL_SHA:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_RC4_128_SHA:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_SALSA20_SHA1:
-            return createECDHEKeyExchange(KeyExchangeAlgorithm.ECDHE_ECDSA);
-
-        case CipherSuite.TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA:
-        case CipherSuite.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA:
-        case CipherSuite.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256:
-        case CipherSuite.TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256:
-        case CipherSuite.TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA:
-        case CipherSuite.TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384:
-        case CipherSuite.TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384:
-        case CipherSuite.TLS_ECDHE_RSA_WITH_CAMELLIA_128_CBC_SHA256:
-        case CipherSuite.TLS_ECDHE_RSA_WITH_CAMELLIA_128_GCM_SHA256:
-        case CipherSuite.TLS_ECDHE_RSA_WITH_CAMELLIA_256_CBC_SHA384:
-        case CipherSuite.TLS_ECDHE_RSA_WITH_CAMELLIA_256_GCM_SHA384:
-        case CipherSuite.TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256:
-        case CipherSuite.TLS_ECDHE_RSA_WITH_ESTREAM_SALSA20_SHA1:
-        case CipherSuite.TLS_ECDHE_RSA_WITH_NULL_SHA:
-        case CipherSuite.TLS_ECDHE_RSA_WITH_RC4_128_SHA:
-        case CipherSuite.TLS_ECDHE_RSA_WITH_SALSA20_SHA1:
-            return createECDHEKeyExchange(KeyExchangeAlgorithm.ECDHE_RSA);
-
-        case CipherSuite.TLS_RSA_WITH_3DES_EDE_CBC_SHA:
-        case CipherSuite.TLS_RSA_WITH_AES_128_CBC_SHA:
-        case CipherSuite.TLS_RSA_WITH_AES_128_CBC_SHA256:
-        case CipherSuite.TLS_RSA_WITH_AES_128_CCM:
-        case CipherSuite.TLS_RSA_WITH_AES_128_CCM_8:
-        case CipherSuite.TLS_RSA_WITH_AES_128_GCM_SHA256:
-        case CipherSuite.TLS_RSA_WITH_AES_256_CBC_SHA:
-        case CipherSuite.TLS_RSA_WITH_AES_256_CBC_SHA256:
-        case CipherSuite.TLS_RSA_WITH_AES_256_CCM:
-        case CipherSuite.TLS_RSA_WITH_AES_256_CCM_8:
-        case CipherSuite.TLS_RSA_WITH_AES_256_GCM_SHA384:
-        case CipherSuite.TLS_RSA_WITH_CAMELLIA_128_CBC_SHA:
-        case CipherSuite.TLS_RSA_WITH_CAMELLIA_128_CBC_SHA256:
-        case CipherSuite.TLS_RSA_WITH_CAMELLIA_128_GCM_SHA256:
-        case CipherSuite.TLS_RSA_WITH_CAMELLIA_256_CBC_SHA:
-        case CipherSuite.TLS_RSA_WITH_CAMELLIA_256_CBC_SHA256:
-        case CipherSuite.TLS_RSA_WITH_CAMELLIA_256_GCM_SHA384:
-        case CipherSuite.TLS_RSA_WITH_ESTREAM_SALSA20_SHA1:
-        case CipherSuite.TLS_RSA_WITH_NULL_MD5:
-        case CipherSuite.TLS_RSA_WITH_NULL_SHA:
-        case CipherSuite.TLS_RSA_WITH_NULL_SHA256:
-        case CipherSuite.TLS_RSA_WITH_RC4_128_MD5:
-        case CipherSuite.TLS_RSA_WITH_RC4_128_SHA:
-        case CipherSuite.TLS_RSA_WITH_SALSA20_SHA1:
-        case CipherSuite.TLS_RSA_WITH_SEED_CBC_SHA:
-            return createRSAKeyExchange();
-
-        default:
-            /*
-             * Note: internal error here; the TlsProtocol implementation verifies that the
-             * server-selected cipher suite was in the list of client-offered cipher suites, so if
-             * we now can't produce an implementation, we shouldn't have offered it!
-             */
-            throw new TlsFatalAlert(AlertDescription.internal_error);
-        }
-    }
-
-    public TlsCipher getCipher()
-        throws IOException
-    {
-        switch (selectedCipherSuite)
-        {
-        case CipherSuite.TLS_DH_DSS_WITH_3DES_EDE_CBC_SHA:
-        case CipherSuite.TLS_DH_RSA_WITH_3DES_EDE_CBC_SHA:
-        case CipherSuite.TLS_DHE_DSS_WITH_3DES_EDE_CBC_SHA:
-        case CipherSuite.TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA:
-        case CipherSuite.TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA:
-        case CipherSuite.TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA:
-        case CipherSuite.TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA:
-        case CipherSuite.TLS_RSA_WITH_3DES_EDE_CBC_SHA:
-            return cipherFactory.createCipher(context, EncryptionAlgorithm._3DES_EDE_CBC, MACAlgorithm.hmac_sha1);
-
-        case CipherSuite.TLS_DHE_RSA_WITH_CHACHA20_POLY1305_SHA256:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256:
-        case CipherSuite.TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256:
-            return cipherFactory.createCipher(context, EncryptionAlgorithm.AEAD_CHACHA20_POLY1305, MACAlgorithm._null);
-
-        case CipherSuite.TLS_DH_DSS_WITH_AES_128_CBC_SHA:
-        case CipherSuite.TLS_DH_RSA_WITH_AES_128_CBC_SHA:
-        case CipherSuite.TLS_DHE_DSS_WITH_AES_128_CBC_SHA:
-        case CipherSuite.TLS_DHE_RSA_WITH_AES_128_CBC_SHA:
-        case CipherSuite.TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA:
-        case CipherSuite.TLS_ECDH_RSA_WITH_AES_128_CBC_SHA:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA:
-        case CipherSuite.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA:
-        case CipherSuite.TLS_RSA_WITH_AES_128_CBC_SHA:
-            return cipherFactory.createCipher(context, EncryptionAlgorithm.AES_128_CBC, MACAlgorithm.hmac_sha1);
-
-        case CipherSuite.TLS_DH_DSS_WITH_AES_128_CBC_SHA256:
-        case CipherSuite.TLS_DH_RSA_WITH_AES_128_CBC_SHA256:
-        case CipherSuite.TLS_DHE_DSS_WITH_AES_128_CBC_SHA256:
-        case CipherSuite.TLS_DHE_RSA_WITH_AES_128_CBC_SHA256:
-        case CipherSuite.TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA256:
-        case CipherSuite.TLS_ECDH_RSA_WITH_AES_128_CBC_SHA256:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256:
-        case CipherSuite.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256:
-        case CipherSuite.TLS_RSA_WITH_AES_128_CBC_SHA256:
-            return cipherFactory.createCipher(context, EncryptionAlgorithm.AES_128_CBC, MACAlgorithm.hmac_sha256);
-
-        case CipherSuite.TLS_DHE_RSA_WITH_AES_128_CCM:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_AES_128_CCM:
-        case CipherSuite.TLS_RSA_WITH_AES_128_CCM:
-            return cipherFactory.createCipher(context, EncryptionAlgorithm.AES_128_CCM, MACAlgorithm._null);
-
-        case CipherSuite.TLS_DHE_RSA_WITH_AES_128_CCM_8:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_AES_128_CCM_8:
-        case CipherSuite.TLS_RSA_WITH_AES_128_CCM_8:
-            return cipherFactory.createCipher(context, EncryptionAlgorithm.AES_128_CCM_8, MACAlgorithm._null);
-
-        case CipherSuite.TLS_DH_DSS_WITH_AES_128_GCM_SHA256:
-        case CipherSuite.TLS_DH_RSA_WITH_AES_128_GCM_SHA256:
-        case CipherSuite.TLS_DHE_DSS_WITH_AES_128_GCM_SHA256:
-        case CipherSuite.TLS_DHE_RSA_WITH_AES_128_GCM_SHA256:
-        case CipherSuite.TLS_ECDH_ECDSA_WITH_AES_128_GCM_SHA256:
-        case CipherSuite.TLS_ECDH_RSA_WITH_AES_128_GCM_SHA256:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256:
-        case CipherSuite.TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256:
-        case CipherSuite.TLS_RSA_WITH_AES_128_GCM_SHA256:
-            return cipherFactory.createCipher(context, EncryptionAlgorithm.AES_128_GCM, MACAlgorithm._null);
-
-        case CipherSuite.TLS_DH_DSS_WITH_AES_256_CBC_SHA:
-        case CipherSuite.TLS_DH_RSA_WITH_AES_256_CBC_SHA:
-        case CipherSuite.TLS_DHE_DSS_WITH_AES_256_CBC_SHA:
-        case CipherSuite.TLS_DHE_RSA_WITH_AES_256_CBC_SHA:
-        case CipherSuite.TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA:
-        case CipherSuite.TLS_ECDH_RSA_WITH_AES_256_CBC_SHA:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA:
-        case CipherSuite.TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA:
-        case CipherSuite.TLS_RSA_WITH_AES_256_CBC_SHA:
-            return cipherFactory.createCipher(context, EncryptionAlgorithm.AES_256_CBC, MACAlgorithm.hmac_sha1);
-
-        case CipherSuite.TLS_DH_DSS_WITH_AES_256_CBC_SHA256:
-        case CipherSuite.TLS_DH_RSA_WITH_AES_256_CBC_SHA256:
-        case CipherSuite.TLS_DHE_DSS_WITH_AES_256_CBC_SHA256:
-        case CipherSuite.TLS_DHE_RSA_WITH_AES_256_CBC_SHA256:
-        case CipherSuite.TLS_RSA_WITH_AES_256_CBC_SHA256:
-            return cipherFactory.createCipher(context, EncryptionAlgorithm.AES_256_CBC, MACAlgorithm.hmac_sha256);
-
-        case CipherSuite.TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA384:
-        case CipherSuite.TLS_ECDH_RSA_WITH_AES_256_CBC_SHA384:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384:
-        case CipherSuite.TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384:
-            return cipherFactory.createCipher(context, EncryptionAlgorithm.AES_256_CBC, MACAlgorithm.hmac_sha384);
-
-        case CipherSuite.TLS_DHE_RSA_WITH_AES_256_CCM:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_AES_256_CCM:
-        case CipherSuite.TLS_RSA_WITH_AES_256_CCM:
-            return cipherFactory.createCipher(context, EncryptionAlgorithm.AES_256_CCM, MACAlgorithm._null);
-
-        case CipherSuite.TLS_DHE_RSA_WITH_AES_256_CCM_8:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_AES_256_CCM_8:
-        case CipherSuite.TLS_RSA_WITH_AES_256_CCM_8:
-            return cipherFactory.createCipher(context, EncryptionAlgorithm.AES_256_CCM_8, MACAlgorithm._null);
-
-        case CipherSuite.TLS_DH_DSS_WITH_AES_256_GCM_SHA384:
-        case CipherSuite.TLS_DH_RSA_WITH_AES_256_GCM_SHA384:
-        case CipherSuite.TLS_DHE_DSS_WITH_AES_256_GCM_SHA384:
-        case CipherSuite.TLS_DHE_RSA_WITH_AES_256_GCM_SHA384:
-        case CipherSuite.TLS_ECDH_ECDSA_WITH_AES_256_GCM_SHA384:
-        case CipherSuite.TLS_ECDH_RSA_WITH_AES_256_GCM_SHA384:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384:
-        case CipherSuite.TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384:
-        case CipherSuite.TLS_RSA_WITH_AES_256_GCM_SHA384:
-            return cipherFactory.createCipher(context, EncryptionAlgorithm.AES_256_GCM, MACAlgorithm._null);
-
-        case CipherSuite.TLS_DH_DSS_WITH_CAMELLIA_128_CBC_SHA:
-        case CipherSuite.TLS_DH_RSA_WITH_CAMELLIA_128_CBC_SHA:
-        case CipherSuite.TLS_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA:
-        case CipherSuite.TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA:
-        case CipherSuite.TLS_RSA_WITH_CAMELLIA_128_CBC_SHA:
-            return cipherFactory.createCipher(context, EncryptionAlgorithm.CAMELLIA_128_CBC, MACAlgorithm.hmac_sha1);
-
-        case CipherSuite.TLS_DH_DSS_WITH_CAMELLIA_128_CBC_SHA256:
-        case CipherSuite.TLS_DH_RSA_WITH_CAMELLIA_128_CBC_SHA256:
-        case CipherSuite.TLS_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA256:
-        case CipherSuite.TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA256:
-        case CipherSuite.TLS_ECDH_ECDSA_WITH_CAMELLIA_128_CBC_SHA256:
-        case CipherSuite.TLS_ECDH_RSA_WITH_CAMELLIA_128_CBC_SHA256:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_CAMELLIA_128_CBC_SHA256:
-        case CipherSuite.TLS_ECDHE_RSA_WITH_CAMELLIA_128_CBC_SHA256:
-        case CipherSuite.TLS_RSA_WITH_CAMELLIA_128_CBC_SHA256:
-            return cipherFactory.createCipher(context, EncryptionAlgorithm.CAMELLIA_128_CBC, MACAlgorithm.hmac_sha256);
-
-        case CipherSuite.TLS_RSA_WITH_CAMELLIA_128_GCM_SHA256:
-        case CipherSuite.TLS_DHE_RSA_WITH_CAMELLIA_128_GCM_SHA256:
-        case CipherSuite.TLS_DH_RSA_WITH_CAMELLIA_128_GCM_SHA256:
-        case CipherSuite.TLS_DHE_DSS_WITH_CAMELLIA_128_GCM_SHA256:
-        case CipherSuite.TLS_DH_DSS_WITH_CAMELLIA_128_GCM_SHA256:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_CAMELLIA_128_GCM_SHA256:
-        case CipherSuite.TLS_ECDH_ECDSA_WITH_CAMELLIA_128_GCM_SHA256:
-        case CipherSuite.TLS_ECDHE_RSA_WITH_CAMELLIA_128_GCM_SHA256:
-        case CipherSuite.TLS_ECDH_RSA_WITH_CAMELLIA_128_GCM_SHA256:
-            return cipherFactory.createCipher(context, EncryptionAlgorithm.CAMELLIA_128_GCM, MACAlgorithm._null);
-
-        case CipherSuite.TLS_DH_DSS_WITH_CAMELLIA_256_CBC_SHA:
-        case CipherSuite.TLS_DH_RSA_WITH_CAMELLIA_256_CBC_SHA:
-        case CipherSuite.TLS_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA:
-        case CipherSuite.TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA:
-        case CipherSuite.TLS_RSA_WITH_CAMELLIA_256_CBC_SHA:
-            return cipherFactory.createCipher(context, EncryptionAlgorithm.CAMELLIA_256_CBC, MACAlgorithm.hmac_sha1);
-
-        case CipherSuite.TLS_DH_DSS_WITH_CAMELLIA_256_CBC_SHA256:
-        case CipherSuite.TLS_DH_RSA_WITH_CAMELLIA_256_CBC_SHA256:
-        case CipherSuite.TLS_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA256:
-        case CipherSuite.TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA256:
-        case CipherSuite.TLS_RSA_WITH_CAMELLIA_256_CBC_SHA256:
-            return cipherFactory.createCipher(context, EncryptionAlgorithm.CAMELLIA_256_CBC, MACAlgorithm.hmac_sha256);
-
-        case CipherSuite.TLS_RSA_WITH_CAMELLIA_256_GCM_SHA384:
-        case CipherSuite.TLS_DHE_RSA_WITH_CAMELLIA_256_GCM_SHA384:
-        case CipherSuite.TLS_DH_RSA_WITH_CAMELLIA_256_GCM_SHA384:
-        case CipherSuite.TLS_DHE_DSS_WITH_CAMELLIA_256_GCM_SHA384:
-        case CipherSuite.TLS_DH_DSS_WITH_CAMELLIA_256_GCM_SHA384:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_CAMELLIA_256_GCM_SHA384:
-        case CipherSuite.TLS_ECDH_ECDSA_WITH_CAMELLIA_256_GCM_SHA384:
-        case CipherSuite.TLS_ECDHE_RSA_WITH_CAMELLIA_256_GCM_SHA384:
-        case CipherSuite.TLS_ECDH_RSA_WITH_CAMELLIA_256_GCM_SHA384:
-            return cipherFactory.createCipher(context, EncryptionAlgorithm.CAMELLIA_256_GCM, MACAlgorithm._null);
-
-        case CipherSuite.TLS_ECDH_ECDSA_WITH_CAMELLIA_256_CBC_SHA384:
-        case CipherSuite.TLS_ECDH_RSA_WITH_CAMELLIA_256_CBC_SHA384:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_CAMELLIA_256_CBC_SHA384:
-        case CipherSuite.TLS_ECDHE_RSA_WITH_CAMELLIA_256_CBC_SHA384:
-            return cipherFactory.createCipher(context, EncryptionAlgorithm.CAMELLIA_256_CBC, MACAlgorithm.hmac_sha384);
-
-        case CipherSuite.TLS_DHE_RSA_WITH_ESTREAM_SALSA20_SHA1:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_ESTREAM_SALSA20_SHA1:
-        case CipherSuite.TLS_ECDHE_RSA_WITH_ESTREAM_SALSA20_SHA1:
-        case CipherSuite.TLS_RSA_WITH_ESTREAM_SALSA20_SHA1:
-            return cipherFactory.createCipher(context, EncryptionAlgorithm.ESTREAM_SALSA20, MACAlgorithm.hmac_sha1);
-
-        case CipherSuite.TLS_RSA_WITH_NULL_MD5:
-            return cipherFactory.createCipher(context, EncryptionAlgorithm.NULL, MACAlgorithm.hmac_md5);
-
-        case CipherSuite.TLS_ECDH_ECDSA_WITH_NULL_SHA:
-        case CipherSuite.TLS_ECDH_RSA_WITH_NULL_SHA:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_NULL_SHA:
-        case CipherSuite.TLS_ECDHE_RSA_WITH_NULL_SHA:
-        case CipherSuite.TLS_RSA_WITH_NULL_SHA:
-            return cipherFactory.createCipher(context, EncryptionAlgorithm.NULL, MACAlgorithm.hmac_sha1);
-
-        case CipherSuite.TLS_RSA_WITH_NULL_SHA256:
-            return cipherFactory.createCipher(context, EncryptionAlgorithm.NULL, MACAlgorithm.hmac_sha256);
-
-        case CipherSuite.TLS_RSA_WITH_RC4_128_MD5:
-            return cipherFactory.createCipher(context, EncryptionAlgorithm.RC4_128, MACAlgorithm.hmac_md5);
-
-        case CipherSuite.TLS_ECDH_ECDSA_WITH_RC4_128_SHA:
-        case CipherSuite.TLS_ECDH_RSA_WITH_RC4_128_SHA:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_RC4_128_SHA:
-        case CipherSuite.TLS_ECDHE_RSA_WITH_RC4_128_SHA:
-        case CipherSuite.TLS_RSA_WITH_RC4_128_SHA:
-            return cipherFactory.createCipher(context, EncryptionAlgorithm.RC4_128, MACAlgorithm.hmac_sha1);
-
-        case CipherSuite.TLS_DHE_RSA_WITH_SALSA20_SHA1:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_SALSA20_SHA1:
-        case CipherSuite.TLS_ECDHE_RSA_WITH_SALSA20_SHA1:
-        case CipherSuite.TLS_RSA_WITH_SALSA20_SHA1:
-            return cipherFactory.createCipher(context, EncryptionAlgorithm.SALSA20, MACAlgorithm.hmac_sha1);
-
-        case CipherSuite.TLS_DH_DSS_WITH_SEED_CBC_SHA:
-        case CipherSuite.TLS_DH_RSA_WITH_SEED_CBC_SHA:
-        case CipherSuite.TLS_DHE_DSS_WITH_SEED_CBC_SHA:
-        case CipherSuite.TLS_DHE_RSA_WITH_SEED_CBC_SHA:
-        case CipherSuite.TLS_RSA_WITH_SEED_CBC_SHA:
-            return cipherFactory.createCipher(context, EncryptionAlgorithm.SEED_CBC, MACAlgorithm.hmac_sha1);
-
-        default:
-            /*
-             * Note: internal error here; the TlsProtocol implementation verifies that the
-             * server-selected cipher suite was in the list of client-offered cipher suites, so if
-             * we now can't produce an implementation, we shouldn't have offered it!
-             */
-            throw new TlsFatalAlert(AlertDescription.internal_error);
-        }
-    }
-
-    protected TlsKeyExchange createDHKeyExchange(int keyExchange)
-    {
-        return new TlsDHKeyExchange(keyExchange, supportedSignatureAlgorithms, null);
-    }
-
-    protected TlsKeyExchange createDHEKeyExchange(int keyExchange)
-    {
-        return new TlsDHEKeyExchange(keyExchange, supportedSignatureAlgorithms, null);
-    }
-
-    protected TlsKeyExchange createECDHKeyExchange(int keyExchange)
-    {
-        return new TlsECDHKeyExchange(keyExchange, supportedSignatureAlgorithms, namedCurves, clientECPointFormats,
-            serverECPointFormats);
-    }
-
-    protected TlsKeyExchange createECDHEKeyExchange(int keyExchange)
-    {
-        return new TlsECDHEKeyExchange(keyExchange, supportedSignatureAlgorithms, namedCurves, clientECPointFormats,
-            serverECPointFormats);
-    }
-
-    protected TlsKeyExchange createRSAKeyExchange()
-    {
-        return new TlsRSAKeyExchange(supportedSignatureAlgorithms);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/DefaultTlsEncryptionCredentials.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/DefaultTlsEncryptionCredentials.java
deleted file mode 100644
index d5151bc..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/DefaultTlsEncryptionCredentials.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-import java.io.IOException;
-
-import org.bouncycastle.crypto.params.AsymmetricKeyParameter;
-import org.bouncycastle.crypto.params.RSAKeyParameters;
-
-public class DefaultTlsEncryptionCredentials extends AbstractTlsEncryptionCredentials
-{
-    protected TlsContext context;
-    protected Certificate certificate;
-    protected AsymmetricKeyParameter privateKey;
-
-    public DefaultTlsEncryptionCredentials(TlsContext context, Certificate certificate,
-        AsymmetricKeyParameter privateKey)
-    {
-        if (certificate == null)
-        {
-            throw new IllegalArgumentException("'certificate' cannot be null");
-        }
-        if (certificate.isEmpty())
-        {
-            throw new IllegalArgumentException("'certificate' cannot be empty");
-        }
-        if (privateKey == null)
-        {
-            throw new IllegalArgumentException("'privateKey' cannot be null");
-        }
-        if (!privateKey.isPrivate())
-        {
-            throw new IllegalArgumentException("'privateKey' must be private");
-        }
-
-        if (privateKey instanceof RSAKeyParameters)
-        {
-        }
-        else
-        {
-            throw new IllegalArgumentException("'privateKey' type not supported: "
-                + privateKey.getClass().getName());
-        }
-
-        this.context = context;
-        this.certificate = certificate;
-        this.privateKey = privateKey;
-    }
-
-    public Certificate getCertificate()
-    {
-        return certificate;
-    }
-
-    public byte[] decryptPreMasterSecret(byte[] encryptedPreMasterSecret)
-        throws IOException
-    {
-        return TlsRSAUtils.safeDecryptPreMasterSecret(context, (RSAKeyParameters)privateKey, encryptedPreMasterSecret);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/DefaultTlsSRPGroupVerifier.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/DefaultTlsSRPGroupVerifier.java
deleted file mode 100644
index 8fb9baa..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/DefaultTlsSRPGroupVerifier.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-import java.math.BigInteger;
-import java.util.Vector;
-
-import org.bouncycastle.crypto.agreement.srp.SRP6StandardGroups;
-import org.bouncycastle.crypto.params.SRP6GroupParameters;
-
-public class DefaultTlsSRPGroupVerifier
-    implements TlsSRPGroupVerifier
-{
-    protected static final Vector DEFAULT_GROUPS = new Vector();
-
-    static
-    {
-        DEFAULT_GROUPS.addElement(SRP6StandardGroups.rfc5054_1024);
-        DEFAULT_GROUPS.addElement(SRP6StandardGroups.rfc5054_1536);
-        DEFAULT_GROUPS.addElement(SRP6StandardGroups.rfc5054_2048);
-        DEFAULT_GROUPS.addElement(SRP6StandardGroups.rfc5054_3072);
-        DEFAULT_GROUPS.addElement(SRP6StandardGroups.rfc5054_4096);
-        DEFAULT_GROUPS.addElement(SRP6StandardGroups.rfc5054_6144);
-        DEFAULT_GROUPS.addElement(SRP6StandardGroups.rfc5054_8192);
-    }
-
-    // Vector is (SRP6GroupParameters)
-    protected Vector groups;
-
-    /**
-     * Accept only the group parameters specified in RFC 5054 Appendix A.
-     */
-    public DefaultTlsSRPGroupVerifier()
-    {
-        this(DEFAULT_GROUPS);
-    }
-
-    /**
-     * Specify a custom set of acceptable group parameters.
-     * 
-     * @param groups a {@link Vector} of acceptable {@link SRP6GroupParameters}
-     */
-    public DefaultTlsSRPGroupVerifier(Vector groups)
-    {
-        this.groups = groups;
-    }
-
-    public boolean accept(SRP6GroupParameters group)
-    {
-        for (int i = 0; i < groups.size(); ++i)
-        {
-            if (areGroupsEqual(group, (SRP6GroupParameters)groups.elementAt(i)))
-            {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    protected boolean areGroupsEqual(SRP6GroupParameters a, SRP6GroupParameters b)
-    {
-        return a == b || (areParametersEqual(a.getN(), b.getN()) && areParametersEqual(a.getG(), b.getG()));
-    }
-    
-    protected boolean areParametersEqual(BigInteger a, BigInteger b)
-    {
-        return a == b || a.equals(b);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/DefaultTlsServer.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/DefaultTlsServer.java
deleted file mode 100644
index 8c48331..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/DefaultTlsServer.java
+++ /dev/null
@@ -1,640 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-import java.io.IOException;
-
-import org.bouncycastle.crypto.agreement.DHStandardGroups;
-import org.bouncycastle.crypto.params.DHParameters;
-
-public abstract class DefaultTlsServer
-    extends AbstractTlsServer
-{
-    public DefaultTlsServer()
-    {
-        super();
-    }
-
-    public DefaultTlsServer(TlsCipherFactory cipherFactory)
-    {
-        super(cipherFactory);
-    }
-
-    protected TlsSignerCredentials getDSASignerCredentials()
-        throws IOException
-    {
-        throw new TlsFatalAlert(AlertDescription.internal_error);
-    }
-
-    protected TlsSignerCredentials getECDSASignerCredentials()
-        throws IOException
-    {
-        throw new TlsFatalAlert(AlertDescription.internal_error);
-    }
-
-    protected TlsEncryptionCredentials getRSAEncryptionCredentials()
-        throws IOException
-    {
-        throw new TlsFatalAlert(AlertDescription.internal_error);
-    }
-
-    protected TlsSignerCredentials getRSASignerCredentials()
-        throws IOException
-    {
-        throw new TlsFatalAlert(AlertDescription.internal_error);
-    }
-
-    protected DHParameters getDHParameters()
-    {
-        return DHStandardGroups.rfc5114_1024_160;
-    }
-
-    protected int[] getCipherSuites()
-    {
-        return new int[]
-        {
-            CipherSuite.TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,
-            CipherSuite.TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,
-            CipherSuite.TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384,
-            CipherSuite.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256,
-            CipherSuite.TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA,
-            CipherSuite.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA,
-            CipherSuite.TLS_RSA_WITH_AES_256_GCM_SHA384,
-            CipherSuite.TLS_RSA_WITH_AES_128_GCM_SHA256,
-            CipherSuite.TLS_RSA_WITH_AES_256_CBC_SHA256,
-            CipherSuite.TLS_RSA_WITH_AES_128_CBC_SHA256,
-            CipherSuite.TLS_RSA_WITH_AES_256_CBC_SHA,
-            CipherSuite.TLS_RSA_WITH_AES_128_CBC_SHA,
-        };
-    }
-
-    public TlsCredentials getCredentials()
-        throws IOException
-    {
-        switch (selectedCipherSuite)
-        {
-        case CipherSuite.TLS_DH_DSS_WITH_3DES_EDE_CBC_SHA:
-        case CipherSuite.TLS_DH_DSS_WITH_AES_128_CBC_SHA:
-        case CipherSuite.TLS_DH_DSS_WITH_AES_128_CBC_SHA256:
-        case CipherSuite.TLS_DH_DSS_WITH_AES_128_GCM_SHA256:
-        case CipherSuite.TLS_DH_DSS_WITH_AES_256_CBC_SHA:
-        case CipherSuite.TLS_DH_DSS_WITH_AES_256_CBC_SHA256:
-        case CipherSuite.TLS_DH_DSS_WITH_AES_256_GCM_SHA384:
-        case CipherSuite.TLS_DH_DSS_WITH_CAMELLIA_128_CBC_SHA:
-        case CipherSuite.TLS_DH_DSS_WITH_CAMELLIA_128_CBC_SHA256:
-        case CipherSuite.TLS_DH_DSS_WITH_CAMELLIA_128_GCM_SHA256:
-        case CipherSuite.TLS_DH_DSS_WITH_CAMELLIA_256_CBC_SHA:
-        case CipherSuite.TLS_DH_DSS_WITH_CAMELLIA_256_CBC_SHA256:
-        case CipherSuite.TLS_DH_DSS_WITH_CAMELLIA_256_GCM_SHA384:
-        case CipherSuite.TLS_DH_DSS_WITH_DES_CBC_SHA:
-        case CipherSuite.TLS_DH_DSS_WITH_SEED_CBC_SHA:
-        case CipherSuite.TLS_DHE_DSS_WITH_3DES_EDE_CBC_SHA:
-        case CipherSuite.TLS_DHE_DSS_WITH_AES_128_CBC_SHA:
-        case CipherSuite.TLS_DHE_DSS_WITH_AES_128_CBC_SHA256:
-        case CipherSuite.TLS_DHE_DSS_WITH_AES_128_GCM_SHA256:
-        case CipherSuite.TLS_DHE_DSS_WITH_AES_256_CBC_SHA:
-        case CipherSuite.TLS_DHE_DSS_WITH_AES_256_CBC_SHA256:
-        case CipherSuite.TLS_DHE_DSS_WITH_AES_256_GCM_SHA384:
-        case CipherSuite.TLS_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA:
-        case CipherSuite.TLS_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA256:
-        case CipherSuite.TLS_DHE_DSS_WITH_CAMELLIA_128_GCM_SHA256:
-        case CipherSuite.TLS_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA:
-        case CipherSuite.TLS_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA256:
-        case CipherSuite.TLS_DHE_DSS_WITH_CAMELLIA_256_GCM_SHA384:
-        case CipherSuite.TLS_DHE_DSS_WITH_DES_CBC_SHA:
-        case CipherSuite.TLS_DHE_DSS_WITH_SEED_CBC_SHA:
-        case CipherSuite.TLS_SRP_SHA_DSS_WITH_3DES_EDE_CBC_SHA:
-        case CipherSuite.TLS_SRP_SHA_DSS_WITH_AES_128_CBC_SHA:
-        case CipherSuite.TLS_SRP_SHA_DSS_WITH_AES_256_CBC_SHA:
-            return getDSASignerCredentials();
-
-        case CipherSuite.TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA:
-        case CipherSuite.TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA:
-        case CipherSuite.TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA256:
-        case CipherSuite.TLS_ECDH_ECDSA_WITH_AES_128_GCM_SHA256:
-        case CipherSuite.TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA:
-        case CipherSuite.TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA384:
-        case CipherSuite.TLS_ECDH_ECDSA_WITH_AES_256_GCM_SHA384:
-        case CipherSuite.TLS_ECDH_ECDSA_WITH_CAMELLIA_128_CBC_SHA256:
-        case CipherSuite.TLS_ECDH_ECDSA_WITH_CAMELLIA_128_GCM_SHA256:
-        case CipherSuite.TLS_ECDH_ECDSA_WITH_CAMELLIA_256_GCM_SHA384:
-        case CipherSuite.TLS_ECDH_ECDSA_WITH_CAMELLIA_256_CBC_SHA384:
-        case CipherSuite.TLS_ECDH_ECDSA_WITH_NULL_SHA:
-        case CipherSuite.TLS_ECDH_ECDSA_WITH_RC4_128_SHA:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_AES_128_CCM:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_AES_128_CCM_8:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_AES_256_CCM:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_AES_256_CCM_8:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_CAMELLIA_128_CBC_SHA256:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_CAMELLIA_128_GCM_SHA256:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_CAMELLIA_256_CBC_SHA384:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_CAMELLIA_256_GCM_SHA384:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_ESTREAM_SALSA20_SHA1:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_NULL_SHA:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_RC4_128_SHA:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_SALSA20_SHA1:
-            return getECDSASignerCredentials();
-
-        case CipherSuite.TLS_RSA_WITH_3DES_EDE_CBC_SHA:
-        case CipherSuite.TLS_RSA_WITH_AES_128_CBC_SHA:
-        case CipherSuite.TLS_RSA_WITH_AES_128_CBC_SHA256:
-        case CipherSuite.TLS_RSA_WITH_AES_128_CCM:
-        case CipherSuite.TLS_RSA_WITH_AES_128_CCM_8:
-        case CipherSuite.TLS_RSA_WITH_AES_128_GCM_SHA256:
-        case CipherSuite.TLS_RSA_WITH_AES_256_CBC_SHA:
-        case CipherSuite.TLS_RSA_WITH_AES_256_CBC_SHA256:
-        case CipherSuite.TLS_RSA_WITH_AES_256_CCM:
-        case CipherSuite.TLS_RSA_WITH_AES_256_CCM_8:
-        case CipherSuite.TLS_RSA_WITH_AES_256_GCM_SHA384:
-        case CipherSuite.TLS_RSA_WITH_CAMELLIA_128_CBC_SHA:
-        case CipherSuite.TLS_RSA_WITH_CAMELLIA_128_CBC_SHA256:
-        case CipherSuite.TLS_RSA_WITH_CAMELLIA_128_GCM_SHA256:
-        case CipherSuite.TLS_RSA_WITH_CAMELLIA_256_CBC_SHA:
-        case CipherSuite.TLS_RSA_WITH_CAMELLIA_256_CBC_SHA256:
-        case CipherSuite.TLS_RSA_WITH_CAMELLIA_256_GCM_SHA384:
-        case CipherSuite.TLS_RSA_WITH_NULL_MD5:
-        case CipherSuite.TLS_RSA_WITH_NULL_SHA:
-        case CipherSuite.TLS_RSA_WITH_NULL_SHA256:
-        case CipherSuite.TLS_RSA_WITH_RC4_128_MD5:
-        case CipherSuite.TLS_RSA_WITH_RC4_128_SHA:
-        case CipherSuite.TLS_RSA_WITH_SEED_CBC_SHA:
-            return getRSAEncryptionCredentials();
-
-        case CipherSuite.TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA:
-        case CipherSuite.TLS_DHE_RSA_WITH_AES_128_CBC_SHA:
-        case CipherSuite.TLS_DHE_RSA_WITH_AES_128_CBC_SHA256:
-        case CipherSuite.TLS_DHE_RSA_WITH_AES_128_CCM:
-        case CipherSuite.TLS_DHE_RSA_WITH_AES_128_CCM_8:
-        case CipherSuite.TLS_DHE_RSA_WITH_AES_128_GCM_SHA256:
-        case CipherSuite.TLS_DHE_RSA_WITH_AES_256_CBC_SHA:
-        case CipherSuite.TLS_DHE_RSA_WITH_AES_256_CBC_SHA256:
-        case CipherSuite.TLS_DHE_RSA_WITH_AES_256_CCM:
-        case CipherSuite.TLS_DHE_RSA_WITH_AES_256_CCM_8:
-        case CipherSuite.TLS_DHE_RSA_WITH_AES_256_GCM_SHA384:
-        case CipherSuite.TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA:
-        case CipherSuite.TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA256:
-        case CipherSuite.TLS_DHE_RSA_WITH_CAMELLIA_128_GCM_SHA256:
-        case CipherSuite.TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA:
-        case CipherSuite.TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA256:
-        case CipherSuite.TLS_DHE_RSA_WITH_CAMELLIA_256_GCM_SHA384:
-        case CipherSuite.TLS_DHE_RSA_WITH_CHACHA20_POLY1305_SHA256:
-        case CipherSuite.TLS_DHE_RSA_WITH_SEED_CBC_SHA:
-        case CipherSuite.TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA:
-        case CipherSuite.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA:
-        case CipherSuite.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256:
-        case CipherSuite.TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256:
-        case CipherSuite.TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA:
-        case CipherSuite.TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384:
-        case CipherSuite.TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384:
-        case CipherSuite.TLS_ECDHE_RSA_WITH_CAMELLIA_128_CBC_SHA256:
-        case CipherSuite.TLS_ECDHE_RSA_WITH_CAMELLIA_128_GCM_SHA256:
-        case CipherSuite.TLS_ECDHE_RSA_WITH_CAMELLIA_256_CBC_SHA384:
-        case CipherSuite.TLS_ECDHE_RSA_WITH_CAMELLIA_256_GCM_SHA384:
-        case CipherSuite.TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256:
-        case CipherSuite.TLS_ECDHE_RSA_WITH_ESTREAM_SALSA20_SHA1:
-        case CipherSuite.TLS_ECDHE_RSA_WITH_NULL_SHA:
-        case CipherSuite.TLS_ECDHE_RSA_WITH_RC4_128_SHA:
-        case CipherSuite.TLS_ECDHE_RSA_WITH_SALSA20_SHA1:
-            return getRSASignerCredentials();
-
-        default:
-            /*
-             * Note: internal error here; selected a key exchange we don't implement!
-             */
-            throw new TlsFatalAlert(AlertDescription.internal_error);
-        }
-    }
-
-    public TlsKeyExchange getKeyExchange()
-        throws IOException
-    {
-        switch (selectedCipherSuite)
-        {
-        case CipherSuite.TLS_DH_DSS_WITH_3DES_EDE_CBC_SHA:
-        case CipherSuite.TLS_DH_DSS_WITH_AES_128_CBC_SHA:
-        case CipherSuite.TLS_DH_DSS_WITH_AES_128_CBC_SHA256:
-        case CipherSuite.TLS_DH_DSS_WITH_AES_128_GCM_SHA256:
-        case CipherSuite.TLS_DH_DSS_WITH_AES_256_CBC_SHA:
-        case CipherSuite.TLS_DH_DSS_WITH_AES_256_CBC_SHA256:
-        case CipherSuite.TLS_DH_DSS_WITH_AES_256_GCM_SHA384:
-        case CipherSuite.TLS_DH_DSS_WITH_CAMELLIA_128_CBC_SHA:
-        case CipherSuite.TLS_DH_DSS_WITH_CAMELLIA_128_CBC_SHA256:
-        case CipherSuite.TLS_DH_DSS_WITH_CAMELLIA_128_GCM_SHA256:
-        case CipherSuite.TLS_DH_DSS_WITH_CAMELLIA_256_CBC_SHA:
-        case CipherSuite.TLS_DH_DSS_WITH_CAMELLIA_256_CBC_SHA256:
-        case CipherSuite.TLS_DH_DSS_WITH_CAMELLIA_256_GCM_SHA384:
-        case CipherSuite.TLS_DH_DSS_WITH_SEED_CBC_SHA:
-            return createDHKeyExchange(KeyExchangeAlgorithm.DH_DSS);
-
-        case CipherSuite.TLS_DH_RSA_WITH_3DES_EDE_CBC_SHA:
-        case CipherSuite.TLS_DH_RSA_WITH_AES_128_CBC_SHA:
-        case CipherSuite.TLS_DH_RSA_WITH_AES_128_CBC_SHA256:
-        case CipherSuite.TLS_DH_RSA_WITH_AES_128_GCM_SHA256:
-        case CipherSuite.TLS_DH_RSA_WITH_AES_256_CBC_SHA:
-        case CipherSuite.TLS_DH_RSA_WITH_AES_256_CBC_SHA256:
-        case CipherSuite.TLS_DH_RSA_WITH_AES_256_GCM_SHA384:
-        case CipherSuite.TLS_DH_RSA_WITH_CAMELLIA_128_CBC_SHA:
-        case CipherSuite.TLS_DH_RSA_WITH_CAMELLIA_128_CBC_SHA256:
-        case CipherSuite.TLS_DH_RSA_WITH_CAMELLIA_128_GCM_SHA256:
-        case CipherSuite.TLS_DH_RSA_WITH_CAMELLIA_256_CBC_SHA:
-        case CipherSuite.TLS_DH_RSA_WITH_CAMELLIA_256_CBC_SHA256:
-        case CipherSuite.TLS_DH_RSA_WITH_CAMELLIA_256_GCM_SHA384:
-        case CipherSuite.TLS_DH_RSA_WITH_SEED_CBC_SHA:
-            return createDHKeyExchange(KeyExchangeAlgorithm.DH_RSA);
-
-        case CipherSuite.TLS_DHE_DSS_WITH_3DES_EDE_CBC_SHA:
-        case CipherSuite.TLS_DHE_DSS_WITH_AES_128_CBC_SHA:
-        case CipherSuite.TLS_DHE_DSS_WITH_AES_128_CBC_SHA256:
-        case CipherSuite.TLS_DHE_DSS_WITH_AES_128_GCM_SHA256:
-        case CipherSuite.TLS_DHE_DSS_WITH_AES_256_CBC_SHA:
-        case CipherSuite.TLS_DHE_DSS_WITH_AES_256_CBC_SHA256:
-        case CipherSuite.TLS_DHE_DSS_WITH_AES_256_GCM_SHA384:
-        case CipherSuite.TLS_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA:
-        case CipherSuite.TLS_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA256:
-        case CipherSuite.TLS_DHE_DSS_WITH_CAMELLIA_128_GCM_SHA256:
-        case CipherSuite.TLS_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA:
-        case CipherSuite.TLS_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA256:
-        case CipherSuite.TLS_DHE_DSS_WITH_CAMELLIA_256_GCM_SHA384:
-        case CipherSuite.TLS_DHE_DSS_WITH_SEED_CBC_SHA:
-            return createDHEKeyExchange(KeyExchangeAlgorithm.DHE_DSS);
-
-        case CipherSuite.TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA:
-        case CipherSuite.TLS_DHE_RSA_WITH_AES_128_CBC_SHA:
-        case CipherSuite.TLS_DHE_RSA_WITH_AES_128_CBC_SHA256:
-        case CipherSuite.TLS_DHE_RSA_WITH_AES_128_CCM:
-        case CipherSuite.TLS_DHE_RSA_WITH_AES_128_CCM_8:
-        case CipherSuite.TLS_DHE_RSA_WITH_AES_128_GCM_SHA256:
-        case CipherSuite.TLS_DHE_RSA_WITH_AES_256_CBC_SHA:
-        case CipherSuite.TLS_DHE_RSA_WITH_AES_256_CBC_SHA256:
-        case CipherSuite.TLS_DHE_RSA_WITH_AES_256_CCM:
-        case CipherSuite.TLS_DHE_RSA_WITH_AES_256_CCM_8:
-        case CipherSuite.TLS_DHE_RSA_WITH_AES_256_GCM_SHA384:
-        case CipherSuite.TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA:
-        case CipherSuite.TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA256:
-        case CipherSuite.TLS_DHE_RSA_WITH_CAMELLIA_128_GCM_SHA256:
-        case CipherSuite.TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA:
-        case CipherSuite.TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA256:
-        case CipherSuite.TLS_DHE_RSA_WITH_CAMELLIA_256_GCM_SHA384:
-        case CipherSuite.TLS_DHE_RSA_WITH_CHACHA20_POLY1305_SHA256:
-        case CipherSuite.TLS_DHE_RSA_WITH_ESTREAM_SALSA20_SHA1:
-        case CipherSuite.TLS_DHE_RSA_WITH_SALSA20_SHA1:
-        case CipherSuite.TLS_DHE_RSA_WITH_SEED_CBC_SHA:
-            return createDHEKeyExchange(KeyExchangeAlgorithm.DHE_RSA);
-
-        case CipherSuite.TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA:
-        case CipherSuite.TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA:
-        case CipherSuite.TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA256:
-        case CipherSuite.TLS_ECDH_ECDSA_WITH_AES_128_GCM_SHA256:
-        case CipherSuite.TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA:
-        case CipherSuite.TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA384:
-        case CipherSuite.TLS_ECDH_ECDSA_WITH_AES_256_GCM_SHA384:
-        case CipherSuite.TLS_ECDH_ECDSA_WITH_CAMELLIA_128_CBC_SHA256:
-        case CipherSuite.TLS_ECDH_ECDSA_WITH_CAMELLIA_128_GCM_SHA256:
-        case CipherSuite.TLS_ECDH_ECDSA_WITH_CAMELLIA_256_CBC_SHA384:
-        case CipherSuite.TLS_ECDH_ECDSA_WITH_CAMELLIA_256_GCM_SHA384:
-        case CipherSuite.TLS_ECDH_ECDSA_WITH_NULL_SHA:
-        case CipherSuite.TLS_ECDH_ECDSA_WITH_RC4_128_SHA:
-            return createECDHKeyExchange(KeyExchangeAlgorithm.ECDH_ECDSA);
-
-        case CipherSuite.TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA:
-        case CipherSuite.TLS_ECDH_RSA_WITH_AES_128_CBC_SHA:
-        case CipherSuite.TLS_ECDH_RSA_WITH_AES_128_CBC_SHA256:
-        case CipherSuite.TLS_ECDH_RSA_WITH_AES_128_GCM_SHA256:
-        case CipherSuite.TLS_ECDH_RSA_WITH_AES_256_CBC_SHA:
-        case CipherSuite.TLS_ECDH_RSA_WITH_AES_256_CBC_SHA384:
-        case CipherSuite.TLS_ECDH_RSA_WITH_AES_256_GCM_SHA384:
-        case CipherSuite.TLS_ECDH_RSA_WITH_CAMELLIA_128_CBC_SHA256:
-        case CipherSuite.TLS_ECDH_RSA_WITH_CAMELLIA_128_GCM_SHA256:
-        case CipherSuite.TLS_ECDH_RSA_WITH_CAMELLIA_256_CBC_SHA384:
-        case CipherSuite.TLS_ECDH_RSA_WITH_CAMELLIA_256_GCM_SHA384:
-        case CipherSuite.TLS_ECDH_RSA_WITH_NULL_SHA:
-        case CipherSuite.TLS_ECDH_RSA_WITH_RC4_128_SHA:
-            return createECDHKeyExchange(KeyExchangeAlgorithm.ECDH_RSA);
-
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_AES_128_CCM:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_AES_128_CCM_8:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_AES_256_CCM:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_AES_256_CCM_8:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_CAMELLIA_128_CBC_SHA256:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_CAMELLIA_128_GCM_SHA256:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_CAMELLIA_256_CBC_SHA384:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_CAMELLIA_256_GCM_SHA384:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_ESTREAM_SALSA20_SHA1:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_NULL_SHA:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_RC4_128_SHA:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_SALSA20_SHA1:
-            return createECDHEKeyExchange(KeyExchangeAlgorithm.ECDHE_ECDSA);
-
-        case CipherSuite.TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA:
-        case CipherSuite.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA:
-        case CipherSuite.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256:
-        case CipherSuite.TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256:
-        case CipherSuite.TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA:
-        case CipherSuite.TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384:
-        case CipherSuite.TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384:
-        case CipherSuite.TLS_ECDHE_RSA_WITH_CAMELLIA_128_CBC_SHA256:
-        case CipherSuite.TLS_ECDHE_RSA_WITH_CAMELLIA_128_GCM_SHA256:
-        case CipherSuite.TLS_ECDHE_RSA_WITH_CAMELLIA_256_CBC_SHA384:
-        case CipherSuite.TLS_ECDHE_RSA_WITH_CAMELLIA_256_GCM_SHA384:
-        case CipherSuite.TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256:
-        case CipherSuite.TLS_ECDHE_RSA_WITH_ESTREAM_SALSA20_SHA1:
-        case CipherSuite.TLS_ECDHE_RSA_WITH_NULL_SHA:
-        case CipherSuite.TLS_ECDHE_RSA_WITH_RC4_128_SHA:
-        case CipherSuite.TLS_ECDHE_RSA_WITH_SALSA20_SHA1:
-            return createECDHEKeyExchange(KeyExchangeAlgorithm.ECDHE_RSA);
-
-        case CipherSuite.TLS_RSA_WITH_3DES_EDE_CBC_SHA:
-        case CipherSuite.TLS_RSA_WITH_AES_128_CBC_SHA:
-        case CipherSuite.TLS_RSA_WITH_AES_128_CBC_SHA256:
-        case CipherSuite.TLS_RSA_WITH_AES_128_CCM:
-        case CipherSuite.TLS_RSA_WITH_AES_128_CCM_8:
-        case CipherSuite.TLS_RSA_WITH_AES_128_GCM_SHA256:
-        case CipherSuite.TLS_RSA_WITH_AES_256_CBC_SHA:
-        case CipherSuite.TLS_RSA_WITH_AES_256_CBC_SHA256:
-        case CipherSuite.TLS_RSA_WITH_AES_256_CCM:
-        case CipherSuite.TLS_RSA_WITH_AES_256_CCM_8:
-        case CipherSuite.TLS_RSA_WITH_AES_256_GCM_SHA384:
-        case CipherSuite.TLS_RSA_WITH_CAMELLIA_128_CBC_SHA:
-        case CipherSuite.TLS_RSA_WITH_CAMELLIA_128_CBC_SHA256:
-        case CipherSuite.TLS_RSA_WITH_CAMELLIA_128_GCM_SHA256:
-        case CipherSuite.TLS_RSA_WITH_CAMELLIA_256_CBC_SHA:
-        case CipherSuite.TLS_RSA_WITH_CAMELLIA_256_CBC_SHA256:
-        case CipherSuite.TLS_RSA_WITH_CAMELLIA_256_GCM_SHA384:
-        case CipherSuite.TLS_RSA_WITH_ESTREAM_SALSA20_SHA1:
-        case CipherSuite.TLS_RSA_WITH_NULL_MD5:
-        case CipherSuite.TLS_RSA_WITH_NULL_SHA:
-        case CipherSuite.TLS_RSA_WITH_NULL_SHA256:
-        case CipherSuite.TLS_RSA_WITH_RC4_128_MD5:
-        case CipherSuite.TLS_RSA_WITH_RC4_128_SHA:
-        case CipherSuite.TLS_RSA_WITH_SALSA20_SHA1:
-        case CipherSuite.TLS_RSA_WITH_SEED_CBC_SHA:
-            return createRSAKeyExchange();
-
-        default:
-            /*
-             * Note: internal error here; selected a key exchange we don't implement!
-             */
-            throw new TlsFatalAlert(AlertDescription.internal_error);
-        }
-    }
-
-    public TlsCipher getCipher()
-        throws IOException
-    {
-        switch (selectedCipherSuite)
-        {
-        case CipherSuite.TLS_DH_DSS_WITH_3DES_EDE_CBC_SHA:
-        case CipherSuite.TLS_DH_RSA_WITH_3DES_EDE_CBC_SHA:
-        case CipherSuite.TLS_DHE_DSS_WITH_3DES_EDE_CBC_SHA:
-        case CipherSuite.TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA:
-        case CipherSuite.TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA:
-        case CipherSuite.TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA:
-        case CipherSuite.TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA:
-        case CipherSuite.TLS_RSA_WITH_3DES_EDE_CBC_SHA:
-            return cipherFactory.createCipher(context, EncryptionAlgorithm._3DES_EDE_CBC, MACAlgorithm.hmac_sha1);
-
-        case CipherSuite.TLS_DHE_RSA_WITH_CHACHA20_POLY1305_SHA256:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256:
-        case CipherSuite.TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256:
-            return cipherFactory.createCipher(context, EncryptionAlgorithm.AEAD_CHACHA20_POLY1305, MACAlgorithm._null);
-
-        case CipherSuite.TLS_DH_DSS_WITH_AES_128_CBC_SHA:
-        case CipherSuite.TLS_DH_RSA_WITH_AES_128_CBC_SHA:
-        case CipherSuite.TLS_DHE_DSS_WITH_AES_128_CBC_SHA:
-        case CipherSuite.TLS_DHE_RSA_WITH_AES_128_CBC_SHA:
-        case CipherSuite.TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA:
-        case CipherSuite.TLS_ECDH_RSA_WITH_AES_128_CBC_SHA:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA:
-        case CipherSuite.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA:
-        case CipherSuite.TLS_RSA_WITH_AES_128_CBC_SHA:
-            return cipherFactory.createCipher(context, EncryptionAlgorithm.AES_128_CBC, MACAlgorithm.hmac_sha1);
-
-        case CipherSuite.TLS_DH_DSS_WITH_AES_128_CBC_SHA256:
-        case CipherSuite.TLS_DH_RSA_WITH_AES_128_CBC_SHA256:
-        case CipherSuite.TLS_DHE_DSS_WITH_AES_128_CBC_SHA256:
-        case CipherSuite.TLS_DHE_RSA_WITH_AES_128_CBC_SHA256:
-        case CipherSuite.TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA256:
-        case CipherSuite.TLS_ECDH_RSA_WITH_AES_128_CBC_SHA256:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256:
-        case CipherSuite.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256:
-        case CipherSuite.TLS_RSA_WITH_AES_128_CBC_SHA256:
-            return cipherFactory.createCipher(context, EncryptionAlgorithm.AES_128_CBC, MACAlgorithm.hmac_sha256);
-
-        case CipherSuite.TLS_DHE_RSA_WITH_AES_128_CCM:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_AES_128_CCM:
-        case CipherSuite.TLS_RSA_WITH_AES_128_CCM:
-            return cipherFactory.createCipher(context, EncryptionAlgorithm.AES_128_CCM, MACAlgorithm._null);
-
-        case CipherSuite.TLS_DHE_RSA_WITH_AES_128_CCM_8:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_AES_128_CCM_8:
-        case CipherSuite.TLS_RSA_WITH_AES_128_CCM_8:
-            return cipherFactory.createCipher(context, EncryptionAlgorithm.AES_128_CCM_8, MACAlgorithm._null);
-
-        case CipherSuite.TLS_DH_DSS_WITH_AES_128_GCM_SHA256:
-        case CipherSuite.TLS_DH_RSA_WITH_AES_128_GCM_SHA256:
-        case CipherSuite.TLS_DHE_DSS_WITH_AES_128_GCM_SHA256:
-        case CipherSuite.TLS_DHE_RSA_WITH_AES_128_GCM_SHA256:
-        case CipherSuite.TLS_ECDH_ECDSA_WITH_AES_128_GCM_SHA256:
-        case CipherSuite.TLS_ECDH_RSA_WITH_AES_128_GCM_SHA256:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256:
-        case CipherSuite.TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256:
-        case CipherSuite.TLS_RSA_WITH_AES_128_GCM_SHA256:
-            return cipherFactory.createCipher(context, EncryptionAlgorithm.AES_128_GCM, MACAlgorithm._null);
-
-        case CipherSuite.TLS_DH_DSS_WITH_AES_256_CBC_SHA:
-        case CipherSuite.TLS_DH_RSA_WITH_AES_256_CBC_SHA:
-        case CipherSuite.TLS_DHE_DSS_WITH_AES_256_CBC_SHA:
-        case CipherSuite.TLS_DHE_RSA_WITH_AES_256_CBC_SHA:
-        case CipherSuite.TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA:
-        case CipherSuite.TLS_ECDH_RSA_WITH_AES_256_CBC_SHA:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA:
-        case CipherSuite.TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA:
-        case CipherSuite.TLS_RSA_WITH_AES_256_CBC_SHA:
-            return cipherFactory.createCipher(context, EncryptionAlgorithm.AES_256_CBC, MACAlgorithm.hmac_sha1);
-
-        case CipherSuite.TLS_DH_DSS_WITH_AES_256_CBC_SHA256:
-        case CipherSuite.TLS_DH_RSA_WITH_AES_256_CBC_SHA256:
-        case CipherSuite.TLS_DHE_DSS_WITH_AES_256_CBC_SHA256:
-        case CipherSuite.TLS_DHE_RSA_WITH_AES_256_CBC_SHA256:
-        case CipherSuite.TLS_RSA_WITH_AES_256_CBC_SHA256:
-            return cipherFactory.createCipher(context, EncryptionAlgorithm.AES_256_CBC, MACAlgorithm.hmac_sha256);
-
-        case CipherSuite.TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA384:
-        case CipherSuite.TLS_ECDH_RSA_WITH_AES_256_CBC_SHA384:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384:
-        case CipherSuite.TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384:
-            return cipherFactory.createCipher(context, EncryptionAlgorithm.AES_256_CBC, MACAlgorithm.hmac_sha384);
-
-        case CipherSuite.TLS_DHE_RSA_WITH_AES_256_CCM:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_AES_256_CCM:
-        case CipherSuite.TLS_RSA_WITH_AES_256_CCM:
-            return cipherFactory.createCipher(context, EncryptionAlgorithm.AES_256_CCM, MACAlgorithm._null);
-
-        case CipherSuite.TLS_DHE_RSA_WITH_AES_256_CCM_8:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_AES_256_CCM_8:
-        case CipherSuite.TLS_RSA_WITH_AES_256_CCM_8:
-            return cipherFactory.createCipher(context, EncryptionAlgorithm.AES_256_CCM_8, MACAlgorithm._null);
-
-        case CipherSuite.TLS_DH_DSS_WITH_AES_256_GCM_SHA384:
-        case CipherSuite.TLS_DH_RSA_WITH_AES_256_GCM_SHA384:
-        case CipherSuite.TLS_DHE_DSS_WITH_AES_256_GCM_SHA384:
-        case CipherSuite.TLS_DHE_RSA_WITH_AES_256_GCM_SHA384:
-        case CipherSuite.TLS_ECDH_ECDSA_WITH_AES_256_GCM_SHA384:
-        case CipherSuite.TLS_ECDH_RSA_WITH_AES_256_GCM_SHA384:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384:
-        case CipherSuite.TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384:
-        case CipherSuite.TLS_RSA_WITH_AES_256_GCM_SHA384:
-            return cipherFactory.createCipher(context, EncryptionAlgorithm.AES_256_GCM, MACAlgorithm._null);
-
-        case CipherSuite.TLS_DH_DSS_WITH_CAMELLIA_128_CBC_SHA:
-        case CipherSuite.TLS_DH_RSA_WITH_CAMELLIA_128_CBC_SHA:
-        case CipherSuite.TLS_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA:
-        case CipherSuite.TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA:
-        case CipherSuite.TLS_RSA_WITH_CAMELLIA_128_CBC_SHA:
-            return cipherFactory.createCipher(context, EncryptionAlgorithm.CAMELLIA_128_CBC, MACAlgorithm.hmac_sha1);
-
-        case CipherSuite.TLS_DH_DSS_WITH_CAMELLIA_128_CBC_SHA256:
-        case CipherSuite.TLS_DH_RSA_WITH_CAMELLIA_128_CBC_SHA256:
-        case CipherSuite.TLS_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA256:
-        case CipherSuite.TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA256:
-        case CipherSuite.TLS_ECDH_ECDSA_WITH_CAMELLIA_128_CBC_SHA256:
-        case CipherSuite.TLS_ECDH_RSA_WITH_CAMELLIA_128_CBC_SHA256:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_CAMELLIA_128_CBC_SHA256:
-        case CipherSuite.TLS_ECDHE_RSA_WITH_CAMELLIA_128_CBC_SHA256:
-        case CipherSuite.TLS_RSA_WITH_CAMELLIA_128_CBC_SHA256:
-            return cipherFactory.createCipher(context, EncryptionAlgorithm.CAMELLIA_128_CBC, MACAlgorithm.hmac_sha256);
-
-        case CipherSuite.TLS_RSA_WITH_CAMELLIA_128_GCM_SHA256:
-        case CipherSuite.TLS_DHE_RSA_WITH_CAMELLIA_128_GCM_SHA256:
-        case CipherSuite.TLS_DH_RSA_WITH_CAMELLIA_128_GCM_SHA256:
-        case CipherSuite.TLS_DHE_DSS_WITH_CAMELLIA_128_GCM_SHA256:
-        case CipherSuite.TLS_DH_DSS_WITH_CAMELLIA_128_GCM_SHA256:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_CAMELLIA_128_GCM_SHA256:
-        case CipherSuite.TLS_ECDH_ECDSA_WITH_CAMELLIA_128_GCM_SHA256:
-        case CipherSuite.TLS_ECDHE_RSA_WITH_CAMELLIA_128_GCM_SHA256:
-        case CipherSuite.TLS_ECDH_RSA_WITH_CAMELLIA_128_GCM_SHA256:
-            return cipherFactory.createCipher(context, EncryptionAlgorithm.CAMELLIA_128_GCM, MACAlgorithm._null);
-
-        case CipherSuite.TLS_DH_DSS_WITH_CAMELLIA_256_CBC_SHA:
-        case CipherSuite.TLS_DH_RSA_WITH_CAMELLIA_256_CBC_SHA:
-        case CipherSuite.TLS_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA:
-        case CipherSuite.TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA:
-        case CipherSuite.TLS_RSA_WITH_CAMELLIA_256_CBC_SHA:
-            return cipherFactory.createCipher(context, EncryptionAlgorithm.CAMELLIA_256_CBC, MACAlgorithm.hmac_sha1);
-
-        case CipherSuite.TLS_DH_DSS_WITH_CAMELLIA_256_CBC_SHA256:
-        case CipherSuite.TLS_DH_RSA_WITH_CAMELLIA_256_CBC_SHA256:
-        case CipherSuite.TLS_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA256:
-        case CipherSuite.TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA256:
-        case CipherSuite.TLS_RSA_WITH_CAMELLIA_256_CBC_SHA256:
-            return cipherFactory.createCipher(context, EncryptionAlgorithm.CAMELLIA_256_CBC, MACAlgorithm.hmac_sha256);
-
-        case CipherSuite.TLS_RSA_WITH_CAMELLIA_256_GCM_SHA384:
-        case CipherSuite.TLS_DHE_RSA_WITH_CAMELLIA_256_GCM_SHA384:
-        case CipherSuite.TLS_DH_RSA_WITH_CAMELLIA_256_GCM_SHA384:
-        case CipherSuite.TLS_DHE_DSS_WITH_CAMELLIA_256_GCM_SHA384:
-        case CipherSuite.TLS_DH_DSS_WITH_CAMELLIA_256_GCM_SHA384:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_CAMELLIA_256_GCM_SHA384:
-        case CipherSuite.TLS_ECDH_ECDSA_WITH_CAMELLIA_256_GCM_SHA384:
-        case CipherSuite.TLS_ECDHE_RSA_WITH_CAMELLIA_256_GCM_SHA384:
-        case CipherSuite.TLS_ECDH_RSA_WITH_CAMELLIA_256_GCM_SHA384:
-            return cipherFactory.createCipher(context, EncryptionAlgorithm.CAMELLIA_256_GCM, MACAlgorithm._null);
-
-        case CipherSuite.TLS_ECDH_ECDSA_WITH_CAMELLIA_256_CBC_SHA384:
-        case CipherSuite.TLS_ECDH_RSA_WITH_CAMELLIA_256_CBC_SHA384:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_CAMELLIA_256_CBC_SHA384:
-        case CipherSuite.TLS_ECDHE_RSA_WITH_CAMELLIA_256_CBC_SHA384:
-            return cipherFactory.createCipher(context, EncryptionAlgorithm.CAMELLIA_256_CBC, MACAlgorithm.hmac_sha384);
-
-        case CipherSuite.TLS_DHE_RSA_WITH_ESTREAM_SALSA20_SHA1:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_ESTREAM_SALSA20_SHA1:
-        case CipherSuite.TLS_ECDHE_RSA_WITH_ESTREAM_SALSA20_SHA1:
-        case CipherSuite.TLS_RSA_WITH_ESTREAM_SALSA20_SHA1:
-            return cipherFactory.createCipher(context, EncryptionAlgorithm.ESTREAM_SALSA20, MACAlgorithm.hmac_sha1);
-
-        case CipherSuite.TLS_RSA_WITH_NULL_MD5:
-            return cipherFactory.createCipher(context, EncryptionAlgorithm.NULL, MACAlgorithm.hmac_md5);
-
-        case CipherSuite.TLS_ECDH_ECDSA_WITH_NULL_SHA:
-        case CipherSuite.TLS_ECDH_RSA_WITH_NULL_SHA:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_NULL_SHA:
-        case CipherSuite.TLS_ECDHE_RSA_WITH_NULL_SHA:
-        case CipherSuite.TLS_RSA_WITH_NULL_SHA:
-            return cipherFactory.createCipher(context, EncryptionAlgorithm.NULL, MACAlgorithm.hmac_sha1);
-
-        case CipherSuite.TLS_RSA_WITH_NULL_SHA256:
-            return cipherFactory.createCipher(context, EncryptionAlgorithm.NULL, MACAlgorithm.hmac_sha256);
-
-        case CipherSuite.TLS_RSA_WITH_RC4_128_MD5:
-            return cipherFactory.createCipher(context, EncryptionAlgorithm.RC4_128, MACAlgorithm.hmac_md5);
-
-        case CipherSuite.TLS_ECDH_ECDSA_WITH_RC4_128_SHA:
-        case CipherSuite.TLS_ECDH_RSA_WITH_RC4_128_SHA:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_RC4_128_SHA:
-        case CipherSuite.TLS_ECDHE_RSA_WITH_RC4_128_SHA:
-        case CipherSuite.TLS_RSA_WITH_RC4_128_SHA:
-            return cipherFactory.createCipher(context, EncryptionAlgorithm.RC4_128, MACAlgorithm.hmac_sha1);
-
-        case CipherSuite.TLS_DHE_RSA_WITH_SALSA20_SHA1:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_SALSA20_SHA1:
-        case CipherSuite.TLS_ECDHE_RSA_WITH_SALSA20_SHA1:
-        case CipherSuite.TLS_RSA_WITH_SALSA20_SHA1:
-            return cipherFactory.createCipher(context, EncryptionAlgorithm.SALSA20, MACAlgorithm.hmac_sha1);
-
-        case CipherSuite.TLS_DH_DSS_WITH_SEED_CBC_SHA:
-        case CipherSuite.TLS_DH_RSA_WITH_SEED_CBC_SHA:
-        case CipherSuite.TLS_DHE_DSS_WITH_SEED_CBC_SHA:
-        case CipherSuite.TLS_DHE_RSA_WITH_SEED_CBC_SHA:
-        case CipherSuite.TLS_RSA_WITH_SEED_CBC_SHA:
-            return cipherFactory.createCipher(context, EncryptionAlgorithm.SEED_CBC, MACAlgorithm.hmac_sha1);
-
-        default:
-            /*
-             * Note: internal error here; selected a cipher suite we don't implement!
-             */
-            throw new TlsFatalAlert(AlertDescription.internal_error);
-        }
-    }
-
-    protected TlsKeyExchange createDHKeyExchange(int keyExchange)
-    {
-        return new TlsDHKeyExchange(keyExchange, supportedSignatureAlgorithms, getDHParameters());
-    }
-
-    protected TlsKeyExchange createDHEKeyExchange(int keyExchange)
-    {
-        return new TlsDHEKeyExchange(keyExchange, supportedSignatureAlgorithms, getDHParameters());
-    }
-
-    protected TlsKeyExchange createECDHKeyExchange(int keyExchange)
-    {
-        return new TlsECDHKeyExchange(keyExchange, supportedSignatureAlgorithms, namedCurves, clientECPointFormats,
-            serverECPointFormats);
-    }
-
-    protected TlsKeyExchange createECDHEKeyExchange(int keyExchange)
-    {
-        return new TlsECDHEKeyExchange(keyExchange, supportedSignatureAlgorithms, namedCurves, clientECPointFormats,
-            serverECPointFormats);
-    }
-
-    protected TlsKeyExchange createRSAKeyExchange()
-    {
-        return new TlsRSAKeyExchange(supportedSignatureAlgorithms);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/DefaultTlsSignerCredentials.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/DefaultTlsSignerCredentials.java
deleted file mode 100644
index 3b3391e..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/DefaultTlsSignerCredentials.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-import java.io.IOException;
-
-import org.bouncycastle.crypto.CryptoException;
-import org.bouncycastle.crypto.params.AsymmetricKeyParameter;
-import org.bouncycastle.crypto.params.DSAPrivateKeyParameters;
-import org.bouncycastle.crypto.params.ECPrivateKeyParameters;
-import org.bouncycastle.crypto.params.RSAKeyParameters;
-
-public class DefaultTlsSignerCredentials
-    extends AbstractTlsSignerCredentials
-{
-    protected TlsContext context;
-    protected Certificate certificate;
-    protected AsymmetricKeyParameter privateKey;
-    protected SignatureAndHashAlgorithm signatureAndHashAlgorithm;
-
-    protected TlsSigner signer;
-
-    public DefaultTlsSignerCredentials(TlsContext context, Certificate certificate, AsymmetricKeyParameter privateKey)
-    {
-        this(context, certificate, privateKey, null);
-    }
-
-    public DefaultTlsSignerCredentials(TlsContext context, Certificate certificate, AsymmetricKeyParameter privateKey,
-        SignatureAndHashAlgorithm signatureAndHashAlgorithm)
-    {
-        if (certificate == null)
-        {
-            throw new IllegalArgumentException("'certificate' cannot be null");
-        }
-        if (certificate.isEmpty())
-        {
-            throw new IllegalArgumentException("'certificate' cannot be empty");
-        }
-        if (privateKey == null)
-        {
-            throw new IllegalArgumentException("'privateKey' cannot be null");
-        }
-        if (!privateKey.isPrivate())
-        {
-            throw new IllegalArgumentException("'privateKey' must be private");
-        }
-        if (TlsUtils.isTLSv12(context) && signatureAndHashAlgorithm == null)
-        {
-            throw new IllegalArgumentException("'signatureAndHashAlgorithm' cannot be null for (D)TLS 1.2+");
-        }
-
-        if (privateKey instanceof RSAKeyParameters)
-        {
-            this.signer = new TlsRSASigner();
-        }
-        else if (privateKey instanceof DSAPrivateKeyParameters)
-        {
-            this.signer = new TlsDSSSigner();
-        }
-        else if (privateKey instanceof ECPrivateKeyParameters)
-        {
-            this.signer = new TlsECDSASigner();
-        }
-        else
-        {
-            throw new IllegalArgumentException("'privateKey' type not supported: " + privateKey.getClass().getName());
-        }
-
-        this.signer.init(context);
-
-        this.context = context;
-        this.certificate = certificate;
-        this.privateKey = privateKey;
-        this.signatureAndHashAlgorithm = signatureAndHashAlgorithm;
-    }
-
-    public Certificate getCertificate()
-    {
-        return certificate;
-    }
-
-    public byte[] generateCertificateSignature(byte[] hash)
-        throws IOException
-    {
-        try
-        {
-            if (TlsUtils.isTLSv12(context))
-            {
-                return signer.generateRawSignature(signatureAndHashAlgorithm, privateKey, hash);
-            }
-            else
-            {
-                return signer.generateRawSignature(privateKey, hash);
-            }
-        }
-        catch (CryptoException e)
-        {
-            throw new TlsFatalAlert(AlertDescription.internal_error, e);
-        }
-    }
-
-    public SignatureAndHashAlgorithm getSignatureAndHashAlgorithm()
-    {
-        return signatureAndHashAlgorithm;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/DeferredHash.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/DeferredHash.java
deleted file mode 100644
index 274e69a..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/DeferredHash.java
+++ /dev/null
@@ -1,207 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.util.Shorts;
-
-/**
- * Buffers input until the hash algorithm is determined.
- */
-class DeferredHash
-    implements TlsHandshakeHash
-{
-    protected static final int BUFFERING_HASH_LIMIT = 4;
-
-    protected TlsContext context;
-
-    private DigestInputBuffer buf;
-    private Hashtable hashes;
-    private Short prfHashAlgorithm;
-
-    DeferredHash()
-    {
-        this.buf = new DigestInputBuffer();
-        this.hashes = new Hashtable();
-        this.prfHashAlgorithm = null;
-    }
-
-    private DeferredHash(Short prfHashAlgorithm, Digest prfHash)
-    {
-        this.buf = null;
-        this.hashes = new Hashtable();
-        this.prfHashAlgorithm = prfHashAlgorithm;
-        hashes.put(prfHashAlgorithm, prfHash);
-    }
-
-    public void init(TlsContext context)
-    {
-        this.context = context;
-    }
-
-    public TlsHandshakeHash notifyPRFDetermined()
-    {
-        int prfAlgorithm = context.getSecurityParameters().getPrfAlgorithm();
-        if (prfAlgorithm == PRFAlgorithm.tls_prf_legacy)
-        {
-            CombinedHash legacyHash = new CombinedHash();
-            legacyHash.init(context);
-            buf.updateDigest(legacyHash);
-            return legacyHash.notifyPRFDetermined();
-        }
-
-        this.prfHashAlgorithm = Shorts.valueOf(TlsUtils.getHashAlgorithmForPRFAlgorithm(prfAlgorithm));
-
-        checkTrackingHash(prfHashAlgorithm);
-
-        return this;
-    }
-
-    public void trackHashAlgorithm(short hashAlgorithm)
-    {
-        if (buf == null)
-        {
-            throw new IllegalStateException("Too late to track more hash algorithms");
-        }
-
-        checkTrackingHash(Shorts.valueOf(hashAlgorithm));
-    }
-
-    public void sealHashAlgorithms()
-    {
-        checkStopBuffering();
-    }
-
-    public TlsHandshakeHash stopTracking()
-    {
-        Digest prfHash = TlsUtils.cloneHash(prfHashAlgorithm.shortValue(), (Digest)hashes.get(prfHashAlgorithm));
-        if (buf != null)
-        {
-            buf.updateDigest(prfHash);
-        }
-        DeferredHash result = new DeferredHash(prfHashAlgorithm, prfHash);
-        result.init(context);
-        return result;
-    }
-
-    public Digest forkPRFHash()
-    {
-        checkStopBuffering();
-
-        if (buf != null)
-        {
-            Digest prfHash = TlsUtils.createHash(prfHashAlgorithm.shortValue());
-            buf.updateDigest(prfHash);
-            return prfHash;
-        }
-
-        return TlsUtils.cloneHash(prfHashAlgorithm.shortValue(), (Digest)hashes.get(prfHashAlgorithm));
-    }
-
-    public byte[] getFinalHash(short hashAlgorithm)
-    {
-        Digest d = (Digest)hashes.get(Shorts.valueOf(hashAlgorithm));
-        if (d == null)
-        {
-            throw new IllegalStateException("HashAlgorithm " + hashAlgorithm + " is not being tracked");
-        }
-
-        d = TlsUtils.cloneHash(hashAlgorithm, d);
-        if (buf != null)
-        {
-            buf.updateDigest(d);
-        }
-
-        byte[] bs = new byte[d.getDigestSize()];
-        d.doFinal(bs, 0);
-        return bs;
-    }
-
-    public String getAlgorithmName()
-    {
-        throw new IllegalStateException("Use fork() to get a definite Digest");
-    }
-
-    public int getDigestSize()
-    {
-        throw new IllegalStateException("Use fork() to get a definite Digest");
-    }
-
-    public void update(byte input)
-    {
-        if (buf != null)
-        {
-            buf.write(input);
-            return;
-        }
-
-        Enumeration e = hashes.elements();
-        while (e.hasMoreElements())
-        {
-            Digest hash = (Digest)e.nextElement();
-            hash.update(input);
-        }
-    }
-
-    public void update(byte[] input, int inOff, int len)
-    {
-        if (buf != null)
-        {
-            buf.write(input, inOff, len);
-            return;
-        }
-
-        Enumeration e = hashes.elements();
-        while (e.hasMoreElements())
-        {
-            Digest hash = (Digest)e.nextElement();
-            hash.update(input, inOff, len);
-        }
-    }
-
-    public int doFinal(byte[] output, int outOff)
-    {
-        throw new IllegalStateException("Use fork() to get a definite Digest");
-    }
-
-    public void reset()
-    {
-        if (buf != null)
-        {
-            buf.reset();
-            return;
-        }
-
-        Enumeration e = hashes.elements();
-        while (e.hasMoreElements())
-        {
-            Digest hash = (Digest)e.nextElement();
-            hash.reset();
-        }
-    }
-
-    protected void checkStopBuffering()
-    {
-        if (buf != null && hashes.size() <= BUFFERING_HASH_LIMIT)
-        {
-            Enumeration e = hashes.elements();
-            while (e.hasMoreElements())
-            {
-                Digest hash = (Digest)e.nextElement();
-                buf.updateDigest(hash);
-            }
-
-            this.buf = null;
-        }
-    }
-
-    protected void checkTrackingHash(Short hashAlgorithm)
-    {
-        if (!hashes.containsKey(hashAlgorithm))
-        {
-            Digest hash = TlsUtils.createHash(hashAlgorithm.shortValue());
-            hashes.put(hashAlgorithm, hash);
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/DigestInputBuffer.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/DigestInputBuffer.java
deleted file mode 100644
index 7cfa890..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/DigestInputBuffer.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-import java.io.ByteArrayOutputStream;
-
-import org.bouncycastle.crypto.Digest;
-
-class DigestInputBuffer extends ByteArrayOutputStream
-{
-    void updateDigest(Digest d)
-    {
-        d.update(this.buf, 0, count);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/DigitallySigned.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/DigitallySigned.java
deleted file mode 100644
index c366ca9..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/DigitallySigned.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-public class DigitallySigned
-{
-    protected SignatureAndHashAlgorithm algorithm;
-    protected byte[] signature;
-
-    public DigitallySigned(SignatureAndHashAlgorithm algorithm, byte[] signature)
-    {
-        if (signature == null)
-        {
-            throw new IllegalArgumentException("'signature' cannot be null");
-        }
-
-        this.algorithm = algorithm;
-        this.signature = signature;
-    }
-
-    /**
-     * @return a {@link SignatureAndHashAlgorithm} (or null before TLS 1.2).
-     */
-    public SignatureAndHashAlgorithm getAlgorithm()
-    {
-        return algorithm;
-    }
-
-    public byte[] getSignature()
-    {
-        return signature;
-    }
-
-    /**
-     * Encode this {@link DigitallySigned} to an {@link OutputStream}.
-     * 
-     * @param output
-     *            the {@link OutputStream} to encode to.
-     * @throws IOException
-     */
-    public void encode(OutputStream output) throws IOException
-    {
-        if (algorithm != null)
-        {
-            algorithm.encode(output);
-        }
-        TlsUtils.writeOpaque16(signature, output);
-    }
-
-    /**
-     * Parse a {@link DigitallySigned} from an {@link InputStream}.
-     * 
-     * @param context
-     *            the {@link TlsContext} of the current connection.
-     * @param input
-     *            the {@link InputStream} to parse from.
-     * @return a {@link DigitallySigned} object.
-     * @throws IOException
-     */
-    public static DigitallySigned parse(TlsContext context, InputStream input) throws IOException
-    {
-        SignatureAndHashAlgorithm algorithm = null;
-        if (TlsUtils.isTLSv12(context))
-        {
-            algorithm = SignatureAndHashAlgorithm.parse(input);
-        }
-        byte[] signature = TlsUtils.readOpaque16(input);
-        return new DigitallySigned(algorithm, signature);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/ECBasisType.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/ECBasisType.java
deleted file mode 100644
index 630dfcd..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/ECBasisType.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-/**
- * RFC 4492 5.4. (Errata ID: 2389)
- */
-public class ECBasisType
-{
-    public static final short ec_basis_trinomial = 1;
-    public static final short ec_basis_pentanomial = 2;
-
-    public static boolean isValid(short ecBasisType)
-    {
-        return ecBasisType >= ec_basis_trinomial && ecBasisType <= ec_basis_pentanomial;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/ECCurveType.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/ECCurveType.java
deleted file mode 100644
index 0b6542f..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/ECCurveType.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-/**
- * RFC 4492 5.4
- */
-public class ECCurveType
-{
-    /**
-     * Indicates the elliptic curve domain parameters are conveyed verbosely, and the
-     * underlying finite field is a prime field.
-     */
-    public static final short explicit_prime = 1;
-
-    /**
-     * Indicates the elliptic curve domain parameters are conveyed verbosely, and the
-     * underlying finite field is a characteristic-2 field.
-     */
-    public static final short explicit_char2 = 2;
-
-    /**
-     * Indicates that a named curve is used. This option SHOULD be used when applicable.
-     */
-    public static final short named_curve = 3;
-
-    /*
-     * Values 248 through 255 are reserved for private use.
-     */
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/ECPointFormat.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/ECPointFormat.java
deleted file mode 100644
index 969d42e..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/ECPointFormat.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-/**
- * RFC 4492 5.1.2
- */
-public class ECPointFormat
-{
-    public static final short uncompressed = 0;
-    public static final short ansiX962_compressed_prime = 1;
-    public static final short ansiX962_compressed_char2 = 2;
-
-    /*
-     * reserved (248..255)
-     */
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/EncryptionAlgorithm.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/EncryptionAlgorithm.java
deleted file mode 100644
index 2da2f76..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/EncryptionAlgorithm.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-/**
- * RFC 2246
- * <p>
- * Note that the values here are implementation-specific and arbitrary. It is recommended not to
- * depend on the particular values (e.g. serialization).
- */
-public class EncryptionAlgorithm
-{
-    public static final int NULL = 0;
-    public static final int RC4_40 = 1;
-    public static final int RC4_128 = 2;
-    public static final int RC2_CBC_40 = 3;
-    public static final int IDEA_CBC = 4;
-    public static final int DES40_CBC = 5;
-    public static final int DES_CBC = 6;
-    public static final int _3DES_EDE_CBC = 7;
-
-    /*
-     * RFC 3268
-     */
-    public static final int AES_128_CBC = 8;
-    public static final int AES_256_CBC = 9;
-
-    /*
-     * RFC 5289
-     */
-    public static final int AES_128_GCM = 10;
-    public static final int AES_256_GCM = 11;
-
-    /*
-     * RFC 5932
-     */
-    public static final int CAMELLIA_128_CBC = 12;
-    public static final int CAMELLIA_256_CBC = 13;
-
-    /*
-     * RFC 4162
-     */
-    public static final int SEED_CBC = 14;
-
-    /*
-     * RFC 6655
-     */
-    public static final int AES_128_CCM = 15;
-    public static final int AES_128_CCM_8 = 16;
-    public static final int AES_256_CCM = 17;
-    public static final int AES_256_CCM_8 = 18;
-
-    /*
-     * RFC 6367
-     */
-    public static final int CAMELLIA_128_GCM = 19;
-    public static final int CAMELLIA_256_GCM = 20;
-
-    /*
-     * draft-josefsson-salsa20-tls-04 
-     */
-    public static final int ESTREAM_SALSA20 = 100;
-    public static final int SALSA20 = 101;
-
-    /*
-     * draft-agl-tls-chacha20poly1305-04
-     */
-    public static final int AEAD_CHACHA20_POLY1305 = 102;
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/ExporterLabel.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/ExporterLabel.java
deleted file mode 100644
index 579d4dc..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/ExporterLabel.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-/**
- * RFC 5705
- */
-public class ExporterLabel
-{
-    /*
-     * RFC 5246
-     */
-    public static final String client_finished = "client finished";
-    public static final String server_finished = "server finished";
-    public static final String master_secret = "master secret";
-    public static final String key_expansion = "key expansion";
-
-    /*
-     * RFC 5216
-     */
-    public static final String client_EAP_encryption = "client EAP encryption";
-
-    /*
-     * RFC 5281
-     */
-    public static final String ttls_keying_material = "ttls keying material";
-    public static final String ttls_challenge = "ttls challenge";
-
-    /*
-     * RFC 5764
-     */
-    public static final String dtls_srtp = "EXTRACTOR-dtls_srtp";
-
-    /*
-     * draft-ietf-tls-session-hash-01
-     */
-    public static final String extended_master_secret = "extended master secret";
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/ExtensionType.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/ExtensionType.java
deleted file mode 100644
index 957db86..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/ExtensionType.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-public class ExtensionType
-{
-    /*
-     * RFC 2546 2.3.
-     */
-    public static final int server_name = 0;
-    public static final int max_fragment_length = 1;
-    public static final int client_certificate_url = 2;
-    public static final int trusted_ca_keys = 3;
-    public static final int truncated_hmac = 4;
-    public static final int status_request = 5;
-
-    /*
-     * RFC 4681
-     */
-    public static final int user_mapping = 6;
-
-    /*
-     * RFC 4492 5.1.
-     */
-    public static final int elliptic_curves = 10;
-    public static final int ec_point_formats = 11;
-
-    /*
-     * RFC 5054 2.8.1.
-     */
-    public static final int srp = 12;
-
-    /*
-     * RFC 5246 7.4.1.4.
-     */
-    public static final int signature_algorithms = 13;
-
-    /*
-     * RFC 5764 9.
-     */
-    public static final int use_srtp = 14;
-
-    /*
-     * RFC 6520 6.
-     */
-    public static final int heartbeat = 15;
-
-    /*
-     * RFC 7366
-     */
-    public static final int encrypt_then_mac = 22;
-
-    /*
-     * draft-ietf-tls-session-hash-01
-     * 
-     * NOTE: Early code-point assignment
-     */
-    public static final int extended_master_secret = 23;
-
-    /*
-     * RFC 5077 7.
-     */
-    public static final int session_ticket = 35;
-
-    /*
-     * draft-ietf-tls-negotiated-ff-dhe-01
-     * 
-     * WARNING: Placeholder value; the real value is TBA
-     */
-    public static final int negotiated_ff_dhe_groups = 101;
-
-    /*
-     * RFC 5746 3.2.
-     */
-    public static final int renegotiation_info = 0xff01;
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/FiniteFieldDHEGroup.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/FiniteFieldDHEGroup.java
deleted file mode 100644
index a16ec9c..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/FiniteFieldDHEGroup.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-/*
- * draft-ietf-tls-negotiated-ff-dhe-01
- */
-public class FiniteFieldDHEGroup
-{
-    public static final short ffdhe2432 = 0;
-    public static final short ffdhe3072 = 1;
-    public static final short ffdhe4096 = 2;
-    public static final short ffdhe6144 = 3;
-    public static final short ffdhe8192 = 4;
-
-    public static boolean isValid(short group)
-    {
-        return group >= ffdhe2432 && group <= ffdhe8192;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/HandshakeType.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/HandshakeType.java
deleted file mode 100644
index c81660a..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/HandshakeType.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-public class HandshakeType
-{
-    /*
-     * RFC 2246 7.4
-     */
-    public static final short hello_request = 0;
-    public static final short client_hello = 1;
-    public static final short server_hello = 2;
-    public static final short certificate = 11;
-    public static final short server_key_exchange = 12;
-    public static final short certificate_request = 13;
-    public static final short server_hello_done = 14;
-    public static final short certificate_verify = 15;
-    public static final short client_key_exchange = 16;
-    public static final short finished = 20;
-
-    /*
-     * RFC 3546 2.4
-     */
-    public static final short certificate_url = 21;
-    public static final short certificate_status = 22;
-
-    /*
-     *  (DTLS) RFC 4347 4.3.2
-     */
-    public static final short hello_verify_request = 3;
-
-    /*
-     * RFC 4680 
-     */
-    public static final short supplemental_data = 23;
-
-    /*
-     * RFC 5077 
-     */
-    public static final short session_ticket = 4;
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/HashAlgorithm.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/HashAlgorithm.java
deleted file mode 100644
index dc7482b..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/HashAlgorithm.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-/**
- * RFC 5246 7.4.1.4.1
- */
-public class HashAlgorithm
-{
-    public static final short none = 0;
-    public static final short md5 = 1;
-    public static final short sha1 = 2;
-    public static final short sha224 = 3;
-    public static final short sha256 = 4;
-    public static final short sha384 = 5;
-    public static final short sha512 = 6;
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/HeartbeatExtension.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/HeartbeatExtension.java
deleted file mode 100644
index f9f3670..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/HeartbeatExtension.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-public class HeartbeatExtension
-{
-    protected short mode;
-
-    public HeartbeatExtension(short mode)
-    {
-        if (!HeartbeatMode.isValid(mode))
-        {
-            throw new IllegalArgumentException("'mode' is not a valid HeartbeatMode value");
-        }
-
-        this.mode = mode;
-    }
-
-    public short getMode()
-    {
-        return mode;
-    }
-
-    /**
-     * Encode this {@link HeartbeatExtension} to an {@link OutputStream}.
-     * 
-     * @param output
-     *            the {@link OutputStream} to encode to.
-     * @throws IOException
-     */
-    public void encode(OutputStream output) throws IOException
-    {
-        TlsUtils.writeUint8(mode, output);
-    }
-
-    /**
-     * Parse a {@link HeartbeatExtension} from an {@link InputStream}.
-     * 
-     * @param input
-     *            the {@link InputStream} to parse from.
-     * @return a {@link HeartbeatExtension} object.
-     * @throws IOException
-     */
-    public static HeartbeatExtension parse(InputStream input) throws IOException
-    {
-        short mode = TlsUtils.readUint8(input);
-        if (!HeartbeatMode.isValid(mode))
-        {
-            throw new TlsFatalAlert(AlertDescription.illegal_parameter);
-        }
-
-        return new HeartbeatExtension(mode);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/HeartbeatMessage.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/HeartbeatMessage.java
deleted file mode 100644
index c6a447f..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/HeartbeatMessage.java
+++ /dev/null
@@ -1,111 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.io.Streams;
-
-public class HeartbeatMessage
-{
-    protected short type;
-    protected byte[] payload;
-    protected int paddingLength;
-
-    public HeartbeatMessage(short type, byte[] payload, int paddingLength)
-    {
-        if (!HeartbeatMessageType.isValid(type))
-        {
-            throw new IllegalArgumentException("'type' is not a valid HeartbeatMessageType value");
-        }
-        if (payload == null || payload.length >= (1 << 16))
-        {
-            throw new IllegalArgumentException("'payload' must have length < 2^16");
-        }
-        if (paddingLength < 16)
-        {
-            throw new IllegalArgumentException("'paddingLength' must be at least 16");
-        }
-
-        this.type = type;
-        this.payload = payload;
-        this.paddingLength = paddingLength;
-    }
-
-    /**
-     * Encode this {@link HeartbeatMessage} to an {@link OutputStream}.
-     * 
-     * @param output
-     *            the {@link OutputStream} to encode to.
-     * @throws IOException
-     */
-    public void encode(TlsContext context, OutputStream output) throws IOException
-    {
-        TlsUtils.writeUint8(type, output);
-
-        TlsUtils.checkUint16(payload.length);
-        TlsUtils.writeUint16(payload.length, output);
-        output.write(payload);
-
-        byte[] padding = new byte[paddingLength];
-        context.getNonceRandomGenerator().nextBytes(padding);
-        output.write(padding);
-    }
-
-    /**
-     * Parse a {@link HeartbeatMessage} from an {@link InputStream}.
-     * 
-     * @param input
-     *            the {@link InputStream} to parse from.
-     * @return a {@link HeartbeatMessage} object.
-     * @throws IOException
-     */
-    public static HeartbeatMessage parse(InputStream input) throws IOException
-    {
-        short type = TlsUtils.readUint8(input);
-        if (!HeartbeatMessageType.isValid(type))
-        {
-            throw new TlsFatalAlert(AlertDescription.illegal_parameter);
-        }
-
-        int payload_length = TlsUtils.readUint16(input);
-
-        PayloadBuffer buf = new PayloadBuffer();
-        Streams.pipeAll(input, buf);
-
-        byte[] payload = buf.toTruncatedByteArray(payload_length);
-        if (payload == null)
-        {
-            /*
-             * RFC 6520 4. If the payload_length of a received HeartbeatMessage is too large, the
-             * received HeartbeatMessage MUST be discarded silently.
-             */
-            return null;
-        }
-
-        int padding_length = buf.size() - payload.length;
-
-        /*
-         * RFC 6520 4. The padding of a received HeartbeatMessage message MUST be ignored
-         */
-        return new HeartbeatMessage(type, payload, padding_length);
-    }
-
-    static class PayloadBuffer extends ByteArrayOutputStream
-    {
-        byte[] toTruncatedByteArray(int payloadLength)
-        {
-            /*
-             * RFC 6520 4. The padding_length MUST be at least 16.
-             */
-            int minimumCount = payloadLength + 16;
-            if (count < minimumCount)
-            {
-                return null;
-            }
-            return Arrays.copyOf(buf, payloadLength);
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/HeartbeatMessageType.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/HeartbeatMessageType.java
deleted file mode 100644
index f1a3b43..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/HeartbeatMessageType.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-/*
- * RFC 6520 3.
- */
-public class HeartbeatMessageType
-{
-    public static final short heartbeat_request = 1;
-    public static final short heartbeat_response = 2;
-
-    public static boolean isValid(short heartbeatMessageType)
-    {
-        return heartbeatMessageType >= heartbeat_request && heartbeatMessageType <= heartbeat_response;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/HeartbeatMode.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/HeartbeatMode.java
deleted file mode 100644
index 4024faa..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/HeartbeatMode.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-/*
- * RFC 6520
- */
-public class HeartbeatMode
-{
-    public static final short peer_allowed_to_send = 1;
-    public static final short peer_not_allowed_to_send = 2;
-
-    public static boolean isValid(short heartbeatMode)
-    {
-        return heartbeatMode >= peer_allowed_to_send && heartbeatMode <= peer_not_allowed_to_send;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/KeyExchangeAlgorithm.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/KeyExchangeAlgorithm.java
deleted file mode 100644
index d862d76..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/KeyExchangeAlgorithm.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-/**
- * RFC 2246
- * <p>
- * Note that the values here are implementation-specific and arbitrary. It is recommended not to
- * depend on the particular values (e.g. serialization).
- */
-public class KeyExchangeAlgorithm
-{
-    public static final int NULL = 0;
-    public static final int RSA = 1;
-    public static final int RSA_EXPORT = 2;
-    public static final int DHE_DSS = 3;
-    public static final int DHE_DSS_EXPORT = 4;
-    public static final int DHE_RSA = 5;
-    public static final int DHE_RSA_EXPORT = 6;
-    public static final int DH_DSS = 7;
-    public static final int DH_DSS_EXPORT = 8;
-    public static final int DH_RSA = 9;
-    public static final int DH_RSA_EXPORT = 10;
-    public static final int DH_anon = 11;
-    public static final int DH_anon_EXPORT = 12;
-
-    /*
-     * RFC 4279
-     */
-    public static final int PSK = 13;
-    public static final int DHE_PSK = 14;
-    public static final int RSA_PSK = 15;
-
-    /*
-     * RFC 4429
-     */
-    public static final int ECDH_ECDSA = 16;
-    public static final int ECDHE_ECDSA = 17;
-    public static final int ECDH_RSA = 18;
-    public static final int ECDHE_RSA = 19;
-    public static final int ECDH_anon = 20;
-
-    /*
-     * RFC 5054
-     */
-    public static final int SRP = 21;
-    public static final int SRP_DSS = 22;
-    public static final int SRP_RSA = 23;
-    
-    /*
-     * RFC 5489
-     */
-    public static final int ECDHE_PSK = 24;
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/MACAlgorithm.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/MACAlgorithm.java
deleted file mode 100644
index bd13ab8..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/MACAlgorithm.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-/**
- * RFC 2246
- * <p>
- * Note that the values here are implementation-specific and arbitrary. It is recommended not to
- * depend on the particular values (e.g. serialization).
- */
-public class MACAlgorithm
-{
-    public static final int _null = 0;
-    public static final int md5 = 1;
-    public static final int sha = 2;
-
-    /*
-     * RFC 5246
-     */
-    public static final int hmac_md5 = md5;
-    public static final int hmac_sha1 = sha;
-    public static final int hmac_sha256 = 3;
-    public static final int hmac_sha384 = 4;
-    public static final int hmac_sha512 = 5;
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/MaxFragmentLength.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/MaxFragmentLength.java
deleted file mode 100644
index 6bc61b0..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/MaxFragmentLength.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-public class MaxFragmentLength
-{
-    /*
-     * RFC 3546 3.2.
-     */
-    public static final short pow2_9 = 1;
-    public static final short pow2_10 = 2;
-    public static final short pow2_11 = 3;
-    public static final short pow2_12 = 4;
-
-    public static boolean isValid(short maxFragmentLength)
-    {
-        return maxFragmentLength >= pow2_9 && maxFragmentLength <= pow2_12;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/NameType.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/NameType.java
deleted file mode 100644
index 9b0cd1b..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/NameType.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-public class NameType
-{
-    /*
-     * RFC 3546 3.1.
-     */
-    public static final short host_name = 0;
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/NamedCurve.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/NamedCurve.java
deleted file mode 100644
index 49fc923..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/NamedCurve.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-/**
- * RFC 4492 5.1.1
- * <p>
- * The named curves defined here are those specified in SEC 2 [13]. Note that many of these curves
- * are also recommended in ANSI X9.62 [7] and FIPS 186-2 [11]. Values 0xFE00 through 0xFEFF are
- * reserved for private use. Values 0xFF01 and 0xFF02 indicate that the client supports arbitrary
- * prime and characteristic-2 curves, respectively (the curve parameters must be encoded explicitly
- * in ECParameters).
- */
-public class NamedCurve
-{
-    public static final int sect163k1 = 1;
-    public static final int sect163r1 = 2;
-    public static final int sect163r2 = 3;
-    public static final int sect193r1 = 4;
-    public static final int sect193r2 = 5;
-    public static final int sect233k1 = 6;
-    public static final int sect233r1 = 7;
-    public static final int sect239k1 = 8;
-    public static final int sect283k1 = 9;
-    public static final int sect283r1 = 10;
-    public static final int sect409k1 = 11;
-    public static final int sect409r1 = 12;
-    public static final int sect571k1 = 13;
-    public static final int sect571r1 = 14;
-    public static final int secp160k1 = 15;
-    public static final int secp160r1 = 16;
-    public static final int secp160r2 = 17;
-    public static final int secp192k1 = 18;
-    public static final int secp192r1 = 19;
-    public static final int secp224k1 = 20;
-    public static final int secp224r1 = 21;
-    public static final int secp256k1 = 22;
-    public static final int secp256r1 = 23;
-    public static final int secp384r1 = 24;
-    public static final int secp521r1 = 25;
-    
-    /*
-     * RFC 7027
-     */
-    public static final int brainpoolP256r1 = 26;
-    public static final int brainpoolP384r1 = 27;
-    public static final int brainpoolP512r1 = 28;
-
-    /*
-     * reserved (0xFE00..0xFEFF)
-     */
-
-    public static final int arbitrary_explicit_prime_curves = 0xFF01;
-    public static final int arbitrary_explicit_char2_curves = 0xFF02;
-
-    public static boolean isValid(int namedCurve)
-    {
-        return (namedCurve >= sect163k1 && namedCurve <= brainpoolP512r1)
-            || (namedCurve >= arbitrary_explicit_prime_curves && namedCurve <= arbitrary_explicit_char2_curves);
-    }
-
-    public static boolean refersToASpecificNamedCurve(int namedCurve)
-    {
-        switch (namedCurve)
-        {
-        case arbitrary_explicit_prime_curves:
-        case arbitrary_explicit_char2_curves:
-            return false;
-        default:
-            return true;
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/NewSessionTicket.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/NewSessionTicket.java
deleted file mode 100644
index 8f87a65..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/NewSessionTicket.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-public class NewSessionTicket
-{
-    protected long ticketLifetimeHint;
-    protected byte[] ticket;
-
-    public NewSessionTicket(long ticketLifetimeHint, byte[] ticket)
-    {
-        this.ticketLifetimeHint = ticketLifetimeHint;
-        this.ticket = ticket;
-    }
-
-    public long getTicketLifetimeHint()
-    {
-        return ticketLifetimeHint;
-    }
-
-    public byte[] getTicket()
-    {
-        return ticket;
-    }
-
-    /**
-     * Encode this {@link NewSessionTicket} to an {@link OutputStream}.
-     *
-     * @param output the {@link OutputStream} to encode to.
-     * @throws IOException
-     */
-    public void encode(OutputStream output)
-        throws IOException
-    {
-        TlsUtils.writeUint32(ticketLifetimeHint, output);
-        TlsUtils.writeOpaque16(ticket, output);
-    }
-
-    /**
-     * Parse a {@link NewSessionTicket} from an {@link InputStream}.
-     *
-     * @param input the {@link InputStream} to parse from.
-     * @return a {@link NewSessionTicket} object.
-     * @throws IOException
-     */
-    public static NewSessionTicket parse(InputStream input)
-        throws IOException
-    {
-        long ticketLifetimeHint = TlsUtils.readUint32(input);
-        byte[] ticket = TlsUtils.readOpaque16(input);
-        return new NewSessionTicket(ticketLifetimeHint, ticket);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/OCSPStatusRequest.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/OCSPStatusRequest.java
deleted file mode 100644
index 473db23..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/OCSPStatusRequest.java
+++ /dev/null
@@ -1,131 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.Vector;
-
-import org.bouncycastle.asn1.ASN1Encoding;
-import org.bouncycastle.asn1.ocsp.ResponderID;
-import org.bouncycastle.asn1.x509.Extensions;
-
-/**
- * RFC 3546 3.6
- */
-public class OCSPStatusRequest
-{
-    protected Vector responderIDList;
-    protected Extensions requestExtensions;
-
-    /**
-     * @param responderIDList
-     *            a {@link Vector} of {@link ResponderID}, specifying the list of trusted OCSP
-     *            responders. An empty list has the special meaning that the responders are
-     *            implicitly known to the server - e.g., by prior arrangement.
-     * @param requestExtensions
-     *            OCSP request extensions. A null value means that there are no extensions.
-     */
-    public OCSPStatusRequest(Vector responderIDList, Extensions requestExtensions)
-    {
-        this.responderIDList = responderIDList;
-        this.requestExtensions = requestExtensions;
-    }
-
-    /**
-     * @return a {@link Vector} of {@link ResponderID}
-     */
-    public Vector getResponderIDList()
-    {
-        return responderIDList;
-    }
-
-    /**
-     * @return OCSP request extensions
-     */
-    public Extensions getRequestExtensions()
-    {
-        return requestExtensions;
-    }
-
-    /**
-     * Encode this {@link OCSPStatusRequest} to an {@link OutputStream}.
-     * 
-     * @param output
-     *            the {@link OutputStream} to encode to.
-     * @throws IOException
-     */
-    public void encode(OutputStream output) throws IOException
-    {
-        if (responderIDList == null || responderIDList.isEmpty())
-        {
-            TlsUtils.writeUint16(0, output);
-        }
-        else
-        {
-            ByteArrayOutputStream buf = new ByteArrayOutputStream();
-            for (int i = 0; i < responderIDList.size(); ++i)
-            {
-                ResponderID responderID = (ResponderID) responderIDList.elementAt(i);
-                byte[] derEncoding = responderID.getEncoded(ASN1Encoding.DER);
-                TlsUtils.writeOpaque16(derEncoding, buf);
-            }
-            TlsUtils.checkUint16(buf.size());
-            TlsUtils.writeUint16(buf.size(), output);
-            buf.writeTo(output);
-        }
-
-        if (requestExtensions == null)
-        {
-            TlsUtils.writeUint16(0, output);
-        }
-        else
-        {
-            byte[] derEncoding = requestExtensions.getEncoded(ASN1Encoding.DER);
-            TlsUtils.checkUint16(derEncoding.length);
-            TlsUtils.writeUint16(derEncoding.length, output);
-            output.write(derEncoding);
-        }
-    }
-
-    /**
-     * Parse an {@link OCSPStatusRequest} from an {@link InputStream}.
-     * 
-     * @param input
-     *            the {@link InputStream} to parse from.
-     * @return an {@link OCSPStatusRequest} object.
-     * @throws IOException
-     */
-    public static OCSPStatusRequest parse(InputStream input) throws IOException
-    {
-        Vector responderIDList = new Vector();
-        {
-            int length = TlsUtils.readUint16(input);
-            if (length > 0)
-            {
-                byte[] data = TlsUtils.readFully(length, input);
-                ByteArrayInputStream buf = new ByteArrayInputStream(data);
-                do
-                {
-                    byte[] derEncoding = TlsUtils.readOpaque16(buf);
-                    ResponderID responderID = ResponderID.getInstance(TlsUtils.readDERObject(derEncoding));
-                    responderIDList.addElement(responderID);
-                }
-                while (buf.available() > 0);
-            }
-        }
-
-        Extensions requestExtensions = null;
-        {
-            int length = TlsUtils.readUint16(input);
-            if (length > 0)
-            {
-                byte[] derEncoding = TlsUtils.readFully(length, input);
-                requestExtensions = Extensions.getInstance(TlsUtils.readDERObject(derEncoding));
-            }
-        }
-
-        return new OCSPStatusRequest(responderIDList, requestExtensions);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/PRFAlgorithm.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/PRFAlgorithm.java
deleted file mode 100644
index 33c27c4..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/PRFAlgorithm.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-/**
- * RFC 5246
- * <p>
- * Note that the values here are implementation-specific and arbitrary. It is recommended not to
- * depend on the particular values (e.g. serialization).
- */
-public class PRFAlgorithm
-{
-    /*
-     * Placeholder to refer to the legacy TLS algorithm
-     */
-    public static final int tls_prf_legacy = 0;
-
-    public static final int tls_prf_sha256 = 1;
-
-    /*
-     * Implied by RFC 5288
-     */
-    public static final int tls_prf_sha384 = 2;
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/PSKTlsClient.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/PSKTlsClient.java
deleted file mode 100644
index cba58a9..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/PSKTlsClient.java
+++ /dev/null
@@ -1,268 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-import java.io.IOException;
-
-public class PSKTlsClient
-    extends AbstractTlsClient
-{
-    protected TlsPSKIdentity pskIdentity;
-
-    public PSKTlsClient(TlsPSKIdentity pskIdentity)
-    {
-        this(new DefaultTlsCipherFactory(), pskIdentity);
-    }
-
-    public PSKTlsClient(TlsCipherFactory cipherFactory, TlsPSKIdentity pskIdentity)
-    {
-        super(cipherFactory);
-        this.pskIdentity = pskIdentity;
-    }
-
-    public int[] getCipherSuites()
-    {
-        return new int[]
-        {
-            CipherSuite.TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA256,
-            CipherSuite.TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA,
-            CipherSuite.TLS_DHE_PSK_WITH_AES_128_CBC_SHA256,
-            CipherSuite.TLS_DHE_PSK_WITH_AES_128_CBC_SHA
-        };
-    }
-
-    public TlsKeyExchange getKeyExchange() throws IOException
-    {
-        switch (selectedCipherSuite)
-        {
-        case CipherSuite.TLS_DHE_PSK_WITH_3DES_EDE_CBC_SHA:
-        case CipherSuite.TLS_DHE_PSK_WITH_AES_128_CBC_SHA:
-        case CipherSuite.TLS_DHE_PSK_WITH_AES_128_CBC_SHA256:
-        case CipherSuite.TLS_DHE_PSK_WITH_AES_128_CCM:
-        case CipherSuite.TLS_DHE_PSK_WITH_AES_128_GCM_SHA256:
-        case CipherSuite.TLS_DHE_PSK_WITH_AES_256_CBC_SHA:
-        case CipherSuite.TLS_DHE_PSK_WITH_AES_256_CBC_SHA384:
-        case CipherSuite.TLS_DHE_PSK_WITH_AES_256_CCM:
-        case CipherSuite.TLS_DHE_PSK_WITH_AES_256_GCM_SHA384:
-        case CipherSuite.TLS_DHE_PSK_WITH_CAMELLIA_128_CBC_SHA256:
-        case CipherSuite.TLS_DHE_PSK_WITH_CAMELLIA_128_GCM_SHA256:
-        case CipherSuite.TLS_DHE_PSK_WITH_CAMELLIA_256_CBC_SHA384:
-        case CipherSuite.TLS_DHE_PSK_WITH_CAMELLIA_256_GCM_SHA384:
-        case CipherSuite.TLS_DHE_PSK_WITH_ESTREAM_SALSA20_SHA1:
-        case CipherSuite.TLS_DHE_PSK_WITH_NULL_SHA:
-        case CipherSuite.TLS_DHE_PSK_WITH_NULL_SHA256:
-        case CipherSuite.TLS_DHE_PSK_WITH_NULL_SHA384:
-        case CipherSuite.TLS_DHE_PSK_WITH_RC4_128_SHA:
-        case CipherSuite.TLS_DHE_PSK_WITH_SALSA20_SHA1:
-        case CipherSuite.TLS_PSK_DHE_WITH_AES_128_CCM_8:
-        case CipherSuite.TLS_PSK_DHE_WITH_AES_256_CCM_8:
-            return createPSKKeyExchange(KeyExchangeAlgorithm.DHE_PSK);
-
-        case CipherSuite.TLS_ECDHE_PSK_WITH_3DES_EDE_CBC_SHA:
-        case CipherSuite.TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA:
-        case CipherSuite.TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA256:
-        case CipherSuite.TLS_ECDHE_PSK_WITH_AES_256_CBC_SHA:
-        case CipherSuite.TLS_ECDHE_PSK_WITH_AES_256_CBC_SHA384:
-        case CipherSuite.TLS_ECDHE_PSK_WITH_CAMELLIA_128_CBC_SHA256:
-        case CipherSuite.TLS_ECDHE_PSK_WITH_CAMELLIA_256_CBC_SHA384:
-        case CipherSuite.TLS_ECDHE_PSK_WITH_ESTREAM_SALSA20_SHA1:
-        case CipherSuite.TLS_ECDHE_PSK_WITH_NULL_SHA:
-        case CipherSuite.TLS_ECDHE_PSK_WITH_NULL_SHA256:
-        case CipherSuite.TLS_ECDHE_PSK_WITH_NULL_SHA384:
-        case CipherSuite.TLS_ECDHE_PSK_WITH_RC4_128_SHA:
-        case CipherSuite.TLS_ECDHE_PSK_WITH_SALSA20_SHA1:
-            return createPSKKeyExchange(KeyExchangeAlgorithm.ECDHE_PSK);
-
-        case CipherSuite.TLS_PSK_WITH_3DES_EDE_CBC_SHA:
-        case CipherSuite.TLS_PSK_WITH_AES_128_CBC_SHA:
-        case CipherSuite.TLS_PSK_WITH_AES_128_CBC_SHA256:
-        case CipherSuite.TLS_PSK_WITH_AES_128_CCM:
-        case CipherSuite.TLS_PSK_WITH_AES_128_CCM_8:
-        case CipherSuite.TLS_PSK_WITH_AES_128_GCM_SHA256:
-        case CipherSuite.TLS_PSK_WITH_AES_256_CBC_SHA:
-        case CipherSuite.TLS_PSK_WITH_AES_256_CBC_SHA384:
-        case CipherSuite.TLS_PSK_WITH_AES_256_CCM:
-        case CipherSuite.TLS_PSK_WITH_AES_256_CCM_8:
-        case CipherSuite.TLS_PSK_WITH_AES_256_GCM_SHA384:
-        case CipherSuite.TLS_PSK_WITH_CAMELLIA_128_CBC_SHA256:
-        case CipherSuite.TLS_PSK_WITH_CAMELLIA_128_GCM_SHA256:
-        case CipherSuite.TLS_PSK_WITH_CAMELLIA_256_CBC_SHA384:
-        case CipherSuite.TLS_PSK_WITH_CAMELLIA_256_GCM_SHA384:
-        case CipherSuite.TLS_PSK_WITH_ESTREAM_SALSA20_SHA1:
-        case CipherSuite.TLS_PSK_WITH_NULL_SHA:
-        case CipherSuite.TLS_PSK_WITH_NULL_SHA256:
-        case CipherSuite.TLS_PSK_WITH_NULL_SHA384:
-        case CipherSuite.TLS_PSK_WITH_RC4_128_SHA:
-        case CipherSuite.TLS_PSK_WITH_SALSA20_SHA1:
-            return createPSKKeyExchange(KeyExchangeAlgorithm.PSK);
-
-        case CipherSuite.TLS_RSA_PSK_WITH_3DES_EDE_CBC_SHA:
-        case CipherSuite.TLS_RSA_PSK_WITH_AES_128_CBC_SHA:
-        case CipherSuite.TLS_RSA_PSK_WITH_AES_128_CBC_SHA256:
-        case CipherSuite.TLS_RSA_PSK_WITH_AES_128_GCM_SHA256:
-        case CipherSuite.TLS_RSA_PSK_WITH_AES_256_CBC_SHA:
-        case CipherSuite.TLS_RSA_PSK_WITH_AES_256_CBC_SHA384:
-        case CipherSuite.TLS_RSA_PSK_WITH_AES_256_GCM_SHA384:
-        case CipherSuite.TLS_RSA_PSK_WITH_CAMELLIA_128_CBC_SHA256:
-        case CipherSuite.TLS_RSA_PSK_WITH_CAMELLIA_128_GCM_SHA256:
-        case CipherSuite.TLS_RSA_PSK_WITH_CAMELLIA_256_CBC_SHA384:
-        case CipherSuite.TLS_RSA_PSK_WITH_CAMELLIA_256_GCM_SHA384:
-        case CipherSuite.TLS_RSA_PSK_WITH_ESTREAM_SALSA20_SHA1:
-        case CipherSuite.TLS_RSA_PSK_WITH_NULL_SHA:
-        case CipherSuite.TLS_RSA_PSK_WITH_NULL_SHA256:
-        case CipherSuite.TLS_RSA_PSK_WITH_NULL_SHA384:
-        case CipherSuite.TLS_RSA_PSK_WITH_RC4_128_SHA:
-        case CipherSuite.TLS_RSA_PSK_WITH_SALSA20_SHA1:
-            return createPSKKeyExchange(KeyExchangeAlgorithm.RSA_PSK);
-
-        default:
-            /*
-             * Note: internal error here; the TlsProtocol implementation verifies that the
-             * server-selected cipher suite was in the list of client-offered cipher suites, so if
-             * we now can't produce an implementation, we shouldn't have offered it!
-             */
-            throw new TlsFatalAlert(AlertDescription.internal_error);
-        }
-    }
-
-    public TlsAuthentication getAuthentication() throws IOException
-    {
-        /*
-         * Note: This method is not called unless a server certificate is sent, which may be the
-         * case e.g. for RSA_PSK key exchange.
-         */
-        throw new TlsFatalAlert(AlertDescription.internal_error);
-    }
-
-    public TlsCipher getCipher() throws IOException
-    {
-        switch (selectedCipherSuite)
-        {
-        case CipherSuite.TLS_DHE_PSK_WITH_3DES_EDE_CBC_SHA:
-        case CipherSuite.TLS_ECDHE_PSK_WITH_3DES_EDE_CBC_SHA:
-        case CipherSuite.TLS_PSK_WITH_3DES_EDE_CBC_SHA:
-        case CipherSuite.TLS_RSA_PSK_WITH_3DES_EDE_CBC_SHA:
-            return cipherFactory.createCipher(context, EncryptionAlgorithm._3DES_EDE_CBC, MACAlgorithm.hmac_sha1);
-
-        case CipherSuite.TLS_DHE_PSK_WITH_AES_128_CBC_SHA:
-        case CipherSuite.TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA:
-        case CipherSuite.TLS_PSK_WITH_AES_128_CBC_SHA:
-        case CipherSuite.TLS_RSA_PSK_WITH_AES_128_CBC_SHA:
-            return cipherFactory.createCipher(context, EncryptionAlgorithm.AES_128_CBC, MACAlgorithm.hmac_sha1);
-
-        case CipherSuite.TLS_DHE_PSK_WITH_AES_128_CBC_SHA256:
-        case CipherSuite.TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA256:
-        case CipherSuite.TLS_PSK_WITH_AES_128_CBC_SHA256:
-        case CipherSuite.TLS_RSA_PSK_WITH_AES_128_CBC_SHA256:
-            return cipherFactory.createCipher(context, EncryptionAlgorithm.AES_128_CBC, MACAlgorithm.hmac_sha256);
-
-        case CipherSuite.TLS_DHE_PSK_WITH_AES_128_CCM:
-        case CipherSuite.TLS_PSK_WITH_AES_128_CCM:
-            return cipherFactory.createCipher(context, EncryptionAlgorithm.AES_128_CCM, MACAlgorithm._null);
-
-        case CipherSuite.TLS_PSK_DHE_WITH_AES_128_CCM_8:
-        case CipherSuite.TLS_PSK_WITH_AES_128_CCM_8:
-            return cipherFactory.createCipher(context, EncryptionAlgorithm.AES_128_CCM_8, MACAlgorithm._null);
-
-        case CipherSuite.TLS_DHE_PSK_WITH_AES_128_GCM_SHA256:
-        case CipherSuite.TLS_PSK_WITH_AES_128_GCM_SHA256:
-        case CipherSuite.TLS_RSA_PSK_WITH_AES_128_GCM_SHA256:
-            return cipherFactory.createCipher(context, EncryptionAlgorithm.AES_128_GCM, MACAlgorithm._null);
-
-        case CipherSuite.TLS_DHE_PSK_WITH_AES_256_CBC_SHA:
-        case CipherSuite.TLS_ECDHE_PSK_WITH_AES_256_CBC_SHA:
-        case CipherSuite.TLS_PSK_WITH_AES_256_CBC_SHA:
-        case CipherSuite.TLS_RSA_PSK_WITH_AES_256_CBC_SHA:
-            return cipherFactory.createCipher(context, EncryptionAlgorithm.AES_256_CBC, MACAlgorithm.hmac_sha1);
-
-        case CipherSuite.TLS_DHE_PSK_WITH_AES_256_CBC_SHA384:
-        case CipherSuite.TLS_ECDHE_PSK_WITH_AES_256_CBC_SHA384:
-        case CipherSuite.TLS_PSK_WITH_AES_256_CBC_SHA384:
-        case CipherSuite.TLS_RSA_PSK_WITH_AES_256_CBC_SHA384:
-            return cipherFactory.createCipher(context, EncryptionAlgorithm.AES_256_CBC, MACAlgorithm.hmac_sha384);
-
-        case CipherSuite.TLS_DHE_PSK_WITH_AES_256_CCM:
-        case CipherSuite.TLS_PSK_WITH_AES_256_CCM:
-            return cipherFactory.createCipher(context, EncryptionAlgorithm.AES_256_CCM, MACAlgorithm._null);
-
-        case CipherSuite.TLS_PSK_DHE_WITH_AES_256_CCM_8:
-        case CipherSuite.TLS_PSK_WITH_AES_256_CCM_8:
-            return cipherFactory.createCipher(context, EncryptionAlgorithm.AES_256_CCM_8, MACAlgorithm._null);
-
-        case CipherSuite.TLS_DHE_PSK_WITH_AES_256_GCM_SHA384:
-        case CipherSuite.TLS_PSK_WITH_AES_256_GCM_SHA384:
-        case CipherSuite.TLS_RSA_PSK_WITH_AES_256_GCM_SHA384:
-            return cipherFactory.createCipher(context, EncryptionAlgorithm.AES_256_GCM, MACAlgorithm._null);
-
-        case CipherSuite.TLS_DHE_PSK_WITH_CAMELLIA_128_CBC_SHA256:
-        case CipherSuite.TLS_ECDHE_PSK_WITH_CAMELLIA_128_CBC_SHA256:
-        case CipherSuite.TLS_PSK_WITH_CAMELLIA_128_CBC_SHA256:
-        case CipherSuite.TLS_RSA_PSK_WITH_CAMELLIA_128_CBC_SHA256:
-            return cipherFactory.createCipher(context, EncryptionAlgorithm.CAMELLIA_128_CBC, MACAlgorithm.hmac_sha256);
-
-        case CipherSuite.TLS_DHE_PSK_WITH_CAMELLIA_128_GCM_SHA256:
-        case CipherSuite.TLS_PSK_WITH_CAMELLIA_128_GCM_SHA256:
-        case CipherSuite.TLS_RSA_PSK_WITH_CAMELLIA_128_GCM_SHA256:
-            return cipherFactory.createCipher(context, EncryptionAlgorithm.CAMELLIA_128_GCM, MACAlgorithm._null);
-
-        case CipherSuite.TLS_DHE_PSK_WITH_CAMELLIA_256_CBC_SHA384:
-        case CipherSuite.TLS_ECDHE_PSK_WITH_CAMELLIA_256_CBC_SHA384:
-        case CipherSuite.TLS_PSK_WITH_CAMELLIA_256_CBC_SHA384:
-        case CipherSuite.TLS_RSA_PSK_WITH_CAMELLIA_256_CBC_SHA384:
-            return cipherFactory.createCipher(context, EncryptionAlgorithm.CAMELLIA_256_CBC, MACAlgorithm.hmac_sha384);
-
-        case CipherSuite.TLS_DHE_PSK_WITH_CAMELLIA_256_GCM_SHA384:
-        case CipherSuite.TLS_PSK_WITH_CAMELLIA_256_GCM_SHA384:
-        case CipherSuite.TLS_RSA_PSK_WITH_CAMELLIA_256_GCM_SHA384:
-            return cipherFactory.createCipher(context, EncryptionAlgorithm.CAMELLIA_256_GCM, MACAlgorithm._null);
-
-        case CipherSuite.TLS_DHE_PSK_WITH_ESTREAM_SALSA20_SHA1:
-        case CipherSuite.TLS_ECDHE_PSK_WITH_ESTREAM_SALSA20_SHA1:
-        case CipherSuite.TLS_PSK_WITH_ESTREAM_SALSA20_SHA1:
-        case CipherSuite.TLS_RSA_PSK_WITH_ESTREAM_SALSA20_SHA1:
-            return cipherFactory.createCipher(context, EncryptionAlgorithm.ESTREAM_SALSA20, MACAlgorithm.hmac_sha1);
-
-        case CipherSuite.TLS_DHE_PSK_WITH_NULL_SHA:
-        case CipherSuite.TLS_ECDHE_PSK_WITH_NULL_SHA:
-        case CipherSuite.TLS_PSK_WITH_NULL_SHA:
-        case CipherSuite.TLS_RSA_PSK_WITH_NULL_SHA:
-            return cipherFactory.createCipher(context, EncryptionAlgorithm.NULL, MACAlgorithm.hmac_sha1);
-
-        case CipherSuite.TLS_DHE_PSK_WITH_NULL_SHA256:
-        case CipherSuite.TLS_ECDHE_PSK_WITH_NULL_SHA256:
-        case CipherSuite.TLS_PSK_WITH_NULL_SHA256:
-        case CipherSuite.TLS_RSA_PSK_WITH_NULL_SHA256:
-            return cipherFactory.createCipher(context, EncryptionAlgorithm.NULL, MACAlgorithm.hmac_sha256);
-
-        case CipherSuite.TLS_DHE_PSK_WITH_NULL_SHA384:
-        case CipherSuite.TLS_ECDHE_PSK_WITH_NULL_SHA384:
-        case CipherSuite.TLS_PSK_WITH_NULL_SHA384:
-        case CipherSuite.TLS_RSA_PSK_WITH_NULL_SHA384:
-            return cipherFactory.createCipher(context, EncryptionAlgorithm.NULL, MACAlgorithm.hmac_sha384);
-
-        case CipherSuite.TLS_DHE_PSK_WITH_RC4_128_SHA:
-        case CipherSuite.TLS_ECDHE_PSK_WITH_RC4_128_SHA:
-        case CipherSuite.TLS_PSK_WITH_RC4_128_SHA:
-        case CipherSuite.TLS_RSA_PSK_WITH_RC4_128_SHA:
-            return cipherFactory.createCipher(context, EncryptionAlgorithm.RC4_128, MACAlgorithm.hmac_sha1);
-
-        case CipherSuite.TLS_DHE_PSK_WITH_SALSA20_SHA1:
-        case CipherSuite.TLS_ECDHE_PSK_WITH_SALSA20_SHA1:
-        case CipherSuite.TLS_PSK_WITH_SALSA20_SHA1:
-        case CipherSuite.TLS_RSA_PSK_WITH_SALSA20_SHA1:
-            return cipherFactory.createCipher(context, EncryptionAlgorithm.SALSA20, MACAlgorithm.hmac_sha1);
-
-        default:
-            /*
-             * Note: internal error here; the TlsProtocol implementation verifies that the
-             * server-selected cipher suite was in the list of client-offered cipher suites, so if
-             * we now can't produce an implementation, we shouldn't have offered it!
-             */
-            throw new TlsFatalAlert(AlertDescription.internal_error);
-        }
-    }
-
-    protected TlsKeyExchange createPSKKeyExchange(int keyExchange)
-    {
-        return new TlsPSKKeyExchange(keyExchange, supportedSignatureAlgorithms, pskIdentity, null, null, namedCurves,
-            clientECPointFormats, serverECPointFormats);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/PSKTlsServer.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/PSKTlsServer.java
deleted file mode 100644
index eedf025..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/PSKTlsServer.java
+++ /dev/null
@@ -1,346 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-import java.io.IOException;
-
-import org.bouncycastle.crypto.agreement.DHStandardGroups;
-import org.bouncycastle.crypto.params.DHParameters;
-
-public class PSKTlsServer
-    extends AbstractTlsServer
-{
-    protected TlsPSKIdentityManager pskIdentityManager;
-
-    public PSKTlsServer(TlsPSKIdentityManager pskIdentityManager)
-    {
-        this(new DefaultTlsCipherFactory(), pskIdentityManager);
-    }
-
-    public PSKTlsServer(TlsCipherFactory cipherFactory, TlsPSKIdentityManager pskIdentityManager)
-    {
-        super(cipherFactory);
-        this.pskIdentityManager = pskIdentityManager;
-    }
-
-    protected TlsEncryptionCredentials getRSAEncryptionCredentials() throws IOException
-    {
-        throw new TlsFatalAlert(AlertDescription.internal_error);
-    }
-
-    protected DHParameters getDHParameters()
-    {
-        return DHStandardGroups.rfc5114_1024_160;
-    }
-
-    protected int[] getCipherSuites()
-    {
-        return new int[]
-        {
-            CipherSuite.TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA256,
-            CipherSuite.TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA,
-            CipherSuite.TLS_DHE_PSK_WITH_AES_128_CBC_SHA256,
-            CipherSuite.TLS_DHE_PSK_WITH_AES_128_CBC_SHA
-        };
-    }
-
-    public TlsCredentials getCredentials() throws IOException
-    {
-        switch (selectedCipherSuite)
-        {
-        case CipherSuite.TLS_DHE_PSK_WITH_3DES_EDE_CBC_SHA:
-        case CipherSuite.TLS_DHE_PSK_WITH_AES_128_CBC_SHA:
-        case CipherSuite.TLS_DHE_PSK_WITH_AES_128_CBC_SHA256:
-        case CipherSuite.TLS_DHE_PSK_WITH_AES_128_CCM:
-        case CipherSuite.TLS_DHE_PSK_WITH_AES_128_GCM_SHA256:
-        case CipherSuite.TLS_DHE_PSK_WITH_AES_256_CBC_SHA:
-        case CipherSuite.TLS_DHE_PSK_WITH_AES_256_CBC_SHA384:
-        case CipherSuite.TLS_DHE_PSK_WITH_AES_256_CCM:
-        case CipherSuite.TLS_DHE_PSK_WITH_AES_256_GCM_SHA384:
-        case CipherSuite.TLS_DHE_PSK_WITH_ESTREAM_SALSA20_SHA1:
-        case CipherSuite.TLS_DHE_PSK_WITH_NULL_SHA:
-        case CipherSuite.TLS_DHE_PSK_WITH_NULL_SHA256:
-        case CipherSuite.TLS_DHE_PSK_WITH_NULL_SHA384:
-        case CipherSuite.TLS_DHE_PSK_WITH_RC4_128_SHA:
-        case CipherSuite.TLS_DHE_PSK_WITH_SALSA20_SHA1:
-        case CipherSuite.TLS_PSK_DHE_WITH_AES_128_CCM_8:
-        case CipherSuite.TLS_PSK_DHE_WITH_AES_256_CCM_8:
-
-        case CipherSuite.TLS_ECDHE_PSK_WITH_3DES_EDE_CBC_SHA:
-        case CipherSuite.TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA:
-        case CipherSuite.TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA256:
-        case CipherSuite.TLS_ECDHE_PSK_WITH_AES_256_CBC_SHA:
-        case CipherSuite.TLS_ECDHE_PSK_WITH_AES_256_CBC_SHA384:
-        case CipherSuite.TLS_ECDHE_PSK_WITH_ESTREAM_SALSA20_SHA1:
-        case CipherSuite.TLS_ECDHE_PSK_WITH_NULL_SHA:
-        case CipherSuite.TLS_ECDHE_PSK_WITH_NULL_SHA256:
-        case CipherSuite.TLS_ECDHE_PSK_WITH_NULL_SHA384:
-        case CipherSuite.TLS_ECDHE_PSK_WITH_RC4_128_SHA:
-        case CipherSuite.TLS_ECDHE_PSK_WITH_SALSA20_SHA1:
-
-        case CipherSuite.TLS_PSK_WITH_3DES_EDE_CBC_SHA:
-        case CipherSuite.TLS_PSK_WITH_AES_128_CBC_SHA:
-        case CipherSuite.TLS_PSK_WITH_AES_128_CBC_SHA256:
-        case CipherSuite.TLS_PSK_WITH_AES_128_CCM:
-        case CipherSuite.TLS_PSK_WITH_AES_128_CCM_8:
-        case CipherSuite.TLS_PSK_WITH_AES_128_GCM_SHA256:
-        case CipherSuite.TLS_PSK_WITH_AES_256_CBC_SHA:
-        case CipherSuite.TLS_PSK_WITH_AES_256_CBC_SHA384:
-        case CipherSuite.TLS_PSK_WITH_AES_256_CCM:
-        case CipherSuite.TLS_PSK_WITH_AES_256_CCM_8:
-        case CipherSuite.TLS_PSK_WITH_AES_256_GCM_SHA384:
-        case CipherSuite.TLS_PSK_WITH_ESTREAM_SALSA20_SHA1:
-        case CipherSuite.TLS_PSK_WITH_NULL_SHA:
-        case CipherSuite.TLS_PSK_WITH_NULL_SHA256:
-        case CipherSuite.TLS_PSK_WITH_NULL_SHA384:
-        case CipherSuite.TLS_PSK_WITH_RC4_128_SHA:
-        case CipherSuite.TLS_PSK_WITH_SALSA20_SHA1:
-            return null;
-
-        case CipherSuite.TLS_RSA_PSK_WITH_3DES_EDE_CBC_SHA:
-        case CipherSuite.TLS_RSA_PSK_WITH_AES_128_CBC_SHA:
-        case CipherSuite.TLS_RSA_PSK_WITH_AES_128_CBC_SHA256:
-        case CipherSuite.TLS_RSA_PSK_WITH_AES_128_GCM_SHA256:
-        case CipherSuite.TLS_RSA_PSK_WITH_AES_256_CBC_SHA:
-        case CipherSuite.TLS_RSA_PSK_WITH_AES_256_CBC_SHA384:
-        case CipherSuite.TLS_RSA_PSK_WITH_AES_256_GCM_SHA384:
-        case CipherSuite.TLS_RSA_PSK_WITH_ESTREAM_SALSA20_SHA1:
-        case CipherSuite.TLS_RSA_PSK_WITH_NULL_SHA:
-        case CipherSuite.TLS_RSA_PSK_WITH_NULL_SHA256:
-        case CipherSuite.TLS_RSA_PSK_WITH_NULL_SHA384:
-        case CipherSuite.TLS_RSA_PSK_WITH_RC4_128_SHA:
-        case CipherSuite.TLS_RSA_PSK_WITH_SALSA20_SHA1:
-            return getRSAEncryptionCredentials();
-
-        default:
-            /* Note: internal error here; selected a key exchange we don't implement! */
-            throw new TlsFatalAlert(AlertDescription.internal_error);
-        }
-    }
-
-    public TlsKeyExchange getKeyExchange() throws IOException
-    {
-        switch (selectedCipherSuite)
-        {
-        case CipherSuite.TLS_DHE_PSK_WITH_3DES_EDE_CBC_SHA:
-        case CipherSuite.TLS_DHE_PSK_WITH_AES_128_CBC_SHA:
-        case CipherSuite.TLS_DHE_PSK_WITH_AES_128_CBC_SHA256:
-        case CipherSuite.TLS_DHE_PSK_WITH_AES_128_CCM:
-        case CipherSuite.TLS_DHE_PSK_WITH_AES_128_GCM_SHA256:
-        case CipherSuite.TLS_DHE_PSK_WITH_AES_256_CBC_SHA:
-        case CipherSuite.TLS_DHE_PSK_WITH_AES_256_CBC_SHA384:
-        case CipherSuite.TLS_DHE_PSK_WITH_AES_256_CCM:
-        case CipherSuite.TLS_DHE_PSK_WITH_AES_256_GCM_SHA384:
-        case CipherSuite.TLS_DHE_PSK_WITH_CAMELLIA_128_CBC_SHA256:
-        case CipherSuite.TLS_DHE_PSK_WITH_CAMELLIA_128_GCM_SHA256:
-        case CipherSuite.TLS_DHE_PSK_WITH_CAMELLIA_256_CBC_SHA384:
-        case CipherSuite.TLS_DHE_PSK_WITH_CAMELLIA_256_GCM_SHA384:
-        case CipherSuite.TLS_DHE_PSK_WITH_ESTREAM_SALSA20_SHA1:
-        case CipherSuite.TLS_DHE_PSK_WITH_NULL_SHA:
-        case CipherSuite.TLS_DHE_PSK_WITH_NULL_SHA256:
-        case CipherSuite.TLS_DHE_PSK_WITH_NULL_SHA384:
-        case CipherSuite.TLS_DHE_PSK_WITH_RC4_128_SHA:
-        case CipherSuite.TLS_DHE_PSK_WITH_SALSA20_SHA1:
-        case CipherSuite.TLS_PSK_DHE_WITH_AES_128_CCM_8:
-        case CipherSuite.TLS_PSK_DHE_WITH_AES_256_CCM_8:
-            return createPSKKeyExchange(KeyExchangeAlgorithm.DHE_PSK);
-
-        case CipherSuite.TLS_ECDHE_PSK_WITH_3DES_EDE_CBC_SHA:
-        case CipherSuite.TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA:
-        case CipherSuite.TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA256:
-        case CipherSuite.TLS_ECDHE_PSK_WITH_AES_256_CBC_SHA:
-        case CipherSuite.TLS_ECDHE_PSK_WITH_AES_256_CBC_SHA384:
-        case CipherSuite.TLS_ECDHE_PSK_WITH_CAMELLIA_128_CBC_SHA256:
-        case CipherSuite.TLS_ECDHE_PSK_WITH_CAMELLIA_256_CBC_SHA384:
-        case CipherSuite.TLS_ECDHE_PSK_WITH_ESTREAM_SALSA20_SHA1:
-        case CipherSuite.TLS_ECDHE_PSK_WITH_NULL_SHA:
-        case CipherSuite.TLS_ECDHE_PSK_WITH_NULL_SHA256:
-        case CipherSuite.TLS_ECDHE_PSK_WITH_NULL_SHA384:
-        case CipherSuite.TLS_ECDHE_PSK_WITH_RC4_128_SHA:
-        case CipherSuite.TLS_ECDHE_PSK_WITH_SALSA20_SHA1:
-            return createPSKKeyExchange(KeyExchangeAlgorithm.ECDHE_PSK);
-
-        case CipherSuite.TLS_PSK_WITH_3DES_EDE_CBC_SHA:
-        case CipherSuite.TLS_PSK_WITH_AES_128_CBC_SHA:
-        case CipherSuite.TLS_PSK_WITH_AES_128_CBC_SHA256:
-        case CipherSuite.TLS_PSK_WITH_AES_128_CCM:
-        case CipherSuite.TLS_PSK_WITH_AES_128_CCM_8:
-        case CipherSuite.TLS_PSK_WITH_AES_128_GCM_SHA256:
-        case CipherSuite.TLS_PSK_WITH_AES_256_CBC_SHA:
-        case CipherSuite.TLS_PSK_WITH_AES_256_CBC_SHA384:
-        case CipherSuite.TLS_PSK_WITH_AES_256_CCM:
-        case CipherSuite.TLS_PSK_WITH_AES_256_CCM_8:
-        case CipherSuite.TLS_PSK_WITH_AES_256_GCM_SHA384:
-        case CipherSuite.TLS_PSK_WITH_CAMELLIA_128_CBC_SHA256:
-        case CipherSuite.TLS_PSK_WITH_CAMELLIA_128_GCM_SHA256:
-        case CipherSuite.TLS_PSK_WITH_CAMELLIA_256_CBC_SHA384:
-        case CipherSuite.TLS_PSK_WITH_CAMELLIA_256_GCM_SHA384:
-        case CipherSuite.TLS_PSK_WITH_ESTREAM_SALSA20_SHA1:
-        case CipherSuite.TLS_PSK_WITH_NULL_SHA:
-        case CipherSuite.TLS_PSK_WITH_NULL_SHA256:
-        case CipherSuite.TLS_PSK_WITH_NULL_SHA384:
-        case CipherSuite.TLS_PSK_WITH_RC4_128_SHA:
-        case CipherSuite.TLS_PSK_WITH_SALSA20_SHA1:
-            return createPSKKeyExchange(KeyExchangeAlgorithm.PSK);
-
-        case CipherSuite.TLS_RSA_PSK_WITH_3DES_EDE_CBC_SHA:
-        case CipherSuite.TLS_RSA_PSK_WITH_AES_128_CBC_SHA:
-        case CipherSuite.TLS_RSA_PSK_WITH_AES_128_CBC_SHA256:
-        case CipherSuite.TLS_RSA_PSK_WITH_AES_128_GCM_SHA256:
-        case CipherSuite.TLS_RSA_PSK_WITH_AES_256_CBC_SHA:
-        case CipherSuite.TLS_RSA_PSK_WITH_AES_256_CBC_SHA384:
-        case CipherSuite.TLS_RSA_PSK_WITH_AES_256_GCM_SHA384:
-        case CipherSuite.TLS_RSA_PSK_WITH_CAMELLIA_128_CBC_SHA256:
-        case CipherSuite.TLS_RSA_PSK_WITH_CAMELLIA_128_GCM_SHA256:
-        case CipherSuite.TLS_RSA_PSK_WITH_CAMELLIA_256_CBC_SHA384:
-        case CipherSuite.TLS_RSA_PSK_WITH_CAMELLIA_256_GCM_SHA384:
-        case CipherSuite.TLS_RSA_PSK_WITH_ESTREAM_SALSA20_SHA1:
-        case CipherSuite.TLS_RSA_PSK_WITH_NULL_SHA:
-        case CipherSuite.TLS_RSA_PSK_WITH_NULL_SHA256:
-        case CipherSuite.TLS_RSA_PSK_WITH_NULL_SHA384:
-        case CipherSuite.TLS_RSA_PSK_WITH_RC4_128_SHA:
-        case CipherSuite.TLS_RSA_PSK_WITH_SALSA20_SHA1:
-            return createPSKKeyExchange(KeyExchangeAlgorithm.RSA_PSK);
-
-        default:
-            /*
-             * Note: internal error here; the TlsProtocol implementation verifies that the
-             * server-selected cipher suite was in the list of client-offered cipher suites, so if
-             * we now can't produce an implementation, we shouldn't have offered it!
-             */
-            throw new TlsFatalAlert(AlertDescription.internal_error);
-        }
-    }
-
-    public TlsCipher getCipher() throws IOException
-    {
-        switch (selectedCipherSuite)
-        {
-        case CipherSuite.TLS_DHE_PSK_WITH_3DES_EDE_CBC_SHA:
-        case CipherSuite.TLS_ECDHE_PSK_WITH_3DES_EDE_CBC_SHA:
-        case CipherSuite.TLS_PSK_WITH_3DES_EDE_CBC_SHA:
-        case CipherSuite.TLS_RSA_PSK_WITH_3DES_EDE_CBC_SHA:
-            return cipherFactory.createCipher(context, EncryptionAlgorithm._3DES_EDE_CBC, MACAlgorithm.hmac_sha1);
-
-        case CipherSuite.TLS_DHE_PSK_WITH_AES_128_CBC_SHA:
-        case CipherSuite.TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA:
-        case CipherSuite.TLS_PSK_WITH_AES_128_CBC_SHA:
-        case CipherSuite.TLS_RSA_PSK_WITH_AES_128_CBC_SHA:
-            return cipherFactory.createCipher(context, EncryptionAlgorithm.AES_128_CBC, MACAlgorithm.hmac_sha1);
-
-        case CipherSuite.TLS_DHE_PSK_WITH_AES_128_CBC_SHA256:
-        case CipherSuite.TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA256:
-        case CipherSuite.TLS_PSK_WITH_AES_128_CBC_SHA256:
-        case CipherSuite.TLS_RSA_PSK_WITH_AES_128_CBC_SHA256:
-            return cipherFactory.createCipher(context, EncryptionAlgorithm.AES_128_CBC, MACAlgorithm.hmac_sha256);
-
-        case CipherSuite.TLS_DHE_PSK_WITH_AES_128_CCM:
-        case CipherSuite.TLS_PSK_WITH_AES_128_CCM:
-            return cipherFactory.createCipher(context, EncryptionAlgorithm.AES_128_CCM, MACAlgorithm._null);
-
-        case CipherSuite.TLS_PSK_DHE_WITH_AES_128_CCM_8:
-        case CipherSuite.TLS_PSK_WITH_AES_128_CCM_8:
-            return cipherFactory.createCipher(context, EncryptionAlgorithm.AES_128_CCM_8, MACAlgorithm._null);
-
-        case CipherSuite.TLS_DHE_PSK_WITH_AES_128_GCM_SHA256:
-        case CipherSuite.TLS_PSK_WITH_AES_128_GCM_SHA256:
-        case CipherSuite.TLS_RSA_PSK_WITH_AES_128_GCM_SHA256:
-            return cipherFactory.createCipher(context, EncryptionAlgorithm.AES_128_GCM, MACAlgorithm._null);
-
-        case CipherSuite.TLS_DHE_PSK_WITH_AES_256_CBC_SHA:
-        case CipherSuite.TLS_ECDHE_PSK_WITH_AES_256_CBC_SHA:
-        case CipherSuite.TLS_PSK_WITH_AES_256_CBC_SHA:
-        case CipherSuite.TLS_RSA_PSK_WITH_AES_256_CBC_SHA:
-            return cipherFactory.createCipher(context, EncryptionAlgorithm.AES_256_CBC, MACAlgorithm.hmac_sha1);
-
-        case CipherSuite.TLS_DHE_PSK_WITH_AES_256_CBC_SHA384:
-        case CipherSuite.TLS_ECDHE_PSK_WITH_AES_256_CBC_SHA384:
-        case CipherSuite.TLS_PSK_WITH_AES_256_CBC_SHA384:
-        case CipherSuite.TLS_RSA_PSK_WITH_AES_256_CBC_SHA384:
-            return cipherFactory.createCipher(context, EncryptionAlgorithm.AES_256_CBC, MACAlgorithm.hmac_sha384);
-
-        case CipherSuite.TLS_DHE_PSK_WITH_AES_256_CCM:
-        case CipherSuite.TLS_PSK_WITH_AES_256_CCM:
-            return cipherFactory.createCipher(context, EncryptionAlgorithm.AES_256_CCM, MACAlgorithm._null);
-
-        case CipherSuite.TLS_PSK_DHE_WITH_AES_256_CCM_8:
-        case CipherSuite.TLS_PSK_WITH_AES_256_CCM_8:
-            return cipherFactory.createCipher(context, EncryptionAlgorithm.AES_256_CCM_8, MACAlgorithm._null);
-
-        case CipherSuite.TLS_DHE_PSK_WITH_AES_256_GCM_SHA384:
-        case CipherSuite.TLS_PSK_WITH_AES_256_GCM_SHA384:
-        case CipherSuite.TLS_RSA_PSK_WITH_AES_256_GCM_SHA384:
-            return cipherFactory.createCipher(context, EncryptionAlgorithm.AES_256_GCM, MACAlgorithm._null);
-
-        case CipherSuite.TLS_DHE_PSK_WITH_CAMELLIA_128_CBC_SHA256:
-        case CipherSuite.TLS_ECDHE_PSK_WITH_CAMELLIA_128_CBC_SHA256:
-        case CipherSuite.TLS_PSK_WITH_CAMELLIA_128_CBC_SHA256:
-        case CipherSuite.TLS_RSA_PSK_WITH_CAMELLIA_128_CBC_SHA256:
-            return cipherFactory.createCipher(context, EncryptionAlgorithm.CAMELLIA_128_CBC, MACAlgorithm.hmac_sha256);
-
-        case CipherSuite.TLS_DHE_PSK_WITH_CAMELLIA_128_GCM_SHA256:
-        case CipherSuite.TLS_PSK_WITH_CAMELLIA_128_GCM_SHA256:
-        case CipherSuite.TLS_RSA_PSK_WITH_CAMELLIA_128_GCM_SHA256:
-            return cipherFactory.createCipher(context, EncryptionAlgorithm.CAMELLIA_128_GCM, MACAlgorithm._null);
-
-        case CipherSuite.TLS_DHE_PSK_WITH_CAMELLIA_256_CBC_SHA384:
-        case CipherSuite.TLS_ECDHE_PSK_WITH_CAMELLIA_256_CBC_SHA384:
-        case CipherSuite.TLS_PSK_WITH_CAMELLIA_256_CBC_SHA384:
-        case CipherSuite.TLS_RSA_PSK_WITH_CAMELLIA_256_CBC_SHA384:
-            return cipherFactory.createCipher(context, EncryptionAlgorithm.CAMELLIA_256_CBC, MACAlgorithm.hmac_sha384);
-
-        case CipherSuite.TLS_DHE_PSK_WITH_CAMELLIA_256_GCM_SHA384:
-        case CipherSuite.TLS_PSK_WITH_CAMELLIA_256_GCM_SHA384:
-        case CipherSuite.TLS_RSA_PSK_WITH_CAMELLIA_256_GCM_SHA384:
-            return cipherFactory.createCipher(context, EncryptionAlgorithm.CAMELLIA_256_GCM, MACAlgorithm._null);
-
-        case CipherSuite.TLS_DHE_PSK_WITH_ESTREAM_SALSA20_SHA1:
-        case CipherSuite.TLS_ECDHE_PSK_WITH_ESTREAM_SALSA20_SHA1:
-        case CipherSuite.TLS_PSK_WITH_ESTREAM_SALSA20_SHA1:
-        case CipherSuite.TLS_RSA_PSK_WITH_ESTREAM_SALSA20_SHA1:
-            return cipherFactory.createCipher(context, EncryptionAlgorithm.ESTREAM_SALSA20, MACAlgorithm.hmac_sha1);
-
-        case CipherSuite.TLS_DHE_PSK_WITH_NULL_SHA:
-        case CipherSuite.TLS_ECDHE_PSK_WITH_NULL_SHA:
-        case CipherSuite.TLS_PSK_WITH_NULL_SHA:
-        case CipherSuite.TLS_RSA_PSK_WITH_NULL_SHA:
-            return cipherFactory.createCipher(context, EncryptionAlgorithm.NULL, MACAlgorithm.hmac_sha1);
-
-        case CipherSuite.TLS_DHE_PSK_WITH_NULL_SHA256:
-        case CipherSuite.TLS_ECDHE_PSK_WITH_NULL_SHA256:
-        case CipherSuite.TLS_PSK_WITH_NULL_SHA256:
-        case CipherSuite.TLS_RSA_PSK_WITH_NULL_SHA256:
-            return cipherFactory.createCipher(context, EncryptionAlgorithm.NULL, MACAlgorithm.hmac_sha256);
-
-        case CipherSuite.TLS_DHE_PSK_WITH_NULL_SHA384:
-        case CipherSuite.TLS_ECDHE_PSK_WITH_NULL_SHA384:
-        case CipherSuite.TLS_PSK_WITH_NULL_SHA384:
-        case CipherSuite.TLS_RSA_PSK_WITH_NULL_SHA384:
-            return cipherFactory.createCipher(context, EncryptionAlgorithm.NULL, MACAlgorithm.hmac_sha384);
-
-        case CipherSuite.TLS_DHE_PSK_WITH_RC4_128_SHA:
-        case CipherSuite.TLS_ECDHE_PSK_WITH_RC4_128_SHA:
-        case CipherSuite.TLS_PSK_WITH_RC4_128_SHA:
-        case CipherSuite.TLS_RSA_PSK_WITH_RC4_128_SHA:
-            return cipherFactory.createCipher(context, EncryptionAlgorithm.RC4_128, MACAlgorithm.hmac_sha1);
-
-        case CipherSuite.TLS_DHE_PSK_WITH_SALSA20_SHA1:
-        case CipherSuite.TLS_ECDHE_PSK_WITH_SALSA20_SHA1:
-        case CipherSuite.TLS_PSK_WITH_SALSA20_SHA1:
-        case CipherSuite.TLS_RSA_PSK_WITH_SALSA20_SHA1:
-            return cipherFactory.createCipher(context, EncryptionAlgorithm.SALSA20, MACAlgorithm.hmac_sha1);
-
-        default:
-            /*
-             * Note: internal error here; the TlsProtocol implementation verifies that the
-             * server-selected cipher suite was in the list of client-offered cipher suites, so if
-             * we now can't produce an implementation, we shouldn't have offered it!
-             */
-            throw new TlsFatalAlert(AlertDescription.internal_error);
-        }
-    }
-
-    protected TlsKeyExchange createPSKKeyExchange(int keyExchange)
-    {
-        return new TlsPSKKeyExchange(keyExchange, supportedSignatureAlgorithms, null, pskIdentityManager,
-            getDHParameters(), namedCurves, clientECPointFormats, serverECPointFormats);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/ProtocolVersion.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/ProtocolVersion.java
deleted file mode 100644
index 8be2bec..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/ProtocolVersion.java
+++ /dev/null
@@ -1,158 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-import java.io.IOException;
-
-import org.bouncycastle.util.Strings;
-
-public final class ProtocolVersion
-{
-    public static final ProtocolVersion SSLv3 = new ProtocolVersion(0x0300, "SSL 3.0");
-    public static final ProtocolVersion TLSv10 = new ProtocolVersion(0x0301, "TLS 1.0");
-    public static final ProtocolVersion TLSv11 = new ProtocolVersion(0x0302, "TLS 1.1");
-    public static final ProtocolVersion TLSv12 = new ProtocolVersion(0x0303, "TLS 1.2");
-    public static final ProtocolVersion DTLSv10 = new ProtocolVersion(0xFEFF, "DTLS 1.0");
-    public static final ProtocolVersion DTLSv12 = new ProtocolVersion(0xFEFD, "DTLS 1.2");
-
-    private int version;
-    private String name;
-
-    private ProtocolVersion(int v, String name)
-    {
-        this.version = v & 0xffff;
-        this.name = name;
-    }
-
-    public int getFullVersion()
-    {
-        return version;
-    }
-
-    public int getMajorVersion()
-    {
-        return version >> 8;
-    }
-
-    public int getMinorVersion()
-    {
-        return version & 0xff;
-    }
-
-    public boolean isDTLS()
-    {
-        return getMajorVersion() == 0xFE;
-    }
-
-    public boolean isSSL()
-    {
-        return this == SSLv3;
-    }
-
-    public boolean isTLS()
-    {
-        return getMajorVersion() == 0x03;
-    }
-
-    public ProtocolVersion getEquivalentTLSVersion()
-    {
-        if (!isDTLS())
-        {
-            return this;
-        }
-        if (this == DTLSv10)
-        {
-            return TLSv11;
-        }
-        return TLSv12;
-    }
-
-    public boolean isEqualOrEarlierVersionOf(ProtocolVersion version)
-    {
-        if (getMajorVersion() != version.getMajorVersion())
-        {
-            return false;
-        }
-        int diffMinorVersion = version.getMinorVersion() - getMinorVersion();
-        return isDTLS() ? diffMinorVersion <= 0 : diffMinorVersion >= 0;
-    }
-
-    public boolean isLaterVersionOf(ProtocolVersion version)
-    {
-        if (getMajorVersion() != version.getMajorVersion())
-        {
-            return false;
-        }
-        int diffMinorVersion = version.getMinorVersion() - getMinorVersion();
-        return isDTLS() ? diffMinorVersion > 0 : diffMinorVersion < 0;
-    }
-
-    public boolean equals(Object other)
-    {
-        return this == other || (other instanceof ProtocolVersion && equals((ProtocolVersion)other));
-    }
-
-    public boolean equals(ProtocolVersion other)
-    {
-        return other != null && this.version == other.version;
-    }
-
-    public int hashCode()
-    {
-        return version;
-    }
-
-    public static ProtocolVersion get(int major, int minor)
-        throws IOException
-    {
-        switch (major)
-        {
-        case 0x03:
-        {
-            switch (minor)
-            {
-            case 0x00:
-                return SSLv3;
-            case 0x01:
-                return TLSv10;
-            case 0x02:
-                return TLSv11;
-            case 0x03:
-                return TLSv12;
-            }
-            return getUnknownVersion(major, minor, "TLS");
-        }
-        case 0xFE:
-        {
-            switch (minor)
-            {
-            case 0xFF:
-                return DTLSv10;
-            case 0xFE:
-                throw new TlsFatalAlert(AlertDescription.illegal_parameter);
-            case 0xFD:
-                return DTLSv12;
-            }
-            return getUnknownVersion(major, minor, "DTLS");
-        }
-        default:
-        {
-            throw new TlsFatalAlert(AlertDescription.illegal_parameter);
-        }
-        }
-    }
-
-    public String toString()
-    {
-        return name;
-    }
-
-    private static ProtocolVersion getUnknownVersion(int major, int minor, String prefix)
-        throws IOException
-    {
-        TlsUtils.checkUint8(major);
-        TlsUtils.checkUint8(minor);
-
-        int v = (major << 8) | minor;
-        String hex = Strings.toUpperCase(Integer.toHexString(0x10000 | v).substring(1));
-        return new ProtocolVersion(v, prefix + " 0x" + hex);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/RecordStream.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/RecordStream.java
deleted file mode 100644
index 5e28658..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/RecordStream.java
+++ /dev/null
@@ -1,363 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-/**
- * An implementation of the TLS 1.0/1.1/1.2 record layer, allowing downgrade to SSLv3.
- */
-class RecordStream
-{
-    private static int DEFAULT_PLAINTEXT_LIMIT = (1 << 14);
-
-    private TlsProtocol handler;
-    private InputStream input;
-    private OutputStream output;
-    private TlsCompression pendingCompression = null, readCompression = null, writeCompression = null;
-    private TlsCipher pendingCipher = null, readCipher = null, writeCipher = null;
-    private long readSeqNo = 0, writeSeqNo = 0;
-    private ByteArrayOutputStream buffer = new ByteArrayOutputStream();
-
-    private TlsHandshakeHash handshakeHash = null;
-
-    private ProtocolVersion readVersion = null, writeVersion = null;
-    private boolean restrictReadVersion = true;
-
-    private int plaintextLimit, compressedLimit, ciphertextLimit;
-
-    RecordStream(TlsProtocol handler, InputStream input, OutputStream output)
-    {
-        this.handler = handler;
-        this.input = input;
-        this.output = output;
-        this.readCompression = new TlsNullCompression();
-        this.writeCompression = this.readCompression;
-    }
-
-    void init(TlsContext context)
-    {
-        this.readCipher = new TlsNullCipher(context);
-        this.writeCipher = this.readCipher;
-        this.handshakeHash = new DeferredHash();
-        this.handshakeHash.init(context);
-
-        setPlaintextLimit(DEFAULT_PLAINTEXT_LIMIT);
-    }
-
-    int getPlaintextLimit()
-    {
-        return plaintextLimit;
-    }
-
-    void setPlaintextLimit(int plaintextLimit)
-    {
-        this.plaintextLimit = plaintextLimit;
-        this.compressedLimit = this.plaintextLimit + 1024;
-        this.ciphertextLimit = this.compressedLimit + 1024;
-    }
-
-    ProtocolVersion getReadVersion()
-    {
-        return readVersion;
-    }
-
-    void setReadVersion(ProtocolVersion readVersion)
-    {
-        this.readVersion = readVersion;
-    }
-
-    void setWriteVersion(ProtocolVersion writeVersion)
-    {
-        this.writeVersion = writeVersion;
-    }
-
-    /**
-     * RFC 5246 E.1. "Earlier versions of the TLS specification were not fully clear on what the
-     * record layer version number (TLSPlaintext.version) should contain when sending ClientHello
-     * (i.e., before it is known which version of the protocol will be employed). Thus, TLS servers
-     * compliant with this specification MUST accept any value {03,XX} as the record layer version
-     * number for ClientHello."
-     */
-    void setRestrictReadVersion(boolean enabled)
-    {
-        this.restrictReadVersion = enabled;
-    }
-
-    void setPendingConnectionState(TlsCompression tlsCompression, TlsCipher tlsCipher)
-    {
-        this.pendingCompression = tlsCompression;
-        this.pendingCipher = tlsCipher;
-    }
-
-    void sentWriteCipherSpec()
-        throws IOException
-    {
-        if (pendingCompression == null || pendingCipher == null)
-        {
-            throw new TlsFatalAlert(AlertDescription.handshake_failure);
-        }
-        this.writeCompression = this.pendingCompression;
-        this.writeCipher = this.pendingCipher;
-        this.writeSeqNo = 0;
-    }
-
-    void receivedReadCipherSpec()
-        throws IOException
-    {
-        if (pendingCompression == null || pendingCipher == null)
-        {
-            throw new TlsFatalAlert(AlertDescription.handshake_failure);
-        }
-        this.readCompression = this.pendingCompression;
-        this.readCipher = this.pendingCipher;
-        this.readSeqNo = 0;
-    }
-
-    void finaliseHandshake()
-        throws IOException
-    {
-        if (readCompression != pendingCompression || writeCompression != pendingCompression
-            || readCipher != pendingCipher || writeCipher != pendingCipher)
-        {
-            throw new TlsFatalAlert(AlertDescription.handshake_failure);
-        }
-        this.pendingCompression = null;
-        this.pendingCipher = null;
-    }
-
-    boolean readRecord()
-        throws IOException
-    {
-        byte[] recordHeader = TlsUtils.readAllOrNothing(5, input);
-        if (recordHeader == null)
-        {
-            return false;
-        }
-
-        short type = TlsUtils.readUint8(recordHeader, 0);
-
-        /*
-         * RFC 5246 6. If a TLS implementation receives an unexpected record type, it MUST send an
-         * unexpected_message alert.
-         */
-        checkType(type, AlertDescription.unexpected_message);
-
-        if (!restrictReadVersion)
-        {
-            int version = TlsUtils.readVersionRaw(recordHeader, 1);
-            if ((version & 0xffffff00) != 0x0300)
-            {
-                throw new TlsFatalAlert(AlertDescription.illegal_parameter);
-            }
-        }
-        else
-        {
-            ProtocolVersion version = TlsUtils.readVersion(recordHeader, 1);
-            if (readVersion == null)
-            {
-                readVersion = version;
-            }
-            else if (!version.equals(readVersion))
-            {
-                throw new TlsFatalAlert(AlertDescription.illegal_parameter);
-            }
-        }
-
-        int length = TlsUtils.readUint16(recordHeader, 3);
-        byte[] plaintext = decodeAndVerify(type, input, length);
-        handler.processRecord(type, plaintext, 0, plaintext.length);
-        return true;
-    }
-
-    byte[] decodeAndVerify(short type, InputStream input, int len)
-        throws IOException
-    {
-        checkLength(len, ciphertextLimit, AlertDescription.record_overflow);
-
-        byte[] buf = TlsUtils.readFully(len, input);
-        byte[] decoded = readCipher.decodeCiphertext(readSeqNo++, type, buf, 0, buf.length);
-
-        checkLength(decoded.length, compressedLimit, AlertDescription.record_overflow);
-
-        /*
-         * TODO RFC5264 6.2.2. Implementation note: Decompression functions are responsible for
-         * ensuring that messages cannot cause internal buffer overflows.
-         */
-        OutputStream cOut = readCompression.decompress(buffer);
-        if (cOut != buffer)
-        {
-            cOut.write(decoded, 0, decoded.length);
-            cOut.flush();
-            decoded = getBufferContents();
-        }
-
-        /*
-         * RFC 5264 6.2.2. If the decompression function encounters a TLSCompressed.fragment that
-         * would decompress to a length in excess of 2^14 bytes, it should report a fatal
-         * decompression failure error.
-         */
-        checkLength(decoded.length, plaintextLimit, AlertDescription.decompression_failure);
-
-        /*
-         * RFC 5264 6.2.1 Implementations MUST NOT send zero-length fragments of Handshake, Alert,
-         * or ChangeCipherSpec content types.
-         */
-        if (decoded.length < 1 && type != ContentType.application_data)
-        {
-            throw new TlsFatalAlert(AlertDescription.illegal_parameter);
-        }
-
-        return decoded;
-    }
-
-    void writeRecord(short type, byte[] plaintext, int plaintextOffset, int plaintextLength)
-        throws IOException
-    {
-        // Never send anything until a valid ClientHello has been received
-        if (writeVersion == null)
-        {
-            return;
-        }
-
-        /*
-         * RFC 5264 6. Implementations MUST NOT send record types not defined in this document
-         * unless negotiated by some extension.
-         */
-        checkType(type, AlertDescription.internal_error);
-
-        /*
-         * RFC 5264 6.2.1 The length should not exceed 2^14.
-         */
-        checkLength(plaintextLength, plaintextLimit, AlertDescription.internal_error);
-
-        /*
-         * RFC 5264 6.2.1 Implementations MUST NOT send zero-length fragments of Handshake, Alert,
-         * or ChangeCipherSpec content types.
-         */
-        if (plaintextLength < 1 && type != ContentType.application_data)
-        {
-            throw new TlsFatalAlert(AlertDescription.internal_error);
-        }
-
-        if (type == ContentType.handshake)
-        {
-            updateHandshakeData(plaintext, plaintextOffset, plaintextLength);
-        }
-
-        OutputStream cOut = writeCompression.compress(buffer);
-
-        byte[] ciphertext;
-        if (cOut == buffer)
-        {
-            ciphertext = writeCipher.encodePlaintext(writeSeqNo++, type, plaintext, plaintextOffset, plaintextLength);
-        }
-        else
-        {
-            cOut.write(plaintext, plaintextOffset, plaintextLength);
-            cOut.flush();
-            byte[] compressed = getBufferContents();
-
-            /*
-             * RFC5264 6.2.2. Compression must be lossless and may not increase the content length
-             * by more than 1024 bytes.
-             */
-            checkLength(compressed.length, plaintextLength + 1024, AlertDescription.internal_error);
-
-            ciphertext = writeCipher.encodePlaintext(writeSeqNo++, type, compressed, 0, compressed.length);
-        }
-
-        /*
-         * RFC 5264 6.2.3. The length may not exceed 2^14 + 2048.
-         */
-        checkLength(ciphertext.length, ciphertextLimit, AlertDescription.internal_error);
-
-        byte[] record = new byte[ciphertext.length + 5];
-        TlsUtils.writeUint8(type, record, 0);
-        TlsUtils.writeVersion(writeVersion, record, 1);
-        TlsUtils.writeUint16(ciphertext.length, record, 3);
-        System.arraycopy(ciphertext, 0, record, 5, ciphertext.length);
-        output.write(record);
-        output.flush();
-    }
-
-    void notifyHelloComplete()
-    {
-        this.handshakeHash = handshakeHash.notifyPRFDetermined();
-    }
-
-    TlsHandshakeHash getHandshakeHash()
-    {
-        return handshakeHash;
-    }
-
-    TlsHandshakeHash prepareToFinish()
-    {
-        TlsHandshakeHash result = handshakeHash;
-        this.handshakeHash = handshakeHash.stopTracking();
-        return result;
-    }
-
-    void updateHandshakeData(byte[] message, int offset, int len)
-    {
-        handshakeHash.update(message, offset, len);
-    }
-
-    void safeClose()
-    {
-        try
-        {
-            input.close();
-        }
-        catch (IOException e)
-        {
-        }
-
-        try
-        {
-            output.close();
-        }
-        catch (IOException e)
-        {
-        }
-    }
-
-    void flush()
-        throws IOException
-    {
-        output.flush();
-    }
-
-    private byte[] getBufferContents()
-    {
-        byte[] contents = buffer.toByteArray();
-        buffer.reset();
-        return contents;
-    }
-
-    private static void checkType(short type, short alertDescription)
-        throws IOException
-    {
-        switch (type)
-        {
-        case ContentType.application_data:
-        case ContentType.alert:
-        case ContentType.change_cipher_spec:
-        case ContentType.handshake:
-        case ContentType.heartbeat:
-            break;
-        default:
-            throw new TlsFatalAlert(alertDescription);
-        }
-    }
-
-    private static void checkLength(int length, int limit, short alertDescription)
-        throws IOException
-    {
-        if (length > limit)
-        {
-            throw new TlsFatalAlert(alertDescription);
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/SRPTlsClient.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/SRPTlsClient.java
deleted file mode 100644
index 15e8fe2..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/SRPTlsClient.java
+++ /dev/null
@@ -1,145 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-import java.io.IOException;
-import java.util.Hashtable;
-
-import org.bouncycastle.util.Arrays;
-
-public class SRPTlsClient
-    extends AbstractTlsClient
-{
-    protected TlsSRPGroupVerifier groupVerifier;
-
-    protected byte[] identity;
-    protected byte[] password;
-
-    public SRPTlsClient(byte[] identity, byte[] password)
-    {
-        this(new DefaultTlsCipherFactory(), new DefaultTlsSRPGroupVerifier(), identity, password);
-    }
-
-    public SRPTlsClient(TlsCipherFactory cipherFactory, byte[] identity, byte[] password)
-    {
-        this(cipherFactory, new DefaultTlsSRPGroupVerifier(), identity, password);
-    }
-
-    public SRPTlsClient(TlsCipherFactory cipherFactory, TlsSRPGroupVerifier groupVerifier,
-        byte[] identity, byte[] password)
-    {
-        super(cipherFactory);
-        this.groupVerifier = groupVerifier;
-        this.identity = Arrays.clone(identity);
-        this.password = Arrays.clone(password);
-    }
-
-    protected boolean requireSRPServerExtension()
-    {
-        // No explicit guidance in RFC 5054; by default an (empty) extension from server is optional
-        return false;
-    }
-
-    public int[] getCipherSuites()
-    {
-        return new int[]
-        {
-            CipherSuite.TLS_SRP_SHA_RSA_WITH_AES_128_CBC_SHA
-        };
-    }
-
-    public Hashtable getClientExtensions()
-        throws IOException
-    {
-        Hashtable clientExtensions = TlsExtensionsUtils.ensureExtensionsInitialised(super.getClientExtensions());
-        TlsSRPUtils.addSRPExtension(clientExtensions, this.identity);
-        return clientExtensions;
-    }
-
-    public void processServerExtensions(Hashtable serverExtensions)
-        throws IOException
-    {
-        if (!TlsUtils.hasExpectedEmptyExtensionData(serverExtensions, TlsSRPUtils.EXT_SRP,
-            AlertDescription.illegal_parameter))
-        {
-            if (requireSRPServerExtension())
-            {
-                throw new TlsFatalAlert(AlertDescription.illegal_parameter);
-            }
-        }
-
-        super.processServerExtensions(serverExtensions);
-    }
-
-    public TlsKeyExchange getKeyExchange()
-        throws IOException
-    {
-        switch (selectedCipherSuite)
-        {
-        case CipherSuite.TLS_SRP_SHA_WITH_3DES_EDE_CBC_SHA:
-        case CipherSuite.TLS_SRP_SHA_WITH_AES_128_CBC_SHA:
-        case CipherSuite.TLS_SRP_SHA_WITH_AES_256_CBC_SHA:
-            return createSRPKeyExchange(KeyExchangeAlgorithm.SRP);
-
-        case CipherSuite.TLS_SRP_SHA_RSA_WITH_3DES_EDE_CBC_SHA:
-        case CipherSuite.TLS_SRP_SHA_RSA_WITH_AES_128_CBC_SHA:
-        case CipherSuite.TLS_SRP_SHA_RSA_WITH_AES_256_CBC_SHA:
-            return createSRPKeyExchange(KeyExchangeAlgorithm.SRP_RSA);
-
-        case CipherSuite.TLS_SRP_SHA_DSS_WITH_3DES_EDE_CBC_SHA:
-        case CipherSuite.TLS_SRP_SHA_DSS_WITH_AES_128_CBC_SHA:
-        case CipherSuite.TLS_SRP_SHA_DSS_WITH_AES_256_CBC_SHA:
-            return createSRPKeyExchange(KeyExchangeAlgorithm.SRP_DSS);
-
-        default:
-            /*
-             * Note: internal error here; the TlsProtocol implementation verifies that the
-             * server-selected cipher suite was in the list of client-offered cipher suites, so if
-             * we now can't produce an implementation, we shouldn't have offered it!
-             */
-            throw new TlsFatalAlert(AlertDescription.internal_error);
-        }
-    }
-
-    public TlsAuthentication getAuthentication() throws IOException
-    {
-        /*
-         * Note: This method is not called unless a server certificate is sent, which may be the
-         * case e.g. for SRP_DSS or SRP_RSA key exchange.
-         */
-        throw new TlsFatalAlert(AlertDescription.internal_error);
-    }
-
-    public TlsCipher getCipher()
-        throws IOException
-    {
-        switch (selectedCipherSuite)
-        {
-        case CipherSuite.TLS_SRP_SHA_WITH_3DES_EDE_CBC_SHA:
-        case CipherSuite.TLS_SRP_SHA_RSA_WITH_3DES_EDE_CBC_SHA:
-        case CipherSuite.TLS_SRP_SHA_DSS_WITH_3DES_EDE_CBC_SHA:
-            return cipherFactory.createCipher(context, EncryptionAlgorithm._3DES_EDE_CBC, MACAlgorithm.hmac_sha1);
-
-        case CipherSuite.TLS_SRP_SHA_WITH_AES_128_CBC_SHA:
-        case CipherSuite.TLS_SRP_SHA_RSA_WITH_AES_128_CBC_SHA:
-        case CipherSuite.TLS_SRP_SHA_DSS_WITH_AES_128_CBC_SHA:
-            return cipherFactory.createCipher(context, EncryptionAlgorithm.AES_128_CBC, MACAlgorithm.hmac_sha1);
-
-        case CipherSuite.TLS_SRP_SHA_WITH_AES_256_CBC_SHA:
-        case CipherSuite.TLS_SRP_SHA_RSA_WITH_AES_256_CBC_SHA:
-        case CipherSuite.TLS_SRP_SHA_DSS_WITH_AES_256_CBC_SHA:
-            return cipherFactory.createCipher(context, EncryptionAlgorithm.AES_256_CBC, MACAlgorithm.hmac_sha1);
-
-        default:
-            /*
-             * Note: internal error here; the TlsProtocol implementation verifies that the
-             * server-selected cipher suite was in the list of client-offered cipher suites, so if
-             * we now can't produce an implementation, we shouldn't have offered it!
-             */
-            throw new TlsFatalAlert(AlertDescription.internal_error);
-        }
-    }
-
-    protected TlsKeyExchange createSRPKeyExchange(int keyExchange)
-    {
-        return new TlsSRPKeyExchange(keyExchange, supportedSignatureAlgorithms, groupVerifier, identity, password);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/SRPTlsServer.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/SRPTlsServer.java
deleted file mode 100644
index bb8e39a..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/SRPTlsServer.java
+++ /dev/null
@@ -1,166 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-import java.io.IOException;
-import java.util.Hashtable;
-
-public class SRPTlsServer
-    extends AbstractTlsServer
-{
-    protected TlsSRPIdentityManager srpIdentityManager;
-
-    protected byte[] srpIdentity = null;
-    protected TlsSRPLoginParameters loginParameters = null;
-
-    public SRPTlsServer(TlsSRPIdentityManager srpIdentityManager)
-    {
-        this(new DefaultTlsCipherFactory(), srpIdentityManager);
-    }
-
-    public SRPTlsServer(TlsCipherFactory cipherFactory, TlsSRPIdentityManager srpIdentityManager)
-    {
-        super(cipherFactory);
-        this.srpIdentityManager = srpIdentityManager;
-    }
-
-    protected TlsSignerCredentials getDSASignerCredentials()
-        throws IOException
-    {
-        throw new TlsFatalAlert(AlertDescription.internal_error);
-    }
-
-    protected TlsSignerCredentials getRSASignerCredentials()
-        throws IOException
-    {
-        throw new TlsFatalAlert(AlertDescription.internal_error);
-    }
-
-    protected int[] getCipherSuites()
-    {
-        return new int[]
-        {
-            CipherSuite.TLS_SRP_SHA_DSS_WITH_AES_256_CBC_SHA,
-            CipherSuite.TLS_SRP_SHA_DSS_WITH_AES_128_CBC_SHA,
-            CipherSuite.TLS_SRP_SHA_RSA_WITH_AES_256_CBC_SHA,
-            CipherSuite.TLS_SRP_SHA_RSA_WITH_AES_128_CBC_SHA,
-            CipherSuite.TLS_SRP_SHA_WITH_AES_256_CBC_SHA,
-            CipherSuite.TLS_SRP_SHA_WITH_AES_128_CBC_SHA
-        };
-    }
-
-    public void processClientExtensions(Hashtable clientExtensions) throws IOException
-    {
-        super.processClientExtensions(clientExtensions);
-
-        this.srpIdentity = TlsSRPUtils.getSRPExtension(clientExtensions);
-    }
-
-    public int getSelectedCipherSuite() throws IOException
-    {
-        int cipherSuite = super.getSelectedCipherSuite();
-
-        if (TlsSRPUtils.isSRPCipherSuite(cipherSuite))
-        {
-            if (srpIdentity != null)
-            {
-                this.loginParameters = srpIdentityManager.getLoginParameters(srpIdentity);
-            }
-
-            if (loginParameters == null)
-            {
-                throw new TlsFatalAlert(AlertDescription.unknown_psk_identity);
-            }
-        }
-
-        return cipherSuite;
-    }
-
-    public TlsCredentials getCredentials() throws IOException
-    {
-        switch (selectedCipherSuite)
-        {
-        case CipherSuite.TLS_SRP_SHA_WITH_3DES_EDE_CBC_SHA:
-        case CipherSuite.TLS_SRP_SHA_WITH_AES_128_CBC_SHA:
-        case CipherSuite.TLS_SRP_SHA_WITH_AES_256_CBC_SHA:
-            return null;
-
-        case CipherSuite.TLS_SRP_SHA_DSS_WITH_3DES_EDE_CBC_SHA:
-        case CipherSuite.TLS_SRP_SHA_DSS_WITH_AES_128_CBC_SHA:
-        case CipherSuite.TLS_SRP_SHA_DSS_WITH_AES_256_CBC_SHA:
-            return getDSASignerCredentials();
-
-        case CipherSuite.TLS_SRP_SHA_RSA_WITH_3DES_EDE_CBC_SHA:
-        case CipherSuite.TLS_SRP_SHA_RSA_WITH_AES_128_CBC_SHA:
-        case CipherSuite.TLS_SRP_SHA_RSA_WITH_AES_256_CBC_SHA:
-            return getRSASignerCredentials();
-
-        default:
-            /* Note: internal error here; selected a key exchange we don't implement! */
-            throw new TlsFatalAlert(AlertDescription.internal_error);
-        }
-    }
-
-    public TlsKeyExchange getKeyExchange()
-        throws IOException
-    {
-        switch (selectedCipherSuite)
-        {
-        case CipherSuite.TLS_SRP_SHA_WITH_3DES_EDE_CBC_SHA:
-        case CipherSuite.TLS_SRP_SHA_WITH_AES_128_CBC_SHA:
-        case CipherSuite.TLS_SRP_SHA_WITH_AES_256_CBC_SHA:
-            return createSRPKeyExchange(KeyExchangeAlgorithm.SRP);
-
-        case CipherSuite.TLS_SRP_SHA_RSA_WITH_3DES_EDE_CBC_SHA:
-        case CipherSuite.TLS_SRP_SHA_RSA_WITH_AES_128_CBC_SHA:
-        case CipherSuite.TLS_SRP_SHA_RSA_WITH_AES_256_CBC_SHA:
-            return createSRPKeyExchange(KeyExchangeAlgorithm.SRP_RSA);
-
-        case CipherSuite.TLS_SRP_SHA_DSS_WITH_3DES_EDE_CBC_SHA:
-        case CipherSuite.TLS_SRP_SHA_DSS_WITH_AES_128_CBC_SHA:
-        case CipherSuite.TLS_SRP_SHA_DSS_WITH_AES_256_CBC_SHA:
-            return createSRPKeyExchange(KeyExchangeAlgorithm.SRP_DSS);
-
-        default:
-            /*
-             * Note: internal error here; the TlsProtocol implementation verifies that the
-             * server-selected cipher suite was in the list of client-offered cipher suites, so if
-             * we now can't produce an implementation, we shouldn't have offered it!
-             */
-            throw new TlsFatalAlert(AlertDescription.internal_error);
-        }
-    }
-
-    public TlsCipher getCipher()
-        throws IOException
-    {
-        switch (selectedCipherSuite)
-        {
-        case CipherSuite.TLS_SRP_SHA_WITH_3DES_EDE_CBC_SHA:
-        case CipherSuite.TLS_SRP_SHA_RSA_WITH_3DES_EDE_CBC_SHA:
-        case CipherSuite.TLS_SRP_SHA_DSS_WITH_3DES_EDE_CBC_SHA:
-            return cipherFactory.createCipher(context, EncryptionAlgorithm._3DES_EDE_CBC, MACAlgorithm.hmac_sha1);
-
-        case CipherSuite.TLS_SRP_SHA_WITH_AES_128_CBC_SHA:
-        case CipherSuite.TLS_SRP_SHA_RSA_WITH_AES_128_CBC_SHA:
-        case CipherSuite.TLS_SRP_SHA_DSS_WITH_AES_128_CBC_SHA:
-            return cipherFactory.createCipher(context, EncryptionAlgorithm.AES_128_CBC, MACAlgorithm.hmac_sha1);
-
-        case CipherSuite.TLS_SRP_SHA_WITH_AES_256_CBC_SHA:
-        case CipherSuite.TLS_SRP_SHA_RSA_WITH_AES_256_CBC_SHA:
-        case CipherSuite.TLS_SRP_SHA_DSS_WITH_AES_256_CBC_SHA:
-            return cipherFactory.createCipher(context, EncryptionAlgorithm.AES_256_CBC, MACAlgorithm.hmac_sha1);
-
-        default:
-            /*
-             * Note: internal error here; the TlsProtocol implementation verifies that the
-             * server-selected cipher suite was in the list of client-offered cipher suites, so if
-             * we now can't produce an implementation, we shouldn't have offered it!
-             */
-            throw new TlsFatalAlert(AlertDescription.internal_error);
-        }
-    }
-
-    protected TlsKeyExchange createSRPKeyExchange(int keyExchange)
-    {
-        return new TlsSRPKeyExchange(keyExchange, supportedSignatureAlgorithms, srpIdentity, loginParameters);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/SRTPProtectionProfile.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/SRTPProtectionProfile.java
deleted file mode 100644
index 1faac96..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/SRTPProtectionProfile.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-public class SRTPProtectionProfile
-{
-    /*
-     * RFC 5764 4.1.2.
-     */
-    public static final int SRTP_AES128_CM_HMAC_SHA1_80 = 0x0001;
-    public static final int SRTP_AES128_CM_HMAC_SHA1_32 = 0x0002;
-    public static final int SRTP_NULL_HMAC_SHA1_80 = 0x0005;
-    public static final int SRTP_NULL_HMAC_SHA1_32 = 0x0006;
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/SSL3Mac.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/SSL3Mac.java
deleted file mode 100644
index 28082d2..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/SSL3Mac.java
+++ /dev/null
@@ -1,114 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.Mac;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.util.Arrays;
-
-/**
- * HMAC implementation based on original internet draft for HMAC (RFC 2104)
- * <p>
- * The difference is that padding is concatenated versus XORed with the key
- * <p>
- * H(K + opad, H(K + ipad, text))
- */
-public class SSL3Mac
-    implements Mac
-{
-    private final static byte IPAD_BYTE = (byte)0x36;
-    private final static byte OPAD_BYTE = (byte)0x5C;
-
-    static final byte[] IPAD = genPad(IPAD_BYTE, 48);
-    static final byte[] OPAD = genPad(OPAD_BYTE, 48);
-
-    private Digest digest;
-    private int padLength;
-
-    private byte[] secret;
-
-    /**
-     * Base constructor for one of the standard digest algorithms that the byteLength of
-     * the algorithm is know for. Behaviour is undefined for digests other than MD5 or SHA1.
-     *
-     * @param digest the digest.
-     */
-    public SSL3Mac(Digest digest)
-    {
-        this.digest = digest;
-
-        if (digest.getDigestSize() == 20)
-        {
-            this.padLength = 40;
-        }
-        else
-        {
-            this.padLength = 48;
-        }
-    }
-
-    public String getAlgorithmName()
-    {
-        return digest.getAlgorithmName() + "/SSL3MAC";
-    }
-
-    public Digest getUnderlyingDigest()
-    {
-        return digest;
-    }
-
-    public void init(CipherParameters params)
-    {
-        secret = Arrays.clone(((KeyParameter)params).getKey());
-
-        reset();
-    }
-
-    public int getMacSize()
-    {
-        return digest.getDigestSize();
-    }
-
-    public void update(byte in)
-    {
-        digest.update(in);
-    }
-
-    public void update(byte[] in, int inOff, int len)
-    {
-        digest.update(in, inOff, len);
-    }
-
-    public int doFinal(byte[] out, int outOff)
-    {
-        byte[] tmp = new byte[digest.getDigestSize()];
-        digest.doFinal(tmp, 0);
-
-        digest.update(secret, 0, secret.length);
-        digest.update(OPAD, 0, padLength);
-        digest.update(tmp, 0, tmp.length);
-
-        int len = digest.doFinal(out, outOff);
-
-        reset();
-
-        return len;
-    }
-
-    /**
-     * Reset the mac generator.
-     */
-    public void reset()
-    {
-        digest.reset();
-        digest.update(secret, 0, secret.length);
-        digest.update(IPAD, 0, padLength);
-    }
-
-    private static byte[] genPad(byte b, int count)
-    {
-        byte[] padding = new byte[count];
-        Arrays.fill(padding, b);
-        return padding;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/SecurityParameters.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/SecurityParameters.java
deleted file mode 100644
index 27f7625..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/SecurityParameters.java
+++ /dev/null
@@ -1,108 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-import org.bouncycastle.util.Arrays;
-
-public class SecurityParameters
-{
-    int entity = -1;
-    int cipherSuite = -1;
-    short compressionAlgorithm = CompressionMethod._null;
-    int prfAlgorithm = -1;
-    int verifyDataLength = -1;
-    byte[] masterSecret = null;
-    byte[] clientRandom = null;
-    byte[] serverRandom = null;
-    byte[] sessionHash = null;
-    byte[] pskIdentity = null;
-    byte[] srpIdentity = null;
-
-    // TODO Keep these internal, since it's maybe not the ideal place for them
-    short maxFragmentLength = -1;
-    boolean truncatedHMac = false;
-    boolean encryptThenMAC = false;
-    boolean extendedMasterSecret = false;
-
-    void clear()
-    {
-        if (this.masterSecret != null)
-        {
-            Arrays.fill(this.masterSecret, (byte)0);
-            this.masterSecret = null;
-        }
-    }
-
-    /**
-     * @return {@link ConnectionEnd}
-     */
-    public int getEntity()
-    {
-        return entity;
-    }
-
-    /**
-     * @return {@link CipherSuite}
-     */
-    public int getCipherSuite()
-    {
-        return cipherSuite;
-    }
-
-    /**
-     * @return {@link CompressionMethod}
-     */
-    public short getCompressionAlgorithm()
-    {
-        return compressionAlgorithm;
-    }
-
-    /**
-     * @return {@link PRFAlgorithm}
-     */
-    public int getPrfAlgorithm()
-    {
-        return prfAlgorithm;
-    }
-
-    public int getVerifyDataLength()
-    {
-        return verifyDataLength;
-    }
-
-    public byte[] getMasterSecret()
-    {
-        return masterSecret;
-    }
-
-    public byte[] getClientRandom()
-    {
-        return clientRandom;
-    }
-
-    public byte[] getServerRandom()
-    {
-        return serverRandom;
-    }
-
-    public byte[] getSessionHash()
-    {
-        return sessionHash;
-    }
-
-    /**
-     * @deprecated Use {@link SecurityParameters#getPSKIdentity()) 
-     */
-    public byte[] getPskIdentity()
-    {
-        return pskIdentity;
-    }
-
-    public byte[] getPSKIdentity()
-    {
-        return pskIdentity;
-    }
-
-    public byte[] getSRPIdentity()
-    {
-        return srpIdentity;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/ServerDHParams.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/ServerDHParams.java
deleted file mode 100644
index 911338e..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/ServerDHParams.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.math.BigInteger;
-
-import org.bouncycastle.crypto.params.DHParameters;
-import org.bouncycastle.crypto.params.DHPublicKeyParameters;
-
-public class ServerDHParams
-{
-    protected DHPublicKeyParameters publicKey;
-
-    public ServerDHParams(DHPublicKeyParameters publicKey)
-    {
-        if (publicKey == null)
-        {
-            throw new IllegalArgumentException("'publicKey' cannot be null");
-        }
-
-        this.publicKey = publicKey;
-    }
-
-    public DHPublicKeyParameters getPublicKey()
-    {
-        return publicKey;
-    }
-
-    /**
-     * Encode this {@link ServerDHParams} to an {@link OutputStream}.
-     * 
-     * @param output
-     *            the {@link OutputStream} to encode to.
-     * @throws IOException
-     */
-    public void encode(OutputStream output) throws IOException
-    {
-        DHParameters dhParameters = publicKey.getParameters();
-        BigInteger Ys = publicKey.getY();
-
-        TlsDHUtils.writeDHParameter(dhParameters.getP(), output);
-        TlsDHUtils.writeDHParameter(dhParameters.getG(), output);
-        TlsDHUtils.writeDHParameter(Ys, output);
-    }
-
-    /**
-     * Parse a {@link ServerDHParams} from an {@link InputStream}.
-     * 
-     * @param input
-     *            the {@link InputStream} to parse from.
-     * @return a {@link ServerDHParams} object.
-     * @throws IOException
-     */
-    public static ServerDHParams parse(InputStream input) throws IOException
-    {
-        BigInteger p = TlsDHUtils.readDHParameter(input);
-        BigInteger g = TlsDHUtils.readDHParameter(input);
-        BigInteger Ys = TlsDHUtils.readDHParameter(input);
-
-        return new ServerDHParams(TlsDHUtils.validateDHPublicKey(new DHPublicKeyParameters(Ys, new DHParameters(p, g))));
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/ServerName.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/ServerName.java
deleted file mode 100644
index df9a439..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/ServerName.java
+++ /dev/null
@@ -1,112 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-import org.bouncycastle.util.Strings;
-
-public class ServerName
-{
-    protected short nameType;
-    protected Object name;
-
-    public ServerName(short nameType, Object name)
-    {
-        if (!isCorrectType(nameType, name))
-        {
-            throw new IllegalArgumentException("'name' is not an instance of the correct type");
-        }
-
-        this.nameType = nameType;
-        this.name = name;
-    }
-
-    public short getNameType()
-    {
-        return nameType;
-    }
-
-    public Object getName()
-    {
-        return name;
-    }
-
-    public String getHostName()
-    {
-        if (!isCorrectType(NameType.host_name, name))
-        {
-            throw new IllegalStateException("'name' is not a HostName string");
-        }
-        return (String)name;
-    }
-
-    /**
-     * Encode this {@link ServerName} to an {@link OutputStream}.
-     * 
-     * @param output
-     *            the {@link OutputStream} to encode to.
-     * @throws IOException
-     */
-    public void encode(OutputStream output) throws IOException
-    {
-        TlsUtils.writeUint8(nameType, output);
-
-        switch (nameType)
-        {
-        case NameType.host_name:
-            byte[] utf8Encoding = Strings.toUTF8ByteArray((String)name);
-            if (utf8Encoding.length < 1)
-            {
-                throw new TlsFatalAlert(AlertDescription.internal_error);
-            }
-            TlsUtils.writeOpaque16(utf8Encoding, output);
-            break;
-        default:
-            throw new TlsFatalAlert(AlertDescription.internal_error);
-        }
-    }
-
-    /**
-     * Parse a {@link ServerName} from an {@link InputStream}.
-     * 
-     * @param input
-     *            the {@link InputStream} to parse from.
-     * @return a {@link ServerName} object.
-     * @throws IOException
-     */
-    public static ServerName parse(InputStream input) throws IOException
-    {
-        short name_type = TlsUtils.readUint8(input);
-        Object name;
-
-        switch (name_type)
-        {
-        case NameType.host_name:
-        {
-            byte[] utf8Encoding = TlsUtils.readOpaque16(input);
-            if (utf8Encoding.length < 1)
-            {
-                throw new TlsFatalAlert(AlertDescription.decode_error);
-            }
-            name = Strings.fromUTF8ByteArray(utf8Encoding);
-            break;
-        }
-        default:
-            throw new TlsFatalAlert(AlertDescription.decode_error);
-        }
-
-        return new ServerName(name_type, name);
-    }
-
-    protected static boolean isCorrectType(short nameType, Object name)
-    {
-        switch (nameType)
-        {
-        case NameType.host_name:
-            return name instanceof String;
-        default:
-            throw new IllegalArgumentException("'name' is an unsupported value");
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/ServerNameList.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/ServerNameList.java
deleted file mode 100644
index 1dc81f0..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/ServerNameList.java
+++ /dev/null
@@ -1,86 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.Vector;
-
-public class ServerNameList
-{
-    protected Vector serverNameList;
-
-    /**
-     * @param serverNameList a {@link Vector} of {@link ServerName}.
-     */
-    public ServerNameList(Vector serverNameList)
-    {
-        if (serverNameList == null || serverNameList.isEmpty())
-        {
-            throw new IllegalArgumentException("'serverNameList' must not be null or empty");
-        }
-
-        this.serverNameList = serverNameList;
-    }
-
-    /**
-     * @return a {@link Vector} of {@link ServerName}.
-     */
-    public Vector getServerNameList()
-    {
-        return serverNameList;
-    }
-
-    /**
-     * Encode this {@link ServerNameList} to an {@link OutputStream}.
-     * 
-     * @param output
-     *            the {@link OutputStream} to encode to.
-     * @throws IOException
-     */
-    public void encode(OutputStream output) throws IOException
-    {
-        ByteArrayOutputStream buf = new ByteArrayOutputStream();
-
-        for (int i = 0; i < serverNameList.size(); ++i)
-        {
-            ServerName entry = (ServerName)serverNameList.elementAt(i);
-            entry.encode(buf);
-        }
-
-        TlsUtils.checkUint16(buf.size());
-        TlsUtils.writeUint16(buf.size(), output);
-        buf.writeTo(output);
-    }
-
-    /**
-     * Parse a {@link ServerNameList} from an {@link InputStream}.
-     * 
-     * @param input
-     *            the {@link InputStream} to parse from.
-     * @return a {@link ServerNameList} object.
-     * @throws IOException
-     */
-    public static ServerNameList parse(InputStream input) throws IOException
-    {
-        int length = TlsUtils.readUint16(input);
-        if (length < 1)
-        {
-            throw new TlsFatalAlert(AlertDescription.decode_error);
-        }
-
-        byte[] data = TlsUtils.readFully(length, input);
-
-        ByteArrayInputStream buf = new ByteArrayInputStream(data);
-
-        Vector server_name_list = new Vector();
-        while (buf.available() > 0)
-        {
-            ServerName entry = ServerName.parse(buf);
-            server_name_list.addElement(entry);
-        }
-
-        return new ServerNameList(server_name_list);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/ServerOnlyTlsAuthentication.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/ServerOnlyTlsAuthentication.java
deleted file mode 100644
index eccbb3f..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/ServerOnlyTlsAuthentication.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-public abstract class ServerOnlyTlsAuthentication
-    implements TlsAuthentication
-{
-    public final TlsCredentials getClientCredentials(CertificateRequest certificateRequest)
-    {
-        return null;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/ServerSRPParams.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/ServerSRPParams.java
deleted file mode 100644
index 21ca7d0..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/ServerSRPParams.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.math.BigInteger;
-
-import org.bouncycastle.util.Arrays;
-
-public class ServerSRPParams
-{
-    protected BigInteger N, g, B;
-    protected byte[] s;
-
-    public ServerSRPParams(BigInteger N, BigInteger g, byte[] s, BigInteger B)
-    {
-        this.N = N;
-        this.g = g;
-        this.s = Arrays.clone(s);
-        this.B = B;
-    }
-
-    public BigInteger getB()
-    {
-        return B;
-    }
-    
-    public BigInteger getG()
-    {
-        return g;
-    }
-
-    public BigInteger getN()
-    {
-        return N;
-    }
-
-    public byte[] getS()
-    {
-        return s;
-    }
-
-    /**
-     * Encode this {@link ServerSRPParams} to an {@link OutputStream}.
-     * 
-     * @param output
-     *            the {@link OutputStream} to encode to.
-     * @throws IOException
-     */
-    public void encode(OutputStream output) throws IOException
-    {
-        TlsSRPUtils.writeSRPParameter(N, output);
-        TlsSRPUtils.writeSRPParameter(g, output);
-        TlsUtils.writeOpaque8(s, output);
-        TlsSRPUtils.writeSRPParameter(B, output);
-    }
-
-    /**
-     * Parse a {@link ServerSRPParams} from an {@link InputStream}.
-     * 
-     * @param input
-     *            the {@link InputStream} to parse from.
-     * @return a {@link ServerSRPParams} object.
-     * @throws IOException
-     */
-    public static ServerSRPParams parse(InputStream input) throws IOException
-    {
-        BigInteger N = TlsSRPUtils.readSRPParameter(input);
-        BigInteger g = TlsSRPUtils.readSRPParameter(input);
-        byte[] s = TlsUtils.readOpaque8(input);
-        BigInteger B = TlsSRPUtils.readSRPParameter(input);
-
-        return new ServerSRPParams(N, g, s, B);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/SessionParameters.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/SessionParameters.java
deleted file mode 100644
index c7418a0..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/SessionParameters.java
+++ /dev/null
@@ -1,186 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.util.Hashtable;
-
-import org.bouncycastle.util.Arrays;
-
-public final class SessionParameters
-{
-    public static final class Builder
-    {
-        private int cipherSuite = -1;
-        private short compressionAlgorithm = -1;
-        private byte[] masterSecret = null;
-        private Certificate peerCertificate = null;
-        private byte[] pskIdentity = null;
-        private byte[] srpIdentity = null;
-        private byte[] encodedServerExtensions = null;
-
-        public Builder()
-        {
-        }
-
-        public SessionParameters build()
-        {
-            validate(this.cipherSuite >= 0, "cipherSuite");
-            validate(this.compressionAlgorithm >= 0, "compressionAlgorithm");
-            validate(this.masterSecret != null, "masterSecret");
-            return new SessionParameters(cipherSuite, compressionAlgorithm, masterSecret, peerCertificate, pskIdentity,
-                srpIdentity, encodedServerExtensions);
-        }
-
-        public Builder setCipherSuite(int cipherSuite)
-        {
-            this.cipherSuite = cipherSuite;
-            return this;
-        }
-
-        public Builder setCompressionAlgorithm(short compressionAlgorithm)
-        {
-            this.compressionAlgorithm = compressionAlgorithm;
-            return this;
-        }
-
-        public Builder setMasterSecret(byte[] masterSecret)
-        {
-            this.masterSecret = masterSecret;
-            return this;
-        }
-
-        public Builder setPeerCertificate(Certificate peerCertificate)
-        {
-            this.peerCertificate = peerCertificate;
-            return this;
-        }
-
-        /**
-         * @deprecated Use {@link #setPSKIdentity(byte[]))
-         */
-        public Builder setPskIdentity(byte[] pskIdentity)
-        {
-            this.pskIdentity = pskIdentity;
-            return this;
-        }
-
-        public Builder setPSKIdentity(byte[] pskIdentity)
-        {
-            this.pskIdentity = pskIdentity;
-            return this;
-        }
-
-        public Builder setSRPIdentity(byte[] srpIdentity)
-        {
-            this.srpIdentity = srpIdentity;
-            return this;
-        }
-
-        public Builder setServerExtensions(Hashtable serverExtensions) throws IOException
-        {
-            if (serverExtensions == null)
-            {
-                encodedServerExtensions = null;
-            }
-            else
-            {
-                ByteArrayOutputStream buf = new ByteArrayOutputStream();
-                TlsProtocol.writeExtensions(buf, serverExtensions);
-                encodedServerExtensions = buf.toByteArray();
-            }
-            return this;
-        }
-
-        private void validate(boolean condition, String parameter)
-        {
-            if (!condition)
-            {
-                throw new IllegalStateException("Required session parameter '" + parameter + "' not configured");
-            }
-        }
-    }
-
-    private int cipherSuite;
-    private short compressionAlgorithm;
-    private byte[] masterSecret;
-    private Certificate peerCertificate;
-    private byte[] pskIdentity = null;
-    private byte[] srpIdentity = null;
-    private byte[] encodedServerExtensions;
-
-    private SessionParameters(int cipherSuite, short compressionAlgorithm, byte[] masterSecret,
-        Certificate peerCertificate, byte[] pskIdentity, byte[] srpIdentity, byte[] encodedServerExtensions)
-    {
-        this.cipherSuite = cipherSuite;
-        this.compressionAlgorithm = compressionAlgorithm;
-        this.masterSecret = Arrays.clone(masterSecret);
-        this.peerCertificate = peerCertificate;
-        this.pskIdentity = Arrays.clone(pskIdentity);
-        this.srpIdentity = Arrays.clone(srpIdentity);
-        this.encodedServerExtensions = encodedServerExtensions;
-    }
-
-    public void clear()
-    {
-        if (this.masterSecret != null)
-        {
-            Arrays.fill(this.masterSecret, (byte)0);
-        }
-    }
-
-    public SessionParameters copy()
-    {
-        return new SessionParameters(cipherSuite, compressionAlgorithm, masterSecret, peerCertificate, pskIdentity,
-            srpIdentity, encodedServerExtensions);
-    }
-
-    public int getCipherSuite()
-    {
-        return cipherSuite;
-    }
-
-    public short getCompressionAlgorithm()
-    {
-        return compressionAlgorithm;
-    }
-
-    public byte[] getMasterSecret()
-    {
-        return masterSecret;
-    }
-
-    public Certificate getPeerCertificate()
-    {
-        return peerCertificate;
-    }
-
-    /**
-     * @deprecated Use {@link #getPSKIdentity())
-     */
-    public byte[] getPskIdentity()
-    {
-        return pskIdentity;
-    }
-
-    public byte[] getPSKIdentity()
-    {
-        return pskIdentity;
-    }
-
-    public byte[] getSRPIdentity()
-    {
-        return srpIdentity;
-    }
-
-    public Hashtable readServerExtensions() throws IOException
-    {
-        if (encodedServerExtensions == null)
-        {
-            return null;
-        }
-
-        ByteArrayInputStream buf = new ByteArrayInputStream(encodedServerExtensions);
-        return TlsProtocol.readExtensions(buf);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/SignatureAlgorithm.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/SignatureAlgorithm.java
deleted file mode 100644
index 820c80c..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/SignatureAlgorithm.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-/**
- * RFC 5246 7.4.1.4.1 (in RFC 2246, there were no specific values assigned)
- */
-public class SignatureAlgorithm
-{
-    public static final short anonymous = 0;
-    public static final short rsa = 1;
-    public static final short dsa = 2;
-    public static final short ecdsa = 3;
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/SignatureAndHashAlgorithm.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/SignatureAndHashAlgorithm.java
deleted file mode 100644
index 9404a72..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/SignatureAndHashAlgorithm.java
+++ /dev/null
@@ -1,96 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-/**
- * RFC 5246 7.4.1.4.1
- */
-public class SignatureAndHashAlgorithm
-{
-    protected short hash;
-    protected short signature;
-
-    /**
-     * @param hash      {@link HashAlgorithm}
-     * @param signature {@link SignatureAlgorithm}
-     */
-    public SignatureAndHashAlgorithm(short hash, short signature)
-    {
-        if (!TlsUtils.isValidUint8(hash))
-        {
-            throw new IllegalArgumentException("'hash' should be a uint8");
-        }
-        if (!TlsUtils.isValidUint8(signature))
-        {
-            throw new IllegalArgumentException("'signature' should be a uint8");
-        }
-        if (signature == SignatureAlgorithm.anonymous)
-        {
-            throw new IllegalArgumentException("'signature' MUST NOT be \"anonymous\"");
-        }
-
-        this.hash = hash;
-        this.signature = signature;
-    }
-
-    /**
-     * @return {@link HashAlgorithm}
-     */
-    public short getHash()
-    {
-        return hash;
-    }
-
-    /**
-     * @return {@link SignatureAlgorithm}
-     */
-    public short getSignature()
-    {
-        return signature;
-    }
-
-    public boolean equals(Object obj)
-    {
-        if (!(obj instanceof SignatureAndHashAlgorithm))
-        {
-            return false;
-        }
-        SignatureAndHashAlgorithm other = (SignatureAndHashAlgorithm)obj;
-        return other.getHash() == getHash() && other.getSignature() == getSignature();
-    }
-
-    public int hashCode()
-    {
-        return (getHash() << 16) | getSignature();
-    }
-
-    /**
-     * Encode this {@link SignatureAndHashAlgorithm} to an {@link OutputStream}.
-     *
-     * @param output the {@link OutputStream} to encode to.
-     * @throws IOException
-     */
-    public void encode(OutputStream output)
-        throws IOException
-    {
-        TlsUtils.writeUint8(getHash(), output);
-        TlsUtils.writeUint8(getSignature(), output);
-    }
-
-    /**
-     * Parse a {@link SignatureAndHashAlgorithm} from an {@link InputStream}.
-     *
-     * @param input the {@link InputStream} to parse from.
-     * @return a {@link SignatureAndHashAlgorithm} object.
-     * @throws IOException
-     */
-    public static SignatureAndHashAlgorithm parse(InputStream input)
-        throws IOException
-    {
-        short hash = TlsUtils.readUint8(input);
-        short signature = TlsUtils.readUint8(input);
-        return new SignatureAndHashAlgorithm(hash, signature);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/SignerInputBuffer.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/SignerInputBuffer.java
deleted file mode 100644
index 8293135..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/SignerInputBuffer.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-import java.io.ByteArrayOutputStream;
-
-import org.bouncycastle.crypto.Signer;
-
-class SignerInputBuffer extends ByteArrayOutputStream
-{
-    void updateSigner(Signer s)
-    {
-        s.update(this.buf, 0, count);
-    }
-}
\ No newline at end of file
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/SimulatedTlsSRPIdentityManager.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/SimulatedTlsSRPIdentityManager.java
deleted file mode 100644
index c48b4ad..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/SimulatedTlsSRPIdentityManager.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-import java.math.BigInteger;
-
-import org.bouncycastle.crypto.Mac;
-import org.bouncycastle.crypto.agreement.srp.SRP6VerifierGenerator;
-import org.bouncycastle.crypto.macs.HMac;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.crypto.params.SRP6GroupParameters;
-import org.bouncycastle.util.Strings;
-
-/**
- * An implementation of {@link TlsSRPIdentityManager} that simulates the existence of "unknown" identities
- * to obscure the fact that there is no verifier for them. 
- */
-public class SimulatedTlsSRPIdentityManager
-    implements TlsSRPIdentityManager
-{
-    private static final byte[] PREFIX_PASSWORD = Strings.toByteArray("password");
-    private static final byte[] PREFIX_SALT = Strings.toByteArray("salt");
-
-    /**
-     * Create a {@link SimulatedTlsSRPIdentityManager} that implements the algorithm from RFC 5054 2.5.1.3
-     *
-     * @param group the {@link SRP6GroupParameters} defining the group that SRP is operating in
-     * @param seedKey the secret "seed key" referred to in RFC 5054 2.5.1.3
-     * @return an instance of {@link SimulatedTlsSRPIdentityManager}
-     */
-    public static SimulatedTlsSRPIdentityManager getRFC5054Default(SRP6GroupParameters group, byte[] seedKey)
-    {
-        SRP6VerifierGenerator verifierGenerator = new SRP6VerifierGenerator();
-        verifierGenerator.init(group, TlsUtils.createHash(HashAlgorithm.sha1));
-
-        HMac mac = new HMac(TlsUtils.createHash(HashAlgorithm.sha1));
-        mac.init(new KeyParameter(seedKey));
-
-        return new SimulatedTlsSRPIdentityManager(group, verifierGenerator, mac);
-    }
-
-    protected SRP6GroupParameters group;
-    protected SRP6VerifierGenerator verifierGenerator;
-    protected Mac mac;
-
-    public SimulatedTlsSRPIdentityManager(SRP6GroupParameters group, SRP6VerifierGenerator verifierGenerator, Mac mac)
-    {
-        this.group = group;
-        this.verifierGenerator = verifierGenerator;
-        this.mac = mac;
-    }
-
-    public TlsSRPLoginParameters getLoginParameters(byte[] identity)
-    {
-        mac.update(PREFIX_SALT, 0, PREFIX_SALT.length);
-        mac.update(identity, 0, identity.length);
-
-        byte[] salt = new byte[mac.getMacSize()];
-        mac.doFinal(salt, 0);
-
-        mac.update(PREFIX_PASSWORD, 0, PREFIX_PASSWORD.length);
-        mac.update(identity, 0, identity.length);
-
-        byte[] password = new byte[mac.getMacSize()];
-        mac.doFinal(password, 0);
-
-        BigInteger verifier = verifierGenerator.generateVerifier(salt, identity, password);
-
-        return new TlsSRPLoginParameters(group, verifier, salt);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/SupplementalDataEntry.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/SupplementalDataEntry.java
deleted file mode 100644
index 4080aaa..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/SupplementalDataEntry.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-public class SupplementalDataEntry
-{
-    protected int dataType;
-    protected byte[] data;
-
-    public SupplementalDataEntry(int dataType, byte[] data)
-    {
-        this.dataType = dataType;
-        this.data = data;
-    }
-
-    public int getDataType()
-    {
-        return dataType;
-    }
-
-    public byte[] getData()
-    {
-        return data;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/SupplementalDataType.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/SupplementalDataType.java
deleted file mode 100644
index 218f36b..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/SupplementalDataType.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-/**
- * RFC 4680
- */
-public class SupplementalDataType
-{
-    /*
-     * RFC 4681
-     */
-    public static final int user_mapping_data = 0;
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsAEADCipher.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsAEADCipher.java
deleted file mode 100644
index 39133e6..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsAEADCipher.java
+++ /dev/null
@@ -1,193 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-import java.io.IOException;
-
-import org.bouncycastle.crypto.modes.AEADBlockCipher;
-import org.bouncycastle.crypto.params.AEADParameters;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.util.Arrays;
-
-public class TlsAEADCipher
-    implements TlsCipher
-{
-    protected TlsContext context;
-    protected int macSize;
-    protected int nonce_explicit_length;
-
-    protected AEADBlockCipher encryptCipher;
-    protected AEADBlockCipher decryptCipher;
-
-    protected byte[] encryptImplicitNonce, decryptImplicitNonce;
-
-    public TlsAEADCipher(TlsContext context, AEADBlockCipher clientWriteCipher, AEADBlockCipher serverWriteCipher,
-        int cipherKeySize, int macSize) throws IOException
-    {
-        if (!TlsUtils.isTLSv12(context))
-        {
-            throw new TlsFatalAlert(AlertDescription.internal_error);
-        }
-
-        this.context = context;
-        this.macSize = macSize;
-
-        // NOTE: Valid for RFC 5288/6655 ciphers but may need review for other AEAD ciphers
-        this.nonce_explicit_length = 8;
-
-        // TODO SecurityParameters.fixed_iv_length
-        int fixed_iv_length = 4;
-
-        int key_block_size = (2 * cipherKeySize) + (2 * fixed_iv_length);
-
-        byte[] key_block = TlsUtils.calculateKeyBlock(context, key_block_size);
-
-        int offset = 0;
-
-        KeyParameter client_write_key = new KeyParameter(key_block, offset, cipherKeySize);
-        offset += cipherKeySize;
-        KeyParameter server_write_key = new KeyParameter(key_block, offset, cipherKeySize);
-        offset += cipherKeySize;
-        byte[] client_write_IV = Arrays.copyOfRange(key_block, offset, offset + fixed_iv_length);
-        offset += fixed_iv_length;
-        byte[] server_write_IV = Arrays.copyOfRange(key_block, offset, offset + fixed_iv_length);
-        offset += fixed_iv_length;
-
-        if (offset != key_block_size)
-        {
-            throw new TlsFatalAlert(AlertDescription.internal_error);
-        }
-
-        KeyParameter encryptKey, decryptKey;
-        if (context.isServer())
-        {
-            this.encryptCipher = serverWriteCipher;
-            this.decryptCipher = clientWriteCipher;
-            this.encryptImplicitNonce = server_write_IV;
-            this.decryptImplicitNonce = client_write_IV;
-            encryptKey = server_write_key;
-            decryptKey = client_write_key;
-        }
-        else
-        {
-            this.encryptCipher = clientWriteCipher;
-            this.decryptCipher = serverWriteCipher;
-            this.encryptImplicitNonce = client_write_IV;
-            this.decryptImplicitNonce = server_write_IV;
-            encryptKey = client_write_key;
-            decryptKey = server_write_key;
-        }
-
-        byte[] dummyNonce = new byte[fixed_iv_length + nonce_explicit_length];
-
-        this.encryptCipher.init(true, new AEADParameters(encryptKey, 8 * macSize, dummyNonce));
-        this.decryptCipher.init(false, new AEADParameters(decryptKey, 8 * macSize, dummyNonce));
-    }
-
-    public int getPlaintextLimit(int ciphertextLimit)
-    {
-        // TODO We ought to be able to ask the decryptCipher (independently of it's current state!)
-        return ciphertextLimit - macSize - nonce_explicit_length;
-    }
-
-    public byte[] encodePlaintext(long seqNo, short type, byte[] plaintext, int offset, int len)
-        throws IOException
-    {
-        byte[] nonce = new byte[this.encryptImplicitNonce.length + nonce_explicit_length];
-        System.arraycopy(encryptImplicitNonce, 0, nonce, 0, encryptImplicitNonce.length);
-
-        /*
-         * RFC 5288/6655 The nonce_explicit MAY be the 64-bit sequence number.
-         * 
-         * (May need review for other AEAD ciphers).
-         */
-        TlsUtils.writeUint64(seqNo, nonce, encryptImplicitNonce.length);
-
-        int plaintextOffset = offset;
-        int plaintextLength = len;
-        int ciphertextLength = encryptCipher.getOutputSize(plaintextLength);
-
-        byte[] output = new byte[nonce_explicit_length + ciphertextLength];
-        System.arraycopy(nonce, encryptImplicitNonce.length, output, 0, nonce_explicit_length);
-        int outputPos = nonce_explicit_length;
-
-        byte[] additionalData = getAdditionalData(seqNo, type, plaintextLength);
-        AEADParameters parameters = new AEADParameters(null, 8 * macSize, nonce, additionalData);
-
-        try
-        {
-            encryptCipher.init(true, parameters);
-            outputPos += encryptCipher.processBytes(plaintext, plaintextOffset, plaintextLength, output, outputPos);
-            outputPos += encryptCipher.doFinal(output, outputPos);
-        }
-        catch (Exception e)
-        {
-            throw new TlsFatalAlert(AlertDescription.internal_error, e);
-        }
-
-        if (outputPos != output.length)
-        {
-            // NOTE: Existing AEAD cipher implementations all give exact output lengths
-            throw new TlsFatalAlert(AlertDescription.internal_error);
-        }
-
-        return output;
-    }
-
-    public byte[] decodeCiphertext(long seqNo, short type, byte[] ciphertext, int offset, int len)
-        throws IOException
-    {
-        if (getPlaintextLimit(len) < 0)
-        {
-            throw new TlsFatalAlert(AlertDescription.decode_error);
-        }
-
-        byte[] nonce = new byte[this.decryptImplicitNonce.length + nonce_explicit_length];
-        System.arraycopy(decryptImplicitNonce, 0, nonce, 0, decryptImplicitNonce.length);
-        System.arraycopy(ciphertext, offset, nonce, decryptImplicitNonce.length, nonce_explicit_length);
-
-        int ciphertextOffset = offset + nonce_explicit_length;
-        int ciphertextLength = len - nonce_explicit_length;
-        int plaintextLength = decryptCipher.getOutputSize(ciphertextLength);
-
-        byte[] output = new byte[plaintextLength];
-        int outputPos = 0;
-
-        byte[] additionalData = getAdditionalData(seqNo, type, plaintextLength);
-        AEADParameters parameters = new AEADParameters(null, 8 * macSize, nonce, additionalData);
-
-        try
-        {
-            decryptCipher.init(false, parameters);
-            outputPos += decryptCipher.processBytes(ciphertext, ciphertextOffset, ciphertextLength, output, outputPos);
-            outputPos += decryptCipher.doFinal(output, outputPos);
-        }
-        catch (Exception e)
-        {
-            throw new TlsFatalAlert(AlertDescription.bad_record_mac, e);
-        }
-
-        if (outputPos != output.length)
-        {
-            // NOTE: Existing AEAD cipher implementations all give exact output lengths
-            throw new TlsFatalAlert(AlertDescription.internal_error);
-        }
-
-        return output;
-    }
-
-    protected byte[] getAdditionalData(long seqNo, short type, int len)
-        throws IOException
-    {
-        /*
-         * additional_data = seq_num + TLSCompressed.type + TLSCompressed.version +
-         * TLSCompressed.length
-         */
-
-        byte[] additional_data = new byte[13];
-        TlsUtils.writeUint64(seqNo, additional_data, 0);
-        TlsUtils.writeUint8(type, additional_data, 8);
-        TlsUtils.writeVersion(context.getServerVersion(), additional_data, 9);
-        TlsUtils.writeUint16(len, additional_data, 11);
-
-        return additional_data;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsAgreementCredentials.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsAgreementCredentials.java
deleted file mode 100644
index 525cdb3..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsAgreementCredentials.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-import java.io.IOException;
-
-import org.bouncycastle.crypto.params.AsymmetricKeyParameter;
-
-public interface TlsAgreementCredentials
-    extends TlsCredentials
-{
-    byte[] generateAgreement(AsymmetricKeyParameter peerPublicKey)
-        throws IOException;
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsAuthentication.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsAuthentication.java
deleted file mode 100644
index 62c2616..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsAuthentication.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-import java.io.IOException;
-
-public interface TlsAuthentication
-{
-    /**
-     * Called by the protocol handler to report the server certificate
-     * Note: this method is responsible for certificate verification and validation
-     *
-     * @param serverCertificate the server certificate received
-     * @throws IOException
-     */
-    void notifyServerCertificate(Certificate serverCertificate)
-        throws IOException;
-
-    /**
-     * Return client credentials in response to server's certificate request
-     *
-     * @param certificateRequest details of the certificate request
-     * @return a TlsCredentials object or null for no client authentication
-     * @throws IOException
-     */
-    TlsCredentials getClientCredentials(CertificateRequest certificateRequest)
-        throws IOException;
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsBlockCipher.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsBlockCipher.java
deleted file mode 100644
index c2c591c..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsBlockCipher.java
+++ /dev/null
@@ -1,394 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-import java.io.IOException;
-import java.security.SecureRandom;
-
-import org.bouncycastle.crypto.BlockCipher;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.crypto.params.ParametersWithIV;
-import org.bouncycastle.util.Arrays;
-
-/**
- * A generic TLS 1.0-1.2 / SSLv3 block cipher. This can be used for AES or 3DES for example.
- */
-public class TlsBlockCipher
-    implements TlsCipher
-{
-    protected TlsContext context;
-    protected byte[] randomData;
-    protected boolean useExplicitIV;
-    protected boolean encryptThenMAC;
-
-    protected BlockCipher encryptCipher;
-    protected BlockCipher decryptCipher;
-
-    protected TlsMac writeMac;
-    protected TlsMac readMac;
-
-    public TlsMac getWriteMac()
-    {
-        return writeMac;
-    }
-
-    public TlsMac getReadMac()
-    {
-        return readMac;
-    }
-
-    public TlsBlockCipher(TlsContext context, BlockCipher clientWriteCipher, BlockCipher serverWriteCipher,
-        Digest clientWriteDigest, Digest serverWriteDigest, int cipherKeySize) throws IOException
-    {
-        this.context = context;
-
-        this.randomData = new byte[256];
-        context.getNonceRandomGenerator().nextBytes(randomData);
-
-        this.useExplicitIV = TlsUtils.isTLSv11(context);
-        this.encryptThenMAC = context.getSecurityParameters().encryptThenMAC;
-
-        int key_block_size = (2 * cipherKeySize) + clientWriteDigest.getDigestSize()
-            + serverWriteDigest.getDigestSize();
-
-        // From TLS 1.1 onwards, block ciphers don't need client_write_IV
-        if (!useExplicitIV)
-        {
-            key_block_size += clientWriteCipher.getBlockSize() + serverWriteCipher.getBlockSize();
-        }
-
-        byte[] key_block = TlsUtils.calculateKeyBlock(context, key_block_size);
-
-        int offset = 0;
-
-        TlsMac clientWriteMac = new TlsMac(context, clientWriteDigest, key_block, offset,
-            clientWriteDigest.getDigestSize());
-        offset += clientWriteDigest.getDigestSize();
-        TlsMac serverWriteMac = new TlsMac(context, serverWriteDigest, key_block, offset,
-            serverWriteDigest.getDigestSize());
-        offset += serverWriteDigest.getDigestSize();
-
-        KeyParameter client_write_key = new KeyParameter(key_block, offset, cipherKeySize);
-        offset += cipherKeySize;
-        KeyParameter server_write_key = new KeyParameter(key_block, offset, cipherKeySize);
-        offset += cipherKeySize;
-
-        byte[] client_write_IV, server_write_IV;
-        if (useExplicitIV)
-        {
-            client_write_IV = new byte[clientWriteCipher.getBlockSize()];
-            server_write_IV = new byte[serverWriteCipher.getBlockSize()];
-        }
-        else
-        {
-            client_write_IV = Arrays.copyOfRange(key_block, offset, offset + clientWriteCipher.getBlockSize());
-            offset += clientWriteCipher.getBlockSize();
-            server_write_IV = Arrays.copyOfRange(key_block, offset, offset + serverWriteCipher.getBlockSize());
-            offset += serverWriteCipher.getBlockSize();
-        }
-
-        if (offset != key_block_size)
-        {
-            throw new TlsFatalAlert(AlertDescription.internal_error);
-        }
-
-        CipherParameters encryptParams, decryptParams;
-        if (context.isServer())
-        {
-            this.writeMac = serverWriteMac;
-            this.readMac = clientWriteMac;
-            this.encryptCipher = serverWriteCipher;
-            this.decryptCipher = clientWriteCipher;
-            encryptParams = new ParametersWithIV(server_write_key, server_write_IV);
-            decryptParams = new ParametersWithIV(client_write_key, client_write_IV);
-        }
-        else
-        {
-            this.writeMac = clientWriteMac;
-            this.readMac = serverWriteMac;
-            this.encryptCipher = clientWriteCipher;
-            this.decryptCipher = serverWriteCipher;
-            encryptParams = new ParametersWithIV(client_write_key, client_write_IV);
-            decryptParams = new ParametersWithIV(server_write_key, server_write_IV);
-        }
-
-        this.encryptCipher.init(true, encryptParams);
-        this.decryptCipher.init(false, decryptParams);
-    }
-
-    public int getPlaintextLimit(int ciphertextLimit)
-    {
-        int blockSize = encryptCipher.getBlockSize();
-        int macSize = writeMac.getSize();
-
-        int plaintextLimit = ciphertextLimit;
-
-        // An explicit IV consumes 1 block
-        if (useExplicitIV)
-        {
-            plaintextLimit -= blockSize;
-        }
-
-        // Leave room for the MAC, and require block-alignment
-        if (encryptThenMAC)
-        {
-            plaintextLimit -= macSize;
-            plaintextLimit -= plaintextLimit % blockSize;
-        }
-        else
-        {
-            plaintextLimit -= plaintextLimit % blockSize;
-            plaintextLimit -= macSize;
-        }
-
-        // Minimum 1 byte of padding
-        --plaintextLimit;
-
-        return plaintextLimit;
-    }
-
-    public byte[] encodePlaintext(long seqNo, short type, byte[] plaintext, int offset, int len)
-    {
-        int blockSize = encryptCipher.getBlockSize();
-        int macSize = writeMac.getSize();
-
-        ProtocolVersion version = context.getServerVersion();
-
-        int enc_input_length = len;
-        if (!encryptThenMAC)
-        {
-            enc_input_length += macSize;
-        }
-
-        int padding_length = blockSize - 1 - (enc_input_length % blockSize);
-
-        // TODO[DTLS] Consider supporting in DTLS (without exceeding send limit though)
-        if (!version.isDTLS() && !version.isSSL())
-        {
-            // Add a random number of extra blocks worth of padding
-            int maxExtraPadBlocks = (255 - padding_length) / blockSize;
-            int actualExtraPadBlocks = chooseExtraPadBlocks(context.getSecureRandom(), maxExtraPadBlocks);
-            padding_length += actualExtraPadBlocks * blockSize;
-        }
-
-        int totalSize = len + macSize + padding_length + 1;
-        if (useExplicitIV)
-        {
-            totalSize += blockSize;
-        }
-
-        byte[] outBuf = new byte[totalSize];
-        int outOff = 0;
-
-        if (useExplicitIV)
-        {
-            byte[] explicitIV = new byte[blockSize];
-            context.getNonceRandomGenerator().nextBytes(explicitIV);
-
-            encryptCipher.init(true, new ParametersWithIV(null, explicitIV));
-
-            System.arraycopy(explicitIV, 0, outBuf, outOff, blockSize);
-            outOff += blockSize;
-        }
-
-        int blocks_start = outOff;
-
-        System.arraycopy(plaintext, offset, outBuf, outOff, len);
-        outOff += len;
-
-        if (!encryptThenMAC)
-        {
-            byte[] mac = writeMac.calculateMac(seqNo, type, plaintext, offset, len);
-            System.arraycopy(mac, 0, outBuf, outOff, mac.length);
-            outOff += mac.length;
-        }
-
-        for (int i = 0; i <= padding_length; i++)
-        {
-            outBuf[outOff++] = (byte)padding_length;
-        }
-
-        for (int i = blocks_start; i < outOff; i += blockSize)
-        {
-            encryptCipher.processBlock(outBuf, i, outBuf, i);
-        }
-
-        if (encryptThenMAC)
-        {
-            byte[] mac = writeMac.calculateMac(seqNo, type, outBuf, 0, outOff);
-            System.arraycopy(mac, 0, outBuf, outOff, mac.length);
-            outOff += mac.length;
-        }
-
-//        assert outBuf.length == outOff;
-
-        return outBuf;
-    }
-
-    public byte[] decodeCiphertext(long seqNo, short type, byte[] ciphertext, int offset, int len)
-        throws IOException
-    {
-        int blockSize = decryptCipher.getBlockSize();
-        int macSize = readMac.getSize();
-
-        int minLen = blockSize;
-        if (encryptThenMAC)
-        {
-            minLen += macSize;
-        }
-        else
-        {
-            minLen = Math.max(minLen, macSize + 1);
-        }
-
-        if (useExplicitIV)
-        {
-            minLen += blockSize;
-        }
-
-        if (len < minLen)
-        {
-            throw new TlsFatalAlert(AlertDescription.decode_error);
-        }
-
-        int blocks_length = len;
-        if (encryptThenMAC)
-        {
-            blocks_length -= macSize;
-        }
-
-        if (blocks_length % blockSize != 0)
-        {
-            throw new TlsFatalAlert(AlertDescription.decryption_failed);
-        }
-
-        if (encryptThenMAC)
-        {
-            int end = offset + len;
-            byte[] receivedMac = Arrays.copyOfRange(ciphertext, end - macSize, end);
-            byte[] calculatedMac = readMac.calculateMac(seqNo, type, ciphertext, offset, len - macSize);
-
-            boolean badMac = !Arrays.constantTimeAreEqual(calculatedMac, receivedMac);
-            if (badMac)
-            {
-                /*
-                 * RFC 7366 3. The MAC SHALL be evaluated before any further processing such as
-                 * decryption is performed, and if the MAC verification fails, then processing SHALL
-                 * terminate immediately. For TLS, a fatal bad_record_mac MUST be generated [2]. For
-                 * DTLS, the record MUST be discarded, and a fatal bad_record_mac MAY be generated
-                 * [4]. This immediate response to a bad MAC eliminates any timing channels that may
-                 * be available through the use of manipulated packet data.
-                 */
-                throw new TlsFatalAlert(AlertDescription.bad_record_mac);
-            }
-        }
-
-        if (useExplicitIV)
-        {
-            decryptCipher.init(false, new ParametersWithIV(null, ciphertext, offset, blockSize));
-
-            offset += blockSize;
-            blocks_length -= blockSize;
-        }
-
-        for (int i = 0; i < blocks_length; i += blockSize)
-        {
-            decryptCipher.processBlock(ciphertext, offset + i, ciphertext, offset + i);
-        }
-
-        // If there's anything wrong with the padding, this will return zero
-        int totalPad = checkPaddingConstantTime(ciphertext, offset, blocks_length, blockSize, encryptThenMAC ? 0 : macSize);
-        boolean badMac = (totalPad == 0);
-
-        int dec_output_length = blocks_length - totalPad;
-
-        if (!encryptThenMAC)
-        {
-            dec_output_length -= macSize;
-            int macInputLen = dec_output_length;
-            int macOff = offset + macInputLen;
-            byte[] receivedMac = Arrays.copyOfRange(ciphertext, macOff, macOff + macSize);
-            byte[] calculatedMac = readMac.calculateMacConstantTime(seqNo, type, ciphertext, offset, macInputLen,
-                blocks_length - macSize, randomData);
-
-            badMac |= !Arrays.constantTimeAreEqual(calculatedMac, receivedMac);
-        }
-
-        if (badMac)
-        {
-            throw new TlsFatalAlert(AlertDescription.bad_record_mac);
-        }
-
-        return Arrays.copyOfRange(ciphertext, offset, offset + dec_output_length);
-    }
-
-    protected int checkPaddingConstantTime(byte[] buf, int off, int len, int blockSize, int macSize)
-    {
-        int end = off + len;
-        byte lastByte = buf[end - 1];
-        int padlen = lastByte & 0xff;
-        int totalPad = padlen + 1;
-
-        int dummyIndex = 0;
-        byte padDiff = 0;
-
-        if ((TlsUtils.isSSL(context) && totalPad > blockSize) || (macSize + totalPad > len))
-        {
-            totalPad = 0;
-        }
-        else
-        {
-            int padPos = end - totalPad;
-            do
-            {
-                padDiff |= (buf[padPos++] ^ lastByte);
-            }
-            while (padPos < end);
-
-            dummyIndex = totalPad;
-
-            if (padDiff != 0)
-            {
-                totalPad = 0;
-            }
-        }
-
-        // Run some extra dummy checks so the number of checks is always constant
-        {
-            byte[] dummyPad = randomData;
-            while (dummyIndex < 256)
-            {
-                padDiff |= (dummyPad[dummyIndex++] ^ lastByte);
-            }
-            // Ensure the above loop is not eliminated
-            dummyPad[0] ^= padDiff;
-        }
-
-        return totalPad;
-    }
-
-    protected int chooseExtraPadBlocks(SecureRandom r, int max)
-    {
-        // return r.nextInt(max + 1);
-
-        int x = r.nextInt();
-        int n = lowestBitSet(x);
-        return Math.min(n, max);
-    }
-
-    protected int lowestBitSet(int x)
-    {
-        if (x == 0)
-        {
-            return 32;
-        }
-
-        int n = 0;
-        while ((x & 1) == 0)
-        {
-            ++n;
-            x >>= 1;
-        }
-        return n;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsCipher.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsCipher.java
deleted file mode 100644
index 2f0af08..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsCipher.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-import java.io.IOException;
-
-public interface TlsCipher
-{
-    int getPlaintextLimit(int ciphertextLimit);
-
-    byte[] encodePlaintext(long seqNo, short type, byte[] plaintext, int offset, int len)
-        throws IOException;
-
-    byte[] decodeCiphertext(long seqNo, short type, byte[] ciphertext, int offset, int len)
-        throws IOException;
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsCipherFactory.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsCipherFactory.java
deleted file mode 100644
index 7407474..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsCipherFactory.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-import java.io.IOException;
-
-public interface TlsCipherFactory
-{
-    /**
-     * See enumeration classes EncryptionAlgorithm, MACAlgorithm for appropriate argument values
-     */
-    TlsCipher createCipher(TlsContext context, int encryptionAlgorithm, int macAlgorithm)
-        throws IOException;
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsClient.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsClient.java
deleted file mode 100644
index da688b0..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsClient.java
+++ /dev/null
@@ -1,81 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-import java.io.IOException;
-import java.util.Hashtable;
-import java.util.Vector;
-
-public interface TlsClient
-    extends TlsPeer
-{
-    void init(TlsClientContext context);
-
-    /**
-     * Return the session this client wants to resume, if any. Note that the peer's certificate
-     * chain for the session (if any) may need to be periodically revalidated.
-     * 
-     * @return A {@link TlsSession} representing the resumable session to be used for this
-     *         connection, or null to use a new session.
-     * @see SessionParameters#getPeerCertificate()
-     */
-    TlsSession getSessionToResume();
-
-    ProtocolVersion getClientHelloRecordLayerVersion();
-
-    ProtocolVersion getClientVersion();
-
-    boolean isFallback();
-
-    int[] getCipherSuites();
-
-    short[] getCompressionMethods();
-
-    // Hashtable is (Integer -> byte[])
-    Hashtable getClientExtensions()
-        throws IOException;
-
-    void notifyServerVersion(ProtocolVersion selectedVersion)
-        throws IOException;
-
-    /**
-     * Notifies the client of the session_id sent in the ServerHello.
-     *
-     * @param sessionID
-     * @see TlsContext#getResumableSession()
-     */
-    void notifySessionID(byte[] sessionID);
-
-    void notifySelectedCipherSuite(int selectedCipherSuite);
-
-    void notifySelectedCompressionMethod(short selectedCompressionMethod);
-
-    // Hashtable is (Integer -> byte[])
-    void processServerExtensions(Hashtable serverExtensions)
-        throws IOException;
-
-    // Vector is (SupplementalDataEntry)
-    void processServerSupplementalData(Vector serverSupplementalData)
-        throws IOException;
-
-    TlsKeyExchange getKeyExchange()
-        throws IOException;
-
-    TlsAuthentication getAuthentication()
-        throws IOException;
-
-    // Vector is (SupplementalDataEntry)
-    Vector getClientSupplementalData()
-        throws IOException;
-
-    /**
-     * RFC 5077 3.3. NewSessionTicket Handshake Message
-     * <p>
-     * This method will be called (only) when a NewSessionTicket handshake message is received. The
-     * ticket is opaque to the client and clients MUST NOT examine the ticket under the assumption
-     * that it complies with e.g. <i>RFC 5077 4. Recommended Ticket Construction</i>.
-     *
-     * @param newSessionTicket The ticket.
-     * @throws IOException
-     */
-    void notifyNewSessionTicket(NewSessionTicket newSessionTicket)
-        throws IOException;
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsClientContext.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsClientContext.java
deleted file mode 100644
index db9f15b..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsClientContext.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-public interface TlsClientContext
-    extends TlsContext
-{
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsClientContextImpl.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsClientContextImpl.java
deleted file mode 100644
index b320144..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsClientContextImpl.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-import java.security.SecureRandom;
-
-class TlsClientContextImpl
-    extends AbstractTlsContext
-    implements TlsClientContext
-{
-    TlsClientContextImpl(SecureRandom secureRandom, SecurityParameters securityParameters)
-    {
-        super(secureRandom, securityParameters);
-    }
-
-    public boolean isServer()
-    {
-        return false;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsClientProtocol.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsClientProtocol.java
deleted file mode 100644
index a776287..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsClientProtocol.java
+++ /dev/null
@@ -1,934 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.security.SecureRandom;
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Vector;
-
-import org.bouncycastle.util.Arrays;
-
-public class TlsClientProtocol
-    extends TlsProtocol
-{
-    protected TlsClient tlsClient = null;
-    TlsClientContextImpl tlsClientContext = null;
-
-    protected byte[] selectedSessionID = null;
-
-    protected TlsKeyExchange keyExchange = null;
-    protected TlsAuthentication authentication = null;
-
-    protected CertificateStatus certificateStatus = null;
-    protected CertificateRequest certificateRequest = null;
-
-    public TlsClientProtocol(InputStream input, OutputStream output, SecureRandom secureRandom)
-    {
-        super(input, output, secureRandom);
-    }
-
-    /**
-     * Initiates a TLS handshake in the role of client
-     *
-     * @param tlsClient The {@link TlsClient} to use for the handshake.
-     * @throws IOException If handshake was not successful.
-     */
-    public void connect(TlsClient tlsClient) throws IOException
-    {
-        if (tlsClient == null)
-        {
-            throw new IllegalArgumentException("'tlsClient' cannot be null");
-        }
-        if (this.tlsClient != null)
-        {
-            throw new IllegalStateException("'connect' can only be called once");
-        }
-
-        this.tlsClient = tlsClient;
-
-        this.securityParameters = new SecurityParameters();
-        this.securityParameters.entity = ConnectionEnd.client;
-
-        this.tlsClientContext = new TlsClientContextImpl(secureRandom, securityParameters);
-
-        this.securityParameters.clientRandom = createRandomBlock(tlsClient.shouldUseGMTUnixTime(),
-            tlsClientContext.getNonceRandomGenerator());
-
-        this.tlsClient.init(tlsClientContext);
-        this.recordStream.init(tlsClientContext);
-
-        TlsSession sessionToResume = tlsClient.getSessionToResume();
-        if (sessionToResume != null)
-        {
-            SessionParameters sessionParameters = sessionToResume.exportSessionParameters();
-            if (sessionParameters != null)
-            {
-                this.tlsSession = sessionToResume;
-                this.sessionParameters = sessionParameters;
-            }
-        }
-
-        sendClientHelloMessage();
-        this.connection_state = CS_CLIENT_HELLO;
-
-        completeHandshake();
-    }
-
-    protected void cleanupHandshake()
-    {
-        super.cleanupHandshake();
-
-        this.selectedSessionID = null;
-        this.keyExchange = null;
-        this.authentication = null;
-        this.certificateStatus = null;
-        this.certificateRequest = null;
-    }
-
-    protected TlsContext getContext()
-    {
-        return tlsClientContext;
-    }
-
-    AbstractTlsContext getContextAdmin()
-    {
-        return tlsClientContext;
-    }
-    
-    protected TlsPeer getPeer()
-    {
-        return tlsClient;
-    }
-
-    protected void handleHandshakeMessage(short type, byte[] data)
-        throws IOException
-    {
-        ByteArrayInputStream buf = new ByteArrayInputStream(data);
-
-        if (this.resumedSession)
-        {
-            if (type != HandshakeType.finished || this.connection_state != CS_SERVER_HELLO)
-            {
-                throw new TlsFatalAlert(AlertDescription.unexpected_message);
-            }
-
-            processFinishedMessage(buf);
-            this.connection_state = CS_SERVER_FINISHED;
-
-            sendFinishedMessage();
-            this.connection_state = CS_CLIENT_FINISHED;
-            this.connection_state = CS_END;
-
-            return;
-        }
-
-        switch (type)
-        {
-        case HandshakeType.certificate:
-        {
-            switch (this.connection_state)
-            {
-            case CS_SERVER_HELLO:
-            {
-                handleSupplementalData(null);
-                // NB: Fall through to next case label
-            }
-            case CS_SERVER_SUPPLEMENTAL_DATA:
-            {
-                // Parse the Certificate message and send to cipher suite
-
-                this.peerCertificate = Certificate.parse(buf);
-
-                assertEmpty(buf);
-
-                // TODO[RFC 3546] Check whether empty certificates is possible, allowed, or excludes CertificateStatus
-                if (this.peerCertificate == null || this.peerCertificate.isEmpty())
-                {
-                    this.allowCertificateStatus = false;
-                }
-
-                this.keyExchange.processServerCertificate(this.peerCertificate);
-
-                this.authentication = tlsClient.getAuthentication();
-                this.authentication.notifyServerCertificate(this.peerCertificate);
-
-                break;
-            }
-            default:
-                throw new TlsFatalAlert(AlertDescription.unexpected_message);
-            }
-
-            this.connection_state = CS_SERVER_CERTIFICATE;
-            break;
-        }
-        case HandshakeType.certificate_status:
-        {
-            switch (this.connection_state)
-            {
-            case CS_SERVER_CERTIFICATE:
-            {
-                if (!this.allowCertificateStatus)
-                {
-                    /*
-                     * RFC 3546 3.6. If a server returns a "CertificateStatus" message, then the
-                     * server MUST have included an extension of type "status_request" with empty
-                     * "extension_data" in the extended server hello..
-                     */
-                    throw new TlsFatalAlert(AlertDescription.unexpected_message);
-                }
-
-                this.certificateStatus = CertificateStatus.parse(buf);
-
-                assertEmpty(buf);
-
-                // TODO[RFC 3546] Figure out how to provide this to the client/authentication.
-
-                this.connection_state = CS_CERTIFICATE_STATUS;
-                break;
-            }
-            default:
-                throw new TlsFatalAlert(AlertDescription.unexpected_message);
-            }
-            break;
-        }
-        case HandshakeType.finished:
-        {
-            switch (this.connection_state)
-            {
-            case CS_CLIENT_FINISHED:
-            {
-                if (this.expectSessionTicket)
-                {
-                    /*
-                     * RFC 5077 3.3. This message MUST be sent if the server included a
-                     * SessionTicket extension in the ServerHello.
-                     */
-                    throw new TlsFatalAlert(AlertDescription.unexpected_message);
-                }
-
-                // NB: Fall through to next case label
-            }
-            case CS_SERVER_SESSION_TICKET:
-            {
-                processFinishedMessage(buf);
-                this.connection_state = CS_SERVER_FINISHED;
-                this.connection_state = CS_END;
-                break;
-            }
-            default:
-                throw new TlsFatalAlert(AlertDescription.unexpected_message);
-            }
-            break;
-        }
-        case HandshakeType.server_hello:
-        {
-            switch (this.connection_state)
-            {
-            case CS_CLIENT_HELLO:
-            {
-                receiveServerHelloMessage(buf);
-                this.connection_state = CS_SERVER_HELLO;
-
-                if (this.securityParameters.maxFragmentLength >= 0)
-                {
-                    int plainTextLimit = 1 << (8 + this.securityParameters.maxFragmentLength);
-                    recordStream.setPlaintextLimit(plainTextLimit);
-                }
-
-                this.securityParameters.prfAlgorithm = getPRFAlgorithm(getContext(),
-                    this.securityParameters.getCipherSuite());
-
-                /*
-                 * RFC 5264 7.4.9. Any cipher suite which does not explicitly specify
-                 * verify_data_length has a verify_data_length equal to 12. This includes all
-                 * existing cipher suites.
-                 */
-                this.securityParameters.verifyDataLength = 12;
-
-                this.recordStream.notifyHelloComplete();
-
-                if (this.resumedSession)
-                {
-                    this.securityParameters.masterSecret = Arrays.clone(this.sessionParameters.getMasterSecret());
-                    this.recordStream.setPendingConnectionState(getPeer().getCompression(), getPeer().getCipher());
-
-                    sendChangeCipherSpecMessage();
-                }
-                else
-                {
-                    invalidateSession();
-
-                    if (this.selectedSessionID.length > 0)
-                    {
-                        this.tlsSession = new TlsSessionImpl(this.selectedSessionID, null);
-                    }
-                }
-
-                break;
-            }
-            default:
-                throw new TlsFatalAlert(AlertDescription.unexpected_message);
-            }
-            break;
-        }
-        case HandshakeType.supplemental_data:
-        {
-            switch (this.connection_state)
-            {
-            case CS_SERVER_HELLO:
-            {
-                handleSupplementalData(readSupplementalDataMessage(buf));
-                break;
-            }
-            default:
-                throw new TlsFatalAlert(AlertDescription.unexpected_message);
-            }
-            break;
-        }
-        case HandshakeType.server_hello_done:
-        {
-            switch (this.connection_state)
-            {
-            case CS_SERVER_HELLO:
-            {
-                handleSupplementalData(null);
-                // NB: Fall through to next case label
-            }
-            case CS_SERVER_SUPPLEMENTAL_DATA:
-            {
-                // There was no server certificate message; check it's OK
-                this.keyExchange.skipServerCredentials();
-                this.authentication = null;
-
-                // NB: Fall through to next case label
-            }
-            case CS_SERVER_CERTIFICATE:
-            case CS_CERTIFICATE_STATUS:
-            {
-                // There was no server key exchange message; check it's OK
-                this.keyExchange.skipServerKeyExchange();
-
-                // NB: Fall through to next case label
-            }
-            case CS_SERVER_KEY_EXCHANGE:
-            case CS_CERTIFICATE_REQUEST:
-            {
-                assertEmpty(buf);
-
-                this.connection_state = CS_SERVER_HELLO_DONE;
-
-                this.recordStream.getHandshakeHash().sealHashAlgorithms();
-
-                Vector clientSupplementalData = tlsClient.getClientSupplementalData();
-                if (clientSupplementalData != null)
-                {
-                    sendSupplementalDataMessage(clientSupplementalData);
-                }
-                this.connection_state = CS_CLIENT_SUPPLEMENTAL_DATA;
-
-                TlsCredentials clientCreds = null;
-                if (certificateRequest == null)
-                {
-                    this.keyExchange.skipClientCredentials();
-                }
-                else
-                {
-                    clientCreds = this.authentication.getClientCredentials(certificateRequest);
-
-                    if (clientCreds == null)
-                    {
-                        this.keyExchange.skipClientCredentials();
-
-                        /*
-                         * RFC 5246 If no suitable certificate is available, the client MUST send a
-                         * certificate message containing no certificates.
-                         * 
-                         * NOTE: In previous RFCs, this was SHOULD instead of MUST.
-                         */
-                        sendCertificateMessage(Certificate.EMPTY_CHAIN);
-                    }
-                    else
-                    {
-                        this.keyExchange.processClientCredentials(clientCreds);
-
-                        sendCertificateMessage(clientCreds.getCertificate());
-                    }
-                }
-
-                this.connection_state = CS_CLIENT_CERTIFICATE;
-
-                /*
-                 * Send the client key exchange message, depending on the key exchange we are using
-                 * in our CipherSuite.
-                 */
-                sendClientKeyExchangeMessage();
-                this.connection_state = CS_CLIENT_KEY_EXCHANGE;
-
-                TlsHandshakeHash prepareFinishHash = recordStream.prepareToFinish();
-                this.securityParameters.sessionHash = getCurrentPRFHash(getContext(), prepareFinishHash, null);
-
-                establishMasterSecret(getContext(), keyExchange);
-                recordStream.setPendingConnectionState(getPeer().getCompression(), getPeer().getCipher());
-
-                if (clientCreds != null && clientCreds instanceof TlsSignerCredentials)
-                {
-                    TlsSignerCredentials signerCredentials = (TlsSignerCredentials)clientCreds;
-
-                    /*
-                     * RFC 5246 4.7. digitally-signed element needs SignatureAndHashAlgorithm from TLS 1.2
-                     */
-                    SignatureAndHashAlgorithm signatureAndHashAlgorithm = TlsUtils.getSignatureAndHashAlgorithm(
-                        getContext(), signerCredentials);
-
-                    byte[] hash;
-                    if (signatureAndHashAlgorithm == null)
-                    {
-                        hash = securityParameters.getSessionHash();
-                    }
-                    else
-                    {
-                        hash = prepareFinishHash.getFinalHash(signatureAndHashAlgorithm.getHash());
-                    }
-
-                    byte[] signature = signerCredentials.generateCertificateSignature(hash);
-                    DigitallySigned certificateVerify = new DigitallySigned(signatureAndHashAlgorithm, signature);
-                    sendCertificateVerifyMessage(certificateVerify);
-
-                    this.connection_state = CS_CERTIFICATE_VERIFY;
-                }
-
-                sendChangeCipherSpecMessage();
-                sendFinishedMessage();
-                break;
-            }
-            default:
-                throw new TlsFatalAlert(AlertDescription.handshake_failure);
-            }
-
-            this.connection_state = CS_CLIENT_FINISHED;
-            break;
-        }
-        case HandshakeType.server_key_exchange:
-        {
-            switch (this.connection_state)
-            {
-            case CS_SERVER_HELLO:
-            {
-                handleSupplementalData(null);
-                // NB: Fall through to next case label
-            }
-            case CS_SERVER_SUPPLEMENTAL_DATA:
-            {
-                // There was no server certificate message; check it's OK
-                this.keyExchange.skipServerCredentials();
-                this.authentication = null;
-
-                // NB: Fall through to next case label
-            }
-            case CS_SERVER_CERTIFICATE:
-            case CS_CERTIFICATE_STATUS:
-            {
-                this.keyExchange.processServerKeyExchange(buf);
-
-                assertEmpty(buf);
-                break;
-            }
-            default:
-                throw new TlsFatalAlert(AlertDescription.unexpected_message);
-            }
-
-            this.connection_state = CS_SERVER_KEY_EXCHANGE;
-            break;
-        }
-        case HandshakeType.certificate_request:
-        {
-            switch (this.connection_state)
-            {
-            case CS_SERVER_CERTIFICATE:
-            case CS_CERTIFICATE_STATUS:
-            {
-                // There was no server key exchange message; check it's OK
-                this.keyExchange.skipServerKeyExchange();
-
-                // NB: Fall through to next case label
-            }
-            case CS_SERVER_KEY_EXCHANGE:
-            {
-                if (this.authentication == null)
-                {
-                    /*
-                     * RFC 2246 7.4.4. It is a fatal handshake_failure alert for an anonymous server
-                     * to request client identification.
-                     */
-                    throw new TlsFatalAlert(AlertDescription.handshake_failure);
-                }
-
-                this.certificateRequest = CertificateRequest.parse(getContext(), buf);
-
-                assertEmpty(buf);
-
-                this.keyExchange.validateCertificateRequest(this.certificateRequest);
-
-                /*
-                 * TODO Give the client a chance to immediately select the CertificateVerify hash
-                 * algorithm here to avoid tracking the other hash algorithms unnecessarily?
-                 */
-                TlsUtils.trackHashAlgorithms(this.recordStream.getHandshakeHash(),
-                    this.certificateRequest.getSupportedSignatureAlgorithms());
-
-                break;
-            }
-            default:
-                throw new TlsFatalAlert(AlertDescription.unexpected_message);
-            }
-
-            this.connection_state = CS_CERTIFICATE_REQUEST;
-            break;
-        }
-        case HandshakeType.session_ticket:
-        {
-            switch (this.connection_state)
-            {
-            case CS_CLIENT_FINISHED:
-            {
-                if (!this.expectSessionTicket)
-                {
-                    /*
-                     * RFC 5077 3.3. This message MUST NOT be sent if the server did not include a
-                     * SessionTicket extension in the ServerHello.
-                     */
-                    throw new TlsFatalAlert(AlertDescription.unexpected_message);
-                }
-
-                /*
-                 * RFC 5077 3.4. If the client receives a session ticket from the server, then it
-                 * discards any Session ID that was sent in the ServerHello.
-                 */
-                invalidateSession();
-
-                receiveNewSessionTicketMessage(buf);
-                break;
-            }
-            default:
-                throw new TlsFatalAlert(AlertDescription.unexpected_message);
-            }
-
-            this.connection_state = CS_SERVER_SESSION_TICKET;
-            break;
-        }
-        case HandshakeType.hello_request:
-        {
-            assertEmpty(buf);
-
-            /*
-             * RFC 2246 7.4.1.1 Hello request This message will be ignored by the client if the
-             * client is currently negotiating a session. This message may be ignored by the client
-             * if it does not wish to renegotiate a session, or the client may, if it wishes,
-             * respond with a no_renegotiation alert.
-             */
-            if (this.connection_state == CS_END)
-            {
-                /*
-                 * RFC 5746 4.5 SSLv3 clients that refuse renegotiation SHOULD use a fatal
-                 * handshake_failure alert.
-                 */
-                if (TlsUtils.isSSL(getContext()))
-                {
-                    throw new TlsFatalAlert(AlertDescription.handshake_failure);
-                }
-
-                String message = "Renegotiation not supported";
-                raiseWarning(AlertDescription.no_renegotiation, message);
-            }
-            break;
-        }
-        case HandshakeType.client_hello:
-        case HandshakeType.client_key_exchange:
-        case HandshakeType.certificate_verify:
-        case HandshakeType.hello_verify_request:
-        default:
-            throw new TlsFatalAlert(AlertDescription.unexpected_message);
-        }
-    }
-
-    protected void handleSupplementalData(Vector serverSupplementalData)
-        throws IOException
-    {
-        this.tlsClient.processServerSupplementalData(serverSupplementalData);
-        this.connection_state = CS_SERVER_SUPPLEMENTAL_DATA;
-
-        this.keyExchange = tlsClient.getKeyExchange();
-        this.keyExchange.init(getContext());
-    }
-
-    protected void receiveNewSessionTicketMessage(ByteArrayInputStream buf)
-        throws IOException
-    {
-        NewSessionTicket newSessionTicket = NewSessionTicket.parse(buf);
-
-        assertEmpty(buf);
-
-        tlsClient.notifyNewSessionTicket(newSessionTicket);
-    }
-
-    protected void receiveServerHelloMessage(ByteArrayInputStream buf)
-        throws IOException
-    {
-        ProtocolVersion server_version = TlsUtils.readVersion(buf);
-        if (server_version.isDTLS())
-        {
-            throw new TlsFatalAlert(AlertDescription.illegal_parameter);
-        }
-
-        // Check that this matches what the server is sending in the record layer
-        if (!server_version.equals(this.recordStream.getReadVersion()))
-        {
-            throw new TlsFatalAlert(AlertDescription.illegal_parameter);
-        }
-
-        ProtocolVersion client_version = getContext().getClientVersion();
-        if (!server_version.isEqualOrEarlierVersionOf(client_version))
-        {
-            throw new TlsFatalAlert(AlertDescription.illegal_parameter);
-        }
-
-        this.recordStream.setWriteVersion(server_version);
-        getContextAdmin().setServerVersion(server_version);
-        this.tlsClient.notifyServerVersion(server_version);
-
-        /*
-         * Read the server random
-         */
-        this.securityParameters.serverRandom = TlsUtils.readFully(32, buf);
-
-        this.selectedSessionID = TlsUtils.readOpaque8(buf);
-        if (this.selectedSessionID.length > 32)
-        {
-            throw new TlsFatalAlert(AlertDescription.illegal_parameter);
-        }
-
-        this.tlsClient.notifySessionID(this.selectedSessionID);
-
-        this.resumedSession = this.selectedSessionID.length > 0 && this.tlsSession != null
-            && Arrays.areEqual(this.selectedSessionID, this.tlsSession.getSessionID());
-
-        /*
-         * Find out which CipherSuite the server has chosen and check that it was one of the offered
-         * ones, and is a valid selection for the negotiated version.
-         */
-        int selectedCipherSuite = TlsUtils.readUint16(buf);
-        if (!Arrays.contains(this.offeredCipherSuites, selectedCipherSuite)
-            || selectedCipherSuite == CipherSuite.TLS_NULL_WITH_NULL_NULL
-            || CipherSuite.isSCSV(selectedCipherSuite)
-            || !TlsUtils.isValidCipherSuiteForVersion(selectedCipherSuite, server_version))
-        {
-            throw new TlsFatalAlert(AlertDescription.illegal_parameter);
-        }
-
-        this.tlsClient.notifySelectedCipherSuite(selectedCipherSuite);
-
-        /*
-         * Find out which CompressionMethod the server has chosen and check that it was one of the
-         * offered ones.
-         */
-        short selectedCompressionMethod = TlsUtils.readUint8(buf);
-        if (!Arrays.contains(this.offeredCompressionMethods, selectedCompressionMethod))
-        {
-            throw new TlsFatalAlert(AlertDescription.illegal_parameter);
-        }
-
-        this.tlsClient.notifySelectedCompressionMethod(selectedCompressionMethod);
-
-        /*
-         * RFC3546 2.2 The extended server hello message format MAY be sent in place of the server
-         * hello message when the client has requested extended functionality via the extended
-         * client hello message specified in Section 2.1. ... Note that the extended server hello
-         * message is only sent in response to an extended client hello message. This prevents the
-         * possibility that the extended server hello message could "break" existing TLS 1.0
-         * clients.
-         */
-        this.serverExtensions = readExtensions(buf);
-
-        /*
-         * draft-ietf-tls-session-hash-01 5.2. If a server receives the "extended_master_secret"
-         * extension, it MUST include the "extended_master_secret" extension in its ServerHello
-         * message.
-         */
-        boolean serverSentExtendedMasterSecret = TlsExtensionsUtils.hasExtendedMasterSecretExtension(serverExtensions);
-        if (serverSentExtendedMasterSecret != securityParameters.extendedMasterSecret)
-        {
-            throw new TlsFatalAlert(AlertDescription.handshake_failure);
-        }
-
-        /*
-         * RFC 3546 2.2 Note that the extended server hello message is only sent in response to an
-         * extended client hello message.
-         * 
-         * However, see RFC 5746 exception below. We always include the SCSV, so an Extended Server
-         * Hello is always allowed.
-         */
-        if (this.serverExtensions != null)
-        {
-            Enumeration e = this.serverExtensions.keys();
-            while (e.hasMoreElements())
-            {
-                Integer extType = (Integer)e.nextElement();
-
-                /*
-                 * RFC 5746 3.6. Note that sending a "renegotiation_info" extension in response to a
-                 * ClientHello containing only the SCSV is an explicit exception to the prohibition
-                 * in RFC 5246, Section 7.4.1.4, on the server sending unsolicited extensions and is
-                 * only allowed because the client is signaling its willingness to receive the
-                 * extension via the TLS_EMPTY_RENEGOTIATION_INFO_SCSV SCSV.
-                 */
-                if (extType.equals(EXT_RenegotiationInfo))
-                {
-                    continue;
-                }
-
-                /*
-                 * RFC 5246 7.4.1.4 An extension type MUST NOT appear in the ServerHello unless the
-                 * same extension type appeared in the corresponding ClientHello. If a client
-                 * receives an extension type in ServerHello that it did not request in the
-                 * associated ClientHello, it MUST abort the handshake with an unsupported_extension
-                 * fatal alert.
-                 */
-                if (null == TlsUtils.getExtensionData(this.clientExtensions, extType))
-                {
-                    throw new TlsFatalAlert(AlertDescription.unsupported_extension);
-                }
-
-                /*
-                 * draft-ietf-tls-session-hash-01 5.2. Implementation note: if the server decides to
-                 * proceed with resumption, the extension does not have any effect. Requiring the
-                 * extension to be included anyway makes the extension negotiation logic easier,
-                 * because it does not depend on whether resumption is accepted or not.
-                 */
-                if (extType.equals(TlsExtensionsUtils.EXT_extended_master_secret))
-                {
-                    continue;
-                }
-
-                /*
-                 * RFC 3546 2.3. If [...] the older session is resumed, then the server MUST ignore
-                 * extensions appearing in the client hello, and send a server hello containing no
-                 * extensions[.]
-                 */
-                if (this.resumedSession)
-                {
-                    // TODO[compat-gnutls] GnuTLS test server sends server extensions e.g. ec_point_formats
-                    // TODO[compat-openssl] OpenSSL test server sends server extensions e.g. ec_point_formats
-                    // TODO[compat-polarssl] PolarSSL test server sends server extensions e.g. ec_point_formats
-//                    throw new TlsFatalAlert(AlertDescription.illegal_parameter);
-                }
-            }
-        }
-
-        /*
-         * RFC 5746 3.4. Client Behavior: Initial Handshake
-         */
-        {
-            /*
-             * When a ServerHello is received, the client MUST check if it includes the
-             * "renegotiation_info" extension:
-             */
-            byte[] renegExtData = TlsUtils.getExtensionData(this.serverExtensions, EXT_RenegotiationInfo);
-            if (renegExtData != null)
-            {
-                /*
-                 * If the extension is present, set the secure_renegotiation flag to TRUE. The
-                 * client MUST then verify that the length of the "renegotiated_connection"
-                 * field is zero, and if it is not, MUST abort the handshake (by sending a fatal
-                 * handshake_failure alert).
-                 */
-                this.secure_renegotiation = true;
-
-                if (!Arrays.constantTimeAreEqual(renegExtData, createRenegotiationInfo(TlsUtils.EMPTY_BYTES)))
-                {
-                    throw new TlsFatalAlert(AlertDescription.handshake_failure);
-                }
-            }
-        }
-
-        // TODO[compat-gnutls] GnuTLS test server fails to send renegotiation_info extension when resuming
-        this.tlsClient.notifySecureRenegotiation(this.secure_renegotiation);
-
-        Hashtable sessionClientExtensions = clientExtensions, sessionServerExtensions = serverExtensions;
-        if (this.resumedSession)
-        {
-            if (selectedCipherSuite != this.sessionParameters.getCipherSuite()
-                || selectedCompressionMethod != this.sessionParameters.getCompressionAlgorithm())
-            {
-                throw new TlsFatalAlert(AlertDescription.illegal_parameter);
-            }
-
-            sessionClientExtensions = null;
-            sessionServerExtensions = this.sessionParameters.readServerExtensions();
-
-            this.securityParameters.extendedMasterSecret = TlsExtensionsUtils.hasExtendedMasterSecretExtension(sessionServerExtensions);
-        }
-
-        this.securityParameters.cipherSuite = selectedCipherSuite;
-        this.securityParameters.compressionAlgorithm = selectedCompressionMethod;
-
-        if (sessionServerExtensions != null)
-        {
-            /*
-             * RFC 7366 3. If a server receives an encrypt-then-MAC request extension from a client
-             * and then selects a stream or Authenticated Encryption with Associated Data (AEAD)
-             * ciphersuite, it MUST NOT send an encrypt-then-MAC response extension back to the
-             * client.
-             */
-            boolean serverSentEncryptThenMAC = TlsExtensionsUtils.hasEncryptThenMACExtension(sessionServerExtensions);
-            if (serverSentEncryptThenMAC && !TlsUtils.isBlockCipherSuite(selectedCipherSuite))
-            {
-                throw new TlsFatalAlert(AlertDescription.illegal_parameter);
-            }
-
-            this.securityParameters.encryptThenMAC = serverSentEncryptThenMAC;
-
-            this.securityParameters.maxFragmentLength = processMaxFragmentLengthExtension(sessionClientExtensions,
-                sessionServerExtensions, AlertDescription.illegal_parameter);
-
-            this.securityParameters.truncatedHMac = TlsExtensionsUtils.hasTruncatedHMacExtension(sessionServerExtensions);
-
-            /*
-             * TODO It's surprising that there's no provision to allow a 'fresh' CertificateStatus to be sent in
-             * a session resumption handshake.
-             */
-            this.allowCertificateStatus = !this.resumedSession
-                && TlsUtils.hasExpectedEmptyExtensionData(sessionServerExtensions,
-                    TlsExtensionsUtils.EXT_status_request, AlertDescription.illegal_parameter);
-
-            this.expectSessionTicket = !this.resumedSession
-                && TlsUtils.hasExpectedEmptyExtensionData(sessionServerExtensions, TlsProtocol.EXT_SessionTicket,
-                    AlertDescription.illegal_parameter);
-        }
-
-        if (sessionClientExtensions != null)
-        {
-            this.tlsClient.processServerExtensions(sessionServerExtensions);
-        }
-    }
-
-    protected void sendCertificateVerifyMessage(DigitallySigned certificateVerify)
-        throws IOException
-    {
-        HandshakeMessage message = new HandshakeMessage(HandshakeType.certificate_verify);
-
-        certificateVerify.encode(message);
-
-        message.writeToRecordStream();
-    }
-
-    protected void sendClientHelloMessage()
-        throws IOException
-    {
-        this.recordStream.setWriteVersion(this.tlsClient.getClientHelloRecordLayerVersion());
-
-        ProtocolVersion client_version = this.tlsClient.getClientVersion();
-        if (client_version.isDTLS())
-        {
-            throw new TlsFatalAlert(AlertDescription.internal_error);
-        }
-
-        getContextAdmin().setClientVersion(client_version);
-
-        /*
-         * TODO RFC 5077 3.4. When presenting a ticket, the client MAY generate and include a
-         * Session ID in the TLS ClientHello.
-         */
-        byte[] session_id = TlsUtils.EMPTY_BYTES;
-        if (this.tlsSession != null)
-        {
-            session_id = this.tlsSession.getSessionID();
-            if (session_id == null || session_id.length > 32)
-            {
-                session_id = TlsUtils.EMPTY_BYTES;
-            }
-        }
-
-        boolean fallback = this.tlsClient.isFallback();
-
-        this.offeredCipherSuites = this.tlsClient.getCipherSuites();
-
-        this.offeredCompressionMethods = this.tlsClient.getCompressionMethods();
-
-        if (session_id.length > 0 && this.sessionParameters != null)
-        {
-            if (!Arrays.contains(this.offeredCipherSuites, sessionParameters.getCipherSuite())
-                || !Arrays.contains(this.offeredCompressionMethods, sessionParameters.getCompressionAlgorithm()))
-            {
-                session_id = TlsUtils.EMPTY_BYTES;
-            }
-        }
-
-        this.clientExtensions = this.tlsClient.getClientExtensions();
-
-        this.securityParameters.extendedMasterSecret = TlsExtensionsUtils.hasExtendedMasterSecretExtension(clientExtensions);
-
-        HandshakeMessage message = new HandshakeMessage(HandshakeType.client_hello);
-
-        TlsUtils.writeVersion(client_version, message);
-
-        message.write(this.securityParameters.getClientRandom());
-
-        TlsUtils.writeOpaque8(session_id, message);
-
-        // Cipher Suites (and SCSV)
-        {
-            /*
-             * RFC 5746 3.4. The client MUST include either an empty "renegotiation_info" extension,
-             * or the TLS_EMPTY_RENEGOTIATION_INFO_SCSV signaling cipher suite value in the
-             * ClientHello. Including both is NOT RECOMMENDED.
-             */
-            byte[] renegExtData = TlsUtils.getExtensionData(clientExtensions, EXT_RenegotiationInfo);
-            boolean noRenegExt = (null == renegExtData);
-
-            boolean noRenegSCSV = !Arrays.contains(offeredCipherSuites, CipherSuite.TLS_EMPTY_RENEGOTIATION_INFO_SCSV);
-
-            if (noRenegExt && noRenegSCSV)
-            {
-                // TODO Consider whether to default to a client extension instead
-//                this.clientExtensions = TlsExtensionsUtils.ensureExtensionsInitialised(this.clientExtensions);
-//                this.clientExtensions.put(EXT_RenegotiationInfo, createRenegotiationInfo(TlsUtils.EMPTY_BYTES));
-                this.offeredCipherSuites = Arrays.append(offeredCipherSuites, CipherSuite.TLS_EMPTY_RENEGOTIATION_INFO_SCSV);
-            }
-
-            /*
-             * draft-ietf-tls-downgrade-scsv-00 4. If a client sends a ClientHello.client_version
-             * containing a lower value than the latest (highest-valued) version supported by the
-             * client, it SHOULD include the TLS_FALLBACK_SCSV cipher suite value in
-             * ClientHello.cipher_suites.
-             */
-            if (fallback && !Arrays.contains(offeredCipherSuites, CipherSuite.TLS_FALLBACK_SCSV))
-            {
-                this.offeredCipherSuites = Arrays.append(offeredCipherSuites, CipherSuite.TLS_FALLBACK_SCSV);
-            }
-
-            TlsUtils.writeUint16ArrayWithUint16Length(offeredCipherSuites, message);
-        }
-
-        TlsUtils.writeUint8ArrayWithUint8Length(offeredCompressionMethods, message);
-
-        if (clientExtensions != null)
-        {
-            writeExtensions(message, clientExtensions);
-        }
-
-        message.writeToRecordStream();
-    }
-
-    protected void sendClientKeyExchangeMessage()
-        throws IOException
-    {
-        HandshakeMessage message = new HandshakeMessage(HandshakeType.client_key_exchange);
-
-        this.keyExchange.generateClientKeyExchange(message);
-
-        message.writeToRecordStream();
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsCompression.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsCompression.java
deleted file mode 100644
index cdeb7e3..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsCompression.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-import java.io.OutputStream;
-
-public interface TlsCompression
-{
-    OutputStream compress(OutputStream output);
-
-    OutputStream decompress(OutputStream output);
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsContext.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsContext.java
deleted file mode 100644
index b3d7d98..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsContext.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-import java.security.SecureRandom;
-
-import org.bouncycastle.crypto.prng.RandomGenerator;
-
-public interface TlsContext
-{
-    RandomGenerator getNonceRandomGenerator();
-
-    SecureRandom getSecureRandom();
-
-    SecurityParameters getSecurityParameters();
-
-    boolean isServer();
-
-    ProtocolVersion getClientVersion();
-
-    ProtocolVersion getServerVersion();
-
-    /**
-     * Used to get the resumable session, if any, used by this connection. Only available after the
-     * handshake has successfully completed.
-     * 
-     * @return A {@link TlsSession} representing the resumable session used by this connection, or
-     *         null if no resumable session available.
-     * @see TlsPeer#notifyHandshakeComplete()
-     */
-    TlsSession getResumableSession();
-
-    Object getUserObject();
-
-    void setUserObject(Object userObject);
-
-    /**
-     * Export keying material according to RFC 5705: "Keying Material Exporters for TLS".
-     *
-     * @param asciiLabel    indicates which application will use the exported keys.
-     * @param context_value allows the application using the exporter to mix its own data with the TLS PRF for
-     *                      the exporter output.
-     * @param length        the number of bytes to generate
-     * @return a pseudorandom bit string of 'length' bytes generated from the master_secret.
-     */
-    byte[] exportKeyingMaterial(String asciiLabel, byte[] context_value, int length);
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsCredentials.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsCredentials.java
deleted file mode 100644
index b8a8747..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsCredentials.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-public interface TlsCredentials
-{
-    Certificate getCertificate();
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsDHEKeyExchange.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsDHEKeyExchange.java
deleted file mode 100644
index d469ca6..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsDHEKeyExchange.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Vector;
-
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.Signer;
-import org.bouncycastle.crypto.params.DHParameters;
-import org.bouncycastle.util.io.TeeInputStream;
-
-public class TlsDHEKeyExchange
-    extends TlsDHKeyExchange
-{
-    protected TlsSignerCredentials serverCredentials = null;
-
-    public TlsDHEKeyExchange(int keyExchange, Vector supportedSignatureAlgorithms, DHParameters dhParameters)
-    {
-        super(keyExchange, supportedSignatureAlgorithms, dhParameters);
-    }
-
-    public void processServerCredentials(TlsCredentials serverCredentials)
-        throws IOException
-    {
-        if (!(serverCredentials instanceof TlsSignerCredentials))
-        {
-            throw new TlsFatalAlert(AlertDescription.internal_error);
-        }
-
-        processServerCertificate(serverCredentials.getCertificate());
-
-        this.serverCredentials = (TlsSignerCredentials)serverCredentials;
-    }
-
-    public byte[] generateServerKeyExchange()
-        throws IOException
-    {
-        if (this.dhParameters == null)
-        {
-            throw new TlsFatalAlert(AlertDescription.internal_error);
-        }
-
-        DigestInputBuffer buf = new DigestInputBuffer();
-
-        this.dhAgreePrivateKey = TlsDHUtils.generateEphemeralServerKeyExchange(context.getSecureRandom(),
-            this.dhParameters, buf);
-
-        /*
-         * RFC 5246 4.7. digitally-signed element needs SignatureAndHashAlgorithm from TLS 1.2
-         */
-        SignatureAndHashAlgorithm signatureAndHashAlgorithm = TlsUtils.getSignatureAndHashAlgorithm(
-            context, serverCredentials);
-
-        Digest d = TlsUtils.createHash(signatureAndHashAlgorithm);
-
-        SecurityParameters securityParameters = context.getSecurityParameters();
-        d.update(securityParameters.clientRandom, 0, securityParameters.clientRandom.length);
-        d.update(securityParameters.serverRandom, 0, securityParameters.serverRandom.length);
-        buf.updateDigest(d);
-
-        byte[] hash = new byte[d.getDigestSize()];
-        d.doFinal(hash, 0);
-
-        byte[] signature = serverCredentials.generateCertificateSignature(hash);
-
-        DigitallySigned signed_params = new DigitallySigned(signatureAndHashAlgorithm, signature);
-        signed_params.encode(buf);
-
-        return buf.toByteArray();
-    }
-
-    public void processServerKeyExchange(InputStream input)
-        throws IOException
-    {
-        SecurityParameters securityParameters = context.getSecurityParameters();
-
-        SignerInputBuffer buf = new SignerInputBuffer();
-        InputStream teeIn = new TeeInputStream(input, buf);
-
-        ServerDHParams dhParams = ServerDHParams.parse(teeIn);
-
-        DigitallySigned signed_params = DigitallySigned.parse(context, input);
-
-        Signer signer = initVerifyer(tlsSigner, signed_params.getAlgorithm(), securityParameters);
-        buf.updateSigner(signer);
-        if (!signer.verifySignature(signed_params.getSignature()))
-        {
-            throw new TlsFatalAlert(AlertDescription.decrypt_error);
-        }
-
-        this.dhAgreePublicKey = TlsDHUtils.validateDHPublicKey(dhParams.getPublicKey());
-        this.dhParameters = dhAgreePublicKey.getParameters();
-    }
-
-    protected Signer initVerifyer(TlsSigner tlsSigner, SignatureAndHashAlgorithm algorithm, SecurityParameters securityParameters)
-    {
-        Signer signer = tlsSigner.createVerifyer(algorithm, this.serverPublicKey);
-        signer.update(securityParameters.clientRandom, 0, securityParameters.clientRandom.length);
-        signer.update(securityParameters.serverRandom, 0, securityParameters.serverRandom.length);
-        return signer;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsDHKeyExchange.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsDHKeyExchange.java
deleted file mode 100644
index 2662fda..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsDHKeyExchange.java
+++ /dev/null
@@ -1,218 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.math.BigInteger;
-import java.util.Vector;
-
-import org.bouncycastle.asn1.x509.KeyUsage;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.bouncycastle.crypto.params.AsymmetricKeyParameter;
-import org.bouncycastle.crypto.params.DHParameters;
-import org.bouncycastle.crypto.params.DHPrivateKeyParameters;
-import org.bouncycastle.crypto.params.DHPublicKeyParameters;
-import org.bouncycastle.crypto.util.PublicKeyFactory;
-
-/**
- * (D)TLS DH key exchange.
- */
-public class TlsDHKeyExchange
-    extends AbstractTlsKeyExchange
-{
-    protected TlsSigner tlsSigner;
-    protected DHParameters dhParameters;
-
-    protected AsymmetricKeyParameter serverPublicKey;
-    protected TlsAgreementCredentials agreementCredentials;
-
-    protected DHPrivateKeyParameters dhAgreePrivateKey;
-    protected DHPublicKeyParameters dhAgreePublicKey;
-
-    public TlsDHKeyExchange(int keyExchange, Vector supportedSignatureAlgorithms, DHParameters dhParameters)
-    {
-        super(keyExchange, supportedSignatureAlgorithms);
-
-        switch (keyExchange)
-        {
-        case KeyExchangeAlgorithm.DH_RSA:
-        case KeyExchangeAlgorithm.DH_DSS:
-            this.tlsSigner = null;
-            break;
-        case KeyExchangeAlgorithm.DHE_RSA:
-            this.tlsSigner = new TlsRSASigner();
-            break;
-        case KeyExchangeAlgorithm.DHE_DSS:
-            this.tlsSigner = new TlsDSSSigner();
-            break;
-        default:
-            throw new IllegalArgumentException("unsupported key exchange algorithm");
-        }
-
-        this.dhParameters = dhParameters;
-    }
-
-    public void init(TlsContext context)
-    {
-        super.init(context);
-
-        if (this.tlsSigner != null)
-        {
-            this.tlsSigner.init(context);
-        }
-    }
-
-    public void skipServerCredentials()
-        throws IOException
-    {
-        throw new TlsFatalAlert(AlertDescription.unexpected_message);
-    }
-
-    public void processServerCertificate(Certificate serverCertificate)
-        throws IOException
-    {
-        if (serverCertificate.isEmpty())
-        {
-            throw new TlsFatalAlert(AlertDescription.bad_certificate);
-        }
-
-        org.bouncycastle.asn1.x509.Certificate x509Cert = serverCertificate.getCertificateAt(0);
-
-        SubjectPublicKeyInfo keyInfo = x509Cert.getSubjectPublicKeyInfo();
-        try
-        {
-            this.serverPublicKey = PublicKeyFactory.createKey(keyInfo);
-        }
-        catch (RuntimeException e)
-        {
-            throw new TlsFatalAlert(AlertDescription.unsupported_certificate, e);
-        }
-
-        if (tlsSigner == null)
-        {
-            try
-            {
-                this.dhAgreePublicKey = TlsDHUtils.validateDHPublicKey((DHPublicKeyParameters)this.serverPublicKey);
-            }
-            catch (ClassCastException e)
-            {
-                throw new TlsFatalAlert(AlertDescription.certificate_unknown, e);
-            }
-
-            TlsUtils.validateKeyUsage(x509Cert, KeyUsage.keyAgreement);
-        }
-        else
-        {
-            if (!tlsSigner.isValidPublicKey(this.serverPublicKey))
-            {
-                throw new TlsFatalAlert(AlertDescription.certificate_unknown);
-            }
-
-            TlsUtils.validateKeyUsage(x509Cert, KeyUsage.digitalSignature);
-        }
-
-        super.processServerCertificate(serverCertificate);
-    }
-
-    public boolean requiresServerKeyExchange()
-    {
-        switch (keyExchange)
-        {
-        case KeyExchangeAlgorithm.DHE_DSS:
-        case KeyExchangeAlgorithm.DHE_RSA:
-        case KeyExchangeAlgorithm.DH_anon:
-            return true;
-        default:
-            return false;
-        }
-    }
-
-    public void validateCertificateRequest(CertificateRequest certificateRequest)
-        throws IOException
-    {
-        short[] types = certificateRequest.getCertificateTypes();
-        for (int i = 0; i < types.length; ++i)
-        {
-            switch (types[i])
-            {
-            case ClientCertificateType.rsa_sign:
-            case ClientCertificateType.dss_sign:
-            case ClientCertificateType.rsa_fixed_dh:
-            case ClientCertificateType.dss_fixed_dh:
-            case ClientCertificateType.ecdsa_sign:
-                break;
-            default:
-                throw new TlsFatalAlert(AlertDescription.illegal_parameter);
-            }
-        }
-    }
-
-    public void processClientCredentials(TlsCredentials clientCredentials)
-        throws IOException
-    {
-        if (clientCredentials instanceof TlsAgreementCredentials)
-        {
-            // TODO Validate client cert has matching parameters (see 'areCompatibleParameters')?
-
-            this.agreementCredentials = (TlsAgreementCredentials)clientCredentials;
-        }
-        else if (clientCredentials instanceof TlsSignerCredentials)
-        {
-            // OK
-        }
-        else
-        {
-            throw new TlsFatalAlert(AlertDescription.internal_error);
-        }
-    }
-
-    public void generateClientKeyExchange(OutputStream output)
-        throws IOException
-    {
-        /*
-         * RFC 2246 7.4.7.2 If the client certificate already contains a suitable Diffie-Hellman
-         * key, then Yc is implicit and does not need to be sent again. In this case, the Client Key
-         * Exchange message will be sent, but will be empty.
-         */
-        if (agreementCredentials == null)
-        {
-            this.dhAgreePrivateKey = TlsDHUtils.generateEphemeralClientKeyExchange(context.getSecureRandom(),
-                dhParameters, output);
-        }
-    }
-
-    public void processClientCertificate(Certificate clientCertificate) throws IOException
-    {
-        // TODO Extract the public key
-        // TODO If the certificate is 'fixed', take the public key as dhAgreeClientPublicKey
-    }
-
-    public void processClientKeyExchange(InputStream input) throws IOException
-    {
-        if (dhAgreePublicKey != null)
-        {
-            // For dss_fixed_dh and rsa_fixed_dh, the key arrived in the client certificate
-            return;
-        }
-
-        BigInteger Yc = TlsDHUtils.readDHParameter(input);
-        
-        this.dhAgreePublicKey = TlsDHUtils.validateDHPublicKey(new DHPublicKeyParameters(Yc, dhParameters));
-    }
-
-    public byte[] generatePremasterSecret()
-        throws IOException
-    {
-        if (agreementCredentials != null)
-        {
-            return agreementCredentials.generateAgreement(dhAgreePublicKey);
-        }
-
-        if (dhAgreePrivateKey != null)
-        {
-            return TlsDHUtils.calculateDHBasicAgreement(dhAgreePublicKey, dhAgreePrivateKey);
-        }
-
-        throw new TlsFatalAlert(AlertDescription.internal_error);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsDHUtils.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsDHUtils.java
deleted file mode 100644
index eef27a4..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsDHUtils.java
+++ /dev/null
@@ -1,499 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.math.BigInteger;
-import java.security.SecureRandom;
-import java.util.Hashtable;
-
-import org.bouncycastle.crypto.AsymmetricCipherKeyPair;
-import org.bouncycastle.crypto.agreement.DHBasicAgreement;
-import org.bouncycastle.crypto.generators.DHBasicKeyPairGenerator;
-import org.bouncycastle.crypto.params.DHKeyGenerationParameters;
-import org.bouncycastle.crypto.params.DHParameters;
-import org.bouncycastle.crypto.params.DHPrivateKeyParameters;
-import org.bouncycastle.crypto.params.DHPublicKeyParameters;
-import org.bouncycastle.util.BigIntegers;
-import org.bouncycastle.util.Integers;
-import org.bouncycastle.util.encoders.Hex;
-
-public class TlsDHUtils
-{
-    static final BigInteger TWO = BigInteger.valueOf(2);
-
-    public static final Integer EXT_negotiated_ff_dhe_groups = Integers.valueOf(ExtensionType.negotiated_ff_dhe_groups);
-
-    /*
-     * TODO[draft-ietf-tls-negotiated-ff-dhe-01] Move these groups to DHStandardGroups once reaches RFC
-     */
-    private static BigInteger fromHex(String hex)
-    {
-        return new BigInteger(1, Hex.decode(hex));
-    }
-
-    private static DHParameters fromSafeP(String hexP)
-    {
-        BigInteger p = fromHex(hexP), q = p.shiftRight(1);
-        return new DHParameters(p, TWO, q);
-    }
-
-    private static final String draft_ffdhe2432_p =
-          "FFFFFFFFFFFFFFFFADF85458A2BB4A9AAFDC5620273D3CF1"
-        + "D8B9C583CE2D3695A9E13641146433FBCC939DCE249B3EF9"
-        + "7D2FE363630C75D8F681B202AEC4617AD3DF1ED5D5FD6561"
-        + "2433F51F5F066ED0856365553DED1AF3B557135E7F57C935"
-        + "984F0C70E0E68B77E2A689DAF3EFE8721DF158A136ADE735"
-        + "30ACCA4F483A797ABC0AB182B324FB61D108A94BB2C8E3FB"
-        + "B96ADAB760D7F4681D4F42A3DE394DF4AE56EDE76372BB19"
-        + "0B07A7C8EE0A6D709E02FCE1CDF7E2ECC03404CD28342F61"
-        + "9172FE9CE98583FF8E4F1232EEF28183C3FE3B1B4C6FAD73"
-        + "3BB5FCBC2EC22005C58EF1837D1683B2C6F34A26C1B2EFFA"
-        + "886B4238611FCFDCDE355B3B6519035BBC34F4DEF99C0238"
-        + "61B46FC9D6E6C9077AD91D2691F7F7EE598CB0FAC186D91C"
-        + "AEFE13098533C8B3FFFFFFFFFFFFFFFF";
-    static final DHParameters draft_ffdhe2432 = fromSafeP(draft_ffdhe2432_p);
-
-    private static final String draft_ffdhe3072_p =
-          "FFFFFFFFFFFFFFFFADF85458A2BB4A9AAFDC5620273D3CF1"
-        + "D8B9C583CE2D3695A9E13641146433FBCC939DCE249B3EF9"
-        + "7D2FE363630C75D8F681B202AEC4617AD3DF1ED5D5FD6561"
-        + "2433F51F5F066ED0856365553DED1AF3B557135E7F57C935"
-        + "984F0C70E0E68B77E2A689DAF3EFE8721DF158A136ADE735"
-        + "30ACCA4F483A797ABC0AB182B324FB61D108A94BB2C8E3FB"
-        + "B96ADAB760D7F4681D4F42A3DE394DF4AE56EDE76372BB19"
-        + "0B07A7C8EE0A6D709E02FCE1CDF7E2ECC03404CD28342F61"
-        + "9172FE9CE98583FF8E4F1232EEF28183C3FE3B1B4C6FAD73"
-        + "3BB5FCBC2EC22005C58EF1837D1683B2C6F34A26C1B2EFFA"
-        + "886B4238611FCFDCDE355B3B6519035BBC34F4DEF99C0238"
-        + "61B46FC9D6E6C9077AD91D2691F7F7EE598CB0FAC186D91C"
-        + "AEFE130985139270B4130C93BC437944F4FD4452E2D74DD3"
-        + "64F2E21E71F54BFF5CAE82AB9C9DF69EE86D2BC522363A0D"
-        + "ABC521979B0DEADA1DBF9A42D5C4484E0ABCD06BFA53DDEF"
-        + "3C1B20EE3FD59D7C25E41D2B66C62E37FFFFFFFFFFFFFFFF";
-    static final DHParameters draft_ffdhe3072 = fromSafeP(draft_ffdhe3072_p);
-
-    private static final String draft_ffdhe4096_p =
-          "FFFFFFFFFFFFFFFFADF85458A2BB4A9AAFDC5620273D3CF1"
-        + "D8B9C583CE2D3695A9E13641146433FBCC939DCE249B3EF9"
-        + "7D2FE363630C75D8F681B202AEC4617AD3DF1ED5D5FD6561"
-        + "2433F51F5F066ED0856365553DED1AF3B557135E7F57C935"
-        + "984F0C70E0E68B77E2A689DAF3EFE8721DF158A136ADE735"
-        + "30ACCA4F483A797ABC0AB182B324FB61D108A94BB2C8E3FB"
-        + "B96ADAB760D7F4681D4F42A3DE394DF4AE56EDE76372BB19"
-        + "0B07A7C8EE0A6D709E02FCE1CDF7E2ECC03404CD28342F61"
-        + "9172FE9CE98583FF8E4F1232EEF28183C3FE3B1B4C6FAD73"
-        + "3BB5FCBC2EC22005C58EF1837D1683B2C6F34A26C1B2EFFA"
-        + "886B4238611FCFDCDE355B3B6519035BBC34F4DEF99C0238"
-        + "61B46FC9D6E6C9077AD91D2691F7F7EE598CB0FAC186D91C"
-        + "AEFE130985139270B4130C93BC437944F4FD4452E2D74DD3"
-        + "64F2E21E71F54BFF5CAE82AB9C9DF69EE86D2BC522363A0D"
-        + "ABC521979B0DEADA1DBF9A42D5C4484E0ABCD06BFA53DDEF"
-        + "3C1B20EE3FD59D7C25E41D2B669E1EF16E6F52C3164DF4FB"
-        + "7930E9E4E58857B6AC7D5F42D69F6D187763CF1D55034004"
-        + "87F55BA57E31CC7A7135C886EFB4318AED6A1E012D9E6832"
-        + "A907600A918130C46DC778F971AD0038092999A333CB8B7A"
-        + "1A1DB93D7140003C2A4ECEA9F98D0ACC0A8291CDCEC97DCF"
-        + "8EC9B55A7F88A46B4DB5A851F44182E1C68A007E5E655F6A"
-        + "FFFFFFFFFFFFFFFF";
-    static final DHParameters draft_ffdhe4096 = fromSafeP(draft_ffdhe4096_p);
-
-    private static final String draft_ffdhe6144_p =
-          "FFFFFFFFFFFFFFFFADF85458A2BB4A9AAFDC5620273D3CF1"
-        + "D8B9C583CE2D3695A9E13641146433FBCC939DCE249B3EF9"
-        + "7D2FE363630C75D8F681B202AEC4617AD3DF1ED5D5FD6561"
-        + "2433F51F5F066ED0856365553DED1AF3B557135E7F57C935"
-        + "984F0C70E0E68B77E2A689DAF3EFE8721DF158A136ADE735"
-        + "30ACCA4F483A797ABC0AB182B324FB61D108A94BB2C8E3FB"
-        + "B96ADAB760D7F4681D4F42A3DE394DF4AE56EDE76372BB19"
-        + "0B07A7C8EE0A6D709E02FCE1CDF7E2ECC03404CD28342F61"
-        + "9172FE9CE98583FF8E4F1232EEF28183C3FE3B1B4C6FAD73"
-        + "3BB5FCBC2EC22005C58EF1837D1683B2C6F34A26C1B2EFFA"
-        + "886B4238611FCFDCDE355B3B6519035BBC34F4DEF99C0238"
-        + "61B46FC9D6E6C9077AD91D2691F7F7EE598CB0FAC186D91C"
-        + "AEFE130985139270B4130C93BC437944F4FD4452E2D74DD3"
-        + "64F2E21E71F54BFF5CAE82AB9C9DF69EE86D2BC522363A0D"
-        + "ABC521979B0DEADA1DBF9A42D5C4484E0ABCD06BFA53DDEF"
-        + "3C1B20EE3FD59D7C25E41D2B669E1EF16E6F52C3164DF4FB"
-        + "7930E9E4E58857B6AC7D5F42D69F6D187763CF1D55034004"
-        + "87F55BA57E31CC7A7135C886EFB4318AED6A1E012D9E6832"
-        + "A907600A918130C46DC778F971AD0038092999A333CB8B7A"
-        + "1A1DB93D7140003C2A4ECEA9F98D0ACC0A8291CDCEC97DCF"
-        + "8EC9B55A7F88A46B4DB5A851F44182E1C68A007E5E0DD902"
-        + "0BFD64B645036C7A4E677D2C38532A3A23BA4442CAF53EA6"
-        + "3BB454329B7624C8917BDD64B1C0FD4CB38E8C334C701C3A"
-        + "CDAD0657FCCFEC719B1F5C3E4E46041F388147FB4CFDB477"
-        + "A52471F7A9A96910B855322EDB6340D8A00EF092350511E3"
-        + "0ABEC1FFF9E3A26E7FB29F8C183023C3587E38DA0077D9B4"
-        + "763E4E4B94B2BBC194C6651E77CAF992EEAAC0232A281BF6"
-        + "B3A739C1226116820AE8DB5847A67CBEF9C9091B462D538C"
-        + "D72B03746AE77F5E62292C311562A846505DC82DB854338A"
-        + "E49F5235C95B91178CCF2DD5CACEF403EC9D1810C6272B04"
-        + "5B3B71F9DC6B80D63FDD4A8E9ADB1E6962A69526D43161C1"
-        + "A41D570D7938DAD4A40E329CD0E40E65FFFFFFFFFFFFFFFF";
-    static final DHParameters draft_ffdhe6144 = fromSafeP(draft_ffdhe6144_p);
-
-    private static final String draft_ffdhe8192_p =
-          "FFFFFFFFFFFFFFFFADF85458A2BB4A9AAFDC5620273D3CF1"
-        + "D8B9C583CE2D3695A9E13641146433FBCC939DCE249B3EF9"
-        + "7D2FE363630C75D8F681B202AEC4617AD3DF1ED5D5FD6561"
-        + "2433F51F5F066ED0856365553DED1AF3B557135E7F57C935"
-        + "984F0C70E0E68B77E2A689DAF3EFE8721DF158A136ADE735"
-        + "30ACCA4F483A797ABC0AB182B324FB61D108A94BB2C8E3FB"
-        + "B96ADAB760D7F4681D4F42A3DE394DF4AE56EDE76372BB19"
-        + "0B07A7C8EE0A6D709E02FCE1CDF7E2ECC03404CD28342F61"
-        + "9172FE9CE98583FF8E4F1232EEF28183C3FE3B1B4C6FAD73"
-        + "3BB5FCBC2EC22005C58EF1837D1683B2C6F34A26C1B2EFFA"
-        + "886B4238611FCFDCDE355B3B6519035BBC34F4DEF99C0238"
-        + "61B46FC9D6E6C9077AD91D2691F7F7EE598CB0FAC186D91C"
-        + "AEFE130985139270B4130C93BC437944F4FD4452E2D74DD3"
-        + "64F2E21E71F54BFF5CAE82AB9C9DF69EE86D2BC522363A0D"
-        + "ABC521979B0DEADA1DBF9A42D5C4484E0ABCD06BFA53DDEF"
-        + "3C1B20EE3FD59D7C25E41D2B669E1EF16E6F52C3164DF4FB"
-        + "7930E9E4E58857B6AC7D5F42D69F6D187763CF1D55034004"
-        + "87F55BA57E31CC7A7135C886EFB4318AED6A1E012D9E6832"
-        + "A907600A918130C46DC778F971AD0038092999A333CB8B7A"
-        + "1A1DB93D7140003C2A4ECEA9F98D0ACC0A8291CDCEC97DCF"
-        + "8EC9B55A7F88A46B4DB5A851F44182E1C68A007E5E0DD902"
-        + "0BFD64B645036C7A4E677D2C38532A3A23BA4442CAF53EA6"
-        + "3BB454329B7624C8917BDD64B1C0FD4CB38E8C334C701C3A"
-        + "CDAD0657FCCFEC719B1F5C3E4E46041F388147FB4CFDB477"
-        + "A52471F7A9A96910B855322EDB6340D8A00EF092350511E3"
-        + "0ABEC1FFF9E3A26E7FB29F8C183023C3587E38DA0077D9B4"
-        + "763E4E4B94B2BBC194C6651E77CAF992EEAAC0232A281BF6"
-        + "B3A739C1226116820AE8DB5847A67CBEF9C9091B462D538C"
-        + "D72B03746AE77F5E62292C311562A846505DC82DB854338A"
-        + "E49F5235C95B91178CCF2DD5CACEF403EC9D1810C6272B04"
-        + "5B3B71F9DC6B80D63FDD4A8E9ADB1E6962A69526D43161C1"
-        + "A41D570D7938DAD4A40E329CCFF46AAA36AD004CF600C838"
-        + "1E425A31D951AE64FDB23FCEC9509D43687FEB69EDD1CC5E"
-        + "0B8CC3BDF64B10EF86B63142A3AB8829555B2F747C932665"
-        + "CB2C0F1CC01BD70229388839D2AF05E454504AC78B758282"
-        + "2846C0BA35C35F5C59160CC046FD8251541FC68C9C86B022"
-        + "BB7099876A460E7451A8A93109703FEE1C217E6C3826E52C"
-        + "51AA691E0E423CFC99E9E31650C1217B624816CDAD9A95F9"
-        + "D5B8019488D9C0A0A1FE3075A577E23183F81D4A3F2FA457"
-        + "1EFC8CE0BA8A4FE8B6855DFE72B0A66EDED2FBABFBE58A30"
-        + "FAFABE1C5D71A87E2F741EF8C1FE86FEA6BBFDE530677F0D"
-        + "97D11D49F7A8443D0822E506A9F4614E011E2A94838FF88C"
-        + "D68C8BB7C5C6424CFFFFFFFFFFFFFFFF";
-    static final DHParameters draft_ffdhe8192 = fromSafeP(draft_ffdhe8192_p);
-
-    
-    public static void addNegotiatedDHEGroupsClientExtension(Hashtable extensions, short[] dheGroups)
-        throws IOException
-    {
-        extensions.put(EXT_negotiated_ff_dhe_groups, createNegotiatedDHEGroupsClientExtension(dheGroups));
-    }
-
-    public static void addNegotiatedDHEGroupsServerExtension(Hashtable extensions, short dheGroup)
-        throws IOException
-    {
-        extensions.put(EXT_negotiated_ff_dhe_groups, createNegotiatedDHEGroupsServerExtension(dheGroup));
-    }
-
-    public static short[] getNegotiatedDHEGroupsClientExtension(Hashtable extensions) throws IOException
-    {
-        byte[] extensionData = TlsUtils.getExtensionData(extensions, EXT_negotiated_ff_dhe_groups);
-        return extensionData == null ? null : readNegotiatedDHEGroupsClientExtension(extensionData);
-    }
-
-    public static short getNegotiatedDHEGroupsServerExtension(Hashtable extensions) throws IOException
-    {
-        byte[] extensionData = TlsUtils.getExtensionData(extensions, EXT_negotiated_ff_dhe_groups);
-        return extensionData == null ? -1 : readNegotiatedDHEGroupsServerExtension(extensionData);
-    }
-
-    public static byte[] createNegotiatedDHEGroupsClientExtension(short[] dheGroups) throws IOException
-    {
-        if (dheGroups == null || dheGroups.length < 1 || dheGroups.length > 255)
-        {
-            throw new TlsFatalAlert(AlertDescription.internal_error);
-        }
-
-        return TlsUtils.encodeUint8ArrayWithUint8Length(dheGroups);
-    }
-
-    public static byte[] createNegotiatedDHEGroupsServerExtension(short dheGroup) throws IOException
-    {
-        TlsUtils.checkUint8(dheGroup);
-
-        byte[] extensionData = new byte[1];
-        TlsUtils.writeUint8(dheGroup, extensionData, 0);
-        return extensionData;
-    }
-
-    public static short[] readNegotiatedDHEGroupsClientExtension(byte[] extensionData) throws IOException
-    {
-        if (extensionData == null)
-        {
-            throw new IllegalArgumentException("'extensionData' cannot be null");
-        }
-
-        ByteArrayInputStream buf = new ByteArrayInputStream(extensionData);
-
-        short length = TlsUtils.readUint8(buf);
-        if (length < 1)
-        {
-            throw new TlsFatalAlert(AlertDescription.decode_error);
-        }
-
-        short[] dheGroups = TlsUtils.readUint8Array(length, buf);
-
-        TlsProtocol.assertEmpty(buf);
-
-        return dheGroups;
-    }
-
-    public static short readNegotiatedDHEGroupsServerExtension(byte[] extensionData) throws IOException
-    {
-        if (extensionData == null)
-        {
-            throw new IllegalArgumentException("'extensionData' cannot be null");
-        }
-
-        if (extensionData.length != 1)
-        {
-            throw new TlsFatalAlert(AlertDescription.decode_error);
-        }
-
-        return TlsUtils.readUint8(extensionData, 0);
-    }
-
-    public static DHParameters getParametersForDHEGroup(short dheGroup)
-    {
-        switch (dheGroup)
-        {
-        case FiniteFieldDHEGroup.ffdhe2432:
-            return draft_ffdhe2432;
-        case FiniteFieldDHEGroup.ffdhe3072:
-            return draft_ffdhe3072;
-        case FiniteFieldDHEGroup.ffdhe4096:
-            return draft_ffdhe4096;
-        case FiniteFieldDHEGroup.ffdhe6144:
-            return draft_ffdhe6144;
-        case FiniteFieldDHEGroup.ffdhe8192:
-            return draft_ffdhe8192;
-        default:
-            return null;
-        }
-    }
-
-    public static boolean containsDHECipherSuites(int[] cipherSuites)
-    {
-        for (int i = 0; i < cipherSuites.length; ++i)
-        {
-            if (isDHECipherSuite(cipherSuites[i]))
-            {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    public static boolean isDHECipherSuite(int cipherSuite)
-    {
-        switch (cipherSuite)
-        {
-        /*
-         * RFC 2246
-         */
-        case CipherSuite.TLS_DHE_DSS_EXPORT_WITH_DES40_CBC_SHA:
-        case CipherSuite.TLS_DHE_DSS_WITH_DES_CBC_SHA:
-        case CipherSuite.TLS_DHE_DSS_WITH_3DES_EDE_CBC_SHA:
-        case CipherSuite.TLS_DHE_RSA_EXPORT_WITH_DES40_CBC_SHA:
-        case CipherSuite.TLS_DHE_RSA_WITH_DES_CBC_SHA:
-        case CipherSuite.TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA:
-
-        /*
-         * RFC 3268
-         */
-        case CipherSuite.TLS_DHE_DSS_WITH_AES_128_CBC_SHA:
-        case CipherSuite.TLS_DHE_RSA_WITH_AES_128_CBC_SHA:
-        case CipherSuite.TLS_DHE_DSS_WITH_AES_256_CBC_SHA:
-        case CipherSuite.TLS_DHE_RSA_WITH_AES_256_CBC_SHA:
-
-        /*
-         * RFC 5932
-         */
-        case CipherSuite.TLS_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA:
-        case CipherSuite.TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA:
-        case CipherSuite.TLS_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA:
-        case CipherSuite.TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA:
-        case CipherSuite.TLS_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA256:
-        case CipherSuite.TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA256:
-        case CipherSuite.TLS_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA256:
-        case CipherSuite.TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA256:
-
-        /*
-         * RFC 4162
-         */
-        case CipherSuite.TLS_DHE_DSS_WITH_SEED_CBC_SHA:
-        case CipherSuite.TLS_DHE_RSA_WITH_SEED_CBC_SHA:
-
-        /*
-         * RFC 4279
-         */
-        case CipherSuite.TLS_DHE_PSK_WITH_RC4_128_SHA:
-        case CipherSuite.TLS_DHE_PSK_WITH_3DES_EDE_CBC_SHA:
-        case CipherSuite.TLS_DHE_PSK_WITH_AES_128_CBC_SHA:
-        case CipherSuite.TLS_DHE_PSK_WITH_AES_256_CBC_SHA:
-
-        /*
-         * RFC 4785
-         */
-        case CipherSuite.TLS_DHE_PSK_WITH_NULL_SHA:
-
-        /*
-         * RFC 5246
-         */
-        case CipherSuite.TLS_DHE_DSS_WITH_AES_128_CBC_SHA256:
-        case CipherSuite.TLS_DHE_RSA_WITH_AES_128_CBC_SHA256:
-        case CipherSuite.TLS_DHE_DSS_WITH_AES_256_CBC_SHA256:
-        case CipherSuite.TLS_DHE_RSA_WITH_AES_256_CBC_SHA256:
-
-        /*
-         * RFC 5288
-         */
-        case CipherSuite.TLS_DHE_RSA_WITH_AES_128_GCM_SHA256:
-        case CipherSuite.TLS_DHE_RSA_WITH_AES_256_GCM_SHA384:
-        case CipherSuite.TLS_DHE_DSS_WITH_AES_128_GCM_SHA256:
-        case CipherSuite.TLS_DHE_DSS_WITH_AES_256_GCM_SHA384:
-
-        /*
-         * RFC 5487
-         */
-        case CipherSuite.TLS_DHE_PSK_WITH_AES_128_GCM_SHA256:
-        case CipherSuite.TLS_DHE_PSK_WITH_AES_256_GCM_SHA384:
-        case CipherSuite.TLS_DHE_PSK_WITH_AES_128_CBC_SHA256:
-        case CipherSuite.TLS_DHE_PSK_WITH_AES_256_CBC_SHA384:
-        case CipherSuite.TLS_DHE_PSK_WITH_NULL_SHA256:
-        case CipherSuite.TLS_DHE_PSK_WITH_NULL_SHA384:
-
-        /*
-         * RFC 6367
-         */
-        case CipherSuite.TLS_DHE_RSA_WITH_CAMELLIA_128_GCM_SHA256:
-        case CipherSuite.TLS_DHE_RSA_WITH_CAMELLIA_256_GCM_SHA384:
-        case CipherSuite.TLS_DHE_DSS_WITH_CAMELLIA_128_GCM_SHA256:
-        case CipherSuite.TLS_DHE_DSS_WITH_CAMELLIA_256_GCM_SHA384:
-        case CipherSuite.TLS_DHE_PSK_WITH_CAMELLIA_128_GCM_SHA256:
-        case CipherSuite.TLS_DHE_PSK_WITH_CAMELLIA_256_GCM_SHA384:
-        case CipherSuite.TLS_DHE_PSK_WITH_CAMELLIA_128_CBC_SHA256:
-        case CipherSuite.TLS_DHE_PSK_WITH_CAMELLIA_256_CBC_SHA384:
-
-        /*
-         * RFC 6655
-         */
-        case CipherSuite.TLS_DHE_RSA_WITH_AES_128_CCM:
-        case CipherSuite.TLS_DHE_RSA_WITH_AES_256_CCM:
-        case CipherSuite.TLS_DHE_RSA_WITH_AES_128_CCM_8:
-        case CipherSuite.TLS_DHE_RSA_WITH_AES_256_CCM_8:
-        case CipherSuite.TLS_DHE_PSK_WITH_AES_128_CCM:
-        case CipherSuite.TLS_DHE_PSK_WITH_AES_256_CCM:
-        case CipherSuite.TLS_PSK_DHE_WITH_AES_128_CCM_8:
-        case CipherSuite.TLS_PSK_DHE_WITH_AES_256_CCM_8:
-
-        /*
-         * draft-agl-tls-chacha20poly1305-04
-         */
-        case CipherSuite.TLS_DHE_RSA_WITH_CHACHA20_POLY1305_SHA256:
-
-        /*
-         * draft-josefsson-salsa20-tls-04
-         */
-        case CipherSuite.TLS_DHE_PSK_WITH_ESTREAM_SALSA20_SHA1:
-        case CipherSuite.TLS_DHE_PSK_WITH_SALSA20_SHA1:
-        case CipherSuite.TLS_DHE_RSA_WITH_ESTREAM_SALSA20_SHA1:
-        case CipherSuite.TLS_DHE_RSA_WITH_SALSA20_SHA1:
-
-            return true;
-
-        default:
-            return false;
-        }
-    }
-
-    public static boolean areCompatibleParameters(DHParameters a, DHParameters b)
-    {
-        return a.getP().equals(b.getP()) && a.getG().equals(b.getG());
-    }
-
-    public static byte[] calculateDHBasicAgreement(DHPublicKeyParameters publicKey, DHPrivateKeyParameters privateKey)
-    {
-        DHBasicAgreement basicAgreement = new DHBasicAgreement();
-        basicAgreement.init(privateKey);
-        BigInteger agreementValue = basicAgreement.calculateAgreement(publicKey);
-
-        /*
-         * RFC 5246 8.1.2. Leading bytes of Z that contain all zero bits are stripped before it is
-         * used as the pre_master_secret.
-         */
-        return BigIntegers.asUnsignedByteArray(agreementValue);
-    }
-
-    public static AsymmetricCipherKeyPair generateDHKeyPair(SecureRandom random, DHParameters dhParams)
-    {
-        DHBasicKeyPairGenerator dhGen = new DHBasicKeyPairGenerator();
-        dhGen.init(new DHKeyGenerationParameters(random, dhParams));
-        return dhGen.generateKeyPair();
-    }
-
-    public static DHPrivateKeyParameters generateEphemeralClientKeyExchange(SecureRandom random, DHParameters dhParams,
-        OutputStream output) throws IOException
-    {
-        AsymmetricCipherKeyPair kp = generateDHKeyPair(random, dhParams);
-
-        DHPublicKeyParameters dhPublic = (DHPublicKeyParameters) kp.getPublic();
-        writeDHParameter(dhPublic.getY(), output);
-
-        return (DHPrivateKeyParameters) kp.getPrivate();
-    }
-
-    public static DHPrivateKeyParameters generateEphemeralServerKeyExchange(SecureRandom random, DHParameters dhParams,
-        OutputStream output) throws IOException
-    {
-        AsymmetricCipherKeyPair kp = generateDHKeyPair(random, dhParams);
-
-        DHPublicKeyParameters dhPublic = (DHPublicKeyParameters)kp.getPublic();
-        new ServerDHParams(dhPublic).encode(output);
-
-        return (DHPrivateKeyParameters)kp.getPrivate();
-    }
-
-    public static DHPublicKeyParameters validateDHPublicKey(DHPublicKeyParameters key) throws IOException
-    {
-        BigInteger Y = key.getY();
-        DHParameters params = key.getParameters();
-        BigInteger p = params.getP();
-        BigInteger g = params.getG();
-
-        if (!p.isProbablePrime(2))
-        {
-            throw new TlsFatalAlert(AlertDescription.illegal_parameter);
-        }
-        if (g.compareTo(TWO) < 0 || g.compareTo(p.subtract(TWO)) > 0)
-        {
-            throw new TlsFatalAlert(AlertDescription.illegal_parameter);
-        }
-        if (Y.compareTo(TWO) < 0 || Y.compareTo(p.subtract(TWO)) > 0)
-        {
-            throw new TlsFatalAlert(AlertDescription.illegal_parameter);
-        }
-
-        // TODO See RFC 2631 for more discussion of Diffie-Hellman validation
-
-        return key;
-    }
-
-    public static BigInteger readDHParameter(InputStream input) throws IOException
-    {
-        return new BigInteger(1, TlsUtils.readOpaque16(input));
-    }
-
-    public static void writeDHParameter(BigInteger x, OutputStream output) throws IOException
-    {
-        TlsUtils.writeOpaque16(BigIntegers.asUnsignedByteArray(x), output);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsDSASigner.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsDSASigner.java
deleted file mode 100644
index 7d068bf..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsDSASigner.java
+++ /dev/null
@@ -1,90 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.CryptoException;
-import org.bouncycastle.crypto.DSA;
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.Signer;
-import org.bouncycastle.crypto.digests.NullDigest;
-import org.bouncycastle.crypto.params.AsymmetricKeyParameter;
-import org.bouncycastle.crypto.params.ParametersWithRandom;
-import org.bouncycastle.crypto.signers.DSADigestSigner;
-
-public abstract class TlsDSASigner
-    extends AbstractTlsSigner
-{
-    public byte[] generateRawSignature(SignatureAndHashAlgorithm algorithm,
-        AsymmetricKeyParameter privateKey, byte[] hash)
-        throws CryptoException
-    {
-        Signer signer = makeSigner(algorithm, true, true,
-            new ParametersWithRandom(privateKey, this.context.getSecureRandom()));
-        if (algorithm == null)
-        {
-            // Note: Only use the SHA1 part of the (MD5/SHA1) hash
-            signer.update(hash, 16, 20);
-        }
-        else
-        {
-            signer.update(hash, 0, hash.length);
-        }
-        return signer.generateSignature();
-    }
-
-    public boolean verifyRawSignature(SignatureAndHashAlgorithm algorithm, byte[] sigBytes,
-        AsymmetricKeyParameter publicKey, byte[] hash)
-        throws CryptoException
-    {
-        Signer signer = makeSigner(algorithm, true, false, publicKey);
-        if (algorithm == null)
-        {
-            // Note: Only use the SHA1 part of the (MD5/SHA1) hash
-            signer.update(hash, 16, 20);
-        }
-        else
-        {
-            signer.update(hash, 0, hash.length);
-        }
-        return signer.verifySignature(sigBytes);
-    }
-
-    public Signer createSigner(SignatureAndHashAlgorithm algorithm, AsymmetricKeyParameter privateKey)
-    {
-        return makeSigner(algorithm, false, true, privateKey);
-    }
-
-    public Signer createVerifyer(SignatureAndHashAlgorithm algorithm, AsymmetricKeyParameter publicKey)
-    {
-        return makeSigner(algorithm, false, false, publicKey);
-    }
-
-    protected CipherParameters makeInitParameters(boolean forSigning, CipherParameters cp)
-    {
-        return cp;
-    }
-
-    protected Signer makeSigner(SignatureAndHashAlgorithm algorithm, boolean raw, boolean forSigning,
-        CipherParameters cp)
-    {
-        if ((algorithm != null) != TlsUtils.isTLSv12(context))
-        {
-            throw new IllegalStateException();
-        }
-
-        if (algorithm != null && algorithm.getSignature() != getSignatureAlgorithm())
-        {
-            throw new IllegalStateException();
-        }
-
-        short hashAlgorithm = algorithm == null ? HashAlgorithm.sha1 : algorithm.getHash();
-        Digest d = raw ? new NullDigest() : TlsUtils.createHash(hashAlgorithm);
-
-        Signer s = new DSADigestSigner(createDSAImpl(hashAlgorithm), d);
-        s.init(forSigning, makeInitParameters(forSigning, cp));
-        return s;
-    }
-
-    protected abstract short getSignatureAlgorithm();
-
-    protected abstract DSA createDSAImpl(short hashAlgorithm);
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsDSSSigner.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsDSSSigner.java
deleted file mode 100644
index 2914b7e..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsDSSSigner.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-import org.bouncycastle.crypto.DSA;
-import org.bouncycastle.crypto.params.AsymmetricKeyParameter;
-import org.bouncycastle.crypto.params.DSAPublicKeyParameters;
-import org.bouncycastle.crypto.signers.DSASigner;
-import org.bouncycastle.crypto.signers.HMacDSAKCalculator;
-
-public class TlsDSSSigner
-    extends TlsDSASigner
-{
-    public boolean isValidPublicKey(AsymmetricKeyParameter publicKey)
-    {
-        return publicKey instanceof DSAPublicKeyParameters;
-    }
-
-    protected DSA createDSAImpl(short hashAlgorithm)
-    {
-        return new DSASigner(new HMacDSAKCalculator(TlsUtils.createHash(hashAlgorithm)));
-    }
-
-    protected short getSignatureAlgorithm()
-    {
-        return SignatureAlgorithm.dsa;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsECCUtils.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsECCUtils.java
deleted file mode 100644
index de562ea..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsECCUtils.java
+++ /dev/null
@@ -1,762 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.math.BigInteger;
-import java.security.SecureRandom;
-import java.util.Hashtable;
-
-import org.bouncycastle.asn1.x9.ECNamedCurveTable;
-import org.bouncycastle.asn1.x9.X9ECParameters;
-import org.bouncycastle.crypto.AsymmetricCipherKeyPair;
-import org.bouncycastle.crypto.agreement.ECDHBasicAgreement;
-import org.bouncycastle.crypto.ec.CustomNamedCurves;
-import org.bouncycastle.crypto.generators.ECKeyPairGenerator;
-import org.bouncycastle.crypto.params.ECDomainParameters;
-import org.bouncycastle.crypto.params.ECKeyGenerationParameters;
-import org.bouncycastle.crypto.params.ECPrivateKeyParameters;
-import org.bouncycastle.crypto.params.ECPublicKeyParameters;
-import org.bouncycastle.math.ec.ECAlgorithms;
-import org.bouncycastle.math.ec.ECCurve;
-import org.bouncycastle.math.ec.ECFieldElement;
-import org.bouncycastle.math.ec.ECPoint;
-import org.bouncycastle.math.field.PolynomialExtensionField;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.BigIntegers;
-import org.bouncycastle.util.Integers;
-
-public class TlsECCUtils
-{
-    public static final Integer EXT_elliptic_curves = Integers.valueOf(ExtensionType.elliptic_curves);
-    public static final Integer EXT_ec_point_formats = Integers.valueOf(ExtensionType.ec_point_formats);
-
-    private static final String[] CURVE_NAMES = new String[] { "sect163k1", "sect163r1", "sect163r2", "sect193r1",
-        "sect193r2", "sect233k1", "sect233r1", "sect239k1", "sect283k1", "sect283r1", "sect409k1", "sect409r1",
-        "sect571k1", "sect571r1", "secp160k1", "secp160r1", "secp160r2", "secp192k1", "secp192r1", "secp224k1",
-        "secp224r1", "secp256k1", "secp256r1", "secp384r1", "secp521r1",
-        "brainpoolP256r1", "brainpoolP384r1", "brainpoolP512r1"};
-
-    public static void addSupportedEllipticCurvesExtension(Hashtable extensions, int[] namedCurves) throws IOException
-    {
-        extensions.put(EXT_elliptic_curves, createSupportedEllipticCurvesExtension(namedCurves));
-    }
-
-    public static void addSupportedPointFormatsExtension(Hashtable extensions, short[] ecPointFormats)
-        throws IOException
-    {
-        extensions.put(EXT_ec_point_formats, createSupportedPointFormatsExtension(ecPointFormats));
-    }
-
-    public static int[] getSupportedEllipticCurvesExtension(Hashtable extensions) throws IOException
-    {
-        byte[] extensionData = TlsUtils.getExtensionData(extensions, EXT_elliptic_curves);
-        return extensionData == null ? null : readSupportedEllipticCurvesExtension(extensionData);
-    }
-
-    public static short[] getSupportedPointFormatsExtension(Hashtable extensions) throws IOException
-    {
-        byte[] extensionData = TlsUtils.getExtensionData(extensions, EXT_ec_point_formats);
-        return extensionData == null ? null : readSupportedPointFormatsExtension(extensionData);
-    }
-
-    public static byte[] createSupportedEllipticCurvesExtension(int[] namedCurves) throws IOException
-    {
-        if (namedCurves == null || namedCurves.length < 1)
-        {
-            throw new TlsFatalAlert(AlertDescription.internal_error);
-        }
-
-        return TlsUtils.encodeUint16ArrayWithUint16Length(namedCurves);
-    }
-
-    public static byte[] createSupportedPointFormatsExtension(short[] ecPointFormats) throws IOException
-    {
-        if (ecPointFormats == null || !Arrays.contains(ecPointFormats, ECPointFormat.uncompressed))
-        {
-            /*
-             * RFC 4492 5.1. If the Supported Point Formats Extension is indeed sent, it MUST
-             * contain the value 0 (uncompressed) as one of the items in the list of point formats.
-             */
-
-            // NOTE: We add it at the end (lowest preference)
-            ecPointFormats = Arrays.append(ecPointFormats, ECPointFormat.uncompressed);
-        }
-
-        return TlsUtils.encodeUint8ArrayWithUint8Length(ecPointFormats);
-    }
-
-    public static int[] readSupportedEllipticCurvesExtension(byte[] extensionData) throws IOException
-    {
-        if (extensionData == null)
-        {
-            throw new IllegalArgumentException("'extensionData' cannot be null");
-        }
-
-        ByteArrayInputStream buf = new ByteArrayInputStream(extensionData);
-
-        int length = TlsUtils.readUint16(buf);
-        if (length < 2 || (length & 1) != 0)
-        {
-            throw new TlsFatalAlert(AlertDescription.decode_error);
-        }
-
-        int[] namedCurves = TlsUtils.readUint16Array(length / 2, buf);
-
-        TlsProtocol.assertEmpty(buf);
-
-        return namedCurves;
-    }
-
-    public static short[] readSupportedPointFormatsExtension(byte[] extensionData) throws IOException
-    {
-        if (extensionData == null)
-        {
-            throw new IllegalArgumentException("'extensionData' cannot be null");
-        }
-
-        ByteArrayInputStream buf = new ByteArrayInputStream(extensionData);
-
-        short length = TlsUtils.readUint8(buf);
-        if (length < 1)
-        {
-            throw new TlsFatalAlert(AlertDescription.decode_error);
-        }
-
-        short[] ecPointFormats = TlsUtils.readUint8Array(length, buf);
-
-        TlsProtocol.assertEmpty(buf);
-
-        if (!Arrays.contains(ecPointFormats, ECPointFormat.uncompressed))
-        {
-            /*
-             * RFC 4492 5.1. If the Supported Point Formats Extension is indeed sent, it MUST
-             * contain the value 0 (uncompressed) as one of the items in the list of point formats.
-             */
-            throw new TlsFatalAlert(AlertDescription.illegal_parameter);
-        }
-
-        return ecPointFormats;
-    }
-
-    public static String getNameOfNamedCurve(int namedCurve)
-    {
-        return isSupportedNamedCurve(namedCurve) ? CURVE_NAMES[namedCurve - 1] : null;
-    }
-
-    public static ECDomainParameters getParametersForNamedCurve(int namedCurve)
-    {
-        String curveName = getNameOfNamedCurve(namedCurve);
-        if (curveName == null)
-        {
-            return null;
-        }
-
-        // Parameters are lazily created the first time a particular curve is accessed
-
-        X9ECParameters ecP = CustomNamedCurves.getByName(curveName);
-        if (ecP == null)
-        {
-            ecP = ECNamedCurveTable.getByName(curveName);
-            if (ecP == null)
-            {
-                return null;
-            }
-        }
-
-        // It's a bit inefficient to do this conversion every time
-        return new ECDomainParameters(ecP.getCurve(), ecP.getG(), ecP.getN(), ecP.getH(), ecP.getSeed());
-    }
-
-    public static boolean hasAnySupportedNamedCurves()
-    {
-        return CURVE_NAMES.length > 0;
-    }
-
-    public static boolean containsECCCipherSuites(int[] cipherSuites)
-    {
-        for (int i = 0; i < cipherSuites.length; ++i)
-        {
-            if (isECCCipherSuite(cipherSuites[i]))
-            {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    public static boolean isECCCipherSuite(int cipherSuite)
-    {
-        switch (cipherSuite)
-        {
-        /*
-         * RFC 4492
-         */
-        case CipherSuite.TLS_ECDH_ECDSA_WITH_NULL_SHA:
-        case CipherSuite.TLS_ECDH_ECDSA_WITH_RC4_128_SHA:
-        case CipherSuite.TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA:
-        case CipherSuite.TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA:
-        case CipherSuite.TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_NULL_SHA:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_RC4_128_SHA:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA:
-        case CipherSuite.TLS_ECDH_RSA_WITH_NULL_SHA:
-        case CipherSuite.TLS_ECDH_RSA_WITH_RC4_128_SHA:
-        case CipherSuite.TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA:
-        case CipherSuite.TLS_ECDH_RSA_WITH_AES_128_CBC_SHA:
-        case CipherSuite.TLS_ECDH_RSA_WITH_AES_256_CBC_SHA:
-        case CipherSuite.TLS_ECDHE_RSA_WITH_NULL_SHA:
-        case CipherSuite.TLS_ECDHE_RSA_WITH_RC4_128_SHA:
-        case CipherSuite.TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA:
-        case CipherSuite.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA:
-        case CipherSuite.TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA:
-        case CipherSuite.TLS_ECDH_anon_WITH_NULL_SHA:
-        case CipherSuite.TLS_ECDH_anon_WITH_RC4_128_SHA:
-        case CipherSuite.TLS_ECDH_anon_WITH_3DES_EDE_CBC_SHA:
-        case CipherSuite.TLS_ECDH_anon_WITH_AES_128_CBC_SHA:
-        case CipherSuite.TLS_ECDH_anon_WITH_AES_256_CBC_SHA:
-
-        /*
-         * RFC 5289
-         */
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384:
-        case CipherSuite.TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA256:
-        case CipherSuite.TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA384:
-        case CipherSuite.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256:
-        case CipherSuite.TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384:
-        case CipherSuite.TLS_ECDH_RSA_WITH_AES_128_CBC_SHA256:
-        case CipherSuite.TLS_ECDH_RSA_WITH_AES_256_CBC_SHA384:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384:
-        case CipherSuite.TLS_ECDH_ECDSA_WITH_AES_128_GCM_SHA256:
-        case CipherSuite.TLS_ECDH_ECDSA_WITH_AES_256_GCM_SHA384:
-        case CipherSuite.TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256:
-        case CipherSuite.TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384:
-        case CipherSuite.TLS_ECDH_RSA_WITH_AES_128_GCM_SHA256:
-        case CipherSuite.TLS_ECDH_RSA_WITH_AES_256_GCM_SHA384:
-
-        /*
-         * RFC 5489
-         */
-        case CipherSuite.TLS_ECDHE_PSK_WITH_3DES_EDE_CBC_SHA:
-        case CipherSuite.TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA:
-        case CipherSuite.TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA256:
-        case CipherSuite.TLS_ECDHE_PSK_WITH_AES_256_CBC_SHA:
-        case CipherSuite.TLS_ECDHE_PSK_WITH_AES_256_CBC_SHA384:
-        case CipherSuite.TLS_ECDHE_PSK_WITH_NULL_SHA:
-        case CipherSuite.TLS_ECDHE_PSK_WITH_NULL_SHA256:
-        case CipherSuite.TLS_ECDHE_PSK_WITH_NULL_SHA384:
-        case CipherSuite.TLS_ECDHE_PSK_WITH_RC4_128_SHA:
-
-        /*
-         * RFC 6367
-         */
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_CAMELLIA_128_CBC_SHA256:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_CAMELLIA_256_CBC_SHA384:
-        case CipherSuite.TLS_ECDH_ECDSA_WITH_CAMELLIA_128_CBC_SHA256:
-        case CipherSuite.TLS_ECDH_ECDSA_WITH_CAMELLIA_256_CBC_SHA384:
-        case CipherSuite.TLS_ECDHE_RSA_WITH_CAMELLIA_128_CBC_SHA256:
-        case CipherSuite.TLS_ECDHE_RSA_WITH_CAMELLIA_256_CBC_SHA384:
-        case CipherSuite.TLS_ECDH_RSA_WITH_CAMELLIA_128_CBC_SHA256:
-        case CipherSuite.TLS_ECDH_RSA_WITH_CAMELLIA_256_CBC_SHA384:
-
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_CAMELLIA_128_GCM_SHA256:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_CAMELLIA_256_GCM_SHA384:
-        case CipherSuite.TLS_ECDH_ECDSA_WITH_CAMELLIA_128_GCM_SHA256:
-        case CipherSuite.TLS_ECDH_ECDSA_WITH_CAMELLIA_256_GCM_SHA384:
-        case CipherSuite.TLS_ECDHE_RSA_WITH_CAMELLIA_128_GCM_SHA256:
-        case CipherSuite.TLS_ECDHE_RSA_WITH_CAMELLIA_256_GCM_SHA384:
-        case CipherSuite.TLS_ECDH_RSA_WITH_CAMELLIA_128_GCM_SHA256:
-        case CipherSuite.TLS_ECDH_RSA_WITH_CAMELLIA_256_GCM_SHA384:
-
-        case CipherSuite.TLS_ECDHE_PSK_WITH_CAMELLIA_128_CBC_SHA256:
-        case CipherSuite.TLS_ECDHE_PSK_WITH_CAMELLIA_256_CBC_SHA384:
-
-        /*
-         * RFC 7251
-         */
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_AES_128_CCM:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_AES_128_CCM_8:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_AES_256_CCM:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_AES_256_CCM_8:
-
-        /*
-         * draft-agl-tls-chacha20poly1305-04
-         */
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256:
-        case CipherSuite.TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256:
-
-        /*
-         * draft-josefsson-salsa20-tls-04 
-         */
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_ESTREAM_SALSA20_SHA1:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_SALSA20_SHA1:
-        case CipherSuite.TLS_ECDHE_PSK_WITH_ESTREAM_SALSA20_SHA1:
-        case CipherSuite.TLS_ECDHE_PSK_WITH_SALSA20_SHA1:
-        case CipherSuite.TLS_ECDHE_RSA_WITH_ESTREAM_SALSA20_SHA1:
-        case CipherSuite.TLS_ECDHE_RSA_WITH_SALSA20_SHA1:
-
-            return true;
-
-        default:
-            return false;
-        }
-    }
-
-    public static boolean areOnSameCurve(ECDomainParameters a, ECDomainParameters b)
-    {
-        // TODO Move to ECDomainParameters.equals() or other utility method?
-        return a.getCurve().equals(b.getCurve()) && a.getG().equals(b.getG()) && a.getN().equals(b.getN())
-            && a.getH().equals(b.getH());
-    }
-
-    public static boolean isSupportedNamedCurve(int namedCurve)
-    {
-        return (namedCurve > 0 && namedCurve <= CURVE_NAMES.length);
-    }
-
-    public static boolean isCompressionPreferred(short[] ecPointFormats, short compressionFormat)
-    {
-        if (ecPointFormats == null)
-        {
-            return false;
-        }
-        for (int i = 0; i < ecPointFormats.length; ++i)
-        {
-            short ecPointFormat = ecPointFormats[i];
-            if (ecPointFormat == ECPointFormat.uncompressed)
-            {
-                return false;
-            }
-            if (ecPointFormat == compressionFormat)
-            {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    public static byte[] serializeECFieldElement(int fieldSize, BigInteger x) throws IOException
-    {
-        return BigIntegers.asUnsignedByteArray((fieldSize + 7) / 8, x);
-    }
-
-    public static byte[] serializeECPoint(short[] ecPointFormats, ECPoint point) throws IOException
-    {
-        ECCurve curve = point.getCurve();
-
-        /*
-         * RFC 4492 5.7. ...an elliptic curve point in uncompressed or compressed format. Here, the
-         * format MUST conform to what the server has requested through a Supported Point Formats
-         * Extension if this extension was used, and MUST be uncompressed if this extension was not
-         * used.
-         */
-        boolean compressed = false;
-        if (ECAlgorithms.isFpCurve(curve))
-        {
-            compressed = isCompressionPreferred(ecPointFormats, ECPointFormat.ansiX962_compressed_prime);
-        }
-        else if (ECAlgorithms.isF2mCurve(curve))
-        {
-            compressed = isCompressionPreferred(ecPointFormats, ECPointFormat.ansiX962_compressed_char2);
-        }
-        return point.getEncoded(compressed);
-    }
-
-    public static byte[] serializeECPublicKey(short[] ecPointFormats, ECPublicKeyParameters keyParameters)
-        throws IOException
-    {
-        return serializeECPoint(ecPointFormats, keyParameters.getQ());
-    }
-
-    public static BigInteger deserializeECFieldElement(int fieldSize, byte[] encoding) throws IOException
-    {
-        int requiredLength = (fieldSize + 7) / 8;
-        if (encoding.length != requiredLength)
-        {
-            throw new TlsFatalAlert(AlertDescription.decode_error);
-        }
-        return new BigInteger(1, encoding);
-    }
-
-    public static ECPoint deserializeECPoint(short[] ecPointFormats, ECCurve curve, byte[] encoding) throws IOException
-    {
-        if (encoding == null || encoding.length < 1)
-        {
-            throw new TlsFatalAlert(AlertDescription.illegal_parameter);
-        }
-
-        short actualFormat;
-        switch (encoding[0])
-        {
-        case 0x02: // compressed
-        case 0x03: // compressed
-        {
-            if (ECAlgorithms.isF2mCurve(curve))
-            {
-                actualFormat = ECPointFormat.ansiX962_compressed_char2;
-            }
-            else if (ECAlgorithms.isFpCurve(curve))
-            {
-                actualFormat = ECPointFormat.ansiX962_compressed_prime;
-            }
-            else
-            {
-                throw new TlsFatalAlert(AlertDescription.illegal_parameter);
-            }
-            break;
-        }
-        case 0x04: // uncompressed
-        {
-            actualFormat = ECPointFormat.uncompressed;
-            break;
-        }
-        case 0x00: // infinity
-        case 0x06: // hybrid
-        case 0x07: // hybrid
-        default:
-            throw new TlsFatalAlert(AlertDescription.illegal_parameter);
-        }
-
-        if (actualFormat != ECPointFormat.uncompressed
-            && (ecPointFormats == null || !Arrays.contains(ecPointFormats, actualFormat)))
-        {
-            throw new TlsFatalAlert(AlertDescription.illegal_parameter);
-        }
-
-        return curve.decodePoint(encoding);
-    }
-
-    public static ECPublicKeyParameters deserializeECPublicKey(short[] ecPointFormats, ECDomainParameters curve_params,
-        byte[] encoding) throws IOException
-    {
-        try
-        {
-            ECPoint Y = deserializeECPoint(ecPointFormats, curve_params.getCurve(), encoding);
-            return new ECPublicKeyParameters(Y, curve_params);
-        }
-        catch (RuntimeException e)
-        {
-            throw new TlsFatalAlert(AlertDescription.illegal_parameter, e);
-        }
-    }
-
-    public static byte[] calculateECDHBasicAgreement(ECPublicKeyParameters publicKey, ECPrivateKeyParameters privateKey)
-    {
-        ECDHBasicAgreement basicAgreement = new ECDHBasicAgreement();
-        basicAgreement.init(privateKey);
-        BigInteger agreementValue = basicAgreement.calculateAgreement(publicKey);
-
-        /*
-         * RFC 4492 5.10. Note that this octet string (Z in IEEE 1363 terminology) as output by
-         * FE2OSP, the Field Element to Octet String Conversion Primitive, has constant length for
-         * any given field; leading zeros found in this octet string MUST NOT be truncated.
-         */
-        return BigIntegers.asUnsignedByteArray(basicAgreement.getFieldSize(), agreementValue);
-    }
-
-    public static AsymmetricCipherKeyPair generateECKeyPair(SecureRandom random, ECDomainParameters ecParams)
-    {
-        ECKeyPairGenerator keyPairGenerator = new ECKeyPairGenerator();
-        keyPairGenerator.init(new ECKeyGenerationParameters(ecParams, random));
-        return keyPairGenerator.generateKeyPair();
-    }
-
-    public static ECPrivateKeyParameters generateEphemeralClientKeyExchange(SecureRandom random, short[] ecPointFormats,
-        ECDomainParameters ecParams, OutputStream output) throws IOException
-    {
-        AsymmetricCipherKeyPair kp = generateECKeyPair(random, ecParams);
-
-        ECPublicKeyParameters ecPublicKey = (ECPublicKeyParameters) kp.getPublic();
-        writeECPoint(ecPointFormats, ecPublicKey.getQ(), output);
-
-        return (ECPrivateKeyParameters) kp.getPrivate();
-    }
-
-    // TODO Refactor around ServerECDHParams before making this public
-    static ECPrivateKeyParameters generateEphemeralServerKeyExchange(SecureRandom random, int[] namedCurves,
-        short[] ecPointFormats, OutputStream output) throws IOException
-    {
-        /* First we try to find a supported named curve from the client's list. */
-        int namedCurve = -1;
-        if (namedCurves == null)
-        {
-            // TODO Let the peer choose the default named curve
-            namedCurve = NamedCurve.secp256r1;
-        }
-        else
-        {
-            for (int i = 0; i < namedCurves.length; ++i)
-            {
-                int entry = namedCurves[i];
-                if (NamedCurve.isValid(entry) && isSupportedNamedCurve(entry))
-                {
-                    namedCurve = entry;
-                    break;
-                }
-            }
-        }
-
-        ECDomainParameters ecParams = null;
-        if (namedCurve >= 0)
-        {
-            ecParams = getParametersForNamedCurve(namedCurve);
-        }
-        else
-        {
-            /* If no named curves are suitable, check if the client supports explicit curves. */
-            if (Arrays.contains(namedCurves, NamedCurve.arbitrary_explicit_prime_curves))
-            {
-                ecParams = getParametersForNamedCurve(NamedCurve.secp256r1);
-            }
-            else if (Arrays.contains(namedCurves, NamedCurve.arbitrary_explicit_char2_curves))
-            {
-                ecParams = getParametersForNamedCurve(NamedCurve.sect283r1);
-            }
-        }
-
-        if (ecParams == null)
-        {
-            /*
-             * NOTE: We shouldn't have negotiated ECDHE key exchange since we apparently can't find
-             * a suitable curve.
-             */
-            throw new TlsFatalAlert(AlertDescription.internal_error);
-        }
-
-        if (namedCurve < 0)
-        {
-            writeExplicitECParameters(ecPointFormats, ecParams, output);
-        }
-        else
-        {
-            writeNamedECParameters(namedCurve, output);
-        }
-
-        return generateEphemeralClientKeyExchange(random, ecPointFormats, ecParams, output);
-    }
-
-    public static ECPublicKeyParameters validateECPublicKey(ECPublicKeyParameters key) throws IOException
-    {
-        // TODO Check RFC 4492 for validation
-        return key;
-    }
-
-    public static int readECExponent(int fieldSize, InputStream input) throws IOException
-    {
-        BigInteger K = readECParameter(input);
-        if (K.bitLength() < 32)
-        {
-            int k = K.intValue();
-            if (k > 0 && k < fieldSize)
-            {
-                return k;
-            }
-        }
-        throw new TlsFatalAlert(AlertDescription.illegal_parameter);
-    }
-
-    public static BigInteger readECFieldElement(int fieldSize, InputStream input) throws IOException
-    {
-        return deserializeECFieldElement(fieldSize, TlsUtils.readOpaque8(input));
-    }
-
-    public static BigInteger readECParameter(InputStream input) throws IOException
-    {
-        // TODO Are leading zeroes okay here?
-        return new BigInteger(1, TlsUtils.readOpaque8(input));
-    }
-
-    public static ECDomainParameters readECParameters(int[] namedCurves, short[] ecPointFormats, InputStream input)
-        throws IOException
-    {
-        try
-        {
-            short curveType = TlsUtils.readUint8(input);
-
-            switch (curveType)
-            {
-            case ECCurveType.explicit_prime:
-            {
-                checkNamedCurve(namedCurves, NamedCurve.arbitrary_explicit_prime_curves);
-
-                BigInteger prime_p = readECParameter(input);
-                BigInteger a = readECFieldElement(prime_p.bitLength(), input);
-                BigInteger b = readECFieldElement(prime_p.bitLength(), input);
-                byte[] baseEncoding = TlsUtils.readOpaque8(input);
-                BigInteger order = readECParameter(input);
-                BigInteger cofactor = readECParameter(input);
-                ECCurve curve = new ECCurve.Fp(prime_p, a, b, order, cofactor);
-                ECPoint base = deserializeECPoint(ecPointFormats, curve, baseEncoding);
-                return new ECDomainParameters(curve, base, order, cofactor);
-            }
-            case ECCurveType.explicit_char2:
-            {
-                checkNamedCurve(namedCurves, NamedCurve.arbitrary_explicit_char2_curves);
-
-                int m = TlsUtils.readUint16(input);
-                short basis = TlsUtils.readUint8(input);
-                if (!ECBasisType.isValid(basis))
-                {
-                    throw new TlsFatalAlert(AlertDescription.illegal_parameter);
-                }
-
-                int k1 = readECExponent(m, input), k2 = -1, k3 = -1;
-                if (basis == ECBasisType.ec_basis_pentanomial)
-                {
-                    k2 = readECExponent(m, input);
-                    k3 = readECExponent(m, input);
-                }
-
-                BigInteger a = readECFieldElement(m, input);
-                BigInteger b = readECFieldElement(m, input);
-                byte[] baseEncoding = TlsUtils.readOpaque8(input);
-                BigInteger order = readECParameter(input);
-                BigInteger cofactor = readECParameter(input);
-
-                ECCurve curve = (basis == ECBasisType.ec_basis_pentanomial)
-                    ? new ECCurve.F2m(m, k1, k2, k3, a, b, order, cofactor)
-                    : new ECCurve.F2m(m, k1, a, b, order, cofactor);
-
-                ECPoint base = deserializeECPoint(ecPointFormats, curve, baseEncoding);
-
-                return new ECDomainParameters(curve, base, order, cofactor);
-            }
-            case ECCurveType.named_curve:
-            {
-                int namedCurve = TlsUtils.readUint16(input);
-                if (!NamedCurve.refersToASpecificNamedCurve(namedCurve))
-                {
-                    /*
-                     * RFC 4492 5.4. All those values of NamedCurve are allowed that refer to a
-                     * specific curve. Values of NamedCurve that indicate support for a class of
-                     * explicitly defined curves are not allowed here [...].
-                     */
-                    throw new TlsFatalAlert(AlertDescription.illegal_parameter);
-                }
-
-                checkNamedCurve(namedCurves, namedCurve);
-
-                return getParametersForNamedCurve(namedCurve);
-            }
-            default:
-                throw new TlsFatalAlert(AlertDescription.illegal_parameter);
-            }
-        }
-        catch (RuntimeException e)
-        {
-            throw new TlsFatalAlert(AlertDescription.illegal_parameter, e);
-        }
-    }
-
-    private static void checkNamedCurve(int[] namedCurves, int namedCurve) throws IOException
-    {
-        if (namedCurves != null && !Arrays.contains(namedCurves, namedCurve))
-        {
-            /*
-             * RFC 4492 4. [...] servers MUST NOT negotiate the use of an ECC cipher suite
-             * unless they can complete the handshake while respecting the choice of curves
-             * and compression techniques specified by the client.
-             */
-            throw new TlsFatalAlert(AlertDescription.illegal_parameter);
-        }
-    }
-
-    public static void writeECExponent(int k, OutputStream output) throws IOException
-    {
-        BigInteger K = BigInteger.valueOf(k);
-        writeECParameter(K, output);
-    }
-
-    public static void writeECFieldElement(ECFieldElement x, OutputStream output) throws IOException
-    {
-        TlsUtils.writeOpaque8(x.getEncoded(), output);
-    }
-
-    public static void writeECFieldElement(int fieldSize, BigInteger x, OutputStream output) throws IOException
-    {
-        TlsUtils.writeOpaque8(serializeECFieldElement(fieldSize, x), output);
-    }
-
-    public static void writeECParameter(BigInteger x, OutputStream output) throws IOException
-    {
-        TlsUtils.writeOpaque8(BigIntegers.asUnsignedByteArray(x), output);
-    }
-
-    public static void writeExplicitECParameters(short[] ecPointFormats, ECDomainParameters ecParameters,
-        OutputStream output) throws IOException
-    {
-        ECCurve curve = ecParameters.getCurve();
-
-        if (ECAlgorithms.isFpCurve(curve))
-        {
-            TlsUtils.writeUint8(ECCurveType.explicit_prime, output);
-
-            writeECParameter(curve.getField().getCharacteristic(), output);
-        }
-        else if (ECAlgorithms.isF2mCurve(curve))
-        {
-            PolynomialExtensionField field = (PolynomialExtensionField)curve.getField();
-            int[] exponents = field.getMinimalPolynomial().getExponentsPresent();
-
-            TlsUtils.writeUint8(ECCurveType.explicit_char2, output);
-
-            int m = exponents[exponents.length - 1];
-            TlsUtils.checkUint16(m);
-            TlsUtils.writeUint16(m, output);
-
-            if (exponents.length == 3)
-            {
-                TlsUtils.writeUint8(ECBasisType.ec_basis_trinomial, output);
-                writeECExponent(exponents[1], output);
-            }
-            else if (exponents.length == 5)
-            {
-                TlsUtils.writeUint8(ECBasisType.ec_basis_pentanomial, output);
-                writeECExponent(exponents[1], output);
-                writeECExponent(exponents[2], output);
-                writeECExponent(exponents[3], output);
-            }
-            else
-            {
-                throw new IllegalArgumentException("Only trinomial and pentomial curves are supported");
-            }
-        }
-        else
-        {
-            throw new IllegalArgumentException("'ecParameters' not a known curve type");
-        }
-
-        writeECFieldElement(curve.getA(), output);
-        writeECFieldElement(curve.getB(), output);
-        TlsUtils.writeOpaque8(serializeECPoint(ecPointFormats, ecParameters.getG()), output);
-        writeECParameter(ecParameters.getN(), output);
-        writeECParameter(ecParameters.getH(), output);
-    }
-
-    public static void writeECPoint(short[] ecPointFormats, ECPoint point, OutputStream output) throws IOException
-    {
-        TlsUtils.writeOpaque8(serializeECPoint(ecPointFormats, point), output);
-    }
-
-    public static void writeNamedECParameters(int namedCurve, OutputStream output) throws IOException
-    {
-        if (!NamedCurve.refersToASpecificNamedCurve(namedCurve))
-        {
-            /*
-             * RFC 4492 5.4. All those values of NamedCurve are allowed that refer to a specific
-             * curve. Values of NamedCurve that indicate support for a class of explicitly defined
-             * curves are not allowed here [...].
-             */
-            throw new TlsFatalAlert(AlertDescription.internal_error);
-        }
-
-        TlsUtils.writeUint8(ECCurveType.named_curve, output);
-        TlsUtils.checkUint16(namedCurve);
-        TlsUtils.writeUint16(namedCurve, output);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsECDHEKeyExchange.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsECDHEKeyExchange.java
deleted file mode 100644
index c784080..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsECDHEKeyExchange.java
+++ /dev/null
@@ -1,144 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Vector;
-
-import org.bouncycastle.crypto.AsymmetricCipherKeyPair;
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.Signer;
-import org.bouncycastle.crypto.params.ECDomainParameters;
-import org.bouncycastle.crypto.params.ECPrivateKeyParameters;
-import org.bouncycastle.crypto.params.ECPublicKeyParameters;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.io.TeeInputStream;
-
-/**
- * (D)TLS ECDHE key exchange (see RFC 4492).
- */
-public class TlsECDHEKeyExchange
-    extends TlsECDHKeyExchange
-{
-    protected TlsSignerCredentials serverCredentials = null;
-
-    public TlsECDHEKeyExchange(int keyExchange, Vector supportedSignatureAlgorithms, int[] namedCurves,
-        short[] clientECPointFormats, short[] serverECPointFormats)
-    {
-        super(keyExchange, supportedSignatureAlgorithms, namedCurves, clientECPointFormats, serverECPointFormats);
-    }
-
-    public void processServerCredentials(TlsCredentials serverCredentials)
-        throws IOException
-    {
-        if (!(serverCredentials instanceof TlsSignerCredentials))
-        {
-            throw new TlsFatalAlert(AlertDescription.internal_error);
-        }
-
-        processServerCertificate(serverCredentials.getCertificate());
-
-        this.serverCredentials = (TlsSignerCredentials)serverCredentials;
-    }
-
-    public byte[] generateServerKeyExchange()
-        throws IOException
-    {
-        DigestInputBuffer buf = new DigestInputBuffer();
-
-        this.ecAgreePrivateKey = TlsECCUtils.generateEphemeralServerKeyExchange(context.getSecureRandom(), namedCurves,
-            clientECPointFormats, buf);
-
-        /*
-         * RFC 5246 4.7. digitally-signed element needs SignatureAndHashAlgorithm from TLS 1.2
-         */
-        SignatureAndHashAlgorithm signatureAndHashAlgorithm = TlsUtils.getSignatureAndHashAlgorithm(
-            context, serverCredentials);
-
-        Digest d = TlsUtils.createHash(signatureAndHashAlgorithm);
-
-        SecurityParameters securityParameters = context.getSecurityParameters();
-        d.update(securityParameters.clientRandom, 0, securityParameters.clientRandom.length);
-        d.update(securityParameters.serverRandom, 0, securityParameters.serverRandom.length);
-        buf.updateDigest(d);
-
-        byte[] hash = new byte[d.getDigestSize()];
-        d.doFinal(hash, 0);
-
-        byte[] signature = serverCredentials.generateCertificateSignature(hash);
-
-        DigitallySigned signed_params = new DigitallySigned(signatureAndHashAlgorithm, signature);
-        signed_params.encode(buf);
-
-        return buf.toByteArray();
-    }
-
-    public void processServerKeyExchange(InputStream input)
-        throws IOException
-    {
-        SecurityParameters securityParameters = context.getSecurityParameters();
-
-        SignerInputBuffer buf = new SignerInputBuffer();
-        InputStream teeIn = new TeeInputStream(input, buf);
-
-        ECDomainParameters curve_params = TlsECCUtils.readECParameters(namedCurves, clientECPointFormats, teeIn);
-
-        byte[] point = TlsUtils.readOpaque8(teeIn);
-
-        DigitallySigned signed_params = DigitallySigned.parse(context, input);
-
-        Signer signer = initVerifyer(tlsSigner, signed_params.getAlgorithm(), securityParameters);
-        buf.updateSigner(signer);
-        if (!signer.verifySignature(signed_params.getSignature()))
-        {
-            throw new TlsFatalAlert(AlertDescription.decrypt_error);
-        }
-
-        this.ecAgreePublicKey = TlsECCUtils.validateECPublicKey(TlsECCUtils.deserializeECPublicKey(
-            clientECPointFormats, curve_params, point));
-    }
-
-    public void validateCertificateRequest(CertificateRequest certificateRequest)
-        throws IOException
-    {
-        /*
-         * RFC 4492 3. [...] The ECDSA_fixed_ECDH and RSA_fixed_ECDH mechanisms are usable with
-         * ECDH_ECDSA and ECDH_RSA. Their use with ECDHE_ECDSA and ECDHE_RSA is prohibited because
-         * the use of a long-term ECDH client key would jeopardize the forward secrecy property of
-         * these algorithms.
-         */
-        short[] types = certificateRequest.getCertificateTypes();
-        for (int i = 0; i < types.length; ++i)
-        {
-            switch (types[i])
-            {
-            case ClientCertificateType.rsa_sign:
-            case ClientCertificateType.dss_sign:
-            case ClientCertificateType.ecdsa_sign:
-                break;
-            default:
-                throw new TlsFatalAlert(AlertDescription.illegal_parameter);
-            }
-        }
-    }
-
-    public void processClientCredentials(TlsCredentials clientCredentials)
-        throws IOException
-    {
-        if (clientCredentials instanceof TlsSignerCredentials)
-        {
-            // OK
-        }
-        else
-        {
-            throw new TlsFatalAlert(AlertDescription.internal_error);
-        }
-    }
-
-    protected Signer initVerifyer(TlsSigner tlsSigner, SignatureAndHashAlgorithm algorithm, SecurityParameters securityParameters)
-    {
-        Signer signer = tlsSigner.createVerifyer(algorithm, this.serverPublicKey);
-        signer.update(securityParameters.clientRandom, 0, securityParameters.clientRandom.length);
-        signer.update(securityParameters.serverRandom, 0, securityParameters.serverRandom.length);
-        return signer;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsECDHKeyExchange.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsECDHKeyExchange.java
deleted file mode 100644
index 3248e78..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsECDHKeyExchange.java
+++ /dev/null
@@ -1,218 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.Vector;
-
-import org.bouncycastle.asn1.x509.KeyUsage;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.bouncycastle.crypto.params.AsymmetricKeyParameter;
-import org.bouncycastle.crypto.params.ECDomainParameters;
-import org.bouncycastle.crypto.params.ECPrivateKeyParameters;
-import org.bouncycastle.crypto.params.ECPublicKeyParameters;
-import org.bouncycastle.crypto.util.PublicKeyFactory;
-
-/**
- * (D)TLS ECDH key exchange (see RFC 4492).
- */
-public class TlsECDHKeyExchange extends AbstractTlsKeyExchange
-{
-    protected TlsSigner tlsSigner;
-    protected int[] namedCurves;
-    protected short[] clientECPointFormats, serverECPointFormats;
-
-    protected AsymmetricKeyParameter serverPublicKey;
-    protected TlsAgreementCredentials agreementCredentials;
-
-    protected ECPrivateKeyParameters ecAgreePrivateKey;
-    protected ECPublicKeyParameters ecAgreePublicKey;
-
-    public TlsECDHKeyExchange(int keyExchange, Vector supportedSignatureAlgorithms, int[] namedCurves,
-        short[] clientECPointFormats, short[] serverECPointFormats)
-    {
-        super(keyExchange, supportedSignatureAlgorithms);
-
-        switch (keyExchange)
-        {
-        case KeyExchangeAlgorithm.ECDHE_RSA:
-            this.tlsSigner = new TlsRSASigner();
-            break;
-        case KeyExchangeAlgorithm.ECDHE_ECDSA:
-            this.tlsSigner = new TlsECDSASigner();
-            break;
-        case KeyExchangeAlgorithm.ECDH_RSA:
-        case KeyExchangeAlgorithm.ECDH_ECDSA:
-            this.tlsSigner = null;
-            break;
-        default:
-            throw new IllegalArgumentException("unsupported key exchange algorithm");
-        }
-
-        this.namedCurves = namedCurves;
-        this.clientECPointFormats = clientECPointFormats;
-        this.serverECPointFormats = serverECPointFormats;
-    }
-
-    public void init(TlsContext context)
-    {
-        super.init(context);
-
-        if (this.tlsSigner != null)
-        {
-            this.tlsSigner.init(context);
-        }
-    }
-
-    public void skipServerCredentials() throws IOException
-    {
-        throw new TlsFatalAlert(AlertDescription.unexpected_message);
-    }
-
-    public void processServerCertificate(Certificate serverCertificate) throws IOException
-    {
-        if (serverCertificate.isEmpty())
-        {
-            throw new TlsFatalAlert(AlertDescription.bad_certificate);
-        }
-
-        org.bouncycastle.asn1.x509.Certificate x509Cert = serverCertificate.getCertificateAt(0);
-
-        SubjectPublicKeyInfo keyInfo = x509Cert.getSubjectPublicKeyInfo();
-        try
-        {
-            this.serverPublicKey = PublicKeyFactory.createKey(keyInfo);
-        }
-        catch (RuntimeException e)
-        {
-            throw new TlsFatalAlert(AlertDescription.unsupported_certificate, e);
-        }
-
-        if (tlsSigner == null)
-        {
-            try
-            {
-                this.ecAgreePublicKey = TlsECCUtils.validateECPublicKey((ECPublicKeyParameters) this.serverPublicKey);
-            }
-            catch (ClassCastException e)
-            {
-                throw new TlsFatalAlert(AlertDescription.certificate_unknown, e);
-            }
-
-            TlsUtils.validateKeyUsage(x509Cert, KeyUsage.keyAgreement);
-        }
-        else
-        {
-            if (!tlsSigner.isValidPublicKey(this.serverPublicKey))
-            {
-                throw new TlsFatalAlert(AlertDescription.certificate_unknown);
-            }
-
-            TlsUtils.validateKeyUsage(x509Cert, KeyUsage.digitalSignature);
-        }
-
-        super.processServerCertificate(serverCertificate);
-    }
-
-    public boolean requiresServerKeyExchange()
-    {
-        switch (keyExchange)
-        {
-        case KeyExchangeAlgorithm.ECDHE_ECDSA:
-        case KeyExchangeAlgorithm.ECDHE_RSA:
-        case KeyExchangeAlgorithm.ECDH_anon:
-            return true;
-        default:
-            return false;
-        }
-    }
-
-    public void validateCertificateRequest(CertificateRequest certificateRequest) throws IOException
-    {
-        /*
-         * RFC 4492 3. [...] The ECDSA_fixed_ECDH and RSA_fixed_ECDH mechanisms are usable with
-         * ECDH_ECDSA and ECDH_RSA. Their use with ECDHE_ECDSA and ECDHE_RSA is prohibited because
-         * the use of a long-term ECDH client key would jeopardize the forward secrecy property of
-         * these algorithms.
-         */
-        short[] types = certificateRequest.getCertificateTypes();
-        for (int i = 0; i < types.length; ++i)
-        {
-            switch (types[i])
-            {
-            case ClientCertificateType.rsa_sign:
-            case ClientCertificateType.dss_sign:
-            case ClientCertificateType.ecdsa_sign:
-            case ClientCertificateType.rsa_fixed_ecdh:
-            case ClientCertificateType.ecdsa_fixed_ecdh:
-                break;
-            default:
-                throw new TlsFatalAlert(AlertDescription.illegal_parameter);
-            }
-        }
-    }
-
-    public void processClientCredentials(TlsCredentials clientCredentials) throws IOException
-    {
-        if (clientCredentials instanceof TlsAgreementCredentials)
-        {
-            // TODO Validate client cert has matching parameters (see 'TlsECCUtils.areOnSameCurve')?
-
-            this.agreementCredentials = (TlsAgreementCredentials)clientCredentials;
-        }
-        else if (clientCredentials instanceof TlsSignerCredentials)
-        {
-            // OK
-        }
-        else
-        {
-            throw new TlsFatalAlert(AlertDescription.internal_error);
-        }
-    }
-
-    public void generateClientKeyExchange(OutputStream output) throws IOException
-    {
-        if (agreementCredentials == null)
-        {
-            this.ecAgreePrivateKey = TlsECCUtils.generateEphemeralClientKeyExchange(context.getSecureRandom(),
-                serverECPointFormats, ecAgreePublicKey.getParameters(), output);
-        }
-    }
-
-    public void processClientCertificate(Certificate clientCertificate) throws IOException
-    {
-        // TODO Extract the public key
-        // TODO If the certificate is 'fixed', take the public key as ecAgreeClientPublicKey
-    }
-
-    public void processClientKeyExchange(InputStream input) throws IOException
-    {
-        if (ecAgreePublicKey != null)
-        {
-            // For ecdsa_fixed_ecdh and rsa_fixed_ecdh, the key arrived in the client certificate
-            return;
-        }
-
-        byte[] point = TlsUtils.readOpaque8(input);
-
-        ECDomainParameters curve_params = this.ecAgreePrivateKey.getParameters();
-
-        this.ecAgreePublicKey = TlsECCUtils.validateECPublicKey(TlsECCUtils.deserializeECPublicKey(
-            serverECPointFormats, curve_params, point));
-    }
-
-    public byte[] generatePremasterSecret() throws IOException
-    {
-        if (agreementCredentials != null)
-        {
-            return agreementCredentials.generateAgreement(ecAgreePublicKey);
-        }
-
-        if (ecAgreePrivateKey != null)
-        {
-            return TlsECCUtils.calculateECDHBasicAgreement(ecAgreePublicKey, ecAgreePrivateKey);
-        }
-
-        throw new TlsFatalAlert(AlertDescription.internal_error);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsECDSASigner.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsECDSASigner.java
deleted file mode 100644
index aa4c546..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsECDSASigner.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-import org.bouncycastle.crypto.DSA;
-import org.bouncycastle.crypto.params.AsymmetricKeyParameter;
-import org.bouncycastle.crypto.params.ECPublicKeyParameters;
-import org.bouncycastle.crypto.signers.ECDSASigner;
-import org.bouncycastle.crypto.signers.HMacDSAKCalculator;
-
-public class TlsECDSASigner
-    extends TlsDSASigner
-{
-    public boolean isValidPublicKey(AsymmetricKeyParameter publicKey)
-    {
-        return publicKey instanceof ECPublicKeyParameters;
-    }
-
-    protected DSA createDSAImpl(short hashAlgorithm)
-    {
-        return new ECDSASigner(new HMacDSAKCalculator(TlsUtils.createHash(hashAlgorithm)));
-    }
-
-    protected short getSignatureAlgorithm()
-    {
-        return SignatureAlgorithm.ecdsa;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsEncryptionCredentials.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsEncryptionCredentials.java
deleted file mode 100644
index f292896..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsEncryptionCredentials.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-import java.io.IOException;
-
-public interface TlsEncryptionCredentials extends TlsCredentials
-{
-    byte[] decryptPreMasterSecret(byte[] encryptedPreMasterSecret)
-        throws IOException;
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsExtensionsUtils.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsExtensionsUtils.java
deleted file mode 100644
index 8e50f57..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsExtensionsUtils.java
+++ /dev/null
@@ -1,281 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.util.Hashtable;
-
-import org.bouncycastle.util.Integers;
-
-public class TlsExtensionsUtils
-{
-    public static final Integer EXT_encrypt_then_mac = Integers.valueOf(ExtensionType.encrypt_then_mac);
-    public static final Integer EXT_extended_master_secret = Integers.valueOf(ExtensionType.extended_master_secret);
-    public static final Integer EXT_heartbeat = Integers.valueOf(ExtensionType.heartbeat);
-    public static final Integer EXT_max_fragment_length = Integers.valueOf(ExtensionType.max_fragment_length);
-    public static final Integer EXT_server_name = Integers.valueOf(ExtensionType.server_name);
-    public static final Integer EXT_status_request = Integers.valueOf(ExtensionType.status_request);
-    public static final Integer EXT_truncated_hmac = Integers.valueOf(ExtensionType.truncated_hmac);
-
-    public static Hashtable ensureExtensionsInitialised(Hashtable extensions)
-    {
-        return extensions == null ? new Hashtable() : extensions;
-    }
-
-    public static void addEncryptThenMACExtension(Hashtable extensions)
-    {
-        extensions.put(EXT_encrypt_then_mac, createEncryptThenMACExtension());
-    }
-
-    public static void addExtendedMasterSecretExtension(Hashtable extensions)
-    {
-        extensions.put(EXT_extended_master_secret, createExtendedMasterSecretExtension());
-    }
-
-    public static void addHeartbeatExtension(Hashtable extensions, HeartbeatExtension heartbeatExtension)
-        throws IOException
-    {
-        extensions.put(EXT_heartbeat, createHeartbeatExtension(heartbeatExtension));
-    }
-
-    public static void addMaxFragmentLengthExtension(Hashtable extensions, short maxFragmentLength)
-        throws IOException
-    {
-        extensions.put(EXT_max_fragment_length, createMaxFragmentLengthExtension(maxFragmentLength));
-    }
-
-    public static void addServerNameExtension(Hashtable extensions, ServerNameList serverNameList)
-        throws IOException
-    {
-        extensions.put(EXT_server_name, createServerNameExtension(serverNameList));
-    }
-
-    public static void addStatusRequestExtension(Hashtable extensions, CertificateStatusRequest statusRequest)
-        throws IOException
-    {
-        extensions.put(EXT_status_request, createStatusRequestExtension(statusRequest));
-    }
-
-    public static void addTruncatedHMacExtension(Hashtable extensions)
-    {
-        extensions.put(EXT_truncated_hmac, createTruncatedHMacExtension());
-    }
-
-    public static HeartbeatExtension getHeartbeatExtension(Hashtable extensions)
-        throws IOException
-    {
-        byte[] extensionData = TlsUtils.getExtensionData(extensions, EXT_heartbeat);
-        return extensionData == null ? null : readHeartbeatExtension(extensionData);
-    }
-
-    public static short getMaxFragmentLengthExtension(Hashtable extensions)
-        throws IOException
-    {
-        byte[] extensionData = TlsUtils.getExtensionData(extensions, EXT_max_fragment_length);
-        return extensionData == null ? -1 : readMaxFragmentLengthExtension(extensionData);
-    }
-
-    public static ServerNameList getServerNameExtension(Hashtable extensions)
-        throws IOException
-    {
-        byte[] extensionData = TlsUtils.getExtensionData(extensions, EXT_server_name);
-        return extensionData == null ? null : readServerNameExtension(extensionData);
-    }
-
-    public static CertificateStatusRequest getStatusRequestExtension(Hashtable extensions)
-        throws IOException
-    {
-        byte[] extensionData = TlsUtils.getExtensionData(extensions, EXT_status_request);
-        return extensionData == null ? null : readStatusRequestExtension(extensionData);
-    }
-
-    public static boolean hasEncryptThenMACExtension(Hashtable extensions) throws IOException
-    {
-        byte[] extensionData = TlsUtils.getExtensionData(extensions, EXT_encrypt_then_mac);
-        return extensionData == null ? false : readEncryptThenMACExtension(extensionData);
-    }
-
-    public static boolean hasExtendedMasterSecretExtension(Hashtable extensions) throws IOException
-    {
-        byte[] extensionData = TlsUtils.getExtensionData(extensions, EXT_extended_master_secret);
-        return extensionData == null ? false : readExtendedMasterSecretExtension(extensionData);
-    }
-
-    public static boolean hasTruncatedHMacExtension(Hashtable extensions) throws IOException
-    {
-        byte[] extensionData = TlsUtils.getExtensionData(extensions, EXT_truncated_hmac);
-        return extensionData == null ? false : readTruncatedHMacExtension(extensionData);
-    }
-
-    public static byte[] createEmptyExtensionData()
-    {
-        return TlsUtils.EMPTY_BYTES;
-    }
-
-    public static byte[] createEncryptThenMACExtension()
-    {
-        return createEmptyExtensionData();
-    }
-
-    public static byte[] createExtendedMasterSecretExtension()
-    {
-        return createEmptyExtensionData();
-    }
-
-    public static byte[] createHeartbeatExtension(HeartbeatExtension heartbeatExtension)
-        throws IOException
-    {
-        if (heartbeatExtension == null)
-        {
-            throw new TlsFatalAlert(AlertDescription.internal_error);
-        }
-
-        ByteArrayOutputStream buf = new ByteArrayOutputStream();
-
-        heartbeatExtension.encode(buf);
-
-        return buf.toByteArray();
-    }
-
-    public static byte[] createMaxFragmentLengthExtension(short maxFragmentLength)
-        throws IOException
-    {
-        TlsUtils.checkUint8(maxFragmentLength);
-
-        byte[] extensionData = new byte[1];
-        TlsUtils.writeUint8(maxFragmentLength, extensionData, 0);
-        return extensionData;
-    }
-
-    public static byte[] createServerNameExtension(ServerNameList serverNameList)
-        throws IOException
-    {
-        if (serverNameList == null)
-        {
-            throw new TlsFatalAlert(AlertDescription.internal_error);
-        }
-        
-        ByteArrayOutputStream buf = new ByteArrayOutputStream();
-        
-        serverNameList.encode(buf);
-
-        return buf.toByteArray();
-    }
-
-    public static byte[] createStatusRequestExtension(CertificateStatusRequest statusRequest)
-        throws IOException
-    {
-        if (statusRequest == null)
-        {
-            throw new TlsFatalAlert(AlertDescription.internal_error);
-        }
-
-        ByteArrayOutputStream buf = new ByteArrayOutputStream();
-
-        statusRequest.encode(buf);
-
-        return buf.toByteArray();
-    }
-
-    public static byte[] createTruncatedHMacExtension()
-    {
-        return createEmptyExtensionData();
-    }
-
-    private static boolean readEmptyExtensionData(byte[] extensionData) throws IOException
-    {
-        if (extensionData == null)
-        {
-            throw new IllegalArgumentException("'extensionData' cannot be null");
-        }
-
-        if (extensionData.length != 0)
-        {
-            throw new TlsFatalAlert(AlertDescription.illegal_parameter);
-        }
-
-        return true;
-    }
-
-    public static boolean readEncryptThenMACExtension(byte[] extensionData) throws IOException
-    {
-        return readEmptyExtensionData(extensionData);
-    }
-
-    public static boolean readExtendedMasterSecretExtension(byte[] extensionData) throws IOException
-    {
-        return readEmptyExtensionData(extensionData);
-    }
-
-    public static HeartbeatExtension readHeartbeatExtension(byte[] extensionData)
-        throws IOException
-    {
-        if (extensionData == null)
-        {
-            throw new IllegalArgumentException("'extensionData' cannot be null");
-        }
-
-        ByteArrayInputStream buf = new ByteArrayInputStream(extensionData);
-
-        HeartbeatExtension heartbeatExtension = HeartbeatExtension.parse(buf);
-
-        TlsProtocol.assertEmpty(buf);
-
-        return heartbeatExtension;
-    }
-
-    public static short readMaxFragmentLengthExtension(byte[] extensionData)
-        throws IOException
-    {
-        if (extensionData == null)
-        {
-            throw new IllegalArgumentException("'extensionData' cannot be null");
-        }
-
-        if (extensionData.length != 1)
-        {
-            throw new TlsFatalAlert(AlertDescription.decode_error);
-        }
-
-        return TlsUtils.readUint8(extensionData, 0);
-    }
-
-    public static ServerNameList readServerNameExtension(byte[] extensionData)
-        throws IOException
-    {
-        if (extensionData == null)
-        {
-            throw new IllegalArgumentException("'extensionData' cannot be null");
-        }
-
-        ByteArrayInputStream buf = new ByteArrayInputStream(extensionData);
-
-        ServerNameList serverNameList = ServerNameList.parse(buf);
-
-        TlsProtocol.assertEmpty(buf);
-
-        return serverNameList;
-    }
-
-    public static CertificateStatusRequest readStatusRequestExtension(byte[] extensionData)
-        throws IOException
-    {
-        if (extensionData == null)
-        {
-            throw new IllegalArgumentException("'extensionData' cannot be null");
-        }
-
-        ByteArrayInputStream buf = new ByteArrayInputStream(extensionData);
-
-        CertificateStatusRequest statusRequest = CertificateStatusRequest.parse(buf);
-
-        TlsProtocol.assertEmpty(buf);
-
-        return statusRequest;
-    }
-
-    public static boolean readTruncatedHMacExtension(byte[] extensionData) throws IOException
-    {
-        return readEmptyExtensionData(extensionData);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsFatalAlert.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsFatalAlert.java
deleted file mode 100644
index dfbb09e..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsFatalAlert.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-import java.io.IOException;
-
-public class TlsFatalAlert
-    extends IOException
-{
-    private static final long serialVersionUID = 3584313123679111168L;
-
-    protected short alertDescription;
-
-    // TODO Some day we might be able to just pass this down to IOException (1.6+)
-    protected Throwable alertCause;
-
-    public TlsFatalAlert(short alertDescription)
-    {
-        this(alertDescription, null);
-    }
-
-    public TlsFatalAlert(short alertDescription, Throwable alertCause)
-    {
-        super(AlertDescription.getText(alertDescription));
-
-        this.alertDescription = alertDescription;
-        this.alertCause = alertCause;
-    }
-
-    public short getAlertDescription()
-    {
-        return alertDescription;
-    }
-
-    public Throwable getCause()
-    {
-        return alertCause;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsHandshakeHash.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsHandshakeHash.java
deleted file mode 100644
index 4ccfe72..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsHandshakeHash.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-import org.bouncycastle.crypto.Digest;
-
-public interface TlsHandshakeHash
-    extends Digest
-{
-    void init(TlsContext context);
-
-    TlsHandshakeHash notifyPRFDetermined();
-
-    void trackHashAlgorithm(short hashAlgorithm);
-
-    void sealHashAlgorithms();
-
-    TlsHandshakeHash stopTracking();
-
-    Digest forkPRFHash();
-
-    byte[] getFinalHash(short hashAlgorithm);
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsInputStream.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsInputStream.java
deleted file mode 100644
index a2cf74e..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsInputStream.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-/**
- * An InputStream for an TLS 1.0 connection.
- */
-class TlsInputStream
-    extends InputStream
-{
-    private byte[] buf = new byte[1];
-    private TlsProtocol handler = null;
-
-    TlsInputStream(TlsProtocol handler)
-    {
-        this.handler = handler;
-    }
-
-    public int available()
-        throws IOException
-    {
-        return this.handler.applicationDataAvailable();
-    }
-
-    public int read(byte[] buf, int offset, int len)
-        throws IOException
-    {
-        return this.handler.readApplicationData(buf, offset, len);
-    }
-
-    public int read()
-        throws IOException
-    {
-        if (this.read(buf) < 0)
-        {
-            return -1;
-        }
-        return buf[0] & 0xff;
-    }
-
-    public void close()
-        throws IOException
-    {
-        handler.close();
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsKeyExchange.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsKeyExchange.java
deleted file mode 100644
index 83cd0b7..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsKeyExchange.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-/**
- * A generic interface for key exchange implementations in (D)TLS.
- */
-public interface TlsKeyExchange
-{
-    void init(TlsContext context);
-
-    void skipServerCredentials()
-        throws IOException;
-
-    void processServerCredentials(TlsCredentials serverCredentials)
-        throws IOException;
-
-    void processServerCertificate(Certificate serverCertificate)
-        throws IOException;
-
-    boolean requiresServerKeyExchange();
-
-    byte[] generateServerKeyExchange()
-        throws IOException;
-
-    void skipServerKeyExchange()
-        throws IOException;
-
-    void processServerKeyExchange(InputStream input)
-        throws IOException;
-
-    void validateCertificateRequest(CertificateRequest certificateRequest)
-        throws IOException;
-
-    void skipClientCredentials()
-        throws IOException;
-
-    void processClientCredentials(TlsCredentials clientCredentials)
-        throws IOException;
-
-    void processClientCertificate(Certificate clientCertificate)
-        throws IOException;
-
-    void generateClientKeyExchange(OutputStream output)
-        throws IOException;
-
-    void processClientKeyExchange(InputStream input)
-        throws IOException;
-
-    byte[] generatePremasterSecret()
-        throws IOException;
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsMac.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsMac.java
deleted file mode 100644
index 00e0c79..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsMac.java
+++ /dev/null
@@ -1,172 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.Mac;
-import org.bouncycastle.crypto.digests.LongDigest;
-import org.bouncycastle.crypto.macs.HMac;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.util.Arrays;
-
-/**
- * A generic TLS MAC implementation, acting as an HMAC based on some underlying Digest.
- */
-public class TlsMac
-{
-    protected TlsContext context;
-    protected byte[] secret;
-    protected Mac mac;
-    protected int digestBlockSize;
-    protected int digestOverhead;
-    protected int macLength;
-
-    /**
-     * Generate a new instance of an TlsMac.
-     *
-     * @param context the TLS client context
-     * @param digest  The digest to use.
-     * @param key     A byte-array where the key for this MAC is located.
-     * @param keyOff  The number of bytes to skip, before the key starts in the buffer.
-     * @param keyLen  The length of the key.
-     */
-    public TlsMac(TlsContext context, Digest digest, byte[] key, int keyOff, int keyLen)
-    {
-        this.context = context;
-
-        KeyParameter keyParameter = new KeyParameter(key, keyOff, keyLen);
-
-        this.secret = Arrays.clone(keyParameter.getKey());
-
-        // TODO This should check the actual algorithm, not rely on the engine type
-        if (digest instanceof LongDigest)
-        {
-            this.digestBlockSize = 128;
-            this.digestOverhead = 16;
-        }
-        else
-        {
-            this.digestBlockSize = 64;
-            this.digestOverhead = 8;
-        }
-
-        if (TlsUtils.isSSL(context))
-        {
-            this.mac = new SSL3Mac(digest);
-
-            // TODO This should check the actual algorithm, not assume based on the digest size
-            if (digest.getDigestSize() == 20)
-            {
-                /*
-                 * NOTE: When SHA-1 is used with the SSL 3.0 MAC, the secret + input pad is not
-                 * digest block-aligned.
-                 */
-                this.digestOverhead = 4;
-            }
-        }
-        else
-        {
-            this.mac = new HMac(digest);
-
-            // NOTE: The input pad for HMAC is always a full digest block
-        }
-
-        this.mac.init(keyParameter);
-
-        this.macLength = mac.getMacSize();
-        if (context.getSecurityParameters().truncatedHMac)
-        {
-            this.macLength = Math.min(this.macLength, 10);
-        }
-    }
-
-    /**
-     * @return the MAC write secret
-     */
-    public byte[] getMACSecret()
-    {
-        return this.secret;
-    }
-
-    /**
-     * @return The output length of this MAC.
-     */
-    public int getSize()
-    {
-        return macLength;
-    }
-
-    /**
-     * Calculate the MAC for some given data.
-     *
-     * @param type    The message type of the message.
-     * @param message A byte-buffer containing the message.
-     * @param offset  The number of bytes to skip, before the message starts.
-     * @param length  The length of the message.
-     * @return A new byte-buffer containing the MAC value.
-     */
-    public byte[] calculateMac(long seqNo, short type, byte[] message, int offset, int length)
-    {
-        ProtocolVersion serverVersion = context.getServerVersion();
-        boolean isSSL = serverVersion.isSSL();
-
-        byte[] macHeader = new byte[isSSL ? 11 : 13];
-        TlsUtils.writeUint64(seqNo, macHeader, 0);
-        TlsUtils.writeUint8(type, macHeader, 8);
-        if (!isSSL)
-        {
-            TlsUtils.writeVersion(serverVersion, macHeader, 9);
-        }
-        TlsUtils.writeUint16(length, macHeader, macHeader.length - 2);
-
-        mac.update(macHeader, 0, macHeader.length);
-        mac.update(message, offset, length);
-
-        byte[] result = new byte[mac.getMacSize()];
-        mac.doFinal(result, 0);
-        return truncate(result);
-    }
-
-    public byte[] calculateMacConstantTime(long seqNo, short type, byte[] message, int offset, int length,
-        int fullLength, byte[] dummyData)
-    {
-        /*
-         * Actual MAC only calculated on 'length' bytes...
-         */
-        byte[] result = calculateMac(seqNo, type, message, offset, length);
-
-        /*
-         * ...but ensure a constant number of complete digest blocks are processed (as many as would
-         * be needed for 'fullLength' bytes of input).
-         */
-        int headerLength = TlsUtils.isSSL(context) ? 11 : 13;
-
-        // How many extra full blocks do we need to calculate?
-        int extra = getDigestBlockCount(headerLength + fullLength) - getDigestBlockCount(headerLength + length);
-
-        while (--extra >= 0)
-        {
-            mac.update(dummyData, 0, digestBlockSize);
-        }
-
-        // One more byte in case the implementation is "lazy" about processing blocks
-        mac.update(dummyData[0]);
-        mac.reset();
-
-        return result;
-    }
-
-    protected int getDigestBlockCount(int inputLength)
-    {
-        // NOTE: This calculation assumes a minimum of 1 pad byte
-        return (inputLength + digestOverhead) / digestBlockSize;
-    }
-
-    protected byte[] truncate(byte[] bs)
-    {
-        if (bs.length <= macLength)
-        {
-            return bs;
-        }
-
-        return Arrays.copyOf(bs, macLength);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsNullCipher.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsNullCipher.java
deleted file mode 100644
index d1f6986..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsNullCipher.java
+++ /dev/null
@@ -1,123 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-import java.io.IOException;
-
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.util.Arrays;
-
-/**
- * A NULL CipherSuite with optional MAC
- */
-public class TlsNullCipher
-    implements TlsCipher
-{
-    protected TlsContext context;
-
-    protected TlsMac writeMac;
-    protected TlsMac readMac;
-
-    public TlsNullCipher(TlsContext context)
-    {
-        this.context = context;
-        this.writeMac = null;
-        this.readMac = null;
-    }
-
-    public TlsNullCipher(TlsContext context, Digest clientWriteDigest, Digest serverWriteDigest)
-        throws IOException
-    {
-        if ((clientWriteDigest == null) != (serverWriteDigest == null))
-        {
-            throw new TlsFatalAlert(AlertDescription.internal_error);
-        }
-
-        this.context = context;
-
-        TlsMac clientWriteMac = null, serverWriteMac = null;
-
-        if (clientWriteDigest != null)
-        {
-            int key_block_size = clientWriteDigest.getDigestSize()
-                + serverWriteDigest.getDigestSize();
-            byte[] key_block = TlsUtils.calculateKeyBlock(context, key_block_size);
-
-            int offset = 0;
-
-            clientWriteMac = new TlsMac(context, clientWriteDigest, key_block, offset,
-                clientWriteDigest.getDigestSize());
-            offset += clientWriteDigest.getDigestSize();
-
-            serverWriteMac = new TlsMac(context, serverWriteDigest, key_block, offset,
-                serverWriteDigest.getDigestSize());
-            offset += serverWriteDigest.getDigestSize();
-
-            if (offset != key_block_size)
-            {
-                throw new TlsFatalAlert(AlertDescription.internal_error);
-            }
-        }
-
-        if (context.isServer())
-        {
-            writeMac = serverWriteMac;
-            readMac = clientWriteMac;
-        }
-        else
-        {
-            writeMac = clientWriteMac;
-            readMac = serverWriteMac;
-        }
-    }
-
-    public int getPlaintextLimit(int ciphertextLimit)
-    {
-        int result = ciphertextLimit;
-        if (writeMac != null)
-        {
-            result -= writeMac.getSize();
-        }
-        return result;
-    }
-
-    public byte[] encodePlaintext(long seqNo, short type, byte[] plaintext, int offset, int len)
-        throws IOException
-    {
-        if (writeMac == null)
-        {
-            return Arrays.copyOfRange(plaintext, offset, offset + len);
-        }
-
-        byte[] mac = writeMac.calculateMac(seqNo, type, plaintext, offset, len);
-        byte[] ciphertext = new byte[len + mac.length];
-        System.arraycopy(plaintext, offset, ciphertext, 0, len);
-        System.arraycopy(mac, 0, ciphertext, len, mac.length);
-        return ciphertext;
-    }
-
-    public byte[] decodeCiphertext(long seqNo, short type, byte[] ciphertext, int offset, int len)
-        throws IOException
-    {
-        if (readMac == null)
-        {
-            return Arrays.copyOfRange(ciphertext, offset, offset + len);
-        }
-
-        int macSize = readMac.getSize();
-        if (len < macSize)
-        {
-            throw new TlsFatalAlert(AlertDescription.decode_error);
-        }
-
-        int macInputLen = len - macSize;
-
-        byte[] receivedMac = Arrays.copyOfRange(ciphertext, offset + macInputLen, offset + len);
-        byte[] computedMac = readMac.calculateMac(seqNo, type, ciphertext, offset, macInputLen);
-
-        if (!Arrays.constantTimeAreEqual(receivedMac, computedMac))
-        {
-            throw new TlsFatalAlert(AlertDescription.bad_record_mac);
-        }
-
-        return Arrays.copyOfRange(ciphertext, offset, offset + macInputLen);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsNullCompression.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsNullCompression.java
deleted file mode 100644
index 13a85ab..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsNullCompression.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-import java.io.OutputStream;
-
-public class TlsNullCompression
-    implements TlsCompression
-{
-    public OutputStream compress(OutputStream output)
-    {
-        return output;
-    }
-
-    public OutputStream decompress(OutputStream output)
-    {
-        return output;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsOutputStream.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsOutputStream.java
deleted file mode 100644
index d953241..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsOutputStream.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-import java.io.IOException;
-import java.io.OutputStream;
-
-/**
- * An OutputStream for an TLS connection.
- */
-class TlsOutputStream
-    extends OutputStream
-{
-    private byte[] buf = new byte[1];
-    private TlsProtocol handler;
-
-    TlsOutputStream(TlsProtocol handler)
-    {
-        this.handler = handler;
-    }
-
-    public void write(byte buf[], int offset, int len)
-        throws IOException
-    {
-        this.handler.writeData(buf, offset, len);
-    }
-
-    public void write(int arg0)
-        throws IOException
-    {
-        buf[0] = (byte)arg0;
-        this.write(buf, 0, 1);
-    }
-
-    public void close()
-        throws IOException
-    {
-        handler.close();
-    }
-
-    public void flush()
-        throws IOException
-    {
-        handler.flush();
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsPSKIdentity.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsPSKIdentity.java
deleted file mode 100644
index 2f6eea2..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsPSKIdentity.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-public interface TlsPSKIdentity
-{
-    void skipIdentityHint();
-
-    void notifyIdentityHint(byte[] psk_identity_hint);
-
-    byte[] getPSKIdentity();
-
-    byte[] getPSK();
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsPSKIdentityManager.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsPSKIdentityManager.java
deleted file mode 100644
index c0ecf32..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsPSKIdentityManager.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-public interface TlsPSKIdentityManager
-{
-    byte[] getHint();
-
-    byte[] getPSK(byte[] identity);
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsPSKKeyExchange.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsPSKKeyExchange.java
deleted file mode 100644
index 43c651d..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsPSKKeyExchange.java
+++ /dev/null
@@ -1,359 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.math.BigInteger;
-import java.util.Vector;
-
-import org.bouncycastle.asn1.x509.KeyUsage;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.bouncycastle.crypto.params.AsymmetricKeyParameter;
-import org.bouncycastle.crypto.params.DHParameters;
-import org.bouncycastle.crypto.params.DHPrivateKeyParameters;
-import org.bouncycastle.crypto.params.DHPublicKeyParameters;
-import org.bouncycastle.crypto.params.ECDomainParameters;
-import org.bouncycastle.crypto.params.ECPrivateKeyParameters;
-import org.bouncycastle.crypto.params.ECPublicKeyParameters;
-import org.bouncycastle.crypto.params.RSAKeyParameters;
-import org.bouncycastle.crypto.util.PublicKeyFactory;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.io.Streams;
-
-/**
- * (D)TLS PSK key exchange (RFC 4279).
- */
-public class TlsPSKKeyExchange
-    extends AbstractTlsKeyExchange
-{
-    protected TlsPSKIdentity pskIdentity;
-    protected TlsPSKIdentityManager pskIdentityManager;
-
-    protected DHParameters dhParameters;
-    protected int[] namedCurves;
-    protected short[] clientECPointFormats, serverECPointFormats;
-
-    protected byte[] psk_identity_hint = null;
-    protected byte[] psk = null;
-
-    protected DHPrivateKeyParameters dhAgreePrivateKey = null;
-    protected DHPublicKeyParameters dhAgreePublicKey = null;
-
-    protected ECPrivateKeyParameters ecAgreePrivateKey = null;
-    protected ECPublicKeyParameters ecAgreePublicKey = null;
-
-    protected AsymmetricKeyParameter serverPublicKey = null;
-    protected RSAKeyParameters rsaServerPublicKey = null;
-    protected TlsEncryptionCredentials serverCredentials = null;
-    protected byte[] premasterSecret;
-
-    public TlsPSKKeyExchange(int keyExchange, Vector supportedSignatureAlgorithms, TlsPSKIdentity pskIdentity,
-        TlsPSKIdentityManager pskIdentityManager, DHParameters dhParameters, int[] namedCurves,
-        short[] clientECPointFormats, short[] serverECPointFormats)
-    {
-        super(keyExchange, supportedSignatureAlgorithms);
-
-        switch (keyExchange)
-        {
-        case KeyExchangeAlgorithm.DHE_PSK:
-        case KeyExchangeAlgorithm.ECDHE_PSK:
-        case KeyExchangeAlgorithm.PSK:
-        case KeyExchangeAlgorithm.RSA_PSK:
-            break;
-        default:
-            throw new IllegalArgumentException("unsupported key exchange algorithm");
-        }
-
-        this.pskIdentity = pskIdentity;
-        this.pskIdentityManager = pskIdentityManager;
-        this.dhParameters = dhParameters;
-        this.namedCurves = namedCurves;
-        this.clientECPointFormats = clientECPointFormats;
-        this.serverECPointFormats = serverECPointFormats;
-    }
-
-    public void skipServerCredentials() throws IOException
-    {
-        if (keyExchange == KeyExchangeAlgorithm.RSA_PSK)
-        {
-            throw new TlsFatalAlert(AlertDescription.unexpected_message);
-        }
-    }
-
-    public void processServerCredentials(TlsCredentials serverCredentials) throws IOException
-    {
-        if (!(serverCredentials instanceof TlsEncryptionCredentials))
-        {
-            throw new TlsFatalAlert(AlertDescription.internal_error);
-        }
-
-        processServerCertificate(serverCredentials.getCertificate());
-
-        this.serverCredentials = (TlsEncryptionCredentials)serverCredentials;
-    }
-
-    public byte[] generateServerKeyExchange() throws IOException
-    {
-        this.psk_identity_hint = pskIdentityManager.getHint();
-
-        if (this.psk_identity_hint == null && !requiresServerKeyExchange())
-        {
-            return null;
-        }
-
-        ByteArrayOutputStream buf = new ByteArrayOutputStream();
-
-        if (this.psk_identity_hint == null)
-        {
-            TlsUtils.writeOpaque16(TlsUtils.EMPTY_BYTES, buf);
-        }
-        else
-        {
-            TlsUtils.writeOpaque16(this.psk_identity_hint, buf);
-        }
-
-        if (this.keyExchange == KeyExchangeAlgorithm.DHE_PSK)
-        {
-            if (this.dhParameters == null)
-            {
-                throw new TlsFatalAlert(AlertDescription.internal_error);
-            }
-
-            this.dhAgreePrivateKey = TlsDHUtils.generateEphemeralServerKeyExchange(context.getSecureRandom(),
-                this.dhParameters, buf);
-        }
-        else if (this.keyExchange == KeyExchangeAlgorithm.ECDHE_PSK)
-        {
-            this.ecAgreePrivateKey = TlsECCUtils.generateEphemeralServerKeyExchange(context.getSecureRandom(),
-                namedCurves, clientECPointFormats, buf);
-        }
-
-        return buf.toByteArray();
-    }
-
-    public void processServerCertificate(Certificate serverCertificate) throws IOException
-    {
-        if (keyExchange != KeyExchangeAlgorithm.RSA_PSK)
-        {
-            throw new TlsFatalAlert(AlertDescription.unexpected_message);
-        }
-        if (serverCertificate.isEmpty())
-        {
-            throw new TlsFatalAlert(AlertDescription.bad_certificate);
-        }
-
-        org.bouncycastle.asn1.x509.Certificate x509Cert = serverCertificate.getCertificateAt(0);
-
-        SubjectPublicKeyInfo keyInfo = x509Cert.getSubjectPublicKeyInfo();
-        try
-        {
-            this.serverPublicKey = PublicKeyFactory.createKey(keyInfo);
-        }
-        catch (RuntimeException e)
-        {
-            throw new TlsFatalAlert(AlertDescription.unsupported_certificate, e);
-        }
-
-        // Sanity check the PublicKeyFactory
-        if (this.serverPublicKey.isPrivate())
-        {
-            throw new TlsFatalAlert(AlertDescription.internal_error);
-        }
-
-        this.rsaServerPublicKey = validateRSAPublicKey((RSAKeyParameters)this.serverPublicKey);
-
-        TlsUtils.validateKeyUsage(x509Cert, KeyUsage.keyEncipherment);
-
-        super.processServerCertificate(serverCertificate);
-    }
-
-    public boolean requiresServerKeyExchange()
-    {
-        switch (keyExchange)
-        {
-        case KeyExchangeAlgorithm.DHE_PSK:
-        case KeyExchangeAlgorithm.ECDHE_PSK:
-            return true;
-        default:
-            return false;
-        }
-    }
-
-    public void processServerKeyExchange(InputStream input) throws IOException
-    {
-        this.psk_identity_hint = TlsUtils.readOpaque16(input);
-
-        if (this.keyExchange == KeyExchangeAlgorithm.DHE_PSK)
-        {
-            ServerDHParams serverDHParams = ServerDHParams.parse(input);
-
-            this.dhAgreePublicKey = TlsDHUtils.validateDHPublicKey(serverDHParams.getPublicKey());
-            this.dhParameters = dhAgreePublicKey.getParameters();
-        }
-        else if (this.keyExchange == KeyExchangeAlgorithm.ECDHE_PSK)
-        {
-            ECDomainParameters ecParams = TlsECCUtils.readECParameters(namedCurves, clientECPointFormats, input);
-
-            byte[] point = TlsUtils.readOpaque8(input);
-
-            this.ecAgreePublicKey = TlsECCUtils.validateECPublicKey(TlsECCUtils.deserializeECPublicKey(
-                clientECPointFormats, ecParams, point));
-        }
-    }
-
-    public void validateCertificateRequest(CertificateRequest certificateRequest) throws IOException
-    {
-        throw new TlsFatalAlert(AlertDescription.unexpected_message);
-    }
-
-    public void processClientCredentials(TlsCredentials clientCredentials) throws IOException
-    {
-        throw new TlsFatalAlert(AlertDescription.internal_error);
-    }
-
-    public void generateClientKeyExchange(OutputStream output) throws IOException
-    {
-        if (psk_identity_hint == null)
-        {
-            pskIdentity.skipIdentityHint();
-        }
-        else
-        {
-            pskIdentity.notifyIdentityHint(psk_identity_hint);
-        }
-
-        byte[] psk_identity = pskIdentity.getPSKIdentity();
-        if (psk_identity == null)
-        {
-            throw new TlsFatalAlert(AlertDescription.internal_error);
-        }
-
-        this.psk = pskIdentity.getPSK();
-        if (psk == null)
-        {
-            throw new TlsFatalAlert(AlertDescription.internal_error);
-        }
-
-        TlsUtils.writeOpaque16(psk_identity, output);
-
-        context.getSecurityParameters().pskIdentity = Arrays.clone(psk_identity);
-
-        if (this.keyExchange == KeyExchangeAlgorithm.DHE_PSK)
-        {
-            this.dhAgreePrivateKey = TlsDHUtils.generateEphemeralClientKeyExchange(context.getSecureRandom(),
-                dhParameters, output);
-        }
-        else if (this.keyExchange == KeyExchangeAlgorithm.ECDHE_PSK)
-        {
-            this.ecAgreePrivateKey = TlsECCUtils.generateEphemeralClientKeyExchange(context.getSecureRandom(),
-                serverECPointFormats, ecAgreePublicKey.getParameters(), output);
-        }
-        else if (this.keyExchange == KeyExchangeAlgorithm.RSA_PSK)
-        {
-            this.premasterSecret = TlsRSAUtils.generateEncryptedPreMasterSecret(context, this.rsaServerPublicKey,
-                output);
-        }
-    }
-
-    public void processClientKeyExchange(InputStream input) throws IOException
-    {
-        byte[] psk_identity = TlsUtils.readOpaque16(input);
-
-        this.psk = pskIdentityManager.getPSK(psk_identity);
-        if (psk == null)
-        {
-            throw new TlsFatalAlert(AlertDescription.unknown_psk_identity);
-        }
-
-        context.getSecurityParameters().pskIdentity = psk_identity;
-
-        if (this.keyExchange == KeyExchangeAlgorithm.DHE_PSK)
-        {
-            BigInteger Yc = TlsDHUtils.readDHParameter(input);
-
-            this.dhAgreePublicKey = TlsDHUtils.validateDHPublicKey(new DHPublicKeyParameters(Yc, dhParameters));
-        }
-        else if (this.keyExchange == KeyExchangeAlgorithm.ECDHE_PSK)
-        {
-            byte[] point = TlsUtils.readOpaque8(input);
-
-            ECDomainParameters curve_params = this.ecAgreePrivateKey.getParameters();
-
-            this.ecAgreePublicKey = TlsECCUtils.validateECPublicKey(TlsECCUtils.deserializeECPublicKey(
-                serverECPointFormats, curve_params, point));
-        }
-        else if (this.keyExchange == KeyExchangeAlgorithm.RSA_PSK)
-        {
-            byte[] encryptedPreMasterSecret;
-            if (TlsUtils.isSSL(context))
-            {
-                // TODO Do any SSLv3 clients actually include the length?
-                encryptedPreMasterSecret = Streams.readAll(input);
-            }
-            else
-            {
-                encryptedPreMasterSecret = TlsUtils.readOpaque16(input);
-            }
-
-            this.premasterSecret = serverCredentials.decryptPreMasterSecret(encryptedPreMasterSecret);
-        }
-    }
-
-    public byte[] generatePremasterSecret() throws IOException
-    {
-        byte[] other_secret = generateOtherSecret(psk.length);
-
-        ByteArrayOutputStream buf = new ByteArrayOutputStream(4 + other_secret.length + psk.length);
-        TlsUtils.writeOpaque16(other_secret, buf);
-        TlsUtils.writeOpaque16(psk, buf);
-
-        Arrays.fill(psk, (byte)0);
-        this.psk = null;
-
-        return buf.toByteArray();
-    }
-
-    protected byte[] generateOtherSecret(int pskLength) throws IOException
-    {
-        if (this.keyExchange == KeyExchangeAlgorithm.DHE_PSK)
-        {
-            if (dhAgreePrivateKey != null)
-            {
-                return TlsDHUtils.calculateDHBasicAgreement(dhAgreePublicKey, dhAgreePrivateKey);
-            }
-
-            throw new TlsFatalAlert(AlertDescription.internal_error);
-        }
-
-        if (this.keyExchange == KeyExchangeAlgorithm.ECDHE_PSK)
-        {
-            if (ecAgreePrivateKey != null)
-            {
-                return TlsECCUtils.calculateECDHBasicAgreement(ecAgreePublicKey, ecAgreePrivateKey);
-            }
-
-            throw new TlsFatalAlert(AlertDescription.internal_error);
-        }
-
-        if (this.keyExchange == KeyExchangeAlgorithm.RSA_PSK)
-        {
-            return this.premasterSecret;
-        }
-
-        return new byte[pskLength];
-    }
-
-    protected RSAKeyParameters validateRSAPublicKey(RSAKeyParameters key) throws IOException
-    {
-        // TODO What is the minimum bit length required?
-        // key.getModulus().bitLength();
-
-        if (!key.getExponent().isProbablePrime(2))
-        {
-            throw new TlsFatalAlert(AlertDescription.illegal_parameter);
-        }
-
-        return key;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsPeer.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsPeer.java
deleted file mode 100644
index aa0dcf8..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsPeer.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-import java.io.IOException;
-
-public interface TlsPeer
-{
-    /**
-     * draft-mathewson-no-gmtunixtime-00 2. "If existing users of a TLS implementation may rely on
-     * gmt_unix_time containing the current time, we recommend that implementors MAY provide the
-     * ability to set gmt_unix_time as an option only, off by default."
-     * 
-     * @return <code>true</code> if the current time should be used in the gmt_unix_time field of
-     *         Random, or <code>false</code> if gmt_unix_time should contain a cryptographically
-     *         random value.
-     */
-    boolean shouldUseGMTUnixTime();
-
-    void notifySecureRenegotiation(boolean secureNegotiation) throws IOException;
-
-    TlsCompression getCompression() throws IOException;
-
-    TlsCipher getCipher() throws IOException;
-
-    /**
-     * This method will be called when an alert is raised by the protocol.
-     *
-     * @param alertLevel       {@link AlertLevel}
-     * @param alertDescription {@link AlertDescription}
-     * @param message          A human-readable message explaining what caused this alert. May be null.
-     * @param cause            The {@link Throwable} that caused this alert to be raised. May be null.
-     */
-    void notifyAlertRaised(short alertLevel, short alertDescription, String message, Throwable cause);
-
-    /**
-     * This method will be called when an alert is received from the remote peer.
-     *
-     * @param alertLevel       {@link AlertLevel}
-     * @param alertDescription {@link AlertDescription}
-     */
-    void notifyAlertReceived(short alertLevel, short alertDescription);
-
-    /**
-     * Notifies the peer that the handshake has been successfully completed.
-     */
-    void notifyHandshakeComplete() throws IOException;
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsProtocol.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsProtocol.java
deleted file mode 100644
index c116401..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsProtocol.java
+++ /dev/null
@@ -1,1191 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.EOFException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.security.SecureRandom;
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Vector;
-
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.prng.RandomGenerator;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.Integers;
-
-public abstract class TlsProtocol
-{
-    protected static final Integer EXT_RenegotiationInfo = Integers.valueOf(ExtensionType.renegotiation_info);
-    protected static final Integer EXT_SessionTicket = Integers.valueOf(ExtensionType.session_ticket);
-
-    private static final String TLS_ERROR_MESSAGE = "Internal TLS error, this could be an attack";
-
-    /*
-     * Our Connection states
-     */
-    protected static final short CS_START = 0;
-    protected static final short CS_CLIENT_HELLO = 1;
-    protected static final short CS_SERVER_HELLO = 2;
-    protected static final short CS_SERVER_SUPPLEMENTAL_DATA = 3;
-    protected static final short CS_SERVER_CERTIFICATE = 4;
-    protected static final short CS_CERTIFICATE_STATUS = 5;
-    protected static final short CS_SERVER_KEY_EXCHANGE = 6;
-    protected static final short CS_CERTIFICATE_REQUEST = 7;
-    protected static final short CS_SERVER_HELLO_DONE = 8;
-    protected static final short CS_CLIENT_SUPPLEMENTAL_DATA = 9;
-    protected static final short CS_CLIENT_CERTIFICATE = 10;
-    protected static final short CS_CLIENT_KEY_EXCHANGE = 11;
-    protected static final short CS_CERTIFICATE_VERIFY = 12;
-    protected static final short CS_CLIENT_FINISHED = 13;
-    protected static final short CS_SERVER_SESSION_TICKET = 14;
-    protected static final short CS_SERVER_FINISHED = 15;
-    protected static final short CS_END = 16;
-
-    /*
-     * Queues for data from some protocols.
-     */
-    private ByteQueue applicationDataQueue = new ByteQueue();
-    private ByteQueue alertQueue = new ByteQueue(2);
-    private ByteQueue handshakeQueue = new ByteQueue();
-//    private ByteQueue heartbeatQueue = new ByteQueue();
-
-    /*
-     * The Record Stream we use
-     */
-    RecordStream recordStream;
-    protected SecureRandom secureRandom;
-
-    private TlsInputStream tlsInputStream = null;
-    private TlsOutputStream tlsOutputStream = null;
-
-    private volatile boolean closed = false;
-    private volatile boolean failedWithError = false;
-    private volatile boolean appDataReady = false;
-    private volatile boolean splitApplicationDataRecords = true;
-    private byte[] expected_verify_data = null;
-
-    protected TlsSession tlsSession = null;
-    protected SessionParameters sessionParameters = null;
-    protected SecurityParameters securityParameters = null;
-    protected Certificate peerCertificate = null;
-
-    protected int[] offeredCipherSuites = null;
-    protected short[] offeredCompressionMethods = null;
-    protected Hashtable clientExtensions = null;
-    protected Hashtable serverExtensions = null;
-
-    protected short connection_state = CS_START;
-    protected boolean resumedSession = false;
-    protected boolean receivedChangeCipherSpec = false;
-    protected boolean secure_renegotiation = false;
-    protected boolean allowCertificateStatus = false;
-    protected boolean expectSessionTicket = false;
-
-    public TlsProtocol(InputStream input, OutputStream output, SecureRandom secureRandom)
-    {
-        this.recordStream = new RecordStream(this, input, output);
-        this.secureRandom = secureRandom;
-    }
-
-    protected abstract TlsContext getContext();
-
-    abstract AbstractTlsContext getContextAdmin();
-
-    protected abstract TlsPeer getPeer();
-
-    protected void handleChangeCipherSpecMessage() throws IOException
-    {
-    }
-
-    protected abstract void handleHandshakeMessage(short type, byte[] buf)
-        throws IOException;
-
-    protected void handleWarningMessage(short description)
-        throws IOException
-    {
-    }
-
-    protected void cleanupHandshake()
-    {
-        if (this.expected_verify_data != null)
-        {
-            Arrays.fill(this.expected_verify_data, (byte)0);
-            this.expected_verify_data = null;
-        }
-
-        this.securityParameters.clear();
-        this.peerCertificate = null;
-
-        this.offeredCipherSuites = null;
-        this.offeredCompressionMethods = null;
-        this.clientExtensions = null;
-        this.serverExtensions = null;
-
-        this.resumedSession = false;
-        this.receivedChangeCipherSpec = false;
-        this.secure_renegotiation = false;
-        this.allowCertificateStatus = false;
-        this.expectSessionTicket = false;
-    }
-
-    protected void completeHandshake()
-        throws IOException
-    {
-        try
-        {
-            /*
-             * We will now read data, until we have completed the handshake.
-             */
-            while (this.connection_state != CS_END)
-            {
-                if (this.closed)
-                {
-                    // TODO What kind of exception/alert?
-                }
-
-                safeReadRecord();
-            }
-
-            this.recordStream.finaliseHandshake();
-
-            this.splitApplicationDataRecords = !TlsUtils.isTLSv11(getContext());
-
-            /*
-             * If this was an initial handshake, we are now ready to send and receive application data.
-             */
-            if (!appDataReady)
-            {
-                this.appDataReady = true;
-
-                this.tlsInputStream = new TlsInputStream(this);
-                this.tlsOutputStream = new TlsOutputStream(this);
-            }
-
-            if (this.tlsSession != null)
-            {
-                if (this.sessionParameters == null)
-                {
-                    this.sessionParameters = new SessionParameters.Builder()
-                        .setCipherSuite(this.securityParameters.cipherSuite)
-                        .setCompressionAlgorithm(this.securityParameters.compressionAlgorithm)
-                        .setMasterSecret(this.securityParameters.masterSecret)
-                        .setPeerCertificate(this.peerCertificate)
-                        .setPSKIdentity(this.securityParameters.pskIdentity)
-                        .setSRPIdentity(this.securityParameters.srpIdentity)
-                        // TODO Consider filtering extensions that aren't relevant to resumed sessions
-                        .setServerExtensions(this.serverExtensions)
-                        .build();
-
-                    this.tlsSession = new TlsSessionImpl(this.tlsSession.getSessionID(), this.sessionParameters);
-                }
-
-                getContextAdmin().setResumableSession(this.tlsSession);
-            }
-
-            getPeer().notifyHandshakeComplete();
-        }
-        finally
-        {
-            cleanupHandshake();
-        }
-    }
-
-    protected void processRecord(short protocol, byte[] buf, int offset, int len)
-        throws IOException
-    {
-        /*
-         * Have a look at the protocol type, and add it to the correct queue.
-         */
-        switch (protocol)
-        {
-        case ContentType.alert:
-        {
-            alertQueue.addData(buf, offset, len);
-            processAlert();
-            break;
-        }
-        case ContentType.application_data:
-        {
-            if (!appDataReady)
-            {
-                throw new TlsFatalAlert(AlertDescription.unexpected_message);
-            }
-            applicationDataQueue.addData(buf, offset, len);
-            processApplicationData();
-            break;
-        }
-        case ContentType.change_cipher_spec:
-        {
-            processChangeCipherSpec(buf, offset, len);
-            break;
-        }
-        case ContentType.handshake:
-        {
-            handshakeQueue.addData(buf, offset, len);
-            processHandshake();
-            break;
-        }
-        case ContentType.heartbeat:
-        {
-            if (!appDataReady)
-            {
-                throw new TlsFatalAlert(AlertDescription.unexpected_message);
-            }
-            // TODO[RFC 6520]
-//            heartbeatQueue.addData(buf, offset, len);
-//            processHeartbeat();
-            break;
-        }
-        default:
-            /*
-             * Uh, we don't know this protocol.
-             * 
-             * RFC2246 defines on page 13, that we should ignore this.
-             */
-            break;
-        }
-    }
-
-    private void processHandshake()
-        throws IOException
-    {
-        boolean read;
-        do
-        {
-            read = false;
-            /*
-             * We need the first 4 bytes, they contain type and length of the message.
-             */
-            if (handshakeQueue.available() >= 4)
-            {
-                byte[] beginning = new byte[4];
-                handshakeQueue.read(beginning, 0, 4, 0);
-                short type = TlsUtils.readUint8(beginning, 0);
-                int len = TlsUtils.readUint24(beginning, 1);
-
-                /*
-                 * Check if we have enough bytes in the buffer to read the full message.
-                 */
-                if (handshakeQueue.available() >= (len + 4))
-                {
-                    /*
-                     * Read the message.
-                     */
-                    byte[] buf = handshakeQueue.removeData(len, 4);
-
-                    /*
-                     * RFC 2246 7.4.9. The value handshake_messages includes all handshake messages
-                     * starting at client hello up to, but not including, this finished message.
-                     * [..] Note: [Also,] Hello Request messages are omitted from handshake hashes.
-                     */
-                    switch (type)
-                    {
-                    case HandshakeType.hello_request:
-                        break;
-                    case HandshakeType.finished:
-                    {
-                        if (this.expected_verify_data == null)
-                        {
-                            this.expected_verify_data = createVerifyData(!getContext().isServer());
-                        }
-
-                        // NB: Fall through to next case label
-                    }
-                    default:
-                        recordStream.updateHandshakeData(beginning, 0, 4);
-                        recordStream.updateHandshakeData(buf, 0, len);
-                        break;
-                    }
-
-                    /*
-                     * Now, parse the message.
-                     */
-                    handleHandshakeMessage(type, buf);
-                    read = true;
-                }
-            }
-        }
-        while (read);
-    }
-
-    private void processApplicationData()
-    {
-        /*
-         * There is nothing we need to do here.
-         * 
-         * This function could be used for callbacks when application data arrives in the future.
-         */
-    }
-
-    private void processAlert()
-        throws IOException
-    {
-        while (alertQueue.available() >= 2)
-        {
-            /*
-             * An alert is always 2 bytes. Read the alert.
-             */
-            byte[] tmp = alertQueue.removeData(2, 0);
-            short level = tmp[0];
-            short description = tmp[1];
-
-            getPeer().notifyAlertReceived(level, description);
-
-            if (level == AlertLevel.fatal)
-            {
-                /*
-                 * RFC 2246 7.2.1. The session becomes unresumable if any connection is terminated
-                 * without proper close_notify messages with level equal to warning.
-                 */
-                invalidateSession();
-
-                this.failedWithError = true;
-                this.closed = true;
-
-                recordStream.safeClose();
-
-                throw new IOException(TLS_ERROR_MESSAGE);
-            }
-            else
-            {
-
-                /*
-                 * RFC 5246 7.2.1. The other party MUST respond with a close_notify alert of its own
-                 * and close down the connection immediately, discarding any pending writes.
-                 */
-                // TODO Can close_notify be a fatal alert?
-                if (description == AlertDescription.close_notify)
-                {
-                    handleClose(false);
-                }
-
-                /*
-                 * If it is just a warning, we continue.
-                 */
-                handleWarningMessage(description);
-            }
-        }
-    }
-
-    /**
-     * This method is called, when a change cipher spec message is received.
-     *
-     * @throws IOException If the message has an invalid content or the handshake is not in the correct
-     * state.
-     */
-    private void processChangeCipherSpec(byte[] buf, int off, int len)
-        throws IOException
-    {
-        for (int i = 0; i < len; ++i)
-        {
-            short message = TlsUtils.readUint8(buf, off + i);
-
-            if (message != ChangeCipherSpec.change_cipher_spec)
-            {
-                throw new TlsFatalAlert(AlertDescription.decode_error);
-            }
-
-            if (this.receivedChangeCipherSpec
-                || alertQueue.available() > 0
-                || handshakeQueue.available() > 0)
-            {
-                throw new TlsFatalAlert(AlertDescription.unexpected_message);
-            }
-
-            recordStream.receivedReadCipherSpec();
-
-            this.receivedChangeCipherSpec = true;
-
-            handleChangeCipherSpecMessage();
-        }
-    }
-
-    protected int applicationDataAvailable()
-        throws IOException
-    {
-        return applicationDataQueue.available();
-    }
-
-    /**
-     * Read data from the network. The method will return immediately, if there is still some data
-     * left in the buffer, or block until some application data has been read from the network.
-     *
-     * @param buf    The buffer where the data will be copied to.
-     * @param offset The position where the data will be placed in the buffer.
-     * @param len    The maximum number of bytes to read.
-     * @return The number of bytes read.
-     * @throws IOException If something goes wrong during reading data.
-     */
-    protected int readApplicationData(byte[] buf, int offset, int len)
-        throws IOException
-    {
-        if (len < 1)
-        {
-            return 0;
-        }
-
-        while (applicationDataQueue.available() == 0)
-        {
-            /*
-             * We need to read some data.
-             */
-            if (this.closed)
-            {
-                if (this.failedWithError)
-                {
-                    /*
-                     * Something went terribly wrong, we should throw an IOException
-                     */
-                    throw new IOException(TLS_ERROR_MESSAGE);
-                }
-
-                /*
-                 * Connection has been closed, there is no more data to read.
-                 */
-                return -1;
-            }
-
-            safeReadRecord();
-        }
-
-        len = Math.min(len, applicationDataQueue.available());
-        applicationDataQueue.removeData(buf, offset, len, 0);
-        return len;
-    }
-
-    protected void safeReadRecord()
-        throws IOException
-    {
-        try
-        {
-            if (!recordStream.readRecord())
-            {
-                // TODO It would be nicer to allow graceful connection close if between records
-//                this.failWithError(AlertLevel.warning, AlertDescription.close_notify);
-                throw new EOFException();
-            }
-        }
-        catch (TlsFatalAlert e)
-        {
-            if (!closed)
-            {
-                this.failWithError(AlertLevel.fatal, e.getAlertDescription(), "Failed to read record", e);
-            }
-            throw e;
-        }
-        catch (IOException e)
-        {
-            if (!closed)
-            {
-                this.failWithError(AlertLevel.fatal, AlertDescription.internal_error, "Failed to read record", e);
-            }
-            throw e;
-        }
-        catch (RuntimeException e)
-        {
-            if (!closed)
-            {
-                this.failWithError(AlertLevel.fatal, AlertDescription.internal_error, "Failed to read record", e);
-            }
-            throw e;
-        }
-    }
-
-    protected void safeWriteRecord(short type, byte[] buf, int offset, int len)
-        throws IOException
-    {
-        try
-        {
-            recordStream.writeRecord(type, buf, offset, len);
-        }
-        catch (TlsFatalAlert e)
-        {
-            if (!closed)
-            {
-                this.failWithError(AlertLevel.fatal, e.getAlertDescription(), "Failed to write record", e);
-            }
-            throw e;
-        }
-        catch (IOException e)
-        {
-            if (!closed)
-            {
-                this.failWithError(AlertLevel.fatal, AlertDescription.internal_error, "Failed to write record", e);
-            }
-            throw e;
-        }
-        catch (RuntimeException e)
-        {
-            if (!closed)
-            {
-                this.failWithError(AlertLevel.fatal, AlertDescription.internal_error, "Failed to write record", e);
-            }
-            throw e;
-        }
-    }
-
-    /**
-     * Send some application data to the remote system.
-     * <p>
-     * The method will handle fragmentation internally.
-     * </p>
-     * @param buf    The buffer with the data.
-     * @param offset The position in the buffer where the data is placed.
-     * @param len    The length of the data.
-     * @throws IOException If something goes wrong during sending.
-     */
-    protected void writeData(byte[] buf, int offset, int len)
-        throws IOException
-    {
-        if (this.closed)
-        {
-            if (this.failedWithError)
-            {
-                throw new IOException(TLS_ERROR_MESSAGE);
-            }
-
-            throw new IOException("Sorry, connection has been closed, you cannot write more data");
-        }
-
-        while (len > 0)
-        {
-            /*
-             * RFC 5246 6.2.1. Zero-length fragments of Application data MAY be sent as they are
-             * potentially useful as a traffic analysis countermeasure.
-             * 
-             * NOTE: Actually, implementations appear to have settled on 1/n-1 record splitting.
-             */
-
-            if (this.splitApplicationDataRecords)
-            {
-                /*
-                 * Protect against known IV attack!
-                 * 
-                 * DO NOT REMOVE THIS CODE, EXCEPT YOU KNOW EXACTLY WHAT YOU ARE DOING HERE.
-                 */
-                safeWriteRecord(ContentType.application_data, buf, offset, 1);
-                ++offset;
-                --len;
-            }
-
-            if (len > 0)
-            {
-                // Fragment data according to the current fragment limit.
-                int toWrite = Math.min(len, recordStream.getPlaintextLimit());
-                safeWriteRecord(ContentType.application_data, buf, offset, toWrite);
-                offset += toWrite;
-                len -= toWrite;
-            }
-        }
-    }
-
-    protected void writeHandshakeMessage(byte[] buf, int off, int len) throws IOException
-    {
-        while (len > 0)
-        {
-            // Fragment data according to the current fragment limit.
-            int toWrite = Math.min(len, recordStream.getPlaintextLimit());
-            safeWriteRecord(ContentType.handshake, buf, off, toWrite);
-            off += toWrite;
-            len -= toWrite;
-        }
-    }
-
-    /**
-     * @return An OutputStream which can be used to send data.
-     */
-    public OutputStream getOutputStream()
-    {
-        return this.tlsOutputStream;
-    }
-
-    /**
-     * @return An InputStream which can be used to read data.
-     */
-    public InputStream getInputStream()
-    {
-        return this.tlsInputStream;
-    }
-
-    /**
-     * Terminate this connection with an alert. Can be used for normal closure too.
-     * 
-     * @param alertLevel
-     *            See {@link AlertLevel} for values.
-     * @param alertDescription
-     *            See {@link AlertDescription} for values.
-     * @throws IOException
-     *             If alert was fatal.
-     */
-    protected void failWithError(short alertLevel, short alertDescription, String message, Throwable cause)
-        throws IOException
-    {
-        /*
-         * Check if the connection is still open.
-         */
-        if (!closed)
-        {
-            /*
-             * Prepare the message
-             */
-            this.closed = true;
-
-            if (alertLevel == AlertLevel.fatal)
-            {
-                /*
-                 * RFC 2246 7.2.1. The session becomes unresumable if any connection is terminated
-                 * without proper close_notify messages with level equal to warning.
-                 */
-                // TODO This isn't quite in the right place. Also, as of TLS 1.1 the above is obsolete.
-                invalidateSession();
-
-                this.failedWithError = true;
-            }
-            raiseAlert(alertLevel, alertDescription, message, cause);
-            recordStream.safeClose();
-            if (alertLevel != AlertLevel.fatal)
-            {
-                return;
-            }
-        }
-
-        throw new IOException(TLS_ERROR_MESSAGE);
-    }
-
-    protected void invalidateSession()
-    {
-        if (this.sessionParameters != null)
-        {
-            this.sessionParameters.clear();
-            this.sessionParameters = null;
-        }
-
-        if (this.tlsSession != null)
-        {
-            this.tlsSession.invalidate();
-            this.tlsSession = null;
-        }
-    }
-
-    protected void processFinishedMessage(ByteArrayInputStream buf)
-        throws IOException
-    {
-        byte[] verify_data = TlsUtils.readFully(expected_verify_data.length, buf);
-
-        assertEmpty(buf);
-
-        /*
-         * Compare both checksums.
-         */
-        if (!Arrays.constantTimeAreEqual(expected_verify_data, verify_data))
-        {
-            /*
-             * Wrong checksum in the finished message.
-             */
-            throw new TlsFatalAlert(AlertDescription.decrypt_error);
-        }
-    }
-
-    protected void raiseAlert(short alertLevel, short alertDescription, String message, Throwable cause)
-        throws IOException
-    {
-        getPeer().notifyAlertRaised(alertLevel, alertDescription, message, cause);
-
-        byte[] error = new byte[2];
-        error[0] = (byte)alertLevel;
-        error[1] = (byte)alertDescription;
-
-        safeWriteRecord(ContentType.alert, error, 0, 2);
-    }
-
-    protected void raiseWarning(short alertDescription, String message)
-        throws IOException
-    {
-        raiseAlert(AlertLevel.warning, alertDescription, message, null);
-    }
-
-    protected void sendCertificateMessage(Certificate certificate)
-        throws IOException
-    {
-        if (certificate == null)
-        {
-            certificate = Certificate.EMPTY_CHAIN;
-        }
-
-        if (certificate.isEmpty())
-        {
-            TlsContext context = getContext();
-            if (!context.isServer())
-            {
-                ProtocolVersion serverVersion = getContext().getServerVersion();
-                if (serverVersion.isSSL())
-                {
-                    String errorMessage = serverVersion.toString() + " client didn't provide credentials";
-                    raiseWarning(AlertDescription.no_certificate, errorMessage);
-                    return;
-                }
-            }
-        }
-
-        HandshakeMessage message = new HandshakeMessage(HandshakeType.certificate);
-
-        certificate.encode(message);
-
-        message.writeToRecordStream();
-    }
-
-    protected void sendChangeCipherSpecMessage()
-        throws IOException
-    {
-        byte[] message = new byte[]{ 1 };
-        safeWriteRecord(ContentType.change_cipher_spec, message, 0, message.length);
-        recordStream.sentWriteCipherSpec();
-    }
-
-    protected void sendFinishedMessage()
-        throws IOException
-    {
-        byte[] verify_data = createVerifyData(getContext().isServer());
-
-        HandshakeMessage message = new HandshakeMessage(HandshakeType.finished, verify_data.length);
-
-        message.write(verify_data);
-
-        message.writeToRecordStream();
-    }
-
-    protected void sendSupplementalDataMessage(Vector supplementalData)
-        throws IOException
-    {
-        HandshakeMessage message = new HandshakeMessage(HandshakeType.supplemental_data);
-
-        writeSupplementalData(message, supplementalData);
-
-        message.writeToRecordStream();
-    }
-
-    protected byte[] createVerifyData(boolean isServer)
-    {
-        TlsContext context = getContext();
-        String asciiLabel = isServer ? ExporterLabel.server_finished : ExporterLabel.client_finished;
-        byte[] sslSender = isServer ? TlsUtils.SSL_SERVER : TlsUtils.SSL_CLIENT;
-        byte[] hash = getCurrentPRFHash(context, recordStream.getHandshakeHash(), sslSender);
-        return TlsUtils.calculateVerifyData(context, asciiLabel, hash);
-    }
-
-    /**
-     * Closes this connection.
-     *
-     * @throws IOException If something goes wrong during closing.
-     */
-    public void close()
-        throws IOException
-    {
-        handleClose(true);
-    }
-
-    protected void handleClose(boolean user_canceled)
-        throws IOException
-    {
-        if (!closed)
-        {
-            if (user_canceled && !appDataReady)
-            {
-                raiseWarning(AlertDescription.user_canceled, "User canceled handshake");
-            }
-            this.failWithError(AlertLevel.warning, AlertDescription.close_notify, "Connection closed", null);
-        }
-    }
-
-    protected void flush()
-        throws IOException
-    {
-        recordStream.flush();
-    }
-
-    protected boolean isClosed()
-    {
-        return closed;
-    }
-
-    protected short processMaxFragmentLengthExtension(Hashtable clientExtensions, Hashtable serverExtensions,
-        short alertDescription)
-        throws IOException
-    {
-        short maxFragmentLength = TlsExtensionsUtils.getMaxFragmentLengthExtension(serverExtensions);
-        if (maxFragmentLength >= 0 && !this.resumedSession)
-        {
-            if (maxFragmentLength != TlsExtensionsUtils.getMaxFragmentLengthExtension(clientExtensions))
-            {
-                throw new TlsFatalAlert(alertDescription);
-            }
-        }
-        return maxFragmentLength;
-    }
-
-    /**
-     * Make sure the InputStream 'buf' now empty. Fail otherwise.
-     *
-     * @param buf The InputStream to check.
-     * @throws IOException If 'buf' is not empty.
-     */
-    protected static void assertEmpty(ByteArrayInputStream buf)
-        throws IOException
-    {
-        if (buf.available() > 0)
-        {
-            throw new TlsFatalAlert(AlertDescription.decode_error);
-        }
-    }
-
-    protected static byte[] createRandomBlock(boolean useGMTUnixTime, RandomGenerator randomGenerator)
-    {
-        byte[] result = new byte[32];
-        randomGenerator.nextBytes(result);
-
-        if (useGMTUnixTime)
-        {
-            TlsUtils.writeGMTUnixTime(result, 0);
-        }
-
-        return result;
-    }
-
-    protected static byte[] createRenegotiationInfo(byte[] renegotiated_connection)
-        throws IOException
-    {
-        return TlsUtils.encodeOpaque8(renegotiated_connection);
-    }
-
-    protected static void establishMasterSecret(TlsContext context, TlsKeyExchange keyExchange)
-        throws IOException
-    {
-        byte[] pre_master_secret = keyExchange.generatePremasterSecret();
-
-        try
-        {
-            context.getSecurityParameters().masterSecret = TlsUtils.calculateMasterSecret(context, pre_master_secret);
-        }
-        finally
-        {
-            // TODO Is there a way to ensure the data is really overwritten?
-            /*
-             * RFC 2246 8.1. The pre_master_secret should be deleted from memory once the
-             * master_secret has been computed.
-             */
-            if (pre_master_secret != null)
-            {
-                Arrays.fill(pre_master_secret, (byte)0);
-            }
-        }
-    }
-
-    /**
-     * 'sender' only relevant to SSLv3
-     */
-    protected static byte[] getCurrentPRFHash(TlsContext context, TlsHandshakeHash handshakeHash, byte[] sslSender)
-    {
-        Digest d = handshakeHash.forkPRFHash();
-
-        if (sslSender != null && TlsUtils.isSSL(context))
-        {
-            d.update(sslSender, 0, sslSender.length);
-        }
-
-        byte[] bs = new byte[d.getDigestSize()];
-        d.doFinal(bs, 0);
-        return bs;
-    }
-
-    protected static Hashtable readExtensions(ByteArrayInputStream input)
-        throws IOException
-    {
-        if (input.available() < 1)
-        {
-            return null;
-        }
-
-        byte[] extBytes = TlsUtils.readOpaque16(input);
-
-        assertEmpty(input);
-
-        ByteArrayInputStream buf = new ByteArrayInputStream(extBytes);
-
-        // Integer -> byte[]
-        Hashtable extensions = new Hashtable();
-
-        while (buf.available() > 0)
-        {
-            Integer extension_type = Integers.valueOf(TlsUtils.readUint16(buf));
-            byte[] extension_data = TlsUtils.readOpaque16(buf);
-
-            /*
-             * RFC 3546 2.3 There MUST NOT be more than one extension of the same type.
-             */
-            if (null != extensions.put(extension_type, extension_data))
-            {
-                throw new TlsFatalAlert(AlertDescription.illegal_parameter);
-            }
-        }
-
-        return extensions;
-    }
-
-    protected static Vector readSupplementalDataMessage(ByteArrayInputStream input)
-        throws IOException
-    {
-        byte[] supp_data = TlsUtils.readOpaque24(input);
-
-        assertEmpty(input);
-
-        ByteArrayInputStream buf = new ByteArrayInputStream(supp_data);
-
-        Vector supplementalData = new Vector();
-
-        while (buf.available() > 0)
-        {
-            int supp_data_type = TlsUtils.readUint16(buf);
-            byte[] data = TlsUtils.readOpaque16(buf);
-
-            supplementalData.addElement(new SupplementalDataEntry(supp_data_type, data));
-        }
-
-        return supplementalData;
-    }
-
-    protected static void writeExtensions(OutputStream output, Hashtable extensions)
-        throws IOException
-    {
-        ByteArrayOutputStream buf = new ByteArrayOutputStream();
-
-        Enumeration keys = extensions.keys();
-        while (keys.hasMoreElements())
-        {
-            Integer key = (Integer)keys.nextElement();
-            int extension_type = key.intValue();
-            byte[] extension_data = (byte[])extensions.get(key);
-
-            TlsUtils.checkUint16(extension_type);
-            TlsUtils.writeUint16(extension_type, buf);
-            TlsUtils.writeOpaque16(extension_data, buf);
-        }
-
-        byte[] extBytes = buf.toByteArray();
-
-        TlsUtils.writeOpaque16(extBytes, output);
-    }
-
-    protected static void writeSupplementalData(OutputStream output, Vector supplementalData)
-        throws IOException
-    {
-        ByteArrayOutputStream buf = new ByteArrayOutputStream();
-
-        for (int i = 0; i < supplementalData.size(); ++i)
-        {
-            SupplementalDataEntry entry = (SupplementalDataEntry)supplementalData.elementAt(i);
-
-            int supp_data_type = entry.getDataType();
-            TlsUtils.checkUint16(supp_data_type);
-            TlsUtils.writeUint16(supp_data_type, buf);
-            TlsUtils.writeOpaque16(entry.getData(), buf);
-        }
-
-        byte[] supp_data = buf.toByteArray();
-
-        TlsUtils.writeOpaque24(supp_data, output);
-    }
-
-    protected static int getPRFAlgorithm(TlsContext context, int ciphersuite) throws IOException
-    {
-        boolean isTLSv12 = TlsUtils.isTLSv12(context);
-
-        switch (ciphersuite)
-        {
-        case CipherSuite.TLS_DH_anon_WITH_CAMELLIA_128_CBC_SHA256:
-        case CipherSuite.TLS_DH_anon_WITH_CAMELLIA_128_GCM_SHA256:
-        case CipherSuite.TLS_DH_anon_WITH_CAMELLIA_256_CBC_SHA256:
-        case CipherSuite.TLS_DH_DSS_WITH_AES_128_CBC_SHA256:
-        case CipherSuite.TLS_DH_DSS_WITH_AES_128_GCM_SHA256:
-        case CipherSuite.TLS_DH_DSS_WITH_AES_256_CBC_SHA256:
-        case CipherSuite.TLS_DH_DSS_WITH_CAMELLIA_128_CBC_SHA256:
-        case CipherSuite.TLS_DH_DSS_WITH_CAMELLIA_128_GCM_SHA256:
-        case CipherSuite.TLS_DH_DSS_WITH_CAMELLIA_256_CBC_SHA256:
-        case CipherSuite.TLS_DH_RSA_WITH_AES_128_CBC_SHA256:
-        case CipherSuite.TLS_DH_RSA_WITH_AES_128_GCM_SHA256:
-        case CipherSuite.TLS_DH_RSA_WITH_AES_256_CBC_SHA256:
-        case CipherSuite.TLS_DH_RSA_WITH_CAMELLIA_128_CBC_SHA256:
-        case CipherSuite.TLS_DH_RSA_WITH_CAMELLIA_128_GCM_SHA256:
-        case CipherSuite.TLS_DH_RSA_WITH_CAMELLIA_256_CBC_SHA256:
-        case CipherSuite.TLS_DHE_DSS_WITH_AES_128_CBC_SHA256:
-        case CipherSuite.TLS_DHE_DSS_WITH_AES_128_GCM_SHA256:
-        case CipherSuite.TLS_DHE_DSS_WITH_AES_256_CBC_SHA256:
-        case CipherSuite.TLS_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA256:
-        case CipherSuite.TLS_DHE_DSS_WITH_CAMELLIA_128_GCM_SHA256:
-        case CipherSuite.TLS_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA256:
-        case CipherSuite.TLS_DHE_PSK_WITH_AES_128_CCM:
-        case CipherSuite.TLS_DHE_PSK_WITH_AES_128_GCM_SHA256:
-        case CipherSuite.TLS_DHE_PSK_WITH_AES_256_CCM:
-        case CipherSuite.TLS_DHE_PSK_WITH_CAMELLIA_128_GCM_SHA256:
-        case CipherSuite.TLS_DHE_RSA_WITH_AES_128_CBC_SHA256:
-        case CipherSuite.TLS_DHE_RSA_WITH_AES_128_CCM:
-        case CipherSuite.TLS_DHE_RSA_WITH_AES_128_CCM_8:
-        case CipherSuite.TLS_DHE_RSA_WITH_AES_128_GCM_SHA256:
-        case CipherSuite.TLS_DHE_RSA_WITH_AES_256_CBC_SHA256:
-        case CipherSuite.TLS_DHE_RSA_WITH_AES_256_CCM:
-        case CipherSuite.TLS_DHE_RSA_WITH_AES_256_CCM_8:
-        case CipherSuite.TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA256:
-        case CipherSuite.TLS_DHE_RSA_WITH_CAMELLIA_128_GCM_SHA256:
-        case CipherSuite.TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA256:
-        case CipherSuite.TLS_DHE_RSA_WITH_CHACHA20_POLY1305_SHA256:
-        case CipherSuite.TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA256:
-        case CipherSuite.TLS_ECDH_ECDSA_WITH_AES_128_GCM_SHA256:
-        case CipherSuite.TLS_ECDH_ECDSA_WITH_CAMELLIA_128_CBC_SHA256:
-        case CipherSuite.TLS_ECDH_ECDSA_WITH_CAMELLIA_128_GCM_SHA256:
-        case CipherSuite.TLS_ECDH_RSA_WITH_AES_128_CBC_SHA256:
-        case CipherSuite.TLS_ECDH_RSA_WITH_AES_128_GCM_SHA256:
-        case CipherSuite.TLS_ECDH_RSA_WITH_CAMELLIA_128_CBC_SHA256:
-        case CipherSuite.TLS_ECDH_RSA_WITH_CAMELLIA_128_GCM_SHA256:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_AES_128_CCM:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_AES_128_CCM_8:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_AES_256_CCM:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_AES_256_CCM_8:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_CAMELLIA_128_CBC_SHA256:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_CAMELLIA_128_GCM_SHA256:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256:
-        case CipherSuite.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256:
-        case CipherSuite.TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256:
-        case CipherSuite.TLS_ECDHE_RSA_WITH_CAMELLIA_128_CBC_SHA256:
-        case CipherSuite.TLS_ECDHE_RSA_WITH_CAMELLIA_128_GCM_SHA256:
-        case CipherSuite.TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256:
-        case CipherSuite.TLS_PSK_DHE_WITH_AES_128_CCM_8:
-        case CipherSuite.TLS_PSK_DHE_WITH_AES_256_CCM_8:
-        case CipherSuite.TLS_PSK_WITH_AES_128_CCM:
-        case CipherSuite.TLS_PSK_WITH_AES_128_CCM_8:
-        case CipherSuite.TLS_PSK_WITH_AES_128_GCM_SHA256:
-        case CipherSuite.TLS_PSK_WITH_AES_256_CCM:
-        case CipherSuite.TLS_PSK_WITH_AES_256_CCM_8:
-        case CipherSuite.TLS_PSK_WITH_CAMELLIA_128_GCM_SHA256:
-        case CipherSuite.TLS_RSA_PSK_WITH_AES_128_GCM_SHA256:
-        case CipherSuite.TLS_RSA_PSK_WITH_CAMELLIA_128_GCM_SHA256:
-        case CipherSuite.TLS_RSA_WITH_AES_128_CBC_SHA256:
-        case CipherSuite.TLS_RSA_WITH_AES_128_CCM:
-        case CipherSuite.TLS_RSA_WITH_AES_128_CCM_8:
-        case CipherSuite.TLS_RSA_WITH_AES_128_GCM_SHA256:
-        case CipherSuite.TLS_RSA_WITH_AES_256_CBC_SHA256:
-        case CipherSuite.TLS_RSA_WITH_AES_256_CCM:
-        case CipherSuite.TLS_RSA_WITH_AES_256_CCM_8:
-        case CipherSuite.TLS_RSA_WITH_CAMELLIA_128_CBC_SHA256:
-        case CipherSuite.TLS_RSA_WITH_CAMELLIA_128_GCM_SHA256:
-        case CipherSuite.TLS_RSA_WITH_CAMELLIA_256_CBC_SHA256:
-        case CipherSuite.TLS_RSA_WITH_NULL_SHA256:
-        {
-            if (isTLSv12)
-            {
-                return PRFAlgorithm.tls_prf_sha256;
-            }
-            throw new TlsFatalAlert(AlertDescription.illegal_parameter);
-        }
-
-        case CipherSuite.TLS_DH_anon_WITH_CAMELLIA_256_GCM_SHA384:
-        case CipherSuite.TLS_DH_DSS_WITH_AES_256_GCM_SHA384:
-        case CipherSuite.TLS_DH_DSS_WITH_CAMELLIA_256_GCM_SHA384:
-        case CipherSuite.TLS_DH_RSA_WITH_AES_256_GCM_SHA384:
-        case CipherSuite.TLS_DH_RSA_WITH_CAMELLIA_256_GCM_SHA384:
-        case CipherSuite.TLS_DHE_DSS_WITH_AES_256_GCM_SHA384:
-        case CipherSuite.TLS_DHE_DSS_WITH_CAMELLIA_256_GCM_SHA384:
-        case CipherSuite.TLS_DHE_PSK_WITH_AES_256_GCM_SHA384:
-        case CipherSuite.TLS_DHE_PSK_WITH_CAMELLIA_256_GCM_SHA384:
-        case CipherSuite.TLS_DHE_RSA_WITH_AES_256_GCM_SHA384:
-        case CipherSuite.TLS_DHE_RSA_WITH_CAMELLIA_256_GCM_SHA384:
-        case CipherSuite.TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA384:
-        case CipherSuite.TLS_ECDH_ECDSA_WITH_AES_256_GCM_SHA384:
-        case CipherSuite.TLS_ECDH_ECDSA_WITH_CAMELLIA_256_CBC_SHA384:
-        case CipherSuite.TLS_ECDH_ECDSA_WITH_CAMELLIA_256_GCM_SHA384:
-        case CipherSuite.TLS_ECDH_RSA_WITH_AES_256_CBC_SHA384:
-        case CipherSuite.TLS_ECDH_RSA_WITH_AES_256_GCM_SHA384:
-        case CipherSuite.TLS_ECDH_RSA_WITH_CAMELLIA_256_CBC_SHA384:
-        case CipherSuite.TLS_ECDH_RSA_WITH_CAMELLIA_256_GCM_SHA384:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_CAMELLIA_256_CBC_SHA384:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_CAMELLIA_256_GCM_SHA384:
-        case CipherSuite.TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384:
-        case CipherSuite.TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384:
-        case CipherSuite.TLS_ECDHE_RSA_WITH_CAMELLIA_256_CBC_SHA384:
-        case CipherSuite.TLS_ECDHE_RSA_WITH_CAMELLIA_256_GCM_SHA384:
-        case CipherSuite.TLS_PSK_WITH_AES_256_GCM_SHA384:
-        case CipherSuite.TLS_PSK_WITH_CAMELLIA_256_GCM_SHA384:
-        case CipherSuite.TLS_RSA_PSK_WITH_AES_256_GCM_SHA384:
-        case CipherSuite.TLS_RSA_PSK_WITH_CAMELLIA_256_GCM_SHA384:
-        case CipherSuite.TLS_RSA_WITH_AES_256_GCM_SHA384:
-        case CipherSuite.TLS_RSA_WITH_CAMELLIA_256_GCM_SHA384:
-        {
-            if (isTLSv12)
-            {
-                return PRFAlgorithm.tls_prf_sha384;
-            }
-            throw new TlsFatalAlert(AlertDescription.illegal_parameter);
-        }
-
-        case CipherSuite.TLS_DHE_PSK_WITH_AES_256_CBC_SHA384:
-        case CipherSuite.TLS_DHE_PSK_WITH_CAMELLIA_256_CBC_SHA384:
-        case CipherSuite.TLS_DHE_PSK_WITH_NULL_SHA384:
-        case CipherSuite.TLS_ECDHE_PSK_WITH_AES_256_CBC_SHA384:
-        case CipherSuite.TLS_ECDHE_PSK_WITH_CAMELLIA_256_CBC_SHA384:
-        case CipherSuite.TLS_ECDHE_PSK_WITH_NULL_SHA384:
-        case CipherSuite.TLS_PSK_WITH_AES_256_CBC_SHA384:
-        case CipherSuite.TLS_PSK_WITH_CAMELLIA_256_CBC_SHA384:
-        case CipherSuite.TLS_PSK_WITH_NULL_SHA384:
-        case CipherSuite.TLS_RSA_PSK_WITH_AES_256_CBC_SHA384:
-        case CipherSuite.TLS_RSA_PSK_WITH_CAMELLIA_256_CBC_SHA384:
-        case CipherSuite.TLS_RSA_PSK_WITH_NULL_SHA384:
-        {
-            if (isTLSv12)
-            {
-                return PRFAlgorithm.tls_prf_sha384;
-            }
-            return PRFAlgorithm.tls_prf_legacy;
-        }
-
-        default:
-        {
-            if (isTLSv12)
-            {
-                return PRFAlgorithm.tls_prf_sha256;
-            }
-            return PRFAlgorithm.tls_prf_legacy;
-        }
-        }
-    }
-
-    class HandshakeMessage extends ByteArrayOutputStream
-    {
-        HandshakeMessage(short handshakeType) throws IOException
-        {
-            this(handshakeType, 60);
-        }
-
-        HandshakeMessage(short handshakeType, int length) throws IOException
-        {
-            super(length + 4);
-            TlsUtils.writeUint8(handshakeType, this);
-            // Reserve space for length
-            count += 3;
-        }
-
-        void writeToRecordStream() throws IOException
-        {
-            // Patch actual length back in
-            int length = count - 4;
-            TlsUtils.checkUint24(length);
-            TlsUtils.writeUint24(length, buf, 1);
-            writeHandshakeMessage(buf, 0, count);
-            buf = null;
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsRSAKeyExchange.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsRSAKeyExchange.java
deleted file mode 100644
index 3efdd6c..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsRSAKeyExchange.java
+++ /dev/null
@@ -1,191 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.Vector;
-
-import org.bouncycastle.asn1.x509.KeyUsage;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.bouncycastle.crypto.params.AsymmetricKeyParameter;
-import org.bouncycastle.crypto.params.RSAKeyParameters;
-import org.bouncycastle.crypto.util.PublicKeyFactory;
-import org.bouncycastle.util.io.Streams;
-
-/**
- * (D)TLS and SSLv3 RSA key exchange.
- */
-public class TlsRSAKeyExchange
-    extends AbstractTlsKeyExchange
-{
-    protected AsymmetricKeyParameter serverPublicKey = null;
-
-    protected RSAKeyParameters rsaServerPublicKey = null;
-
-    protected TlsEncryptionCredentials serverCredentials = null;
-
-    protected byte[] premasterSecret;
-
-    public TlsRSAKeyExchange(Vector supportedSignatureAlgorithms)
-    {
-        super(KeyExchangeAlgorithm.RSA, supportedSignatureAlgorithms);
-    }
-
-    public void skipServerCredentials()
-        throws IOException
-    {
-        throw new TlsFatalAlert(AlertDescription.unexpected_message);
-    }
-
-    public void processServerCredentials(TlsCredentials serverCredentials)
-        throws IOException
-    {
-        if (!(serverCredentials instanceof TlsEncryptionCredentials))
-        {
-            throw new TlsFatalAlert(AlertDescription.internal_error);
-        }
-
-        processServerCertificate(serverCredentials.getCertificate());
-
-        this.serverCredentials = (TlsEncryptionCredentials)serverCredentials;
-    }
-
-    public void processServerCertificate(Certificate serverCertificate)
-        throws IOException
-    {
-        if (serverCertificate.isEmpty())
-        {
-            throw new TlsFatalAlert(AlertDescription.bad_certificate);
-        }
-
-        org.bouncycastle.asn1.x509.Certificate x509Cert = serverCertificate.getCertificateAt(0);
-
-        SubjectPublicKeyInfo keyInfo = x509Cert.getSubjectPublicKeyInfo();
-        try
-        {
-            this.serverPublicKey = PublicKeyFactory.createKey(keyInfo);
-        }
-        catch (RuntimeException e)
-        {
-            throw new TlsFatalAlert(AlertDescription.unsupported_certificate, e);
-        }
-
-        // Sanity check the PublicKeyFactory
-        if (this.serverPublicKey.isPrivate())
-        {
-            throw new TlsFatalAlert(AlertDescription.internal_error);
-        }
-
-        this.rsaServerPublicKey = validateRSAPublicKey((RSAKeyParameters)this.serverPublicKey);
-
-        TlsUtils.validateKeyUsage(x509Cert, KeyUsage.keyEncipherment);
-
-        super.processServerCertificate(serverCertificate);
-    }
-
-    public void validateCertificateRequest(CertificateRequest certificateRequest)
-        throws IOException
-    {
-        short[] types = certificateRequest.getCertificateTypes();
-        for (int i = 0; i < types.length; ++i)
-        {
-            switch (types[i])
-            {
-            case ClientCertificateType.rsa_sign:
-            case ClientCertificateType.dss_sign:
-            case ClientCertificateType.ecdsa_sign:
-                break;
-            default:
-                throw new TlsFatalAlert(AlertDescription.illegal_parameter);
-            }
-        }
-    }
-
-    public void processClientCredentials(TlsCredentials clientCredentials)
-        throws IOException
-    {
-        if (!(clientCredentials instanceof TlsSignerCredentials))
-        {
-            throw new TlsFatalAlert(AlertDescription.internal_error);
-        }
-    }
-
-    public void generateClientKeyExchange(OutputStream output)
-        throws IOException
-    {
-        this.premasterSecret = TlsRSAUtils.generateEncryptedPreMasterSecret(context, rsaServerPublicKey, output);
-    }
-
-    public void processClientKeyExchange(InputStream input)
-        throws IOException
-    {
-        byte[] encryptedPreMasterSecret;
-        if (TlsUtils.isSSL(context))
-        {
-            // TODO Do any SSLv3 clients actually include the length?
-            encryptedPreMasterSecret = Streams.readAll(input);
-        }
-        else
-        {
-            encryptedPreMasterSecret = TlsUtils.readOpaque16(input);
-        }
-
-        this.premasterSecret = serverCredentials.decryptPreMasterSecret(encryptedPreMasterSecret);
-    }
-
-    public byte[] generatePremasterSecret()
-        throws IOException
-    {
-        if (this.premasterSecret == null)
-        {
-            throw new TlsFatalAlert(AlertDescription.internal_error);
-        }
-
-        byte[] tmp = this.premasterSecret;
-        this.premasterSecret = null;
-        return tmp;
-    }
-
-    // Would be needed to process RSA_EXPORT server key exchange
-    // protected void processRSAServerKeyExchange(InputStream is, Signer signer) throws IOException
-    // {
-    // InputStream sigIn = is;
-    // if (signer != null)
-    // {
-    // sigIn = new SignerInputStream(is, signer);
-    // }
-    //
-    // byte[] modulusBytes = TlsUtils.readOpaque16(sigIn);
-    // byte[] exponentBytes = TlsUtils.readOpaque16(sigIn);
-    //
-    // if (signer != null)
-    // {
-    // byte[] sigByte = TlsUtils.readOpaque16(is);
-    //
-    // if (!signer.verifySignature(sigByte))
-    // {
-    // handler.failWithError(AlertLevel.fatal, AlertDescription.bad_certificate);
-    // }
-    // }
-    //
-    // BigInteger modulus = new BigInteger(1, modulusBytes);
-    // BigInteger exponent = new BigInteger(1, exponentBytes);
-    //
-    // this.rsaServerPublicKey = validateRSAPublicKey(new RSAKeyParameters(false, modulus,
-    // exponent));
-    // }
-
-    protected RSAKeyParameters validateRSAPublicKey(RSAKeyParameters key)
-        throws IOException
-    {
-        // TODO What is the minimum bit length required?
-        // key.getModulus().bitLength();
-
-        if (!key.getExponent().isProbablePrime(2))
-        {
-            throw new TlsFatalAlert(AlertDescription.illegal_parameter);
-        }
-
-        return key;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsRSASigner.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsRSASigner.java
deleted file mode 100644
index 35538a7..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsRSASigner.java
+++ /dev/null
@@ -1,112 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-import org.bouncycastle.crypto.AsymmetricBlockCipher;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.CryptoException;
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.Signer;
-import org.bouncycastle.crypto.digests.NullDigest;
-import org.bouncycastle.crypto.encodings.PKCS1Encoding;
-import org.bouncycastle.crypto.engines.RSABlindedEngine;
-import org.bouncycastle.crypto.params.AsymmetricKeyParameter;
-import org.bouncycastle.crypto.params.ParametersWithRandom;
-import org.bouncycastle.crypto.params.RSAKeyParameters;
-import org.bouncycastle.crypto.signers.GenericSigner;
-import org.bouncycastle.crypto.signers.RSADigestSigner;
-
-public class TlsRSASigner
-    extends AbstractTlsSigner
-{
-    public byte[] generateRawSignature(SignatureAndHashAlgorithm algorithm,
-        AsymmetricKeyParameter privateKey, byte[] hash)
-        throws CryptoException
-    {
-        Signer signer = makeSigner(algorithm, true, true,
-            new ParametersWithRandom(privateKey, this.context.getSecureRandom()));
-        signer.update(hash, 0, hash.length);
-        return signer.generateSignature();
-    }
-
-    public boolean verifyRawSignature(SignatureAndHashAlgorithm algorithm, byte[] sigBytes,
-        AsymmetricKeyParameter publicKey, byte[] hash)
-        throws CryptoException
-    {
-        Signer signer = makeSigner(algorithm, true, false, publicKey);
-        signer.update(hash, 0, hash.length);
-        return signer.verifySignature(sigBytes);
-    }
-
-    public Signer createSigner(SignatureAndHashAlgorithm algorithm, AsymmetricKeyParameter privateKey)
-    {
-        return makeSigner(algorithm, false, true, new ParametersWithRandom(privateKey, this.context.getSecureRandom()));
-    }
-
-    public Signer createVerifyer(SignatureAndHashAlgorithm algorithm, AsymmetricKeyParameter publicKey)
-    {
-        return makeSigner(algorithm, false, false, publicKey);
-    }
-
-    public boolean isValidPublicKey(AsymmetricKeyParameter publicKey)
-    {
-        return publicKey instanceof RSAKeyParameters && !publicKey.isPrivate();
-    }
-
-    protected Signer makeSigner(SignatureAndHashAlgorithm algorithm, boolean raw, boolean forSigning,
-        CipherParameters cp)
-    {
-        if ((algorithm != null) != TlsUtils.isTLSv12(context))
-        {
-            throw new IllegalStateException();
-        }
-
-        if (algorithm != null && algorithm.getSignature() != SignatureAlgorithm.rsa)
-        {
-            throw new IllegalStateException();
-        }
-
-        Digest d;
-        if (raw)
-        {
-            d = new NullDigest();
-        }
-        else if (algorithm == null)
-        {
-            d = new CombinedHash();
-        }
-        else
-        {
-            d = TlsUtils.createHash(algorithm.getHash());
-        }
-
-        Signer s;
-        if (algorithm != null)
-        {
-            /*
-             * RFC 5246 4.7. In RSA signing, the opaque vector contains the signature generated
-             * using the RSASSA-PKCS1-v1_5 signature scheme defined in [PKCS1].
-             */
-            s = new RSADigestSigner(d, TlsUtils.getOIDForHashAlgorithm(algorithm.getHash()));
-        }
-        else
-        {
-            /*
-             * RFC 5246 4.7. Note that earlier versions of TLS used a different RSA signature scheme
-             * that did not include a DigestInfo encoding.
-             */
-            s = new GenericSigner(createRSAImpl(), d);
-        }
-        s.init(forSigning, cp);
-        return s;
-    }
-
-    protected AsymmetricBlockCipher createRSAImpl()
-    {
-        /*
-         * RFC 5264 7.4.7.1. Implementation note: It is now known that remote timing-based attacks
-         * on TLS are possible, at least when the client and server are on the same LAN.
-         * Accordingly, implementations that use static RSA keys MUST use RSA blinding or some other
-         * anti-timing technique, as described in [TIMING].
-         */
-        return new PKCS1Encoding(new RSABlindedEngine());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsRSAUtils.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsRSAUtils.java
deleted file mode 100644
index 99f1fb3..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsRSAUtils.java
+++ /dev/null
@@ -1,131 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-import java.io.IOException;
-import java.io.OutputStream;
-
-import org.bouncycastle.crypto.InvalidCipherTextException;
-import org.bouncycastle.crypto.encodings.PKCS1Encoding;
-import org.bouncycastle.crypto.engines.RSABlindedEngine;
-import org.bouncycastle.crypto.params.ParametersWithRandom;
-import org.bouncycastle.crypto.params.RSAKeyParameters;
-import org.bouncycastle.util.Arrays;
-
-public class TlsRSAUtils
-{
-    public static byte[] generateEncryptedPreMasterSecret(TlsContext context, RSAKeyParameters rsaServerPublicKey,
-        OutputStream output) throws IOException
-    {
-        /*
-         * Choose a PremasterSecret and send it encrypted to the server
-         */
-        byte[] premasterSecret = new byte[48];
-        context.getSecureRandom().nextBytes(premasterSecret);
-        TlsUtils.writeVersion(context.getClientVersion(), premasterSecret, 0);
-
-        PKCS1Encoding encoding = new PKCS1Encoding(new RSABlindedEngine());
-        encoding.init(true, new ParametersWithRandom(rsaServerPublicKey, context.getSecureRandom()));
-
-        try
-        {
-            byte[] encryptedPreMasterSecret = encoding.processBlock(premasterSecret, 0, premasterSecret.length);
-
-            if (TlsUtils.isSSL(context))
-            {
-                // TODO Do any SSLv3 servers actually expect the length?
-                output.write(encryptedPreMasterSecret);
-            }
-            else
-            {
-                TlsUtils.writeOpaque16(encryptedPreMasterSecret, output);
-            }
-        }
-        catch (InvalidCipherTextException e)
-        {
-            /*
-             * This should never happen, only during decryption.
-             */
-            throw new TlsFatalAlert(AlertDescription.internal_error, e);
-        }
-
-        return premasterSecret;
-    }
-
-    public static byte[] safeDecryptPreMasterSecret(TlsContext context, RSAKeyParameters rsaServerPrivateKey,
-        byte[] encryptedPreMasterSecret)
-    {
-        /*
-         * RFC 5246 7.4.7.1.
-         */
-        ProtocolVersion clientVersion = context.getClientVersion();
-
-        // TODO Provide as configuration option?
-        boolean versionNumberCheckDisabled = false;
-
-        /*
-         * Generate 48 random bytes we can use as a Pre-Master-Secret, if the
-         * PKCS1 padding check should fail.
-         */
-        byte[] fallback = new byte[48];
-        context.getSecureRandom().nextBytes(fallback);
-
-        byte[] M = Arrays.clone(fallback);
-        try
-        {
-            PKCS1Encoding encoding = new PKCS1Encoding(new RSABlindedEngine(), fallback);
-            encoding.init(false,
-                new ParametersWithRandom(rsaServerPrivateKey, context.getSecureRandom()));
-
-            M = encoding.processBlock(encryptedPreMasterSecret, 0, encryptedPreMasterSecret.length);
-        }
-        catch (Exception e)
-        {
-            /*
-             * This should never happen since the decryption should never throw an exception
-             * and return a random value instead.
-             *
-             * In any case, a TLS server MUST NOT generate an alert if processing an
-             * RSA-encrypted premaster secret message fails, or the version number is not as
-             * expected. Instead, it MUST continue the handshake with a randomly generated
-             * premaster secret.
-             */
-        }
-
-        /*
-         * If ClientHello.client_version is TLS 1.1 or higher, server implementations MUST
-         * check the version number [..].
-         */
-        if (versionNumberCheckDisabled && clientVersion.isEqualOrEarlierVersionOf(ProtocolVersion.TLSv10))
-        {
-            /*
-             * If the version number is TLS 1.0 or earlier, server
-             * implementations SHOULD check the version number, but MAY have a
-             * configuration option to disable the check.
-             *
-             * So there is nothing to do here.
-             */
-        }
-        else
-        {
-            /*
-             * OK, we need to compare the version number in the decrypted Pre-Master-Secret with the
-             * clientVersion received during the handshake. If they don't match, we replace the
-             * decrypted Pre-Master-Secret with a random one.
-             */
-            int correct = (clientVersion.getMajorVersion() ^ (M[0] & 0xff))
-                | (clientVersion.getMinorVersion() ^ (M[1] & 0xff));
-            correct |= correct >> 1;
-            correct |= correct >> 2;
-            correct |= correct >> 4;
-            int mask = ~((correct & 1) - 1);
-
-            /*
-             * mask will be all bits set to 0xff if the version number differed.
-             */
-            for (int i = 0; i < 48; i++)
-            {
-                M[i] = (byte)((M[i] & (~mask)) | (fallback[i] & mask));
-            }
-        }
-        return M;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsSRPGroupVerifier.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsSRPGroupVerifier.java
deleted file mode 100644
index 81767d1..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsSRPGroupVerifier.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-import org.bouncycastle.crypto.params.SRP6GroupParameters;
-
-public interface TlsSRPGroupVerifier
-{
-    /**
-     * Check whether the given SRP group parameters are acceptable for use.
-     * 
-     * @param group the {@link SRP6GroupParameters} to check
-     * @return true if (and only if) the specified group parameters are acceptable
-     */
-    boolean accept(SRP6GroupParameters group);
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsSRPIdentityManager.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsSRPIdentityManager.java
deleted file mode 100644
index fbf50b1..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsSRPIdentityManager.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-public interface TlsSRPIdentityManager
-{
-    /**
-     * Lookup the {@link TlsSRPLoginParameters} corresponding to the specified identity.
-     * 
-     * NOTE: To avoid "identity probing", unknown identities SHOULD be handled as recommended in RFC
-     * 5054 2.5.1.3. {@link SimulatedTlsSRPIdentityManager} is provided for this purpose.
-     * 
-     * @param identity
-     *            the SRP identity sent by the connecting client
-     * @return the {@link TlsSRPLoginParameters} for the specified identity, or else 'simulated'
-     *         parameters if the identity is not recognized. A null value is also allowed, but not
-     *         recommended.
-     */
-    TlsSRPLoginParameters getLoginParameters(byte[] identity);
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsSRPKeyExchange.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsSRPKeyExchange.java
deleted file mode 100644
index 1ec6ee2..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsSRPKeyExchange.java
+++ /dev/null
@@ -1,312 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.math.BigInteger;
-import java.util.Vector;
-
-import org.bouncycastle.asn1.x509.KeyUsage;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.bouncycastle.crypto.CryptoException;
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.Signer;
-import org.bouncycastle.crypto.agreement.srp.SRP6Client;
-import org.bouncycastle.crypto.agreement.srp.SRP6Server;
-import org.bouncycastle.crypto.agreement.srp.SRP6Util;
-import org.bouncycastle.crypto.params.AsymmetricKeyParameter;
-import org.bouncycastle.crypto.params.SRP6GroupParameters;
-import org.bouncycastle.crypto.util.PublicKeyFactory;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.BigIntegers;
-import org.bouncycastle.util.io.TeeInputStream;
-
-/**
- * (D)TLS SRP key exchange (RFC 5054).
- */
-public class TlsSRPKeyExchange extends AbstractTlsKeyExchange
-{
-    protected static TlsSigner createSigner(int keyExchange)
-    {
-        switch (keyExchange)
-        {
-        case KeyExchangeAlgorithm.SRP:
-            return null;
-        case KeyExchangeAlgorithm.SRP_RSA:
-            return new TlsRSASigner();
-        case KeyExchangeAlgorithm.SRP_DSS:
-            return new TlsDSSSigner();
-        default:
-            throw new IllegalArgumentException("unsupported key exchange algorithm");
-        }
-    }
-    
-    protected TlsSigner tlsSigner;
-    protected TlsSRPGroupVerifier groupVerifier;
-    protected byte[] identity;
-    protected byte[] password;
-
-    protected AsymmetricKeyParameter serverPublicKey = null;
-
-    protected SRP6GroupParameters srpGroup = null;
-    protected SRP6Client srpClient = null;
-    protected SRP6Server srpServer = null;
-    protected BigInteger srpPeerCredentials = null;
-    protected BigInteger srpVerifier = null;
-    protected byte[] srpSalt = null;
-
-    protected TlsSignerCredentials serverCredentials = null;
-
-    /**
-     * @deprecated Use constructor taking an explicit 'groupVerifier' argument
-     */
-    public TlsSRPKeyExchange(int keyExchange, Vector supportedSignatureAlgorithms, byte[] identity, byte[] password)
-    {
-        this(keyExchange, supportedSignatureAlgorithms, new DefaultTlsSRPGroupVerifier(), identity, password);
-    }
-
-    public TlsSRPKeyExchange(int keyExchange, Vector supportedSignatureAlgorithms, TlsSRPGroupVerifier groupVerifier,
-        byte[] identity, byte[] password)
-    {
-        super(keyExchange, supportedSignatureAlgorithms);
-
-        this.tlsSigner = createSigner(keyExchange);
-        this.groupVerifier = groupVerifier;
-        this.identity = identity;
-        this.password = password;
-        this.srpClient = new SRP6Client();
-    }
-
-    public TlsSRPKeyExchange(int keyExchange, Vector supportedSignatureAlgorithms, byte[] identity,
-        TlsSRPLoginParameters loginParameters)
-    {
-        super(keyExchange, supportedSignatureAlgorithms);
-
-        this.tlsSigner = createSigner(keyExchange);
-        this.identity = identity;
-        this.srpServer = new SRP6Server();
-        this.srpGroup = loginParameters.getGroup();
-        this.srpVerifier = loginParameters.getVerifier();
-        this.srpSalt = loginParameters.getSalt();
-    }
-
-    public void init(TlsContext context)
-    {
-        super.init(context);
-
-        if (this.tlsSigner != null)
-        {
-            this.tlsSigner.init(context);
-        }
-    }
-
-    public void skipServerCredentials() throws IOException
-    {
-        if (tlsSigner != null)
-        {
-            throw new TlsFatalAlert(AlertDescription.unexpected_message);
-        }
-    }
-
-    public void processServerCertificate(Certificate serverCertificate) throws IOException
-    {
-        if (tlsSigner == null)
-        {
-            throw new TlsFatalAlert(AlertDescription.unexpected_message);
-        }
-        if (serverCertificate.isEmpty())
-        {
-            throw new TlsFatalAlert(AlertDescription.bad_certificate);
-        }
-
-        org.bouncycastle.asn1.x509.Certificate x509Cert = serverCertificate.getCertificateAt(0);
-
-        SubjectPublicKeyInfo keyInfo = x509Cert.getSubjectPublicKeyInfo();
-        try
-        {
-            this.serverPublicKey = PublicKeyFactory.createKey(keyInfo);
-        }
-        catch (RuntimeException e)
-        {
-            throw new TlsFatalAlert(AlertDescription.unsupported_certificate, e);
-        }
-
-        if (!tlsSigner.isValidPublicKey(this.serverPublicKey))
-        {
-            throw new TlsFatalAlert(AlertDescription.certificate_unknown);
-        }
-
-        TlsUtils.validateKeyUsage(x509Cert, KeyUsage.digitalSignature);
-
-        super.processServerCertificate(serverCertificate);
-    }
-
-    public void processServerCredentials(TlsCredentials serverCredentials)
-        throws IOException
-    {
-        if ((keyExchange == KeyExchangeAlgorithm.SRP) || !(serverCredentials instanceof TlsSignerCredentials))
-        {
-            throw new TlsFatalAlert(AlertDescription.internal_error);
-        }
-
-        processServerCertificate(serverCredentials.getCertificate());
-
-        this.serverCredentials = (TlsSignerCredentials)serverCredentials;
-    }
-
-    public boolean requiresServerKeyExchange()
-    {
-        return true;
-    }
-
-    public byte[] generateServerKeyExchange() throws IOException
-    {
-        srpServer.init(srpGroup, srpVerifier, TlsUtils.createHash(HashAlgorithm.sha1), context.getSecureRandom());
-        BigInteger B = srpServer.generateServerCredentials();
-
-        ServerSRPParams srpParams = new ServerSRPParams(srpGroup.getN(), srpGroup.getG(), srpSalt, B);
-
-        DigestInputBuffer buf = new DigestInputBuffer();
-
-        srpParams.encode(buf);
-
-        if (serverCredentials != null)
-        {
-            /*
-             * RFC 5246 4.7. digitally-signed element needs SignatureAndHashAlgorithm from TLS 1.2
-             */
-            SignatureAndHashAlgorithm signatureAndHashAlgorithm = TlsUtils.getSignatureAndHashAlgorithm(
-                context, serverCredentials);
-
-            Digest d = TlsUtils.createHash(signatureAndHashAlgorithm);
-
-            SecurityParameters securityParameters = context.getSecurityParameters();
-            d.update(securityParameters.clientRandom, 0, securityParameters.clientRandom.length);
-            d.update(securityParameters.serverRandom, 0, securityParameters.serverRandom.length);
-            buf.updateDigest(d);
-
-            byte[] hash = new byte[d.getDigestSize()];
-            d.doFinal(hash, 0);
-
-            byte[] signature = serverCredentials.generateCertificateSignature(hash);
-
-            DigitallySigned signed_params = new DigitallySigned(signatureAndHashAlgorithm, signature);
-            signed_params.encode(buf);
-        }
-
-        return buf.toByteArray();
-    }
-
-    public void processServerKeyExchange(InputStream input) throws IOException
-    {
-        SecurityParameters securityParameters = context.getSecurityParameters();
-
-        SignerInputBuffer buf = null;
-        InputStream teeIn = input;
-
-        if (tlsSigner != null)
-        {
-            buf = new SignerInputBuffer();
-            teeIn = new TeeInputStream(input, buf);
-        }
-
-        ServerSRPParams srpParams = ServerSRPParams.parse(teeIn);
-
-        if (buf != null)
-        {
-            DigitallySigned signed_params = DigitallySigned.parse(context, input);
-
-            Signer signer = initVerifyer(tlsSigner, signed_params.getAlgorithm(), securityParameters);
-            buf.updateSigner(signer);
-            if (!signer.verifySignature(signed_params.getSignature()))
-            {
-                throw new TlsFatalAlert(AlertDescription.decrypt_error);
-            }
-        }
-
-        this.srpGroup = new SRP6GroupParameters(srpParams.getN(), srpParams.getG());
-
-        if (!groupVerifier.accept(srpGroup))
-        {
-            throw new TlsFatalAlert(AlertDescription.insufficient_security);
-        }
-
-        this.srpSalt = srpParams.getS();
-
-        /*
-         * RFC 5054 2.5.3: The client MUST abort the handshake with an "illegal_parameter" alert if
-         * B % N = 0.
-         */
-        try
-        {
-            this.srpPeerCredentials = SRP6Util.validatePublicValue(srpGroup.getN(), srpParams.getB());
-        }
-        catch (CryptoException e)
-        {
-            throw new TlsFatalAlert(AlertDescription.illegal_parameter, e);
-        }
-
-        this.srpClient.init(srpGroup, TlsUtils.createHash(HashAlgorithm.sha1), context.getSecureRandom());
-    }
-
-    public void validateCertificateRequest(CertificateRequest certificateRequest) throws IOException
-    {
-        throw new TlsFatalAlert(AlertDescription.unexpected_message);
-    }
-
-    public void processClientCredentials(TlsCredentials clientCredentials) throws IOException
-    {
-        throw new TlsFatalAlert(AlertDescription.internal_error);
-    }
-
-    public void generateClientKeyExchange(OutputStream output) throws IOException
-    {
-        BigInteger A = srpClient.generateClientCredentials(srpSalt, identity, password);
-        TlsSRPUtils.writeSRPParameter(A, output);
-
-        context.getSecurityParameters().srpIdentity = Arrays.clone(identity);
-    }
-
-    public void processClientKeyExchange(InputStream input) throws IOException
-    {
-        /*
-         * RFC 5054 2.5.4: The server MUST abort the handshake with an "illegal_parameter" alert if
-         * A % N = 0.
-         */
-        try
-        {
-            this.srpPeerCredentials = SRP6Util.validatePublicValue(srpGroup.getN(), TlsSRPUtils.readSRPParameter(input));
-        }
-        catch (CryptoException e)
-        {
-            throw new TlsFatalAlert(AlertDescription.illegal_parameter, e);
-        }
-
-        context.getSecurityParameters().srpIdentity = Arrays.clone(identity);
-    }
-
-    public byte[] generatePremasterSecret() throws IOException
-    {
-        try
-        {
-            BigInteger S = srpServer != null
-                ?   srpServer.calculateSecret(srpPeerCredentials)
-                :   srpClient.calculateSecret(srpPeerCredentials);
-
-            // TODO Check if this needs to be a fixed size
-            return BigIntegers.asUnsignedByteArray(S);
-        }
-        catch (CryptoException e)
-        {
-            throw new TlsFatalAlert(AlertDescription.illegal_parameter, e);
-        }
-    }
-
-    protected Signer initVerifyer(TlsSigner tlsSigner, SignatureAndHashAlgorithm algorithm, SecurityParameters securityParameters)
-    {
-        Signer signer = tlsSigner.createVerifyer(algorithm, this.serverPublicKey);
-        signer.update(securityParameters.clientRandom, 0, securityParameters.clientRandom.length);
-        signer.update(securityParameters.serverRandom, 0, securityParameters.serverRandom.length);
-        return signer;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsSRPLoginParameters.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsSRPLoginParameters.java
deleted file mode 100644
index 45ef192..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsSRPLoginParameters.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-import java.math.BigInteger;
-
-import org.bouncycastle.crypto.params.SRP6GroupParameters;
-
-public class TlsSRPLoginParameters
-{
-    protected SRP6GroupParameters group;
-    protected BigInteger verifier;
-    protected byte[] salt;
-
-    public TlsSRPLoginParameters(SRP6GroupParameters group, BigInteger verifier, byte[] salt)
-    {
-        this.group = group;
-        this.verifier = verifier;
-        this.salt = salt;
-    }
-
-    public SRP6GroupParameters getGroup()
-    {
-        return group;
-    }
-
-    public byte[] getSalt()
-    {
-        return salt;
-    }
-
-    public BigInteger getVerifier()
-    {
-        return verifier;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsSRPUtils.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsSRPUtils.java
deleted file mode 100644
index 941d13b..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsSRPUtils.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.math.BigInteger;
-import java.util.Hashtable;
-
-import org.bouncycastle.util.BigIntegers;
-import org.bouncycastle.util.Integers;
-
-public class TlsSRPUtils
-{
-    public static final Integer EXT_SRP = Integers.valueOf(ExtensionType.srp);
-
-    public static void addSRPExtension(Hashtable extensions, byte[] identity) throws IOException
-    {
-        extensions.put(EXT_SRP, createSRPExtension(identity));
-    }
-
-    public static byte[] getSRPExtension(Hashtable extensions) throws IOException
-    {
-        byte[] extensionData = TlsUtils.getExtensionData(extensions, EXT_SRP);
-        return extensionData == null ? null : readSRPExtension(extensionData);
-    }
-
-    public static byte[] createSRPExtension(byte[] identity) throws IOException
-    {
-        if (identity == null)
-        {
-            throw new TlsFatalAlert(AlertDescription.internal_error);
-        }
-
-        return TlsUtils.encodeOpaque8(identity);
-    }
-
-    public static byte[] readSRPExtension(byte[] extensionData) throws IOException
-    {
-        if (extensionData == null)
-        {
-            throw new IllegalArgumentException("'extensionData' cannot be null");
-        }
-
-        ByteArrayInputStream buf = new ByteArrayInputStream(extensionData);
-        byte[] identity = TlsUtils.readOpaque8(buf);
-
-        TlsProtocol.assertEmpty(buf);
-
-        return identity;
-    }
-
-    public static BigInteger readSRPParameter(InputStream input) throws IOException
-    {
-        return new BigInteger(1, TlsUtils.readOpaque16(input));
-    }
-
-    public static void writeSRPParameter(BigInteger x, OutputStream output) throws IOException
-    {
-        TlsUtils.writeOpaque16(BigIntegers.asUnsignedByteArray(x), output);
-    }
-
-    public static boolean isSRPCipherSuite(int cipherSuite)
-    {
-        switch (cipherSuite)
-        {
-        case CipherSuite.TLS_SRP_SHA_DSS_WITH_3DES_EDE_CBC_SHA:
-        case CipherSuite.TLS_SRP_SHA_DSS_WITH_AES_128_CBC_SHA:
-        case CipherSuite.TLS_SRP_SHA_DSS_WITH_AES_256_CBC_SHA:
-        case CipherSuite.TLS_SRP_SHA_RSA_WITH_3DES_EDE_CBC_SHA:
-        case CipherSuite.TLS_SRP_SHA_RSA_WITH_AES_128_CBC_SHA:
-        case CipherSuite.TLS_SRP_SHA_RSA_WITH_AES_256_CBC_SHA:
-        case CipherSuite.TLS_SRP_SHA_WITH_3DES_EDE_CBC_SHA:
-        case CipherSuite.TLS_SRP_SHA_WITH_AES_128_CBC_SHA:
-        case CipherSuite.TLS_SRP_SHA_WITH_AES_256_CBC_SHA:
-            return true;
-
-        default:
-            return false;
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsSRTPUtils.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsSRTPUtils.java
deleted file mode 100644
index da98b7a..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsSRTPUtils.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.util.Hashtable;
-
-import org.bouncycastle.util.Integers;
-
-/**
- * RFC 5764 DTLS Extension to Establish Keys for SRTP.
- */
-public class TlsSRTPUtils
-{
-    public static final Integer EXT_use_srtp = Integers.valueOf(ExtensionType.use_srtp);
-
-    public static void addUseSRTPExtension(Hashtable extensions, UseSRTPData useSRTPData)
-        throws IOException
-    {
-        extensions.put(EXT_use_srtp, createUseSRTPExtension(useSRTPData));
-    }
-
-    public static UseSRTPData getUseSRTPExtension(Hashtable extensions)
-        throws IOException
-    {
-        byte[] extensionData = TlsUtils.getExtensionData(extensions, EXT_use_srtp);
-        return extensionData == null ? null : readUseSRTPExtension(extensionData);
-    }
-
-    public static byte[] createUseSRTPExtension(UseSRTPData useSRTPData)
-        throws IOException
-    {
-        if (useSRTPData == null)
-        {
-            throw new IllegalArgumentException("'useSRTPData' cannot be null");
-        }
-
-        ByteArrayOutputStream buf = new ByteArrayOutputStream();
-
-        // SRTPProtectionProfiles
-        TlsUtils.writeUint16ArrayWithUint16Length(useSRTPData.getProtectionProfiles(), buf);
-
-        // srtp_mki
-        TlsUtils.writeOpaque8(useSRTPData.getMki(), buf);
-
-        return buf.toByteArray();
-    }
-
-    public static UseSRTPData readUseSRTPExtension(byte[] extensionData)
-        throws IOException
-    {
-        if (extensionData == null)
-        {
-            throw new IllegalArgumentException("'extensionData' cannot be null");
-        }
-
-        ByteArrayInputStream buf = new ByteArrayInputStream(extensionData);
-
-        // SRTPProtectionProfiles
-        int length = TlsUtils.readUint16(buf);
-        if (length < 2 || (length & 1) != 0)
-        {
-            throw new TlsFatalAlert(AlertDescription.decode_error);
-        }
-        int[] protectionProfiles = TlsUtils.readUint16Array(length / 2, buf);
-
-        // srtp_mki
-        byte[] mki = TlsUtils.readOpaque8(buf);
-
-        TlsProtocol.assertEmpty(buf);
-
-        return new UseSRTPData(protectionProfiles, mki);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsServer.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsServer.java
deleted file mode 100644
index 2a9ae55..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsServer.java
+++ /dev/null
@@ -1,92 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-import java.io.IOException;
-import java.util.Hashtable;
-import java.util.Vector;
-
-public interface TlsServer
-    extends TlsPeer
-{
-    void init(TlsServerContext context);
-
-    void notifyClientVersion(ProtocolVersion clientVersion) throws IOException;
-
-    void notifyFallback(boolean isFallback) throws IOException;
-
-    void notifyOfferedCipherSuites(int[] offeredCipherSuites)
-        throws IOException;
-
-    void notifyOfferedCompressionMethods(short[] offeredCompressionMethods)
-        throws IOException;
-
-    // Hashtable is (Integer -> byte[])
-    void processClientExtensions(Hashtable clientExtensions)
-        throws IOException;
-
-    ProtocolVersion getServerVersion()
-        throws IOException;
-
-    int getSelectedCipherSuite()
-        throws IOException;
-
-    short getSelectedCompressionMethod()
-        throws IOException;
-
-    // Hashtable is (Integer -> byte[])
-    Hashtable getServerExtensions()
-        throws IOException;
-
-    // Vector is (SupplementalDataEntry)
-    Vector getServerSupplementalData()
-        throws IOException;
-
-    TlsCredentials getCredentials()
-        throws IOException;
-
-    /**
-     * This method will be called (only) if the server included an extension of type
-     * "status_request" with empty "extension_data" in the extended server hello. See <i>RFC 3546
-     * 3.6. Certificate Status Request</i>. If a non-null {@link CertificateStatus} is returned, it
-     * is sent to the client as a handshake message of type "certificate_status".
-     * 
-     * @return A {@link CertificateStatus} to be sent to the client (or null for none).
-     * @throws IOException
-     */
-    CertificateStatus getCertificateStatus()
-        throws IOException;
-
-    TlsKeyExchange getKeyExchange()
-        throws IOException;
-
-    CertificateRequest getCertificateRequest()
-        throws IOException;
-
-    // Vector is (SupplementalDataEntry)
-    void processClientSupplementalData(Vector clientSupplementalData)
-        throws IOException;
-
-    /**
-     * Called by the protocol handler to report the client certificate, only if
-     * {@link #getCertificateRequest()} returned non-null.
-     * 
-     * Note: this method is responsible for certificate verification and validation.
-     * 
-     * @param clientCertificate
-     *            the effective client certificate (may be an empty chain).
-     * @throws IOException
-     */
-    void notifyClientCertificate(Certificate clientCertificate)
-        throws IOException;
-
-    /**
-     * RFC 5077 3.3. NewSessionTicket Handshake Message.
-     * <p>
-     * This method will be called (only) if a NewSessionTicket extension was sent by the server. See
-     * <i>RFC 5077 4. Recommended Ticket Construction</i> for recommended format and protection.
-     *
-     * @return The ticket.
-     * @throws IOException
-     */
-    NewSessionTicket getNewSessionTicket()
-        throws IOException;
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsServerContext.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsServerContext.java
deleted file mode 100644
index 37a0c95..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsServerContext.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-public interface TlsServerContext
-    extends TlsContext
-{
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsServerContextImpl.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsServerContextImpl.java
deleted file mode 100644
index 48f028a..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsServerContextImpl.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-import java.security.SecureRandom;
-
-class TlsServerContextImpl
-    extends AbstractTlsContext
-    implements TlsServerContext
-{
-    TlsServerContextImpl(SecureRandom secureRandom, SecurityParameters securityParameters)
-    {
-        super(secureRandom, securityParameters);
-    }
-
-    public boolean isServer()
-    {
-        return true;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsServerProtocol.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsServerProtocol.java
deleted file mode 100644
index 509c4b2..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsServerProtocol.java
+++ /dev/null
@@ -1,794 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.security.SecureRandom;
-import java.util.Vector;
-
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.bouncycastle.crypto.params.AsymmetricKeyParameter;
-import org.bouncycastle.crypto.util.PublicKeyFactory;
-import org.bouncycastle.util.Arrays;
-
-public class TlsServerProtocol
-    extends TlsProtocol
-{
-    protected TlsServer tlsServer = null;
-    TlsServerContextImpl tlsServerContext = null;
-
-    protected TlsKeyExchange keyExchange = null;
-    protected TlsCredentials serverCredentials = null;
-    protected CertificateRequest certificateRequest = null;
-
-    protected short clientCertificateType = -1;
-    protected TlsHandshakeHash prepareFinishHash = null;
-
-    public TlsServerProtocol(InputStream input, OutputStream output, SecureRandom secureRandom)
-    {
-        super(input, output, secureRandom);
-    }
-
-    /**
-     * Receives a TLS handshake in the role of server
-     *
-     * @param tlsServer
-     * @throws IOException If handshake was not successful.
-     */
-    public void accept(TlsServer tlsServer)
-        throws IOException
-    {
-        if (tlsServer == null)
-        {
-            throw new IllegalArgumentException("'tlsServer' cannot be null");
-        }
-        if (this.tlsServer != null)
-        {
-            throw new IllegalStateException("'accept' can only be called once");
-        }
-
-        this.tlsServer = tlsServer;
-
-        this.securityParameters = new SecurityParameters();
-        this.securityParameters.entity = ConnectionEnd.server;
-
-        this.tlsServerContext = new TlsServerContextImpl(secureRandom, securityParameters);
-
-        this.securityParameters.serverRandom = createRandomBlock(tlsServer.shouldUseGMTUnixTime(),
-            tlsServerContext.getNonceRandomGenerator());
-
-        this.tlsServer.init(tlsServerContext);
-        this.recordStream.init(tlsServerContext);
-
-        this.recordStream.setRestrictReadVersion(false);
-
-        completeHandshake();
-    }
-
-    protected void cleanupHandshake()
-    {
-        super.cleanupHandshake();
-        
-        this.keyExchange = null;
-        this.serverCredentials = null;
-        this.certificateRequest = null;
-        this.prepareFinishHash = null;
-    }
-
-    protected TlsContext getContext()
-    {
-        return tlsServerContext;
-    }
-
-    AbstractTlsContext getContextAdmin()
-    {
-        return tlsServerContext;
-    }
-
-    protected TlsPeer getPeer()
-    {
-        return tlsServer;
-    }
-
-    protected void handleHandshakeMessage(short type, byte[] data)
-        throws IOException
-    {
-        ByteArrayInputStream buf = new ByteArrayInputStream(data);
-
-        switch (type)
-        {
-        case HandshakeType.client_hello:
-        {
-            switch (this.connection_state)
-            {
-            case CS_START:
-            {
-                receiveClientHelloMessage(buf);
-                this.connection_state = CS_CLIENT_HELLO;
-
-                sendServerHelloMessage();
-                this.connection_state = CS_SERVER_HELLO;
-
-                Vector serverSupplementalData = tlsServer.getServerSupplementalData();
-                if (serverSupplementalData != null)
-                {
-                    sendSupplementalDataMessage(serverSupplementalData);
-                }
-                this.connection_state = CS_SERVER_SUPPLEMENTAL_DATA;
-
-                this.keyExchange = tlsServer.getKeyExchange();
-                this.keyExchange.init(getContext());
-
-                this.serverCredentials = tlsServer.getCredentials();
-
-                Certificate serverCertificate = null;
-
-                if (this.serverCredentials == null)
-                {
-                    this.keyExchange.skipServerCredentials();
-                }
-                else
-                {
-                    this.keyExchange.processServerCredentials(this.serverCredentials);
-
-                    serverCertificate = this.serverCredentials.getCertificate();
-                    sendCertificateMessage(serverCertificate);
-                }
-                this.connection_state = CS_SERVER_CERTIFICATE;
-
-                // TODO[RFC 3546] Check whether empty certificates is possible, allowed, or excludes CertificateStatus
-                if (serverCertificate == null || serverCertificate.isEmpty())
-                {
-                    this.allowCertificateStatus = false;
-                }
-
-                if (this.allowCertificateStatus)
-                {
-                    CertificateStatus certificateStatus = tlsServer.getCertificateStatus();
-                    if (certificateStatus != null)
-                    {
-                        sendCertificateStatusMessage(certificateStatus);
-                    }
-                }
-
-                this.connection_state = CS_CERTIFICATE_STATUS;
-
-                byte[] serverKeyExchange = this.keyExchange.generateServerKeyExchange();
-                if (serverKeyExchange != null)
-                {
-                    sendServerKeyExchangeMessage(serverKeyExchange);
-                }
-                this.connection_state = CS_SERVER_KEY_EXCHANGE;
-
-                if (this.serverCredentials != null)
-                {
-                    this.certificateRequest = tlsServer.getCertificateRequest();
-                    if (this.certificateRequest != null)
-                    {
-                        this.keyExchange.validateCertificateRequest(certificateRequest);
-
-                        sendCertificateRequestMessage(certificateRequest);
-
-                        TlsUtils.trackHashAlgorithms(this.recordStream.getHandshakeHash(),
-                            this.certificateRequest.getSupportedSignatureAlgorithms());
-                    }
-                }
-                this.connection_state = CS_CERTIFICATE_REQUEST;
-
-                sendServerHelloDoneMessage();
-                this.connection_state = CS_SERVER_HELLO_DONE;
-
-                this.recordStream.getHandshakeHash().sealHashAlgorithms();
-
-                break;
-            }
-            default:
-                throw new TlsFatalAlert(AlertDescription.unexpected_message);
-            }
-            break;
-        }
-        case HandshakeType.supplemental_data:
-        {
-            switch (this.connection_state)
-            {
-            case CS_SERVER_HELLO_DONE:
-            {
-                tlsServer.processClientSupplementalData(readSupplementalDataMessage(buf));
-                this.connection_state = CS_CLIENT_SUPPLEMENTAL_DATA;
-                break;
-            }
-            default:
-                throw new TlsFatalAlert(AlertDescription.unexpected_message);
-            }
-            break;
-        }
-        case HandshakeType.certificate:
-        {
-            switch (this.connection_state)
-            {
-            case CS_SERVER_HELLO_DONE:
-            {
-                tlsServer.processClientSupplementalData(null);
-                // NB: Fall through to next case label
-            }
-            case CS_CLIENT_SUPPLEMENTAL_DATA:
-            {
-                if (this.certificateRequest == null)
-                {
-                    throw new TlsFatalAlert(AlertDescription.unexpected_message);
-                }
-                receiveCertificateMessage(buf);
-                this.connection_state = CS_CLIENT_CERTIFICATE;
-                break;
-            }
-            default:
-                throw new TlsFatalAlert(AlertDescription.unexpected_message);
-            }
-            break;
-        }
-        case HandshakeType.client_key_exchange:
-        {
-            switch (this.connection_state)
-            {
-            case CS_SERVER_HELLO_DONE:
-            {
-                tlsServer.processClientSupplementalData(null);
-                // NB: Fall through to next case label
-            }
-            case CS_CLIENT_SUPPLEMENTAL_DATA:
-            {
-                if (this.certificateRequest == null)
-                {
-                    this.keyExchange.skipClientCredentials();
-                }
-                else
-                {
-                    if (TlsUtils.isTLSv12(getContext()))
-                    {
-                        /*
-                         * RFC 5246 If no suitable certificate is available, the client MUST send a
-                         * certificate message containing no certificates.
-                         * 
-                         * NOTE: In previous RFCs, this was SHOULD instead of MUST.
-                         */
-                        throw new TlsFatalAlert(AlertDescription.unexpected_message);
-                    }
-                    else if (TlsUtils.isSSL(getContext()))
-                    {
-                        if (this.peerCertificate == null)
-                        {
-                            throw new TlsFatalAlert(AlertDescription.unexpected_message);
-                        }
-                    }
-                    else
-                    {
-                        notifyClientCertificate(Certificate.EMPTY_CHAIN);
-                    }
-                }
-                // NB: Fall through to next case label
-            }
-            case CS_CLIENT_CERTIFICATE:
-            {
-                receiveClientKeyExchangeMessage(buf);
-                this.connection_state = CS_CLIENT_KEY_EXCHANGE;
-                break;
-            }
-            default:
-                throw new TlsFatalAlert(AlertDescription.unexpected_message);
-            }
-            break;
-        }
-        case HandshakeType.certificate_verify:
-        {
-            switch (this.connection_state)
-            {
-            case CS_CLIENT_KEY_EXCHANGE:
-            {
-                /*
-                 * RFC 5246 7.4.8 This message is only sent following a client certificate that has
-                 * signing capability (i.e., all certificates except those containing fixed
-                 * Diffie-Hellman parameters).
-                 */
-                if (!expectCertificateVerifyMessage())
-                {
-                    throw new TlsFatalAlert(AlertDescription.unexpected_message);
-                }
-
-                receiveCertificateVerifyMessage(buf);
-                this.connection_state = CS_CERTIFICATE_VERIFY;
-
-                break;
-            }
-            default:
-                throw new TlsFatalAlert(AlertDescription.unexpected_message);
-            }
-            break;
-        }
-        case HandshakeType.finished:
-        {
-            switch (this.connection_state)
-            {
-            case CS_CLIENT_KEY_EXCHANGE:
-            {
-                if (expectCertificateVerifyMessage())
-                {
-                    throw new TlsFatalAlert(AlertDescription.unexpected_message);
-                }
-                // NB: Fall through to next case label
-            }
-            case CS_CERTIFICATE_VERIFY:
-            {
-                processFinishedMessage(buf);
-                this.connection_state = CS_CLIENT_FINISHED;
-
-                if (this.expectSessionTicket)
-                {
-                    sendNewSessionTicketMessage(tlsServer.getNewSessionTicket());
-                    sendChangeCipherSpecMessage();
-                }
-                this.connection_state = CS_SERVER_SESSION_TICKET;
-
-                sendFinishedMessage();
-                this.connection_state = CS_SERVER_FINISHED;
-                this.connection_state = CS_END;
-                break;
-            }
-            default:
-                throw new TlsFatalAlert(AlertDescription.unexpected_message);
-            }
-            break;
-        }
-        case HandshakeType.hello_request:
-        case HandshakeType.hello_verify_request:
-        case HandshakeType.server_hello:
-        case HandshakeType.server_key_exchange:
-        case HandshakeType.certificate_request:
-        case HandshakeType.server_hello_done:
-        case HandshakeType.session_ticket:
-        default:
-            throw new TlsFatalAlert(AlertDescription.unexpected_message);
-        }
-    }
-
-    protected void handleWarningMessage(short description)
-        throws IOException
-    {
-        switch (description)
-        {
-        case AlertDescription.no_certificate:
-        {
-            /*
-             * SSL 3.0 If the server has sent a certificate request Message, the client must send
-             * either the certificate message or a no_certificate alert.
-             */
-            if (TlsUtils.isSSL(getContext()) && certificateRequest != null)
-            {
-                notifyClientCertificate(Certificate.EMPTY_CHAIN);
-            }
-            break;
-        }
-        default:
-        {
-            super.handleWarningMessage(description);
-            break;
-        }
-        }
-    }
-
-    protected void notifyClientCertificate(Certificate clientCertificate)
-        throws IOException
-    {
-        if (certificateRequest == null)
-        {
-            throw new IllegalStateException();
-        }
-
-        if (peerCertificate != null)
-        {
-            throw new TlsFatalAlert(AlertDescription.unexpected_message);
-        }
-
-        this.peerCertificate = clientCertificate;
-
-        if (clientCertificate.isEmpty())
-        {
-            this.keyExchange.skipClientCredentials();
-        }
-        else
-        {
-
-            /*
-             * TODO RFC 5246 7.4.6. If the certificate_authorities list in the certificate request
-             * message was non-empty, one of the certificates in the certificate chain SHOULD be
-             * issued by one of the listed CAs.
-             */
-
-            this.clientCertificateType = TlsUtils.getClientCertificateType(clientCertificate,
-                this.serverCredentials.getCertificate());
-
-            this.keyExchange.processClientCertificate(clientCertificate);
-        }
-
-        /*
-         * RFC 5246 7.4.6. If the client does not send any certificates, the server MAY at its
-         * discretion either continue the handshake without client authentication, or respond with a
-         * fatal handshake_failure alert. Also, if some aspect of the certificate chain was
-         * unacceptable (e.g., it was not signed by a known, trusted CA), the server MAY at its
-         * discretion either continue the handshake (considering the client unauthenticated) or send
-         * a fatal alert.
-         */
-        this.tlsServer.notifyClientCertificate(clientCertificate);
-    }
-
-    protected void receiveCertificateMessage(ByteArrayInputStream buf)
-        throws IOException
-    {
-        Certificate clientCertificate = Certificate.parse(buf);
-
-        assertEmpty(buf);
-
-        notifyClientCertificate(clientCertificate);
-    }
-
-    protected void receiveCertificateVerifyMessage(ByteArrayInputStream buf)
-        throws IOException
-    {
-        DigitallySigned clientCertificateVerify = DigitallySigned.parse(getContext(), buf);
-
-        assertEmpty(buf);
-
-        // Verify the CertificateVerify message contains a correct signature.
-        try
-        {
-            byte[] hash;
-            if (TlsUtils.isTLSv12(getContext()))
-            {
-                hash = prepareFinishHash.getFinalHash(clientCertificateVerify.getAlgorithm().getHash());
-            }
-            else
-            {
-                hash = securityParameters.getSessionHash();
-            }
-
-            org.bouncycastle.asn1.x509.Certificate x509Cert = peerCertificate.getCertificateAt(0);
-            SubjectPublicKeyInfo keyInfo = x509Cert.getSubjectPublicKeyInfo();
-            AsymmetricKeyParameter publicKey = PublicKeyFactory.createKey(keyInfo);
-
-            TlsSigner tlsSigner = TlsUtils.createTlsSigner(clientCertificateType);
-            tlsSigner.init(getContext());
-            if (!tlsSigner.verifyRawSignature(clientCertificateVerify.getAlgorithm(),
-                clientCertificateVerify.getSignature(), publicKey, hash))
-            {
-                throw new TlsFatalAlert(AlertDescription.decrypt_error);
-            }
-        }
-        catch (Exception e)
-        {
-            throw new TlsFatalAlert(AlertDescription.decrypt_error, e);
-        }
-    }
-
-    protected void receiveClientHelloMessage(ByteArrayInputStream buf)
-        throws IOException
-    {
-        ProtocolVersion client_version = TlsUtils.readVersion(buf);
-        recordStream.setWriteVersion(client_version);
-
-        if (client_version.isDTLS())
-        {
-            throw new TlsFatalAlert(AlertDescription.illegal_parameter);
-        }
-
-        byte[] client_random = TlsUtils.readFully(32, buf);
-
-        /*
-         * TODO RFC 5077 3.4. If a ticket is presented by the client, the server MUST NOT attempt to
-         * use the Session ID in the ClientHello for stateful session resumption.
-         */
-        byte[] sessionID = TlsUtils.readOpaque8(buf);
-        if (sessionID.length > 32)
-        {
-            throw new TlsFatalAlert(AlertDescription.illegal_parameter);
-        }
-
-        /*
-         * TODO RFC 5246 7.4.1.2. If the session_id field is not empty (implying a session
-         * resumption request), this vector MUST include at least the cipher_suite from that
-         * session.
-         */
-        int cipher_suites_length = TlsUtils.readUint16(buf);
-        if (cipher_suites_length < 2 || (cipher_suites_length & 1) != 0)
-        {
-            throw new TlsFatalAlert(AlertDescription.decode_error);
-        }
-        this.offeredCipherSuites = TlsUtils.readUint16Array(cipher_suites_length / 2, buf);
-
-        /*
-         * TODO RFC 5246 7.4.1.2. If the session_id field is not empty (implying a session
-         * resumption request), it MUST include the compression_method from that session.
-         */
-        int compression_methods_length = TlsUtils.readUint8(buf);
-        if (compression_methods_length < 1)
-        {
-            throw new TlsFatalAlert(AlertDescription.illegal_parameter);
-        }
-        this.offeredCompressionMethods = TlsUtils.readUint8Array(compression_methods_length, buf);
-
-        /*
-         * TODO RFC 3546 2.3 If [...] the older session is resumed, then the server MUST ignore
-         * extensions appearing in the client hello, and send a server hello containing no
-         * extensions.
-         */
-        this.clientExtensions = readExtensions(buf);
-
-        this.securityParameters.extendedMasterSecret = TlsExtensionsUtils.hasExtendedMasterSecretExtension(clientExtensions);
-
-        getContextAdmin().setClientVersion(client_version);
-
-        tlsServer.notifyClientVersion(client_version);
-        tlsServer.notifyFallback(Arrays.contains(offeredCipherSuites, CipherSuite.TLS_FALLBACK_SCSV));
-
-        securityParameters.clientRandom = client_random;
-
-        tlsServer.notifyOfferedCipherSuites(offeredCipherSuites);
-        tlsServer.notifyOfferedCompressionMethods(offeredCompressionMethods);
-
-        /*
-         * RFC 5746 3.6. Server Behavior: Initial Handshake
-         */
-        {
-            /*
-             * RFC 5746 3.4. The client MUST include either an empty "renegotiation_info" extension,
-             * or the TLS_EMPTY_RENEGOTIATION_INFO_SCSV signaling cipher suite value in the
-             * ClientHello. Including both is NOT RECOMMENDED.
-             */
-
-            /*
-             * When a ClientHello is received, the server MUST check if it includes the
-             * TLS_EMPTY_RENEGOTIATION_INFO_SCSV SCSV. If it does, set the secure_renegotiation flag
-             * to TRUE.
-             */
-            if (Arrays.contains(offeredCipherSuites, CipherSuite.TLS_EMPTY_RENEGOTIATION_INFO_SCSV))
-            {
-                this.secure_renegotiation = true;
-            }
-
-            /*
-             * The server MUST check if the "renegotiation_info" extension is included in the
-             * ClientHello.
-             */
-            byte[] renegExtData = TlsUtils.getExtensionData(clientExtensions, EXT_RenegotiationInfo);
-            if (renegExtData != null)
-            {
-                /*
-                 * If the extension is present, set secure_renegotiation flag to TRUE. The
-                 * server MUST then verify that the length of the "renegotiated_connection"
-                 * field is zero, and if it is not, MUST abort the handshake.
-                 */
-                this.secure_renegotiation = true;
-
-                if (!Arrays.constantTimeAreEqual(renegExtData, createRenegotiationInfo(TlsUtils.EMPTY_BYTES)))
-                {
-                    throw new TlsFatalAlert(AlertDescription.handshake_failure);
-                }
-            }
-        }
-
-        tlsServer.notifySecureRenegotiation(this.secure_renegotiation);
-
-        if (clientExtensions != null)
-        {
-            tlsServer.processClientExtensions(clientExtensions);
-        }
-    }
-
-    protected void receiveClientKeyExchangeMessage(ByteArrayInputStream buf)
-        throws IOException
-    {
-        keyExchange.processClientKeyExchange(buf);
-
-        assertEmpty(buf);
-
-        this.prepareFinishHash = recordStream.prepareToFinish();
-        this.securityParameters.sessionHash = getCurrentPRFHash(getContext(), prepareFinishHash, null);
-
-        establishMasterSecret(getContext(), keyExchange);
-        recordStream.setPendingConnectionState(getPeer().getCompression(), getPeer().getCipher());
-
-        if (!expectSessionTicket)
-        {
-            sendChangeCipherSpecMessage();
-        }
-    }
-
-    protected void sendCertificateRequestMessage(CertificateRequest certificateRequest)
-        throws IOException
-    {
-        HandshakeMessage message = new HandshakeMessage(HandshakeType.certificate_request);
-
-        certificateRequest.encode(message);
-
-        message.writeToRecordStream();
-    }
-
-    protected void sendCertificateStatusMessage(CertificateStatus certificateStatus)
-        throws IOException
-    {
-        HandshakeMessage message = new HandshakeMessage(HandshakeType.certificate_status);
-
-        certificateStatus.encode(message);
-
-        message.writeToRecordStream();
-    }
-
-    protected void sendNewSessionTicketMessage(NewSessionTicket newSessionTicket)
-        throws IOException
-    {
-        if (newSessionTicket == null)
-        {
-            throw new TlsFatalAlert(AlertDescription.internal_error);
-        }
-
-        HandshakeMessage message = new HandshakeMessage(HandshakeType.session_ticket);
-
-        newSessionTicket.encode(message);
-
-        message.writeToRecordStream();
-    }
-
-    protected void sendServerHelloMessage()
-        throws IOException
-    {
-        HandshakeMessage message = new HandshakeMessage(HandshakeType.server_hello);
-
-        ProtocolVersion server_version = tlsServer.getServerVersion();
-        if (!server_version.isEqualOrEarlierVersionOf(getContext().getClientVersion()))
-        {
-            throw new TlsFatalAlert(AlertDescription.internal_error);
-        }
-
-        recordStream.setReadVersion(server_version);
-        recordStream.setWriteVersion(server_version);
-        recordStream.setRestrictReadVersion(true);
-        getContextAdmin().setServerVersion(server_version);
-
-        TlsUtils.writeVersion(server_version, message);
-
-        message.write(this.securityParameters.serverRandom);
-
-        /*
-         * The server may return an empty session_id to indicate that the session will not be cached
-         * and therefore cannot be resumed.
-         */
-        TlsUtils.writeOpaque8(TlsUtils.EMPTY_BYTES, message);
-
-        int selectedCipherSuite = tlsServer.getSelectedCipherSuite();
-        if (!Arrays.contains(offeredCipherSuites, selectedCipherSuite)
-            || selectedCipherSuite == CipherSuite.TLS_NULL_WITH_NULL_NULL
-            || CipherSuite.isSCSV(selectedCipherSuite)
-            || !TlsUtils.isValidCipherSuiteForVersion(selectedCipherSuite, server_version))
-        {
-            throw new TlsFatalAlert(AlertDescription.internal_error);
-        }
-        securityParameters.cipherSuite = selectedCipherSuite;
-
-        short selectedCompressionMethod = tlsServer.getSelectedCompressionMethod();
-        if (!Arrays.contains(offeredCompressionMethods, selectedCompressionMethod))
-        {
-            throw new TlsFatalAlert(AlertDescription.internal_error);
-        }
-        securityParameters.compressionAlgorithm = selectedCompressionMethod;
-
-        TlsUtils.writeUint16(selectedCipherSuite, message);
-        TlsUtils.writeUint8(selectedCompressionMethod, message);
-
-        this.serverExtensions = tlsServer.getServerExtensions();
-
-        /*
-         * RFC 5746 3.6. Server Behavior: Initial Handshake
-         */
-        if (this.secure_renegotiation)
-        {
-            byte[] renegExtData = TlsUtils.getExtensionData(this.serverExtensions, EXT_RenegotiationInfo);
-            boolean noRenegExt = (null == renegExtData);
-
-            if (noRenegExt)
-            {
-                /*
-                 * Note that sending a "renegotiation_info" extension in response to a ClientHello
-                 * containing only the SCSV is an explicit exception to the prohibition in RFC 5246,
-                 * Section 7.4.1.4, on the server sending unsolicited extensions and is only allowed
-                 * because the client is signaling its willingness to receive the extension via the
-                 * TLS_EMPTY_RENEGOTIATION_INFO_SCSV SCSV.
-                 */
-
-                /*
-                 * If the secure_renegotiation flag is set to TRUE, the server MUST include an empty
-                 * "renegotiation_info" extension in the ServerHello message.
-                 */
-                this.serverExtensions = TlsExtensionsUtils.ensureExtensionsInitialised(serverExtensions);
-                this.serverExtensions.put(EXT_RenegotiationInfo, createRenegotiationInfo(TlsUtils.EMPTY_BYTES));
-            }
-        }
-
-        if (securityParameters.extendedMasterSecret)
-        {
-            this.serverExtensions = TlsExtensionsUtils.ensureExtensionsInitialised(serverExtensions);
-            TlsExtensionsUtils.addExtendedMasterSecretExtension(serverExtensions);
-        }
-
-        /*
-         * TODO RFC 3546 2.3 If [...] the older session is resumed, then the server MUST ignore
-         * extensions appearing in the client hello, and send a server hello containing no
-         * extensions.
-         */
-
-        if (this.serverExtensions != null)
-        {
-            this.securityParameters.encryptThenMAC = TlsExtensionsUtils.hasEncryptThenMACExtension(serverExtensions);
-
-            this.securityParameters.maxFragmentLength = processMaxFragmentLengthExtension(clientExtensions,
-                serverExtensions, AlertDescription.internal_error);
-
-            this.securityParameters.truncatedHMac = TlsExtensionsUtils.hasTruncatedHMacExtension(serverExtensions);
-
-            /*
-             * TODO It's surprising that there's no provision to allow a 'fresh' CertificateStatus to be sent in
-             * a session resumption handshake.
-             */
-            this.allowCertificateStatus = !resumedSession
-                && TlsUtils.hasExpectedEmptyExtensionData(serverExtensions, TlsExtensionsUtils.EXT_status_request,
-                    AlertDescription.internal_error);
-
-            this.expectSessionTicket = !resumedSession
-                && TlsUtils.hasExpectedEmptyExtensionData(serverExtensions, TlsProtocol.EXT_SessionTicket,
-                    AlertDescription.internal_error);
-
-            writeExtensions(message, serverExtensions);
-        }
-
-        if (securityParameters.maxFragmentLength >= 0)
-        {
-            int plainTextLimit = 1 << (8 + securityParameters.maxFragmentLength);
-            recordStream.setPlaintextLimit(plainTextLimit);
-        }
-
-        securityParameters.prfAlgorithm = getPRFAlgorithm(getContext(), securityParameters.getCipherSuite());
-
-        /*
-         * RFC 5264 7.4.9. Any cipher suite which does not explicitly specify verify_data_length has
-         * a verify_data_length equal to 12. This includes all existing cipher suites.
-         */
-        securityParameters.verifyDataLength = 12;
-
-        message.writeToRecordStream();
-
-        recordStream.notifyHelloComplete();
-    }
-
-    protected void sendServerHelloDoneMessage()
-        throws IOException
-    {
-        byte[] message = new byte[4];
-        TlsUtils.writeUint8(HandshakeType.server_hello_done, message, 0);
-        TlsUtils.writeUint24(0, message, 1);
-
-        writeHandshakeMessage(message, 0, message.length);
-    }
-
-    protected void sendServerKeyExchangeMessage(byte[] serverKeyExchange)
-        throws IOException
-    {
-        HandshakeMessage message = new HandshakeMessage(HandshakeType.server_key_exchange, serverKeyExchange.length);
-
-        message.write(serverKeyExchange);
-
-        message.writeToRecordStream();
-    }
-
-    protected boolean expectCertificateVerifyMessage()
-    {
-        return clientCertificateType >= 0 && TlsUtils.hasSigningCapability(clientCertificateType);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsSession.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsSession.java
deleted file mode 100644
index 9b5ad46..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsSession.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-public interface TlsSession
-{
-    SessionParameters exportSessionParameters();
-
-    byte[] getSessionID();
-
-    void invalidate();
-
-    boolean isResumable();
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsSessionImpl.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsSessionImpl.java
deleted file mode 100644
index 615c442..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsSessionImpl.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-import org.bouncycastle.util.Arrays;
-
-class TlsSessionImpl implements TlsSession
-{
-    final byte[] sessionID;
-    SessionParameters sessionParameters;
-
-    TlsSessionImpl(byte[] sessionID, SessionParameters sessionParameters)
-    {
-        if (sessionID == null)
-        {
-            throw new IllegalArgumentException("'sessionID' cannot be null");
-        }
-        if (sessionID.length < 1 || sessionID.length > 32)
-        {
-            throw new IllegalArgumentException("'sessionID' must have length between 1 and 32 bytes, inclusive");
-        }
-
-        this.sessionID = Arrays.clone(sessionID);
-        this.sessionParameters = sessionParameters;
-    }
-
-    public synchronized SessionParameters exportSessionParameters()
-    {
-        return this.sessionParameters == null ? null : this.sessionParameters.copy();
-    }
-
-    public synchronized byte[] getSessionID()
-    {
-        return sessionID;
-    }
-
-    public synchronized void invalidate()
-    {
-        if (this.sessionParameters != null)
-        {
-            this.sessionParameters.clear();
-            this.sessionParameters = null;
-        }
-    }
-
-    public synchronized boolean isResumable()
-    {
-        return this.sessionParameters != null;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsSigner.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsSigner.java
deleted file mode 100644
index 68826d2..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsSigner.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-import org.bouncycastle.crypto.CryptoException;
-import org.bouncycastle.crypto.Signer;
-import org.bouncycastle.crypto.params.AsymmetricKeyParameter;
-
-public interface TlsSigner
-{
-    void init(TlsContext context);
-
-    byte[] generateRawSignature(AsymmetricKeyParameter privateKey, byte[] md5AndSha1)
-        throws CryptoException;
-
-    byte[] generateRawSignature(SignatureAndHashAlgorithm algorithm,
-        AsymmetricKeyParameter privateKey, byte[] hash)
-        throws CryptoException;
-
-    boolean verifyRawSignature(byte[] sigBytes, AsymmetricKeyParameter publicKey, byte[] md5AndSha1)
-        throws CryptoException;
-
-    boolean verifyRawSignature(SignatureAndHashAlgorithm algorithm, byte[] sigBytes,
-        AsymmetricKeyParameter publicKey, byte[] hash)
-        throws CryptoException;
-
-    Signer createSigner(AsymmetricKeyParameter privateKey);
-
-    Signer createSigner(SignatureAndHashAlgorithm algorithm, AsymmetricKeyParameter privateKey);
-
-    Signer createVerifyer(AsymmetricKeyParameter publicKey);
-
-    Signer createVerifyer(SignatureAndHashAlgorithm algorithm, AsymmetricKeyParameter publicKey);
-
-    boolean isValidPublicKey(AsymmetricKeyParameter publicKey);
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsSignerCredentials.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsSignerCredentials.java
deleted file mode 100644
index 39ee99c..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsSignerCredentials.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-import java.io.IOException;
-
-public interface TlsSignerCredentials
-    extends TlsCredentials
-{
-    byte[] generateCertificateSignature(byte[] hash)
-        throws IOException;
-
-    SignatureAndHashAlgorithm getSignatureAndHashAlgorithm();
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsStreamCipher.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsStreamCipher.java
deleted file mode 100644
index 4e2c263..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsStreamCipher.java
+++ /dev/null
@@ -1,168 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-import java.io.IOException;
-
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.StreamCipher;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.crypto.params.ParametersWithIV;
-import org.bouncycastle.util.Arrays;
-
-public class TlsStreamCipher
-    implements TlsCipher
-{
-    protected TlsContext context;
-
-    protected StreamCipher encryptCipher;
-    protected StreamCipher decryptCipher;
-
-    protected TlsMac writeMac;
-    protected TlsMac readMac;
-
-    protected boolean usesNonce;
-
-    public TlsStreamCipher(TlsContext context, StreamCipher clientWriteCipher,
-        StreamCipher serverWriteCipher, Digest clientWriteDigest, Digest serverWriteDigest,
-        int cipherKeySize, boolean usesNonce) throws IOException
-    {
-        boolean isServer = context.isServer();
-
-        this.context = context;
-        this.usesNonce = usesNonce;
-
-        this.encryptCipher = clientWriteCipher;
-        this.decryptCipher = serverWriteCipher;
-
-        int key_block_size = (2 * cipherKeySize) + clientWriteDigest.getDigestSize()
-            + serverWriteDigest.getDigestSize();
-
-        byte[] key_block = TlsUtils.calculateKeyBlock(context, key_block_size);
-
-        int offset = 0;
-
-        // Init MACs
-        TlsMac clientWriteMac = new TlsMac(context, clientWriteDigest, key_block, offset,
-            clientWriteDigest.getDigestSize());
-        offset += clientWriteDigest.getDigestSize();
-        TlsMac serverWriteMac = new TlsMac(context, serverWriteDigest, key_block, offset,
-            serverWriteDigest.getDigestSize());
-        offset += serverWriteDigest.getDigestSize();
-
-        // Build keys
-        KeyParameter clientWriteKey = new KeyParameter(key_block, offset, cipherKeySize);
-        offset += cipherKeySize;
-        KeyParameter serverWriteKey = new KeyParameter(key_block, offset, cipherKeySize);
-        offset += cipherKeySize;
-
-        if (offset != key_block_size)
-        {
-            throw new TlsFatalAlert(AlertDescription.internal_error);
-        }
-
-        CipherParameters encryptParams, decryptParams;
-        if (isServer)
-        {
-            this.writeMac = serverWriteMac;
-            this.readMac = clientWriteMac;
-            this.encryptCipher = serverWriteCipher;
-            this.decryptCipher = clientWriteCipher;
-            encryptParams = serverWriteKey;
-            decryptParams = clientWriteKey;
-        }
-        else
-        {
-            this.writeMac = clientWriteMac;
-            this.readMac = serverWriteMac;
-            this.encryptCipher = clientWriteCipher;
-            this.decryptCipher = serverWriteCipher;
-            encryptParams = clientWriteKey;
-            decryptParams = serverWriteKey;
-        }
-
-        if (usesNonce)
-        {
-            byte[] dummyNonce = new byte[8];
-            encryptParams = new ParametersWithIV(encryptParams, dummyNonce);
-            decryptParams = new ParametersWithIV(decryptParams, dummyNonce);
-        }
-
-        this.encryptCipher.init(true, encryptParams);
-        this.decryptCipher.init(false, decryptParams);
-    }
-
-    public int getPlaintextLimit(int ciphertextLimit)
-    {
-        return ciphertextLimit - writeMac.getSize();
-    }
-
-    public byte[] encodePlaintext(long seqNo, short type, byte[] plaintext, int offset, int len)
-    {
-        /*
-         * draft-josefsson-salsa20-tls-04 2.1 Note that Salsa20 requires a 64-bit nonce. That
-         * nonce is updated on the encryption of every TLS record, and is set to be the 64-bit TLS
-         * record sequence number. In case of DTLS the 64-bit nonce is formed as the concatenation
-         * of the 16-bit epoch with the 48-bit sequence number.
-         */
-        if (usesNonce)
-        {
-            updateIV(encryptCipher, true, seqNo);
-        }
-
-        byte[] outBuf = new byte[len + writeMac.getSize()];
-
-        encryptCipher.processBytes(plaintext, offset, len, outBuf, 0);
-
-        byte[] mac = writeMac.calculateMac(seqNo, type, plaintext, offset, len);
-        encryptCipher.processBytes(mac, 0, mac.length, outBuf, len);
-
-        return outBuf;
-    }
-
-    public byte[] decodeCiphertext(long seqNo, short type, byte[] ciphertext, int offset, int len)
-        throws IOException
-    {
-        /*
-         * draft-josefsson-salsa20-tls-04 2.1 Note that Salsa20 requires a 64-bit nonce. That
-         * nonce is updated on the encryption of every TLS record, and is set to be the 64-bit TLS
-         * record sequence number. In case of DTLS the 64-bit nonce is formed as the concatenation
-         * of the 16-bit epoch with the 48-bit sequence number.
-         */
-        if (usesNonce)
-        {
-            updateIV(decryptCipher, false, seqNo);
-        }
-
-        int macSize = readMac.getSize();
-        if (len < macSize)
-        {
-            throw new TlsFatalAlert(AlertDescription.decode_error);
-        }
-
-        int plaintextLength = len - macSize;
-
-        byte[] deciphered = new byte[len];
-        decryptCipher.processBytes(ciphertext, offset, len, deciphered, 0);
-        checkMAC(seqNo, type, deciphered, plaintextLength, len, deciphered, 0, plaintextLength);
-        return Arrays.copyOfRange(deciphered, 0, plaintextLength);
-    }
-
-    protected void checkMAC(long seqNo, short type, byte[] recBuf, int recStart, int recEnd, byte[] calcBuf, int calcOff, int calcLen)
-        throws IOException
-    {
-        byte[] receivedMac = Arrays.copyOfRange(recBuf, recStart, recEnd);
-        byte[] computedMac = readMac.calculateMac(seqNo, type, calcBuf, calcOff, calcLen);
-
-        if (!Arrays.constantTimeAreEqual(receivedMac, computedMac))
-        {
-            throw new TlsFatalAlert(AlertDescription.bad_record_mac);
-        }
-    }
-
-    protected void updateIV(StreamCipher cipher, boolean forEncryption, long seqNo)
-    {
-        byte[] nonce = new byte[8];
-        TlsUtils.writeUint64(seqNo, nonce, 0);
-        cipher.init(forEncryption, new ParametersWithIV(null, nonce));
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsUtils.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsUtils.java
deleted file mode 100644
index d390983..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/TlsUtils.java
+++ /dev/null
@@ -1,1843 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.EOFException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.Hashtable;
-import java.util.Vector;
-
-import org.bouncycastle.asn1.ASN1Encoding;
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.nist.NISTObjectIdentifiers;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.asn1.x509.Extensions;
-import org.bouncycastle.asn1.x509.KeyUsage;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.bouncycastle.asn1.x509.X509ObjectIdentifiers;
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.digests.MD5Digest;
-import org.bouncycastle.crypto.digests.SHA1Digest;
-import org.bouncycastle.crypto.digests.SHA224Digest;
-import org.bouncycastle.crypto.digests.SHA256Digest;
-import org.bouncycastle.crypto.digests.SHA384Digest;
-import org.bouncycastle.crypto.digests.SHA512Digest;
-import org.bouncycastle.crypto.macs.HMac;
-import org.bouncycastle.crypto.params.AsymmetricKeyParameter;
-import org.bouncycastle.crypto.params.DSAPublicKeyParameters;
-import org.bouncycastle.crypto.params.ECPublicKeyParameters;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.crypto.params.RSAKeyParameters;
-import org.bouncycastle.crypto.util.PublicKeyFactory;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.Integers;
-import org.bouncycastle.util.Strings;
-import org.bouncycastle.util.io.Streams;
-
-/**
- * Some helper functions for MicroTLS.
- */
-public class TlsUtils
-{
-    public static final byte[] EMPTY_BYTES = new byte[0];
-    public static final short[] EMPTY_SHORTS = new short[0];
-    public static final int[] EMPTY_INTS = new int[0];
-    public static final long[] EMPTY_LONGS = new long[0];
-
-    public static final Integer EXT_signature_algorithms = Integers.valueOf(ExtensionType.signature_algorithms);
-
-    public static void checkUint8(short i) throws IOException
-    {
-        if (!isValidUint8(i))
-        {
-            throw new TlsFatalAlert(AlertDescription.internal_error);
-        }
-    }
-
-    public static void checkUint8(int i) throws IOException
-    {
-        if (!isValidUint8(i))
-        {
-            throw new TlsFatalAlert(AlertDescription.internal_error);
-        }
-    }
-
-    public static void checkUint8(long i) throws IOException
-    {
-        if (!isValidUint8(i))
-        {
-            throw new TlsFatalAlert(AlertDescription.internal_error);
-        }
-    }
-
-    public static void checkUint16(int i) throws IOException
-    {
-        if (!isValidUint16(i))
-        {
-            throw new TlsFatalAlert(AlertDescription.internal_error);
-        }
-    }
-
-    public static void checkUint16(long i) throws IOException
-    {
-        if (!isValidUint16(i))
-        {
-            throw new TlsFatalAlert(AlertDescription.internal_error);
-        }
-    }
-
-    public static void checkUint24(int i) throws IOException
-    {
-        if (!isValidUint24(i))
-        {
-            throw new TlsFatalAlert(AlertDescription.internal_error);
-        }
-    }
-
-    public static void checkUint24(long i) throws IOException
-    {
-        if (!isValidUint24(i))
-        {
-            throw new TlsFatalAlert(AlertDescription.internal_error);
-        }
-    }
-
-    public static void checkUint32(long i) throws IOException
-    {
-        if (!isValidUint32(i))
-        {
-            throw new TlsFatalAlert(AlertDescription.internal_error);
-        }
-    }
-
-    public static void checkUint48(long i) throws IOException
-    {
-        if (!isValidUint48(i))
-        {
-            throw new TlsFatalAlert(AlertDescription.internal_error);
-        }
-    }
-
-    public static void checkUint64(long i) throws IOException
-    {
-        if (!isValidUint64(i))
-        {
-            throw new TlsFatalAlert(AlertDescription.internal_error);
-        }
-    }
-
-    public static boolean isValidUint8(short i)
-    {
-        return (i & 0xFF) == i;
-    }
-
-    public static boolean isValidUint8(int i)
-    {
-        return (i & 0xFF) == i;
-    }
-
-    public static boolean isValidUint8(long i)
-    {
-        return (i & 0xFFL) == i;
-    }
-
-    public static boolean isValidUint16(int i)
-    {
-        return (i & 0xFFFF) == i;
-    }
-
-    public static boolean isValidUint16(long i)
-    {
-        return (i & 0xFFFFL) == i;
-    }
-
-    public static boolean isValidUint24(int i)
-    {
-        return (i & 0xFFFFFF) == i;
-    }
-
-    public static boolean isValidUint24(long i)
-    {
-        return (i & 0xFFFFFFL) == i;
-    }
-
-    public static boolean isValidUint32(long i)
-    {
-        return (i & 0xFFFFFFFFL) == i;
-    }
-
-    public static boolean isValidUint48(long i)
-    {
-        return (i & 0xFFFFFFFFFFFFL) == i;
-    }
-
-    public static boolean isValidUint64(long i)
-    {
-        return true;
-    }
-
-    public static boolean isSSL(TlsContext context)
-    {
-        return context.getServerVersion().isSSL();
-    }
-
-    public static boolean isTLSv11(TlsContext context)
-    {
-        return ProtocolVersion.TLSv11.isEqualOrEarlierVersionOf(context.getServerVersion().getEquivalentTLSVersion());
-    }
-
-    public static boolean isTLSv12(TlsContext context)
-    {
-        return ProtocolVersion.TLSv12.isEqualOrEarlierVersionOf(context.getServerVersion().getEquivalentTLSVersion());
-    }
-
-    public static void writeUint8(short i, OutputStream output)
-        throws IOException
-    {
-        output.write(i);
-    }
-
-    public static void writeUint8(int i, OutputStream output)
-        throws IOException
-    {
-        output.write(i);
-    }
-
-    public static void writeUint8(short i, byte[] buf, int offset)
-    {
-        buf[offset] = (byte)i;
-    }
-
-    public static void writeUint8(int i, byte[] buf, int offset)
-    {
-        buf[offset] = (byte)i;
-    }
-
-    public static void writeUint16(int i, OutputStream output)
-        throws IOException
-    {
-        output.write(i >>> 8);
-        output.write(i);
-    }
-
-    public static void writeUint16(int i, byte[] buf, int offset)
-    {
-        buf[offset] = (byte)(i >>> 8);
-        buf[offset + 1] = (byte)i;
-    }
-
-    public static void writeUint24(int i, OutputStream output)
-        throws IOException
-    {
-        output.write((byte)(i >>> 16));
-        output.write((byte)(i >>> 8));
-        output.write((byte)i);
-    }
-
-    public static void writeUint24(int i, byte[] buf, int offset)
-    {
-        buf[offset] = (byte)(i >>> 16);
-        buf[offset + 1] = (byte)(i >>> 8);
-        buf[offset + 2] = (byte)i;
-    }
-
-    public static void writeUint32(long i, OutputStream output)
-        throws IOException
-    {
-        output.write((byte)(i >>> 24));
-        output.write((byte)(i >>> 16));
-        output.write((byte)(i >>> 8));
-        output.write((byte)i);
-    }
-
-    public static void writeUint32(long i, byte[] buf, int offset)
-    {
-        buf[offset] = (byte)(i >>> 24);
-        buf[offset + 1] = (byte)(i >>> 16);
-        buf[offset + 2] = (byte)(i >>> 8);
-        buf[offset + 3] = (byte)i;
-    }
-
-    public static void writeUint48(long i, OutputStream output)
-        throws IOException
-    {
-        output.write((byte)(i >>> 40));
-        output.write((byte)(i >>> 32));
-        output.write((byte)(i >>> 24));
-        output.write((byte)(i >>> 16));
-        output.write((byte)(i >>> 8));
-        output.write((byte)i);
-    }
-
-    public static void writeUint48(long i, byte[] buf, int offset)
-    {
-        buf[offset] = (byte)(i >>> 40);
-        buf[offset + 1] = (byte)(i >>> 32);
-        buf[offset + 2] = (byte)(i >>> 24);
-        buf[offset + 3] = (byte)(i >>> 16);
-        buf[offset + 4] = (byte)(i >>> 8);
-        buf[offset + 5] = (byte)i;
-    }
-
-    public static void writeUint64(long i, OutputStream output)
-        throws IOException
-    {
-        output.write((byte)(i >>> 56));
-        output.write((byte)(i >>> 48));
-        output.write((byte)(i >>> 40));
-        output.write((byte)(i >>> 32));
-        output.write((byte)(i >>> 24));
-        output.write((byte)(i >>> 16));
-        output.write((byte)(i >>> 8));
-        output.write((byte)i);
-    }
-
-    public static void writeUint64(long i, byte[] buf, int offset)
-    {
-        buf[offset] = (byte)(i >>> 56);
-        buf[offset + 1] = (byte)(i >>> 48);
-        buf[offset + 2] = (byte)(i >>> 40);
-        buf[offset + 3] = (byte)(i >>> 32);
-        buf[offset + 4] = (byte)(i >>> 24);
-        buf[offset + 5] = (byte)(i >>> 16);
-        buf[offset + 6] = (byte)(i >>> 8);
-        buf[offset + 7] = (byte)i;
-    }
-
-    public static void writeOpaque8(byte[] buf, OutputStream output)
-        throws IOException
-    {
-        checkUint8(buf.length);
-        writeUint8(buf.length, output);
-        output.write(buf);
-    }
-
-    public static void writeOpaque16(byte[] buf, OutputStream output)
-        throws IOException
-    {
-        checkUint16(buf.length);
-        writeUint16(buf.length, output);
-        output.write(buf);
-    }
-
-    public static void writeOpaque24(byte[] buf, OutputStream output)
-        throws IOException
-    {
-        checkUint24(buf.length);
-        writeUint24(buf.length, output);
-        output.write(buf);
-    }
-
-    public static void writeUint8Array(short[] uints, OutputStream output)
-        throws IOException
-    {
-        for (int i = 0; i < uints.length; ++i)
-        {
-            writeUint8(uints[i], output);
-        }
-    }
-
-    public static void writeUint8Array(short[] uints, byte[] buf, int offset)
-        throws IOException
-    {
-        for (int i = 0; i < uints.length; ++i)
-        {
-            writeUint8(uints[i], buf, offset);
-            ++offset;
-        }
-    }
-
-    public static void writeUint8ArrayWithUint8Length(short[] uints, OutputStream output)
-        throws IOException
-    {
-        checkUint8(uints.length);
-        writeUint8(uints.length, output);
-        writeUint8Array(uints, output);
-    }
-
-    public static void writeUint8ArrayWithUint8Length(short[] uints, byte[] buf, int offset)
-        throws IOException
-    {
-        checkUint8(uints.length);
-        writeUint8(uints.length, buf, offset);
-        writeUint8Array(uints, buf, offset + 1);
-    }
-
-    public static void writeUint16Array(int[] uints, OutputStream output)
-        throws IOException
-    {
-        for (int i = 0; i < uints.length; ++i)
-        {
-            writeUint16(uints[i], output);
-        }
-    }
-
-    public static void writeUint16Array(int[] uints, byte[] buf, int offset)
-        throws IOException
-    {
-        for (int i = 0; i < uints.length; ++i)
-        {
-            writeUint16(uints[i], buf, offset);
-            offset += 2;
-        }
-    }
-
-    public static void writeUint16ArrayWithUint16Length(int[] uints, OutputStream output)
-        throws IOException
-    {
-        int length = 2 * uints.length;
-        checkUint16(length);
-        writeUint16(length, output);
-        writeUint16Array(uints, output);
-    }
-
-    public static void writeUint16ArrayWithUint16Length(int[] uints, byte[] buf, int offset)
-        throws IOException
-    {
-        int length = 2 * uints.length;
-        checkUint16(length);
-        writeUint16(length, buf, offset);
-        writeUint16Array(uints, buf, offset + 2);
-    }
-
-    public static byte[] encodeOpaque8(byte[] buf)
-        throws IOException
-    {
-        checkUint8(buf.length);
-        return Arrays.prepend(buf, (byte)buf.length);
-    }
-
-    public static byte[] encodeUint8ArrayWithUint8Length(short[] uints) throws IOException
-    {
-        byte[] result = new byte[1 + uints.length];
-        writeUint8ArrayWithUint8Length(uints, result, 0);
-        return result;
-    }
-
-    public static byte[] encodeUint16ArrayWithUint16Length(int[] uints) throws IOException
-    {
-        int length = 2 * uints.length;
-        byte[] result = new byte[2 + length];
-        writeUint16ArrayWithUint16Length(uints, result, 0);
-        return result;
-    }
-
-    public static short readUint8(InputStream input)
-        throws IOException
-    {
-        int i = input.read();
-        if (i < 0)
-        {
-            throw new EOFException();
-        }
-        return (short)i;
-    }
-
-    public static short readUint8(byte[] buf, int offset)
-    {
-        return (short)buf[offset];
-    }
-
-    public static int readUint16(InputStream input)
-        throws IOException
-    {
-        int i1 = input.read();
-        int i2 = input.read();
-        if (i2 < 0)
-        {
-            throw new EOFException();
-        }
-        return i1 << 8 | i2;
-    }
-
-    public static int readUint16(byte[] buf, int offset)
-    {
-        int n = (buf[offset] & 0xff) << 8;
-        n |= (buf[++offset] & 0xff);
-        return n;
-    }
-
-    public static int readUint24(InputStream input)
-        throws IOException
-    {
-        int i1 = input.read();
-        int i2 = input.read();
-        int i3 = input.read();
-        if (i3 < 0)
-        {
-            throw new EOFException();
-        }
-        return (i1 << 16) | (i2 << 8) | i3;
-    }
-
-    public static int readUint24(byte[] buf, int offset)
-    {
-        int n = (buf[offset] & 0xff) << 16;
-        n |= (buf[++offset] & 0xff) << 8;
-        n |= (buf[++offset] & 0xff);
-        return n;
-    }
-
-    public static long readUint32(InputStream input)
-        throws IOException
-    {
-        int i1 = input.read();
-        int i2 = input.read();
-        int i3 = input.read();
-        int i4 = input.read();
-        if (i4 < 0)
-        {
-            throw new EOFException();
-        }
-        return ((i1 << 2) | (i2 << 16) | (i3 << 8) | i4) & 0xFFFFFFFFL;
-    }
-
-    public static long readUint32(byte[] buf, int offset)
-    {
-        int n = (buf[offset] & 0xff) << 24;
-        n |= (buf[++offset] & 0xff) << 16;
-        n |= (buf[++offset] & 0xff) << 8;
-        n |= (buf[++offset] & 0xff);
-        return n & 0xFFFFFFFFL;
-    }
-
-    public static long readUint48(InputStream input)
-        throws IOException
-    {
-        int hi = readUint24(input);
-        int lo = readUint24(input);
-        return ((long)(hi & 0xffffffffL) << 24) | (long)(lo & 0xffffffffL);
-    }
-
-    public static long readUint48(byte[] buf, int offset)
-    {
-        int hi = readUint24(buf, offset);
-        int lo = readUint24(buf, offset + 3);
-        return ((long)(hi & 0xffffffffL) << 24) | (long)(lo & 0xffffffffL);
-    }
-
-    public static byte[] readAllOrNothing(int length, InputStream input)
-        throws IOException
-    {
-        if (length < 1)
-        {
-            return EMPTY_BYTES;
-        }
-        byte[] buf = new byte[length];
-        int read = Streams.readFully(input, buf);
-        if (read == 0)
-        {
-            return null;
-        }
-        if (read != length)
-        {
-            throw new EOFException();
-        }
-        return buf;
-    }
-
-    public static byte[] readFully(int length, InputStream input)
-        throws IOException
-    {
-        if (length < 1)
-        {
-            return EMPTY_BYTES;
-        }
-        byte[] buf = new byte[length];
-        if (length != Streams.readFully(input, buf))
-        {
-            throw new EOFException();
-        }
-        return buf;
-    }
-
-    public static void readFully(byte[] buf, InputStream input)
-        throws IOException
-    {
-        int length = buf.length;
-        if (length > 0 && length != Streams.readFully(input, buf))
-        {
-            throw new EOFException();
-        }
-    }
-
-    public static byte[] readOpaque8(InputStream input)
-        throws IOException
-    {
-        short length = readUint8(input);
-        return readFully(length, input);
-    }
-
-    public static byte[] readOpaque16(InputStream input)
-        throws IOException
-    {
-        int length = readUint16(input);
-        return readFully(length, input);
-    }
-
-    public static byte[] readOpaque24(InputStream input)
-        throws IOException
-    {
-        int length = readUint24(input);
-        return readFully(length, input);
-    }
-
-    public static short[] readUint8Array(int count, InputStream input)
-        throws IOException
-    {
-        short[] uints = new short[count];
-        for (int i = 0; i < count; ++i)
-        {
-            uints[i] = readUint8(input);
-        }
-        return uints;
-    }
-
-    public static int[] readUint16Array(int count, InputStream input)
-        throws IOException
-    {
-        int[] uints = new int[count];
-        for (int i = 0; i < count; ++i)
-        {
-            uints[i] = readUint16(input);
-        }
-        return uints;
-    }
-
-    public static ProtocolVersion readVersion(byte[] buf, int offset)
-        throws IOException
-    {
-        return ProtocolVersion.get(buf[offset] & 0xFF, buf[offset + 1] & 0xFF);
-    }
-
-    public static ProtocolVersion readVersion(InputStream input)
-        throws IOException
-    {
-        int i1 = input.read();
-        int i2 = input.read();
-        if (i2 < 0)
-        {
-            throw new EOFException();
-        }
-        return ProtocolVersion.get(i1, i2);
-    }
-
-    public static int readVersionRaw(byte[] buf, int offset)
-        throws IOException
-    {
-        return (buf[offset] << 8) | buf[offset + 1];
-    }
-
-    public static int readVersionRaw(InputStream input)
-        throws IOException
-    {
-        int i1 = input.read();
-        int i2 = input.read();
-        if (i2 < 0)
-        {
-            throw new EOFException();
-        }
-        return (i1 << 8) | i2;
-    }
-
-    public static ASN1Primitive readASN1Object(byte[] encoding) throws IOException
-    {
-        ASN1InputStream asn1 = new ASN1InputStream(encoding);
-        ASN1Primitive result = asn1.readObject();
-        if (null == result)
-        {
-            throw new TlsFatalAlert(AlertDescription.decode_error);
-        }
-        if (null != asn1.readObject())
-        {
-            throw new TlsFatalAlert(AlertDescription.decode_error);
-        }
-        return result;
-    }
-
-    public static ASN1Primitive readDERObject(byte[] encoding) throws IOException
-    {
-        /*
-         * NOTE: The current ASN.1 parsing code can't enforce DER-only parsing, but since DER is
-         * canonical, we can check it by re-encoding the result and comparing to the original.
-         */
-        ASN1Primitive result = readASN1Object(encoding);
-        byte[] check = result.getEncoded(ASN1Encoding.DER);
-        if (!Arrays.areEqual(check, encoding))
-        {
-            throw new TlsFatalAlert(AlertDescription.decode_error);
-        }
-        return result;
-    }
-
-    public static void writeGMTUnixTime(byte[] buf, int offset)
-    {
-        int t = (int)(System.currentTimeMillis() / 1000L);
-        buf[offset] = (byte)(t >>> 24);
-        buf[offset + 1] = (byte)(t >>> 16);
-        buf[offset + 2] = (byte)(t >>> 8);
-        buf[offset + 3] = (byte)t;
-    }
-
-    public static void writeVersion(ProtocolVersion version, OutputStream output)
-        throws IOException
-    {
-        output.write(version.getMajorVersion());
-        output.write(version.getMinorVersion());
-    }
-
-    public static void writeVersion(ProtocolVersion version, byte[] buf, int offset)
-    {
-        buf[offset] = (byte)version.getMajorVersion();
-        buf[offset + 1] = (byte)version.getMinorVersion();
-    }
-
-    public static Vector getDefaultDSSSignatureAlgorithms()
-    {
-        return vectorOfOne(new SignatureAndHashAlgorithm(HashAlgorithm.sha1, SignatureAlgorithm.dsa));
-    }
-
-    public static Vector getDefaultECDSASignatureAlgorithms()
-    {
-        return vectorOfOne(new SignatureAndHashAlgorithm(HashAlgorithm.sha1, SignatureAlgorithm.ecdsa));
-    }
-
-    public static Vector getDefaultRSASignatureAlgorithms()
-    {
-        return vectorOfOne(new SignatureAndHashAlgorithm(HashAlgorithm.sha1, SignatureAlgorithm.rsa));
-    }
-
-    public static Vector getDefaultSupportedSignatureAlgorithms()
-    {
-        short[] hashAlgorithms = new short[]{ HashAlgorithm.sha1, HashAlgorithm.sha224, HashAlgorithm.sha256,
-            HashAlgorithm.sha384, HashAlgorithm.sha512 };
-        short[] signatureAlgorithms = new short[]{ SignatureAlgorithm.rsa, SignatureAlgorithm.dsa,
-            SignatureAlgorithm.ecdsa };
-
-        Vector result = new Vector();
-        for (int i = 0; i < signatureAlgorithms.length; ++i)
-        {
-            for (int j = 0; j < hashAlgorithms.length; ++j)
-            {
-                result.addElement(new SignatureAndHashAlgorithm(hashAlgorithms[j], signatureAlgorithms[i]));
-            }
-        }
-        return result;
-    }
-
-    public static SignatureAndHashAlgorithm getSignatureAndHashAlgorithm(TlsContext context,
-        TlsSignerCredentials signerCredentials)
-        throws IOException
-    {
-        SignatureAndHashAlgorithm signatureAndHashAlgorithm = null;
-        if (TlsUtils.isTLSv12(context))
-        {
-            signatureAndHashAlgorithm = signerCredentials.getSignatureAndHashAlgorithm();
-            if (signatureAndHashAlgorithm == null)
-            {
-                throw new TlsFatalAlert(AlertDescription.internal_error);
-            }
-        }
-        return signatureAndHashAlgorithm;
-    }
-
-    public static byte[] getExtensionData(Hashtable extensions, Integer extensionType)
-    {
-        return extensions == null ? null : (byte[])extensions.get(extensionType);
-    }
-
-    public static boolean hasExpectedEmptyExtensionData(Hashtable extensions, Integer extensionType,
-        short alertDescription) throws IOException
-    {
-        byte[] extension_data = getExtensionData(extensions, extensionType);
-        if (extension_data == null)
-        {
-            return false;
-        }
-        if (extension_data.length != 0)
-        {
-            throw new TlsFatalAlert(alertDescription);
-        }
-        return true;
-    }
-
-    public static TlsSession importSession(byte[] sessionID, SessionParameters sessionParameters)
-    {
-        return new TlsSessionImpl(sessionID, sessionParameters);
-    }
-
-    public static boolean isSignatureAlgorithmsExtensionAllowed(ProtocolVersion clientVersion)
-    {
-        return ProtocolVersion.TLSv12.isEqualOrEarlierVersionOf(clientVersion.getEquivalentTLSVersion());
-    }
-
-    /**
-     * Add a 'signature_algorithms' extension to existing extensions.
-     *
-     * @param extensions                   A {@link Hashtable} to add the extension to.
-     * @param supportedSignatureAlgorithms {@link Vector} containing at least 1 {@link SignatureAndHashAlgorithm}.
-     * @throws IOException
-     */
-    public static void addSignatureAlgorithmsExtension(Hashtable extensions, Vector supportedSignatureAlgorithms)
-        throws IOException
-    {
-        extensions.put(EXT_signature_algorithms, createSignatureAlgorithmsExtension(supportedSignatureAlgorithms));
-    }
-
-    /**
-     * Get a 'signature_algorithms' extension from extensions.
-     *
-     * @param extensions A {@link Hashtable} to get the extension from, if it is present.
-     * @return A {@link Vector} containing at least 1 {@link SignatureAndHashAlgorithm}, or null.
-     * @throws IOException
-     */
-    public static Vector getSignatureAlgorithmsExtension(Hashtable extensions)
-        throws IOException
-    {
-        byte[] extensionData = getExtensionData(extensions, EXT_signature_algorithms);
-        return extensionData == null ? null : readSignatureAlgorithmsExtension(extensionData);
-    }
-
-    /**
-     * Create a 'signature_algorithms' extension value.
-     *
-     * @param supportedSignatureAlgorithms A {@link Vector} containing at least 1 {@link SignatureAndHashAlgorithm}.
-     * @return A byte array suitable for use as an extension value.
-     * @throws IOException
-     */
-    public static byte[] createSignatureAlgorithmsExtension(Vector supportedSignatureAlgorithms)
-        throws IOException
-    {
-        ByteArrayOutputStream buf = new ByteArrayOutputStream();
-
-        // supported_signature_algorithms
-        encodeSupportedSignatureAlgorithms(supportedSignatureAlgorithms, false, buf);
-
-        return buf.toByteArray();
-    }
-
-    /**
-     * Read 'signature_algorithms' extension data.
-     *
-     * @param extensionData The extension data.
-     * @return A {@link Vector} containing at least 1 {@link SignatureAndHashAlgorithm}.
-     * @throws IOException
-     */
-    public static Vector readSignatureAlgorithmsExtension(byte[] extensionData)
-        throws IOException
-    {
-        if (extensionData == null)
-        {
-            throw new IllegalArgumentException("'extensionData' cannot be null");
-        }
-
-        ByteArrayInputStream buf = new ByteArrayInputStream(extensionData);
-
-        // supported_signature_algorithms
-        Vector supported_signature_algorithms = parseSupportedSignatureAlgorithms(false, buf);
-
-        TlsProtocol.assertEmpty(buf);
-
-        return supported_signature_algorithms;
-    }
-
-    public static void encodeSupportedSignatureAlgorithms(Vector supportedSignatureAlgorithms, boolean allowAnonymous,
-        OutputStream output) throws IOException
-    {
-        if (supportedSignatureAlgorithms == null || supportedSignatureAlgorithms.size() < 1
-            || supportedSignatureAlgorithms.size() >= (1 << 15))
-        {
-            throw new IllegalArgumentException(
-                "'supportedSignatureAlgorithms' must have length from 1 to (2^15 - 1)");
-        }
-
-        // supported_signature_algorithms
-        int length = 2 * supportedSignatureAlgorithms.size();
-        checkUint16(length);
-        writeUint16(length, output);
-        for (int i = 0; i < supportedSignatureAlgorithms.size(); ++i)
-        {
-            SignatureAndHashAlgorithm entry = (SignatureAndHashAlgorithm)supportedSignatureAlgorithms.elementAt(i);
-            if (!allowAnonymous && entry.getSignature() == SignatureAlgorithm.anonymous)
-            {
-                /*
-                 * RFC 5246 7.4.1.4.1 The "anonymous" value is meaningless in this context but used
-                 * in Section 7.4.3. It MUST NOT appear in this extension.
-                 */
-                throw new IllegalArgumentException(
-                    "SignatureAlgorithm.anonymous MUST NOT appear in the signature_algorithms extension");
-            }
-            entry.encode(output);
-        }
-    }
-
-    public static Vector parseSupportedSignatureAlgorithms(boolean allowAnonymous, InputStream input)
-        throws IOException
-    {
-        // supported_signature_algorithms
-        int length = readUint16(input);
-        if (length < 2 || (length & 1) != 0)
-        {
-            throw new TlsFatalAlert(AlertDescription.decode_error);
-        }
-        int count = length / 2;
-        Vector supportedSignatureAlgorithms = new Vector(count);
-        for (int i = 0; i < count; ++i)
-        {
-            SignatureAndHashAlgorithm entry = SignatureAndHashAlgorithm.parse(input);
-            if (!allowAnonymous && entry.getSignature() == SignatureAlgorithm.anonymous)
-            {
-                /*
-                 * RFC 5246 7.4.1.4.1 The "anonymous" value is meaningless in this context but used
-                 * in Section 7.4.3. It MUST NOT appear in this extension.
-                 */
-                throw new TlsFatalAlert(AlertDescription.illegal_parameter);
-            }
-            supportedSignatureAlgorithms.addElement(entry);
-        }
-        return supportedSignatureAlgorithms;
-    }
-
-    public static byte[] PRF(TlsContext context, byte[] secret, String asciiLabel, byte[] seed, int size)
-    {
-        ProtocolVersion version = context.getServerVersion();
-
-        if (version.isSSL())
-        {
-            throw new IllegalStateException("No PRF available for SSLv3 session");
-        }
-
-        byte[] label = Strings.toByteArray(asciiLabel);
-        byte[] labelSeed = concat(label, seed);
-
-        int prfAlgorithm = context.getSecurityParameters().getPrfAlgorithm();
-
-        if (prfAlgorithm == PRFAlgorithm.tls_prf_legacy)
-        {
-            return PRF_legacy(secret, label, labelSeed, size);
-        }
-
-        Digest prfDigest = createPRFHash(prfAlgorithm);
-        byte[] buf = new byte[size];
-        hmac_hash(prfDigest, secret, labelSeed, buf);
-        return buf;
-    }
-
-    public static byte[] PRF_legacy(byte[] secret, String asciiLabel, byte[] seed, int size)
-    {
-        byte[] label = Strings.toByteArray(asciiLabel);
-        byte[] labelSeed = concat(label, seed);
-
-        return PRF_legacy(secret, label, labelSeed, size);
-    }
-
-    static byte[] PRF_legacy(byte[] secret, byte[] label, byte[] labelSeed, int size)
-    {
-        int s_half = (secret.length + 1) / 2;
-        byte[] s1 = new byte[s_half];
-        byte[] s2 = new byte[s_half];
-        System.arraycopy(secret, 0, s1, 0, s_half);
-        System.arraycopy(secret, secret.length - s_half, s2, 0, s_half);
-
-        byte[] b1 = new byte[size];
-        byte[] b2 = new byte[size];
-        hmac_hash(createHash(HashAlgorithm.md5), s1, labelSeed, b1);
-        hmac_hash(createHash(HashAlgorithm.sha1), s2, labelSeed, b2);
-        for (int i = 0; i < size; i++)
-        {
-            b1[i] ^= b2[i];
-        }
-        return b1;
-    }
-
-    static byte[] concat(byte[] a, byte[] b)
-    {
-        byte[] c = new byte[a.length + b.length];
-        System.arraycopy(a, 0, c, 0, a.length);
-        System.arraycopy(b, 0, c, a.length, b.length);
-        return c;
-    }
-
-    static void hmac_hash(Digest digest, byte[] secret, byte[] seed, byte[] out)
-    {
-        HMac mac = new HMac(digest);
-        mac.init(new KeyParameter(secret));
-        byte[] a = seed;
-        int size = digest.getDigestSize();
-        int iterations = (out.length + size - 1) / size;
-        byte[] buf = new byte[mac.getMacSize()];
-        byte[] buf2 = new byte[mac.getMacSize()];
-        for (int i = 0; i < iterations; i++)
-        {
-            mac.update(a, 0, a.length);
-            mac.doFinal(buf, 0);
-            a = buf;
-            mac.update(a, 0, a.length);
-            mac.update(seed, 0, seed.length);
-            mac.doFinal(buf2, 0);
-            System.arraycopy(buf2, 0, out, (size * i), Math.min(size, out.length - (size * i)));
-        }
-    }
-
-    static void validateKeyUsage(org.bouncycastle.asn1.x509.Certificate c, int keyUsageBits)
-        throws IOException
-    {
-        Extensions exts = c.getTBSCertificate().getExtensions();
-        if (exts != null)
-        {
-            KeyUsage ku = KeyUsage.fromExtensions(exts);
-            if (ku != null)
-            {
-                int bits = ku.getBytes()[0] & 0xff;
-                if ((bits & keyUsageBits) != keyUsageBits)
-                {
-                    throw new TlsFatalAlert(AlertDescription.certificate_unknown);
-                }
-            }
-        }
-    }
-
-    static byte[] calculateKeyBlock(TlsContext context, int size)
-    {
-        SecurityParameters securityParameters = context.getSecurityParameters();
-        byte[] master_secret = securityParameters.getMasterSecret();
-        byte[] seed = concat(securityParameters.getServerRandom(),
-            securityParameters.getClientRandom());
-
-        if (isSSL(context))
-        {
-            return calculateKeyBlock_SSL(master_secret, seed, size);
-        }
-
-        return PRF(context, master_secret, ExporterLabel.key_expansion, seed, size);
-    }
-
-    static byte[] calculateKeyBlock_SSL(byte[] master_secret, byte[] random, int size)
-    {
-        Digest md5 = createHash(HashAlgorithm.md5);
-        Digest sha1 = createHash(HashAlgorithm.sha1);
-        int md5Size = md5.getDigestSize();
-        byte[] shatmp = new byte[sha1.getDigestSize()];
-        byte[] tmp = new byte[size + md5Size];
-
-        int i = 0, pos = 0;
-        while (pos < size)
-        {
-            byte[] ssl3Const = SSL3_CONST[i];
-
-            sha1.update(ssl3Const, 0, ssl3Const.length);
-            sha1.update(master_secret, 0, master_secret.length);
-            sha1.update(random, 0, random.length);
-            sha1.doFinal(shatmp, 0);
-
-            md5.update(master_secret, 0, master_secret.length);
-            md5.update(shatmp, 0, shatmp.length);
-            md5.doFinal(tmp, pos);
-
-            pos += md5Size;
-            ++i;
-        }
-
-        return Arrays.copyOfRange(tmp, 0, size);
-    }
-
-    static byte[] calculateMasterSecret(TlsContext context, byte[] pre_master_secret)
-    {
-        SecurityParameters securityParameters = context.getSecurityParameters();
-
-        byte[] seed;
-        if (securityParameters.extendedMasterSecret)
-        {
-            seed = securityParameters.getSessionHash();
-        }
-        else
-        {
-            seed = concat(securityParameters.getClientRandom(), securityParameters.getServerRandom());
-        }
-
-        if (isSSL(context))
-        {
-            return calculateMasterSecret_SSL(pre_master_secret, seed);
-        }
-
-        String asciiLabel = securityParameters.extendedMasterSecret
-            ?   ExporterLabel.extended_master_secret
-            :   ExporterLabel.master_secret;
-
-        return PRF(context, pre_master_secret, asciiLabel, seed, 48);
-    }
-
-    static byte[] calculateMasterSecret_SSL(byte[] pre_master_secret, byte[] random)
-    {
-        Digest md5 = createHash(HashAlgorithm.md5);
-        Digest sha1 = createHash(HashAlgorithm.sha1);
-        int md5Size = md5.getDigestSize();
-        byte[] shatmp = new byte[sha1.getDigestSize()];
-
-        byte[] rval = new byte[md5Size * 3];
-        int pos = 0;
-
-        for (int i = 0; i < 3; ++i)
-        {
-            byte[] ssl3Const = SSL3_CONST[i];
-
-            sha1.update(ssl3Const, 0, ssl3Const.length);
-            sha1.update(pre_master_secret, 0, pre_master_secret.length);
-            sha1.update(random, 0, random.length);
-            sha1.doFinal(shatmp, 0);
-
-            md5.update(pre_master_secret, 0, pre_master_secret.length);
-            md5.update(shatmp, 0, shatmp.length);
-            md5.doFinal(rval, pos);
-
-            pos += md5Size;
-        }
-
-        return rval;
-    }
-
-    static byte[] calculateVerifyData(TlsContext context, String asciiLabel, byte[] handshakeHash)
-    {
-        if (isSSL(context))
-        {
-            return handshakeHash;
-        }
-
-        SecurityParameters securityParameters = context.getSecurityParameters();
-        byte[] master_secret = securityParameters.getMasterSecret();
-        int verify_data_length = securityParameters.getVerifyDataLength();
-
-        return PRF(context, master_secret, asciiLabel, handshakeHash, verify_data_length);
-    }
-
-    public static Digest createHash(short hashAlgorithm)
-    {
-        switch (hashAlgorithm)
-        {
-        case HashAlgorithm.md5:
-            return new MD5Digest();
-        case HashAlgorithm.sha1:
-            return new SHA1Digest();
-        case HashAlgorithm.sha224:
-            return new SHA224Digest();
-        case HashAlgorithm.sha256:
-            return new SHA256Digest();
-        case HashAlgorithm.sha384:
-            return new SHA384Digest();
-        case HashAlgorithm.sha512:
-            return new SHA512Digest();
-        default:
-            throw new IllegalArgumentException("unknown HashAlgorithm");
-        }
-    }
-
-    public static Digest createHash(SignatureAndHashAlgorithm signatureAndHashAlgorithm)
-    {
-        return signatureAndHashAlgorithm == null
-            ?   new CombinedHash()
-            :   createHash(signatureAndHashAlgorithm.getHash());
-    }
-
-    public static Digest cloneHash(short hashAlgorithm, Digest hash)
-    {
-        switch (hashAlgorithm)
-        {
-        case HashAlgorithm.md5:
-            return new MD5Digest((MD5Digest)hash);
-        case HashAlgorithm.sha1:
-            return new SHA1Digest((SHA1Digest)hash);
-        case HashAlgorithm.sha224:
-            return new SHA224Digest((SHA224Digest)hash);
-        case HashAlgorithm.sha256:
-            return new SHA256Digest((SHA256Digest)hash);
-        case HashAlgorithm.sha384:
-            return new SHA384Digest((SHA384Digest)hash);
-        case HashAlgorithm.sha512:
-            return new SHA512Digest((SHA512Digest)hash);
-        default:
-            throw new IllegalArgumentException("unknown HashAlgorithm");
-        }
-    }
-
-    public static Digest createPRFHash(int prfAlgorithm)
-    {
-        switch (prfAlgorithm)
-        {
-        case PRFAlgorithm.tls_prf_legacy:
-            return new CombinedHash();
-        default:
-            return createHash(getHashAlgorithmForPRFAlgorithm(prfAlgorithm));
-        }
-    }
-
-    public static Digest clonePRFHash(int prfAlgorithm, Digest hash)
-    {
-        switch (prfAlgorithm)
-        {
-        case PRFAlgorithm.tls_prf_legacy:
-            return new CombinedHash((CombinedHash)hash);
-        default:
-            return cloneHash(getHashAlgorithmForPRFAlgorithm(prfAlgorithm), hash);
-        }
-    }
-
-    public static short getHashAlgorithmForPRFAlgorithm(int prfAlgorithm)
-    {
-        switch (prfAlgorithm)
-        {
-        case PRFAlgorithm.tls_prf_legacy:
-            throw new IllegalArgumentException("legacy PRF not a valid algorithm");
-        case PRFAlgorithm.tls_prf_sha256:
-            return HashAlgorithm.sha256;
-        case PRFAlgorithm.tls_prf_sha384:
-            return HashAlgorithm.sha384;
-        default:
-            throw new IllegalArgumentException("unknown PRFAlgorithm");
-        }
-    }
-
-    public static ASN1ObjectIdentifier getOIDForHashAlgorithm(short hashAlgorithm)
-    {
-        switch (hashAlgorithm)
-        {
-        case HashAlgorithm.md5:
-            return PKCSObjectIdentifiers.md5;
-        case HashAlgorithm.sha1:
-            return X509ObjectIdentifiers.id_SHA1;
-        case HashAlgorithm.sha224:
-            return NISTObjectIdentifiers.id_sha224;
-        case HashAlgorithm.sha256:
-            return NISTObjectIdentifiers.id_sha256;
-        case HashAlgorithm.sha384:
-            return NISTObjectIdentifiers.id_sha384;
-        case HashAlgorithm.sha512:
-            return NISTObjectIdentifiers.id_sha512;
-        default:
-            throw new IllegalArgumentException("unknown HashAlgorithm");
-        }
-    }
-
-    static short getClientCertificateType(Certificate clientCertificate, Certificate serverCertificate)
-        throws IOException
-    {
-        if (clientCertificate.isEmpty())
-        {
-            return -1;
-        }
-
-        org.bouncycastle.asn1.x509.Certificate x509Cert = clientCertificate.getCertificateAt(0);
-        SubjectPublicKeyInfo keyInfo = x509Cert.getSubjectPublicKeyInfo();
-        try
-        {
-            AsymmetricKeyParameter publicKey = PublicKeyFactory.createKey(keyInfo);
-            if (publicKey.isPrivate())
-            {
-                throw new TlsFatalAlert(AlertDescription.internal_error);
-            }
-
-            /*
-             * TODO RFC 5246 7.4.6. The certificates MUST be signed using an acceptable hash/
-             * signature algorithm pair, as described in Section 7.4.4. Note that this relaxes the
-             * constraints on certificate-signing algorithms found in prior versions of TLS.
-             */
-
-            /*
-             * RFC 5246 7.4.6. Client Certificate
-             */
-
-            /*
-             * RSA public key; the certificate MUST allow the key to be used for signing with the
-             * signature scheme and hash algorithm that will be employed in the certificate verify
-             * message.
-             */
-            if (publicKey instanceof RSAKeyParameters)
-            {
-                validateKeyUsage(x509Cert, KeyUsage.digitalSignature);
-                return ClientCertificateType.rsa_sign;
-            }
-
-            /*
-             * DSA public key; the certificate MUST allow the key to be used for signing with the
-             * hash algorithm that will be employed in the certificate verify message.
-             */
-            if (publicKey instanceof DSAPublicKeyParameters)
-            {
-                validateKeyUsage(x509Cert, KeyUsage.digitalSignature);
-                return ClientCertificateType.dss_sign;
-            }
-
-            /*
-             * ECDSA-capable public key; the certificate MUST allow the key to be used for signing
-             * with the hash algorithm that will be employed in the certificate verify message; the
-             * public key MUST use a curve and point format supported by the server.
-             */
-            if (publicKey instanceof ECPublicKeyParameters)
-            {
-                validateKeyUsage(x509Cert, KeyUsage.digitalSignature);
-                // TODO Check the curve and point format
-                return ClientCertificateType.ecdsa_sign;
-            }
-
-            // TODO Add support for ClientCertificateType.*_fixed_*
-
-            throw new TlsFatalAlert(AlertDescription.unsupported_certificate);
-        }
-        catch (Exception e)
-        {
-            throw new TlsFatalAlert(AlertDescription.unsupported_certificate, e);
-        }
-    }
-
-    static void trackHashAlgorithms(TlsHandshakeHash handshakeHash, Vector supportedSignatureAlgorithms)
-    {
-        if (supportedSignatureAlgorithms != null)
-        {
-            for (int i = 0; i < supportedSignatureAlgorithms.size(); ++i)
-            {
-                SignatureAndHashAlgorithm signatureAndHashAlgorithm = (SignatureAndHashAlgorithm)
-                    supportedSignatureAlgorithms.elementAt(i);
-                short hashAlgorithm = signatureAndHashAlgorithm.getHash();
-                handshakeHash.trackHashAlgorithm(hashAlgorithm);
-            }
-        }
-    }
-
-    public static boolean hasSigningCapability(short clientCertificateType)
-    {
-        switch (clientCertificateType)
-        {
-        case ClientCertificateType.dss_sign:
-        case ClientCertificateType.ecdsa_sign:
-        case ClientCertificateType.rsa_sign:
-            return true;
-        default:
-            return false;
-        }
-    }
-
-    public static TlsSigner createTlsSigner(short clientCertificateType)
-    {
-        switch (clientCertificateType)
-        {
-        case ClientCertificateType.dss_sign:
-            return new TlsDSSSigner();
-        case ClientCertificateType.ecdsa_sign:
-            return new TlsECDSASigner();
-        case ClientCertificateType.rsa_sign:
-            return new TlsRSASigner();
-        default:
-            throw new IllegalArgumentException("'clientCertificateType' is not a type with signing capability");
-        }
-    }
-
-    static final byte[] SSL_CLIENT = {0x43, 0x4C, 0x4E, 0x54};
-    static final byte[] SSL_SERVER = {0x53, 0x52, 0x56, 0x52};
-
-    // SSL3 magic mix constants ("A", "BB", "CCC", ...)
-    static final byte[][] SSL3_CONST = genSSL3Const();
-
-    private static byte[][] genSSL3Const()
-    {
-        int n = 10;
-        byte[][] arr = new byte[n][];
-        for (int i = 0; i < n; i++)
-        {
-            byte[] b = new byte[i + 1];
-            Arrays.fill(b, (byte)('A' + i));
-            arr[i] = b;
-        }
-        return arr;
-    }
-
-    private static Vector vectorOfOne(Object obj)
-    {
-        Vector v = new Vector(1);
-        v.addElement(obj);
-        return v;
-    }
-
-    public static int getCipherType(int ciphersuite) throws IOException
-    {
-        switch (getEncryptionAlgorithm(ciphersuite))
-        {
-        case EncryptionAlgorithm.AES_128_GCM:
-        case EncryptionAlgorithm.AES_256_GCM:
-        case EncryptionAlgorithm.AES_128_CCM:
-        case EncryptionAlgorithm.AES_128_CCM_8:
-        case EncryptionAlgorithm.AES_256_CCM:
-        case EncryptionAlgorithm.AES_256_CCM_8:
-        case EncryptionAlgorithm.CAMELLIA_128_GCM:
-        case EncryptionAlgorithm.CAMELLIA_256_GCM:
-        case EncryptionAlgorithm.AEAD_CHACHA20_POLY1305:
-            return CipherType.aead;
-
-        case EncryptionAlgorithm.RC2_CBC_40:
-        case EncryptionAlgorithm.IDEA_CBC:
-        case EncryptionAlgorithm.DES40_CBC:
-        case EncryptionAlgorithm.DES_CBC:
-        case EncryptionAlgorithm._3DES_EDE_CBC:
-        case EncryptionAlgorithm.AES_128_CBC:
-        case EncryptionAlgorithm.AES_256_CBC:
-        case EncryptionAlgorithm.CAMELLIA_128_CBC:
-        case EncryptionAlgorithm.CAMELLIA_256_CBC:
-        case EncryptionAlgorithm.SEED_CBC:
-            return CipherType.block;
-
-        case EncryptionAlgorithm.RC4_40:
-        case EncryptionAlgorithm.RC4_128:
-        case EncryptionAlgorithm.ESTREAM_SALSA20:
-        case EncryptionAlgorithm.SALSA20:
-            return CipherType.stream;
-
-        default:
-            throw new TlsFatalAlert(AlertDescription.internal_error);
-        }
-    }
-
-    public static int getEncryptionAlgorithm(int ciphersuite) throws IOException
-    {
-        switch (ciphersuite)
-        {
-        case CipherSuite.TLS_DH_DSS_WITH_3DES_EDE_CBC_SHA:
-        case CipherSuite.TLS_DH_RSA_WITH_3DES_EDE_CBC_SHA:
-        case CipherSuite.TLS_DHE_DSS_WITH_3DES_EDE_CBC_SHA:
-        case CipherSuite.TLS_DHE_PSK_WITH_3DES_EDE_CBC_SHA:
-        case CipherSuite.TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA:
-        case CipherSuite.TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA:
-        case CipherSuite.TLS_ECDH_RSA_WITH_3DES_EDE_CBC_SHA:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_3DES_EDE_CBC_SHA:
-        case CipherSuite.TLS_ECDHE_PSK_WITH_3DES_EDE_CBC_SHA:
-        case CipherSuite.TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA:
-        case CipherSuite.TLS_PSK_WITH_3DES_EDE_CBC_SHA:
-        case CipherSuite.TLS_RSA_PSK_WITH_3DES_EDE_CBC_SHA:
-        case CipherSuite.TLS_RSA_WITH_3DES_EDE_CBC_SHA:
-        case CipherSuite.TLS_SRP_SHA_DSS_WITH_3DES_EDE_CBC_SHA:
-        case CipherSuite.TLS_SRP_SHA_RSA_WITH_3DES_EDE_CBC_SHA:
-        case CipherSuite.TLS_SRP_SHA_WITH_3DES_EDE_CBC_SHA:
-            return EncryptionAlgorithm._3DES_EDE_CBC;
-
-        case CipherSuite.TLS_DHE_RSA_WITH_CHACHA20_POLY1305_SHA256:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256:
-        case CipherSuite.TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256:
-            return EncryptionAlgorithm.AEAD_CHACHA20_POLY1305;
-
-        case CipherSuite.TLS_DH_DSS_WITH_AES_128_CBC_SHA:
-        case CipherSuite.TLS_DH_RSA_WITH_AES_128_CBC_SHA:
-        case CipherSuite.TLS_DHE_DSS_WITH_AES_128_CBC_SHA:
-        case CipherSuite.TLS_DHE_PSK_WITH_AES_128_CBC_SHA:
-        case CipherSuite.TLS_DHE_RSA_WITH_AES_128_CBC_SHA:
-        case CipherSuite.TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA:
-        case CipherSuite.TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA:
-        case CipherSuite.TLS_ECDH_RSA_WITH_AES_128_CBC_SHA:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA:
-        case CipherSuite.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA:
-        case CipherSuite.TLS_PSK_WITH_AES_128_CBC_SHA:
-        case CipherSuite.TLS_RSA_PSK_WITH_AES_128_CBC_SHA:
-        case CipherSuite.TLS_RSA_WITH_AES_128_CBC_SHA:
-        case CipherSuite.TLS_SRP_SHA_DSS_WITH_AES_128_CBC_SHA:
-        case CipherSuite.TLS_SRP_SHA_RSA_WITH_AES_128_CBC_SHA:
-        case CipherSuite.TLS_SRP_SHA_WITH_AES_128_CBC_SHA:
-            return EncryptionAlgorithm.AES_128_CBC;
-
-        case CipherSuite.TLS_DH_DSS_WITH_AES_128_CBC_SHA256:
-        case CipherSuite.TLS_DH_RSA_WITH_AES_128_CBC_SHA256:
-        case CipherSuite.TLS_DHE_DSS_WITH_AES_128_CBC_SHA256:
-        case CipherSuite.TLS_DHE_PSK_WITH_AES_128_CBC_SHA256:
-        case CipherSuite.TLS_DHE_RSA_WITH_AES_128_CBC_SHA256:
-        case CipherSuite.TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA256:
-        case CipherSuite.TLS_ECDH_RSA_WITH_AES_128_CBC_SHA256:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256:
-        case CipherSuite.TLS_ECDHE_PSK_WITH_AES_128_CBC_SHA256:
-        case CipherSuite.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256:
-        case CipherSuite.TLS_PSK_WITH_AES_128_CBC_SHA256:
-        case CipherSuite.TLS_RSA_PSK_WITH_AES_128_CBC_SHA256:
-        case CipherSuite.TLS_RSA_WITH_AES_128_CBC_SHA256:
-            return EncryptionAlgorithm.AES_128_CBC;
-
-        case CipherSuite.TLS_DHE_PSK_WITH_AES_128_CCM:
-        case CipherSuite.TLS_DHE_RSA_WITH_AES_128_CCM:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_AES_128_CCM:
-        case CipherSuite.TLS_PSK_WITH_AES_128_CCM:
-        case CipherSuite.TLS_RSA_WITH_AES_128_CCM:
-            return EncryptionAlgorithm.AES_128_CCM;
-
-        case CipherSuite.TLS_DHE_RSA_WITH_AES_128_CCM_8:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_AES_128_CCM_8:
-        case CipherSuite.TLS_PSK_DHE_WITH_AES_128_CCM_8:
-        case CipherSuite.TLS_PSK_WITH_AES_128_CCM_8:
-        case CipherSuite.TLS_RSA_WITH_AES_128_CCM_8:
-            return EncryptionAlgorithm.AES_128_CCM_8;
-
-        case CipherSuite.TLS_DH_DSS_WITH_AES_128_GCM_SHA256:
-        case CipherSuite.TLS_DH_RSA_WITH_AES_128_GCM_SHA256:
-        case CipherSuite.TLS_DHE_DSS_WITH_AES_128_GCM_SHA256:
-        case CipherSuite.TLS_DHE_PSK_WITH_AES_128_GCM_SHA256:
-        case CipherSuite.TLS_DHE_RSA_WITH_AES_128_GCM_SHA256:
-        case CipherSuite.TLS_ECDH_ECDSA_WITH_AES_128_GCM_SHA256:
-        case CipherSuite.TLS_ECDH_RSA_WITH_AES_128_GCM_SHA256:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256:
-        case CipherSuite.TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256:
-        case CipherSuite.TLS_PSK_WITH_AES_128_GCM_SHA256:
-        case CipherSuite.TLS_RSA_PSK_WITH_AES_128_GCM_SHA256:
-        case CipherSuite.TLS_RSA_WITH_AES_128_GCM_SHA256:
-            return EncryptionAlgorithm.AES_128_GCM;
-
-        case CipherSuite.TLS_DH_DSS_WITH_AES_256_CBC_SHA:
-        case CipherSuite.TLS_DH_RSA_WITH_AES_256_CBC_SHA:
-        case CipherSuite.TLS_DHE_DSS_WITH_AES_256_CBC_SHA:
-        case CipherSuite.TLS_DHE_PSK_WITH_AES_256_CBC_SHA:
-        case CipherSuite.TLS_DHE_RSA_WITH_AES_256_CBC_SHA:
-        case CipherSuite.TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA:
-        case CipherSuite.TLS_ECDH_RSA_WITH_AES_256_CBC_SHA:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA:
-        case CipherSuite.TLS_ECDHE_PSK_WITH_AES_256_CBC_SHA:
-        case CipherSuite.TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA:
-        case CipherSuite.TLS_PSK_WITH_AES_256_CBC_SHA:
-        case CipherSuite.TLS_RSA_PSK_WITH_AES_256_CBC_SHA:
-        case CipherSuite.TLS_RSA_WITH_AES_256_CBC_SHA:
-        case CipherSuite.TLS_SRP_SHA_DSS_WITH_AES_256_CBC_SHA:
-        case CipherSuite.TLS_SRP_SHA_RSA_WITH_AES_256_CBC_SHA:
-        case CipherSuite.TLS_SRP_SHA_WITH_AES_256_CBC_SHA:
-            return EncryptionAlgorithm.AES_256_CBC;
-
-        case CipherSuite.TLS_DH_DSS_WITH_AES_256_CBC_SHA256:
-        case CipherSuite.TLS_DH_RSA_WITH_AES_256_CBC_SHA256:
-        case CipherSuite.TLS_DHE_DSS_WITH_AES_256_CBC_SHA256:
-        case CipherSuite.TLS_DHE_RSA_WITH_AES_256_CBC_SHA256:
-        case CipherSuite.TLS_RSA_WITH_AES_256_CBC_SHA256:
-            return EncryptionAlgorithm.AES_256_CBC;
-
-        case CipherSuite.TLS_DHE_PSK_WITH_AES_256_CBC_SHA384:
-        case CipherSuite.TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA384:
-        case CipherSuite.TLS_ECDH_RSA_WITH_AES_256_CBC_SHA384:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384:
-        case CipherSuite.TLS_ECDHE_PSK_WITH_AES_256_CBC_SHA384:
-        case CipherSuite.TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384:
-        case CipherSuite.TLS_PSK_WITH_AES_256_CBC_SHA384:
-        case CipherSuite.TLS_RSA_PSK_WITH_AES_256_CBC_SHA384:
-            return EncryptionAlgorithm.AES_256_CBC;
-
-        case CipherSuite.TLS_DHE_PSK_WITH_AES_256_CCM:
-        case CipherSuite.TLS_DHE_RSA_WITH_AES_256_CCM:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_AES_256_CCM:
-        case CipherSuite.TLS_PSK_WITH_AES_256_CCM:
-        case CipherSuite.TLS_RSA_WITH_AES_256_CCM:
-            return EncryptionAlgorithm.AES_256_CCM;
-
-        case CipherSuite.TLS_DHE_RSA_WITH_AES_256_CCM_8:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_AES_256_CCM_8:
-        case CipherSuite.TLS_PSK_DHE_WITH_AES_256_CCM_8:
-        case CipherSuite.TLS_PSK_WITH_AES_256_CCM_8:
-        case CipherSuite.TLS_RSA_WITH_AES_256_CCM_8:
-            return EncryptionAlgorithm.AES_256_CCM_8;
-
-        case CipherSuite.TLS_DH_DSS_WITH_AES_256_GCM_SHA384:
-        case CipherSuite.TLS_DH_RSA_WITH_AES_256_GCM_SHA384:
-        case CipherSuite.TLS_DHE_DSS_WITH_AES_256_GCM_SHA384:
-        case CipherSuite.TLS_DHE_PSK_WITH_AES_256_GCM_SHA384:
-        case CipherSuite.TLS_DHE_RSA_WITH_AES_256_GCM_SHA384:
-        case CipherSuite.TLS_ECDH_ECDSA_WITH_AES_256_GCM_SHA384:
-        case CipherSuite.TLS_ECDH_RSA_WITH_AES_256_GCM_SHA384:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384:
-        case CipherSuite.TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384:
-        case CipherSuite.TLS_PSK_WITH_AES_256_GCM_SHA384:
-        case CipherSuite.TLS_RSA_PSK_WITH_AES_256_GCM_SHA384:
-        case CipherSuite.TLS_RSA_WITH_AES_256_GCM_SHA384:
-            return EncryptionAlgorithm.AES_256_GCM;
-
-        case CipherSuite.TLS_DH_DSS_WITH_CAMELLIA_128_CBC_SHA:
-        case CipherSuite.TLS_DH_RSA_WITH_CAMELLIA_128_CBC_SHA:
-        case CipherSuite.TLS_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA:
-        case CipherSuite.TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA:
-        case CipherSuite.TLS_RSA_WITH_CAMELLIA_128_CBC_SHA:
-            return EncryptionAlgorithm.CAMELLIA_128_CBC;
-
-        case CipherSuite.TLS_DH_DSS_WITH_CAMELLIA_128_CBC_SHA256:
-        case CipherSuite.TLS_DH_RSA_WITH_CAMELLIA_128_CBC_SHA256:
-        case CipherSuite.TLS_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA256:
-        case CipherSuite.TLS_DHE_PSK_WITH_CAMELLIA_128_CBC_SHA256:
-        case CipherSuite.TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA256:
-        case CipherSuite.TLS_ECDH_ECDSA_WITH_CAMELLIA_128_CBC_SHA256:
-        case CipherSuite.TLS_ECDH_RSA_WITH_CAMELLIA_128_CBC_SHA256:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_CAMELLIA_128_CBC_SHA256:
-        case CipherSuite.TLS_ECDHE_PSK_WITH_CAMELLIA_128_CBC_SHA256:
-        case CipherSuite.TLS_ECDHE_RSA_WITH_CAMELLIA_128_CBC_SHA256:
-        case CipherSuite.TLS_PSK_WITH_CAMELLIA_128_CBC_SHA256:
-        case CipherSuite.TLS_RSA_PSK_WITH_CAMELLIA_128_CBC_SHA256:
-        case CipherSuite.TLS_RSA_WITH_CAMELLIA_128_CBC_SHA256:
-            return EncryptionAlgorithm.CAMELLIA_128_CBC;
-
-        case CipherSuite.TLS_DH_DSS_WITH_CAMELLIA_128_GCM_SHA256:
-        case CipherSuite.TLS_DH_RSA_WITH_CAMELLIA_128_GCM_SHA256:
-        case CipherSuite.TLS_DHE_DSS_WITH_CAMELLIA_128_GCM_SHA256:
-        case CipherSuite.TLS_DHE_PSK_WITH_CAMELLIA_128_GCM_SHA256:
-        case CipherSuite.TLS_DHE_RSA_WITH_CAMELLIA_128_GCM_SHA256:
-        case CipherSuite.TLS_ECDH_ECDSA_WITH_CAMELLIA_128_GCM_SHA256:
-        case CipherSuite.TLS_ECDH_RSA_WITH_CAMELLIA_128_GCM_SHA256:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_CAMELLIA_128_GCM_SHA256:
-        case CipherSuite.TLS_ECDHE_RSA_WITH_CAMELLIA_128_GCM_SHA256:
-        case CipherSuite.TLS_PSK_WITH_CAMELLIA_128_GCM_SHA256:
-        case CipherSuite.TLS_RSA_PSK_WITH_CAMELLIA_128_GCM_SHA256:
-        case CipherSuite.TLS_RSA_WITH_CAMELLIA_128_GCM_SHA256:
-            return EncryptionAlgorithm.CAMELLIA_128_GCM;
-
-        case CipherSuite.TLS_DH_DSS_WITH_CAMELLIA_256_CBC_SHA:
-        case CipherSuite.TLS_DH_RSA_WITH_CAMELLIA_256_CBC_SHA:
-        case CipherSuite.TLS_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA:
-        case CipherSuite.TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA:
-        case CipherSuite.TLS_RSA_WITH_CAMELLIA_256_CBC_SHA:
-            return EncryptionAlgorithm.CAMELLIA_256_CBC;
-
-        case CipherSuite.TLS_DH_DSS_WITH_CAMELLIA_256_CBC_SHA256:
-        case CipherSuite.TLS_DH_RSA_WITH_CAMELLIA_256_CBC_SHA256:
-        case CipherSuite.TLS_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA256:
-        case CipherSuite.TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA256:
-        case CipherSuite.TLS_RSA_WITH_CAMELLIA_256_CBC_SHA256:
-            return EncryptionAlgorithm.CAMELLIA_256_CBC;
-
-        case CipherSuite.TLS_DHE_PSK_WITH_CAMELLIA_256_CBC_SHA384:
-        case CipherSuite.TLS_ECDH_ECDSA_WITH_CAMELLIA_256_CBC_SHA384:
-        case CipherSuite.TLS_ECDH_RSA_WITH_CAMELLIA_256_CBC_SHA384:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_CAMELLIA_256_CBC_SHA384:
-        case CipherSuite.TLS_ECDHE_PSK_WITH_CAMELLIA_256_CBC_SHA384:
-        case CipherSuite.TLS_ECDHE_RSA_WITH_CAMELLIA_256_CBC_SHA384:
-        case CipherSuite.TLS_PSK_WITH_CAMELLIA_256_CBC_SHA384:
-        case CipherSuite.TLS_RSA_PSK_WITH_CAMELLIA_256_CBC_SHA384:
-            return EncryptionAlgorithm.CAMELLIA_256_CBC;
-
-        case CipherSuite.TLS_DH_DSS_WITH_CAMELLIA_256_GCM_SHA384:
-        case CipherSuite.TLS_DH_RSA_WITH_CAMELLIA_256_GCM_SHA384:
-        case CipherSuite.TLS_DHE_DSS_WITH_CAMELLIA_256_GCM_SHA384:
-        case CipherSuite.TLS_DHE_PSK_WITH_CAMELLIA_256_GCM_SHA384:
-        case CipherSuite.TLS_DHE_RSA_WITH_CAMELLIA_256_GCM_SHA384:
-        case CipherSuite.TLS_ECDH_ECDSA_WITH_CAMELLIA_256_GCM_SHA384:
-        case CipherSuite.TLS_ECDH_RSA_WITH_CAMELLIA_256_GCM_SHA384:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_CAMELLIA_256_GCM_SHA384:
-        case CipherSuite.TLS_ECDHE_RSA_WITH_CAMELLIA_256_GCM_SHA384:
-        case CipherSuite.TLS_PSK_WITH_CAMELLIA_256_GCM_SHA384:
-        case CipherSuite.TLS_RSA_PSK_WITH_CAMELLIA_256_GCM_SHA384:
-        case CipherSuite.TLS_RSA_WITH_CAMELLIA_256_GCM_SHA384:
-            return EncryptionAlgorithm.CAMELLIA_256_GCM;
-
-        case CipherSuite.TLS_DHE_PSK_WITH_ESTREAM_SALSA20_SHA1:
-        case CipherSuite.TLS_DHE_RSA_WITH_ESTREAM_SALSA20_SHA1:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_ESTREAM_SALSA20_SHA1:
-        case CipherSuite.TLS_ECDHE_PSK_WITH_ESTREAM_SALSA20_SHA1:
-        case CipherSuite.TLS_ECDHE_RSA_WITH_ESTREAM_SALSA20_SHA1:
-        case CipherSuite.TLS_PSK_WITH_ESTREAM_SALSA20_SHA1:
-        case CipherSuite.TLS_RSA_PSK_WITH_ESTREAM_SALSA20_SHA1:
-        case CipherSuite.TLS_RSA_WITH_ESTREAM_SALSA20_SHA1:
-            return EncryptionAlgorithm.ESTREAM_SALSA20;
-
-        case CipherSuite.TLS_RSA_WITH_NULL_MD5:
-            return EncryptionAlgorithm.NULL;
-
-        case CipherSuite.TLS_DHE_PSK_WITH_NULL_SHA:
-        case CipherSuite.TLS_ECDH_ECDSA_WITH_NULL_SHA:
-        case CipherSuite.TLS_ECDH_RSA_WITH_NULL_SHA:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_NULL_SHA:
-        case CipherSuite.TLS_ECDHE_PSK_WITH_NULL_SHA:
-        case CipherSuite.TLS_ECDHE_RSA_WITH_NULL_SHA:
-        case CipherSuite.TLS_PSK_WITH_NULL_SHA:
-        case CipherSuite.TLS_RSA_PSK_WITH_NULL_SHA:
-        case CipherSuite.TLS_RSA_WITH_NULL_SHA:
-            return EncryptionAlgorithm.NULL;
-
-        case CipherSuite.TLS_DHE_PSK_WITH_NULL_SHA256:
-        case CipherSuite.TLS_ECDHE_PSK_WITH_NULL_SHA256:
-        case CipherSuite.TLS_PSK_WITH_NULL_SHA256:
-        case CipherSuite.TLS_RSA_PSK_WITH_NULL_SHA256:
-        case CipherSuite.TLS_RSA_WITH_NULL_SHA256:
-            return EncryptionAlgorithm.NULL;
-
-        case CipherSuite.TLS_DHE_PSK_WITH_NULL_SHA384:
-        case CipherSuite.TLS_ECDHE_PSK_WITH_NULL_SHA384:
-        case CipherSuite.TLS_PSK_WITH_NULL_SHA384:
-        case CipherSuite.TLS_RSA_PSK_WITH_NULL_SHA384:
-            return EncryptionAlgorithm.NULL;
-
-        case CipherSuite.TLS_DH_anon_WITH_RC4_128_MD5:
-        case CipherSuite.TLS_RSA_WITH_RC4_128_MD5:
-            return EncryptionAlgorithm.RC4_128;
-
-        case CipherSuite.TLS_DHE_PSK_WITH_RC4_128_SHA:
-        case CipherSuite.TLS_ECDH_anon_WITH_RC4_128_SHA:
-        case CipherSuite.TLS_ECDH_ECDSA_WITH_RC4_128_SHA:
-        case CipherSuite.TLS_ECDH_RSA_WITH_RC4_128_SHA:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_RC4_128_SHA:
-        case CipherSuite.TLS_ECDHE_PSK_WITH_RC4_128_SHA:
-        case CipherSuite.TLS_ECDHE_RSA_WITH_RC4_128_SHA:
-        case CipherSuite.TLS_PSK_WITH_RC4_128_SHA:
-        case CipherSuite.TLS_RSA_WITH_RC4_128_SHA:
-        case CipherSuite.TLS_RSA_PSK_WITH_RC4_128_SHA:
-            return EncryptionAlgorithm.RC4_128;
-
-        case CipherSuite.TLS_DHE_PSK_WITH_SALSA20_SHA1:
-        case CipherSuite.TLS_DHE_RSA_WITH_SALSA20_SHA1:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_SALSA20_SHA1:
-        case CipherSuite.TLS_ECDHE_PSK_WITH_SALSA20_SHA1:
-        case CipherSuite.TLS_ECDHE_RSA_WITH_SALSA20_SHA1:
-        case CipherSuite.TLS_PSK_WITH_SALSA20_SHA1:
-        case CipherSuite.TLS_RSA_PSK_WITH_SALSA20_SHA1:
-        case CipherSuite.TLS_RSA_WITH_SALSA20_SHA1:
-            return EncryptionAlgorithm.SALSA20;
-
-        case CipherSuite.TLS_DH_DSS_WITH_SEED_CBC_SHA:
-        case CipherSuite.TLS_DH_RSA_WITH_SEED_CBC_SHA:
-        case CipherSuite.TLS_DHE_DSS_WITH_SEED_CBC_SHA:
-        case CipherSuite.TLS_DHE_RSA_WITH_SEED_CBC_SHA:
-        case CipherSuite.TLS_RSA_WITH_SEED_CBC_SHA:
-            return EncryptionAlgorithm.SEED_CBC;
-
-        default:
-            throw new TlsFatalAlert(AlertDescription.internal_error);
-        }
-    }
-
-    public static ProtocolVersion getMinimumVersion(int ciphersuite)
-    {
-        switch (ciphersuite)
-        {
-        case CipherSuite.TLS_DH_anon_WITH_CAMELLIA_128_CBC_SHA256:
-        case CipherSuite.TLS_DH_anon_WITH_CAMELLIA_128_GCM_SHA256:
-        case CipherSuite.TLS_DH_anon_WITH_CAMELLIA_256_CBC_SHA256:
-        case CipherSuite.TLS_DH_anon_WITH_CAMELLIA_256_GCM_SHA384:
-        case CipherSuite.TLS_DH_DSS_WITH_AES_128_CBC_SHA256:
-        case CipherSuite.TLS_DH_DSS_WITH_AES_128_GCM_SHA256:
-        case CipherSuite.TLS_DH_DSS_WITH_AES_256_CBC_SHA256:
-        case CipherSuite.TLS_DH_DSS_WITH_AES_256_GCM_SHA384:
-        case CipherSuite.TLS_DH_DSS_WITH_CAMELLIA_128_CBC_SHA256:
-        case CipherSuite.TLS_DH_DSS_WITH_CAMELLIA_128_GCM_SHA256:
-        case CipherSuite.TLS_DH_DSS_WITH_CAMELLIA_256_CBC_SHA256:
-        case CipherSuite.TLS_DH_DSS_WITH_CAMELLIA_256_GCM_SHA384:
-        case CipherSuite.TLS_DH_RSA_WITH_AES_128_CBC_SHA256:
-        case CipherSuite.TLS_DH_RSA_WITH_AES_128_GCM_SHA256:
-        case CipherSuite.TLS_DH_RSA_WITH_AES_256_CBC_SHA256:
-        case CipherSuite.TLS_DH_RSA_WITH_AES_256_GCM_SHA384:
-        case CipherSuite.TLS_DH_RSA_WITH_CAMELLIA_128_CBC_SHA256:
-        case CipherSuite.TLS_DH_RSA_WITH_CAMELLIA_128_GCM_SHA256:
-        case CipherSuite.TLS_DH_RSA_WITH_CAMELLIA_256_CBC_SHA256:
-        case CipherSuite.TLS_DH_RSA_WITH_CAMELLIA_256_GCM_SHA384:
-        case CipherSuite.TLS_DHE_DSS_WITH_AES_128_CBC_SHA256:
-        case CipherSuite.TLS_DHE_DSS_WITH_AES_128_GCM_SHA256:
-        case CipherSuite.TLS_DHE_DSS_WITH_AES_256_CBC_SHA256:
-        case CipherSuite.TLS_DHE_DSS_WITH_AES_256_GCM_SHA384:
-        case CipherSuite.TLS_DHE_DSS_WITH_CAMELLIA_128_CBC_SHA256:
-        case CipherSuite.TLS_DHE_DSS_WITH_CAMELLIA_128_GCM_SHA256:
-        case CipherSuite.TLS_DHE_DSS_WITH_CAMELLIA_256_CBC_SHA256:
-        case CipherSuite.TLS_DHE_DSS_WITH_CAMELLIA_256_GCM_SHA384:
-        case CipherSuite.TLS_DHE_PSK_WITH_AES_128_CCM:
-        case CipherSuite.TLS_DHE_PSK_WITH_AES_128_GCM_SHA256:
-        case CipherSuite.TLS_DHE_PSK_WITH_AES_256_CCM:
-        case CipherSuite.TLS_DHE_PSK_WITH_AES_256_GCM_SHA384:
-        case CipherSuite.TLS_DHE_PSK_WITH_CAMELLIA_128_GCM_SHA256:
-        case CipherSuite.TLS_DHE_PSK_WITH_CAMELLIA_256_GCM_SHA384:
-        case CipherSuite.TLS_DHE_RSA_WITH_AES_128_CBC_SHA256:
-        case CipherSuite.TLS_DHE_RSA_WITH_AES_128_CCM:
-        case CipherSuite.TLS_DHE_RSA_WITH_AES_128_CCM_8:
-        case CipherSuite.TLS_DHE_RSA_WITH_AES_128_GCM_SHA256:
-        case CipherSuite.TLS_DHE_RSA_WITH_AES_256_CBC_SHA256:
-        case CipherSuite.TLS_DHE_RSA_WITH_AES_256_CCM:
-        case CipherSuite.TLS_DHE_RSA_WITH_AES_256_CCM_8:
-        case CipherSuite.TLS_DHE_RSA_WITH_AES_256_GCM_SHA384:
-        case CipherSuite.TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA256:
-        case CipherSuite.TLS_DHE_RSA_WITH_CAMELLIA_128_GCM_SHA256:
-        case CipherSuite.TLS_DHE_RSA_WITH_CAMELLIA_256_CBC_SHA256:
-        case CipherSuite.TLS_DHE_RSA_WITH_CAMELLIA_256_GCM_SHA384:
-        case CipherSuite.TLS_DHE_RSA_WITH_CHACHA20_POLY1305_SHA256:
-        case CipherSuite.TLS_ECDH_ECDSA_WITH_AES_128_CBC_SHA256:
-        case CipherSuite.TLS_ECDH_ECDSA_WITH_AES_128_GCM_SHA256:
-        case CipherSuite.TLS_ECDH_ECDSA_WITH_AES_256_CBC_SHA384:
-        case CipherSuite.TLS_ECDH_ECDSA_WITH_AES_256_GCM_SHA384:
-        case CipherSuite.TLS_ECDH_ECDSA_WITH_CAMELLIA_128_CBC_SHA256:
-        case CipherSuite.TLS_ECDH_ECDSA_WITH_CAMELLIA_128_GCM_SHA256:
-        case CipherSuite.TLS_ECDH_ECDSA_WITH_CAMELLIA_256_CBC_SHA384:
-        case CipherSuite.TLS_ECDH_ECDSA_WITH_CAMELLIA_256_GCM_SHA384:
-        case CipherSuite.TLS_ECDH_RSA_WITH_AES_128_CBC_SHA256:
-        case CipherSuite.TLS_ECDH_RSA_WITH_AES_128_GCM_SHA256:
-        case CipherSuite.TLS_ECDH_RSA_WITH_AES_256_CBC_SHA384:
-        case CipherSuite.TLS_ECDH_RSA_WITH_AES_256_GCM_SHA384:
-        case CipherSuite.TLS_ECDH_RSA_WITH_CAMELLIA_128_CBC_SHA256:
-        case CipherSuite.TLS_ECDH_RSA_WITH_CAMELLIA_128_GCM_SHA256:
-        case CipherSuite.TLS_ECDH_RSA_WITH_CAMELLIA_256_CBC_SHA384:
-        case CipherSuite.TLS_ECDH_RSA_WITH_CAMELLIA_256_GCM_SHA384:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_AES_128_CCM:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_AES_128_CCM_8:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_AES_256_CCM:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_AES_256_CCM_8:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_CAMELLIA_128_CBC_SHA256:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_CAMELLIA_128_GCM_SHA256:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_CAMELLIA_256_CBC_SHA384:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_CAMELLIA_256_GCM_SHA384:
-        case CipherSuite.TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256:
-        case CipherSuite.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256:
-        case CipherSuite.TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256:
-        case CipherSuite.TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384:
-        case CipherSuite.TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384:
-        case CipherSuite.TLS_ECDHE_RSA_WITH_CAMELLIA_128_CBC_SHA256:
-        case CipherSuite.TLS_ECDHE_RSA_WITH_CAMELLIA_128_GCM_SHA256:
-        case CipherSuite.TLS_ECDHE_RSA_WITH_CAMELLIA_256_CBC_SHA384:
-        case CipherSuite.TLS_ECDHE_RSA_WITH_CAMELLIA_256_GCM_SHA384:
-        case CipherSuite.TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256:
-        case CipherSuite.TLS_PSK_DHE_WITH_AES_128_CCM_8:
-        case CipherSuite.TLS_PSK_DHE_WITH_AES_256_CCM_8:
-        case CipherSuite.TLS_PSK_WITH_AES_128_CCM:
-        case CipherSuite.TLS_PSK_WITH_AES_128_CCM_8:
-        case CipherSuite.TLS_PSK_WITH_AES_128_GCM_SHA256:
-        case CipherSuite.TLS_PSK_WITH_AES_256_CCM:
-        case CipherSuite.TLS_PSK_WITH_AES_256_CCM_8:
-        case CipherSuite.TLS_PSK_WITH_AES_256_GCM_SHA384:
-        case CipherSuite.TLS_PSK_WITH_CAMELLIA_128_GCM_SHA256:
-        case CipherSuite.TLS_PSK_WITH_CAMELLIA_256_GCM_SHA384:
-        case CipherSuite.TLS_RSA_PSK_WITH_AES_128_GCM_SHA256:
-        case CipherSuite.TLS_RSA_PSK_WITH_AES_256_GCM_SHA384:
-        case CipherSuite.TLS_RSA_PSK_WITH_CAMELLIA_128_GCM_SHA256:
-        case CipherSuite.TLS_RSA_PSK_WITH_CAMELLIA_256_GCM_SHA384:
-        case CipherSuite.TLS_RSA_WITH_AES_128_CBC_SHA256:
-        case CipherSuite.TLS_RSA_WITH_AES_128_CCM:
-        case CipherSuite.TLS_RSA_WITH_AES_128_CCM_8:
-        case CipherSuite.TLS_RSA_WITH_AES_128_GCM_SHA256:
-        case CipherSuite.TLS_RSA_WITH_AES_256_CBC_SHA256:
-        case CipherSuite.TLS_RSA_WITH_AES_256_CCM:
-        case CipherSuite.TLS_RSA_WITH_AES_256_CCM_8:
-        case CipherSuite.TLS_RSA_WITH_AES_256_GCM_SHA384:
-        case CipherSuite.TLS_RSA_WITH_CAMELLIA_128_CBC_SHA256:
-        case CipherSuite.TLS_RSA_WITH_CAMELLIA_128_GCM_SHA256:
-        case CipherSuite.TLS_RSA_WITH_CAMELLIA_256_CBC_SHA256:
-        case CipherSuite.TLS_RSA_WITH_CAMELLIA_256_GCM_SHA384:
-        case CipherSuite.TLS_RSA_WITH_NULL_SHA256:
-            return ProtocolVersion.TLSv12;
-
-        default:
-            return ProtocolVersion.SSLv3;
-        }
-    }
-
-    public static boolean isAEADCipherSuite(int ciphersuite) throws IOException
-    {
-        return CipherType.aead == getCipherType(ciphersuite);
-    }
-
-    public static boolean isBlockCipherSuite(int ciphersuite) throws IOException
-    {
-        return CipherType.block == getCipherType(ciphersuite);
-    }
-
-    public static boolean isStreamCipherSuite(int ciphersuite) throws IOException
-    {
-        return CipherType.stream == getCipherType(ciphersuite);
-    }
-
-    public static boolean isValidCipherSuiteForVersion(int cipherSuite, ProtocolVersion serverVersion)
-    {
-        return getMinimumVersion(cipherSuite).isEqualOrEarlierVersionOf(serverVersion.getEquivalentTLSVersion());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/UDPTransport.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/UDPTransport.java
deleted file mode 100644
index d5f0769..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/UDPTransport.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-import java.io.IOException;
-import java.net.DatagramPacket;
-import java.net.DatagramSocket;
-
-public class UDPTransport
-    implements DatagramTransport
-{
-    protected final static int MIN_IP_OVERHEAD = 20;
-    protected final static int MAX_IP_OVERHEAD = MIN_IP_OVERHEAD + 64;
-    protected final static int UDP_OVERHEAD = 8;
-
-    protected final DatagramSocket socket;
-    protected final int receiveLimit, sendLimit;
-
-    public UDPTransport(DatagramSocket socket, int mtu)
-        throws IOException
-    {
-        if (!socket.isBound() || !socket.isConnected())
-        {
-            throw new IllegalArgumentException("'socket' must be bound and connected");
-        }
-
-        this.socket = socket;
-
-        // NOTE: As of JDK 1.6, can use NetworkInterface.getMTU
-
-        this.receiveLimit = mtu - MIN_IP_OVERHEAD - UDP_OVERHEAD;
-        this.sendLimit = mtu - MAX_IP_OVERHEAD - UDP_OVERHEAD;
-    }
-
-    public int getReceiveLimit()
-    {
-        return receiveLimit;
-    }
-
-    public int getSendLimit()
-    {
-        // TODO[DTLS] Implement Path-MTU discovery?
-        return sendLimit;
-    }
-
-    public int receive(byte[] buf, int off, int len, int waitMillis)
-        throws IOException
-    {
-        socket.setSoTimeout(waitMillis);
-        DatagramPacket packet = new DatagramPacket(buf, off, len);
-        socket.receive(packet);
-        return packet.getLength();
-    }
-
-    public void send(byte[] buf, int off, int len)
-        throws IOException
-    {
-        if (len > getSendLimit())
-        {
-            /*
-             * RFC 4347 4.1.1. "If the application attempts to send a record larger than the MTU,
-             * the DTLS implementation SHOULD generate an error, thus avoiding sending a packet
-             * which will be fragmented."
-             */
-            throw new TlsFatalAlert(AlertDescription.internal_error);
-        }
-
-        DatagramPacket packet = new DatagramPacket(buf, off, len);
-        socket.send(packet);
-    }
-
-    public void close()
-        throws IOException
-    {
-        socket.close();
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/URLAndHash.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/URLAndHash.java
deleted file mode 100644
index c32a904..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/URLAndHash.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-import org.bouncycastle.util.Strings;
-
-/**
- * RFC 6066 5.
- */
-public class URLAndHash
-{
-    protected String url;
-    protected byte[] sha1Hash;
-
-    public URLAndHash(String url, byte[] sha1Hash)
-    {
-        if (url == null || url.length() < 1 || url.length() >= (1 << 16))
-        {
-            throw new IllegalArgumentException("'url' must have length from 1 to (2^16 - 1)");
-        }
-        if (sha1Hash != null && sha1Hash.length != 20)
-        {
-            throw new IllegalArgumentException("'sha1Hash' must have length == 20, if present");
-        }
-
-        this.url = url;
-        this.sha1Hash = sha1Hash;
-    }
-
-    public String getURL()
-    {
-        return url;
-    }
-
-    public byte[] getSHA1Hash()
-    {
-        return sha1Hash;
-    }
-
-    /**
-     * Encode this {@link URLAndHash} to an {@link OutputStream}.
-     *
-     * @param output the {@link OutputStream} to encode to.
-     * @throws IOException
-     */
-    public void encode(OutputStream output)
-        throws IOException
-    {
-        byte[] urlEncoding = Strings.toByteArray(this.url);
-        TlsUtils.writeOpaque16(urlEncoding, output);
-
-        if (this.sha1Hash == null)
-        {
-            TlsUtils.writeUint8(0, output);
-        }
-        else
-        {
-            TlsUtils.writeUint8(1, output);
-            output.write(this.sha1Hash);
-        }
-    }
-
-    /**
-     * Parse a {@link URLAndHash} from an {@link InputStream}.
-     * 
-     * @param context
-     *            the {@link TlsContext} of the current connection.
-     * @param input
-     *            the {@link InputStream} to parse from.
-     * @return a {@link URLAndHash} object.
-     * @throws IOException
-     */
-    public static URLAndHash parse(TlsContext context, InputStream input)
-        throws IOException
-    {
-        byte[] urlEncoding = TlsUtils.readOpaque16(input);
-        if (urlEncoding.length < 1)
-        {
-            throw new TlsFatalAlert(AlertDescription.illegal_parameter);
-        }
-        String url = Strings.fromByteArray(urlEncoding);
-
-        byte[] sha1Hash = null;
-        short padding = TlsUtils.readUint8(input);
-        switch (padding)
-        {
-        case 0:
-            if (TlsUtils.isTLSv12(context))
-            {
-                throw new TlsFatalAlert(AlertDescription.illegal_parameter);
-            }
-            break;
-        case 1:
-            sha1Hash = TlsUtils.readFully(20, input);
-            break;
-        default:
-            throw new TlsFatalAlert(AlertDescription.illegal_parameter);
-        }
-
-        return new URLAndHash(url, sha1Hash);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/UseSRTPData.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/UseSRTPData.java
deleted file mode 100644
index 7a83e4d..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/UseSRTPData.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-/**
- * RFC 5764 4.1.1
- */
-public class UseSRTPData
-{
-    protected int[] protectionProfiles;
-    protected byte[] mki;
-
-    /**
-     * @param protectionProfiles see {@link SRTPProtectionProfile} for valid constants.
-     * @param mki                valid lengths from 0 to 255.
-     */
-    public UseSRTPData(int[] protectionProfiles, byte[] mki)
-    {
-        if (protectionProfiles == null || protectionProfiles.length < 1
-            || protectionProfiles.length >= (1 << 15))
-        {
-            throw new IllegalArgumentException(
-                "'protectionProfiles' must have length from 1 to (2^15 - 1)");
-        }
-
-        if (mki == null)
-        {
-            mki = TlsUtils.EMPTY_BYTES;
-        }
-        else if (mki.length > 255)
-        {
-            throw new IllegalArgumentException("'mki' cannot be longer than 255 bytes");
-        }
-
-        this.protectionProfiles = protectionProfiles;
-        this.mki = mki;
-    }
-
-    /**
-     * @return see {@link SRTPProtectionProfile} for valid constants.
-     */
-    public int[] getProtectionProfiles()
-    {
-        return protectionProfiles;
-    }
-
-    /**
-     * @return valid lengths from 0 to 255.
-     */
-    public byte[] getMki()
-    {
-        return mki;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/UserMappingType.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/UserMappingType.java
deleted file mode 100644
index 8f6ae7b..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/UserMappingType.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.bouncycastle.crypto.tls;
-
-/**
- * RFC 4681
- */
-public class UserMappingType
-{
-    /*
-     * RFC 4681
-     */
-    public static final short upn_domain_hint = 64;
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/package.html b/bcprov/src/main/java/org/bouncycastle/crypto/tls/package.html
deleted file mode 100644
index ee59f8a..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body bgcolor="#ffffff">
-A lightweight TLS API.
-</body>
-</html>
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/test/AllTests.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/test/AllTests.java
deleted file mode 100644
index ef5b29b..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/test/AllTests.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package org.bouncycastle.crypto.tls.test;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-public class AllTests
-{
-    public static void main(String[] args)
-        throws Exception
-    {
-        junit.textui.TestRunner.run(suite());
-    }
-
-    public static Test suite()
-        throws Exception
-    {
-        TestSuite suite = new TestSuite("TLS tests");
-
-        suite.addTest(BasicTlsTest.suite());
-
-        return suite;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/test/BasicTlsTest.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/test/BasicTlsTest.java
deleted file mode 100644
index 49f6310..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/test/BasicTlsTest.java
+++ /dev/null
@@ -1,226 +0,0 @@
-package org.bouncycastle.crypto.tls.test;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.PrintStream;
-import java.net.Socket;
-import java.security.SecureRandom;
-
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.bouncycastle.crypto.tls.AlertDescription;
-import org.bouncycastle.crypto.tls.AlertLevel;
-import org.bouncycastle.crypto.tls.Certificate;
-import org.bouncycastle.crypto.tls.CipherSuite;
-import org.bouncycastle.crypto.tls.DefaultTlsClient;
-import org.bouncycastle.crypto.tls.ServerOnlyTlsAuthentication;
-import org.bouncycastle.crypto.tls.TlsAuthentication;
-import org.bouncycastle.crypto.tls.TlsClient;
-import org.bouncycastle.crypto.tls.TlsClientProtocol;
-import org.bouncycastle.crypto.tls.TlsFatalAlert;
-import org.bouncycastle.crypto.tls.TlsKeyExchange;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.encoders.Hex;
-
-public class BasicTlsTest
-    extends TestCase
-{
-    private static final int PORT_NO = 8003;
-
-    protected boolean isSufficientVMVersion(String vmVersion)
-    {
-        if (vmVersion == null)
-        {
-            return false;
-        }
-        String[] parts = vmVersion.split("\\.");
-        if (parts == null || parts.length != 2)
-        {
-            return false;
-        }
-        try
-        {
-            int major = Integer.parseInt(parts[0]);
-            if (major != 1)
-            {
-                return major > 1;
-            }
-            int minor = Integer.parseInt(parts[1]);
-            return minor >= 7;
-        }
-        catch (NumberFormatException e)
-        {
-            return false;
-        }
-    }
-
-    public void testConnection()
-        throws Exception
-    {
-        String vmVersion = System.getProperty("java.specification.version");
-        if (!isSufficientVMVersion(vmVersion))
-        {
-            return; // only works on later VMs.
-        }
-
-        Thread server = new HTTPSServerThread();
-
-        server.start();
-
-        Thread.yield();
-
-        Socket s = null;
-
-        for (int i = 0; s == null && i != 3; i++)
-        {
-            Thread.sleep(1000);
-
-            try
-            {
-                s = new Socket("localhost", PORT_NO);
-            }
-            catch (IOException e)
-            {
-                // ignore
-            }
-        }
-
-        if (s == null)
-        {
-            throw new IOException("unable to connect");
-        }
-
-        TlsClientProtocol protocol = new TlsClientProtocol(s.getInputStream(), s.getOutputStream(),
-            new SecureRandom());
-        protocol.connect(new MyTlsClient(new ServerOnlyTlsAuthentication()
-        {
-            public void notifyServerCertificate(Certificate serverCertificate) throws IOException
-            {
-                // NOTE: In production code this MUST verify the certificate!
-            }
-        }));
-
-        InputStream is = protocol.getInputStream();
-        OutputStream os = protocol.getOutputStream();
-
-        os.write("GET / HTTP/1.1\r\n\r\n".getBytes());
-
-        byte[] buf = new byte[4096];
-        int read = 0;
-        int total = 0;
-
-        while ((read = is.read(buf, total, buf.length - total)) > 0)
-        {
-            total += read;
-        }
-
-        is.close();
-
-        byte[] expected = Hex.decode("485454502f312e3120323030204f4b0d0a436f6e74656e742d547970653a20746578742f68"
-            + "746d6c0d0a0d0a3c68746d6c3e0d0a3c626f64793e0d0a48656c6c6f20576f726c64210d0a3c2f626f64793e0d0a3c2f"
-            + "68746d6c3e0d0a");
-        assertEquals(total, expected.length);
-
-        byte[] tmp = new byte[expected.length];
-        System.arraycopy(buf, 0, tmp, 0, total);
-        assertTrue(Arrays.areEqual(expected, tmp));
-    }
-
-    public void testRSAConnectionClient()
-        throws Exception
-    {
-        MyTlsClient client = new MyTlsClient(null);
-
-        checkConnectionClient(client, CipherSuite.TLS_RSA_WITH_3DES_EDE_CBC_SHA, TlsTestUtils.rsaCertData);
-        checkConnectionClient(client, CipherSuite.TLS_RSA_WITH_AES_128_CBC_SHA, TlsTestUtils.rsaCertData);
-        checkConnectionClient(client, CipherSuite.TLS_RSA_WITH_AES_256_CBC_SHA, TlsTestUtils.rsaCertData);
-        checkConnectionClient(client, CipherSuite.TLS_RSA_WITH_RC4_128_SHA, TlsTestUtils.rsaCertData);
-
-        try
-        {
-            checkConnectionClient(client, CipherSuite.TLS_RSA_WITH_3DES_EDE_CBC_SHA, TlsTestUtils.dudRsaCertData);
-
-            fail("dud certificate not caught");
-        }
-        catch (TlsFatalAlert e)
-        {
-            assertEquals(AlertDescription.certificate_unknown, e.getAlertDescription());
-        }
-
-        try
-        {
-            checkConnectionClient(client, CipherSuite.TLS_DH_anon_EXPORT_WITH_DES40_CBC_SHA, TlsTestUtils.rsaCertData);
-
-            fail("wrong certificate not caught");
-        }
-        catch (TlsFatalAlert e)
-        {
-            assertEquals(AlertDescription.internal_error, e.getAlertDescription());
-        }
-    }
-
-    private void checkConnectionClient(TlsClient client, int cipherSuite, byte[] encCert)
-        throws Exception
-    {
-        client.notifySelectedCipherSuite(cipherSuite);
-
-        TlsKeyExchange keyExchange = client.getKeyExchange();
-
-        keyExchange
-            .processServerCertificate(new Certificate(
-                new org.bouncycastle.asn1.x509.Certificate[]{org.bouncycastle.asn1.x509.Certificate
-                    .getInstance(encCert)}));
-    }
-
-    public static TestSuite suite()
-    {
-        return new TestSuite(BasicTlsTest.class);
-    }
-
-    public static void main(String[] args)
-        throws Exception
-    {
-        junit.textui.TestRunner.run(suite());
-    }
-
-    static class MyTlsClient
-        extends DefaultTlsClient
-    {
-        public void notifyAlertRaised(short alertLevel, short alertDescription, String message, Throwable cause)
-        {
-            PrintStream out = (alertLevel == AlertLevel.fatal) ? System.err : System.out;
-            out.println("TLS client raised alert (AlertLevel." + alertLevel + ", AlertDescription." + alertDescription
-                + ")");
-            if (message != null)
-            {
-                out.println(message);
-            }
-            if (cause != null)
-            {
-                cause.printStackTrace(out);
-            }
-        }
-
-        public void notifyAlertReceived(short alertLevel, short alertDescription)
-        {
-            PrintStream out = (alertLevel == AlertLevel.fatal) ? System.err : System.out;
-            out.println("TLS client received alert (AlertLevel." + alertLevel + ", AlertDescription."
-                + alertDescription + ")");
-        }
-
-        private final TlsAuthentication authentication;
-
-        MyTlsClient(TlsAuthentication authentication)
-        {
-            this.authentication = authentication;
-        }
-
-        public TlsAuthentication getAuthentication()
-            throws IOException
-        {
-            return authentication;
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/test/DTLSClientTest.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/test/DTLSClientTest.java
deleted file mode 100644
index 37ad8ca..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/test/DTLSClientTest.java
+++ /dev/null
@@ -1,81 +0,0 @@
-package org.bouncycastle.crypto.tls.test;
-
-import java.io.IOException;
-import java.net.DatagramSocket;
-import java.net.InetAddress;
-import java.security.SecureRandom;
-
-import org.bouncycastle.crypto.tls.DTLSClientProtocol;
-import org.bouncycastle.crypto.tls.DTLSTransport;
-import org.bouncycastle.crypto.tls.DatagramTransport;
-import org.bouncycastle.crypto.tls.TlsClient;
-import org.bouncycastle.crypto.tls.TlsSession;
-import org.bouncycastle.crypto.tls.UDPTransport;
-
-/**
- * A simple test designed to conduct a DTLS handshake with an external DTLS server.
- * <p>
- * Please refer to GnuTLSSetup.html or OpenSSLSetup.html (under 'docs'), and x509-*.pem files in
- * this package (under 'src/test/resources') for help configuring an external DTLS server.
- * </p>
- */
-public class DTLSClientTest
-{
-    private static final SecureRandom secureRandom = new SecureRandom();
-
-    public static void main(String[] args)
-        throws Exception
-    {
-        InetAddress address = InetAddress.getLocalHost();
-        int port = 5556;
-
-        TlsSession session = createSession(address, port);
-
-        MockDTLSClient client = new MockDTLSClient(session);
-
-        DTLSTransport dtls = openDTLSConnection(address, port, client);
-
-        System.out.println("Receive limit: " + dtls.getReceiveLimit());
-        System.out.println("Send limit: " + dtls.getSendLimit());
-
-        // Send and hopefully receive a packet back
-
-        byte[] request = "Hello World!\n".getBytes("UTF-8");
-        dtls.send(request, 0, request.length);
-
-        byte[] response = new byte[dtls.getReceiveLimit()];
-        int received = dtls.receive(response, 0, response.length, 30000);
-        if (received >= 0)
-        {
-            System.out.println(new String(response, 0, received, "UTF-8"));
-        }
-
-        dtls.close();
-    }
-
-    private static TlsSession createSession(InetAddress address, int port)
-        throws IOException
-    {
-        MockDTLSClient client = new MockDTLSClient(null);
-        DTLSTransport dtls = openDTLSConnection(address, port, client);
-        TlsSession session = client.getSessionToResume();
-        dtls.close();
-        return session;
-    }
-
-    private static DTLSTransport openDTLSConnection(InetAddress address, int port, TlsClient client)
-        throws IOException
-    {
-        DatagramSocket socket = new DatagramSocket();
-        socket.connect(address, port);
-
-        int mtu = 1500;
-        DatagramTransport transport = new UDPTransport(socket, mtu);
-        transport = new UnreliableDatagramTransport(transport, secureRandom, 0, 0);
-        transport = new LoggingDatagramTransport(transport, System.out);
-
-        DTLSClientProtocol protocol = new DTLSClientProtocol(secureRandom);
-
-        return protocol.connect(client, transport);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/test/DTLSProtocolTest.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/test/DTLSProtocolTest.java
deleted file mode 100644
index df5a3f8..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/test/DTLSProtocolTest.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package org.bouncycastle.crypto.tls.test;
-
-import java.security.SecureRandom;
-
-import junit.framework.TestCase;
-
-import org.bouncycastle.crypto.tls.DTLSClientProtocol;
-import org.bouncycastle.crypto.tls.DTLSServerProtocol;
-import org.bouncycastle.crypto.tls.DTLSTransport;
-import org.bouncycastle.crypto.tls.DatagramTransport;
-import org.bouncycastle.util.Arrays;
-
-public class DTLSProtocolTest
-    extends TestCase
-{
-    public void testClientServer()
-        throws Exception
-    {
-        SecureRandom secureRandom = new SecureRandom();
-
-        DTLSClientProtocol clientProtocol = new DTLSClientProtocol(secureRandom);
-        DTLSServerProtocol serverProtocol = new DTLSServerProtocol(secureRandom);
-
-        MockDatagramAssociation network = new MockDatagramAssociation(1500);
-
-        ServerThread serverThread = new ServerThread(serverProtocol, network.getServer());
-        serverThread.start();
-
-        DatagramTransport clientTransport = network.getClient();
-
-        clientTransport = new UnreliableDatagramTransport(clientTransport, secureRandom, 0, 0);
-
-        clientTransport = new LoggingDatagramTransport(clientTransport, System.out);
-
-        MockDTLSClient client = new MockDTLSClient(null);
-
-        DTLSTransport dtlsClient = clientProtocol.connect(client, clientTransport);
-
-        for (int i = 1; i <= 10; ++i)
-        {
-            byte[] data = new byte[i];
-            Arrays.fill(data, (byte)i);
-            dtlsClient.send(data, 0, data.length);
-        }
-
-        byte[] buf = new byte[dtlsClient.getReceiveLimit()];
-        while (dtlsClient.receive(buf, 0, buf.length, 100) >= 0)
-        {
-        }
-
-        dtlsClient.close();
-
-        serverThread.shutdown();
-    }
-
-    static class ServerThread
-        extends Thread
-    {
-        private final DTLSServerProtocol serverProtocol;
-        private final DatagramTransport serverTransport;
-        private volatile boolean isShutdown = false;
-
-        ServerThread(DTLSServerProtocol serverProtocol, DatagramTransport serverTransport)
-        {
-            this.serverProtocol = serverProtocol;
-            this.serverTransport = serverTransport;
-        }
-
-        public void run()
-        {
-            try
-            {
-                MockDTLSServer server = new MockDTLSServer();
-                DTLSTransport dtlsServer = serverProtocol.accept(server, serverTransport);
-                byte[] buf = new byte[dtlsServer.getReceiveLimit()];
-                while (!isShutdown)
-                {
-                    int length = dtlsServer.receive(buf, 0, buf.length, 1000);
-                    if (length >= 0)
-                    {
-                        dtlsServer.send(buf, 0, length);
-                    }
-                }
-                dtlsServer.close();
-            }
-            catch (Exception e)
-            {
-                e.printStackTrace();
-            }
-        }
-
-        void shutdown()
-            throws InterruptedException
-        {
-            if (!isShutdown)
-            {
-                isShutdown = true;
-                this.join();
-            }
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/test/DTLSServerTest.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/test/DTLSServerTest.java
deleted file mode 100644
index 06f57ab..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/test/DTLSServerTest.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package org.bouncycastle.crypto.tls.test;
-
-import java.net.DatagramPacket;
-import java.net.DatagramSocket;
-import java.net.SocketTimeoutException;
-import java.security.SecureRandom;
-
-import org.bouncycastle.crypto.tls.DTLSServerProtocol;
-import org.bouncycastle.crypto.tls.DTLSTransport;
-import org.bouncycastle.crypto.tls.DatagramTransport;
-import org.bouncycastle.crypto.tls.UDPTransport;
-
-/**
- * A simple test designed to conduct a DTLS handshake with an external DTLS client.
- * <p>
- * Please refer to GnuTLSSetup.html or OpenSSLSetup.html (under 'docs'), and x509-*.pem files in
- * this package (under 'src/test/resources') for help configuring an external DTLS client.
- * </p>
- */
-public class DTLSServerTest
-{
-    public static void main(String[] args)
-        throws Exception
-    {
-        int port = 5556;
-
-        int mtu = 1500;
-
-        SecureRandom secureRandom = new SecureRandom();
-
-        DTLSServerProtocol serverProtocol = new DTLSServerProtocol(secureRandom);
-
-        byte[] data = new byte[mtu];
-        DatagramPacket packet = new DatagramPacket(data, mtu);
-
-        DatagramSocket socket = new DatagramSocket(port);
-        socket.receive(packet);
-
-        System.out.println("Accepting connection from " + packet.getAddress().getHostAddress() + ":" + port);
-        socket.connect(packet.getAddress(), packet.getPort());
-
-        /*
-         * NOTE: For simplicity, and since we don't yet have HelloVerifyRequest support, we just
-         * discard the initial packet, which the client should re-send anyway.
-         */
-
-        DatagramTransport transport = new UDPTransport(socket, mtu);
-        
-        // Uncomment to see packets
-//        transport = new LoggingDatagramTransport(transport, System.out);
-
-        MockDTLSServer server = new MockDTLSServer();
-        DTLSTransport dtlsServer = serverProtocol.accept(server, transport);
-
-        byte[] buf = new byte[dtlsServer.getReceiveLimit()];
-
-        while (!socket.isClosed())
-        {
-            try
-            {
-                int length = dtlsServer.receive(buf, 0, buf.length, 60000);
-                if (length >= 0)
-                {
-                    System.out.write(buf, 0, length);
-                    dtlsServer.send(buf, 0, length);
-                }
-            }
-            catch (SocketTimeoutException ste)
-            {
-            }
-        }
-
-        dtlsServer.close();
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/test/DTLSTestCase.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/test/DTLSTestCase.java
deleted file mode 100644
index 928647c..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/test/DTLSTestCase.java
+++ /dev/null
@@ -1,161 +0,0 @@
-package org.bouncycastle.crypto.tls.test;
-
-import java.security.SecureRandom;
-
-import junit.framework.TestCase;
-
-import org.bouncycastle.crypto.tls.DTLSClientProtocol;
-import org.bouncycastle.crypto.tls.DTLSServerProtocol;
-import org.bouncycastle.crypto.tls.DTLSTransport;
-import org.bouncycastle.crypto.tls.DatagramTransport;
-import org.bouncycastle.crypto.tls.ProtocolVersion;
-import org.bouncycastle.util.Arrays;
-
-public class DTLSTestCase extends TestCase
-{
-    private static void checkDTLSVersion(ProtocolVersion version)
-    {
-        if (version != null && !version.isDTLS())
-        {
-            throw new IllegalStateException("Non-DTLS version");
-        }
-    }
-
-    protected final TlsTestConfig config;
-
-    public DTLSTestCase(TlsTestConfig config, String name)
-    {
-        checkDTLSVersion(config.clientMinimumVersion);
-        checkDTLSVersion(config.clientOfferVersion);
-        checkDTLSVersion(config.serverMaximumVersion);
-        checkDTLSVersion(config.serverMinimumVersion);
-
-        this.config = config;
-
-        setName(name);
-    }
-
-    protected void runTest() throws Throwable
-    {
-        SecureRandom secureRandom = new SecureRandom();
-
-        DTLSClientProtocol clientProtocol = new DTLSClientProtocol(secureRandom);
-        DTLSServerProtocol serverProtocol = new DTLSServerProtocol(secureRandom);
-
-        MockDatagramAssociation network = new MockDatagramAssociation(1500);
-
-        TlsTestClientImpl clientImpl = new TlsTestClientImpl(config);
-        TlsTestServerImpl serverImpl = new TlsTestServerImpl(config);
-
-        ServerThread serverThread = new ServerThread(serverProtocol, network.getServer(), serverImpl);
-        serverThread.start();
-
-        Exception caught = null;
-        try
-        {
-            DatagramTransport clientTransport = network.getClient();
-    
-            if (TlsTestConfig.DEBUG)
-            {
-                clientTransport = new LoggingDatagramTransport(clientTransport, System.out);
-            }
-    
-            DTLSTransport dtlsClient = clientProtocol.connect(clientImpl, clientTransport);
-    
-            for (int i = 1; i <= 10; ++i)
-            {
-                byte[] data = new byte[i];
-                Arrays.fill(data, (byte)i);
-                dtlsClient.send(data, 0, data.length);
-            }
-    
-            byte[] buf = new byte[dtlsClient.getReceiveLimit()];
-            while (dtlsClient.receive(buf, 0, buf.length, 100) >= 0)
-            {
-            }
-    
-            dtlsClient.close();
-        }
-        catch (Exception e)
-        {
-            caught = e;
-            logException(caught);
-        }
-
-        serverThread.shutdown();
-
-        // TODO Add checks that the various streams were closed
-
-        assertEquals("Client fatal alert connection end", config.expectFatalAlertConnectionEnd, clientImpl.firstFatalAlertConnectionEnd);
-        assertEquals("Server fatal alert connection end", config.expectFatalAlertConnectionEnd, serverImpl.firstFatalAlertConnectionEnd);
-
-        assertEquals("Client fatal alert description", config.expectFatalAlertDescription, clientImpl.firstFatalAlertDescription);
-        assertEquals("Server fatal alert description", config.expectFatalAlertDescription, serverImpl.firstFatalAlertDescription);
-
-        if (config.expectFatalAlertConnectionEnd == -1)
-        {
-            assertNull("Unexpected client exception", caught);
-            assertNull("Unexpected server exception", serverThread.caught);
-        }
-    }
-
-    protected  void logException(Exception e)
-    {
-        if (TlsTestConfig.DEBUG)
-        {
-            e.printStackTrace();
-        }
-    }
-
-    class ServerThread
-        extends Thread
-    {
-        private final DTLSServerProtocol serverProtocol;
-        private final DatagramTransport serverTransport;
-        private final TlsTestServerImpl serverImpl;
-
-        private volatile boolean isShutdown = false;
-        Exception caught = null;
-
-        ServerThread(DTLSServerProtocol serverProtocol, DatagramTransport serverTransport, TlsTestServerImpl serverImpl)
-        {
-            this.serverProtocol = serverProtocol;
-            this.serverTransport = serverTransport;
-            this.serverImpl = serverImpl;
-        }
-
-        public void run()
-        {
-            try
-            {
-                DTLSTransport dtlsServer = serverProtocol.accept(serverImpl, serverTransport);
-                byte[] buf = new byte[dtlsServer.getReceiveLimit()];
-                while (!isShutdown)
-                {
-                    int length = dtlsServer.receive(buf, 0, buf.length, 100);
-                    if (length >= 0)
-                    {
-                        dtlsServer.send(buf, 0, length);
-                    }
-                }
-                dtlsServer.close();
-            }
-            catch (Exception e)
-            {
-                caught = e;
-                logException(caught);
-            }
-        }
-
-        void shutdown()
-            throws InterruptedException
-        {
-            if (!isShutdown)
-            {
-                isShutdown = true;
-                this.interrupt();
-                this.join();
-            }
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/test/DTLSTestSuite.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/test/DTLSTestSuite.java
deleted file mode 100644
index df26bff..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/test/DTLSTestSuite.java
+++ /dev/null
@@ -1,126 +0,0 @@
-package org.bouncycastle.crypto.tls.test;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.bouncycastle.crypto.tls.AlertDescription;
-import org.bouncycastle.crypto.tls.ProtocolVersion;
-
-public class DTLSTestSuite extends TestSuite
-{
-    // Make the access to constants less verbose 
-    static abstract class C extends TlsTestConfig {}
-
-    public static Test suite()
-    {
-        DTLSTestSuite testSuite = new DTLSTestSuite();
-
-        addFallbackTests(testSuite);
-        addVersionTests(testSuite, ProtocolVersion.DTLSv10);
-        addVersionTests(testSuite, ProtocolVersion.DTLSv12);
-
-        return testSuite;
-    }
-
-    private static void addFallbackTests(TestSuite testSuite)
-    {
-        {
-            TlsTestConfig c = createDTLSTestConfig(ProtocolVersion.DTLSv12);
-            c.clientFallback = true;
-
-            testSuite.addTest(new DTLSTestCase(c, "FallbackGood"));
-        }
-
-        /*
-         * NOTE: Temporarily disabled automatic test runs because of problems getting a clean exit
-         * of the DTLS server after a fatal alert. As of writing, manual runs show the correct
-         * alerts being raised
-         */
-
-//        {
-//            TlsTestConfig c = createDTLSTestConfig(ProtocolVersion.DTLSv12);
-//            c.clientOfferVersion = ProtocolVersion.DTLSv10;
-//            c.clientFallback = true;
-//            c.expectServerFatalAlert(AlertDescription.inappropriate_fallback);
-//
-//            testSuite.addTest(new DTLSTestCase(c, "FallbackBad"));
-//        }
-
-        {
-            TlsTestConfig c = createDTLSTestConfig(ProtocolVersion.DTLSv12);
-            c.clientOfferVersion = ProtocolVersion.DTLSv10;
-
-            testSuite.addTest(new DTLSTestCase(c, "FallbackNone"));
-        }
-    }
-
-    private static void addVersionTests(TestSuite testSuite, ProtocolVersion version)
-    {
-        String prefix = version.toString().replaceAll("[ \\.]", "") + "_";
-
-        /*
-         * NOTE: Temporarily disabled automatic test runs because of problems getting a clean exit
-         * of the DTLS server after a fatal alert. As of writing, manual runs show the correct
-         * alerts being raised
-         */
-
-//        {
-//            TlsTestConfig c = createDTLSTestConfig(version);
-//            c.clientAuth = C.CLIENT_AUTH_INVALID_VERIFY;
-//            c.expectServerFatalAlert(AlertDescription.decrypt_error);
-//
-//            testSuite.addTest(new DTLSTestCase(c, prefix + "BadCertificateVerify"));
-//        }
-//
-//        {
-//            TlsTestConfig c = createDTLSTestConfig(version);
-//            c.clientAuth = C.CLIENT_AUTH_INVALID_CERT;
-//            c.expectServerFatalAlert(AlertDescription.bad_certificate);
-//
-//            testSuite.addTest(new DTLSTestCase(c, prefix + "BadClientCertificate"));
-//        }
-//
-//        {
-//            TlsTestConfig c = createDTLSTestConfig(version);
-//            c.clientAuth = C.CLIENT_AUTH_NONE;
-//            c.serverCertReq = C.SERVER_CERT_REQ_MANDATORY;
-//            c.expectServerFatalAlert(AlertDescription.handshake_failure);
-//
-//            testSuite.addTest(new DTLSTestCase(c, prefix + "BadMandatoryCertReqDeclined"));
-//        }
-
-        {
-            TlsTestConfig c = createDTLSTestConfig(version);
-
-            testSuite.addTest(new DTLSTestCase(c, prefix + "GoodDefault"));
-        }
-
-        {
-            TlsTestConfig c = createDTLSTestConfig(version);
-            c.serverCertReq = C.SERVER_CERT_REQ_NONE;
-
-            testSuite.addTest(new DTLSTestCase(c, prefix + "GoodNoCertReq"));
-        }
-
-        {
-            TlsTestConfig c = createDTLSTestConfig(version);
-            c.clientAuth = C.CLIENT_AUTH_NONE;
-
-            testSuite.addTest(new DTLSTestCase(c, prefix + "GoodOptionalCertReqDeclined"));
-        }
-    }
-
-    private static TlsTestConfig createDTLSTestConfig(ProtocolVersion version)
-    {
-        TlsTestConfig c = new TlsTestConfig();
-        c.clientMinimumVersion = ProtocolVersion.DTLSv10;
-        /*
-         * TODO We'd like to just set the offer version to DTLSv12, but there is a known issue with
-         * overly-restrictive version checks b/w BC DTLS 1.2 client, BC DTLS 1.0 server
-         */
-        c.clientOfferVersion = version;
-        c.serverMaximumVersion = version;
-        c.serverMinimumVersion = ProtocolVersion.DTLSv10;
-        return c;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/test/HTTPSServerThread.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/test/HTTPSServerThread.java
deleted file mode 100644
index d55bc73..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/test/HTTPSServerThread.java
+++ /dev/null
@@ -1,113 +0,0 @@
-package org.bouncycastle.crypto.tls.test;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.io.PrintWriter;
-import java.security.KeyStore;
-
-import javax.net.ssl.KeyManagerFactory;
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.SSLServerSocket;
-import javax.net.ssl.SSLServerSocketFactory;
-import javax.net.ssl.SSLSession;
-import javax.net.ssl.SSLSocket;
-import javax.net.ssl.TrustManagerFactory;
-
-public class HTTPSServerThread
-    extends Thread
-{
-    private static final int PORT_NO = 8003;
-    private static final char[] SERVER_PASSWORD = "serverPassword".toCharArray();
-    private static final char[] TRUST_STORE_PASSWORD = "trustPassword".toCharArray();
-
-    /**
-     * Read a HTTP request
-     */
-    private void readRequest(
-        InputStream in)
-        throws IOException
-    {
-        int ch = 0;
-        int lastCh = 0;
-        while ((ch = in.read()) >= 0 && (ch != '\n' && lastCh != '\n'))
-        {
-            if (ch != '\r')
-            {
-                lastCh = ch;
-            }
-        }
-    }
-
-    /**
-     * Send a response
-     */
-    private void sendResponse(
-        OutputStream out)
-    {
-        PrintWriter pWrt = new PrintWriter(new OutputStreamWriter(out));
-        pWrt.print("HTTP/1.1 200 OK\r\n");
-        pWrt.print("Content-Type: text/html\r\n");
-        pWrt.print("\r\n");
-        pWrt.print("<html>\r\n");
-        pWrt.print("<body>\r\n");
-        pWrt.print("Hello World!\r\n");
-        pWrt.print("</body>\r\n");
-        pWrt.print("</html>\r\n");
-        pWrt.flush();
-    }
-
-    SSLContext createSSLContext()
-        throws Exception
-    {
-        KeyManagerFactory mgrFact = KeyManagerFactory.getInstance("SunX509");
-        KeyStore serverStore = KeyStore.getInstance("JKS");
-
-        serverStore.load(new ByteArrayInputStream(KeyStores.server), SERVER_PASSWORD);
-
-        mgrFact.init(serverStore, SERVER_PASSWORD);
-
-        // set up a trust manager so we can recognize the server
-        TrustManagerFactory trustFact = TrustManagerFactory.getInstance("SunX509");
-        KeyStore trustStore = KeyStore.getInstance("JKS");
-
-        trustStore.load(new ByteArrayInputStream(KeyStores.trustStore), TRUST_STORE_PASSWORD);
-
-        trustFact.init(trustStore);
-
-        // create a context and set up a socket factory
-        SSLContext sslContext = SSLContext.getInstance("TLS");
-
-        sslContext.init(mgrFact.getKeyManagers(), trustFact.getTrustManagers(), null);
-
-        return sslContext;
-    }
-
-    public void run()
-    {
-        try
-        {
-            SSLContext sslContext = createSSLContext();
-            SSLServerSocketFactory fact = sslContext.getServerSocketFactory();
-
-            SSLServerSocket sSock = (SSLServerSocket)fact.createServerSocket(PORT_NO);
-            SSLSocket sslSock = (SSLSocket)sSock.accept();
-
-            sslSock.startHandshake();
-
-            readRequest(sslSock.getInputStream());
-
-            SSLSession session = sslSock.getSession();
-
-            sendResponse(sslSock.getOutputStream());
-
-            sslSock.close();
-        }
-        catch (Exception e)
-        {
-            throw new RuntimeException(e);
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/test/KeyStores.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/test/KeyStores.java
deleted file mode 100644
index bf71f96..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/test/KeyStores.java
+++ /dev/null
@@ -1,113 +0,0 @@
-package org.bouncycastle.crypto.tls.test;
-
-import org.bouncycastle.util.encoders.Base64;
-
-public class KeyStores
-{
-    static final byte[] trustStore = Base64.decode(
-        "/u3+7QAAAAIAAAABAAAAAgAGc2VydmVyAAABD34zDJEABVguNTA5AAABrzCC"
-            + "AaswggEUAgEBMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE1Rlc3QgQ0Eg"
-            + "Q2VydGlmaWNhdGUwHhcNMDYxMjEzMjM0MzI5WhcNMDYxMjIwMjM0MzI5WjAe"
-            + "MRwwGgYDVQQDExNUZXN0IENBIENlcnRpZmljYXRlMIGfMA0GCSqGSIb3DQEB"
-            + "AQUAA4GNADCBiQKBgQCmOumCM46ehsdcrZMw6tj0hMl5D0xf21gcyBj/ByIv"
-            + "pe008ukaN3zCXIUUUlAu0GkbI1sCbTD1V4qVZuaHqtfa/FINJjyZJy5w7KEx"
-            + "93OOF2/gyPlnEPGs6RPdThAPliSBsWKBKqtOdmKpwYn/NKuUNFRkFXVLLUPn"
-            + "jyEKjIcNywIDAQABMA0GCSqGSIb3DQEBBQUAA4GBACi8J7raYqDFjXqAXXPJ"
-            + "ljZHqvzJNVaSWvBtK/oY7g0+sdGIjPR526fhSCxOZRr7G157ERqMnPjuFjcm"
-            + "cRlUOPsQtTl6KbUnxmKxa04UzDuNXzSx2oyGx5GCWx9u62hpO6vSpK69L9gH"
-            + "OUtM5dQXcoK4i3olScKaU8qaYb0mBAy8fnx5pen8B0bIg+pz47l5VxQ5NO8=");
-
-    static final byte[] server = Base64.decode(
-        "/u3+7QAAAAIAAAABAAAAAQAGc2VydmVyAAABD34zDJIAAAK8MIICuDAOBgor"
-            + "BgEEASoCEQEBBQAEggKk9OXWj3aBr6rV9Grcsm2YL+/2ShVsxbJVGMSWll1f"
-            + "U8z/mjhv5K/skgleTIMoyE5FzDDxJIGEmSMCkcHsnseXzxyhLpKBaz3N1Tk7"
-            + "KVPzXfrNh0FJwzw3lPWyC2ayT+ObQfAtzuI9SUWNLBzzpWeolUJ8gkXnLshX"
-            + "5RqmR735NRZdjgQOtNYBBErX/NOhTyi009/CZDNxgJQzywFmQcXBLhNSA+0i"
-            + "cE+LwZ4sZV0NXshPZiyNnsfqN/XNOyhpKr8a3VyVtee2nhO9+FY5IDEviHmR"
-            + "WDvH5TmB6Os3L6xvwE1ZQCPElk/cK2G1q9+zDBe4JDeo8o7lPhiNpVfcivnr"
-            + "+tyK9m7PqlssR0+ohuZGwrFMyzLugkOWh+qZ3pk8/7AwJosMvvTvIg36nN7R"
-            + "pdnouQNKqTm1Sr/UUnKyWqfG7zqKIuF72IkDwwafwuQ9YRX5PAOuRfo6bCyb"
-            + "D4w1OWdfGFciKMc1BrT+8JzhiTkzNe+jWEA5Tw1zeazPGpp1RHPz2np50G2s"
-            + "v025uiOSUilBe13Qpx0mAyx7z8Gl6eOxai6rQ/eB/Fu++BMx0OX8vO/K4//Q"
-            + "w43IPVPklGlb/3Qt7eoNf4tichuxrYJjHu4XbwnzB29Vmsan0XZFER7epvFj"
-            + "cAZCSG+O6G/f6Ib+7d7xYjLdUaPI60tJ4/C+AuYwZn4jJwTnMnMmwIypz4Z8"
-            + "XPXW5SbHlV5OkkFC+eAuuN4b2YXZmifeWv4fx65Ioir921LMJrorMizH41RJ"
-            + "/rAO5wGSwjeDJ784QhhLGbEUMygraRtdaz6MRx26InnoHY7V58ET3Z5YGV39"
-            + "p+9AtVhYw/QQmTZiF7hqnEMf9AMVFfac9qFF2+IN3g9HAMC6QLxJ1VuPn5oo"
-            + "lS//axPfjckO7iZx9x59/gAAAAEABVguNTA5AAABrzCCAaswggEUAgEBMA0G"
-            + "CSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE1Rlc3QgQ0EgQ2VydGlmaWNhdGUw"
-            + "HhcNMDYxMjEzMjM0MzI5WhcNMDYxMjIwMjM0MzI5WjAeMRwwGgYDVQQDExNU"
-            + "ZXN0IENBIENlcnRpZmljYXRlMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKB"
-            + "gQCmOumCM46ehsdcrZMw6tj0hMl5D0xf21gcyBj/ByIvpe008ukaN3zCXIUU"
-            + "UlAu0GkbI1sCbTD1V4qVZuaHqtfa/FINJjyZJy5w7KEx93OOF2/gyPlnEPGs"
-            + "6RPdThAPliSBsWKBKqtOdmKpwYn/NKuUNFRkFXVLLUPnjyEKjIcNywIDAQAB"
-            + "MA0GCSqGSIb3DQEBBQUAA4GBACi8J7raYqDFjXqAXXPJljZHqvzJNVaSWvBt"
-            + "K/oY7g0+sdGIjPR526fhSCxOZRr7G157ERqMnPjuFjcmcRlUOPsQtTl6KbUn"
-            + "xmKxa04UzDuNXzSx2oyGx5GCWx9u62hpO6vSpK69L9gHOUtM5dQXcoK4i3ol"
-            + "ScKaU8qaYb0mBAy87VQaPfaiQqqxSgqifbSowlg+0fg=");
-
-    static final byte[] client = Base64.decode(
-        "MIACAQMwgAYJKoZIhvcNAQcBoIAkgASCA+gwgDCABgkqhkiG9w0BBwGggCSA"
-            + "BIIDDzCCAwswggMHBgsqhkiG9w0BDAoBAqCCArIwggKuMCgGCiqGSIb3DQEM"
-            + "AQMwGgQUyeN8U+ViAJCk1WGo8wTnRVOaE1oCAgQABIICgH3yMWB+dfMBNa07"
-            + "hn3smUSBTF+LUauM+kx+12nZt0QazBYg09yM+aVcTznettlDwE/PTpKZnrFT"
-            + "22DSQf5GwABwiL6KW+xyM8wV5vZx1xtqrQoNf2oNHnF0lB7ddSYM8jHqennb"
-            + "bzcVOdrrCqewqAfUU/CDugpwwI8c8Iy9ECri6vBMbfeIIZQTug+1952TCCiA"
-            + "E1bEDFGqgAoDsqYi6uNtpjmL/DPX/qmkbHAXUKxOtjTtxacfat2HgN97Gb7z"
-            + "+ZBNI5aaCSRoYwl+K9biWGID3EqsNmg0+2ELmFhE4mQZ78i7vNLTG7e5mj6v"
-            + "Qt+QuqN+daCbVqVTKxsFpODRRweobUTRxwEun6p0p3w3SUhR6p7ug1Jttgyu"
-            + "vfZug3PIk2j9fb26wAs2ZreVYut8hXpp/09ulCUudtlsYb/FD+H11v/JyopG"
-            + "2vYy0hL/gkMr41sGoVdyvzXeZUa7A1wYask+g7torad9sT8CPb3zXBd0kU2r"
-            + "lbSJIXQ8wTpheeUKe47YF9JVCF8WRc1dokD7fgfn6197pwyZpDEVrVyz1pUq"
-            + "jyum3ctONU4BSkAUVr9pTyeRFUeOE7SLuVu+c67PzNWXEc/HMVD4Hgs/idVc"
-            + "mrONk3xe385wFJK1iPe1kfRX5OXk9UWr2/yjgrahbkonWhJHnIlvs+b5rRKN"
-            + "qauwUZ+agMJV98Eyc2Lz0Lp/pNDRNjmGXeJLzAaAy46STov8sxwAgj3bQ7xu"
-            + "uEzdhJPDynAY5sWd3WnBY2ZhpawnToEKnD4u+eiH2MjUL2q/R2IPSmoyg9i2"
-            + "Ictgh4/ylrhm+lJDzcDrLDhC0m/t9EdhytH4erk/uCPcmAK/jpzFn6ltxcsx"
-            + "QjAbBgkqhkiG9w0BCRQxDh4MAGMAbABpAGUAbgB0MCMGCSqGSIb3DQEJFTEW"
-            + "BBS2wDxw7yH2OhKIgkDoQrTlavLvxQAAAAAAADCABgkqhkiG9w0BBwaggDCA"
-            + "AgEAMIAGCSqGSIb3DQEHATAoBgoqhkiG9w0BDAEGMBoEFORdyeTIG2oXDQBl"
-            + "I3aFNozDAkC2AgIEAKCABIIHICsc3D8rxLiDlegyXFfIejto66RW4u6b+d0C"
-            + "uAAz0G+dIvhQ9g3s++vUsX7x+icO/vjpgdo09aqtIg7T3suzfcHtU8CGSgtQ"
-            + "Tvml25LDC3IK3qI6cRqO+sCdvg18aS04IDKvDPYH4ca5btwPBIID6CStk/jY"
-            + "QFpnSI6VNz9IERi/nwuvuBYk+A0Z7+nQdhF+QkW1rzN+uz0dkNJt6ZbG5lEK"
-            + "GayV+FDTQcREMihYa716RN9sq3cm0jXXdttj998oS/QrpZDEcPqd4AM6EIL+"
-            + "PTA1tEQYxXa8msAPp+tLvXOtiD6v/4FO77EA7E5oR36a9en+M1QQasFU3VBf"
-            + "V9os92QlbtVUTkspJV9gXL6s4CGNptc7lUH+nIw65j9MOoyOU9w1qjPRlN/Z"
-            + "MTuhFooglE6TPd29Udwufqp+hHkW/7z5tBKkhGlZEClzD3IWhcF9NVraE/IV"
-            + "S5qVmx2Up7SeLZAXJ+AAznq5IXwE1dOUTkwYLcIrH1FuVA5rtOkB8Xt1LJq0"
-            + "ERkjJ5MfpxTxbKXp5PejzD98v54+s4INekcrI0jzz4pLsann7ex0r6CPsQsH"
-            + "+F3rBVaT3oHSKqoIm2Nw57oDjLLp5lP2qcCqps3y2dcVzu5NIzCSkVlxUaBK"
-            + "IT3xv0gvVJI7wnP0QM35MCywKkToJX5ajQKrDc4iCAAzmxaQzdBycxJPYByq"
-            + "VHvH7BJldJlMw5NHbTHlNoYKndMdAsHp7sUqERkDEGl80R86TlB4nJaDrfsx"
-            + "vL+KluiCY9AD7o+MEYZ9VYoNDUzVGH4pTr4wnv1UFoRWix5IZuDnnYkyijKD"
-            + "VtU5+mc0YtsPQIpKCBJOYt05bgpX5aPQ3s2lviYw3bvP0TrclYs/rx4wKVgW"
-            + "2GYLzPh0OVMBduCbzW1E58ieBsgRyQ7+2MTl9Nj+nznjCAfLSvrVEcwxVUQA"
-            + "ofcEbiECEJss2JNQq8erwgo8dP3atwQ1KeqMc8acICcOrI2rNxwVOLzPuCsl"
-            + "l8gwZOoxLZXuKMQbQu4as1HNS309dfWIWppvc3K4nDWg51HUCPbsIo3wm3rR"
-            + "igc/W3bf4Ppg0pLAS5c1s0Xau43u9GmIjGiDqYaasfcXnCKy2LNuUpbhoOC1"
-            + "o/wMC9gT45aJQ5vsVGe5XvfhLV7Y815EdI756s9PIEOnG8HbAtCAjOIVpQfP"
-            + "eF8+cnZyGGdsbmu7lYzg3whCpZ/L2RrTI86nEn5eePs4m2hDV0Oi9r6e2CIf"
-            + "nGUa0TB9jf1OMhOSBD+h4jx7b6uT+XLmG8qUxvkoItMDZLrJ0f8czO5MyOZa"
-            + "nEJoG42Fy2p7zD/qO72OUQISNmt8C1rQFsg9dBDib4DMu69vBsVrIV028sal"
-            + "+tq1UH3vFMbEYyVfPH3WDgxyHwUQK2qrz3WBdD/BMyuAV4DPI3SPTweROh8n"
-            + "yWJN1ppY9qybmTyHFCs6TRjPB9cVcdKSc0qYxgzblJiXXb3s9ANOb89aA3Ah"
-            + "anWnAhcEggLZN2yFCtrRuvJXvDQhj8qmye9UkjB2fEpWXV7H0natE3hSoB+C"
-            + "2krt3eBV0xJ1tLEco7T4zsbQQJRmeu/essOsfwpRfE5ZPoIeThf+UmWTsfsw"
-            + "r4fxeePMTy6iCnkF5/ro8k5WKnOsaV+HWy/ulwW2r/DMT3aDBWfHX5Hk8DpU"
-            + "+PlQhbyGTSTIJ/OFmbcWjMPt469o7+KrrF9IBrzJ42KzMw6xtKwtVb0232AM"
-            + "pIwnLzCHIiNO2qDBZAIDdF68+GU3RsEkHfR6d5myZVxnH4mhSCFFtHxgqTOz"
-            + "Ouo/uvgu72miZ0OFAy1zcMtfGMS3Md54MJkhSZq4ZgUo/EyJCeEDLGn8pMF1"
-            + "jX1WsUj96qMRyc+p2KnKs6ZL95BVa76SdIFz6ts6uoIem3drTXYJHNbw29OW"
-            + "Y0am+FmXTWFZFnin8Qu5Xct5l7FYIGA9VLOHL9Vtp+SXomcFEZpjMaxvtf4R"
-            + "xoAI2Bc9Ka+MNiz35O0JXhI9/t5uOdiN6ZOJlfpEWOK7ou5lDkZuDcrHvLvQ"
-            + "PocP2Yemd36xEgjFssR/tFITlhRBXHDeHwpvmXM4iiwD1wOGMqybXx/1g1m1"
-            + "0UBbKqDsgSLQC7c0TaRFJjj71T74PBMiapiQgijv9WINfmTgxNUukbK3Kqp/"
-            + "G3BmThoIDCB8WD1kxXBpaG62dSsih7yhPQJVEV3Y0tdkdChOk+Y3Wf8crV/Q"
-            + "P08pQH7H9yCi04S5fSJtIDtYARWhr1yl8EQMnu2X8J6r/DWcDmXUK4Bv1vqe"
-            + "tcnT5EAYFPeOMz21nonM3kJgUMNsxCQjKaEMEcUu8ZRnGUAFdG4lULPJn5NQ"
-            + "LTvWg8Y3GrHRLjpnd9k+8gWWzRIbBiwCwEbClMZffRd6kcA5ZoOhVngdyvvj"
-            + "BhkgadB5jC+ZRzExHxoEhzPJx3mxIVTqLuw7QxHz9OTcysvY/cGKCvmgzgk/"
-            + "TjTJsqcEAAAAAAAAAAAAAAAAAAAAAAAAMD0wITAJBgUrDgMCGgUABBQWfGA6"
-            + "lI+TXQiuXaa1V+LlHodhXAQUAwMIAAUvBYY+a7sXNlQeVEPAGkMCAgQAAAA=");
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/test/LoggingDatagramTransport.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/test/LoggingDatagramTransport.java
deleted file mode 100644
index 4181619..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/test/LoggingDatagramTransport.java
+++ /dev/null
@@ -1,91 +0,0 @@
-package org.bouncycastle.crypto.tls.test;
-
-import java.io.IOException;
-import java.io.PrintStream;
-
-import org.bouncycastle.crypto.tls.DatagramTransport;
-
-public class LoggingDatagramTransport
-    implements DatagramTransport
-{
-
-    private static final String HEX_CHARS = "0123456789ABCDEF";
-
-    private final DatagramTransport transport;
-    private final PrintStream output;
-    private final long launchTimestamp;
-
-    public LoggingDatagramTransport(DatagramTransport transport, PrintStream output)
-    {
-        this.transport = transport;
-        this.output = output;
-        this.launchTimestamp = System.currentTimeMillis();
-    }
-
-    public int getReceiveLimit()
-        throws IOException
-    {
-        return transport.getReceiveLimit();
-    }
-
-    public int getSendLimit()
-        throws IOException
-    {
-        return transport.getSendLimit();
-    }
-
-    public int receive(byte[] buf, int off, int len, int waitMillis)
-        throws IOException
-    {
-        int length = transport.receive(buf, off, len, waitMillis);
-        if (length >= 0)
-        {
-            dumpDatagram("Received", buf, off, length);
-        }
-        return length;
-    }
-
-    public void send(byte[] buf, int off, int len)
-        throws IOException
-    {
-        dumpDatagram("Sending", buf, off, len);
-        transport.send(buf, off, len);
-    }
-
-    public void close()
-        throws IOException
-    {
-    }
-
-    private void dumpDatagram(String verb, byte[] buf, int off, int len)
-        throws IOException
-    {
-        long timestamp = System.currentTimeMillis() - launchTimestamp;
-        StringBuffer sb = new StringBuffer("(+" + timestamp + "ms) " + verb + " " + len + " byte datagram:");
-        for (int pos = 0; pos < len; ++pos)
-        {
-            if (pos % 16 == 0)
-            {
-                sb.append(System.getProperty("line.separator"));
-                sb.append("    ");
-            }
-            else if (pos % 16 == 8)
-            {
-                sb.append('-');
-            }
-            else
-            {
-                sb.append(' ');
-            }
-            int val = buf[off + pos] & 0xFF;
-            sb.append(HEX_CHARS.charAt(val >> 4));
-            sb.append(HEX_CHARS.charAt(val & 0xF));
-        }
-        dump(sb.toString());
-    }
-
-    private synchronized void dump(String s)
-    {
-        output.println(s);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/test/MockDTLSClient.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/test/MockDTLSClient.java
deleted file mode 100644
index c93b89e..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/test/MockDTLSClient.java
+++ /dev/null
@@ -1,180 +0,0 @@
-package org.bouncycastle.crypto.tls.test;
-
-import java.io.IOException;
-import java.io.PrintStream;
-import java.util.Hashtable;
-import java.util.Vector;
-
-import org.bouncycastle.asn1.x509.Certificate;
-import org.bouncycastle.crypto.tls.AlertDescription;
-import org.bouncycastle.crypto.tls.AlertLevel;
-import org.bouncycastle.crypto.tls.CertificateRequest;
-import org.bouncycastle.crypto.tls.ClientCertificateType;
-import org.bouncycastle.crypto.tls.DefaultTlsClient;
-import org.bouncycastle.crypto.tls.MaxFragmentLength;
-import org.bouncycastle.crypto.tls.ProtocolVersion;
-import org.bouncycastle.crypto.tls.SignatureAlgorithm;
-import org.bouncycastle.crypto.tls.SignatureAndHashAlgorithm;
-import org.bouncycastle.crypto.tls.TlsAuthentication;
-import org.bouncycastle.crypto.tls.TlsCredentials;
-import org.bouncycastle.crypto.tls.TlsExtensionsUtils;
-import org.bouncycastle.crypto.tls.TlsSession;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.encoders.Hex;
-
-public class MockDTLSClient
-    extends DefaultTlsClient
-{
-    protected TlsSession session;
-
-    public MockDTLSClient(TlsSession session)
-    {
-        this.session = session;
-    }
-
-    public TlsSession getSessionToResume()
-    {
-        return this.session;
-    }
-
-    public void notifyAlertRaised(short alertLevel, short alertDescription, String message, Throwable cause)
-    {
-        PrintStream out = (alertLevel == AlertLevel.fatal) ? System.err : System.out;
-        out.println("DTLS client raised alert: " + AlertLevel.getText(alertLevel)
-            + ", " + AlertDescription.getText(alertDescription));
-        if (message != null)
-        {
-            out.println(message);
-        }
-        if (cause != null)
-        {
-            cause.printStackTrace(out);
-        }
-    }
-
-    public void notifyAlertReceived(short alertLevel, short alertDescription)
-    {
-        PrintStream out = (alertLevel == AlertLevel.fatal) ? System.err : System.out;
-        out.println("DTLS client received alert: " + AlertLevel.getText(alertLevel)
-            + ", " + AlertDescription.getText(alertDescription));
-    }
-
-    public ProtocolVersion getClientVersion()
-    {
-        return ProtocolVersion.DTLSv12;
-    }
-
-    public ProtocolVersion getMinimumVersion()
-    {
-        return ProtocolVersion.DTLSv10;
-    }
-
-//    public int[] getCipherSuites()
-//    {
-//        return Arrays.concatenate(super.getCipherSuites(),
-//            new int[]
-//            {
-//                CipherSuite.TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256,
-//                CipherSuite.TLS_ECDHE_RSA_WITH_ESTREAM_SALSA20_SHA1,
-//                CipherSuite.TLS_ECDHE_RSA_WITH_SALSA20_SHA1,
-//                CipherSuite.TLS_RSA_WITH_ESTREAM_SALSA20_SHA1,
-//                CipherSuite.TLS_RSA_WITH_SALSA20_SHA1,
-//            });
-//    }
-
-    public Hashtable getClientExtensions() throws IOException
-    {
-        Hashtable clientExtensions = TlsExtensionsUtils.ensureExtensionsInitialised(super.getClientExtensions());
-        TlsExtensionsUtils.addEncryptThenMACExtension(clientExtensions);
-        // TODO[draft-ietf-tls-session-hash-01] Enable once code-point assigned (only for compatible server though)
-//        TlsExtensionsUtils.addExtendedMasterSecretExtension(clientExtensions);
-        TlsExtensionsUtils.addMaxFragmentLengthExtension(clientExtensions, MaxFragmentLength.pow2_9);
-        TlsExtensionsUtils.addTruncatedHMacExtension(clientExtensions);
-        return clientExtensions;
-    }
-
-    public void notifyServerVersion(ProtocolVersion serverVersion) throws IOException
-    {
-        super.notifyServerVersion(serverVersion);
-
-        System.out.println("Negotiated " + serverVersion);
-    }
-
-    public TlsAuthentication getAuthentication()
-        throws IOException
-    {
-        return new TlsAuthentication()
-        {
-            public void notifyServerCertificate(org.bouncycastle.crypto.tls.Certificate serverCertificate)
-                throws IOException
-            {
-                Certificate[] chain = serverCertificate.getCertificateList();
-                System.out.println("Received server certificate chain of length " + chain.length);
-                for (int i = 0; i != chain.length; i++)
-                {
-                    Certificate entry = chain[i];
-                    // TODO Create fingerprint based on certificate signature algorithm digest
-                    System.out.println("    fingerprint:SHA-256 " + TlsTestUtils.fingerprint(entry) + " ("
-                        + entry.getSubject() + ")");
-                }
-            }
-
-            public TlsCredentials getClientCredentials(CertificateRequest certificateRequest)
-                throws IOException
-            {
-                short[] certificateTypes = certificateRequest.getCertificateTypes();
-                if (certificateTypes == null || !Arrays.contains(certificateTypes, ClientCertificateType.rsa_sign))
-                {
-                    return null;
-                }
-
-                SignatureAndHashAlgorithm signatureAndHashAlgorithm = null;
-                Vector sigAlgs = certificateRequest.getSupportedSignatureAlgorithms();
-                if (sigAlgs != null)
-                {
-                    for (int i = 0; i < sigAlgs.size(); ++i)
-                    {
-                        SignatureAndHashAlgorithm sigAlg = (SignatureAndHashAlgorithm)
-                            sigAlgs.elementAt(i);
-                        if (sigAlg.getSignature() == SignatureAlgorithm.rsa)
-                        {
-                            signatureAndHashAlgorithm = sigAlg;
-                            break;
-                        }
-                    }
-
-                    if (signatureAndHashAlgorithm == null)
-                    {
-                        return null;
-                    }
-                }
-
-                return TlsTestUtils.loadSignerCredentials(context, new String[] { "x509-client.pem", "x509-ca.pem" },
-                    "x509-client-key.pem", signatureAndHashAlgorithm);
-            }
-        };
-    }
-
-    public void notifyHandshakeComplete() throws IOException
-    {
-        super.notifyHandshakeComplete();
-
-        TlsSession newSession = context.getResumableSession();
-        if (newSession != null)
-        {
-            byte[] newSessionID = newSession.getSessionID();
-            String hex = Hex.toHexString(newSessionID);
-
-            if (this.session != null && Arrays.areEqual(this.session.getSessionID(), newSessionID))
-            {
-                System.out.println("Resumed session: " + hex);
-            }
-            else
-            {
-                System.out.println("Established session: " + hex);
-            }
-
-            this.session = newSession;
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/test/MockDTLSServer.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/test/MockDTLSServer.java
deleted file mode 100644
index bdf533f..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/test/MockDTLSServer.java
+++ /dev/null
@@ -1,138 +0,0 @@
-package org.bouncycastle.crypto.tls.test;
-
-import java.io.IOException;
-import java.io.PrintStream;
-import java.util.Vector;
-
-import org.bouncycastle.asn1.x509.Certificate;
-import org.bouncycastle.crypto.tls.AlertDescription;
-import org.bouncycastle.crypto.tls.AlertLevel;
-import org.bouncycastle.crypto.tls.CertificateRequest;
-import org.bouncycastle.crypto.tls.CipherSuite;
-import org.bouncycastle.crypto.tls.ClientCertificateType;
-import org.bouncycastle.crypto.tls.DefaultTlsServer;
-import org.bouncycastle.crypto.tls.ProtocolVersion;
-import org.bouncycastle.crypto.tls.SignatureAlgorithm;
-import org.bouncycastle.crypto.tls.SignatureAndHashAlgorithm;
-import org.bouncycastle.crypto.tls.TlsEncryptionCredentials;
-import org.bouncycastle.crypto.tls.TlsSignerCredentials;
-import org.bouncycastle.crypto.tls.TlsUtils;
-import org.bouncycastle.util.Arrays;
-
-public class MockDTLSServer
-    extends DefaultTlsServer
-{
-    public void notifyAlertRaised(short alertLevel, short alertDescription, String message, Throwable cause)
-    {
-        PrintStream out = (alertLevel == AlertLevel.fatal) ? System.err : System.out;
-        out.println("DTLS server raised alert: " + AlertLevel.getText(alertLevel)
-            + ", " + AlertDescription.getText(alertDescription));
-        if (message != null)
-        {
-            out.println(message);
-        }
-        if (cause != null)
-        {
-            cause.printStackTrace(out);
-        }
-    }
-
-    public void notifyAlertReceived(short alertLevel, short alertDescription)
-    {
-        PrintStream out = (alertLevel == AlertLevel.fatal) ? System.err : System.out;
-        out.println("DTLS server received alert: " + AlertLevel.getText(alertLevel)
-            + ", " + AlertDescription.getText(alertDescription));
-    }
-
-    protected int[] getCipherSuites()
-    {
-        return Arrays.concatenate(super.getCipherSuites(),
-            new int[]
-            {
-                CipherSuite.TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256,
-                CipherSuite.TLS_ECDHE_RSA_WITH_ESTREAM_SALSA20_SHA1,
-                CipherSuite.TLS_ECDHE_RSA_WITH_SALSA20_SHA1,
-                CipherSuite.TLS_RSA_WITH_ESTREAM_SALSA20_SHA1,
-                CipherSuite.TLS_RSA_WITH_SALSA20_SHA1,
-            });
-    }
-
-    public CertificateRequest getCertificateRequest() throws IOException
-    {
-        short[] certificateTypes = new short[]{ ClientCertificateType.rsa_sign,
-            ClientCertificateType.dss_sign, ClientCertificateType.ecdsa_sign };
-
-        Vector serverSigAlgs = null;
-        if (TlsUtils.isSignatureAlgorithmsExtensionAllowed(serverVersion))
-        {
-            serverSigAlgs = TlsUtils.getDefaultSupportedSignatureAlgorithms();
-        }
-
-        Vector certificateAuthorities = new Vector();
-        certificateAuthorities.add(TlsTestUtils.loadCertificateResource("x509-ca.pem").getSubject());
-
-        return new CertificateRequest(certificateTypes, serverSigAlgs, certificateAuthorities);
-    }
-
-    public void notifyClientCertificate(org.bouncycastle.crypto.tls.Certificate clientCertificate)
-        throws IOException
-    {
-        Certificate[] chain = clientCertificate.getCertificateList();
-        System.out.println("Received client certificate chain of length " + chain.length);
-        for (int i = 0; i != chain.length; i++)
-        {
-            Certificate entry = chain[i];
-            // TODO Create fingerprint based on certificate signature algorithm digest
-            System.out.println("    fingerprint:SHA-256 " + TlsTestUtils.fingerprint(entry) + " (" + entry.getSubject()
-                + ")");
-        }
-    }
-
-    protected ProtocolVersion getMaximumVersion()
-    {
-        return ProtocolVersion.DTLSv12;
-    }
-
-    protected ProtocolVersion getMinimumVersion()
-    {
-        return ProtocolVersion.DTLSv10;
-    }
-
-    protected TlsEncryptionCredentials getRSAEncryptionCredentials()
-        throws IOException
-    {
-        return TlsTestUtils.loadEncryptionCredentials(context, new String[]{"x509-server.pem", "x509-ca.pem"},
-            "x509-server-key.pem");
-    }
-
-    protected TlsSignerCredentials getRSASignerCredentials()
-        throws IOException
-    {
-        /*
-         * TODO Note that this code fails to provide default value for the client supported
-         * algorithms if it wasn't sent.
-         */
-        SignatureAndHashAlgorithm signatureAndHashAlgorithm = null;
-        Vector sigAlgs = supportedSignatureAlgorithms;
-        if (sigAlgs != null)
-        {
-            for (int i = 0; i < sigAlgs.size(); ++i)
-            {
-                SignatureAndHashAlgorithm sigAlg = (SignatureAndHashAlgorithm)
-                    sigAlgs.elementAt(i);
-                if (sigAlg.getSignature() == SignatureAlgorithm.rsa)
-                {
-                    signatureAndHashAlgorithm = sigAlg;
-                    break;
-                }
-            }
-
-            if (signatureAndHashAlgorithm == null)
-            {
-                return null;
-            }
-        }
-        return TlsTestUtils.loadSignerCredentials(context, new String[]{"x509-server.pem", "x509-ca.pem"},
-            "x509-server-key.pem", signatureAndHashAlgorithm);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/test/MockDatagramAssociation.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/test/MockDatagramAssociation.java
deleted file mode 100644
index b8b7c06..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/test/MockDatagramAssociation.java
+++ /dev/null
@@ -1,110 +0,0 @@
-package org.bouncycastle.crypto.tls.test;
-
-import java.io.IOException;
-import java.net.DatagramPacket;
-import java.util.Vector;
-
-import org.bouncycastle.crypto.tls.DatagramTransport;
-
-public class MockDatagramAssociation
-{
-    private int mtu;
-    private MockDatagramTransport client, server;
-
-    public MockDatagramAssociation(int mtu)
-    {
-        this.mtu = mtu;
-
-        Vector clientQueue = new Vector();
-        Vector serverQueue = new Vector();
-
-        this.client = new MockDatagramTransport(clientQueue, serverQueue);
-        this.server = new MockDatagramTransport(serverQueue, clientQueue);
-    }
-
-    public DatagramTransport getClient()
-    {
-        return client;
-    }
-
-    public DatagramTransport getServer()
-    {
-        return server;
-    }
-
-    private class MockDatagramTransport
-        implements DatagramTransport
-    {
-        private Vector receiveQueue, sendQueue;
-
-        MockDatagramTransport(Vector receiveQueue, Vector sendQueue)
-        {
-            this.receiveQueue = receiveQueue;
-            this.sendQueue = sendQueue;
-        }
-
-        public int getReceiveLimit()
-            throws IOException
-        {
-            return mtu;
-        }
-
-        public int getSendLimit()
-            throws IOException
-        {
-            return mtu;
-        }
-
-        public int receive(byte[] buf, int off, int len, int waitMillis)
-            throws IOException
-        {
-            synchronized (receiveQueue)
-            {
-                if (receiveQueue.isEmpty())
-                {
-                    try
-                    {
-                        receiveQueue.wait(waitMillis);
-                    }
-                    catch (InterruptedException e)
-                    {
-                        // TODO Keep waiting until full wait expired?
-                    }
-                    if (receiveQueue.isEmpty())
-                    {
-                        return -1;
-                    }
-                }
-                DatagramPacket packet = (DatagramPacket)receiveQueue.remove(0);
-                int copyLength = Math.min(len, packet.getLength());
-                System.arraycopy(packet.getData(), packet.getOffset(), buf, off, copyLength);
-                return copyLength;
-            }
-        }
-
-        public void send(byte[] buf, int off, int len)
-            throws IOException
-        {
-            if (len > mtu)
-            {
-                // TODO Simulate rejection?
-            }
-
-            byte[] copy = new byte[len];
-            System.arraycopy(buf, off, copy, 0, len);
-            DatagramPacket packet = new DatagramPacket(copy, len);
-
-            synchronized (sendQueue)
-            {
-                sendQueue.addElement(packet);
-                sendQueue.notify();
-            }
-        }
-
-        public void close()
-            throws IOException
-        {
-            // TODO?
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/test/MockPSKTlsClient.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/test/MockPSKTlsClient.java
deleted file mode 100644
index 7af5957..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/test/MockPSKTlsClient.java
+++ /dev/null
@@ -1,134 +0,0 @@
-package org.bouncycastle.crypto.tls.test;
-
-import java.io.IOException;
-import java.io.PrintStream;
-import java.util.Hashtable;
-
-import org.bouncycastle.asn1.x509.Certificate;
-import org.bouncycastle.crypto.tls.AlertDescription;
-import org.bouncycastle.crypto.tls.AlertLevel;
-import org.bouncycastle.crypto.tls.BasicTlsPSKIdentity;
-import org.bouncycastle.crypto.tls.CipherSuite;
-import org.bouncycastle.crypto.tls.PSKTlsClient;
-import org.bouncycastle.crypto.tls.ProtocolVersion;
-import org.bouncycastle.crypto.tls.ServerOnlyTlsAuthentication;
-import org.bouncycastle.crypto.tls.TlsAuthentication;
-import org.bouncycastle.crypto.tls.TlsExtensionsUtils;
-import org.bouncycastle.crypto.tls.TlsPSKIdentity;
-import org.bouncycastle.crypto.tls.TlsSession;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.encoders.Hex;
-
-class MockPSKTlsClient
-    extends PSKTlsClient
-{
-    TlsSession session;
-
-    MockPSKTlsClient(TlsSession session)
-    {
-        this(session, new BasicTlsPSKIdentity("client", new byte[16]));
-    }
-
-    MockPSKTlsClient(TlsSession session, TlsPSKIdentity pskIdentity)
-    {
-        super(pskIdentity);
-
-        this.session = session;
-    }
-
-    public TlsSession getSessionToResume()
-    {
-        return this.session;
-    }
-
-    public void notifyAlertRaised(short alertLevel, short alertDescription, String message, Throwable cause)
-    {
-        PrintStream out = (alertLevel == AlertLevel.fatal) ? System.err : System.out;
-        out.println("TLS-PSK client raised alert: " + AlertLevel.getText(alertLevel) + ", "
-            + AlertDescription.getText(alertDescription));
-        if (message != null)
-        {
-            out.println("> " + message);
-        }
-        if (cause != null)
-        {
-            cause.printStackTrace(out);
-        }
-    }
-
-    public void notifyAlertReceived(short alertLevel, short alertDescription)
-    {
-        PrintStream out = (alertLevel == AlertLevel.fatal) ? System.err : System.out;
-        out.println("TLS-PSK client received alert: " + AlertLevel.getText(alertLevel) + ", "
-            + AlertDescription.getText(alertDescription));
-    }
-
-    public void notifyHandshakeComplete() throws IOException
-    {
-        super.notifyHandshakeComplete();
-
-        TlsSession newSession = context.getResumableSession();
-        if (newSession != null)
-        {
-            byte[] newSessionID = newSession.getSessionID();
-            String hex = Hex.toHexString(newSessionID);
-
-            if (this.session != null && Arrays.areEqual(this.session.getSessionID(), newSessionID))
-            {
-                System.out.println("Resumed session: " + hex);
-            }
-            else
-            {
-                System.out.println("Established session: " + hex);
-            }
-
-            this.session = newSession;
-        }
-    }
-
-    public int[] getCipherSuites()
-    {
-        return new int[]{ CipherSuite.TLS_ECDHE_PSK_WITH_AES_256_CBC_SHA384,
-            CipherSuite.TLS_DHE_PSK_WITH_AES_256_CBC_SHA384, CipherSuite.TLS_RSA_PSK_WITH_AES_256_CBC_SHA384,
-            CipherSuite.TLS_PSK_WITH_AES_256_CBC_SHA };
-    }
-
-    public ProtocolVersion getMinimumVersion()
-    {
-        return ProtocolVersion.TLSv12;
-    }
-
-    public Hashtable getClientExtensions() throws IOException
-    {
-        Hashtable clientExtensions = TlsExtensionsUtils.ensureExtensionsInitialised(super.getClientExtensions());
-        TlsExtensionsUtils.addEncryptThenMACExtension(clientExtensions);
-        return clientExtensions;
-    }
-
-    public void notifyServerVersion(ProtocolVersion serverVersion) throws IOException
-    {
-        super.notifyServerVersion(serverVersion);
-
-        System.out.println("TLS-PSK client negotiated " + serverVersion);
-    }
-
-    public TlsAuthentication getAuthentication() throws IOException
-    {
-        return new ServerOnlyTlsAuthentication()
-        {
-            public void notifyServerCertificate(org.bouncycastle.crypto.tls.Certificate serverCertificate)
-                throws IOException
-            {
-                Certificate[] chain = serverCertificate.getCertificateList();
-                System.out.println("TLS-PSK client received server certificate chain of length " + chain.length);
-                for (int i = 0; i != chain.length; i++)
-                {
-                    Certificate entry = chain[i];
-                    // TODO Create fingerprint based on certificate signature algorithm digest
-                    System.out.println("    fingerprint:SHA-256 " + TlsTestUtils.fingerprint(entry) + " ("
-                        + entry.getSubject() + ")");
-                }
-            }
-        };
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/test/MockPSKTlsServer.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/test/MockPSKTlsServer.java
deleted file mode 100644
index d5ca7ab..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/test/MockPSKTlsServer.java
+++ /dev/null
@@ -1,110 +0,0 @@
-package org.bouncycastle.crypto.tls.test;
-
-import java.io.IOException;
-import java.io.PrintStream;
-
-import org.bouncycastle.crypto.tls.AlertDescription;
-import org.bouncycastle.crypto.tls.AlertLevel;
-import org.bouncycastle.crypto.tls.CipherSuite;
-import org.bouncycastle.crypto.tls.PSKTlsServer;
-import org.bouncycastle.crypto.tls.ProtocolVersion;
-import org.bouncycastle.crypto.tls.TlsEncryptionCredentials;
-import org.bouncycastle.crypto.tls.TlsPSKIdentityManager;
-import org.bouncycastle.util.Strings;
-
-class MockPSKTlsServer
-    extends PSKTlsServer
-{
-    MockPSKTlsServer()
-    {
-        super(new MyIdentityManager());
-    }
-
-    public void notifyAlertRaised(short alertLevel, short alertDescription, String message, Throwable cause)
-    {
-        PrintStream out = (alertLevel == AlertLevel.fatal) ? System.err : System.out;
-        out.println("TLS-PSK server raised alert: " + AlertLevel.getText(alertLevel) + ", "
-            + AlertDescription.getText(alertDescription));
-        if (message != null)
-        {
-            out.println("> " + message);
-        }
-        if (cause != null)
-        {
-            cause.printStackTrace(out);
-        }
-    }
-
-    public void notifyAlertReceived(short alertLevel, short alertDescription)
-    {
-        PrintStream out = (alertLevel == AlertLevel.fatal) ? System.err : System.out;
-        out.println("TLS-PSK server received alert: " + AlertLevel.getText(alertLevel) + ", "
-            + AlertDescription.getText(alertDescription));
-    }
-
-    public void notifyHandshakeComplete() throws IOException
-    {
-        super.notifyHandshakeComplete();
-
-        byte[] pskIdentity = context.getSecurityParameters().getPSKIdentity();
-        if (pskIdentity != null)
-        {
-            String name = Strings.fromUTF8ByteArray(pskIdentity);
-            System.out.println("TLS-PSK server completed handshake for PSK identity: " + name);
-        }
-    }
-
-    protected int[] getCipherSuites()
-    {
-        return new int[]{ CipherSuite.TLS_ECDHE_PSK_WITH_AES_256_CBC_SHA384,
-            CipherSuite.TLS_DHE_PSK_WITH_AES_256_CBC_SHA384, CipherSuite.TLS_RSA_PSK_WITH_AES_256_CBC_SHA384,
-            CipherSuite.TLS_PSK_WITH_AES_256_CBC_SHA };
-    }
-
-    protected ProtocolVersion getMaximumVersion()
-    {
-        return ProtocolVersion.TLSv12;
-    }
-
-    protected ProtocolVersion getMinimumVersion()
-    {
-        return ProtocolVersion.TLSv12;
-    }
-
-    public ProtocolVersion getServerVersion() throws IOException
-    {
-        ProtocolVersion serverVersion = super.getServerVersion();
-
-        System.out.println("TLS-PSK server negotiated " + serverVersion);
-
-        return serverVersion;
-    }
-
-    protected TlsEncryptionCredentials getRSAEncryptionCredentials() throws IOException
-    {
-        return TlsTestUtils.loadEncryptionCredentials(context, new String[]{ "x509-server.pem", "x509-ca.pem" },
-            "x509-server-key.pem");
-    }
-
-    static class MyIdentityManager
-        implements TlsPSKIdentityManager
-    {
-        public byte[] getHint()
-        {
-            return Strings.toUTF8ByteArray("hint");
-        }
-
-        public byte[] getPSK(byte[] identity)
-        {
-            if (identity != null)
-            {
-                String name = Strings.fromUTF8ByteArray(identity);
-                if (name.equals("client"))
-                {
-                    return new byte[16];
-                }
-            }
-            return null;
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/test/MockSRPTlsClient.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/test/MockSRPTlsClient.java
deleted file mode 100644
index e6f20d6..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/test/MockSRPTlsClient.java
+++ /dev/null
@@ -1,120 +0,0 @@
-package org.bouncycastle.crypto.tls.test;
-
-import java.io.IOException;
-import java.io.PrintStream;
-import java.util.Hashtable;
-
-import org.bouncycastle.asn1.x509.Certificate;
-import org.bouncycastle.crypto.tls.AlertDescription;
-import org.bouncycastle.crypto.tls.AlertLevel;
-import org.bouncycastle.crypto.tls.CipherSuite;
-import org.bouncycastle.crypto.tls.ProtocolVersion;
-import org.bouncycastle.crypto.tls.SRPTlsClient;
-import org.bouncycastle.crypto.tls.ServerOnlyTlsAuthentication;
-import org.bouncycastle.crypto.tls.TlsAuthentication;
-import org.bouncycastle.crypto.tls.TlsExtensionsUtils;
-import org.bouncycastle.crypto.tls.TlsSession;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.encoders.Hex;
-
-class MockSRPTlsClient
-    extends SRPTlsClient
-{
-    TlsSession session;
-
-    MockSRPTlsClient(TlsSession session, byte[] identity, byte[] password)
-    {
-        super(identity, password);
-
-        this.session = session;
-    }
-
-    public TlsSession getSessionToResume()
-    {
-        return this.session;
-    }
-
-    public void notifyAlertRaised(short alertLevel, short alertDescription, String message, Throwable cause)
-    {
-        PrintStream out = (alertLevel == AlertLevel.fatal) ? System.err : System.out;
-        out.println("TLS-SRP client raised alert: " + AlertLevel.getText(alertLevel) + ", "
-            + AlertDescription.getText(alertDescription));
-        if (message != null)
-        {
-            out.println("> " + message);
-        }
-        if (cause != null)
-        {
-            cause.printStackTrace(out);
-        }
-    }
-
-    public void notifyAlertReceived(short alertLevel, short alertDescription)
-    {
-        PrintStream out = (alertLevel == AlertLevel.fatal) ? System.err : System.out;
-        out.println("TLS-SRP client received alert: " + AlertLevel.getText(alertLevel) + ", "
-            + AlertDescription.getText(alertDescription));
-    }
-
-    public void notifyHandshakeComplete() throws IOException
-    {
-        super.notifyHandshakeComplete();
-
-        TlsSession newSession = context.getResumableSession();
-        if (newSession != null)
-        {
-            byte[] newSessionID = newSession.getSessionID();
-            String hex = Hex.toHexString(newSessionID);
-
-            if (this.session != null && Arrays.areEqual(this.session.getSessionID(), newSessionID))
-            {
-                System.out.println("Resumed session: " + hex);
-            }
-            else
-            {
-                System.out.println("Established session: " + hex);
-            }
-
-            this.session = newSession;
-        }
-    }
-
-    public ProtocolVersion getMinimumVersion()
-    {
-        return ProtocolVersion.TLSv12;
-    }
-
-    public Hashtable getClientExtensions() throws IOException
-    {
-        Hashtable clientExtensions = TlsExtensionsUtils.ensureExtensionsInitialised(super.getClientExtensions());
-        TlsExtensionsUtils.addEncryptThenMACExtension(clientExtensions);
-        return clientExtensions;
-    }
-
-    public void notifyServerVersion(ProtocolVersion serverVersion) throws IOException
-    {
-        super.notifyServerVersion(serverVersion);
-
-        System.out.println("TLS-SRP client negotiated " + serverVersion);
-    }
-
-    public TlsAuthentication getAuthentication() throws IOException
-    {
-        return new ServerOnlyTlsAuthentication()
-        {
-            public void notifyServerCertificate(org.bouncycastle.crypto.tls.Certificate serverCertificate)
-                throws IOException
-            {
-                Certificate[] chain = serverCertificate.getCertificateList();
-                System.out.println("TLS-SRP client received server certificate chain of length " + chain.length);
-                for (int i = 0; i != chain.length; i++)
-                {
-                    Certificate entry = chain[i];
-                    // TODO Create fingerprint based on certificate signature algorithm digest
-                    System.out.println("    fingerprint:SHA-256 " + TlsTestUtils.fingerprint(entry) + " ("
-                        + entry.getSubject() + ")");
-                }
-            }
-        };
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/test/MockSRPTlsServer.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/test/MockSRPTlsServer.java
deleted file mode 100644
index 3593757..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/test/MockSRPTlsServer.java
+++ /dev/null
@@ -1,124 +0,0 @@
-package org.bouncycastle.crypto.tls.test;
-
-import java.io.IOException;
-import java.io.PrintStream;
-import java.math.BigInteger;
-
-import org.bouncycastle.crypto.agreement.srp.SRP6StandardGroups;
-import org.bouncycastle.crypto.agreement.srp.SRP6VerifierGenerator;
-import org.bouncycastle.crypto.params.SRP6GroupParameters;
-import org.bouncycastle.crypto.tls.AlertDescription;
-import org.bouncycastle.crypto.tls.AlertLevel;
-import org.bouncycastle.crypto.tls.HashAlgorithm;
-import org.bouncycastle.crypto.tls.ProtocolVersion;
-import org.bouncycastle.crypto.tls.SRPTlsServer;
-import org.bouncycastle.crypto.tls.SignatureAlgorithm;
-import org.bouncycastle.crypto.tls.SimulatedTlsSRPIdentityManager;
-import org.bouncycastle.crypto.tls.TlsSRPIdentityManager;
-import org.bouncycastle.crypto.tls.TlsSRPLoginParameters;
-import org.bouncycastle.crypto.tls.TlsSignerCredentials;
-import org.bouncycastle.crypto.tls.TlsUtils;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.Strings;
-
-class MockSRPTlsServer
-    extends SRPTlsServer
-{
-    static final SRP6GroupParameters TEST_GROUP = SRP6StandardGroups.rfc5054_1024;
-    static final byte[] TEST_IDENTITY = Strings.toUTF8ByteArray("client");
-    static final byte[] TEST_PASSWORD = Strings.toUTF8ByteArray("password");
-    static final byte[] TEST_SALT = Strings.toUTF8ByteArray("salt");
-    static final byte[] TEST_SEED_KEY = Strings.toUTF8ByteArray("seed_key");
-
-    MockSRPTlsServer()
-    {
-        super(new MyIdentityManager());
-    }
-
-    public void notifyAlertRaised(short alertLevel, short alertDescription, String message, Throwable cause)
-    {
-        PrintStream out = (alertLevel == AlertLevel.fatal) ? System.err : System.out;
-        out.println("TLS-SRP server raised alert: " + AlertLevel.getText(alertLevel) + ", "
-            + AlertDescription.getText(alertDescription));
-        if (message != null)
-        {
-            out.println("> " + message);
-        }
-        if (cause != null)
-        {
-            cause.printStackTrace(out);
-        }
-    }
-
-    public void notifyAlertReceived(short alertLevel, short alertDescription)
-    {
-        PrintStream out = (alertLevel == AlertLevel.fatal) ? System.err : System.out;
-        out.println("TLS-SRP server received alert: " + AlertLevel.getText(alertLevel) + ", "
-            + AlertDescription.getText(alertDescription));
-    }
-
-    public void notifyHandshakeComplete() throws IOException
-    {
-        super.notifyHandshakeComplete();
-
-        byte[] srpIdentity = context.getSecurityParameters().getSRPIdentity();
-        if (srpIdentity != null)
-        {
-            String name = Strings.fromUTF8ByteArray(srpIdentity);
-            System.out.println("TLS-SRP server completed handshake for SRP identity: " + name);
-        }
-    }
-
-    protected ProtocolVersion getMaximumVersion()
-    {
-        return ProtocolVersion.TLSv12;
-    }
-
-    protected ProtocolVersion getMinimumVersion()
-    {
-        return ProtocolVersion.TLSv12;
-    }
-
-    public ProtocolVersion getServerVersion() throws IOException
-    {
-        ProtocolVersion serverVersion = super.getServerVersion();
-
-        System.out.println("TLS-SRP server negotiated " + serverVersion);
-
-        return serverVersion;
-    }
-
-    protected TlsSignerCredentials getDSASignerCredentials() throws IOException
-    {
-        return TlsTestUtils.loadSignerCredentials(context, supportedSignatureAlgorithms, SignatureAlgorithm.dsa,
-            "x509-server-dsa.pem", "x509-server-key-dsa.pem");
-    }
-
-    protected TlsSignerCredentials getRSASignerCredentials() throws IOException
-    {
-        return TlsTestUtils.loadSignerCredentials(context, supportedSignatureAlgorithms, SignatureAlgorithm.rsa,
-            "x509-server.pem", "x509-server-key.pem");
-    }
-
-    static class MyIdentityManager
-        implements TlsSRPIdentityManager
-    {
-        protected SimulatedTlsSRPIdentityManager unknownIdentityManager = SimulatedTlsSRPIdentityManager.getRFC5054Default(
-            TEST_GROUP, TEST_SEED_KEY);
-
-        public TlsSRPLoginParameters getLoginParameters(byte[] identity)
-        {
-            if (Arrays.areEqual(TEST_IDENTITY, identity))
-            {
-                SRP6VerifierGenerator verifierGenerator = new SRP6VerifierGenerator();
-                verifierGenerator.init(TEST_GROUP, TlsUtils.createHash(HashAlgorithm.sha1));
-
-                BigInteger verifier = verifierGenerator.generateVerifier(TEST_SALT, identity, TEST_PASSWORD);
-
-                return new TlsSRPLoginParameters(TEST_GROUP, verifier, TEST_SALT);
-            }
-
-            return unknownIdentityManager.getLoginParameters(identity);
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/test/MockTlsClient.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/test/MockTlsClient.java
deleted file mode 100644
index 3530b4a..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/test/MockTlsClient.java
+++ /dev/null
@@ -1,170 +0,0 @@
-package org.bouncycastle.crypto.tls.test;
-
-import java.io.IOException;
-import java.io.PrintStream;
-import java.util.Hashtable;
-import java.util.Vector;
-
-import org.bouncycastle.asn1.x509.Certificate;
-import org.bouncycastle.crypto.tls.AlertDescription;
-import org.bouncycastle.crypto.tls.AlertLevel;
-import org.bouncycastle.crypto.tls.CertificateRequest;
-import org.bouncycastle.crypto.tls.ClientCertificateType;
-import org.bouncycastle.crypto.tls.DefaultTlsClient;
-import org.bouncycastle.crypto.tls.MaxFragmentLength;
-import org.bouncycastle.crypto.tls.ProtocolVersion;
-import org.bouncycastle.crypto.tls.SignatureAlgorithm;
-import org.bouncycastle.crypto.tls.SignatureAndHashAlgorithm;
-import org.bouncycastle.crypto.tls.TlsAuthentication;
-import org.bouncycastle.crypto.tls.TlsCredentials;
-import org.bouncycastle.crypto.tls.TlsExtensionsUtils;
-import org.bouncycastle.crypto.tls.TlsSession;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.encoders.Hex;
-
-class MockTlsClient
-    extends DefaultTlsClient
-{
-    TlsSession session;
-
-    MockTlsClient(TlsSession session)
-    {
-        this.session = session;
-    }
-
-    public TlsSession getSessionToResume()
-    {
-        return this.session;
-    }
-
-    public void notifyAlertRaised(short alertLevel, short alertDescription, String message, Throwable cause)
-    {
-        PrintStream out = (alertLevel == AlertLevel.fatal) ? System.err : System.out;
-        out.println("TLS client raised alert: " + AlertLevel.getText(alertLevel)
-            + ", " + AlertDescription.getText(alertDescription));
-        if (message != null)
-        {
-            out.println("> " + message);
-        }
-        if (cause != null)
-        {
-            cause.printStackTrace(out);
-        }
-    }
-
-    public void notifyAlertReceived(short alertLevel, short alertDescription)
-    {
-        PrintStream out = (alertLevel == AlertLevel.fatal) ? System.err : System.out;
-        out.println("TLS client received alert: " + AlertLevel.getText(alertLevel)
-            + ", " + AlertDescription.getText(alertDescription));
-    }
-
-//    public int[] getCipherSuites()
-//    {
-//        return Arrays.concatenate(super.getCipherSuites(),
-//            new int[]
-//            {
-//                CipherSuite.TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256,
-//                CipherSuite.TLS_ECDHE_RSA_WITH_ESTREAM_SALSA20_SHA1,
-//                CipherSuite.TLS_ECDHE_RSA_WITH_SALSA20_SHA1,
-//                CipherSuite.TLS_RSA_WITH_ESTREAM_SALSA20_SHA1,
-//                CipherSuite.TLS_RSA_WITH_SALSA20_SHA1,
-//            });
-//    }
-
-    public Hashtable getClientExtensions() throws IOException
-    {
-        Hashtable clientExtensions = TlsExtensionsUtils.ensureExtensionsInitialised(super.getClientExtensions());
-        TlsExtensionsUtils.addEncryptThenMACExtension(clientExtensions);
-        // TODO[draft-ietf-tls-session-hash-01] Enable once code-point assigned (only for compatible server though)
-//        TlsExtensionsUtils.addExtendedMasterSecretExtension(clientExtensions);
-        TlsExtensionsUtils.addMaxFragmentLengthExtension(clientExtensions, MaxFragmentLength.pow2_9);
-        TlsExtensionsUtils.addTruncatedHMacExtension(clientExtensions);
-        return clientExtensions;
-    }
-
-    public void notifyServerVersion(ProtocolVersion serverVersion) throws IOException
-    {
-        super.notifyServerVersion(serverVersion);
-
-        System.out.println("TLS client negotiated " + serverVersion);
-    }
-
-    public TlsAuthentication getAuthentication()
-        throws IOException
-    {
-        return new TlsAuthentication()
-        {
-            public void notifyServerCertificate(org.bouncycastle.crypto.tls.Certificate serverCertificate)
-                throws IOException
-            {
-                Certificate[] chain = serverCertificate.getCertificateList();
-                System.out.println("TLS client received server certificate chain of length " + chain.length);
-                for (int i = 0; i != chain.length; i++)
-                {
-                    Certificate entry = chain[i];
-                    // TODO Create fingerprint based on certificate signature algorithm digest
-                    System.out.println("    fingerprint:SHA-256 " + TlsTestUtils.fingerprint(entry) + " ("
-                        + entry.getSubject() + ")");
-                }
-            }
-
-            public TlsCredentials getClientCredentials(CertificateRequest certificateRequest)
-                throws IOException
-            {
-                short[] certificateTypes = certificateRequest.getCertificateTypes();
-                if (certificateTypes == null || !Arrays.contains(certificateTypes, ClientCertificateType.rsa_sign))
-                {
-                    return null;
-                }
-
-                SignatureAndHashAlgorithm signatureAndHashAlgorithm = null;
-                Vector sigAlgs = certificateRequest.getSupportedSignatureAlgorithms();
-                if (sigAlgs != null)
-                {
-                    for (int i = 0; i < sigAlgs.size(); ++i)
-                    {
-                        SignatureAndHashAlgorithm sigAlg = (SignatureAndHashAlgorithm)
-                            sigAlgs.elementAt(i);
-                        if (sigAlg.getSignature() == SignatureAlgorithm.rsa)
-                        {
-                            signatureAndHashAlgorithm = sigAlg;
-                            break;
-                        }
-                    }
-
-                    if (signatureAndHashAlgorithm == null)
-                    {
-                        return null;
-                    }
-                }
-
-                return TlsTestUtils.loadSignerCredentials(context, new String[] { "x509-client.pem", "x509-ca.pem" },
-                    "x509-client-key.pem", signatureAndHashAlgorithm);
-            }
-        };
-    }
-
-    public void notifyHandshakeComplete() throws IOException
-    {
-        super.notifyHandshakeComplete();
-
-        TlsSession newSession = context.getResumableSession();
-        if (newSession != null)
-        {
-            byte[] newSessionID = newSession.getSessionID();
-            String hex = Hex.toHexString(newSessionID);
-
-            if (this.session != null && Arrays.areEqual(this.session.getSessionID(), newSessionID))
-            {
-                System.out.println("Resumed session: " + hex);
-            }
-            else
-            {
-                System.out.println("Established session: " + hex);
-            }
-
-            this.session = newSession;
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/test/MockTlsServer.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/test/MockTlsServer.java
deleted file mode 100644
index 3aa47e8..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/test/MockTlsServer.java
+++ /dev/null
@@ -1,143 +0,0 @@
-package org.bouncycastle.crypto.tls.test;
-
-import java.io.IOException;
-import java.io.PrintStream;
-import java.util.Vector;
-
-import org.bouncycastle.asn1.x509.Certificate;
-import org.bouncycastle.crypto.tls.AlertDescription;
-import org.bouncycastle.crypto.tls.AlertLevel;
-import org.bouncycastle.crypto.tls.CertificateRequest;
-import org.bouncycastle.crypto.tls.CipherSuite;
-import org.bouncycastle.crypto.tls.ClientCertificateType;
-import org.bouncycastle.crypto.tls.DefaultTlsServer;
-import org.bouncycastle.crypto.tls.ProtocolVersion;
-import org.bouncycastle.crypto.tls.SignatureAlgorithm;
-import org.bouncycastle.crypto.tls.SignatureAndHashAlgorithm;
-import org.bouncycastle.crypto.tls.TlsEncryptionCredentials;
-import org.bouncycastle.crypto.tls.TlsSignerCredentials;
-import org.bouncycastle.crypto.tls.TlsUtils;
-import org.bouncycastle.util.Arrays;
-
-class MockTlsServer
-    extends DefaultTlsServer
-{
-    public void notifyAlertRaised(short alertLevel, short alertDescription, String message, Throwable cause)
-    {
-        PrintStream out = (alertLevel == AlertLevel.fatal) ? System.err : System.out;
-        out.println("TLS server raised alert: " + AlertLevel.getText(alertLevel)
-            + ", " + AlertDescription.getText(alertDescription));
-        if (message != null)
-        {
-            out.println("> " + message);
-        }
-        if (cause != null)
-        {
-            cause.printStackTrace(out);
-        }
-    }
-
-    public void notifyAlertReceived(short alertLevel, short alertDescription)
-    {
-        PrintStream out = (alertLevel == AlertLevel.fatal) ? System.err : System.out;
-        out.println("TLS server received alert: " + AlertLevel.getText(alertLevel)
-            + ", " + AlertDescription.getText(alertDescription));
-    }
-
-    protected int[] getCipherSuites()
-    {
-        return Arrays.concatenate(super.getCipherSuites(),
-            new int[]
-            {
-                CipherSuite.TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256,
-                CipherSuite.TLS_ECDHE_RSA_WITH_ESTREAM_SALSA20_SHA1,
-                CipherSuite.TLS_ECDHE_RSA_WITH_SALSA20_SHA1,
-                CipherSuite.TLS_RSA_WITH_ESTREAM_SALSA20_SHA1,
-                CipherSuite.TLS_RSA_WITH_SALSA20_SHA1,
-            });
-    }
-
-    protected ProtocolVersion getMaximumVersion()
-    {
-        return ProtocolVersion.TLSv12;
-    }
-
-    public ProtocolVersion getServerVersion() throws IOException
-    {
-        ProtocolVersion serverVersion = super.getServerVersion();
-
-        System.out.println("TLS server negotiated " + serverVersion);
-
-        return serverVersion;
-    }
-
-    public CertificateRequest getCertificateRequest() throws IOException
-    {
-        short[] certificateTypes = new short[]{ ClientCertificateType.rsa_sign,
-            ClientCertificateType.dss_sign, ClientCertificateType.ecdsa_sign };
-
-        Vector serverSigAlgs = null;
-        if (TlsUtils.isSignatureAlgorithmsExtensionAllowed(serverVersion))
-        {
-            serverSigAlgs = TlsUtils.getDefaultSupportedSignatureAlgorithms();
-        }
-
-        Vector certificateAuthorities = new Vector();
-        certificateAuthorities.add(TlsTestUtils.loadCertificateResource("x509-ca.pem").getSubject());
-
-        return new CertificateRequest(certificateTypes, serverSigAlgs, certificateAuthorities);
-    }
-
-    public void notifyClientCertificate(org.bouncycastle.crypto.tls.Certificate clientCertificate)
-        throws IOException
-    {
-        Certificate[] chain = clientCertificate.getCertificateList();
-        System.out.println("TLS server received client certificate chain of length " + chain.length);
-        for (int i = 0; i != chain.length; i++)
-        {
-            Certificate entry = chain[i];
-            // TODO Create fingerprint based on certificate signature algorithm digest
-            System.out.println("    fingerprint:SHA-256 " + TlsTestUtils.fingerprint(entry) + " ("
-                + entry.getSubject() + ")");
-        }
-    }
-
-    protected TlsEncryptionCredentials getRSAEncryptionCredentials()
-        throws IOException
-    {
-        return TlsTestUtils.loadEncryptionCredentials(context, new String[]{"x509-server.pem", "x509-ca.pem"},
-            "x509-server-key.pem");
-    }
-
-    protected TlsSignerCredentials getRSASignerCredentials()
-        throws IOException
-    {
-        /*
-         * TODO Note that this code fails to provide default value for the client supported
-         * algorithms if it wasn't sent.
-         */
-        SignatureAndHashAlgorithm signatureAndHashAlgorithm = null;
-        Vector sigAlgs = supportedSignatureAlgorithms;
-        if (sigAlgs != null)
-        {
-            for (int i = 0; i < sigAlgs.size(); ++i)
-            {
-                SignatureAndHashAlgorithm sigAlg = (SignatureAndHashAlgorithm)
-                    sigAlgs.elementAt(i);
-                if (sigAlg.getSignature() == SignatureAlgorithm.rsa)
-                {
-                    signatureAndHashAlgorithm = sigAlg;
-                    break;
-                }
-            }
-
-            if (signatureAndHashAlgorithm == null)
-            {
-                return null;
-            }
-        }
-
-        return TlsTestUtils.loadSignerCredentials(context, new String[]{"x509-server.pem", "x509-ca.pem"},
-            "x509-server-key.pem", signatureAndHashAlgorithm);
-    }
-}
\ No newline at end of file
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/test/NetworkInputStream.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/test/NetworkInputStream.java
deleted file mode 100644
index e5f4770..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/test/NetworkInputStream.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package org.bouncycastle.crypto.tls.test;
-
-import java.io.FilterInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-
-/**
- * Tracks and enforces close() calls, without closing the underlying InputStream
- */
-class NetworkInputStream extends FilterInputStream
-{
-    boolean closed = false;
-
-    public NetworkInputStream(InputStream input)
-    {
-        super(input);
-    }
-
-    synchronized boolean isClosed()
-    {
-        return closed;
-    }
-
-    public int available() throws IOException
-    {
-        checkNotClosed();
-        return in.available();
-    }
-
-    public synchronized void close() throws IOException
-    {
-        closed = true;
-    }
-
-    public int read() throws IOException
-    {
-        checkNotClosed();
-        return in.read();
-    }
-
-    public int read(byte[] b) throws IOException
-    {
-        checkNotClosed();
-        return in.read(b);
-    }
-
-    public int read(byte[] b, int off, int len) throws IOException
-    {
-        checkNotClosed();
-        return in.read(b, off, len);
-    }
-
-    protected synchronized void checkNotClosed() throws IOException
-    {
-        if (closed)
-        {
-            throw new IOException("NetworkInputStream closed");
-        }
-    }
-}
\ No newline at end of file
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/test/NetworkOutputStream.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/test/NetworkOutputStream.java
deleted file mode 100644
index a11694b..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/test/NetworkOutputStream.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package org.bouncycastle.crypto.tls.test;
-
-import java.io.FilterOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-
-/**
- * Tracks and enforces close() calls, without closing the underlying OutputStream
- */
-class NetworkOutputStream extends FilterOutputStream
-{
-    boolean closed = false;
-
-    public NetworkOutputStream(OutputStream output)
-    {
-        super(output);
-    }
-
-    synchronized boolean isClosed()
-    {
-        return closed;
-    }
-
-    public synchronized void close() throws IOException
-    {
-        closed = true;
-    }
-
-    public void write(int b) throws IOException
-    {
-        checkNotClosed();
-        out.write(b);
-    }
-
-    public void write(byte[] b) throws IOException
-    {
-        checkNotClosed();
-        out.write(b);
-    }
-
-    public void write(byte[] b, int off, int len) throws IOException
-    {
-        checkNotClosed();
-        out.write(b, off, len);
-    }
-
-    protected synchronized void checkNotClosed() throws IOException
-    {
-        if (closed)
-        {
-            throw new IOException("NetworkOutputStream closed");
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/test/PSKTlsClientTest.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/test/PSKTlsClientTest.java
deleted file mode 100644
index 4b152f4..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/test/PSKTlsClientTest.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package org.bouncycastle.crypto.tls.test;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.net.InetAddress;
-import java.net.Socket;
-import java.security.SecureRandom;
-
-import org.bouncycastle.crypto.tls.BasicTlsPSKIdentity;
-import org.bouncycastle.crypto.tls.TlsClient;
-import org.bouncycastle.crypto.tls.TlsClientProtocol;
-
-/**
- * A simple test designed to conduct a TLS handshake with an external TLS server.
- * <p>
- * Please refer to GnuTLSSetup.html or OpenSSLSetup.html (under 'docs'), and x509-*.pem files in
- * this package (under 'src/test/resources') for help configuring an external TLS server.
- * </p><p>
- * In both cases, extra options are required to enable PSK ciphersuites and configure identities/keys.
- * </p>
- */
-public class PSKTlsClientTest
-{
-    private static final SecureRandom secureRandom = new SecureRandom();
-
-    public static void main(String[] args) throws Exception
-    {
-        InetAddress address = InetAddress.getLocalHost();
-        int port = 5556;
-
-        long time1 = System.currentTimeMillis();
-
-        /*
-         * Note: This is the default PSK identity for 'openssl s_server' testing, the server must be
-         * started with "-psk 6161616161" to make the keys match, and possibly the "-psk_hint"
-         * option should be present.
-         */
-        String psk_identity = "Client_identity";
-        byte[] psk = new byte[]{ 0x61, 0x61, 0x61, 0x61, 0x61 };
-
-        BasicTlsPSKIdentity pskIdentity = new BasicTlsPSKIdentity(psk_identity, psk);
-
-        MockPSKTlsClient client = new MockPSKTlsClient(null, pskIdentity);
-        TlsClientProtocol protocol = openTlsConnection(address, port, client);
-        protocol.close();
-
-        long time2 = System.currentTimeMillis();
-        System.out.println("Elapsed 1: " + (time2 - time1) + "ms");
-
-        client = new MockPSKTlsClient(client.getSessionToResume(), pskIdentity);
-        protocol = openTlsConnection(address, port, client);
-
-        long time3 = System.currentTimeMillis();
-        System.out.println("Elapsed 2: " + (time3 - time2) + "ms");
-
-        OutputStream output = protocol.getOutputStream();
-        output.write("GET / HTTP/1.1\r\n\r\n".getBytes("UTF-8"));
-        output.flush();
-
-        InputStream input = protocol.getInputStream();
-        BufferedReader reader = new BufferedReader(new InputStreamReader(input));
-
-        String line;
-        while ((line = reader.readLine()) != null)
-        {
-            System.out.println(">>> " + line);
-        }
-
-        protocol.close();
-    }
-
-    static TlsClientProtocol openTlsConnection(InetAddress address, int port, TlsClient client) throws IOException
-    {
-        Socket s = new Socket(address, port);
-        TlsClientProtocol protocol = new TlsClientProtocol(s.getInputStream(), s.getOutputStream(), secureRandom);
-        protocol.connect(client);
-        return protocol;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/test/TlsClientTest.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/test/TlsClientTest.java
deleted file mode 100644
index bf289d8..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/test/TlsClientTest.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package org.bouncycastle.crypto.tls.test;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.net.InetAddress;
-import java.net.Socket;
-import java.security.SecureRandom;
-
-import org.bouncycastle.crypto.tls.TlsClient;
-import org.bouncycastle.crypto.tls.TlsClientProtocol;
-
-/**
- * A simple test designed to conduct a TLS handshake with an external TLS server.
- * <p>
- * Please refer to GnuTLSSetup.html or OpenSSLSetup.html (under 'docs'), and x509-*.pem files in
- * this package (under 'src/test/resources') for help configuring an external TLS server.
- * </p>
- */
-public class TlsClientTest
-{
-    private static final SecureRandom secureRandom = new SecureRandom();
-
-    public static void main(String[] args)
-        throws Exception
-    {
-        InetAddress address = InetAddress.getLocalHost();
-        int port = 5556;
-
-        long time1 = System.currentTimeMillis();
-
-        MockTlsClient client = new MockTlsClient(null);
-        TlsClientProtocol protocol = openTlsConnection(address, port, client);
-        protocol.close();
-
-        long time2 = System.currentTimeMillis();
-        System.out.println("Elapsed 1: " + (time2 - time1) + "ms");
-
-        client = new MockTlsClient(client.getSessionToResume());
-        protocol = openTlsConnection(address, port, client);
-
-        long time3 = System.currentTimeMillis();
-        System.out.println("Elapsed 2: " + (time3 - time2) + "ms");
-
-        OutputStream output = protocol.getOutputStream();
-        output.write("GET / HTTP/1.1\r\n\r\n".getBytes("UTF-8"));
-        output.flush();
-
-        InputStream input = protocol.getInputStream();
-        BufferedReader reader = new BufferedReader(new InputStreamReader(input));
-
-        String line;
-        while ((line = reader.readLine()) != null)
-        {
-            System.out.println(">>> " + line);
-        }
-
-        protocol.close();
-    }
-
-    static TlsClientProtocol openTlsConnection(InetAddress address, int port, TlsClient client) throws IOException
-    {
-        Socket s = new Socket(address, port);
-        TlsClientProtocol protocol = new TlsClientProtocol(s.getInputStream(), s.getOutputStream(), secureRandom);
-        protocol.connect(client);
-        return protocol;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/test/TlsPSKProtocolTest.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/test/TlsPSKProtocolTest.java
deleted file mode 100644
index f32554a..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/test/TlsPSKProtocolTest.java
+++ /dev/null
@@ -1,81 +0,0 @@
-package org.bouncycastle.crypto.tls.test;
-
-import java.io.OutputStream;
-import java.io.PipedInputStream;
-import java.io.PipedOutputStream;
-import java.security.SecureRandom;
-
-import junit.framework.TestCase;
-
-import org.bouncycastle.crypto.tls.TlsClientProtocol;
-import org.bouncycastle.crypto.tls.TlsServerProtocol;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.io.Streams;
-
-public class TlsPSKProtocolTest
-    extends TestCase
-{
-    public void testClientServer() throws Exception
-    {
-        SecureRandom secureRandom = new SecureRandom();
-
-        PipedInputStream clientRead = new PipedInputStream();
-        PipedInputStream serverRead = new PipedInputStream();
-        PipedOutputStream clientWrite = new PipedOutputStream(serverRead);
-        PipedOutputStream serverWrite = new PipedOutputStream(clientRead);
-
-        TlsClientProtocol clientProtocol = new TlsClientProtocol(clientRead, clientWrite, secureRandom);
-        TlsServerProtocol serverProtocol = new TlsServerProtocol(serverRead, serverWrite, secureRandom);
-
-        ServerThread serverThread = new ServerThread(serverProtocol);
-        serverThread.start();
-
-        MockPSKTlsClient client = new MockPSKTlsClient(null);
-        clientProtocol.connect(client);
-
-        // NOTE: Because we write-all before we read-any, this length can't be more than the pipe capacity
-        int length = 1000;
-
-        byte[] data = new byte[length];
-        secureRandom.nextBytes(data);
-
-        OutputStream output = clientProtocol.getOutputStream();
-        output.write(data);
-
-        byte[] echo = new byte[data.length];
-        int count = Streams.readFully(clientProtocol.getInputStream(), echo);
-
-        assertEquals(count, data.length);
-        assertTrue(Arrays.areEqual(data, echo));
-
-        output.close();
-
-        serverThread.join();
-    }
-
-    static class ServerThread
-        extends Thread
-    {
-        private final TlsServerProtocol serverProtocol;
-
-        ServerThread(TlsServerProtocol serverProtocol)
-        {
-            this.serverProtocol = serverProtocol;
-        }
-
-        public void run()
-        {
-            try
-            {
-                MockPSKTlsServer server = new MockPSKTlsServer();
-                serverProtocol.accept(server);
-                Streams.pipeAll(serverProtocol.getInputStream(), serverProtocol.getOutputStream());
-                serverProtocol.close();
-            }
-            catch (Exception e)
-            {
-                //                throw new RuntimeException(e);
-            }
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/test/TlsProtocolTest.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/test/TlsProtocolTest.java
deleted file mode 100644
index a817c47..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/test/TlsProtocolTest.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package org.bouncycastle.crypto.tls.test;
-
-import java.io.OutputStream;
-import java.io.PipedInputStream;
-import java.io.PipedOutputStream;
-import java.security.SecureRandom;
-
-import junit.framework.TestCase;
-
-import org.bouncycastle.crypto.tls.TlsClientProtocol;
-import org.bouncycastle.crypto.tls.TlsServerProtocol;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.io.Streams;
-
-public class TlsProtocolTest
-    extends TestCase
-{
-    public void testClientServer()
-        throws Exception
-    {
-        SecureRandom secureRandom = new SecureRandom();
-
-        PipedInputStream clientRead = new PipedInputStream();
-        PipedInputStream serverRead = new PipedInputStream();
-        PipedOutputStream clientWrite = new PipedOutputStream(serverRead);
-        PipedOutputStream serverWrite = new PipedOutputStream(clientRead);
-
-        TlsClientProtocol clientProtocol = new TlsClientProtocol(clientRead, clientWrite, secureRandom);
-        TlsServerProtocol serverProtocol = new TlsServerProtocol(serverRead, serverWrite, secureRandom);
-
-        ServerThread serverThread = new ServerThread(serverProtocol);
-        serverThread.start();
-
-        MockTlsClient client = new MockTlsClient(null);
-        clientProtocol.connect(client);
-
-        // NOTE: Because we write-all before we read-any, this length can't be more than the pipe capacity
-        int length = 1000;
-
-        byte[] data = new byte[length];
-        secureRandom.nextBytes(data);
-
-        OutputStream output = clientProtocol.getOutputStream();
-        output.write(data);
-
-        byte[] echo = new byte[data.length];
-        int count = Streams.readFully(clientProtocol.getInputStream(), echo);
-
-        assertEquals(count, data.length);
-        assertTrue(Arrays.areEqual(data, echo));
-
-        output.close();
-
-        serverThread.join();
-    }
-
-    static class ServerThread
-        extends Thread
-    {
-        private final TlsServerProtocol serverProtocol;
-
-        ServerThread(TlsServerProtocol serverProtocol)
-        {
-            this.serverProtocol = serverProtocol;
-        }
-
-        public void run()
-        {
-            try
-            {
-                MockTlsServer server = new MockTlsServer();
-                serverProtocol.accept(server);
-                Streams.pipeAll(serverProtocol.getInputStream(), serverProtocol.getOutputStream());
-                serverProtocol.close();
-            }
-            catch (Exception e)
-            {
-//                throw new RuntimeException(e);
-            }
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/test/TlsSRPProtocolTest.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/test/TlsSRPProtocolTest.java
deleted file mode 100644
index b0c3c92..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/test/TlsSRPProtocolTest.java
+++ /dev/null
@@ -1,81 +0,0 @@
-package org.bouncycastle.crypto.tls.test;
-
-import java.io.OutputStream;
-import java.io.PipedInputStream;
-import java.io.PipedOutputStream;
-import java.security.SecureRandom;
-
-import junit.framework.TestCase;
-
-import org.bouncycastle.crypto.tls.TlsClientProtocol;
-import org.bouncycastle.crypto.tls.TlsServerProtocol;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.io.Streams;
-
-public class TlsSRPProtocolTest
-    extends TestCase
-{
-    public void testClientServer() throws Exception
-    {
-        SecureRandom secureRandom = new SecureRandom();
-
-        PipedInputStream clientRead = new PipedInputStream();
-        PipedInputStream serverRead = new PipedInputStream();
-        PipedOutputStream clientWrite = new PipedOutputStream(serverRead);
-        PipedOutputStream serverWrite = new PipedOutputStream(clientRead);
-
-        TlsClientProtocol clientProtocol = new TlsClientProtocol(clientRead, clientWrite, secureRandom);
-        TlsServerProtocol serverProtocol = new TlsServerProtocol(serverRead, serverWrite, secureRandom);
-
-        ServerThread serverThread = new ServerThread(serverProtocol);
-        serverThread.start();
-
-        MockSRPTlsClient client = new MockSRPTlsClient(null, MockSRPTlsServer.TEST_IDENTITY, MockSRPTlsServer.TEST_PASSWORD);
-        clientProtocol.connect(client);
-
-        // NOTE: Because we write-all before we read-any, this length can't be more than the pipe capacity
-        int length = 1000;
-
-        byte[] data = new byte[length];
-        secureRandom.nextBytes(data);
-
-        OutputStream output = clientProtocol.getOutputStream();
-        output.write(data);
-
-        byte[] echo = new byte[data.length];
-        int count = Streams.readFully(clientProtocol.getInputStream(), echo);
-
-        assertEquals(count, data.length);
-        assertTrue(Arrays.areEqual(data, echo));
-
-        output.close();
-
-        serverThread.join();
-    }
-
-    static class ServerThread
-        extends Thread
-    {
-        private final TlsServerProtocol serverProtocol;
-
-        ServerThread(TlsServerProtocol serverProtocol)
-        {
-            this.serverProtocol = serverProtocol;
-        }
-
-        public void run()
-        {
-            try
-            {
-                MockSRPTlsServer server = new MockSRPTlsServer();
-                serverProtocol.accept(server);
-                Streams.pipeAll(serverProtocol.getInputStream(), serverProtocol.getOutputStream());
-                serverProtocol.close();
-            }
-            catch (Exception e)
-            {
-                //throw new RuntimeException(e);
-            }
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/test/TlsServerTest.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/test/TlsServerTest.java
deleted file mode 100644
index e2faea7..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/test/TlsServerTest.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package org.bouncycastle.crypto.tls.test;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.net.InetAddress;
-import java.net.ServerSocket;
-import java.net.Socket;
-import java.security.SecureRandom;
-
-import org.bouncycastle.crypto.tls.TlsServerProtocol;
-import org.bouncycastle.util.io.Streams;
-import org.bouncycastle.util.io.TeeOutputStream;
-
-/**
- * A simple test designed to conduct a TLS handshake with an external TLS client.
- * <p>
- * Please refer to GnuTLSSetup.html or OpenSSLSetup.html (under 'docs'), and x509-*.pem files in
- * this package (under 'src/test/resources') for help configuring an external TLS client.
- * </p>
- */
-public class TlsServerTest
-{
-    private static final SecureRandom secureRandom = new SecureRandom();
-
-    public static void main(String[] args)
-        throws Exception
-    {
-        InetAddress address = InetAddress.getLocalHost();
-        int port = 5556;
-
-        ServerSocket ss = new ServerSocket(port, 16, address);
-        while (true)
-        {
-            Socket s = ss.accept();
-            System.out.println("--------------------------------------------------------------------------------");
-            System.out.println("Accepted " + s);
-            ServerThread t = new ServerThread(s);
-            t.start();
-        }
-    }
-
-    static class ServerThread
-        extends Thread
-    {
-        private final Socket s;
-
-        ServerThread(Socket s)
-        {
-            this.s = s;
-        }
-
-        public void run()
-        {
-            try
-            {
-                MockTlsServer server = new MockTlsServer();
-                TlsServerProtocol serverProtocol = new TlsServerProtocol(s.getInputStream(), s.getOutputStream(), secureRandom);
-                serverProtocol.accept(server);
-                OutputStream log = new TeeOutputStream(serverProtocol.getOutputStream(), System.out);
-                Streams.pipeAll(serverProtocol.getInputStream(), log);
-                serverProtocol.close();
-            }
-            catch (Exception e)
-            {
-                throw new RuntimeException(e);
-            }
-            finally
-            {
-                try
-                {
-                    s.close();
-                }
-                catch (IOException e)
-                {
-                }
-                finally
-                {
-                }
-            }
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/test/TlsTestCase.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/test/TlsTestCase.java
deleted file mode 100644
index 79ad784..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/test/TlsTestCase.java
+++ /dev/null
@@ -1,171 +0,0 @@
-package org.bouncycastle.crypto.tls.test;
-
-import java.io.OutputStream;
-import java.io.PipedInputStream;
-import java.io.PipedOutputStream;
-import java.security.SecureRandom;
-
-import junit.framework.TestCase;
-
-import org.bouncycastle.crypto.tls.ProtocolVersion;
-import org.bouncycastle.crypto.tls.TlsClientProtocol;
-import org.bouncycastle.crypto.tls.TlsServerProtocol;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.io.Streams;
-
-public class TlsTestCase extends TestCase
-{
-    private static void checkTLSVersion(ProtocolVersion version)
-    {
-        if (version != null && !version.isTLS())
-        {
-            throw new IllegalStateException("Non-TLS version");
-        }
-    }
-
-    protected final TlsTestConfig config;
-
-    public TlsTestCase(TlsTestConfig config, String name)
-    {
-        checkTLSVersion(config.clientMinimumVersion);
-        checkTLSVersion(config.clientOfferVersion);
-        checkTLSVersion(config.serverMaximumVersion);
-        checkTLSVersion(config.serverMinimumVersion);
-
-        this.config = config;
-
-        setName(name);
-    }
-
-    protected void runTest() throws Throwable
-    {
-        SecureRandom secureRandom = new SecureRandom();
-        
-        PipedInputStream clientRead = new PipedInputStream();
-        PipedInputStream serverRead = new PipedInputStream();
-        PipedOutputStream clientWrite = new PipedOutputStream(serverRead);
-        PipedOutputStream serverWrite = new PipedOutputStream(clientRead);
-
-        NetworkInputStream clientNetIn = new NetworkInputStream(clientRead);
-        NetworkInputStream serverNetIn = new NetworkInputStream(serverRead);
-        NetworkOutputStream clientNetOut = new NetworkOutputStream(clientWrite);
-        NetworkOutputStream serverNetOut = new NetworkOutputStream(serverWrite);
-
-        TlsClientProtocol clientProtocol = new TlsClientProtocol(clientNetIn, clientNetOut, secureRandom);
-        TlsServerProtocol serverProtocol = new TlsServerProtocol(serverNetIn, serverNetOut, secureRandom);
-
-        TlsTestClientImpl clientImpl = new TlsTestClientImpl(config);
-        TlsTestServerImpl serverImpl = new TlsTestServerImpl(config);
-
-        ServerThread serverThread = new ServerThread(serverProtocol, serverImpl);
-        serverThread.start();
-
-        Exception caught = null;
-        try
-        {
-            clientProtocol.connect(clientImpl);
-
-            // NOTE: Because we write-all before we read-any, this length can't be more than the pipe capacity
-            int length = 1000;
-
-            byte[] data = new byte[length];
-            secureRandom.nextBytes(data);
-    
-            OutputStream output = clientProtocol.getOutputStream();
-            output.write(data);
-    
-            byte[] echo = new byte[data.length];
-            int count = Streams.readFully(clientProtocol.getInputStream(), echo);
-    
-            assertEquals(count, data.length);
-            assertTrue(Arrays.areEqual(data, echo));
-    
-            output.close();
-        }
-        catch (Exception e)
-        {
-            caught = e;
-            logException(caught);
-        }
-
-        serverThread.allowExit();
-        serverThread.join();
-
-        assertTrue("Client InputStream not closed", clientNetIn.isClosed());
-        assertTrue("Client OutputStream not closed", clientNetOut.isClosed());
-        assertTrue("Server InputStream not closed", serverNetIn.isClosed());
-        assertTrue("Server OutputStream not closed", serverNetOut.isClosed());
-
-        assertEquals("Client fatal alert connection end", config.expectFatalAlertConnectionEnd, clientImpl.firstFatalAlertConnectionEnd);
-        assertEquals("Server fatal alert connection end", config.expectFatalAlertConnectionEnd, serverImpl.firstFatalAlertConnectionEnd);
-
-        assertEquals("Client fatal alert description", config.expectFatalAlertDescription, clientImpl.firstFatalAlertDescription);
-        assertEquals("Server fatal alert description", config.expectFatalAlertDescription, serverImpl.firstFatalAlertDescription);
-
-        if (config.expectFatalAlertConnectionEnd == -1)
-        {
-            assertNull("Unexpected client exception", caught);
-            assertNull("Unexpected server exception", serverThread.caught);
-        }
-    }
-
-    protected  void logException(Exception e)
-    {
-        if (TlsTestConfig.DEBUG)
-        {
-            e.printStackTrace();
-        }
-    }
-
-    class ServerThread extends Thread
-    {
-        protected final TlsServerProtocol serverProtocol;
-        protected final TlsTestServerImpl serverImpl;
-
-        boolean canExit = false;
-        Exception caught = null;
-
-        ServerThread(TlsServerProtocol serverProtocol, TlsTestServerImpl serverImpl)
-        {
-            this.serverProtocol = serverProtocol;
-            this.serverImpl = serverImpl;
-        }
-
-        synchronized void allowExit()
-        {
-            canExit = true;
-            this.notifyAll();
-        }
-
-        public void run()
-        {
-            try
-            {
-                serverProtocol.accept(serverImpl);
-                Streams.pipeAll(serverProtocol.getInputStream(), serverProtocol.getOutputStream());
-                serverProtocol.close();
-            }
-            catch (Exception e)
-            {
-                caught = e;
-                logException(caught);
-            }
-
-            waitExit();
-        }
-
-        protected synchronized void waitExit()
-        {
-            while (!canExit)
-            {
-                try
-                {
-                    this.wait();
-                }
-                catch (InterruptedException e)
-                {
-                }
-            }
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/test/TlsTestClientImpl.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/test/TlsTestClientImpl.java
deleted file mode 100644
index 4374631..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/test/TlsTestClientImpl.java
+++ /dev/null
@@ -1,251 +0,0 @@
-package org.bouncycastle.crypto.tls.test;
-
-import java.io.IOException;
-import java.io.PrintStream;
-import java.util.Vector;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.DERBitString;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.x509.Certificate;
-import org.bouncycastle.crypto.tls.AlertDescription;
-import org.bouncycastle.crypto.tls.AlertLevel;
-import org.bouncycastle.crypto.tls.CertificateRequest;
-import org.bouncycastle.crypto.tls.ClientCertificateType;
-import org.bouncycastle.crypto.tls.ConnectionEnd;
-import org.bouncycastle.crypto.tls.DefaultTlsClient;
-import org.bouncycastle.crypto.tls.ProtocolVersion;
-import org.bouncycastle.crypto.tls.SignatureAlgorithm;
-import org.bouncycastle.crypto.tls.SignatureAndHashAlgorithm;
-import org.bouncycastle.crypto.tls.TlsAuthentication;
-import org.bouncycastle.crypto.tls.TlsCredentials;
-import org.bouncycastle.crypto.tls.TlsFatalAlert;
-import org.bouncycastle.crypto.tls.TlsSignerCredentials;
-import org.bouncycastle.util.Arrays;
-
-class TlsTestClientImpl
-    extends DefaultTlsClient
-{
-    protected final TlsTestConfig config;
-
-    protected int firstFatalAlertConnectionEnd = -1;
-    protected short firstFatalAlertDescription = -1;
-
-    TlsTestClientImpl(TlsTestConfig config)
-    {
-        this.config = config;
-    }
-
-    int getFirstFatalAlertConnectionEnd()
-    {
-        return firstFatalAlertConnectionEnd;
-    }
-
-    short getFirstFatalAlertDescription()
-    {
-        return firstFatalAlertDescription;
-    }
-
-    public ProtocolVersion getClientVersion()
-    {
-        if (config.clientOfferVersion != null)
-        {
-            return config.clientOfferVersion;
-        }
-
-        return super.getClientVersion();
-    }
-
-    public ProtocolVersion getMinimumVersion()
-    {
-        if (config.clientMinimumVersion != null)
-        {
-            return config.clientMinimumVersion;
-        }
-
-        return super.getMinimumVersion();
-    }
-
-    public boolean isFallback()
-    {
-        return config.clientFallback;
-    }
-
-    public void notifyAlertRaised(short alertLevel, short alertDescription, String message, Throwable cause)
-    {
-        if (alertLevel == AlertLevel.fatal && firstFatalAlertConnectionEnd == -1)
-        {
-            firstFatalAlertConnectionEnd = ConnectionEnd.client;
-            firstFatalAlertDescription = alertDescription;
-        }
-
-        if (TlsTestConfig.DEBUG)
-        {
-            PrintStream out = (alertLevel == AlertLevel.fatal) ? System.err : System.out;
-            out.println("TLS client raised alert: " + AlertLevel.getText(alertLevel)
-                + ", " + AlertDescription.getText(alertDescription));
-            if (message != null)
-            {
-                out.println("> " + message);
-            }
-            if (cause != null)
-            {
-                cause.printStackTrace(out);
-            }
-        }
-    }
-
-    public void notifyAlertReceived(short alertLevel, short alertDescription)
-    {
-        if (alertLevel == AlertLevel.fatal && firstFatalAlertConnectionEnd == -1)
-        {
-            firstFatalAlertConnectionEnd = ConnectionEnd.server;
-            firstFatalAlertDescription = alertDescription;
-        }
-
-        if (TlsTestConfig.DEBUG)
-        {
-            PrintStream out = (alertLevel == AlertLevel.fatal) ? System.err : System.out;
-            out.println("TLS client received alert: " + AlertLevel.getText(alertLevel)
-                + ", " + AlertDescription.getText(alertDescription));
-        }
-    }
-
-    public void notifyServerVersion(ProtocolVersion serverVersion) throws IOException
-    {
-        super.notifyServerVersion(serverVersion);
-
-        if (TlsTestConfig.DEBUG)
-        {
-            System.out.println("TLS client negotiated " + serverVersion);
-        }
-    }
-
-    public TlsAuthentication getAuthentication()
-        throws IOException
-    {
-        return new TlsAuthentication()
-        {
-            public void notifyServerCertificate(org.bouncycastle.crypto.tls.Certificate serverCertificate)
-                throws IOException
-            {
-                boolean isEmpty = serverCertificate == null || serverCertificate.isEmpty();
-
-                Certificate[] chain = serverCertificate.getCertificateList();
-
-                // TODO Cache test resources?
-                if (isEmpty || !(chain[0].equals(TlsTestUtils.loadCertificateResource("x509-server.pem"))
-                    || chain[0].equals(TlsTestUtils.loadCertificateResource("x509-server-dsa.pem"))
-                    || chain[0].equals(TlsTestUtils.loadCertificateResource("x509-server-ecdsa.pem"))))
-                {
-                    throw new TlsFatalAlert(AlertDescription.bad_certificate);
-                }
-
-                if (TlsTestConfig.DEBUG)
-                {
-                    System.out.println("TLS client received server certificate chain of length " + chain.length);
-                    for (int i = 0; i != chain.length; i++)
-                    {
-                        Certificate entry = chain[i];
-                        // TODO Create fingerprint based on certificate signature algorithm digest
-                        System.out.println("    fingerprint:SHA-256 " + TlsTestUtils.fingerprint(entry) + " ("
-                            + entry.getSubject() + ")");
-                    }
-                }
-            }
-
-            public TlsCredentials getClientCredentials(CertificateRequest certificateRequest)
-                throws IOException
-            {
-                if (config.serverCertReq == TlsTestConfig.SERVER_CERT_REQ_NONE)
-                {
-                    throw new IllegalStateException();
-                }
-                if (config.clientAuth == TlsTestConfig.CLIENT_AUTH_NONE)
-                {
-                    return null;
-                }
-
-                short[] certificateTypes = certificateRequest.getCertificateTypes();
-                if (certificateTypes == null || !Arrays.contains(certificateTypes, ClientCertificateType.rsa_sign))
-                {
-                    return null;
-                }
-
-                final TlsSignerCredentials signerCredentials = TlsTestUtils.loadSignerCredentials(context,
-                    certificateRequest.getSupportedSignatureAlgorithms(), SignatureAlgorithm.rsa,
-                    "x509-client.pem", "x509-client-key.pem");
-
-                if (config.clientAuth == TlsTestConfig.CLIENT_AUTH_VALID)
-                {
-                    return signerCredentials;
-                }
-
-                return new TlsSignerCredentials()
-                {
-                    public byte[] generateCertificateSignature(byte[] hash) throws IOException
-                    {
-                        byte[] sig = signerCredentials.generateCertificateSignature(hash);
-
-                        if (config.clientAuth == TlsTestConfig.CLIENT_AUTH_INVALID_VERIFY)
-                        {
-                            sig = corruptBit(sig);
-                        }
-
-                        return sig;
-                    }
-
-                    public org.bouncycastle.crypto.tls.Certificate getCertificate()
-                    {
-                        org.bouncycastle.crypto.tls.Certificate cert = signerCredentials.getCertificate();
-
-                        if (config.clientAuth == TlsTestConfig.CLIENT_AUTH_INVALID_CERT)
-                        {
-                            cert = corruptCertificate(cert);
-                        }
-
-                        return cert;
-                    }
-
-                    public SignatureAndHashAlgorithm getSignatureAndHashAlgorithm()
-                    {
-                        return signerCredentials.getSignatureAndHashAlgorithm();
-                    }
-                };
-            }
-        };
-    }
-
-    protected org.bouncycastle.crypto.tls.Certificate corruptCertificate(org.bouncycastle.crypto.tls.Certificate cert)
-    {
-        Certificate[] certList = cert.getCertificateList();
-        certList[0] = corruptCertificateSignature(certList[0]);
-        return new org.bouncycastle.crypto.tls.Certificate(certList);
-    }
-
-    protected Certificate corruptCertificateSignature(Certificate cert)
-    {
-        ASN1EncodableVector v = new ASN1EncodableVector();
-        v.add(cert.getTBSCertificate());
-        v.add(cert.getSignatureAlgorithm());
-        v.add(corruptBitString(cert.getSignature()));
-
-        return Certificate.getInstance(new DERSequence(v));
-    }
-
-    protected DERBitString corruptBitString(DERBitString bs)
-    {
-        return new DERBitString(corruptBit(bs.getBytes()));
-    }
-
-    protected byte[] corruptBit(byte[] bs)
-    {
-        bs = Arrays.clone(bs);
-
-        // Flip a random bit
-        int bit = context.getSecureRandom().nextInt(bs.length << 3); 
-        bs[bit >>> 3] ^= (1 << (bit & 7));
-
-        return bs;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/test/TlsTestConfig.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/test/TlsTestConfig.java
deleted file mode 100644
index 461ecd5..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/test/TlsTestConfig.java
+++ /dev/null
@@ -1,101 +0,0 @@
-package org.bouncycastle.crypto.tls.test;
-
-import org.bouncycastle.crypto.tls.ConnectionEnd;
-import org.bouncycastle.crypto.tls.ProtocolVersion;
-
-public class TlsTestConfig
-{
-    public static final boolean DEBUG = false;
-
-    /**
-     * Client does not authenticate, ignores any certificate request
-     */
-    public static final int CLIENT_AUTH_NONE = 0;
-
-    /**
-     * Client will authenticate if it receives a certificate request
-     */
-    public static final int CLIENT_AUTH_VALID = 1;
-
-    /**
-     * Client will authenticate if it receives a certificate request, with an invalid certificate
-     */
-    public static final int CLIENT_AUTH_INVALID_CERT = 2;
-
-    /**
-     * Client will authenticate if it receives a certificate request, with an invalid CertificateVerify signature
-     */
-    public static final int CLIENT_AUTH_INVALID_VERIFY = 3;
-
-    /**
-     * Server will not request a client certificate
-     */
-    public static final int SERVER_CERT_REQ_NONE = 0;
-
-    /**
-     * Server will request a client certificate but receiving one is optional
-     */
-    public static final int SERVER_CERT_REQ_OPTIONAL = 1;
-
-    /**
-     * Server will request a client certificate and receiving one is mandatory
-     */
-    public static final int SERVER_CERT_REQ_MANDATORY = 2;
-
-    /**
-     * Configures the client authentication behaviour of the test client. Use CLIENT_AUTH_* constants.
-     */
-    public int clientAuth = CLIENT_AUTH_VALID;
-
-    /**
-     * Configures the minimum protocol version the client will accept. If null, uses the library's default.
-     */
-    public ProtocolVersion clientMinimumVersion = null;
-
-    /**
-     * Configures the protocol version the client will offer. If null, uses the library's default.
-     */
-    public ProtocolVersion clientOfferVersion = null;
-
-    /**
-     * Configures whether the client will indicate version fallback via TLS_FALLBACK_SCSV.
-     */
-    public boolean clientFallback = false;
-
-    /**
-     * Configures whether the test server will send a certificate request.
-     */
-    public int serverCertReq = SERVER_CERT_REQ_OPTIONAL;
-
-    /**
-     * Configures the maximum protocol version the server will accept. If null, uses the library's default.
-     */
-    public ProtocolVersion serverMaximumVersion = null;
-
-    /**
-     * Configures the minimum protocol version the server will accept. If null, uses the library's default.
-     */
-    public ProtocolVersion serverMinimumVersion = null;
-
-    /**
-     * Configures the connection end that a fatal alert is expected to be raised. Use ConnectionEnd.* constants.
-     */
-    public int expectFatalAlertConnectionEnd = -1;
-
-    /**
-     * Configures the type of fatal alert expected to be raised. Use AlertDescription.* constants.
-     */
-    public short expectFatalAlertDescription = -1;
-
-    public void expectClientFatalAlert(short alertDescription)
-    {
-        this.expectFatalAlertConnectionEnd = ConnectionEnd.client;
-        this.expectFatalAlertDescription = alertDescription;
-    }
-
-    public void expectServerFatalAlert(short alertDescription)
-    {
-        this.expectFatalAlertConnectionEnd = ConnectionEnd.server;
-        this.expectFatalAlertDescription = alertDescription;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/test/TlsTestServerImpl.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/test/TlsTestServerImpl.java
deleted file mode 100644
index b334293..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/test/TlsTestServerImpl.java
+++ /dev/null
@@ -1,198 +0,0 @@
-package org.bouncycastle.crypto.tls.test;
-
-import java.io.IOException;
-import java.io.PrintStream;
-import java.util.Vector;
-
-import org.bouncycastle.asn1.x509.Certificate;
-import org.bouncycastle.crypto.tls.AlertDescription;
-import org.bouncycastle.crypto.tls.AlertLevel;
-import org.bouncycastle.crypto.tls.CertificateRequest;
-import org.bouncycastle.crypto.tls.ClientCertificateType;
-import org.bouncycastle.crypto.tls.ConnectionEnd;
-import org.bouncycastle.crypto.tls.DefaultTlsServer;
-import org.bouncycastle.crypto.tls.ProtocolVersion;
-import org.bouncycastle.crypto.tls.SignatureAlgorithm;
-import org.bouncycastle.crypto.tls.TlsEncryptionCredentials;
-import org.bouncycastle.crypto.tls.TlsFatalAlert;
-import org.bouncycastle.crypto.tls.TlsSignerCredentials;
-import org.bouncycastle.crypto.tls.TlsUtils;
-
-class TlsTestServerImpl
-    extends DefaultTlsServer
-{
-    protected final TlsTestConfig config;
-
-    protected int firstFatalAlertConnectionEnd = -1;
-    protected short firstFatalAlertDescription = -1;
-
-    TlsTestServerImpl(TlsTestConfig config)
-    {
-        this.config = config;
-    }
-
-    int getFirstFatalAlertConnectionEnd()
-    {
-        return firstFatalAlertConnectionEnd;
-    }
-
-    short getFirstFatalAlertDescription()
-    {
-        return firstFatalAlertDescription;
-    }
-
-    protected ProtocolVersion getMaximumVersion()
-    {
-        if (config.serverMaximumVersion != null)
-        {
-            return config.serverMaximumVersion;
-        }
-
-        return super.getMaximumVersion();
-    }
-
-    protected ProtocolVersion getMinimumVersion()
-    {
-        if (config.serverMinimumVersion != null)
-        {
-            return config.serverMinimumVersion;
-        }
-
-        return super.getMinimumVersion();
-    }
-
-    public void notifyAlertRaised(short alertLevel, short alertDescription, String message, Throwable cause)
-    {
-        if (alertLevel == AlertLevel.fatal && firstFatalAlertConnectionEnd == -1)
-        {
-            firstFatalAlertConnectionEnd = ConnectionEnd.server;
-            firstFatalAlertDescription = alertDescription;
-        }
-
-        if (TlsTestConfig.DEBUG)
-        {
-            PrintStream out = (alertLevel == AlertLevel.fatal) ? System.err : System.out;
-            out.println("TLS server raised alert: " + AlertLevel.getText(alertLevel)
-                + ", " + AlertDescription.getText(alertDescription));
-            if (message != null)
-            {
-                out.println("> " + message);
-            }
-            if (cause != null)
-            {
-                cause.printStackTrace(out);
-            }
-        }
-    }
-
-    public void notifyAlertReceived(short alertLevel, short alertDescription)
-    {
-        if (alertLevel == AlertLevel.fatal && firstFatalAlertConnectionEnd == -1)
-        {
-            firstFatalAlertConnectionEnd = ConnectionEnd.client;
-            firstFatalAlertDescription = alertDescription;
-        }
-
-        if (TlsTestConfig.DEBUG)
-        {
-            PrintStream out = (alertLevel == AlertLevel.fatal) ? System.err : System.out;
-            out.println("TLS server received alert: " + AlertLevel.getText(alertLevel)
-                + ", " + AlertDescription.getText(alertDescription));
-        }
-    }
-
-    public ProtocolVersion getServerVersion() throws IOException
-    {
-        ProtocolVersion serverVersion = super.getServerVersion();
-
-        if (TlsTestConfig.DEBUG)
-        {
-            System.out.println("TLS server negotiated " + serverVersion);
-        }
-
-        return serverVersion;
-    }
-
-    public CertificateRequest getCertificateRequest() throws IOException
-    {
-        if (config.serverCertReq == TlsTestConfig.SERVER_CERT_REQ_NONE)
-        {
-            return null;
-        }
-
-        short[] certificateTypes = new short[]{ ClientCertificateType.rsa_sign,
-            ClientCertificateType.dss_sign, ClientCertificateType.ecdsa_sign };
-
-        Vector serverSigAlgs = null;
-        if (TlsUtils.isSignatureAlgorithmsExtensionAllowed(serverVersion))
-        {
-            serverSigAlgs = TlsUtils.getDefaultSupportedSignatureAlgorithms();
-        }
-
-        Vector certificateAuthorities = new Vector();
-        certificateAuthorities.add(TlsTestUtils.loadCertificateResource("x509-ca.pem").getSubject());
-
-        return new CertificateRequest(certificateTypes, serverSigAlgs, certificateAuthorities);
-    }
-
-    public void notifyClientCertificate(org.bouncycastle.crypto.tls.Certificate clientCertificate)
-        throws IOException
-    {
-        boolean isEmpty = (clientCertificate == null || clientCertificate.isEmpty());
-
-        if (isEmpty != (config.clientAuth == TlsTestConfig.CLIENT_AUTH_NONE))
-        {
-            throw new IllegalStateException();
-        }
-        if (isEmpty && (config.serverCertReq == TlsTestConfig.SERVER_CERT_REQ_MANDATORY))
-        {
-            throw new TlsFatalAlert(AlertDescription.handshake_failure);
-        }
-
-        Certificate[] chain = clientCertificate.getCertificateList();
-
-        // TODO Cache test resources?
-        if (!isEmpty && !(chain[0].equals(TlsTestUtils.loadCertificateResource("x509-client.pem"))
-            || chain[0].equals(TlsTestUtils.loadCertificateResource("x509-client-dsa.pem"))
-            || chain[0].equals(TlsTestUtils.loadCertificateResource("x509-client-ecdsa.pem"))))
-        {
-            throw new TlsFatalAlert(AlertDescription.bad_certificate);
-        }
-
-        if (TlsTestConfig.DEBUG)
-        {
-            System.out.println("TLS server received client certificate chain of length " + chain.length);
-            for (int i = 0; i != chain.length; i++)
-            {
-                Certificate entry = chain[i];
-                // TODO Create fingerprint based on certificate signature algorithm digest
-                System.out.println("    fingerprint:SHA-256 " + TlsTestUtils.fingerprint(entry) + " ("
-                    + entry.getSubject() + ")");
-            }
-        }
-    }
-
-    protected TlsSignerCredentials getDSASignerCredentials() throws IOException
-    {
-        return TlsTestUtils.loadSignerCredentials(context, supportedSignatureAlgorithms, SignatureAlgorithm.dsa,
-            "x509-server-dsa.pem", "x509-server-key-dsa.pem");
-    }
-
-    protected TlsSignerCredentials getECDSASignerCredentials() throws IOException
-    {
-        return TlsTestUtils.loadSignerCredentials(context, supportedSignatureAlgorithms, SignatureAlgorithm.ecdsa,
-            "x509-server-ecdsa.pem", "x509-server-key-ecdsa.pem");
-    }
-
-    protected TlsEncryptionCredentials getRSAEncryptionCredentials() throws IOException
-    {
-        return TlsTestUtils.loadEncryptionCredentials(context, new String[]{ "x509-server.pem", "x509-ca.pem" },
-            "x509-server-key.pem");
-    }
-
-    protected TlsSignerCredentials getRSASignerCredentials() throws IOException
-    {
-        return TlsTestUtils.loadSignerCredentials(context, supportedSignatureAlgorithms, SignatureAlgorithm.rsa,
-            "x509-server.pem", "x509-server-key.pem");
-    }
-}
\ No newline at end of file
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/test/TlsTestSuite.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/test/TlsTestSuite.java
deleted file mode 100644
index ae71faf..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/test/TlsTestSuite.java
+++ /dev/null
@@ -1,111 +0,0 @@
-package org.bouncycastle.crypto.tls.test;
-
-import org.bouncycastle.crypto.tls.AlertDescription;
-import org.bouncycastle.crypto.tls.ProtocolVersion;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-public class TlsTestSuite extends TestSuite
-{
-    // Make the access to constants less verbose 
-    static abstract class C extends TlsTestConfig {}
-
-    public static Test suite()
-    {
-        TlsTestSuite testSuite = new TlsTestSuite();
-
-        addFallbackTests(testSuite);
-        addVersionTests(testSuite, ProtocolVersion.TLSv10);
-        addVersionTests(testSuite, ProtocolVersion.TLSv11);
-        addVersionTests(testSuite, ProtocolVersion.TLSv12);
-
-        return testSuite;
-    }
-
-    private static void addFallbackTests(TestSuite testSuite)
-    {
-        {
-            TlsTestConfig c = createTlsTestConfig(ProtocolVersion.TLSv12);
-            c.clientFallback = true;
-
-            testSuite.addTest(new TlsTestCase(c, "FallbackGood"));
-        }
-
-        {
-            TlsTestConfig c = createTlsTestConfig(ProtocolVersion.TLSv12);
-            c.clientOfferVersion = ProtocolVersion.TLSv11;
-            c.clientFallback = true;
-            c.expectServerFatalAlert(AlertDescription.inappropriate_fallback);
-
-            testSuite.addTest(new TlsTestCase(c, "FallbackBad"));
-        }
-
-        {
-            TlsTestConfig c = createTlsTestConfig(ProtocolVersion.TLSv12);
-            c.clientOfferVersion = ProtocolVersion.TLSv11;
-
-            testSuite.addTest(new TlsTestCase(c, "FallbackNone"));
-        }
-    }
-
-    private static void addVersionTests(TestSuite testSuite, ProtocolVersion version)
-    {
-        String prefix = version.toString().replaceAll("[ \\.]", "") + "_";
-
-        {
-            TlsTestConfig c = createTlsTestConfig(version);
-
-            testSuite.addTest(new TlsTestCase(c, prefix + "GoodDefault"));
-        }
-
-        {
-            TlsTestConfig c = createTlsTestConfig(version);
-            c.clientAuth = C.CLIENT_AUTH_INVALID_VERIFY;
-            c.expectServerFatalAlert(AlertDescription.decrypt_error);
-
-            testSuite.addTest(new TlsTestCase(c, prefix + "BadCertificateVerify"));
-        }
-
-        {
-            TlsTestConfig c = createTlsTestConfig(version);
-            c.clientAuth = C.CLIENT_AUTH_INVALID_CERT;
-            c.expectServerFatalAlert(AlertDescription.bad_certificate);
-
-            testSuite.addTest(new TlsTestCase(c, prefix + "BadClientCertificate"));
-        }
-
-        {
-            TlsTestConfig c = createTlsTestConfig(version);
-            c.clientAuth = C.CLIENT_AUTH_NONE;
-            c.serverCertReq = C.SERVER_CERT_REQ_MANDATORY;
-            c.expectServerFatalAlert(AlertDescription.handshake_failure);
-
-            testSuite.addTest(new TlsTestCase(c, prefix + "BadMandatoryCertReqDeclined"));
-        }
-
-        {
-            TlsTestConfig c = createTlsTestConfig(version);
-            c.serverCertReq = C.SERVER_CERT_REQ_NONE;
-
-            testSuite.addTest(new TlsTestCase(c, prefix + "GoodNoCertReq"));
-        }
-
-        {
-            TlsTestConfig c = createTlsTestConfig(version);
-            c.clientAuth = C.CLIENT_AUTH_NONE;
-
-            testSuite.addTest(new TlsTestCase(c, prefix + "GoodOptionalCertReqDeclined"));
-        }
-    }
-
-    private static TlsTestConfig createTlsTestConfig(ProtocolVersion version)
-    {
-        TlsTestConfig c = new TlsTestConfig();
-        c.clientMinimumVersion = ProtocolVersion.TLSv10;
-        c.clientOfferVersion = ProtocolVersion.TLSv12;
-        c.serverMaximumVersion = version;
-        c.serverMinimumVersion = ProtocolVersion.TLSv10;
-        return c;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/test/TlsTestUtils.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/test/TlsTestUtils.java
deleted file mode 100644
index a03f8d0..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/test/TlsTestUtils.java
+++ /dev/null
@@ -1,192 +0,0 @@
-package org.bouncycastle.crypto.tls.test;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.util.Vector;
-
-import org.bouncycastle.asn1.pkcs.RSAPrivateKey;
-import org.bouncycastle.crypto.digests.SHA256Digest;
-import org.bouncycastle.crypto.params.AsymmetricKeyParameter;
-import org.bouncycastle.crypto.params.RSAPrivateCrtKeyParameters;
-import org.bouncycastle.crypto.tls.Certificate;
-import org.bouncycastle.crypto.tls.DefaultTlsAgreementCredentials;
-import org.bouncycastle.crypto.tls.DefaultTlsEncryptionCredentials;
-import org.bouncycastle.crypto.tls.DefaultTlsSignerCredentials;
-import org.bouncycastle.crypto.tls.SignatureAlgorithm;
-import org.bouncycastle.crypto.tls.SignatureAndHashAlgorithm;
-import org.bouncycastle.crypto.tls.TlsAgreementCredentials;
-import org.bouncycastle.crypto.tls.TlsContext;
-import org.bouncycastle.crypto.tls.TlsEncryptionCredentials;
-import org.bouncycastle.crypto.tls.TlsSignerCredentials;
-import org.bouncycastle.crypto.util.PrivateKeyFactory;
-import org.bouncycastle.util.encoders.Base64;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.io.pem.PemObject;
-import org.bouncycastle.util.io.pem.PemReader;
-
-public class TlsTestUtils
-{
-    static final byte[] rsaCertData = Base64
-        .decode("MIICUzCCAf2gAwIBAgIBATANBgkqhkiG9w0BAQQFADCBjzELMAkGA1UEBhMCQVUxKDAmBgNVBAoMH1RoZSBMZWdpb2"
-            + "4gb2YgdGhlIEJvdW5jeSBDYXN0bGUxEjAQBgNVBAcMCU1lbGJvdXJuZTERMA8GA1UECAwIVmljdG9yaWExLzAtBgkq"
-            + "hkiG9w0BCQEWIGZlZWRiYWNrLWNyeXB0b0Bib3VuY3ljYXN0bGUub3JnMB4XDTEzMDIyNTA2MDIwNVoXDTEzMDIyNT"
-            + "A2MDM0NVowgY8xCzAJBgNVBAYTAkFVMSgwJgYDVQQKDB9UaGUgTGVnaW9uIG9mIHRoZSBCb3VuY3kgQ2FzdGxlMRIw"
-            + "EAYDVQQHDAlNZWxib3VybmUxETAPBgNVBAgMCFZpY3RvcmlhMS8wLQYJKoZIhvcNAQkBFiBmZWVkYmFjay1jcnlwdG"
-            + "9AYm91bmN5Y2FzdGxlLm9yZzBaMA0GCSqGSIb3DQEBAQUAA0kAMEYCQQC0p+RhcFdPFqlwgrIr5YtqKmKXmEGb4Shy"
-            + "pL26Ymz66ZAPdqv7EhOdzl3lZWT6srZUMWWgQMYGiHQg4z2R7X7XAgERo0QwQjAOBgNVHQ8BAf8EBAMCBSAwEgYDVR"
-            + "0lAQH/BAgwBgYEVR0lADAcBgNVHREBAf8EEjAQgQ50ZXN0QHRlc3QudGVzdDANBgkqhkiG9w0BAQQFAANBAHU55Ncz"
-            + "eglREcTg54YLUlGWu2WOYWhit/iM1eeq8Kivro7q98eW52jTuMI3CI5ulqd0hYzshQKQaZ5GDzErMyM=");
-
-    static final byte[] dudRsaCertData = Base64
-        .decode("MIICUzCCAf2gAwIBAgIBATANBgkqhkiG9w0BAQQFADCBjzELMAkGA1UEBhMCQVUxKDAmBgNVBAoMH1RoZSBMZWdpb2"
-            + "4gb2YgdGhlIEJvdW5jeSBDYXN0bGUxEjAQBgNVBAcMCU1lbGJvdXJuZTERMA8GA1UECAwIVmljdG9yaWExLzAtBgkq"
-            + "hkiG9w0BCQEWIGZlZWRiYWNrLWNyeXB0b0Bib3VuY3ljYXN0bGUub3JnMB4XDTEzMDIyNTA1NDcyOFoXDTEzMDIyNT"
-            + "A1NDkwOFowgY8xCzAJBgNVBAYTAkFVMSgwJgYDVQQKDB9UaGUgTGVnaW9uIG9mIHRoZSBCb3VuY3kgQ2FzdGxlMRIw"
-            + "EAYDVQQHDAlNZWxib3VybmUxETAPBgNVBAgMCFZpY3RvcmlhMS8wLQYJKoZIhvcNAQkBFiBmZWVkYmFjay1jcnlwdG"
-            + "9AYm91bmN5Y2FzdGxlLm9yZzBaMA0GCSqGSIb3DQEBAQUAA0kAMEYCQQC0p+RhcFdPFqlwgrIr5YtqKmKXmEGb4Shy"
-            + "pL26Ymz66ZAPdqv7EhOdzl3lZWT6srZUMWWgQMYGiHQg4z2R7X7XAgERo0QwQjAOBgNVHQ8BAf8EBAMCAAEwEgYDVR"
-            + "0lAQH/BAgwBgYEVR0lADAcBgNVHREBAf8EEjAQgQ50ZXN0QHRlc3QudGVzdDANBgkqhkiG9w0BAQQFAANBAJg55PBS"
-            + "weg6obRUKF4FF6fCrWFi6oCYSQ99LWcAeupc5BofW5MstFMhCOaEucuGVqunwT5G7/DweazzCIrSzB0=");
-
-    static String fingerprint(org.bouncycastle.asn1.x509.Certificate c)
-        throws IOException
-    {
-        byte[] der = c.getEncoded();
-        byte[] sha1 = sha256DigestOf(der);
-        byte[] hexBytes = Hex.encode(sha1);
-        String hex = new String(hexBytes, "ASCII").toUpperCase();
-
-        StringBuffer fp = new StringBuffer();
-        int i = 0;
-        fp.append(hex.substring(i, i + 2));
-        while ((i += 2) < hex.length())
-        {
-            fp.append(':');
-            fp.append(hex.substring(i, i + 2));
-        }
-        return fp.toString();
-    }
-
-    static byte[] sha256DigestOf(byte[] input)
-    {
-        SHA256Digest d = new SHA256Digest();
-        d.update(input, 0, input.length);
-        byte[] result = new byte[d.getDigestSize()];
-        d.doFinal(result, 0);
-        return result;
-    }
-
-    static TlsAgreementCredentials loadAgreementCredentials(TlsContext context,
-        String[] certResources, String keyResource)
-        throws IOException
-    {
-        Certificate certificate = loadCertificateChain(certResources);
-        AsymmetricKeyParameter privateKey = loadPrivateKeyResource(keyResource);
-
-        return new DefaultTlsAgreementCredentials(certificate, privateKey);
-    }
-
-    static TlsEncryptionCredentials loadEncryptionCredentials(TlsContext context,
-        String[] certResources, String keyResource)
-        throws IOException
-    {
-        Certificate certificate = loadCertificateChain(certResources);
-        AsymmetricKeyParameter privateKey = loadPrivateKeyResource(keyResource);
-
-        return new DefaultTlsEncryptionCredentials(context, certificate, privateKey);
-    }
-
-    static TlsSignerCredentials loadSignerCredentials(TlsContext context, String[] certResources,
-        String keyResource, SignatureAndHashAlgorithm signatureAndHashAlgorithm)
-        throws IOException
-    {
-        Certificate certificate = loadCertificateChain(certResources);
-        AsymmetricKeyParameter privateKey = loadPrivateKeyResource(keyResource);
-
-        return new DefaultTlsSignerCredentials(context, certificate, privateKey, signatureAndHashAlgorithm);
-    }
-
-    static TlsSignerCredentials loadSignerCredentials(TlsContext context, Vector supportedSignatureAlgorithms,
-        short signatureAlgorithm, String certResource, String keyResource)
-        throws IOException
-    {
-        /*
-         * TODO Note that this code fails to provide default value for the client supported
-         * algorithms if it wasn't sent.
-         */
-     
-        SignatureAndHashAlgorithm signatureAndHashAlgorithm = null;
-        if (supportedSignatureAlgorithms != null)
-        {
-            for (int i = 0; i < supportedSignatureAlgorithms.size(); ++i)
-            {
-                SignatureAndHashAlgorithm alg = (SignatureAndHashAlgorithm)
-                    supportedSignatureAlgorithms.elementAt(i);
-                if (alg.getSignature() == signatureAlgorithm)
-                {
-                    signatureAndHashAlgorithm = alg;
-                    break;
-                }
-            }
-
-            if (signatureAndHashAlgorithm == null)
-            {
-                return null;
-            }
-        }
-
-        return TlsTestUtils.loadSignerCredentials(context, new String[]{
-            certResource, "x509-ca.pem" }, keyResource, signatureAndHashAlgorithm);
-    }
-
-    static Certificate loadCertificateChain(String[] resources)
-        throws IOException
-    {
-        org.bouncycastle.asn1.x509.Certificate[] chain = new org.bouncycastle.asn1.x509.Certificate[resources.length];
-        for (int i = 0; i < resources.length; ++i)
-        {
-            chain[i] = loadCertificateResource(resources[i]);
-        }
-        return new Certificate(chain);
-    }
-
-    static org.bouncycastle.asn1.x509.Certificate loadCertificateResource(String resource)
-        throws IOException
-    {
-        PemObject pem = loadPemResource(resource);
-        if (pem.getType().endsWith("CERTIFICATE"))
-        {
-            return org.bouncycastle.asn1.x509.Certificate.getInstance(pem.getContent());
-        }
-        throw new IllegalArgumentException("'resource' doesn't specify a valid certificate");
-    }
-
-    static AsymmetricKeyParameter loadPrivateKeyResource(String resource)
-        throws IOException
-    {
-        PemObject pem = loadPemResource(resource);
-        if (pem.getType().endsWith("RSA PRIVATE KEY"))
-        {
-            RSAPrivateKey rsa = RSAPrivateKey.getInstance(pem.getContent());
-            return new RSAPrivateCrtKeyParameters(rsa.getModulus(), rsa.getPublicExponent(),
-                rsa.getPrivateExponent(), rsa.getPrime1(), rsa.getPrime2(), rsa.getExponent1(),
-                rsa.getExponent2(), rsa.getCoefficient());
-        }
-        if (pem.getType().endsWith("PRIVATE KEY"))
-        {
-            return PrivateKeyFactory.createKey(pem.getContent());
-        }
-        throw new IllegalArgumentException("'resource' doesn't specify a valid private key");
-    }
-
-    static PemObject loadPemResource(String resource)
-        throws IOException
-    {
-        InputStream s = TlsTestUtils.class.getResourceAsStream(resource);
-        PemReader p = new PemReader(new InputStreamReader(s));
-        PemObject o = p.readPemObject();
-        p.close();
-        return o;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/tls/test/UnreliableDatagramTransport.java b/bcprov/src/main/java/org/bouncycastle/crypto/tls/test/UnreliableDatagramTransport.java
deleted file mode 100644
index bdc205a..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/tls/test/UnreliableDatagramTransport.java
+++ /dev/null
@@ -1,93 +0,0 @@
-package org.bouncycastle.crypto.tls.test;
-
-import java.io.IOException;
-import java.util.Random;
-
-import org.bouncycastle.crypto.tls.DatagramTransport;
-
-public class UnreliableDatagramTransport
-    implements DatagramTransport
-{
-
-    private final DatagramTransport transport;
-    private final Random random;
-    private final int percentPacketLossReceiving, percentPacketLossSending;
-
-    public UnreliableDatagramTransport(DatagramTransport transport, Random random,
-                                       int percentPacketLossReceiving, int percentPacketLossSending)
-    {
-        if (percentPacketLossReceiving < 0 || percentPacketLossReceiving > 100)
-        {
-            throw new IllegalArgumentException("'percentPacketLossReceiving' out of range");
-        }
-        if (percentPacketLossSending < 0 || percentPacketLossSending > 100)
-        {
-            throw new IllegalArgumentException("'percentPacketLossSending' out of range");
-        }
-
-        this.transport = transport;
-        this.random = random;
-        this.percentPacketLossReceiving = percentPacketLossReceiving;
-        this.percentPacketLossSending = percentPacketLossSending;
-    }
-
-    public int getReceiveLimit()
-        throws IOException
-    {
-        return transport.getReceiveLimit();
-    }
-
-    public int getSendLimit()
-        throws IOException
-    {
-        return transport.getSendLimit();
-    }
-
-    public int receive(byte[] buf, int off, int len, int waitMillis)
-        throws IOException
-    {
-        long endMillis = System.currentTimeMillis() + waitMillis;
-        for (; ; )
-        {
-            int length = transport.receive(buf, off, len, waitMillis);
-            if (length < 0 || !lostPacket(percentPacketLossReceiving))
-            {
-                return length;
-            }
-
-            System.out.println("PACKET LOSS (" + length + " byte packet not received)");
-
-            long now = System.currentTimeMillis();
-            if (now >= endMillis)
-            {
-                return -1;
-            }
-
-            waitMillis = (int)(endMillis - now);
-        }
-    }
-
-    public void send(byte[] buf, int off, int len)
-        throws IOException
-    {
-        if (lostPacket(percentPacketLossSending))
-        {
-            System.out.println("PACKET LOSS (" + len + " byte packet not sent)");
-        }
-        else
-        {
-            transport.send(buf, off, len);
-        }
-    }
-
-    public void close()
-        throws IOException
-    {
-        transport.close();
-    }
-
-    private boolean lostPacket(int percentPacketLoss)
-    {
-        return percentPacketLoss > 0 && random.nextInt(100) < percentPacketLoss;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/util/PrivateKeyFactory.java b/bcprov/src/main/java/org/bouncycastle/crypto/util/PrivateKeyFactory.java
index 92684ec..0175aa1 100644
--- a/bcprov/src/main/java/org/bouncycastle/crypto/util/PrivateKeyFactory.java
+++ b/bcprov/src/main/java/org/bouncycastle/crypto/util/PrivateKeyFactory.java
@@ -9,7 +9,9 @@ import org.bouncycastle.asn1.ASN1InputStream;
 import org.bouncycastle.asn1.ASN1Integer;
 import org.bouncycastle.asn1.ASN1ObjectIdentifier;
 import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.oiw.ElGamalParameter;
+// BEGIN android-removed
+// import org.bouncycastle.asn1.oiw.ElGamalParameter;
+// END android-removed
 import org.bouncycastle.asn1.oiw.OIWObjectIdentifiers;
 import org.bouncycastle.asn1.pkcs.DHParameter;
 import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
@@ -31,8 +33,10 @@ import org.bouncycastle.crypto.params.DSAPrivateKeyParameters;
 import org.bouncycastle.crypto.params.ECDomainParameters;
 import org.bouncycastle.crypto.params.ECNamedDomainParameters;
 import org.bouncycastle.crypto.params.ECPrivateKeyParameters;
-import org.bouncycastle.crypto.params.ElGamalParameters;
-import org.bouncycastle.crypto.params.ElGamalPrivateKeyParameters;
+// BEGIN android-removed
+// import org.bouncycastle.crypto.params.ElGamalParameters;
+// import org.bouncycastle.crypto.params.ElGamalPrivateKeyParameters;
+// END android-removed
 import org.bouncycastle.crypto.params.RSAPrivateCrtKeyParameters;
 
 /**
@@ -98,14 +102,16 @@ public class PrivateKeyFactory
 
             return new DHPrivateKeyParameters(derX.getValue(), dhParams);
         }
-        else if (algId.getAlgorithm().equals(OIWObjectIdentifiers.elGamalAlgorithm))
-        {
-            ElGamalParameter params = ElGamalParameter.getInstance(algId.getParameters());
-            ASN1Integer derX = (ASN1Integer)keyInfo.parsePrivateKey();
-
-            return new ElGamalPrivateKeyParameters(derX.getValue(), new ElGamalParameters(
-                params.getP(), params.getG()));
-        }
+        // BEGIN android-removed
+        // else if (algId.getAlgorithm().equals(OIWObjectIdentifiers.elGamalAlgorithm))
+        // {
+        //     ElGamalParameter params = ElGamalParameter.getInstance(algId.getParameters());
+        //     ASN1Integer derX = (ASN1Integer)keyInfo.parsePrivateKey();
+        //
+        //     return new ElGamalPrivateKeyParameters(derX.getValue(), new ElGamalParameters(
+        //         params.getP(), params.getG()));
+        // }
+        // END android-removed
         else if (algId.getAlgorithm().equals(X9ObjectIdentifiers.id_dsa))
         {
             ASN1Integer derX = (ASN1Integer)keyInfo.parsePrivateKey();
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/util/PrivateKeyInfoFactory.java b/bcprov/src/main/java/org/bouncycastle/crypto/util/PrivateKeyInfoFactory.java
deleted file mode 100644
index f61815e..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/util/PrivateKeyInfoFactory.java
+++ /dev/null
@@ -1,90 +0,0 @@
-package org.bouncycastle.crypto.util;
-
-import java.io.IOException;
-
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.DERNull;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
-import org.bouncycastle.asn1.pkcs.RSAPrivateKey;
-import org.bouncycastle.asn1.sec.ECPrivateKey;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.asn1.x509.DSAParameter;
-import org.bouncycastle.asn1.x9.X962Parameters;
-import org.bouncycastle.asn1.x9.X9ECParameters;
-import org.bouncycastle.asn1.x9.X9ObjectIdentifiers;
-import org.bouncycastle.crypto.params.AsymmetricKeyParameter;
-import org.bouncycastle.crypto.params.DSAParameters;
-import org.bouncycastle.crypto.params.DSAPrivateKeyParameters;
-import org.bouncycastle.crypto.params.ECDomainParameters;
-import org.bouncycastle.crypto.params.ECNamedDomainParameters;
-import org.bouncycastle.crypto.params.ECPrivateKeyParameters;
-import org.bouncycastle.crypto.params.RSAKeyParameters;
-import org.bouncycastle.crypto.params.RSAPrivateCrtKeyParameters;
-
-/**
- * Factory to create ASN.1 private key info objects from lightweight private keys.
- */
-public class PrivateKeyInfoFactory
-{
-    /**
-     * Create a PrivateKeyInfo representation of a private key.
-     *
-     * @param privateKey the SubjectPublicKeyInfo encoding
-     * @return the appropriate key parameter
-     * @throws java.io.IOException on an error encoding the key
-     */
-    public static PrivateKeyInfo createPrivateKeyInfo(AsymmetricKeyParameter privateKey) throws IOException
-    {
-        if (privateKey instanceof RSAKeyParameters)
-        {
-            RSAPrivateCrtKeyParameters priv = (RSAPrivateCrtKeyParameters)privateKey;
-
-            return new PrivateKeyInfo(new AlgorithmIdentifier(PKCSObjectIdentifiers.rsaEncryption, DERNull.INSTANCE), new RSAPrivateKey(priv.getModulus(), priv.getPublicExponent(), priv.getExponent(), priv.getP(), priv.getQ(), priv.getDP(), priv.getDQ(), priv.getQInv()));
-        }
-        else if (privateKey instanceof DSAPrivateKeyParameters)
-        {
-            DSAPrivateKeyParameters priv = (DSAPrivateKeyParameters)privateKey;
-            DSAParameters params = priv.getParameters();
-
-            return new PrivateKeyInfo(new AlgorithmIdentifier(X9ObjectIdentifiers.id_dsa, new DSAParameter(params.getP(), params.getQ(), params.getG())), new ASN1Integer(priv.getX()));
-        }
-        else if (privateKey instanceof ECPrivateKeyParameters)
-        {
-            ECPrivateKeyParameters priv = (ECPrivateKeyParameters)privateKey;
-            ECDomainParameters domainParams = priv.getParameters();
-            ASN1Encodable params;
-            int orderBitLength;
-
-            if (domainParams == null)
-            {
-                params = new X962Parameters(DERNull.INSTANCE);      // Implicitly CA
-                orderBitLength = priv.getD().bitLength();   // TODO: this is as good as currently available, must be a better way...
-            }
-            else if (domainParams instanceof ECNamedDomainParameters)
-            {
-                params = new X962Parameters(((ECNamedDomainParameters)domainParams).getName());
-                orderBitLength = domainParams.getCurve().getOrder().bitLength();
-            }
-            else
-            {
-                X9ECParameters ecP = new X9ECParameters(
-                    domainParams.getCurve(),
-                    domainParams.getG(),
-                    domainParams.getN(),
-                    domainParams.getH(),
-                    domainParams.getSeed());
-
-                params = new X962Parameters(ecP);
-                orderBitLength = domainParams.getCurve().getOrder().bitLength();
-            }
-
-            return new PrivateKeyInfo(new AlgorithmIdentifier(X9ObjectIdentifiers.id_ecPublicKey, params), new ECPrivateKey(orderBitLength, priv.getD(), params));
-        }
-        else
-        {
-            throw new IOException("key parameters not recognised.");
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/util/PublicKeyFactory.java b/bcprov/src/main/java/org/bouncycastle/crypto/util/PublicKeyFactory.java
index cb13095..2b33321 100644
--- a/bcprov/src/main/java/org/bouncycastle/crypto/util/PublicKeyFactory.java
+++ b/bcprov/src/main/java/org/bouncycastle/crypto/util/PublicKeyFactory.java
@@ -11,7 +11,9 @@ import org.bouncycastle.asn1.ASN1ObjectIdentifier;
 import org.bouncycastle.asn1.ASN1OctetString;
 import org.bouncycastle.asn1.ASN1Primitive;
 import org.bouncycastle.asn1.DEROctetString;
-import org.bouncycastle.asn1.oiw.ElGamalParameter;
+// BEGIN android-removed
+// import org.bouncycastle.asn1.oiw.ElGamalParameter;
+// END android-removed
 import org.bouncycastle.asn1.oiw.OIWObjectIdentifiers;
 import org.bouncycastle.asn1.pkcs.DHParameter;
 import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
@@ -38,8 +40,10 @@ import org.bouncycastle.crypto.params.DSAPublicKeyParameters;
 import org.bouncycastle.crypto.params.ECDomainParameters;
 import org.bouncycastle.crypto.params.ECNamedDomainParameters;
 import org.bouncycastle.crypto.params.ECPublicKeyParameters;
-import org.bouncycastle.crypto.params.ElGamalParameters;
-import org.bouncycastle.crypto.params.ElGamalPublicKeyParameters;
+// BEGIN android-removed
+// import org.bouncycastle.crypto.params.ElGamalParameters;
+// import org.bouncycastle.crypto.params.ElGamalPublicKeyParameters;
+// END android-removed
 import org.bouncycastle.crypto.params.RSAKeyParameters;
 
 /**
@@ -133,14 +137,16 @@ public class PublicKeyFactory
 
             return new DHPublicKeyParameters(derY.getValue(), dhParams);
         }
-        else if (algId.getAlgorithm().equals(OIWObjectIdentifiers.elGamalAlgorithm))
-        {
-            ElGamalParameter params = ElGamalParameter.getInstance(algId.getParameters());
-            ASN1Integer derY = (ASN1Integer)keyInfo.parsePublicKey();
-
-            return new ElGamalPublicKeyParameters(derY.getValue(), new ElGamalParameters(
-                params.getP(), params.getG()));
-        }
+        // BEGIN android-removed
+        // else if (algId.getAlgorithm().equals(OIWObjectIdentifiers.elGamalAlgorithm))
+        // {
+        //     ElGamalParameter params = ElGamalParameter.getInstance(algId.getParameters());
+        //     ASN1Integer derY = (ASN1Integer)keyInfo.parsePublicKey();
+        //
+        //     return new ElGamalPublicKeyParameters(derY.getValue(), new ElGamalParameters(
+        //         params.getP(), params.getG()));
+        // }
+        // END android-removed
         else if (algId.getAlgorithm().equals(X9ObjectIdentifiers.id_dsa)
             || algId.getAlgorithm().equals(OIWObjectIdentifiers.dsaWithSHA1))
         {
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/util/SubjectPublicKeyInfoFactory.java b/bcprov/src/main/java/org/bouncycastle/crypto/util/SubjectPublicKeyInfoFactory.java
deleted file mode 100644
index d2d4203..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/util/SubjectPublicKeyInfoFactory.java
+++ /dev/null
@@ -1,85 +0,0 @@
-package org.bouncycastle.crypto.util;
-
-import java.io.IOException;
-
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.DERNull;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.asn1.pkcs.RSAPublicKey;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.bouncycastle.asn1.x9.X962Parameters;
-import org.bouncycastle.asn1.x9.X9ECParameters;
-import org.bouncycastle.asn1.x9.X9ECPoint;
-import org.bouncycastle.asn1.x9.X9ObjectIdentifiers;
-import org.bouncycastle.crypto.params.AsymmetricKeyParameter;
-import org.bouncycastle.crypto.params.DSAPublicKeyParameters;
-import org.bouncycastle.crypto.params.ECDomainParameters;
-import org.bouncycastle.crypto.params.ECNamedDomainParameters;
-import org.bouncycastle.crypto.params.ECPublicKeyParameters;
-import org.bouncycastle.crypto.params.RSAKeyParameters;
-
-/**
- * Factory to create ASN.1 subject public key info objects from lightweight public keys.
- */
-public class SubjectPublicKeyInfoFactory
-{
-    /**
-     * Create a SubjectPublicKeyInfo public key.
-     *
-     * @param publicKey the SubjectPublicKeyInfo encoding
-     * @return the appropriate key parameter
-     * @throws java.io.IOException on an error encoding the key
-     */
-    public static SubjectPublicKeyInfo createSubjectPublicKeyInfo(AsymmetricKeyParameter publicKey) throws IOException
-    {
-        if (publicKey instanceof RSAKeyParameters)
-        {
-            RSAKeyParameters pub = (RSAKeyParameters)publicKey;
-
-            return new SubjectPublicKeyInfo(new AlgorithmIdentifier(PKCSObjectIdentifiers.rsaEncryption, DERNull.INSTANCE), new RSAPublicKey(pub.getModulus(), pub.getExponent()));
-        }
-        else if (publicKey instanceof DSAPublicKeyParameters)
-        {
-            DSAPublicKeyParameters pub = (DSAPublicKeyParameters)publicKey;
-
-            return new SubjectPublicKeyInfo(new AlgorithmIdentifier(X9ObjectIdentifiers.id_dsa), new ASN1Integer(pub.getY()));
-        }
-        else if (publicKey instanceof ECPublicKeyParameters)
-        {
-            ECPublicKeyParameters pub = (ECPublicKeyParameters)publicKey;
-            ECDomainParameters domainParams = pub.getParameters();
-            ASN1Encodable      params;
-
-            if (domainParams == null)
-            {
-                params = new X962Parameters(DERNull.INSTANCE);      // Implicitly CA
-            }
-            else if (domainParams instanceof ECNamedDomainParameters)
-            {
-                params = new X962Parameters(((ECNamedDomainParameters)domainParams).getName());
-            }
-            else
-            {
-                X9ECParameters ecP = new X9ECParameters(
-                    domainParams.getCurve(),
-                    domainParams.getG(),
-                    domainParams.getN(),
-                    domainParams.getH(),
-                    domainParams.getSeed());
-
-                params = new X962Parameters(ecP);
-            }
-
-            ASN1OctetString p = (ASN1OctetString)new X9ECPoint(pub.getQ()).toASN1Primitive();
-
-            return new SubjectPublicKeyInfo(new AlgorithmIdentifier(X9ObjectIdentifiers.id_ecPublicKey, params), p.getOctets());
-        }
-        else
-        {
-            throw new IOException("key parameters not recognised.");
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/util/package.html b/bcprov/src/main/java/org/bouncycastle/crypto/util/package.html
deleted file mode 100644
index 787b892..0000000
--- a/bcprov/src/main/java/org/bouncycastle/crypto/util/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body bgcolor="#ffffff">
-Some general utility/conversion classes.
-</body>
-</html>
diff --git a/bcprov/src/main/java/org/bouncycastle/i18n/ErrorBundle.java b/bcprov/src/main/java/org/bouncycastle/i18n/ErrorBundle.java
deleted file mode 100644
index 415b5e5..0000000
--- a/bcprov/src/main/java/org/bouncycastle/i18n/ErrorBundle.java
+++ /dev/null
@@ -1,120 +0,0 @@
-package org.bouncycastle.i18n;
-
-import java.io.UnsupportedEncodingException;
-import java.util.Locale;
-import java.util.TimeZone;
-
-public class ErrorBundle extends MessageBundle 
-{
-
-    /**
-     * summary entry key
-     */
-    public static final String SUMMARY_ENTRY = "summary";
-    
-    /**
-     * detail entry key
-     */
-    public static final String DETAIL_ENTRY = "details";
-    
-    /**
-     * Constructs a new ErrorBundle using <code>resource</code> as the base name for the 
-     * RessourceBundle and <code>id</code> as the message bundle id the resource file. 
-     * @param resource base name of the resource file 
-     * @param id the id of the corresponding bundle in the resource file
-     * @throws NullPointerException if <code>resource</code> or <code>id</code> is <code>null</code>
-     */
-    public ErrorBundle(String resource, String id) throws NullPointerException
-    {
-        super(resource, id);
-    }
-    
-    /**
-     * Constructs a new ErrorBundle using <code>resource</code> as the base name for the 
-     * RessourceBundle and <code>id</code> as the message bundle id the resource file. 
-     * @param resource base name of the resource file 
-     * @param id the id of the corresponding bundle in the resource file
-     * @param encoding the encoding of the resource file
-     * @throws NullPointerException if <code>resource</code> or <code>id</code> is <code>null</code>
-     * @throws UnsupportedEncodingException if the encoding is not supported
-     */
-    public ErrorBundle(String resource, String id, String encoding) throws NullPointerException, UnsupportedEncodingException
-    {
-        super(resource, id, encoding);
-    }
-
-    /**
-     * Constructs a new ErrorBundle using <code>resource</code> as the base name for the 
-     * RessourceBundle and <code>id</code> as the message bundle id the resource file. 
-     * @param resource base name of the resource file 
-     * @param id the id of the corresponding bundle in the resource file
-     * @param arguments an array containing the arguments for the message
-     * @throws NullPointerException if <code>resource</code> or <code>id</code> is <code>null</code>
-     */
-    public ErrorBundle(String resource, String id, Object[] arguments) throws NullPointerException
-    {
-        super(resource, id, arguments);
-    }
-    
-    /**
-     * Constructs a new ErrorBundle using <code>resource</code> as the base name for the 
-     * RessourceBundle and <code>id</code> as the message bundle id the resource file. 
-     * @param resource base name of the resource file 
-     * @param id the id of the corresponding bundle in the resource file
-     * @param encoding the encoding of the resource file
-     * @param arguments an array containing the arguments for the message
-     * @throws NullPointerException if <code>resource</code> or <code>id</code> is <code>null</code>
-     * @throws UnsupportedEncodingException if the encoding is not supported
-     */
-    public ErrorBundle(String resource, String id, String encoding, Object[] arguments) throws NullPointerException, UnsupportedEncodingException
-    {
-        super(resource, id, encoding, arguments);
-    }
-    
-    /**
-     * Returns the summary message in the given locale and timezone.
-     * @param loc the {@link Locale}
-     * @param timezone the {@link TimeZone}
-     * @return the summary message.
-     * @throws MissingEntryException if the message is not available
-     */
-    public String getSummary(Locale loc, TimeZone timezone) throws MissingEntryException
-    {
-        return getEntry(SUMMARY_ENTRY,loc,timezone);
-    }
-    
-    /**
-     * Returns the summary message in the given locale and the default timezone.
-     * @param loc the {@link Locale}
-     * @return the summary message.
-     * @throws MissingEntryException if the message is not available
-     */
-    public String getSummary(Locale loc) throws MissingEntryException
-    {
-        return getEntry(SUMMARY_ENTRY,loc,TimeZone.getDefault());
-    }
-    
-    /**
-     * Returns the detail message in the given locale and timezone.
-     * @param loc the {@link Locale}
-     * @param timezone the {@link TimeZone}
-     * @return the detail message.
-     * @throws MissingEntryException if the message is not available
-     */
-    public String getDetail(Locale loc, TimeZone timezone) throws MissingEntryException
-    {
-        return getEntry(DETAIL_ENTRY,loc,timezone);
-    }
-    
-    /**
-     * Returns the detail message in the given locale and the default timezone.
-     * @param loc the {@link Locale}
-     * @return the detail message.
-     * @throws MissingEntryException if the message is not available
-     */
-    public String getDetail(Locale loc) throws MissingEntryException
-    {
-        return getEntry(DETAIL_ENTRY,loc,TimeZone.getDefault());
-    }
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/i18n/LocaleString.java b/bcprov/src/main/java/org/bouncycastle/i18n/LocaleString.java
deleted file mode 100644
index ab898a9..0000000
--- a/bcprov/src/main/java/org/bouncycastle/i18n/LocaleString.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package org.bouncycastle.i18n;
-
-import java.io.UnsupportedEncodingException;
-import java.util.Locale;
-
-public class LocaleString extends LocalizedMessage
-{
-
-    public LocaleString(String resource, String id)
-    {
-        super(resource, id);
-    }
-    
-    public LocaleString(String resource, String id, String encoding) throws NullPointerException, UnsupportedEncodingException
-    {
-        super(resource, id, encoding);
-    }
-
-    public LocaleString(String resource, String id, String encoding, Object[] arguments)
-        throws NullPointerException, UnsupportedEncodingException
-    {
-        super(resource, id, encoding, arguments);
-    }
-    
-    public String getLocaleString(Locale locale)
-    {
-        return this.getEntry(null, locale, null);
-    }
-    
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/i18n/LocalizedException.java b/bcprov/src/main/java/org/bouncycastle/i18n/LocalizedException.java
deleted file mode 100644
index 373fd6c..0000000
--- a/bcprov/src/main/java/org/bouncycastle/i18n/LocalizedException.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package org.bouncycastle.i18n;
-
-import java.util.Locale;
-
-/**
- * Base class for all Exceptions with localized messages.
- */
-public class LocalizedException extends Exception 
-{
-
-    protected ErrorBundle message;
-    private Throwable cause;
-    
-    /**
-     * Constructs a new LocalizedException with the specified localized message.
-     * @param message the {@link ErrorBundle} that contains the message for the exception
-     */
-    public LocalizedException(ErrorBundle message) 
-    {
-        super(message.getText(Locale.getDefault()));
-        this.message = message;
-    }
-    
-    /**
-     * Constructs a new LocalizedException with the specified localized message and cause.
-     * @param message the {@link ErrorBundle} that contains the message for the exception
-     * @param throwable the cause
-     */
-    public LocalizedException(ErrorBundle message, Throwable throwable) 
-    {
-        super(message.getText(Locale.getDefault()));
-        this.message = message;
-        this.cause = throwable;
-    }
-    
-    /**
-     * Returns the localized error message of the exception.
-     * @return the localized error message as {@link ErrorBundle}
-     */
-    public ErrorBundle getErrorMessage() 
-    {
-        return message;
-    }
-
-    public Throwable getCause()
-    {
-        return cause;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/i18n/LocalizedMessage.java b/bcprov/src/main/java/org/bouncycastle/i18n/LocalizedMessage.java
deleted file mode 100644
index d88c229..0000000
--- a/bcprov/src/main/java/org/bouncycastle/i18n/LocalizedMessage.java
+++ /dev/null
@@ -1,476 +0,0 @@
-package org.bouncycastle.i18n;
-
-import org.bouncycastle.i18n.filter.Filter;
-import org.bouncycastle.i18n.filter.TrustedInput;
-import org.bouncycastle.i18n.filter.UntrustedInput;
-import org.bouncycastle.i18n.filter.UntrustedUrlInput;
-
-import java.io.UnsupportedEncodingException;
-import java.nio.charset.Charset;
-import java.text.DateFormat;
-import java.text.Format;
-import java.text.MessageFormat;
-import java.util.Locale;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-import java.util.TimeZone;
-
-public class LocalizedMessage 
-{
-
-    protected final String id;
-    protected final String resource;
-    
-    // ISO-8859-1 is the default encoding
-    public static final String DEFAULT_ENCODING = "ISO-8859-1";
-    protected String encoding = DEFAULT_ENCODING;
-    
-    protected FilteredArguments arguments;
-    protected FilteredArguments extraArgs = null;
-    
-    protected Filter filter = null;
-    
-    protected ClassLoader loader = null;
-    
-    /**
-     * Constructs a new LocalizedMessage using <code>resource</code> as the base name for the 
-     * RessourceBundle and <code>id</code> as the message bundle id the resource file. 
-     * @param resource base name of the resource file 
-     * @param id the id of the corresponding bundle in the resource file
-     * @throws NullPointerException if <code>resource</code> or <code>id</code> is <code>null</code>
-     */
-    public LocalizedMessage(String resource,String id) throws NullPointerException
-    {
-        if (resource == null || id == null)
-        {
-            throw new NullPointerException();
-        }
-        this.id = id;
-        this.resource = resource;
-        arguments = new FilteredArguments();
-    }
-    
-    /**
-     * Constructs a new LocalizedMessage using <code>resource</code> as the base name for the 
-     * RessourceBundle and <code>id</code> as the message bundle id the resource file. 
-     * @param resource base name of the resource file 
-     * @param id the id of the corresponding bundle in the resource file
-     * @param encoding the encoding of the resource file
-     * @throws NullPointerException if <code>resource</code> or <code>id</code> is <code>null</code>
-     * @throws UnsupportedEncodingException if the encoding is not supported
-     */
-    public LocalizedMessage(String resource,String id, String encoding) throws NullPointerException, UnsupportedEncodingException
-    {
-        if (resource == null || id == null)
-        {
-            throw new NullPointerException();
-        }
-        this.id = id;
-        this.resource = resource;
-        arguments = new FilteredArguments();
-        if (!Charset.isSupported(encoding))
-        {
-            throw new UnsupportedEncodingException("The encoding \"" + encoding + "\" is not supported.");
-        }
-        this.encoding = encoding;
-    }
-    
-    /**
-     * Constructs a new LocalizedMessage using <code>resource</code> as the base name for the 
-     * RessourceBundle and <code>id</code> as the message bundle id the resource file. 
-     * @param resource base name of the resource file 
-     * @param id the id of the corresponding bundle in the resource file
-     * @param arguments an array containing the arguments for the message
-     * @throws NullPointerException if <code>resource</code> or <code>id</code> is <code>null</code>
-     */
-    public LocalizedMessage(String resource, String id, Object[] arguments) throws NullPointerException
-    {
-        if (resource == null || id == null || arguments == null)
-        {
-            throw new NullPointerException();
-        }
-        this.id = id;
-        this.resource = resource;
-        this.arguments = new FilteredArguments(arguments);
-    }
-    
-    /**
-     * Constructs a new LocalizedMessage using <code>resource</code> as the base name for the 
-     * RessourceBundle and <code>id</code> as the message bundle id the resource file. 
-     * @param resource base name of the resource file 
-     * @param id the id of the corresponding bundle in the resource file
-     * @param encoding the encoding of the resource file
-     * @param arguments an array containing the arguments for the message
-     * @throws NullPointerException if <code>resource</code> or <code>id</code> is <code>null</code>
-     * @throws UnsupportedEncodingException if the encoding is not supported
-     */
-    public LocalizedMessage(String resource, String id, String encoding, Object[] arguments) throws NullPointerException, UnsupportedEncodingException
-    {
-        if (resource == null || id == null || arguments == null)
-        {
-            throw new NullPointerException();
-        }
-        this.id = id;
-        this.resource = resource;
-        this.arguments = new FilteredArguments(arguments);
-        if (!Charset.isSupported(encoding))
-        {
-            throw new UnsupportedEncodingException("The encoding \"" + encoding + "\" is not supported.");
-        }
-        this.encoding = encoding;
-    }
-    
-    /**
-     * Reads the entry <code>id + "." + key</code> from the resource file and returns a 
-     * formated message for the given Locale and TimeZone.
-     * @param key second part of the entry id
-     * @param loc the used {@link Locale}
-     * @param timezone the used {@link TimeZone}
-     * @return a Strng containing the localized message
-     * @throws MissingEntryException if the resource file is not available or the entry does not exist.
-     */
-    public String getEntry(String key,Locale loc, TimeZone timezone) throws MissingEntryException
-    {
-        String entry = id;
-        if (key != null)
-        {
-            entry += "." + key;
-        }
-        
-        try
-        {
-            ResourceBundle bundle;
-            if (loader == null)
-            {
-                bundle = ResourceBundle.getBundle(resource,loc);
-            }
-            else
-            {
-                bundle = ResourceBundle.getBundle(resource, loc, loader);
-            }
-            String result = bundle.getString(entry);
-            if (!encoding.equals(DEFAULT_ENCODING))
-            {
-                result = new String(result.getBytes(DEFAULT_ENCODING), encoding);
-            }
-            if (!arguments.isEmpty())
-            {
-                result = formatWithTimeZone(result,arguments.getFilteredArgs(loc),loc,timezone);
-            }
-            result = addExtraArgs(result, loc);
-            return result;
-        }
-        catch (MissingResourceException mre)
-        {
-            throw new MissingEntryException("Can't find entry " + entry + " in resource file " + resource + ".",
-                    resource,
-                    entry,
-                    loc,
-                    loader != null ? loader : this.getClassLoader()); 
-        }
-        catch (UnsupportedEncodingException use)
-        {
-            // should never occur - cause we already test this in the constructor
-            throw new RuntimeException(use);
-        }
-    }
-    
-    protected String formatWithTimeZone(
-            String template,
-            Object[] arguments, 
-            Locale locale,
-            TimeZone timezone) 
-    {
-        MessageFormat mf = new MessageFormat(" ");
-        mf.setLocale(locale);
-        mf.applyPattern(template);
-        if (!timezone.equals(TimeZone.getDefault())) 
-        {
-            Format[] formats = mf.getFormats();
-            for (int i = 0; i < formats.length; i++) 
-            {
-                if (formats[i] instanceof DateFormat) 
-                {
-                    DateFormat temp = (DateFormat) formats[i];
-                    temp.setTimeZone(timezone);
-                    mf.setFormat(i,temp);
-                }
-            }
-        }
-        return mf.format(arguments);
-    }
-    
-    protected String addExtraArgs(String msg, Locale locale)
-    {
-        if (extraArgs != null)
-        {
-            StringBuffer sb = new StringBuffer(msg);
-            Object[] filteredArgs = extraArgs.getFilteredArgs(locale);
-            for (int i = 0; i < filteredArgs.length; i++)
-            {
-                sb.append(filteredArgs[i]);
-            }
-            msg = sb.toString();
-        }
-        return msg;
-    }
-    
-    /**
-     * Sets the {@link Filter} that is used to filter the arguments of this message
-     * @param filter the {@link Filter} to use. <code>null</code> to disable filtering.
-     */
-    public void setFilter(Filter filter)
-    {
-        arguments.setFilter(filter);
-        if (extraArgs != null)
-        {
-            extraArgs.setFilter(filter);
-        }
-        this.filter = filter;
-    }
-    
-    /**
-     * Returns the current filter.
-     * @return the current filter
-     */
-    public Filter getFilter()
-    {
-        return filter;
-    }
-    
-    /**
-     * Set the {@link ClassLoader} which loads the resource files. If it is set to <code>null</code>
-     * then the default {@link ClassLoader} is used. 
-     * @param loader the {@link ClassLoader} which loads the resource files
-     */
-    public void setClassLoader(ClassLoader loader)
-    {
-        this.loader = loader;
-    }
-    
-    /**
-     * Returns the {@link ClassLoader} which loads the resource files or <code>null</code>
-     * if the default ClassLoader is used.
-     * @return the {@link ClassLoader} which loads the resource files
-     */
-    public ClassLoader getClassLoader()
-    {
-        return loader;
-    }
-    
-    /**
-     * Returns the id of the message in the resource bundle.
-     * @return the id of the message
-     */
-    public String getId()
-    {
-        return id;
-    }
-    
-    /**
-     * Returns the name of the resource bundle for this message
-     * @return name of the resource file
-     */
-    public String getResource()
-    {
-        return resource;
-    }
-    
-    /**
-     * Returns an <code>Object[]</code> containing the message arguments.
-     * @return the message arguments
-     */
-    public Object[] getArguments()
-    {
-        return arguments.getArguments();
-    }
-    
-    /**
-     * 
-     * @param extraArg
-     */
-    public void setExtraArgument(Object extraArg)
-    {
-        setExtraArguments(new Object[] {extraArg});
-    }
-    
-    /**
-     * 
-     * @param extraArgs
-     */
-    public void setExtraArguments(Object[] extraArgs)
-    {
-        if (extraArgs != null)
-        {
-            this.extraArgs = new FilteredArguments(extraArgs);
-            this.extraArgs.setFilter(filter);
-        }
-        else
-        {
-            this.extraArgs = null;
-        }
-    }
-    
-    /**
-     * 
-     * @return
-     */
-    public Object[] getExtraArgs()
-    {
-        return (extraArgs == null) ? null : extraArgs.getArguments();
-    }
-    
-    protected class FilteredArguments
-    {
-        protected static final int NO_FILTER = 0;
-        protected static final int FILTER = 1;
-        protected static final int FILTER_URL = 2;
-        
-        protected Filter filter = null;
-        
-        protected boolean[] isLocaleSpecific;
-        protected int[] argFilterType;
-        protected Object[] arguments;
-        protected Object[] unpackedArgs;
-        protected Object[] filteredArgs;
-        
-        FilteredArguments()
-        {
-            this(new Object[0]);
-        }
-        
-        FilteredArguments(Object[] args)
-        {
-            this.arguments = args;
-            this.unpackedArgs = new Object[args.length];
-            this.filteredArgs = new Object[args.length];
-            this.isLocaleSpecific = new boolean[args.length];
-            this.argFilterType = new int[args.length];
-            for (int i = 0; i < args.length; i++)
-            {
-                if (args[i] instanceof TrustedInput)
-                {
-                    this.unpackedArgs[i] = ((TrustedInput) args[i]).getInput();
-                    argFilterType[i] = NO_FILTER;
-                }
-                else if (args[i] instanceof UntrustedInput)
-                {
-                    this.unpackedArgs[i] = ((UntrustedInput) args[i]).getInput();
-                    if (args[i] instanceof UntrustedUrlInput)
-                    {
-                        argFilterType[i] = FILTER_URL;
-                    }
-                    else
-                    {
-                        argFilterType[i] = FILTER;
-                    }
-                }
-                else
-                {
-                    this.unpackedArgs[i] = args[i];
-                    argFilterType[i] = FILTER;
-                }
-                
-                // locale specific
-                this.isLocaleSpecific[i] = (this.unpackedArgs[i] instanceof LocaleString);
-            }
-        }
-        
-        public boolean isEmpty()
-        {
-            return unpackedArgs.length == 0;
-        }
-        
-        public Object[] getArguments()
-        {
-            return arguments;
-        }
-        
-        public Object[] getFilteredArgs(Locale locale)
-        {
-            Object[] result = new Object[unpackedArgs.length];
-            for (int i = 0; i < unpackedArgs.length; i++)
-            {
-                Object arg;
-                if (filteredArgs[i] != null)
-                {
-                    arg = filteredArgs[i];
-                }
-                else
-                {
-                    arg = unpackedArgs[i];
-                    if (isLocaleSpecific[i])
-                    {
-                        // get locale
-                        arg = ((LocaleString) arg).getLocaleString(locale);
-                        arg = filter(argFilterType[i], arg);
-                    }
-                    else
-                    {
-                        arg = filter(argFilterType[i], arg);
-                        filteredArgs[i] = arg;
-                    }
-                }
-                result[i] = arg;
-            }
-            return result;
-        }
-        
-        private Object filter(int type, Object obj)
-        {
-            if (filter != null)
-            {
-                Object o = (null == obj) ? "null" : obj;
-                switch (type)
-                {
-                case NO_FILTER:
-                    return o;
-                case FILTER:
-                    return filter.doFilter(o.toString());
-                case FILTER_URL:
-                    return filter.doFilterUrl(o.toString());
-                default:
-                    return null;
-                }
-            }
-            else
-            {
-                return obj;
-            }
-        }
-
-        public Filter getFilter()
-        {
-            return filter;
-        }
-
-        public void setFilter(Filter filter)
-        {
-            if (filter != this.filter)
-            {
-                for (int i = 0; i < unpackedArgs.length; i++)
-                {
-                    filteredArgs[i] = null;
-                }
-            }
-            this.filter = filter;
-        }
-        
-    }
-    
-    public String toString()
-    {
-        StringBuffer sb = new StringBuffer();
-        sb.append("Resource: \"").append(resource);
-        sb.append("\" Id: \"").append(id).append("\"");
-        sb.append(" Arguments: ").append(arguments.getArguments().length).append(" normal");
-        if (extraArgs != null && extraArgs.getArguments().length > 0)
-        {
-            sb.append(", ").append(extraArgs.getArguments().length).append(" extra");
-        }
-        sb.append(" Encoding: ").append(encoding);
-        sb.append(" ClassLoader: ").append(loader);
-        return sb.toString();
-    }
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/i18n/MessageBundle.java b/bcprov/src/main/java/org/bouncycastle/i18n/MessageBundle.java
deleted file mode 100644
index de931fc..0000000
--- a/bcprov/src/main/java/org/bouncycastle/i18n/MessageBundle.java
+++ /dev/null
@@ -1,92 +0,0 @@
-package org.bouncycastle.i18n;
-
-import java.io.UnsupportedEncodingException;
-import java.util.Locale;
-import java.util.TimeZone;
-
-public class MessageBundle extends TextBundle
-{
-
-    /**
-     * title entry key
-     */
-    public static final String TITLE_ENTRY = "title";
-    
-    /**
-     * Constructs a new MessageBundle using <code>resource</code> as the base name for the 
-     * RessourceBundle and <code>id</code> as the message bundle id the resource file. 
-     * @param resource base name of the resource file 
-     * @param id the id of the corresponding bundle in the resource file
-     * @throws NullPointerException if <code>resource</code> or <code>id</code> is <code>null</code>
-     */
-    public MessageBundle(String resource, String id) throws NullPointerException
-    {
-        super(resource, id);
-    }
-    
-    /**
-     * Constructs a new MessageBundle using <code>resource</code> as the base name for the 
-     * RessourceBundle and <code>id</code> as the message bundle id the resource file. 
-     * @param resource base name of the resource file 
-     * @param id the id of the corresponding bundle in the resource file
-     * @param encoding the encoding of the resource file
-     * @throws NullPointerException if <code>resource</code> or <code>id</code> is <code>null</code>
-     * @throws UnsupportedEncodingException if the encoding is not supported
-     */
-    public MessageBundle(String resource, String id, String encoding) throws NullPointerException, UnsupportedEncodingException
-    {
-        super(resource, id, encoding);
-    }
-
-    /**
-     * Constructs a new MessageBundle using <code>resource</code> as the base name for the 
-     * RessourceBundle and <code>id</code> as the message bundle id the resource file. 
-     * @param resource base name of the resource file 
-     * @param id the id of the corresponding bundle in the resource file
-     * @param arguments an array containing the arguments for the message
-     * @throws NullPointerException if <code>resource</code> or <code>id</code> is <code>null</code>
-     */
-    public MessageBundle(String resource, String id, Object[] arguments) throws NullPointerException
-    {
-        super(resource, id, arguments);
-    }
-    
-    /**
-     * Constructs a new MessageBundle using <code>resource</code> as the base name for the 
-     * RessourceBundle and <code>id</code> as the message bundle id the resource file. 
-     * @param resource base name of the resource file 
-     * @param id the id of the corresponding bundle in the resource file
-     * @param encoding the encoding of the resource file
-     * @param arguments an array containing the arguments for the message
-     * @throws NullPointerException if <code>resource</code> or <code>id</code> is <code>null</code>
-     * @throws UnsupportedEncodingException if the encoding is not supported
-     */
-    public MessageBundle(String resource, String id, String encoding, Object[] arguments) throws NullPointerException, UnsupportedEncodingException
-    {
-        super(resource, id, encoding, arguments);
-    }
-    
-    /**
-     * Returns the title message in the given locale and timezone.
-     * @param loc the {@link Locale}
-     * @param timezone the {@link TimeZone}
-     * @return the title message.
-     * @throws MissingEntryException if the message is not available
-     */
-    public String getTitle(Locale loc,TimeZone timezone) throws MissingEntryException
-    {
-        return getEntry(TITLE_ENTRY,loc,timezone);
-    }
-    
-    /**
-     * Returns the title message in the given locale and the default timezone.
-     * @param loc the {@link Locale}
-     * @return the title message.
-     * @throws MissingEntryException if the message is not available
-     */
-    public String getTitle(Locale loc) throws MissingEntryException
-    {
-        return getEntry(TITLE_ENTRY,loc,TimeZone.getDefault());
-    }
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/i18n/MissingEntryException.java b/bcprov/src/main/java/org/bouncycastle/i18n/MissingEntryException.java
deleted file mode 100644
index ffd4d54..0000000
--- a/bcprov/src/main/java/org/bouncycastle/i18n/MissingEntryException.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package org.bouncycastle.i18n;
-
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.util.Locale;
-
-public class MissingEntryException extends RuntimeException 
-{
-
-    protected final String resource;
-    protected final String key;
-    protected final ClassLoader loader;
-    protected final Locale locale;
-    
-    private String debugMsg;
-
-    public MissingEntryException(String message, String resource, String key, Locale locale, ClassLoader loader) 
-    {
-        super(message);
-        this.resource = resource;
-        this.key = key;
-        this.locale = locale;
-        this.loader = loader;
-    }
-    
-    public MissingEntryException(String message, Throwable cause, String resource, String key, Locale locale, ClassLoader loader) 
-    {
-        super(message, cause);
-        this.resource = resource;
-        this.key = key;
-        this.locale = locale;
-        this.loader = loader;
-    }
-
-    public String getKey()
-    {
-        return key;
-    }
-
-    public String getResource()
-    {
-        return resource;
-    }
-    
-    public ClassLoader getClassLoader()
-    {
-        return loader;
-    }
-    
-    public Locale getLocale()
-    {
-        return locale;
-    }
-
-    public String getDebugMsg()
-    {
-        if (debugMsg == null)
-        {
-            debugMsg = "Can not find entry " + key + " in resource file " + resource + " for the locale " + locale + ".";
-            if (loader instanceof URLClassLoader)
-            {
-                URL[] urls = ((URLClassLoader) loader).getURLs();
-                debugMsg += " The following entries in the classpath were searched: ";
-                for (int i = 0; i != urls.length; i++)
-                {
-                    debugMsg += urls[i] + " ";
-                }
-            }
-        }
-        return debugMsg;
-    }
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/i18n/TextBundle.java b/bcprov/src/main/java/org/bouncycastle/i18n/TextBundle.java
deleted file mode 100644
index d77e841..0000000
--- a/bcprov/src/main/java/org/bouncycastle/i18n/TextBundle.java
+++ /dev/null
@@ -1,92 +0,0 @@
-package org.bouncycastle.i18n;
-
-import java.io.UnsupportedEncodingException;
-import java.util.Locale;
-import java.util.TimeZone;
-
-public class TextBundle extends LocalizedMessage 
-{
-
-    /**
-     * text entry key
-     */
-    public static final String TEXT_ENTRY = "text";
-    
-    /**
-     * Constructs a new TextBundle using <code>resource</code> as the base name for the 
-     * RessourceBundle and <code>id</code> as the message bundle id the resource file. 
-     * @param resource base name of the resource file 
-     * @param id the id of the corresponding bundle in the resource file
-     * @throws NullPointerException if <code>resource</code> or <code>id</code> is <code>null</code>
-     */
-    public TextBundle(String resource, String id) throws NullPointerException 
-    {
-        super(resource, id);
-    }
-    
-    /**
-     * Constructs a new TextBundle using <code>resource</code> as the base name for the 
-     * RessourceBundle and <code>id</code> as the message bundle id the resource file. 
-     * @param resource base name of the resource file 
-     * @param id the id of the corresponding bundle in the resource file
-     * @param encoding the encoding of the resource file
-     * @throws NullPointerException if <code>resource</code> or <code>id</code> is <code>null</code>
-     * @throws UnsupportedEncodingException if the encoding is not supported
-     */
-    public TextBundle(String resource, String id, String encoding) throws NullPointerException, UnsupportedEncodingException 
-    {
-        super(resource, id, encoding);
-    }
-
-    /**
-     * Constructs a new TextBundle using <code>resource</code> as the base name for the 
-     * RessourceBundle and <code>id</code> as the message bundle id the resource file. 
-     * @param resource base name of the resource file 
-     * @param id the id of the corresponding bundle in the resource file
-     * @param arguments an array containing the arguments for the message
-     * @throws NullPointerException if <code>resource</code> or <code>id</code> is <code>null</code>
-     */
-    public TextBundle(String resource, String id, Object[] arguments) throws NullPointerException 
-    {
-        super(resource, id, arguments);
-    }
-    
-    /**
-     * Constructs a new TextBundle using <code>resource</code> as the base name for the 
-     * RessourceBundle and <code>id</code> as the message bundle id the resource file. 
-     * @param resource base name of the resource file 
-     * @param id the id of the corresponding bundle in the resource file
-     * @param encoding the encoding of the resource file
-     * @param arguments an array containing the arguments for the message
-     * @throws NullPointerException if <code>resource</code> or <code>id</code> is <code>null</code>
-     * @throws UnsupportedEncodingException if the encoding is not supported
-     */
-    public TextBundle(String resource, String id, String encoding, Object[] arguments) throws NullPointerException, UnsupportedEncodingException 
-    {
-        super(resource, id, encoding, arguments);
-    }
-    
-    /**
-     * Returns the text message in the given locale and timezone.
-     * @param loc the {@link Locale}
-     * @param timezone the {@link TimeZone}
-     * @return the text message.
-     * @throws MissingEntryException if the message is not available
-     */
-    public String getText(Locale loc, TimeZone timezone) throws MissingEntryException
-    {
-        return getEntry(TEXT_ENTRY,loc,timezone);
-    }
-    
-    /**
-     * Returns the text message in the given locale and the defaut timezone.
-     * @param loc the {@link Locale}
-     * @return the text message.
-     * @throws MissingEntryException if the message is not available
-     */
-    public String getText(Locale loc) throws MissingEntryException
-    {
-        return getEntry(TEXT_ENTRY,loc,TimeZone.getDefault());
-    }
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/i18n/filter/Filter.java b/bcprov/src/main/java/org/bouncycastle/i18n/filter/Filter.java
deleted file mode 100644
index fc86aaa..0000000
--- a/bcprov/src/main/java/org/bouncycastle/i18n/filter/Filter.java
+++ /dev/null
@@ -1,21 +0,0 @@
-
-package org.bouncycastle.i18n.filter;
-
-public interface Filter
-{
-
-    /**
-     * Runs the filter on the input String and returns the filtered String
-     * @param input input String
-     * @return filtered String
-     */
-    public String doFilter(String input);
-    
-    /**
-     * Runs the filter on the input url and returns the filtered String
-     * @param input input url String
-     * @return filtered String
-     */
-    public String doFilterUrl(String input);
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/i18n/filter/HTMLFilter.java b/bcprov/src/main/java/org/bouncycastle/i18n/filter/HTMLFilter.java
deleted file mode 100644
index b9904bc..0000000
--- a/bcprov/src/main/java/org/bouncycastle/i18n/filter/HTMLFilter.java
+++ /dev/null
@@ -1,68 +0,0 @@
-
-package org.bouncycastle.i18n.filter;
-
-/**
- * HTML Filter
- */
-public class HTMLFilter implements Filter 
-{
-
-    public String doFilter(String input) 
-    {
-        StringBuffer buf = new StringBuffer(input);
-        int i = 0;
-        while (i < buf.length()) 
-        {
-            char ch = buf.charAt(i);
-            switch (ch)
-            {
-            case '<':
-                buf.replace(i,i+1,"&#60");
-                break;
-            case '>':
-                buf.replace(i,i+1,"&#62");
-                break;
-            case '(':
-                buf.replace(i,i+1,"&#40");
-                break;
-            case ')':
-                buf.replace(i,i+1,"&#41");
-                break;
-            case '#':
-                buf.replace(i,i+1,"&#35");
-                break;
-            case '&':
-                buf.replace(i,i+1,"&#38");
-                break;
-            case '\"':
-                buf.replace(i,i+1,"&#34");
-                break;
-            case '\'':
-                buf.replace(i,i+1,"&#39");
-                break;
-            case '%':
-                buf.replace(i,i+1,"&#37");
-                break;
-            case ';':
-                buf.replace(i,i+1,"&#59");
-                break;
-            case '+':
-                buf.replace(i,i+1,"&#43");
-                break;
-            case '-':
-                buf.replace(i,i+1,"&#45");
-                break;
-            default:
-                i -= 3;
-            }
-            i += 4;
-        }
-        return buf.toString();
-    }
-    
-    public String doFilterUrl(String input)
-    {
-        return doFilter(input);
-    }
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/i18n/filter/SQLFilter.java b/bcprov/src/main/java/org/bouncycastle/i18n/filter/SQLFilter.java
deleted file mode 100644
index d55610b..0000000
--- a/bcprov/src/main/java/org/bouncycastle/i18n/filter/SQLFilter.java
+++ /dev/null
@@ -1,69 +0,0 @@
-
-package org.bouncycastle.i18n.filter;
-
-/**
- * Filter for strings to store in a SQL table.
- * 
- * escapes ' " = - / \ ; \r \n
- */
-public class SQLFilter implements Filter
-{
-
-    public String doFilter(String input) 
-    {
-        StringBuffer buf = new StringBuffer(input);
-        int i = 0;
-        while (i < buf.length()) 
-        {
-            char ch = buf.charAt(i);
-            switch (ch) 
-            {
-            case '\'':
-                buf.replace(i,i+1,"\\\'");
-                i += 1;
-                break;
-            case '\"':
-                buf.replace(i,i+1,"\\\"");
-                i += 1;
-                break;
-            case '=':
-                buf.replace(i,i+1,"\\=");
-                i += 1;
-                break;
-            case '-':
-                buf.replace(i,i+1,"\\-");
-                i += 1;
-                break;
-            case '/':
-                buf.replace(i,i+1,"\\/");
-                i += 1;
-                break;
-            case '\\':
-                buf.replace(i,i+1,"\\\\");
-                i += 1;
-                break;
-            case ';':
-                buf.replace(i,i+1,"\\;");
-                i += 1;
-                break;
-            case '\r':
-                buf.replace(i,i+1,"\\r");
-                i += 1;
-                break;
-            case '\n':
-                buf.replace(i,i+1,"\\n");
-                i += 1;
-                break;
-            default:
-            }
-            i++;
-        }
-        return buf.toString();
-    }
-    
-    public String doFilterUrl(String input)
-    {
-        return doFilter(input);
-    }
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/i18n/filter/TrustedInput.java b/bcprov/src/main/java/org/bouncycastle/i18n/filter/TrustedInput.java
deleted file mode 100644
index 0feeeea..0000000
--- a/bcprov/src/main/java/org/bouncycastle/i18n/filter/TrustedInput.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package org.bouncycastle.i18n.filter;
-
-public class TrustedInput
-{
-
-    protected Object input;
-    
-    public TrustedInput(Object input)
-    {
-        this.input = input; 
-    }
-    
-    public Object getInput()
-    {
-        return input;
-    }
-    
-    public String toString()
-    {
-        return input.toString();
-    }
-    
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/i18n/filter/UntrustedInput.java b/bcprov/src/main/java/org/bouncycastle/i18n/filter/UntrustedInput.java
deleted file mode 100644
index cc69ac4..0000000
--- a/bcprov/src/main/java/org/bouncycastle/i18n/filter/UntrustedInput.java
+++ /dev/null
@@ -1,44 +0,0 @@
-
-package org.bouncycastle.i18n.filter;
-
-/**
- * Wrapper class to mark untrusted input.
- */
-public class UntrustedInput 
-{
-
-    protected Object input;
-
-    /**
-     * Construct a new UntrustedInput instance.
-     * @param input the untrusted input Object
-     */
-    public UntrustedInput(Object input) 
-    {
-        this.input = input;
-    }
-
-    /**
-     * Returns the untrusted input as Object.
-     * @return the <code>input</code> as Object
-     */
-    public Object getInput() 
-    {
-        return input;
-    }
-
-    /**
-     * Returns the untrusted input convertet to a String.
-     * @return the <code>input</code> as String
-     */
-    public String getString() 
-    {
-        return input.toString();
-    }
-    
-    public String toString()
-    {
-        return input.toString();
-    }
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/i18n/filter/UntrustedUrlInput.java b/bcprov/src/main/java/org/bouncycastle/i18n/filter/UntrustedUrlInput.java
deleted file mode 100644
index 98ee1e7..0000000
--- a/bcprov/src/main/java/org/bouncycastle/i18n/filter/UntrustedUrlInput.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package org.bouncycastle.i18n.filter;
-
-/**
- * 
- * Wrapper class to mark an untrusted Url
- */
-public class UntrustedUrlInput extends UntrustedInput
-{
-    public UntrustedUrlInput(Object url)
-    {
-        super(url);
-    }
-    
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/PKCS12Key.java b/bcprov/src/main/java/org/bouncycastle/jcajce/PKCS12Key.java
deleted file mode 100644
index 471bc77..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jcajce/PKCS12Key.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package org.bouncycastle.jcajce;
-
-import javax.crypto.SecretKey;
-
-import org.bouncycastle.crypto.PBEParametersGenerator;
-
-public class PKCS12Key
-    implements SecretKey
-{
-    private final char[] password;
-
-    /**
-     * Basic constructor for a password based key - secret key generation parameters will be passed separately..
-     *
-     * @param password password to use.
-     */
-    public PKCS12Key(char[] password)
-    {
-        this.password = new char[password.length];
-
-        System.arraycopy(password, 0, this.password, 0, password.length);
-    }
-
-    public char[] getPassword()
-    {
-        return password;
-    }
-
-    public String getAlgorithm()
-    {
-        return "PKCS12";
-    }
-
-    public String getFormat()
-    {
-        return "RAW";
-    }
-
-    public byte[] getEncoded()
-    {
-        return PBEParametersGenerator.PKCS12PasswordToBytes(password);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/PKCS12KeyWithParameters.java b/bcprov/src/main/java/org/bouncycastle/jcajce/PKCS12KeyWithParameters.java
deleted file mode 100644
index 9b7f386..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jcajce/PKCS12KeyWithParameters.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package org.bouncycastle.jcajce;
-
-import javax.crypto.interfaces.PBEKey;
-
-import org.bouncycastle.util.Arrays;
-
-public class PKCS12KeyWithParameters
-    extends PKCS12Key implements PBEKey
-{
-    private final byte[] salt;
-    private final int iterationCount;
-
-    /**
-     * Basic constructor for a password based key with generation parameters.
-     *
-     * @param password password to use.
-     * @param salt salt for generation algorithm
-     * @param iterationCount iteration count for generation algorithm.
-     */
-    public PKCS12KeyWithParameters(char[] password, byte[] salt, int iterationCount)
-    {
-        super(password);
-
-        this.salt = Arrays.clone(salt);
-        this.iterationCount = iterationCount;
-    }
-
-    public byte[] getSalt()
-    {
-        return salt;
-    }
-
-    public int getIterationCount()
-    {
-        return iterationCount;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/io/CipherInputStream.java b/bcprov/src/main/java/org/bouncycastle/jcajce/io/CipherInputStream.java
deleted file mode 100644
index bca96fa..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jcajce/io/CipherInputStream.java
+++ /dev/null
@@ -1,218 +0,0 @@
-package org.bouncycastle.jcajce.io;
-
-import java.io.FilterInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.security.GeneralSecurityException;
-
-import javax.crypto.BadPaddingException;
-import javax.crypto.Cipher;
-import javax.crypto.IllegalBlockSizeException;
-
-import org.bouncycastle.crypto.io.InvalidCipherTextIOException;
-
-/**
- * A CipherInputStream is composed of an InputStream and a cipher so that read() methods return data
- * that are read in from the underlying InputStream but have been additionally processed by the
- * Cipher. The cipher must be fully initialized before being used by a CipherInputStream.
- * <p>
- * For example, if the Cipher is initialized for decryption, the CipherInputStream will attempt to
- * read in data and decrypt them, before returning the decrypted data.
- * </p><p>
- * This is a reimplementation of {@link javax.crypto.CipherInputStream} that is safe for use with
- * AEAD block ciphers, and does not silently catch {@link BadPaddingException} and
- * {@link IllegalBlockSizeException} errors. Any errors that occur during {@link Cipher#doFinal()
- * finalisation} are rethrown wrapped in an {@link InvalidCipherTextIOException}.
- * </p>
- */
-public class CipherInputStream
-    extends FilterInputStream
-{
-    private final Cipher cipher;
-    private final byte[] inputBuffer = new byte[512];
-    private boolean finalized = false;
-    private byte[] buf;
-    private int maxBuf;
-    private int bufOff;
-
-    /**
-     * Constructs a CipherInputStream from an InputStream and an initialised Cipher.
-     */
-    public CipherInputStream(InputStream input, Cipher cipher)
-    {
-        super(input);
-        this.cipher = cipher;
-    }
-
-    /**
-     * Read data from underlying stream and process with cipher until end of stream or some data is
-     * available after cipher processing.
-     *
-     * @return -1 to indicate end of stream, or the number of bytes (> 0) available.
-     */
-    private int nextChunk()
-        throws IOException
-    {
-        if (finalized)
-        {
-            return -1;
-        }
-
-        bufOff = 0;
-        maxBuf = 0;
-
-        // Keep reading until EOF or cipher processing produces data
-        while (maxBuf == 0)
-        {
-            int read = in.read(inputBuffer);
-            if (read == -1)
-            {
-                buf = finaliseCipher();
-                if ((buf == null) || (buf.length == 0))
-                {
-                    return -1;
-                }
-                maxBuf = buf.length;
-                return maxBuf;
-            }
-
-            buf = cipher.update(inputBuffer, 0, read);
-            if (buf != null)
-            {
-                maxBuf = buf.length;
-            }
-        }
-        return maxBuf;
-    }
-
-    private byte[] finaliseCipher()
-        throws InvalidCipherTextIOException
-    {
-        try
-        {
-            finalized = true;
-            return cipher.doFinal();
-        }
-        catch (GeneralSecurityException e)
-        {
-            throw new InvalidCipherTextIOException("Error finalising cipher", e);
-        }
-    }
-
-    /**
-     * Reads data from the underlying stream and processes it with the cipher until the cipher
-     * outputs data, and returns the next available byte.
-     * <p>
-     * If the underlying stream is exhausted by this call, the cipher will be finalised.
-     * </p>
-     * @throws IOException if there was an error closing the input stream.
-     * @throws InvalidCipherTextIOException if the data read from the stream was invalid ciphertext
-     * (e.g. the cipher is an AEAD cipher and the ciphertext tag check fails).
-     */
-    public int read()
-        throws IOException
-    {
-        if (bufOff >= maxBuf)
-        {
-            if (nextChunk() < 0)
-            {
-                return -1;
-            }
-        }
-
-        return buf[bufOff++] & 0xff;
-    }
-
-    /**
-     * Reads data from the underlying stream and processes it with the cipher until the cipher
-     * outputs data, and then returns up to <code>len</code> bytes in the provided array.
-     * <p>
-     * If the underlying stream is exhausted by this call, the cipher will be finalised.
-     * </p>
-     * @param b   the buffer into which the data is read.
-     * @param off the start offset in the destination array <code>b</code>
-     * @param len the maximum number of bytes read.
-     * @return the total number of bytes read into the buffer, or <code>-1</code> if there is no
-     *         more data because the end of the stream has been reached.
-     * @throws IOException if there was an error closing the input stream.
-     * @throws InvalidCipherTextIOException if the data read from the stream was invalid ciphertext
-     * (e.g. the cipher is an AEAD cipher and the ciphertext tag check fails).
-     */
-    public int read(byte[] b, int off, int len)
-        throws IOException
-    {
-        if (bufOff >= maxBuf)
-        {
-            if (nextChunk() < 0)
-            {
-                return -1;
-            }
-        }
-
-        int toSupply = Math.min(len, available());
-        System.arraycopy(buf, bufOff, b, off, toSupply);
-        bufOff += toSupply;
-        return toSupply;
-    }
-
-    public long skip(long n)
-        throws IOException
-    {
-        if (n <= 0)
-        {
-            return 0;
-        }
-
-        int skip = (int)Math.min(n, available());
-        bufOff += skip;
-        return skip;
-    }
-
-    public int available()
-        throws IOException
-    {
-        return maxBuf - bufOff;
-    }
-
-    /**
-     * Closes the underlying input stream, and then finalises the processing of the data by the
-     * cipher.
-     *
-     * @throws IOException if there was an error closing the input stream.
-     * @throws InvalidCipherTextIOException if the data read from the stream was invalid ciphertext
-     * (e.g. the cipher is an AEAD cipher and the ciphertext tag check fails).
-     */
-    public void close()
-        throws IOException
-    {
-        try
-        {
-            in.close();
-        }
-        finally
-        {
-            if (!finalized)
-            {
-                // Reset the cipher, discarding any data buffered in it
-                // Errors in cipher finalisation trump I/O error closing input
-                finaliseCipher();
-            }
-        }
-        maxBuf = bufOff = 0;
-    }
-
-    public void mark(int readlimit)
-    {
-    }
-
-    public void reset()
-        throws IOException
-    {
-    }
-
-    public boolean markSupported()
-    {
-        return false;
-    }
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/io/CipherOutputStream.java b/bcprov/src/main/java/org/bouncycastle/jcajce/io/CipherOutputStream.java
deleted file mode 100644
index 7c1cebf..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jcajce/io/CipherOutputStream.java
+++ /dev/null
@@ -1,147 +0,0 @@
-package org.bouncycastle.jcajce.io;
-
-import java.io.FilterOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.security.GeneralSecurityException;
-
-import javax.crypto.BadPaddingException;
-import javax.crypto.Cipher;
-import javax.crypto.IllegalBlockSizeException;
-
-import org.bouncycastle.crypto.io.InvalidCipherTextIOException;
-
-/**
- * A CipherOutputStream is composed of an OutputStream and a cipher so that write() methods process
- * the written data with the cipher, and the output of the cipher is in turn written to the
- * underlying OutputStream. The cipher must be fully initialized before being used by a
- * CipherInputStream.
- * <p>
- * For example, if the cipher is initialized for encryption, the CipherOutputStream will encrypt the
- * data before writing the encrypted data to the underlying stream.
- * </p><p>
- * This is a reimplementation of {@link javax.crypto.CipherOutputStream} that is safe for use with
- * AEAD block ciphers, and does not silently catch {@link BadPaddingException} and
- * {@link IllegalBlockSizeException} errors. Any errors that occur during {@link Cipher#doFinal()
- * finalisation} are rethrown wrapped in an {@link InvalidCipherTextIOException}.
- * </p>
- */
-public class CipherOutputStream
-    extends FilterOutputStream
-{
-    private final Cipher cipher;
-    private final byte[] oneByte = new byte[1];
-
-    /**
-     * Constructs a CipherOutputStream from an OutputStream and a Cipher.
-     */
-    public CipherOutputStream(OutputStream output, Cipher cipher)
-    {
-        super(output);
-        this.cipher = cipher;
-    }
-
-    /**
-     * Writes the specified byte to this output stream.
-     *
-     * @param b the <code>byte</code>.
-     * @throws java.io.IOException if an I/O error occurs.
-     */
-    public void write(int b)
-        throws IOException
-    {
-        oneByte[0] = (byte)b;
-        write(oneByte, 0, 1);
-    }
-
-    /**
-     * Writes <code>len</code> bytes from the specified byte array starting at offset
-     * <code>off</code> to this output stream.
-     *
-     * @param b   the data.
-     * @param off the start offset in the data.
-     * @param len the number of bytes to write.
-     * @throws java.io.IOException if an I/O error occurs.
-     */
-    public void write(byte[] b, int off, int len)
-        throws IOException
-    {
-        byte[] outData = cipher.update(b, off, len);
-        if (outData != null)
-        {
-            out.write(outData);
-        }
-    }
-
-    /**
-     * Flushes this output stream by forcing any buffered output bytes that have already been
-     * processed by the encapsulated cipher object to be written out.
-     * <p>
-     * Any bytes buffered by the encapsulated cipher and waiting to be processed by it will not be
-     * written out. For example, if the encapsulated cipher is a block cipher, and the total number
-     * of bytes written using one of the <code>write</code> methods is less than the cipher's block
-     * size, no bytes will be written out.
-     * </p>
-     * @throws java.io.IOException if an I/O error occurs.
-     */
-    public void flush()
-        throws IOException
-    {
-        out.flush();
-    }
-
-    /**
-     * Closes this output stream and releases any system resources associated with this stream.
-     * <p>
-     * This method invokes the <code>doFinal</code> method of the encapsulated cipher object, which
-     * causes any bytes buffered by the encapsulated cipher to be processed. The result is written
-     * out by calling the <code>flush</code> method of this output stream.
-     * </p><p>
-     * This method resets the encapsulated cipher object to its initial state and calls the
-     * <code>close</code> method of the underlying output stream.
-     * </p>
-     * @throws java.io.IOException if an I/O error occurs.
-     * @throws InvalidCipherTextIOException if the data written to this stream was invalid
-     * ciphertext (e.g. the cipher is an AEAD cipher and the ciphertext tag check
-     * fails).
-     */
-    public void close()
-        throws IOException
-    {
-        IOException error = null;
-        try
-        {
-            byte[] outData = cipher.doFinal();
-            if (outData != null)
-            {
-                out.write(outData);
-            }
-        }
-        catch (GeneralSecurityException e)
-        {
-            error = new InvalidCipherTextIOException("Error during cipher finalisation", e);
-        }
-        catch (Exception e)
-        {
-            error = new IOException("Error closing stream: " + e);
-        }
-        try
-        {
-            flush();
-            out.close();
-        }
-        catch (IOException e)
-        {
-            // Invalid ciphertext takes precedence over close error
-            if (error == null)
-            {
-                error = e;
-            }
-        }
-        if (error != null)
-        {
-            throw error;
-        }
-    }
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/io/MacOutputStream.java b/bcprov/src/main/java/org/bouncycastle/jcajce/io/MacOutputStream.java
deleted file mode 100644
index 235bfe5..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jcajce/io/MacOutputStream.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package org.bouncycastle.jcajce.io;
-
-import java.io.IOException;
-import java.io.OutputStream;
-
-import javax.crypto.Mac;
-
-public class MacOutputStream
-    extends OutputStream
-{
-    protected Mac mac;
-
-    public MacOutputStream(
-        Mac          mac)
-    {
-        this.mac = mac;
-    }
-
-    public void write(int b)
-        throws IOException
-    {
-        mac.update((byte)b);
-    }
-
-    public void write(
-        byte[] b,
-        int off,
-        int len)
-        throws IOException
-    {
-        mac.update(b, off, len);
-    }
-
-    public byte[] getMac()
-    {
-        return mac.doFinal();
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/DH.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/DH.java
index 5b6b8c4..d43924d 100644
--- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/DH.java
+++ b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/DH.java
@@ -35,10 +35,12 @@ public class DH
 
             provider.addAlgorithm("AlgorithmParameterGenerator.DH", PREFIX + "AlgorithmParameterGeneratorSpi");
             
-            provider.addAlgorithm("Cipher.DHIES", PREFIX + "IESCipher$IES");
-            provider.addAlgorithm("Cipher.DHIESwithAES", PREFIX + "IESCipher$IESwithAES");
-            provider.addAlgorithm("Cipher.DHIESWITHAES", PREFIX + "IESCipher$IESwithAES");
-            provider.addAlgorithm("Cipher.DHIESWITHDESEDE", PREFIX + "IESCipher$IESwithDESede");
+            // BEGIN android-removed
+            // provider.addAlgorithm("Cipher.DHIES", PREFIX + "IESCipher$IES");
+            // provider.addAlgorithm("Cipher.DHIESwithAES", PREFIX + "IESCipher$IESwithAES");
+            // provider.addAlgorithm("Cipher.DHIESWITHAES", PREFIX + "IESCipher$IESwithAES");
+            // provider.addAlgorithm("Cipher.DHIESWITHDESEDE", PREFIX + "IESCipher$IESwithDESede");
+            // END android-removed
 
             registerOid(provider, PKCSObjectIdentifiers.dhKeyAgreement, "DH", new KeyFactorySpi());
             registerOid(provider, X9ObjectIdentifiers.dhpublicnumber, "DH", new KeyFactorySpi());
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/DSA.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/DSA.java
index 2efffbf..7c402f3 100644
--- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/DSA.java
+++ b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/DSA.java
@@ -27,40 +27,55 @@ public class DSA
             provider.addAlgorithm("KeyPairGenerator.DSA", PREFIX + "KeyPairGeneratorSpi");
             provider.addAlgorithm("KeyFactory.DSA", PREFIX + "KeyFactorySpi");
 
-            provider.addAlgorithm("Signature.DSA", PREFIX + "DSASigner$stdDSA");
+            // BEGIN android-changed
+            provider.addAlgorithm("Signature.SHA1withDSA", PREFIX + "DSASigner$stdDSA");
+            // END android-changed
             provider.addAlgorithm("Signature.NONEWITHDSA", PREFIX + "DSASigner$noneDSA");
 
             provider.addAlgorithm("Alg.Alias.Signature.RAWDSA", "NONEWITHDSA");
 
-            provider.addAlgorithm("Signature.DETDSA", PREFIX + "DSASigner$detDSA");
-            provider.addAlgorithm("Signature.SHA1WITHDETDSA", PREFIX + "DSASigner$detDSA");
-            provider.addAlgorithm("Signature.SHA224WITHDETDSA", PREFIX + "DSASigner$detDSA224");
-            provider.addAlgorithm("Signature.SHA256WITHDETDSA", PREFIX + "DSASigner$detDSA256");
-            provider.addAlgorithm("Signature.SHA384WITHDETDSA", PREFIX + "DSASigner$detDSA384");
-            provider.addAlgorithm("Signature.SHA512WITHDETDSA", PREFIX + "DSASigner$detDSA512");
+            // BEGIN android-removed
+            // provider.addAlgorithm("Signature.DETDSA", PREFIX + "DSASigner$detDSA");
+            // provider.addAlgorithm("Signature.SHA1WITHDETDSA", PREFIX + "DSASigner$detDSA");
+            // provider.addAlgorithm("Signature.SHA224WITHDETDSA", PREFIX + "DSASigner$detDSA224");
+            // provider.addAlgorithm("Signature.SHA256WITHDETDSA", PREFIX + "DSASigner$detDSA256");
+            // provider.addAlgorithm("Signature.SHA384WITHDETDSA", PREFIX + "DSASigner$detDSA384");
+            // provider.addAlgorithm("Signature.SHA512WITHDETDSA", PREFIX + "DSASigner$detDSA512");
+            // END android-removed
 
             addSignatureAlgorithm(provider, "SHA224", "DSA", PREFIX + "DSASigner$dsa224", NISTObjectIdentifiers.dsa_with_sha224);
             addSignatureAlgorithm(provider, "SHA256", "DSA", PREFIX + "DSASigner$dsa256", NISTObjectIdentifiers.dsa_with_sha256);
-            addSignatureAlgorithm(provider, "SHA384", "DSA", PREFIX + "DSASigner$dsa384", NISTObjectIdentifiers.dsa_with_sha384);
-            addSignatureAlgorithm(provider, "SHA512", "DSA", PREFIX + "DSASigner$dsa512", NISTObjectIdentifiers.dsa_with_sha512);
+            // BEGIN android-removed
+            // addSignatureAlgorithm(provider, "SHA384", "DSA", PREFIX + "DSASigner$dsa384", NISTObjectIdentifiers.dsa_with_sha384);
+            // addSignatureAlgorithm(provider, "SHA512", "DSA", PREFIX + "DSASigner$dsa512", NISTObjectIdentifiers.dsa_with_sha512);
+            // END android-removed
 
-            provider.addAlgorithm("Alg.Alias.Signature.SHA/DSA", "DSA");
-            provider.addAlgorithm("Alg.Alias.Signature.SHA1withDSA", "DSA");
-            provider.addAlgorithm("Alg.Alias.Signature.SHA1WITHDSA", "DSA");
-            provider.addAlgorithm("Alg.Alias.Signature.1.3.14.3.2.26with1.2.840.10040.4.1", "DSA");
-            provider.addAlgorithm("Alg.Alias.Signature.1.3.14.3.2.26with1.2.840.10040.4.3", "DSA");
-            provider.addAlgorithm("Alg.Alias.Signature.DSAwithSHA1", "DSA");
-            provider.addAlgorithm("Alg.Alias.Signature.DSAWITHSHA1", "DSA");
-            provider.addAlgorithm("Alg.Alias.Signature.SHA1WithDSA", "DSA");
-            provider.addAlgorithm("Alg.Alias.Signature.DSAWithSHA1", "DSA");
+            // BEGIN android-added
+            provider.addAlgorithm("Alg.Alias.Signature.DSA", "SHA1withDSA");
+            // END android-added
+            // BEGIN android-changed
+            provider.addAlgorithm("Alg.Alias.Signature.SHA/DSA", "SHA1withDSA");
+            provider.addAlgorithm("Alg.Alias.Signature.SHA1withDSA", "SHA1withDSA");
+            provider.addAlgorithm("Alg.Alias.Signature.SHA1WITHDSA", "SHA1withDSA");
+            provider.addAlgorithm("Alg.Alias.Signature.1.3.14.3.2.26with1.2.840.10040.4.1", "SHA1withDSA");
+            provider.addAlgorithm("Alg.Alias.Signature.1.3.14.3.2.26with1.2.840.10040.4.3", "SHA1withDSA");
+            provider.addAlgorithm("Alg.Alias.Signature.DSAwithSHA1", "SHA1withDSA");
+            provider.addAlgorithm("Alg.Alias.Signature.DSAWITHSHA1", "SHA1withDSA");
+            provider.addAlgorithm("Alg.Alias.Signature.SHA1WithDSA", "SHA1withDSA");
+            provider.addAlgorithm("Alg.Alias.Signature.DSAWithSHA1", "SHA1withDSA");
+            // END android-changed
 
-            provider.addAlgorithm("Alg.Alias.Signature.1.2.840.10040.4.3", "DSA");
+            // BEGIN android-removed
+            // provider.addAlgorithm("Alg.Alias.Signature.1.2.840.10040.4.3", "DSA");
+            // END android-removed
 
             AsymmetricKeyInfoConverter keyFact = new KeyFactorySpi();
 
             for (int i = 0; i != DSAUtil.dsaOids.length; i++)
             {
-                provider.addAlgorithm("Alg.Alias.Signature." + DSAUtil.dsaOids[i], "DSA");
+                // BEGIN android-changed
+                provider.addAlgorithm("Alg.Alias.Signature." + DSAUtil.dsaOids[i], "SHA1withDSA");
+                // END android-changed
 
                 registerOid(provider, DSAUtil.dsaOids[i], "DSA", keyFact);
                 registerOidAlgorithmParameters(provider, DSAUtil.dsaOids[i], "DSA");
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/DSTU4145.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/DSTU4145.java
deleted file mode 100644
index bdf167d..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/DSTU4145.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package org.bouncycastle.jcajce.provider.asymmetric;
-
-import org.bouncycastle.asn1.ua.UAObjectIdentifiers;
-import org.bouncycastle.jcajce.provider.asymmetric.dstu.KeyFactorySpi;
-import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
-import org.bouncycastle.jcajce.provider.util.AsymmetricAlgorithmProvider;
-
-public class DSTU4145 
-{
-    private static final String PREFIX = "org.bouncycastle.jcajce.provider.asymmetric" + ".dstu.";
-
-    public static class Mappings
-        extends AsymmetricAlgorithmProvider
-    {
-        public Mappings()
-        {
-        }
-        
-        public void configure(ConfigurableProvider provider)
-        {
-            provider.addAlgorithm("KeyFactory.DSTU4145", PREFIX + "KeyFactorySpi");
-            provider.addAlgorithm("Alg.Alias.KeyFactory.DSTU-4145-2002", "DSTU4145");
-            provider.addAlgorithm("Alg.Alias.KeyFactory.DSTU4145-3410", "DSTU4145");
-
-            registerOid(provider, UAObjectIdentifiers.dstu4145le, "DSTU4145", new KeyFactorySpi());
-            registerOidAlgorithmParameters(provider, UAObjectIdentifiers.dstu4145le, "DSTU4145");
-            registerOid(provider, UAObjectIdentifiers.dstu4145be, "DSTU4145", new KeyFactorySpi());
-            registerOidAlgorithmParameters(provider, UAObjectIdentifiers.dstu4145be, "DSTU4145");
-
-            provider.addAlgorithm("KeyPairGenerator.DSTU4145", PREFIX + "KeyPairGeneratorSpi");
-            provider.addAlgorithm("Alg.Alias.KeyPairGenerator.DSTU-4145", "DSTU4145");
-            provider.addAlgorithm("Alg.Alias.KeyPairGenerator.DSTU-4145-2002", "DSTU4145");
-
-            provider.addAlgorithm("Signature.DSTU4145", PREFIX + "SignatureSpi");
-            provider.addAlgorithm("Alg.Alias.Signature.DSTU-4145", "DSTU4145");
-            provider.addAlgorithm("Alg.Alias.Signature.DSTU-4145-2002", "DSTU4145");
-
-            addSignatureAlgorithm(provider, "GOST3411", "DSTU4145LE", PREFIX + "SignatureSpiLe", UAObjectIdentifiers.dstu4145le);
-            addSignatureAlgorithm(provider, "GOST3411", "DSTU4145", PREFIX + "SignatureSpi", UAObjectIdentifiers.dstu4145be);
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/EC.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/EC.java
index d7b437c..1266abd 100644
--- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/EC.java
+++ b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/EC.java
@@ -1,8 +1,10 @@
 package org.bouncycastle.jcajce.provider.asymmetric;
 
-import org.bouncycastle.asn1.bsi.BSIObjectIdentifiers;
-import org.bouncycastle.asn1.eac.EACObjectIdentifiers;
-import org.bouncycastle.asn1.teletrust.TeleTrusTObjectIdentifiers;
+// BEGIN android-removed
+// import org.bouncycastle.asn1.bsi.BSIObjectIdentifiers;
+// import org.bouncycastle.asn1.eac.EACObjectIdentifiers;
+// import org.bouncycastle.asn1.teletrust.TeleTrusTObjectIdentifiers;
+// END android-removed
 import org.bouncycastle.asn1.x9.X9ObjectIdentifiers;
 import org.bouncycastle.jcajce.provider.asymmetric.ec.KeyFactorySpi;
 import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
@@ -22,45 +24,59 @@ public class EC
         public void configure(ConfigurableProvider provider)
         {
             provider.addAlgorithm("KeyAgreement.ECDH", PREFIX + "KeyAgreementSpi$DH");
-            provider.addAlgorithm("KeyAgreement.ECDHC", PREFIX + "KeyAgreementSpi$DHC");
-            provider.addAlgorithm("KeyAgreement.ECMQV", PREFIX + "KeyAgreementSpi$MQV");
-            provider.addAlgorithm("KeyAgreement." + X9ObjectIdentifiers.dhSinglePass_stdDH_sha1kdf_scheme, PREFIX + "KeyAgreementSpi$DHwithSHA1KDF");
-            provider.addAlgorithm("KeyAgreement." + X9ObjectIdentifiers.mqvSinglePass_sha1kdf_scheme, PREFIX + "KeyAgreementSpi$MQVwithSHA1KDF");
-            provider.addAlgorithm("KeyAgreement.ECDHWITHSHA1KDF", PREFIX + "KeyAgreementSpi$DHwithSHA1KDF");
+            // BEGIN android-removed
+            // provider.addAlgorithm("KeyAgreement.ECDHC", PREFIX + "KeyAgreementSpi$DHC");
+            // provider.addAlgorithm("KeyAgreement.ECMQV", PREFIX + "KeyAgreementSpi$MQV");
+            // provider.addAlgorithm("KeyAgreement." + X9ObjectIdentifiers.dhSinglePass_stdDH_sha1kdf_scheme, PREFIX + "KeyAgreementSpi$DHwithSHA1KDF");
+            // provider.addAlgorithm("KeyAgreement." + X9ObjectIdentifiers.mqvSinglePass_sha1kdf_scheme, PREFIX + "KeyAgreementSpi$MQVwithSHA1KDF");
+            // provider.addAlgorithm("KeyAgreement.ECDHWITHSHA1KDF", PREFIX + "KeyAgreementSpi$DHwithSHA1KDF");
+            // END android-removed
 
             registerOid(provider, X9ObjectIdentifiers.id_ecPublicKey, "EC", new KeyFactorySpi.EC());
             // TODO Should this be an alias for ECDH?
             registerOid(provider, X9ObjectIdentifiers.dhSinglePass_stdDH_sha1kdf_scheme, "EC", new KeyFactorySpi.EC());
-            registerOid(provider, X9ObjectIdentifiers.mqvSinglePass_sha1kdf_scheme, "ECMQV", new KeyFactorySpi.ECMQV());
-
-            registerOidAlgorithmParameters(provider, X9ObjectIdentifiers.id_ecPublicKey, "EC");
+            // BEGIN android-removed
+            // registerOid(provider, X9ObjectIdentifiers.mqvSinglePass_sha1kdf_scheme, "ECMQV", new KeyFactorySpi.ECMQV());
+            //
+            // // Android comment: the registration below is causing CTS tests to fail and doesn't seem
+            // // to be implemented by bouncycastle (so looks like an bug in bouncycastle).
+            // registerOidAlgorithmParameters(provider, X9ObjectIdentifiers.id_ecPublicKey, "EC");
+            // END android-removed
             // TODO Should this be an alias for ECDH?
-            registerOidAlgorithmParameters(provider, X9ObjectIdentifiers.dhSinglePass_stdDH_sha1kdf_scheme, "EC");
-            registerOidAlgorithmParameters(provider, X9ObjectIdentifiers.mqvSinglePass_sha1kdf_scheme, "EC");
+            // BEGIN android-removed
+            // // Android comment: the registration below is causing CTS tests to fail and doesn't seem
+            // // to be implemented by bouncycastle (so looks like an bug in bouncycastle).
+            // registerOidAlgorithmParameters(provider, X9ObjectIdentifiers.dhSinglePass_stdDH_sha1kdf_scheme, "EC");
+            // registerOidAlgorithmParameters(provider, X9ObjectIdentifiers.mqvSinglePass_sha1kdf_scheme, "EC");
+            // END android-removed
 
             provider.addAlgorithm("KeyFactory.EC", PREFIX + "KeyFactorySpi$EC");
-            provider.addAlgorithm("KeyFactory.ECDSA", PREFIX + "KeyFactorySpi$ECDSA");
-            provider.addAlgorithm("KeyFactory.ECDH", PREFIX + "KeyFactorySpi$ECDH");
-            provider.addAlgorithm("KeyFactory.ECDHC", PREFIX + "KeyFactorySpi$ECDHC");
-            provider.addAlgorithm("KeyFactory.ECMQV", PREFIX + "KeyFactorySpi$ECMQV");
+            // BEGIN android-removed
+            // provider.addAlgorithm("KeyFactory.ECDSA", PREFIX + "KeyFactorySpi$ECDSA");
+            // provider.addAlgorithm("KeyFactory.ECDH", PREFIX + "KeyFactorySpi$ECDH");
+            // provider.addAlgorithm("KeyFactory.ECDHC", PREFIX + "KeyFactorySpi$ECDHC");
+            // provider.addAlgorithm("KeyFactory.ECMQV", PREFIX + "KeyFactorySpi$ECMQV");
+            // END android-removed
 
             provider.addAlgorithm("KeyPairGenerator.EC", PREFIX + "KeyPairGeneratorSpi$EC");
-            provider.addAlgorithm("KeyPairGenerator.ECDSA", PREFIX + "KeyPairGeneratorSpi$ECDSA");
-            provider.addAlgorithm("KeyPairGenerator.ECDH", PREFIX + "KeyPairGeneratorSpi$ECDH");
-            provider.addAlgorithm("KeyPairGenerator.ECDHWITHSHA1KDF", PREFIX + "KeyPairGeneratorSpi$ECDH");
-            provider.addAlgorithm("KeyPairGenerator.ECDHC", PREFIX + "KeyPairGeneratorSpi$ECDHC");
-            provider.addAlgorithm("KeyPairGenerator.ECIES", PREFIX + "KeyPairGeneratorSpi$ECDH");
-            provider.addAlgorithm("KeyPairGenerator.ECMQV", PREFIX + "KeyPairGeneratorSpi$ECMQV");
-            
-            provider.addAlgorithm("Cipher.ECIES", PREFIX + "IESCipher$ECIES");
-            provider.addAlgorithm("Cipher.ECIESwithAES", PREFIX + "IESCipher$ECIESwithAES");
-            provider.addAlgorithm("Cipher.ECIESWITHAES", PREFIX + "IESCipher$ECIESwithAES");
-            provider.addAlgorithm("Cipher.ECIESwithDESEDE", PREFIX + "IESCipher$ECIESwithDESede");
-            provider.addAlgorithm("Cipher.ECIESWITHDESEDE", PREFIX + "IESCipher$ECIESwithDESede");
-            provider.addAlgorithm("Cipher.ECIESwithAES-CBC", PREFIX + "IESCipher$ECIESwithAESCBC");
-            provider.addAlgorithm("Cipher.ECIESWITHAES-CBC", PREFIX + "IESCipher$ECIESwithAESCBC");
-            provider.addAlgorithm("Cipher.ECIESwithDESEDE-CBC", PREFIX + "IESCipher$ECIESwithDESedeCBC");
-            provider.addAlgorithm("Cipher.ECIESWITHDESEDE-CBC", PREFIX + "IESCipher$ECIESwithDESedeCBC");
+            // BEGIN android-removed
+            // provider.addAlgorithm("KeyPairGenerator.ECDSA", PREFIX + "KeyPairGeneratorSpi$ECDSA");
+            // provider.addAlgorithm("KeyPairGenerator.ECDH", PREFIX + "KeyPairGeneratorSpi$ECDH");
+            // provider.addAlgorithm("KeyPairGenerator.ECDHWITHSHA1KDF", PREFIX + "KeyPairGeneratorSpi$ECDH");
+            // provider.addAlgorithm("KeyPairGenerator.ECDHC", PREFIX + "KeyPairGeneratorSpi$ECDHC");
+            // provider.addAlgorithm("KeyPairGenerator.ECIES", PREFIX + "KeyPairGeneratorSpi$ECDH");
+            // provider.addAlgorithm("KeyPairGenerator.ECMQV", PREFIX + "KeyPairGeneratorSpi$ECMQV");
+            //
+            // provider.addAlgorithm("Cipher.ECIES", PREFIX + "IESCipher$ECIES");
+            // provider.addAlgorithm("Cipher.ECIESwithAES", PREFIX + "IESCipher$ECIESwithAES");
+            // provider.addAlgorithm("Cipher.ECIESWITHAES", PREFIX + "IESCipher$ECIESwithAES");
+            // provider.addAlgorithm("Cipher.ECIESwithDESEDE", PREFIX + "IESCipher$ECIESwithDESede");
+            // provider.addAlgorithm("Cipher.ECIESWITHDESEDE", PREFIX + "IESCipher$ECIESwithDESede");
+            // provider.addAlgorithm("Cipher.ECIESwithAES-CBC", PREFIX + "IESCipher$ECIESwithAESCBC");
+            // provider.addAlgorithm("Cipher.ECIESWITHAES-CBC", PREFIX + "IESCipher$ECIESwithAESCBC");
+            // provider.addAlgorithm("Cipher.ECIESwithDESEDE-CBC", PREFIX + "IESCipher$ECIESwithDESedeCBC");
+            // provider.addAlgorithm("Cipher.ECIESWITHDESEDE-CBC", PREFIX + "IESCipher$ECIESwithDESedeCBC");
+            // END android-removed
 
             provider.addAlgorithm("Signature.ECDSA", PREFIX + "SignatureSpi$ecDSA");
             provider.addAlgorithm("Signature.NONEwithECDSA", PREFIX + "SignatureSpi$ecDSAnone");
@@ -72,39 +88,43 @@ public class EC
             provider.addAlgorithm("Alg.Alias.Signature.SHA1WithECDSA", "ECDSA");
             provider.addAlgorithm("Alg.Alias.Signature.ECDSAWithSHA1", "ECDSA");
             provider.addAlgorithm("Alg.Alias.Signature.1.2.840.10045.4.1", "ECDSA");
-            provider.addAlgorithm("Alg.Alias.Signature." + TeleTrusTObjectIdentifiers.ecSignWithSha1, "ECDSA");
-
-            provider.addAlgorithm("Signature.DETECDSA", PREFIX + "SignatureSpi$ecDetDSA");
-            provider.addAlgorithm("Signature.SHA1WITHDETECDSA", PREFIX + "SignatureSpi$ecDetDSA");
-            provider.addAlgorithm("Signature.SHA224WITHDETECDSA", PREFIX + "SignatureSpi$ecDetDSA224");
-            provider.addAlgorithm("Signature.SHA256WITHDETECDSA", PREFIX + "SignatureSpi$ecDetDSA256");
-            provider.addAlgorithm("Signature.SHA384WITHDETECDSA", PREFIX + "SignatureSpi$ecDetDSA384");
-            provider.addAlgorithm("Signature.SHA512WITHDETECDSA", PREFIX + "SignatureSpi$ecDetDSA512");
+            // BEGIN android-removed
+            // provider.addAlgorithm("Alg.Alias.Signature." + TeleTrusTObjectIdentifiers.ecSignWithSha1, "ECDSA");
+            //
+            // provider.addAlgorithm("Signature.DETECDSA", PREFIX + "SignatureSpi$ecDetDSA");
+            // provider.addAlgorithm("Signature.SHA1WITHDETECDSA", PREFIX + "SignatureSpi$ecDetDSA");
+            // provider.addAlgorithm("Signature.SHA224WITHDETECDSA", PREFIX + "SignatureSpi$ecDetDSA224");
+            // provider.addAlgorithm("Signature.SHA256WITHDETECDSA", PREFIX + "SignatureSpi$ecDetDSA256");
+            // provider.addAlgorithm("Signature.SHA384WITHDETECDSA", PREFIX + "SignatureSpi$ecDetDSA384");
+            // provider.addAlgorithm("Signature.SHA512WITHDETECDSA", PREFIX + "SignatureSpi$ecDetDSA512");
+            // END android-removed
 
             addSignatureAlgorithm(provider, "SHA224", "ECDSA", PREFIX + "SignatureSpi$ecDSA224", X9ObjectIdentifiers.ecdsa_with_SHA224);
             addSignatureAlgorithm(provider, "SHA256", "ECDSA", PREFIX + "SignatureSpi$ecDSA256", X9ObjectIdentifiers.ecdsa_with_SHA256);
             addSignatureAlgorithm(provider, "SHA384", "ECDSA", PREFIX + "SignatureSpi$ecDSA384", X9ObjectIdentifiers.ecdsa_with_SHA384);
             addSignatureAlgorithm(provider, "SHA512", "ECDSA", PREFIX + "SignatureSpi$ecDSA512", X9ObjectIdentifiers.ecdsa_with_SHA512);
-            addSignatureAlgorithm(provider, "RIPEMD160", "ECDSA", PREFIX + "SignatureSpi$ecDSARipeMD160",TeleTrusTObjectIdentifiers.ecSignWithRipemd160);
-
-            provider.addAlgorithm("Signature.SHA1WITHECNR", PREFIX + "SignatureSpi$ecNR");
-            provider.addAlgorithm("Signature.SHA224WITHECNR", PREFIX + "SignatureSpi$ecNR224");
-            provider.addAlgorithm("Signature.SHA256WITHECNR", PREFIX + "SignatureSpi$ecNR256");
-            provider.addAlgorithm("Signature.SHA384WITHECNR", PREFIX + "SignatureSpi$ecNR384");
-            provider.addAlgorithm("Signature.SHA512WITHECNR", PREFIX + "SignatureSpi$ecNR512");
-
-            addSignatureAlgorithm(provider, "SHA1", "CVC-ECDSA", PREFIX + "SignatureSpi$ecCVCDSA", EACObjectIdentifiers.id_TA_ECDSA_SHA_1);
-            addSignatureAlgorithm(provider, "SHA224", "CVC-ECDSA", PREFIX + "SignatureSpi$ecCVCDSA224", EACObjectIdentifiers.id_TA_ECDSA_SHA_224);
-            addSignatureAlgorithm(provider, "SHA256", "CVC-ECDSA", PREFIX + "SignatureSpi$ecCVCDSA256", EACObjectIdentifiers.id_TA_ECDSA_SHA_256);
-            addSignatureAlgorithm(provider, "SHA384", "CVC-ECDSA", PREFIX + "SignatureSpi$ecCVCDSA384", EACObjectIdentifiers.id_TA_ECDSA_SHA_384);
-            addSignatureAlgorithm(provider, "SHA512", "CVC-ECDSA", PREFIX + "SignatureSpi$ecCVCDSA512", EACObjectIdentifiers.id_TA_ECDSA_SHA_512);
-
-            addSignatureAlgorithm(provider, "SHA1", "PLAIN-ECDSA", PREFIX + "SignatureSpi$ecCVCDSA", BSIObjectIdentifiers.ecdsa_plain_SHA1);
-            addSignatureAlgorithm(provider, "SHA224", "PLAIN-ECDSA", PREFIX + "SignatureSpi$ecCVCDSA224", BSIObjectIdentifiers.ecdsa_plain_SHA224);
-            addSignatureAlgorithm(provider, "SHA256", "PLAIN-ECDSA", PREFIX + "SignatureSpi$ecCVCDSA256", BSIObjectIdentifiers.ecdsa_plain_SHA256);
-            addSignatureAlgorithm(provider, "SHA384", "PLAIN-ECDSA", PREFIX + "SignatureSpi$ecCVCDSA384", BSIObjectIdentifiers.ecdsa_plain_SHA384);
-            addSignatureAlgorithm(provider, "SHA512", "PLAIN-ECDSA", PREFIX + "SignatureSpi$ecCVCDSA512", BSIObjectIdentifiers.ecdsa_plain_SHA512);
-            addSignatureAlgorithm(provider, "RIPEMD160", "PLAIN-ECDSA", PREFIX + "SignatureSpi$ecPlainDSARP160", BSIObjectIdentifiers.ecdsa_plain_RIPEMD160);
+            // BEGIN android-removed
+            // addSignatureAlgorithm(provider, "RIPEMD160", "ECDSA", PREFIX + "SignatureSpi$ecDSARipeMD160",TeleTrusTObjectIdentifiers.ecSignWithRipemd160);
+            //
+            // provider.addAlgorithm("Signature.SHA1WITHECNR", PREFIX + "SignatureSpi$ecNR");
+            // provider.addAlgorithm("Signature.SHA224WITHECNR", PREFIX + "SignatureSpi$ecNR224");
+            // provider.addAlgorithm("Signature.SHA256WITHECNR", PREFIX + "SignatureSpi$ecNR256");
+            // provider.addAlgorithm("Signature.SHA384WITHECNR", PREFIX + "SignatureSpi$ecNR384");
+            // provider.addAlgorithm("Signature.SHA512WITHECNR", PREFIX + "SignatureSpi$ecNR512");
+            //
+            // addSignatureAlgorithm(provider, "SHA1", "CVC-ECDSA", PREFIX + "SignatureSpi$ecCVCDSA", EACObjectIdentifiers.id_TA_ECDSA_SHA_1);
+            // addSignatureAlgorithm(provider, "SHA224", "CVC-ECDSA", PREFIX + "SignatureSpi$ecCVCDSA224", EACObjectIdentifiers.id_TA_ECDSA_SHA_224);
+            // addSignatureAlgorithm(provider, "SHA256", "CVC-ECDSA", PREFIX + "SignatureSpi$ecCVCDSA256", EACObjectIdentifiers.id_TA_ECDSA_SHA_256);
+            // addSignatureAlgorithm(provider, "SHA384", "CVC-ECDSA", PREFIX + "SignatureSpi$ecCVCDSA384", EACObjectIdentifiers.id_TA_ECDSA_SHA_384);
+            // addSignatureAlgorithm(provider, "SHA512", "CVC-ECDSA", PREFIX + "SignatureSpi$ecCVCDSA512", EACObjectIdentifiers.id_TA_ECDSA_SHA_512);
+            //
+            // addSignatureAlgorithm(provider, "SHA1", "PLAIN-ECDSA", PREFIX + "SignatureSpi$ecCVCDSA", BSIObjectIdentifiers.ecdsa_plain_SHA1);
+            // addSignatureAlgorithm(provider, "SHA224", "PLAIN-ECDSA", PREFIX + "SignatureSpi$ecCVCDSA224", BSIObjectIdentifiers.ecdsa_plain_SHA224);
+            // addSignatureAlgorithm(provider, "SHA256", "PLAIN-ECDSA", PREFIX + "SignatureSpi$ecCVCDSA256", BSIObjectIdentifiers.ecdsa_plain_SHA256);
+            // addSignatureAlgorithm(provider, "SHA384", "PLAIN-ECDSA", PREFIX + "SignatureSpi$ecCVCDSA384", BSIObjectIdentifiers.ecdsa_plain_SHA384);
+            // addSignatureAlgorithm(provider, "SHA512", "PLAIN-ECDSA", PREFIX + "SignatureSpi$ecCVCDSA512", BSIObjectIdentifiers.ecdsa_plain_SHA512);
+            // addSignatureAlgorithm(provider, "RIPEMD160", "PLAIN-ECDSA", PREFIX + "SignatureSpi$ecPlainDSARP160", BSIObjectIdentifiers.ecdsa_plain_RIPEMD160);
+            // END android-removed
         }
     }
 }
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/ECGOST.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/ECGOST.java
deleted file mode 100644
index d33126b..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/ECGOST.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package org.bouncycastle.jcajce.provider.asymmetric;
-
-import org.bouncycastle.asn1.cryptopro.CryptoProObjectIdentifiers;
-import org.bouncycastle.jcajce.provider.asymmetric.ecgost.KeyFactorySpi;
-import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
-import org.bouncycastle.jcajce.provider.util.AsymmetricAlgorithmProvider;
-
-public class ECGOST
-{
-    private static final String PREFIX = "org.bouncycastle.jcajce.provider.asymmetric" + ".ecgost.";
-
-    public static class Mappings
-        extends AsymmetricAlgorithmProvider
-    {
-        public Mappings()
-        {
-        }
-        
-        public void configure(ConfigurableProvider provider)
-        {
-            provider.addAlgorithm("KeyFactory.ECGOST3410", PREFIX + "KeyFactorySpi");
-            provider.addAlgorithm("Alg.Alias.KeyFactory.GOST-3410-2001", "ECGOST3410");
-            provider.addAlgorithm("Alg.Alias.KeyFactory.ECGOST-3410", "ECGOST3410");
-
-            registerOid(provider, CryptoProObjectIdentifiers.gostR3410_2001, "ECGOST3410", new KeyFactorySpi());
-            registerOidAlgorithmParameters(provider, CryptoProObjectIdentifiers.gostR3410_2001, "ECGOST3410");
-
-            provider.addAlgorithm("KeyPairGenerator.ECGOST3410", PREFIX + "KeyPairGeneratorSpi");
-            provider.addAlgorithm("Alg.Alias.KeyPairGenerator.ECGOST-3410", "ECGOST3410");
-            provider.addAlgorithm("Alg.Alias.KeyPairGenerator.GOST-3410-2001", "ECGOST3410");
-
-            provider.addAlgorithm("Signature.ECGOST3410", PREFIX + "SignatureSpi");
-            provider.addAlgorithm("Alg.Alias.Signature.ECGOST-3410", "ECGOST3410");
-            provider.addAlgorithm("Alg.Alias.Signature.GOST-3410-2001", "ECGOST3410");
-
-            addSignatureAlgorithm(provider, "GOST3411", "ECGOST3410", PREFIX + "SignatureSpi", CryptoProObjectIdentifiers.gostR3411_94_with_gostR3410_2001);
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/ElGamal.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/ElGamal.java
deleted file mode 100644
index 8dfeed0..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/ElGamal.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package org.bouncycastle.jcajce.provider.asymmetric;
-
-import org.bouncycastle.asn1.oiw.OIWObjectIdentifiers;
-import org.bouncycastle.jcajce.provider.asymmetric.elgamal.KeyFactorySpi;
-import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
-import org.bouncycastle.jcajce.provider.util.AsymmetricAlgorithmProvider;
-import org.bouncycastle.jcajce.provider.util.AsymmetricKeyInfoConverter;
-
-public class ElGamal
-{
-    private static final String PREFIX = "org.bouncycastle.jcajce.provider.asymmetric" + ".elgamal.";
-
-    public static class Mappings
-        extends AsymmetricAlgorithmProvider
-    {
-        public Mappings()
-        {
-        }
-        
-        public void configure(ConfigurableProvider provider)
-        {
-            provider.addAlgorithm("AlgorithmParameterGenerator.ELGAMAL", PREFIX + "AlgorithmParameterGeneratorSpi");
-            provider.addAlgorithm("AlgorithmParameterGenerator.ElGamal", PREFIX + "AlgorithmParameterGeneratorSpi");
-            provider.addAlgorithm("AlgorithmParameters.ELGAMAL", PREFIX + "AlgorithmParametersSpi");
-            provider.addAlgorithm("AlgorithmParameters.ElGamal", PREFIX + "AlgorithmParametersSpi");
-
-            provider.addAlgorithm("Cipher.ELGAMAL", PREFIX + "CipherSpi$NoPadding");
-            provider.addAlgorithm("Cipher.ElGamal", PREFIX + "CipherSpi$NoPadding");
-            provider.addAlgorithm("Alg.Alias.Cipher.ELGAMAL/ECB/PKCS1PADDING", "ELGAMAL/PKCS1");
-            provider.addAlgorithm("Alg.Alias.Cipher.ELGAMAL/NONE/PKCS1PADDING", "ELGAMAL/PKCS1");
-            provider.addAlgorithm("Alg.Alias.Cipher.ELGAMAL/NONE/NOPADDING", "ELGAMAL");
-
-            provider.addAlgorithm("Cipher.ELGAMAL/PKCS1", PREFIX + "CipherSpi$PKCS1v1_5Padding");
-            provider.addAlgorithm("KeyFactory.ELGAMAL", PREFIX + "KeyFactorySpi");
-            provider.addAlgorithm("KeyFactory.ElGamal", PREFIX + "KeyFactorySpi");
-
-            provider.addAlgorithm("KeyPairGenerator.ELGAMAL", PREFIX + "KeyPairGeneratorSpi");
-            provider.addAlgorithm("KeyPairGenerator.ElGamal", PREFIX + "KeyPairGeneratorSpi");
-
-            AsymmetricKeyInfoConverter keyFact = new KeyFactorySpi();
-
-            registerOid(provider, OIWObjectIdentifiers.elGamalAlgorithm, "ELGAMAL", keyFact);
-            registerOidAlgorithmParameters(provider, OIWObjectIdentifiers.elGamalAlgorithm, "ELGAMAL");
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/GOST.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/GOST.java
deleted file mode 100644
index 39ab20d..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/GOST.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package org.bouncycastle.jcajce.provider.asymmetric;
-
-import org.bouncycastle.asn1.cryptopro.CryptoProObjectIdentifiers;
-import org.bouncycastle.jcajce.provider.asymmetric.gost.KeyFactorySpi;
-import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
-import org.bouncycastle.jcajce.provider.util.AsymmetricAlgorithmProvider;
-
-public class GOST
-{
-    private static final String PREFIX = "org.bouncycastle.jcajce.provider.asymmetric" + ".gost.";
-
-    public static class Mappings
-        extends AsymmetricAlgorithmProvider
-    {
-        public Mappings()
-        {
-        }
-        
-        public void configure(ConfigurableProvider provider)
-        {
-            provider.addAlgorithm("KeyPairGenerator.GOST3410", PREFIX + "KeyPairGeneratorSpi");
-            provider.addAlgorithm("Alg.Alias.KeyPairGenerator.GOST-3410", "GOST3410");
-            provider.addAlgorithm("Alg.Alias.KeyPairGenerator.GOST-3410-94", "GOST3410");
-
-            provider.addAlgorithm("KeyFactory.GOST3410", PREFIX + "KeyFactorySpi");
-            provider.addAlgorithm("Alg.Alias.KeyFactory.GOST-3410", "GOST3410");
-            provider.addAlgorithm("Alg.Alias.KeyFactory.GOST-3410-94", "GOST3410");
-
-
-            provider.addAlgorithm("AlgorithmParameters.GOST3410", PREFIX + "AlgorithmParametersSpi");
-            provider.addAlgorithm("AlgorithmParameterGenerator.GOST3410", PREFIX + "AlgorithmParameterGeneratorSpi");
-
-            registerOid(provider, CryptoProObjectIdentifiers.gostR3410_94, "GOST3410", new KeyFactorySpi());
-            registerOidAlgorithmParameters(provider, CryptoProObjectIdentifiers.gostR3410_94, "GOST3410");
-
-            provider.addAlgorithm("Signature.GOST3410", PREFIX + "SignatureSpi");
-            provider.addAlgorithm("Alg.Alias.Signature.GOST-3410", "GOST3410");
-            provider.addAlgorithm("Alg.Alias.Signature.GOST-3410-94", "GOST3410");
-            provider.addAlgorithm("Alg.Alias.Signature.GOST3411withGOST3410", "GOST3410");
-            provider.addAlgorithm("Alg.Alias.Signature.GOST3411WITHGOST3410", "GOST3410");
-            provider.addAlgorithm("Alg.Alias.Signature.GOST3411WithGOST3410", "GOST3410");
-            provider.addAlgorithm("Alg.Alias.Signature." + CryptoProObjectIdentifiers.gostR3411_94_with_gostR3410_94, "GOST3410");
-
-
-            provider.addAlgorithm("Alg.Alias.AlgorithmParameterGenerator.GOST-3410", "GOST3410");
-            provider.addAlgorithm("Alg.Alias.AlgorithmParameters.GOST-3410", "GOST3410");
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/IES.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/IES.java
deleted file mode 100644
index 47cf3f6..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/IES.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package org.bouncycastle.jcajce.provider.asymmetric;
-
-import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
-import org.bouncycastle.jcajce.provider.util.AsymmetricAlgorithmProvider;
-
-public class IES
-{
-    private static final String PREFIX = "org.bouncycastle.jcajce.provider.asymmetric" + ".ies.";
-
-    public static class Mappings
-        extends AsymmetricAlgorithmProvider
-    {
-        public Mappings()
-        {
-        }
-
-        public void configure(ConfigurableProvider provider)
-        {
-            provider.addAlgorithm("AlgorithmParameters.IES", PREFIX + "AlgorithmParametersSpi");
-            provider.addAlgorithm("Cipher.IES", PREFIX + "CipherSpi$IES");
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/RSA.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/RSA.java
index b65b859..37ca513 100644
--- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/RSA.java
+++ b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/RSA.java
@@ -3,7 +3,9 @@ package org.bouncycastle.jcajce.provider.asymmetric;
 import org.bouncycastle.asn1.ASN1ObjectIdentifier;
 import org.bouncycastle.asn1.oiw.OIWObjectIdentifiers;
 import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.asn1.teletrust.TeleTrusTObjectIdentifiers;
+// BEGIN android-removed
+// import org.bouncycastle.asn1.teletrust.TeleTrusTObjectIdentifiers;
+// END android-removed
 import org.bouncycastle.asn1.x509.X509ObjectIdentifiers;
 import org.bouncycastle.jcajce.provider.asymmetric.rsa.KeyFactorySpi;
 import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
@@ -26,39 +28,47 @@ public class RSA
             provider.addAlgorithm("AlgorithmParameters.OAEP", PREFIX + "AlgorithmParametersSpi$OAEP");
             provider.addAlgorithm("AlgorithmParameters.PSS", PREFIX + "AlgorithmParametersSpi$PSS");
 
-            provider.addAlgorithm("Alg.Alias.AlgorithmParameters.RSAPSS", "PSS");
-            provider.addAlgorithm("Alg.Alias.AlgorithmParameters.RSASSA-PSS", "PSS");
-
-            provider.addAlgorithm("Alg.Alias.AlgorithmParameters.SHA224withRSA/PSS", "PSS");
-            provider.addAlgorithm("Alg.Alias.AlgorithmParameters.SHA256withRSA/PSS", "PSS");
-            provider.addAlgorithm("Alg.Alias.AlgorithmParameters.SHA384withRSA/PSS", "PSS");
-            provider.addAlgorithm("Alg.Alias.AlgorithmParameters.SHA512withRSA/PSS", "PSS");
-
-            provider.addAlgorithm("Alg.Alias.AlgorithmParameters.SHA224WITHRSAANDMGF1", "PSS");
-            provider.addAlgorithm("Alg.Alias.AlgorithmParameters.SHA256WITHRSAANDMGF1", "PSS");
-            provider.addAlgorithm("Alg.Alias.AlgorithmParameters.SHA384WITHRSAANDMGF1", "PSS");
-            provider.addAlgorithm("Alg.Alias.AlgorithmParameters.SHA512WITHRSAANDMGF1", "PSS");
-            provider.addAlgorithm("Alg.Alias.AlgorithmParameters.RAWRSAPSS", "PSS");
-            provider.addAlgorithm("Alg.Alias.AlgorithmParameters.NONEWITHRSAPSS", "PSS");
-            provider.addAlgorithm("Alg.Alias.AlgorithmParameters.NONEWITHRSASSA-PSS", "PSS");
-            provider.addAlgorithm("Alg.Alias.AlgorithmParameters.NONEWITHRSAANDMGF1", "PSS");
+            // BEGIN android-removed
+            // provider.addAlgorithm("Alg.Alias.AlgorithmParameters.RSAPSS", "PSS");
+            // provider.addAlgorithm("Alg.Alias.AlgorithmParameters.RSASSA-PSS", "PSS");
+            //
+            // provider.addAlgorithm("Alg.Alias.AlgorithmParameters.SHA224withRSA/PSS", "PSS");
+            // provider.addAlgorithm("Alg.Alias.AlgorithmParameters.SHA256withRSA/PSS", "PSS");
+            // provider.addAlgorithm("Alg.Alias.AlgorithmParameters.SHA384withRSA/PSS", "PSS");
+            // provider.addAlgorithm("Alg.Alias.AlgorithmParameters.SHA512withRSA/PSS", "PSS");
+            //
+            // provider.addAlgorithm("Alg.Alias.AlgorithmParameters.SHA224WITHRSAANDMGF1", "PSS");
+            // provider.addAlgorithm("Alg.Alias.AlgorithmParameters.SHA256WITHRSAANDMGF1", "PSS");
+            // provider.addAlgorithm("Alg.Alias.AlgorithmParameters.SHA384WITHRSAANDMGF1", "PSS");
+            // provider.addAlgorithm("Alg.Alias.AlgorithmParameters.SHA512WITHRSAANDMGF1", "PSS");
+            // provider.addAlgorithm("Alg.Alias.AlgorithmParameters.RAWRSAPSS", "PSS");
+            // provider.addAlgorithm("Alg.Alias.AlgorithmParameters.NONEWITHRSAPSS", "PSS");
+            // provider.addAlgorithm("Alg.Alias.AlgorithmParameters.NONEWITHRSASSA-PSS", "PSS");
+            // provider.addAlgorithm("Alg.Alias.AlgorithmParameters.NONEWITHRSAANDMGF1", "PSS");
+            // END android-removed
 
             provider.addAlgorithm("Cipher.RSA", PREFIX + "CipherSpi$NoPadding");
-            provider.addAlgorithm("Cipher.RSA/RAW", PREFIX + "CipherSpi$NoPadding");
-            provider.addAlgorithm("Cipher.RSA/PKCS1", PREFIX + "CipherSpi$PKCS1v1_5Padding");
-            provider.addAlgorithm("Cipher.1.2.840.113549.1.1.1", PREFIX + "CipherSpi$PKCS1v1_5Padding");
-            provider.addAlgorithm("Cipher.2.5.8.1.1", PREFIX + "CipherSpi$PKCS1v1_5Padding");
-            provider.addAlgorithm("Cipher.RSA/1", PREFIX + "CipherSpi$PKCS1v1_5Padding_PrivateOnly");
-            provider.addAlgorithm("Cipher.RSA/2", PREFIX + "CipherSpi$PKCS1v1_5Padding_PublicOnly");
-            provider.addAlgorithm("Cipher.RSA/OAEP", PREFIX + "CipherSpi$OAEPPadding");
-            provider.addAlgorithm("Cipher." + PKCSObjectIdentifiers.id_RSAES_OAEP, PREFIX + "CipherSpi$OAEPPadding");
-            provider.addAlgorithm("Cipher.RSA/ISO9796-1", PREFIX + "CipherSpi$ISO9796d1Padding");
+            // BEGIN android-changed
+            provider.addAlgorithm("Alg.Alias.Cipher.RSA/RAW", "RSA");
+            // END android-changed
+            // BEGIN android-removed
+            // provider.addAlgorithm("Cipher.RSA/PKCS1", PREFIX + "CipherSpi$PKCS1v1_5Padding");
+            // provider.addAlgorithm("Cipher.1.2.840.113549.1.1.1", PREFIX + "CipherSpi$PKCS1v1_5Padding");
+            // provider.addAlgorithm("Cipher.2.5.8.1.1", PREFIX + "CipherSpi$PKCS1v1_5Padding");
+            // provider.addAlgorithm("Cipher.RSA/1", PREFIX + "CipherSpi$PKCS1v1_5Padding_PrivateOnly");
+            // provider.addAlgorithm("Cipher.RSA/2", PREFIX + "CipherSpi$PKCS1v1_5Padding_PublicOnly");
+            // provider.addAlgorithm("Cipher.RSA/OAEP", PREFIX + "CipherSpi$OAEPPadding");
+            // provider.addAlgorithm("Cipher." + PKCSObjectIdentifiers.id_RSAES_OAEP, PREFIX + "CipherSpi$OAEPPadding");
+            // provider.addAlgorithm("Cipher.RSA/ISO9796-1", PREFIX + "CipherSpi$ISO9796d1Padding");
+            // END android-removed
 
             provider.addAlgorithm("Alg.Alias.Cipher.RSA//RAW", "RSA");
             provider.addAlgorithm("Alg.Alias.Cipher.RSA//NOPADDING", "RSA");
-            provider.addAlgorithm("Alg.Alias.Cipher.RSA//PKCS1PADDING", "RSA/PKCS1");
-            provider.addAlgorithm("Alg.Alias.Cipher.RSA//OAEPPADDING", "RSA/OAEP");
-            provider.addAlgorithm("Alg.Alias.Cipher.RSA//ISO9796-1PADDING", "RSA/ISO9796-1");
+            // BEGIN android-removed
+            // provider.addAlgorithm("Alg.Alias.Cipher.RSA//PKCS1PADDING", "RSA/PKCS1");
+            // provider.addAlgorithm("Alg.Alias.Cipher.RSA//OAEPPADDING", "RSA/OAEP");
+            // provider.addAlgorithm("Alg.Alias.Cipher.RSA//ISO9796-1PADDING", "RSA/ISO9796-1");
+            // END android-removed
 
             provider.addAlgorithm("KeyFactory.RSA", PREFIX + "KeyFactorySpi");
             provider.addAlgorithm("KeyPairGenerator.RSA", PREFIX + "KeyPairGeneratorSpi");
@@ -68,79 +78,89 @@ public class RSA
             registerOid(provider, PKCSObjectIdentifiers.rsaEncryption, "RSA", keyFact);
             registerOid(provider, X509ObjectIdentifiers.id_ea_rsa, "RSA", keyFact);
             registerOid(provider, PKCSObjectIdentifiers.id_RSAES_OAEP, "RSA", keyFact);
-            registerOid(provider, PKCSObjectIdentifiers.id_RSASSA_PSS, "RSA", keyFact);
-
-            registerOidAlgorithmParameters(provider, PKCSObjectIdentifiers.rsaEncryption, "RSA");
-            registerOidAlgorithmParameters(provider, X509ObjectIdentifiers.id_ea_rsa, "RSA");
-            registerOidAlgorithmParameters(provider, PKCSObjectIdentifiers.id_RSAES_OAEP, "OAEP");
-            registerOidAlgorithmParameters(provider, PKCSObjectIdentifiers.id_RSASSA_PSS, "PSS");
-
-
-            provider.addAlgorithm("Signature.RSASSA-PSS", PREFIX + "PSSSignatureSpi$PSSwithRSA");
-            provider.addAlgorithm("Signature." + PKCSObjectIdentifiers.id_RSASSA_PSS, PREFIX + "PSSSignatureSpi$PSSwithRSA");
-            provider.addAlgorithm("Signature.OID." + PKCSObjectIdentifiers.id_RSASSA_PSS, PREFIX + "PSSSignatureSpi$PSSwithRSA");
-
-            provider.addAlgorithm("Signature.SHA224WITHRSAANDMGF1", PREFIX + "PSSSignatureSpi$SHA224withRSA");
-            provider.addAlgorithm("Signature.SHA256WITHRSAANDMGF1", PREFIX + "PSSSignatureSpi$SHA256withRSA");
-            provider.addAlgorithm("Signature.SHA384WITHRSAANDMGF1", PREFIX + "PSSSignatureSpi$SHA384withRSA");
-            provider.addAlgorithm("Signature.SHA512WITHRSAANDMGF1", PREFIX + "PSSSignatureSpi$SHA512withRSA");
-            provider.addAlgorithm("Signature.SHA224withRSA/PSS", PREFIX + "PSSSignatureSpi$SHA224withRSA");
-            provider.addAlgorithm("Signature.SHA256withRSA/PSS", PREFIX + "PSSSignatureSpi$SHA256withRSA");
-            provider.addAlgorithm("Signature.SHA384withRSA/PSS", PREFIX + "PSSSignatureSpi$SHA384withRSA");
-            provider.addAlgorithm("Signature.SHA512withRSA/PSS", PREFIX + "PSSSignatureSpi$SHA512withRSA");
-
-            provider.addAlgorithm("Signature.RSA", PREFIX + "DigestSignatureSpi$noneRSA");
-            provider.addAlgorithm("Signature.RAWRSASSA-PSS", PREFIX + "PSSSignatureSpi$nonePSS");
-
-            provider.addAlgorithm("Alg.Alias.Signature.RAWRSA", "RSA");
-            provider.addAlgorithm("Alg.Alias.Signature.NONEWITHRSA", "RSA");
-            provider.addAlgorithm("Alg.Alias.Signature.RAWRSAPSS", "RAWRSASSA-PSS");
-            provider.addAlgorithm("Alg.Alias.Signature.NONEWITHRSAPSS", "RAWRSASSA-PSS");
-            provider.addAlgorithm("Alg.Alias.Signature.NONEWITHRSASSA-PSS", "RAWRSASSA-PSS");
-            provider.addAlgorithm("Alg.Alias.Signature.NONEWITHRSAANDMGF1", "RAWRSASSA-PSS");
-            provider.addAlgorithm("Alg.Alias.Signature.RSAPSS", "RSASSA-PSS");
-
-
-            provider.addAlgorithm("Alg.Alias.Signature.SHA224withRSAandMGF1", "SHA224withRSA/PSS");
-            provider.addAlgorithm("Alg.Alias.Signature.SHA256withRSAandMGF1", "SHA256withRSA/PSS");
-            provider.addAlgorithm("Alg.Alias.Signature.SHA384withRSAandMGF1", "SHA384withRSA/PSS");
-            provider.addAlgorithm("Alg.Alias.Signature.SHA512withRSAandMGF1", "SHA512withRSA/PSS");
-
-            if (provider.hasAlgorithm("MessageDigest", "MD2"))
-            {
-                addDigestSignature(provider, "MD2", PREFIX + "DigestSignatureSpi$MD2", PKCSObjectIdentifiers.md2WithRSAEncryption);
-            }
-
-            if (provider.hasAlgorithm("MessageDigest", "MD4"))
-            {
-                addDigestSignature(provider, "MD4", PREFIX + "DigestSignatureSpi$MD4", PKCSObjectIdentifiers.md4WithRSAEncryption);
-            }
+            // BEGIN android-removed
+            // registerOid(provider, PKCSObjectIdentifiers.id_RSASSA_PSS, "RSA", keyFact);
+            //
+            // registerOidAlgorithmParameters(provider, PKCSObjectIdentifiers.rsaEncryption, "RSA");
+            // registerOidAlgorithmParameters(provider, X509ObjectIdentifiers.id_ea_rsa, "RSA");
+            // registerOidAlgorithmParameters(provider, PKCSObjectIdentifiers.id_RSAES_OAEP, "OAEP");
+            // registerOidAlgorithmParameters(provider, PKCSObjectIdentifiers.id_RSASSA_PSS, "PSS");
+            //
+            //
+            // provider.addAlgorithm("Signature.RSASSA-PSS", PREFIX + "PSSSignatureSpi$PSSwithRSA");
+            // provider.addAlgorithm("Signature." + PKCSObjectIdentifiers.id_RSASSA_PSS, PREFIX + "PSSSignatureSpi$PSSwithRSA");
+            // provider.addAlgorithm("Signature.OID." + PKCSObjectIdentifiers.id_RSASSA_PSS, PREFIX + "PSSSignatureSpi$PSSwithRSA");
+            //
+            // provider.addAlgorithm("Signature.SHA224WITHRSAANDMGF1", PREFIX + "PSSSignatureSpi$SHA224withRSA");
+            // provider.addAlgorithm("Signature.SHA256WITHRSAANDMGF1", PREFIX + "PSSSignatureSpi$SHA256withRSA");
+            // provider.addAlgorithm("Signature.SHA384WITHRSAANDMGF1", PREFIX + "PSSSignatureSpi$SHA384withRSA");
+            // provider.addAlgorithm("Signature.SHA512WITHRSAANDMGF1", PREFIX + "PSSSignatureSpi$SHA512withRSA");
+            // provider.addAlgorithm("Signature.SHA224withRSA/PSS", PREFIX + "PSSSignatureSpi$SHA224withRSA");
+            // provider.addAlgorithm("Signature.SHA256withRSA/PSS", PREFIX + "PSSSignatureSpi$SHA256withRSA");
+            // provider.addAlgorithm("Signature.SHA384withRSA/PSS", PREFIX + "PSSSignatureSpi$SHA384withRSA");
+            // provider.addAlgorithm("Signature.SHA512withRSA/PSS", PREFIX + "PSSSignatureSpi$SHA512withRSA");
+            //
+            // provider.addAlgorithm("Signature.RSA", PREFIX + "DigestSignatureSpi$noneRSA");
+            // provider.addAlgorithm("Signature.RAWRSASSA-PSS", PREFIX + "PSSSignatureSpi$nonePSS");
+            //
+            // provider.addAlgorithm("Alg.Alias.Signature.RAWRSA", "RSA");
+            // provider.addAlgorithm("Alg.Alias.Signature.NONEWITHRSA", "RSA");
+            // provider.addAlgorithm("Alg.Alias.Signature.RAWRSAPSS", "RAWRSASSA-PSS");
+            // provider.addAlgorithm("Alg.Alias.Signature.NONEWITHRSAPSS", "RAWRSASSA-PSS");
+            // provider.addAlgorithm("Alg.Alias.Signature.NONEWITHRSASSA-PSS", "RAWRSASSA-PSS");
+            // provider.addAlgorithm("Alg.Alias.Signature.NONEWITHRSAANDMGF1", "RAWRSASSA-PSS");
+            // provider.addAlgorithm("Alg.Alias.Signature.RSAPSS", "RSASSA-PSS");
+            //
+            //
+            // provider.addAlgorithm("Alg.Alias.Signature.SHA224withRSAandMGF1", "SHA224withRSA/PSS");
+            // provider.addAlgorithm("Alg.Alias.Signature.SHA256withRSAandMGF1", "SHA256withRSA/PSS");
+            // provider.addAlgorithm("Alg.Alias.Signature.SHA384withRSAandMGF1", "SHA384withRSA/PSS");
+            // provider.addAlgorithm("Alg.Alias.Signature.SHA512withRSAandMGF1", "SHA512withRSA/PSS");
+            //
+            // if (provider.hasAlgorithm("MessageDigest", "MD2"))
+            // {
+            //     addDigestSignature(provider, "MD2", PREFIX + "DigestSignatureSpi$MD2", PKCSObjectIdentifiers.md2WithRSAEncryption);
+            // }
+            //
+            // if (provider.hasAlgorithm("MessageDigest", "MD4"))
+            // {
+            //     addDigestSignature(provider, "MD4", PREFIX + "DigestSignatureSpi$MD4", PKCSObjectIdentifiers.md4WithRSAEncryption);
+            // }
+            // END android-removed
 
             if (provider.hasAlgorithm("MessageDigest", "MD5"))
             {
                 addDigestSignature(provider, "MD5", PREFIX + "DigestSignatureSpi$MD5", PKCSObjectIdentifiers.md5WithRSAEncryption);
-                provider.addAlgorithm("Signature.MD5withRSA/ISO9796-2", PREFIX + "ISOSignatureSpi$MD5WithRSAEncryption");
-                provider.addAlgorithm("Alg.Alias.Signature.MD5WithRSA/ISO9796-2", "MD5withRSA/ISO9796-2");
+                // END android-removed
+                // provider.addAlgorithm("Signature.MD5withRSA/ISO9796-2", PREFIX + "ISOSignatureSpi$MD5WithRSAEncryption");
+                // provider.addAlgorithm("Alg.Alias.Signature.MD5WithRSA/ISO9796-2", "MD5withRSA/ISO9796-2");
+                // END android-removed
             }
 
             if (provider.hasAlgorithm("MessageDigest", "SHA1"))
             {
-                provider.addAlgorithm("Alg.Alias.AlgorithmParameters.SHA1withRSA/PSS", "PSS");
-                provider.addAlgorithm("Alg.Alias.AlgorithmParameters.SHA1WITHRSAANDMGF1", "PSS");
-                provider.addAlgorithm("Signature.SHA1withRSA/PSS", PREFIX + "PSSSignatureSpi$SHA1withRSA");
-                provider.addAlgorithm("Alg.Alias.Signature.SHA1withRSAandMGF1", "SHA1withRSA/PSS");
-                provider.addAlgorithm("Alg.Alias.Signature.SHA1WITHRSAANDMGF1", "SHA1withRSA/PSS");
+                // BEGIN android-removed
+                // provider.addAlgorithm("Alg.Alias.AlgorithmParameters.SHA1withRSA/PSS", "PSS");
+                // provider.addAlgorithm("Alg.Alias.AlgorithmParameters.SHA1WITHRSAANDMGF1", "PSS");
+                // provider.addAlgorithm("Signature.SHA1withRSA/PSS", PREFIX + "PSSSignatureSpi$SHA1withRSA");
+                // provider.addAlgorithm("Alg.Alias.Signature.SHA1withRSAandMGF1", "SHA1withRSA/PSS");
+                // provider.addAlgorithm("Alg.Alias.Signature.SHA1WITHRSAANDMGF1", "SHA1withRSA/PSS");
+                // END android-removed
 
                 addDigestSignature(provider, "SHA1", PREFIX + "DigestSignatureSpi$SHA1", PKCSObjectIdentifiers.sha1WithRSAEncryption);
 
-                provider.addAlgorithm("Alg.Alias.Signature.SHA1WithRSA/ISO9796-2", "SHA1withRSA/ISO9796-2");
-                provider.addAlgorithm("Signature.SHA1withRSA/ISO9796-2", PREFIX + "ISOSignatureSpi$SHA1WithRSAEncryption");
+                // BEGIN android-removed
+                // provider.addAlgorithm("Alg.Alias.Signature.SHA1WithRSA/ISO9796-2", "SHA1withRSA/ISO9796-2");
+                // provider.addAlgorithm("Signature.SHA1withRSA/ISO9796-2", PREFIX + "ISOSignatureSpi$SHA1WithRSAEncryption");
+                // END android-removed
                 provider.addAlgorithm("Alg.Alias.Signature." + OIWObjectIdentifiers.sha1WithRSA, "SHA1WITHRSA");
                 provider.addAlgorithm("Alg.Alias.Signature.OID." + OIWObjectIdentifiers.sha1WithRSA, "SHA1WITHRSA");
 
-                provider.addAlgorithm("Alg.Alias.Signature.SHA1withRSA/X9.31", "SHA1WITHRSA/X9.31");
-                provider.addAlgorithm("Alg.Alias.Signature.SHA1WithRSA/X9.31", "SHA1WITHRSA/X9.31");
-                provider.addAlgorithm("Signature.SHA1WITHRSA/X9.31", PREFIX + "X931SignatureSpi$SHA1WithRSAEncryption");
+                // BEGIN android-removed
+                // provider.addAlgorithm("Alg.Alias.Signature.SHA1withRSA/X9.31", "SHA1WITHRSA/X9.31");
+                // provider.addAlgorithm("Alg.Alias.Signature.SHA1WithRSA/X9.31", "SHA1WITHRSA/X9.31");
+                // provider.addAlgorithm("Signature.SHA1WITHRSA/X9.31", PREFIX + "X931SignatureSpi$SHA1WithRSAEncryption");
+                // END android-removed
             }
 
             addDigestSignature(provider, "SHA224", PREFIX + "DigestSignatureSpi$SHA224", PKCSObjectIdentifiers.sha224WithRSAEncryption);
@@ -148,52 +168,54 @@ public class RSA
             addDigestSignature(provider, "SHA384", PREFIX + "DigestSignatureSpi$SHA384", PKCSObjectIdentifiers.sha384WithRSAEncryption);
             addDigestSignature(provider, "SHA512", PREFIX + "DigestSignatureSpi$SHA512", PKCSObjectIdentifiers.sha512WithRSAEncryption);
 
-            provider.addAlgorithm("Alg.Alias.Signature.SHA224withRSA/X9.31", "SHA224WITHRSA/X9.31");
-            provider.addAlgorithm("Alg.Alias.Signature.SHA224WithRSA/X9.31", "SHA224WITHRSA/X9.31");
-            provider.addAlgorithm("Signature.SHA224WITHRSA/X9.31", PREFIX + "X931SignatureSpi$SHA224WithRSAEncryption");
-            provider.addAlgorithm("Alg.Alias.Signature.SHA256withRSA/X9.31", "SHA256WITHRSA/X9.31");
-            provider.addAlgorithm("Alg.Alias.Signature.SHA256WithRSA/X9.31", "SHA256WITHRSA/X9.31");
-            provider.addAlgorithm("Signature.SHA256WITHRSA/X9.31", PREFIX + "X931SignatureSpi$SHA256WithRSAEncryption");
-            provider.addAlgorithm("Alg.Alias.Signature.SHA384withRSA/X9.31", "SHA384WITHRSA/X9.31");
-            provider.addAlgorithm("Alg.Alias.Signature.SHA384WithRSA/X9.31", "SHA384WITHRSA/X9.31");
-            provider.addAlgorithm("Signature.SHA384WITHRSA/X9.31", PREFIX + "X931SignatureSpi$SHA384WithRSAEncryption");
-            provider.addAlgorithm("Alg.Alias.Signature.SHA512withRSA/X9.31", "SHA512WITHRSA/X9.31");
-            provider.addAlgorithm("Alg.Alias.Signature.SHA512WithRSA/X9.31", "SHA512WITHRSA/X9.31");
-            provider.addAlgorithm("Signature.SHA512WITHRSA/X9.31", PREFIX + "X931SignatureSpi$SHA512WithRSAEncryption");
-
-            if (provider.hasAlgorithm("MessageDigest", "RIPEMD128"))
-            {
-                addDigestSignature(provider, "RIPEMD128", PREFIX + "DigestSignatureSpi$RIPEMD128", TeleTrusTObjectIdentifiers.rsaSignatureWithripemd128);
-                addDigestSignature(provider, "RMD128", PREFIX + "DigestSignatureSpi$RIPEMD128", null);
-                provider.addAlgorithm("Alg.Alias.Signature.RIPEMD128withRSA/X9.31", "RIPEMD128WITHRSA/X9.31");
-                provider.addAlgorithm("Alg.Alias.Signature.RIPEMD128WithRSA/X9.31", "RIPEMD128WITHRSA/X9.31");
-                provider.addAlgorithm("Signature.RIPEMD128WITHRSA/X9.31", PREFIX + "X931SignatureSpi$RIPEMD128WithRSAEncryption");
-            }
-
-            if (provider.hasAlgorithm("MessageDigest", "RIPEMD160"))
-            {
-                addDigestSignature(provider, "RIPEMD160", PREFIX + "DigestSignatureSpi$RIPEMD160", TeleTrusTObjectIdentifiers.rsaSignatureWithripemd160);
-                addDigestSignature(provider, "RMD160", PREFIX + "DigestSignatureSpi$RIPEMD160", null);
-                provider.addAlgorithm("Alg.Alias.Signature.RIPEMD160WithRSA/ISO9796-2", "RIPEMD160withRSA/ISO9796-2");
-                provider.addAlgorithm("Signature.RIPEMD160withRSA/ISO9796-2", PREFIX + "ISOSignatureSpi$RIPEMD160WithRSAEncryption");
-                provider.addAlgorithm("Alg.Alias.Signature.RIPEMD160withRSA/X9.31", "RIPEMD160WITHRSA/X9.31");
-                provider.addAlgorithm("Alg.Alias.Signature.RIPEMD160WithRSA/X9.31", "RIPEMD160WITHRSA/X9.31");
-                provider.addAlgorithm("Signature.RIPEMD160WITHRSA/X9.31", PREFIX + "X931SignatureSpi$RIPEMD160WithRSAEncryption");
-            }
-
-            if (provider.hasAlgorithm("MessageDigest", "RIPEMD256"))
-            {
-                addDigestSignature(provider, "RIPEMD256", PREFIX + "DigestSignatureSpi$RIPEMD256", TeleTrusTObjectIdentifiers.rsaSignatureWithripemd256);
-                addDigestSignature(provider, "RMD256", PREFIX + "DigestSignatureSpi$RIPEMD256", null);
-            }
-
-            if (provider.hasAlgorithm("MessageDigest", "WHIRLPOOL"))
-            {
-                provider.addAlgorithm("Alg.Alias.Signature.WhirlpoolWithRSA/X9.31", "WHIRLPOOLWITHRSA/X9.31");
-                provider.addAlgorithm("Alg.Alias.Signature.WHIRLPOOLwithRSA/X9.31", "WHIRLPOOLWITHRSA/X9.31");
-                provider.addAlgorithm("Alg.Alias.Signature.WHIRLPOOLWithRSA/X9.31", "WHIRLPOOLWITHRSA/X9.31");
-                provider.addAlgorithm("Signature.WHIRLPOOLWITHRSA/X9.31", PREFIX + "X931SignatureSpi$WhirlpoolWithRSAEncryption");
-            }
+            // BEGIN android-removed
+            // provider.addAlgorithm("Alg.Alias.Signature.SHA224withRSA/X9.31", "SHA224WITHRSA/X9.31");
+            // provider.addAlgorithm("Alg.Alias.Signature.SHA224WithRSA/X9.31", "SHA224WITHRSA/X9.31");
+            // provider.addAlgorithm("Signature.SHA224WITHRSA/X9.31", PREFIX + "X931SignatureSpi$SHA224WithRSAEncryption");
+            // provider.addAlgorithm("Alg.Alias.Signature.SHA256withRSA/X9.31", "SHA256WITHRSA/X9.31");
+            // provider.addAlgorithm("Alg.Alias.Signature.SHA256WithRSA/X9.31", "SHA256WITHRSA/X9.31");
+            // provider.addAlgorithm("Signature.SHA256WITHRSA/X9.31", PREFIX + "X931SignatureSpi$SHA256WithRSAEncryption");
+            // provider.addAlgorithm("Alg.Alias.Signature.SHA384withRSA/X9.31", "SHA384WITHRSA/X9.31");
+            // provider.addAlgorithm("Alg.Alias.Signature.SHA384WithRSA/X9.31", "SHA384WITHRSA/X9.31");
+            // provider.addAlgorithm("Signature.SHA384WITHRSA/X9.31", PREFIX + "X931SignatureSpi$SHA384WithRSAEncryption");
+            // provider.addAlgorithm("Alg.Alias.Signature.SHA512withRSA/X9.31", "SHA512WITHRSA/X9.31");
+            // provider.addAlgorithm("Alg.Alias.Signature.SHA512WithRSA/X9.31", "SHA512WITHRSA/X9.31");
+            // provider.addAlgorithm("Signature.SHA512WITHRSA/X9.31", PREFIX + "X931SignatureSpi$SHA512WithRSAEncryption");
+            //
+            // if (provider.hasAlgorithm("MessageDigest", "RIPEMD128"))
+            // {
+            //     addDigestSignature(provider, "RIPEMD128", PREFIX + "DigestSignatureSpi$RIPEMD128", TeleTrusTObjectIdentifiers.rsaSignatureWithripemd128);
+            //     addDigestSignature(provider, "RMD128", PREFIX + "DigestSignatureSpi$RIPEMD128", null);
+            //     provider.addAlgorithm("Alg.Alias.Signature.RIPEMD128withRSA/X9.31", "RIPEMD128WITHRSA/X9.31");
+            //     provider.addAlgorithm("Alg.Alias.Signature.RIPEMD128WithRSA/X9.31", "RIPEMD128WITHRSA/X9.31");
+            //     provider.addAlgorithm("Signature.RIPEMD128WITHRSA/X9.31", PREFIX + "X931SignatureSpi$RIPEMD128WithRSAEncryption");
+            // }
+	    //
+            // if (provider.hasAlgorithm("MessageDigest", "RIPEMD160"))
+            // {
+            //     addDigestSignature(provider, "RIPEMD160", PREFIX + "DigestSignatureSpi$RIPEMD160", TeleTrusTObjectIdentifiers.rsaSignatureWithripemd160);
+            //     addDigestSignature(provider, "RMD160", PREFIX + "DigestSignatureSpi$RIPEMD160", null);
+            //     provider.addAlgorithm("Alg.Alias.Signature.RIPEMD160WithRSA/ISO9796-2", "RIPEMD160withRSA/ISO9796-2");
+            //     provider.addAlgorithm("Signature.RIPEMD160withRSA/ISO9796-2", PREFIX + "ISOSignatureSpi$RIPEMD160WithRSAEncryption");
+            //     provider.addAlgorithm("Alg.Alias.Signature.RIPEMD160withRSA/X9.31", "RIPEMD160WITHRSA/X9.31");
+            //     provider.addAlgorithm("Alg.Alias.Signature.RIPEMD160WithRSA/X9.31", "RIPEMD160WITHRSA/X9.31");
+            //     provider.addAlgorithm("Signature.RIPEMD160WITHRSA/X9.31", PREFIX + "X931SignatureSpi$RIPEMD160WithRSAEncryption");
+            // }
+	    //
+            // if (provider.hasAlgorithm("MessageDigest", "RIPEMD256"))
+            // {
+            //     addDigestSignature(provider, "RIPEMD256", PREFIX + "DigestSignatureSpi$RIPEMD256", TeleTrusTObjectIdentifiers.rsaSignatureWithripemd256);
+            //     addDigestSignature(provider, "RMD256", PREFIX + "DigestSignatureSpi$RIPEMD256", null);
+            // }
+	    //
+            // if (provider.hasAlgorithm("MessageDigest", "WHIRLPOOL"))
+            // {
+            //     provider.addAlgorithm("Alg.Alias.Signature.WhirlpoolWithRSA/X9.31", "WHIRLPOOLWITHRSA/X9.31");
+            //     provider.addAlgorithm("Alg.Alias.Signature.WHIRLPOOLwithRSA/X9.31", "WHIRLPOOLWITHRSA/X9.31");
+            //     provider.addAlgorithm("Alg.Alias.Signature.WHIRLPOOLWithRSA/X9.31", "WHIRLPOOLWITHRSA/X9.31");
+            //     provider.addAlgorithm("Signature.WHIRLPOOLWITHRSA/X9.31", PREFIX + "X931SignatureSpi$WhirlpoolWithRSAEncryption");
+            // }
+	    // END android-removed
         }
 
         private void addDigestSignature(
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/X509.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/X509.java
index 5cbee90..a9fb6b2 100644
--- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/X509.java
+++ b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/X509.java
@@ -18,8 +18,10 @@ public class X509
 
         public void configure(ConfigurableProvider provider)
         {
-            provider.addAlgorithm("KeyFactory.X.509", "org.bouncycastle.jcajce.provider.asymmetric.x509.KeyFactory");
-            provider.addAlgorithm("Alg.Alias.KeyFactory.X509", "X.509");
+            // BEGIN android-removed
+            // provider.addAlgorithm("KeyFactory.X.509", "org.bouncycastle.jcajce.provider.asymmetric.x509.KeyFactory");
+            // provider.addAlgorithm("Alg.Alias.KeyFactory.X509", "X.509");
+            // END android-removed
 
             //
             // certificate factories.
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/dh/IESCipher.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/dh/IESCipher.java
deleted file mode 100644
index df6b6f9..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/dh/IESCipher.java
+++ /dev/null
@@ -1,512 +0,0 @@
-package org.bouncycastle.jcajce.provider.asymmetric.dh;
-
-import java.io.ByteArrayOutputStream;
-import java.security.AlgorithmParameters;
-import java.security.InvalidAlgorithmParameterException;
-import java.security.InvalidKeyException;
-import java.security.Key;
-import java.security.NoSuchAlgorithmException;
-import java.security.PrivateKey;
-import java.security.Provider;
-import java.security.PublicKey;
-import java.security.SecureRandom;
-import java.security.Security;
-import java.security.spec.AlgorithmParameterSpec;
-
-import javax.crypto.BadPaddingException;
-import javax.crypto.Cipher;
-import javax.crypto.CipherSpi;
-import javax.crypto.IllegalBlockSizeException;
-import javax.crypto.NoSuchPaddingException;
-import javax.crypto.ShortBufferException;
-import javax.crypto.interfaces.DHKey;
-import javax.crypto.interfaces.DHPrivateKey;
-import javax.crypto.interfaces.DHPublicKey;
-
-import org.bouncycastle.crypto.InvalidCipherTextException;
-import org.bouncycastle.crypto.KeyEncoder;
-import org.bouncycastle.crypto.agreement.DHBasicAgreement;
-import org.bouncycastle.crypto.digests.SHA1Digest;
-import org.bouncycastle.crypto.engines.AESEngine;
-import org.bouncycastle.crypto.engines.DESedeEngine;
-import org.bouncycastle.crypto.engines.IESEngine;
-import org.bouncycastle.crypto.generators.DHKeyPairGenerator;
-import org.bouncycastle.crypto.generators.EphemeralKeyPairGenerator;
-import org.bouncycastle.crypto.generators.KDF2BytesGenerator;
-import org.bouncycastle.crypto.macs.HMac;
-import org.bouncycastle.crypto.paddings.PaddedBufferedBlockCipher;
-import org.bouncycastle.crypto.params.AsymmetricKeyParameter;
-import org.bouncycastle.crypto.params.DHKeyGenerationParameters;
-import org.bouncycastle.crypto.params.DHKeyParameters;
-import org.bouncycastle.crypto.params.DHParameters;
-import org.bouncycastle.crypto.params.DHPublicKeyParameters;
-import org.bouncycastle.crypto.params.IESParameters;
-import org.bouncycastle.crypto.params.IESWithCipherParameters;
-import org.bouncycastle.crypto.parsers.DHIESPublicKeyParser;
-import org.bouncycastle.jcajce.provider.asymmetric.util.DHUtil;
-import org.bouncycastle.jcajce.provider.asymmetric.util.IESUtil;
-import org.bouncycastle.jcajce.util.BCJcaJceHelper;
-import org.bouncycastle.jcajce.util.JcaJceHelper;
-import org.bouncycastle.jce.interfaces.IESKey;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.jce.spec.IESParameterSpec;
-import org.bouncycastle.util.BigIntegers;
-import org.bouncycastle.util.Strings;
-
-
-public class IESCipher
-    extends CipherSpi
-{
-    private final JcaJceHelper helper = new BCJcaJceHelper();
-
-    private IESEngine engine;
-    private int state = -1;
-    private ByteArrayOutputStream buffer = new ByteArrayOutputStream();
-    private AlgorithmParameters engineParam = null;
-    private IESParameterSpec engineSpec = null;
-    private AsymmetricKeyParameter key;
-    private SecureRandom random;
-    private boolean dhaesMode = false;
-    private AsymmetricKeyParameter otherKeyParameter = null;
-
-    public IESCipher(IESEngine engine)
-    {
-        this.engine = engine;
-    }
-
-
-    public int engineGetBlockSize()
-    {
-        if (engine.getCipher() != null)
-        {
-            return engine.getCipher().getBlockSize();
-        }
-        else
-        {
-            return 0;
-        }
-    }
-
-
-    public int engineGetKeySize(Key key)
-    {
-        if (key instanceof DHKey)
-        {
-            return ((DHKey)key).getParams().getP().bitLength();
-        }
-        else
-        {
-            throw new IllegalArgumentException("not a DH key");
-        }
-    }
-
-
-    public byte[] engineGetIV()
-    {
-        return null;
-    }
-
-    public AlgorithmParameters engineGetParameters()
-    {
-        if (engineParam == null && engineSpec != null)
-        {
-            try
-            {
-                engineParam = helper.createAlgorithmParameters("IES");
-                engineParam.init(engineSpec);
-            }
-            catch (Exception e)
-            {
-                throw new RuntimeException(e.toString());
-            }
-        }
-
-        return engineParam;
-    }
-
-
-    public void engineSetMode(String mode)
-        throws NoSuchAlgorithmException
-    {
-        String modeName = Strings.toUpperCase(mode);
-
-        if (modeName.equals("NONE"))
-        {
-            dhaesMode = false;
-        }
-        else if (modeName.equals("DHAES"))
-        {
-            dhaesMode = true;
-        }
-        else
-        {
-            throw new IllegalArgumentException("can't support mode " + mode);
-        }
-    }
-
-    public int engineGetOutputSize(int inputLen)
-    {
-        int len1, len2, len3;
-
-        len1 = engine.getMac().getMacSize();
-
-        if (key != null)
-        {
-            len2 = ((DHKey)key).getParams().getP().bitLength() / 8 + 1;
-        }
-        else
-        {
-            throw new IllegalStateException("cipher not initialised");
-        }
-
-        if (engine.getCipher() == null)
-        {
-            len3 = inputLen;
-        }
-        else if (state == Cipher.ENCRYPT_MODE || state == Cipher.WRAP_MODE)
-        {
-            len3 = engine.getCipher().getOutputSize(inputLen);
-        }
-        else if (state == Cipher.DECRYPT_MODE || state == Cipher.UNWRAP_MODE)
-        {
-            len3 = engine.getCipher().getOutputSize(inputLen - len1 - len2);
-        }
-        else
-        {
-            throw new IllegalStateException("cipher not initialised");
-        }
-
-        if (state == Cipher.ENCRYPT_MODE || state == Cipher.WRAP_MODE)
-        {
-            return buffer.size() + len1 + len2 + len3;
-        }
-        else if (state == Cipher.DECRYPT_MODE || state == Cipher.UNWRAP_MODE)
-        {
-            return buffer.size() - len1 - len2 + len3;
-        }
-        else
-        {
-            throw new IllegalStateException("IESCipher not initialised");
-        }
-
-    }
-
-    public void engineSetPadding(String padding)
-        throws NoSuchPaddingException
-    {
-        String paddingName = Strings.toUpperCase(padding);
-
-        // TDOD: make this meaningful...
-        if (paddingName.equals("NOPADDING"))
-        {
-
-        }
-        else if (paddingName.equals("PKCS5PADDING") || paddingName.equals("PKCS7PADDING"))
-        {
-
-        }
-        else
-        {
-            throw new NoSuchPaddingException("padding not available with IESCipher");
-        }
-    }
-
-    // Initialisation methods
-
-    public void engineInit(
-        int opmode,
-        Key key,
-        AlgorithmParameters params,
-        SecureRandom random)
-        throws InvalidKeyException, InvalidAlgorithmParameterException
-    {
-        AlgorithmParameterSpec paramSpec = null;
-
-        if (params != null)
-        {
-            try
-            {
-                paramSpec = params.getParameterSpec(IESParameterSpec.class);
-            }
-            catch (Exception e)
-            {
-                throw new InvalidAlgorithmParameterException("cannot recognise parameters: " + e.toString());
-            }
-        }
-
-        engineParam = params;
-        engineInit(opmode, key, paramSpec, random);
-    }
-
-
-    public void engineInit(
-        int opmode,
-        Key key,
-        AlgorithmParameterSpec engineSpec,
-        SecureRandom random)
-        throws InvalidAlgorithmParameterException, InvalidKeyException
-    {
-        // Use default parameters (including cipher key size) if none are specified
-        if (engineSpec == null)
-        {
-            this.engineSpec = IESUtil.guessParameterSpec(engine);
-        }
-        else if (engineSpec instanceof IESParameterSpec)
-        {
-            this.engineSpec = (IESParameterSpec)engineSpec;
-        }
-        else
-        {
-            throw new InvalidAlgorithmParameterException("must be passed IES parameters");
-        }
-
-        // Parse the recipient's key
-        if (opmode == Cipher.ENCRYPT_MODE || opmode == Cipher.WRAP_MODE)
-        {
-            if (key instanceof DHPublicKey)
-            {
-                this.key = DHUtil.generatePublicKeyParameter((PublicKey)key);
-            }
-            else if (key instanceof IESKey)
-            {
-                IESKey ieKey = (IESKey)key;
-
-                this.key = DHUtil.generatePublicKeyParameter(ieKey.getPublic());
-                this.otherKeyParameter = DHUtil.generatePrivateKeyParameter(ieKey.getPrivate());
-            }
-            else
-            {
-                throw new InvalidKeyException("must be passed recipient's public DH key for encryption");
-            }
-        }
-        else if (opmode == Cipher.DECRYPT_MODE || opmode == Cipher.UNWRAP_MODE)
-        {
-            if (key instanceof DHPrivateKey)
-            {
-                this.key = DHUtil.generatePrivateKeyParameter((PrivateKey)key);
-            }
-            else if (key instanceof IESKey)
-            {
-                IESKey ieKey = (IESKey)key;
-
-                this.otherKeyParameter = DHUtil.generatePublicKeyParameter(ieKey.getPublic());
-                this.key = DHUtil.generatePrivateKeyParameter(ieKey.getPrivate());
-            }
-            else
-            {
-                throw new InvalidKeyException("must be passed recipient's private DH key for decryption");
-            }
-        }
-        else
-        {
-            throw new InvalidKeyException("must be passed EC key");
-        }
-
-        this.random = random;
-        this.state = opmode;
-        buffer.reset();
-
-    }
-
-
-    public void engineInit(
-        int opmode,
-        Key key,
-        SecureRandom random)
-        throws InvalidKeyException
-    {
-        try
-        {
-            engineInit(opmode, key, (AlgorithmParameterSpec)null, random);
-        }
-        catch (InvalidAlgorithmParameterException e)
-        {
-            throw new IllegalArgumentException("can't handle supplied parameter spec");
-        }
-
-    }
-
-
-    // Update methods - buffer the input
-
-    public byte[] engineUpdate(
-        byte[] input,
-        int inputOffset,
-        int inputLen)
-    {
-        buffer.write(input, inputOffset, inputLen);
-        return null;
-    }
-
-
-    public int engineUpdate(
-        byte[] input,
-        int inputOffset,
-        int inputLen,
-        byte[] output,
-        int outputOffset)
-    {
-        buffer.write(input, inputOffset, inputLen);
-        return 0;
-    }
-
-
-    // Finalisation methods
-
-    public byte[] engineDoFinal(
-        byte[] input,
-        int inputOffset,
-        int inputLen)
-        throws IllegalBlockSizeException, BadPaddingException
-    {
-        if (inputLen != 0)
-        {
-            buffer.write(input, inputOffset, inputLen);
-        }
-
-        byte[] in = buffer.toByteArray();
-        buffer.reset();
-
-        // Convert parameters for use in IESEngine
-        IESParameters params = new IESWithCipherParameters(engineSpec.getDerivationV(),
-            engineSpec.getEncodingV(),
-            engineSpec.getMacKeySize(),
-            engineSpec.getCipherKeySize());
-
-        DHParameters dhParams = ((DHKeyParameters)key).getParameters();
-
-        byte[] V;
-        if (otherKeyParameter != null)
-        {
-            try
-            {
-                if (state == Cipher.ENCRYPT_MODE || state == Cipher.WRAP_MODE)
-                {
-                    engine.init(true, otherKeyParameter, key, params);
-                }
-                else
-                {
-                    engine.init(false, key, otherKeyParameter, params);
-                }
-                return engine.processBlock(in, 0, in.length);
-            }
-            catch (Exception e)
-            {
-                throw new BadPaddingException(e.getMessage());
-            }
-        }
-
-        if (state == Cipher.ENCRYPT_MODE || state == Cipher.WRAP_MODE)
-        {
-            // Generate the ephemeral key pair
-            DHKeyPairGenerator gen = new DHKeyPairGenerator();
-            gen.init(new DHKeyGenerationParameters(random, dhParams));
-
-            EphemeralKeyPairGenerator kGen = new EphemeralKeyPairGenerator(gen, new KeyEncoder()
-            {
-                public byte[] getEncoded(AsymmetricKeyParameter keyParameter)
-                {
-                    byte[] Vloc = new byte[(((DHKeyParameters)keyParameter).getParameters().getP().bitLength() + 7) / 8];
-                    byte[] Vtmp = BigIntegers.asUnsignedByteArray(((DHPublicKeyParameters)keyParameter).getY());
-
-                    if (Vtmp.length > Vloc.length)
-                    {
-                        throw new IllegalArgumentException("Senders's public key longer than expected.");
-                    }
-                    else
-                    {
-                        System.arraycopy(Vtmp, 0, Vloc, Vloc.length - Vtmp.length, Vtmp.length);
-                    }
-
-                    return Vloc;
-                }
-            });
-
-            // Encrypt the buffer
-            try
-            {
-                engine.init(key, params, kGen);
-
-                return engine.processBlock(in, 0, in.length);
-            }
-            catch (Exception e)
-            {
-                throw new BadPaddingException(e.getMessage());
-            }
-        }
-        else if (state == Cipher.DECRYPT_MODE || state == Cipher.UNWRAP_MODE)
-        {
-            // Decrypt the buffer
-            try
-            {
-                engine.init(key, params, new DHIESPublicKeyParser(((DHKeyParameters)key).getParameters()));
-
-                return engine.processBlock(in, 0, in.length);
-            }
-            catch (InvalidCipherTextException e)
-            {
-                throw new BadPaddingException(e.getMessage());
-            }
-        }
-        else
-        {
-            throw new IllegalStateException("IESCipher not initialised");
-        }
-
-    }
-
-
-    public int engineDoFinal(
-        byte[] input,
-        int inputOffset,
-        int inputLength,
-        byte[] output,
-        int outputOffset)
-        throws ShortBufferException, IllegalBlockSizeException, BadPaddingException
-    {
-
-        byte[] buf = engineDoFinal(input, inputOffset, inputLength);
-        System.arraycopy(buf, 0, output, outputOffset, buf.length);
-        return buf.length;
-
-    }
-
-    /**
-     * Classes that inherit from us
-     */
-
-    static public class IES
-        extends IESCipher
-    {
-        public IES()
-        {
-            super(new IESEngine(new DHBasicAgreement(),
-                new KDF2BytesGenerator(new SHA1Digest()),
-                new HMac(new SHA1Digest())));
-        }
-    }
-
-    static public class IESwithDESede
-        extends IESCipher
-    {
-        public IESwithDESede()
-        {
-            super(new IESEngine(new DHBasicAgreement(),
-                new KDF2BytesGenerator(new SHA1Digest()),
-                new HMac(new SHA1Digest()),
-                new PaddedBufferedBlockCipher(new DESedeEngine())));
-        }
-    }
-
-    static public class IESwithAES
-        extends IESCipher
-    {
-        public IESwithAES()
-        {
-            super(new IESEngine(new DHBasicAgreement(),
-                new KDF2BytesGenerator(new SHA1Digest()),
-                new HMac(new SHA1Digest()),
-                new PaddedBufferedBlockCipher(new AESEngine())));
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/dsa/DSASigner.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/dsa/DSASigner.java
index ade49b3..bdda6a2 100644
--- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/dsa/DSASigner.java
+++ b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/dsa/DSASigner.java
@@ -23,13 +23,20 @@ import org.bouncycastle.crypto.CipherParameters;
 import org.bouncycastle.crypto.DSA;
 import org.bouncycastle.crypto.Digest;
 import org.bouncycastle.crypto.digests.NullDigest;
-import org.bouncycastle.crypto.digests.SHA1Digest;
-import org.bouncycastle.crypto.digests.SHA224Digest;
-import org.bouncycastle.crypto.digests.SHA256Digest;
-import org.bouncycastle.crypto.digests.SHA384Digest;
-import org.bouncycastle.crypto.digests.SHA512Digest;
+// BEGIN android-added
+import org.bouncycastle.crypto.digests.AndroidDigestFactory;
+// END android-added
+// BEGIN android-removed
+// import org.bouncycastle.crypto.digests.SHA1Digest;
+// import org.bouncycastle.crypto.digests.SHA224Digest;
+// import org.bouncycastle.crypto.digests.SHA256Digest;
+// import org.bouncycastle.crypto.digests.SHA384Digest;
+// import org.bouncycastle.crypto.digests.SHA512Digest;
+// END android-removed
 import org.bouncycastle.crypto.params.ParametersWithRandom;
-import org.bouncycastle.crypto.signers.HMacDSAKCalculator;
+// BEGIN android-removed
+// import org.bouncycastle.crypto.signers.HMacDSAKCalculator;
+// END android-removed
 
 public class DSASigner
     extends SignatureSpi
@@ -217,90 +224,102 @@ public class DSASigner
     {
         public stdDSA()
         {
-            super(new SHA1Digest(), new org.bouncycastle.crypto.signers.DSASigner());
+            // BEGIN android-changed
+            super(AndroidDigestFactory.getSHA1(), new org.bouncycastle.crypto.signers.DSASigner());
+            // END android-changed
         }
     }
 
-    static public class detDSA
-        extends DSASigner
-    {
-        public detDSA()
-        {
-            super(new SHA1Digest(), new org.bouncycastle.crypto.signers.DSASigner(new HMacDSAKCalculator(new SHA1Digest())));
-        }
-    }
+    // BEGIN android-removed
+    // static public class detDSA
+    //     extends DSASigner
+    // {
+    //     public detDSA()
+    //     {
+    //         super(new SHA1Digest(), new org.bouncycastle.crypto.signers.DSASigner(new HMacDSAKCalculator(new SHA1Digest())));
+    //     }
+    // }
+    // END android-removed
 
     static public class dsa224
         extends DSASigner
     {
         public dsa224()
         {
-            super(new SHA224Digest(), new org.bouncycastle.crypto.signers.DSASigner());
+            // BEGIN android-changed
+            super(AndroidDigestFactory.getSHA224(), new org.bouncycastle.crypto.signers.DSASigner());
+            // END android-changed
         }
     }
 
-    static public class detDSA224
-        extends DSASigner
-    {
-        public detDSA224()
-        {
-            super(new SHA224Digest(), new org.bouncycastle.crypto.signers.DSASigner(new HMacDSAKCalculator(new SHA224Digest())));
-        }
-    }
+    // BEGIN android-removed
+    // static public class detDSA224
+    //     extends DSASigner
+    // {
+    //     public detDSA224()
+    //     {
+    //         super(new SHA224Digest(), new org.bouncycastle.crypto.signers.DSASigner(new HMacDSAKCalculator(new SHA224Digest())));
+    //     }
+    // }
+    // END android-removed
 
     static public class dsa256
         extends DSASigner
     {
         public dsa256()
         {
-            super(new SHA256Digest(), new org.bouncycastle.crypto.signers.DSASigner());
+            // BEGIN android-changed
+            super(AndroidDigestFactory.getSHA256(), new org.bouncycastle.crypto.signers.DSASigner());
+            // END android-changed
         }
     }
 
-    static public class detDSA256
-        extends DSASigner
-    {
-        public detDSA256()
-        {
-            super(new SHA256Digest(), new org.bouncycastle.crypto.signers.DSASigner(new HMacDSAKCalculator(new SHA256Digest())));
-        }
-    }
-
-    static public class dsa384
-        extends DSASigner
-    {
-        public dsa384()
-        {
-            super(new SHA384Digest(), new org.bouncycastle.crypto.signers.DSASigner());
-        }
-    }
-
-    static public class detDSA384
-        extends DSASigner
-    {
-        public detDSA384()
-        {
-            super(new SHA384Digest(), new org.bouncycastle.crypto.signers.DSASigner(new HMacDSAKCalculator(new SHA384Digest())));
-        }
-    }
-
-    static public class dsa512
-        extends DSASigner
-    {
-        public dsa512()
-        {
-            super(new SHA512Digest(), new org.bouncycastle.crypto.signers.DSASigner());
-        }
-    }
-
-    static public class detDSA512
-        extends DSASigner
-    {
-        public detDSA512()
-        {
-            super(new SHA512Digest(), new org.bouncycastle.crypto.signers.DSASigner(new HMacDSAKCalculator(new SHA512Digest())));
-        }
-    }
+    // BEGIN android-removed
+    // static public class detDSA256
+    //     extends DSASigner
+    // {
+    //     public detDSA256()
+    //     {
+    //         super(new SHA256Digest(), new org.bouncycastle.crypto.signers.DSASigner(new HMacDSAKCalculator(new SHA256Digest())));
+    //     }
+    // }
+    //
+    // static public class dsa384
+    //     extends DSASigner
+    // {
+    //     public dsa384()
+    //     {
+    //         super(new SHA384Digest(), new org.bouncycastle.crypto.signers.DSASigner());
+    //     }
+    // }
+    //
+    // static public class detDSA384
+    //     extends DSASigner
+    // {
+    //     public detDSA384()
+    //     {
+    //         super(new SHA384Digest(), new org.bouncycastle.crypto.signers.DSASigner(new HMacDSAKCalculator(new SHA384Digest())));
+    //     }
+    // }
+    //
+    // static public class dsa512
+    //     extends DSASigner
+    // {
+    //     public dsa512()
+    //     {
+    //         super(new SHA512Digest(), new org.bouncycastle.crypto.signers.DSASigner());
+    //     }
+    // }
+    //
+    // static public class detDSA512
+    //     extends DSASigner
+    // {
+    //     public detDSA512()
+    //     {
+    //         super(new SHA512Digest(), new org.bouncycastle.crypto.signers.DSASigner(new HMacDSAKCalculator(new SHA512Digest())));
+    //     }
+    // }
+    // END android-removed
 
     static public class noneDSA
         extends DSASigner
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/dsa/DSAUtil.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/dsa/DSAUtil.java
index 5e940ec..c7e2aa9 100644
--- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/dsa/DSAUtil.java
+++ b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/dsa/DSAUtil.java
@@ -23,6 +23,9 @@ public class DSAUtil
     public static final ASN1ObjectIdentifier[] dsaOids =
     {
         X9ObjectIdentifiers.id_dsa,
+        // BEGIN android-added
+        X9ObjectIdentifiers.id_dsa_with_sha1,
+        // END android-added
         OIWObjectIdentifiers.dsaWithSHA1
     };
 
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/dstu/BCDSTU4145PrivateKey.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/dstu/BCDSTU4145PrivateKey.java
deleted file mode 100644
index 27d4b45..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/dstu/BCDSTU4145PrivateKey.java
+++ /dev/null
@@ -1,471 +0,0 @@
-package org.bouncycastle.jcajce.provider.asymmetric.dstu;
-
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.math.BigInteger;
-import java.security.interfaces.ECPrivateKey;
-import java.security.spec.ECParameterSpec;
-import java.security.spec.ECPoint;
-import java.security.spec.ECPrivateKeySpec;
-import java.security.spec.EllipticCurve;
-import java.util.Enumeration;
-
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1Encoding;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.DERBitString;
-import org.bouncycastle.asn1.DERNull;
-import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
-import org.bouncycastle.asn1.ua.DSTU4145NamedCurves;
-import org.bouncycastle.asn1.ua.UAObjectIdentifiers;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.bouncycastle.asn1.x9.X962Parameters;
-import org.bouncycastle.asn1.x9.X9ECParameters;
-import org.bouncycastle.asn1.x9.X9ObjectIdentifiers;
-import org.bouncycastle.crypto.params.ECDomainParameters;
-import org.bouncycastle.crypto.params.ECPrivateKeyParameters;
-import org.bouncycastle.jcajce.provider.asymmetric.util.EC5Util;
-import org.bouncycastle.jcajce.provider.asymmetric.util.ECUtil;
-import org.bouncycastle.jcajce.provider.asymmetric.util.PKCS12BagAttributeCarrierImpl;
-import org.bouncycastle.jce.interfaces.ECPointEncoder;
-import org.bouncycastle.jce.interfaces.PKCS12BagAttributeCarrier;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.jce.spec.ECNamedCurveSpec;
-import org.bouncycastle.math.ec.ECCurve;
-
-public class BCDSTU4145PrivateKey
-    implements ECPrivateKey, org.bouncycastle.jce.interfaces.ECPrivateKey, PKCS12BagAttributeCarrier, ECPointEncoder
-{
-    static final long serialVersionUID = 7245981689601667138L;
-
-    private String algorithm = "DSTU4145";
-    private boolean withCompression;
-
-    private transient BigInteger d;
-    private transient ECParameterSpec ecSpec;
-    private transient DERBitString publicKey;
-    private transient PKCS12BagAttributeCarrierImpl attrCarrier = new PKCS12BagAttributeCarrierImpl();
-
-    protected BCDSTU4145PrivateKey()
-    {
-    }
-
-    public BCDSTU4145PrivateKey(
-        ECPrivateKey key)
-    {
-        this.d = key.getS();
-        this.algorithm = key.getAlgorithm();
-        this.ecSpec = key.getParams();
-    }
-
-    public BCDSTU4145PrivateKey(
-        org.bouncycastle.jce.spec.ECPrivateKeySpec spec)
-    {
-        this.d = spec.getD();
-
-        if (spec.getParams() != null) // can be null if implicitlyCA
-        {
-            ECCurve curve = spec.getParams().getCurve();
-            EllipticCurve ellipticCurve;
-
-            ellipticCurve = EC5Util.convertCurve(curve, spec.getParams().getSeed());
-
-            this.ecSpec = EC5Util.convertSpec(ellipticCurve, spec.getParams());
-        }
-        else
-        {
-            this.ecSpec = null;
-        }
-    }
-
-
-    public BCDSTU4145PrivateKey(
-        ECPrivateKeySpec spec)
-    {
-        this.d = spec.getS();
-        this.ecSpec = spec.getParams();
-    }
-
-    public BCDSTU4145PrivateKey(
-        BCDSTU4145PrivateKey key)
-    {
-        this.d = key.d;
-        this.ecSpec = key.ecSpec;
-        this.withCompression = key.withCompression;
-        this.attrCarrier = key.attrCarrier;
-        this.publicKey = key.publicKey;
-    }
-
-    public BCDSTU4145PrivateKey(
-        String algorithm,
-        ECPrivateKeyParameters params,
-        BCDSTU4145PublicKey pubKey,
-        ECParameterSpec spec)
-    {
-        ECDomainParameters dp = params.getParameters();
-
-        this.algorithm = algorithm;
-        this.d = params.getD();
-
-        if (spec == null)
-        {
-            EllipticCurve ellipticCurve = EC5Util.convertCurve(dp.getCurve(), dp.getSeed());
-
-            this.ecSpec = new ECParameterSpec(
-                ellipticCurve,
-                new ECPoint(
-                    dp.getG().getAffineXCoord().toBigInteger(),
-                    dp.getG().getAffineYCoord().toBigInteger()),
-                dp.getN(),
-                dp.getH().intValue());
-        }
-        else
-        {
-            this.ecSpec = spec;
-        }
-
-        publicKey = getPublicKeyDetails(pubKey);
-    }
-
-    public BCDSTU4145PrivateKey(
-        String algorithm,
-        ECPrivateKeyParameters params,
-        BCDSTU4145PublicKey pubKey,
-        org.bouncycastle.jce.spec.ECParameterSpec spec)
-    {
-        ECDomainParameters dp = params.getParameters();
-
-        this.algorithm = algorithm;
-        this.d = params.getD();
-
-        if (spec == null)
-        {
-            EllipticCurve ellipticCurve = EC5Util.convertCurve(dp.getCurve(), dp.getSeed());
-
-            this.ecSpec = new ECParameterSpec(
-                ellipticCurve,
-                new ECPoint(
-                    dp.getG().getAffineXCoord().toBigInteger(),
-                    dp.getG().getAffineYCoord().toBigInteger()),
-                dp.getN(),
-                dp.getH().intValue());
-        }
-        else
-        {
-            EllipticCurve ellipticCurve = EC5Util.convertCurve(spec.getCurve(), spec.getSeed());
-
-            this.ecSpec = new ECParameterSpec(
-                ellipticCurve,
-                new ECPoint(
-                    spec.getG().getAffineXCoord().toBigInteger(),
-                    spec.getG().getAffineYCoord().toBigInteger()),
-                spec.getN(),
-                spec.getH().intValue());
-        }
-
-        publicKey = getPublicKeyDetails(pubKey);
-    }
-
-    public BCDSTU4145PrivateKey(
-        String algorithm,
-        ECPrivateKeyParameters params)
-    {
-        this.algorithm = algorithm;
-        this.d = params.getD();
-        this.ecSpec = null;
-    }
-
-    BCDSTU4145PrivateKey(
-        PrivateKeyInfo info)
-        throws IOException
-    {
-        populateFromPrivKeyInfo(info);
-    }
-
-    private void populateFromPrivKeyInfo(PrivateKeyInfo info)
-        throws IOException
-    {
-        X962Parameters params = new X962Parameters((ASN1Primitive)info.getPrivateKeyAlgorithm().getParameters());
-
-        if (params.isNamedCurve())
-        {
-            ASN1ObjectIdentifier oid = ASN1ObjectIdentifier.getInstance(params.getParameters());
-            X9ECParameters ecP = ECUtil.getNamedCurveByOid(oid);
-
-            if (ecP == null) // DSTU Curve
-            {
-                ECDomainParameters gParam = DSTU4145NamedCurves.getByOID(oid);
-                EllipticCurve ellipticCurve = EC5Util.convertCurve(gParam.getCurve(), gParam.getSeed());
-
-                ecSpec = new ECNamedCurveSpec(
-                    oid.getId(),
-                    ellipticCurve,
-                    new ECPoint(
-                        gParam.getG().getAffineXCoord().toBigInteger(),
-                        gParam.getG().getAffineYCoord().toBigInteger()),
-                    gParam.getN(),
-                    gParam.getH());
-            }
-            else
-            {
-                EllipticCurve ellipticCurve = EC5Util.convertCurve(ecP.getCurve(), ecP.getSeed());
-
-                ecSpec = new ECNamedCurveSpec(
-                    ECUtil.getCurveName(oid),
-                    ellipticCurve,
-                    new ECPoint(
-                        ecP.getG().getAffineXCoord().toBigInteger(),
-                        ecP.getG().getAffineYCoord().toBigInteger()),
-                    ecP.getN(),
-                    ecP.getH());
-            }
-        }
-        else if (params.isImplicitlyCA())
-        {
-            ecSpec = null;
-        }
-        else
-        {
-            X9ECParameters ecP = X9ECParameters.getInstance(params.getParameters());
-            EllipticCurve ellipticCurve = EC5Util.convertCurve(ecP.getCurve(), ecP.getSeed());
-
-            this.ecSpec = new ECParameterSpec(
-                ellipticCurve,
-                new ECPoint(
-                    ecP.getG().getAffineXCoord().toBigInteger(),
-                    ecP.getG().getAffineYCoord().toBigInteger()),
-                ecP.getN(),
-                ecP.getH().intValue());
-        }
-
-        ASN1Encodable privKey = info.parsePrivateKey();
-        if (privKey instanceof ASN1Integer)
-        {
-            ASN1Integer derD = ASN1Integer.getInstance(privKey);
-
-            this.d = derD.getValue();
-        }
-        else
-        {
-            org.bouncycastle.asn1.sec.ECPrivateKey ec = org.bouncycastle.asn1.sec.ECPrivateKey.getInstance(privKey);
-
-            this.d = ec.getKey();
-            this.publicKey = ec.getPublicKey();
-        }
-    }
-
-    public String getAlgorithm()
-    {
-        return algorithm;
-    }
-
-    /**
-     * return the encoding format we produce in getEncoded().
-     *
-     * @return the string "PKCS#8"
-     */
-    public String getFormat()
-    {
-        return "PKCS#8";
-    }
-
-    /**
-     * Return a PKCS8 representation of the key. The sequence returned
-     * represents a full PrivateKeyInfo object.
-     *
-     * @return a PKCS8 representation of the key.
-     */
-    public byte[] getEncoded()
-    {
-        X962Parameters params;
-        int orderBitLength;
-
-        if (ecSpec instanceof ECNamedCurveSpec)
-        {
-            ASN1ObjectIdentifier curveOid = ECUtil.getNamedCurveOid(((ECNamedCurveSpec)ecSpec).getName());
-            if (curveOid == null)  // guess it's the OID
-            {
-                curveOid = new ASN1ObjectIdentifier(((ECNamedCurveSpec)ecSpec).getName());
-            }
-            params = new X962Parameters(curveOid);
-            orderBitLength = ECUtil.getOrderBitLength(ecSpec.getOrder(), this.getS());
-        }
-        else if (ecSpec == null)
-        {
-            params = new X962Parameters(DERNull.INSTANCE);
-            orderBitLength = ECUtil.getOrderBitLength(null, this.getS());
-        }
-        else
-        {
-            ECCurve curve = EC5Util.convertCurve(ecSpec.getCurve());
-
-            X9ECParameters ecP = new X9ECParameters(
-                curve,
-                EC5Util.convertPoint(curve, ecSpec.getGenerator(), withCompression),
-                ecSpec.getOrder(),
-                BigInteger.valueOf(ecSpec.getCofactor()),
-                ecSpec.getCurve().getSeed());
-
-            params = new X962Parameters(ecP);
-            orderBitLength = ECUtil.getOrderBitLength(ecSpec.getOrder(), this.getS());
-        }
-
-        PrivateKeyInfo info;
-        org.bouncycastle.asn1.sec.ECPrivateKey keyStructure;
-
-        if (publicKey != null)
-        {
-            keyStructure = new org.bouncycastle.asn1.sec.ECPrivateKey(orderBitLength, this.getS(), publicKey, params);
-        }
-        else
-        {
-            keyStructure = new org.bouncycastle.asn1.sec.ECPrivateKey(orderBitLength, this.getS(), params);
-        }
-
-        try
-        {
-            if (algorithm.equals("DSTU4145"))
-            {
-                info = new PrivateKeyInfo(new AlgorithmIdentifier(UAObjectIdentifiers.dstu4145be, params.toASN1Primitive()), keyStructure.toASN1Primitive());
-            }
-            else
-            {
-
-                info = new PrivateKeyInfo(new AlgorithmIdentifier(X9ObjectIdentifiers.id_ecPublicKey, params.toASN1Primitive()), keyStructure.toASN1Primitive());
-            }
-
-            return info.getEncoded(ASN1Encoding.DER);
-        }
-        catch (IOException e)
-        {
-            return null;
-        }
-    }
-
-    public ECParameterSpec getParams()
-    {
-        return ecSpec;
-    }
-
-    public org.bouncycastle.jce.spec.ECParameterSpec getParameters()
-    {
-        if (ecSpec == null)
-        {
-            return null;
-        }
-
-        return EC5Util.convertSpec(ecSpec, withCompression);
-    }
-
-    org.bouncycastle.jce.spec.ECParameterSpec engineGetSpec()
-    {
-        if (ecSpec != null)
-        {
-            return EC5Util.convertSpec(ecSpec, withCompression);
-        }
-
-        return BouncyCastleProvider.CONFIGURATION.getEcImplicitlyCa();
-    }
-
-    public BigInteger getS()
-    {
-        return d;
-    }
-
-    public BigInteger getD()
-    {
-        return d;
-    }
-
-    public void setBagAttribute(
-        ASN1ObjectIdentifier oid,
-        ASN1Encodable attribute)
-    {
-        attrCarrier.setBagAttribute(oid, attribute);
-    }
-
-    public ASN1Encodable getBagAttribute(
-        ASN1ObjectIdentifier oid)
-    {
-        return attrCarrier.getBagAttribute(oid);
-    }
-
-    public Enumeration getBagAttributeKeys()
-    {
-        return attrCarrier.getBagAttributeKeys();
-    }
-
-    public void setPointFormat(String style)
-    {
-        withCompression = !("UNCOMPRESSED".equalsIgnoreCase(style));
-    }
-
-    public boolean equals(Object o)
-    {
-        if (!(o instanceof BCDSTU4145PrivateKey))
-        {
-            return false;
-        }
-
-        BCDSTU4145PrivateKey other = (BCDSTU4145PrivateKey)o;
-
-        return getD().equals(other.getD()) && (engineGetSpec().equals(other.engineGetSpec()));
-    }
-
-    public int hashCode()
-    {
-        return getD().hashCode() ^ engineGetSpec().hashCode();
-    }
-
-    public String toString()
-    {
-        StringBuffer buf = new StringBuffer();
-        String nl = System.getProperty("line.separator");
-
-        buf.append("EC Private Key").append(nl);
-        buf.append("             S: ").append(this.d.toString(16)).append(nl);
-
-        return buf.toString();
-
-    }
-
-    private DERBitString getPublicKeyDetails(BCDSTU4145PublicKey pub)
-    {
-        try
-        {
-            SubjectPublicKeyInfo info = SubjectPublicKeyInfo.getInstance(ASN1Primitive.fromByteArray(pub.getEncoded()));
-
-            return info.getPublicKeyData();
-        }
-        catch (IOException e)
-        {   // should never happen
-            return null;
-        }
-    }
-
-    private void readObject(
-        ObjectInputStream in)
-        throws IOException, ClassNotFoundException
-    {
-        in.defaultReadObject();
-
-        byte[] enc = (byte[])in.readObject();
-
-        populateFromPrivKeyInfo(PrivateKeyInfo.getInstance(ASN1Primitive.fromByteArray(enc)));
-
-        this.attrCarrier = new PKCS12BagAttributeCarrierImpl();
-    }
-
-    private void writeObject(
-        ObjectOutputStream out)
-        throws IOException
-    {
-        out.defaultWriteObject();
-
-        out.writeObject(this.getEncoded());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/dstu/BCDSTU4145PublicKey.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/dstu/BCDSTU4145PublicKey.java
deleted file mode 100644
index 11c52a7..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/dstu/BCDSTU4145PublicKey.java
+++ /dev/null
@@ -1,431 +0,0 @@
-package org.bouncycastle.jcajce.provider.asymmetric.dstu;
-
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.math.BigInteger;
-import java.security.interfaces.ECPublicKey;
-import java.security.spec.ECParameterSpec;
-import java.security.spec.ECPoint;
-import java.security.spec.ECPublicKeySpec;
-import java.security.spec.EllipticCurve;
-
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DERBitString;
-import org.bouncycastle.asn1.DEROctetString;
-import org.bouncycastle.asn1.ua.DSTU4145BinaryField;
-import org.bouncycastle.asn1.ua.DSTU4145ECBinary;
-import org.bouncycastle.asn1.ua.DSTU4145NamedCurves;
-import org.bouncycastle.asn1.ua.DSTU4145Params;
-import org.bouncycastle.asn1.ua.DSTU4145PointEncoder;
-import org.bouncycastle.asn1.ua.UAObjectIdentifiers;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.bouncycastle.asn1.x9.X962Parameters;
-import org.bouncycastle.asn1.x9.X9ECParameters;
-import org.bouncycastle.crypto.params.ECDomainParameters;
-import org.bouncycastle.crypto.params.ECPublicKeyParameters;
-import org.bouncycastle.jcajce.provider.asymmetric.util.EC5Util;
-import org.bouncycastle.jcajce.provider.asymmetric.util.KeyUtil;
-import org.bouncycastle.jce.interfaces.ECPointEncoder;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.jce.spec.ECNamedCurveParameterSpec;
-import org.bouncycastle.jce.spec.ECNamedCurveSpec;
-import org.bouncycastle.math.ec.ECCurve;
-import org.bouncycastle.math.ec.custom.sec.SecP256K1Point;
-import org.bouncycastle.math.ec.custom.sec.SecP256R1Point;
-
-public class BCDSTU4145PublicKey
-    implements ECPublicKey, org.bouncycastle.jce.interfaces.ECPublicKey, ECPointEncoder
-{
-    static final long serialVersionUID = 7026240464295649314L;
-
-    private String algorithm = "DSTU4145";
-    private boolean withCompression;
-
-    private transient org.bouncycastle.math.ec.ECPoint q;
-    private transient ECParameterSpec ecSpec;
-    private transient DSTU4145Params dstuParams;
-
-    public BCDSTU4145PublicKey(
-        BCDSTU4145PublicKey key)
-    {
-        this.q = key.q;
-        this.ecSpec = key.ecSpec;
-        this.withCompression = key.withCompression;
-        this.dstuParams = key.dstuParams;
-    }
-
-    public BCDSTU4145PublicKey(
-        ECPublicKeySpec spec)
-    {
-        this.ecSpec = spec.getParams();
-        this.q = EC5Util.convertPoint(ecSpec, spec.getW(), false);
-    }
-
-    public BCDSTU4145PublicKey(
-        org.bouncycastle.jce.spec.ECPublicKeySpec spec)
-    {
-        this.q = spec.getQ();
-
-        if (spec.getParams() != null) // can be null if implictlyCa
-        {
-            ECCurve curve = spec.getParams().getCurve();
-            EllipticCurve ellipticCurve = EC5Util.convertCurve(curve, spec.getParams().getSeed());
-
-            this.ecSpec = EC5Util.convertSpec(ellipticCurve, spec.getParams());
-        }
-        else
-        {
-            if (q.getCurve() == null)
-            {
-                org.bouncycastle.jce.spec.ECParameterSpec s = BouncyCastleProvider.CONFIGURATION.getEcImplicitlyCa();
-
-                q = s.getCurve().createPoint(q.getAffineXCoord().toBigInteger(), q.getAffineYCoord().toBigInteger());
-            }
-            this.ecSpec = null;
-        }
-    }
-
-    public BCDSTU4145PublicKey(
-        String algorithm,
-        ECPublicKeyParameters params,
-        ECParameterSpec spec)
-    {
-        ECDomainParameters dp = params.getParameters();
-
-        this.algorithm = algorithm;
-        this.q = params.getQ();
-
-        if (spec == null)
-        {
-            EllipticCurve ellipticCurve = EC5Util.convertCurve(dp.getCurve(), dp.getSeed());
-
-            this.ecSpec = createSpec(ellipticCurve, dp);
-        }
-        else
-        {
-            this.ecSpec = spec;
-        }
-    }
-
-    public BCDSTU4145PublicKey(
-        String algorithm,
-        ECPublicKeyParameters params,
-        org.bouncycastle.jce.spec.ECParameterSpec spec)
-    {
-        ECDomainParameters dp = params.getParameters();
-
-        this.algorithm = algorithm;
-        this.q = params.getQ();
-
-        if (spec == null)
-        {
-            EllipticCurve ellipticCurve = EC5Util.convertCurve(dp.getCurve(), dp.getSeed());
-
-            this.ecSpec = createSpec(ellipticCurve, dp);
-        }
-        else
-        {
-            EllipticCurve ellipticCurve = EC5Util.convertCurve(spec.getCurve(), spec.getSeed());
-
-            this.ecSpec = EC5Util.convertSpec(ellipticCurve, spec);
-        }
-    }
-
-    /*
-     * called for implicitCA
-     */
-    public BCDSTU4145PublicKey(
-        String algorithm,
-        ECPublicKeyParameters params)
-    {
-        this.algorithm = algorithm;
-        this.q = params.getQ();
-        this.ecSpec = null;
-    }
-
-    private ECParameterSpec createSpec(EllipticCurve ellipticCurve, ECDomainParameters dp)
-    {
-        return new ECParameterSpec(
-            ellipticCurve,
-            new ECPoint(
-                dp.getG().getAffineXCoord().toBigInteger(),
-                dp.getG().getAffineYCoord().toBigInteger()),
-            dp.getN(),
-            dp.getH().intValue());
-    }
-
-    public BCDSTU4145PublicKey(
-        ECPublicKey key)
-    {
-        this.algorithm = key.getAlgorithm();
-        this.ecSpec = key.getParams();
-        this.q = EC5Util.convertPoint(this.ecSpec, key.getW(), false);
-    }
-
-    BCDSTU4145PublicKey(
-        SubjectPublicKeyInfo info)
-    {
-        populateFromPubKeyInfo(info);
-    }
-
-    private void reverseBytes(byte[] bytes)
-    {
-        byte tmp;
-
-        for (int i = 0; i < bytes.length / 2; i++)
-        {
-            tmp = bytes[i];
-            bytes[i] = bytes[bytes.length - 1 - i];
-            bytes[bytes.length - 1 - i] = tmp;
-        }
-    }
-
-    private void populateFromPubKeyInfo(SubjectPublicKeyInfo info)
-    {
-        DERBitString bits = info.getPublicKeyData();
-        ASN1OctetString key;
-        this.algorithm = "DSTU4145";
-
-        try
-        {
-            key = (ASN1OctetString)ASN1Primitive.fromByteArray(bits.getBytes());
-        }
-        catch (IOException ex)
-        {
-            throw new IllegalArgumentException("error recovering public key");
-        }
-
-        byte[] keyEnc = key.getOctets();
-
-        if (info.getAlgorithm().getAlgorithm().equals(UAObjectIdentifiers.dstu4145le))
-        {
-            reverseBytes(keyEnc);
-        }
-
-        dstuParams = DSTU4145Params.getInstance((ASN1Sequence)info.getAlgorithm().getParameters());
-
-        //ECNamedCurveParameterSpec spec = ECGOST3410NamedCurveTable.getParameterSpec(ECGOST3410NamedCurves.getName(gostParams.getPublicKeyParamSet()));
-        org.bouncycastle.jce.spec.ECParameterSpec spec = null;
-        if (dstuParams.isNamedCurve())
-        {
-            ASN1ObjectIdentifier curveOid = dstuParams.getNamedCurve();
-            ECDomainParameters ecP = DSTU4145NamedCurves.getByOID(curveOid);
-
-            spec = new ECNamedCurveParameterSpec(curveOid.getId(), ecP.getCurve(), ecP.getG(), ecP.getN(), ecP.getH(), ecP.getSeed());
-        }
-        else
-        {
-            DSTU4145ECBinary binary = dstuParams.getECBinary();
-            byte[] b_bytes = binary.getB();
-            if (info.getAlgorithm().getAlgorithm().equals(UAObjectIdentifiers.dstu4145le))
-            {
-                reverseBytes(b_bytes);
-            }
-            DSTU4145BinaryField field = binary.getField();
-            ECCurve curve = new ECCurve.F2m(field.getM(), field.getK1(), field.getK2(), field.getK3(), binary.getA(), new BigInteger(1, b_bytes));
-            byte[] g_bytes = binary.getG();
-            if (info.getAlgorithm().getAlgorithm().equals(UAObjectIdentifiers.dstu4145le))
-            {
-                reverseBytes(g_bytes);
-            }
-            spec = new org.bouncycastle.jce.spec.ECParameterSpec(curve, DSTU4145PointEncoder.decodePoint(curve, g_bytes), binary.getN());
-        }
-
-        ECCurve curve = spec.getCurve();
-        EllipticCurve ellipticCurve = EC5Util.convertCurve(curve, spec.getSeed());
-
-        //this.q = curve.createPoint(new BigInteger(1, x), new BigInteger(1, y), false);
-        this.q = DSTU4145PointEncoder.decodePoint(curve, keyEnc);
-
-        if (dstuParams.isNamedCurve())
-        {
-            ecSpec = new ECNamedCurveSpec(
-                dstuParams.getNamedCurve().getId(),
-                ellipticCurve,
-                new ECPoint(
-                    spec.getG().getAffineXCoord().toBigInteger(),
-                    spec.getG().getAffineYCoord().toBigInteger()),
-                spec.getN(), spec.getH());
-        }
-        else
-        {
-            ecSpec = new ECParameterSpec(
-                ellipticCurve,
-                new ECPoint(
-                    spec.getG().getAffineXCoord().toBigInteger(),
-                    spec.getG().getAffineYCoord().toBigInteger()),
-                spec.getN(), spec.getH().intValue());
-        }
-    }
-
-    public byte[] getSbox()
-    {
-        if (null != dstuParams)
-        {
-            return dstuParams.getDKE();
-        }
-        else
-        {
-            return DSTU4145Params.getDefaultDKE();
-        }
-    }
-
-    public String getAlgorithm()
-    {
-        return algorithm;
-    }
-
-    public String getFormat()
-    {
-        return "X.509";
-    }
-
-    public byte[] getEncoded()
-    {
-        ASN1Encodable params;
-        SubjectPublicKeyInfo info;
-
-        if (dstuParams != null)
-        {
-            params = dstuParams;
-        }
-        else
-        {
-            if (ecSpec instanceof ECNamedCurveSpec)
-            {
-                params = new DSTU4145Params(new ASN1ObjectIdentifier(((ECNamedCurveSpec)ecSpec).getName()));
-            }
-            else
-            {   // strictly speaking this may not be applicable...
-                ECCurve curve = EC5Util.convertCurve(ecSpec.getCurve());
-
-                X9ECParameters ecP = new X9ECParameters(
-                    curve,
-                    EC5Util.convertPoint(curve, ecSpec.getGenerator(), withCompression),
-                    ecSpec.getOrder(),
-                    BigInteger.valueOf(ecSpec.getCofactor()),
-                    ecSpec.getCurve().getSeed());
-
-                params = new X962Parameters(ecP);
-            }
-        }
-
-        byte[] encKey = DSTU4145PointEncoder.encodePoint(this.q);
-
-        try
-        {
-            info = new SubjectPublicKeyInfo(new AlgorithmIdentifier(UAObjectIdentifiers.dstu4145be, params), new DEROctetString(encKey));
-        }
-        catch (IOException e)
-        {
-            return null;
-        }
-
-        return KeyUtil.getEncodedSubjectPublicKeyInfo(info);
-    }
-
-    public ECParameterSpec getParams()
-    {
-        return ecSpec;
-    }
-
-    public org.bouncycastle.jce.spec.ECParameterSpec getParameters()
-    {
-        if (ecSpec == null)     // implictlyCA
-        {
-            return null;
-        }
-
-        return EC5Util.convertSpec(ecSpec, withCompression);
-    }
-
-    public ECPoint getW()
-    {
-        return new ECPoint(q.getAffineXCoord().toBigInteger(), q.getAffineYCoord().toBigInteger());
-    }
-
-    public org.bouncycastle.math.ec.ECPoint getQ()
-    {
-        if (ecSpec == null)
-        {
-            return q.getDetachedPoint();
-        }
-
-        return q;
-    }
-
-    public org.bouncycastle.math.ec.ECPoint engineGetQ()
-    {
-        return q;
-    }
-
-    org.bouncycastle.jce.spec.ECParameterSpec engineGetSpec()
-    {
-        if (ecSpec != null)
-        {
-            return EC5Util.convertSpec(ecSpec, withCompression);
-        }
-
-        return BouncyCastleProvider.CONFIGURATION.getEcImplicitlyCa();
-    }
-
-    public String toString()
-    {
-        StringBuffer buf = new StringBuffer();
-        String nl = System.getProperty("line.separator");
-
-        buf.append("EC Public Key").append(nl);
-        buf.append("            X: ").append(this.q.getAffineXCoord().toBigInteger().toString(16)).append(nl);
-        buf.append("            Y: ").append(this.q.getAffineYCoord().toBigInteger().toString(16)).append(nl);
-
-        return buf.toString();
-    }
-
-    public void setPointFormat(String style)
-    {
-        withCompression = !("UNCOMPRESSED".equalsIgnoreCase(style));
-    }
-
-    public boolean equals(Object o)
-    {
-        if (!(o instanceof BCDSTU4145PublicKey))
-        {
-            return false;
-        }
-
-        BCDSTU4145PublicKey other = (BCDSTU4145PublicKey)o;
-
-        return engineGetQ().equals(other.engineGetQ()) && (engineGetSpec().equals(other.engineGetSpec()));
-    }
-
-    public int hashCode()
-    {
-        return engineGetQ().hashCode() ^ engineGetSpec().hashCode();
-    }
-
-    private void readObject(
-        ObjectInputStream in)
-        throws IOException, ClassNotFoundException
-    {
-        in.defaultReadObject();
-
-        byte[] enc = (byte[])in.readObject();
-
-        populateFromPubKeyInfo(SubjectPublicKeyInfo.getInstance(ASN1Primitive.fromByteArray(enc)));
-    }
-
-    private void writeObject(
-        ObjectOutputStream out)
-        throws IOException
-    {
-        out.defaultWriteObject();
-
-        out.writeObject(this.getEncoded());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/dstu/KeyFactorySpi.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/dstu/KeyFactorySpi.java
deleted file mode 100644
index 95a91de..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/dstu/KeyFactorySpi.java
+++ /dev/null
@@ -1,166 +0,0 @@
-package org.bouncycastle.jcajce.provider.asymmetric.dstu;
-
-import java.io.IOException;
-import java.security.InvalidKeyException;
-import java.security.Key;
-import java.security.PrivateKey;
-import java.security.PublicKey;
-import java.security.interfaces.ECPrivateKey;
-import java.security.interfaces.ECPublicKey;
-import java.security.spec.InvalidKeySpecException;
-import java.security.spec.KeySpec;
-
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
-import org.bouncycastle.asn1.ua.UAObjectIdentifiers;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.bouncycastle.jcajce.provider.asymmetric.util.EC5Util;
-import org.bouncycastle.jcajce.provider.asymmetric.util.BaseKeyFactorySpi;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.jce.spec.ECParameterSpec;
-import org.bouncycastle.jce.spec.ECPrivateKeySpec;
-import org.bouncycastle.jce.spec.ECPublicKeySpec;
-
-public class KeyFactorySpi
-    extends BaseKeyFactorySpi
-{
-    public KeyFactorySpi()
-    {
-    }
-
-    protected KeySpec engineGetKeySpec(
-        Key key,
-        Class spec)
-        throws InvalidKeySpecException
-    {
-        if (spec.isAssignableFrom(java.security.spec.ECPublicKeySpec.class) && key instanceof ECPublicKey)
-        {
-            ECPublicKey k = (ECPublicKey)key;
-            if (k.getParams() != null)
-            {
-                return new java.security.spec.ECPublicKeySpec(k.getW(), k.getParams());
-            }
-            else
-            {
-                ECParameterSpec implicitSpec = BouncyCastleProvider.CONFIGURATION.getEcImplicitlyCa();
-
-                return new java.security.spec.ECPublicKeySpec(k.getW(), EC5Util.convertSpec(EC5Util.convertCurve(implicitSpec.getCurve(), implicitSpec.getSeed()), implicitSpec));
-            }
-        }
-        else if (spec.isAssignableFrom(java.security.spec.ECPrivateKeySpec.class) && key instanceof ECPrivateKey)
-        {
-            ECPrivateKey k = (ECPrivateKey)key;
-
-            if (k.getParams() != null)
-            {
-                return new java.security.spec.ECPrivateKeySpec(k.getS(), k.getParams());
-            }
-            else
-            {
-                ECParameterSpec implicitSpec = BouncyCastleProvider.CONFIGURATION.getEcImplicitlyCa();
-
-                return new java.security.spec.ECPrivateKeySpec(k.getS(), EC5Util.convertSpec(EC5Util.convertCurve(implicitSpec.getCurve(), implicitSpec.getSeed()), implicitSpec));
-            }
-        }
-        else if (spec.isAssignableFrom(org.bouncycastle.jce.spec.ECPublicKeySpec.class) && key instanceof ECPublicKey)
-        {
-            ECPublicKey k = (ECPublicKey)key;
-            if (k.getParams() != null)
-            {
-                return new org.bouncycastle.jce.spec.ECPublicKeySpec(EC5Util.convertPoint(k.getParams(), k.getW(), false), EC5Util.convertSpec(k.getParams(), false));
-            }
-            else
-            {
-                ECParameterSpec implicitSpec = BouncyCastleProvider.CONFIGURATION.getEcImplicitlyCa();
-
-                return new org.bouncycastle.jce.spec.ECPublicKeySpec(EC5Util.convertPoint(k.getParams(), k.getW(), false), implicitSpec);
-            }
-        }
-        else if (spec.isAssignableFrom(org.bouncycastle.jce.spec.ECPrivateKeySpec.class) && key instanceof ECPrivateKey)
-        {
-            ECPrivateKey k = (ECPrivateKey)key;
-
-            if (k.getParams() != null)
-            {
-                return new org.bouncycastle.jce.spec.ECPrivateKeySpec(k.getS(), EC5Util.convertSpec(k.getParams(), false));
-            }
-            else
-            {
-                ECParameterSpec implicitSpec = BouncyCastleProvider.CONFIGURATION.getEcImplicitlyCa();
-
-                return new org.bouncycastle.jce.spec.ECPrivateKeySpec(k.getS(), implicitSpec);
-            }
-        }
-
-        return super.engineGetKeySpec(key, spec);
-    }
-
-    protected Key engineTranslateKey(
-        Key key)
-        throws InvalidKeyException
-    {
-        throw new InvalidKeyException("key type unknown");
-    }
-
-    protected PrivateKey engineGeneratePrivate(
-        KeySpec keySpec)
-        throws InvalidKeySpecException
-    {
-        if (keySpec instanceof ECPrivateKeySpec)
-        {
-            return new BCDSTU4145PrivateKey((ECPrivateKeySpec)keySpec);
-        }
-        else if (keySpec instanceof java.security.spec.ECPrivateKeySpec)
-        {
-            return new BCDSTU4145PrivateKey((java.security.spec.ECPrivateKeySpec)keySpec);
-        }
-
-        return super.engineGeneratePrivate(keySpec);
-    }
-
-    protected PublicKey engineGeneratePublic(
-        KeySpec keySpec)
-        throws InvalidKeySpecException
-    {
-        if (keySpec instanceof ECPublicKeySpec)
-        {
-            return new BCDSTU4145PublicKey((ECPublicKeySpec)keySpec);
-        }
-        else if (keySpec instanceof java.security.spec.ECPublicKeySpec)
-        {
-            return new BCDSTU4145PublicKey((java.security.spec.ECPublicKeySpec)keySpec);
-        }
-
-        return super.engineGeneratePublic(keySpec);
-    }
-
-    public PrivateKey generatePrivate(PrivateKeyInfo keyInfo)
-        throws IOException
-    {
-        ASN1ObjectIdentifier algOid = keyInfo.getPrivateKeyAlgorithm().getAlgorithm();
-
-        if (algOid.equals(UAObjectIdentifiers.dstu4145le) || algOid.equals(UAObjectIdentifiers.dstu4145be))
-        {
-            return new BCDSTU4145PrivateKey(keyInfo);
-        }
-        else
-        {
-            throw new IOException("algorithm identifier " + algOid + " in key not recognised");
-        }
-    }
-
-    public PublicKey generatePublic(SubjectPublicKeyInfo keyInfo)
-        throws IOException
-    {
-        ASN1ObjectIdentifier algOid = keyInfo.getAlgorithm().getAlgorithm();
-
-        if (algOid.equals(UAObjectIdentifiers.dstu4145le) || algOid.equals(UAObjectIdentifiers.dstu4145be))
-        {
-            return new BCDSTU4145PublicKey(keyInfo);
-        }
-        else
-        {
-            throw new IOException("algorithm identifier " + algOid + " in key not recognised");
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/dstu/KeyPairGeneratorSpi.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/dstu/KeyPairGeneratorSpi.java
deleted file mode 100644
index f39eb7f..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/dstu/KeyPairGeneratorSpi.java
+++ /dev/null
@@ -1,188 +0,0 @@
-package org.bouncycastle.jcajce.provider.asymmetric.dstu;
-
-import java.math.BigInteger;
-import java.security.InvalidAlgorithmParameterException;
-import java.security.InvalidParameterException;
-import java.security.KeyPair;
-import java.security.SecureRandom;
-import java.security.spec.AlgorithmParameterSpec;
-import java.security.spec.ECGenParameterSpec;
-
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ua.DSTU4145NamedCurves;
-import org.bouncycastle.crypto.AsymmetricCipherKeyPair;
-import org.bouncycastle.crypto.generators.DSTU4145KeyPairGenerator;
-import org.bouncycastle.crypto.generators.ECKeyPairGenerator;
-import org.bouncycastle.crypto.params.ECDomainParameters;
-import org.bouncycastle.crypto.params.ECKeyGenerationParameters;
-import org.bouncycastle.crypto.params.ECPrivateKeyParameters;
-import org.bouncycastle.crypto.params.ECPublicKeyParameters;
-import org.bouncycastle.jcajce.provider.asymmetric.util.EC5Util;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.jce.spec.ECNamedCurveGenParameterSpec;
-import org.bouncycastle.jce.spec.ECNamedCurveSpec;
-import org.bouncycastle.jce.spec.ECParameterSpec;
-import org.bouncycastle.math.ec.ECCurve;
-import org.bouncycastle.math.ec.ECPoint;
-
-public class KeyPairGeneratorSpi
-    extends java.security.KeyPairGenerator
-{
-    Object ecParams = null;
-    ECKeyPairGenerator engine = new DSTU4145KeyPairGenerator();
-
-    String algorithm = "DSTU4145";
-    ECKeyGenerationParameters param;
-    //int strength = 239;
-    SecureRandom random = null;
-    boolean initialised = false;
-
-    public KeyPairGeneratorSpi()
-    {
-        super("DSTU4145");
-    }
-
-    public void initialize(
-        int strength,
-        SecureRandom random)
-    {
-        this.random = random;
-
-        if (ecParams != null)
-        {
-            try
-            {
-                initialize((ECGenParameterSpec)ecParams, random);
-            }
-            catch (InvalidAlgorithmParameterException e)
-            {
-                throw new InvalidParameterException("key size not configurable.");
-            }
-        }
-        else
-        {
-            throw new InvalidParameterException("unknown key size.");
-        }
-    }
-
-    public void initialize(
-        AlgorithmParameterSpec params,
-        SecureRandom random)
-        throws InvalidAlgorithmParameterException
-    {
-        if (params instanceof ECParameterSpec)
-        {
-            ECParameterSpec p = (ECParameterSpec)params;
-            this.ecParams = params;
-
-            param = new ECKeyGenerationParameters(new ECDomainParameters(p.getCurve(), p.getG(), p.getN()), random);
-
-            engine.init(param);
-            initialised = true;
-        }
-        else if (params instanceof java.security.spec.ECParameterSpec)
-        {
-            java.security.spec.ECParameterSpec p = (java.security.spec.ECParameterSpec)params;
-            this.ecParams = params;
-
-            ECCurve curve = EC5Util.convertCurve(p.getCurve());
-            ECPoint g = EC5Util.convertPoint(curve, p.getGenerator(), false);
-
-            param = new ECKeyGenerationParameters(new ECDomainParameters(curve, g, p.getOrder(), BigInteger.valueOf(p.getCofactor())), random);
-
-            engine.init(param);
-            initialised = true;
-        }
-        else if (params instanceof ECGenParameterSpec || params instanceof ECNamedCurveGenParameterSpec)
-        {
-            String curveName;
-
-            if (params instanceof ECGenParameterSpec)
-            {
-                curveName = ((ECGenParameterSpec)params).getName();
-            }
-            else
-            {
-                curveName = ((ECNamedCurveGenParameterSpec)params).getName();
-            }
-
-            //ECDomainParameters ecP = ECGOST3410NamedCurves.getByName(curveName);
-            ECDomainParameters ecP = DSTU4145NamedCurves.getByOID(new ASN1ObjectIdentifier(curveName));
-            if (ecP == null)
-            {
-                throw new InvalidAlgorithmParameterException("unknown curve name: " + curveName);
-            }
-
-            this.ecParams = new ECNamedCurveSpec(
-                curveName,
-                ecP.getCurve(),
-                ecP.getG(),
-                ecP.getN(),
-                ecP.getH(),
-                ecP.getSeed());
-
-            java.security.spec.ECParameterSpec p = (java.security.spec.ECParameterSpec)ecParams;
-
-            ECCurve curve = EC5Util.convertCurve(p.getCurve());
-            ECPoint g = EC5Util.convertPoint(curve, p.getGenerator(), false);
-
-            param = new ECKeyGenerationParameters(new ECDomainParameters(curve, g, p.getOrder(), BigInteger.valueOf(p.getCofactor())), random);
-
-            engine.init(param);
-            initialised = true;
-        }
-        else if (params == null && BouncyCastleProvider.CONFIGURATION.getEcImplicitlyCa() != null)
-        {
-            ECParameterSpec p = BouncyCastleProvider.CONFIGURATION.getEcImplicitlyCa();
-            this.ecParams = params;
-
-            param = new ECKeyGenerationParameters(new ECDomainParameters(p.getCurve(), p.getG(), p.getN()), random);
-
-            engine.init(param);
-            initialised = true;
-        }
-        else if (params == null && BouncyCastleProvider.CONFIGURATION.getEcImplicitlyCa() == null)
-        {
-            throw new InvalidAlgorithmParameterException("null parameter passed but no implicitCA set");
-        }
-        else
-        {
-            throw new InvalidAlgorithmParameterException("parameter object not a ECParameterSpec: " + params.getClass().getName());
-        }
-    }
-
-    public KeyPair generateKeyPair()
-    {
-        if (!initialised)
-        {
-            throw new IllegalStateException("DSTU Key Pair Generator not initialised");
-        }
-
-        AsymmetricCipherKeyPair pair = engine.generateKeyPair();
-        ECPublicKeyParameters pub = (ECPublicKeyParameters)pair.getPublic();
-        ECPrivateKeyParameters priv = (ECPrivateKeyParameters)pair.getPrivate();
-
-        if (ecParams instanceof ECParameterSpec)
-        {
-            ECParameterSpec p = (ECParameterSpec)ecParams;
-
-            BCDSTU4145PublicKey pubKey = new BCDSTU4145PublicKey(algorithm, pub, p);
-            return new KeyPair(pubKey,
-                new BCDSTU4145PrivateKey(algorithm, priv, pubKey, p));
-        }
-        else if (ecParams == null)
-        {
-            return new KeyPair(new BCDSTU4145PublicKey(algorithm, pub),
-                new BCDSTU4145PrivateKey(algorithm, priv));
-        }
-        else
-        {
-            java.security.spec.ECParameterSpec p = (java.security.spec.ECParameterSpec)ecParams;
-
-            BCDSTU4145PublicKey pubKey = new BCDSTU4145PublicKey(algorithm, pub, p);
-
-            return new KeyPair(pubKey, new BCDSTU4145PrivateKey(algorithm, priv, pubKey, p));
-        }
-    }
-}
-
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/dstu/SignatureSpi.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/dstu/SignatureSpi.java
deleted file mode 100644
index 1b9ce70..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/dstu/SignatureSpi.java
+++ /dev/null
@@ -1,221 +0,0 @@
-package org.bouncycastle.jcajce.provider.asymmetric.dstu;
-
-import java.math.BigInteger;
-import java.security.InvalidKeyException;
-import java.security.PrivateKey;
-import java.security.PublicKey;
-import java.security.SignatureException;
-import java.security.spec.AlgorithmParameterSpec;
-
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.DEROctetString;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.bouncycastle.asn1.x509.X509ObjectIdentifiers;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.DSA;
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.digests.GOST3411Digest;
-import org.bouncycastle.crypto.params.ParametersWithRandom;
-import org.bouncycastle.crypto.signers.DSTU4145Signer;
-import org.bouncycastle.jcajce.provider.asymmetric.util.ECUtil;
-import org.bouncycastle.jce.interfaces.ECKey;
-import org.bouncycastle.jce.interfaces.ECPublicKey;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-
-public class SignatureSpi
-    extends java.security.SignatureSpi
-    implements PKCSObjectIdentifiers, X509ObjectIdentifiers
-{
-    private Digest digest;
-    private DSA signer;
-
-    private static byte[] DEFAULT_SBOX = {
-        0xa, 0x9, 0xd, 0x6, 0xe, 0xb, 0x4, 0x5, 0xf, 0x1, 0x3, 0xc, 0x7, 0x0, 0x8, 0x2,
-        0x8, 0x0, 0xc, 0x4, 0x9, 0x6, 0x7, 0xb, 0x2, 0x3, 0x1, 0xf, 0x5, 0xe, 0xa, 0xd,
-        0xf, 0x6, 0x5, 0x8, 0xe, 0xb, 0xa, 0x4, 0xc, 0x0, 0x3, 0x7, 0x2, 0x9, 0x1, 0xd,
-        0x3, 0x8, 0xd, 0x9, 0x6, 0xb, 0xf, 0x0, 0x2, 0x5, 0xc, 0xa, 0x4, 0xe, 0x1, 0x7,
-        0xf, 0x8, 0xe, 0x9, 0x7, 0x2, 0x0, 0xd, 0xc, 0x6, 0x1, 0x5, 0xb, 0x4, 0x3, 0xa,
-        0x2, 0x8, 0x9, 0x7, 0x5, 0xf, 0x0, 0xb, 0xc, 0x1, 0xd, 0xe, 0xa, 0x3, 0x6, 0x4,
-        0x3, 0x8, 0xb, 0x5, 0x6, 0x4, 0xe, 0xa, 0x2, 0xc, 0x1, 0x7, 0x9, 0xf, 0xd, 0x0,
-        0x1, 0x2, 0x3, 0xe, 0x6, 0xd, 0xb, 0x8, 0xf, 0xa, 0xc, 0x5, 0x7, 0x9, 0x0, 0x4
-    };
-
-    public SignatureSpi()
-    {
-        //TODO: Add default ua s-box
-        //this.digest = new GOST3411Digest(DEFAULT_SBOX);
-        this.signer = new DSTU4145Signer();
-    }
-
-    protected void engineInitVerify(
-        PublicKey publicKey)
-        throws InvalidKeyException
-    {
-        CipherParameters param;
-
-        if (publicKey instanceof ECPublicKey)
-        {
-            param = ECUtil.generatePublicKeyParameter(publicKey);
-        }
-        else
-        {
-            try
-            {
-                byte[] bytes = publicKey.getEncoded();
-
-                publicKey = BouncyCastleProvider.getPublicKey(SubjectPublicKeyInfo.getInstance(bytes));
-
-                if (publicKey instanceof ECPublicKey)
-                {
-                    param = ECUtil.generatePublicKeyParameter(publicKey);
-                }
-                else
-                {
-                    throw new InvalidKeyException("can't recognise key type in DSA based signer");
-                }
-            }
-            catch (Exception e)
-            {
-                throw new InvalidKeyException("can't recognise key type in DSA based signer");
-            }
-        }
-
-        digest = new GOST3411Digest(expandSbox(((BCDSTU4145PublicKey)publicKey).getSbox()));
-        signer.init(false, param);
-    }
-
-    byte[] expandSbox(byte[] compressed)
-    {
-        byte[] expanded = new byte[128];
-
-        for (int i = 0; i < compressed.length; i++)
-        {
-            expanded[i * 2] = (byte)((compressed[i] >> 4) & 0xf);
-            expanded[i * 2 + 1] = (byte)(compressed[i] & 0xf);
-        }
-        return expanded;
-    }
-
-    protected void engineInitSign(
-        PrivateKey privateKey)
-        throws InvalidKeyException
-    {
-        CipherParameters param = null;
-
-        if (privateKey instanceof ECKey)
-        {
-            param = ECUtil.generatePrivateKeyParameter(privateKey);
-        }
-
-        digest = new GOST3411Digest(DEFAULT_SBOX);
-
-        if (appRandom != null)
-        {
-            signer.init(true, new ParametersWithRandom(param, appRandom));
-        }
-        else
-        {
-            signer.init(true, param);
-        }
-    }
-
-    protected void engineUpdate(
-        byte b)
-        throws SignatureException
-    {
-        digest.update(b);
-    }
-
-    protected void engineUpdate(
-        byte[] b,
-        int off,
-        int len)
-        throws SignatureException
-    {
-        digest.update(b, off, len);
-    }
-
-    protected byte[] engineSign()
-        throws SignatureException
-    {
-        byte[] hash = new byte[digest.getDigestSize()];
-
-        digest.doFinal(hash, 0);
-
-        try
-        {
-            BigInteger[] sig = signer.generateSignature(hash);
-            byte[] r = sig[0].toByteArray();
-            byte[] s = sig[1].toByteArray();
-
-            byte[] sigBytes = new byte[(r.length > s.length ? r.length * 2 : s.length * 2)];
-            System.arraycopy(s, 0, sigBytes, (sigBytes.length / 2) - s.length, s.length);
-            System.arraycopy(r, 0, sigBytes, sigBytes.length - r.length, r.length);
-
-            return new DEROctetString(sigBytes).getEncoded();
-        }
-        catch (Exception e)
-        {
-            throw new SignatureException(e.toString());
-        }
-    }
-
-    protected boolean engineVerify(
-        byte[] sigBytes)
-        throws SignatureException
-    {
-        byte[] hash = new byte[digest.getDigestSize()];
-
-        digest.doFinal(hash, 0);
-
-        BigInteger[] sig;
-
-        try
-        {
-            byte[] bytes = ((ASN1OctetString)ASN1OctetString.fromByteArray(sigBytes)).getOctets();
-
-            byte[] r = new byte[bytes.length / 2];
-            byte[] s = new byte[bytes.length / 2];
-
-            System.arraycopy(bytes, 0, s, 0, bytes.length / 2);
-
-            System.arraycopy(bytes, bytes.length / 2, r, 0, bytes.length / 2);
-
-            sig = new BigInteger[2];
-            sig[0] = new BigInteger(1, r);
-            sig[1] = new BigInteger(1, s);
-        }
-        catch (Exception e)
-        {
-            throw new SignatureException("error decoding signature bytes.");
-        }
-
-        return signer.verifySignature(hash, sig[0], sig[1]);
-    }
-
-    protected void engineSetParameter(
-        AlgorithmParameterSpec params)
-    {
-        throw new UnsupportedOperationException("engineSetParameter unsupported");
-    }
-
-    /**
-     * @deprecated replaced with <a href = "#engineSetParameter(java.security.spec.AlgorithmParameterSpec)">
-     */
-    protected void engineSetParameter(
-        String param,
-        Object value)
-    {
-        throw new UnsupportedOperationException("engineSetParameter unsupported");
-    }
-
-    /**
-     * @deprecated
-     */
-    protected Object engineGetParameter(
-        String param)
-    {
-        throw new UnsupportedOperationException("engineSetParameter unsupported");
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/dstu/SignatureSpiLe.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/dstu/SignatureSpiLe.java
deleted file mode 100644
index 0eb8bc9..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/dstu/SignatureSpiLe.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package org.bouncycastle.jcajce.provider.asymmetric.dstu;
-
-import java.io.IOException;
-import java.security.SignatureException;
-
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.DEROctetString;
-
-public class SignatureSpiLe
-    extends SignatureSpi
-{
-    void reverseBytes(byte[] bytes)
-    {
-        byte tmp;
-
-        for (int i = 0; i < bytes.length / 2; i++)
-        {
-            tmp = bytes[i];
-            bytes[i] = bytes[bytes.length - 1 - i];
-            bytes[bytes.length - 1 - i] = tmp;
-        }
-    }
-
-    protected byte[] engineSign()
-        throws SignatureException
-    {
-        byte[] signature = ASN1OctetString.getInstance(super.engineSign()).getOctets();
-        reverseBytes(signature);
-        try
-        {
-            return (new DEROctetString(signature)).getEncoded();
-        }
-        catch (Exception e)
-        {
-            throw new SignatureException(e.toString());
-        }
-    }
-
-    protected boolean engineVerify(
-        byte[] sigBytes)
-        throws SignatureException
-    {
-        byte[] bytes = null;
-
-        try
-        {
-            bytes = ((ASN1OctetString)ASN1OctetString.fromByteArray(sigBytes)).getOctets();
-        }
-        catch (IOException e)
-        {
-            throw new SignatureException("error decoding signature bytes.");
-        }
-
-        reverseBytes(bytes);
-
-        try
-        {
-            return super.engineVerify((new DEROctetString(bytes)).getEncoded());
-        }
-        catch (SignatureException e)
-        {
-            throw e;
-        }
-        catch (Exception e)
-        {
-            throw new SignatureException(e.toString());
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/ec/IESCipher.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/ec/IESCipher.java
deleted file mode 100644
index fbeb8f0..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/ec/IESCipher.java
+++ /dev/null
@@ -1,553 +0,0 @@
-package org.bouncycastle.jcajce.provider.asymmetric.ec;
-
-import java.io.ByteArrayOutputStream;
-import java.security.AlgorithmParameters;
-import java.security.InvalidAlgorithmParameterException;
-import java.security.InvalidKeyException;
-import java.security.Key;
-import java.security.NoSuchAlgorithmException;
-import java.security.PrivateKey;
-import java.security.PublicKey;
-import java.security.SecureRandom;
-import java.security.spec.AlgorithmParameterSpec;
-
-import javax.crypto.BadPaddingException;
-import javax.crypto.Cipher;
-import javax.crypto.CipherSpi;
-import javax.crypto.IllegalBlockSizeException;
-import javax.crypto.NoSuchPaddingException;
-import javax.crypto.ShortBufferException;
-
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.InvalidCipherTextException;
-import org.bouncycastle.crypto.KeyEncoder;
-import org.bouncycastle.crypto.agreement.ECDHBasicAgreement;
-import org.bouncycastle.crypto.digests.SHA1Digest;
-import org.bouncycastle.crypto.engines.AESEngine;
-import org.bouncycastle.crypto.engines.DESedeEngine;
-import org.bouncycastle.crypto.engines.IESEngine;
-import org.bouncycastle.crypto.generators.ECKeyPairGenerator;
-import org.bouncycastle.crypto.generators.EphemeralKeyPairGenerator;
-import org.bouncycastle.crypto.generators.KDF2BytesGenerator;
-import org.bouncycastle.crypto.macs.HMac;
-import org.bouncycastle.crypto.modes.CBCBlockCipher;
-import org.bouncycastle.crypto.paddings.PaddedBufferedBlockCipher;
-import org.bouncycastle.crypto.params.AsymmetricKeyParameter;
-import org.bouncycastle.crypto.params.ECDomainParameters;
-import org.bouncycastle.crypto.params.ECKeyGenerationParameters;
-import org.bouncycastle.crypto.params.ECKeyParameters;
-import org.bouncycastle.crypto.params.ECPublicKeyParameters;
-import org.bouncycastle.crypto.params.IESWithCipherParameters;
-import org.bouncycastle.crypto.params.ParametersWithIV;
-import org.bouncycastle.crypto.parsers.ECIESPublicKeyParser;
-import org.bouncycastle.jcajce.provider.asymmetric.util.ECUtil;
-import org.bouncycastle.jcajce.provider.asymmetric.util.IESUtil;
-import org.bouncycastle.jcajce.util.BCJcaJceHelper;
-import org.bouncycastle.jcajce.util.JcaJceHelper;
-import org.bouncycastle.jce.interfaces.ECKey;
-import org.bouncycastle.jce.interfaces.IESKey;
-import org.bouncycastle.jce.spec.IESParameterSpec;
-import org.bouncycastle.util.Strings;
-
-
-public class IESCipher
-    extends CipherSpi
-{
-    private final JcaJceHelper helper = new BCJcaJceHelper();
-
-    private int ivLength;
-    private IESEngine engine;
-    private int state = -1;
-    private ByteArrayOutputStream buffer = new ByteArrayOutputStream();
-    private AlgorithmParameters engineParam = null;
-    private IESParameterSpec engineSpec = null;
-    private AsymmetricKeyParameter key;
-    private SecureRandom random;
-    private boolean dhaesMode = false;
-    private AsymmetricKeyParameter otherKeyParameter = null;
-
-    public IESCipher(IESEngine engine)
-    {
-        this.engine = engine;
-        this.ivLength = 0;
-    }
-
-    public IESCipher(IESEngine engine, int ivLength)
-    {
-        this.engine = engine;
-        this.ivLength = ivLength;
-    }
-
-    public int engineGetBlockSize()
-    {
-        if (engine.getCipher() != null)
-        {
-            return engine.getCipher().getBlockSize();
-        }
-        else
-        {
-            return 0;
-        }
-    }
-
-
-    public int engineGetKeySize(Key key)
-    {
-        if (key instanceof ECKey)
-        {
-            return ((ECKey)key).getParameters().getCurve().getFieldSize();
-        }
-        else
-        {
-            throw new IllegalArgumentException("not an EC key");
-        }
-    }
-
-
-    public byte[] engineGetIV()
-    {
-        return null;
-    }
-
-    public AlgorithmParameters engineGetParameters()
-    {
-        if (engineParam == null && engineSpec != null)
-        {
-            try
-            {
-                engineParam = helper.createAlgorithmParameters("IES");
-                engineParam.init(engineSpec);
-            }
-            catch (Exception e)
-            {
-                throw new RuntimeException(e.toString());
-            }
-        }
-
-        return engineParam;
-    }
-
-
-    public void engineSetMode(String mode)
-        throws NoSuchAlgorithmException
-    {
-        String modeName = Strings.toUpperCase(mode);
-
-        if (modeName.equals("NONE"))
-        {
-            dhaesMode = false;
-        }
-        else if (modeName.equals("DHAES"))
-        {
-            dhaesMode = true;
-        }
-        else
-        {
-            throw new IllegalArgumentException("can't support mode " + mode);
-        }
-    }
-
-
-    public int engineGetOutputSize(int inputLen)
-    {
-        int len1, len2, len3;
-
-        len1 = engine.getMac().getMacSize();
-
-        if (key != null)
-        {
-            len2 = 1 + 2 * (((ECKey)key).getParameters().getCurve().getFieldSize() + 7) / 8;
-        }
-        else
-        {
-            throw new IllegalStateException("cipher not initialised");
-        }
-
-        if (engine.getCipher() == null)
-        {
-            len3 = inputLen;
-        }
-        else if (state == Cipher.ENCRYPT_MODE || state == Cipher.WRAP_MODE)
-        {
-            len3 = engine.getCipher().getOutputSize(inputLen);
-        }
-        else if (state == Cipher.DECRYPT_MODE || state == Cipher.UNWRAP_MODE)
-        {
-            len3 = engine.getCipher().getOutputSize(inputLen - len1 - len2);
-        }
-        else
-        {
-            throw new IllegalStateException("cipher not initialised");
-        }
-
-        if (state == Cipher.ENCRYPT_MODE || state == Cipher.WRAP_MODE)
-        {
-            return buffer.size() + len1 + len2 + len3;
-        }
-        else if (state == Cipher.DECRYPT_MODE || state == Cipher.UNWRAP_MODE)
-        {
-            return buffer.size() - len1 - len2 + len3;
-        }
-        else
-        {
-            throw new IllegalStateException("cipher not initialised");
-        }
-
-    }
-
-    public void engineSetPadding(String padding)
-        throws NoSuchPaddingException
-    {
-        String paddingName = Strings.toUpperCase(padding);
-
-        // TDOD: make this meaningful...
-        if (paddingName.equals("NOPADDING"))
-        {
-
-        }
-        else if (paddingName.equals("PKCS5PADDING") || paddingName.equals("PKCS7PADDING"))
-        {
-
-        }
-        else
-        {
-            throw new NoSuchPaddingException("padding not available with IESCipher");
-        }
-    }
-
-
-    // Initialisation methods
-
-    public void engineInit(
-        int opmode,
-        Key key,
-        AlgorithmParameters params,
-        SecureRandom random)
-        throws InvalidKeyException, InvalidAlgorithmParameterException
-    {
-        AlgorithmParameterSpec paramSpec = null;
-
-        if (params != null)
-        {
-            try
-            {
-                paramSpec = params.getParameterSpec(IESParameterSpec.class);
-            }
-            catch (Exception e)
-            {
-                throw new InvalidAlgorithmParameterException("cannot recognise parameters: " + e.toString());
-            }
-        }
-
-        engineParam = params;
-        engineInit(opmode, key, paramSpec, random);
-
-    }
-
-
-    public void engineInit(
-        int opmode,
-        Key key,
-        AlgorithmParameterSpec engineSpec,
-        SecureRandom random)
-        throws InvalidAlgorithmParameterException, InvalidKeyException
-    {
-        otherKeyParameter = null;
-
-        // Use default parameters (including cipher key size) if none are specified
-        if (engineSpec == null)
-        {
-            this.engineSpec = IESUtil.guessParameterSpec(engine);
-        }
-        else if (engineSpec instanceof IESParameterSpec)
-        {
-            this.engineSpec = (IESParameterSpec)engineSpec;
-        }
-        else
-        {
-            throw new InvalidAlgorithmParameterException("must be passed IES parameters");
-        }
-
-        byte[] nonce = this.engineSpec.getNonce();
-
-        if (nonce != null)
-        {
-            if (ivLength == 0)
-            {
-                throw new InvalidAlgorithmParameterException("NONCE present in IES Parameters when none required");
-            }
-            else if (nonce.length != ivLength)
-            {
-                throw new InvalidAlgorithmParameterException("NONCE in IES Parameters needs to be " + ivLength + " bytes long");
-            }
-        }
-
-        // Parse the recipient's key
-        if (opmode == Cipher.ENCRYPT_MODE || opmode == Cipher.WRAP_MODE)
-        {
-            if (key instanceof PublicKey)
-            {
-                this.key = ECUtil.generatePublicKeyParameter((PublicKey)key);
-            }
-            else if (key instanceof IESKey)
-            {
-                IESKey ieKey = (IESKey)key;
-
-                this.key = ECUtil.generatePublicKeyParameter(ieKey.getPublic());
-                this.otherKeyParameter = ECUtil.generatePrivateKeyParameter(ieKey.getPrivate());
-            }
-            else
-            {
-                throw new InvalidKeyException("must be passed recipient's public EC key for encryption");
-            }
-        }
-        else if (opmode == Cipher.DECRYPT_MODE || opmode == Cipher.UNWRAP_MODE)
-        {
-            if (key instanceof PrivateKey)
-            {
-                this.key = ECUtil.generatePrivateKeyParameter((PrivateKey)key);
-            }
-            else if (key instanceof IESKey)
-            {
-                IESKey ieKey = (IESKey)key;
-
-                this.otherKeyParameter = ECUtil.generatePublicKeyParameter(ieKey.getPublic());
-                this.key = ECUtil.generatePrivateKeyParameter(ieKey.getPrivate());
-            }
-            else
-            {
-                throw new InvalidKeyException("must be passed recipient's private EC key for decryption");
-            }
-        }
-        else
-        {
-            throw new InvalidKeyException("must be passed EC key");
-        }
-
-
-        this.random = random;
-        this.state = opmode;
-        buffer.reset();
-
-    }
-
-
-    public void engineInit(
-        int opmode,
-        Key key,
-        SecureRandom random)
-        throws InvalidKeyException
-    {
-        try
-        {
-            engineInit(opmode, key, (AlgorithmParameterSpec)null, random);
-        }
-        catch (InvalidAlgorithmParameterException e)
-        {
-            throw new IllegalArgumentException("can't handle supplied parameter spec");
-        }
-
-    }
-
-
-    // Update methods - buffer the input
-
-    public byte[] engineUpdate(
-        byte[] input,
-        int inputOffset,
-        int inputLen)
-    {
-        buffer.write(input, inputOffset, inputLen);
-        return null;
-    }
-
-
-    public int engineUpdate(
-        byte[] input,
-        int inputOffset,
-        int inputLen,
-        byte[] output,
-        int outputOffset)
-    {
-        buffer.write(input, inputOffset, inputLen);
-        return 0;
-    }
-
-
-    // Finalisation methods
-
-    public byte[] engineDoFinal(
-        byte[] input,
-        int inputOffset,
-        int inputLen)
-        throws IllegalBlockSizeException, BadPaddingException
-    {
-        if (inputLen != 0)
-        {
-            buffer.write(input, inputOffset, inputLen);
-        }
-
-        final byte[] in = buffer.toByteArray();
-        buffer.reset();
-
-        // Convert parameters for use in IESEngine
-        CipherParameters params = new IESWithCipherParameters(engineSpec.getDerivationV(),
-            engineSpec.getEncodingV(),
-            engineSpec.getMacKeySize(),
-            engineSpec.getCipherKeySize());
-
-        if (engineSpec.getNonce() != null)
-        {
-            params = new ParametersWithIV(params, engineSpec.getNonce());
-        }
-
-        final ECDomainParameters ecParams = ((ECKeyParameters)key).getParameters();
-
-        final byte[] V;
-
-        if (otherKeyParameter != null)
-        {
-            try
-            {
-                if (state == Cipher.ENCRYPT_MODE || state == Cipher.WRAP_MODE)
-                {
-                    engine.init(true, otherKeyParameter, key, params);
-                }
-                else
-                {
-                    engine.init(false, key, otherKeyParameter, params);
-                }
-                return engine.processBlock(in, 0, in.length);
-            }
-            catch (Exception e)
-            {
-                throw new BadPaddingException(e.getMessage());
-            }
-        }
-
-        if (state == Cipher.ENCRYPT_MODE || state == Cipher.WRAP_MODE)
-        {
-            // Generate the ephemeral key pair
-            ECKeyPairGenerator gen = new ECKeyPairGenerator();
-            gen.init(new ECKeyGenerationParameters(ecParams, random));
-
-            final boolean usePointCompression = engineSpec.getPointCompression();
-            EphemeralKeyPairGenerator kGen = new EphemeralKeyPairGenerator(gen, new KeyEncoder()
-            {
-                public byte[] getEncoded(AsymmetricKeyParameter keyParameter)
-                {
-                    return ((ECPublicKeyParameters)keyParameter).getQ().getEncoded(usePointCompression);
-                }
-            });
-
-            // Encrypt the buffer
-            try
-            {
-                engine.init(key, params, kGen);
-
-                return engine.processBlock(in, 0, in.length);
-            }
-            catch (Exception e)
-            {
-                throw new BadPaddingException(e.getMessage());
-            }
-
-        }
-        else if (state == Cipher.DECRYPT_MODE || state == Cipher.UNWRAP_MODE)
-        {
-            // Decrypt the buffer
-            try
-            {
-                engine.init(key, params, new ECIESPublicKeyParser(ecParams));
-
-                return engine.processBlock(in, 0, in.length);
-            }
-            catch (InvalidCipherTextException e)
-            {
-                throw new BadPaddingException(e.getMessage());
-            }
-        }
-        else
-        {
-            throw new IllegalStateException("cipher not initialised");
-        }
-
-    }
-
-    public int engineDoFinal(
-        byte[] input,
-        int inputOffset,
-        int inputLength,
-        byte[] output,
-        int outputOffset)
-        throws ShortBufferException, IllegalBlockSizeException, BadPaddingException
-    {
-
-        byte[] buf = engineDoFinal(input, inputOffset, inputLength);
-        System.arraycopy(buf, 0, output, outputOffset, buf.length);
-        return buf.length;
-    }
-
-    /**
-     * Classes that inherit from us
-     */
-
-    static public class ECIES
-        extends IESCipher
-    {
-        public ECIES()
-        {
-            super(new IESEngine(new ECDHBasicAgreement(),
-                new KDF2BytesGenerator(new SHA1Digest()),
-                new HMac(new SHA1Digest())));
-        }
-    }
-
-    static public class ECIESwithDESede
-        extends IESCipher
-    {
-        public ECIESwithDESede()
-        {
-            super(new IESEngine(new ECDHBasicAgreement(),
-                new KDF2BytesGenerator(new SHA1Digest()),
-                new HMac(new SHA1Digest()),
-                new PaddedBufferedBlockCipher(new DESedeEngine())));
-        }
-    }
-
-    static public class ECIESwithAES
-        extends IESCipher
-    {
-        public ECIESwithAES()
-        {
-            super(new IESEngine(new ECDHBasicAgreement(),
-                new KDF2BytesGenerator(new SHA1Digest()),
-                new HMac(new SHA1Digest()),
-                new PaddedBufferedBlockCipher(new AESEngine())));
-        }
-    }
-
-    static public class ECIESwithDESedeCBC
-        extends IESCipher
-    {
-        public ECIESwithDESedeCBC()
-        {
-            super(new IESEngine(new ECDHBasicAgreement(),
-                new KDF2BytesGenerator(new SHA1Digest()),
-                new HMac(new SHA1Digest()),
-                new PaddedBufferedBlockCipher(new CBCBlockCipher(new DESedeEngine()))), 8);
-        }
-    }
-
-    static public class ECIESwithAESCBC
-        extends IESCipher
-    {
-        public ECIESwithAESCBC()
-        {
-            super(new IESEngine(new ECDHBasicAgreement(),
-                new KDF2BytesGenerator(new SHA1Digest()),
-                new HMac(new SHA1Digest()),
-                new PaddedBufferedBlockCipher(new CBCBlockCipher(new AESEngine()))), 16);
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/ec/KeyAgreementSpi.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/ec/KeyAgreementSpi.java
index 4ea57fe..3dbe004 100644
--- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/ec/KeyAgreementSpi.java
+++ b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/ec/KeyAgreementSpi.java
@@ -24,22 +24,28 @@ import org.bouncycastle.crypto.BasicAgreement;
 import org.bouncycastle.crypto.CipherParameters;
 import org.bouncycastle.crypto.DerivationFunction;
 import org.bouncycastle.crypto.agreement.ECDHBasicAgreement;
-import org.bouncycastle.crypto.agreement.ECDHCBasicAgreement;
-import org.bouncycastle.crypto.agreement.ECMQVBasicAgreement;
-import org.bouncycastle.crypto.agreement.kdf.DHKDFParameters;
-import org.bouncycastle.crypto.agreement.kdf.ECDHKEKGenerator;
+// BEGIN android-removed
+// import org.bouncycastle.crypto.agreement.ECDHCBasicAgreement;
+// import org.bouncycastle.crypto.agreement.ECMQVBasicAgreement;
+// import org.bouncycastle.crypto.agreement.kdf.DHKDFParameters;
+// import org.bouncycastle.crypto.agreement.kdf.ECDHKEKGenerator;
+// END android-removed
 import org.bouncycastle.crypto.digests.SHA1Digest;
 import org.bouncycastle.crypto.params.DESParameters;
 import org.bouncycastle.crypto.params.ECDomainParameters;
 import org.bouncycastle.crypto.params.ECPrivateKeyParameters;
 import org.bouncycastle.crypto.params.ECPublicKeyParameters;
-import org.bouncycastle.crypto.params.MQVPrivateParameters;
-import org.bouncycastle.crypto.params.MQVPublicParameters;
+// BEGIN android-removed
+// import org.bouncycastle.crypto.params.MQVPrivateParameters;
+// import org.bouncycastle.crypto.params.MQVPublicParameters;
+// END android-removed
 import org.bouncycastle.jcajce.provider.asymmetric.util.ECUtil;
 import org.bouncycastle.jce.interfaces.ECPrivateKey;
 import org.bouncycastle.jce.interfaces.ECPublicKey;
-import org.bouncycastle.jce.interfaces.MQVPrivateKey;
-import org.bouncycastle.jce.interfaces.MQVPublicKey;
+// BEGIN android-removed
+// import org.bouncycastle.jce.interfaces.MQVPrivateKey;
+// import org.bouncycastle.jce.interfaces.MQVPublicKey;
+// END android-removed
 import org.bouncycastle.util.Integers;
 import org.bouncycastle.util.Strings;
 
@@ -89,7 +95,9 @@ public class KeyAgreementSpi
     private BigInteger             result;
     private ECDomainParameters     parameters;
     private BasicAgreement         agreement;
-    private DerivationFunction     kdf;
+    // BEGIN android-removed
+    // private DerivationFunction     kdf;
+    // END android-removed
 
     private byte[] bigIntToBytes(
         BigInteger    r)
@@ -104,7 +112,9 @@ public class KeyAgreementSpi
     {
         this.kaAlgorithm = kaAlgorithm;
         this.agreement = agreement;
-        this.kdf = kdf;
+        // BEGIN android-removed
+        // this.kdf = kdf;
+        // END android-removed
     }
 
     protected Key engineDoPhase(
@@ -123,25 +133,27 @@ public class KeyAgreementSpi
         }
 
         CipherParameters pubKey;        
-        if (agreement instanceof ECMQVBasicAgreement)
-        {
-            if (!(key instanceof MQVPublicKey))
-            {
-                throw new InvalidKeyException(kaAlgorithm + " key agreement requires "
-                    + getSimpleName(MQVPublicKey.class) + " for doPhase");
-            }
-
-            MQVPublicKey mqvPubKey = (MQVPublicKey)key;
-            ECPublicKeyParameters staticKey = (ECPublicKeyParameters)
-                ECUtil.generatePublicKeyParameter(mqvPubKey.getStaticKey());
-            ECPublicKeyParameters ephemKey = (ECPublicKeyParameters)
-                ECUtil.generatePublicKeyParameter(mqvPubKey.getEphemeralKey());
-
-            pubKey = new MQVPublicParameters(staticKey, ephemKey);
-
-            // TODO Validate that all the keys are using the same parameters?
-        }
-        else
+        // BEGIN android-removed
+        // if (agreement instanceof ECMQVBasicAgreement)
+        // {
+        //     if (!(key instanceof MQVPublicKey))
+        //     {
+        //         throw new InvalidKeyException(kaAlgorithm + " key agreement requires "
+        //             + getSimpleName(MQVPublicKey.class) + " for doPhase");
+        //     }
+        //
+        //     MQVPublicKey mqvPubKey = (MQVPublicKey)key;
+        //     ECPublicKeyParameters staticKey = (ECPublicKeyParameters)
+        //         ECUtil.generatePublicKeyParameter(mqvPubKey.getStaticKey());
+        //     ECPublicKeyParameters ephemKey = (ECPublicKeyParameters)
+        //         ECUtil.generatePublicKeyParameter(mqvPubKey.getEphemeralKey());
+        //
+        //     pubKey = new MQVPublicParameters(staticKey, ephemKey);
+        //
+        //     // TODO Validate that all the keys are using the same parameters?
+        // }
+        // else
+        // END android-removed
         {
             if (!(key instanceof PublicKey))
             {
@@ -162,11 +174,13 @@ public class KeyAgreementSpi
     protected byte[] engineGenerateSecret()
         throws IllegalStateException
     {
-        if (kdf != null)
-        {
-            throw new UnsupportedOperationException(
-                "KDF can only be used when algorithm is known");
-        }
+        // BEGIN android-removed
+        // if (kdf != null)
+        // {
+        //     throw new UnsupportedOperationException(
+        //         "KDF can only be used when algorithm is known");
+        // }
+        // END android-removed
 
         return bigIntToBytes(result);
     }
@@ -201,23 +215,25 @@ public class KeyAgreementSpi
             oidAlgorithm = ((ASN1ObjectIdentifier)oids.get(algKey)).getId();
         }
 
-        if (kdf != null)
-        {
-            if (!algorithms.containsKey(oidAlgorithm))
-            {
-                throw new NoSuchAlgorithmException("unknown algorithm encountered: " + algorithm);
-            }
-            
-            int    keySize = ((Integer)algorithms.get(oidAlgorithm)).intValue();
-
-            DHKDFParameters params = new DHKDFParameters(new ASN1ObjectIdentifier(oidAlgorithm), keySize, secret);
-
-            byte[] keyBytes = new byte[keySize / 8];
-            kdf.init(params);
-            kdf.generateBytes(keyBytes, 0, keyBytes.length);
-            secret = keyBytes;
-        }
-        else
+        // BEGIN android-removed
+        // if (kdf != null)
+        // {
+        //     if (!algorithms.containsKey(oidAlgorithm))
+        //     {
+        //         throw new NoSuchAlgorithmException("unknown algorithm encountered: " + algorithm);
+        //     }
+        //     
+        //     int    keySize = ((Integer)algorithms.get(oidAlgorithm)).intValue();
+        //
+        //     DHKDFParameters params = new DHKDFParameters(new ASN1ObjectIdentifier(oidAlgorithm), keySize, secret);
+        //
+        //     byte[] keyBytes = new byte[keySize / 8];
+        //     kdf.init(params);
+        //     kdf.generateBytes(keyBytes, 0, keyBytes.length);
+        //     secret = keyBytes;
+        // }
+        // else
+        // END android-removed
         {
             if (algorithms.containsKey(oidAlgorithm))
             {
@@ -264,35 +280,37 @@ public class KeyAgreementSpi
     private void initFromKey(Key key)
         throws InvalidKeyException
     {
-        if (agreement instanceof ECMQVBasicAgreement)
-        {
-            if (!(key instanceof MQVPrivateKey))
-            {
-                throw new InvalidKeyException(kaAlgorithm + " key agreement requires "
-                    + getSimpleName(MQVPrivateKey.class) + " for initialisation");
-            }
-
-            MQVPrivateKey mqvPrivKey = (MQVPrivateKey)key;
-            ECPrivateKeyParameters staticPrivKey = (ECPrivateKeyParameters)
-                ECUtil.generatePrivateKeyParameter(mqvPrivKey.getStaticPrivateKey());
-            ECPrivateKeyParameters ephemPrivKey = (ECPrivateKeyParameters)
-                ECUtil.generatePrivateKeyParameter(mqvPrivKey.getEphemeralPrivateKey());
-
-            ECPublicKeyParameters ephemPubKey = null;
-            if (mqvPrivKey.getEphemeralPublicKey() != null)
-            {
-                ephemPubKey = (ECPublicKeyParameters)
-                    ECUtil.generatePublicKeyParameter(mqvPrivKey.getEphemeralPublicKey());
-            }
-
-            MQVPrivateParameters localParams = new MQVPrivateParameters(staticPrivKey, ephemPrivKey, ephemPubKey);
-            this.parameters = staticPrivKey.getParameters();
-
-            // TODO Validate that all the keys are using the same parameters?
-
-            agreement.init(localParams);
-        }
-        else
+        // BEGIN android-removed
+        // if (agreement instanceof ECMQVBasicAgreement)
+        // {
+        //     if (!(key instanceof MQVPrivateKey))
+        //     {
+        //         throw new InvalidKeyException(kaAlgorithm + " key agreement requires "
+        //             + getSimpleName(MQVPrivateKey.class) + " for initialisation");
+        //     }
+        //
+        //     MQVPrivateKey mqvPrivKey = (MQVPrivateKey)key;
+        //     ECPrivateKeyParameters staticPrivKey = (ECPrivateKeyParameters)
+        //         ECUtil.generatePrivateKeyParameter(mqvPrivKey.getStaticPrivateKey());
+        //     ECPrivateKeyParameters ephemPrivKey = (ECPrivateKeyParameters)
+        //         ECUtil.generatePrivateKeyParameter(mqvPrivKey.getEphemeralPrivateKey());
+        //
+        //     ECPublicKeyParameters ephemPubKey = null;
+        //     if (mqvPrivKey.getEphemeralPublicKey() != null)
+        //     {
+        //         ephemPubKey = (ECPublicKeyParameters)
+        //             ECUtil.generatePublicKeyParameter(mqvPrivKey.getEphemeralPublicKey());
+        //     }
+        //
+        //     MQVPrivateParameters localParams = new MQVPrivateParameters(staticPrivKey, ephemPrivKey, ephemPubKey);
+        //     this.parameters = staticPrivKey.getParameters();
+        //
+        //     // TODO Validate that all the keys are using the same parameters?
+        //
+        //     agreement.init(localParams);
+        // }
+        // else
+        // END android-removed
         {
             if (!(key instanceof PrivateKey))
             {
@@ -323,39 +341,41 @@ public class KeyAgreementSpi
         }
     }
 
-    public static class DHC
-        extends KeyAgreementSpi
-    {
-        public DHC()
-        {
-            super("ECDHC", new ECDHCBasicAgreement(), null);
-        }
-    }
-
-    public static class MQV
-        extends KeyAgreementSpi
-    {
-        public MQV()
-        {
-            super("ECMQV", new ECMQVBasicAgreement(), null);
-        }
-    }
-
-    public static class DHwithSHA1KDF
-        extends KeyAgreementSpi
-    {
-        public DHwithSHA1KDF()
-        {
-            super("ECDHwithSHA1KDF", new ECDHBasicAgreement(), new ECDHKEKGenerator(new SHA1Digest()));
-        }
-    }
-
-    public static class MQVwithSHA1KDF
-        extends KeyAgreementSpi
-    {
-        public MQVwithSHA1KDF()
-        {
-            super("ECMQVwithSHA1KDF", new ECMQVBasicAgreement(), new ECDHKEKGenerator(new SHA1Digest()));
-        }
-    }
+    // BEGIN android-removed
+    // public static class DHC
+    //     extends KeyAgreementSpi
+    // {
+    //     public DHC()
+    //     {
+    //         super("ECDHC", new ECDHCBasicAgreement(), null);
+    //     }
+    // }
+    //
+    // public static class MQV
+    //     extends KeyAgreementSpi
+    // {
+    //     public MQV()
+    //     {
+    //         super("ECMQV", new ECMQVBasicAgreement(), null);
+    //     }
+    // }
+    //
+    // public static class DHwithSHA1KDF
+    //     extends KeyAgreementSpi
+    // {
+    //     public DHwithSHA1KDF()
+    //     {
+    //         super("ECDHwithSHA1KDF", new ECDHBasicAgreement(), new ECDHKEKGenerator(new SHA1Digest()));
+    //     }
+    // }
+    //
+    // public static class MQVwithSHA1KDF
+    //     extends KeyAgreementSpi
+    // {
+    //     public MQVwithSHA1KDF()
+    //     {
+    //         super("ECMQVwithSHA1KDF", new ECMQVBasicAgreement(), new ECDHKEKGenerator(new SHA1Digest()));
+    //     }
+    // }
+    // END android-removed
 }
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/ec/KeyFactorySpi.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/ec/KeyFactorySpi.java
index 20555c2..5769bac 100644
--- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/ec/KeyFactorySpi.java
+++ b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/ec/KeyFactorySpi.java
@@ -201,14 +201,16 @@ public class KeyFactorySpi
         }
     }
 
-    public static class ECGOST3410
-        extends KeyFactorySpi
-    {
-        public ECGOST3410()
-        {
-            super("ECGOST3410", BouncyCastleProvider.CONFIGURATION);
-        }
-    }
+    // BEGIN android-removed
+    // public static class ECGOST3410
+    //     extends KeyFactorySpi
+    // {
+    //     public ECGOST3410()
+    //     {
+    //         super("ECGOST3410", BouncyCastleProvider.CONFIGURATION);
+    //     }
+    // }
+    // END android-removed
 
     public static class ECDH
         extends KeyFactorySpi
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/ec/KeyPairGeneratorSpi.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/ec/KeyPairGeneratorSpi.java
index ae9be26..d858518 100644
--- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/ec/KeyPairGeneratorSpi.java
+++ b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/ec/KeyPairGeneratorSpi.java
@@ -42,7 +42,9 @@ public abstract class KeyPairGeneratorSpi
         ECKeyGenerationParameters   param;
         ECKeyPairGenerator          engine = new ECKeyPairGenerator();
         Object                      ecParams = null;
-        int                         strength = 239;
+        // BEGIN android-changed
+        int                         strength = 256;
+        // BEGIN android-changed
         int                         certainty = 50;
         SecureRandom                random = new SecureRandom();
         boolean                     initialised = false;
@@ -84,7 +86,13 @@ public abstract class KeyPairGeneratorSpi
             SecureRandom    random)
         {
             this.strength = strength;
+            // BEGIN android-added
+            if (random != null) {
+            // END android-added
             this.random = random;
+            // BEGIN android-added
+            }
+            // END android-added
 
             ECGenParameterSpec ecParams = (ECGenParameterSpec)ecParameters.get(Integers.valueOf(strength));
             if (ecParams == null)
@@ -107,6 +115,11 @@ public abstract class KeyPairGeneratorSpi
             SecureRandom            random)
             throws InvalidAlgorithmParameterException
         {
+            // BEGIN android-added
+            if (random == null) {
+                random = this.random;
+            }
+            // END android-added
             if (params == null)
             {
                 ECParameterSpec implicitCA = configuration.getEcImplicitlyCa();
@@ -267,4 +280,4 @@ public abstract class KeyPairGeneratorSpi
             super("ECMQV", BouncyCastleProvider.CONFIGURATION);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/ec/SignatureSpi.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/ec/SignatureSpi.java
index 5e2bb4e..26811d1 100644
--- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/ec/SignatureSpi.java
+++ b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/ec/SignatureSpi.java
@@ -16,16 +16,23 @@ import org.bouncycastle.crypto.CipherParameters;
 import org.bouncycastle.crypto.DSA;
 import org.bouncycastle.crypto.Digest;
 import org.bouncycastle.crypto.digests.NullDigest;
-import org.bouncycastle.crypto.digests.RIPEMD160Digest;
-import org.bouncycastle.crypto.digests.SHA1Digest;
-import org.bouncycastle.crypto.digests.SHA224Digest;
-import org.bouncycastle.crypto.digests.SHA256Digest;
-import org.bouncycastle.crypto.digests.SHA384Digest;
-import org.bouncycastle.crypto.digests.SHA512Digest;
+// BEGIN android-added
+import org.bouncycastle.crypto.digests.AndroidDigestFactory;
+// END android-added
+// BEGIN android-removed
+// import org.bouncycastle.crypto.digests.RIPEMD160Digest;
+// import org.bouncycastle.crypto.digests.SHA1Digest;
+// import org.bouncycastle.crypto.digests.SHA224Digest;
+// import org.bouncycastle.crypto.digests.SHA256Digest;
+// import org.bouncycastle.crypto.digests.SHA384Digest;
+// import org.bouncycastle.crypto.digests.SHA512Digest;
+// END android-removed
 import org.bouncycastle.crypto.params.ParametersWithRandom;
 import org.bouncycastle.crypto.signers.ECDSASigner;
-import org.bouncycastle.crypto.signers.ECNRSigner;
-import org.bouncycastle.crypto.signers.HMacDSAKCalculator;
+// BEGIN android-removed
+// import org.bouncycastle.crypto.signers.ECNRSigner;
+// import org.bouncycastle.crypto.signers.HMacDSAKCalculator;
+// END android-removed
 import org.bouncycastle.jcajce.provider.asymmetric.util.DSABase;
 import org.bouncycastle.jcajce.provider.asymmetric.util.DSAEncoder;
 import org.bouncycastle.jcajce.provider.asymmetric.util.ECUtil;
@@ -70,18 +77,22 @@ public class SignatureSpi
     {
         public ecDSA()
         {
-            super(new SHA1Digest(), new ECDSASigner(), new StdDSAEncoder());
+            // BEGIN android-changed
+            super(AndroidDigestFactory.getSHA1(), new ECDSASigner(), new StdDSAEncoder());
+            // END android-changed
         }
     }
 
-    static public class ecDetDSA
-        extends SignatureSpi
-    {
-        public ecDetDSA()
-        {
-            super(new SHA1Digest(), new ECDSASigner(new HMacDSAKCalculator(new SHA1Digest())), new StdDSAEncoder());
-        }
-    }
+    // BEGIN android-removed
+    // static public class ecDetDSA
+    //     extends SignatureSpi
+    // {
+    //     public ecDetDSA()
+    //     {
+    //         super(new SHA1Digest(), new ECDSASigner(new HMacDSAKCalculator(new SHA1Digest())), new StdDSAEncoder());
+    //     }
+    // }
+    // END android-removed
 
     static public class ecDSAnone
         extends SignatureSpi
@@ -97,180 +108,196 @@ public class SignatureSpi
     {
         public ecDSA224()
         {
-            super(new SHA224Digest(), new ECDSASigner(), new StdDSAEncoder());
+            // BEGIN android-changed
+            super(AndroidDigestFactory.getSHA224(), new ECDSASigner(), new StdDSAEncoder());
+            // END android-changed
         }
     }
 
-    static public class ecDetDSA224
-        extends SignatureSpi
-    {
-        public ecDetDSA224()
-        {
-            super(new SHA224Digest(), new ECDSASigner(new HMacDSAKCalculator(new SHA224Digest())), new StdDSAEncoder());
-        }
-    }
+    // BEGIN android-removed
+    // static public class ecDetDSA224
+    //     extends SignatureSpi
+    // {
+    //     public ecDetDSA224()
+    //     {
+    //         super(new SHA224Digest(), new ECDSASigner(new HMacDSAKCalculator(new SHA224Digest())), new StdDSAEncoder());
+    //     }
+    // }
+    // END android-removed
 
     static public class ecDSA256
         extends SignatureSpi
     {
         public ecDSA256()
         {
-            super(new SHA256Digest(), new ECDSASigner(), new StdDSAEncoder());
+            // BEGIN android-changed
+            super(AndroidDigestFactory.getSHA256(), new ECDSASigner(), new StdDSAEncoder());
+            // END android-changed
         }
     }
 
-    static public class ecDetDSA256
-        extends SignatureSpi
-    {
-        public ecDetDSA256()
-        {
-            super(new SHA256Digest(), new ECDSASigner(new HMacDSAKCalculator(new SHA256Digest())), new StdDSAEncoder());
-        }
-    }
+    // BEGIN android-removed
+    // static public class ecDetDSA256
+    //     extends SignatureSpi
+    // {
+    //     public ecDetDSA256()
+    //     {
+    //         super(new SHA256Digest(), new ECDSASigner(new HMacDSAKCalculator(new SHA256Digest())), new StdDSAEncoder());
+    //     }
+    // }
+    // END android-removed
 
     static public class ecDSA384
         extends SignatureSpi
     {
         public ecDSA384()
         {
-            super(new SHA384Digest(), new ECDSASigner(), new StdDSAEncoder());
+            // BEGIN android-changed
+            super(AndroidDigestFactory.getSHA384(), new ECDSASigner(), new StdDSAEncoder());
+            // END android-changed
         }
     }
 
-    static public class ecDetDSA384
-        extends SignatureSpi
-    {
-        public ecDetDSA384()
-        {
-            super(new SHA384Digest(), new ECDSASigner(new HMacDSAKCalculator(new SHA384Digest())), new StdDSAEncoder());
-        }
-    }
+    // BEGIN android-removed
+    // static public class ecDetDSA384
+    //     extends SignatureSpi
+    // {
+    //     public ecDetDSA384()
+    //     {
+    //         super(new SHA384Digest(), new ECDSASigner(new HMacDSAKCalculator(new SHA384Digest())), new StdDSAEncoder());
+    //     }
+    // }
+    // END android-removed
 
     static public class ecDSA512
         extends SignatureSpi
     {
         public ecDSA512()
         {
-            super(new SHA512Digest(), new ECDSASigner(), new StdDSAEncoder());
-        }
-    }
-
-    static public class ecDetDSA512
-        extends SignatureSpi
-    {
-        public ecDetDSA512()
-        {
-            super(new SHA512Digest(), new ECDSASigner(new HMacDSAKCalculator(new SHA512Digest())), new StdDSAEncoder());
+            // BEGIN android-changed
+            super(AndroidDigestFactory.getSHA512(), new ECDSASigner(), new StdDSAEncoder());
+            // END android-changed
         }
     }
 
-    static public class ecDSARipeMD160
-        extends SignatureSpi
-    {
-        public ecDSARipeMD160()
-        {
-            super(new RIPEMD160Digest(), new ECDSASigner(), new StdDSAEncoder());
-        }
-    }
-
-    static public class ecNR
-        extends SignatureSpi
-    {
-        public ecNR()
-        {
-            super(new SHA1Digest(), new ECNRSigner(), new StdDSAEncoder());
-        }
-    }
-
-    static public class ecNR224
-        extends SignatureSpi
-    {
-        public ecNR224()
-        {
-            super(new SHA224Digest(), new ECNRSigner(), new StdDSAEncoder());
-        }
-    }
-
-    static public class ecNR256
-        extends SignatureSpi
-    {
-        public ecNR256()
-        {
-            super(new SHA256Digest(), new ECNRSigner(), new StdDSAEncoder());
-        }
-    }
-
-    static public class ecNR384
-        extends SignatureSpi
-    {
-        public ecNR384()
-        {
-            super(new SHA384Digest(), new ECNRSigner(), new StdDSAEncoder());
-        }
-    }
-
-    static public class ecNR512
-        extends SignatureSpi
-    {
-        public ecNR512()
-        {
-            super(new SHA512Digest(), new ECNRSigner(), new StdDSAEncoder());
-        }
-    }
-
-    static public class ecCVCDSA
-        extends SignatureSpi
-    {
-        public ecCVCDSA()
-        {
-            super(new SHA1Digest(), new ECDSASigner(), new PlainDSAEncoder());
-        }
-    }
-
-    static public class ecCVCDSA224
-        extends SignatureSpi
-    {
-        public ecCVCDSA224()
-        {
-            super(new SHA224Digest(), new ECDSASigner(), new PlainDSAEncoder());
-        }
-    }
-
-    static public class ecCVCDSA256
-        extends SignatureSpi
-    {
-        public ecCVCDSA256()
-        {
-            super(new SHA256Digest(), new ECDSASigner(), new PlainDSAEncoder());
-        }
-    }
-
-    static public class ecCVCDSA384
-        extends SignatureSpi
-    {
-        public ecCVCDSA384()
-        {
-            super(new SHA384Digest(), new ECDSASigner(), new PlainDSAEncoder());
-        }
-    }
-
-    static public class ecCVCDSA512
-        extends SignatureSpi
-    {
-        public ecCVCDSA512()
-        {
-            super(new SHA512Digest(), new ECDSASigner(), new PlainDSAEncoder());
-        }
-    }
-
-    static public class ecPlainDSARP160
-        extends SignatureSpi
-    {
-        public ecPlainDSARP160()
-        {
-            super(new RIPEMD160Digest(), new ECDSASigner(), new PlainDSAEncoder());
-        }
-    }
+    // BEGIN android-removed
+    // static public class ecDetDSA512
+    //     extends SignatureSpi
+    // {
+    //     public ecDetDSA512()
+    //     {
+    //         super(new SHA512Digest(), new ECDSASigner(new HMacDSAKCalculator(new SHA512Digest())), new StdDSAEncoder());
+    //     }
+    // }
+    //
+    // static public class ecDSARipeMD160
+    //     extends SignatureSpi
+    // {
+    //     public ecDSARipeMD160()
+    //     {
+    //         super(new RIPEMD160Digest(), new ECDSASigner(), new StdDSAEncoder());
+    //     }
+    // }
+    //
+    // static public class ecNR
+    //     extends SignatureSpi
+    // {
+    //     public ecNR()
+    //     {
+    //         super(new SHA1Digest(), new ECNRSigner(), new StdDSAEncoder());
+    //     }
+    // }
+    //
+    // static public class ecNR224
+    //     extends SignatureSpi
+    // {
+    //     public ecNR224()
+    //     {
+    //         super(new SHA224Digest(), new ECNRSigner(), new StdDSAEncoder());
+    //     }
+    // }
+    //
+    // static public class ecNR256
+    //     extends SignatureSpi
+    // {
+    //     public ecNR256()
+    //     {
+    //         super(new SHA256Digest(), new ECNRSigner(), new StdDSAEncoder());
+    //     }
+    // }
+    //
+    // static public class ecNR384
+    //     extends SignatureSpi
+    // {
+    //     public ecNR384()
+    //     {
+    //         super(new SHA384Digest(), new ECNRSigner(), new StdDSAEncoder());
+    //     }
+    // }
+    //
+    // static public class ecNR512
+    //     extends SignatureSpi
+    // {
+    //     public ecNR512()
+    //     {
+    //         super(new SHA512Digest(), new ECNRSigner(), new StdDSAEncoder());
+    //     }
+    // }
+    //
+    // static public class ecCVCDSA
+    //     extends SignatureSpi
+    // {
+    //     public ecCVCDSA()
+    //     {
+    //         super(new SHA1Digest(), new ECDSASigner(), new PlainDSAEncoder());
+    //     }
+    // }
+    //
+    // static public class ecCVCDSA224
+    //     extends SignatureSpi
+    // {
+    //     public ecCVCDSA224()
+    //     {
+    //         super(new SHA224Digest(), new ECDSASigner(), new PlainDSAEncoder());
+    //     }
+    // }
+    //
+    // static public class ecCVCDSA256
+    //     extends SignatureSpi
+    // {
+    //     public ecCVCDSA256()
+    //     {
+    //         super(new SHA256Digest(), new ECDSASigner(), new PlainDSAEncoder());
+    //     }
+    // }
+    //
+    // static public class ecCVCDSA384
+    //     extends SignatureSpi
+    // {
+    //     public ecCVCDSA384()
+    //     {
+    //         super(new SHA384Digest(), new ECDSASigner(), new PlainDSAEncoder());
+    //     }
+    // }
+    //
+    // static public class ecCVCDSA512
+    //     extends SignatureSpi
+    // {
+    //     public ecCVCDSA512()
+    //     {
+    //         super(new SHA512Digest(), new ECDSASigner(), new PlainDSAEncoder());
+    //     }
+    // }
+    //
+    // static public class ecPlainDSARP160
+    //     extends SignatureSpi
+    // {
+    //     public ecPlainDSARP160()
+    //     {
+    //         super(new RIPEMD160Digest(), new ECDSASigner(), new PlainDSAEncoder());
+    //     }
+    // }
+    // END android-removed
 
     private static class StdDSAEncoder
         implements DSAEncoder
@@ -302,66 +329,68 @@ public class SignatureSpi
         }
     }
 
-    private static class PlainDSAEncoder
-        implements DSAEncoder
-    {
-        public byte[] encode(
-            BigInteger r,
-            BigInteger s)
-            throws IOException
-        {
-            byte[] first = makeUnsigned(r);
-            byte[] second = makeUnsigned(s);
-            byte[] res;
-
-            if (first.length > second.length)
-            {
-                res = new byte[first.length * 2];
-            }
-            else
-            {
-                res = new byte[second.length * 2];
-            }
-
-            System.arraycopy(first, 0, res, res.length / 2 - first.length, first.length);
-            System.arraycopy(second, 0, res, res.length - second.length, second.length);
-
-            return res;
-        }
-
-
-        private byte[] makeUnsigned(BigInteger val)
-        {
-            byte[] res = val.toByteArray();
-
-            if (res[0] == 0)
-            {
-                byte[] tmp = new byte[res.length - 1];
-
-                System.arraycopy(res, 1, tmp, 0, tmp.length);
-
-                return tmp;
-            }
-
-            return res;
-        }
-
-        public BigInteger[] decode(
-            byte[] encoding)
-            throws IOException
-        {
-            BigInteger[] sig = new BigInteger[2];
-
-            byte[] first = new byte[encoding.length / 2];
-            byte[] second = new byte[encoding.length / 2];
-
-            System.arraycopy(encoding, 0, first, 0, first.length);
-            System.arraycopy(encoding, first.length, second, 0, second.length);
-
-            sig[0] = new BigInteger(1, first);
-            sig[1] = new BigInteger(1, second);
-
-            return sig;
-        }
-    }
-}
\ No newline at end of file
+    // BEGIN android-removed
+    // private static class PlainDSAEncoder
+    //     implements DSAEncoder
+    // {
+    //     public byte[] encode(
+    //         BigInteger r,
+    //         BigInteger s)
+    //         throws IOException
+    //     {
+    //         byte[] first = makeUnsigned(r);
+    //         byte[] second = makeUnsigned(s);
+    //         byte[] res;
+    //
+    //         if (first.length > second.length)
+    //         {
+    //             res = new byte[first.length * 2];
+    //         }
+    //         else
+    //         {
+    //             res = new byte[second.length * 2];
+    //         }
+    //
+    //         System.arraycopy(first, 0, res, res.length / 2 - first.length, first.length);
+    //         System.arraycopy(second, 0, res, res.length - second.length, second.length);
+    //
+    //         return res;
+    //     }
+    //
+    //
+    //     private byte[] makeUnsigned(BigInteger val)
+    //     {
+    //         byte[] res = val.toByteArray();
+    //
+    //         if (res[0] == 0)
+    //         {
+    //             byte[] tmp = new byte[res.length - 1];
+    //
+    //             System.arraycopy(res, 1, tmp, 0, tmp.length);
+    //
+    //             return tmp;
+    //         }
+    //
+    //         return res;
+    //     }
+    //
+    //     public BigInteger[] decode(
+    //         byte[] encoding)
+    //         throws IOException
+    //     {
+    //         BigInteger[] sig = new BigInteger[2];
+    //
+    //         byte[] first = new byte[encoding.length / 2];
+    //         byte[] second = new byte[encoding.length / 2];
+    //
+    //         System.arraycopy(encoding, 0, first, 0, first.length);
+    //         System.arraycopy(encoding, first.length, second, 0, second.length);
+    //
+    //         sig[0] = new BigInteger(1, first);
+    //         sig[1] = new BigInteger(1, second);
+    //
+    //         return sig;
+    //     }
+    // }
+    // END android-removed
+}
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/ecgost/BCECGOST3410PrivateKey.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/ecgost/BCECGOST3410PrivateKey.java
deleted file mode 100644
index 4c046fe..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/ecgost/BCECGOST3410PrivateKey.java
+++ /dev/null
@@ -1,545 +0,0 @@
-package org.bouncycastle.jcajce.provider.asymmetric.ecgost;
-
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.math.BigInteger;
-import java.security.interfaces.ECPrivateKey;
-import java.security.spec.ECParameterSpec;
-import java.security.spec.ECPoint;
-import java.security.spec.ECPrivateKeySpec;
-import java.security.spec.EllipticCurve;
-import java.util.Enumeration;
-
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1Encoding;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DERBitString;
-import org.bouncycastle.asn1.DERNull;
-import org.bouncycastle.asn1.DEROctetString;
-import org.bouncycastle.asn1.cryptopro.CryptoProObjectIdentifiers;
-import org.bouncycastle.asn1.cryptopro.ECGOST3410NamedCurves;
-import org.bouncycastle.asn1.cryptopro.GOST3410PublicKeyAlgParameters;
-import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.bouncycastle.asn1.x9.X962Parameters;
-import org.bouncycastle.asn1.x9.X9ECParameters;
-import org.bouncycastle.crypto.params.ECDomainParameters;
-import org.bouncycastle.crypto.params.ECPrivateKeyParameters;
-import org.bouncycastle.jcajce.provider.asymmetric.util.EC5Util;
-import org.bouncycastle.jcajce.provider.asymmetric.util.ECUtil;
-import org.bouncycastle.jcajce.provider.asymmetric.util.PKCS12BagAttributeCarrierImpl;
-import org.bouncycastle.jce.ECGOST3410NamedCurveTable;
-import org.bouncycastle.jce.interfaces.ECPointEncoder;
-import org.bouncycastle.jce.interfaces.PKCS12BagAttributeCarrier;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.jce.spec.ECNamedCurveParameterSpec;
-import org.bouncycastle.jce.spec.ECNamedCurveSpec;
-import org.bouncycastle.math.ec.ECCurve;
-
-public class BCECGOST3410PrivateKey
-    implements ECPrivateKey, org.bouncycastle.jce.interfaces.ECPrivateKey, PKCS12BagAttributeCarrier, ECPointEncoder
-{
-    static final long serialVersionUID = 7245981689601667138L;
-
-    private String algorithm = "ECGOST3410";
-    private boolean withCompression;
-
-    private transient GOST3410PublicKeyAlgParameters gostParams;
-    private transient BigInteger d;
-    private transient ECParameterSpec ecSpec;
-    private transient DERBitString publicKey;
-    private transient PKCS12BagAttributeCarrierImpl attrCarrier = new PKCS12BagAttributeCarrierImpl();
-
-    protected BCECGOST3410PrivateKey()
-    {
-    }
-
-    public BCECGOST3410PrivateKey(
-        ECPrivateKey key)
-    {
-        this.d = key.getS();
-        this.algorithm = key.getAlgorithm();
-        this.ecSpec = key.getParams();
-    }
-
-    public BCECGOST3410PrivateKey(
-        org.bouncycastle.jce.spec.ECPrivateKeySpec spec)
-    {
-        this.d = spec.getD();
-
-        if (spec.getParams() != null) // can be null if implicitlyCA
-        {
-            ECCurve curve = spec.getParams().getCurve();
-            EllipticCurve ellipticCurve;
-
-            ellipticCurve = EC5Util.convertCurve(curve, spec.getParams().getSeed());
-
-            this.ecSpec = EC5Util.convertSpec(ellipticCurve, spec.getParams());
-        }
-        else
-        {
-            this.ecSpec = null;
-        }
-    }
-
-
-    public BCECGOST3410PrivateKey(
-        ECPrivateKeySpec spec)
-    {
-        this.d = spec.getS();
-        this.ecSpec = spec.getParams();
-    }
-
-    public BCECGOST3410PrivateKey(
-        BCECGOST3410PrivateKey key)
-    {
-        this.d = key.d;
-        this.ecSpec = key.ecSpec;
-        this.withCompression = key.withCompression;
-        this.attrCarrier = key.attrCarrier;
-        this.publicKey = key.publicKey;
-        this.gostParams = key.gostParams;
-    }
-
-    public BCECGOST3410PrivateKey(
-        String algorithm,
-        ECPrivateKeyParameters params,
-        BCECGOST3410PublicKey pubKey,
-        ECParameterSpec spec)
-    {
-        ECDomainParameters dp = params.getParameters();
-
-        this.algorithm = algorithm;
-        this.d = params.getD();
-
-        if (spec == null)
-        {
-            EllipticCurve ellipticCurve = EC5Util.convertCurve(dp.getCurve(), dp.getSeed());
-
-            this.ecSpec = new ECParameterSpec(
-                ellipticCurve,
-                new ECPoint(
-                    dp.getG().getAffineXCoord().toBigInteger(),
-                    dp.getG().getAffineYCoord().toBigInteger()),
-                dp.getN(),
-                dp.getH().intValue());
-        }
-        else
-        {
-            this.ecSpec = spec;
-        }
-
-        this.gostParams = pubKey.getGostParams();
-
-        publicKey = getPublicKeyDetails(pubKey);
-    }
-
-    public BCECGOST3410PrivateKey(
-        String algorithm,
-        ECPrivateKeyParameters params,
-        BCECGOST3410PublicKey pubKey,
-        org.bouncycastle.jce.spec.ECParameterSpec spec)
-    {
-        ECDomainParameters dp = params.getParameters();
-
-        this.algorithm = algorithm;
-        this.d = params.getD();
-
-        if (spec == null)
-        {
-            EllipticCurve ellipticCurve = EC5Util.convertCurve(dp.getCurve(), dp.getSeed());
-
-            this.ecSpec = new ECParameterSpec(
-                ellipticCurve,
-                new ECPoint(
-                    dp.getG().getAffineXCoord().toBigInteger(),
-                    dp.getG().getAffineYCoord().toBigInteger()),
-                dp.getN(),
-                dp.getH().intValue());
-        }
-        else
-        {
-            EllipticCurve ellipticCurve = EC5Util.convertCurve(spec.getCurve(), spec.getSeed());
-
-            this.ecSpec = new ECParameterSpec(
-                ellipticCurve,
-                new ECPoint(
-                    spec.getG().getAffineXCoord().toBigInteger(),
-                    spec.getG().getAffineYCoord().toBigInteger()),
-                spec.getN(),
-                spec.getH().intValue());
-        }
-
-        this.gostParams = pubKey.getGostParams();
-
-        publicKey = getPublicKeyDetails(pubKey);
-    }
-
-    public BCECGOST3410PrivateKey(
-        String algorithm,
-        ECPrivateKeyParameters params)
-    {
-        this.algorithm = algorithm;
-        this.d = params.getD();
-        this.ecSpec = null;
-    }
-
-    BCECGOST3410PrivateKey(
-        PrivateKeyInfo info)
-        throws IOException
-    {
-        populateFromPrivKeyInfo(info);
-    }
-
-    private void populateFromPrivKeyInfo(PrivateKeyInfo info)
-        throws IOException
-    {
-        ASN1Primitive p = info.getPrivateKeyAlgorithm().getParameters().toASN1Primitive();
-
-        if (p instanceof ASN1Sequence && (ASN1Sequence.getInstance(p).size() == 2 || ASN1Sequence.getInstance(p).size() == 3))
-        {
-            gostParams = GOST3410PublicKeyAlgParameters.getInstance(info.getPrivateKeyAlgorithm().getParameters());
-
-            ECNamedCurveParameterSpec spec = ECGOST3410NamedCurveTable.getParameterSpec(ECGOST3410NamedCurves.getName(gostParams.getPublicKeyParamSet()));
-
-            ECCurve curve = spec.getCurve();
-            EllipticCurve ellipticCurve = EC5Util.convertCurve(curve, spec.getSeed());
-
-            ecSpec = new ECNamedCurveSpec(
-                ECGOST3410NamedCurves.getName(gostParams.getPublicKeyParamSet()),
-                ellipticCurve,
-                new ECPoint(
-                    spec.getG().getAffineXCoord().toBigInteger(),
-                    spec.getG().getAffineYCoord().toBigInteger()),
-                spec.getN(), spec.getH());
-
-            ASN1Encodable privKey = info.parsePrivateKey();
-
-            byte[] encVal = ASN1OctetString.getInstance(privKey).getOctets();
-            byte[] dVal = new byte[encVal.length];
-
-            for (int i = 0; i != encVal.length; i++)
-            {
-                dVal[i] = encVal[encVal.length - 1 - i];
-            }
-
-            this.d = new BigInteger(1, dVal);
-        }
-        else
-        {
-            // for backwards compatibility
-            X962Parameters params = X962Parameters.getInstance(info.getPrivateKeyAlgorithm().getParameters());
-
-            if (params.isNamedCurve())
-            {
-                ASN1ObjectIdentifier oid = ASN1ObjectIdentifier.getInstance(params.getParameters());
-                X9ECParameters ecP = ECUtil.getNamedCurveByOid(oid);
-
-                if (ecP == null) // GOST Curve
-                {
-                    ECDomainParameters gParam = ECGOST3410NamedCurves.getByOID(oid);
-                    EllipticCurve ellipticCurve = EC5Util.convertCurve(gParam.getCurve(), gParam.getSeed());
-
-                    ecSpec = new ECNamedCurveSpec(
-                        ECGOST3410NamedCurves.getName(oid),
-                        ellipticCurve,
-                        new ECPoint(
-                            gParam.getG().getAffineXCoord().toBigInteger(),
-                            gParam.getG().getAffineYCoord().toBigInteger()),
-                        gParam.getN(),
-                        gParam.getH());
-                }
-                else
-                {
-                    EllipticCurve ellipticCurve = EC5Util.convertCurve(ecP.getCurve(), ecP.getSeed());
-
-                    ecSpec = new ECNamedCurveSpec(
-                        ECUtil.getCurveName(oid),
-                        ellipticCurve,
-                        new ECPoint(
-                            ecP.getG().getAffineXCoord().toBigInteger(),
-                            ecP.getG().getAffineYCoord().toBigInteger()),
-                        ecP.getN(),
-                        ecP.getH());
-                }
-            }
-            else if (params.isImplicitlyCA())
-            {
-                ecSpec = null;
-            }
-            else
-            {
-                X9ECParameters ecP = X9ECParameters.getInstance(params.getParameters());
-                EllipticCurve ellipticCurve = EC5Util.convertCurve(ecP.getCurve(), ecP.getSeed());
-
-                this.ecSpec = new ECParameterSpec(
-                    ellipticCurve,
-                    new ECPoint(
-                        ecP.getG().getAffineXCoord().toBigInteger(),
-                        ecP.getG().getAffineYCoord().toBigInteger()),
-                    ecP.getN(),
-                    ecP.getH().intValue());
-            }
-
-            ASN1Encodable privKey = info.parsePrivateKey();
-            if (privKey instanceof ASN1Integer)
-            {
-                ASN1Integer derD = ASN1Integer.getInstance(privKey);
-
-                this.d = derD.getValue();
-            }
-            else
-            {
-                org.bouncycastle.asn1.sec.ECPrivateKey ec = org.bouncycastle.asn1.sec.ECPrivateKey.getInstance(privKey);
-
-                this.d = ec.getKey();
-                this.publicKey = ec.getPublicKey();
-            }
-        }
-    }
-
-    public String getAlgorithm()
-    {
-        return algorithm;
-    }
-
-    /**
-     * return the encoding format we produce in getEncoded().
-     *
-     * @return the string "PKCS#8"
-     */
-    public String getFormat()
-    {
-        return "PKCS#8";
-    }
-
-    /**
-     * Return a PKCS8 representation of the key. The sequence returned
-     * represents a full PrivateKeyInfo object.
-     *
-     * @return a PKCS8 representation of the key.
-     */
-    public byte[] getEncoded()
-    {
-        if (gostParams != null)
-        {
-            byte[] encKey = new byte[32];
-
-            extractBytes(encKey, 0, this.getS());
-
-            try
-            {
-                PrivateKeyInfo info = new PrivateKeyInfo(new AlgorithmIdentifier(CryptoProObjectIdentifiers.gostR3410_2001, gostParams), new DEROctetString(encKey));
-
-                return info.getEncoded(ASN1Encoding.DER);
-            }
-            catch (IOException e)
-            {
-                return null;
-            }
-        }
-        else
-        {
-            X962Parameters params;
-            int orderBitLength;
-
-            if (ecSpec instanceof ECNamedCurveSpec)
-            {
-                ASN1ObjectIdentifier curveOid = ECUtil.getNamedCurveOid(((ECNamedCurveSpec)ecSpec).getName());
-                if (curveOid == null)  // guess it's the OID
-                {
-                    curveOid = new ASN1ObjectIdentifier(((ECNamedCurveSpec)ecSpec).getName());
-                }
-                params = new X962Parameters(curveOid);
-                orderBitLength = ECUtil.getOrderBitLength(ecSpec.getOrder(), this.getS());
-            }
-            else if (ecSpec == null)
-            {
-                params = new X962Parameters(DERNull.INSTANCE);
-                orderBitLength = ECUtil.getOrderBitLength(null, this.getS());
-            }
-            else
-            {
-                ECCurve curve = EC5Util.convertCurve(ecSpec.getCurve());
-
-                X9ECParameters ecP = new X9ECParameters(
-                    curve,
-                    EC5Util.convertPoint(curve, ecSpec.getGenerator(), withCompression),
-                    ecSpec.getOrder(),
-                    BigInteger.valueOf(ecSpec.getCofactor()),
-                    ecSpec.getCurve().getSeed());
-
-                params = new X962Parameters(ecP);
-                orderBitLength = ECUtil.getOrderBitLength(ecSpec.getOrder(), this.getS());
-            }
-
-            PrivateKeyInfo info;
-            org.bouncycastle.asn1.sec.ECPrivateKey keyStructure;
-
-            if (publicKey != null)
-            {
-                keyStructure = new org.bouncycastle.asn1.sec.ECPrivateKey(orderBitLength, this.getS(), publicKey, params);
-            }
-            else
-            {
-                keyStructure = new org.bouncycastle.asn1.sec.ECPrivateKey(orderBitLength, this.getS(), params);
-            }
-
-            try
-            {
-                info = new PrivateKeyInfo(new AlgorithmIdentifier(CryptoProObjectIdentifiers.gostR3410_2001, params.toASN1Primitive()), keyStructure.toASN1Primitive());
-
-                return info.getEncoded(ASN1Encoding.DER);
-            }
-            catch (IOException e)
-            {
-                return null;
-            }
-        }
-    }
-
-    private void extractBytes(byte[] encKey, int offSet, BigInteger bI)
-    {
-        byte[] val = bI.toByteArray();
-        if (val.length < 32)
-        {
-            byte[] tmp = new byte[32];
-            System.arraycopy(val, 0, tmp, tmp.length - val.length, val.length);
-            val = tmp;
-        }
-
-        for (int i = 0; i != 32; i++)
-        {
-            encKey[offSet + i] = val[val.length - 1 - i];
-        }
-    }
-
-    public ECParameterSpec getParams()
-    {
-        return ecSpec;
-    }
-
-    public org.bouncycastle.jce.spec.ECParameterSpec getParameters()
-    {
-        if (ecSpec == null)
-        {
-            return null;
-        }
-
-        return EC5Util.convertSpec(ecSpec, withCompression);
-    }
-
-    org.bouncycastle.jce.spec.ECParameterSpec engineGetSpec()
-    {
-        if (ecSpec != null)
-        {
-            return EC5Util.convertSpec(ecSpec, withCompression);
-        }
-
-        return BouncyCastleProvider.CONFIGURATION.getEcImplicitlyCa();
-    }
-
-    public BigInteger getS()
-    {
-        return d;
-    }
-
-    public BigInteger getD()
-    {
-        return d;
-    }
-
-    public void setBagAttribute(
-        ASN1ObjectIdentifier oid,
-        ASN1Encodable attribute)
-    {
-        attrCarrier.setBagAttribute(oid, attribute);
-    }
-
-    public ASN1Encodable getBagAttribute(
-        ASN1ObjectIdentifier oid)
-    {
-        return attrCarrier.getBagAttribute(oid);
-    }
-
-    public Enumeration getBagAttributeKeys()
-    {
-        return attrCarrier.getBagAttributeKeys();
-    }
-
-    public void setPointFormat(String style)
-    {
-        withCompression = !("UNCOMPRESSED".equalsIgnoreCase(style));
-    }
-
-    public boolean equals(Object o)
-    {
-        if (!(o instanceof BCECGOST3410PrivateKey))
-        {
-            return false;
-        }
-
-        BCECGOST3410PrivateKey other = (BCECGOST3410PrivateKey)o;
-
-        return getD().equals(other.getD()) && (engineGetSpec().equals(other.engineGetSpec()));
-    }
-
-    public int hashCode()
-    {
-        return getD().hashCode() ^ engineGetSpec().hashCode();
-    }
-
-    public String toString()
-    {
-        StringBuffer buf = new StringBuffer();
-        String nl = System.getProperty("line.separator");
-
-        buf.append("EC Private Key").append(nl);
-        buf.append("             S: ").append(this.d.toString(16)).append(nl);
-
-        return buf.toString();
-
-    }
-
-    private DERBitString getPublicKeyDetails(BCECGOST3410PublicKey pub)
-    {
-        try
-        {
-            SubjectPublicKeyInfo info = SubjectPublicKeyInfo.getInstance(ASN1Primitive.fromByteArray(pub.getEncoded()));
-
-            return info.getPublicKeyData();
-        }
-        catch (IOException e)
-        {   // should never happen
-            return null;
-        }
-    }
-
-    private void readObject(
-        ObjectInputStream in)
-        throws IOException, ClassNotFoundException
-    {
-        in.defaultReadObject();
-
-        byte[] enc = (byte[])in.readObject();
-
-        populateFromPrivKeyInfo(PrivateKeyInfo.getInstance(ASN1Primitive.fromByteArray(enc)));
-
-        this.attrCarrier = new PKCS12BagAttributeCarrierImpl();
-    }
-
-    private void writeObject(
-        ObjectOutputStream out)
-        throws IOException
-    {
-        out.defaultWriteObject();
-
-        out.writeObject(this.getEncoded());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/ecgost/BCECGOST3410PublicKey.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/ecgost/BCECGOST3410PublicKey.java
deleted file mode 100644
index 1240a0f..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/ecgost/BCECGOST3410PublicKey.java
+++ /dev/null
@@ -1,400 +0,0 @@
-package org.bouncycastle.jcajce.provider.asymmetric.ecgost;
-
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.math.BigInteger;
-import java.security.interfaces.ECPublicKey;
-import java.security.spec.ECParameterSpec;
-import java.security.spec.ECPoint;
-import java.security.spec.ECPublicKeySpec;
-import java.security.spec.EllipticCurve;
-
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.DERBitString;
-import org.bouncycastle.asn1.DEROctetString;
-import org.bouncycastle.asn1.cryptopro.CryptoProObjectIdentifiers;
-import org.bouncycastle.asn1.cryptopro.ECGOST3410NamedCurves;
-import org.bouncycastle.asn1.cryptopro.GOST3410PublicKeyAlgParameters;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.bouncycastle.asn1.x9.X962Parameters;
-import org.bouncycastle.asn1.x9.X9ECParameters;
-import org.bouncycastle.crypto.params.ECDomainParameters;
-import org.bouncycastle.crypto.params.ECPublicKeyParameters;
-import org.bouncycastle.jcajce.provider.asymmetric.util.EC5Util;
-import org.bouncycastle.jcajce.provider.asymmetric.util.KeyUtil;
-import org.bouncycastle.jce.ECGOST3410NamedCurveTable;
-import org.bouncycastle.jce.interfaces.ECPointEncoder;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.jce.spec.ECNamedCurveParameterSpec;
-import org.bouncycastle.jce.spec.ECNamedCurveSpec;
-import org.bouncycastle.math.ec.ECCurve;
-import org.bouncycastle.math.ec.custom.sec.SecP256K1Point;
-import org.bouncycastle.math.ec.custom.sec.SecP256R1Point;
-
-public class BCECGOST3410PublicKey
-    implements ECPublicKey, org.bouncycastle.jce.interfaces.ECPublicKey, ECPointEncoder
-{
-    static final long serialVersionUID = 7026240464295649314L;
-
-    private String algorithm = "ECGOST3410";
-    private boolean withCompression;
-
-    private transient org.bouncycastle.math.ec.ECPoint q;
-    private transient ECParameterSpec ecSpec;
-    private transient GOST3410PublicKeyAlgParameters gostParams;
-
-    public BCECGOST3410PublicKey(
-        BCECGOST3410PublicKey key)
-    {
-        this.q = key.q;
-        this.ecSpec = key.ecSpec;
-        this.withCompression = key.withCompression;
-        this.gostParams = key.gostParams;
-    }
-
-    public BCECGOST3410PublicKey(
-        ECPublicKeySpec spec)
-    {
-        this.ecSpec = spec.getParams();
-        this.q = EC5Util.convertPoint(ecSpec, spec.getW(), false);
-    }
-
-    public BCECGOST3410PublicKey(
-        org.bouncycastle.jce.spec.ECPublicKeySpec spec)
-    {
-        this.q = spec.getQ();
-
-        if (spec.getParams() != null) // can be null if implictlyCa
-        {
-            ECCurve curve = spec.getParams().getCurve();
-            EllipticCurve ellipticCurve = EC5Util.convertCurve(curve, spec.getParams().getSeed());
-
-            this.ecSpec = EC5Util.convertSpec(ellipticCurve, spec.getParams());
-        }
-        else
-        {
-            if (q.getCurve() == null)
-            {
-                org.bouncycastle.jce.spec.ECParameterSpec s = BouncyCastleProvider.CONFIGURATION.getEcImplicitlyCa();
-
-                q = s.getCurve().createPoint(q.getAffineXCoord().toBigInteger(), q.getAffineYCoord().toBigInteger());
-            }
-            this.ecSpec = null;
-        }
-    }
-
-    public BCECGOST3410PublicKey(
-        String algorithm,
-        ECPublicKeyParameters params,
-        ECParameterSpec spec)
-    {
-        ECDomainParameters dp = params.getParameters();
-
-        this.algorithm = algorithm;
-        this.q = params.getQ();
-
-        if (spec == null)
-        {
-            EllipticCurve ellipticCurve = EC5Util.convertCurve(dp.getCurve(), dp.getSeed());
-
-            this.ecSpec = createSpec(ellipticCurve, dp);
-        }
-        else
-        {
-            this.ecSpec = spec;
-        }
-    }
-
-    public BCECGOST3410PublicKey(
-        String algorithm,
-        ECPublicKeyParameters params,
-        org.bouncycastle.jce.spec.ECParameterSpec spec)
-    {
-        ECDomainParameters dp = params.getParameters();
-
-        this.algorithm = algorithm;
-        this.q = params.getQ();
-
-        if (spec == null)
-        {
-            EllipticCurve ellipticCurve = EC5Util.convertCurve(dp.getCurve(), dp.getSeed());
-
-            this.ecSpec = createSpec(ellipticCurve, dp);
-        }
-        else
-        {
-            EllipticCurve ellipticCurve = EC5Util.convertCurve(spec.getCurve(), spec.getSeed());
-
-            this.ecSpec = EC5Util.convertSpec(ellipticCurve, spec);
-        }
-    }
-
-    /*
-     * called for implicitCA
-     */
-    public BCECGOST3410PublicKey(
-        String algorithm,
-        ECPublicKeyParameters params)
-    {
-        this.algorithm = algorithm;
-        this.q = params.getQ();
-        this.ecSpec = null;
-    }
-
-    private ECParameterSpec createSpec(EllipticCurve ellipticCurve, ECDomainParameters dp)
-    {
-        return new ECParameterSpec(
-            ellipticCurve,
-            new ECPoint(
-                dp.getG().getAffineXCoord().toBigInteger(),
-                dp.getG().getAffineYCoord().toBigInteger()),
-            dp.getN(),
-            dp.getH().intValue());
-    }
-
-    public BCECGOST3410PublicKey(
-        ECPublicKey key)
-    {
-        this.algorithm = key.getAlgorithm();
-        this.ecSpec = key.getParams();
-        this.q = EC5Util.convertPoint(this.ecSpec, key.getW(), false);
-    }
-
-    BCECGOST3410PublicKey(
-        SubjectPublicKeyInfo info)
-    {
-        populateFromPubKeyInfo(info);
-    }
-
-    private void populateFromPubKeyInfo(SubjectPublicKeyInfo info)
-    {
-        DERBitString bits = info.getPublicKeyData();
-        ASN1OctetString key;
-        this.algorithm = "ECGOST3410";
-
-        try
-        {
-            key = (ASN1OctetString)ASN1Primitive.fromByteArray(bits.getBytes());
-        }
-        catch (IOException ex)
-        {
-            throw new IllegalArgumentException("error recovering public key");
-        }
-
-        byte[] keyEnc = key.getOctets();
-        byte[] x = new byte[32];
-        byte[] y = new byte[32];
-
-        for (int i = 0; i != x.length; i++)
-        {
-            x[i] = keyEnc[32 - 1 - i];
-        }
-
-        for (int i = 0; i != y.length; i++)
-        {
-            y[i] = keyEnc[64 - 1 - i];
-        }
-
-        gostParams = GOST3410PublicKeyAlgParameters.getInstance(info.getAlgorithm().getParameters());
-
-        ECNamedCurveParameterSpec spec = ECGOST3410NamedCurveTable.getParameterSpec(ECGOST3410NamedCurves.getName(gostParams.getPublicKeyParamSet()));
-
-        ECCurve curve = spec.getCurve();
-        EllipticCurve ellipticCurve = EC5Util.convertCurve(curve, spec.getSeed());
-
-        this.q = curve.createPoint(new BigInteger(1, x), new BigInteger(1, y));
-
-        ecSpec = new ECNamedCurveSpec(
-            ECGOST3410NamedCurves.getName(gostParams.getPublicKeyParamSet()),
-            ellipticCurve,
-            new ECPoint(
-                spec.getG().getAffineXCoord().toBigInteger(),
-                spec.getG().getAffineYCoord().toBigInteger()),
-            spec.getN(), spec.getH());
-    }
-
-    public String getAlgorithm()
-    {
-        return algorithm;
-    }
-
-    public String getFormat()
-    {
-        return "X.509";
-    }
-
-    public byte[] getEncoded()
-    {
-        ASN1Encodable params;
-        SubjectPublicKeyInfo info;
-
-        if (gostParams != null)
-        {
-            params = gostParams;
-        }
-        else
-        {
-            if (ecSpec instanceof ECNamedCurveSpec)
-            {
-                params = new GOST3410PublicKeyAlgParameters(
-                    ECGOST3410NamedCurves.getOID(((ECNamedCurveSpec)ecSpec).getName()),
-                    CryptoProObjectIdentifiers.gostR3411_94_CryptoProParamSet);
-            }
-            else
-            {   // strictly speaking this may not be applicable...
-                ECCurve curve = EC5Util.convertCurve(ecSpec.getCurve());
-
-                X9ECParameters ecP = new X9ECParameters(
-                    curve,
-                    EC5Util.convertPoint(curve, ecSpec.getGenerator(), withCompression),
-                    ecSpec.getOrder(),
-                    BigInteger.valueOf(ecSpec.getCofactor()),
-                    ecSpec.getCurve().getSeed());
-
-                params = new X962Parameters(ecP);
-            }
-        }
-
-        BigInteger bX = this.q.getAffineXCoord().toBigInteger();
-        BigInteger bY = this.q.getAffineYCoord().toBigInteger();
-        byte[] encKey = new byte[64];
-
-        extractBytes(encKey, 0, bX);
-        extractBytes(encKey, 32, bY);
-
-        try
-        {
-            info = new SubjectPublicKeyInfo(new AlgorithmIdentifier(CryptoProObjectIdentifiers.gostR3410_2001, params), new DEROctetString(encKey));
-        }
-        catch (IOException e)
-        {
-            return null;
-        }
-
-        return KeyUtil.getEncodedSubjectPublicKeyInfo(info);
-    }
-
-    private void extractBytes(byte[] encKey, int offSet, BigInteger bI)
-    {
-        byte[] val = bI.toByteArray();
-        if (val.length < 32)
-        {
-            byte[] tmp = new byte[32];
-            System.arraycopy(val, 0, tmp, tmp.length - val.length, val.length);
-            val = tmp;
-        }
-
-        for (int i = 0; i != 32; i++)
-        {
-            encKey[offSet + i] = val[val.length - 1 - i];
-        }
-    }
-
-    public ECParameterSpec getParams()
-    {
-        return ecSpec;
-    }
-
-    public org.bouncycastle.jce.spec.ECParameterSpec getParameters()
-    {
-        if (ecSpec == null)     // implictlyCA
-        {
-            return null;
-        }
-
-        return EC5Util.convertSpec(ecSpec, withCompression);
-    }
-
-    public ECPoint getW()
-    {
-        return new ECPoint(q.getAffineXCoord().toBigInteger(), q.getAffineYCoord().toBigInteger());
-    }
-
-    public org.bouncycastle.math.ec.ECPoint getQ()
-    {
-        if (ecSpec == null)
-        {
-            return q.getDetachedPoint();
-        }
-
-        return q;
-    }
-
-    public org.bouncycastle.math.ec.ECPoint engineGetQ()
-    {
-        return q;
-    }
-
-    org.bouncycastle.jce.spec.ECParameterSpec engineGetSpec()
-    {
-        if (ecSpec != null)
-        {
-            return EC5Util.convertSpec(ecSpec, withCompression);
-        }
-
-        return BouncyCastleProvider.CONFIGURATION.getEcImplicitlyCa();
-    }
-
-    public String toString()
-    {
-        StringBuffer buf = new StringBuffer();
-        String nl = System.getProperty("line.separator");
-
-        buf.append("EC Public Key").append(nl);
-        buf.append("            X: ").append(this.q.getAffineXCoord().toBigInteger().toString(16)).append(nl);
-        buf.append("            Y: ").append(this.q.getAffineYCoord().toBigInteger().toString(16)).append(nl);
-
-        return buf.toString();
-    }
-
-    public void setPointFormat(String style)
-    {
-        withCompression = !("UNCOMPRESSED".equalsIgnoreCase(style));
-    }
-
-    public boolean equals(Object o)
-    {
-        if (!(o instanceof BCECGOST3410PublicKey))
-        {
-            return false;
-        }
-
-        BCECGOST3410PublicKey other = (BCECGOST3410PublicKey)o;
-
-        return engineGetQ().equals(other.engineGetQ()) && (engineGetSpec().equals(other.engineGetSpec()));
-    }
-
-    public int hashCode()
-    {
-        return engineGetQ().hashCode() ^ engineGetSpec().hashCode();
-    }
-
-    private void readObject(
-        ObjectInputStream in)
-        throws IOException, ClassNotFoundException
-    {
-        in.defaultReadObject();
-
-        byte[] enc = (byte[])in.readObject();
-
-        populateFromPubKeyInfo(SubjectPublicKeyInfo.getInstance(ASN1Primitive.fromByteArray(enc)));
-    }
-
-    private void writeObject(
-        ObjectOutputStream out)
-        throws IOException
-    {
-        out.defaultWriteObject();
-
-        out.writeObject(this.getEncoded());
-    }
-
-    public GOST3410PublicKeyAlgParameters getGostParams()
-    {
-        return gostParams;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/ecgost/KeyFactorySpi.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/ecgost/KeyFactorySpi.java
deleted file mode 100644
index 61a34be..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/ecgost/KeyFactorySpi.java
+++ /dev/null
@@ -1,166 +0,0 @@
-package org.bouncycastle.jcajce.provider.asymmetric.ecgost;
-
-import java.io.IOException;
-import java.security.InvalidKeyException;
-import java.security.Key;
-import java.security.PrivateKey;
-import java.security.PublicKey;
-import java.security.interfaces.ECPrivateKey;
-import java.security.interfaces.ECPublicKey;
-import java.security.spec.InvalidKeySpecException;
-import java.security.spec.KeySpec;
-
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.cryptopro.CryptoProObjectIdentifiers;
-import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.bouncycastle.jcajce.provider.asymmetric.util.EC5Util;
-import org.bouncycastle.jcajce.provider.asymmetric.util.BaseKeyFactorySpi;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.jce.spec.ECParameterSpec;
-import org.bouncycastle.jce.spec.ECPrivateKeySpec;
-import org.bouncycastle.jce.spec.ECPublicKeySpec;
-
-public class KeyFactorySpi
-    extends BaseKeyFactorySpi
-{
-    public KeyFactorySpi()
-    {
-    }
-
-    protected KeySpec engineGetKeySpec(
-        Key key,
-        Class spec)
-        throws InvalidKeySpecException
-    {
-       if (spec.isAssignableFrom(java.security.spec.ECPublicKeySpec.class) && key instanceof ECPublicKey)
-       {
-           ECPublicKey k = (ECPublicKey)key;
-           if (k.getParams() != null)
-           {
-               return new java.security.spec.ECPublicKeySpec(k.getW(), k.getParams());
-           }
-           else
-           {
-               ECParameterSpec implicitSpec = BouncyCastleProvider.CONFIGURATION.getEcImplicitlyCa();
-
-               return new java.security.spec.ECPublicKeySpec(k.getW(), EC5Util.convertSpec(EC5Util.convertCurve(implicitSpec.getCurve(), implicitSpec.getSeed()), implicitSpec));
-           }
-       }
-       else if (spec.isAssignableFrom(java.security.spec.ECPrivateKeySpec.class) && key instanceof ECPrivateKey)
-       {
-           ECPrivateKey k = (ECPrivateKey)key;
-
-           if (k.getParams() != null)
-           {
-               return new java.security.spec.ECPrivateKeySpec(k.getS(), k.getParams());
-           }
-           else
-           {
-               ECParameterSpec implicitSpec = BouncyCastleProvider.CONFIGURATION.getEcImplicitlyCa();
-
-               return new java.security.spec.ECPrivateKeySpec(k.getS(), EC5Util.convertSpec(EC5Util.convertCurve(implicitSpec.getCurve(), implicitSpec.getSeed()), implicitSpec));
-           }
-       }
-       else if (spec.isAssignableFrom(org.bouncycastle.jce.spec.ECPublicKeySpec.class) && key instanceof ECPublicKey)
-       {
-           ECPublicKey k = (ECPublicKey)key;
-           if (k.getParams() != null)
-           {
-               return new org.bouncycastle.jce.spec.ECPublicKeySpec(EC5Util.convertPoint(k.getParams(), k.getW(), false), EC5Util.convertSpec(k.getParams(), false));
-           }
-           else
-           {
-               ECParameterSpec implicitSpec = BouncyCastleProvider.CONFIGURATION.getEcImplicitlyCa();
-
-               return new org.bouncycastle.jce.spec.ECPublicKeySpec(EC5Util.convertPoint(k.getParams(), k.getW(), false), implicitSpec);
-           }
-       }
-       else if (spec.isAssignableFrom(org.bouncycastle.jce.spec.ECPrivateKeySpec.class) && key instanceof ECPrivateKey)
-       {
-           ECPrivateKey k = (ECPrivateKey)key;
-
-           if (k.getParams() != null)
-           {
-               return new org.bouncycastle.jce.spec.ECPrivateKeySpec(k.getS(), EC5Util.convertSpec(k.getParams(), false));
-           }
-           else
-           {
-               ECParameterSpec implicitSpec = BouncyCastleProvider.CONFIGURATION.getEcImplicitlyCa();
-
-               return new org.bouncycastle.jce.spec.ECPrivateKeySpec(k.getS(), implicitSpec);
-           }
-       }
-
-       return super.engineGetKeySpec(key, spec);
-    }
-
-    protected Key engineTranslateKey(
-        Key key)
-        throws InvalidKeyException
-    {
-        throw new InvalidKeyException("key type unknown");
-    }
-
-    protected PrivateKey engineGeneratePrivate(
-        KeySpec keySpec)
-        throws InvalidKeySpecException
-    {
-        if (keySpec instanceof ECPrivateKeySpec)
-        {
-            return new BCECGOST3410PrivateKey((ECPrivateKeySpec)keySpec);
-        }
-        else if (keySpec instanceof java.security.spec.ECPrivateKeySpec)
-        {
-            return new BCECGOST3410PrivateKey((java.security.spec.ECPrivateKeySpec)keySpec);
-        }
-
-        return super.engineGeneratePrivate(keySpec);
-    }
-
-    protected PublicKey engineGeneratePublic(
-        KeySpec keySpec)
-        throws InvalidKeySpecException
-    {
-        if (keySpec instanceof ECPublicKeySpec)
-        {
-            return new BCECGOST3410PublicKey((ECPublicKeySpec)keySpec);
-        }
-        else if (keySpec instanceof java.security.spec.ECPublicKeySpec)
-        {
-            return new BCECGOST3410PublicKey((java.security.spec.ECPublicKeySpec)keySpec);
-        }
-
-        return super.engineGeneratePublic(keySpec);
-    }
-
-    public PrivateKey generatePrivate(PrivateKeyInfo keyInfo)
-        throws IOException
-    {
-        ASN1ObjectIdentifier algOid = keyInfo.getPrivateKeyAlgorithm().getAlgorithm();
-
-        if (algOid.equals(CryptoProObjectIdentifiers.gostR3410_2001))
-        {
-            return new BCECGOST3410PrivateKey(keyInfo);
-        }
-        else
-        {
-            throw new IOException("algorithm identifier " + algOid + " in key not recognised");
-        }
-    }
-
-    public PublicKey generatePublic(SubjectPublicKeyInfo keyInfo)
-        throws IOException
-    {
-        ASN1ObjectIdentifier algOid = keyInfo.getAlgorithm().getAlgorithm();
-
-        if (algOid.equals(CryptoProObjectIdentifiers.gostR3410_2001))
-        {
-            return new BCECGOST3410PublicKey(keyInfo);
-        }
-        else
-        {
-            throw new IOException("algorithm identifier " + algOid + " in key not recognised");
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/ecgost/KeyPairGeneratorSpi.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/ecgost/KeyPairGeneratorSpi.java
deleted file mode 100644
index efd74b4..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/ecgost/KeyPairGeneratorSpi.java
+++ /dev/null
@@ -1,186 +0,0 @@
-package org.bouncycastle.jcajce.provider.asymmetric.ecgost;
-
-import java.math.BigInteger;
-import java.security.InvalidAlgorithmParameterException;
-import java.security.InvalidParameterException;
-import java.security.KeyPair;
-import java.security.SecureRandom;
-import java.security.spec.AlgorithmParameterSpec;
-import java.security.spec.ECGenParameterSpec;
-
-import org.bouncycastle.asn1.cryptopro.ECGOST3410NamedCurves;
-import org.bouncycastle.crypto.AsymmetricCipherKeyPair;
-import org.bouncycastle.crypto.generators.ECKeyPairGenerator;
-import org.bouncycastle.crypto.params.ECDomainParameters;
-import org.bouncycastle.crypto.params.ECKeyGenerationParameters;
-import org.bouncycastle.crypto.params.ECPrivateKeyParameters;
-import org.bouncycastle.crypto.params.ECPublicKeyParameters;
-import org.bouncycastle.jcajce.provider.asymmetric.util.EC5Util;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.jce.spec.ECNamedCurveGenParameterSpec;
-import org.bouncycastle.jce.spec.ECNamedCurveSpec;
-import org.bouncycastle.jce.spec.ECParameterSpec;
-import org.bouncycastle.math.ec.ECCurve;
-import org.bouncycastle.math.ec.ECPoint;
-
-public class KeyPairGeneratorSpi
-    extends java.security.KeyPairGenerator
-{
-    Object ecParams = null;
-    ECKeyPairGenerator engine = new ECKeyPairGenerator();
-
-    String algorithm = "ECGOST3410";
-    ECKeyGenerationParameters param;
-    int strength = 239;
-    SecureRandom random = null;
-    boolean initialised = false;
-
-    public KeyPairGeneratorSpi()
-    {
-        super("ECGOST3410");
-    }
-
-    public void initialize(
-        int strength,
-        SecureRandom random)
-    {
-        this.strength = strength;
-        this.random = random;
-
-        if (ecParams != null)
-        {
-            try
-            {
-                initialize((ECGenParameterSpec)ecParams, random);
-            }
-            catch (InvalidAlgorithmParameterException e)
-            {
-                throw new InvalidParameterException("key size not configurable.");
-            }
-        }
-        else
-        {
-            throw new InvalidParameterException("unknown key size.");
-        }
-    }
-
-    public void initialize(
-        AlgorithmParameterSpec params,
-        SecureRandom random)
-        throws InvalidAlgorithmParameterException
-    {
-        if (params instanceof ECParameterSpec)
-        {
-            ECParameterSpec p = (ECParameterSpec)params;
-            this.ecParams = params;
-
-            param = new ECKeyGenerationParameters(new ECDomainParameters(p.getCurve(), p.getG(), p.getN()), random);
-
-            engine.init(param);
-            initialised = true;
-        }
-        else if (params instanceof java.security.spec.ECParameterSpec)
-        {
-            java.security.spec.ECParameterSpec p = (java.security.spec.ECParameterSpec)params;
-            this.ecParams = params;
-
-            ECCurve curve = EC5Util.convertCurve(p.getCurve());
-            ECPoint g = EC5Util.convertPoint(curve, p.getGenerator(), false);
-
-            param = new ECKeyGenerationParameters(new ECDomainParameters(curve, g, p.getOrder(), BigInteger.valueOf(p.getCofactor())), random);
-
-            engine.init(param);
-            initialised = true;
-        }
-        else if (params instanceof ECGenParameterSpec || params instanceof ECNamedCurveGenParameterSpec)
-        {
-            String curveName;
-
-            if (params instanceof ECGenParameterSpec)
-            {
-                curveName = ((ECGenParameterSpec)params).getName();
-            }
-            else
-            {
-                curveName = ((ECNamedCurveGenParameterSpec)params).getName();
-            }
-
-            ECDomainParameters ecP = ECGOST3410NamedCurves.getByName(curveName);
-            if (ecP == null)
-            {
-                throw new InvalidAlgorithmParameterException("unknown curve name: " + curveName);
-            }
-
-            this.ecParams = new ECNamedCurveSpec(
-                curveName,
-                ecP.getCurve(),
-                ecP.getG(),
-                ecP.getN(),
-                ecP.getH(),
-                ecP.getSeed());
-
-            java.security.spec.ECParameterSpec p = (java.security.spec.ECParameterSpec)ecParams;
-
-            ECCurve curve = EC5Util.convertCurve(p.getCurve());
-            ECPoint g = EC5Util.convertPoint(curve, p.getGenerator(), false);
-
-            param = new ECKeyGenerationParameters(new ECDomainParameters(curve, g, p.getOrder(), BigInteger.valueOf(p.getCofactor())), random);
-
-            engine.init(param);
-            initialised = true;
-        }
-        else if (params == null && BouncyCastleProvider.CONFIGURATION.getEcImplicitlyCa() != null)
-        {
-            ECParameterSpec p = BouncyCastleProvider.CONFIGURATION.getEcImplicitlyCa();
-            this.ecParams = params;
-
-            param = new ECKeyGenerationParameters(new ECDomainParameters(p.getCurve(), p.getG(), p.getN()), random);
-
-            engine.init(param);
-            initialised = true;
-        }
-        else if (params == null && BouncyCastleProvider.CONFIGURATION.getEcImplicitlyCa() == null)
-        {
-            throw new InvalidAlgorithmParameterException("null parameter passed but no implicitCA set");
-        }
-        else
-        {
-            throw new InvalidAlgorithmParameterException("parameter object not a ECParameterSpec: " + params.getClass().getName());
-        }
-    }
-
-    public KeyPair generateKeyPair()
-    {
-        if (!initialised)
-        {
-            throw new IllegalStateException("EC Key Pair Generator not initialised");
-        }
-
-        AsymmetricCipherKeyPair pair = engine.generateKeyPair();
-        ECPublicKeyParameters pub = (ECPublicKeyParameters)pair.getPublic();
-        ECPrivateKeyParameters priv = (ECPrivateKeyParameters)pair.getPrivate();
-
-        if (ecParams instanceof ECParameterSpec)
-        {
-            ECParameterSpec p = (ECParameterSpec)ecParams;
-
-            BCECGOST3410PublicKey pubKey = new BCECGOST3410PublicKey(algorithm, pub, p);
-            return new KeyPair(pubKey,
-                new BCECGOST3410PrivateKey(algorithm, priv, pubKey, p));
-        }
-        else if (ecParams == null)
-        {
-            return new KeyPair(new BCECGOST3410PublicKey(algorithm, pub),
-                new BCECGOST3410PrivateKey(algorithm, priv));
-        }
-        else
-        {
-            java.security.spec.ECParameterSpec p = (java.security.spec.ECParameterSpec)ecParams;
-
-            BCECGOST3410PublicKey pubKey = new BCECGOST3410PublicKey(algorithm, pub, p);
-
-            return new KeyPair(pubKey, new BCECGOST3410PrivateKey(algorithm, priv, pubKey, p));
-        }
-    }
-}
-
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/ecgost/SignatureSpi.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/ecgost/SignatureSpi.java
deleted file mode 100644
index 407dda5..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/ecgost/SignatureSpi.java
+++ /dev/null
@@ -1,211 +0,0 @@
-package org.bouncycastle.jcajce.provider.asymmetric.ecgost;
-
-import java.math.BigInteger;
-import java.security.InvalidKeyException;
-import java.security.PrivateKey;
-import java.security.PublicKey;
-import java.security.SignatureException;
-import java.security.spec.AlgorithmParameterSpec;
-
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.bouncycastle.asn1.x509.X509ObjectIdentifiers;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.DSA;
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.digests.GOST3411Digest;
-import org.bouncycastle.crypto.params.ParametersWithRandom;
-import org.bouncycastle.crypto.signers.ECGOST3410Signer;
-import org.bouncycastle.jcajce.provider.asymmetric.util.ECUtil;
-import org.bouncycastle.jce.interfaces.ECKey;
-import org.bouncycastle.jce.interfaces.ECPublicKey;
-import org.bouncycastle.jce.interfaces.GOST3410Key;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.jcajce.provider.asymmetric.util.GOST3410Util;
-
-public class SignatureSpi
-    extends java.security.SignatureSpi
-    implements PKCSObjectIdentifiers, X509ObjectIdentifiers
-{
-    private Digest                  digest;
-    private DSA                     signer;
-
-    public SignatureSpi()
-    {
-        this.digest = new GOST3411Digest();
-        this.signer = new ECGOST3410Signer();
-    }
-
-    protected void engineInitVerify(
-        PublicKey   publicKey)
-        throws InvalidKeyException
-    {
-        CipherParameters    param;
-
-        if (publicKey instanceof ECPublicKey)
-        {
-            param = ECUtil.generatePublicKeyParameter(publicKey);
-        }
-        else if (publicKey instanceof GOST3410Key)
-        {
-            param = GOST3410Util.generatePublicKeyParameter(publicKey);
-        }
-        else
-        {
-            try
-            {
-                byte[]  bytes = publicKey.getEncoded();
-
-                publicKey = BouncyCastleProvider.getPublicKey(SubjectPublicKeyInfo.getInstance(bytes));
-
-                param = ECUtil.generatePublicKeyParameter(publicKey);
-            }
-            catch (Exception e)
-            {
-                throw new InvalidKeyException("can't recognise key type in DSA based signer");
-            }
-        }
-
-        digest.reset();
-        signer.init(false, param);
-    }
-
-    protected void engineInitSign(
-        PrivateKey  privateKey)
-        throws InvalidKeyException
-    {
-        CipherParameters    param;
-
-        if (privateKey instanceof ECKey)
-        {
-            param = ECUtil.generatePrivateKeyParameter(privateKey);
-        }
-        else
-        {
-            param = GOST3410Util.generatePrivateKeyParameter(privateKey);
-        }
-
-        digest.reset();
-
-        if (appRandom != null)
-        {
-            signer.init(true, new ParametersWithRandom(param, appRandom));
-        }
-        else
-        {
-            signer.init(true, param);
-        }
-    }
-
-    protected void engineUpdate(
-        byte    b)
-        throws SignatureException
-    {
-        digest.update(b);
-    }
-
-    protected void engineUpdate(
-        byte[]  b,
-        int     off,
-        int     len) 
-        throws SignatureException
-    {
-        digest.update(b, off, len);
-    }
-
-    protected byte[] engineSign()
-        throws SignatureException
-    {
-        byte[]  hash = new byte[digest.getDigestSize()];
-
-        digest.doFinal(hash, 0);
-
-        try
-        {
-            byte[]          sigBytes = new byte[64];
-            BigInteger[]    sig = signer.generateSignature(hash);
-            byte[]          r = sig[0].toByteArray();
-            byte[]          s = sig[1].toByteArray();
-
-            if (s[0] != 0)
-            {
-                System.arraycopy(s, 0, sigBytes, 32 - s.length, s.length);
-            }
-            else
-            {
-                System.arraycopy(s, 1, sigBytes, 32 - (s.length - 1), s.length - 1);
-            }
-            
-            if (r[0] != 0)
-            {
-                System.arraycopy(r, 0, sigBytes, 64 - r.length, r.length);
-            }
-            else
-            {
-                System.arraycopy(r, 1, sigBytes, 64 - (r.length - 1), r.length - 1);
-            }
-
-            return sigBytes;
-        }
-        catch (Exception e)
-        {
-            throw new SignatureException(e.toString());
-        }
-    }
-    
-    protected boolean engineVerify(
-        byte[]  sigBytes) 
-        throws SignatureException
-    {
-        byte[]  hash = new byte[digest.getDigestSize()];
-
-        digest.doFinal(hash, 0);
-
-        BigInteger[]    sig;
-
-        try
-        {
-            byte[] r = new byte[32]; 
-            byte[] s = new byte[32];
-
-            System.arraycopy(sigBytes, 0, s, 0, 32);
-
-            System.arraycopy(sigBytes, 32, r, 0, 32);
-            
-            sig = new BigInteger[2];
-            sig[0] = new BigInteger(1, r);
-            sig[1] = new BigInteger(1, s);
-        }
-        catch (Exception e)
-        {
-            throw new SignatureException("error decoding signature bytes.");
-        }
-
-        return signer.verifySignature(hash, sig[0], sig[1]);
-    }
-
-    protected void engineSetParameter(
-        AlgorithmParameterSpec params)
-    {
-        throw new UnsupportedOperationException("engineSetParameter unsupported");
-    }
-
-    /**
-     * @deprecated replaced with <a href = "#engineSetParameter(java.security.spec.AlgorithmParameterSpec)">
-     */
-    protected void engineSetParameter(
-        String  param,
-        Object  value)
-    {
-        throw new UnsupportedOperationException("engineSetParameter unsupported");
-    }
-
-    /**
-     * @deprecated
-     */
-    protected Object engineGetParameter(
-        String      param)
-    {
-        throw new UnsupportedOperationException("engineSetParameter unsupported");
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/elgamal/AlgorithmParameterGeneratorSpi.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/elgamal/AlgorithmParameterGeneratorSpi.java
deleted file mode 100644
index 6097c3c..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/elgamal/AlgorithmParameterGeneratorSpi.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package org.bouncycastle.jcajce.provider.asymmetric.elgamal;
-
-import java.security.AlgorithmParameters;
-import java.security.InvalidAlgorithmParameterException;
-import java.security.SecureRandom;
-import java.security.spec.AlgorithmParameterSpec;
-
-import javax.crypto.spec.DHGenParameterSpec;
-import javax.crypto.spec.DHParameterSpec;
-
-import org.bouncycastle.crypto.generators.ElGamalParametersGenerator;
-import org.bouncycastle.crypto.params.ElGamalParameters;
-import org.bouncycastle.jcajce.provider.asymmetric.util.BaseAlgorithmParameterGeneratorSpi;
-
-public class AlgorithmParameterGeneratorSpi
-    extends BaseAlgorithmParameterGeneratorSpi
-{
-    protected SecureRandom random;
-    protected int strength = 1024;
-
-    private int l = 0;
-
-    protected void engineInit(
-        int strength,
-        SecureRandom random)
-    {
-        this.strength = strength;
-        this.random = random;
-    }
-
-    protected void engineInit(
-        AlgorithmParameterSpec genParamSpec,
-        SecureRandom random)
-        throws InvalidAlgorithmParameterException
-    {
-        if (!(genParamSpec instanceof DHGenParameterSpec))
-        {
-            throw new InvalidAlgorithmParameterException("DH parameter generator requires a DHGenParameterSpec for initialisation");
-        }
-        DHGenParameterSpec spec = (DHGenParameterSpec)genParamSpec;
-
-        this.strength = spec.getPrimeSize();
-        this.l = spec.getExponentSize();
-        this.random = random;
-    }
-
-    protected AlgorithmParameters engineGenerateParameters()
-    {
-        ElGamalParametersGenerator pGen = new ElGamalParametersGenerator();
-
-        if (random != null)
-        {
-            pGen.init(strength, 20, random);
-        }
-        else
-        {
-            pGen.init(strength, 20, new SecureRandom());
-        }
-
-        ElGamalParameters p = pGen.generateParameters();
-
-        AlgorithmParameters params;
-
-        try
-        {
-            params = createParametersInstance("ElGamal");
-            params.init(new DHParameterSpec(p.getP(), p.getG(), l));
-        }
-        catch (Exception e)
-        {
-            throw new RuntimeException(e.getMessage());
-        }
-
-        return params;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/elgamal/AlgorithmParametersSpi.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/elgamal/AlgorithmParametersSpi.java
deleted file mode 100644
index 3253fbb..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/elgamal/AlgorithmParametersSpi.java
+++ /dev/null
@@ -1,129 +0,0 @@
-package org.bouncycastle.jcajce.provider.asymmetric.elgamal;
-
-import java.io.IOException;
-import java.security.spec.AlgorithmParameterSpec;
-import java.security.spec.InvalidParameterSpecException;
-
-import javax.crypto.spec.DHParameterSpec;
-
-import org.bouncycastle.asn1.ASN1Encoding;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.oiw.ElGamalParameter;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseAlgorithmParameters;
-import org.bouncycastle.jce.spec.ElGamalParameterSpec;
-
-public class AlgorithmParametersSpi
-    extends BaseAlgorithmParameters
-{
-    ElGamalParameterSpec currentSpec;
-
-    /**
-     * Return the X.509 ASN.1 structure ElGamalParameter.
-     * <pre>
-     *  ElGamalParameter ::= SEQUENCE {
-     *                   prime INTEGER, -- p
-     *                   base INTEGER, -- g}
-     * </pre>
-     */
-    protected byte[] engineGetEncoded()
-    {
-        ElGamalParameter elP = new ElGamalParameter(currentSpec.getP(), currentSpec.getG());
-
-        try
-        {
-            return elP.getEncoded(ASN1Encoding.DER);
-        }
-        catch (IOException e)
-        {
-            throw new RuntimeException("Error encoding ElGamalParameters");
-        }
-    }
-
-    protected byte[] engineGetEncoded(
-        String format)
-    {
-        if (isASN1FormatString(format) || format.equalsIgnoreCase("X.509"))
-        {
-            return engineGetEncoded();
-        }
-
-        return null;
-    }
-
-    protected AlgorithmParameterSpec localEngineGetParameterSpec(
-        Class paramSpec)
-        throws InvalidParameterSpecException
-    {
-        if (paramSpec == ElGamalParameterSpec.class)
-        {
-            return currentSpec;
-        }
-        else if (paramSpec == DHParameterSpec.class)
-        {
-            return new DHParameterSpec(currentSpec.getP(), currentSpec.getG());
-        }
-
-        throw new InvalidParameterSpecException("unknown parameter spec passed to ElGamal parameters object.");
-    }
-
-    protected void engineInit(
-        AlgorithmParameterSpec paramSpec)
-        throws InvalidParameterSpecException
-    {
-        if (!(paramSpec instanceof ElGamalParameterSpec) && !(paramSpec instanceof DHParameterSpec))
-        {
-            throw new InvalidParameterSpecException("DHParameterSpec required to initialise a ElGamal algorithm parameters object");
-        }
-
-        if (paramSpec instanceof ElGamalParameterSpec)
-        {
-            this.currentSpec = (ElGamalParameterSpec)paramSpec;
-        }
-        else
-        {
-            DHParameterSpec s = (DHParameterSpec)paramSpec;
-
-            this.currentSpec = new ElGamalParameterSpec(s.getP(), s.getG());
-        }
-    }
-
-    protected void engineInit(
-        byte[] params)
-        throws IOException
-    {
-        try
-        {
-            ElGamalParameter elP = ElGamalParameter.getInstance(ASN1Primitive.fromByteArray(params));
-
-            currentSpec = new ElGamalParameterSpec(elP.getP(), elP.getG());
-        }
-        catch (ClassCastException e)
-        {
-            throw new IOException("Not a valid ElGamal Parameter encoding.");
-        }
-        catch (ArrayIndexOutOfBoundsException e)
-        {
-            throw new IOException("Not a valid ElGamal Parameter encoding.");
-        }
-    }
-
-    protected void engineInit(
-        byte[] params,
-        String format)
-        throws IOException
-    {
-        if (isASN1FormatString(format) || format.equalsIgnoreCase("X.509"))
-        {
-            engineInit(params);
-        }
-        else
-        {
-            throw new IOException("Unknown parameter format " + format);
-        }
-    }
-
-    protected String engineToString()
-    {
-        return "ElGamal Parameters";
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/elgamal/BCElGamalPrivateKey.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/elgamal/BCElGamalPrivateKey.java
deleted file mode 100644
index f0f83fa..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/elgamal/BCElGamalPrivateKey.java
+++ /dev/null
@@ -1,197 +0,0 @@
-package org.bouncycastle.jcajce.provider.asymmetric.elgamal;
-
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.math.BigInteger;
-import java.util.Enumeration;
-
-import javax.crypto.interfaces.DHPrivateKey;
-import javax.crypto.spec.DHParameterSpec;
-import javax.crypto.spec.DHPrivateKeySpec;
-
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1Encoding;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.oiw.ElGamalParameter;
-import org.bouncycastle.asn1.oiw.OIWObjectIdentifiers;
-import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.crypto.params.ElGamalPrivateKeyParameters;
-import org.bouncycastle.jcajce.provider.asymmetric.util.PKCS12BagAttributeCarrierImpl;
-import org.bouncycastle.jce.interfaces.ElGamalPrivateKey;
-import org.bouncycastle.jce.interfaces.PKCS12BagAttributeCarrier;
-import org.bouncycastle.jce.spec.ElGamalParameterSpec;
-import org.bouncycastle.jce.spec.ElGamalPrivateKeySpec;
-
-public class BCElGamalPrivateKey
-    implements ElGamalPrivateKey, DHPrivateKey, PKCS12BagAttributeCarrier
-{
-    static final long serialVersionUID = 4819350091141529678L;
-        
-    private BigInteger      x;
-
-    private transient ElGamalParameterSpec   elSpec;
-    private transient PKCS12BagAttributeCarrierImpl attrCarrier = new PKCS12BagAttributeCarrierImpl();
-
-    protected BCElGamalPrivateKey()
-    {
-    }
-
-    BCElGamalPrivateKey(
-        ElGamalPrivateKey key)
-    {
-        this.x = key.getX();
-        this.elSpec = key.getParameters();
-    }
-
-    BCElGamalPrivateKey(
-        DHPrivateKey key)
-    {
-        this.x = key.getX();
-        this.elSpec = new ElGamalParameterSpec(key.getParams().getP(), key.getParams().getG());
-    }
-    
-    BCElGamalPrivateKey(
-        ElGamalPrivateKeySpec spec)
-    {
-        this.x = spec.getX();
-        this.elSpec = new ElGamalParameterSpec(spec.getParams().getP(), spec.getParams().getG());
-    }
-
-    BCElGamalPrivateKey(
-        DHPrivateKeySpec spec)
-    {
-        this.x = spec.getX();
-        this.elSpec = new ElGamalParameterSpec(spec.getP(), spec.getG());
-    }
-    
-    BCElGamalPrivateKey(
-        PrivateKeyInfo info)
-        throws IOException
-    {
-        ElGamalParameter     params = ElGamalParameter.getInstance(info.getPrivateKeyAlgorithm().getParameters());
-        ASN1Integer      derX = ASN1Integer.getInstance(info.parsePrivateKey());
-
-        this.x = derX.getValue();
-        this.elSpec = new ElGamalParameterSpec(params.getP(), params.getG());
-    }
-
-    BCElGamalPrivateKey(
-        ElGamalPrivateKeyParameters params)
-    {
-        this.x = params.getX();
-        this.elSpec = new ElGamalParameterSpec(params.getParameters().getP(), params.getParameters().getG());
-    }
-
-    public String getAlgorithm()
-    {
-        return "ElGamal";
-    }
-
-    /**
-     * return the encoding format we produce in getEncoded().
-     *
-     * @return the string "PKCS#8"
-     */
-    public String getFormat()
-    {
-        return "PKCS#8";
-    }
-
-    /**
-     * Return a PKCS8 representation of the key. The sequence returned
-     * represents a full PrivateKeyInfo object.
-     *
-     * @return a PKCS8 representation of the key.
-     */
-    public byte[] getEncoded()
-    {
-        try
-        {
-            PrivateKeyInfo          info = new PrivateKeyInfo(new AlgorithmIdentifier(OIWObjectIdentifiers.elGamalAlgorithm, new ElGamalParameter(elSpec.getP(), elSpec.getG())), new ASN1Integer(getX()));
-
-            return info.getEncoded(ASN1Encoding.DER);
-        }
-        catch (IOException e)
-        {
-            return null;
-        }
-    }
-
-    public ElGamalParameterSpec getParameters()
-    {
-        return elSpec;
-    }
-
-    public DHParameterSpec getParams()
-    {
-        return new DHParameterSpec(elSpec.getP(), elSpec.getG());
-    }
-    
-    public BigInteger getX()
-    {
-        return x;
-    }
-
-    public boolean equals(
-        Object o)
-    {
-        if (!(o instanceof DHPrivateKey))
-        {
-            return false;
-        }
-
-        DHPrivateKey other = (DHPrivateKey)o;
-
-        return this.getX().equals(other.getX())
-            && this.getParams().getG().equals(other.getParams().getG())
-            && this.getParams().getP().equals(other.getParams().getP())
-            && this.getParams().getL() == other.getParams().getL();
-    }
-
-    public int hashCode()
-    {
-        return this.getX().hashCode() ^ this.getParams().getG().hashCode()
-                ^ this.getParams().getP().hashCode() ^ this.getParams().getL();
-    }
-
-    private void readObject(
-        ObjectInputStream   in)
-        throws IOException, ClassNotFoundException
-    {
-        in.defaultReadObject();
-
-        this.elSpec = new ElGamalParameterSpec((BigInteger)in.readObject(), (BigInteger)in.readObject());
-        this.attrCarrier = new PKCS12BagAttributeCarrierImpl();
-    }
-
-    private void writeObject(
-        ObjectOutputStream  out)
-        throws IOException
-    {
-        out.defaultWriteObject();
-
-        out.writeObject(elSpec.getP());
-        out.writeObject(elSpec.getG());
-    }
-
-    public void setBagAttribute(
-        ASN1ObjectIdentifier oid,
-        ASN1Encodable attribute)
-    {
-        attrCarrier.setBagAttribute(oid, attribute);
-    }
-
-    public ASN1Encodable getBagAttribute(
-        ASN1ObjectIdentifier oid)
-    {
-        return attrCarrier.getBagAttribute(oid);
-    }
-
-    public Enumeration getBagAttributeKeys()
-    {
-        return attrCarrier.getBagAttributeKeys();
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/elgamal/BCElGamalPublicKey.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/elgamal/BCElGamalPublicKey.java
deleted file mode 100644
index cd31cc5..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/elgamal/BCElGamalPublicKey.java
+++ /dev/null
@@ -1,172 +0,0 @@
-package org.bouncycastle.jcajce.provider.asymmetric.elgamal;
-
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.math.BigInteger;
-
-import javax.crypto.interfaces.DHPublicKey;
-import javax.crypto.spec.DHParameterSpec;
-import javax.crypto.spec.DHPublicKeySpec;
-
-import org.bouncycastle.asn1.ASN1Encoding;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.oiw.ElGamalParameter;
-import org.bouncycastle.asn1.oiw.OIWObjectIdentifiers;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.bouncycastle.crypto.params.ElGamalPublicKeyParameters;
-import org.bouncycastle.jce.interfaces.ElGamalPublicKey;
-import org.bouncycastle.jce.spec.ElGamalParameterSpec;
-import org.bouncycastle.jce.spec.ElGamalPublicKeySpec;
-
-public class BCElGamalPublicKey
-    implements ElGamalPublicKey, DHPublicKey
-{
-    static final long serialVersionUID = 8712728417091216948L;
-        
-    private BigInteger              y;
-    private transient ElGamalParameterSpec    elSpec;
-
-    BCElGamalPublicKey(
-        ElGamalPublicKeySpec spec)
-    {
-        this.y = spec.getY();
-        this.elSpec = new ElGamalParameterSpec(spec.getParams().getP(), spec.getParams().getG());
-    }
-
-    BCElGamalPublicKey(
-        DHPublicKeySpec spec)
-    {
-        this.y = spec.getY();
-        this.elSpec = new ElGamalParameterSpec(spec.getP(), spec.getG());
-    }
-    
-    BCElGamalPublicKey(
-        ElGamalPublicKey key)
-    {
-        this.y = key.getY();
-        this.elSpec = key.getParameters();
-    }
-
-    BCElGamalPublicKey(
-        DHPublicKey key)
-    {
-        this.y = key.getY();
-        this.elSpec = new ElGamalParameterSpec(key.getParams().getP(), key.getParams().getG());
-    }
-    
-    BCElGamalPublicKey(
-        ElGamalPublicKeyParameters params)
-    {
-        this.y = params.getY();
-        this.elSpec = new ElGamalParameterSpec(params.getParameters().getP(), params.getParameters().getG());
-    }
-
-    BCElGamalPublicKey(
-        BigInteger y,
-        ElGamalParameterSpec elSpec)
-    {
-        this.y = y;
-        this.elSpec = elSpec;
-    }
-
-    BCElGamalPublicKey(
-        SubjectPublicKeyInfo info)
-    {
-        ElGamalParameter        params = ElGamalParameter.getInstance(info.getAlgorithm().getParameters());
-        ASN1Integer              derY = null;
-
-        try
-        {
-            derY = (ASN1Integer)info.parsePublicKey();
-        }
-        catch (IOException e)
-        {
-            throw new IllegalArgumentException("invalid info structure in DSA public key");
-        }
-
-        this.y = derY.getValue();
-        this.elSpec = new ElGamalParameterSpec(params.getP(), params.getG());
-    }
-
-    public String getAlgorithm()
-    {
-        return "ElGamal";
-    }
-
-    public String getFormat()
-    {
-        return "X.509";
-    }
-
-    public byte[] getEncoded()
-    {
-        try
-        {
-            SubjectPublicKeyInfo    info = new SubjectPublicKeyInfo(new AlgorithmIdentifier(OIWObjectIdentifiers.elGamalAlgorithm, new ElGamalParameter(elSpec.getP(), elSpec.getG())), new ASN1Integer(y));
-
-            return info.getEncoded(ASN1Encoding.DER);
-        }
-        catch (IOException e)
-        {
-            return null;
-        }
-    }
-
-    public ElGamalParameterSpec getParameters()
-    {
-        return elSpec;
-    }
-    
-    public DHParameterSpec getParams()
-    {
-        return new DHParameterSpec(elSpec.getP(), elSpec.getG());
-    }
-
-    public BigInteger getY()
-    {
-        return y;
-    }
-
-    public int hashCode()
-    {
-        return this.getY().hashCode() ^ this.getParams().getG().hashCode()
-                ^ this.getParams().getP().hashCode() ^ this.getParams().getL();
-    }
-
-    public boolean equals(
-        Object o)
-    {
-        if (!(o instanceof DHPublicKey))
-        {
-            return false;
-        }
-
-        DHPublicKey other = (DHPublicKey)o;
-
-        return this.getY().equals(other.getY())
-            && this.getParams().getG().equals(other.getParams().getG())
-            && this.getParams().getP().equals(other.getParams().getP())
-            && this.getParams().getL() == other.getParams().getL();
-    }
-
-    private void readObject(
-        ObjectInputStream   in)
-        throws IOException, ClassNotFoundException
-    {
-        in.defaultReadObject();
-
-        this.elSpec = new ElGamalParameterSpec((BigInteger)in.readObject(), (BigInteger)in.readObject());
-    }
-
-    private void writeObject(
-        ObjectOutputStream  out)
-        throws IOException
-    {
-        out.defaultWriteObject();
-
-        out.writeObject(elSpec.getP());
-        out.writeObject(elSpec.getG());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/elgamal/CipherSpi.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/elgamal/CipherSpi.java
deleted file mode 100644
index 9c28670..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/elgamal/CipherSpi.java
+++ /dev/null
@@ -1,339 +0,0 @@
-package org.bouncycastle.jcajce.provider.asymmetric.elgamal;
-
-import java.security.AlgorithmParameters;
-import java.security.InvalidAlgorithmParameterException;
-import java.security.InvalidKeyException;
-import java.security.InvalidParameterException;
-import java.security.Key;
-import java.security.NoSuchAlgorithmException;
-import java.security.PrivateKey;
-import java.security.PublicKey;
-import java.security.SecureRandom;
-import java.security.spec.AlgorithmParameterSpec;
-import java.security.spec.MGF1ParameterSpec;
-
-import javax.crypto.BadPaddingException;
-import javax.crypto.IllegalBlockSizeException;
-import javax.crypto.NoSuchPaddingException;
-import javax.crypto.interfaces.DHKey;
-import javax.crypto.spec.OAEPParameterSpec;
-import javax.crypto.spec.PSource;
-
-import org.bouncycastle.crypto.AsymmetricBlockCipher;
-import org.bouncycastle.crypto.BufferedAsymmetricBlockCipher;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.InvalidCipherTextException;
-import org.bouncycastle.crypto.encodings.ISO9796d1Encoding;
-import org.bouncycastle.crypto.encodings.OAEPEncoding;
-import org.bouncycastle.crypto.encodings.PKCS1Encoding;
-import org.bouncycastle.crypto.engines.ElGamalEngine;
-import org.bouncycastle.crypto.params.ParametersWithRandom;
-import org.bouncycastle.jcajce.provider.asymmetric.util.BaseCipherSpi;
-import org.bouncycastle.jcajce.provider.util.DigestFactory;
-import org.bouncycastle.jce.interfaces.ElGamalKey;
-import org.bouncycastle.jce.interfaces.ElGamalPrivateKey;
-import org.bouncycastle.jce.interfaces.ElGamalPublicKey;
-import org.bouncycastle.util.Strings;
-
-public class CipherSpi
-    extends BaseCipherSpi
-{
-    private BufferedAsymmetricBlockCipher   cipher;
-    private AlgorithmParameterSpec          paramSpec;
-    private AlgorithmParameters             engineParams;
-
-    public CipherSpi(
-        AsymmetricBlockCipher engine)
-    {
-        cipher = new BufferedAsymmetricBlockCipher(engine);
-    }
-   
-    private void initFromSpec(
-        OAEPParameterSpec pSpec) 
-        throws NoSuchPaddingException
-    {
-        MGF1ParameterSpec   mgfParams = (MGF1ParameterSpec)pSpec.getMGFParameters();
-        Digest              digest = DigestFactory.getDigest(mgfParams.getDigestAlgorithm());
-        
-        if (digest == null)
-        {
-            throw new NoSuchPaddingException("no match on OAEP constructor for digest algorithm: "+ mgfParams.getDigestAlgorithm());
-        }
-
-        cipher = new BufferedAsymmetricBlockCipher(new OAEPEncoding(new ElGamalEngine(), digest, ((PSource.PSpecified)pSpec.getPSource()).getValue()));        
-        paramSpec = pSpec;
-    }
-    
-    protected int engineGetBlockSize() 
-    {
-        return cipher.getInputBlockSize();
-    }
-
-    protected int engineGetKeySize(
-        Key     key) 
-    {
-        if (key instanceof ElGamalKey)
-        {
-            ElGamalKey   k = (ElGamalKey)key;
-
-            return k.getParameters().getP().bitLength();
-        }
-        else if (key instanceof DHKey)
-        {
-            DHKey   k = (DHKey)key;
-
-            return k.getParams().getP().bitLength();
-        }
-
-        throw new IllegalArgumentException("not an ElGamal key!");
-    }
-
-    protected int engineGetOutputSize(
-        int     inputLen) 
-    {
-        return cipher.getOutputBlockSize();
-    }
-
-    protected AlgorithmParameters engineGetParameters() 
-    {
-        if (engineParams == null)
-        {
-            if (paramSpec != null)
-            {
-                try
-                {
-                    engineParams = createParametersInstance("OAEP");
-                    engineParams.init(paramSpec);
-                }
-                catch (Exception e)
-                {
-                    throw new RuntimeException(e.toString());
-                }
-            }
-        }
-
-        return engineParams;
-    }
-
-    protected void engineSetMode(
-        String  mode)
-        throws NoSuchAlgorithmException
-    {
-        String md = Strings.toUpperCase(mode);
-        
-        if (md.equals("NONE") || md.equals("ECB"))
-        {
-            return;
-        }
-        
-        throw new NoSuchAlgorithmException("can't support mode " + mode);
-    }
-
-    protected void engineSetPadding(
-        String  padding) 
-        throws NoSuchPaddingException
-    {
-        String pad = Strings.toUpperCase(padding);
-
-        if (pad.equals("NOPADDING"))
-        {
-            cipher = new BufferedAsymmetricBlockCipher(new ElGamalEngine());
-        }
-        else if (pad.equals("PKCS1PADDING"))
-        {
-            cipher = new BufferedAsymmetricBlockCipher(new PKCS1Encoding(new ElGamalEngine()));
-        }
-        else if (pad.equals("ISO9796-1PADDING"))
-        {
-            cipher = new BufferedAsymmetricBlockCipher(new ISO9796d1Encoding(new ElGamalEngine()));
-        }
-        else if (pad.equals("OAEPPADDING"))
-        {
-            initFromSpec(OAEPParameterSpec.DEFAULT);
-        }
-        else if (pad.equals("OAEPWITHMD5ANDMGF1PADDING"))
-        {
-            initFromSpec(new OAEPParameterSpec("MD5", "MGF1", new MGF1ParameterSpec("MD5"), PSource.PSpecified.DEFAULT));
-        }
-        else if (pad.equals("OAEPWITHSHA1ANDMGF1PADDING"))
-        {
-            initFromSpec(OAEPParameterSpec.DEFAULT);
-        }
-        else if (pad.equals("OAEPWITHSHA224ANDMGF1PADDING"))
-        {
-            initFromSpec(new OAEPParameterSpec("SHA-224", "MGF1", new MGF1ParameterSpec("SHA-224"), PSource.PSpecified.DEFAULT));
-        }
-        else if (pad.equals("OAEPWITHSHA256ANDMGF1PADDING"))
-        {
-            initFromSpec(new OAEPParameterSpec("SHA-256", "MGF1", MGF1ParameterSpec.SHA256, PSource.PSpecified.DEFAULT));
-        }
-        else if (pad.equals("OAEPWITHSHA384ANDMGF1PADDING"))
-        {
-            initFromSpec(new OAEPParameterSpec("SHA-384", "MGF1", MGF1ParameterSpec.SHA384, PSource.PSpecified.DEFAULT));
-        }
-        else if (pad.equals("OAEPWITHSHA512ANDMGF1PADDING"))
-        {
-            initFromSpec(new OAEPParameterSpec("SHA-512", "MGF1", MGF1ParameterSpec.SHA512, PSource.PSpecified.DEFAULT));
-        }
-        else
-        {
-            throw new NoSuchPaddingException(padding + " unavailable with ElGamal.");
-        }
-    }
-
-    protected void engineInit(
-        int                     opmode,
-        Key                     key,
-        AlgorithmParameterSpec  params,
-        SecureRandom            random) 
-    throws InvalidKeyException
-    {
-        CipherParameters        param;
-
-        if (params == null)
-        {
-            if (key instanceof ElGamalPublicKey)
-            {
-                param = ElGamalUtil.generatePublicKeyParameter((PublicKey)key);
-            }
-            else if (key instanceof ElGamalPrivateKey)
-            {
-                param = ElGamalUtil.generatePrivateKeyParameter((PrivateKey)key);
-            }
-            else
-            {
-                throw new InvalidKeyException("unknown key type passed to ElGamal");
-            }
-        }
-        else
-        {
-            throw new IllegalArgumentException("unknown parameter type.");
-        }
-
-        if (random != null)
-        {
-            param = new ParametersWithRandom(param, random);
-        }
-
-        switch (opmode)
-        {
-        case javax.crypto.Cipher.ENCRYPT_MODE:
-        case javax.crypto.Cipher.WRAP_MODE:
-            cipher.init(true, param);
-            break;
-        case javax.crypto.Cipher.DECRYPT_MODE:
-        case javax.crypto.Cipher.UNWRAP_MODE:
-            cipher.init(false, param);
-            break;
-        default:
-            throw new InvalidParameterException("unknown opmode " + opmode + " passed to ElGamal");
-        }
-    }
-
-    protected void engineInit(
-        int                 opmode,
-        Key                 key,
-        AlgorithmParameters params,
-        SecureRandom        random) 
-    throws InvalidKeyException, InvalidAlgorithmParameterException
-    {
-        throw new InvalidAlgorithmParameterException("can't handle parameters in ElGamal");
-    }
-
-    protected void engineInit(
-        int                 opmode,
-        Key                 key,
-        SecureRandom        random) 
-    throws InvalidKeyException
-    {
-        engineInit(opmode, key, (AlgorithmParameterSpec)null, random);
-    }
-
-    protected byte[] engineUpdate(
-        byte[]  input,
-        int     inputOffset,
-        int     inputLen) 
-    {
-        cipher.processBytes(input, inputOffset, inputLen);
-        return null;
-    }
-
-    protected int engineUpdate(
-        byte[]  input,
-        int     inputOffset,
-        int     inputLen,
-        byte[]  output,
-        int     outputOffset) 
-    {
-        cipher.processBytes(input, inputOffset, inputLen);
-        return 0;
-    }
-
-    protected byte[] engineDoFinal(
-        byte[]  input,
-        int     inputOffset,
-        int     inputLen) 
-        throws IllegalBlockSizeException, BadPaddingException
-    {
-        cipher.processBytes(input, inputOffset, inputLen);
-        try
-        {
-            return cipher.doFinal();
-        }
-        catch (InvalidCipherTextException e)
-        {
-            throw new BadPaddingException(e.getMessage());
-        }
-    }
-
-    protected int engineDoFinal(
-        byte[]  input,
-        int     inputOffset,
-        int     inputLen,
-        byte[]  output,
-        int     outputOffset) 
-        throws IllegalBlockSizeException, BadPaddingException
-    {
-        byte[]  out;
-
-        cipher.processBytes(input, inputOffset, inputLen);
-
-        try
-        {
-            out = cipher.doFinal();
-        }
-        catch (InvalidCipherTextException e)
-        {
-            throw new BadPaddingException(e.getMessage());
-        }
-
-        for (int i = 0; i != out.length; i++)
-        {
-            output[outputOffset + i] = out[i];
-        }
-
-        return out.length;
-    }
-
-    /**
-     * classes that inherit from us.
-     */
-    static public class NoPadding
-        extends CipherSpi
-    {
-        public NoPadding()
-        {
-            super(new ElGamalEngine());
-        }
-    }
-    
-    static public class PKCS1v1_5Padding
-        extends CipherSpi
-    {
-        public PKCS1v1_5Padding()
-        {
-            super(new PKCS1Encoding(new ElGamalEngine()));
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/elgamal/ElGamalUtil.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/elgamal/ElGamalUtil.java
deleted file mode 100644
index f0442f4..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/elgamal/ElGamalUtil.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package org.bouncycastle.jcajce.provider.asymmetric.elgamal;
-
-import java.security.InvalidKeyException;
-import java.security.PrivateKey;
-import java.security.PublicKey;
-
-import javax.crypto.interfaces.DHPrivateKey;
-import javax.crypto.interfaces.DHPublicKey;
-
-import org.bouncycastle.crypto.params.AsymmetricKeyParameter;
-import org.bouncycastle.crypto.params.ElGamalParameters;
-import org.bouncycastle.crypto.params.ElGamalPrivateKeyParameters;
-import org.bouncycastle.crypto.params.ElGamalPublicKeyParameters;
-import org.bouncycastle.jce.interfaces.ElGamalPrivateKey;
-import org.bouncycastle.jce.interfaces.ElGamalPublicKey;
-
-/**
- * utility class for converting jce/jca ElGamal objects
- * objects into their org.bouncycastle.crypto counterparts.
- */
-public class ElGamalUtil
-{
-    static public AsymmetricKeyParameter generatePublicKeyParameter(
-        PublicKey    key)
-        throws InvalidKeyException
-    {
-        if (key instanceof ElGamalPublicKey)
-        {
-            ElGamalPublicKey    k = (ElGamalPublicKey)key;
-
-            return new ElGamalPublicKeyParameters(k.getY(),
-                new ElGamalParameters(k.getParameters().getP(), k.getParameters().getG()));
-        }
-        else if (key instanceof DHPublicKey)
-        {
-            DHPublicKey    k = (DHPublicKey)key;
-
-            return new ElGamalPublicKeyParameters(k.getY(),
-                new ElGamalParameters(k.getParams().getP(), k.getParams().getG()));
-        }
-
-        throw new InvalidKeyException("can't identify public key for El Gamal.");
-    }
-
-    static public AsymmetricKeyParameter generatePrivateKeyParameter(
-        PrivateKey    key)
-        throws InvalidKeyException
-    {
-        if (key instanceof ElGamalPrivateKey)
-        {
-            ElGamalPrivateKey    k = (ElGamalPrivateKey)key;
-
-            return new ElGamalPrivateKeyParameters(k.getX(),
-                new ElGamalParameters(k.getParameters().getP(), k.getParameters().getG()));
-        }
-        else if (key instanceof DHPrivateKey)
-        {
-            DHPrivateKey    k = (DHPrivateKey)key;
-
-            return new ElGamalPrivateKeyParameters(k.getX(),
-                new ElGamalParameters(k.getParams().getP(), k.getParams().getG()));
-        }
-                        
-        throw new InvalidKeyException("can't identify private key for El Gamal.");
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/elgamal/KeyFactorySpi.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/elgamal/KeyFactorySpi.java
deleted file mode 100644
index 92e655f..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/elgamal/KeyFactorySpi.java
+++ /dev/null
@@ -1,156 +0,0 @@
-package org.bouncycastle.jcajce.provider.asymmetric.elgamal;
-
-import java.io.IOException;
-import java.security.InvalidKeyException;
-import java.security.Key;
-import java.security.PrivateKey;
-import java.security.PublicKey;
-import java.security.spec.InvalidKeySpecException;
-import java.security.spec.KeySpec;
-
-import javax.crypto.interfaces.DHPrivateKey;
-import javax.crypto.interfaces.DHPublicKey;
-import javax.crypto.spec.DHPrivateKeySpec;
-import javax.crypto.spec.DHPublicKeySpec;
-
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.oiw.OIWObjectIdentifiers;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.bouncycastle.asn1.x9.X9ObjectIdentifiers;
-import org.bouncycastle.jcajce.provider.asymmetric.util.BaseKeyFactorySpi;
-import org.bouncycastle.jce.interfaces.ElGamalPrivateKey;
-import org.bouncycastle.jce.interfaces.ElGamalPublicKey;
-import org.bouncycastle.jce.spec.ElGamalPrivateKeySpec;
-import org.bouncycastle.jce.spec.ElGamalPublicKeySpec;
-
-public class KeyFactorySpi
-    extends BaseKeyFactorySpi
-{
-    public KeyFactorySpi()
-    {
-    }
-
-    protected PrivateKey engineGeneratePrivate(
-        KeySpec keySpec)
-        throws InvalidKeySpecException
-    {
-        if (keySpec instanceof ElGamalPrivateKeySpec)
-        {
-            return new BCElGamalPrivateKey((ElGamalPrivateKeySpec)keySpec);
-        }
-        else if (keySpec instanceof DHPrivateKeySpec)
-        {
-            return new BCElGamalPrivateKey((DHPrivateKeySpec)keySpec);
-        }
-
-        return super.engineGeneratePrivate(keySpec);
-    }
-
-    protected PublicKey engineGeneratePublic(
-        KeySpec keySpec)
-        throws InvalidKeySpecException
-    {
-        if (keySpec instanceof ElGamalPublicKeySpec)
-        {
-            return new BCElGamalPublicKey((ElGamalPublicKeySpec)keySpec);
-        }
-        else if (keySpec instanceof DHPublicKeySpec)
-        {
-            return new BCElGamalPublicKey((DHPublicKeySpec)keySpec);
-        }
-        return super.engineGeneratePublic(keySpec);
-    }
-
-    protected KeySpec engineGetKeySpec(
-        Key key,
-        Class spec)
-        throws InvalidKeySpecException
-    {
-        if (spec.isAssignableFrom(DHPrivateKeySpec.class) && key instanceof DHPrivateKey)
-        {
-            DHPrivateKey k = (DHPrivateKey)key;
-
-            return new DHPrivateKeySpec(k.getX(), k.getParams().getP(), k.getParams().getG());
-        }
-        else if (spec.isAssignableFrom(DHPublicKeySpec.class) && key instanceof DHPublicKey)
-        {
-            DHPublicKey k = (DHPublicKey)key;
-
-            return new DHPublicKeySpec(k.getY(), k.getParams().getP(), k.getParams().getG());
-        }
-
-        return super.engineGetKeySpec(key, spec);
-    }
-
-    protected Key engineTranslateKey(
-        Key key)
-        throws InvalidKeyException
-    {
-        if (key instanceof DHPublicKey)
-        {
-            return new BCElGamalPublicKey((DHPublicKey)key);
-        }
-        else if (key instanceof DHPrivateKey)
-        {
-            return new BCElGamalPrivateKey((DHPrivateKey)key);
-        }
-        else if (key instanceof ElGamalPublicKey)
-        {
-            return new BCElGamalPublicKey((ElGamalPublicKey)key);
-        }
-        else if (key instanceof ElGamalPrivateKey)
-        {
-            return new BCElGamalPrivateKey((ElGamalPrivateKey)key);
-        }
-
-        throw new InvalidKeyException("key type unknown");
-    }
-
-    public PrivateKey generatePrivate(PrivateKeyInfo info)
-        throws IOException
-    {
-        ASN1ObjectIdentifier algOid = info.getPrivateKeyAlgorithm().getAlgorithm();
-
-        if (algOid.equals(PKCSObjectIdentifiers.dhKeyAgreement))
-        {
-            return new BCElGamalPrivateKey(info);
-        }
-        else if (algOid.equals(X9ObjectIdentifiers.dhpublicnumber))
-        {
-            return new BCElGamalPrivateKey(info);
-        }
-        else if (algOid.equals(OIWObjectIdentifiers.elGamalAlgorithm))
-        {
-            return new BCElGamalPrivateKey(info);
-        }
-        else
-        {
-            throw new IOException("algorithm identifier " + algOid + " in key not recognised");
-        }
-    }
-
-    public PublicKey generatePublic(SubjectPublicKeyInfo info)
-        throws IOException
-    {
-        ASN1ObjectIdentifier algOid = info.getAlgorithm().getAlgorithm();
-
-        if (algOid.equals(PKCSObjectIdentifiers.dhKeyAgreement))
-        {
-            return new BCElGamalPublicKey(info);
-        }
-        else if (algOid.equals(X9ObjectIdentifiers.dhpublicnumber))
-        {
-            return new BCElGamalPublicKey(info);
-        }
-        else if (algOid.equals(OIWObjectIdentifiers.elGamalAlgorithm))
-        {
-            return new BCElGamalPublicKey(info);
-        }
-        else
-        {
-            throw new IOException("algorithm identifier " + algOid + " in key not recognised");
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/elgamal/KeyPairGeneratorSpi.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/elgamal/KeyPairGeneratorSpi.java
deleted file mode 100644
index 9455ece..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/elgamal/KeyPairGeneratorSpi.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package org.bouncycastle.jcajce.provider.asymmetric.elgamal;
-
-import java.security.InvalidAlgorithmParameterException;
-import java.security.KeyPair;
-import java.security.SecureRandom;
-import java.security.spec.AlgorithmParameterSpec;
-
-import javax.crypto.spec.DHParameterSpec;
-
-import org.bouncycastle.crypto.AsymmetricCipherKeyPair;
-import org.bouncycastle.crypto.generators.ElGamalKeyPairGenerator;
-import org.bouncycastle.crypto.generators.ElGamalParametersGenerator;
-import org.bouncycastle.crypto.params.ElGamalKeyGenerationParameters;
-import org.bouncycastle.crypto.params.ElGamalParameters;
-import org.bouncycastle.crypto.params.ElGamalPrivateKeyParameters;
-import org.bouncycastle.crypto.params.ElGamalPublicKeyParameters;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.jce.spec.ElGamalParameterSpec;
-
-public class KeyPairGeneratorSpi
-    extends java.security.KeyPairGenerator
-{
-    ElGamalKeyGenerationParameters param;
-    ElGamalKeyPairGenerator engine = new ElGamalKeyPairGenerator();
-    int strength = 1024;
-    int certainty = 20;
-    SecureRandom random = new SecureRandom();
-    boolean initialised = false;
-
-    public KeyPairGeneratorSpi()
-    {
-        super("ElGamal");
-    }
-
-    public void initialize(
-        int strength,
-        SecureRandom random)
-    {
-        this.strength = strength;
-        this.random = random;
-    }
-
-    public void initialize(
-        AlgorithmParameterSpec params,
-        SecureRandom random)
-        throws InvalidAlgorithmParameterException
-    {
-        if (!(params instanceof ElGamalParameterSpec) && !(params instanceof DHParameterSpec))
-        {
-            throw new InvalidAlgorithmParameterException("parameter object not a DHParameterSpec or an ElGamalParameterSpec");
-        }
-
-        if (params instanceof ElGamalParameterSpec)
-        {
-            ElGamalParameterSpec elParams = (ElGamalParameterSpec)params;
-
-            param = new ElGamalKeyGenerationParameters(random, new ElGamalParameters(elParams.getP(), elParams.getG()));
-        }
-        else
-        {
-            DHParameterSpec dhParams = (DHParameterSpec)params;
-
-            param = new ElGamalKeyGenerationParameters(random, new ElGamalParameters(dhParams.getP(), dhParams.getG(), dhParams.getL()));
-        }
-
-        engine.init(param);
-        initialised = true;
-    }
-
-    public KeyPair generateKeyPair()
-    {
-        if (!initialised)
-        {
-            DHParameterSpec dhParams = BouncyCastleProvider.CONFIGURATION.getDHDefaultParameters(strength);
-
-            if (dhParams != null)
-            {
-                param = new ElGamalKeyGenerationParameters(random, new ElGamalParameters(dhParams.getP(), dhParams.getG(), dhParams.getL()));
-            }
-            else
-            {
-                ElGamalParametersGenerator pGen = new ElGamalParametersGenerator();
-
-                pGen.init(strength, certainty, random);
-                param = new ElGamalKeyGenerationParameters(random, pGen.generateParameters());
-            }
-
-            engine.init(param);
-            initialised = true;
-        }
-
-        AsymmetricCipherKeyPair pair = engine.generateKeyPair();
-        ElGamalPublicKeyParameters pub = (ElGamalPublicKeyParameters)pair.getPublic();
-        ElGamalPrivateKeyParameters priv = (ElGamalPrivateKeyParameters)pair.getPrivate();
-
-        return new KeyPair(new BCElGamalPublicKey(pub),
-            new BCElGamalPrivateKey(priv));
-    }
-}
-
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/gost/AlgorithmParameterGeneratorSpi.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/gost/AlgorithmParameterGeneratorSpi.java
deleted file mode 100644
index 2e7ee7c..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/gost/AlgorithmParameterGeneratorSpi.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package org.bouncycastle.jcajce.provider.asymmetric.gost;
-
-import java.security.AlgorithmParameters;
-import java.security.InvalidAlgorithmParameterException;
-import java.security.SecureRandom;
-import java.security.spec.AlgorithmParameterSpec;
-
-import org.bouncycastle.crypto.generators.GOST3410ParametersGenerator;
-import org.bouncycastle.crypto.params.GOST3410Parameters;
-import org.bouncycastle.jcajce.provider.asymmetric.util.BaseAlgorithmParameterGeneratorSpi;
-import org.bouncycastle.jce.spec.GOST3410ParameterSpec;
-import org.bouncycastle.jce.spec.GOST3410PublicKeyParameterSetSpec;
-
-public abstract class AlgorithmParameterGeneratorSpi
-    extends BaseAlgorithmParameterGeneratorSpi
-{
-    protected SecureRandom random;
-    protected int strength = 1024;
-
-    protected void engineInit(
-        int strength,
-        SecureRandom random)
-    {
-        this.strength = strength;
-        this.random = random;
-    }
-
-    protected void engineInit(
-        AlgorithmParameterSpec genParamSpec,
-        SecureRandom random)
-        throws InvalidAlgorithmParameterException
-    {
-        throw new InvalidAlgorithmParameterException("No supported AlgorithmParameterSpec for GOST3410 parameter generation.");
-    }
-
-    protected AlgorithmParameters engineGenerateParameters()
-    {
-        GOST3410ParametersGenerator pGen = new GOST3410ParametersGenerator();
-
-        if (random != null)
-        {
-            pGen.init(strength, 2, random);
-        }
-        else
-        {
-            pGen.init(strength, 2, new SecureRandom());
-        }
-
-        GOST3410Parameters p = pGen.generateParameters();
-
-        AlgorithmParameters params;
-
-        try
-        {
-            params = createParametersInstance("GOST3410");
-            params.init(new GOST3410ParameterSpec(new GOST3410PublicKeyParameterSetSpec(p.getP(), p.getQ(), p.getA())));
-        }
-        catch (Exception e)
-        {
-            throw new RuntimeException(e.getMessage());
-        }
-
-        return params;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/gost/AlgorithmParametersSpi.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/gost/AlgorithmParametersSpi.java
deleted file mode 100644
index 88f78bd..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/gost/AlgorithmParametersSpi.java
+++ /dev/null
@@ -1,137 +0,0 @@
-package org.bouncycastle.jcajce.provider.asymmetric.gost;
-
-import java.io.IOException;
-import java.security.spec.AlgorithmParameterSpec;
-import java.security.spec.InvalidParameterSpecException;
-
-import org.bouncycastle.asn1.ASN1Encoding;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.cryptopro.GOST3410PublicKeyAlgParameters;
-import org.bouncycastle.jce.spec.GOST3410ParameterSpec;
-import org.bouncycastle.jce.spec.GOST3410PublicKeyParameterSetSpec;
-
-public class AlgorithmParametersSpi
-    extends java.security.AlgorithmParametersSpi
-{
-    GOST3410ParameterSpec currentSpec;
-
-    protected boolean isASN1FormatString(String format)
-    {
-        return format == null || format.equals("ASN.1");
-    }
-
-    protected AlgorithmParameterSpec engineGetParameterSpec(
-        Class paramSpec)
-        throws InvalidParameterSpecException
-    {
-        if (paramSpec == null)
-        {
-            throw new NullPointerException("argument to getParameterSpec must not be null");
-        }
-
-        return localEngineGetParameterSpec(paramSpec);
-    }
-
-
-    /**
-     * Return the X.509 ASN.1 structure GOST3410Parameter.
-     * <pre>
-     *  GOST3410Parameter ::= SEQUENCE {
-     *                   prime INTEGER, -- p
-     *                   subprime INTEGER, -- q
-     *                   base INTEGER, -- a}
-     * </pre>
-     */
-    protected byte[] engineGetEncoded()
-    {
-        GOST3410PublicKeyAlgParameters gost3410P = new GOST3410PublicKeyAlgParameters(new ASN1ObjectIdentifier(currentSpec.getPublicKeyParamSetOID()), new ASN1ObjectIdentifier(currentSpec.getDigestParamSetOID()), new ASN1ObjectIdentifier(currentSpec.getEncryptionParamSetOID()));
-
-        try
-        {
-            return gost3410P.getEncoded(ASN1Encoding.DER);
-        }
-        catch (IOException e)
-        {
-            throw new RuntimeException("Error encoding GOST3410Parameters");
-        }
-    }
-
-    protected byte[] engineGetEncoded(
-        String format)
-    {
-        if (isASN1FormatString(format) || format.equalsIgnoreCase("X.509"))
-        {
-            return engineGetEncoded();
-        }
-
-        return null;
-    }
-
-    protected AlgorithmParameterSpec localEngineGetParameterSpec(
-        Class paramSpec)
-        throws InvalidParameterSpecException
-    {
-        if (paramSpec == GOST3410PublicKeyParameterSetSpec.class)
-        {
-            return currentSpec;
-        }
-
-        throw new InvalidParameterSpecException("unknown parameter spec passed to GOST3410 parameters object.");
-    }
-
-    protected void engineInit(
-        AlgorithmParameterSpec paramSpec)
-        throws InvalidParameterSpecException
-    {
-        if (!(paramSpec instanceof GOST3410ParameterSpec))
-        {
-            throw new InvalidParameterSpecException("GOST3410ParameterSpec required to initialise a GOST3410 algorithm parameters object");
-        }
-
-        this.currentSpec = (GOST3410ParameterSpec)paramSpec;
-    }
-
-    protected void engineInit(
-        byte[] params)
-        throws IOException
-    {
-        try
-        {
-            ASN1Sequence seq = (ASN1Sequence)ASN1Primitive.fromByteArray(params);
-
-            this.currentSpec = GOST3410ParameterSpec.fromPublicKeyAlg(
-                new GOST3410PublicKeyAlgParameters(seq));
-        }
-        catch (ClassCastException e)
-        {
-            throw new IOException("Not a valid GOST3410 Parameter encoding.");
-        }
-        catch (ArrayIndexOutOfBoundsException e)
-        {
-            throw new IOException("Not a valid GOST3410 Parameter encoding.");
-        }
-    }
-
-    protected void engineInit(
-        byte[] params,
-        String format)
-        throws IOException
-    {
-        if (isASN1FormatString(format) || format.equalsIgnoreCase("X.509"))
-        {
-            engineInit(params);
-        }
-        else
-        {
-            throw new IOException("Unknown parameter format " + format);
-        }
-    }
-
-    protected String engineToString()
-    {
-        return "GOST3410 Parameters";
-    }
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/gost/BCGOST3410PrivateKey.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/gost/BCGOST3410PrivateKey.java
deleted file mode 100644
index 8da4998..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/gost/BCGOST3410PrivateKey.java
+++ /dev/null
@@ -1,253 +0,0 @@
-package org.bouncycastle.jcajce.provider.asymmetric.gost;
-
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.math.BigInteger;
-import java.util.Enumeration;
-
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1Encoding;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DEROctetString;
-import org.bouncycastle.asn1.cryptopro.CryptoProObjectIdentifiers;
-import org.bouncycastle.asn1.cryptopro.GOST3410PublicKeyAlgParameters;
-import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.crypto.params.GOST3410PrivateKeyParameters;
-import org.bouncycastle.jcajce.provider.asymmetric.util.PKCS12BagAttributeCarrierImpl;
-import org.bouncycastle.jce.interfaces.GOST3410Params;
-import org.bouncycastle.jce.interfaces.GOST3410PrivateKey;
-import org.bouncycastle.jce.interfaces.PKCS12BagAttributeCarrier;
-import org.bouncycastle.jce.spec.GOST3410ParameterSpec;
-import org.bouncycastle.jce.spec.GOST3410PrivateKeySpec;
-import org.bouncycastle.jce.spec.GOST3410PublicKeyParameterSetSpec;
-
-public class BCGOST3410PrivateKey
-    implements GOST3410PrivateKey, PKCS12BagAttributeCarrier
-{
-    static final long serialVersionUID = 8581661527592305464L;
-
-    private BigInteger          x;
-
-    private transient   GOST3410Params      gost3410Spec;
-    private transient   PKCS12BagAttributeCarrier attrCarrier = new PKCS12BagAttributeCarrierImpl();
-
-    protected BCGOST3410PrivateKey()
-    {
-    }
-
-    BCGOST3410PrivateKey(
-        GOST3410PrivateKey key)
-    {
-        this.x = key.getX();
-        this.gost3410Spec = key.getParameters();
-    }
-
-    BCGOST3410PrivateKey(
-        GOST3410PrivateKeySpec spec)
-    {
-        this.x = spec.getX();
-        this.gost3410Spec = new GOST3410ParameterSpec(new GOST3410PublicKeyParameterSetSpec(spec.getP(), spec.getQ(), spec.getA()));
-    }
-
-    BCGOST3410PrivateKey(
-        PrivateKeyInfo info)
-        throws IOException
-    {
-        GOST3410PublicKeyAlgParameters    params = new GOST3410PublicKeyAlgParameters((ASN1Sequence)info.getAlgorithmId().getParameters());
-        ASN1OctetString      derX = ASN1OctetString.getInstance(info.parsePrivateKey());
-        byte[]              keyEnc = derX.getOctets();
-        byte[]              keyBytes = new byte[keyEnc.length];
-        
-        for (int i = 0; i != keyEnc.length; i++)
-        {
-            keyBytes[i] = keyEnc[keyEnc.length - 1 - i]; // was little endian
-        }
-        
-        this.x = new BigInteger(1, keyBytes);
-        this.gost3410Spec = GOST3410ParameterSpec.fromPublicKeyAlg(params);
-    }
-
-    BCGOST3410PrivateKey(
-        GOST3410PrivateKeyParameters params,
-        GOST3410ParameterSpec spec)
-    {
-        this.x = params.getX();
-        this.gost3410Spec = spec;
-
-        if (spec == null) 
-        {
-            throw new IllegalArgumentException("spec is null");
-        }
-    }
-
-    public String getAlgorithm()
-    {
-        return "GOST3410";
-    }
-
-    /**
-     * return the encoding format we produce in getEncoded().
-     *
-     * @return the string "PKCS#8"
-     */
-    public String getFormat()
-    {
-        return "PKCS#8";
-    }
-
-    /**
-     * Return a PKCS8 representation of the key. The sequence returned
-     * represents a full PrivateKeyInfo object.
-     *
-     * @return a PKCS8 representation of the key.
-     */
-    public byte[] getEncoded()
-    {
-        PrivateKeyInfo          info;
-        byte[]                  keyEnc = this.getX().toByteArray();
-        byte[]                  keyBytes;
-
-        if (keyEnc[0] == 0)
-        {
-            keyBytes = new byte[keyEnc.length - 1];
-        }
-        else
-        {
-            keyBytes = new byte[keyEnc.length];
-        }
-        
-        for (int i = 0; i != keyBytes.length; i++)
-        {
-            keyBytes[i] = keyEnc[keyEnc.length - 1 - i]; // must be little endian
-        }
-
-        try
-        {
-            if (gost3410Spec instanceof GOST3410ParameterSpec)
-            {
-                info = new PrivateKeyInfo(new AlgorithmIdentifier(CryptoProObjectIdentifiers.gostR3410_94, new GOST3410PublicKeyAlgParameters(new ASN1ObjectIdentifier(gost3410Spec.getPublicKeyParamSetOID()), new ASN1ObjectIdentifier(gost3410Spec.getDigestParamSetOID()))), new DEROctetString(keyBytes));
-            }
-            else
-            {
-                info = new PrivateKeyInfo(new AlgorithmIdentifier(CryptoProObjectIdentifiers.gostR3410_94), new DEROctetString(keyBytes));
-            }
-
-            return info.getEncoded(ASN1Encoding.DER);
-        }
-        catch (IOException e)
-        {
-            return null;
-        }
-    }
-
-    public GOST3410Params getParameters()
-    {
-        return gost3410Spec;
-    }
-
-    public BigInteger getX()
-    {
-        return x;
-    }
-
-    public boolean equals(
-        Object o)
-    {
-        if (!(o instanceof GOST3410PrivateKey))
-        {
-            return false;
-        }
-
-        GOST3410PrivateKey other = (GOST3410PrivateKey)o;
-
-        return this.getX().equals(other.getX())
-            && this.getParameters().getPublicKeyParameters().equals(other.getParameters().getPublicKeyParameters())
-            && this.getParameters().getDigestParamSetOID().equals(other.getParameters().getDigestParamSetOID())
-            && compareObj(this.getParameters().getEncryptionParamSetOID(), other.getParameters().getEncryptionParamSetOID());
-    }
-
-    private boolean compareObj(Object o1, Object o2)
-    {
-        if (o1 == o2)
-        {
-            return true;
-        }
-
-        if (o1 == null)
-        {
-            return false;
-        }
-
-        return o1.equals(o2);
-    }
-
-    public int hashCode()
-    {
-        return this.getX().hashCode() ^ gost3410Spec.hashCode();
-    }
-
-    public void setBagAttribute(
-        ASN1ObjectIdentifier oid,
-        ASN1Encodable        attribute)
-    {
-        attrCarrier.setBagAttribute(oid, attribute);
-    }
-
-    public ASN1Encodable getBagAttribute(
-        ASN1ObjectIdentifier oid)
-    {
-        return attrCarrier.getBagAttribute(oid);
-    }
-
-    public Enumeration getBagAttributeKeys()
-    {
-        return attrCarrier.getBagAttributeKeys();
-    }
-
-    private void readObject(
-        ObjectInputStream in)
-        throws IOException, ClassNotFoundException
-    {
-        in.defaultReadObject();
-
-        String publicKeyParamSetOID = (String)in.readObject();
-        if (publicKeyParamSetOID != null)
-        {
-            this.gost3410Spec = new GOST3410ParameterSpec(publicKeyParamSetOID, (String)in.readObject(), (String)in.readObject());
-        }
-        else
-        {
-            this.gost3410Spec = new GOST3410ParameterSpec(new GOST3410PublicKeyParameterSetSpec((BigInteger)in.readObject(), (BigInteger)in.readObject(), (BigInteger)in.readObject()));
-            in.readObject();
-            in.readObject();
-        }
-        this.attrCarrier = new PKCS12BagAttributeCarrierImpl();
-    }
-
-    private void writeObject(
-        ObjectOutputStream out)
-        throws IOException
-    {
-        out.defaultWriteObject();
-
-        if (gost3410Spec.getPublicKeyParamSetOID() != null)
-        {
-            out.writeObject(gost3410Spec.getPublicKeyParamSetOID());
-            out.writeObject(gost3410Spec.getDigestParamSetOID());
-            out.writeObject(gost3410Spec.getEncryptionParamSetOID());
-        }
-        else
-        {
-            out.writeObject(null);
-            out.writeObject(gost3410Spec.getPublicKeyParameters().getP());
-            out.writeObject(gost3410Spec.getPublicKeyParameters().getQ());
-            out.writeObject(gost3410Spec.getPublicKeyParameters().getA());
-            out.writeObject(gost3410Spec.getDigestParamSetOID());
-            out.writeObject(gost3410Spec.getEncryptionParamSetOID());
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/gost/BCGOST3410PublicKey.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/gost/BCGOST3410PublicKey.java
deleted file mode 100644
index 1729b96..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/gost/BCGOST3410PublicKey.java
+++ /dev/null
@@ -1,224 +0,0 @@
-package org.bouncycastle.jcajce.provider.asymmetric.gost;
-
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.math.BigInteger;
-
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DEROctetString;
-import org.bouncycastle.asn1.cryptopro.CryptoProObjectIdentifiers;
-import org.bouncycastle.asn1.cryptopro.GOST3410PublicKeyAlgParameters;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.bouncycastle.crypto.params.GOST3410PublicKeyParameters;
-import org.bouncycastle.jcajce.provider.asymmetric.util.KeyUtil;
-import org.bouncycastle.jce.interfaces.GOST3410Params;
-import org.bouncycastle.jce.interfaces.GOST3410PublicKey;
-import org.bouncycastle.jce.spec.GOST3410ParameterSpec;
-import org.bouncycastle.jce.spec.GOST3410PublicKeyParameterSetSpec;
-import org.bouncycastle.jce.spec.GOST3410PublicKeySpec;
-
-public class BCGOST3410PublicKey
-    implements GOST3410PublicKey
-{
-    static final long serialVersionUID = -6251023343619275990L;
-
-    private BigInteger      y;
-    private transient GOST3410Params  gost3410Spec;
-
-    BCGOST3410PublicKey(
-        GOST3410PublicKeySpec spec)
-    {
-        this.y = spec.getY();
-        this.gost3410Spec = new GOST3410ParameterSpec(new GOST3410PublicKeyParameterSetSpec(spec.getP(), spec.getQ(), spec.getA()));
-    }
-
-    BCGOST3410PublicKey(
-        GOST3410PublicKey key)
-    {
-        this.y = key.getY();
-        this.gost3410Spec = key.getParameters();
-    }
-
-    BCGOST3410PublicKey(
-        GOST3410PublicKeyParameters params,
-        GOST3410ParameterSpec spec)
-    {
-        this.y = params.getY();
-        this.gost3410Spec = spec;
-    }
-
-    BCGOST3410PublicKey(
-        BigInteger y,
-        GOST3410ParameterSpec gost3410Spec)
-    {
-        this.y = y;
-        this.gost3410Spec = gost3410Spec;
-    }
-
-    BCGOST3410PublicKey(
-        SubjectPublicKeyInfo info)
-    {
-        GOST3410PublicKeyAlgParameters    params = new GOST3410PublicKeyAlgParameters((ASN1Sequence)info.getAlgorithmId().getParameters());
-        DEROctetString                    derY;
-
-        try
-        {
-            derY = (DEROctetString)info.parsePublicKey();
-            
-            byte[]                  keyEnc = derY.getOctets();
-            byte[]                  keyBytes = new byte[keyEnc.length];
-            
-            for (int i = 0; i != keyEnc.length; i++)
-            {
-                keyBytes[i] = keyEnc[keyEnc.length - 1 - i]; // was little endian
-            }
-
-            this.y = new BigInteger(1, keyBytes);
-        }
-        catch (IOException e)
-        {
-            throw new IllegalArgumentException("invalid info structure in GOST3410 public key");
-        }
-
-        this.gost3410Spec = GOST3410ParameterSpec.fromPublicKeyAlg(params);
-    }
-
-    public String getAlgorithm()
-    {
-        return "GOST3410";
-    }
-
-    public String getFormat()
-    {
-        return "X.509";
-    }
-
-    public byte[] getEncoded()
-    {
-        SubjectPublicKeyInfo    info;
-        byte[]                  keyEnc = this.getY().toByteArray();
-        byte[]                  keyBytes;
-        
-        if (keyEnc[0] == 0)
-        {
-            keyBytes = new byte[keyEnc.length - 1];
-        }
-        else
-        {
-            keyBytes = new byte[keyEnc.length];
-        }
-        
-        for (int i = 0; i != keyBytes.length; i++)
-        {
-            keyBytes[i] = keyEnc[keyEnc.length - 1 - i]; // must be little endian
-        }
-
-        try
-        {
-            if (gost3410Spec instanceof GOST3410ParameterSpec)
-            {
-                if (gost3410Spec.getEncryptionParamSetOID() != null)
-                {
-                    info = new SubjectPublicKeyInfo(new AlgorithmIdentifier(CryptoProObjectIdentifiers.gostR3410_94, new GOST3410PublicKeyAlgParameters(new ASN1ObjectIdentifier(gost3410Spec.getPublicKeyParamSetOID()), new ASN1ObjectIdentifier(gost3410Spec.getDigestParamSetOID()), new ASN1ObjectIdentifier(gost3410Spec.getEncryptionParamSetOID()))), new DEROctetString(keyBytes));
-                }
-                else
-                {
-                    info = new SubjectPublicKeyInfo(new AlgorithmIdentifier(CryptoProObjectIdentifiers.gostR3410_94, new GOST3410PublicKeyAlgParameters(new ASN1ObjectIdentifier(gost3410Spec.getPublicKeyParamSetOID()), new ASN1ObjectIdentifier(gost3410Spec.getDigestParamSetOID()))), new DEROctetString(keyBytes));
-                }
-            }
-            else
-            {
-                info = new SubjectPublicKeyInfo(new AlgorithmIdentifier(CryptoProObjectIdentifiers.gostR3410_94), new DEROctetString(keyBytes));
-            }
-
-            return KeyUtil.getEncodedSubjectPublicKeyInfo(info);
-        }
-        catch (IOException e)
-        {
-            return null;
-        }
-    }
-
-    public GOST3410Params getParameters()
-    {
-        return gost3410Spec;
-    }
-
-    public BigInteger getY()
-    {
-        return y;
-    }
-
-    public String toString()
-    {
-        StringBuffer    buf = new StringBuffer();
-        String          nl = System.getProperty("line.separator");
-
-        buf.append("GOST3410 Public Key").append(nl);
-        buf.append("            y: ").append(this.getY().toString(16)).append(nl);
-
-        return buf.toString();
-    }
-    
-    public boolean equals(Object o)
-    {
-        if (o instanceof BCGOST3410PublicKey)
-        {
-            BCGOST3410PublicKey other = (BCGOST3410PublicKey)o;
-            
-            return this.y.equals(other.y) && this.gost3410Spec.equals(other.gost3410Spec);
-        }
-        
-        return false;
-    }
-    
-    public int hashCode()
-    {
-        return y.hashCode() ^ gost3410Spec.hashCode();
-    }
-
-    private void readObject(
-        ObjectInputStream in)
-        throws IOException, ClassNotFoundException
-    {
-        in.defaultReadObject();
-
-        String publicKeyParamSetOID = (String)in.readObject();
-        if (publicKeyParamSetOID != null)
-        {
-            this.gost3410Spec = new GOST3410ParameterSpec(publicKeyParamSetOID, (String)in.readObject(), (String)in.readObject());
-        }
-        else
-        {
-            this.gost3410Spec = new GOST3410ParameterSpec(new GOST3410PublicKeyParameterSetSpec((BigInteger)in.readObject(), (BigInteger)in.readObject(), (BigInteger)in.readObject()));
-            in.readObject();
-            in.readObject();
-        }
-    }
-
-    private void writeObject(
-        ObjectOutputStream out)
-        throws IOException
-    {
-        out.defaultWriteObject();
-
-        if (gost3410Spec.getPublicKeyParamSetOID() != null)
-        {
-            out.writeObject(gost3410Spec.getPublicKeyParamSetOID());
-            out.writeObject(gost3410Spec.getDigestParamSetOID());
-            out.writeObject(gost3410Spec.getEncryptionParamSetOID());
-        }
-        else
-        {
-            out.writeObject(null);
-            out.writeObject(gost3410Spec.getPublicKeyParameters().getP());
-            out.writeObject(gost3410Spec.getPublicKeyParameters().getQ());
-            out.writeObject(gost3410Spec.getPublicKeyParameters().getA());
-            out.writeObject(gost3410Spec.getDigestParamSetOID());
-            out.writeObject(gost3410Spec.getEncryptionParamSetOID());
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/gost/KeyFactorySpi.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/gost/KeyFactorySpi.java
deleted file mode 100644
index ceaf967..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/gost/KeyFactorySpi.java
+++ /dev/null
@@ -1,121 +0,0 @@
-package org.bouncycastle.jcajce.provider.asymmetric.gost;
-
-import java.io.IOException;
-import java.security.InvalidKeyException;
-import java.security.Key;
-import java.security.PrivateKey;
-import java.security.PublicKey;
-import java.security.spec.InvalidKeySpecException;
-import java.security.spec.KeySpec;
-
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.cryptopro.CryptoProObjectIdentifiers;
-import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.bouncycastle.jcajce.provider.asymmetric.util.BaseKeyFactorySpi;
-import org.bouncycastle.jce.interfaces.GOST3410PrivateKey;
-import org.bouncycastle.jce.interfaces.GOST3410PublicKey;
-import org.bouncycastle.jce.spec.GOST3410PrivateKeySpec;
-import org.bouncycastle.jce.spec.GOST3410PublicKeyParameterSetSpec;
-import org.bouncycastle.jce.spec.GOST3410PublicKeySpec;
-
-public class KeyFactorySpi
-    extends BaseKeyFactorySpi
-{
-    public KeyFactorySpi()
-    {
-    }
-
-    protected KeySpec engineGetKeySpec(
-        Key key,
-        Class spec)
-        throws InvalidKeySpecException
-    {
-        if (spec.isAssignableFrom(GOST3410PublicKeySpec.class) && key instanceof GOST3410PublicKey)
-        {
-            GOST3410PublicKey k = (GOST3410PublicKey)key;
-            GOST3410PublicKeyParameterSetSpec parameters = k.getParameters().getPublicKeyParameters();
-
-            return new GOST3410PublicKeySpec(k.getY(), parameters.getP(), parameters.getQ(), parameters.getA());
-        }
-        else if (spec.isAssignableFrom(GOST3410PrivateKeySpec.class) && key instanceof GOST3410PrivateKey)
-        {
-            GOST3410PrivateKey k = (GOST3410PrivateKey)key;
-            GOST3410PublicKeyParameterSetSpec parameters = k.getParameters().getPublicKeyParameters();
-
-            return new GOST3410PrivateKeySpec(k.getX(), parameters.getP(), parameters.getQ(), parameters.getA());
-        }
-
-        return super.engineGetKeySpec(key, spec);
-    }
-
-    protected Key engineTranslateKey(
-        Key key)
-        throws InvalidKeyException
-    {
-        if (key instanceof GOST3410PublicKey)
-        {
-            return new BCGOST3410PublicKey((GOST3410PublicKey)key);
-        }
-        else if (key instanceof GOST3410PrivateKey)
-        {
-            return new BCGOST3410PrivateKey((GOST3410PrivateKey)key);
-        }
-
-        throw new InvalidKeyException("key type unknown");
-    }
-
-    protected PrivateKey engineGeneratePrivate(
-            KeySpec    keySpec)
-    throws InvalidKeySpecException
-    {
-        if (keySpec instanceof GOST3410PrivateKeySpec)
-        {
-            return new BCGOST3410PrivateKey((GOST3410PrivateKeySpec)keySpec);
-        }
-
-        return super.engineGeneratePrivate(keySpec);
-    }
-
-    protected PublicKey engineGeneratePublic(
-            KeySpec    keySpec)
-    throws InvalidKeySpecException
-    {
-        if (keySpec instanceof GOST3410PublicKeySpec)
-        {
-            return new BCGOST3410PublicKey((GOST3410PublicKeySpec)keySpec);
-        }
-
-        return super.engineGeneratePublic(keySpec);
-    }
-
-    public PrivateKey generatePrivate(PrivateKeyInfo keyInfo)
-        throws IOException
-    {
-        ASN1ObjectIdentifier algOid = keyInfo.getPrivateKeyAlgorithm().getAlgorithm();
-
-        if (algOid.equals(CryptoProObjectIdentifiers.gostR3410_94))
-        {
-            return new BCGOST3410PrivateKey(keyInfo);
-        }
-        else
-        {
-            throw new IOException("algorithm identifier " + algOid + " in key not recognised");
-        }
-    }
-
-    public PublicKey generatePublic(SubjectPublicKeyInfo keyInfo)
-        throws IOException
-    {
-        ASN1ObjectIdentifier algOid = keyInfo.getAlgorithm().getAlgorithm();
-
-        if (algOid.equals(CryptoProObjectIdentifiers.gostR3410_94))
-        {
-            return new BCGOST3410PublicKey(keyInfo);
-        }
-        else
-        {
-            throw new IOException("algorithm identifier " + algOid + " in key not recognised");
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/gost/KeyPairGeneratorSpi.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/gost/KeyPairGeneratorSpi.java
deleted file mode 100644
index 0a6a40e..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/gost/KeyPairGeneratorSpi.java
+++ /dev/null
@@ -1,81 +0,0 @@
-package org.bouncycastle.jcajce.provider.asymmetric.gost;
-
-import java.security.InvalidAlgorithmParameterException;
-import java.security.KeyPair;
-import java.security.SecureRandom;
-import java.security.spec.AlgorithmParameterSpec;
-
-import org.bouncycastle.asn1.cryptopro.CryptoProObjectIdentifiers;
-import org.bouncycastle.crypto.AsymmetricCipherKeyPair;
-import org.bouncycastle.crypto.generators.GOST3410KeyPairGenerator;
-import org.bouncycastle.crypto.params.GOST3410KeyGenerationParameters;
-import org.bouncycastle.crypto.params.GOST3410Parameters;
-import org.bouncycastle.crypto.params.GOST3410PrivateKeyParameters;
-import org.bouncycastle.crypto.params.GOST3410PublicKeyParameters;
-import org.bouncycastle.jce.spec.GOST3410ParameterSpec;
-import org.bouncycastle.jce.spec.GOST3410PublicKeyParameterSetSpec;
-
-public class KeyPairGeneratorSpi
-    extends java.security.KeyPairGenerator
-{
-    GOST3410KeyGenerationParameters param;
-    GOST3410KeyPairGenerator engine = new GOST3410KeyPairGenerator();
-    GOST3410ParameterSpec gost3410Params;
-    int strength = 1024;
-    SecureRandom random = null;
-    boolean initialised = false;
-
-    public KeyPairGeneratorSpi()
-    {
-        super("GOST3410");
-    }
-
-    public void initialize(
-        int strength,
-        SecureRandom random)
-    {
-        this.strength = strength;
-        this.random = random;
-    }
-
-    private void init(
-        GOST3410ParameterSpec gParams,
-        SecureRandom random)
-    {
-        GOST3410PublicKeyParameterSetSpec spec = gParams.getPublicKeyParameters();
-
-        param = new GOST3410KeyGenerationParameters(random, new GOST3410Parameters(spec.getP(), spec.getQ(), spec.getA()));
-
-        engine.init(param);
-
-        initialised = true;
-        gost3410Params = gParams;
-    }
-
-    public void initialize(
-        AlgorithmParameterSpec params,
-        SecureRandom random)
-        throws InvalidAlgorithmParameterException
-    {
-        if (!(params instanceof GOST3410ParameterSpec))
-        {
-            throw new InvalidAlgorithmParameterException("parameter object not a GOST3410ParameterSpec");
-        }
-
-        init((GOST3410ParameterSpec)params, random);
-    }
-
-    public KeyPair generateKeyPair()
-    {
-        if (!initialised)
-        {
-            init(new GOST3410ParameterSpec(CryptoProObjectIdentifiers.gostR3410_94_CryptoPro_A.getId()), new SecureRandom());
-        }
-
-        AsymmetricCipherKeyPair pair = engine.generateKeyPair();
-        GOST3410PublicKeyParameters pub = (GOST3410PublicKeyParameters)pair.getPublic();
-        GOST3410PrivateKeyParameters priv = (GOST3410PrivateKeyParameters)pair.getPrivate();
-
-        return new KeyPair(new BCGOST3410PublicKey(pub, gost3410Params), new BCGOST3410PrivateKey(priv, gost3410Params));
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/gost/SignatureSpi.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/gost/SignatureSpi.java
deleted file mode 100644
index 30a6660..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/gost/SignatureSpi.java
+++ /dev/null
@@ -1,229 +0,0 @@
-package org.bouncycastle.jcajce.provider.asymmetric.gost;
-
-import java.math.BigInteger;
-import java.security.InvalidKeyException;
-import java.security.PrivateKey;
-import java.security.PublicKey;
-import java.security.SecureRandom;
-import java.security.SignatureException;
-import java.security.spec.AlgorithmParameterSpec;
-
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.bouncycastle.asn1.x509.X509ObjectIdentifiers;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.DSA;
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.digests.GOST3411Digest;
-import org.bouncycastle.crypto.params.ParametersWithRandom;
-import org.bouncycastle.crypto.signers.GOST3410Signer;
-import org.bouncycastle.jcajce.provider.asymmetric.util.ECUtil;
-import org.bouncycastle.jce.interfaces.ECKey;
-import org.bouncycastle.jce.interfaces.ECPublicKey;
-import org.bouncycastle.jce.interfaces.GOST3410Key;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.jcajce.provider.asymmetric.util.GOST3410Util;
-
-public class SignatureSpi
-    extends java.security.SignatureSpi
-    implements PKCSObjectIdentifiers, X509ObjectIdentifiers
-{
-    private Digest                  digest;
-    private DSA                     signer;
-    private SecureRandom            random;
-
-    public SignatureSpi()
-    {
-        this.digest = new GOST3411Digest();
-        this.signer = new GOST3410Signer();
-    }
-
-    protected void engineInitVerify(
-        PublicKey   publicKey)
-        throws InvalidKeyException
-    {
-        CipherParameters    param;
-
-        if (publicKey instanceof ECPublicKey)
-        {
-            param = ECUtil.generatePublicKeyParameter(publicKey);
-        }
-        else if (publicKey instanceof GOST3410Key)
-        {
-            param = GOST3410Util.generatePublicKeyParameter(publicKey);
-        }
-        else
-        {
-            try
-            {
-                byte[]  bytes = publicKey.getEncoded();
-
-                publicKey = BouncyCastleProvider.getPublicKey(SubjectPublicKeyInfo.getInstance(bytes));
-
-                if (publicKey instanceof ECPublicKey)
-                {
-                    param = ECUtil.generatePublicKeyParameter(publicKey);
-                }
-                else
-                {
-                    throw new InvalidKeyException("can't recognise key type in DSA based signer");
-                }
-            }
-            catch (Exception e)
-            {
-                throw new InvalidKeyException("can't recognise key type in DSA based signer");
-            }
-        }
-
-        digest.reset();
-        signer.init(false, param);
-    }
-
-    protected void engineInitSign(
-        PrivateKey      privateKey,
-        SecureRandom    random)
-        throws InvalidKeyException
-    {
-        this.random = random;
-        engineInitSign(privateKey);
-    }
-
-    protected void engineInitSign(
-        PrivateKey  privateKey)
-        throws InvalidKeyException
-    {
-        CipherParameters    param;
-
-        if (privateKey instanceof ECKey)
-        {
-            param = ECUtil.generatePrivateKeyParameter(privateKey);
-        }
-        else
-        {
-            param = GOST3410Util.generatePrivateKeyParameter(privateKey);
-        }
-
-        digest.reset();
-
-        if (random != null)
-        {
-            signer.init(true, new ParametersWithRandom(param, random));
-        }
-        else
-        {
-            signer.init(true, param);
-        }
-    }
-
-    protected void engineUpdate(
-        byte    b)
-        throws SignatureException
-    {
-        digest.update(b);
-    }
-
-    protected void engineUpdate(
-        byte[]  b,
-        int     off,
-        int     len) 
-        throws SignatureException
-    {
-        digest.update(b, off, len);
-    }
-
-    protected byte[] engineSign()
-        throws SignatureException
-    {
-        byte[]  hash = new byte[digest.getDigestSize()];
-
-        digest.doFinal(hash, 0);
-
-        try
-        {
-            byte[]          sigBytes = new byte[64];
-            BigInteger[]    sig = signer.generateSignature(hash);
-            byte[]          r = sig[0].toByteArray();
-            byte[]          s = sig[1].toByteArray();
-
-            if (s[0] != 0)
-            {
-                System.arraycopy(s, 0, sigBytes, 32 - s.length, s.length);
-            }
-            else
-            {
-                System.arraycopy(s, 1, sigBytes, 32 - (s.length - 1), s.length - 1);
-            }
-            
-            if (r[0] != 0)
-            {
-                System.arraycopy(r, 0, sigBytes, 64 - r.length, r.length);
-            }
-            else
-            {
-                System.arraycopy(r, 1, sigBytes, 64 - (r.length - 1), r.length - 1);
-            }
-
-            return sigBytes;
-        }
-        catch (Exception e)
-        {
-            throw new SignatureException(e.toString());
-        }
-    }
-    
-    protected boolean engineVerify(
-        byte[]  sigBytes) 
-        throws SignatureException
-    {
-        byte[]  hash = new byte[digest.getDigestSize()];
-
-        digest.doFinal(hash, 0);
-
-        BigInteger[]    sig;
-
-        try
-        {
-            byte[] r = new byte[32]; 
-            byte[] s = new byte[32];
-
-            System.arraycopy(sigBytes, 0, s, 0, 32);
-
-            System.arraycopy(sigBytes, 32, r, 0, 32);
-            
-            sig = new BigInteger[2];
-            sig[0] = new BigInteger(1, r);
-            sig[1] = new BigInteger(1, s);
-        }
-        catch (Exception e)
-        {
-            throw new SignatureException("error decoding signature bytes.");
-        }
-
-        return signer.verifySignature(hash, sig[0], sig[1]);
-    }
-
-    protected void engineSetParameter(
-        AlgorithmParameterSpec params)
-    {
-        throw new UnsupportedOperationException("engineSetParameter unsupported");
-    }
-
-    /**
-     * @deprecated replaced with <a href = "#engineSetParameter(java.security.spec.AlgorithmParameterSpec)">
-     */
-    protected void engineSetParameter(
-        String  param,
-        Object  value)
-    {
-        throw new UnsupportedOperationException("engineSetParameter unsupported");
-    }
-
-    /**
-     * @deprecated
-     */
-    protected Object engineGetParameter(
-        String      param)
-    {
-        throw new UnsupportedOperationException("engineSetParameter unsupported");
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/ies/AlgorithmParametersSpi.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/ies/AlgorithmParametersSpi.java
deleted file mode 100644
index 61f1e37..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/ies/AlgorithmParametersSpi.java
+++ /dev/null
@@ -1,138 +0,0 @@
-package org.bouncycastle.jcajce.provider.asymmetric.ies;
-
-import java.io.IOException;
-import java.security.spec.AlgorithmParameterSpec;
-import java.security.spec.InvalidParameterSpecException;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Encoding;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DEROctetString;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.jce.spec.IESParameterSpec;
-
-public class AlgorithmParametersSpi
-    extends java.security.AlgorithmParametersSpi
-{
-    protected boolean isASN1FormatString(String format)
-    {
-        return format == null || format.equals("ASN.1");
-    }
-
-    protected AlgorithmParameterSpec engineGetParameterSpec(
-        Class paramSpec)
-        throws InvalidParameterSpecException
-    {
-        if (paramSpec == null)
-        {
-            throw new NullPointerException("argument to getParameterSpec must not be null");
-        }
-
-        return localEngineGetParameterSpec(paramSpec);
-    }
-
-    IESParameterSpec currentSpec;
-
-    /**
-     * in the absence of a standard way of doing it this will do for
-     * now...
-     */
-    protected byte[] engineGetEncoded()
-    {
-        try
-        {
-            ASN1EncodableVector v = new ASN1EncodableVector();
-
-            v.add(new DEROctetString(currentSpec.getDerivationV()));
-            v.add(new DEROctetString(currentSpec.getEncodingV()));
-            v.add(new ASN1Integer(currentSpec.getMacKeySize()));
-
-            return new DERSequence(v).getEncoded(ASN1Encoding.DER);
-        }
-        catch (IOException e)
-        {
-            throw new RuntimeException("Error encoding IESParameters");
-        }
-    }
-
-    protected byte[] engineGetEncoded(
-        String format)
-    {
-        if (isASN1FormatString(format) || format.equalsIgnoreCase("X.509"))
-        {
-            return engineGetEncoded();
-        }
-
-        return null;
-    }
-
-    protected AlgorithmParameterSpec localEngineGetParameterSpec(
-        Class paramSpec)
-        throws InvalidParameterSpecException
-    {
-        if (paramSpec == IESParameterSpec.class)
-        {
-            return currentSpec;
-        }
-
-        throw new InvalidParameterSpecException("unknown parameter spec passed to ElGamal parameters object.");
-    }
-
-    protected void engineInit(
-        AlgorithmParameterSpec paramSpec)
-        throws InvalidParameterSpecException
-    {
-        if (!(paramSpec instanceof IESParameterSpec))
-        {
-            throw new InvalidParameterSpecException("IESParameterSpec required to initialise a IES algorithm parameters object");
-        }
-
-        this.currentSpec = (IESParameterSpec)paramSpec;
-    }
-
-    protected void engineInit(
-        byte[] params)
-        throws IOException
-    {
-        try
-        {
-            ASN1Sequence s = (ASN1Sequence)ASN1Primitive.fromByteArray(params);
-
-            this.currentSpec = new IESParameterSpec(
-                ((ASN1OctetString)s.getObjectAt(0)).getOctets(),
-                ((ASN1OctetString)s.getObjectAt(0)).getOctets(),
-                ((ASN1Integer)s.getObjectAt(0)).getValue().intValue());
-        }
-        catch (ClassCastException e)
-        {
-            throw new IOException("Not a valid IES Parameter encoding.");
-        }
-        catch (ArrayIndexOutOfBoundsException e)
-        {
-            throw new IOException("Not a valid IES Parameter encoding.");
-        }
-    }
-
-    protected void engineInit(
-        byte[] params,
-        String format)
-        throws IOException
-    {
-        if (isASN1FormatString(format) || format.equalsIgnoreCase("X.509"))
-        {
-            engineInit(params);
-        }
-        else
-        {
-            throw new IOException("Unknown parameter format " + format);
-        }
-    }
-
-    protected String engineToString()
-    {
-        return "IES Parameters";
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/ies/CipherSpi.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/ies/CipherSpi.java
deleted file mode 100644
index 430f6b1..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/ies/CipherSpi.java
+++ /dev/null
@@ -1,367 +0,0 @@
-package org.bouncycastle.jcajce.provider.asymmetric.ies;
-
-import java.io.ByteArrayOutputStream;
-import java.security.AlgorithmParameters;
-import java.security.InvalidAlgorithmParameterException;
-import java.security.InvalidKeyException;
-import java.security.Key;
-import java.security.SecureRandom;
-import java.security.spec.AlgorithmParameterSpec;
-
-import javax.crypto.BadPaddingException;
-import javax.crypto.Cipher;
-import javax.crypto.IllegalBlockSizeException;
-import javax.crypto.NoSuchPaddingException;
-import javax.crypto.interfaces.DHPrivateKey;
-import javax.crypto.interfaces.DHPublicKey;
-
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.InvalidCipherTextException;
-import org.bouncycastle.crypto.agreement.DHBasicAgreement;
-import org.bouncycastle.crypto.digests.SHA1Digest;
-import org.bouncycastle.crypto.engines.IESEngine;
-import org.bouncycastle.crypto.generators.KDF2BytesGenerator;
-import org.bouncycastle.crypto.macs.HMac;
-import org.bouncycastle.crypto.params.IESParameters;
-import org.bouncycastle.jcajce.provider.asymmetric.util.DHUtil;
-import org.bouncycastle.jcajce.provider.asymmetric.util.ECUtil;
-import org.bouncycastle.jcajce.util.BCJcaJceHelper;
-import org.bouncycastle.jcajce.util.JcaJceHelper;
-import org.bouncycastle.jce.interfaces.ECPrivateKey;
-import org.bouncycastle.jce.interfaces.IESKey;
-import org.bouncycastle.jce.spec.IESParameterSpec;
-
-public class CipherSpi
-    extends javax.crypto.CipherSpi
-{
-    private final JcaJceHelper     helper = new BCJcaJceHelper();
-
-    private IESEngine cipher;
-    private int                     state = -1;
-    private ByteArrayOutputStream   buffer = new ByteArrayOutputStream();
-    private AlgorithmParameters     engineParam = null;
-    private IESParameterSpec        engineParams = null;
-
-    //
-    // specs we can handle.
-    //
-    private Class[]                 availableSpecs =
-                                    {
-                                        IESParameterSpec.class
-                                    };
-
-    public CipherSpi(
-        IESEngine engine)
-    {
-        cipher = engine;
-    }
-
-    protected int engineGetBlockSize() 
-    {
-        return 0;
-    }
-
-    protected byte[] engineGetIV() 
-    {
-        return null;
-    }
-
-    protected int engineGetKeySize(
-        Key     key) 
-    {
-        if (!(key instanceof IESKey))
-        {
-            throw new IllegalArgumentException("must be passed IE key");
-        }
-
-        IESKey   ieKey = (IESKey)key;
-
-        if (ieKey.getPrivate() instanceof DHPrivateKey)
-        {
-            DHPrivateKey   k = (DHPrivateKey)ieKey.getPrivate();
-
-            return k.getX().bitLength();
-        }
-        else if (ieKey.getPrivate() instanceof ECPrivateKey)
-        {
-            ECPrivateKey   k = (ECPrivateKey)ieKey.getPrivate();
-
-            return k.getD().bitLength();
-        }
-
-        throw new IllegalArgumentException("not an IE key!");
-    }
-
-    protected int engineGetOutputSize(
-        int     inputLen) 
-    {
-        if (state == Cipher.ENCRYPT_MODE || state == Cipher.WRAP_MODE)
-        {
-            return buffer.size() + inputLen + 20; /* SHA1 MAC size */
-        }
-        else if (state == Cipher.DECRYPT_MODE || state == Cipher.UNWRAP_MODE)
-        {
-            return buffer.size() + inputLen - 20;
-        }
-        else
-        {
-            throw new IllegalStateException("cipher not initialised");
-        }
-    }
-
-    protected AlgorithmParameters engineGetParameters() 
-    {
-        if (engineParam == null)
-        {
-            if (engineParams != null)
-            {
-                String  name = "IES";
-
-                try
-                {
-                    engineParam = helper.createAlgorithmParameters(name);
-                    engineParam.init(engineParams);
-                }
-                catch (Exception e)
-                {
-                    throw new RuntimeException(e.toString());
-                }
-            }
-        }
-
-        return engineParam;
-    }
-
-    protected void engineSetMode(
-        String  mode) 
-    {
-        throw new IllegalArgumentException("can't support mode " + mode);
-    }
-
-    protected void engineSetPadding(
-        String  padding) 
-        throws NoSuchPaddingException
-    {
-        throw new NoSuchPaddingException(padding + " unavailable with RSA.");
-    }
-
-    protected void engineInit(
-        int                     opmode,
-        Key                     key,
-        AlgorithmParameterSpec  params,
-        SecureRandom            random) 
-    throws InvalidKeyException, InvalidAlgorithmParameterException
-    {
-        if (!(key instanceof IESKey))
-        {
-            throw new InvalidKeyException("must be passed IES key");
-        }
-
-        if (params == null && (opmode == Cipher.ENCRYPT_MODE || opmode == Cipher.WRAP_MODE))
-        {
-            //
-            // if nothing is specified we set up for a 128 bit mac, with
-            // 128 bit derivation vectors.
-            //
-            byte[]  d = new byte[16];
-            byte[]  e = new byte[16];
-
-            if (random == null)
-            {
-                random = new SecureRandom();
-            }
-
-            random.nextBytes(d);
-            random.nextBytes(e);
-
-            params = new IESParameterSpec(d, e, 128);
-        }
-        else if (!(params instanceof IESParameterSpec))
-        {
-            throw new InvalidAlgorithmParameterException("must be passed IES parameters");
-        }
-
-        IESKey       ieKey = (IESKey)key;
-
-        CipherParameters pubKey;
-        CipherParameters privKey;
-
-        if (ieKey.getPublic() instanceof DHPublicKey)
-        {
-            pubKey = DHUtil.generatePublicKeyParameter(ieKey.getPublic());
-            privKey = DHUtil.generatePrivateKeyParameter(ieKey.getPrivate());
-
-        }
-        else
-        {
-            pubKey = ECUtil.generatePublicKeyParameter(ieKey.getPublic());
-            privKey = ECUtil.generatePrivateKeyParameter(ieKey.getPrivate());
-        }
-
-        this.engineParams = (IESParameterSpec)params;
-
-        IESParameters       p = new IESParameters(engineParams.getDerivationV(), engineParams.getEncodingV(), engineParams.getMacKeySize());
-
-        this.state = opmode;
-
-        buffer.reset();
-
-        switch (opmode)
-        {
-        case Cipher.ENCRYPT_MODE:
-        case Cipher.WRAP_MODE:
-            cipher.init(true, privKey, pubKey, p);
-            break;
-        case Cipher.DECRYPT_MODE:
-        case Cipher.UNWRAP_MODE:
-            cipher.init(false, privKey, pubKey, p);
-            break;
-        default:
-            System.out.println("eeek!");
-        }
-    }
-
-    protected void engineInit(
-        int                 opmode,
-        Key                 key,
-        AlgorithmParameters params,
-        SecureRandom        random) 
-    throws InvalidKeyException, InvalidAlgorithmParameterException
-    {
-        AlgorithmParameterSpec  paramSpec = null;
-
-        if (params != null)
-        {
-            for (int i = 0; i != availableSpecs.length; i++)
-            {
-                try
-                {
-                    paramSpec = params.getParameterSpec(availableSpecs[i]);
-                    break;
-                }
-                catch (Exception e)
-                {
-                    continue;
-                }
-            }
-
-            if (paramSpec == null)
-            {
-                throw new InvalidAlgorithmParameterException("can't handle parameter " + params.toString());
-            }
-        }
-
-        engineParam = params;
-        engineInit(opmode, key, paramSpec, random);
-    }
-
-    protected void engineInit(
-        int                 opmode,
-        Key                 key,
-        SecureRandom        random) 
-    throws InvalidKeyException
-    {
-        if (opmode == Cipher.ENCRYPT_MODE || opmode == Cipher.WRAP_MODE)
-        {
-            try
-            {
-                engineInit(opmode, key, (AlgorithmParameterSpec)null, random);
-                return;
-            }
-            catch (InvalidAlgorithmParameterException e)
-            {
-                // fall through...
-            }
-        }
-
-        throw new IllegalArgumentException("can't handle null parameter spec in IES");
-    }
-
-    protected byte[] engineUpdate(
-        byte[]  input,
-        int     inputOffset,
-        int     inputLen) 
-    {
-        buffer.write(input, inputOffset, inputLen);
-        return null;
-    }
-
-    protected int engineUpdate(
-        byte[]  input,
-        int     inputOffset,
-        int     inputLen,
-        byte[]  output,
-        int     outputOffset) 
-    {
-        buffer.write(input, inputOffset, inputLen);
-        return 0;
-    }
-
-    protected byte[] engineDoFinal(
-        byte[]  input,
-        int     inputOffset,
-        int     inputLen) 
-        throws IllegalBlockSizeException, BadPaddingException
-    {
-        if (inputLen != 0)
-        {
-            buffer.write(input, inputOffset, inputLen);
-        }
-
-        try
-        {
-            byte[]  buf = buffer.toByteArray();
-
-            buffer.reset();
-
-            return cipher.processBlock(buf, 0, buf.length);
-        }
-        catch (InvalidCipherTextException e)
-        {
-            throw new BadPaddingException(e.getMessage());
-        }
-    }
-
-    protected int engineDoFinal(
-        byte[]  input,
-        int     inputOffset,
-        int     inputLen,
-        byte[]  output,
-        int     outputOffset) 
-        throws IllegalBlockSizeException, BadPaddingException
-    {
-        if (inputLen != 0)
-        {
-            buffer.write(input, inputOffset, inputLen);
-        }
-
-        try
-        {
-            byte[]  buf = buffer.toByteArray();
-
-            buffer.reset();
-
-            buf = cipher.processBlock(buf, 0, buf.length);
-
-            System.arraycopy(buf, 0, output, outputOffset, buf.length);
-
-            return buf.length;
-        }
-        catch (InvalidCipherTextException e)
-        {
-            throw new BadPaddingException(e.getMessage());
-        }
-    }
-
-    static public class IES
-        extends CipherSpi
-    {
-        public IES()
-        {
-            super(new IESEngine(
-                   new DHBasicAgreement(),
-                   new KDF2BytesGenerator(new SHA1Digest()),
-                   new HMac(new SHA1Digest())));
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/rsa/CipherSpi.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/rsa/CipherSpi.java
index 239e511..aceb5ee 100644
--- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/rsa/CipherSpi.java
+++ b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/rsa/CipherSpi.java
@@ -26,7 +26,9 @@ import org.bouncycastle.crypto.AsymmetricBlockCipher;
 import org.bouncycastle.crypto.CipherParameters;
 import org.bouncycastle.crypto.Digest;
 import org.bouncycastle.crypto.InvalidCipherTextException;
-import org.bouncycastle.crypto.encodings.ISO9796d1Encoding;
+// BEGIN android-removed
+// import org.bouncycastle.crypto.encodings.ISO9796d1Encoding;
+// END android-removed
 import org.bouncycastle.crypto.encodings.OAEPEncoding;
 import org.bouncycastle.crypto.encodings.PKCS1Encoding;
 import org.bouncycastle.crypto.engines.RSABlindedEngine;
@@ -201,10 +203,12 @@ public class CipherSpi
         {
             cipher = new PKCS1Encoding(new RSABlindedEngine());
         }
-        else if (pad.equals("ISO9796-1PADDING"))
-        {
-            cipher = new ISO9796d1Encoding(new RSABlindedEngine());
-        }
+        // BEGIN android-removed
+        // else if (pad.equals("ISO9796-1PADDING"))
+        // {
+        //     cipher = new ISO9796d1Encoding(new RSABlindedEngine());
+        // }
+        // END android-removed
         else if (pad.equals("OAEPWITHMD5ANDMGF1PADDING"))
         {
             initFromSpec(new OAEPParameterSpec("MD5", "MGF1", new MGF1ParameterSpec("MD5"), PSource.PSpecified.DEFAULT));
@@ -543,48 +547,50 @@ public class CipherSpi
         }
     }
 
-    static public class PKCS1v1_5Padding
-        extends CipherSpi
-    {
-        public PKCS1v1_5Padding()
-        {
-            super(new PKCS1Encoding(new RSABlindedEngine()));
-        }
-    }
-
-    static public class PKCS1v1_5Padding_PrivateOnly
-        extends CipherSpi
-    {
-        public PKCS1v1_5Padding_PrivateOnly()
-        {
-            super(false, true, new PKCS1Encoding(new RSABlindedEngine()));
-        }
-    }
-
-    static public class PKCS1v1_5Padding_PublicOnly
-        extends CipherSpi
-    {
-        public PKCS1v1_5Padding_PublicOnly()
-        {
-            super(true, false, new PKCS1Encoding(new RSABlindedEngine()));
-        }
-    }
-
-    static public class OAEPPadding
-        extends CipherSpi
-    {
-        public OAEPPadding()
-        {
-            super(OAEPParameterSpec.DEFAULT);
-        }
-    }
-    
-    static public class ISO9796d1Padding
-        extends CipherSpi
-    {
-        public ISO9796d1Padding()
-        {
-            super(new ISO9796d1Encoding(new RSABlindedEngine()));
-        }
-    }
+    // BEGIN android-removed
+    // static public class PKCS1v1_5Padding
+    //     extends CipherSpi
+    // {
+    //     public PKCS1v1_5Padding()
+    //     {
+    //         super(new PKCS1Encoding(new RSABlindedEngine()));
+    //     }
+    // }
+    //
+    // static public class PKCS1v1_5Padding_PrivateOnly
+    //     extends CipherSpi
+    // {
+    //     public PKCS1v1_5Padding_PrivateOnly()
+    //     {
+    //         super(false, true, new PKCS1Encoding(new RSABlindedEngine()));
+    //     }
+    // }
+    //
+    // static public class PKCS1v1_5Padding_PublicOnly
+    //     extends CipherSpi
+    // {
+    //     public PKCS1v1_5Padding_PublicOnly()
+    //     {
+    //         super(true, false, new PKCS1Encoding(new RSABlindedEngine()));
+    //     }
+    // }
+    //
+    // static public class OAEPPadding
+    //     extends CipherSpi
+    // {
+    //     public OAEPPadding()
+    //     {
+    //         super(OAEPParameterSpec.DEFAULT);
+    //     }
+    // }
+    //
+    // static public class ISO9796d1Padding
+    //     extends CipherSpi
+    // {
+    //     public ISO9796d1Padding()
+    //     {
+    //         super(new ISO9796d1Encoding(new RSABlindedEngine()));
+    //     }
+    // }
+    // END android-removed
 }
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/rsa/DigestSignatureSpi.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/rsa/DigestSignatureSpi.java
index c04bec9..123ed41 100644
--- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/rsa/DigestSignatureSpi.java
+++ b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/rsa/DigestSignatureSpi.java
@@ -17,24 +17,31 @@ import org.bouncycastle.asn1.DERNull;
 import org.bouncycastle.asn1.nist.NISTObjectIdentifiers;
 import org.bouncycastle.asn1.oiw.OIWObjectIdentifiers;
 import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.asn1.teletrust.TeleTrusTObjectIdentifiers;
+// BEGIN android-removed
+// import org.bouncycastle.asn1.teletrust.TeleTrusTObjectIdentifiers;
+// END android-removed
 import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
 import org.bouncycastle.asn1.x509.DigestInfo;
 import org.bouncycastle.crypto.AsymmetricBlockCipher;
 import org.bouncycastle.crypto.CipherParameters;
 import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.digests.MD2Digest;
-import org.bouncycastle.crypto.digests.MD4Digest;
-import org.bouncycastle.crypto.digests.MD5Digest;
-import org.bouncycastle.crypto.digests.NullDigest;
-import org.bouncycastle.crypto.digests.RIPEMD128Digest;
-import org.bouncycastle.crypto.digests.RIPEMD160Digest;
-import org.bouncycastle.crypto.digests.RIPEMD256Digest;
-import org.bouncycastle.crypto.digests.SHA1Digest;
-import org.bouncycastle.crypto.digests.SHA224Digest;
-import org.bouncycastle.crypto.digests.SHA256Digest;
-import org.bouncycastle.crypto.digests.SHA384Digest;
-import org.bouncycastle.crypto.digests.SHA512Digest;
+// BEGIN android-removed
+// import org.bouncycastle.crypto.digests.MD2Digest;
+// import org.bouncycastle.crypto.digests.MD4Digest;
+// import org.bouncycastle.crypto.digests.MD5Digest;
+// import org.bouncycastle.crypto.digests.NullDigest;
+// import org.bouncycastle.crypto.digests.RIPEMD128Digest;
+// import org.bouncycastle.crypto.digests.RIPEMD160Digest;
+// import org.bouncycastle.crypto.digests.RIPEMD256Digest;
+// import org.bouncycastle.crypto.digests.SHA1Digest;
+// import org.bouncycastle.crypto.digests.SHA224Digest;
+// import org.bouncycastle.crypto.digests.SHA256Digest;
+// import org.bouncycastle.crypto.digests.SHA384Digest;
+// import org.bouncycastle.crypto.digests.SHA512Digest;
+// END android-removed
+// BEGIN android-added
+import org.bouncycastle.crypto.digests.AndroidDigestFactory;
+// END android-added
 import org.bouncycastle.crypto.encodings.PKCS1Encoding;
 import org.bouncycastle.crypto.engines.RSABlindedEngine;
 import org.bouncycastle.util.Arrays;
@@ -254,7 +261,9 @@ public class DigestSignatureSpi
     {
         public SHA1()
         {
-            super(OIWObjectIdentifiers.idSHA1, new SHA1Digest(), new PKCS1Encoding(new RSABlindedEngine()));
+            // BEGIN android-changed
+            super(OIWObjectIdentifiers.idSHA1, AndroidDigestFactory.getSHA1(), new PKCS1Encoding(new RSABlindedEngine()));
+            // END android-changed
         }
     }
 
@@ -263,7 +272,9 @@ public class DigestSignatureSpi
     {
         public SHA224()
         {
-            super(NISTObjectIdentifiers.id_sha224, new SHA224Digest(), new PKCS1Encoding(new RSABlindedEngine()));
+            // BEGIN android-changed
+            super(NISTObjectIdentifiers.id_sha224, AndroidDigestFactory.getSHA224(), new PKCS1Encoding(new RSABlindedEngine()));
+            // END android-changed
         }
     }
 
@@ -272,7 +283,9 @@ public class DigestSignatureSpi
     {
         public SHA256()
         {
-            super(NISTObjectIdentifiers.id_sha256, new SHA256Digest(), new PKCS1Encoding(new RSABlindedEngine()));
+            // BEGIN android-changed
+            super(NISTObjectIdentifiers.id_sha256, AndroidDigestFactory.getSHA256(), new PKCS1Encoding(new RSABlindedEngine()));
+            // END android-changed
         }
     }
 
@@ -281,7 +294,9 @@ public class DigestSignatureSpi
     {
         public SHA384()
         {
-            super(NISTObjectIdentifiers.id_sha384, new SHA384Digest(), new PKCS1Encoding(new RSABlindedEngine()));
+            // BEGIN android-changed
+            super(NISTObjectIdentifiers.id_sha384, AndroidDigestFactory.getSHA384(), new PKCS1Encoding(new RSABlindedEngine()));
+            // END android-changed
         }
     }
 
@@ -290,70 +305,78 @@ public class DigestSignatureSpi
     {
         public SHA512()
         {
-            super(NISTObjectIdentifiers.id_sha512, new SHA512Digest(), new PKCS1Encoding(new RSABlindedEngine()));
+            // BEGIN android-changed
+            super(NISTObjectIdentifiers.id_sha512, AndroidDigestFactory.getSHA512(), new PKCS1Encoding(new RSABlindedEngine()));
+            // END android-changed
         }
     }
 
-    static public class MD2
-        extends DigestSignatureSpi
-    {
-        public MD2()
-        {
-            super(PKCSObjectIdentifiers.md2, new MD2Digest(), new PKCS1Encoding(new RSABlindedEngine()));
-        }
-    }
-
-    static public class MD4
-        extends DigestSignatureSpi
-    {
-        public MD4()
-        {
-            super(PKCSObjectIdentifiers.md4, new MD4Digest(), new PKCS1Encoding(new RSABlindedEngine()));
-        }
-    }
+    // BEGIN android-removed
+    // static public class MD2
+    //     extends DigestSignatureSpi
+    // {
+    //     public MD2()
+    //     {
+    //         super(PKCSObjectIdentifiers.md2, new MD2Digest(), new PKCS1Encoding(new RSABlindedEngine()));
+    //     }
+    // }
+    //
+    // static public class MD4
+    //     extends DigestSignatureSpi
+    // {
+    //     public MD4()
+    //     {
+    //         super(PKCSObjectIdentifiers.md4, new MD4Digest(), new PKCS1Encoding(new RSABlindedEngine()));
+    //     }
+    // }
+    // END android-removed
 
     static public class MD5
         extends DigestSignatureSpi
     {
         public MD5()
         {
-            super(PKCSObjectIdentifiers.md5, new MD5Digest(), new PKCS1Encoding(new RSABlindedEngine()));
-        }
-    }
-
-    static public class RIPEMD160
-        extends DigestSignatureSpi
-    {
-        public RIPEMD160()
-        {
-            super(TeleTrusTObjectIdentifiers.ripemd160, new RIPEMD160Digest(), new PKCS1Encoding(new RSABlindedEngine()));
+            // BEGIN android-changed
+            super(PKCSObjectIdentifiers.md5, AndroidDigestFactory.getMD5(), new PKCS1Encoding(new RSABlindedEngine()));
+            // END android-changed
         }
     }
 
-    static public class RIPEMD128
-        extends DigestSignatureSpi
-    {
-        public RIPEMD128()
-        {
-            super(TeleTrusTObjectIdentifiers.ripemd128, new RIPEMD128Digest(), new PKCS1Encoding(new RSABlindedEngine()));
-        }
-    }
-
-    static public class RIPEMD256
-        extends DigestSignatureSpi
-    {
-        public RIPEMD256()
-        {
-            super(TeleTrusTObjectIdentifiers.ripemd256, new RIPEMD256Digest(), new PKCS1Encoding(new RSABlindedEngine()));
-        }
-    }
-
-    static public class noneRSA
-        extends DigestSignatureSpi
-    {
-        public noneRSA()
-        {
-            super(new NullDigest(), new PKCS1Encoding(new RSABlindedEngine()));
-        }
-    }
+    // BEGIN android-removed
+    // static public class RIPEMD160
+    //     extends DigestSignatureSpi
+    // {
+    //     public RIPEMD160()
+    //     {
+    //         super(TeleTrusTObjectIdentifiers.ripemd160, new RIPEMD160Digest(), new PKCS1Encoding(new RSABlindedEngine()));
+    //     }
+    // }
+    //
+    // static public class RIPEMD128
+    //     extends DigestSignatureSpi
+    // {
+    //     public RIPEMD128()
+    //     {
+    //         super(TeleTrusTObjectIdentifiers.ripemd128, new RIPEMD128Digest(), new PKCS1Encoding(new RSABlindedEngine()));
+    //     }
+    // }
+    //
+    // static public class RIPEMD256
+    //     extends DigestSignatureSpi
+    // {
+    //     public RIPEMD256()
+    //     {
+    //         super(TeleTrusTObjectIdentifiers.ripemd256, new RIPEMD256Digest(), new PKCS1Encoding(new RSABlindedEngine()));
+    //     }
+    // }
+    //
+    // static public class noneRSA
+    //     extends DigestSignatureSpi
+    // {
+    //     public noneRSA()
+    //     {
+    //         super(new NullDigest(), new PKCS1Encoding(new RSABlindedEngine()));
+    //     }
+    // }
+    // END android-removed
 }
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/rsa/ISOSignatureSpi.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/rsa/ISOSignatureSpi.java
deleted file mode 100644
index 4d24e96..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/rsa/ISOSignatureSpi.java
+++ /dev/null
@@ -1,142 +0,0 @@
-package org.bouncycastle.jcajce.provider.asymmetric.rsa;
-
-import java.security.InvalidKeyException;
-import java.security.PrivateKey;
-import java.security.PublicKey;
-import java.security.SignatureException;
-import java.security.SignatureSpi;
-import java.security.interfaces.RSAPrivateKey;
-import java.security.interfaces.RSAPublicKey;
-import java.security.spec.AlgorithmParameterSpec;
-
-import org.bouncycastle.crypto.AsymmetricBlockCipher;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.digests.MD5Digest;
-import org.bouncycastle.crypto.digests.RIPEMD160Digest;
-import org.bouncycastle.crypto.digests.SHA1Digest;
-import org.bouncycastle.crypto.engines.RSABlindedEngine;
-import org.bouncycastle.crypto.signers.ISO9796d2Signer;
-
-public class ISOSignatureSpi
-    extends SignatureSpi
-{
-    private ISO9796d2Signer signer;
-
-    protected ISOSignatureSpi(
-        Digest digest,
-        AsymmetricBlockCipher cipher)
-    {
-        signer = new ISO9796d2Signer(cipher, digest, true);
-    }
-
-    protected void engineInitVerify(
-        PublicKey publicKey)
-        throws InvalidKeyException
-    {
-        CipherParameters param = RSAUtil.generatePublicKeyParameter((RSAPublicKey)publicKey);
-
-        signer.init(false, param);
-    }
-
-    protected void engineInitSign(
-        PrivateKey privateKey)
-        throws InvalidKeyException
-    {
-        CipherParameters param = RSAUtil.generatePrivateKeyParameter((RSAPrivateKey)privateKey);
-
-        signer.init(true, param);
-    }
-
-    protected void engineUpdate(
-        byte    b)
-        throws SignatureException
-    {
-        signer.update(b);
-    }
-
-    protected void engineUpdate(
-        byte[]  b,
-        int     off,
-        int     len) 
-        throws SignatureException
-    {
-        signer.update(b, off, len);
-    }
-
-    protected byte[] engineSign()
-        throws SignatureException
-    {
-        try
-        {
-            byte[]  sig = signer.generateSignature();
-
-            return sig;
-        }
-        catch (Exception e)
-        {
-            throw new SignatureException(e.toString());
-        }
-    }
-
-    protected boolean engineVerify(
-        byte[]  sigBytes) 
-        throws SignatureException
-    {
-        boolean yes = signer.verifySignature(sigBytes);
-
-        return yes;
-    }
-
-    protected void engineSetParameter(
-        AlgorithmParameterSpec params)
-    {
-        throw new UnsupportedOperationException("engineSetParameter unsupported");
-    }
-
-    /**
-     * @deprecated replaced with <a href = "#engineSetParameter(java.security.spec.AlgorithmParameterSpec)">
-     */
-    protected void engineSetParameter(
-        String param,
-        Object value)
-    {
-        throw new UnsupportedOperationException("engineSetParameter unsupported");
-    }
-
-    /**
-     * @deprecated
-     */
-    protected Object engineGetParameter(
-        String param)
-    {
-        throw new UnsupportedOperationException("engineSetParameter unsupported");
-    }
-
-    static public class SHA1WithRSAEncryption
-        extends ISOSignatureSpi
-    {
-        public SHA1WithRSAEncryption()
-        {
-            super(new SHA1Digest(), new RSABlindedEngine());
-        }
-    }
-
-    static public class MD5WithRSAEncryption
-        extends ISOSignatureSpi
-    {
-        public MD5WithRSAEncryption()
-        {
-            super(new MD5Digest(), new RSABlindedEngine());
-        }
-    }
-
-    static public class RIPEMD160WithRSAEncryption
-        extends ISOSignatureSpi
-    {
-        public RIPEMD160WithRSAEncryption()
-        {
-            super(new RIPEMD160Digest(), new RSABlindedEngine());
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/rsa/PSSSignatureSpi.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/rsa/PSSSignatureSpi.java
deleted file mode 100644
index ea632fc..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/rsa/PSSSignatureSpi.java
+++ /dev/null
@@ -1,398 +0,0 @@
-package org.bouncycastle.jcajce.provider.asymmetric.rsa;
-
-import java.io.ByteArrayOutputStream;
-import java.security.AlgorithmParameters;
-import java.security.InvalidKeyException;
-import java.security.InvalidParameterException;
-import java.security.PrivateKey;
-import java.security.PublicKey;
-import java.security.SecureRandom;
-import java.security.SignatureException;
-import java.security.SignatureSpi;
-import java.security.interfaces.RSAPrivateKey;
-import java.security.interfaces.RSAPublicKey;
-import java.security.spec.AlgorithmParameterSpec;
-import java.security.spec.MGF1ParameterSpec;
-import java.security.spec.PSSParameterSpec;
-
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.crypto.AsymmetricBlockCipher;
-import org.bouncycastle.crypto.CryptoException;
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.engines.RSABlindedEngine;
-import org.bouncycastle.crypto.params.ParametersWithRandom;
-import org.bouncycastle.jcajce.provider.util.DigestFactory;
-import org.bouncycastle.jcajce.util.BCJcaJceHelper;
-import org.bouncycastle.jcajce.util.JcaJceHelper;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-
-public class PSSSignatureSpi
-    extends SignatureSpi
-{
-    private final JcaJceHelper helper = new BCJcaJceHelper();
-
-    private AlgorithmParameters engineParams;
-    private PSSParameterSpec paramSpec;
-    private PSSParameterSpec originalSpec;
-    private AsymmetricBlockCipher signer;
-    private Digest contentDigest;
-    private Digest mgfDigest;
-    private int saltLength;
-    private byte trailer;
-    private boolean isRaw;
-
-    private org.bouncycastle.crypto.signers.PSSSigner pss;
-
-    private byte getTrailer(
-        int trailerField)
-    {
-        if (trailerField == 1)
-        {
-            return org.bouncycastle.crypto.signers.PSSSigner.TRAILER_IMPLICIT;
-        }
-        
-        throw new IllegalArgumentException("unknown trailer field");
-    }
-
-    private void setupContentDigest()
-    {
-        if (isRaw)
-        {
-            this.contentDigest = new NullPssDigest(mgfDigest);
-        }
-        else
-        {
-            this.contentDigest = mgfDigest;
-        }
-    }
-
-    // care - this constructor is actually used by outside organisations
-    protected PSSSignatureSpi(
-        AsymmetricBlockCipher signer,
-        PSSParameterSpec paramSpecArg)
-    {
-        this(signer, paramSpecArg, false);
-    }
-
-    // care - this constructor is actually used by outside organisations
-    protected PSSSignatureSpi(
-        AsymmetricBlockCipher signer,
-        PSSParameterSpec baseParamSpec,
-        boolean isRaw)
-    {
-        this.signer = signer;
-        this.originalSpec = baseParamSpec;
-        
-        if (baseParamSpec == null)
-        {
-            this.paramSpec = PSSParameterSpec.DEFAULT;
-        }
-        else
-        {
-            this.paramSpec = baseParamSpec;
-        }
-
-        this.mgfDigest = DigestFactory.getDigest(paramSpec.getDigestAlgorithm());
-        this.saltLength = paramSpec.getSaltLength();
-        this.trailer = getTrailer(paramSpec.getTrailerField());
-        this.isRaw = isRaw;
-
-        setupContentDigest();
-    }
-    
-    protected void engineInitVerify(
-        PublicKey publicKey)
-        throws InvalidKeyException
-    {
-        if (!(publicKey instanceof RSAPublicKey))
-        {
-            throw new InvalidKeyException("Supplied key is not a RSAPublicKey instance");
-        }
-
-        pss = new org.bouncycastle.crypto.signers.PSSSigner(signer, contentDigest, mgfDigest, saltLength, trailer);
-        pss.init(false,
-            RSAUtil.generatePublicKeyParameter((RSAPublicKey)publicKey));
-    }
-
-    protected void engineInitSign(
-        PrivateKey privateKey,
-        SecureRandom random)
-        throws InvalidKeyException
-    {
-        if (!(privateKey instanceof RSAPrivateKey))
-        {
-            throw new InvalidKeyException("Supplied key is not a RSAPrivateKey instance");
-        }
-
-        pss = new org.bouncycastle.crypto.signers.PSSSigner(signer, contentDigest, mgfDigest, saltLength, trailer);
-        pss.init(true, new ParametersWithRandom(RSAUtil.generatePrivateKeyParameter((RSAPrivateKey)privateKey), random));
-    }
-
-    protected void engineInitSign(
-        PrivateKey privateKey)
-        throws InvalidKeyException
-    {
-        if (!(privateKey instanceof RSAPrivateKey))
-        {
-            throw new InvalidKeyException("Supplied key is not a RSAPrivateKey instance");
-        }
-
-        pss = new org.bouncycastle.crypto.signers.PSSSigner(signer, contentDigest, mgfDigest, saltLength, trailer);
-        pss.init(true, RSAUtil.generatePrivateKeyParameter((RSAPrivateKey)privateKey));
-    }
-
-    protected void engineUpdate(
-        byte    b)
-        throws SignatureException
-    {
-        pss.update(b);
-    }
-
-    protected void engineUpdate(
-        byte[]  b,
-        int     off,
-        int     len) 
-        throws SignatureException
-    {
-        pss.update(b, off, len);
-    }
-
-    protected byte[] engineSign()
-        throws SignatureException
-    {
-        try
-        {
-            return pss.generateSignature();
-        }
-        catch (CryptoException e)
-        {
-            throw new SignatureException(e.getMessage());
-        }
-    }
-
-    protected boolean engineVerify(
-        byte[]  sigBytes) 
-        throws SignatureException
-    {
-        return pss.verifySignature(sigBytes);
-    }
-
-    protected void engineSetParameter(
-        AlgorithmParameterSpec params)
-        throws InvalidParameterException
-    {
-        if (params instanceof PSSParameterSpec)
-        {
-            PSSParameterSpec newParamSpec = (PSSParameterSpec)params;
-            
-            if (originalSpec != null)
-            {
-                if (!DigestFactory.isSameDigest(originalSpec.getDigestAlgorithm(), newParamSpec.getDigestAlgorithm()))
-                {
-                    throw new InvalidParameterException("parameter must be using " + originalSpec.getDigestAlgorithm());
-                }
-            }
-            if (!newParamSpec.getMGFAlgorithm().equalsIgnoreCase("MGF1") && !newParamSpec.getMGFAlgorithm().equals(PKCSObjectIdentifiers.id_mgf1.getId()))
-            {
-                throw new InvalidParameterException("unknown mask generation function specified");
-            }
-            
-            if (!(newParamSpec.getMGFParameters() instanceof MGF1ParameterSpec))
-            {
-                throw new InvalidParameterException("unkown MGF parameters");
-            }
-            
-            MGF1ParameterSpec mgfParams = (MGF1ParameterSpec)newParamSpec.getMGFParameters();
-            
-            if (!DigestFactory.isSameDigest(mgfParams.getDigestAlgorithm(), newParamSpec.getDigestAlgorithm()))
-            {
-                throw new InvalidParameterException("digest algorithm for MGF should be the same as for PSS parameters.");
-            }
-            
-            Digest newDigest = DigestFactory.getDigest(mgfParams.getDigestAlgorithm());
-            
-            if (newDigest == null)
-            {
-                throw new InvalidParameterException("no match on MGF digest algorithm: "+ mgfParams.getDigestAlgorithm());
-            }
-
-            this.engineParams = null;
-            this.paramSpec = newParamSpec;
-            this.mgfDigest = newDigest;
-            this.saltLength = paramSpec.getSaltLength();
-            this.trailer = getTrailer(paramSpec.getTrailerField());
-
-            setupContentDigest();
-        }
-        else
-        {
-            throw new InvalidParameterException("Only PSSParameterSpec supported");
-        }
-    }
-
-    protected AlgorithmParameters engineGetParameters()
-    {
-        if (engineParams == null)
-        {
-            if (paramSpec != null)
-            {
-                try
-                {
-                    engineParams = helper.createAlgorithmParameters("PSS");
-                    engineParams.init(paramSpec);
-                }
-                catch (Exception e)
-                {
-                    throw new RuntimeException(e.toString());
-                }
-            }
-        }
-
-        return engineParams;
-    }
-    
-    /**
-     * @deprecated replaced with <a href = "#engineSetParameter(java.security.spec.AlgorithmParameterSpec)">
-     */
-    protected void engineSetParameter(
-        String param,
-        Object value)
-    {
-        throw new UnsupportedOperationException("engineSetParameter unsupported");
-    }
-    
-    protected Object engineGetParameter(
-        String param)
-    {
-        throw new UnsupportedOperationException("engineGetParameter unsupported");
-    }
-
-    static public class nonePSS
-        extends PSSSignatureSpi
-    {
-        public nonePSS()
-        {
-            super(new RSABlindedEngine(), null, true);
-        }
-    }
-
-    static public class PSSwithRSA
-        extends PSSSignatureSpi
-    {
-        public PSSwithRSA()
-        {
-            super(new RSABlindedEngine(), null);
-        }
-    }
-    
-    static public class SHA1withRSA
-        extends PSSSignatureSpi
-    {
-        public SHA1withRSA()
-        {
-            super(new RSABlindedEngine(), PSSParameterSpec.DEFAULT);
-        }
-    }
-
-    static public class SHA224withRSA
-        extends PSSSignatureSpi
-    {
-        public SHA224withRSA()
-        {
-            super(new RSABlindedEngine(), new PSSParameterSpec("SHA-224", "MGF1", new MGF1ParameterSpec("SHA-224"), 28, 1));
-        }
-    }
-    
-    static public class SHA256withRSA
-        extends PSSSignatureSpi
-    {
-        public SHA256withRSA()
-        {
-            super(new RSABlindedEngine(), new PSSParameterSpec("SHA-256", "MGF1", new MGF1ParameterSpec("SHA-256"), 32, 1));
-        }
-    }
-
-    static public class SHA384withRSA
-        extends PSSSignatureSpi
-    {
-        public SHA384withRSA()
-        {
-            super(new RSABlindedEngine(), new PSSParameterSpec("SHA-384", "MGF1", new MGF1ParameterSpec("SHA-384"), 48, 1));
-        }
-    }
-
-    static public class SHA512withRSA
-        extends PSSSignatureSpi
-    {
-        public SHA512withRSA()
-        {
-            super(new RSABlindedEngine(), new PSSParameterSpec("SHA-512", "MGF1", new MGF1ParameterSpec("SHA-512"), 64, 1));
-        }
-    }
-
-    private class NullPssDigest
-        implements Digest
-    {
-        private ByteArrayOutputStream bOut = new ByteArrayOutputStream();
-        private Digest baseDigest;
-        private boolean oddTime = true;
-
-        public NullPssDigest(Digest mgfDigest)
-        {
-            this.baseDigest = mgfDigest;
-        }
-
-        public String getAlgorithmName()
-        {
-            return "NULL";
-        }
-
-        public int getDigestSize()
-        {
-            return baseDigest.getDigestSize();
-        }
-
-        public void update(byte in)
-        {
-            bOut.write(in);
-        }
-
-        public void update(byte[] in, int inOff, int len)
-        {
-            bOut.write(in, inOff, len);
-        }
-
-        public int doFinal(byte[] out, int outOff)
-        {
-            byte[] res = bOut.toByteArray();
-
-            if (oddTime)
-            {
-                System.arraycopy(res, 0, out, outOff, res.length);
-            }
-            else
-            {
-                baseDigest.update(res, 0, res.length);
-
-                baseDigest.doFinal(out, outOff);
-            }
-
-            reset();
-
-            oddTime = !oddTime;
-
-            return res.length;
-        }
-
-        public void reset()
-        {
-            bOut.reset();
-            baseDigest.reset();
-        }
-
-        public int getByteLength()
-        {
-            return 0;
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/rsa/X931SignatureSpi.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/rsa/X931SignatureSpi.java
deleted file mode 100644
index 727f685..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/rsa/X931SignatureSpi.java
+++ /dev/null
@@ -1,194 +0,0 @@
-package org.bouncycastle.jcajce.provider.asymmetric.rsa;
-
-import java.security.InvalidKeyException;
-import java.security.PrivateKey;
-import java.security.PublicKey;
-import java.security.SignatureException;
-import java.security.SignatureSpi;
-import java.security.interfaces.RSAPrivateKey;
-import java.security.interfaces.RSAPublicKey;
-import java.security.spec.AlgorithmParameterSpec;
-
-import org.bouncycastle.crypto.AsymmetricBlockCipher;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.digests.MD5Digest;
-import org.bouncycastle.crypto.digests.RIPEMD128Digest;
-import org.bouncycastle.crypto.digests.RIPEMD160Digest;
-import org.bouncycastle.crypto.digests.SHA1Digest;
-import org.bouncycastle.crypto.digests.SHA224Digest;
-import org.bouncycastle.crypto.digests.SHA256Digest;
-import org.bouncycastle.crypto.digests.SHA384Digest;
-import org.bouncycastle.crypto.digests.SHA512Digest;
-import org.bouncycastle.crypto.digests.WhirlpoolDigest;
-import org.bouncycastle.crypto.engines.RSABlindedEngine;
-import org.bouncycastle.crypto.signers.ISO9796d2Signer;
-import org.bouncycastle.crypto.signers.X931Signer;
-
-public class X931SignatureSpi
-    extends SignatureSpi
-{
-    private X931Signer signer;
-
-    protected X931SignatureSpi(
-        Digest digest,
-        AsymmetricBlockCipher cipher)
-    {
-        signer = new X931Signer(cipher, digest);
-    }
-
-    protected void engineInitVerify(
-        PublicKey publicKey)
-        throws InvalidKeyException
-    {
-        CipherParameters param = RSAUtil.generatePublicKeyParameter((RSAPublicKey)publicKey);
-
-        signer.init(false, param);
-    }
-
-    protected void engineInitSign(
-        PrivateKey privateKey)
-        throws InvalidKeyException
-    {
-        CipherParameters param = RSAUtil.generatePrivateKeyParameter((RSAPrivateKey)privateKey);
-
-        signer.init(true, param);
-    }
-
-    protected void engineUpdate(
-        byte    b)
-        throws SignatureException
-    {
-        signer.update(b);
-    }
-
-    protected void engineUpdate(
-        byte[]  b,
-        int     off,
-        int     len) 
-        throws SignatureException
-    {
-        signer.update(b, off, len);
-    }
-
-    protected byte[] engineSign()
-        throws SignatureException
-    {
-        try
-        {
-            byte[]  sig = signer.generateSignature();
-
-            return sig;
-        }
-        catch (Exception e)
-        {
-            throw new SignatureException(e.toString());
-        }
-    }
-
-    protected boolean engineVerify(
-        byte[]  sigBytes) 
-        throws SignatureException
-    {
-        boolean yes = signer.verifySignature(sigBytes);
-
-        return yes;
-    }
-
-    protected void engineSetParameter(
-        AlgorithmParameterSpec params)
-    {
-        throw new UnsupportedOperationException("engineSetParameter unsupported");
-    }
-
-    /**
-     * @deprecated replaced with <a href = "#engineSetParameter(java.security.spec.AlgorithmParameterSpec)">
-     */
-    protected void engineSetParameter(
-        String param,
-        Object value)
-    {
-        throw new UnsupportedOperationException("engineSetParameter unsupported");
-    }
-
-    /**
-     * @deprecated
-     */
-    protected Object engineGetParameter(
-        String param)
-    {
-        throw new UnsupportedOperationException("engineSetParameter unsupported");
-    }
-
-    static public class RIPEMD128WithRSAEncryption
-        extends X931SignatureSpi
-    {
-        public RIPEMD128WithRSAEncryption()
-        {
-            super(new RIPEMD128Digest(), new RSABlindedEngine());
-        }
-    }
-
-    static public class RIPEMD160WithRSAEncryption
-        extends X931SignatureSpi
-    {
-        public RIPEMD160WithRSAEncryption()
-        {
-            super(new RIPEMD160Digest(), new RSABlindedEngine());
-        }
-    }
-
-    static public class SHA1WithRSAEncryption
-        extends X931SignatureSpi
-    {
-        public SHA1WithRSAEncryption()
-        {
-            super(new SHA1Digest(), new RSABlindedEngine());
-        }
-    }
-
-    static public class SHA224WithRSAEncryption
-        extends X931SignatureSpi
-    {
-        public SHA224WithRSAEncryption()
-        {
-            super(new SHA224Digest(), new RSABlindedEngine());
-        }
-    }
-
-    static public class SHA256WithRSAEncryption
-        extends X931SignatureSpi
-    {
-        public SHA256WithRSAEncryption()
-        {
-            super(new SHA256Digest(), new RSABlindedEngine());
-        }
-    }
-
-    static public class SHA384WithRSAEncryption
-        extends X931SignatureSpi
-    {
-        public SHA384WithRSAEncryption()
-        {
-            super(new SHA384Digest(), new RSABlindedEngine());
-        }
-    }
-
-    static public class SHA512WithRSAEncryption
-        extends X931SignatureSpi
-    {
-        public SHA512WithRSAEncryption()
-        {
-            super(new SHA512Digest(), new RSABlindedEngine());
-        }
-    }
-
-    static public class WhirlpoolWithRSAEncryption
-        extends X931SignatureSpi
-    {
-        public WhirlpoolWithRSAEncryption()
-        {
-            super(new WhirlpoolDigest(), new RSABlindedEngine());
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/util/BaseCipherSpi.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/util/BaseCipherSpi.java
index 482329c..5842b9e 100644
--- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/util/BaseCipherSpi.java
+++ b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/util/BaseCipherSpi.java
@@ -18,8 +18,10 @@ import javax.crypto.IllegalBlockSizeException;
 import javax.crypto.NoSuchPaddingException;
 import javax.crypto.spec.IvParameterSpec;
 import javax.crypto.spec.PBEParameterSpec;
-import javax.crypto.spec.RC2ParameterSpec;
-import javax.crypto.spec.RC5ParameterSpec;
+// BEGIN android-removed
+// import javax.crypto.spec.RC2ParameterSpec;
+// import javax.crypto.spec.RC5ParameterSpec;
+// END android-removed
 import javax.crypto.spec.SecretKeySpec;
 
 import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
@@ -39,8 +41,10 @@ public abstract class BaseCipherSpi
                                     {
                                         IvParameterSpec.class,
                                         PBEParameterSpec.class,
-                                        RC2ParameterSpec.class,
-                                        RC5ParameterSpec.class
+                                        // BEGIN android-removed
+                                        // RC2ParameterSpec.class,
+                                        // RC5ParameterSpec.class
+                                        // END android-removed
                                     };
 
     private final JcaJceHelper helper = new BCJcaJceHelper();
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/util/ECUtil.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/util/ECUtil.java
index b1805f6..b8ef398 100644
--- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/util/ECUtil.java
+++ b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/util/ECUtil.java
@@ -6,11 +6,15 @@ import java.security.PrivateKey;
 import java.security.PublicKey;
 
 import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.cryptopro.ECGOST3410NamedCurves;
+// BEGIN android-removed
+// import org.bouncycastle.asn1.cryptopro.ECGOST3410NamedCurves;
+// END android-removed
 import org.bouncycastle.asn1.nist.NISTNamedCurves;
 import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
 import org.bouncycastle.asn1.sec.SECNamedCurves;
-import org.bouncycastle.asn1.teletrust.TeleTrusTNamedCurves;
+// BEGIN android-removed
+// import org.bouncycastle.asn1.teletrust.TeleTrusTNamedCurves;
+// END android-removed
 import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
 import org.bouncycastle.asn1.x9.X962NamedCurves;
 import org.bouncycastle.asn1.x9.X962Parameters;
@@ -247,14 +251,16 @@ public class ECUtil
             {
                 oid = NISTNamedCurves.getOID(name);
             }
-            if (oid == null)
-            {
-                oid = TeleTrusTNamedCurves.getOID(name);
-            }
-            if (oid == null)
-            {
-                oid = ECGOST3410NamedCurves.getOID(name);
-            }
+            // BEGIN android-removed
+            // if (oid == null)
+            // {
+            //     oid = TeleTrusTNamedCurves.getOID(name);
+            // }
+            // if (oid == null)
+            // {
+            //     oid = ECGOST3410NamedCurves.getOID(name);
+            // }
+            // END android-removed
         }
 
         return oid;
@@ -276,10 +282,12 @@ public class ECUtil
             {
                 params = NISTNamedCurves.getByOID(oid);
             }
-            if (params == null)
-            {
-                params = TeleTrusTNamedCurves.getByOID(oid);
-            }
+            // BEGIN android-removed
+            // if (params == null)
+            // {
+            //     params = TeleTrusTNamedCurves.getByOID(oid);
+            // }
+            // END android-removed
         }
 
         return params;
@@ -297,14 +305,16 @@ public class ECUtil
             {
                 name = NISTNamedCurves.getName(oid);
             }
-            if (name == null)
-            {
-                name = TeleTrusTNamedCurves.getName(oid);
-            }
-            if (name == null)
-            {
-                name = ECGOST3410NamedCurves.getName(oid);
-            }
+            // BEGIN android-removed
+            // if (name == null)
+            // {
+            //     name = TeleTrusTNamedCurves.getName(oid);
+            // }
+            // if (name == null)
+            // {
+            //     name = ECGOST3410NamedCurves.getName(oid);
+            // }
+            // END android-removed
         }
 
         return name;
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/util/GOST3410Util.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/util/GOST3410Util.java
deleted file mode 100644
index 850ab9d..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/util/GOST3410Util.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package org.bouncycastle.jcajce.provider.asymmetric.util;
-
-import java.security.InvalidKeyException;
-import java.security.PrivateKey;
-import java.security.PublicKey;
-
-import org.bouncycastle.crypto.params.AsymmetricKeyParameter;
-import org.bouncycastle.crypto.params.GOST3410Parameters;
-import org.bouncycastle.crypto.params.GOST3410PrivateKeyParameters;
-import org.bouncycastle.crypto.params.GOST3410PublicKeyParameters;
-import org.bouncycastle.jce.interfaces.GOST3410PrivateKey;
-import org.bouncycastle.jce.interfaces.GOST3410PublicKey;
-import org.bouncycastle.jce.spec.GOST3410PublicKeyParameterSetSpec;
-
-/**
- * utility class for converting jce/jca GOST3410-94 objects
- * objects into their org.bouncycastle.crypto counterparts.
- */
-public class GOST3410Util
-{
-    static public AsymmetricKeyParameter generatePublicKeyParameter(
-        PublicKey    key)
-        throws InvalidKeyException
-    {
-        if (key instanceof GOST3410PublicKey)
-        {
-            GOST3410PublicKey          k = (GOST3410PublicKey)key;
-            GOST3410PublicKeyParameterSetSpec p = k.getParameters().getPublicKeyParameters();
-            
-            return new GOST3410PublicKeyParameters(k.getY(),
-                new GOST3410Parameters(p.getP(), p.getQ(), p.getA()));
-        }
-
-        throw new InvalidKeyException("can't identify GOST3410 public key: " + key.getClass().getName());
-    }
-
-    static public AsymmetricKeyParameter generatePrivateKeyParameter(
-        PrivateKey    key)
-        throws InvalidKeyException
-    {
-        if (key instanceof GOST3410PrivateKey)
-        {
-            GOST3410PrivateKey         k = (GOST3410PrivateKey)key;
-            GOST3410PublicKeyParameterSetSpec p = k.getParameters().getPublicKeyParameters();
-            
-            return new GOST3410PrivateKeyParameters(k.getX(),
-                new GOST3410Parameters(p.getP(), p.getQ(), p.getA()));
-        }
-
-        throw new InvalidKeyException("can't identify GOST3410 private key.");
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/util/IESUtil.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/util/IESUtil.java
deleted file mode 100644
index 93ed727..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/util/IESUtil.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package org.bouncycastle.jcajce.provider.asymmetric.util;
-
-import org.bouncycastle.crypto.engines.IESEngine;
-import org.bouncycastle.jce.spec.IESParameterSpec;
-
-public class IESUtil
-{
-    public static IESParameterSpec guessParameterSpec(IESEngine engine)
-    {
-        if (engine.getCipher() == null)
-        {
-            return new IESParameterSpec(null, null, 128);
-        }
-        else if (engine.getCipher().getUnderlyingCipher().getAlgorithmName().equals("DES") ||
-                engine.getCipher().getUnderlyingCipher().getAlgorithmName().equals("RC2") ||
-                engine.getCipher().getUnderlyingCipher().getAlgorithmName().equals("RC5-32") ||
-                engine.getCipher().getUnderlyingCipher().getAlgorithmName().equals("RC5-64"))
-        {
-            return new IESParameterSpec(null, null, 64, 64);
-        }
-        else if (engine.getCipher().getUnderlyingCipher().getAlgorithmName().equals("SKIPJACK"))
-        {
-            return new IESParameterSpec(null, null, 80, 80);
-        }
-        else if (engine.getCipher().getUnderlyingCipher().getAlgorithmName().equals("GOST28147"))
-        {
-            return new IESParameterSpec(null, null, 256, 256);
-        }
-
-        return new IESParameterSpec(null, null, 128, 128);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/x509/PKIXCertPath.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/x509/PKIXCertPath.java
index b82d091..8bb4c3a 100644
--- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/x509/PKIXCertPath.java
+++ b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/x509/PKIXCertPath.java
@@ -37,7 +37,9 @@ import org.bouncycastle.asn1.pkcs.SignedData;
 import org.bouncycastle.jcajce.util.BCJcaJceHelper;
 import org.bouncycastle.jcajce.util.JcaJceHelper;
 import org.bouncycastle.util.io.pem.PemObject;
-import org.bouncycastle.util.io.pem.PemWriter;
+// BEGIN android-removed
+// import org.bouncycastle.util.io.pem.PemWriter;
+// END android-removed
 
 /**
  * CertPath implementation for X.509 certificates.
@@ -54,7 +56,9 @@ public  class PKIXCertPath
     {
         List encodings = new ArrayList();
         encodings.add("PkiPath");
-        encodings.add("PEM");
+        // BEGIN android-removed
+        // encodings.add("PEM");
+        // END android-removed
         encodings.add("PKCS7");
         certPathEncodings = Collections.unmodifiableList(encodings);
     }
@@ -301,27 +305,29 @@ public  class PKIXCertPath
             return toDEREncoded(new ContentInfo(
                     PKCSObjectIdentifiers.signedData, sd));
         }
-        else if (encoding.equalsIgnoreCase("PEM"))
-        {
-            ByteArrayOutputStream bOut = new ByteArrayOutputStream();
-            PemWriter pWrt = new PemWriter(new OutputStreamWriter(bOut));
-
-            try
-            {
-                for (int i = 0; i != certificates.size(); i++)
-                {
-                    pWrt.writeObject(new PemObject("CERTIFICATE", ((X509Certificate)certificates.get(i)).getEncoded()));
-                }
-            
-                pWrt.close();
-            }
-            catch (Exception e)
-            {
-                throw new CertificateEncodingException("can't encode certificate for PEM encoded path");
-            }
-
-            return bOut.toByteArray();
-        }
+        // BEGIN android-removed
+        // else if (encoding.equalsIgnoreCase("PEM"))
+        // {
+        //     ByteArrayOutputStream bOut = new ByteArrayOutputStream();
+        //     PemWriter pWrt = new PemWriter(new OutputStreamWriter(bOut));
+        //
+        //     try
+        //     {
+        //         for (int i = 0; i != certificates.size(); i++)
+        //         {
+        //             pWrt.writeObject(new PemObject("CERTIFICATE", ((X509Certificate)certificates.get(i)).getEncoded()));
+        //         }
+        //
+        //         pWrt.close();
+        //     }
+        //     catch (Exception e)
+        //     {
+        //         throw new CertificateEncodingException("can't encode certificate for PEM encoded path");
+        //     }
+        //
+        //     return bOut.toByteArray();
+        // }
+        // END android-removed
         else
         {
             throw new CertificateEncodingException("unsupported encoding: " + encoding);
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/x509/X509CertificateObject.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/x509/X509CertificateObject.java
index 56df634..3157ea6 100644
--- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/x509/X509CertificateObject.java
+++ b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/x509/X509CertificateObject.java
@@ -55,6 +55,9 @@ import org.bouncycastle.asn1.x509.Extension;
 import org.bouncycastle.asn1.x509.Extensions;
 import org.bouncycastle.asn1.x509.GeneralName;
 import org.bouncycastle.asn1.x509.KeyUsage;
+// BEGIN android-added
+import org.bouncycastle.asn1.x509.X509Name;
+// END android-added
 import org.bouncycastle.jcajce.provider.asymmetric.util.PKCS12BagAttributeCarrierImpl;
 import org.bouncycastle.jce.X509Principal;
 import org.bouncycastle.jce.interfaces.PKCS12BagAttributeCarrier;
@@ -534,12 +537,20 @@ class X509CertificateObject
         }
     }
 
+    // BEGIN android-changed
+    private byte[] encoded;
+    // END android-changed
     public byte[] getEncoded()
         throws CertificateEncodingException
     {
         try
         {
-            return c.getEncoded(ASN1Encoding.DER);
+            // BEGIN android-changed
+            if (encoded == null) {
+                encoded = c.getEncoded(ASN1Encoding.DER);
+            }
+            return encoded;
+            // END android-changed
         }
         catch (IOException e)
         {
@@ -839,7 +850,9 @@ class X509CertificateObject
                     list.add(genName.getEncoded());
                     break;
                 case GeneralName.directoryName:
-                    list.add(X500Name.getInstance(RFC4519Style.INSTANCE, genName.getName()).toString());
+                    // BEGIN android-changed
+                    list.add(X509Name.getInstance(genName.getName()).toString(true, X509Name.DefaultSymbols));
+                    // END android-changed
                     break;
                 case GeneralName.dNSName:
                 case GeneralName.rfc822Name:
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/x509/X509SignatureUtil.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/x509/X509SignatureUtil.java
index 8488f80..61b0545 100644
--- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/x509/X509SignatureUtil.java
+++ b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/asymmetric/x509/X509SignatureUtil.java
@@ -16,12 +16,16 @@ import org.bouncycastle.asn1.ASN1Null;
 import org.bouncycastle.asn1.ASN1ObjectIdentifier;
 import org.bouncycastle.asn1.ASN1Sequence;
 import org.bouncycastle.asn1.DERNull;
-import org.bouncycastle.asn1.cryptopro.CryptoProObjectIdentifiers;
+// BEGIN android-removed
+// import org.bouncycastle.asn1.cryptopro.CryptoProObjectIdentifiers;
+// END android-removed
 import org.bouncycastle.asn1.nist.NISTObjectIdentifiers;
 import org.bouncycastle.asn1.oiw.OIWObjectIdentifiers;
 import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
 import org.bouncycastle.asn1.pkcs.RSASSAPSSparams;
-import org.bouncycastle.asn1.teletrust.TeleTrusTObjectIdentifiers;
+// BEGIN android-removed
+// import org.bouncycastle.asn1.teletrust.TeleTrusTObjectIdentifiers;
+// END android-removed
 import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
 import org.bouncycastle.asn1.x9.X9ObjectIdentifiers;
 import org.bouncycastle.jce.provider.BouncyCastleProvider;
@@ -143,22 +147,24 @@ class X509SignatureUtil
         {
             return "SHA512";
         }
-        else if (TeleTrusTObjectIdentifiers.ripemd128.equals(digestAlgOID))
-        {
-            return "RIPEMD128";
-        }
-        else if (TeleTrusTObjectIdentifiers.ripemd160.equals(digestAlgOID))
-        {
-            return "RIPEMD160";
-        }
-        else if (TeleTrusTObjectIdentifiers.ripemd256.equals(digestAlgOID))
-        {
-            return "RIPEMD256";
-        }
-        else if (CryptoProObjectIdentifiers.gostR3411.equals(digestAlgOID))
-        {
-            return "GOST3411";
-        }
+        // BEGIN android-removed
+        // else if (TeleTrusTObjectIdentifiers.ripemd128.equals(digestAlgOID))
+        // {
+        //     return "RIPEMD128";
+        // }
+        // else if (TeleTrusTObjectIdentifiers.ripemd160.equals(digestAlgOID))
+        // {
+        //     return "RIPEMD160";
+        // }
+        // else if (TeleTrusTObjectIdentifiers.ripemd256.equals(digestAlgOID))
+        // {
+        //     return "RIPEMD256";
+        // }
+        // else if (CryptoProObjectIdentifiers.gostR3411.equals(digestAlgOID))
+        // {
+        //     return "GOST3411";
+        // }
+        // END android-removed
         else
         {
             return digestAlgOID.getId();            
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/digest/GOST3411.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/digest/GOST3411.java
deleted file mode 100644
index 2112673..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/digest/GOST3411.java
+++ /dev/null
@@ -1,94 +0,0 @@
-package org.bouncycastle.jcajce.provider.digest;
-
-import org.bouncycastle.asn1.cryptopro.CryptoProObjectIdentifiers;
-import org.bouncycastle.crypto.CipherKeyGenerator;
-import org.bouncycastle.crypto.digests.GOST3411Digest;
-import org.bouncycastle.crypto.macs.HMac;
-import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseMac;
-import org.bouncycastle.jcajce.provider.symmetric.util.PBESecretKeyFactory;
-
-public class GOST3411
-{
-    private GOST3411()
-    {
-
-    }
-
-    static public class Digest
-        extends BCMessageDigest
-        implements Cloneable
-    {
-        public Digest()
-        {
-            super(new GOST3411Digest());
-        }
-
-        public Object clone()
-            throws CloneNotSupportedException
-        {
-            Digest d = (Digest)super.clone();
-            d.digest = new GOST3411Digest((GOST3411Digest)digest);
-
-            return d;
-        }
-    }
-
-    /**
-     * GOST3411 HMac
-     */
-    public static class HashMac
-        extends BaseMac
-    {
-        public HashMac()
-        {
-            super(new HMac(new GOST3411Digest()));
-        }
-    }
-
-    /**
-     * PBEWithHmacGOST3411
-     */
-    public static class PBEWithMacKeyFactory
-        extends PBESecretKeyFactory
-    {
-        public PBEWithMacKeyFactory()
-        {
-            super("PBEwithHmacGOST3411", null, false, PKCS12, GOST3411, 256, 0);
-        }
-    }
-
-    public static class KeyGenerator
-        extends BaseKeyGenerator
-    {
-        public KeyGenerator()
-        {
-            super("HMACGOST3411", 256, new CipherKeyGenerator());
-        }
-    }
-
-    public static class Mappings
-        extends DigestAlgorithmProvider
-    {
-        private static final String PREFIX = GOST3411.class.getName();
-
-        public Mappings()
-        {
-        }
-
-        public void configure(ConfigurableProvider provider)
-        {
-            provider.addAlgorithm("MessageDigest.GOST3411", PREFIX + "$Digest");
-            provider.addAlgorithm("Alg.Alias.MessageDigest.GOST", "GOST3411");
-            provider.addAlgorithm("Alg.Alias.MessageDigest.GOST-3411", "GOST3411");
-            provider.addAlgorithm("Alg.Alias.MessageDigest." + CryptoProObjectIdentifiers.gostR3411, "GOST3411");
-
-            provider.addAlgorithm("SecretKeyFactory.PBEWITHHMACGOST3411", PREFIX + "$PBEWithMacKeyFactory");
-            provider.addAlgorithm("Alg.Alias.SecretKeyFactory." + CryptoProObjectIdentifiers.gostR3411, "PBEWITHHMACGOST3411");
-
-            addHMACAlgorithm(provider, "GOST3411", PREFIX + "$HashMac", PREFIX + "$KeyGenerator");
-            addHMACAlias(provider, "GOST3411", CryptoProObjectIdentifiers.gostR3411);
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/digest/MD2.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/digest/MD2.java
deleted file mode 100644
index 5a3a2bf..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/digest/MD2.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package org.bouncycastle.jcajce.provider.digest;
-
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.crypto.CipherKeyGenerator;
-import org.bouncycastle.crypto.digests.MD2Digest;
-import org.bouncycastle.crypto.macs.HMac;
-import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseMac;
-
-public class MD2
-{
-    private MD2()
-    {
-
-    }
-
-    static public class Digest
-        extends BCMessageDigest
-        implements Cloneable
-    {
-        public Digest()
-        {
-            super(new MD2Digest());
-        }
-
-        public Object clone()
-            throws CloneNotSupportedException
-        {
-            Digest d = (Digest)super.clone();
-            d.digest = new MD2Digest((MD2Digest)digest);
-
-            return d;
-        }
-    }
-
-    /**
-     * MD2 HMac
-     */
-    public static class HashMac
-        extends BaseMac
-    {
-        public HashMac()
-        {
-            super(new HMac(new MD2Digest()));
-        }
-    }
-
-    public static class KeyGenerator
-        extends BaseKeyGenerator
-    {
-        public KeyGenerator()
-        {
-            super("HMACMD2", 128, new CipherKeyGenerator());
-        }
-    }
-
-    public static class Mappings
-        extends DigestAlgorithmProvider
-    {
-        private static final String PREFIX = MD2.class.getName();
-
-        public Mappings()
-        {
-        }
-
-        public void configure(ConfigurableProvider provider)
-        {
-            provider.addAlgorithm("MessageDigest.MD2", PREFIX + "$Digest");
-            provider.addAlgorithm("Alg.Alias.MessageDigest." + PKCSObjectIdentifiers.md2, "MD2");
-
-            addHMACAlgorithm(provider, "MD2", PREFIX + "$HashMac", PREFIX + "$KeyGenerator");
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/digest/MD4.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/digest/MD4.java
deleted file mode 100644
index 8a30baa..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/digest/MD4.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package org.bouncycastle.jcajce.provider.digest;
-
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.crypto.CipherKeyGenerator;
-import org.bouncycastle.crypto.digests.MD4Digest;
-import org.bouncycastle.crypto.macs.HMac;
-import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseMac;
-
-public class MD4
-{
-    private MD4()
-    {
-
-    }
-
-    /**
-     * MD4 HashMac
-     */
-    public static class HashMac
-        extends BaseMac
-    {
-        public HashMac()
-        {
-            super(new HMac(new MD4Digest()));
-        }
-    }
-
-    public static class KeyGenerator
-        extends BaseKeyGenerator
-    {
-        public KeyGenerator()
-        {
-            super("HMACMD4", 128, new CipherKeyGenerator());
-        }
-    }
-
-    static public class Digest
-        extends BCMessageDigest
-        implements Cloneable
-    {
-        public Digest()
-        {
-            super(new MD4Digest());
-        }
-
-        public Object clone()
-            throws CloneNotSupportedException
-        {
-            Digest d = (Digest)super.clone();
-            d.digest = new MD4Digest((MD4Digest)digest);
-
-            return d;
-        }
-    }
-
-    public static class Mappings
-        extends DigestAlgorithmProvider
-    {
-        private static final String PREFIX = MD4.class.getName();
-
-        public Mappings()
-        {
-        }
-
-        public void configure(ConfigurableProvider provider)
-        {
-            provider.addAlgorithm("MessageDigest.MD4", PREFIX + "$Digest");
-            provider.addAlgorithm("Alg.Alias.MessageDigest." + PKCSObjectIdentifiers.md4, "MD4");
-
-            addHMACAlgorithm(provider, "MD4", PREFIX + "$HashMac", PREFIX + "$KeyGenerator");
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/digest/RIPEMD128.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/digest/RIPEMD128.java
deleted file mode 100644
index e913f65..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/digest/RIPEMD128.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package org.bouncycastle.jcajce.provider.digest;
-
-import org.bouncycastle.asn1.teletrust.TeleTrusTObjectIdentifiers;
-import org.bouncycastle.crypto.CipherKeyGenerator;
-import org.bouncycastle.crypto.digests.RIPEMD128Digest;
-import org.bouncycastle.crypto.macs.HMac;
-import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseMac;
-
-public class RIPEMD128
-{
-    private RIPEMD128()
-    {
-
-    }
-
-    static public class Digest
-        extends BCMessageDigest
-        implements Cloneable
-    {
-        public Digest()
-        {
-            super(new RIPEMD128Digest());
-        }
-
-        public Object clone()
-            throws CloneNotSupportedException
-        {
-            Digest d = (Digest)super.clone();
-            d.digest = new RIPEMD128Digest((RIPEMD128Digest)digest);
-
-            return d;
-        }
-    }
-
-    /**
-     * RIPEMD128 HashMac
-     */
-    public static class HashMac
-        extends BaseMac
-    {
-        public HashMac()
-        {
-            super(new HMac(new RIPEMD128Digest()));
-        }
-    }
-
-    public static class KeyGenerator
-        extends BaseKeyGenerator
-    {
-        public KeyGenerator()
-        {
-            super("HMACRIPEMD128", 128, new CipherKeyGenerator());
-        }
-    }
-
-    public static class Mappings
-        extends DigestAlgorithmProvider
-    {
-        private static final String PREFIX = RIPEMD128.class.getName();
-
-        public Mappings()
-        {
-        }
-
-        public void configure(ConfigurableProvider provider)
-        {
-            provider.addAlgorithm("MessageDigest.RIPEMD128", PREFIX + "$Digest");
-            provider.addAlgorithm("Alg.Alias.MessageDigest." + TeleTrusTObjectIdentifiers.ripemd128, "RIPEMD128");            
-
-            addHMACAlgorithm(provider, "RIPEMD128", PREFIX + "$HashMac", PREFIX + "$KeyGenerator");
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/digest/RIPEMD160.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/digest/RIPEMD160.java
deleted file mode 100644
index f081713..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/digest/RIPEMD160.java
+++ /dev/null
@@ -1,113 +0,0 @@
-package org.bouncycastle.jcajce.provider.digest;
-
-import org.bouncycastle.asn1.iana.IANAObjectIdentifiers;
-import org.bouncycastle.asn1.teletrust.TeleTrusTObjectIdentifiers;
-import org.bouncycastle.crypto.CipherKeyGenerator;
-import org.bouncycastle.crypto.digests.RIPEMD160Digest;
-import org.bouncycastle.crypto.macs.HMac;
-import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseMac;
-import org.bouncycastle.jcajce.provider.symmetric.util.PBESecretKeyFactory;
-
-public class RIPEMD160
-{
-    private RIPEMD160()
-    {
-
-    }
-
-    static public class Digest
-        extends BCMessageDigest
-        implements Cloneable
-    {
-        public Digest()
-        {
-            super(new RIPEMD160Digest());
-        }
-
-        public Object clone()
-            throws CloneNotSupportedException
-        {
-            Digest d = (Digest)super.clone();
-            d.digest = new RIPEMD160Digest((RIPEMD160Digest)digest);
-
-            return d;
-        }
-    }
-
-    /**
-     * RIPEMD160 HMac
-     */
-    public static class HashMac
-        extends BaseMac
-    {
-        public HashMac()
-        {
-            super(new HMac(new RIPEMD160Digest()));
-        }
-    }
-
-    public static class KeyGenerator
-        extends BaseKeyGenerator
-    {
-        public KeyGenerator()
-        {
-            super("HMACRIPEMD160", 160, new CipherKeyGenerator());
-        }
-    }
-
-
-    //
-    // PKCS12 states that the same algorithm should be used
-    // for the key generation as is used in the HMAC, so that
-    // is what we do here.
-    //
-
-    /**
-     * PBEWithHmacRIPEMD160
-     */
-    public static class PBEWithHmac
-        extends BaseMac
-    {
-        public PBEWithHmac()
-        {
-            super(new HMac(new RIPEMD160Digest()), PKCS12, RIPEMD160, 160);
-        }
-    }
-
-    /**
-     * PBEWithHmacRIPEMD160
-     */
-    public static class PBEWithHmacKeyFactory
-        extends PBESecretKeyFactory
-    {
-        public PBEWithHmacKeyFactory()
-        {
-            super("PBEwithHmacRIPEMD160", null, false, PKCS12, RIPEMD160, 160, 0);
-        }
-    }
-
-    public static class Mappings
-        extends DigestAlgorithmProvider
-    {
-        private static final String PREFIX = RIPEMD160.class.getName();
-
-        public Mappings()
-        {
-        }
-
-        public void configure(ConfigurableProvider provider)
-        {
-            provider.addAlgorithm("MessageDigest.RIPEMD160", PREFIX + "$Digest");
-            provider.addAlgorithm("Alg.Alias.MessageDigest." + TeleTrusTObjectIdentifiers.ripemd160, "RIPEMD160");
-
-            addHMACAlgorithm(provider, "RIPEMD160", PREFIX + "$HashMac", PREFIX + "$KeyGenerator");
-            addHMACAlias(provider, "RIPEMD160", IANAObjectIdentifiers.hmacRIPEMD160);
-
-
-            provider.addAlgorithm("SecretKeyFactory.PBEWITHHMACRIPEMD160", PREFIX + "$PBEWithHmacKeyFactory");
-            provider.addAlgorithm("Mac.PBEWITHHMACRIPEMD160", PREFIX + "$PBEWithHmac");
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/digest/RIPEMD256.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/digest/RIPEMD256.java
deleted file mode 100644
index dcb1b56..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/digest/RIPEMD256.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package org.bouncycastle.jcajce.provider.digest;
-
-import org.bouncycastle.asn1.teletrust.TeleTrusTObjectIdentifiers;
-import org.bouncycastle.crypto.CipherKeyGenerator;
-import org.bouncycastle.crypto.digests.RIPEMD256Digest;
-import org.bouncycastle.crypto.macs.HMac;
-import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseMac;
-
-public class RIPEMD256
-{
-    private RIPEMD256()
-    {
-
-    }
-
-    static public class Digest
-        extends BCMessageDigest
-        implements Cloneable
-    {
-        public Digest()
-        {
-            super(new RIPEMD256Digest());
-        }
-
-        public Object clone()
-            throws CloneNotSupportedException
-        {
-            Digest d = (Digest)super.clone();
-            d.digest = new RIPEMD256Digest((RIPEMD256Digest)digest);
-
-            return d;
-        }
-    }
-
-    /**
-     * RIPEMD256 HMac
-     */
-    public static class HashMac
-        extends BaseMac
-    {
-        public HashMac()
-        {
-            super(new HMac(new RIPEMD256Digest()));
-        }
-    }
-
-    public static class KeyGenerator
-        extends BaseKeyGenerator
-    {
-        public KeyGenerator()
-        {
-            super("HMACRIPEMD256", 256, new CipherKeyGenerator());
-        }
-    }
-
-    public static class Mappings
-        extends DigestAlgorithmProvider
-    {
-        private static final String PREFIX = RIPEMD256.class.getName();
-
-        public Mappings()
-        {
-        }
-
-        public void configure(ConfigurableProvider provider)
-        {
-            provider.addAlgorithm("MessageDigest.RIPEMD256", PREFIX + "$Digest");
-            provider.addAlgorithm("Alg.Alias.MessageDigest." + TeleTrusTObjectIdentifiers.ripemd256, "RIPEMD256");
-
-            addHMACAlgorithm(provider, "RIPEMD256", PREFIX + "$HashMac", PREFIX + "$KeyGenerator");
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/digest/RIPEMD320.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/digest/RIPEMD320.java
deleted file mode 100644
index 12e0fd8..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/digest/RIPEMD320.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package org.bouncycastle.jcajce.provider.digest;
-
-import org.bouncycastle.crypto.CipherKeyGenerator;
-import org.bouncycastle.crypto.digests.RIPEMD320Digest;
-import org.bouncycastle.crypto.macs.HMac;
-import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseMac;
-
-public class RIPEMD320
-{
-    private RIPEMD320()
-    {
-
-    }
-
-    static public class Digest
-        extends BCMessageDigest
-        implements Cloneable
-    {
-        public Digest()
-        {
-            super(new RIPEMD320Digest());
-        }
-
-        public Object clone()
-            throws CloneNotSupportedException
-        {
-            Digest d = (Digest)super.clone();
-            d.digest = new RIPEMD320Digest((RIPEMD320Digest)digest);
-
-            return d;
-        }
-    }
-
-    /**
-     * RIPEMD320 HMac
-     */
-    public static class HashMac
-        extends BaseMac
-    {
-        public HashMac()
-        {
-            super(new HMac(new RIPEMD320Digest()));
-        }
-    }
-
-    public static class KeyGenerator
-        extends BaseKeyGenerator
-    {
-        public KeyGenerator()
-        {
-            super("HMACRIPEMD320", 320, new CipherKeyGenerator());
-        }
-    }
-
-    public static class Mappings
-        extends DigestAlgorithmProvider
-    {
-        private static final String PREFIX = RIPEMD320.class.getName();
-
-        public Mappings()
-        {
-        }
-
-        public void configure(ConfigurableProvider provider)
-        {
-            provider.addAlgorithm("MessageDigest.RIPEMD320", PREFIX + "$Digest");
-
-            addHMACAlgorithm(provider, "RIPEMD320", PREFIX + "$HashMac", PREFIX + "$KeyGenerator");
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/digest/SHA256.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/digest/SHA256.java
index 785cf65..4504f30 100644
--- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/digest/SHA256.java
+++ b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/digest/SHA256.java
@@ -45,17 +45,19 @@ public class SHA256
         }
     }
 
-    /**
-     * PBEWithHmacSHA
-     */
-    public static class PBEWithMacKeyFactory
-        extends PBESecretKeyFactory
-    {
-        public PBEWithMacKeyFactory()
-        {
-            super("PBEwithHmacSHA256", null, false, PKCS12, SHA256, 256, 0);
-        }
-    }
+    // BEGIN android-removed
+    // /**
+    //  * PBEWithHmacSHA
+    //  */
+    // public static class PBEWithMacKeyFactory
+    //     extends PBESecretKeyFactory
+    // {
+    //     public PBEWithMacKeyFactory()
+    //     {
+    //         super("PBEwithHmacSHA256", null, false, PKCS12, SHA256, 256, 0);
+    //     }
+    // }
+    // END android-removed
 
     /**
      * HMACSHA256
@@ -84,9 +86,11 @@ public class SHA256
             provider.addAlgorithm("Alg.Alias.MessageDigest.SHA256", "SHA-256");
             provider.addAlgorithm("Alg.Alias.MessageDigest." + NISTObjectIdentifiers.id_sha256, "SHA-256");
 
-            provider.addAlgorithm("SecretKeyFactory.PBEWITHHMACSHA256", PREFIX + "$PBEWithMacKeyFactory");
-            provider.addAlgorithm("Alg.Alias.SecretKeyFactory.PBEWITHHMACSHA-256", "PBEWITHHMACSHA256");
-            provider.addAlgorithm("Alg.Alias.SecretKeyFactory." + NISTObjectIdentifiers.id_sha256, "PBEWITHHMACSHA256");
+            // BEGIN android-removed
+            // provider.addAlgorithm("SecretKeyFactory.PBEWITHHMACSHA256", PREFIX + "$PBEWithMacKeyFactory");
+            // provider.addAlgorithm("Alg.Alias.SecretKeyFactory.PBEWITHHMACSHA-256", "PBEWITHHMACSHA256");
+            // provider.addAlgorithm("Alg.Alias.SecretKeyFactory." + NISTObjectIdentifiers.id_sha256, "PBEWITHHMACSHA256");
+            // END android-removed
 
             addHMACAlgorithm(provider, "SHA256", PREFIX + "$HashMac",  PREFIX + "$KeyGenerator");
             addHMACAlias(provider, "SHA256", PKCSObjectIdentifiers.id_hmacWithSHA256);
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/digest/SHA3.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/digest/SHA3.java
deleted file mode 100644
index 2c832fb..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/digest/SHA3.java
+++ /dev/null
@@ -1,171 +0,0 @@
-package org.bouncycastle.jcajce.provider.digest;
-
-import org.bouncycastle.crypto.CipherKeyGenerator;
-import org.bouncycastle.crypto.digests.SHA3Digest;
-import org.bouncycastle.crypto.macs.HMac;
-import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseMac;
-
-public class SHA3
-{
-    private SHA3()
-    {
-
-    }
-
-    static public class DigestSHA3
-        extends BCMessageDigest
-        implements Cloneable
-    {
-        public DigestSHA3(int size)
-        {
-            super(new SHA3Digest(size));
-        }
-
-        public Object clone()
-            throws CloneNotSupportedException
-        {
-            BCMessageDigest d = (BCMessageDigest)super.clone();
-            d.digest = new SHA3Digest((SHA3Digest)digest);
-
-            return d;
-        }
-    }
-
-    static public class Digest224
-        extends DigestSHA3
-    {
-        public Digest224()
-        {
-            super(224);
-        }
-    }
-
-    static public class Digest256
-        extends DigestSHA3
-    {
-        public Digest256()
-        {
-            super(256);
-        }
-    }
-
-    static public class Digest384
-        extends DigestSHA3
-    {
-        public Digest384()
-        {
-            super(384);
-        }
-    }
-
-    static public class Digest512
-        extends DigestSHA3
-    {
-        public Digest512()
-        {
-            super(512);
-        }
-    }
-
-    /**
-     * SHA3 HMac
-     */
-    public static class HashMac224
-        extends BaseMac
-    {
-        public HashMac224()
-        {
-            super(new HMac(new SHA3Digest(224)));
-        }
-    }
-
-    public static class HashMac256
-        extends BaseMac
-    {
-        public HashMac256()
-        {
-            super(new HMac(new SHA3Digest(256)));
-        }
-    }
-
-    public static class HashMac384
-        extends BaseMac
-    {
-        public HashMac384()
-        {
-            super(new HMac(new SHA3Digest(384)));
-        }
-    }
-
-    public static class HashMac512
-        extends BaseMac
-    {
-        public HashMac512()
-        {
-            super(new HMac(new SHA3Digest(512)));
-        }
-    }
-
-    public static class KeyGenerator224
-        extends BaseKeyGenerator
-    {
-        public KeyGenerator224()
-        {
-            super("HMACSHA3-224", 224, new CipherKeyGenerator());
-        }
-    }
-
-    public static class KeyGenerator256
-        extends BaseKeyGenerator
-    {
-        public KeyGenerator256()
-        {
-            super("HMACSHA3-256", 256, new CipherKeyGenerator());
-        }
-    }
-
-    public static class KeyGenerator384
-        extends BaseKeyGenerator
-    {
-        public KeyGenerator384()
-        {
-            super("HMACSHA3-384", 384, new CipherKeyGenerator());
-        }
-    }
-
-    public static class KeyGenerator512
-        extends BaseKeyGenerator
-    {
-        public KeyGenerator512()
-        {
-            super("HMACSHA3-512", 512, new CipherKeyGenerator());
-        }
-    }
-
-    public static class Mappings
-        extends DigestAlgorithmProvider
-    {
-        private static final String PREFIX = SHA3.class.getName();
-
-        public Mappings()
-        {
-        }
-
-        public void configure(ConfigurableProvider provider)
-        {
-            provider.addAlgorithm("MessageDigest.SHA3-224", PREFIX + "$Digest224");
-            provider.addAlgorithm("MessageDigest.SHA3-256", PREFIX + "$Digest256");
-            provider.addAlgorithm("MessageDigest.SHA3-384", PREFIX + "$Digest384");
-            provider.addAlgorithm("MessageDigest.SHA3-512", PREFIX + "$Digest512");
-            // look for an object identifier (NIST???) for SHA3 family
-            // provider.addAlgorithm("Alg.Alias.MessageDigest." + OIWObjectIdentifiers.idSHA3, "SHA3-224"); // *****
-
-            addHMACAlgorithm(provider, "SHA3-224", PREFIX + "$HashMac224", PREFIX + "$KeyGenerator224");
-            addHMACAlgorithm(provider, "SHA3-256", PREFIX + "$HashMac256", PREFIX + "$KeyGenerator256");
-            addHMACAlgorithm(provider, "SHA3-384", PREFIX + "$HashMac384", PREFIX + "$KeyGenerator384");
-            addHMACAlgorithm(provider, "SHA3-512", PREFIX + "$HashMac512", PREFIX + "$KeyGenerator512");
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/digest/SHA384.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/digest/SHA384.java
index f811df6..e563579 100644
--- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/digest/SHA384.java
+++ b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/digest/SHA384.java
@@ -5,7 +5,9 @@ import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
 import org.bouncycastle.crypto.CipherKeyGenerator;
 import org.bouncycastle.crypto.digests.SHA384Digest;
 import org.bouncycastle.crypto.macs.HMac;
-import org.bouncycastle.crypto.macs.OldHMac;
+// BEGIN android-removed
+// import org.bouncycastle.crypto.macs.OldHMac;
+// END android-removed
 import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
 import org.bouncycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
 import org.bouncycastle.jcajce.provider.symmetric.util.BaseMac;
@@ -57,14 +59,16 @@ public class SHA384
         }
     }
 
-    public static class OldSHA384
-        extends BaseMac
-    {
-        public OldSHA384()
-        {
-            super(new OldHMac(new SHA384Digest()));
-        }
-    }
+    // BEGIN android-removed
+    // public static class OldSHA384
+    //     extends BaseMac
+    // {
+    //     public OldSHA384()
+    //     {
+    //         super(new OldHMac(new SHA384Digest()));
+    //     }
+    // }
+    // END android-removed
 
     public static class Mappings
         extends DigestAlgorithmProvider
@@ -80,7 +84,9 @@ public class SHA384
             provider.addAlgorithm("MessageDigest.SHA-384", PREFIX + "$Digest");
             provider.addAlgorithm("Alg.Alias.MessageDigest.SHA384", "SHA-384");
             provider.addAlgorithm("Alg.Alias.MessageDigest." + NISTObjectIdentifiers.id_sha384, "SHA-384");
-            provider.addAlgorithm("Mac.OLDHMACSHA384", PREFIX + "$OldSHA384");
+            // BEGIN android-removed
+            // provider.addAlgorithm("Mac.OLDHMACSHA384", PREFIX + "$OldSHA384");
+            // END android-removed
 
             addHMACAlgorithm(provider, "SHA384", PREFIX + "$HashMac",  PREFIX + "$KeyGenerator");
             addHMACAlias(provider, "SHA384", PKCSObjectIdentifiers.id_hmacWithSHA384);
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/digest/SHA512.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/digest/SHA512.java
index 48adf73..903eec1 100644
--- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/digest/SHA512.java
+++ b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/digest/SHA512.java
@@ -4,9 +4,13 @@ import org.bouncycastle.asn1.nist.NISTObjectIdentifiers;
 import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
 import org.bouncycastle.crypto.CipherKeyGenerator;
 import org.bouncycastle.crypto.digests.SHA512Digest;
-import org.bouncycastle.crypto.digests.SHA512tDigest;
+// BEGIN android-removed
+// import org.bouncycastle.crypto.digests.SHA512tDigest;
+// END android-removed
 import org.bouncycastle.crypto.macs.HMac;
-import org.bouncycastle.crypto.macs.OldHMac;
+// BEGIN android-removed
+// import org.bouncycastle.crypto.macs.OldHMac;
+// END android-removed
 import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
 import org.bouncycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
 import org.bouncycastle.jcajce.provider.symmetric.util.BaseMac;
@@ -37,42 +41,44 @@ public class SHA512
         }
     }
 
-    static public class DigestT
-        extends BCMessageDigest
-        implements Cloneable
-    {
-        public DigestT(int bitLength)
-        {
-            super(new SHA512tDigest(bitLength));
-        }
-
-        public Object clone()
-            throws CloneNotSupportedException
-        {
-            DigestT d = (DigestT)super.clone();
-            d.digest = new SHA512tDigest((SHA512tDigest)digest);
-
-            return d;
-        }
-    }
-
-    static public class DigestT224
-        extends DigestT
-    {
-        public DigestT224()
-        {
-            super(224);
-        }
-    }
-
-    static public class DigestT256
-        extends DigestT
-    {
-        public DigestT256()
-        {
-            super(256);
-        }
-    }
+    // BEGIN android-removed
+    // static public class DigestT
+    //     extends BCMessageDigest
+    //     implements Cloneable
+    // {
+    //     public DigestT(int bitLength)
+    //     {
+    //         super(new SHA512tDigest(bitLength));
+    //     }
+    //
+    //     public Object clone()
+    //         throws CloneNotSupportedException
+    //     {
+    //         DigestT d = (DigestT)super.clone();
+    //         d.digest = new SHA512tDigest((SHA512tDigest)digest);
+    //
+    //         return d;
+    //     }
+    // }
+    //
+    // static public class DigestT224
+    //     extends DigestT
+    // {
+    //     public DigestT224()
+    //     {
+    //         super(224);
+    //     }
+    // }
+    //
+    // static public class DigestT256
+    //     extends DigestT
+    // {
+    //     public DigestT256()
+    //     {
+    //         super(256);
+    //     }
+    // }
+    // END android-removed
 
     public static class HashMac
         extends BaseMac
@@ -83,35 +89,37 @@ public class SHA512
         }
     }
 
-    public static class HashMacT224
-        extends BaseMac
-    {
-        public HashMacT224()
-        {
-            super(new HMac(new SHA512tDigest(224)));
-        }
-    }
-
-    public static class HashMacT256
-        extends BaseMac
-    {
-        public HashMacT256()
-        {
-            super(new HMac(new SHA512tDigest(256)));
-        }
-    }
-
-    /**
-     * SHA-512 HMac
-     */
-    public static class OldSHA512
-        extends BaseMac
-    {
-        public OldSHA512()
-        {
-            super(new OldHMac(new SHA512Digest()));
-        }
-    }
+    // BEGIN android-removed
+    // public static class HashMacT224
+    //     extends BaseMac
+    // {
+    //     public HashMacT224()
+    //     {
+    //         super(new HMac(new SHA512tDigest(224)));
+    //     }
+    // }
+    //
+    // public static class HashMacT256
+    //     extends BaseMac
+    // {
+    //     public HashMacT256()
+    //     {
+    //         super(new HMac(new SHA512tDigest(256)));
+    //     }
+    // }
+    //
+    // /**
+    //  * SHA-512 HMac
+    //  */
+    // public static class OldSHA512
+    //     extends BaseMac
+    // {
+    //     public OldSHA512()
+    //     {
+    //         super(new OldHMac(new SHA512Digest()));
+    //     }
+    // }
+    // END android-removed
 
     /**
      * HMACSHA512
@@ -125,23 +133,25 @@ public class SHA512
         }
     }
 
-    public static class KeyGeneratorT224
-        extends BaseKeyGenerator
-    {
-        public KeyGeneratorT224()
-        {
-            super("HMACSHA512/224", 224, new CipherKeyGenerator());
-        }
-    }
-
-    public static class KeyGeneratorT256
-        extends BaseKeyGenerator
-    {
-        public KeyGeneratorT256()
-        {
-            super("HMACSHA512/256", 256, new CipherKeyGenerator());
-        }
-    }
+    // BEGIN android-removed
+    // public static class KeyGeneratorT224
+    //     extends BaseKeyGenerator
+    // {
+    //     public KeyGeneratorT224()
+    //     {
+    //         super("HMACSHA512/224", 224, new CipherKeyGenerator());
+    //     }
+    // }
+    //
+    // public static class KeyGeneratorT256
+    //     extends BaseKeyGenerator
+    // {
+    //     public KeyGeneratorT256()
+    //     {
+    //         super("HMACSHA512/256", 256, new CipherKeyGenerator());
+    //     }
+    // }
+    // END android-removed
 
     public static class Mappings
         extends DigestAlgorithmProvider
@@ -158,21 +168,25 @@ public class SHA512
             provider.addAlgorithm("Alg.Alias.MessageDigest.SHA512", "SHA-512");
             provider.addAlgorithm("Alg.Alias.MessageDigest." + NISTObjectIdentifiers.id_sha512, "SHA-512");
 
-            provider.addAlgorithm("MessageDigest.SHA-512/224", PREFIX + "$DigestT224");
-            provider.addAlgorithm("Alg.Alias.MessageDigest.SHA512/224", "SHA-512/224");
-            provider.addAlgorithm("Alg.Alias.MessageDigest." + NISTObjectIdentifiers.id_sha512_224, "SHA-512/224");
-
-            provider.addAlgorithm("MessageDigest.SHA-512/256", PREFIX + "$DigestT256");
-            provider.addAlgorithm("Alg.Alias.MessageDigest.SHA512256", "SHA-512/256");
-            provider.addAlgorithm("Alg.Alias.MessageDigest." + NISTObjectIdentifiers.id_sha512_256, "SHA-512/256");
-
-            provider.addAlgorithm("Mac.OLDHMACSHA512", PREFIX + "$OldSHA512");
+            // BEGIN android-removed
+            // provider.addAlgorithm("MessageDigest.SHA-512/224", PREFIX + "$DigestT224");
+            // provider.addAlgorithm("Alg.Alias.MessageDigest.SHA512/224", "SHA-512/224");
+            // provider.addAlgorithm("Alg.Alias.MessageDigest." + NISTObjectIdentifiers.id_sha512_224, "SHA-512/224");
+            //
+            // provider.addAlgorithm("MessageDigest.SHA-512/256", PREFIX + "$DigestT256");
+            // provider.addAlgorithm("Alg.Alias.MessageDigest.SHA512256", "SHA-512/256");
+            // provider.addAlgorithm("Alg.Alias.MessageDigest." + NISTObjectIdentifiers.id_sha512_256, "SHA-512/256");
+            //
+            // provider.addAlgorithm("Mac.OLDHMACSHA512", PREFIX + "$OldSHA512");
+            // END android-removed
 
             addHMACAlgorithm(provider, "SHA512", PREFIX + "$HashMac",  PREFIX + "$KeyGenerator");
             addHMACAlias(provider, "SHA512", PKCSObjectIdentifiers.id_hmacWithSHA512);
 
-            addHMACAlgorithm(provider, "SHA512/224", PREFIX + "$HashMacT224",  PREFIX + "$KeyGeneratorT224");
-            addHMACAlgorithm(provider, "SHA512/256", PREFIX + "$HashMacT256",  PREFIX + "$KeyGeneratorT256");
+            // BEGIN android-removed
+            // addHMACAlgorithm(provider, "SHA512/224", PREFIX + "$HashMacT224",  PREFIX + "$KeyGeneratorT224");
+            // addHMACAlgorithm(provider, "SHA512/256", PREFIX + "$HashMacT256",  PREFIX + "$KeyGeneratorT256");
+            // END android-removed
         }
     }
 
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/digest/SM3.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/digest/SM3.java
deleted file mode 100644
index 8050e35..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/digest/SM3.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package org.bouncycastle.jcajce.provider.digest;
-
-import org.bouncycastle.crypto.digests.SM3Digest;
-import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
-
-public class SM3
-{
-    private SM3()
-    {
-    }
-
-    static public class Digest
-        extends BCMessageDigest
-        implements Cloneable
-    {
-        public Digest()
-        {
-            super(new SM3Digest());
-        }
-
-        public Object clone()
-            throws CloneNotSupportedException
-        {
-            Digest d = (Digest)super.clone();
-            d.digest = new SM3Digest((SM3Digest)digest);
-
-            return d;
-        }
-    }
-
-    public static class Mappings
-        extends DigestAlgorithmProvider
-    {
-        private static final String PREFIX = SM3.class.getName();
-
-        public Mappings()
-        {
-        }
-
-        public void configure(ConfigurableProvider provider)
-        {
-            provider.addAlgorithm("MessageDigest.SM3", PREFIX + "$Digest");
-            provider.addAlgorithm("Alg.Alias.MessageDigest.SM3", "SM3");
-            provider.addAlgorithm("Alg.Alias.MessageDigest.1.2.156.197.1.401", "SM3");
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/digest/Skein.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/digest/Skein.java
deleted file mode 100644
index 1191049..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/digest/Skein.java
+++ /dev/null
@@ -1,740 +0,0 @@
-package org.bouncycastle.jcajce.provider.digest;
-
-import org.bouncycastle.crypto.CipherKeyGenerator;
-import org.bouncycastle.crypto.digests.SkeinDigest;
-import org.bouncycastle.crypto.macs.HMac;
-import org.bouncycastle.crypto.macs.SkeinMac;
-import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseMac;
-
-public class Skein
-{
-    private Skein()
-    {
-    }
-
-    public static class DigestSkein256
-        extends BCMessageDigest
-        implements Cloneable
-    {
-        public DigestSkein256(int outputSize)
-        {
-            super(new SkeinDigest(SkeinDigest.SKEIN_256, outputSize));
-        }
-
-        public Object clone()
-            throws CloneNotSupportedException
-        {
-            BCMessageDigest d = (BCMessageDigest)super.clone();
-            d.digest = new SkeinDigest((SkeinDigest)digest);
-
-            return d;
-        }
-    }
-
-    public static class Digest_256_128
-        extends DigestSkein256
-    {
-        public Digest_256_128()
-        {
-            super(128);
-        }
-    }
-
-    public static class Digest_256_160
-        extends DigestSkein256
-    {
-        public Digest_256_160()
-        {
-            super(160);
-        }
-    }
-
-    public static class Digest_256_224
-        extends DigestSkein256
-    {
-        public Digest_256_224()
-        {
-            super(224);
-        }
-    }
-
-    public static class Digest_256_256
-        extends DigestSkein256
-    {
-        public Digest_256_256()
-        {
-            super(256);
-        }
-    }
-
-    public static class DigestSkein512
-        extends BCMessageDigest
-        implements Cloneable
-    {
-        public DigestSkein512(int outputSize)
-        {
-            super(new SkeinDigest(SkeinDigest.SKEIN_512, outputSize));
-        }
-
-        public Object clone()
-            throws CloneNotSupportedException
-        {
-            BCMessageDigest d = (BCMessageDigest)super.clone();
-            d.digest = new SkeinDigest((SkeinDigest)digest);
-
-            return d;
-        }
-    }
-
-    public static class Digest_512_128
-        extends DigestSkein512
-    {
-        public Digest_512_128()
-        {
-            super(128);
-        }
-    }
-
-    public static class Digest_512_160
-        extends DigestSkein512
-    {
-        public Digest_512_160()
-        {
-            super(160);
-        }
-    }
-
-    public static class Digest_512_224
-        extends DigestSkein512
-    {
-        public Digest_512_224()
-        {
-            super(224);
-        }
-    }
-
-    public static class Digest_512_256
-        extends DigestSkein512
-    {
-        public Digest_512_256()
-        {
-            super(256);
-        }
-    }
-
-    public static class Digest_512_384
-        extends DigestSkein512
-    {
-        public Digest_512_384()
-        {
-            super(384);
-        }
-    }
-
-    public static class Digest_512_512
-        extends DigestSkein512
-    {
-        public Digest_512_512()
-        {
-            super(512);
-        }
-    }
-
-    public static class DigestSkein1024
-        extends BCMessageDigest
-        implements Cloneable
-    {
-        public DigestSkein1024(int outputSize)
-        {
-            super(new SkeinDigest(SkeinDigest.SKEIN_1024, outputSize));
-        }
-
-        public Object clone()
-            throws CloneNotSupportedException
-        {
-            BCMessageDigest d = (BCMessageDigest)super.clone();
-            d.digest = new SkeinDigest((SkeinDigest)digest);
-
-            return d;
-        }
-    }
-
-    public static class Digest_1024_384
-        extends DigestSkein1024
-    {
-        public Digest_1024_384()
-        {
-            super(384);
-        }
-    }
-
-    public static class Digest_1024_512
-        extends DigestSkein1024
-    {
-        public Digest_1024_512()
-        {
-            super(512);
-        }
-    }
-
-    public static class Digest_1024_1024
-        extends DigestSkein1024
-    {
-        public Digest_1024_1024()
-        {
-            super(1024);
-        }
-    }
-
-    /**
-     * Skein HMac
-     */
-    public static class HashMac_256_128
-        extends BaseMac
-    {
-        public HashMac_256_128()
-        {
-            super(new HMac(new SkeinDigest(SkeinDigest.SKEIN_256, 128)));
-        }
-    }
-
-    public static class HashMac_256_160
-        extends BaseMac
-    {
-        public HashMac_256_160()
-        {
-            super(new HMac(new SkeinDigest(SkeinDigest.SKEIN_256, 160)));
-        }
-    }
-
-    public static class HashMac_256_224
-        extends BaseMac
-    {
-        public HashMac_256_224()
-        {
-            super(new HMac(new SkeinDigest(SkeinDigest.SKEIN_256, 224)));
-        }
-    }
-
-    public static class HashMac_256_256
-        extends BaseMac
-    {
-        public HashMac_256_256()
-        {
-            super(new HMac(new SkeinDigest(SkeinDigest.SKEIN_256, 256)));
-        }
-    }
-
-    public static class HashMac_512_128
-        extends BaseMac
-    {
-        public HashMac_512_128()
-        {
-            super(new HMac(new SkeinDigest(SkeinDigest.SKEIN_512, 128)));
-        }
-    }
-
-    public static class HashMac_512_160
-        extends BaseMac
-    {
-        public HashMac_512_160()
-        {
-            super(new HMac(new SkeinDigest(SkeinDigest.SKEIN_512, 160)));
-        }
-    }
-
-    public static class HashMac_512_224
-        extends BaseMac
-    {
-        public HashMac_512_224()
-        {
-            super(new HMac(new SkeinDigest(SkeinDigest.SKEIN_512, 224)));
-        }
-    }
-
-    public static class HashMac_512_256
-        extends BaseMac
-    {
-        public HashMac_512_256()
-        {
-            super(new HMac(new SkeinDigest(SkeinDigest.SKEIN_512, 256)));
-        }
-    }
-
-    public static class HashMac_512_384
-        extends BaseMac
-    {
-        public HashMac_512_384()
-        {
-            super(new HMac(new SkeinDigest(SkeinDigest.SKEIN_512, 384)));
-        }
-    }
-
-    public static class HashMac_512_512
-        extends BaseMac
-    {
-        public HashMac_512_512()
-        {
-            super(new HMac(new SkeinDigest(SkeinDigest.SKEIN_512, 512)));
-        }
-    }
-
-    public static class HashMac_1024_384
-        extends BaseMac
-    {
-        public HashMac_1024_384()
-        {
-            super(new HMac(new SkeinDigest(SkeinDigest.SKEIN_1024, 384)));
-        }
-    }
-
-    public static class HashMac_1024_512
-        extends BaseMac
-    {
-        public HashMac_1024_512()
-        {
-            super(new HMac(new SkeinDigest(SkeinDigest.SKEIN_1024, 512)));
-        }
-    }
-
-    public static class HashMac_1024_1024
-        extends BaseMac
-    {
-        public HashMac_1024_1024()
-        {
-            super(new HMac(new SkeinDigest(SkeinDigest.SKEIN_1024, 1024)));
-        }
-    }
-
-    public static class HMacKeyGenerator_256_128
-        extends BaseKeyGenerator
-    {
-        public HMacKeyGenerator_256_128()
-        {
-            super("HMACSkein-256-128", 128, new CipherKeyGenerator());
-        }
-    }
-
-    public static class HMacKeyGenerator_256_160
-        extends BaseKeyGenerator
-    {
-        public HMacKeyGenerator_256_160()
-        {
-            super("HMACSkein-256-160", 160, new CipherKeyGenerator());
-        }
-    }
-
-    public static class HMacKeyGenerator_256_224
-        extends BaseKeyGenerator
-    {
-        public HMacKeyGenerator_256_224()
-        {
-            super("HMACSkein-256-224", 224, new CipherKeyGenerator());
-        }
-    }
-
-    public static class HMacKeyGenerator_256_256
-        extends BaseKeyGenerator
-    {
-        public HMacKeyGenerator_256_256()
-        {
-            super("HMACSkein-256-256", 256, new CipherKeyGenerator());
-        }
-    }
-
-    public static class HMacKeyGenerator_512_128
-        extends BaseKeyGenerator
-    {
-        public HMacKeyGenerator_512_128()
-        {
-            super("HMACSkein-512-128", 128, new CipherKeyGenerator());
-        }
-    }
-
-    public static class HMacKeyGenerator_512_160
-        extends BaseKeyGenerator
-    {
-        public HMacKeyGenerator_512_160()
-        {
-            super("HMACSkein-512-160", 160, new CipherKeyGenerator());
-        }
-    }
-
-    public static class HMacKeyGenerator_512_224
-        extends BaseKeyGenerator
-    {
-        public HMacKeyGenerator_512_224()
-        {
-            super("HMACSkein-512-224", 224, new CipherKeyGenerator());
-        }
-    }
-
-    public static class HMacKeyGenerator_512_256
-        extends BaseKeyGenerator
-    {
-        public HMacKeyGenerator_512_256()
-        {
-            super("HMACSkein-512-256", 256, new CipherKeyGenerator());
-        }
-    }
-
-    public static class HMacKeyGenerator_512_384
-        extends BaseKeyGenerator
-    {
-        public HMacKeyGenerator_512_384()
-        {
-            super("HMACSkein-512-384", 384, new CipherKeyGenerator());
-        }
-    }
-
-    public static class HMacKeyGenerator_512_512
-        extends BaseKeyGenerator
-    {
-        public HMacKeyGenerator_512_512()
-        {
-            super("HMACSkein-512-512", 512, new CipherKeyGenerator());
-        }
-    }
-
-    public static class HMacKeyGenerator_1024_384
-        extends BaseKeyGenerator
-    {
-        public HMacKeyGenerator_1024_384()
-        {
-            super("HMACSkein-1024-384", 384, new CipherKeyGenerator());
-        }
-    }
-
-    public static class HMacKeyGenerator_1024_512
-        extends BaseKeyGenerator
-    {
-        public HMacKeyGenerator_1024_512()
-        {
-            super("HMACSkein-1024-512", 512, new CipherKeyGenerator());
-        }
-    }
-
-    public static class HMacKeyGenerator_1024_1024
-        extends BaseKeyGenerator
-    {
-        public HMacKeyGenerator_1024_1024()
-        {
-            super("HMACSkein-1024-1024", 1024, new CipherKeyGenerator());
-        }
-    }
-
-    /*
-     * Skein-MAC
-     */
-    public static class SkeinMac_256_128
-        extends BaseMac
-    {
-        public SkeinMac_256_128()
-        {
-            super(new SkeinMac(SkeinMac.SKEIN_256, 128));
-        }
-    }
-
-    public static class SkeinMac_256_160
-        extends BaseMac
-    {
-        public SkeinMac_256_160()
-        {
-            super(new SkeinMac(SkeinMac.SKEIN_256, 160));
-        }
-    }
-
-    public static class SkeinMac_256_224
-        extends BaseMac
-    {
-        public SkeinMac_256_224()
-        {
-            super(new SkeinMac(SkeinMac.SKEIN_256, 224));
-        }
-    }
-
-    public static class SkeinMac_256_256
-        extends BaseMac
-    {
-        public SkeinMac_256_256()
-        {
-            super(new SkeinMac(SkeinMac.SKEIN_256, 256));
-        }
-    }
-
-    public static class SkeinMac_512_128
-        extends BaseMac
-    {
-        public SkeinMac_512_128()
-        {
-            super(new SkeinMac(SkeinMac.SKEIN_512, 128));
-        }
-    }
-
-    public static class SkeinMac_512_160
-        extends BaseMac
-    {
-        public SkeinMac_512_160()
-        {
-            super(new SkeinMac(SkeinMac.SKEIN_512, 160));
-        }
-    }
-
-    public static class SkeinMac_512_224
-        extends BaseMac
-    {
-        public SkeinMac_512_224()
-        {
-            super(new SkeinMac(SkeinMac.SKEIN_512, 224));
-        }
-    }
-
-    public static class SkeinMac_512_256
-        extends BaseMac
-    {
-        public SkeinMac_512_256()
-        {
-            super(new SkeinMac(SkeinMac.SKEIN_512, 256));
-        }
-    }
-
-    public static class SkeinMac_512_384
-        extends BaseMac
-    {
-        public SkeinMac_512_384()
-        {
-            super(new SkeinMac(SkeinMac.SKEIN_512, 384));
-        }
-    }
-
-    public static class SkeinMac_512_512
-        extends BaseMac
-    {
-        public SkeinMac_512_512()
-        {
-            super(new SkeinMac(SkeinMac.SKEIN_512, 512));
-        }
-    }
-
-    public static class SkeinMac_1024_384
-        extends BaseMac
-    {
-        public SkeinMac_1024_384()
-        {
-            super(new SkeinMac(SkeinMac.SKEIN_1024, 384));
-        }
-    }
-
-    public static class SkeinMac_1024_512
-        extends BaseMac
-    {
-        public SkeinMac_1024_512()
-        {
-            super(new SkeinMac(SkeinMac.SKEIN_1024, 512));
-        }
-    }
-
-    public static class SkeinMac_1024_1024
-        extends BaseMac
-    {
-        public SkeinMac_1024_1024()
-        {
-            super(new SkeinMac(SkeinMac.SKEIN_1024, 1024));
-        }
-    }
-
-    public static class SkeinMacKeyGenerator_256_128
-        extends BaseKeyGenerator
-    {
-        public SkeinMacKeyGenerator_256_128()
-        {
-            super("Skein-MAC-256-128", 128, new CipherKeyGenerator());
-        }
-    }
-
-    public static class SkeinMacKeyGenerator_256_160
-        extends BaseKeyGenerator
-    {
-        public SkeinMacKeyGenerator_256_160()
-        {
-            super("Skein-MAC-256-160", 160, new CipherKeyGenerator());
-        }
-    }
-
-    public static class SkeinMacKeyGenerator_256_224
-        extends BaseKeyGenerator
-    {
-        public SkeinMacKeyGenerator_256_224()
-        {
-            super("Skein-MAC-256-224", 224, new CipherKeyGenerator());
-        }
-    }
-
-    public static class SkeinMacKeyGenerator_256_256
-        extends BaseKeyGenerator
-    {
-        public SkeinMacKeyGenerator_256_256()
-        {
-            super("Skein-MAC-256-256", 256, new CipherKeyGenerator());
-        }
-    }
-
-    public static class SkeinMacKeyGenerator_512_128
-        extends BaseKeyGenerator
-    {
-        public SkeinMacKeyGenerator_512_128()
-        {
-            super("Skein-MAC-512-128", 128, new CipherKeyGenerator());
-        }
-    }
-
-    public static class SkeinMacKeyGenerator_512_160
-        extends BaseKeyGenerator
-    {
-        public SkeinMacKeyGenerator_512_160()
-        {
-            super("Skein-MAC-512-160", 160, new CipherKeyGenerator());
-        }
-    }
-
-    public static class SkeinMacKeyGenerator_512_224
-        extends BaseKeyGenerator
-    {
-        public SkeinMacKeyGenerator_512_224()
-        {
-            super("Skein-MAC-512-224", 224, new CipherKeyGenerator());
-        }
-    }
-
-    public static class SkeinMacKeyGenerator_512_256
-        extends BaseKeyGenerator
-    {
-        public SkeinMacKeyGenerator_512_256()
-        {
-            super("Skein-MAC-512-256", 256, new CipherKeyGenerator());
-        }
-    }
-
-    public static class SkeinMacKeyGenerator_512_384
-        extends BaseKeyGenerator
-    {
-        public SkeinMacKeyGenerator_512_384()
-        {
-            super("Skein-MAC-512-384", 384, new CipherKeyGenerator());
-        }
-    }
-
-    public static class SkeinMacKeyGenerator_512_512
-        extends BaseKeyGenerator
-    {
-        public SkeinMacKeyGenerator_512_512()
-        {
-            super("Skein-MAC-512-512", 512, new CipherKeyGenerator());
-        }
-    }
-
-    public static class SkeinMacKeyGenerator_1024_384
-        extends BaseKeyGenerator
-    {
-        public SkeinMacKeyGenerator_1024_384()
-        {
-            super("Skein-MAC-1024-384", 384, new CipherKeyGenerator());
-        }
-    }
-
-    public static class SkeinMacKeyGenerator_1024_512
-        extends BaseKeyGenerator
-    {
-        public SkeinMacKeyGenerator_1024_512()
-        {
-            super("Skein-MAC-1024-512", 512, new CipherKeyGenerator());
-        }
-    }
-
-    public static class SkeinMacKeyGenerator_1024_1024
-        extends BaseKeyGenerator
-    {
-        public SkeinMacKeyGenerator_1024_1024()
-        {
-            super("Skein-MAC-1024-1024", 1024, new CipherKeyGenerator());
-        }
-    }
-
-    public static class Mappings
-        extends DigestAlgorithmProvider
-    {
-        private static final String PREFIX = Skein.class.getName();
-
-        public Mappings()
-        {
-        }
-
-        public void configure(ConfigurableProvider provider)
-        {
-            // Skein sizes as used in "The Skein Hash Function Family 1.3"
-
-            provider.addAlgorithm("MessageDigest.Skein-256-128", PREFIX + "$Digest_256_128");
-            provider.addAlgorithm("MessageDigest.Skein-256-160", PREFIX + "$Digest_256_160");
-            provider.addAlgorithm("MessageDigest.Skein-256-224", PREFIX + "$Digest_256_224");
-            provider.addAlgorithm("MessageDigest.Skein-256-256", PREFIX + "$Digest_256_256");
-
-            provider.addAlgorithm("MessageDigest.Skein-512-128", PREFIX + "$Digest_512_128");
-            provider.addAlgorithm("MessageDigest.Skein-512-160", PREFIX + "$Digest_512_160");
-            provider.addAlgorithm("MessageDigest.Skein-512-224", PREFIX + "$Digest_512_224");
-            provider.addAlgorithm("MessageDigest.Skein-512-256", PREFIX + "$Digest_512_256");
-            provider.addAlgorithm("MessageDigest.Skein-512-384", PREFIX + "$Digest_512_384");
-            provider.addAlgorithm("MessageDigest.Skein-512-512", PREFIX + "$Digest_512_512");
-
-            provider.addAlgorithm("MessageDigest.Skein-1024-384", PREFIX + "$Digest_1024_384");
-            provider.addAlgorithm("MessageDigest.Skein-1024-512", PREFIX + "$Digest_1024_512");
-            provider.addAlgorithm("MessageDigest.Skein-1024-1024", PREFIX + "$Digest_1024_1024");
-
-            addHMACAlgorithm(provider, "Skein-256-128", PREFIX + "$HashMac_256_128", PREFIX + "$HMacKeyGenerator_256_128");
-            addHMACAlgorithm(provider, "Skein-256-160", PREFIX + "$HashMac_256_160", PREFIX + "$HMacKeyGenerator_256_160");
-            addHMACAlgorithm(provider, "Skein-256-224", PREFIX + "$HashMac_256_224", PREFIX + "$HMacKeyGenerator_256_224");
-            addHMACAlgorithm(provider, "Skein-256-256", PREFIX + "$HashMac_256_256", PREFIX + "$HMacKeyGenerator_256_256");
-
-            addHMACAlgorithm(provider, "Skein-512-128", PREFIX + "$HashMac_512_128", PREFIX + "$HMacKeyGenerator_512_128");
-            addHMACAlgorithm(provider, "Skein-512-160", PREFIX + "$HashMac_512_160", PREFIX + "$HMacKeyGenerator_512_160");
-            addHMACAlgorithm(provider, "Skein-512-224", PREFIX + "$HashMac_512_224", PREFIX + "$HMacKeyGenerator_512_224");
-            addHMACAlgorithm(provider, "Skein-512-256", PREFIX + "$HashMac_512_256", PREFIX + "$HMacKeyGenerator_512_256");
-            addHMACAlgorithm(provider, "Skein-512-384", PREFIX + "$HashMac_512_384", PREFIX + "$HMacKeyGenerator_512_384");
-            addHMACAlgorithm(provider, "Skein-512-512", PREFIX + "$HashMac_512_512", PREFIX + "$HMacKeyGenerator_512_512");
-
-            addHMACAlgorithm(provider, "Skein-1024-384", PREFIX + "$HashMac_1024_384", PREFIX + "$HMacKeyGenerator_1024_384");
-            addHMACAlgorithm(provider, "Skein-1024-512", PREFIX + "$HashMac_1024_512", PREFIX + "$HMacKeyGenerator_1024_512");
-            addHMACAlgorithm(provider, "Skein-1024-1024", PREFIX + "$HashMac_1024_1024", PREFIX + "$HMacKeyGenerator_1024_1024");
-
-            addSkeinMacAlgorithm(provider, 256, 128);
-            addSkeinMacAlgorithm(provider, 256, 160);
-            addSkeinMacAlgorithm(provider, 256, 224);
-            addSkeinMacAlgorithm(provider, 256, 256);
-
-            addSkeinMacAlgorithm(provider, 512, 128);
-            addSkeinMacAlgorithm(provider, 512, 160);
-            addSkeinMacAlgorithm(provider, 512, 224);
-            addSkeinMacAlgorithm(provider, 512, 256);
-            addSkeinMacAlgorithm(provider, 512, 384);
-            addSkeinMacAlgorithm(provider, 512, 512);
-
-            addSkeinMacAlgorithm(provider, 1024, 384);
-            addSkeinMacAlgorithm(provider, 1024, 512);
-            addSkeinMacAlgorithm(provider, 1024, 1024);
-        }
-
-        private void addSkeinMacAlgorithm(ConfigurableProvider provider, int blockSize, int outputSize)
-        {
-            String mainName = "Skein-MAC-" + blockSize + "-" + outputSize;
-            String algorithmClassName = PREFIX + "$SkeinMac_" + blockSize + "_" + outputSize;
-            String keyGeneratorClassName = PREFIX + "$SkeinMacKeyGenerator_" + blockSize + "_" + outputSize;
-
-            provider.addAlgorithm("Mac." + mainName, algorithmClassName);
-            provider.addAlgorithm("Alg.Alias.Mac.Skein-MAC" + blockSize + "/" + outputSize, mainName);
-            provider.addAlgorithm("KeyGenerator." + mainName, keyGeneratorClassName);
-            provider.addAlgorithm("Alg.Alias.KeyGenerator.Skein-MAC" + blockSize + "/" + outputSize, mainName);
-        }
-
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/digest/Tiger.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/digest/Tiger.java
deleted file mode 100644
index 3d248aa..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/digest/Tiger.java
+++ /dev/null
@@ -1,115 +0,0 @@
-package org.bouncycastle.jcajce.provider.digest;
-
-import org.bouncycastle.asn1.iana.IANAObjectIdentifiers;
-import org.bouncycastle.crypto.CipherKeyGenerator;
-import org.bouncycastle.crypto.digests.TigerDigest;
-import org.bouncycastle.crypto.macs.HMac;
-import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseMac;
-import org.bouncycastle.jcajce.provider.symmetric.util.PBESecretKeyFactory;
-
-public class Tiger
-{
-    private Tiger()
-    {
-
-    }
-
-    static public class Digest
-        extends BCMessageDigest
-        implements Cloneable
-    {
-        public Digest()
-        {
-            super(new TigerDigest());
-        }
-
-        public Object clone()
-            throws CloneNotSupportedException
-        {
-            Digest d = (Digest)super.clone();
-            d.digest = new TigerDigest((TigerDigest)digest);
-
-            return d;
-        }
-    }
-
-    /**
-     * Tiger HMac
-     */
-    public static class HashMac
-        extends BaseMac
-    {
-        public HashMac()
-        {
-            super(new HMac(new TigerDigest()));
-        }
-    }
-
-    public static class KeyGenerator
-        extends BaseKeyGenerator
-    {
-        public KeyGenerator()
-        {
-            super("HMACTIGER", 192, new CipherKeyGenerator());
-        }
-    }
-
-    /**
-     * Tiger HMac
-     */
-    public static class TigerHmac
-        extends BaseMac
-    {
-        public TigerHmac()
-        {
-            super(new HMac(new TigerDigest()));
-        }
-    }
-
-    /**
-     * PBEWithHmacTiger
-     */
-    public static class PBEWithMacKeyFactory
-        extends PBESecretKeyFactory
-    {
-        public PBEWithMacKeyFactory()
-        {
-            super("PBEwithHmacTiger", null, false, PKCS12, TIGER, 192, 0);
-        }
-    }
-
-    /**
-     * PBEWithHmacTiger
-     */
-    public static class PBEWithHashMac
-        extends BaseMac
-    {
-        public PBEWithHashMac()
-        {
-            super(new HMac(new TigerDigest()), PKCS12, TIGER, 192);
-        }
-    }
-
-    public static class Mappings
-        extends DigestAlgorithmProvider
-    {
-        private static final String PREFIX = Tiger.class.getName();
-
-        public Mappings()
-        {
-        }
-
-        public void configure(ConfigurableProvider provider)
-        {
-            provider.addAlgorithm("MessageDigest.TIGER", PREFIX + "$Digest");
-            provider.addAlgorithm("MessageDigest.Tiger", PREFIX + "$Digest"); // JDK 1.1.
-
-            addHMACAlgorithm(provider, "TIGER", PREFIX + "$HashMac", PREFIX + "$KeyGenerator");
-            addHMACAlias(provider, "TIGER", IANAObjectIdentifiers.hmacTIGER);
-
-            provider.addAlgorithm("SecretKeyFactory.PBEWITHHMACTIGER", PREFIX + "$PBEWithMacKeyFactory");
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/digest/Whirlpool.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/digest/Whirlpool.java
deleted file mode 100644
index bf1c06c..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/digest/Whirlpool.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package org.bouncycastle.jcajce.provider.digest;
-
-import org.bouncycastle.crypto.CipherKeyGenerator;
-import org.bouncycastle.crypto.digests.WhirlpoolDigest;
-import org.bouncycastle.crypto.macs.HMac;
-import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseMac;
-
-public class Whirlpool
-{
-    private Whirlpool()
-    {
-
-    }
-
-    static public class Digest
-        extends BCMessageDigest
-        implements Cloneable
-    {
-        public Digest()
-        {
-            super(new WhirlpoolDigest());
-        }
-
-        public Object clone()
-            throws CloneNotSupportedException
-        {
-            Digest d = (Digest)super.clone();
-            d.digest = new WhirlpoolDigest((WhirlpoolDigest)digest);
-
-            return d;
-        }
-    }
-
-    /**
-     * Tiger HMac
-     */
-    public static class HashMac
-        extends BaseMac
-    {
-        public HashMac()
-        {
-            super(new HMac(new WhirlpoolDigest()));
-        }
-    }
-
-    public static class KeyGenerator
-        extends BaseKeyGenerator
-    {
-        public KeyGenerator()
-        {
-            super("HMACWHIRLPOOL", 512, new CipherKeyGenerator());
-        }
-    }
-
-    public static class Mappings
-        extends DigestAlgorithmProvider
-    {
-        private static final String PREFIX = Whirlpool.class.getName();
-
-        public Mappings()
-        {
-        }
-
-        public void configure(ConfigurableProvider provider)
-        {
-            provider.addAlgorithm("MessageDigest.WHIRLPOOL", PREFIX + "$Digest");
-
-            addHMACAlgorithm(provider, "WHIRLPOOL", PREFIX + "$HashMac", PREFIX + "$KeyGenerator");
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/keystore/BC.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/keystore/BC.java
index 30a81ff..9711426 100644
--- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/keystore/BC.java
+++ b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/keystore/BC.java
@@ -17,7 +17,9 @@ public class BC
         public void configure(ConfigurableProvider provider)
         {
             provider.addAlgorithm("KeyStore.BKS", PREFIX + "BcKeyStoreSpi$Std");
-            provider.addAlgorithm("KeyStore.BKS-V1", PREFIX + "BcKeyStoreSpi$Version1");
+            // BEGIN android-removed
+            // provider.addAlgorithm("KeyStore.BKS-V1", PREFIX + "BcKeyStoreSpi$Version1");
+            // END android-removed
             provider.addAlgorithm("KeyStore.BouncyCastle", PREFIX + "BcKeyStoreSpi$BouncyCastleStore");
             provider.addAlgorithm("Alg.Alias.KeyStore.UBER", "BouncyCastle");
             provider.addAlgorithm("Alg.Alias.KeyStore.BOUNCYCASTLE", "BouncyCastle");
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/keystore/PKCS12.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/keystore/PKCS12.java
index 73abd17..1d4e146 100644
--- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/keystore/PKCS12.java
+++ b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/keystore/PKCS12.java
@@ -17,14 +17,16 @@ public class PKCS12
         public void configure(ConfigurableProvider provider)
         {
             provider.addAlgorithm("KeyStore.PKCS12", PREFIX + "PKCS12KeyStoreSpi$BCPKCS12KeyStore");
-            provider.addAlgorithm("KeyStore.BCPKCS12", PREFIX + "PKCS12KeyStoreSpi$BCPKCS12KeyStore");
-            provider.addAlgorithm("KeyStore.PKCS12-DEF", PREFIX + "PKCS12KeyStoreSpi$DefPKCS12KeyStore");
-
-            provider.addAlgorithm("KeyStore.PKCS12-3DES-40RC2", PREFIX + "PKCS12KeyStoreSpi$BCPKCS12KeyStore");
-            provider.addAlgorithm("KeyStore.PKCS12-3DES-3DES", PREFIX + "PKCS12KeyStoreSpi$BCPKCS12KeyStore3DES");
-    
-            provider.addAlgorithm("KeyStore.PKCS12-DEF-3DES-40RC2", PREFIX + "PKCS12KeyStoreSpi$DefPKCS12KeyStore");
-            provider.addAlgorithm("KeyStore.PKCS12-DEF-3DES-3DES", PREFIX + "PKCS12KeyStoreSpi$DefPKCS12KeyStore3DES");
+            // BEGIN android-removed
+            // provider.addAlgorithm("KeyStore.BCPKCS12", PREFIX + "PKCS12KeyStoreSpi$BCPKCS12KeyStore");
+            // provider.addAlgorithm("KeyStore.PKCS12-DEF", PREFIX + "PKCS12KeyStoreSpi$DefPKCS12KeyStore");
+            //
+            // provider.addAlgorithm("KeyStore.PKCS12-3DES-40RC2", PREFIX + "PKCS12KeyStoreSpi$BCPKCS12KeyStore");
+            // provider.addAlgorithm("KeyStore.PKCS12-3DES-3DES", PREFIX + "PKCS12KeyStoreSpi$BCPKCS12KeyStore3DES");
+            //
+            // provider.addAlgorithm("KeyStore.PKCS12-DEF-3DES-40RC2", PREFIX + "PKCS12KeyStoreSpi$DefPKCS12KeyStore");
+            // provider.addAlgorithm("KeyStore.PKCS12-DEF-3DES-3DES", PREFIX + "PKCS12KeyStoreSpi$DefPKCS12KeyStore3DES");
+            // END android-removed
         }
     }
 }
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/keystore/pkcs12/PKCS12KeyStoreSpi.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/keystore/pkcs12/PKCS12KeyStoreSpi.java
index 3fc0396..53548f0 100644
--- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/keystore/pkcs12/PKCS12KeyStoreSpi.java
+++ b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/keystore/pkcs12/PKCS12KeyStoreSpi.java
@@ -62,8 +62,10 @@ import org.bouncycastle.asn1.DEROctetString;
 import org.bouncycastle.asn1.DEROutputStream;
 import org.bouncycastle.asn1.DERSequence;
 import org.bouncycastle.asn1.DERSet;
-import org.bouncycastle.asn1.cryptopro.CryptoProObjectIdentifiers;
-import org.bouncycastle.asn1.cryptopro.GOST28147Parameters;
+// BEGIN android-removed
+// import org.bouncycastle.asn1.cryptopro.CryptoProObjectIdentifiers;
+// import org.bouncycastle.asn1.cryptopro.GOST28147Parameters;
+// END android-removed
 import org.bouncycastle.asn1.nist.NISTObjectIdentifiers;
 import org.bouncycastle.asn1.ntt.NTTObjectIdentifiers;
 import org.bouncycastle.asn1.pkcs.AuthenticatedSafe;
@@ -89,7 +91,9 @@ import org.bouncycastle.crypto.Digest;
 import org.bouncycastle.crypto.digests.SHA1Digest;
 import org.bouncycastle.jcajce.PKCS12StoreParameter;
 import org.bouncycastle.jcajce.provider.symmetric.util.BCPBEKey;
-import org.bouncycastle.jcajce.spec.GOST28147ParameterSpec;
+// BEGIN android-removed
+// import org.bouncycastle.jcajce.spec.GOST28147ParameterSpec;
+// END android-removed
 import org.bouncycastle.jcajce.spec.PBKDF2KeySpec;
 import org.bouncycastle.jcajce.util.BCJcaJceHelper;
 import org.bouncycastle.jcajce.util.JcaJceHelper;
@@ -753,13 +757,15 @@ public class PKCS12KeyStoreSpi
         {
             cipher.init(mode, key, new IvParameterSpec(ASN1OctetString.getInstance(encParams).getOctets()));
         }
-        else
-        {
-            // TODO: at the moment it's just GOST, but...
-            GOST28147Parameters gParams = GOST28147Parameters.getInstance(encParams);
-
-            cipher.init(mode, key, new GOST28147ParameterSpec(gParams.getEncryptionParamSet(), gParams.getIV()));
-        }
+        // BEGIN android-removed
+        // else
+        // {
+        //     // TODO: at the moment it's just GOST, but...
+        //     GOST28147Parameters gParams = GOST28147Parameters.getInstance(encParams);
+        //
+        //     cipher.init(mode, key, new GOST28147ParameterSpec(gParams.getEncryptionParamSet(), gParams.getIV()));
+        // }
+        // END android-removed
         return cipher;
     }
 
@@ -1680,33 +1686,34 @@ public class PKCS12KeyStoreSpi
             super(new BouncyCastleProvider(), pbeWithSHAAnd3_KeyTripleDES_CBC, pbeWithSHAAnd40BitRC2_CBC);
         }
     }
-
-    public static class BCPKCS12KeyStore3DES
-        extends PKCS12KeyStoreSpi
-    {
-        public BCPKCS12KeyStore3DES()
-        {
-            super(new BouncyCastleProvider(), pbeWithSHAAnd3_KeyTripleDES_CBC, pbeWithSHAAnd3_KeyTripleDES_CBC);
-        }
-    }
-
-    public static class DefPKCS12KeyStore
-        extends PKCS12KeyStoreSpi
-    {
-        public DefPKCS12KeyStore()
-        {
-            super(null, pbeWithSHAAnd3_KeyTripleDES_CBC, pbeWithSHAAnd40BitRC2_CBC);
-        }
-    }
-
-    public static class DefPKCS12KeyStore3DES
-        extends PKCS12KeyStoreSpi
-    {
-        public DefPKCS12KeyStore3DES()
-        {
-            super(null, pbeWithSHAAnd3_KeyTripleDES_CBC, pbeWithSHAAnd3_KeyTripleDES_CBC);
-        }
-    }
+    // BEGIN android-removed
+    // public static class BCPKCS12KeyStore3DES
+    //     extends PKCS12KeyStoreSpi
+    // {
+    //     public BCPKCS12KeyStore3DES()
+    //     {
+    //         super(new BouncyCastleProvider(), pbeWithSHAAnd3_KeyTripleDES_CBC, pbeWithSHAAnd3_KeyTripleDES_CBC);
+    //     }
+    // }
+    // 
+    // public static class DefPKCS12KeyStore
+    //     extends PKCS12KeyStoreSpi
+    // {
+    //     public DefPKCS12KeyStore()
+    //     {
+    //         super(null, pbeWithSHAAnd3_KeyTripleDES_CBC, pbeWithSHAAnd40BitRC2_CBC);
+    //     }
+    // }
+    // 
+    // public static class DefPKCS12KeyStore3DES
+    //     extends PKCS12KeyStoreSpi
+    // {
+    //     public DefPKCS12KeyStore3DES()
+    //     {
+    //         super(null, pbeWithSHAAnd3_KeyTripleDES_CBC, pbeWithSHAAnd3_KeyTripleDES_CBC);
+    //     }
+    // }
+    // END android-removed
 
     private static class IgnoresCaseHashtable
     {
@@ -1779,7 +1786,9 @@ public class PKCS12KeyStoreSpi
             keySizes.put(NTTObjectIdentifiers.id_camellia192_cbc, Integers.valueOf(192));
             keySizes.put(NTTObjectIdentifiers.id_camellia256_cbc, Integers.valueOf(256));
 
-            keySizes.put(CryptoProObjectIdentifiers.gostR28147_gcfb, Integers.valueOf(256));
+            // BEGIN android-removed
+            // keySizes.put(CryptoProObjectIdentifiers.gostR28147_gcfb, Integers.valueOf(256));
+            // END android-removed
 
             KEY_SIZES = Collections.unmodifiableMap(keySizes);
         }
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/AES.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/AES.java
index e69f39f..d476df8 100644
--- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/AES.java
+++ b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/AES.java
@@ -3,16 +3,28 @@ package org.bouncycastle.jcajce.provider.symmetric;
 import java.io.IOException;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
-import java.security.AlgorithmParameters;
-import java.security.InvalidAlgorithmParameterException;
+// BEGIN android-added
+import java.security.NoSuchAlgorithmException;
+// END android-added
+// BEGIN android-removed
+// import java.security.AlgorithmParameters;
+// import java.security.InvalidAlgorithmParameterException;
+// END android-removed
 import java.security.SecureRandom;
 import java.security.spec.AlgorithmParameterSpec;
 import java.security.spec.InvalidParameterSpecException;
 
-import javax.crypto.spec.IvParameterSpec;
+// BEGIN android-removed
+// import javax.crypto.spec.IvParameterSpec;
+// END android-removed
 
+// BEGIN android-added
+import javax.crypto.NoSuchPaddingException;
+// END android-added
 import org.bouncycastle.asn1.bc.BCObjectIdentifiers;
-import org.bouncycastle.asn1.cms.CCMParameters;
+// BEGIN android-removed
+// import org.bouncycastle.asn1.cms.CCMParameters;
+// END android-removed
 import org.bouncycastle.asn1.cms.GCMParameters;
 import org.bouncycastle.asn1.nist.NISTObjectIdentifiers;
 import org.bouncycastle.crypto.BlockCipher;
@@ -20,22 +32,30 @@ import org.bouncycastle.crypto.BufferedBlockCipher;
 import org.bouncycastle.crypto.CipherKeyGenerator;
 import org.bouncycastle.crypto.engines.AESFastEngine;
 import org.bouncycastle.crypto.engines.AESWrapEngine;
-import org.bouncycastle.crypto.engines.RFC3211WrapEngine;
-import org.bouncycastle.crypto.engines.RFC5649WrapEngine;
-import org.bouncycastle.crypto.generators.Poly1305KeyGenerator;
-import org.bouncycastle.crypto.macs.CMac;
-import org.bouncycastle.crypto.macs.GMac;
+// BEGIN android-removed
+// import org.bouncycastle.crypto.engines.RFC3211WrapEngine;
+// import org.bouncycastle.crypto.engines.RFC5649WrapEngine;
+// import org.bouncycastle.crypto.generators.Poly1305KeyGenerator;
+// import org.bouncycastle.crypto.macs.CMac;
+// import org.bouncycastle.crypto.macs.GMac;
+// END android-removed
 import org.bouncycastle.crypto.modes.CBCBlockCipher;
-import org.bouncycastle.crypto.modes.CCMBlockCipher;
+// BEGIN android-removed
+// import org.bouncycastle.crypto.modes.CCMBlockCipher;
+// END android-removed
 import org.bouncycastle.crypto.modes.CFBBlockCipher;
 import org.bouncycastle.crypto.modes.GCMBlockCipher;
 import org.bouncycastle.crypto.modes.OFBBlockCipher;
 import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseAlgorithmParameterGenerator;
+// BEGIN android-removed
+// import org.bouncycastle.jcajce.provider.symmetric.util.BaseAlgorithmParameterGenerator;
+// END android-removed
 import org.bouncycastle.jcajce.provider.symmetric.util.BaseAlgorithmParameters;
 import org.bouncycastle.jcajce.provider.symmetric.util.BaseBlockCipher;
 import org.bouncycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseMac;
+// BEGIN android-removed
+// import org.bouncycastle.jcajce.provider.symmetric.util.BaseMac;
+// END android-removed
 import org.bouncycastle.jcajce.provider.symmetric.util.BaseWrapCipher;
 import org.bouncycastle.jcajce.provider.symmetric.util.BlockCipherProvider;
 import org.bouncycastle.jcajce.provider.symmetric.util.IvAlgorithmParameters;
@@ -98,53 +118,64 @@ public final class AES
         public GCM()
         {
             super(new GCMBlockCipher(new AESFastEngine()));
-        }
-    }
-
-    static public class CCM
-        extends BaseBlockCipher
-    {
-        public CCM()
-        {
-            super(new CCMBlockCipher(new AESFastEngine()));
-        }
-    }
-
-    public static class AESCMAC
-        extends BaseMac
-    {
-        public AESCMAC()
-        {
-            super(new CMac(new AESFastEngine()));
-        }
-    }
-
-    public static class AESGMAC
-        extends BaseMac
-    {
-        public AESGMAC()
-        {
-            super(new GMac(new GCMBlockCipher(new AESFastEngine())));
-        }
-    }
-
-    public static class Poly1305
-        extends BaseMac
-    {
-        public Poly1305()
-        {
-            super(new org.bouncycastle.crypto.macs.Poly1305(new AESFastEngine()));
-        }
-    }
-
-    public static class Poly1305KeyGen
-        extends BaseKeyGenerator
-    {
-        public Poly1305KeyGen()
-        {
-            super("Poly1305-AES", 256, new Poly1305KeyGenerator());
-        }
-    }
+            // BEGIN android-added
+            try {
+                engineSetMode("GCM");
+                engineSetPadding("NoPadding");
+            } catch (NoSuchAlgorithmException | NoSuchPaddingException e) {
+                // this should not be possible
+                throw new RuntimeException("Could not set mode or padding for GCM mode", e);
+            }
+            // END android-added
+        }
+    }
+
+    // BEGIN android-removed
+    // static public class CCM
+    //     extends BaseBlockCipher
+    // {
+    //     public CCM()
+    //     {
+    //         super(new CCMBlockCipher(new AESFastEngine()));
+    //     }
+    // }
+    //
+    // public static class AESCMAC
+    //     extends BaseMac
+    // {
+    //     public AESCMAC()
+    //     {
+    //         super(new CMac(new AESFastEngine()));
+    //     }
+    // }
+    //
+    // public static class AESGMAC
+    //     extends BaseMac
+    // {
+    //     public AESGMAC()
+    //     {
+    //         super(new GMac(new GCMBlockCipher(new AESFastEngine())));
+    //     }
+    // }
+    //
+    // public static class Poly1305
+    //     extends BaseMac
+    // {
+    //     public Poly1305()
+    //     {
+    //         super(new org.bouncycastle.crypto.macs.Poly1305(new AESFastEngine()));
+    //     }
+    // }
+    //
+    // public static class Poly1305KeyGen
+    //     extends BaseKeyGenerator
+    // {
+    //     public Poly1305KeyGen()
+    //     {
+    //         super("Poly1305-AES", 256, new Poly1305KeyGenerator());
+    //     }
+    // }
+    // END android-removed
 
     static public class Wrap
         extends BaseWrapCipher
@@ -155,23 +186,25 @@ public final class AES
         }
     }
 
-    public static class RFC3211Wrap
-        extends BaseWrapCipher
-    {
-        public RFC3211Wrap()
-        {
-            super(new RFC3211WrapEngine(new AESFastEngine()), 16);
-        }
-    }
-
-    public static class RFC5649Wrap
-        extends BaseWrapCipher
-    {
-        public RFC5649Wrap()
-        {
-            super(new RFC5649WrapEngine(new AESFastEngine()));
-        }
-    }
+    // BEGIN android-removed
+    // public static class RFC3211Wrap
+    //     extends BaseWrapCipher
+    // {
+    //     public RFC3211Wrap()
+    //     {
+    //         super(new RFC3211WrapEngine(new AESFastEngine()), 16);
+    //     }
+    // }
+    //
+    // public static class RFC5649Wrap
+    //     extends BaseWrapCipher
+    // {
+    //     public RFC5649Wrap()
+    //     {
+    //         super(new RFC5649WrapEngine(new AESFastEngine()));
+    //     }
+    // }
+    // END android-removed
 
     /**
      * PBEWithAES-CBC
@@ -190,7 +223,9 @@ public final class AES
     {
         public KeyGen()
         {
-            this(192);
+            // BEGIN android-changed
+            this(128);
+            // END android-changed
         }
 
         public KeyGen(int keySize)
@@ -199,32 +234,34 @@ public final class AES
         }
     }
 
-    public static class KeyGen128
-        extends KeyGen
-    {
-        public KeyGen128()
-        {
-            super(128);
-        }
-    }
-
-    public static class KeyGen192
-        extends KeyGen
-    {
-        public KeyGen192()
-        {
-            super(192);
-        }
-    }
-
-    public static class KeyGen256
-        extends KeyGen
-    {
-        public KeyGen256()
-        {
-            super(256);
-        }
-    }
+    // BEGIN android-removed
+    // public static class KeyGen128
+    //     extends KeyGen
+    // {
+    //     public KeyGen128()
+    //     {
+    //         super(128);
+    //     }
+    // }
+    //
+    // public static class KeyGen192
+    //     extends KeyGen
+    // {
+    //     public KeyGen192()
+    //     {
+    //         super(192);
+    //     }
+    // }
+    //
+    // public static class KeyGen256
+    //     extends KeyGen
+    // {
+    //     public KeyGen256()
+    //     {
+    //         super(256);
+    //     }
+    // }
+    // END android-removed
     
     /**
      * PBEWithSHA1And128BitAES-BC
@@ -334,119 +371,121 @@ public final class AES
         }
     }
     
-    public static class AlgParamGen
-        extends BaseAlgorithmParameterGenerator
-    {
-        protected void engineInit(
-            AlgorithmParameterSpec genParamSpec,
-            SecureRandom random)
-            throws InvalidAlgorithmParameterException
-        {
-            throw new InvalidAlgorithmParameterException("No supported AlgorithmParameterSpec for AES parameter generation.");
-        }
-
-        protected AlgorithmParameters engineGenerateParameters()
-        {
-            byte[]  iv = new byte[16];
-
-            if (random == null)
-            {
-                random = new SecureRandom();
-            }
-
-            random.nextBytes(iv);
-
-            AlgorithmParameters params;
-
-            try
-            {
-                params = createParametersInstance("AES");
-                params.init(new IvParameterSpec(iv));
-            }
-            catch (Exception e)
-            {
-                throw new RuntimeException(e.getMessage());
-            }
-
-            return params;
-        }
-    }
-
-    public static class AlgParamGenCCM
-        extends BaseAlgorithmParameterGenerator
-    {
-        protected void engineInit(
-            AlgorithmParameterSpec genParamSpec,
-            SecureRandom random)
-            throws InvalidAlgorithmParameterException
-        {
-            throw new InvalidAlgorithmParameterException("No supported AlgorithmParameterSpec for AES parameter generation.");
-        }
-
-        protected AlgorithmParameters engineGenerateParameters()
-        {
-            byte[]  iv = new byte[12];
-
-            if (random == null)
-            {
-                random = new SecureRandom();
-            }
-
-            random.nextBytes(iv);
-
-            AlgorithmParameters params;
-
-            try
-            {
-                params = createParametersInstance("CCM");
-                params.init(new CCMParameters(iv, 12).getEncoded());
-            }
-            catch (Exception e)
-            {
-                throw new RuntimeException(e.getMessage());
-            }
-
-            return params;
-        }
-    }
-
-    public static class AlgParamGenGCM
-        extends BaseAlgorithmParameterGenerator
-    {
-        protected void engineInit(
-            AlgorithmParameterSpec genParamSpec,
-            SecureRandom random)
-            throws InvalidAlgorithmParameterException
-        {
-            throw new InvalidAlgorithmParameterException("No supported AlgorithmParameterSpec for AES parameter generation.");
-        }
-
-        protected AlgorithmParameters engineGenerateParameters()
-        {
-            byte[]  nonce = new byte[12];
-
-            if (random == null)
-            {
-                random = new SecureRandom();
-            }
-
-            random.nextBytes(nonce);
-
-            AlgorithmParameters params;
-
-            try
-            {
-                params = createParametersInstance("GCM");
-                params.init(new GCMParameters(nonce, 12).getEncoded());
-            }
-            catch (Exception e)
-            {
-                throw new RuntimeException(e.getMessage());
-            }
-
-            return params;
-        }
-    }
+    // BEGIN android-removed
+    // public static class AlgParamGen
+    //     extends BaseAlgorithmParameterGenerator
+    // {
+    //     protected void engineInit(
+    //         AlgorithmParameterSpec genParamSpec,
+    //         SecureRandom random)
+    //         throws InvalidAlgorithmParameterException
+    //     {
+    //         throw new InvalidAlgorithmParameterException("No supported AlgorithmParameterSpec for AES parameter generation.");
+    //     }
+    //
+    //     protected AlgorithmParameters engineGenerateParameters()
+    //     {
+    //         byte[]  iv = new byte[16];
+    //
+    //         if (random == null)
+    //         {
+    //             random = new SecureRandom();
+    //         }
+    //
+    //         random.nextBytes(iv);
+    //
+    //         AlgorithmParameters params;
+    //
+    //         try
+    //         {
+    //             params = createParametersInstance("AES");
+    //             params.init(new IvParameterSpec(iv));
+    //         }
+    //         catch (Exception e)
+    //         {
+    //             throw new RuntimeException(e.getMessage());
+    //         }
+    //
+    //         return params;
+    //     }
+    // }
+    //
+    // public static class AlgParamGenCCM
+    //     extends BaseAlgorithmParameterGenerator
+    // {
+    //     protected void engineInit(
+    //         AlgorithmParameterSpec genParamSpec,
+    //         SecureRandom random)
+    //         throws InvalidAlgorithmParameterException
+    //     {
+    //         throw new InvalidAlgorithmParameterException("No supported AlgorithmParameterSpec for AES parameter generation.");
+    //     }
+    //
+    //     protected AlgorithmParameters engineGenerateParameters()
+    //     {
+    //         byte[]  iv = new byte[12];
+    //
+    //         if (random == null)
+    //         {
+    //             random = new SecureRandom();
+    //         }
+    //
+    //         random.nextBytes(iv);
+    //
+    //         AlgorithmParameters params;
+    //
+    //         try
+    //         {
+    //             params = createParametersInstance("CCM");
+    //             params.init(new CCMParameters(iv, 12).getEncoded());
+    //         }
+    //         catch (Exception e)
+    //         {
+    //             throw new RuntimeException(e.getMessage());
+    //         }
+    //
+    //         return params;
+    //     }
+    // }
+    //
+    // public static class AlgParamGenGCM
+    //     extends BaseAlgorithmParameterGenerator
+    // {
+    //     protected void engineInit(
+    //         AlgorithmParameterSpec genParamSpec,
+    //         SecureRandom random)
+    //         throws InvalidAlgorithmParameterException
+    //     {
+    //         throw new InvalidAlgorithmParameterException("No supported AlgorithmParameterSpec for AES parameter generation.");
+    //     }
+    //
+    //     protected AlgorithmParameters engineGenerateParameters()
+    //     {
+    //         byte[]  nonce = new byte[12];
+    //
+    //         if (random == null)
+    //         {
+    //             random = new SecureRandom();
+    //         }
+    //
+    //         random.nextBytes(nonce);
+    //
+    //         AlgorithmParameters params;
+    //
+    //         try
+    //         {
+    //             params = createParametersInstance("GCM");
+    //             params.init(new GCMParameters(nonce, 12).getEncoded());
+    //         }
+    //         catch (Exception e)
+    //         {
+    //             throw new RuntimeException(e.getMessage());
+    //         }
+    //
+    //         return params;
+    //     }
+    // }
+    // END android-removed
 
     public static class AlgParams
         extends IvAlgorithmParameters
@@ -545,80 +584,82 @@ public final class AES
         }
     }
 
-    public static class AlgParamsCCM
-        extends BaseAlgorithmParameters
-    {
-        private CCMParameters ccmParams;
-
-        protected void engineInit(AlgorithmParameterSpec paramSpec)
-            throws InvalidParameterSpecException
-        {
-            throw new InvalidParameterSpecException("No supported AlgorithmParameterSpec for AES parameter generation.");
-        }
-
-        protected void engineInit(byte[] params)
-            throws IOException
-        {
-            ccmParams = CCMParameters.getInstance(params);
-        }
-
-        protected void engineInit(byte[] params, String format)
-            throws IOException
-        {
-            if (!isASN1FormatString(format))
-            {
-                throw new IOException("unknown format specified");
-            }
-
-            ccmParams = CCMParameters.getInstance(params);
-        }
-
-        protected byte[] engineGetEncoded()
-            throws IOException
-        {
-            return ccmParams.getEncoded();
-        }
-
-        protected byte[] engineGetEncoded(String format)
-            throws IOException
-        {
-            if (!isASN1FormatString(format))
-            {
-                throw new IOException("unknown format specified");
-            }
-
-            return ccmParams.getEncoded();
-        }
-
-        protected String engineToString()
-        {
-            return "CCM";
-        }
-
-        protected AlgorithmParameterSpec localEngineGetParameterSpec(Class paramSpec)
-            throws InvalidParameterSpecException
-        {
-            if (gcmSpecClass != null)
-            {
-                try
-                {
-                    Constructor constructor = gcmSpecClass.getConstructor(new Class[] { Integer.TYPE, byte[].class });
-
-                    return (AlgorithmParameterSpec)constructor.newInstance(new Object[] { Integers.valueOf(ccmParams.getIcvLen() * 8), ccmParams.getNonce() });
-                }
-                catch (NoSuchMethodException e)
-                {
-                    throw new InvalidParameterSpecException("no constructor found!");   // should never happen
-                }
-                catch (Exception e)
-                {
-                    throw new InvalidParameterSpecException("construction failed: " + e.getMessage());   // should never happen
-                }
-            }
-
-            throw new InvalidParameterSpecException("unknown parameter spec: " + paramSpec.getName());
-        }
-    }
+    // BEGIN android-removed
+    // public static class AlgParamsCCM
+    //     extends BaseAlgorithmParameters
+    // {
+    //     private CCMParameters ccmParams;
+    // 
+    //     protected void engineInit(AlgorithmParameterSpec paramSpec)
+    //         throws InvalidParameterSpecException
+    //     {
+    //         throw new InvalidParameterSpecException("No supported AlgorithmParameterSpec for AES parameter generation.");
+    //     }
+    // 
+    //     protected void engineInit(byte[] params)
+    //         throws IOException
+    //     {
+    //         ccmParams = CCMParameters.getInstance(params);
+    //     }
+    // 
+    //     protected void engineInit(byte[] params, String format)
+    //         throws IOException
+    //     {
+    //         if (!isASN1FormatString(format))
+    //         {
+    //             throw new IOException("unknown format specified");
+    //         }
+    // 
+    //         ccmParams = CCMParameters.getInstance(params);
+    //     }
+    // 
+    //     protected byte[] engineGetEncoded()
+    //         throws IOException
+    //     {
+    //         return ccmParams.getEncoded();
+    //     }
+    // 
+    //     protected byte[] engineGetEncoded(String format)
+    //         throws IOException
+    //     {
+    //         if (!isASN1FormatString(format))
+    //         {
+    //             throw new IOException("unknown format specified");
+    //         }
+    // 
+    //         return ccmParams.getEncoded();
+    //     }
+    // 
+    //     protected String engineToString()
+    //     {
+    //         return "CCM";
+    //     }
+    // 
+    //     protected AlgorithmParameterSpec localEngineGetParameterSpec(Class paramSpec)
+    //         throws InvalidParameterSpecException
+    //     {
+    //         if (gcmSpecClass != null)
+    //         {
+    //             try
+    //             {
+    //                 Constructor constructor = gcmSpecClass.getConstructor(new Class[] { Integer.TYPE, byte[].class });
+    // 
+    //                 return (AlgorithmParameterSpec)constructor.newInstance(new Object[] { Integers.valueOf(ccmParams.getIcvLen() * 8), ccmParams.getNonce() });
+    //             }
+    //             catch (NoSuchMethodException e)
+    //             {
+    //                 throw new InvalidParameterSpecException("no constructor found!");   // should never happen
+    //             }
+    //             catch (Exception e)
+    //             {
+    //                 throw new InvalidParameterSpecException("construction failed: " + e.getMessage());   // should never happen
+    //             }
+    //         }
+    // 
+    //         throw new InvalidParameterSpecException("unknown parameter spec: " + paramSpec.getName());
+    //     }
+    // }
+    // END android-removed
 
     public static class Mappings
         extends SymmetricAlgorithmProvider
@@ -652,92 +693,101 @@ public final class AES
             provider.addAlgorithm("Alg.Alias.AlgorithmParameters." + NISTObjectIdentifiers.id_aes128_GCM, "GCM");
             provider.addAlgorithm("Alg.Alias.AlgorithmParameters." + NISTObjectIdentifiers.id_aes192_GCM, "GCM");
             provider.addAlgorithm("Alg.Alias.AlgorithmParameters." + NISTObjectIdentifiers.id_aes256_GCM, "GCM");
-
-            provider.addAlgorithm("AlgorithmParameters.CCM", PREFIX + "$AlgParamsCCM");
-            provider.addAlgorithm("Alg.Alias.AlgorithmParameters." + NISTObjectIdentifiers.id_aes128_CCM, "CCM");
-            provider.addAlgorithm("Alg.Alias.AlgorithmParameters." + NISTObjectIdentifiers.id_aes192_CCM, "CCM");
-            provider.addAlgorithm("Alg.Alias.AlgorithmParameters." + NISTObjectIdentifiers.id_aes256_CCM, "CCM");
-
-            provider.addAlgorithm("AlgorithmParameterGenerator.AES", PREFIX + "$AlgParamGen");
-            provider.addAlgorithm("Alg.Alias.AlgorithmParameterGenerator." + wrongAES128, "AES");
-            provider.addAlgorithm("Alg.Alias.AlgorithmParameterGenerator." + wrongAES192, "AES");
-            provider.addAlgorithm("Alg.Alias.AlgorithmParameterGenerator." + wrongAES256, "AES");
-            provider.addAlgorithm("Alg.Alias.AlgorithmParameterGenerator." + NISTObjectIdentifiers.id_aes128_CBC, "AES");
-            provider.addAlgorithm("Alg.Alias.AlgorithmParameterGenerator." + NISTObjectIdentifiers.id_aes192_CBC, "AES");
-            provider.addAlgorithm("Alg.Alias.AlgorithmParameterGenerator." + NISTObjectIdentifiers.id_aes256_CBC, "AES");
+            // BEGIN android-removed
+            // provider.addAlgorithm("AlgorithmParameters.CCM", PREFIX + "$AlgParamsCCM");
+            // provider.addAlgorithm("Alg.Alias.AlgorithmParameters." + NISTObjectIdentifiers.id_aes128_CCM, "CCM");
+            // provider.addAlgorithm("Alg.Alias.AlgorithmParameters." + NISTObjectIdentifiers.id_aes192_CCM, "CCM");
+            // provider.addAlgorithm("Alg.Alias.AlgorithmParameters." + NISTObjectIdentifiers.id_aes256_CCM, "CCM");
+            //
+            // provider.addAlgorithm("AlgorithmParameterGenerator.AES", PREFIX + "$AlgParamGen");
+            // provider.addAlgorithm("Alg.Alias.AlgorithmParameterGenerator." + wrongAES128, "AES");
+            // provider.addAlgorithm("Alg.Alias.AlgorithmParameterGenerator." + wrongAES192, "AES");
+            // provider.addAlgorithm("Alg.Alias.AlgorithmParameterGenerator." + wrongAES256, "AES");
+            // provider.addAlgorithm("Alg.Alias.AlgorithmParameterGenerator." + NISTObjectIdentifiers.id_aes128_CBC, "AES");
+            // provider.addAlgorithm("Alg.Alias.AlgorithmParameterGenerator." + NISTObjectIdentifiers.id_aes192_CBC, "AES");
+            // provider.addAlgorithm("Alg.Alias.AlgorithmParameterGenerator." + NISTObjectIdentifiers.id_aes256_CBC, "AES");
+            // END android-removed
 
             provider.addAlgorithm("Cipher.AES", PREFIX + "$ECB");
             provider.addAlgorithm("Alg.Alias.Cipher." + wrongAES128, "AES");
             provider.addAlgorithm("Alg.Alias.Cipher." + wrongAES192, "AES");
             provider.addAlgorithm("Alg.Alias.Cipher." + wrongAES256, "AES");
-            provider.addAlgorithm("Cipher." + NISTObjectIdentifiers.id_aes128_ECB, PREFIX + "$ECB");
-            provider.addAlgorithm("Cipher." + NISTObjectIdentifiers.id_aes192_ECB, PREFIX + "$ECB");
-            provider.addAlgorithm("Cipher." + NISTObjectIdentifiers.id_aes256_ECB, PREFIX + "$ECB");
-            provider.addAlgorithm("Cipher." + NISTObjectIdentifiers.id_aes128_CBC, PREFIX + "$CBC");
-            provider.addAlgorithm("Cipher." + NISTObjectIdentifiers.id_aes192_CBC, PREFIX + "$CBC");
-            provider.addAlgorithm("Cipher." + NISTObjectIdentifiers.id_aes256_CBC, PREFIX + "$CBC");
-            provider.addAlgorithm("Cipher." + NISTObjectIdentifiers.id_aes128_OFB, PREFIX + "$OFB");
-            provider.addAlgorithm("Cipher." + NISTObjectIdentifiers.id_aes192_OFB, PREFIX + "$OFB");
-            provider.addAlgorithm("Cipher." + NISTObjectIdentifiers.id_aes256_OFB, PREFIX + "$OFB");
-            provider.addAlgorithm("Cipher." + NISTObjectIdentifiers.id_aes128_CFB, PREFIX + "$CFB");
-            provider.addAlgorithm("Cipher." + NISTObjectIdentifiers.id_aes192_CFB, PREFIX + "$CFB");
-            provider.addAlgorithm("Cipher." + NISTObjectIdentifiers.id_aes256_CFB, PREFIX + "$CFB");
+            // BEGIN android-removed
+            // provider.addAlgorithm("Cipher." + NISTObjectIdentifiers.id_aes128_ECB, PREFIX + "$ECB");
+            // provider.addAlgorithm("Cipher." + NISTObjectIdentifiers.id_aes192_ECB, PREFIX + "$ECB");
+            // provider.addAlgorithm("Cipher." + NISTObjectIdentifiers.id_aes256_ECB, PREFIX + "$ECB");
+            // provider.addAlgorithm("Cipher." + NISTObjectIdentifiers.id_aes128_CBC, PREFIX + "$CBC");
+            // provider.addAlgorithm("Cipher." + NISTObjectIdentifiers.id_aes192_CBC, PREFIX + "$CBC");
+            // provider.addAlgorithm("Cipher." + NISTObjectIdentifiers.id_aes256_CBC, PREFIX + "$CBC");
+            // provider.addAlgorithm("Cipher." + NISTObjectIdentifiers.id_aes128_OFB, PREFIX + "$OFB");
+            // provider.addAlgorithm("Cipher." + NISTObjectIdentifiers.id_aes192_OFB, PREFIX + "$OFB");
+            // provider.addAlgorithm("Cipher." + NISTObjectIdentifiers.id_aes256_OFB, PREFIX + "$OFB");
+            // provider.addAlgorithm("Cipher." + NISTObjectIdentifiers.id_aes128_CFB, PREFIX + "$CFB");
+            // provider.addAlgorithm("Cipher." + NISTObjectIdentifiers.id_aes192_CFB, PREFIX + "$CFB");
+            // provider.addAlgorithm("Cipher." + NISTObjectIdentifiers.id_aes256_CFB, PREFIX + "$CFB");
+            // END android-removed
             provider.addAlgorithm("Cipher.AESWRAP", PREFIX + "$Wrap");
             provider.addAlgorithm("Alg.Alias.Cipher." + NISTObjectIdentifiers.id_aes128_wrap, "AESWRAP");
             provider.addAlgorithm("Alg.Alias.Cipher." + NISTObjectIdentifiers.id_aes192_wrap, "AESWRAP");
             provider.addAlgorithm("Alg.Alias.Cipher." + NISTObjectIdentifiers.id_aes256_wrap, "AESWRAP");
 
-            provider.addAlgorithm("Cipher.AESRFC3211WRAP", PREFIX + "$RFC3211Wrap");
-            provider.addAlgorithm("Cipher.AESRFC5649WRAP", PREFIX + "$RFC5649Wrap");
-
-            provider.addAlgorithm("AlgorithmParameterGenerator.CCM", PREFIX + "$AlgParamGenCCM");
-            provider.addAlgorithm("Alg.Alias.AlgorithmParameterGenerator." + NISTObjectIdentifiers.id_aes128_CCM, "CCM");
-            provider.addAlgorithm("Alg.Alias.AlgorithmParameterGenerator." + NISTObjectIdentifiers.id_aes192_CCM, "CCM");
-            provider.addAlgorithm("Alg.Alias.AlgorithmParameterGenerator." + NISTObjectIdentifiers.id_aes256_CCM, "CCM");
-
-            provider.addAlgorithm("Cipher.CCM", PREFIX + "$CCM");
-            provider.addAlgorithm("Alg.Alias.Cipher." + NISTObjectIdentifiers.id_aes128_CCM, "CCM");
-            provider.addAlgorithm("Alg.Alias.Cipher." + NISTObjectIdentifiers.id_aes192_CCM, "CCM");
-            provider.addAlgorithm("Alg.Alias.Cipher." + NISTObjectIdentifiers.id_aes256_CCM, "CCM");
-
-            provider.addAlgorithm("AlgorithmParameterGenerator.GCM", PREFIX + "$AlgParamGenGCM");
-            provider.addAlgorithm("Alg.Alias.AlgorithmParameterGenerator." + NISTObjectIdentifiers.id_aes128_GCM, "GCM");
-            provider.addAlgorithm("Alg.Alias.AlgorithmParameterGenerator." + NISTObjectIdentifiers.id_aes192_GCM, "GCM");
-            provider.addAlgorithm("Alg.Alias.AlgorithmParameterGenerator." + NISTObjectIdentifiers.id_aes256_GCM, "GCM");
-
-            provider.addAlgorithm("Cipher.GCM", PREFIX + "$GCM");
-            provider.addAlgorithm("Alg.Alias.Cipher." + NISTObjectIdentifiers.id_aes128_GCM, "GCM");
-            provider.addAlgorithm("Alg.Alias.Cipher." + NISTObjectIdentifiers.id_aes192_GCM, "GCM");
-            provider.addAlgorithm("Alg.Alias.Cipher." + NISTObjectIdentifiers.id_aes256_GCM, "GCM");
+            // BEGIN android-removed
+            // provider.addAlgorithm("Cipher.AESRFC3211WRAP", PREFIX + "$RFC3211Wrap");
+            // provider.addAlgorithm("Cipher.AESRFC5649WRAP", PREFIX + "$RFC5649Wrap");
+            // 
+            // provider.addAlgorithm("AlgorithmParameterGenerator.CCM", PREFIX + "$AlgParamGenCCM");
+            // provider.addAlgorithm("Alg.Alias.AlgorithmParameterGenerator." + NISTObjectIdentifiers.id_aes128_CCM, "CCM");
+            // provider.addAlgorithm("Alg.Alias.AlgorithmParameterGenerator." + NISTObjectIdentifiers.id_aes192_CCM, "CCM");
+            // provider.addAlgorithm("Alg.Alias.AlgorithmParameterGenerator." + NISTObjectIdentifiers.id_aes256_CCM, "CCM");
+            // 
+            // provider.addAlgorithm("Cipher.CCM", PREFIX + "$CCM");
+            // provider.addAlgorithm("Alg.Alias.Cipher." + NISTObjectIdentifiers.id_aes128_CCM, "CCM");
+            // provider.addAlgorithm("Alg.Alias.Cipher." + NISTObjectIdentifiers.id_aes192_CCM, "CCM");
+            // provider.addAlgorithm("Alg.Alias.Cipher." + NISTObjectIdentifiers.id_aes256_CCM, "CCM");
+            // 
+            // provider.addAlgorithm("AlgorithmParameterGenerator.GCM", PREFIX + "$AlgParamGenGCM");
+            // provider.addAlgorithm("Alg.Alias.AlgorithmParameterGenerator." + NISTObjectIdentifiers.id_aes128_GCM, "GCM");
+            // provider.addAlgorithm("Alg.Alias.AlgorithmParameterGenerator." + NISTObjectIdentifiers.id_aes192_GCM, "GCM");
+            // provider.addAlgorithm("Alg.Alias.AlgorithmParameterGenerator." + NISTObjectIdentifiers.id_aes256_GCM, "GCM");
+            // END android-removed
+
+            // BEGIN android-changed
+            provider.addAlgorithm("Cipher.AES/GCM/NOPADDING", PREFIX + "$GCM");
+            provider.addAlgorithm("Alg.Alias.Cipher." + NISTObjectIdentifiers.id_aes128_GCM, "AES/GCM/NOPADDING");
+            provider.addAlgorithm("Alg.Alias.Cipher." + NISTObjectIdentifiers.id_aes192_GCM, "AES/GCM/NOPADDING");
+            provider.addAlgorithm("Alg.Alias.Cipher." + NISTObjectIdentifiers.id_aes256_GCM, "AES/GCM/NOPADDING");
+            // END android-changed
 
             provider.addAlgorithm("KeyGenerator.AES", PREFIX + "$KeyGen");
-            provider.addAlgorithm("KeyGenerator." + wrongAES128, PREFIX + "$KeyGen128");
-            provider.addAlgorithm("KeyGenerator." + wrongAES192, PREFIX + "$KeyGen192");
-            provider.addAlgorithm("KeyGenerator." + wrongAES256, PREFIX + "$KeyGen256");
-            provider.addAlgorithm("KeyGenerator." + NISTObjectIdentifiers.id_aes128_ECB, PREFIX + "$KeyGen128");
-            provider.addAlgorithm("KeyGenerator." + NISTObjectIdentifiers.id_aes128_CBC, PREFIX + "$KeyGen128");
-            provider.addAlgorithm("KeyGenerator." + NISTObjectIdentifiers.id_aes128_OFB, PREFIX + "$KeyGen128");
-            provider.addAlgorithm("KeyGenerator." + NISTObjectIdentifiers.id_aes128_CFB, PREFIX + "$KeyGen128");
-            provider.addAlgorithm("KeyGenerator." + NISTObjectIdentifiers.id_aes192_ECB, PREFIX + "$KeyGen192");
-            provider.addAlgorithm("KeyGenerator." + NISTObjectIdentifiers.id_aes192_CBC, PREFIX + "$KeyGen192");
-            provider.addAlgorithm("KeyGenerator." + NISTObjectIdentifiers.id_aes192_OFB, PREFIX + "$KeyGen192");
-            provider.addAlgorithm("KeyGenerator." + NISTObjectIdentifiers.id_aes192_CFB, PREFIX + "$KeyGen192");
-            provider.addAlgorithm("KeyGenerator." + NISTObjectIdentifiers.id_aes256_ECB, PREFIX + "$KeyGen256");
-            provider.addAlgorithm("KeyGenerator." + NISTObjectIdentifiers.id_aes256_CBC, PREFIX + "$KeyGen256");
-            provider.addAlgorithm("KeyGenerator." + NISTObjectIdentifiers.id_aes256_OFB, PREFIX + "$KeyGen256");
-            provider.addAlgorithm("KeyGenerator." + NISTObjectIdentifiers.id_aes256_CFB, PREFIX + "$KeyGen256");
-            provider.addAlgorithm("KeyGenerator.AESWRAP", PREFIX + "$KeyGen");
-            provider.addAlgorithm("KeyGenerator." + NISTObjectIdentifiers.id_aes128_wrap, PREFIX + "$KeyGen128");
-            provider.addAlgorithm("KeyGenerator." + NISTObjectIdentifiers.id_aes192_wrap, PREFIX + "$KeyGen192");
-            provider.addAlgorithm("KeyGenerator." + NISTObjectIdentifiers.id_aes256_wrap, PREFIX + "$KeyGen256");
-            provider.addAlgorithm("KeyGenerator." + NISTObjectIdentifiers.id_aes128_GCM, PREFIX + "$KeyGen128");
-            provider.addAlgorithm("KeyGenerator." + NISTObjectIdentifiers.id_aes192_GCM, PREFIX + "$KeyGen192");
-            provider.addAlgorithm("KeyGenerator." + NISTObjectIdentifiers.id_aes256_GCM, PREFIX + "$KeyGen256");
-            provider.addAlgorithm("KeyGenerator." + NISTObjectIdentifiers.id_aes128_CCM, PREFIX + "$KeyGen128");
-            provider.addAlgorithm("KeyGenerator." + NISTObjectIdentifiers.id_aes192_CCM, PREFIX + "$KeyGen192");
-            provider.addAlgorithm("KeyGenerator." + NISTObjectIdentifiers.id_aes256_CCM, PREFIX + "$KeyGen256");
-
-            provider.addAlgorithm("Mac.AESCMAC", PREFIX + "$AESCMAC");
+            // BEGIN android-removed
+            // provider.addAlgorithm("KeyGenerator." + wrongAES128, PREFIX + "$KeyGen128");
+            // provider.addAlgorithm("KeyGenerator." + wrongAES192, PREFIX + "$KeyGen192");
+            // provider.addAlgorithm("KeyGenerator." + wrongAES256, PREFIX + "$KeyGen256");
+            // provider.addAlgorithm("KeyGenerator." + NISTObjectIdentifiers.id_aes128_ECB, PREFIX + "$KeyGen128");
+            // provider.addAlgorithm("KeyGenerator." + NISTObjectIdentifiers.id_aes128_CBC, PREFIX + "$KeyGen128");
+            // provider.addAlgorithm("KeyGenerator." + NISTObjectIdentifiers.id_aes128_OFB, PREFIX + "$KeyGen128");
+            // provider.addAlgorithm("KeyGenerator." + NISTObjectIdentifiers.id_aes128_CFB, PREFIX + "$KeyGen128");
+            // provider.addAlgorithm("KeyGenerator." + NISTObjectIdentifiers.id_aes192_ECB, PREFIX + "$KeyGen192");
+            // provider.addAlgorithm("KeyGenerator." + NISTObjectIdentifiers.id_aes192_CBC, PREFIX + "$KeyGen192");
+            // provider.addAlgorithm("KeyGenerator." + NISTObjectIdentifiers.id_aes192_OFB, PREFIX + "$KeyGen192");
+            // provider.addAlgorithm("KeyGenerator." + NISTObjectIdentifiers.id_aes192_CFB, PREFIX + "$KeyGen192");
+            // provider.addAlgorithm("KeyGenerator." + NISTObjectIdentifiers.id_aes256_ECB, PREFIX + "$KeyGen256");
+            // provider.addAlgorithm("KeyGenerator." + NISTObjectIdentifiers.id_aes256_CBC, PREFIX + "$KeyGen256");
+            // provider.addAlgorithm("KeyGenerator." + NISTObjectIdentifiers.id_aes256_OFB, PREFIX + "$KeyGen256");
+            // provider.addAlgorithm("KeyGenerator." + NISTObjectIdentifiers.id_aes256_CFB, PREFIX + "$KeyGen256");
+            // provider.addAlgorithm("KeyGenerator.AESWRAP", PREFIX + "$KeyGen");
+            // provider.addAlgorithm("KeyGenerator." + NISTObjectIdentifiers.id_aes128_wrap, PREFIX + "$KeyGen128");
+            // provider.addAlgorithm("KeyGenerator." + NISTObjectIdentifiers.id_aes192_wrap, PREFIX + "$KeyGen192");
+            // provider.addAlgorithm("KeyGenerator." + NISTObjectIdentifiers.id_aes256_wrap, PREFIX + "$KeyGen256");
+            // provider.addAlgorithm("KeyGenerator." + NISTObjectIdentifiers.id_aes128_GCM, PREFIX + "$KeyGen128");
+            // provider.addAlgorithm("KeyGenerator." + NISTObjectIdentifiers.id_aes192_GCM, PREFIX + "$KeyGen192");
+            // provider.addAlgorithm("KeyGenerator." + NISTObjectIdentifiers.id_aes256_GCM, PREFIX + "$KeyGen256");
+            // provider.addAlgorithm("KeyGenerator." + NISTObjectIdentifiers.id_aes128_CCM, PREFIX + "$KeyGen128");
+            // provider.addAlgorithm("KeyGenerator." + NISTObjectIdentifiers.id_aes192_CCM, PREFIX + "$KeyGen192");
+            // provider.addAlgorithm("KeyGenerator." + NISTObjectIdentifiers.id_aes256_CCM, PREFIX + "$KeyGen256");
+            // 
+            // provider.addAlgorithm("Mac.AESCMAC", PREFIX + "$AESCMAC");
+            // END android-removed
             
             provider.addAlgorithm("Alg.Alias.Cipher." + BCObjectIdentifiers.bc_pbe_sha1_pkcs12_aes128_cbc.getId(), "PBEWITHSHAAND128BITAES-CBC-BC");
             provider.addAlgorithm("Alg.Alias.Cipher." + BCObjectIdentifiers.bc_pbe_sha1_pkcs12_aes192_cbc.getId(), "PBEWITHSHAAND192BITAES-CBC-BC");
@@ -816,8 +866,10 @@ public final class AES
             provider.addAlgorithm("Alg.Alias.AlgorithmParameters." + BCObjectIdentifiers.bc_pbe_sha256_pkcs12_aes192_cbc.getId(), "PKCS12PBE");
             provider.addAlgorithm("Alg.Alias.AlgorithmParameters." + BCObjectIdentifiers.bc_pbe_sha256_pkcs12_aes256_cbc.getId(), "PKCS12PBE");
 
-            addGMacAlgorithm(provider, "AES", PREFIX + "$AESGMAC", PREFIX + "$KeyGen128");
-            addPoly1305Algorithm(provider, "AES", PREFIX + "$Poly1305", PREFIX + "$Poly1305KeyGen");
+            // BEGIN android-removed
+            // addGMacAlgorithm(provider, "AES", PREFIX + "$AESGMAC", PREFIX + "$KeyGen128");
+            // addPoly1305Algorithm(provider, "AES", PREFIX + "$Poly1305", PREFIX + "$Poly1305KeyGen");
+            // END android-removed
         }
     }
 
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/ARC4.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/ARC4.java
index e31ab29..9de8ef0 100644
--- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/ARC4.java
+++ b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/ARC4.java
@@ -29,7 +29,9 @@ public final class ARC4
     {
         public KeyGen()
         {
-            super("RC4", 128, new CipherKeyGenerator());
+            // BEGIN android-changed
+            super("ARC4", 128, new CipherKeyGenerator());
+            // END android-changed
         }
     }
 
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/Blowfish.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/Blowfish.java
index 7694934..0e37487 100644
--- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/Blowfish.java
+++ b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/Blowfish.java
@@ -64,7 +64,9 @@ public final class Blowfish
         {
 
             provider.addAlgorithm("Cipher.BLOWFISH", PREFIX + "$ECB");
-            provider.addAlgorithm("Cipher.1.3.6.1.4.1.3029.1.2", PREFIX + "$CBC");
+            // BEGIN android-removed
+            // provider.addAlgorithm("Cipher.1.3.6.1.4.1.3029.1.2", PREFIX + "$CBC");
+            // END android-removed
             provider.addAlgorithm("KeyGenerator.BLOWFISH", PREFIX + "$KeyGen");
             provider.addAlgorithm("Alg.Alias.KeyGenerator.1.3.6.1.4.1.3029.1.2", "BLOWFISH");
             provider.addAlgorithm("AlgorithmParameters.BLOWFISH", PREFIX + "$AlgParams");
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/CAST5.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/CAST5.java
deleted file mode 100644
index 7fa4ce4..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/CAST5.java
+++ /dev/null
@@ -1,221 +0,0 @@
-package org.bouncycastle.jcajce.provider.symmetric;
-
-import java.io.IOException;
-import java.security.AlgorithmParameters;
-import java.security.InvalidAlgorithmParameterException;
-import java.security.SecureRandom;
-import java.security.spec.AlgorithmParameterSpec;
-import java.security.spec.InvalidParameterSpecException;
-
-import javax.crypto.spec.IvParameterSpec;
-
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.misc.CAST5CBCParameters;
-import org.bouncycastle.crypto.CipherKeyGenerator;
-import org.bouncycastle.crypto.engines.CAST5Engine;
-import org.bouncycastle.crypto.modes.CBCBlockCipher;
-import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseAlgorithmParameterGenerator;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseAlgorithmParameters;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseBlockCipher;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
-import org.bouncycastle.jcajce.provider.util.AlgorithmProvider;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-
-public final class CAST5
-{
-    private CAST5()
-    {
-    }
-    
-    public static class ECB
-        extends BaseBlockCipher
-    {
-        public ECB()
-        {
-            super(new CAST5Engine());
-        }
-    }
-
-    public static class CBC
-       extends BaseBlockCipher
-    {
-        public CBC()
-        {
-            super(new CBCBlockCipher(new CAST5Engine()), 64);
-        }
-    }
-
-    public static class KeyGen
-        extends BaseKeyGenerator
-    {
-        public KeyGen()
-        {
-            super("CAST5", 128, new CipherKeyGenerator());
-        }
-    }
-
-    public static class AlgParamGen
-        extends BaseAlgorithmParameterGenerator
-    {
-        protected void engineInit(
-            AlgorithmParameterSpec  genParamSpec,
-            SecureRandom            random)
-            throws InvalidAlgorithmParameterException
-        {
-            throw new InvalidAlgorithmParameterException("No supported AlgorithmParameterSpec for CAST5 parameter generation.");
-        }
-
-        protected AlgorithmParameters engineGenerateParameters()
-        {
-            byte[]  iv = new byte[8];
-
-            if (random == null)
-            {
-                random = new SecureRandom();
-            }
-
-            random.nextBytes(iv);
-
-            AlgorithmParameters params;
-
-            try
-            {
-                params = createParametersInstance("CAST5");
-                params.init(new IvParameterSpec(iv));
-            }
-            catch (Exception e)
-            {
-                throw new RuntimeException(e.getMessage());
-            }
-
-            return params;
-        }
-    }
-
-    public static class AlgParams
-        extends BaseAlgorithmParameters
-    {
-        private byte[]  iv;
-        private int     keyLength = 128;
-
-        protected byte[] engineGetEncoded()
-        {
-            byte[]  tmp = new byte[iv.length];
-
-            System.arraycopy(iv, 0, tmp, 0, iv.length);
-            return tmp;
-        }
-
-        protected byte[] engineGetEncoded(
-            String format)
-            throws IOException
-        {
-            if (this.isASN1FormatString(format))
-            {
-                return new CAST5CBCParameters(engineGetEncoded(), keyLength).getEncoded();
-            }
-
-            if (format.equals("RAW"))
-            {
-                return engineGetEncoded();
-            }
-
-
-            return null;
-        }
-
-        protected AlgorithmParameterSpec localEngineGetParameterSpec(
-            Class paramSpec)
-            throws InvalidParameterSpecException
-        {
-            if (paramSpec == IvParameterSpec.class)
-            {
-                return new IvParameterSpec(iv);
-            }
-
-            throw new InvalidParameterSpecException("unknown parameter spec passed to CAST5 parameters object.");
-        }
-
-        protected void engineInit(
-            AlgorithmParameterSpec paramSpec)
-            throws InvalidParameterSpecException
-        {
-            if (paramSpec instanceof IvParameterSpec)
-            {
-                this.iv = ((IvParameterSpec)paramSpec).getIV();
-            }
-            else
-            {
-                throw new InvalidParameterSpecException("IvParameterSpec required to initialise a CAST5 parameters algorithm parameters object");
-            }
-        }
-
-        protected void engineInit(
-            byte[] params)
-            throws IOException
-        {
-            this.iv = new byte[params.length];
-
-            System.arraycopy(params, 0, iv, 0, iv.length);
-        }
-
-        protected void engineInit(
-            byte[] params,
-            String format)
-            throws IOException
-        {
-            if (this.isASN1FormatString(format))
-            {
-                ASN1InputStream aIn = new ASN1InputStream(params);
-                CAST5CBCParameters      p = CAST5CBCParameters.getInstance(aIn.readObject());
-
-                keyLength = p.getKeyLength();
-
-                iv = p.getIV();
-
-                return;
-            }
-
-            if (format.equals("RAW"))
-            {
-                engineInit(params);
-                return;
-            }
-
-            throw new IOException("Unknown parameters format in IV parameters object");
-        }
-
-        protected String engineToString()
-        {
-            return "CAST5 Parameters";
-        }
-    }
-
-    public static class Mappings
-        extends AlgorithmProvider
-    {
-        private static final String PREFIX = CAST5.class.getName();
-
-        public Mappings()
-        {
-        }
-
-        public void configure(ConfigurableProvider provider)
-        {
-
-            provider.addAlgorithm("AlgorithmParameters.CAST5", PREFIX + "$AlgParams");
-            provider.addAlgorithm("Alg.Alias.AlgorithmParameters.1.2.840.113533.7.66.10", "CAST5");
-
-            provider.addAlgorithm("AlgorithmParameterGenerator.CAST5", PREFIX + "$AlgParamGen");
-            provider.addAlgorithm("Alg.Alias.AlgorithmParameterGenerator.1.2.840.113533.7.66.10", "CAST5");
-
-            provider.addAlgorithm("Cipher.CAST5", PREFIX + "$ECB");
-            provider.addAlgorithm("Cipher.1.2.840.113533.7.66.10", PREFIX + "$CBC");
-
-            provider.addAlgorithm("KeyGenerator.CAST5", PREFIX + "$KeyGen");
-            provider.addAlgorithm("Alg.Alias.KeyGenerator.1.2.840.113533.7.66.10", "CAST5");
-
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/CAST6.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/CAST6.java
deleted file mode 100644
index d16e6c7..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/CAST6.java
+++ /dev/null
@@ -1,90 +0,0 @@
-package org.bouncycastle.jcajce.provider.symmetric;
-
-import org.bouncycastle.crypto.BlockCipher;
-import org.bouncycastle.crypto.CipherKeyGenerator;
-import org.bouncycastle.crypto.engines.CAST6Engine;
-import org.bouncycastle.crypto.generators.Poly1305KeyGenerator;
-import org.bouncycastle.crypto.macs.GMac;
-import org.bouncycastle.crypto.modes.GCMBlockCipher;
-import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseBlockCipher;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseMac;
-import org.bouncycastle.jcajce.provider.symmetric.util.BlockCipherProvider;
-
-public final class CAST6
-{
-    private CAST6()
-    {
-    }
-    
-    public static class ECB
-        extends BaseBlockCipher
-    {
-        public ECB()
-        {
-            super(new BlockCipherProvider()
-            {
-                public BlockCipher get()
-                {
-                    return new CAST6Engine();
-                }
-            });
-        }
-    }
-
-    public static class KeyGen
-        extends BaseKeyGenerator
-    {
-        public KeyGen()
-        {
-            super("CAST6", 256, new CipherKeyGenerator());
-        }
-    }
-
-    public static class GMAC
-        extends BaseMac
-    {
-        public GMAC()
-        {
-            super(new GMac(new GCMBlockCipher(new CAST6Engine())));
-        }
-    }
-
-    public static class Poly1305
-        extends BaseMac
-    {
-        public Poly1305()
-        {
-            super(new org.bouncycastle.crypto.macs.Poly1305(new CAST6Engine()));
-        }
-    }
-
-    public static class Poly1305KeyGen
-        extends BaseKeyGenerator
-    {
-        public Poly1305KeyGen()
-        {
-            super("Poly1305-CAST6", 256, new Poly1305KeyGenerator());
-        }
-    }
-
-    public static class Mappings
-        extends SymmetricAlgorithmProvider
-    {
-        private static final String PREFIX = CAST6.class.getName();
-
-        public Mappings()
-        {
-        }
-
-        public void configure(ConfigurableProvider provider)
-        {
-            provider.addAlgorithm("Cipher.CAST6", PREFIX + "$ECB");
-            provider.addAlgorithm("KeyGenerator.CAST6", PREFIX + "$KeyGen");
-
-            addGMacAlgorithm(provider, "CAST6", PREFIX + "$GMAC", PREFIX + "$KeyGen");
-            addPoly1305Algorithm(provider, "CAST6", PREFIX + "$Poly1305", PREFIX + "$Poly1305KeyGen");
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/Camellia.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/Camellia.java
deleted file mode 100644
index 5dde846..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/Camellia.java
+++ /dev/null
@@ -1,237 +0,0 @@
-package org.bouncycastle.jcajce.provider.symmetric;
-
-import java.security.AlgorithmParameters;
-import java.security.InvalidAlgorithmParameterException;
-import java.security.SecureRandom;
-import java.security.spec.AlgorithmParameterSpec;
-
-import javax.crypto.spec.IvParameterSpec;
-
-import org.bouncycastle.asn1.ntt.NTTObjectIdentifiers;
-import org.bouncycastle.crypto.BlockCipher;
-import org.bouncycastle.crypto.CipherKeyGenerator;
-import org.bouncycastle.crypto.engines.CamelliaEngine;
-import org.bouncycastle.crypto.engines.CamelliaWrapEngine;
-import org.bouncycastle.crypto.engines.RFC3211WrapEngine;
-import org.bouncycastle.crypto.generators.Poly1305KeyGenerator;
-import org.bouncycastle.crypto.macs.GMac;
-import org.bouncycastle.crypto.modes.CBCBlockCipher;
-import org.bouncycastle.crypto.modes.GCMBlockCipher;
-import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseAlgorithmParameterGenerator;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseBlockCipher;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseMac;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseWrapCipher;
-import org.bouncycastle.jcajce.provider.symmetric.util.BlockCipherProvider;
-import org.bouncycastle.jcajce.provider.symmetric.util.IvAlgorithmParameters;
-
-public final class Camellia
-{
-    private Camellia()
-    {
-    }
-    
-    public static class ECB
-        extends BaseBlockCipher
-    {
-        public ECB()
-        {
-            super(new BlockCipherProvider()
-            {
-                public BlockCipher get()
-                {
-                    return new CamelliaEngine();
-                }
-            });
-        }
-    }
-
-    public static class CBC
-       extends BaseBlockCipher
-    {
-        public CBC()
-        {
-            super(new CBCBlockCipher(new CamelliaEngine()), 128);
-        }
-    }
-
-    public static class Wrap
-        extends BaseWrapCipher
-    {
-        public Wrap()
-        {
-            super(new CamelliaWrapEngine());
-        }
-    }
-
-    public static class RFC3211Wrap
-        extends BaseWrapCipher
-    {
-        public RFC3211Wrap()
-        {
-            super(new RFC3211WrapEngine(new CamelliaEngine()), 16);
-        }
-    }
-
-    public static class GMAC
-        extends BaseMac
-    {
-        public GMAC()
-        {
-            super(new GMac(new GCMBlockCipher(new CamelliaEngine())));
-        }
-    }
-
-    public static class Poly1305
-        extends BaseMac
-    {
-        public Poly1305()
-        {
-            super(new org.bouncycastle.crypto.macs.Poly1305(new CamelliaEngine()));
-        }
-    }
-
-    public static class Poly1305KeyGen
-        extends BaseKeyGenerator
-    {
-        public Poly1305KeyGen()
-        {
-            super("Poly1305-Camellia", 256, new Poly1305KeyGenerator());
-        }
-    }
-
-    public static class KeyGen
-        extends BaseKeyGenerator
-    {
-        public KeyGen()
-        {
-            this(256);
-        }
-
-        public KeyGen(int keySize)
-        {
-            super("Camellia", keySize, new CipherKeyGenerator());
-        }
-    }
-
-    public static class KeyGen128
-        extends KeyGen
-    {
-        public KeyGen128()
-        {
-            super(128);
-        }
-    }
-
-    public static class KeyGen192
-        extends KeyGen
-    {
-        public KeyGen192()
-        {
-            super(192);
-        }
-    }
-
-    public static class KeyGen256
-        extends KeyGen
-    {
-        public KeyGen256()
-        {
-            super(256);
-        }
-    }
-
-    public static class AlgParamGen
-        extends BaseAlgorithmParameterGenerator
-    {
-        protected void engineInit(
-            AlgorithmParameterSpec genParamSpec,
-            SecureRandom random)
-            throws InvalidAlgorithmParameterException
-        {
-            throw new InvalidAlgorithmParameterException("No supported AlgorithmParameterSpec for Camellia parameter generation.");
-        }
-
-        protected AlgorithmParameters engineGenerateParameters()
-        {
-            byte[] iv = new byte[16];
-
-            if (random == null)
-            {
-                random = new SecureRandom();
-            }
-
-            random.nextBytes(iv);
-
-            AlgorithmParameters params;
-
-            try
-            {
-                params = createParametersInstance("Camellia");
-                params.init(new IvParameterSpec(iv));
-            }
-            catch (Exception e)
-            {
-                throw new RuntimeException(e.getMessage());
-            }
-
-            return params;
-        }
-    }
-
-    public static class AlgParams
-        extends IvAlgorithmParameters
-    {
-        protected String engineToString()
-        {
-            return "Camellia IV";
-        }
-    }
-
-    public static class Mappings
-        extends SymmetricAlgorithmProvider
-    {
-        private static final String PREFIX = Camellia.class.getName();
-
-        public Mappings()
-        {
-        }
-
-        public void configure(ConfigurableProvider provider)
-        {
-
-            provider.addAlgorithm("AlgorithmParameters.CAMELLIA", PREFIX + "$AlgParams");
-            provider.addAlgorithm("Alg.Alias.AlgorithmParameters." + NTTObjectIdentifiers.id_camellia128_cbc, "CAMELLIA");
-            provider.addAlgorithm("Alg.Alias.AlgorithmParameters." + NTTObjectIdentifiers.id_camellia192_cbc, "CAMELLIA");
-            provider.addAlgorithm("Alg.Alias.AlgorithmParameters." + NTTObjectIdentifiers.id_camellia256_cbc, "CAMELLIA");
-
-            provider.addAlgorithm("AlgorithmParameterGenerator.CAMELLIA", PREFIX + "$AlgParamGen");
-            provider.addAlgorithm("Alg.Alias.AlgorithmParameterGenerator." + NTTObjectIdentifiers.id_camellia128_cbc, "CAMELLIA");
-            provider.addAlgorithm("Alg.Alias.AlgorithmParameterGenerator." + NTTObjectIdentifiers.id_camellia192_cbc, "CAMELLIA");
-            provider.addAlgorithm("Alg.Alias.AlgorithmParameterGenerator." + NTTObjectIdentifiers.id_camellia256_cbc, "CAMELLIA");
-
-            provider.addAlgorithm("Cipher.CAMELLIA", PREFIX + "$ECB");
-            provider.addAlgorithm("Cipher." + NTTObjectIdentifiers.id_camellia128_cbc, PREFIX + "$CBC");
-            provider.addAlgorithm("Cipher." + NTTObjectIdentifiers.id_camellia192_cbc, PREFIX + "$CBC");
-            provider.addAlgorithm("Cipher." + NTTObjectIdentifiers.id_camellia256_cbc, PREFIX + "$CBC");
-
-            provider.addAlgorithm("Cipher.CAMELLIARFC3211WRAP", PREFIX + "$RFC3211Wrap");
-            provider.addAlgorithm("Cipher.CAMELLIAWRAP", PREFIX + "$Wrap");
-            provider.addAlgorithm("Alg.Alias.Cipher." + NTTObjectIdentifiers.id_camellia128_wrap, "CAMELLIAWRAP");
-            provider.addAlgorithm("Alg.Alias.Cipher." + NTTObjectIdentifiers.id_camellia192_wrap, "CAMELLIAWRAP");
-            provider.addAlgorithm("Alg.Alias.Cipher." + NTTObjectIdentifiers.id_camellia256_wrap, "CAMELLIAWRAP");
-
-            provider.addAlgorithm("KeyGenerator.CAMELLIA", PREFIX + "$KeyGen");
-            provider.addAlgorithm("KeyGenerator." + NTTObjectIdentifiers.id_camellia128_wrap, PREFIX + "$KeyGen128");
-            provider.addAlgorithm("KeyGenerator." + NTTObjectIdentifiers.id_camellia192_wrap, PREFIX + "$KeyGen192");
-            provider.addAlgorithm("KeyGenerator." + NTTObjectIdentifiers.id_camellia256_wrap, PREFIX + "$KeyGen256");
-            provider.addAlgorithm("KeyGenerator." + NTTObjectIdentifiers.id_camellia128_cbc, PREFIX + "$KeyGen128");
-            provider.addAlgorithm("KeyGenerator." + NTTObjectIdentifiers.id_camellia192_cbc, PREFIX + "$KeyGen192");
-            provider.addAlgorithm("KeyGenerator." + NTTObjectIdentifiers.id_camellia256_cbc, PREFIX + "$KeyGen256");
-
-            addGMacAlgorithm(provider, "CAMELLIA", PREFIX + "$GMAC", PREFIX + "$KeyGen");
-            addPoly1305Algorithm(provider, "CAMELLIA", PREFIX + "$Poly1305", PREFIX + "$Poly1305KeyGen");
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/ChaCha.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/ChaCha.java
deleted file mode 100644
index ff748ae..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/ChaCha.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package org.bouncycastle.jcajce.provider.symmetric;
-
-import org.bouncycastle.crypto.CipherKeyGenerator;
-import org.bouncycastle.crypto.engines.ChaChaEngine;
-import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseStreamCipher;
-import org.bouncycastle.jcajce.provider.util.AlgorithmProvider;
-
-public final class ChaCha
-{
-    private ChaCha()
-    {
-    }
-    
-    public static class Base
-        extends BaseStreamCipher
-    {
-        public Base()
-        {
-            super(new ChaChaEngine(), 8);
-        }
-    }
-
-    public static class KeyGen
-        extends BaseKeyGenerator
-    {
-        public KeyGen()
-        {
-            super("ChaCha", 128, new CipherKeyGenerator());
-        }
-    }
-
-    public static class Mappings
-        extends AlgorithmProvider
-    {
-        private static final String PREFIX = ChaCha.class.getName();
-
-        public Mappings()
-        {
-        }
-
-        public void configure(ConfigurableProvider provider)
-        {
-
-            provider.addAlgorithm("Cipher.CHACHA", PREFIX + "$Base");
-            provider.addAlgorithm("KeyGenerator.CHACHA", PREFIX + "$KeyGen");
-
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/DES.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/DES.java
index 2ab7086..b4c7c06 100644
--- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/DES.java
+++ b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/DES.java
@@ -19,12 +19,16 @@ import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
 import org.bouncycastle.crypto.CipherParameters;
 import org.bouncycastle.crypto.KeyGenerationParameters;
 import org.bouncycastle.crypto.engines.DESEngine;
-import org.bouncycastle.crypto.engines.RFC3211WrapEngine;
+// BEGIN android-removed
+// import org.bouncycastle.crypto.engines.RFC3211WrapEngine;
+// END android-removed
 import org.bouncycastle.crypto.generators.DESKeyGenerator;
 import org.bouncycastle.crypto.macs.CBCBlockCipherMac;
-import org.bouncycastle.crypto.macs.CFBBlockCipherMac;
-import org.bouncycastle.crypto.macs.CMac;
-import org.bouncycastle.crypto.macs.ISO9797Alg3Mac;
+// BEGIN android-removed
+// import org.bouncycastle.crypto.macs.CFBBlockCipherMac;
+// import org.bouncycastle.crypto.macs.CMac;
+// import org.bouncycastle.crypto.macs.ISO9797Alg3Mac;
+// END android-removed
 import org.bouncycastle.crypto.modes.CBCBlockCipher;
 import org.bouncycastle.crypto.paddings.ISO7816d4Padding;
 import org.bouncycastle.crypto.params.DESParameters;
@@ -65,17 +69,19 @@ public final class DES
         }
     }
 
-    /**
-     * DES   CFB8
-     */
-    public static class DESCFB8
-        extends BaseMac
-    {
-        public DESCFB8()
-        {
-            super(new CFBBlockCipherMac(new DESEngine()));
-        }
-    }
+    // BEGIN android-removed
+    // /**
+    //  * DES   CFB8
+    //  */
+    // public static class DESCFB8
+    //     extends BaseMac
+    // {
+    //     public DESCFB8()
+    //     {
+    //         super(new CFBBlockCipherMac(new DESEngine()));
+    //     }
+    // }
+    // END android-removed
 
     /**
      * DES64
@@ -110,47 +116,49 @@ public final class DES
         }
     }
 
-    static public class CMAC
-        extends BaseMac
-    {
-        public CMAC()
-        {
-            super(new CMac(new DESEngine()));
-        }
-    }
-
-    /**
-     * DES9797Alg3with7816-4Padding
-     */
-    public static class DES9797Alg3with7816d4
-        extends BaseMac
-    {
-        public DES9797Alg3with7816d4()
-        {
-            super(new ISO9797Alg3Mac(new DESEngine(), new ISO7816d4Padding()));
-        }
-    }
-
-    /**
-     * DES9797Alg3
-     */
-    public static class DES9797Alg3
-        extends BaseMac
-    {
-        public DES9797Alg3()
-        {
-            super(new ISO9797Alg3Mac(new DESEngine()));
-        }
-    }
-
-    public static class RFC3211
-        extends BaseWrapCipher
-    {
-        public RFC3211()
-        {
-            super(new RFC3211WrapEngine(new DESEngine()), 8);
-        }
-    }
+    // BEGIN android-removed
+    // static public class CMAC
+    //     extends BaseMac
+    // {
+    //     public CMAC()
+    //     {
+    //         super(new CMac(new DESEngine()));
+    //     }
+    // }
+    //
+    // /**
+    //  * DES9797Alg3with7816-4Padding
+    //  */
+    // public static class DES9797Alg3with7816d4
+    //     extends BaseMac
+    // {
+    //     public DES9797Alg3with7816d4()
+    //     {
+    //         super(new ISO9797Alg3Mac(new DESEngine(), new ISO7816d4Padding()));
+    //     }
+    // }
+    //
+    // /**
+    //  * DES9797Alg3
+    //  */
+    // public static class DES9797Alg3
+    //     extends BaseMac
+    // {
+    //     public DES9797Alg3()
+    //     {
+    //         super(new ISO9797Alg3Mac(new DESEngine()));
+    //     }
+    // }
+    //
+    // public static class RFC3211
+    //     extends BaseWrapCipher
+    // {
+    //     public RFC3211()
+    //     {
+    //         super(new RFC3211WrapEngine(new DESEngine()), 8);
+    //     }
+    // }
+    // END android-removed
 
     public static class AlgParamGen
         extends BaseAlgorithmParameterGenerator
@@ -350,17 +358,19 @@ public final class DES
         }
     }
 
-    /**
-     * PBEWithMD2AndDES
-     */
-    static public class PBEWithMD2KeyFactory
-        extends DESPBEKeyFactory
-    {
-        public PBEWithMD2KeyFactory()
-        {
-            super("PBEwithMD2andDES", PKCSObjectIdentifiers.pbeWithMD2AndDES_CBC, true, PKCS5S1, MD2, 64, 64);
-        }
-    }
+    // BEGIN android-removed
+    // /**
+    //  * PBEWithMD2AndDES
+    //  */
+    // static public class PBEWithMD2KeyFactory
+    //     extends DESPBEKeyFactory
+    // {
+    //     public PBEWithMD2KeyFactory()
+    //     {
+    //         super("PBEwithMD2andDES", PKCSObjectIdentifiers.pbeWithMD2AndDES_CBC, true, PKCS5S1, MD2, 64, 64);
+    //     }
+    // }
+    // END android-removed
 
     /**
      * PBEWithMD5AndDES
@@ -386,17 +396,19 @@ public final class DES
         }
     }
 
-    /**
-     * PBEWithMD2AndDES
-     */
-    static public class PBEWithMD2
-        extends BaseBlockCipher
-    {
-        public PBEWithMD2()
-        {
-            super(new CBCBlockCipher(new DESEngine()));
-        }
-    }
+    // BEGIN android-removed
+    // /**
+    //  * PBEWithMD2AndDES
+    //  */
+    // static public class PBEWithMD2
+    //     extends BaseBlockCipher
+    // {
+    //     public PBEWithMD2()
+    //     {
+    //         super(new CBCBlockCipher(new DESEngine()));
+    //     }
+    // }
+    // END android-removed
 
     /**
      * PBEWithMD5AndDES
@@ -436,61 +448,75 @@ public final class DES
         {
 
             provider.addAlgorithm("Cipher.DES", PREFIX + "$ECB");
-            provider.addAlgorithm("Cipher." + OIWObjectIdentifiers.desCBC, PREFIX + "$CBC");
-
-            addAlias(provider, OIWObjectIdentifiers.desCBC, "DES");
-
-            provider.addAlgorithm("Cipher.DESRFC3211WRAP", PREFIX + "$RFC3211");
+            // BEGIN android-removed
+            // provider.addAlgorithm("Cipher." + OIWObjectIdentifiers.desCBC, PREFIX + "$CBC");
+            //
+            // addAlias(provider, OIWObjectIdentifiers.desCBC, "DES");
+            //
+            // provider.addAlgorithm("Cipher.DESRFC3211WRAP", PREFIX + "$RFC3211");
+            // END android-removed
 
             provider.addAlgorithm("KeyGenerator.DES", PREFIX + "$KeyGenerator");
 
             provider.addAlgorithm("SecretKeyFactory.DES", PREFIX + "$KeyFactory");
 
-            provider.addAlgorithm("Mac.DESCMAC", PREFIX + "$CMAC");
-            provider.addAlgorithm("Mac.DESMAC", PREFIX + "$CBCMAC");
-            provider.addAlgorithm("Alg.Alias.Mac.DES", "DESMAC");
-
-            provider.addAlgorithm("Mac.DESMAC/CFB8", PREFIX + "$DESCFB8");
-            provider.addAlgorithm("Alg.Alias.Mac.DES/CFB8", "DESMAC/CFB8");
-
-            provider.addAlgorithm("Mac.DESMAC64", PREFIX + "$DES64");
-            provider.addAlgorithm("Alg.Alias.Mac.DES64", "DESMAC64");
-
-            provider.addAlgorithm("Mac.DESMAC64WITHISO7816-4PADDING", PREFIX + "$DES64with7816d4");
-            provider.addAlgorithm("Alg.Alias.Mac.DES64WITHISO7816-4PADDING", "DESMAC64WITHISO7816-4PADDING");
-            provider.addAlgorithm("Alg.Alias.Mac.DESISO9797ALG1MACWITHISO7816-4PADDING", "DESMAC64WITHISO7816-4PADDING");
-            provider.addAlgorithm("Alg.Alias.Mac.DESISO9797ALG1WITHISO7816-4PADDING", "DESMAC64WITHISO7816-4PADDING");
-
-            provider.addAlgorithm("Mac.DESWITHISO9797", PREFIX + "$DES9797Alg3");
-            provider.addAlgorithm("Alg.Alias.Mac.DESISO9797MAC", "DESWITHISO9797");
-
-            provider.addAlgorithm("Mac.ISO9797ALG3MAC", PREFIX + "$DES9797Alg3");
-            provider.addAlgorithm("Alg.Alias.Mac.ISO9797ALG3", "ISO9797ALG3MAC");
-            provider.addAlgorithm("Mac.ISO9797ALG3WITHISO7816-4PADDING", PREFIX + "$DES9797Alg3with7816d4");
-            provider.addAlgorithm("Alg.Alias.Mac.ISO9797ALG3MACWITHISO7816-4PADDING", "ISO9797ALG3WITHISO7816-4PADDING");
+            // BEGIN android-removed
+            // provider.addAlgorithm("Mac.DESCMAC", PREFIX + "$CMAC");
+            // provider.addAlgorithm("Mac.DESMAC", PREFIX + "$CBCMAC");
+            // provider.addAlgorithm("Alg.Alias.Mac.DES", "DESMAC");
+            //
+            // provider.addAlgorithm("Mac.DESMAC/CFB8", PREFIX + "$DESCFB8");
+            // provider.addAlgorithm("Alg.Alias.Mac.DES/CFB8", "DESMAC/CFB8");
+            //
+            // provider.addAlgorithm("Mac.DESMAC64", PREFIX + "$DES64");
+            // provider.addAlgorithm("Alg.Alias.Mac.DES64", "DESMAC64");
+            //
+            // provider.addAlgorithm("Mac.DESMAC64WITHISO7816-4PADDING", PREFIX + "$DES64with7816d4");
+            // provider.addAlgorithm("Alg.Alias.Mac.DES64WITHISO7816-4PADDING", "DESMAC64WITHISO7816-4PADDING");
+            // provider.addAlgorithm("Alg.Alias.Mac.DESISO9797ALG1MACWITHISO7816-4PADDING", "DESMAC64WITHISO7816-4PADDING");
+            // provider.addAlgorithm("Alg.Alias.Mac.DESISO9797ALG1WITHISO7816-4PADDING", "DESMAC64WITHISO7816-4PADDING");
+            //
+            // provider.addAlgorithm("Mac.DESWITHISO9797", PREFIX + "$DES9797Alg3");
+            // provider.addAlgorithm("Alg.Alias.Mac.DESISO9797MAC", "DESWITHISO9797");
+            //
+            // provider.addAlgorithm("Mac.ISO9797ALG3MAC", PREFIX + "$DES9797Alg3");
+            // provider.addAlgorithm("Alg.Alias.Mac.ISO9797ALG3", "ISO9797ALG3MAC");
+            // provider.addAlgorithm("Mac.ISO9797ALG3WITHISO7816-4PADDING", PREFIX + "$DES9797Alg3with7816d4");
+            // provider.addAlgorithm("Alg.Alias.Mac.ISO9797ALG3MACWITHISO7816-4PADDING", "ISO9797ALG3WITHISO7816-4PADDING");
+            // END android-removed
 
             provider.addAlgorithm("AlgorithmParameters.DES", PACKAGE + ".util.IvAlgorithmParameters");
             provider.addAlgorithm("Alg.Alias.AlgorithmParameters." + OIWObjectIdentifiers.desCBC, "DES");
 
-            provider.addAlgorithm("AlgorithmParameterGenerator.DES",  PREFIX + "$AlgParamGen");
-            provider.addAlgorithm("Alg.Alias.AlgorithmParameterGenerator." + OIWObjectIdentifiers.desCBC, "DES");
-
-            provider.addAlgorithm("Cipher.PBEWITHMD2ANDDES", PREFIX + "$PBEWithMD2");
+            // BEGIN android-removed
+            // provider.addAlgorithm("AlgorithmParameterGenerator.DES",  PREFIX + "$AlgParamGen");
+            // provider.addAlgorithm("Alg.Alias.AlgorithmParameterGenerator." + OIWObjectIdentifiers.desCBC, "DES");
+            //
+            // provider.addAlgorithm("Cipher.PBEWITHMD2ANDDES", PREFIX + "$PBEWithMD2");
+            // END android-removed
             provider.addAlgorithm("Cipher.PBEWITHMD5ANDDES", PREFIX + "$PBEWithMD5");
             provider.addAlgorithm("Cipher.PBEWITHSHA1ANDDES", PREFIX + "$PBEWithSHA1");
             
-            provider.addAlgorithm("Alg.Alias.Cipher." + PKCSObjectIdentifiers.pbeWithMD2AndDES_CBC, "PBEWITHMD2ANDDES");
+            // BEGIN android-removed
+            // provider.addAlgorithm("Alg.Alias.Cipher." + PKCSObjectIdentifiers.pbeWithMD2AndDES_CBC, "PBEWITHMD2ANDDES");
+            // END android-removed
             provider.addAlgorithm("Alg.Alias.Cipher." + PKCSObjectIdentifiers.pbeWithMD5AndDES_CBC, "PBEWITHMD5ANDDES");
             provider.addAlgorithm("Alg.Alias.Cipher." + PKCSObjectIdentifiers.pbeWithSHA1AndDES_CBC, "PBEWITHSHA1ANDDES");
             
-            provider.addAlgorithm("SecretKeyFactory.PBEWITHMD2ANDDES", PREFIX + "$PBEWithMD2KeyFactory");
+            // BEGIN android-removed
+            // provider.addAlgorithm("SecretKeyFactory.PBEWITHMD2ANDDES", PREFIX + "$PBEWithMD2KeyFactory");
+            // END android-removed
             provider.addAlgorithm("SecretKeyFactory.PBEWITHMD5ANDDES", PREFIX + "$PBEWithMD5KeyFactory");
             provider.addAlgorithm("SecretKeyFactory.PBEWITHSHA1ANDDES", PREFIX + "$PBEWithSHA1KeyFactory");
 
-            provider.addAlgorithm("Alg.Alias.SecretKeyFactory.PBEWITHMD2ANDDES-CBC", "PBEWITHMD2ANDDES");
+            // BEGIN android-removed
+            // provider.addAlgorithm("Alg.Alias.SecretKeyFactory.PBEWITHMD2ANDDES-CBC", "PBEWITHMD2ANDDES");
+            // END android-removed
             provider.addAlgorithm("Alg.Alias.SecretKeyFactory.PBEWITHMD5ANDDES-CBC", "PBEWITHMD5ANDDES");
             provider.addAlgorithm("Alg.Alias.SecretKeyFactory.PBEWITHSHA1ANDDES-CBC", "PBEWITHSHA1ANDDES");
-            provider.addAlgorithm("Alg.Alias.SecretKeyFactory." + PKCSObjectIdentifiers.pbeWithMD2AndDES_CBC, "PBEWITHMD2ANDDES");
+            // BEGIN android-removed
+            // provider.addAlgorithm("Alg.Alias.SecretKeyFactory." + PKCSObjectIdentifiers.pbeWithMD2AndDES_CBC, "PBEWITHMD2ANDDES");
+            // END android-removed
             provider.addAlgorithm("Alg.Alias.SecretKeyFactory." + PKCSObjectIdentifiers.pbeWithMD5AndDES_CBC, "PBEWITHMD5ANDDES");
             provider.addAlgorithm("Alg.Alias.SecretKeyFactory." + PKCSObjectIdentifiers.pbeWithSHA1AndDES_CBC, "PBEWITHSHA1ANDDES");
         }
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/DESede.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/DESede.java
index d7a52db..7b3addd 100644
--- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/DESede.java
+++ b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/DESede.java
@@ -1,30 +1,42 @@
 package org.bouncycastle.jcajce.provider.symmetric;
 
-import java.security.AlgorithmParameters;
-import java.security.InvalidAlgorithmParameterException;
+// BEGIN android-removed
+// import java.security.AlgorithmParameters;
+// import java.security.InvalidAlgorithmParameterException;
+// END android-removed
 import java.security.SecureRandom;
-import java.security.spec.AlgorithmParameterSpec;
+// BEGIN android-removed
+// import java.security.spec.AlgorithmParameterSpec;
+// END android-removed
 import java.security.spec.InvalidKeySpecException;
 import java.security.spec.KeySpec;
 
 import javax.crypto.SecretKey;
 import javax.crypto.spec.DESedeKeySpec;
-import javax.crypto.spec.IvParameterSpec;
+// BEGIN android-removed
+// import javax.crypto.spec.IvParameterSpec;
+// END android-removed
 import javax.crypto.spec.SecretKeySpec;
 
 import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
 import org.bouncycastle.crypto.KeyGenerationParameters;
 import org.bouncycastle.crypto.engines.DESedeEngine;
 import org.bouncycastle.crypto.engines.DESedeWrapEngine;
-import org.bouncycastle.crypto.engines.RFC3211WrapEngine;
+// BEGIN android-removed
+// import org.bouncycastle.crypto.engines.RFC3211WrapEngine;
+// END android-removed
 import org.bouncycastle.crypto.generators.DESedeKeyGenerator;
 import org.bouncycastle.crypto.macs.CBCBlockCipherMac;
-import org.bouncycastle.crypto.macs.CFBBlockCipherMac;
-import org.bouncycastle.crypto.macs.CMac;
+// BEGIN android-removed
+// import org.bouncycastle.crypto.macs.CFBBlockCipherMac;
+// import org.bouncycastle.crypto.macs.CMac;
+// END android-removed
 import org.bouncycastle.crypto.modes.CBCBlockCipher;
 import org.bouncycastle.crypto.paddings.ISO7816d4Padding;
 import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseAlgorithmParameterGenerator;
+// BEGIN android-removed
+// import org.bouncycastle.jcajce.provider.symmetric.util.BaseAlgorithmParameterGenerator;
+// END android-removed
 import org.bouncycastle.jcajce.provider.symmetric.util.BaseBlockCipher;
 import org.bouncycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
 import org.bouncycastle.jcajce.provider.symmetric.util.BaseMac;
@@ -56,17 +68,19 @@ public final class DESede
         }
     }
 
-    /**
-     * DESede   CFB8
-     */
-    public static class DESedeCFB8
-        extends BaseMac
-    {
-        public DESedeCFB8()
-        {
-            super(new CFBBlockCipherMac(new DESedeEngine()));
-        }
-    }
+    // BEGIN android-removed
+    // /**
+    //  * DESede   CFB8
+    //  */
+    // public static class DESedeCFB8
+    //     extends BaseMac
+    // {
+    //     public DESedeCFB8()
+    //     {
+    //         super(new CFBBlockCipherMac(new DESedeEngine()));
+    //     }
+    // }
+    // END android-removed
 
     /**
      * DESede64
@@ -101,15 +115,17 @@ public final class DESede
         }
     }
 
-    static public class CMAC
-        extends BaseMac
-    {
-        public CMAC()
-        {
-            super(new CMac(new DESedeEngine()));
-        }
-    }
-
+    // BEGIN android-removed
+    // static public class CMAC
+    //     extends BaseMac
+    // {
+    //     public CMAC()
+    //     {
+    //         super(new CMac(new DESedeEngine()));
+    //     }
+    // }
+    // END android-removed
+    
     public static class Wrap
         extends BaseWrapCipher
     {
@@ -118,15 +134,17 @@ public final class DESede
             super(new DESedeWrapEngine());
         }
     }
-
-    public static class RFC3211
-        extends BaseWrapCipher
-    {
-        public RFC3211()
-        {
-            super(new RFC3211WrapEngine(new DESedeEngine()), 8);
-        }
-    }
+    
+    // BEGIN android-removed
+    // public static class RFC3211
+    //     extends BaseWrapCipher
+    // {
+    //     public RFC3211()
+    //     {
+    //         super(new RFC3211WrapEngine(new DESedeEngine()), 8);
+    //     }
+    // }
+    // END android-removed
 
   /**
      * DESede - the default for this is to generate a key in
@@ -240,43 +258,45 @@ public final class DESede
         }
     }
 
-    public static class AlgParamGen
-        extends BaseAlgorithmParameterGenerator
-    {
-        protected void engineInit(
-            AlgorithmParameterSpec genParamSpec,
-            SecureRandom            random)
-            throws InvalidAlgorithmParameterException
-        {
-            throw new InvalidAlgorithmParameterException("No supported AlgorithmParameterSpec for DES parameter generation.");
-        }
-
-        protected AlgorithmParameters engineGenerateParameters()
-        {
-            byte[]  iv = new byte[8];
-
-            if (random == null)
-            {
-                random = new SecureRandom();
-            }
-
-            random.nextBytes(iv);
-
-            AlgorithmParameters params;
-
-            try
-            {
-                params = createParametersInstance("DES");
-                params.init(new IvParameterSpec(iv));
-            }
-            catch (Exception e)
-            {
-                throw new RuntimeException(e.getMessage());
-            }
-
-            return params;
-        }
-    }
+    // BEGIN android-removed
+    // public static class AlgParamGen
+    //     extends BaseAlgorithmParameterGenerator
+    // {
+    //     protected void engineInit(
+    //         AlgorithmParameterSpec genParamSpec,
+    //         SecureRandom            random)
+    //         throws InvalidAlgorithmParameterException
+    //     {
+    //         throw new InvalidAlgorithmParameterException("No supported AlgorithmParameterSpec for DES parameter generation.");
+    //     }
+
+    //     protected AlgorithmParameters engineGenerateParameters()
+    //     {
+    //         byte[]  iv = new byte[8];
+
+    //         if (random == null)
+    //         {
+    //             random = new SecureRandom();
+    //         }
+
+    //         random.nextBytes(iv);
+
+    //         AlgorithmParameters params;
+
+    //         try
+    //         {
+    //             params = createParametersInstance("DES");
+    //             params.init(new IvParameterSpec(iv));
+    //         }
+    //         catch (Exception e)
+    //         {
+    //             throw new RuntimeException(e.getMessage());
+    //         }
+
+    //         return params;
+    //     }
+    // }
+    // END android-removed
 
     static public class KeyFactory
         extends BaseSecretKeyFactory
@@ -360,25 +380,37 @@ public final class DESede
         public void configure(ConfigurableProvider provider)
         {
             provider.addAlgorithm("Cipher.DESEDE", PREFIX + "$ECB");
-            provider.addAlgorithm("Cipher." + PKCSObjectIdentifiers.des_EDE3_CBC, PREFIX + "$CBC");
+            // BEGIN android-removed
+            // provider.addAlgorithm("Cipher." + PKCSObjectIdentifiers.des_EDE3_CBC, PREFIX + "$CBC");
+            // END android-removed
             provider.addAlgorithm("Cipher.DESEDEWRAP", PREFIX + "$Wrap");
-            provider.addAlgorithm("Cipher." + PKCSObjectIdentifiers.id_alg_CMS3DESwrap, PREFIX + "$Wrap");
-            provider.addAlgorithm("Cipher.DESEDERFC3211WRAP", PREFIX + "$RFC3211");
+            // BEGIN android-changed
+            provider.addAlgorithm("Alg.Alias.Cipher." + PKCSObjectIdentifiers.id_alg_CMS3DESwrap, "DESEDEWRAP");
+            // END android-changed
+            // BEGIN android-removed
+            // provider.addAlgorithm("Cipher.DESEDERFC3211WRAP", PREFIX + "$RFC3211");
+            // END android-removed
 
             provider.addAlgorithm("Alg.Alias.Cipher.TDEA", "DESEDE");
             provider.addAlgorithm("Alg.Alias.Cipher.TDEAWRAP", "DESEDEWRAP");
             provider.addAlgorithm("Alg.Alias.KeyGenerator.TDEA", "DESEDE");
             provider.addAlgorithm("Alg.Alias.AlgorithmParameters.TDEA", "DESEDE");
-            provider.addAlgorithm("Alg.Alias.AlgorithmParameterGenerator.TDEA", "DESEDE");
+            // BEGIN android-removed
+            // provider.addAlgorithm("Alg.Alias.AlgorithmParameterGenerator.TDEA", "DESEDE");
+            // END android-removed
             provider.addAlgorithm("Alg.Alias.SecretKeyFactory.TDEA", "DESEDE");
 
             if (provider.hasAlgorithm("MessageDigest", "SHA-1"))
             {
                 provider.addAlgorithm("Cipher.PBEWITHSHAAND3-KEYTRIPLEDES-CBC", PREFIX + "$PBEWithSHAAndDES3Key");
-                provider.addAlgorithm("Cipher.BROKENPBEWITHSHAAND3-KEYTRIPLEDES-CBC", PREFIX + "$BrokePBEWithSHAAndDES3Key");
-                provider.addAlgorithm("Cipher.OLDPBEWITHSHAAND3-KEYTRIPLEDES-CBC", PREFIX + "$OldPBEWithSHAAndDES3Key");
+                // BEGIN android-removed
+                // provider.addAlgorithm("Cipher.BROKENPBEWITHSHAAND3-KEYTRIPLEDES-CBC", PREFIX + "$BrokePBEWithSHAAndDES3Key");
+                // provider.addAlgorithm("Cipher.OLDPBEWITHSHAAND3-KEYTRIPLEDES-CBC", PREFIX + "$OldPBEWithSHAAndDES3Key");
+                // END android-removed
                 provider.addAlgorithm("Cipher.PBEWITHSHAAND2-KEYTRIPLEDES-CBC", PREFIX + "$PBEWithSHAAndDES2Key");
-                provider.addAlgorithm("Cipher.BROKENPBEWITHSHAAND2-KEYTRIPLEDES-CBC", PREFIX + "$BrokePBEWithSHAAndDES2Key");
+                // BEGIN android-removed
+                // provider.addAlgorithm("Cipher.BROKENPBEWITHSHAAND2-KEYTRIPLEDES-CBC", PREFIX + "$BrokePBEWithSHAAndDES2Key");
+                // END android-removed
                 provider.addAlgorithm("Alg.Alias.Cipher." + PKCSObjectIdentifiers.pbeWithSHAAnd3_KeyTripleDES_CBC, "PBEWITHSHAAND3-KEYTRIPLEDES-CBC");
                 provider.addAlgorithm("Alg.Alias.Cipher." + PKCSObjectIdentifiers.pbeWithSHAAnd2_KeyTripleDES_CBC, "PBEWITHSHAAND2-KEYTRIPLEDES-CBC");
                 provider.addAlgorithm("Alg.Alias.Cipher.PBEWITHSHA1ANDDESEDE", "PBEWITHSHAAND3-KEYTRIPLEDES-CBC");
@@ -387,31 +419,37 @@ public final class DESede
             }
 
             provider.addAlgorithm("KeyGenerator.DESEDE", PREFIX + "$KeyGenerator");
-            provider.addAlgorithm("KeyGenerator." + PKCSObjectIdentifiers.des_EDE3_CBC, PREFIX + "$KeyGenerator3");
-            provider.addAlgorithm("KeyGenerator.DESEDEWRAP", PREFIX + "$KeyGenerator");
+            // BEGIN android-removed
+            // provider.addAlgorithm("KeyGenerator." + PKCSObjectIdentifiers.des_EDE3_CBC, PREFIX + "$KeyGenerator3");
+            // provider.addAlgorithm("KeyGenerator.DESEDEWRAP", PREFIX + "$KeyGenerator");
+            // END android-removed
 
             provider.addAlgorithm("SecretKeyFactory.DESEDE", PREFIX + "$KeyFactory");
 
-            provider.addAlgorithm("Mac.DESEDECMAC", PREFIX + "$CMAC");
-            provider.addAlgorithm("Mac.DESEDEMAC", PREFIX + "$CBCMAC");
-            provider.addAlgorithm("Alg.Alias.Mac.DESEDE", "DESEDEMAC");
-
-            provider.addAlgorithm("Mac.DESEDEMAC/CFB8", PREFIX + "$DESedeCFB8");
-            provider.addAlgorithm("Alg.Alias.Mac.DESEDE/CFB8", "DESEDEMAC/CFB8");
-
-            provider.addAlgorithm("Mac.DESEDEMAC64", PREFIX + "$DESede64");
-            provider.addAlgorithm("Alg.Alias.Mac.DESEDE64", "DESEDEMAC64");
-
-            provider.addAlgorithm("Mac.DESEDEMAC64WITHISO7816-4PADDING", PREFIX + "$DESede64with7816d4");
-            provider.addAlgorithm("Alg.Alias.Mac.DESEDE64WITHISO7816-4PADDING", "DESEDEMAC64WITHISO7816-4PADDING");
-            provider.addAlgorithm("Alg.Alias.Mac.DESEDEISO9797ALG1MACWITHISO7816-4PADDING", "DESEDEMAC64WITHISO7816-4PADDING");
-            provider.addAlgorithm("Alg.Alias.Mac.DESEDEISO9797ALG1WITHISO7816-4PADDING", "DESEDEMAC64WITHISO7816-4PADDING");
+            // BEGIN android-removed
+            // provider.addAlgorithm("Mac.DESEDECMAC", PREFIX + "$CMAC");
+            // provider.addAlgorithm("Mac.DESEDEMAC", PREFIX + "$CBCMAC");
+            // provider.addAlgorithm("Alg.Alias.Mac.DESEDE", "DESEDEMAC");
+            //
+            // provider.addAlgorithm("Mac.DESEDEMAC/CFB8", PREFIX + "$DESedeCFB8");
+            // provider.addAlgorithm("Alg.Alias.Mac.DESEDE/CFB8", "DESEDEMAC/CFB8");
+            //
+            // provider.addAlgorithm("Mac.DESEDEMAC64", PREFIX + "$DESede64");
+            // provider.addAlgorithm("Alg.Alias.Mac.DESEDE64", "DESEDEMAC64");
+            //
+            // provider.addAlgorithm("Mac.DESEDEMAC64WITHISO7816-4PADDING", PREFIX + "$DESede64with7816d4");
+            // provider.addAlgorithm("Alg.Alias.Mac.DESEDE64WITHISO7816-4PADDING", "DESEDEMAC64WITHISO7816-4PADDING");
+            // provider.addAlgorithm("Alg.Alias.Mac.DESEDEISO9797ALG1MACWITHISO7816-4PADDING", "DESEDEMAC64WITHISO7816-4PADDING");
+            // provider.addAlgorithm("Alg.Alias.Mac.DESEDEISO9797ALG1WITHISO7816-4PADDING", "DESEDEMAC64WITHISO7816-4PADDING");
+            // END android-removed
 
             provider.addAlgorithm("AlgorithmParameters.DESEDE", PACKAGE + ".util.IvAlgorithmParameters");
             provider.addAlgorithm("Alg.Alias.AlgorithmParameters." + PKCSObjectIdentifiers.des_EDE3_CBC, "DESEDE");
 
-            provider.addAlgorithm("AlgorithmParameterGenerator.DESEDE",  PREFIX + "$AlgParamGen");
-            provider.addAlgorithm("Alg.Alias.AlgorithmParameterGenerator." + PKCSObjectIdentifiers.des_EDE3_CBC, "DESEDE");
+            // BEGIN android-removed
+            // provider.addAlgorithm("AlgorithmParameterGenerator.DESEDE",  PREFIX + "$AlgParamGen");
+            // provider.addAlgorithm("Alg.Alias.AlgorithmParameterGenerator." + PKCSObjectIdentifiers.des_EDE3_CBC, "DESEDE");
+            // END android-removed
 
             provider.addAlgorithm("SecretKeyFactory.PBEWITHSHAAND3-KEYTRIPLEDES-CBC", PREFIX + "$PBEWithSHAAndDES3KeyFactory");
             provider.addAlgorithm("SecretKeyFactory.PBEWITHSHAAND2-KEYTRIPLEDES-CBC", PREFIX + "$PBEWithSHAAndDES2KeyFactory");
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/GOST28147.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/GOST28147.java
deleted file mode 100644
index a849a18..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/GOST28147.java
+++ /dev/null
@@ -1,156 +0,0 @@
-package org.bouncycastle.jcajce.provider.symmetric;
-
-import java.security.AlgorithmParameters;
-import java.security.InvalidAlgorithmParameterException;
-import java.security.SecureRandom;
-import java.security.spec.AlgorithmParameterSpec;
-
-import javax.crypto.spec.IvParameterSpec;
-
-import org.bouncycastle.asn1.cryptopro.CryptoProObjectIdentifiers;
-import org.bouncycastle.crypto.BufferedBlockCipher;
-import org.bouncycastle.crypto.CipherKeyGenerator;
-import org.bouncycastle.crypto.engines.GOST28147Engine;
-import org.bouncycastle.crypto.macs.GOST28147Mac;
-import org.bouncycastle.crypto.modes.CBCBlockCipher;
-import org.bouncycastle.crypto.modes.GCFBBlockCipher;
-import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseAlgorithmParameterGenerator;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseBlockCipher;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseMac;
-import org.bouncycastle.jcajce.provider.symmetric.util.IvAlgorithmParameters;
-import org.bouncycastle.jcajce.provider.util.AlgorithmProvider;
-
-public final class GOST28147
-{
-    private GOST28147()
-    {
-    }
-    
-    public static class ECB
-        extends BaseBlockCipher
-    {
-        public ECB()
-        {
-            super(new GOST28147Engine());
-        }
-    }
-
-    public static class CBC
-       extends BaseBlockCipher
-    {
-        public CBC()
-        {
-            super(new CBCBlockCipher(new GOST28147Engine()), 64);
-        }
-    }
-
-    public static class GCFB
-       extends BaseBlockCipher
-    {
-        public GCFB()
-        {
-            super(new BufferedBlockCipher(new GCFBBlockCipher(new GOST28147Engine())), 64);
-        }
-    }
-
-    /**
-     * GOST28147
-     */
-    public static class Mac
-        extends BaseMac
-    {
-        public Mac()
-        {
-            super(new GOST28147Mac());
-        }
-    }
-
-    public static class KeyGen
-        extends BaseKeyGenerator
-    {
-        public KeyGen()
-        {
-            this(256);
-        }
-
-        public KeyGen(int keySize)
-        {
-            super("GOST28147", keySize, new CipherKeyGenerator());
-        }
-    }
-
-    public static class AlgParamGen
-        extends BaseAlgorithmParameterGenerator
-    {
-        protected void engineInit(
-            AlgorithmParameterSpec genParamSpec,
-            SecureRandom random)
-            throws InvalidAlgorithmParameterException
-        {
-            throw new InvalidAlgorithmParameterException("No supported AlgorithmParameterSpec for GOST28147 parameter generation.");
-        }
-
-        protected AlgorithmParameters engineGenerateParameters()
-        {
-            byte[]  iv = new byte[16];
-
-            if (random == null)
-            {
-                random = new SecureRandom();
-            }
-
-            random.nextBytes(iv);
-
-            AlgorithmParameters params;
-
-            try
-            {
-                params = createParametersInstance("GOST28147");
-                params.init(new IvParameterSpec(iv));
-            }
-            catch (Exception e)
-            {
-                throw new RuntimeException(e.getMessage());
-            }
-
-            return params;
-        }
-    }
-
-    public static class AlgParams
-        extends IvAlgorithmParameters
-    {
-        protected String engineToString()
-        {
-            return "GOST IV";
-        }
-    }
-
-    public static class Mappings
-        extends AlgorithmProvider
-    {
-        private static final String PREFIX = GOST28147.class.getName();
-
-        public Mappings()
-        {
-        }
-
-        public void configure(ConfigurableProvider provider)
-        {
-            provider.addAlgorithm("Cipher.GOST28147", PREFIX + "$ECB");
-            provider.addAlgorithm("Alg.Alias.Cipher.GOST", "GOST28147");
-            provider.addAlgorithm("Alg.Alias.Cipher.GOST-28147", "GOST28147");
-            provider.addAlgorithm("Cipher." + CryptoProObjectIdentifiers.gostR28147_gcfb, PREFIX + "$GCFB");
-
-            provider.addAlgorithm("KeyGenerator.GOST28147", PREFIX + "$KeyGen");
-            provider.addAlgorithm("Alg.Alias.KeyGenerator.GOST", "GOST28147");
-            provider.addAlgorithm("Alg.Alias.KeyGenerator.GOST-28147", "GOST28147");
-            provider.addAlgorithm("Alg.Alias.KeyGenerator." + CryptoProObjectIdentifiers.gostR28147_gcfb, "GOST28147");
-
-            provider.addAlgorithm("Mac.GOST28147MAC", PREFIX + "$Mac");
-            provider.addAlgorithm("Alg.Alias.Mac.GOST28147", "GOST28147MAC");
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/Grain128.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/Grain128.java
deleted file mode 100644
index d7232b1..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/Grain128.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package org.bouncycastle.jcajce.provider.symmetric;
-
-import org.bouncycastle.crypto.CipherKeyGenerator;
-import org.bouncycastle.crypto.engines.Grain128Engine;
-import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseStreamCipher;
-import org.bouncycastle.jcajce.provider.util.AlgorithmProvider;
-
-public final class Grain128
-{
-    private Grain128()
-    {
-    }
-    
-    public static class Base
-        extends BaseStreamCipher
-    {
-        public Base()
-        {
-            super(new Grain128Engine(), 12);
-        }
-    }
-
-    public static class KeyGen
-        extends BaseKeyGenerator
-    {
-        public KeyGen()
-        {
-            super("Grain128", 128, new CipherKeyGenerator());
-        }
-    }
-
-    public static class Mappings
-        extends AlgorithmProvider
-    {
-        private static final String PREFIX = Grain128.class.getName();
-
-        public Mappings()
-        {
-        }
-
-        public void configure(ConfigurableProvider provider)
-        {
-            provider.addAlgorithm("Cipher.Grain128", PREFIX + "$Base");
-            provider.addAlgorithm("KeyGenerator.Grain128", PREFIX + "$KeyGen");
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/Grainv1.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/Grainv1.java
deleted file mode 100644
index fce224d..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/Grainv1.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package org.bouncycastle.jcajce.provider.symmetric;
-
-import org.bouncycastle.crypto.CipherKeyGenerator;
-import org.bouncycastle.crypto.engines.Grainv1Engine;
-import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseStreamCipher;
-import org.bouncycastle.jcajce.provider.util.AlgorithmProvider;
-
-public final class Grainv1
-{
-    private Grainv1()
-    {
-    }
-    
-    public static class Base
-        extends BaseStreamCipher
-    {
-        public Base()
-        {
-            super(new Grainv1Engine(), 8);
-        }
-    }
-
-    public static class KeyGen
-        extends BaseKeyGenerator
-    {
-        public KeyGen()
-        {
-            super("Grainv1", 80, new CipherKeyGenerator());
-        }
-    }
-
-    public static class Mappings
-        extends AlgorithmProvider
-    {
-        private static final String PREFIX = Grainv1.class.getName();
-
-        public Mappings()
-        {
-        }
-
-        public void configure(ConfigurableProvider provider)
-        {
-            provider.addAlgorithm("Cipher.Grainv1", PREFIX + "$Base");
-            provider.addAlgorithm("KeyGenerator.Grainv1", PREFIX + "$KeyGen");
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/HC128.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/HC128.java
deleted file mode 100644
index efe7ede..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/HC128.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package org.bouncycastle.jcajce.provider.symmetric;
-
-import org.bouncycastle.crypto.CipherKeyGenerator;
-import org.bouncycastle.crypto.engines.HC128Engine;
-import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseStreamCipher;
-import org.bouncycastle.jcajce.provider.util.AlgorithmProvider;
-
-public final class HC128
-{
-    private HC128()
-    {
-    }
-    
-    public static class Base
-        extends BaseStreamCipher
-    {
-        public Base()
-        {
-            super(new HC128Engine(), 16);
-        }
-    }
-
-    public static class KeyGen
-        extends BaseKeyGenerator
-    {
-        public KeyGen()
-        {
-            super("HC128", 128, new CipherKeyGenerator());
-        }
-    }
-
-    public static class Mappings
-        extends AlgorithmProvider
-    {
-        private static final String PREFIX = HC128.class.getName();
-
-        public Mappings()
-        {
-        }
-
-        public void configure(ConfigurableProvider provider)
-        {
-            provider.addAlgorithm("Cipher.HC128", PREFIX + "$Base");
-            provider.addAlgorithm("KeyGenerator.HC128", PREFIX + "$KeyGen");
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/HC256.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/HC256.java
deleted file mode 100644
index dd93445..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/HC256.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package org.bouncycastle.jcajce.provider.symmetric;
-
-import org.bouncycastle.crypto.CipherKeyGenerator;
-import org.bouncycastle.crypto.engines.HC256Engine;
-import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseStreamCipher;
-import org.bouncycastle.jcajce.provider.util.AlgorithmProvider;
-
-public final class HC256
-{
-    private HC256()
-    {
-    }
-    
-    public static class Base
-        extends BaseStreamCipher
-    {
-        public Base()
-        {
-            super(new HC256Engine(), 32);
-        }
-    }
-
-    public static class KeyGen
-        extends BaseKeyGenerator
-    {
-        public KeyGen()
-        {
-            super("HC256", 256, new CipherKeyGenerator());
-        }
-    }
-
-    public static class Mappings
-        extends AlgorithmProvider
-    {
-        private static final String PREFIX = HC256.class.getName();
-
-        public Mappings()
-        {
-        }
-
-        public void configure(ConfigurableProvider provider)
-        {
-            provider.addAlgorithm("Cipher.HC256", PREFIX + "$Base");
-            provider.addAlgorithm("KeyGenerator.HC256", PREFIX + "$KeyGen");
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/IDEA.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/IDEA.java
deleted file mode 100644
index 6910051..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/IDEA.java
+++ /dev/null
@@ -1,257 +0,0 @@
-package org.bouncycastle.jcajce.provider.symmetric;
-
-import java.io.IOException;
-import java.security.AlgorithmParameters;
-import java.security.InvalidAlgorithmParameterException;
-import java.security.SecureRandom;
-import java.security.spec.AlgorithmParameterSpec;
-import java.security.spec.InvalidParameterSpecException;
-
-import javax.crypto.spec.IvParameterSpec;
-
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.misc.IDEACBCPar;
-import org.bouncycastle.crypto.CipherKeyGenerator;
-import org.bouncycastle.crypto.engines.IDEAEngine;
-import org.bouncycastle.crypto.macs.CBCBlockCipherMac;
-import org.bouncycastle.crypto.macs.CFBBlockCipherMac;
-import org.bouncycastle.crypto.modes.CBCBlockCipher;
-import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseAlgorithmParameterGenerator;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseAlgorithmParameters;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseBlockCipher;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseMac;
-import org.bouncycastle.jcajce.provider.symmetric.util.PBESecretKeyFactory;
-import org.bouncycastle.jcajce.provider.util.AlgorithmProvider;
-
-public final class IDEA
-{
-    private IDEA()
-    {
-    }
-    
-    public static class ECB
-        extends BaseBlockCipher
-    {
-        public ECB()
-        {
-            super(new IDEAEngine());
-        }
-    }
-
-    public static class CBC
-       extends BaseBlockCipher
-    {
-        public CBC()
-        {
-            super(new CBCBlockCipher(new IDEAEngine()), 64);
-        }
-    }
-
-    public static class KeyGen
-        extends BaseKeyGenerator
-    {
-        public KeyGen()
-        {
-            super("IDEA", 128, new CipherKeyGenerator());
-        }
-    }
-
-    public static class PBEWithSHAAndIDEAKeyGen
-       extends PBESecretKeyFactory
-    {
-       public PBEWithSHAAndIDEAKeyGen()
-       {
-           super("PBEwithSHAandIDEA-CBC", null, true, PKCS12, SHA1, 128, 64);
-       }
-    }
-
-    static public class PBEWithSHAAndIDEA
-        extends BaseBlockCipher
-    {
-        public PBEWithSHAAndIDEA()
-        {
-            super(new CBCBlockCipher(new IDEAEngine()));
-        }
-    }
-
-    public static class AlgParamGen
-        extends BaseAlgorithmParameterGenerator
-    {
-        protected void engineInit(
-            AlgorithmParameterSpec genParamSpec,
-            SecureRandom random)
-            throws InvalidAlgorithmParameterException
-        {
-            throw new InvalidAlgorithmParameterException("No supported AlgorithmParameterSpec for IDEA parameter generation.");
-        }
-
-        protected AlgorithmParameters engineGenerateParameters()
-        {
-            byte[] iv = new byte[8];
-
-            if (random == null)
-            {
-                random = new SecureRandom();
-            }
-
-            random.nextBytes(iv);
-
-            AlgorithmParameters params;
-
-            try
-            {
-                params = createParametersInstance("IDEA");
-                params.init(new IvParameterSpec(iv));
-            }
-            catch (Exception e)
-            {
-                throw new RuntimeException(e.getMessage());
-            }
-
-            return params;
-        }
-    }
-
-    public static class AlgParams
-        extends BaseAlgorithmParameters
-    {
-        private byte[]  iv;
-
-        protected byte[] engineGetEncoded()
-            throws IOException
-        {
-            return engineGetEncoded("ASN.1");
-        }
-
-        protected byte[] engineGetEncoded(
-            String format)
-            throws IOException
-        {
-            if (this.isASN1FormatString(format))
-            {
-                return new IDEACBCPar(engineGetEncoded("RAW")).getEncoded();
-            }
-
-            if (format.equals("RAW"))
-            {
-                byte[]  tmp = new byte[iv.length];
-
-                System.arraycopy(iv, 0, tmp, 0, iv.length);
-                return tmp;
-            }
-
-            return null;
-        }
-
-        protected AlgorithmParameterSpec localEngineGetParameterSpec(
-            Class paramSpec)
-            throws InvalidParameterSpecException
-        {
-            if (paramSpec == IvParameterSpec.class)
-            {
-                return new IvParameterSpec(iv);
-            }
-
-            throw new InvalidParameterSpecException("unknown parameter spec passed to IV parameters object.");
-        }
-
-        protected void engineInit(
-            AlgorithmParameterSpec paramSpec)
-            throws InvalidParameterSpecException
-        {
-            if (!(paramSpec instanceof IvParameterSpec))
-            {
-                throw new InvalidParameterSpecException("IvParameterSpec required to initialise a IV parameters algorithm parameters object");
-            }
-
-            this.iv = ((IvParameterSpec)paramSpec).getIV();
-        }
-
-        protected void engineInit(
-            byte[] params)
-            throws IOException
-        {
-            this.iv = new byte[params.length];
-
-            System.arraycopy(params, 0, iv, 0, iv.length);
-        }
-
-        protected void engineInit(
-            byte[] params,
-            String format)
-            throws IOException
-        {
-            if (format.equals("RAW"))
-            {
-                engineInit(params);
-                return;
-            }
-            if (format.equals("ASN.1"))
-            {
-                ASN1InputStream aIn = new ASN1InputStream(params);
-                IDEACBCPar      oct = new IDEACBCPar((ASN1Sequence)aIn.readObject());
-
-                engineInit(oct.getIV());
-                return;
-            }
-
-            throw new IOException("Unknown parameters format in IV parameters object");
-        }
-
-        protected String engineToString()
-        {
-            return "IDEA Parameters";
-        }
-    }
-    
-    public static class Mac
-        extends BaseMac
-    {
-        public Mac()
-        {
-            super(new CBCBlockCipherMac(new IDEAEngine()));
-        }
-    }
-
-    public static class CFB8Mac
-        extends BaseMac
-    {
-        public CFB8Mac()
-        {
-            super(new CFBBlockCipherMac(new IDEAEngine()));
-        }
-    }
-
-    public static class Mappings
-        extends AlgorithmProvider
-    {
-        private static final String PREFIX = IDEA.class.getName();
-
-        public Mappings()
-        {
-        }
-
-        public void configure(ConfigurableProvider provider)
-        {
-            provider.addAlgorithm("AlgorithmParameterGenerator.IDEA", PREFIX + "$AlgParamGen");
-            provider.addAlgorithm("AlgorithmParameterGenerator.1.3.6.1.4.1.188.7.1.1.2", PREFIX + "$AlgParamGen");
-            provider.addAlgorithm("AlgorithmParameters.IDEA", PREFIX + "$AlgParams");
-            provider.addAlgorithm("AlgorithmParameters.1.3.6.1.4.1.188.7.1.1.2", PREFIX + "$AlgParams");
-            provider.addAlgorithm("Alg.Alias.AlgorithmParameters.PBEWITHSHAANDIDEA", "PKCS12PBE");
-            provider.addAlgorithm("Alg.Alias.AlgorithmParameters.PBEWITHSHAANDIDEA-CBC", "PKCS12PBE");
-            provider.addAlgorithm("Cipher.IDEA", PREFIX + "$ECB");
-            provider.addAlgorithm("Cipher.1.3.6.1.4.1.188.7.1.1.2", PREFIX + "$CBC");
-            provider.addAlgorithm("Cipher.PBEWITHSHAANDIDEA-CBC", PREFIX + "$PBEWithSHAAndIDEA");
-            provider.addAlgorithm("KeyGenerator.IDEA", PREFIX + "$KeyGen");
-            provider.addAlgorithm("KeyGenerator.1.3.6.1.4.1.188.7.1.1.2", PREFIX + "$KeyGen");
-            provider.addAlgorithm("SecretKeyFactory.PBEWITHSHAANDIDEA-CBC", PREFIX + "$PBEWithSHAAndIDEAKeyGen");
-            provider.addAlgorithm("Mac.IDEAMAC", PREFIX + "$Mac");
-            provider.addAlgorithm("Alg.Alias.Mac.IDEA", "IDEAMAC");
-            provider.addAlgorithm("Mac.IDEAMAC/CFB8", PREFIX + "$CFB8Mac");
-            provider.addAlgorithm("Alg.Alias.Mac.IDEA/CFB8", "IDEAMAC/CFB8");
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/Noekeon.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/Noekeon.java
deleted file mode 100644
index 1fefd14..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/Noekeon.java
+++ /dev/null
@@ -1,152 +0,0 @@
-package org.bouncycastle.jcajce.provider.symmetric;
-
-import java.security.AlgorithmParameters;
-import java.security.InvalidAlgorithmParameterException;
-import java.security.SecureRandom;
-import java.security.spec.AlgorithmParameterSpec;
-
-import javax.crypto.spec.IvParameterSpec;
-
-import org.bouncycastle.crypto.BlockCipher;
-import org.bouncycastle.crypto.CipherKeyGenerator;
-import org.bouncycastle.crypto.engines.NoekeonEngine;
-import org.bouncycastle.crypto.generators.Poly1305KeyGenerator;
-import org.bouncycastle.crypto.macs.GMac;
-import org.bouncycastle.crypto.modes.GCMBlockCipher;
-import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseAlgorithmParameterGenerator;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseBlockCipher;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseMac;
-import org.bouncycastle.jcajce.provider.symmetric.util.BlockCipherProvider;
-import org.bouncycastle.jcajce.provider.symmetric.util.IvAlgorithmParameters;
-
-public final class Noekeon
-{
-    private Noekeon()
-    {
-    }
-
-    public static class ECB
-        extends BaseBlockCipher
-    {
-        public ECB()
-        {
-            super(new BlockCipherProvider()
-            {
-                public BlockCipher get()
-                {
-                    return new NoekeonEngine();
-                }
-            });
-        }
-    }
-
-    public static class KeyGen
-        extends BaseKeyGenerator
-    {
-        public KeyGen()
-        {
-            super("Noekeon", 128, new CipherKeyGenerator());
-        }
-    }
-
-    public static class GMAC
-        extends BaseMac
-    {
-        public GMAC()
-        {
-            super(new GMac(new GCMBlockCipher(new NoekeonEngine())));
-        }
-    }
-
-    public static class Poly1305
-        extends BaseMac
-    {
-        public Poly1305()
-        {
-            super(new org.bouncycastle.crypto.macs.Poly1305(new NoekeonEngine()));
-        }
-    }
-
-    public static class Poly1305KeyGen
-        extends BaseKeyGenerator
-    {
-        public Poly1305KeyGen()
-        {
-            super("Poly1305-Noekeon", 256, new Poly1305KeyGenerator());
-        }
-    }
-
-    public static class AlgParamGen
-        extends BaseAlgorithmParameterGenerator
-    {
-        protected void engineInit(
-            AlgorithmParameterSpec genParamSpec,
-            SecureRandom random)
-            throws InvalidAlgorithmParameterException
-        {
-            throw new InvalidAlgorithmParameterException("No supported AlgorithmParameterSpec for Noekeon parameter generation.");
-        }
-
-        protected AlgorithmParameters engineGenerateParameters()
-        {
-            byte[] iv = new byte[16];
-
-            if (random == null)
-            {
-                random = new SecureRandom();
-            }
-
-            random.nextBytes(iv);
-
-            AlgorithmParameters params;
-
-            try
-            {
-                params = createParametersInstance("Noekeon");
-                params.init(new IvParameterSpec(iv));
-            }
-            catch (Exception e)
-            {
-                throw new RuntimeException(e.getMessage());
-            }
-
-            return params;
-        }
-    }
-
-    public static class AlgParams
-        extends IvAlgorithmParameters
-    {
-        protected String engineToString()
-        {
-            return "Noekeon IV";
-        }
-    }
-
-    public static class Mappings
-        extends SymmetricAlgorithmProvider
-    {
-        private static final String PREFIX = Noekeon.class.getName();
-
-        public Mappings()
-        {
-        }
-
-        public void configure(ConfigurableProvider provider)
-        {
-
-            provider.addAlgorithm("AlgorithmParameters.NOEKEON", PREFIX + "$AlgParams");
-
-            provider.addAlgorithm("AlgorithmParameterGenerator.NOEKEON", PREFIX + "$AlgParamGen");
-
-            provider.addAlgorithm("Cipher.NOEKEON", PREFIX + "$ECB");
-
-            provider.addAlgorithm("KeyGenerator.NOEKEON", PREFIX + "$KeyGen");
-
-            addGMacAlgorithm(provider, "NOEKEON", PREFIX + "$GMAC", PREFIX + "$KeyGen");
-            addPoly1305Algorithm(provider, "NOEKEON", PREFIX + "$Poly1305", PREFIX + "$Poly1305KeyGen");
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/PBEPBKDF2.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/PBEPBKDF2.java
deleted file mode 100644
index 4b0d8b9..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/PBEPBKDF2.java
+++ /dev/null
@@ -1,228 +0,0 @@
-package org.bouncycastle.jcajce.provider.symmetric;
-
-import java.io.IOException;
-import java.security.spec.AlgorithmParameterSpec;
-import java.security.spec.InvalidKeySpecException;
-import java.security.spec.InvalidParameterSpecException;
-import java.security.spec.KeySpec;
-
-import javax.crypto.SecretKey;
-import javax.crypto.spec.PBEKeySpec;
-import javax.crypto.spec.PBEParameterSpec;
-
-import org.bouncycastle.asn1.ASN1Encoding;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.cryptopro.CryptoProObjectIdentifiers;
-import org.bouncycastle.asn1.pkcs.PBKDF2Params;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
-import org.bouncycastle.jcajce.provider.symmetric.util.BCPBEKey;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseAlgorithmParameters;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseSecretKeyFactory;
-import org.bouncycastle.jcajce.provider.symmetric.util.PBE;
-import org.bouncycastle.jcajce.provider.util.AlgorithmProvider;
-import org.bouncycastle.jcajce.spec.PBKDF2KeySpec;
-
-public class PBEPBKDF2
-{
-    private PBEPBKDF2()
-    {
-
-    }
-
-    public static class AlgParams
-        extends BaseAlgorithmParameters
-    {
-        PBKDF2Params params;
-
-        protected byte[] engineGetEncoded()
-        {
-            try
-            {
-                return params.getEncoded(ASN1Encoding.DER);
-            }
-            catch (IOException e)
-            {
-                throw new RuntimeException("Oooops! " + e.toString());
-            }
-        }
-
-        protected byte[] engineGetEncoded(
-            String format)
-        {
-            if (this.isASN1FormatString(format))
-            {
-                return engineGetEncoded();
-            }
-
-            return null;
-        }
-
-        protected AlgorithmParameterSpec localEngineGetParameterSpec(
-            Class paramSpec)
-            throws InvalidParameterSpecException
-        {
-            if (paramSpec == PBEParameterSpec.class)
-            {
-                return new PBEParameterSpec(params.getSalt(),
-                                params.getIterationCount().intValue());
-            }
-
-            throw new InvalidParameterSpecException("unknown parameter spec passed to PBKDF2 PBE parameters object.");
-        }
-
-        protected void engineInit(
-            AlgorithmParameterSpec paramSpec)
-            throws InvalidParameterSpecException
-        {
-            if (!(paramSpec instanceof PBEParameterSpec))
-            {
-                throw new InvalidParameterSpecException("PBEParameterSpec required to initialise a PBKDF2 PBE parameters algorithm parameters object");
-            }
-
-            PBEParameterSpec    pbeSpec = (PBEParameterSpec)paramSpec;
-
-            this.params = new PBKDF2Params(pbeSpec.getSalt(),
-                                pbeSpec.getIterationCount());
-        }
-
-        protected void engineInit(
-            byte[] params)
-            throws IOException
-        {
-            this.params = PBKDF2Params.getInstance(ASN1Primitive.fromByteArray(params));
-        }
-
-        protected void engineInit(
-            byte[] params,
-            String format)
-            throws IOException
-        {
-            if (this.isASN1FormatString(format))
-            {
-                engineInit(params);
-                return;
-            }
-
-            throw new IOException("Unknown parameters format in PBKDF2 parameters object");
-        }
-
-        protected String engineToString()
-        {
-            return "PBKDF2 Parameters";
-        }
-    }
-
-    public static class BasePBKDF2
-        extends BaseSecretKeyFactory
-    {
-        private int scheme;
-
-        public BasePBKDF2(String name, int scheme)
-        {
-            super(name, PKCSObjectIdentifiers.id_PBKDF2);
-
-            this.scheme = scheme;
-        }
-
-        protected SecretKey engineGenerateSecret(
-            KeySpec keySpec)
-            throws InvalidKeySpecException
-        {
-            if (keySpec instanceof PBEKeySpec)
-            {
-                PBEKeySpec pbeSpec = (PBEKeySpec)keySpec;
-
-                if (pbeSpec.getSalt() == null)
-                {
-                    throw new InvalidKeySpecException("missing required salt");
-                }
-
-                if (pbeSpec.getIterationCount() <= 0)
-                {
-                    throw new InvalidKeySpecException("positive iteration count required: "
-                        + pbeSpec.getIterationCount());
-                }
-
-                if (pbeSpec.getKeyLength() <= 0)
-                {
-                    throw new InvalidKeySpecException("positive key length required: "
-                        + pbeSpec.getKeyLength());
-                }
-
-                if (pbeSpec.getPassword().length == 0)
-                {
-                    throw new IllegalArgumentException("password empty");
-                }
-
-                if (pbeSpec instanceof PBKDF2KeySpec)
-                {
-                    PBKDF2KeySpec spec = (PBKDF2KeySpec)pbeSpec;
-
-                    int digest = getDigestCode(spec.getPrf().getAlgorithm());
-                    int keySize = pbeSpec.getKeyLength();
-                    int ivSize = -1;    // JDK 1,2 and earlier does not understand simplified version.
-                    CipherParameters param = PBE.Util.makePBEMacParameters(pbeSpec, scheme, digest, keySize);
-
-                    return new BCPBEKey(this.algName, this.algOid, scheme, digest, keySize, ivSize, pbeSpec, param);
-                }
-                else
-                {
-                    int digest = SHA1;
-                    int keySize = pbeSpec.getKeyLength();
-                    int ivSize = -1;    // JDK 1,2 and earlier does not understand simplified version.
-                    CipherParameters param = PBE.Util.makePBEMacParameters(pbeSpec, scheme, digest, keySize);
-
-                    return new BCPBEKey(this.algName, this.algOid, scheme, digest, keySize, ivSize, pbeSpec, param);
-                }
-            }
-
-            throw new InvalidKeySpecException("Invalid KeySpec");
-        }
-
-
-        private int getDigestCode(ASN1ObjectIdentifier algorithm)
-            throws InvalidKeySpecException
-        {
-            if (algorithm.equals(CryptoProObjectIdentifiers.gostR3411Hmac))
-            {
-                return GOST3411;
-            }
-            else if (algorithm.equals(PKCSObjectIdentifiers.id_hmacWithSHA1))
-            {
-                return SHA1;
-            }
-
-            throw new InvalidKeySpecException("Invalid KeySpec: unknown PRF algorithm " + algorithm);
-        }
-    }
-
-    public static class PBKDF2withUTF8
-        extends BasePBKDF2
-    {
-        public PBKDF2withUTF8()
-        {
-            super("PBKDF2", PKCS5S2_UTF8);
-        }
-    }
-
-    public static class Mappings
-        extends AlgorithmProvider
-    {
-        private static final String PREFIX = PBEPBKDF2.class.getName();
-
-        public Mappings()
-        {
-        }
-
-        public void configure(ConfigurableProvider provider)
-        {
-            provider.addAlgorithm("AlgorithmParameters.PBKDF2", PREFIX + "$AlgParams");
-            provider.addAlgorithm("Alg.Alias.AlgorithmParameters." + PKCSObjectIdentifiers.id_PBKDF2, "PBKDF2");
-            provider.addAlgorithm("SecretKeyFactory.PBKDF2", PREFIX + "$PBKDF2withUTF8");
-            provider.addAlgorithm("Alg.Alias.SecretKeyFactory." + PKCSObjectIdentifiers.id_PBKDF2, "PBKDF2");
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/RC2.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/RC2.java
index 18d780d..4056aa7 100644
--- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/RC2.java
+++ b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/RC2.java
@@ -12,20 +12,28 @@ import javax.crypto.spec.RC2ParameterSpec;
 
 import org.bouncycastle.asn1.ASN1Primitive;
 import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.asn1.pkcs.RC2CBCParameter;
-import org.bouncycastle.crypto.CipherKeyGenerator;
+// BEGIN android-removed
+// import org.bouncycastle.asn1.pkcs.RC2CBCParameter;
+// import org.bouncycastle.crypto.CipherKeyGenerator;
+// END android-removed
 import org.bouncycastle.crypto.engines.RC2Engine;
-import org.bouncycastle.crypto.engines.RC2WrapEngine;
-import org.bouncycastle.crypto.macs.CBCBlockCipherMac;
-import org.bouncycastle.crypto.macs.CFBBlockCipherMac;
+// BEGIN android-removed
+// import org.bouncycastle.crypto.engines.RC2WrapEngine;
+// import org.bouncycastle.crypto.macs.CBCBlockCipherMac;
+// import org.bouncycastle.crypto.macs.CFBBlockCipherMac;
+// END android-removed
 import org.bouncycastle.crypto.modes.CBCBlockCipher;
 import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseAlgorithmParameterGenerator;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseAlgorithmParameters;
+// BEGIN android-removed
+// import org.bouncycastle.jcajce.provider.symmetric.util.BaseAlgorithmParameterGenerator;
+// import org.bouncycastle.jcajce.provider.symmetric.util.BaseAlgorithmParameters;
+// END android-removed
 import org.bouncycastle.jcajce.provider.symmetric.util.BaseBlockCipher;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseMac;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseWrapCipher;
+// BEGIN android-removed
+// import org.bouncycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
+// import org.bouncycastle.jcajce.provider.symmetric.util.BaseMac;
+// import org.bouncycastle.jcajce.provider.symmetric.util.BaseWrapCipher;
+// END android-removed
 import org.bouncycastle.jcajce.provider.symmetric.util.PBESecretKeyFactory;
 import org.bouncycastle.jcajce.provider.util.AlgorithmProvider;
 import org.bouncycastle.util.Arrays;
@@ -36,59 +44,61 @@ public final class RC2
     {
     }
 
-    /**
-     * RC2
-     */
-    static public class ECB
-        extends BaseBlockCipher
-    {
-        public ECB()
-        {
-            super(new RC2Engine());
-        }
-    }
-
-    /**
-     * RC2CBC
-     */
-    static public class CBC
-        extends BaseBlockCipher
-    {
-        public CBC()
-        {
-            super(new CBCBlockCipher(new RC2Engine()), 64);
-        }
-    }
-
-    public static class Wrap
-        extends BaseWrapCipher
-    {
-        public Wrap()
-        {
-            super(new RC2WrapEngine());
-        }
-    }
-
-    /**
-     * RC2
-     */
-    public static class CBCMAC
-        extends BaseMac
-    {
-        public CBCMAC()
-        {
-            super(new CBCBlockCipherMac(new RC2Engine()));
-        }
-    }
-
-    public static class CFB8MAC
-        extends BaseMac
-    {
-        public CFB8MAC()
-        {
-            super(new CFBBlockCipherMac(new RC2Engine()));
-        }
-    }
+    // BEGIN android-removed
+    // /**
+    //  * RC2
+    //  */
+    // static public class ECB
+    //     extends BaseBlockCipher
+    // {
+    //     public ECB()
+    //     {
+    //         super(new RC2Engine());
+    //     }
+    // }
+    //
+    // /**
+    //  * RC2CBC
+    //  */
+    // static public class CBC
+    //     extends BaseBlockCipher
+    // {
+    //     public CBC()
+    //     {
+    //         super(new CBCBlockCipher(new RC2Engine()), 64);
+    //     }
+    // }
+    //
+    // public static class Wrap
+    //     extends BaseWrapCipher
+    // {
+    //     public Wrap()
+    //     {
+    //         super(new RC2WrapEngine());
+    //     }
+    // }
+    //
+    // /**
+    //  * RC2
+    //  */
+    // public static class CBCMAC
+    //     extends BaseMac
+    // {
+    //     public CBCMAC()
+    //     {
+    //         super(new CBCBlockCipherMac(new RC2Engine()));
+    //     }
+    // }
+    //
+    // public static class CFB8MAC
+    //     extends BaseMac
+    // {
+    //     public CFB8MAC()
+    //     {
+    //         super(new CFBBlockCipherMac(new RC2Engine()));
+    //     }
+    // }
+    // END android-removed
 
     /**
      * PBEWithSHA1AndRC2
@@ -174,17 +184,19 @@ public final class RC2
         }
     }
 
-    /**
-     * PBEWithMD2AndRC2
-     */
-    static public class PBEWithMD2KeyFactory
-        extends PBESecretKeyFactory
-    {
-        public PBEWithMD2KeyFactory()
-        {
-            super("PBEwithMD2andRC2", PKCSObjectIdentifiers.pbeWithMD2AndRC2_CBC, true, PKCS5S1, MD2, 64, 64);
-        }
-    }
+    // BEGIN android-removed
+    // /**
+    //  * PBEWithMD2AndRC2
+    //  */
+    // static public class PBEWithMD2KeyFactory
+    //     extends PBESecretKeyFactory
+    // {
+    //     public PBEWithMD2KeyFactory()
+    //     {
+    //         super("PBEwithMD2andRC2", PKCSObjectIdentifiers.pbeWithMD2AndRC2_CBC, true, PKCS5S1, MD2, 64, 64);
+    //     }
+    // }
+    // END android-removed
 
    /**
     * PBEWithMD5AndRC2
@@ -198,247 +210,249 @@ public final class RC2
        }
    }
 
-    public static class AlgParamGen
-        extends BaseAlgorithmParameterGenerator
-    {
-        RC2ParameterSpec spec = null;
-
-        protected void engineInit(
-            AlgorithmParameterSpec genParamSpec,
-            SecureRandom random)
-            throws InvalidAlgorithmParameterException
-        {
-            if (genParamSpec instanceof RC2ParameterSpec)
-            {
-                spec = (RC2ParameterSpec)genParamSpec;
-                return;
-            }
-
-            throw new InvalidAlgorithmParameterException("No supported AlgorithmParameterSpec for RC2 parameter generation.");
-        }
-
-        protected AlgorithmParameters engineGenerateParameters()
-        {
-            AlgorithmParameters params;
-
-            if (spec == null)
-            {
-                byte[] iv = new byte[8];
-
-                if (random == null)
-                {
-                    random = new SecureRandom();
-                }
-
-                random.nextBytes(iv);
-
-                try
-                {
-                    params = createParametersInstance("RC2");
-                    params.init(new IvParameterSpec(iv));
-                }
-                catch (Exception e)
-                {
-                    throw new RuntimeException(e.getMessage());
-                }
-            }
-            else
-            {
-                try
-                {
-                    params = createParametersInstance("RC2");
-                    params.init(spec);
-                }
-                catch (Exception e)
-                {
-                    throw new RuntimeException(e.getMessage());
-                }
-            }
-
-            return params;
-        }
-    }
-
-    public static class KeyGenerator
-        extends BaseKeyGenerator
-    {
-        public KeyGenerator()
-        {
-            super("RC2", 128, new CipherKeyGenerator());
-        }
-    }
-
-    public static class AlgParams
-        extends BaseAlgorithmParameters
-    {
-        private static final short[] table = {
-            0xbd, 0x56, 0xea, 0xf2, 0xa2, 0xf1, 0xac, 0x2a, 0xb0, 0x93, 0xd1, 0x9c, 0x1b, 0x33, 0xfd, 0xd0,
-            0x30, 0x04, 0xb6, 0xdc, 0x7d, 0xdf, 0x32, 0x4b, 0xf7, 0xcb, 0x45, 0x9b, 0x31, 0xbb, 0x21, 0x5a,
-            0x41, 0x9f, 0xe1, 0xd9, 0x4a, 0x4d, 0x9e, 0xda, 0xa0, 0x68, 0x2c, 0xc3, 0x27, 0x5f, 0x80, 0x36,
-            0x3e, 0xee, 0xfb, 0x95, 0x1a, 0xfe, 0xce, 0xa8, 0x34, 0xa9, 0x13, 0xf0, 0xa6, 0x3f, 0xd8, 0x0c,
-            0x78, 0x24, 0xaf, 0x23, 0x52, 0xc1, 0x67, 0x17, 0xf5, 0x66, 0x90, 0xe7, 0xe8, 0x07, 0xb8, 0x60,
-            0x48, 0xe6, 0x1e, 0x53, 0xf3, 0x92, 0xa4, 0x72, 0x8c, 0x08, 0x15, 0x6e, 0x86, 0x00, 0x84, 0xfa,
-            0xf4, 0x7f, 0x8a, 0x42, 0x19, 0xf6, 0xdb, 0xcd, 0x14, 0x8d, 0x50, 0x12, 0xba, 0x3c, 0x06, 0x4e,
-            0xec, 0xb3, 0x35, 0x11, 0xa1, 0x88, 0x8e, 0x2b, 0x94, 0x99, 0xb7, 0x71, 0x74, 0xd3, 0xe4, 0xbf,
-            0x3a, 0xde, 0x96, 0x0e, 0xbc, 0x0a, 0xed, 0x77, 0xfc, 0x37, 0x6b, 0x03, 0x79, 0x89, 0x62, 0xc6,
-            0xd7, 0xc0, 0xd2, 0x7c, 0x6a, 0x8b, 0x22, 0xa3, 0x5b, 0x05, 0x5d, 0x02, 0x75, 0xd5, 0x61, 0xe3,
-            0x18, 0x8f, 0x55, 0x51, 0xad, 0x1f, 0x0b, 0x5e, 0x85, 0xe5, 0xc2, 0x57, 0x63, 0xca, 0x3d, 0x6c,
-            0xb4, 0xc5, 0xcc, 0x70, 0xb2, 0x91, 0x59, 0x0d, 0x47, 0x20, 0xc8, 0x4f, 0x58, 0xe0, 0x01, 0xe2,
-            0x16, 0x38, 0xc4, 0x6f, 0x3b, 0x0f, 0x65, 0x46, 0xbe, 0x7e, 0x2d, 0x7b, 0x82, 0xf9, 0x40, 0xb5,
-            0x1d, 0x73, 0xf8, 0xeb, 0x26, 0xc7, 0x87, 0x97, 0x25, 0x54, 0xb1, 0x28, 0xaa, 0x98, 0x9d, 0xa5,
-            0x64, 0x6d, 0x7a, 0xd4, 0x10, 0x81, 0x44, 0xef, 0x49, 0xd6, 0xae, 0x2e, 0xdd, 0x76, 0x5c, 0x2f,
-            0xa7, 0x1c, 0xc9, 0x09, 0x69, 0x9a, 0x83, 0xcf, 0x29, 0x39, 0xb9, 0xe9, 0x4c, 0xff, 0x43, 0xab
-        };
-
-        private static final short[] ekb = {
-            0x5d, 0xbe, 0x9b, 0x8b, 0x11, 0x99, 0x6e, 0x4d, 0x59, 0xf3, 0x85, 0xa6, 0x3f, 0xb7, 0x83, 0xc5,
-            0xe4, 0x73, 0x6b, 0x3a, 0x68, 0x5a, 0xc0, 0x47, 0xa0, 0x64, 0x34, 0x0c, 0xf1, 0xd0, 0x52, 0xa5,
-            0xb9, 0x1e, 0x96, 0x43, 0x41, 0xd8, 0xd4, 0x2c, 0xdb, 0xf8, 0x07, 0x77, 0x2a, 0xca, 0xeb, 0xef,
-            0x10, 0x1c, 0x16, 0x0d, 0x38, 0x72, 0x2f, 0x89, 0xc1, 0xf9, 0x80, 0xc4, 0x6d, 0xae, 0x30, 0x3d,
-            0xce, 0x20, 0x63, 0xfe, 0xe6, 0x1a, 0xc7, 0xb8, 0x50, 0xe8, 0x24, 0x17, 0xfc, 0x25, 0x6f, 0xbb,
-            0x6a, 0xa3, 0x44, 0x53, 0xd9, 0xa2, 0x01, 0xab, 0xbc, 0xb6, 0x1f, 0x98, 0xee, 0x9a, 0xa7, 0x2d,
-            0x4f, 0x9e, 0x8e, 0xac, 0xe0, 0xc6, 0x49, 0x46, 0x29, 0xf4, 0x94, 0x8a, 0xaf, 0xe1, 0x5b, 0xc3,
-            0xb3, 0x7b, 0x57, 0xd1, 0x7c, 0x9c, 0xed, 0x87, 0x40, 0x8c, 0xe2, 0xcb, 0x93, 0x14, 0xc9, 0x61,
-            0x2e, 0xe5, 0xcc, 0xf6, 0x5e, 0xa8, 0x5c, 0xd6, 0x75, 0x8d, 0x62, 0x95, 0x58, 0x69, 0x76, 0xa1,
-            0x4a, 0xb5, 0x55, 0x09, 0x78, 0x33, 0x82, 0xd7, 0xdd, 0x79, 0xf5, 0x1b, 0x0b, 0xde, 0x26, 0x21,
-            0x28, 0x74, 0x04, 0x97, 0x56, 0xdf, 0x3c, 0xf0, 0x37, 0x39, 0xdc, 0xff, 0x06, 0xa4, 0xea, 0x42,
-            0x08, 0xda, 0xb4, 0x71, 0xb0, 0xcf, 0x12, 0x7a, 0x4e, 0xfa, 0x6c, 0x1d, 0x84, 0x00, 0xc8, 0x7f,
-            0x91, 0x45, 0xaa, 0x2b, 0xc2, 0xb1, 0x8f, 0xd5, 0xba, 0xf2, 0xad, 0x19, 0xb2, 0x67, 0x36, 0xf7,
-            0x0f, 0x0a, 0x92, 0x7d, 0xe3, 0x9d, 0xe9, 0x90, 0x3e, 0x23, 0x27, 0x66, 0x13, 0xec, 0x81, 0x15,
-            0xbd, 0x22, 0xbf, 0x9f, 0x7e, 0xa9, 0x51, 0x4b, 0x4c, 0xfb, 0x02, 0xd3, 0x70, 0x86, 0x31, 0xe7,
-            0x3b, 0x05, 0x03, 0x54, 0x60, 0x48, 0x65, 0x18, 0xd2, 0xcd, 0x5f, 0x32, 0x88, 0x0e, 0x35, 0xfd
-        };
-
-        private byte[] iv;
-        private int parameterVersion = 58;
-
-        protected byte[] engineGetEncoded()
-        {
-            return Arrays.clone(iv);
-        }
-
-        protected byte[] engineGetEncoded(
-            String format)
-            throws IOException
-        {
-            if (this.isASN1FormatString(format))
-            {
-                if (parameterVersion == -1)
-                {
-                    return new RC2CBCParameter(engineGetEncoded()).getEncoded();
-                }
-                else
-                {
-                    return new RC2CBCParameter(parameterVersion, engineGetEncoded()).getEncoded();
-                }
-            }
-
-            if (format.equals("RAW"))
-            {
-                return engineGetEncoded();
-            }
-
-            return null;
-        }
-
-        protected AlgorithmParameterSpec localEngineGetParameterSpec(
-            Class paramSpec)
-            throws InvalidParameterSpecException
-        {
-            if (paramSpec == RC2ParameterSpec.class)
-            {
-                if (parameterVersion != -1)
-                {
-                    if (parameterVersion < 256)
-                    {
-                        return new RC2ParameterSpec(ekb[parameterVersion], iv);
-                    }
-                    else
-                    {
-                        return new RC2ParameterSpec(parameterVersion, iv);
-                    }
-                }
-            }
-
-            if (paramSpec == IvParameterSpec.class)
-            {
-                return new IvParameterSpec(iv);
-            }
-
-            throw new InvalidParameterSpecException("unknown parameter spec passed to RC2 parameters object.");
-        }
-
-        protected void engineInit(
-            AlgorithmParameterSpec paramSpec)
-            throws InvalidParameterSpecException
-        {
-            if (paramSpec instanceof IvParameterSpec)
-            {
-                this.iv = ((IvParameterSpec)paramSpec).getIV();
-            }
-            else if (paramSpec instanceof RC2ParameterSpec)
-            {
-                int effKeyBits = ((RC2ParameterSpec)paramSpec).getEffectiveKeyBits();
-                if (effKeyBits != -1)
-                {
-                    if (effKeyBits < 256)
-                    {
-                        parameterVersion = table[effKeyBits];
-                    }
-                    else
-                    {
-                        parameterVersion = effKeyBits;
-                    }
-                }
-
-                this.iv = ((RC2ParameterSpec)paramSpec).getIV();
-            }
-            else
-            {
-                throw new InvalidParameterSpecException("IvParameterSpec or RC2ParameterSpec required to initialise a RC2 parameters algorithm parameters object");
-            }
-        }
-
-        protected void engineInit(
-            byte[] params)
-            throws IOException
-        {
-            this.iv = Arrays.clone(params);
-        }
-
-        protected void engineInit(
-            byte[] params,
-            String format)
-            throws IOException
-        {
-            if (this.isASN1FormatString(format))
-            {
-                RC2CBCParameter p = RC2CBCParameter.getInstance(ASN1Primitive.fromByteArray(params));
-
-                if (p.getRC2ParameterVersion() != null)
-                {
-                    parameterVersion = p.getRC2ParameterVersion().intValue();
-                }
-
-                iv = p.getIV();
-
-                return;
-            }
-
-            if (format.equals("RAW"))
-            {
-                engineInit(params);
-                return;
-            }
-
-            throw new IOException("Unknown parameters format in IV parameters object");
-        }
-
-        protected String engineToString()
-        {
-            return "RC2 Parameters";
-        }
-    }
+    // BEGIN android-removed
+    // public static class AlgParamGen
+    //     extends BaseAlgorithmParameterGenerator
+    // {
+    //     RC2ParameterSpec spec = null;
+    // 
+    //     protected void engineInit(
+    //         AlgorithmParameterSpec genParamSpec,
+    //         SecureRandom random)
+    //         throws InvalidAlgorithmParameterException
+    //     {
+    //         if (genParamSpec instanceof RC2ParameterSpec)
+    //         {
+    //             spec = (RC2ParameterSpec)genParamSpec;
+    //             return;
+    //         }
+    // 
+    //         throw new InvalidAlgorithmParameterException("No supported AlgorithmParameterSpec for RC2 parameter generation.");
+    //     }
+    // 
+    //     protected AlgorithmParameters engineGenerateParameters()
+    //     {
+    //         AlgorithmParameters params;
+    // 
+    //         if (spec == null)
+    //         {
+    //             byte[] iv = new byte[8];
+    // 
+    //             if (random == null)
+    //             {
+    //                 random = new SecureRandom();
+    //             }
+    // 
+    //             random.nextBytes(iv);
+    // 
+    //             try
+    //             {
+    //                 params = createParametersInstance("RC2");
+    //                 params.init(new IvParameterSpec(iv));
+    //             }
+    //             catch (Exception e)
+    //             {
+    //                 throw new RuntimeException(e.getMessage());
+    //             }
+    //         }
+    //         else
+    //         {
+    //             try
+    //             {
+    //                 params = createParametersInstance("RC2");
+    //                 params.init(spec);
+    //             }
+    //             catch (Exception e)
+    //             {
+    //                 throw new RuntimeException(e.getMessage());
+    //             }
+    //         }
+    // 
+    //         return params;
+    //     }
+    // }
+    // 
+    // public static class KeyGenerator
+    //     extends BaseKeyGenerator
+    // {
+    //     public KeyGenerator()
+    //     {
+    //         super("RC2", 128, new CipherKeyGenerator());
+    //     }
+    // }
+    // 
+    // public static class AlgParams
+    //     extends BaseAlgorithmParameters
+    // {
+    //     private static final short[] table = {
+    //         0xbd, 0x56, 0xea, 0xf2, 0xa2, 0xf1, 0xac, 0x2a, 0xb0, 0x93, 0xd1, 0x9c, 0x1b, 0x33, 0xfd, 0xd0,
+    //         0x30, 0x04, 0xb6, 0xdc, 0x7d, 0xdf, 0x32, 0x4b, 0xf7, 0xcb, 0x45, 0x9b, 0x31, 0xbb, 0x21, 0x5a,
+    //         0x41, 0x9f, 0xe1, 0xd9, 0x4a, 0x4d, 0x9e, 0xda, 0xa0, 0x68, 0x2c, 0xc3, 0x27, 0x5f, 0x80, 0x36,
+    //         0x3e, 0xee, 0xfb, 0x95, 0x1a, 0xfe, 0xce, 0xa8, 0x34, 0xa9, 0x13, 0xf0, 0xa6, 0x3f, 0xd8, 0x0c,
+    //         0x78, 0x24, 0xaf, 0x23, 0x52, 0xc1, 0x67, 0x17, 0xf5, 0x66, 0x90, 0xe7, 0xe8, 0x07, 0xb8, 0x60,
+    //         0x48, 0xe6, 0x1e, 0x53, 0xf3, 0x92, 0xa4, 0x72, 0x8c, 0x08, 0x15, 0x6e, 0x86, 0x00, 0x84, 0xfa,
+    //         0xf4, 0x7f, 0x8a, 0x42, 0x19, 0xf6, 0xdb, 0xcd, 0x14, 0x8d, 0x50, 0x12, 0xba, 0x3c, 0x06, 0x4e,
+    //         0xec, 0xb3, 0x35, 0x11, 0xa1, 0x88, 0x8e, 0x2b, 0x94, 0x99, 0xb7, 0x71, 0x74, 0xd3, 0xe4, 0xbf,
+    //         0x3a, 0xde, 0x96, 0x0e, 0xbc, 0x0a, 0xed, 0x77, 0xfc, 0x37, 0x6b, 0x03, 0x79, 0x89, 0x62, 0xc6,
+    //         0xd7, 0xc0, 0xd2, 0x7c, 0x6a, 0x8b, 0x22, 0xa3, 0x5b, 0x05, 0x5d, 0x02, 0x75, 0xd5, 0x61, 0xe3,
+    //         0x18, 0x8f, 0x55, 0x51, 0xad, 0x1f, 0x0b, 0x5e, 0x85, 0xe5, 0xc2, 0x57, 0x63, 0xca, 0x3d, 0x6c,
+    //         0xb4, 0xc5, 0xcc, 0x70, 0xb2, 0x91, 0x59, 0x0d, 0x47, 0x20, 0xc8, 0x4f, 0x58, 0xe0, 0x01, 0xe2,
+    //         0x16, 0x38, 0xc4, 0x6f, 0x3b, 0x0f, 0x65, 0x46, 0xbe, 0x7e, 0x2d, 0x7b, 0x82, 0xf9, 0x40, 0xb5,
+    //         0x1d, 0x73, 0xf8, 0xeb, 0x26, 0xc7, 0x87, 0x97, 0x25, 0x54, 0xb1, 0x28, 0xaa, 0x98, 0x9d, 0xa5,
+    //         0x64, 0x6d, 0x7a, 0xd4, 0x10, 0x81, 0x44, 0xef, 0x49, 0xd6, 0xae, 0x2e, 0xdd, 0x76, 0x5c, 0x2f,
+    //         0xa7, 0x1c, 0xc9, 0x09, 0x69, 0x9a, 0x83, 0xcf, 0x29, 0x39, 0xb9, 0xe9, 0x4c, 0xff, 0x43, 0xab
+    //     };
+    // 
+    //     private static final short[] ekb = {
+    //         0x5d, 0xbe, 0x9b, 0x8b, 0x11, 0x99, 0x6e, 0x4d, 0x59, 0xf3, 0x85, 0xa6, 0x3f, 0xb7, 0x83, 0xc5,
+    //         0xe4, 0x73, 0x6b, 0x3a, 0x68, 0x5a, 0xc0, 0x47, 0xa0, 0x64, 0x34, 0x0c, 0xf1, 0xd0, 0x52, 0xa5,
+    //         0xb9, 0x1e, 0x96, 0x43, 0x41, 0xd8, 0xd4, 0x2c, 0xdb, 0xf8, 0x07, 0x77, 0x2a, 0xca, 0xeb, 0xef,
+    //         0x10, 0x1c, 0x16, 0x0d, 0x38, 0x72, 0x2f, 0x89, 0xc1, 0xf9, 0x80, 0xc4, 0x6d, 0xae, 0x30, 0x3d,
+    //         0xce, 0x20, 0x63, 0xfe, 0xe6, 0x1a, 0xc7, 0xb8, 0x50, 0xe8, 0x24, 0x17, 0xfc, 0x25, 0x6f, 0xbb,
+    //         0x6a, 0xa3, 0x44, 0x53, 0xd9, 0xa2, 0x01, 0xab, 0xbc, 0xb6, 0x1f, 0x98, 0xee, 0x9a, 0xa7, 0x2d,
+    //         0x4f, 0x9e, 0x8e, 0xac, 0xe0, 0xc6, 0x49, 0x46, 0x29, 0xf4, 0x94, 0x8a, 0xaf, 0xe1, 0x5b, 0xc3,
+    //         0xb3, 0x7b, 0x57, 0xd1, 0x7c, 0x9c, 0xed, 0x87, 0x40, 0x8c, 0xe2, 0xcb, 0x93, 0x14, 0xc9, 0x61,
+    //         0x2e, 0xe5, 0xcc, 0xf6, 0x5e, 0xa8, 0x5c, 0xd6, 0x75, 0x8d, 0x62, 0x95, 0x58, 0x69, 0x76, 0xa1,
+    //         0x4a, 0xb5, 0x55, 0x09, 0x78, 0x33, 0x82, 0xd7, 0xdd, 0x79, 0xf5, 0x1b, 0x0b, 0xde, 0x26, 0x21,
+    //         0x28, 0x74, 0x04, 0x97, 0x56, 0xdf, 0x3c, 0xf0, 0x37, 0x39, 0xdc, 0xff, 0x06, 0xa4, 0xea, 0x42,
+    //         0x08, 0xda, 0xb4, 0x71, 0xb0, 0xcf, 0x12, 0x7a, 0x4e, 0xfa, 0x6c, 0x1d, 0x84, 0x00, 0xc8, 0x7f,
+    //         0x91, 0x45, 0xaa, 0x2b, 0xc2, 0xb1, 0x8f, 0xd5, 0xba, 0xf2, 0xad, 0x19, 0xb2, 0x67, 0x36, 0xf7,
+    //         0x0f, 0x0a, 0x92, 0x7d, 0xe3, 0x9d, 0xe9, 0x90, 0x3e, 0x23, 0x27, 0x66, 0x13, 0xec, 0x81, 0x15,
+    //         0xbd, 0x22, 0xbf, 0x9f, 0x7e, 0xa9, 0x51, 0x4b, 0x4c, 0xfb, 0x02, 0xd3, 0x70, 0x86, 0x31, 0xe7,
+    //         0x3b, 0x05, 0x03, 0x54, 0x60, 0x48, 0x65, 0x18, 0xd2, 0xcd, 0x5f, 0x32, 0x88, 0x0e, 0x35, 0xfd
+    //     };
+    // 
+    //     private byte[] iv;
+    //     private int parameterVersion = 58;
+    // 
+    //     protected byte[] engineGetEncoded()
+    //     {
+    //         return Arrays.clone(iv);
+    //     }
+    // 
+    //     protected byte[] engineGetEncoded(
+    //         String format)
+    //         throws IOException
+    //     {
+    //         if (this.isASN1FormatString(format))
+    //         {
+    //             if (parameterVersion == -1)
+    //             {
+    //                 return new RC2CBCParameter(engineGetEncoded()).getEncoded();
+    //             }
+    //             else
+    //             {
+    //                 return new RC2CBCParameter(parameterVersion, engineGetEncoded()).getEncoded();
+    //             }
+    //         }
+    // 
+    //         if (format.equals("RAW"))
+    //         {
+    //             return engineGetEncoded();
+    //         }
+    // 
+    //         return null;
+    //     }
+    // 
+    //     protected AlgorithmParameterSpec localEngineGetParameterSpec(
+    //         Class paramSpec)
+    //         throws InvalidParameterSpecException
+    //     {
+    //         if (paramSpec == RC2ParameterSpec.class)
+    //         {
+    //             if (parameterVersion != -1)
+    //             {
+    //                 if (parameterVersion < 256)
+    //                 {
+    //                     return new RC2ParameterSpec(ekb[parameterVersion], iv);
+    //                 }
+    //                 else
+    //                 {
+    //                     return new RC2ParameterSpec(parameterVersion, iv);
+    //                 }
+    //             }
+    //         }
+    // 
+    //         if (paramSpec == IvParameterSpec.class)
+    //         {
+    //             return new IvParameterSpec(iv);
+    //         }
+    // 
+    //         throw new InvalidParameterSpecException("unknown parameter spec passed to RC2 parameters object.");
+    //     }
+    // 
+    //     protected void engineInit(
+    //         AlgorithmParameterSpec paramSpec)
+    //         throws InvalidParameterSpecException
+    //     {
+    //         if (paramSpec instanceof IvParameterSpec)
+    //         {
+    //             this.iv = ((IvParameterSpec)paramSpec).getIV();
+    //         }
+    //         else if (paramSpec instanceof RC2ParameterSpec)
+    //         {
+    //             int effKeyBits = ((RC2ParameterSpec)paramSpec).getEffectiveKeyBits();
+    //             if (effKeyBits != -1)
+    //             {
+    //                 if (effKeyBits < 256)
+    //                 {
+    //                     parameterVersion = table[effKeyBits];
+    //                 }
+    //                 else
+    //                 {
+    //                     parameterVersion = effKeyBits;
+    //                 }
+    //             }
+    // 
+    //             this.iv = ((RC2ParameterSpec)paramSpec).getIV();
+    //         }
+    //         else
+    //         {
+    //             throw new InvalidParameterSpecException("IvParameterSpec or RC2ParameterSpec required to initialise a RC2 parameters algorithm parameters object");
+    //         }
+    //     }
+    // 
+    //     protected void engineInit(
+    //         byte[] params)
+    //         throws IOException
+    //     {
+    //         this.iv = Arrays.clone(params);
+    //     }
+    // 
+    //     protected void engineInit(
+    //         byte[] params,
+    //         String format)
+    //         throws IOException
+    //     {
+    //         if (this.isASN1FormatString(format))
+    //         {
+    //             RC2CBCParameter p = RC2CBCParameter.getInstance(ASN1Primitive.fromByteArray(params));
+    // 
+    //             if (p.getRC2ParameterVersion() != null)
+    //             {
+    //                 parameterVersion = p.getRC2ParameterVersion().intValue();
+    //             }
+    // 
+    //             iv = p.getIV();
+    // 
+    //             return;
+    //         }
+    // 
+    //         if (format.equals("RAW"))
+    //         {
+    //             engineInit(params);
+    //             return;
+    //         }
+    // 
+    //         throw new IOException("Unknown parameters format in IV parameters object");
+    //     }
+    // 
+    //     protected String engineToString()
+    //     {
+    //         return "RC2 Parameters";
+    //     }
+    // }
+    // END android-removed
 
     public static class Mappings
         extends AlgorithmProvider
@@ -452,32 +466,36 @@ public final class RC2
         public void configure(ConfigurableProvider provider)
         {
 
-            provider.addAlgorithm("AlgorithmParameterGenerator.RC2", PREFIX + "$AlgParamGen");
-            provider.addAlgorithm("AlgorithmParameterGenerator.1.2.840.113549.3.2", PREFIX + "$AlgParamGen");
-
-            provider.addAlgorithm("KeyGenerator.RC2", PREFIX + "$KeyGenerator");
-            provider.addAlgorithm("KeyGenerator.1.2.840.113549.3.2", PREFIX + "$KeyGenerator");
-
-            provider.addAlgorithm("AlgorithmParameters.RC2", PREFIX + "$AlgParams");
-            provider.addAlgorithm("AlgorithmParameters.1.2.840.113549.3.2", PREFIX + "$AlgParams");
-
-            provider.addAlgorithm("Cipher.RC2", PREFIX + "$ECB");
-            provider.addAlgorithm("Cipher.RC2WRAP", PREFIX + "$Wrap");
-            provider.addAlgorithm("Alg.Alias.Cipher." + PKCSObjectIdentifiers.id_alg_CMSRC2wrap, "RC2WRAP");
-            provider.addAlgorithm("Cipher.1.2.840.113549.3.2", PREFIX + "$CBC");
-
-            provider.addAlgorithm("Mac.RC2MAC", PREFIX + "$CBCMAC");
-            provider.addAlgorithm("Alg.Alias.Mac.RC2", "RC2MAC");
-            provider.addAlgorithm("Mac.RC2MAC/CFB8", PREFIX + "$CFB8MAC");
-            provider.addAlgorithm("Alg.Alias.Mac.RC2/CFB8", "RC2MAC/CFB8");
-
-            provider.addAlgorithm("Alg.Alias.SecretKeyFactory.PBEWITHMD2ANDRC2-CBC", "PBEWITHMD2ANDRC2");
+            // BEGIN android-removed
+            // provider.addAlgorithm("AlgorithmParameterGenerator.RC2", PREFIX + "$AlgParamGen");
+            // provider.addAlgorithm("AlgorithmParameterGenerator.1.2.840.113549.3.2", PREFIX + "$AlgParamGen");
+            //
+            // provider.addAlgorithm("KeyGenerator.RC2", PREFIX + "$KeyGenerator");
+            // provider.addAlgorithm("KeyGenerator.1.2.840.113549.3.2", PREFIX + "$KeyGenerator");
+            //
+            // provider.addAlgorithm("AlgorithmParameters.RC2", PREFIX + "$AlgParams");
+            // provider.addAlgorithm("AlgorithmParameters.1.2.840.113549.3.2", PREFIX + "$AlgParams");
+            //
+            // provider.addAlgorithm("Cipher.RC2", PREFIX + "$ECB");
+            // provider.addAlgorithm("Cipher.RC2WRAP", PREFIX + "$Wrap");
+            // provider.addAlgorithm("Alg.Alias.Cipher." + PKCSObjectIdentifiers.id_alg_CMSRC2wrap, "RC2WRAP");
+            // provider.addAlgorithm("Cipher.1.2.840.113549.3.2", PREFIX + "$CBC");
+            //
+            // provider.addAlgorithm("Mac.RC2MAC", PREFIX + "$CBCMAC");
+            // provider.addAlgorithm("Alg.Alias.Mac.RC2", "RC2MAC");
+            // provider.addAlgorithm("Mac.RC2MAC/CFB8", PREFIX + "$CFB8MAC");
+            // provider.addAlgorithm("Alg.Alias.Mac.RC2/CFB8", "RC2MAC/CFB8");
+            //
+            // provider.addAlgorithm("Alg.Alias.SecretKeyFactory.PBEWITHMD2ANDRC2-CBC", "PBEWITHMD2ANDRC2");
+            // END android-removed
 
             provider.addAlgorithm("Alg.Alias.SecretKeyFactory.PBEWITHMD5ANDRC2-CBC", "PBEWITHMD5ANDRC2");
 
             provider.addAlgorithm("Alg.Alias.SecretKeyFactory.PBEWITHSHA1ANDRC2-CBC", "PBEWITHSHA1ANDRC2");
 
-            provider.addAlgorithm("Alg.Alias.SecretKeyFactory." + PKCSObjectIdentifiers.pbeWithMD2AndRC2_CBC, "PBEWITHMD2ANDRC2");
+            // BEGIN android-removed
+            // provider.addAlgorithm("Alg.Alias.SecretKeyFactory." + PKCSObjectIdentifiers.pbeWithMD2AndRC2_CBC, "PBEWITHMD2ANDRC2");
+            // END android-removed
 
             provider.addAlgorithm("Alg.Alias.SecretKeyFactory." + PKCSObjectIdentifiers.pbeWithMD5AndRC2_CBC, "PBEWITHMD5ANDRC2");
 
@@ -485,14 +503,18 @@ public final class RC2
             provider.addAlgorithm("Alg.Alias.SecretKeyFactory.1.2.840.113549.1.12.1.5", "PBEWITHSHAAND128BITRC2-CBC");
             provider.addAlgorithm("Alg.Alias.SecretKeyFactory.1.2.840.113549.1.12.1.6", "PBEWITHSHAAND40BITRC2-CBC");
 
-            provider.addAlgorithm("SecretKeyFactory.PBEWITHMD2ANDRC2", PREFIX + "$PBEWithMD2KeyFactory");
+            // BEGIN android-removed
+            // provider.addAlgorithm("SecretKeyFactory.PBEWITHMD2ANDRC2", PREFIX + "$PBEWithMD2KeyFactory");
+            // END android-removed
             provider.addAlgorithm("SecretKeyFactory.PBEWITHMD5ANDRC2", PREFIX + "$PBEWithMD5KeyFactory");
             provider.addAlgorithm("SecretKeyFactory.PBEWITHSHA1ANDRC2", PREFIX + "$PBEWithSHA1KeyFactory");
 
             provider.addAlgorithm("SecretKeyFactory.PBEWITHSHAAND128BITRC2-CBC", PREFIX + "$PBEWithSHAAnd128BitKeyFactory");
             provider.addAlgorithm("SecretKeyFactory.PBEWITHSHAAND40BITRC2-CBC", PREFIX + "$PBEWithSHAAnd40BitKeyFactory");
             
-            provider.addAlgorithm("Alg.Alias.Cipher." + PKCSObjectIdentifiers.pbeWithMD2AndRC2_CBC, "PBEWITHMD2ANDRC2");
+            // BEGIN android-removed
+            // provider.addAlgorithm("Alg.Alias.Cipher." + PKCSObjectIdentifiers.pbeWithMD2AndRC2_CBC, "PBEWITHMD2ANDRC2");
+            // END android-removed
 
             provider.addAlgorithm("Alg.Alias.Cipher." + PKCSObjectIdentifiers.pbeWithMD5AndRC2_CBC, "PBEWITHMD5ANDRC2");
 
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/RC5.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/RC5.java
deleted file mode 100644
index 2f1d83a..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/RC5.java
+++ /dev/null
@@ -1,177 +0,0 @@
-package org.bouncycastle.jcajce.provider.symmetric;
-
-import java.security.AlgorithmParameters;
-import java.security.InvalidAlgorithmParameterException;
-import java.security.SecureRandom;
-import java.security.spec.AlgorithmParameterSpec;
-
-import javax.crypto.spec.IvParameterSpec;
-
-import org.bouncycastle.crypto.CipherKeyGenerator;
-import org.bouncycastle.crypto.engines.RC532Engine;
-import org.bouncycastle.crypto.engines.RC564Engine;
-import org.bouncycastle.crypto.macs.CBCBlockCipherMac;
-import org.bouncycastle.crypto.macs.CFBBlockCipherMac;
-import org.bouncycastle.crypto.modes.CBCBlockCipher;
-import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseAlgorithmParameterGenerator;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseBlockCipher;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseMac;
-import org.bouncycastle.jcajce.provider.symmetric.util.IvAlgorithmParameters;
-import org.bouncycastle.jcajce.provider.util.AlgorithmProvider;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-
-public final class RC5
-{
-    private RC5()
-    {
-    }
-
-    /**
-     * RC5
-     */
-    public static class ECB32
-        extends BaseBlockCipher
-    {
-        public ECB32()
-        {
-            super(new RC532Engine());
-        }
-    }
-
-    /**
-     * RC564
-     */
-    public static class ECB64
-        extends BaseBlockCipher
-    {
-        public ECB64()
-        {
-            super(new RC564Engine());
-        }
-    }
-
-    public static class CBC32
-       extends BaseBlockCipher
-    {
-        public CBC32()
-        {
-            super(new CBCBlockCipher(new RC532Engine()), 64);
-        }
-    }
-
-    public static class KeyGen32
-        extends BaseKeyGenerator
-    {
-        public KeyGen32()
-        {
-            super("RC5", 128, new CipherKeyGenerator());
-        }
-    }
-
-    /**
-     * RC5
-     */
-    public static class KeyGen64
-        extends BaseKeyGenerator
-    {
-        public KeyGen64()
-        {
-            super("RC5-64", 256, new CipherKeyGenerator());
-        }
-    }
-
-    public static class AlgParamGen
-        extends BaseAlgorithmParameterGenerator
-    {
-        protected void engineInit(
-            AlgorithmParameterSpec genParamSpec,
-            SecureRandom random)
-            throws InvalidAlgorithmParameterException
-        {
-            throw new InvalidAlgorithmParameterException("No supported AlgorithmParameterSpec for RC5 parameter generation.");
-        }
-
-        protected AlgorithmParameters engineGenerateParameters()
-        {
-            byte[] iv = new byte[8];
-
-            if (random == null)
-            {
-                random = new SecureRandom();
-            }
-
-            random.nextBytes(iv);
-
-            AlgorithmParameters params;
-
-            try
-            {
-                params = createParametersInstance("RC5");
-                params.init(new IvParameterSpec(iv));
-            }
-            catch (Exception e)
-            {
-                throw new RuntimeException(e.getMessage());
-            }
-
-            return params;
-        }
-    }
-
-    public static class Mac32
-        extends BaseMac
-    {
-        public Mac32()
-        {
-            super(new CBCBlockCipherMac(new RC532Engine()));
-        }
-    }
-
-    public static class CFB8Mac32
-        extends BaseMac
-    {
-        public CFB8Mac32()
-        {
-            super(new CFBBlockCipherMac(new RC532Engine()));
-        }
-    }
-
-    public static class AlgParams
-        extends IvAlgorithmParameters
-    {
-        protected String engineToString()
-        {
-            return "RC5 IV";
-        }
-    }
-
-    public static class Mappings
-        extends AlgorithmProvider
-    {
-        private static final String PREFIX = RC5.class.getName();
-
-        public Mappings()
-        {
-        }
-
-        public void configure(ConfigurableProvider provider)
-        {
-
-            provider.addAlgorithm("Cipher.RC5", PREFIX + "$ECB32");
-            provider.addAlgorithm("Alg.Alias.Cipher.RC5-32", "RC5");
-            provider.addAlgorithm("Cipher.RC5-64", PREFIX + "$ECB64");
-            provider.addAlgorithm("KeyGenerator.RC5", PREFIX + "$KeyGen32");
-            provider.addAlgorithm("Alg.Alias.KeyGenerator.RC5-32", "RC5");
-            provider.addAlgorithm("KeyGenerator.RC5-64", PREFIX + "$KeyGen64");
-            provider.addAlgorithm("AlgorithmParameters.RC5", PREFIX + "$AlgParams");
-            provider.addAlgorithm("AlgorithmParameters.RC5-64", PREFIX + "$AlgParams");
-            provider.addAlgorithm("Mac.RC5MAC", PREFIX + "$Mac32");
-            provider.addAlgorithm("Alg.Alias.Mac.RC5", "RC5MAC");
-            provider.addAlgorithm("Mac.RC5MAC/CFB8", PREFIX + "$CFB8Mac32");
-            provider.addAlgorithm("Alg.Alias.Mac.RC5/CFB8", "RC5MAC/CFB8");
-
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/RC6.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/RC6.java
deleted file mode 100644
index 674ea48..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/RC6.java
+++ /dev/null
@@ -1,180 +0,0 @@
-package org.bouncycastle.jcajce.provider.symmetric;
-
-import java.security.AlgorithmParameters;
-import java.security.InvalidAlgorithmParameterException;
-import java.security.SecureRandom;
-import java.security.spec.AlgorithmParameterSpec;
-
-import javax.crypto.spec.IvParameterSpec;
-
-import org.bouncycastle.crypto.BlockCipher;
-import org.bouncycastle.crypto.BufferedBlockCipher;
-import org.bouncycastle.crypto.CipherKeyGenerator;
-import org.bouncycastle.crypto.engines.RC6Engine;
-import org.bouncycastle.crypto.generators.Poly1305KeyGenerator;
-import org.bouncycastle.crypto.macs.GMac;
-import org.bouncycastle.crypto.modes.CBCBlockCipher;
-import org.bouncycastle.crypto.modes.CFBBlockCipher;
-import org.bouncycastle.crypto.modes.GCMBlockCipher;
-import org.bouncycastle.crypto.modes.OFBBlockCipher;
-import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseAlgorithmParameterGenerator;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseBlockCipher;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseMac;
-import org.bouncycastle.jcajce.provider.symmetric.util.BlockCipherProvider;
-import org.bouncycastle.jcajce.provider.symmetric.util.IvAlgorithmParameters;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-
-public final class RC6
-{
-    private RC6()
-    {
-    }
-    
-    public static class ECB
-        extends BaseBlockCipher
-    {
-        public ECB()
-        {
-            super(new BlockCipherProvider()
-            {
-                public BlockCipher get()
-                {
-                    return new RC6Engine();
-                }
-            });
-        }
-    }
-
-    public static class CBC
-       extends BaseBlockCipher
-    {
-        public CBC()
-        {
-            super(new CBCBlockCipher(new RC6Engine()), 128);
-        }
-    }
-
-    static public class CFB
-        extends BaseBlockCipher
-    {
-        public CFB()
-        {
-            super(new BufferedBlockCipher(new CFBBlockCipher(new RC6Engine(), 128)), 128);
-        }
-    }
-
-    static public class OFB
-        extends BaseBlockCipher
-    {
-        public OFB()
-        {
-            super(new BufferedBlockCipher(new OFBBlockCipher(new RC6Engine(), 128)), 128);
-        }
-    }
-
-    public static class GMAC
-        extends BaseMac
-    {
-        public GMAC()
-        {
-            super(new GMac(new GCMBlockCipher(new RC6Engine())));
-        }
-    }
-
-    public static class Poly1305
-        extends BaseMac
-    {
-        public Poly1305()
-        {
-            super(new org.bouncycastle.crypto.macs.Poly1305(new RC6Engine()));
-        }
-    }
-
-    public static class Poly1305KeyGen
-        extends BaseKeyGenerator
-    {
-        public Poly1305KeyGen()
-        {
-            super("Poly1305-RC6", 256, new Poly1305KeyGenerator());
-        }
-    }
-
-    public static class KeyGen
-        extends BaseKeyGenerator
-    {
-        public KeyGen()
-        {
-            super("RC6", 256, new CipherKeyGenerator());
-        }
-    }
-
-    public static class AlgParamGen
-        extends BaseAlgorithmParameterGenerator
-    {
-        protected void engineInit(
-            AlgorithmParameterSpec genParamSpec,
-            SecureRandom random)
-            throws InvalidAlgorithmParameterException
-        {
-            throw new InvalidAlgorithmParameterException("No supported AlgorithmParameterSpec for RC6 parameter generation.");
-        }
-
-        protected AlgorithmParameters engineGenerateParameters()
-        {
-            byte[]  iv = new byte[16];
-
-            if (random == null)
-            {
-                random = new SecureRandom();
-            }
-
-            random.nextBytes(iv);
-
-            AlgorithmParameters params;
-
-            try
-            {
-                params = createParametersInstance("RC6");
-                params.init(new IvParameterSpec(iv));
-            }
-            catch (Exception e)
-            {
-                throw new RuntimeException(e.getMessage());
-            }
-
-            return params;
-        }
-    }
-
-    public static class AlgParams
-        extends IvAlgorithmParameters
-    {
-        protected String engineToString()
-        {
-            return "RC6 IV";
-        }
-    }
-
-    public static class Mappings
-        extends SymmetricAlgorithmProvider
-    {
-        private static final String PREFIX = RC6.class.getName();
-
-        public Mappings()
-        {
-        }
-
-        public void configure(ConfigurableProvider provider)
-        {
-
-            provider.addAlgorithm("Cipher.RC6", PREFIX + "$ECB");
-            provider.addAlgorithm("KeyGenerator.RC6", PREFIX + "$KeyGen");
-            provider.addAlgorithm("AlgorithmParameters.RC6", PREFIX + "$AlgParams");
-
-            addGMacAlgorithm(provider, "RC6", PREFIX + "$GMAC", PREFIX + "$KeyGen");
-            addPoly1305Algorithm(provider, "RC6", PREFIX + "$Poly1305", PREFIX + "$Poly1305KeyGen");
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/Rijndael.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/Rijndael.java
deleted file mode 100644
index b8c36b7..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/Rijndael.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package org.bouncycastle.jcajce.provider.symmetric;
-
-import org.bouncycastle.crypto.BlockCipher;
-import org.bouncycastle.crypto.CipherKeyGenerator;
-import org.bouncycastle.crypto.engines.RijndaelEngine;
-import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseBlockCipher;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
-import org.bouncycastle.jcajce.provider.symmetric.util.BlockCipherProvider;
-import org.bouncycastle.jcajce.provider.symmetric.util.IvAlgorithmParameters;
-import org.bouncycastle.jcajce.provider.util.AlgorithmProvider;
-
-public final class Rijndael
-{
-    private Rijndael()
-    {
-    }
-    
-    public static class ECB
-        extends BaseBlockCipher
-    {
-        public ECB()
-        {
-            super(new BlockCipherProvider()
-            {
-                public BlockCipher get()
-                {
-                    return new RijndaelEngine();
-                }
-            });
-        }
-    }
-
-    public static class KeyGen
-        extends BaseKeyGenerator
-    {
-        public KeyGen()
-        {
-            super("Rijndael", 192, new CipherKeyGenerator());
-        }
-    }
-
-    public static class AlgParams
-        extends IvAlgorithmParameters
-    {
-        protected String engineToString()
-        {
-            return "Rijndael IV";
-        }
-    }
-
-    public static class Mappings
-        extends AlgorithmProvider
-    {
-        private static final String PREFIX = Rijndael.class.getName();
-
-        public Mappings()
-        {
-        }
-
-        public void configure(ConfigurableProvider provider)
-        {
-
-            provider.addAlgorithm("Cipher.RIJNDAEL", PREFIX + "$ECB");
-            provider.addAlgorithm("KeyGenerator.RIJNDAEL", PREFIX + "$KeyGen");
-            provider.addAlgorithm("AlgorithmParameters.RIJNDAEL", PREFIX + "$AlgParams");
-
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/SEED.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/SEED.java
deleted file mode 100644
index 510d92e..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/SEED.java
+++ /dev/null
@@ -1,182 +0,0 @@
-package org.bouncycastle.jcajce.provider.symmetric;
-
-import java.security.AlgorithmParameters;
-import java.security.InvalidAlgorithmParameterException;
-import java.security.SecureRandom;
-import java.security.spec.AlgorithmParameterSpec;
-
-import javax.crypto.spec.IvParameterSpec;
-
-import org.bouncycastle.asn1.kisa.KISAObjectIdentifiers;
-import org.bouncycastle.crypto.BlockCipher;
-import org.bouncycastle.crypto.CipherKeyGenerator;
-import org.bouncycastle.crypto.engines.SEEDEngine;
-import org.bouncycastle.crypto.engines.SEEDWrapEngine;
-import org.bouncycastle.crypto.generators.Poly1305KeyGenerator;
-import org.bouncycastle.crypto.macs.GMac;
-import org.bouncycastle.crypto.modes.CBCBlockCipher;
-import org.bouncycastle.crypto.modes.GCMBlockCipher;
-import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseAlgorithmParameterGenerator;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseBlockCipher;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseMac;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseWrapCipher;
-import org.bouncycastle.jcajce.provider.symmetric.util.BlockCipherProvider;
-import org.bouncycastle.jcajce.provider.symmetric.util.IvAlgorithmParameters;
-
-public final class SEED
-{
-    private SEED()
-    {
-    }
-    
-    public static class ECB
-        extends BaseBlockCipher
-    {
-        public ECB()
-        {
-            super(new BlockCipherProvider()
-            {
-                public BlockCipher get()
-                {
-                    return new SEEDEngine();
-                }
-            });
-        }
-    }
-
-    public static class CBC
-       extends BaseBlockCipher
-    {
-        public CBC()
-        {
-            super(new CBCBlockCipher(new SEEDEngine()), 128);
-        }
-    }
-
-    public static class Wrap
-        extends BaseWrapCipher
-    {
-        public Wrap()
-        {
-            super(new SEEDWrapEngine());
-        }
-    }
-
-    public static class KeyGen
-        extends BaseKeyGenerator
-    {
-        public KeyGen()
-        {
-            super("SEED", 128, new CipherKeyGenerator());
-        }
-    }
-
-    public static class GMAC
-        extends BaseMac
-    {
-        public GMAC()
-        {
-            super(new GMac(new GCMBlockCipher(new SEEDEngine())));
-        }
-    }
-
-    public static class Poly1305
-        extends BaseMac
-    {
-        public Poly1305()
-        {
-            super(new org.bouncycastle.crypto.macs.Poly1305(new SEEDEngine()));
-        }
-    }
-
-    public static class Poly1305KeyGen
-        extends BaseKeyGenerator
-    {
-        public Poly1305KeyGen()
-        {
-            super("Poly1305-SEED", 256, new Poly1305KeyGenerator());
-        }
-    }
-
-    public static class AlgParamGen
-        extends BaseAlgorithmParameterGenerator
-    {
-        protected void engineInit(
-            AlgorithmParameterSpec genParamSpec,
-            SecureRandom random)
-            throws InvalidAlgorithmParameterException
-        {
-            throw new InvalidAlgorithmParameterException("No supported AlgorithmParameterSpec for SEED parameter generation.");
-        }
-
-        protected AlgorithmParameters engineGenerateParameters()
-        {
-            byte[] iv = new byte[16];
-
-            if (random == null)
-            {
-                random = new SecureRandom();
-            }
-
-            random.nextBytes(iv);
-
-            AlgorithmParameters params;
-
-            try
-            {
-                params = createParametersInstance("SEED");
-                params.init(new IvParameterSpec(iv));
-            }
-            catch (Exception e)
-            {
-                throw new RuntimeException(e.getMessage());
-            }
-
-            return params;
-        }
-    }
-
-    public static class AlgParams
-        extends IvAlgorithmParameters
-    {
-        protected String engineToString()
-        {
-            return "SEED IV";
-        }
-    }
-
-    public static class Mappings
-        extends SymmetricAlgorithmProvider
-    {
-        private static final String PREFIX = SEED.class.getName();
-
-        public Mappings()
-        {
-        }
-
-        public void configure(ConfigurableProvider provider)
-        {
-
-            provider.addAlgorithm("AlgorithmParameters.SEED", PREFIX + "$AlgParams");
-            provider.addAlgorithm("Alg.Alias.AlgorithmParameters." + KISAObjectIdentifiers.id_seedCBC, "SEED");
-
-            provider.addAlgorithm("AlgorithmParameterGenerator.SEED", PREFIX + "$AlgParamGen");
-            provider.addAlgorithm("Alg.Alias.AlgorithmParameterGenerator." + KISAObjectIdentifiers.id_seedCBC, "SEED");
-
-            provider.addAlgorithm("Cipher.SEED", PREFIX + "$ECB");
-            provider.addAlgorithm("Cipher." + KISAObjectIdentifiers.id_seedCBC, PREFIX + "$CBC");
-
-            provider.addAlgorithm("Cipher.SEEDWRAP", PREFIX + "$Wrap");
-            provider.addAlgorithm("Alg.Alias.Cipher." + KISAObjectIdentifiers.id_npki_app_cmsSeed_wrap, "SEEDWRAP");
-
-            provider.addAlgorithm("KeyGenerator.SEED", PREFIX + "$KeyGen");
-            provider.addAlgorithm("KeyGenerator." + KISAObjectIdentifiers.id_seedCBC, PREFIX + "$KeyGen");
-            provider.addAlgorithm("KeyGenerator." + KISAObjectIdentifiers.id_npki_app_cmsSeed_wrap, PREFIX + "$KeyGen");
-
-            addGMacAlgorithm(provider, "SEED", PREFIX + "$GMAC", PREFIX + "$KeyGen");
-            addPoly1305Algorithm(provider, "SEED", PREFIX + "$Poly1305", PREFIX + "$Poly1305KeyGen");
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/Salsa20.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/Salsa20.java
deleted file mode 100644
index 88b27a6..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/Salsa20.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package org.bouncycastle.jcajce.provider.symmetric;
-
-import org.bouncycastle.crypto.CipherKeyGenerator;
-import org.bouncycastle.crypto.engines.Salsa20Engine;
-import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseStreamCipher;
-import org.bouncycastle.jcajce.provider.util.AlgorithmProvider;
-
-public final class Salsa20
-{
-    private Salsa20()
-    {
-    }
-    
-    public static class Base
-        extends BaseStreamCipher
-    {
-        public Base()
-        {
-            super(new Salsa20Engine(), 8);
-        }
-    }
-
-    public static class KeyGen
-        extends BaseKeyGenerator
-    {
-        public KeyGen()
-        {
-            super("Salsa20", 128, new CipherKeyGenerator());
-        }
-    }
-
-    public static class Mappings
-        extends AlgorithmProvider
-    {
-        private static final String PREFIX = Salsa20.class.getName();
-
-        public Mappings()
-        {
-        }
-
-        public void configure(ConfigurableProvider provider)
-        {
-
-            provider.addAlgorithm("Cipher.SALSA20", PREFIX + "$Base");
-            provider.addAlgorithm("KeyGenerator.SALSA20", PREFIX + "$KeyGen");
-
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/Serpent.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/Serpent.java
deleted file mode 100644
index ec21880..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/Serpent.java
+++ /dev/null
@@ -1,103 +0,0 @@
-package org.bouncycastle.jcajce.provider.symmetric;
-
-import org.bouncycastle.crypto.BlockCipher;
-import org.bouncycastle.crypto.CipherKeyGenerator;
-import org.bouncycastle.crypto.engines.SerpentEngine;
-import org.bouncycastle.crypto.engines.TwofishEngine;
-import org.bouncycastle.crypto.generators.Poly1305KeyGenerator;
-import org.bouncycastle.crypto.macs.GMac;
-import org.bouncycastle.crypto.modes.GCMBlockCipher;
-import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseBlockCipher;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseMac;
-import org.bouncycastle.jcajce.provider.symmetric.util.BlockCipherProvider;
-import org.bouncycastle.jcajce.provider.symmetric.util.IvAlgorithmParameters;
-
-public final class Serpent
-{
-    private Serpent()
-    {
-    }
-    
-    public static class ECB
-        extends BaseBlockCipher
-    {
-        public ECB()
-        {
-            super(new BlockCipherProvider()
-            {
-                public BlockCipher get()
-                {
-                    return new SerpentEngine();
-                }
-            });
-        }
-    }
-
-    public static class KeyGen
-        extends BaseKeyGenerator
-    {
-        public KeyGen()
-        {
-            super("Serpent", 192, new CipherKeyGenerator());
-        }
-    }
-
-    public static class SerpentGMAC
-        extends BaseMac
-    {
-        public SerpentGMAC()
-        {
-            super(new GMac(new GCMBlockCipher(new SerpentEngine())));
-        }
-    }
-
-    public static class Poly1305
-        extends BaseMac
-    {
-        public Poly1305()
-        {
-            super(new org.bouncycastle.crypto.macs.Poly1305(new TwofishEngine()));
-        }
-    }
-
-    public static class Poly1305KeyGen
-        extends BaseKeyGenerator
-    {
-        public Poly1305KeyGen()
-        {
-            super("Poly1305-Serpent", 256, new Poly1305KeyGenerator());
-        }
-    }
-
-    public static class AlgParams
-        extends IvAlgorithmParameters
-    {
-        protected String engineToString()
-        {
-            return "Serpent IV";
-        }
-    }
-
-    public static class Mappings
-        extends SymmetricAlgorithmProvider
-    {
-        private static final String PREFIX = Serpent.class.getName();
-
-        public Mappings()
-        {
-        }
-
-        public void configure(ConfigurableProvider provider)
-        {
-
-            provider.addAlgorithm("Cipher.Serpent", PREFIX + "$ECB");
-            provider.addAlgorithm("KeyGenerator.Serpent", PREFIX + "$KeyGen");
-            provider.addAlgorithm("AlgorithmParameters.Serpent", PREFIX + "$AlgParams");
-
-            addGMacAlgorithm(provider, "SERPENT", PREFIX + "$SerpentGMAC", PREFIX + "$KeyGen");
-            addPoly1305Algorithm(provider, "SERPENT", PREFIX + "$Poly1305", PREFIX + "$Poly1305KeyGen");
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/Shacal2.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/Shacal2.java
deleted file mode 100644
index ea4ccda..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/Shacal2.java
+++ /dev/null
@@ -1,123 +0,0 @@
-package org.bouncycastle.jcajce.provider.symmetric;
-
-import java.security.AlgorithmParameters;
-import java.security.InvalidAlgorithmParameterException;
-import java.security.SecureRandom;
-import java.security.spec.AlgorithmParameterSpec;
-
-import javax.crypto.spec.IvParameterSpec;
-
-import org.bouncycastle.crypto.BlockCipher;
-import org.bouncycastle.crypto.CipherKeyGenerator;
-import org.bouncycastle.crypto.engines.Shacal2Engine;
-import org.bouncycastle.crypto.modes.CBCBlockCipher;
-import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseAlgorithmParameterGenerator;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseBlockCipher;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
-import org.bouncycastle.jcajce.provider.symmetric.util.BlockCipherProvider;
-import org.bouncycastle.jcajce.provider.symmetric.util.IvAlgorithmParameters;
-
-public final class Shacal2
-{
-    private Shacal2()
-    {
-    }
-    
-    public static class ECB
-        extends BaseBlockCipher
-    {
-        public ECB()
-        {
-            super(new BlockCipherProvider()
-            {
-                public BlockCipher get()
-                {
-                    return new Shacal2Engine();
-                }
-            });
-        }
-    }
-
-    public static class CBC
-       extends BaseBlockCipher
-    {
-        public CBC()
-        {
-            super(new CBCBlockCipher(new Shacal2Engine()), 256);//block size
-        }
-    }
-
-    public static class KeyGen
-        extends BaseKeyGenerator
-    {
-        public KeyGen()
-        {
-            super("Shacal2", 512, new CipherKeyGenerator());//key size
-        }
-    }
-
-    public static class AlgParamGen
-        extends BaseAlgorithmParameterGenerator
-    {
-        protected void engineInit(
-            AlgorithmParameterSpec genParamSpec,
-            SecureRandom random)
-            throws InvalidAlgorithmParameterException
-        {
-            throw new InvalidAlgorithmParameterException("No supported AlgorithmParameterSpec for Shacal2 parameter generation.");
-        }
-
-        protected AlgorithmParameters engineGenerateParameters()
-        {
-            byte[] iv = new byte[32];// block size 256
-
-            if (random == null)
-            {
-                random = new SecureRandom();
-            }
-
-            random.nextBytes(iv);
-
-            AlgorithmParameters params;
-
-            try
-            {
-                params = createParametersInstance("Shacal2");
-                params.init(new IvParameterSpec(iv));
-            }
-            catch (Exception e)
-            {
-                throw new RuntimeException(e.getMessage());
-            }
-            return params;
-        }
-    }
-
-    public static class AlgParams
-        extends IvAlgorithmParameters
-    {
-        protected String engineToString()
-        {
-            return "Shacal2 IV";
-        }
-    }
-
-    public static class Mappings
-        extends SymmetricAlgorithmProvider
-    {
-        private static final String PREFIX = Shacal2.class.getName();
-
-        public Mappings()
-        {
-        }
-
-        public void configure(ConfigurableProvider provider)
-        {
-            provider.addAlgorithm("Cipher.Shacal2", PREFIX + "$ECB");
-            provider.addAlgorithm("KeyGenerator.Shacal2", PREFIX + "$KeyGen");        
-            provider.addAlgorithm("AlgorithmParameterGenerator.Shacal2", PREFIX + "$AlgParamGen");
-        	provider.addAlgorithm("AlgorithmParameters.Shacal2", PREFIX + "$AlgParams");
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/SipHash.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/SipHash.java
deleted file mode 100644
index 5a11531..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/SipHash.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package org.bouncycastle.jcajce.provider.symmetric;
-
-import org.bouncycastle.crypto.CipherKeyGenerator;
-import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseMac;
-import org.bouncycastle.jcajce.provider.util.AlgorithmProvider;
-
-public final class SipHash
-{
-    private SipHash()
-    {
-    }
-
-    public static class Mac24
-        extends BaseMac
-    {
-        public Mac24()
-        {
-            super(new org.bouncycastle.crypto.macs.SipHash());
-        }
-    }
-
-    public static class Mac48
-        extends BaseMac
-    {
-        public Mac48()
-        {
-            super(new org.bouncycastle.crypto.macs.SipHash(4, 8));
-        }
-    }
-
-    public static class KeyGen
-        extends BaseKeyGenerator
-    {
-        public KeyGen()
-        {
-            super("SipHash", 128, new CipherKeyGenerator());
-        }
-    }
-
-    public static class Mappings
-        extends AlgorithmProvider
-    {
-        private static final String PREFIX = SipHash.class.getName();
-
-        public Mappings()
-        {
-        }
-
-        public void configure(ConfigurableProvider provider)
-        {
-            provider.addAlgorithm("Mac.SIPHASH-2-4", PREFIX + "$Mac24");
-            provider.addAlgorithm("Alg.Alias.Mac.SIPHASH", "SIPHASH-2-4");
-            provider.addAlgorithm("Mac.SIPHASH-4-8", PREFIX + "$Mac48");
-
-            provider.addAlgorithm("KeyGenerator.SIPHASH", PREFIX + "$KeyGen");
-            provider.addAlgorithm("Alg.Alias.KeyGenerator.SIPHASH-2-4", "SIPHASH");
-            provider.addAlgorithm("Alg.Alias.KeyGenerator.SIPHASH-4-8", "SIPHASH");
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/Skipjack.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/Skipjack.java
deleted file mode 100644
index ec75944..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/Skipjack.java
+++ /dev/null
@@ -1,87 +0,0 @@
-package org.bouncycastle.jcajce.provider.symmetric;
-
-import org.bouncycastle.crypto.CipherKeyGenerator;
-import org.bouncycastle.crypto.engines.SkipjackEngine;
-import org.bouncycastle.crypto.macs.CBCBlockCipherMac;
-import org.bouncycastle.crypto.macs.CFBBlockCipherMac;
-import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseBlockCipher;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseMac;
-import org.bouncycastle.jcajce.provider.symmetric.util.IvAlgorithmParameters;
-import org.bouncycastle.jcajce.provider.util.AlgorithmProvider;
-
-public final class Skipjack
-{
-    private Skipjack()
-    {
-    }
-    
-    public static class ECB
-        extends BaseBlockCipher
-    {
-        public ECB()
-        {
-            super(new SkipjackEngine());
-        }
-    }
-
-    public static class KeyGen
-        extends BaseKeyGenerator
-    {
-        public KeyGen()
-        {
-            super("Skipjack", 80, new CipherKeyGenerator());
-        }
-    }
-
-    public static class AlgParams
-        extends IvAlgorithmParameters
-    {
-        protected String engineToString()
-        {
-            return "Skipjack IV";
-        }
-    }
-
-    public static class Mac
-        extends BaseMac
-    {
-        public Mac()
-        {
-            super(new CBCBlockCipherMac(new SkipjackEngine()));
-        }
-    }
-
-    public static class MacCFB8
-        extends BaseMac
-    {
-        public MacCFB8()
-        {
-            super(new CFBBlockCipherMac(new SkipjackEngine()));
-        }
-    }
-
-    public static class Mappings
-        extends AlgorithmProvider
-    {
-        private static final String PREFIX = Skipjack.class.getName();
-
-        public Mappings()
-        {
-        }
-
-        public void configure(ConfigurableProvider provider)
-        {
-
-            provider.addAlgorithm("Cipher.SKIPJACK", PREFIX + "$ECB");
-            provider.addAlgorithm("KeyGenerator.SKIPJACK", PREFIX + "$KeyGen");
-            provider.addAlgorithm("AlgorithmParameters.SKIPJACK", PREFIX + "$AlgParams");
-            provider.addAlgorithm("Mac.SKIPJACKMAC", PREFIX + "$Mac");
-            provider.addAlgorithm("Alg.Alias.Mac.SKIPJACK", "SKIPJACKMAC");
-            provider.addAlgorithm("Mac.SKIPJACKMAC/CFB8", PREFIX + "$MacCFB8");
-            provider.addAlgorithm("Alg.Alias.Mac.SKIPJACK/CFB8", "SKIPJACKMAC/CFB8");
-
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/SymmetricAlgorithmProvider.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/SymmetricAlgorithmProvider.java
index c1b3d19..fc34865 100644
--- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/SymmetricAlgorithmProvider.java
+++ b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/SymmetricAlgorithmProvider.java
@@ -6,29 +6,31 @@ import org.bouncycastle.jcajce.provider.util.AlgorithmProvider;
 abstract class SymmetricAlgorithmProvider
     extends AlgorithmProvider
 {
-    protected void addGMacAlgorithm(
-        ConfigurableProvider provider,
-        String algorithm,
-        String algorithmClassName,
-        String keyGeneratorClassName)
-    {
-        provider.addAlgorithm("Mac." + algorithm + "-GMAC", algorithmClassName);
-        provider.addAlgorithm("Alg.Alias.Mac." + algorithm + "GMAC", algorithm + "-GMAC");
-
-        provider.addAlgorithm("KeyGenerator." + algorithm + "-GMAC", keyGeneratorClassName);
-        provider.addAlgorithm("Alg.Alias.KeyGenerator." + algorithm + "GMAC",  algorithm + "-GMAC");
-    }
-
-    protected void addPoly1305Algorithm(ConfigurableProvider provider,
-                                        String algorithm,
-                                        String algorithmClassName,
-                                        String keyGeneratorClassName)
-    {
-        provider.addAlgorithm("Mac.POLY1305-" + algorithm, algorithmClassName);
-        provider.addAlgorithm("Alg.Alias.Mac.POLY1305" + algorithm, "POLY1305-" + algorithm);
-
-        provider.addAlgorithm("KeyGenerator.POLY1305-" + algorithm, keyGeneratorClassName);
-        provider.addAlgorithm("Alg.Alias.KeyGenerator.POLY1305" + algorithm, "POLY1305-" + algorithm);
-    }
+    // BEGIN android-removed
+    // protected void addGMacAlgorithm(
+    //     ConfigurableProvider provider,
+    //     String algorithm,
+    //     String algorithmClassName,
+    //     String keyGeneratorClassName)
+    // {
+    //     provider.addAlgorithm("Mac." + algorithm + "-GMAC", algorithmClassName);
+    //     provider.addAlgorithm("Alg.Alias.Mac." + algorithm + "GMAC", algorithm + "-GMAC");
+    //
+    //     provider.addAlgorithm("KeyGenerator." + algorithm + "-GMAC", keyGeneratorClassName);
+    //     provider.addAlgorithm("Alg.Alias.KeyGenerator." + algorithm + "GMAC",  algorithm + "-GMAC");
+    // }
+    //
+    // protected void addPoly1305Algorithm(ConfigurableProvider provider,
+    //                                     String algorithm,
+    //                                     String algorithmClassName,
+    //                                     String keyGeneratorClassName)
+    // {
+    //     provider.addAlgorithm("Mac.POLY1305-" + algorithm, algorithmClassName);
+    //     provider.addAlgorithm("Alg.Alias.Mac.POLY1305" + algorithm, "POLY1305-" + algorithm);
+    //
+    //     provider.addAlgorithm("KeyGenerator.POLY1305-" + algorithm, keyGeneratorClassName);
+    //     provider.addAlgorithm("Alg.Alias.KeyGenerator.POLY1305" + algorithm, "POLY1305-" + algorithm);
+    // }
+    // END android-removed
 
 }
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/TEA.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/TEA.java
deleted file mode 100644
index 4bc12c9..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/TEA.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package org.bouncycastle.jcajce.provider.symmetric;
-
-import org.bouncycastle.crypto.CipherKeyGenerator;
-import org.bouncycastle.crypto.engines.TEAEngine;
-import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseBlockCipher;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
-import org.bouncycastle.jcajce.provider.symmetric.util.IvAlgorithmParameters;
-import org.bouncycastle.jcajce.provider.util.AlgorithmProvider;
-
-public final class TEA
-{
-    private TEA()
-    {
-    }
-    
-    public static class ECB
-        extends BaseBlockCipher
-    {
-        public ECB()
-        {
-            super(new TEAEngine());
-        }
-    }
-
-    public static class KeyGen
-        extends BaseKeyGenerator
-    {
-        public KeyGen()
-        {
-            super("TEA", 128, new CipherKeyGenerator());
-        }
-    }
-
-    public static class AlgParams
-        extends IvAlgorithmParameters
-    {
-        protected String engineToString()
-        {
-            return "TEA IV";
-        }
-    }
-
-    public static class Mappings
-        extends AlgorithmProvider
-    {
-        private static final String PREFIX = TEA.class.getName();
-
-        public Mappings()
-        {
-        }
-
-        public void configure(ConfigurableProvider provider)
-        {
-
-            provider.addAlgorithm("Cipher.TEA", PREFIX + "$ECB");
-            provider.addAlgorithm("KeyGenerator.TEA", PREFIX + "$KeyGen");
-            provider.addAlgorithm("AlgorithmParameters.TEA", PREFIX + "$AlgParams");
-
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/Threefish.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/Threefish.java
deleted file mode 100644
index 2970de6..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/Threefish.java
+++ /dev/null
@@ -1,120 +0,0 @@
-package org.bouncycastle.jcajce.provider.symmetric;
-
-import org.bouncycastle.crypto.CipherKeyGenerator;
-import org.bouncycastle.crypto.engines.ThreefishEngine;
-import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseBlockCipher;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
-import org.bouncycastle.jcajce.provider.symmetric.util.IvAlgorithmParameters;
-import org.bouncycastle.jcajce.provider.util.AlgorithmProvider;
-
-public final class Threefish
-{
-    private Threefish()
-    {
-    }
-
-    public static class ECB_256
-        extends BaseBlockCipher
-    {
-        public ECB_256()
-        {
-            super(new ThreefishEngine(ThreefishEngine.BLOCKSIZE_256));
-        }
-    }
-
-    public static class ECB_512
-        extends BaseBlockCipher
-    {
-        public ECB_512()
-        {
-            super(new ThreefishEngine(ThreefishEngine.BLOCKSIZE_512));
-        }
-    }
-
-    public static class ECB_1024
-        extends BaseBlockCipher
-    {
-        public ECB_1024()
-        {
-            super(new ThreefishEngine(ThreefishEngine.BLOCKSIZE_1024));
-        }
-    }
-
-    public static class KeyGen_256
-        extends BaseKeyGenerator
-    {
-        public KeyGen_256()
-        {
-            super("Threefish-256", 256, new CipherKeyGenerator());
-        }
-    }
-
-    public static class KeyGen_512
-        extends BaseKeyGenerator
-    {
-        public KeyGen_512()
-        {
-            super("Threefish-512", 512, new CipherKeyGenerator());
-        }
-    }
-
-    public static class KeyGen_1024
-        extends BaseKeyGenerator
-    {
-        public KeyGen_1024()
-        {
-            super("Threefish-1024", 1024, new CipherKeyGenerator());
-        }
-    }
-
-    public static class AlgParams_256
-        extends IvAlgorithmParameters
-    {
-        protected String engineToString()
-        {
-            return "Threefish-256 IV";
-        }
-    }
-
-    public static class AlgParams_512
-        extends IvAlgorithmParameters
-    {
-        protected String engineToString()
-        {
-            return "Threefish-512 IV";
-        }
-    }
-
-    public static class AlgParams_1024
-        extends IvAlgorithmParameters
-    {
-        protected String engineToString()
-        {
-            return "Threefish-1024 IV";
-        }
-    }
-
-    public static class Mappings
-        extends AlgorithmProvider
-    {
-        private static final String PREFIX = Threefish.class.getName();
-
-        public Mappings()
-        {
-        }
-
-        public void configure(ConfigurableProvider provider)
-        {
-            provider.addAlgorithm("Cipher.Threefish-256", PREFIX + "$ECB_256");
-            provider.addAlgorithm("Cipher.Threefish-512", PREFIX + "$ECB_512");
-            provider.addAlgorithm("Cipher.Threefish-1024", PREFIX + "$ECB_1024");
-            provider.addAlgorithm("KeyGenerator.Threefish-256", PREFIX + "$KeyGen_256");
-            provider.addAlgorithm("KeyGenerator.Threefish-512", PREFIX + "$KeyGen_512");
-            provider.addAlgorithm("KeyGenerator.Threefish-1024", PREFIX + "$KeyGen_1024");
-            provider.addAlgorithm("AlgorithmParameters.Threefish-256", PREFIX + "$AlgParams_256");
-            provider.addAlgorithm("AlgorithmParameters.Threefish-512", PREFIX + "$AlgParams_512");
-            provider.addAlgorithm("AlgorithmParameters.Threefish-1024", PREFIX + "$AlgParams_1024");
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/Twofish.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/Twofish.java
index 4c3ab1c..e2b2efd 100644
--- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/Twofish.java
+++ b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/Twofish.java
@@ -1,18 +1,26 @@
 package org.bouncycastle.jcajce.provider.symmetric;
 
-import org.bouncycastle.crypto.BlockCipher;
-import org.bouncycastle.crypto.CipherKeyGenerator;
+// BEGIN android-removed
+// import org.bouncycastle.crypto.BlockCipher;
+// import org.bouncycastle.crypto.CipherKeyGenerator;
+// END android-removed
 import org.bouncycastle.crypto.engines.TwofishEngine;
-import org.bouncycastle.crypto.generators.Poly1305KeyGenerator;
-import org.bouncycastle.crypto.macs.GMac;
+// BEGIN android-removed
+// import org.bouncycastle.crypto.generators.Poly1305KeyGenerator;
+// import org.bouncycastle.crypto.macs.GMac;
+// END android-removed
 import org.bouncycastle.crypto.modes.CBCBlockCipher;
-import org.bouncycastle.crypto.modes.GCMBlockCipher;
+// BEGIN android-removed
+// import org.bouncycastle.crypto.modes.GCMBlockCipher;
+// END android-removed
 import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
 import org.bouncycastle.jcajce.provider.symmetric.util.BaseBlockCipher;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseMac;
-import org.bouncycastle.jcajce.provider.symmetric.util.BlockCipherProvider;
-import org.bouncycastle.jcajce.provider.symmetric.util.IvAlgorithmParameters;
+// BEGIN android-removed
+// import org.bouncycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
+// import org.bouncycastle.jcajce.provider.symmetric.util.BaseMac;
+// import org.bouncycastle.jcajce.provider.symmetric.util.BlockCipherProvider;
+// import org.bouncycastle.jcajce.provider.symmetric.util.IvAlgorithmParameters;
+// END android-removed
 import org.bouncycastle.jcajce.provider.symmetric.util.PBESecretKeyFactory;
 
 public final class Twofish
@@ -21,56 +29,58 @@ public final class Twofish
     {
     }
 
-    public static class ECB
-        extends BaseBlockCipher
-    {
-        public ECB()
-        {
-            super(new BlockCipherProvider()
-            {
-                public BlockCipher get()
-                {
-                    return new TwofishEngine();
-                }
-            });
-        }
-    }
-
-    public static class KeyGen
-        extends BaseKeyGenerator
-    {
-        public KeyGen()
-        {
-            super("Twofish", 256, new CipherKeyGenerator());
-        }
-    }
-
-    public static class GMAC
-        extends BaseMac
-    {
-        public GMAC()
-        {
-            super(new GMac(new GCMBlockCipher(new TwofishEngine())));
-        }
-    }
-
-    public static class Poly1305
-        extends BaseMac
-    {
-        public Poly1305()
-        {
-            super(new org.bouncycastle.crypto.macs.Poly1305(new TwofishEngine()));
-        }
-    }
-
-    public static class Poly1305KeyGen
-        extends BaseKeyGenerator
-    {
-        public Poly1305KeyGen()
-        {
-            super("Poly1305-Twofish", 256, new Poly1305KeyGenerator());
-        }
-    }
+    // BEGIN android-removed
+    // public static class ECB
+    //     extends BaseBlockCipher
+    // {
+    //     public ECB()
+    //     {
+    //         super(new BlockCipherProvider()
+    //         {
+    //             public BlockCipher get()
+    //             {
+    //                 return new TwofishEngine();
+    //             }
+    //         });
+    //     }
+    // }
+    //
+    // public static class KeyGen
+    //     extends BaseKeyGenerator
+    // {
+    //     public KeyGen()
+    //     {
+    //         super("Twofish", 256, new CipherKeyGenerator());
+    //     }
+    // }
+    //
+    // public static class GMAC
+    //     extends BaseMac
+    // {
+    //     public GMAC()
+    //     {
+    //         super(new GMac(new GCMBlockCipher(new TwofishEngine())));
+    //     }
+    // }
+    //
+    // public static class Poly1305
+    //     extends BaseMac
+    // {
+    //     public Poly1305()
+    //     {
+    //         super(new org.bouncycastle.crypto.macs.Poly1305(new TwofishEngine()));
+    //     }
+    // }
+    //
+    // public static class Poly1305KeyGen
+    //     extends BaseKeyGenerator
+    // {
+    //     public Poly1305KeyGen()
+    //     {
+    //         super("Poly1305-Twofish", 256, new Poly1305KeyGenerator());
+    //     }
+    // }
+    // END android-removed
 
     /**
      * PBEWithSHAAndTwofish-CBC
@@ -96,14 +106,16 @@ public final class Twofish
         }
     }
 
-    public static class AlgParams
-        extends IvAlgorithmParameters
-    {
-        protected String engineToString()
-        {
-            return "Twofish IV";
-        }
-    }
+    // BEGIN android-removed
+    // public static class AlgParams
+    //     extends IvAlgorithmParameters
+    // {
+    //     protected String engineToString()
+    //     {
+    //         return "Twofish IV";
+    //     }
+    // }
+    // END android-removed
 
     public static class Mappings
         extends SymmetricAlgorithmProvider
@@ -116,17 +128,21 @@ public final class Twofish
 
         public void configure(ConfigurableProvider provider)
         {
-            provider.addAlgorithm("Cipher.Twofish", PREFIX + "$ECB");
-            provider.addAlgorithm("KeyGenerator.Twofish", PREFIX + "$KeyGen");
-            provider.addAlgorithm("AlgorithmParameters.Twofish", PREFIX + "$AlgParams");
+            // BEGIN android-removed
+            // provider.addAlgorithm("Cipher.Twofish", PREFIX + "$ECB");
+            // provider.addAlgorithm("KeyGenerator.Twofish", PREFIX + "$KeyGen");
+            // provider.addAlgorithm("AlgorithmParameters.Twofish", PREFIX + "$AlgParams");
+            // END android-removed
 
             provider.addAlgorithm("Alg.Alias.AlgorithmParameters.PBEWITHSHAANDTWOFISH", "PKCS12PBE");
             provider.addAlgorithm("Alg.Alias.AlgorithmParameters.PBEWITHSHAANDTWOFISH-CBC", "PKCS12PBE");
             provider.addAlgorithm("Cipher.PBEWITHSHAANDTWOFISH-CBC",  PREFIX + "$PBEWithSHA");
             provider.addAlgorithm("SecretKeyFactory.PBEWITHSHAANDTWOFISH-CBC", PREFIX + "$PBEWithSHAKeyFactory");
 
-            addGMacAlgorithm(provider, "Twofish", PREFIX + "$GMAC", PREFIX + "$KeyGen");
-            addPoly1305Algorithm(provider, "Twofish", PREFIX + "$Poly1305", PREFIX + "$Poly1305KeyGen");
+            // BEGIN android-removed
+            // addGMacAlgorithm(provider, "Twofish", PREFIX + "$GMAC", PREFIX + "$KeyGen");
+            // addPoly1305Algorithm(provider, "Twofish", PREFIX + "$Poly1305", PREFIX + "$Poly1305KeyGen");
+            // END android-removed
         }
     }
 }
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/VMPC.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/VMPC.java
deleted file mode 100644
index 1e59e07..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/VMPC.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package org.bouncycastle.jcajce.provider.symmetric;
-
-import org.bouncycastle.crypto.CipherKeyGenerator;
-import org.bouncycastle.crypto.engines.VMPCEngine;
-import org.bouncycastle.crypto.macs.VMPCMac;
-import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseMac;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseStreamCipher;
-import org.bouncycastle.jcajce.provider.util.AlgorithmProvider;
-
-public final class VMPC
-{
-    private VMPC()
-    {
-    }
-    
-    public static class Base
-        extends BaseStreamCipher
-    {
-        public Base()
-        {
-            super(new VMPCEngine(), 16);
-        }
-    }
-
-    public static class KeyGen
-        extends BaseKeyGenerator
-    {
-        public KeyGen()
-        {
-            super("VMPC", 128, new CipherKeyGenerator());
-        }
-    }
-
-    public static class Mac
-        extends BaseMac
-    {
-        public Mac()
-        {
-            super(new VMPCMac());
-        }
-    }
-
-    public static class Mappings
-        extends AlgorithmProvider
-    {
-        private static final String PREFIX = VMPC.class.getName();
-
-        public Mappings()
-        {
-        }
-
-        public void configure(ConfigurableProvider provider)
-        {
-
-            provider.addAlgorithm("Cipher.VMPC", PREFIX + "$Base");
-            provider.addAlgorithm("KeyGenerator.VMPC", PREFIX + "$KeyGen");
-            provider.addAlgorithm("Mac.VMPCMAC", PREFIX + "$Mac");
-            provider.addAlgorithm("Alg.Alias.Mac.VMPC", "VMPCMAC");
-            provider.addAlgorithm("Alg.Alias.Mac.VMPC-MAC", "VMPCMAC");
-
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/VMPCKSA3.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/VMPCKSA3.java
deleted file mode 100644
index b5d8814..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/VMPCKSA3.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package org.bouncycastle.jcajce.provider.symmetric;
-
-import org.bouncycastle.crypto.CipherKeyGenerator;
-import org.bouncycastle.crypto.engines.VMPCKSA3Engine;
-import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseStreamCipher;
-import org.bouncycastle.jcajce.provider.util.AlgorithmProvider;
-
-public final class VMPCKSA3
-{
-    private VMPCKSA3()
-    {
-    }
-    
-    public static class Base
-        extends BaseStreamCipher
-    {
-        public Base()
-        {
-            super(new VMPCKSA3Engine(), 16);
-        }
-    }
-
-    public static class KeyGen
-        extends BaseKeyGenerator
-    {
-        public KeyGen()
-        {
-            super("VMPC-KSA3", 128, new CipherKeyGenerator());
-        }
-    }
-
-    public static class Mappings
-        extends AlgorithmProvider
-    {
-        private static final String PREFIX = VMPCKSA3.class.getName();
-
-        public Mappings()
-        {
-        }
-
-        public void configure(ConfigurableProvider provider)
-        {
-
-            provider.addAlgorithm("Cipher.VMPC-KSA3", PREFIX + "$Base");
-            provider.addAlgorithm("KeyGenerator.VMPC-KSA3", PREFIX + "$KeyGen");
-
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/XSalsa20.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/XSalsa20.java
deleted file mode 100644
index 5be0640..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/XSalsa20.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package org.bouncycastle.jcajce.provider.symmetric;
-
-import org.bouncycastle.crypto.CipherKeyGenerator;
-import org.bouncycastle.crypto.engines.XSalsa20Engine;
-import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseStreamCipher;
-import org.bouncycastle.jcajce.provider.util.AlgorithmProvider;
-
-public final class XSalsa20
-{
-    private XSalsa20()
-    {
-    }
-    
-    public static class Base
-        extends BaseStreamCipher
-    {
-        public Base()
-        {
-            super(new XSalsa20Engine(), 24);
-        }
-    }
-
-    public static class KeyGen
-        extends BaseKeyGenerator
-    {
-        public KeyGen()
-        {
-            super("XSalsa20", 256, new CipherKeyGenerator());
-        }
-    }
-
-    public static class Mappings
-        extends AlgorithmProvider
-    {
-        private static final String PREFIX = XSalsa20.class.getName();
-
-        public Mappings()
-        {
-        }
-
-        public void configure(ConfigurableProvider provider)
-        {
-
-            provider.addAlgorithm("Cipher.XSALSA20", PREFIX + "$Base");
-            provider.addAlgorithm("KeyGenerator.XSALSA20", PREFIX + "$KeyGen");
-
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/XTEA.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/XTEA.java
deleted file mode 100644
index 2e946de..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/XTEA.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package org.bouncycastle.jcajce.provider.symmetric;
-
-import org.bouncycastle.crypto.CipherKeyGenerator;
-import org.bouncycastle.crypto.engines.XTEAEngine;
-import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseBlockCipher;
-import org.bouncycastle.jcajce.provider.symmetric.util.BaseKeyGenerator;
-import org.bouncycastle.jcajce.provider.symmetric.util.IvAlgorithmParameters;
-import org.bouncycastle.jcajce.provider.util.AlgorithmProvider;
-
-public final class XTEA
-{
-    private XTEA()
-    {
-    }
-    
-    public static class ECB
-        extends BaseBlockCipher
-    {
-        public ECB()
-        {
-            super(new XTEAEngine());
-        }
-    }
-
-    public static class KeyGen
-        extends BaseKeyGenerator
-    {
-        public KeyGen()
-        {
-            super("XTEA", 128, new CipherKeyGenerator());
-        }
-    }
-
-    public static class AlgParams
-        extends IvAlgorithmParameters
-    {
-        protected String engineToString()
-        {
-            return "XTEA IV";
-        }
-    }
-
-    public static class Mappings
-        extends AlgorithmProvider
-    {
-        private static final String PREFIX = XTEA.class.getName();
-
-        public Mappings()
-        {
-        }
-
-        public void configure(ConfigurableProvider provider)
-        {
-
-            provider.addAlgorithm("Cipher.XTEA", PREFIX + "$ECB");
-            provider.addAlgorithm("KeyGenerator.XTEA", PREFIX + "$KeyGen");
-            provider.addAlgorithm("AlgorithmParameters.XTEA", PREFIX + "$AlgParams");
-
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/util/BaseBlockCipher.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/util/BaseBlockCipher.java
index 08ddfb4..0e933b7 100644
--- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/util/BaseBlockCipher.java
+++ b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/util/BaseBlockCipher.java
@@ -20,8 +20,10 @@ import javax.crypto.SecretKey;
 import javax.crypto.ShortBufferException;
 import javax.crypto.spec.IvParameterSpec;
 import javax.crypto.spec.PBEParameterSpec;
-import javax.crypto.spec.RC2ParameterSpec;
-import javax.crypto.spec.RC5ParameterSpec;
+// BEGIN android-removed
+// import javax.crypto.spec.RC2ParameterSpec;
+// import javax.crypto.spec.RC5ParameterSpec;
+// END android-removed
 
 import org.bouncycastle.asn1.cms.GCMParameters;
 import org.bouncycastle.crypto.BlockCipher;
@@ -35,14 +37,20 @@ import org.bouncycastle.crypto.modes.CBCBlockCipher;
 import org.bouncycastle.crypto.modes.CCMBlockCipher;
 import org.bouncycastle.crypto.modes.CFBBlockCipher;
 import org.bouncycastle.crypto.modes.CTSBlockCipher;
-import org.bouncycastle.crypto.modes.EAXBlockCipher;
-import org.bouncycastle.crypto.modes.GCFBBlockCipher;
+// BEGIN android-removed
+// import org.bouncycastle.crypto.modes.EAXBlockCipher;
+// import org.bouncycastle.crypto.modes.GCFBBlockCipher;
+// END android-removed
 import org.bouncycastle.crypto.modes.GCMBlockCipher;
-import org.bouncycastle.crypto.modes.GOFBBlockCipher;
-import org.bouncycastle.crypto.modes.OCBBlockCipher;
+// BEGIN android-removed
+// import org.bouncycastle.crypto.modes.GOFBBlockCipher;
+// import org.bouncycastle.crypto.modes.OCBBlockCipher;
+// END android-removed
 import org.bouncycastle.crypto.modes.OFBBlockCipher;
-import org.bouncycastle.crypto.modes.OpenPGPCFBBlockCipher;
-import org.bouncycastle.crypto.modes.PGPCFBBlockCipher;
+// BEGIN android-removed
+// import org.bouncycastle.crypto.modes.OpenPGPCFBBlockCipher;
+// import org.bouncycastle.crypto.modes.PGPCFBBlockCipher;
+// END android-removed
 import org.bouncycastle.crypto.modes.SICBlockCipher;
 import org.bouncycastle.crypto.paddings.BlockCipherPadding;
 import org.bouncycastle.crypto.paddings.ISO10126d2Padding;
@@ -55,11 +63,15 @@ import org.bouncycastle.crypto.params.AEADParameters;
 import org.bouncycastle.crypto.params.KeyParameter;
 import org.bouncycastle.crypto.params.ParametersWithIV;
 import org.bouncycastle.crypto.params.ParametersWithRandom;
-import org.bouncycastle.crypto.params.ParametersWithSBox;
+// BEGIN android-removed
+// import org.bouncycastle.crypto.params.ParametersWithSBox;
+// END android-removed
 import org.bouncycastle.crypto.params.RC2Parameters;
-import org.bouncycastle.crypto.params.RC5Parameters;
-import org.bouncycastle.jcajce.spec.GOST28147ParameterSpec;
-import org.bouncycastle.jcajce.spec.RepeatedSecretKeySpec;
+// BEGIN android-removed
+// import org.bouncycastle.crypto.params.RC5Parameters;
+// import org.bouncycastle.jcajce.spec.GOST28147ParameterSpec;
+// import org.bouncycastle.jcajce.spec.RepeatedSecretKeySpec;
+// END android-removed
 import org.bouncycastle.jce.provider.BouncyCastleProvider;
 import org.bouncycastle.util.Strings;
 
@@ -74,11 +86,15 @@ public class BaseBlockCipher
     //
     private Class[]                 availableSpecs =
                                     {
-                                        RC2ParameterSpec.class,
-                                        RC5ParameterSpec.class,
+                                        // BEGIN android-removed
+                                        // RC2ParameterSpec.class,
+                                        // RC5ParameterSpec.class,
+                                        // END android-removed
                                         IvParameterSpec.class,
                                         PBEParameterSpec.class,
-                                        GOST28147ParameterSpec.class,
+                                        // BEGIN android-removed
+                                        // GOST28147ParameterSpec.class,
+                                        // END android-removed
                                         gcmSpecClass
                                     };
 
@@ -284,48 +300,52 @@ public class BaseBlockCipher
                         new CFBBlockCipher(baseEngine, 8 * baseEngine.getBlockSize()));
             }
         }
-        else if (modeName.startsWith("PGP"))
-        {
-            boolean inlineIV = modeName.equalsIgnoreCase("PGPCFBwithIV");
-
-            ivLength = baseEngine.getBlockSize();
-            cipher = new BufferedGenericBlockCipher(
-                new PGPCFBBlockCipher(baseEngine, inlineIV));
-        }
-        else if (modeName.equalsIgnoreCase("OpenPGPCFB"))
-        {
-            ivLength = 0;
-            cipher = new BufferedGenericBlockCipher(
-                new OpenPGPCFBBlockCipher(baseEngine));
-        }
-        else if (modeName.startsWith("SIC"))
-        {
-            ivLength = baseEngine.getBlockSize();
-            if (ivLength < 16)
-            {
-                throw new IllegalArgumentException("Warning: SIC-Mode can become a twotime-pad if the blocksize of the cipher is too small. Use a cipher with a block size of at least 128 bits (e.g. AES)");
-            }
-            cipher = new BufferedGenericBlockCipher(new BufferedBlockCipher(
-                        new SICBlockCipher(baseEngine)));
-        }
+        // BEGIN android-removed
+        // else if (modeName.startsWith("PGP"))
+        // {
+        //     boolean inlineIV = modeName.equalsIgnoreCase("PGPCFBwithIV");
+        //
+        //     ivLength = baseEngine.getBlockSize();
+        //     cipher = new BufferedGenericBlockCipher(
+        //         new PGPCFBBlockCipher(baseEngine, inlineIV));
+        // }
+        // else if (modeName.equalsIgnoreCase("OpenPGPCFB"))
+        // {
+        //     ivLength = 0;
+        //     cipher = new BufferedGenericBlockCipher(
+        //         new OpenPGPCFBBlockCipher(baseEngine));
+        // }
+        // else if (modeName.startsWith("SIC"))
+        // {
+        //     ivLength = baseEngine.getBlockSize();
+        //     if (ivLength < 16)
+        //     {
+        //         throw new IllegalArgumentException("Warning: SIC-Mode can become a twotime-pad if the blocksize of the cipher is too small. Use a cipher with a block size of at least 128 bits (e.g. AES)");
+        //     }
+        //     cipher = new BufferedGenericBlockCipher(new BufferedBlockCipher(
+        //                 new SICBlockCipher(baseEngine)));
+        // }
+        // END android-removed
         else if (modeName.startsWith("CTR"))
         {
             ivLength = baseEngine.getBlockSize();
             cipher = new BufferedGenericBlockCipher(new BufferedBlockCipher(
                         new SICBlockCipher(baseEngine)));
         }
-        else if (modeName.startsWith("GOFB"))
-        {
-            ivLength = baseEngine.getBlockSize();
-            cipher = new BufferedGenericBlockCipher(new BufferedBlockCipher(
-                        new GOFBBlockCipher(baseEngine)));
-        }
-        else if (modeName.startsWith("GCFB"))
-        {
-            ivLength = baseEngine.getBlockSize();
-            cipher = new BufferedGenericBlockCipher(new BufferedBlockCipher(
-                        new GCFBBlockCipher(baseEngine)));
-        }
+        // BEGIN android-removed
+        // else if (modeName.startsWith("GOFB"))
+        // {
+        //     ivLength = baseEngine.getBlockSize();
+        //     cipher = new BufferedGenericBlockCipher(new BufferedBlockCipher(
+        //                 new GOFBBlockCipher(baseEngine)));
+        // }
+        // else if (modeName.startsWith("GCFB"))
+        // {
+        //     ivLength = baseEngine.getBlockSize();
+        //     cipher = new BufferedGenericBlockCipher(new BufferedBlockCipher(
+        //                 new GCFBBlockCipher(baseEngine)));
+        // }
+        // END android-removed
         else if (modeName.startsWith("CTS"))
         {
             ivLength = baseEngine.getBlockSize();
@@ -336,26 +356,28 @@ public class BaseBlockCipher
             ivLength = 13; // CCM nonce 7..13 bytes
             cipher = new AEADGenericBlockCipher(new CCMBlockCipher(baseEngine));
         }
-        else if (modeName.startsWith("OCB"))
-        {
-            if (engineProvider != null)
-            {
-                /*
-                 * RFC 7253 4.2. Nonce is a string of no more than 120 bits
-                 */
-                ivLength = 15;
-                cipher = new AEADGenericBlockCipher(new OCBBlockCipher(baseEngine, engineProvider.get()));
-            }
-            else
-            {
-                throw new NoSuchAlgorithmException("can't support mode " + mode);
-            }
-        }
-        else if (modeName.startsWith("EAX"))
-        {
-            ivLength = baseEngine.getBlockSize();
-            cipher = new AEADGenericBlockCipher(new EAXBlockCipher(baseEngine));
-        }
+        // BEGIN android-removed
+        // else if (modeName.startsWith("OCB"))
+        // {
+        //     if (engineProvider != null)
+        //     {
+        //         /*
+        //          * RFC 7253 4.2. Nonce is a string of no more than 120 bits
+        //          */
+        //         ivLength = 15;
+        //         cipher = new AEADGenericBlockCipher(new OCBBlockCipher(baseEngine, engineProvider.get()));
+        //     }
+        //     else
+        //     {
+        //         throw new NoSuchAlgorithmException("can't support mode " + mode);
+        //     }
+        // }
+        // else if (modeName.startsWith("EAX"))
+        // {
+        //     ivLength = baseEngine.getBlockSize();
+        //     cipher = new AEADGenericBlockCipher(new EAXBlockCipher(baseEngine));
+        // }
+        // END android-removed
         else if (modeName.startsWith("GCM"))
         {
             ivLength = baseEngine.getBlockSize();
@@ -478,18 +500,20 @@ public class BaseBlockCipher
 
                     param = new ParametersWithIV(param, iv.getIV());
                 }
-                else if (params instanceof GOST28147ParameterSpec)
-                {
-                    // need to pick up IV and SBox.
-                    GOST28147ParameterSpec    gost28147Param = (GOST28147ParameterSpec)params;
-
-                    param = new ParametersWithSBox(param, gost28147Param.getSbox());
-
-                    if (gost28147Param.getIV() != null && ivLength != 0)
-                    {
-                        param = new ParametersWithIV(param, gost28147Param.getIV());
-                    }
-                }
+                // BEGIN android-removed
+                // else if (params instanceof GOST28147ParameterSpec)
+                // {
+                //     // need to pick up IV and SBox.
+                //     GOST28147ParameterSpec    gost28147Param = (GOST28147ParameterSpec)params;
+                //
+                //     param = new ParametersWithSBox(param, gost28147Param.getSbox());
+                //
+                //     if (gost28147Param.getIV() != null && ivLength != 0)
+                //     {
+                //         param = new ParametersWithIV(param, gost28147Param.getIV());
+                //     }
+                // }
+                // END android-removed
             }
             else if (params instanceof PBEParameterSpec)
             {
@@ -521,12 +545,14 @@ public class BaseBlockCipher
                     throw new InvalidAlgorithmParameterException("IV must be " + ivLength + " bytes long.");
                 }
 
-                if (key instanceof RepeatedSecretKeySpec)
-                {
-                    param = new ParametersWithIV(null, p.getIV());
-                    ivParam = (ParametersWithIV)param;
-                }
-                else
+                // BEGIN android-removed
+                // if (key instanceof RepeatedSecretKeySpec)
+                // {
+                //     param = new ParametersWithIV(null, p.getIV());
+                //     ivParam = (ParametersWithIV)param;
+                // }
+                // else
+                // END android-removed
                 {
                     param = new ParametersWithIV(new KeyParameter(key.getEncoded()), p.getIV());
                     ivParam = (ParametersWithIV)param;
@@ -542,63 +568,65 @@ public class BaseBlockCipher
                 param = new KeyParameter(key.getEncoded());
             }
         }
-        else if (params instanceof GOST28147ParameterSpec)
-        {
-            GOST28147ParameterSpec    gost28147Param = (GOST28147ParameterSpec)params;
-
-            param = new ParametersWithSBox(
-                       new KeyParameter(key.getEncoded()), ((GOST28147ParameterSpec)params).getSbox());
-
-            if (gost28147Param.getIV() != null && ivLength != 0)
-            {
-                param = new ParametersWithIV(param, gost28147Param.getIV());
-                ivParam = (ParametersWithIV)param;
-            }
-        }
-        else if (params instanceof RC2ParameterSpec)
-        {
-            RC2ParameterSpec    rc2Param = (RC2ParameterSpec)params;
-
-            param = new RC2Parameters(key.getEncoded(), ((RC2ParameterSpec)params).getEffectiveKeyBits());
-
-            if (rc2Param.getIV() != null && ivLength != 0)
-            {
-                param = new ParametersWithIV(param, rc2Param.getIV());
-                ivParam = (ParametersWithIV)param;
-            }
-        }
-        else if (params instanceof RC5ParameterSpec)
-        {
-            RC5ParameterSpec    rc5Param = (RC5ParameterSpec)params;
-
-            param = new RC5Parameters(key.getEncoded(), ((RC5ParameterSpec)params).getRounds());
-            if (baseEngine.getAlgorithmName().startsWith("RC5"))
-            {
-                if (baseEngine.getAlgorithmName().equals("RC5-32"))
-                {
-                    if (rc5Param.getWordSize() != 32)
-                    {
-                        throw new InvalidAlgorithmParameterException("RC5 already set up for a word size of 32 not " + rc5Param.getWordSize() + ".");
-                    }
-                }
-                else if (baseEngine.getAlgorithmName().equals("RC5-64"))
-                {
-                    if (rc5Param.getWordSize() != 64)
-                    {
-                        throw new InvalidAlgorithmParameterException("RC5 already set up for a word size of 64 not " + rc5Param.getWordSize() + ".");
-                    }
-                }
-            }
-            else
-            {
-                throw new InvalidAlgorithmParameterException("RC5 parameters passed to a cipher that is not RC5.");
-            }
-            if ((rc5Param.getIV() != null) && (ivLength != 0))
-            {
-                param = new ParametersWithIV(param, rc5Param.getIV());
-                ivParam = (ParametersWithIV)param;
-            }
-        }
+        // BEGIN android-removed
+        // else if (params instanceof GOST28147ParameterSpec)
+        // {
+        //     GOST28147ParameterSpec    gost28147Param = (GOST28147ParameterSpec)params;
+        //
+        //     param = new ParametersWithSBox(
+        //                new KeyParameter(key.getEncoded()), ((GOST28147ParameterSpec)params).getSbox());
+        //
+        //     if (gost28147Param.getIV() != null && ivLength != 0)
+        //     {
+        //         param = new ParametersWithIV(param, gost28147Param.getIV());
+        //         ivParam = (ParametersWithIV)param;
+        //     }
+        // }
+        // else if (params instanceof RC2ParameterSpec)
+        // {
+        //     RC2ParameterSpec    rc2Param = (RC2ParameterSpec)params;
+        //
+        //     param = new RC2Parameters(key.getEncoded(), ((RC2ParameterSpec)params).getEffectiveKeyBits());
+        //
+        //     if (rc2Param.getIV() != null && ivLength != 0)
+        //     {
+        //         param = new ParametersWithIV(param, rc2Param.getIV());
+        //         ivParam = (ParametersWithIV)param;
+        //     }
+        // }
+        // else if (params instanceof RC5ParameterSpec)
+        // {
+        //     RC5ParameterSpec    rc5Param = (RC5ParameterSpec)params;
+        //
+        //     param = new RC5Parameters(key.getEncoded(), ((RC5ParameterSpec)params).getRounds());
+        //     if (baseEngine.getAlgorithmName().startsWith("RC5"))
+        //     {
+        //         if (baseEngine.getAlgorithmName().equals("RC5-32"))
+        //         {
+        //             if (rc5Param.getWordSize() != 32)
+        //             {
+        //                 throw new InvalidAlgorithmParameterException("RC5 already set up for a word size of 32 not " + rc5Param.getWordSize() + ".");
+        //             }
+        //         }
+        //         else if (baseEngine.getAlgorithmName().equals("RC5-64"))
+        //         {
+        //             if (rc5Param.getWordSize() != 64)
+        //             {
+        //                 throw new InvalidAlgorithmParameterException("RC5 already set up for a word size of 64 not " + rc5Param.getWordSize() + ".");
+        //             }
+        //         }
+        //     }
+        //     else
+        //     {
+        //         throw new InvalidAlgorithmParameterException("RC5 parameters passed to a cipher that is not RC5.");
+        //     }
+        //     if ((rc5Param.getIV() != null) && (ivLength != 0))
+        //     {
+        //         param = new ParametersWithIV(param, rc5Param.getIV());
+        //         ivParam = (ParametersWithIV)param;
+        //     }
+        // }
+        // END android-removed
         else if (gcmSpecClass != null && gcmSpecClass.isInstance(params))
         {
             if (!isAEADModeName(modeName) && !(cipher instanceof AEADGenericBlockCipher))
@@ -611,11 +639,13 @@ public class BaseBlockCipher
                 Method tLen = gcmSpecClass.getDeclaredMethod("getTLen", new Class[0]);
                 Method iv= gcmSpecClass.getDeclaredMethod("getIV", new Class[0]);
 
-                if (key instanceof RepeatedSecretKeySpec)
-                {
-                    param = aeadParams = new AEADParameters(null, ((Integer)tLen.invoke(params, new Object[0])).intValue(), (byte[])iv.invoke(params, new Object[0]));
-                }
-                else
+                // BEGIN android-removed
+                // if (key instanceof RepeatedSecretKeySpec)
+                // {
+                //     param = aeadParams = new AEADParameters(null, ((Integer)tLen.invoke(params, new Object[0])).intValue(), (byte[])iv.invoke(params, new Object[0]));
+                // }
+                // else
+                // END android-removed
                 {
                     param = aeadParams = new AEADParameters(new KeyParameter(key.getEncoded()), ((Integer)tLen.invoke(params, new Object[0])).intValue(), (byte[])iv.invoke(params, new Object[0]));
                 }
@@ -867,7 +897,9 @@ public class BaseBlockCipher
     private boolean isAEADModeName(
         String modeName)
     {
-        return "CCM".equals(modeName) || "EAX".equals(modeName) || "GCM".equals(modeName) || "OCB".equals(modeName);
+        // BEGIN android-changed
+        return "CCM".equals(modeName) || "GCM".equals(modeName);
+        // END android-changed
     }
 
     /*
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/util/BaseMac.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/util/BaseMac.java
index 270d648..d014972 100644
--- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/util/BaseMac.java
+++ b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/util/BaseMac.java
@@ -16,8 +16,10 @@ import org.bouncycastle.crypto.CipherParameters;
 import org.bouncycastle.crypto.Mac;
 import org.bouncycastle.crypto.params.KeyParameter;
 import org.bouncycastle.crypto.params.ParametersWithIV;
-import org.bouncycastle.crypto.params.SkeinParameters;
-import org.bouncycastle.jcajce.spec.SkeinParameterSpec;
+// BEGIN android-removed
+// import org.bouncycastle.crypto.params.SkeinParameters;
+// import org.bouncycastle.jcajce.spec.SkeinParameterSpec;
+// END android-removed
 
 public class BaseMac
     extends MacSpi implements PBE
@@ -79,10 +81,12 @@ public class BaseMac
         {
             param = new ParametersWithIV(new KeyParameter(key.getEncoded()), ((IvParameterSpec)params).getIV());
         }
-        else if (params instanceof SkeinParameterSpec)
-        {
-            param = new SkeinParameters.Builder(copyMap(((SkeinParameterSpec)params).getParameters())).setKey(key.getEncoded()).build();
-        }
+        // BEGIN android-removed
+        // else if (params instanceof SkeinParameterSpec)
+        // {
+        //     param = new SkeinParameters.Builder(copyMap(((SkeinParameterSpec)params).getParameters())).setKey(key.getEncoded()).build();
+        // }
+        // END android-removed
         else if (params == null)
         {
             param = new KeyParameter(key.getEncoded());
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/util/BaseStreamCipher.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/util/BaseStreamCipher.java
index 665bcab..fba61b8 100644
--- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/util/BaseStreamCipher.java
+++ b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/util/BaseStreamCipher.java
@@ -15,8 +15,10 @@ import javax.crypto.SecretKey;
 import javax.crypto.ShortBufferException;
 import javax.crypto.spec.IvParameterSpec;
 import javax.crypto.spec.PBEParameterSpec;
-import javax.crypto.spec.RC2ParameterSpec;
-import javax.crypto.spec.RC5ParameterSpec;
+// BEGIN android-removed
+// import javax.crypto.spec.RC2ParameterSpec;
+// import javax.crypto.spec.RC5ParameterSpec;
+// END android-removed
 
 import org.bouncycastle.crypto.CipherParameters;
 import org.bouncycastle.crypto.DataLengthException;
@@ -34,8 +36,10 @@ public class BaseStreamCipher
     //
     private Class[]                 availableSpecs =
                                     {
-                                        RC2ParameterSpec.class,
-                                        RC5ParameterSpec.class,
+                                        // BEGIN android-removed
+                                        // RC2ParameterSpec.class,
+                                        // RC5ParameterSpec.class,
+                                        // END android-removed
                                         IvParameterSpec.class,
                                         PBEParameterSpec.class
                                     };
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/util/BaseWrapCipher.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/util/BaseWrapCipher.java
index 5d9aea0..a26d980 100644
--- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/util/BaseWrapCipher.java
+++ b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/util/BaseWrapCipher.java
@@ -24,8 +24,10 @@ import javax.crypto.NoSuchPaddingException;
 import javax.crypto.ShortBufferException;
 import javax.crypto.spec.IvParameterSpec;
 import javax.crypto.spec.PBEParameterSpec;
-import javax.crypto.spec.RC2ParameterSpec;
-import javax.crypto.spec.RC5ParameterSpec;
+// BEGIN android-removed
+// import javax.crypto.spec.RC2ParameterSpec;
+// import javax.crypto.spec.RC5ParameterSpec;
+// END android-removed
 import javax.crypto.spec.SecretKeySpec;
 
 import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
@@ -50,8 +52,10 @@ public abstract class BaseWrapCipher
                                     {
                                         IvParameterSpec.class,
                                         PBEParameterSpec.class,
-                                        RC2ParameterSpec.class,
-                                        RC5ParameterSpec.class
+                                        // BEGIN android-removed
+                                        // RC2ParameterSpec.class,
+                                        // RC5ParameterSpec.class
+                                        // END android-removed
                                     };
 
     protected int                     pbeType = PKCS12;
@@ -276,6 +280,8 @@ public abstract class BaseWrapCipher
         return null;
     }
 
+    // BEGIN android-changed
+    // added ShortBufferException to throws statement
     protected int engineDoFinal(
         byte[]  input,
         int     inputOffset,
@@ -286,6 +292,7 @@ public abstract class BaseWrapCipher
     {
         return 0;
     }
+    // END android-changed
 
     protected byte[] engineWrap(
         Key     key)
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/util/PBE.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/util/PBE.java
index fac3ead..c39a2d3 100644
--- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/util/PBE.java
+++ b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/util/PBE.java
@@ -7,13 +7,18 @@ import javax.crypto.spec.PBEParameterSpec;
 
 import org.bouncycastle.crypto.CipherParameters;
 import org.bouncycastle.crypto.PBEParametersGenerator;
-import org.bouncycastle.crypto.digests.GOST3411Digest;
-import org.bouncycastle.crypto.digests.MD2Digest;
-import org.bouncycastle.crypto.digests.MD5Digest;
-import org.bouncycastle.crypto.digests.RIPEMD160Digest;
-import org.bouncycastle.crypto.digests.SHA1Digest;
-import org.bouncycastle.crypto.digests.SHA256Digest;
-import org.bouncycastle.crypto.digests.TigerDigest;
+// BEGIN android-removed
+// import org.bouncycastle.crypto.digests.GOST3411Digest;
+// import org.bouncycastle.crypto.digests.MD2Digest;
+// import org.bouncycastle.crypto.digests.MD5Digest;
+// import org.bouncycastle.crypto.digests.RIPEMD160Digest;
+// import org.bouncycastle.crypto.digests.SHA1Digest;
+// import org.bouncycastle.crypto.digests.SHA256Digest;
+// import org.bouncycastle.crypto.digests.TigerDigest;
+// END android-removed
+// BEGIN android-added
+import org.bouncycastle.crypto.digests.AndroidDigestFactory;
+// END android-added
 import org.bouncycastle.crypto.generators.OpenSSLPBEParametersGenerator;
 import org.bouncycastle.crypto.generators.PKCS12ParametersGenerator;
 import org.bouncycastle.crypto.generators.PKCS5S1ParametersGenerator;
@@ -29,11 +34,15 @@ public interface PBE
     //
     static final int        MD5          = 0;
     static final int        SHA1         = 1;
-    static final int        RIPEMD160    = 2;
-    static final int        TIGER        = 3;
+    // BEGIN android-removed
+    // static final int        RIPEMD160    = 2;
+    // static final int        TIGER        = 3;
+    // END android-removed
     static final int        SHA256       = 4;
-    static final int        MD2          = 5;
-    static final int        GOST3411     = 6;
+    // BEGIN android-removed
+    // static final int        MD2          = 5;
+    // static final int        GOST3411     = 6;
+    // END android-removed
 
     static final int        PKCS5S1      = 0;
     static final int        PKCS5S2      = 1;
@@ -57,14 +66,20 @@ public interface PBE
             {
                 switch (hash)
                 {
-                case MD2:
-                    generator = new PKCS5S1ParametersGenerator(new MD2Digest());
-                    break;
+                // BEGIN android-removed
+                // case MD2:
+                //     generator = new PKCS5S1ParametersGenerator(new MD2Digest());
+                //     break;
+                // END android-removed
                 case MD5:
-                    generator = new PKCS5S1ParametersGenerator(new MD5Digest());
+                    // BEGIN android-changed
+                    generator = new PKCS5S1ParametersGenerator(AndroidDigestFactory.getMD5());
+                    // END android-changed
                     break;
                 case SHA1:
-                    generator = new PKCS5S1ParametersGenerator(new SHA1Digest());
+                    // BEGIN android-changed
+                    generator = new PKCS5S1ParametersGenerator(AndroidDigestFactory.getSHA1());
+                    // END android-changed
                     break;
                 default:
                     throw new IllegalStateException("PKCS5 scheme 1 only supports MD2, MD5 and SHA1.");
@@ -74,27 +89,39 @@ public interface PBE
             {
                 switch (hash)
                 {
-                case MD2:
-                    generator = new PKCS5S2ParametersGenerator(new MD2Digest());
-                    break;
+                // BEGIN android-removed
+                // case MD2:
+                //     generator = new PKCS5S2ParametersGenerator(new MD2Digest());
+                //     break;
+                // END android-removed
                 case MD5:
-                    generator = new PKCS5S2ParametersGenerator(new MD5Digest());
+                    // BEGIN android-changed
+                    generator = new PKCS5S2ParametersGenerator(AndroidDigestFactory.getMD5());
+                    // END android-changed
                     break;
                 case SHA1:
-                    generator = new PKCS5S2ParametersGenerator(new SHA1Digest());
-                    break;
-                case RIPEMD160:
-                    generator = new PKCS5S2ParametersGenerator(new RIPEMD160Digest());
-                    break;
-                case TIGER:
-                    generator = new PKCS5S2ParametersGenerator(new TigerDigest());
+                    // BEGIN android-changed
+                    generator = new PKCS5S2ParametersGenerator(AndroidDigestFactory.getSHA1());
+                    // END android-changed
                     break;
+                // BEGIN android-removed
+                // case RIPEMD160:
+                //     generator = new PKCS5S2ParametersGenerator(new RIPEMD160Digest());
+                //     break;
+                // case TIGER:
+                //     generator = new PKCS5S2ParametersGenerator(new TigerDigest());
+                //     break;
+                // END android-removed
                 case SHA256:
-                    generator = new PKCS5S2ParametersGenerator(new SHA256Digest());
-                    break;
-                case GOST3411:
-                    generator = new PKCS5S2ParametersGenerator(new GOST3411Digest());
+                    // BEGIN android-changed
+                    generator = new PKCS5S2ParametersGenerator(AndroidDigestFactory.getSHA256());
+                    // END android-changed
                     break;
+                // BEGIN android-removed
+                // case GOST3411:
+                //     generator = new PKCS5S2ParametersGenerator(new GOST3411Digest());
+                //     break;
+                // END android-removed
                 default:
                     throw new IllegalStateException("unknown digest scheme for PBE PKCS5S2 encryption.");
                 }
@@ -103,27 +130,39 @@ public interface PBE
             {
                 switch (hash)
                 {
-                case MD2:
-                    generator = new PKCS12ParametersGenerator(new MD2Digest());
-                    break;
+                // BEGIN android-removed
+                // case MD2:
+                //     generator = new PKCS12ParametersGenerator(new MD2Digest());
+                //     break;
+                // END android-removed
                 case MD5:
-                    generator = new PKCS12ParametersGenerator(new MD5Digest());
+                    // BEGIN android-changed
+                    generator = new PKCS12ParametersGenerator(AndroidDigestFactory.getMD5());
+                    // END android-changed
                     break;
                 case SHA1:
-                    generator = new PKCS12ParametersGenerator(new SHA1Digest());
-                    break;
-                case RIPEMD160:
-                    generator = new PKCS12ParametersGenerator(new RIPEMD160Digest());
-                    break;
-                case TIGER:
-                    generator = new PKCS12ParametersGenerator(new TigerDigest());
+                    // BEGIN android-changed
+                    generator = new PKCS12ParametersGenerator(AndroidDigestFactory.getSHA1());
+                    // END android-changed
                     break;
+                // BEGIN android-removed
+                // case RIPEMD160:
+                //     generator = new PKCS12ParametersGenerator(new RIPEMD160Digest());
+                //     break;
+                // case TIGER:
+                //     generator = new PKCS12ParametersGenerator(new TigerDigest());
+                //     break;
+                // END android-removed
                 case SHA256:
-                    generator = new PKCS12ParametersGenerator(new SHA256Digest());
-                    break;
-                case GOST3411:
-                    generator = new PKCS12ParametersGenerator(new GOST3411Digest());
+                    // BEGIN android-changed
+                    generator = new PKCS12ParametersGenerator(AndroidDigestFactory.getSHA256());
+                    // END android-changed
                     break;
+                // BEGIN android-removed
+                // case GOST3411:
+                //     generator = new PKCS12ParametersGenerator(new GOST3411Digest());
+                //     break;
+                // END android-removed
                 default:
                     throw new IllegalStateException("unknown digest scheme for PBE encryption.");
                 }
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/util/DigestFactory.java b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/util/DigestFactory.java
index f97e75f..19ca6b1 100644
--- a/bcprov/src/main/java/org/bouncycastle/jcajce/provider/util/DigestFactory.java
+++ b/bcprov/src/main/java/org/bouncycastle/jcajce/provider/util/DigestFactory.java
@@ -10,12 +10,17 @@ import org.bouncycastle.asn1.nist.NISTObjectIdentifiers;
 import org.bouncycastle.asn1.oiw.OIWObjectIdentifiers;
 import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
 import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.digests.MD5Digest;
-import org.bouncycastle.crypto.digests.SHA1Digest;
-import org.bouncycastle.crypto.digests.SHA224Digest;
-import org.bouncycastle.crypto.digests.SHA256Digest;
-import org.bouncycastle.crypto.digests.SHA384Digest;
-import org.bouncycastle.crypto.digests.SHA512Digest;
+// BEGIN android-removed
+// import org.bouncycastle.crypto.digests.MD5Digest;
+// import org.bouncycastle.crypto.digests.SHA1Digest;
+// import org.bouncycastle.crypto.digests.SHA224Digest;
+// import org.bouncycastle.crypto.digests.SHA256Digest;
+// import org.bouncycastle.crypto.digests.SHA384Digest;
+// import org.bouncycastle.crypto.digests.SHA512Digest;
+// END android-removed
+// BEGIN android-added
+import org.bouncycastle.crypto.digests.AndroidDigestFactory;
+// END android-added
 import org.bouncycastle.util.Strings;
 
 public class DigestFactory
@@ -85,27 +90,39 @@ public class DigestFactory
         
         if (sha1.contains(digestName))
         {
-            return new SHA1Digest();
+            // BEGIN android-changed
+            return AndroidDigestFactory.getSHA1();
+            // END android-changed
         }
         if (md5.contains(digestName))
         {
-            return new MD5Digest();
+            // BEGIN android-changed
+            return AndroidDigestFactory.getMD5();
+            // END android-changed
         }
         if (sha224.contains(digestName))
         {
-            return new SHA224Digest();
+            // BEGIN android-changed
+            return AndroidDigestFactory.getSHA224();
+            // END android-changed
         }
         if (sha256.contains(digestName))
         {
-            return new SHA256Digest();
+            // BEGIN android-changed
+            return AndroidDigestFactory.getSHA256();
+            // END android-changed
         }
         if (sha384.contains(digestName))
         {
-            return new SHA384Digest();
+            // BEGIN android-changed
+            return AndroidDigestFactory.getSHA384();
+            // END android-changed
         }
         if (sha512.contains(digestName))
         {
-            return new SHA512Digest();
+            // BEGIN android-changed
+            return AndroidDigestFactory.getSHA512();
+            // END android-changed
         }
         
         return null;
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/spec/GOST28147ParameterSpec.java b/bcprov/src/main/java/org/bouncycastle/jcajce/spec/GOST28147ParameterSpec.java
deleted file mode 100644
index be341c4..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jcajce/spec/GOST28147ParameterSpec.java
+++ /dev/null
@@ -1,108 +0,0 @@
-package org.bouncycastle.jcajce.spec;
-
-import java.security.spec.AlgorithmParameterSpec;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.cryptopro.CryptoProObjectIdentifiers;
-import org.bouncycastle.crypto.engines.GOST28147Engine;
-import org.bouncycastle.util.Arrays;
-
-/**
- * A parameter spec for the GOST-28147 cipher.
- */
-public class GOST28147ParameterSpec
-    implements AlgorithmParameterSpec
-{
-    private byte[] iv = null;
-    private byte[] sBox = null;
-
-    public GOST28147ParameterSpec(
-        byte[] sBox)
-    {
-        this.sBox = new byte[sBox.length];
-        
-        System.arraycopy(sBox, 0, this.sBox, 0, sBox.length);
-    }
-
-    public GOST28147ParameterSpec(
-        byte[] sBox,
-        byte[] iv)
-    {
-        this(sBox);
-        this.iv = new byte[iv.length];
-        
-        System.arraycopy(iv, 0, this.iv, 0, iv.length);
-    }
-    
-    public GOST28147ParameterSpec(
-        String sBoxName)
-    {
-        this.sBox = GOST28147Engine.getSBox(sBoxName);
-    }
-
-    public GOST28147ParameterSpec(
-        String sBoxName,
-        byte[] iv)
-    {
-        this(sBoxName);
-        this.iv = new byte[iv.length];
-        
-        System.arraycopy(iv, 0, this.iv, 0, iv.length);
-    }
-
-    public GOST28147ParameterSpec(
-        ASN1ObjectIdentifier sBoxName,
-        byte[] iv)
-    {
-        this(getName(sBoxName));
-        this.iv = Arrays.clone(iv);
-    }
-
-    public byte[] getSbox()
-    {
-        return sBox;
-    }
-
-    /**
-     * Returns the IV or null if this parameter set does not contain an IV.
-     *
-     * @return the IV or null if this parameter set does not contain an IV.
-     */
-    public byte[] getIV()
-    {
-        if (iv == null)
-        {
-            return null;
-        }
-
-        byte[]  tmp = new byte[iv.length];
-
-        System.arraycopy(iv, 0, tmp, 0, tmp.length);
-
-        return tmp;
-    }
-
-    private static Map oidMappings = new HashMap();
-
-    static
-    {
-        oidMappings.put(CryptoProObjectIdentifiers.id_Gost28147_89_CryptoPro_A_ParamSet, "E-A");
-        oidMappings.put(CryptoProObjectIdentifiers.id_Gost28147_89_CryptoPro_B_ParamSet, "E-B");
-        oidMappings.put(CryptoProObjectIdentifiers.id_Gost28147_89_CryptoPro_C_ParamSet, "E-C");
-        oidMappings.put(CryptoProObjectIdentifiers.id_Gost28147_89_CryptoPro_D_ParamSet, "E-D");
-    }
-
-    private static String getName(ASN1ObjectIdentifier sBoxOid)
-    {
-        String sBoxName = (String)oidMappings.get(sBoxOid);
-
-        if (sBoxName == null)
-        {
-            throw new IllegalArgumentException("unknown OID: " + sBoxOid);
-        }
-
-        return sBoxName;
-    }
-}
\ No newline at end of file
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/spec/RepeatedSecretKeySpec.java b/bcprov/src/main/java/org/bouncycastle/jcajce/spec/RepeatedSecretKeySpec.java
deleted file mode 100644
index 6af15db..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jcajce/spec/RepeatedSecretKeySpec.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package org.bouncycastle.jcajce.spec;
-
-
-import javax.crypto.SecretKey;
-
-/**
- * A simple object to indicate that a symmetric cipher should reuse the
- * last key provided.
- */
-public class RepeatedSecretKeySpec
-    implements SecretKey
-{
-    private String algorithm;
-
-    public RepeatedSecretKeySpec(String algorithm)
-    {
-        this.algorithm = algorithm;
-    }
-
-    public String getAlgorithm()
-    {
-        return algorithm;
-    }
-
-    public String getFormat()
-    {
-        return null;
-    }
-
-    public byte[] getEncoded()
-    {
-        return null;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/spec/SkeinParameterSpec.java b/bcprov/src/main/java/org/bouncycastle/jcajce/spec/SkeinParameterSpec.java
deleted file mode 100644
index c8c6c1a..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jcajce/spec/SkeinParameterSpec.java
+++ /dev/null
@@ -1,319 +0,0 @@
-package org.bouncycastle.jcajce.spec;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.OutputStreamWriter;
-import java.security.spec.AlgorithmParameterSpec;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Locale;
-import java.util.Map;
-
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.Integers;
-
-/**
- * Parameters for the Skein hash function - a series of byte[] strings identified by integer tags.
- * <p>
- * Parameterised Skein can be used for:
- * <ul>
- * <li>MAC generation, by providing a {@link org.bouncycastle.jcajce.spec.SkeinParameterSpec.Builder#setKey(byte[]) key}.</li>
- * <li>Randomised hashing, by providing a {@link org.bouncycastle.jcajce.spec.SkeinParameterSpec.Builder#setNonce(byte[]) nonce}.</li>
- * <li>A hash function for digital signatures, associating a
- * {@link org.bouncycastle.jcajce.spec.SkeinParameterSpec.Builder#setPublicKey(byte[]) public key} with the message digest.</li>
- * <li>A key derivation function, by providing a
- * {@link org.bouncycastle.jcajce.spec.SkeinParameterSpec.Builder#setKeyIdentifier(byte[]) key identifier}.</li>
- * <li>Personalised hashing, by providing a
- * {@link org.bouncycastle.jcajce.spec.SkeinParameterSpec.Builder#setPersonalisation(java.util.Date, String, String) recommended format} or
- * {@link org.bouncycastle.jcajce.spec.SkeinParameterSpec.Builder#setPersonalisation(byte[]) arbitrary} personalisation string.</li>
- * </ul>
- * </p>
- * @see org.bouncycastle.crypto.digests.SkeinEngine
- * @see org.bouncycastle.crypto.digests.SkeinDigest
- * @see org.bouncycastle.crypto.macs.SkeinMac
- */
-public class SkeinParameterSpec
-    implements AlgorithmParameterSpec
-{
-    /**
-     * The parameter type for a secret key, supporting MAC or KDF functions: {@value
-     * #PARAM_TYPE_KEY}.
-     */
-    public static final int PARAM_TYPE_KEY = 0;
-
-    /**
-     * The parameter type for the Skein configuration block: {@value #PARAM_TYPE_CONFIG}.
-     */
-    public static final int PARAM_TYPE_CONFIG = 4;
-
-    /**
-     * The parameter type for a personalisation string: {@value #PARAM_TYPE_PERSONALISATION}.
-     */
-    public static final int PARAM_TYPE_PERSONALISATION = 8;
-
-    /**
-     * The parameter type for a public key: {@value #PARAM_TYPE_PUBLIC_KEY}.
-     */
-    public static final int PARAM_TYPE_PUBLIC_KEY = 12;
-
-    /**
-     * The parameter type for a key identifier string: {@value #PARAM_TYPE_KEY_IDENTIFIER}.
-     */
-    public static final int PARAM_TYPE_KEY_IDENTIFIER = 16;
-
-    /**
-     * The parameter type for a nonce: {@value #PARAM_TYPE_NONCE}.
-     */
-    public static final int PARAM_TYPE_NONCE = 20;
-
-    /**
-     * The parameter type for the message: {@value #PARAM_TYPE_MESSAGE}.
-     */
-    public static final int PARAM_TYPE_MESSAGE = 48;
-
-    /**
-     * The parameter type for the output transformation: {@value #PARAM_TYPE_OUTPUT}.
-     */
-    public static final int PARAM_TYPE_OUTPUT = 63;
-
-    private Map parameters;
-
-    public SkeinParameterSpec()
-    {
-        this(new HashMap());
-    }
-
-    private SkeinParameterSpec(Map parameters)
-    {
-        this.parameters = Collections.unmodifiableMap(parameters);
-    }
-
-    /**
-     * Obtains a map of type (Integer) to value (byte[]) for the parameters tracked in this object.
-     */
-    public Map getParameters()
-    {
-        return parameters;
-    }
-
-    /**
-     * Obtains the value of the {@link #PARAM_TYPE_KEY key parameter}, or <code>null</code> if not
-     * set.
-     */
-    public byte[] getKey()
-    {
-        return Arrays.clone((byte[])parameters.get(Integers.valueOf(PARAM_TYPE_KEY)));
-    }
-
-    /**
-     * Obtains the value of the {@link #PARAM_TYPE_PERSONALISATION personalisation parameter}, or
-     * <code>null</code> if not set.
-     */
-    public byte[] getPersonalisation()
-    {
-        return Arrays.clone((byte[])parameters.get(Integers.valueOf(PARAM_TYPE_PERSONALISATION)));
-    }
-
-    /**
-     * Obtains the value of the {@link #PARAM_TYPE_PUBLIC_KEY public key parameter}, or
-     * <code>null</code> if not set.
-     */
-    public byte[] getPublicKey()
-    {
-        return Arrays.clone((byte[])parameters.get(Integers.valueOf(PARAM_TYPE_PUBLIC_KEY)));
-    }
-
-    /**
-     * Obtains the value of the {@link #PARAM_TYPE_KEY_IDENTIFIER key identifier parameter}, or
-     * <code>null</code> if not set.
-     */
-    public byte[] getKeyIdentifier()
-    {
-        return Arrays.clone((byte[])parameters.get(Integers.valueOf(PARAM_TYPE_KEY_IDENTIFIER)));
-    }
-
-    /**
-     * Obtains the value of the {@link #PARAM_TYPE_NONCE nonce parameter}, or <code>null</code> if
-     * not set.
-     */
-    public byte[] getNonce()
-    {
-        return Arrays.clone((byte[])parameters.get(Integers.valueOf(PARAM_TYPE_NONCE)));
-    }
-
-    /**
-     * A builder for {@link org.bouncycastle.jcajce.spec.SkeinParameterSpec}.
-     */
-    public static class Builder
-    {
-        private Map parameters = new HashMap();
-
-        public Builder()
-        {
-        }
-
-        public Builder(SkeinParameterSpec params)
-        {
-            Iterator keys = params.parameters.keySet().iterator();
-            while (keys.hasNext())
-            {
-                Integer key = (Integer)keys.next();
-                parameters.put(key, params.parameters.get(key));
-            }
-        }
-
-        /**
-         * Sets a parameters to apply to the Skein hash function.<br>
-         * Parameter types must be in the range 0,5..62, and cannot use the value {@value
-         * org.bouncycastle.jcajce.spec.SkeinParameterSpec#PARAM_TYPE_MESSAGE} (reserved for message body).
-         * <p>
-         * Parameters with type < {@value org.bouncycastle.jcajce.spec.SkeinParameterSpec#PARAM_TYPE_MESSAGE} are processed before
-         * the message content, parameters with type > {@value org.bouncycastle.jcajce.spec.SkeinParameterSpec#PARAM_TYPE_MESSAGE}
-         * are processed after the message and prior to output.
-         * </p>
-         * @param type  the type of the parameter, in the range 5..62.
-         * @param value the byte sequence of the parameter.
-         * @return
-         */
-        public Builder set(int type, byte[] value)
-        {
-            if (value == null)
-            {
-                throw new IllegalArgumentException("Parameter value must not be null.");
-            }
-            if ((type != PARAM_TYPE_KEY)
-                && (type <= PARAM_TYPE_CONFIG || type >= PARAM_TYPE_OUTPUT || type == PARAM_TYPE_MESSAGE))
-            {
-                throw new IllegalArgumentException("Parameter types must be in the range 0,5..47,49..62.");
-            }
-            if (type == PARAM_TYPE_CONFIG)
-            {
-                throw new IllegalArgumentException("Parameter type " + PARAM_TYPE_CONFIG
-                    + " is reserved for internal use.");
-            }
-            this.parameters.put(Integers.valueOf(type), value);
-            return this;
-        }
-
-        /**
-         * Sets the {@link org.bouncycastle.jcajce.spec.SkeinParameterSpec#PARAM_TYPE_KEY} parameter.
-         */
-        public Builder setKey(byte[] key)
-        {
-            return set(PARAM_TYPE_KEY, key);
-        }
-
-        /**
-         * Sets the {@link org.bouncycastle.jcajce.spec.SkeinParameterSpec#PARAM_TYPE_PERSONALISATION} parameter.
-         */
-        public Builder setPersonalisation(byte[] personalisation)
-        {
-            return set(PARAM_TYPE_PERSONALISATION, personalisation);
-        }
-
-        /**
-         * Implements the recommended personalisation format for Skein defined in Section 4.11 of
-         * the Skein 1.3 specification.
-         * <p>
-         * The format is <code>YYYYMMDD email@address distinguisher</code>, encoded to a byte
-         * sequence using UTF-8 encoding.
-         * </p>
-         * @param date          the date the personalised application of the Skein was defined.
-         * @param emailAddress  the email address of the creation of the personalised application.
-         * @param distinguisher an arbitrary personalisation string distinguishing the application.
-         * @return
-         */
-        public Builder setPersonalisation(Date date, String emailAddress, String distinguisher)
-        {
-            try
-            {
-                final ByteArrayOutputStream bout = new ByteArrayOutputStream();
-                final OutputStreamWriter out = new OutputStreamWriter(bout, "UTF-8");
-                final DateFormat format = new SimpleDateFormat("YYYYMMDD");
-                out.write(format.format(date));
-                out.write(" ");
-                out.write(emailAddress);
-                out.write(" ");
-                out.write(distinguisher);
-                out.close();
-                return set(PARAM_TYPE_PERSONALISATION, bout.toByteArray());
-            }
-            catch (IOException e)
-            {
-                throw new IllegalStateException("Byte I/O failed: " + e);
-            }
-        }
-
-        /**
-          * Implements the recommended personalisation format for Skein defined in Section 4.11 of
-          * the Skein 1.3 specification. You may need to use this method if the default locale
-          * doesn't use a Gregorian calender so that the GeneralizedTime produced is compatible implementations.
-          * <p>
-          * The format is <code>YYYYMMDD email@address distinguisher</code>, encoded to a byte
-          * sequence using UTF-8 encoding.
-          *
-          * @param date          the date the personalised application of the Skein was defined.
-          * @param dateLocale    locale to be used for date interpretation.
-          * @param emailAddress  the email address of the creation of the personalised application.
-          * @param distinguisher an arbitrary personalisation string distinguishing the application.
-          * @return the current builder.
-          */
-         public Builder setPersonalisation(Date date, Locale dateLocale, String emailAddress, String distinguisher)
-         {
-             try
-             {
-                 final ByteArrayOutputStream bout = new ByteArrayOutputStream();
-                 final OutputStreamWriter out = new OutputStreamWriter(bout, "UTF-8");
-                 final DateFormat format = new SimpleDateFormat("YYYYMMDD", dateLocale);
-                 out.write(format.format(date));
-                 out.write(" ");
-                 out.write(emailAddress);
-                 out.write(" ");
-                 out.write(distinguisher);
-                 out.close();
-                 return set(PARAM_TYPE_PERSONALISATION, bout.toByteArray());
-             }
-             catch (IOException e)
-             {
-                 throw new IllegalStateException("Byte I/O failed: " + e);
-             }
-         }
-
-        /**
-         * Sets the {@link org.bouncycastle.jcajce.spec.SkeinParameterSpec#PARAM_TYPE_KEY_IDENTIFIER} parameter.
-         */
-        public Builder setPublicKey(byte[] publicKey)
-        {
-            return set(PARAM_TYPE_PUBLIC_KEY, publicKey);
-        }
-
-        /**
-         * Sets the {@link org.bouncycastle.jcajce.spec.SkeinParameterSpec#PARAM_TYPE_KEY_IDENTIFIER} parameter.
-         */
-        public Builder setKeyIdentifier(byte[] keyIdentifier)
-        {
-            return set(PARAM_TYPE_KEY_IDENTIFIER, keyIdentifier);
-        }
-
-        /**
-         * Sets the {@link org.bouncycastle.jcajce.spec.SkeinParameterSpec#PARAM_TYPE_NONCE} parameter.
-         */
-        public Builder setNonce(byte[] nonce)
-        {
-            return set(PARAM_TYPE_NONCE, nonce);
-        }
-
-        /**
-         * Constructs a new {@link org.bouncycastle.jcajce.spec.SkeinParameterSpec} instance with the parameters provided to this
-         * builder.
-         */
-        public SkeinParameterSpec build()
-        {
-            return new SkeinParameterSpec(parameters);
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/util/JcaJceUtils.java b/bcprov/src/main/java/org/bouncycastle/jcajce/util/JcaJceUtils.java
index 9f62ced..a082d89 100644
--- a/bcprov/src/main/java/org/bouncycastle/jcajce/util/JcaJceUtils.java
+++ b/bcprov/src/main/java/org/bouncycastle/jcajce/util/JcaJceUtils.java
@@ -6,11 +6,15 @@ import java.security.AlgorithmParameters;
 import org.bouncycastle.asn1.ASN1Encodable;
 import org.bouncycastle.asn1.ASN1ObjectIdentifier;
 import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.cryptopro.CryptoProObjectIdentifiers;
+// BEGIN android-removed
+// import org.bouncycastle.asn1.cryptopro.CryptoProObjectIdentifiers;
+// END android-removed
 import org.bouncycastle.asn1.nist.NISTObjectIdentifiers;
 import org.bouncycastle.asn1.oiw.OIWObjectIdentifiers;
 import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.asn1.teletrust.TeleTrusTObjectIdentifiers;
+// BEGIN android-removed
+// import org.bouncycastle.asn1.teletrust.TeleTrusTObjectIdentifiers;
+// END android-removed
 
 /**
  * General JCA/JCE utility methods.
@@ -100,22 +104,24 @@ public class JcaJceUtils
         {
             return "SHA512";
         }
-        else if (TeleTrusTObjectIdentifiers.ripemd128.equals(digestAlgOID))
-        {
-            return "RIPEMD128";
-        }
-        else if (TeleTrusTObjectIdentifiers.ripemd160.equals(digestAlgOID))
-        {
-            return "RIPEMD160";
-        }
-        else if (TeleTrusTObjectIdentifiers.ripemd256.equals(digestAlgOID))
-        {
-            return "RIPEMD256";
-        }
-        else if (CryptoProObjectIdentifiers.gostR3411.equals(digestAlgOID))
-        {
-            return "GOST3411";
-        }
+        // BEGIN android-removed
+        // else if (TeleTrusTObjectIdentifiers.ripemd128.equals(digestAlgOID))
+        // {
+        //     return "RIPEMD128";
+        // }
+        // else if (TeleTrusTObjectIdentifiers.ripemd160.equals(digestAlgOID))
+        // {
+        //     return "RIPEMD160";
+        // }
+        // else if (TeleTrusTObjectIdentifiers.ripemd256.equals(digestAlgOID))
+        // {
+        //     return "RIPEMD256";
+        // }
+        // else if (CryptoProObjectIdentifiers.gostR3411.equals(digestAlgOID))
+        // {
+        //     return "GOST3411";
+        // }
+        // END android-removed
         else
         {
             return digestAlgOID.getId();
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/ECGOST3410NamedCurveTable.java b/bcprov/src/main/java/org/bouncycastle/jce/ECGOST3410NamedCurveTable.java
deleted file mode 100644
index 7843e0a..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/ECGOST3410NamedCurveTable.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package org.bouncycastle.jce;
-
-import java.util.Enumeration;
-
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.cryptopro.ECGOST3410NamedCurves;
-import org.bouncycastle.crypto.params.ECDomainParameters;
-import org.bouncycastle.jce.spec.ECNamedCurveParameterSpec;
-
-/**
- * a table of locally supported named curves.
- */
-public class ECGOST3410NamedCurveTable
-{
-    /**
-     * return a parameter spec representing the passed in named
-     * curve. The routine returns null if the curve is not present.
-     * 
-     * @param name the name of the curve requested
-     * @return a parameter spec for the curve, null if it is not available.
-     */
-    public static ECNamedCurveParameterSpec getParameterSpec(
-        String  name)
-    {
-        ECDomainParameters  ecP = ECGOST3410NamedCurves.getByName(name);
-        if (ecP == null)
-        {
-            try
-            {
-                ecP = ECGOST3410NamedCurves.getByOID(new ASN1ObjectIdentifier(name));
-            }
-            catch (IllegalArgumentException e)
-            {
-                return null; // not an oid.
-            }
-        }
-        
-        if (ecP == null)
-        {
-            return null;
-        }
-
-        return new ECNamedCurveParameterSpec(
-                                        name,
-                                        ecP.getCurve(),
-                                        ecP.getG(),
-                                        ecP.getN(),
-                                        ecP.getH(),
-                                        ecP.getSeed());
-    }
-
-    /**
-     * return an enumeration of the names of the available curves.
-     *
-     * @return an enumeration of the names of the available curves.
-     */
-    public static Enumeration getNames()
-    {
-        return ECGOST3410NamedCurves.getNames();
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/ECKeyUtil.java b/bcprov/src/main/java/org/bouncycastle/jce/ECKeyUtil.java
deleted file mode 100644
index c4c72cf..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/ECKeyUtil.java
+++ /dev/null
@@ -1,229 +0,0 @@
-package org.bouncycastle.jce;
-
-import java.io.UnsupportedEncodingException;
-import java.security.KeyFactory;
-import java.security.NoSuchAlgorithmException;
-import java.security.NoSuchProviderException;
-import java.security.PrivateKey;
-import java.security.Provider;
-import java.security.PublicKey;
-import java.security.Security;
-import java.security.spec.PKCS8EncodedKeySpec;
-import java.security.spec.X509EncodedKeySpec;
-
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.cryptopro.CryptoProObjectIdentifiers;
-import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.bouncycastle.asn1.x9.X962Parameters;
-import org.bouncycastle.asn1.x9.X9ECParameters;
-import org.bouncycastle.asn1.x9.X9ObjectIdentifiers;
-import org.bouncycastle.jcajce.provider.asymmetric.util.ECUtil;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-
-/**
- * Utility class to allow conversion of EC key parameters to explicit from named
- * curves and back (where possible).
- */
-public class ECKeyUtil
-{
-    /**
-     * Convert a passed in public EC key to have explicit parameters. If the key
-     * is already using explicit parameters it is returned.
-     *
-     * @param key key to be converted
-     * @param providerName provider name to be used.
-     * @return the equivalent key with explicit curve parameters
-     * @throws IllegalArgumentException
-     * @throws NoSuchAlgorithmException
-     * @throws NoSuchProviderException
-     */
-    public static PublicKey publicToExplicitParameters(PublicKey key, String providerName)
-        throws IllegalArgumentException, NoSuchAlgorithmException, NoSuchProviderException
-    {
-        Provider provider = Security.getProvider(providerName);
-
-        if (provider == null)
-        {
-            throw new NoSuchProviderException("cannot find provider: " + providerName);
-        }
-
-        return publicToExplicitParameters(key, provider);
-    }
-
-    /**
-     * Convert a passed in public EC key to have explicit parameters. If the key
-     * is already using explicit parameters it is returned.
-     *
-     * @param key key to be converted
-     * @param provider provider to be used.
-     * @return the equivalent key with explicit curve parameters
-     * @throws IllegalArgumentException
-     * @throws NoSuchAlgorithmException
-     */
-    public static PublicKey publicToExplicitParameters(PublicKey key, Provider provider)
-        throws IllegalArgumentException, NoSuchAlgorithmException
-    {
-        try
-        {
-            SubjectPublicKeyInfo info = SubjectPublicKeyInfo.getInstance(ASN1Primitive.fromByteArray(key.getEncoded()));
-
-            if (info.getAlgorithmId().getObjectId().equals(CryptoProObjectIdentifiers.gostR3410_2001))
-            {
-                throw new IllegalArgumentException("cannot convert GOST key to explicit parameters.");
-            }
-            else
-            {
-                X962Parameters params = X962Parameters.getInstance(info.getAlgorithmId().getParameters());
-                X9ECParameters curveParams;
-
-                if (params.isNamedCurve())
-                {
-                    ASN1ObjectIdentifier oid = ASN1ObjectIdentifier.getInstance(params.getParameters());
-
-                    curveParams = ECUtil.getNamedCurveByOid(oid);
-                    // ignore seed value due to JDK bug
-                    curveParams = new X9ECParameters(curveParams.getCurve(), curveParams.getG(), curveParams.getN(), curveParams.getH());
-                }
-                else if (params.isImplicitlyCA())
-                {
-                    curveParams = new X9ECParameters(BouncyCastleProvider.CONFIGURATION.getEcImplicitlyCa().getCurve(), BouncyCastleProvider.CONFIGURATION.getEcImplicitlyCa().getG(), BouncyCastleProvider.CONFIGURATION.getEcImplicitlyCa().getN(), BouncyCastleProvider.CONFIGURATION.getEcImplicitlyCa().getH());
-                }
-                else
-                {
-                    return key;   // already explicit
-                }
-
-                params = new X962Parameters(curveParams);
-
-                info = new SubjectPublicKeyInfo(new AlgorithmIdentifier(X9ObjectIdentifiers.id_ecPublicKey, params), info.getPublicKeyData().getBytes());
-
-                KeyFactory keyFact = KeyFactory.getInstance(key.getAlgorithm(), provider);
-
-                return keyFact.generatePublic(new X509EncodedKeySpec(info.getEncoded()));
-            }
-        }
-        catch (IllegalArgumentException e)
-        {
-            throw e;
-        }
-        catch (NoSuchAlgorithmException e)
-        {
-            throw e;
-        }
-        catch (Exception e)
-        {               // shouldn't really happen...
-            throw new UnexpectedException(e);
-        }
-    }
-
-    /**
-     * Convert a passed in private EC key to have explicit parameters. If the key
-     * is already using explicit parameters it is returned.
-     *
-     * @param key key to be converted
-     * @param providerName provider name to be used.
-     * @return the equivalent key with explicit curve parameters
-     * @throws IllegalArgumentException
-     * @throws NoSuchAlgorithmException
-     * @throws NoSuchProviderException
-     */
-    public static PrivateKey privateToExplicitParameters(PrivateKey key, String providerName)
-        throws IllegalArgumentException, NoSuchAlgorithmException, NoSuchProviderException
-    {
-        Provider provider = Security.getProvider(providerName);
-
-        if (provider == null)
-        {
-            throw new NoSuchProviderException("cannot find provider: " + providerName);
-        }
-
-        return privateToExplicitParameters(key, provider);
-    }
-
-    /**
-     * Convert a passed in private EC key to have explicit parameters. If the key
-     * is already using explicit parameters it is returned.
-     *
-     * @param key key to be converted
-     * @param provider provider to be used.
-     * @return the equivalent key with explicit curve parameters
-     * @throws IllegalArgumentException
-     * @throws NoSuchAlgorithmException
-     */
-    public static PrivateKey privateToExplicitParameters(PrivateKey key, Provider provider)
-        throws IllegalArgumentException, NoSuchAlgorithmException
-    {
-        try
-        {
-            PrivateKeyInfo info = PrivateKeyInfo.getInstance(ASN1Primitive.fromByteArray(key.getEncoded()));
-
-            if (info.getAlgorithmId().getObjectId().equals(CryptoProObjectIdentifiers.gostR3410_2001))
-            {
-                throw new UnsupportedEncodingException("cannot convert GOST key to explicit parameters.");
-            }
-            else
-            {
-                X962Parameters params = X962Parameters.getInstance(info.getAlgorithmId().getParameters());
-                X9ECParameters curveParams;
-
-                if (params.isNamedCurve())
-                {
-                    ASN1ObjectIdentifier oid = ASN1ObjectIdentifier.getInstance(params.getParameters());
-
-                    curveParams = ECUtil.getNamedCurveByOid(oid);
-                    // ignore seed value due to JDK bug
-                    curveParams = new X9ECParameters(curveParams.getCurve(), curveParams.getG(), curveParams.getN(), curveParams.getH());
-                }
-                else if (params.isImplicitlyCA())
-                {
-                    curveParams = new X9ECParameters(BouncyCastleProvider.CONFIGURATION.getEcImplicitlyCa().getCurve(), BouncyCastleProvider.CONFIGURATION.getEcImplicitlyCa().getG(), BouncyCastleProvider.CONFIGURATION.getEcImplicitlyCa().getN(), BouncyCastleProvider.CONFIGURATION.getEcImplicitlyCa().getH());
-                }
-                else
-                {
-                    return key;   // already explicit
-                }
-
-                params = new X962Parameters(curveParams);
-
-                info = new PrivateKeyInfo(new AlgorithmIdentifier(X9ObjectIdentifiers.id_ecPublicKey, params), info.parsePrivateKey());
-
-                KeyFactory keyFact = KeyFactory.getInstance(key.getAlgorithm(), provider);
-
-                return keyFact.generatePrivate(new PKCS8EncodedKeySpec(info.getEncoded()));
-            }
-        }
-        catch (IllegalArgumentException e)
-        {
-            throw e;
-        }
-        catch (NoSuchAlgorithmException e)
-        {
-            throw e;
-        }
-        catch (Exception e)
-        {          // shouldn't really happen
-            throw new UnexpectedException(e);
-        }
-    }
-
-    private static class UnexpectedException
-        extends RuntimeException
-    {
-        private Throwable cause;
-
-        UnexpectedException(Throwable cause)
-        {
-            super(cause.toString());
-
-            this.cause = cause;
-        }
-
-        public Throwable getCause()
-        {
-            return cause;
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/ECPointUtil.java b/bcprov/src/main/java/org/bouncycastle/jce/ECPointUtil.java
deleted file mode 100644
index 5ff966a..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/ECPointUtil.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package org.bouncycastle.jce;
-
-import java.security.spec.ECFieldF2m;
-import java.security.spec.ECFieldFp;
-import java.security.spec.ECPoint;
-import java.security.spec.EllipticCurve;
-
-import org.bouncycastle.math.ec.ECCurve;
-
-/**
- * Utility class for handling EC point decoding.
- */
-public class ECPointUtil
-{
-    /**
-     * Decode a point on this curve which has been encoded using point
-     * compression (X9.62 s 4.2.1 and 4.2.2) or regular encoding.
-     * 
-     * @param curve
-     *            The elliptic curve.
-     * @param encoded
-     *            The encoded point.
-     * @return the decoded point.
-     */
-    public static ECPoint decodePoint(
-       EllipticCurve curve, 
-       byte[] encoded)
-    {
-        ECCurve c = null;
-        
-        if (curve.getField() instanceof ECFieldFp)
-        {
-            c = new ECCurve.Fp(
-                    ((ECFieldFp)curve.getField()).getP(), curve.getA(), curve.getB());
-        }
-        else
-        {
-            int k[] = ((ECFieldF2m)curve.getField()).getMidTermsOfReductionPolynomial();
-            
-            if (k.length == 3)
-            {
-                c = new ECCurve.F2m(
-                        ((ECFieldF2m)curve.getField()).getM(), k[2], k[1], k[0], curve.getA(), curve.getB());
-            }
-            else
-            {
-                c = new ECCurve.F2m(
-                        ((ECFieldF2m)curve.getField()).getM(), k[0], curve.getA(), curve.getB());
-            }
-        }
-        
-        org.bouncycastle.math.ec.ECPoint p = c.decodePoint(encoded);
-
-        return new ECPoint(p.getAffineXCoord().toBigInteger(), p.getAffineYCoord().toBigInteger());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/MultiCertStoreParameters.java b/bcprov/src/main/java/org/bouncycastle/jce/MultiCertStoreParameters.java
deleted file mode 100644
index 2ffa031..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/MultiCertStoreParameters.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package org.bouncycastle.jce;
-
-import java.security.cert.CertStoreParameters;
-import java.util.Collection;
-
-public class MultiCertStoreParameters
-    implements CertStoreParameters
-{
-    private Collection certStores;
-    private boolean searchAllStores;
-
-    /**
-     * Create a parameters object which specifies searching of all the passed in stores.
-     *
-     * @param certStores CertStores making up the multi CertStore
-     */
-    public MultiCertStoreParameters(Collection certStores)
-    {
-        this(certStores, true);
-    }
-
-    /**
-     * Create a parameters object which can be to used to make a multi store made up
-     * of the passed in CertStores. If the searchAllStores parameter is false, any search on
-     * the multi-store will terminate as soon as a search query produces a result.
-     * 
-     * @param certStores CertStores making up the multi CertStore
-     * @param searchAllStores true if all CertStores should be searched on request, false if a result
-     * should be returned on the first successful CertStore query.
-     */
-    public MultiCertStoreParameters(Collection certStores, boolean searchAllStores)
-    {
-        this.certStores = certStores;
-        this.searchAllStores = searchAllStores;
-    }
-
-    public Collection getCertStores()
-    {
-        return certStores;
-    }
-
-    public boolean getSearchAllStores()
-    {
-        return searchAllStores;
-    }
-
-    public Object clone()
-    {
-        return this;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/PKCS10CertificationRequest.java b/bcprov/src/main/java/org/bouncycastle/jce/PKCS10CertificationRequest.java
index 13bed1a..3670695 100644
--- a/bcprov/src/main/java/org/bouncycastle/jce/PKCS10CertificationRequest.java
+++ b/bcprov/src/main/java/org/bouncycastle/jce/PKCS10CertificationRequest.java
@@ -30,14 +30,18 @@ import org.bouncycastle.asn1.ASN1Sequence;
 import org.bouncycastle.asn1.ASN1Set;
 import org.bouncycastle.asn1.DERBitString;
 import org.bouncycastle.asn1.DERNull;
-import org.bouncycastle.asn1.cryptopro.CryptoProObjectIdentifiers;
+// BEGIN android-removed
+// import org.bouncycastle.asn1.cryptopro.CryptoProObjectIdentifiers;
+// END android-removed
 import org.bouncycastle.asn1.nist.NISTObjectIdentifiers;
 import org.bouncycastle.asn1.oiw.OIWObjectIdentifiers;
 import org.bouncycastle.asn1.pkcs.CertificationRequest;
 import org.bouncycastle.asn1.pkcs.CertificationRequestInfo;
 import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
 import org.bouncycastle.asn1.pkcs.RSASSAPSSparams;
-import org.bouncycastle.asn1.teletrust.TeleTrusTObjectIdentifiers;
+// BEGIN android-removed
+// import org.bouncycastle.asn1.teletrust.TeleTrusTObjectIdentifiers;
+// END android-removed
 import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
 import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
 import org.bouncycastle.asn1.x509.X509Name;
@@ -81,8 +85,11 @@ public class PKCS10CertificationRequest
 
     static
     {
-        algorithms.put("MD2WITHRSAENCRYPTION", new ASN1ObjectIdentifier("1.2.840.113549.1.1.2"));
-        algorithms.put("MD2WITHRSA", new ASN1ObjectIdentifier("1.2.840.113549.1.1.2"));
+        // BEGIN android-removed
+        // Dropping MD2
+        // algorithms.put("MD2WITHRSAENCRYPTION", new ASN1ObjectIdentifier("1.2.840.113549.1.1.2"));
+        // algorithms.put("MD2WITHRSA", new ASN1ObjectIdentifier("1.2.840.113549.1.1.2"));
+        // END android-removed
         algorithms.put("MD5WITHRSAENCRYPTION", new ASN1ObjectIdentifier("1.2.840.113549.1.1.4"));
         algorithms.put("MD5WITHRSA", new ASN1ObjectIdentifier("1.2.840.113549.1.1.4"));
         algorithms.put("RSAWITHMD5", new ASN1ObjectIdentifier("1.2.840.113549.1.1.4"));
@@ -102,12 +109,14 @@ public class PKCS10CertificationRequest
         algorithms.put("SHA384WITHRSAANDMGF1", PKCSObjectIdentifiers.id_RSASSA_PSS);
         algorithms.put("SHA512WITHRSAANDMGF1", PKCSObjectIdentifiers.id_RSASSA_PSS);
         algorithms.put("RSAWITHSHA1", new ASN1ObjectIdentifier("1.2.840.113549.1.1.5"));
-        algorithms.put("RIPEMD128WITHRSAENCRYPTION", TeleTrusTObjectIdentifiers.rsaSignatureWithripemd128);
-        algorithms.put("RIPEMD128WITHRSA", TeleTrusTObjectIdentifiers.rsaSignatureWithripemd128);
-        algorithms.put("RIPEMD160WITHRSAENCRYPTION", TeleTrusTObjectIdentifiers.rsaSignatureWithripemd160);
-        algorithms.put("RIPEMD160WITHRSA", TeleTrusTObjectIdentifiers.rsaSignatureWithripemd160);
-        algorithms.put("RIPEMD256WITHRSAENCRYPTION", TeleTrusTObjectIdentifiers.rsaSignatureWithripemd256);
-        algorithms.put("RIPEMD256WITHRSA", TeleTrusTObjectIdentifiers.rsaSignatureWithripemd256);
+        // BEGIN android-removed
+        // algorithms.put("RIPEMD128WITHRSAENCRYPTION", TeleTrusTObjectIdentifiers.rsaSignatureWithripemd128);
+        // algorithms.put("RIPEMD128WITHRSA", TeleTrusTObjectIdentifiers.rsaSignatureWithripemd128);
+        // algorithms.put("RIPEMD160WITHRSAENCRYPTION", TeleTrusTObjectIdentifiers.rsaSignatureWithripemd160);
+        // algorithms.put("RIPEMD160WITHRSA", TeleTrusTObjectIdentifiers.rsaSignatureWithripemd160);
+        // algorithms.put("RIPEMD256WITHRSAENCRYPTION", TeleTrusTObjectIdentifiers.rsaSignatureWithripemd256);
+        // algorithms.put("RIPEMD256WITHRSA", TeleTrusTObjectIdentifiers.rsaSignatureWithripemd256);
+        // END android-removed
         algorithms.put("SHA1WITHDSA", new ASN1ObjectIdentifier("1.2.840.10040.4.3"));
         algorithms.put("DSAWITHSHA1", new ASN1ObjectIdentifier("1.2.840.10040.4.3"));
         algorithms.put("SHA224WITHDSA", NISTObjectIdentifiers.dsa_with_sha224);
@@ -120,11 +129,13 @@ public class PKCS10CertificationRequest
         algorithms.put("SHA384WITHECDSA", X9ObjectIdentifiers.ecdsa_with_SHA384);
         algorithms.put("SHA512WITHECDSA", X9ObjectIdentifiers.ecdsa_with_SHA512);
         algorithms.put("ECDSAWITHSHA1", X9ObjectIdentifiers.ecdsa_with_SHA1);
-        algorithms.put("GOST3411WITHGOST3410", CryptoProObjectIdentifiers.gostR3411_94_with_gostR3410_94);
-        algorithms.put("GOST3410WITHGOST3411", CryptoProObjectIdentifiers.gostR3411_94_with_gostR3410_94);
-        algorithms.put("GOST3411WITHECGOST3410", CryptoProObjectIdentifiers.gostR3411_94_with_gostR3410_2001);
-        algorithms.put("GOST3411WITHECGOST3410-2001", CryptoProObjectIdentifiers.gostR3411_94_with_gostR3410_2001);
-        algorithms.put("GOST3411WITHGOST3410-2001", CryptoProObjectIdentifiers.gostR3411_94_with_gostR3410_2001);
+        // BEGIN android-removed
+        // algorithms.put("GOST3411WITHGOST3410", CryptoProObjectIdentifiers.gostR3411_94_with_gostR3410_94);
+        // algorithms.put("GOST3410WITHGOST3411", CryptoProObjectIdentifiers.gostR3411_94_with_gostR3410_94);
+        // algorithms.put("GOST3411WITHECGOST3410", CryptoProObjectIdentifiers.gostR3411_94_with_gostR3410_2001);
+        // algorithms.put("GOST3411WITHECGOST3410-2001", CryptoProObjectIdentifiers.gostR3411_94_with_gostR3410_2001);
+        // algorithms.put("GOST3411WITHGOST3410-2001", CryptoProObjectIdentifiers.gostR3411_94_with_gostR3410_2001);
+        // END android-removed
 
         //
         // reverse mappings
@@ -134,11 +145,15 @@ public class PKCS10CertificationRequest
         oids.put(PKCSObjectIdentifiers.sha256WithRSAEncryption, "SHA256WITHRSA");
         oids.put(PKCSObjectIdentifiers.sha384WithRSAEncryption, "SHA384WITHRSA");
         oids.put(PKCSObjectIdentifiers.sha512WithRSAEncryption, "SHA512WITHRSA");
-        oids.put(CryptoProObjectIdentifiers.gostR3411_94_with_gostR3410_94, "GOST3411WITHGOST3410");
-        oids.put(CryptoProObjectIdentifiers.gostR3411_94_with_gostR3410_2001, "GOST3411WITHECGOST3410");
+        // BEGIN android-removed
+        // oids.put(CryptoProObjectIdentifiers.gostR3411_94_with_gostR3410_94, "GOST3411WITHGOST3410");
+        // oids.put(CryptoProObjectIdentifiers.gostR3411_94_with_gostR3410_2001, "GOST3411WITHECGOST3410");
+        // END android-removed
         
         oids.put(new ASN1ObjectIdentifier("1.2.840.113549.1.1.4"), "MD5WITHRSA");
-        oids.put(new ASN1ObjectIdentifier("1.2.840.113549.1.1.2"), "MD2WITHRSA");
+        // BEGIN android-removed
+        // oids.put(new ASN1ObjectIdentifier("1.2.840.113549.1.1.2"), "MD2WITHRSA");
+        // END android-removed
         oids.put(new ASN1ObjectIdentifier("1.2.840.10040.4.3"), "SHA1WITHDSA");
         oids.put(X9ObjectIdentifiers.ecdsa_with_SHA1, "SHA1WITHECDSA");
         oids.put(X9ObjectIdentifiers.ecdsa_with_SHA224, "SHA224WITHECDSA");
@@ -172,8 +187,10 @@ public class PKCS10CertificationRequest
         //
         // RFC 4491
         //
-        noParams.add(CryptoProObjectIdentifiers.gostR3411_94_with_gostR3410_94);
-        noParams.add(CryptoProObjectIdentifiers.gostR3411_94_with_gostR3410_2001);
+        // BEGIN android-removed
+        // noParams.add(CryptoProObjectIdentifiers.gostR3411_94_with_gostR3410_94);
+        // noParams.add(CryptoProObjectIdentifiers.gostR3411_94_with_gostR3410_2001);
+        // END android-removed
         //
         // explicit params
         //
@@ -616,22 +633,24 @@ public class PKCS10CertificationRequest
         {
             return "SHA512";
         }
-        else if (TeleTrusTObjectIdentifiers.ripemd128.equals(digestAlgOID))
-        {
-            return "RIPEMD128";
-        }
-        else if (TeleTrusTObjectIdentifiers.ripemd160.equals(digestAlgOID))
-        {
-            return "RIPEMD160";
-        }
-        else if (TeleTrusTObjectIdentifiers.ripemd256.equals(digestAlgOID))
-        {
-            return "RIPEMD256";
-        }
-        else if (CryptoProObjectIdentifiers.gostR3411.equals(digestAlgOID))
-        {
-            return "GOST3411";
-        }
+        // BEGIN android-removed
+        // else if (TeleTrusTObjectIdentifiers.ripemd128.equals(digestAlgOID))
+        // {
+        //     return "RIPEMD128";
+        // }
+        // else if (TeleTrusTObjectIdentifiers.ripemd160.equals(digestAlgOID))
+        // {
+        //     return "RIPEMD160";
+        // }
+        // else if (TeleTrusTObjectIdentifiers.ripemd256.equals(digestAlgOID))
+        // {
+        //     return "RIPEMD256";
+        // }
+        // else if (CryptoProObjectIdentifiers.gostR3411.equals(digestAlgOID))
+        // {
+        //     return "GOST3411";
+        // }
+        // END android-removed
         else
         {
             return digestAlgOID.getId();            
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/PKCS12Util.java b/bcprov/src/main/java/org/bouncycastle/jce/PKCS12Util.java
deleted file mode 100644
index c7059b2..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/PKCS12Util.java
+++ /dev/null
@@ -1,126 +0,0 @@
-package org.bouncycastle.jce;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-
-import javax.crypto.Mac;
-import javax.crypto.SecretKey;
-import javax.crypto.SecretKeyFactory;
-import javax.crypto.spec.PBEKeySpec;
-import javax.crypto.spec.PBEParameterSpec;
-
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.DERNull;
-import org.bouncycastle.asn1.DEROctetString;
-import org.bouncycastle.asn1.DEROutputStream;
-import org.bouncycastle.asn1.pkcs.ContentInfo;
-import org.bouncycastle.asn1.pkcs.MacData;
-import org.bouncycastle.asn1.pkcs.Pfx;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.asn1.x509.DigestInfo;
-
-/**
- * Utility class for reencoding PKCS#12 files to definite length.
- */
-public class PKCS12Util
-{
-    /**
-     * Just re-encode the outer layer of the PKCS#12 file to definite length encoding.
-     *
-     * @param berPKCS12File - original PKCS#12 file
-     * @return a byte array representing the DER encoding of the PFX structure
-     * @throws IOException
-     */
-    public static byte[] convertToDefiniteLength(byte[] berPKCS12File)
-        throws IOException
-    {
-        ByteArrayOutputStream bOut = new ByteArrayOutputStream();
-        DEROutputStream dOut = new DEROutputStream(bOut);
-
-        Pfx pfx = Pfx.getInstance(berPKCS12File);
-
-        bOut.reset();
-
-        dOut.writeObject(pfx);
-
-        return bOut.toByteArray();
-    }
-
-    /**
-     * Re-encode the PKCS#12 structure to definite length encoding at the inner layer
-     * as well, recomputing the MAC accordingly.
-     *
-     * @param berPKCS12File - original PKCS12 file.
-     * @param provider - provider to use for MAC calculation.
-     * @return a byte array representing the DER encoding of the PFX structure.
-     * @throws IOException on parsing, encoding errors.
-     */
-    public static byte[] convertToDefiniteLength(byte[] berPKCS12File, char[] passwd, String provider)
-        throws IOException
-    {
-        Pfx pfx = Pfx.getInstance(berPKCS12File);
-
-        ContentInfo info = pfx.getAuthSafe();
-
-        ASN1OctetString content = ASN1OctetString.getInstance(info.getContent());
-
-        ByteArrayOutputStream bOut = new ByteArrayOutputStream();
-        DEROutputStream dOut = new DEROutputStream(bOut);
-
-        ASN1InputStream contentIn = new ASN1InputStream(content.getOctets());
-        ASN1Primitive obj = contentIn.readObject();
-
-        dOut.writeObject(obj);
-
-        info = new ContentInfo(info.getContentType(), new DEROctetString(bOut.toByteArray()));
-
-        MacData mData = pfx.getMacData();
-        try
-        {
-            int itCount = mData.getIterationCount().intValue();
-            byte[] data = ASN1OctetString.getInstance(info.getContent()).getOctets();
-            byte[] res = calculatePbeMac(mData.getMac().getAlgorithmId().getObjectId(), mData.getSalt(), itCount, passwd, data, provider);
-
-            AlgorithmIdentifier algId = new AlgorithmIdentifier(mData.getMac().getAlgorithmId().getObjectId(), DERNull.INSTANCE);
-            DigestInfo dInfo = new DigestInfo(algId, res);
-
-            mData = new MacData(dInfo, mData.getSalt(), itCount);
-        }
-        catch (Exception e)
-        {
-            throw new IOException("error constructing MAC: " + e.toString());
-        }
-        
-        pfx = new Pfx(info, mData);
-
-        bOut.reset();
-        
-        dOut.writeObject(pfx);
-        
-        return bOut.toByteArray();
-    }
-
-    private static byte[] calculatePbeMac(
-        ASN1ObjectIdentifier oid,
-        byte[]              salt,
-        int                 itCount,
-        char[]              password,
-        byte[]              data,
-        String              provider)
-        throws Exception
-    {
-        SecretKeyFactory keyFact = SecretKeyFactory.getInstance(oid.getId(), provider);
-        PBEParameterSpec defParams = new PBEParameterSpec(salt, itCount);
-        PBEKeySpec pbeSpec = new PBEKeySpec(password);
-        SecretKey key = keyFact.generateSecret(pbeSpec);
-
-        Mac mac = Mac.getInstance(oid.getId(), provider);
-        mac.init(key, defParams);
-        mac.update(data);
-
-        return mac.doFinal();
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/X509KeyUsage.java b/bcprov/src/main/java/org/bouncycastle/jce/X509KeyUsage.java
deleted file mode 100644
index 163566a..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/X509KeyUsage.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package org.bouncycastle.jce;
-
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.x509.KeyUsage;
-
-/**
- * A holding class for constructing an X509 Key Usage extension.
- *
- * <pre>
- *    id-ce-keyUsage OBJECT IDENTIFIER ::=  { id-ce 15 }
- *
- *    KeyUsage ::= BIT STRING {
- *         digitalSignature        (0),
- *         nonRepudiation          (1),
- *         keyEncipherment         (2),
- *         dataEncipherment        (3),
- *         keyAgreement            (4),
- *         keyCertSign             (5),
- *         cRLSign                 (6),
- *         encipherOnly            (7),
- *         decipherOnly            (8) }
- * </pre>
- */
-public class X509KeyUsage
-    extends ASN1Object
-{
-    public static final int        digitalSignature = 1 << 7; 
-    public static final int        nonRepudiation   = 1 << 6;
-    public static final int        keyEncipherment  = 1 << 5;
-    public static final int        dataEncipherment = 1 << 4;
-    public static final int        keyAgreement     = 1 << 3;
-    public static final int        keyCertSign      = 1 << 2;
-    public static final int        cRLSign          = 1 << 1;
-    public static final int        encipherOnly     = 1 << 0;
-    public static final int        decipherOnly     = 1 << 15;
-
-    private int usage = 0;
-
-    /**
-     * Basic constructor.
-     * 
-     * @param usage - the bitwise OR of the Key Usage flags giving the
-     * allowed uses for the key.
-     * e.g. (X509KeyUsage.keyEncipherment | X509KeyUsage.dataEncipherment)
-     */
-    public X509KeyUsage(
-        int usage)
-    {
-        this.usage = usage;
-    }
-
-    public ASN1Primitive toASN1Primitive()
-    {
-        return new KeyUsage(usage).toASN1Primitive();
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/X509LDAPCertStoreParameters.java b/bcprov/src/main/java/org/bouncycastle/jce/X509LDAPCertStoreParameters.java
deleted file mode 100644
index 80532fa..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/X509LDAPCertStoreParameters.java
+++ /dev/null
@@ -1,1258 +0,0 @@
-package org.bouncycastle.jce;
-
-import org.bouncycastle.x509.X509StoreParameters;
-
-import java.security.cert.CertStoreParameters;
-import java.security.cert.LDAPCertStoreParameters;
-
-/**
- * An expanded set of parameters for an LDAPCertStore
- */
-public class X509LDAPCertStoreParameters
-    implements X509StoreParameters, CertStoreParameters
-{
-
-    private String ldapURL;
-
-    private String baseDN;
-
-    // LDAP attributes, where data is stored
-
-    private String userCertificateAttribute;
-
-    private String cACertificateAttribute;
-
-    private String crossCertificateAttribute;
-
-    private String certificateRevocationListAttribute;
-
-    private String deltaRevocationListAttribute;
-
-    private String authorityRevocationListAttribute;
-
-    private String attributeCertificateAttributeAttribute;
-
-    private String aACertificateAttribute;
-
-    private String attributeDescriptorCertificateAttribute;
-
-    private String attributeCertificateRevocationListAttribute;
-
-    private String attributeAuthorityRevocationListAttribute;
-
-    // LDAP attributes with which data can be found
-
-    private String ldapUserCertificateAttributeName;
-
-    private String ldapCACertificateAttributeName;
-
-    private String ldapCrossCertificateAttributeName;
-
-    private String ldapCertificateRevocationListAttributeName;
-
-    private String ldapDeltaRevocationListAttributeName;
-
-    private String ldapAuthorityRevocationListAttributeName;
-
-    private String ldapAttributeCertificateAttributeAttributeName;
-
-    private String ldapAACertificateAttributeName;
-
-    private String ldapAttributeDescriptorCertificateAttributeName;
-
-    private String ldapAttributeCertificateRevocationListAttributeName;
-
-    private String ldapAttributeAuthorityRevocationListAttributeName;
-
-    // certificates and CRLs subject or issuer DN attributes, which must be
-    // matched against ldap attribute names
-
-    private String userCertificateSubjectAttributeName;
-
-    private String cACertificateSubjectAttributeName;
-
-    private String crossCertificateSubjectAttributeName;
-
-    private String certificateRevocationListIssuerAttributeName;
-
-    private String deltaRevocationListIssuerAttributeName;
-
-    private String authorityRevocationListIssuerAttributeName;
-
-    private String attributeCertificateAttributeSubjectAttributeName;
-
-    private String aACertificateSubjectAttributeName;
-
-    private String attributeDescriptorCertificateSubjectAttributeName;
-
-    private String attributeCertificateRevocationListIssuerAttributeName;
-
-    private String attributeAuthorityRevocationListIssuerAttributeName;
-
-    private String searchForSerialNumberIn;
-
-    public static class Builder
-    {
-        private String ldapURL;
-
-        private String baseDN;
-
-        // LDAP attributes, where data is stored
-
-        private String userCertificateAttribute;
-
-        private String cACertificateAttribute;
-
-        private String crossCertificateAttribute;
-
-        private String certificateRevocationListAttribute;
-
-        private String deltaRevocationListAttribute;
-
-        private String authorityRevocationListAttribute;
-
-        private String attributeCertificateAttributeAttribute;
-
-        private String aACertificateAttribute;
-
-        private String attributeDescriptorCertificateAttribute;
-
-        private String attributeCertificateRevocationListAttribute;
-
-        private String attributeAuthorityRevocationListAttribute;
-
-        // LDAP attributes with which data can be found
-
-        private String ldapUserCertificateAttributeName;
-
-        private String ldapCACertificateAttributeName;
-
-        private String ldapCrossCertificateAttributeName;
-
-        private String ldapCertificateRevocationListAttributeName;
-
-        private String ldapDeltaRevocationListAttributeName;
-
-        private String ldapAuthorityRevocationListAttributeName;
-
-        private String ldapAttributeCertificateAttributeAttributeName;
-
-        private String ldapAACertificateAttributeName;
-
-        private String ldapAttributeDescriptorCertificateAttributeName;
-
-        private String ldapAttributeCertificateRevocationListAttributeName;
-
-        private String ldapAttributeAuthorityRevocationListAttributeName;
-
-        // certificates and CRLs subject or issuer DN attributes, which must be
-        // matched against ldap attribute names
-
-        private String userCertificateSubjectAttributeName;
-
-        private String cACertificateSubjectAttributeName;
-
-        private String crossCertificateSubjectAttributeName;
-
-        private String certificateRevocationListIssuerAttributeName;
-
-        private String deltaRevocationListIssuerAttributeName;
-
-        private String authorityRevocationListIssuerAttributeName;
-
-        private String attributeCertificateAttributeSubjectAttributeName;
-
-        private String aACertificateSubjectAttributeName;
-
-        private String attributeDescriptorCertificateSubjectAttributeName;
-
-        private String attributeCertificateRevocationListIssuerAttributeName;
-
-        private String attributeAuthorityRevocationListIssuerAttributeName;
-
-        private String searchForSerialNumberIn;
-
-        public Builder()
-        {
-            this("ldap://localhost:389", "");
-        }
-
-        public Builder(String ldapURL, String baseDN)
-        {
-            this.ldapURL = ldapURL;
-            if (baseDN == null)
-            {
-                this.baseDN = "";
-            }
-            else
-            {
-                this.baseDN = baseDN;
-            }
-
-            this.userCertificateAttribute = "userCertificate";
-            this.cACertificateAttribute = "cACertificate";
-            this.crossCertificateAttribute = "crossCertificatePair";
-            this.certificateRevocationListAttribute = "certificateRevocationList";
-            this.deltaRevocationListAttribute = "deltaRevocationList";
-            this.authorityRevocationListAttribute = "authorityRevocationList";
-            this.attributeCertificateAttributeAttribute = "attributeCertificateAttribute";
-            this.aACertificateAttribute = "aACertificate";
-            this.attributeDescriptorCertificateAttribute = "attributeDescriptorCertificate";
-            this.attributeCertificateRevocationListAttribute = "attributeCertificateRevocationList";
-            this.attributeAuthorityRevocationListAttribute = "attributeAuthorityRevocationList";
-            this.ldapUserCertificateAttributeName = "cn";
-            this.ldapCACertificateAttributeName = "cn ou o";
-            this.ldapCrossCertificateAttributeName = "cn ou o";
-            this.ldapCertificateRevocationListAttributeName = "cn ou o";
-            this.ldapDeltaRevocationListAttributeName = "cn ou o";
-            this.ldapAuthorityRevocationListAttributeName = "cn ou o";
-            this.ldapAttributeCertificateAttributeAttributeName = "cn";
-            this.ldapAACertificateAttributeName = "cn o ou";
-            this.ldapAttributeDescriptorCertificateAttributeName = "cn o ou";
-            this.ldapAttributeCertificateRevocationListAttributeName = "cn o ou";
-            this.ldapAttributeAuthorityRevocationListAttributeName = "cn o ou";
-            this.userCertificateSubjectAttributeName = "cn";
-            this.cACertificateSubjectAttributeName = "o ou";
-            this.crossCertificateSubjectAttributeName = "o ou";
-            this.certificateRevocationListIssuerAttributeName = "o ou";
-            this.deltaRevocationListIssuerAttributeName = "o ou";
-            this.authorityRevocationListIssuerAttributeName = "o ou";
-            this.attributeCertificateAttributeSubjectAttributeName = "cn";
-            this.aACertificateSubjectAttributeName = "o ou";
-            this.attributeDescriptorCertificateSubjectAttributeName = "o ou";
-            this.attributeCertificateRevocationListIssuerAttributeName = "o ou";
-            this.attributeAuthorityRevocationListIssuerAttributeName = "o ou";
-            this.searchForSerialNumberIn = "uid serialNumber cn";
-        }
-
-        /**
-         * @param userCertificateAttribute       Attribute name(s) in the LDAP directory where end certificates
-         *                                       are stored. Separated by space. Defaults to "userCertificate"
-         *                                       if <code>null</code>.
-         * @throws IllegalArgumentException if a necessary parameter is <code>null</code>.
-         * @return the builder
-         */
-        public Builder setUserCertificateAttribute(String userCertificateAttribute)
-        {
-            this.userCertificateAttribute = userCertificateAttribute;
-
-            return this;
-        }
-
-        /**
-         * @param cACertificateAttribute         Attribute name(s) in the LDAP directory where CA certificates
-         *                                       are stored. Separated by space. Defaults to "cACertificate" if
-         *                                       <code>null</code>.
-         * @throws IllegalArgumentException if a necessary parameter is <code>null</code>.
-         * @return the builder
-         */
-        public Builder setCACertificateAttribute(String cACertificateAttribute)
-        {
-            this.cACertificateAttribute = cACertificateAttribute;
-
-            return this;
-        }
-
-        /**
-         * @param crossCertificateAttribute      Attribute name(s), where the cross certificates are stored.
-         *                                       Separated by space. Defaults to "crossCertificatePair" if
-         *                                       <code>null</code>
-         * @throws IllegalArgumentException if a necessary parameter is <code>null</code>.
-         * @return the builder
-         */
-        public Builder setCrossCertificateAttribute(String crossCertificateAttribute)
-        {
-            this.crossCertificateAttribute = crossCertificateAttribute;
-
-            return this;
-        }
-
-        /**
-         * @param certificateRevocationListAttribute
-         *                                       Attribute name(s) in the LDAP directory where CRLs are stored.
-         *                                       Separated by space. Defaults to "certificateRevocationList" if
-         *                                       <code>null</code>.
-         * @throws IllegalArgumentException if a necessary parameter is <code>null</code>.
-         * @return the builder
-         */
-        public Builder setCertificateRevocationListAttribute(String certificateRevocationListAttribute)
-        {
-            this.certificateRevocationListAttribute = certificateRevocationListAttribute;
-
-            return this;
-        }
-
-        /**
-         * @param deltaRevocationListAttribute   Attribute name(s) in the LDAP directory where delta RLs are
-         *                                       stored. Separated by space. Defaults to "deltaRevocationList"
-         *                                       if <code>null</code>.
-         * @throws IllegalArgumentException if a necessary parameter is <code>null</code>.
-         * @return the builder
-         */
-        public Builder setDeltaRevocationListAttribute(String deltaRevocationListAttribute)
-        {
-            this.deltaRevocationListAttribute = deltaRevocationListAttribute;
-
-            return this;
-        }
-
-        /**
-         * @param authorityRevocationListAttribute
-         *                                       Attribute name(s) in the LDAP directory where CRLs for
-         *                                       authorities are stored. Separated by space. Defaults to
-         *                                       "authorityRevocationList" if <code>null</code>.
-         * @throws IllegalArgumentException if a necessary parameter is <code>null</code>.
-         * @return the builder
-         */
-        public Builder setAuthorityRevocationListAttribute(String authorityRevocationListAttribute)
-        {
-            this.authorityRevocationListAttribute = authorityRevocationListAttribute;
-
-            return this;
-        }
-
-        /**
-         * @param attributeCertificateAttributeAttribute
-         *                                       Attribute name(s) in the LDAP directory where end attribute
-         *                                       certificates are stored. Separated by space. Defaults to
-         *                                       "attributeCertificateAttribute" if <code>null</code>.
-         * @throws IllegalArgumentException if a necessary parameter is <code>null</code>.
-         * @return the builder
-         */
-        public Builder setAttributeCertificateAttributeAttribute(String attributeCertificateAttributeAttribute)
-        {
-            this.attributeCertificateAttributeAttribute = attributeCertificateAttributeAttribute;
-
-            return this;
-        }
-
-        /**
-         * @param aACertificateAttribute         Attribute name(s) in the LDAP directory where attribute
-         *                                       certificates for attribute authorities are stored. Separated
-         *                                       by space. Defaults to "aACertificate" if <code>null</code>.
-         * @throws IllegalArgumentException if a necessary parameter is <code>null</code>.
-         * @return the builder
-         */
-        public Builder setAACertificateAttribute(String aACertificateAttribute)
-        {
-            this.aACertificateAttribute = aACertificateAttribute;
-
-            return this;
-        }
-
-        /**
-         * @param attributeDescriptorCertificateAttribute
-         *                                       Attribute name(s) in the LDAP directory where self signed
-         *                                       attribute certificates for attribute authorities are stored.
-         *                                       Separated by space. Defaults to
-         *                                       "attributeDescriptorCertificate" if <code>null</code>.
-         * @throws IllegalArgumentException if a necessary parameter is <code>null</code>.
-         * @return the builder
-         */
-        public Builder setAttributeDescriptorCertificateAttribute(String attributeDescriptorCertificateAttribute)
-        {
-            this.attributeDescriptorCertificateAttribute = attributeDescriptorCertificateAttribute;
-
-            return this;
-        }
-
-        /**
-         * @param attributeCertificateRevocationListAttribute
-         *                                       Attribute name(s) in the LDAP directory where CRLs for
-         *                                       attribute certificates are stored. Separated by space.
-         *                                       Defaults to "attributeCertificateRevocationList" if
-         *                                       <code>null</code>.
-         * @throws IllegalArgumentException if a necessary parameter is <code>null</code>.
-         * @return the builder
-         */
-        public Builder setAttributeCertificateRevocationListAttribute(String attributeCertificateRevocationListAttribute)
-        {
-            this.attributeCertificateRevocationListAttribute = attributeCertificateRevocationListAttribute;
-
-            return this;
-        }
-
-        /**
-         * @param attributeAuthorityRevocationListAttribute
-         *                                       Attribute name(s) in the LDAP directory where RLs for
-         *                                       attribute authority attribute certificates are stored.
-         *                                       Separated by space. Defaults to
-         *                                       "attributeAuthorityRevocationList" if <code>null</code>.
-         * @throws IllegalArgumentException if a necessary parameter is <code>null</code>.
-         * @return the builder
-         */
-        public Builder setAttributeAuthorityRevocationListAttribute(String attributeAuthorityRevocationListAttribute)
-        {
-            this.attributeAuthorityRevocationListAttribute = attributeAuthorityRevocationListAttribute;
-
-            return this;
-        }
-
-        /**
-         * @param ldapUserCertificateAttributeName
-         *                                       The attribute name(s) in the LDAP directory where to search
-         *                                       for the attribute value of the specified
-         *                                       <code>userCertificateSubjectAttributeName</code>. E.g. if
-         *                                       "cn" is used to put information about the subject for end
-         *                                       certificates, then specify "cn".
-         * @throws IllegalArgumentException if a necessary parameter is <code>null</code>.
-         * @return the builder
-         */
-        public Builder setLdapUserCertificateAttributeName(String ldapUserCertificateAttributeName)
-        {
-            this.ldapUserCertificateAttributeName = ldapUserCertificateAttributeName;
-
-            return this;
-        }
-
-        /**
-         * @param ldapCACertificateAttributeName The attribute name(s) in the LDAP directory where to search
-         *                                       for the attribute value of the specified
-         *                                       <code>cACertificateSubjectAttributeName</code>. E.g. if
-         *                                       "ou" is used to put information about the subject for CA
-         *                                       certificates, then specify "ou".
-         * @throws IllegalArgumentException if a necessary parameter is <code>null</code>.
-         * @return the builder
-         */
-        public Builder setLdapCACertificateAttributeName(String ldapCACertificateAttributeName)
-        {
-            this.ldapCACertificateAttributeName = ldapCACertificateAttributeName;
-
-            return this;
-        }
-
-        /**
-         * @param ldapCrossCertificateAttributeName
-         *                                       The attribute name(s) in the LDAP directory where to search for
-         *                                       the attribute value of the specified
-         *                                       <code>crossCertificateSubjectAttributeName</code>. E.g. if
-         *                                       "o" is used to put information about the subject for cross
-         *                                       certificates, then specify "o".
-         * @throws IllegalArgumentException if a necessary parameter is <code>null</code>.
-         * @return the builder
-         */
-        public Builder setLdapCrossCertificateAttributeName(String ldapCrossCertificateAttributeName)
-        {
-            this.ldapCrossCertificateAttributeName = ldapCrossCertificateAttributeName;
-
-            return this;
-        }
-
-        /**
-         * @param ldapCertificateRevocationListAttributeName
-         *                                       The attribute name(s) in the LDAP directory where to search for
-         *                                       the attribute value of the specified
-         *                                       <code>certificateRevocationListIssuerAttributeName</code>.
-         *                                       E.g. if "ou" is used to put information about the issuer of
-         *                                       CRLs, specify "ou".
-         * @throws IllegalArgumentException if a necessary parameter is <code>null</code>.
-         * @return the builder
-         */
-        public Builder setLdapCertificateRevocationListAttributeName(String ldapCertificateRevocationListAttributeName)
-        {
-            this.ldapCertificateRevocationListAttributeName = ldapCertificateRevocationListAttributeName;
-
-            return this;
-        }
-
-        /**
-         * @param ldapDeltaRevocationListAttributeName
-         *                                       The attribute name(s) in the LDAP directory where to search for
-         *                                       the attribute value of the specified
-         *                                       <code>deltaRevocationListIssuerAttributeName</code>. E.g.
-         *                                       if "ou" is used to put information about the issuer of CRLs,
-         *                                       specify "ou".
-         * @throws IllegalArgumentException if a necessary parameter is <code>null</code>.
-         * @return the builder
-         */
-        public Builder setLdapDeltaRevocationListAttributeName(String ldapDeltaRevocationListAttributeName)
-        {
-            this.ldapDeltaRevocationListAttributeName = ldapDeltaRevocationListAttributeName;
-
-            return this;
-        }
-
-        /**
-         * @param ldapAuthorityRevocationListAttributeName
-         *                                       The attribute name(s) in the LDAP directory where to search for
-         *                                       the attribute value of the specified
-         *                                       <code>authorityRevocationListIssuerAttributeName</code>.
-         *                                       E.g. if "ou" is used to put information about the issuer of
-         *                                       CRLs, specify "ou".
-         * @throws IllegalArgumentException if a necessary parameter is <code>null</code>.
-         * @return the builder
-         */
-        public Builder setLdapAuthorityRevocationListAttributeName(String ldapAuthorityRevocationListAttributeName)
-        {
-            this.ldapAuthorityRevocationListAttributeName = ldapAuthorityRevocationListAttributeName;
-
-            return this;
-        }
-
-        /**
-         * @param ldapAttributeCertificateAttributeAttributeName
-         *                                       The attribute name(s) in the LDAP directory where to search for
-         *                                       the attribute value of the specified
-         *                                       <code>attributeCertificateAttributeSubjectAttributeName</code>.
-         *                                       E.g. if "cn" is used to put information about the subject of
-         *                                       end attribute certificates, specify "cn".
-         * @throws IllegalArgumentException if a necessary parameter is <code>null</code>.
-         * @return the builder
-         */
-        public Builder setLdapAttributeCertificateAttributeAttributeName(String ldapAttributeCertificateAttributeAttributeName)
-        {
-            this.ldapAttributeCertificateAttributeAttributeName = ldapAttributeCertificateAttributeAttributeName;
-
-            return this;
-        }
-
-        /**
-         * @param ldapAACertificateAttributeName The attribute name(s) in the LDAP directory where to search for
-         *                                       the attribute value of the specified
-         *                                       <code>aACertificateSubjectAttributeName</code>. E.g. if
-         *                                       "ou" is used to put information about the subject of attribute
-         *                                       authority attribute certificates, specify "ou".
-         * @throws IllegalArgumentException if a necessary parameter is <code>null</code>.
-         * @return the builder
-         */
-        public Builder setLdapAACertificateAttributeName(String ldapAACertificateAttributeName)
-        {
-            this.ldapAACertificateAttributeName = ldapAACertificateAttributeName;
-
-            return this;
-        }
-
-        /**
-         * @param ldapAttributeDescriptorCertificateAttributeName
-         *                                       The attribute name(s) in the LDAP directory where to search for
-         *                                       the attribute value of the specified
-         *                                       <code>attributeDescriptorCertificateSubjectAttributeName</code>.
-         *                                       E.g. if "o" is used to put information about the subject of
-         *                                       self signed attribute authority attribute certificates,
-         *                                       specify "o".
-         * @throws IllegalArgumentException if a necessary parameter is <code>null</code>.
-         * @return the builder
-         */
-        public Builder setLdapAttributeDescriptorCertificateAttributeName(String ldapAttributeDescriptorCertificateAttributeName)
-        {
-            this.ldapAttributeDescriptorCertificateAttributeName = ldapAttributeDescriptorCertificateAttributeName;
-
-            return this;
-        }
-
-        /**
-         * @param ldapAttributeCertificateRevocationListAttributeName
-         *                                       The attribute name(s) in the LDAP directory where to search for
-         *                                       the attribute value of the specified
-         *                                       <code>attributeCertificateRevocationListIssuerAttributeName</code>.
-         *                                       E.g. if "ou" is used to put information about the issuer of
-         *                                       CRLs, specify "ou".
-         * @throws IllegalArgumentException if a necessary parameter is <code>null</code>.
-         * @return the builder
-         */
-        public Builder setLdapAttributeCertificateRevocationListAttributeName(String ldapAttributeCertificateRevocationListAttributeName)
-        {
-            this.ldapAttributeCertificateRevocationListAttributeName = ldapAttributeCertificateRevocationListAttributeName;
-
-            return this;
-        }
-
-        /**
-         * @param ldapAttributeAuthorityRevocationListAttributeName
-         *                                       The attribute name(s) in the LDAP directory where to search for
-         *                                       the attribute value of the specified
-         *                                       <code>attributeAuthorityRevocationListIssuerAttributeName</code>.
-         *                                       E.g. if "ou" is used to put information about the issuer of
-         *                                       CRLs, specify "ou".
-         * @throws IllegalArgumentException if a necessary parameter is <code>null</code>.
-         * @return the builder
-         */
-        public Builder setLdapAttributeAuthorityRevocationListAttributeName(String ldapAttributeAuthorityRevocationListAttributeName)
-        {
-            this.ldapAttributeAuthorityRevocationListAttributeName = ldapAttributeAuthorityRevocationListAttributeName;
-
-            return this;
-        }
-
-        /**
-         * @param userCertificateSubjectAttributeName
-         *                                       Attribute(s) in the subject of the certificate which is used
-         *                                       to be searched in the
-         *                                       <code>ldapUserCertificateAttributeName</code>. E.g. the
-         *                                       "cn" attribute of the DN could be used.
-         * @throws IllegalArgumentException if a necessary parameter is <code>null</code>.
-         * @return the builder
-         */
-        public Builder setUserCertificateSubjectAttributeName(String userCertificateSubjectAttributeName)
-        {
-            this.userCertificateSubjectAttributeName = userCertificateSubjectAttributeName;
-
-            return this;
-        }
-
-        /**
-         * @param cACertificateSubjectAttributeName
-         *                                       Attribute(s) in the subject of the certificate which is used
-         *                                       to be searched in the
-         *                                       <code>ldapCACertificateAttributeName</code>. E.g. the "ou"
-         *                                       attribute of the DN could be used.
-         * @throws IllegalArgumentException if a necessary parameter is <code>null</code>.
-         * @return the builder
-         */
-        public Builder setCACertificateSubjectAttributeName(String cACertificateSubjectAttributeName)
-        {
-            this.cACertificateSubjectAttributeName = cACertificateSubjectAttributeName;
-
-            return this;
-        }
-
-        /**
-         * @param crossCertificateSubjectAttributeName
-         *                                       Attribute(s) in the subject of the cross certificate which is
-         *                                       used to be searched in the
-         *                                       <code>ldapCrossCertificateAttributeName</code>. E.g. the
-         *                                       "o" attribute of the DN may be appropriate.
-         * @throws IllegalArgumentException if a necessary parameter is <code>null</code>.
-         * @return the builder
-         */
-        public Builder setCrossCertificateSubjectAttributeName(String crossCertificateSubjectAttributeName)
-        {
-            this.crossCertificateSubjectAttributeName = crossCertificateSubjectAttributeName;
-
-            return this;
-        }
-
-        /**
-         * @param certificateRevocationListIssuerAttributeName
-         *                                       Attribute(s) in the issuer of the CRL which is used to be
-         *                                       searched in the
-         *                                       <code>ldapCertificateRevocationListAttributeName</code>.
-         *                                       E.g. the "o" or "ou" attribute may be used.
-         * @throws IllegalArgumentException if a necessary parameter is <code>null</code>.
-         * @return the builder
-         */
-        public Builder setCertificateRevocationListIssuerAttributeName(String certificateRevocationListIssuerAttributeName)
-        {
-            this.certificateRevocationListIssuerAttributeName = certificateRevocationListIssuerAttributeName;
-
-            return this;
-        }
-
-        /**
-         * @param deltaRevocationListIssuerAttributeName
-         *                                       Attribute(s) in the issuer of the CRL which is used to be
-         *                                       searched in the
-         *                                       <code>ldapDeltaRevocationListAttributeName</code>. E.g. the
-         *                                       "o" or "ou" attribute may be used.
-         * @throws IllegalArgumentException if a necessary parameter is <code>null</code>.
-         * @return the builder
-         */
-        public Builder setDeltaRevocationListIssuerAttributeName(String deltaRevocationListIssuerAttributeName)
-        {
-            this.deltaRevocationListIssuerAttributeName = deltaRevocationListIssuerAttributeName;
-
-            return this;
-        }
-
-        /**
-         * @param authorityRevocationListIssuerAttributeName
-         *                                       Attribute(s) in the issuer of the CRL which is used to be
-         *                                       searched in the
-         *                                       <code>ldapAuthorityRevocationListAttributeName</code>. E.g.
-         *                                       the "o" or "ou" attribute may be used.
-         * @throws IllegalArgumentException if a necessary parameter is <code>null</code>.
-         * @return the builder
-         */
-        public Builder setAuthorityRevocationListIssuerAttributeName(String authorityRevocationListIssuerAttributeName)
-        {
-            this.authorityRevocationListIssuerAttributeName = authorityRevocationListIssuerAttributeName;
-
-            return this;
-        }
-
-        /**
-         * @param attributeCertificateAttributeSubjectAttributeName
-         *                                       Attribute(s) in the subject of the attribute certificate which
-         *                                       is used to be searched in the
-         *                                       <code>ldapAttributeCertificateAttributeAttributeName</code>.
-         *                                       E.g. the "cn" attribute of the DN could be used.
-         * @throws IllegalArgumentException if a necessary parameter is <code>null</code>.
-         * @return the builder
-         */
-        public Builder setAttributeCertificateAttributeSubjectAttributeName(String attributeCertificateAttributeSubjectAttributeName)
-        {
-            this.attributeCertificateAttributeSubjectAttributeName = attributeCertificateAttributeSubjectAttributeName;
-
-            return this;
-        }
-
-        /**
-         * @param aACertificateSubjectAttributeName
-         *                                       Attribute(s) in the subject of the attribute certificate which
-         *                                       is used to be searched in the
-         *                                       <code>ldapAACertificateAttributeName</code>. E.g. the "ou"
-         *                                       attribute of the DN could be used.
-         * @throws IllegalArgumentException if a necessary parameter is <code>null</code>.
-         * @return the builder
-         */
-        public Builder setAACertificateSubjectAttributeName(String aACertificateSubjectAttributeName)
-        {
-            this.aACertificateSubjectAttributeName = aACertificateSubjectAttributeName;
-
-            return this;
-        }
-
-        /**
-         * @param attributeDescriptorCertificateSubjectAttributeName
-         *                                       Attribute(s) in the subject of the attribute certificate which
-         *                                       is used to be searched in the
-         *                                       <code>ldapAttributeDescriptorCertificateAttributeName</code>.
-         *                                       E.g. the "o" attribute of the DN could be used.
-         * @throws IllegalArgumentException if a necessary parameter is <code>null</code>.
-         * @return the builder
-         */
-        public Builder setAttributeDescriptorCertificateSubjectAttributeName(String attributeDescriptorCertificateSubjectAttributeName)
-        {
-            this.attributeDescriptorCertificateSubjectAttributeName = attributeDescriptorCertificateSubjectAttributeName;
-
-            return this;
-        }
-
-        /**
-         * @param attributeCertificateRevocationListIssuerAttributeName
-         *                                       Attribute(s) in the issuer of the CRL which is used to be
-         *                                       searched in the
-         *                                       <code>ldapAttributeCertificateRevocationListAttributeName</code>.
-         *                                       E.g. the "o" or "ou" attribute may be used
-         *                                       certificate is searched in this LDAP attribute.
-         * @throws IllegalArgumentException if a necessary parameter is <code>null</code>.
-         * @return the builder
-         */
-        public Builder setAttributeCertificateRevocationListIssuerAttributeName(String attributeCertificateRevocationListIssuerAttributeName)
-        {
-            this.attributeCertificateRevocationListIssuerAttributeName = attributeCertificateRevocationListIssuerAttributeName;
-
-            return this;
-        }
-
-        /**
-         * @param attributeAuthorityRevocationListIssuerAttributeName
-         *                                       Anttribute(s) in the issuer of the CRL which is used to be
-         *                                       searched in the
-         *                                       <code>ldapAttributeAuthorityRevocationListAttributeName</code>.
-         *                                       E.g. the "o" or "ou" attribute may be used.
-         * @throws IllegalArgumentException if a necessary parameter is <code>null</code>.
-         * @return the builder
-         */
-        public Builder setAttributeAuthorityRevocationListIssuerAttributeName(String attributeAuthorityRevocationListIssuerAttributeName)
-        {
-            this.attributeAuthorityRevocationListIssuerAttributeName = attributeAuthorityRevocationListIssuerAttributeName;
-
-            return this;
-        }
-
-        /**
-         *
-         * @param searchForSerialNumberIn        If not <code>null</code> the serial number of the
-         *                                       certificate is searched in this LDAP attribute.
-         * @throws IllegalArgumentException if a necessary parameter is <code>null</code>.
-         * @return the builder
-         */
-        public Builder setSearchForSerialNumberIn(String searchForSerialNumberIn)
-        {
-            this.searchForSerialNumberIn = searchForSerialNumberIn;
-
-            return this;
-        }
-
-        public X509LDAPCertStoreParameters build()
-        {
-             if (ldapUserCertificateAttributeName == null   // migrate to setters
-                || ldapCACertificateAttributeName == null
-                || ldapCrossCertificateAttributeName == null
-                || ldapCertificateRevocationListAttributeName == null
-                || ldapDeltaRevocationListAttributeName == null
-                || ldapAuthorityRevocationListAttributeName == null
-                || ldapAttributeCertificateAttributeAttributeName == null
-                || ldapAACertificateAttributeName == null
-                || ldapAttributeDescriptorCertificateAttributeName == null
-                || ldapAttributeCertificateRevocationListAttributeName == null
-                || ldapAttributeAuthorityRevocationListAttributeName == null
-                || userCertificateSubjectAttributeName == null
-                || cACertificateSubjectAttributeName == null
-                || crossCertificateSubjectAttributeName == null
-                || certificateRevocationListIssuerAttributeName == null
-                || deltaRevocationListIssuerAttributeName == null
-                || authorityRevocationListIssuerAttributeName == null
-                || attributeCertificateAttributeSubjectAttributeName == null
-                || aACertificateSubjectAttributeName == null
-                || attributeDescriptorCertificateSubjectAttributeName == null
-                || attributeCertificateRevocationListIssuerAttributeName == null
-                || attributeAuthorityRevocationListIssuerAttributeName == null)
-            {
-                throw new IllegalArgumentException(
-                    "Necessary parameters not specified.");
-            }
-            return new X509LDAPCertStoreParameters(this);
-        }
-    }
-
-
-    private X509LDAPCertStoreParameters(Builder builder)
-    {
-        this.ldapURL = builder.ldapURL;
-        this.baseDN = builder.baseDN;
-
-        this.userCertificateAttribute = builder.userCertificateAttribute;
-        this.cACertificateAttribute = builder.cACertificateAttribute;
-        this.crossCertificateAttribute = builder.crossCertificateAttribute;
-        this.certificateRevocationListAttribute = builder.certificateRevocationListAttribute;
-        this.deltaRevocationListAttribute = builder.deltaRevocationListAttribute;
-        this.authorityRevocationListAttribute = builder.authorityRevocationListAttribute;
-        this.attributeCertificateAttributeAttribute = builder.attributeCertificateAttributeAttribute;
-        this.aACertificateAttribute = builder.aACertificateAttribute;
-        this.attributeDescriptorCertificateAttribute = builder.attributeDescriptorCertificateAttribute;
-        this.attributeCertificateRevocationListAttribute = builder.attributeCertificateRevocationListAttribute;
-        this.attributeAuthorityRevocationListAttribute = builder.attributeAuthorityRevocationListAttribute;
-        this.ldapUserCertificateAttributeName = builder.ldapUserCertificateAttributeName;
-        this.ldapCACertificateAttributeName = builder.ldapCACertificateAttributeName;
-        this.ldapCrossCertificateAttributeName = builder.ldapCrossCertificateAttributeName;
-        this.ldapCertificateRevocationListAttributeName = builder.ldapCertificateRevocationListAttributeName;
-        this.ldapDeltaRevocationListAttributeName = builder.ldapDeltaRevocationListAttributeName;
-        this.ldapAuthorityRevocationListAttributeName = builder.ldapAuthorityRevocationListAttributeName;
-        this.ldapAttributeCertificateAttributeAttributeName = builder.ldapAttributeCertificateAttributeAttributeName;
-        this.ldapAACertificateAttributeName = builder.ldapAACertificateAttributeName;
-        this.ldapAttributeDescriptorCertificateAttributeName = builder.ldapAttributeDescriptorCertificateAttributeName;
-        this.ldapAttributeCertificateRevocationListAttributeName = builder.ldapAttributeCertificateRevocationListAttributeName;
-        this.ldapAttributeAuthorityRevocationListAttributeName = builder.ldapAttributeAuthorityRevocationListAttributeName;
-        this.userCertificateSubjectAttributeName = builder.userCertificateSubjectAttributeName;
-        this.cACertificateSubjectAttributeName = builder.cACertificateSubjectAttributeName;
-        this.crossCertificateSubjectAttributeName = builder.crossCertificateSubjectAttributeName;
-        this.certificateRevocationListIssuerAttributeName = builder.certificateRevocationListIssuerAttributeName;
-        this.deltaRevocationListIssuerAttributeName = builder.deltaRevocationListIssuerAttributeName;
-        this.authorityRevocationListIssuerAttributeName = builder.authorityRevocationListIssuerAttributeName;
-        this.attributeCertificateAttributeSubjectAttributeName = builder.attributeCertificateAttributeSubjectAttributeName;
-        this.aACertificateSubjectAttributeName = builder.aACertificateSubjectAttributeName;
-        this.attributeDescriptorCertificateSubjectAttributeName = builder.attributeDescriptorCertificateSubjectAttributeName;
-        this.attributeCertificateRevocationListIssuerAttributeName = builder.attributeCertificateRevocationListIssuerAttributeName;
-        this.attributeAuthorityRevocationListIssuerAttributeName = builder.attributeAuthorityRevocationListIssuerAttributeName;
-        this.searchForSerialNumberIn = builder.searchForSerialNumberIn;
-    }
-
-    /**
-     * Returns a clone of this object.
-     */
-    public Object clone()
-    {
-        return this;
-    }
-
-    public boolean equal(Object o)
-    {
-        if (o == this)
-        {
-            return true;
-        }
-
-        if (!(o instanceof X509LDAPCertStoreParameters))
-        {
-            return false;
-        }
-
-        X509LDAPCertStoreParameters params = (X509LDAPCertStoreParameters)o;
-        return checkField(ldapURL, params.ldapURL)
-            && checkField(baseDN, params.baseDN)
-            && checkField(userCertificateAttribute, params.userCertificateAttribute)
-            && checkField(cACertificateAttribute, params.cACertificateAttribute)
-            && checkField(crossCertificateAttribute, params.crossCertificateAttribute)
-            && checkField(certificateRevocationListAttribute, params.certificateRevocationListAttribute)
-            && checkField(deltaRevocationListAttribute, params.deltaRevocationListAttribute)
-            && checkField(authorityRevocationListAttribute, params.authorityRevocationListAttribute)
-            && checkField(attributeCertificateAttributeAttribute, params.attributeCertificateAttributeAttribute)
-            && checkField(aACertificateAttribute, params.aACertificateAttribute)
-            && checkField(attributeDescriptorCertificateAttribute, params.attributeDescriptorCertificateAttribute)
-            && checkField(attributeCertificateRevocationListAttribute, params.attributeCertificateRevocationListAttribute)
-            && checkField(attributeAuthorityRevocationListAttribute, params.attributeAuthorityRevocationListAttribute)
-            && checkField(ldapUserCertificateAttributeName, params.ldapUserCertificateAttributeName)
-            && checkField(ldapCACertificateAttributeName, params.ldapCACertificateAttributeName)
-            && checkField(ldapCrossCertificateAttributeName, params.ldapCrossCertificateAttributeName)
-            && checkField(ldapCertificateRevocationListAttributeName, params.ldapCertificateRevocationListAttributeName)
-            && checkField(ldapDeltaRevocationListAttributeName, params.ldapDeltaRevocationListAttributeName)
-            && checkField(ldapAuthorityRevocationListAttributeName, params.ldapAuthorityRevocationListAttributeName)
-            && checkField(ldapAttributeCertificateAttributeAttributeName, params.ldapAttributeCertificateAttributeAttributeName)
-            && checkField(ldapAACertificateAttributeName, params.ldapAACertificateAttributeName)
-            && checkField(ldapAttributeDescriptorCertificateAttributeName, params.ldapAttributeDescriptorCertificateAttributeName)
-            && checkField(ldapAttributeCertificateRevocationListAttributeName, params.ldapAttributeCertificateRevocationListAttributeName)
-            && checkField(ldapAttributeAuthorityRevocationListAttributeName, params.ldapAttributeAuthorityRevocationListAttributeName)
-            && checkField(userCertificateSubjectAttributeName, params.userCertificateSubjectAttributeName)
-            && checkField(cACertificateSubjectAttributeName, params.cACertificateSubjectAttributeName)
-            && checkField(crossCertificateSubjectAttributeName, params.crossCertificateSubjectAttributeName)
-            && checkField(certificateRevocationListIssuerAttributeName, params.certificateRevocationListIssuerAttributeName)
-            && checkField(deltaRevocationListIssuerAttributeName, params.deltaRevocationListIssuerAttributeName)
-            && checkField(authorityRevocationListIssuerAttributeName, params.authorityRevocationListIssuerAttributeName)
-            && checkField(attributeCertificateAttributeSubjectAttributeName, params.attributeCertificateAttributeSubjectAttributeName)
-            && checkField(aACertificateSubjectAttributeName, params.aACertificateSubjectAttributeName)
-            && checkField(attributeDescriptorCertificateSubjectAttributeName, params.attributeDescriptorCertificateSubjectAttributeName)
-            && checkField(attributeCertificateRevocationListIssuerAttributeName, params.attributeCertificateRevocationListIssuerAttributeName)
-            && checkField(attributeAuthorityRevocationListIssuerAttributeName, params.attributeAuthorityRevocationListIssuerAttributeName)
-            && checkField(searchForSerialNumberIn, params.searchForSerialNumberIn);
-    }
-
-    private boolean checkField(Object o1, Object o2)
-    {
-        if (o1 == o2)
-        {
-            return true;
-        }
-
-        if (o1 == null)
-        {
-            return false;
-        }
-
-        return o1.equals(o2);
-    }
-
-    public int hashCode()
-    {
-        int hash = 0;
-
-        hash = addHashCode(hash, userCertificateAttribute);
-        hash = addHashCode(hash, cACertificateAttribute);
-        hash = addHashCode(hash, crossCertificateAttribute);
-        hash = addHashCode(hash, certificateRevocationListAttribute);
-        hash = addHashCode(hash, deltaRevocationListAttribute);
-        hash = addHashCode(hash, authorityRevocationListAttribute);
-        hash = addHashCode(hash, attributeCertificateAttributeAttribute);
-        hash = addHashCode(hash, aACertificateAttribute);
-        hash = addHashCode(hash, attributeDescriptorCertificateAttribute);
-        hash = addHashCode(hash, attributeCertificateRevocationListAttribute);
-        hash = addHashCode(hash, attributeAuthorityRevocationListAttribute);
-        hash = addHashCode(hash, ldapUserCertificateAttributeName);
-        hash = addHashCode(hash, ldapCACertificateAttributeName);
-        hash = addHashCode(hash, ldapCrossCertificateAttributeName);
-        hash = addHashCode(hash, ldapCertificateRevocationListAttributeName);
-        hash = addHashCode(hash, ldapDeltaRevocationListAttributeName);
-        hash = addHashCode(hash, ldapAuthorityRevocationListAttributeName);
-        hash = addHashCode(hash, ldapAttributeCertificateAttributeAttributeName);
-        hash = addHashCode(hash, ldapAACertificateAttributeName);
-        hash = addHashCode(hash, ldapAttributeDescriptorCertificateAttributeName);
-        hash = addHashCode(hash, ldapAttributeCertificateRevocationListAttributeName);
-        hash = addHashCode(hash, ldapAttributeAuthorityRevocationListAttributeName);
-        hash = addHashCode(hash, userCertificateSubjectAttributeName);
-        hash = addHashCode(hash, cACertificateSubjectAttributeName);
-        hash = addHashCode(hash, crossCertificateSubjectAttributeName);
-        hash = addHashCode(hash, certificateRevocationListIssuerAttributeName);
-        hash = addHashCode(hash, deltaRevocationListIssuerAttributeName);
-        hash = addHashCode(hash, authorityRevocationListIssuerAttributeName);
-        hash = addHashCode(hash, attributeCertificateAttributeSubjectAttributeName);
-        hash = addHashCode(hash, aACertificateSubjectAttributeName);
-        hash = addHashCode(hash, attributeDescriptorCertificateSubjectAttributeName);
-        hash = addHashCode(hash, attributeCertificateRevocationListIssuerAttributeName);
-        hash = addHashCode(hash, attributeAuthorityRevocationListIssuerAttributeName);
-        hash = addHashCode(hash, searchForSerialNumberIn);
-        
-        return hash;
-    }
-
-    private int addHashCode(int hashCode, Object o)
-    {
-        return (hashCode * 29) + (o == null ? 0 : o.hashCode());
-    }
-
-    /**
-     * @return Returns the aACertificateAttribute.
-     */
-    public String getAACertificateAttribute()
-    {
-        return aACertificateAttribute;
-    }
-
-    /**
-     * @return Returns the aACertificateSubjectAttributeName.
-     */
-    public String getAACertificateSubjectAttributeName()
-    {
-        return aACertificateSubjectAttributeName;
-    }
-
-    /**
-     * @return Returns the attributeAuthorityRevocationListAttribute.
-     */
-    public String getAttributeAuthorityRevocationListAttribute()
-    {
-        return attributeAuthorityRevocationListAttribute;
-    }
-
-    /**
-     * @return Returns the attributeAuthorityRevocationListIssuerAttributeName.
-     */
-    public String getAttributeAuthorityRevocationListIssuerAttributeName()
-    {
-        return attributeAuthorityRevocationListIssuerAttributeName;
-    }
-
-    /**
-     * @return Returns the attributeCertificateAttributeAttribute.
-     */
-    public String getAttributeCertificateAttributeAttribute()
-    {
-        return attributeCertificateAttributeAttribute;
-    }
-
-    /**
-     * @return Returns the attributeCertificateAttributeSubjectAttributeName.
-     */
-    public String getAttributeCertificateAttributeSubjectAttributeName()
-    {
-        return attributeCertificateAttributeSubjectAttributeName;
-    }
-
-    /**
-     * @return Returns the attributeCertificateRevocationListAttribute.
-     */
-    public String getAttributeCertificateRevocationListAttribute()
-    {
-        return attributeCertificateRevocationListAttribute;
-    }
-
-    /**
-     * @return Returns the
-     *         attributeCertificateRevocationListIssuerAttributeName.
-     */
-    public String getAttributeCertificateRevocationListIssuerAttributeName()
-    {
-        return attributeCertificateRevocationListIssuerAttributeName;
-    }
-
-    /**
-     * @return Returns the attributeDescriptorCertificateAttribute.
-     */
-    public String getAttributeDescriptorCertificateAttribute()
-    {
-        return attributeDescriptorCertificateAttribute;
-    }
-
-    /**
-     * @return Returns the attributeDescriptorCertificateSubjectAttributeName.
-     */
-    public String getAttributeDescriptorCertificateSubjectAttributeName()
-    {
-        return attributeDescriptorCertificateSubjectAttributeName;
-    }
-
-    /**
-     * @return Returns the authorityRevocationListAttribute.
-     */
-    public String getAuthorityRevocationListAttribute()
-    {
-        return authorityRevocationListAttribute;
-    }
-
-    /**
-     * @return Returns the authorityRevocationListIssuerAttributeName.
-     */
-    public String getAuthorityRevocationListIssuerAttributeName()
-    {
-        return authorityRevocationListIssuerAttributeName;
-    }
-
-    /**
-     * @return Returns the baseDN.
-     */
-    public String getBaseDN()
-    {
-        return baseDN;
-    }
-
-    /**
-     * @return Returns the cACertificateAttribute.
-     */
-    public String getCACertificateAttribute()
-    {
-        return cACertificateAttribute;
-    }
-
-    /**
-     * @return Returns the cACertificateSubjectAttributeName.
-     */
-    public String getCACertificateSubjectAttributeName()
-    {
-        return cACertificateSubjectAttributeName;
-    }
-
-    /**
-     * @return Returns the certificateRevocationListAttribute.
-     */
-    public String getCertificateRevocationListAttribute()
-    {
-        return certificateRevocationListAttribute;
-    }
-
-    /**
-     * @return Returns the certificateRevocationListIssuerAttributeName.
-     */
-    public String getCertificateRevocationListIssuerAttributeName()
-    {
-        return certificateRevocationListIssuerAttributeName;
-    }
-
-    /**
-     * @return Returns the crossCertificateAttribute.
-     */
-    public String getCrossCertificateAttribute()
-    {
-        return crossCertificateAttribute;
-    }
-
-    /**
-     * @return Returns the crossCertificateSubjectAttributeName.
-     */
-    public String getCrossCertificateSubjectAttributeName()
-    {
-        return crossCertificateSubjectAttributeName;
-    }
-
-    /**
-     * @return Returns the deltaRevocationListAttribute.
-     */
-    public String getDeltaRevocationListAttribute()
-    {
-        return deltaRevocationListAttribute;
-    }
-
-    /**
-     * @return Returns the deltaRevocationListIssuerAttributeName.
-     */
-    public String getDeltaRevocationListIssuerAttributeName()
-    {
-        return deltaRevocationListIssuerAttributeName;
-    }
-
-    /**
-     * @return Returns the ldapAACertificateAttributeName.
-     */
-    public String getLdapAACertificateAttributeName()
-    {
-        return ldapAACertificateAttributeName;
-    }
-
-    /**
-     * @return Returns the ldapAttributeAuthorityRevocationListAttributeName.
-     */
-    public String getLdapAttributeAuthorityRevocationListAttributeName()
-    {
-        return ldapAttributeAuthorityRevocationListAttributeName;
-    }
-
-    /**
-     * @return Returns the ldapAttributeCertificateAttributeAttributeName.
-     */
-    public String getLdapAttributeCertificateAttributeAttributeName()
-    {
-        return ldapAttributeCertificateAttributeAttributeName;
-    }
-
-    /**
-     * @return Returns the ldapAttributeCertificateRevocationListAttributeName.
-     */
-    public String getLdapAttributeCertificateRevocationListAttributeName()
-    {
-        return ldapAttributeCertificateRevocationListAttributeName;
-    }
-
-    /**
-     * @return Returns the ldapAttributeDescriptorCertificateAttributeName.
-     */
-    public String getLdapAttributeDescriptorCertificateAttributeName()
-    {
-        return ldapAttributeDescriptorCertificateAttributeName;
-    }
-
-    /**
-     * @return Returns the ldapAuthorityRevocationListAttributeName.
-     */
-    public String getLdapAuthorityRevocationListAttributeName()
-    {
-        return ldapAuthorityRevocationListAttributeName;
-    }
-
-    /**
-     * @return Returns the ldapCACertificateAttributeName.
-     */
-    public String getLdapCACertificateAttributeName()
-    {
-        return ldapCACertificateAttributeName;
-    }
-
-    /**
-     * @return Returns the ldapCertificateRevocationListAttributeName.
-     */
-    public String getLdapCertificateRevocationListAttributeName()
-    {
-        return ldapCertificateRevocationListAttributeName;
-    }
-
-    /**
-     * @return Returns the ldapCrossCertificateAttributeName.
-     */
-    public String getLdapCrossCertificateAttributeName()
-    {
-        return ldapCrossCertificateAttributeName;
-    }
-
-    /**
-     * @return Returns the ldapDeltaRevocationListAttributeName.
-     */
-    public String getLdapDeltaRevocationListAttributeName()
-    {
-        return ldapDeltaRevocationListAttributeName;
-    }
-
-    /**
-     * @return Returns the ldapURL.
-     */
-    public String getLdapURL()
-    {
-        return ldapURL;
-    }
-
-    /**
-     * @return Returns the ldapUserCertificateAttributeName.
-     */
-    public String getLdapUserCertificateAttributeName()
-    {
-        return ldapUserCertificateAttributeName;
-    }
-
-    /**
-     * @return Returns the searchForSerialNumberIn.
-     */
-    public String getSearchForSerialNumberIn()
-    {
-        return searchForSerialNumberIn;
-    }
-
-    /**
-     * @return Returns the userCertificateAttribute.
-     */
-    public String getUserCertificateAttribute()
-    {
-        return userCertificateAttribute;
-    }
-
-    /**
-     * @return Returns the userCertificateSubjectAttributeName.
-     */
-    public String getUserCertificateSubjectAttributeName()
-    {
-        return userCertificateSubjectAttributeName;
-    }
-
-    public static X509LDAPCertStoreParameters getInstance(LDAPCertStoreParameters params)
-    {
-        String server = "ldap://" + params.getServerName() + ":" + params.getPort();
-        X509LDAPCertStoreParameters _params = new Builder(server, "").build();
-        return _params;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/examples/package.html b/bcprov/src/main/java/org/bouncycastle/jce/examples/package.html
deleted file mode 100644
index 96b3193..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/examples/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body bgcolor="#ffffff">
-Example classes for use with the JCE.
-</body>
-</html>
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/exception/ExtCertificateEncodingException.java b/bcprov/src/main/java/org/bouncycastle/jce/exception/ExtCertificateEncodingException.java
deleted file mode 100644
index e3c33d8..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/exception/ExtCertificateEncodingException.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package org.bouncycastle.jce.exception;
-
-import java.security.cert.CertificateEncodingException;
-
-public class ExtCertificateEncodingException
-    extends CertificateEncodingException
-    implements ExtException
-{
-    private Throwable cause;
-
-    public ExtCertificateEncodingException(String message, Throwable cause)
-    {
-        super(message);
-        this.cause = cause;
-    }
-
-    public Throwable getCause()
-    {
-        return cause;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/exception/ExtIOException.java b/bcprov/src/main/java/org/bouncycastle/jce/exception/ExtIOException.java
deleted file mode 100644
index 656e23a..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/exception/ExtIOException.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package org.bouncycastle.jce.exception;
-
-import java.io.IOException;
-
-public class ExtIOException
-    extends IOException
-    implements ExtException
-{
-    private Throwable cause;
-
-    public ExtIOException(String message, Throwable cause)
-    {
-        super(message);
-        this.cause = cause;
-    }
-
-    public Throwable getCause()
-    {
-        return cause;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/interfaces/ElGamalKey.java b/bcprov/src/main/java/org/bouncycastle/jce/interfaces/ElGamalKey.java
deleted file mode 100644
index e639483..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/interfaces/ElGamalKey.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package org.bouncycastle.jce.interfaces;
-
-import org.bouncycastle.jce.spec.ElGamalParameterSpec;
-
-public interface ElGamalKey
-{
-    public ElGamalParameterSpec getParameters();
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/interfaces/ElGamalPrivateKey.java b/bcprov/src/main/java/org/bouncycastle/jce/interfaces/ElGamalPrivateKey.java
deleted file mode 100644
index 609a2a8..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/interfaces/ElGamalPrivateKey.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package org.bouncycastle.jce.interfaces;
-
-import java.math.BigInteger;
-import java.security.PrivateKey;
-
-public interface ElGamalPrivateKey
-    extends ElGamalKey, PrivateKey
-{
-    public BigInteger getX();
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/interfaces/ElGamalPublicKey.java b/bcprov/src/main/java/org/bouncycastle/jce/interfaces/ElGamalPublicKey.java
deleted file mode 100644
index c9fe35e..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/interfaces/ElGamalPublicKey.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package org.bouncycastle.jce.interfaces;
-
-import java.math.BigInteger;
-import java.security.PublicKey;
-
-public interface ElGamalPublicKey
-    extends ElGamalKey, PublicKey
-{
-    public BigInteger getY();
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/interfaces/GOST3410Key.java b/bcprov/src/main/java/org/bouncycastle/jce/interfaces/GOST3410Key.java
deleted file mode 100644
index ad16ac3..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/interfaces/GOST3410Key.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package org.bouncycastle.jce.interfaces;
-
-/**
- * Main interface for a GOST 3410-94 key.
- */
-public interface GOST3410Key
-{
-
-    public GOST3410Params getParameters();
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/interfaces/GOST3410Params.java b/bcprov/src/main/java/org/bouncycastle/jce/interfaces/GOST3410Params.java
deleted file mode 100644
index 175913b..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/interfaces/GOST3410Params.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package org.bouncycastle.jce.interfaces;
-
-import org.bouncycastle.jce.spec.GOST3410PublicKeyParameterSetSpec;
-
-public interface GOST3410Params
-{
-
-    public String getPublicKeyParamSetOID();
-
-    public String getDigestParamSetOID();
-
-    public String getEncryptionParamSetOID();
-    
-    public GOST3410PublicKeyParameterSetSpec getPublicKeyParameters();
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/interfaces/GOST3410PrivateKey.java b/bcprov/src/main/java/org/bouncycastle/jce/interfaces/GOST3410PrivateKey.java
deleted file mode 100644
index dcb25fe..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/interfaces/GOST3410PrivateKey.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package org.bouncycastle.jce.interfaces;
-
-import java.math.BigInteger;
-
-public interface GOST3410PrivateKey extends GOST3410Key, java.security.PrivateKey
-{
-
-    public BigInteger getX();
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/interfaces/GOST3410PublicKey.java b/bcprov/src/main/java/org/bouncycastle/jce/interfaces/GOST3410PublicKey.java
deleted file mode 100644
index 447cec2..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/interfaces/GOST3410PublicKey.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package org.bouncycastle.jce.interfaces;
-
-import java.security.PublicKey;
-import java.math.BigInteger;
-
-public interface GOST3410PublicKey extends GOST3410Key, PublicKey
-{
-
-    public BigInteger getY();
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/interfaces/IESKey.java b/bcprov/src/main/java/org/bouncycastle/jce/interfaces/IESKey.java
deleted file mode 100644
index f1d7901..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/interfaces/IESKey.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package org.bouncycastle.jce.interfaces;
-
-import java.security.Key;
-import java.security.PrivateKey;
-import java.security.PublicKey;
-
-/**
- * key pair for use with an integrated encryptor
- */
-public interface IESKey
-    extends Key
-{
-    /**
-     * return the intended recipient's/sender's public key.
-     */
-    public PublicKey getPublic();
-
-    /**
-     * return the local private key.
-     */
-    public PrivateKey getPrivate();
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/interfaces/MQVPrivateKey.java b/bcprov/src/main/java/org/bouncycastle/jce/interfaces/MQVPrivateKey.java
deleted file mode 100644
index a8caffd..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/interfaces/MQVPrivateKey.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package org.bouncycastle.jce.interfaces;
-
-import java.security.PrivateKey;
-import java.security.PublicKey;
-
-/**
- * Static/ephemeral private key (pair) for use with ECMQV key agreement
- * (Optionally provides the ephemeral public key)
- */
-public interface MQVPrivateKey
-    extends PrivateKey
-{
-    /**
-     * return the static private key.
-     */
-    PrivateKey getStaticPrivateKey();
-
-    /**
-     * return the ephemeral private key.
-     */
-    PrivateKey getEphemeralPrivateKey();
-
-    /**
-     * return the ephemeral public key (may be null).
-     */
-    PublicKey getEphemeralPublicKey();
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/interfaces/MQVPublicKey.java b/bcprov/src/main/java/org/bouncycastle/jce/interfaces/MQVPublicKey.java
deleted file mode 100644
index 1be14bd..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/interfaces/MQVPublicKey.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package org.bouncycastle.jce.interfaces;
-
-import java.security.PublicKey;
-
-/**
- * Static/ephemeral public key pair for use with ECMQV key agreement
- */
-public interface MQVPublicKey
-    extends PublicKey
-{
-    /**
-     * return the static public key.
-     */
-    PublicKey getStaticKey();
-
-    /**
-     * return the ephemeral public key.
-     */
-    PublicKey getEphemeralKey();
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/interfaces/package.html b/bcprov/src/main/java/org/bouncycastle/jce/interfaces/package.html
deleted file mode 100644
index bacde6c..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/interfaces/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body bgcolor="#ffffff">
-Interfaces for supporting Elliptic Curve Keys, El Gamal, and PKCS12 attributes.
-</body>
-</html>
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/package.html b/bcprov/src/main/java/org/bouncycastle/jce/package.html
deleted file mode 100644
index 52ef3bf..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/package.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<html>
-<body bgcolor="#ffffff">
-Utility classes for use with the JCE.
-<p>
-The classes in this package support the generation of certificates and PKCS10 signing requests.
-<p>
-Note: the PKCS7 class is deprecated, for a fuller version of CMS see the cms package distributed
-with the BC mail API.
-</body>
-</html>
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/provider/BouncyCastleProvider.java b/bcprov/src/main/java/org/bouncycastle/jce/provider/BouncyCastleProvider.java
index a02ca15..82c6a5a 100644
--- a/bcprov/src/main/java/org/bouncycastle/jce/provider/BouncyCastleProvider.java
+++ b/bcprov/src/main/java/org/bouncycastle/jce/provider/BouncyCastleProvider.java
@@ -64,15 +64,22 @@ public final class BouncyCastleProvider extends Provider
 
     private static final String[] SYMMETRIC_MACS =
     {
-        "SipHash"
+        // BEGIN android-removed
+        // "SipHash"
+        // END android-removed
     };
 
     private static final String[] SYMMETRIC_CIPHERS =
     {
-        "AES", "ARC4", "Blowfish", "Camellia", "CAST5", "CAST6", "ChaCha", "DES", "DESede",
-        "GOST28147", "Grainv1", "Grain128", "HC128", "HC256", "IDEA", "Noekeon", "RC2", "RC5",
-        "RC6", "Rijndael", "Salsa20", "SEED", "Serpent", "Shacal2", "Skipjack", "TEA", "Twofish", "Threefish",
-        "VMPC", "VMPCKSA3", "XTEA", "XSalsa20"
+        // BEGIN android-removed
+        // "AES", "ARC4", "Blowfish", "Camellia", "CAST5", "CAST6", "ChaCha", "DES", "DESede",
+        // "GOST28147", "Grainv1", "Grain128", "HC128", "HC256", "IDEA", "Noekeon", "RC2", "RC5",
+        // "RC6", "Rijndael", "Salsa20", "SEED", "Serpent", "Shacal2", "Skipjack", "TEA", "Twofish", "Threefish",
+        // "VMPC", "VMPCKSA3", "XTEA", "XSalsa20"
+        // END android-removed
+        // BEGIN android-added
+        "AES", "ARC4", "Blowfish", "DES", "DESede", "RC2", "Twofish",
+        // END android-added
     };
 
      /*
@@ -84,12 +91,22 @@ public final class BouncyCastleProvider extends Provider
     // later ones configure it.
     private static final String[] ASYMMETRIC_GENERIC =
     {
-        "X509", "IES"
+        // BEGIN android-removed
+        // "X509", "IES"
+        // END android-removed
+        // BEGIN android-added
+        "X509"
+        // END android-added
     };
 
     private static final String[] ASYMMETRIC_CIPHERS =
     {
-        "DSA", "DH", "EC", "RSA", "GOST", "ECGOST", "ElGamal", "DSTU4145"
+        // BEGIN android-removed
+        // "DSA", "DH", "EC", "RSA", "GOST", "ECGOST", "ElGamal", "DSTU4145"
+        // END android-removed
+        // BEGIN android-added
+        "DSA", "DH", "EC", "RSA",
+        // END android-added
     };
 
     /*
@@ -98,7 +115,12 @@ public final class BouncyCastleProvider extends Provider
     private static final String DIGEST_PACKAGE = "org.bouncycastle.jcajce.provider.digest.";
     private static final String[] DIGESTS =
     {
-        "GOST3411", "MD2", "MD4", "MD5", "SHA1", "RIPEMD128", "RIPEMD160", "RIPEMD256", "RIPEMD320", "SHA224", "SHA256", "SHA384", "SHA512", "SHA3", "Skein", "SM3", "Tiger", "Whirlpool"
+        // BEGIN android-removed
+        // "GOST3411", "MD2", "MD4", "MD5", "SHA1", "RIPEMD128", "RIPEMD160", "RIPEMD256", "RIPEMD320", "SHA224", "SHA256", "SHA384", "SHA512", "SHA3", "Skein", "SM3", "Tiger", "Whirlpool"
+        // END android-removed
+        // BEGIN android-added
+        "MD5", "SHA1", "SHA224", "SHA256", "SHA384", "SHA512",
+        // END android-added
     };
 
     /*
@@ -145,48 +167,52 @@ public final class BouncyCastleProvider extends Provider
 
         loadAlgorithms(KEYSTORE_PACKAGE, KEYSTORES);
 
+        // BEGIN android-removed
+        // //
+        // // X509Store
+        // //
+        // put("X509Store.CERTIFICATE/COLLECTION", "org.bouncycastle.jce.provider.X509StoreCertCollection");
+        // put("X509Store.ATTRIBUTECERTIFICATE/COLLECTION", "org.bouncycastle.jce.provider.X509StoreAttrCertCollection");
+        // put("X509Store.CRL/COLLECTION", "org.bouncycastle.jce.provider.X509StoreCRLCollection");
+        // put("X509Store.CERTIFICATEPAIR/COLLECTION", "org.bouncycastle.jce.provider.X509StoreCertPairCollection");
         //
-        // X509Store
+        // put("X509Store.CERTIFICATE/LDAP", "org.bouncycastle.jce.provider.X509StoreLDAPCerts");
+        // put("X509Store.CRL/LDAP", "org.bouncycastle.jce.provider.X509StoreLDAPCRLs");
+        // put("X509Store.ATTRIBUTECERTIFICATE/LDAP", "org.bouncycastle.jce.provider.X509StoreLDAPAttrCerts");
+        // put("X509Store.CERTIFICATEPAIR/LDAP", "org.bouncycastle.jce.provider.X509StoreLDAPCertPairs");
         //
-        put("X509Store.CERTIFICATE/COLLECTION", "org.bouncycastle.jce.provider.X509StoreCertCollection");
-        put("X509Store.ATTRIBUTECERTIFICATE/COLLECTION", "org.bouncycastle.jce.provider.X509StoreAttrCertCollection");
-        put("X509Store.CRL/COLLECTION", "org.bouncycastle.jce.provider.X509StoreCRLCollection");
-        put("X509Store.CERTIFICATEPAIR/COLLECTION", "org.bouncycastle.jce.provider.X509StoreCertPairCollection");
-
-        put("X509Store.CERTIFICATE/LDAP", "org.bouncycastle.jce.provider.X509StoreLDAPCerts");
-        put("X509Store.CRL/LDAP", "org.bouncycastle.jce.provider.X509StoreLDAPCRLs");
-        put("X509Store.ATTRIBUTECERTIFICATE/LDAP", "org.bouncycastle.jce.provider.X509StoreLDAPAttrCerts");
-        put("X509Store.CERTIFICATEPAIR/LDAP", "org.bouncycastle.jce.provider.X509StoreLDAPCertPairs");
-        
+        // //
+        // // X509StreamParser
+        // //
+        // put("X509StreamParser.CERTIFICATE", "org.bouncycastle.jce.provider.X509CertParser");
+        // put("X509StreamParser.ATTRIBUTECERTIFICATE", "org.bouncycastle.jce.provider.X509AttrCertParser");
+        // put("X509StreamParser.CRL", "org.bouncycastle.jce.provider.X509CRLParser");
+        // put("X509StreamParser.CERTIFICATEPAIR", "org.bouncycastle.jce.provider.X509CertPairParser");
         //
-        // X509StreamParser
+        // //
+        // // cipher engines
+        // //
+        // put("Cipher.BROKENPBEWITHMD5ANDDES", "org.bouncycastle.jce.provider.BrokenJCEBlockCipher$BrokePBEWithMD5AndDES");
         //
-        put("X509StreamParser.CERTIFICATE", "org.bouncycastle.jce.provider.X509CertParser");
-        put("X509StreamParser.ATTRIBUTECERTIFICATE", "org.bouncycastle.jce.provider.X509AttrCertParser");
-        put("X509StreamParser.CRL", "org.bouncycastle.jce.provider.X509CRLParser");
-        put("X509StreamParser.CERTIFICATEPAIR", "org.bouncycastle.jce.provider.X509CertPairParser");
-
+        // put("Cipher.BROKENPBEWITHSHA1ANDDES", "org.bouncycastle.jce.provider.BrokenJCEBlockCipher$BrokePBEWithSHA1AndDES");
         //
-        // cipher engines
         //
-        put("Cipher.BROKENPBEWITHMD5ANDDES", "org.bouncycastle.jce.provider.BrokenJCEBlockCipher$BrokePBEWithMD5AndDES");
-
-        put("Cipher.BROKENPBEWITHSHA1ANDDES", "org.bouncycastle.jce.provider.BrokenJCEBlockCipher$BrokePBEWithSHA1AndDES");
-
-
-        put("Cipher.OLDPBEWITHSHAANDTWOFISH-CBC", "org.bouncycastle.jce.provider.BrokenJCEBlockCipher$OldPBEWithSHAAndTwofish");
-
-        // Certification Path API
-        put("CertPathValidator.RFC3281", "org.bouncycastle.jce.provider.PKIXAttrCertPathValidatorSpi");
-        put("CertPathBuilder.RFC3281", "org.bouncycastle.jce.provider.PKIXAttrCertPathBuilderSpi");
-        put("CertPathValidator.RFC3280", "org.bouncycastle.jce.provider.PKIXCertPathValidatorSpi");
-        put("CertPathBuilder.RFC3280", "org.bouncycastle.jce.provider.PKIXCertPathBuilderSpi");
+        // put("Cipher.OLDPBEWITHSHAANDTWOFISH-CBC", "org.bouncycastle.jce.provider.BrokenJCEBlockCipher$OldPBEWithSHAAndTwofish");
+        //
+        // // Certification Path API
+        // put("CertPathValidator.RFC3281", "org.bouncycastle.jce.provider.PKIXAttrCertPathValidatorSpi");
+        // put("CertPathBuilder.RFC3281", "org.bouncycastle.jce.provider.PKIXAttrCertPathBuilderSpi");
+        // put("CertPathValidator.RFC3280", "org.bouncycastle.jce.provider.PKIXCertPathValidatorSpi");
+        // put("CertPathBuilder.RFC3280", "org.bouncycastle.jce.provider.PKIXCertPathBuilderSpi");
+        // END android-removed
         put("CertPathValidator.PKIX", "org.bouncycastle.jce.provider.PKIXCertPathValidatorSpi");
         put("CertPathBuilder.PKIX", "org.bouncycastle.jce.provider.PKIXCertPathBuilderSpi");
         put("CertStore.Collection", "org.bouncycastle.jce.provider.CertStoreCollectionSpi");
-        put("CertStore.LDAP", "org.bouncycastle.jce.provider.X509LDAPCertStoreSpi");
-        put("CertStore.Multi", "org.bouncycastle.jce.provider.MultiCertStoreSpi");
-        put("Alg.Alias.CertStore.X509LDAP", "LDAP");
+        // BEGIN android-removed
+        // put("CertStore.LDAP", "org.bouncycastle.jce.provider.X509LDAPCertStoreSpi");
+        // put("CertStore.Multi", "org.bouncycastle.jce.provider.MultiCertStoreSpi");
+        // put("Alg.Alias.CertStore.X509LDAP", "LDAP");
+        // END android-removed
     }
 
     private void loadAlgorithms(String packageName, String[] names)
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/provider/BrokenJCEBlockCipher.java b/bcprov/src/main/java/org/bouncycastle/jce/provider/BrokenJCEBlockCipher.java
deleted file mode 100644
index cb88e20..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/provider/BrokenJCEBlockCipher.java
+++ /dev/null
@@ -1,621 +0,0 @@
-package org.bouncycastle.jce.provider;
-
-import java.security.AlgorithmParameters;
-import java.security.InvalidAlgorithmParameterException;
-import java.security.InvalidKeyException;
-import java.security.Key;
-import java.security.KeyFactory;
-import java.security.NoSuchAlgorithmException;
-import java.security.NoSuchProviderException;
-import java.security.SecureRandom;
-import java.security.spec.AlgorithmParameterSpec;
-import java.security.spec.InvalidKeySpecException;
-import java.security.spec.PKCS8EncodedKeySpec;
-import java.security.spec.X509EncodedKeySpec;
-
-import javax.crypto.BadPaddingException;
-import javax.crypto.Cipher;
-import javax.crypto.IllegalBlockSizeException;
-import javax.crypto.NoSuchPaddingException;
-import javax.crypto.spec.IvParameterSpec;
-import javax.crypto.spec.PBEParameterSpec;
-import javax.crypto.spec.RC2ParameterSpec;
-import javax.crypto.spec.RC5ParameterSpec;
-import javax.crypto.spec.SecretKeySpec;
-
-import org.bouncycastle.crypto.BlockCipher;
-import org.bouncycastle.crypto.BufferedBlockCipher;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.DataLengthException;
-import org.bouncycastle.crypto.InvalidCipherTextException;
-import org.bouncycastle.crypto.engines.DESEngine;
-import org.bouncycastle.crypto.engines.DESedeEngine;
-import org.bouncycastle.crypto.engines.TwofishEngine;
-import org.bouncycastle.crypto.modes.CBCBlockCipher;
-import org.bouncycastle.crypto.modes.CFBBlockCipher;
-import org.bouncycastle.crypto.modes.CTSBlockCipher;
-import org.bouncycastle.crypto.modes.OFBBlockCipher;
-import org.bouncycastle.crypto.paddings.PaddedBufferedBlockCipher;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.crypto.params.ParametersWithIV;
-import org.bouncycastle.crypto.params.RC2Parameters;
-import org.bouncycastle.crypto.params.RC5Parameters;
-import org.bouncycastle.jcajce.provider.symmetric.util.BCPBEKey;
-import org.bouncycastle.util.Strings;
-
-public class BrokenJCEBlockCipher
-    implements BrokenPBE
-{
-    //
-    // specs we can handle.
-    //
-    private Class[]                 availableSpecs =
-                                    {
-                                        IvParameterSpec.class,
-                                        PBEParameterSpec.class,
-                                        RC2ParameterSpec.class,
-                                        RC5ParameterSpec.class
-                                    };
- 
-    private BufferedBlockCipher     cipher;
-    private ParametersWithIV        ivParam;
-
-    private int                     pbeType = PKCS12;
-    private int                     pbeHash = SHA1;
-    private int                     pbeKeySize;
-    private int                     pbeIvSize;
-
-    private int                     ivLength = 0;
-
-    private AlgorithmParameters     engineParams = null;
-
-    protected BrokenJCEBlockCipher(
-        BlockCipher engine)
-    {
-        cipher = new PaddedBufferedBlockCipher(engine);
-    }
-        
-    protected BrokenJCEBlockCipher(
-        BlockCipher engine,
-        int         pbeType,
-        int         pbeHash,
-        int         pbeKeySize,
-        int         pbeIvSize)
-    {
-        cipher = new PaddedBufferedBlockCipher(engine);
-
-        this.pbeType = pbeType;
-        this.pbeHash = pbeHash;
-        this.pbeKeySize = pbeKeySize;
-        this.pbeIvSize = pbeIvSize;
-    }
-
-    protected int engineGetBlockSize() 
-    {
-        return cipher.getBlockSize();
-    }
-
-    protected byte[] engineGetIV() 
-    {
-        return (ivParam != null) ? ivParam.getIV() : null;
-    }
-
-    protected int engineGetKeySize(
-        Key     key) 
-    {
-        return key.getEncoded().length;
-    }
-
-    protected int engineGetOutputSize(
-        int     inputLen) 
-    {
-        return cipher.getOutputSize(inputLen);
-    }
-
-    protected AlgorithmParameters engineGetParameters() 
-    {
-        if (engineParams == null)
-        {
-            if (ivParam != null)
-            {
-                String  name = cipher.getUnderlyingCipher().getAlgorithmName();
-
-                if (name.indexOf('/') >= 0)
-                {
-                    name = name.substring(0, name.indexOf('/'));
-                }
-
-                try
-                {
-                    engineParams = AlgorithmParameters.getInstance(name, BouncyCastleProvider.PROVIDER_NAME);
-                    engineParams.init(ivParam.getIV());
-                }
-                catch (Exception e)
-                {
-                    throw new RuntimeException(e.toString());
-                }
-            }
-        }
-
-        return engineParams;
-    }
-
-    protected void engineSetMode(
-        String  mode) 
-    {
-        String  modeName = Strings.toUpperCase(mode);
-
-        if (modeName.equals("ECB"))
-        {
-            ivLength = 0;
-            cipher = new PaddedBufferedBlockCipher(cipher.getUnderlyingCipher());
-        }
-        else if (modeName.equals("CBC"))
-        {
-            ivLength = cipher.getUnderlyingCipher().getBlockSize();
-            cipher = new PaddedBufferedBlockCipher(
-                            new CBCBlockCipher(cipher.getUnderlyingCipher()));
-        }
-        else if (modeName.startsWith("OFB"))
-        {
-            ivLength = cipher.getUnderlyingCipher().getBlockSize();
-            if (modeName.length() != 3)
-            {
-                int wordSize = Integer.parseInt(modeName.substring(3));
-
-                cipher = new PaddedBufferedBlockCipher(
-                                new OFBBlockCipher(cipher.getUnderlyingCipher(), wordSize));
-            }
-            else
-            {
-                cipher = new PaddedBufferedBlockCipher(
-                        new OFBBlockCipher(cipher.getUnderlyingCipher(), 8 * cipher.getBlockSize()));
-            }
-        }
-        else if (modeName.startsWith("CFB"))
-        {
-            ivLength = cipher.getUnderlyingCipher().getBlockSize();
-            if (modeName.length() != 3)
-            {
-                int wordSize = Integer.parseInt(modeName.substring(3));
-
-                cipher = new PaddedBufferedBlockCipher(
-                                new CFBBlockCipher(cipher.getUnderlyingCipher(), wordSize));
-            }
-            else
-            {
-                cipher = new PaddedBufferedBlockCipher(
-                        new CFBBlockCipher(cipher.getUnderlyingCipher(), 8 * cipher.getBlockSize()));
-            }
-        }
-        else
-        {
-            throw new IllegalArgumentException("can't support mode " + mode);
-        }
-    }
-
-    protected void engineSetPadding(
-        String  padding) 
-    throws NoSuchPaddingException
-    {
-        String  paddingName = Strings.toUpperCase(padding);
-
-        if (paddingName.equals("NOPADDING"))
-        {
-            cipher = new BufferedBlockCipher(cipher.getUnderlyingCipher());
-        }
-        else if (paddingName.equals("PKCS5PADDING") || paddingName.equals("PKCS7PADDING") || paddingName.equals("ISO10126PADDING"))
-        {
-            cipher = new PaddedBufferedBlockCipher(cipher.getUnderlyingCipher());
-        }
-        else if (paddingName.equals("WITHCTS"))
-        {
-            cipher = new CTSBlockCipher(cipher.getUnderlyingCipher());
-        }
-        else
-        {
-            throw new NoSuchPaddingException("Padding " + padding + " unknown.");
-        }
-    }
-
-    protected void engineInit(
-        int                     opmode,
-        Key                     key,
-        AlgorithmParameterSpec  params,
-        SecureRandom            random) 
-    throws InvalidKeyException, InvalidAlgorithmParameterException
-    {
-        CipherParameters        param;
-
-        //
-        // a note on iv's - if ivLength is zero the IV gets ignored (we don't use it).
-        //
-        if (key instanceof BCPBEKey)
-        {
-            param = BrokenPBE.Util.makePBEParameters((BCPBEKey)key, params, pbeType, pbeHash,
-                        cipher.getUnderlyingCipher().getAlgorithmName(), pbeKeySize, pbeIvSize);
-
-            if (pbeIvSize != 0)
-            {
-                ivParam = (ParametersWithIV)param;
-            }
-        }
-        else if (params == null)
-        {
-            param = new KeyParameter(key.getEncoded());
-        }
-        else if (params instanceof IvParameterSpec)
-        {
-            if (ivLength != 0)
-            {
-                param = new ParametersWithIV(new KeyParameter(key.getEncoded()), ((IvParameterSpec)params).getIV());
-                ivParam = (ParametersWithIV)param;
-            }
-            else
-            {
-                param = new KeyParameter(key.getEncoded());
-            }
-        }
-        else if (params instanceof RC2ParameterSpec)
-        {
-            RC2ParameterSpec    rc2Param = (RC2ParameterSpec)params;
-
-            param = new RC2Parameters(key.getEncoded(), ((RC2ParameterSpec)params).getEffectiveKeyBits());
-
-            if (rc2Param.getIV() != null && ivLength != 0)
-            {
-                param = new ParametersWithIV(param, rc2Param.getIV());
-                ivParam = (ParametersWithIV)param;
-            }
-        }
-        else if (params instanceof RC5ParameterSpec)
-        {
-            RC5ParameterSpec    rc5Param = (RC5ParameterSpec)params;
-
-            param = new RC5Parameters(key.getEncoded(), ((RC5ParameterSpec)params).getRounds());
-            if (rc5Param.getWordSize() != 32)
-            {
-                throw new IllegalArgumentException("can only accept RC5 word size 32 (at the moment...)");
-            }
-            if ((rc5Param.getIV() != null) && (ivLength != 0))
-            {
-                param = new ParametersWithIV(param, rc5Param.getIV());
-                ivParam = (ParametersWithIV)param;
-            }
-        }
-        else
-        {
-            throw new InvalidAlgorithmParameterException("unknown parameter type.");
-        }
-
-        if ((ivLength != 0) && !(param instanceof ParametersWithIV))
-        {
-            if (random == null)
-            {
-                random = new SecureRandom();
-            }
-
-            if ((opmode == Cipher.ENCRYPT_MODE) || (opmode == Cipher.WRAP_MODE))
-            {
-                byte[]  iv = new byte[ivLength];
-
-                random.nextBytes(iv);
-                param = new ParametersWithIV(param, iv);
-                ivParam = (ParametersWithIV)param;
-            }
-            else
-            {
-                throw new InvalidAlgorithmParameterException("no IV set when one expected");
-            }
-        }
-
-        switch (opmode)
-        {
-        case Cipher.ENCRYPT_MODE:
-        case Cipher.WRAP_MODE:
-            cipher.init(true, param);
-            break;
-        case Cipher.DECRYPT_MODE:
-        case Cipher.UNWRAP_MODE:
-            cipher.init(false, param);
-            break;
-        default:
-            System.out.println("eeek!");
-        }
-    }
-
-    protected void engineInit(
-        int                 opmode,
-        Key                 key,
-        AlgorithmParameters params,
-        SecureRandom        random) 
-    throws InvalidKeyException, InvalidAlgorithmParameterException
-    {
-        AlgorithmParameterSpec  paramSpec = null;
-
-        if (params != null)
-        {
-            for (int i = 0; i != availableSpecs.length; i++)
-            {
-                try
-                {
-                    paramSpec = params.getParameterSpec(availableSpecs[i]);
-                    break;
-                }
-                catch (Exception e)
-                {
-                    continue;
-                }
-            }
-
-            if (paramSpec == null)
-            {
-                throw new InvalidAlgorithmParameterException("can't handle parameter " + params.toString());
-            }
-        }
-
-        engineParams = params;
-        engineInit(opmode, key, paramSpec, random);
-    }
-
-    protected void engineInit(
-        int                 opmode,
-        Key                 key,
-        SecureRandom        random) 
-        throws InvalidKeyException
-    {
-        try
-        {
-            engineInit(opmode, key, (AlgorithmParameterSpec)null, random);
-        }
-        catch (InvalidAlgorithmParameterException e)
-        {
-            throw new IllegalArgumentException(e.getMessage());
-        }
-    }
-
-    protected byte[] engineUpdate(
-        byte[]  input,
-        int     inputOffset,
-        int     inputLen) 
-    {
-        int     length = cipher.getUpdateOutputSize(inputLen);
-
-        if (length > 0)
-        {
-                byte[]  out = new byte[length];
-
-                cipher.processBytes(input, inputOffset, inputLen, out, 0);
-                return out;
-        }
-
-        cipher.processBytes(input, inputOffset, inputLen, null, 0);
-
-        return null;
-    }
-
-    protected int engineUpdate(
-        byte[]  input,
-        int     inputOffset,
-        int     inputLen,
-        byte[]  output,
-        int     outputOffset) 
-    {
-        return cipher.processBytes(input, inputOffset, inputLen, output, outputOffset);
-    }
-
-    protected byte[] engineDoFinal(
-        byte[]  input,
-        int     inputOffset,
-        int     inputLen) 
-        throws IllegalBlockSizeException, BadPaddingException
-    {
-        int     len = 0;
-        byte[]  tmp = new byte[engineGetOutputSize(inputLen)];
-
-        if (inputLen != 0)
-        {
-            len = cipher.processBytes(input, inputOffset, inputLen, tmp, 0);
-        }
-
-        try
-        {
-            len += cipher.doFinal(tmp, len);
-        }
-        catch (DataLengthException e)
-        {
-            throw new IllegalBlockSizeException(e.getMessage());
-        }
-        catch (InvalidCipherTextException e)
-        {
-            throw new BadPaddingException(e.getMessage());
-        }
-
-        byte[]  out = new byte[len];
-
-        System.arraycopy(tmp, 0, out, 0, len);
-
-        return out;
-    }
-
-    protected int engineDoFinal(
-        byte[]  input,
-        int     inputOffset,
-        int     inputLen,
-        byte[]  output,
-        int     outputOffset) 
-        throws IllegalBlockSizeException, BadPaddingException
-    {
-        int     len = 0;
-
-        if (inputLen != 0)
-        {
-                len = cipher.processBytes(input, inputOffset, inputLen, output, outputOffset);
-        }
-
-        try
-        {
-            return len + cipher.doFinal(output, outputOffset + len);
-        }
-        catch (DataLengthException e)
-        {
-            throw new IllegalBlockSizeException(e.getMessage());
-        }
-        catch (InvalidCipherTextException e)
-        {
-            throw new BadPaddingException(e.getMessage());
-        }
-    }
-
-    protected byte[] engineWrap(
-        Key     key) 
-    throws IllegalBlockSizeException, java.security.InvalidKeyException
-    {
-        byte[] encoded = key.getEncoded();
-        if (encoded == null)
-        {
-            throw new InvalidKeyException("Cannot wrap key, null encoding.");
-        }
-
-        try
-        {
-            return engineDoFinal(encoded, 0, encoded.length);
-        }
-        catch (BadPaddingException e)
-        {
-            throw new IllegalBlockSizeException(e.getMessage());
-        }
-    }
-
-    protected Key engineUnwrap(
-        byte[]  wrappedKey,
-        String  wrappedKeyAlgorithm,
-        int     wrappedKeyType) 
-    throws InvalidKeyException
-    {
-        byte[] encoded = null;
-        try
-        {
-            encoded = engineDoFinal(wrappedKey, 0, wrappedKey.length);
-        }
-        catch (BadPaddingException e)
-        {
-            throw new InvalidKeyException(e.getMessage());
-        }
-        catch (IllegalBlockSizeException e2)
-        {
-            throw new InvalidKeyException(e2.getMessage());
-        }
-
-        if (wrappedKeyType == Cipher.SECRET_KEY)
-        {
-            return new SecretKeySpec(encoded, wrappedKeyAlgorithm);
-        }
-        else
-        {
-            try
-            {
-                KeyFactory kf = KeyFactory.getInstance(wrappedKeyAlgorithm, BouncyCastleProvider.PROVIDER_NAME);
-
-                if (wrappedKeyType == Cipher.PUBLIC_KEY)
-                {
-                    return kf.generatePublic(new X509EncodedKeySpec(encoded));
-                }
-                else if (wrappedKeyType == Cipher.PRIVATE_KEY)
-                {
-                    return kf.generatePrivate(new PKCS8EncodedKeySpec(encoded));
-                }
-            }
-            catch (NoSuchProviderException e)
-            {
-                throw new InvalidKeyException("Unknown key type " + e.getMessage());
-            }
-            catch (NoSuchAlgorithmException e)
-            {
-                throw new InvalidKeyException("Unknown key type " + e.getMessage());
-            }
-            catch (InvalidKeySpecException e2)
-            {
-                throw new InvalidKeyException("Unknown key type " + e2.getMessage());
-            }
-
-            throw new InvalidKeyException("Unknown key type " + wrappedKeyType);
-        }
-    }
-
-    /*
-     * The ciphers that inherit from us.
-     */
-
-    /**
-     * PBEWithMD5AndDES
-     */
-    static public class BrokePBEWithMD5AndDES
-        extends BrokenJCEBlockCipher
-    {
-        public BrokePBEWithMD5AndDES()
-        {
-            super(new CBCBlockCipher(new DESEngine()), PKCS5S1, MD5, 64, 64);
-        }
-    }
-
-    /**
-     * PBEWithSHA1AndDES
-     */
-    static public class BrokePBEWithSHA1AndDES
-        extends BrokenJCEBlockCipher
-    {
-        public BrokePBEWithSHA1AndDES()
-        {
-            super(new CBCBlockCipher(new DESEngine()), PKCS5S1, SHA1, 64, 64);
-        }
-    }
-
-    /**
-     * PBEWithSHAAnd3-KeyTripleDES-CBC
-     */
-    static public class BrokePBEWithSHAAndDES3Key
-        extends BrokenJCEBlockCipher
-    {
-        public BrokePBEWithSHAAndDES3Key()
-        {
-            super(new CBCBlockCipher(new DESedeEngine()), PKCS12, SHA1, 192, 64);
-        }
-    }
-
-    /**
-     * OldPBEWithSHAAnd3-KeyTripleDES-CBC
-     */
-    static public class OldPBEWithSHAAndDES3Key
-        extends BrokenJCEBlockCipher
-    {
-        public OldPBEWithSHAAndDES3Key()
-        {
-            super(new CBCBlockCipher(new DESedeEngine()), OLD_PKCS12, SHA1, 192, 64);
-        }
-    }
-
-    /**
-     * PBEWithSHAAnd2-KeyTripleDES-CBC
-     */
-    static public class BrokePBEWithSHAAndDES2Key
-        extends BrokenJCEBlockCipher
-    {
-        public BrokePBEWithSHAAndDES2Key()
-        {
-            super(new CBCBlockCipher(new DESedeEngine()), PKCS12, SHA1, 128, 64);
-        }
-    }
-
-    /**
-     * OldPBEWithSHAAndTwofish-CBC
-     */
-    static public class OldPBEWithSHAAndTwofish
-        extends BrokenJCEBlockCipher
-    {
-        public OldPBEWithSHAAndTwofish()
-        {
-            super(new CBCBlockCipher(new TwofishEngine()), OLD_PKCS12, SHA1, 256, 128);
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/provider/BrokenKDF2BytesGenerator.java b/bcprov/src/main/java/org/bouncycastle/jce/provider/BrokenKDF2BytesGenerator.java
deleted file mode 100644
index e6186f6..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/provider/BrokenKDF2BytesGenerator.java
+++ /dev/null
@@ -1,127 +0,0 @@
-package org.bouncycastle.jce.provider;
-
-import org.bouncycastle.crypto.DataLengthException;
-import org.bouncycastle.crypto.DerivationFunction;
-import org.bouncycastle.crypto.DerivationParameters;
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.params.KDFParameters;
-
-/**
- * Generator for PBE derived keys and ivs as defined by IEEE P1363a
- * <br>
- * This implementation is based on draft 9 of IEEE P1363a. <b>Note:</b>
- * as this is still a draft the output of this generator may change, don't
- * use it for anything that might be subject to long term storage.
- */
-public class BrokenKDF2BytesGenerator
-    implements DerivationFunction
-{
-    private Digest  digest;
-    private byte[]  shared;
-    private byte[]  iv;
-
-    /**
-     * Construct a KDF2 Parameters generator. Generates key material
-     * according to IEEE P1363a - if you want orthodox results you should
-     * use a digest specified in the standard.
-     * <p>
-     * <b>Note:</b> IEEE P1363a standard is still a draft standard, if the standard
-     * changes this function, the output of this function will change as well.
-     * Don't use this routine for anything subject to long term storage.
-     *
-     * @param digest the digest to be used as the source of derived keys.
-     */
-    public BrokenKDF2BytesGenerator(
-        Digest  digest)
-    {
-        this.digest = digest;
-    }
-
-    public void init(
-        DerivationParameters    param)
-    {
-        if (!(param instanceof KDFParameters))
-        {
-            throw new IllegalArgumentException("KDF parameters required for KDF2Generator");
-        }
-
-        KDFParameters   p = (KDFParameters)param;
-
-        shared = p.getSharedSecret();
-        iv = p.getIV();
-    }
-
-    /**
-     * return the underlying digest.
-     */
-    public Digest getDigest()
-    {
-        return digest;
-    }
-
-    /**
-     * fill len bytes of the output buffer with bytes generated from
-     * the derivation function.
-     *
-     * @throws IllegalArgumentException if the size of the request will cause an overflow.
-     * @throws DataLengthException if the out buffer is too small.
-     */
-    public int generateBytes(
-        byte[]  out,
-        int     outOff,
-        int     len)
-        throws DataLengthException, IllegalArgumentException
-    {
-        if ((out.length - len) < outOff)
-        {
-            throw new DataLengthException("output buffer too small");
-        }
-
-        long    oBits = len * 8;
-
-        //
-        // this is at odds with the standard implementation, the
-        // maximum value should be hBits * (2^23 - 1) where hBits
-        // is the digest output size in bits. We can't have an
-        // array with a long index at the moment...
-        //
-        if (oBits > (digest.getDigestSize() * 8 * (2L^32 - 1)))
-        {
-            new IllegalArgumentException("Output length to large");
-        }
-    
-        int cThreshold = (int)(oBits / digest.getDigestSize());
-
-        byte[] dig = null;
-
-        dig = new byte[digest.getDigestSize()];
-
-        for (int counter = 1; counter <= cThreshold; counter++)
-        {
-            digest.update(shared, 0, shared.length);
-
-            digest.update((byte)(counter & 0xff));
-            digest.update((byte)((counter >> 8) & 0xff));
-            digest.update((byte)((counter >> 16) & 0xff));
-            digest.update((byte)((counter >> 24) & 0xff));
-
-            digest.update(iv, 0, iv.length);
-
-            digest.doFinal(dig, 0);
-
-            if ((len - outOff) > dig.length)
-            {
-                System.arraycopy(dig, 0, out, outOff, dig.length);
-                outOff += dig.length;
-            }
-            else
-            {
-                System.arraycopy(dig, 0, out, outOff, len - outOff);
-            }
-        }
-    
-        digest.reset();
-
-        return len;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/provider/BrokenPBE.java b/bcprov/src/main/java/org/bouncycastle/jce/provider/BrokenPBE.java
deleted file mode 100644
index a173625..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/provider/BrokenPBE.java
+++ /dev/null
@@ -1,441 +0,0 @@
-package org.bouncycastle.jce.provider;
-
-import java.security.spec.AlgorithmParameterSpec;
-
-import javax.crypto.spec.PBEParameterSpec;
-
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.PBEParametersGenerator;
-import org.bouncycastle.crypto.digests.MD5Digest;
-import org.bouncycastle.crypto.digests.RIPEMD160Digest;
-import org.bouncycastle.crypto.digests.SHA1Digest;
-import org.bouncycastle.crypto.generators.PKCS12ParametersGenerator;
-import org.bouncycastle.crypto.generators.PKCS5S1ParametersGenerator;
-import org.bouncycastle.crypto.generators.PKCS5S2ParametersGenerator;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.crypto.params.ParametersWithIV;
-import org.bouncycastle.jcajce.provider.symmetric.util.BCPBEKey;
-
-/**
- * Generator for PBE derived keys and ivs as defined by PKCS 12 V1.0,
- * with a bug affecting 180 bit plus keys - this class is only here to
- * allow smooth migration of the version 0 keystore to version 1. Don't
- * use it (it won't be staying around).
- * <p>
- * The document this implementation is based on can be found at
- * <a href=http://www.rsasecurity.com/rsalabs/pkcs/pkcs-12/index.html>
- * RSA's PKCS12 Page</a>
- */
-class OldPKCS12ParametersGenerator
-    extends PBEParametersGenerator
-{
-    public static final int KEY_MATERIAL = 1;
-    public static final int IV_MATERIAL  = 2;
-    public static final int MAC_MATERIAL = 3;
-
-    private Digest digest;
-
-    private int     u;
-    private int     v;
-
-    /**
-     * Construct a PKCS 12 Parameters generator. This constructor will
-     * accept MD5, SHA1, and RIPEMD160.
-     *
-     * @param digest the digest to be used as the source of derived keys.
-     * @exception IllegalArgumentException if an unknown digest is passed in.
-     */
-    public OldPKCS12ParametersGenerator(
-        Digest  digest)
-    {
-        this.digest = digest;
-        if (digest instanceof MD5Digest)
-        {
-            u = 128 / 8;
-            v = 512 / 8;
-        }
-        else if (digest instanceof SHA1Digest)
-        {
-            u = 160 / 8;
-            v = 512 / 8;
-        }
-        else if (digest instanceof RIPEMD160Digest)
-        {
-            u = 160 / 8;
-            v = 512 / 8;
-        }
-        else
-        {
-            throw new IllegalArgumentException("Digest " + digest.getAlgorithmName() + " unsupported");
-        }
-    }
-
-    /**
-     * add a + b + 1, returning the result in a. The a value is treated
-     * as a BigInteger of length (b.length * 8) bits. The result is 
-     * modulo 2^b.length in case of overflow.
-     */
-    private void adjust(
-        byte[]  a,
-        int     aOff,
-        byte[]  b)
-    {
-        int  x = (b[b.length - 1] & 0xff) + (a[aOff + b.length - 1] & 0xff) + 1;
-
-        a[aOff + b.length - 1] = (byte)x;
-        x >>>= 8;
-
-        for (int i = b.length - 2; i >= 0; i--)
-        {
-            x += (b[i] & 0xff) + (a[aOff + i] & 0xff);
-            a[aOff + i] = (byte)x;
-            x >>>= 8;
-        }
-    }
-
-    /**
-     * generation of a derived key ala PKCS12 V1.0.
-     */
-    private byte[] generateDerivedKey(
-        int idByte,
-        int n)
-    {
-        byte[]  D = new byte[v];
-        byte[]  dKey = new byte[n];
-
-        for (int i = 0; i != D.length; i++)
-        {
-            D[i] = (byte)idByte;
-        }
-
-        byte[]  S;
-
-        if ((salt != null) && (salt.length != 0))
-        {
-            S = new byte[v * ((salt.length + v - 1) / v)];
-
-            for (int i = 0; i != S.length; i++)
-            {
-                S[i] = salt[i % salt.length];
-            }
-        }
-        else
-        {
-            S = new byte[0];
-        }
-
-        byte[]  P;
-
-        if ((password != null) && (password.length != 0))
-        {
-            P = new byte[v * ((password.length + v - 1) / v)];
-
-            for (int i = 0; i != P.length; i++)
-            {
-                P[i] = password[i % password.length];
-            }
-        }
-        else
-        {
-            P = new byte[0];
-        }
-
-        byte[]  I = new byte[S.length + P.length];
-
-        System.arraycopy(S, 0, I, 0, S.length);
-        System.arraycopy(P, 0, I, S.length, P.length);
-
-        byte[]  B = new byte[v];
-        int     c = (n + u - 1) / u;
-
-        for (int i = 1; i <= c; i++)
-        {
-            byte[]  A = new byte[u];
-
-            digest.update(D, 0, D.length);
-            digest.update(I, 0, I.length);
-            digest.doFinal(A, 0);
-            for (int j = 1; j != iterationCount; j++)
-            {
-                digest.update(A, 0, A.length);
-                digest.doFinal(A, 0);
-            }
-
-            for (int j = 0; j != B.length; j++)
-            {
-                B[i] = A[j % A.length];
-            }
-
-            for (int j = 0; j != I.length / v; j++)
-            {
-                adjust(I, j * v, B);
-            }
-
-            if (i == c)
-            {
-                System.arraycopy(A, 0, dKey, (i - 1) * u, dKey.length - ((i - 1) * u));
-            }
-            else
-            {
-                System.arraycopy(A, 0, dKey, (i - 1) * u, A.length);
-            }
-        }
-
-        return dKey;
-    }
-
-    /**
-     * Generate a key parameter derived from the password, salt, and iteration
-     * count we are currently initialised with.
-     *
-     * @param keySize the size of the key we want (in bits)
-     * @return a KeyParameter object.
-     */
-    public CipherParameters generateDerivedParameters(
-        int keySize)
-    {
-        keySize = keySize / 8;
-
-        byte[]  dKey = generateDerivedKey(KEY_MATERIAL, keySize);
-
-        return new KeyParameter(dKey, 0, keySize);
-    }
-
-    /**
-     * Generate a key with initialisation vector parameter derived from
-     * the password, salt, and iteration count we are currently initialised
-     * with.
-     *
-     * @param keySize the size of the key we want (in bits)
-     * @param ivSize the size of the iv we want (in bits)
-     * @return a ParametersWithIV object.
-     */
-    public CipherParameters generateDerivedParameters(
-        int     keySize,
-        int     ivSize)
-    {
-        keySize = keySize / 8;
-        ivSize = ivSize / 8;
-
-        byte[]  dKey = generateDerivedKey(KEY_MATERIAL, keySize);
-
-        byte[]  iv = generateDerivedKey(IV_MATERIAL, ivSize);
-
-        return new ParametersWithIV(new KeyParameter(dKey, 0, keySize), iv, 0, ivSize);
-    }
-
-    /**
-     * Generate a key parameter for use with a MAC derived from the password,
-     * salt, and iteration count we are currently initialised with.
-     *
-     * @param keySize the size of the key we want (in bits)
-     * @return a KeyParameter object.
-     */
-    public CipherParameters generateDerivedMacParameters(
-        int keySize)
-    {
-        keySize = keySize / 8;
-
-        byte[]  dKey = generateDerivedKey(MAC_MATERIAL, keySize);
-
-        return new KeyParameter(dKey, 0, keySize);
-    }
-}
-
-public interface BrokenPBE
-{
-    //
-    // PBE Based encryption constants - by default we do PKCS12 with SHA-1
-    //
-    static final int        MD5         = 0;
-    static final int        SHA1        = 1;
-    static final int        RIPEMD160   = 2;
-
-    static final int        PKCS5S1     = 0;
-    static final int        PKCS5S2     = 1;
-    static final int        PKCS12      = 2;
-    static final int        OLD_PKCS12  = 3;
-
-    /**
-     * uses the appropriate mixer to generate the key and IV if neccessary.
-     */
-    static class Util
-    {
-        /**
-         * a faulty parity routine...
-         *
-         * @param bytes the byte array to set the parity on.
-         */
-        static private void setOddParity(
-            byte[] bytes)
-        {
-            for (int i = 0; i < bytes.length; i++)
-            {
-                int b = bytes[i];
-                bytes[i] = (byte)((b & 0xfe) |
-                                (((b >> 1) ^
-                                (b >> 2) ^
-                                (b >> 3) ^
-                                (b >> 4) ^
-                                (b >> 5) ^
-                                (b >> 6) ^
-                                (b >> 7)) ^ 0x01));
-            }
-        }
-
-        static private PBEParametersGenerator makePBEGenerator(
-            int                     type,
-            int                     hash)
-        {
-            PBEParametersGenerator  generator;
-    
-            if (type == PKCS5S1)
-            {
-                switch (hash)
-                {
-                case MD5:
-                    generator = new PKCS5S1ParametersGenerator(new MD5Digest());
-                    break;
-                case SHA1:
-                    generator = new PKCS5S1ParametersGenerator(new SHA1Digest());
-                    break;
-                default:
-                    throw new IllegalStateException("PKCS5 scheme 1 only supports only MD5 and SHA1.");
-                }
-            }
-            else if (type == PKCS5S2)
-            {
-                generator = new PKCS5S2ParametersGenerator();
-            }
-            else if (type == OLD_PKCS12)
-            {
-                switch (hash)
-                {
-                case MD5:
-                    generator = new OldPKCS12ParametersGenerator(new MD5Digest());
-                    break;
-                case SHA1:
-                    generator = new OldPKCS12ParametersGenerator(new SHA1Digest());
-                    break;
-                case RIPEMD160:
-                    generator = new OldPKCS12ParametersGenerator(new RIPEMD160Digest());
-                    break;
-                default:
-                    throw new IllegalStateException("unknown digest scheme for PBE encryption.");
-                }
-            }
-            else
-            {
-                switch (hash)
-                {
-                case MD5:
-                    generator = new PKCS12ParametersGenerator(new MD5Digest());
-                    break;
-                case SHA1:
-                    generator = new PKCS12ParametersGenerator(new SHA1Digest());
-                    break;
-                case RIPEMD160:
-                    generator = new PKCS12ParametersGenerator(new RIPEMD160Digest());
-                    break;
-                default:
-                    throw new IllegalStateException("unknown digest scheme for PBE encryption.");
-                }
-            }
-    
-            return generator;
-        }
-
-        /**
-         * construct a key and iv (if neccessary) suitable for use with a 
-         * Cipher.
-         */
-        static CipherParameters makePBEParameters(
-            BCPBEKey pbeKey,
-            AlgorithmParameterSpec  spec,
-            int                     type,
-            int                     hash,
-            String                  targetAlgorithm,
-            int                     keySize,
-            int                     ivSize)
-        {
-            if ((spec == null) || !(spec instanceof PBEParameterSpec))
-            {
-                throw new IllegalArgumentException("Need a PBEParameter spec with a PBE key.");
-            }
-    
-            PBEParameterSpec        pbeParam = (PBEParameterSpec)spec;
-            PBEParametersGenerator  generator = makePBEGenerator(type, hash);
-            byte[]                  key = pbeKey.getEncoded();
-            CipherParameters        param;
-    
-            generator.init(key, pbeParam.getSalt(), pbeParam.getIterationCount());
-
-            if (ivSize != 0)
-            {
-                param = generator.generateDerivedParameters(keySize, ivSize);
-            }
-            else
-            {
-                param = generator.generateDerivedParameters(keySize);
-            }
-
-            if (targetAlgorithm.startsWith("DES"))
-            {
-                if (param instanceof ParametersWithIV)
-                {
-                    KeyParameter    kParam = (KeyParameter)((ParametersWithIV)param).getParameters();
-
-                    setOddParity(kParam.getKey());
-                }
-                else
-                {
-                    KeyParameter    kParam = (KeyParameter)param;
-
-                    setOddParity(kParam.getKey());
-                }
-            }
-
-            for (int i = 0; i != key.length; i++)
-            {
-                key[i] = 0;
-            }
-
-            return param;
-        }
-
-        /**
-         * generate a PBE based key suitable for a MAC algorithm, the
-         * key size is chosen according the MAC size, or the hashing algorithm,
-         * whichever is greater.
-         */
-        static CipherParameters makePBEMacParameters(
-            BCPBEKey pbeKey,
-            AlgorithmParameterSpec  spec,
-            int                     type,
-            int                     hash,
-            int                     keySize)
-        {
-            if ((spec == null) || !(spec instanceof PBEParameterSpec))
-            {
-                throw new IllegalArgumentException("Need a PBEParameter spec with a PBE key.");
-            }
-    
-            PBEParameterSpec        pbeParam = (PBEParameterSpec)spec;
-            PBEParametersGenerator  generator = makePBEGenerator(type, hash);
-            byte[]                  key = pbeKey.getEncoded();
-            CipherParameters        param;
-    
-            generator.init(key, pbeParam.getSalt(), pbeParam.getIterationCount());
-
-            param = generator.generateDerivedMacParameters(keySize);
-    
-            for (int i = 0; i != key.length; i++)
-            {
-                key[i] = 0;
-            }
-
-            return param;
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/provider/CertPathValidatorUtilities.java b/bcprov/src/main/java/org/bouncycastle/jce/provider/CertPathValidatorUtilities.java
index 1807aa8..f53f3ac 100644
--- a/bcprov/src/main/java/org/bouncycastle/jce/provider/CertPathValidatorUtilities.java
+++ b/bcprov/src/main/java/org/bouncycastle/jce/provider/CertPathValidatorUtilities.java
@@ -35,6 +35,7 @@ import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import javax.security.auth.x500.X500Principal;
 
 import org.bouncycastle.asn1.ASN1Encodable;
 import org.bouncycastle.asn1.ASN1Enumerated;
@@ -73,7 +74,9 @@ import org.bouncycastle.util.Selector;
 import org.bouncycastle.util.Store;
 import org.bouncycastle.util.StoreException;
 import org.bouncycastle.x509.X509AttributeCertificate;
-import org.bouncycastle.x509.extension.X509ExtensionUtil;
+// BEGIN android-removed
+// import org.bouncycastle.x509.extension.X509ExtensionUtil;
+// END android-removed
 
 class CertPathValidatorUtilities
 {
@@ -653,20 +656,22 @@ class CertPathValidatorUtilities
         {
             Object obj = iter.next();
 
-            if (obj instanceof Store)
-            {
-                Store certStore = (Store)obj;
-                try
-                {
-                    certs.addAll(certStore.getMatches(certSelect));
-                }
-                catch (StoreException e)
-                {
-                    throw new AnnotatedException(
-                            "Problem while picking certificates from X.509 store.", e);
-                }
-            }
-            else
+            // BEGIN android-removed
+            // if (obj instanceof X509Store)
+            // {
+            //     X509Store certStore = (X509Store)obj;
+            //     try
+            //     {
+            //         certs.addAll(certStore.getMatches(certSelect));
+            //     }
+            //     catch (StoreException e)
+            //     {
+            //         throw new AnnotatedException(
+            //                 "Problem while picking certificates from X.509 store.", e);
+            //     }
+            // }
+            // else
+            // END android-removed
             {
                 CertStore certStore = (CertStore)obj;
 
@@ -715,7 +720,14 @@ class CertPathValidatorUtilities
 
                         for (int j = 0; j < genNames.length; j++)
                         {
-                            PKIXCRLStore store = namedCRLStoreMap.get(genNames[i]);
+                            // BEGIN android-removed
+                            // PKIXCRLStore store = namedCRLStoreMap.get(genNames[i]);
+                            // END android-removed
+                            // BEGIN android-added
+                            // Seems like a bug, unless there should be a guarantee that j < i,
+                            // However, it's breaking the tests.
+                            PKIXCRLStore store = namedCRLStoreMap.get(genNames[j]);
+                            // END android-added
                             if (store != null)
                             {
                                 stores.add(store);
@@ -888,8 +900,20 @@ class CertPathValidatorUtilities
             {
                 return;
             }
-
-            X500Name certIssuer = X500Name.getInstance(crl_entry.getCertificateIssuer().getEncoded());
+            // BEGIN android-removed
+            // X500Name certIssuer = X500Name.getInstance(crl_entry.getCertificateIssuer().getEncoded());
+            // END android-removed
+            // BEGIN android-added
+            // The original code throws null pointer exception for OpenSSLX509CRL,
+            // which uses the implementation for getCertificateIssuer() in X509CRL, method
+            // whose reference implementation has the following JavaDoc: "If the certificate
+            // issuer is also the CRL issuer, this method returns null."
+            X500Name certIssuer = null;
+            X500Principal certificateIssuerPrincipal = crl_entry.getCertificateIssuer();
+            if (certificateIssuerPrincipal != null) {
+                certIssuer = X500Name.getInstance(certificateIssuerPrincipal.getEncoded());
+            }
+            // END android-added
 
             if (certIssuer == null)
             {
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/provider/JCEECPrivateKey.java b/bcprov/src/main/java/org/bouncycastle/jce/provider/JCEECPrivateKey.java
index 67e40b4..f5af73a 100644
--- a/bcprov/src/main/java/org/bouncycastle/jce/provider/JCEECPrivateKey.java
+++ b/bcprov/src/main/java/org/bouncycastle/jce/provider/JCEECPrivateKey.java
@@ -19,8 +19,10 @@ import org.bouncycastle.asn1.ASN1Primitive;
 import org.bouncycastle.asn1.ASN1Sequence;
 import org.bouncycastle.asn1.DERBitString;
 import org.bouncycastle.asn1.DERNull;
-import org.bouncycastle.asn1.cryptopro.CryptoProObjectIdentifiers;
-import org.bouncycastle.asn1.cryptopro.ECGOST3410NamedCurves;
+// BEGIN android-removed
+// import org.bouncycastle.asn1.cryptopro.CryptoProObjectIdentifiers;
+// import org.bouncycastle.asn1.cryptopro.ECGOST3410NamedCurves;
+// END android-removed
 import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
 import org.bouncycastle.asn1.sec.ECPrivateKeyStructure;
 import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
@@ -202,21 +204,23 @@ public class JCEECPrivateKey
             ASN1ObjectIdentifier oid = ASN1ObjectIdentifier.getInstance(params.getParameters());
             X9ECParameters ecP = ECUtil.getNamedCurveByOid(oid);
 
-            if (ecP == null) // GOST Curve
-            {
-                ECDomainParameters gParam = ECGOST3410NamedCurves.getByOID(oid);
-                EllipticCurve ellipticCurve = EC5Util.convertCurve(gParam.getCurve(), gParam.getSeed());
-
-                ecSpec = new ECNamedCurveSpec(
-                        ECGOST3410NamedCurves.getName(oid),
-                        ellipticCurve,
-                        new ECPoint(
-                                gParam.getG().getAffineXCoord().toBigInteger(),
-                                gParam.getG().getAffineYCoord().toBigInteger()),
-                        gParam.getN(),
-                        gParam.getH());
-            }
-            else
+            // BEGIN android-removed
+            // if (ecP == null) // GOST Curve
+            // {
+            //     ECDomainParameters gParam = ECGOST3410NamedCurves.getByOID(oid);
+            //     EllipticCurve ellipticCurve = EC5Util.convertCurve(gParam.getCurve(), gParam.getSeed());
+            //
+            //     ecSpec = new ECNamedCurveSpec(
+            //             ECGOST3410NamedCurves.getName(oid),
+            //             ellipticCurve,
+            //             new ECPoint(
+            //                     gParam.getG().getAffineXCoord().toBigInteger(),
+            //                     gParam.getG().getAffineYCoord().toBigInteger()),
+            //             gParam.getN(),
+            //             gParam.getH());
+            // }
+            // else
+            // END android-removed
             {
                 EllipticCurve ellipticCurve = EC5Util.convertCurve(ecP.getCurve(), ecP.getSeed());
 
@@ -330,11 +334,13 @@ public class JCEECPrivateKey
 
         try
         {
-            if (algorithm.equals("ECGOST3410"))
-            {
-                info = new PrivateKeyInfo(new AlgorithmIdentifier(CryptoProObjectIdentifiers.gostR3410_2001, params.toASN1Primitive()), keyStructure.toASN1Primitive());
-            }
-            else
+            // BEGIN android-removed
+            // if (algorithm.equals("ECGOST3410"))
+            // {
+            //     info = new PrivateKeyInfo(new AlgorithmIdentifier(CryptoProObjectIdentifiers.gostR3410_2001, params.toASN1Primitive()), keyStructure.toASN1Primitive());
+            // }
+            // else
+            // END android-removed
             {
 
                 info = new PrivateKeyInfo(new AlgorithmIdentifier(X9ObjectIdentifiers.id_ecPublicKey, params.toASN1Primitive()), keyStructure.toASN1Primitive());
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/provider/JCEECPublicKey.java b/bcprov/src/main/java/org/bouncycastle/jce/provider/JCEECPublicKey.java
index c82be8c..10dfb48 100644
--- a/bcprov/src/main/java/org/bouncycastle/jce/provider/JCEECPublicKey.java
+++ b/bcprov/src/main/java/org/bouncycastle/jce/provider/JCEECPublicKey.java
@@ -18,9 +18,11 @@ import org.bouncycastle.asn1.ASN1Sequence;
 import org.bouncycastle.asn1.DERBitString;
 import org.bouncycastle.asn1.DERNull;
 import org.bouncycastle.asn1.DEROctetString;
-import org.bouncycastle.asn1.cryptopro.CryptoProObjectIdentifiers;
-import org.bouncycastle.asn1.cryptopro.ECGOST3410NamedCurves;
-import org.bouncycastle.asn1.cryptopro.GOST3410PublicKeyAlgParameters;
+// BEGIN android-removed
+// import org.bouncycastle.asn1.cryptopro.CryptoProObjectIdentifiers;
+// import org.bouncycastle.asn1.cryptopro.ECGOST3410NamedCurves;
+// import org.bouncycastle.asn1.cryptopro.GOST3410PublicKeyAlgParameters;
+// END android-removed
 import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
 import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
 import org.bouncycastle.asn1.x9.X962Parameters;
@@ -33,9 +35,13 @@ import org.bouncycastle.crypto.params.ECPublicKeyParameters;
 import org.bouncycastle.jcajce.provider.asymmetric.util.EC5Util;
 import org.bouncycastle.jcajce.provider.asymmetric.util.ECUtil;
 import org.bouncycastle.jcajce.provider.asymmetric.util.KeyUtil;
-import org.bouncycastle.jce.ECGOST3410NamedCurveTable;
+// BEGIN android-removed
+// import org.bouncycastle.jce.ECGOST3410NamedCurveTable;
+// END android-removed
 import org.bouncycastle.jce.interfaces.ECPointEncoder;
-import org.bouncycastle.jce.spec.ECNamedCurveParameterSpec;
+// BEGIN android-removed
+// import org.bouncycastle.jce.spec.ECNamedCurveParameterSpec;
+// END android-removed
 import org.bouncycastle.jce.spec.ECNamedCurveSpec;
 import org.bouncycastle.math.ec.ECCurve;
 import org.bouncycastle.math.ec.custom.sec.SecP256K1Point;
@@ -48,7 +54,9 @@ public class JCEECPublicKey
     private org.bouncycastle.math.ec.ECPoint q;
     private ECParameterSpec         ecSpec;
     private boolean                 withCompression;
-    private GOST3410PublicKeyAlgParameters       gostParams;
+    // BEGIN android-removed
+    // private GOST3410PublicKeyAlgParameters       gostParams;
+    // END android-removed
 
     public JCEECPublicKey(
         String              algorithm,
@@ -58,7 +66,9 @@ public class JCEECPublicKey
         this.q = key.q;
         this.ecSpec = key.ecSpec;
         this.withCompression = key.withCompression;
-        this.gostParams = key.gostParams;
+        // BEGIN android-removed
+        // this.gostParams = key.gostParams;
+        // END android-removed
     }
     
     public JCEECPublicKey(
@@ -181,54 +191,55 @@ public class JCEECPublicKey
 
     private void populateFromPubKeyInfo(SubjectPublicKeyInfo info)
     {
-        if (info.getAlgorithmId().getObjectId().equals(CryptoProObjectIdentifiers.gostR3410_2001))
-        {
-            DERBitString bits = info.getPublicKeyData();
-            ASN1OctetString key;
-            this.algorithm = "ECGOST3410";
-
-            try
-            {
-                key = (ASN1OctetString) ASN1Primitive.fromByteArray(bits.getBytes());
-            }
-            catch (IOException ex)
-            {
-                throw new IllegalArgumentException("error recovering public key");
-            }
-
-            byte[]          keyEnc = key.getOctets();
-            byte[]          x = new byte[32];
-            byte[]          y = new byte[32];
-
-            for (int i = 0; i != x.length; i++)
-            {
-                x[i] = keyEnc[32 - 1 - i];
-            }
-
-            for (int i = 0; i != y.length; i++)
-            {
-                y[i] = keyEnc[64 - 1 - i];
-            }
-
-            gostParams = new GOST3410PublicKeyAlgParameters((ASN1Sequence)info.getAlgorithmId().getParameters());
-
-            ECNamedCurveParameterSpec spec = ECGOST3410NamedCurveTable.getParameterSpec(ECGOST3410NamedCurves.getName(gostParams.getPublicKeyParamSet()));
-
-            ECCurve curve = spec.getCurve();
-            EllipticCurve ellipticCurve = EC5Util.convertCurve(curve, spec.getSeed());
-
-            this.q = curve.createPoint(new BigInteger(1, x), new BigInteger(1, y), false);
-
-            ecSpec = new ECNamedCurveSpec(
-                    ECGOST3410NamedCurves.getName(gostParams.getPublicKeyParamSet()),
-                    ellipticCurve,
-                    new ECPoint(
-                            spec.getG().getAffineXCoord().toBigInteger(),
-                            spec.getG().getAffineYCoord().toBigInteger()),
-                            spec.getN(), spec.getH());
-
-        }
-        else
+        // if (info.getAlgorithmId().getObjectId().equals(CryptoProObjectIdentifiers.gostR3410_2001))
+        // {
+        //     DERBitString bits = info.getPublicKeyData();
+        //     ASN1OctetString key;
+        //     this.algorithm = "ECGOST3410";
+        //
+        //     try
+        //     {
+        //         key = (ASN1OctetString) ASN1Primitive.fromByteArray(bits.getBytes());
+        //     }
+        //     catch (IOException ex)
+        //     {
+        //         throw new IllegalArgumentException("error recovering public key");
+        //     }
+        //
+        //     byte[]          keyEnc = key.getOctets();
+        //     byte[]          x = new byte[32];
+        //     byte[]          y = new byte[32];
+        //
+        //     for (int i = 0; i != x.length; i++)
+        //     {
+        //         x[i] = keyEnc[32 - 1 - i];
+        //     }
+        //
+        //     for (int i = 0; i != y.length; i++)
+        //     {
+        //         y[i] = keyEnc[64 - 1 - i];
+        //     }
+        //
+        //     gostParams = new GOST3410PublicKeyAlgParameters((ASN1Sequence)info.getAlgorithmId().getParameters());
+        //
+        //     ECNamedCurveParameterSpec spec = ECGOST3410NamedCurveTable.getParameterSpec(ECGOST3410NamedCurves.getName(gostParams.getPublicKeyParamSet()));
+        //
+        //     ECCurve curve = spec.getCurve();
+        //     EllipticCurve ellipticCurve = EC5Util.convertCurve(curve, spec.getSeed());
+        //
+        //     this.q = curve.createPoint(new BigInteger(1, x), new BigInteger(1, y), false);
+        //
+        //     ecSpec = new ECNamedCurveSpec(
+        //             ECGOST3410NamedCurves.getName(gostParams.getPublicKeyParamSet()),
+        //             ellipticCurve,
+        //             new ECPoint(
+        //                     spec.getG().getAffineXCoord().toBigInteger(),
+        //                     spec.getG().getAffineYCoord().toBigInteger()),
+        //                     spec.getN(), spec.getH());
+        //
+        // }
+        // else
+        // END android-removed
         {
             X962Parameters params = new X962Parameters((ASN1Primitive)info.getAlgorithmId().getParameters());
             ECCurve                 curve;
@@ -317,52 +328,54 @@ public class JCEECPublicKey
         ASN1Encodable        params;
         SubjectPublicKeyInfo info;
 
-        if (algorithm.equals("ECGOST3410"))
-        {
-            if (gostParams != null)
-            {
-                params = gostParams;
-            }
-            else
-            {
-                if (ecSpec instanceof ECNamedCurveSpec)
-                {
-                    params = new GOST3410PublicKeyAlgParameters(
-                                   ECGOST3410NamedCurves.getOID(((ECNamedCurveSpec)ecSpec).getName()),
-                                   CryptoProObjectIdentifiers.gostR3411_94_CryptoProParamSet);
-                }
-                else
-                {   // strictly speaking this may not be applicable...
-                    ECCurve curve = EC5Util.convertCurve(ecSpec.getCurve());
-
-                    X9ECParameters ecP = new X9ECParameters(
-                        curve,
-                        EC5Util.convertPoint(curve, ecSpec.getGenerator(), withCompression),
-                        ecSpec.getOrder(),
-                        BigInteger.valueOf(ecSpec.getCofactor()),
-                        ecSpec.getCurve().getSeed());
-
-                    params = new X962Parameters(ecP);
-                }
-            }
-
-            BigInteger      bX = this.q.getAffineXCoord().toBigInteger();
-            BigInteger      bY = this.q.getAffineYCoord().toBigInteger();
-            byte[]          encKey = new byte[64];
-
-            extractBytes(encKey, 0, bX);
-            extractBytes(encKey, 32, bY);
-
-            try
-            {
-                info = new SubjectPublicKeyInfo(new AlgorithmIdentifier(CryptoProObjectIdentifiers.gostR3410_2001, params), new DEROctetString(encKey));
-            }
-            catch (IOException e)
-            {
-                return null;
-            }
-        }
-        else
+        // BEGIN android-removed
+        // if (algorithm.equals("ECGOST3410"))
+        // {
+        //     if (gostParams != null)
+        //     {
+        //         params = gostParams;
+        //     }
+        //     else
+        //     {
+        //         if (ecSpec instanceof ECNamedCurveSpec)
+        //         {
+        //             params = new GOST3410PublicKeyAlgParameters(
+        //                            ECGOST3410NamedCurves.getOID(((ECNamedCurveSpec)ecSpec).getName()),
+        //                            CryptoProObjectIdentifiers.gostR3411_94_CryptoProParamSet);
+        //         }
+        //         else
+        //         {   // strictly speaking this may not be applicable...
+        //             ECCurve curve = EC5Util.convertCurve(ecSpec.getCurve());
+        //
+        //             X9ECParameters ecP = new X9ECParameters(
+        //                 curve,
+        //                 EC5Util.convertPoint(curve, ecSpec.getGenerator(), withCompression),
+        //                 ecSpec.getOrder(),
+        //                 BigInteger.valueOf(ecSpec.getCofactor()),
+        //                 ecSpec.getCurve().getSeed());
+        //
+        //             params = new X962Parameters(ecP);
+        //         }
+        //     }
+        //
+        //     BigInteger      bX = this.q.getAffineXCoord().toBigInteger();
+        //     BigInteger      bY = this.q.getAffineYCoord().toBigInteger();
+        //     byte[]          encKey = new byte[64];
+        //
+        //     extractBytes(encKey, 0, bX);
+        //     extractBytes(encKey, 32, bY);
+        //
+        //     try
+        //     {
+        //         info = new SubjectPublicKeyInfo(new AlgorithmIdentifier(CryptoProObjectIdentifiers.gostR3410_2001, params), new DEROctetString(encKey));
+        //     }
+        //     catch (IOException e)
+        //     {
+        //         return null;
+        //     }
+        // }
+        // else
+        // END android-removed
         {
             if (ecSpec instanceof ECNamedCurveSpec)
             {
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/provider/JCEElGamalPrivateKey.java b/bcprov/src/main/java/org/bouncycastle/jce/provider/JCEElGamalPrivateKey.java
deleted file mode 100644
index 6c21f87..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/provider/JCEElGamalPrivateKey.java
+++ /dev/null
@@ -1,165 +0,0 @@
-package org.bouncycastle.jce.provider;
-
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.math.BigInteger;
-import java.util.Enumeration;
-
-import javax.crypto.interfaces.DHPrivateKey;
-import javax.crypto.spec.DHParameterSpec;
-import javax.crypto.spec.DHPrivateKeySpec;
-
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.oiw.ElGamalParameter;
-import org.bouncycastle.asn1.oiw.OIWObjectIdentifiers;
-import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.crypto.params.ElGamalPrivateKeyParameters;
-import org.bouncycastle.jcajce.provider.asymmetric.util.KeyUtil;
-import org.bouncycastle.jcajce.provider.asymmetric.util.PKCS12BagAttributeCarrierImpl;
-import org.bouncycastle.jce.interfaces.ElGamalPrivateKey;
-import org.bouncycastle.jce.interfaces.PKCS12BagAttributeCarrier;
-import org.bouncycastle.jce.spec.ElGamalParameterSpec;
-import org.bouncycastle.jce.spec.ElGamalPrivateKeySpec;
-
-public class JCEElGamalPrivateKey
-    implements ElGamalPrivateKey, DHPrivateKey, PKCS12BagAttributeCarrier
-{
-    static final long serialVersionUID = 4819350091141529678L;
-        
-    BigInteger      x;
-
-    ElGamalParameterSpec   elSpec;
-
-    private PKCS12BagAttributeCarrierImpl attrCarrier = new PKCS12BagAttributeCarrierImpl();
-
-    protected JCEElGamalPrivateKey()
-    {
-    }
-
-    JCEElGamalPrivateKey(
-        ElGamalPrivateKey    key)
-    {
-        this.x = key.getX();
-        this.elSpec = key.getParameters();
-    }
-
-    JCEElGamalPrivateKey(
-        DHPrivateKey    key)
-    {
-        this.x = key.getX();
-        this.elSpec = new ElGamalParameterSpec(key.getParams().getP(), key.getParams().getG());
-    }
-    
-    JCEElGamalPrivateKey(
-        ElGamalPrivateKeySpec    spec)
-    {
-        this.x = spec.getX();
-        this.elSpec = new ElGamalParameterSpec(spec.getParams().getP(), spec.getParams().getG());
-    }
-
-    JCEElGamalPrivateKey(
-        DHPrivateKeySpec    spec)
-    {
-        this.x = spec.getX();
-        this.elSpec = new ElGamalParameterSpec(spec.getP(), spec.getG());
-    }
-    
-    JCEElGamalPrivateKey(
-        PrivateKeyInfo  info)
-        throws IOException
-    {
-        ElGamalParameter     params = ElGamalParameter.getInstance(info.getPrivateKeyAlgorithm().getParameters());
-        ASN1Integer      derX = ASN1Integer.getInstance(info.parsePrivateKey());
-
-        this.x = derX.getValue();
-        this.elSpec = new ElGamalParameterSpec(params.getP(), params.getG());
-    }
-
-    JCEElGamalPrivateKey(
-        ElGamalPrivateKeyParameters  params)
-    {
-        this.x = params.getX();
-        this.elSpec = new ElGamalParameterSpec(params.getParameters().getP(), params.getParameters().getG());
-    }
-
-    public String getAlgorithm()
-    {
-        return "ElGamal";
-    }
-
-    /**
-     * return the encoding format we produce in getEncoded().
-     *
-     * @return the string "PKCS#8"
-     */
-    public String getFormat()
-    {
-        return "PKCS#8";
-    }
-
-    /**
-     * Return a PKCS8 representation of the key. The sequence returned
-     * represents a full PrivateKeyInfo object.
-     *
-     * @return a PKCS8 representation of the key.
-     */
-    public byte[] getEncoded()
-    {
-        return KeyUtil.getEncodedPrivateKeyInfo(new AlgorithmIdentifier(OIWObjectIdentifiers.elGamalAlgorithm, new ElGamalParameter(elSpec.getP(), elSpec.getG())), new ASN1Integer(getX()));
-    }
-
-    public ElGamalParameterSpec getParameters()
-    {
-        return elSpec;
-    }
-
-    public DHParameterSpec getParams()
-    {
-        return new DHParameterSpec(elSpec.getP(), elSpec.getG());
-    }
-    
-    public BigInteger getX()
-    {
-        return x;
-    }
-
-    private void readObject(
-        ObjectInputStream   in)
-        throws IOException, ClassNotFoundException
-    {
-        x = (BigInteger)in.readObject();
-
-        this.elSpec = new ElGamalParameterSpec((BigInteger)in.readObject(), (BigInteger)in.readObject());
-    }
-
-    private void writeObject(
-        ObjectOutputStream  out)
-        throws IOException
-    {
-        out.writeObject(this.getX());
-        out.writeObject(elSpec.getP());
-        out.writeObject(elSpec.getG());
-    }
-
-    public void setBagAttribute(
-        ASN1ObjectIdentifier oid,
-        ASN1Encodable attribute)
-    {
-        attrCarrier.setBagAttribute(oid, attribute);
-    }
-
-    public ASN1Encodable getBagAttribute(
-        ASN1ObjectIdentifier oid)
-    {
-        return attrCarrier.getBagAttribute(oid);
-    }
-
-    public Enumeration getBagAttributeKeys()
-    {
-        return attrCarrier.getBagAttributeKeys();
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/provider/JCEElGamalPublicKey.java b/bcprov/src/main/java/org/bouncycastle/jce/provider/JCEElGamalPublicKey.java
deleted file mode 100644
index 30780c8..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/provider/JCEElGamalPublicKey.java
+++ /dev/null
@@ -1,139 +0,0 @@
-package org.bouncycastle.jce.provider;
-
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.math.BigInteger;
-
-import javax.crypto.interfaces.DHPublicKey;
-import javax.crypto.spec.DHParameterSpec;
-import javax.crypto.spec.DHPublicKeySpec;
-
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.oiw.ElGamalParameter;
-import org.bouncycastle.asn1.oiw.OIWObjectIdentifiers;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.bouncycastle.crypto.params.ElGamalPublicKeyParameters;
-import org.bouncycastle.jcajce.provider.asymmetric.util.KeyUtil;
-import org.bouncycastle.jce.interfaces.ElGamalPublicKey;
-import org.bouncycastle.jce.spec.ElGamalParameterSpec;
-import org.bouncycastle.jce.spec.ElGamalPublicKeySpec;
-
-public class JCEElGamalPublicKey
-    implements ElGamalPublicKey, DHPublicKey
-{
-    static final long serialVersionUID = 8712728417091216948L;
-        
-    private BigInteger              y;
-    private ElGamalParameterSpec    elSpec;
-
-    JCEElGamalPublicKey(
-        ElGamalPublicKeySpec    spec)
-    {
-        this.y = spec.getY();
-        this.elSpec = new ElGamalParameterSpec(spec.getParams().getP(), spec.getParams().getG());
-    }
-
-    JCEElGamalPublicKey(
-        DHPublicKeySpec    spec)
-    {
-        this.y = spec.getY();
-        this.elSpec = new ElGamalParameterSpec(spec.getP(), spec.getG());
-    }
-    
-    JCEElGamalPublicKey(
-        ElGamalPublicKey    key)
-    {
-        this.y = key.getY();
-        this.elSpec = key.getParameters();
-    }
-
-    JCEElGamalPublicKey(
-        DHPublicKey    key)
-    {
-        this.y = key.getY();
-        this.elSpec = new ElGamalParameterSpec(key.getParams().getP(), key.getParams().getG());
-    }
-    
-    JCEElGamalPublicKey(
-        ElGamalPublicKeyParameters  params)
-    {
-        this.y = params.getY();
-        this.elSpec = new ElGamalParameterSpec(params.getParameters().getP(), params.getParameters().getG());
-    }
-
-    JCEElGamalPublicKey(
-        BigInteger              y,
-        ElGamalParameterSpec    elSpec)
-    {
-        this.y = y;
-        this.elSpec = elSpec;
-    }
-
-    JCEElGamalPublicKey(
-        SubjectPublicKeyInfo    info)
-    {
-        ElGamalParameter        params = ElGamalParameter.getInstance(info.getAlgorithm().getParameters());
-        ASN1Integer              derY = null;
-
-        try
-        {
-            derY = (ASN1Integer)info.parsePublicKey();
-        }
-        catch (IOException e)
-        {
-            throw new IllegalArgumentException("invalid info structure in DSA public key");
-        }
-
-        this.y = derY.getValue();
-        this.elSpec = new ElGamalParameterSpec(params.getP(), params.getG());
-    }
-
-    public String getAlgorithm()
-    {
-        return "ElGamal";
-    }
-
-    public String getFormat()
-    {
-        return "X.509";
-    }
-
-    public byte[] getEncoded()
-    {
-        return KeyUtil.getEncodedSubjectPublicKeyInfo(new AlgorithmIdentifier(OIWObjectIdentifiers.elGamalAlgorithm, new ElGamalParameter(elSpec.getP(), elSpec.getG())), new ASN1Integer(y));
-    }
-
-    public ElGamalParameterSpec getParameters()
-    {
-        return elSpec;
-    }
-    
-    public DHParameterSpec getParams()
-    {
-        return new DHParameterSpec(elSpec.getP(), elSpec.getG());
-    }
-
-    public BigInteger getY()
-    {
-        return y;
-    }
-
-    private void readObject(
-        ObjectInputStream   in)
-        throws IOException, ClassNotFoundException
-    {
-        this.y = (BigInteger)in.readObject();
-        this.elSpec = new ElGamalParameterSpec((BigInteger)in.readObject(), (BigInteger)in.readObject());
-    }
-
-    private void writeObject(
-        ObjectOutputStream  out)
-        throws IOException
-    {
-        out.writeObject(this.getY());
-        out.writeObject(elSpec.getP());
-        out.writeObject(elSpec.getG());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/provider/MultiCertStoreSpi.java b/bcprov/src/main/java/org/bouncycastle/jce/provider/MultiCertStoreSpi.java
deleted file mode 100644
index cf3d15d..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/provider/MultiCertStoreSpi.java
+++ /dev/null
@@ -1,85 +0,0 @@
-package org.bouncycastle.jce.provider;
-
-import java.security.InvalidAlgorithmParameterException;
-import java.security.cert.CRLSelector;
-import java.security.cert.CertSelector;
-import java.security.cert.CertStore;
-import java.security.cert.CertStoreException;
-import java.security.cert.CertStoreParameters;
-import java.security.cert.CertStoreSpi;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-
-import org.bouncycastle.jce.MultiCertStoreParameters;
-
-public class MultiCertStoreSpi
-    extends CertStoreSpi
-{
-    private MultiCertStoreParameters params;
-
-    public MultiCertStoreSpi(CertStoreParameters params)
-        throws InvalidAlgorithmParameterException
-    {
-        super(params);
-
-        if (!(params instanceof MultiCertStoreParameters))
-        {
-            throw new InvalidAlgorithmParameterException("org.bouncycastle.jce.provider.MultiCertStoreSpi: parameter must be a MultiCertStoreParameters object\n" +  params.toString());
-        }
-
-        this.params = (MultiCertStoreParameters)params;
-    }
-
-    public Collection engineGetCertificates(CertSelector certSelector)
-        throws CertStoreException
-    {
-        boolean searchAllStores = params.getSearchAllStores();
-        Iterator iter = params.getCertStores().iterator();
-        List allCerts = searchAllStores ? new ArrayList() : Collections.EMPTY_LIST;
-
-        while (iter.hasNext())
-        {
-            CertStore store = (CertStore)iter.next();
-            Collection certs = store.getCertificates(certSelector);
-
-            if (searchAllStores)
-            {
-                allCerts.addAll(certs);
-            }
-            else if (!certs.isEmpty())
-            {
-                return certs;
-            }
-        }
-
-        return allCerts;
-    }
-
-    public Collection engineGetCRLs(CRLSelector crlSelector)
-        throws CertStoreException
-    {
-        boolean searchAllStores = params.getSearchAllStores();
-        Iterator iter = params.getCertStores().iterator();
-        List allCRLs = searchAllStores ? new ArrayList() : Collections.EMPTY_LIST;
-        
-        while (iter.hasNext())
-        {
-            CertStore store = (CertStore)iter.next();
-            Collection crls = store.getCRLs(crlSelector);
-
-            if (searchAllStores)
-            {
-                allCRLs.addAll(crls);
-            }
-            else if (!crls.isEmpty())
-            {
-                return crls;
-            }
-        }
-
-        return allCRLs;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/provider/PKIXAttrCertPathBuilderSpi.java b/bcprov/src/main/java/org/bouncycastle/jce/provider/PKIXAttrCertPathBuilderSpi.java
deleted file mode 100644
index 115c198..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/provider/PKIXAttrCertPathBuilderSpi.java
+++ /dev/null
@@ -1,361 +0,0 @@
-package org.bouncycastle.jce.provider;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.security.InvalidAlgorithmParameterException;
-import java.security.Principal;
-import java.security.cert.CertPath;
-import java.security.cert.CertPathBuilderException;
-import java.security.cert.CertPathBuilderResult;
-import java.security.cert.CertPathBuilderSpi;
-import java.security.cert.CertPathParameters;
-import java.security.cert.CertPathValidator;
-import java.security.cert.CertStore;
-import java.security.cert.CertStoreException;
-import java.security.cert.Certificate;
-import java.security.cert.CertificateException;
-import java.security.cert.CertificateFactory;
-import java.security.cert.CertificateParsingException;
-import java.security.cert.PKIXBuilderParameters;
-import java.security.cert.PKIXCertPathBuilderResult;
-import java.security.cert.PKIXCertPathValidatorResult;
-import java.security.cert.X509Certificate;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import javax.security.auth.x500.X500Principal;
-
-import org.bouncycastle.asn1.x509.Extension;
-import org.bouncycastle.jcajce.PKIXCertStoreSelector;
-import org.bouncycastle.jcajce.PKIXExtendedBuilderParameters;
-import org.bouncycastle.jce.exception.ExtCertPathBuilderException;
-import org.bouncycastle.util.Encodable;
-import org.bouncycastle.util.Selector;
-import org.bouncycastle.util.Store;
-import org.bouncycastle.util.StoreException;
-import org.bouncycastle.x509.ExtendedPKIXBuilderParameters;
-import org.bouncycastle.x509.ExtendedPKIXParameters;
-import org.bouncycastle.x509.X509AttributeCertStoreSelector;
-import org.bouncycastle.x509.X509AttributeCertificate;
-import org.bouncycastle.x509.X509CertStoreSelector;
-import org.bouncycastle.x509.X509Store;
-
-public class PKIXAttrCertPathBuilderSpi
-    extends CertPathBuilderSpi
-{
-
-    /**
-     * Build and validate a CertPath using the given parameter.
-     * 
-     * @param params PKIXBuilderParameters object containing all information to
-     *            build the CertPath
-     */
-    public CertPathBuilderResult engineBuild(CertPathParameters params)
-            throws CertPathBuilderException, InvalidAlgorithmParameterException
-    {
-        if (!(params instanceof PKIXBuilderParameters)
-                && !(params instanceof ExtendedPKIXBuilderParameters)
-                && !(params instanceof PKIXExtendedBuilderParameters))
-        {
-            throw new InvalidAlgorithmParameterException(
-                    "Parameters must be an instance of "
-                            + PKIXBuilderParameters.class.getName() + " or "
-                            + PKIXExtendedBuilderParameters.class.getName()
-                            + ".");
-        }
-
-        List targetStores = new ArrayList();
-
-        PKIXExtendedBuilderParameters paramsPKIX;
-        if (params instanceof PKIXBuilderParameters)
-        {
-            PKIXExtendedBuilderParameters.Builder paramsPKIXBldr = new PKIXExtendedBuilderParameters.Builder((PKIXBuilderParameters)params);
-
-            if (params instanceof ExtendedPKIXParameters)
-            {
-                ExtendedPKIXBuilderParameters extPKIX = (ExtendedPKIXBuilderParameters)params;
-
-                paramsPKIXBldr.addExcludedCerts(extPKIX.getExcludedCerts());
-                paramsPKIXBldr.setMaxPathLength(extPKIX.getMaxPathLength());
-                targetStores = extPKIX.getStores();
-            }
-
-            paramsPKIX = paramsPKIXBldr.build();
-        }
-        else
-        {
-            paramsPKIX = (PKIXExtendedBuilderParameters)params;
-        }
-
-        Collection targets;
-        Iterator targetIter;
-        List certPathList = new ArrayList();
-        X509AttributeCertificate cert;
-
-        // search target certificates
-
-        Selector certSelect = paramsPKIX.getBaseParameters().getTargetConstraints();
-        if (!(certSelect instanceof X509AttributeCertStoreSelector))
-        {
-            throw new CertPathBuilderException(
-                    "TargetConstraints must be an instance of "
-                            + X509AttributeCertStoreSelector.class.getName()
-                            + " for "+this.getClass().getName()+" class.");
-        }
-
-
-        try
-        {
-            targets = findCertificates((X509AttributeCertStoreSelector)certSelect, targetStores);
-        }
-        catch (AnnotatedException e)
-        {
-            throw new ExtCertPathBuilderException("Error finding target attribute certificate.", e);
-        }
-
-        if (targets.isEmpty())
-        {
-            throw new CertPathBuilderException(
-                    "No attribute certificate found matching targetContraints.");
-        }
-
-        CertPathBuilderResult result = null;
-
-        // check all potential target certificates
-        targetIter = targets.iterator();
-        while (targetIter.hasNext() && result == null)
-        {
-            cert = (X509AttributeCertificate) targetIter.next();
-            
-            X509CertStoreSelector selector = new X509CertStoreSelector();
-            Principal[] principals = cert.getIssuer().getPrincipals();
-            Set issuers = new HashSet();
-            for (int i = 0; i < principals.length; i++)
-            {
-                try
-                {
-                    if (principals[i] instanceof X500Principal)
-                    {
-                        selector.setSubject(((X500Principal)principals[i]).getEncoded());
-                    }
-                    PKIXCertStoreSelector certStoreSelector = new PKIXCertStoreSelector.Builder(selector).build();
-                    issuers.addAll(CertPathValidatorUtilities.findCertificates(certStoreSelector, paramsPKIX.getBaseParameters().getCertStores()));
-                    issuers.addAll(CertPathValidatorUtilities.findCertificates(certStoreSelector, paramsPKIX.getBaseParameters().getCertificateStores()));
-                }
-                catch (AnnotatedException e)
-                {
-                    throw new ExtCertPathBuilderException(
-                        "Public key certificate for attribute certificate cannot be searched.",
-                        e);
-                }
-                catch (IOException e)
-                {
-                    throw new ExtCertPathBuilderException(
-                        "cannot encode X500Principal.",
-                        e);
-                }
-            }
-            if (issuers.isEmpty())
-            {
-                throw new CertPathBuilderException(
-                    "Public key certificate for attribute certificate cannot be found.");
-            }
-            Iterator it = issuers.iterator();
-            while (it.hasNext() && result == null)
-            {
-                result = build(cert, (X509Certificate)it.next(), paramsPKIX, certPathList);
-            }
-        }
-
-        if (result == null && certPathException != null)
-        {
-            throw new ExtCertPathBuilderException(
-                                    "Possible certificate chain could not be validated.",
-                                    certPathException);
-        }
-
-        if (result == null && certPathException == null)
-        {
-            throw new CertPathBuilderException(
-                    "Unable to find certificate chain.");
-        }
-
-        return result;
-    }
-
-    private Exception certPathException;
-
-    private CertPathBuilderResult build(X509AttributeCertificate attrCert, X509Certificate tbvCert,
-            PKIXExtendedBuilderParameters pkixParams, List tbvPath)
-
-    {
-        // If tbvCert is readily present in tbvPath, it indicates having run
-        // into a cycle in the
-        // PKI graph.
-        if (tbvPath.contains(tbvCert))
-        {
-            return null;
-        }
-        // step out, the certificate is not allowed to appear in a certification
-        // chain
-        if (pkixParams.getExcludedCerts().contains(tbvCert))
-        {
-            return null;
-        }
-        // test if certificate path exceeds maximum length
-        if (pkixParams.getMaxPathLength() != -1)
-        {
-            if (tbvPath.size() - 1 > pkixParams.getMaxPathLength())
-            {
-                return null;
-            }
-        }
-
-        tbvPath.add(tbvCert);
-
-        CertificateFactory cFact;
-        CertPathValidator validator;
-        CertPathBuilderResult builderResult = null;
-
-        try
-        {
-            cFact = CertificateFactory.getInstance("X.509", BouncyCastleProvider.PROVIDER_NAME);
-            validator = CertPathValidator.getInstance("RFC3281", BouncyCastleProvider.PROVIDER_NAME);
-        }
-        catch (Exception e)
-        {
-            // cannot happen
-            throw new RuntimeException(
-                            "Exception creating support classes.");
-        }
-
-        try
-        {
-            // check whether the issuer of <tbvCert> is a TrustAnchor
-            if (CertPathValidatorUtilities.findTrustAnchor(tbvCert, pkixParams.getBaseParameters().getTrustAnchors(),
-                pkixParams.getBaseParameters().getSigProvider()) != null)
-            {
-                CertPath certPath;
-                PKIXCertPathValidatorResult result;
-                try
-                {
-                    certPath = cFact.generateCertPath(tbvPath);
-                }
-                catch (Exception e)
-                {
-                    throw new AnnotatedException(
-                                            "Certification path could not be constructed from certificate list.",
-                                            e);
-                }
-
-                try
-                {
-                    result = (PKIXCertPathValidatorResult) validator.validate(
-                            certPath, pkixParams);
-                }
-                catch (Exception e)
-                {
-                    throw new AnnotatedException(
-                                            "Certification path could not be validated.",
-                                            e);
-                }
-
-                return new PKIXCertPathBuilderResult(certPath, result
-                        .getTrustAnchor(), result.getPolicyTree(), result
-                        .getPublicKey());
-
-            }
-            else
-            {
-                List stores = new ArrayList();
-
-                stores.addAll(pkixParams.getBaseParameters().getCertificateStores());
-                // add additional X.509 stores from locations in certificate
-                try
-                {
-                    stores.addAll(CertPathValidatorUtilities.getAdditionalStoresFromAltNames(tbvCert.getExtensionValue(Extension.issuerAlternativeName.getId()), pkixParams.getBaseParameters().getNamedCertificateStoreMap()));
-                }
-                catch (CertificateParsingException e)
-                {
-                    throw new AnnotatedException(
-                                            "No additional X.509 stores can be added from certificate locations.",
-                                            e);
-                }
-                Collection issuers = new HashSet();
-                // try to get the issuer certificate from one
-                // of the stores
-                try
-                {
-                    issuers.addAll(CertPathValidatorUtilities.findIssuerCerts(tbvCert, pkixParams.getBaseParameters().getCertStores(), stores));
-                }
-                catch (AnnotatedException e)
-                {
-                    throw new AnnotatedException(
-                                            "Cannot find issuer certificate for certificate in certification path.",
-                                            e);
-                }
-                if (issuers.isEmpty())
-                {
-                    throw new AnnotatedException(
-                            "No issuer certificate for certificate in certification path found.");
-                }
-                Iterator it = issuers.iterator();
-
-                while (it.hasNext() && builderResult == null)
-                {
-                    X509Certificate issuer = (X509Certificate) it.next();
-                    // TODO Use CertPathValidatorUtilities.isSelfIssued(issuer)?
-                    // if untrusted self signed certificate continue
-                    if (issuer.getIssuerX500Principal().equals(
-                            issuer.getSubjectX500Principal()))
-                    {
-                        continue;
-                    }
-                    builderResult = build(attrCert, issuer, pkixParams, tbvPath);
-                }
-            }
-        }
-        catch (AnnotatedException e)
-        {
-            certPathException = new AnnotatedException(
-                            "No valid certification path could be build.", e);
-        }
-        if (builderResult == null)
-        {
-            tbvPath.remove(tbvCert);
-        }
-        return builderResult;
-    }
-
-    protected static Collection findCertificates(X509AttributeCertStoreSelector certSelect,
-                                                     List certStores)
-        throws AnnotatedException
-    {
-        Set certs = new HashSet();
-        Iterator iter = certStores.iterator();
-
-        while (iter.hasNext())
-        {
-            Object obj = iter.next();
-
-            if (obj instanceof Store)
-            {
-                Store certStore = (Store)obj;
-                try
-                {
-                    certs.addAll(certStore.getMatches(certSelect));
-                }
-                catch (StoreException e)
-                {
-                    throw new AnnotatedException(
-                            "Problem while picking certificates from X.509 store.", e);
-                }
-            }
-        }
-        return certs;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/provider/PKIXAttrCertPathValidatorSpi.java b/bcprov/src/main/java/org/bouncycastle/jce/provider/PKIXAttrCertPathValidatorSpi.java
deleted file mode 100644
index ee72703..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/provider/PKIXAttrCertPathValidatorSpi.java
+++ /dev/null
@@ -1,137 +0,0 @@
-package org.bouncycastle.jce.provider;
-
-import java.security.InvalidAlgorithmParameterException;
-import java.security.Provider;
-import java.security.Security;
-import java.security.cert.CertPath;
-import java.security.cert.CertPathParameters;
-import java.security.cert.CertPathValidatorException;
-import java.security.cert.CertPathValidatorResult;
-import java.security.cert.CertPathValidatorSpi;
-import java.security.cert.PKIXParameters;
-import java.security.cert.X509Certificate;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.bouncycastle.jcajce.PKIXExtendedParameters;
-import org.bouncycastle.jcajce.util.BCJcaJceHelper;
-import org.bouncycastle.jcajce.util.JcaJceHelper;
-import org.bouncycastle.jce.exception.ExtCertPathValidatorException;
-import org.bouncycastle.util.Selector;
-import org.bouncycastle.x509.ExtendedPKIXParameters;
-import org.bouncycastle.x509.X509AttributeCertStoreSelector;
-import org.bouncycastle.x509.X509AttributeCertificate;
-
-/**
- * CertPathValidatorSpi implementation for X.509 Attribute Certificates la RFC 3281.
- * 
- * @see org.bouncycastle.x509.ExtendedPKIXParameters
- */
-public class PKIXAttrCertPathValidatorSpi
-    extends CertPathValidatorSpi
-{
-    private final JcaJceHelper helper = new BCJcaJceHelper();
-
-    public PKIXAttrCertPathValidatorSpi()
-    {
-    }
-
-    /**
-     * Validates an attribute certificate with the given certificate path.
-     * 
-     * <p>
-     * <code>params</code> must be an instance of
-     * <code>ExtendedPKIXParameters</code>.
-     * <p>
-     * The target constraints in the <code>params</code> must be an
-     * <code>X509AttributeCertStoreSelector</code> with at least the attribute
-     * certificate criterion set. Obey that also target informations may be
-     * necessary to correctly validate this attribute certificate.
-     * <p>
-     * The attribute certificate issuer must be added to the trusted attribute
-     * issuers with {@link org.bouncycastle.x509.ExtendedPKIXParameters#setTrustedACIssuers(java.util.Set)}.
-     * 
-     * @param certPath The certificate path which belongs to the attribute
-     *            certificate issuer public key certificate.
-     * @param params The PKIX parameters.
-     * @return A <code>PKIXCertPathValidatorResult</code> of the result of
-     *         validating the <code>certPath</code>.
-     * @throws java.security.InvalidAlgorithmParameterException if <code>params</code> is
-     *             inappropriate for this validator.
-     * @throws java.security.cert.CertPathValidatorException if the verification fails.
-     */
-    public CertPathValidatorResult engineValidate(CertPath certPath,
-        CertPathParameters params) throws CertPathValidatorException,
-        InvalidAlgorithmParameterException
-    {
-        if (!(params instanceof ExtendedPKIXParameters || params instanceof PKIXExtendedParameters))
-        {
-            throw new InvalidAlgorithmParameterException(
-                "Parameters must be a "
-                    + ExtendedPKIXParameters.class.getName() + " instance.");
-        }
-        Set attrCertCheckers = new HashSet();
-        Set prohibitedACAttrbiutes = new HashSet();
-        Set necessaryACAttributes = new HashSet();
-        Set trustedACIssuers = new HashSet();
-
-        PKIXExtendedParameters paramsPKIX;
-        if (params instanceof PKIXParameters)
-        {
-            PKIXExtendedParameters.Builder paramsPKIXBldr = new PKIXExtendedParameters.Builder((PKIXParameters)params);
-
-            if (params instanceof ExtendedPKIXParameters)
-            {
-                ExtendedPKIXParameters extPKIX = (ExtendedPKIXParameters)params;
-
-                paramsPKIXBldr.setUseDeltasEnabled(extPKIX.isUseDeltasEnabled());
-                paramsPKIXBldr.setValidityModel(extPKIX.getValidityModel());
-                attrCertCheckers = extPKIX.getAttrCertCheckers();
-                prohibitedACAttrbiutes = extPKIX.getProhibitedACAttributes();
-                necessaryACAttributes = extPKIX.getNecessaryACAttributes();
-            }
-
-            paramsPKIX = paramsPKIXBldr.build();
-        }
-        else
-        {
-            paramsPKIX = (PKIXExtendedParameters)params;
-        }
-
-        Selector certSelect = paramsPKIX.getTargetConstraints();
-        if (!(certSelect instanceof X509AttributeCertStoreSelector))
-        {
-            throw new InvalidAlgorithmParameterException(
-                "TargetConstraints must be an instance of "
-                    + X509AttributeCertStoreSelector.class.getName() + " for "
-                    + this.getClass().getName() + " class.");
-        }
-
-        X509AttributeCertificate attrCert = ((X509AttributeCertStoreSelector) certSelect)
-            .getAttributeCert();
-
-        CertPath holderCertPath = RFC3281CertPathUtilities.processAttrCert1(attrCert, paramsPKIX);
-        CertPathValidatorResult result = RFC3281CertPathUtilities.processAttrCert2(certPath, paramsPKIX);
-        X509Certificate issuerCert = (X509Certificate) certPath
-            .getCertificates().get(0);
-        RFC3281CertPathUtilities.processAttrCert3(issuerCert, paramsPKIX);
-        RFC3281CertPathUtilities.processAttrCert4(issuerCert, trustedACIssuers);
-        RFC3281CertPathUtilities.processAttrCert5(attrCert, paramsPKIX);
-        // 6 already done in X509AttributeCertStoreSelector
-        RFC3281CertPathUtilities.processAttrCert7(attrCert, certPath, holderCertPath, paramsPKIX, attrCertCheckers);
-        RFC3281CertPathUtilities.additionalChecks(attrCert, prohibitedACAttrbiutes, necessaryACAttributes);
-        Date date = null;
-        try
-        {
-            date = CertPathValidatorUtilities.getValidCertDateFromValidityModel(paramsPKIX, null, -1);
-        }
-        catch (AnnotatedException e)
-        {
-            throw new ExtCertPathValidatorException(
-                "Could not get validity date from attribute certificate.", e);
-        }
-        RFC3281CertPathUtilities.checkCRLs(attrCert, paramsPKIX, issuerCert, date, certPath.getCertificates(), helper);
-        return result;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/provider/PKIXCRLUtil.java b/bcprov/src/main/java/org/bouncycastle/jce/provider/PKIXCRLUtil.java
index f43e185..b53b7aa 100644
--- a/bcprov/src/main/java/org/bouncycastle/jce/provider/PKIXCRLUtil.java
+++ b/bcprov/src/main/java/org/bouncycastle/jce/provider/PKIXCRLUtil.java
@@ -88,22 +88,24 @@ class PKIXCRLUtil
         {
             Object obj = iter.next();
 
-            if (obj instanceof Store)
-            {
-                Store store = (Store)obj;
-
-                try
-                {
-                    crls.addAll(store.getMatches(crlSelect));
-                    foundValidStore = true;
-                }
-                catch (StoreException e)
-                {
-                    lastException = new AnnotatedException(
-                        "Exception searching in X.509 CRL store.", e);
-                }
-            }
-            else
+            // BEGIN android-removed
+	    // if (obj instanceof Store)
+            // {
+            //     Store store = (Store)obj;
+
+            //     try
+            //     {
+            //         crls.addAll(store.getMatches(crlSelect));
+            //         foundValidStore = true;
+            //     }
+            //     catch (StoreException e)
+            //     {
+            //         lastException = new AnnotatedException(
+            //             "Exception searching in X.509 CRL store.", e);
+            //     }
+            // }
+            // else
+            // END android-removed
             {
                 CertStore store = (CertStore)obj;
 
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/provider/PKIXCertPathValidatorSpi.java b/bcprov/src/main/java/org/bouncycastle/jce/provider/PKIXCertPathValidatorSpi.java
index f87b427..3fdedad 100644
--- a/bcprov/src/main/java/org/bouncycastle/jce/provider/PKIXCertPathValidatorSpi.java
+++ b/bcprov/src/main/java/org/bouncycastle/jce/provider/PKIXCertPathValidatorSpi.java
@@ -1,5 +1,8 @@
 package org.bouncycastle.jce.provider;
 
+// BEGIN android-added
+import java.math.BigInteger;
+// END android-added
 import java.security.InvalidAlgorithmParameterException;
 import java.security.PublicKey;
 import java.security.cert.CertPath;
@@ -41,6 +44,11 @@ public class PKIXCertPathValidatorSpi
     public PKIXCertPathValidatorSpi()
     {
     }
+    // BEGIN android-added
+    private static class NoPreloadHolder {
+        private final static CertBlacklist blacklist = new CertBlacklist();
+    }
+    // END android-added
 
     public CertPathValidatorResult engineValidate(
             CertPath certPath,
@@ -73,10 +81,18 @@ public class PKIXCertPathValidatorSpi
         {
             paramsPKIX = ((PKIXExtendedBuilderParameters)params).getBaseParameters();
         }
-        else
+        // BEGIN android-changed
+        // else
+        else if (params instanceof PKIXExtendedParameters)
+        // END android-changed
         {
             paramsPKIX = (PKIXExtendedParameters)params;
         }
+        // BEGIN android-added
+        else {
+            throw new InvalidAlgorithmParameterException("Expecting PKIX algorithm parameters");
+        }
+        // END android-added
 
         if (paramsPKIX.getTrustAnchors() == null)
         {
@@ -98,6 +114,22 @@ public class PKIXCertPathValidatorSpi
         {
             throw new CertPathValidatorException("Certification path is empty.", null, certPath, 0);
         }
+        // BEGIN android-added
+        {
+            X509Certificate cert = (X509Certificate) certs.get(0);
+
+            if (cert != null) {
+                BigInteger serial = cert.getSerialNumber();
+                if (NoPreloadHolder.blacklist.isSerialNumberBlackListed(serial)) {
+                    // emulate CRL exception message in RFC3280CertPathUtilities.checkCRLs
+                    String message = "Certificate revocation of serial 0x" + serial.toString(16);
+                    System.out.println(message);
+                    AnnotatedException e = new AnnotatedException(message);
+                    throw new CertPathValidatorException(e.getMessage(), e, certPath, 0);
+                }
+            }
+        }
+        // END android-added
 
         //
         // (b)
@@ -277,6 +309,15 @@ public class PKIXCertPathValidatorSpi
 
         for (index = certs.size() - 1; index >= 0; index--)
         {
+            // BEGIN android-added
+            if (NoPreloadHolder.blacklist.isPublicKeyBlackListed(workingPublicKey)) {
+                // emulate CRL exception message in RFC3280CertPathUtilities.checkCRLs
+                String message = "Certificate revocation of public key " + workingPublicKey;
+                System.out.println(message);
+                AnnotatedException e = new AnnotatedException(message);
+                throw new CertPathValidatorException(e.getMessage(), e, certPath, index);
+            }
+            // END android-added
             // try
             // {
             //
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/provider/RFC3281CertPathUtilities.java b/bcprov/src/main/java/org/bouncycastle/jce/provider/RFC3281CertPathUtilities.java
deleted file mode 100644
index b515306..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/provider/RFC3281CertPathUtilities.java
+++ /dev/null
@@ -1,720 +0,0 @@
-package org.bouncycastle.jce.provider;
-
-import java.io.IOException;
-import java.security.InvalidAlgorithmParameterException;
-import java.security.NoSuchAlgorithmException;
-import java.security.NoSuchProviderException;
-import java.security.Principal;
-import java.security.Provider;
-import java.security.PublicKey;
-import java.security.cert.CertPath;
-import java.security.cert.CertPathBuilder;
-import java.security.cert.CertPathBuilderException;
-import java.security.cert.CertPathBuilderResult;
-import java.security.cert.CertPathValidator;
-import java.security.cert.CertPathValidatorException;
-import java.security.cert.CertPathValidatorResult;
-import java.security.cert.CertSelector;
-import java.security.cert.CertificateExpiredException;
-import java.security.cert.CertificateNotYetValidException;
-import java.security.cert.TrustAnchor;
-import java.security.cert.X509CRL;
-import java.security.cert.X509CertSelector;
-import java.security.cert.X509Certificate;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import javax.security.auth.x500.X500Principal;
-
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.x509.CRLDistPoint;
-import org.bouncycastle.asn1.x509.CRLReason;
-import org.bouncycastle.asn1.x509.DistributionPoint;
-import org.bouncycastle.asn1.x509.DistributionPointName;
-import org.bouncycastle.asn1.x509.GeneralName;
-import org.bouncycastle.asn1.x509.GeneralNames;
-import org.bouncycastle.asn1.x509.TargetInformation;
-import org.bouncycastle.asn1.x509.X509Extensions;
-import org.bouncycastle.jcajce.PKIXCRLStore;
-import org.bouncycastle.jcajce.PKIXCertStoreSelector;
-import org.bouncycastle.jcajce.PKIXExtendedBuilderParameters;
-import org.bouncycastle.jcajce.util.JcaJceHelper;
-import org.bouncycastle.jce.exception.ExtCertPathValidatorException;
-import org.bouncycastle.x509.ExtendedPKIXBuilderParameters;
-import org.bouncycastle.jcajce.PKIXExtendedParameters;
-import org.bouncycastle.x509.PKIXAttrCertChecker;
-import org.bouncycastle.x509.X509AttributeCertificate;
-import org.bouncycastle.x509.X509CertStoreSelector;
-
-class RFC3281CertPathUtilities
-{
-
-    private static final String TARGET_INFORMATION = X509Extensions.TargetInformation
-        .getId();
-
-    private static final String NO_REV_AVAIL = X509Extensions.NoRevAvail
-        .getId();
-
-    private static final String CRL_DISTRIBUTION_POINTS = X509Extensions.CRLDistributionPoints
-        .getId();
-
-    private static final String AUTHORITY_INFO_ACCESS = X509Extensions.AuthorityInfoAccess
-        .getId();
-
-    protected static void processAttrCert7(X509AttributeCertificate attrCert,
-        CertPath certPath, CertPath holderCertPath,
-        PKIXExtendedParameters pkixParams, Set attrCertCheckers) throws CertPathValidatorException
-    {
-        // TODO:
-        // AA Controls
-        // Attribute encryption
-        // Proxy
-        Set set = attrCert.getCriticalExtensionOIDs();
-        // 7.1
-        // process extensions
-
-        // target information checked in step 6 / X509AttributeCertStoreSelector
-        if (set.contains(TARGET_INFORMATION))
-        {
-            try
-            {
-                TargetInformation.getInstance(CertPathValidatorUtilities
-                    .getExtensionValue(attrCert, TARGET_INFORMATION));
-            }
-            catch (AnnotatedException e)
-            {
-                throw new ExtCertPathValidatorException(
-                    "Target information extension could not be read.", e);
-            }
-            catch (IllegalArgumentException e)
-            {
-                throw new ExtCertPathValidatorException(
-                    "Target information extension could not be read.", e);
-            }
-        }
-        set.remove(TARGET_INFORMATION);
-        for (Iterator it = attrCertCheckers.iterator(); it
-            .hasNext();)
-        {
-            ((PKIXAttrCertChecker) it.next()).check(attrCert, certPath,
-                holderCertPath, set);
-        }
-        if (!set.isEmpty())
-        {
-            throw new CertPathValidatorException(
-                "Attribute certificate contains unsupported critical extensions: "
-                    + set);
-        }
-    }
-
-    /**
-     * Checks if an attribute certificate is revoked.
-     * 
-     * @param attrCert Attribute certificate to check if it is revoked.
-     * @param paramsPKIX PKIX parameters.
-     * @param issuerCert The issuer certificate of the attribute certificate
-     *            <code>attrCert</code>.
-     * @param validDate The date when the certificate revocation status should
-     *            be checked.
-     * @param certPathCerts The certificates of the certification path to be
-     *            checked.
-     * 
-     * @throws CertPathValidatorException if the certificate is revoked or the
-     *             status cannot be checked or some error occurs.
-     */
-    protected static void checkCRLs(X509AttributeCertificate attrCert,
-        PKIXExtendedParameters paramsPKIX, X509Certificate issuerCert,
-        Date validDate, List certPathCerts, JcaJceHelper helper) throws CertPathValidatorException
-    {
-        if (paramsPKIX.isRevocationEnabled())
-        {
-            // check if revocation is available
-            if (attrCert.getExtensionValue(NO_REV_AVAIL) == null)
-            {
-                CRLDistPoint crldp = null;
-                try
-                {
-                    crldp = CRLDistPoint.getInstance(CertPathValidatorUtilities
-                        .getExtensionValue(attrCert, CRL_DISTRIBUTION_POINTS));
-                }
-                catch (AnnotatedException e)
-                {
-                    throw new CertPathValidatorException(
-                        "CRL distribution point extension could not be read.",
-                        e);
-                }
-
-                List crlStores = new ArrayList();
-
-                try
-                {
-                    crlStores.addAll(CertPathValidatorUtilities.getAdditionalStoresFromCRLDistributionPoint(crldp, paramsPKIX.getNamedCRLStoreMap()));
-                }
-                catch (AnnotatedException e)
-                {
-                    throw new CertPathValidatorException(
-                        "No additional CRL locations could be decoded from CRL distribution point extension.",
-                        e);
-                }
-
-                PKIXExtendedParameters.Builder bldr = new PKIXExtendedParameters.Builder(paramsPKIX);
-
-                for (Iterator it = crlStores.iterator(); it.hasNext(); )
-                {
-                    bldr.addCRLStore((PKIXCRLStore)crlStores);
-                }
-
-                paramsPKIX = bldr.build();
-
-                CertStatus certStatus = new CertStatus();
-                ReasonsMask reasonsMask = new ReasonsMask();
-
-                AnnotatedException lastException = null;
-                boolean validCrlFound = false;
-                // for each distribution point
-                if (crldp != null)
-                {
-                    DistributionPoint dps[] = null;
-                    try
-                    {
-                        dps = crldp.getDistributionPoints();
-                    }
-                    catch (Exception e)
-                    {
-                        throw new ExtCertPathValidatorException(
-                            "Distribution points could not be read.", e);
-                    }
-                    try
-                    {
-                        for (int i = 0; i < dps.length
-                            && certStatus.getCertStatus() == CertStatus.UNREVOKED
-                            && !reasonsMask.isAllReasons(); i++)
-                        {
-                            PKIXExtendedParameters paramsPKIXClone = (PKIXExtendedParameters)paramsPKIX
-                                    .clone();
-
-                            checkCRL(dps[i], attrCert, paramsPKIXClone,
-                                validDate, issuerCert, certStatus, reasonsMask,
-                                certPathCerts, helper);
-                            validCrlFound = true;
-                        }
-                    }
-                    catch (AnnotatedException e)
-                    {
-                        lastException = new AnnotatedException(
-                            "No valid CRL for distribution point found.", e);
-                    }
-                }
-
-                /*
-                 * If the revocation status has not been determined, repeat the
-                 * process above with any available CRLs not specified in a
-                 * distribution point but issued by the certificate issuer.
-                 */
-
-                if (certStatus.getCertStatus() == CertStatus.UNREVOKED
-                    && !reasonsMask.isAllReasons())
-                {
-                    try
-                    {
-                        /*
-                         * assume a DP with both the reasons and the cRLIssuer
-                         * fields omitted and a distribution point name of the
-                         * certificate issuer.
-                         */
-                        ASN1Primitive issuer = null;
-                        try
-                        {
-
-                            issuer = new ASN1InputStream(
-                                ((X500Principal) attrCert.getIssuer()
-                                    .getPrincipals()[0]).getEncoded())
-                                .readObject();
-                        }
-                        catch (Exception e)
-                        {
-                            throw new AnnotatedException(
-                                "Issuer from certificate for CRL could not be reencoded.",
-                                e);
-                        }
-                        DistributionPoint dp = new DistributionPoint(
-                            new DistributionPointName(0, new GeneralNames(
-                                new GeneralName(GeneralName.directoryName,
-                                    issuer))), null, null);
-                        PKIXExtendedParameters paramsPKIXClone = (PKIXExtendedParameters) paramsPKIX
-                            .clone();
-                        checkCRL(dp, attrCert, paramsPKIXClone, validDate,
-                            issuerCert, certStatus, reasonsMask, certPathCerts, helper);
-                        validCrlFound = true;
-                    }
-                    catch (AnnotatedException e)
-                    {
-                        lastException = new AnnotatedException(
-                            "No valid CRL for distribution point found.", e);
-                    }
-                }
-
-                if (!validCrlFound)
-                {
-                    throw new ExtCertPathValidatorException(
-                        "No valid CRL found.", lastException);
-                }
-                if (certStatus.getCertStatus() != CertStatus.UNREVOKED)
-                {
-                    String message = "Attribute certificate revocation after "
-                        + certStatus.getRevocationDate();
-                    message += ", reason: "
-                        + RFC3280CertPathUtilities.crlReasons[certStatus
-                            .getCertStatus()];
-                    throw new CertPathValidatorException(message);
-                }
-                if (!reasonsMask.isAllReasons()
-                    && certStatus.getCertStatus() == CertStatus.UNREVOKED)
-                {
-                    certStatus.setCertStatus(CertStatus.UNDETERMINED);
-                }
-                if (certStatus.getCertStatus() == CertStatus.UNDETERMINED)
-                {
-                    throw new CertPathValidatorException(
-                        "Attribute certificate status could not be determined.");
-                }
-
-            }
-            else
-            {
-                if (attrCert.getExtensionValue(CRL_DISTRIBUTION_POINTS) != null
-                    || attrCert.getExtensionValue(AUTHORITY_INFO_ACCESS) != null)
-                {
-                    throw new CertPathValidatorException(
-                        "No rev avail extension is set, but also an AC revocation pointer.");
-                }
-            }
-        }
-    }
-
-    protected static void additionalChecks(X509AttributeCertificate attrCert,
-        Set prohibitedACAttributes, Set necessaryACAttributes) throws CertPathValidatorException
-    {
-        // 1
-        for (Iterator it = prohibitedACAttributes.iterator(); it
-            .hasNext();)
-        {
-            String oid = (String) it.next();
-            if (attrCert.getAttributes(oid) != null)
-            {
-                throw new CertPathValidatorException(
-                    "Attribute certificate contains prohibited attribute: "
-                        + oid + ".");
-            }
-        }
-        for (Iterator it = necessaryACAttributes.iterator(); it
-            .hasNext();)
-        {
-            String oid = (String) it.next();
-            if (attrCert.getAttributes(oid) == null)
-            {
-                throw new CertPathValidatorException(
-                    "Attribute certificate does not contain necessary attribute: "
-                        + oid + ".");
-            }
-        }
-    }
-
-    protected static void processAttrCert5(X509AttributeCertificate attrCert,
-        PKIXExtendedParameters pkixParams) throws CertPathValidatorException
-    {
-        try
-        {
-            attrCert.checkValidity(CertPathValidatorUtilities
-                .getValidDate(pkixParams));
-        }
-        catch (CertificateExpiredException e)
-        {
-            throw new ExtCertPathValidatorException(
-                "Attribute certificate is not valid.", e);
-        }
-        catch (CertificateNotYetValidException e)
-        {
-            throw new ExtCertPathValidatorException(
-                "Attribute certificate is not valid.", e);
-        }
-    }
-
-    protected static void processAttrCert4(X509Certificate acIssuerCert,
-        Set trustedACIssuers) throws CertPathValidatorException
-    {
-        Set set = trustedACIssuers;
-        boolean trusted = false;
-        for (Iterator it = set.iterator(); it.hasNext();)
-        {
-            TrustAnchor anchor = (TrustAnchor) it.next();
-            if (acIssuerCert.getSubjectX500Principal().getName("RFC2253")
-                .equals(anchor.getCAName())
-                || acIssuerCert.equals(anchor.getTrustedCert()))
-            {
-                trusted = true;
-            }
-        }
-        if (!trusted)
-        {
-            throw new CertPathValidatorException(
-                "Attribute certificate issuer is not directly trusted.");
-        }
-    }
-
-    protected static void processAttrCert3(X509Certificate acIssuerCert,
-        PKIXExtendedParameters pkixParams) throws CertPathValidatorException
-    {
-        if (acIssuerCert.getKeyUsage() != null
-            && (!acIssuerCert.getKeyUsage()[0] && !acIssuerCert.getKeyUsage()[1]))
-        {
-            throw new CertPathValidatorException(
-                "Attribute certificate issuer public key cannot be used to validate digital signatures.");
-        }
-        if (acIssuerCert.getBasicConstraints() != -1)
-        {
-            throw new CertPathValidatorException(
-                "Attribute certificate issuer is also a public key certificate issuer.");
-        }
-    }
-
-    protected static CertPathValidatorResult processAttrCert2(
-        CertPath certPath, PKIXExtendedParameters pkixParams)
-        throws CertPathValidatorException
-    {
-        CertPathValidator validator = null;
-        try
-        {
-            validator = CertPathValidator.getInstance("PKIX", BouncyCastleProvider.PROVIDER_NAME);
-        }
-        catch (NoSuchProviderException e)
-        {
-            throw new ExtCertPathValidatorException(
-                "Support class could not be created.", e);
-        }
-        catch (NoSuchAlgorithmException e)
-        {
-            throw new ExtCertPathValidatorException(
-                "Support class could not be created.", e);
-        }
-        try
-        {
-            return validator.validate(certPath, pkixParams);
-        }
-        catch (CertPathValidatorException e)
-        {
-            throw new ExtCertPathValidatorException(
-                "Certification path for issuer certificate of attribute certificate could not be validated.",
-                e);
-        }
-        catch (InvalidAlgorithmParameterException e)
-        {
-            // must be a programming error
-            throw new RuntimeException(e.getMessage());
-        }
-    }
-
-    /**
-     * Searches for a holder public key certificate and verifies its
-     * certification path.
-     * 
-     * @param attrCert the attribute certificate.
-     * @param pkixParams The PKIX parameters.
-     * @return The certificate path of the holder certificate.
-     * @throws AnnotatedException if
-     *             <ul>
-     *             <li>no public key certificate can be found although holder
-     *             information is given by an entity name or a base certificate
-     *             ID
-     *             <li>support classes cannot be created
-     *             <li>no certification path for the public key certificate can
-     *             be built
-     *             </ul>
-     */
-    protected static CertPath processAttrCert1(
-        X509AttributeCertificate attrCert, PKIXExtendedParameters pkixParams)
-        throws CertPathValidatorException
-    {
-        CertPathBuilderResult result = null;
-        // find holder PKCs
-        Set holderPKCs = new HashSet();
-        if (attrCert.getHolder().getIssuer() != null)
-        {
-            X509CertSelector selector = new X509CertSelector();
-            selector.setSerialNumber(attrCert.getHolder().getSerialNumber());
-            Principal[] principals = attrCert.getHolder().getIssuer();
-            for (int i = 0; i < principals.length; i++)
-            {
-                try
-                {
-                    if (principals[i] instanceof X500Principal)
-                    {
-                        selector.setIssuer(((X500Principal)principals[i])
-                            .getEncoded());
-                    }
-                    holderPKCs.addAll(CertPathValidatorUtilities
-                        .findCertificates(new PKIXCertStoreSelector.Builder(selector).build(), pkixParams.getCertStores()));
-                }
-                catch (AnnotatedException e)
-                {
-                    throw new ExtCertPathValidatorException(
-                        "Public key certificate for attribute certificate cannot be searched.",
-                        e);
-                }
-                catch (IOException e)
-                {
-                    throw new ExtCertPathValidatorException(
-                        "Unable to encode X500 principal.", e);
-                }
-            }
-            if (holderPKCs.isEmpty())
-            {
-                throw new CertPathValidatorException(
-                    "Public key certificate specified in base certificate ID for attribute certificate cannot be found.");
-            }
-        }
-        if (attrCert.getHolder().getEntityNames() != null)
-        {
-            X509CertStoreSelector selector = new X509CertStoreSelector();
-            Principal[] principals = attrCert.getHolder().getEntityNames();
-            for (int i = 0; i < principals.length; i++)
-            {
-                try
-                {
-                    if (principals[i] instanceof X500Principal)
-                    {
-                        selector.setIssuer(((X500Principal) principals[i])
-                            .getEncoded());
-                    }
-                    holderPKCs.addAll(CertPathValidatorUtilities
-                        .findCertificates(new PKIXCertStoreSelector.Builder(selector).build(), pkixParams.getCertStores()));
-                }
-                catch (AnnotatedException e)
-                {
-                    throw new ExtCertPathValidatorException(
-                        "Public key certificate for attribute certificate cannot be searched.",
-                        e);
-                }
-                catch (IOException e)
-                {
-                    throw new ExtCertPathValidatorException(
-                        "Unable to encode X500 principal.", e);
-                }
-            }
-            if (holderPKCs.isEmpty())
-            {
-                throw new CertPathValidatorException(
-                    "Public key certificate specified in entity name for attribute certificate cannot be found.");
-            }
-        }
-        // verify cert paths for PKCs
-        PKIXExtendedParameters.Builder paramsBldr = new PKIXExtendedParameters.Builder(pkixParams);
-
-        CertPathValidatorException lastException = null;
-        for (Iterator it = holderPKCs.iterator(); it.hasNext();)
-        {
-            X509CertStoreSelector selector = new X509CertStoreSelector();
-            selector.setCertificate((X509Certificate) it.next());
-            paramsBldr.setTargetConstraints(new PKIXCertStoreSelector.Builder(selector).build());
-            CertPathBuilder builder = null;
-            try
-            {
-                builder = CertPathBuilder.getInstance("PKIX", BouncyCastleProvider.PROVIDER_NAME);
-            }
-            catch (NoSuchProviderException e)
-            {
-                throw new ExtCertPathValidatorException(
-                    "Support class could not be created.", e);
-            }
-            catch (NoSuchAlgorithmException e)
-            {
-                throw new ExtCertPathValidatorException(
-                    "Support class could not be created.", e);
-            }
-            try
-            {
-                result = builder.build(new PKIXExtendedBuilderParameters.Builder(paramsBldr.build()).build());
-            }
-            catch (CertPathBuilderException e)
-            {
-                lastException = new ExtCertPathValidatorException(
-                    "Certification path for public key certificate of attribute certificate could not be build.",
-                    e);
-            }
-            catch (InvalidAlgorithmParameterException e)
-            {
-                // must be a programming error
-                throw new RuntimeException(e.getMessage());
-            }
-        }
-        if (lastException != null)
-        {
-            throw lastException;
-        }
-        return result.getCertPath();
-    }
-
-    /**
-     * 
-     * Checks a distribution point for revocation information for the
-     * certificate <code>attrCert</code>.
-     * 
-     * @param dp The distribution point to consider.
-     * @param attrCert The attribute certificate which should be checked.
-     * @param paramsPKIX PKIX parameters.
-     * @param validDate The date when the certificate revocation status should
-     *            be checked.
-     * @param issuerCert Certificate to check if it is revoked.
-     * @param reasonMask The reasons mask which is already checked.
-     * @param certPathCerts The certificates of the certification path to be
-     *            checked.
-     * @throws AnnotatedException if the certificate is revoked or the status
-     *             cannot be checked or some error occurs.
-     */
-    private static void checkCRL(DistributionPoint dp,
-        X509AttributeCertificate attrCert, PKIXExtendedParameters paramsPKIX,
-        Date validDate, X509Certificate issuerCert, CertStatus certStatus,
-        ReasonsMask reasonMask, List certPathCerts, JcaJceHelper helper) throws AnnotatedException
-    {
-
-        /*
-         * 4.3.6 No Revocation Available
-         * 
-         * The noRevAvail extension, defined in [X.509-2000], allows an AC
-         * issuer to indicate that no revocation information will be made
-         * available for this AC.
-         */
-        if (attrCert.getExtensionValue(X509Extensions.NoRevAvail.getId()) != null)
-        {
-            return;
-        }
-        Date currentDate = new Date(System.currentTimeMillis());
-        if (validDate.getTime() > currentDate.getTime())
-        {
-            throw new AnnotatedException("Validation time is in future.");
-        }
-
-        // (a)
-        /*
-         * We always get timely valid CRLs, so there is no step (a) (1).
-         * "locally cached" CRLs are assumed to be in getStore(), additional
-         * CRLs must be enabled in the PKIXExtendedParameters and are in
-         * getAdditionalStore()
-         */
-
-        Set crls = CertPathValidatorUtilities.getCompleteCRLs(dp, attrCert,
-            currentDate, paramsPKIX);
-        boolean validCrlFound = false;
-        AnnotatedException lastException = null;
-        Iterator crl_iter = crls.iterator();
-
-        while (crl_iter.hasNext()
-            && certStatus.getCertStatus() == CertStatus.UNREVOKED
-            && !reasonMask.isAllReasons())
-        {
-            try
-            {
-                X509CRL crl = (X509CRL) crl_iter.next();
-
-                // (d)
-                ReasonsMask interimReasonsMask = RFC3280CertPathUtilities
-                    .processCRLD(crl, dp);
-
-                // (e)
-                /*
-                 * The reasons mask is updated at the end, so only valid CRLs
-                 * can update it. If this CRL does not contain new reasons it
-                 * must be ignored.
-                 */
-                if (!interimReasonsMask.hasNewReasons(reasonMask))
-                {
-                    continue;
-                }
-
-                // (f)
-                Set keys = RFC3280CertPathUtilities.processCRLF(crl, attrCert, null, null, paramsPKIX, certPathCerts, helper);
-                // (g)
-                PublicKey key = RFC3280CertPathUtilities.processCRLG(crl, keys);
-
-                X509CRL deltaCRL = null;
-
-                if (paramsPKIX.isUseDeltasEnabled())
-                {
-                    // get delta CRLs
-                    Set deltaCRLs = CertPathValidatorUtilities.getDeltaCRLs(currentDate, crl, paramsPKIX.getCertStores(), paramsPKIX.getCRLStores());
-                    // we only want one valid delta CRL
-                    // (h)
-                    deltaCRL = RFC3280CertPathUtilities.processCRLH(deltaCRLs,
-                        key);
-                }
-
-                /*
-                 * CRL must be be valid at the current time, not the validation
-                 * time. If a certificate is revoked with reason keyCompromise,
-                 * cACompromise, it can be used for forgery, also for the past.
-                 * This reason may not be contained in older CRLs.
-                 */
-
-                /*
-                 * in the chain model signatures stay valid also after the
-                 * certificate has been expired, so they do not have to be in
-                 * the CRL vality time
-                 */
-
-                if (paramsPKIX.getValidityModel() != PKIXExtendedParameters.CHAIN_VALIDITY_MODEL)
-                {
-                    /*
-                     * if a certificate has expired, but was revoked, it is not
-                     * more in the CRL, so it would be regarded as valid if the
-                     * first check is not done
-                     */
-                    if (attrCert.getNotAfter().getTime() < crl.getThisUpdate()
-                        .getTime())
-                    {
-                        throw new AnnotatedException(
-                            "No valid CRL for current time found.");
-                    }
-                }
-
-                RFC3280CertPathUtilities.processCRLB1(dp, attrCert, crl);
-
-                // (b) (2)
-                RFC3280CertPathUtilities.processCRLB2(dp, attrCert, crl);
-
-                // (c)
-                RFC3280CertPathUtilities.processCRLC(deltaCRL, crl, paramsPKIX);
-
-                // (i)
-                RFC3280CertPathUtilities.processCRLI(validDate, deltaCRL,
-                    attrCert, certStatus, paramsPKIX);
-
-                // (j)
-                RFC3280CertPathUtilities.processCRLJ(validDate, crl, attrCert,
-                    certStatus);
-
-                // (k)
-                if (certStatus.getCertStatus() == CRLReason.removeFromCRL)
-                {
-                    certStatus.setCertStatus(CertStatus.UNREVOKED);
-                }
-
-                // update reasons mask
-                reasonMask.addReasons(interimReasonsMask);
-                validCrlFound = true;
-            }
-            catch (AnnotatedException e)
-            {
-                lastException = e;
-            }
-        }
-        if (!validCrlFound)
-        {
-            throw lastException;
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/provider/X509AttrCertParser.java b/bcprov/src/main/java/org/bouncycastle/jce/provider/X509AttrCertParser.java
deleted file mode 100644
index 08f61c2..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/provider/X509AttrCertParser.java
+++ /dev/null
@@ -1,156 +0,0 @@
-package org.bouncycastle.jce.provider;
-
-import java.io.BufferedInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.ASN1Set;
-import org.bouncycastle.asn1.ASN1TaggedObject;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.asn1.pkcs.SignedData;
-import org.bouncycastle.x509.X509AttributeCertificate;
-import org.bouncycastle.x509.X509StreamParserSpi;
-import org.bouncycastle.x509.X509V2AttributeCertificate;
-import org.bouncycastle.x509.util.StreamParsingException;
-
-public class X509AttrCertParser
-    extends X509StreamParserSpi
-{
-    private static final PEMUtil PEM_PARSER = new PEMUtil("ATTRIBUTE CERTIFICATE");
-
-    private ASN1Set     sData = null;
-    private int         sDataObjectCount = 0;
-    private InputStream currentStream = null;
-
-    private X509AttributeCertificate readDERCertificate(
-        InputStream in)
-        throws IOException
-    {
-        ASN1InputStream dIn = new ASN1InputStream(in);
-        ASN1Sequence seq = (ASN1Sequence)dIn.readObject();
-
-        if (seq.size() > 1
-                && seq.getObjectAt(0) instanceof ASN1ObjectIdentifier)
-        {
-            if (seq.getObjectAt(0).equals(PKCSObjectIdentifiers.signedData))
-            {
-                sData = new SignedData(ASN1Sequence.getInstance(
-                                (ASN1TaggedObject)seq.getObjectAt(1), true)).getCertificates();
-
-                return getCertificate();
-            }
-        }
-
-        return new X509V2AttributeCertificate(seq.getEncoded());
-    }
-
-    private X509AttributeCertificate getCertificate()
-        throws IOException
-    {
-        if (sData != null)
-        {
-            while (sDataObjectCount < sData.size())
-            {
-                Object obj = sData.getObjectAt(sDataObjectCount++);
-
-                if (obj instanceof ASN1TaggedObject && ((ASN1TaggedObject)obj).getTagNo() == 2)
-                {
-                   return new X509V2AttributeCertificate(
-                          ASN1Sequence.getInstance((ASN1TaggedObject)obj, false).getEncoded());
-                }
-            }
-        }
-
-        return null;
-    }
-
-    private X509AttributeCertificate readPEMCertificate(
-        InputStream  in)
-        throws IOException
-    {
-        ASN1Sequence seq = PEM_PARSER.readPEMObject(in);
-
-        if (seq != null)
-        {
-            return new X509V2AttributeCertificate(seq.getEncoded());
-        }
-
-        return null;
-    }
-
-    public void engineInit(InputStream in)
-    {
-        currentStream = in;
-        sData = null;
-        sDataObjectCount = 0;
-
-        if (!currentStream.markSupported())
-        {
-            currentStream = new BufferedInputStream(currentStream);
-        }
-    }
-
-    public Object engineRead()
-        throws StreamParsingException
-    {
-        try
-        {
-            if (sData != null)
-            {
-                if (sDataObjectCount != sData.size())
-                {
-                    return getCertificate();
-                }
-                else
-                {
-                    sData = null;
-                    sDataObjectCount = 0;
-                    return null;
-                }
-            }
-
-            currentStream.mark(10);
-            int    tag = currentStream.read();
-
-            if (tag == -1)
-            {
-                return null;
-            }
-
-            if (tag != 0x30)  // assume ascii PEM encoded.
-            {
-                currentStream.reset();
-                return readPEMCertificate(currentStream);
-            }
-            else
-            {
-                currentStream.reset();
-                return readDERCertificate(currentStream);
-            }
-        }
-        catch (Exception e)
-        {
-            throw new StreamParsingException(e.toString(), e);
-        }
-    }
-
-    public Collection engineReadAll()
-        throws StreamParsingException
-    {
-        X509AttributeCertificate cert;
-        List certs = new ArrayList();
-
-        while ((cert = (X509AttributeCertificate)engineRead()) != null)
-        {
-            certs.add(cert);
-        }
-
-        return certs;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/provider/X509CRLParser.java b/bcprov/src/main/java/org/bouncycastle/jce/provider/X509CRLParser.java
deleted file mode 100644
index 0d1eca7..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/provider/X509CRLParser.java
+++ /dev/null
@@ -1,150 +0,0 @@
-package org.bouncycastle.jce.provider;
-
-import java.io.BufferedInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.security.cert.CRL;
-import java.security.cert.CRLException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.ASN1Set;
-import org.bouncycastle.asn1.ASN1TaggedObject;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.asn1.pkcs.SignedData;
-import org.bouncycastle.asn1.x509.CertificateList;
-import org.bouncycastle.x509.X509StreamParserSpi;
-import org.bouncycastle.x509.util.StreamParsingException;
-
-public class X509CRLParser
-    extends X509StreamParserSpi
-{
-    private static final PEMUtil PEM_PARSER = new PEMUtil("CRL");
-
-    private ASN1Set     sData = null;
-    private int         sDataObjectCount = 0;
-    private InputStream currentStream = null;
-
-    private CRL readDERCRL(
-        InputStream in)
-        throws IOException, CRLException
-    {
-        ASN1InputStream dIn = new ASN1InputStream(in);
-        ASN1Sequence seq = (ASN1Sequence)dIn.readObject();
-
-        if (seq.size() > 1
-                && seq.getObjectAt(0) instanceof ASN1ObjectIdentifier)
-        {
-            if (seq.getObjectAt(0).equals(PKCSObjectIdentifiers.signedData))
-            {
-                sData = new SignedData(ASN1Sequence.getInstance(
-                                (ASN1TaggedObject)seq.getObjectAt(1), true)).getCRLs();
-
-                return getCRL();
-            }
-        }
-
-        return new X509CRLObject(CertificateList.getInstance(seq));
-    }
-
-    private CRL getCRL()
-        throws CRLException
-    {
-        if (sData == null || sDataObjectCount >= sData.size())
-        {
-            return null;
-        }
-
-        return new X509CRLObject(
-                        CertificateList.getInstance(
-                                sData.getObjectAt(sDataObjectCount++)));
-    }
-
-    private CRL readPEMCRL(
-        InputStream  in)
-        throws IOException, CRLException
-    {
-        ASN1Sequence seq = PEM_PARSER.readPEMObject(in);
-
-        if (seq != null)
-        {
-            return new X509CRLObject(CertificateList.getInstance(seq));
-        }
-
-        return null;
-    }
-
-    public void engineInit(InputStream in)
-    {
-        currentStream = in;
-        sData = null;
-        sDataObjectCount = 0;
-
-        if (!currentStream.markSupported())
-        {
-            currentStream = new BufferedInputStream(currentStream);
-        }
-    }
-
-    public Object engineRead()
-        throws StreamParsingException
-    {
-        try
-        {
-            if (sData != null)
-            {
-                if (sDataObjectCount != sData.size())
-                {
-                    return getCRL();
-                }
-                else
-                {
-                    sData = null;
-                    sDataObjectCount = 0;
-                    return null;
-                }
-            }
-
-            currentStream.mark(10);
-            int    tag = currentStream.read();
-
-            if (tag == -1)
-            {
-                return null;
-            }
-
-            if (tag != 0x30)  // assume ascii PEM encoded.
-            {
-                currentStream.reset();
-                return readPEMCRL(currentStream);
-            }
-            else
-            {
-                currentStream.reset();
-                return readDERCRL(currentStream);
-            }
-        }
-        catch (Exception e)
-        {
-            throw new StreamParsingException(e.toString(), e);
-        }
-    }
-
-    public Collection engineReadAll()
-        throws StreamParsingException
-    {
-        CRL     crl;
-        List certs = new ArrayList();
-
-        while ((crl = (CRL)engineRead()) != null)
-        {
-            certs.add(crl);
-        }
-
-        return certs;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/provider/X509CertPairParser.java b/bcprov/src/main/java/org/bouncycastle/jce/provider/X509CertPairParser.java
deleted file mode 100644
index 41d6448..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/provider/X509CertPairParser.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package org.bouncycastle.jce.provider;
-
-import java.io.BufferedInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.security.cert.CertificateParsingException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.x509.CertificatePair;
-import org.bouncycastle.x509.X509CertificatePair;
-import org.bouncycastle.x509.X509StreamParserSpi;
-import org.bouncycastle.x509.util.StreamParsingException;
-
-public class X509CertPairParser
-    extends X509StreamParserSpi
-{
-    private InputStream currentStream = null;
-
-    private X509CertificatePair readDERCrossCertificatePair(
-        InputStream in)
-        throws IOException, CertificateParsingException
-    {
-        ASN1InputStream dIn = new ASN1InputStream(in);
-        ASN1Sequence seq = (ASN1Sequence)dIn.readObject();
-        CertificatePair pair = CertificatePair.getInstance(seq);
-        return new X509CertificatePair(pair);
-    }
-
-    public void engineInit(InputStream in)
-    {
-        currentStream = in;
-
-        if (!currentStream.markSupported())
-        {
-            currentStream = new BufferedInputStream(currentStream);
-        }
-    }
-
-    public Object engineRead() throws StreamParsingException
-    {
-        try
-        {
-
-            currentStream.mark(10);
-            int tag = currentStream.read();
-
-            if (tag == -1)
-            {
-                return null;
-            }
-
-            currentStream.reset();
-            return readDERCrossCertificatePair(currentStream);
-        }
-        catch (Exception e)
-        {
-            throw new StreamParsingException(e.toString(), e);
-        }
-    }
-
-    public Collection engineReadAll() throws StreamParsingException
-    {
-        X509CertificatePair pair;
-        List certs = new ArrayList();
-
-        while ((pair = (X509CertificatePair)engineRead()) != null)
-        {
-            certs.add(pair);
-        }
-
-        return certs;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/provider/X509CertParser.java b/bcprov/src/main/java/org/bouncycastle/jce/provider/X509CertParser.java
deleted file mode 100644
index 0663735..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/provider/X509CertParser.java
+++ /dev/null
@@ -1,158 +0,0 @@
-package org.bouncycastle.jce.provider;
-
-import java.io.BufferedInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.security.cert.Certificate;
-import java.security.cert.CertificateParsingException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.ASN1Set;
-import org.bouncycastle.asn1.ASN1TaggedObject;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.asn1.pkcs.SignedData;
-import org.bouncycastle.x509.X509StreamParserSpi;
-import org.bouncycastle.x509.util.StreamParsingException;
-
-public class X509CertParser
-    extends X509StreamParserSpi
-{
-    private static final PEMUtil PEM_PARSER = new PEMUtil("CERTIFICATE");
-
-    private ASN1Set     sData = null;
-    private int         sDataObjectCount = 0;
-    private InputStream currentStream = null;
-
-    private Certificate readDERCertificate(
-        InputStream in)
-        throws IOException, CertificateParsingException
-    {
-        ASN1InputStream dIn = new ASN1InputStream(in);
-        ASN1Sequence seq = (ASN1Sequence)dIn.readObject();
-
-        if (seq.size() > 1
-                && seq.getObjectAt(0) instanceof ASN1ObjectIdentifier)
-        {
-            if (seq.getObjectAt(0).equals(PKCSObjectIdentifiers.signedData))
-            {
-                sData = new SignedData(ASN1Sequence.getInstance(
-                                (ASN1TaggedObject)seq.getObjectAt(1), true)).getCertificates();
-
-                return getCertificate();
-            }
-        }
-
-        return new X509CertificateObject(
-                            org.bouncycastle.asn1.x509.Certificate.getInstance(seq));
-    }
-
-    private Certificate getCertificate()
-        throws CertificateParsingException
-    {
-        if (sData != null)
-        {
-            while (sDataObjectCount < sData.size())
-            {
-                Object obj = sData.getObjectAt(sDataObjectCount++);
-
-                if (obj instanceof ASN1Sequence)
-                {
-                   return new X509CertificateObject(
-                                    org.bouncycastle.asn1.x509.Certificate.getInstance(obj));
-                }
-            }
-        }
-
-        return null;
-    }
-
-    private Certificate readPEMCertificate(
-        InputStream  in)
-        throws IOException, CertificateParsingException
-    {
-        ASN1Sequence seq = PEM_PARSER.readPEMObject(in);
-
-        if (seq != null)
-        {
-            return new X509CertificateObject(
-                            org.bouncycastle.asn1.x509.Certificate.getInstance(seq));
-        }
-
-        return null;
-    }
-
-    public void engineInit(InputStream in)
-    {
-        currentStream = in;
-        sData = null;
-        sDataObjectCount = 0;
-
-        if (!currentStream.markSupported())
-        {
-            currentStream = new BufferedInputStream(currentStream);
-        }
-    }
-
-    public Object engineRead()
-        throws StreamParsingException
-    {
-        try
-        {
-            if (sData != null)
-            {
-                if (sDataObjectCount != sData.size())
-                {
-                    return getCertificate();
-                }
-                else
-                {
-                    sData = null;
-                    sDataObjectCount = 0;
-                    return null;
-                }
-            }
-
-            currentStream.mark(10);
-            int    tag = currentStream.read();
-
-            if (tag == -1)
-            {
-                return null;
-            }
-
-            if (tag != 0x30)  // assume ascii PEM encoded.
-            {
-                currentStream.reset();
-                return readPEMCertificate(currentStream);
-            }
-            else
-            {
-                currentStream.reset();
-                return readDERCertificate(currentStream);
-            }
-        }
-        catch (Exception e)
-        {
-            throw new StreamParsingException(e.toString(), e);
-        }
-    }
-
-    public Collection engineReadAll()
-        throws StreamParsingException
-    {
-        Certificate     cert;
-        List certs = new ArrayList();
-
-        while ((cert = (Certificate)engineRead()) != null)
-        {
-            certs.add(cert);
-        }
-
-        return certs;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/provider/X509CertificateObject.java b/bcprov/src/main/java/org/bouncycastle/jce/provider/X509CertificateObject.java
index 97ff6f9..0ae61d2 100644
--- a/bcprov/src/main/java/org/bouncycastle/jce/provider/X509CertificateObject.java
+++ b/bcprov/src/main/java/org/bouncycastle/jce/provider/X509CertificateObject.java
@@ -57,6 +57,9 @@ import org.bouncycastle.asn1.x509.Extension;
 import org.bouncycastle.asn1.x509.Extensions;
 import org.bouncycastle.asn1.x509.GeneralName;
 import org.bouncycastle.asn1.x509.KeyUsage;
+// BEGIN android-added
+import org.bouncycastle.asn1.x509.X509Name;
+// END android-added
 import org.bouncycastle.jcajce.provider.asymmetric.util.PKCS12BagAttributeCarrierImpl;
 import org.bouncycastle.jce.X509Principal;
 import org.bouncycastle.jce.interfaces.PKCS12BagAttributeCarrier;
@@ -562,12 +565,20 @@ public class X509CertificateObject
         }
     }
 
+    // BEGIN android-changed
+    private byte[] encoded;
+    // END android-changed
     public byte[] getEncoded()
         throws CertificateEncodingException
     {
         try
         {
-            return c.getEncoded(ASN1Encoding.DER);
+            // BEGIN android-changed
+            if (encoded == null) {
+                encoded = c.getEncoded(ASN1Encoding.DER);
+            }
+            return encoded;
+            // END android-changed
         }
         catch (IOException e)
         {
@@ -858,7 +869,9 @@ public class X509CertificateObject
                     list.add(genName.getEncoded());
                     break;
                 case GeneralName.directoryName:
-                    list.add(X500Name.getInstance(RFC4519Style.INSTANCE, genName.getName()).toString());
+                    // BEGIN android-changed
+                    list.add(X509Name.getInstance(genName.getName()).toString(true, X509Name.DefaultSymbols));
+                    // END android-changed
                     break;
                 case GeneralName.dNSName:
                 case GeneralName.rfc822Name:
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/provider/X509LDAPCertStoreSpi.java b/bcprov/src/main/java/org/bouncycastle/jce/provider/X509LDAPCertStoreSpi.java
deleted file mode 100644
index f526994..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/provider/X509LDAPCertStoreSpi.java
+++ /dev/null
@@ -1,477 +0,0 @@
-package org.bouncycastle.jce.provider;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.security.InvalidAlgorithmParameterException;
-import java.security.cert.CRL;
-import java.security.cert.CRLSelector;
-import java.security.cert.CertSelector;
-import java.security.cert.CertStoreException;
-import java.security.cert.CertStoreParameters;
-import java.security.cert.CertStoreSpi;
-import java.security.cert.Certificate;
-import java.security.cert.CertificateFactory;
-import java.security.cert.X509CRLSelector;
-import java.security.cert.X509CertSelector;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Properties;
-import java.util.Set;
-
-import javax.naming.Context;
-import javax.naming.NamingEnumeration;
-import javax.naming.NamingException;
-import javax.naming.directory.Attribute;
-import javax.naming.directory.DirContext;
-import javax.naming.directory.InitialDirContext;
-import javax.naming.directory.SearchControls;
-import javax.naming.directory.SearchResult;
-import javax.security.auth.x500.X500Principal;
-
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.x509.CertificatePair;
-import org.bouncycastle.jce.X509LDAPCertStoreParameters;
-
-/**
- * 
- * This is a general purpose implementation to get X.509 certificates and CRLs
- * from a LDAP location.
- * <p>
- * At first a search is performed in the ldap*AttributeNames of the
- * {@link org.bouncycastle.jce.X509LDAPCertStoreParameters} with the given
- * information of the subject (for all kind of certificates) or issuer (for
- * CRLs), respectively, if a X509CertSelector is given with that details. For
- * CRLs, CA certificates and cross certificates a coarse search is made only for
- * entries with that content to get more possibly matching results.
- */
-public class X509LDAPCertStoreSpi
-    extends CertStoreSpi
-{
-    private X509LDAPCertStoreParameters params;
-
-    public X509LDAPCertStoreSpi(CertStoreParameters params)
-        throws InvalidAlgorithmParameterException
-    {
-        super(params);
-
-        if (!(params instanceof X509LDAPCertStoreParameters))
-        {
-            throw new InvalidAlgorithmParameterException(
-                X509LDAPCertStoreSpi.class.getName() + ": parameter must be a " + X509LDAPCertStoreParameters.class.getName() + " object\n"
-                    + params.toString());
-        }
-
-        this.params = (X509LDAPCertStoreParameters)params;
-    }
-
-    /**
-     * Initial Context Factory.
-     */
-    private static String LDAP_PROVIDER = "com.sun.jndi.ldap.LdapCtxFactory";
-
-    /**
-     * Processing referrals..
-     */
-    private static String REFERRALS_IGNORE = "ignore";
-
-    /**
-     * Security level to be used for LDAP connections.
-     */
-    private static final String SEARCH_SECURITY_LEVEL = "none";
-
-    /**
-     * Package Prefix for loading URL context factories.
-     */
-    private static final String URL_CONTEXT_PREFIX = "com.sun.jndi.url";
-
-    private DirContext connectLDAP() throws NamingException
-    {
-        Properties props = new Properties();
-        props.setProperty(Context.INITIAL_CONTEXT_FACTORY, LDAP_PROVIDER);
-        props.setProperty(Context.BATCHSIZE, "0");
-
-        props.setProperty(Context.PROVIDER_URL, params.getLdapURL());
-        props.setProperty(Context.URL_PKG_PREFIXES, URL_CONTEXT_PREFIX);
-        props.setProperty(Context.REFERRAL, REFERRALS_IGNORE);
-        props.setProperty(Context.SECURITY_AUTHENTICATION,
-            SEARCH_SECURITY_LEVEL);
-
-        DirContext ctx = new InitialDirContext(props);
-        return ctx;
-    }
-
-    private String parseDN(String subject, String subjectAttributeName)
-    {
-        String temp = subject;
-        int begin = temp.toLowerCase().indexOf(
-            subjectAttributeName.toLowerCase());
-        temp = temp.substring(begin + subjectAttributeName.length());
-        int end = temp.indexOf(',');
-        if (end == -1)
-        {
-            end = temp.length();
-        }
-        while (temp.charAt(end - 1) == '\\')
-        {
-            end = temp.indexOf(',', end + 1);
-            if (end == -1)
-            {
-                end = temp.length();
-            }
-        }
-        temp = temp.substring(0, end);
-        begin = temp.indexOf('=');
-        temp = temp.substring(begin + 1);
-        if (temp.charAt(0) == ' ')
-        {
-            temp = temp.substring(1);
-        }
-        if (temp.startsWith("\""))
-        {
-            temp = temp.substring(1);
-        }
-        if (temp.endsWith("\""))
-        {
-            temp = temp.substring(0, temp.length() - 1);
-        }
-        return temp;
-    }
-
-    public Collection engineGetCertificates(CertSelector selector)
-        throws CertStoreException
-    {
-        if (!(selector instanceof X509CertSelector))
-        {
-            throw new CertStoreException("selector is not a X509CertSelector");
-        }
-        X509CertSelector xselector = (X509CertSelector)selector;
-
-        Set certSet = new HashSet();
-
-        Set set = getEndCertificates(xselector);
-        set.addAll(getCACertificates(xselector));
-        set.addAll(getCrossCertificates(xselector));
-
-        Iterator it = set.iterator();
-
-        try
-        {
-            CertificateFactory cf = CertificateFactory.getInstance("X.509",
-                BouncyCastleProvider.PROVIDER_NAME);
-            while (it.hasNext())
-            {
-                byte[] bytes = (byte[])it.next();
-                if (bytes == null || bytes.length == 0)
-                {
-                    continue;
-                }
-
-                List bytesList = new ArrayList();
-                bytesList.add(bytes);
-
-                try
-                {
-                    CertificatePair pair = CertificatePair
-                        .getInstance(new ASN1InputStream(bytes)
-                            .readObject());
-                    bytesList.clear();
-                    if (pair.getForward() != null)
-                    {
-                        bytesList.add(pair.getForward().getEncoded());
-                    }
-                    if (pair.getReverse() != null)
-                    {
-                        bytesList.add(pair.getReverse().getEncoded());
-                    }
-                }
-                catch (IOException e)
-                {
-
-                }
-                catch (IllegalArgumentException e)
-                {
-
-                }
-                for (Iterator it2 = bytesList.iterator(); it2.hasNext();)
-                {
-                    ByteArrayInputStream bIn = new ByteArrayInputStream(
-                        (byte[])it2.next());
-                    try
-                    {
-                        Certificate cert = cf.generateCertificate(bIn);
-                        // System.out.println(((X509Certificate)
-                        // cert).getSubjectX500Principal());
-                        if (xselector.match(cert))
-                        {
-                            certSet.add(cert);
-                        }
-                    }
-                    catch (Exception e)
-                    {
-
-                    }
-                }
-            }
-        }
-        catch (Exception e)
-        {
-            throw new CertStoreException(
-                "certificate cannot be constructed from LDAP result: " + e);
-        }
-
-        return certSet;
-    }
-
-    private Set certSubjectSerialSearch(X509CertSelector xselector,
-                                        String[] attrs, String attrName, String subjectAttributeName)
-        throws CertStoreException
-    {
-        Set set = new HashSet();
-        try
-        {
-            if (xselector.getSubjectAsBytes() != null
-                || xselector.getSubjectAsString() != null
-                || xselector.getCertificate() != null)
-            {
-                String subject = null;
-                String serial = null;
-                if (xselector.getCertificate() != null)
-                {
-                    subject = xselector.getCertificate()
-                        .getSubjectX500Principal().getName("RFC1779");
-                    serial = xselector.getCertificate().getSerialNumber()
-                        .toString();
-                }
-                else
-                {
-                    if (xselector.getSubjectAsBytes() != null)
-                    {
-                        subject = new X500Principal(xselector
-                            .getSubjectAsBytes()).getName("RFC1779");
-                    }
-                    else
-                    {
-                        subject = xselector.getSubjectAsString();
-                    }
-                }
-                String attrValue = parseDN(subject, subjectAttributeName);
-                set.addAll(search(attrName, "*" + attrValue + "*", attrs));
-                if (serial != null
-                    && params.getSearchForSerialNumberIn() != null)
-                {
-                    attrValue = serial;
-                    attrName = params.getSearchForSerialNumberIn();
-                    set.addAll(search(attrName, "*" + attrValue + "*", attrs));
-                }
-            }
-            else
-            {
-                set.addAll(search(attrName, "*", attrs));
-            }
-        }
-        catch (IOException e)
-        {
-            throw new CertStoreException("exception processing selector: " + e);
-        }
-
-        return set;
-    }
-
-    private Set getEndCertificates(X509CertSelector xselector)
-        throws CertStoreException
-    {
-        String[] attrs = {params.getUserCertificateAttribute()};
-        String attrName = params.getLdapUserCertificateAttributeName();
-        String subjectAttributeName = params.getUserCertificateSubjectAttributeName();
-
-        Set set = certSubjectSerialSearch(xselector, attrs, attrName,
-            subjectAttributeName);
-        return set;
-    }
-
-    private Set getCACertificates(X509CertSelector xselector)
-        throws CertStoreException
-    {
-        String[] attrs = {params.getCACertificateAttribute()};
-        String attrName = params.getLdapCACertificateAttributeName();
-        String subjectAttributeName = params
-            .getCACertificateSubjectAttributeName();
-        Set set = certSubjectSerialSearch(xselector, attrs, attrName,
-            subjectAttributeName);
-
-        if (set.isEmpty())
-        {
-            set.addAll(search(null, "*", attrs));
-        }
-
-        return set;
-    }
-
-    private Set getCrossCertificates(X509CertSelector xselector)
-        throws CertStoreException
-    {
-        String[] attrs = {params.getCrossCertificateAttribute()};
-        String attrName = params.getLdapCrossCertificateAttributeName();
-        String subjectAttributeName = params
-            .getCrossCertificateSubjectAttributeName();
-        Set set = certSubjectSerialSearch(xselector, attrs, attrName,
-            subjectAttributeName);
-
-        if (set.isEmpty())
-        {
-            set.addAll(search(null, "*", attrs));
-        }
-
-        return set;
-    }
-
-    public Collection engineGetCRLs(CRLSelector selector)
-        throws CertStoreException
-    {
-        String[] attrs = {params.getCertificateRevocationListAttribute()};
-        if (!(selector instanceof X509CRLSelector))
-        {
-            throw new CertStoreException("selector is not a X509CRLSelector");
-        }
-        X509CRLSelector xselector = (X509CRLSelector)selector;
-
-        Set crlSet = new HashSet();
-
-        String attrName = params.getLdapCertificateRevocationListAttributeName();
-        Set set = new HashSet();
-
-        if (xselector.getIssuerNames() != null)
-        {
-            for (Iterator it = xselector.getIssuerNames().iterator(); it
-                .hasNext();)
-            {
-                Object o = it.next();
-                String attrValue = null;
-                if (o instanceof String)
-                {
-                    String issuerAttributeName = params
-                        .getCertificateRevocationListIssuerAttributeName();
-                    attrValue = parseDN((String)o, issuerAttributeName);
-                }
-                else
-                {
-                    String issuerAttributeName = params
-                        .getCertificateRevocationListIssuerAttributeName();
-                    attrValue = parseDN(new X500Principal((byte[])o)
-                        .getName("RFC1779"), issuerAttributeName);
-                }
-                set.addAll(search(attrName, "*" + attrValue + "*", attrs));
-            }
-        }
-        else
-        {
-            set.addAll(search(attrName, "*", attrs));
-        }
-        set.addAll(search(null, "*", attrs));
-        Iterator it = set.iterator();
-
-        try
-        {
-            CertificateFactory cf = CertificateFactory.getInstance("X.509",
-                BouncyCastleProvider.PROVIDER_NAME);
-            while (it.hasNext())
-            {
-                CRL crl = cf.generateCRL(new ByteArrayInputStream((byte[])it
-                    .next()));
-                if (xselector.match(crl))
-                {
-                    crlSet.add(crl);
-                }
-            }
-        }
-        catch (Exception e)
-        {
-            throw new CertStoreException(
-                "CRL cannot be constructed from LDAP result " + e);
-        }
-
-        return crlSet;
-    }
-
-    /**
-     * Returns a Set of byte arrays with the certificate or CRL encodings.
-     *
-     * @param attributeName  The attribute name to look for in the LDAP.
-     * @param attributeValue The value the attribute name must have.
-     * @param attrs          The attributes in the LDAP which hold the certificate,
-     *                       certificate pair or CRL in a found entry.
-     * @return Set of byte arrays with the certificate encodings.
-     */
-    private Set search(String attributeName, String attributeValue,
-                       String[] attrs) throws CertStoreException
-    {
-        String filter = attributeName + "=" + attributeValue;
-        if (attributeName == null)
-        {
-            filter = null;
-        }
-        DirContext ctx = null;
-        Set set = new HashSet();
-        try
-        {
-
-            ctx = connectLDAP();
-
-            SearchControls constraints = new SearchControls();
-            constraints.setSearchScope(SearchControls.SUBTREE_SCOPE);
-            constraints.setCountLimit(0);
-            for (int i = 0; i < attrs.length; i++)
-            {
-                String temp[] = new String[1];
-                temp[0] = attrs[i];
-                constraints.setReturningAttributes(temp);
-
-                String filter2 = "(&(" + filter + ")(" + temp[0] + "=*))";
-                if (filter == null)
-                {
-                    filter2 = "(" + temp[0] + "=*)";
-                }
-                NamingEnumeration results = ctx.search(params.getBaseDN(),
-                    filter2, constraints);
-                while (results.hasMoreElements())
-                {
-                    SearchResult sr = (SearchResult)results.next();
-                    // should only be one attribute in the attribute set with
-                    // one
-                    // attribute value as byte array
-                    NamingEnumeration enumeration = ((Attribute)(sr
-                        .getAttributes().getAll().next())).getAll();
-                    while (enumeration.hasMore())
-                    {
-                        Object o = enumeration.next();
-                        set.add(o);
-                    }
-                }
-            }
-        }
-        catch (Exception e)
-        {
-            throw new CertStoreException(
-                "Error getting results from LDAP directory " + e);
-
-        }
-        finally
-        {
-            try
-            {
-                if (null != ctx)
-                {
-                    ctx.close();
-                }
-            }
-            catch (Exception e)
-            {
-            }
-        }
-        return set;
-    }
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/provider/X509SignatureUtil.java b/bcprov/src/main/java/org/bouncycastle/jce/provider/X509SignatureUtil.java
index eb1e556..b12b1df 100644
--- a/bcprov/src/main/java/org/bouncycastle/jce/provider/X509SignatureUtil.java
+++ b/bcprov/src/main/java/org/bouncycastle/jce/provider/X509SignatureUtil.java
@@ -14,7 +14,9 @@ import org.bouncycastle.asn1.ASN1Null;
 import org.bouncycastle.asn1.ASN1ObjectIdentifier;
 import org.bouncycastle.asn1.ASN1Sequence;
 import org.bouncycastle.asn1.DERNull;
-import org.bouncycastle.asn1.cryptopro.CryptoProObjectIdentifiers;
+// BEGIN android-removed
+// import org.bouncycastle.asn1.cryptopro.CryptoProObjectIdentifiers;
+// END android-removed
 import org.bouncycastle.asn1.nist.NISTObjectIdentifiers;
 import org.bouncycastle.asn1.oiw.OIWObjectIdentifiers;
 import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
@@ -66,12 +68,14 @@ class X509SignatureUtil
         
         if (params != null && !derNull.equals(params))
         {
-            if (sigAlgId.getAlgorithm().equals(PKCSObjectIdentifiers.id_RSASSA_PSS))
-            {
-                RSASSAPSSparams rsaParams = RSASSAPSSparams.getInstance(params);
-                
-                return getDigestAlgName(rsaParams.getHashAlgorithm().getAlgorithm()) + "withRSAandMGF1";
-            }
+            // BEGIN android-removed
+            // if (sigAlgId.getAlgorithm().equals(PKCSObjectIdentifiers.id_RSASSA_PSS))
+            // {
+            //     RSASSAPSSparams rsaParams = RSASSAPSSparams.getInstance(params);
+            //     
+            //     return getDigestAlgName(rsaParams.getHashAlgorithm().getAlgorithm()) + "withRSAandMGF1";
+            // }
+            // END android-removed
             if (sigAlgId.getAlgorithm().equals(X9ObjectIdentifiers.ecdsa_with_SHA2))
             {
                 ASN1Sequence ecDsaParams = ASN1Sequence.getInstance(params);
@@ -114,22 +118,24 @@ class X509SignatureUtil
         {
             return "SHA512";
         }
-        else if (TeleTrusTObjectIdentifiers.ripemd128.equals(digestAlgOID))
-        {
-            return "RIPEMD128";
-        }
-        else if (TeleTrusTObjectIdentifiers.ripemd160.equals(digestAlgOID))
-        {
-            return "RIPEMD160";
-        }
-        else if (TeleTrusTObjectIdentifiers.ripemd256.equals(digestAlgOID))
-        {
-            return "RIPEMD256";
-        }
-        else if (CryptoProObjectIdentifiers.gostR3411.equals(digestAlgOID))
-        {
-            return "GOST3411";
-        }
+        // BEGIN android-removed
+        // else if (TeleTrusTObjectIdentifiers.ripemd128.equals(digestAlgOID))
+        // {
+        //     return "RIPEMD128";
+        // }
+        // else if (TeleTrusTObjectIdentifiers.ripemd160.equals(digestAlgOID))
+        // {
+        //     return "RIPEMD160";
+        // }
+        // else if (TeleTrusTObjectIdentifiers.ripemd256.equals(digestAlgOID))
+        // {
+        //     return "RIPEMD256";
+        // }
+        // else if (CryptoProObjectIdentifiers.gostR3411.equals(digestAlgOID))
+        // {
+        //     return "GOST3411";
+        // }
+        // END android-removed
         else
         {
             return digestAlgOID.getId();            
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/provider/X509StoreAttrCertCollection.java b/bcprov/src/main/java/org/bouncycastle/jce/provider/X509StoreAttrCertCollection.java
deleted file mode 100644
index 7e2dc6a..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/provider/X509StoreAttrCertCollection.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package org.bouncycastle.jce.provider;
-
-import java.util.Collection;
-
-import org.bouncycastle.util.CollectionStore;
-import org.bouncycastle.util.Selector;
-import org.bouncycastle.x509.X509CollectionStoreParameters;
-import org.bouncycastle.x509.X509StoreParameters;
-import org.bouncycastle.x509.X509StoreSpi;
-
-public class X509StoreAttrCertCollection
-    extends X509StoreSpi
-{
-    private CollectionStore _store;
-
-    public X509StoreAttrCertCollection()
-    {
-    }
-
-    public void engineInit(X509StoreParameters params)
-    {
-        if (!(params instanceof X509CollectionStoreParameters))
-        {
-            throw new IllegalArgumentException(params.toString());
-        }
-
-        _store = new CollectionStore(((X509CollectionStoreParameters)params).getCollection());
-    }
-
-    public Collection engineGetMatches(Selector selector)
-    {
-        return _store.getMatches(selector);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/provider/X509StoreCRLCollection.java b/bcprov/src/main/java/org/bouncycastle/jce/provider/X509StoreCRLCollection.java
deleted file mode 100644
index b914f17..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/provider/X509StoreCRLCollection.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package org.bouncycastle.jce.provider;
-
-import java.util.Collection;
-
-import org.bouncycastle.util.CollectionStore;
-import org.bouncycastle.util.Selector;
-import org.bouncycastle.x509.X509CollectionStoreParameters;
-import org.bouncycastle.x509.X509StoreParameters;
-import org.bouncycastle.x509.X509StoreSpi;
-
-public class X509StoreCRLCollection
-    extends X509StoreSpi
-{
-    private CollectionStore _store;
-
-    public X509StoreCRLCollection()
-    {
-    }
-
-    public void engineInit(X509StoreParameters params)
-    {
-        if (!(params instanceof X509CollectionStoreParameters))
-        {
-            throw new IllegalArgumentException(params.toString());
-        }
-
-        _store = new CollectionStore(((X509CollectionStoreParameters)params).getCollection());
-    }
-
-    public Collection engineGetMatches(Selector selector)
-    {
-        return _store.getMatches(selector);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/provider/X509StoreCertCollection.java b/bcprov/src/main/java/org/bouncycastle/jce/provider/X509StoreCertCollection.java
deleted file mode 100644
index db88f31..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/provider/X509StoreCertCollection.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package org.bouncycastle.jce.provider;
-
-import java.util.Collection;
-
-import org.bouncycastle.util.CollectionStore;
-import org.bouncycastle.util.Selector;
-import org.bouncycastle.x509.X509CollectionStoreParameters;
-import org.bouncycastle.x509.X509StoreParameters;
-import org.bouncycastle.x509.X509StoreSpi;
-
-public class X509StoreCertCollection
-    extends X509StoreSpi
-{
-    private CollectionStore _store;
-
-    public X509StoreCertCollection()
-    {
-    }
-
-    public void engineInit(X509StoreParameters params)
-    {
-        if (!(params instanceof X509CollectionStoreParameters))
-        {
-            throw new IllegalArgumentException(params.toString());
-        }
-
-        _store = new CollectionStore(((X509CollectionStoreParameters)params).getCollection());
-    }
-
-    public Collection engineGetMatches(Selector selector)
-    {
-        return _store.getMatches(selector);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/provider/X509StoreCertPairCollection.java b/bcprov/src/main/java/org/bouncycastle/jce/provider/X509StoreCertPairCollection.java
deleted file mode 100644
index 2a6a2c3..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/provider/X509StoreCertPairCollection.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package org.bouncycastle.jce.provider;
-
-import java.util.Collection;
-
-import org.bouncycastle.util.CollectionStore;
-import org.bouncycastle.util.Selector;
-import org.bouncycastle.x509.X509CollectionStoreParameters;
-import org.bouncycastle.x509.X509StoreParameters;
-import org.bouncycastle.x509.X509StoreSpi;
-
-/**
- * This class is a collection based Bouncy Castle
- * {@link org.bouncycastle.x509.X509Store} SPI implementation for certificate
- * pairs.
- *
- * @see org.bouncycastle.x509.X509Store
- * @see org.bouncycastle.x509.X509CertificatePair
- */
-public class X509StoreCertPairCollection extends X509StoreSpi
-{
-
-    private CollectionStore _store;
-
-    public X509StoreCertPairCollection()
-    {
-    }
-
-    /**
-     * Initializes this store.
-     *
-     * @param params The {@link X509CollectionStoreParameters}s for this store.
-     * @throws IllegalArgumentException if <code>params</code> is no instance of
-     *                                  <code>X509CollectionStoreParameters</code>.
-     */
-    public void engineInit(X509StoreParameters params)
-    {
-        if (!(params instanceof X509CollectionStoreParameters))
-        {
-            throw new IllegalArgumentException(
-                "Initialization parameters must be an instance of "
-                    + X509CollectionStoreParameters.class.getName()
-                    + ".");
-        }
-
-        _store = new CollectionStore(((X509CollectionStoreParameters)params)
-            .getCollection());
-    }
-
-    /**
-     * Returns a colelction of certificate pairs which match the given
-     * <code>selector</code>.
-     * <p>
-     * The returned collection contains
-     * {@link org.bouncycastle.x509.X509CertificatePair}s. The selector must be
-     * a {@link org.bouncycastle.x509.X509CertPairStoreSelector} to select
-     * certificate pairs.
-     * </p>
-     * @return A collection with matching certificate pairs.
-     */
-    public Collection engineGetMatches(Selector selector)
-    {
-        return _store.getMatches(selector);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/provider/X509StoreLDAPAttrCerts.java b/bcprov/src/main/java/org/bouncycastle/jce/provider/X509StoreLDAPAttrCerts.java
deleted file mode 100644
index 245f305..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/provider/X509StoreLDAPAttrCerts.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package org.bouncycastle.jce.provider;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.bouncycastle.jce.X509LDAPCertStoreParameters;
-import org.bouncycastle.util.Selector;
-import org.bouncycastle.util.StoreException;
-import org.bouncycastle.x509.X509AttributeCertStoreSelector;
-import org.bouncycastle.x509.X509StoreParameters;
-import org.bouncycastle.x509.X509StoreSpi;
-import org.bouncycastle.x509.util.LDAPStoreHelper;
-
-/**
- * A SPI implementation of Bouncy Castle <code>X509Store</code> for getting
- * attribute certificates from an LDAP directory.
- *
- * @see org.bouncycastle.x509.X509Store
- */
-public class X509StoreLDAPAttrCerts extends X509StoreSpi
-{
-
-    private LDAPStoreHelper helper;
-
-    public X509StoreLDAPAttrCerts()
-    {
-    }
-
-    /**
-     * Initializes this LDAP attribute cert store implementation.
-     *
-     * @param parameters <code>X509LDAPCertStoreParameters</code>.
-     * @throws IllegalArgumentException if <code>params</code> is not an instance of
-     *                                  <code>X509LDAPCertStoreParameters</code>.
-     */
-    public void engineInit(X509StoreParameters parameters)
-    {
-        if (!(parameters instanceof X509LDAPCertStoreParameters))
-        {
-            throw new IllegalArgumentException(
-                "Initialization parameters must be an instance of "
-                    + X509LDAPCertStoreParameters.class.getName() + ".");
-        }
-        helper = new LDAPStoreHelper((X509LDAPCertStoreParameters)parameters);
-    }
-
-    /**
-     * Returns a collection of matching attribute certificates from the LDAP
-     * location.
-     * <p>
-     * The selector must be a of type
-     * <code>X509AttributeCertStoreSelector</code>. If it is not an empty
-     * collection is returned.
-     * </p>
-     * <p>
-     * The subject and the serial number should be reasonable criterias for a
-     * selector.
-     * </p>
-     * @param selector The selector to use for finding.
-     * @return A collection with the matches.
-     * @throws StoreException if an exception occurs while searching.
-     */
-    public Collection engineGetMatches(Selector selector) throws StoreException
-    {
-        if (!(selector instanceof X509AttributeCertStoreSelector))
-        {
-            return Collections.EMPTY_SET;
-        }
-        X509AttributeCertStoreSelector xselector = (X509AttributeCertStoreSelector)selector;
-        Set set = new HashSet();
-        set.addAll(helper.getAACertificates(xselector));
-        set.addAll(helper.getAttributeCertificateAttributes(xselector));
-        set.addAll(helper.getAttributeDescriptorCertificates(xselector));
-        return set;
-    }
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/provider/X509StoreLDAPCRLs.java b/bcprov/src/main/java/org/bouncycastle/jce/provider/X509StoreLDAPCRLs.java
deleted file mode 100644
index 8af4ade..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/provider/X509StoreLDAPCRLs.java
+++ /dev/null
@@ -1,87 +0,0 @@
-package org.bouncycastle.jce.provider;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.bouncycastle.jce.X509LDAPCertStoreParameters;
-import org.bouncycastle.util.Selector;
-import org.bouncycastle.util.StoreException;
-import org.bouncycastle.x509.X509CRLStoreSelector;
-import org.bouncycastle.x509.X509StoreParameters;
-import org.bouncycastle.x509.X509StoreSpi;
-import org.bouncycastle.x509.util.LDAPStoreHelper;
-
-/**
- * A SPI implementation of Bouncy Castle <code>X509Store</code> for getting
- * certificate revocation lists from an LDAP directory.
- *
- * @see org.bouncycastle.x509.X509Store
- */
-public class X509StoreLDAPCRLs extends X509StoreSpi
-{
-
-    private LDAPStoreHelper helper;
-
-    public X509StoreLDAPCRLs()
-    {
-    }
-
-    /**
-     * Initializes this LDAP CRL store implementation.
-     *
-     * @param params <code>X509LDAPCertStoreParameters</code>.
-     * @throws IllegalArgumentException if <code>params</code> is not an instance of
-     *                                  <code>X509LDAPCertStoreParameters</code>.
-     */
-    public void engineInit(X509StoreParameters params)
-    {
-        if (!(params instanceof X509LDAPCertStoreParameters))
-        {
-            throw new IllegalArgumentException(
-                "Initialization parameters must be an instance of "
-                    + X509LDAPCertStoreParameters.class.getName() + ".");
-        }
-        helper = new LDAPStoreHelper((X509LDAPCertStoreParameters)params);
-    }
-
-    /**
-     * Returns a collection of matching CRLs from the LDAP location.
-     * <p>
-     * The selector must be a of type <code>X509CRLStoreSelector</code>. If
-     * it is not an empty collection is returned.
-     * </p><p>
-     * The issuer should be a reasonable criteria for a selector.
-     * </p>
-     * @param selector The selector to use for finding.
-     * @return A collection with the matches.
-     * @throws StoreException if an exception occurs while searching.
-     */
-    public Collection engineGetMatches(Selector selector) throws StoreException
-    {
-        if (!(selector instanceof X509CRLStoreSelector))
-        {
-            return Collections.EMPTY_SET;
-        }
-        X509CRLStoreSelector xselector = (X509CRLStoreSelector)selector;
-        Set set = new HashSet();
-        // test only delta CRLs should be selected
-        if (xselector.isDeltaCRLIndicatorEnabled())
-        {
-            set.addAll(helper.getDeltaCertificateRevocationLists(xselector));
-        }
-        // nothing specified
-        else
-        {
-            set.addAll(helper.getDeltaCertificateRevocationLists(xselector));
-            set.addAll(helper.getAttributeAuthorityRevocationLists(xselector));
-            set
-                .addAll(helper
-                    .getAttributeCertificateRevocationLists(xselector));
-            set.addAll(helper.getAuthorityRevocationLists(xselector));
-            set.addAll(helper.getCertificateRevocationLists(xselector));
-        }
-        return set;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/provider/X509StoreLDAPCertPairs.java b/bcprov/src/main/java/org/bouncycastle/jce/provider/X509StoreLDAPCertPairs.java
deleted file mode 100644
index 3d3036d..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/provider/X509StoreLDAPCertPairs.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package org.bouncycastle.jce.provider;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.bouncycastle.jce.X509LDAPCertStoreParameters;
-import org.bouncycastle.util.Selector;
-import org.bouncycastle.util.StoreException;
-import org.bouncycastle.x509.X509CertPairStoreSelector;
-import org.bouncycastle.x509.X509StoreParameters;
-import org.bouncycastle.x509.X509StoreSpi;
-import org.bouncycastle.x509.util.LDAPStoreHelper;
-
-/**
- * A SPI implementation of Bouncy Castle <code>X509Store</code> for getting
- * cross certificates pairs from an LDAP directory.
- *
- * @see org.bouncycastle.x509.X509Store
- */
-public class X509StoreLDAPCertPairs extends X509StoreSpi
-{
-
-    private LDAPStoreHelper helper;
-
-    public X509StoreLDAPCertPairs()
-    {
-    }
-
-    /**
-     * Initializes this LDAP cross certificate pair store implementation.
-     *
-     * @param parameters <code>X509LDAPCertStoreParameters</code>.
-     * @throws IllegalArgumentException if <code>params</code> is not an instance of
-     *                                  <code>X509LDAPCertStoreParameters</code>.
-     */
-    public void engineInit(X509StoreParameters parameters)
-    {
-        if (!(parameters instanceof X509LDAPCertStoreParameters))
-        {
-            throw new IllegalArgumentException(
-                "Initialization parameters must be an instance of "
-                    + X509LDAPCertStoreParameters.class.getName() + ".");
-        }
-        helper = new LDAPStoreHelper((X509LDAPCertStoreParameters)parameters);
-    }
-
-    /**
-     * Returns a collection of matching cross certificate pairs from the LDAP
-     * location.
-     * <p>
-     * The selector must be a of type <code>X509CertPairStoreSelector</code>.
-     * If it is not an empty collection is returned.
-     * </p>
-     * <p>
-     * The subject should be a reasonable criteria for a selector.
-     * </p>
-     * @param selector The selector to use for finding.
-     * @return A collection with the matches.
-     * @throws StoreException if an exception occurs while searching.
-     */
-    public Collection engineGetMatches(Selector selector) throws StoreException
-    {
-        if (!(selector instanceof X509CertPairStoreSelector))
-        {
-            return Collections.EMPTY_SET;
-        }
-        X509CertPairStoreSelector xselector = (X509CertPairStoreSelector)selector;
-        Set set = new HashSet();
-        set.addAll(helper.getCrossCertificatePairs(xselector));
-        return set;
-    }
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/provider/X509StoreLDAPCerts.java b/bcprov/src/main/java/org/bouncycastle/jce/provider/X509StoreLDAPCerts.java
deleted file mode 100644
index c8463ef..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/provider/X509StoreLDAPCerts.java
+++ /dev/null
@@ -1,128 +0,0 @@
-package org.bouncycastle.jce.provider;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Set;
-
-import org.bouncycastle.jce.X509LDAPCertStoreParameters;
-import org.bouncycastle.util.Selector;
-import org.bouncycastle.util.StoreException;
-import org.bouncycastle.x509.X509CertPairStoreSelector;
-import org.bouncycastle.x509.X509CertStoreSelector;
-import org.bouncycastle.x509.X509CertificatePair;
-import org.bouncycastle.x509.X509StoreParameters;
-import org.bouncycastle.x509.X509StoreSpi;
-import org.bouncycastle.x509.util.LDAPStoreHelper;
-
-/**
- * A SPI implementation of Bouncy Castle <code>X509Store</code> for getting
- * certificates form a LDAP directory.
- *
- * @see org.bouncycastle.x509.X509Store
- */
-public class X509StoreLDAPCerts
-    extends X509StoreSpi
-{
-
-    private LDAPStoreHelper helper;
-
-    public X509StoreLDAPCerts()
-    {
-    }
-
-    /**
-     * Initializes this LDAP cert store implementation.
-     *
-     * @param params <code>X509LDAPCertStoreParameters</code>.
-     * @throws IllegalArgumentException if <code>params</code> is not an instance of
-     *                                  <code>X509LDAPCertStoreParameters</code>.
-     */
-    public void engineInit(X509StoreParameters params)
-    {
-        if (!(params instanceof X509LDAPCertStoreParameters))
-        {
-            throw new IllegalArgumentException(
-                "Initialization parameters must be an instance of "
-                    + X509LDAPCertStoreParameters.class.getName() + ".");
-        }
-        helper = new LDAPStoreHelper((X509LDAPCertStoreParameters)params);
-    }
-
-    /**
-     * Returns a collection of matching certificates from the LDAP location.
-     * <p>
-     * The selector must be a of type <code>X509CertStoreSelector</code>. If
-     * it is not an empty collection is returned.
-     * </p><p>
-     * The implementation searches only for CA certificates, if the method
-     * {@link java.security.cert.X509CertSelector#getBasicConstraints()} is
-     * greater or equal to 0. If it is -2 only end certificates are searched.
-     * </p><p>
-     * The subject and the serial number for end certificates should be
-     * reasonable criterias for a selector.
-     * </p>
-     * @param selector The selector to use for finding.
-     * @return A collection with the matches.
-     * @throws StoreException if an exception occurs while searching.
-     */
-    public Collection engineGetMatches(Selector selector) throws StoreException
-    {
-        if (!(selector instanceof X509CertStoreSelector))
-        {
-            return Collections.EMPTY_SET;
-        }
-        X509CertStoreSelector xselector = (X509CertStoreSelector)selector;
-        Set set = new HashSet();
-        // test if only CA certificates should be selected
-        if (xselector.getBasicConstraints() > 0)
-        {
-            set.addAll(helper.getCACertificates(xselector));
-            set.addAll(getCertificatesFromCrossCertificatePairs(xselector));
-        }
-        // only end certificates should be selected
-        else if (xselector.getBasicConstraints() == -2)
-        {
-            set.addAll(helper.getUserCertificates(xselector));
-        }
-        // nothing specified
-        else
-        {
-            set.addAll(helper.getUserCertificates(xselector));
-            set.addAll(helper.getCACertificates(xselector));
-            set.addAll(getCertificatesFromCrossCertificatePairs(xselector));
-        }
-        return set;
-    }
-
-    private Collection getCertificatesFromCrossCertificatePairs(
-        X509CertStoreSelector xselector) throws StoreException
-    {
-        Set set = new HashSet();
-        X509CertPairStoreSelector ps = new X509CertPairStoreSelector();
-
-        ps.setForwardSelector(xselector);
-        ps.setReverseSelector(new X509CertStoreSelector());
-        
-        Set crossCerts = new HashSet(helper.getCrossCertificatePairs(ps));
-        Set forward = new HashSet();
-        Set reverse = new HashSet();
-        Iterator it = crossCerts.iterator();
-        while (it.hasNext())
-        {
-            X509CertificatePair pair = (X509CertificatePair)it.next();
-            if (pair.getForward() != null)
-            {
-                forward.add(pair.getForward());
-            }
-            if (pair.getReverse() != null)
-            {
-                reverse.add(pair.getReverse());
-            }
-        }
-        set.addAll(forward);
-        set.addAll(reverse);
-        return set;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/AEADTest.java b/bcprov/src/main/java/org/bouncycastle/jce/provider/test/AEADTest.java
deleted file mode 100644
index 7d89515..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/AEADTest.java
+++ /dev/null
@@ -1,355 +0,0 @@
-package org.bouncycastle.jce.provider.test;
-
-import java.io.IOException;
-import java.security.AlgorithmParameters;
-import java.security.InvalidAlgorithmParameterException;
-import java.security.InvalidKeyException;
-import java.security.NoSuchAlgorithmException;
-import java.security.NoSuchProviderException;
-import java.security.SecureRandom;
-import java.security.Security;
-import java.security.spec.InvalidParameterSpecException;
-
-import javax.crypto.BadPaddingException;
-import javax.crypto.Cipher;
-import javax.crypto.IllegalBlockSizeException;
-import javax.crypto.NoSuchPaddingException;
-import javax.crypto.spec.GCMParameterSpec;
-import javax.crypto.spec.IvParameterSpec;
-import javax.crypto.spec.SecretKeySpec;
-
-import org.bouncycastle.asn1.cms.GCMParameters;
-import org.bouncycastle.jcajce.spec.RepeatedSecretKeySpec;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-
-public class AEADTest extends SimpleTest
-{
-
-    // EAX test vector from EAXTest
-    private byte[] K2 = Hex.decode("91945D3F4DCBEE0BF45EF52255F095A4");
-    private byte[] N2 = Hex.decode("BECAF043B0A23D843194BA972C66DEBD");
-    private byte[] A2 = Hex.decode("FA3BFD4806EB53FA");
-    private byte[] P2 = Hex.decode("F7FB");
-    private byte[] C2 = Hex.decode("19DD5C4C9331049D0BDAB0277408F67967E5");
-    // C2 with only 64bit MAC (default for EAX)
-    private byte[] C2_short = Hex.decode("19DD5C4C9331049D0BDA");
-
-    private byte[] KGCM = Hex.decode("00000000000000000000000000000000");
-    private byte[] NGCM = Hex.decode("000000000000000000000000");
-    private byte[] CGCM = Hex.decode("58e2fccefa7e3061367f1d57a4e7455a");
-
-    public String getName()
-    {
-        return "AEAD";
-    }
-
-    public void performTest() throws Exception
-    {
-        boolean aeadAvailable = false;
-        try
-        {
-            this.getClass().getClassLoader().loadClass("javax.crypto.spec.GCMParameterSpec");
-            aeadAvailable = true;
-        }
-        catch (ClassNotFoundException e)
-        {
-        }
-        if (aeadAvailable)
-        {
-            checkCipherWithAD(K2, N2, A2, P2, C2_short);
-            testGCMParameterSpec(K2, N2, A2, P2, C2);
-            testGCMParameterSpecWithRepeatKey(K2, N2, A2, P2, C2);
-            testGCMGeneric(KGCM, NGCM, new byte[0], new byte[0], CGCM);
-            testGCMParameterSpecWithMultipleUpdates(K2, N2, A2, P2, C2);
-        }
-        else
-        {
-            System.err.println("GCM AEADTests disabled due to JDK");
-        }
-        testTampering(aeadAvailable);
-    }
-
-    private void testTampering(boolean aeadAvailable)
-        throws InvalidKeyException,
-        InvalidAlgorithmParameterException,
-        NoSuchAlgorithmException,
-        NoSuchProviderException,
-        NoSuchPaddingException,
-        IllegalBlockSizeException,
-        BadPaddingException
-    {
-        Cipher eax = Cipher.getInstance("AES/EAX/NoPadding", "BC");
-        final SecretKeySpec key = new SecretKeySpec(new byte[eax.getBlockSize()], eax.getAlgorithm());
-        final IvParameterSpec iv = new IvParameterSpec(new byte[eax.getBlockSize()]);
-
-        eax.init(Cipher.ENCRYPT_MODE, key, iv);
-        byte[] ciphertext = eax.doFinal(new byte[100]);
-        ciphertext[0] = (byte)(ciphertext[0] + 1);  // Tamper
-
-        try
-        {
-            eax.init(Cipher.DECRYPT_MODE, key, iv);
-            eax.doFinal(ciphertext);
-            fail("Tampered ciphertext should be invalid");
-        }
-        catch (BadPaddingException e)
-        {
-            if (aeadAvailable)
-            {
-                if (!e.getClass().getName().equals("javax.crypto.AEADBadTagException"))
-                {
-                    fail("Tampered AEAD ciphertext should fail with AEADBadTagException when available.");
-                }
-            }
-        }
-    }
-
-    private void checkCipherWithAD(byte[] K,
-                                   byte[] N,
-                                   byte[] A,
-                                   byte[] P,
-                                   byte[] C) throws InvalidKeyException,
-            NoSuchAlgorithmException, NoSuchPaddingException,
-            IllegalBlockSizeException, BadPaddingException,
-            InvalidAlgorithmParameterException, NoSuchProviderException
-    {
-        Cipher eax = Cipher.getInstance("AES/EAX/NoPadding", "BC");
-        SecretKeySpec key = new SecretKeySpec(K, "AES");
-        IvParameterSpec iv = new IvParameterSpec(N);
-        eax.init(Cipher.ENCRYPT_MODE, key, iv);
-
-        eax.updateAAD(A);
-        byte[] c = eax.doFinal(P);
-
-        if (!areEqual(C, c))
-        {
-            fail("JCE encrypt with additional data failed.");
-        }
-
-        eax.init(Cipher.DECRYPT_MODE, key, iv);
-        eax.updateAAD(A);
-        byte[] p = eax.doFinal(C);
-
-        if (!areEqual(P, p))
-        {
-            fail("JCE decrypt with additional data failed.");
-        }
-    }
-
-    private void testGCMParameterSpec(byte[] K,
-                                      byte[] N,
-                                      byte[] A,
-                                      byte[] P,
-                                      byte[] C)
-        throws InvalidKeyException,
-        NoSuchAlgorithmException, NoSuchPaddingException,
-        IllegalBlockSizeException, BadPaddingException,
-        InvalidAlgorithmParameterException, NoSuchProviderException, IOException
-    {
-        Cipher eax = Cipher.getInstance("AES/EAX/NoPadding", "BC");
-        SecretKeySpec key = new SecretKeySpec(K, "AES");
-
-        // GCMParameterSpec mapped to AEADParameters and overrides default MAC
-        // size
-        GCMParameterSpec spec = new GCMParameterSpec(128, N);
-        eax.init(Cipher.ENCRYPT_MODE, key, spec);
-
-        eax.updateAAD(A);
-        byte[] c = eax.doFinal(P);
-
-        if (!areEqual(C, c))
-        {
-            fail("JCE encrypt with additional data and GCMParameterSpec failed.");
-        }
-
-        eax.init(Cipher.DECRYPT_MODE, key, spec);
-        eax.updateAAD(A);
-        byte[] p = eax.doFinal(C);
-
-        if (!areEqual(P, p))
-        {
-            fail("JCE decrypt with additional data and GCMParameterSpec failed.");
-        }
-
-        AlgorithmParameters algParams = eax.getParameters();
-
-        byte[] encParams = algParams.getEncoded();
-
-        GCMParameters gcmParameters = GCMParameters.getInstance(encParams);
-
-        if (!Arrays.areEqual(spec.getIV(), gcmParameters.getNonce()) || spec.getTLen() != gcmParameters.getIcvLen())
-        {
-            fail("parameters mismatch");
-        }
-    }
-
-    private void testGCMParameterSpecWithMultipleUpdates(byte[] K,
-                                      byte[] N,
-                                      byte[] A,
-                                      byte[] P,
-                                      byte[] C)
-        throws Exception
-    {
-        Cipher eax = Cipher.getInstance("AES/EAX/NoPadding", "BC");
-        SecretKeySpec key = new SecretKeySpec(K, "AES");
-        SecureRandom random = new SecureRandom();
-
-        // GCMParameterSpec mapped to AEADParameters and overrides default MAC
-        // size
-        GCMParameterSpec spec = new GCMParameterSpec(128, N);
-
-        for (int i = 900; i != 1024; i++)
-        {
-            byte[] message = new byte[i];
-
-            random.nextBytes(message);
-
-            eax.init(Cipher.ENCRYPT_MODE, key, spec);
-
-            byte[] out = new byte[eax.getOutputSize(i)];
-
-            int offSet = 0;
-
-            int count;
-            for (count = 0; count < i / 21; count++)
-            {
-                offSet += eax.update(message, count * 21, 21, out, offSet);
-            }
-
-            offSet += eax.doFinal(message, count * 21, i - (count * 21), out, offSet);
-
-            byte[] dec = new byte[i];
-            int    len = offSet;
-
-            eax.init(Cipher.DECRYPT_MODE, key, spec);
-
-            offSet = 0;
-            for (count = 0; count < len / 10; count++)
-            {
-                offSet += eax.update(out, count * 10, 10, dec, offSet);
-            }
-
-            offSet += eax.doFinal(out, count * 10, len - (count * 10), dec, offSet);
-
-            if (!Arrays.areEqual(message, dec) || offSet != message.length)
-            {
-                fail("message mismatch");
-            }
-        }
-    }
-
-
-    private void testGCMParameterSpecWithRepeatKey(byte[] K,
-                                                   byte[] N,
-                                                   byte[] A,
-                                                   byte[] P,
-                                                   byte[] C)
-        throws InvalidKeyException, NoSuchAlgorithmException,
-        NoSuchPaddingException, IllegalBlockSizeException,
-        BadPaddingException, InvalidAlgorithmParameterException, NoSuchProviderException, IOException
-    {
-        Cipher eax = Cipher.getInstance("AES/EAX/NoPadding", "BC");
-        SecretKeySpec key = new SecretKeySpec(K, "AES");
-        GCMParameterSpec spec = new GCMParameterSpec(128, N);
-        eax.init(Cipher.ENCRYPT_MODE, key, spec);
-
-        eax.updateAAD(A);
-        byte[] c = eax.doFinal(P);
-
-        if (!areEqual(C, c))
-        {
-            fail("JCE encrypt with additional data and RepeatedSecretKeySpec failed.");
-        }
-
-        // Check GCMParameterSpec handling knows about RepeatedSecretKeySpec
-        eax.init(Cipher.DECRYPT_MODE, new RepeatedSecretKeySpec("AES"), spec);
-        eax.updateAAD(A);
-        byte[] p = eax.doFinal(C);
-
-        if (!areEqual(P, p))
-        {
-            fail("JCE decrypt with additional data and RepeatedSecretKeySpec failed.");
-        }
-
-        AlgorithmParameters algParams = eax.getParameters();
-
-        byte[] encParams = algParams.getEncoded();
-
-        GCMParameters gcmParameters = GCMParameters.getInstance(encParams);
-
-        if (!Arrays.areEqual(spec.getIV(), gcmParameters.getNonce()) || spec.getTLen() != gcmParameters.getIcvLen())
-        {
-            fail("parameters mismatch");
-        }
-    }
-
-    private void testGCMGeneric(byte[] K,
-                                      byte[] N,
-                                      byte[] A,
-                                      byte[] P,
-                                      byte[] C)
-        throws InvalidKeyException,
-        NoSuchAlgorithmException, NoSuchPaddingException,
-        IllegalBlockSizeException, BadPaddingException,
-        InvalidAlgorithmParameterException, NoSuchProviderException, IOException, InvalidParameterSpecException
-    {
-        Cipher eax = Cipher.getInstance("AES/GCM/NoPadding", "BC");
-        SecretKeySpec key = new SecretKeySpec(K, "AES");
-
-        // GCMParameterSpec mapped to AEADParameters and overrides default MAC
-        // size
-        GCMParameterSpec spec = new GCMParameterSpec(128, N);
-        eax.init(Cipher.ENCRYPT_MODE, key, spec);
-
-        eax.updateAAD(A);
-        byte[] c = eax.doFinal(P);
-
-        if (!areEqual(C, c))
-        {
-            fail("JCE encrypt with additional data and GCMParameterSpec failed.");
-        }
-
-        eax = Cipher.getInstance("GCM", "BC");
-        eax.init(Cipher.DECRYPT_MODE, key, spec);
-        eax.updateAAD(A);
-        byte[] p = eax.doFinal(C);
-
-        if (!areEqual(P, p))
-        {
-            fail("JCE decrypt with additional data and GCMParameterSpec failed.");
-        }
-
-        AlgorithmParameters algParams = eax.getParameters();
-
-        byte[] encParams = algParams.getEncoded();
-
-        GCMParameters gcmParameters = GCMParameters.getInstance(encParams);
-
-        if (!Arrays.areEqual(spec.getIV(), gcmParameters.getNonce()) || spec.getTLen() != gcmParameters.getIcvLen())
-        {
-            fail("parameters mismatch");
-        }
-
-        GCMParameterSpec gcmSpec = algParams.getParameterSpec(GCMParameterSpec.class);
-
-        if (!Arrays.areEqual(gcmSpec.getIV(), gcmParameters.getNonce()) || gcmSpec.getTLen() != gcmParameters.getIcvLen() * 8)
-        {
-            fail("spec parameters mismatch");
-        }
-
-        if (!Arrays.areEqual(eax.getIV(), gcmParameters.getNonce()))
-        {
-            fail("iv mismatch");
-        }
-    }
-
-    public static void main(String[] args) throws Exception
-    {
-        Security.addProvider(new BouncyCastleProvider());
-
-        runTest(new AEADTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/AESSICTest.java b/bcprov/src/main/java/org/bouncycastle/jce/provider/test/AESSICTest.java
deleted file mode 100644
index ae6d7bc..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/AESSICTest.java
+++ /dev/null
@@ -1,168 +0,0 @@
-package org.bouncycastle.jce.provider.test;
-
-import java.security.Key;
-import java.security.Security;
-
-import javax.crypto.Cipher;
-import javax.crypto.spec.IvParameterSpec;
-import javax.crypto.spec.SecretKeySpec;
-
-import org.bouncycastle.jcajce.spec.RepeatedSecretKeySpec;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-
-/**
- * test vectors based on NIST Special Publication 800-38A,
- * "Recommendation for Block Cipher Modes of Operation"
- */
-public class AESSICTest
-    extends SimpleTest
-{
-    private byte[][]    keys =
-                        {
-                            Hex.decode("2b7e151628aed2a6abf7158809cf4f3c"),
-                            Hex.decode("8e73b0f7da0e6452c810f32b809079e562f8ead2522c6b7b"),
-                            Hex.decode("603deb1015ca71be2b73aef0857d77811f352c073b6108d72d9810a30914dff4")
-                        };
-
-    private byte[][]    plain =
-                        {
-                            Hex.decode("6bc1bee22e409f96e93d7e117393172a"),
-                            Hex.decode("ae2d8a571e03ac9c9eb76fac45af8e51"),
-                            Hex.decode("30c81c46a35ce411e5fbc1191a0a52ef"),
-                            Hex.decode("f69f2445df4f9b17ad2b417be66c3710")
-                        };
-
-    private byte[][][]  cipher =
-                        {
-                            {
-                                Hex.decode("874d6191b620e3261bef6864990db6ce"),
-                                Hex.decode("9806f66b7970fdff8617187bb9fffdff"),
-                                Hex.decode("5ae4df3edbd5d35e5b4f09020db03eab"),
-                                Hex.decode("1e031dda2fbe03d1792170a0f3009cee")
-                            },
-                            {
-                                Hex.decode("1abc932417521ca24f2b0459fe7e6e0b"),
-                                Hex.decode("090339ec0aa6faefd5ccc2c6f4ce8e94"),
-                                Hex.decode("1e36b26bd1ebc670d1bd1d665620abf7"),
-                                Hex.decode("4f78a7f6d29809585a97daec58c6b050")
-                            },
-                            {
-                                Hex.decode("601ec313775789a5b7a7f504bbf3d228"),
-                                Hex.decode("f443e3ca4d62b59aca84e990cacaf5c5"),
-                                Hex.decode("2b0930daa23de94ce87017ba2d84988d"),
-                                Hex.decode("dfc9c58db67aada613c2dd08457941a6")
-                            }
-                        };
-
-    public String getName()
-    {
-        return "AESSIC";
-    }
-
-    public void performTest()
-        throws Exception
-    {
-        Cipher c = Cipher.getInstance("AES/SIC/NoPadding", "BC");
-
-        //
-        // NIST vectors
-        //
-        for (int i = 0; i != keys.length; i++)
-        {
-            Key sk = new SecretKeySpec(keys[i], "AES");
-            c.init(
-                Cipher.ENCRYPT_MODE, sk,
-            new IvParameterSpec(Hex.decode("F0F1F2F3F4F5F6F7F8F9FAFBFCFDFEFF")));
-
-            for (int j = 0; j != plain.length; j++)
-            {
-                byte[] crypt = c.update(plain[j]);
-                if (!areEqual(crypt, cipher[i][j]))
-                {
-                    fail("AESSIC encrypt failed: key " + i + " block " + j);
-                }
-            }
-
-            c.init(
-                Cipher.DECRYPT_MODE, sk,
-            new IvParameterSpec(Hex.decode("F0F1F2F3F4F5F6F7F8F9FAFBFCFDFEFF")));
-
-            for (int j = 0; j != plain.length; j++)
-            {
-                byte[] crypt = c.update(cipher[i][j]);
-                if (!areEqual(crypt, plain[j]))
-                {
-                    fail("AESSIC decrypt failed: key " + i + " block " + j);
-                }
-            }
-        }
-
-        //
-        // check CTR also recognised.
-        //
-        c = Cipher.getInstance("AES/CTR/NoPadding", "BC");
-
-        Key sk = new SecretKeySpec(Hex.decode("2B7E151628AED2A6ABF7158809CF4F3C"), "AES");
-
-        c.init(
-            Cipher.ENCRYPT_MODE, sk,
-            new IvParameterSpec(Hex.decode("F0F1F2F3F4F5F6F7F8F9FAFBFCFD0001")));
-
-        byte[] crypt = c.doFinal(Hex.decode("00000000000000000000000000000000"));
-
-        if (!areEqual(crypt, Hex.decode("D23513162B02D0F72A43A2FE4A5F97AB")))
-        {
-            fail("AESSIC failed test 2");
-        }
-        
-        //
-        // check partial block processing
-        //
-        c = Cipher.getInstance("AES/CTR/NoPadding", "BC");
-
-        sk = new SecretKeySpec(Hex.decode("2B7E151628AED2A6ABF7158809CF4F3C"), "AES");
-
-        c.init(
-            Cipher.ENCRYPT_MODE, sk,
-            new IvParameterSpec(Hex.decode("F0F1F2F3F4F5F6F7F8F9FAFBFCFD0001")));
-
-        crypt = c.doFinal(Hex.decode("12345678"));
-
-        c.init(
-                Cipher.DECRYPT_MODE, sk,
-                new IvParameterSpec(Hex.decode("F0F1F2F3F4F5F6F7F8F9FAFBFCFD0001")));
-        
-        crypt = c.doFinal(crypt);
-        
-        if (!areEqual(crypt, Hex.decode("12345678")))
-        {
-            fail("AESSIC failed partial test");
-        }
-
-        // null key test
-        sk = new RepeatedSecretKeySpec("AES");
-
-        c.init(
-                Cipher.ENCRYPT_MODE, sk,
-        new IvParameterSpec(Hex.decode("F0F1F2F3F4F5F6F7F8F9FAFBFCFDFEFF")));
-
-        for (int j = 0; j != plain.length; j++)
-        {
-            crypt = c.update(plain[j]);
-            if (!areEqual(crypt, cipher[0][j]))
-            {
-                fail("AESSIC encrypt failed: key " + 0 + " block " + j);
-            }
-        }
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        Security.addProvider(new BouncyCastleProvider());
-
-        runTest(new AESSICTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/AESTest.java b/bcprov/src/main/java/org/bouncycastle/jce/provider/test/AESTest.java
deleted file mode 100644
index 72a8a34..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/AESTest.java
+++ /dev/null
@@ -1,423 +0,0 @@
-package org.bouncycastle.jce.provider.test;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.DataInputStream;
-import java.io.IOException;
-import java.security.Key;
-import java.security.Security;
-
-import javax.crypto.Cipher;
-import javax.crypto.CipherInputStream;
-import javax.crypto.CipherOutputStream;
-import javax.crypto.NoSuchPaddingException;
-import javax.crypto.spec.IvParameterSpec;
-import javax.crypto.spec.SecretKeySpec;
-
-import org.bouncycastle.asn1.nist.NISTObjectIdentifiers;
-import org.bouncycastle.crypto.prng.FixedSecureRandom;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.util.encoders.Hex;
-
-/**
- * basic test class for the AES cipher vectors from FIPS-197
- */
-public class AESTest
-    extends BaseBlockCipherTest
-{
-    static String[] cipherTests =
-    {
-        "128",
-        "000102030405060708090a0b0c0d0e0f",
-        "00112233445566778899aabbccddeeff",
-        "69c4e0d86a7b0430d8cdb78070b4c55a",
-        "192",
-        "000102030405060708090a0b0c0d0e0f1011121314151617",
-        "00112233445566778899aabbccddeeff",
-        "dda97ca4864cdfe06eaf70a0ec0d7191",
-        "256",
-        "000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f",
-        "00112233445566778899aabbccddeeff",
-        "8ea2b7ca516745bfeafc49904b496089",
-    };
-
-    public AESTest()
-    {
-        super("AES");
-    }
-
-    private void test(
-        int         strength,
-        byte[]      keyBytes,
-        byte[]      input,
-        byte[]      output)
-        throws Exception
-    {
-        Key                     key;
-        Cipher                  in, out;
-        CipherInputStream       cIn;
-        CipherOutputStream      cOut;
-        ByteArrayInputStream    bIn;
-        ByteArrayOutputStream   bOut;
-
-        key = new SecretKeySpec(keyBytes, "AES");
-
-        in = Cipher.getInstance("AES/ECB/NoPadding", "BC");
-        out = Cipher.getInstance("AES/ECB/NoPadding", "BC");
-        
-        try
-        {
-            out.init(Cipher.ENCRYPT_MODE, key);
-        }
-        catch (Exception e)
-        {
-            fail("AES failed initialisation - " + e.toString(), e);
-        }
-
-        try
-        {
-            in.init(Cipher.DECRYPT_MODE, key);
-        }
-        catch (Exception e)
-        {
-            fail("AES failed initialisation - " + e.toString(), e);
-        }
-
-        //
-        // encryption pass
-        //
-        bOut = new ByteArrayOutputStream();
-
-        cOut = new CipherOutputStream(bOut, out);
-
-        try
-        {
-            for (int i = 0; i != input.length / 2; i++)
-            {
-                cOut.write(input[i]);
-            }
-            cOut.write(input, input.length / 2, input.length - input.length / 2);
-            cOut.close();
-        }
-        catch (IOException e)
-        {
-            fail("AES failed encryption - " + e.toString(), e);
-        }
-
-        byte[]    bytes;
-
-        bytes = bOut.toByteArray();
-
-        if (!areEqual(bytes, output))
-        {
-            fail("AES failed encryption - expected " + new String(Hex.encode(output)) + " got " + new String(Hex.encode(bytes)));
-        }
-
-        //
-        // decryption pass
-        //
-        bIn = new ByteArrayInputStream(bytes);
-
-        cIn = new CipherInputStream(bIn, in);
-
-        try
-        {
-            DataInputStream dIn = new DataInputStream(cIn);
-
-            bytes = new byte[input.length];
-
-            for (int i = 0; i != input.length / 2; i++)
-            {
-                bytes[i] = (byte)dIn.read();
-            }
-            dIn.readFully(bytes, input.length / 2, bytes.length - input.length / 2);
-        }
-        catch (Exception e)
-        {
-            fail("AES failed encryption - " + e.toString(), e);
-        }
-
-        if (!areEqual(bytes, input))
-        {
-            fail("AES failed decryption - expected " + new String(Hex.encode(input)) + " got " + new String(Hex.encode(bytes)));
-        }
-    }
-
-    private void eaxTest()
-        throws Exception
-    {
-        byte[] K = Hex.decode("233952DEE4D5ED5F9B9C6D6FF80FF478");
-        byte[] N = Hex.decode("62EC67F9C3A4A407FCB2A8C49031A8B3");
-        byte[] P = Hex.decode("68656c6c6f20776f726c642121");
-        byte[] C = Hex.decode("2f9f76cb7659c70e4be11670a3e193ae1bc6b5762a");
-
-        Key                     key;
-        Cipher                  in, out;
-
-        key = new SecretKeySpec(K, "AES");
-
-        in = Cipher.getInstance("AES/EAX/NoPadding", "BC");
-        out = Cipher.getInstance("AES/EAX/NoPadding", "BC");
-
-        in.init(Cipher.ENCRYPT_MODE, key, new IvParameterSpec(N));
-
-        byte[] enc = in.doFinal(P);
-        if (!areEqual(enc, C))
-        {
-            fail("ciphertext doesn't match in EAX");
-        }
-
-        out.init(Cipher.DECRYPT_MODE, key, new IvParameterSpec(N));
-
-        byte[] dec = out.doFinal(C);
-        if (!areEqual(dec, P))
-        {
-            fail("plaintext doesn't match in EAX");
-        }
-
-        try
-        {
-            in = Cipher.getInstance("AES/EAX/PKCS5Padding", "BC");
-
-            fail("bad padding missed in EAX");
-        }
-        catch (NoSuchPaddingException e)
-        {
-            // expected
-        }
-    }
-
-    private void ccmTest()
-        throws Exception
-    {
-        byte[] K = Hex.decode("404142434445464748494a4b4c4d4e4f");
-        byte[] N = Hex.decode("10111213141516");
-        byte[] P = Hex.decode("68656c6c6f20776f726c642121");
-        byte[] C = Hex.decode("39264f148b54c456035de0a531c8344f46db12b388");
-
-        Key                     key;
-        Cipher                  in, out;
-
-        key = new SecretKeySpec(K, "AES");
-
-        in = Cipher.getInstance("AES/CCM/NoPadding", "BC");
-        out = Cipher.getInstance("AES/CCM/NoPadding", "BC");
-
-        in.init(Cipher.ENCRYPT_MODE, key, new IvParameterSpec(N));
-
-        byte[] enc = in.doFinal(P);
-        if (!areEqual(enc, C))
-        {
-            fail("ciphertext doesn't match in CCM");
-        }
-
-        out.init(Cipher.DECRYPT_MODE, key, new IvParameterSpec(N));
-
-        byte[] dec = out.doFinal(C);
-        if (!areEqual(dec, P))
-        {
-            fail("plaintext doesn't match in CCM");
-        }
-
-        try
-        {
-            in = Cipher.getInstance("AES/CCM/PKCS5Padding", "BC");
-
-            fail("bad padding missed in CCM");
-        }
-        catch (NoSuchPaddingException e)
-        {
-            // expected
-        }
-    }
-
-    private void gcmTest()
-        throws Exception
-    {
-        // Test Case 15 from McGrew/Viega
-        byte[] K = Hex.decode(
-              "feffe9928665731c6d6a8f9467308308"
-            + "feffe9928665731c6d6a8f9467308308");
-        byte[] P = Hex.decode(
-              "d9313225f88406e5a55909c5aff5269a"
-            + "86a7a9531534f7da2e4c303d8a318a72"
-            + "1c3c0c95956809532fcf0e2449a6b525"
-            + "b16aedf5aa0de657ba637b391aafd255");
-        byte[] N = Hex.decode("cafebabefacedbaddecaf888");
-        String T = "b094dac5d93471bdec1a502270e3cc6c";
-        byte[] C = Hex.decode(
-              "522dc1f099567d07f47f37a32a84427d"
-            + "643a8cdcbfe5c0c97598a2bd2555d1aa"
-            + "8cb08e48590dbb3da7b08b1056828838"
-            + "c5f61e6393ba7a0abcc9f662898015ad"
-            + T);
-
-        Key                     key;
-        Cipher                  in, out;
-
-        key = new SecretKeySpec(K, "AES");
-
-        in = Cipher.getInstance("AES/GCM/NoPadding", "BC");
-        out = Cipher.getInstance("AES/GCM/NoPadding", "BC");
-
-        in.init(Cipher.ENCRYPT_MODE, key, new IvParameterSpec(N));
-
-        byte[] enc = in.doFinal(P);
-        if (!areEqual(enc, C))
-        {
-            fail("ciphertext doesn't match in GCM");
-        }
-
-        out.init(Cipher.DECRYPT_MODE, key, new IvParameterSpec(N));
-
-        byte[] dec = out.doFinal(C);
-        if (!areEqual(dec, P))
-        {
-            fail("plaintext doesn't match in GCM");
-        }
-
-        try
-        {
-            in = Cipher.getInstance("AES/GCM/PKCS5Padding", "BC");
-    
-            fail("bad padding missed in GCM");
-        }
-        catch (NoSuchPaddingException e)
-        {
-            // expected
-        }
-    }
-
-    private void ocbTest()
-        throws Exception
-    {
-        byte[] K = Hex.decode(
-              "000102030405060708090A0B0C0D0E0F");
-        byte[] P = Hex.decode(
-              "000102030405060708090A0B0C0D0E0F");
-        byte[] N = Hex.decode("000102030405060708090A0B");
-        String T = "4CBB3E4BD6B456AF";
-        byte[] C = Hex.decode(
-            "BEA5E8798DBE7110031C144DA0B2612213CC8B747807121A" + T);
-
-        Key                     key;
-        Cipher                  in, out;
-
-        key = new SecretKeySpec(K, "AES");
-
-        in = Cipher.getInstance("AES/OCB/NoPadding", "BC");
-        out = Cipher.getInstance("AES/OCB/NoPadding", "BC");
-
-        in.init(Cipher.ENCRYPT_MODE, key, new IvParameterSpec(N));
-
-        byte[] enc = in.doFinal(P);
-        if (!areEqual(enc, C))
-        {
-            fail("ciphertext doesn't match in OCB");
-        }
-
-        out.init(Cipher.DECRYPT_MODE, key, new IvParameterSpec(N));
-
-        byte[] dec = out.doFinal(C);
-        if (!areEqual(dec, P))
-        {
-            fail("plaintext doesn't match in OCB");
-        }
-
-        try
-        {
-            in = Cipher.getInstance("AES/OCB/PKCS5Padding", "BC");
-
-            fail("bad padding missed in OCB");
-        }
-        catch (NoSuchPaddingException e)
-        {
-            // expected
-        }
-    }
-
-    public void performTest()
-        throws Exception
-    {
-        for (int i = 0; i != cipherTests.length; i += 4)
-        {
-            test(Integer.parseInt(cipherTests[i]), 
-                            Hex.decode(cipherTests[i + 1]),
-                            Hex.decode(cipherTests[i + 2]),
-                            Hex.decode(cipherTests[i + 3]));
-        }
-
-        byte[]  kek1 = Hex.decode("000102030405060708090a0b0c0d0e0f");
-        byte[]  in1 = Hex.decode("00112233445566778899aabbccddeeff");
-        byte[]  out1 = Hex.decode("1fa68b0a8112b447aef34bd8fb5a7b829d3e862371d2cfe5");
-        
-        wrapTest(1, "AESWrap", kek1, in1, out1);
-
-        byte[]  kek2 = Hex.decode("000102030405060708090a0b0c0d0e0f");
-        byte[]  in2 = Hex.decode("00112233445566778899aabbccddeeff");
-        byte[]  out2 = Hex.decode("7c8798dfc802553b3f00bb4315e3a087322725c92398b9c112c74d0925c63b61");
-        String  rndData = "68d38e9635962288d4daa1df203e3e2a15adb2f1da8998b72ac24ab1c78cceac";
-
-        wrapTest(2, "AESRFC3211WRAP", kek2,  kek2, new FixedSecureRandom(Hex.decode(rndData + rndData)), in2, out2);
-
-        byte[] kek3 = Hex.decode("5840df6e29b02af1ab493b705bf16ea1ae8338f4dcc176a8");
-        byte[] in3 = Hex.decode("c37b7e6492584340bed12207808941155068f738");
-        byte[] out3 = Hex.decode("138bdeaa9b8fa7fc61f97742e72248ee5ae6ae5360d1ae6a5f54f373fa543b6a");
-
-        wrapTest(3, "AESRFC5649WRAP", kek3, in3, out3);
-
-        String[] oids = {
-                NISTObjectIdentifiers.id_aes128_ECB.getId(),
-                NISTObjectIdentifiers.id_aes128_CBC.getId(),
-                NISTObjectIdentifiers.id_aes128_OFB.getId(),
-                NISTObjectIdentifiers.id_aes128_CFB.getId(),
-                NISTObjectIdentifiers.id_aes192_ECB.getId(),
-                NISTObjectIdentifiers.id_aes192_CBC.getId(),
-                NISTObjectIdentifiers.id_aes192_OFB.getId(),
-                NISTObjectIdentifiers.id_aes192_CFB.getId(),
-                NISTObjectIdentifiers.id_aes256_ECB.getId(),
-                NISTObjectIdentifiers.id_aes256_CBC.getId(),
-                NISTObjectIdentifiers.id_aes256_OFB.getId(),
-                NISTObjectIdentifiers.id_aes256_CFB.getId()
-        };
-
-        String[] names = {
-                "AES/ECB/PKCS7Padding",
-                "AES/CBC/PKCS7Padding",
-                "AES/OFB/NoPadding",
-                "AES/CFB/NoPadding",
-                "AES/ECB/PKCS7Padding",
-                "AES/CBC/PKCS7Padding",
-                "AES/OFB/NoPadding",
-                "AES/CFB/NoPadding",
-                "AES/ECB/PKCS7Padding",
-                "AES/CBC/PKCS7Padding",
-                "AES/OFB/NoPadding",
-                "AES/CFB/NoPadding"
-        };
-
-        oidTest(oids, names, 4);
-
-
-        String[] wrapOids = {
-                NISTObjectIdentifiers.id_aes128_wrap.getId(),
-                NISTObjectIdentifiers.id_aes192_wrap.getId(),
-                NISTObjectIdentifiers.id_aes256_wrap.getId()
-        };
-
-        wrapOidTest(wrapOids, "AESWrap");
-
-        eaxTest();
-        ccmTest();
-        gcmTest();
-        ocbTest();
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        Security.addProvider(new BouncyCastleProvider());
-
-        runTest(new AESTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/AlgorithmParametersTest.java b/bcprov/src/main/java/org/bouncycastle/jce/provider/test/AlgorithmParametersTest.java
deleted file mode 100644
index 72f3885..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/AlgorithmParametersTest.java
+++ /dev/null
@@ -1,110 +0,0 @@
-package org.bouncycastle.jce.provider.test;
-
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.util.encoders.Base64;
-import org.bouncycastle.util.test.SimpleTest;
-
-import java.io.IOException;
-import java.security.AlgorithmParameters;
-import java.security.Security;
-import java.security.spec.AlgorithmParameterSpec;
-import java.security.spec.DSAParameterSpec;
-import java.security.spec.InvalidParameterSpecException;
-
-public class AlgorithmParametersTest
-    extends SimpleTest
-{
-    private byte[] dsaParams = Base64.decode(
-        "MIGcAkEAjfKklEkidqo9JXWbsGhpy+rA2Dr7jQz3y7gyTw14guXQdi/FtyEOr8Lprawyq3qsSWk9+/g3J"
-      + "MLsBzbuMcgCkQIVAMdzIYxzfsjumTtPLe0w9I7azpFfAkBP3Z9K7oNeZMXEXYpqvrMUgVdFjq4lnWJoV8"
-      + "Rwe+TERStHTkqSO7sp0lq7EEggVMcuXtarKNsxaJ+qyYv/n1t6");
-
-    private void basicTest(String algorithm, Class algorithmParameterSpec, byte[] asn1Encoded)
-        throws Exception
-    {
-        AlgorithmParameters alg = AlgorithmParameters.getInstance(algorithm, "BC");
-
-        alg.init(asn1Encoded);
-
-        try
-        {
-            alg.init(asn1Encoded);
-            fail("encoded re-initialization not detected");
-        }
-        catch (IOException e)
-        {
-            // expected already initialized
-        }
-
-        AlgorithmParameterSpec spec = alg.getParameterSpec(algorithmParameterSpec);
-
-        try
-        {
-            alg.init(spec);
-            fail("spec re-initialization not detected");
-        }
-        catch (InvalidParameterSpecException e)
-        {
-            // expected already initialized
-        }
-
-        try
-        {
-            spec = alg.getParameterSpec(AlgorithmParameterSpec.class);
-            fail("wrong spec not detected");
-        }
-        catch (InvalidParameterSpecException e)
-        {
-            // expected unknown object
-        }
-
-        try
-        {
-            spec = alg.getParameterSpec(null);
-            fail("null spec not detected");
-        }
-        catch (NullPointerException e)
-        {
-            // expected unknown object
-        }
-
-        alg = AlgorithmParameters.getInstance(algorithm, "BC");
-
-        alg.init(asn1Encoded, "ASN.1");
-
-        alg = AlgorithmParameters.getInstance(algorithm, "BC");
-
-        alg.init(asn1Encoded, null);
-
-        alg = AlgorithmParameters.getInstance(algorithm, "BC");
-
-        try
-        {
-            alg.init(asn1Encoded, "FRED");
-            fail("unknown spec not detected");
-        }
-        catch (IOException e)
-        {
-            // expected already initialized
-        }
-    }
-
-    public void performTest()
-        throws Exception
-    {
-        basicTest("DSA", DSAParameterSpec.class, dsaParams);
-    }
-
-    public String getName()
-    {
-        return "AlgorithmParameters";
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        Security.addProvider(new BouncyCastleProvider());
-
-        runTest(new AlgorithmParametersTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/AllTests.java b/bcprov/src/main/java/org/bouncycastle/jce/provider/test/AllTests.java
deleted file mode 100644
index 3476745..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/AllTests.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package org.bouncycastle.jce.provider.test;
-
-import java.security.Security;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.jce.provider.test.rsa3.RSA3CertTest;
-import org.bouncycastle.util.test.SimpleTestResult;
-
-public class AllTests
-    extends TestCase
-{
-    public void testJCE()
-    {   
-        org.bouncycastle.util.test.Test[] tests = RegressionTest.tests;
-        
-        for (int i = 0; i != tests.length; i++)
-        {
-            SimpleTestResult  result = (SimpleTestResult)tests[i].perform();
-            
-            if (!result.isSuccessful())
-            {
-                if (result.getException() != null)
-                {
-                    result.getException().printStackTrace();
-                }
-                fail(result.toString());
-            }
-        }
-    }
-    
-    public static void main (String[] args)
-    {
-        junit.textui.TestRunner.run(suite());
-    }
-    
-    public static Test suite()
-    {
-        TestSuite suite = new TestSuite("JCE Tests");
-        
-        if (Security.getProvider("BC") == null)
-        {
-            Security.addProvider(new BouncyCastleProvider());  
-        }
-        
-        suite.addTestSuite(RSA3CertTest.class);
-        suite.addTestSuite(AllTests.class);
-        
-        return suite;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/AttrCertData.java b/bcprov/src/main/java/org/bouncycastle/jce/provider/test/AttrCertData.java
deleted file mode 100644
index 3e49657..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/AttrCertData.java
+++ /dev/null
@@ -1,119 +0,0 @@
-package org.bouncycastle.jce.provider.test;
-
-import java.math.BigInteger;
-import java.security.spec.RSAPrivateCrtKeySpec;
-
-import org.bouncycastle.util.encoders.Base64;
-
-public class AttrCertData
-{
-    private static final RSAPrivateCrtKeySpec RSA_PRIVATE_KEY_SPEC = new RSAPrivateCrtKeySpec(
-                new BigInteger("b4a7e46170574f16a97082b22be58b6a2a629798419be12872a4bdba626cfae9900f76abfb12139dce5de56564fab2b6543165a040c606887420e33d91ed7ed7", 16),
-                new BigInteger("11", 16),
-                new BigInteger("9f66f6b05410cd503b2709e88115d55daced94d1a34d4e32bf824d0dde6028ae79c5f07b580f5dce240d7111f7ddb130a7945cd7d957d1920994da389f490c89", 16),
-                new BigInteger("c0a0758cdf14256f78d4708c86becdead1b50ad4ad6c5c703e2168fbf37884cb", 16),
-                new BigInteger("f01734d7960ea60070f1b06f2bb81bfac48ff192ae18451d5e56c734a5aab8a5", 16),
-                new BigInteger("b54bb9edff22051d9ee60f9351a48591b6500a319429c069a3e335a1d6171391", 16),
-                new BigInteger("d3d83daf2a0cecd3367ae6f8ae1aeb82e9ac2f816c6fc483533d8297dd7884cd", 16),
-                new BigInteger("b8f52fc6f38593dabb661d3f50f8897f8106eee68b1bce78a95b132b4e5b5d19", 16));
-
-    public static byte[]  attrCert = Base64.decode(
-            "MIIHQDCCBqkCAQEwgZChgY2kgYowgYcxHDAaBgkqhkiG9w0BCQEWDW1sb3JjaEB2"
-          + "dC5lZHUxHjAcBgNVBAMTFU1hcmt1cyBMb3JjaCAobWxvcmNoKTEbMBkGA1UECxMS"
-          + "VmlyZ2luaWEgVGVjaCBVc2VyMRAwDgYDVQQLEwdDbGFzcyAyMQswCQYDVQQKEwJ2"
-          + "dDELMAkGA1UEBhMCVVMwgYmkgYYwgYMxGzAZBgkqhkiG9w0BCQEWDHNzaGFoQHZ0"
-          + "LmVkdTEbMBkGA1UEAxMSU3VtaXQgU2hhaCAoc3NoYWgpMRswGQYDVQQLExJWaXJn"
-          + "aW5pYSBUZWNoIFVzZXIxEDAOBgNVBAsTB0NsYXNzIDExCzAJBgNVBAoTAnZ0MQsw"
-          + "CQYDVQQGEwJVUzANBgkqhkiG9w0BAQQFAAIBBTAiGA8yMDAzMDcxODE2MDgwMloY"
-          + "DzIwMDMwNzI1MTYwODAyWjCCBU0wggVJBgorBgEEAbRoCAEBMYIFORaCBTU8UnVs"
-          + "ZSBSdWxlSWQ9IkZpbGUtUHJpdmlsZWdlLVJ1bGUiIEVmZmVjdD0iUGVybWl0Ij4K"
-          + "IDxUYXJnZXQ+CiAgPFN1YmplY3RzPgogICA8U3ViamVjdD4KICAgIDxTdWJqZWN0"
-          + "TWF0Y2ggTWF0Y2hJZD0idXJuOm9hc2lzOm5hbWVzOnRjOnhhY21sOjEuMDpmdW5j"
-          + "dGlvbjpzdHJpbmctZXF1YWwiPgogICAgIDxBdHRyaWJ1dGVWYWx1ZSBEYXRhVHlw"
-          + "ZT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS9YTUxTY2hlbWEjc3RyaW5nIj4KICAg"
-          + "ICAgIENOPU1hcmt1cyBMb3JjaDwvQXR0cmlidXRlVmFsdWU+CiAgICAgPFN1Ympl"
-          + "Y3RBdHRyaWJ1dGVEZXNpZ25hdG9yIEF0dHJpYnV0ZUlkPSJ1cm46b2FzaXM6bmFt"
-          + "ZXM6dGM6eGFjbWw6MS4wOnN1YmplY3Q6c3ViamVjdC1pZCIgRGF0YVR5cGU9Imh0"
-          + "dHA6Ly93d3cudzMub3JnLzIwMDEvWE1MU2NoZW1hI3N0cmluZyIgLz4gCiAgICA8"
-          + "L1N1YmplY3RNYXRjaD4KICAgPC9TdWJqZWN0PgogIDwvU3ViamVjdHM+CiAgPFJl"
-          + "c291cmNlcz4KICAgPFJlc291cmNlPgogICAgPFJlc291cmNlTWF0Y2ggTWF0Y2hJ"
-          + "ZD0idXJuOm9hc2lzOm5hbWVzOnRjOnhhY21sOjEuMDpmdW5jdGlvbjpzdHJpbmct"
-          + "ZXF1YWwiPgogICAgIDxBdHRyaWJ1dGVWYWx1ZSBEYXRhVHlwZT0iaHR0cDovL3d3"
-          + "dy53My5vcmcvMjAwMS9YTUxTY2hlbWEjYW55VVJJIj4KICAgICAgaHR0cDovL3p1"
-          + "bmkuY3MudnQuZWR1PC9BdHRyaWJ1dGVWYWx1ZT4KICAgICA8UmVzb3VyY2VBdHRy"
-          + "aWJ1dGVEZXNpZ25hdG9yIEF0dHJpYnV0ZUlkPSJ1cm46b2FzaXM6bmFtZXM6dGM6"
-          + "eGFjbWw6MS4wOnJlc291cmNlOnJlc291cmNlLWlkIiBEYXRhVHlwZT0iaHR0cDov"
-          + "L3d3dy53My5vcmcvMjAwMS9YTUxTY2hlbWEjYW55VVJJIiAvPiAKICAgIDwvUmVz"
-          + "b3VyY2VNYXRjaD4KICAgPC9SZXNvdXJjZT4KICA8L1Jlc291cmNlcz4KICA8QWN0"
-          + "aW9ucz4KICAgPEFjdGlvbj4KICAgIDxBY3Rpb25NYXRjaCBNYXRjaElkPSJ1cm46"
-          + "b2FzaXM6bmFtZXM6dGM6eGFjbWw6MS4wOmZ1bmN0aW9uOnN0cmluZy1lcXVhbCI+"
-          + "CiAgICAgPEF0dHJpYnV0ZVZhbHVlIERhdGFUeXBlPSJodHRwOi8vd3d3LnczLm9y"
-          + "Zy8yMDAxL1hNTFNjaGVtYSNzdHJpbmciPgpEZWxlZ2F0ZSBBY2Nlc3MgICAgIDwv"
-          + "QXR0cmlidXRlVmFsdWU+CgkgIDxBY3Rpb25BdHRyaWJ1dGVEZXNpZ25hdG9yIEF0"
-          + "dHJpYnV0ZUlkPSJ1cm46b2FzaXM6bmFtZXM6dGM6eGFjbWw6MS4wOmFjdGlvbjph"
-          + "Y3Rpb24taWQiIERhdGFUeXBlPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxL1hNTFNj"
-          + "aGVtYSNzdHJpbmciIC8+IAogICAgPC9BY3Rpb25NYXRjaD4KICAgPC9BY3Rpb24+"
-          + "CiAgPC9BY3Rpb25zPgogPC9UYXJnZXQ+CjwvUnVsZT4KMA0GCSqGSIb3DQEBBAUA"
-          + "A4GBAGiJSM48XsY90HlYxGmGVSmNR6ZW2As+bot3KAfiCIkUIOAqhcphBS23egTr"
-          + "6asYwy151HshbPNYz+Cgeqs45KkVzh7bL/0e1r8sDVIaaGIkjHK3CqBABnfSayr3"
-          + "Rd1yBoDdEv8Qb+3eEPH6ab9021AsLEnJ6LWTmybbOpMNZ3tv");
-
-    byte[]  signCert = Base64.decode(
-            "MIIGjTCCBXWgAwIBAgICAPswDQYJKoZIhvcNAQEEBQAwaTEdMBsGCSqGSIb3DQEJ"
-          + "ARYOaXJtaGVscEB2dC5lZHUxLjAsBgNVBAMTJVZpcmdpbmlhIFRlY2ggQ2VydGlm"
-          + "aWNhdGlvbiBBdXRob3JpdHkxCzAJBgNVBAoTAnZ0MQswCQYDVQQGEwJVUzAeFw0w"
-          + "MzAxMzExMzUyMTRaFw0wNDAxMzExMzUyMTRaMIGDMRswGQYJKoZIhvcNAQkBFgxz"
-          + "c2hhaEB2dC5lZHUxGzAZBgNVBAMTElN1bWl0IFNoYWggKHNzaGFoKTEbMBkGA1UE"
-          + "CxMSVmlyZ2luaWEgVGVjaCBVc2VyMRAwDgYDVQQLEwdDbGFzcyAxMQswCQYDVQQK"
-          + "EwJ2dDELMAkGA1UEBhMCVVMwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAPDc"
-          + "scgSKmsEp0VegFkuitD5j5PUkDuzLjlfaYONt2SN8WeqU4j2qtlCnsipa128cyKS"
-          + "JzYe9duUdNxquh5BPIkMkHBw4jHoQA33tk0J/sydWdN74/AHPpPieK5GHwhU7GTG"
-          + "rCCS1PJRxjXqse79ExAlul+gjQwHeldAC+d4A6oZAgMBAAGjggOmMIIDojAMBgNV"
-          + "HRMBAf8EAjAAMBEGCWCGSAGG+EIBAQQEAwIFoDAOBgNVHQ8BAf8EBAMCA/gwHQYD"
-          + "VR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMEMB0GA1UdDgQWBBRUIoWAzlXbzBYE"
-          + "yVTjQFWyMMKo1jCBkwYDVR0jBIGLMIGIgBTgc3Fm+TGqKDhen+oKfbl+xVbj2KFt"
-          + "pGswaTEdMBsGCSqGSIb3DQEJARYOaXJtaGVscEB2dC5lZHUxLjAsBgNVBAMTJVZp"
-          + "cmdpbmlhIFRlY2ggQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkxCzAJBgNVBAoTAnZ0"
-          + "MQswCQYDVQQGEwJVU4IBADCBiwYJYIZIAYb4QgENBH4WfFZpcmdpbmlhIFRlY2gg"
-          + "Q2VydGlmaWNhdGlvbiBBdXRob3JpdHkgZGlnaXRhbCBjZXJ0aWZpY2F0ZXMgYXJl"
-          + "IHN1YmplY3QgdG8gcG9saWNpZXMgbG9jYXRlZCBhdCBodHRwOi8vd3d3LnBraS52"
-          + "dC5lZHUvY2EvY3BzLy4wFwYDVR0RBBAwDoEMc3NoYWhAdnQuZWR1MBkGA1UdEgQS"
-          + "MBCBDmlybWhlbHBAdnQuZWR1MEMGCCsGAQUFBwEBBDcwNTAzBggrBgEFBQcwAoYn"
-          + "aHR0cDovL2JveDE3Ny5jYy52dC5lZHUvY2EvaXNzdWVycy5odG1sMEQGA1UdHwQ9"
-          + "MDswOaA3oDWGM2h0dHA6Ly9ib3gxNzcuY2MudnQuZWR1L2h0ZG9jcy1wdWJsaWMv"
-          + "Y3JsL2NhY3JsLmNybDBUBgNVHSAETTBLMA0GCysGAQQBtGgFAQEBMDoGCysGAQQB"
-          + "tGgFAQEBMCswKQYIKwYBBQUHAgEWHWh0dHA6Ly93d3cucGtpLnZ0LmVkdS9jYS9j"
-          + "cHMvMD8GCWCGSAGG+EIBBAQyFjBodHRwOi8vYm94MTc3LmNjLnZ0LmVkdS9jZ2kt"
-          + "cHVibGljL2NoZWNrX3Jldl9jYT8wPAYJYIZIAYb4QgEDBC8WLWh0dHA6Ly9ib3gx"
-          + "NzcuY2MudnQuZWR1L2NnaS1wdWJsaWMvY2hlY2tfcmV2PzBLBglghkgBhvhCAQcE"
-          + "PhY8aHR0cHM6Ly9ib3gxNzcuY2MudnQuZWR1L35PcGVuQ0E4LjAxMDYzMC9jZ2kt"
-          + "cHVibGljL3JlbmV3YWw/MCwGCWCGSAGG+EIBCAQfFh1odHRwOi8vd3d3LnBraS52"
-          + "dC5lZHUvY2EvY3BzLzANBgkqhkiG9w0BAQQFAAOCAQEAHJ2ls9yjpZVcu5DqiE67"
-          + "r7BfkdMnm7IOj2v8cd4EAlPp6OPBmjwDMwvKRBb/P733kLBqFNWXWKTpT008R0KB"
-          + "8kehbx4h0UPz9vp31zhGv169+5iReQUUQSIwTGNWGLzrT8kPdvxiSAvdAJxcbRBm"
-          + "KzDic5I8PoGe48kSCkPpT1oNmnivmcu5j1SMvlx0IS2BkFMksr0OHiAW1elSnE/N"
-          + "RuX2k73b3FucwVxB3NRo3vgoHPCTnh9r4qItAHdxFlF+pPtbw2oHESKRfMRfOIHz"
-          + "CLQWSIa6Tvg4NIV3RRJ0sbCObesyg08lymalQMdkXwtRn5eGE00SHWwEUjSXP2gR"
-          + "3g==");
-
-    static byte[] certWithBaseCertificateID = Base64.decode(
-            "MIIBqzCCARQCAQEwSKBGMD6kPDA6MQswCQYDVQQGEwJJVDEOMAwGA1UEChMFVU5JVE4xDDAKBgNV"
-          + "BAsTA0RJVDENMAsGA1UEAxMEcm9vdAIEAVMVjqB6MHikdjB0MQswCQYDVQQGEwJBVTEoMCYGA1UE"
-          + "ChMfVGhlIExlZ2lvbiBvZiB0aGUgQm91bmN5IENhc3RsZTEjMCEGA1UECxMaQm91bmN5IFByaW1h"
-          + "cnkgQ2VydGlmaWNhdGUxFjAUBgNVBAMTDUJvdW5jeSBDYXN0bGUwDQYJKoZIhvcNAQEFBQACBQKW"
-          + "RhnHMCIYDzIwMDUxMjEyMTIwMDQyWhgPMjAwNTEyMTkxMjAxMzJaMA8wDQYDVRhIMQaBBGVWSVAw"
-          + "DQYJKoZIhvcNAQEFBQADgYEAUAVin9StDaA+InxtXq/av6rUQLI9p1X6louBcj4kYJnxRvTrHpsr"
-          + "N3+i9Uq/uk5lRdAqmPFvcmSbuE3TRAsjrXON5uFiBBKZ1AouLqcr8nHbwcdwjJ9TyUNO9I4hfpSH"
-          + "UHHXMtBKgp4MOkhhX8xTGyWg3hp23d3GaUeg/IYlXBI=");
-    
-    byte[] holderCertWithBaseCertificateID = Base64.decode(
-            "MIIBwDCCASmgAwIBAgIEAVMVjjANBgkqhkiG9w0BAQUFADA6MQswCQYDVQQGEwJJVDEOMAwGA1UE"
-          + "ChMFVU5JVE4xDDAKBgNVBAsTA0RJVDENMAsGA1UEAxMEcm9vdDAeFw0wNTExMTExMjAxMzJaFw0w"
-          + "NjA2MTYxMjAxMzJaMD4xCzAJBgNVBAYTAklUMQ4wDAYDVQQKEwVVTklUTjEMMAoGA1UECxMDRElU"
-          + "MREwDwYDVQQDEwhMdWNhQm9yejBaMA0GCSqGSIb3DQEBAQUAA0kAMEYCQQC0p+RhcFdPFqlwgrIr"
-          + "5YtqKmKXmEGb4ShypL26Ymz66ZAPdqv7EhOdzl3lZWT6srZUMWWgQMYGiHQg4z2R7X7XAgERoxUw"
-          + "EzARBglghkgBhvhCAQEEBAMCBDAwDQYJKoZIhvcNAQEFBQADgYEAsX50VPQQCWmHvPq9y9DeCpmS"
-          + "4szcpFAhpZyn6gYRwY9CRZVtmZKH8713XhkGDWcIEMcG0u3oTz3tdKgPU5uyIPrDEWr6w8ClUj4x"
-          + "5aVz5c2223+dVY7KES//JSB2bE/KCIchN3kAioQ4K8O3e0OL6oDVjsqKGw5bfahgKuSIk/Q=");
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/BaseBlockCipherTest.java b/bcprov/src/main/java/org/bouncycastle/jce/provider/test/BaseBlockCipherTest.java
deleted file mode 100644
index 379bd44..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/BaseBlockCipherTest.java
+++ /dev/null
@@ -1,172 +0,0 @@
-package org.bouncycastle.jce.provider.test;
-
-import java.security.Key;
-import java.security.SecureRandom;
-
-import javax.crypto.Cipher;
-import javax.crypto.KeyGenerator;
-import javax.crypto.SecretKey;
-import javax.crypto.spec.IvParameterSpec;
-import javax.crypto.spec.SecretKeySpec;
-
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-import org.bouncycastle.util.test.TestFailedException;
-
-public abstract class BaseBlockCipherTest
-    extends SimpleTest
-{
-    String algorithm;
-
-    BaseBlockCipherTest(
-        String algorithm)
-    {
-        this.algorithm = algorithm;
-    }
-
-    public String getName()
-    {
-        return algorithm;
-    }
-
-    protected void oidTest(String[] oids, String[] names, int groupSize)
-        throws Exception
-    {
-        byte[] data = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16};
-        IvParameterSpec ivSpec = new IvParameterSpec(new byte[16]);
-
-        for (int i = 0; i != oids.length; i++)
-        {
-            Cipher c1 = Cipher.getInstance(oids[i], "BC");
-            Cipher c2 = Cipher.getInstance(names[i], "BC");
-            KeyGenerator kg = KeyGenerator.getInstance(oids[i], "BC");
-
-            SecretKey k = kg.generateKey();
-
-            if (names[i].indexOf("/ECB/") > 0)
-            {
-                c1.init(Cipher.ENCRYPT_MODE, k);
-                c2.init(Cipher.DECRYPT_MODE, k);
-            }
-            else
-            {
-                c1.init(Cipher.ENCRYPT_MODE, k, ivSpec);
-                c2.init(Cipher.DECRYPT_MODE, k, ivSpec);
-            }
-
-            byte[] result = c2.doFinal(c1.doFinal(data));
-
-            if (!areEqual(data, result))
-            {
-                fail("failed OID test");
-            }
-
-            if (k.getEncoded().length != (16 + ((i / groupSize) * 8)))
-            {
-                fail("failed key length test");
-            }
-        }
-    }
-
-    protected void wrapOidTest(String[] oids, String name)
-        throws Exception
-    {
-        byte[] data = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16};
-
-        for (int i = 0; i != oids.length; i++)
-        {
-            Cipher c1 = Cipher.getInstance(oids[i], "BC");
-            Cipher c2 = Cipher.getInstance(name, "BC");
-            KeyGenerator kg = KeyGenerator.getInstance(oids[i], "BC");
-
-            SecretKey k = kg.generateKey();
-
-            c1.init(Cipher.WRAP_MODE, k);
-            c2.init(Cipher.UNWRAP_MODE, k);
-
-            Key wKey = c2.unwrap(c1.wrap(new SecretKeySpec(data, algorithm)), algorithm, Cipher.SECRET_KEY);
-
-            if (!areEqual(data, wKey.getEncoded()))
-            {
-                fail("failed wrap OID test");
-            }
-
-            if (k.getEncoded().length != (16 + (i * 8)))
-            {
-                fail("failed key length test");
-            }
-        }
-    }
-
-    protected void wrapTest(
-        int     id,
-        String  wrappingAlgorithm,
-        byte[]  kek,
-        byte[]  in,
-        byte[]  out)
-        throws Exception
-    {
-        wrapTest(id, wrappingAlgorithm, kek, null, null, in, out);
-    }
-
-    protected void wrapTest(
-        int     id,
-        String  wrappingAlgorithm,
-        byte[]  kek,
-        byte[] iv,
-        SecureRandom rand,
-        byte[]  in,
-        byte[]  out)
-        throws Exception
-    {
-        Cipher wrapper = Cipher.getInstance(wrappingAlgorithm, "BC");
-
-        if (iv != null)
-        {
-            wrapper.init(Cipher.WRAP_MODE, new SecretKeySpec(kek, algorithm), new IvParameterSpec(iv), rand);
-        }
-        else
-        {
-            wrapper.init(Cipher.WRAP_MODE, new SecretKeySpec(kek, algorithm), rand);
-        }
-
-        try
-        {
-            byte[]  cText = wrapper.wrap(new SecretKeySpec(in, algorithm));
-            if (!areEqual(cText, out))
-            {
-                fail("failed wrap test " + id  + " expected " + new String(Hex.encode(out)) + " got " + new String(Hex.encode(cText)));
-            }
-        }
-        catch (TestFailedException e)
-        {
-            throw e;
-        }
-        catch (Exception e)
-        {
-            fail("failed wrap test exception " + e.toString(), e);
-        }
-
-        if (iv != null)
-        {
-            wrapper.init(Cipher.UNWRAP_MODE, new SecretKeySpec(kek, algorithm), new IvParameterSpec(iv));
-        }
-        else
-        {
-            wrapper.init(Cipher.UNWRAP_MODE, new SecretKeySpec(kek, algorithm));
-        }
-
-        try
-        {
-            Key  pText = wrapper.unwrap(out, algorithm, Cipher.SECRET_KEY);
-            if (!areEqual(pText.getEncoded(), in))
-            {
-                fail("failed unwrap test " + id  + " expected " + new String(Hex.encode(in)) + " got " + new String(Hex.encode(pText.getEncoded())));
-            }
-        }
-        catch (Exception e)
-        {
-            fail("failed unwrap test exception " + e.toString(), e);
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/BlockCipherTest.java b/bcprov/src/main/java/org/bouncycastle/jce/provider/test/BlockCipherTest.java
deleted file mode 100644
index 0c9cf01..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/BlockCipherTest.java
+++ /dev/null
@@ -1,1135 +0,0 @@
-package org.bouncycastle.jce.provider.test;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.DataInputStream;
-import java.io.IOException;
-import java.security.AlgorithmParameters;
-import java.security.InvalidAlgorithmParameterException;
-import java.security.InvalidKeyException;
-import java.security.InvalidParameterException;
-import java.security.Key;
-import java.security.PrivateKey;
-import java.security.PublicKey;
-import java.security.SecureRandom;
-import java.security.Security;
-import java.security.spec.InvalidKeySpecException;
-import java.security.spec.KeySpec;
-
-import javax.crypto.Cipher;
-import javax.crypto.CipherInputStream;
-import javax.crypto.CipherOutputStream;
-import javax.crypto.IllegalBlockSizeException;
-import javax.crypto.KeyGenerator;
-import javax.crypto.SecretKey;
-import javax.crypto.SecretKeyFactory;
-import javax.crypto.ShortBufferException;
-import javax.crypto.spec.DESedeKeySpec;
-import javax.crypto.spec.IvParameterSpec;
-import javax.crypto.spec.RC2ParameterSpec;
-import javax.crypto.spec.RC5ParameterSpec;
-import javax.crypto.spec.SecretKeySpec;
-
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-
-/**
- * basic test class for a block cipher, basically this just exercises the provider, and makes sure we
- * are behaving sensibly, correctness of the implementation is shown in the lightweight test classes.
- */
-public class BlockCipherTest
-    extends SimpleTest
-{
-    static String[] cipherTests1 =
-    {
-        "DES",
-        "466da00648ef0e1f9617b1f002e225251a3248d09172f46b9617b1f002e225250112ecb3da61bc99",
-        "DESede",
-        "2f4bc6b30c893fa549d82c560d61cf3eb088aed020603de249d82c560d61cf3e529e95ecd8e05394",
-        "SKIPJACK",
-        "d4de46d52274dbb029f33b076043f8c40089f906751623de29f33b076043f8c4ac99b90f9396cb04",
-        "Blowfish",
-        "7870ebe7f6a52803eb9396ba6c5198216ce81d76d8d4c74beb9396ba6c5198211212473b05214e9f",
-        "Twofish",
-        "70336d9c9718a8a2ced1b19deed973a3c58af7ea71a69e7efc4df082dca581c0839e31468661bcfc57a14899ceeb0253",
-        "RC2",
-        "eb5b889bbcced12eb6b1a3da6a3d965bba66a5edfdd4c8a6b6b1a3da6a3d965b994a5b859e765797",
-        "RC5",
-        "220053543e3eca3bc9503a091ca67b08372560d8a4fdbee8c9503a091ca67b08a796d53bb8a4b7e0",
-        "RC5-64",
-        "e0b4a526ba3bc5f09199c3b1fe3737fe6d248cde70e565b0feea59ebfda375ae1946c386a48d8d8a74d7b1947ff6a788",
-        "RC6",
-        "44c97b67ca8486067f8b6c5b97632f3049e5e52c1d61fdd527dc3da39616540f19a3db39aac1ffd713795cd886cce0c0",
-        "IDEA",
-        "8c9fd56823ffdc523f6ccf7f614aa6173553e594fc7a21b53f6ccf7f614aa61740c54f7a66e95108",
-        "TEA",
-        "fcf45062104fda7c35712368b56dd4216a6ca998dc297b5435712368b56dd421208027ed2923cd0c",
-        "XTEA",
-        "4b427893d3d6aaded2afafabe25f7b233fb5589faa2b6389d2afafabe25f7b239d12979ac67e1c07",
-        "Camellia",
-        "3a68b4ad145bc2c76010669d68f2826359887afce763a78d9994143266adfaec8ba7ee562a1688ef9dfd7f897e5c44dc",
-        "SEED",
-        "d53d4ce1f48b9879420949467bfcbfbe2c6a7d4a8770bee0c71211def898d7c5024ce2007dd85accb3f69d906ae2164d",
-        "Noekeon",
-        "7e68ceb33aad9db04af6b878a16dd6c6b4f880d6c89027ba581884c10690bb6b3dbfd6ed5513e2c4f5670c3528023121",
-        "DES/CBC/NoPadding",
-        "60fa2f8fae5aa2a38e9ac77d0246726beb7511e4515feb12cf99f75cc6e0122a",
-        "DESede/CBC/NoPadding",
-        "4d3d7931875cf25593dc402298add8b914761e4936c9585ae22b2c1441169231",
-        "SKIPJACK/CBC/NoPadding",
-        "ceebcc2e5e2b847f9ed797b4930b95f115b9e6cf49c457fc2ea0df79ad5c8334",
-        "Blowfish/CBC/NoPadding",
-        "80823abbabc109733e7ebf3ce3344d67fc387c306b782086b452f7fbe8e844ce",
-        "Twofish/CBC/NoPadding",
-        "f819694251a00bdd403928745cd1d8a094de61f49ddf8e7692e9d81a83812943",
-        "RC2/CBC/NoPadding",
-        "a51facdb3933c9676795cd38cc3146fd4694722b468b1a979a399c77606abf99",
-        "RC5/CBC/NoPadding",
-        "9ee7517eab0280445f3a7c60c90c0f75029d65bca8b1af83ace5399d388c83c3",
-        "RC6/CBC/NoPadding",
-        "c44695633c07010f3a0d8f7ea046a642d4a96bf4e44f89fd91b46830bc95b130",
-        "IDEA/CBC/NoPadding",
-        "30cd990ebdae80fe12b6c6e4fcd1c064a27d985c276b3d7097351c8684e4c4d9",
-        "DES/CBC/PKCS5Padding",
-        "60fa2f8fae5aa2a38e9ac77d0246726beb7511e4515feb12cf99f75cc6e0122afdc70484fb9c0232",
-        "DES/CBC/ISO10126Padding",
-        "60fa2f8fae5aa2a38e9ac77d0246726beb7511e4515feb12cf99f75cc6e0122a980639850a2cc3e8",
-        "DES/CBC/ISO7816-4Padding",
-        "60fa2f8fae5aa2a38e9ac77d0246726beb7511e4515feb12cf99f75cc6e0122a1f80b9b0f1be49ac",
-        "DES/CBC/X9.23Padding",
-        "60fa2f8fae5aa2a38e9ac77d0246726beb7511e4515feb12cf99f75cc6e0122a980639850a2cc3e8",
-        "DESede/CBC/PKCS7Padding",
-        "4d3d7931875cf25593dc402298add8b914761e4936c9585ae22b2c1441169231a41e40695f1cff84",
-        "SKIPJACK/CBC/PKCS7Padding",
-        "ceebcc2e5e2b847f9ed797b4930b95f115b9e6cf49c457fc2ea0df79ad5c8334df7042de5db89c96",
-        "Blowfish/CBC/PKCS7Padding",
-        "80823abbabc109733e7ebf3ce3344d67fc387c306b782086b452f7fbe8e844cef986562ab1a675e8",
-        "Twofish/CBC/PKCS7Padding",
-        "f819694251a00bdd403928745cd1d8a094de61f49ddf8e7692e9d81a838129433e5f1343d6cdb0b41838619da1541f04",
-        "RC2/CBC/PKCS7Padding",
-        "a51facdb3933c9676795cd38cc3146fd4694722b468b1a979a399c77606abf9958435525f770f137",
-        "RC5/CBC/PKCS7Padding",
-        "9ee7517eab0280445f3a7c60c90c0f75029d65bca8b1af83ace5399d388c83c3edd95ff49be76651",
-        "RC5-64/CBC/PKCS7Padding",
-        "e479fd11f89dab22d2f3dd062b1d2abd5b5962553421a5c562dc7214c3b23b8e21949fda87f2f820e5f032c552c6ec78",
-        "RC6/CBC/PKCS7Padding",
-        "c44695633c07010f3a0d8f7ea046a642d4a96bf4e44f89fd91b46830bc95b130824b972c9019a69d2dd05ef2d36b37ac",
-        "IDEA/CBC/PKCS7Padding",
-        "30cd990ebdae80fe12b6c6e4fcd1c064a27d985c276b3d7097351c8684e4c4d9e584751325ef7c32",
-        "IDEA/CBC/ISO10126Padding",
-        "30cd990ebdae80fe12b6c6e4fcd1c064a27d985c276b3d7097351c8684e4c4d978b3fd73135f033b",
-        "IDEA/CBC/X9.23Padding",
-        "30cd990ebdae80fe12b6c6e4fcd1c064a27d985c276b3d7097351c8684e4c4d978b3fd73135f033b",
-        "AES/CBC/PKCS7Padding",
-        "cf87f4d8bb9d1abb36cdd9f44ead7d046db2f802d99e1ef0a5940f306079e08389a44c4a8cc1a47cbaee1128da55bbb7",
-        "AES/CBC/ISO7816-4Padding",
-        "cf87f4d8bb9d1abb36cdd9f44ead7d046db2f802d99e1ef0a5940f306079e08306d84876508a33efec701118d8eeaf6d",
-        "Rijndael/CBC/PKCS7Padding",
-        "cf87f4d8bb9d1abb36cdd9f44ead7d046db2f802d99e1ef0a5940f306079e08389a44c4a8cc1a47cbaee1128da55bbb7",
-        "Serpent/CBC/PKCS7Padding",
-        "f8940ca31aba8ce1e0693b1ae0b1e08daef6de03c80f019774280052f824ac44540bb8dd74dfad47f83f9c7ec268ca68",
-        "CAST5/CBC/PKCS7Padding",
-        "87b6dc0c5a1d23d42fa740b0548be0b298112000544610d889d6361994cf8e670a19d6af72d7289f",
-        "CAST6/CBC/PKCS7Padding",
-        "943445569cfdda174118e433828f84e137faee38cac5c827d87a3c9a5a46a07dd64e7ad8accd921f248eea627cd6826f",
-        "DES/CBC/WithCTS",
-        "60fa2f8fae5aa2a38e9ac77d0246726bcf99f75cc6e0122aeb7511e4515feb12",
-        "IDEA/CBC/PKCS7Padding",
-        "30cd990ebdae80fe12b6c6e4fcd1c064a27d985c276b3d7097351c8684e4c4d9e584751325ef7c32",
-        "DES/CBC/ZeroBytePadding",
-        "60fa2f8fae5aa2a38e9ac77d0246726beb7511e4515feb12cf99f75cc6e0122ad3b3f002c927f1fd",
-        "DES/CTS/NoPadding", // official style
-        "60fa2f8fae5aa2a38e9ac77d0246726bcf99f75cc6e0122aeb7511e4515feb12",
-        "DESede/CTS/NoPadding",
-        "4d3d7931875cf25593dc402298add8b9e22b2c144116923114761e4936c9585a",
-        "SKIPJACK/CTS/NoPadding",
-        "ceebcc2e5e2b847f9ed797b4930b95f12ea0df79ad5c833415b9e6cf49c457fc",
-        "Blowfish/CTS/NoPadding",
-        "80823abbabc109733e7ebf3ce3344d67b452f7fbe8e844cefc387c306b782086",
-        "Twofish/CTS/NoPadding",
-        "94de61f49ddf8e7692e9d81a83812943f819694251a00bdd403928745cd1d8a0",
-        "AES/CTS/NoPadding",
-        "6db2f802d99e1ef0a5940f306079e083cf87f4d8bb9d1abb36cdd9f44ead7d04",
-        "Rijndael/CTS/NoPadding",
-        "6db2f802d99e1ef0a5940f306079e083cf87f4d8bb9d1abb36cdd9f44ead7d04",
-        "Serpent/CTS/NoPadding",
-        "aef6de03c80f019774280052f824ac44f8940ca31aba8ce1e0693b1ae0b1e08d",
-        "CAST5/CTS/NoPadding",
-        "87b6dc0c5a1d23d42fa740b0548be0b289d6361994cf8e6798112000544610d8",
-        "CAST6/CTS/NoPadding",
-        "37faee38cac5c827d87a3c9a5a46a07d943445569cfdda174118e433828f84e1",
-        "RC2/CTS/NoPadding",
-        "a51facdb3933c9676795cd38cc3146fd9a399c77606abf994694722b468b1a97",
-        "RC5/CTS/NoPadding",
-        "9ee7517eab0280445f3a7c60c90c0f75ace5399d388c83c3029d65bca8b1af83",
-        "RC6/CTS/NoPadding",
-        "d4a96bf4e44f89fd91b46830bc95b130c44695633c07010f3a0d8f7ea046a642",
-        "IDEA/CTS/NoPadding",
-        "30cd990ebdae80fe12b6c6e4fcd1c06497351c8684e4c4d9a27d985c276b3d70",
-        "DES/CBC/WithCTS",                  // older style
-        "60fa2f8fae5aa2a38e9ac77d0246726bcf99f75cc6e0122aeb7511e4515feb12",
-        "DESede/CBC/WithCTS",
-        "4d3d7931875cf25593dc402298add8b9e22b2c144116923114761e4936c9585a",
-        "SKIPJACK/CBC/WithCTS",
-        "ceebcc2e5e2b847f9ed797b4930b95f12ea0df79ad5c833415b9e6cf49c457fc",
-        "Blowfish/CBC/WithCTS",
-        "80823abbabc109733e7ebf3ce3344d67b452f7fbe8e844cefc387c306b782086",
-        "Twofish/CBC/WithCTS",
-        "94de61f49ddf8e7692e9d81a83812943f819694251a00bdd403928745cd1d8a0",
-        "AES/CBC/WithCTS",
-        "6db2f802d99e1ef0a5940f306079e083cf87f4d8bb9d1abb36cdd9f44ead7d04",
-        "Rijndael/CBC/WithCTS",
-        "6db2f802d99e1ef0a5940f306079e083cf87f4d8bb9d1abb36cdd9f44ead7d04",
-        "Serpent/CBC/WithCTS",
-        "aef6de03c80f019774280052f824ac44f8940ca31aba8ce1e0693b1ae0b1e08d",
-        "CAST5/CBC/WithCTS",
-        "87b6dc0c5a1d23d42fa740b0548be0b289d6361994cf8e6798112000544610d8",
-        "CAST6/CBC/WithCTS",
-        "37faee38cac5c827d87a3c9a5a46a07d943445569cfdda174118e433828f84e1",
-        "RC2/CBC/WithCTS",
-        "a51facdb3933c9676795cd38cc3146fd9a399c77606abf994694722b468b1a97",
-        "RC5/CBC/WithCTS",
-        "9ee7517eab0280445f3a7c60c90c0f75ace5399d388c83c3029d65bca8b1af83",
-        "RC6/CBC/WithCTS",
-        "d4a96bf4e44f89fd91b46830bc95b130c44695633c07010f3a0d8f7ea046a642",
-        "IDEA/CBC/WithCTS",
-        "30cd990ebdae80fe12b6c6e4fcd1c06497351c8684e4c4d9a27d985c276b3d70",
-        "DES/OFB/NoPadding",
-        "537572e480c1714f5c9a4f3b874df824dc6681b1fd6c11982debcad91e3f78b7",
-        "DESede/OFB/NoPadding",
-        "481e9872acea7fcf8e29a453242da774e5f6a28f15f7723659a73e4ff4939f80",
-        "SKIPJACK/OFB/NoPadding",
-        "71143a124e3a0cde753b60fe9b200e559018b6a0fe0682659f7c13feb9df995c",
-        "Blowfish/OFB/NoPadding",
-        "6cd6f7c5d2c655556d7a9e98a1696d1875e9f1b2fc991e28a2d55b56861e80bd",
-        "Twofish/OFB/NoPadding",
-        "821c54b1b54ae113cf74595eefe10c83b61c9682fc81f92c52f39a3a693f88b8",
-        "Threefish-256/OFB/NoPadding",
-        "546ea995dd302f1efcb1f27d14bad468280a3a7994c2af75dfdf1e9fc5ef2373",
-        "Threefish-512/OFB/NoPadding",
-        "152df966484ecc2e9ddfc386559732f7f632e4008920804a1bde4efcf2e6e2f2",
-        "Threefish-1024/OFB/NoPadding",
-        "03953ac751a7377812c6e3e4d14b36c6953f9b390acaa892811c10001c9be454",
-        "RC2/OFB/NoPadding",
-        "0a07cb78537cb04c0c74e28a7b86b80f80acadf87d6ef32792f1a8cf74b39f74",
-        "RC5/OFB/NoPadding",
-        "c62b233df296283b918a2b4cc53a54fbf061850e781b97332ed1bd78b88d9670",
-        "IDEA/OFB/NoPadding",
-        "dd447da3cbdcf81f4053fb446596261cb00a3c49a66085485af5f7c10ba20dad",
-        "DES/OFB8/NoPadding",
-        "53cb5010d189f94cf584e5ff1c4a9d86443c45ddb6fa3c2d1a5dadfcdf01db8a",
-        "DESede/OFB8/NoPadding",
-        "482c0c1ccd0e6d218e1cffb0a295352c2357ffaa673f2257ef5c77b6c04f03b5",
-        "SKIPJACK/OFB8/NoPadding",
-        "719ea1b432b3d2c8011e5aa873f95978420022b5e2c9c1a1c1082cd1f4999da2",
-        "Blowfish/OFB8/NoPadding",
-        "6ca6078755b263f09787d830b6fda7b7748494634bdc73ab68540cf9f6b7eccf",
-        "Twofish/OFB8/NoPadding",
-        "825dcec234ad52253d6e064b0d769bc04b1142435933f4a510ffc20d70095a88",
-        "Threefish-256/OFB8/NoPadding",
-        "545fbd92313512127218262dd4394569aca96ba122e1432b661ecfc01af3a25c",
-        "Threefish-512/OFB8/NoPadding",
-        "15f6e7d215662c525ea982cab56409cf833157e1af06edd57a13c71487904fea",
-        "Threefish-1024/OFB8/NoPadding",
-        "03d80b67ff7139d9dd8b07280642f94074496e5fc37b1ba1f8593cdf64a1e4ca",
-        "RC2/OFB8/NoPadding",
-        "0aa26c6f6a820fe7d38da97085995ad62e2e293323a76300fcd4eb572810f7c6",
-        "RC5/OFB8/NoPadding",
-        "c601a9074dbd874f4d3293f6a32d93d9f0a4f5685d8597f0102fcc96d444f976",
-        "IDEA/OFB8/NoPadding",
-        "dd7897b6ced43d060a518bb38d570308b83b4de577eb208130daabf619e9b1fb",
-        "DES/CFB/NoPadding",
-        "537572e480c1714fec3c7424f88d4202219244c5ca8f5e4361d64f08fe747bb2",
-        "DESede/CFB/NoPadding",
-        "481e9872acea7fcfb75bb58670fe64c59123265139e357d161cd4ddb5eba042a",
-        "SKIPJACK/CFB/NoPadding",
-        "71143a124e3a0cde70a69ede4ceb14376b1e6a80bafde0a6330508dfa86a7c41",
-        "Blowfish/CFB/NoPadding",
-        "6cd6f7c5d2c6555561167fe9b10665102206869339122f1ed89efa4a985397f6",
-        "Twofish/CFB/NoPadding",
-        "821c54b1b54ae113cf74595eefe10c8308b7a438277de4f40948ac2d172d53d2",
-        "Threefish-256/CFB/NoPadding",
-        "546ea995dd302f1efcb1f27d14bad468280a3a7994c2af75dfdf1e9fc5ef2373",
-        "Threefish-512/CFB/NoPadding",
-        "152df966484ecc2e9ddfc386559732f7f632e4008920804a1bde4efcf2e6e2f2",
-        "Threefish-1024/CFB/NoPadding",
-        "03953ac751a7377812c6e3e4d14b36c6953f9b390acaa892811c10001c9be454",
-        "RC2/CFB/NoPadding",
-        "0a07cb78537cb04ca1401450d5cd411c7da7fa5b6baaa17bb2137bd95c9f26a5",
-        "RC5/CFB/NoPadding",
-        "c62b233df296283b989352bbebf616a19e11503ac737f9e0eaf19049cde05d34",
-        "IDEA/CFB/NoPadding",
-        "dd447da3cbdcf81fcbe4661dcbed88aed899f87585118384bd0565067fa6c13a",
-        "DES/CFB8/NoPadding",
-        "53cb0cdff712a825eb283b23c31e7323aa12495e7e751428b5c4eb89b28a25d4",
-        "DESede/CFB8/NoPadding",
-        "482cd5bf87ca4cee0b573d66a077231bfea93843ce2d1f948550a1d208e18279",
-        "SKIPJACK/CFB8/NoPadding",
-        "719eef3906bef23f7b63599285437d8e34183b165acf3e855b4e160d4f036508",
-        "Blowfish/CFB8/NoPadding",
-        "6ca63aaada9188d2410c07513cc0736b9888770768c25a5befc776beea5bdc4c",
-        "Twofish/CFB8/NoPadding",
-        "825d12af040721cf5ed4a4798647837ac5eb14d752aace28728aeb37b2010abd",
-        "Threefish-256/CFB8/NoPadding",
-        "545fbf0a4b925f399cf7540f1cc1cc6012e329ab2d4db0aa0dfa29ee2a2019d1",
-        "Threefish-512/CFB8/NoPadding",
-        "15f695964f20b95ed72afad75f905788839c53bed2ae5fdfdfb13e3241fd7f94",
-        "Threefish-1024/CFB8/NoPadding",
-        "03d897c89e740d2254f717b73315151d9a34c829e4162232b3cd5f5158ff367b",
-        "RC2/CFB8/NoPadding",
-        "0aa227f94be3a32ff927c5d25647ea41d7c2a1e94012fc7f2ad6767b9664bce5",
-        "RC5/CFB8/NoPadding",
-        "c601cf88725411f119965b9cd38d6c313b91128ed7c98c7604cc62d9b210be79",
-        "IDEA/CFB8/NoPadding",
-        "dd7839d2525420d10f95eec23dbaf3463302c445972a28c563c2635191bc19af",
-        "IDEA/PGPCFB/NoPadding",
-        "dd447da3cbdcf81fcbe4661dcbed88aed899f87585118384bd0565067fa6c13a",
-        "IDEA/PGPCFBwithIv/NoPadding",
-        "ed5adbac0e730cc0f00df7e4f6fef672ab042673106435faf3ecf3996a72a0e127b440ba9e5313501de3",
-        "Twofish/ECB/TBCPadding",
-        "70336d9c9718a8a2ced1b19deed973a3c58af7ea71a69e7efc4df082dca581c019d7daa58d02b89aab6e8c0d17202439",
-        "RC2/ECB/TBCPadding",
-        "eb5b889bbcced12eb6b1a3da6a3d965bba66a5edfdd4c8a6b6b1a3da6a3d965b6b5359ba5e69b179",
-        "DES/CTR/NoPadding",
-        "537572e480c1714fb47081d35eb18eaca9e0a5aee982f105438a0db6cece1f6d",
-        "DESede/CTR/NoPadding",
-        "481e9872acea7fcfa93b7d4e34ec7bab340c10faba2e43b879d40d38e07c422d",
-        "SKIPJACK/CTR/NoPadding",
-        "71143a124e3a0cdeee98a7b843baa05bd1d59faee8ec9b89880e070314a04cc2",
-        "Blowfish/CTR/NoPadding",
-        "6cd6f7c5d2c65555d2b31f8614f54ec654f5e7888d515008d59302c3edfcc6cb",
-        "Twofish/CTR/NoPadding",
-        "821c54b1b54ae113cf74595eefe10c83d09e95d4599190b9bbd5bc71dd703730",
-        "Threefish-256/CTR/NoPadding",
-        "546ea995dd302f1efcb1f27d14bad468280a3a7994c2af75dfdf1e9fc5ef2373",
-        "Threefish-512/CTR/NoPadding",
-        "152df966484ecc2e9ddfc386559732f7f632e4008920804a1bde4efcf2e6e2f2",
-        "Threefish-1024/CTR/NoPadding",
-        "03953ac751a7377812c6e3e4d14b36c6953f9b390acaa892811c10001c9be454",
-        "RC2/CTR/NoPadding",
-        "0a07cb78537cb04c8c5a0a39a15977a7eb19f3c48a42759c234868c391a99c63",
-        "RC5/CTR/NoPadding",
-        "c62b233df296283b97f17364d5f69a1ff91f46659cf9856caefd322a936203a7",
-        "IDEA/CTR/NoPadding",
-        "dd447da3cbdcf81f4694ab7715d79e3f90af5682e8c318b8f7dadbed6b5c9714",
-    };
-
-    static String[] cipherTests2 =
-    {
-        "DES/OFB64/NoPadding",
-        "537572e480c1714f5c9a4f3b874df824dc6681b1fd6c11982debcad91e",
-        "DES/CFB64/NoPadding",
-        "537572e480c1714fec3c7424f88d4202219244c5ca8f5e4361d64f08fe",
-        "DES/CTR/NoPadding",
-        "537572e480c1714fb47081d35eb18eaca9e0a5aee982f105438a0db6ce",
-        "DES/CTS/NoPadding",
-        "60fa2f8fae5aa2a38e9ac77d0246726b32df660db51a710ceb7511e451"
-    };
-
-    static String[] cipherTestsLargeBlock =
-    {
-        "Threefish-256",
-        "9f82b577cf4cca7a504e9f7a2cd7dbb4ef4ac167c716fca19ab1211f195f610f" +
-            "9f82b577cf4cca7a504e9f7a2cd7dbb4ef4ac167c716fca19ab1211f195f610f" +
-            "9f82b577cf4cca7a504e9f7a2cd7dbb4ef4ac167c716fca19ab1211f195f610f" +
-            "9f82b577cf4cca7a504e9f7a2cd7dbb4ef4ac167c716fca19ab1211f195f610f" +
-             "31533aa864e6a40edc3e24b36260d94374893dc2e479793292e29c18a6ee01a9",
-        "Threefish-512",
-        "35d0c46770ebb3bf62fadd48765db209df215d7cd18a8b18d11625e70067e1fa" +
-            "bb98982312ce1fdfccae1a59408e1d5418b400a7bf0d1c4e9ea4afa4395886d7" +
-            "35d0c46770ebb3bf62fadd48765db209df215d7cd18a8b18d11625e70067e1fa" +
-            "bb98982312ce1fdfccae1a59408e1d5418b400a7bf0d1c4e9ea4afa4395886d7" +
-            "ad7ec86b2137af1ddb64794d714c4e1d7b687b19fc9781ef887a0ad7f88e18fc" +
-            "1baa6123ec8bc497e7eb7b5090cfd756fd5333425ed5a240cb96735dea9713d9",
-        "Threefish-1024",
-        "df6d789e301c6a5e22e0cff0b44666630d44ce774a41b628ebaff6adc86d9e66" +
-            "af50a282a4313552bc9b861cb286ab569e2e23b1c97cdb5cb1fde1bacfba9bfb" +
-            "de3b443218e16b6038537b3d803ff5dbd26b13c177a5bfb597ffccca142a5905" +
-            "8c0f74623daa96bff95b716674701034e7947ce0541426fa5177bc1a519b23ba" +
-            "462f1724989612e49ca5e92a0129ec7be576846fe2616664674e16a29ce8679c" +
-            "0adda9034fbd652910c2ae5afacde10281ab18dbeeb83464dc21ff66b0d358ff" +
-            "2328c73aca59e9095a7bca94acc79d10038eab6ef865545bcf73f4caeeba1844" +
-            "6add98350c8276e5abfb8709bb6c01ef3297b862818a4996b744f375b9126e5c",
-        "Threefish-256/CBC/NoPadding",
-        "1c46830ef0a43a0869bf070a87f0d4e63f2458edfa5654bafd8520358dae8bf9" +
-            "2a8c039d41e87bb65a907331dde317450d38aba6cb3885bfbe0aee148503e37b" +
-            "973c5e8a16c4309f7a4229d9943ab403082b5836431b9d1646b619f368e057b3" +
-            "0931ce1b791b641dd3e79f2b536897f3c537e3b4588dc03c3888f9bab3bc7a0e",
-        "Threefish-512/CBC/NoPadding",
-        "caee9b663eba4663de1cd6f17ffc51dc8b808c95f91e12a818ab31436985830b" +
-            "3aa886a93e53849d34e713f36db52bac3557b137328434f41f825f3948a611c6" +
-            "03efe066d8d6d57b15b04729632de0ce5636b8ccd28219ac17ef836734556e15" +
-            "e90356111279412a814b660150323a416138b2b62942f2d0cd08ee0bb45b0dd7",
-        "Threefish-1024/CBC/NoPadding",
-        "7540a8fe54a1a1d117ba1f970a12002cf9e24477daef9439dfc43b79a88a9e87" +
-            "b59be63aa448b4e02e8b9a6464419c35b0b3f97219e6c88ed5429d0f9ffb40bb" +
-            "491f280f4281af177e254828f82e90d196c6bf9afa31926cf5bf0cc3dc81f28a" +
-            "419544ef5907f3b8bf6179da37ff07134d9c6d147521e5c840d5086ec74c1003",
-        "Threefish-256/CBC/PKCS7Padding",
-        "1c46830ef0a43a0869bf070a87f0d4e63f2458edfa5654bafd8520358dae8bf9" +
-            "2a8c039d41e87bb65a907331dde317450d38aba6cb3885bfbe0aee148503e37b" +
-            "973c5e8a16c4309f7a4229d9943ab403082b5836431b9d1646b619f368e057b3" +
-            "0931ce1b791b641dd3e79f2b536897f3c537e3b4588dc03c3888f9bab3bc7a0e" +
-            "f96cb468a5cd39a003f976464a7d072c94cb72a3fe739f101aa7b5452bc3fbba",
-        "Threefish-512/CBC/PKCS7Padding",
-        "caee9b663eba4663de1cd6f17ffc51dc8b808c95f91e12a818ab31436985830b" +
-            "3aa886a93e53849d34e713f36db52bac3557b137328434f41f825f3948a611c6" +
-            "03efe066d8d6d57b15b04729632de0ce5636b8ccd28219ac17ef836734556e15" +
-            "e90356111279412a814b660150323a416138b2b62942f2d0cd08ee0bb45b0dd7" +
-            "03902162280012e59efa15c6beecfbf440a6a0c4474bbbb2f74a0ad31bcd398f" +
-            "b24728c3605a4ced3c92c30a5e231113abafaf6f83a3867978e3cdd74091d09f",
-        "Threefish-1024/CBC/PKCS7Padding",
-        "7540a8fe54a1a1d117ba1f970a12002cf9e24477daef9439dfc43b79a88a9e87" +
-            "b59be63aa448b4e02e8b9a6464419c35b0b3f97219e6c88ed5429d0f9ffb40bb" +
-            "491f280f4281af177e254828f82e90d196c6bf9afa31926cf5bf0cc3dc81f28a" +
-            "419544ef5907f3b8bf6179da37ff07134d9c6d147521e5c840d5086ec74c1003" +
-            "4ddd16ad731ad9a32d0f196a72284f7a8df98918e3e22f1708662edeb1810d2b" +
-            "bafd4200e849f3288b55634b37f99f0f7b2dd192a5944fc211ef9e37b67a829b" +
-            "005a5ec609f736875fdf8946bd79c1daa6c44c9d6733a2223cf8b7e5203b1cfd" +
-            "76995f67e570d9c403b2a2e3f3a89c63c7850ee8d47d4398ac377345a139dda4",
-        "Threefish-256/CTS/NoPadding",
-        "1c46830ef0a43a0869bf070a87f0d4e63f2458edfa5654bafd8520358dae8bf9" +
-            "2a8c039d41e87bb65a907331dde317450d38aba6cb3885bfbe0aee148503e37b" +
-            "0931ce1b791b641dd3e79f2b536897f3c537e3b4588dc03c3888f9bab3bc7a0e" +
-            "973c5e8a16c4309f7a4229d9943ab403082b5836431b9d1646b619f368e057b3",
-        "Threefish-512/CTS/NoPadding",
-        "03efe066d8d6d57b15b04729632de0ce5636b8ccd28219ac17ef836734556e15" +
-            "e90356111279412a814b660150323a416138b2b62942f2d0cd08ee0bb45b0dd7" +
-            "caee9b663eba4663de1cd6f17ffc51dc8b808c95f91e12a818ab31436985830b" +
-            "3aa886a93e53849d34e713f36db52bac3557b137328434f41f825f3948a611c6",
-        "Threefish-1024/CTS/NoPadding",
-        "7540a8fe54a1a1d117ba1f970a12002cf9e24477daef9439dfc43b79a88a9e87b59b" +
-        "e63aa448b4e02e8b9a6464419c35b0b3f97219e6c88ed5429d0f9ffb40bb491f280f" +
-        "4281af177e254828f82e90d196c6bf9afa31926cf5bf0cc3dc81f28a419544ef5907" +
-        "f3b8bf6179da37ff07134d9c6d147521e5c840d5086ec74c1003",
-        "Threefish-256/CBC/WithCTS",
-        "1c46830ef0a43a0869bf070a87f0d4e63f2458edfa5654bafd8520358dae8bf9" +
-            "2a8c039d41e87bb65a907331dde317450d38aba6cb3885bfbe0aee148503e37b" +
-            "0931ce1b791b641dd3e79f2b536897f3c537e3b4588dc03c3888f9bab3bc7a0e" +
-            "973c5e8a16c4309f7a4229d9943ab403082b5836431b9d1646b619f368e057b3",
-        "Threefish-512/CBC/WithCTS",
-        "03efe066d8d6d57b15b04729632de0ce5636b8ccd28219ac17ef836734556e15" +
-            "e90356111279412a814b660150323a416138b2b62942f2d0cd08ee0bb45b0dd7" +
-            "caee9b663eba4663de1cd6f17ffc51dc8b808c95f91e12a818ab31436985830b" +
-            "3aa886a93e53849d34e713f36db52bac3557b137328434f41f825f3948a611c6",
-        "Threefish-1024/CBC/WithCTS",
-        "7540a8fe54a1a1d117ba1f970a12002cf9e24477daef9439dfc43b79a88a9e87b59b" +
-        "e63aa448b4e02e8b9a6464419c35b0b3f97219e6c88ed5429d0f9ffb40bb491f280f" +
-        "4281af177e254828f82e90d196c6bf9afa31926cf5bf0cc3dc81f28a419544ef5907" +
-        "f3b8bf6179da37ff07134d9c6d147521e5c840d5086ec74c1003",
-        "Threefish-256/ECB/TBCPadding",
-        "9f82b577cf4cca7a504e9f7a2cd7dbb4ef4ac167c716fca19ab1211f195f610f" +
-            "9f82b577cf4cca7a504e9f7a2cd7dbb4ef4ac167c716fca19ab1211f195f610f" +
-            "9f82b577cf4cca7a504e9f7a2cd7dbb4ef4ac167c716fca19ab1211f195f610f" +
-            "9f82b577cf4cca7a504e9f7a2cd7dbb4ef4ac167c716fca19ab1211f195f610f" +
-            "89c4e79b90153a821bdd4efd5eb1e2cda89b6a91540a003eef03868472d8cfce",
-        "Threefish-512/ECB/TBCPadding",
-        "35d0c46770ebb3bf62fadd48765db209df215d7cd18a8b18d11625e70067e1fa" +
-            "bb98982312ce1fdfccae1a59408e1d5418b400a7bf0d1c4e9ea4afa4395886d7" +
-            "35d0c46770ebb3bf62fadd48765db209df215d7cd18a8b18d11625e70067e1fa" +
-            "bb98982312ce1fdfccae1a59408e1d5418b400a7bf0d1c4e9ea4afa4395886d7" +
-            "dd6bfa1006e4df51298e382ca397a2c398cdb4d65009dce77c5f0a31f9807218" +
-            "a72372a8a0df3b1bacd5dbfb116ebbe314e0b0cd64fd2c8ae8a81491c2534a2a",
-        "Threefish-1024/ECB/TBCPadding",
-        "df6d789e301c6a5e22e0cff0b44666630d44ce774a41b628ebaff6adc86d9e66" +
-            "af50a282a4313552bc9b861cb286ab569e2e23b1c97cdb5cb1fde1bacfba9bfb" +
-            "de3b443218e16b6038537b3d803ff5dbd26b13c177a5bfb597ffccca142a5905" +
-            "8c0f74623daa96bff95b716674701034e7947ce0541426fa5177bc1a519b23ba" +
-            "7312262dc3a25984847d1b05cb624f5751946f136ee7bd0a9a4bbac5dd3bd213" +
-            "702390d3a53d1a4132f59383cce4fe61e08cd3c73c570190d1c8b60940031ef7" +
-            "42f6775b00fb0b4273a14b46a3fc0e760e02f75dc6100ca9c038c3f151e03145" +
-            "92686fd8cccbee74d246a8c59ad80205c9f9aaeb100ea5812837ee8699753301",
-    };
-
-    static byte[]   input1 = Hex.decode("000102030405060708090a0b0c0d0e0fff0102030405060708090a0b0c0d0e0f");
-    static byte[]   input2 = Hex.decode("000102030405060708090a0b0c0d0e0fff0102030405060708090a0b0c");
-    static byte[]   inputLargeBlock = Hex.decode("000102030405060708090a0b0c0d0e0fff0102030405060708090a0b0c0d0e0f" +
-                                                 "000102030405060708090a0b0c0d0e0fff0102030405060708090a0b0c0d0e0f" +
-                                                 "000102030405060708090a0b0c0d0e0fff0102030405060708090a0b0c0d0e0f" +
-                                                 "000102030405060708090a0b0c0d0e0fff0102030405060708090a0b0c0d0e0f");
-
-    static RC2ParameterSpec rc2Spec = new RC2ParameterSpec(128, Hex.decode("0123456789abcdef"));
-    static RC5ParameterSpec rc5Spec = new RC5ParameterSpec(16, 16, 32, Hex.decode("0123456789abcdef"));
-    static RC5ParameterSpec rc564Spec = new RC5ParameterSpec(16, 16, 64, Hex.decode("0123456789abcdef0123456789abcdef"));
-
-    /**
-     * a fake random number generator - we just want to make sure the random numbers
-     * aren't random so that we get the same output, while still getting to test the
-     * key generation facilities.
-     */
-    private class FixedSecureRandom
-        extends SecureRandom
-    {
-        byte[]  seed = {
-                (byte)0xaa, (byte)0xfd, (byte)0x12, (byte)0xf6, (byte)0x59,
-                (byte)0xca, (byte)0xe6, (byte)0x34, (byte)0x89, (byte)0xb4,
-                (byte)0x79, (byte)0xe5, (byte)0x07, (byte)0x6d, (byte)0xde,
-                (byte)0xc2, (byte)0xf0, (byte)0x6c, (byte)0xb5, (byte)0x8f
-        };
-
-        public void nextBytes(
-            byte[]  bytes)
-        {
-            int offset = 0;
-
-            while ((offset + seed.length) < bytes.length)
-            {
-                System.arraycopy(seed, 0, bytes, offset, seed.length);
-                offset += seed.length;
-            }
-
-            System.arraycopy(seed, 0, bytes, offset, bytes.length - offset);
-        }
-    }
-
-    public String getName()
-    {
-        return "BlockCipher";
-    }
-
-    public void test(
-        String      algorithm,
-        byte[]      input,
-        byte[]      output)
-    {
-        Key                     key = null;
-        KeyGenerator            keyGen;
-        SecureRandom            rand;
-        Cipher                  in = null;
-        Cipher                  out = null;
-        CipherInputStream       cIn;
-        CipherOutputStream      cOut;
-        ByteArrayInputStream    bIn;
-        ByteArrayOutputStream   bOut;
-
-        rand = new FixedSecureRandom();
-
-        try
-        {
-            String  baseAlgorithm;
-            int     index = algorithm.indexOf('/');
-
-            if (index > 0)
-            {
-                baseAlgorithm = algorithm.substring(0, index);
-            }
-            else
-            {
-                baseAlgorithm = algorithm;
-            }
-
-            if (baseAlgorithm.equals("IDEA") & noIDEA())
-            {
-                return;
-            }
-
-            keyGen = KeyGenerator.getInstance(baseAlgorithm, "BC");
-            if (!keyGen.getAlgorithm().equals(baseAlgorithm))
-            {
-                fail("wrong key generator returned!");
-            }
-            keyGen.init(rand);
-
-            key = keyGen.generateKey();
-
-            in = Cipher.getInstance(algorithm, "BC");
-            out = Cipher.getInstance(algorithm, "BC");
-
-            if (!in.getAlgorithm().startsWith(baseAlgorithm))
-            {
-                fail("wrong cipher returned!");
-            }
-
-            if (algorithm.startsWith("RC2"))
-            {
-                out.init(Cipher.ENCRYPT_MODE, key, rc2Spec, rand);
-            }
-            else if (algorithm.startsWith("RC5"))
-            {
-                if (algorithm.startsWith("RC5-64"))
-                {
-                    out.init(Cipher.ENCRYPT_MODE, key, rc564Spec, rand);
-                }
-                else
-                {
-                    out.init(Cipher.ENCRYPT_MODE, key, rc5Spec, rand);
-                }
-            }
-            else
-            {
-                out.init(Cipher.ENCRYPT_MODE, key, rand);
-            }
-        }
-        catch (Exception e)
-        {
-            fail("" + algorithm + " failed initialisation - " + e.toString(), e);
-        }
-
-        //
-        // grab the iv if there is one
-        //
-        try
-        {
-            if (algorithm.startsWith("RC2"))
-            {
-                in.init(Cipher.DECRYPT_MODE, key, rc2Spec);
-            }
-            else if (algorithm.startsWith("RC5"))
-            {
-                if (algorithm.startsWith("RC5-64"))
-                {
-                    in.init(Cipher.DECRYPT_MODE, key, rc564Spec, rand);
-                }
-                else
-                {
-                    in.init(Cipher.DECRYPT_MODE, key, rc5Spec, rand);
-                }
-            }
-            else
-            {
-                byte[]    iv;
-
-                iv = out.getIV();
-                if (iv != null)
-                {
-                    try
-                    {
-                        byte[]  nIv = new byte[iv.length - 1];
-
-                        in.init(Cipher.DECRYPT_MODE, key, new IvParameterSpec(nIv));
-                        fail("failed to pick up short IV");
-                    }
-                    catch (InvalidAlgorithmParameterException e)
-                    {
-                        // ignore - this is what we want...
-                    }
-
-                    IvParameterSpec    spec;
-
-                    spec = new IvParameterSpec(iv);
-
-                    in.init(Cipher.DECRYPT_MODE, key, spec);
-                }
-                else
-                {
-                    in.init(Cipher.DECRYPT_MODE, key);
-                }
-            }
-        }
-        catch (Exception e)
-        {
-            fail("" + algorithm + " failed initialisation - " + e.toString());
-        }
-
-        //
-        // encryption pass
-        //
-        bOut = new ByteArrayOutputStream();
-
-        cOut = new CipherOutputStream(bOut, out);
-
-        try
-        {
-            for (int i = 0; i != input.length / 2; i++)
-            {
-                cOut.write(input[i]);
-            }
-            cOut.write(input, input.length / 2, input.length - input.length / 2);
-            cOut.close();
-        }
-        catch (IOException e)
-        {
-            fail("" + algorithm + " failed encryption - " + e.toString());
-        }
-
-        byte[]    bytes;
-
-        bytes = bOut.toByteArray();
-
-        if (!areEqual(bytes, output))
-        {
-            fail("" + algorithm + " failed encryption - expected " + new String(Hex.encode(output)) + " got " + new String(Hex.encode(bytes)));
-        }
-
-        //
-        // decryption pass
-        //
-        bIn = new ByteArrayInputStream(bytes);
-
-        cIn = new CipherInputStream(bIn, in);
-
-        try
-        {
-            DataInputStream dIn = new DataInputStream(cIn);
-
-            bytes = new byte[input.length];
-
-            for (int i = 0; i != input.length / 2; i++)
-            {
-                bytes[i] = (byte)dIn.read();
-            }
-            dIn.readFully(bytes, input.length / 2, bytes.length - input.length / 2);
-        }
-        catch (Exception e)
-        {
-            fail("" + algorithm + " failed decryption - " + e.toString());
-        }
-
-        if (!areEqual(bytes, input))
-        {
-            fail("" + algorithm + " failed decryption - expected " + new String(Hex.encode(input)) + " got " + new String(Hex.encode(bytes)));
-        }
-    }
-
-    private boolean noIDEA()
-    {
-        try
-        {
-            Cipher.getInstance("IDEA", "BC");
-
-            return false;
-        }
-        catch (Exception e)
-        {
-            return true;
-        }
-    }
-
-    private void testExceptions()
-    {
-        SecretKeyFactory skF = null;
-        
-        try
-        {
-            skF = SecretKeyFactory.getInstance("DESede", "BC");
-        }
-        catch (Exception e)
-        {
-            fail("unexpected exception.", e);
-        }
-        
-        KeySpec ks = null;
-        SecretKey secKey = null;
-        byte[] bb = new byte[24];
-
-        try
-        {
-            skF.getKeySpec(null, null);
-            
-            fail("failed exception test - no exception thrown");
-        }
-        catch (InvalidKeySpecException e)
-        {
-            // ignore okay
-        }
-        catch (Exception e)
-        {
-            fail("failed exception test.", e);
-        }
-        try
-        {
-            ks = (KeySpec)new DESedeKeySpec(bb);
-            skF.getKeySpec(null, ks.getClass());
-            
-            fail("failed exception test - no exception thrown");
-        }
-        catch (InvalidKeySpecException e)
-        {
-            // ignore okay;
-        }
-        catch (Exception e)
-        {
-            fail("failed exception test.", e);
-        }
-        try
-        {
-            skF.getKeySpec(secKey, null);
-        }
-        catch (InvalidKeySpecException e)
-        {
-            // ignore okay
-        }
-        catch (Exception e)
-        {
-            fail("failed exception test.", e);
-        }
-        
-        try
-        {
-            KeyGenerator kg = KeyGenerator.getInstance("DESede", "BC");
-            try
-            {
-                kg.init(Integer.MIN_VALUE, new SecureRandom());
-                
-                fail("failed exception test - no exception thrown");
-            }
-            catch (InvalidParameterException e)
-            {
-                // ignore okay
-            }
-            catch (Exception e)
-            {
-                fail("failed exception test.", e);
-            }
-        }
-        catch (Exception e)
-        {
-            fail("unexpected exception.", e);
-        }
-
-        try
-        {
-            skF = SecretKeyFactory.getInstance("DESede", "BC");
-
-            try
-            {
-                skF.translateKey(null);
-                
-                fail("failed exception test - no exception thrown");
-            }
-            catch (InvalidKeyException e)
-            {
-                // ignore okay
-            }
-            catch (Exception e)
-            {
-                fail("failed exception test.", e);
-            }
-        }
-        catch (Exception e)
-        {
-            fail("unexpected exception.", e);
-        }
-        
-        try
-        {
-            byte[] rawDESKey = { (byte)128, (byte)131, (byte)133, (byte)134,
-                    (byte)137, (byte)138, (byte)140, (byte)143 };
-
-            SecretKeySpec cipherKey = new SecretKeySpec(rawDESKey, "DES");
-
-            Cipher cipher = Cipher.getInstance("DES/CBC/NoPadding", "BC");
-            
-            try
-            {
-                // According specification engineInit(int opmode, Key key,
-                // SecureRandom random) throws InvalidKeyException if this
-                // cipher is being
-                // initialized for decryption and requires algorithm parameters
-                // that cannot be determined from the given key
-                cipher.init(Cipher.DECRYPT_MODE, cipherKey, (SecureRandom)null);
-                
-                fail("failed exception test - no InvalidKeyException thrown");
-            }
-            catch (InvalidKeyException e)
-            {
-                // ignore
-            }
-        }
-        catch (Exception e)
-        {
-            fail("unexpected exception.", e);
-        }
-
-        try
-        {
-            byte[] rawDESKey = { -128, -125, -123, -122, -119, -118 };
-
-            SecretKeySpec cipherKey = new SecretKeySpec(rawDESKey, "DES");
-            Cipher cipher = Cipher.getInstance("DES/ECB/NoPadding", "BC");
-            try
-            {
-                // According specification engineInit(int opmode, Key key,
-                // SecureRandom random) throws InvalidKeyException if the given
-                // key is inappropriate for initializing this cipher
-                cipher.init(Cipher.ENCRYPT_MODE, cipherKey);
-                
-                fail("failed exception test - no InvalidKeyException thrown");
-            }
-            catch (InvalidKeyException e)
-            {
-                // ignore
-            }
-        }
-        catch (Exception e)
-        {
-            fail("unexpected exception.", e);
-        }
-
-        try
-        {
-            byte[] rawDESKey = { -128, -125, -123, -122, -119, -118, -117, -115, -114 };
-
-            SecretKeySpec cipherKey = new SecretKeySpec(rawDESKey, "DES");
-            Cipher cipher = Cipher.getInstance("DES/ECB/NoPadding", "BC");
-            try
-            {
-                // According specification engineInit(int opmode, Key key,
-                // SecureRandom random) throws InvalidKeyException if the given
-                // key is inappropriate for initializing this cipher
-                cipher.init(Cipher.ENCRYPT_MODE, cipherKey);
-                
-                fail("failed exception test - no InvalidKeyException thrown");
-            }
-            catch (InvalidKeyException e)
-            {
-                // ignore
-            }
-        }
-        catch (Exception e)
-        {
-            fail("unexpected exception.", e);
-        }
-        
-
-        try
-        {
-            byte[] rawDESKey = { (byte)128, (byte)131, (byte)133, (byte)134,
-                    (byte)137, (byte)138, (byte)140, (byte)143 };
-
-            SecretKeySpec cipherKey = new SecretKeySpec(rawDESKey, "DES");
-            Cipher ecipher = Cipher.getInstance("DES/ECB/PKCS5Padding", "BC");
-            ecipher.init(Cipher.ENCRYPT_MODE, cipherKey);
-
-            byte[] cipherText = new byte[0];
-            try
-            {
-                // According specification Method engineUpdate(byte[] input,
-                // int inputOffset, int inputLen, byte[] output, int
-                // outputOffset)
-                // throws ShortBufferException - if the given output buffer is
-                // too
-                // small to hold the result
-                ecipher.update(new byte[20], 0, 20, cipherText);
-                
-                fail("failed exception test - no ShortBufferException thrown");
-            }
-            catch (ShortBufferException e)
-            {
-                // ignore
-            }
-        }
-        catch (Exception e)
-        {
-            fail("unexpected exception.", e);
-        }
-
-        try
-        {
-            byte[] rawDESKey = { (byte)128, (byte)131, (byte)133, (byte)134,
-                    (byte)137, (byte)138, (byte)140, (byte)143 };
-
-            SecretKeySpec cipherKey = new SecretKeySpec(rawDESKey, "DES");
-            Cipher ecipher = Cipher.getInstance("DES/ECB/PKCS5Padding", "BC");
-            ecipher.init(Cipher.ENCRYPT_MODE, cipherKey);
-
-            byte[] cipherText = new byte[0];
-            try
-            {
-                // According specification Method enginedoFinal(byte[] input,
-                // int inputOffset, int inputLen, byte[] output, int
-                // outputOffset)
-                // throws ShortBufferException - if the given output buffer is
-                // too
-                // small to hold the result
-                ecipher.doFinal(new byte[20], 0, 20, cipherText);
-
-                fail("failed exception test - no ShortBufferException thrown");
-            }
-            catch (ShortBufferException e)
-            {
-                // ignore
-            }
-        }
-        catch (Exception e)
-        {
-            fail("unexpected exception.", e);
-        }
-
-        try
-        {
-            KeyGenerator keyGen = KeyGenerator.getInstance("DES", "BC");
-
-            keyGen.init((SecureRandom)null);
-
-            // According specification engineGenerateKey() doesn't throw any exceptions.
-
-            SecretKey key = keyGen.generateKey();
-            if (key == null)
-            {
-                fail("key is null!");
-            }
-        }
-        catch (Exception e)
-        {
-            fail("unexpected exception.", e);
-        }
-
-        try
-        {
-            AlgorithmParameters algParams = AlgorithmParameters.getInstance("DES", "BC");
-            
-            algParams.init(new IvParameterSpec(new byte[8]));
-
-            // According specification engineGetEncoded() returns
-            // the parameters in their primary encoding format. The primary
-            // encoding
-            // format for parameters is ASN.1, if an ASN.1 specification for
-            // this type
-            // of parameters exists.
-            byte[] iv = algParams.getEncoded();
-            
-            if (iv.length != 10)
-            {
-                fail("parameters encoding wrong length - "  + iv.length);
-            }
-        }
-        catch (Exception e)
-        {
-            fail("unexpected exception.", e);
-        }
-
-        try
-        {
-            try
-            {
-                AlgorithmParameters algParams = AlgorithmParameters.getInstance("DES", "BC");
-    
-                byte[] encoding = new byte[10];
-                encoding[0] = 3;
-                encoding[1] = 8;
-    
-                // According specification engineInit(byte[] params, String format)
-                // throws
-                // IOException on decoding errors, but BC throws ClassCastException.
-                algParams.init(encoding, "ASN.1");
-    
-                fail("failed exception test - no IOException thrown");
-            }
-            catch (IOException e)
-            {
-                // okay
-            }
-            
-            try
-            {
-                Cipher c = Cipher.getInstance("DES", "BC");
-    
-                Key k = new PublicKey()
-                {
-
-                    public String getAlgorithm()
-                    {
-                        return "STUB";
-                    }
-
-                    public String getFormat()
-                    {
-                        return null;
-                    }
-
-                    public byte[] getEncoded()
-                    {
-                        return null;
-                    }
-                    
-                };
-    
-                c.init(Cipher.ENCRYPT_MODE, k);
-    
-                fail("failed exception test - no InvalidKeyException thrown for public key");
-            }
-            catch (InvalidKeyException e)
-            {
-                // okay
-            }
-            
-            try
-            {
-                Cipher c = Cipher.getInstance("DES", "BC");
-    
-                Key k = new PrivateKey()
-                {
-
-                    public String getAlgorithm()
-                    {
-                        return "STUB";
-                    }
-
-                    public String getFormat()
-                    {
-                        return null;
-                    }
-
-                    public byte[] getEncoded()
-                    {
-                        return null;
-                    }
-                    
-                };
-    
-                c.init(Cipher.DECRYPT_MODE, k);
-    
-                fail("failed exception test - no InvalidKeyException thrown for private key");
-            }
-            catch (InvalidKeyException e)
-            {
-                // okay
-            }
-        }
-        catch (Exception e)
-        {
-            fail("unexpected exception.", e);
-        }
-    }
-    
-    public void performTest()
-    {
-        for (int i = 0; i != cipherTests1.length; i += 2)
-        {
-            test(cipherTests1[i], input1, Hex.decode(cipherTests1[i + 1]));
-        }
-
-        for (int i = 0; i != cipherTests2.length; i += 2)
-        {
-            test(cipherTests2[i], input2, Hex.decode(cipherTests2[i + 1]));
-        }
-
-        for (int i = 0; i != cipherTestsLargeBlock.length; i += 2)
-        {
-            test(cipherTestsLargeBlock[i], inputLargeBlock, Hex.decode(cipherTestsLargeBlock[i + 1]));
-        }
-
-        //
-        // check for less than a block
-        //
-        try
-        {
-            Cipher c = Cipher.getInstance("AES/CTS/NoPadding", "BC");
-            
-            c.init(Cipher.ENCRYPT_MODE, new SecretKeySpec(new byte[16], "AES"));
-            
-            c.doFinal(new byte[4]);
-            
-            fail("CTS failed to throw exception");
-        }
-        catch (Exception e)
-        {
-            if (!(e instanceof IllegalBlockSizeException))
-            {
-                fail("CTS exception test - " + e, e);
-            }
-        }
-        
-        testExceptions();
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        Security.addProvider(new BouncyCastleProvider());
-
-        runTest(new BlockCipherTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/CMacTest.java b/bcprov/src/main/java/org/bouncycastle/jce/provider/test/CMacTest.java
deleted file mode 100644
index 29ffc7f..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/CMacTest.java
+++ /dev/null
@@ -1,288 +0,0 @@
-package org.bouncycastle.jce.provider.test;
-
-import java.security.Security;
-
-import javax.crypto.Mac;
-import javax.crypto.spec.SecretKeySpec;
-
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-
-/**
- * CMAC tester - <a href="http://www.nuee.nagoya-u.ac.jp/labs/tiwata/omac/tv/omac1-tv.txt">AES Official Test Vectors</a>.
- */
-public class CMacTest
-    extends SimpleTest
-{
-    private static final byte[] keyBytes128 = Hex.decode("2b7e151628aed2a6abf7158809cf4f3c");
-    private static final byte[] keyBytes192 = Hex.decode(
-              "8e73b0f7da0e6452c810f32b809079e5"
-            + "62f8ead2522c6b7b");
-    private static final byte[] keyBytes256 = Hex.decode(
-              "603deb1015ca71be2b73aef0857d7781"
-            + "1f352c073b6108d72d9810a30914dff4");
-
-    private static final byte[] input0 = Hex.decode("");
-    private static final byte[] input16 = Hex.decode("6bc1bee22e409f96e93d7e117393172a");
-    private static final byte[] input40 = Hex.decode(
-              "6bc1bee22e409f96e93d7e117393172a"
-            + "ae2d8a571e03ac9c9eb76fac45af8e5130c81c46a35ce411");
-    private static final byte[] input64 = Hex.decode(
-              "6bc1bee22e409f96e93d7e117393172a"
-            + "ae2d8a571e03ac9c9eb76fac45af8e51"
-            + "30c81c46a35ce411e5fbc1191a0a52ef"
-            + "f69f2445df4f9b17ad2b417be66c3710");
-
-    private static final byte[] output_k128_m0 = Hex.decode("bb1d6929e95937287fa37d129b756746");
-    private static final byte[] output_k128_m16 = Hex.decode("070a16b46b4d4144f79bdd9dd04a287c");
-    private static final byte[] output_k128_m40 = Hex.decode("dfa66747de9ae63030ca32611497c827");
-    private static final byte[] output_k128_m64 = Hex.decode("51f0bebf7e3b9d92fc49741779363cfe");
-
-    private static final byte[] output_k192_m0 = Hex.decode("d17ddf46adaacde531cac483de7a9367");
-    private static final byte[] output_k192_m16 = Hex.decode("9e99a7bf31e710900662f65e617c5184");
-    private static final byte[] output_k192_m40 = Hex.decode("8a1de5be2eb31aad089a82e6ee908b0e");
-    private static final byte[] output_k192_m64 = Hex.decode("a1d5df0eed790f794d77589659f39a11");
-
-    private static final byte[] output_k256_m0 = Hex.decode("028962f61b7bf89efc6b551f4667d983");
-    private static final byte[] output_k256_m16 = Hex.decode("28a7023f452e8f82bd4bf28d8c37c35c");
-    private static final byte[] output_k256_m40 = Hex.decode("aaf3d8f1de5640c232f5b169b9c911e6");
-    private static final byte[] output_k256_m64 = Hex.decode("e1992190549f6ed5696a2c056c315410");
-
-    private final byte[] output_des_ede = Hex.decode("1ca670dea381d37c");
-
-    public CMacTest()
-    {
-    }
-
-    public void performTest()
-        throws Exception
-    {
-        Mac mac = Mac.getInstance("AESCMAC", "BC");
-
-        //128 bytes key
-
-        SecretKeySpec key = new SecretKeySpec(keyBytes128, "AES");
-
-        // 0 bytes message - 128 bytes key
-        mac.init(key);
-
-        mac.update(input0, 0, input0.length);
-
-        byte[] out = new byte[mac.getMacLength()];
-
-        mac.doFinal(out, 0);
-
-        if (!areEqual(out, output_k128_m0))
-        {
-            fail("Failed - expected " + new String(Hex.encode(output_k128_m0))
-                + " got " + new String(Hex.encode(out)));
-        }
-
-        // 16 bytes message - 128 bytes key
-        mac.init(key);
-
-        mac.update(input16, 0, input16.length);
-
-        out = new byte[mac.getMacLength()];
-
-        mac.doFinal(out, 0);
-
-        if (!areEqual(out, output_k128_m16))
-        {
-            fail("Failed - expected " + new String(Hex.encode(output_k128_m16))
-                + " got " + new String(Hex.encode(out)));
-        }
-
-        // 40 bytes message - 128 bytes key
-        mac.init(key);
-
-        mac.update(input40, 0, input40.length);
-
-        out = new byte[mac.getMacLength()];
-
-        mac.doFinal(out, 0);
-
-        if (!areEqual(out, output_k128_m40))
-        {
-            fail("Failed - expected " + new String(Hex.encode(output_k128_m40))
-                + " got " + new String(Hex.encode(out)));
-        }
-
-        // 64 bytes message - 128 bytes key
-        mac.init(key);
-
-        mac.update(input64, 0, input64.length);
-
-        out = new byte[mac.getMacLength()];
-
-        mac.doFinal(out, 0);
-
-        if (!areEqual(out, output_k128_m64))
-        {
-            fail("Failed - expected " + new String(Hex.encode(output_k128_m64))
-                + " got " + new String(Hex.encode(out)));
-        }
-
-        //192 bytes key
-
-        key = new SecretKeySpec(keyBytes192, "AES");
-
-        // 0 bytes message - 192 bytes key
-        mac.init(key);
-
-        mac.update(input0, 0, input0.length);
-
-        out = new byte[mac.getMacLength()];
-
-        mac.doFinal(out, 0);
-
-        if (!areEqual(out, output_k192_m0))
-        {
-            fail("Failed - expected " + new String(Hex.encode(output_k192_m0))
-                + " got " + new String(Hex.encode(out)));
-        }
-
-        // 16 bytes message - 192 bytes key
-        mac.init(key);
-
-        mac.update(input16, 0, input16.length);
-
-        out = new byte[mac.getMacLength()];
-
-        mac.doFinal(out, 0);
-
-        if (!areEqual(out, output_k192_m16))
-        {
-            fail("Failed - expected " + new String(Hex.encode(output_k192_m16))
-                + " got " + new String(Hex.encode(out)));
-        }
-
-        // 40 bytes message - 192 bytes key
-        mac.init(key);
-
-        mac.update(input40, 0, input40.length);
-
-        out = new byte[mac.getMacLength()];
-
-        mac.doFinal(out, 0);
-
-        if (!areEqual(out, output_k192_m40))
-        {
-            fail("Failed - expected " + new String(Hex.encode(output_k192_m40))
-                + " got " + new String(Hex.encode(out)));
-        }
-
-        // 64 bytes message - 192 bytes key
-        mac.init(key);
-
-        mac.update(input64, 0, input64.length);
-
-        out = new byte[mac.getMacLength()];
-
-        mac.doFinal(out, 0);
-
-        if (!areEqual(out, output_k192_m64))
-        {
-            fail("Failed - expected " + new String(Hex.encode(output_k192_m64))
-                + " got " + new String(Hex.encode(out)));
-        }
-
-        //256 bytes key
-
-        key = new SecretKeySpec(keyBytes256, "AES");
-
-        // 0 bytes message - 256 bytes key
-        mac.init(key);
-
-        mac.update(input0, 0, input0.length);
-
-        out = new byte[mac.getMacLength()];
-
-        mac.doFinal(out, 0);
-
-        if (!areEqual(out, output_k256_m0))
-        {
-            fail("Failed - expected " + new String(Hex.encode(output_k256_m0))
-                + " got " + new String(Hex.encode(out)));
-        }
-
-        // 16 bytes message - 256 bytes key
-        mac.init(key);
-
-        mac.update(input16, 0, input16.length);
-
-        out = new byte[mac.getMacLength()];
-
-        mac.doFinal(out, 0);
-
-        if (!areEqual(out, output_k256_m16))
-        {
-            fail("Failed - expected " + new String(Hex.encode(output_k256_m16))
-                + " got " + new String(Hex.encode(out)));
-        }
-
-        // 40 bytes message - 256 bytes key
-        mac.init(key);
-
-        mac.update(input40, 0, input40.length);
-
-        out = new byte[mac.getMacLength()];
-
-        mac.doFinal(out, 0);
-
-        if (!areEqual(out, output_k256_m40))
-        {
-            fail("Failed - expected " + new String(Hex.encode(output_k256_m40))
-                + " got " + new String(Hex.encode(out)));
-        }
-
-        // 64 bytes message - 256 bytes key
-        mac.init(key);
-
-        mac.update(input64, 0, input64.length);
-
-        out = new byte[mac.getMacLength()];
-
-        mac.doFinal(out, 0);
-
-        if (!areEqual(out, output_k256_m64))
-        {
-            fail("Failed - expected " + new String(Hex.encode(output_k256_m64))
-                + " got " + new String(Hex.encode(out)));
-        }
-
-        mac = Mac.getInstance("DESedeCMAC", "BC");
-
-        //DESede
-
-        key = new SecretKeySpec(keyBytes128, "DESede");
-
-        // 0 bytes message - 128 bytes key
-        mac.init(key);
-
-        mac.update(input0, 0, input0.length);
-
-        out = new byte[mac.getMacLength()];
-
-        mac.doFinal(out, 0);
-
-        if (!areEqual(out, output_des_ede))
-        {
-            fail("Failed - expected " + new String(Hex.encode(output_des_ede))
-                + " got " + new String(Hex.encode(out)));
-        }
-    }
-
-    public String getName()
-    {
-        return "CMac";
-    }
-
-    public static void main(String[] args)
-    {
-        Security.addProvider(new BouncyCastleProvider());
-
-        runTest(new CMacTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/CRL5Test.java b/bcprov/src/main/java/org/bouncycastle/jce/provider/test/CRL5Test.java
deleted file mode 100644
index 8b1c022..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/CRL5Test.java
+++ /dev/null
@@ -1,268 +0,0 @@
-package org.bouncycastle.jce.provider.test;
-
-import java.io.ByteArrayInputStream;
-import java.security.Security;
-import java.security.cert.CertificateFactory;
-import java.security.cert.X509CRL;
-import java.security.cert.X509CRLEntry;
-import java.util.Iterator;
-import java.util.Set;
-
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.util.encoders.Base64;
-import org.bouncycastle.util.test.SimpleTest;
-
-public class CRL5Test
-    extends SimpleTest
-{
-    byte[] inDirectCrl = Base64.decode(
-            "MIIdXjCCHMcCAQEwDQYJKoZIhvcNAQEFBQAwdDELMAkGA1UEBhMCREUxHDAaBgNV"
-            +"BAoUE0RldXRzY2hlIFRlbGVrb20gQUcxFzAVBgNVBAsUDlQtVGVsZVNlYyBUZXN0"
-            +"MS4wDAYHAoIGAQoHFBMBMTAeBgNVBAMUF1QtVGVsZVNlYyBUZXN0IERJUiA4OlBO"
-            +"Fw0wNjA4MDQwODQ1MTRaFw0wNjA4MDQxNDQ1MTRaMIIbfzB+AgQvrj/pFw0wMzA3"
-            +"MjIwNTQxMjhaMGcwZQYDVR0dAQH/BFswWaRXMFUxCzAJBgNVBAYTAkRFMRwwGgYD"
-            +"VQQKFBNEZXV0c2NoZSBUZWxla29tIEFHMSgwDAYHAoIGAQoHFBMBMTAYBgNVBAMU"
-            +"EVNpZ0cgVGVzdCBDQSA0OlBOMH4CBC+uP+oXDTAzMDcyMjA1NDEyOFowZzBlBgNV"
-            +"HR0BAf8EWzBZpFcwVTELMAkGA1UEBhMCREUxHDAaBgNVBAoUE0RldXRzY2hlIFRl"
-            +"bGVrb20gQUcxKDAMBgcCggYBCgcUEwExMBgGA1UEAxQRU2lnRyBUZXN0IENBIDQ6"
-            +"UE4wfgIEL64/5xcNMDQwNDA1MTMxODE3WjBnMGUGA1UdHQEB/wRbMFmkVzBVMQsw"
-            +"CQYDVQQGEwJERTEcMBoGA1UEChQTRGV1dHNjaGUgVGVsZWtvbSBBRzEoMAwGBwKC"
-            +"BgEKBxQTATEwGAYDVQQDFBFTaWdHIFRlc3QgQ0EgNDpQTjB+AgQvrj/oFw0wNDA0"
-            +"MDUxMzE4MTdaMGcwZQYDVR0dAQH/BFswWaRXMFUxCzAJBgNVBAYTAkRFMRwwGgYD"
-            +"VQQKFBNEZXV0c2NoZSBUZWxla29tIEFHMSgwDAYHAoIGAQoHFBMBMTAYBgNVBAMU"
-            +"EVNpZ0cgVGVzdCBDQSA0OlBOMH4CBC+uP+UXDTAzMDExMzExMTgxMVowZzBlBgNV"
-            +"HR0BAf8EWzBZpFcwVTELMAkGA1UEBhMCREUxHDAaBgNVBAoUE0RldXRzY2hlIFRl"
-            +"bGVrb20gQUcxKDAMBgcCggYBCgcUEwExMBgGA1UEAxQRU2lnRyBUZXN0IENBIDQ6"
-            +"UE4wfgIEL64/5hcNMDMwMTEzMTExODExWjBnMGUGA1UdHQEB/wRbMFmkVzBVMQsw"
-            +"CQYDVQQGEwJERTEcMBoGA1UEChQTRGV1dHNjaGUgVGVsZWtvbSBBRzEoMAwGBwKC"
-            +"BgEKBxQTATEwGAYDVQQDFBFTaWdHIFRlc3QgQ0EgNDpQTjB+AgQvrj/jFw0wMzAx"
-            +"MTMxMTI2NTZaMGcwZQYDVR0dAQH/BFswWaRXMFUxCzAJBgNVBAYTAkRFMRwwGgYD"
-            +"VQQKFBNEZXV0c2NoZSBUZWxla29tIEFHMSgwDAYHAoIGAQoHFBMBMTAYBgNVBAMU"
-            +"EVNpZ0cgVGVzdCBDQSA0OlBOMH4CBC+uP+QXDTAzMDExMzExMjY1NlowZzBlBgNV"
-            +"HR0BAf8EWzBZpFcwVTELMAkGA1UEBhMCREUxHDAaBgNVBAoUE0RldXRzY2hlIFRl"
-            +"bGVrb20gQUcxKDAMBgcCggYBCgcUEwExMBgGA1UEAxQRU2lnRyBUZXN0IENBIDQ6"
-            +"UE4wfgIEL64/4hcNMDQwNzEzMDc1ODM4WjBnMGUGA1UdHQEB/wRbMFmkVzBVMQsw"
-            +"CQYDVQQGEwJERTEcMBoGA1UEChQTRGV1dHNjaGUgVGVsZWtvbSBBRzEoMAwGBwKC"
-            +"BgEKBxQTATEwGAYDVQQDFBFTaWdHIFRlc3QgQ0EgNDpQTjB+AgQvrj/eFw0wMzAy"
-            +"MTcwNjMzMjVaMGcwZQYDVR0dAQH/BFswWaRXMFUxCzAJBgNVBAYTAkRFMRwwGgYD"
-            +"VQQKFBNEZXV0c2NoZSBUZWxla29tIEFHMSgwDAYHAoIGAQoHFBMBMTAYBgNVBAMU"
-            +"EVNpZ0cgVGVzdCBDQSA0OlBOMH4CBC+uP98XDTAzMDIxNzA2MzMyNVowZzBlBgNV"
-            +"HR0BAf8EWzBZpFcwVTELMAkGA1UEBhMCREUxHDAaBgNVBAoUE0RldXRzY2hlIFRl"
-            +"bGVrb20gQUcxKDAMBgcCggYBCgcUEwExMBgGA1UEAxQRU2lnRyBUZXN0IENBIDQ6"
-            +"UE4wfgIEL64/0xcNMDMwMjE3MDYzMzI1WjBnMGUGA1UdHQEB/wRbMFmkVzBVMQsw"
-            +"CQYDVQQGEwJERTEcMBoGA1UEChQTRGV1dHNjaGUgVGVsZWtvbSBBRzEoMAwGBwKC"
-            +"BgEKBxQTATEwGAYDVQQDFBFTaWdHIFRlc3QgQ0EgNDpQTjB+AgQvrj/dFw0wMzAx"
-            +"MTMxMTI4MTRaMGcwZQYDVR0dAQH/BFswWaRXMFUxCzAJBgNVBAYTAkRFMRwwGgYD"
-            +"VQQKFBNEZXV0c2NoZSBUZWxla29tIEFHMSgwDAYHAoIGAQoHFBMBMTAYBgNVBAMU"
-            +"EVNpZ0cgVGVzdCBDQSA0OlBOMH4CBC+uP9cXDTAzMDExMzExMjcwN1owZzBlBgNV"
-            +"HR0BAf8EWzBZpFcwVTELMAkGA1UEBhMCREUxHDAaBgNVBAoUE0RldXRzY2hlIFRl"
-            +"bGVrb20gQUcxKDAMBgcCggYBCgcUEwExMBgGA1UEAxQRU2lnRyBUZXN0IENBIDQ6"
-            +"UE4wfgIEL64/2BcNMDMwMTEzMTEyNzA3WjBnMGUGA1UdHQEB/wRbMFmkVzBVMQsw"
-            +"CQYDVQQGEwJERTEcMBoGA1UEChQTRGV1dHNjaGUgVGVsZWtvbSBBRzEoMAwGBwKC"
-            +"BgEKBxQTATEwGAYDVQQDFBFTaWdHIFRlc3QgQ0EgNDpQTjB+AgQvrj/VFw0wMzA0"
-            +"MzAxMjI3NTNaMGcwZQYDVR0dAQH/BFswWaRXMFUxCzAJBgNVBAYTAkRFMRwwGgYD"
-            +"VQQKFBNEZXV0c2NoZSBUZWxla29tIEFHMSgwDAYHAoIGAQoHFBMBMTAYBgNVBAMU"
-            +"EVNpZ0cgVGVzdCBDQSA0OlBOMH4CBC+uP9YXDTAzMDQzMDEyMjc1M1owZzBlBgNV"
-            +"HR0BAf8EWzBZpFcwVTELMAkGA1UEBhMCREUxHDAaBgNVBAoUE0RldXRzY2hlIFRl"
-            +"bGVrb20gQUcxKDAMBgcCggYBCgcUEwExMBgGA1UEAxQRU2lnRyBUZXN0IENBIDQ6"
-            +"UE4wfgIEL64/xhcNMDMwMjEyMTM0NTQwWjBnMGUGA1UdHQEB/wRbMFmkVzBVMQsw"
-            +"CQYDVQQGEwJERTEcMBoGA1UEChQTRGV1dHNjaGUgVGVsZWtvbSBBRzEoMAwGBwKC"
-            +"BgEKBxQTATEwGAYDVQQDFBFUVEMgVGVzdCBDQSAxMTpQTjCBkAIEL64/xRcNMDMw"
-            +"MjEyMTM0NTQwWjB5MHcGA1UdHQEB/wRtMGukaTBnMQswCQYDVQQGEwJERTEcMBoG"
-            +"A1UEChQTRGV1dHNjaGUgVGVsZWtvbSBBRzEQMA4GA1UECxQHVGVsZVNlYzEoMAwG"
-            +"BwKCBgEKBxQTATEwGAYDVQQDFBFTaWdHIFRlc3QgQ0EgNTpQTjB+AgQvrj/CFw0w"
-            +"MzAyMTIxMzA5MTZaMGcwZQYDVR0dAQH/BFswWaRXMFUxCzAJBgNVBAYTAkRFMRww"
-            +"GgYDVQQKFBNEZXV0c2NoZSBUZWxla29tIEFHMSgwDAYHAoIGAQoHFBMBMTAYBgNV"
-            +"BAMUEVRUQyBUZXN0IENBIDExOlBOMIGQAgQvrj/BFw0wMzAyMTIxMzA4NDBaMHkw"
-            +"dwYDVR0dAQH/BG0wa6RpMGcxCzAJBgNVBAYTAkRFMRwwGgYDVQQKFBNEZXV0c2No"
-            +"ZSBUZWxla29tIEFHMRAwDgYDVQQLFAdUZWxlU2VjMSgwDAYHAoIGAQoHFBMBMTAY"
-            +"BgNVBAMUEVNpZ0cgVGVzdCBDQSA1OlBOMH4CBC+uP74XDTAzMDIxNzA2MzcyNVow"
-            +"ZzBlBgNVHR0BAf8EWzBZpFcwVTELMAkGA1UEBhMCREUxHDAaBgNVBAoUE0RldXRz"
-            +"Y2hlIFRlbGVrb20gQUcxKDAMBgcCggYBCgcUEwExMBgGA1UEAxQRVFRDIFRlc3Qg"
-            +"Q0EgMTE6UE4wgZACBC+uP70XDTAzMDIxNzA2MzcyNVoweTB3BgNVHR0BAf8EbTBr"
-            +"pGkwZzELMAkGA1UEBhMCREUxHDAaBgNVBAoUE0RldXRzY2hlIFRlbGVrb20gQUcx"
-            +"EDAOBgNVBAsUB1RlbGVTZWMxKDAMBgcCggYBCgcUEwExMBgGA1UEAxQRU2lnRyBU"
-            +"ZXN0IENBIDU6UE4wgZACBC+uP7AXDTAzMDIxMjEzMDg1OVoweTB3BgNVHR0BAf8E"
-            +"bTBrpGkwZzELMAkGA1UEBhMCREUxHDAaBgNVBAoUE0RldXRzY2hlIFRlbGVrb20g"
-            +"QUcxEDAOBgNVBAsUB1RlbGVTZWMxKDAMBgcCggYBCgcUEwExMBgGA1UEAxQRU2ln"
-            +"RyBUZXN0IENBIDU6UE4wgZACBC+uP68XDTAzMDIxNzA2MzcyNVoweTB3BgNVHR0B"
-            +"Af8EbTBrpGkwZzELMAkGA1UEBhMCREUxHDAaBgNVBAoUE0RldXRzY2hlIFRlbGVr"
-            +"b20gQUcxEDAOBgNVBAsUB1RlbGVTZWMxKDAMBgcCggYBCgcUEwExMBgGA1UEAxQR"
-            +"U2lnRyBUZXN0IENBIDU6UE4wfgIEL64/kxcNMDMwNDEwMDUyNjI4WjBnMGUGA1Ud"
-            +"HQEB/wRbMFmkVzBVMQswCQYDVQQGEwJERTEcMBoGA1UEChQTRGV1dHNjaGUgVGVs"
-            +"ZWtvbSBBRzEoMAwGBwKCBgEKBxQTATEwGAYDVQQDFBFUVEMgVGVzdCBDQSAxMTpQ"
-            +"TjCBkAIEL64/khcNMDMwNDEwMDUyNjI4WjB5MHcGA1UdHQEB/wRtMGukaTBnMQsw"
-            +"CQYDVQQGEwJERTEcMBoGA1UEChQTRGV1dHNjaGUgVGVsZWtvbSBBRzEQMA4GA1UE"
-            +"CxQHVGVsZVNlYzEoMAwGBwKCBgEKBxQTATEwGAYDVQQDFBFTaWdHIFRlc3QgQ0Eg"
-            +"NTpQTjB+AgQvrj8/Fw0wMzAyMjYxMTA0NDRaMGcwZQYDVR0dAQH/BFswWaRXMFUx"
-            +"CzAJBgNVBAYTAkRFMRwwGgYDVQQKFBNEZXV0c2NoZSBUZWxla29tIEFHMSgwDAYH"
-            +"AoIGAQoHFBMBMTAYBgNVBAMUEVRUQyBUZXN0IENBIDExOlBOMIGQAgQvrj8+Fw0w"
-            +"MzAyMjYxMTA0NDRaMHkwdwYDVR0dAQH/BG0wa6RpMGcxCzAJBgNVBAYTAkRFMRww"
-            +"GgYDVQQKFBNEZXV0c2NoZSBUZWxla29tIEFHMRAwDgYDVQQLFAdUZWxlU2VjMSgw"
-            +"DAYHAoIGAQoHFBMBMTAYBgNVBAMUEVNpZ0cgVGVzdCBDQSA1OlBOMH4CBC+uPs0X"
-            +"DTAzMDUyMDA1MjczNlowZzBlBgNVHR0BAf8EWzBZpFcwVTELMAkGA1UEBhMCREUx"
-            +"HDAaBgNVBAoUE0RldXRzY2hlIFRlbGVrb20gQUcxKDAMBgcCggYBCgcUEwExMBgG"
-            +"A1UEAxQRVFRDIFRlc3QgQ0EgMTE6UE4wgZACBC+uPswXDTAzMDUyMDA1MjczNlow"
-            +"eTB3BgNVHR0BAf8EbTBrpGkwZzELMAkGA1UEBhMCREUxHDAaBgNVBAoUE0RldXRz"
-            +"Y2hlIFRlbGVrb20gQUcxEDAOBgNVBAsUB1RlbGVTZWMxKDAMBgcCggYBCgcUEwEx"
-            +"MBgGA1UEAxQRU2lnRyBUZXN0IENBIDY6UE4wfgIEL64+PBcNMDMwNjE3MTAzNDE2"
-            +"WjBnMGUGA1UdHQEB/wRbMFmkVzBVMQswCQYDVQQGEwJERTEcMBoGA1UEChQTRGV1"
-            +"dHNjaGUgVGVsZWtvbSBBRzEoMAwGBwKCBgEKBxQTATEwGAYDVQQDFBFUVEMgVGVz"
-            +"dCBDQSAxMTpQTjCBkAIEL64+OxcNMDMwNjE3MTAzNDE2WjB5MHcGA1UdHQEB/wRt"
-            +"MGukaTBnMQswCQYDVQQGEwJERTEcMBoGA1UEChQTRGV1dHNjaGUgVGVsZWtvbSBB"
-            +"RzEQMA4GA1UECxQHVGVsZVNlYzEoMAwGBwKCBgEKBxQTATEwGAYDVQQDFBFTaWdH"
-            +"IFRlc3QgQ0EgNjpQTjCBkAIEL64+OhcNMDMwNjE3MTAzNDE2WjB5MHcGA1UdHQEB"
-            +"/wRtMGukaTBnMQswCQYDVQQGEwJERTEcMBoGA1UEChQTRGV1dHNjaGUgVGVsZWtv"
-            +"bSBBRzEQMA4GA1UECxQHVGVsZVNlYzEoMAwGBwKCBgEKBxQTATEwGAYDVQQDFBFT"
-            +"aWdHIFRlc3QgQ0EgNjpQTjB+AgQvrj45Fw0wMzA2MTcxMzAxMDBaMGcwZQYDVR0d"
-            +"AQH/BFswWaRXMFUxCzAJBgNVBAYTAkRFMRwwGgYDVQQKFBNEZXV0c2NoZSBUZWxl"
-            +"a29tIEFHMSgwDAYHAoIGAQoHFBMBMTAYBgNVBAMUEVRUQyBUZXN0IENBIDExOlBO"
-            +"MIGQAgQvrj44Fw0wMzA2MTcxMzAxMDBaMHkwdwYDVR0dAQH/BG0wa6RpMGcxCzAJ"
-            +"BgNVBAYTAkRFMRwwGgYDVQQKFBNEZXV0c2NoZSBUZWxla29tIEFHMRAwDgYDVQQL"
-            +"FAdUZWxlU2VjMSgwDAYHAoIGAQoHFBMBMTAYBgNVBAMUEVNpZ0cgVGVzdCBDQSA2"
-            +"OlBOMIGQAgQvrj43Fw0wMzA2MTcxMzAxMDBaMHkwdwYDVR0dAQH/BG0wa6RpMGcx"
-            +"CzAJBgNVBAYTAkRFMRwwGgYDVQQKFBNEZXV0c2NoZSBUZWxla29tIEFHMRAwDgYD"
-            +"VQQLFAdUZWxlU2VjMSgwDAYHAoIGAQoHFBMBMTAYBgNVBAMUEVNpZ0cgVGVzdCBD"
-            +"QSA2OlBOMIGQAgQvrj42Fw0wMzA2MTcxMzAxMDBaMHkwdwYDVR0dAQH/BG0wa6Rp"
-            +"MGcxCzAJBgNVBAYTAkRFMRwwGgYDVQQKFBNEZXV0c2NoZSBUZWxla29tIEFHMRAw"
-            +"DgYDVQQLFAdUZWxlU2VjMSgwDAYHAoIGAQoHFBMBMTAYBgNVBAMUEVNpZ0cgVGVz"
-            +"dCBDQSA2OlBOMIGQAgQvrj4zFw0wMzA2MTcxMDM3NDlaMHkwdwYDVR0dAQH/BG0w"
-            +"a6RpMGcxCzAJBgNVBAYTAkRFMRwwGgYDVQQKFBNEZXV0c2NoZSBUZWxla29tIEFH"
-            +"MRAwDgYDVQQLFAdUZWxlU2VjMSgwDAYHAoIGAQoHFBMBMTAYBgNVBAMUEVNpZ0cg"
-            +"VGVzdCBDQSA2OlBOMH4CBC+uPjEXDTAzMDYxNzEwNDI1OFowZzBlBgNVHR0BAf8E"
-            +"WzBZpFcwVTELMAkGA1UEBhMCREUxHDAaBgNVBAoUE0RldXRzY2hlIFRlbGVrb20g"
-            +"QUcxKDAMBgcCggYBCgcUEwExMBgGA1UEAxQRVFRDIFRlc3QgQ0EgMTE6UE4wgZAC"
-            +"BC+uPjAXDTAzMDYxNzEwNDI1OFoweTB3BgNVHR0BAf8EbTBrpGkwZzELMAkGA1UE"
-            +"BhMCREUxHDAaBgNVBAoUE0RldXRzY2hlIFRlbGVrb20gQUcxEDAOBgNVBAsUB1Rl"
-            +"bGVTZWMxKDAMBgcCggYBCgcUEwExMBgGA1UEAxQRU2lnRyBUZXN0IENBIDY6UE4w"
-            +"gZACBC+uPakXDTAzMTAyMjExMzIyNFoweTB3BgNVHR0BAf8EbTBrpGkwZzELMAkG"
-            +"A1UEBhMCREUxHDAaBgNVBAoUE0RldXRzY2hlIFRlbGVrb20gQUcxEDAOBgNVBAsU"
-            +"B1RlbGVTZWMxKDAMBgcCggYBCgcUEwExMBgGA1UEAxQRU2lnRyBUZXN0IENBIDY6"
-            +"UE4wgZACBC+uPLIXDTA1MDMxMTA2NDQyNFoweTB3BgNVHR0BAf8EbTBrpGkwZzEL"
-            +"MAkGA1UEBhMCREUxHDAaBgNVBAoUE0RldXRzY2hlIFRlbGVrb20gQUcxEDAOBgNV"
-            +"BAsUB1RlbGVTZWMxKDAMBgcCggYBCgcUEwExMBgGA1UEAxQRU2lnRyBUZXN0IENB"
-            +"IDY6UE4wgZACBC+uPKsXDTA0MDQwMjA3NTQ1M1oweTB3BgNVHR0BAf8EbTBrpGkw"
-            +"ZzELMAkGA1UEBhMCREUxHDAaBgNVBAoUE0RldXRzY2hlIFRlbGVrb20gQUcxEDAO"
-            +"BgNVBAsUB1RlbGVTZWMxKDAMBgcCggYBCgcUEwExMBgGA1UEAxQRU2lnRyBUZXN0"
-            +"IENBIDY6UE4wgZACBC+uOugXDTA1MDEyNzEyMDMyNFoweTB3BgNVHR0BAf8EbTBr"
-            +"pGkwZzELMAkGA1UEBhMCREUxHDAaBgNVBAoUE0RldXRzY2hlIFRlbGVrb20gQUcx"
-            +"EDAOBgNVBAsUB1RlbGVTZWMxKDAMBgcCggYBCgcUEwExMBgGA1UEAxQRU2lnRyBU"
-            +"ZXN0IENBIDY6UE4wgZACBC+uOr4XDTA1MDIxNjA3NTcxNloweTB3BgNVHR0BAf8E"
-            +"bTBrpGkwZzELMAkGA1UEBhMCREUxHDAaBgNVBAoUE0RldXRzY2hlIFRlbGVrb20g"
-            +"QUcxEDAOBgNVBAsUB1RlbGVTZWMxKDAMBgcCggYBCgcUEwExMBgGA1UEAxQRU2ln"
-            +"RyBUZXN0IENBIDY6UE4wgZACBC+uOqcXDTA1MDMxMDA1NTkzNVoweTB3BgNVHR0B"
-            +"Af8EbTBrpGkwZzELMAkGA1UEBhMCREUxHDAaBgNVBAoUE0RldXRzY2hlIFRlbGVr"
-            +"b20gQUcxEDAOBgNVBAsUB1RlbGVTZWMxKDAMBgcCggYBCgcUEwExMBgGA1UEAxQR"
-            +"U2lnRyBUZXN0IENBIDY6UE4wgZACBC+uOjwXDTA1MDUxMTEwNDk0NloweTB3BgNV"
-            +"HR0BAf8EbTBrpGkwZzELMAkGA1UEBhMCREUxHDAaBgNVBAoUE0RldXRzY2hlIFRl"
-            +"bGVrb20gQUcxEDAOBgNVBAsUB1RlbGVTZWMxKDAMBgcCggYBCgcUEwExMBgGA1UE"
-            +"AxQRU2lnRyBUZXN0IENBIDY6UE4wgaoCBC+sbdUXDTA1MTExMTEwMDMyMVowgZIw"
-            +"gY8GA1UdHQEB/wSBhDCBgaR/MH0xCzAJBgNVBAYTAkRFMRwwGgYDVQQKFBNEZXV0"
-            +"c2NoZSBUZWxla29tIEFHMR8wHQYDVQQLFBZQcm9kdWt0emVudHJ1bSBUZWxlU2Vj"
-            +"MS8wDAYHAoIGAQoHFBMBMTAfBgNVBAMUGFRlbGVTZWMgUEtTIFNpZ0cgQ0EgMTpQ"
-            +"TjCBlQIEL64uaBcNMDYwMTIzMTAyNTU1WjB+MHwGA1UdHQEB/wRyMHCkbjBsMQsw"
-            +"CQYDVQQGEwJERTEcMBoGA1UEChQTRGV1dHNjaGUgVGVsZWtvbSBBRzEWMBQGA1UE"
-            +"CxQNWmVudHJhbGUgQm9ubjEnMAwGBwKCBgEKBxQTATEwFwYDVQQDFBBUVEMgVGVz"
-            +"dCBDQSA5OlBOMIGVAgQvribHFw0wNjA4MDEwOTQ4NDRaMH4wfAYDVR0dAQH/BHIw"
-            +"cKRuMGwxCzAJBgNVBAYTAkRFMRwwGgYDVQQKFBNEZXV0c2NoZSBUZWxla29tIEFH"
-            +"MRYwFAYDVQQLFA1aZW50cmFsZSBCb25uMScwDAYHAoIGAQoHFBMBMTAXBgNVBAMU"
-            +"EFRUQyBUZXN0IENBIDk6UE6ggZswgZgwCwYDVR0UBAQCAhEMMB8GA1UdIwQYMBaA"
-            +"FANbyNumDI9545HwlCF26NuOJC45MA8GA1UdHAEB/wQFMAOEAf8wVwYDVR0SBFAw"
-            +"ToZMbGRhcDovL3Brc2xkYXAudHR0Yy5kZS9vdT1ULVRlbGVTZWMgVGVzdCBESVIg"
-            +"ODpQTixvPURldXRzY2hlIFRlbGVrb20gQUcsYz1kZTANBgkqhkiG9w0BAQUFAAOB"
-            +"gQBewL5gLFHpeOWO07Vk3Gg7pRDuAlvaovBH4coCyCWpk5jEhUfFSYEDuaQB7do4"
-            +"IlJmeTHvkI0PIZWJ7bwQ2PVdipPWDx0NVwS/Cz5jUKiS3BbAmZQZOueiKLFpQq3A"
-            +"b8aOHA7WHU4078/1lM+bgeu33Ln1CGykEbmSjA/oKPi/JA==");
-    
-    byte[] directCRL = Base64.decode(
-            "MIIGXTCCBckCAQEwCgYGKyQDAwECBQAwdDELMAkGA1UEBhMCREUxHDAaBgNVBAoU"
-            +"E0RldXRzY2hlIFRlbGVrb20gQUcxFzAVBgNVBAsUDlQtVGVsZVNlYyBUZXN0MS4w"
-            +"DAYHAoIGAQoHFBMBMTAeBgNVBAMUF1QtVGVsZVNlYyBUZXN0IERJUiA4OlBOFw0w"
-            +"NjA4MDQwODQ1MTRaFw0wNjA4MDQxNDQ1MTRaMIIElTAVAgQvrj/pFw0wMzA3MjIw"
-            +"NTQxMjhaMBUCBC+uP+oXDTAzMDcyMjA1NDEyOFowFQIEL64/5xcNMDQwNDA1MTMx"
-            +"ODE3WjAVAgQvrj/oFw0wNDA0MDUxMzE4MTdaMBUCBC+uP+UXDTAzMDExMzExMTgx"
-            +"MVowFQIEL64/5hcNMDMwMTEzMTExODExWjAVAgQvrj/jFw0wMzAxMTMxMTI2NTZa"
-            +"MBUCBC+uP+QXDTAzMDExMzExMjY1NlowFQIEL64/4hcNMDQwNzEzMDc1ODM4WjAV"
-            +"AgQvrj/eFw0wMzAyMTcwNjMzMjVaMBUCBC+uP98XDTAzMDIxNzA2MzMyNVowFQIE"
-            +"L64/0xcNMDMwMjE3MDYzMzI1WjAVAgQvrj/dFw0wMzAxMTMxMTI4MTRaMBUCBC+u"
-            +"P9cXDTAzMDExMzExMjcwN1owFQIEL64/2BcNMDMwMTEzMTEyNzA3WjAVAgQvrj/V"
-            +"Fw0wMzA0MzAxMjI3NTNaMBUCBC+uP9YXDTAzMDQzMDEyMjc1M1owFQIEL64/xhcN"
-            +"MDMwMjEyMTM0NTQwWjAVAgQvrj/FFw0wMzAyMTIxMzQ1NDBaMBUCBC+uP8IXDTAz"
-            +"MDIxMjEzMDkxNlowFQIEL64/wRcNMDMwMjEyMTMwODQwWjAVAgQvrj++Fw0wMzAy"
-            +"MTcwNjM3MjVaMBUCBC+uP70XDTAzMDIxNzA2MzcyNVowFQIEL64/sBcNMDMwMjEy"
-            +"MTMwODU5WjAVAgQvrj+vFw0wMzAyMTcwNjM3MjVaMBUCBC+uP5MXDTAzMDQxMDA1"
-            +"MjYyOFowFQIEL64/khcNMDMwNDEwMDUyNjI4WjAVAgQvrj8/Fw0wMzAyMjYxMTA0"
-            +"NDRaMBUCBC+uPz4XDTAzMDIyNjExMDQ0NFowFQIEL64+zRcNMDMwNTIwMDUyNzM2"
-            +"WjAVAgQvrj7MFw0wMzA1MjAwNTI3MzZaMBUCBC+uPjwXDTAzMDYxNzEwMzQxNlow"
-            +"FQIEL64+OxcNMDMwNjE3MTAzNDE2WjAVAgQvrj46Fw0wMzA2MTcxMDM0MTZaMBUC"
-            +"BC+uPjkXDTAzMDYxNzEzMDEwMFowFQIEL64+OBcNMDMwNjE3MTMwMTAwWjAVAgQv"
-            +"rj43Fw0wMzA2MTcxMzAxMDBaMBUCBC+uPjYXDTAzMDYxNzEzMDEwMFowFQIEL64+"
-            +"MxcNMDMwNjE3MTAzNzQ5WjAVAgQvrj4xFw0wMzA2MTcxMDQyNThaMBUCBC+uPjAX"
-            +"DTAzMDYxNzEwNDI1OFowFQIEL649qRcNMDMxMDIyMTEzMjI0WjAVAgQvrjyyFw0w"
-            +"NTAzMTEwNjQ0MjRaMBUCBC+uPKsXDTA0MDQwMjA3NTQ1M1owFQIEL6466BcNMDUw"
-            +"MTI3MTIwMzI0WjAVAgQvrjq+Fw0wNTAyMTYwNzU3MTZaMBUCBC+uOqcXDTA1MDMx"
-            +"MDA1NTkzNVowFQIEL646PBcNMDUwNTExMTA0OTQ2WjAVAgQvrG3VFw0wNTExMTEx"
-            +"MDAzMjFaMBUCBC+uLmgXDTA2MDEyMzEwMjU1NVowFQIEL64mxxcNMDYwODAxMDk0"
-            +"ODQ0WqCBijCBhzALBgNVHRQEBAICEQwwHwYDVR0jBBgwFoAUA1vI26YMj3njkfCU"
-            +"IXbo244kLjkwVwYDVR0SBFAwToZMbGRhcDovL3Brc2xkYXAudHR0Yy5kZS9vdT1U"
-            +"LVRlbGVTZWMgVGVzdCBESVIgODpQTixvPURldXRzY2hlIFRlbGVrb20gQUcsYz1k"
-            +"ZTAKBgYrJAMDAQIFAAOBgQArj4eMlbAwuA2aS5O4UUUHQMKKdK/dtZi60+LJMiMY"
-            +"ojrMIf4+ZCkgm1Ca0Cd5T15MJxVHhh167Ehn/Hd48pdnAP6Dfz/6LeqkIHGWMHR+"
-            +"z6TXpwWB+P4BdUec1ztz04LypsznrHcLRa91ixg9TZCb1MrOG+InNhleRs1ImXk8"
-            +"MQ==");
-        
- 
-    public String getName()
-    {
-        return "CRL5";
-    }
-   
-    public void indirectCRLTest()
-        throws Exception
-    {
-        CertificateFactory cf = CertificateFactory.getInstance("X.509", "BC");
-        ByteArrayInputStream in = new ByteArrayInputStream(inDirectCrl);
-        X509CRL crl = (X509CRL) cf.generateCRL(in);
-        Set set = crl.getRevokedCertificates();
-        Iterator it = set.iterator();
-        while (it.hasNext())
-        {
-            if (((X509CRLEntry)it.next()).getCertificateIssuer() == null)
-            {
-                fail("certificate issuer CRL entry extension is null");
-            }
-        }
-    } 
-
-    public void directCRLTest()
-        throws Exception
-    {
-        CertificateFactory cf = CertificateFactory.getInstance("X.509", "BC");
-        ByteArrayInputStream in = new ByteArrayInputStream(directCRL);
-        X509CRL crl = (X509CRL) cf.generateCRL(in);
-        Set set = crl.getRevokedCertificates();
-        Iterator it = set.iterator();
-        while (it.hasNext())
-        {
-            if (((X509CRLEntry)it.next()).getCertificateIssuer() != null)
-            {
-                fail("certificate issuer CRL entry extension is not null");
-            }
-        }
-    }
-    
-    public void performTest()
-        throws Exception
-    {
-        indirectCRLTest();
-        directCRLTest();
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        Security.addProvider(new BouncyCastleProvider());
-
-        runTest(new CRL5Test());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/CamelliaTest.java b/bcprov/src/main/java/org/bouncycastle/jce/provider/test/CamelliaTest.java
deleted file mode 100644
index 9ee56c7..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/CamelliaTest.java
+++ /dev/null
@@ -1,189 +0,0 @@
-package org.bouncycastle.jce.provider.test;
-
-import org.bouncycastle.asn1.ntt.NTTObjectIdentifiers;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.util.encoders.Hex;
-
-import javax.crypto.Cipher;
-import javax.crypto.CipherInputStream;
-import javax.crypto.CipherOutputStream;
-import javax.crypto.spec.SecretKeySpec;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.DataInputStream;
-import java.io.IOException;
-import java.security.Key;
-import java.security.Security;
-
-/**
- * basic test class for Camellia
- */
-public class CamelliaTest
-    extends BaseBlockCipherTest
-{
-    static String[] cipherTests =
-    {
-        "128",
-        "0123456789abcdeffedcba9876543210",
-        "0123456789abcdeffedcba9876543210",
-        "67673138549669730857065648eabe43",
-        "192",
-        "0123456789abcdeffedcba98765432100011223344556677",
-        "0123456789abcdeffedcba9876543210",
-        "b4993401b3e996f84ee5cee7d79b09b9",
-        "256",
-        "0123456789abcdeffedcba987654321000112233445566778899aabbccddeeff",
-        "0123456789abcdeffedcba9876543210",
-        "9acc237dff16d76c20ef7c919e3a7509",
-    };
-
-    public CamelliaTest()
-    {
-        super("Camellia");
-    }
-
-    public void test(
-        int         strength,
-        byte[]      keyBytes,
-        byte[]      input,
-        byte[]      output)
-        throws Exception
-    {
-        Key key;
-        Cipher in, out;
-        CipherInputStream cIn;
-        CipherOutputStream cOut;
-        ByteArrayInputStream bIn;
-        ByteArrayOutputStream bOut;
-
-        key = new SecretKeySpec(keyBytes, "Camellia");
-
-        in = Cipher.getInstance("Camellia/ECB/NoPadding", "BC");
-        out = Cipher.getInstance("Camellia/ECB/NoPadding", "BC");
-
-        try
-        {
-            out.init(Cipher.ENCRYPT_MODE, key);
-        }
-        catch (Exception e)
-        {
-            fail("Camellia failed initialisation - " + e.toString(), e);
-        }
-
-        try
-        {
-            in.init(Cipher.DECRYPT_MODE, key);
-        }
-        catch (Exception e)
-        {
-            fail("Camellia failed initialisation - " + e.toString(), e);
-        }
-
-        //
-        // encryption pass
-        //
-        bOut = new ByteArrayOutputStream();
-
-        cOut = new CipherOutputStream(bOut, out);
-
-        try
-        {
-            for (int i = 0; i != input.length / 2; i++)
-            {
-                cOut.write(input[i]);
-            }
-            cOut.write(input, input.length / 2, input.length - input.length / 2);
-            cOut.close();
-        }
-        catch (IOException e)
-        {
-            fail("Camellia failed encryption - " + e.toString(), e);
-        }
-
-        byte[]    bytes;
-
-        bytes = bOut.toByteArray();
-
-        if (!areEqual(bytes, output))
-        {
-            fail("Camellia failed encryption - expected " + new String(Hex.encode(output)) + " got " + new String(Hex.encode(bytes)));
-        }
-
-        //
-        // decryption pass
-        //
-        bIn = new ByteArrayInputStream(bytes);
-
-        cIn = new CipherInputStream(bIn, in);
-
-        try
-        {
-            DataInputStream dIn = new DataInputStream(cIn);
-
-            bytes = new byte[input.length];
-
-            for (int i = 0; i != input.length / 2; i++)
-            {
-                bytes[i] = (byte)dIn.read();
-            }
-            dIn.readFully(bytes, input.length / 2, bytes.length - input.length / 2);
-        }
-        catch (Exception e)
-        {
-            fail("Camellia failed encryption - " + e.toString(), e);
-        }
-
-        if (!areEqual(bytes, input))
-        {
-            fail("Camellia failed decryption - expected " + new String(Hex.encode(input)) + " got " + new String(Hex.encode(bytes)));
-        }
-    }
-
-    public void performTest()
-        throws Exception
-    {
-        for (int i = 0; i != cipherTests.length; i += 4)
-        {
-            test(Integer.parseInt(cipherTests[i]),
-                            Hex.decode(cipherTests[i + 1]),
-                            Hex.decode(cipherTests[i + 2]),
-                            Hex.decode(cipherTests[i + 3]));
-        }
-
-        byte[]  kek1 = Hex.decode("000102030405060708090a0b0c0d0e0f");
-        byte[]  in1 = Hex.decode("00112233445566778899aabbccddeeff");
-        byte[]  out1 = Hex.decode("635d6ac46eedebd3a7f4a06421a4cbd1746b24795ba2f708");
-
-        wrapTest(1, "CamelliaWrap", kek1, in1, out1);
-
-        String[] oids = {
-                NTTObjectIdentifiers.id_camellia128_cbc.getId(),
-                NTTObjectIdentifiers.id_camellia192_cbc.getId(),
-                NTTObjectIdentifiers.id_camellia256_cbc.getId()
-        };
-
-        String[] names = {
-                "Camellia/CBC/PKCS7Padding",
-                "Camellia/CBC/PKCS7Padding",
-                "Camellia/CBC/PKCS7Padding"
-        };
-
-        oidTest(oids, names, 1);
-
-        String[] wrapOids = {
-                NTTObjectIdentifiers.id_camellia128_wrap.getId(),
-                NTTObjectIdentifiers.id_camellia192_wrap.getId(),
-                NTTObjectIdentifiers.id_camellia256_wrap.getId()
-        };
-
-        wrapOidTest(wrapOids, "CamelliaWrap");
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        Security.addProvider(new BouncyCastleProvider());
-
-        runTest(new CamelliaTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/CertPathBuilderTest.java b/bcprov/src/main/java/org/bouncycastle/jce/provider/test/CertPathBuilderTest.java
deleted file mode 100644
index 42f5878..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/CertPathBuilderTest.java
+++ /dev/null
@@ -1,140 +0,0 @@
-package org.bouncycastle.jce.provider.test;
-
-import java.io.ByteArrayInputStream;
-import java.math.BigInteger;
-import java.security.KeyPair;
-import java.security.Security;
-import java.security.cert.CertPath;
-import java.security.cert.CertPathBuilder;
-import java.security.cert.CertStore;
-import java.security.cert.CertificateFactory;
-import java.security.cert.CollectionCertStoreParameters;
-import java.security.cert.PKIXBuilderParameters;
-import java.security.cert.PKIXCertPathBuilderResult;
-import java.security.cert.TrustAnchor;
-import java.security.cert.X509CRL;
-import java.security.cert.X509CertSelector;
-import java.security.cert.X509Certificate;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.util.test.SimpleTest;
-
-public class CertPathBuilderTest
-    extends SimpleTest
-{
-
-    private void baseTest()
-        throws Exception
-    {
-        CertificateFactory cf = CertificateFactory.getInstance("X.509", "BC");
-
-            // initialise CertStore
-        X509Certificate rootCert = (X509Certificate)cf.generateCertificate(new ByteArrayInputStream(CertPathTest.rootCertBin));
-        X509Certificate interCert = (X509Certificate)cf.generateCertificate(new ByteArrayInputStream(CertPathTest.interCertBin));
-        X509Certificate finalCert = (X509Certificate)cf.generateCertificate(new ByteArrayInputStream(CertPathTest.finalCertBin));
-        X509CRL rootCrl = (X509CRL)cf.generateCRL(new ByteArrayInputStream(CertPathTest.rootCrlBin));
-        X509CRL interCrl = (X509CRL)cf.generateCRL(new ByteArrayInputStream(CertPathTest.interCrlBin));
-        List list = new ArrayList();
-        list.add(rootCert);
-        list.add(interCert);
-        list.add(finalCert);
-        list.add(rootCrl);
-        list.add(interCrl);
-        CollectionCertStoreParameters ccsp = new CollectionCertStoreParameters(list);
-        CertStore store = CertStore.getInstance("Collection", ccsp, "BC");
-        Date validDate = new Date(rootCrl.getThisUpdate().getTime() + 60 * 60 * 1000);
-
-            //Searching for rootCert by subjectDN without CRL
-        Set trust = new HashSet();
-        trust.add(new TrustAnchor(rootCert, null));
-
-        CertPathBuilder cpb = CertPathBuilder.getInstance("PKIX","BC");
-        X509CertSelector targetConstraints = new X509CertSelector();
-        targetConstraints.setSubject(finalCert.getSubjectX500Principal().getEncoded());
-        PKIXBuilderParameters params = new PKIXBuilderParameters(trust, targetConstraints);
-        params.addCertStore(store);
-        params.setDate(validDate);
-        PKIXCertPathBuilderResult result = (PKIXCertPathBuilderResult) cpb.build(params);
-        CertPath                  path = result.getCertPath();
-
-        if (path.getCertificates().size() != 2)
-        {
-            fail("wrong number of certs in baseTest path");
-        }
-    }
-
-    private void v0Test()
-        throws Exception
-    {
-        // create certificates and CRLs
-        KeyPair         rootPair = TestUtils.generateRSAKeyPair();
-        KeyPair         interPair = TestUtils.generateRSAKeyPair();
-        KeyPair         endPair = TestUtils.generateRSAKeyPair();
-
-        X509Certificate rootCert = TestUtils.generateRootCert(rootPair);
-        X509Certificate interCert = TestUtils.generateIntermediateCert(interPair.getPublic(), rootPair.getPrivate(), rootCert);
-        X509Certificate endCert = TestUtils.generateEndEntityCert(endPair.getPublic(), interPair.getPrivate(), interCert);
-
-        BigInteger      revokedSerialNumber = BigInteger.valueOf(2);
-        X509CRL         rootCRL = TestUtils.createCRL(rootCert, rootPair.getPrivate(), revokedSerialNumber);
-        X509CRL         interCRL = TestUtils.createCRL(interCert, interPair.getPrivate(), revokedSerialNumber);
-
-        // create CertStore to support path building
-        List list = new ArrayList();
-
-        list.add(rootCert);
-        list.add(interCert);
-        list.add(endCert);
-        list.add(rootCRL);
-        list.add(interCRL);
-
-        CollectionCertStoreParameters params = new CollectionCertStoreParameters(list);
-        CertStore                     store = CertStore.getInstance("Collection", params);
-
-        // build the path
-        CertPathBuilder  builder = CertPathBuilder.getInstance("PKIX", "BC");
-        X509CertSelector pathConstraints = new X509CertSelector();
-
-        pathConstraints.setSubject(endCert.getSubjectX500Principal().getEncoded());
-
-        PKIXBuilderParameters buildParams = new PKIXBuilderParameters(Collections.singleton(new TrustAnchor(rootCert, null)), pathConstraints);
-
-        buildParams.addCertStore(store);
-        buildParams.setDate(new Date());
-
-        PKIXCertPathBuilderResult result = (PKIXCertPathBuilderResult)builder.build(buildParams);
-        CertPath                  path = result.getCertPath();
-
-        if (path.getCertificates().size() != 2)
-        {
-            fail("wrong number of certs in v0Test path");
-        }
-    }
-
-    public void performTest()
-        throws Exception
-    {
-        baseTest();
-        v0Test();
-    }
-    
-    public String getName()
-    {
-        return "CertPathBuilder";
-    }
-
-    public static void main(
-        String[] args)
-    {
-        Security.addProvider(new BouncyCastleProvider());
-
-        runTest(new CertPathBuilderTest());
-    }
-}
-
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/CertPathTest.java b/bcprov/src/main/java/org/bouncycastle/jce/provider/test/CertPathTest.java
deleted file mode 100644
index 5e00b61..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/CertPathTest.java
+++ /dev/null
@@ -1,369 +0,0 @@
-package org.bouncycastle.jce.provider.test;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.ObjectOutputStream;
-import java.security.InvalidKeyException;
-import java.security.NoSuchAlgorithmException;
-import java.security.NoSuchProviderException;
-import java.security.PublicKey;
-import java.security.Security;
-import java.security.SignatureException;
-import java.security.cert.CertPath;
-import java.security.cert.CertPathBuilder;
-import java.security.cert.CertPathBuilderException;
-import java.security.cert.CertPathBuilderResult;
-import java.security.cert.CertStore;
-import java.security.cert.Certificate;
-import java.security.cert.CertificateEncodingException;
-import java.security.cert.CertificateException;
-import java.security.cert.CertificateFactory;
-import java.security.cert.CollectionCertStoreParameters;
-import java.security.cert.PKIXBuilderParameters;
-import java.security.cert.TrustAnchor;
-import java.security.cert.X509CertSelector;
-import java.security.cert.X509Certificate;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-import java.util.Vector;
-
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.util.encoders.Base64;
-import org.bouncycastle.util.test.SimpleTest;
-
-public class CertPathTest
-    extends SimpleTest
-{
-    public static byte[] rootCertBin = Base64.decode(
-        "MIIBqzCCARQCAQEwDQYJKoZIhvcNAQEFBQAwHjEcMBoGA1UEAxMTVGVzdCBDQSBDZXJ0aWZpY2F0ZTAeFw0wODA5MDQwNDQ1MDhaFw0wODA5MTEwNDQ1MDhaMB4xHDAaBgNVBAMTE1Rlc3QgQ0EgQ2VydGlmaWNhdGUwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMRLUjhPe4YUdLo6EcjKcWUOG7CydFTH53Pr1lWjOkbmszYDpkhCTT9LOsI+disk18nkBxSl8DAHTqV+VxtuTPt64iyi10YxyDeep+DwZG/f8cVQv97U3hA9cLurZ2CofkMLGr6JpSGCMZ9FcstcTdHB4lbErIJ54YqfF4pNOs4/AgMBAAEwDQYJKoZIhvcNAQEFBQADgYEAgyrTEFY7ALpeY59jL6xFOLpuPqoBOWrUWv6O+zy5BCU0qiX71r3BpigtxRj+DYcfLIM9FNERDoHu3TthD3nwYWUBtFX8N0QUJIdJabxqAMhLjSC744koiFpCYse5Ye3ZvEdFwDzgAQsJTp5eFGgTZPkPzcdhkFJ2p9+OWs+cb24=");
-
-
-    static byte[] interCertBin = Base64.decode(
-        "MIICSzCCAbSgAwIBAgIBATANBgkqhkiG9w0BAQUFADAeMRwwGgYDVQQDExNUZXN0IENBIENlcnRpZmljYXRlMB4XDTA4MDkwNDA0NDUwOFoXDTA4MDkxMTA0NDUwOFowKDEmMCQGA1UEAxMdVGVzdCBJbnRlcm1lZGlhdGUgQ2VydGlmaWNhdGUwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAISS9OOZ2wxzdWny9aVvk4Joq+dwSJ+oqvHUxX3PflZyuiLiCBUOUE4q59dGKdtNX5fIfwyK3cpV0e73Y/0fwfM3m9rOWFrCKOhfeswNTes0w/2PqPVVDDsF/nj7NApuqXwioeQlgTL251RDF4sVoxXqAU7lRkcqwZt3mwqS4KTJAgMBAAGjgY4wgYswRgYDVR0jBD8wPYAUhv8BOT27EB9JaCccJD4YASPP5XWhIqQgMB4xHDAaBgNVBAMTE1Rlc3QgQ0EgQ2VydGlmaWNhdGWCAQEwHQYDVR0OBBYEFL/IwAGOkHzaQyPZegy79CwM5oTFMBIGA1UdEwEB/wQIMAYBAf8CAQAwDgYDVR0PAQH/BAQDAgGGMA0GCSqGSIb3DQEBBQUAA4GBAE4TRgUz4sUvZyVdZxqV+XyNRnqXAeLOOqFGYv2D96tQrS+zjd0elVlT6lFrtchZdOmmX7R6/H/tjMWMcTBICZyRYrvK8cCAmDOI+EIdq5p6lj2Oq6Pbw/wruojAqNrpaR6IkwNpWtdOSSupv4IJL+YU9q2YFTh4R1j3tOkPoFGr");
-
-    static byte[] finalCertBin = Base64.decode(
-        "MIICRjCCAa+gAwIBAgIBATANBgkqhkiG9w0BAQUFADAoMSYwJAYDVQQDEx1UZXN0IEludGVybWVkaWF0ZSBDZXJ0aWZpY2F0ZTAeFw0wODA5MDQwNDQ1MDhaFw0wODA5MTEwNDQ1MDhaMB8xHTAbBgNVBAMTFFRlc3QgRW5kIENlcnRpZmljYXRlMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQChpUeo0tPYywWKiLlbWKNJBcCpSaLSlaZ+4+yer1AxI5yJIVHP6SAlBghlbD5Qne5ImnN/15cz1xwYAiul6vGKJkVPlFEe2Mr+g/J/WJPQQPsjbZ1G+vxbAwXEDA4KaQrnpjRZFq+CdKHwOjuPLYS/MYQNgdIvDVEQcTbPQ8GaiQIDAQABo4GIMIGFMEYGA1UdIwQ/MD2AFL/IwAGOkHzaQyPZegy79CwM5oTFoSKkIDAeMRwwGgYDVQQDExNUZXN0IENBIENlcnRpZmljYXRlggEBMB0GA1UdDgQWBBSVkw+VpqBf3zsLc/9GdkK9TzHPwDAMBgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIFoDANBgkqhkiG9w0BAQUFAAOBgQBLv/0bVDjzTs/y1vN3FUiZNknEbzupIZduTuXJjqv/vBX+LDPjUfu/+iOCXOSKoRn6nlOWhwB1z6taG2usQkFG8InMkRcPREi2uVgFdhJ/1C3dAWhsdlubjdL926bftXvxnx/koDzyrePW5U96RlOQM2qLvbaky2Giz6hrc3Wl+w==");
-    public static byte[] rootCrlBin = Base64.decode(
-        "MIIBYjCBzAIBATANBgkqhkiG9w0BAQsFADAeMRwwGgYDVQQDExNUZXN0IENBIENlcnRpZmljYXRlFw0wODA5MDQwNDQ1MDhaFw0wODA5MDQwNzMxNDhaMCIwIAIBAhcNMDgwOTA0MDQ0NTA4WjAMMAoGA1UdFQQDCgEJoFYwVDBGBgNVHSMEPzA9gBSG/wE5PbsQH0loJxwkPhgBI8/ldaEipCAwHjEcMBoGA1UEAxMTVGVzdCBDQSBDZXJ0aWZpY2F0ZYIBATAKBgNVHRQEAwIBATANBgkqhkiG9w0BAQsFAAOBgQCAbaFCo0BNG4AktVf6jjBLeawP1u0ELYkOCEGvYZE0mBpQ+OvFg7subZ6r3lRIj030nUli28sPFtu5ZQMBNcpE4nS1ziF44RfT3Lp5UgHx9x17Krz781iEyV+7zU8YxYMY9wULD+DCuK294kGKIssVNbmTYXZatBNoXQN5CLIocA==");
-    static byte[] interCrlBin = Base64.decode(
-        "MIIBbDCB1gIBATANBgkqhkiG9w0BAQsFADAoMSYwJAYDVQQDEx1UZXN0IEludGVybWVkaWF0ZSBDZXJ0aWZpY2F0ZRcNMDgwOTA0MDQ0NTA4WhcNMDgwOTA0MDczMTQ4WjAiMCACAQIXDTA4MDkwNDA0NDUwOFowDDAKBgNVHRUEAwoBCaBWMFQwRgYDVR0jBD8wPYAUv8jAAY6QfNpDI9l6DLv0LAzmhMWhIqQgMB4xHDAaBgNVBAMTE1Rlc3QgQ0EgQ2VydGlmaWNhdGWCAQEwCgYDVR0UBAMCAQEwDQYJKoZIhvcNAQELBQADgYEAEVCr5TKs5yguGgLH+dBzmSPoeSIWJFLsgWwJEit/iUDJH3dgYmaczOcGxIDtbYYHLWIHM+P2YRyQz3MEkCXEgm/cx4y7leAmux5l+xQWgmxFPz+197vaphPeCZo+B7V1CWtm518gcq4mrs9ovfgNqgyFj7KGjcBpWdJE32KMt50=");
-
-    /*
-     * certpath with a circular reference
-     */
-    static byte[] certA = Base64.decode(
-        "MIIC6jCCAlOgAwIBAgIBBTANBgkqhkiG9w0BAQUFADCBjTEPMA0GA1UEAxMGSW50"
-      + "ZXIzMQswCQYDVQQGEwJDSDEPMA0GA1UEBxMGWnVyaWNoMQswCQYDVQQIEwJaSDEX"
-      + "MBUGA1UEChMOUHJpdmFzcGhlcmUgQUcxEDAOBgNVBAsTB1Rlc3RpbmcxJDAiBgkq"
-      + "hkiG9w0BCQEWFWFybWluQHByaXZhc3BoZXJlLmNvbTAeFw0wNzA0MDIwODQ2NTda"
-      + "Fw0xNzAzMzAwODQ0MDBaMIGlMScwJQYDVQQDHh4AQQByAG0AaQBuACAASADkAGIA"
-      + "ZQByAGwAaQBuAGcxCzAJBgNVBAYTAkNIMQ8wDQYDVQQHEwZadXJpY2gxCzAJBgNV"
-      + "BAgTAlpIMRcwFQYDVQQKEw5Qcml2YXNwaGVyZSBBRzEQMA4GA1UECxMHVGVzdGlu"
-      + "ZzEkMCIGCSqGSIb3DQEJARYVYXJtaW5AcHJpdmFzcGhlcmUuY29tMIGfMA0GCSqG"
-      + "SIb3DQEBAQUAA4GNADCBiQKBgQCfHfyVs5dbxG35H/Thd29qR4NZU88taCu/OWA1"
-      + "GdACI02lXWYpmLWiDgnU0ULP+GG8OnVp1IES9fz2zcrXKQ19xZzsen/To3h5sNte"
-      + "cJpS00XMM24q/jDwy5NvkBP9YIfFKQ1E/0hFHXcqwlw+b/y/v6YGsZCU2h6QDzc4"
-      + "5m0+BwIDAQABo0AwPjAMBgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIE8DAeBglg"
-      + "hkgBhvhCAQ0EERYPeGNhIGNlcnRpZmljYXRlMA0GCSqGSIb3DQEBBQUAA4GBAJEu"
-      + "KiSfIwsY7SfobMLrv2v/BtLhGLi4RnmjiwzBhuv5rn4rRfBpq1ppmqQMJ2pmA67v"
-      + "UWCY+mNwuyjHyivpCCyJGsZ9d5H09g2vqxzkDBMz7X9VNMZYFH8j/R3/Cfvqks31"
-      + "z0OFslJkeKLa1I0P/dfVHsRKNkLRT3Ws5LKksErQ");
-
-    static byte[] certB = Base64.decode(
-        "MIICtTCCAh6gAwIBAgIBBDANBgkqhkiG9w0BAQQFADCBjTEPMA0GA1UEAxMGSW50"
-      + "ZXIyMQswCQYDVQQGEwJDSDEPMA0GA1UEBxMGWnVyaWNoMQswCQYDVQQIEwJaSDEX"
-      + "MBUGA1UEChMOUHJpdmFzcGhlcmUgQUcxEDAOBgNVBAsTB1Rlc3RpbmcxJDAiBgkq"
-      + "hkiG9w0BCQEWFWFybWluQHByaXZhc3BoZXJlLmNvbTAeFw0wNzA0MDIwODQ2Mzha"
-      + "Fw0xNzAzMzAwODQ0MDBaMIGNMQ8wDQYDVQQDEwZJbnRlcjMxCzAJBgNVBAYTAkNI"
-      + "MQ8wDQYDVQQHEwZadXJpY2gxCzAJBgNVBAgTAlpIMRcwFQYDVQQKEw5Qcml2YXNw"
-      + "aGVyZSBBRzEQMA4GA1UECxMHVGVzdGluZzEkMCIGCSqGSIb3DQEJARYVYXJtaW5A"
-      + "cHJpdmFzcGhlcmUuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCxCXIB"
-      + "QRnmVvl2h7Q+0SsRxDLnyM1dJG9jMa+UCCmHy0k/ZHs5VirSbjEJSjkQ9BGeh9SC"
-      + "7JwbMpXO7UE+gcVc2RnWUY+MA+fWIeTV4KtkYA8WPu8wVGCXbN8wwh/StOocszxb"
-      + "g+iLvGeh8CYSRqg6QN3S/02etH3o8H4e7Z0PZwIDAQABoyMwITAPBgNVHRMBAf8E"
-      + "BTADAQH/MA4GA1UdDwEB/wQEAwIB9jANBgkqhkiG9w0BAQQFAAOBgQCtWdirSsmt"
-      + "+CBBCNn6ZnbU3QqQfiiQIomjenNEHESJgaS/+PvPE5i3xWFXsunTHLW321/Km16I"
-      + "7+ZvT8Su1cqHg79NAT8QB0yke1saKSy2C0Pic4HwrNqVBWFNSxMU0hQzpx/ZXDbZ"
-      + "DqIXAp5EfyRYBy2ul+jm6Rot6aFgzuopKg==");
-
-    static byte[] certC = Base64.decode(
-        "MIICtTCCAh6gAwIBAgIBAjANBgkqhkiG9w0BAQQFADCBjTEPMA0GA1UEAxMGSW50"
-      + "ZXIxMQswCQYDVQQGEwJDSDEPMA0GA1UEBxMGWnVyaWNoMQswCQYDVQQIEwJaSDEX"
-      + "MBUGA1UEChMOUHJpdmFzcGhlcmUgQUcxEDAOBgNVBAsTB1Rlc3RpbmcxJDAiBgkq"
-      + "hkiG9w0BCQEWFWFybWluQHByaXZhc3BoZXJlLmNvbTAeFw0wNzA0MDIwODQ0Mzla"
-      + "Fw0xNzAzMzAwODQ0MDBaMIGNMQ8wDQYDVQQDEwZJbnRlcjIxCzAJBgNVBAYTAkNI"
-      + "MQ8wDQYDVQQHEwZadXJpY2gxCzAJBgNVBAgTAlpIMRcwFQYDVQQKEw5Qcml2YXNw"
-      + "aGVyZSBBRzEQMA4GA1UECxMHVGVzdGluZzEkMCIGCSqGSIb3DQEJARYVYXJtaW5A"
-      + "cHJpdmFzcGhlcmUuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQD0rLr6"
-      + "f2/ONeJzTb0q9M/NNX+MnAFMSqiQGVBkT76u5nOH4KLkpHXkzI82JI7GuQMzoT3a"
-      + "+RP1hO6FneO92ms2soC6xiOFb4EC69Dfhh87Nww5O35JxVF0bzmbmIAWd6P/7zGh"
-      + "nd2S4tKkaZcubps+C0j9Fgi0hipVicAOUVVoDQIDAQABoyMwITAPBgNVHRMBAf8E"
-      + "BTADAQH/MA4GA1UdDwEB/wQEAwIB9jANBgkqhkiG9w0BAQQFAAOBgQCLPvc1IMA4"
-      + "YP+PmnEldyUoRWRnvPWjBGeu0WheBP7fdcnGBf93Nmc5j68ZN+eTZ5VMuZ99YdvH"
-      + "CXGNX6oodONLU//LlFKdLl5xjLAS5X9p1RbOEGytnalqeiEpjk4+C/7rIBG1kllO"
-      + "dItmI6LlEMV09Hkpg6ZRAUmRkb8KrM4X7A==");
-
-    static byte[] certD = Base64.decode(
-        "MIICtTCCAh6gAwIBAgIBBjANBgkqhkiG9w0BAQQFADCBjTEPMA0GA1UEAxMGSW50"
-      + "ZXIzMQswCQYDVQQGEwJDSDEPMA0GA1UEBxMGWnVyaWNoMQswCQYDVQQIEwJaSDEX"
-      + "MBUGA1UEChMOUHJpdmFzcGhlcmUgQUcxEDAOBgNVBAsTB1Rlc3RpbmcxJDAiBgkq"
-      + "hkiG9w0BCQEWFWFybWluQHByaXZhc3BoZXJlLmNvbTAeFw0wNzA0MDIwODQ5NTNa"
-      + "Fw0xNzAzMzAwODQ0MDBaMIGNMQ8wDQYDVQQDEwZJbnRlcjExCzAJBgNVBAYTAkNI"
-      + "MQ8wDQYDVQQHEwZadXJpY2gxCzAJBgNVBAgTAlpIMRcwFQYDVQQKEw5Qcml2YXNw"
-      + "aGVyZSBBRzEQMA4GA1UECxMHVGVzdGluZzEkMCIGCSqGSIb3DQEJARYVYXJtaW5A"
-      + "cHJpdmFzcGhlcmUuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCae3TP"
-      + "jIVKeASqvNabaiUHAMGUgFxB7L0yUsIj39azLcLtUj4S7XkDf7SMGtYV0JY1XNaQ"
-      + "sHJAsnJivDZc50oiYvqDYfgFZx5+AsN5l5X5rjRzs/OX+Jo+k1OgsIyu6+mf9Kfb"
-      + "5IdWOVB2EcOg4f9tPjLM8CIj9Pp7RbKLyqUUgwIDAQABoyMwITAPBgNVHRMBAf8E"
-      + "BTADAQH/MA4GA1UdDwEB/wQEAwIB9jANBgkqhkiG9w0BAQQFAAOBgQCgr9kUdWUT"
-      + "Lt9UcztSzR3pnHRsyvS0E/z850OKQKS5/VxLEalpFvhj+3EcZ7Y6mFxaaS2B7vXg"
-      + "2YWyqV1PRb6iF7/u9EXkpSTKGrJahwANirCa3V/HTUuPdCE2GITlnWI8h3eVA+xQ"
-      + "D4LF0PXHOkXbwmhXRSb10lW1bSGkUxE9jg==");
-
-    private void testExceptions()
-        throws Exception
-    {
-        byte[] enc = { (byte)0, (byte)2, (byte)3, (byte)4, (byte)5 };
-        MyCertPath mc = new MyCertPath(enc);
-        ByteArrayOutputStream os = new ByteArrayOutputStream();
-        ByteArrayInputStream is;
-        byte[] arr;
-
-        ObjectOutputStream oOut = new ObjectOutputStream(os);
-        oOut.writeObject(mc);
-        oOut.flush();
-        oOut.close();
-
-        try
-        {
-            CertificateFactory cFac = CertificateFactory.getInstance("X.509",
-                    "BC");
-            arr = os.toByteArray();
-            is = new ByteArrayInputStream(arr);
-            cFac.generateCertPath(is);
-        }
-        catch (CertificateException e)
-        {
-            // ignore okay
-        }
-
-        CertificateFactory cf = CertificateFactory.getInstance("X.509");
-        List certCol = new ArrayList();
-
-        certCol.add(cf.generateCertificate(new ByteArrayInputStream(certA)));
-        certCol.add(cf.generateCertificate(new ByteArrayInputStream(certB)));
-        certCol.add(cf.generateCertificate(new ByteArrayInputStream(certC)));
-        certCol.add(cf.generateCertificate(new ByteArrayInputStream(certD)));
-
-        CertPathBuilder pathBuilder = CertPathBuilder.getInstance("PKIX", "BC");
-        X509CertSelector select = new X509CertSelector();
-        select.setSubject(((X509Certificate)certCol.get(0)).getSubjectX500Principal().getEncoded());
-
-        Set trustanchors = new HashSet();
-        trustanchors.add(new TrustAnchor((X509Certificate)cf.generateCertificate(new ByteArrayInputStream(rootCertBin)), null));
-
-        CertStore certStore = CertStore.getInstance("Collection", new CollectionCertStoreParameters(certCol));
-
-        PKIXBuilderParameters params = new PKIXBuilderParameters(trustanchors, select);
-        params.addCertStore(certStore);
-
-        try
-        {
-            CertPathBuilderResult result = pathBuilder.build(params);
-            CertPath path = result.getCertPath();
-            fail("found cert path in circular set");
-        }
-        catch (CertPathBuilderException e) 
-        {
-            // expected
-        }
-    }
-    
-    public void performTest()
-        throws Exception
-    {
-        CertificateFactory cf = CertificateFactory.getInstance("X.509", "BC");
-
-        X509Certificate rootCert = (X509Certificate)cf.generateCertificate(new ByteArrayInputStream(rootCertBin));
-        X509Certificate interCert = (X509Certificate)cf.generateCertificate(new ByteArrayInputStream(interCertBin));
-        X509Certificate finalCert = (X509Certificate)cf.generateCertificate(new ByteArrayInputStream(finalCertBin));
-
-            //Testing CertPath generation from List
-        List list = new ArrayList();
-        list.add(interCert);
-        CertPath certPath1 = cf.generateCertPath(list);
-
-            //Testing CertPath encoding as PkiPath
-        byte[] encoded = certPath1.getEncoded("PkiPath");
-
-            //Testing CertPath generation from InputStream
-        ByteArrayInputStream inStream = new ByteArrayInputStream(encoded);
-        CertPath certPath2 = cf.generateCertPath(inStream, "PkiPath");
-
-            //Comparing both CertPathes
-        if (!certPath2.equals(certPath1))
-        {
-            fail("CertPath differ after encoding and decoding.");
-        }
-
-        encoded = certPath1.getEncoded("PKCS7");
-
-            //Testing CertPath generation from InputStream
-        inStream = new ByteArrayInputStream(encoded);
-        certPath2 = cf.generateCertPath(inStream, "PKCS7");
-
-            //Comparing both CertPathes
-        if (!certPath2.equals(certPath1))
-        {
-            fail("CertPath differ after encoding and decoding.");
-        }
-
-        encoded = certPath1.getEncoded("PEM");
-
-            //Testing CertPath generation from InputStream
-        inStream = new ByteArrayInputStream(encoded);
-        certPath2 = cf.generateCertPath(inStream, "PEM");
-
-            //Comparing both CertPathes
-        if (!certPath2.equals(certPath1))
-        {
-            fail("CertPath differ after encoding and decoding.");
-        }
-
-        //
-        // empty list test
-        //
-        list = new ArrayList();
-
-        CertPath certPath = CertificateFactory.getInstance("X.509","BC").generateCertPath(list);
-        if (certPath.getCertificates().size() != 0)
-        {
-            fail("list wrong size.");
-        }
-
-        //
-        // exception tests
-        //
-        testExceptions();
-    }
-
-    public String getName()
-    {
-        return "CertPath";
-    }
-
-    public static void main(
-        String[] args)
-    {
-        Security.addProvider(new BouncyCastleProvider());
-
-        runTest(new CertPathTest());
-    }
-
-    private static class MyCertificate extends Certificate
-    {
-        private final byte[] encoding;
-
-        public MyCertificate(String type, byte[] encoding)
-        {
-            super(type);
-            // don't copy to allow null parameter in test
-            this.encoding = encoding;
-        }
-
-        public byte[] getEncoded() throws CertificateEncodingException
-        {
-            // do copy to force NPE in test
-            return (byte[])encoding.clone();
-        }
-
-        public void verify(PublicKey key) throws CertificateException,
-                NoSuchAlgorithmException, InvalidKeyException,
-                NoSuchProviderException, SignatureException
-        {
-        }
-
-        public void verify(PublicKey key, String sigProvider)
-                throws CertificateException, NoSuchAlgorithmException,
-                InvalidKeyException, NoSuchProviderException,
-                SignatureException
-        {
-        }
-
-        public String toString()
-        {
-            return "[My test Certificate, type: " + getType() + "]";
-        }
-
-        public PublicKey getPublicKey()
-        {
-            return new PublicKey()
-            {
-                public String getAlgorithm()
-                {
-                    return "TEST";
-                }
-
-                public byte[] getEncoded()
-                {
-                    return new byte[] { (byte)1, (byte)2, (byte)3 };
-                }
-
-                public String getFormat()
-                {
-                    return "TEST_FORMAT";
-                }
-            };
-        }
-    }
-
-    private static class MyCertPath extends CertPath
-    {
-        private final Vector certificates;
-
-        private final Vector encodingNames;
-
-        private final byte[] encoding;
-
-        public MyCertPath(byte[] encoding)
-        {
-            super("MyEncoding");
-            this.encoding = encoding;
-            certificates = new Vector();
-            certificates.add(new MyCertificate("MyEncoding", encoding));
-            encodingNames = new Vector();
-            encodingNames.add("MyEncoding");
-        }
-
-        public List getCertificates()
-        {
-            return Collections.unmodifiableList(certificates);
-        }
-
-        public byte[] getEncoded() throws CertificateEncodingException
-        {
-            return (byte[])encoding.clone();
-        }
-
-        public byte[] getEncoded(String encoding)
-                throws CertificateEncodingException
-        {
-            if (getType().equals(encoding))
-            {
-                return (byte[])this.encoding.clone();
-            }
-            throw new CertificateEncodingException("Encoding not supported: "
-                    + encoding);
-        }
-
-        public Iterator getEncodings()
-        {
-            return Collections.unmodifiableCollection(encodingNames).iterator();
-        }
-    }
-}
-
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/CertPathValidatorTest.java b/bcprov/src/main/java/org/bouncycastle/jce/provider/test/CertPathValidatorTest.java
deleted file mode 100644
index d4c2b42..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/CertPathValidatorTest.java
+++ /dev/null
@@ -1,424 +0,0 @@
-package org.bouncycastle.jce.provider.test;
-
-import java.io.ByteArrayInputStream;
-import java.security.PublicKey;
-import java.security.Security;
-import java.security.cert.CertPath;
-import java.security.cert.CertPathValidator;
-import java.security.cert.CertPathValidatorException;
-import java.security.cert.CertStore;
-import java.security.cert.CertStoreParameters;
-import java.security.cert.Certificate;
-import java.security.cert.CertificateFactory;
-import java.security.cert.CollectionCertStoreParameters;
-import java.security.cert.PKIXBuilderParameters;
-import java.security.cert.PKIXCertPathChecker;
-import java.security.cert.PKIXCertPathValidatorResult;
-import java.security.cert.PKIXParameters;
-import java.security.cert.PolicyNode;
-import java.security.cert.TrustAnchor;
-import java.security.cert.X509CRL;
-import java.security.cert.X509CertSelector;
-import java.security.cert.X509Certificate;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.util.encoders.Base64;
-import org.bouncycastle.util.test.SimpleTest;
-
-public class CertPathValidatorTest
-    extends SimpleTest
-{
-    private byte[] AC_PR = Base64.decode(
-           "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tDQpNSUlFU1RDQ0F6R2dBd0lC"
-        + "QWdJQkJUQU5CZ2txaGtpRzl3MEJBUVVGQURDQnRERUxNQWtHQTFVRUJoTUNR"
-        + "bEl4DQpFekFSQmdOVkJBb1RDa2xEVUMxQ2NtRnphV3d4UFRBN0JnTlZCQXNU"
-        + "TkVsdWMzUnBkSFYwYnlCT1lXTnBiMjVoDQpiQ0JrWlNCVVpXTnViMnh2WjJs"
-        + "aElHUmhJRWx1Wm05eWJXRmpZVzhnTFNCSlZFa3hFVEFQQmdOVkJBY1RDRUp5"
-        + "DQpZWE5wYkdsaE1Rc3dDUVlEVlFRSUV3SkVSakV4TUM4R0ExVUVBeE1vUVhW"
-        + "MGIzSnBaR0ZrWlNCRFpYSjBhV1pwDQpZMkZrYjNKaElGSmhhWG9nUW5KaGMy"
-        + "bHNaV2x5WVRBZUZ3MHdNakEwTURReE9UTTVNREJhRncwd05UQTBNRFF5DQpN"
-        + "elU1TURCYU1HRXhDekFKQmdOVkJBWVRBa0pTTVJNd0VRWURWUVFLRXdwSlEx"
-        + "QXRRbkpoYzJsc01UMHdPd1lEDQpWUVFERXpSQmRYUnZjbWxrWVdSbElFTmxj"
-        + "blJwWm1sallXUnZjbUVnWkdFZ1VISmxjMmxrWlc1amFXRWdaR0VnDQpVbVZ3"
-        + "ZFdKc2FXTmhNSUlCSWpBTkJna3Foa2lHOXcwQkFRRUZBQU9DQVE4QU1JSUJD"
-        + "Z0tDQVFFQXMwc0t5NGsrDQp6b016aldyMTQxeTVYQ045UGJMZERFQXN2cjZ4"
-        + "Z0NCN1l5bEhIQ1NBYmpGR3dOQ0R5NlVxN1h0VjZ6UHdIMXpGDQpFWENlS3Jm"
-        + "UUl5YXBXSEZ4V1VKajBMblFrY1RZM1FOR1huK0JuVk9EVTZDV3M1c3NoZktH"
-        + "RXZyVlQ1Z214V1NmDQp4OFlsdDgzY1dwUE1QZzg3VDlCaHVIbHQzazh2M2Ev"
-        + "NmRPbmF2dytOYTAyZExBaDBlNzZqcCtQUS9LK0pHZlBuDQphQjVVWURrZkd0"
-        + "em5uTTNBV01tY3VJK0o0ek5OMDZaa3ZnbDFsdEo2UU1qcnZEUFlSak9ndDlT"
-        + "cklpY1NmbEo4DQptVDdHWGRRaXJnQUNXc3g1QURBSklRK253TU1vNHlyTUtx"
-        + "SlFhNFFDMHhhT0QvdkdVcG9SaDQzT0FTZFp3c3YvDQpPWFlybmVJeVAwVCs4"
-        + "UUlEQVFBQm80RzNNSUcwTUQwR0ExVWRId1EyTURRd01xQXdvQzZHTEdoMGRI"
-        + "QTZMeTloDQpZM0poYVhvdWFXTndZbkpoYzJsc0xtZHZkaTVpY2k5TVExSmhZ"
-        + "M0poYVhvdVkzSnNNQklHQTFVZElBUUxNQWt3DQpCd1lGWUV3QkFRRXdIUVlE"
-        + "VlIwT0JCWUVGREpUVFlKNE9TWVB5T09KZkVMZXhDaHppK2hiTUI4R0ExVWRJ"
-        + "d1FZDQpNQmFBRklyNjhWZUVFUk0xa0VMNlYwbFVhUTJreFBBM01BNEdBMVVk"
-        + "RHdFQi93UUVBd0lCQmpBUEJnTlZIUk1CDQpBZjhFQlRBREFRSC9NQTBHQ1Nx"
-        + "R1NJYjNEUUVCQlFVQUE0SUJBUUJRUFNoZ1lidnFjaWV2SDVVb3ZMeXhkbkYr"
-        + "DQpFcjlOeXF1SWNkMnZ3Y0N1SnpKMkQ3WDBUcWhHQ0JmUEpVVkdBVWorS0NP"
-        + "SDFCVkgva1l1OUhsVHB1MGtKWFBwDQpBQlZkb2hJUERqRHhkbjhXcFFSL0Yr"
-        + "ejFDaWtVcldIMDR4eTd1N1p6UUpLSlBuR0loY1FpOElyRm1PYkllMEc3DQpY"
-        + "WTZPTjdPRUZxY21KTFFHWWdtRzFXMklXcytQd1JwWTdENGhLVEFoVjFSNkVv"
-        + "amE1L3BPcmVDL09kZXlQWmVxDQo1SUZTOUZZZk02U0Npd2hrK3l2Q1FHbVo0"
-        + "YzE5SjM0ZjVFYkRrK1NQR2tEK25EQ0E3L3VMUWNUMlJURE14SzBaDQpuZlo2"
-        + "Nm1Sc0ZjcXRGaWdScjVFcmtKZDdoUVV6eHNOV0VrNzJEVUFIcVgvNlNjeWtt"
-        + "SkR2V0plSUpqZlcNCi0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0NCg==");
-
-    private byte[] AC_RAIZ_ICPBRASIL = Base64.decode(
-          "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tDQpNSUlFdURDQ0E2Q2dBd0lC"
-        + "QWdJQkJEQU5CZ2txaGtpRzl3MEJBUVVGQURDQnRERUxNQWtHQTFVRUJoTUNR"
-        + "bEl4DQpFekFSQmdOVkJBb1RDa2xEVUMxQ2NtRnphV3d4UFRBN0JnTlZCQXNU"
-        + "TkVsdWMzUnBkSFYwYnlCT1lXTnBiMjVoDQpiQ0JrWlNCVVpXTnViMnh2WjJs"
-        + "aElHUmhJRWx1Wm05eWJXRmpZVzhnTFNCSlZFa3hFVEFQQmdOVkJBY1RDRUp5"
-        + "DQpZWE5wYkdsaE1Rc3dDUVlEVlFRSUV3SkVSakV4TUM4R0ExVUVBeE1vUVhW"
-        + "MGIzSnBaR0ZrWlNCRFpYSjBhV1pwDQpZMkZrYjNKaElGSmhhWG9nUW5KaGMy"
-        + "bHNaV2x5WVRBZUZ3MHdNVEV4TXpBeE1qVTRNREJhRncweE1URXhNekF5DQpN"
-        + "elU1TURCYU1JRzBNUXN3Q1FZRFZRUUdFd0pDVWpFVE1CRUdBMVVFQ2hNS1NV"
-        + "TlFMVUp5WVhOcGJERTlNRHNHDQpBMVVFQ3hNMFNXNXpkR2wwZFhSdklFNWhZ"
-        + "Mmx2Ym1Gc0lHUmxJRlJsWTI1dmJHOW5hV0VnWkdFZ1NXNW1iM0p0DQpZV05o"
-        + "YnlBdElFbFVTVEVSTUE4R0ExVUVCeE1JUW5KaGMybHNhV0V4Q3pBSkJnTlZC"
-        + "QWdUQWtSR01URXdMd1lEDQpWUVFERXloQmRYUnZjbWxrWVdSbElFTmxjblJw"
-        + "Wm1sallXUnZjbUVnVW1GcGVpQkNjbUZ6YVd4bGFYSmhNSUlCDQpJakFOQmdr"
-        + "cWhraUc5dzBCQVFFRkFBT0NBUThBTUlJQkNnS0NBUUVBd1BNdWR3WC9odm0r"
-        + "VWgyYi9sUUFjSFZBDQppc2FtYUxrV2Rrd1A5L1MvdE9LSWdSckw2T3krWklH"
-        + "bE9VZGQ2dVl0azlNYS8zcFVwZ2NmTkFqMHZZbTVnc3lqDQpRbzllbXNjK3g2"
-        + "bTRWV3drOWlxTVpTQ0s1RVFrQXEvVXQ0bjdLdUxFMStnZGZ0d2RJZ3hmVXNQ"
-        + "dDRDeU5yWTUwDQpRVjU3S00yVVQ4eDVycm16RWpyN1RJQ0dwU1VBbDJnVnFl"
-        + "NnhhaWkrYm1ZUjFRcm1XYUJTQUc1OUxya3Jqcll0DQpiUmhGYm9VRGUxREsr"
-        + "NlQ4czVMNms4Yzhva3BiSHBhOXZlTXp0RFZDOXNQSjYwTVdYaDZhblZLbzFV"
-        + "Y0xjYlVSDQp5RWVOdlpuZVZSS0FBVTZvdXdkakR2d2xzYUt5ZEZLd2VkMFRv"
-        + "UTQ3Ym1VS2djbSt3VjNlVFJrMzZVT25Ud0lEDQpBUUFCbzRIU01JSFBNRTRH"
-        + "QTFVZElBUkhNRVV3UXdZRllFd0JBUUF3T2pBNEJnZ3JCZ0VGQlFjQ0FSWXNh"
-        + "SFIwDQpjRG92TDJGamNtRnBlaTVwWTNCaWNtRnphV3d1WjI5MkxtSnlMMFJR"
-        + "UTJGamNtRnBlaTV3WkdZd1BRWURWUjBmDQpCRFl3TkRBeW9EQ2dMb1lzYUhS"
-        + "MGNEb3ZMMkZqY21GcGVpNXBZM0JpY21GemFXd3VaMjkyTG1KeUwweERVbUZq"
-        + "DQpjbUZwZWk1amNtd3dIUVlEVlIwT0JCWUVGSXI2OFZlRUVSTTFrRUw2VjBs"
-        + "VWFRMmt4UEEzTUE4R0ExVWRFd0VCDQovd1FGTUFNQkFmOHdEZ1lEVlIwUEFR"
-        + "SC9CQVFEQWdFR01BMEdDU3FHU0liM0RRRUJCUVVBQTRJQkFRQVpBNWMxDQpV"
-        + "L2hnSWg2T2NnTEFmaUpnRldwdm1EWldxbFYzMC9iSEZwajhpQm9iSlNtNXVE"
-        + "cHQ3VGlyWWgxVXhlM2ZRYUdsDQpZakplKzl6ZCtpelBSYkJxWFBWUUEzNEVY"
-        + "Y3drNHFwV3VmMWhIcmlXZmRyeDhBY3FTcXI2Q3VRRndTcjc1Rm9zDQpTemx3"
-        + "REFEYTcwbVQ3d1pqQW1RaG5aeDJ4SjZ3ZldsVDlWUWZTLy9KWWVJYzdGdWUy"
-        + "Sk5MZDAwVU9TTU1haUsvDQp0NzllbktOSEVBMmZ1cEgzdkVpZ2Y1RWg0YlZB"
-        + "TjVWb2hyVG02TVk1M3g3WFFaWnIxTUU3YTU1bEZFblNlVDB1DQptbE9BalIy"
-        + "bUFidlNNNVg1b1NaTnJtZXRkenlUajJmbENNOENDN01MYWIwa2tkbmdSSWxV"
-        + "QkdIRjEvUzVubVBiDQpLKzlBNDZzZDMzb3FLOG44DQotLS0tLUVORCBDRVJU"
-        + "SUZJQ0FURS0tLS0tDQo=");
-
-    private byte[] schefer = Base64.decode(
-          "MIIEnDCCBAWgAwIBAgICIPAwDQYJKoZIhvcNAQEEBQAwgcAxCzAJBgNVBAYT"
-        + "AkRFMQ8wDQYDVQQIEwZIRVNTRU4xGDAWBgNVBAcTDzY1MDA4IFdpZXNiYWRl"
-        + "bjEaMBgGA1UEChMRU0NIVUZBIEhPTERJTkcgQUcxGjAYBgNVBAsTEVNDSFVG"
-        + "QSBIT0xESU5HIEFHMSIwIAYDVQQDExlJbnRlcm5ldCBCZW51dHplciBTZXJ2"
-        + "aWNlMSowKAYJKoZIhvcNAQkBFht6ZXJ0aWZpa2F0QHNjaHVmYS1vbmxpbmUu"
-        + "ZGUwHhcNMDQwMzMwMTEwODAzWhcNMDUwMzMwMTEwODAzWjCBnTELMAkGA1UE"
-        + "BhMCREUxCjAIBgNVBAcTASAxIzAhBgNVBAoTGlNIUyBJbmZvcm1hdGlvbnNz"
-        + "eXN0ZW1lIEFHMRwwGgYDVQQLExM2MDAvMDU5NDktNjAwLzA1OTQ5MRgwFgYD"
-        + "VQQDEw9TY2hldHRlciBTdGVmYW4xJTAjBgkqhkiG9w0BCQEWFlN0ZWZhbi5T"
-        + "Y2hldHRlckBzaHMuZGUwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAJD0"
-        + "95Bi76fkAMjJNTGPDiLPHmZXNsmakngDeS0juzKMeJA+TjXFouhYh6QyE4Bl"
-        + "Nf18fT4mInlgLefwf4t6meIWbiseeTo7VQdM+YrbXERMx2uHsRcgZMsiMYHM"
-        + "kVfYMK3SMJ4nhCmZxrBkoTRed4gXzVA1AA8YjjTqMyyjvt4TAgMBAAGjggHE"
-        + "MIIBwDAJBgNVHRMEAjAAMBEGCWCGSAGG+EIBAQQEAwIEsDALBgNVHQ8EBAMC"
-        + "BNAwOQYJYIZIAYb4QgENBCwWKlplcnRpZmlrYXQgbnVyIGZ1ZXIgU0NIVUZB"
-        + "LU9ubGluZSBndWVsdGlnLjAdBgNVHQ4EFgQUXReirhBfg0Yhf6MsBWoo/nPa"
-        + "hGwwge0GA1UdIwSB5TCB4oAUf2UyCaBV9JUeG9lS1Yo6OFBUdEKhgcakgcMw"
-        + "gcAxCzAJBgNVBAYTAkRFMQ8wDQYDVQQIEwZIRVNTRU4xGDAWBgNVBAcTDzY1"
-        + "MDA4IFdpZXNiYWRlbjEaMBgGA1UEChMRU0NIVUZBIEhPTERJTkcgQUcxGjAY"
-        + "BgNVBAsTEVNDSFVGQSBIT0xESU5HIEFHMSIwIAYDVQQDExlJbnRlcm5ldCBC"
-        + "ZW51dHplciBTZXJ2aWNlMSowKAYJKoZIhvcNAQkBFht6ZXJ0aWZpa2F0QHNj"
-        + "aHVmYS1vbmxpbmUuZGWCAQAwIQYDVR0RBBowGIEWU3RlZmFuLlNjaGV0dGVy"
-        + "QHNocy5kZTAmBgNVHRIEHzAdgRt6ZXJ0aWZpa2F0QHNjaHVmYS1vbmxpbmUu"
-        + "ZGUwDQYJKoZIhvcNAQEEBQADgYEAWzZtN9XQ9uyrFXqSy3hViYwV751+XZr0"
-        + "YH5IFhIS+9ixNAu8orP3bxqTaMhpwoU7T/oSsyGGSkb3fhzclgUADbA2lrOI"
-        + "GkeB/m+FArTwRbwpqhCNTwZywOp0eDosgPjCX1t53BB/m/2EYkRiYdDGsot0"
-        + "kQPOVGSjQSQ4+/D+TM8=");
-
-    // circular dependency certificates
-    private static final byte[] circCA = Base64.decode(
-        "MIIDTzCCAjegAwIBAgIDARAAMA0GCSqGSIb3DQEBBQUAMDkxCzAJBgNVBAYT"
-      + "AkZSMRAwDgYDVQQKEwdHSVAtQ1BTMRgwFgYDVQQLEw9HSVAtQ1BTIEFOT05Z"
-      + "TUUwHhcNMDQxMDExMDAwMDAxWhcNMTQxMjMxMjM1OTU5WjA5MQswCQYDVQQG"
-      + "EwJGUjEQMA4GA1UEChMHR0lQLUNQUzEYMBYGA1UECxMPR0lQLUNQUyBBTk9O"
-      + "WU1FMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3WyWDwcM58aU"
-      + "hPX4ueI1mwETt3WdQtMfIdRiCXeBrjCkYCc7nIgCmGbnfTzXSplHRgKColWh"
-      + "q/Z+1rHYayje1gjAEU2+4/r1P2pnBmPgquDuguktCIbDtCcGZu0ylyKeHh37"
-      + "aeIKzkcmRSLRzvGf/eO3RdFksrvaPaSjqCVfGRXVDKK2uftE8rIFJE+bCqow"
-      + "6+WiaAaDDiJaSJPuu5hC1NA5jw0/BFodlCuAvl1GJ8A+TICkYWcSpKS9bkSC"
-      + "0i8xdGbSSk94shA1PdDvRdFMfFys8g4aupBXV8yqqEAUkBYmOtZSJckc3W4y"
-      + "2Gx53y7vY07Xh63mcgtJs2T82WJICwIDAQABo2AwXjAdBgNVHQ4EFgQU8c/P"
-      + "NNJaL0srd9SwHwgtvwPB/3cwDgYDVR0PAQH/BAQDAgIEMBkGA1UdIAQSMBAw"
-      + "DgYMKoF6AUcDBwgAAAABMBIGA1UdEwEB/wQIMAYBAf8CAQEwDQYJKoZIhvcN"
-      + "AQEFBQADggEBAHRjYDPJKlfUzID0YzajZpgR/i2ngJrJqYeaWCmwzBgNUPad"
-      + "uBKSGHmPVg21sfULMSnirnR+e90i/D0EVzLwQzcbjPDD/85rp9QDCeMxqqPe"
-      + "9ZCHGs2BpE/HOQMP0QfQ3/Kpk7SvOH/ZcpIf6+uE6lLBQYAGs5cxvtTGOzZk"
-      + "jCVFG+TrAnF4V5sNkn3maCWiYLmyqcnxtKEFSONy2bYqqudx/dBBlRrDbRfZ"
-      + "9XsCBdiXAHY1hFHldbfDs8rslmkXJi3fJC028HZYB6oiBX/JE7BbMk7bRnUf"
-      + "HSpP7Sjxeso2SY7Yit+hQDVAlqTDGmh6kLt/hQMpsOMry4vgBL6XHKw=");
-
-    private static final byte[] circCRLCA = Base64.decode(
-       "MIIDXDCCAkSgAwIBAgIDASAAMA0GCSqGSIb3DQEBBQUAMDkxCzAJBgNVBAYT"
-     + "AkZSMRAwDgYDVQQKEwdHSVAtQ1BTMRgwFgYDVQQLEw9HSVAtQ1BTIEFOT05Z"
-     + "TUUwHhcNMDQxMDExMDAwMDAxWhcNMTQxMjMxMjM1OTU5WjA5MQswCQYDVQQG"
-     + "EwJGUjEQMA4GA1UEChMHR0lQLUNQUzEYMBYGA1UECxMPR0lQLUNQUyBBTk9O"
-     + "WU1FMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwfEcFK0g7Kfo"
-     + "o5f2IBF7VEd/AG+RVGSds0Yg+u2kNYu4k04HR/+tOdBQtJvyr4W5jrQKsC5X"
-     + "skeFWMyWaFKzAjZDWB52HWp/kiMivGcxnYDuYf5piukSC+d2+vL8YaAphDzV"
-     + "HPnxEKqoM/J66uUussDTqfcL3JC/Bc7kBwn4srrsZOsamMWTQQtEqVQxNN7A"
-     + "ROSRsdiTt3hMOKditc9/NBNmjZWxgc7Twr/SaZ8CfN5wf2wuOl23knWL0QsJ"
-     + "0lSMBSBTzTcfAke4/jIT7d4nVMp3t7dsna8rt56pFK4wpRFGuCt+1P5gi51x"
-     + "xVSdI+JoNXv6zGO4o8YVaRpC5rQeGQIDAQABo20wazAfBgNVHSMEGDAWgBTx"
-     + "z8800lovSyt31LAfCC2/A8H/dzAdBgNVHQ4EFgQUGa3SbBrJx/wa2MQwhWPl"
-     + "dwLw1+IwDgYDVR0PAQH/BAQDAgECMBkGA1UdIAQSMBAwDgYMKoF6AUcDBwgA"
-     + "AAABMA0GCSqGSIb3DQEBBQUAA4IBAQAPDpYe2WPYnXTLsXSIUREBNMLmg+/7"
-     + "4Yhq9uOm5Hb5LVkDuHoEHGfmpXXEvucx5Ehu69hw+F4YSrd9wPjOiG8G6GXi"
-     + "RcrK8nE8XDvvV+E1HpJ7NKN4fSAoSb+0gliiq3aF15bvXP8nfespdd/x1xWQ"
-     + "mpYCx/mJeuqONQv2/D/7hfRKYoDBaAkWGodenPFPVs6FxwnEuH2R+KWCUdA9"
-     + "L04v8JBeL3kZiALkU7+DCCm7A0imUAgeeArbAbfIPu6eDygm+XndZ9qi7o4O"
-     + "AntPxrqbeXFIbDrQ4GV1kpxnW+XpSGDd96SWKe715gxkkDBppR5IKYJwRb6O"
-     + "1TRQIf2F+muQ");
-
-    private static final byte[] circCRL = Base64.decode(
-        "MIIB1DCBvQIBATANBgkqhkiG9w0BAQUFADA5MQswCQYDVQQGEwJGUjEQMA4G"
-      + "A1UEChMHR0lQLUNQUzEYMBYGA1UECxMPR0lQLUNQUyBBTk9OWU1FFw0xMDAx"
-      + "MDcwMzAwMTVaFw0xMDAxMTMwMzAwMTVaMACgTjBMMB8GA1UdIwQYMBaAFBmt"
-      + "0mwaycf8GtjEMIVj5XcC8NfiMAsGA1UdFAQEAgILgzAcBgNVHRIEFTATgRFh"
-      + "Yy1naXBAZ2lwLWNwcy5mcjANBgkqhkiG9w0BAQUFAAOCAQEAtF1DdFl1MQvf"
-      + "vNkbrCPuppNYcHen4+za/ZDepKuwHsH/OpKuaDJc4LndRgd5IwzfpCHkQGzt"
-      + "shK50bakN8oaYJgthKIOIJzR+fn6NMjftfR2a27Hdk2o3eQXRHQ360qMbpSy"
-      + "qPb3WfuBhxO2/DlLChJP+OxZIHtT/rNYgE0tlIv7swYi81Gq+DafzaZ9+A5t"
-      + "I0L2Gp/NUDsp5dF6PllAGiXQzl27qkcu+r50w+u0gul3nobXgbwPcMSYuWUz"
-      + "1lhA+uDn/EUWV4RSiJciCGSS10WCkFh1/YPo++mV15KDB0m+8chscrSu/bAl"
-      + "B19LxL/pCX3qr5iLE9ss3olVImyFZg==");
-
-    private void checkCircProcessing()
-        throws Exception
-    {
-        CertificateFactory cf = CertificateFactory.getInstance("X.509", "BC");
-
-        X509Certificate caCert = (X509Certificate)cf.generateCertificate(new ByteArrayInputStream(circCA));
-        X509Certificate crlCaCert = (X509Certificate)cf.generateCertificate(new ByteArrayInputStream(circCRLCA));
-        X509CRL crl = (X509CRL)cf.generateCRL(new ByteArrayInputStream(circCRL));
-
-        List list = new ArrayList();
-
-        list.add(caCert);
-        list.add(crlCaCert);
-        list.add(crl);
-
-        CertStoreParameters ccsp = new CollectionCertStoreParameters(list);
-        CertStore store = CertStore.getInstance("Collection", ccsp);
-
-        Date validDate = new Date(crl.getThisUpdate().getTime() + 60 * 60 * 1000);
-
-            //validating path
-        List certchain = new ArrayList();
-
-        certchain.add(crlCaCert);
-        CertPath cp = CertificateFactory.getInstance("X.509","BC").generateCertPath(certchain);
-
-        Set trust = new HashSet();
-        trust.add(new TrustAnchor(caCert, null));
-
-        CertPathValidator cpv = CertPathValidator.getInstance("PKIX","BC");
-        //PKIXParameters param = new PKIXParameters(trust);
-
-        PKIXBuilderParameters param = new PKIXBuilderParameters(trust, null);
-        X509CertSelector certSelector = new X509CertSelector();
-        certSelector.setCertificate(crlCaCert);
-        param.setTargetCertConstraints(certSelector);
-        param.addCertStore(store);
-        param.setRevocationEnabled(true);
-        param.setDate(validDate);
-
-        PKIXCertPathValidatorResult result = (PKIXCertPathValidatorResult)cpv.validate(cp, param);
-    }
-
-    private void checkPolicyProcessingAtDomainMatch()
-        throws Exception
-    {
-        CertificateFactory cf = CertificateFactory.getInstance("X.509", "BC");
-
-        X509Certificate   root = (X509Certificate)cf.generateCertificate(this.getClass().getResourceAsStream("qvRooCa3.crt"));
-        X509Certificate   ca1 = (X509Certificate)cf.generateCertificate(this.getClass().getResourceAsStream("suvaRoot1.crt"));
-        X509Certificate   ca2 = (X509Certificate)cf.generateCertificate(this.getClass().getResourceAsStream("suvaEmail1.crt"));
-        X509Certificate   ee = (X509Certificate)cf.generateCertificate(this.getClass().getResourceAsStream("suvaEE.crt"));
-
-        List certchain = new ArrayList();
-        certchain.add(ee);
-        certchain.add(ca2);
-        certchain.add(ca1);
-
-        Set trust = new HashSet();
-        trust.add(new TrustAnchor(root, null));
-
-        CertPathValidator cpv = CertPathValidator.getInstance("PKIX","BC");
-        PKIXParameters param = new PKIXParameters(trust);
-        param.setRevocationEnabled(false);
-
-        CertPath cp = cf.generateCertPath(certchain);
-
-        MyChecker checker = new MyChecker();
-        param.addCertPathChecker(checker);
-
-        PKIXCertPathValidatorResult result =
-            (PKIXCertPathValidatorResult) cpv.validate(cp, param);
-    }
-
-    public void performTest()
-        throws Exception
-    {
-        CertificateFactory cf = CertificateFactory.getInstance("X.509", "BC");
-
-            // initialise CertStore
-        X509Certificate rootCert = (X509Certificate)cf.generateCertificate(new ByteArrayInputStream(CertPathTest.rootCertBin));
-        X509Certificate interCert = (X509Certificate)cf.generateCertificate(new ByteArrayInputStream(CertPathTest.interCertBin));
-        X509Certificate finalCert = (X509Certificate)cf.generateCertificate(new ByteArrayInputStream(CertPathTest.finalCertBin));
-        X509CRL rootCrl = (X509CRL)cf.generateCRL(new ByteArrayInputStream(CertPathTest.rootCrlBin));
-        X509CRL interCrl = (X509CRL)cf.generateCRL(new ByteArrayInputStream(CertPathTest.interCrlBin));
-        List list = new ArrayList();
-        list.add(rootCert);
-        list.add(interCert);
-        list.add(finalCert);
-        list.add(rootCrl);
-        list.add(interCrl);
-        CollectionCertStoreParameters ccsp = new CollectionCertStoreParameters(list);
-        CertStore store = CertStore.getInstance("Collection", ccsp, "BC");
-        Date validDate = new Date(rootCrl.getThisUpdate().getTime() + 60 * 60 * 1000);
-            //validating path
-        List certchain = new ArrayList();
-        certchain.add(finalCert);
-        certchain.add(interCert);
-        CertPath cp = CertificateFactory.getInstance("X.509","BC").generateCertPath(certchain);
-        Set trust = new HashSet();
-        trust.add(new TrustAnchor(rootCert, null));
-
-        CertPathValidator cpv = CertPathValidator.getInstance("PKIX","BC");
-        PKIXParameters param = new PKIXParameters(trust);
-        param.addCertStore(store);
-        param.setDate(validDate);
-        MyChecker checker = new MyChecker();
-        param.addCertPathChecker(checker);
-
-        PKIXCertPathValidatorResult result =
-            (PKIXCertPathValidatorResult) cpv.validate(cp, param);
-        PolicyNode policyTree = result.getPolicyTree();
-        PublicKey subjectPublicKey = result.getPublicKey();
-
-        if (checker.getCount() != 2)
-        {
-            fail("checker not evaluated for each certificate");
-        }
-        
-        if (!subjectPublicKey.equals(finalCert.getPublicKey()))
-        {
-            fail("wrong public key returned");
-        }
-
-        //
-        // invalid path containing a valid one test
-        //
-        try
-        {
-                // initialise CertStore
-            rootCert = (X509Certificate)cf.generateCertificate(new ByteArrayInputStream(AC_RAIZ_ICPBRASIL));
-            interCert = (X509Certificate)cf.generateCertificate(new ByteArrayInputStream(AC_PR));
-            finalCert = (X509Certificate)cf.generateCertificate(new ByteArrayInputStream(schefer));
-    
-            list = new ArrayList();
-            list.add(rootCert);
-            list.add(interCert);
-            list.add(finalCert);
-
-            ccsp = new CollectionCertStoreParameters(list);
-            store = CertStore.getInstance("Collection", ccsp);
-            validDate = new Date(finalCert.getNotBefore().getTime() + 60 * 60 * 1000);
-
-                //validating path
-            certchain = new ArrayList();
-            certchain.add(finalCert);
-            certchain.add(interCert);
-            cp = CertificateFactory.getInstance("X.509","BC").generateCertPath(certchain);
-            trust = new HashSet();
-            trust.add(new TrustAnchor(rootCert, null));
-
-            cpv = CertPathValidator.getInstance("PKIX","BC");
-            param = new PKIXParameters(trust);
-            param.addCertStore(store);
-            param.setRevocationEnabled(false);
-            param.setDate(validDate);
-
-            result =(PKIXCertPathValidatorResult) cpv.validate(cp, param);
-            policyTree = result.getPolicyTree();
-            subjectPublicKey = result.getPublicKey();
-            
-            fail("Invalid path validated");
-        }
-        catch (Exception e)
-        {
-            if (!(e instanceof CertPathValidatorException
-                && e.getMessage().startsWith("Could not validate certificate signature.")))
-            {
-                fail("unexpected exception", e);
-            } 
-        }
-
-        checkCircProcessing();
-        checkPolicyProcessingAtDomainMatch();
-    }
-
-    public String getName()
-    {
-        return "CertPathValidator";
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        Security.addProvider(new BouncyCastleProvider());
-
-        runTest(new CertPathValidatorTest());
-    }
-
-
-    private static class MyChecker
-       extends PKIXCertPathChecker
-    {
-        private static int count;
-
-        public void init(boolean forward)
-        throws CertPathValidatorException
-        {
-            //To change body of implemented methods use File | Settings | File Templates.
-        }
-
-        public boolean isForwardCheckingSupported()
-        {
-            return true;
-        }
-
-        public Set getSupportedExtensions()
-        {
-            return null;
-        }
-
-        public void check(Certificate cert, Collection unresolvedCritExts)
-        throws CertPathValidatorException
-        {
-            count++;
-        }
-
-        public int getCount()
-        {
-           return count;
-        }
-    }
-}
-
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/CertStoreTest.java b/bcprov/src/main/java/org/bouncycastle/jce/provider/test/CertStoreTest.java
deleted file mode 100644
index 35f55e8..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/CertStoreTest.java
+++ /dev/null
@@ -1,235 +0,0 @@
-package org.bouncycastle.jce.provider.test;
-
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.util.test.SimpleTest;
-
-import java.io.ByteArrayInputStream;
-import java.security.Security;
-import java.security.cert.CertStore;
-import java.security.cert.CertificateFactory;
-import java.security.cert.CollectionCertStoreParameters;
-import java.security.cert.X509CRL;
-import java.security.cert.X509CRLSelector;
-import java.security.cert.X509CertSelector;
-import java.security.cert.X509Certificate;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
-public class CertStoreTest
-    extends SimpleTest
-{
-
-    public void performTest()
-        throws Exception
-    {
-        basicTest();
-        orderTest();
-    }
-
-    private void basicTest()
-        throws Exception
-    {
-        CertificateFactory cf = CertificateFactory.getInstance("X.509", "BC");
-
-        X509Certificate rootCert = (X509Certificate)cf
-                .generateCertificate(new ByteArrayInputStream(
-                        CertPathTest.rootCertBin));
-        X509Certificate interCert = (X509Certificate)cf
-                .generateCertificate(new ByteArrayInputStream(
-                        CertPathTest.interCertBin));
-        X509Certificate finalCert = (X509Certificate)cf
-                .generateCertificate(new ByteArrayInputStream(
-                        CertPathTest.finalCertBin));
-        X509CRL rootCrl = (X509CRL)cf.generateCRL(new ByteArrayInputStream(
-                CertPathTest.rootCrlBin));
-        X509CRL interCrl = (X509CRL)cf
-                .generateCRL(new ByteArrayInputStream(
-                        CertPathTest.interCrlBin));
-
-        // Testing CollectionCertStore generation from List
-        List list = new ArrayList();
-        list.add(rootCert);
-        list.add(interCert);
-        list.add(finalCert);
-        list.add(rootCrl);
-        list.add(interCrl);
-        CollectionCertStoreParameters ccsp = new CollectionCertStoreParameters(list);
-        CertStore store = CertStore.getInstance("Collection", ccsp, "BC");
-
-        // Searching for rootCert by subjectDN
-        X509CertSelector targetConstraints = new X509CertSelector();
-        targetConstraints.setSubject(rootCert.getSubjectX500Principal().getName());
-        Collection certs = store.getCertificates(targetConstraints);
-        if (certs.size() != 1 || !certs.contains(rootCert))
-        {
-            fail("rootCert not found by subjectDN");
-        }
-
-        // Searching for rootCert by subjectDN encoded as byte
-        targetConstraints = new X509CertSelector();
-        targetConstraints.setSubject(rootCert.getSubjectX500Principal()
-                .getEncoded());
-        certs = store.getCertificates(targetConstraints);
-        if (certs.size() != 1 || !certs.contains(rootCert))
-        {
-            fail("rootCert not found by encoded subjectDN");
-        }
-
-        // Searching for rootCert by public key encoded as byte
-        targetConstraints = new X509CertSelector();
-        targetConstraints.setSubjectPublicKey(rootCert.getPublicKey()
-                .getEncoded());
-        certs = store.getCertificates(targetConstraints);
-        if (certs.size() != 1 || !certs.contains(rootCert))
-        {
-            fail("rootCert not found by encoded public key");
-        }
-
-        // Searching for interCert by issuerDN
-        targetConstraints = new X509CertSelector();
-        targetConstraints.setIssuer(rootCert.getSubjectX500Principal()
-                .getEncoded());
-        certs = store.getCertificates(targetConstraints);
-        if (certs.size() != 2)
-        {
-            fail("did not found 2 certs");
-        }
-        if (!certs.contains(rootCert))
-        {
-            fail("rootCert not found");
-        }
-        if (!certs.contains(interCert))
-        {
-            fail("interCert not found");
-        }
-
-        // Searching for rootCrl by issuerDN
-        X509CRLSelector targetConstraintsCRL = new X509CRLSelector();
-        targetConstraintsCRL.addIssuerName(rootCrl.getIssuerX500Principal()
-                .getEncoded());
-        Collection crls = store.getCRLs(targetConstraintsCRL);
-        if (crls.size() != 1 || !crls.contains(rootCrl))
-        {
-            fail("rootCrl not found");
-        }
-    }
-
-    private void orderTest()
-        throws Exception
-    {
-        CertificateFactory cf = CertificateFactory.getInstance("X.509", "BC");
-
-        X509Certificate rootCert = (X509Certificate)cf
-                .generateCertificate(new ByteArrayInputStream(
-                        CertPathTest.rootCertBin));
-        X509Certificate interCert = (X509Certificate)cf
-                .generateCertificate(new ByteArrayInputStream(
-                        CertPathTest.interCertBin));
-        X509Certificate finalCert = (X509Certificate)cf
-                .generateCertificate(new ByteArrayInputStream(
-                        CertPathTest.finalCertBin));
-
-        List list = new ArrayList();
-        list.add(rootCert);
-        list.add(interCert);
-        list.add(finalCert);
-        CollectionCertStoreParameters ccsp = new CollectionCertStoreParameters(list);
-        CertStore store = CertStore.getInstance("Collection", ccsp, "BC");
-
-        Iterator certs = store.getCertificates(null).iterator();
-
-        if (!certs.next().equals(rootCert))
-        {
-            fail("root ordering wrong");
-        }
-        if (!certs.next().equals(interCert))
-        {
-            fail("mid ordering wrong");
-        }
-        if (!certs.next().equals(finalCert))
-        {
-            fail("final ordering wrong");
-        }
-
-        list = new ArrayList();
-        list.add(finalCert);
-        list.add(interCert);
-        list.add(rootCert);
-        ccsp = new CollectionCertStoreParameters(list);
-        store = CertStore.getInstance("Collection", ccsp, "BC");
-
-        certs = store.getCertificates(null).iterator();
-
-        if (!certs.next().equals(finalCert))
-        {
-            fail("reverse final ordering wrong");
-        }
-        if (!certs.next().equals(interCert))
-        {
-            fail("reverse mid ordering wrong");
-        }
-        if (!certs.next().equals(rootCert))
-        {
-            fail("reverse root ordering wrong");
-        }
-
-        X509CRL rootCrl = (X509CRL)cf.generateCRL(new ByteArrayInputStream(
-                CertPathTest.rootCrlBin));
-        X509CRL interCrl = (X509CRL)cf
-                .generateCRL(new ByteArrayInputStream(
-                        CertPathTest.interCrlBin));
-
-        list = new ArrayList();
-        list.add(finalCert);
-        list.add(rootCrl);
-        list.add(interCrl);
-
-        ccsp = new CollectionCertStoreParameters(list);
-        store = CertStore.getInstance("Collection", ccsp, "BC");
-
-        Iterator crls = store.getCRLs(null).iterator();
-
-        if (!crls.next().equals(rootCrl))
-        {
-            fail("root crl ordering wrong");
-        }
-        if (!crls.next().equals(interCrl))
-        {
-            fail("mid crl ordering wrong");
-        }
-
-        list = new ArrayList();
-        list.add(finalCert);
-        list.add(interCrl);
-        list.add(rootCrl);
-        ccsp = new CollectionCertStoreParameters(list);
-        store = CertStore.getInstance("Collection", ccsp, "BC");
-
-        crls = store.getCRLs(null).iterator();
-
-        if (!crls.next().equals(interCrl))
-        {
-            fail("reverse mid crl ordering wrong");
-        }
-        if (!crls.next().equals(rootCrl))
-        {
-            fail("reverse root crl ordering wrong");
-        }
-    }
-    
-    public String getName()
-    {
-        return "CertStore";
-    }
-
-    public static void main(String[] args)
-    {
-        Security.addProvider(new BouncyCastleProvider());
-
-        runTest(new CertStoreTest());
-    }
-
-}
-
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/CertTest.java b/bcprov/src/main/java/org/bouncycastle/jce/provider/test/CertTest.java
deleted file mode 100644
index 1ad59fa..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/CertTest.java
+++ /dev/null
@@ -1,1620 +0,0 @@
-package org.bouncycastle.jce.provider.test;
-
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
-import java.math.BigInteger;
-import java.security.KeyFactory;
-import java.security.KeyPair;
-import java.security.NoSuchAlgorithmException;
-import java.security.NoSuchProviderException;
-import java.security.PublicKey;
-import java.security.Security;
-import java.security.cert.CRL;
-import java.security.cert.Certificate;
-import java.security.cert.CertificateException;
-import java.security.cert.CertificateFactory;
-import java.security.cert.X509CRL;
-import java.security.cert.X509Certificate;
-import java.security.spec.InvalidKeySpecException;
-import java.security.spec.RSAPrivateCrtKeySpec;
-import java.security.spec.RSAPublicKeySpec;
-import java.util.Collection;
-import java.util.Iterator;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.DERSet;
-import org.bouncycastle.asn1.DERTaggedObject;
-import org.bouncycastle.asn1.cms.CMSObjectIdentifiers;
-import org.bouncycastle.asn1.cms.ContentInfo;
-import org.bouncycastle.asn1.cms.SignedData;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.util.encoders.Base64;
-import org.bouncycastle.util.io.Streams;
-import org.bouncycastle.util.test.SimpleTest;
-import org.bouncycastle.util.test.TestFailedException;
-
-public class CertTest
-    extends SimpleTest
-{
-    //
-    // server.crt
-    //
-    byte[]  cert1 = Base64.decode(
-           "MIIDXjCCAsegAwIBAgIBBzANBgkqhkiG9w0BAQQFADCBtzELMAkGA1UEBhMCQVUx"
-         + "ETAPBgNVBAgTCFZpY3RvcmlhMRgwFgYDVQQHEw9Tb3V0aCBNZWxib3VybmUxGjAY"
-         + "BgNVBAoTEUNvbm5lY3QgNCBQdHkgTHRkMR4wHAYDVQQLExVDZXJ0aWZpY2F0ZSBB"
-         + "dXRob3JpdHkxFTATBgNVBAMTDENvbm5lY3QgNCBDQTEoMCYGCSqGSIb3DQEJARYZ"
-         + "d2VibWFzdGVyQGNvbm5lY3Q0LmNvbS5hdTAeFw0wMDA2MDIwNzU2MjFaFw0wMTA2"
-         + "MDIwNzU2MjFaMIG4MQswCQYDVQQGEwJBVTERMA8GA1UECBMIVmljdG9yaWExGDAW"
-         + "BgNVBAcTD1NvdXRoIE1lbGJvdXJuZTEaMBgGA1UEChMRQ29ubmVjdCA0IFB0eSBM"
-         + "dGQxFzAVBgNVBAsTDldlYnNlcnZlciBUZWFtMR0wGwYDVQQDExR3d3cyLmNvbm5l"
-         + "Y3Q0LmNvbS5hdTEoMCYGCSqGSIb3DQEJARYZd2VibWFzdGVyQGNvbm5lY3Q0LmNv"
-         + "bS5hdTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEArvDxclKAhyv7Q/Wmr2re"
-         + "Gw4XL9Cnh9e+6VgWy2AWNy/MVeXdlxzd7QAuc1eOWQkGQEiLPy5XQtTY+sBUJ3AO"
-         + "Rvd2fEVJIcjf29ey7bYua9J/vz5MG2KYo9/WCHIwqD9mmG9g0xLcfwq/s8ZJBswE"
-         + "7sb85VU+h94PTvsWOsWuKaECAwEAAaN3MHUwJAYDVR0RBB0wG4EZd2VibWFzdGVy"
-         + "QGNvbm5lY3Q0LmNvbS5hdTA6BglghkgBhvhCAQ0ELRYrbW9kX3NzbCBnZW5lcmF0"
-         + "ZWQgY3VzdG9tIHNlcnZlciBjZXJ0aWZpY2F0ZTARBglghkgBhvhCAQEEBAMCBkAw"
-         + "DQYJKoZIhvcNAQEEBQADgYEAotccfKpwSsIxM1Hae8DR7M/Rw8dg/RqOWx45HNVL"
-         + "iBS4/3N/TO195yeQKbfmzbAA2jbPVvIvGgTxPgO1MP4ZgvgRhasaa0qCJCkWvpM4"
-         + "yQf33vOiYQbpv4rTwzU8AmRlBG45WdjyNIigGV+oRc61aKCTnLq7zB8N3z1TF/bF"
-         + "5/8=");
-
-    //
-    // ca.crt
-    //
-    byte[]  cert2 = Base64.decode(
-           "MIIDbDCCAtWgAwIBAgIBADANBgkqhkiG9w0BAQQFADCBtzELMAkGA1UEBhMCQVUx"
-         + "ETAPBgNVBAgTCFZpY3RvcmlhMRgwFgYDVQQHEw9Tb3V0aCBNZWxib3VybmUxGjAY"
-         + "BgNVBAoTEUNvbm5lY3QgNCBQdHkgTHRkMR4wHAYDVQQLExVDZXJ0aWZpY2F0ZSBB"
-         + "dXRob3JpdHkxFTATBgNVBAMTDENvbm5lY3QgNCBDQTEoMCYGCSqGSIb3DQEJARYZ"
-         + "d2VibWFzdGVyQGNvbm5lY3Q0LmNvbS5hdTAeFw0wMDA2MDIwNzU1MzNaFw0wMTA2"
-         + "MDIwNzU1MzNaMIG3MQswCQYDVQQGEwJBVTERMA8GA1UECBMIVmljdG9yaWExGDAW"
-         + "BgNVBAcTD1NvdXRoIE1lbGJvdXJuZTEaMBgGA1UEChMRQ29ubmVjdCA0IFB0eSBM"
-         + "dGQxHjAcBgNVBAsTFUNlcnRpZmljYXRlIEF1dGhvcml0eTEVMBMGA1UEAxMMQ29u"
-         + "bmVjdCA0IENBMSgwJgYJKoZIhvcNAQkBFhl3ZWJtYXN0ZXJAY29ubmVjdDQuY29t"
-         + "LmF1MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDgs5ptNG6Qv1ZpCDuUNGmv"
-         + "rhjqMDPd3ri8JzZNRiiFlBA4e6/ReaO1U8ASewDeQMH6i9R6degFdQRLngbuJP0s"
-         + "xcEE+SksEWNvygfzLwV9J/q+TQDyJYK52utb++lS0b48A1KPLwEsyL6kOAgelbur"
-         + "ukwxowprKUIV7Knf1ajetQIDAQABo4GFMIGCMCQGA1UdEQQdMBuBGXdlYm1hc3Rl"
-         + "ckBjb25uZWN0NC5jb20uYXUwDwYDVR0TBAgwBgEB/wIBADA2BglghkgBhvhCAQ0E"
-         + "KRYnbW9kX3NzbCBnZW5lcmF0ZWQgY3VzdG9tIENBIGNlcnRpZmljYXRlMBEGCWCG"
-         + "SAGG+EIBAQQEAwICBDANBgkqhkiG9w0BAQQFAAOBgQCsGvfdghH8pPhlwm1r3pQk"
-         + "msnLAVIBb01EhbXm2861iXZfWqGQjrGAaA0ZpXNk9oo110yxoqEoSJSzniZa7Xtz"
-         + "soTwNUpE0SLHvWf/SlKdFWlzXA+vOZbzEv4UmjeelekTm7lc01EEa5QRVzOxHFtQ"
-         + "DhkaJ8VqOMajkQFma2r9iA==");
-
-    //
-    // testx509.pem
-    //
-    byte[]  cert3 = Base64.decode(
-           "MIIBWzCCAQYCARgwDQYJKoZIhvcNAQEEBQAwODELMAkGA1UEBhMCQVUxDDAKBgNV"
-         + "BAgTA1FMRDEbMBkGA1UEAxMSU1NMZWF5L3JzYSB0ZXN0IENBMB4XDTk1MDYxOTIz"
-         + "MzMxMloXDTk1MDcxNzIzMzMxMlowOjELMAkGA1UEBhMCQVUxDDAKBgNVBAgTA1FM"
-         + "RDEdMBsGA1UEAxMUU1NMZWF5L3JzYSB0ZXN0IGNlcnQwXDANBgkqhkiG9w0BAQEF"
-         + "AANLADBIAkEAqtt6qS5GTxVxGZYWa0/4u+IwHf7p2LNZbcPBp9/OfIcYAXBQn8hO"
-         + "/Re1uwLKXdCjIoaGs4DLdG88rkzfyK5dPQIDAQABMAwGCCqGSIb3DQIFBQADQQAE"
-         + "Wc7EcF8po2/ZO6kNCwK/ICH6DobgLekA5lSLr5EvuioZniZp5lFzAw4+YzPQ7XKJ"
-         + "zl9HYIMxATFyqSiD9jsx");
-
-    //
-    // v3-cert1.pem
-    //
-    byte[]  cert4 = Base64.decode(
-           "MIICjTCCAfigAwIBAgIEMaYgRzALBgkqhkiG9w0BAQQwRTELMAkGA1UEBhMCVVMx"
-         + "NjA0BgNVBAoTLU5hdGlvbmFsIEFlcm9uYXV0aWNzIGFuZCBTcGFjZSBBZG1pbmlz"
-         + "dHJhdGlvbjAmFxE5NjA1MjgxMzQ5MDUrMDgwMBcROTgwNTI4MTM0OTA1KzA4MDAw"
-         + "ZzELMAkGA1UEBhMCVVMxNjA0BgNVBAoTLU5hdGlvbmFsIEFlcm9uYXV0aWNzIGFu"
-         + "ZCBTcGFjZSBBZG1pbmlzdHJhdGlvbjEgMAkGA1UEBRMCMTYwEwYDVQQDEwxTdGV2"
-         + "ZSBTY2hvY2gwWDALBgkqhkiG9w0BAQEDSQAwRgJBALrAwyYdgxmzNP/ts0Uyf6Bp"
-         + "miJYktU/w4NG67ULaN4B5CnEz7k57s9o3YY3LecETgQ5iQHmkwlYDTL2fTgVfw0C"
-         + "AQOjgaswgagwZAYDVR0ZAQH/BFowWDBWMFQxCzAJBgNVBAYTAlVTMTYwNAYDVQQK"
-         + "Ey1OYXRpb25hbCBBZXJvbmF1dGljcyBhbmQgU3BhY2UgQWRtaW5pc3RyYXRpb24x"
-         + "DTALBgNVBAMTBENSTDEwFwYDVR0BAQH/BA0wC4AJODMyOTcwODEwMBgGA1UdAgQR"
-         + "MA8ECTgzMjk3MDgyM4ACBSAwDQYDVR0KBAYwBAMCBkAwCwYJKoZIhvcNAQEEA4GB"
-         + "AH2y1VCEw/A4zaXzSYZJTTUi3uawbbFiS2yxHvgf28+8Js0OHXk1H1w2d6qOHH21"
-         + "X82tZXd/0JtG0g1T9usFFBDvYK8O0ebgz/P5ELJnBL2+atObEuJy1ZZ0pBDWINR3"
-         + "WkDNLCGiTkCKp0F5EWIrVDwh54NNevkCQRZita+z4IBO");
-
-    //
-    // v3-cert2.pem
-    //
-    byte[]  cert5 = Base64.decode(
-           "MIICiTCCAfKgAwIBAgIEMeZfHzANBgkqhkiG9w0BAQQFADB9MQswCQYDVQQGEwJD"
-         + "YTEPMA0GA1UEBxMGTmVwZWFuMR4wHAYDVQQLExVObyBMaWFiaWxpdHkgQWNjZXB0"
-         + "ZWQxHzAdBgNVBAoTFkZvciBEZW1vIFB1cnBvc2VzIE9ubHkxHDAaBgNVBAMTE0Vu"
-         + "dHJ1c3QgRGVtbyBXZWIgQ0EwHhcNOTYwNzEyMTQyMDE1WhcNOTYxMDEyMTQyMDE1"
-         + "WjB0MSQwIgYJKoZIhvcNAQkBExVjb29rZUBpc3NsLmF0bC5ocC5jb20xCzAJBgNV"
-         + "BAYTAlVTMScwJQYDVQQLEx5IZXdsZXR0IFBhY2thcmQgQ29tcGFueSAoSVNTTCkx"
-         + "FjAUBgNVBAMTDVBhdWwgQS4gQ29va2UwXDANBgkqhkiG9w0BAQEFAANLADBIAkEA"
-         + "6ceSq9a9AU6g+zBwaL/yVmW1/9EE8s5you1mgjHnj0wAILuoB3L6rm6jmFRy7QZT"
-         + "G43IhVZdDua4e+5/n1ZslwIDAQABo2MwYTARBglghkgBhvhCAQEEBAMCB4AwTAYJ"
-         + "YIZIAYb4QgENBD8WPVRoaXMgY2VydGlmaWNhdGUgaXMgb25seSBpbnRlbmRlZCBm"
-         + "b3IgZGVtb25zdHJhdGlvbiBwdXJwb3Nlcy4wDQYJKoZIhvcNAQEEBQADgYEAi8qc"
-         + "F3zfFqy1sV8NhjwLVwOKuSfhR/Z8mbIEUeSTlnH3QbYt3HWZQ+vXI8mvtZoBc2Fz"
-         + "lexKeIkAZXCesqGbs6z6nCt16P6tmdfbZF3I3AWzLquPcOXjPf4HgstkyvVBn0Ap"
-         + "jAFN418KF/Cx4qyHB4cjdvLrRjjQLnb2+ibo7QU=");
-
-    //
-    // pem encoded pkcs7
-    //
-    byte[]  cert6 = Base64.decode(
-          "MIAGCSqGSIb3DQEHAqCAMIACAQExCzAJBgUrDgMCGgUAMIAGCSqGSIb3DQEHAQAAoIIJbzCCAj0w"
-        + "ggGmAhEAzbp/VvDf5LxU/iKss3KqVTANBgkqhkiG9w0BAQIFADBfMQswCQYDVQQGEwJVUzEXMBUG"
-        + "A1UEChMOVmVyaVNpZ24sIEluYy4xNzA1BgNVBAsTLkNsYXNzIDEgUHVibGljIFByaW1hcnkgQ2Vy"
-        + "dGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNOTYwMTI5MDAwMDAwWhcNMjgwODAxMjM1OTU5WjBfMQsw"
-        + "CQYDVQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xNzA1BgNVBAsTLkNsYXNzIDEgUHVi"
-        + "bGljIFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwgZ8wDQYJKoZIhvcNAQEBBQADgY0A"
-        + "MIGJAoGBAOUZv22jVmEtmUhx9mfeuY3rt56GgAqRDvo4Ja9GiILlc6igmyRdDR/MZW4MsNBWhBiH"
-        + "mgabEKFz37RYOWtuwfYV1aioP6oSBo0xrH+wNNePNGeICc0UEeJORVZpH3gCgNrcR5EpuzbJY1zF"
-        + "4Ncth3uhtzKwezC6Ki8xqu6jZ9rbAgMBAAEwDQYJKoZIhvcNAQECBQADgYEATD+4i8Zo3+5DMw5d"
-        + "6abLB4RNejP/khv0Nq3YlSI2aBFsfELM85wuxAc/FLAPT/+Qknb54rxK6Y/NoIAK98Up8YIiXbix"
-        + "3YEjo3slFUYweRb46gVLlH8dwhzI47f0EEA8E8NfH1PoSOSGtHuhNbB7Jbq4046rPzidADQAmPPR"
-        + "cZQwggMuMIICl6ADAgECAhEA0nYujRQMPX2yqCVdr+4NdTANBgkqhkiG9w0BAQIFADBfMQswCQYD"
-        + "VQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xNzA1BgNVBAsTLkNsYXNzIDEgUHVibGlj"
-        + "IFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNOTgwNTEyMDAwMDAwWhcNMDgwNTEy"
-        + "MjM1OTU5WjCBzDEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRy"
-        + "dXN0IE5ldHdvcmsxRjBEBgNVBAsTPXd3dy52ZXJpc2lnbi5jb20vcmVwb3NpdG9yeS9SUEEgSW5j"
-        + "b3JwLiBCeSBSZWYuLExJQUIuTFREKGMpOTgxSDBGBgNVBAMTP1ZlcmlTaWduIENsYXNzIDEgQ0Eg"
-        + "SW5kaXZpZHVhbCBTdWJzY3JpYmVyLVBlcnNvbmEgTm90IFZhbGlkYXRlZDCBnzANBgkqhkiG9w0B"
-        + "AQEFAAOBjQAwgYkCgYEAu1pEigQWu1X9A3qKLZRPFXg2uA1Ksm+cVL+86HcqnbnwaLuV2TFBcHqB"
-        + "S7lIE1YtxwjhhEKrwKKSq0RcqkLwgg4C6S/7wju7vsknCl22sDZCM7VuVIhPh0q/Gdr5FegPh7Yc"
-        + "48zGmo5/aiSS4/zgZbqnsX7vyds3ashKyAkG5JkCAwEAAaN8MHowEQYJYIZIAYb4QgEBBAQDAgEG"
-        + "MEcGA1UdIARAMD4wPAYLYIZIAYb4RQEHAQEwLTArBggrBgEFBQcCARYfd3d3LnZlcmlzaWduLmNv"
-        + "bS9yZXBvc2l0b3J5L1JQQTAPBgNVHRMECDAGAQH/AgEAMAsGA1UdDwQEAwIBBjANBgkqhkiG9w0B"
-        + "AQIFAAOBgQCIuDc73dqUNwCtqp/hgQFxHpJqbS/28Z3TymQ43BuYDAeGW4UVag+5SYWklfEXfWe0"
-        + "fy0s3ZpCnsM+tI6q5QsG3vJWKvozx74Z11NMw73I4xe1pElCY+zCphcPXVgaSTyQXFWjZSAA/Rgg"
-        + "5V+CprGoksVYasGNAzzrw80FopCubjCCA/gwggNhoAMCAQICEBbbn/1G1zppD6KsP01bwywwDQYJ"
-        + "KoZIhvcNAQEEBQAwgcwxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJpU2ln"
-        + "biBUcnVzdCBOZXR3b3JrMUYwRAYDVQQLEz13d3cudmVyaXNpZ24uY29tL3JlcG9zaXRvcnkvUlBB"
-        + "IEluY29ycC4gQnkgUmVmLixMSUFCLkxURChjKTk4MUgwRgYDVQQDEz9WZXJpU2lnbiBDbGFzcyAx"
-        + "IENBIEluZGl2aWR1YWwgU3Vic2NyaWJlci1QZXJzb25hIE5vdCBWYWxpZGF0ZWQwHhcNMDAxMDAy"
-        + "MDAwMDAwWhcNMDAxMjAxMjM1OTU5WjCCAQcxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYD"
-        + "VQQLExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMUYwRAYDVQQLEz13d3cudmVyaXNpZ24uY29tL3Jl"
-        + "cG9zaXRvcnkvUlBBIEluY29ycC4gYnkgUmVmLixMSUFCLkxURChjKTk4MR4wHAYDVQQLExVQZXJz"
-        + "b25hIE5vdCBWYWxpZGF0ZWQxJzAlBgNVBAsTHkRpZ2l0YWwgSUQgQ2xhc3MgMSAtIE1pY3Jvc29m"
-        + "dDETMBEGA1UEAxQKRGF2aWQgUnlhbjElMCMGCSqGSIb3DQEJARYWZGF2aWRAbGl2ZW1lZGlhLmNv"
-        + "bS5hdTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAqxBsdeNmSvFqhMNwhQgNzM8mdjX9eSXb"
-        + "DawpHtQHjmh0AKJSa3IwUY0VIsyZHuXWktO/CgaMBVPt6OVf/n0R2sQigMP6Y+PhEiS0vCJBL9aK"
-        + "0+pOo2qXrjVBmq+XuCyPTnc+BOSrU26tJsX0P9BYorwySiEGxGanBNATdVL4NdUCAwEAAaOBnDCB"
-        + "mTAJBgNVHRMEAjAAMEQGA1UdIAQ9MDswOQYLYIZIAYb4RQEHAQgwKjAoBggrBgEFBQcCARYcaHR0"
-        + "cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYTARBglghkgBhvhCAQEEBAMCB4AwMwYDVR0fBCwwKjAo"
-        + "oCagJIYiaHR0cDovL2NybC52ZXJpc2lnbi5jb20vY2xhc3MxLmNybDANBgkqhkiG9w0BAQQFAAOB"
-        + "gQBC8yIIdVGpFTf8/YiL14cMzcmL0nIRm4kGR3U59z7UtcXlfNXXJ8MyaeI/BnXwG/gD5OKYqW6R"
-        + "yca9vZOxf1uoTBl82gInk865ED3Tej6msCqFzZffnSUQvOIeqLxxDlqYRQ6PmW2nAnZeyjcnbI5Y"
-        + "syQSM2fmo7n6qJFP+GbFezGCAkUwggJBAgEBMIHhMIHMMRcwFQYDVQQKEw5WZXJpU2lnbiwgSW5j"
-        + "LjEfMB0GA1UECxMWVmVyaVNpZ24gVHJ1c3QgTmV0d29yazFGMEQGA1UECxM9d3d3LnZlcmlzaWdu"
-        + "LmNvbS9yZXBvc2l0b3J5L1JQQSBJbmNvcnAuIEJ5IFJlZi4sTElBQi5MVEQoYyk5ODFIMEYGA1UE"
-        + "AxM/VmVyaVNpZ24gQ2xhc3MgMSBDQSBJbmRpdmlkdWFsIFN1YnNjcmliZXItUGVyc29uYSBOb3Qg"
-        + "VmFsaWRhdGVkAhAW25/9Rtc6aQ+irD9NW8MsMAkGBSsOAwIaBQCggbowGAYJKoZIhvcNAQkDMQsG"
-        + "CSqGSIb3DQEHATAcBgkqhkiG9w0BCQUxDxcNMDAxMDAyMTczNTE4WjAjBgkqhkiG9w0BCQQxFgQU"
-        + "gZjSaBEY2oxGvlQUIMnxSXhivK8wWwYJKoZIhvcNAQkPMU4wTDAKBggqhkiG9w0DBzAOBggqhkiG"
-        + "9w0DAgICAIAwDQYIKoZIhvcNAwICAUAwBwYFKw4DAgcwDQYIKoZIhvcNAwICASgwBwYFKw4DAh0w"
-        + "DQYJKoZIhvcNAQEBBQAEgYAzk+PU91/ZFfoiuKOECjxEh9fDYE2jfDCheBIgh5gdcCo+sS1WQs8O"
-        + "HreQ9Nop/JdJv1DQMBK6weNBBDoP0EEkRm1XCC144XhXZC82jBZohYmi2WvDbbC//YN58kRMYMyy"
-        + "srrfn4Z9I+6kTriGXkrpGk9Q0LSGjmG2BIsqiF0dvwAAAAAAAA==");
-
-    //
-    // dsaWithSHA1 cert
-    //
-    byte[]  cert7 = Base64.decode(
-          "MIIEXAYJKoZIhvcNAQcCoIIETTCCBEkCAQExCzAJBgUrDgMCGgUAMAsGCSqG"
-        + "SIb3DQEHAaCCAsMwggK/MIIB4AIBADCBpwYFKw4DAhswgZ0CQQEkJRHP+mN7"
-        + "d8miwTMN55CUSmo3TO8WGCxgY61TX5k+7NU4XPf1TULjw3GobwaJX13kquPh"
-        + "fVXk+gVy46n4Iw3hAhUBSe/QF4BUj+pJOF9ROBM4u+FEWA8CQQD4mSJbrABj"
-        + "TUWrlnAte8pS22Tq4/FPO7jHSqjijUHfXKTrHL1OEqV3SVWcFy5j/cqBgX/z"
-        + "m8Q12PFp/PjOhh+nMA4xDDAKBgNVBAMTA0lEMzAeFw05NzEwMDEwMDAwMDBa"
-        + "Fw0zODAxMDEwMDAwMDBaMA4xDDAKBgNVBAMTA0lEMzCB8DCBpwYFKw4DAhsw"
-        + "gZ0CQQEkJRHP+mN7d8miwTMN55CUSmo3TO8WGCxgY61TX5k+7NU4XPf1TULj"
-        + "w3GobwaJX13kquPhfVXk+gVy46n4Iw3hAhUBSe/QF4BUj+pJOF9ROBM4u+FE"
-        + "WA8CQQD4mSJbrABjTUWrlnAte8pS22Tq4/FPO7jHSqjijUHfXKTrHL1OEqV3"
-        + "SVWcFy5j/cqBgX/zm8Q12PFp/PjOhh+nA0QAAkEAkYkXLYMtGVGWj9OnzjPn"
-        + "sB9sefSRPrVegZJCZbpW+Iv0/1RP1u04pHG9vtRpIQLjzUiWvLMU9EKQTThc"
-        + "eNMmWDCBpwYFKw4DAhswgZ0CQQEkJRHP+mN7d8miwTMN55CUSmo3TO8WGCxg"
-        + "Y61TX5k+7NU4XPf1TULjw3GobwaJX13kquPhfVXk+gVy46n4Iw3hAhUBSe/Q"
-        + "F4BUj+pJOF9ROBM4u+FEWA8CQQD4mSJbrABjTUWrlnAte8pS22Tq4/FPO7jH"
-        + "SqjijUHfXKTrHL1OEqV3SVWcFy5j/cqBgX/zm8Q12PFp/PjOhh+nAy8AMCwC"
-        + "FBY3dBSdeprGcqpr6wr3xbG+6WW+AhRMm/facKJNxkT3iKgJbp7R8Xd3QTGC"
-        + "AWEwggFdAgEBMBMwDjEMMAoGA1UEAxMDSUQzAgEAMAkGBSsOAwIaBQCgXTAY"
-        + "BgkqhkiG9w0BCQMxCwYJKoZIhvcNAQcBMBwGCSqGSIb3DQEJBTEPFw0wMjA1"
-        + "MjQyMzEzMDdaMCMGCSqGSIb3DQEJBDEWBBS4WMsoJhf7CVbZYCFcjoTRzPkJ"
-        + "xjCBpwYFKw4DAhswgZ0CQQEkJRHP+mN7d8miwTMN55CUSmo3TO8WGCxgY61T"
-        + "X5k+7NU4XPf1TULjw3GobwaJX13kquPhfVXk+gVy46n4Iw3hAhUBSe/QF4BU"
-        + "j+pJOF9ROBM4u+FEWA8CQQD4mSJbrABjTUWrlnAte8pS22Tq4/FPO7jHSqji"
-        + "jUHfXKTrHL1OEqV3SVWcFy5j/cqBgX/zm8Q12PFp/PjOhh+nBC8wLQIVALID"
-        + "dt+MHwawrDrwsO1Z6sXBaaJsAhRaKssrpevmLkbygKPV07XiAKBG02Zvb2Jh"
-        + "cg==");
-
-    //
-    // testcrl.pem
-    //
-    byte[]  crl1 = Base64.decode(
-        "MIICjTCCAfowDQYJKoZIhvcNAQECBQAwXzELMAkGA1UEBhMCVVMxIDAeBgNVBAoT"
-        + "F1JTQSBEYXRhIFNlY3VyaXR5LCBJbmMuMS4wLAYDVQQLEyVTZWN1cmUgU2VydmVy"
-        + "IENlcnRpZmljYXRpb24gQXV0aG9yaXR5Fw05NTA1MDIwMjEyMjZaFw05NTA2MDEw"
-        + "MDAxNDlaMIIBaDAWAgUCQQAABBcNOTUwMjAxMTcyNDI2WjAWAgUCQQAACRcNOTUw"
-        + "MjEwMDIxNjM5WjAWAgUCQQAADxcNOTUwMjI0MDAxMjQ5WjAWAgUCQQAADBcNOTUw"
-        + "MjI1MDA0NjQ0WjAWAgUCQQAAGxcNOTUwMzEzMTg0MDQ5WjAWAgUCQQAAFhcNOTUw"
-        + "MzE1MTkxNjU0WjAWAgUCQQAAGhcNOTUwMzE1MTk0MDQxWjAWAgUCQQAAHxcNOTUw"
-        + "MzI0MTk0NDMzWjAWAgUCcgAABRcNOTUwMzI5MjAwNzExWjAWAgUCcgAAERcNOTUw"
-        + "MzMwMDIzNDI2WjAWAgUCQQAAIBcNOTUwNDA3MDExMzIxWjAWAgUCcgAAHhcNOTUw"
-        + "NDA4MDAwMjU5WjAWAgUCcgAAQRcNOTUwNDI4MTcxNzI0WjAWAgUCcgAAOBcNOTUw"
-        + "NDI4MTcyNzIxWjAWAgUCcgAATBcNOTUwNTAyMDIxMjI2WjANBgkqhkiG9w0BAQIF"
-        + "AAN+AHqOEJXSDejYy0UwxxrH/9+N2z5xu/if0J6qQmK92W0hW158wpJg+ovV3+wQ"
-        + "wvIEPRL2rocL0tKfAsVq1IawSJzSNgxG0lrcla3MrJBnZ4GaZDu4FutZh72MR3Gt"
-        + "JaAL3iTJHJD55kK2D/VoyY1djlsPuNh6AEgdVwFAyp0v");
-
-    //
-    // ecdsa cert with extra octet string.
-    //
-    byte[]  oldEcdsa = Base64.decode(
-          "MIICljCCAkCgAwIBAgIBATALBgcqhkjOPQQBBQAwgY8xCzAJBgNVBAYTAkFVMSgwJ"
-        + "gYDVQQKEx9UaGUgTGVnaW9uIG9mIHRoZSBCb3VuY3kgQ2FzdGxlMRIwEAYDVQQHEw"
-        + "lNZWxib3VybmUxETAPBgNVBAgTCFZpY3RvcmlhMS8wLQYJKoZIhvcNAQkBFiBmZWV"
-        + "kYmFjay1jcnlwdG9AYm91bmN5Y2FzdGxlLm9yZzAeFw0wMTEyMDcwMTAwMDRaFw0w"
-        + "MTEyMDcwMTAxNDRaMIGPMQswCQYDVQQGEwJBVTEoMCYGA1UEChMfVGhlIExlZ2lvb"
-        + "iBvZiB0aGUgQm91bmN5IENhc3RsZTESMBAGA1UEBxMJTWVsYm91cm5lMREwDwYDVQ"
-        + "QIEwhWaWN0b3JpYTEvMC0GCSqGSIb3DQEJARYgZmVlZGJhY2stY3J5cHRvQGJvdW5"
-        + "jeWNhc3RsZS5vcmcwgeQwgb0GByqGSM49AgEwgbECAQEwKQYHKoZIzj0BAQIef///"
-        + "////////////f///////gAAAAAAAf///////MEAEHn///////////////3///////"
-        + "4AAAAAAAH///////AQeawFsO9zxiUHQ1lSSFHXKcanbL7J9HTd5YYXClCwKBB8CD/"
-        + "qWPNyogWzMM7hkK+35BcPTWFc9Pyf7vTs8uaqvAh5///////////////9///+eXpq"
-        + "fXZBx+9FSJoiQnQsDIgAEHwJbbcU7xholSP+w9nFHLebJUhqdLSU05lq/y9X+DHAw"
-        + "CwYHKoZIzj0EAQUAA0MAMEACHnz6t4UNoVROp74ma4XNDjjGcjaqiIWPZLK8Bdw3G"
-        + "QIeLZ4j3a6ividZl344UH+UPUE7xJxlYGuy7ejTsqRR");
-
-    byte[]  uncompressedPtEC = Base64.decode(
-          "MIIDKzCCAsGgAwIBAgICA+kwCwYHKoZIzj0EAQUAMGYxCzAJBgNVBAYTAkpQ"
-        + "MRUwEwYDVQQKEwxuaXRlY2guYWMuanAxDjAMBgNVBAsTBWFpbGFiMQ8wDQYD"
-        + "VQQDEwZ0ZXN0Y2ExHzAdBgkqhkiG9w0BCQEWEHRlc3RjYUBsb2NhbGhvc3Qw"
-        + "HhcNMDExMDEzMTE1MzE3WhcNMjAxMjEyMTE1MzE3WjBmMQswCQYDVQQGEwJK"
-        + "UDEVMBMGA1UEChMMbml0ZWNoLmFjLmpwMQ4wDAYDVQQLEwVhaWxhYjEPMA0G"
-        + "A1UEAxMGdGVzdGNhMR8wHQYJKoZIhvcNAQkBFhB0ZXN0Y2FAbG9jYWxob3N0"
-        + "MIIBczCCARsGByqGSM49AgEwggEOAgEBMDMGByqGSM49AQECKEdYWnajFmnZ"
-        + "tzrukK2XWdle2v+GsD9l1ZiR6g7ozQDbhFH/bBiMDQcwVAQoJ5EQKrI54/CT"
-        + "xOQ2pMsd/fsXD+EX8YREd8bKHWiLz8lIVdD5cBNeVwQoMKSc6HfI7vKZp8Q2"
-        + "zWgIFOarx1GQoWJbMcSt188xsl30ncJuJT2OoARRBAqJ4fD+q6hbqgNSjTQ7"
-        + "htle1KO3eiaZgcJ8rrnyN8P+5A8+5K+H9aQ/NbBR4Gs7yto5PXIUZEUgodHA"
-        + "TZMSAcSq5ZYt4KbnSYaLY0TtH9CqAigEwZ+hglbT21B7ZTzYX2xj0x+qooJD"
-        + "hVTLtIPaYJK2HrMPxTw6/zfrAgEPA1IABAnvfFcFDgD/JicwBGn6vR3N8MIn"
-        + "mptZf/mnJ1y649uCF60zOgdwIyI7pVSxBFsJ7ohqXEHW0x7LrGVkdSEiipiH"
-        + "LYslqh3xrqbAgPbl93GUo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB"
-        + "/wQEAwIBxjAdBgNVHQ4EFgQUAEo62Xm9H6DcsE0zUDTza4BRG90wCwYHKoZI"
-        + "zj0EAQUAA1cAMFQCKAQsCHHSNOqfJXLgt3bg5+k49hIBGVr/bfG0B9JU3rNt"
-        + "Ycl9Y2zfRPUCKAK2ccOQXByAWfsasDu8zKHxkZv7LVDTFjAIffz3HaCQeVhD"
-        + "z+fauEg=");
-
-    byte[]  keyUsage = Base64.decode(
-          "MIIE7TCCBFagAwIBAgIEOAOR7jANBgkqhkiG9w0BAQQFADCByTELMAkGA1UE"
-        + "BhMCVVMxFDASBgNVBAoTC0VudHJ1c3QubmV0MUgwRgYDVQQLFD93d3cuZW50"
-        + "cnVzdC5uZXQvQ2xpZW50X0NBX0luZm8vQ1BTIGluY29ycC4gYnkgcmVmLiBs"
-        + "aW1pdHMgbGlhYi4xJTAjBgNVBAsTHChjKSAxOTk5IEVudHJ1c3QubmV0IExp"
-        + "bWl0ZWQxMzAxBgNVBAMTKkVudHJ1c3QubmV0IENsaWVudCBDZXJ0aWZpY2F0"
-        + "aW9uIEF1dGhvcml0eTAeFw05OTEwMTIxOTI0MzBaFw0xOTEwMTIxOTU0MzBa"
-        + "MIHJMQswCQYDVQQGEwJVUzEUMBIGA1UEChMLRW50cnVzdC5uZXQxSDBGBgNV"
-        + "BAsUP3d3dy5lbnRydXN0Lm5ldC9DbGllbnRfQ0FfSW5mby9DUFMgaW5jb3Jw"
-        + "LiBieSByZWYuIGxpbWl0cyBsaWFiLjElMCMGA1UECxMcKGMpIDE5OTkgRW50"
-        + "cnVzdC5uZXQgTGltaXRlZDEzMDEGA1UEAxMqRW50cnVzdC5uZXQgQ2xpZW50"
-        + "IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIGdMA0GCSqGSIb3DQEBAQUAA4GL"
-        + "ADCBhwKBgQDIOpleMRffrCdvkHvkGf9FozTC28GoT/Bo6oT9n3V5z8GKUZSv"
-        + "x1cDR2SerYIbWtp/N3hHuzeYEpbOxhN979IMMFGpOZ5V+Pux5zDeg7K6PvHV"
-        + "iTs7hbqqdCz+PzFur5GVbgbUB01LLFZHGARS2g4Qk79jkJvh34zmAqTmT173"
-        + "iwIBA6OCAeAwggHcMBEGCWCGSAGG+EIBAQQEAwIABzCCASIGA1UdHwSCARkw"
-        + "ggEVMIHkoIHhoIHepIHbMIHYMQswCQYDVQQGEwJVUzEUMBIGA1UEChMLRW50"
-        + "cnVzdC5uZXQxSDBGBgNVBAsUP3d3dy5lbnRydXN0Lm5ldC9DbGllbnRfQ0Ff"
-        + "SW5mby9DUFMgaW5jb3JwLiBieSByZWYuIGxpbWl0cyBsaWFiLjElMCMGA1UE"
-        + "CxMcKGMpIDE5OTkgRW50cnVzdC5uZXQgTGltaXRlZDEzMDEGA1UEAxMqRW50"
-        + "cnVzdC5uZXQgQ2xpZW50IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MQ0wCwYD"
-        + "VQQDEwRDUkwxMCygKqAohiZodHRwOi8vd3d3LmVudHJ1c3QubmV0L0NSTC9D"
-        + "bGllbnQxLmNybDArBgNVHRAEJDAigA8xOTk5MTAxMjE5MjQzMFqBDzIwMTkx"
-        + "MDEyMTkyNDMwWjALBgNVHQ8EBAMCAQYwHwYDVR0jBBgwFoAUxPucKXuXzUyW"
-        + "/O5bs8qZdIuV6kwwHQYDVR0OBBYEFMT7nCl7l81MlvzuW7PKmXSLlepMMAwG"
-        + "A1UdEwQFMAMBAf8wGQYJKoZIhvZ9B0EABAwwChsEVjQuMAMCBJAwDQYJKoZI"
-        + "hvcNAQEEBQADgYEAP66K8ddmAwWePvrqHEa7pFuPeJoSSJn59DXeDDYHAmsQ"
-        + "OokUgZwxpnyyQbJq5wcBoUv5nyU7lsqZwz6hURzzwy5E97BnRqqS5TvaHBkU"
-        + "ODDV4qIxJS7x7EU47fgGWANzYrAQMY9Av2TgXD7FTx/aEkP/TOYGJqibGapE"
-        + "PHayXOw=");
-
-    byte[] nameCert = Base64.decode(
-            "MIIEFjCCA3+gAwIBAgIEdS8BozANBgkqhkiG9w0BAQUFADBKMQswCQYDVQQGEwJE"+
-            "RTERMA8GA1UEChQIREFURVYgZUcxKDAMBgcCggYBCgcUEwExMBgGA1UEAxQRQ0Eg"+
-            "REFURVYgRDAzIDE6UE4wIhgPMjAwMTA1MTAxMDIyNDhaGA8yMDA0MDUwOTEwMjI0"+
-            "OFowgYQxCzAJBgNVBAYTAkRFMQ8wDQYDVQQIFAZCYXllcm4xEjAQBgNVBAcUCU7I"+
-            "dXJuYmVyZzERMA8GA1UEChQIREFURVYgZUcxHTAbBgNVBAUTFDAwMDAwMDAwMDA4"+
-            "OTU3NDM2MDAxMR4wHAYDVQQDFBVEaWV0bWFyIFNlbmdlbmxlaXRuZXIwgaEwDQYJ"+
-            "KoZIhvcNAQEBBQADgY8AMIGLAoGBAJLI/LJLKaHoMk8fBECW/od8u5erZi6jI8Ug"+
-            "C0a/LZyQUO/R20vWJs6GrClQtXB+AtfiBSnyZOSYzOdfDI8yEKPEv8qSuUPpOHps"+
-            "uNCFdLZF1vavVYGEEWs2+y+uuPmg8q1oPRyRmUZ+x9HrDvCXJraaDfTEd9olmB/Z"+
-            "AuC/PqpjAgUAwAAAAaOCAcYwggHCMAwGA1UdEwEB/wQCMAAwDwYDVR0PAQH/BAUD"+
-            "AwdAADAxBgNVHSAEKjAoMCYGBSskCAEBMB0wGwYIKwYBBQUHAgEWD3d3dy56cy5k"+
-            "YXRldi5kZTApBgNVHREEIjAggR5kaWV0bWFyLnNlbmdlbmxlaXRuZXJAZGF0ZXYu"+
-            "ZGUwgYQGA1UdIwR9MHuhc6RxMG8xCzAJBgNVBAYTAkRFMT0wOwYDVQQKFDRSZWd1"+
-            "bGllcnVuZ3NiZWjIb3JkZSBmyHVyIFRlbGVrb21tdW5pa2F0aW9uIHVuZCBQb3N0"+
-            "MSEwDAYHAoIGAQoHFBMBMTARBgNVBAMUCjVSLUNBIDE6UE6CBACm8LkwDgYHAoIG"+
-            "AQoMAAQDAQEAMEcGA1UdHwRAMD4wPKAUoBKGEHd3dy5jcmwuZGF0ZXYuZGWiJKQi"+
-            "MCAxCzAJBgNVBAYTAkRFMREwDwYDVQQKFAhEQVRFViBlRzAWBgUrJAgDBAQNMAsT"+
-            "A0VVUgIBBQIBATAdBgNVHQ4EFgQUfv6xFP0xk7027folhy+ziZvBJiwwLAYIKwYB"+
-            "BQUHAQEEIDAeMBwGCCsGAQUFBzABhhB3d3cuZGlyLmRhdGV2LmRlMA0GCSqGSIb3"+
-            "DQEBBQUAA4GBAEOVX6uQxbgtKzdgbTi6YLffMftFr2mmNwch7qzpM5gxcynzgVkg"+
-            "pnQcDNlm5AIbS6pO8jTCLfCd5TZ5biQksBErqmesIl3QD+VqtB+RNghxectZ3VEs"+
-            "nCUtcE7tJ8O14qwCb3TxS9dvIUFiVi4DjbxX46TdcTbTaK8/qr6AIf+l");
-    
-    byte[] probSelfSignedCert = Base64.decode(
-              "MIICxTCCAi6gAwIBAgIQAQAAAAAAAAAAAAAAAAAAATANBgkqhkiG9w0BAQUFADBF"
-            + "MScwJQYDVQQKEx4gRElSRUNUSU9OIEdFTkVSQUxFIERFUyBJTVBPVFMxGjAYBgNV"
-            + "BAMTESBBQyBNSU5FRkkgQiBURVNUMB4XDTA0MDUwNzEyMDAwMFoXDTE0MDUwNzEy"
-            + "MDAwMFowRTEnMCUGA1UEChMeIERJUkVDVElPTiBHRU5FUkFMRSBERVMgSU1QT1RT"
-            + "MRowGAYDVQQDExEgQUMgTUlORUZJIEIgVEVTVDCBnzANBgkqhkiG9w0BAQEFAAOB"
-            + "jQAwgYkCgYEAveoCUOAukZdcFCs2qJk76vSqEX0ZFzHqQ6faBPZWjwkgUNwZ6m6m"
-            + "qWvvyq1cuxhoDvpfC6NXILETawYc6MNwwxsOtVVIjuXlcF17NMejljJafbPximEt"
-            + "DQ4LcQeSp4K7FyFlIAMLyt3BQ77emGzU5fjFTvHSUNb3jblx0sV28c0CAwEAAaOB"
-            + "tTCBsjAfBgNVHSMEGDAWgBSEJ4bLbvEQY8cYMAFKPFD1/fFXlzAdBgNVHQ4EFgQU"
-            + "hCeGy27xEGPHGDABSjxQ9f3xV5cwDgYDVR0PAQH/BAQDAgEGMBEGCWCGSAGG+EIB"
-            + "AQQEAwIBBjA8BgNVHR8ENTAzMDGgL6AthitodHRwOi8vYWRvbmlzLnBrNy5jZXJ0"
-            + "cGx1cy5uZXQvZGdpLXRlc3QuY3JsMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcN"
-            + "AQEFBQADgYEAmToHJWjd3+4zknfsP09H6uMbolHNGG0zTS2lrLKpzcmkQfjhQpT9"
-            + "LUTBvfs1jdjo9fGmQLvOG+Sm51Rbjglb8bcikVI5gLbclOlvqLkm77otjl4U4Z2/"
-            + "Y0vP14Aov3Sn3k+17EfReYUZI4liuB95ncobC4e8ZM++LjQcIM0s+Vs=");
-    
-    
-    byte[] gost34102001base = Base64.decode(
-              "MIIB1DCCAYECEEjpVKXP6Wn1yVz3VeeDQa8wCgYGKoUDAgIDBQAwbTEfMB0G"
-            + "A1UEAwwWR29zdFIzNDEwLTIwMDEgZXhhbXBsZTESMBAGA1UECgwJQ3J5cHRv"
-            + "UHJvMQswCQYDVQQGEwJSVTEpMCcGCSqGSIb3DQEJARYaR29zdFIzNDEwLTIw"
-            + "MDFAZXhhbXBsZS5jb20wHhcNMDUwMjAzMTUxNjQ2WhcNMTUwMjAzMTUxNjQ2"
-            + "WjBtMR8wHQYDVQQDDBZHb3N0UjM0MTAtMjAwMSBleGFtcGxlMRIwEAYDVQQK"
-            + "DAlDcnlwdG9Qcm8xCzAJBgNVBAYTAlJVMSkwJwYJKoZIhvcNAQkBFhpHb3N0"
-            + "UjM0MTAtMjAwMUBleGFtcGxlLmNvbTBjMBwGBiqFAwICEzASBgcqhQMCAiQA"
-            + "BgcqhQMCAh4BA0MABECElWh1YAIaQHUIzROMMYks/eUFA3pDXPRtKw/nTzJ+"
-            + "V4/rzBa5lYgD0Jp8ha4P5I3qprt+VsfLsN8PZrzK6hpgMAoGBiqFAwICAwUA"
-            + "A0EAHw5dw/aw/OiNvHyOE65kvyo4Hp0sfz3csM6UUkp10VO247ofNJK3tsLb"
-            + "HOLjUaqzefrlGb11WpHYrvWFg+FcLA==");
-    
-    byte[] gost341094base = Base64.decode(
-              "MIICDzCCAbwCEBcxKsIb0ghYvAQeUjfQdFAwCgYGKoUDAgIEBQAwaTEdMBsG"
-            + "A1UEAwwUR29zdFIzNDEwLTk0IGV4YW1wbGUxEjAQBgNVBAoMCUNyeXB0b1By"
-            + "bzELMAkGA1UEBhMCUlUxJzAlBgkqhkiG9w0BCQEWGEdvc3RSMzQxMC05NEBl"
-            + "eGFtcGxlLmNvbTAeFw0wNTAyMDMxNTE2NTFaFw0xNTAyMDMxNTE2NTFaMGkx"
-            + "HTAbBgNVBAMMFEdvc3RSMzQxMC05NCBleGFtcGxlMRIwEAYDVQQKDAlDcnlw"
-            + "dG9Qcm8xCzAJBgNVBAYTAlJVMScwJQYJKoZIhvcNAQkBFhhHb3N0UjM0MTAt"
-            + "OTRAZXhhbXBsZS5jb20wgaUwHAYGKoUDAgIUMBIGByqFAwICIAIGByqFAwIC"
-            + "HgEDgYQABIGAu4Rm4XmeWzTYLIB/E6gZZnFX/oxUJSFHbzALJ3dGmMb7R1W+"
-            + "t7Lzk2w5tUI3JoTiDRCKJA4fDEJNKzsRK6i/ZjkyXJSLwaj+G2MS9gklh8x1"
-            + "G/TliYoJgmjTXHemD7aQEBON4z58nJHWrA0ILD54wbXCtrcaqCqLRYGTMjJ2"
-            + "+nswCgYGKoUDAgIEBQADQQBxKNhOmjgz/i5CEgLOyKyz9pFGkDcaymsWYQWV"
-            + "v7CZ0pTM8IzMzkUBW3GHsUjCFpanFZDfg2zuN+3kT+694n9B");
-    
-    byte[] gost341094A = Base64.decode(
-            "MIICSDCCAfWgAwIBAgIBATAKBgYqhQMCAgQFADCBgTEXMBUGA1UEAxMOZGVmYXVsdDM0MTAtOTQx"
-            + "DTALBgNVBAoTBERpZ3QxDzANBgNVBAsTBkNyeXB0bzEOMAwGA1UEBxMFWS1vbGExDDAKBgNVBAgT"
-            + "A01FTDELMAkGA1UEBhMCcnUxGzAZBgkqhkiG9w0BCQEWDHRlc3RAdGVzdC5ydTAeFw0wNTAzMjkx"
-            + "MzExNTdaFw0wNjAzMjkxMzExNTdaMIGBMRcwFQYDVQQDEw5kZWZhdWx0MzQxMC05NDENMAsGA1UE"
-            + "ChMERGlndDEPMA0GA1UECxMGQ3J5cHRvMQ4wDAYDVQQHEwVZLW9sYTEMMAoGA1UECBMDTUVMMQsw"
-            + "CQYDVQQGEwJydTEbMBkGCSqGSIb3DQEJARYMdGVzdEB0ZXN0LnJ1MIGlMBwGBiqFAwICFDASBgcq"
-            + "hQMCAiACBgcqhQMCAh4BA4GEAASBgIQACDLEuxSdRDGgdZxHmy30g/DUYkRxO9Mi/uSHX5NjvZ31"
-            + "b7JMEMFqBtyhql1HC5xZfUwZ0aT3UnEFDfFjLP+Bf54gA+LPkQXw4SNNGOj+klnqgKlPvoqMGlwa"
-            + "+hLPKbS561WpvB2XSTgbV+pqqXR3j6j30STmybelEV3RdS2Now8wDTALBgNVHQ8EBAMCB4AwCgYG"
-            + "KoUDAgIEBQADQQBCFy7xWRXtNVXflKvDs0pBdBuPzjCMeZAXVxK8vUxsxxKu76d9CsvhgIFknFRi"
-            + "wWTPiZenvNoJ4R1uzeX+vREm");
-    
-    byte[] gost341094B = Base64.decode(
-            "MIICSDCCAfWgAwIBAgIBATAKBgYqhQMCAgQFADCBgTEXMBUGA1UEAxMOcGFyYW0xLTM0MTAtOTQx"
-            +  "DTALBgNVBAoTBERpZ3QxDzANBgNVBAsTBkNyeXB0bzEOMAwGA1UEBxMFWS1PbGExDDAKBgNVBAgT"
-            +  "A01lbDELMAkGA1UEBhMCcnUxGzAZBgkqhkiG9w0BCQEWDHRlc3RAdGVzdC5ydTAeFw0wNTAzMjkx"
-            +  "MzEzNTZaFw0wNjAzMjkxMzEzNTZaMIGBMRcwFQYDVQQDEw5wYXJhbTEtMzQxMC05NDENMAsGA1UE"
-            +  "ChMERGlndDEPMA0GA1UECxMGQ3J5cHRvMQ4wDAYDVQQHEwVZLU9sYTEMMAoGA1UECBMDTWVsMQsw"
-            +  "CQYDVQQGEwJydTEbMBkGCSqGSIb3DQEJARYMdGVzdEB0ZXN0LnJ1MIGlMBwGBiqFAwICFDASBgcq"
-            +  "hQMCAiADBgcqhQMCAh4BA4GEAASBgEa+AAcZmijWs1M9x5Pn9efE8D9ztG1NMoIt0/hNZNqln3+j"
-            +  "lMZjyqPt+kTLIjtmvz9BRDmIDk6FZz+4LhG2OTL7yGpWfrMxMRr56nxomTN9aLWRqbyWmn3brz9Y"
-            +  "AUD3ifnwjjIuW7UM84JNlDTOdxx0XRUfLQIPMCXe9cO02Xskow8wDTALBgNVHQ8EBAMCB4AwCgYG"
-            +  "KoUDAgIEBQADQQBzFcnuYc/639OTW+L5Ecjw9KxGr+dwex7lsS9S1BUgKa3m1d5c+cqI0B2XUFi5"
-            +  "4iaHHJG0dCyjtQYLJr0OZjRw");
-    
-    byte[] gost34102001A = Base64.decode(
-            "MIICCzCCAbigAwIBAgIBATAKBgYqhQMCAgMFADCBhDEaMBgGA1UEAxMRZGVmYXVsdC0zNDEwLTIw"
-            + "MDExDTALBgNVBAoTBERpZ3QxDzANBgNVBAsTBkNyeXB0bzEOMAwGA1UEBxMFWS1PbGExDDAKBgNV"
-            + "BAgTA01lbDELMAkGA1UEBhMCcnUxGzAZBgkqhkiG9w0BCQEWDHRlc3RAdGVzdC5ydTAeFw0wNTAz"
-            + "MjkxMzE4MzFaFw0wNjAzMjkxMzE4MzFaMIGEMRowGAYDVQQDExFkZWZhdWx0LTM0MTAtMjAwMTEN"
-            + "MAsGA1UEChMERGlndDEPMA0GA1UECxMGQ3J5cHRvMQ4wDAYDVQQHEwVZLU9sYTEMMAoGA1UECBMD"
-            + "TWVsMQswCQYDVQQGEwJydTEbMBkGCSqGSIb3DQEJARYMdGVzdEB0ZXN0LnJ1MGMwHAYGKoUDAgIT"
-            + "MBIGByqFAwICIwEGByqFAwICHgEDQwAEQG/4c+ZWb10IpeHfmR+vKcbpmSOClJioYmCVgnojw0Xn"
-            + "ned0KTg7TJreRUc+VX7vca4hLQaZ1o/TxVtfEApK/O6jDzANMAsGA1UdDwQEAwIHgDAKBgYqhQMC"
-            + "AgMFAANBAN8y2b6HuIdkD3aWujpfQbS1VIA/7hro4vLgDhjgVmev/PLzFB8oTh3gKhExpDo82IEs"
-            + "ZftGNsbbyp1NFg7zda0=");
-    
-    byte[] gostCA1 = Base64.decode(
-            "MIIDNDCCAuGgAwIBAgIQZLcKDcWcQopF+jp4p9jylDAKBgYqhQMCAgQFADBm"
-            + "MQswCQYDVQQGEwJSVTEPMA0GA1UEBxMGTW9zY293MRcwFQYDVQQKEw5PT08g"
-            + "Q3J5cHRvLVBybzEUMBIGA1UECxMLRGV2ZWxvcG1lbnQxFzAVBgNVBAMTDkNQ"
-            + "IENTUCBUZXN0IENBMB4XDTAyMDYwOTE1NTIyM1oXDTA5MDYwOTE1NTkyOVow"
-            + "ZjELMAkGA1UEBhMCUlUxDzANBgNVBAcTBk1vc2NvdzEXMBUGA1UEChMOT09P"
-            + "IENyeXB0by1Qcm8xFDASBgNVBAsTC0RldmVsb3BtZW50MRcwFQYDVQQDEw5D"
-            + "UCBDU1AgVGVzdCBDQTCBpTAcBgYqhQMCAhQwEgYHKoUDAgIgAgYHKoUDAgIe"
-            + "AQOBhAAEgYAYglywKuz1nMc9UiBYOaulKy53jXnrqxZKbCCBSVaJ+aCKbsQm"
-            + "glhRFrw6Mwu8Cdeabo/ojmea7UDMZd0U2xhZFRti5EQ7OP6YpqD0alllo7za"
-            + "4dZNXdX+/ag6fOORSLFdMpVx5ganU0wHMPk67j+audnCPUj/plbeyccgcdcd"
-            + "WaOCASIwggEeMAsGA1UdDwQEAwIBxjAPBgNVHRMBAf8EBTADAQH/MB0GA1Ud"
-            + "DgQWBBTe840gTo4zt2twHilw3PD9wJaX0TCBygYDVR0fBIHCMIG/MDygOqA4"
-            + "hjYtaHR0cDovL2ZpZXdhbGwvQ2VydEVucm9sbC9DUCUyMENTUCUyMFRlc3Ql"
-            + "MjBDQSgzKS5jcmwwRKBCoECGPmh0dHA6Ly93d3cuY3J5cHRvcHJvLnJ1L0Nl"
-            + "cnRFbnJvbGwvQ1AlMjBDU1AlMjBUZXN0JTIwQ0EoMykuY3JsMDmgN6A1hjMt"
-            + "ZmlsZTovL1xcZmlld2FsbFxDZXJ0RW5yb2xsXENQIENTUCBUZXN0IENBKDMp"
-            + "LmNybC8wEgYJKwYBBAGCNxUBBAUCAwMAAzAKBgYqhQMCAgQFAANBAIJi7ni7"
-            + "9rwMR5rRGTFftt2k70GbqyUEfkZYOzrgdOoKiB4IIsIstyBX0/ne6GsL9Xan"
-            + "G2IN96RB7KrowEHeW+k=");
-    
-    byte[] gostCA2 = Base64.decode(
-            "MIIC2DCCAoWgAwIBAgIQe9ZCugm42pRKNcHD8466zTAKBgYqhQMCAgMFADB+"
-            + "MRowGAYJKoZIhvcNAQkBFgtzYmFAZGlndC5ydTELMAkGA1UEBhMCUlUxDDAK"
-            + "BgNVBAgTA01FTDEUMBIGA1UEBxMLWW9zaGthci1PbGExDTALBgNVBAoTBERp"
-            + "Z3QxDzANBgNVBAsTBkNyeXB0bzEPMA0GA1UEAxMGc2JhLUNBMB4XDTA0MDgw"
-            + "MzEzMzE1OVoXDTE0MDgwMzEzNDAxMVowfjEaMBgGCSqGSIb3DQEJARYLc2Jh"
-            + "QGRpZ3QucnUxCzAJBgNVBAYTAlJVMQwwCgYDVQQIEwNNRUwxFDASBgNVBAcT"
-            + "C1lvc2hrYXItT2xhMQ0wCwYDVQQKEwREaWd0MQ8wDQYDVQQLEwZDcnlwdG8x"
-            + "DzANBgNVBAMTBnNiYS1DQTBjMBwGBiqFAwICEzASBgcqhQMCAiMBBgcqhQMC"
-            + "Ah4BA0MABEDMSy10CuOH+i8QKG2UWA4XmCt6+BFrNTZQtS6bOalyDY8Lz+G7"
-            + "HybyipE3PqdTB4OIKAAPsEEeZOCZd2UXGQm5o4HaMIHXMBMGCSsGAQQBgjcU"
-            + "AgQGHgQAQwBBMAsGA1UdDwQEAwIBhjAPBgNVHRMBAf8EBTADAQH/MB0GA1Ud"
-            + "DgQWBBRJJl3LcNMxkZI818STfoi3ng1xoDBxBgNVHR8EajBoMDGgL6Athito"
-            + "dHRwOi8vc2JhLmRpZ3QubG9jYWwvQ2VydEVucm9sbC9zYmEtQ0EuY3JsMDOg"
-            + "MaAvhi1maWxlOi8vXFxzYmEuZGlndC5sb2NhbFxDZXJ0RW5yb2xsXHNiYS1D"
-            + "QS5jcmwwEAYJKwYBBAGCNxUBBAMCAQAwCgYGKoUDAgIDBQADQQA+BRJHbc/p"
-            + "q8EYl6iJqXCuR+ozRmH7hPAP3c4KqYSC38TClCgBloLapx/3/WdatctFJW/L"
-            + "mcTovpq088927shE");
-
-    byte[] inDirectCrl = Base64.decode(
-            "MIIdXjCCHMcCAQEwDQYJKoZIhvcNAQEFBQAwdDELMAkGA1UEBhMCREUxHDAaBgNV"
-            +"BAoUE0RldXRzY2hlIFRlbGVrb20gQUcxFzAVBgNVBAsUDlQtVGVsZVNlYyBUZXN0"
-            +"MS4wDAYHAoIGAQoHFBMBMTAeBgNVBAMUF1QtVGVsZVNlYyBUZXN0IERJUiA4OlBO"
-            +"Fw0wNjA4MDQwODQ1MTRaFw0wNjA4MDQxNDQ1MTRaMIIbfzB+AgQvrj/pFw0wMzA3"
-            +"MjIwNTQxMjhaMGcwZQYDVR0dAQH/BFswWaRXMFUxCzAJBgNVBAYTAkRFMRwwGgYD"
-            +"VQQKFBNEZXV0c2NoZSBUZWxla29tIEFHMSgwDAYHAoIGAQoHFBMBMTAYBgNVBAMU"
-            +"EVNpZ0cgVGVzdCBDQSA0OlBOMH4CBC+uP+oXDTAzMDcyMjA1NDEyOFowZzBlBgNV"
-            +"HR0BAf8EWzBZpFcwVTELMAkGA1UEBhMCREUxHDAaBgNVBAoUE0RldXRzY2hlIFRl"
-            +"bGVrb20gQUcxKDAMBgcCggYBCgcUEwExMBgGA1UEAxQRU2lnRyBUZXN0IENBIDQ6"
-            +"UE4wfgIEL64/5xcNMDQwNDA1MTMxODE3WjBnMGUGA1UdHQEB/wRbMFmkVzBVMQsw"
-            +"CQYDVQQGEwJERTEcMBoGA1UEChQTRGV1dHNjaGUgVGVsZWtvbSBBRzEoMAwGBwKC"
-            +"BgEKBxQTATEwGAYDVQQDFBFTaWdHIFRlc3QgQ0EgNDpQTjB+AgQvrj/oFw0wNDA0"
-            +"MDUxMzE4MTdaMGcwZQYDVR0dAQH/BFswWaRXMFUxCzAJBgNVBAYTAkRFMRwwGgYD"
-            +"VQQKFBNEZXV0c2NoZSBUZWxla29tIEFHMSgwDAYHAoIGAQoHFBMBMTAYBgNVBAMU"
-            +"EVNpZ0cgVGVzdCBDQSA0OlBOMH4CBC+uP+UXDTAzMDExMzExMTgxMVowZzBlBgNV"
-            +"HR0BAf8EWzBZpFcwVTELMAkGA1UEBhMCREUxHDAaBgNVBAoUE0RldXRzY2hlIFRl"
-            +"bGVrb20gQUcxKDAMBgcCggYBCgcUEwExMBgGA1UEAxQRU2lnRyBUZXN0IENBIDQ6"
-            +"UE4wfgIEL64/5hcNMDMwMTEzMTExODExWjBnMGUGA1UdHQEB/wRbMFmkVzBVMQsw"
-            +"CQYDVQQGEwJERTEcMBoGA1UEChQTRGV1dHNjaGUgVGVsZWtvbSBBRzEoMAwGBwKC"
-            +"BgEKBxQTATEwGAYDVQQDFBFTaWdHIFRlc3QgQ0EgNDpQTjB+AgQvrj/jFw0wMzAx"
-            +"MTMxMTI2NTZaMGcwZQYDVR0dAQH/BFswWaRXMFUxCzAJBgNVBAYTAkRFMRwwGgYD"
-            +"VQQKFBNEZXV0c2NoZSBUZWxla29tIEFHMSgwDAYHAoIGAQoHFBMBMTAYBgNVBAMU"
-            +"EVNpZ0cgVGVzdCBDQSA0OlBOMH4CBC+uP+QXDTAzMDExMzExMjY1NlowZzBlBgNV"
-            +"HR0BAf8EWzBZpFcwVTELMAkGA1UEBhMCREUxHDAaBgNVBAoUE0RldXRzY2hlIFRl"
-            +"bGVrb20gQUcxKDAMBgcCggYBCgcUEwExMBgGA1UEAxQRU2lnRyBUZXN0IENBIDQ6"
-            +"UE4wfgIEL64/4hcNMDQwNzEzMDc1ODM4WjBnMGUGA1UdHQEB/wRbMFmkVzBVMQsw"
-            +"CQYDVQQGEwJERTEcMBoGA1UEChQTRGV1dHNjaGUgVGVsZWtvbSBBRzEoMAwGBwKC"
-            +"BgEKBxQTATEwGAYDVQQDFBFTaWdHIFRlc3QgQ0EgNDpQTjB+AgQvrj/eFw0wMzAy"
-            +"MTcwNjMzMjVaMGcwZQYDVR0dAQH/BFswWaRXMFUxCzAJBgNVBAYTAkRFMRwwGgYD"
-            +"VQQKFBNEZXV0c2NoZSBUZWxla29tIEFHMSgwDAYHAoIGAQoHFBMBMTAYBgNVBAMU"
-            +"EVNpZ0cgVGVzdCBDQSA0OlBOMH4CBC+uP98XDTAzMDIxNzA2MzMyNVowZzBlBgNV"
-            +"HR0BAf8EWzBZpFcwVTELMAkGA1UEBhMCREUxHDAaBgNVBAoUE0RldXRzY2hlIFRl"
-            +"bGVrb20gQUcxKDAMBgcCggYBCgcUEwExMBgGA1UEAxQRU2lnRyBUZXN0IENBIDQ6"
-            +"UE4wfgIEL64/0xcNMDMwMjE3MDYzMzI1WjBnMGUGA1UdHQEB/wRbMFmkVzBVMQsw"
-            +"CQYDVQQGEwJERTEcMBoGA1UEChQTRGV1dHNjaGUgVGVsZWtvbSBBRzEoMAwGBwKC"
-            +"BgEKBxQTATEwGAYDVQQDFBFTaWdHIFRlc3QgQ0EgNDpQTjB+AgQvrj/dFw0wMzAx"
-            +"MTMxMTI4MTRaMGcwZQYDVR0dAQH/BFswWaRXMFUxCzAJBgNVBAYTAkRFMRwwGgYD"
-            +"VQQKFBNEZXV0c2NoZSBUZWxla29tIEFHMSgwDAYHAoIGAQoHFBMBMTAYBgNVBAMU"
-            +"EVNpZ0cgVGVzdCBDQSA0OlBOMH4CBC+uP9cXDTAzMDExMzExMjcwN1owZzBlBgNV"
-            +"HR0BAf8EWzBZpFcwVTELMAkGA1UEBhMCREUxHDAaBgNVBAoUE0RldXRzY2hlIFRl"
-            +"bGVrb20gQUcxKDAMBgcCggYBCgcUEwExMBgGA1UEAxQRU2lnRyBUZXN0IENBIDQ6"
-            +"UE4wfgIEL64/2BcNMDMwMTEzMTEyNzA3WjBnMGUGA1UdHQEB/wRbMFmkVzBVMQsw"
-            +"CQYDVQQGEwJERTEcMBoGA1UEChQTRGV1dHNjaGUgVGVsZWtvbSBBRzEoMAwGBwKC"
-            +"BgEKBxQTATEwGAYDVQQDFBFTaWdHIFRlc3QgQ0EgNDpQTjB+AgQvrj/VFw0wMzA0"
-            +"MzAxMjI3NTNaMGcwZQYDVR0dAQH/BFswWaRXMFUxCzAJBgNVBAYTAkRFMRwwGgYD"
-            +"VQQKFBNEZXV0c2NoZSBUZWxla29tIEFHMSgwDAYHAoIGAQoHFBMBMTAYBgNVBAMU"
-            +"EVNpZ0cgVGVzdCBDQSA0OlBOMH4CBC+uP9YXDTAzMDQzMDEyMjc1M1owZzBlBgNV"
-            +"HR0BAf8EWzBZpFcwVTELMAkGA1UEBhMCREUxHDAaBgNVBAoUE0RldXRzY2hlIFRl"
-            +"bGVrb20gQUcxKDAMBgcCggYBCgcUEwExMBgGA1UEAxQRU2lnRyBUZXN0IENBIDQ6"
-            +"UE4wfgIEL64/xhcNMDMwMjEyMTM0NTQwWjBnMGUGA1UdHQEB/wRbMFmkVzBVMQsw"
-            +"CQYDVQQGEwJERTEcMBoGA1UEChQTRGV1dHNjaGUgVGVsZWtvbSBBRzEoMAwGBwKC"
-            +"BgEKBxQTATEwGAYDVQQDFBFUVEMgVGVzdCBDQSAxMTpQTjCBkAIEL64/xRcNMDMw"
-            +"MjEyMTM0NTQwWjB5MHcGA1UdHQEB/wRtMGukaTBnMQswCQYDVQQGEwJERTEcMBoG"
-            +"A1UEChQTRGV1dHNjaGUgVGVsZWtvbSBBRzEQMA4GA1UECxQHVGVsZVNlYzEoMAwG"
-            +"BwKCBgEKBxQTATEwGAYDVQQDFBFTaWdHIFRlc3QgQ0EgNTpQTjB+AgQvrj/CFw0w"
-            +"MzAyMTIxMzA5MTZaMGcwZQYDVR0dAQH/BFswWaRXMFUxCzAJBgNVBAYTAkRFMRww"
-            +"GgYDVQQKFBNEZXV0c2NoZSBUZWxla29tIEFHMSgwDAYHAoIGAQoHFBMBMTAYBgNV"
-            +"BAMUEVRUQyBUZXN0IENBIDExOlBOMIGQAgQvrj/BFw0wMzAyMTIxMzA4NDBaMHkw"
-            +"dwYDVR0dAQH/BG0wa6RpMGcxCzAJBgNVBAYTAkRFMRwwGgYDVQQKFBNEZXV0c2No"
-            +"ZSBUZWxla29tIEFHMRAwDgYDVQQLFAdUZWxlU2VjMSgwDAYHAoIGAQoHFBMBMTAY"
-            +"BgNVBAMUEVNpZ0cgVGVzdCBDQSA1OlBOMH4CBC+uP74XDTAzMDIxNzA2MzcyNVow"
-            +"ZzBlBgNVHR0BAf8EWzBZpFcwVTELMAkGA1UEBhMCREUxHDAaBgNVBAoUE0RldXRz"
-            +"Y2hlIFRlbGVrb20gQUcxKDAMBgcCggYBCgcUEwExMBgGA1UEAxQRVFRDIFRlc3Qg"
-            +"Q0EgMTE6UE4wgZACBC+uP70XDTAzMDIxNzA2MzcyNVoweTB3BgNVHR0BAf8EbTBr"
-            +"pGkwZzELMAkGA1UEBhMCREUxHDAaBgNVBAoUE0RldXRzY2hlIFRlbGVrb20gQUcx"
-            +"EDAOBgNVBAsUB1RlbGVTZWMxKDAMBgcCggYBCgcUEwExMBgGA1UEAxQRU2lnRyBU"
-            +"ZXN0IENBIDU6UE4wgZACBC+uP7AXDTAzMDIxMjEzMDg1OVoweTB3BgNVHR0BAf8E"
-            +"bTBrpGkwZzELMAkGA1UEBhMCREUxHDAaBgNVBAoUE0RldXRzY2hlIFRlbGVrb20g"
-            +"QUcxEDAOBgNVBAsUB1RlbGVTZWMxKDAMBgcCggYBCgcUEwExMBgGA1UEAxQRU2ln"
-            +"RyBUZXN0IENBIDU6UE4wgZACBC+uP68XDTAzMDIxNzA2MzcyNVoweTB3BgNVHR0B"
-            +"Af8EbTBrpGkwZzELMAkGA1UEBhMCREUxHDAaBgNVBAoUE0RldXRzY2hlIFRlbGVr"
-            +"b20gQUcxEDAOBgNVBAsUB1RlbGVTZWMxKDAMBgcCggYBCgcUEwExMBgGA1UEAxQR"
-            +"U2lnRyBUZXN0IENBIDU6UE4wfgIEL64/kxcNMDMwNDEwMDUyNjI4WjBnMGUGA1Ud"
-            +"HQEB/wRbMFmkVzBVMQswCQYDVQQGEwJERTEcMBoGA1UEChQTRGV1dHNjaGUgVGVs"
-            +"ZWtvbSBBRzEoMAwGBwKCBgEKBxQTATEwGAYDVQQDFBFUVEMgVGVzdCBDQSAxMTpQ"
-            +"TjCBkAIEL64/khcNMDMwNDEwMDUyNjI4WjB5MHcGA1UdHQEB/wRtMGukaTBnMQsw"
-            +"CQYDVQQGEwJERTEcMBoGA1UEChQTRGV1dHNjaGUgVGVsZWtvbSBBRzEQMA4GA1UE"
-            +"CxQHVGVsZVNlYzEoMAwGBwKCBgEKBxQTATEwGAYDVQQDFBFTaWdHIFRlc3QgQ0Eg"
-            +"NTpQTjB+AgQvrj8/Fw0wMzAyMjYxMTA0NDRaMGcwZQYDVR0dAQH/BFswWaRXMFUx"
-            +"CzAJBgNVBAYTAkRFMRwwGgYDVQQKFBNEZXV0c2NoZSBUZWxla29tIEFHMSgwDAYH"
-            +"AoIGAQoHFBMBMTAYBgNVBAMUEVRUQyBUZXN0IENBIDExOlBOMIGQAgQvrj8+Fw0w"
-            +"MzAyMjYxMTA0NDRaMHkwdwYDVR0dAQH/BG0wa6RpMGcxCzAJBgNVBAYTAkRFMRww"
-            +"GgYDVQQKFBNEZXV0c2NoZSBUZWxla29tIEFHMRAwDgYDVQQLFAdUZWxlU2VjMSgw"
-            +"DAYHAoIGAQoHFBMBMTAYBgNVBAMUEVNpZ0cgVGVzdCBDQSA1OlBOMH4CBC+uPs0X"
-            +"DTAzMDUyMDA1MjczNlowZzBlBgNVHR0BAf8EWzBZpFcwVTELMAkGA1UEBhMCREUx"
-            +"HDAaBgNVBAoUE0RldXRzY2hlIFRlbGVrb20gQUcxKDAMBgcCggYBCgcUEwExMBgG"
-            +"A1UEAxQRVFRDIFRlc3QgQ0EgMTE6UE4wgZACBC+uPswXDTAzMDUyMDA1MjczNlow"
-            +"eTB3BgNVHR0BAf8EbTBrpGkwZzELMAkGA1UEBhMCREUxHDAaBgNVBAoUE0RldXRz"
-            +"Y2hlIFRlbGVrb20gQUcxEDAOBgNVBAsUB1RlbGVTZWMxKDAMBgcCggYBCgcUEwEx"
-            +"MBgGA1UEAxQRU2lnRyBUZXN0IENBIDY6UE4wfgIEL64+PBcNMDMwNjE3MTAzNDE2"
-            +"WjBnMGUGA1UdHQEB/wRbMFmkVzBVMQswCQYDVQQGEwJERTEcMBoGA1UEChQTRGV1"
-            +"dHNjaGUgVGVsZWtvbSBBRzEoMAwGBwKCBgEKBxQTATEwGAYDVQQDFBFUVEMgVGVz"
-            +"dCBDQSAxMTpQTjCBkAIEL64+OxcNMDMwNjE3MTAzNDE2WjB5MHcGA1UdHQEB/wRt"
-            +"MGukaTBnMQswCQYDVQQGEwJERTEcMBoGA1UEChQTRGV1dHNjaGUgVGVsZWtvbSBB"
-            +"RzEQMA4GA1UECxQHVGVsZVNlYzEoMAwGBwKCBgEKBxQTATEwGAYDVQQDFBFTaWdH"
-            +"IFRlc3QgQ0EgNjpQTjCBkAIEL64+OhcNMDMwNjE3MTAzNDE2WjB5MHcGA1UdHQEB"
-            +"/wRtMGukaTBnMQswCQYDVQQGEwJERTEcMBoGA1UEChQTRGV1dHNjaGUgVGVsZWtv"
-            +"bSBBRzEQMA4GA1UECxQHVGVsZVNlYzEoMAwGBwKCBgEKBxQTATEwGAYDVQQDFBFT"
-            +"aWdHIFRlc3QgQ0EgNjpQTjB+AgQvrj45Fw0wMzA2MTcxMzAxMDBaMGcwZQYDVR0d"
-            +"AQH/BFswWaRXMFUxCzAJBgNVBAYTAkRFMRwwGgYDVQQKFBNEZXV0c2NoZSBUZWxl"
-            +"a29tIEFHMSgwDAYHAoIGAQoHFBMBMTAYBgNVBAMUEVRUQyBUZXN0IENBIDExOlBO"
-            +"MIGQAgQvrj44Fw0wMzA2MTcxMzAxMDBaMHkwdwYDVR0dAQH/BG0wa6RpMGcxCzAJ"
-            +"BgNVBAYTAkRFMRwwGgYDVQQKFBNEZXV0c2NoZSBUZWxla29tIEFHMRAwDgYDVQQL"
-            +"FAdUZWxlU2VjMSgwDAYHAoIGAQoHFBMBMTAYBgNVBAMUEVNpZ0cgVGVzdCBDQSA2"
-            +"OlBOMIGQAgQvrj43Fw0wMzA2MTcxMzAxMDBaMHkwdwYDVR0dAQH/BG0wa6RpMGcx"
-            +"CzAJBgNVBAYTAkRFMRwwGgYDVQQKFBNEZXV0c2NoZSBUZWxla29tIEFHMRAwDgYD"
-            +"VQQLFAdUZWxlU2VjMSgwDAYHAoIGAQoHFBMBMTAYBgNVBAMUEVNpZ0cgVGVzdCBD"
-            +"QSA2OlBOMIGQAgQvrj42Fw0wMzA2MTcxMzAxMDBaMHkwdwYDVR0dAQH/BG0wa6Rp"
-            +"MGcxCzAJBgNVBAYTAkRFMRwwGgYDVQQKFBNEZXV0c2NoZSBUZWxla29tIEFHMRAw"
-            +"DgYDVQQLFAdUZWxlU2VjMSgwDAYHAoIGAQoHFBMBMTAYBgNVBAMUEVNpZ0cgVGVz"
-            +"dCBDQSA2OlBOMIGQAgQvrj4zFw0wMzA2MTcxMDM3NDlaMHkwdwYDVR0dAQH/BG0w"
-            +"a6RpMGcxCzAJBgNVBAYTAkRFMRwwGgYDVQQKFBNEZXV0c2NoZSBUZWxla29tIEFH"
-            +"MRAwDgYDVQQLFAdUZWxlU2VjMSgwDAYHAoIGAQoHFBMBMTAYBgNVBAMUEVNpZ0cg"
-            +"VGVzdCBDQSA2OlBOMH4CBC+uPjEXDTAzMDYxNzEwNDI1OFowZzBlBgNVHR0BAf8E"
-            +"WzBZpFcwVTELMAkGA1UEBhMCREUxHDAaBgNVBAoUE0RldXRzY2hlIFRlbGVrb20g"
-            +"QUcxKDAMBgcCggYBCgcUEwExMBgGA1UEAxQRVFRDIFRlc3QgQ0EgMTE6UE4wgZAC"
-            +"BC+uPjAXDTAzMDYxNzEwNDI1OFoweTB3BgNVHR0BAf8EbTBrpGkwZzELMAkGA1UE"
-            +"BhMCREUxHDAaBgNVBAoUE0RldXRzY2hlIFRlbGVrb20gQUcxEDAOBgNVBAsUB1Rl"
-            +"bGVTZWMxKDAMBgcCggYBCgcUEwExMBgGA1UEAxQRU2lnRyBUZXN0IENBIDY6UE4w"
-            +"gZACBC+uPakXDTAzMTAyMjExMzIyNFoweTB3BgNVHR0BAf8EbTBrpGkwZzELMAkG"
-            +"A1UEBhMCREUxHDAaBgNVBAoUE0RldXRzY2hlIFRlbGVrb20gQUcxEDAOBgNVBAsU"
-            +"B1RlbGVTZWMxKDAMBgcCggYBCgcUEwExMBgGA1UEAxQRU2lnRyBUZXN0IENBIDY6"
-            +"UE4wgZACBC+uPLIXDTA1MDMxMTA2NDQyNFoweTB3BgNVHR0BAf8EbTBrpGkwZzEL"
-            +"MAkGA1UEBhMCREUxHDAaBgNVBAoUE0RldXRzY2hlIFRlbGVrb20gQUcxEDAOBgNV"
-            +"BAsUB1RlbGVTZWMxKDAMBgcCggYBCgcUEwExMBgGA1UEAxQRU2lnRyBUZXN0IENB"
-            +"IDY6UE4wgZACBC+uPKsXDTA0MDQwMjA3NTQ1M1oweTB3BgNVHR0BAf8EbTBrpGkw"
-            +"ZzELMAkGA1UEBhMCREUxHDAaBgNVBAoUE0RldXRzY2hlIFRlbGVrb20gQUcxEDAO"
-            +"BgNVBAsUB1RlbGVTZWMxKDAMBgcCggYBCgcUEwExMBgGA1UEAxQRU2lnRyBUZXN0"
-            +"IENBIDY6UE4wgZACBC+uOugXDTA1MDEyNzEyMDMyNFoweTB3BgNVHR0BAf8EbTBr"
-            +"pGkwZzELMAkGA1UEBhMCREUxHDAaBgNVBAoUE0RldXRzY2hlIFRlbGVrb20gQUcx"
-            +"EDAOBgNVBAsUB1RlbGVTZWMxKDAMBgcCggYBCgcUEwExMBgGA1UEAxQRU2lnRyBU"
-            +"ZXN0IENBIDY6UE4wgZACBC+uOr4XDTA1MDIxNjA3NTcxNloweTB3BgNVHR0BAf8E"
-            +"bTBrpGkwZzELMAkGA1UEBhMCREUxHDAaBgNVBAoUE0RldXRzY2hlIFRlbGVrb20g"
-            +"QUcxEDAOBgNVBAsUB1RlbGVTZWMxKDAMBgcCggYBCgcUEwExMBgGA1UEAxQRU2ln"
-            +"RyBUZXN0IENBIDY6UE4wgZACBC+uOqcXDTA1MDMxMDA1NTkzNVoweTB3BgNVHR0B"
-            +"Af8EbTBrpGkwZzELMAkGA1UEBhMCREUxHDAaBgNVBAoUE0RldXRzY2hlIFRlbGVr"
-            +"b20gQUcxEDAOBgNVBAsUB1RlbGVTZWMxKDAMBgcCggYBCgcUEwExMBgGA1UEAxQR"
-            +"U2lnRyBUZXN0IENBIDY6UE4wgZACBC+uOjwXDTA1MDUxMTEwNDk0NloweTB3BgNV"
-            +"HR0BAf8EbTBrpGkwZzELMAkGA1UEBhMCREUxHDAaBgNVBAoUE0RldXRzY2hlIFRl"
-            +"bGVrb20gQUcxEDAOBgNVBAsUB1RlbGVTZWMxKDAMBgcCggYBCgcUEwExMBgGA1UE"
-            +"AxQRU2lnRyBUZXN0IENBIDY6UE4wgaoCBC+sbdUXDTA1MTExMTEwMDMyMVowgZIw"
-            +"gY8GA1UdHQEB/wSBhDCBgaR/MH0xCzAJBgNVBAYTAkRFMRwwGgYDVQQKFBNEZXV0"
-            +"c2NoZSBUZWxla29tIEFHMR8wHQYDVQQLFBZQcm9kdWt0emVudHJ1bSBUZWxlU2Vj"
-            +"MS8wDAYHAoIGAQoHFBMBMTAfBgNVBAMUGFRlbGVTZWMgUEtTIFNpZ0cgQ0EgMTpQ"
-            +"TjCBlQIEL64uaBcNMDYwMTIzMTAyNTU1WjB+MHwGA1UdHQEB/wRyMHCkbjBsMQsw"
-            +"CQYDVQQGEwJERTEcMBoGA1UEChQTRGV1dHNjaGUgVGVsZWtvbSBBRzEWMBQGA1UE"
-            +"CxQNWmVudHJhbGUgQm9ubjEnMAwGBwKCBgEKBxQTATEwFwYDVQQDFBBUVEMgVGVz"
-            +"dCBDQSA5OlBOMIGVAgQvribHFw0wNjA4MDEwOTQ4NDRaMH4wfAYDVR0dAQH/BHIw"
-            +"cKRuMGwxCzAJBgNVBAYTAkRFMRwwGgYDVQQKFBNEZXV0c2NoZSBUZWxla29tIEFH"
-            +"MRYwFAYDVQQLFA1aZW50cmFsZSBCb25uMScwDAYHAoIGAQoHFBMBMTAXBgNVBAMU"
-            +"EFRUQyBUZXN0IENBIDk6UE6ggZswgZgwCwYDVR0UBAQCAhEMMB8GA1UdIwQYMBaA"
-            +"FANbyNumDI9545HwlCF26NuOJC45MA8GA1UdHAEB/wQFMAOEAf8wVwYDVR0SBFAw"
-            +"ToZMbGRhcDovL3Brc2xkYXAudHR0Yy5kZS9vdT1ULVRlbGVTZWMgVGVzdCBESVIg"
-            +"ODpQTixvPURldXRzY2hlIFRlbGVrb20gQUcsYz1kZTANBgkqhkiG9w0BAQUFAAOB"
-            +"gQBewL5gLFHpeOWO07Vk3Gg7pRDuAlvaovBH4coCyCWpk5jEhUfFSYEDuaQB7do4"
-            +"IlJmeTHvkI0PIZWJ7bwQ2PVdipPWDx0NVwS/Cz5jUKiS3BbAmZQZOueiKLFpQq3A"
-            +"b8aOHA7WHU4078/1lM+bgeu33Ln1CGykEbmSjA/oKPi/JA==");
-    
-    byte[] directCRL = Base64.decode(
-            "MIIGXTCCBckCAQEwCgYGKyQDAwECBQAwdDELMAkGA1UEBhMCREUxHDAaBgNVBAoU"
-            +"E0RldXRzY2hlIFRlbGVrb20gQUcxFzAVBgNVBAsUDlQtVGVsZVNlYyBUZXN0MS4w"
-            +"DAYHAoIGAQoHFBMBMTAeBgNVBAMUF1QtVGVsZVNlYyBUZXN0IERJUiA4OlBOFw0w"
-            +"NjA4MDQwODQ1MTRaFw0wNjA4MDQxNDQ1MTRaMIIElTAVAgQvrj/pFw0wMzA3MjIw"
-            +"NTQxMjhaMBUCBC+uP+oXDTAzMDcyMjA1NDEyOFowFQIEL64/5xcNMDQwNDA1MTMx"
-            +"ODE3WjAVAgQvrj/oFw0wNDA0MDUxMzE4MTdaMBUCBC+uP+UXDTAzMDExMzExMTgx"
-            +"MVowFQIEL64/5hcNMDMwMTEzMTExODExWjAVAgQvrj/jFw0wMzAxMTMxMTI2NTZa"
-            +"MBUCBC+uP+QXDTAzMDExMzExMjY1NlowFQIEL64/4hcNMDQwNzEzMDc1ODM4WjAV"
-            +"AgQvrj/eFw0wMzAyMTcwNjMzMjVaMBUCBC+uP98XDTAzMDIxNzA2MzMyNVowFQIE"
-            +"L64/0xcNMDMwMjE3MDYzMzI1WjAVAgQvrj/dFw0wMzAxMTMxMTI4MTRaMBUCBC+u"
-            +"P9cXDTAzMDExMzExMjcwN1owFQIEL64/2BcNMDMwMTEzMTEyNzA3WjAVAgQvrj/V"
-            +"Fw0wMzA0MzAxMjI3NTNaMBUCBC+uP9YXDTAzMDQzMDEyMjc1M1owFQIEL64/xhcN"
-            +"MDMwMjEyMTM0NTQwWjAVAgQvrj/FFw0wMzAyMTIxMzQ1NDBaMBUCBC+uP8IXDTAz"
-            +"MDIxMjEzMDkxNlowFQIEL64/wRcNMDMwMjEyMTMwODQwWjAVAgQvrj++Fw0wMzAy"
-            +"MTcwNjM3MjVaMBUCBC+uP70XDTAzMDIxNzA2MzcyNVowFQIEL64/sBcNMDMwMjEy"
-            +"MTMwODU5WjAVAgQvrj+vFw0wMzAyMTcwNjM3MjVaMBUCBC+uP5MXDTAzMDQxMDA1"
-            +"MjYyOFowFQIEL64/khcNMDMwNDEwMDUyNjI4WjAVAgQvrj8/Fw0wMzAyMjYxMTA0"
-            +"NDRaMBUCBC+uPz4XDTAzMDIyNjExMDQ0NFowFQIEL64+zRcNMDMwNTIwMDUyNzM2"
-            +"WjAVAgQvrj7MFw0wMzA1MjAwNTI3MzZaMBUCBC+uPjwXDTAzMDYxNzEwMzQxNlow"
-            +"FQIEL64+OxcNMDMwNjE3MTAzNDE2WjAVAgQvrj46Fw0wMzA2MTcxMDM0MTZaMBUC"
-            +"BC+uPjkXDTAzMDYxNzEzMDEwMFowFQIEL64+OBcNMDMwNjE3MTMwMTAwWjAVAgQv"
-            +"rj43Fw0wMzA2MTcxMzAxMDBaMBUCBC+uPjYXDTAzMDYxNzEzMDEwMFowFQIEL64+"
-            +"MxcNMDMwNjE3MTAzNzQ5WjAVAgQvrj4xFw0wMzA2MTcxMDQyNThaMBUCBC+uPjAX"
-            +"DTAzMDYxNzEwNDI1OFowFQIEL649qRcNMDMxMDIyMTEzMjI0WjAVAgQvrjyyFw0w"
-            +"NTAzMTEwNjQ0MjRaMBUCBC+uPKsXDTA0MDQwMjA3NTQ1M1owFQIEL6466BcNMDUw"
-            +"MTI3MTIwMzI0WjAVAgQvrjq+Fw0wNTAyMTYwNzU3MTZaMBUCBC+uOqcXDTA1MDMx"
-            +"MDA1NTkzNVowFQIEL646PBcNMDUwNTExMTA0OTQ2WjAVAgQvrG3VFw0wNTExMTEx"
-            +"MDAzMjFaMBUCBC+uLmgXDTA2MDEyMzEwMjU1NVowFQIEL64mxxcNMDYwODAxMDk0"
-            +"ODQ0WqCBijCBhzALBgNVHRQEBAICEQwwHwYDVR0jBBgwFoAUA1vI26YMj3njkfCU"
-            +"IXbo244kLjkwVwYDVR0SBFAwToZMbGRhcDovL3Brc2xkYXAudHR0Yy5kZS9vdT1U"
-            +"LVRlbGVTZWMgVGVzdCBESVIgODpQTixvPURldXRzY2hlIFRlbGVrb20gQUcsYz1k"
-            +"ZTAKBgYrJAMDAQIFAAOBgQArj4eMlbAwuA2aS5O4UUUHQMKKdK/dtZi60+LJMiMY"
-            +"ojrMIf4+ZCkgm1Ca0Cd5T15MJxVHhh167Ehn/Hd48pdnAP6Dfz/6LeqkIHGWMHR+"
-            +"z6TXpwWB+P4BdUec1ztz04LypsznrHcLRa91ixg9TZCb1MrOG+InNhleRs1ImXk8"
-            +"MQ==");
-
-    private final byte[] pkcs7CrlProblem = Base64.decode(
-              "MIIwSAYJKoZIhvcNAQcCoIIwOTCCMDUCAQExCzAJBgUrDgMCGgUAMAsGCSqG"
-            + "SIb3DQEHAaCCEsAwggP4MIIC4KADAgECAgF1MA0GCSqGSIb3DQEBBQUAMEUx"
-            + "CzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMR4wHAYDVQQD"
-            + "ExVHZW9UcnVzdCBDQSBmb3IgQWRvYmUwHhcNMDQxMjAyMjEyNTM5WhcNMDYx"
-            + "MjMwMjEyNTM5WjBMMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMR2VvVHJ1c3Qg"
-            + "SW5jMSYwJAYDVQQDEx1HZW9UcnVzdCBBZG9iZSBPQ1NQIFJlc3BvbmRlcjCB"
-            + "nzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA4gnNYhtw7U6QeVXZODnGhHMj"
-            + "+OgZ0DB393rEk6a2q9kq129IA2e03yKBTfJfQR9aWKc2Qj90dsSqPjvTDHFG"
-            + "Qsagm2FQuhnA3fb1UWhPzeEIdm6bxDsnQ8nWqKqxnWZzELZbdp3I9bBLizIq"
-            + "obZovzt60LNMghn/unvvuhpeVSsCAwEAAaOCAW4wggFqMA4GA1UdDwEB/wQE"
-            + "AwIE8DCB5QYDVR0gAQH/BIHaMIHXMIHUBgkqhkiG9y8BAgEwgcYwgZAGCCsG"
-            + "AQUFBwICMIGDGoGAVGhpcyBjZXJ0aWZpY2F0ZSBoYXMgYmVlbiBpc3N1ZWQg"
-            + "aW4gYWNjb3JkYW5jZSB3aXRoIHRoZSBBY3JvYmF0IENyZWRlbnRpYWxzIENQ"
-            + "UyBsb2NhdGVkIGF0IGh0dHA6Ly93d3cuZ2VvdHJ1c3QuY29tL3Jlc291cmNl"
-            + "cy9jcHMwMQYIKwYBBQUHAgEWJWh0dHA6Ly93d3cuZ2VvdHJ1c3QuY29tL3Jl"
-            + "c291cmNlcy9jcHMwEwYDVR0lBAwwCgYIKwYBBQUHAwkwOgYDVR0fBDMwMTAv"
-            + "oC2gK4YpaHR0cDovL2NybC5nZW90cnVzdC5jb20vY3Jscy9hZG9iZWNhMS5j"
-            + "cmwwHwYDVR0jBBgwFoAUq4BZw2WDbR19E70Zw+wajw1HaqMwDQYJKoZIhvcN"
-            + "AQEFBQADggEBAENJf1BD7PX5ivuaawt90q1OGzXpIQL/ClzEeFVmOIxqPc1E"
-            + "TFRq92YuxG5b6+R+k+tGkmCwPLcY8ipg6ZcbJ/AirQhohzjlFuT6YAXsTfEj"
-            + "CqEZfWM2sS7crK2EYxCMmKE3xDfPclYtrAoz7qZvxfQj0TuxHSstHZv39wu2"
-            + "ZiG1BWiEcyDQyTgqTOXBoZmfJtshuAcXmTpgkrYSrS37zNlPTGh+pMYQ0yWD"
-            + "c8OQRJR4OY5ZXfdna01mjtJTOmj6/6XPoLPYTq2gQrc2BCeNJ4bEhLb7sFVB"
-            + "PbwPrpzTE/HRbQHDrzj0YimDxeOUV/UXctgvYwHNtEkcBLsOm/uytMYwggSh"
-            + "MIIDiaADAgECAgQ+HL0oMA0GCSqGSIb3DQEBBQUAMGkxCzAJBgNVBAYTAlVT"
-            + "MSMwIQYDVQQKExpBZG9iZSBTeXN0ZW1zIEluY29ycG9yYXRlZDEdMBsGA1UE"
-            + "CxMUQWRvYmUgVHJ1c3QgU2VydmljZXMxFjAUBgNVBAMTDUFkb2JlIFJvb3Qg"
-            + "Q0EwHhcNMDMwMTA4MjMzNzIzWhcNMjMwMTA5MDAwNzIzWjBpMQswCQYDVQQG"
-            + "EwJVUzEjMCEGA1UEChMaQWRvYmUgU3lzdGVtcyBJbmNvcnBvcmF0ZWQxHTAb"
-            + "BgNVBAsTFEFkb2JlIFRydXN0IFNlcnZpY2VzMRYwFAYDVQQDEw1BZG9iZSBS"
-            + "b290IENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzE9UhPen"
-            + "ouczU38/nBKIayyZR2d+Dx65rRSI+cMQ2B3w8NWfaQovWTWwzGypTJwVoJ/O"
-            + "IL+gz1Ti4CBmRT85hjh+nMSOByLGJPYBErA131XqaZCw24U3HuJOB7JCoWoT"
-            + "aaBm6oCREVkqmwh5WiBELcm9cziLPC/gQxtdswvwrzUaKf7vppLdgUydPVmO"
-            + "rTE8QH6bkTYG/OJcjdGNJtVcRc+vZT+xqtJilvSoOOq6YEL09BxKNRXO+E4i"
-            + "Vg+VGMX4lp+f+7C3eCXpgGu91grwxnSUnfMPUNuad85LcIMjjaDKeCBEXDxU"
-            + "ZPHqojAZn+pMBk0GeEtekt8i0slns3rSAQIDAQABo4IBTzCCAUswEQYJYIZI"
-            + "AYb4QgEBBAQDAgAHMIGOBgNVHR8EgYYwgYMwgYCgfqB8pHoweDELMAkGA1UE"
-            + "BhMCVVMxIzAhBgNVBAoTGkFkb2JlIFN5c3RlbXMgSW5jb3Jwb3JhdGVkMR0w"
-            + "GwYDVQQLExRBZG9iZSBUcnVzdCBTZXJ2aWNlczEWMBQGA1UEAxMNQWRvYmUg"
-            + "Um9vdCBDQTENMAsGA1UEAxMEQ1JMMTArBgNVHRAEJDAigA8yMDAzMDEwODIz"
-            + "MzcyM1qBDzIwMjMwMTA5MDAwNzIzWjALBgNVHQ8EBAMCAQYwHwYDVR0jBBgw"
-            + "FoAUgrc4SpOqmxDvgLvZVOLxD/uAnN4wHQYDVR0OBBYEFIK3OEqTqpsQ74C7"
-            + "2VTi8Q/7gJzeMAwGA1UdEwQFMAMBAf8wHQYJKoZIhvZ9B0EABBAwDhsIVjYu"
-            + "MDo0LjADAgSQMA0GCSqGSIb3DQEBBQUAA4IBAQAy2p9DdcH6b8lv26sdNjc+"
-            + "vGEZNrcCPB0jWZhsnu5NhedUyCAfp9S74r8Ad30ka3AvXME6dkm10+AjhCpx"
-            + "aiLzwScpmBX2NZDkBEzDjbyfYRzn/SSM0URDjBa6m02l1DUvvBHOvfdRN42f"
-            + "kOQU8Rg/vulZEjX5M5LznuDVa5pxm5lLyHHD4bFhCcTl+pHwQjo3fTT5cujN"
-            + "qmIcIenV9IIQ43sFti1oVgt+fpIsb01yggztVnSynbmrLSsdEF/bJ3Vwj/0d"
-            + "1+ICoHnlHOX/r2RAUS2em0fbQqV8H8KmSLDXvpJpTaT2KVfFeBEY3IdRyhOy"
-            + "Yp1PKzK9MaXB+lKrBYjIMIIEyzCCA7OgAwIBAgIEPhy9tTANBgkqhkiG9w0B"
-            + "AQUFADBpMQswCQYDVQQGEwJVUzEjMCEGA1UEChMaQWRvYmUgU3lzdGVtcyBJ"
-            + "bmNvcnBvcmF0ZWQxHTAbBgNVBAsTFEFkb2JlIFRydXN0IFNlcnZpY2VzMRYw"
-            + "FAYDVQQDEw1BZG9iZSBSb290IENBMB4XDTA0MDExNzAwMDMzOVoXDTE1MDEx"
-            + "NTA4MDAwMFowRTELMAkGA1UEBhMCVVMxFjAUBgNVBAoTDUdlb1RydXN0IElu"
-            + "Yy4xHjAcBgNVBAMTFUdlb1RydXN0IENBIGZvciBBZG9iZTCCASIwDQYJKoZI"
-            + "hvcNAQEBBQADggEPADCCAQoCggEBAKfld+BkeFrnOYW8r9L1WygTDlTdSfrO"
-            + "YvWS/Z6Ye5/l+HrBbOHqQCXBcSeCpz7kB2WdKMh1FOE4e9JlmICsHerBLdWk"
-            + "emU+/PDb69zh8E0cLoDfxukF6oVPXj6WSThdSG7H9aXFzRr6S3XGCuvgl+Qw"
-            + "DTLiLYW+ONF6DXwt3TQQtKReJjOJZk46ZZ0BvMStKyBaeB6DKZsmiIo89qso"
-            + "13VDZINH2w1KvXg0ygDizoNtbvgAPFymwnsINS1klfQlcvn0x0RJm9bYQXK3"
-            + "5GNZAgL3M7Lqrld0jMfIUaWvuHCLyivytRuzq1dJ7E8rmidjDEk/G+27pf13"
-            + "fNZ7vR7M+IkCAwEAAaOCAZ0wggGZMBIGA1UdEwEB/wQIMAYBAf8CAQEwUAYD"
-            + "VR0gBEkwRzBFBgkqhkiG9y8BAgEwODA2BggrBgEFBQcCARYqaHR0cHM6Ly93"
-            + "d3cuYWRvYmUuY29tL21pc2MvcGtpL2Nkc19jcC5odG1sMBQGA1UdJQQNMAsG"
-            + "CSqGSIb3LwEBBTCBsgYDVR0fBIGqMIGnMCKgIKAehhxodHRwOi8vY3JsLmFk"
-            + "b2JlLmNvbS9jZHMuY3JsMIGAoH6gfKR6MHgxCzAJBgNVBAYTAlVTMSMwIQYD"
-            + "VQQKExpBZG9iZSBTeXN0ZW1zIEluY29ycG9yYXRlZDEdMBsGA1UECxMUQWRv"
-            + "YmUgVHJ1c3QgU2VydmljZXMxFjAUBgNVBAMTDUFkb2JlIFJvb3QgQ0ExDTAL"
-            + "BgNVBAMTBENSTDEwCwYDVR0PBAQDAgEGMB8GA1UdIwQYMBaAFIK3OEqTqpsQ"
-            + "74C72VTi8Q/7gJzeMB0GA1UdDgQWBBSrgFnDZYNtHX0TvRnD7BqPDUdqozAZ"
-            + "BgkqhkiG9n0HQQAEDDAKGwRWNi4wAwIEkDANBgkqhkiG9w0BAQUFAAOCAQEA"
-            + "PzlZLqIAjrFeEWEs0uC29YyJhkXOE9mf3YSaFGsITF+Gl1j0pajTjyH4R35Q"
-            + "r3floW2q3HfNzTeZ90Jnr1DhVERD6zEMgJpCtJqVuk0sixuXJHghS/KicKf4"
-            + "YXJJPx9epuIRF1siBRnznnF90svmOJMXApc0jGnYn3nQfk4kaShSnDaYaeYR"
-            + "DJKcsiWhl6S5zfwS7Gg8hDeyckhMQKKWnlG1CQrwlSFisKCduoodwRtWgft8"
-            + "kx13iyKK3sbalm6vnVc+5nufS4vI+TwMXoV63NqYaSroafBWk0nL53zGXPEy"
-            + "+A69QhzEViJKn2Wgqt5gt++jMMNImbRObIqgfgF1VjCCBUwwggQ0oAMCAQIC"
-            + "AgGDMA0GCSqGSIb3DQEBBQUAMEUxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1H"
-            + "ZW9UcnVzdCBJbmMuMR4wHAYDVQQDExVHZW9UcnVzdCBDQSBmb3IgQWRvYmUw"
-            + "HhcNMDYwMzI0MTU0MjI5WhcNMDkwNDA2MTQ0MjI5WjBzMQswCQYDVQQGEwJV"
-            + "UzELMAkGA1UECBMCTUExETAPBgNVBAoTCEdlb1RydXN0MR0wGwYDVQQDExRN"
-            + "YXJrZXRpbmcgRGVwYXJ0bWVudDElMCMGCSqGSIb3DQEJARYWbWFya2V0aW5n"
-            + "QGdlb3RydXN0LmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB"
-            + "ANmvajTO4XJvAU2nVcLmXeCnAQX7RZt+7+ML3InmqQ3LCGo1weop09zV069/"
-            + "1x/Nmieol7laEzeXxd2ghjGzwfXafqQEqHn6+vBCvqdNPoSi63fSWhnuDVWp"
-            + "KVDOYgxOonrXl+Cc43lu4zRSq+Pi5phhrjDWcH74a3/rdljUt4c4GFezFXfa"
-            + "w2oTzWkxj2cTSn0Szhpr17+p66UNt8uknlhmu4q44Speqql2HwmCEnpLYJrK"
-            + "W3fOq5D4qdsvsLR2EABLhrBezamLI3iGV8cRHOUTsbTMhWhv/lKfHAyf4XjA"
-            + "z9orzvPN5jthhIfICOFq/nStTgakyL4Ln+nFAB/SMPkCAwEAAaOCAhYwggIS"
-            + "MA4GA1UdDwEB/wQEAwIF4DCB5QYDVR0gAQH/BIHaMIHXMIHUBgkqhkiG9y8B"
-            + "AgEwgcYwgZAGCCsGAQUFBwICMIGDGoGAVGhpcyBjZXJ0aWZpY2F0ZSBoYXMg"
-            + "YmVlbiBpc3N1ZWQgaW4gYWNjb3JkYW5jZSB3aXRoIHRoZSBBY3JvYmF0IENy"
-            + "ZWRlbnRpYWxzIENQUyBsb2NhdGVkIGF0IGh0dHA6Ly93d3cuZ2VvdHJ1c3Qu"
-            + "Y29tL3Jlc291cmNlcy9jcHMwMQYIKwYBBQUHAgEWJWh0dHA6Ly93d3cuZ2Vv"
-            + "dHJ1c3QuY29tL3Jlc291cmNlcy9jcHMwOgYDVR0fBDMwMTAvoC2gK4YpaHR0"
-            + "cDovL2NybC5nZW90cnVzdC5jb20vY3Jscy9hZG9iZWNhMS5jcmwwHwYDVR0j"
-            + "BBgwFoAUq4BZw2WDbR19E70Zw+wajw1HaqMwRAYIKwYBBQUHAQEEODA2MDQG"
-            + "CCsGAQUFBzABhihodHRwOi8vYWRvYmUtb2NzcC5nZW90cnVzdC5jb20vcmVz"
-            + "cG9uZGVyMBQGA1UdJQQNMAsGCSqGSIb3LwEBBTA8BgoqhkiG9y8BAQkBBC4w"
-            + "LAIBAYYnaHR0cDovL2Fkb2JlLXRpbWVzdGFtcC5nZW90cnVzdC5jb20vdHNh"
-            + "MBMGCiqGSIb3LwEBCQIEBTADAgEBMAwGA1UdEwQFMAMCAQAwDQYJKoZIhvcN"
-            + "AQEFBQADggEBAAOhy6QxOo+i3h877fvDvTa0plGD2bIqK7wMdNqbMDoSWied"
-            + "FIcgcBOIm2wLxOjZBAVj/3lDq59q2rnVeNnfXM0/N0MHI9TumHRjU7WNk9e4"
-            + "+JfJ4M+c3anrWOG3NE5cICDVgles+UHjXetHWql/LlP04+K2ZOLb6LE2xGnI"
-            + "YyLW9REzCYNAVF+/WkYdmyceHtaBZdbyVAJq0NAJPsfgY1pWcBo31Mr1fpX9"
-            + "WrXNTYDCqMyxMImJTmN3iI68tkXlNrhweQoArKFqBysiBkXzG/sGKYY6tWKU"
-            + "pzjLc3vIp/LrXC5zilROes8BSvwu1w9qQrJNcGwo7O4uijoNtyYil1Exgh1Q"
-            + "MIIdTAIBATBLMEUxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJ"
-            + "bmMuMR4wHAYDVQQDExVHZW9UcnVzdCBDQSBmb3IgQWRvYmUCAgGDMAkGBSsO"
-            + "AwIaBQCgggxMMBgGCSqGSIb3DQEJAzELBgkqhkiG9w0BBwEwIwYJKoZIhvcN"
-            + "AQkEMRYEFP4R6qIdpQJzWyzrqO8X1ZfJOgChMIIMCQYJKoZIhvcvAQEIMYIL"
-            + "+jCCC/agggZ5MIIGdTCCA6gwggKQMA0GCSqGSIb3DQEBBQUAMEUxCzAJBgNV"
-            + "BAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMR4wHAYDVQQDExVHZW9U"
-            + "cnVzdCBDQSBmb3IgQWRvYmUXDTA2MDQwNDE3NDAxMFoXDTA2MDQwNTE3NDAx"
-            + "MFowggIYMBMCAgC5Fw0wNTEwMTEyMDM2MzJaMBICAVsXDTA0MTEwNDE1MDk0"
-            + "MVowEwICALgXDTA1MTIxMjIyMzgzOFowEgIBWhcNMDQxMTA0MTUwOTMzWjAT"
-            + "AgIA5hcNMDUwODI3MDQwOTM4WjATAgIAtxcNMDYwMTE2MTc1NTEzWjATAgIA"
-            + "hhcNMDUxMjEyMjIzODU1WjATAgIAtRcNMDUwNzA2MTgzODQwWjATAgIA4BcN"
-            + "MDYwMzIwMDc0ODM0WjATAgIAgRcNMDUwODAyMjIzMTE1WjATAgIA3xcNMDUx"
-            + "MjEyMjIzNjUwWjASAgFKFw0wNDExMDQxNTA5MTZaMBICAUQXDTA0MTEwNDE1"
-            + "MDg1M1owEgIBQxcNMDQxMDAzMDEwMDQwWjASAgFsFw0wNDEyMDYxOTQ0MzFa"
-            + "MBMCAgEoFw0wNjAzMDkxMjA3MTJaMBMCAgEkFw0wNjAxMTYxNzU1MzRaMBIC"
-            + "AWcXDTA1MDMxODE3NTYxNFowEwICAVEXDTA2MDEzMTExMjcxMVowEgIBZBcN"
-            + "MDQxMTExMjI0ODQxWjATAgIA8RcNMDUwOTE2MTg0ODAxWjATAgIBThcNMDYw"
-            + "MjIxMjAxMDM2WjATAgIAwRcNMDUxMjEyMjIzODE2WjASAgFiFw0wNTAxMTAx"
-            + "NjE5MzRaMBICAWAXDTA1MDExMDE5MDAwNFowEwICAL4XDTA1MDUxNzE0NTYx"
-            + "MFowDQYJKoZIhvcNAQEFBQADggEBAEKhRMS3wVho1U3EvEQJZC8+JlUngmZQ"
-            + "A78KQbHPWNZWFlNvPuf/b0s7Lu16GfNHXh1QAW6Y5Hi1YtYZ3YOPyMd4Xugt"
-            + "gCdumbB6xtKsDyN5RvTht6ByXj+CYlYqsL7RX0izJZ6mJn4fjMkqzPKNOjb8"
-            + "kSn5T6rn93BjlATtCE8tPVOM8dnqGccRE0OV59+nDBXc90UMt5LdEbwaUOap"
-            + "snVB0oLcNm8d/HnlVH6RY5LnDjrT4vwfe/FApZtTecEWsllVUXDjSpwfcfD/"
-            + "476/lpGySB2otALqzImlA9R8Ok3hJ8dnF6hhQ5Oe6OJMnGYgdhkKbxsKkdib"
-            + "tTVl3qmH5QAwggLFMIIBrQIBATANBgkqhkiG9w0BAQUFADBpMQswCQYDVQQG"
-            + "EwJVUzEjMCEGA1UEChMaQWRvYmUgU3lzdGVtcyBJbmNvcnBvcmF0ZWQxHTAb"
-            + "BgNVBAsTFEFkb2JlIFRydXN0IFNlcnZpY2VzMRYwFAYDVQQDEw1BZG9iZSBS"
-            + "b290IENBFw0wNjAxMjcxODMzMzFaFw0wNzAxMjcwMDAwMDBaMIHeMCMCBD4c"
-            + "vUAXDTAzMDEyMTIzNDY1NlowDDAKBgNVHRUEAwoBBDAjAgQ+HL1BFw0wMzAx"
-            + "MjEyMzQ3MjJaMAwwCgYDVR0VBAMKAQQwIwIEPhy9YhcNMDMwMTIxMjM0NzQy"
-            + "WjAMMAoGA1UdFQQDCgEEMCMCBD4cvWEXDTA0MDExNzAxMDg0OFowDDAKBgNV"
-            + "HRUEAwoBBDAjAgQ+HL2qFw0wNDAxMTcwMTA5MDVaMAwwCgYDVR0VBAMKAQQw"
-            + "IwIEPhy9qBcNMDQwMTE3MDEzOTI5WjAMMAoGA1UdFQQDCgEEoC8wLTAKBgNV"
-            + "HRQEAwIBDzAfBgNVHSMEGDAWgBSCtzhKk6qbEO+Au9lU4vEP+4Cc3jANBgkq"
-            + "hkiG9w0BAQUFAAOCAQEAwtXF9042wG39icUlsotn5tpE3oCusLb/hBpEONhx"
-            + "OdfEQOq0w5hf/vqaxkcf71etA+KpbEUeSVaHMHRPhx/CmPrO9odE139dJdbt"
-            + "9iqbrC9iZokFK3h/es5kg73xujLKd7C/u5ngJ4mwBtvhMLjFjF2vJhPKHL4C"
-            + "IgMwdaUAhrcNzy16v+mw/VGJy3Fvc6oCESW1K9tvFW58qZSNXrMlsuidgunM"
-            + "hPKG+z0SXVyCqL7pnqKiaGddcgujYGOSY4S938oVcfZeZQEODtSYGlzldojX"
-            + "C1U1hCK5+tHAH0Ox/WqRBIol5VCZQwJftf44oG8oviYq52aaqSejXwmfT6zb"
-            + "76GCBXUwggVxMIIFbQoBAKCCBWYwggViBgkrBgEFBQcwAQEEggVTMIIFTzCB"
-            + "taIWBBS+8EpykfXdl4h3z7m/NZfdkAQQERgPMjAwNjA0MDQyMDIwMTVaMGUw"
-            + "YzA7MAkGBSsOAwIaBQAEFEb4BuZYkbjBjOjT6VeA/00fBvQaBBT3fTSQniOp"
-            + "BbHBSkz4xridlX0bsAICAYOAABgPMjAwNjA0MDQyMDIwMTVaoBEYDzIwMDYw"
-            + "NDA1MDgyMDE1WqEjMCEwHwYJKwYBBQUHMAECBBIEEFqooq/R2WltD7TposkT"
-            + "BhMwDQYJKoZIhvcNAQEFBQADgYEAMig6lty4b0JDsT/oanfQG5x6jVKPACpp"
-            + "1UA9SJ0apJJa7LeIdDFmu5C2S/CYiKZm4A4P9cAu0YzgLHxE4r6Op+HfVlAG"
-            + "6bzUe1P/hi1KCJ8r8wxOZAktQFPSzs85RAZwkHMfB0lP2e/h666Oye+Zf8VH"
-            + "RaE+/xZ7aswE89HXoumgggQAMIID/DCCA/gwggLgoAMCAQICAXUwDQYJKoZI"
-            + "hvcNAQEFBQAwRTELMAkGA1UEBhMCVVMxFjAUBgNVBAoTDUdlb1RydXN0IElu"
-            + "Yy4xHjAcBgNVBAMTFUdlb1RydXN0IENBIGZvciBBZG9iZTAeFw0wNDEyMDIy"
-            + "MTI1MzlaFw0wNjEyMzAyMTI1MzlaMEwxCzAJBgNVBAYTAlVTMRUwEwYDVQQK"
-            + "EwxHZW9UcnVzdCBJbmMxJjAkBgNVBAMTHUdlb1RydXN0IEFkb2JlIE9DU1Ag"
-            + "UmVzcG9uZGVyMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDiCc1iG3Dt"
-            + "TpB5Vdk4OcaEcyP46BnQMHf3esSTprar2SrXb0gDZ7TfIoFN8l9BH1pYpzZC"
-            + "P3R2xKo+O9MMcUZCxqCbYVC6GcDd9vVRaE/N4Qh2bpvEOydDydaoqrGdZnMQ"
-            + "tlt2ncj1sEuLMiqhtmi/O3rQs0yCGf+6e++6Gl5VKwIDAQABo4IBbjCCAWow"
-            + "DgYDVR0PAQH/BAQDAgTwMIHlBgNVHSABAf8EgdowgdcwgdQGCSqGSIb3LwEC"
-            + "ATCBxjCBkAYIKwYBBQUHAgIwgYMagYBUaGlzIGNlcnRpZmljYXRlIGhhcyBi"
-            + "ZWVuIGlzc3VlZCBpbiBhY2NvcmRhbmNlIHdpdGggdGhlIEFjcm9iYXQgQ3Jl"
-            + "ZGVudGlhbHMgQ1BTIGxvY2F0ZWQgYXQgaHR0cDovL3d3dy5nZW90cnVzdC5j"
-            + "b20vcmVzb3VyY2VzL2NwczAxBggrBgEFBQcCARYlaHR0cDovL3d3dy5nZW90"
-            + "cnVzdC5jb20vcmVzb3VyY2VzL2NwczATBgNVHSUEDDAKBggrBgEFBQcDCTA6"
-            + "BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLmdlb3RydXN0LmNvbS9jcmxz"
-            + "L2Fkb2JlY2ExLmNybDAfBgNVHSMEGDAWgBSrgFnDZYNtHX0TvRnD7BqPDUdq"
-            + "ozANBgkqhkiG9w0BAQUFAAOCAQEAQ0l/UEPs9fmK+5prC33SrU4bNekhAv8K"
-            + "XMR4VWY4jGo9zURMVGr3Zi7Eblvr5H6T60aSYLA8txjyKmDplxsn8CKtCGiH"
-            + "OOUW5PpgBexN8SMKoRl9YzaxLtysrYRjEIyYoTfEN89yVi2sCjPupm/F9CPR"
-            + "O7EdKy0dm/f3C7ZmIbUFaIRzINDJOCpM5cGhmZ8m2yG4BxeZOmCSthKtLfvM"
-            + "2U9MaH6kxhDTJYNzw5BElHg5jlld92drTWaO0lM6aPr/pc+gs9hOraBCtzYE"
-            + "J40nhsSEtvuwVUE9vA+unNMT8dFtAcOvOPRiKYPF45RX9Rdy2C9jAc20SRwE"
-            + "uw6b+7K0xjANBgkqhkiG9w0BAQEFAASCAQC7a4yICFGCEMPlJbydK5qLG3rV"
-            + "sip7Ojjz9TB4nLhC2DgsIHds8jjdq2zguInluH2nLaBCVS+qxDVlTjgbI2cB"
-            + "TaWS8nglC7nNjzkKAsa8vThA8FZUVXTW0pb74jNJJU2AA27bb4g+4WgunCrj"
-            + "fpYp+QjDyMmdrJVqRmt5eQN+dpVxMS9oq+NrhOSEhyIb4/rejgNg9wnVK1ms"
-            + "l5PxQ4x7kpm7+Ua41//owkJVWykRo4T1jo4eHEz1DolPykAaKie2VKH/sMqR"
-            + "Spjh4E5biKJLOV9fKivZWKAXByXfwUbbMsJvz4v/2yVHFy9xP+tqB5ZbRoDK"
-            + "k8PzUyCprozn+/22oYIPijCCD4YGCyqGSIb3DQEJEAIOMYIPdTCCD3EGCSqG"
-            + "SIb3DQEHAqCCD2Iwgg9eAgEDMQswCQYFKw4DAhoFADCB+gYLKoZIhvcNAQkQ"
-            + "AQSggeoEgecwgeQCAQEGAikCMCEwCQYFKw4DAhoFAAQUoT97qeCv3FXYaEcS"
-            + "gY8patCaCA8CAiMHGA8yMDA2MDQwNDIwMjA1N1owAwIBPAEB/wIIO0yRre3L"
-            + "8/6ggZCkgY0wgYoxCzAJBgNVBAYTAlVTMRYwFAYDVQQIEw1NYXNzYWNodXNl"
-            + "dHRzMRAwDgYDVQQHEwdOZWVkaGFtMRUwEwYDVQQKEwxHZW9UcnVzdCBJbmMx"
-            + "EzARBgNVBAsTClByb2R1Y3Rpb24xJTAjBgNVBAMTHGFkb2JlLXRpbWVzdGFt"
-            + "cC5nZW90cnVzdC5jb22gggzJMIIDUTCCAjmgAwIBAgICAI8wDQYJKoZIhvcN"
-            + "AQEFBQAwRTELMAkGA1UEBhMCVVMxFjAUBgNVBAoTDUdlb1RydXN0IEluYy4x"
-            + "HjAcBgNVBAMTFUdlb1RydXN0IENBIGZvciBBZG9iZTAeFw0wNTAxMTAwMTI5"
-            + "MTBaFw0xNTAxMTUwODAwMDBaMIGKMQswCQYDVQQGEwJVUzEWMBQGA1UECBMN"
-            + "TWFzc2FjaHVzZXR0czEQMA4GA1UEBxMHTmVlZGhhbTEVMBMGA1UEChMMR2Vv"
-            + "VHJ1c3QgSW5jMRMwEQYDVQQLEwpQcm9kdWN0aW9uMSUwIwYDVQQDExxhZG9i"
-            + "ZS10aW1lc3RhbXAuZ2VvdHJ1c3QuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GN"
-            + "ADCBiQKBgQDRbxJotLFPWQuuEDhKtOMaBUJepGxIvWxeahMbq1DVmqnk88+j"
-            + "w/5lfPICPzQZ1oHrcTLSAFM7Mrz3pyyQKQKMqUyiemzuG/77ESUNfBNSUfAF"
-            + "PdtHuDMU8Is8ABVnFk63L+wdlvvDIlKkE08+VTKCRdjmuBVltMpQ6QcLFQzm"
-            + "AQIDAQABo4GIMIGFMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwuZ2Vv"
-            + "dHJ1c3QuY29tL2NybHMvYWRvYmVjYTEuY3JsMB8GA1UdIwQYMBaAFKuAWcNl"
-            + "g20dfRO9GcPsGo8NR2qjMA4GA1UdDwEB/wQEAwIGwDAWBgNVHSUBAf8EDDAK"
-            + "BggrBgEFBQcDCDANBgkqhkiG9w0BAQUFAAOCAQEAmnyXjdtX+F79Nf0KggTd"
-            + "6YC2MQD9s09IeXTd8TP3rBmizfM+7f3icggeCGakNfPRmIUMLoa0VM5Kt37T"
-            + "2X0TqzBWusfbKx7HnX4v1t/G8NJJlT4SShSHv+8bjjU4lUoCmW2oEcC5vXwP"
-            + "R5JfjCyois16npgcO05ZBT+LLDXyeBijE6qWmwLDfEpLyILzVRmyU4IE7jvm"
-            + "rgb3GXwDUvd3yQXGRRHbPCh3nj9hBGbuzyt7GnlqnEie3wzIyMG2ET/wvTX5"
-            + "4BFXKNe7lDLvZj/MXvd3V7gMTSVW0kAszKao56LfrVTgp1VX3UBQYwmQqaoA"
-            + "UwFezih+jEvjW6cYJo/ErDCCBKEwggOJoAMCAQICBD4cvSgwDQYJKoZIhvcN"
-            + "AQEFBQAwaTELMAkGA1UEBhMCVVMxIzAhBgNVBAoTGkFkb2JlIFN5c3RlbXMg"
-            + "SW5jb3Jwb3JhdGVkMR0wGwYDVQQLExRBZG9iZSBUcnVzdCBTZXJ2aWNlczEW"
-            + "MBQGA1UEAxMNQWRvYmUgUm9vdCBDQTAeFw0wMzAxMDgyMzM3MjNaFw0yMzAx"
-            + "MDkwMDA3MjNaMGkxCzAJBgNVBAYTAlVTMSMwIQYDVQQKExpBZG9iZSBTeXN0"
-            + "ZW1zIEluY29ycG9yYXRlZDEdMBsGA1UECxMUQWRvYmUgVHJ1c3QgU2Vydmlj"
-            + "ZXMxFjAUBgNVBAMTDUFkb2JlIFJvb3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUA"
-            + "A4IBDwAwggEKAoIBAQDMT1SE96ei5zNTfz+cEohrLJlHZ34PHrmtFIj5wxDY"
-            + "HfDw1Z9pCi9ZNbDMbKlMnBWgn84gv6DPVOLgIGZFPzmGOH6cxI4HIsYk9gES"
-            + "sDXfVeppkLDbhTce4k4HskKhahNpoGbqgJERWSqbCHlaIEQtyb1zOIs8L+BD"
-            + "G12zC/CvNRop/u+mkt2BTJ09WY6tMTxAfpuRNgb84lyN0Y0m1VxFz69lP7Gq"
-            + "0mKW9Kg46rpgQvT0HEo1Fc74TiJWD5UYxfiWn5/7sLd4JemAa73WCvDGdJSd"
-            + "8w9Q25p3zktwgyONoMp4IERcPFRk8eqiMBmf6kwGTQZ4S16S3yLSyWezetIB"
-            + "AgMBAAGjggFPMIIBSzARBglghkgBhvhCAQEEBAMCAAcwgY4GA1UdHwSBhjCB"
-            + "gzCBgKB+oHykejB4MQswCQYDVQQGEwJVUzEjMCEGA1UEChMaQWRvYmUgU3lz"
-            + "dGVtcyBJbmNvcnBvcmF0ZWQxHTAbBgNVBAsTFEFkb2JlIFRydXN0IFNlcnZp"
-            + "Y2VzMRYwFAYDVQQDEw1BZG9iZSBSb290IENBMQ0wCwYDVQQDEwRDUkwxMCsG"
-            + "A1UdEAQkMCKADzIwMDMwMTA4MjMzNzIzWoEPMjAyMzAxMDkwMDA3MjNaMAsG"
-            + "A1UdDwQEAwIBBjAfBgNVHSMEGDAWgBSCtzhKk6qbEO+Au9lU4vEP+4Cc3jAd"
-            + "BgNVHQ4EFgQUgrc4SpOqmxDvgLvZVOLxD/uAnN4wDAYDVR0TBAUwAwEB/zAd"
-            + "BgkqhkiG9n0HQQAEEDAOGwhWNi4wOjQuMAMCBJAwDQYJKoZIhvcNAQEFBQAD"
-            + "ggEBADLan0N1wfpvyW/bqx02Nz68YRk2twI8HSNZmGye7k2F51TIIB+n1Lvi"
-            + "vwB3fSRrcC9cwTp2SbXT4COEKnFqIvPBJymYFfY1kOQETMONvJ9hHOf9JIzR"
-            + "REOMFrqbTaXUNS+8Ec6991E3jZ+Q5BTxGD++6VkSNfkzkvOe4NVrmnGbmUvI"
-            + "ccPhsWEJxOX6kfBCOjd9NPly6M2qYhwh6dX0ghDjewW2LWhWC35+kixvTXKC"
-            + "DO1WdLKduastKx0QX9sndXCP/R3X4gKgeeUc5f+vZEBRLZ6bR9tCpXwfwqZI"
-            + "sNe+kmlNpPYpV8V4ERjch1HKE7JinU8rMr0xpcH6UqsFiMgwggTLMIIDs6AD"
-            + "AgECAgQ+HL21MA0GCSqGSIb3DQEBBQUAMGkxCzAJBgNVBAYTAlVTMSMwIQYD"
-            + "VQQKExpBZG9iZSBTeXN0ZW1zIEluY29ycG9yYXRlZDEdMBsGA1UECxMUQWRv"
-            + "YmUgVHJ1c3QgU2VydmljZXMxFjAUBgNVBAMTDUFkb2JlIFJvb3QgQ0EwHhcN"
-            + "MDQwMTE3MDAwMzM5WhcNMTUwMTE1MDgwMDAwWjBFMQswCQYDVQQGEwJVUzEW"
-            + "MBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEeMBwGA1UEAxMVR2VvVHJ1c3QgQ0Eg"
-            + "Zm9yIEFkb2JlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAp+V3"
-            + "4GR4Wuc5hbyv0vVbKBMOVN1J+s5i9ZL9nph7n+X4esFs4epAJcFxJ4KnPuQH"
-            + "ZZ0oyHUU4Th70mWYgKwd6sEt1aR6ZT788Nvr3OHwTRwugN/G6QXqhU9ePpZJ"
-            + "OF1Ibsf1pcXNGvpLdcYK6+CX5DANMuIthb440XoNfC3dNBC0pF4mM4lmTjpl"
-            + "nQG8xK0rIFp4HoMpmyaIijz2qyjXdUNkg0fbDUq9eDTKAOLOg21u+AA8XKbC"
-            + "ewg1LWSV9CVy+fTHREmb1thBcrfkY1kCAvczsuquV3SMx8hRpa+4cIvKK/K1"
-            + "G7OrV0nsTyuaJ2MMST8b7bul/Xd81nu9Hsz4iQIDAQABo4IBnTCCAZkwEgYD"
-            + "VR0TAQH/BAgwBgEB/wIBATBQBgNVHSAESTBHMEUGCSqGSIb3LwECATA4MDYG"
-            + "CCsGAQUFBwIBFipodHRwczovL3d3dy5hZG9iZS5jb20vbWlzYy9wa2kvY2Rz"
-            + "X2NwLmh0bWwwFAYDVR0lBA0wCwYJKoZIhvcvAQEFMIGyBgNVHR8Egaowgacw"
-            + "IqAgoB6GHGh0dHA6Ly9jcmwuYWRvYmUuY29tL2Nkcy5jcmwwgYCgfqB8pHow"
-            + "eDELMAkGA1UEBhMCVVMxIzAhBgNVBAoTGkFkb2JlIFN5c3RlbXMgSW5jb3Jw"
-            + "b3JhdGVkMR0wGwYDVQQLExRBZG9iZSBUcnVzdCBTZXJ2aWNlczEWMBQGA1UE"
-            + "AxMNQWRvYmUgUm9vdCBDQTENMAsGA1UEAxMEQ1JMMTALBgNVHQ8EBAMCAQYw"
-            + "HwYDVR0jBBgwFoAUgrc4SpOqmxDvgLvZVOLxD/uAnN4wHQYDVR0OBBYEFKuA"
-            + "WcNlg20dfRO9GcPsGo8NR2qjMBkGCSqGSIb2fQdBAAQMMAobBFY2LjADAgSQ"
-            + "MA0GCSqGSIb3DQEBBQUAA4IBAQA/OVkuogCOsV4RYSzS4Lb1jImGRc4T2Z/d"
-            + "hJoUawhMX4aXWPSlqNOPIfhHflCvd+Whbarcd83NN5n3QmevUOFUREPrMQyA"
-            + "mkK0mpW6TSyLG5ckeCFL8qJwp/hhckk/H16m4hEXWyIFGfOecX3Sy+Y4kxcC"
-            + "lzSMadifedB+TiRpKFKcNphp5hEMkpyyJaGXpLnN/BLsaDyEN7JySExAopae"
-            + "UbUJCvCVIWKwoJ26ih3BG1aB+3yTHXeLIorextqWbq+dVz7me59Li8j5PAxe"
-            + "hXrc2phpKuhp8FaTScvnfMZc8TL4Dr1CHMRWIkqfZaCq3mC376Mww0iZtE5s"
-            + "iqB+AXVWMYIBgDCCAXwCAQEwSzBFMQswCQYDVQQGEwJVUzEWMBQGA1UEChMN"
-            + "R2VvVHJ1c3QgSW5jLjEeMBwGA1UEAxMVR2VvVHJ1c3QgQ0EgZm9yIEFkb2Jl"
-            + "AgIAjzAJBgUrDgMCGgUAoIGMMBoGCSqGSIb3DQEJAzENBgsqhkiG9w0BCRAB"
-            + "BDAcBgkqhkiG9w0BCQUxDxcNMDYwNDA0MjAyMDU3WjAjBgkqhkiG9w0BCQQx"
-            + "FgQUp7AnXBqoNcarvO7fMJut1og2U5AwKwYLKoZIhvcNAQkQAgwxHDAaMBgw"
-            + "FgQU1dH4eZTNhgxdiSABrat6zsPdth0wDQYJKoZIhvcNAQEBBQAEgYCinr/F"
-            + "rMiQz/MRm9ZD5YGcC0Qo2dRTPd0Aop8mZ4g1xAhKFLnp7lLsjCbkSDpVLDBh"
-            + "cnCk7CV+3FT5hlvt8OqZlR0CnkSnCswLFhrppiWle6cpxlwGqyAteC8uKtQu"
-            + "wjE5GtBKLcCOAzQYyyuNZZeB6oCZ+3mPhZ62FxrvvEGJCgAAAAAAAAAAAAAA"
-            + "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
-            + "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
-            + "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
-            + "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
-            + "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
-            + "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
-            + "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
-            + "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
-            + "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==");
-
-    private final byte[] emptyDNCert = Base64.decode(
-              "MIICfTCCAeagAwIBAgIBajANBgkqhkiG9w0BAQQFADB8MQswCQYDVQQGEwJVUzEMMAoGA1UEChMD"
-            + "Q0RXMQkwBwYDVQQLEwAxCTAHBgNVBAcTADEJMAcGA1UECBMAMRowGAYDVQQDExFUZW1wbGFyIFRl"
-            + "c3QgMTAyNDEiMCAGCSqGSIb3DQEJARYTdGVtcGxhcnRlc3RAY2R3LmNvbTAeFw0wNjA1MjIwNTAw"
-            + "MDBaFw0xMDA1MjIwNTAwMDBaMHwxCzAJBgNVBAYTAlVTMQwwCgYDVQQKEwNDRFcxCTAHBgNVBAsT"
-            + "ADEJMAcGA1UEBxMAMQkwBwYDVQQIEwAxGjAYBgNVBAMTEVRlbXBsYXIgVGVzdCAxMDI0MSIwIAYJ"
-            + "KoZIhvcNAQkBFhN0ZW1wbGFydGVzdEBjZHcuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKB"
-            + "gQDH3aJpJBfM+A3d84j5YcU6zEQaQ76u5xO9NSBmHjZykKS2kCcUqPpvVOPDA5WgV22dtKPh+lYV"
-            + "iUp7wyCVwAKibq8HIbihHceFqMKzjwC639rMoDJ7bi/yzQWz1Zg+075a4FGPlUKn7Yfu89wKkjdW"
-            + "wDpRPXc/agqBnrx5pJTXzQIDAQABow8wDTALBgNVHQ8EBAMCALEwDQYJKoZIhvcNAQEEBQADgYEA"
-            + "RRsRsjse3i2/KClFVd6YLZ+7K1BE0WxFyY2bbytkwQJSxvv3vLSuweFUbhNxutb68wl/yW4GLy4b"
-            + "1QdyswNxrNDXTuu5ILKhRDDuWeocz83aG2KGtr3JlFyr3biWGEyn5WUOE6tbONoQDJ0oPYgI6CAc"
-            + "EHdUp0lioOCt6UOw7Cs=");
-
-    private final byte[] gostRFC4491_94 = Base64.decode(
-        "MIICCzCCAboCECMO42BGlSTOxwvklBgufuswCAYGKoUDAgIEMGkxHTAbBgNVBAMM" +
-            "FEdvc3RSMzQxMC05NCBleGFtcGxlMRIwEAYDVQQKDAlDcnlwdG9Qcm8xCzAJBgNV" +
-            "BAYTAlJVMScwJQYJKoZIhvcNAQkBFhhHb3N0UjM0MTAtOTRAZXhhbXBsZS5jb20w" +
-            "HhcNMDUwODE2MTIzMjUwWhcNMTUwODE2MTIzMjUwWjBpMR0wGwYDVQQDDBRHb3N0" +
-            "UjM0MTAtOTQgZXhhbXBsZTESMBAGA1UECgwJQ3J5cHRvUHJvMQswCQYDVQQGEwJS" +
-            "VTEnMCUGCSqGSIb3DQEJARYYR29zdFIzNDEwLTk0QGV4YW1wbGUuY29tMIGlMBwG" +
-            "BiqFAwICFDASBgcqhQMCAiACBgcqhQMCAh4BA4GEAASBgLuEZuF5nls02CyAfxOo" +
-            "GWZxV/6MVCUhR28wCyd3RpjG+0dVvrey85NsObVCNyaE4g0QiiQOHwxCTSs7ESuo" +
-            "v2Y5MlyUi8Go/htjEvYJJYfMdRv05YmKCYJo01x3pg+2kBATjeM+fJyR1qwNCCw+" +
-            "eMG1wra3Gqgqi0WBkzIydvp7MAgGBiqFAwICBANBABHHCH4S3ALxAiMpR3aPRyqB" +
-            "g1DjB8zy5DEjiULIc+HeIveF81W9lOxGkZxnrFjXBSqnjLeFKgF1hffXOAP7zUM=");
-
-    private final byte[] gostRFC4491_2001 = Base64.decode(
-            "MIIB0DCCAX8CECv1xh7CEb0Xx9zUYma0LiEwCAYGKoUDAgIDMG0xHzAdBgNVBAMM" +
-            "Fkdvc3RSMzQxMC0yMDAxIGV4YW1wbGUxEjAQBgNVBAoMCUNyeXB0b1BybzELMAkG" +
-            "A1UEBhMCUlUxKTAnBgkqhkiG9w0BCQEWGkdvc3RSMzQxMC0yMDAxQGV4YW1wbGUu" +
-            "Y29tMB4XDTA1MDgxNjE0MTgyMFoXDTE1MDgxNjE0MTgyMFowbTEfMB0GA1UEAwwW" +
-            "R29zdFIzNDEwLTIwMDEgZXhhbXBsZTESMBAGA1UECgwJQ3J5cHRvUHJvMQswCQYD" +
-            "VQQGEwJSVTEpMCcGCSqGSIb3DQEJARYaR29zdFIzNDEwLTIwMDFAZXhhbXBsZS5j" +
-            "b20wYzAcBgYqhQMCAhMwEgYHKoUDAgIkAAYHKoUDAgIeAQNDAARAhJVodWACGkB1" +
-            "CM0TjDGJLP3lBQN6Q1z0bSsP508yfleP68wWuZWIA9CafIWuD+SN6qa7flbHy7Df" +
-            "D2a8yuoaYDAIBgYqhQMCAgMDQQA8L8kJRLcnqeyn1en7U23Sw6pkfEQu3u0xFkVP" +
-            "vFQ/3cHeF26NG+xxtZPz3TaTVXdoiYkXYiD02rEx1bUcM97i");
-    
-    private final byte[] uaczo1 = Base64.decode(
-            "MIIFWzCCBNegAwIBAgIUMAR1He8seK4BAAAAAQAAAAEAAAAwDQYLKoYkAgEBAQED" +
-            "AQEwgfoxPzA9BgNVBAoMNtCc0ZbQvdGW0YHRgtC10YDRgdGC0LLQviDRjtGB0YLQ" +
-            "uNGG0ZbRlyDQo9C60YDQsNGX0L3QuDExMC8GA1UECwwo0JDQtNC80ZbQvdGW0YHR" +
-            "gtGA0LDRgtC+0YAg0IbQotChINCm0JfQnjFJMEcGA1UEAwxA0KbQtdC90YLRgNCw" +
-            "0LvRjNC90LjQuSDQt9Cw0YHQstGW0LTRh9GD0LLQsNC70YzQvdC40Lkg0L7RgNCz" +
-            "0LDQvTEZMBcGA1UEBQwQVUEtMDAwMTU2MjItMjAxMjELMAkGA1UEBhMCVUExETAP" +
-            "BgNVBAcMCNCa0LjRl9CyMB4XDTEyMDkyODE5NTMwMFoXDTIyMDkyODE5NTMwMFow" +
-            "gfoxPzA9BgNVBAoMNtCc0ZbQvdGW0YHRgtC10YDRgdGC0LLQviDRjtGB0YLQuNGG" +
-            "0ZbRlyDQo9C60YDQsNGX0L3QuDExMC8GA1UECwwo0JDQtNC80ZbQvdGW0YHRgtGA" +
-            "0LDRgtC+0YAg0IbQotChINCm0JfQnjFJMEcGA1UEAwxA0KbQtdC90YLRgNCw0LvR" +
-            "jNC90LjQuSDQt9Cw0YHQstGW0LTRh9GD0LLQsNC70YzQvdC40Lkg0L7RgNCz0LDQ" +
-            "vTEZMBcGA1UEBQwQVUEtMDAwMTU2MjItMjAxMjELMAkGA1UEBhMCVUExETAPBgNV" +
-            "BAcMCNCa0LjRl9CyMIIBUTCCARIGCyqGJAIBAQEBAwEBMIIBATCBvDAPAgIBrzAJ" +
-            "AgEBAgEDAgEFAgEBBDbzykDGaaTaFzFJyhLDLa4Ya1Osa8Y2WZferq6K0tiI+b/V" +
-            "NAFpTvnEJz2M/m3Cj3BqD0kQzgMCNj//////////////////////////////////" +
-            "/7oxdUWACajApyTwL4Gqih/Lr4DZDHqVEQUEzwQ2fIV8lMVDO/2ZHhfCJoQGWFCp" +
-            "oknte8JJrlpOh4aJ+HLvetUkCC7DA46a7ee6a6Ezgdl5umIaBECp1utF8TxwgoDE" +
-            "lnsjH16t9ljrpMA3KR042WvwJcpOF/jpcg3GFbQ6KJdfC8Heo2Q4tWTqLBef0BI+" +
-            "bbj6xXkEAzkABDa2G/m9S2LKqyw5UPXFHV+oDXB+AHtSW3BnZ9zlzRuvbido2tDG" +
-            "qE/CL5kFHZE0NfTrHrGa1USjggE6MIIBNjApBgNVHQ4EIgQgMAR1He8seK4VC6vv" +
-            "vv8Nq9v4LOVonutO0xCl+xM4+wowKwYDVR0jBCQwIoAgMAR1He8seK4VC6vvvv8N" +
-            "q9v4LOVonutO0xCl+xM4+wowDgYDVR0PAQH/BAQDAgEGMBkGA1UdIAEB/wQPMA0w" +
-            "CwYJKoYkAgEBAQICMBIGA1UdEwEB/wQIMAYBAf8CAQIwHgYIKwYBBQUHAQMBAf8E" +
-            "DzANMAsGCSqGJAIBAQECATA9BgNVHR8ENjA0MDKgMKAuhixodHRwOi8vY3pvLmdv" +
-            "di51YS9kb3dubG9hZC9jcmxzL0NaTy1GdWxsLmNybDA+BgNVHS4ENzA1MDOgMaAv" +
-            "hi1odHRwOi8vY3pvLmdvdi51YS9kb3dubG9hZC9jcmxzL0NaTy1EZWx0YS5jcmww" +
-            "DQYLKoYkAgEBAQEDAQEDbwAEbPF4bx7drDxzzYABhB33Y0MQ+/N5FuPl7faVx/es" +
-            "V5n5DXg5TzZovzZeICB5JHPLcbdeCq6aGwvXsgybt34zqf7LKmfq0rFNYfXJVWFH" +
-            "4Tg5sPA+fCQ+T0O35VN873BLgTGz7bnHH9o8bnjwMA==");
-    
-    private final byte[] uaczo2 = Base64.decode(
-            "MIIEvTCCBDmgAwIBAgIDAYhwMA0GCyqGJAIBAQEBAwEBMIIBHjELMAkGA1UEBhMC" +
-            "VUExKDAmBgNVBAgMH9Ca0LjRl9Cy0YHRjNC60LAg0L7QsdC70LDRgdGC0YwxETAP" +
-            "BgNVBAcMCNCa0LjRl9CyMUkwRwYDVQQKDEDQptC10L3RgtGA0LDQu9GM0L3QuNC5" +
-            "INC30LDRgdCy0ZbQtNGH0YPQstCw0LvRjNC90LjQuSDQvtGA0LPQsNC9MTUwMwYD" +
-            "VQQLDCzQotC10YXQvdC+0LvQvtCz0ZbRh9C90LjQuSDRhtC10L3RgtGAINCm0JfQ" +
-            "njE1MDMGA1UEAwws0KPQutGA0LDRl9C90LAsINCm0JfQniAvIFVrcmFpbmUsIENl" +
-            "bnRyYWwgQ0ExGTAXBgNVBAUTEFVBLTM3MjAwMzAzLTIwMTAwHhcNMDYxMjI1MDc0" +
-            "MDU4WhcNMTExMjI0MDc0MDU4WjCCAR4xCzAJBgNVBAYTAlVBMSgwJgYDVQQIDB/Q" +
-            "mtC40ZfQstGB0YzQutCwINC+0LHQu9Cw0YHRgtGMMREwDwYDVQQHDAjQmtC40ZfQ" +
-            "sjFJMEcGA1UECgxA0KbQtdC90YLRgNCw0LvRjNC90LjQuSDQt9Cw0YHQstGW0LTR" +
-            "h9GD0LLQsNC70YzQvdC40Lkg0L7RgNCz0LDQvTE1MDMGA1UECwws0KLQtdGF0L3Q" +
-            "vtC70L7Qs9GW0YfQvdC40Lkg0YbQtdC90YLRgCDQptCX0J4xNTAzBgNVBAMMLNCj" +
-            "0LrRgNCw0ZfQvdCwLCDQptCX0J4gLyBVa3JhaW5lLCBDZW50cmFsIENBMRkwFwYD" +
-            "VQQFExBVQS0zNzIwMDMwMy0yMDEwMIGdMGAGCyqGJAIBAQEBAwEBMFEGDSqGJAIB" +
-            "AQEBAwEBAgkEQKnW60XxPHCCgMSWeyMfXq32WOukwDcpHTjZa/Alyk4X+OlyDcYV" +
-            "tDool18Lwd6jZDi1ZOosF5/QEj5tuPrFeQQDOQAENlMfji/H5gxxL5TKtLMFv2X3" +
-            "0EJrj3orwGV0zEz+EgSChr+I8bsOrnfkr5UwMQIjGJOg1G/nYKOCARgwggEUMA8G" +
-            "A1UdEwEB/wQFMAMBAf8weQYDVR0gAQH/BG8wbTBeBgkqhiQCAQEBAgEwUTBPBggr" +
-            "BgEFBQcCARZDaHR0cDovL2N6by5nb3YudWEvY29udGVudC9ub3JtYXRpdmVfZG9j" +
-            "dW1lbnQvZ2VuZXJhbF9kb2MvcmVnQ1pPLnppcDALBgkqhiQCAQEBAgIwHgYIKwYB" +
-            "BQUHAQMBAf8EDzANMAsGCSqGJAIBAQECATAOBgNVHQ8BAf8EBAMCAcYwKQYDVR0O" +
-            "BCIEIPqbNt55OgWdLCn8hfuY9HJE3d3+DTTBlTJBN0nxog+mMCsGA1UdIwQkMCKA" +
-            "IPqbNt55OgWdLCn8hfuY9HJE3d3+DTTBlTJBN0nxog+mMA0GCyqGJAIBAQEBAwEB" +
-            "A28ABGx8QNaWcy0admsBt6iB0Vi+kAargzsQuoc/BThskYdxGNftLvYDPYxkEM2N" +
-            "GQ+9f1RJgCSNVRj3NhWoHhkqcL5R3gxAHie+a+zMqsX0258hGdT3MXkm0Syn/cNo" +
-            "sga4XzzvnVaas9vsPKMrZTQ=");
-    
-    private final byte[] uaczo3 = Base64.decode(
-            "MIIEtTCCBDGgAwIBAgIDAYisMA0GCyqGJAIBAQEBAwEBMIIBGjELMAkGA1UEBhMC" +
-            "VUExKDAmBgNVBAgMH9Ca0LjRl9Cy0YHRjNC60LAg0L7QsdC70LDRgdGC0YwxETAP" +
-            "BgNVBAcMCNCa0LjRl9CyMUkwRwYDVQQKDEDQptC10L3RgtGA0LDQu9GM0L3QuNC5" +
-            "INC30LDRgdCy0ZbQtNGH0YPQstCw0LvRjNC90LjQuSDQvtGA0LPQsNC9MTEwLwYD" +
-            "VQQLDCjQkNC00LzRltC90ZbRgdGC0YDQsNGC0L7RgCDQhtCi0KEg0KbQl9CeMTUw" +
-            "MwYDVQQDDCzQo9C60YDQsNGX0L3QsCwg0KbQl9CeIC8gVWtyYWluZSwgQ2VudHJh" +
-            "bCBDQTEZMBcGA1UEBRMQVUEtMDAwMTU2MjItMjAxMTAeFw0wNzEyMjAxMDAwMDBa" +
-            "Fw0xMjEyMTgxMDAwMDBaMIIBGjELMAkGA1UEBhMCVUExKDAmBgNVBAgMH9Ca0LjR" +
-            "l9Cy0YHRjNC60LAg0L7QsdC70LDRgdGC0YwxETAPBgNVBAcMCNCa0LjRl9CyMUkw" +
-            "RwYDVQQKDEDQptC10L3RgtGA0LDQu9GM0L3QuNC5INC30LDRgdCy0ZbQtNGH0YPQ" +
-            "stCw0LvRjNC90LjQuSDQvtGA0LPQsNC9MTEwLwYDVQQLDCjQkNC00LzRltC90ZbR" +
-            "gdGC0YDQsNGC0L7RgCDQhtCi0KEg0KbQl9CeMTUwMwYDVQQDDCzQo9C60YDQsNGX" +
-            "0L3QsCwg0KbQl9CeIC8gVWtyYWluZSwgQ2VudHJhbCBDQTEZMBcGA1UEBRMQVUEt" +
-            "MDAwMTU2MjItMjAxMTCBnTBgBgsqhiQCAQEBAQMBATBRBg0qhiQCAQEBAQMBAQIJ" +
-            "BECp1utF8TxwgoDElnsjH16t9ljrpMA3KR042WvwJcpOF/jpcg3GFbQ6KJdfC8He" +
-            "o2Q4tWTqLBef0BI+bbj6xXkEAzkABDajkfNBomH27xjY1N7wklRvY5E0ZFaU53Fh" +
-            "y4jUY+G4AUhEHHCkTvUja8CUxPqtb9KyfuZELVOjggEYMIIBFDAPBgNVHRMBAf8E" +
-            "BTADAQH/MHkGA1UdIAEB/wRvMG0wXgYJKoYkAgEBAQIBMFEwTwYIKwYBBQUHAgEW" +
-            "Q2h0dHA6Ly9jem8uZ292LnVhL2NvbnRlbnQvbm9ybWF0aXZlX2RvY3VtZW50L2dl" +
-            "bmVyYWxfZG9jL3JlZ0NaTy56aXAwCwYJKoYkAgEBAQICMB4GCCsGAQUFBwEDAQH/" +
-            "BA8wDTALBgkqhiQCAQEBAgEwDgYDVR0PAQH/BAQDAgHGMCkGA1UdDgQiBCC+e+cA" +
-            "bIdAgQkh6q3dUAZjPrNhwDDGrVnLNP6telmoCjArBgNVHSMEJDAigCC+e+cAbIdA" +
-            "gQkh6q3dUAZjPrNhwDDGrVnLNP6telmoCjANBgsqhiQCAQEBAQMBAQNvAARsyq9i" +
-            "ajEgdBh5mPUZefcLY56AIRWqmsJsWuZuUbCa5oQXRH5iCRa4PSvs8v6zHAKKlMgK" +
-            "gaoY6jywqmwiMlylbSgo/A0HKdCFnUUl7S8yjE4054MSSIjb2R0c2pmqmwtU25JB" +
-            "/MkNbe77Uzka");
-    
-    private final byte[] uaczo4 = Base64.decode(
-            "MIIEKzCCA6egAwIBAgIBATANBgsqhiQCAQEBAQMBATCBzDFJMEcGA1UECwxA0KbQ" +
-            "tdC90YLRgNCw0LvRjNC90LjQuSDQt9Cw0YHQstGW0LTRh9GD0LLQsNC70YzQvdC4" +
-            "0Lkg0L7RgNCz0LDQvTE1MDMGA1UEAwws0KPQutGA0LDRl9C90LAsINCm0JfQniAv" +
-            "IFVrcmFpbmUsIENlbnRyYWwgQ0ExCzAJBgNVBAYTAlVBMREwDwYDVQQHDAjQmtC4" +
-            "0ZfQsjEoMCYGA1UECAwf0JrQuNGX0LLRgdGM0LrQsCDQvtCx0LvQsNGB0YLRjDAe" +
-            "Fw0wNTEyMjMyMzAxMDFaFw0xMDEyMjMyMzAxMDFaMIHMMUkwRwYDVQQLDEDQptC1" +
-            "0L3RgtGA0LDQu9GM0L3QuNC5INC30LDRgdCy0ZbQtNGH0YPQstCw0LvRjNC90LjQ" +
-            "uSDQvtGA0LPQsNC9MTUwMwYDVQQDDCzQo9C60YDQsNGX0L3QsCwg0KbQl9CeIC8g" +
-            "VWtyYWluZSwgQ2VudHJhbCBDQTELMAkGA1UEBhMCVUExETAPBgNVBAcMCNCa0LjR" +
-            "l9CyMSgwJgYDVQQIDB/QmtC40ZfQstGB0YzQutCwINC+0LHQu9Cw0YHRgtGMMIIB" +
-            "UTCCARIGCyqGJAIBAQEBAwEBMIIBATCBvDAPAgIBrzAJAgEBAgEDAgEFAgEBBDbz" +
-            "ykDGaaTaFzFJyhLDLa4Ya1Osa8Y2WZferq6K0tiI+b/VNAFpTvnEJz2M/m3Cj3Bq" +
-            "D0kQzgMCNj///////////////////////////////////7oxdUWACajApyTwL4Gq" +
-            "ih/Lr4DZDHqVEQUEzwQ2lqAgR9+skUI33jGNgj2Qsh9+3x7so5koelwr4fy89k/x" +
-            "5eqNSvFZ/1fPHfXz+iz7PmFIhr15BECLwhftNllK8B904j3LmmBY/teFIBSrw2lL" +
-            "CKc1nWIez+h/01q0GSxgeuwU0oOw9WmwlkGuj13DJ8cSmm70jTULAzkABDa6vb3U" +
-            "VIxZr2cXcVSvKkPM65Ii2+8biqyoH8i9e0NKJu+IhjDvUrvzlr8U+ywuf5bpSj4N" +
-            "fEmjezB5MA4GA1UdDwEB/wQEAwIBxjAPBgNVHRMBAf8EBTADAQH/MCsGA1UdIwQk" +
-            "MCKAIOPEn/xcXE6VGFNB8vbfXS1XMYYzAa4ML8opsOslTHJNMCkGA1UdDgQiBCDj" +
-            "xJ/8XFxOlRhTQfL2310tVzGGMwGuDC/KKbDrJUxyTTANBgsqhiQCAQEBAQMBAQNv" +
-            "AARsh0unjBfQoINx2rXAJggrBdoRsCouw8lN771DhcuUrlQUuEEQHTaZrQoYbECu" +
-            "AGfsxfTyldQDEOVzD/Uq8Xh4gIHuSqki9mRSjMR19MQtTKRmI9TRHIeTdIZ6l3P7" +
-            "jFfGJvTP0E9NYSolx+kM");
-
-    private PublicKey dudPublicKey = new PublicKey() 
-    {
-        public String getAlgorithm()
-        {
-            return null;
-        }
-
-        public String getFormat()
-        {
-            return null;
-        }
-
-        public byte[] getEncoded()
-        {
-            return null;
-        }
-
-    };
-    
-    public String getName()
-    {
-        return "CertTest";
-    }
-
-    public void checkCertificate(
-        int     id,
-        byte[]  bytes)
-    {
-        ByteArrayInputStream    bIn;
-        String                  dump = "";
-
-        try
-        {
-            bIn = new ByteArrayInputStream(bytes);
-
-            CertificateFactory  fact = CertificateFactory.getInstance("X.509", "BC");
-
-            Certificate cert = fact.generateCertificate(bIn);
-
-            PublicKey    k = cert.getPublicKey();
-            // System.out.println(cert);
-        }
-        catch (Exception e)
-        {
-            fail(dump + System.getProperty("line.separator") + getName() + ": "+ id + " failed - exception " + e.toString(), e);
-        }
-
-    }
-
-    public void checkNameCertificate(
-        int     id,
-        byte[]  bytes)
-    {
-        ByteArrayInputStream    bIn;
-        String                  dump = "";
-
-        try
-        {
-            bIn = new ByteArrayInputStream(bytes);
-
-            CertificateFactory  fact = CertificateFactory.getInstance("X.509", "BC");
-
-            X509Certificate cert = (X509Certificate)fact.generateCertificate(bIn);
-
-            PublicKey    k = cert.getPublicKey();
-            if (!cert.getIssuerDN().toString().equals("C=DE,O=DATEV eG,0.2.262.1.10.7.20=1+CN=CA DATEV D03 1:PN"))
-            {
-                fail(id + " failed - name test.");
-            }
-            // System.out.println(cert);
-        }
-        catch (Exception e)
-        {
-            fail(dump + System.getProperty("line.separator") + getName() + ": "+ id + " failed - exception " + e.toString(), e);
-        }
-
-    }
-
-    public void checkKeyUsage(
-        int     id,
-        byte[]  bytes)
-    {
-        ByteArrayInputStream    bIn;
-        String                  dump = "";
-
-        try
-        {
-            bIn = new ByteArrayInputStream(bytes);
-
-            CertificateFactory  fact = CertificateFactory.getInstance("X.509", "BC");
-
-            X509Certificate cert = (X509Certificate)fact.generateCertificate(bIn);
-
-            PublicKey    k = cert.getPublicKey();
-
-            if (cert.getKeyUsage()[7])
-            {
-                fail("error generating cert - key usage wrong.");
-            }
-
-            // System.out.println(cert);
-        }
-        catch (Exception e)
-        {
-            fail(dump + System.getProperty("line.separator") + getName() + ": "+ id + " failed - exception " + e.toString(), e);
-        }
-
-    }
-
-
-    public void checkSelfSignedCertificate(
-        int     id,
-        byte[]  bytes,
-        String  sigAlgName)
-    {
-        ByteArrayInputStream    bIn;
-        String                  dump = "";
-
-        try
-        {
-            bIn = new ByteArrayInputStream(bytes);
-
-            CertificateFactory  fact = CertificateFactory.getInstance("X.509", "BC");
-
-            Certificate cert = fact.generateCertificate(bIn);
-
-            PublicKey    k = cert.getPublicKey();
-
-            cert.verify(k);
-            if (sigAlgName != null && !sigAlgName.equals(((X509Certificate)cert).getSigAlgName()))
-            {
-                fail("sigAlgName not matched on certificate: " + sigAlgName);
-            }
-
-            // System.out.println(cert);
-        }
-        catch (TestFailedException e)
-        {
-            throw e;
-        }
-        catch (Exception e)
-        {
-            fail(dump + System.getProperty("line.separator") + getName() + ": "+ id + " failed - exception " + e.toString(), e);
-        }
-
-    }
-    
-    private void checkCRL(
-        int     id,
-        byte[]  bytes)
-    {
-        ByteArrayInputStream    bIn;
-        String                  dump = "";
-
-        try
-        {
-            bIn = new ByteArrayInputStream(bytes);
-
-            CertificateFactory  fact = CertificateFactory.getInstance("X.509", "BC");
-
-            CRL cert = fact.generateCRL(bIn);
-
-            // System.out.println(cert);
-        }
-        catch (Exception e)
-        {
-            fail(dump + System.getProperty("line.separator") + getName() + ": "+ id + " failed - exception " + e.toString(), e);
-        }
-
-    }
-
-    private void testForgedSignature() 
-        throws Exception
-    {
-        String cert = "MIIBsDCCAVoCAQYwDQYJKoZIhvcNAQEFBQAwYzELMAkGA1UEBhMCQVUxEzARBgNV"
-                    + "BAgTClF1ZWVuc2xhbmQxGjAYBgNVBAoTEUNyeXB0U29mdCBQdHkgTHRkMSMwIQYD"
-                    + "VQQDExpTZXJ2ZXIgdGVzdCBjZXJ0ICg1MTIgYml0KTAeFw0wNjA5MTEyMzU4NTVa"
-                    + "Fw0wNjEwMTEyMzU4NTVaMGMxCzAJBgNVBAYTAkFVMRMwEQYDVQQIEwpRdWVlbnNs"
-                    + "YW5kMRowGAYDVQQKExFDcnlwdFNvZnQgUHR5IEx0ZDEjMCEGA1UEAxMaU2VydmVy"
-                    + "IHRlc3QgY2VydCAoNTEyIGJpdCkwXDANBgkqhkiG9w0BAQEFAANLADBIAkEAn7PD"
-                    + "hCeV/xIxUg8V70YRxK2A5jZbD92A12GN4PxyRQk0/lVmRUNMaJdq/qigpd9feP/u"
-                    + "12S4PwTLb/8q/v657QIDAQABMA0GCSqGSIb3DQEBBQUAA0EAbynCRIlUQgaqyNgU"
-                    + "DF6P14yRKUtX8akOP2TwStaSiVf/akYqfLFm3UGka5XbPj4rifrZ0/sOoZEEBvHQ"
-                    + "e20sRA==";
-        
-        CertificateFactory certFact = CertificateFactory.getInstance("X.509", "BC");
-        
-        X509Certificate x509 = (X509Certificate)certFact.generateCertificate(new ByteArrayInputStream(Base64.decode(cert)));
-        try
-        {
-            x509.verify(x509.getPublicKey());
-            
-            fail("forged RSA signature passed");
-        }
-        catch (Exception e)
-        {
-            // expected
-        }
-    }
-
-
-    private void pemTest()
-        throws Exception
-    {
-        CertificateFactory cf = CertificateFactory.getInstance("X.509", "BC");
-
-        Certificate cert = readPEMCert(cf, PEMData.CERTIFICATE_1);
-        if (cert == null)
-        {
-            fail("PEM cert not read");
-        }
-        cert = readPEMCert(cf, "-----BEGIN CERTIFICATE-----" + PEMData.CERTIFICATE_2);
-        if (cert == null)
-        {
-            fail("PEM cert with extraneous header not read");
-        }
-        CRL crl = cf.generateCRL(new ByteArrayInputStream(PEMData.CRL_1.getBytes("US-ASCII")));
-        if (crl == null)
-        {
-            fail("PEM crl not read");
-        }
-        Collection col = cf.generateCertificates(new ByteArrayInputStream(PEMData.CERTIFICATE_2.getBytes("US-ASCII")));
-        if (col.size() != 1 || !col.contains(cert))
-        {
-            fail("PEM cert collection not right");
-        }
-        col = cf.generateCRLs(new ByteArrayInputStream(PEMData.CRL_2.getBytes("US-ASCII")));
-        if (col.size() != 1 || !col.contains(crl))
-        {
-            fail("PEM crl collection not right");
-        }
-    }
-
-    private static Certificate readPEMCert(CertificateFactory cf, String pemData)
-        throws CertificateException, UnsupportedEncodingException
-    {
-        return cf.generateCertificate(new ByteArrayInputStream(pemData.getBytes("US-ASCII")));
-    }
-
-    private void pkcs7Test()
-        throws Exception
-    {
-        ASN1EncodableVector certs = new ASN1EncodableVector();
-
-        certs.add(new ASN1InputStream(CertPathTest.rootCertBin).readObject());
-        certs.add(new DERTaggedObject(false, 2, new ASN1InputStream(AttrCertData.attrCert).readObject()));
-
-        ASN1EncodableVector crls = new ASN1EncodableVector();
-
-        crls.add(new ASN1InputStream(CertPathTest.rootCrlBin).readObject());
-        SignedData sigData = new SignedData(new DERSet(), new ContentInfo(CMSObjectIdentifiers.data, null), new DERSet(certs), new DERSet(crls), new DERSet());
-
-        ContentInfo info = new ContentInfo(CMSObjectIdentifiers.signedData, sigData);
-
-        CertificateFactory cf = CertificateFactory.getInstance("X.509", "BC");
-
-        X509Certificate cert = (X509Certificate)cf.generateCertificate(new ByteArrayInputStream(info.getEncoded()));
-        if (cert == null || !areEqual(cert.getEncoded(), certs.get(0).toASN1Primitive().getEncoded()))
-        {
-            fail("PKCS7 cert not read");
-        }
-        X509CRL crl = (X509CRL)cf.generateCRL(new ByteArrayInputStream(info.getEncoded()));
-        if (crl == null || !areEqual(crl.getEncoded(), crls.get(0).toASN1Primitive().getEncoded()))
-        {
-            fail("PKCS7 crl not read");
-        }
-
-        if (!"SHA256WITHRSA".equals(crl.getSigAlgName()))
-        {
-            fail("signature ID not matched in CRL: " + crl.getSigAlgName());
-        }
-
-        Collection col = cf.generateCertificates(new ByteArrayInputStream(info.getEncoded()));
-        if (col.size() != 1 || !col.contains(cert))
-        {
-            fail("PKCS7 cert collection not right");
-        }
-        col = cf.generateCRLs(new ByteArrayInputStream(info.getEncoded()));
-        if (col.size() != 1 || !col.contains(crl))
-        {
-            fail("PKCS7 crl collection not right");
-        }
-
-        // data with no certificates or CRLs
-
-        sigData = new SignedData(new DERSet(), new ContentInfo(CMSObjectIdentifiers.data, null), new DERSet(), new DERSet(), new DERSet());
-
-        info = new ContentInfo(CMSObjectIdentifiers.signedData, sigData);
-
-        cert = (X509Certificate)cf.generateCertificate(new ByteArrayInputStream(info.getEncoded()));
-        if (cert != null)
-        {
-            fail("PKCS7 cert present");
-        }
-        crl = (X509CRL)cf.generateCRL(new ByteArrayInputStream(info.getEncoded()));
-        if (crl != null)
-        {
-            fail("PKCS7 crl present");
-        }
-
-        // data with absent certificates and CRLS
-
-        sigData = new SignedData(new DERSet(), new ContentInfo(CMSObjectIdentifiers.data, null), null, null, new DERSet());
-
-        info = new ContentInfo(CMSObjectIdentifiers.signedData, sigData);
-
-        cert = (X509Certificate)cf.generateCertificate(new ByteArrayInputStream(info.getEncoded()));
-        if (cert != null)
-        {
-            fail("PKCS7 cert present");
-        }
-        crl = (X509CRL)cf.generateCRL(new ByteArrayInputStream(info.getEncoded()));
-        if (crl != null)
-        {
-            fail("PKCS7 crl present");
-        }
-
-        //
-        // sample message
-        //
-        InputStream in = new ByteArrayInputStream(pkcs7CrlProblem);
-        Collection certCol = cf.generateCertificates(in);
-        Collection crlCol = cf.generateCRLs(in);
-
-        if (crlCol.size() != 0)
-        {
-            fail("wrong number of CRLs: " + crlCol.size());
-        }
-
-        if (certCol.size() != 4)
-        {
-            fail("wrong number of Certs: " + certCol.size());
-        }
-    }
-
-    private KeyPair generateLongFixedKeys()
-        throws NoSuchAlgorithmException, NoSuchProviderException, InvalidKeySpecException
-    {
-        RSAPublicKeySpec pubKeySpec = new RSAPublicKeySpec(
-            new BigInteger("a56e4a0e701017589a5187dc7ea841d156f2ec0e36ad52a44dfeb1e61f7ad991d8c51056ffedb162b4c0f283a12a88a394dff526ab7291cbb307ceabfce0b1dfd5cd9508096d5b2b8b6df5d671ef6377c0921cb23c270a70e2598e6ff89d19f105acc2d3f0cb35f29280e1386b6f64c4ef22e1e1f20d0ce8cffb2249bd9a2137",16),
-            new BigInteger("010001",16));
-
-        RSAPrivateCrtKeySpec privKeySpec = new RSAPrivateCrtKeySpec(
-            new BigInteger("a56e4a0e701017589a5187dc7ea841d156f2ec0e36ad52a44dfeb1e61f7ad991d8c51056ffedb162b4c0f283a12a88a394dff526ab7291cbb307ceabfce0b1dfd5cd9508096d5b2b8b6df5d671ef6377c0921cb23c270a70e2598e6ff89d19f105acc2d3f0cb35f29280e1386b6f64c4ef22e1e1f20d0ce8cffb2249bd9a2137",16),
-            new BigInteger("010001",16),
-            new BigInteger("33a5042a90b27d4f5451ca9bbbd0b44771a101af884340aef9885f2a4bbe92e894a724ac3c568c8f97853ad07c0266c8c6a3ca0929f1e8f11231884429fc4d9ae55fee896a10ce707c3ed7e734e44727a39574501a532683109c2abacaba283c31b4bd2f53c3ee37e352cee34f9e503bd80c0622ad79c6dcee883547c6a3b325",16),
-            new BigInteger("e7e8942720a877517273a356053ea2a1bc0c94aa72d55c6e86296b2dfc967948c0a72cbccca7eacb35706e09a1df55a1535bd9b3cc34160b3b6dcd3eda8e6443",16),
-            new BigInteger("b69dca1cf7d4d7ec81e75b90fcca874abcde123fd2700180aa90479b6e48de8d67ed24f9f19d85ba275874f542cd20dc723e6963364a1f9425452b269a6799fd",16),
-            new BigInteger("28fa13938655be1f8a159cbaca5a72ea190c30089e19cd274a556f36c4f6e19f554b34c077790427bbdd8dd3ede2448328f385d81b30e8e43b2fffa027861979",16),
-            new BigInteger("1a8b38f398fa712049898d7fb79ee0a77668791299cdfa09efc0e507acb21ed74301ef5bfd48be455eaeb6e1678255827580a8e4e8e14151d1510a82a3f2e729",16),
-            new BigInteger("27156aba4126d24a81f3a528cbfb27f56886f840a9f6e86e17a44b94fe9319584b8e22fdde1e5a2e3bd8aa5ba8d8584194eb2190acf832b847f13a3d24a79f4d",16));
-
-        KeyFactory fact = KeyFactory.getInstance("RSA", "BC");
-
-        return new KeyPair(fact.generatePublic(pubKeySpec), fact.generatePrivate(privKeySpec));
-    }
-
-    private void rfc4491Test()
-       throws Exception
-    {
-        CertificateFactory certFact = CertificateFactory.getInstance("X.509", "BC");
-
-        X509Certificate x509 = (X509Certificate)certFact.generateCertificate(new ByteArrayInputStream(gostRFC4491_94));
-
-        x509.verify(x509.getPublicKey(), "BC");
-
-        x509 = (X509Certificate)certFact.generateCertificate(new ByteArrayInputStream(gostRFC4491_2001));
-
-        x509.verify(x509.getPublicKey(), "BC");
-    }
-
-    private void checkComparison(byte[] encCert)
-        throws NoSuchProviderException, CertificateException
-    {
-        CertificateFactory bcFact = CertificateFactory.getInstance("X.509", "BC");
-        CertificateFactory sunFact = CertificateFactory.getInstance("X.509", "SUN");
-
-        X509Certificate bcCert = (X509Certificate)bcFact.generateCertificate(new ByteArrayInputStream(encCert));
-        X509Certificate sunCert = (X509Certificate)sunFact.generateCertificate(new ByteArrayInputStream(encCert));
-
-        if (!bcCert.equals(sunCert) || !sunCert.equals(bcCert))
-        {
-            fail("BC/Sun equals test failed");
-        }
-
-        // Yes, they actually changed hashCode() on a certificate in JDK 1.8...
-//        if (bcCert.hashCode() != sunCert.hashCode())
-//        {
-//            fail("BC/Sun hashCode test failed");
-//        }
-    }
-
-    private void testV1CRL()
-        throws Exception
-    {
-        byte[] certData = Streams.readAll(this.getClass().getResourceAsStream("ThawteSGCCA.cer"));
-        byte[] crlData = Streams.readAll(this.getClass().getResourceAsStream("ThawteSGCCA.crl"));
-
-        // verify CRL with default (JCE) provider
-        CertificateFactory jceFac = CertificateFactory.getInstance("X.509");
-
-        X509Certificate jceIssuer = (X509Certificate)
-            jceFac.generateCertificate(new ByteArrayInputStream(certData));
-
-        X509CRL jceCRL = (X509CRL)jceFac.generateCRL(new ByteArrayInputStream(crlData));
-
-        jceCRL.verify(jceIssuer.getPublicKey());
-
-        // verify CRL with BC provider
-        CertificateFactory bcFac = CertificateFactory.getInstance("X.509", "BC");
-
-        X509Certificate bcIssuer = (X509Certificate)
-            bcFac.generateCertificate(new ByteArrayInputStream(certData));
-
-        X509CRL bcCRL = (X509CRL)bcFac.generateCRL(new ByteArrayInputStream(crlData));
-
-        jceCRL.verify(bcIssuer.getPublicKey());
-
-        bcCRL.verify(bcIssuer.getPublicKey());
-
-        if (!"SHA1WITHRSA".equals(bcCRL.getSigAlgName()))
-        {
-            fail("signature ID not matched in CRL");
-        }
-
-        if (!"SHA1WITHRSA".equals(bcIssuer.getSigAlgName()))
-        {
-            fail("signature ID not matched in certificate");
-        }
-    }
-
-    private void testCertPathEncAvailableTest()
-        throws Exception
-    {
-        CertificateFactory certFact = CertificateFactory.getInstance("X.509", "BC");
-
-        Iterator it = certFact.getCertPathEncodings();
-
-        if (!"PkiPath".equals(it.next()))
-        {
-            fail("available enc 1 wrong");
-        }
-        if (!"PEM".equals(it.next()))
-        {
-            fail("available enc 2 wrong");
-        }
-        if (!"PKCS7".equals(it.next()))
-        {
-            fail("available enc 3 wrong");
-        }
-
-        if (it.hasNext())
-        {
-            fail("wrong number of encodings");
-        }
-    }
-
-    public void performTest()
-        throws Exception
-    {
-        testV1CRL();
-
-        checkCertificate(1, cert1);
-        checkCertificate(2, cert2);
-        checkCertificate(3, cert3);
-        checkCertificate(4, cert4);
-        checkCertificate(5, cert5);
-        checkCertificate(6, oldEcdsa);
-        checkCertificate(7, cert7);
-
-        checkComparison(cert1);
-
-        checkKeyUsage(8, keyUsage);
-        checkSelfSignedCertificate(9, uncompressedPtEC, "ECDSA");
-        checkNameCertificate(10, nameCert);
-
-        checkSelfSignedCertificate(11, probSelfSignedCert, "SHA1WITHRSA");
-        checkSelfSignedCertificate(12, gostCA1, "GOST3410");
-        checkSelfSignedCertificate(13, gostCA2, "GOST3411WITHECGOST3410");
-        checkSelfSignedCertificate(14, gost341094base, "GOST3410");
-        checkSelfSignedCertificate(15, gost34102001base, "GOST3411WITHECGOST3410");
-        checkSelfSignedCertificate(16, gost341094A, "GOST3410");
-        checkSelfSignedCertificate(17, gost341094B, "GOST3410");
-        checkSelfSignedCertificate(18, gost34102001A, "GOST3411WITHECGOST3410");
-
-        try
-        {
-            checkSelfSignedCertificate(19, uaczo1, "GOST3411WITHDSTU4145LE");
-            checkSelfSignedCertificate(20, uaczo2, "GOST3411WITHDSTU4145LE");
-            checkSelfSignedCertificate(21, uaczo3, "GOST3411WITHDSTU4145LE");
-            checkSelfSignedCertificate(22, uaczo4, "GOST3411WITHDSTU4145LE");
-        }
-        catch (Exception e)
-        {
-            if (e instanceof NoSuchAlgorithmException)
-            {
-                // ignore - only valid for jdk1.5+
-            }
-        }
-
-        checkCRL(1, crl1);
-
-        pemTest();
-        pkcs7Test();
-        rfc4491Test();
-        
-        testForgedSignature();
-
-        checkCertificate(18, emptyDNCert);
-
-        testCertPathEncAvailableTest();
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        Security.addProvider(new BouncyCastleProvider());
-
-        runTest(new CertTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/CertUniqueIDTest.java b/bcprov/src/main/java/org/bouncycastle/jce/provider/test/CertUniqueIDTest.java
deleted file mode 100644
index 283c50b..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/CertUniqueIDTest.java
+++ /dev/null
@@ -1,178 +0,0 @@
-package org.bouncycastle.jce.provider.test;
-
-import java.math.BigInteger;
-import java.security.KeyFactory;
-import java.security.PrivateKey;
-import java.security.PublicKey;
-import java.security.Security;
-import java.security.cert.X509Certificate;
-import java.security.spec.RSAPrivateCrtKeySpec;
-import java.security.spec.RSAPublicKeySpec;
-import java.util.Date;
-import java.util.Set;
-import java.util.Vector;
-
-import org.bouncycastle.jce.X509Principal;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.test.SimpleTest;
-import org.bouncycastle.x509.X509V3CertificateGenerator;
-
-public class CertUniqueIDTest
-    extends SimpleTest
-{
-  public String getName()
-  {
-      return "CertUniqueID";
-  }
-
-  public void performTest() throws Exception
-  {
-    checkCreation1();
-  }
-
-  /**
-   * we generate a self signed certificate for the sake of testing - RSA
-   */
-  public void checkCreation1()
-      throws Exception
-  {
-      //
-      // a sample key pair.
-      //
-      RSAPublicKeySpec pubKeySpec = new RSAPublicKeySpec(
-          new BigInteger("b4a7e46170574f16a97082b22be58b6a2a629798419be12872a4bdba626cfae9900f76abfb12139dce5de56564fab2b6543165a040c606887420e33d91ed7ed7", 16),
-          new BigInteger("11", 16));
-
-      RSAPrivateCrtKeySpec privKeySpec = new RSAPrivateCrtKeySpec(
-          new BigInteger("b4a7e46170574f16a97082b22be58b6a2a629798419be12872a4bdba626cfae9900f76abfb12139dce5de56564fab2b6543165a040c606887420e33d91ed7ed7", 16),
-          new BigInteger("11", 16),
-          new BigInteger("9f66f6b05410cd503b2709e88115d55daced94d1a34d4e32bf824d0dde6028ae79c5f07b580f5dce240d7111f7ddb130a7945cd7d957d1920994da389f490c89", 16),
-          new BigInteger("c0a0758cdf14256f78d4708c86becdead1b50ad4ad6c5c703e2168fbf37884cb", 16),
-          new BigInteger("f01734d7960ea60070f1b06f2bb81bfac48ff192ae18451d5e56c734a5aab8a5", 16),
-          new BigInteger("b54bb9edff22051d9ee60f9351a48591b6500a319429c069a3e335a1d6171391", 16),
-          new BigInteger("d3d83daf2a0cecd3367ae6f8ae1aeb82e9ac2f816c6fc483533d8297dd7884cd", 16),
-          new BigInteger("b8f52fc6f38593dabb661d3f50f8897f8106eee68b1bce78a95b132b4e5b5d19", 16));
-
-      //
-      // set up the keys
-      //
-      PrivateKey          privKey;
-      PublicKey           pubKey;
-
-      KeyFactory  fact = KeyFactory.getInstance("RSA", "BC");
-
-      privKey = fact.generatePrivate(privKeySpec);
-      pubKey = fact.generatePublic(pubKeySpec);
-
-      //
-      // distinguished name table.
-      //
-      Vector                      ord = new Vector();
-      Vector                      values = new Vector();
-
-      ord.addElement(X509Principal.C);
-      ord.addElement(X509Principal.O);
-      ord.addElement(X509Principal.L);
-      ord.addElement(X509Principal.ST);
-      ord.addElement(X509Principal.E);
-
-      values.addElement("AU");
-      values.addElement("The Legion of the Bouncy Castle");
-      values.addElement("Melbourne");
-      values.addElement("Victoria");
-      values.addElement("feedback-crypto@bouncycastle.org");
-
-      //
-      // extensions
-      //
-
-      //
-      // create the certificate - version 3 - without subject unique ID
-      //
-      X509V3CertificateGenerator  certGen = new X509V3CertificateGenerator();
-
-      certGen.setSerialNumber(BigInteger.valueOf(1));
-      certGen.setIssuerDN(new X509Principal(ord, values));
-      certGen.setNotBefore(new Date(System.currentTimeMillis() - 50000));
-      certGen.setNotAfter(new Date(System.currentTimeMillis() + 50000));
-      certGen.setSubjectDN(new X509Principal(ord, values));
-      certGen.setPublicKey(pubKey);
-      certGen.setSignatureAlgorithm("SHA256WithRSAEncryption");
-
-      X509Certificate cert = certGen.generate(privKey);
-
-      cert.checkValidity(new Date());
-
-      cert.verify(pubKey);
-
-      Set dummySet = cert.getNonCriticalExtensionOIDs();
-      if (dummySet != null)
-      {
-          fail("non-critical oid set should be null");
-      }
-      dummySet = cert.getCriticalExtensionOIDs();
-      if (dummySet != null)
-      {
-          fail("critical oid set should be null");
-      }
-
-      //
-      // create the certificate - version 3 - with subject unique ID
-      //
-      certGen = new X509V3CertificateGenerator();
-
-      certGen.setSerialNumber(BigInteger.valueOf(1));
-      certGen.setIssuerDN(new X509Principal(ord, values));
-      certGen.setNotBefore(new Date(System.currentTimeMillis() - 50000));
-      certGen.setNotAfter(new Date(System.currentTimeMillis() + 50000));
-      certGen.setSubjectDN(new X509Principal(ord, values));
-      certGen.setPublicKey(pubKey);
-      certGen.setSignatureAlgorithm("MD5WithRSAEncryption");
-
-      boolean[] subjectUniqID = {true, false, false, false, true, false, false, true, false, true, true};
-
-      certGen.setSubjectUniqueID(subjectUniqID);
-
-      boolean[] issuerUniqID = {false, false, true, false, true, false, false, false, true, false, false, true, false, true, true};
-
-      certGen.setIssuerUniqueID(issuerUniqID);
-
-      cert = certGen.generate(privKey);
-
-      cert.checkValidity(new Date());
-
-      cert.verify(pubKey);
-
-      boolean[] subjectUniqueId = cert.getSubjectUniqueID();
-      if (!Arrays.areEqual(subjectUniqID, subjectUniqueId))
-      {
-          fail("Subject unique id is not correct, original: "+arrayToString(subjectUniqID)+", from cert: "+arrayToString(subjectUniqueId));
-      }
-
-      boolean[] issuerUniqueId = cert.getIssuerUniqueID();
-      if (!Arrays.areEqual(issuerUniqID, issuerUniqueId))
-      {
-          fail("Issuer unique id is not correct, original: "+arrayToString(issuerUniqID)+", from cert: "+arrayToString(subjectUniqueId));
-      }
-  }
-
-  private String arrayToString(boolean[] array)
-  {
-      StringBuffer b = new StringBuffer();
-
-      for (int i = 0; i != array.length; i++)
-      {
-          b.append(array[i] ? "1" : "0");
-      }
-
-      return b.toString();
-  }
-  public static void main(
-      String[]    args)
-  {
-      Security.addProvider(new BouncyCastleProvider());
-
-      runTest(new CertUniqueIDTest());
-  }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/CipherStreamTest.java b/bcprov/src/main/java/org/bouncycastle/jce/provider/test/CipherStreamTest.java
deleted file mode 100644
index 0110d22..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/CipherStreamTest.java
+++ /dev/null
@@ -1,354 +0,0 @@
-package org.bouncycastle.jce.provider.test;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.security.InvalidKeyException;
-import java.security.Key;
-import java.security.PrivateKey;
-import java.security.PublicKey;
-import java.security.Security;
-
-import javax.crypto.Cipher;
-import javax.crypto.CipherInputStream;
-import javax.crypto.CipherOutputStream;
-import javax.crypto.KeyGenerator;
-import javax.crypto.SecretKey;
-import javax.crypto.ShortBufferException;
-import javax.crypto.spec.IvParameterSpec;
-import javax.crypto.spec.SecretKeySpec;
-
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-
-/**
- * check that cipher input/output streams are working correctly
- */
-public class CipherStreamTest
-    extends SimpleTest
-{
-
-    private static byte[] RK = Hex.decode("0123456789ABCDEF");
-    private static byte[] RIN = Hex.decode("4e6f772069732074");
-    private static byte[] ROUT = Hex.decode("3afbb5c77938280d");
-
-    private static byte[] SIN = Hex.decode(
-                    "00000000000000000000000000000000"
-                  + "00000000000000000000000000000000"
-                  + "00000000000000000000000000000000"
-                  + "00000000000000000000000000000000");
-    private static final byte[] SK = Hex.decode("80000000000000000000000000000000");
-    private static final byte[] SIV = Hex.decode("0000000000000000");
-    private static final byte[] SOUT = Hex.decode(
-          "4DFA5E481DA23EA09A31022050859936"
-        + "DA52FCEE218005164F267CB65F5CFD7F"
-        + "2B4F97E0FF16924A52DF269515110A07"
-        + "F9E460BC65EF95DA58F740B7D1DBB0AA");
-
-    private static final byte[] XSK = Hex.decode("d5c7f6797b7e7e9c1d7fd2610b2abf2bc5a7885fb3ff78092fb3abe8986d35e2");
-    private static final byte[] XSIV = Hex.decode("744e17312b27969d826444640e9c4a378ae334f185369c95");
-    private static final byte[] XSIN = Hex.decode("7758298c628eb3a4b6963c5445ef66971222be5d1a4ad839715d1188071739b77cc6e05d5410f963a64167629757");
-    private static final byte[] XSOUT= Hex.decode("27b8cfe81416a76301fd1eec6a4d99675069b2da2776c360db1bdfea7c0aa613913e10f7a60fec04d11e65f2d64e");
-
-    private static final byte[] CHAK = Hex.decode("80000000000000000000000000000000");
-    private static final byte[] CHAIV = Hex.decode("0000000000000000");
-    private static final byte[] CHAIN =  Hex.decode(
-                                              "00000000000000000000000000000000"
-                                            + "00000000000000000000000000000000"
-                                            + "00000000000000000000000000000000"
-                                            + "00000000000000000000000000000000");
-    private static final byte[] CHAOUT = Hex.decode("FBB87FBB8395E05DAA3B1D683C422046"
-                                                    + "F913985C2AD9B23CFC06C1D8D04FF213"
-                                                    + "D44A7A7CDB84929F915420A8A3DC58BF"
-                                                    + "0F7ECB4B1F167BB1A5E6153FDAF4493D");
-
-    private static final byte[] HCIN = new byte[64];
-    private static final byte[] HCIV = new byte[32];
-
-    private static final byte[] HCK256A = new byte[32];
-    private static final byte[] HC256A = Hex.decode(
-          "5B078985D8F6F30D42C5C02FA6B67951"
-        + "53F06534801F89F24E74248B720B4818"
-        + "CD9227ECEBCF4DBF8DBF6977E4AE14FA"
-        + "E8504C7BC8A9F3EA6C0106F5327E6981");
-
-    private static final byte[] HCK128A = new byte[16];
-    private static final byte[] HC128A = Hex.decode(
-          "82001573A003FD3B7FD72FFB0EAF63AA"
-        + "C62F12DEB629DCA72785A66268EC758B"
-        + "1EDB36900560898178E0AD009ABF1F49"
-        + "1330DC1C246E3D6CB264F6900271D59C");
-
-    private static final byte[] GRAIN_V1 = Hex.decode("0123456789abcdef1234");
-    private static final byte[] GRAIN_V1_IV = Hex.decode("0123456789abcdef");
-    private static final byte[] GRAIN_V1_IN = new byte[10];
-    private static final byte[] GRAIN_V1_OUT = Hex.decode("7f362bd3f7abae203664");
-
-    private static final byte[] GRAIN_128 = Hex.decode("0123456789abcdef123456789abcdef0");
-    private static final byte[] GRAIN_128_IV = Hex.decode("0123456789abcdef12345678");
-    private static final byte[] GRAIN_128_IN = new byte[16];
-    private static final byte[] GRAIN_128_OUT = Hex.decode("afb5babfa8de896b4b9c6acaf7c4fbfd");
-
-    public CipherStreamTest()
-    {
-    }
-
-    private void runTest(
-        String  name)
-        throws Exception
-    {
-        String lCode = "ABCDEFGHIJKLMNOPQRSTUVWXY0123456789";
-        KeyGenerator            kGen;
-
-        if (name.indexOf('/') < 0)
-        {
-            kGen = KeyGenerator.getInstance(name, "BC");
-        }
-        else
-        {
-            kGen = KeyGenerator.getInstance(name.substring(0, name.indexOf('/')), "BC");
-        }
-
-        Cipher                  in = Cipher.getInstance(name, "BC");
-        Cipher                  out = Cipher.getInstance(name, "BC");
-        Key                     key = kGen.generateKey();
-        ByteArrayInputStream    bIn = new ByteArrayInputStream(lCode.getBytes());
-        ByteArrayOutputStream   bOut = new ByteArrayOutputStream();
-
-        in.init(Cipher.ENCRYPT_MODE, key);
-        if (in.getIV() != null)
-        {
-            out.init(Cipher.DECRYPT_MODE, key, new IvParameterSpec(in.getIV()));
-        }
-        else
-        {
-            out.init(Cipher.DECRYPT_MODE, key);
-        }
-
-        CipherInputStream       cIn = new CipherInputStream(bIn, in);
-        CipherOutputStream      cOut = new CipherOutputStream(bOut, out);
-
-        int c;
-
-        while ((c = cIn.read()) >= 0)
-        {
-            cOut.write(c);
-        }
-
-        cIn.close();
-
-        cOut.flush();
-        cOut.close();
-
-        String  res = new String(bOut.toByteArray());
-
-        if (!res.equals(lCode))
-        {
-            fail("Failed - decrypted data doesn't match.");
-        }
-    }
-
-    private void testAlgorithm(String name, byte[] keyBytes, byte[] iv, byte[] plainText, byte[] cipherText)
-        throws Exception
-    {
-        SecretKey key = new SecretKeySpec(keyBytes, name);
-        Cipher    in = Cipher.getInstance(name, "BC");
-        Cipher    out = Cipher.getInstance(name, "BC");
-
-        if (iv != null)
-        {
-            in.init(Cipher.ENCRYPT_MODE, key, new IvParameterSpec(iv));
-            out.init(Cipher.DECRYPT_MODE, key, new IvParameterSpec(iv));
-        }
-        else
-        {
-            in.init(Cipher.ENCRYPT_MODE, key);
-            out.init(Cipher.DECRYPT_MODE, key);
-        }
-
-        byte[] enc = in.doFinal(plainText);
-        if (!areEqual(enc, cipherText))
-        {
-            fail(name + ": cipher text doesn't match got " + new String(Hex.encode(enc)));
-        }
-
-        byte[] dec = out.doFinal(enc);
-
-        if (!areEqual(dec, plainText))
-        {
-            fail(name + ": plain text doesn't match");
-        }
-    }
-
-    private void testException(
-        String  name)
-    {
-        try
-        {
-            byte[] key128 = {
-                    (byte)128, (byte)131, (byte)133, (byte)134,
-                    (byte)137, (byte)138, (byte)140, (byte)143,
-                    (byte)128, (byte)131, (byte)133, (byte)134,
-                    (byte)137, (byte)138, (byte)140, (byte)143 };
-
-            byte[] key256 = {
-                    (byte)128, (byte)131, (byte)133, (byte)134,
-                    (byte)137, (byte)138, (byte)140, (byte)143,
-                    (byte)128, (byte)131, (byte)133, (byte)134,
-                    (byte)137, (byte)138, (byte)140, (byte)143,
-                    (byte)128, (byte)131, (byte)133, (byte)134,
-                    (byte)137, (byte)138, (byte)140, (byte)143,
-                    (byte)128, (byte)131, (byte)133, (byte)134,
-                    (byte)137, (byte)138, (byte)140, (byte)143 };
-
-            byte[] keyBytes;
-            if (name.equals("HC256") || name.equals("XSalsa20"))
-            {
-                keyBytes = key256;
-            }
-            else
-            {
-                keyBytes = key128;
-            }
-
-            SecretKeySpec cipherKey = new SecretKeySpec(keyBytes, name);
-            Cipher ecipher = Cipher.getInstance(name, "BC");
-            ecipher.init(Cipher.ENCRYPT_MODE, cipherKey);
-
-            byte[] cipherText = new byte[0];
-            try
-            {
-                // According specification Method engineUpdate(byte[] input,
-                // int inputOffset, int inputLen, byte[] output, int
-                // outputOffset)
-                // throws ShortBufferException - if the given output buffer is
-                // too
-                // small to hold the result
-                ecipher.update(new byte[20], 0, 20, cipherText);
-
-                fail("failed exception test - no ShortBufferException thrown");
-            }
-            catch (ShortBufferException e)
-            {
-                // ignore
-            }
-
-            try
-            {
-                Cipher c = Cipher.getInstance(name, "BC");
-
-                Key k = new PublicKey()
-                {
-
-                    public String getAlgorithm()
-                    {
-                        return "STUB";
-                    }
-
-                    public String getFormat()
-                    {
-                        return null;
-                    }
-
-                    public byte[] getEncoded()
-                    {
-                        return null;
-                    }
-
-                };
-
-                c.init(Cipher.ENCRYPT_MODE, k);
-
-                fail("failed exception test - no InvalidKeyException thrown for public key");
-            }
-            catch (InvalidKeyException e)
-            {
-                // okay
-            }
-
-            try
-            {
-                Cipher c = Cipher.getInstance(name, "BC");
-
-                Key k = new PrivateKey()
-                {
-
-                    public String getAlgorithm()
-                    {
-                        return "STUB";
-                    }
-
-                    public String getFormat()
-                    {
-                        return null;
-                    }
-
-                    public byte[] getEncoded()
-                    {
-                        return null;
-                    }
-
-                };
-
-                c.init(Cipher.DECRYPT_MODE, k);
-
-                fail("failed exception test - no InvalidKeyException thrown for private key");
-            }
-            catch (InvalidKeyException e)
-            {
-                // okay
-            }
-        }
-        catch (Exception e)
-        {
-            fail("unexpected exception.", e);
-        }
-    }
-
-    public void performTest()
-        throws Exception
-    {
-        runTest("RC4");
-        testException("RC4");
-        testAlgorithm("RC4", RK, null, RIN, ROUT);
-        runTest("Salsa20");
-        testException("Salsa20");
-        testAlgorithm("Salsa20", SK, SIV, SIN, SOUT);
-        runTest("XSalsa20");
-        testException("XSalsa20");
-        testAlgorithm("XSalsa20", XSK, XSIV, XSIN, XSOUT);
-        runTest("ChaCha");
-        testException("ChaCha");
-        testAlgorithm("ChaCha", CHAK, CHAIV, CHAIN, CHAOUT);
-        runTest("HC128");
-        testException("HC128");
-        testAlgorithm("HC128", HCK128A, HCIV, HCIN, HC128A);
-        runTest("HC256");
-        testException("HC256");
-        testAlgorithm("HC256", HCK256A, HCIV, HCIN, HC256A);
-        runTest("VMPC");
-        testException("VMPC");
-        //testAlgorithm("VMPC", a, iv, in, a);
-        runTest("VMPC-KSA3");
-        testException("VMPC-KSA3");
-        //testAlgorithm("VMPC-KSA3", a, iv, in, a);
-        testAlgorithm("Grainv1", GRAIN_V1, GRAIN_V1_IV, GRAIN_V1_IN, GRAIN_V1_OUT);
-        testAlgorithm("Grain128", GRAIN_128, GRAIN_128_IV, GRAIN_128_IN, GRAIN_128_OUT);
-        runTest("DES/ECB/PKCS7Padding");
-        runTest("DES/CFB8/NoPadding");
-    }
-
-    public String getName()
-    {
-        return "CipherStreamTest";
-    }
-
-
-    public static void main(
-        String[]    args)
-    {
-        Security.addProvider(new BouncyCastleProvider());
-
-        runTest(new CipherStreamTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/CipherStreamTest2.java b/bcprov/src/main/java/org/bouncycastle/jce/provider/test/CipherStreamTest2.java
deleted file mode 100644
index 2201c8a..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/CipherStreamTest2.java
+++ /dev/null
@@ -1,519 +0,0 @@
-package org.bouncycastle.jce.provider.test;
-
-import java.io.*;
-import java.security.Key;
-import java.security.Security;
-
-import javax.crypto.*;
-import javax.crypto.spec.IvParameterSpec;
-
-import org.bouncycastle.crypto.io.InvalidCipherTextIOException;
-import org.bouncycastle.jcajce.io.CipherInputStream;
-import org.bouncycastle.jcajce.io.CipherOutputStream;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.test.SimpleTest;
-
-public class CipherStreamTest2
-    extends SimpleTest
-{
-    private int streamSize;
-
-    public String getName()
-    {
-        return "CipherStreamTest2";
-    }
-
-    private void testModes(String algo, String[] transforms, boolean authenticated)
-        throws Exception
-    {
-        Key key = generateKey(algo);
-        for (int i = 0; i != transforms.length; i++)
-        {
-            String transform = transforms[i];
-            String cipherName = algo + transform;
-
-            boolean cts = transform.indexOf("CTS") > -1;
-            if (cts && streamSize < Cipher.getInstance(cipherName, "BC").getBlockSize())
-            {
-                continue;
-            }
-            testWriteRead(cipherName, key, authenticated, true, false);
-            testWriteRead(cipherName, key, authenticated, true, true);
-            testWriteRead(cipherName, key, authenticated, false, false);
-            testWriteRead(cipherName, key, authenticated, false, true);
-            testReadWrite(cipherName, key, authenticated, true, false);
-            testReadWrite(cipherName, key, authenticated, true, true);
-            testReadWrite(cipherName, key, authenticated, false, false);
-            testReadWrite(cipherName, key, authenticated, false, true);
-
-            if (!cts)
-            {
-                testWriteReadEmpty(cipherName, key, authenticated, true, false);
-                testWriteReadEmpty(cipherName, key, authenticated, true, true);
-                testWriteReadEmpty(cipherName, key, authenticated, false, false);
-                testWriteReadEmpty(cipherName, key, authenticated, false, true);
-            }
-
-            if (authenticated)
-            {
-                testTamperedRead(cipherName, key, true, true);
-                testTamperedRead(cipherName, key, true, false);
-                testTruncatedRead(cipherName, key, true, true);
-                testTruncatedRead(cipherName, key, true, false);
-                testTamperedWrite(cipherName, key, true, true);
-                testTamperedWrite(cipherName, key, true, false);
-            }
-        }
-    }
-
-    private InputStream createInputStream(byte[] data, Cipher cipher, boolean useBc)
-    {
-        ByteArrayInputStream bytes = new ByteArrayInputStream(data);
-        // cast required for earlier JDK
-        return useBc ? (InputStream)new CipherInputStream(bytes, cipher) : (InputStream)new javax.crypto.CipherInputStream(bytes, cipher);
-    }
-
-    private OutputStream createOutputStream(ByteArrayOutputStream bytes, Cipher cipher, boolean useBc)
-    {
-        // cast required for earlier JDK
-        return useBc ? (OutputStream)new CipherOutputStream(bytes, cipher) : (OutputStream)new javax.crypto.CipherOutputStream(bytes, cipher);
-    }
-
-    /**
-     * Test tampering of ciphertext followed by read from decrypting CipherInputStream
-     */
-    private void testTamperedRead(String name, Key key, boolean authenticated, boolean useBc)
-        throws Exception
-    {
-        Cipher encrypt = Cipher.getInstance(name, "BC");
-        Cipher decrypt = Cipher.getInstance(name, "BC");
-        encrypt.init(Cipher.ENCRYPT_MODE, key);
-        if (encrypt.getIV() != null)
-        {
-            decrypt.init(Cipher.DECRYPT_MODE, key, new IvParameterSpec(encrypt.getIV()));
-        }
-        else
-        {
-            decrypt.init(Cipher.DECRYPT_MODE, key);
-        }
-
-        byte[] ciphertext = encrypt.doFinal(new byte[streamSize]);
-
-        // Tamper
-        ciphertext[0] += 1;
-
-        InputStream input = createInputStream(ciphertext, decrypt, useBc);
-        try
-        {
-            while (input.read() >= 0)
-            {
-            }
-            fail("Expected invalid ciphertext after tamper and read : " + name, authenticated, useBc);
-        }
-        catch (InvalidCipherTextIOException e)
-        {
-            // Expected
-        }
-        catch (IOException e)       //     cause will be AEADBadTagException
-        {
-            // Expected
-        }
-        try
-        {
-            input.close();
-        }
-        catch (Exception e)
-        {
-            fail("Unexpected exception : " + name, e, authenticated, useBc);
-        }
-    }
-
-    /**
-     * Test truncation of ciphertext to make tag calculation impossible, followed by read from
-     * decrypting CipherInputStream
-     */
-    private void testTruncatedRead(String name, Key key, boolean authenticated, boolean useBc)
-        throws Exception
-    {
-        Cipher encrypt = Cipher.getInstance(name, "BC");
-        Cipher decrypt = Cipher.getInstance(name, "BC");
-        encrypt.init(Cipher.ENCRYPT_MODE, key);
-        if (encrypt.getIV() != null)
-        {
-            decrypt.init(Cipher.DECRYPT_MODE, key, new IvParameterSpec(encrypt.getIV()));
-        }
-        else
-        {
-            decrypt.init(Cipher.DECRYPT_MODE, key);
-        }
-
-        byte[] ciphertext = encrypt.doFinal(new byte[streamSize]);
-
-        // Truncate to just smaller than complete tag
-        byte[] truncated = new byte[ciphertext.length - streamSize - 1];
-        System.arraycopy(ciphertext, 0, truncated, 0, truncated.length);
-
-        // Tamper
-        ciphertext[0] += 1;
-
-        InputStream input = createInputStream(truncated, decrypt, useBc);
-        while (true)
-        {
-            int read = 0;
-            try
-            {
-                read = input.read();
-            }
-            catch (InvalidCipherTextIOException e)
-            {
-                // Expected
-                break;
-            }
-            catch (IOException e)
-            {
-                // Expected from JDK 1.7 on
-                break;
-            }
-            catch (Exception e)
-            {
-                fail("Unexpected exception : " + name, e, authenticated, useBc);
-                break;
-            }
-            if (read < 0)
-            {
-                fail("Expected invalid ciphertext after truncate and read : " + name, authenticated, useBc);
-                break;
-            }
-        }
-        try
-        {
-            input.close();
-        }
-        catch (Exception e)
-        {
-            fail("Unexpected exception : " + name, e, authenticated, useBc);
-        }
-    }
-
-    /**
-     * Test tampering of ciphertext followed by write to decrypting CipherOutputStream
-     */
-    private void testTamperedWrite(String name, Key key, boolean authenticated, boolean useBc)
-        throws Exception
-    {
-        Cipher encrypt = Cipher.getInstance(name, "BC");
-        Cipher decrypt = Cipher.getInstance(name, "BC");
-        encrypt.init(Cipher.ENCRYPT_MODE, key);
-        if (encrypt.getIV() != null)
-        {
-            decrypt.init(Cipher.DECRYPT_MODE, key, new IvParameterSpec(encrypt.getIV()));
-        }
-        else
-        {
-            decrypt.init(Cipher.DECRYPT_MODE, key);
-        }
-
-        byte[] ciphertext = encrypt.doFinal(new byte[streamSize]);
-
-        // Tamper
-        ciphertext[0] += 1;
-
-        ByteArrayOutputStream plaintext = new ByteArrayOutputStream();
-        OutputStream output = createOutputStream(plaintext, decrypt, useBc);
-
-        for (int i = 0; i < ciphertext.length; i++)
-        {
-            output.write(ciphertext[i]);
-        }
-        try
-        {
-            output.close();
-            fail("Expected invalid ciphertext after tamper and write : " + name, authenticated, useBc);
-        }
-        catch (InvalidCipherTextIOException e)
-        {
-            // Expected
-        }
-    }
-
-    /**
-     * Test CipherOutputStream in ENCRYPT_MODE, CipherInputStream in DECRYPT_MODE
-     */
-    private void testWriteRead(String name, Key key, boolean authenticated, boolean useBc, boolean blocks)
-        throws Exception
-    {
-        byte[] data = new byte[streamSize];
-        for (int i = 0; i < data.length; i++)
-        {
-            data[i] = (byte)(i % 255);
-        }
-
-        testWriteRead(name, key, authenticated, useBc, blocks, data);
-    }
-
-    /**
-     * Test CipherOutputStream in ENCRYPT_MODE, CipherInputStream in DECRYPT_MODE
-     */
-    private void testWriteReadEmpty(String name, Key key, boolean authenticated, boolean useBc, boolean blocks)
-        throws Exception
-    {
-        byte[] data = new byte[0];
-
-        testWriteRead(name, key, authenticated, useBc, blocks, data);
-    }
-
-    private void testWriteRead(String name, Key key, boolean authenticated, boolean useBc, boolean blocks, byte[] data)
-    {
-        ByteArrayOutputStream bOut = new ByteArrayOutputStream();
-
-        try
-        {
-            Cipher encrypt = Cipher.getInstance(name, "BC");
-            Cipher decrypt = Cipher.getInstance(name, "BC");
-            encrypt.init(Cipher.ENCRYPT_MODE, key);
-            if (encrypt.getIV() != null)
-            {
-                decrypt.init(Cipher.DECRYPT_MODE, key, new IvParameterSpec(encrypt.getIV()));
-            }
-            else
-            {
-                decrypt.init(Cipher.DECRYPT_MODE, key);
-            }
-
-            OutputStream cOut = createOutputStream(bOut, encrypt, useBc);
-            if (blocks)
-            {
-                int chunkSize = Math.max(1, data.length / 8);
-                for (int i = 0; i < data.length; i += chunkSize)
-                {
-                    cOut.write(data, i, Math.min(chunkSize, data.length - i));
-                }
-            }
-            else
-            {
-                for (int i = 0; i < data.length; i++)
-                {
-                    cOut.write(data[i]);
-                }
-            }
-            cOut.close();
-
-            byte[] cipherText = bOut.toByteArray();
-            bOut.reset();
-            InputStream cIn = createInputStream(cipherText, decrypt, useBc);
-
-            if (blocks)
-            {
-                byte[] block = new byte[encrypt.getBlockSize() + 1];
-                int c;
-                while ((c = cIn.read(block)) >= 0)
-                {
-                    bOut.write(block, 0, c);
-                }
-            }
-            else
-            {
-                int c;
-                while ((c = cIn.read()) >= 0)
-                {
-                    bOut.write(c);
-                }
-
-            }
-            cIn.close();
-
-        }
-        catch (Exception e)
-        {
-            fail("Unexpected exception " + name, e, authenticated, useBc);
-        }
-
-        byte[] decrypted = bOut.toByteArray();
-        if (!Arrays.areEqual(data, decrypted))
-        {
-            fail("Failed - decrypted data doesn't match: " + name, authenticated, useBc);
-        }
-    }
-
-    protected void fail(String message, boolean authenticated, boolean bc)
-    {
-        if (bc || !authenticated)
-        {
-            super.fail(message);
-        }
-        else
-        {
-            // javax.crypto.CipherInputStream/CipherOutputStream
-            // are broken wrt handling AEAD failures
-            // System.err.println("Broken JCE Streams: " + message);
-        }
-    }
-
-    protected void fail(String message, Throwable throwable, boolean authenticated, boolean bc)
-    {
-        if (bc || !authenticated)
-        {
-            super.fail(message, throwable);
-        }
-        else
-        {
-            // javax.crypto.CipherInputStream/CipherOutputStream
-            // are broken wrt handling AEAD failures
-            //System.err.println("Broken JCE Streams: " + message + " : " + throwable);
-            throwable.printStackTrace();
-        }
-    }
-
-    /**
-     * Test CipherInputStream in ENCRYPT_MODE, CipherOutputStream in DECRYPT_MODE
-     */
-    private void testReadWrite(String name, Key key, boolean authenticated, boolean useBc, boolean blocks)
-        throws Exception
-    {
-        String lCode = "ABCDEFGHIJKLMNOPQRSTU";
-
-        ByteArrayOutputStream bOut = new ByteArrayOutputStream();
-
-        try
-        {
-            Cipher in = Cipher.getInstance(name, "BC");
-            Cipher out = Cipher.getInstance(name, "BC");
-            in.init(Cipher.ENCRYPT_MODE, key);
-            if (in.getIV() != null)
-            {
-                out.init(Cipher.DECRYPT_MODE, key, new IvParameterSpec(in.getIV()));
-            }
-            else
-            {
-                out.init(Cipher.DECRYPT_MODE, key);
-            }
-
-            InputStream cIn = createInputStream(lCode.getBytes(), in, useBc);
-            OutputStream cOut = createOutputStream(bOut, out, useBc);
-
-            if (blocks)
-            {
-                byte[] block = new byte[in.getBlockSize() + 1];
-                int c;
-                while ((c = cIn.read(block)) >= 0)
-                {
-                    cOut.write(block, 0, c);
-                }
-            }
-            else
-            {
-                int c;
-                while ((c = cIn.read()) >= 0)
-                {
-                    cOut.write(c);
-                }
-            }
-
-            cIn.close();
-
-            cOut.flush();
-            cOut.close();
-
-        }
-        catch (Exception e)
-        {
-            fail("Unexpected exception " + name, e, authenticated, useBc);
-        }
-
-        String res = new String(bOut.toByteArray());
-        if (!res.equals(lCode))
-        {
-            fail("Failed - decrypted data doesn't match: " + name, authenticated, useBc);
-        }
-    }
-
-    private static Key generateKey(String name)
-        throws Exception
-    {
-        KeyGenerator kGen;
-
-        if (name.indexOf('/') < 0)
-        {
-            kGen = KeyGenerator.getInstance(name, "BC");
-        }
-        else
-        {
-            kGen = KeyGenerator.getInstance(name.substring(0, name.indexOf('/')), "BC");
-        }
-        return kGen.generateKey();
-    }
-
-    public void performTest()
-        throws Exception
-    {
-        int[] testSizes = new int[]{0, 1, 7, 8, 9, 15, 16, 17, 1023, 1024, 1025, 2047, 2048, 2049, 4095, 4096, 4097};
-        for (int i = 0; i < testSizes.length; i++)
-        {
-            this.streamSize = testSizes[i];
-            performTests();
-        }
-    }
-
-    private void performTests()
-        throws Exception
-    {
-        final String[] blockCiphers64 = new String[]{"BLOWFISH", "DES", "DESEDE", "TEA", "CAST5", "RC2", "XTEA"};
-
-        for (int i = 0; i != blockCiphers64.length; i++)
-        {
-            testModes(blockCiphers64[i], new String[]{
-                "/ECB/PKCS5Padding",
-                "/CBC/PKCS5Padding",
-                "/OFB/NoPadding",
-                "/CFB/NoPadding",
-                "/CTS/NoPadding",}, false);
-            testModes(blockCiphers64[i], new String[]{"/EAX/NoPadding"}, true);
-        }
-
-        final String[] blockCiphers128 = new String[]{
-            "AES",
-            "NOEKEON",
-            "Twofish",
-            "CAST6",
-            "SEED",
-            "Serpent",
-            "RC6",
-            "CAMELLIA"};
-
-        for (int i = 0; i != blockCiphers128.length; i++)
-        {
-            testModes(blockCiphers128[i], new String[]{
-                "/ECB/PKCS5Padding",
-                "/CBC/PKCS5Padding",
-                "/OFB/NoPadding",
-                "/CFB/NoPadding",
-                "/CTS/NoPadding",
-                "/CTR/NoPadding",
-                "/SIC/NoPadding"}, false);
-            testModes(blockCiphers128[i], new String[]{"/CCM/NoPadding", "/EAX/NoPadding", "/GCM/NoPadding", "/OCB/NoPadding"}, true);
-        }
-
-        final String[] streamCiphers = new String[]{
-            "ARC4",
-            "SALSA20",
-            "XSalsa20",
-            "ChaCha",
-            "Grainv1",
-            "Grain128",
-            "HC128",
-            "HC256"};
-
-        for (int i = 0; i != streamCiphers.length; i++)
-        {
-            testModes(streamCiphers[i], new String[]{""}, false);
-        }
-    }
-
-    public static void main(String[] args)
-    {
-        Security.addProvider(new BouncyCastleProvider());
-        runTest(new CipherStreamTest2());
-    }
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/DESedeTest.java b/bcprov/src/main/java/org/bouncycastle/jce/provider/test/DESedeTest.java
deleted file mode 100644
index 313f665..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/DESedeTest.java
+++ /dev/null
@@ -1,326 +0,0 @@
-package org.bouncycastle.jce.provider.test;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.DataInputStream;
-import java.io.IOException;
-import java.security.Key;
-import java.security.SecureRandom;
-import java.security.Security;
-
-import javax.crypto.Cipher;
-import javax.crypto.CipherInputStream;
-import javax.crypto.CipherOutputStream;
-import javax.crypto.KeyGenerator;
-import javax.crypto.SecretKey;
-import javax.crypto.SecretKeyFactory;
-import javax.crypto.spec.DESedeKeySpec;
-import javax.crypto.spec.IvParameterSpec;
-import javax.crypto.spec.SecretKeySpec;
-
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-
-/**
- * basic test class for key generation for a DES-EDE block cipher, basically
- * this just exercises the provider, and makes sure we are behaving sensibly,
- * correctness of the implementation is shown in the lightweight test classes.
- */
-public class DESedeTest
-    extends SimpleTest
-{
-    static String[] cipherTests1 =
-    {
-        "112",
-        "2f4bc6b30c893fa549d82c560d61cf3eb088aed020603de249d82c560d61cf3e529e95ecd8e05394",
-        "128",
-        "2f4bc6b30c893fa549d82c560d61cf3eb088aed020603de249d82c560d61cf3e529e95ecd8e05394",
-        "168",
-        "50ddb583a25c21e6c9233f8e57a86d40bb034af421c03096c9233f8e57a86d402fce91e8eb639f89",
-        "192",
-        "50ddb583a25c21e6c9233f8e57a86d40bb034af421c03096c9233f8e57a86d402fce91e8eb639f89",
-    };
-
-    static byte[]   input1 = Hex.decode("000102030405060708090a0b0c0d0e0fff0102030405060708090a0b0c0d0e0f");
-    
-    /**
-     * a fake random number generator - we just want to make sure the random numbers
-     * aren't random so that we get the same output, while still getting to test the
-     * key generation facilities.
-     */
-    private class FixedSecureRandom
-        extends SecureRandom
-    {
-        byte[]  seed = {
-                (byte)0xaa, (byte)0xfd, (byte)0x12, (byte)0xf6, (byte)0x59,
-                (byte)0xca, (byte)0xe6, (byte)0x34, (byte)0x89, (byte)0xb4,
-                (byte)0x79, (byte)0xe5, (byte)0x07, (byte)0x6d, (byte)0xde,
-                (byte)0xc2, (byte)0xf0, (byte)0x6c, (byte)0xb5, (byte)0x8f
-        };
-
-        public void nextBytes(
-            byte[]  bytes)
-        {
-            int offset = 0;
-
-            while ((offset + seed.length) < bytes.length)
-            {
-                System.arraycopy(seed, 0, bytes, offset, seed.length);
-                offset += seed.length;
-            }
-
-            System.arraycopy(seed, 0, bytes, offset, bytes.length - offset);
-        }
-    }
-
-    public String getName()
-    {
-        return "DESEDE";
-    }
-
-    private boolean equalArray(
-        byte[]  a,
-        byte[]  b)
-    {
-        if (a.length != b.length)
-        {
-            return false;
-        }
-
-        for (int i = 0; i != a.length; i++)
-        {
-            if (a[i] != b[i])
-            {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    private boolean equalArray(
-        byte[]  a,
-        byte[]  b,
-        int     length)
-    {
-        if (a.length < length)
-        {
-            return false;
-        }
-
-        if (b.length < length)
-        {
-            return false;
-        }
-
-        for (int i = 0; i != length; i++)
-        {
-            if (a[i] != b[i])
-            {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    private void wrapTest(
-        String      alg,
-        int     id,
-        byte[]  kek,
-        byte[]  iv,
-        byte[]  in,
-        byte[]  out)
-    {
-        try
-        {
-            Cipher wrapper = Cipher.getInstance(alg + "Wrap", "BC");
-
-            wrapper.init(Cipher.WRAP_MODE, new SecretKeySpec(kek, alg), new IvParameterSpec(iv));
-
-            try
-            {
-                byte[]  cText = wrapper.wrap(new SecretKeySpec(in, alg));
-                if (!equalArray(cText, out))
-                {
-                    fail("failed wrap test " + id  + " expected " + new String(Hex.encode(out)) + " got " + new String(Hex.encode(cText)));
-                }
-            }
-            catch (Exception e)
-            {
-                fail("failed wrap test exception " + e.toString());
-            }
-
-            wrapper.init(Cipher.UNWRAP_MODE, new SecretKeySpec(kek, alg));
-
-            try
-            {
-                Key  pText = wrapper.unwrap(out, alg, Cipher.SECRET_KEY);
-                if (!equalArray(pText.getEncoded(), in))
-                {
-                    fail("failed unwrap test " + id  + " expected " + new String(Hex.encode(in)) + " got " + new String(Hex.encode(pText.getEncoded())));
-                }
-            }
-            catch (Exception e)
-            {
-                fail("failed unwrap test exception " + e.toString());
-            }
-        }
-        catch (Exception ex)
-        {
-            fail("failed exception " + ex.toString());
-        }
-    }
-
-    public void test(
-        String      alg,
-        int         strength,
-        byte[]      input,
-        byte[]      output)
-    {
-        Key                     key = null;
-        KeyGenerator            keyGen;
-        SecureRandom            rand;
-        Cipher                  in = null;
-        Cipher                  out = null;
-        CipherInputStream       cIn;
-        CipherOutputStream      cOut;
-        ByteArrayInputStream    bIn;
-        ByteArrayOutputStream   bOut;
-
-        rand = new FixedSecureRandom();
-
-        try
-        {
-            keyGen = KeyGenerator.getInstance(alg, "BC");
-            keyGen.init(strength, rand);
-
-            key = keyGen.generateKey();
-
-            in = Cipher.getInstance(alg + "/ECB/PKCS7Padding", "BC");
-            out = Cipher.getInstance(alg + "/ECB/PKCS7Padding", "BC");
-
-            out.init(Cipher.ENCRYPT_MODE, key, rand);
-        }
-        catch (Exception e)
-        {
-            fail(alg + " failed initialisation - " + e.toString());
-        }
-
-        try
-        {
-            in.init(Cipher.DECRYPT_MODE, key);
-        }
-        catch (Exception e)
-        {
-            fail(alg + " failed initialisation - " + e.toString());
-        }
-
-        //
-        // encryption pass
-        //
-        bOut = new ByteArrayOutputStream();
-
-        cOut = new CipherOutputStream(bOut, out);
-
-        try
-        {
-            for (int i = 0; i != input.length / 2; i++)
-            {
-                cOut.write(input[i]);
-            }
-            cOut.write(input, input.length / 2, input.length - input.length / 2);
-            cOut.close();
-        }
-        catch (IOException e)
-        {
-            fail(alg + " failed encryption - " + e.toString());
-        }
-
-        byte[]    bytes;
-
-        bytes = bOut.toByteArray();
-
-        if (!equalArray(bytes, output))
-        {
-            fail(alg + " failed encryption - expected " + new String(Hex.encode(output)) + " got " + new String(Hex.encode(bytes)));
-        }
-
-        //
-        // decryption pass
-        //
-        bIn = new ByteArrayInputStream(bytes);
-
-        cIn = new CipherInputStream(bIn, in);
-
-        try
-        {
-            DataInputStream dIn = new DataInputStream(cIn);
-
-            bytes = new byte[input.length];
-
-            for (int i = 0; i != input.length / 2; i++)
-            {
-                bytes[i] = (byte)dIn.read();
-            }
-            dIn.readFully(bytes, input.length / 2, bytes.length - input.length / 2);
-        }
-        catch (Exception e)
-        {
-            fail(alg + " failed encryption - " + e.toString());
-        }
-
-        if (!equalArray(bytes, input))
-        {
-            fail(alg + " failed decryption - expected " + new String(Hex.encode(input)) + " got " + new String(Hex.encode(bytes)));
-        }
-
-        //
-        // keyspec test
-        //
-        try
-        {
-            SecretKeyFactory keyFactory = SecretKeyFactory.getInstance(alg, "BC");
-            DESedeKeySpec keySpec = (DESedeKeySpec)keyFactory.getKeySpec((SecretKey)key, DESedeKeySpec.class);
-
-            if (!equalArray(key.getEncoded(), keySpec.getKey(), 16))
-            {
-                fail(alg + " KeySpec does not match key.");
-            }
-        }
-        catch (Exception e)
-        {
-            fail(alg + " failed keyspec - " + e.toString());
-        }
-    }
-
-    public void performTest()
-    {
-        for (int i = 0; i != cipherTests1.length; i += 2)
-        {
-            test("DESEDE", Integer.parseInt(cipherTests1[i]), input1, Hex.decode(cipherTests1[i + 1]));
-        }
-
-        for (int i = 0; i != cipherTests1.length; i += 2)
-        {
-            test("TDEA", Integer.parseInt(cipherTests1[i]), input1, Hex.decode(cipherTests1[i + 1]));
-        }
-
-        byte[]  kek1 = Hex.decode("255e0d1c07b646dfb3134cc843ba8aa71f025b7c0838251f");
-        byte[]  iv1 = Hex.decode("5dd4cbfc96f5453b");
-        byte[]  in1 = Hex.decode("2923bf85e06dd6ae529149f1f1bae9eab3a7da3d860d3e98");
-        byte[]  out1 = Hex.decode("690107618ef092b3b48ca1796b234ae9fa33ebb4159604037db5d6a84eb3aac2768c632775a467d4");
-
-        wrapTest("DESEDE", 1, kek1, iv1, in1, out1);
-        wrapTest("TDEA", 1, kek1, iv1, in1, out1);
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        Security.addProvider(new BouncyCastleProvider());
-
-        runTest(new DESedeTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/DHIESTest.java b/bcprov/src/main/java/org/bouncycastle/jce/provider/test/DHIESTest.java
deleted file mode 100644
index f081d80..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/DHIESTest.java
+++ /dev/null
@@ -1,194 +0,0 @@
-package org.bouncycastle.jce.provider.test;
-
-import java.math.BigInteger;
-import java.security.KeyPair;
-import java.security.KeyPairGenerator;
-import java.security.SecureRandom;
-import java.security.Security;
-
-import javax.crypto.Cipher;
-import javax.crypto.interfaces.DHPrivateKey;
-import javax.crypto.interfaces.DHPublicKey;
-import javax.crypto.spec.DHParameterSpec;
-
-import org.bouncycastle.crypto.agreement.DHBasicAgreement;
-import org.bouncycastle.crypto.digests.SHA1Digest;
-import org.bouncycastle.crypto.engines.DESEngine;
-import org.bouncycastle.crypto.engines.IESEngine;
-import org.bouncycastle.crypto.generators.KDF2BytesGenerator;
-import org.bouncycastle.crypto.macs.HMac;
-import org.bouncycastle.crypto.paddings.PaddedBufferedBlockCipher;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.jcajce.provider.asymmetric.dh.IESCipher;
-import org.bouncycastle.jce.spec.IESParameterSpec;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-
-/**
- * Test for DHIES - Diffie-Hellman Integrated Encryption Scheme
- */
-public class DHIESTest
-    extends SimpleTest
-{
-    // Oakley group 2 - RFC 5996
-    BigInteger p1024 = new BigInteger(
-                    "FFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD1" +
-                    "29024E088A67CC74020BBEA63B139B22514A08798E3404DD" +
-                    "EF9519B3CD3A431B302B0A6DF25F14374FE1356D6D51C245" +
-                    "E485B576625E7EC6F44C42E9A637ED6B0BFF5CB6F406B7ED" +
-                    "EE386BFB5A899FA5AE9F24117C4B1FE649286651ECE65381" +
-                    "FFFFFFFFFFFFFFFF",16);
-
-    BigInteger g1024 = new BigInteger("2",16);
-
-    DHParameterSpec param = new DHParameterSpec(p1024, g1024);
-
-    DHIESTest()
-    {
-    }
-
-    public String getName()
-    {
-        return "DHIES";
-    }
-
-    public void performTest()
-        throws Exception
-    {
-        byte[] derivation = Hex.decode("202122232425262728292a2b2c2d2e2f");
-        byte[] encoding   = Hex.decode("303132333435363738393a3b3c3d3e3f");
-
-        
-        IESCipher c1 = new org.bouncycastle.jcajce.provider.asymmetric.dh.IESCipher.IES();
-        IESCipher c2 = new org.bouncycastle.jcajce.provider.asymmetric.dh.IESCipher.IES();
-        IESParameterSpec params = new IESParameterSpec(derivation,encoding,128);
-
-        // Testing DHIES with default prime in streaming mode
-        KeyPairGenerator    g = KeyPairGenerator.getInstance("DH", "BC");
-
-        g.initialize(param);
-
-        doTest("DHIES with default", g, "DHIES", params);
-        
-        // Testing DHIES with 512-bit prime in streaming mode
-        g.initialize(512, new SecureRandom());
-        doTest("DHIES with 512-bit", g, "DHIES", params);
-
-        // Testing ECIES with 1024-bit prime in streaming mode 
-        g.initialize(1024, new SecureRandom());
-        doTest("DHIES with 1024-bit", g, "DHIES", params);
-
-        c1 = new IESCipher(new IESEngine(new DHBasicAgreement(), 
-                new KDF2BytesGenerator(new SHA1Digest()),
-                new HMac(new SHA1Digest()),
-                new PaddedBufferedBlockCipher(new DESEngine())));
-        
-        c2 = new IESCipher(new IESEngine(new DHBasicAgreement(), 
-                new KDF2BytesGenerator(new SHA1Digest()),
-                new HMac(new SHA1Digest()),
-                new PaddedBufferedBlockCipher(new DESEngine())));  
-    
-        params = new IESParameterSpec(derivation, encoding, 128, 192);
-      
-        // Testing DHIES with default prime using DESEDE
-        g = KeyPairGenerator.getInstance("DH", "BC");
-        doTest("DHIESwithDES default", g, "DHIESwithDESEDE", params);
-        
-        // Testing DHIES with 512-bit prime using DESEDE
-        g.initialize(512, new SecureRandom());
-        doTest("DHIESwithDES 512-bit", g, "DHIESwithDESEDE", params);
-        
-        // Testing DHIES with 1024-bit prime using DESEDE
-        g.initialize(1024, new SecureRandom());
-        doTest("DHIESwithDES 1024-bit", g, "DHIESwithDESEDE", params);
-
-        g = KeyPairGenerator.getInstance("DH", "BC");
-        g.initialize(param);
-
-        c1 = new IESCipher.IESwithAES();
-        c2 = new IESCipher.IESwithAES();
-        params = new IESParameterSpec(derivation, encoding, 128, 128);
-        
-        // Testing DHIES with default curve using AES
-        doTest("DHIESwithAES default", g, "DHIESwithAES", params);
-        
-        // Testing DHIES with 512-bit curve using AES
-        g.initialize(512, new SecureRandom());
-        doTest("DHIESwithAES 512-bit", g, "DHIESwithAES", params);
-        
-        // Testing DHIES with 1024-bit curve using AES
-        g.initialize(1024, new SecureRandom());
-        doTest("DHIESwithAES 1024-bit", g, "DHIESwithAES", params);
-        
-    }
-
-    public void doTest(
-        String                testname,
-        KeyPairGenerator     g,
-        String              cipher,
-        IESParameterSpec    p)
-        throws Exception
-    {
-        
-        byte[] message = Hex.decode("0102030405060708090a0b0c0d0e0f10111213141516");
-        byte[] out1, out2;
-  
-        Cipher        c1 = Cipher.getInstance(cipher, "BC");
-        Cipher        c2 = Cipher.getInstance(cipher, "BC");
-        // Generate static key pair
-        KeyPair       keyPair = g.generateKeyPair();
-        DHPublicKey   pub = (DHPublicKey)keyPair.getPublic();
-        DHPrivateKey  priv = (DHPrivateKey)keyPair.getPrivate();
-       
-
-        // Testing with null parameters and DHAES mode off
-        c1.init(Cipher.ENCRYPT_MODE, pub, new SecureRandom());
-        c2.init(Cipher.DECRYPT_MODE, priv, new SecureRandom());
-        out1 = c1.doFinal(message, 0, message.length);
-        out2 = c2.doFinal(out1, 0, out1.length);
-        if (!areEqual(out2, message))
-        {
-            fail(testname + " test failed with null parameters, DHAES mode false.");
-        }
-    
-        
-        // Testing with given parameters and DHAES mode off
-        c1.init(Cipher.ENCRYPT_MODE, pub, p, new SecureRandom());
-        c2.init(Cipher.DECRYPT_MODE, priv, p, new SecureRandom());
-        out1 = c1.doFinal(message, 0, message.length);
-        out2 = c2.doFinal(out1, 0, out1.length);
-        if (!areEqual(out2, message))
-            fail(testname + " test failed with non-null parameters, DHAES mode false.");
-        
-        // Testing with null parameters and DHAES mode on
-        c1 = Cipher.getInstance(cipher + "/DHAES/PKCS7Padding","BC");
-        c2 = Cipher.getInstance(cipher + "/DHAES/PKCS7Padding","BC");
-        c1.init(Cipher.ENCRYPT_MODE, pub, new SecureRandom());
-        c2.init(Cipher.DECRYPT_MODE, priv, new SecureRandom());
-        out1 = c1.doFinal(message, 0, message.length);
-        out2 = c2.doFinal(out1, 0, out1.length);
-        if (!areEqual(out2, message))
-            fail(testname + " test failed with null parameters, DHAES mode true.");
-     
-        
-        // Testing with given parameters and DHAES mode on
-        c1 = Cipher.getInstance(cipher + "/DHAES/PKCS7Padding","BC");
-        c2 = Cipher.getInstance(cipher + "/DHAES/PKCS7Padding","BC");
-
-        c1.init(Cipher.ENCRYPT_MODE, pub, p, new SecureRandom());
-        c2.init(Cipher.DECRYPT_MODE, priv, p, new SecureRandom());
-
-        out1 = c1.doFinal(message, 0, message.length);
-        out2 = c2.doFinal(out1, 0, out1.length);
-        if (!areEqual(out2, message))
-            fail(testname + " test failed with non-null parameters, DHAES mode true.");
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        Security.addProvider(new BouncyCastleProvider());
-
-        runTest(new DHIESTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/DHTest.java b/bcprov/src/main/java/org/bouncycastle/jce/provider/test/DHTest.java
deleted file mode 100644
index 6b9ad4e..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/DHTest.java
+++ /dev/null
@@ -1,990 +0,0 @@
-package org.bouncycastle.jce.provider.test;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.math.BigInteger;
-import java.security.AlgorithmParameterGenerator;
-import java.security.AlgorithmParameters;
-import java.security.Key;
-import java.security.KeyFactory;
-import java.security.KeyPair;
-import java.security.KeyPairGenerator;
-import java.security.SecureRandom;
-import java.security.Security;
-import java.security.interfaces.ECPrivateKey;
-import java.security.interfaces.ECPublicKey;
-import java.security.spec.ECFieldFp;
-import java.security.spec.ECParameterSpec;
-import java.security.spec.EllipticCurve;
-import java.security.spec.PKCS8EncodedKeySpec;
-import java.security.spec.X509EncodedKeySpec;
-
-import javax.crypto.KeyAgreement;
-import javax.crypto.SecretKey;
-import javax.crypto.interfaces.DHPrivateKey;
-import javax.crypto.interfaces.DHPublicKey;
-import javax.crypto.spec.DESKeySpec;
-import javax.crypto.spec.DESedeKeySpec;
-import javax.crypto.spec.DHParameterSpec;
-import javax.crypto.spec.DHPrivateKeySpec;
-import javax.crypto.spec.DHPublicKeySpec;
-
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
-import org.bouncycastle.jce.ECNamedCurveTable;
-import org.bouncycastle.jce.ECPointUtil;
-import org.bouncycastle.jce.interfaces.PKCS12BagAttributeCarrier;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.jce.spec.ECNamedCurveParameterSpec;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.encoders.Base64;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-
-public class DHTest
-    extends SimpleTest
-{
-    private BigInteger g512 = new BigInteger("153d5d6172adb43045b68ae8e1de1070b6137005686d29d3d73a7749199681ee5b212c9b96bfdcfa5b20cd5e3fd2044895d609cf9b410b7a0f12ca1cb9a428cc", 16);
-    private BigInteger p512 = new BigInteger("9494fec095f3b85ee286542b3836fc81a5dd0a0349b4c239dd38744d488cf8e31db8bcb7d33b41abb9e5a33cca9144b1cef332c94bf0573bf047a3aca98cdf3b", 16);
-
-    private BigInteger g768 = new BigInteger("7c240073c1316c621df461b71ebb0cdcc90a6e5527e5e126633d131f87461c4dc4afc60c2cb0f053b6758871489a69613e2a8b4c8acde23954c08c81cbd36132cfd64d69e4ed9f8e51ed6e516297206672d5c0a69135df0a5dcf010d289a9ca1", 16);
-    private BigInteger p768 = new BigInteger("8c9dd223debed1b80103b8b309715be009d48860ed5ae9b9d5d8159508efd802e3ad4501a7f7e1cfec78844489148cd72da24b21eddd01aa624291c48393e277cfc529e37075eccef957f3616f962d15b44aeab4039d01b817fde9eaa12fd73f", 16);
-
-    private BigInteger  g1024 = new BigInteger("1db17639cdf96bc4eabba19454f0b7e5bd4e14862889a725c96eb61048dcd676ceb303d586e30f060dbafd8a571a39c4d823982117da5cc4e0f89c77388b7a08896362429b94a18a327604eb7ff227bffbc83459ade299e57b5f77b50fb045250934938efa145511166e3197373e1b5b1e52de713eb49792bedde722c6717abf", 16);
-    private BigInteger  p1024 = new BigInteger("a00e283b3c624e5b2b4d9fbc2653b5185d99499b00fd1bf244c6f0bb817b4d1c451b2958d62a0f8a38caef059fb5ecd25d75ed9af403f5b5bdab97a642902f824e3c13789fed95fa106ddfe0ff4a707c85e2eb77d49e68f2808bcea18ce128b178cd287c6bc00efa9a1ad2a673fe0dceace53166f75b81d6709d5f8af7c66bb7", 16);
-
-    // public key with mismatched oid/parameters
-    private byte[] oldPubEnc = Base64.decode(
-        "MIIBnzCCARQGByqGSM4+AgEwggEHAoGBAPxSrN417g43VAM9sZRf1dt6AocAf7D6" +
-        "WVCtqEDcBJrMzt63+g+BNJzhXVtbZ9kp9vw8L/0PHgzv0Ot/kOLX7Khn+JalOECW" +
-        "YlkyBhmOVbjR79TY5u2GAlvG6pqpizieQNBCEMlUuYuK1Iwseil6VoRuA13Zm7uw" +
-        "WO1eZmaJtY7LAoGAQaPRCFKM5rEdkMrV9FNzeSsYRs8m3DqPnnJHpuySpyO9wUcX" +
-        "OOJcJY5qvHbDO5SxHXu/+bMgXmVT6dXI5o0UeYqJR7fj6pR4E6T0FwG55RFr5Ok4" +
-        "3C4cpXmaOu176SyWuoDqGs1RDGmYQjwbZUi23DjaaTFUly9LCYXMliKrQfEDgYQA" +
-        "AoGAQUGCBN4TaBw1BpdBXdTvTfCU69XDB3eyU2FOBE3UWhpx9D8XJlx4f5DpA4Y6" +
-        "6sQMuCbhfmjEph8W7/sbMurM/awR+PSR8tTY7jeQV0OkmAYdGK2nzh0ZSifMO1oE" +
-        "NNhN2O62TLs67msxT28S4/S89+LMtc98mevQ2SX+JF3wEVU=");
-
-    // bogus key with full PKCS parameter set
-    private byte[] oldFullParams = Base64.decode(
-        "MIIBIzCCARgGByqGSM4+AgEwggELAoGBAP1/U4EddRIpUt9KnC7s5Of2EbdSPO9E" +
-        "AMMeP4C2USZpRV1AIlH7WT2NWPq/xfW6MPbLm1Vs14E7gB00b/JmYLdrmVClpJ+f" +
-        "6AR7ECLCT7up1/63xhv4O1fnxqimFQ8E+4P208UewwI1VBNaFpEy9nXzrith1yrv" +
-        "8iIDGZ3RSAHHAoGBAPfhoIXWmz3ey7yrXDa4V7l5lK+7+jrqgvlXTAs9B4JnUVlX" +
-        "jrrUWU/mcQcQgYC0SRZxI+hMKBYTt88JMozIpuE8FnqLVHyNKOCjrh4rs6Z1kW6j" +
-        "fwv6ITVi8ftiegEkO8yk8b6oUZCJqIPf4VrlnwaSi2ZegHtVJWQBTDv+z0kqAgFk" +
-        "AwUAAgIH0A==");
-
-    private byte[] samplePubEnc = Base64.decode(
-       "MIIBpjCCARsGCSqGSIb3DQEDATCCAQwCgYEA/X9TgR11EilS30qcLuzk5/YRt1I8" +
-       "70QAwx4/gLZRJmlFXUAiUftZPY1Y+r/F9bow9subVWzXgTuAHTRv8mZgt2uZUKWk" +
-       "n5/oBHsQIsJPu6nX/rfGG/g7V+fGqKYVDwT7g/bTxR7DAjVUE1oWkTL2dfOuK2HX" +
-       "Ku/yIgMZndFIAccCgYEA9+GghdabPd7LvKtcNrhXuXmUr7v6OuqC+VdMCz0HgmdR" +
-       "WVeOutRZT+ZxBxCBgLRJFnEj6EwoFhO3zwkyjMim4TwWeotUfI0o4KOuHiuzpnWR" +
-       "bqN/C/ohNWLx+2J6ASQ7zKTxvqhRkImog9/hWuWfBpKLZl6Ae1UlZAFMO/7PSSoC" +
-       "AgIAA4GEAAKBgEIiqxoUW6E6GChoOgcfNbVFclW91ITf5MFSUGQwt2R0RHoOhxvO" +
-       "lZhNs++d0VPATLAyXovjfgENT9SGCbuZttYcqqLdKTbMXBWPek+rfnAl9E4iEMED" +
-       "IDd83FJTKs9hQcPAm7zmp0Xm1bGF9CbUFjP5G02265z7eBmHDaT0SNlB");
-
-    private byte[] samplePrivEnc = Base64.decode(
-       "MIIBZgIBADCCARsGCSqGSIb3DQEDATCCAQwCgYEA/X9TgR11EilS30qcLuzk5/YR" +
-       "t1I870QAwx4/gLZRJmlFXUAiUftZPY1Y+r/F9bow9subVWzXgTuAHTRv8mZgt2uZ" +
-       "UKWkn5/oBHsQIsJPu6nX/rfGG/g7V+fGqKYVDwT7g/bTxR7DAjVUE1oWkTL2dfOu" +
-       "K2HXKu/yIgMZndFIAccCgYEA9+GghdabPd7LvKtcNrhXuXmUr7v6OuqC+VdMCz0H" +
-       "gmdRWVeOutRZT+ZxBxCBgLRJFnEj6EwoFhO3zwkyjMim4TwWeotUfI0o4KOuHiuz" +
-       "pnWRbqN/C/ohNWLx+2J6ASQ7zKTxvqhRkImog9/hWuWfBpKLZl6Ae1UlZAFMO/7P" +
-       "SSoCAgIABEICQAZYXnBHazxXUUdFP4NIf2Ipu7du0suJPZQKKff81wymi2zfCfHh" +
-       "uhe9gQ9xdm4GpzeNtrQ8/MzpTy+ZVrtd29Q=");
-
-    public String getName()
-    {
-        return "DH";
-    }
-
-    private void testGP(
-        String      algName,
-        int         size,
-        int         privateValueSize,
-        BigInteger  g,
-        BigInteger  p)
-        throws Exception
-    {
-        DHParameterSpec             dhParams = new DHParameterSpec(p, g, privateValueSize);
-
-        KeyPairGenerator keyGen = KeyPairGenerator.getInstance(algName, "BC");
-
-        keyGen.initialize(dhParams);
-
-        testTwoParty(algName, size, privateValueSize, keyGen);
-
-        KeyPair aKeyPair = keyGen.generateKeyPair();
-
-        //
-        // public key encoding test
-        //
-        byte[]              pubEnc = aKeyPair.getPublic().getEncoded();
-        KeyFactory          keyFac = KeyFactory.getInstance(algName, "BC");
-        X509EncodedKeySpec  pubX509 = new X509EncodedKeySpec(pubEnc);
-        DHPublicKey         pubKey = (DHPublicKey)keyFac.generatePublic(pubX509);
-        DHParameterSpec     spec = pubKey.getParams();
-
-        if (!spec.getG().equals(dhParams.getG()) || !spec.getP().equals(dhParams.getP()))
-        {
-            fail(size + " bit public key encoding/decoding test failed on parameters");
-        }
-
-        if (!((DHPublicKey)aKeyPair.getPublic()).getY().equals(pubKey.getY()))
-        {
-            fail(size + " bit public key encoding/decoding test failed on y value");
-        }
-
-        //
-        // public key serialisation test
-        //
-        pubKey = (DHPublicKey)serializeDeserialize(aKeyPair.getPublic());
-        spec = pubKey.getParams();
-
-        if (!spec.getG().equals(dhParams.getG()) || !spec.getP().equals(dhParams.getP()))
-        {
-            fail(size + " bit public key serialisation test failed on parameters");
-        }
-
-        if (!((DHPublicKey)aKeyPair.getPublic()).getY().equals(pubKey.getY()))
-        {
-            fail(size + " bit public key serialisation test failed on y value");
-        }
-
-        if (!aKeyPair.getPublic().equals(pubKey))
-        {
-            fail("equals test failed");
-        }
-
-        if (aKeyPair.getPublic().hashCode() != pubKey.hashCode())
-        {
-            fail("hashCode test failed");
-        }
-
-        //
-        // private key encoding test
-        //
-        byte[]              privEnc = aKeyPair.getPrivate().getEncoded();
-        PKCS8EncodedKeySpec privPKCS8 = new PKCS8EncodedKeySpec(privEnc);
-        DHPrivateKey        privKey = (DHPrivateKey)keyFac.generatePrivate(privPKCS8);
-
-        spec = privKey.getParams();
-
-        if (!spec.getG().equals(dhParams.getG()) || !spec.getP().equals(dhParams.getP()))
-        {
-            fail(size + " bit private key encoding/decoding test failed on parameters");
-        }
-
-        if (!((DHPrivateKey)aKeyPair.getPrivate()).getX().equals(privKey.getX()))
-        {
-            fail(size + " bit private key encoding/decoding test failed on y value");
-        }
-
-        //
-        // private key serialisation test
-        //
-        privKey = (DHPrivateKey)serializeDeserialize(aKeyPair.getPrivate());
-        spec = privKey.getParams();
-
-        if (!spec.getG().equals(dhParams.getG()) || !spec.getP().equals(dhParams.getP()))
-        {
-            fail(size + " bit private key serialisation test failed on parameters");
-        }
-
-        if (!((DHPrivateKey)aKeyPair.getPrivate()).getX().equals(privKey.getX()))
-        {
-            fail(size + " bit private key serialisation test failed on X value");
-        }
-
-        if (!aKeyPair.getPrivate().equals(privKey))
-        {
-            fail("equals test failed");
-        }
-
-        if (aKeyPair.getPrivate().hashCode() != privKey.hashCode())
-        {
-            fail("hashCode test failed");
-        }
-
-        if (!(privKey instanceof PKCS12BagAttributeCarrier))
-        {
-            fail("private key not implementing PKCS12 attribute carrier");
-        }
-
-        //
-        // three party test
-        //
-        KeyPairGenerator aPairGen = KeyPairGenerator.getInstance(algName, "BC");
-        aPairGen.initialize(spec);
-        KeyPair aPair = aPairGen.generateKeyPair();
-
-        KeyPairGenerator bPairGen = KeyPairGenerator.getInstance(algName, "BC");
-        bPairGen.initialize(spec);
-        KeyPair bPair = bPairGen.generateKeyPair();
-
-        KeyPairGenerator cPairGen = KeyPairGenerator.getInstance(algName, "BC");
-        cPairGen.initialize(spec);
-        KeyPair cPair = cPairGen.generateKeyPair();
-
-        KeyAgreement aKeyAgree = KeyAgreement.getInstance(algName, "BC");
-        aKeyAgree.init(aPair.getPrivate());
-
-        KeyAgreement bKeyAgree = KeyAgreement.getInstance(algName, "BC");
-        bKeyAgree.init(bPair.getPrivate());
-
-        KeyAgreement cKeyAgree = KeyAgreement.getInstance(algName, "BC");
-        cKeyAgree.init(cPair.getPrivate());
-
-        Key ac = aKeyAgree.doPhase(cPair.getPublic(), false);
-
-        Key ba = bKeyAgree.doPhase(aPair.getPublic(), false);
-
-        Key cb = cKeyAgree.doPhase(bPair.getPublic(), false);
-
-        aKeyAgree.doPhase(cb, true);
-
-        bKeyAgree.doPhase(ac, true);
-
-        cKeyAgree.doPhase(ba, true);
-
-        BigInteger aShared = new BigInteger(aKeyAgree.generateSecret());
-        BigInteger bShared = new BigInteger(bKeyAgree.generateSecret());
-        BigInteger cShared = new BigInteger(cKeyAgree.generateSecret());
-
-        if (!aShared.equals(bShared))
-        {
-            fail(size + " bit 3-way test failed (a and b differ)");
-        }
-
-        if (!cShared.equals(bShared))
-        {
-            fail(size + " bit 3-way test failed (c and b differ)");
-        }
-    }
-
-    private void testTwoParty(String algName, int size, int privateValueSize, KeyPairGenerator keyGen)
-            throws Exception
-    {
-        testTwoParty(algName, size, privateValueSize, keyGen.generateKeyPair(), keyGen.generateKeyPair());
-    }
-
-    private byte[] testTwoParty(String algName, int size, int privateValueSize, KeyPair aKeyPair, KeyPair bKeyPair)
-        throws Exception
-    {
-        //
-        // a side
-        //
-        KeyAgreement aKeyAgree = KeyAgreement.getInstance(algName, "BC");
-
-        checkKeySize(privateValueSize, aKeyPair);
-
-        aKeyAgree.init(aKeyPair.getPrivate());
-
-        //
-        // b side
-        //
-        KeyAgreement bKeyAgree = KeyAgreement.getInstance(algName, "BC");
-
-        checkKeySize(privateValueSize, bKeyPair);
-
-        bKeyAgree.init(bKeyPair.getPrivate());
-
-        //
-        // agreement
-        //
-        aKeyAgree.doPhase(bKeyPair.getPublic(), true);
-        bKeyAgree.doPhase(aKeyPair.getPublic(), true);
-
-        byte[] aSecret = aKeyAgree.generateSecret();
-        byte[] bSecret = bKeyAgree.generateSecret();
-
-        if (!Arrays.areEqual(aSecret, bSecret))
-        {
-            fail(size + " bit 2-way test failed");
-        }
-
-        return aSecret;
-    }
-
-    private void testExplicitWrapping(
-        int         size,
-        int         privateValueSize,
-        BigInteger  g,
-        BigInteger  p)
-        throws Exception
-    {
-        DHParameterSpec             dhParams = new DHParameterSpec(p, g, privateValueSize);
-
-        KeyPairGenerator keyGen = KeyPairGenerator.getInstance("DH", "BC");
-
-        keyGen.initialize(dhParams);
-
-        //
-        // a side
-        //
-        KeyPair aKeyPair = keyGen.generateKeyPair();
-
-        KeyAgreement aKeyAgree = KeyAgreement.getInstance("DH", "BC");
-
-        checkKeySize(privateValueSize, aKeyPair);
-
-        aKeyAgree.init(aKeyPair.getPrivate());
-
-        //
-        // b side
-        //
-        KeyPair bKeyPair = keyGen.generateKeyPair();
-
-        KeyAgreement bKeyAgree = KeyAgreement.getInstance("DH", "BC");
-
-        checkKeySize(privateValueSize, bKeyPair);
-
-        bKeyAgree.init(bKeyPair.getPrivate());
-
-        //
-        // agreement
-        //
-        aKeyAgree.doPhase(bKeyPair.getPublic(), true);
-        bKeyAgree.doPhase(aKeyPair.getPublic(), true);
-
-        SecretKey k1 = aKeyAgree.generateSecret(PKCSObjectIdentifiers.id_alg_CMS3DESwrap.getId());
-        SecretKey k2 = bKeyAgree.generateSecret(PKCSObjectIdentifiers.id_alg_CMS3DESwrap.getId());
-        
-        // TODO Compare k1 and k2?
-    }
-
-    private Object serializeDeserialize(Object o)
-        throws Exception
-    {
-        ByteArrayOutputStream bOut = new ByteArrayOutputStream();
-        ObjectOutputStream oOut = new ObjectOutputStream(bOut);
-
-        oOut.writeObject(o);
-        oOut.close();
-
-        ObjectInputStream oIn = new ObjectInputStream(new ByteArrayInputStream(bOut.toByteArray()));
-
-        return oIn.readObject();
-    }
-
-    private void checkKeySize(int privateValueSize, KeyPair aKeyPair)
-    {
-        if (privateValueSize != 0)
-        {
-            DHPrivateKey key = (DHPrivateKey)aKeyPair.getPrivate();
-
-            if (key.getX().bitLength() != privateValueSize)
-            {
-                fail("limited key check failed for key size " + privateValueSize);
-            }
-        }
-    }
-
-    private void testRandom(
-        int         size)
-        throws Exception
-    {
-        AlgorithmParameterGenerator a = AlgorithmParameterGenerator.getInstance("DH", "BC");
-        a.init(size, new SecureRandom());
-        AlgorithmParameters params = a.generateParameters();
-
-        byte[] encodeParams = params.getEncoded();
-
-        AlgorithmParameters a2 = AlgorithmParameters.getInstance("DH", "BC");
-        a2.init(encodeParams);
-
-        // a and a2 should be equivalent!
-        byte[] encodeParams_2 = a2.getEncoded();
-
-        if (!areEqual(encodeParams, encodeParams_2))
-        {
-            fail("encode/decode parameters failed");
-        }
-
-        DHParameterSpec dhP = (DHParameterSpec)params.getParameterSpec(DHParameterSpec.class);
-
-        testGP("DH", size, 0, dhP.getG(), dhP.getP());
-    }
-
-    private void testDefault(
-        int         privateValueSize,
-        BigInteger  g,
-        BigInteger  p)
-        throws Exception
-    {
-        DHParameterSpec             dhParams = new DHParameterSpec(p, g, privateValueSize);
-        String                      algName = "DH";
-        int                         size = p.bitLength();
-
-        new BouncyCastleProvider().setParameter(ConfigurableProvider.DH_DEFAULT_PARAMS, dhParams);
-
-        KeyPairGenerator keyGen = KeyPairGenerator.getInstance(algName, "BC");
-
-        keyGen.initialize(dhParams.getP().bitLength());
-
-        testTwoParty("DH", size, privateValueSize, keyGen);
-
-        KeyPair aKeyPair = keyGen.generateKeyPair();
-
-        new BouncyCastleProvider().setParameter(ConfigurableProvider.DH_DEFAULT_PARAMS, null);
-
-        //
-        // public key encoding test
-        //
-        byte[]              pubEnc = aKeyPair.getPublic().getEncoded();
-        KeyFactory          keyFac = KeyFactory.getInstance(algName, "BC");
-        X509EncodedKeySpec  pubX509 = new X509EncodedKeySpec(pubEnc);
-        DHPublicKey         pubKey = (DHPublicKey)keyFac.generatePublic(pubX509);
-        DHParameterSpec     spec = pubKey.getParams();
-
-        if (!spec.getG().equals(dhParams.getG()) || !spec.getP().equals(dhParams.getP()))
-        {
-            fail(size + " bit public key encoding/decoding test failed on parameters");
-        }
-
-        if (!((DHPublicKey)aKeyPair.getPublic()).getY().equals(pubKey.getY()))
-        {
-            fail(size + " bit public key encoding/decoding test failed on y value");
-        }
-
-        //
-        // public key serialisation test
-        //
-        ByteArrayOutputStream   bOut = new ByteArrayOutputStream();
-        ObjectOutputStream      oOut = new ObjectOutputStream(bOut);
-
-        oOut.writeObject(aKeyPair.getPublic());
-
-        ByteArrayInputStream   bIn = new ByteArrayInputStream(bOut.toByteArray());
-        ObjectInputStream      oIn = new ObjectInputStream(bIn);
-
-        pubKey = (DHPublicKey)oIn.readObject();
-        spec = pubKey.getParams();
-
-        if (!spec.getG().equals(dhParams.getG()) || !spec.getP().equals(dhParams.getP()))
-        {
-            fail(size + " bit public key serialisation test failed on parameters");
-        }
-
-        if (!((DHPublicKey)aKeyPair.getPublic()).getY().equals(pubKey.getY()))
-        {
-            fail(size + " bit public key serialisation test failed on y value");
-        }
-
-        //
-        // private key encoding test
-        //
-        byte[]              privEnc = aKeyPair.getPrivate().getEncoded();
-        PKCS8EncodedKeySpec privPKCS8 = new PKCS8EncodedKeySpec(privEnc);
-        DHPrivateKey        privKey = (DHPrivateKey)keyFac.generatePrivate(privPKCS8);
-
-        spec = privKey.getParams();
-
-        if (!spec.getG().equals(dhParams.getG()) || !spec.getP().equals(dhParams.getP()))
-        {
-            fail(size + " bit private key encoding/decoding test failed on parameters");
-        }
-
-        if (!((DHPrivateKey)aKeyPair.getPrivate()).getX().equals(privKey.getX()))
-        {
-            fail(size + " bit private key encoding/decoding test failed on y value");
-        }
-
-        //
-        // private key serialisation test
-        //
-        bOut = new ByteArrayOutputStream();
-        oOut = new ObjectOutputStream(bOut);
-
-        oOut.writeObject(aKeyPair.getPrivate());
-
-        bIn = new ByteArrayInputStream(bOut.toByteArray());
-        oIn = new ObjectInputStream(bIn);
-
-        privKey = (DHPrivateKey)oIn.readObject();
-        spec = privKey.getParams();
-
-        if (!spec.getG().equals(dhParams.getG()) || !spec.getP().equals(dhParams.getP()))
-        {
-            fail(size + " bit private key serialisation test failed on parameters");
-        }
-
-        if (!((DHPrivateKey)aKeyPair.getPrivate()).getX().equals(privKey.getX()))
-        {
-            fail(size + " bit private key serialisation test failed on y value");
-        }
-
-        //
-        // three party test
-        //
-        KeyPairGenerator aPairGen = KeyPairGenerator.getInstance(algName, "BC");
-        aPairGen.initialize(spec);
-        KeyPair aPair = aPairGen.generateKeyPair();
-
-        KeyPairGenerator bPairGen = KeyPairGenerator.getInstance(algName, "BC");
-        bPairGen.initialize(spec);
-        KeyPair bPair = bPairGen.generateKeyPair();
-
-        KeyPairGenerator cPairGen = KeyPairGenerator.getInstance(algName, "BC");
-        cPairGen.initialize(spec);
-        KeyPair cPair = cPairGen.generateKeyPair();
-
-        KeyAgreement aKeyAgree = KeyAgreement.getInstance(algName, "BC");
-        aKeyAgree.init(aPair.getPrivate());
-
-        KeyAgreement bKeyAgree = KeyAgreement.getInstance(algName, "BC");
-        bKeyAgree.init(bPair.getPrivate());
-
-        KeyAgreement cKeyAgree = KeyAgreement.getInstance(algName, "BC");
-        cKeyAgree.init(cPair.getPrivate());
-
-        Key ac = aKeyAgree.doPhase(cPair.getPublic(), false);
-
-        Key ba = bKeyAgree.doPhase(aPair.getPublic(), false);
-
-        Key cb = cKeyAgree.doPhase(bPair.getPublic(), false);
-
-        aKeyAgree.doPhase(cb, true);
-
-        bKeyAgree.doPhase(ac, true);
-
-        cKeyAgree.doPhase(ba, true);
-
-        BigInteger aShared = new BigInteger(aKeyAgree.generateSecret());
-        BigInteger bShared = new BigInteger(bKeyAgree.generateSecret());
-        BigInteger cShared = new BigInteger(cKeyAgree.generateSecret());
-
-        if (!aShared.equals(bShared))
-        {
-            fail(size + " bit 3-way test failed (a and b differ)");
-        }
-
-        if (!cShared.equals(bShared))
-        {
-            fail(size + " bit 3-way test failed (c and b differ)");
-        }
-    }
-
-    private void testECDH(String algorithm, String cipher, int keyLen)
-        throws Exception
-    {
-        ECNamedCurveParameterSpec parameterSpec = ECNamedCurveTable.getParameterSpec("secp521r1");
-        KeyPairGenerator g = KeyPairGenerator.getInstance(algorithm, "BC");
-
-        g.initialize(parameterSpec);
-
-        //
-        // a side
-        //
-        KeyPair aKeyPair = g.generateKeyPair();
-
-        KeyAgreement aKeyAgree = KeyAgreement.getInstance(algorithm, "BC");
-
-        aKeyAgree.init(aKeyPair.getPrivate());
-
-        //
-        // b side
-        //
-        KeyPair bKeyPair = g.generateKeyPair();
-
-        KeyAgreement bKeyAgree = KeyAgreement.getInstance(algorithm, "BC");
-
-        bKeyAgree.init(bKeyPair.getPrivate());
-
-        //
-        // agreement
-        //
-        aKeyAgree.doPhase(bKeyPair.getPublic(), true);
-        bKeyAgree.doPhase(aKeyPair.getPublic(), true);
-
-        SecretKey k1 = aKeyAgree.generateSecret(cipher);
-        SecretKey k2 = bKeyAgree.generateSecret(cipher);
-
-        if (!k1.equals(k2))
-        {
-            fail(algorithm + " 2-way test failed");
-        }
-
-        if (k1.getEncoded().length != keyLen / 8)
-        {
-            fail("key for " + cipher + " the wrong size expected " + keyLen / 8 + " got " + k1.getEncoded().length);
-        }
-    }
-
-    private void testECDH(String algorithm)
-        throws Exception
-    {
-        KeyPairGenerator    g = KeyPairGenerator.getInstance(algorithm, "BC");
-
-        EllipticCurve curve = new EllipticCurve(
-                new ECFieldFp(new BigInteger("883423532389192164791648750360308885314476597252960362792450860609699839")), // q
-                new BigInteger("7fffffffffffffffffffffff7fffffffffff8000000000007ffffffffffc", 16), // a
-                new BigInteger("6b016c3bdcf18941d0d654921475ca71a9db2fb27d1d37796185c2942c0a", 16)); // b
-
-        ECParameterSpec ecSpec = new ECParameterSpec(
-                curve,
-                ECPointUtil.decodePoint(curve, Hex.decode("020ffa963cdca8816ccc33b8642bedf905c3d358573d3f27fbbd3b3cb9aaaf")), // G
-                new BigInteger("883423532389192164791648750360308884807550341691627752275345424702807307"), // n
-                1); // h
-
-        g.initialize(ecSpec, new SecureRandom());
-
-        //
-        // a side
-        //
-        KeyPair aKeyPair = g.generateKeyPair();
-
-        KeyAgreement aKeyAgree = KeyAgreement.getInstance(algorithm, "BC");
-
-        aKeyAgree.init(aKeyPair.getPrivate());
-
-        //
-        // b side
-        //
-        KeyPair bKeyPair = g.generateKeyPair();
-
-        KeyAgreement bKeyAgree = KeyAgreement.getInstance(algorithm, "BC");
-
-        bKeyAgree.init(bKeyPair.getPrivate());
-
-        //
-        // agreement
-        //
-        aKeyAgree.doPhase(bKeyPair.getPublic(), true);
-        bKeyAgree.doPhase(aKeyPair.getPublic(), true);
-
-        BigInteger  k1 = new BigInteger(aKeyAgree.generateSecret());
-        BigInteger  k2 = new BigInteger(bKeyAgree.generateSecret());
-
-        if (!k1.equals(k2))
-        {
-            fail(algorithm + " 2-way test failed");
-        }
-
-        //
-        // public key encoding test
-        //
-        byte[]              pubEnc = aKeyPair.getPublic().getEncoded();
-        KeyFactory          keyFac = KeyFactory.getInstance(algorithm, "BC");
-        X509EncodedKeySpec  pubX509 = new X509EncodedKeySpec(pubEnc);
-        ECPublicKey         pubKey = (ECPublicKey)keyFac.generatePublic(pubX509);
-
-        if (!pubKey.getW().equals(((ECPublicKey)aKeyPair.getPublic()).getW()))
-        {
-            System.out.println(" expected " + pubKey.getW().getAffineX() + " got " + ((ECPublicKey)aKeyPair.getPublic()).getW().getAffineX());
-            System.out.println(" expected " + pubKey.getW().getAffineY() + " got " + ((ECPublicKey)aKeyPair.getPublic()).getW().getAffineY());
-            fail(algorithm + " public key encoding (W test) failed");
-        }
-
-        if (!pubKey.getParams().getGenerator().equals(((ECPublicKey)aKeyPair.getPublic()).getParams().getGenerator()))
-        {
-            fail(algorithm + " public key encoding (G test) failed");
-        }
-
-        //
-        // private key encoding test
-        //
-        byte[]              privEnc = aKeyPair.getPrivate().getEncoded();
-        PKCS8EncodedKeySpec privPKCS8 = new PKCS8EncodedKeySpec(privEnc);
-        ECPrivateKey        privKey = (ECPrivateKey)keyFac.generatePrivate(privPKCS8);
-
-        if (!privKey.getS().equals(((ECPrivateKey)aKeyPair.getPrivate()).getS()))
-        {
-            fail(algorithm + " private key encoding (S test) failed");
-        }
-
-        if (!privKey.getParams().getGenerator().equals(((ECPrivateKey)aKeyPair.getPrivate()).getParams().getGenerator()))
-        {
-            fail(algorithm + " private key encoding (G test) failed");
-        }
-    }
-
-    private void testExceptions()
-    {
-        try
-        {
-            KeyAgreement aKeyAgree = KeyAgreement.getInstance("DH", "BC");
-
-            aKeyAgree.generateSecret("DES");
-        }
-        catch (IllegalStateException e)
-        {
-            // okay
-        }
-        catch (Exception e)
-        {
-            fail("Unexpected exception: " + e, e);
-        }
-    }
-
-    private void testDESAndDESede(BigInteger g, BigInteger p)
-        throws Exception
-    {
-        DHParameterSpec             dhParams = new DHParameterSpec(p, g, 256);
-
-        KeyPairGenerator keyGen = KeyPairGenerator.getInstance("DH", "BC");
-
-        keyGen.initialize(dhParams);
-
-        KeyPair kp = keyGen.generateKeyPair();
-
-        KeyAgreement keyAgreement = KeyAgreement.getInstance("DH", "BC");
-
-        keyAgreement.init(kp.getPrivate());
-        keyAgreement.doPhase(kp.getPublic(), true);
-
-        SecretKey key = keyAgreement.generateSecret("DES");
-
-        if (key.getEncoded().length != 8)
-        {
-            fail("DES length wrong");
-        }
-
-        if (!DESKeySpec.isParityAdjusted(key.getEncoded(), 0))
-        {
-            fail("DES parity wrong");
-        }
-
-        key = keyAgreement.generateSecret("DESEDE");
-
-        if (key.getEncoded().length != 24)
-        {
-            fail("DESEDE length wrong");
-        }
-
-        if (!DESedeKeySpec.isParityAdjusted(key.getEncoded(), 0))
-        {
-            fail("DESEDE parity wrong");
-        }
-
-        key = keyAgreement.generateSecret("Blowfish");
-
-        if (key.getEncoded().length != 16)
-        {
-            fail("Blowfish length wrong");
-        }
-    }
-
-    private void testInitialise()
-        throws Exception
-    {
-        KeyPairGenerator keyGen = KeyPairGenerator.getInstance("DH", "BC");
-
-        keyGen.initialize(512);
-
-        keyGen.generateKeyPair();
-
-        testTwoParty("DH", 512, 0, keyGen);
-    }
-
-    private void testSmallSecret()
-        throws Exception
-    {
-        BigInteger p = new BigInteger("ff3b512a4cc0961fa625d6cbd9642c377ece46b8dbc3146a98e0567f944034b5e3a1406edb179a77cd2539bdb74dc819f0a74d486606e26e578ff52c5242a5ff", 16);
-        BigInteger g = new BigInteger("58a66667431136e99d86de8199eb650a21afc9de3dd4ef9da6dfe89c866e928698952d95e68b418becef26f23211572eebfcbf328809bdaf02bba3d24c74f8c0", 16);
-
-        DHPrivateKeySpec aPrivSpec = new DHPrivateKeySpec(
-            new BigInteger("30a6ea4e2240a42867ad98bd3adbfd5b81aba48bd930f20a595983d807566f7cba4e766951efef2c6c0c1be3823f63d66e12c2a091d5ff3bbeb1ea6e335d072d", 16), p, g);
-        DHPublicKeySpec aPubSpec = new DHPublicKeySpec(
-                    new BigInteger("694dfea1bfc8897e2fcbfd88033ab34f4581892d7d5cc362dc056e3d43955accda12222bd651ca31c85f008a05dea914de68828dfd83a54a340fa84f3bbe6caf", 16), p, g);
-
-        DHPrivateKeySpec bPrivSpec = new DHPrivateKeySpec(
-                    new BigInteger("775b1e7e162190700e2212dd8e4aaacf8a2af92c9c108b81d5bf9a14548f494eaa86a6c4844b9512eb3e3f2f22ffec44c795c813edfea13f075b99bbdebb34bd", 16), p, g);
-
-        DHPublicKeySpec bPubSpec = new DHPublicKeySpec(
-                    new BigInteger("d8ddd4ff9246635eadbfa0bc2ef06d98a329b6e8cd2d1435d7b4921467570e697c9a9d3c172c684626a9d2b6b2fa0fc725d5b91f9a9625b717a4169bc714b064", 16), p, g);
-
-        KeyFactory kFact = KeyFactory.getInstance("DH", "BC");
-
-        byte[] secret = testTwoParty("DH", 512, 0, new KeyPair(kFact.generatePublic(aPubSpec), kFact.generatePrivate(aPrivSpec)), new KeyPair(kFact.generatePublic(bPubSpec), kFact.generatePrivate(bPrivSpec)));
-
-        if (secret.length != ((p.bitLength() + 7) / 8))
-        {
-            fail("short secret wrong length");
-        }
-
-        if (!Arrays.areEqual(Hex.decode("00340d3309ddc86e99e2f0be4fc212837bfb5c59336b09b9e1aeb1884b72c8b485b56723d0bf1c1d37fc89a292fc1cface9125106f1df15f55f22e4f77c5879b"), secret))
-        {
-            fail("short secret mismatch");
-        }
-    }
-
-    private void testEnc()
-        throws Exception
-    {
-        KeyFactory  kFact = KeyFactory.getInstance("DH", "BC");
-
-        Key k = kFact.generatePrivate(new PKCS8EncodedKeySpec(samplePrivEnc));
-
-        if (!Arrays.areEqual(samplePrivEnc, k.getEncoded()))
-        {
-            fail("private key re-encode failed");
-        }
-
-        k = kFact.generatePublic(new X509EncodedKeySpec(samplePubEnc));
-
-        if (!Arrays.areEqual(samplePubEnc, k.getEncoded()))
-        {
-            fail("public key re-encode failed");
-        }
-
-        k = kFact.generatePublic(new X509EncodedKeySpec(oldPubEnc));
-
-        if (!Arrays.areEqual(oldPubEnc, k.getEncoded()))
-        {
-            fail("old public key re-encode failed");
-        }
-
-        k = kFact.generatePublic(new X509EncodedKeySpec(oldFullParams));
-
-        if (!Arrays.areEqual(oldFullParams, k.getEncoded()))
-        {
-            fail("old full public key re-encode failed");
-        }
-    }
-
-    private void testConfig()
-    {
-        ConfigurableProvider prov = new BouncyCastleProvider();
-
-        DHParameterSpec dhSpec512 = new DHParameterSpec(
-            new BigInteger("fca682ce8e12caba26efccf7110e526db078b05edecbcd1eb4a208f3ae1617ae01f35b91a47e6df63413c5e12ed0899bcd132acd50d99151bdc43ee737592e17", 16),
-            new BigInteger("678471b27a9cf44ee91a49c5147db1a9aaf244f05a434d6486931d2d14271b9e35030b71fd73da179069b32e2935630e1c2062354d0da20a6c416e50be794ca4", 16),
-            384);
-
-        DHParameterSpec dhSpec768 = new DHParameterSpec(
-             new BigInteger("e9e642599d355f37c97ffd3567120b8e25c9cd43e927b3a9670fbec5d890141922d2c3b3ad2480093799869d1e846aab49fab0ad26d2ce6a22219d470bce7d777d4a21fbe9c270b57f607002f3cef8393694cf45ee3688c11a8c56ab127a3daf", 16),
-             new BigInteger("30470ad5a005fb14ce2d9dcd87e38bc7d1b1c5facbaecbe95f190aa7a31d23c4dbbcbe06174544401a5b2c020965d8c2bd2171d3668445771f74ba084d2029d83c1c158547f3a9f1a2715be23d51ae4d3e5a1f6a7064f316933a346d3f529252", 16),
-             384);
-
-        DHParameterSpec dhSpec1024 = new DHParameterSpec(
-                    new BigInteger("f7e1a085d69b3ddecbbcab5c36b857b97994afbbfa3aea82f9574c0b3d0782675159578ebad4594fe67107108180b449167123e84c281613b7cf09328cc8a6e13c167a8b547c8d28e0a3ae1e2bb3a675916ea37f0bfa213562f1fb627a01243bcca4f1bea8519089a883dfe15ae59f06928b665e807b552564014c3bfecf492a", 16),
-                    new BigInteger("fd7f53811d75122952df4a9c2eece4e7f611b7523cef4400c31e3f80b6512669455d402251fb593d8d58fabfc5f5ba30f6cb9b556cd7813b801d346ff26660b76b9950a5a49f9fe8047b1022c24fbba9d7feb7c61bf83b57e7c6a8a6150f04fb83f6d3c51ec3023554135a169132f675f3ae2b61d72aeff22203199dd14801c7", 16),
-                    512);
-
-        prov.setParameter(ConfigurableProvider.DH_DEFAULT_PARAMS, dhSpec512);
-
-        if (!dhSpec512.equals(BouncyCastleProvider.CONFIGURATION.getDHDefaultParameters(512)))
-        {
-            fail("config mismatch");
-        }
-
-        if (BouncyCastleProvider.CONFIGURATION.getDHDefaultParameters(768) != null)
-        {
-            fail("config found when none expected");
-        }
-
-        prov.setParameter(ConfigurableProvider.DH_DEFAULT_PARAMS, new DHParameterSpec[] { dhSpec512, dhSpec768, dhSpec1024 });
-
-        if (!dhSpec512.equals(BouncyCastleProvider.CONFIGURATION.getDHDefaultParameters(512)))
-        {
-            fail("512 config mismatch");
-        }
-
-        if (!dhSpec768.equals(BouncyCastleProvider.CONFIGURATION.getDHDefaultParameters(768)))
-        {
-            fail("768 config mismatch");
-        }
-
-        if (!dhSpec1024.equals(BouncyCastleProvider.CONFIGURATION.getDHDefaultParameters(1024)))
-        {
-            fail("1024 config mismatch");
-        }
-
-        prov.setParameter(ConfigurableProvider.DH_DEFAULT_PARAMS, null);
-
-        if (BouncyCastleProvider.CONFIGURATION.getDHDefaultParameters(512) != null)
-        {
-            fail("config found for 512 when none expected");
-        }
-
-        if (BouncyCastleProvider.CONFIGURATION.getDHDefaultParameters(768) != null)
-        {
-            fail("config found for 768 when none expected");
-        }
-
-        prov.setParameter(ConfigurableProvider.THREAD_LOCAL_DH_DEFAULT_PARAMS, dhSpec512);
-
-        if (!dhSpec512.equals(BouncyCastleProvider.CONFIGURATION.getDHDefaultParameters(512)))
-        {
-            fail("config mismatch");
-        }
-
-        if (BouncyCastleProvider.CONFIGURATION.getDHDefaultParameters(768) != null)
-        {
-            fail("config found when none expected");
-        }
-
-        prov.setParameter(ConfigurableProvider.THREAD_LOCAL_DH_DEFAULT_PARAMS, new DHParameterSpec[] { dhSpec512, dhSpec768, dhSpec1024 });
-
-        if (!dhSpec512.equals(BouncyCastleProvider.CONFIGURATION.getDHDefaultParameters(512)))
-        {
-            fail("512 config mismatch");
-        }
-
-        if (!dhSpec768.equals(BouncyCastleProvider.CONFIGURATION.getDHDefaultParameters(768)))
-        {
-            fail("768 config mismatch");
-        }
-
-        if (!dhSpec1024.equals(BouncyCastleProvider.CONFIGURATION.getDHDefaultParameters(1024)))
-        {
-            fail("1024 config mismatch");
-        }
-
-        prov.setParameter(ConfigurableProvider.THREAD_LOCAL_DH_DEFAULT_PARAMS, null);
-
-        if (BouncyCastleProvider.CONFIGURATION.getDHDefaultParameters(512) != null)
-        {
-            fail("config found for 512 when none expected");
-        }
-
-        if (BouncyCastleProvider.CONFIGURATION.getDHDefaultParameters(768) != null)
-        {
-            fail("config found for 768 when none expected");
-        }
-    }
-
-    public void performTest()
-        throws Exception
-    {
-        testDefault(64, g512, p512);
-
-        testEnc();
-        testGP("DH", 512, 0, g512, p512);
-        testGP("DiffieHellman", 768, 0, g768, p768);
-        testGP("DIFFIEHELLMAN", 1024, 0, g1024, p1024);
-        testGP("DH", 512, 64, g512, p512);
-        testGP("DiffieHellman", 768, 128, g768, p768);
-        testGP("DIFFIEHELLMAN", 1024, 256, g1024, p1024);
-        testExplicitWrapping(512, 0, g512, p512);
-        testRandom(256);
-
-        testECDH("ECDH");
-        testECDH("ECDHC");
-        testECDH("ECDH", "AES", 256);
-        testECDH("ECDH", "DESEDE", 192);
-        testECDH("ECDH", "DES", 64);
-        testECDH("ECDHwithSHA1KDF", "AES", 256);
-        testECDH("ECDHwithSHA1KDF", "DESEDE", 192);
-
-        testExceptions();
-        testDESAndDESede(g768, p768);
-        testInitialise();
-        testSmallSecret();
-        testConfig();
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        Security.addProvider(new BouncyCastleProvider());
-
-        runTest(new DHTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/DSATest.java b/bcprov/src/main/java/org/bouncycastle/jce/provider/test/DSATest.java
deleted file mode 100644
index 3e2ebd4..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/DSATest.java
+++ /dev/null
@@ -1,1016 +0,0 @@
-package org.bouncycastle.jce.provider.test;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.math.BigInteger;
-import java.security.AlgorithmParameterGenerator;
-import java.security.AlgorithmParameters;
-import java.security.InvalidKeyException;
-import java.security.KeyFactory;
-import java.security.KeyPair;
-import java.security.KeyPairGenerator;
-import java.security.PrivateKey;
-import java.security.PublicKey;
-import java.security.SecureRandom;
-import java.security.Security;
-import java.security.Signature;
-import java.security.SignatureException;
-import java.security.interfaces.DSAPrivateKey;
-import java.security.interfaces.DSAPublicKey;
-import java.security.spec.DSAParameterSpec;
-import java.security.spec.PKCS8EncodedKeySpec;
-import java.security.spec.X509EncodedKeySpec;
-
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.eac.EACObjectIdentifiers;
-import org.bouncycastle.asn1.teletrust.TeleTrusTObjectIdentifiers;
-import org.bouncycastle.asn1.x9.X9ObjectIdentifiers;
-import org.bouncycastle.crypto.params.DSAParameters;
-import org.bouncycastle.crypto.params.DSAPublicKeyParameters;
-import org.bouncycastle.crypto.signers.DSASigner;
-import org.bouncycastle.jce.interfaces.PKCS12BagAttributeCarrier;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.jce.spec.ECNamedCurveGenParameterSpec;
-import org.bouncycastle.jce.spec.ECParameterSpec;
-import org.bouncycastle.jce.spec.ECPrivateKeySpec;
-import org.bouncycastle.jce.spec.ECPublicKeySpec;
-import org.bouncycastle.math.ec.ECCurve;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.BigIntegers;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.FixedSecureRandom;
-import org.bouncycastle.util.test.SimpleTest;
-
-public class DSATest
-    extends SimpleTest
-{
-    byte[] k1 = Hex.decode("d5014e4b60ef2ba8b6211b4062ba3224e0427dd3");
-    byte[] k2 = Hex.decode("345e8d05c075c3a508df729a1685690e68fcfb8c8117847e89063bca1f85d968fd281540b6e13bd1af989a1fbf17e06462bf511f9d0b140fb48ac1b1baa5bded");
-
-    SecureRandom    random = new FixedSecureRandom(new byte[][] { k1, k2 });
-    
-    private void testCompat()
-        throws Exception
-    {
-        if (Security.getProvider("SUN") == null)
-        {
-            return;
-        }
-
-        Signature           s = Signature.getInstance("DSA", "SUN");
-        KeyPairGenerator    g = KeyPairGenerator.getInstance("DSA", "SUN");
-        byte[]              data = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 0 };
-        
-        g.initialize(512, new SecureRandom());
-        
-        KeyPair p = g.generateKeyPair();
-        
-        PrivateKey  sKey = p.getPrivate();
-        PublicKey   vKey = p.getPublic();
-        
-        //
-        // sign SUN - verify with BC 
-        //
-        s.initSign(sKey);
-        
-        s.update(data);
-        
-        byte[]  sigBytes = s.sign();
-        
-        s = Signature.getInstance("DSA", "BC");
-        
-        s.initVerify(vKey);
-        
-        s.update(data);
-        
-        if (!s.verify(sigBytes))
-        {
-            fail("SUN -> BC verification failed");
-        }
-        
-        //
-        // sign BC - verify with SUN
-        //
-        
-        s.initSign(sKey);
-        
-        s.update(data);
-        
-        sigBytes = s.sign();
-        
-        s = Signature.getInstance("DSA", "SUN");
-        
-        s.initVerify(vKey);
-        
-        s.update(data);
-        
-        if (!s.verify(sigBytes))
-        {
-            fail("BC -> SUN verification failed");
-        }
-
-        //
-        // key encoding test - BC decoding Sun keys
-        //
-        KeyFactory          f = KeyFactory.getInstance("DSA", "BC");
-        X509EncodedKeySpec  x509s = new X509EncodedKeySpec(vKey.getEncoded());
-
-        DSAPublicKey        k1 = (DSAPublicKey)f.generatePublic(x509s);
-
-        checkPublic(k1, vKey);
-        
-        PKCS8EncodedKeySpec  pkcs8 = new PKCS8EncodedKeySpec(sKey.getEncoded());
-
-        DSAPrivateKey        k2 = (DSAPrivateKey)f.generatePrivate(pkcs8);
-
-        checkPrivateKey(k2, sKey);
-        
-        //
-        // key decoding test - SUN decoding BC keys
-        // 
-        f = KeyFactory.getInstance("DSA", "SUN");
-        x509s = new X509EncodedKeySpec(k1.getEncoded());
-        
-        vKey = (DSAPublicKey)f.generatePublic(x509s);
-
-        checkPublic(k1, vKey);
-        
-        pkcs8 = new PKCS8EncodedKeySpec(k2.getEncoded());
-        sKey = f.generatePrivate(pkcs8);
-
-        checkPrivateKey(k2, sKey);
-    }
-
-    private void testNONEwithDSA()
-        throws Exception
-    {
-        byte[] dummySha1 = Hex.decode("01020304050607080910111213141516");
-
-        KeyPairGenerator kpGen = KeyPairGenerator.getInstance("DSA", "BC");
-
-        kpGen.initialize(512);
-
-        KeyPair          kp = kpGen.generateKeyPair();
-
-        Signature        sig = Signature.getInstance("NONEwithDSA", "BC");
-
-        sig.initSign(kp.getPrivate());
-
-        sig.update(dummySha1);
-
-        byte[] sigBytes = sig.sign();
-
-        sig.initVerify(kp.getPublic());
-
-        sig.update(dummySha1);
-
-        sig.verify(sigBytes);
-
-        // reset test
-
-        sig.update(dummySha1);
-
-        if (!sig.verify(sigBytes))
-        {
-            fail("NONEwithDSA failed to reset");
-        }
-
-        // lightweight test
-        DSAPublicKey  key = (DSAPublicKey)kp.getPublic();
-        DSAParameters params = new DSAParameters(key.getParams().getP(), key.getParams().getQ(), key.getParams().getG());
-        DSAPublicKeyParameters keyParams = new DSAPublicKeyParameters(key.getY(), params);
-        DSASigner signer = new DSASigner();
-        ASN1Sequence derSig = ASN1Sequence.getInstance(ASN1Primitive.fromByteArray(sigBytes));
-
-        signer.init(false, keyParams);
-
-        if (!signer.verifySignature(dummySha1, ASN1Integer.getInstance(derSig.getObjectAt(0)).getValue(), ASN1Integer.getInstance(derSig.getObjectAt(1)).getValue()))
-        {
-            fail("NONEwithDSA not really NONE!");
-        }
-    }
-
-    private void checkPublic(DSAPublicKey k1, PublicKey vKey)
-    {
-        if (!k1.getY().equals(((DSAPublicKey)vKey).getY()))
-        {
-            fail("public number not decoded properly");
-        }
-
-        if (!k1.getParams().getG().equals(((DSAPublicKey)vKey).getParams().getG()))
-        {
-            fail("public generator not decoded properly");
-        }
-
-        if (!k1.getParams().getP().equals(((DSAPublicKey)vKey).getParams().getP()))
-        {
-            fail("public p value not decoded properly");
-        }
-
-        if (!k1.getParams().getQ().equals(((DSAPublicKey)vKey).getParams().getQ()))
-        {
-            fail("public q value not decoded properly");
-        }
-    }
-
-    private void checkPrivateKey(DSAPrivateKey k2, PrivateKey sKey)
-    {
-        if (!k2.getX().equals(((DSAPrivateKey)sKey).getX()))
-        {
-            fail("private number not decoded properly");
-        }
-
-        if (!k2.getParams().getG().equals(((DSAPrivateKey)sKey).getParams().getG()))
-        {
-            fail("private generator not decoded properly");
-        }
-
-        if (!k2.getParams().getP().equals(((DSAPrivateKey)sKey).getParams().getP()))
-        {
-            fail("private p value not decoded properly");
-        }
-
-        if (!k2.getParams().getQ().equals(((DSAPrivateKey)sKey).getParams().getQ()))
-        {
-            fail("private q value not decoded properly");
-        }
-    }
-
-    private Object serializeDeserialize(Object o)
-        throws Exception
-    {
-        ByteArrayOutputStream bOut = new ByteArrayOutputStream();
-        ObjectOutputStream oOut = new ObjectOutputStream(bOut);
-
-        oOut.writeObject(o);
-        oOut.close();
-
-        ObjectInputStream oIn = new ObjectInputStream(new ByteArrayInputStream(bOut.toByteArray()));
-
-        return oIn.readObject();
-    }
-
-    /**
-     * X9.62 - 1998,<br>
-     * J.3.2, Page 155, ECDSA over the field Fp<br>
-     * an example with 239 bit prime
-     */
-    private void testECDSA239bitPrime()
-        throws Exception
-    {
-        BigInteger r = new BigInteger("308636143175167811492622547300668018854959378758531778147462058306432176");
-        BigInteger s = new BigInteger("323813553209797357708078776831250505931891051755007842781978505179448783");
-
-        byte[] kData = BigIntegers.asUnsignedByteArray(new BigInteger("700000017569056646655505781757157107570501575775705779575555657156756655"));
-
-        SecureRandom    k = new FixedSecureRandom(kData);
-
-        ECCurve curve = new ECCurve.Fp(
-                new BigInteger("883423532389192164791648750360308885314476597252960362792450860609699839"), // q
-                new BigInteger("7fffffffffffffffffffffff7fffffffffff8000000000007ffffffffffc", 16), // a
-                new BigInteger("6b016c3bdcf18941d0d654921475ca71a9db2fb27d1d37796185c2942c0a", 16)); // b
-        
-        ECParameterSpec spec = new ECParameterSpec(
-                curve,
-                curve.decodePoint(Hex.decode("020ffa963cdca8816ccc33b8642bedf905c3d358573d3f27fbbd3b3cb9aaaf")), // G
-                new BigInteger("883423532389192164791648750360308884807550341691627752275345424702807307")); // n
-        
-        
-        ECPrivateKeySpec priKey = new ECPrivateKeySpec(
-                new BigInteger("876300101507107567501066130761671078357010671067781776716671676178726717"), // d
-                spec);
-        
-        ECPublicKeySpec pubKey = new ECPublicKeySpec(
-                curve.decodePoint(Hex.decode("025b6dc53bc61a2548ffb0f671472de6c9521a9d2d2534e65abfcbd5fe0c70")), // Q
-                spec);
-        
-        Signature           sgr = Signature.getInstance("ECDSA", "BC");
-        KeyFactory          f = KeyFactory.getInstance("ECDSA", "BC");
-        PrivateKey          sKey = f.generatePrivate(priKey);
-        PublicKey           vKey = f.generatePublic(pubKey);
-        
-        sgr.initSign(sKey, k);
-        
-        byte[] message = new byte[] { (byte)'a', (byte)'b', (byte)'c' };
-        
-        sgr.update(message);
-        
-        byte[]  sigBytes = sgr.sign();
-        
-        sgr.initVerify(vKey);
-        
-        sgr.update(message);
-        
-        if (!sgr.verify(sigBytes))
-        {
-            fail("239 Bit EC verification failed");
-        }
-        
-        BigInteger[]  sig = derDecode(sigBytes);
-        
-        if (!r.equals(sig[0]))
-        {
-            fail("r component wrong." + System.getProperty("line.separator")
-                    + " expecting: " + r + System.getProperty("line.separator")
-                    + " got      : " + sig[0]);
-        }
-        
-        if (!s.equals(sig[1]))
-        {
-            fail("s component wrong." + System.getProperty("line.separator")
-                    + " expecting: " + s + System.getProperty("line.separator")
-                    + " got      : " + sig[1]);
-        }
-    }
-
-    private void testNONEwithECDSA239bitPrime()
-        throws Exception
-    {
-        ECCurve curve = new ECCurve.Fp(
-                new BigInteger("883423532389192164791648750360308885314476597252960362792450860609699839"), // q
-                new BigInteger("7fffffffffffffffffffffff7fffffffffff8000000000007ffffffffffc", 16), // a
-                new BigInteger("6b016c3bdcf18941d0d654921475ca71a9db2fb27d1d37796185c2942c0a", 16)); // b
-
-        ECParameterSpec spec = new ECParameterSpec(
-                curve,
-                curve.decodePoint(Hex.decode("020ffa963cdca8816ccc33b8642bedf905c3d358573d3f27fbbd3b3cb9aaaf")), // G
-                new BigInteger("883423532389192164791648750360308884807550341691627752275345424702807307")); // n
-
-
-        ECPrivateKeySpec priKey = new ECPrivateKeySpec(
-                new BigInteger("876300101507107567501066130761671078357010671067781776716671676178726717"), // d
-                spec);
-
-        ECPublicKeySpec pubKey = new ECPublicKeySpec(
-                curve.decodePoint(Hex.decode("025b6dc53bc61a2548ffb0f671472de6c9521a9d2d2534e65abfcbd5fe0c70")), // Q
-                spec);
-
-        Signature           sgr = Signature.getInstance("NONEwithECDSA", "BC");
-        KeyFactory          f = KeyFactory.getInstance("ECDSA", "BC");
-        PrivateKey          sKey = f.generatePrivate(priKey);
-        PublicKey           vKey = f.generatePublic(pubKey);
-
-        byte[] message = "abc".getBytes();
-        byte[] sig = Hex.decode("3040021e2cb7f36803ebb9c427c58d8265f11fc5084747133078fc279de874fbecb0021e64cb19604be06c57e761b3de5518f71de0f6e0cd2df677cec8a6ffcb690d");
-
-        checkMessage(sgr, sKey, vKey, message, sig);
-
-        message = "abcdefghijklmnopqrstuvwxyz".getBytes();
-        sig = Hex.decode("3040021e2cb7f36803ebb9c427c58d8265f11fc5084747133078fc279de874fbecb0021e43fd65b3363d76aabef8630572257dbb67c82818ad9fad31256539b1b02c");
-
-        checkMessage(sgr, sKey, vKey, message, sig);
-
-        message = "a very very long message gauranteed to cause an overflow".getBytes();
-        sig = Hex.decode("3040021e2cb7f36803ebb9c427c58d8265f11fc5084747133078fc279de874fbecb0021e7d5be84b22937a1691859a3c6fe45ed30b108574431d01b34025825ec17a");
-
-        checkMessage(sgr, sKey, vKey, message, sig);
-    }
-
-    private void checkMessage(Signature sgr, PrivateKey sKey, PublicKey vKey, byte[] message, byte[] sig)
-        throws InvalidKeyException, SignatureException
-    {
-        byte[] kData = BigIntegers.asUnsignedByteArray(new BigInteger("700000017569056646655505781757157107570501575775705779575555657156756655"));
-
-        SecureRandom    k = new FixedSecureRandom(kData);
-
-        sgr.initSign(sKey, k);
-
-        sgr.update(message);
-
-        byte[]  sigBytes = sgr.sign();
-
-        if (!Arrays.areEqual(sigBytes, sig))
-        {
-            fail(new String(message) + " signature incorrect");
-        }
-
-        sgr.initVerify(vKey);
-
-        sgr.update(message);
-
-        if (!sgr.verify(sigBytes))
-        {
-            fail(new String(message) + " verification failed");
-        }
-    }
-
-    /**
-     * X9.62 - 1998,<br>
-     * J.2.1, Page 100, ECDSA over the field F2m<br>
-     * an example with 191 bit binary field
-     */
-    private void testECDSA239bitBinary()
-        throws Exception
-    {
-        BigInteger r = new BigInteger("21596333210419611985018340039034612628818151486841789642455876922391552");
-        BigInteger s = new BigInteger("197030374000731686738334997654997227052849804072198819102649413465737174");
-    
-        byte[] kData = BigIntegers.asUnsignedByteArray(new BigInteger("171278725565216523967285789236956265265265235675811949404040041670216363"));
-
-        SecureRandom    k = new FixedSecureRandom(kData);
-
-        ECCurve curve = new ECCurve.F2m(
-            239, // m
-            36, // k
-            new BigInteger("32010857077C5431123A46B808906756F543423E8D27877578125778AC76", 16), // a
-            new BigInteger("790408F2EEDAF392B012EDEFB3392F30F4327C0CA3F31FC383C422AA8C16", 16)); // b
-    
-        ECParameterSpec params = new ECParameterSpec(
-            curve,
-            curve.decodePoint(Hex.decode("0457927098FA932E7C0A96D3FD5B706EF7E5F5C156E16B7E7C86038552E91D61D8EE5077C33FECF6F1A16B268DE469C3C7744EA9A971649FC7A9616305")), // G
-            new BigInteger("220855883097298041197912187592864814557886993776713230936715041207411783"), // n
-            BigInteger.valueOf(4)); // h
-    
-        ECPrivateKeySpec priKeySpec = new ECPrivateKeySpec(
-            new BigInteger("145642755521911534651321230007534120304391871461646461466464667494947990"), // d
-            params);
-        
-        ECPublicKeySpec pubKeySpec = new ECPublicKeySpec(
-            curve.decodePoint(Hex.decode("045894609CCECF9A92533F630DE713A958E96C97CCB8F5ABB5A688A238DEED6DC2D9D0C94EBFB7D526BA6A61764175B99CB6011E2047F9F067293F57F5")), // Q
-            params);
-    
-        Signature   sgr = Signature.getInstance("ECDSA", "BC");
-        KeyFactory  f = KeyFactory.getInstance("ECDSA", "BC");
-        PrivateKey  sKey = f.generatePrivate(priKeySpec);
-        PublicKey   vKey = f.generatePublic(pubKeySpec);
-        byte[]      message = new byte[] { (byte)'a', (byte)'b', (byte)'c' };
-       
-        sgr.initSign(sKey, k);
-
-        sgr.update(message);
-        
-        byte[]  sigBytes = sgr.sign();
-
-        sgr.initVerify(vKey);
-
-        sgr.update(message);
-
-        if (!sgr.verify(sigBytes))
-        {
-            fail("239 Bit EC verification failed");
-        }
-
-        BigInteger[]  sig = derDecode(sigBytes);
-
-        if (!r.equals(sig[0]))
-        {
-            fail("r component wrong." + System.getProperty("line.separator")
-                + " expecting: " + r + System.getProperty("line.separator")
-                + " got      : " + sig[0]);
-        }
-
-        if (!s.equals(sig[1]))
-        {
-            fail("s component wrong." + System.getProperty("line.separator")
-                + " expecting: " + s + System.getProperty("line.separator")
-                + " got      : " + sig[1]);
-        }
-    }
-
-    private void testECDSA239bitBinary(String algorithm, ASN1ObjectIdentifier oid)
-        throws Exception
-    {
-        byte[] kData = BigIntegers.asUnsignedByteArray(new BigInteger("171278725565216523967285789236956265265265235675811949404040041670216363"));
-
-        SecureRandom    k = new FixedSecureRandom(kData);
-
-        ECCurve curve = new ECCurve.F2m(
-            239, // m
-            36, // k
-            new BigInteger("32010857077C5431123A46B808906756F543423E8D27877578125778AC76", 16), // a
-            new BigInteger("790408F2EEDAF392B012EDEFB3392F30F4327C0CA3F31FC383C422AA8C16", 16)); // b
-
-        ECParameterSpec params = new ECParameterSpec(
-            curve,
-            curve.decodePoint(Hex.decode("0457927098FA932E7C0A96D3FD5B706EF7E5F5C156E16B7E7C86038552E91D61D8EE5077C33FECF6F1A16B268DE469C3C7744EA9A971649FC7A9616305")), // G
-            new BigInteger("220855883097298041197912187592864814557886993776713230936715041207411783"), // n
-            BigInteger.valueOf(4)); // h
-
-        ECPrivateKeySpec priKeySpec = new ECPrivateKeySpec(
-            new BigInteger("145642755521911534651321230007534120304391871461646461466464667494947990"), // d
-            params);
-
-        ECPublicKeySpec pubKeySpec = new ECPublicKeySpec(
-            curve.decodePoint(Hex.decode("045894609CCECF9A92533F630DE713A958E96C97CCB8F5ABB5A688A238DEED6DC2D9D0C94EBFB7D526BA6A61764175B99CB6011E2047F9F067293F57F5")), // Q
-            params);
-
-        Signature   sgr = Signature.getInstance(algorithm, "BC");
-        KeyFactory  f = KeyFactory.getInstance("ECDSA", "BC");
-        PrivateKey  sKey = f.generatePrivate(priKeySpec);
-        PublicKey   vKey = f.generatePublic(pubKeySpec);
-        byte[]      message = new byte[] { (byte)'a', (byte)'b', (byte)'c' };
-
-        sgr.initSign(sKey, k);
-
-        sgr.update(message);
-
-        byte[]  sigBytes = sgr.sign();
-
-        sgr = Signature.getInstance(oid.getId(), "BC");
-
-        sgr.initVerify(vKey);
-
-        sgr.update(message);
-
-        if (!sgr.verify(sigBytes))
-        {
-            fail("239 Bit EC RIPEMD160 verification failed");
-        }
-    }
-
-    private void testGeneration()
-        throws Exception
-    {
-        Signature           s = Signature.getInstance("DSA", "BC");
-        KeyPairGenerator    g = KeyPairGenerator.getInstance("DSA", "BC");
-        byte[]              data = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 0 };
-
-
-        // test exception
-        //
-        try
-        {
-            g.initialize(513, new SecureRandom());
-
-            fail("illegal parameter 513 check failed.");
-        }
-        catch (IllegalArgumentException e)
-        {
-            // expected
-        }
-
-        try
-        {
-            g.initialize(510, new SecureRandom());
-
-            fail("illegal parameter 510 check failed.");
-        }
-        catch (IllegalArgumentException e)
-        {
-            // expected
-        }
-
-        try
-        {
-            g.initialize(1025, new SecureRandom());
-
-            fail("illegal parameter 1025 check failed.");
-        }
-        catch (IllegalArgumentException e)
-        {
-            // expected
-        }
-
-        g.initialize(512, new SecureRandom());
-
-        KeyPair p = g.generateKeyPair();
-
-        PrivateKey  sKey = p.getPrivate();
-        PublicKey   vKey = p.getPublic();
-
-        s.initSign(sKey);
-
-        s.update(data);
-
-        byte[]  sigBytes = s.sign();
-
-        s = Signature.getInstance("DSA", "BC");
-
-        s.initVerify(vKey);
-
-        s.update(data);
-
-        if (!s.verify(sigBytes))
-        {
-            fail("DSA verification failed");
-        }
-
-        //
-        // key decoding test - serialisation test
-        //
-
-        DSAPublicKey k1 = (DSAPublicKey)serializeDeserialize(vKey);
-
-        checkPublic(k1, vKey);
-
-        checkEquals(k1, vKey);
-
-        DSAPrivateKey k2 = (DSAPrivateKey)serializeDeserialize(sKey);
-
-        checkPrivateKey(k2, sKey);
-
-        checkEquals(k2, sKey);
-
-        if (!(k2 instanceof PKCS12BagAttributeCarrier))
-        {
-            fail("private key not implementing PKCS12 attribute carrier");
-        }
-
-        //
-        // ECDSA Fp generation test
-        //
-        s = Signature.getInstance("ECDSA", "BC");
-        g = KeyPairGenerator.getInstance("ECDSA", "BC");
-
-        ECCurve curve = new ECCurve.Fp(
-            new BigInteger("883423532389192164791648750360308885314476597252960362792450860609699839"), // q
-            new BigInteger("7fffffffffffffffffffffff7fffffffffff8000000000007ffffffffffc", 16), // a
-            new BigInteger("6b016c3bdcf18941d0d654921475ca71a9db2fb27d1d37796185c2942c0a", 16)); // b
-
-        ECParameterSpec ecSpec = new ECParameterSpec(
-            curve,
-            curve.decodePoint(Hex.decode("020ffa963cdca8816ccc33b8642bedf905c3d358573d3f27fbbd3b3cb9aaaf")), // G
-            new BigInteger("883423532389192164791648750360308884807550341691627752275345424702807307")); // n
-
-        g.initialize(ecSpec, new SecureRandom());
-
-        p = g.generateKeyPair();
-
-        sKey = p.getPrivate();
-        vKey = p.getPublic();
-
-        s.initSign(sKey);
-
-        s.update(data);
-
-        sigBytes = s.sign();
-
-        s = Signature.getInstance("ECDSA", "BC");
-
-        s.initVerify(vKey);
-
-        s.update(data);
-
-        if (!s.verify(sigBytes))
-        {
-            fail("ECDSA verification failed");
-        }
-
-        //
-        // key decoding test - serialisation test
-        //
-
-        PublicKey eck1 = (PublicKey)serializeDeserialize(vKey);
-
-        checkEquals(eck1, vKey);
-
-        PrivateKey eck2 = (PrivateKey)serializeDeserialize(sKey);
-
-        checkEquals(eck2, sKey);
-
-        // Named curve parameter
-        g.initialize(new ECNamedCurveGenParameterSpec("P-256"), new SecureRandom());
-
-        p = g.generateKeyPair();
-
-        sKey = p.getPrivate();
-        vKey = p.getPublic();
-
-        s.initSign(sKey);
-
-        s.update(data);
-
-        sigBytes = s.sign();
-
-        s = Signature.getInstance("ECDSA", "BC");
-
-        s.initVerify(vKey);
-
-        s.update(data);
-
-        if (!s.verify(sigBytes))
-        {
-            fail("ECDSA verification failed");
-        }
-
-        //
-        // key decoding test - serialisation test
-        //
-
-        eck1 = (PublicKey)serializeDeserialize(vKey);
-
-        checkEquals(eck1, vKey);
-
-        eck2 = (PrivateKey)serializeDeserialize(sKey);
-
-        checkEquals(eck2, sKey);
-
-        //
-        // ECDSA F2m generation test
-        //
-        s = Signature.getInstance("ECDSA", "BC");
-        g = KeyPairGenerator.getInstance("ECDSA", "BC");
-
-        curve = new ECCurve.F2m(
-                239, // m
-                36, // k
-                new BigInteger("32010857077C5431123A46B808906756F543423E8D27877578125778AC76", 16), // a
-                new BigInteger("790408F2EEDAF392B012EDEFB3392F30F4327C0CA3F31FC383C422AA8C16", 16)); // b
-        
-        ecSpec = new ECParameterSpec(
-            curve,
-            curve.decodePoint(Hex.decode("0457927098FA932E7C0A96D3FD5B706EF7E5F5C156E16B7E7C86038552E91D61D8EE5077C33FECF6F1A16B268DE469C3C7744EA9A971649FC7A9616305")), // G
-            new BigInteger("220855883097298041197912187592864814557886993776713230936715041207411783"), // n
-            BigInteger.valueOf(4)); // h
-        
-        g.initialize(ecSpec, new SecureRandom());
-
-        p = g.generateKeyPair();
-
-        sKey = p.getPrivate();
-        vKey = p.getPublic();
-
-        s.initSign(sKey);
-
-        s.update(data);
-
-        sigBytes = s.sign();
-
-        s = Signature.getInstance("ECDSA", "BC");
-
-        s.initVerify(vKey);
-
-        s.update(data);
-
-        if (!s.verify(sigBytes))
-        {
-            fail("ECDSA verification failed");
-        }
-
-        //
-        // key decoding test - serialisation test
-        //
-
-        eck1 = (PublicKey)serializeDeserialize(vKey);
-
-        checkEquals(eck1, vKey);
-
-        eck2 = (PrivateKey)serializeDeserialize(sKey);
-
-        checkEquals(eck2, sKey);
-
-        if (!(eck2 instanceof PKCS12BagAttributeCarrier))
-        {
-            fail("private key not implementing PKCS12 attribute carrier");
-        }
-    }
-
-    private void checkEquals(Object o1, Object o2)
-    {
-        if (!o1.equals(o2))
-        {
-            fail("comparison test failed");
-        }
-
-        if (o1.hashCode() != o2.hashCode())
-        {
-            fail("hashCode test failed");
-        }
-    }
-    
-    private void testParameters()
-        throws Exception
-    {
-        AlgorithmParameterGenerator a = AlgorithmParameterGenerator.getInstance("DSA", "BC");
-        a.init(512, random);
-        AlgorithmParameters params = a.generateParameters();
-        
-        byte[] encodeParams = params.getEncoded();
-        
-        AlgorithmParameters a2 = AlgorithmParameters.getInstance("DSA", "BC");
-        a2.init(encodeParams);
-        
-        // a and a2 should be equivalent!
-        byte[] encodeParams_2 = a2.getEncoded();
-        
-        if (!areEqual(encodeParams, encodeParams_2))
-        {
-            fail("encode/decode parameters failed");
-        }
-        
-        DSAParameterSpec dsaP = (DSAParameterSpec)params.getParameterSpec(DSAParameterSpec.class);
-        
-        KeyPairGenerator    g = KeyPairGenerator.getInstance("DSA", "BC");
-        g.initialize(dsaP, new SecureRandom());
-        KeyPair p = g.generateKeyPair();
-        
-        PrivateKey  sKey = p.getPrivate();
-        PublicKey   vKey = p.getPublic();
-        
-        Signature           s = Signature.getInstance("DSA", "BC");
-        byte[]              data = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 0 };
-        
-        s.initSign(sKey);
-        
-        s.update(data);
-        
-        byte[]  sigBytes = s.sign();
-        
-        s = Signature.getInstance("DSA", "BC");
-        
-        s.initVerify(vKey);
-        
-        s.update(data);
-        
-        if (!s.verify(sigBytes))
-        {
-            fail("DSA verification failed");
-        }
-    }
-
-    private void testDSA2Parameters()
-        throws Exception
-    {
-        byte[] seed = Hex.decode("4783081972865EA95D43318AB2EAF9C61A2FC7BBF1B772A09017BDF5A58F4FF0");
-
-        AlgorithmParameterGenerator a = AlgorithmParameterGenerator.getInstance("DSA", "BC");
-        a.init(2048, new DSATestSecureRandom(seed));
-        AlgorithmParameters params = a.generateParameters();
-
-        DSAParameterSpec dsaP = (DSAParameterSpec)params.getParameterSpec(DSAParameterSpec.class);
-
-        if (!dsaP.getQ().equals(new BigInteger("C24ED361870B61E0D367F008F99F8A1F75525889C89DB1B673C45AF5867CB467", 16)))
-        {
-            fail("Q incorrect");
-        }
-
-        if (!dsaP.getP().equals(new BigInteger(
-            "F56C2A7D366E3EBDEAA1891FD2A0D099" +
-            "436438A673FED4D75F594959CFFEBCA7BE0FC72E4FE67D91" +
-            "D801CBA0693AC4ED9E411B41D19E2FD1699C4390AD27D94C" +
-            "69C0B143F1DC88932CFE2310C886412047BD9B1C7A67F8A2" +
-            "5909132627F51A0C866877E672E555342BDF9355347DBD43" +
-            "B47156B2C20BAD9D2B071BC2FDCF9757F75C168C5D9FC431" +
-            "31BE162A0756D1BDEC2CA0EB0E3B018A8B38D3EF2487782A" +
-            "EB9FBF99D8B30499C55E4F61E5C7DCEE2A2BB55BD7F75FCD" +
-            "F00E48F2E8356BDB59D86114028F67B8E07B127744778AFF" +
-            "1CF1399A4D679D92FDE7D941C5C85C5D7BFF91BA69F9489D" +
-            "531D1EBFA727CFDA651390F8021719FA9F7216CEB177BD75", 16)))
-        {
-            fail("P incorrect");
-        }
-
-        if (!dsaP.getG().equals(new BigInteger(
-            "8DC6CC814CAE4A1C05A3E186A6FE27EA" +
-            "BA8CDB133FDCE14A963A92E809790CBA096EAA26140550C1" +
-            "29FA2B98C16E84236AA33BF919CD6F587E048C52666576DB" +
-            "6E925C6CBE9B9EC5C16020F9A44C9F1C8F7A8E611C1F6EC2" +
-            "513EA6AA0B8D0F72FED73CA37DF240DB57BBB27431D61869" +
-            "7B9E771B0B301D5DF05955425061A30DC6D33BB6D2A32BD0" +
-            "A75A0A71D2184F506372ABF84A56AEEEA8EB693BF29A6403" +
-            "45FA1298A16E85421B2208D00068A5A42915F82CF0B858C8" +
-            "FA39D43D704B6927E0B2F916304E86FB6A1B487F07D8139E" +
-            "428BB096C6D67A76EC0B8D4EF274B8A2CF556D279AD267CC" +
-            "EF5AF477AFED029F485B5597739F5D0240F67C2D948A6279", 16)))
-        {
-            fail("G incorrect");
-        }
-
-        KeyPairGenerator    g = KeyPairGenerator.getInstance("DSA", "BC");
-        g.initialize(dsaP, new FixedSecureRandom(Hex.decode("0CAF2EF547EC49C4F3A6FE6DF4223A174D01F2C115D49A6F73437C29A2A8458C")));
-        KeyPair p = g.generateKeyPair();
-
-        DSAPrivateKey  sKey = (DSAPrivateKey)p.getPrivate();
-        DSAPublicKey   vKey = (DSAPublicKey)p.getPublic();
-
-        if (!vKey.getY().equals(new BigInteger(
-            "2828003D7C747199143C370FDD07A286" +
-            "1524514ACC57F63F80C38C2087C6B795B62DE1C224BF8D1D" +
-            "1424E60CE3F5AE3F76C754A2464AF292286D873A7A30B7EA" +
-            "CBBC75AAFDE7191D9157598CDB0B60E0C5AA3F6EBE425500" +
-            "C611957DBF5ED35490714A42811FDCDEB19AF2AB30BEADFF" +
-            "2907931CEE7F3B55532CFFAEB371F84F01347630EB227A41" +
-            "9B1F3F558BC8A509D64A765D8987D493B007C4412C297CAF" +
-            "41566E26FAEE475137EC781A0DC088A26C8804A98C23140E" +
-            "7C936281864B99571EE95C416AA38CEEBB41FDBFF1EB1D1D" +
-            "C97B63CE1355257627C8B0FD840DDB20ED35BE92F08C49AE" +
-            "A5613957D7E5C7A6D5A5834B4CB069E0831753ECF65BA02B", 16)))
-        {
-            fail("Y value incorrect");
-        }
-
-        if (!sKey.getX().equals(
-            new BigInteger("0CAF2EF547EC49C4F3A6FE6DF4223A174D01F2C115D49A6F73437C29A2A8458C", 16)))
-        {
-            fail("X value incorrect");
-        }
-
-        byte[] encodeParams = params.getEncoded();
-
-        AlgorithmParameters a2 = AlgorithmParameters.getInstance("DSA", "BC");
-        a2.init(encodeParams);
-
-        // a and a2 should be equivalent!
-        byte[] encodeParams_2 = a2.getEncoded();
-
-        if (!areEqual(encodeParams, encodeParams_2))
-        {
-            fail("encode/decode parameters failed");
-        }
-
-        Signature           s = Signature.getInstance("DSA", "BC");
-        byte[]              data = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 0 };
-
-        s.initSign(sKey);
-
-        s.update(data);
-
-        byte[]  sigBytes = s.sign();
-
-        s = Signature.getInstance("DSA", "BC");
-
-        s.initVerify(vKey);
-
-        s.update(data);
-
-        if (!s.verify(sigBytes))
-        {
-            fail("DSA verification failed");
-        }
-    }
-
-    public void performTest()
-        throws Exception
-    {
-        testCompat();
-        testNONEwithDSA();
-        testECDSA239bitPrime();
-        testNONEwithECDSA239bitPrime();
-        testECDSA239bitBinary();
-        testECDSA239bitBinary("RIPEMD160withECDSA", TeleTrusTObjectIdentifiers.ecSignWithRipemd160);
-        testECDSA239bitBinary("SHA1withECDSA", TeleTrusTObjectIdentifiers.ecSignWithSha1);
-        testECDSA239bitBinary("SHA224withECDSA", X9ObjectIdentifiers.ecdsa_with_SHA224);
-        testECDSA239bitBinary("SHA256withECDSA", X9ObjectIdentifiers.ecdsa_with_SHA256);
-        testECDSA239bitBinary("SHA384withECDSA", X9ObjectIdentifiers.ecdsa_with_SHA384);
-        testECDSA239bitBinary("SHA512withECDSA", X9ObjectIdentifiers.ecdsa_with_SHA512);
-        testECDSA239bitBinary("SHA1withCVC-ECDSA", EACObjectIdentifiers.id_TA_ECDSA_SHA_1);
-        testECDSA239bitBinary("SHA224withCVC-ECDSA", EACObjectIdentifiers.id_TA_ECDSA_SHA_224);
-        testECDSA239bitBinary("SHA256withCVC-ECDSA", EACObjectIdentifiers.id_TA_ECDSA_SHA_256);
-        testECDSA239bitBinary("SHA384withCVC-ECDSA", EACObjectIdentifiers.id_TA_ECDSA_SHA_384);
-        testECDSA239bitBinary("SHA512withCVC-ECDSA", EACObjectIdentifiers.id_TA_ECDSA_SHA_512);
-
-        testGeneration();
-        testParameters();
-        testDSA2Parameters();
-    }
-
-    protected BigInteger[] derDecode(
-        byte[]  encoding)
-        throws IOException
-    {
-        ByteArrayInputStream    bIn = new ByteArrayInputStream(encoding);
-        ASN1InputStream         aIn = new ASN1InputStream(bIn);
-        ASN1Sequence            s = (ASN1Sequence)aIn.readObject();
-
-        BigInteger[]            sig = new BigInteger[2];
-
-        sig[0] = ((ASN1Integer)s.getObjectAt(0)).getValue();
-        sig[1] = ((ASN1Integer)s.getObjectAt(1)).getValue();
-
-        return sig;
-    }
-
-    public String getName()
-    {
-        return "DSA/ECDSA";
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        Security.addProvider(new BouncyCastleProvider());
-
-        runTest(new DSATest());
-    }
-
-    private class DSATestSecureRandom
-        extends FixedSecureRandom
-    {
-        private boolean first = true;
-
-        public DSATestSecureRandom(byte[] value)
-        {
-            super(value);
-        }
-
-       public void nextBytes(byte[] bytes)
-       {
-           if (first)
-           {
-               super.nextBytes(bytes);
-               first = false;
-           }
-           else
-           {
-               bytes[bytes.length - 1] = 2;
-           }
-       }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/DSTU4145Test.java b/bcprov/src/main/java/org/bouncycastle/jce/provider/test/DSTU4145Test.java
deleted file mode 100644
index 5d29841..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/DSTU4145Test.java
+++ /dev/null
@@ -1,196 +0,0 @@
-package org.bouncycastle.jce.provider.test;
-
-import java.io.IOException;
-import java.math.BigInteger;
-import java.security.InvalidAlgorithmParameterException;
-import java.security.InvalidKeyException;
-import java.security.KeyFactory;
-import java.security.KeyPair;
-import java.security.KeyPairGenerator;
-import java.security.NoSuchAlgorithmException;
-import java.security.NoSuchProviderException;
-import java.security.PrivateKey;
-import java.security.PublicKey;
-import java.security.SecureRandom;
-import java.security.Security;
-import java.security.Signature;
-import java.security.interfaces.ECPrivateKey;
-import java.security.interfaces.ECPublicKey;
-
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.jce.spec.ECParameterSpec;
-import org.bouncycastle.jce.spec.ECPrivateKeySpec;
-import org.bouncycastle.jce.spec.ECPublicKeySpec;
-import org.bouncycastle.math.ec.ECCurve;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.FixedSecureRandom;
-import org.bouncycastle.util.test.SimpleTest;
-
-public class DSTU4145Test
-    extends SimpleTest
-{
-
-    public String getName()
-    {
-        return "DSTU4145";
-    }
-
-    public void performTest()
-        throws Exception
-    {
-
-        DSTU4145Test();
-        generationTest();
-        //parametersTest();
-
-    }
-
-    public static void main(String[] args)
-    {
-        Security.addProvider(new BouncyCastleProvider());
-        runTest(new DSTU4145Test());
-    }
-    
-    static final BigInteger r = new BigInteger("00f2702989366e9569d5092b83ac17f918bf040c487a", 16);
-    static final BigInteger s = new BigInteger("01dd460039db3be70392d7012f2a492d3e59091ab7a6", 16);
-    
-    private void generationTest() throws Exception
-    {
-        ECCurve.F2m curve = new ECCurve.F2m(173, 1, 2, 10, BigInteger.ZERO, new BigInteger("108576C80499DB2FC16EDDF6853BBB278F6B6FB437D9", 16));
-
-        ECParameterSpec spec = new ECParameterSpec(
-            curve,
-            curve.createPoint(new BigInteger("BE6628EC3E67A91A4E470894FBA72B52C515F8AEE9", 16), new BigInteger("D9DEEDF655CF5412313C11CA566CDC71F4DA57DB45C", 16), false),
-            new BigInteger("800000000000000000000189B4E67606E3825BB2831", 16));
-        
-        SecureRandom k = new FixedSecureRandom(Hex.decode("00137449348C1249971759D99C252FFE1E14D8B31F00"));
-        SecureRandom keyRand = new FixedSecureRandom(Hex.decode("0000955CD7E344303D1034E66933DC21C8044D42ADB8"));
-        
-        KeyPairGenerator keyGen = KeyPairGenerator.getInstance("DSTU4145", "BC");
-        keyGen.initialize(spec, keyRand);
-        KeyPair pair = keyGen.generateKeyPair();
-        
-        Signature sgr = Signature.getInstance("DSTU4145", "BC");
-
-        sgr.initSign(pair.getPrivate(), k);
-
-        byte[] message = new byte[]{(byte)'a', (byte)'b', (byte)'c'};
-
-        sgr.update(message);
-
-        byte[] sigBytes = sgr.sign();
-
-        sgr.initVerify(pair.getPublic());
-
-        sgr.update(message);
-
-        if (!sgr.verify(sigBytes))
-        {
-            fail("DSTU4145 verification failed");
-        }
-
-        BigInteger[] sig = decode(sigBytes);
-
-        if (!r.equals(sig[0]))
-        {
-            fail(
-                ": r component wrong." + System.getProperty("line.separator")
-                    + " expecting: " + r + System.getProperty("line.separator")
-                    + " got      : " + sig[0].toString(16));
-        }
-
-        if (!s.equals(sig[1]))
-        {
-            fail(
-                ": s component wrong." + System.getProperty("line.separator")
-                    + " expecting: " + s + System.getProperty("line.separator")
-                    + " got      : " + sig[1].toString(16));
-        }
-    }
-
-    private void DSTU4145Test()
-        throws Exception
-    {
-
-        SecureRandom k = new FixedSecureRandom(Hex.decode("00137449348C1249971759D99C252FFE1E14D8B31F00"));
-
-        ECCurve.F2m curve = new ECCurve.F2m(173, 1, 2, 10, BigInteger.ZERO, new BigInteger("108576C80499DB2FC16EDDF6853BBB278F6B6FB437D9", 16));
-
-        ECParameterSpec spec = new ECParameterSpec(
-            curve,
-            curve.createPoint(new BigInteger("BE6628EC3E67A91A4E470894FBA72B52C515F8AEE9", 16), new BigInteger("D9DEEDF655CF5412313C11CA566CDC71F4DA57DB45C", 16), false),
-            new BigInteger("800000000000000000000189B4E67606E3825BB2831", 16));
-
-        ECPrivateKeySpec priKey = new ECPrivateKeySpec(
-            new BigInteger("955CD7E344303D1034E66933DC21C8044D42ADB8", 16), // d
-            spec);
-
-        ECPublicKeySpec pubKey = new ECPublicKeySpec(
-            curve.createPoint(new BigInteger("22de541d48a75c1c3b8c7c107b2551c5093c6c096e1", 16), new BigInteger("1e5b602efc0269d61e64d97c9193d2788fa05c4b7fd5", 16), false),
-            spec);
-
-        Signature sgr = Signature.getInstance("DSTU4145", "BC");
-        KeyFactory f = KeyFactory.getInstance("DSTU4145", "BC");
-        PrivateKey sKey = f.generatePrivate(priKey);
-        PublicKey vKey = f.generatePublic(pubKey);
-
-        sgr.initSign(sKey, k);
-
-        byte[] message = new byte[]{(byte)'a', (byte)'b', (byte)'c'};
-
-        sgr.update(message);
-
-        byte[] sigBytes = sgr.sign();
-
-        sgr.initVerify(vKey);
-
-        sgr.update(message);
-
-        if (!sgr.verify(sigBytes))
-        {
-            fail("DSTU4145 verification failed");
-        }
-
-        BigInteger[] sig = decode(sigBytes);
-
-        if (!r.equals(sig[0]))
-        {
-            fail(
-                ": r component wrong." + System.getProperty("line.separator")
-                    + " expecting: " + r + System.getProperty("line.separator")
-                    + " got      : " + sig[0].toString(16));
-        }
-
-        if (!s.equals(sig[1]))
-        {
-            fail(
-                ": s component wrong." + System.getProperty("line.separator")
-                    + " expecting: " + s + System.getProperty("line.separator")
-                    + " got      : " + sig[1].toString(16));
-        }
-    }
-
-    private BigInteger[] decode(
-        byte[] encoding)
-        throws IOException
-    {
-        ASN1OctetString octetString = (ASN1OctetString)ASN1OctetString.fromByteArray(encoding);
-        encoding = octetString.getOctets();
-
-        byte[] r = new byte[encoding.length / 2];
-        byte[] s = new byte[encoding.length / 2];
-
-        System.arraycopy(encoding, 0, s, 0, encoding.length / 2);
-
-        System.arraycopy(encoding, encoding.length / 2, r, 0, encoding.length / 2);
-
-        BigInteger[] sig = new BigInteger[2];
-
-        sig[0] = new BigInteger(1, r);
-        sig[1] = new BigInteger(1, s);
-
-        return sig;
-    }
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/DetDSATest.java b/bcprov/src/main/java/org/bouncycastle/jce/provider/test/DetDSATest.java
deleted file mode 100644
index 16c1969..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/DetDSATest.java
+++ /dev/null
@@ -1,152 +0,0 @@
-package org.bouncycastle.jce.provider.test;
-
-import java.math.BigInteger;
-import java.security.KeyFactory;
-import java.security.PrivateKey;
-import java.security.Security;
-import java.security.Signature;
-import java.security.spec.DSAPrivateKeySpec;
-import java.security.spec.ECFieldFp;
-import java.security.spec.ECParameterSpec;
-import java.security.spec.ECPoint;
-import java.security.spec.ECPrivateKeySpec;
-import java.security.spec.EllipticCurve;
-
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.nist.NISTNamedCurves;
-import org.bouncycastle.asn1.x9.X9ECParameters;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.math.ec.ECCurve;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-
-/**
- * Tests are taken from RFC 6979 - "Deterministic Usage of the Digital Signature Algorithm (DSA) and Elliptic Curve Digital Signature Algorithm (ECDSA)"
- */
-public class DetDSATest
-    extends SimpleTest
-{
-
-    public static final byte[] SAMPLE = Hex.decode("73616d706c65"); // "sample"
-    public static final byte[] TEST = Hex.decode("74657374"); // "test"
-
-    // test vectors from appendix in RFC 6979
-    private void testHMacDeterministic()
-        throws Exception
-    {
-        DSAPrivateKeySpec privKeySpec = new DSAPrivateKeySpec(new BigInteger("411602CB19A6CCC34494D79D98EF1E7ED5AF25F7", 16),
-            new BigInteger("86F5CA03DCFEB225063FF830A0C769B9DD9D6153AD91D7CE27F787C43278B447" +
-                           "E6533B86B18BED6E8A48B784A14C252C5BE0DBF60B86D6385BD2F12FB763ED88" +
-                           "73ABFD3F5BA2E0A8C0A59082EAC056935E529DAF7C610467899C77ADEDFC846C" +
-                           "881870B7B19B2B58F9BE0521A17002E3BDD6B86685EE90B3D9A1B02B782B1779", 16),
-            new BigInteger("996F967F6C8E388D9E28D01E205FBA957A5698B1", 16),
-            new BigInteger("07B0F92546150B62514BB771E2A0C0CE387F03BDA6C56B505209FF25FD3C133D" +
-                           "89BBCD97E904E09114D9A7DEFDEADFC9078EA544D2E401AEECC40BB9FBBF78FD" +
-                           "87995A10A1C27CB7789B594BA7EFB5C4326A9FE59A070E136DB77175464ADCA4" +
-                           "17BE5DCE2F40D10A46A3A3943F26AB7FD9C0398FF8C76EE0A56826A8A88F1DBD", 16));
-
-        KeyFactory keyFact = KeyFactory.getInstance("DSA", "BC");
-
-        PrivateKey privKey = keyFact.generatePrivate(privKeySpec);
-
-        doTestHMACDetDSASample("SHA1withDETDSA", privKey, new BigInteger("2E1A0C2562B2912CAAF89186FB0F42001585DA55", 16), new BigInteger("29EFB6B0AFF2D7A68EB70CA313022253B9A88DF5", 16));
-        doTestHMACDetDSASample("SHA224withDETDSA", privKey, new BigInteger("4BC3B686AEA70145856814A6F1BB53346F02101E", 16), new BigInteger("410697B92295D994D21EDD2F4ADA85566F6F94C1", 16));
-        doTestHMACDetDSASample("SHA256withDETDSA", privKey, new BigInteger("81F2F5850BE5BC123C43F71A3033E9384611C545", 16), new BigInteger("4CDD914B65EB6C66A8AAAD27299BEE6B035F5E89", 16));
-        doTestHMACDetDSASample("SHA384withDETDSA", privKey, new BigInteger("07F2108557EE0E3921BC1774F1CA9B410B4CE65A", 16), new BigInteger("54DF70456C86FAC10FAB47C1949AB83F2C6F7595", 16));
-        doTestHMACDetDSASample("SHA512withDETDSA", privKey, new BigInteger("16C3491F9B8C3FBBDD5E7A7B667057F0D8EE8E1B", 16), new BigInteger("02C36A127A7B89EDBB72E4FFBC71DABC7D4FC69C", 16));
-    }
-
-    private void doTestHMACDetDSASample(String algName, PrivateKey privKey, BigInteger r, BigInteger s)
-        throws Exception
-    {
-        doTestHMACDetECDSA(Signature.getInstance(algName, "BC"), SAMPLE, privKey, r, s);
-    }
-
-    // test vectors from appendix in RFC 6979
-    private void testECHMacDeterministic()
-        throws Exception
-    {
-        X9ECParameters x9ECParameters = NISTNamedCurves.getByName("P-192");
-        ECCurve curve = x9ECParameters.getCurve();
-
-        ECPrivateKeySpec privKeySpec = new ECPrivateKeySpec(new BigInteger("6FAB034934E4C0FC9AE67F5B5659A9D7D1FEFD187EE09FD4", 16),
-            new ECParameterSpec(
-                new EllipticCurve(new ECFieldFp(((ECCurve.Fp)curve).getQ()), curve.getA().toBigInteger(), curve.getB().toBigInteger(), null),
-                new ECPoint(x9ECParameters.getG().getXCoord().toBigInteger(), x9ECParameters.getG().getYCoord().toBigInteger()),
-                x9ECParameters.getN(), x9ECParameters.getH().intValue())
-            );
-
-        KeyFactory keyFact = KeyFactory.getInstance("ECDSA", "BC");
-
-        PrivateKey privKey = keyFact.generatePrivate(privKeySpec);
-
-        doTestHMACDetECDSASample("SHA1withDETECDSA", privKey,   new BigInteger("98C6BD12B23EAF5E2A2045132086BE3EB8EBD62ABF6698FF", 16), new BigInteger("57A22B07DEA9530F8DE9471B1DC6624472E8E2844BC25B64", 16));
-        doTestHMACDetECDSASample("SHA224withDETECDSA", privKey, new BigInteger("A1F00DAD97AEEC91C95585F36200C65F3C01812AA60378F5", 16), new BigInteger("E07EC1304C7C6C9DEBBE980B9692668F81D4DE7922A0F97A", 16));
-        doTestHMACDetECDSASample("SHA256withDETECDSA", privKey, new BigInteger("4B0B8CE98A92866A2820E20AA6B75B56382E0F9BFD5ECB55", 16), new BigInteger("CCDB006926EA9565CBADC840829D8C384E06DE1F1E381B85", 16));
-        doTestHMACDetECDSASample("SHA384withDETECDSA", privKey, new BigInteger("DA63BF0B9ABCF948FBB1E9167F136145F7A20426DCC287D5", 16), new BigInteger("C3AA2C960972BD7A2003A57E1C4C77F0578F8AE95E31EC5E", 16));
-        doTestHMACDetECDSASample("SHA512withDETECDSA", privKey, new BigInteger("4D60C5AB1996BD848343B31C00850205E2EA6922DAC2E4B8", 16), new BigInteger("3F6E837448F027A1BF4B34E796E32A811CBB4050908D8F67", 16));
-
-        doTestHMACDetECDSATest("SHA1withDETECDSA", privKey,   new BigInteger("0F2141A0EBBC44D2E1AF90A50EBCFCE5E197B3B7D4DE036D", 16), new BigInteger("EB18BC9E1F3D7387500CB99CF5F7C157070A8961E38700B7", 16));
-        doTestHMACDetECDSATest("SHA224withDETECDSA", privKey, new BigInteger("6945A1C1D1B2206B8145548F633BB61CEF04891BAF26ED34", 16), new BigInteger("B7FB7FDFC339C0B9BD61A9F5A8EAF9BE58FC5CBA2CB15293", 16));
-        doTestHMACDetECDSATest("SHA256withDETECDSA", privKey, new BigInteger("3A718BD8B4926C3B52EE6BBE67EF79B18CB6EB62B1AD97AE", 16), new BigInteger("5662E6848A4A19B1F1AE2F72ACD4B8BBE50F1EAC65D9124F", 16));
-        doTestHMACDetECDSATest("SHA384withDETECDSA", privKey, new BigInteger("B234B60B4DB75A733E19280A7A6034BD6B1EE88AF5332367", 16), new BigInteger("7994090B2D59BB782BE57E74A44C9A1C700413F8ABEFE77A", 16));
-        doTestHMACDetECDSATest("SHA512withDETECDSA", privKey, new BigInteger("FE4F4AE86A58B6507946715934FE2D8FF9D95B6B098FE739", 16), new BigInteger("74CF5605C98FBA0E1EF34D4B5A1577A7DCF59457CAE52290", 16));
-    }
-
-    private void doTestHMACDetECDSASample(String sigAlg, PrivateKey privKey, BigInteger r, BigInteger s)
-        throws Exception
-    {
-        doTestHMACDetECDSA(Signature.getInstance(sigAlg, "BC"), SAMPLE, privKey, r, s);
-    }
-
-    private void doTestHMACDetECDSATest(String sigAlg, PrivateKey privKey, BigInteger r, BigInteger s)
-        throws Exception
-    {
-        doTestHMACDetECDSA(Signature.getInstance(sigAlg, "BC"), TEST, privKey, r, s);
-    }
-
-    private void doTestHMACDetECDSA(Signature detSigner, byte[] data, PrivateKey privKey, BigInteger r, BigInteger s)
-        throws Exception
-    {
-        detSigner.initSign(privKey);
-
-        detSigner.update(data, 0, data.length);
-
-        byte[] m = detSigner.sign();
-
-        ASN1Sequence seq = ASN1Sequence.getInstance(m);
-
-
-        if (!r.equals(ASN1Integer.getInstance(seq.getObjectAt(0)).getValue()))
-        {
-            fail("r value wrong");
-        }
-        if (!s.equals(ASN1Integer.getInstance(seq.getObjectAt(1)).getValue()))
-        {
-            fail("s value wrong");
-        }
-    }
-
-    public String getName()
-    {
-        return "DetDSA";
-    }
-
-    public void performTest()
-        throws Exception
-    {
-        testHMacDeterministic();
-        testECHMacDeterministic();
-    }
-
-
-    public static void main(
-        String[] args)
-    {
-        Security.addProvider(new BouncyCastleProvider());
-
-        runTest(new DetDSATest());
-    }
-}
-
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/DigestTest.java b/bcprov/src/main/java/org/bouncycastle/jce/provider/test/DigestTest.java
deleted file mode 100644
index 679f3ea..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/DigestTest.java
+++ /dev/null
@@ -1,154 +0,0 @@
-package org.bouncycastle.jce.provider.test;
-
-import java.security.MessageDigest;
-import java.security.Security;
-
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-
-public class DigestTest
-    extends SimpleTest
-{
-    final static String provider = "BC";
-
-    static private String[][] abcVectors =
-    {
-        { "MD2", "da853b0d3f88d99b30283a69e6ded6bb" },
-        { "MD4", "a448017aaf21d8525fc10ae87aa6729d" },
-        { "MD5", "900150983cd24fb0d6963f7d28e17f72"},
-        { "SHA-1", "a9993e364706816aba3e25717850c26c9cd0d89d" },
-        { "SHA-224", "23097d223405d8228642a477bda255b32aadbce4bda0b3f7e36c9da7" },
-        { "SHA-256", "ba7816bf8f01cfea414140de5dae2223b00361a396177a9cb410ff61f20015ad" },
-        { "SHA-384", "cb00753f45a35e8bb5a03d699ac65007272c32ab0eded1631a8b605a43ff5bed8086072ba1e7cc2358baeca134c825a7" },
-        { "SHA-512", "ddaf35a193617abacc417349ae20413112e6fa4e89a97ea20a9eeee64b55d39a2192992a274fc1a836ba3c23a3feebbd454d4423643ce80e2a9ac94fa54ca49f" },
-        { "SHA-512/224", "4634270F707B6A54DAAE7530460842E20E37ED265CEEE9A43E8924AA" },
-        { "SHA-512/256", "53048E2681941EF99B2E29B76B4C7DABE4C2D0C634FC6D46E0E2F13107E7AF23" },
-        { "RIPEMD128", "c14a12199c66e4ba84636b0f69144c77" },
-        { "RIPEMD160", "8eb208f7e05d987a9b044a8e98c6b087f15a0bfc" },
-        { "RIPEMD256", "afbd6e228b9d8cbbcef5ca2d03e6dba10ac0bc7dcbe4680e1e42d2e975459b65" },
-        { "RIPEMD320", "de4c01b3054f8930a79d09ae738e92301e5a17085beffdc1b8d116713e74f82fa942d64cdbc4682d" },
-        { "Tiger", "2AAB1484E8C158F2BFB8C5FF41B57A525129131C957B5F93" },
-        { "GOST3411", "b285056dbf18d7392d7677369524dd14747459ed8143997e163b2986f92fd42c" },
-        { "WHIRLPOOL", "4E2448A4C6F486BB16B6562C73B4020BF3043E3A731BCE721AE1B303D97E6D4C7181EEBDB6C57E277D0E34957114CBD6C797FC9D95D8B582D225292076D4EEF5" },
-        { "SM3", "66c7f0f462eeedd9d1f2d46bdc10e4e24167c4875cf2f7a2297da02b8f4ba8e0" },
-    };
-    
-    public String getName()
-    {
-        return "Digest";
-    }
-
-    void test(String algorithm)
-        throws Exception
-    {
-        byte[] message = "hello world".getBytes();
-
-        MessageDigest digest = MessageDigest.getInstance(algorithm, provider);
-
-        byte[] result = digest.digest(message);
-        byte[] result2 = digest.digest(message);
-
-        // test one digest the same message with the same instance
-        if (!MessageDigest.isEqual(result, result2))
-        {
-            fail("Result object 1 not equal");
-        }
-
-        // test two, single byte updates
-        for (int i = 0; i < message.length; i++)
-        {
-            digest.update(message[i]);
-        }
-        result2 = digest.digest();
-
-        if (!MessageDigest.isEqual(result, result2))
-        {
-            fail("Result object 2 not equal");
-        }
-
-        // test three, two half updates
-        digest.update(message, 0, message.length/2);
-        digest.update(message, message.length/2, message.length-message.length/2);
-        result2 = digest.digest();
-
-        if (!MessageDigest.isEqual(result, result2))
-        {
-            fail("Result object 3 not equal");
-        }
-
-        // test four, clone test
-        digest.update(message, 0, message.length/2);
-        MessageDigest d = (MessageDigest)digest.clone();
-        digest.update(message, message.length/2, message.length-message.length/2);
-        result2 = digest.digest();
-
-        if (!MessageDigest.isEqual(result, result2))
-        {
-            fail("Result object 4(a) not equal");
-        }
-
-        d.update(message, message.length/2, message.length-message.length/2);
-        result2 = d.digest();
-
-        if (!MessageDigest.isEqual(result, result2))
-        {
-            fail("Result object 4(b) not equal");
-        }
-
-        // test five, check reset() method
-        digest.update(message, 0, message.length/2);
-        digest.reset();
-        digest.update(message, 0, message.length/2);
-        digest.update(message, message.length/2, message.length-message.length/2);
-        result2 = digest.digest();
-
-        if (!MessageDigest.isEqual(result, result2))
-        {
-            fail("Result object 5 not equal");
-        }
-    }
-
-    /**
-     * Test the hash against a standard value for the string "abc"
-     * 
-     * @param algorithm algorithm to test
-     * @param hash expected value
-     * @return the test result.
-     */
-    void abcTest(
-        String algorithm,
-        String hash)
-        throws Exception
-    {
-        byte[] abc = { (byte)0x61, (byte)0x62, (byte)0x63 };
-        
-        MessageDigest digest = MessageDigest.getInstance(algorithm, provider);
-
-        byte[] result = digest.digest(abc);
-        
-        if (!MessageDigest.isEqual(result, Hex.decode(hash)))
-        {
-            fail("abc result not equal for " + algorithm);
-        }
-    }
-    
-    public void performTest()
-        throws Exception
-    {
-        for (int i = 0; i != abcVectors.length; i++)
-        {
-            test(abcVectors[i][0]);
-         
-            abcTest(abcVectors[i][0], abcVectors[i][1]);
-        }
-    }
-
-    public static void main(String[] args)
-    {
-        Security.addProvider(new BouncyCastleProvider());
-
-        runTest(new DigestTest());
-    }
-}
-
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/DoFinalTest.java b/bcprov/src/main/java/org/bouncycastle/jce/provider/test/DoFinalTest.java
deleted file mode 100644
index d059138..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/DoFinalTest.java
+++ /dev/null
@@ -1,164 +0,0 @@
-package org.bouncycastle.jce.provider.test;
-
-import java.security.Key;
-import java.security.Security;
-
-import javax.crypto.Cipher;
-import javax.crypto.KeyGenerator;
-
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.util.test.SimpleTestResult;
-import org.bouncycastle.util.test.Test;
-import org.bouncycastle.util.test.TestResult;
-
-/**
- * check that doFinal is properly reseting the cipher.
- */
-public class DoFinalTest
-    implements Test
-{
-    public DoFinalTest()
-    {
-    }
-
-    private boolean equalArray(
-        byte[]  a,
-        int        aOff,
-        byte[]  b,
-        int        length)
-    {
-        if (aOff + a.length < length)
-        {
-            return false;
-        }
-        
-        if (b.length < length)
-        {
-            return false;
-        }
-        
-        for (int i = 0; i != length; i++)
-        {
-            if (a[aOff + i] != b[i])
-            {
-                return false;
-            }
-        }
-
-        return true;
-    }
-    
-    public TestResult checkCipher(
-        String    cipherName)
-    {
-        String lCode = "ABCDEFGHIJKLMNOPQRSTUVWXY0123456789";
-        String  baseAlgorithm;
-        int     index = cipherName.indexOf('/');
-
-        if (index > 0)
-        {
-            baseAlgorithm = cipherName.substring(0, index);
-        }
-        else
-        {
-            baseAlgorithm = cipherName;
-        }
-        
-        try
-        {
-            KeyGenerator    kGen = KeyGenerator.getInstance(baseAlgorithm, "BC");
-            Cipher          cipher = Cipher.getInstance(cipherName, "BC");
-            Key             key = kGen.generateKey();
-
-            cipher.init(Cipher.ENCRYPT_MODE, key);
-
-            byte[] encrypted = cipher.doFinal(lCode.getBytes());
-
-            // 2nd try
-            byte[]    encrypted2 = cipher.doFinal(lCode.getBytes());
-
-            if (encrypted.length != encrypted2.length)
-            {
-                return new SimpleTestResult(false, getName() + ": Failed " + cipherName + " - expected length " + encrypted.length + " got " + encrypted2.length);
-            }
-
-            if (!equalArray(encrypted, 0, encrypted2, encrypted.length))
-            {
-                return new SimpleTestResult(false, getName() + ": Failed " + cipherName + " - first two arrays not equal");
-            }
-            
-            // 3rd try
-            byte[]  enc1 = cipher.update(lCode.getBytes());
-            byte[]  enc2 = cipher.doFinal();
-
-            if ((enc1.length + enc2.length) != encrypted.length)
-            {
-                return new SimpleTestResult(false, getName() + ": Failed " + cipherName + " - expected length " + encrypted.length + " got " + (enc1.length + enc2.length));
-            }
-
-            if (!equalArray(encrypted, 0, enc1, enc1.length))
-            {
-                return new SimpleTestResult(false, getName() + ": Failed " + cipherName + " - enc1 array not equal");
-            }
-            
-            if (!equalArray(encrypted, enc1.length, enc2, enc2.length))
-            {
-                return new SimpleTestResult(false, getName() + ": Failed " + cipherName + " - enc1 array not equal");
-            }
-            
-            enc1 = cipher.update(lCode.getBytes());
-            
-            if (!equalArray(encrypted, 0, enc1, enc1.length))
-            {
-                return new SimpleTestResult(false, getName() + ": Failed " + cipherName + " - 2nd enc1 array not equal");
-            }
-            
-            int len = cipher.doFinal(enc1, 0);
-            if ((enc1.length + len) != encrypted.length)
-            {
-                return new SimpleTestResult(false, getName() + ": Failed " + cipherName + " - expected length " + encrypted.length + " got " + (enc1.length + len));
-            }
-        }
-        catch (Exception e)
-        {
-            return new SimpleTestResult(false, getName() + ": Failed " + cipherName + " - exception " + e.toString());
-        }
-
-        return new SimpleTestResult(true, getName() + ": Okay");
-    }
-
-    public TestResult perform()
-    {
-        TestResult    result = checkCipher("RC4");
-        
-        if (!result.isSuccessful())
-        {
-            return result;
-        }
-        
-        result = checkCipher("DES/CBC/PKCS5Padding");
-        
-        if (!result.isSuccessful())
-        {
-            return result;
-        }
-        
-        return checkCipher("Rijndael");
-    }
-    
-    public String getName()
-    {
-        return "DoFinalTest";
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        Security.addProvider(new BouncyCastleProvider());
-
-        Test            test = new DoFinalTest();
-        TestResult      result = test.perform();
-
-        System.out.println(result.toString());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/ECDSA5Test.java b/bcprov/src/main/java/org/bouncycastle/jce/provider/test/ECDSA5Test.java
deleted file mode 100644
index 87773da..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/ECDSA5Test.java
+++ /dev/null
@@ -1,934 +0,0 @@
-package org.bouncycastle.jce.provider.test;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.math.BigInteger;
-import java.security.InvalidAlgorithmParameterException;
-import java.security.InvalidKeyException;
-import java.security.KeyFactory;
-import java.security.KeyPair;
-import java.security.KeyPairGenerator;
-import java.security.NoSuchAlgorithmException;
-import java.security.NoSuchProviderException;
-import java.security.PrivateKey;
-import java.security.PublicKey;
-import java.security.SecureRandom;
-import java.security.Security;
-import java.security.Signature;
-import java.security.SignatureException;
-import java.security.interfaces.ECPrivateKey;
-import java.security.interfaces.ECPublicKey;
-import java.security.spec.AlgorithmParameterSpec;
-import java.security.spec.ECFieldF2m;
-import java.security.spec.ECFieldFp;
-import java.security.spec.ECGenParameterSpec;
-import java.security.spec.ECParameterSpec;
-import java.security.spec.ECPoint;
-import java.security.spec.ECPrivateKeySpec;
-import java.security.spec.ECPublicKeySpec;
-import java.security.spec.EllipticCurve;
-import java.security.spec.PKCS8EncodedKeySpec;
-import java.security.spec.X509EncodedKeySpec;
-
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.bsi.BSIObjectIdentifiers;
-import org.bouncycastle.asn1.eac.EACObjectIdentifiers;
-import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
-import org.bouncycastle.asn1.sec.SECObjectIdentifiers;
-import org.bouncycastle.asn1.teletrust.TeleTrusTObjectIdentifiers;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.bouncycastle.asn1.x9.X962Parameters;
-import org.bouncycastle.asn1.x9.X9ECParameters;
-import org.bouncycastle.asn1.x9.X9ObjectIdentifiers;
-import org.bouncycastle.jcajce.provider.asymmetric.util.ECUtil;
-import org.bouncycastle.jce.ECKeyUtil;
-import org.bouncycastle.jce.ECNamedCurveTable;
-import org.bouncycastle.jce.ECPointUtil;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.math.ec.ECCurve;
-import org.bouncycastle.util.BigIntegers;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.FixedSecureRandom;
-import org.bouncycastle.util.test.SimpleTest;
-
-public class ECDSA5Test
-    extends SimpleTest
-{
-    byte[] k1 = Hex.decode("d5014e4b60ef2ba8b6211b4062ba3224e0427dd3");
-    byte[] k2 = Hex.decode("345e8d05c075c3a508df729a1685690e68fcfb8c8117847e89063bca1f85d968fd281540b6e13bd1af989a1fbf17e06462bf511f9d0b140fb48ac1b1baa5bded");
-
-    SecureRandom    random = new FixedSecureRandom(new byte[][] { k1, k2 });
-    
-    private void decodeTest()
-    {
-        EllipticCurve curve = new EllipticCurve(
-                new ECFieldFp(new BigInteger("6277101735386680763835789423207666416083908700390324961279")), // q
-                new BigInteger("fffffffffffffffffffffffffffffffefffffffffffffffc", 16), // a
-                new BigInteger("64210519e59c80e70fa7e9ab72243049feb8deecc146b9b1", 16)); // b
-
-        ECPoint p = ECPointUtil.decodePoint(curve, Hex.decode("03188da80eb03090f67cbf20eb43a18800f4ff0afd82ff1012"));
-
-        if (!p.getAffineX().equals(new BigInteger("188da80eb03090f67cbf20eb43a18800f4ff0afd82ff1012", 16)))
-        {
-            fail("x uncompressed incorrectly");
-        }
-
-        if (!p.getAffineY().equals(new BigInteger("7192b95ffc8da78631011ed6b24cdd573f977a11e794811", 16)))
-        {
-            fail("y uncompressed incorrectly");
-        }
-    }
-
-    /**
-     * X9.62 - 1998,<br>
-     * J.3.2, Page 155, ECDSA over the field Fp<br>
-     * an example with 239 bit prime
-     */
-    private void testECDSA239bitPrime()
-        throws Exception
-    {
-        BigInteger r = new BigInteger("308636143175167811492622547300668018854959378758531778147462058306432176");
-        BigInteger s = new BigInteger("323813553209797357708078776831250505931891051755007842781978505179448783");
-
-        byte[] kData = BigIntegers.asUnsignedByteArray(new BigInteger("700000017569056646655505781757157107570501575775705779575555657156756655"));
-
-        SecureRandom    k = new FixedSecureRandom(kData);
-
-        EllipticCurve curve = new EllipticCurve(
-            new ECFieldFp(new BigInteger("883423532389192164791648750360308885314476597252960362792450860609699839")), // q
-            new BigInteger("7fffffffffffffffffffffff7fffffffffff8000000000007ffffffffffc", 16), // a
-            new BigInteger("6b016c3bdcf18941d0d654921475ca71a9db2fb27d1d37796185c2942c0a", 16)); // b
-
-        ECParameterSpec spec = new ECParameterSpec(
-            curve,
-            ECPointUtil.decodePoint(curve, Hex.decode("020ffa963cdca8816ccc33b8642bedf905c3d358573d3f27fbbd3b3cb9aaaf")), // G
-            new BigInteger("883423532389192164791648750360308884807550341691627752275345424702807307"), // n
-            1); // h
-        
-
-        ECPrivateKeySpec priKey = new ECPrivateKeySpec(
-            new BigInteger("876300101507107567501066130761671078357010671067781776716671676178726717"), // d
-            spec);
-
-        ECPublicKeySpec pubKey = new ECPublicKeySpec(
-            ECPointUtil.decodePoint(curve, Hex.decode("025b6dc53bc61a2548ffb0f671472de6c9521a9d2d2534e65abfcbd5fe0c70")), // Q
-            spec);
-
-        Signature           sgr = Signature.getInstance("ECDSA", "BC");
-        KeyFactory          f = KeyFactory.getInstance("ECDSA", "BC");
-        PrivateKey          sKey = f.generatePrivate(priKey);
-        PublicKey           vKey = f.generatePublic(pubKey);
-
-        sgr.initSign(sKey, k);
-
-        byte[] message = new byte[] { (byte)'a', (byte)'b', (byte)'c' };
-
-        sgr.update(message);
-
-        byte[]  sigBytes = sgr.sign();
-
-        sgr.initVerify(vKey);
-
-        sgr.update(message);
-
-        if (!sgr.verify(sigBytes))
-        {
-            fail("239 Bit EC verification failed");
-        }
-
-        BigInteger[]  sig = derDecode(sigBytes);
-
-        if (!r.equals(sig[0]))
-        {
-            fail("r component wrong." + System.getProperty("line.separator")
-                + " expecting: " + r + System.getProperty("line.separator")
-                + " got      : " + sig[0]);
-        }
-
-        if (!s.equals(sig[1]))
-        {
-            fail("s component wrong." + System.getProperty("line.separator")
-                + " expecting: " + s + System.getProperty("line.separator")
-                + " got      : " + sig[1]);
-        }
-    }
-
-    // test BSI algorithm support.
-    private void testBSI()
-        throws Exception
-    {
-        KeyPairGenerator kpGen = KeyPairGenerator.getInstance("ECDSA", "BC");
-
-        kpGen.initialize(new ECGenParameterSpec(TeleTrusTObjectIdentifiers.brainpoolP512r1.getId()));
-
-        KeyPair kp = kpGen.generateKeyPair();
-
-        byte[] data = "Hello World!!!".getBytes();
-        String[] cvcAlgs = { "SHA1WITHCVC-ECDSA", "SHA224WITHCVC-ECDSA",
-                             "SHA256WITHCVC-ECDSA", "SHA384WITHCVC-ECDSA",
-                             "SHA512WITHCVC-ECDSA" };
-        String[] cvcOids = { EACObjectIdentifiers.id_TA_ECDSA_SHA_1.getId(), EACObjectIdentifiers.id_TA_ECDSA_SHA_224.getId(),
-                             EACObjectIdentifiers.id_TA_ECDSA_SHA_256.getId(), EACObjectIdentifiers.id_TA_ECDSA_SHA_384.getId(),
-                             EACObjectIdentifiers.id_TA_ECDSA_SHA_512.getId() };
-
-        testBsiAlgorithms(kp, data, cvcAlgs, cvcOids);
-
-        String[] plainAlgs = { "SHA1WITHPLAIN-ECDSA", "SHA224WITHPLAIN-ECDSA",
-                             "SHA256WITHPLAIN-ECDSA", "SHA384WITHPLAIN-ECDSA",
-                             "SHA512WITHPLAIN-ECDSA", "RIPEMD160WITHPLAIN-ECDSA" };
-        String[] plainOids = { BSIObjectIdentifiers.ecdsa_plain_SHA1.getId(), BSIObjectIdentifiers.ecdsa_plain_SHA224.getId(),
-                                BSIObjectIdentifiers.ecdsa_plain_SHA256.getId(), BSIObjectIdentifiers.ecdsa_plain_SHA384.getId(),
-                                BSIObjectIdentifiers.ecdsa_plain_SHA512.getId(), BSIObjectIdentifiers.ecdsa_plain_RIPEMD160.getId() };
-
-        testBsiAlgorithms(kp, data, plainAlgs, plainOids);
-    }
-
-    private void testBsiAlgorithms(KeyPair kp, byte[] data, String[] algs, String[] oids)
-        throws NoSuchAlgorithmException, NoSuchProviderException, InvalidKeyException, SignatureException
-    {
-        for (int i = 0; i != algs.length; i++)
-        {
-            Signature sig1 = Signature.getInstance(algs[i], "BC");
-            Signature sig2 = Signature.getInstance(oids[i], "BC");
-
-            sig1.initSign(kp.getPrivate());
-
-            sig1.update(data);
-
-            byte[] sig = sig1.sign();
-
-            sig2.initVerify(kp.getPublic());
-
-            sig2.update(data);
-
-            if (!sig2.verify(sig))
-            {
-                fail("BSI CVC signature failed: " + algs[i]);
-            }
-        }
-    }
-
-    /**
-     * X9.62 - 1998,<br>
-     * J.2.1, Page 100, ECDSA over the field F2m<br>
-     * an example with 191 bit binary field
-     */
-    private void testECDSA239bitBinary()
-        throws Exception
-    {
-        BigInteger r = new BigInteger("21596333210419611985018340039034612628818151486841789642455876922391552");
-        BigInteger s = new BigInteger("197030374000731686738334997654997227052849804072198819102649413465737174");
-    
-        byte[] kData = BigIntegers.asUnsignedByteArray(new BigInteger("171278725565216523967285789236956265265265235675811949404040041670216363"));
-
-        SecureRandom    k = new FixedSecureRandom(kData);
-
-        EllipticCurve curve = new EllipticCurve(
-            new ECFieldF2m(239, // m
-                           new int[] { 36 }), // k
-            new BigInteger("32010857077C5431123A46B808906756F543423E8D27877578125778AC76", 16), // a
-            new BigInteger("790408F2EEDAF392B012EDEFB3392F30F4327C0CA3F31FC383C422AA8C16", 16)); // b
-    
-        ECParameterSpec params = new ECParameterSpec(
-            curve,
-            ECPointUtil.decodePoint(curve, Hex.decode("0457927098FA932E7C0A96D3FD5B706EF7E5F5C156E16B7E7C86038552E91D61D8EE5077C33FECF6F1A16B268DE469C3C7744EA9A971649FC7A9616305")), // G
-            new BigInteger("220855883097298041197912187592864814557886993776713230936715041207411783"), // n
-            4); // h
-    
-        ECPrivateKeySpec priKeySpec = new ECPrivateKeySpec(
-            new BigInteger("145642755521911534651321230007534120304391871461646461466464667494947990"), // d
-            params);
-        
-        ECPublicKeySpec pubKeySpec = new ECPublicKeySpec(
-            ECPointUtil.decodePoint(curve, Hex.decode("045894609CCECF9A92533F630DE713A958E96C97CCB8F5ABB5A688A238DEED6DC2D9D0C94EBFB7D526BA6A61764175B99CB6011E2047F9F067293F57F5")), // Q
-            params);
-    
-        Signature   sgr = Signature.getInstance("ECDSA", "BC");
-        KeyFactory  f = KeyFactory.getInstance("ECDSA", "BC");
-        PrivateKey  sKey = f.generatePrivate(priKeySpec);
-        PublicKey   vKey = f.generatePublic(pubKeySpec);
-        byte[]      message = new byte[] { (byte)'a', (byte)'b', (byte)'c' };
-       
-        sgr.initSign(sKey, k);
-
-        sgr.update(message);
-        
-        byte[]  sigBytes = sgr.sign();
-
-        sgr.initVerify(vKey);
-
-        sgr.update(message);
-
-        if (!sgr.verify(sigBytes))
-        {
-            fail("239 Bit EC verification failed");
-        }
-
-        BigInteger[]  sig = derDecode(sigBytes);
-
-        if (!r.equals(sig[0]))
-        {
-            fail("r component wrong." + System.getProperty("line.separator")
-                + " expecting: " + r + System.getProperty("line.separator")
-                + " got      : " + sig[0]);
-        }
-
-        if (!s.equals(sig[1]))
-        {
-            fail("s component wrong." + System.getProperty("line.separator")
-                + " expecting: " + s + System.getProperty("line.separator")
-                + " got      : " + sig[1]);
-        }
-    }
-    
-    private void testGeneration()
-        throws Exception
-    {
-        //
-        // ECDSA generation test
-        //
-        byte[]              data = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 0 };
-        Signature s = Signature.getInstance("ECDSA", "BC");
-        KeyPairGenerator g = KeyPairGenerator.getInstance("ECDSA", "BC");
-
-        EllipticCurve curve = new EllipticCurve(
-            new ECFieldFp(new BigInteger("883423532389192164791648750360308885314476597252960362792450860609699839")), // q
-            new BigInteger("7fffffffffffffffffffffff7fffffffffff8000000000007ffffffffffc", 16), // a
-            new BigInteger("6b016c3bdcf18941d0d654921475ca71a9db2fb27d1d37796185c2942c0a", 16)); // b
-
-        ECParameterSpec ecSpec = new ECParameterSpec(
-            curve,
-            ECPointUtil.decodePoint(curve, Hex.decode("020ffa963cdca8816ccc33b8642bedf905c3d358573d3f27fbbd3b3cb9aaaf")), // G
-            new BigInteger("883423532389192164791648750360308884807550341691627752275345424702807307"), // n
-            1); // h
-
-        g.initialize(ecSpec, new SecureRandom());
-
-        KeyPair p = g.generateKeyPair();
-
-        PrivateKey sKey = p.getPrivate();
-        PublicKey  vKey = p.getPublic();
-
-        s.initSign(sKey);
-
-        s.update(data);
-
-        byte[] sigBytes = s.sign();
-
-        s = Signature.getInstance("ECDSA", "BC");
-
-        s.initVerify(vKey);
-
-        s.update(data);
-
-        if (!s.verify(sigBytes))
-        {
-            fail("ECDSA verification failed");
-        }
-
-        testKeyFactory((ECPublicKey)vKey, (ECPrivateKey)sKey);
-        testSerialise((ECPublicKey)vKey, (ECPrivateKey)sKey);
-    }
-
-    private void testSerialise(ECPublicKey ecPublicKey, ECPrivateKey ecPrivateKey)
-        throws Exception
-    {
-        ByteArrayOutputStream bOut = new ByteArrayOutputStream();
-        ObjectOutputStream oOut = new ObjectOutputStream(bOut);
-
-        oOut.writeObject(ecPublicKey);
-        oOut.writeObject(ecPrivateKey);
-        oOut.close();
-
-        ObjectInputStream oIn = new ObjectInputStream(new ByteArrayInputStream(bOut.toByteArray()));
-
-        PublicKey pubKey = (PublicKey)oIn.readObject();
-        PrivateKey privKey = (PrivateKey)oIn.readObject();
-
-        if (!ecPublicKey.equals(pubKey))
-        {
-            fail("public key serialisation check failed");
-        }
-
-        if (!ecPrivateKey.equals(privKey))
-        {
-            fail("private key serialisation check failed");
-        }
-    }
-
-    private void testKeyFactory(ECPublicKey pub, ECPrivateKey priv)
-        throws Exception
-    {
-        KeyFactory ecFact = KeyFactory.getInstance("ECDSA");
-
-        ECPublicKeySpec  pubSpec = (ECPublicKeySpec)ecFact.getKeySpec(pub, ECPublicKeySpec.class);
-        ECPrivateKeySpec  privSpec = (ECPrivateKeySpec)ecFact.getKeySpec(priv, ECPrivateKeySpec.class);
-
-        if (!pubSpec.getW().equals(pub.getW()) || !pubSpec.getParams().getCurve().equals(pub.getParams().getCurve()))
-        {
-            fail("pubSpec not correct");
-        }
-
-        if (!privSpec.getS().equals(priv.getS()) || !privSpec.getParams().getCurve().equals(priv.getParams().getCurve()))
-        {
-            fail("privSpec not correct");
-        }
-
-        ECPublicKey  pubKey = (ECPublicKey)ecFact.translateKey(pub);
-        ECPrivateKey  privKey = (ECPrivateKey)ecFact.translateKey(priv);
-
-        if (!pubKey.getW().equals(pub.getW()) || !pubKey.getParams().getCurve().equals(pub.getParams().getCurve()))
-        {
-            fail("pubKey not correct");
-        }
-
-        if (!privKey.getS().equals(priv.getS()) || !privKey.getParams().getCurve().equals(priv.getParams().getCurve()))
-        {
-            fail("privKey not correct");
-        }
-    }
-
-    private void testKeyConversion()
-        throws Exception
-    {
-        KeyPairGenerator kpGen = KeyPairGenerator.getInstance("ECDSA", "BC");
-
-        kpGen.initialize(new ECGenParameterSpec("prime192v1"));
-
-        KeyPair pair = kpGen.generateKeyPair();
-
-        PublicKey pubKey = ECKeyUtil.publicToExplicitParameters(pair.getPublic(), "BC");
-
-        SubjectPublicKeyInfo info = SubjectPublicKeyInfo.getInstance(ASN1Primitive.fromByteArray(pubKey.getEncoded()));
-        X962Parameters params = X962Parameters.getInstance(info.getAlgorithmId().getParameters());
-
-        if (params.isNamedCurve() || params.isImplicitlyCA())
-        {
-            fail("public key conversion to explicit failed");
-        }
-
-        if (!((ECPublicKey)pair.getPublic()).getW().equals(((ECPublicKey)pubKey).getW()))
-        {
-            fail("public key conversion check failed");
-        }
-
-        PrivateKey privKey = ECKeyUtil.privateToExplicitParameters(pair.getPrivate(), "BC");
-        PrivateKeyInfo privInfo = PrivateKeyInfo.getInstance(ASN1Primitive.fromByteArray(privKey.getEncoded()));
-        params = X962Parameters.getInstance(privInfo.getAlgorithmId().getParameters());
-
-        if (params.isNamedCurve() || params.isImplicitlyCA())
-        {
-            fail("private key conversion to explicit failed");
-        }
-
-        if (!((ECPrivateKey)pair.getPrivate()).getS().equals(((ECPrivateKey)privKey).getS()))
-        {
-            fail("private key conversion check failed");
-        }
-    }
-
-    private void testAdaptiveKeyConversion()
-        throws Exception
-    {
-        KeyPairGenerator kpGen = KeyPairGenerator.getInstance("ECDSA", "BC");
-
-        kpGen.initialize(new ECGenParameterSpec("prime192v1"));
-
-        KeyPair pair = kpGen.generateKeyPair();
-
-        final PrivateKey privKey = pair.getPrivate();
-        final PublicKey  pubKey = pair.getPublic();
-
-        Signature s = Signature.getInstance("ECDSA", "BC");
-
-        // raw interface tests
-        s.initSign(new PrivateKey()
-        {
-            public String getAlgorithm()
-            {
-                return privKey.getAlgorithm();
-            }
-
-            public String getFormat()
-            {
-                return privKey.getFormat();
-            }
-
-            public byte[] getEncoded()
-            {
-                return privKey.getEncoded();
-            }
-        });
-
-        s.initVerify(new PublicKey()
-        {
-            public String getAlgorithm()
-            {
-                return pubKey.getAlgorithm();
-            }
-
-            public String getFormat()
-            {
-                return pubKey.getFormat();
-            }
-
-            public byte[] getEncoded()
-            {
-                return pubKey.getEncoded();
-            }
-        });
-
-
-        s.initSign(new ECPrivateKey()
-        {
-            public String getAlgorithm()
-            {
-                return privKey.getAlgorithm();
-            }
-
-            public String getFormat()
-            {
-                return privKey.getFormat();
-            }
-
-            public byte[] getEncoded()
-            {
-                return privKey.getEncoded();
-            }
-
-            public BigInteger getS()
-            {
-                return ((ECPrivateKey)privKey).getS();
-            }
-
-            public ECParameterSpec getParams()
-            {
-                return ((ECPrivateKey)privKey).getParams();
-            }
-        });
-
-        s.initVerify(new ECPublicKey()
-        {
-            public String getAlgorithm()
-            {
-                return pubKey.getAlgorithm();
-            }
-
-            public String getFormat()
-            {
-                return pubKey.getFormat();
-            }
-
-            public byte[] getEncoded()
-            {
-                return pubKey.getEncoded();
-            }
-
-            public ECPoint getW()
-            {
-                return ((ECPublicKey)pubKey).getW();
-            }
-
-            public ECParameterSpec getParams()
-            {
-                return ((ECPublicKey)pubKey).getParams();
-            }
-        });
-
-        try
-        {
-            s.initSign(new PrivateKey()
-            {
-                public String getAlgorithm()
-                {
-                    return privKey.getAlgorithm();
-                }
-
-                public String getFormat()
-                {
-                    return privKey.getFormat();
-                }
-
-                public byte[] getEncoded()
-                {
-                    return null;
-                }
-            });
-
-            fail("no exception thrown!!!");
-        }
-        catch (InvalidKeyException e)
-        {
-            // ignore
-        }
-
-        try
-        {
-            s.initVerify(new PublicKey()
-            {
-                public String getAlgorithm()
-                {
-                    return pubKey.getAlgorithm();
-                }
-
-                public String getFormat()
-                {
-                    return pubKey.getFormat();
-                }
-
-                public byte[] getEncoded()
-                {
-                    return null;
-                }
-            });
-
-            fail("no exception thrown!!!");
-        }
-        catch (InvalidKeyException e)
-        {
-            // ignore
-        }
-
-        // try bogus encoding
-        try
-        {
-            s.initSign(new PrivateKey()
-            {
-                public String getAlgorithm()
-                {
-                    return privKey.getAlgorithm();
-                }
-
-                public String getFormat()
-                {
-                    return privKey.getFormat();
-                }
-
-                public byte[] getEncoded()
-                {
-                    return new byte[20];
-                }
-            });
-
-            fail("no exception thrown!!!");
-        }
-        catch (InvalidKeyException e)
-        {
-            // ignore
-        }
-
-        try
-        {
-            s.initVerify(new PublicKey()
-            {
-                public String getAlgorithm()
-                {
-                    return pubKey.getAlgorithm();
-                }
-
-                public String getFormat()
-                {
-                    return pubKey.getFormat();
-                }
-
-                public byte[] getEncoded()
-                {
-                    return new byte[20];
-                }
-            });
-
-            fail("no exception thrown!!!");
-        }
-        catch (InvalidKeyException e)
-        {
-            // ignore
-        }
-
-        // try encoding of wrong key
-        kpGen = KeyPairGenerator.getInstance("RSA", "BC");
-
-        kpGen.initialize(512);
-
-        pair = kpGen.generateKeyPair();
-
-        final PrivateKey privRsa = pair.getPrivate();
-        final PublicKey  pubRsa = pair.getPublic();
-
-        try
-        {
-            s.initSign(new PrivateKey()
-            {
-                public String getAlgorithm()
-                {
-                    return privRsa.getAlgorithm();
-                }
-
-                public String getFormat()
-                {
-                    return privRsa.getFormat();
-                }
-
-                public byte[] getEncoded()
-                {
-                    return privRsa.getEncoded();
-                }
-            });
-
-            fail("no exception thrown!!!");
-
-        }
-        catch (InvalidKeyException e)
-        {
-            // ignore
-        }
-
-        try
-        {
-            s.initVerify(new PublicKey()
-            {
-                public String getAlgorithm()
-                {
-                    return pubRsa.getAlgorithm();
-                }
-
-                public String getFormat()
-                {
-                    return pubRsa.getFormat();
-                }
-
-                public byte[] getEncoded()
-                {
-                    return pubRsa.getEncoded();
-                }
-            });
-
-            fail("no exception thrown!!!");
-        }
-        catch (InvalidKeyException e)
-        {
-            // ignore
-        }
-    }
-
-    private void testKeyPairGenerationWithOIDs()
-        throws Exception
-    {
-        KeyPairGenerator kpGen = KeyPairGenerator.getInstance("ECDSA", "BC");
-
-        kpGen.initialize(new ECGenParameterSpec(X9ObjectIdentifiers.prime192v1.getId()));
-        kpGen.initialize(new ECGenParameterSpec(TeleTrusTObjectIdentifiers.brainpoolP160r1.getId()));
-        kpGen.initialize(new ECGenParameterSpec(SECObjectIdentifiers.secp128r1.getId()));
-
-        try
-        {
-            kpGen.initialize(new ECGenParameterSpec("1.1"));
-
-            fail("non-existant curve OID failed");
-        }
-        catch (InvalidAlgorithmParameterException e)
-        {
-            if (!"unknown curve OID: 1.1".equals(e.getMessage()))
-            {
-                fail("OID message check failed");
-            }
-        }
-
-        try
-        {
-            kpGen.initialize(new ECGenParameterSpec("flibble"));
-
-            fail("non-existant curve name failed");
-        }
-        catch (InvalidAlgorithmParameterException e)
-        {
-            if (!"unknown curve name: flibble".equals(e.getMessage()))
-            {
-                fail("name message check failed");
-            }
-        }
-    }
-
-    private static class ECRandom
-        extends SecureRandom
-    {
-        public void nextBytes(byte[] bytes)
-        {
-            byte[] src = new BigInteger("e2eb6663f551331bda00b90f1272c09d980260c1a70cab1ec481f6c937f34b62", 16).toByteArray();
-
-            if (src.length <= bytes.length)
-            {
-                System.arraycopy(src, 0, bytes, bytes.length - src.length, src.length);
-            }
-            else
-            {
-                System.arraycopy(src, 0, bytes, 0, bytes.length);
-            }
-        }
-    }
-
-    private void testNamedCurveParameterPreservation()
-        throws Exception
-    {
-        AlgorithmParameterSpec ecSpec = ECNamedCurveTable.getParameterSpec("secp256r1");
-        KeyPairGenerator keygen = KeyPairGenerator.getInstance("EC", "BC");
-        keygen.initialize(ecSpec, new ECRandom());
-
-        KeyPair keys = keygen.generateKeyPair();
-
-        PrivateKeyInfo priv1 = PrivateKeyInfo.getInstance(keys.getPrivate().getEncoded());
-        SubjectPublicKeyInfo pub1 = SubjectPublicKeyInfo.getInstance(keys.getPublic().getEncoded());
-
-        keygen = KeyPairGenerator.getInstance("EC", "BC");
-        keygen.initialize(new ECGenParameterSpec("secp256r1"), new ECRandom());
-
-        PrivateKeyInfo priv2 = PrivateKeyInfo.getInstance(keys.getPrivate().getEncoded());
-        SubjectPublicKeyInfo pub2 = SubjectPublicKeyInfo.getInstance(keys.getPublic().getEncoded());
-
-        if (!priv1.equals(priv2) || !pub1.equals(pub2))
-        {
-            fail("mismatch between alg param spec and ECGenParameterSpec");
-        }
-
-        if (!(priv2.getPrivateKeyAlgorithm().getParameters() instanceof ASN1ObjectIdentifier))
-        {
-            fail("OID not preserved in private key");
-        }
-
-        if (!(pub1.getAlgorithm().getParameters() instanceof ASN1ObjectIdentifier))
-        {
-            fail("OID not preserved in public key");
-        }
-    }
-
-    private void testNamedCurveSigning()
-        throws Exception
-    {
-        testCustomNamedCurveSigning("secp256r1");
-
-        try
-        {
-            testCustomNamedCurveSigning("secp256k1");
-        }
-        catch (IllegalArgumentException e)
-        {
-            if (!e.getMessage().equals("first coefficient is negative"))     // bogus jdk 1.5 exception...
-            {
-                throw e;
-            }
-        }
-    }
-
-    private void testCustomNamedCurveSigning(String name)
-        throws Exception
-    {
-        X9ECParameters x9Params = ECUtil.getNamedCurveByOid(ECUtil.getNamedCurveOid(name));
-
-        // TODO: one day this may have to change
-        if (x9Params.getCurve() instanceof ECCurve.Fp)
-        {
-            fail("curve not custom curve!!");
-        }
-
-        AlgorithmParameterSpec ecSpec = ECNamedCurveTable.getParameterSpec(name);
-        KeyPairGenerator keygen = KeyPairGenerator.getInstance("EC", "BC");
-        keygen.initialize(ecSpec, new ECRandom());
-
-        KeyPair keys = keygen.generateKeyPair();
-
-        PrivateKeyInfo priv1 = PrivateKeyInfo.getInstance(keys.getPrivate().getEncoded());
-        SubjectPublicKeyInfo pub1 = SubjectPublicKeyInfo.getInstance(keys.getPublic().getEncoded());
-
-        keygen = KeyPairGenerator.getInstance("EC", "BC");
-        keygen.initialize(new ECGenParameterSpec("secp256r1"), new ECRandom());
-
-        Signature ecdsaSigner = Signature.getInstance("ECDSA", "BC");
-
-        ecdsaSigner.initSign(keys.getPrivate());
-
-        ecdsaSigner.update(new byte[100]);
-
-        byte[] sig = ecdsaSigner.sign();
-
-        ecdsaSigner.initVerify(keys.getPublic());
-
-        ecdsaSigner.update(new byte[100]);
-
-        if (!ecdsaSigner.verify(sig))
-        {
-            fail("signature failed to verify");
-        }
-
-        KeyFactory kFact = KeyFactory.getInstance("EC", "BC");
-
-        PublicKey pub = kFact.generatePublic(new X509EncodedKeySpec(pub1.getEncoded()));
-        PrivateKey pri = kFact.generatePrivate(new PKCS8EncodedKeySpec(priv1.getEncoded()));
-
-        ecdsaSigner = Signature.getInstance("ECDSA", "BC");
-
-        ecdsaSigner.initSign(pri);
-
-        ecdsaSigner.update(new byte[100]);
-
-        sig = ecdsaSigner.sign();
-
-        ecdsaSigner.initVerify(pub);
-
-        ecdsaSigner.update(new byte[100]);
-
-        if (!ecdsaSigner.verify(sig))
-        {
-            fail("signature failed to verify");
-        }
-    }
-
-    protected BigInteger[] derDecode(
-        byte[]  encoding)
-        throws IOException
-    {
-        ByteArrayInputStream    bIn = new ByteArrayInputStream(encoding);
-        ASN1InputStream         aIn = new ASN1InputStream(bIn);
-        ASN1Sequence            s = (ASN1Sequence)aIn.readObject();
-
-        BigInteger[]            sig = new BigInteger[2];
-
-        sig[0] = ((ASN1Integer)s.getObjectAt(0)).getValue();
-        sig[1] = ((ASN1Integer)s.getObjectAt(1)).getValue();
-
-        return sig;
-    }
-
-    public String getName()
-    {
-        return "ECDSA5";
-    }
-
-    public void performTest()
-        throws Exception
-    {
-        testKeyConversion();
-        testAdaptiveKeyConversion();
-        decodeTest();
-        testECDSA239bitPrime();
-        testECDSA239bitBinary();
-        testGeneration();
-        testKeyPairGenerationWithOIDs();
-        testNamedCurveParameterPreservation();
-        testNamedCurveSigning();
-        testBSI();
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        Security.addProvider(new BouncyCastleProvider());
-
-        runTest(new ECDSA5Test());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/ECEncodingTest.java b/bcprov/src/main/java/org/bouncycastle/jce/provider/test/ECEncodingTest.java
deleted file mode 100644
index 1bd3178..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/ECEncodingTest.java
+++ /dev/null
@@ -1,214 +0,0 @@
-package org.bouncycastle.jce.provider.test;
-
-import java.io.ByteArrayInputStream;
-import java.math.BigInteger;
-import java.security.InvalidKeyException;
-import java.security.KeyPair;
-import java.security.KeyPairGenerator;
-import java.security.KeyStore;
-import java.security.PrivateKey;
-import java.security.PublicKey;
-import java.security.Security;
-import java.security.SignatureException;
-import java.security.cert.Certificate;
-import java.security.cert.X509Certificate;
-import java.util.Date;
-
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.x9.X9ECParameters;
-import org.bouncycastle.jce.X509Principal;
-import org.bouncycastle.jce.interfaces.ECPointEncoder;
-import org.bouncycastle.jce.interfaces.ECPrivateKey;
-import org.bouncycastle.jce.interfaces.ECPublicKey;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.jce.spec.ECParameterSpec;
-import org.bouncycastle.math.ec.ECCurve;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-import org.bouncycastle.x509.X509V3CertificateGenerator;
-
-public class ECEncodingTest
-    extends SimpleTest
-{
-    public String getName()
-    {
-        return "ECEncodingTest";
-    }
-
-    /** J.4.7 An Example with m = 304 */
-    private int m = 304;
-    
-    /** f = 010000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000000 00000807 */
-    private int k1 = 1;
-    private int    k2 = 2;
-    private int    k3 = 11;
-    private byte hexa[] = {(byte)0xFD, 0x0D, 0x69, 0x31, 0x49, (byte)0xA1, 0x18, (byte)0xF6, 0x51
-        , (byte)0xE6, (byte)0xDC, (byte)0xE6, (byte)0x80, 0x20, (byte)0x85, 0x37, 0x7E, 0x5F, (byte)0x88, 0x2D, 0x1B, 0x51
-        , 0x0B, 0x44, 0x16, 0x00, 0x74, (byte)0xC1, 0x28, (byte)0x80, 0x78, 0x36, 0x5A, 0x03
-        , (byte)0x96, (byte)0xC8, (byte)0xE6, (byte)0x81};
-    private byte hexb[] = {(byte)0xBD, (byte)0xDB, (byte)0x97, (byte)0xE5, (byte)0x55
-        , (byte)0xA5, (byte)0x0A, (byte)0x90, (byte)0x8E, (byte)0x43, (byte)0xB0
-        , (byte)0x1C, (byte)0x79, (byte)0x8E, (byte)0xA5, (byte)0xDA, (byte)0xA6
-        , (byte)0x78, (byte)0x8F, (byte)0x1E, (byte)0xA2, (byte)0x79
-        , (byte)0x4E, (byte)0xFC, (byte)0xF5, (byte)0x71, (byte)0x66, (byte)0xB8
-        , (byte)0xC1, (byte)0x40, (byte)0x39, (byte)0x60, (byte)0x1E
-        , (byte)0x55, (byte)0x82, (byte)0x73, (byte)0x40, (byte)0xBE};
-    private BigInteger a = new BigInteger(1, hexa);
-    private BigInteger b = new BigInteger(1, hexb);
-    
-    /** Base point G (with point compression) */
-    private byte enc[] =    
-    {0x02, 0x19, 0x7B, 0x07, (byte)0x84, 0x5E, (byte)0x9B, (byte)0xE2, (byte)0xD9, 0x6A, (byte)0xDB, 0x0F
-            , 0x5F, 0x3C, 0x7F, 0x2C, (byte)0xFF, (byte)0xBD, 0x7A, 0x3E, (byte)0xB8, (byte)0xB6, (byte)0xFE, 
-            (byte)0xC3, 0x5C, 0x7F, (byte)0xD6, 0x7F, 0x26, (byte)0xDD, (byte)0xF6
-            , 0x28, 0x5A, 0x64, 0x4F, 0x74, 0x0A, 0x26, 0x14};
-    
-    private void testPointCompression() 
-        throws Exception
-    {
-        ECCurve curve = new ECCurve.F2m(m, k1, k2, k3, a, b);
-        curve.decodePoint(enc);
-        
-        int ks[] = new int[3];
-        ks[0] = k3;
-        ks[1] = k2;
-        ks[2] = k1;
-    }
-    
-    public void performTest()
-        throws Exception
-    {
-        byte[] ecParams = Hex.decode("3081C8020101302806072A8648CE3D0101021D00D7C134AA264366862A18302575D1D787B09F075797DA89F57EC8C0FF303C041C68A5E62CA9CE6C1C299803A6C1530B514E182AD8B0042A59CAD29F43041C2580F63CCFE44138870713B1A92369E33E2135D266DBB372386C400B0439040D9029AD2C7E5CF4340823B2A87DC68C9E4CE3174C1E6EFDEE12C07D58AA56F772C0726F24C6B89E4ECDAC24354B9E99CAA3F6D3761402CD021D00D7C134AA264366862A18302575D0FB98D116BC4B6DDEBCA3A5A7939F020101");
-        testParams(ecParams, true);
-        
-        testParams(ecParams, false);
-        
-        ecParams = Hex.decode("3081C8020101302806072A8648CE3D0101021D00D7C134AA264366862A18302575D1D787B09F075797DA89F57EC8C0FF303C041C56E6C7E4F11A7B4B961A4DCB5BD282EB22E42E9BCBE3E7B361F18012041C4BE3E7B361F18012F2353D22975E02D8D05D2C6F3342DD8F57D4C76F0439048D127A0C27E0DE207ED3B7FB98F83C8BD5A2A57C827F4B97874DEB2C1BAEB0C006958CE61BB1FC81F5389E288CB3E86E2ED91FB47B08FCCA021D00D7C134AA264366862A18302575D11A5F7AABFBA3D897FF5CA727AF53020101");
-        testParams(ecParams, true);
-        
-        testParams(ecParams, false);
-        
-        ecParams = Hex.decode("30820142020101303c06072a8648ce3d0101023100fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffeffffffff0000000000000000ffffffff3066043100fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffeffffffff0000000000000000fffffffc043100b3312fa7e23ee7e4988e056be3f82d19181d9c6efe8141120314088f5013875ac656398d8a2ed19d2a85c8edd3ec2aef046104aa87ca22be8b05378eb1c71ef320ad746e1d3b628ba79b9859f741e082542a385502f25dbf55296c3a545e3872760ab73617de4a96262c6f5d9e98bf9292dc29f8f41dbd289a147ce9da3113b5f0b8c00a60b1ce1d7e819d7a431d7c90ea0e5f023100ffffffffffffffffffffffffffffffffffffffffffffffffc7634d81f4372ddf581a0db248b0a77aecec196accc52973020101");
-        testParams(ecParams, true);
-        
-        testParams(ecParams, false);
-        
-        testPointCompression();
-    }
-    
-    private void testParams(byte[] ecParameterEncoded, boolean compress)
-        throws Exception
-    {
-        String keyStorePass = "myPass";
-        ASN1InputStream in = new ASN1InputStream(new ByteArrayInputStream(
-                ecParameterEncoded));
-        X9ECParameters params = X9ECParameters.getInstance(in
-                .readObject());
-        KeyPair kp = null;
-        boolean success = false;
-        while (!success)
-        {
-            KeyPairGenerator kpg = KeyPairGenerator.getInstance("ECDSA");
-            kpg.initialize(new ECParameterSpec(params.getCurve(),
-                    params.getG(), params.getN(), params.getH(), params
-                            .getSeed()));
-            kp = kpg.generateKeyPair();
-            // The very old Problem... we need a certificate chain to
-            // save a private key...
-            ECPublicKey pubKey = (ECPublicKey)kp.getPublic();
-            if (!compress)
-            {
-                ((ECPointEncoder)pubKey).setPointFormat("UNCOMPRESSED");
-            }
-            byte[] x = pubKey.getQ().getAffineXCoord().toBigInteger().toByteArray();
-            byte[] y = pubKey.getQ().getAffineYCoord().toBigInteger().toByteArray();
-            if (x.length == y.length)
-            {
-                success = true;
-            }
-        }
-
-        // The very old Problem... we need a certificate chain to
-        // save a private key...
-
-        Certificate[] chain = new Certificate[] { generateSelfSignedSoftECCert(
-                kp, compress) };
-
-        KeyStore keyStore = KeyStore.getInstance("BKS");
-        keyStore.load(null, keyStorePass.toCharArray());
-
-        keyStore.setCertificateEntry("ECCert", chain[0]);
-
-        ECPrivateKey privateECKey = (ECPrivateKey)kp.getPrivate();
-        keyStore.setKeyEntry("ECPrivKey", privateECKey, keyStorePass
-                .toCharArray(), chain);
-
-        // Test ec sign / verify
-        ECPublicKey pub = (ECPublicKey)kp.getPublic();
-        String oldPrivateKey = new String(Hex.encode(privateECKey.getEncoded()));
-        String oldPublicKey = new String(Hex.encode(pub.getEncoded()));
-        ECPrivateKey newKey = (ECPrivateKey)keyStore.getKey("ECPrivKey",
-                keyStorePass.toCharArray());
-        ECPublicKey newPubKey = (ECPublicKey)keyStore.getCertificate(
-                "ECCert").getPublicKey();
-        if (!compress)
-        {
-            ((ECPointEncoder)newKey).setPointFormat("UNCOMPRESSED");
-            ((ECPointEncoder)newPubKey).setPointFormat("UNCOMPRESSED");
-        }
-
-        String newPrivateKey = new String(Hex.encode(newKey.getEncoded()));
-        String newPublicKey = new String(Hex.encode(newPubKey.getEncoded()));
-
-        if (!oldPrivateKey.equals(newPrivateKey))
-        {
-            fail("failed private key comparison");
-        }
-
-        if (!oldPublicKey.equals(newPublicKey))
-        {
-            fail("failed public key comparison");
-        }
-    }
-
-    /**
-     * Create a self signed cert for our software emulation
-     * 
-     * @param kp
-     *            is the keypair for our certificate
-     * @return a self signed cert for our software emulation
-     * @throws InvalidKeyException
-     *             on error
-     * @throws SignatureException
-     *             on error
-     */
-    private X509Certificate generateSelfSignedSoftECCert(KeyPair kp,
-            boolean compress) throws Exception
-    {
-        X509V3CertificateGenerator certGen = new X509V3CertificateGenerator();
-        ECPrivateKey privECKey = (ECPrivateKey)kp.getPrivate();
-        ECPublicKey pubECKey = (ECPublicKey)kp.getPublic();
-        if (!compress)
-        {
-            ((ECPointEncoder)privECKey).setPointFormat("UNCOMPRESSED");
-            ((ECPointEncoder)pubECKey).setPointFormat("UNCOMPRESSED");
-        }
-        certGen.setSignatureAlgorithm("ECDSAwithSHA1");
-        certGen.setSerialNumber(BigInteger.valueOf(1));
-        certGen.setIssuerDN(new X509Principal("CN=Software emul (EC Cert)"));
-        certGen.setNotBefore(new Date(System.currentTimeMillis() - 50000));
-        certGen.setNotAfter(new Date(System.currentTimeMillis() + 50000000));
-        certGen.setSubjectDN(new X509Principal("CN=Software emul (EC Cert)"));
-        certGen.setPublicKey((PublicKey)pubECKey);
-
-        return certGen.generate((PrivateKey)privECKey);
-    }
-    
-    public static void main(
-        String[]    args)
-    {
-        Security.addProvider(new BouncyCastleProvider());
-
-        runTest(new ECEncodingTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/ECIESTest.java b/bcprov/src/main/java/org/bouncycastle/jce/provider/test/ECIESTest.java
deleted file mode 100644
index ad2b8b2..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/ECIESTest.java
+++ /dev/null
@@ -1,226 +0,0 @@
-package org.bouncycastle.jce.provider.test;
-
-import java.security.InvalidAlgorithmParameterException;
-import java.security.KeyPair;
-import java.security.KeyPairGenerator;
-import java.security.SecureRandom;
-import java.security.Security;
-
-import javax.crypto.Cipher;
-
-import org.bouncycastle.crypto.agreement.ECDHBasicAgreement;
-import org.bouncycastle.crypto.digests.SHA1Digest;
-import org.bouncycastle.crypto.engines.DESEngine;
-import org.bouncycastle.crypto.engines.IESEngine;
-import org.bouncycastle.crypto.generators.KDF2BytesGenerator;
-import org.bouncycastle.crypto.macs.HMac;
-import org.bouncycastle.crypto.paddings.PaddedBufferedBlockCipher;
-import org.bouncycastle.jcajce.provider.asymmetric.ec.IESCipher;
-import org.bouncycastle.jce.interfaces.ECPrivateKey;
-import org.bouncycastle.jce.interfaces.ECPublicKey;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.jce.spec.IESParameterSpec;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-
-/**
- * Test for ECIES - Elliptic Curve Integrated Encryption Scheme
- */
-public class ECIESTest
-    extends SimpleTest
-{
-
-    ECIESTest()
-    {
-    }
-
-    public String getName()
-    {
-        return "ECIES";
-    }
-
-    public void performTest()
-        throws Exception
-    {
-        byte[] derivation = Hex.decode("202122232425262728292a2b2c2d2e2f");
-        byte[] encoding   = Hex.decode("303132333435363738393a3b3c3d3e3f");
-        
-        
-        IESCipher c1 = new org.bouncycastle.jcajce.provider.asymmetric.ec.IESCipher.ECIES();
-        IESCipher c2 = new org.bouncycastle.jcajce.provider.asymmetric.ec.IESCipher.ECIES();
-        IESParameterSpec params = new IESParameterSpec(derivation,encoding,128);
-
-        // Testing ECIES with default curve in streaming mode
-        KeyPairGenerator    g = KeyPairGenerator.getInstance("EC", "BC");
-        doTest("ECIES with default", g, "ECIES", params);
-        
-        // Testing ECIES with 192-bit curve in streaming mode 
-        g.initialize(192, new SecureRandom());
-        doTest("ECIES with 192-bit", g, "ECIES", params);
-
-        // Testing ECIES with 256-bit curve in streaming mode 
-        g.initialize(256, new SecureRandom());
-        doTest("ECIES with 256-bit", g, "ECIES", params);
-
-        
-        c1 = new IESCipher(new IESEngine(new ECDHBasicAgreement(), 
-                new KDF2BytesGenerator(new SHA1Digest()),
-                new HMac(new SHA1Digest()),
-                new PaddedBufferedBlockCipher(new DESEngine())));
-        
-        c2 = new IESCipher(new IESEngine(new ECDHBasicAgreement(), 
-                new KDF2BytesGenerator(new SHA1Digest()),
-                new HMac(new SHA1Digest()),
-                new PaddedBufferedBlockCipher(new DESEngine())));  
-    
-        params = new IESParameterSpec(derivation, encoding, 128, 128);
-      
-        // Testing ECIES with default curve using DES
-        g = KeyPairGenerator.getInstance("EC", "BC");
-        doTest("default", g, "ECIESwithDESEDE", params);
-        
-        // Testing ECIES with 192-bit curve using DES
-        g.initialize(192, new SecureRandom());
-        doTest("192-bit", g, "ECIESwithDESEDE", params);
-        
-        // Testing ECIES with 256-bit curve using DES
-        g.initialize(256, new SecureRandom());
-        doTest("256-bit", g, "ECIESwithDESEDE", params);
-
-        // Testing ECIES with 256-bit curve using DES-CBC
-        g.initialize(256, new SecureRandom());
-        doTest("256-bit", g, "ECIESwithDESEDE-CBC", params);
-
-        params = new IESParameterSpec(derivation, encoding, 128, 128, Hex.decode("0001020304050607"));
-        g.initialize(256, new SecureRandom());
-        doTest("256-bit", g, "ECIESwithDESEDE-CBC", params);
-
-        try
-        {
-            params = new IESParameterSpec(derivation, encoding, 128, 128, new byte[10]);
-            g.initialize(256, new SecureRandom());
-            doTest("256-bit", g, "ECIESwithDESEDE-CBC", params);
-            fail("DESEDE no exception!");
-        }
-        catch (InvalidAlgorithmParameterException e)
-        {
-            if (!e.getMessage().equals("NONCE in IES Parameters needs to be 8 bytes long"))
-            {
-                fail("DESEDE wrong message!");
-            }
-        }
-
-        c1 = new org.bouncycastle.jcajce.provider.asymmetric.ec.IESCipher.ECIESwithAES();
-        c2 = new org.bouncycastle.jcajce.provider.asymmetric.ec.IESCipher.ECIESwithAES();
-        params = new IESParameterSpec(derivation, encoding, 128, 128);
-        
-        // Testing ECIES with default curve using AES 
-        g = KeyPairGenerator.getInstance("EC", "BC");
-        doTest("default", g, "ECIESwithAES", params);
-        
-        // Testing ECIES with 192-bit curve using AES
-        g.initialize(192, new SecureRandom());
-        doTest("192-bit", g, "ECIESwithAES", params);
-        
-        // Testing ECIES with 256-bit curve using AES
-        g.initialize(256, new SecureRandom());
-        doTest("256-bit", g, "ECIESwithAES", params);
-
-        // Testing ECIES with 256-bit curve using AES-CBC
-        g.initialize(256, new SecureRandom());
-        doTest("256-bit", g, "ECIESwithAES-CBC", params);
-
-        params = new IESParameterSpec(derivation, encoding, 128, 128, Hex.decode("000102030405060708090a0b0c0d0e0f"));
-        g.initialize(256, new SecureRandom());
-        doTest("256-bit", g, "ECIESwithAES-CBC", params);
-
-        try
-        {
-            params = new IESParameterSpec(derivation, encoding, 128, 128, new byte[10]);
-            g.initialize(256, new SecureRandom());
-            doTest("256-bit", g, "ECIESwithAES-CBC", params);
-            fail("AES no exception!");
-        }
-        catch (InvalidAlgorithmParameterException e)
-        {
-            if (!e.getMessage().equals("NONCE in IES Parameters needs to be 16 bytes long"))
-            {
-                fail("AES wrong message!");
-            }
-        }
-    }
-
-    public void doTest(
-        String                testname,
-        KeyPairGenerator     g,
-        String              cipher,
-        IESParameterSpec    p)
-        throws Exception
-    {
-
-        byte[] message = Hex.decode("0102030405060708090a0b0c0d0e0f10111213141516");
-        byte[] out1, out2;
-
-        // Generate static key pair
-        KeyPair     KeyPair = g.generateKeyPair();
-        ECPublicKey   Pub = (ECPublicKey) KeyPair.getPublic();
-        ECPrivateKey  Priv = (ECPrivateKey) KeyPair.getPrivate();
-
-        Cipher c1 = Cipher.getInstance(cipher);
-        Cipher c2 = Cipher.getInstance(cipher);
-
-        // Testing with null parameters and DHAES mode off
-        c1.init(Cipher.ENCRYPT_MODE, Pub, new SecureRandom());
-        c2.init(Cipher.DECRYPT_MODE, Priv, new SecureRandom());
-        out1 = c1.doFinal(message, 0, message.length);
-        out2 = c2.doFinal(out1, 0, out1.length);
-        if (!areEqual(out2, message))
-            fail(testname + " test failed with null parameters, DHAES mode false.");
-    
-        
-        // Testing with given parameters and DHAES mode off
-        c1.init(Cipher.ENCRYPT_MODE, Pub, p, new SecureRandom());
-        c2.init(Cipher.DECRYPT_MODE, Priv, p, new SecureRandom());
-        out1 = c1.doFinal(message, 0, message.length);
-        out2 = c2.doFinal(out1, 0, out1.length);
-        if (!areEqual(out2, message))
-            fail(testname + " test failed with non-null parameters, DHAES mode false.");
-        
-
-// TODO: DHAES mode is not currently implemented, perhaps it shouldn't be...
-//        c1 = Cipher.getInstance(cipher + "/DHAES/PKCS7Padding","BC");
-//        c2 = Cipher.getInstance(cipher + "/DHAES/PKCS7Padding","BC");
-//
-//        // Testing with null parameters and DHAES mode on
-//        c1.init(Cipher.ENCRYPT_MODE, Pub, new SecureRandom());
-//        c2.init(Cipher.DECRYPT_MODE, Priv, new SecureRandom());
-//
-//        out1 = c1.doFinal(message, 0, message.length);
-//        out2 = c2.doFinal(out1, 0, out1.length);
-//        if (!areEqual(out2, message))
-//            fail(testname + " test failed with null parameters, DHAES mode true.");
-//
-//        c1 = Cipher.getInstance(cipher + "/DHAES/PKCS7Padding");
-//        c2 = Cipher.getInstance(cipher + "/DHAES/PKCS7Padding");
-//
-//        // Testing with given parameters and DHAES mode on
-//        c1.init(Cipher.ENCRYPT_MODE, Pub, p, new SecureRandom());
-//        c2.init(Cipher.DECRYPT_MODE, Priv, p, new SecureRandom());
-//
-//        out1 = c1.doFinal(message, 0, message.length);
-//        out2 = c2.doFinal(out1, 0, out1.length);
-//        if (!areEqual(out2, message))
-//            fail(testname + " test failed with non-null parameters, DHAES mode true.");
-        
-    }
-
-   
-
-    public static void main(
-        String[]    args)
-    {
-        Security.addProvider(new BouncyCastleProvider());
-
-        runTest(new ECIESTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/ECNRTest.java b/bcprov/src/main/java/org/bouncycastle/jce/provider/test/ECNRTest.java
deleted file mode 100644
index 7469506..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/ECNRTest.java
+++ /dev/null
@@ -1,247 +0,0 @@
-package org.bouncycastle.jce.provider.test;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.math.BigInteger;
-import java.security.KeyFactory;
-import java.security.PrivateKey;
-import java.security.PublicKey;
-import java.security.SecureRandom;
-import java.security.Security;
-import java.security.Signature;
-
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.jce.spec.ECParameterSpec;
-import org.bouncycastle.jce.spec.ECPrivateKeySpec;
-import org.bouncycastle.jce.spec.ECPublicKeySpec;
-import org.bouncycastle.math.ec.ECCurve;
-import org.bouncycastle.util.BigIntegers;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.FixedSecureRandom;
-import org.bouncycastle.util.test.SimpleTest;
-
-public class ECNRTest
-    extends SimpleTest
-{
-    byte[] k1 = Hex.decode("d5014e4b60ef2ba8b6211b4062ba3224e0427dd3");
-    byte[] k2 = Hex.decode("345e8d05c075c3a508df729a1685690e68fcfb8c8117847e89063bca1f85d968fd281540b6e13bd1af989a1fbf17e06462bf511f9d0b140fb48ac1b1baa5bded");
-
-    SecureRandom    random = new FixedSecureRandom(new byte[][] { k1, k2 });
-    
-    /**
-     * X9.62 - 1998,<br>
-     * J.3.2, Page 155, ECDSA over the field Fp<br>
-     * an example with 239 bit prime
-     */
-    private void testECNR239bitPrime()
-        throws Exception
-    {
-        BigInteger r = new BigInteger("308636143175167811492623515537541734843573549327605293463169625072911693");
-        BigInteger s = new BigInteger("852401710738814635664888632022555967400445256405412579597015412971797143");
-
-        byte[] kData = BigIntegers.asUnsignedByteArray(new BigInteger("700000017569056646655505781757157107570501575775705779575555657156756655"));
-        
-        SecureRandom    k = new FixedSecureRandom(kData);
-
-        ECCurve curve = new ECCurve.Fp(
-            new BigInteger("883423532389192164791648750360308885314476597252960362792450860609699839"), // q
-            new BigInteger("7fffffffffffffffffffffff7fffffffffff8000000000007ffffffffffc", 16), // a
-            new BigInteger("6b016c3bdcf18941d0d654921475ca71a9db2fb27d1d37796185c2942c0a", 16)); // b
-
-        ECParameterSpec spec = new ECParameterSpec(
-            curve,
-            curve.decodePoint(Hex.decode("020ffa963cdca8816ccc33b8642bedf905c3d358573d3f27fbbd3b3cb9aaaf")), // G
-            new BigInteger("883423532389192164791648750360308884807550341691627752275345424702807307")); // n
-        
-
-        ECPrivateKeySpec priKey = new ECPrivateKeySpec(
-            new BigInteger("876300101507107567501066130761671078357010671067781776716671676178726717"), // d
-            spec);
-
-        ECPublicKeySpec pubKey = new ECPublicKeySpec(
-            curve.decodePoint(Hex.decode("025b6dc53bc61a2548ffb0f671472de6c9521a9d2d2534e65abfcbd5fe0c70")), // Q
-            spec);
-
-        Signature           sgr = Signature.getInstance("SHA1withECNR", "BC");
-        KeyFactory          f = KeyFactory.getInstance("ECDSA", "BC");
-
-        byte[] message = new byte[] { (byte)'a', (byte)'b', (byte)'c' };
-        
-        checkSignature(239, priKey, pubKey, sgr, k, message, r, s);
-    }
-    
-    // -------------------------------------------------------------------------
-    
-    /**
-     * X9.62 - 1998,<br>
-     * Page 104-105, ECDSA over the field Fp<br>
-     * an example with 192 bit prime
-     */
-    private void testECNR192bitPrime()
-        throws Exception
-    {
-        BigInteger r  = new BigInteger("2474388605162950674935076940284692598330235697454145648371");
-        BigInteger s  = new BigInteger("2997192822503471356158280167065034437828486078932532073836");
-
-        byte[] kData = BigIntegers.asUnsignedByteArray(new BigInteger("dcc5d1f1020906df2782360d36b2de7a17ece37d503784af", 16));
-        
-        SecureRandom    k = new FixedSecureRandom(kData);
-
-        ECCurve.Fp curve = new ECCurve.Fp(
-            new BigInteger("6277101735386680763835789423207666416083908700390324961279"), // q (or p)
-            new BigInteger("FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFC", 16),   // a
-            new BigInteger("64210519E59C80E70FA7E9AB72243049FEB8DEECC146B9B1", 16));  // b
-        
-        ECParameterSpec spec = new ECParameterSpec(
-            curve,
-            curve.decodePoint(Hex.decode("03188DA80EB03090F67CBF20EB43A18800F4FF0AFD82FF1012")), // G
-            new BigInteger("6277101735386680763835789423176059013767194773182842284081")); // n
-        
-
-        ECPrivateKeySpec priKey = new ECPrivateKeySpec(
-            new BigInteger("651056770906015076056810763456358567190100156695615665659"), // d
-            spec);
-
-        ECPublicKeySpec pubKey = new ECPublicKeySpec(
-            curve.decodePoint(Hex.decode("0262B12D60690CDCF330BABAB6E69763B471F994DD702D16A5")), // Q
-            spec);
-
-        Signature           sgr = Signature.getInstance("SHA1withECNR", "BC");
-        KeyFactory          f = KeyFactory.getInstance("ECDSA", "BC");
-
-        byte[] message = new byte[] { (byte)'a', (byte)'b', (byte)'c' };
-        
-        checkSignature(192, priKey, pubKey, sgr, k, message, r, s);
-    }
-    
-    // -------------------------------------------------------------------------
-    
-    /**
-     * SEC 2: Recommended Elliptic Curve Domain Parameters - September 2000,<br>
-     * Page 17-19, Recommended 521-bit Elliptic Curve Domain Parameters over Fp<br>
-     * an ECC example with a 521 bit prime and a 512 bit hash
-     */
-    private void testECNR521bitPrime()
-        throws Exception
-    {
-        BigInteger r  = new BigInteger("1820641608112320695747745915744708800944302281118541146383656165330049339564439316345159057453301092391897040509935100825960342573871340486684575368150970954");
-        BigInteger s  = new BigInteger("6358277176448326821136601602749690343031826490505780896013143436153111780706227024847359990383467115737705919410755190867632280059161174165591324242446800763");
-
-        byte[] kData = BigIntegers.asUnsignedByteArray(new BigInteger("cdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef", 16));
-        
-        SecureRandom    k = new FixedSecureRandom(kData);
-
-        ECCurve.Fp curve = new ECCurve.Fp(
-            new BigInteger("6864797660130609714981900799081393217269435300143305409394463459185543183397656052122559640661454554977296311391480858037121987999716643812574028291115057151"), // q (or p)
-            new BigInteger("01FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFC", 16),   // a
-            new BigInteger("0051953EB9618E1C9A1F929A21A0B68540EEA2DA725B99B315F3B8B489918EF109E156193951EC7E937B1652C0BD3BB1BF073573DF883D2C34F1EF451FD46B503F00", 16));  // b
-        
-        ECParameterSpec spec = new ECParameterSpec(
-            curve,
-            curve.decodePoint(Hex.decode("0200C6858E06B70404E9CD9E3ECB662395B4429C648139053FB521F828AF606B4D3DBAA14B5E77EFE75928FE1DC127A2FFA8DE3348B3C1856A429BF97E7E31C2E5BD66")), // G
-            new BigInteger("01FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFA51868783BF2F966B7FCC0148F709A5D03BB5C9B8899C47AEBB6FB71E91386409", 16)); // n
-        
-
-        ECPrivateKeySpec priKey = new ECPrivateKeySpec(
-            new BigInteger("5769183828869504557786041598510887460263120754767955773309066354712783118202294874205844512909370791582896372147797293913785865682804434049019366394746072023"), // d
-            spec);
-
-        ECPublicKeySpec pubKey = new ECPublicKeySpec(
-            curve.decodePoint(Hex.decode("02006BFDD2C9278B63C92D6624F151C9D7A822CC75BD983B17D25D74C26740380022D3D8FAF304781E416175EADF4ED6E2B47142D2454A7AC7801DD803CF44A4D1F0AC")), // Q
-            spec);
-
-        Signature           sgr = Signature.getInstance("SHA512withECNR", "BC");
-        byte[] message = new byte[] { (byte)'a', (byte)'b', (byte)'c' };
-        
-        checkSignature(521, priKey, pubKey, sgr, k, message, r, s);
-    }
-
-    private void checkSignature(
-        int size,
-        ECPrivateKeySpec priKey, 
-        ECPublicKeySpec pubKey, 
-        Signature sgr,
-        SecureRandom k, 
-        byte[] message, 
-        BigInteger r, 
-        BigInteger s)
-        throws Exception
-    {
-        KeyFactory          f = KeyFactory.getInstance("ECDSA", "BC");
-        PrivateKey          sKey = f.generatePrivate(priKey);
-        PublicKey           vKey = f.generatePublic(pubKey);
-
-        sgr.initSign(sKey, k);
-
-        sgr.update(message);
-
-        byte[]  sigBytes = sgr.sign();
-
-        sgr.initVerify(vKey);
-
-        sgr.update(message);
-
-        if (!sgr.verify(sigBytes))
-        {
-            fail(size + " bit EC verification failed");
-        }
-
-        BigInteger[]  sig = derDecode(sigBytes);
-
-        if (!r.equals(sig[0]))
-        {
-            fail(size + "bit"
-                + ": r component wrong." + System.getProperty("line.separator")
-                + " expecting: " + r + System.getProperty("line.separator")
-                + " got      : " + sig[0]);
-        }
-
-        if (!s.equals(sig[1]))
-        {
-            fail(size + "bit"
-                + ": s component wrong." + System.getProperty("line.separator")
-                + " expecting: " + s + System.getProperty("line.separator")
-                + " got      : " + sig[1]);
-        }
-    }
-
-    protected BigInteger[] derDecode(
-        byte[]  encoding)
-        throws IOException
-    {
-        ByteArrayInputStream    bIn = new ByteArrayInputStream(encoding);
-        ASN1InputStream         aIn = new ASN1InputStream(bIn);
-        ASN1Sequence            s = (ASN1Sequence)aIn.readObject();
-
-        BigInteger[]            sig = new BigInteger[2];
-
-        sig[0] = ((ASN1Integer)s.getObjectAt(0)).getValue();
-        sig[1] = ((ASN1Integer)s.getObjectAt(1)).getValue();
-
-        return sig;
-    }
-
-    public String getName()
-    {
-        return "ECNR";
-    }
-
-    public void performTest()
-        throws Exception
-    {
-        testECNR192bitPrime();
-        testECNR239bitPrime();
-        testECNR521bitPrime();
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        Security.addProvider(new BouncyCastleProvider());
-
-        runTest(new ECNRTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/ElGamalTest.java b/bcprov/src/main/java/org/bouncycastle/jce/provider/test/ElGamalTest.java
deleted file mode 100644
index 2ff0851..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/ElGamalTest.java
+++ /dev/null
@@ -1,497 +0,0 @@
-package org.bouncycastle.jce.provider.test;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.math.BigInteger;
-import java.security.AlgorithmParameterGenerator;
-import java.security.AlgorithmParameters;
-import java.security.KeyFactory;
-import java.security.KeyPair;
-import java.security.KeyPairGenerator;
-import java.security.SecureRandom;
-import java.security.Security;
-import java.security.spec.PKCS8EncodedKeySpec;
-import java.security.spec.X509EncodedKeySpec;
-
-import javax.crypto.Cipher;
-import javax.crypto.interfaces.DHPrivateKey;
-import javax.crypto.interfaces.DHPublicKey;
-import javax.crypto.spec.DHParameterSpec;
-
-import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
-import org.bouncycastle.jce.interfaces.PKCS12BagAttributeCarrier;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-
-public class ElGamalTest
-    extends SimpleTest
-{
-    private BigInteger g512 = new BigInteger("153d5d6172adb43045b68ae8e1de1070b6137005686d29d3d73a7749199681ee5b212c9b96bfdcfa5b20cd5e3fd2044895d609cf9b410b7a0f12ca1cb9a428cc", 16);
-    private BigInteger p512 = new BigInteger("9494fec095f3b85ee286542b3836fc81a5dd0a0349b4c239dd38744d488cf8e31db8bcb7d33b41abb9e5a33cca9144b1cef332c94bf0573bf047a3aca98cdf3b", 16);
-
-    private BigInteger g768 = new BigInteger("7c240073c1316c621df461b71ebb0cdcc90a6e5527e5e126633d131f87461c4dc4afc60c2cb0f053b6758871489a69613e2a8b4c8acde23954c08c81cbd36132cfd64d69e4ed9f8e51ed6e516297206672d5c0a69135df0a5dcf010d289a9ca1", 16);
-    private BigInteger p768 = new BigInteger("8c9dd223debed1b80103b8b309715be009d48860ed5ae9b9d5d8159508efd802e3ad4501a7f7e1cfec78844489148cd72da24b21eddd01aa624291c48393e277cfc529e37075eccef957f3616f962d15b44aeab4039d01b817fde9eaa12fd73f", 16);
-
-    private BigInteger  g1024 = new BigInteger("1db17639cdf96bc4eabba19454f0b7e5bd4e14862889a725c96eb61048dcd676ceb303d586e30f060dbafd8a571a39c4d823982117da5cc4e0f89c77388b7a08896362429b94a18a327604eb7ff227bffbc83459ade299e57b5f77b50fb045250934938efa145511166e3197373e1b5b1e52de713eb49792bedde722c6717abf", 16);
-    private BigInteger  p1024 = new BigInteger("a00e283b3c624e5b2b4d9fbc2653b5185d99499b00fd1bf244c6f0bb817b4d1c451b2958d62a0f8a38caef059fb5ecd25d75ed9af403f5b5bdab97a642902f824e3c13789fed95fa106ddfe0ff4a707c85e2eb77d49e68f2808bcea18ce128b178cd287c6bc00efa9a1ad2a673fe0dceace53166f75b81d6709d5f8af7c66bb7", 16);
-
-    public String getName()
-    {
-        return "ElGamal";
-    }
-
-    private void testGP(
-        int         size,
-        int         privateValueSize,
-        BigInteger  g,
-        BigInteger  p)
-        throws Exception
-    {
-        DHParameterSpec  elParams = new DHParameterSpec(p, g, privateValueSize);
-        KeyPairGenerator keyGen = KeyPairGenerator.getInstance("ElGamal", "BC");
-        byte[]           in = "This is a test".getBytes();
-
-        keyGen.initialize(elParams);
-        
-        KeyPair         keyPair = keyGen.generateKeyPair();
-        SecureRandom    rand = new SecureRandom();
-
-        checkKeySize(privateValueSize, keyPair);
-
-        Cipher  cipher = Cipher.getInstance("ElGamal", "BC");
-        
-        cipher.init(Cipher.ENCRYPT_MODE, keyPair.getPublic(), rand);
-        
-        if (cipher.getOutputSize(in.length) != (size / 8) * 2)
-        {
-            fail("getOutputSize wrong on encryption");
-        }
-
-        byte[]  out = cipher.doFinal(in);
-        
-        cipher.init(Cipher.DECRYPT_MODE, keyPair.getPrivate());
-        
-        if (cipher.getOutputSize(out.length) != (size / 8) - 1)
-        {
-            fail("getOutputSize wrong on decryption");
-        }
-        
-        //
-        // No Padding - maximum length
-        //
-        byte[]  modBytes = ((DHPublicKey)keyPair.getPublic()).getParams().getP().toByteArray();
-        byte[]  maxInput = new byte[modBytes.length - 1];
-
-        maxInput[0] |= 0x7f;
-
-        cipher.init(Cipher.ENCRYPT_MODE, keyPair.getPublic(), rand);
-
-        out = cipher.doFinal(maxInput);
-
-        cipher.init(Cipher.DECRYPT_MODE, keyPair.getPrivate());
-
-        out = cipher.doFinal(out);
-
-        if (!areEqual(out, maxInput))
-        {
-            fail("NoPadding test failed on decrypt expected " + new String(Hex.encode(maxInput)) + " got " + new String(Hex.encode(out)));
-        }
-
-        //
-        // encrypt/decrypt
-        //
-
-        Cipher  c1 = Cipher.getInstance("ElGamal", "BC");
-        Cipher  c2 = Cipher.getInstance("ElGamal", "BC");
-
-        c1.init(Cipher.ENCRYPT_MODE, keyPair.getPublic(), rand);
-
-        byte[]  out1 = c1.doFinal(in);
-
-        c2.init(Cipher.DECRYPT_MODE, keyPair.getPrivate());
-
-        byte[]  out2 = c2.doFinal(out1);
-
-        if (!areEqual(in, out2))
-        {
-            fail(size + " encrypt test failed");
-        }
-        
-        //
-        // encrypt/decrypt with update
-        //
-        int outLen = c1.update(in, 0, 2, out1, 0);
-        
-        outLen += c1.doFinal(in, 2, in.length - 2, out1, outLen);
-
-        outLen = c2.update(out1, 0, 2, out2, 0);
-        
-        outLen += c2.doFinal(out1, 2, out1.length - 2, out2, outLen);
-
-        if (!areEqual(in, out2))
-        {
-            fail(size + " encrypt with update test failed");
-        }
-
-        //
-        // public key encoding test
-        //
-        byte[]                  pubEnc = keyPair.getPublic().getEncoded();
-        KeyFactory              keyFac = KeyFactory.getInstance("ElGamal", "BC");
-        X509EncodedKeySpec      pubX509 = new X509EncodedKeySpec(pubEnc);
-        DHPublicKey             pubKey = (DHPublicKey)keyFac.generatePublic(pubX509);
-        DHParameterSpec         spec = pubKey.getParams();
-
-        if (!spec.getG().equals(elParams.getG()) || !spec.getP().equals(elParams.getP()))
-        {
-            fail(size + " bit public key encoding/decoding test failed on parameters");
-        }
-
-        if (!((DHPublicKey)keyPair.getPublic()).getY().equals(pubKey.getY()))
-        {
-            fail(size + " bit public key encoding/decoding test failed on y value");
-        }
-
-        //
-        // public key serialisation test
-        //
-        pubKey = (DHPublicKey)serializeDeserialize(keyPair.getPublic());
-        spec = pubKey.getParams();
-
-        if (!spec.getG().equals(elParams.getG()) || !spec.getP().equals(elParams.getP()))
-        {
-            fail(size + " bit public key serialisation test failed on parameters");
-        }
-
-        if (!((DHPublicKey)keyPair.getPublic()).getY().equals(pubKey.getY()))
-        {
-            fail(size + " bit public key serialisation test failed on y value");
-        }
-
-        if (!keyPair.getPublic().equals(pubKey))
-        {
-            fail("equals test failed");
-        }
-
-        if (keyPair.getPublic().hashCode() != pubKey.hashCode())
-        {
-            fail("hashCode test failed");
-        }
-
-        //
-        // private key encoding test
-        //
-        byte[]              privEnc = keyPair.getPrivate().getEncoded();
-        PKCS8EncodedKeySpec privPKCS8 = new PKCS8EncodedKeySpec(privEnc);
-        DHPrivateKey        privKey = (DHPrivateKey)keyFac.generatePrivate(privPKCS8);
-
-        spec = privKey.getParams();
-
-        if (!spec.getG().equals(elParams.getG()) || !spec.getP().equals(elParams.getP()))
-        {
-            fail(size + " bit private key encoding/decoding test failed on parameters");
-        }
-
-        if (!((DHPrivateKey)keyPair.getPrivate()).getX().equals(privKey.getX()))
-        {
-            fail(size + " bit private key encoding/decoding test failed on y value");
-        }
-
-        //
-        // private key serialisation test
-        //
-        privKey = (DHPrivateKey)serializeDeserialize(keyPair.getPrivate());
-        spec = privKey.getParams();
-
-        if (!spec.getG().equals(elParams.getG()) || !spec.getP().equals(elParams.getP()))
-        {
-            fail(size + " bit private key serialisation test failed on parameters");
-        }
-
-        if (!((DHPrivateKey)keyPair.getPrivate()).getX().equals(privKey.getX()))
-        {
-            fail(size + " bit private key serialisation test failed on y value");
-        }
-
-        if (!keyPair.getPrivate().equals(privKey))
-        {
-            fail("equals test failed");
-        }
-
-        if (keyPair.getPrivate().hashCode() != privKey.hashCode())
-        {
-            fail("hashCode test failed");
-        }
-
-        if (!(privKey instanceof PKCS12BagAttributeCarrier))
-        {
-            fail("private key not implementing PKCS12 attribute carrier");
-        }
-    }
-
-    private Object serializeDeserialize(Object o)
-        throws Exception
-    {
-        ByteArrayOutputStream bOut = new ByteArrayOutputStream();
-        ObjectOutputStream oOut = new ObjectOutputStream(bOut);
-
-        oOut.writeObject(o);
-        oOut.close();
-
-        ObjectInputStream oIn = new ObjectInputStream(new ByteArrayInputStream(bOut.toByteArray()));
-
-        return oIn.readObject();
-    }
-
-    private void checkKeySize(int privateValueSize, KeyPair aKeyPair)
-    {
-        if (privateValueSize != 0)
-        {
-            DHPrivateKey key = (DHPrivateKey)aKeyPair.getPrivate();
-
-            if (key.getX().bitLength() != privateValueSize)
-            {
-                fail("limited key check failed for key size " + privateValueSize);
-            }
-        }
-    }
-
-    private void testRandom(
-        int         size)
-        throws Exception
-    {
-        AlgorithmParameterGenerator a = AlgorithmParameterGenerator.getInstance("ElGamal", "BC");
-        a.init(size, new SecureRandom());
-        AlgorithmParameters params = a.generateParameters();
-
-        byte[] encodeParams = params.getEncoded();
-
-        AlgorithmParameters a2 = AlgorithmParameters.getInstance("ElGamal", "BC");
-        a2.init(encodeParams);
-
-        // a and a2 should be equivalent!
-        byte[] encodeParams_2 = a2.getEncoded();
-
-        if (!areEqual(encodeParams, encodeParams_2))
-        {
-            fail(this.getName() + ": encode/decode parameters failed");
-        }
-
-        DHParameterSpec elP = (DHParameterSpec)params.getParameterSpec(DHParameterSpec.class);
-
-        testGP(size, 0, elP.getG(), elP.getP());
-    }
-
-    private void testDefault(
-        int         privateValueSize,
-        BigInteger  g,
-        BigInteger  p)
-        throws Exception
-    {
-        DHParameterSpec  elParams = new DHParameterSpec(p, g, privateValueSize);
-        int              size = p.bitLength();
-
-        new BouncyCastleProvider().setParameter(ConfigurableProvider.DH_DEFAULT_PARAMS, elParams);
-
-        KeyPairGenerator keyGen = KeyPairGenerator.getInstance("ElGamal", "BC");
-        byte[]           in = "This is a test".getBytes();
-
-        keyGen.initialize(p.bitLength());
-
-        KeyPair         keyPair = keyGen.generateKeyPair();
-
-        new BouncyCastleProvider().setParameter(ConfigurableProvider.DH_DEFAULT_PARAMS, elParams);
-
-        SecureRandom    rand = new SecureRandom();
-
-        checkKeySize(privateValueSize, keyPair);
-
-        Cipher  cipher = Cipher.getInstance("ElGamal", "BC");
-
-        cipher.init(Cipher.ENCRYPT_MODE, keyPair.getPublic(), rand);
-
-        if (cipher.getOutputSize(in.length) != (size / 8) * 2)
-        {
-            fail("getOutputSize wrong on encryption");
-        }
-
-        byte[]  out = cipher.doFinal(in);
-
-        cipher.init(Cipher.DECRYPT_MODE, keyPair.getPrivate());
-
-        if (cipher.getOutputSize(out.length) != (size / 8) - 1)
-        {
-            fail("getOutputSize wrong on decryption");
-        }
-
-        //
-        // No Padding - maximum length
-        //
-        byte[]  modBytes = ((DHPublicKey)keyPair.getPublic()).getParams().getP().toByteArray();
-        byte[]  maxInput = new byte[modBytes.length - 1];
-
-        maxInput[0] |= 0x7f;
-
-        cipher.init(Cipher.ENCRYPT_MODE, keyPair.getPublic(), rand);
-
-        out = cipher.doFinal(maxInput);
-
-        cipher.init(Cipher.DECRYPT_MODE, keyPair.getPrivate());
-
-        out = cipher.doFinal(out);
-
-        if (!areEqual(out, maxInput))
-        {
-            fail("NoPadding test failed on decrypt expected " + new String(Hex.encode(maxInput)) + " got " + new String(Hex.encode(out)));
-        }
-
-        //
-        // encrypt/decrypt
-        //
-
-        Cipher  c1 = Cipher.getInstance("ElGamal", "BC");
-        Cipher  c2 = Cipher.getInstance("ElGamal", "BC");
-
-        c1.init(Cipher.ENCRYPT_MODE, keyPair.getPublic(), rand);
-
-        byte[]  out1 = c1.doFinal(in);
-
-        c2.init(Cipher.DECRYPT_MODE, keyPair.getPrivate());
-
-        byte[]  out2 = c2.doFinal(out1);
-
-        if (!areEqual(in, out2))
-        {
-            fail(size + " encrypt test failed");
-        }
-
-        //
-        // encrypt/decrypt with update
-        //
-        int outLen = c1.update(in, 0, 2, out1, 0);
-
-        outLen += c1.doFinal(in, 2, in.length - 2, out1, outLen);
-
-        outLen = c2.update(out1, 0, 2, out2, 0);
-
-        outLen += c2.doFinal(out1, 2, out1.length - 2, out2, outLen);
-
-        if (!areEqual(in, out2))
-        {
-            fail(size + " encrypt with update test failed");
-        }
-
-        //
-        // public key encoding test
-        //
-        byte[]                  pubEnc = keyPair.getPublic().getEncoded();
-        KeyFactory              keyFac = KeyFactory.getInstance("ElGamal", "BC");
-        X509EncodedKeySpec      pubX509 = new X509EncodedKeySpec(pubEnc);
-        DHPublicKey             pubKey = (DHPublicKey)keyFac.generatePublic(pubX509);
-        DHParameterSpec         spec = pubKey.getParams();
-
-        if (!spec.getG().equals(elParams.getG()) || !spec.getP().equals(elParams.getP()))
-        {
-            fail(size + " bit public key encoding/decoding test failed on parameters");
-        }
-
-        if (!((DHPublicKey)keyPair.getPublic()).getY().equals(pubKey.getY()))
-        {
-            fail(size + " bit public key encoding/decoding test failed on y value");
-        }
-
-        //
-        // public key serialisation test
-        //
-        ByteArrayOutputStream   bOut = new ByteArrayOutputStream();
-        ObjectOutputStream      oOut = new ObjectOutputStream(bOut);
-
-        oOut.writeObject(keyPair.getPublic());
-
-        ByteArrayInputStream   bIn = new ByteArrayInputStream(bOut.toByteArray());
-        ObjectInputStream      oIn = new ObjectInputStream(bIn);
-
-        pubKey = (DHPublicKey)oIn.readObject();
-        spec = pubKey.getParams();
-
-        if (!spec.getG().equals(elParams.getG()) || !spec.getP().equals(elParams.getP()))
-        {
-            fail(size + " bit public key serialisation test failed on parameters");
-        }
-
-        if (!((DHPublicKey)keyPair.getPublic()).getY().equals(pubKey.getY()))
-        {
-            fail(size + " bit public key serialisation test failed on y value");
-        }
-
-        //
-        // private key encoding test
-        //
-        byte[]              privEnc = keyPair.getPrivate().getEncoded();
-        PKCS8EncodedKeySpec privPKCS8 = new PKCS8EncodedKeySpec(privEnc);
-        DHPrivateKey        privKey = (DHPrivateKey)keyFac.generatePrivate(privPKCS8);
-
-        spec = privKey.getParams();
-
-        if (!spec.getG().equals(elParams.getG()) || !spec.getP().equals(elParams.getP()))
-        {
-            fail(size + " bit private key encoding/decoding test failed on parameters");
-        }
-
-        if (!((DHPrivateKey)keyPair.getPrivate()).getX().equals(privKey.getX()))
-        {
-            fail(size + " bit private key encoding/decoding test failed on y value");
-        }
-
-        //
-        // private key serialisation test
-        //
-        bOut = new ByteArrayOutputStream();
-        oOut = new ObjectOutputStream(bOut);
-
-        oOut.writeObject(keyPair.getPrivate());
-
-        bIn = new ByteArrayInputStream(bOut.toByteArray());
-        oIn = new ObjectInputStream(bIn);
-
-        privKey = (DHPrivateKey)oIn.readObject();
-        spec = privKey.getParams();
-
-        if (!spec.getG().equals(elParams.getG()) || !spec.getP().equals(elParams.getP()))
-        {
-            fail(size + " bit private key serialisation test failed on parameters");
-        }
-
-        if (!((DHPrivateKey)keyPair.getPrivate()).getX().equals(privKey.getX()))
-        {
-            fail(size + " bit private key serialisation test failed on y value");
-        }
-    }
-
-    public void performTest()
-        throws Exception
-    {
-        testDefault(64, g512, p512);
-
-        testGP(512, 0, g512, p512);
-        testGP(768, 0, g768, p768);
-        testGP(1024, 0, g1024, p1024);
-
-        testGP(512, 64, g512, p512);
-        testGP(768, 128, g768, p768);
-        testGP(1024, 256, g1024, p1024);
-
-        testRandom(256);
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        Security.addProvider(new BouncyCastleProvider());
-
-        runTest(new ElGamalTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/EncryptedPrivateKeyInfoTest.java b/bcprov/src/main/java/org/bouncycastle/jce/provider/test/EncryptedPrivateKeyInfoTest.java
deleted file mode 100644
index 80e64ac..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/EncryptedPrivateKeyInfoTest.java
+++ /dev/null
@@ -1,145 +0,0 @@
-package org.bouncycastle.jce.provider.test;
-
-import java.security.AlgorithmParameters;
-import java.security.KeyPair;
-import java.security.KeyPairGenerator;
-import java.security.MessageDigest;
-import java.security.PrivateKey;
-import java.security.PublicKey;
-import java.security.SecureRandom;
-import java.security.Security;
-import java.security.spec.PKCS8EncodedKeySpec;
-
-import javax.crypto.Cipher;
-import javax.crypto.EncryptedPrivateKeyInfo;
-import javax.crypto.SecretKeyFactory;
-import javax.crypto.spec.PBEKeySpec;
-import javax.crypto.spec.PBEParameterSpec;
-
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.util.test.SimpleTestResult;
-import org.bouncycastle.util.test.Test;
-import org.bouncycastle.util.test.TestResult;
-
-public class EncryptedPrivateKeyInfoTest
-    implements Test
-{
-    String  alg = "1.2.840.113549.1.12.1.3"; // 3 key triple DES with SHA-1
-
-    public TestResult perform()
-    {
-        try
-        {
-            KeyPairGenerator fact = KeyPairGenerator.getInstance("RSA", "BC");
-            fact.initialize(512, new SecureRandom());
-
-            KeyPair keyPair = fact.generateKeyPair();
-
-            PrivateKey  priKey = keyPair.getPrivate();
-            PublicKey   pubKey = keyPair.getPublic();
-
-            //
-            // set up the parameters
-            //
-            byte[]              salt = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 };
-            int                 iterationCount = 100;
-            PBEParameterSpec    defParams = new PBEParameterSpec(salt, iterationCount);
-
-            AlgorithmParameters params = AlgorithmParameters.getInstance(alg, "BC");
-
-            params.init(defParams);
-
-            //
-            // set up the key
-            //
-            char[]  password1 = { 'h', 'e', 'l', 'l', 'o' };
-
-            PBEKeySpec          pbeSpec = new PBEKeySpec(password1);
-            SecretKeyFactory    keyFact = SecretKeyFactory.getInstance(alg, "BC");
-            Cipher cipher = Cipher.getInstance(alg, "BC");
-
-            cipher.init(Cipher.WRAP_MODE, keyFact.generateSecret(pbeSpec), params);
-
-            byte[] wrappedKey = cipher.wrap(priKey);
-
-            //
-            // create encrypted object
-            //
-
-            EncryptedPrivateKeyInfo pInfo = new EncryptedPrivateKeyInfo(params, wrappedKey);
-
-            //
-            // decryption step
-            //
-            char[]  password2 = { 'h', 'e', 'l', 'l', 'o' };
-
-            pbeSpec = new PBEKeySpec(password2);
-
-            cipher = Cipher.getInstance(pInfo.getAlgName(), "BC");
-
-            cipher.init(Cipher.DECRYPT_MODE, keyFact.generateSecret(pbeSpec), pInfo.getAlgParameters());
-
-            PKCS8EncodedKeySpec keySpec = pInfo.getKeySpec(cipher);
-
-            if (!MessageDigest.isEqual(priKey.getEncoded(), keySpec.getEncoded()))
-            {
-                return new SimpleTestResult(false, "Private key does not match");
-            }
-
-            //
-            // using Cipher parameters test
-            //
-            pbeSpec = new PBEKeySpec(password1);
-            keyFact = SecretKeyFactory.getInstance(alg, "BC");
-            cipher = Cipher.getInstance(alg, "BC");
-
-            cipher.init(Cipher.WRAP_MODE, keyFact.generateSecret(pbeSpec), params);
-
-            wrappedKey = cipher.wrap(priKey);
-
-            //
-            // create encrypted object
-            //
-
-            pInfo = new EncryptedPrivateKeyInfo(cipher.getParameters(), wrappedKey);
-
-            //
-            // decryption step
-            //
-            pbeSpec = new PBEKeySpec(password2);
-
-            cipher = Cipher.getInstance(pInfo.getAlgName(), "BC");
-
-            cipher.init(Cipher.DECRYPT_MODE, keyFact.generateSecret(pbeSpec), pInfo.getAlgParameters());
-
-            keySpec = pInfo.getKeySpec(cipher);
-
-            if (!MessageDigest.isEqual(priKey.getEncoded(), keySpec.getEncoded()))
-            {
-                return new SimpleTestResult(false, "Private key does not match");
-            }
-            
-            return new SimpleTestResult(true, getName() + ": Okay");
-        }
-        catch (Exception e)
-        {
-            return new SimpleTestResult(false, getName() + ": exception - " + e.toString(), e);
-        }
-    }
-
-    public String getName()
-    {
-        return "EncryptedPrivateKeyInfoTest";
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        Security.addProvider(new BouncyCastleProvider());
-
-        Test            test = new EncryptedPrivateKeyInfoTest();
-        TestResult      result = test.perform();
-
-        System.out.println(result.toString());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/FIPSDESTest.java b/bcprov/src/main/java/org/bouncycastle/jce/provider/test/FIPSDESTest.java
deleted file mode 100644
index 5a59987..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/FIPSDESTest.java
+++ /dev/null
@@ -1,229 +0,0 @@
-package org.bouncycastle.jce.provider.test;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.DataInputStream;
-import java.io.IOException;
-import java.security.InvalidAlgorithmParameterException;
-import java.security.Key;
-import java.security.KeyException;
-import java.security.Security;
-
-import javax.crypto.Cipher;
-import javax.crypto.CipherInputStream;
-import javax.crypto.CipherOutputStream;
-import javax.crypto.spec.IvParameterSpec;
-import javax.crypto.spec.SecretKeySpec;
-
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTestResult;
-import org.bouncycastle.util.test.Test;
-import org.bouncycastle.util.test.TestResult;
-
-/**
- * basic FIPS test class for a block cipher, just to make sure ECB/CBC/OFB/CFB are behaving
- * correctly. Tests from <a href=http://www.itl.nist.gov/fipspubs/fip81.htm>FIPS 81</a>.
- */
-public class FIPSDESTest
-    implements Test
-{
-    static String[] fips1Tests =
-    {
-        "DES/ECB/NoPadding",
-        "3fa40e8a984d48156a271787ab8883f9893d51ec4b563b53",
-        "DES/CBC/NoPadding",
-        "e5c7cdde872bf27c43e934008c389c0f683788499a7c05f6",
-        "DES/CFB/NoPadding",
-        "f3096249c7f46e51a69e839b1a92f78403467133898ea622"
-    };
-
-    static String[] fips2Tests =
-    {
-        "DES/CFB8/NoPadding",
-        "f31fda07011462ee187f",
-        "DES/OFB8/NoPadding",
-        "f34a2850c9c64985d684"
-    };
-
-    static byte[]   input1 = Hex.decode("4e6f77206973207468652074696d6520666f7220616c6c20");
-    static byte[]   input2 = Hex.decode("4e6f7720697320746865");
-
-    public String getName()
-    {
-        return "FIPSDESTest";
-    }
-
-    private boolean equalArray(
-        byte[]  a,
-        byte[]  b)
-    {
-        if (a.length != b.length)
-        {
-            return false;
-        }
-
-        for (int i = 0; i != a.length; i++)
-        {
-            if (a[i] != b[i])
-            {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    public TestResult test(
-        String      algorithm,
-        byte[]      input,
-        byte[]      output)
-    {
-        Key                     key;
-        Cipher                  in, out;
-        CipherInputStream       cIn;
-        CipherOutputStream      cOut;
-        ByteArrayInputStream    bIn;
-        ByteArrayOutputStream   bOut;
-        IvParameterSpec         spec = new IvParameterSpec(Hex.decode("1234567890abcdef"));
-
-        try
-        {
-            String  baseAlgorithm;
-
-            key = new SecretKeySpec(Hex.decode("0123456789abcdef"), "DES");
-
-            in = Cipher.getInstance(algorithm, "BC");
-            out = Cipher.getInstance(algorithm, "BC");
-
-            if (algorithm.startsWith("DES/ECB"))
-            {
-                out.init(Cipher.ENCRYPT_MODE, key);
-            }
-            else
-            {
-                out.init(Cipher.ENCRYPT_MODE, key, spec);
-            }
-        }
-        catch (Exception e)
-        {
-            return new SimpleTestResult(false, getName() + ": " + algorithm + " failed initialisation - " + e.toString(), e);
-        }
-
-        try
-        {
-            if (algorithm.startsWith("DES/ECB"))
-            {
-                in.init(Cipher.DECRYPT_MODE, key);
-            }
-            else
-            {
-                in.init(Cipher.DECRYPT_MODE, key, spec);
-            }
-        }
-        catch (Exception e)
-        {
-            return new SimpleTestResult(false, getName() + ": " + algorithm + " failed initialisation - " + e.toString(), e);
-        }
-
-        //
-        // encryption pass
-        //
-        bOut = new ByteArrayOutputStream();
-
-        cOut = new CipherOutputStream(bOut, out);
-
-        try
-        {
-            for (int i = 0; i != input.length / 2; i++)
-            {
-                cOut.write(input[i]);
-            }
-            cOut.write(input, input.length / 2, input.length - input.length / 2);
-            cOut.close();
-        }
-        catch (IOException e)
-        {
-            return new SimpleTestResult(false, getName() + ": " + algorithm + " failed encryption - " + e.toString());
-        }
-
-        byte[]    bytes;
-
-        bytes = bOut.toByteArray();
-
-        if (!equalArray(bytes, output))
-        {
-            return new SimpleTestResult(false, getName() + ": " + algorithm + " failed encryption - expected " + new String(Hex.encode(output)) + " got " + new String(Hex.encode(bytes)));
-        }
-
-        //
-        // decryption pass
-        //
-        bIn = new ByteArrayInputStream(bytes);
-
-        cIn = new CipherInputStream(bIn, in);
-
-        try
-        {
-            DataInputStream dIn = new DataInputStream(cIn);
-
-            bytes = new byte[input.length];
-
-            for (int i = 0; i != input.length / 2; i++)
-            {
-                bytes[i] = (byte)dIn.read();
-            }
-            dIn.readFully(bytes, input.length / 2, bytes.length - input.length / 2);
-        }
-        catch (Exception e)
-        {
-            return new SimpleTestResult(false, getName() + ": " + algorithm + " failed encryption - " + e.toString());
-        }
-
-        if (!equalArray(bytes, input))
-        {
-            return new SimpleTestResult(false, getName() + ": " + algorithm + " failed decryption - expected " + new String(Hex.encode(input)) + " got " + new String(Hex.encode(bytes)));
-        }
-
-        return new SimpleTestResult(true, getName() + ": " + algorithm + " Okay");
-    }
-
-    public TestResult perform()
-    {
-        for (int i = 0; i != fips1Tests.length; i += 2)
-        {
-            TestResult  result;
-
-            result = test(fips1Tests[i], input1, Hex.decode(fips1Tests[i + 1]));
-            if (!result.isSuccessful())
-            {
-                return result;
-            }
-        }
-
-        for (int i = 0; i != fips2Tests.length; i += 2)
-        {
-            TestResult  result;
-
-            result = test(fips2Tests[i], input2, Hex.decode(fips2Tests[i + 1]));
-            if (!result.isSuccessful())
-            {
-                return result;
-            }
-        }
-
-        return new SimpleTestResult(true, getName() + ": Okay");
-    }
-
-    public static void main(
-        String[]    args)
-        throws KeyException, InvalidAlgorithmParameterException
-    {
-        Security.addProvider(new BouncyCastleProvider());
-
-        Test            test = new FIPSDESTest();
-        TestResult      result = test.perform();
-
-        System.out.println(result.toString());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/GMacTest.java b/bcprov/src/main/java/org/bouncycastle/jce/provider/test/GMacTest.java
deleted file mode 100644
index 3a26d3c..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/GMacTest.java
+++ /dev/null
@@ -1,144 +0,0 @@
-package org.bouncycastle.jce.provider.test;
-
-import java.security.NoSuchAlgorithmException;
-import java.security.Security;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import javax.crypto.Cipher;
-import javax.crypto.KeyGenerator;
-import javax.crypto.Mac;
-import javax.crypto.spec.IvParameterSpec;
-import javax.crypto.spec.SecretKeySpec;
-
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-import org.bouncycastle.util.test.TestFailedException;
-
-public class GMacTest
-    extends SimpleTest
-{
-    public String getName()
-    {
-        return "GMac";
-    }
-
-    public void performTest()
-        throws Exception
-    {
-        checkRegistrations();
-    }
-
-    private void checkRegistrations()
-        throws Exception
-    {
-        List missingMacs = new ArrayList();
-        List missingKeyGens = new ArrayList();
-
-        String[] ciphers = new String[] { "AES", "NOEKEON", "Twofish", "CAST6", "SEED", "Serpent", "RC6", "CAMELLIA" };
-        String[] macs = new String[]
-            {
-                "a52308801b32d4770c701ace9b826f12",
-                "cf11dacaf6024a78dba76b256e23caab",
-                "13db7c428e5a7128149b5ec782d07fac",
-                "d13a33e78e48b274bf7d64bf9aecdb82",
-                "d05d550054735c6e7e01b6981fc14b4e",
-                "4a34dfe4f5410afd7c40b1e110377a73",
-                "d9f597c96b41f641da6c83d4760f543b",
-                "371ad8cc920c6bda2a26d8f237bd446b"
-            };
-
-        for (int i = 0; i < ciphers.length; i++)
-        {
-            String cipherName = ciphers[i];
-            Cipher cipher;
-            try
-            {
-                cipher = Cipher.getInstance(cipherName, "BC");
-            }
-            catch (Exception e)
-            {
-                System.err.println(cipherName + ": " + e.getMessage());
-                continue;
-            }
-            int blocksize;
-            try
-            {
-                blocksize = cipher.getBlockSize();
-            }
-            catch (Exception e)
-            {
-                System.err.println(cipherName + ": " + e.getMessage());
-                continue;
-            }
-            // GCM is defined over 128 bit block ciphers
-            if (blocksize == 16)
-            {
-                String macName = cipherName + "-GMAC";
-                String macNameAlt = cipherName + "GMAC";
-
-                // Check we have a GMAC registered for each name
-                checkMac(macName, missingMacs, missingKeyGens, macs[i]);
-                checkMac(macNameAlt, missingMacs, missingKeyGens, macs[i]);
-            }
-        }
-        if (missingMacs.size() != 0)
-        {
-            fail("Did not find GMAC registrations for the following ciphers: " + missingMacs);
-        }
-        if (missingKeyGens.size() != 0)
-        {
-            fail("Did not find GMAC KeyGenerator registrations for the following macs: " + missingKeyGens);
-        }
-    }
-
-    private void checkMac(String name, List missingMacs, List missingKeyGens, String macOutput)
-    {
-        try
-        {
-            Mac mac = Mac.getInstance(name);
-
-            mac.init(new SecretKeySpec(new byte[mac.getMacLength()], mac.getAlgorithm()), new IvParameterSpec(
-                new byte[16]));
-            mac.update(new byte[128]);
-            byte[] bytes = mac.doFinal();
-
-            if (!Arrays.areEqual(bytes, Hex.decode(macOutput)))
-            {
-                fail("wrong mac value computed for " + name);
-            }
-
-            try
-            {
-                KeyGenerator kg = KeyGenerator.getInstance(name);
-                kg.generateKey();
-            }
-            catch (NoSuchAlgorithmException e)
-            {
-                missingKeyGens.add(name);
-            }
-        }
-        catch (NoSuchAlgorithmException e)
-        {
-            missingMacs.add(name);
-        }
-        catch (TestFailedException e)
-        {
-            throw e;
-        }
-        catch (Exception e)
-        {
-            fail("Unexpected error", e);
-        }
-    }
-
-    public static void main(String[] args)
-    {
-        Security.addProvider(new BouncyCastleProvider());
-
-        runTest(new GMacTest());
-    }
-}
\ No newline at end of file
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/GOST28147Test.java b/bcprov/src/main/java/org/bouncycastle/jce/provider/test/GOST28147Test.java
deleted file mode 100644
index 93e3ad7..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/GOST28147Test.java
+++ /dev/null
@@ -1,249 +0,0 @@
-package org.bouncycastle.jce.provider.test;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.DataInputStream;
-import java.security.Key;
-import java.security.Security;
-
-import javax.crypto.Cipher;
-import javax.crypto.CipherInputStream;
-import javax.crypto.CipherOutputStream;
-import javax.crypto.KeyGenerator;
-import javax.crypto.SecretKey;
-import javax.crypto.spec.IvParameterSpec;
-import javax.crypto.spec.SecretKeySpec;
-
-import org.bouncycastle.asn1.cryptopro.CryptoProObjectIdentifiers;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-
-/**
- * basic test class for the GOST28147 cipher
- */
-public class GOST28147Test
-    extends SimpleTest
-{
-    static String[] cipherTests =
-    {
-        "256",
-        "0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef",
-        "4e6f77206973207468652074696d6520666f7220616c6c20",
-        "281630d0d5770030068c252d841e84149ccc1912052dbc02",
-
-        "256",
-        "0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef",
-        "4e6f77206973207468652074696d65208a920c6ed1a804f5",
-        "88e543dfc04dc4f764fa7b624741cec07de49b007bf36065"
-    };
-
-    public String getName()
-    {
-        return "GOST28147";
-    }
-
-    public void testECB(
-        int         strength,
-        byte[]      keyBytes,
-        byte[]      input,
-        byte[]      output)
-        throws Exception
-    {
-        Key                     key;
-        Cipher                  in, out;
-        CipherInputStream       cIn;
-        CipherOutputStream      cOut;
-        ByteArrayInputStream    bIn;
-        ByteArrayOutputStream   bOut;
-
-        key = new SecretKeySpec(keyBytes, "GOST28147");
-
-        in = Cipher.getInstance("GOST28147/ECB/NoPadding", "BC");
-        out = Cipher.getInstance("GOST28147/ECB/NoPadding", "BC");
-        out.init(Cipher.ENCRYPT_MODE, key);
-        in.init(Cipher.DECRYPT_MODE, key);
-
-        //
-        // encryption pass
-        //
-        bOut = new ByteArrayOutputStream();
-
-        cOut = new CipherOutputStream(bOut, out);
-
-        for (int i = 0; i != input.length / 2; i++)
-        {
-            cOut.write(input[i]);
-        }
-        cOut.write(input, input.length / 2, input.length - input.length / 2);
-        cOut.close();
-
-        byte[]    bytes;
-
-        bytes = bOut.toByteArray();
-
-        if (!areEqual(bytes, output))
-        {
-            fail("GOST28147 failed encryption - expected " + new String(Hex.encode(output)) + " got " + new String(Hex.encode(bytes)));
-        }
-
-        //
-        // decryption pass
-        //
-        bIn = new ByteArrayInputStream(bytes);
-
-        cIn = new CipherInputStream(bIn, in);
-
-        DataInputStream dIn = new DataInputStream(cIn);
-
-        bytes = new byte[input.length];
-
-        for (int i = 0; i != input.length / 2; i++)
-        {
-            bytes[i] = (byte)dIn.read();
-        }
-        dIn.readFully(bytes, input.length / 2, bytes.length - input.length / 2);
-
-        if (!areEqual(bytes, input))
-        {
-            fail("GOST28147 failed decryption - expected " + new String(Hex.encode(input)) + " got " + new String(Hex.encode(bytes)));
-        }
-    }
-
-    public void testCFB(
-        int         strength,
-        byte[]      keyBytes,
-        byte[]      input,
-        byte[]      output)
-        throws Exception
-    {
-        Key                     key;
-        Cipher                  in, out;
-        CipherInputStream       cIn;
-        CipherOutputStream      cOut;
-        ByteArrayInputStream    bIn;
-        ByteArrayOutputStream   bOut;
-
-        key = new SecretKeySpec(keyBytes, "GOST28147");
-
-        in = Cipher.getInstance("GOST28147/CFB8/NoPadding", "BC");
-        out = Cipher.getInstance("GOST28147/CFB8/NoPadding", "BC");
-        byte[] iv = {1,2,3,4,5,6,7,8};
-        
-        out.init(Cipher.ENCRYPT_MODE, key, new IvParameterSpec(iv));
-        in.init(Cipher.DECRYPT_MODE, key, new IvParameterSpec(iv));
-
-        //
-        // encryption pass
-        //
-        bOut = new ByteArrayOutputStream();
-
-        cOut = new CipherOutputStream(bOut, out);
-
-        for (int i = 0; i != input.length / 2; i++)
-        {
-            cOut.write(input[i]);
-        }
-        cOut.write(input, input.length / 2, input.length - input.length / 2);
-        cOut.close();
-
-        byte[]    bytes;
-
-        bytes = bOut.toByteArray();
-
-        if (!areEqual(bytes, output))
-        {
-            fail("GOST28147 failed encryption - expected " + new String(Hex.encode(output)) + " got " + new String(Hex.encode(bytes)));
-        }
-
-        //
-        // decryption pass
-        //
-        bIn = new ByteArrayInputStream(bytes);
-
-        cIn = new CipherInputStream(bIn, in);
-
-        DataInputStream dIn = new DataInputStream(cIn);
-
-        bytes = new byte[input.length];
-
-        for (int i = 0; i != input.length / 2; i++)
-        {
-            bytes[i] = (byte)dIn.read();
-        }
-        dIn.readFully(bytes, input.length / 2, bytes.length - input.length / 2);
-
-        if (!areEqual(bytes, input))
-        {
-            fail("GOST28147 failed decryption - expected " + new String(Hex.encode(input)) + " got " + new String(Hex.encode(bytes)));
-        }
-    }
-
-    private void oidTest()
-    {
-        String[] oids = {
-                CryptoProObjectIdentifiers.gostR28147_gcfb.getId(),
-        };
-        
-        String[] names = {
-            "GOST28147/GCFB/NoPadding"
-        };
-        
-        try
-        {
-            
-            byte[]          data = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16 };
-            IvParameterSpec ivSpec = new IvParameterSpec(new byte[8]);
-            
-            for (int i = 0; i != oids.length; i++)
-            {
-                Cipher c1 = Cipher.getInstance(oids[i], "BC");
-                Cipher c2 = Cipher.getInstance(names[i], "BC");
-                KeyGenerator kg = KeyGenerator.getInstance(oids[i], "BC");
-                
-                SecretKey k = kg.generateKey();
-                
-                c1.init(Cipher.ENCRYPT_MODE, k, ivSpec);
-                c2.init(Cipher.DECRYPT_MODE, k, ivSpec);
-
-                byte[] result = c2.doFinal(c1.doFinal(data));
-
-                if (!areEqual(data, result))
-                {
-                    fail("failed OID test");
-                }
-            }
-        }
-        catch (Exception ex)
-        {
-            fail("failed exception " + ex.toString(), ex);
-        }
-    }
-    
-        public void performTest() 
-            throws Exception
-        {
-            for (int i = 0; i != cipherTests.length; i += 8)
-            {
-                testECB(Integer.parseInt(cipherTests[i]),
-                                Hex.decode(cipherTests[i + 1]),
-                                Hex.decode(cipherTests[i + 2]),
-                                Hex.decode(cipherTests[i + 3]));
-
-                testCFB(Integer.parseInt(cipherTests[i + 4]),
-                                Hex.decode(cipherTests[i + 4 + 1]),
-                                Hex.decode(cipherTests[i + 4 + 2]),
-                                Hex.decode(cipherTests[i + 4 + 3]));
-
-                oidTest();
-            }
-        }
-
-        public static void main(
-            String[]    args)
-        {
-            Security.addProvider(new BouncyCastleProvider());
-
-            runTest(new GOST28147Test());
-        }
-    }
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/GOST3410Test.java b/bcprov/src/main/java/org/bouncycastle/jce/provider/test/GOST3410Test.java
deleted file mode 100644
index 472f274..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/GOST3410Test.java
+++ /dev/null
@@ -1,517 +0,0 @@
-package org.bouncycastle.jce.provider.test;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.math.BigInteger;
-import java.security.InvalidKeyException;
-import java.security.KeyFactory;
-import java.security.KeyPair;
-import java.security.KeyPairGenerator;
-import java.security.KeyStore;
-import java.security.KeyStoreException;
-import java.security.NoSuchAlgorithmException;
-import java.security.NoSuchProviderException;
-import java.security.PrivateKey;
-import java.security.PublicKey;
-import java.security.SecureRandom;
-import java.security.Security;
-import java.security.Signature;
-import java.security.SignatureException;
-import java.security.UnrecoverableKeyException;
-import java.security.cert.Certificate;
-import java.security.cert.CertificateException;
-import java.security.cert.X509Certificate;
-import java.security.spec.PKCS8EncodedKeySpec;
-import java.security.spec.X509EncodedKeySpec;
-import java.util.Date;
-
-import org.bouncycastle.asn1.cryptopro.CryptoProObjectIdentifiers;
-import org.bouncycastle.jce.X509Principal;
-import org.bouncycastle.jce.interfaces.ECPrivateKey;
-import org.bouncycastle.jce.interfaces.ECPublicKey;
-import org.bouncycastle.jce.interfaces.GOST3410PrivateKey;
-import org.bouncycastle.jce.interfaces.GOST3410PublicKey;
-import org.bouncycastle.jce.interfaces.PKCS12BagAttributeCarrier;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.jce.spec.ECNamedCurveGenParameterSpec;
-import org.bouncycastle.jce.spec.ECParameterSpec;
-import org.bouncycastle.jce.spec.ECPrivateKeySpec;
-import org.bouncycastle.jce.spec.ECPublicKeySpec;
-import org.bouncycastle.jce.spec.GOST3410ParameterSpec;
-import org.bouncycastle.math.ec.ECCurve;
-import org.bouncycastle.math.ec.ECFieldElement;
-import org.bouncycastle.math.ec.ECPoint;
-import org.bouncycastle.util.BigIntegers;
-import org.bouncycastle.util.test.FixedSecureRandom;
-import org.bouncycastle.util.test.SimpleTest;
-import org.bouncycastle.x509.X509V3CertificateGenerator;
-
-public class GOST3410Test
-    extends SimpleTest
-{
-    private void ecGOST3410Test()
-        throws Exception
-    {
-        
-        BigInteger r = new BigInteger("29700980915817952874371204983938256990422752107994319651632687982059210933395");
-        BigInteger s = new BigInteger("46959264877825372965922731380059061821746083849389763294914877353246631700866");
-
-        byte[] kData = BigIntegers.asUnsignedByteArray(new BigInteger("53854137677348463731403841147996619241504003434302020712960838528893196233395"));
-
-        SecureRandom    k = new FixedSecureRandom(kData);
-
-        BigInteger mod_p = new BigInteger("57896044618658097711785492504343953926634992332820282019728792003956564821041"); //p
-
-        ECCurve curve = new ECCurve.Fp(
-            mod_p, // p
-            new BigInteger("7"), // a
-            new BigInteger("43308876546767276905765904595650931995942111794451039583252968842033849580414")); // b
-
-        ECParameterSpec spec = new ECParameterSpec(
-            curve,
-                new ECPoint.Fp(curve,
-                               new ECFieldElement.Fp(mod_p,new BigInteger("2")), // x
-                               new ECFieldElement.Fp(mod_p,new BigInteger("4018974056539037503335449422937059775635739389905545080690979365213431566280"))), // y
-                new BigInteger("57896044618658097711785492504343953927082934583725450622380973592137631069619")); // q
-
-        ECPrivateKeySpec priKey = new ECPrivateKeySpec(
-            new BigInteger("55441196065363246126355624130324183196576709222340016572108097750006097525544"), // d
-            spec);
-
-        ECPublicKeySpec pubKey = new ECPublicKeySpec(
-                new ECPoint.Fp(curve,
-                               new ECFieldElement.Fp(mod_p, new BigInteger("57520216126176808443631405023338071176630104906313632182896741342206604859403")), // x
-                               new ECFieldElement.Fp(mod_p, new BigInteger("17614944419213781543809391949654080031942662045363639260709847859438286763994"))), // y
-            spec);
-
-        Signature           sgr = Signature.getInstance("ECGOST3410", "BC");
-        KeyFactory          f = KeyFactory.getInstance("ECGOST3410", "BC");
-        PrivateKey          sKey = f.generatePrivate(priKey);
-        PublicKey           vKey = f.generatePublic(pubKey);
-
-        sgr.initSign(sKey, k);
-
-        byte[] message = new byte[] { (byte)'a', (byte)'b', (byte)'c' };
-
-        sgr.update(message);
-
-        byte[]  sigBytes = sgr.sign();
-
-        sgr.initVerify(vKey);
-
-        sgr.update(message);
-
-        if (!sgr.verify(sigBytes))
-        {
-            fail("ECGOST3410 verification failed");
-        }
-
-        BigInteger[]  sig = decode(sigBytes);
-
-        if (!r.equals(sig[0]))
-        {
-            fail(
-                  ": r component wrong." + System.getProperty("line.separator")
-                + " expecting: " + r + System.getProperty("line.separator")
-                + " got      : " + sig[0]);
-        }
-
-        if (!s.equals(sig[1]))
-        {
-            fail(
-                  ": s component wrong." + System.getProperty("line.separator")
-                + " expecting: " + s + System.getProperty("line.separator")
-                + " got      : " + sig[1]);
-        }
-    }
-
-    private void generationTest()
-        throws Exception
-    {
-        Signature             s = Signature.getInstance("GOST3410", "BC");
-        KeyPairGenerator      g = KeyPairGenerator.getInstance("GOST3410", "BC");
-        byte[]                data = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 0 };
-        GOST3410ParameterSpec gost3410P = new GOST3410ParameterSpec(CryptoProObjectIdentifiers.gostR3410_94_CryptoPro_A.getId());
-
-        g.initialize(gost3410P, new SecureRandom());
-
-        KeyPair p = g.generateKeyPair();
-
-        PrivateKey  sKey = p.getPrivate();
-        PublicKey   vKey = p.getPublic();
-
-        s.initSign(sKey);
-
-        s.update(data);
-
-        byte[]  sigBytes = s.sign();
-
-        s = Signature.getInstance("GOST3410", "BC");
-
-        s.initVerify(vKey);
-
-        s.update(data);
-
-        if (!s.verify(sigBytes))
-        {
-            fail("GOST3410 verification failed");
-        }
-
-        //
-        // default initialisation test
-        //
-        s = Signature.getInstance("GOST3410", "BC");
-        g = KeyPairGenerator.getInstance("GOST3410", "BC");
-
-        p = g.generateKeyPair();
-
-        sKey = p.getPrivate();
-        vKey = p.getPublic();
-
-        s.initSign(sKey);
-
-        s.update(data);
-
-        sigBytes = s.sign();
-
-        s = Signature.getInstance("GOST3410", "BC");
-
-        s.initVerify(vKey);
-
-        s.update(data);
-
-        if (!s.verify(sigBytes))
-        {
-            fail("GOST3410 verification failed");
-        }
-
-        //
-        // encoded test
-        //
-        KeyFactory f = KeyFactory.getInstance("GOST3410", "BC");
-
-        X509EncodedKeySpec  x509s = new X509EncodedKeySpec(vKey.getEncoded());
-        GOST3410PublicKey   k1 = (GOST3410PublicKey)f.generatePublic(x509s);
-
-        if (!k1.getY().equals(((GOST3410PublicKey)vKey).getY()))
-        {
-            fail("public number not decoded properly");
-        }
-
-        if (!k1.getParameters().equals(((GOST3410PublicKey)vKey).getParameters()))
-        {
-            fail("public parameters not decoded properly");
-        }
-
-        PKCS8EncodedKeySpec  pkcs8 = new PKCS8EncodedKeySpec(sKey.getEncoded());
-        GOST3410PrivateKey   k2 = (GOST3410PrivateKey)f.generatePrivate(pkcs8);
-
-        if (!k2.getX().equals(((GOST3410PrivateKey)sKey).getX()))
-        {
-            fail("private number not decoded properly");
-        }
-
-        if (!k2.getParameters().equals(((GOST3410PrivateKey)sKey).getParameters()))
-        {
-            fail("private number not decoded properly");
-        }
-
-        k2 = (GOST3410PrivateKey)serializeDeserialize(sKey);
-        if (!k2.getX().equals(((GOST3410PrivateKey)sKey).getX()))
-        {
-            fail("private number not deserialised properly");
-        }
-
-        if (!k2.getParameters().equals(((GOST3410PrivateKey)sKey).getParameters()))
-        {
-            fail("private number not deserialised properly");
-        }
-
-        checkEquals(k2, sKey);
-
-        if (!(k2 instanceof PKCS12BagAttributeCarrier))
-        {
-            fail("private key not implementing PKCS12 attribute carrier");
-        }
-
-        k1 = (GOST3410PublicKey)serializeDeserialize(vKey);
-
-        if (!k1.getY().equals(((GOST3410PublicKey)vKey).getY()))
-        {
-            fail("public number not deserialised properly");
-        }
-
-        if (!k1.getParameters().equals(((GOST3410PublicKey)vKey).getParameters()))
-        {
-            fail("public parameters not deserialised properly");
-        }
-
-        checkEquals(k1, vKey);
-
-        //
-        // ECGOST3410 generation test
-        //
-        s = Signature.getInstance("ECGOST3410", "BC");
-        g = KeyPairGenerator.getInstance("ECGOST3410", "BC");
-
-//        BigInteger mod_p = new BigInteger("57896044618658097711785492504343953926634992332820282019728792003956564821041"); //p
-//
-//        ECCurve curve = new ECCurve.Fp(
-//            mod_p, // p
-//            new BigInteger("7"), // a
-//            new BigInteger("43308876546767276905765904595650931995942111794451039583252968842033849580414")); // b
-//
-//        ECParameterSpec ecSpec = new ECParameterSpec(
-//                curve,
-//                    new ECPoint.Fp(curve,
-//                                   new ECFieldElement.Fp(mod_p,new BigInteger("2")), // x
-//                                   new ECFieldElement.Fp(mod_p,new BigInteger("4018974056539037503335449422937059775635739389905545080690979365213431566280"))), // y
-//                    new BigInteger("57896044618658097711785492504343953927082934583725450622380973592137631069619")); // q
-
-        g.initialize(new ECNamedCurveGenParameterSpec("GostR3410-2001-CryptoPro-A"), new SecureRandom());
-
-        p = g.generateKeyPair();
-
-        sKey = p.getPrivate();
-        vKey = p.getPublic();
-
-        s.initSign(sKey);
-
-        s.update(data);
-
-        sigBytes = s.sign();
-
-        s = Signature.getInstance("ECGOST3410", "BC");
-
-        s.initVerify(vKey);
-
-        s.update(data);
-
-        if (!s.verify(sigBytes))
-        {
-            fail("ECGOST3410 verification failed");
-        }
-
-        //
-        // encoded test
-        //
-        f = KeyFactory.getInstance("ECGOST3410", "BC");
-
-        x509s = new X509EncodedKeySpec(vKey.getEncoded());
-        ECPublicKey eck1 = (ECPublicKey)f.generatePublic(x509s);
-
-        if (!eck1.getQ().equals(((ECPublicKey)vKey).getQ()))
-        {
-            fail("public number not decoded properly");
-        }
-
-        if (!eck1.getParameters().equals(((ECPublicKey)vKey).getParameters()))
-        {
-            fail("public parameters not decoded properly");
-        }
-
-        pkcs8 = new PKCS8EncodedKeySpec(sKey.getEncoded());
-        ECPrivateKey eck2 = (ECPrivateKey)f.generatePrivate(pkcs8);
-
-        if (!eck2.getD().equals(((ECPrivateKey)sKey).getD()))
-        {
-            fail("private number not decoded properly");
-        }
-
-        if (!eck2.getParameters().equals(((ECPrivateKey)sKey).getParameters()))
-        {
-            fail("private number not decoded properly");
-        }
-
-        eck2 = (ECPrivateKey)serializeDeserialize(sKey);
-        if (!eck2.getD().equals(((ECPrivateKey)sKey).getD()))
-        {
-            fail("private number not decoded properly");
-        }
-
-        if (!eck2.getParameters().equals(((ECPrivateKey)sKey).getParameters()))
-        {
-            fail("private number not decoded properly");
-        }
-
-        checkEquals(eck2, sKey);
-
-        if (!(eck2 instanceof PKCS12BagAttributeCarrier))
-        {
-            fail("private key not implementing PKCS12 attribute carrier");
-        }
-
-        eck1 = (ECPublicKey)serializeDeserialize(vKey);
-
-        if (!eck1.getQ().equals(((ECPublicKey)vKey).getQ()))
-        {
-            fail("public number not decoded properly");
-        }
-
-        if (!eck1.getParameters().equals(((ECPublicKey)vKey).getParameters()))
-        {
-            fail("public parameters not decoded properly");
-        }
-
-        checkEquals(eck1, vKey);
-    }
-
-    private void keyStoreTest(PrivateKey sKey, PublicKey vKey)
-        throws KeyStoreException, IOException, NoSuchAlgorithmException, CertificateException, NoSuchProviderException, SignatureException, InvalidKeyException, UnrecoverableKeyException
-    {
-        //
-        // keystore test
-        //
-        KeyStore ks = KeyStore.getInstance("JKS");
-
-        ks.load(null, null);
-
-        //
-        // create the certificate - version 3
-        //
-        X509V3CertificateGenerator certGen = new X509V3CertificateGenerator();
-
-        certGen.setSerialNumber(BigInteger.valueOf(1));
-        certGen.setIssuerDN(new X509Principal("CN=Test"));
-        certGen.setNotBefore(new Date(System.currentTimeMillis() - 50000));
-        certGen.setNotAfter(new Date(System.currentTimeMillis() + 50000));
-        certGen.setSubjectDN(new X509Principal("CN=Test"));
-        certGen.setPublicKey(vKey);
-        certGen.setSignatureAlgorithm("GOST3411withGOST3410");
-
-        X509Certificate cert = certGen.generate(sKey, "BC");
-
-        ks.setKeyEntry("gost",sKey, "gost".toCharArray(), new Certificate[] { cert });
-
-        ByteArrayOutputStream bOut = new ByteArrayOutputStream();
-
-        ks.store(bOut, "gost".toCharArray());
-
-        ks = KeyStore.getInstance("JKS");
-
-        ks.load(new ByteArrayInputStream(bOut.toByteArray()), "gost".toCharArray());
-
-        PrivateKey gKey = (PrivateKey)ks.getKey("gost", "gost".toCharArray());
-    }
-
-    private void checkEquals(Object o1, Object o2)
-    {
-        if (!o1.equals(o2))
-        {
-            fail("comparison test failed");
-        }
-
-        if (o1.hashCode() != o2.hashCode())
-        {
-            fail("hashCode test failed");
-        }
-    }
-
-    private void parametersTest()
-        throws Exception
-    {
-//                AlgorithmParameterGenerator a = AlgorithmParameterGenerator.getInstance("GOST3410", "BC");
-//                a.init(512, random);
-//                AlgorithmParameters params = a.generateParameters();
-//
-//                byte[] encodeParams = params.getEncoded();
-//
-//                AlgorithmParameters a2 = AlgorithmParameters.getInstance("GOST3410", "BC");
-//                a2.init(encodeParams);
-//
-//                // a and a2 should be equivalent!
-//                byte[] encodeParams_2 = a2.getEncoded();
-//
-//                if (!arrayEquals(encodeParams, encodeParams_2))
-//                {
-//                    fail("encode/decode parameters failed");
-//                }
-
-        GOST3410ParameterSpec gost3410P = new GOST3410ParameterSpec(CryptoProObjectIdentifiers.gostR3410_94_CryptoPro_B.getId());
-
-        KeyPairGenerator    g = KeyPairGenerator.getInstance("GOST3410", "BC");
-        g.initialize(gost3410P, new SecureRandom());
-        KeyPair p = g.generateKeyPair();
-
-        PrivateKey  sKey = p.getPrivate();
-        PublicKey   vKey = p.getPublic();
-
-        Signature           s = Signature.getInstance("GOST3410", "BC");
-        byte[]              data = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 0 };
-
-        s.initSign(sKey);
-
-        s.update(data);
-
-        byte[]  sigBytes = s.sign();
-
-        s = Signature.getInstance("GOST3410", "BC");
-
-        s.initVerify(vKey);
-
-        s.update(data);
-
-        if (!s.verify(sigBytes))
-        {
-            fail("GOST3410 verification failed");
-        }
-
-        keyStoreTest(sKey, vKey);
-    }
-
-    private BigInteger[] decode(
-        byte[]  encoding)
-    {
-        byte[] r = new byte[32];
-        byte[] s = new byte[32];
-
-        System.arraycopy(encoding, 0, s, 0, 32);
-
-        System.arraycopy(encoding, 32, r, 0, 32);
-
-        BigInteger[]            sig = new BigInteger[2];
-
-        sig[0] = new BigInteger(1, r);
-        sig[1] = new BigInteger(1, s);
-
-        return sig;
-    }
-
-    private Object serializeDeserialize(Object o)
-        throws Exception
-    {
-        ByteArrayOutputStream bOut = new ByteArrayOutputStream();
-        ObjectOutputStream oOut = new ObjectOutputStream(bOut);
-
-        oOut.writeObject(o);
-        oOut.close();
-
-        ObjectInputStream oIn = new ObjectInputStream(new ByteArrayInputStream(bOut.toByteArray()));
-
-        return oIn.readObject();
-    }
-
-    public String getName()
-    {
-        return "GOST3410/ECGOST3410";
-    }
-
-    public void performTest()
-        throws Exception
-    {
-        ecGOST3410Test();
-        generationTest();
-        parametersTest();
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        Security.addProvider(new BouncyCastleProvider());
-
-        runTest(new GOST3410Test());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/HMacTest.java b/bcprov/src/main/java/org/bouncycastle/jce/provider/test/HMacTest.java
deleted file mode 100644
index 080df07..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/HMacTest.java
+++ /dev/null
@@ -1,187 +0,0 @@
-package org.bouncycastle.jce.provider.test;
-
-import java.security.InvalidAlgorithmParameterException;
-import java.security.InvalidKeyException;
-import java.security.Security;
-
-import javax.crypto.KeyGenerator;
-import javax.crypto.Mac;
-import javax.crypto.SecretKey;
-import javax.crypto.spec.RC5ParameterSpec;
-import javax.crypto.spec.SecretKeySpec;
-
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-import org.bouncycastle.asn1.iana.IANAObjectIdentifiers;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-
-/**
- * HMAC tester
- */
-public class HMacTest
-    extends SimpleTest
-{
-    static byte[]   keyBytes = Hex.decode("0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b");
-    static byte[]   message = "Hi There".getBytes();
-    static byte[]   output1 = Hex.decode("b617318655057264e28bc0b6fb378c8ef146be00");
-    static byte[]   outputMD5 = Hex.decode("5ccec34ea9656392457fa1ac27f08fbc");
-    static byte[]   outputMD2 = Hex.decode("dc1923ef5f161d35bef839ca8c807808");
-    static byte[]   outputMD4 = Hex.decode("5570ce964ba8c11756cdc3970278ff5a");
-    static byte[]   output224 = Hex.decode("896fb1128abbdf196832107cd49df33f47b4b1169912ba4f53684b22");
-    static byte[]   output256 = Hex.decode("b0344c61d8db38535ca8afceaf0bf12b881dc200c9833da726e9376c2e32cff7");
-    static byte[]   output384 = Hex.decode("afd03944d84895626b0825f4ab46907f15f9dadbe4101ec682aa034c7cebc59cfaea9ea9076ede7f4af152e8b2fa9cb6");
-    static byte[]   output512 = Hex.decode("87aa7cdea5ef619d4ff0b4241a1d6cb02379f4e2ce4ec2787ad0b30545e17cdedaa833b7d6b8a702038b274eaea3f4e4be9d914eeb61f1702e696c203a126854");
-    static byte[]   output512_224 = Hex.decode("b244ba01307c0e7a8ccaad13b1067a4cf6b961fe0c6a20bda3d92039");
-    static byte[]   output512_256 = Hex.decode("9f9126c3d9c3c330d760425ca8a217e31feae31bfe70196ff81642b868402eab");
-    static byte[]   outputRipeMD128 = Hex.decode("fda5717fb7e20cf05d30bb286a44b05d");
-    static byte[]   outputRipeMD160 = Hex.decode("24cb4bd67d20fc1a5d2ed7732dcc39377f0a5668");
-    static byte[]   outputTiger = Hex.decode("1d7a658c75f8f004916e7b07e2a2e10aec7de2ae124d3647");
-    static byte[]   outputOld384 = Hex.decode("0a046aaa0255e432912228f8ccda437c8a8363fb160afb0570ab5b1fd5ddc20eb1888b9ed4e5b6cb5bc034cd9ef70e40");
-    static byte[]   outputOld512 = Hex.decode("9656975ee5de55e75f2976ecce9a04501060b9dc22a6eda2eaef638966280182477fe09f080b2bf564649cad42af8607a2bd8d02979df3a980f15e2326a0a22a");
-
-    public HMacTest()
-    {
-    }
-
-    public void testHMac(
-        String  hmacName,
-        byte[]  output)
-        throws Exception
-    {
-        SecretKey           key = new SecretKeySpec(keyBytes, hmacName);
-        byte[]              out;
-        Mac                 mac;
-
-        mac = Mac.getInstance(hmacName, "BC");
-
-        mac.init(key);
-
-        mac.reset();
-
-        mac.update(message, 0, message.length);
-
-        out = mac.doFinal();
-
-        if (!areEqual(out, output))
-        {
-            fail("Failed - expected " + new String(Hex.encode(output)) + " got " + new String(Hex.encode(out)));
-        }
-
-        // no key generator for the old algorithms
-        if (hmacName.startsWith("Old"))
-        {
-            return;
-        }
-
-        KeyGenerator kGen = KeyGenerator.getInstance(hmacName, "BC");
-
-        mac.init(kGen.generateKey());
-
-        mac.update(message);
-
-        out = mac.doFinal();
-    }
-
-    private void testExceptions()
-        throws Exception
-    {
-        Mac mac = null;
-
-        mac = Mac.getInstance("HmacSHA1", "BC");
-
-        byte [] b = {(byte)1, (byte)2, (byte)3, (byte)4, (byte)5};
-        SecretKeySpec sks = new SecretKeySpec(b, "HmacSHA1");
-        RC5ParameterSpec algPS = new RC5ParameterSpec(100, 100, 100);
-
-        try
-        {
-            mac.init(sks, algPS);
-        }
-        catch (InvalidAlgorithmParameterException e)
-        {
-            // ignore okay
-        }
-
-        try
-        {
-            mac.init(null, null);
-        }
-        catch (InvalidKeyException e)
-        {
-            // ignore okay
-        }
-        catch (InvalidAlgorithmParameterException e)
-        {
-            // ignore okay
-        }
-
-        try
-        {
-            mac.init(null);
-        }
-        catch (InvalidKeyException e)
-        {
-            // ignore okay
-        }
-    }
-
-    public void performTest()
-        throws Exception
-    {
-        testHMac("HMac-SHA1", output1);
-        testHMac("HMac-MD5", outputMD5);
-        testHMac("HMac-MD4", outputMD4);
-        testHMac("HMac-MD2", outputMD2);
-        testHMac("HMac-SHA224", output224);
-        testHMac("HMac-SHA256", output256);
-        testHMac("HMac-SHA384", output384);
-        testHMac("HMac-SHA512", output512);
-        testHMac("HMac-SHA512/224", output512_224);
-        testHMac("HMac-SHA512/256", output512_256);
-        testHMac("HMac-RIPEMD128", outputRipeMD128);
-        testHMac("HMac-RIPEMD160", outputRipeMD160);
-        testHMac("HMac-TIGER", outputTiger);
-
-        testHMac("HMac/SHA1", output1);
-        testHMac("HMac/MD5", outputMD5);
-        testHMac("HMac/MD4", outputMD4);
-        testHMac("HMac/MD2", outputMD2);
-        testHMac("HMac/SHA224", output224);
-        testHMac("HMac/SHA256", output256);
-        testHMac("HMac/SHA384", output384);
-        testHMac("HMac/SHA512", output512);
-        testHMac("HMac/RIPEMD128", outputRipeMD128);
-        testHMac("HMac/RIPEMD160", outputRipeMD160);
-        testHMac("HMac/TIGER", outputTiger);
-
-        testHMac(PKCSObjectIdentifiers.id_hmacWithSHA1.getId(), output1);
-        testHMac(PKCSObjectIdentifiers.id_hmacWithSHA224.getId(), output224);
-        testHMac(PKCSObjectIdentifiers.id_hmacWithSHA256.getId(), output256);
-        testHMac(PKCSObjectIdentifiers.id_hmacWithSHA384.getId(), output384);
-        testHMac(PKCSObjectIdentifiers.id_hmacWithSHA512.getId(), output512);
-        testHMac(IANAObjectIdentifiers.hmacSHA1.getId(), output1);
-        testHMac(IANAObjectIdentifiers.hmacMD5.getId(), outputMD5);
-        testHMac(IANAObjectIdentifiers.hmacRIPEMD160.getId(), outputRipeMD160);
-        testHMac(IANAObjectIdentifiers.hmacTIGER.getId(), outputTiger);
-
-        // test for compatibility with broken HMac.
-        testHMac("OldHMacSHA384", outputOld384);
-        testHMac("OldHMacSHA512", outputOld512);
-
-        testExceptions();
-    }
-
-    public String getName()
-    {
-        return "HMac";
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        Security.addProvider(new BouncyCastleProvider());
-
-        runTest(new HMacTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/IESTest.java b/bcprov/src/main/java/org/bouncycastle/jce/provider/test/IESTest.java
deleted file mode 100644
index 8dc1c0b..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/IESTest.java
+++ /dev/null
@@ -1,244 +0,0 @@
-package org.bouncycastle.jce.provider.test;
-
-import java.math.BigInteger;
-import java.security.AlgorithmParameters;
-import java.security.KeyPair;
-import java.security.KeyPairGenerator;
-import java.security.PrivateKey;
-import java.security.PublicKey;
-import java.security.SecureRandom;
-import java.security.Security;
-
-import javax.crypto.Cipher;
-import javax.crypto.spec.DHParameterSpec;
-
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.jce.spec.ECParameterSpec;
-import org.bouncycastle.jce.spec.IEKeySpec;
-import org.bouncycastle.jce.spec.IESParameterSpec;
-import org.bouncycastle.math.ec.ECCurve;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-
-/**
- * test for ECIES - Elliptic Curve Integrated Encryption Scheme
- */
-public class IESTest
-    extends SimpleTest
-{
-    private BigInteger g512 = new BigInteger("153d5d6172adb43045b68ae8e1de1070b6137005686d29d3d73a7749199681ee5b212c9b96bfdcfa5b20cd5e3fd2044895d609cf9b410b7a0f12ca1cb9a428cc", 16);
-    private BigInteger p512 = new BigInteger("9494fec095f3b85ee286542b3836fc81a5dd0a0349b4c239dd38744d488cf8e31db8bcb7d33b41abb9e5a33cca9144b1cef332c94bf0573bf047a3aca98cdf3b", 16);
-
-    IESTest()
-    {
-    }
-
-    public String getName()
-    {
-        return "IES";
-    }
-
-    public void performTest()
-        throws Exception
-    {
-        KeyPairGenerator    g = KeyPairGenerator.getInstance("ECIES", "BC");
-
-        ECCurve curve = new ECCurve.Fp(
-                new BigInteger("883423532389192164791648750360308885314476597252960362792450860609699839"), // q
-                new BigInteger("7fffffffffffffffffffffff7fffffffffff8000000000007ffffffffffc", 16), // a
-                new BigInteger("6b016c3bdcf18941d0d654921475ca71a9db2fb27d1d37796185c2942c0a", 16)); // b
-
-        ECParameterSpec ecSpec = new ECParameterSpec(
-                curve,
-                curve.decodePoint(Hex.decode("020ffa963cdca8816ccc33b8642bedf905c3d358573d3f27fbbd3b3cb9aaaf")), // G
-                new BigInteger("883423532389192164791648750360308884807550341691627752275345424702807307")); // n
-
-        g.initialize(ecSpec, new SecureRandom());
-
-        Cipher c1 = Cipher.getInstance("ECIES", "BC");
-        Cipher c2 = Cipher.getInstance("ECIES", "BC");
-        
-        doTest(g, c1, c2);
-
-        g = KeyPairGenerator.getInstance("ECIES", "BC");
-
-        g.initialize(192, new SecureRandom());
-
-        doTest(g, c1, c2);
-
-        g = KeyPairGenerator.getInstance("ECIES", "BC");
-
-        g.initialize(239, new SecureRandom());
-
-        doTest(g, c1, c2);
-
-        g = KeyPairGenerator.getInstance("ECIES", "BC");
-
-        g.initialize(256, new SecureRandom());
-
-        doTest(g, c1, c2);
-
-        doDefTest(g, c1, c2);
-        
-        DHParameterSpec             dhParams = new DHParameterSpec(p512, g512);
-        
-        c1 = Cipher.getInstance("IES", "BC");
-        c2 = Cipher.getInstance("IES", "BC");
-        
-        g = KeyPairGenerator.getInstance("DH", "BC");
-
-        g.initialize(dhParams);
-        
-        doTest(g, c1, c2);
-        
-        doDefTest(g, c1, c2);
-    }
-
-    public void doTest(
-        KeyPairGenerator g,
-        Cipher           c1,
-        Cipher           c2)
-        throws Exception
-    {
-        //
-        // a side
-        //
-        KeyPair     aKeyPair = g.generateKeyPair();
-        PublicKey   aPub = aKeyPair.getPublic();
-        PrivateKey  aPriv = aKeyPair.getPrivate();
-
-        //
-        // b side
-        //
-        KeyPair     bKeyPair = g.generateKeyPair();
-        PublicKey   bPub = bKeyPair.getPublic();
-        PrivateKey  bPriv = bKeyPair.getPrivate();
-
-        //
-        // stream test
-        //
-
-        IEKeySpec   c1Key = new IEKeySpec(aPriv, bPub);
-        IEKeySpec   c2Key = new IEKeySpec(bPriv, aPub);
-
-        byte[]  d = new byte[] { 1, 2, 3, 4, 5, 6, 7, 8 };
-        byte[]  e = new byte[] { 8, 7, 6, 5, 4, 3, 2, 1 };
-
-        IESParameterSpec param = new IESParameterSpec(d, e, 128);
-
-        c1.init(Cipher.ENCRYPT_MODE, c1Key, param);
-
-        c2.init(Cipher.DECRYPT_MODE, c2Key, param);
-
-        byte[] message = Hex.decode("1234567890abcdef");
-
-        byte[]   out1 = c1.doFinal(message, 0, message.length);
-
-        byte[]   out2 = c2.doFinal(out1, 0, out1.length);
-
-        if (!areEqual(out2, message))
-        {
-            fail("stream cipher test failed");
-        }
-    }
-
-    public void doDefTest(
-        KeyPairGenerator    g,
-        Cipher              c1,
-        Cipher              c2)
-        throws Exception
-    {
-        //
-        // a side
-        //
-        KeyPair     aKeyPair = g.generateKeyPair();
-        PublicKey   aPub = aKeyPair.getPublic();
-        PrivateKey  aPriv = aKeyPair.getPrivate();
-
-        //
-        // b side
-        //
-        KeyPair     bKeyPair = g.generateKeyPair();
-        PublicKey   bPub = bKeyPair.getPublic();
-        PrivateKey  bPriv = bKeyPair.getPrivate();
-
-        //
-        // stream test
-        //
-        IEKeySpec   c1Key = new IEKeySpec(aPriv, bPub);
-        IEKeySpec   c2Key = new IEKeySpec(bPriv, aPub);
-
-        c1.init(Cipher.ENCRYPT_MODE, c1Key);
-
-        AlgorithmParameters param = c1.getParameters();
-
-        c2.init(Cipher.DECRYPT_MODE, c2Key, param);
-
-        byte[] message = Hex.decode("1234567890abcdef");
-
-        byte[] out1 = c1.doFinal(message, 0, message.length);
-
-        byte[] out2 = c2.doFinal(out1, 0, out1.length);
-
-        if (!areEqual(out2, message))
-        {
-            fail("stream cipher test failed");
-        }
-        
-        //
-        // int doFinal
-        //
-        int len1 = c1.doFinal(message, 0, message.length, out1, 0);
-        
-        if (len1 != out1.length)
-        {
-            fail("encryption length wrong");
-        }
-        
-        int len2 = c2.doFinal(out1, 0, out1.length, out2, 0);
-
-        if (len2 != out2.length)
-        {
-            fail("decryption length wrong");
-        }
-        
-        if (!areEqual(out2, message))
-        {
-            fail("stream cipher test failed");
-        }
-        
-        //
-        // int doFinal with update
-        //
-        len1 = c1.update(message, 0, 2, out1, 0);
-        
-        len1 += c1.doFinal(message, 2, message.length - 2, out1, len1);
-        
-        if (len1 != out1.length)
-        {
-            fail("update encryption length wrong");
-        }
-        
-        len2 = c2.update(out1, 0, 2, out2, 0);
-        
-        len2 += c2.doFinal(out1, 2, out1.length - 2, out2, len2);
-
-        if (len2 != out2.length)
-        {
-            fail("update decryption length wrong");
-        }
-        
-        if (!areEqual(out2, message))
-        {
-            fail("update stream cipher test failed");
-        }
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        Security.addProvider(new BouncyCastleProvider());
-
-        runTest(new IESTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/ImplicitlyCaTest.java b/bcprov/src/main/java/org/bouncycastle/jce/provider/test/ImplicitlyCaTest.java
deleted file mode 100644
index fa90108..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/ImplicitlyCaTest.java
+++ /dev/null
@@ -1,342 +0,0 @@
-package org.bouncycastle.jce.provider.test;
-
-import java.math.BigInteger;
-import java.security.KeyFactory;
-import java.security.KeyPair;
-import java.security.KeyPairGenerator;
-import java.security.SecureRandom;
-import java.security.Security;
-import java.security.Signature;
-import java.security.interfaces.ECKey;
-import java.security.spec.ECFieldFp;
-import java.security.spec.EllipticCurve;
-import java.security.spec.PKCS8EncodedKeySpec;
-import java.security.spec.X509EncodedKeySpec;
-
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.DERNull;
-import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
-import org.bouncycastle.jce.ECPointUtil;
-import org.bouncycastle.jce.interfaces.ECPrivateKey;
-import org.bouncycastle.jce.interfaces.ECPublicKey;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.jce.spec.ECParameterSpec;
-import org.bouncycastle.jce.spec.ECPrivateKeySpec;
-import org.bouncycastle.jce.spec.ECPublicKeySpec;
-import org.bouncycastle.math.ec.ECCurve;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.FixedSecureRandom;
-import org.bouncycastle.util.test.SimpleTest;
-
-public class ImplicitlyCaTest
-    extends SimpleTest
-{
-    byte[] k1 = Hex.decode("d5014e4b60ef2ba8b6211b4062ba3224e0427dd3");
-    byte[] k2 = Hex.decode("345e8d05c075c3a508df729a1685690e68fcfb8c8117847e89063bca1f85d968fd281540b6e13bd1af989a1fbf17e06462bf511f9d0b140fb48ac1b1baa5bded");
-
-    SecureRandom random = new FixedSecureRandom(new byte[][] { k1, k2 });
-
-    public void performTest()
-        throws Exception
-    {
-        testBCAPI();
-
-        testJDKAPI();
-
-        testKeyFactory();
-
-        testBasicThreadLocal();
-    }
-
-    private void testBCAPI()
-        throws Exception
-    {
-        KeyPairGenerator g = KeyPairGenerator.getInstance("ECDSA", "BC");
-
-        ECCurve curve = new ECCurve.Fp(
-            new BigInteger("883423532389192164791648750360308885314476597252960362792450860609699839"), // q
-            new BigInteger("7fffffffffffffffffffffff7fffffffffff8000000000007ffffffffffc", 16), // a
-            new BigInteger("6b016c3bdcf18941d0d654921475ca71a9db2fb27d1d37796185c2942c0a", 16)); // b
-
-        ECParameterSpec ecSpec = new ECParameterSpec(
-            curve,
-            curve.decodePoint(Hex.decode("020ffa963cdca8816ccc33b8642bedf905c3d358573d3f27fbbd3b3cb9aaaf")), // G
-            new BigInteger("883423532389192164791648750360308884807550341691627752275345424702807307")); // n
-
-        ConfigurableProvider config = (ConfigurableProvider)Security.getProvider("BC");
-
-        config.setParameter(ConfigurableProvider.EC_IMPLICITLY_CA, ecSpec);
-
-        g.initialize(null, new SecureRandom());
-
-        KeyPair p = g.generateKeyPair();
-
-        ECPrivateKey sKey = (ECPrivateKey)p.getPrivate();
-        ECPublicKey vKey = (ECPublicKey)p.getPublic();
-
-        testECDSA(sKey, vKey);
-
-        testBCParamsAndQ(sKey, vKey);
-        testEC5Params(sKey, vKey);
-
-        testEncoding(sKey, vKey);
-    }
-
-    private void testKeyFactory()
-        throws Exception
-    {
-        KeyPairGenerator g = KeyPairGenerator.getInstance("ECDSA", "BC");
-
-        ECCurve curve = new ECCurve.Fp(
-            new BigInteger("883423532389192164791648750360308885314476597252960362792450860609699839"), // q
-            new BigInteger("7fffffffffffffffffffffff7fffffffffff8000000000007ffffffffffc", 16), // a
-            new BigInteger("6b016c3bdcf18941d0d654921475ca71a9db2fb27d1d37796185c2942c0a", 16)); // b
-
-        ECParameterSpec ecSpec = new ECParameterSpec(
-            curve,
-            curve.decodePoint(Hex.decode("020ffa963cdca8816ccc33b8642bedf905c3d358573d3f27fbbd3b3cb9aaaf")), // G
-            new BigInteger("883423532389192164791648750360308884807550341691627752275345424702807307")); // n
-
-        ConfigurableProvider config = (ConfigurableProvider)Security.getProvider("BC");
-
-        config.setParameter(ConfigurableProvider.EC_IMPLICITLY_CA, ecSpec);
-
-        g.initialize(null, new SecureRandom());
-
-        KeyPair p = g.generateKeyPair();
-
-        ECPrivateKey sKey = (ECPrivateKey)p.getPrivate();
-        ECPublicKey vKey = (ECPublicKey)p.getPublic();
-
-        KeyFactory fact = KeyFactory.getInstance("ECDSA", "BC");
-
-        vKey = (ECPublicKey)fact.generatePublic(new ECPublicKeySpec(vKey.getQ(), null));
-        sKey = (ECPrivateKey)fact.generatePrivate(new ECPrivateKeySpec(sKey.getD(), null));
-        
-        testECDSA(sKey, vKey);
-
-        testBCParamsAndQ(sKey, vKey);
-        testEC5Params(sKey, vKey);
-
-        testEncoding(sKey, vKey);
-
-        ECPublicKey vKey2 = (ECPublicKey)fact.generatePublic(new ECPublicKeySpec(vKey.getQ(), null));
-        ECPrivateKey sKey2 = (ECPrivateKey)fact.generatePrivate(new ECPrivateKeySpec(sKey.getD(), null));
-
-        if (!vKey.equals(vKey2) || vKey.hashCode() != vKey2.hashCode())
-        {
-            fail("public equals/hashCode failed");
-        }
-
-        if (!sKey.equals(sKey2) || sKey.hashCode() != sKey2.hashCode())
-        {
-            fail("private equals/hashCode failed");
-        }
-
-        // check we can get specs.
-        fact.getKeySpec(vKey, java.security.spec.ECPublicKeySpec.class);
-
-        fact.getKeySpec(sKey, java.security.spec.ECPrivateKeySpec.class);
-    }
-
-    private void testJDKAPI()
-        throws Exception
-    {
-        KeyPairGenerator g = KeyPairGenerator.getInstance("ECDSA", "BC");
-
-        EllipticCurve curve = new EllipticCurve(
-            new ECFieldFp(new BigInteger("883423532389192164791648750360308885314476597252960362792450860609699839")), // q
-            new BigInteger("7fffffffffffffffffffffff7fffffffffff8000000000007ffffffffffc", 16), // a
-            new BigInteger("6b016c3bdcf18941d0d654921475ca71a9db2fb27d1d37796185c2942c0a", 16)); // b
-
-        java.security.spec.ECParameterSpec ecSpec = new java.security.spec.ECParameterSpec(
-            curve,
-            ECPointUtil.decodePoint(curve, Hex.decode("020ffa963cdca8816ccc33b8642bedf905c3d358573d3f27fbbd3b3cb9aaaf")), // G
-            new BigInteger("883423532389192164791648750360308884807550341691627752275345424702807307"), // n
-            1); // h
-
-
-        ConfigurableProvider config = (ConfigurableProvider)Security.getProvider("BC");
-
-        config.setParameter(ConfigurableProvider.EC_IMPLICITLY_CA, ecSpec);
-
-        g.initialize(null, new SecureRandom());
-
-        KeyPair p = g.generateKeyPair();
-
-        ECPrivateKey sKey = (ECPrivateKey)p.getPrivate();
-        ECPublicKey vKey = (ECPublicKey)p.getPublic();
-
-        testECDSA(sKey, vKey);
-
-        testBCParamsAndQ(sKey, vKey);
-        testEC5Params(sKey, vKey);
-
-        testEncoding(sKey, vKey);
-    }
-
-    private void testBasicThreadLocal()
-        throws Exception
-    {
-        KeyPairGenerator g = KeyPairGenerator.getInstance("ECDSA", "BC");
-
-        EllipticCurve curve = new EllipticCurve(
-            new ECFieldFp(new BigInteger("883423532389192164791648750360308885314476597252960362792450860609699839")), // q
-            new BigInteger("7fffffffffffffffffffffff7fffffffffff8000000000007ffffffffffc", 16), // a
-            new BigInteger("6b016c3bdcf18941d0d654921475ca71a9db2fb27d1d37796185c2942c0a", 16)); // b
-
-        java.security.spec.ECParameterSpec ecSpec = new java.security.spec.ECParameterSpec(
-            curve,
-            ECPointUtil.decodePoint(curve, Hex.decode("020ffa963cdca8816ccc33b8642bedf905c3d358573d3f27fbbd3b3cb9aaaf")), // G
-            new BigInteger("883423532389192164791648750360308884807550341691627752275345424702807307"), // n
-            1); // h
-
-
-        ConfigurableProvider config = (ConfigurableProvider)Security.getProvider("BC");
-
-        config.setParameter(ConfigurableProvider.THREAD_LOCAL_EC_IMPLICITLY_CA, ecSpec);
-
-        g.initialize(null, new SecureRandom());
-
-        KeyPair p = g.generateKeyPair();
-
-        ECPrivateKey sKey = (ECPrivateKey)p.getPrivate();
-        ECPublicKey vKey = (ECPublicKey)p.getPublic();
-
-        testECDSA(sKey, vKey);
-
-        testBCParamsAndQ(sKey, vKey);
-        testEC5Params(sKey, vKey);
-
-        testEncoding(sKey, vKey);
-    }
-
-    private void testECDSA(
-        ECPrivateKey sKey,
-        ECPublicKey vKey)
-        throws Exception
-    {
-        byte[]           data = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 0 };
-        Signature        s = Signature.getInstance("ECDSA", "BC");
-
-        s.initSign(sKey);
-
-        s.update(data);
-
-        byte[] sigBytes = s.sign();
-
-        s = Signature.getInstance("ECDSA", "BC");
-
-        s.initVerify(vKey);
-
-        s.update(data);
-
-        if (!s.verify(sigBytes))
-        {
-            fail("ECDSA verification failed");
-        }
-    }
-
-    private void testEncoding(
-        ECPrivateKey privKey,
-        ECPublicKey pubKey)
-        throws Exception
-    {
-        KeyFactory kFact = KeyFactory.getInstance("ECDSA", "BC");
-
-        byte[] bytes = privKey.getEncoded();
-
-        PrivateKeyInfo sInfo = PrivateKeyInfo.getInstance(new ASN1InputStream(bytes).readObject());
-        
-        if (!sInfo.getPrivateKeyAlgorithm().getParameters().equals(DERNull.INSTANCE))
-        {
-            fail("private key parameters wrong");
-        }
-
-        ECPrivateKey sKey = (ECPrivateKey)kFact.generatePrivate(new PKCS8EncodedKeySpec(bytes));
-
-        if (!sKey.equals(privKey))
-        {
-            fail("private equals failed");
-        }
-
-        if (sKey.hashCode() != privKey.hashCode())
-        {
-            fail("private hashCode failed");          
-        }
-
-        bytes = pubKey.getEncoded();
-
-        SubjectPublicKeyInfo vInfo = SubjectPublicKeyInfo.getInstance(new ASN1InputStream(bytes).readObject());
-
-        if (!vInfo.getAlgorithm().getParameters().equals(DERNull.INSTANCE))
-        {
-            fail("public key parameters wrong");
-        }
-        
-        ECPublicKey vKey = (ECPublicKey)kFact.generatePublic(new X509EncodedKeySpec(bytes));
-
-        if (!vKey.equals(pubKey) || vKey.hashCode() != pubKey.hashCode())
-        {
-            fail("public equals/hashCode failed");
-        }
-
-        testBCParamsAndQ(sKey, vKey);
-        testEC5Params(sKey, vKey);
-
-        testECDSA(sKey, vKey);
-    }
-
-    private void testBCParamsAndQ(
-        ECPrivateKey sKey,
-        ECPublicKey vKey)
-    {
-        if (sKey.getParameters() != null)
-        {
-            fail("parameters exposed in private key");
-        }
-
-        if (vKey.getParameters() != null)
-        {
-            fail("parameters exposed in public key");
-        }
-
-        if (vKey.getQ().getCurve() != null)
-        {
-            fail("curve exposed in public point");
-        }
-    }
-
-    private void testEC5Params(
-        ECPrivateKey sKey,
-        ECPublicKey vKey)
-    {
-        java.security.interfaces.ECKey k = (java.security.interfaces.ECKey)sKey;
-
-        if (k.getParams() != null)
-        {
-            fail("parameters exposed in private key");
-        }
-
-        k = (ECKey)vKey;
-        if (k.getParams() != null)
-        {
-            fail("parameters exposed in public key");
-        }
-    }
-
-    public String getName()
-    {
-        return "ImplicitlyCA";
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        Security.addProvider(new BouncyCastleProvider());
-
-        runTest(new ImplicitlyCaTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/JceTestUtil.java b/bcprov/src/main/java/org/bouncycastle/jce/provider/test/JceTestUtil.java
deleted file mode 100644
index 9c0805a..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/JceTestUtil.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package org.bouncycastle.jce.provider.test;
-
-import java.security.Security;
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.List;
-
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-
-abstract class JceTestUtil
-{
-    private JceTestUtil()
-    {
-    }
-
-    static String[] getRegisteredAlgorithms(String prefix, String[] exclusionPatterns)
-    {
-        final BouncyCastleProvider prov = (BouncyCastleProvider)Security.getProvider("BC");
-
-        List matches = new ArrayList();
-        Enumeration algos = prov.keys();
-        while (algos.hasMoreElements())
-        {
-            String algo = (String)algos.nextElement();
-            if (!algo.startsWith(prefix))
-            {
-                continue;
-            }
-            String algoName = algo.substring(prefix.length());
-            if (!isExcluded(algoName, exclusionPatterns))
-            {
-                matches.add(algoName);
-            }
-        }
-        return (String[])matches.toArray(new String[matches.size()]);
-    }
-
-    private static boolean isExcluded(String algoName, String[] exclusionPatterns)
-    {
-        for (int i = 0; i < exclusionPatterns.length; i++)
-        {
-            if (algoName.contains(exclusionPatterns[i]))
-            {
-                return true;
-            }
-        }
-        return false;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/KeyStoreTest.java b/bcprov/src/main/java/org/bouncycastle/jce/provider/test/KeyStoreTest.java
deleted file mode 100644
index 4dc6247..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/KeyStoreTest.java
+++ /dev/null
@@ -1,424 +0,0 @@
-package org.bouncycastle.jce.provider.test;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.math.BigInteger;
-import java.security.Key;
-import java.security.KeyFactory;
-import java.security.KeyPair;
-import java.security.KeyPairGenerator;
-import java.security.KeyStore;
-import java.security.PrivateKey;
-import java.security.PublicKey;
-import java.security.SecureRandom;
-import java.security.Security;
-import java.security.cert.Certificate;
-import java.security.cert.CertificateFactory;
-import java.security.cert.X509Certificate;
-import java.security.interfaces.RSAPrivateKey;
-import java.security.interfaces.RSAPublicKey;
-import java.security.spec.PKCS8EncodedKeySpec;
-import java.security.spec.X509EncodedKeySpec;
-import java.util.Date;
-import java.util.Hashtable;
-import java.util.Vector;
-
-import org.bouncycastle.jce.X509Principal;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.jce.spec.ECParameterSpec;
-import org.bouncycastle.math.ec.ECCurve;
-import org.bouncycastle.util.encoders.Base64;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-import org.bouncycastle.x509.X509V3CertificateGenerator;
-
-/**
- * Exercise the various key stores, making sure we at least get back what we put in!
- * <p>
- * This tests both the BKS, and the UBER key store.
- */
-public class KeyStoreTest
-    extends SimpleTest
-{
-    static char[]   passwd = { 'h', 'e', 'l', 'l', 'o', ' ', 'w', 'o', 'r', 'l', 'd' };
-
-    byte[] v1BKS = Base64.decode(
-          "AAAAAQAAABTqZbNMyPjsFazhFplWWDMBLPRdRAAABcYEAAdhbmRyb2lkAAAB"
-        + "NOifkPwAAAAAAAAAPAAAABTZOLhcyhB0gKyfoDvyQbpzftB7GgAABEYPrZP8"
-        + "q20AJLETjDv0K9C5rIl1erpyvpv20bqcbghK6wD0b8OP5/XzOz/8knhxmqJZ"
-        + "3yRJMw==");
-    byte[] v2BKS = Base64.decode(
-          "AAAAAgAAABSkmTXz4VIznO1SSUqsIHdxWcxsuQAABFMEAAdhbmRyb2lkAAABN" +
-          "OifkPwAAAAAAAAAPAAAABTZOLhcyhB0gKyfoDvyQbpzftB7GgAABEYPrZP8q2" +
-          "0AJLETjDv0K9C5rIl1erpyvpv20bqcbghK6wBO59KOGPvSrmJpd32P6ZAh9qLZJw==");
-
-    byte[] v1UBER = Base64.decode(
-          "AAAAAQAAABRP0F6p2p3FyQKqyJiJt3NbvdybiwAAB2znqrO779YIW5gMtbt+"
-        + "NUs96VPPcfZiKJPg7RKH7Yu3CQB0/g9nYsvgFB0fQ05mHcW3KjntN2/31A6G"
-        + "i00n4ZnUTjJL16puZnQrloeGXxFy58tjwkFuwJ7V7ELYgiZlls0beHSdDGQW"
-        + "iyYECwWs1la/");
-    byte[] v2UBER = Base64.decode(
-          "AAAAAgAAABQ/D9k3376OG/REg4Ams9Up332tLQAABujoVcsRcKWwhlo4mMg5"
-        + "lF2vJfK+okIYecJGWCvdykF5r8kDn68llt52IDXDkpRXVXcNJ0/aD7sa7iZ0"
-        + "SL0TAwcfp/9v4j/w8slj/qgO0i/76+zROrP0NGFIa5k/iOg5Z0Tj77muMaJf"
-        + "n3vLlIHa4IsX");
-
-    byte[] negSaltBKS = Base64.decode(
-          "AAAAAv////+WnyglO06djy6JgCxGiIemnZdcOwAAB2AEAAdhbmRyb2lkAAAB" +
-          "NOifkPwAAAAAAAAAPAAAABTZOLhcyhB0gKyfoDvyQbpzftB7GgAABEYPrZP8" +
-          "q20AJLETjDv0K9C5rIl1erpyvpv20bqcbghK6wDrg6gUHsh27wNjUwkR+REe" +
-          "NeFYBg==");
-
-    char[] oldStorePass = "fredfred".toCharArray();
-
-    public void ecStoreTest(
-        String  storeName)
-        throws Exception
-    {
-        ECCurve curve = new ECCurve.Fp(
-                                new BigInteger("883423532389192164791648750360308885314476597252960362792450860609699839"), // q
-                                new BigInteger("7fffffffffffffffffffffff7fffffffffff8000000000007ffffffffffc", 16), // a
-                                new BigInteger("6b016c3bdcf18941d0d654921475ca71a9db2fb27d1d37796185c2942c0a", 16)); // b
-
-        ECParameterSpec ecSpec = new ECParameterSpec(
-                                curve,
-                                curve.decodePoint(Hex.decode("020ffa963cdca8816ccc33b8642bedf905c3d358573d3f27fbbd3b3cb9aaaf")), // G
-                                new BigInteger("883423532389192164791648750360308884807550341691627752275345424702807307")); // n
-
-        KeyPairGenerator    g = KeyPairGenerator.getInstance("ECDSA", "BC");
-
-        g.initialize(ecSpec, new SecureRandom());
-
-        KeyPair     keyPair = g.generateKeyPair();
-
-        PublicKey   pubKey = keyPair.getPublic();
-        PrivateKey  privKey = keyPair.getPrivate();
-
-        //
-        // distinguished name table.
-        //
-        Hashtable                 attrs = new Hashtable();
-        Vector                    order = new Vector();
-
-        attrs.put(X509Principal.C, "AU");
-        attrs.put(X509Principal.O, "The Legion of the Bouncy Castle");
-        attrs.put(X509Principal.L, "Melbourne");
-        attrs.put(X509Principal.ST, "Victoria");
-        attrs.put(X509Principal.E, "feedback-crypto@bouncycastle.org");
-
-        order.addElement(X509Principal.C);
-        order.addElement(X509Principal.O);
-        order.addElement(X509Principal.L);
-        order.addElement(X509Principal.ST);
-        order.addElement(X509Principal.E);
-
-        //
-        // create the certificate - version 3
-        //
-        X509V3CertificateGenerator  certGen = new X509V3CertificateGenerator();
-
-        certGen.setSerialNumber(BigInteger.valueOf(1));
-        certGen.setIssuerDN(new X509Principal(order, attrs));
-        certGen.setNotBefore(new Date(System.currentTimeMillis() - 50000));
-        certGen.setNotAfter(new Date(System.currentTimeMillis() + 50000));
-        certGen.setSubjectDN(new X509Principal(order, attrs));
-        certGen.setPublicKey(pubKey);
-        certGen.setSignatureAlgorithm("ECDSAwithSHA1");
-
-        Certificate[]    chain = new Certificate[1];
-
-        try
-        {
-            X509Certificate cert = certGen.generate(privKey);
-
-            cert.checkValidity(new Date());
-
-            cert.verify(pubKey);
-
-            ByteArrayInputStream    bIn = new ByteArrayInputStream(cert.getEncoded());
-            CertificateFactory      fact = CertificateFactory.getInstance("X.509", "BC");
-
-            cert = (X509Certificate)fact.generateCertificate(bIn);
-
-            chain[0] = cert;
-        }
-        catch (Exception e)
-        {
-            fail("error generating cert - " + e.toString());
-        }
-
-        KeyStore store = KeyStore.getInstance(storeName, "BC");
-
-        store.load(null, null);
-
-        store.setKeyEntry("private", privKey, passwd, chain);
-
-        //
-        // write out and read back store
-        //
-        ByteArrayOutputStream   bOut = new ByteArrayOutputStream();
-
-        store.store(bOut, passwd);
-
-        ByteArrayInputStream    bIn = new ByteArrayInputStream(bOut.toByteArray());
-
-        //
-        // start with a new key store
-        //
-        store = KeyStore.getInstance(storeName, "BC");
-
-        store.load(bIn, passwd);
-
-        //
-        // load the private key
-        //
-        privKey = (PrivateKey)store.getKey("private", passwd);
-
-        //
-        // double public key encoding test
-        //
-        byte[]              pubEnc = pubKey.getEncoded();
-        KeyFactory          keyFac = KeyFactory.getInstance(pubKey.getAlgorithm(), "BC");
-        X509EncodedKeySpec  pubX509 = new X509EncodedKeySpec(pubEnc);
-
-        pubKey = (PublicKey)keyFac.generatePublic(pubX509);
-
-        pubEnc = pubKey.getEncoded();
-        keyFac = KeyFactory.getInstance(pubKey.getAlgorithm(), "BC");
-        pubX509 = new X509EncodedKeySpec(pubEnc);
-
-        pubKey = (PublicKey)keyFac.generatePublic(pubX509);
-
-        //
-        // double private key encoding test
-        //
-        byte[]              privEnc = privKey.getEncoded();
-
-        keyFac = KeyFactory.getInstance(privKey.getAlgorithm(), "BC");
-
-        PKCS8EncodedKeySpec privPKCS8 = new PKCS8EncodedKeySpec(privEnc);
-        privKey = (PrivateKey)keyFac.generatePrivate(privPKCS8);
-
-        keyFac = KeyFactory.getInstance(privKey.getAlgorithm(), "BC");
-        privPKCS8 = new PKCS8EncodedKeySpec(privEnc);
-        privKey = (PrivateKey)keyFac.generatePrivate(privPKCS8);
-    }
-
-    public void keyStoreTest(
-        String    storeName)
-        throws Exception
-    {
-        KeyStore store = KeyStore.getInstance(storeName, "BC");
-
-        store.load(null, null);
-
-        KeyPairGenerator gen = KeyPairGenerator.getInstance("RSA", "BC");
-
-        gen.initialize(1024, new SecureRandom());
-
-        KeyPair         pair = gen.generateKeyPair();
-        RSAPrivateKey   privKey = (RSAPrivateKey)pair.getPrivate();
-        RSAPublicKey    pubKey = (RSAPublicKey)pair.getPublic();
-        BigInteger      modulus = privKey.getModulus();
-        BigInteger      privateExponent = privKey.getPrivateExponent();
-
-
-        //
-        // distinguished name table.
-        //
-        Hashtable                   attrs = new Hashtable();
-        Vector                      order = new Vector();
-
-        attrs.put(X509Principal.C, "AU");
-        attrs.put(X509Principal.O, "The Legion of the Bouncy Castle");
-        attrs.put(X509Principal.L, "Melbourne");
-        attrs.put(X509Principal.ST, "Victoria");
-        attrs.put(X509Principal.EmailAddress, "feedback-crypto@bouncycastle.org");
-
-        order.addElement(X509Principal.C);
-        order.addElement(X509Principal.O);
-        order.addElement(X509Principal.L);
-        order.addElement(X509Principal.ST);
-        order.addElement(X509Principal.EmailAddress);
-
-        //
-        // extensions
-        //
-
-        //
-        // create the certificate.
-        //
-        X509V3CertificateGenerator  certGen = new X509V3CertificateGenerator();
-
-        certGen.setSerialNumber(BigInteger.valueOf(1));
-        certGen.setIssuerDN(new X509Principal(order, attrs));
-        certGen.setNotBefore(new Date(System.currentTimeMillis() - 50000));
-        certGen.setNotAfter(new Date(System.currentTimeMillis() + 50000));
-        certGen.setSubjectDN(new X509Principal(order, attrs));
-        certGen.setPublicKey(pubKey);
-        certGen.setSignatureAlgorithm("MD5WithRSAEncryption");
-
-        Certificate[]   chain = new Certificate[1];
-
-        try
-        {
-            X509Certificate cert = certGen.generate(privKey);
-
-            cert.checkValidity(new Date());
-
-            cert.verify(pubKey);
-
-            ByteArrayInputStream    bIn = new ByteArrayInputStream(cert.getEncoded());
-            CertificateFactory      fact = CertificateFactory.getInstance("X.509", "BC");
-
-            cert = (X509Certificate)fact.generateCertificate(bIn);
-
-            chain[0] = cert;
-        }
-        catch (Exception e)
-        {
-            fail("error generating cert - " + e.toString());
-        }
-
-        store.setKeyEntry("private", privKey, passwd, chain);
-
-        //
-        // write out and read back store
-        //
-        ByteArrayOutputStream   bOut = new ByteArrayOutputStream();
-
-        store.store(bOut, passwd);
-
-        ByteArrayInputStream    bIn = new ByteArrayInputStream(bOut.toByteArray());
-
-        //
-        // start with a new key store
-        //
-        store = KeyStore.getInstance(storeName, "BC");
-
-        store.load(bIn, passwd);
-
-        //
-        // verify public key
-        //
-        privKey = (RSAPrivateKey)store.getKey("private", passwd);
-
-        if (!privKey.getModulus().equals(modulus))
-        {
-            fail("private key modulus wrong");
-        }
-        else if (!privKey.getPrivateExponent().equals(privateExponent))
-        {
-            fail("private key exponent wrong");
-        }
-
-        //
-        // verify certificate
-        //
-        Certificate cert = store.getCertificateChain("private")[0];
-
-        cert.verify(pubKey);
-    }
-
-    private void oldStoreTest()
-        throws Exception
-    {
-        checkStore(KeyStore.getInstance("BKS", "BC"), v1BKS);
-        checkStore(KeyStore.getInstance("BKS", "BC"), v2BKS);
-        checkStore(KeyStore.getInstance("UBER", "BC"), v1UBER);
-        checkStore(KeyStore.getInstance("UBER", "BC"), v2UBER);
-
-        checkOldStore(KeyStore.getInstance("BKS-V1", "BC"), v1BKS);
-        checkOldStore(KeyStore.getInstance("BKS-V1", "BC"), v2BKS);
-    }
-
-    private void checkStore(KeyStore ks, byte[] data)
-        throws Exception
-    {
-        ks.load(new ByteArrayInputStream(data), oldStorePass);
-
-        if (!ks.containsAlias("android"))
-        {
-            fail("cannot find alias");
-        }
-
-        Key key = ks.getKey("android", oldStorePass);
-        if (key == null)
-        {
-            fail("cannot find key");
-        }
-
-        ByteArrayOutputStream bOut = new ByteArrayOutputStream();
-
-        ks.store(bOut, oldStorePass);
-    }
-
-    private void checkOldStore(KeyStore ks, byte[] data)
-        throws Exception
-    {
-        ks.load(new ByteArrayInputStream(data), oldStorePass);
-
-        if (!ks.containsAlias("android"))
-        {
-            fail("cannot find alias");
-        }
-
-        Key key = ks.getKey("android", oldStorePass);
-        if (key == null)
-        {
-            fail("cannot find key");
-        }
-
-        ByteArrayOutputStream bOut = new ByteArrayOutputStream();
-
-        ks.store(bOut, oldStorePass);
-
-        if (data.length != bOut.toByteArray().length)
-        {
-            fail("Old version key store write incorrect");
-        }
-    }
-
-    private void checkException()
-        throws Exception
-    {
-        KeyStore ks = KeyStore.getInstance("BKS", "BC");
-
-        try
-        {
-            ks.load(new ByteArrayInputStream(negSaltBKS), oldStorePass);
-        }
-        catch (IOException e)
-        {
-            if (!e.getMessage().equals("Invalid salt detected"))
-            {
-                fail("negative salt length not detected");
-            }
-        }
-    }
-
-    public String getName()
-    {
-        return "KeyStore";
-    }
-
-    public void performTest()
-        throws Exception
-    {
-        keyStoreTest("BKS");
-        keyStoreTest("UBER");
-        keyStoreTest("BKS-V1");
-        ecStoreTest("BKS");
-        oldStoreTest();
-        checkException();
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        Security.addProvider(new BouncyCastleProvider());
-
-        runTest(new KeyStoreTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/MQVTest.java b/bcprov/src/main/java/org/bouncycastle/jce/provider/test/MQVTest.java
deleted file mode 100644
index 3b0b8a2..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/MQVTest.java
+++ /dev/null
@@ -1,93 +0,0 @@
-package org.bouncycastle.jce.provider.test;
-
-import java.math.BigInteger;
-import java.security.KeyPair;
-import java.security.KeyPairGenerator;
-import java.security.SecureRandom;
-import java.security.Security;
-import java.security.spec.ECFieldFp;
-import java.security.spec.ECParameterSpec;
-import java.security.spec.EllipticCurve;
-
-import javax.crypto.KeyAgreement;
-
-import org.bouncycastle.jce.ECPointUtil;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.jce.spec.MQVPrivateKeySpec;
-import org.bouncycastle.jce.spec.MQVPublicKeySpec;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-
-public class MQVTest
-    extends SimpleTest
-{
-    public String getName()
-    {
-        return "MQV";
-    }
-
-    public void performTest()
-        throws Exception
-    {
-        testECMQV();
-    }
-
-    private void testECMQV()
-        throws Exception
-    {
-        KeyPairGenerator g = KeyPairGenerator.getInstance("ECMQV", "BC");
-
-        EllipticCurve curve = new EllipticCurve(
-                new ECFieldFp(new BigInteger("883423532389192164791648750360308885314476597252960362792450860609699839")), // q
-                new BigInteger("7fffffffffffffffffffffff7fffffffffff8000000000007ffffffffffc", 16), // a
-                new BigInteger("6b016c3bdcf18941d0d654921475ca71a9db2fb27d1d37796185c2942c0a", 16)); // b
-
-        ECParameterSpec ecSpec = new ECParameterSpec(
-                curve,
-                ECPointUtil.decodePoint(curve, Hex.decode("020ffa963cdca8816ccc33b8642bedf905c3d358573d3f27fbbd3b3cb9aaaf")), // G
-                new BigInteger("883423532389192164791648750360308884807550341691627752275345424702807307"), // n
-                1); // h
-
-        g.initialize(ecSpec, new SecureRandom());
-
-        //
-        // U side
-        //
-        KeyPair U1 = g.generateKeyPair();
-        KeyPair U2 = g.generateKeyPair();
-
-        KeyAgreement uAgree = KeyAgreement.getInstance("ECMQV", "BC");
-        uAgree.init(new MQVPrivateKeySpec(U1.getPrivate(), U2.getPrivate(), U2.getPublic()));
-
-        //
-        // V side
-        //
-        KeyPair V1 = g.generateKeyPair();
-        KeyPair V2 = g.generateKeyPair();
-
-        KeyAgreement vAgree = KeyAgreement.getInstance("ECMQV", "BC");
-        vAgree.init(new MQVPrivateKeySpec(V1.getPrivate(), V2.getPrivate(), V2.getPublic()));
-
-        //
-        // agreement
-        //
-        uAgree.doPhase(new MQVPublicKeySpec(V1.getPublic(), V2.getPublic()), true);
-        vAgree.doPhase(new MQVPublicKeySpec(U1.getPublic(), U2.getPublic()), true);
-
-        BigInteger ux = new BigInteger(uAgree.generateSecret());
-        BigInteger vx = new BigInteger(vAgree.generateSecret());
-
-        if (!ux.equals(vx))
-        {
-            fail("Agreement failed");
-        }
-    }
-
-    public static void main(
-        String[] args)
-    {
-        Security.addProvider(new BouncyCastleProvider());
-
-        runTest(new MQVTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/MacTest.java b/bcprov/src/main/java/org/bouncycastle/jce/provider/test/MacTest.java
deleted file mode 100644
index d011eb7..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/MacTest.java
+++ /dev/null
@@ -1,186 +0,0 @@
-package org.bouncycastle.jce.provider.test;
-
-import java.security.Security;
-
-import javax.crypto.Mac;
-import javax.crypto.SecretKey;
-import javax.crypto.spec.IvParameterSpec;
-import javax.crypto.spec.SecretKeySpec;
-
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-
-/**
- * MAC tester - vectors from 
- * <a href=http://www.itl.nist.gov/fipspubs/fip81.htm>FIP 81</a> and 
- * <a href=http://www.itl.nist.gov/fipspubs/fip113.htm>FIP 113</a>.
- */
-public class MacTest
-    extends SimpleTest
-{
-    static byte[]   keyBytes = Hex.decode("0123456789abcdef");
-    static byte[]   ivBytes = Hex.decode("1234567890abcdef");
-
-    static byte[]   input = Hex.decode("37363534333231204e6f77206973207468652074696d6520666f7220");
-
-    static byte[]   output1 = Hex.decode("f1d30f68");
-    static byte[]   output2 = Hex.decode("58d2e77e");
-    static byte[]   output3 = Hex.decode("cd647403");
-
-    static byte[]   keyBytesISO9797 = Hex.decode("7CA110454A1A6E570131D9619DC1376E");
-    
-    static byte[]   inputISO9797 = "Hello World !!!!".getBytes(); 
-    
-    static byte[]   outputISO9797 = Hex.decode("F09B856213BAB83B");
-    
-    static byte[]   inputDesEDE64 = "Hello World !!!!".getBytes(); 
-    
-    static byte[]   outputDesEDE64 = Hex.decode("862304d33af01096");
-    
-    public MacTest()
-    {
-    }
-
-    private void aliasTest(SecretKey key, String primary, String[] aliases)
-        throws Exception
-    {
-        Mac mac = Mac.getInstance(primary, "BC");
-
-        //
-        // standard DAC - zero IV
-        //
-        mac.init(key);
-
-        mac.update(input, 0, input.length);
-
-        byte[] ref = mac.doFinal();
-
-        for (int i = 0; i != aliases.length; i++)
-        {
-            mac = Mac.getInstance(aliases[i], "BC");
-
-            mac.init(key);
-
-            mac.update(input, 0, input.length);
-
-            byte[] out = mac.doFinal();
-            if (!areEqual(out, ref))
-            {
-                fail("Failed - expected " + new String(Hex.encode(ref)) + " got " + new String(Hex.encode(out)));
-            }
-        }
-    }
-
-    public void performTest()
-        throws Exception
-    {
-        SecretKey           key = new SecretKeySpec(keyBytes, "DES");
-        byte[]              out;
-        Mac                 mac;
-
-        mac = Mac.getInstance("DESMac", "BC");
-
-        //
-        // standard DAC - zero IV
-        //
-        mac.init(key);
-
-        mac.update(input, 0, input.length);
-
-        out = mac.doFinal();
-
-        if (!areEqual(out, output1))
-        {
-            fail("Failed - expected " + new String(Hex.encode(output1)) + " got " + new String(Hex.encode(out)));
-        }
-        
-        //
-        // mac with IV.
-        //
-        mac.init(key, new IvParameterSpec(ivBytes));
-
-        mac.update(input, 0, input.length);
-
-        out = mac.doFinal();
-
-        if (!areEqual(out, output2))
-        {
-            fail("Failed - expected " + new String(Hex.encode(output2)) + " got " + new String(Hex.encode(out)));
-        }
-        
-        //
-        // CFB mac with IV - 8 bit CFB mode
-        //
-        mac = Mac.getInstance("DESMac/CFB8", "BC");
-
-        mac.init(key, new IvParameterSpec(ivBytes));
-
-        mac.update(input, 0, input.length);
-
-        out = mac.doFinal();
-
-        if (!areEqual(out, output3))
-        {
-            fail("Failed - expected " + new String(Hex.encode(output3)) + " got " + new String(Hex.encode(out)));
-        }
-        
-        //
-        // ISO9797 algorithm 3 using DESEDE
-        //
-        key = new SecretKeySpec(keyBytesISO9797, "DESEDE");
-        
-        mac = Mac.getInstance("ISO9797ALG3", "BC");
-
-        mac.init(key);
-
-        mac.update(inputISO9797, 0, inputISO9797.length);
-
-        out = mac.doFinal();
-
-        if (!areEqual(out, outputISO9797))
-        {
-            fail("Failed - expected " + new String(Hex.encode(outputISO9797)) + " got " + new String(Hex.encode(out)));
-        }
-        
-        //
-        // 64bit DESede Mac
-        //
-        key = new SecretKeySpec(keyBytesISO9797, "DESEDE");
-        
-        mac = Mac.getInstance("DESEDE64", "BC");
-
-        mac.init(key);
-
-        mac.update(inputDesEDE64, 0, inputDesEDE64.length);
-
-        out = mac.doFinal();
-
-        if (!areEqual(out, outputDesEDE64))
-        {
-            fail("Failed - expected " + new String(Hex.encode(outputDesEDE64)) + " got " + new String(Hex.encode(out)));
-        }
-
-        aliasTest(new SecretKeySpec(keyBytesISO9797, "DESede"), "DESedeMac64withISO7816-4Padding",
-            new String[] { "DESEDE64WITHISO7816-4PADDING", "DESEDEISO9797ALG1MACWITHISO7816-4PADDING", "DESEDEISO9797ALG1WITHISO7816-4PADDING" });
-
-        aliasTest(new SecretKeySpec(keyBytesISO9797, "DESede"), "ISO9797ALG3WITHISO7816-4PADDING",
-            new String[] { "ISO9797ALG3MACWITHISO7816-4PADDING" });
-
-        aliasTest(new SecretKeySpec(keyBytes, "DES"), "DES64",
-            new String[] { "DESMAC64" });
-    }
-
-    public String getName()
-    {
-        return "Mac";
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        Security.addProvider(new BouncyCastleProvider());
-
-        runTest(new MacTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/MultiCertStoreTest.java b/bcprov/src/main/java/org/bouncycastle/jce/provider/test/MultiCertStoreTest.java
deleted file mode 100644
index 240d1e6..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/MultiCertStoreTest.java
+++ /dev/null
@@ -1,96 +0,0 @@
-package org.bouncycastle.jce.provider.test;
-
-import org.bouncycastle.jce.MultiCertStoreParameters;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.util.test.SimpleTest;
-
-import java.io.ByteArrayInputStream;
-import java.security.Security;
-import java.security.cert.CertStore;
-import java.security.cert.CertificateFactory;
-import java.security.cert.CollectionCertStoreParameters;
-import java.security.cert.X509CRL;
-import java.security.cert.X509CertSelector;
-import java.security.cert.X509Certificate;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-public class MultiCertStoreTest
-    extends SimpleTest
-{
-
-    public void performTest()
-        throws Exception
-    {
-        basicTest();
-    }
-
-    private void basicTest()
-        throws Exception
-    {
-        CertificateFactory cf = CertificateFactory.getInstance("X.509", "BC");
-
-        X509Certificate rootCert = (X509Certificate)cf
-                .generateCertificate(new ByteArrayInputStream(
-                        CertPathTest.rootCertBin));
-        X509Certificate interCert = (X509Certificate)cf
-                .generateCertificate(new ByteArrayInputStream(
-                        CertPathTest.interCertBin));
-        X509Certificate finalCert = (X509Certificate)cf
-                .generateCertificate(new ByteArrayInputStream(
-                        CertPathTest.finalCertBin));
-        X509CRL rootCrl = (X509CRL)cf.generateCRL(new ByteArrayInputStream(
-                CertPathTest.rootCrlBin));
-        X509CRL interCrl = (X509CRL)cf
-                .generateCRL(new ByteArrayInputStream(
-                        CertPathTest.interCrlBin));
-
-        // Testing CollectionCertStore generation from List
-        List list = new ArrayList();
-        list.add(rootCert);
-        list.add(interCert);
-        list.add(finalCert);
-        list.add(rootCrl);
-        list.add(interCrl);
-        CollectionCertStoreParameters ccsp = new CollectionCertStoreParameters(list);
-        CertStore store1 = CertStore.getInstance("Collection", ccsp, "BC");
-        CertStore store2 = CertStore.getInstance("Collection", ccsp, "BC");
-
-        List storeList = new ArrayList();
-        storeList.add(store1);
-        storeList.add(store2);
-        CertStore store = CertStore.getInstance("Multi", new MultiCertStoreParameters(storeList));
-
-        // Searching for rootCert by subjectDN
-        X509CertSelector targetConstraints = new X509CertSelector();
-        targetConstraints.setSubject(rootCert.getSubjectX500Principal().getName());
-        Collection certs = store.getCertificates(targetConstraints);
-
-        if (certs.size() != 2 || !certs.contains(rootCert))
-        {
-            fail("2 rootCerts not found by subjectDN");
-        }
-
-        store = CertStore.getInstance("Multi", new MultiCertStoreParameters(storeList, false));
-        certs = store.getCertificates(targetConstraints);
-        
-        if (certs.size() != 1 || !certs.contains(rootCert))
-        {
-            fail("1 rootCert not found by subjectDN");
-        }
-    }
-
-    public String getName()
-    {
-        return "MultiCertStore";
-    }
-
-    public static void main(String[] args)
-    {
-        Security.addProvider(new BouncyCastleProvider());
-
-        runTest(new MultiCertStoreTest());
-    }
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/NISTCertPathTest.java b/bcprov/src/main/java/org/bouncycastle/jce/provider/test/NISTCertPathTest.java
deleted file mode 100644
index 43f90a1..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/NISTCertPathTest.java
+++ /dev/null
@@ -1,5173 +0,0 @@
-package org.bouncycastle.jce.provider.test;
-
-import java.io.ByteArrayInputStream;
-import java.security.GeneralSecurityException;
-import java.security.Security;
-import java.security.cert.CertPathBuilder;
-import java.security.cert.CertPathBuilderResult;
-import java.security.cert.CertStore;
-import java.security.cert.CertificateFactory;
-import java.security.cert.CollectionCertStoreParameters;
-import java.security.cert.PKIXBuilderParameters;
-import java.security.cert.TrustAnchor;
-import java.security.cert.X509CRL;
-import java.security.cert.X509CertSelector;
-import java.security.cert.X509Certificate;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.Vector;
-
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.util.encoders.Base64;
-import org.bouncycastle.util.test.SimpleTest;
-
-
-/*
- * These tests are taken from the NIST X.509 Validation Test Suite
- * available at: http://csrc.nist.gov/pki/testing/x509paths.html
- * 
- * Only the relevant certificate and crl data has been kept, in order
- * to keep the class size to a minimum.
- * 
- */
-
-public class NISTCertPathTest 
-    extends SimpleTest 
-{    
-    private static final String TEST_POLICY_1 = "2.16.840.1.101.3.1.48.1";
-    private static final String TEST_POLICY_2 = "2.16.840.1.101.3.1.48.2";
-    private static final String TEST_POLICY_3 = "2.16.840.1.101.3.1.48.3";
-    private static final String TEST_POLICY_4 = "2.16.840.1.101.3.1.48.4";
-    private static final String TEST_POLICY_5 = "2.16.840.1.101.3.1.48.5";
-    
-    private static Set ANY;
-    private static Set TP1;
-    private static Set TP2;
-    private static Set TP3;
-    private static Set TP4;
-    private static Set TP1_TP2;
-    
-    static {
-        ANY = new HashSet();
-        
-        TP1 = new HashSet();
-        TP1.add(TEST_POLICY_1);
-        
-        TP2 = new HashSet();
-        TP2.add(TEST_POLICY_2);
-        
-        TP3 = new HashSet();
-        TP3.add(TEST_POLICY_3);
-
-        TP4 = new HashSet();
-        TP4.add(TEST_POLICY_4);
-        
-        TP1_TP2 = new HashSet();
-        TP1_TP2.add(TEST_POLICY_1);
-        TP1_TP2.add(TEST_POLICY_2);
-    }
-
-    /*  
-     *  
-     *  FIELDS
-     *  
-     */ 
-    
-    private CertificateFactory fact;
-    
-    private X509Certificate trustedCert;
-    private X509CRL         trustedCRL;
-    private Set             trustedSet;
-    private int             testCount;
-    private Vector          testFail;
-    private StringBuffer    resultBuf;
- 
-    public String getName() 
-    {
-        return "NISTCertPathTest";
-    }
-    
-    
-    public void performTest() 
-    {
-        init();
-        
-        test(" 1", TEST_1_DATA , true , false);
-        test(" 2", TEST_2_DATA , false, false);
-        test(" 3", TEST_3_DATA , false, false);
-        test(" 4", TEST_4_DATA , true , false);
-        test(" 5", TEST_5_DATA , false, false);
-        test(" 6", TEST_6_DATA , false, false);
-        test(" 7", TEST_7_DATA , true , false);
-        test(" 8", TEST_8_DATA , false, false);
-        test(" 9", TEST_9_DATA , false, false);
-        
-        test("10", TEST_10_DATA, false, false);
-        test("11", TEST_11_DATA, false, false);
-        test("12", TEST_12_DATA, true , false);
-        test("13", TEST_13_DATA, false, false);
-        test("14", TEST_14_DATA, false, false);
-        test("15", TEST_15_DATA, true , false);
-        test("16", TEST_16_DATA, true , false);
-        test("17", TEST_17_DATA, true , false);
-        test("18", TEST_18_DATA, true , false);
-        test("19", TEST_19_DATA, false, false);
-        
-        test("20", TEST_20_DATA, false, false);
-        test("21", TEST_21_DATA, false, false);
-        test("22", TEST_22_DATA, false, false);
-        test("23", TEST_23_DATA, false, false);
-        test("24", TEST_24_DATA, true , false);
-        test("25", TEST_25_DATA, false, false);
-        test("26", TEST_26_DATA, true , false);
-        test("27", TEST_27_DATA, true , false);
-        test("28", TEST_28_DATA, false, false);
-        test("29", TEST_29_DATA, false, false);
-        
-        test("30", TEST_30_DATA, true , false);
-        test("31", TEST_31_DATA, false, false);
-        test("32", TEST_32_DATA, false, false);
-        test("33", TEST_33_DATA, true , false);
-        
-        
-
-        test("34a", TEST_34_DATA, ANY , true , true , false);
-        test("34b", TEST_34_DATA, ANY , false, true , false);
-        test("34c", TEST_34_DATA, TP1 , true , true , false);
-        test("34d", TEST_34_DATA, TP1 , false, true , false);
-        test("34e", TEST_34_DATA, TP2 , true , false, false);
-        test("34f", TEST_34_DATA, TP2 , false, true , false);
-        
-        test("35a", TEST_35_DATA, false,  true , false);
-        test("35b", TEST_35_DATA, true ,  false, false);
-
-        test("36a", TEST_36_DATA, false,  true , false);
-        test("36b", TEST_36_DATA, true ,  false, false);
-        
-        test("37a", TEST_37_DATA, false,  true , false);
-        test("37b", TEST_37_DATA, true ,  false, false);
-        
-        test("38a", TEST_38_DATA, false,  true , false);
-        test("38b", TEST_38_DATA, true ,  false, false);
-        
-        test("39a", TEST_39_DATA, ANY , true ,  true , false);
-        test("39b", TEST_39_DATA, ANY , false,  true , false);
-        test("39c", TEST_39_DATA, TP1 , true ,  true , false);
-        test("39d", TEST_39_DATA, TP1 , false,  true , false);
-        test("39e", TEST_39_DATA, TP2 , true ,  false, false);
-        test("39f", TEST_39_DATA, TP2 , false,  true , false);
-        
-
-        test("40a", TEST_40_DATA, false, true , false);
-        test("40b", TEST_40_DATA, true , false, false);
-        
-        test("41a", TEST_41_DATA, false, true , false);
-        test("41b", TEST_41_DATA, true , false, false);
-        
-        test("42a", TEST_42_DATA, false, true , false);
-        test("42b", TEST_42_DATA, true , false, false);
-
-        test("43a", TEST_43_DATA, false, true , false);
-        test("43b", TEST_43_DATA, true , false, false);
-        
-        test("44a", TEST_44_DATA, false, true , false);
-        test("44b", TEST_44_DATA, true , false, false);
-        
-        test("45a", TEST_45_DATA, false, false, false);
-        test("45b", TEST_45_DATA, true , false, false);
-        
-        test("46a", TEST_46_DATA, ANY , false, true , false);
-        test("46b", TEST_46_DATA, ANY , true , true , false);
-        test("46c", TEST_46_DATA, TP1 , true , true , false);
-        test("46d", TEST_46_DATA, TP1 , false, true , false);
-        test("46e", TEST_46_DATA, TP2 , true , false, false);
-        test("46f", TEST_46_DATA, TP2 , false, false, false);
-        
-        test("47a", TEST_47_DATA, false, false, false);
-        test("47b", TEST_47_DATA, true , false, false);
-        
-        test("48a", TEST_48_DATA, TP1 , false, true , false);
-        test("48b", TEST_48_DATA, TP1 , true , true , false);
-        test("48c", TEST_48_DATA, ANY , false, true , false);
-        test("48d", TEST_48_DATA, ANY , true , true , false);
-        test("48e", TEST_48_DATA, TP2 , false, true , false);
-        test("48f", TEST_48_DATA, TP2 , true , false, false);
-        
-        test("49a", TEST_49_DATA, TP1 , false,  true , false);
-        test("49b", TEST_49_DATA, TP1 , true ,  true , false);
-        test("49c", TEST_49_DATA, TP3 , false,  true , false);
-        test("49d", TEST_49_DATA, TP3 , true ,  false, false);
-        test("49e", TEST_49_DATA, ANY , false,  true , false);
-        test("49f", TEST_49_DATA, ANY , true ,  true , false);
-        
-        test("50a", TEST_50_DATA, TP1     , false,  true , false);
-        test("50b", TEST_50_DATA, TP1     , true ,  true , false);
-        test("50c", TEST_50_DATA, TP1_TP2 , false,  true , false);
-        test("50d", TEST_50_DATA, TP1_TP2 , true ,  true , false);
-        test("50e", TEST_50_DATA, ANY     , false,  true , false);
-        test("50f", TEST_50_DATA, ANY     , true ,  true , false);
-        
-        test("51a", TEST_51_DATA, false, true , false);
-        test("51b", TEST_51_DATA, true , false, false);
-        
-        test("52a", TEST_52_DATA, TP1     , false,  true , false);
-        test("52b", TEST_52_DATA, TP1     , true ,  false, false);
-        test("52c", TEST_52_DATA, TP1_TP2 , false,  true , false);
-        test("52d", TEST_52_DATA, TP1_TP2 , true ,  false, false);
-        test("52e", TEST_52_DATA, ANY     , false,  true , false);
-        test("52f", TEST_52_DATA, ANY     , true ,  true , false);
-        
-        test("53a", TEST_53_DATA, TP1     , false,  true , false);
-        test("53b", TEST_53_DATA, TP1     , true ,  true , false);
-        test("53c", TEST_53_DATA, TP1_TP2 , false,  true , false);
-        test("53d", TEST_53_DATA, TP1_TP2 , true ,  true , false);
-        test("53e", TEST_53_DATA, TP4     , false,  true , false);
-        test("53f", TEST_53_DATA, TP4     , true ,  false, false);
-        test("53g", TEST_53_DATA, ANY     , false,  true , false);
-        test("53h", TEST_53_DATA, ANY     , true ,  true , false);
-        
-        test("54", TEST_54_DATA, false, false);
-        test("55", TEST_55_DATA, false, false);
-        test("56", TEST_56_DATA, true , false);
-        test("57", TEST_57_DATA, true , false);
-        test("58", TEST_58_DATA, false, false);
-        test("59", TEST_59_DATA, false, false);
-        
-        test("60", TEST_60_DATA, false, false);
-        test("61", TEST_61_DATA, false, false);
-        test("62", TEST_62_DATA, true , false);
-        test("63", TEST_63_DATA, true , false);
-        test("64", TEST_64_DATA, false, false);
-        test("65", TEST_65_DATA, false, false);
-        test("66", TEST_66_DATA, false, false);
-        test("67", TEST_67_DATA, true , false);
-        test("68", TEST_68_DATA, false, false);
-        test("69", TEST_69_DATA, false, false);
-        
-        test("70", TEST_70_DATA, false, false);
-        test("71", TEST_71_DATA, false, false);
-        test("72", TEST_72_DATA, false, false);
-        test("73", TEST_73_DATA, false, false);
-        test("74", TEST_74_DATA, true , false);
-        test("75", TEST_75_DATA, false, false);
-        test("76", TEST_76_DATA, false, false);
-        
-        resultBuf.append("NISTCertPathTest -- Failed: ").append(testFail.size()).append('/').append(testCount).append('\n');
-        if (!testFail.isEmpty())
-        {
-            fail(resultBuf.toString());
-        }
-    }
-    
-    private void init()
-    {
-        try
-        {
-            fact = CertificateFactory.getInstance("X.509", "BC");
-            trustedCert = (X509Certificate)fact
-                    .generateCertificate(new ByteArrayInputStream(Base64
-                            .decode(Trust_Anchor_CP_01_01_crt)));
-            trustedCRL = (X509CRL)fact.generateCRL(new ByteArrayInputStream(
-                    Base64.decode(Trust_Anchor_CRL_CP_01_01_crl)));
-            trustedSet = new HashSet();
-
-            byte[] _ncBytes = null;
-            byte[] _octBytes = trustedCert.getExtensionValue("2.5.29.30");
-            if (_octBytes != null)
-            {
-                ASN1InputStream _ais = new ASN1InputStream(
-                        new ByteArrayInputStream(_octBytes));
-                ASN1OctetString _oct = ASN1OctetString.getInstance(_ais
-                        .readObject());
-                _ais.close();
-                _ncBytes = _oct.getOctets();
-            }
-
-            trustedSet.add(new TrustAnchor(trustedCert, _ncBytes));
-            testCount = 0;
-            testFail = new Vector();
-            resultBuf = new StringBuffer();
-        }
-        catch (Exception ex)
-        {
-            throw new RuntimeException(ex.getMessage());
-        }
-    }
-
-    private X509Certificate decodeCertificate(String _str)
-            throws GeneralSecurityException
-    {
-
-        return (X509Certificate)fact
-                .generateCertificate(new ByteArrayInputStream(Base64
-                        .decode(_str)));
-    }
-
-    private X509CRL decodeCRL(String _str)
-            throws GeneralSecurityException
-    {
-
-        return (X509CRL)fact.generateCRL(new ByteArrayInputStream(Base64
-                .decode(_str)));
-    }
-
-    private CertStore makeCertStore(String[] _strs)
-            throws GeneralSecurityException
-    {
-
-        Vector _vec = new Vector();
-        _vec.addElement(trustedCRL);
-
-        for (int i = 0; i < _strs.length; i++)
-        {
-            if (_strs[i].startsWith("MIIC"))
-            {
-                _vec.addElement(fact
-                        .generateCertificate(new ByteArrayInputStream(Base64
-                                .decode(_strs[i]))));
-            }
-            else if (_strs[i].startsWith("MIIB"))
-            {
-                _vec.addElement(fact.generateCRL(new ByteArrayInputStream(
-                        Base64.decode(_strs[i]))));
-            }
-            else
-            {
-                throw new IllegalArgumentException("Invalid certificate or crl");
-            }
-        }
-
-        // Insert elements backwards to muck up forward ordering dependency
-        Vector _vec2 = new Vector();
-        for (int i = _vec.size() - 1; i >= 0; i--)
-        {
-            _vec2.add(_vec.elementAt(i));
-        }
-
-        return CertStore.getInstance("Collection",
-                new CollectionCertStoreParameters(_vec2), "BC");
-    }
-
-    private void test(String _name, String[] _data, boolean _accept,
-            boolean _debug)
-    {
-
-        test(_name, _data, null, false, _accept, _debug);
-    }
-
-    private void test(String _name, String[] _data, boolean _explicit,
-            boolean _accept, boolean _debug)
-    {
-
-        test(_name, _data, null, _explicit, _accept, _debug);
-    }
-
-    private void test(String _name, String[] _data, Set _ipolset,
-            boolean _explicit, boolean _accept, boolean _debug)
-    {
-
-        testCount++;
-        boolean _pass = true;
-
-        try
-        {
-            CertPathBuilder _cpb = CertPathBuilder.getInstance("PKIX", "BC");
-            X509Certificate _ee = decodeCertificate(_data[_data.length - 1]);
-            X509CertSelector _select = new X509CertSelector();
-            _select.setSubject(_ee.getSubjectX500Principal().getEncoded());
-
-            PKIXBuilderParameters _param = new PKIXBuilderParameters(
-                    trustedSet, _select);
-            _param.setExplicitPolicyRequired(_explicit);
-            _param.addCertStore(makeCertStore(_data));
-            _param.setRevocationEnabled(true);
-            if (_ipolset != null)
-            {
-                _param.setInitialPolicies(_ipolset);
-            }
-
-            CertPathBuilderResult _result = _cpb.build(_param);
-
-            if (!_accept)
-            {
-                System.out.println("Accept when it should reject");
-                _pass = false;
-                testFail.addElement(_name);
-            }
-        }
-        catch (Exception ex)
-        {
-            if (_accept)
-            {
-                System.out.println("Reject when it should accept");
-                _pass = false;
-                testFail.addElement(_name);
-            }
-        }
-
-        resultBuf.append("NISTCertPathTest -- ").append(_name).append(": ")
-                .append(_pass ? "\n" : "Failed.\n");
-    }
-    
-
-    public static void main(
-        String[]    args)
-    {
-        Security.addProvider(new BouncyCastleProvider());
-
-        runTest(new NISTCertPathTest());
-    }
-    
-    /*  
-     *  Trust Anchor
-     *  
-     */ 
-    public static final String Trust_Anchor_CP_01_01_crt = 
-        "MIICbDCCAdWgAwIBAgIDAYafMA0GCSqGSIb3DQEBBQUAMF4xCzAJBgNVBAYTAlVTMRgwFg" +
-        "YDVQQKEw9VLlMuIEdvdmVybm1lbnQxDDAKBgNVBAsTA0RvRDEQMA4GA1UECxMHVGVzdGlu" +
-        "ZzEVMBMGA1UEAxMMVHJ1c3QgQW5jaG9yMB4XDTk5MDEwMTEyMDEwMFoXDTQ4MDEwMTEyMD" +
-        "EwMFowXjELMAkGA1UEBhMCVVMxGDAWBgNVBAoTD1UuUy4gR292ZXJubWVudDEMMAoGA1UE" +
-        "CxMDRG9EMRAwDgYDVQQLEwdUZXN0aW5nMRUwEwYDVQQDEwxUcnVzdCBBbmNob3IwgZ8wDQ" +
-        "YJKoZIhvcNAQEBBQADgY0AMIGJAoGBANPzucEztz+nJ/ZBHVyceZ2q0pUQt4TO2qPlWAw+" +
-        "TotWvz6qIS1QE/7zGS56yxHP89O4X1efnZeArx2VVxLfNNS9865N53ymINQETtpjYT49Ko" +
-        "03z8U8yfn68DlIBHi9sN31JEYzoUafF58Eu883lAwTQ6qQrJF4HbrzGIQqgitHAgMBAAGj" +
-        "ODA2MBEGA1UdDgQKBAirmuv5wudUjzAMBgNVHRMEBTADAQH/MBMGA1UdIwQMMAqACKua6/" +
-        "nC51SPMA0GCSqGSIb3DQEBBQUAA4GBABZWD2Gsh4tP62QSG8OFWUpo4TulIcFZLpGsaP4T" +
-        "/2Nt7lXUoIJMN7wWjqkmYf5/Rvo4HxNcimq3EkeYcrm1VoDueJUYGvRjcCY5mxkghI27Yl" +
-        "/fLKE9/BvQOrvYzBs2EqKrrT7m4VK0dRMR7CeVpmPP08z0Tti6uK2tzBplp1pF";
-    public static final String Trust_Anchor_CRL_CP_01_01_crl = 
-        "MIIBbzCB2QIBATANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS" +
-        "5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb0QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNV" +
-        "BAMTDFRydXN0IEFuY2hvchcNOTkwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMTAwWjAiMCACAS" +
-        "cXDTk5MDEwMTEyMDAwMFowDDAKBgNVHRUEAwoBAaAjMCEwCgYDVR0UBAMCAQEwEwYDVR0j" +
-        "BAwwCoAIq5rr+cLnVI8wDQYJKoZIhvcNAQEFBQADgYEAC7lqZwejJRW7QvzH11/7cYcL3r" +
-        "acgMxH3PSU/ufvyLk7ahR++RtHary/WeCvRdyznLiIOA8ZBiguWtVPqsNysNn7WLofQIVa" +
-        "+/TD3T+lece4e1NwGQvj5Q+e2wRtGXg+gCuTjTKUFfKRnWz7O7RyiJKKim0jtAF4RkCpLe" +
-        "bNChY=";
-
-
-    /*  
-     *  test1
-     *  
-     */ 
-
-    public static final String End_Certificate_CP_01_01_crt = 
-        "MIIChjCCAe+gAwIBAgIBATANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1" +
-        "UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb0QxEDAOBgNVBAsTB1Rlc3Rpbmcx" +
-        "FTATBgNVBAMTDFRydXN0IEFuY2hvcjAeFw05ODAxMDExMjAxMDBaFw00ODAxMDExMjAxMD" +
-        "BaMGAxCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9VLlMuIEdvdmVybm1lbnQxDDAKBgNVBAsT" +
-        "A0RvRDEQMA4GA1UECxMHVGVzdGluZzEXMBUGA1UEAxMOVXNlcjEtQ1AuMDEuMDEwgZ8wDQ" +
-        "YJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMY07G8M4FkOvF+6LpO7BKcDuXCKudfl1+bKSowj" +
-        "2GCza8uIiMfYSH5k+fYb43lGQeRh9yVHcfNQlE7yfGo3tgxGv5yWpeKvDMqL8Iy6Q0oIjm" +
-        "qH80ZOz21dUkermcckzTEOfe/R2fNpJPv8M24pq29SdYAqu+CpLDHFtws9O+q1AgMBAAGj" +
-        "UjBQMA4GA1UdDwEB/wQEAwIF4DAWBgNVHSAEDzANMAsGCWCGSAFlAwEwATARBgNVHQ4ECg" +
-        "QIrNv88bwFLtIwEwYDVR0jBAwwCoAIq5rr+cLnVI8wDQYJKoZIhvcNAQEFBQADgYEAK4hP" +
-        "goWtZbHf6qWfRfmrPrz9hDH1644NrJop2Y7MXzuTtpo1zp4NCG4+ii0CSOfvhugc8yOmq3" +
-        "I6olgE0V16VtC5br2892UHYZ55Q4oQ9BWouVVlOyY9rogOB160BnsqBELFhT0Wf6mnbsdD" +
-        "G+BB5fFyeK61aYDWV84kS7cSX5w=";
-    public static final String[] TEST_1_DATA = new String[] {
-        End_Certificate_CP_01_01_crt,
-    };
-
-    /*  
-     *  test2
-     *  
-     */ 
-
-    public static final String Intermediate_Certificate_CP_01_02_crt = 
-        "MIIClTCCAf6gAwIBAgIBAjANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1" +
-        "UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb0QxEDAOBgNVBAsTB1Rlc3Rpbmcx" +
-        "FTATBgNVBAMTDFRydXN0IEFuY2hvcjAeFw05ODAxMDExMjAxMDBaFw00ODAxMDExMjAxMD" +
-        "BaMF4xCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9VLlMuIEdvdmVybm1lbnQxDDAKBgNVBAsT" +
-        "A0RvZDEQMA4GA1UECxMHVGVzdGluZzEVMBMGA1UEAxMMQ0ExLUNQLjAxLjAyMIGfMA0GCS" +
-        "qGSIb3DQEBAQUAA4GNADCBiQKBgQDWOZ4hk+K6NX/l+OiHC4pfKCWFt+XM2n/TxwkqY+mt" +
-        "j9Co77rPPPtVA7mDKU4OiYT74mIWH52HQBZr+PRmOFh0Z9S1oTpLbxNLCDc6OmQKBo6iex" +
-        "SIt/jOatFFmzmTZ78Kq9s3nfrOVA83ggmPDTPkuG5GwcxPgFq0vRmAJ0CESQIDAQABo2Mw" +
-        "YTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAWBgNVHSAEDzANMAsGCWCGSA" +
-        "FlAwEwATARBgNVHQ4ECgQI5o5Am09NlOYwEwYDVR0jBAwwCoAIq5rr+cLnVI8wDQYJKoZI" +
-        "hvcNAQEFBQADgYEA3C7Ye5/Te14LIwo/LK2fnpobbQA3dhOn5UgqZ8lKbQ/HV1D8/eU9dK" +
-        "2v5gW43XvFq4whK0WKLBvBFchKtp9T1QX3CI2WCqdJRyqla6TkQsS36T17/ww2nzy1853Y" +
-        "hfDYNsge5XW8YZNfNjjVxcR3RnyFxPax1YIlISiGdI0dnag=";
-    public static final String Intermediate_CRL_CP_01_02_crl = 
-        "MIIBSzCBtQIBATANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS" +
-        "5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNV" +
-        "BAMTDENBMS1DUC4wMS4wMhcNOTkwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMTAwWqAjMCEwCg" +
-        "YDVR0UBAMCAQEwEwYDVR0jBAwwCoAI5o5Am09NlOYwDQYJKoZIhvcNAQEFBQADgYEAl26W" +
-        "g1Gqq3R93XPjghABVocfeIi8zcSJ0YAKqbifh5V3JCC8Piy19GzZdL244GqBDls44IAhKj" +
-        "YuXN2mSohdqwULbye4agAgfl37XhhwsBDTYwaJiv3njFQ6Ml7KJ3STmoIpmlLvrXibDuHX" +
-        "ocuNGo72ckhOdBpXd+PhgGuoTis=";
-    public static final String End_Certificate_CP_01_02_crt = 
-        "MIIChjCCAe+gAwIBAgIBAzANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1" +
-        "UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3Rpbmcx" +
-        "FTATBgNVBAMTDENBMS1DUC4wMS4wMjAeFw05ODAxMDExMjAxMDBaFw00ODAxMDExMjAxMD" +
-        "BaMGAxCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9VLlMuIEdvdmVybm1lbnQxDDAKBgNVBAsT" +
-        "A0RvRDEQMA4GA1UECxMHVGVzdGluZzEXMBUGA1UEAxMOVXNlcjEtQ1AuMDEuMDIwgZ8wDQ" +
-        "YJKoZIhvcNAQEBBQADgY0AMIGJAoGBALwJrZT6bJXQnZzc3socZ/mNsEag4BTdym99ZCP2" +
-        "3PGsTCfV2z7+p4DehIFrn/N/a1d1nvyqRqpQGPU86tl1CWgFtXS+zCctDR71P76bjd6yef" +
-        "5vxxdO/SBIRHfQTjM8F3BTLkrC+PVl5wbaLcEXRORXrFvBvsj0oqwZ4C8ZObh/AgMBAAGj" +
-        "UjBQMA4GA1UdDwEB/wQEAwIF4DAWBgNVHSAEDzANMAsGCWCGSAFlAwEwATARBgNVHQ4ECg" +
-        "QIf5mSjuNhs/gwEwYDVR0jBAwwCoAI5o5Am09NlOYwDQYJKoZIhvcNAQEFBQADgYEAK7wd" +
-        "MyLlIZ/Qsqj3/A3Gat0d5BORtFTZH0VdlVVOWN1JCZxrnjeIFB92NNzUROemxgBxzneuWN" +
-        "SlYlcpTk25pAbs6RMdbT8dovKQkQkF2TXeQ+4qktFaLQntVT8UsEzHR4Diw0/gH8tseGqF" +
-        "F7FyiW8ni6zInSO+embUKiibj9I=";
-    public static final String[] TEST_2_DATA = new String[] {
-        Intermediate_Certificate_CP_01_02_crt,
-        Intermediate_CRL_CP_01_02_crl,
-        End_Certificate_CP_01_02_crt
-    };
-
-    /*  
-     *  test3
-     *  
-     */ 
-
-    public static final String Intermediate_Certificate_CP_01_03_crt = 
-        "MIIClTCCAf6gAwIBAgIBBDANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1" +
-        "UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb0QxEDAOBgNVBAsTB1Rlc3Rpbmcx" +
-        "FTATBgNVBAMTDFRydXN0IEFuY2hvcjAeFw05ODAxMDExMjAxMDBaFw00ODAxMDExMjAxMD" +
-        "BaMF4xCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9VLlMuIEdvdmVybm1lbnQxDDAKBgNVBAsT" +
-        "A0RvZDEQMA4GA1UECxMHVGVzdGluZzEVMBMGA1UEAxMMQ0ExLUNQLjAxLjAzMIGfMA0GCS" +
-        "qGSIb3DQEBAQUAA4GNADCBiQKBgQC4RZ0R82sA+BfyynFeoIDG7c5IlZ8HorEv+O4Ij3Oy" +
-        "7FR1MB4no8hDEBPBf5fCrAR/8PVxCZjVj2HOwnSAqUQgxo6WPcmkabux12k8kK6yeKq3b7" +
-        "u5fL6tb7eKElQzsz8Je4z4rCDkI10vV+X0VZ5Ip/Es428dw2KoN8eyGmw3+QIDAQABo2Mw" +
-        "YTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAWBgNVHSAEDzANMAsGCWCGSA" +
-        "FlAwEwATARBgNVHQ4ECgQIz08WhMpG2JswEwYDVR0jBAwwCoAIq5rr+cLnVI8wDQYJKoZI" +
-        "hvcNAQEFBQADgYEAQ+iqlFvbvDejO/m+RCHh2UuUau1FuABObkPOu2Tv9yTWvTSWDRygdO" +
-        "LQRiOLsjgrdXPdbDutVGjllBoTN8cdz3SWjCpampg5TBikArxmNEYMDQvL6n2lkUcetRJR" +
-        "gQ7TYLvFj9+SycKXfM5CUXAyCfcU/QwDghhZgc99AuDZtJc=";
-    public static final String Intermediate_CRL_CP_01_03_crl = 
-        "MIIBSzCBtQIBATANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS" +
-        "5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNV" +
-        "BAMTDENBMS1DUC4wMS4wMxcNOTkwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMTAwWqAjMCEwCg" +
-        "YDVR0UBAMCAQEwEwYDVR0jBAwwCoAIz08WhMpG2JswDQYJKoZIhvcNAQEFBQADgYEAoyO/" +
-        "xcpJ0Obj4rTXhHFd7XMzslt79njkEgdwnon9BaYB3xSmkEXCMwLMurrjVYKaB6SWAiPeUv" +
-        "G7ScDHJE6UFVJwIt4vP/M7gTOJ7uak33aWi9e5DeIuLqE6pFqTGu+uoBkkd82SHg2GhJhZ" +
-        "VXDtJ3UcO/3JQPbslc02s9HiRBg=";
-    public static final String End_Certificate_CP_01_03_crt = 
-        "MIIChjCCAe+gAwIBAgIBBTANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1" +
-        "UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3Rpbmcx" +
-        "FTATBgNVBAMTDENBMS1DUC4wMS4wMzAeFw05ODAxMDExMjAxMDBaFw00ODAxMDExMjAxMD" +
-        "BaMGAxCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9VLlMuIEdvdmVybm1lbnQxDDAKBgNVBAsT" +
-        "A0RvRDEQMA4GA1UECxMHVGVzdGluZzEXMBUGA1UEAxMOVXNlcjEtQ1AuMDEuMDMwgZ8wDQ" +
-        "YJKoZIhvcNAQEBBQADgY0AMIGJAoGBANAD1vQj//4BGEXW1Q7HX/AUyFJFyHoYcvg5y4u/" +
-        "8Sj6okriXj3knnBKDiJLpKfcsO5p5MQS5QzAc+lxErXD+duiw8lm61hj0StsRzhDFsaC1g" +
-        "akjzU70R2Tmz/djUnqO3aa2wICc4NVAXnIMMsH/b6XXFZpC0/C32TPTv9aa9mrAgMBAAGj" +
-        "UjBQMA4GA1UdDwEB/wQEAwIF4DAWBgNVHSAEDzANMAsGCWCGSAFlAwEwATARBgNVHQ4ECg" +
-        "QIPw2wltiRqz4wEwYDVR0jBAwwCoAIz08WhMpG2JswDQYJKoZIhvcNAQEFBQADgYEAln42" +
-        "iR3eHyazF8CRjS9Jnas/26MaBtjUyDtcSjTVDWFlccwrQ7TgtzjkNm9fCmgSyvryDnUYGM" +
-        "DoEjwYNLIgtCAkVIEBTmJvlqiPHH+tV5oJvIav+Fn8okHpuuK44umDcdKiFWlOyxrShxzV" +
-        "3Bez/eHklaPTw/VsVhyh+Uru5zM=";
-    public static final String[] TEST_3_DATA = new String[] {
-        Intermediate_Certificate_CP_01_03_crt,
-        Intermediate_CRL_CP_01_03_crl,
-        End_Certificate_CP_01_03_crt
-    };
-
-    /*  
-     *  test4
-     *  
-     */ 
-
-    public static final String Intermediate_Certificate_1_CP_02_01_crt = 
-        "MIIClTCCAf6gAwIBAgIBBjANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1" +
-        "UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb0QxEDAOBgNVBAsTB1Rlc3Rpbmcx" +
-        "FTATBgNVBAMTDFRydXN0IEFuY2hvcjAeFw05OTAxMDExMjAxMDBaFw00ODAxMDExMjAxMD" +
-        "BaMF4xCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9VLlMuIEdvdmVybm1lbnQxDDAKBgNVBAsT" +
-        "A0RvZDEQMA4GA1UECxMHVGVzdGluZzEVMBMGA1UEAxMMQ0ExLUNQLjAyLjAxMIGfMA0GCS" +
-        "qGSIb3DQEBAQUAA4GNADCBiQKBgQC/lQLtWKzklgYuzhjMiK2CzFmzODsEY/JIVNdn9T8M" +
-        "W4ufpGwnfIV62EUHCFeMYydKBm8Hyjbjrz1otINJmrGL5WSAX1/UPtHy1chgXOsFYD6nAH" +
-        "jZAJJGw74nUbKw5+L1wUHU8qXABaaTrRpS1UdKSq4TCZ18NCjC4Oxcf/yDdQIDAQABo2Mw" +
-        "YTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAWBgNVHSAEDzANMAsGCWCGSA" +
-        "FlAwEwATARBgNVHQ4ECgQINsJcxaBqdugwEwYDVR0jBAwwCoAIq5rr+cLnVI8wDQYJKoZI" +
-        "hvcNAQEFBQADgYEAOQP3iUX7FtJlL9nvu4F+8o/N5vr+OB28OsbYtW+Q1FzEfjkUGtT9Ri" +
-        "teradpN/xUnS/oj3BfqFtNANkYKrBeqRtm2VeOC3kdCVFnWFME2aoRAQZbWvOwCFc3yLA7" +
-        "JBdENtDNI54yYHMHPA4/2CuNQq1Iu1ektAS95DIe7ddxL18=";
-    public static final String Intermediate_Certificate_2_CP_02_01_crt = 
-        "MIIClTCCAf6gAwIBAgIBBzANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1" +
-        "UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3Rpbmcx" +
-        "FTATBgNVBAMTDENBMS1DUC4wMi4wMTAeFw05OTAxMDExMjAxMDBaFw00ODAxMDExMjAxMD" +
-        "BaMF4xCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9VLlMuIEdvdmVybm1lbnQxDDAKBgNVBAsT" +
-        "A0RvZDEQMA4GA1UECxMHVGVzdGluZzEVMBMGA1UEAxMMQ0EyLUNQLjAyLjAxMIGfMA0GCS" +
-        "qGSIb3DQEBAQUAA4GNADCBiQKBgQCx/mIo1Ma/IN8OR7KOjclvIwsv0JFXD/T258DruDZU" +
-        "uGoYiEbAc/ZN7R8OHI7dnv9pBfsvyEl7m2DVoLZnP0eXJTHjdZxb1TwPHoSIysi9u3xWlP" +
-        "Rg+v+GGfKLB9pL0m8SZh97SngerZI14w7vQy0kkXziGatSpBoXtWNmsHJNuQIDAQABo2Mw" +
-        "YTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAWBgNVHSAEDzANMAsGCWCGSA" +
-        "FlAwEwATARBgNVHQ4ECgQIoI0mSmDmzZUwEwYDVR0jBAwwCoAINsJcxaBqdugwDQYJKoZI" +
-        "hvcNAQEFBQADgYEAcfs1pH12Qwdhv4NOJO2xxgMZZo8+A9Zl9c7RxsvuoZOOyCxoE9wT/l" +
-        "PdUpGoGxtIPoWQs1qXEXnAlXJCXjLCJUHIG1/E6gQUXW0Ty6Ztpc5Dz06pPTN2gt+41B3J" +
-        "sL/Klqc4iyCaWr8sYgEPQ8nColWRmIwk9gAasPNkNhyxA3Y=";
-    public static final String Intermediate_CRL_1_CP_02_01_crl = 
-        "MIIBSzCBtQIBATANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS" +
-        "5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNV" +
-        "BAMTDENBMS1DUC4wMi4wMRcNOTkwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMTAwWqAjMCEwCg" +
-        "YDVR0UBAMCAQEwEwYDVR0jBAwwCoAINsJcxaBqdugwDQYJKoZIhvcNAQEFBQADgYEAlBaV" +
-        "VfrZqvyRhGXNYFik169nBHiNfKpw8k1YgFAQeNYdmfScq1KHmKzDhsx9kQteczBL7ltviK" +
-        "TN3CKlZW82c16mfd4yYx0l5tkU80lwKCHSUzx92+qrvYjSMup+bqSsi8JhqByBf6b0JbKf" +
-        "yx53Vpw1OCzjxrVHcfHPx8Q/vR4=";
-    public static final String Intermediate_CRL_2_CP_02_01_crl = 
-        "MIIBSzCBtQIBATANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS" +
-        "5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNV" +
-        "BAMTDENBMi1DUC4wMi4wMRcNOTkwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMTAwWqAjMCEwCg" +
-        "YDVR0UBAMCAQEwEwYDVR0jBAwwCoAIoI0mSmDmzZUwDQYJKoZIhvcNAQEFBQADgYEAhAHP" +
-        "QxpcrTTN0GXeOwoMXuQUoHMvezEpM0BYOVLzI3KbRXWa9iWZINr99cRQvonMtOGkhIH3iS" +
-        "wSNbsjmF9HX5UvNzrofOWataVP+macpCuNlK0NS3xxJjKRWOB9C1Ib7tiSSrQqIPcchlF6" +
-        "vofy2ALEL6Usa1UTVYMhzGYnVZU=";
-    public static final String End_Certificate_CP_02_01_crt = 
-        "MIIChjCCAe+gAwIBAgIBCDANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1" +
-        "UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3Rpbmcx" +
-        "FTATBgNVBAMTDENBMi1DUC4wMi4wMTAeFw05OTAxMDExMjAxMDBaFw00ODAxMDExMjAxMD" +
-        "BaMGAxCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9VLlMuIEdvdmVybm1lbnQxDDAKBgNVBAsT" +
-        "A0RvRDEQMA4GA1UECxMHVGVzdGluZzEXMBUGA1UEAxMOVXNlcjEtQ1AuMDIuMDEwgZ8wDQ" +
-        "YJKoZIhvcNAQEBBQADgY0AMIGJAoGBAOzYq2murB5ZjQd4wReI51Lc1F5VwK90OMGRfi71" +
-        "YvwdRjgCudeDXZGW5ayid82y+eTDKFSzo1Li/BPTUXMpeqHHMCmLeefqxAWmz3aDoilF8I" +
-        "Q53PlejnXJdntsal44w6WdP6ssiXlwzcZDnobAfuDTPgsnWWfzAkr1/LqEw/QZAgMBAAGj" +
-        "UjBQMA4GA1UdDwEB/wQEAwIF4DAWBgNVHSAEDzANMAsGCWCGSAFlAwEwATARBgNVHQ4ECg" +
-        "QIP5tVdEyxotcwEwYDVR0jBAwwCoAIoI0mSmDmzZUwDQYJKoZIhvcNAQEFBQADgYEAkVx9" +
-        "S/20Hir8qMnfMpMGTgMKoVeWoljxim83IkNs1Xqe1oLGHdyDUA66uF8wPkoTqGrfDYvgBa" +
-        "5Mi0iJREnMWoiWvCe467+L1b2gtvRBMl9bcRj40bvelk0Wn4lBl3VuKXarP5M0PKT5OWvN" +
-        "2cPLNeXHvV6ZIrC4rmK2ISpIXX4=";
-    public static final String[] TEST_4_DATA = new String[] {
-        Intermediate_Certificate_1_CP_02_01_crt,
-        Intermediate_Certificate_2_CP_02_01_crt,
-        Intermediate_CRL_1_CP_02_01_crl,
-        Intermediate_CRL_2_CP_02_01_crl,
-        End_Certificate_CP_02_01_crt
-    };
-
-    /*  
-     *  test5
-     *  
-     */ 
-
-    public static final String Intermediate_Certificate_CP_02_02_crt = 
-        "MIIClTCCAf6gAwIBAgIBCTANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1" +
-        "UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb0QxEDAOBgNVBAsTB1Rlc3Rpbmcx" +
-        "FTATBgNVBAMTDFRydXN0IEFuY2hvcjAeFw00NzAxMDExMjAxMDBaFw00ODAxMDExMjAxMD" +
-        "BaMF4xCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9VLlMuIEdvdmVybm1lbnQxDDAKBgNVBAsT" +
-        "A0RvZDEQMA4GA1UECxMHVGVzdGluZzEVMBMGA1UEAxMMQ0ExLUNQLjAyLjAyMIGfMA0GCS" +
-        "qGSIb3DQEBAQUAA4GNADCBiQKBgQDHJmlRKb+mjc61iiqGe9gx/VUMLNmGrXGRYKMmYSxO" +
-        "Q5sGLoztd2XtEgtZEPwvzd9KLKGP3XmgTrc4BGohqoFoG9Qb+w2ZGFwVC22GpeSoXc+J2u" +
-        "2t3uRKYgboHpB0Jk42XLy+2wSEtS+/er7cFu2ufdPsvT4J1AqiuZSco96vtQIDAQABo2Mw" +
-        "YTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAWBgNVHSAEDzANMAsGCWCGSA" +
-        "FlAwEwATARBgNVHQ4ECgQIBvoP1E6PGiMwEwYDVR0jBAwwCoAIq5rr+cLnVI8wDQYJKoZI" +
-        "hvcNAQEFBQADgYEAmOyFq2vZrUNDVWRcyzYvZhs1uQ4zgXtfqnPE0V19RgaYffCrSCI86z" +
-        "5kyDUyZwbGABMxBaVxEw536MesyDTdZdEVw6lN5RRtxr8/WEiSH6oI6t0xNxuNOkSNpz4d" +
-        "28HA4UfUvtXK8RK2YZnPAd6UXsRUPBPXKEpzy4v/9RyihSg=";
-    public static final String Intermediate_CRL_CP_02_02_crl = 
-        "MIIBSzCBtQIBATANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS" +
-        "5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNV" +
-        "BAMTDENBMS1DUC4wMi4wMhcNOTkwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMTAwWqAjMCEwCg" +
-        "YDVR0UBAMCAQEwEwYDVR0jBAwwCoAIBvoP1E6PGiMwDQYJKoZIhvcNAQEFBQADgYEAALlA" +
-        "f3IDWexcdkMQHWTdGeFe+bG5dBvVPL5ZyQUw9DWbLwrjw/Jm4v9t+HLjETLSymsFT4bW21" +
-        "OwnEiAAdaKT96k5t+sTyU5QQ6HL/jRXLHLGdCQgMFCglm5iNqaCLIFoMAVCaFkYtFUE3m/" +
-        "iVt+319JOh5UyshMuWrAEW0IGGQ=";
-    public static final String End_Certificate_CP_02_02_crt = 
-        "MIIChjCCAe+gAwIBAgIBCjANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1" +
-        "UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3Rpbmcx" +
-        "FTATBgNVBAMTDENBMS1DUC4wMi4wMjAeFw05ODAxMDExMjAxMDBaFw00ODAxMDExMjAxMD" +
-        "BaMGAxCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9VLlMuIEdvdmVybm1lbnQxDDAKBgNVBAsT" +
-        "A0RvRDEQMA4GA1UECxMHVGVzdGluZzEXMBUGA1UEAxMOVXNlcjEtQ1AuMDIuMDIwgZ8wDQ" +
-        "YJKoZIhvcNAQEBBQADgY0AMIGJAoGBAL/Src6e8qXwL+KJs5+v+JsakZdSDqMAFJUMfA2O" +
-        "OO2TIqcvDFHzqesX+G+28MUwy6++ux07CD3FCaapgzBN4zO4RfKcamxFReKMKcEvNVVCOO" +
-        "wO4Lvku1Sad14oYyGLOMzZwZFjRp8paaz5g87k70EOPBLeDlFMcch36czw53sLAgMBAAGj" +
-        "UjBQMA4GA1UdDwEB/wQEAwIF4DAWBgNVHSAEDzANMAsGCWCGSAFlAwEwATARBgNVHQ4ECg" +
-        "QIPoHc2Sfk6XUwEwYDVR0jBAwwCoAIBvoP1E6PGiMwDQYJKoZIhvcNAQEFBQADgYEAFHhm" +
-        "o6QRFdO1x1wp7Jb1QQAlChFfP8MrGVNK04Ur8f+wfkwIypTDifJ0AoFpjcM3Ohu9Ixvb9q" +
-        "3kCSIWKDnWtDWw1/dN8mPL5If5gGqPA0+wRbUKVKvduOg7hKr4mWjKw7oYiaJuIIoN9RRZ" +
-        "ejzltd0NEaODNPW/JaKeQUVgZbY=";
-    public static final String[] TEST_5_DATA = new String[] {
-        Intermediate_Certificate_CP_02_02_crt,
-        Intermediate_CRL_CP_02_02_crl,
-        End_Certificate_CP_02_02_crt
-    };
-
-    /*  
-     *  test6
-     *  
-     */ 
-
-    public static final String Intermediate_Certificate_CP_02_03_crt = 
-        "MIIClTCCAf6gAwIBAgIBCzANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1" +
-        "UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb0QxEDAOBgNVBAsTB1Rlc3Rpbmcx" +
-        "FTATBgNVBAMTDFRydXN0IEFuY2hvcjAeFw05ODAxMDExMjAxMDBaFw00ODAxMDExMjAxMD" +
-        "BaMF4xCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9VLlMuIEdvdmVybm1lbnQxDDAKBgNVBAsT" +
-        "A0RvZDEQMA4GA1UECxMHVGVzdGluZzEVMBMGA1UEAxMMQ0ExLUNQLjAyLjAzMIGfMA0GCS" +
-        "qGSIb3DQEBAQUAA4GNADCBiQKBgQCaJ7NcOvb22F6HjMF1R/AORa4+pKFfFfd9teXPpVWC" +
-        "9InTq+alY11QaSj27Qg0znOIItmf2W/8Dub9sjnbg+SgAkoV5+CAkplodRNC8AbD4x8rh/" +
-        "fioQ8lb0Qb4Dn9I0n2wjOgitmMRdE2uW4uwVpH52vsMyenbDVxVI7jA4NS/wIDAQABo2Mw" +
-        "YTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAWBgNVHSAEDzANMAsGCWCGSA" +
-        "FlAwEwATARBgNVHQ4ECgQIC2T+/BkG93AwEwYDVR0jBAwwCoAIq5rr+cLnVI8wDQYJKoZI" +
-        "hvcNAQEFBQADgYEApr6kDXVY5jYt23wC9n3LmhoxDoWh8cBQxcWmr1wpVxIrCbaP0/y00a" +
-        "29wbewKfucUoh/W2OfjNcohjpKRrnVmOpi5vN7SmbZIHaxbKLzyQ7JwF17aznyCSZVrGpF" +
-        "A/S49T5rlCm8KDBcc2ym7gRJzwUApbC0Wws4Pg46czrpQlg=";
-    public static final String Intermediate_CRL_CP_02_03_crl = 
-        "MIIBSzCBtQIBATANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS" +
-        "5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNV" +
-        "BAMTDENBMS1DUC4wMi4wMxcNOTkwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMTAwWqAjMCEwCg" +
-        "YDVR0UBAMCAQEwEwYDVR0jBAwwCoAIC2T+/BkG93AwDQYJKoZIhvcNAQEFBQADgYEAlBFY" +
-        "vPxhFYsjFOIfQkd7MwKIi7vgPgoWTP5f+QlI0ison5n4N3rYJv31hTZRRRP99JZce1hY6J" +
-        "Qiv1OtkpG7VfQIhr0FAGxTNaJD6F6rLbGjG8cap4+VibFQf5gZv0XQcyW4akYiRqSXImYn" +
-        "NVlNyaxiJja+5GA9XVqvWOjjz4o=";
-    public static final String End_Certificate_CP_02_03_crt = 
-        "MIIChjCCAe+gAwIBAgIBDDANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1" +
-        "UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3Rpbmcx" +
-        "FTATBgNVBAMTDENBMS1DUC4wMi4wMzAeFw00NzAxMDExMjAxMDBaFw00ODAxMDExMjAxMD" +
-        "BaMGAxCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9VLlMuIEdvdmVybm1lbnQxDDAKBgNVBAsT" +
-        "A0RvRDEQMA4GA1UECxMHVGVzdGluZzEXMBUGA1UEAxMOVXNlcjEtQ1AuMDIuMDMwgZ8wDQ" +
-        "YJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMlW6FOLwhRsKZM6p0ww4QEWjQzjpjYhKnz3BnLw" +
-        "SdGZqMe4wzZnDWc/0eyDOMCSYXIWQhlDMqQn2zCVPbDKzMRkdEeRSvE6ghhYP/hn3ipjSw" +
-        "D8QwaqofCp0sFkbDPke+xD2tMhLdUyNKynPjpSQmYtfoA98PD7so3cSAtrYuSDAgMBAAGj" +
-        "UjBQMA4GA1UdDwEB/wQEAwIF4DAWBgNVHSAEDzANMAsGCWCGSAFlAwEwATARBgNVHQ4ECg" +
-        "QIc/X6kp7teCQwEwYDVR0jBAwwCoAIC2T+/BkG93AwDQYJKoZIhvcNAQEFBQADgYEAStub" +
-        "g3DzhJgzYO+ZmRc0acldZGwZFm6F1Ckc1JzQDgVHU0bnCANgBcJj49UV2MwbNKPQdVzdwo" +
-        "c91rfwrSY/PrvVQ9tUonZ28y/esFRBAdJTLf4u++p/gI3vfCvEXa5xVTIz1Hc+iKzAGKrI" +
-        "cveDHy3ZZluQ3J6tbHs2BhnQFXM=";
-    public static final String[] TEST_6_DATA = new String[] {
-        Intermediate_Certificate_CP_02_03_crt,
-        Intermediate_CRL_CP_02_03_crl,
-        End_Certificate_CP_02_03_crt
-    };
-
-    /*  
-     *  test7
-     *  
-     */ 
-
-    public static final String Intermediate_Certificate_CP_02_04_crt = 
-        "MIIClTCCAf6gAwIBAgIBDTANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1" +
-        "UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb0QxEDAOBgNVBAsTB1Rlc3Rpbmcx" +
-        "FTATBgNVBAMTDFRydXN0IEFuY2hvcjAeFw05ODAxMDExMjAxMDBaFw00ODAxMDExMjAxMD" +
-        "BaMF4xCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9VLlMuIEdvdmVybm1lbnQxDDAKBgNVBAsT" +
-        "A0RvZDEQMA4GA1UECxMHVGVzdGluZzEVMBMGA1UEAxMMQ0ExLUNQLjAyLjA0MIGfMA0GCS" +
-        "qGSIb3DQEBAQUAA4GNADCBiQKBgQDgZy2Xs5pIoJrT7GuagmKLrn8F9rj8p8w2wELorGhM" +
-        "1HJMVOurH+o+y6RXd0oMGJkKNrhjEnbHKm3PBYiLgpCjVEcFNhQF1OOxJ7RdahvA9ifsuw" +
-        "jV1TxTGq35jeaJYASRXb2TiNfzuPWSVm0MWr5zz+YB6NNuvjxwEBgZvNiV8QIDAQABo2Mw" +
-        "YTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAWBgNVHSAEDzANMAsGCWCGSA" +
-        "FlAwEwATARBgNVHQ4ECgQIWAOnkHkwSVkwEwYDVR0jBAwwCoAIq5rr+cLnVI8wDQYJKoZI" +
-        "hvcNAQEFBQADgYEAMiHozz92EOhSXU/krwQVs0GNEWoAUH3LHt70Zr01dFzEF6QhA/wUa4" +
-        "+V4XwbMob+q4zGnTHj+tL9ChGWi3NDGELQ4cN64OMPsToGKkepLy+sDwdm9LaUP1bDvPxd" +
-        "v2hjlskJ7TEu4+6ltXSG/k36Jk8C0/I/ayNGbYcEcLyes3s=";
-    public static final String Intermediate_CRL_CP_02_04_crl = 
-        "MIIBSzCBtQIBATANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS" +
-        "5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNV" +
-        "BAMTDENBMS1DUC4wMi4wNBcNOTkwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMTAwWqAjMCEwCg" +
-        "YDVR0UBAMCAQEwEwYDVR0jBAwwCoAIWAOnkHkwSVkwDQYJKoZIhvcNAQEFBQADgYEAVtCi" +
-        "IocktnWOwWiaOc7tTUJvvH5+IYVyB/XhmMhF7cDbL292gyrnuh1+3+lHwZQBPoF9kzF0vt" +
-        "WaweG7mDvYKxENQODdph/VcnypgUiFTWRTIPB1ZXfCTMWYf2QSalpHRDR4vVsqF748QbcG" +
-        "E9mbzvLUz6NDA+Vf8wEwZehqSDM=";
-    public static final String End_Certificate_CP_02_04_crt = 
-        "MIIChjCCAe+gAwIBAgIBDjANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1" +
-        "UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3Rpbmcx" +
-        "FTATBgNVBAMTDENBMS1DUC4wMi4wNDAeFw01MDAxMDExMjAxMDBaFw00ODAxMDExMjAxMD" +
-        "BaMGAxCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9VLlMuIEdvdmVybm1lbnQxDDAKBgNVBAsT" +
-        "A0RvRDEQMA4GA1UECxMHVGVzdGluZzEXMBUGA1UEAxMOVXNlcjEtQ1AuMDIuMDQwgZ8wDQ" +
-        "YJKoZIhvcNAQEBBQADgY0AMIGJAoGBALBX5GIQtvwswWwMDDPnphIk1rJSbcq7iClXLM2E" +
-        "kgvBu+hbOzb0v9mtl0KJB71TWJCfwceVQiXc3Gk+YduujAbZRVTkROf9UOWD9bfrI7g+52" +
-        "g4ms2n7evCO33b+kGEf4I014xl8dJDWtHK9Bhr+569RW9TzO06IeVeTD7whxMXAgMBAAGj" +
-        "UjBQMA4GA1UdDwEB/wQEAwIF4DAWBgNVHSAEDzANMAsGCWCGSAFlAwEwATARBgNVHQ4ECg" +
-        "QIuKXv5WkUTWAwEwYDVR0jBAwwCoAIWAOnkHkwSVkwDQYJKoZIhvcNAQEFBQADgYEAiu0B" +
-        "yR5Ru8qVsgRqkOpCvrJnkqBAImbbR6+BUYH0juRxxKzKnbFOjU6a9WvkKpEBB8Q2xLynPN" +
-        "68ecLpnOynx3xj2sWWSVbsRKPy0iOesQblKrq3yHAm4lhzoWA8t1Xz29Ko1WxylDhyxGpR" +
-        "QAWsyGVCfJFlsZE0ibw3erlWTnA=";
-    public static final String[] TEST_7_DATA = new String[] {
-        Intermediate_Certificate_CP_02_04_crt,
-        Intermediate_CRL_CP_02_04_crl,
-        End_Certificate_CP_02_04_crt
-    };
-
-    /*  
-     *  test8
-     *  
-     */ 
-
-    public static final String Intermediate_Certificate_CP_02_05_crt = 
-        "MIIClTCCAf6gAwIBAgIBDzANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1" +
-        "UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb0QxEDAOBgNVBAsTB1Rlc3Rpbmcx" +
-        "FTATBgNVBAMTDFRydXN0IEFuY2hvcjAeFw05ODAxMDExMjAxMDBaFw00ODAxMDExMjAxMD" +
-        "BaMF4xCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9VLlMuIEdvdmVybm1lbnQxDDAKBgNVBAsT" +
-        "A0RvZDEQMA4GA1UECxMHVGVzdGluZzEVMBMGA1UEAxMMQ0ExLUNQLjAyLjA1MIGfMA0GCS" +
-        "qGSIb3DQEBAQUAA4GNADCBiQKBgQC2d80bD1RounqjKizkZJYPFUuVWZQ8W2nZDkEp8qR9" +
-        "fRWCAGOZGs84tgHj5gasmxy1mxJc9ogyQ2mcZhJRitRm5LVNuGevO6JmfqYtJxbW54aZGE" +
-        "5AWSRXqjJKJEih4VmPjA3vjQaSZSZJnu0DSnO82qWfu1ZUDlvIG6dfKJWRQQIDAQABo2Mw" +
-        "YTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAWBgNVHSAEDzANMAsGCWCGSA" +
-        "FlAwEwATARBgNVHQ4ECgQI3uNhI+QuI4owEwYDVR0jBAwwCoAIq5rr+cLnVI8wDQYJKoZI" +
-        "hvcNAQEFBQADgYEAG/+Rpk8dYrSFdaEO8Ch5tuvvKTOMi7W/DRA4B4xR7WyRJmosPB+37c" +
-        "teGKVzqFND22Xc8xQH/b/nxYW08sCSLAfN0cRusoSWwWSRtPO2f9fyC/BqCy2B2kQLFNPM" +
-        "Bk22jNFwLqPUeZn1UHN05RFAqVx325kpl2m1V7tw/mrXATI=";
-    public static final String Intermediate_CRL_CP_02_05_crl = 
-        "MIIBSzCBtQIBATANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS" +
-        "5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNV" +
-        "BAMTDENBMS1DUC4wMi4wNRcNOTkwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMTAwWqAjMCEwCg" +
-        "YDVR0UBAMCAQEwEwYDVR0jBAwwCoAI3uNhI+QuI4owDQYJKoZIhvcNAQEFBQADgYEAWZUI" +
-        "2VGY4pak0kICONP/CKvamYFs5txJfR69AC5tEJ+Fy3PmSeHkLUZf/oc9d8EEyr0MsIjRHj" +
-        "N4X4MquMlk4FflZcc8GblQK8LdXBK4Dy1SiXHA5GB3U1AmgzAzEQGwGRZnzWP5+rJ65upX" +
-        "vksAYyPQmruRM0O5sElctPn6B+Y=";
-    public static final String End_Certificate_CP_02_05_crt = 
-        "MIICiDCCAfGgAwIBAgIBEDANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1" +
-        "UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3Rpbmcx" +
-        "FTATBgNVBAMTDENBMS1DUC4wMi4wNTAgGA8yMDUwMDEwMTEyMDEwMFoXDTQ4MDEwMTEyMD" +
-        "EwMFowYDELMAkGA1UEBhMCVVMxGDAWBgNVBAoTD1UuUy4gR292ZXJubWVudDEMMAoGA1UE" +
-        "CxMDRG9EMRAwDgYDVQQLEwdUZXN0aW5nMRcwFQYDVQQDEw5Vc2VyMS1DUC4wMi4wNTCBnz" +
-        "ANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAviLKpW4iblWNLQfmBJJ+ruMgygmjRWfoFGya" +
-        "Ndv2ma0Ugqm5xXq8c0orbnezwSp+tnzZZhG5KDNZr5+z3krCkqOGGzuUvVLqeJxPOLu7Js" +
-        "y472nAA7+FhwfZrXUI+Vg9F4qF+Ye81ivDrYVAEmalCpCyHOAKdvwkwQjRucifu90CAwEA" +
-        "AaNSMFAwDgYDVR0PAQH/BAQDAgXgMBYGA1UdIAQPMA0wCwYJYIZIAWUDATABMBEGA1UdDg" +
-        "QKBAjgph7BA5L7dzATBgNVHSMEDDAKgAje42Ej5C4jijANBgkqhkiG9w0BAQUFAAOBgQBr" +
-        "MDMv9NWCTIQ3blMEqPiEyjiBhSJl88Cu797P4lIn+gc6E+0vZp61X7B2k5CHgsnxyVLK5e" +
-        "bwl0bYAPKwRI9yzHLrj71RNw8HA7PCRPn1GNrtBBbIpLE0/sqLo51UPu/377+CnzYhIycL" +
-        "tvS0KDLUTDSY/OowDcplF6Xwnt8cUQ==";
-    public static final String[] TEST_8_DATA = new String[] {
-        Intermediate_Certificate_CP_02_05_crt,
-        Intermediate_CRL_CP_02_05_crl,
-        End_Certificate_CP_02_05_crt
-    };
-
-    /*  
-     *  test9
-     *  
-     */ 
-
-    public static final String Intermediate_Certificate_CP_03_01_crt = 
-        "MIIClTCCAf6gAwIBAgIBETANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1" +
-        "UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb0QxEDAOBgNVBAsTB1Rlc3Rpbmcx" +
-        "FTATBgNVBAMTDFRydXN0IEFuY2hvcjAeFw05ODAxMDExMjAxMDBaFw0wMDAxMDExMjAxMD" +
-        "BaMF4xCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9VLlMuIEdvdmVybm1lbnQxDDAKBgNVBAsT" +
-        "A0RvZDEQMA4GA1UECxMHVGVzdGluZzEVMBMGA1UEAxMMQ0ExLUNQLjAzLjAxMIGfMA0GCS" +
-        "qGSIb3DQEBAQUAA4GNADCBiQKBgQCuF8mub5cgUYZytrRjJ5Rhc2fgazGxWIj6EIKzeSpo" +
-        "FwScItRX9KxnTIXEBTguBk7eQUsbN8yu49/Mlq45EAnemyZRBWzLFLYLPCco7pyTsWm7Ps" +
-        "2FAGJ3vE9pC9xaZC+KrwF3Ho+DZNDwhj5InXTP8pChAIPfB8/7V/2mk0lN0wIDAQABo2Mw" +
-        "YTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAWBgNVHSAEDzANMAsGCWCGSA" +
-        "FlAwEwATARBgNVHQ4ECgQI4mI6Ojs0onswEwYDVR0jBAwwCoAIq5rr+cLnVI8wDQYJKoZI" +
-        "hvcNAQEFBQADgYEAMVGzU6f4YOHpHla+YuGCjHOUZYrA9J25G3UFFoPr2JZEG+Fb5hRQUh" +
-        "4S1qUQKXn6dpVua+qTJDk3Tg2N8OdIHG/gy0hvYHsxhLCSDQBsfPN7p3FClM7r/VHOqgAN" +
-        "vzT+KYvxx6gwn6O+n7ERkrBIfkyrGFhnmjx3+VOCc9P4SDE=";
-    public static final String Intermediate_CRL_CP_03_01_crl = 
-        "MIIBSzCBtQIBATANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS" +
-        "5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNV" +
-        "BAMTDENBMS1DUC4wMy4wMRcNOTkwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMTAwWqAjMCEwCg" +
-        "YDVR0UBAMCAQEwEwYDVR0jBAwwCoAI4mI6Ojs0onswDQYJKoZIhvcNAQEFBQADgYEAfwYf" +
-        "4kAG4srB2VxWimJs1HwXTaPDooellQclZ5hP/EluT7oe03+ReFef6uXbHt/xRdeaoQhJGy" +
-        "SP8dWf6UIbL82oaSYqChIvAZD6zTMavEgSET0PlUsK1aEMTpMEtKPvedFSOTNBaMNvMzSW" +
-        "t5xwurn63qyXTOxHf4m2L4w8+i0=";
-    public static final String End_Certificate_CP_03_01_crt = 
-        "MIIChjCCAe+gAwIBAgIBEjANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1" +
-        "UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3Rpbmcx" +
-        "FTATBgNVBAMTDENBMS1DUC4wMy4wMTAeFw05ODAxMDExMjAxMDBaFw00ODAxMDExMjAxMD" +
-        "BaMGAxCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9VLlMuIEdvdmVybm1lbnQxDDAKBgNVBAsT" +
-        "A0RvRDEQMA4GA1UECxMHVGVzdGluZzEXMBUGA1UEAxMOVXNlcjEtQ1AuMDMuMDEwgZ8wDQ" +
-        "YJKoZIhvcNAQEBBQADgY0AMIGJAoGBAJ/ALaZ+MdNxKDH49+7jUm+17DII5QQEfjk8IaEU" +
-        "syApOhsByOG06HPItiBEnnfDDxU5kjsZDtw/9LlouBocNXAJt+ZmL3QYyOgeH4SQ4f21rw" +
-        "7j8fw57gUkP5oWhEc0loXr/hB92hoKbsBoRpv8F1zPZcPNLUnyUzqLH5+CeIibAgMBAAGj" +
-        "UjBQMA4GA1UdDwEB/wQEAwIF4DAWBgNVHSAEDzANMAsGCWCGSAFlAwEwATARBgNVHQ4ECg" +
-        "QI822isg/wPCowEwYDVR0jBAwwCoAI4mI6Ojs0onswDQYJKoZIhvcNAQEFBQADgYEAilIn" +
-        "OD0iQrLrHRkO4zr9S9VXAJXJV3l9wfbLBweXM3q/zt4HGKBw4Wq1Yn+AfDxXrBtJA5hP5e" +
-        "d7CDd4eM93yeKozdZCLNZfUM8sJ2/MRh07tvwJ19e2STklED8b/ndmr5my8H8jjJDaaYww" +
-        "qTSnXqpcqsUsj+kV4Mk0DvVWT3w=";
-    public static final String[] TEST_9_DATA = new String[] {
-        Intermediate_Certificate_CP_03_01_crt,
-        Intermediate_CRL_CP_03_01_crl,
-        End_Certificate_CP_03_01_crt
-    };
-
-    /*  
-     *  test10
-     *  
-     */ 
-
-    public static final String Intermediate_Certificate_CP_03_02_crt = 
-        "MIIClTCCAf6gAwIBAgIBEzANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1" +
-        "UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb0QxEDAOBgNVBAsTB1Rlc3Rpbmcx" +
-        "FTATBgNVBAMTDFRydXN0IEFuY2hvcjAeFw05ODAxMDExMjAxMDBaFw00ODAxMDExMjAxMD" +
-        "BaMF4xCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9VLlMuIEdvdmVybm1lbnQxDDAKBgNVBAsT" +
-        "A0RvZDEQMA4GA1UECxMHVGVzdGluZzEVMBMGA1UEAxMMQ0ExLUNQLjAzLjAyMIGfMA0GCS" +
-        "qGSIb3DQEBAQUAA4GNADCBiQKBgQC4AbP8gDUUcIa8w4pEsGgbYH2sz08QMUXd4xwx691i" +
-        "9QCcyWSovQO4Jozeb9JwtyN2+f3T+JqZL/gwUHuLO2IEXpzE2C8FzQg6Ma+TiSrlvGJfec" +
-        "TlSooFmEtD3Xh6I6N5PM1fpyyY2sOOhARN5S6qR9BOuxkBAqrAT0fgqD2TswIDAQABo2Mw" +
-        "YTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAWBgNVHSAEDzANMAsGCWCGSA" +
-        "FlAwEwATARBgNVHQ4ECgQI97nJCqq6+kIwEwYDVR0jBAwwCoAIq5rr+cLnVI8wDQYJKoZI" +
-        "hvcNAQEFBQADgYEAWwpfh9oOOvj9xHS0zcczaUIHTkpjgk09I+pERlu0Z0+rHvpZGge4Ov" +
-        "NDFtMc4TgthGcydbIwiKogjtGBM2/sNHIO2jcpNeOtNKLxrzD4Y0Ve164kXBu9Mmsxx4sG" +
-        "7XUXZWgiOPfu/HmyPVdzbIReJdQO515SNx7JdgVyUkyhBxM=";
-    public static final String Intermediate_CRL_CP_03_02_crl = 
-        "MIIBSzCBtQIBATANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS" +
-        "5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNV" +
-        "BAMTDENBMS1DUC4wMy4wMhcNOTkwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMTAwWqAjMCEwCg" +
-        "YDVR0UBAMCAQEwEwYDVR0jBAwwCoAI97nJCqq6+kIwDQYJKoZIhvcNAQEFBQADgYEAC9Hv" +
-        "NevV6/Oz3wcgEbDgZYRKJRdr4OW4Es7R4ahjz3sH6GXZ1HiEjx2+frmp8LMshQ4D+hpjRk" +
-        "drSPko1M4a/fQCYxbonZ0xjpYw067dwLmr56+GPJAxkzcSmFKXx+ejyQpG+9+qCR+zm98V" +
-        "lop6besAaGUjZKnYShIQOfNzDZk=";
-    public static final String End_Certificate_CP_03_02_crt = 
-        "MIIChjCCAe+gAwIBAgIBFDANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1" +
-        "UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3Rpbmcx" +
-        "FTATBgNVBAMTDENBMS1DUC4wMy4wMjAeFw05ODAxMDExMjAxMDBaFw0wMDAxMDExMjAxMD" +
-        "BaMGAxCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9VLlMuIEdvdmVybm1lbnQxDDAKBgNVBAsT" +
-        "A0RvRDEQMA4GA1UECxMHVGVzdGluZzEXMBUGA1UEAxMOVXNlcjEtQ1AuMDMuMDIwgZ8wDQ" +
-        "YJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMJMiW+G4bgoRaYz2OUu/+PQ/yp4JgFOB3Vegf5/" +
-        "vIrF4gsnoQxOCCsO5JTLrbS5fi3COjvM5w9/SZpNHtSfyWb9afmx4DdrT1bNjma7I6PCid" +
-        "yxMzX4iTLeaMRnqBk4A+/0Wf2+4VzCqr8aViIiQ7u2JfZiTQ4dZxDoUW6G8lrbAgMBAAGj" +
-        "UjBQMA4GA1UdDwEB/wQEAwIF4DAWBgNVHSAEDzANMAsGCWCGSAFlAwEwATARBgNVHQ4ECg" +
-        "QIEjny2GzFXGQwEwYDVR0jBAwwCoAI97nJCqq6+kIwDQYJKoZIhvcNAQEFBQADgYEAJw3T" +
-        "3aL3pYbZhswgshOvJ9Y1qv65R6rClSxB5lqBw6+Qki4ZpW57NK8LwaGS03XzDUPaDi4/9R" +
-        "hGCHpP24fIskS4n4jNZgKpGtt6VEVorUH7cOLNCw2cuwMlKbkyZnNdx2JqTMMlHzNJ3cmy" +
-        "aX3F70IY0OZbwCKdUo/uMVC6hss=";
-    public static final String[] TEST_10_DATA = new String[] {
-        Intermediate_Certificate_CP_03_02_crt,
-        Intermediate_CRL_CP_03_02_crl,
-        End_Certificate_CP_03_02_crt
-    };
-
-    /*  
-     *  test11
-     *  
-     */ 
-
-    public static final String Intermediate_Certificate_CP_03_03_crt = 
-        "MIIClTCCAf6gAwIBAgIBFTANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1" +
-        "UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb0QxEDAOBgNVBAsTB1Rlc3Rpbmcx" +
-        "FTATBgNVBAMTDFRydXN0IEFuY2hvcjAeFw05ODAxMDExMjAxMDBaFw00ODAxMDExMjAxMD" +
-        "BaMF4xCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9VLlMuIEdvdmVybm1lbnQxDDAKBgNVBAsT" +
-        "A0RvZDEQMA4GA1UECxMHVGVzdGluZzEVMBMGA1UEAxMMQ0ExLUNQLjAzLjAzMIGfMA0GCS" +
-        "qGSIb3DQEBAQUAA4GNADCBiQKBgQCjLYKGKEMJgC/r0NH7vubQZ5qPEFEEN6QdLUWWqf/O" +
-        "Yqo9hboQq6S8dFHp3DVR5x/4NOdNRjsTABbXsnz8U+L7+4CorhDhXj29weGMYIIfJ3XSIb" +
-        "T7sE/GOPmXeGhrTv2zucI1j80sN5nTEoiGFm10LQqAgoyV46BxDltf3/D7wwIDAQABo2Mw" +
-        "YTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAWBgNVHSAEDzANMAsGCWCGSA" +
-        "FlAwEwATARBgNVHQ4ECgQIhCIOyzfScpAwEwYDVR0jBAwwCoAIq5rr+cLnVI8wDQYJKoZI" +
-        "hvcNAQEFBQADgYEAA18kQijoJebmTQS7n/q/fQx2iblOJaJAWQLHeGCCGqKxCjUpOxuD+y" +
-        "xMspmTKdQqEkqQ5vpHdFYQ5MYuecqAdp6woWUNQGVd4HHPmHsAW3Oppwb0yLggYs8IVHjm" +
-        "dNO1pYb+YYciCKBtX8D1OnedIRcrQmDMJUjbfmAEv/4b0EM=";
-    public static final String Intermediate_CRL_CP_03_03_crl = 
-        "MIIBSzCBtQIBATANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS" +
-        "5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNV" +
-        "BAMTDENBMS1DUC4wMy4wMxcNOTkwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMTAwWqAjMCEwCg" +
-        "YDVR0UBAMCAQEwEwYDVR0jBAwwCoAIhCIOyzfScpAwDQYJKoZIhvcNAQEFBQADgYEAk34j" +
-        "SxMr8p1h1qJWlfoh4er9pu1AkkHujovan6Ctx89VwFdOS5Kw82OCvD+nmJAHrFuncNlClf" +
-        "51G8FCEAFLhMNwic4WAxrBX15hcUTaWk8Wj00dfUFwjG8/Kv3QUCDBN8f3KC8/oBeORRX9" +
-        "dHW5ei2IUKuD1ITCeIoyRDBxQIg=";
-    public static final String End_Certificate_CP_03_03_crt = 
-        "MIIChjCCAe+gAwIBAgIBFjANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1" +
-        "UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3Rpbmcx" +
-        "FTATBgNVBAMTDENBMS1DUC4wMy4wMzAeFw05ODAxMDExMjAxMDBaFw01MDA3MDExMjAxMD" +
-        "BaMGAxCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9VLlMuIEdvdmVybm1lbnQxDDAKBgNVBAsT" +
-        "A0RvRDEQMA4GA1UECxMHVGVzdGluZzEXMBUGA1UEAxMOVXNlcjEtQ1AuMDMuMDMwgZ8wDQ" +
-        "YJKoZIhvcNAQEBBQADgY0AMIGJAoGBALSw1Ey7kzFzzjMS4oTSrZH/95NMHLxtUSaVGMCy" +
-        "0q2iLfGZ79eTS9megQUranYlIuK411yvFtskbFKf0idMKBtM8nX3Rxubm5EnbnpgvNrBEg" +
-        "0FbOPqpSaR+8pxZ6lweB45tkzLU3OZeAZSpGOY1UvT/htn6Ae8JQAVajSvYyfNAgMBAAGj" +
-        "UjBQMA4GA1UdDwEB/wQEAwIF4DAWBgNVHSAEDzANMAsGCWCGSAFlAwEwATARBgNVHQ4ECg" +
-        "QIF014kOHikvcwEwYDVR0jBAwwCoAIhCIOyzfScpAwDQYJKoZIhvcNAQEFBQADgYEAdLMM" +
-        "zGPPvBLgPbhn2tba/7HiaZaayHIxTXmpW0KAhP+8hwapOitrtLGPwqVtxQ3GoSMZJPMDCV" +
-        "WsrT3OZm27G6ytqqNZ2ZO49UC7WwQ49TVlN79Ui9RZIBnRzlMIDNKsyuohfSRhFZTkWdoH" +
-        "/y8ulY8k4xBThV8e8IRgtYj3nhc=";
-    public static final String[] TEST_11_DATA = new String[] {
-        Intermediate_Certificate_CP_03_03_crt,
-        Intermediate_CRL_CP_03_03_crl,
-        End_Certificate_CP_03_03_crt
-    };
-
-    /*  
-     *  test12
-     *  
-     */ 
-
-    public static final String Intermediate_Certificate_CP_03_04_crt = 
-        "MIIClTCCAf6gAwIBAgIBFzANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1" +
-        "UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb0QxEDAOBgNVBAsTB1Rlc3Rpbmcx" +
-        "FTATBgNVBAMTDFRydXN0IEFuY2hvcjAeFw05ODAxMDExMjAxMDBaFw00ODAxMDExMjAxMD" +
-        "BaMF4xCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9VLlMuIEdvdmVybm1lbnQxDDAKBgNVBAsT" +
-        "A0RvZDEQMA4GA1UECxMHVGVzdGluZzEVMBMGA1UEAxMMQ0ExLUNQLjAzLjA0MIGfMA0GCS" +
-        "qGSIb3DQEBAQUAA4GNADCBiQKBgQDbUii3czeUQ2zNlxvrhnJ0LcBGxCDHFr3xx+plDg3f" +
-        "uasDKCY/VjCLEfQ5a2oqcovvGKsd2CPXbCFJtimW1R7Dvt+a0y95fppsdseorYDikiBlOj" +
-        "ja6LR3Cz3bslYc133C+W/MKHMJ0tdvtTk+SJrq7lqs+iv/b/xHC3k/gDjIswIDAQABo2Mw" +
-        "YTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAWBgNVHSAEDzANMAsGCWCGSA" +
-        "FlAwEwATARBgNVHQ4ECgQIFNw3o1kc4XkwEwYDVR0jBAwwCoAIq5rr+cLnVI8wDQYJKoZI" +
-        "hvcNAQEFBQADgYEAn/pr7/noYyjXSKEe/eLk3l4Rb6PEhNAnzySmxGkjIjWKAgh5IVYSGV" +
-        "KFO/FaNOiYkRFHwXZFNj71q7gbM+HwALurN0Mr/MUA1TSpPy7YhFL0SWq3C3XsC/dVJ50b" +
-        "HmTW+dGcxboX0h9HeKFxp3VyOY/dUut2oc+s/TnmqQII1CU=";
-    public static final String Intermediate_CRL_CP_03_04_crl = 
-        "MIIBSzCBtQIBATANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS" +
-        "5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNV" +
-        "BAMTDENBMS1DUC4wMy4wNBcNOTkwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMTAwWqAjMCEwCg" +
-        "YDVR0UBAMCAQEwEwYDVR0jBAwwCoAIFNw3o1kc4XkwDQYJKoZIhvcNAQEFBQADgYEAMoJ5" +
-        "jGE1AxxfluixG8Sk7H4W2rqSEkQyNHfnlKSMbh9KZA3evI8HGKGGfkbBNoe4/HauZ4NVFw" +
-        "FXgllCp+TI8Qd+HafFoDv6ff1K7T86p6r7tE3AEM1XmbnfohP3/ivpIzustv/f2rqjxILK" +
-        "Ldvrth2/OlNygwY+D54lcWH1DX8=";
-    public static final String End_Certificate_CP_03_04_crt = 
-        "MIICiDCCAfGgAwIBAgIBGDANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1" +
-        "UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3Rpbmcx" +
-        "FTATBgNVBAMTDENBMS1DUC4wMy4wNDAgFw05ODAxMDExMjAxMDBaGA8yMDUwMDEwMTEyMD" +
-        "EwMFowYDELMAkGA1UEBhMCVVMxGDAWBgNVBAoTD1UuUy4gR292ZXJubWVudDEMMAoGA1UE" +
-        "CxMDRG9EMRAwDgYDVQQLEwdUZXN0aW5nMRcwFQYDVQQDEw5Vc2VyMS1DUC4wMy4wNDCBnz" +
-        "ANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAuSL9tB1JW6JPUO2Xw6TMYkPX41lru3EPyYko" +
-        "YgXy4giy6LGoqbgtskHehD22v3rfWjqOd9iV2PBio/vYE4zEz0H0n84dpnBvog6A1AlE19" +
-        "PkQ1txjzIA52FQIRwRfZ38LaulQEfJ0a+fiRHQiM960O3YvHXV+GEbNcw4jo8b0sUCAwEA" +
-        "AaNSMFAwDgYDVR0PAQH/BAQDAgXgMBYGA1UdIAQPMA0wCwYJYIZIAWUDATABMBEGA1UdDg" +
-        "QKBAh9/WgM+UT6bTATBgNVHSMEDDAKgAgU3DejWRzheTANBgkqhkiG9w0BAQUFAAOBgQDR" +
-        "I6PKUGg876/fSljtqxXCR4CoGAAurNFOcM4EWeoc6ZvuDOi3P7rNYiYAXXlmp7epOAgvZP" +
-        "EV4vS16ODaJO6qIMR1YsaGEPo0ecT2pEStvP37X6pb5TdyjyKYF3586IN6TJdFMFsW/Lqg" +
-        "tucl9bGlWmfTVwxTexq6+D8diK48KQ==";
-    public static final String[] TEST_12_DATA = new String[] {
-        Intermediate_Certificate_CP_03_04_crt,
-        Intermediate_CRL_CP_03_04_crl,
-        End_Certificate_CP_03_04_crt
-    };
-
-    /*  
-     *  test13
-     *  
-     */ 
-
-    public static final String Intermediate_Certificate_CP_04_01_crt = 
-        "MIIClTCCAf6gAwIBAgIBGTANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1" +
-        "UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb0QxEDAOBgNVBAsTB1Rlc3Rpbmcx" +
-        "FTATBgNVBAMTDFRydXN0IEFuY2hvcjAeFw05ODAxMDExMjAxMDBaFw00ODAxMDExMjAxMD" +
-        "BaMF4xCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9VLlMuIEdvdmVybm1lbnQxDDAKBgNVBAsT" +
-        "A0RvZDEQMA4GA1UECxMHVGVzdGluZzEVMBMGA1UEAxMMQ0ExLUNQLjA0LjAxMIGfMA0GCS" +
-        "qGSIb3DQEBAQUAA4GNADCBiQKBgQC5UJ+KMj8tAmzr3OGYL2gSFcNTf8ik+ZVxlaPVGHyS" +
-        "KjYQBAEbefhfg5Ps2aIuqBwYkbtFXuHif5GEhgObA4InCyESeRjYLGcVMqwSZzAOFAR0dP" +
-        "1LzgzQs3ZgG9JX5MO5wEZ8IMnVN4Otu4XIlWSgIpUNS2vyet8Zi7t9fX+JewIDAQABo2Mw" +
-        "YTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAWBgNVHSAEDzANMAsGCWCGSA" +
-        "FlAwEwATARBgNVHQ4ECgQIOZvfph4Uu9YwEwYDVR0jBAwwCoAIq5rr+cLnVI8wDQYJKoZI" +
-        "hvcNAQEFBQADgYEAXMyscmGpKSLG3hQltMQLegy0+g5wzgOrbFOWxZmiVNR+zSsHDD3UAH" +
-        "H4SyTozlooC0jAY4yAhZ5RX6SSJKx9fHsOZD9ldCmst14qLk3pkI+M0QiPBZkVTx5/7dR2" +
-        "wGkuNKSVWH6woOq7BbEzpO7xMlrUr6tgHt4Dc6Evt1pVZls=";
-    public static final String Intermediate_CRL_CP_04_01_crl = 
-        "MIIBSzCBtQIBATANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS" +
-        "5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNV" +
-        "BAMTDENBMS1DUC4wNC4wMRcNOTkwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMTAwWqAjMCEwCg" +
-        "YDVR0UBAMCAQEwEwYDVR0jBAwwCoAIOZvfph4Uu9YwDQYJKoZIhvcNAQEFBQADgYEAe79z" +
-        "iEUgP/mvouJ9ufit1y4SjnHQWik75W65eGn/XGArRrBqJ8jZVJE4/rpDBbzm2V0hQoWU8z" +
-        "zchZFlesUyqQZ9KUlT0YGR0YPcNw/V+58RonWWfmU3M2DvWDrXgCOXPm61+AYq4+kTowsG" +
-        "0stmeML6NxjDzWpfAgI/MpXqe80=";
-    public static final String End_Certificate_CP_04_01_crt = 
-        "MIIChjCCAe+gAwIBAgIBGjANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1" +
-        "UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3Rpbmcx" +
-        "FTATBgNVBAMTDENBMS1DUC45OS45OTAeFw05ODAxMDExMjAxMDBaFw00ODAxMDExMjAxMD" +
-        "BaMGAxCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9VLlMuIEdvdmVybm1lbnQxDDAKBgNVBAsT" +
-        "A0RvRDEQMA4GA1UECxMHVGVzdGluZzEXMBUGA1UEAxMOVXNlcjEtQ1AuMDQuMDEwgZ8wDQ" +
-        "YJKoZIhvcNAQEBBQADgY0AMIGJAoGBAPiAZKXPjK8jvaNj34VynyKPK7dQtFysBPKFW5Y1" +
-        "Bc+OMsyd2pPpQoJYcQTMMomlAqoBvSXUJCMNly/BxVuvn7l6I9crtx6PjBBUlEzdcsscaa" +
-        "EaHuCCVl+Msnr66cSV3GqVGAhujun81+lyurcTEog3ftsohwbQnfA76qNU/N3/AgMBAAGj" +
-        "UjBQMA4GA1UdDwEB/wQEAwIF4DAWBgNVHSAEDzANMAsGCWCGSAFlAwEwATARBgNVHQ4ECg" +
-        "QIJZPDbf2xNv8wEwYDVR0jBAwwCoAIOZvfph4Uu9YwDQYJKoZIhvcNAQEFBQADgYEAZf4L" +
-        "1RDHDXwwA2CgcIhM4CAfZ72CR2zOan0at38VVFB3u9vs4VLwFcrOQCIjDbdLijc0XWLima" +
-        "4vCD1qrsv6Hk5+6113HfFNmD8mp6X5jAwoNPa/I4kmFOA8iIm4TTk7M75vQyCQTPG0VzbU" +
-        "Nu3uwTbXKm5ME9C5MFMf7z347CM=";
-    public static final String[] TEST_13_DATA = new String[] {
-        Intermediate_Certificate_CP_04_01_crt,
-        Intermediate_CRL_CP_04_01_crl,
-        End_Certificate_CP_04_01_crt
-    };
-
-    /*  
-     *  test14
-     *  
-     */ 
-
-    public static final String Intermediate_Certificate_CP_04_02_crt = 
-        "MIIClTCCAf6gAwIBAgIBGzANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1" +
-        "UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb0QxEDAOBgNVBAsTB1Rlc3Rpbmcx" +
-        "FTATBgNVBAMTDFRydXN0IEFuY2hvcjAeFw05ODAxMDExMjAxMDBaFw00ODAxMDExMjAxMD" +
-        "BaMF4xCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9VLlMuIEdvdmVybm1lbnQxDDAKBgNVBAsT" +
-        "A0RvRDEQMA4GA1UECxMHVGVzdGluZzEVMBMGA1UEAxMMQ0ExLUNQLjA0LjAyMIGfMA0GCS" +
-        "qGSIb3DQEBAQUAA4GNADCBiQKBgQCteErspc5ekSOel/wmjn/XQ0HUy4XzxB5Zj0nGn9FD" +
-        "PbjF2LERCHOn5aBnIMHYhyr7PDynwbvSx2egzGC6wGe9Zrri1MteirQ9Ppw7062IIleloy" +
-        "UAiuwvD+s0npKsvboarQsCMfOB1hOB1tGG1bjXP6B5B187SZXuR3KawggyJwIDAQABo2Mw" +
-        "YTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAWBgNVHSAEDzANMAsGCWCGSA" +
-        "FlAwEwATARBgNVHQ4ECgQIUjnGp96itUMwEwYDVR0jBAwwCoAIq5rr+cLnVI8wDQYJKoZI" +
-        "hvcNAQEFBQADgYEAR6fmN+9p5AWy/asEAiVBnbY9q7EQXyB8WuZK9FtFmupe3hlfcTq84E" +
-        "A+TGvXOlNr05/1iLRv82GsWXDif7DlGVPN8CS1+0kb5Ve8Pmv2ziiWVREqWx916ioPjDRp" +
-        "wvdGcCNC26+fyvv5TrP8uzojurl1ZlVRRqi2sIbopVX5r8w=";
-    public static final String Intermediate_CRL_CP_04_02_crl = 
-        "MIIBSzCBtQIBATANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS" +
-        "5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb0QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNV" +
-        "BAMTDENBMS1DUC4wNC4wMhcNOTkwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMTAwWqAjMCEwCg" +
-        "YDVR0UBAMCAQEwEwYDVR0jBAwwCoAIUjnGp96itUMwDQYJKoZIhvcNAQEFBQADgYEAZkXJ" +
-        "aJG4QDE02wFURwaxWuv2VyD7m+N/2B0/9KR+6UKVpsMd2XHq+G3SlFOa6dA/fHUdhtUs2D" +
-        "gpx3SfQYbcgKFrryZHqJDK230eP3F41S9g5XJTRaNR5iZvxvh4bmSf4l6a5MXsKEoBoJoT" +
-        "j8cU4qg6j7Xk4NpIR1JbWiSIYQc=";
-    public static final String End_Certificate_CP_04_02_crt = 
-        "MIIChjCCAe+gAwIBAgIBHDANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1" +
-        "UEChMPVS5TLiBHb3Zlcm5tZW50MRAwDgYDVQQLEwdUZXN0aW5nMQwwCgYDVQQLEwNEb0Qx" +
-        "FTATBgNVBAMTDENBMS1DUC4wNC4wMjAeFw05ODAxMDExMjAxMDBaFw00ODAxMDExMjAxMD" +
-        "BaMGAxCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9VLlMuIEdvdmVybm1lbnQxDDAKBgNVBAsT" +
-        "A0RvRDEQMA4GA1UECxMHVGVzdGluZzEXMBUGA1UEAxMOVXNlcjEtQ1AuMDQuMDIwgZ8wDQ" +
-        "YJKoZIhvcNAQEBBQADgY0AMIGJAoGBALM7mfq+hpLfvQdqZUJfIx/2gFcgHS2AsgZn0An+" +
-        "Yn61WtG8K2+lt/a8aypa/q+J93RVkRYKWKFQcJHiRgx7DMlXElVnfQbSFuLX46ng4hqmQL" +
-        "sSOKmXDld2BlyMZ41B3rfdhJT8P12RMR6uAwvc9CH3b0UTcsc498Kj+JeaRbzxAgMBAAGj" +
-        "UjBQMA4GA1UdDwEB/wQEAwIF4DAWBgNVHSAEDzANMAsGCWCGSAFlAwEwATARBgNVHQ4ECg" +
-        "QIo7S64S6t5nswEwYDVR0jBAwwCoAIUjnGp96itUMwDQYJKoZIhvcNAQEFBQADgYEApNT5" +
-        "Y+9Jc28m5Qwjm+/8SKk83iCPnIW3BsAvQUB9Wmd1+kMZvqLySQjm1tBBbcGYuSERMJ2Et5" +
-        "eoTdL9B6EG2CZYnPqu1vk0TVugRxs7IJm4h5z4MCInf2g1KTt0AMEasQW6ZTj7DIkkU48Z" +
-        "EKLPoBGXfD9t9Y9cmdj1e1RQbog=";
-    public static final String[] TEST_14_DATA = new String[] {
-        Intermediate_Certificate_CP_04_02_crt,
-        Intermediate_CRL_CP_04_02_crl,
-        End_Certificate_CP_04_02_crt
-    };
-
-    /*  
-     *  test15
-     *  
-     */ 
-
-    public static final String Intermediate_Certificate_CP_04_03_crt = 
-        "MIICmzCCAgSgAwIBAgIBHTANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1" +
-        "UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb0QxEDAOBgNVBAsTB1Rlc3Rpbmcx" +
-        "FTATBgNVBAMTDFRydXN0IEFuY2hvcjAeFw05ODAxMDExMjAxMDBaFw00ODAxMDExMjAxMD" +
-        "BaMGQxCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9VLlMuIEdvdmVybm1lbnQxDDAKBgNVBAsT" +
-        "A0RvZDEQMA4GA1UECxMHVGVzdGluZzEbMBkGA1UEAxMSICBDQTEgLSAgIENQLjA0LjAzMI" +
-        "GfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQD11QBcw4P2rTUfPmbVNYqdo0AMmcB3Yxsx" +
-        "Iz5me/S1I2PJLtRh9KP7lUV20SMEFsFKtE1C+9O7ODtOUCJA/6ECeXbyj20SbG1E2oQrZe" +
-        "gkcn7IQDUgnuedzdFj4kTevok6ao9hycg+qeZrL6oeBD2XQCd9nqMmzhihNu/QOSnp5wID" +
-        "AQABo2MwYTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAWBgNVHSAEDzANMA" +
-        "sGCWCGSAFlAwEwATARBgNVHQ4ECgQInx+ELo31rJMwEwYDVR0jBAwwCoAIq5rr+cLnVI8w" +
-        "DQYJKoZIhvcNAQEFBQADgYEAriYMoRDpSPI4HWrxN1rjqWIzggz8p1wpbEFgK5o/Fi2KT3" +
-        "jCd6bfCcIFDpoXNqlsc+dvzc4XB1Eg/Qbcror8HP8LSxrbFw/y7VhC+wCaDCmhcqQn3rp/" +
-        "WaOWnR7/H7HlKM9m1u7MBtwlxHINnLKwPHIA1XwmAnItAXIL2yHRJhU=";
-    public static final String Intermediate_CRL_CP_04_03_crl = 
-        "MIIBUTCBuwIBATANBgkqhkiG9w0BAQUFADBkMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS" +
-        "5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxGzAZBgNV" +
-        "BAMTEiAgQ0ExIC0gICBDUC4wNC4wMxcNOTkwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMTAwWq" +
-        "AjMCEwCgYDVR0UBAMCAQEwEwYDVR0jBAwwCoAInx+ELo31rJMwDQYJKoZIhvcNAQEFBQAD" +
-        "gYEAvJgOX6tewnRbC9Ch+Fe4KjkB9IAhe5anQKGfnDHuLfga6JEjOzyfhonWZeppJwvYpl" +
-        "1rZbsKICNphMDkd/eaWnn8Q9w02ah4kzIb0LuzrNBrxpFv9AAidfGU2VeF0gRi02jtAZsh" +
-        "gUNbrdC+ovA8mAsBigy+HMzCi61+wrumwvo=";
-    public static final String End_Certificate_CP_04_03_crt = 
-        "MIICijCCAfOgAwIBAgIBHjANBgkqhkiG9w0BAQUFADBiMQswCQYDVQQGEwJVUzEYMBYGA1" +
-        "UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3Rpbmcx" +
-        "GTAXBgNVBAMTEGNhMSAtIENQLjA0LjAzICAwHhcNOTgwMTAxMTIwMTAwWhcNNDgwMTAxMT" +
-        "IwMTAwWjBgMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYD" +
-        "VQQLEwNEb0QxEDAOBgNVBAsTB1Rlc3RpbmcxFzAVBgNVBAMTDlVzZXIxLUNQLjA0LjAzMI" +
-        "GfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC2Rd0VKnTIrME7hzpnpIPGXGXZCjpf5lSO" +
-        "19zvB3WdZumLGdwUBXpIQTrl5teYgL62PpOwNC93URZDEUt+rqoqvs8E7MpF3IulStp2+H" +
-        "/xa6Ihf4OmkgKjpHNTWOIFXeRJ4sVgWuH6cqQ+6GL+0fa1sed1crsEgTTAGYNhFi6ebwID" +
-        "AQABo1IwUDAOBgNVHQ8BAf8EBAMCBeAwFgYDVR0gBA8wDTALBglghkgBZQMBMAEwEQYDVR" +
-        "0OBAoECBNwCFdDgPCqMBMGA1UdIwQMMAqACJ8fhC6N9ayTMA0GCSqGSIb3DQEBBQUAA4GB" +
-        "ABAjSPg794yiVz9RqdNxic8TGnApNrZui/vwr1U8ZkETZfx8W1fWgQ0z7KjryML5IOmvps" +
-        "zycM7by6jb2kMmxI1SQCwjiNQ1fb1osrNAj2bRfpp2YgjjbHx1XkddommtVc0V8kvyQBcb" +
-        "7NdxfbwKr8AtpiWTWIajc2uqUlELsLzr";
-    public static final String[] TEST_15_DATA = new String[] {
-        Intermediate_Certificate_CP_04_03_crt,
-        Intermediate_CRL_CP_04_03_crl,
-        End_Certificate_CP_04_03_crt
-    };
-
-    /*  
-     *  test16
-     *  
-     */ 
-
-    public static final String Intermediate_Certificate_CP_04_04_crt = 
-        "MIIClzCCAgCgAwIBAgIBHzANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1" +
-        "UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb0QxEDAOBgNVBAsTB1Rlc3Rpbmcx" +
-        "FTATBgNVBAMTDFRydXN0IEFuY2hvcjAeFw05ODAxMDExMjAxMDBaFw00ODAxMDExMjAxMD" +
-        "BaMGAxCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9VLlMuIEdvdmVybm1lbnQxDDAKBgNVBAsT" +
-        "A0RvZDEQMA4GA1UECxMHVGVzdGluZzEXMBUGA1UEAxMOQ0ExIC0gQ1AuMDQuMDQwgZ8wDQ" +
-        "YJKoZIhvcNAQEBBQADgY0AMIGJAoGBAOFf5hr4R8IqTp53qQSiBEjOFQ3Q3ICcafl+FLzm" +
-        "K3xIFqERjyXARsTM4gDQ9yntFeNp2TiIi98xBrz7D8TlrbTAmxO/PUfAQ68tXpz9Id/XrU" +
-        "WeAKxMZULPL9nPFcGQoh0qq3JKpFRSb3Iobryfysblm7cCDDCJOI7uK14XZtTFAgMBAAGj" +
-        "YzBhMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMBYGA1UdIAQPMA0wCwYJYI" +
-        "ZIAWUDATABMBEGA1UdDgQKBAjior7qCuLBljATBgNVHSMEDDAKgAirmuv5wudUjzANBgkq" +
-        "hkiG9w0BAQUFAAOBgQBhh55gTy5htqjxW1Ch2hRrRikhBH7LJz1PmDuzwiIOtnWL+EiQOY" +
-        "T6h3NV1j8Kn5S4KhUOrhnvrPXRi22HdqRzEPl7y/wXm6G0XcgYlyy2ofZKdYVWCVStKAMW" +
-        "5SwV2wC5RPK2KphdhnlEqss6QVRUsliDDjnf9Saiey9nzJAfNw==";
-    public static final String Intermediate_CRL_CP_04_04_crl = 
-        "MIIBTTCBtwIBATANBgkqhkiG9w0BAQUFADBgMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS" +
-        "5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFzAVBgNV" +
-        "BAMTDkNBMSAtIENQLjA0LjA0Fw05OTAxMDExMjAxMDBaFw00ODAxMDExMjAxMDBaoCMwIT" +
-        "AKBgNVHRQEAwIBATATBgNVHSMEDDAKgAjior7qCuLBljANBgkqhkiG9w0BAQUFAAOBgQBI" +
-        "VlXD5FnIiO8tavLJ8qo/qRhbBNgUbFBdAgAY6yVnFNP6YN4qPineYPN6NV1XdqNDrZh2Nz" +
-        "GHzX3YDo1Uv9yABVR0NvXCaMIW5/raqZp/on6bPuQLgJe9UisOPKunzehTm/NmO1RW9dwU" +
-        "37UzC0XnVHyVipDVh07DrTKBUtQJQw==";
-    public static final String End_Certificate_CP_04_04_crt = 
-        "MIICjTCCAfagAwIBAgIBIDANBgkqhkiG9w0BAQUFADBlMQswCQYDVQQGEwJVUzEZMBcGA1" +
-        "UEChMQVS5TLiAgR292ZXJubWVudDEMMAoGA1UECxMDRG9EMRAwDgYDVQQLEwdUZXN0aW5n" +
-        "MRswGQYDVQQDExJDQTEgICAgLSAgQ1AuMDQuMDQwHhcNOTgwMTAxMTIwMTAwWhcNNDgwMT" +
-        "AxMTIwMTAwWjBgMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS5TLiBHb3Zlcm5tZW50MQww" +
-        "CgYDVQQLEwNEb0QxEDAOBgNVBAsTB1Rlc3RpbmcxFzAVBgNVBAMTDlVzZXIxLUNQLjA0Lj" +
-        "A0MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCegy6qOnM14CS7+enBElgh2DLtF5bn" +
-        "ah0yfA18/hbqnmUaWOWJQllyXa8QFawnvdXOOEXJm1ErIm3rDYihkbUTP+ybOBH9dprWtl" +
-        "1cSGL9CkoxwzkJRLQTu5xG72EhET3S3kwqZsmYbgy4MduGKv9VGFbv75Wr17Vo9K4Lz6QK" +
-        "vQIDAQABo1IwUDAOBgNVHQ8BAf8EBAMCBeAwFgYDVR0gBA8wDTALBglghkgBZQMBMAEwEQ" +
-        "YDVR0OBAoECEc4b3BP059HMBMGA1UdIwQMMAqACOKivuoK4sGWMA0GCSqGSIb3DQEBBQUA" +
-        "A4GBADj73jXpPLev5crwZIoXCJd/nXXp1fJzEEbByWggsR9cFHN4wnp7N6gpIxQbLQwjmo" +
-        "cLPC1pHQ3A5VHVrCbxAk6nifmSvnKFWHTBftZGpfTGkrXbURFF64T/CB4O+JXr1eBUGheN" +
-        "Q0T8L17UNgi3oBENKjASWnpjxvD2QrOnH0rb";
-    public static final String[] TEST_16_DATA = new String[] {
-        Intermediate_Certificate_CP_04_04_crt,
-        Intermediate_CRL_CP_04_04_crl,
-        End_Certificate_CP_04_04_crt
-    };
-
-    /*  
-     *  test17
-     *  
-     */ 
-
-    public static final String Intermediate_Certificate_CP_04_05_crt = 
-        "MIIClzCCAgCgAwIBAgIBITANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1" +
-        "UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb0QxEDAOBgNVBAsTB1Rlc3Rpbmcx" +
-        "FTATBgNVBAMTDFRydXN0IEFuY2hvcjAeFw05ODAxMDExMjAxMDBaFw00ODAxMDExMjAxMD" +
-        "BaMGAxCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9VLlMuIEdvdmVybm1lbnQxDDAKBgNVBAsT" +
-        "A0RvZDEQMA4GA1UECxMHVGVzdGluZzEXMBUGA1UEAxMOICBDQTEtQ1AuMDQuMDUwgZ8wDQ" +
-        "YJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMBsWmrcKH0J9bkI3zHthZ0S3904f3fMUSasY5qp" +
-        "7CSQ0sbXTwP947sfAPK4Dso6Bpwl0WExRCdFHd6qfY9wR+NtfuI/DkFEY8WveoqM4Vskpi" +
-        "cutWghCx14PiPY5YGFn8VvXu7wbuHp4TnHtUCMEUt3EfYO5oqm+/I8y0eTKMNHAgMBAAGj" +
-        "YzBhMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMBYGA1UdIAQPMA0wCwYJYI" +
-        "ZIAWUDATABMBEGA1UdDgQKBAjOoKlp+BfGqTATBgNVHSMEDDAKgAirmuv5wudUjzANBgkq" +
-        "hkiG9w0BAQUFAAOBgQDLhQ/RJFqMDNRonAHZ30DYyphf8do4q6ARikhhXSSa6G2G/PzbpS" +
-        "x3T+3G8ot+NnFhtf9ZWo7KfwmFEbUA/B/X2vJaJbNImkMDT1aTY5sPXtA69B3QKQVz7HST" +
-        "f5XH6DjuoV0/m1M153A4vf1Z783dOPw1MzOq19t+6tYFeELEHQ==";
-    public static final String Intermediate_CRL_CP_04_05_crl = 
-        "MIIBTTCBtwIBATANBgkqhkiG9w0BAQUFADBgMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS" +
-        "5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFzAVBgNV" +
-        "BAMTDiAgQ0ExLUNQLjA0LjA1Fw05OTAxMDExMjAxMDBaFw00ODAxMDExMjAxMDBaoCMwIT" +
-        "AKBgNVHRQEAwIBATATBgNVHSMEDDAKgAjOoKlp+BfGqTANBgkqhkiG9w0BAQUFAAOBgQAp" +
-        "6gLCdPQw7Hisnr1i3QbD7GybqfD6b1s10GQ3c/j59RYDe1Fk47Srs9ol/baleasWjcdt8M" +
-        "SlTc66KvK9YPFAqIdYoOW4FidpJBF/1cvSc2hGYwVsxLnXKr9CJ5Py5vBCCjovIRiLdzoL" +
-        "ZoteOKFIEHkV7V8V2OTFawxpW9hkiA==";
-    public static final String End_Certificate_CP_04_05_crt = 
-        "MIICiDCCAfGgAwIBAgIBIjANBgkqhkiG9w0BAQUFADBgMQswCQYDVQQGEwJVUzEYMBYGA1" +
-        "UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3Rpbmcx" +
-        "FzAVBgNVBAMTDkNBMS1DUC4wNC4wNSAgMB4XDTk4MDEwMTEyMDEwMFoXDTQ4MDEwMTEyMD" +
-        "EwMFowYDELMAkGA1UEBhMCVVMxGDAWBgNVBAoTD1UuUy4gR292ZXJubWVudDEMMAoGA1UE" +
-        "CxMDRG9EMRAwDgYDVQQLEwdUZXN0aW5nMRcwFQYDVQQDEw5Vc2VyMS1DUC4wNC4wNTCBnz" +
-        "ANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAwZsiUhXiFHN9dfJb0Yyy+rYtV8gx+d0+8WkW" +
-        "5C68nQgSqqk2uSTpvZbx0bpHF+s+LKppj2M2tt/AfZgVQHTsp5rO0IftZE2iLwqejj0rYU" +
-        "Poprq1PE3vVhs818ZlDS0PTUP97YxLysQjq2jS/d/9lF5pS3sMlP4Usp24gXX0vG0CAwEA" +
-        "AaNSMFAwDgYDVR0PAQH/BAQDAgXgMBYGA1UdIAQPMA0wCwYJYIZIAWUDATABMBEGA1UdDg" +
-        "QKBAjpC0ZvCXrvBTATBgNVHSMEDDAKgAjOoKlp+BfGqTANBgkqhkiG9w0BAQUFAAOBgQB7" +
-        "YwJWcx+PU1sUZUOVleoB5amHFu0GT+Hy7cRa82UJMHFkz0bmnyEV8CBNcnn0xa5iVfwe2y" +
-        "5ZKwy61DLR3MPTar9eKITL67uZag9w+1tnIf594XRbEiUzn20uxuDFX3oPoZCemtWdVanj" +
-        "2T+9TVQKfrp15+qzOCObNNRHZw29EA==";
-    public static final String[] TEST_17_DATA = new String[] {
-        Intermediate_Certificate_CP_04_05_crt,
-        Intermediate_CRL_CP_04_05_crl,
-        End_Certificate_CP_04_05_crt
-    };
-
-    /*  
-     *  test18
-     *  
-     */ 
-
-    public static final String Intermediate_Certificate_CP_04_06_crt = 
-        "MIIClTCCAf6gAwIBAgIBIzANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1" +
-        "UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb0QxEDAOBgNVBAsTB1Rlc3Rpbmcx" +
-        "FTATBgNVBAMTDFRydXN0IEFuY2hvcjAeFw05ODAxMDExMjAxMDBaFw00ODAxMDExMjAxMD" +
-        "BaMF4xCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9VLlMuIEdvdmVybm1lbnQxDDAKBgNVBAsT" +
-        "A0RvZDEQMA4GA1UECxMHVGVzdGluZzEVMBMGA1UEAxMMQ0ExLUNQLjA0LjA2MIGfMA0GCS" +
-        "qGSIb3DQEBAQUAA4GNADCBiQKBgQD0t0dfe82Su58bJdn4dh7E3OCam1AUPTzPnt7DwT2w" +
-        "1XwD76OCUYP7SBBjsLYDDfUCb2ek96pSK4jpzyE6/4IOtfObe7OW+iBT9YAB5WeW+SmvEO" +
-        "TIX+xo13sbz6rG6j9svcOxtth98yv7mxzV/ZwTNBSO72CcfDXIIq20TVunlwIDAQABo2Mw" +
-        "YTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAWBgNVHSAEDzANMAsGCWCGSA" +
-        "FlAwEwATARBgNVHQ4ECgQI0AufZEn1f9AwEwYDVR0jBAwwCoAIq5rr+cLnVI8wDQYJKoZI" +
-        "hvcNAQEFBQADgYEAbfhxuNBYizxfMZNcyiN61j+7LXZZo3SmMU21UmOhPBTmdTbIkuVCI+" +
-        "F1jSWdu3eGShVNJ3jmkidDvojMm+E8ZZ1YGHYfgeG16dDQudaGUjGmOfYzzlkFmsaf0paG" +
-        "4y4sBerPsZCmhN7BanGh3qYPFvadSmp3OapGfEmDtS+BbVQ=";
-    public static final String Intermediate_CRL_CP_04_06_crl = 
-        "MIIBSzCBtQIBATANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS" +
-        "5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNV" +
-        "BAMTDENBMS1DUC4wNC4wNhcNOTkwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMTAwWqAjMCEwCg" +
-        "YDVR0UBAMCAQEwEwYDVR0jBAwwCoAI0AufZEn1f9AwDQYJKoZIhvcNAQEFBQADgYEAIAI7" +
-        "W6K69twJZnHx6CoIMs5+P9DrJ2yKHptmntlOCTSJirC/xdj0Zv2k5FW84VrTtdCSZDT1Ce" +
-        "4Dh69fT2sUUexJb/4IcDtzloiuASSJzKWCeVIj9A8e6+coNUJVKtRKRX8bHJ5Un7xpFrY6" +
-        "t1hdxt8gUecAAdXEFGuZ3QEHHN0=";
-    public static final String End_Certificate_CP_04_06_crt = 
-        "MIIChjCCAe+gAwIBAgIBJDANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1" +
-        "UEChMPdS5zLiBHT1ZFUk5NRU5UMQwwCgYDVQQLEwNEb0QxEDAOBgNVBAsTB1RFU1RJTkcx" +
-        "FTATBgNVBAMTDGNhMS1DUC4wNC4wNjAeFw05ODAxMDExMjAxMDBaFw00ODAxMDExMjAxMD" +
-        "BaMGAxCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9VLlMuIEdvdmVybm1lbnQxDDAKBgNVBAsT" +
-        "A0RvRDEQMA4GA1UECxMHVGVzdGluZzEXMBUGA1UEAxMOVXNlcjEtQ1AuMDQuMDYwgZ8wDQ" +
-        "YJKoZIhvcNAQEBBQADgY0AMIGJAoGBAKq8rAPXsu1RVm3vT7od7CDLn8k/C3x3wvfzoWrm" +
-        "W0cmlhp9xRy5a3HWiJATD8yCKY1psBgnrOpv37sdtUX4P2kf668HrYOaGo365fKPeT5Wjm" +
-        "gp0pL3sXKNNsCuJPd3wKAXGHAi1R9arZFYPsKJlfQl1774dwAvzxSOMr5+pbnzAgMBAAGj" +
-        "UjBQMA4GA1UdDwEB/wQEAwIF4DAWBgNVHSAEDzANMAsGCWCGSAFlAwEwATARBgNVHQ4ECg" +
-        "QI33MEYdo5YX4wEwYDVR0jBAwwCoAI0AufZEn1f9AwDQYJKoZIhvcNAQEFBQADgYEAo8Ge" +
-        "ADBoJFEIRzdO37uasuyIBhClTUgyFhEKemMBN6aelYeiJMX6FZIL3DgZOce4dg7Zg3Ak/w" +
-        "B5m8XlGQLW9xIbpEzY/Iq9kr+qK6k9YmvtcOiHFbnudCFNZngTQZpxjiDaj4eA48uqKIxs" +
-        "51taC5gOv9LYWPnugN8TsUUFZ1s=";
-    public static final String[] TEST_18_DATA = new String[] {
-        Intermediate_Certificate_CP_04_06_crt,
-        Intermediate_CRL_CP_04_06_crl,
-        End_Certificate_CP_04_06_crt
-    };
-
-    /*  
-     *  test19
-     *  
-     */ 
-
-    public static final String Intermediate_Certificate_CP_05_01_crt = 
-        "MIIClTCCAf6gAwIBAgIBJTANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1" +
-        "UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb0QxEDAOBgNVBAsTB1Rlc3Rpbmcx" +
-        "FTATBgNVBAMTDFRydXN0IEFuY2hvcjAeFw05ODAxMDExMjAxMDBaFw00ODAxMDExMjAxMD" +
-        "BaMF4xCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9VLlMuIEdvdmVybm1lbnQxDDAKBgNVBAsT" +
-        "A0RvZDEQMA4GA1UECxMHVGVzdGluZzEVMBMGA1UEAxMMQ0ExLUNQLjA1LjAxMIGfMA0GCS" +
-        "qGSIb3DQEBAQUAA4GNADCBiQKBgQCshocJtyGsxeEd2ouVTVKp+HuhDjnDk9eXtaLQIKaB" +
-        "7aTODHYbq1mC+1LO5DmRV5PBVd8NuuCA+1DmzFrfYl+nMCjjgOkC0//Gf9O85Hi/n21q0T" +
-        "F+oVa1j9fc7nAgLIziexaXrflYSbaeNWkwHHftGUninKPuNGM2re0krEeurQIDAQABo2Mw" +
-        "YTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAWBgNVHSAEDzANMAsGCWCGSA" +
-        "FlAwEwATARBgNVHQ4ECgQIaUi/P20o4LcwEwYDVR0jBAwwCoAIq5rr+cLnVI8wDQYJKoZI" +
-        "hvcNAQEFBQADgYEAWBLeJl4qlAPKxmBM5QZ2JYsbCV3VBeYGAKQ+4L7ehS63VQMCwIjBCI" +
-        "LaHGIFfCqecDNd6cpYIArdx4tY7X2/Zxm3j5ocngpI1Tv8zydQcFeraILglsHf2UZUuK/N" +
-        "6jKGjwL68C8YwmA+u6ZhcQFD2Xg4wSMC/xxzAs9zEAQGBPo=";
-    public static final String End_Certificate_CP_05_01_crt = 
-        "MIIChjCCAe+gAwIBAgIBJjANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1" +
-        "UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3Rpbmcx" +
-        "FTATBgNVBAMTDENBMS1DUC4wNS4wMTAeFw05ODAxMDExMjAxMDBaFw00ODAxMDExMjAxMD" +
-        "BaMGAxCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9VLlMuIEdvdmVybm1lbnQxDDAKBgNVBAsT" +
-        "A0RvRDEQMA4GA1UECxMHVGVzdGluZzEXMBUGA1UEAxMOVXNlcjEtQ1AuMDUuMDEwgZ8wDQ" +
-        "YJKoZIhvcNAQEBBQADgY0AMIGJAoGBAO9ODA12Fky/Md5AELkaOvOwB31UlfZq3SHAOvs0" +
-        "Y4NYoA7Q5KDIwW8RNzMSKD30z51VlgOAaBVR6HLo6rkcWB4wGiV7EPelewdSOdk72IrnYR" +
-        "npJEm2KEuLkHB+gejgk+paw8CejxMsrvT6loN8Pz0btBKxWaCfknTIyXVyQsolAgMBAAGj" +
-        "UjBQMA4GA1UdDwEB/wQEAwIF4DAWBgNVHSAEDzANMAsGCWCGSAFlAwEwATARBgNVHQ4ECg" +
-        "QI5LtSKs/inGMwEwYDVR0jBAwwCoAIaUi/P20o4LcwDQYJKoZIhvcNAQEFBQADgYEAOMrC" +
-        "38uzHckKMkiawXhPUHtDQfyR7bLweS2qro7GyndfxPpeMJwjzVxqvQBtMuHON+al8jyXpy" +
-        "BsEryV6qvdFC1vczLzJHAJZmLe5np27zQIXOObsyYcOG+aPq727/pKoD90DAlBvrxNW0ox" +
-        "x7citflEYpmOEv9Do5xiO3MuCFw=";
-    public static final String[] TEST_19_DATA = new String[] {
-        Intermediate_Certificate_CP_05_01_crt,
-        End_Certificate_CP_05_01_crt
-    };
-
-    /*  
-     *  test20
-     *  
-     */ 
-
-    public static final String Intermediate_Certificate_CP_06_01_crt = 
-        "MIIClTCCAf6gAwIBAgIBJzANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1" +
-        "UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb0QxEDAOBgNVBAsTB1Rlc3Rpbmcx" +
-        "FTATBgNVBAMTDFRydXN0IEFuY2hvcjAeFw05ODAxMDExMjAxMDBaFw00ODAxMDExMjAxMD" +
-        "BaMF4xCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9VLlMuIEdvdmVybm1lbnQxDDAKBgNVBAsT" +
-        "A0RvZDEQMA4GA1UECxMHVGVzdGluZzEVMBMGA1UEAxMMQ0ExLUNQLjA2LjAxMIGfMA0GCS" +
-        "qGSIb3DQEBAQUAA4GNADCBiQKBgQDI4MXZB08BfUHxo//4Re7Ax0qWkHgy6nb+/XaLQ2Fw" +
-        "Pbvpb5mkhLhqDZBSX3KQL0YiJ8p81tmdvRQH/LbFzX/3OKBTUfV5imYy979A2NEb4otFp6" +
-        "EDSskZhttY3d2IzUICoCWUXhObnmkHJ2jEc81bggFkK5Lir1m/tKq2IOPFJQIDAQABo2Mw" +
-        "YTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAWBgNVHSAEDzANMAsGCWCGSA" +
-        "FlAwEwATARBgNVHQ4ECgQICIAmlz6+Cc0wEwYDVR0jBAwwCoAIq5rr+cLnVI8wDQYJKoZI" +
-        "hvcNAQEFBQADgYEA0ZvIG2cnk32p6uxqGw8Bu40NrfHu9gNkJL5MhDHJXA6OxU5BX5bWZp" +
-        "LnKXLoHiqSdtEdmy5cLZw3kggxndxjsnRFMyCawaYupJBhlgquFbuvBtA8rMtkc5H4zudP" +
-        "ZcOcvXu7Xw58K+1caSGURL+A6uXFPnMUBd1+k+ejbtO8Pto=";
-    public static final String Intermediate_CRL_CP_06_01_crl = 
-        "MIIBSzCBtQIBATANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS" +
-        "5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNV" +
-        "BAMTDENBMS1DUC4wNi4wMRcNOTkwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMTAwWqAjMCEwCg" +
-        "YDVR0UBAMCAQEwEwYDVR0jBAwwCoAICIAmlz6+Cc0wDQYJKoZIhvcNAQEFBQADgYEAbkJe" +
-        "jfc1rztCbtC6xJZ3iZEDDMW2CxFvOvSwhmCjPqVY3lrCPNSQzdjmqepioCnu7ongP+HAA7" +
-        "hM7bm+SoN7KzXKufQ7C2ONoAwvoPZgnoidg7RVECxUByD6AJu04yd2wCLYRpCfS2tDtXLh" +
-        "HEDpe+ELwv35pbkCMlCO2u7J+Tc=";
-    public static final String End_Certificate_CP_06_01_crt = 
-        "MIIChjCCAe+gAwIBAgIBKDANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1" +
-        "UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3Rpbmcx" +
-        "FTATBgNVBAMTDENBMS1DUC4wNi4wMTAeFw05ODAxMDExMjAxMDBaFw00ODAxMDExMjAxMD" +
-        "BaMGAxCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9VLlMuIEdvdmVybm1lbnQxDDAKBgNVBAsT" +
-        "A0RvRDEQMA4GA1UECxMHVGVzdGluZzEXMBUGA1UEAxMOVXNlcjEtQ1AuMDYuMDEwgZ8wDQ" +
-        "YJKoZIhvcNAQEBBQADgY0AMIGJAoGBAOh7lUwMRet7t/ABI6mo27CsnRzQ64Xx7f1dqxrJ" +
-        "NuuSRslVShaWnwiGHjc+5/TS7Urfj9VO0dseBCzPsyYFoIX1q7Q5zlArwy24qpXTGMmlpE" +
-        "GByzi7jkXO8w5+wqh3+8RFrQQzr71zLtAVV/qPUyleuF8M8jzkwfPvawunmwdLAgMBAAGj" +
-        "UjBQMA4GA1UdDwEB/wQEAwIF4DAWBgNVHSAEDzANMAsGCWCGSAFlAwEwATARBgNVHQ4ECg" +
-        "QIayC0PPU9zyswEwYDVR0jBAwwCoAICIAmlz6+Cc0wDQYJKoZIhvcNAQEFBQADgYEAPz7b" +
-        "UvaEV7Myjhe8LJO/soj84X71rvVPtBPrhYjWTJ6p69GCfJRyho3vAUIt8RFal1GFb72c45" +
-        "DQGkcVzLLJw8cDP3ajtWac5HZ9dNPJkW+Kh12l9gqjn061XAjQ4XnbbwQDYCuXhguPE9v3" +
-        "kzDbimwVwIEOB/4SARX37y7TUWk=";
-    public static final String[] TEST_20_DATA = new String[] {
-        Intermediate_Certificate_CP_06_01_crt,
-        Intermediate_CRL_CP_06_01_crl,
-        End_Certificate_CP_06_01_crt
-    };
-
-    /*  
-     *  test21
-     *  
-     */ 
-
-    public static final String Intermediate_Certificate_CP_06_02_crt = 
-        "MIIClTCCAf6gAwIBAgIBKTANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1" +
-        "UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb0QxEDAOBgNVBAsTB1Rlc3Rpbmcx" +
-        "FTATBgNVBAMTDFRydXN0IEFuY2hvcjAeFw05ODAxMDExMjAxMDBaFw00ODAxMDExMjAxMD" +
-        "BaMF4xCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9VLlMuIEdvdmVybm1lbnQxDDAKBgNVBAsT" +
-        "A0RvZDEQMA4GA1UECxMHVGVzdGluZzEVMBMGA1UEAxMMQ0ExLUNQLjA2LjAyMIGfMA0GCS" +
-        "qGSIb3DQEBAQUAA4GNADCBiQKBgQC/IejV3DmeaLW8OwMfAGyr5+8NOxM1C+UBYslbOfWj" +
-        "KUGdhlX6TxFc5AOJVJBpS/QjeA+RWoUCxnxKb9QSlOrBmADrcnGz8zV0/c0JDLaU3oSgsV" +
-        "EWZE0SexBVWrKcl1j7wN0RuxMeAp342/YoyvBwea3VeqJkmSCc7Y2TjruWEQIDAQABo2Mw" +
-        "YTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAWBgNVHSAEDzANMAsGCWCGSA" +
-        "FlAwEwATARBgNVHQ4ECgQIaHxWOdHsLbUwEwYDVR0jBAwwCoAIq5rr+cLnVI8wDQYJKoZI" +
-        "hvcNAQEFBQADgYEAuzeq/lqp0qs62krK6EA81Silhy42l/KmynE3mVu9GPBgQS0BUDi7+r" +
-        "QQ+m0UxYElzj2SNO4J5aBYeC98lVJFCHX7QE8yVOoPBQd5rA+rrz4HD9QoP7glxTqLU6Tc" +
-        "9VFd+iaFpqsVtSh2bxH2BtUB2ARgebTklaNl5VPbu0+yc2I=";
-    public static final String Intermediate_CRL_CP_06_02_crl = 
-        "MIIBbzCB2QIBATANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS" +
-        "5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNV" +
-        "BAMTDENBMS1DUC4wNi4wMhcNOTkwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMTAwWjAiMCACAS" +
-        "oXDTk5MDEwMTEyMDAwMFowDDAKBgNVHRUEAwoBAaAjMCEwCgYDVR0UBAMCAQEwEwYDVR0j" +
-        "BAwwCoAIaHxWOdHsLbUwDQYJKoZIhvcNAQEFBQADgYEAYGaAzVoUdlSZ3uGKiRPfHAFIoK" +
-        "T79hNOvtOxaGA0aIek9OypDrDqYAh/s2jsXSheL0pr/v9WRIHvtCt7ytXDxVyn4Nxjpfv7" +
-        "BkAMMiccdUx1OH1VElTRkmmtMe7ROzUeHUGzXJNPex1Bc9BvSChH18bWYckyOZdYJBjctC" +
-        "KJFgw=";
-    public static final String End_Certificate_CP_06_02_crt = 
-        "MIIChjCCAe+gAwIBAgIBKjANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1" +
-        "UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3Rpbmcx" +
-        "FTATBgNVBAMTDENBMS1DUC4wNi4wMjAeFw05ODAxMDExMjAxMDBaFw00ODAxMDExMjAxMD" +
-        "BaMGAxCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9VLlMuIEdvdmVybm1lbnQxDDAKBgNVBAsT" +
-        "A0RvRDEQMA4GA1UECxMHVGVzdGluZzEXMBUGA1UEAxMOVXNlcjEtQ1AuMDYuMDIwgZ8wDQ" +
-        "YJKoZIhvcNAQEBBQADgY0AMIGJAoGBAK4D9H8JxeIrFuOmx0cSkIYNS0p7cDSBlcc57Na3" +
-        "+1k7lJD7mE9ZP6/47YsDVK2bwe4aTKCTXtPk/kGQ6bsLswJXbyW4k4+f5LeAYoXgbmZXjA" +
-        "WF+BKIl8uKetsqC3HkCeqhBaY1AGUqef4oOAkakEP+1jYFumNYtMaB+9x/0ncBAgMBAAGj" +
-        "UjBQMA4GA1UdDwEB/wQEAwIF4DAWBgNVHSAEDzANMAsGCWCGSAFlAwEwATARBgNVHQ4ECg" +
-        "QIC9MiJNI71RMwEwYDVR0jBAwwCoAIaHxWOdHsLbUwDQYJKoZIhvcNAQEFBQADgYEAo/ib" +
-        "mIxteityjZlszjCc/s7yM/0snL78pYpMOZ3P2TPKkYh2Th4+Bw8JqX10+M/zwFBj5Bw7Im" +
-        "zCIRfS3GFuKmcVcyHB4OZLMcQZtXWA8GOZ94YvWq5TBINlVtThQtusQj15KBq2TJNNFUyD" +
-        "pBdvyo05AnEsRY0HbIQu6ZhNQ40=";
-    public static final String[] TEST_21_DATA = new String[] {
-        Intermediate_Certificate_CP_06_02_crt,
-        Intermediate_CRL_CP_06_02_crl,
-        End_Certificate_CP_06_02_crt
-    };
-
-    /*  
-     *  test22
-     *  
-     */ 
-
-    public static final String Intermediate_Certificate_IC_01_01_crt = 
-        "MIIChDCCAe2gAwIBAgIBKzANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1" +
-        "UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb0QxEDAOBgNVBAsTB1Rlc3Rpbmcx" +
-        "FTATBgNVBAMTDFRydXN0IEFuY2hvcjAeFw05ODAxMDExMjAxMDBaFw00ODAxMDExMjAxMD" +
-        "BaMF4xCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9VLlMuIEdvdmVybm1lbnQxDDAKBgNVBAsT" +
-        "A0RvZDEQMA4GA1UECxMHVGVzdGluZzEVMBMGA1UEAxMMQ0ExLUlDLjAxLjAxMIGfMA0GCS" +
-        "qGSIb3DQEBAQUAA4GNADCBiQKBgQDDOu1J/VIzbB4VcS2Dwf2fsHOmIj3iatM8y61V7CrN" +
-        "RCxCWTJ1Os8e/mFWOi/zN+0afizA0UzJDTe8L++/RlP68IFg5Ju2OhXqQC3HbUZmQ7ve9g" +
-        "QdWTfur3oEJV6/XoVE4WG0Ic7D1p7BENb3LUT+8MJdSboTvAggA1CiOI6zRQIDAQABo1Iw" +
-        "UDAOBgNVHQ8BAf8EBAMCAQYwFgYDVR0gBA8wDTALBglghkgBZQMBMAEwEQYDVR0OBAoECP" +
-        "RyRiSV+4XrMBMGA1UdIwQMMAqACKua6/nC51SPMA0GCSqGSIb3DQEBBQUAA4GBAJlmJ9EW" +
-        "9ujUosqHZyZkniu2vX8VOL52OnxtLxw3LqxLyuxivjyYCaMAaJNr7/xfm3C2ozh9mQyZTQ" +
-        "6TpBapLFUH8QsEKUhy57MDUgIvZsyOvvjJh3AXfSkXDaMZ3ncLg6x0wwjN/Hxu9i+IhX1W" +
-        "1E7/5foGx7AEVfwY7Fo9S82d";
-    public static final String Intermediate_CRL_IC_01_01_crl = 
-        "MIIBSzCBtQIBATANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS" +
-        "5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNV" +
-        "BAMTDENBMS1JQy4wMS4wMRcNOTkwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMTAwWqAjMCEwCg" +
-        "YDVR0UBAMCAQEwEwYDVR0jBAwwCoAI9HJGJJX7heswDQYJKoZIhvcNAQEFBQADgYEAV4DM" +
-        "F5gU8MZ6E/mnjAWS+dIRKUBJV1GZJ+hOysdbmK1hD0mj5Pd5qTzlcvLjuatIoIsB5DCpYd" +
-        "AcNRLVvF5EJFhVjqsPzRlfUZth0Xqa+U/DeHjVxHxYsLEOSt+v2bLkbGh88SmOAk6F8xj1" +
-        "l7YIfPX5cIkUBTVZlsUt51slMXc=";
-    public static final String End_Certificate_IC_01_01_crt = 
-        "MIIChjCCAe+gAwIBAgIBLDANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1" +
-        "UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3Rpbmcx" +
-        "FTATBgNVBAMTDENBMS1JQy4wMS4wMTAeFw05ODAxMDExMjAxMDBaFw00ODAxMDExMjAxMD" +
-        "BaMGAxCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9VLlMuIEdvdmVybm1lbnQxDDAKBgNVBAsT" +
-        "A0RvRDEQMA4GA1UECxMHVGVzdGluZzEXMBUGA1UEAxMOVXNlcjEtSUMuMDEuMDEwgZ8wDQ" +
-        "YJKoZIhvcNAQEBBQADgY0AMIGJAoGBAPrk1fosBu0hemIKgTDCeV/RoFbbsm02X4LfZonX" +
-        "KeGRGYZXz4tpWgbNpjKBq1e/2bOO1DCn9I8I2kjvZdOkabk4MLeuRDo/sqlNndu4Ar5502" +
-        "pAo4A2V0QLR4IDHAJoDpxtSFrqELOiiyCx9O9V19ywe5pcBFrxVEWDqTnBUeDJAgMBAAGj" +
-        "UjBQMA4GA1UdDwEB/wQEAwIF4DAWBgNVHSAEDzANMAsGCWCGSAFlAwEwATARBgNVHQ4ECg" +
-        "QIbI6BhABrmQ8wEwYDVR0jBAwwCoAI9HJGJJX7heswDQYJKoZIhvcNAQEFBQADgYEAYzYy" +
-        "M0wbzNhZftAWz7TfFi64uA9WmTmd4MeK9vga4ChswT4H1zlaV1Sr+3hqpGmOoP5AUd9XIq" +
-        "O/ui+/gFaeuOLI+ATmK+V2KHGAneMwzcw9qbXRc+xZqGGjbXMb3Bowe3qrj3mhyowfa1n7" +
-        "x5xB7XEOqO6sfWxLdDjLVo4sn88=";
-    public static final String[] TEST_22_DATA = new String[] {
-        Intermediate_Certificate_IC_01_01_crt,
-        Intermediate_CRL_IC_01_01_crl,
-        End_Certificate_IC_01_01_crt
-    };
-
-    /*  
-     *  test23
-     *  
-     */ 
-
-    public static final String Intermediate_Certificate_IC_02_01_crt = 
-        "MIICkjCCAfugAwIBAgIBLTANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1" +
-        "UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb0QxEDAOBgNVBAsTB1Rlc3Rpbmcx" +
-        "FTATBgNVBAMTDFRydXN0IEFuY2hvcjAeFw05ODAxMDExMjAxMDBaFw00ODAxMDExMjAxMD" +
-        "BaMF4xCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9VLlMuIEdvdmVybm1lbnQxDDAKBgNVBAsT" +
-        "A0RvZDEQMA4GA1UECxMHVGVzdGluZzEVMBMGA1UEAxMMQ0ExLUlDLjAyLjAxMIGfMA0GCS" +
-        "qGSIb3DQEBAQUAA4GNADCBiQKBgQDemJgZnOzXOwNGqRA3Xq9aMrAWQU4oFuhSELsEYfLZ" +
-        "GO3ntBjJLqCn+rs3FjR9N94cu63TduOAgqlXqrNbvyO1+SF9m35JXreqn/OS6KrK6c8W2I" +
-        "pDAWJcr89nGyyCXMoJeaOOtj8m2NjZblmCZvtAl5UMOew73GE7Z5fE+jtA2wIDAQABo2Aw" +
-        "XjAMBgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIBBjAWBgNVHSAEDzANMAsGCWCGSAFlAw" +
-        "EwATARBgNVHQ4ECgQIhT9GjaaHj68wEwYDVR0jBAwwCoAIq5rr+cLnVI8wDQYJKoZIhvcN" +
-        "AQEFBQADgYEAWhKJUujLapxpz/DoD/w48HMzkL6UQCxQPOAjwwHicX8wFcKmcrWLVBdVC3" +
-        "0+ywrzMraWhaq+QCOqsgtxCwTZrfUxbCNqhKS0lZijCMgNN4Jht+PAZ22tzEsw7nCwiMM2" +
-        "n1jeKF/3btoDEUvZn9SuzhkIyxy7Q8l2tbNOsANqpxE=";
-    public static final String Intermediate_CRL_IC_02_01_crl = 
-        "MIIBSzCBtQIBATANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS" +
-        "5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNV" +
-        "BAMTDENBMS1JQy4wMi4wMRcNOTkwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMTAwWqAjMCEwCg" +
-        "YDVR0UBAMCAQEwEwYDVR0jBAwwCoAIhT9GjaaHj68wDQYJKoZIhvcNAQEFBQADgYEAJsjf" +
-        "oS3F1KMpcVBOC1Z6P5N20TYLCCHG6KETlBA3Rjf8ehNxJKJW0lGd7qHpVHp4BGvkSfaOAa" +
-        "OrC0G59wjDEY+Ci4QS46OYzBcHXMFX5HF2xMq+y5SfQnyV6MQUVVkxJRjgsTLrYwP2JaYm" +
-        "BK/zExhqQgPfgcR+56swBPXqogo=";
-    public static final String End_Certificate_IC_02_01_crt = 
-        "MIIChjCCAe+gAwIBAgIBLjANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1" +
-        "UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3Rpbmcx" +
-        "FTATBgNVBAMTDENBMS1JQy4wMi4wMTAeFw05ODAxMDExMjAxMDBaFw00ODAxMDExMjAxMD" +
-        "BaMGAxCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9VLlMuIEdvdmVybm1lbnQxDDAKBgNVBAsT" +
-        "A0RvRDEQMA4GA1UECxMHVGVzdGluZzEXMBUGA1UEAxMOVXNlcjEtSUMuMDIuMDEwgZ8wDQ" +
-        "YJKoZIhvcNAQEBBQADgY0AMIGJAoGBANbTVeAxOibAO3KGqxxY3VqKXDr9tKJN+igpKb4w" +
-        "goR0ZnWGDusSVm4pvneZ9qfmi8A0sM0E91+B2hAwsU6Y9RoA7nPsTkFYi5F+hHGIF46Op6" +
-        "8blGrZraGf9bsWXCZFoLoxcgltwjGPQqyZ5mnnm8cxUbtaWmgo28MK1yBH/sS5AgMBAAGj" +
-        "UjBQMA4GA1UdDwEB/wQEAwIF4DAWBgNVHSAEDzANMAsGCWCGSAFlAwEwATARBgNVHQ4ECg" +
-        "QI3gkBNo/SISMwEwYDVR0jBAwwCoAIhT9GjaaHj68wDQYJKoZIhvcNAQEFBQADgYEAQGl1" +
-        "7uT2xxYDks6HolrQIpesIoPqEiZ8TkizEBuLG3sUKsC7klHwy2iyVvA6nRUDwf/XzDLpGW" +
-        "/Gn0KTW6ZYIX6snOC1+7HX5OJglQx8tDpDvcAgyocK8PvCrHfu9o33J49aSeLAVpoCHwne" +
-        "tTtJxVfTMmjYWKeDbHHHi8a2YTI=";
-    public static final String[] TEST_23_DATA = new String[] {
-        Intermediate_Certificate_IC_02_01_crt,
-        Intermediate_CRL_IC_02_01_crl,
-        End_Certificate_IC_02_01_crt
-    };
-
-    /*  
-     *  test24
-     *  
-     */ 
-
-    public static final String Intermediate_Certificate_IC_02_02_crt = 
-        "MIIClTCCAf6gAwIBAgIBLzANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1" +
-        "UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb0QxEDAOBgNVBAsTB1Rlc3Rpbmcx" +
-        "FTATBgNVBAMTDFRydXN0IEFuY2hvcjAeFw05ODAxMDExMjAxMDBaFw00ODAxMDExMjAxMD" +
-        "BaMF4xCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9VLlMuIEdvdmVybm1lbnQxDDAKBgNVBAsT" +
-        "A0RvZDEQMA4GA1UECxMHVGVzdGluZzEVMBMGA1UEAxMMQ0ExLUlDLjAyLjAyMIGfMA0GCS" +
-        "qGSIb3DQEBAQUAA4GNADCBiQKBgQDoeA32BPwgq8pLJoR/tbOSjHtAz6fmzvzJrhJMvl64" +
-        "ccVuIzGxzOneYsO/ZYWy3ZGtlCoMZJRnS83tw0ikU9vQUwBw7DEcfRlLKYkY68rp25N1V5" +
-        "JEjnlHw+RvubdGkonWzUNJFbY1GA24J3no2GZHiLPgWmGb1jsA8Ag32MUrCQIDAQABo2Mw" +
-        "YTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAWBgNVHSAEDzANMAsGCWCGSA" +
-        "FlAwEwATARBgNVHQ4ECgQIKx4Ybzu2PaYwEwYDVR0jBAwwCoAIq5rr+cLnVI8wDQYJKoZI" +
-        "hvcNAQEFBQADgYEAotGeNFzmktvcxpCRcpuARHkv1lW+LegvbDBnSPvGnr1+Cn9rZcuLup" +
-        "u8ex6VJ7KWtgWBtzdOelerO6ytfWQ67uNpTOuc0SDdk/f3tCagdx44LBVQywuq/Kj57ZuN" +
-        "jpe4J8UPZSBFFK+P3gTX3S/lIKsDi6xjRnqFLSQYGX2XiIE=";
-    public static final String Intermediate_CRL_IC_02_02_crl = 
-        "MIIBSzCBtQIBATANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS" +
-        "5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNV" +
-        "BAMTDENBMS1JQy4wMi4wMhcNOTkwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMTAwWqAjMCEwCg" +
-        "YDVR0UBAMCAQEwEwYDVR0jBAwwCoAIKx4Ybzu2PaYwDQYJKoZIhvcNAQEFBQADgYEAOfuX" +
-        "wRv4skbPZAbOH/LVXdc/cA7vCSTAnWecN3ZKm/eCsxbyRxqn7fcDyHmqg5H3Ac5UOlMHR4" +
-        "FMe0Dp+Yu4Xg8xg3zRvE/3M/5jyRILGGi7olh4ikkOMD+UlreysvYvUX2MVP1iM9qAkXh8" +
-        "E8n/LZIlABN2GGkFEMRMJA6KTXg=";
-    public static final String End_Certificate_IC_02_02_crt = 
-        "MIIChjCCAe+gAwIBAgIBMDANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1" +
-        "UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3Rpbmcx" +
-        "FTATBgNVBAMTDENBMS1JQy4wMi4wMjAeFw05ODAxMDExMjAxMDBaFw00ODAxMDExMjAxMD" +
-        "BaMGAxCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9VLlMuIEdvdmVybm1lbnQxDDAKBgNVBAsT" +
-        "A0RvRDEQMA4GA1UECxMHVGVzdGluZzEXMBUGA1UEAxMOVXNlcjEtSUMuMDIuMDIwgZ8wDQ" +
-        "YJKoZIhvcNAQEBBQADgY0AMIGJAoGBAKogqWGx9EpJ/0G7ORopyIQ4IZXYKKTE48WqOJbu" +
-        "nLD3txGjMUb5Xefl/QyTfd6J758ddGzPiKs1zWO6riffJLIBoOFDmt8tchPBJuIM3gKgXe" +
-        "VcZMyF5mebm5/GZekMOjbs8P/zbLdrlu1D9CZWZMXONYitdluSg2moMGbewS2NAgMBAAGj" +
-        "UjBQMA4GA1UdDwEB/wQEAwIF4DAWBgNVHSAEDzANMAsGCWCGSAFlAwEwATARBgNVHQ4ECg" +
-        "QIP8N7OmNGshEwEwYDVR0jBAwwCoAIKx4Ybzu2PaYwDQYJKoZIhvcNAQEFBQADgYEAwkpF" +
-        "j6Kv+OcKrUtOgnH9QddB0Ej0oU6B5/5Hhhf3liAPKtllDHnhUj6nqfh4APNq/iqYFOkKMR" +
-        "RUZoaj6kakJNSOlgvRIiQfuFIgv3CqLZnhr85YFRnKgoluZE1pq3TvunoiKyJbCjbmyCos" +
-        "Rd32gVcJq024xvY2eVBTl6tfn5A=";
-    public static final String[] TEST_24_DATA = new String[] {
-        Intermediate_Certificate_IC_02_02_crt,
-        Intermediate_CRL_IC_02_02_crl,
-        End_Certificate_IC_02_02_crt
-    };
-
-    /*  
-     *  test25
-     *  
-     */ 
-
-    public static final String Intermediate_Certificate_IC_02_03_crt = 
-        "MIICjzCCAfigAwIBAgIBMTANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1" +
-        "UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb0QxEDAOBgNVBAsTB1Rlc3Rpbmcx" +
-        "FTATBgNVBAMTDFRydXN0IEFuY2hvcjAeFw05ODAxMDExMjAxMDBaFw00ODAxMDExMjAxMD" +
-        "BaMF4xCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9VLlMuIEdvdmVybm1lbnQxDDAKBgNVBAsT" +
-        "A0RvZDEQMA4GA1UECxMHVGVzdGluZzEVMBMGA1UEAxMMQ0ExLUlDLjAyLjAzMIGfMA0GCS" +
-        "qGSIb3DQEBAQUAA4GNADCBiQKBgQC7LFt+yGItQFqSEPi03ICIr5ydWnFPQHZdEMNu2tRU" +
-        "3XiOpfam1wl0xgAPGBkQK768OfidpP/i1hgYOU/isOB5dyALscvIQ9XJG1OWQXBBLgKuCb" +
-        "MS5fuDhBNa4KiFuGMbJ3/UjluRsD9qaXwGUavc436JwbRHvW8FomaBYYY1hQIDAQABo10w" +
-        "WzAJBgNVHRMEAjAAMA4GA1UdDwEB/wQEAwIBBjAWBgNVHSAEDzANMAsGCWCGSAFlAwEwAT" +
-        "ARBgNVHQ4ECgQIPsBg9tMABhAwEwYDVR0jBAwwCoAIq5rr+cLnVI8wDQYJKoZIhvcNAQEF" +
-        "BQADgYEANZcayTTX+FGhtRUJ+XuYA7jR14CJL6qTHPvdSMgHNw9mGXI/7sO5I4v1vayOCI" +
-        "YQ9luBvrTYlMPmuej8+bhM8YTYpiiOjVFANwvSKArI9U2CAGBcoBMXydykkm8qYw4gtYQT" +
-        "neiOz7VqI9plLWA111IRMgayD3CAt4Ntpzd1VSE=";
-    public static final String Intermediate_CRL_IC_02_03_crl = 
-        "MIIBSzCBtQIBATANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS" +
-        "5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNV" +
-        "BAMTDENBMS1JQy4wMi4wMxcNOTkwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMTAwWqAjMCEwCg" +
-        "YDVR0UBAMCAQEwEwYDVR0jBAwwCoAIPsBg9tMABhAwDQYJKoZIhvcNAQEFBQADgYEAVeQi" +
-        "tT1FRUaJlhfpkfjZr6VHmvGnqYapdo4DRT/pm8tsp1LbZZXpYW638ztwgZNgeBRPFlcb+x" +
-        "8naQjEkoaYzLbCYfdY+PPVDv7ym15PE48Kve8ImvANY0YnTGS8pcKdK1dpNKBnYYMOG9JN" +
-        "+H5K/4cSm/WMCKIuKdsiAWFYauE=";
-    public static final String End_Certificate_IC_02_03_crt = 
-        "MIIChjCCAe+gAwIBAgIBMjANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1" +
-        "UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3Rpbmcx" +
-        "FTATBgNVBAMTDENBMS1JQy4wMi4wMzAeFw05ODAxMDExMjAxMDBaFw00ODAxMDExMjAxMD" +
-        "BaMGAxCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9VLlMuIEdvdmVybm1lbnQxDDAKBgNVBAsT" +
-        "A0RvRDEQMA4GA1UECxMHVGVzdGluZzEXMBUGA1UEAxMOVXNlcjEtSUMuMDIuMDMwgZ8wDQ" +
-        "YJKoZIhvcNAQEBBQADgY0AMIGJAoGBALGbo9yEujZ9RFU+Vmxb5+Rx1VdIG/3E/5hXV/xI" +
-        "OFu4mEfYh2tBhP2qIMH2KbrR1tiW5t4DvTCBM3NKKqp75wpiuu7E3q6imt1pLbGW13NVL+" +
-        "81gYWXnCnzHpxYjMTIqqCkPIAeOG+SBJ1MgERbL+NBl+AK3WG4TeQ8vw7r2CGrAgMBAAGj" +
-        "UjBQMA4GA1UdDwEB/wQEAwIF4DAWBgNVHSAEDzANMAsGCWCGSAFlAwEwATARBgNVHQ4ECg" +
-        "QIS/HbII+ki/kwEwYDVR0jBAwwCoAIPsBg9tMABhAwDQYJKoZIhvcNAQEFBQADgYEAWHy4" +
-        "sHrTkqY1XjDBY5XpNEyhP6htcnjYD9bos4wjxPlJUyxdIWACWrLDE+R5iRCOYsh/nDAJEt" +
-        "CUcVASukvP6VLJaFjyxUOaCp6JCVV+txk7Fh0S/Ur3Zyysfp5LllP1plOA3N/k1Hliljp0" +
-        "+bnSiDhA1+3hJh0gDMjWUdRq9yM=";
-    public static final String[] TEST_25_DATA = new String[] {
-        Intermediate_Certificate_IC_02_03_crt,
-        Intermediate_CRL_IC_02_03_crl,
-        End_Certificate_IC_02_03_crt
-    };
-
-    /*  
-     *  test26
-     *  
-     */ 
-
-    public static final String Intermediate_Certificate_IC_02_04_crt = 
-        "MIICkjCCAfugAwIBAgIBMzANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1" +
-        "UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb0QxEDAOBgNVBAsTB1Rlc3Rpbmcx" +
-        "FTATBgNVBAMTDFRydXN0IEFuY2hvcjAeFw05ODAxMDExMjAxMDBaFw00ODAxMDExMjAxMD" +
-        "BaMF4xCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9VLlMuIEdvdmVybm1lbnQxDDAKBgNVBAsT" +
-        "A0RvZDEQMA4GA1UECxMHVGVzdGluZzEVMBMGA1UEAxMMQ0ExLUlDLjAyLjA0MIGfMA0GCS" +
-        "qGSIb3DQEBAQUAA4GNADCBiQKBgQDf5u5ouGQlQmdNfc4ell3RXKWmtq+ar9VKMme3kp8D" +
-        "cbDbUaVwlvhWTkOKxb9I208wfGG2nQiArezIwutlASf7sWo16EPapmGdCF+rp1dpjAPBUu" +
-        "fruEyCZ8nu2ITD52wuPY9OAcKHQE2/bBpCJWkw97fYX6Q9PPW5uobWoUJtOwIDAQABo2Aw" +
-        "XjAMBgNVHRMEBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAWBgNVHSAEDzANMAsGCWCGSAFlAw" +
-        "EwATARBgNVHQ4ECgQIjDm8K5YcGakwEwYDVR0jBAwwCoAIq5rr+cLnVI8wDQYJKoZIhvcN" +
-        "AQEFBQADgYEAEQIJeZj/HE3HvjjJV7PdU+2Ze8OeCYeeWDocxrA647xpeOksVXBXKmq2OV" +
-        "NqoFk7YNtlSUqiS2TlqjGqLtKYetk7a17qS/8EIQct+H5KWdvkLkYMkfIAAMJvJZHPGxEv" +
-        "j+oVPAi9FITRbFdN8Jvdo9MAuU2q8d2x8MF236RmEds=";
-    public static final String Intermediate_CRL_IC_02_04_crl = 
-        "MIIBSzCBtQIBATANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS" +
-        "5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNV" +
-        "BAMTDENBMS1JQy4wMi4wNBcNOTkwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMTAwWqAjMCEwCg" +
-        "YDVR0UBAMCAQEwEwYDVR0jBAwwCoAIjDm8K5YcGakwDQYJKoZIhvcNAQEFBQADgYEAV5bX" +
-        "7WsT8sWeA0iQ7V/+ZQESDzvyHA7Ziju0iRsvTL7qOVF/Nl5v+zND+ZNPhdJDKEM/Q0lEaA" +
-        "ybe0E73NMmM1qRX1daAwE++jHukF9TMeNl750HJaS667H6jcjeRrHUJDD0+AgqrZY52dL6" +
-        "CPM3V4QSvdfc1/xtKmNIZWSSoqY=";
-    public static final String End_Certificate_IC_02_04_crt = 
-        "MIIChjCCAe+gAwIBAgIBNDANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1" +
-        "UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3Rpbmcx" +
-        "FTATBgNVBAMTDENBMS1JQy4wMi4wNDAeFw05ODAxMDExMjAxMDBaFw00ODAxMDExMjAxMD" +
-        "BaMGAxCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9VLlMuIEdvdmVybm1lbnQxDDAKBgNVBAsT" +
-        "A0RvRDEQMA4GA1UECxMHVGVzdGluZzEXMBUGA1UEAxMOVXNlcjEtSUMuMDIuMDQwgZ8wDQ" +
-        "YJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMW45d5dPrzUJbuRIDeQ5gIJRYxi80PxPvxSmJe8" +
-        "ScG1A+l75SAtgLGWAxBqxPSzL+teBBUsnmf2Xsc8/qQHHev74uat0lxq9YrZ3npLW2YNo2" +
-        "CfxLK0M7F1/bhkHK2f9ttIvOrrKI67BeEjfACULdJEhl431uWINWV0pY+fHq+pAgMBAAGj" +
-        "UjBQMA4GA1UdDwEB/wQEAwIF4DAWBgNVHSAEDzANMAsGCWCGSAFlAwEwATARBgNVHQ4ECg" +
-        "QII61NnUvgvjYwEwYDVR0jBAwwCoAIjDm8K5YcGakwDQYJKoZIhvcNAQEFBQADgYEAjwgL" +
-        "6qMnnqUvNspsDaYpPQzTCqXkqshZhsy5G/nLk621H/YbNGlnZ6asHGljYVYMzjmcny16y6" +
-        "ntiv9QPB7YorAx27WT7pQPFla96s+nM/rfwWHPWI6QGDsquPriwJm/MwQC+1oDXEFKvdIL" +
-        "0urejfd5hgiXYbRRwMI7km97iHg=";
-    public static final String[] TEST_26_DATA = new String[] {
-        Intermediate_Certificate_IC_02_04_crt,
-        Intermediate_CRL_IC_02_04_crl,
-        End_Certificate_IC_02_04_crt
-    };
-
-    /*  
-     *  test27
-     *  
-     */ 
-
-    public static final String Intermediate_Certificate_IC_04_01_crt = 
-        "MIICjzCCAfigAwIBAgIBNTANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1" +
-        "UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb0QxEDAOBgNVBAsTB1Rlc3Rpbmcx" +
-        "FTATBgNVBAMTDFRydXN0IEFuY2hvcjAeFw05ODAxMDExMjAxMDBaFw00ODAxMDExMjAxMD" +
-        "BaMF4xCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9VLlMuIEdvdmVybm1lbnQxDDAKBgNVBAsT" +
-        "A0RvZDEQMA4GA1UECxMHVGVzdGluZzEVMBMGA1UEAxMMQ0ExLUlDLjA0LjAxMIGfMA0GCS" +
-        "qGSIb3DQEBAQUAA4GNADCBiQKBgQDBtNwpr9LZBF2LRtAp9Tb1FZnfM3b/Jv2sdO5zc/Bk" +
-        "sO4ByUgY+Mux9dEvFrkVWBK110TvXn+dj+85TuboILv4MDKlu+tI/rtuadXGwwDIg8TQnz" +
-        "uyC7LWhxM5JZs1/Is+sPKUY4PTCHs3+EHPBWf2tFiP3l6ZftkySEiL6+2LSQIDAQABo10w" +
-        "WzAMBgNVHRMEBTADAQH/MAsGA1UdDwQEAwIBBjAWBgNVHSAEDzANMAsGCWCGSAFlAwEwAT" +
-        "ARBgNVHQ4ECgQIbMuZ73onuZswEwYDVR0jBAwwCoAIq5rr+cLnVI8wDQYJKoZIhvcNAQEF" +
-        "BQADgYEAhaTSc2xafdP/QceMm9YJ/rZJ5gTgBR/SlmKQwd2BclHabG+Fozdg4delDjtRXS" +
-        "FKY3sFWBFZHVeprh4T93Oj6IVA5X4DIuUeBpprtS+psCnWZxdtcUWmbyYQwZNCifG5C5D0" +
-        "lRwxlMlv40xT2oCM1zPZpfmqemBDUPJ2OhkCjvo=";
-    public static final String Intermediate_CRL_IC_04_01_crl = 
-        "MIIBSzCBtQIBATANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS" +
-        "5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNV" +
-        "BAMTDENBMS1JQy4wNC4wMRcNOTkwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMTAwWqAjMCEwCg" +
-        "YDVR0UBAMCAQEwEwYDVR0jBAwwCoAIbMuZ73onuZswDQYJKoZIhvcNAQEFBQADgYEAMk6D" +
-        "Rztz1AyFnFr1KAlbjLLwxtQplf2eIc//zUkDFVUHtX5TrEC/ijUaItjdkOoPGQfpnL0w8x" +
-        "wyqWndMh593QPCqIJTtv/iACoiJNZ90ZJS0adcdZ+AEmQpa0Zv0e1JOqRrPoAfTq4HrOfR" +
-        "vhBwhvKQNtTExupW/EBudznKC6Q=";
-    public static final String End_Certificate_IC_04_01_crt = 
-        "MIIChjCCAe+gAwIBAgIBNjANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1" +
-        "UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3Rpbmcx" +
-        "FTATBgNVBAMTDENBMS1JQy4wNC4wMTAeFw05ODAxMDExMjAxMDBaFw00ODAxMDExMjAxMD" +
-        "BaMGAxCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9VLlMuIEdvdmVybm1lbnQxDDAKBgNVBAsT" +
-        "A0RvRDEQMA4GA1UECxMHVGVzdGluZzEXMBUGA1UEAxMOVXNlcjEtSUMuMDQuMDEwgZ8wDQ" +
-        "YJKoZIhvcNAQEBBQADgY0AMIGJAoGBAM2dGkraKGdIi6EXxAu6/ekMqDloX5YSVBGh4Hp2" +
-        "faujr1u4j8Lp8afqjngRxFUpTqGbqH0ETgm4cVPXmc9rUvUzYTMdxTUmIZ+iW+ULZEvzNB" +
-        "712kxRPCD2kDFN2fH2ai8miXr434w+weLm8VQN4jJGo4nswhSs2w1gsUmWyn/ZAgMBAAGj" +
-        "UjBQMA4GA1UdDwEB/wQEAwIF4DAWBgNVHSAEDzANMAsGCWCGSAFlAwEwATARBgNVHQ4ECg" +
-        "QITsLx/sO1edwwEwYDVR0jBAwwCoAIbMuZ73onuZswDQYJKoZIhvcNAQEFBQADgYEAeKft" +
-        "0RM8/b3zQodaKrTdWiFyLg5fzoOsTecSfdFPXoqz9J5ejLVkvJevSmfXJrIUhKXySzsQi+" +
-        "GazuTh/hvWjwUTIvmupi+EiFudnMpXCro8bgi48+NkepNjXvjsSmOfzlrK3SxtpH5dqonL" +
-        "6LHjGyg+Xp0Nor1m5g1rLHyrcEk=";
-    public static final String[] TEST_27_DATA = new String[] {
-        Intermediate_Certificate_IC_04_01_crt,
-        Intermediate_CRL_IC_04_01_crl,
-        End_Certificate_IC_04_01_crt
-    };
-
-    /*  
-     *  test28
-     *  
-     */ 
-
-    public static final String Intermediate_Certificate_IC_05_01_crt = 
-        "MIIClTCCAf6gAwIBAgIBNzANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1" +
-        "UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb0QxEDAOBgNVBAsTB1Rlc3Rpbmcx" +
-        "FTATBgNVBAMTDFRydXN0IEFuY2hvcjAeFw05ODAxMDExMjAxMDBaFw00ODAxMDExMjAxMD" +
-        "BaMF4xCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9VLlMuIEdvdmVybm1lbnQxDDAKBgNVBAsT" +
-        "A0RvZDEQMA4GA1UECxMHVGVzdGluZzEVMBMGA1UEAxMMQ0ExLUlDLjA1LjAxMIGfMA0GCS" +
-        "qGSIb3DQEBAQUAA4GNADCBiQKBgQDM3aWmgX3OzAaBg6lnWjpFQ9ufeTOia3+lIUqn+Ypf" +
-        "5OH/s9dLRqg1ZynV3YIUyzaJPP/YlUEmrhheJn3Bjw25bHeIKdge73pfEbuBAugbUMS75D" +
-        "csBV7Ze9D+sVw8w/LtT3ZPcvM3Vju4d+c14Ip/8pC15jlgQPhwVQSf0x3V2QIDAQABo2Mw" +
-        "YTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBAjAWBgNVHSAEDzANMAsGCWCGSA" +
-        "FlAwEwATARBgNVHQ4ECgQIJ2DFtxoQnXkwEwYDVR0jBAwwCoAIq5rr+cLnVI8wDQYJKoZI" +
-        "hvcNAQEFBQADgYEASvdcfBOh2d1dC10pGLZLI3T+oSPCup/U9riynIR3RxZsIaS/+Q2s81" +
-        "oeg++WQV6pyYvCLneZIp0efvqh5DThNV9lhBcJjlYwm/T8Hi2IaRGsSMwIvzrFN7zxA/zu" +
-        "tW98wigAKM2myk/nlYxmholgbQkQ7ZxYM3lD1TDRl69N66Q=";
-    public static final String Intermediate_CRL_IC_05_01_crl = 
-        "MIIBSzCBtQIBATANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS" +
-        "5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNV" +
-        "BAMTDENBMS1JQy4wNS4wMRcNOTkwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMTAwWqAjMCEwCg" +
-        "YDVR0UBAMCAQEwEwYDVR0jBAwwCoAIJ2DFtxoQnXkwDQYJKoZIhvcNAQEFBQADgYEAK7Ym" +
-        "Y9PjX5CpVewe2E9PNxj3dLYElghaQyapYoVtNq3jDqLMWspdmHdNdeaQoXsjlSJe0Zy8xH" +
-        "ZvpimwifnFZ5hq4yByzHjzNMpcA2yFtg2MtPWGEia+BmaZYZi3X0lR+OShKpNLFc4CfVM/" +
-        "aWG6W2BulHjIAThZhTg3uRekDzs=";
-    public static final String End_Certificate_IC_05_01_crt = 
-        "MIIChjCCAe+gAwIBAgIBODANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1" +
-        "UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3Rpbmcx" +
-        "FTATBgNVBAMTDENBMS1JQy4wNS4wMTAeFw05ODAxMDExMjAxMDBaFw00ODAxMDExMjAxMD" +
-        "BaMGAxCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9VLlMuIEdvdmVybm1lbnQxDDAKBgNVBAsT" +
-        "A0RvRDEQMA4GA1UECxMHVGVzdGluZzEXMBUGA1UEAxMOVXNlcjEtSUMuMDUuMDEwgZ8wDQ" +
-        "YJKoZIhvcNAQEBBQADgY0AMIGJAoGBALlcUtceuxDznvI3pVM7YddPcBOrNvrOtpuLOa1L" +
-        "Lj9LeNH6+8CzRZnMsUtt+bRGqCKMEJLUIIstWwGg4SskXWk2m+nDKm5Ai6Kyx4nldpgtgQ" +
-        "xZSEwNcwRhpy7TtmLkxDVM9DoTbIbK0dZ7aWw4bXVHPK/lnOMtOaJbFDq0sLfxAgMBAAGj" +
-        "UjBQMA4GA1UdDwEB/wQEAwIF4DAWBgNVHSAEDzANMAsGCWCGSAFlAwEwATARBgNVHQ4ECg" +
-        "QIiXgrRBVcDf0wEwYDVR0jBAwwCoAIJ2DFtxoQnXkwDQYJKoZIhvcNAQEFBQADgYEAhyO6" +
-        "SP6brWDDKZwdQGULno4Om5+DuilJKamyEcvSqE666z1KhvOCdLicqwVa6tQiAL6akrt5Kv" +
-        "R+TT0xqHR4JGosGLGolvK4DLrMeD+PRK7m1a+nJl44luo5Mn48HrKI7jn7n8Lp9bNdCHvr" +
-        "NHaQksCIR/Q8xoucPa+8sCTVSj4=";
-    public static final String[] TEST_28_DATA = new String[] {
-        Intermediate_Certificate_IC_05_01_crt,
-        Intermediate_CRL_IC_05_01_crl,
-        End_Certificate_IC_05_01_crt
-    };
-
-    /*  
-     *  test29
-     *  
-     */ 
-
-    public static final String Intermediate_Certificate_IC_05_02_crt = 
-        "MIICkjCCAfugAwIBAgIBOTANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1" +
-        "UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb0QxEDAOBgNVBAsTB1Rlc3Rpbmcx" +
-        "FTATBgNVBAMTDFRydXN0IEFuY2hvcjAeFw05ODAxMDExMjAxMDBaFw00ODAxMDExMjAxMD" +
-        "BaMF4xCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9VLlMuIEdvdmVybm1lbnQxDDAKBgNVBAsT" +
-        "A0RvZDEQMA4GA1UECxMHVGVzdGluZzEVMBMGA1UEAxMMQ0ExLUlDLjA1LjAyMIGfMA0GCS" +
-        "qGSIb3DQEBAQUAA4GNADCBiQKBgQCrtIYqo2Is8Cd6Ld+fyWC755oA6hQiiruooaR/6O4z" +
-        "ikyhOUztnHkOGMF5H4CKWafwwVrfFtqe7iop3N6AToEIpNlJLVy3cj14A/IASVYSSNFeHd" +
-        "O44Id1NWhPiKx3paPTWslMEdKQV9BlXb7gu8pQpvqTa/38hNQ9vdil/4QZbQIDAQABo2Aw" +
-        "XjAPBgNVHRMBAf8EBTADAQH/MAsGA1UdDwQEAwIBAjAWBgNVHSAEDzANMAsGCWCGSAFlAw" +
-        "EwATARBgNVHQ4ECgQI9P78RavuWW8wEwYDVR0jBAwwCoAIq5rr+cLnVI8wDQYJKoZIhvcN" +
-        "AQEFBQADgYEA0sAEmWBYSazUav6RtuNFtZgNrlQ2i5i138VzRHoF/kq/CxeR/lINQqgJhC" +
-        "ZlUnlslUuM86g8OQGlR8SS0Wsi0MdCQCtPCKA2hStlTx9MMux2IZAGoyHy6P95UE9qINHE" +
-        "fYZUYjO9rh96fzNyJ5Oy2kJdJWdhFXtSh3BSOe0ZD+Y=";
-    public static final String Intermediate_CRL_IC_05_02_crl = 
-        "MIIBSzCBtQIBATANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS" +
-        "5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNV" +
-        "BAMTDENBMS1JQy4wNS4wMhcNOTkwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMTAwWqAjMCEwCg" +
-        "YDVR0UBAMCAQEwEwYDVR0jBAwwCoAI9P78RavuWW8wDQYJKoZIhvcNAQEFBQADgYEAlPLh" +
-        "+CMqRcbLgUKEAL2UlSY5tjsF8At0hf000kec93TnBf7f1NKYVJ5eyeoh/WK4s+k4paAA5E" +
-        "/P2C8JMlGXNTrqKZXMy2zIlufE1ymXAZCKLOLC5ezXRSpwIsBWxko2nfw8Bz/mZO/bCSCT" +
-        "nDwkH8BJIbFV51vJFlyyOmZnCz4=";
-    public static final String End_Certificate_IC_05_02_crt = 
-        "MIIChjCCAe+gAwIBAgIBOjANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1" +
-        "UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3Rpbmcx" +
-        "FTATBgNVBAMTDENBMS1JQy4wNS4wMjAeFw05ODAxMDExMjAxMDBaFw00ODAxMDExMjAxMD" +
-        "BaMGAxCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9VLlMuIEdvdmVybm1lbnQxDDAKBgNVBAsT" +
-        "A0RvRDEQMA4GA1UECxMHVGVzdGluZzEXMBUGA1UEAxMOVXNlcjEtSUMuMDUuMDIwgZ8wDQ" +
-        "YJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMPsWBfT8HqaiLnoUCPAFniq502odL4uVqzOOxkx" +
-        "evZtjh7NaFlRjuYjTofdkj/IAgg7lkkBEW3auK47Td3TvqnHO401PqvOFNTlbhr5wDLmXS" +
-        "WWcR6XrvgYL3Z3wx15/z6eojcSgu07kdvKqzuLzcDs+noG8lbcruokX0A186pVAgMBAAGj" +
-        "UjBQMA4GA1UdDwEB/wQEAwIF4DAWBgNVHSAEDzANMAsGCWCGSAFlAwEwATARBgNVHQ4ECg" +
-        "QImgomUTkzwbEwEwYDVR0jBAwwCoAI9P78RavuWW8wDQYJKoZIhvcNAQEFBQADgYEATAEq" +
-        "YVV0iYdYomPqxbTapSCJFAMQO/WZhN9brCXP88+jRfk6cAHzTodQOYTOAVe8YXa904505e" +
-        "RA11NNTViP3s/AseGWuqbWjsom9mbR+tVkvufGqPQtm1JhfLgR/68e29AI7tj7zIJyFVYD" +
-        "nLRXGwMGnosqSHDle+WYyfok6a8=";
-    public static final String[] TEST_29_DATA = new String[] {
-        Intermediate_Certificate_IC_05_02_crt,
-        Intermediate_CRL_IC_05_02_crl,
-        End_Certificate_IC_05_02_crt
-    };
-
-    /*  
-     *  test30
-     *  
-     */ 
-
-    public static final String Intermediate_Certificate_IC_05_03_crt = 
-        "MIICkjCCAfugAwIBAgIBOzANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1" +
-        "UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb0QxEDAOBgNVBAsTB1Rlc3Rpbmcx" +
-        "FTATBgNVBAMTDFRydXN0IEFuY2hvcjAeFw05ODAxMDExMjAxMDBaFw00ODAxMDExMjAxMD" +
-        "BaMF4xCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9VLlMuIEdvdmVybm1lbnQxDDAKBgNVBAsT" +
-        "A0RvZDEQMA4GA1UECxMHVGVzdGluZzEVMBMGA1UEAxMMQ0ExLUlDLjA1LjAzMIGfMA0GCS" +
-        "qGSIb3DQEBAQUAA4GNADCBiQKBgQCajRjoRNL9HFTytLLx7C8WYouW0uONGsrtGS5tKMiW" +
-        "oLlQUkohqB2a2PhA1InNGQqnbDtNdqKbR1k6EzD6MyegvXK1sXs0ZE8gt0LZYio7Xp3k+Q" +
-        "7i4Rk5iTruAUrV8bFMYmeIXHXL/9rl5LQV8YRp/Ut3Bg3VECzfhQG4EavMlwIDAQABo2Aw" +
-        "XjAPBgNVHRMBAf8EBTADAQH/MAsGA1UdDwQEAwIBBjAWBgNVHSAEDzANMAsGCWCGSAFlAw" +
-        "EwATARBgNVHQ4ECgQI9041oiwvHsgwEwYDVR0jBAwwCoAIq5rr+cLnVI8wDQYJKoZIhvcN" +
-        "AQEFBQADgYEAYwGYwLsA/kxYZG/RM+kvoH+mUebrBVZRBxjovYsYzNznD26fssjBFfiTmg" +
-        "zwZJfG7MZRsgDSRsS+bxuTlXMVeGRKH8fVj7PNq05sS18QZQOF0CCKzg9DLkCzkzkEWBxc" +
-        "5ersciPrL90UarOIPIJWUxQ/5sdMS/wZtYTU34rNNWE=";
-    public static final String Intermediate_CRL_IC_05_03_crl = 
-        "MIIBSzCBtQIBATANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS" +
-        "5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNV" +
-        "BAMTDENBMS1JQy4wNS4wMxcNOTkwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMTAwWqAjMCEwCg" +
-        "YDVR0UBAMCAQEwEwYDVR0jBAwwCoAI9041oiwvHsgwDQYJKoZIhvcNAQEFBQADgYEAJHTp" +
-        "k+RRsD0dUv59J1GQMWjQTjVz39Xaonx2sk38WHcrHBB78L0W6Skjvt082PwZg32sb7FQBt" +
-        "boAQ3PIKpXMnFnkjnkyaFihrnMdfa0abCPtQhFl3yra+w+1a2RDjQBZOOdq3xlFcLi9unT" +
-        "YYome7eS93wchIvNWFpgwF5A5XY=";
-    public static final String End_Certificate_IC_05_03_crt = 
-        "MIIChjCCAe+gAwIBAgIBPDANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1" +
-        "UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3Rpbmcx" +
-        "FTATBgNVBAMTDENBMS1JQy4wNS4wMzAeFw05ODAxMDExMjAxMDBaFw00ODAxMDExMjAxMD" +
-        "BaMGAxCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9VLlMuIEdvdmVybm1lbnQxDDAKBgNVBAsT" +
-        "A0RvRDEQMA4GA1UECxMHVGVzdGluZzEXMBUGA1UEAxMOVXNlcjEtSUMuMDUuMDMwgZ8wDQ" +
-        "YJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMYxdSZq7qRBdPOz6H+l0GGAtymAWTshfZZCubHK" +
-        "lQjbVq98qudORfhCOZgOy83j/mo2KAecBhxaxB9YA5ggWNAgaKtFvknvjFemtBCZwt6cVK" +
-        "8LCyUGKzStwAV1+HSDlHxdWo7pRwP0beXFvFECrX418osGt6E/v7Cz++ZtvaDhAgMBAAGj" +
-        "UjBQMA4GA1UdDwEB/wQEAwIF4DAWBgNVHSAEDzANMAsGCWCGSAFlAwEwATARBgNVHQ4ECg" +
-        "QIgTuCLfTVa+QwEwYDVR0jBAwwCoAI9041oiwvHsgwDQYJKoZIhvcNAQEFBQADgYEAQRuC" +
-        "rAx9zzu9QwOq9weNit9PNgFHBpo3Gh9jPVYGJjOQxeSqqou503xi82H3W30FT/3ESCO7IF" +
-        "hfpr/uQZVEmUQnvDsVwbKvED1QF9qkTp6ILk38ITJJgfb+sdSL3bsUeNqVXd0C9wzVoErc" +
-        "OuoCulwkZzfoIOlO2YAjAnR1nUc=";
-    public static final String[] TEST_30_DATA = new String[] {
-        Intermediate_Certificate_IC_05_03_crt,
-        Intermediate_CRL_IC_05_03_crl,
-        End_Certificate_IC_05_03_crt
-    };
-
-    /*  
-     *  test31
-     *  
-     */ 
-
-    public static final String Intermediate_Certificate_IC_06_01_crt = 
-        "MIIClTCCAf6gAwIBAgIBPTANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1" +
-        "UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb0QxEDAOBgNVBAsTB1Rlc3Rpbmcx" +
-        "FTATBgNVBAMTDFRydXN0IEFuY2hvcjAeFw05ODAxMDExMjAxMDBaFw00ODAxMDExMjAxMD" +
-        "BaMF4xCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9VLlMuIEdvdmVybm1lbnQxDDAKBgNVBAsT" +
-        "A0RvZDEQMA4GA1UECxMHVGVzdGluZzEVMBMGA1UEAxMMQ0ExLUlDLjA2LjAxMIGfMA0GCS" +
-        "qGSIb3DQEBAQUAA4GNADCBiQKBgQDmutL9PY/BLXvXMEDQLQnWE7dCOsrLNvJiuSjDdznF" +
-        "vBz6WS/RqUr9zsDFknpOWB3Epo2syV4ZFto+v4VWNo61uaClIEsw5x1y0saG19px34KVpQ" +
-        "wkpvLeRZySdCydKdE1rptYR/JbHvPo5TU4mxOo6L7JeEwAvjSI4tK4rwJ4MwIDAQABo2Mw" +
-        "YTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwICBDAWBgNVHSAEDzANMAsGCWCGSA" +
-        "FlAwEwATARBgNVHQ4ECgQI1BB9j6Jyny4wEwYDVR0jBAwwCoAIq5rr+cLnVI8wDQYJKoZI" +
-        "hvcNAQEFBQADgYEAajWMbY8zL8jS2VUjCPBMuIjUvBfy55+92EXg5pZnyNNwN1diZfJFiB" +
-        "rrPWEg3Fa4NMLgaDKWZsYkOcDDo8I+Qb9FsU9LphCzQ1ubIEuxu6KPX9X29BscFOxUnZCz" +
-        "yuzVfadACxi5Y7Bz5pN5LfC/jEb2iXjkdN5Rm8AqT81syIo=";
-    public static final String Intermediate_CRL_IC_06_01_crl = 
-        "MIIBSzCBtQIBATANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS" +
-        "5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNV" +
-        "BAMTDENBMS1JQy4wNi4wMRcNOTkwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMTAwWqAjMCEwCg" +
-        "YDVR0UBAMCAQEwEwYDVR0jBAwwCoAI1BB9j6Jyny4wDQYJKoZIhvcNAQEFBQADgYEAxH4/" +
-        "mgACT847PyufmF1nob9TSqBj+cM5ye2bgv83gTVd3B1Gopr75Tnu4iP10d0PpSXjySWCjB" +
-        "0HPJ7BdxzkKxSrcM5vcb/jLdk9PqMUS30ohexsx1xK+E38pDJdLX4kbJ3E62AgyXm9WQlD" +
-        "9xsDk7TMXwuxHT4fX070HL6lWGI=";
-    public static final String End_Certificate_IC_06_01_crt = 
-        "MIIChjCCAe+gAwIBAgIBPjANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1" +
-        "UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3Rpbmcx" +
-        "FTATBgNVBAMTDENBMS1JQy4wNi4wMTAeFw05ODAxMDExMjAxMDBaFw00ODAxMDExMjAxMD" +
-        "BaMGAxCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9VLlMuIEdvdmVybm1lbnQxDDAKBgNVBAsT" +
-        "A0RvRDEQMA4GA1UECxMHVGVzdGluZzEXMBUGA1UEAxMOVXNlcjEtSUMuMDYuMDEwgZ8wDQ" +
-        "YJKoZIhvcNAQEBBQADgY0AMIGJAoGBAO1VOl25MTf068LOgzmQOmyh8MXunBrQ4t6UYuEj" +
-        "H7v+owR9JTDXpfzLPcYfkR+BH2jjISSHIJsUDesKVhpmhABNXcOI5tiRNkeDlV2zKCBXKC" +
-        "wFi5qkhrE8FUCP0hL8YzbybOrYZYSVEP8GgIgMSQcTvhN/Tor0o1jdJvRLmevXAgMBAAGj" +
-        "UjBQMA4GA1UdDwEB/wQEAwIF4DAWBgNVHSAEDzANMAsGCWCGSAFlAwEwATARBgNVHQ4ECg" +
-        "QIFJA9XGd9UZUwEwYDVR0jBAwwCoAI1BB9j6Jyny4wDQYJKoZIhvcNAQEFBQADgYEApRQC" +
-        "OTU9cp16BHM2n0TdZThgj9kSAQ4wHk/dKNOjYNEWu6n/GQ0alxy1dyRzpsr058FOvft23Z" +
-        "Kp0YhdKG/7F1hkcoNvC2yN+Re44n7S+F/jcEPTWnOX6h1Nkw8OS7Uz2fZ8t61iHjqjX4sv" +
-        "M/cKP+AkC8g7p2tfdkP1fQ6ww5E=";
-    public static final String[] TEST_31_DATA = new String[] {
-        Intermediate_Certificate_IC_06_01_crt,
-        Intermediate_CRL_IC_06_01_crl,
-        End_Certificate_IC_06_01_crt
-    };
-
-    /*  
-     *  test32
-     *  
-     */ 
-
-    public static final String Intermediate_Certificate_IC_06_02_crt = 
-        "MIICkjCCAfugAwIBAgIBPzANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1" +
-        "UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb0QxEDAOBgNVBAsTB1Rlc3Rpbmcx" +
-        "FTATBgNVBAMTDFRydXN0IEFuY2hvcjAeFw05ODAxMDExMjAxMDBaFw00ODAxMDExMjAxMD" +
-        "BaMF4xCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9VLlMuIEdvdmVybm1lbnQxDDAKBgNVBAsT" +
-        "A0RvZDEQMA4GA1UECxMHVGVzdGluZzEVMBMGA1UEAxMMQ0ExLUlDLjA2LjAyMIGfMA0GCS" +
-        "qGSIb3DQEBAQUAA4GNADCBiQKBgQC0JoTnPaI/HT2eAqCW1204nRNjcA8EQSp87tvHLpWy" +
-        "5aafmxeJxvk5V9Ba7Ye8eY8yX9losbNUpHJFNdE46fD5qp/oS7Cn3NXA0dwIDQEn1X9vaz" +
-        "nqtZtMjt1S/yGv2xDOb2LKT9zRrqSvxGszCHFUBcJ4HDFJMAdhXPUZiLyXVQIDAQABo2Aw" +
-        "XjAPBgNVHRMBAf8EBTADAQH/MAsGA1UdDwQEAwICBDAWBgNVHSAEDzANMAsGCWCGSAFlAw" +
-        "EwATARBgNVHQ4ECgQI7j2LO1CcsE4wEwYDVR0jBAwwCoAIq5rr+cLnVI8wDQYJKoZIhvcN" +
-        "AQEFBQADgYEAfXIh0oYlM2pagAWzTuYqTl0NavtfqibPgolvhgIG/XmmjswHOg/JVCLb7O" +
-        "jIYtEG2MAD0xQXwu0mc9Deufed2embP/wc0qVG7rj7lxUq6p0aMQJNndBw4m9KlSnjdzyG" +
-        "lwE9pNd2BgEeD516J2k7dspCZHDw3qLer4i2JYoCo2Y=";
-    public static final String Intermediate_CRL_IC_06_02_crl = 
-        "MIIBSzCBtQIBATANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS" +
-        "5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNV" +
-        "BAMTDENBMS1JQy4wNi4wMhcNOTkwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMTAwWqAjMCEwCg" +
-        "YDVR0UBAMCAQEwEwYDVR0jBAwwCoAI7j2LO1CcsE4wDQYJKoZIhvcNAQEFBQADgYEAJej7" +
-        "23qVtwkcvCTPb6afTosYMnVppPXWbtvqn0N5mAFHQfE27x1YPOXOQHBrpQuTyiUdUmPXiH" +
-        "xMKbuR5o2lfdQgew9hbYVk6GegSu+DBC1JKv2YSTgzgRAlJfyByDZ7mbJwZWHVHys08oGk" +
-        "adG6zstavg5EkEeRuAp47T+7cZc=";
-    public static final String End_Certificate_IC_06_02_crt = 
-        "MIIChjCCAe+gAwIBAgIBQDANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1" +
-        "UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3Rpbmcx" +
-        "FTATBgNVBAMTDENBMS1JQy4wNi4wMjAeFw05ODAxMDExMjAxMDBaFw00ODAxMDExMjAxMD" +
-        "BaMGAxCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9VLlMuIEdvdmVybm1lbnQxDDAKBgNVBAsT" +
-        "A0RvRDEQMA4GA1UECxMHVGVzdGluZzEXMBUGA1UEAxMOVXNlcjEtSUMuMDYuMDIwgZ8wDQ" +
-        "YJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMkIzl9+NRTZf/xaA8noiHRt65Zo6Zp57YvCKUe+" +
-        "YfoC8koMq12MBgrc0IyIfJoqEDEMfD1WbitZdGZMQZ7D9BP2Bk09NXLEAAuj+waFhYk0bW" +
-        "vHBH90O7HpMGmxwHmzOjDV3JHYsU8hq77/5gRFDNRkSCJe2A1Maj8Gcqi6tYf5AgMBAAGj" +
-        "UjBQMA4GA1UdDwEB/wQEAwIF4DAWBgNVHSAEDzANMAsGCWCGSAFlAwEwATARBgNVHQ4ECg" +
-        "QIYDfThEjNL28wEwYDVR0jBAwwCoAI7j2LO1CcsE4wDQYJKoZIhvcNAQEFBQADgYEAJiHT" +
-        "CjLGZK5Lyw+7ICDHs3eS1OGJH/wfsLcBP5sLER41qJfrXGTl2XdKvBMIpriUmJYzjkjof4" +
-        "bvS/VPDNlhI9AJadicW8LM4L3qpy7/YV4Dd/C/BJphJ6cZcT+hjaRKeC7gQVjMeC/npu/p" +
-        "jLgIgzf7HC4WYnaS3h9oYl0cMJk=";
-    public static final String[] TEST_32_DATA = new String[] {
-        Intermediate_Certificate_IC_06_02_crt,
-        Intermediate_CRL_IC_06_02_crl,
-        End_Certificate_IC_06_02_crt
-    };
-
-    /*  
-     *  test33
-     *  
-     */ 
-
-    public static final String Intermediate_Certificate_IC_06_03_crt = 
-        "MIICkjCCAfugAwIBAgIBQTANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1" +
-        "UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb0QxEDAOBgNVBAsTB1Rlc3Rpbmcx" +
-        "FTATBgNVBAMTDFRydXN0IEFuY2hvcjAeFw05ODAxMDExMjAxMDBaFw00ODAxMDExMjAxMD" +
-        "BaMF4xCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9VLlMuIEdvdmVybm1lbnQxDDAKBgNVBAsT" +
-        "A0RvZDEQMA4GA1UECxMHVGVzdGluZzEVMBMGA1UEAxMMQ0ExLUlDLjA2LjAzMIGfMA0GCS" +
-        "qGSIb3DQEBAQUAA4GNADCBiQKBgQCuUtIYFbVjg8VLLUqIEQ6r7hjTaqYVs8DJnJPHUWPA" +
-        "JW9HEIV+d6hj/so76Bff4KJRX7MgoXbvq4ivmn8656N7YSGk9GPuJ25SXK7RJyoqzG/x2R" +
-        "AVUCx/wG99VXVDZhd5ZAVBG2JCkHImsWAei6/Tz8UgXmmLBM8rZNJ/hNtTBwIDAQABo2Aw" +
-        "XjAPBgNVHRMBAf8EBTADAQH/MAsGA1UdDwQEAwIBBjAWBgNVHSAEDzANMAsGCWCGSAFlAw" +
-        "EwATARBgNVHQ4ECgQIpwUlwG1W+sMwEwYDVR0jBAwwCoAIq5rr+cLnVI8wDQYJKoZIhvcN" +
-        "AQEFBQADgYEAqJhUfgar10fl5qG+oH34s/JS3ku0dRm4cTQvqUNOWA9ALnBhSkmOpoMMzH" +
-        "sE9FXXcZ072a8/ecpviP04X5mt5QSLreh3hPVvgWv1LiZ9YkS4Z2kcr+3Gx7zj4gQgT5vG" +
-        "QPpbIBAtBRH5xNHIYQsk6kOe2+t7b0Q82Wnj8UoznmQ=";
-    public static final String Intermediate_CRL_IC_06_03_crl = 
-        "MIIBSzCBtQIBATANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS" +
-        "5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNV" +
-        "BAMTDENBMS1JQy4wNi4wMxcNOTkwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMTAwWqAjMCEwCg" +
-        "YDVR0UBAMCAQEwEwYDVR0jBAwwCoAIpwUlwG1W+sMwDQYJKoZIhvcNAQEFBQADgYEAKCp7" +
-        "ViY1cajXpbjCIqe8yo/98SQRIxoTNgp7EUaaV17FeHZ59nJhRtsF1XnLP4cK0lPBkKFhHK" +
-        "2XyDEWx2hK3X7Z3lSAtn12WFJHOP5T5i0DmYfMJYAFbuPD0JQEWCM3aYsgbXKbbFH1BURh" +
-        "L/uy3arVBP4FaJB8gH678K4J1p4=";
-    public static final String End_Certificate_IC_06_03_crt = 
-        "MIIChjCCAe+gAwIBAgIBQjANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1" +
-        "UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3Rpbmcx" +
-        "FTATBgNVBAMTDENBMS1JQy4wNi4wMzAeFw05ODAxMDExMjAxMDBaFw00ODAxMDExMjAxMD" +
-        "BaMGAxCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9VLlMuIEdvdmVybm1lbnQxDDAKBgNVBAsT" +
-        "A0RvRDEQMA4GA1UECxMHVGVzdGluZzEXMBUGA1UEAxMOVXNlcjEtSUMuMDYuMDMwgZ8wDQ" +
-        "YJKoZIhvcNAQEBBQADgY0AMIGJAoGBALZw+GpvdleGlmdqZ/zEO2DUGhwgrsselBUNnEzR" +
-        "bcuzr5O1WwiG6aLjrPxIXeL1wLS1/u9AD9p3CQU0XFhi+bEI9+LLnt2y3707O+AQxy1PnQ" +
-        "6qmYE4jMwqDGHn8WVanN2joFT3isLH5wJD0Jh74eoG0tqCHUyOiXaZNo78qgB3AgMBAAGj" +
-        "UjBQMA4GA1UdDwEB/wQEAwIF4DAWBgNVHSAEDzANMAsGCWCGSAFlAwEwATARBgNVHQ4ECg" +
-        "QIJOeyCnvfJtAwEwYDVR0jBAwwCoAIpwUlwG1W+sMwDQYJKoZIhvcNAQEFBQADgYEAJbz1" +
-        "RipbW6uu7B+f2Ol1iq4AVOUuET2S9vi9ojReyAIka3q1XUceZCm5Et0KqpOoOLiu8IRuNB" +
-        "bvKwRcZ4hcVEXv5bRMqaPEK2B0VrRAV/Llj5A+RGn6yc1ZdkJeBRhoSsaHn5whfICaiJX6" +
-        "j3lMpo/CiMRViL+gZLU3SdKqvdY=";
-    public static final String[] TEST_33_DATA = new String[] {
-        Intermediate_Certificate_IC_06_03_crt,
-        Intermediate_CRL_IC_06_03_crl,
-        End_Certificate_IC_06_03_crt
-    };
-
-    /*  
-     *  test34
-     *  
-     */ 
-
-    public static final String Intermediate_Certificate_PP_01_01_crt = 
-        "MIIClTCCAf6gAwIBAgIBQzANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1" +
-        "UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb0QxEDAOBgNVBAsTB1Rlc3Rpbmcx" +
-        "FTATBgNVBAMTDFRydXN0IEFuY2hvcjAeFw05ODAxMDExMjAxMDBaFw00ODAxMDExMjAxMD" +
-        "BaMF4xCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9VLlMuIEdvdmVybm1lbnQxDDAKBgNVBAsT" +
-        "A0RvZDEQMA4GA1UECxMHVGVzdGluZzEVMBMGA1UEAxMMQ0ExLVBQLjAxLjAxMIGfMA0GCS" +
-        "qGSIb3DQEBAQUAA4GNADCBiQKBgQDRkBhJJVgOXHjydAHAnokd/XfEiW+bnWd2ZPJrMBmP" +
-        "7TlvVpxOGqLd6lGdbelbSyAzut1i8lyYn9NSDR0PcyehCSS+MsKS2uNKsTEuH3mlMK/7C5" +
-        "B1qggKqE8f7opyl9+U+Qyi1WQj01gY6XYXaCxksCB0Oqx2737d7QWMvl15dQIDAQABo2Mw" +
-        "YTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAWBgNVHSAEDzANMAsGCWCGSA" +
-        "FlAwEwATARBgNVHQ4ECgQIO1U69B4DBHQwEwYDVR0jBAwwCoAIq5rr+cLnVI8wDQYJKoZI" +
-        "hvcNAQEFBQADgYEAcHWV4Q4z7C+IC4bWgIf1+BzkszCN+LSb4JquR7GgICESbwF2JzR+xL" +
-        "7yoKvB/NBcCqtMY4Hi1DHACbIGJwRe68vVHzz4CmYEK50UUCbAtiAiy9Od6wwrTyFyacBd" +
-        "CBjiO6mkFEp6jOsoIgXRfxK4kDNcMkGUUwMbSR/wZKFuImc=";
-    public static final String Intermediate_CRL_PP_01_01_crl = 
-        "MIIBSzCBtQIBATANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS" +
-        "5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNV" +
-        "BAMTDENBMS1QUC4wMS4wMRcNOTkwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMTAwWqAjMCEwCg" +
-        "YDVR0UBAMCAQEwEwYDVR0jBAwwCoAIO1U69B4DBHQwDQYJKoZIhvcNAQEFBQADgYEAHtbX" +
-        "MUofQlCnbJhgLQw96jsBRu0Kdx/Rk4LWxEbZQOWNaD7aukASjEv63d1qZIDgpefuUNTz5s" +
-        "3eascdtI6iyWFtBO3r6tihtkkSbxocN2Rz7OlR4rW9VwuUirxP0145nMd5CEL03/CNABP5" +
-        "zUo1bNgswHW3z/RaH6h0j0yTkbo=";
-    public static final String End_Certificate_PP_01_01_crt = 
-        "MIIChjCCAe+gAwIBAgIBRDANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1" +
-        "UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3Rpbmcx" +
-        "FTATBgNVBAMTDENBMS1QUC4wMS4wMTAeFw05ODAxMDExMjAxMDBaFw00ODAxMDExMjAxMD" +
-        "BaMGAxCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9VLlMuIEdvdmVybm1lbnQxDDAKBgNVBAsT" +
-        "A0RvRDEQMA4GA1UECxMHVGVzdGluZzEXMBUGA1UEAxMOVXNlcjEtUFAuMDEuMDEwgZ8wDQ" +
-        "YJKoZIhvcNAQEBBQADgY0AMIGJAoGBALQaTS1wvv551g3BP9JYBMM+KXXLzxtOwPlO5NR4" +
-        "LwuJJB2WuO4vmbn8AG35in/0JqwjZeroLQvbCPxZseXsyA0+7cMO0qcjRJ5l5WdFsahT6g" +
-        "z1YW8pYYY5i2eDUkIRsM7roHMiNjt3zpkuUGX0xZQfAxhuWnRIvlGg5J4r7UOdAgMBAAGj" +
-        "UjBQMA4GA1UdDwEB/wQEAwIF4DAWBgNVHSAEDzANMAsGCWCGSAFlAwEwATARBgNVHQ4ECg" +
-        "QIeyLSANVaTpQwEwYDVR0jBAwwCoAIO1U69B4DBHQwDQYJKoZIhvcNAQEFBQADgYEAvZ4a" +
-        "SQMNl+Q++D9yVaGr+37XJyxs4yow5e5YM9LXn1qBASQ+GNfqPWoe2cPCPYKj32yulxyFEu" +
-        "RHrbhpEQe+nrKWJgO9W1bmfwgQDin29ne/JCQPlznhd3EPFvCkmPLnTyJmSLR6B2VxvndM" +
-        "GO8JEbj3KCf51uf3VnC/Qj11mX8=";
-    public static final String[] TEST_34_DATA = new String[] {
-        Intermediate_Certificate_PP_01_01_crt,
-        Intermediate_CRL_PP_01_01_crl,
-        End_Certificate_PP_01_01_crt
-    };
-
-    /*  
-     *  test35
-     *  
-     */ 
-
-    public static final String Intermediate_Certificate_PP_01_02_crt = 
-        "MIICfTCCAeagAwIBAgIBRTANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1" +
-        "UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb0QxEDAOBgNVBAsTB1Rlc3Rpbmcx" +
-        "FTATBgNVBAMTDFRydXN0IEFuY2hvcjAeFw05ODAxMDExMjAxMDBaFw00ODAxMDExMjAxMD" +
-        "BaMF4xCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9VLlMuIEdvdmVybm1lbnQxDDAKBgNVBAsT" +
-        "A0RvZDEQMA4GA1UECxMHVGVzdGluZzEVMBMGA1UEAxMMQ0ExLVBQLjAxLjAyMIGfMA0GCS" +
-        "qGSIb3DQEBAQUAA4GNADCBiQKBgQCkQQXRO+dnU2v7EbaqQNmfPD8v0s5Wa50hl9M1Gfr5" +
-        "5nuVUZs/RI//1VksTNrW10MVh11nsxpA/XRPntEIbHiH1OoECd4dnZBiA/2xEueM02fTjj" +
-        "fb/t7g+pr9dSU/TzCVZDVWFBcPn4VNz7BBqIrTAOXaJkyBZ8hh7vyiE1Y2VQIDAQABo0sw" +
-        "STAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjARBgNVHQ4ECgQIoTKVlZ8YCR" +
-        "AwEwYDVR0jBAwwCoAIq5rr+cLnVI8wDQYJKoZIhvcNAQEFBQADgYEADhtnd6ifr6kyfC5D" +
-        "UWuAXLtoccMj8Jaur/1YT1DgnH1XbBsEeZwm9Jkzr1a3cXPIHgaHYgXvBeGUtZ3XhbCSGp" +
-        "8U6clJz3lm3qKPKkb5rdDrpdTaPnEJJjS3C4ZK1L7UZtQga2Enlelm5vIkhjsF3Sexe1kY" +
-        "mzqiLZZ8yLxJ/Tg=";
-    public static final String Intermediate_CRL_PP_01_02_crl = 
-        "MIIBSzCBtQIBATANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS" +
-        "5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNV" +
-        "BAMTDENBMS1QUC4wMS4wMhcNOTkwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMTAwWqAjMCEwCg" +
-        "YDVR0UBAMCAQEwEwYDVR0jBAwwCoAIoTKVlZ8YCRAwDQYJKoZIhvcNAQEFBQADgYEAn94u" +
-        "sT8ZYNzfHIdnx0+fV0jglL0Kn1duz+ehKHow+RGqH+J9opMYuXVD+rVQnLdZl5LbFBcv+5" +
-        "TSP9WR9QtyoXar4/jmY2FFdBjfgO9w7p7OHD4WxblJmfPVOvrzFm/slZE39Oe5Qn4KlS03" +
-        "9tttEFTKDH3qREQbT6g4k4ExxYM=";
-    public static final String End_Certificate_PP_01_02_crt = 
-        "MIICbjCCAdegAwIBAgIBRjANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1" +
-        "UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3Rpbmcx" +
-        "FTATBgNVBAMTDENBMS1QUC4wMS4wMjAeFw05ODAxMDExMjAxMDBaFw00ODAxMDExMjAxMD" +
-        "BaMGAxCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9VLlMuIEdvdmVybm1lbnQxDDAKBgNVBAsT" +
-        "A0RvRDEQMA4GA1UECxMHVGVzdGluZzEXMBUGA1UEAxMOVXNlcjEtUFAuMDEuMDIwgZ8wDQ" +
-        "YJKoZIhvcNAQEBBQADgY0AMIGJAoGBANBwkwTWdZ977UAx6CCpXc9T4MX9T3/Tt6LbtY9I" +
-        "eXxI9W15eXm/aqrKiXhULB+oF9/qNeUi2fAtrURZ7hgHbTaswr8CZ3Uwc6Rbkyj2GGiM6Z" +
-        "8sKFztYZfFyGBiNEwfTT0yaUUQ6etIFqPuL/6qLvqXmvNPxFb9gjTH/azs/MdNAgMBAAGj" +
-        "OjA4MA4GA1UdDwEB/wQEAwIF4DARBgNVHQ4ECgQIW1/BRCbe3c0wEwYDVR0jBAwwCoAIoT" +
-        "KVlZ8YCRAwDQYJKoZIhvcNAQEFBQADgYEAPJg24q7wCU8CVlxFLchoe7txhkzApkVMIJ9G" +
-        "+QTnraHDn0CZS6undCsJw8mrTNBQPHFn2Ixa5lrPfJvwW4Med1bcJKbwR4TveL1WeYYq6+" +
-        "9k1kS/7KmqyKAKC/s504jAc7qgMd4b08oLxbGVfFVjWG/ZMbO770FrsyRHHs2rTOU=";
-    public static final String[] TEST_35_DATA = new String[] {
-        Intermediate_Certificate_PP_01_02_crt,
-        Intermediate_CRL_PP_01_02_crl,
-        End_Certificate_PP_01_02_crt
-    };
-
-    /*  
-     *  test36
-     *  
-     */ 
-
-    public static final String Intermediate_Certificate_1_PP_01_03_crt = 
-        "MIIClTCCAf6gAwIBAgIBRzANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1" +
-        "UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb0QxEDAOBgNVBAsTB1Rlc3Rpbmcx" +
-        "FTATBgNVBAMTDFRydXN0IEFuY2hvcjAeFw05ODAxMDExMjAxMDBaFw00ODAxMDExMjAxMD" +
-        "BaMF4xCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9VLlMuIEdvdmVybm1lbnQxDDAKBgNVBAsT" +
-        "A0RvZDEQMA4GA1UECxMHVGVzdGluZzEVMBMGA1UEAxMMQ0ExLVBQLjAxLjAzMIGfMA0GCS" +
-        "qGSIb3DQEBAQUAA4GNADCBiQKBgQDL/XgMvoeszcAzZqMYnv1At5u83Gb/CEX3fv6O1jL4" +
-        "W3XbdvBNIZpuTwQhTH4Iofk9rIuQdkR7xOmbk4AqZINuas3Y1CPdzss7teraK0CNralNl1" +
-        "jPYK+ClDBHt32Iw3bAl7RqWX73hl3YH6/7cvG4XCo1HqeeFFHUGa7HXGXq9QIDAQABo2Mw" +
-        "YTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAWBgNVHSAEDzANMAsGCWCGSA" +
-        "FlAwEwAjARBgNVHQ4ECgQITMu5Qbn1Cm4wEwYDVR0jBAwwCoAIq5rr+cLnVI8wDQYJKoZI" +
-        "hvcNAQEFBQADgYEAuCnzXbHg87PIYYRbCCiXKDKA3MOcEKuxpNaSbtm12DQWpnvzmaK5nB" +
-        "D/Ebko97CS7u9Tpwa7TmTyi39bYzY0dmVaotCDzfSTpzw6qHZl/w8riS+cKr0mimnjW1cq" +
-        "kGPyHf0zBBqh0liGbd7EOLIBln0ASrn8V+G4Tj0Q6aQVcko=";
-    public static final String Intermediate_Certificate_2_PP_01_03_crt = 
-        "MIIClTCCAf6gAwIBAgIBSDANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1" +
-        "UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3Rpbmcx" +
-        "FTATBgNVBAMTDENBMS1QUC4wMS4wMzAeFw05ODAxMDExMjAxMDBaFw00ODAxMDExMjAxMD" +
-        "BaMF4xCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9VLlMuIEdvdmVybm1lbnQxDDAKBgNVBAsT" +
-        "A0RvZDEQMA4GA1UECxMHVGVzdGluZzEVMBMGA1UEAxMMQ0EyLVBQLjAxLjAzMIGfMA0GCS" +
-        "qGSIb3DQEBAQUAA4GNADCBiQKBgQCu1Fq+gBJsBf5EjKKtNIxgdtgPMObby7tKH7fTJxYE" +
-        "5LPyPi/IiWQ5Mi/8BCG3zmQhu9ZdBbpal350qCGVTbaMlnpi98D4WwXSw7e8oHIJIK689p" +
-        "Q6Z5cf8hgwPnwDpYLeEaqxwhd4bu0x1lG1fUISA0ZZIQaEeNSJfdh15IkAswIDAQABo2Mw" +
-        "YTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAWBgNVHSAEDzANMAsGCWCGSA" +
-        "FlAwEwATARBgNVHQ4ECgQILRhQwULcyPYwEwYDVR0jBAwwCoAITMu5Qbn1Cm4wDQYJKoZI" +
-        "hvcNAQEFBQADgYEAlEVOqXcdeTU7wT0l+/BJhlG5iaAcanAsOaJFZsXPjLMSjhldQe11/z" +
-        "BsrrqjcpdctcmBarKO4MnwqVU9DN2RZ/v5Gps6OcPxj3T8wlrCGe4l6s9d1FncBMJ0RAUe" +
-        "QEn2JLkQW5JWRBQ00+RXJYFuIM6Ger2MipWj1oOciv9MMoc=";
-    public static final String Intermediate_CRL_1_PP_01_03_crl = 
-        "MIIBSzCBtQIBATANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS" +
-        "5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNV" +
-        "BAMTDENBMS1QUC4wMS4wMxcNOTkwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMTAwWqAjMCEwCg" +
-        "YDVR0UBAMCAQEwEwYDVR0jBAwwCoAITMu5Qbn1Cm4wDQYJKoZIhvcNAQEFBQADgYEAycux" +
-        "rzvy2IiYfFkTw7QgGuBhxIQPbSIbfudqyUumuviHJkIMZpPwYj2wltjyiRaozrDAWq8mlc" +
-        "PsFYNr2lUYN5Cj4BhNQCNZlyBw7LLdzRgza55zVjmYkHWedyZm3kPWe7Y0w8xc/XIvi3iC" +
-        "qlwV+X85cgHNJarx3GEYdb7Yos4=";
-    public static final String Intermediate_CRL_2_PP_01_03_crl = 
-        "MIIBSzCBtQIBATANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS" +
-        "5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNV" +
-        "BAMTDENBMi1QUC4wMS4wMxcNOTkwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMTAwWqAjMCEwCg" +
-        "YDVR0UBAMCAQEwEwYDVR0jBAwwCoAILRhQwULcyPYwDQYJKoZIhvcNAQEFBQADgYEAbcjU" +
-        "+8l6pSik8PcuIzWndAg/w8uRfAgR5W9hPSXZChlx7uM+48wK98DGEXuTkJcbeclZia+Mpi" +
-        "J5u3qG1zhoL1aHr+RqyJrjiWKC4/rDBuiUk/ftU54mrYn0qev3aSjf/GLtpcC8kC3gpqD+" +
-        "20bvxLjBG3Vc9ZrxDvzfj8cD9K4=";
-    public static final String End_Certificate_PP_01_03_crt = 
-        "MIIChjCCAe+gAwIBAgIBSTANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1" +
-        "UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3Rpbmcx" +
-        "FTATBgNVBAMTDENBMi1QUC4wMS4wMzAeFw05ODAxMDExMjAxMDBaFw00ODAxMDExMjAxMD" +
-        "BaMGAxCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9VLlMuIEdvdmVybm1lbnQxDDAKBgNVBAsT" +
-        "A0RvRDEQMA4GA1UECxMHVGVzdGluZzEXMBUGA1UEAxMOVXNlcjEtUFAuMDEuMDMwgZ8wDQ" +
-        "YJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMO0l0+X6jfT8cY4DumtseTryyIJ7h+nraogXmYo" +
-        "uhFGvMUWEAZVGD4x9QTTVEL/UCqNfzpI//Pp/uZpDudSgOX0ZdAbykObqCAEO85msK+eie" +
-        "8baS1cW1XGjCuWDqNZko3Uo3c5lLPlRMbZ3hjvA1zmYh3prYnOh032GZAArVcVAgMBAAGj" +
-        "UjBQMA4GA1UdDwEB/wQEAwIF4DAWBgNVHSAEDzANMAsGCWCGSAFlAwEwATARBgNVHQ4ECg" +
-        "QIMh2aWvtm0mgwEwYDVR0jBAwwCoAILRhQwULcyPYwDQYJKoZIhvcNAQEFBQADgYEAigVE" +
-        "FlCgbgKLR9FWIiwnz1bZ0MKsfhytllCI+jGx0Q3o3CxCGXs9PvL6BPDdMOxNIT/oU2uG64" +
-        "EhZEjcZCnUknGx9OkkSSVq44P/pGuUx1g4Kx4i8gsJ/UPrPpYv/3heuMcKWCr92l33cxPT" +
-        "IU+kmAtqy0MBvBKL4p635+MSIVA=";
-    public static final String[] TEST_36_DATA = new String[] {
-        Intermediate_Certificate_1_PP_01_03_crt,
-        Intermediate_Certificate_2_PP_01_03_crt,
-        Intermediate_CRL_1_PP_01_03_crl,
-        Intermediate_CRL_2_PP_01_03_crl,
-        End_Certificate_PP_01_03_crt
-    };
-
-    /*  
-     *  test37
-     *  
-     */ 
-
-    public static final String Intermediate_Certificate_1_PP_01_04_crt = 
-        "MIIClTCCAf6gAwIBAgIBSjANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1" +
-        "UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb0QxEDAOBgNVBAsTB1Rlc3Rpbmcx" +
-        "FTATBgNVBAMTDFRydXN0IEFuY2hvcjAeFw05ODAxMDExMjAxMDBaFw00ODAxMDExMjAxMD" +
-        "BaMF4xCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9VLlMuIEdvdmVybm1lbnQxDDAKBgNVBAsT" +
-        "A0RvZDEQMA4GA1UECxMHVGVzdGluZzEVMBMGA1UEAxMMQ0ExLVBQLjAxLjA0MIGfMA0GCS" +
-        "qGSIb3DQEBAQUAA4GNADCBiQKBgQC9gxMP8j4L+ISffY9wkislQ/V5sO9LzZOncYK93lZf" +
-        "HXJG1MPSQzFPNzDLSc2zsilA03v6q+zr4NRrRWwWGmB34NGM4aqkoxox/7ngTn0MIq5gZ2" +
-        "eOx0FbjA9W9DHEceVDS6kgs9lFcN2W+muCG2/fGqQUED9Fzl9JSM/tE8XAKwIDAQABo2Mw" +
-        "YTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAWBgNVHSAEDzANMAsGCWCGSA" +
-        "FlAwEwATARBgNVHQ4ECgQIgdUt9H4i6kwwEwYDVR0jBAwwCoAIq5rr+cLnVI8wDQYJKoZI" +
-        "hvcNAQEFBQADgYEAxPe0vM0BvormJLF5HxkyFcTtoombfDGANoLoyj+PTWRD6z1/AcAx5K" +
-        "rn/0J1sZo13M2ezaZUABbbpNH9X0OS225IJF4mXNpfkYhsz/+jNPGjRpN2p0K+DhMSawUw" +
-        "QfGv2x6f31k6WCdy/769i1mwKP6Rpph2nkRyYW8MwO0N5HU=";
-    public static final String Intermediate_Certificate_2_PP_01_04_crt = 
-        "MIIClTCCAf6gAwIBAgIBSzANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1" +
-        "UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3Rpbmcx" +
-        "FTATBgNVBAMTDENBMS1QUC4wMS4wNDAeFw05ODAxMDExMjAxMDBaFw00ODAxMDExMjAxMD" +
-        "BaMF4xCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9VLlMuIEdvdmVybm1lbnQxDDAKBgNVBAsT" +
-        "A0RvZDEQMA4GA1UECxMHVGVzdGluZzEVMBMGA1UEAxMMQ0EyLVBQLjAxLjA0MIGfMA0GCS" +
-        "qGSIb3DQEBAQUAA4GNADCBiQKBgQC7YCtN67S/ItOzaSGqTvfEE483HoQGiQZ0ob3+0beK" +
-        "kmbSGADBQVBKe/sLJEKddyV2Gl8S4x+cKaKBWUI8lMZViJwWqVnyAFd8ZiAB/BpXaKKgP5" +
-        "pFsg10Yo/EtsxGlLSTLurst0azNnFv7ca5Hb8te3T91eaI6y59IjbsRgilSQIDAQABo2Mw" +
-        "YTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAWBgNVHSAEDzANMAsGCWCGSA" +
-        "FlAwEwATARBgNVHQ4ECgQIGazrt+QRNCkwEwYDVR0jBAwwCoAIgdUt9H4i6kwwDQYJKoZI" +
-        "hvcNAQEFBQADgYEAUIz/MSc6K5eaIAg8skaAgm6rSPvcU/711b9G0qsIs6YqvEz4zhGi5X" +
-        "nalYYXfaSQzomuRuABNvuR1Ydaw/B9OdPMro0DhX8VpY6NzCL5Qj60/I4is5a+Hzgk82ck" +
-        "eAC3okPHbVMd7R9kdFsWNE3Capnv7rriqXO3vwFw8b9vXD4=";
-    public static final String Intermediate_CRL_1_PP_01_04_crl = 
-        "MIIBSzCBtQIBATANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS" +
-        "5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNV" +
-        "BAMTDENBMS1QUC4wMS4wNBcNOTkwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMTAwWqAjMCEwCg" +
-        "YDVR0UBAMCAQEwEwYDVR0jBAwwCoAIgdUt9H4i6kwwDQYJKoZIhvcNAQEFBQADgYEAkR24" +
-        "ebKfvEhDA0C7sawukQbv/q8mjSS3CrhA/oqeb8bML1IlW8rjHSXuRU/n3oeyAZuxLCAQMU" +
-        "TPG6Vq4dOu8XC1RY74xIm8ps4mE0xB8/nI5kadHUSDPtUZhNzc8tv+z7fUGRaVGL7CBEpq" +
-        "ICyQKYytCwxyf4xu2Ip71Uy2tuo=";
-    public static final String Intermediate_CRL_2_PP_01_04_crl = 
-        "MIIBSzCBtQIBATANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS" +
-        "5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNV" +
-        "BAMTDENBMi1QUC4wMS4wNBcNOTkwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMTAwWqAjMCEwCg" +
-        "YDVR0UBAMCAQEwEwYDVR0jBAwwCoAIGazrt+QRNCkwDQYJKoZIhvcNAQEFBQADgYEAjpUo" +
-        "XSj0HX7Wm4w1FiRBBazInGOhSQX9VP2GcGb5lfr3GKt75Y+C+C9qd5X25DVkA4M1gPBK+u" +
-        "XjSMQoHAmFJychQG23rcGcuDJlzRMyfvPCF9dOGLFdmkuHSo5hQUyYsxnXV8cWLIkR1AUz" +
-        "PtUbTJL9g98R/OJFsCBiPi+By6w=";
-    public static final String End_Certificate_PP_01_04_crt = 
-        "MIIChjCCAe+gAwIBAgIBTDANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1" +
-        "UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3Rpbmcx" +
-        "FTATBgNVBAMTDENBMi1QUC4wMS4wNDAeFw05ODAxMDExMjAxMDBaFw00ODAxMDExMjAxMD" +
-        "BaMGAxCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9VLlMuIEdvdmVybm1lbnQxDDAKBgNVBAsT" +
-        "A0RvRDEQMA4GA1UECxMHVGVzdGluZzEXMBUGA1UEAxMOVXNlcjEtUFAuMDEuMDQwgZ8wDQ" +
-        "YJKoZIhvcNAQEBBQADgY0AMIGJAoGBAOtf65MaydWM3bmMT8tAGCX8gZkx1JlgQyBlJT67" +
-        "2APIkfmKRFK/dBtSwwCVGHZG4JYBrrwMpzUPrkGKYI6ZVIvvPnPfadZns9i5SM5LZFS+a5" +
-        "JfbRnSJd8dXhZsKHxqkxIWwG6+VgnRKXE/Uc4m8TePQJZEOra5ezna5yhvqUwPAgMBAAGj" +
-        "UjBQMA4GA1UdDwEB/wQEAwIF4DAWBgNVHSAEDzANMAsGCWCGSAFlAwEwAjARBgNVHQ4ECg" +
-        "QI4iNoMjKiXMkwEwYDVR0jBAwwCoAIGazrt+QRNCkwDQYJKoZIhvcNAQEFBQADgYEAmOjp" +
-        "2EupE1AmgjGfiGK1fk9kf39yQXK1EDsyO6KLdWL/bmWeYi/G7ZE57/+yVVADJuHI8xVIDZ" +
-        "LAC0u5p35OLgbcmmA5bs52KWJJfa0nbgGpVaUSMg9SkEGS997OsgExWMvYhdFIKXlq4Rwc" +
-        "ca89Hg1GlXdrpfD2OCDNBvcWB5Y=";
-    public static final String[] TEST_37_DATA = new String[] {
-        Intermediate_Certificate_1_PP_01_04_crt,
-        Intermediate_Certificate_2_PP_01_04_crt,
-        Intermediate_CRL_1_PP_01_04_crl,
-        Intermediate_CRL_2_PP_01_04_crl,
-        End_Certificate_PP_01_04_crt
-    };
-
-    /*  
-     *  test38
-     *  
-     */ 
-
-    public static final String Intermediate_Certificate_1_PP_01_05_crt = 
-        "MIIClTCCAf6gAwIBAgIBTTANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1" +
-        "UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb0QxEDAOBgNVBAsTB1Rlc3Rpbmcx" +
-        "FTATBgNVBAMTDFRydXN0IEFuY2hvcjAeFw05ODAxMDExMjAxMDBaFw00ODAxMDExMjAxMD" +
-        "BaMF4xCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9VLlMuIEdvdmVybm1lbnQxDDAKBgNVBAsT" +
-        "A0RvZDEQMA4GA1UECxMHVGVzdGluZzEVMBMGA1UEAxMMQ0ExLVBQLjAxLjA1MIGfMA0GCS" +
-        "qGSIb3DQEBAQUAA4GNADCBiQKBgQDFzEEzV/yUEORIOufyqpZzKpYz5aPyBbcDf8AMMCM5" +
-        "tEz7j39cf1f227cbrTcAaUfYFwkrb07RU4bTS2X+U2Ak7Q5OROz5rrZBbsfwF3yHhwHxCg" +
-        "KLjbwz7D+OJdNfv7x2HRckwfMUkmP4cEuJIIPwj1ieBbsnUi9dkWZePwl80QIDAQABo2Mw" +
-        "YTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAWBgNVHSAEDzANMAsGCWCGSA" +
-        "FlAwEwATARBgNVHQ4ECgQIjsCjmszYCHMwEwYDVR0jBAwwCoAIq5rr+cLnVI8wDQYJKoZI" +
-        "hvcNAQEFBQADgYEAWMUBdOdHMB/SV5kPUk+zut9g/1v/GyxyB60mq9jGqjrIsk4a9JRqa5" +
-        "MWju+6kVfSLelAOCR24EQsXnZM/5Qqg3Wb/SFJXWDcBnfWQWgh8UmJfmPhD7jViG5QVIxn" +
-        "iALNCYtz373L+IDECLMO6S3wcTPsHdYv14jl6BKtabwIpE4=";
-    public static final String Intermediate_Certificate_2_PP_01_05_crt = 
-        "MIIClTCCAf6gAwIBAgIBTjANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1" +
-        "UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3Rpbmcx" +
-        "FTATBgNVBAMTDENBMS1QUC4wMS4wNTAeFw05ODAxMDExMjAxMDBaFw00ODAxMDExMjAxMD" +
-        "BaMF4xCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9VLlMuIEdvdmVybm1lbnQxDDAKBgNVBAsT" +
-        "A0RvZDEQMA4GA1UECxMHVGVzdGluZzEVMBMGA1UEAxMMQ0EyLVBQLjAxLjA1MIGfMA0GCS" +
-        "qGSIb3DQEBAQUAA4GNADCBiQKBgQCZzdj+ixWCuxJGMjcoHUwSNqI9Wt9gYwXUTl+dWg/E" +
-        "lg2SPJP7lrBOibAhSmaTorhunUSEf2adhdxhuGrd5Ucp6G0oZAa6ZDWaID4rKYWsI7d5kv" +
-        "mrUhDEEdzk2s4PCoPiQm4dKwRg2rIvA5Dv+W1ldqSVSG376zVrQ5xdjDUX5QIDAQABo2Mw" +
-        "YTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAWBgNVHSAEDzANMAsGCWCGSA" +
-        "FlAwEwAjARBgNVHQ4ECgQIUASviIKBmJgwEwYDVR0jBAwwCoAIjsCjmszYCHMwDQYJKoZI" +
-        "hvcNAQEFBQADgYEAa3c+0Drcq7iWP7K+gE6Mz/0ATQoiG87irXWfWBUGWtYnsh6K+1THMl" +
-        "ibmZjYhsztK1P5rm6qL6HAyw0PhrRE9imqZ16cgiMomh65BWQImOeiXx9YWIPvjXWsE6iV" +
-        "E31XShr9b9OZBA2+Zpydc3ID/SQzy9PiTAfL5yJiW/JZvFw=";
-    public static final String Intermediate_CRL_1_PP_01_05_crl = 
-        "MIIBSzCBtQIBATANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS" +
-        "5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNV" +
-        "BAMTDENBMS1QUC4wMS4wNRcNOTkwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMTAwWqAjMCEwCg" +
-        "YDVR0UBAMCAQEwEwYDVR0jBAwwCoAIjsCjmszYCHMwDQYJKoZIhvcNAQEFBQADgYEAZIzN" +
-        "pXT89MplQgcXcA/K7YKlf62QCbw3rE+bUQiumJMlNGiVdaNJ8T66ObyoOWE+s+KN/Oetlu" +
-        "HglQ7r6RG68gHYtZZiO6kmxq+wor65dFGQyRggpD+D47yioEgR12wUUksL/8oBW1pfGW2B" +
-        "dR4sNWjzV5k5EWbLYu7wxj2/ubo=";
-    public static final String Intermediate_CRL_2_PP_01_05_crl = 
-        "MIIBSzCBtQIBATANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS" +
-        "5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNV" +
-        "BAMTDENBMi1QUC4wMS4wNRcNOTkwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMTAwWqAjMCEwCg" +
-        "YDVR0UBAMCAQEwEwYDVR0jBAwwCoAIUASviIKBmJgwDQYJKoZIhvcNAQEFBQADgYEAlZ06" +
-        "h2L/89GvCtU1K1VtbHPMN/LAUYJrWFID1Eo+Cf/5wKEGBr8hxRtvshTK436zqVQRQN/XTq" +
-        "7u0SLxvIixNRErlmUlGByi5vumN2OA77SxOyqYLCnBXTd5tWbFGz/udjaNk1MxOK0MQxPV" +
-        "9R+HHUUVojRnAIQvlcqx/sMzU5o=";
-    public static final String End_Certificate_PP_01_05_crt = 
-        "MIIChjCCAe+gAwIBAgIBTzANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1" +
-        "UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3Rpbmcx" +
-        "FTATBgNVBAMTDENBMi1QUC4wMS4wNTAeFw05ODAxMDExMjAxMDBaFw00ODAxMDExMjAxMD" +
-        "BaMGAxCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9VLlMuIEdvdmVybm1lbnQxDDAKBgNVBAsT" +
-        "A0RvRDEQMA4GA1UECxMHVGVzdGluZzEXMBUGA1UEAxMOVXNlcjEtUFAuMDEuMDUwgZ8wDQ" +
-        "YJKoZIhvcNAQEBBQADgY0AMIGJAoGBALyBn2GKvoKNHcu3AEJRCbWOyUpCc/onvRoQgWRr" +
-        "wE7vMI7vjqnoR8mXdWDW5u9DFu9V5pb/yHBWn1zpgFGNnLrqn8irwR9i6Q+qlu4lXL5WSr" +
-        "DqBqEKxrOBDPgkVz8Ldjt/Hy57qEukBarvpAwTc4XEJPAmxNrboMeGCEn2UShbAgMBAAGj" +
-        "UjBQMA4GA1UdDwEB/wQEAwIF4DAWBgNVHSAEDzANMAsGCWCGSAFlAwEwATARBgNVHQ4ECg" +
-        "QIaV3Cd/83r08wEwYDVR0jBAwwCoAIUASviIKBmJgwDQYJKoZIhvcNAQEFBQADgYEAVJXz" +
-        "gooT1qd6rdehnLxJMf1HZ6JuqpyoQjzWF1jA3SkJmBDMXvAkMmIcQ7r5CZHaVF0iMQl5JW" +
-        "fxPtM9Bws6jZhVL0TkwJHmbnSvbzUkJYeXPCP7ags4bu5I32co1nFVF6wf3aQDZeLFj/TU" +
-        "1GCQ4rh80T5oknuazD4xXAYx9sE=";
-    public static final String[] TEST_38_DATA = new String[] {
-        Intermediate_Certificate_1_PP_01_05_crt,
-        Intermediate_Certificate_2_PP_01_05_crt,
-        Intermediate_CRL_1_PP_01_05_crl,
-        Intermediate_CRL_2_PP_01_05_crl,
-        End_Certificate_PP_01_05_crt
-    };
-
-    /*  
-     *  test39
-     *  
-     */ 
-
-    public static final String Intermediate_Certificate_1_PP_01_06_crt = 
-        "MIICvjCCAiegAwIBAgIBUDANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1" +
-        "UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb0QxEDAOBgNVBAsTB1Rlc3Rpbmcx" +
-        "FTATBgNVBAMTDFRydXN0IEFuY2hvcjAeFw05ODAxMDExMjAxMDBaFw00ODAxMDExMjAxMD" +
-        "BaMF4xCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9VLlMuIEdvdmVybm1lbnQxDDAKBgNVBAsT" +
-        "A0RvZDEQMA4GA1UECxMHVGVzdGluZzEVMBMGA1UEAxMMQ0ExLVBQLjAxLjA2MIGfMA0GCS" +
-        "qGSIb3DQEBAQUAA4GNADCBiQKBgQCjeJAwaZ0cw6O76hu15XadwJiTsIJcXZxGAETq8H9p" +
-        "VJs7kJh57oLpO/lG8zG89QS9g1ozxaaGDWsSyXsDzv1eqDVZg3ISQu6XcKdDu8EwgQDY3S" +
-        "EGkJ2AidFue3l0kEwR9+rtsuVKd/P+ULF1hWcoyLB/sQD5z8GvIiDKyRBiFwIDAQABo4GL" +
-        "MIGIMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMD0GA1UdIAQ2MDQwCwYJYI" +
-        "ZIAWUDATABMAsGCWCGSAFlAwEwAjALBglghkgBZQMBMAMwCwYJYIZIAWUDATAEMBEGA1Ud" +
-        "DgQKBAh9i6tKUsPTgTATBgNVHSMEDDAKgAirmuv5wudUjzANBgkqhkiG9w0BAQUFAAOBgQ" +
-        "B/Gxsb5lxSTN21CrjBp2aE+U1oTP2MpIFWUD1q8KWhZZF1iCQ7orcDVITqJPdPxDu1YwKk" +
-        "zOegc4YBSJzHZqF/W4Kw4wisMfnWLTsUAeP/Ucz4vXk5rsf7IRssFG6PLxVmtRZizoxl9a" +
-        "DO9abTM/jV8Mgi1IB6LdWgmtosBGBzbQ==";
-    public static final String Intermediate_Certificate_2_PP_01_06_crt = 
-        "MIICrzCCAhigAwIBAgIBUTANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1" +
-        "UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3Rpbmcx" +
-        "FTATBgNVBAMTDENBMS1QUC4wMS4wNjAeFw05ODAxMDExMjAxMDBaFw00ODAxMDExMjAxMD" +
-        "BaMF4xCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9VLlMuIEdvdmVybm1lbnQxDDAKBgNVBAsT" +
-        "A0RvZDEQMA4GA1UECxMHVGVzdGluZzEVMBMGA1UEAxMMQ0EyLVBQLjAxLjA2MIGfMA0GCS" +
-        "qGSIb3DQEBAQUAA4GNADCBiQKBgQC8DbqYUf437toWlRkOQA5PloqYQjWYpiR67yGSjQHp" +
-        "j/HlduTYFS4qfUbLCjH4qsNUH8yQDvogImQw5M1IQOsUAqO6mYFxjqUWccuOaHT6XfUaOs" +
-        "DDHr/tQUvhz3LJryaILiPlNcQF8QiYpujM1utVRyFpmUrMAlOvWUB93c/xUQIDAQABo30w" +
-        "ezAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAwBgNVHSAEKTAnMAsGCWCGSA" +
-        "FlAwEwATALBglghkgBZQMBMAIwCwYJYIZIAWUDATADMBEGA1UdDgQKBAgQxGVMTJml1TAT" +
-        "BgNVHSMEDDAKgAh9i6tKUsPTgTANBgkqhkiG9w0BAQUFAAOBgQALJtPqY5uROJ+2QYTekn" +
-        "fSUc0gC7j3/cngIvxGT385xDLTrd6TjYSi+12+vU7RNd3MIZoz1o7RpWQV6C751WtOFuZi" +
-        "iXeQ758aLqfhjYSVW/NHkO8vjrAMUzUbgjqb03k7q5JgtT6udB+9ySmou2/RxYW5p/IT17" +
-        "euMVGmQb/RFg==";
-    public static final String Intermediate_Certificate_3_PP_01_06_crt = 
-        "MIICojCCAgugAwIBAgIBUjANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1" +
-        "UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3Rpbmcx" +
-        "FTATBgNVBAMTDENBMi1QUC4wMS4wNjAeFw05ODAxMDExMjAxMDBaFw00ODAxMDExMjAxMD" +
-        "BaMF4xCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9VLlMuIEdvdmVybm1lbnQxDDAKBgNVBAsT" +
-        "A0RvZDEQMA4GA1UECxMHVGVzdGluZzEVMBMGA1UEAxMMQ0EzLVBQLjAxLjA2MIGfMA0GCS" +
-        "qGSIb3DQEBAQUAA4GNADCBiQKBgQCsQqIx0ayxpIE8NduclvK1ubbNkXyvr0RDqnGOoyTj" +
-        "yMtnfnwRbclkFCNBdalZYofuTWP0reqvqGqsBj+RS3uazvDBqVmn0J0AGRiLILummgEFRJ" +
-        "ow8IB1hduDYJpDMrHRpfXpbG2H3fzN1XeX/B0hUZgdQ86GyK2qrmyIcyqZXwIDAQABo3Aw" +
-        "bjAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAjBgNVHSAEHDAaMAsGCWCGSA" +
-        "FlAwEwATALBglghkgBZQMBMAIwEQYDVR0OBAoECNKJMmEWCA+jMBMGA1UdIwQMMAqACBDE" +
-        "ZUxMmaXVMA0GCSqGSIb3DQEBBQUAA4GBAKv9F3+Y4N8RX4bRZ4fFTKri2rrB4BsVrBFpOr" +
-        "SLzKnuyO1O5gg45d70pSHUAVBn3pz0f/6WwWLECq9tB7/Fphi0TyqeFmkRnysygZGlvLgs" +
-        "L19bpIgVPkjFFziMGuzdAFIGy8vnV19yJ2euMygEHr20yiGBUaHHnKyuOGbDg4i7";
-    public static final String Intermediate_CRL_1_PP_01_06_crl = 
-        "MIIBSzCBtQIBATANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS" +
-        "5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNV" +
-        "BAMTDENBMS1QUC4wMS4wNhcNOTkwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMTAwWqAjMCEwCg" +
-        "YDVR0UBAMCAQEwEwYDVR0jBAwwCoAIfYurSlLD04EwDQYJKoZIhvcNAQEFBQADgYEARL4u" +
-        "DZvfcQDYanTfwU/hWAJDdDO7m7oQZLy3o0PTqXkk2Jd2v3+M2U8UN2PcuqZXT1lwS/piiW" +
-        "Sc1x1YndD0qUtV4bOZ9SESPhCeOc1lQTk5mMf/zqFxQqYv8rfDB5O3QY4bjS7QQzSsvmal" +
-        "TGCnoHmUJ4skmZJrQAzYnXyD9G4=";
-    public static final String Intermediate_CRL_2_PP_01_06_crl = 
-        "MIIBSzCBtQIBATANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS" +
-        "5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNV" +
-        "BAMTDENBMi1QUC4wMS4wNhcNOTkwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMTAwWqAjMCEwCg" +
-        "YDVR0UBAMCAQEwEwYDVR0jBAwwCoAIEMRlTEyZpdUwDQYJKoZIhvcNAQEFBQADgYEAcEyr" +
-        "sgLhVq0L6N5fww/U6TW4lqaVAEtjqxluWRyZnL3AJLEHfwh1lllCG5dNM5fahGDOW/53fV" +
-        "+gW5l92bsi2D/lAkDfNUdQdi5ZpQG9y2zhTArUlx9z1+KXklCi2Gg1X22gi+cYbK2hfzk6" +
-        "kNGP1v42bjrkF/ECczpy3e41rEg=";
-    public static final String Intermediate_CRL_3_PP_01_06_crl = 
-        "MIIBSzCBtQIBATANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS" +
-        "5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNV" +
-        "BAMTDENBMy1QUC4wMS4wNhcNOTkwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMTAwWqAjMCEwCg" +
-        "YDVR0UBAMCAQEwEwYDVR0jBAwwCoAI0okyYRYID6MwDQYJKoZIhvcNAQEFBQADgYEAp3uQ" +
-        "Tn2HC65TFmSjzvjuStIJwJcVahNcTWiGdtfTalZrMtuC9vUgQq0K1QIa7QNC9C3hQlzb5e" +
-        "bO7JhJDs+5GZnnsqHN3pvdKEoueRfWBjUGpPnSGFD61ysf9aDFY2j9Amf3zcBFsXZs4+DM" +
-        "dIENndbjkwqCV4zRTajAqCsIy20=";
-    public static final String End_Certificate_PP_01_06_crt = 
-        "MIIClTCCAf6gAwIBAgIBUzANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1" +
-        "UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3Rpbmcx" +
-        "FTATBgNVBAMTDENBMy1QUC4wMS4wNjAeFw05ODAxMDExMjAxMDBaFw00ODAxMDExMjAxMD" +
-        "BaMF4xCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9VLlMuIEdvdmVybm1lbnQxDDAKBgNVBAsT" +
-        "A0RvZDEQMA4GA1UECxMHVGVzdGluZzEVMBMGA1UEAxMMQ0E0LVBQLjAxLjA2MIGfMA0GCS" +
-        "qGSIb3DQEBAQUAA4GNADCBiQKBgQC+IxiNJMOQG2gx1xd9ELNuzs9LrVJVRLvgP0lpWrx2" +
-        "2HTEXPDB6YmrEg/YgyptmQ5Z4K6CEgJz3EdDOarCSGcL7DmcSEwEw46MV3piS5DrHwQ4GH" +
-        "a2/ENSh3lF+6dliBwbQR2necmQ5g8ekqkWNb65pLl6RCNGkntJpdu8w5GWbwIDAQABo2Mw" +
-        "YTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIF4DAWBgNVHSAEDzANMAsGCWCGSA" +
-        "FlAwEwATARBgNVHQ4ECgQIMf/eRyakKwgwEwYDVR0jBAwwCoAI0okyYRYID6MwDQYJKoZI" +
-        "hvcNAQEFBQADgYEADgpHRDgyPuK4dc+m2p0IELHUAK3qsdTZzBXsaA0rkkk1aRjI6DQ2qg" +
-        "b4crRU3spQgYwBC7KQYd/hp8Lk17iX6fdV/9wol0DxTGhamOJA0uRl768awRArf4cEUElF" +
-        "uWPN8D3wJEfL6BWgReUJWg8V9HEtdvXZZgzFN/CgHRkQ2RM=";
-    public static final String[] TEST_39_DATA = new String[] {
-        Intermediate_Certificate_1_PP_01_06_crt,
-        Intermediate_Certificate_2_PP_01_06_crt,
-        Intermediate_Certificate_3_PP_01_06_crt,
-        Intermediate_CRL_1_PP_01_06_crl,
-        Intermediate_CRL_2_PP_01_06_crl,
-        Intermediate_CRL_3_PP_01_06_crl,
-        End_Certificate_PP_01_06_crt
-    };
-
-    /*  
-     *  test40
-     *  
-     */ 
-
-    public static final String Intermediate_Certificate_1_PP_01_07_crt = 
-        "MIICrzCCAhigAwIBAgIBVDANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1" +
-        "UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb0QxEDAOBgNVBAsTB1Rlc3Rpbmcx" +
-        "FTATBgNVBAMTDFRydXN0IEFuY2hvcjAeFw05ODAxMDExMjAxMDBaFw00ODAxMDExMjAxMD" +
-        "BaMF4xCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9VLlMuIEdvdmVybm1lbnQxDDAKBgNVBAsT" +
-        "A0RvZDEQMA4GA1UECxMHVGVzdGluZzEVMBMGA1UEAxMMQ0ExLVBQLjAxLjA3MIGfMA0GCS" +
-        "qGSIb3DQEBAQUAA4GNADCBiQKBgQDs3Z/FfgJOyKp+Ds8xiQBM053cWylYbD+g+zuWDz3d" +
-        "nD0eF77TLPITL7hwI058Pn3tXHlveuKMFqbvzWUgFXaBoHmmRohIj1eqfJQhlmKLjlSYyC" +
-        "N4xhLVi7vg71ZjFdRk1k8ME1HDfpb2WXqXh9LyRYY8b/aqL+NHe1PUDbT6FQIDAQABo30w" +
-        "ezAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAwBgNVHSAEKTAnMAsGCWCGSA" +
-        "FlAwEwATALBglghkgBZQMBMAIwCwYJYIZIAWUDATADMBEGA1UdDgQKBAgvehPxsTfSBDAT" +
-        "BgNVHSMEDDAKgAirmuv5wudUjzANBgkqhkiG9w0BAQUFAAOBgQBpdMBEONGcpFitMN1ihf" +
-        "W441E4HVTQwtF+h56aagVFndUF1gQsVEdDNmvvN/jdlzXotcfdEj1lOahmcwWbPOlNx3PB" +
-        "LUPAcaNM9SCrXWi1gKJK3gXC2OAxj0mT5XhfPlAdfhZXTBZLqMqebmk6kVwa+VyPPZFHGy" +
-        "BW0fV2ClJ69Q==";
-    public static final String Intermediate_Certificate_2_PP_01_07_crt = 
-        "MIICojCCAgugAwIBAgIBVTANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1" +
-        "UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3Rpbmcx" +
-        "FTATBgNVBAMTDENBMS1QUC4wMS4wNzAeFw05ODAxMDExMjAxMDBaFw00ODAxMDExMjAxMD" +
-        "BaMF4xCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9VLlMuIEdvdmVybm1lbnQxDDAKBgNVBAsT" +
-        "A0RvZDEQMA4GA1UECxMHVGVzdGluZzEVMBMGA1UEAxMMQ0EyLVBQLjAxLjA3MIGfMA0GCS" +
-        "qGSIb3DQEBAQUAA4GNADCBiQKBgQCrO/98w96Bg5YTTmtdc9sL8AOABGcYx5J8E1Y7/GhU" +
-        "2sInc/j0dtBbE0Tj4KFIKpVLD0m2mTyHVCUA0/QGiS1Tq6DzmZW/V36Clya3CoX9rDTJyU" +
-        "cKHpgntV19fFAK58aksyKCdP9jjLpbSspzOlIc+mVW+hkjgw3NcuY6fAOQvQIDAQABo3Aw" +
-        "bjAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAjBgNVHSAEHDAaMAsGCWCGSA" +
-        "FlAwEwATALBglghkgBZQMBMAIwEQYDVR0OBAoECEmeATXRkM5EMBMGA1UdIwQMMAqACC96" +
-        "E/GxN9IEMA0GCSqGSIb3DQEBBQUAA4GBAG/Qv60jyImedUXtCYl0QpQ1Ne2ZLxvUHRLms8" +
-        "B1nXC/Rze7zfz5cwiyQn+6XN2rhuYFdTMDEFZDIjeeCLNllfan4GUAdRGtoJnfoLOGLlQf" +
-        "RW1ONc80cxd1NTxHqxOtqpWdoJQEn8070WLqQPACEs88XYKBZ00sF9ZdSg5vhHUu";
-    public static final String Intermediate_Certificate_3_PP_01_07_crt = 
-        "MIIClTCCAf6gAwIBAgIBVjANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1" +
-        "UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3Rpbmcx" +
-        "FTATBgNVBAMTDENBMi1QUC4wMS4wNzAeFw05ODAxMDExMjAxMDBaFw00ODAxMDExMjAxMD" +
-        "BaMF4xCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9VLlMuIEdvdmVybm1lbnQxDDAKBgNVBAsT" +
-        "A0RvZDEQMA4GA1UECxMHVGVzdGluZzEVMBMGA1UEAxMMQ0EzLVBQLjAxLjA3MIGfMA0GCS" +
-        "qGSIb3DQEBAQUAA4GNADCBiQKBgQC+5b7o4iWl80ntDMKGcnquLQDTGlf6Gy/8y34Vw08/" +
-        "8ij+nuHMiKpo6UCF0OpDcnkJ2ovvMsY5dAb5ErhH64UbnMlKbghnGv0sVidtipoC8u7ey1" +
-        "YUIzDCdmbNvTfho6IXKzH8ev//K+FJd3qBuKHl9u2Kk5+igsyb+bPSid7d/QIDAQABo2Mw" +
-        "YTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAWBgNVHSAEDzANMAsGCWCGSA" +
-        "FlAwEwATARBgNVHQ4ECgQIUDKu7h5EQ70wEwYDVR0jBAwwCoAISZ4BNdGQzkQwDQYJKoZI" +
-        "hvcNAQEFBQADgYEAnKhR3OvdgtVtmio7ikCvjxlSoKVbUleazxONOxHUAKdXEv0/mSOTwp" +
-        "hPPIoE2xAqPOOHvXPmzmJpPADjrfhU6afJ7ThDRFTMk4ZLOkT1SvRlymK7uWhj5bhUgi6S" +
-        "UQ2LUmrY2hIN4cTrrzZvDw2Q/6UIuqpmySXEOHDL5T5MXEo=";
-    public static final String Intermediate_CRL_1_PP_01_07_crl = 
-        "MIIBSzCBtQIBATANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS" +
-        "5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNV" +
-        "BAMTDENBMS1QUC4wMS4wNxcNOTkwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMTAwWqAjMCEwCg" +
-        "YDVR0UBAMCAQEwEwYDVR0jBAwwCoAIL3oT8bE30gQwDQYJKoZIhvcNAQEFBQADgYEA4gZR" +
-        "71wRXNdxWe7kaQPAw44UUw+cN1bDBU0RV7nwYAFDYxDIaDGOfjhUVTMBq4rb51S7uqIqYS" +
-        "F6j7BdLXl9WVRJobfkRH0t0cBnuSeQRz3ckrZrCuvyxb3PEL3pbf0UH1i/BfoG+EHJAY7R" +
-        "OVOL/dyoXeX6ehH6ImGhucDixS0=";
-    public static final String Intermediate_CRL_2_PP_01_07_crl = 
-        "MIIBSzCBtQIBATANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS" +
-        "5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNV" +
-        "BAMTDENBMi1QUC4wMS4wNxcNOTkwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMTAwWqAjMCEwCg" +
-        "YDVR0UBAMCAQEwEwYDVR0jBAwwCoAISZ4BNdGQzkQwDQYJKoZIhvcNAQEFBQADgYEAfzKw" +
-        "NHrl10PJDHa3olBYXYzXi94zxDsEQSIb+W4pPXUfDZijPqL1NzapLqc/uL1Sl28GmLDrbm" +
-        "nCrlMn1Kt/gI6XndOnSyC9Sg6WDxAI3HTHxlG5MHLBn9Lb36CHobnwep1BMo8zl2clh0Kz" +
-        "PIxQSGXM1BDpHkwF5eoFAolDih4=";
-    public static final String Intermediate_CRL_3_PP_01_07_crl = 
-        "MIIBSzCBtQIBATANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS" +
-        "5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNV" +
-        "BAMTDENBMy1QUC4wMS4wNxcNOTkwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMTAwWqAjMCEwCg" +
-        "YDVR0UBAMCAQEwEwYDVR0jBAwwCoAIUDKu7h5EQ70wDQYJKoZIhvcNAQEFBQADgYEAj7+M" +
-        "EeIe1GmJpbRUFqbNrDvT5tHjKQMNdbe5Y8F920U5t0ig1Up60kc7hs7LH57i6R/quPOpym" +
-        "a9Eo9Bql+P2Bg9FELih5/a4B021TZBmmdSI5fwQZ6Q5PjgG58Zl2cJitNYvGi7tVUBojA5" +
-        "CSN7KBMyipia9ivxm9a/llJPrQY=";
-    public static final String End_Certificate_PP_01_07_crt = 
-        "MIIClTCCAf6gAwIBAgIBVzANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1" +
-        "UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3Rpbmcx" +
-        "FTATBgNVBAMTDENBMy1QUC4wMS4wNzAeFw05ODAxMDExMjAxMDBaFw00ODAxMDExMjAxMD" +
-        "BaMF4xCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9VLlMuIEdvdmVybm1lbnQxDDAKBgNVBAsT" +
-        "A0RvZDEQMA4GA1UECxMHVGVzdGluZzEVMBMGA1UEAxMMQ0E0LVBQLjAxLjA3MIGfMA0GCS" +
-        "qGSIb3DQEBAQUAA4GNADCBiQKBgQC/RmUcYHxgQRHCUh5cMug/J2o8DzYbT+2pIehJkNCr" +
-        "zfqemV3qshLdMct5GV73oEkG5b6n7tj3/hI1TLh/A3LQpKROAGZybdo9fk4Pa0+6V6ql/U" +
-        "NnSpcAKct/f3IvchGo9nBGdi9aE+j+xKhMM6E8xj1+Jc7Z0xz7zE4+qRbeZQIDAQABo2Mw" +
-        "YTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIF4DAWBgNVHSAEDzANMAsGCWCGSA" +
-        "FlAwEwAjARBgNVHQ4ECgQI/y572lfRyH4wEwYDVR0jBAwwCoAIUDKu7h5EQ70wDQYJKoZI" +
-        "hvcNAQEFBQADgYEANl9zdMKbaq14OP45PeK9D4ftOSuliW2di1qAX38FQoWPYLLoaDU0Q1" +
-        "9I54PDY/UYRR9jKDl1WPhV6cD+65eadtiOZVr/h1CaW/HxTloouzN4z1zCXMC7AxZKo+EI" +
-        "XLN8f4w7hKLFYgf6gP9+iVi+T2gKfH5Ch2zjRhlmGFRgsBQ=";
-    public static final String[] TEST_40_DATA = new String[] {
-        Intermediate_Certificate_1_PP_01_07_crt,
-        Intermediate_Certificate_2_PP_01_07_crt,
-        Intermediate_Certificate_3_PP_01_07_crt,
-        Intermediate_CRL_1_PP_01_07_crl,
-        Intermediate_CRL_2_PP_01_07_crl,
-        Intermediate_CRL_3_PP_01_07_crl,
-        End_Certificate_PP_01_07_crt
-    };
-
-    /*  
-     *  test41
-     *  
-     */ 
-
-    public static final String Intermediate_Certificate_1_PP_01_08_crt = 
-        "MIICojCCAgugAwIBAgIBWDANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1" +
-        "UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb0QxEDAOBgNVBAsTB1Rlc3Rpbmcx" +
-        "FTATBgNVBAMTDFRydXN0IEFuY2hvcjAeFw05ODAxMDExMjAxMDBaFw00ODAxMDExMjAxMD" +
-        "BaMF4xCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9VLlMuIEdvdmVybm1lbnQxDDAKBgNVBAsT" +
-        "A0RvZDEQMA4GA1UECxMHVGVzdGluZzEVMBMGA1UEAxMMQ0ExLVBQLjAxLjA4MIGfMA0GCS" +
-        "qGSIb3DQEBAQUAA4GNADCBiQKBgQDDe20HLq7R8b0fWTsEiNV3Z5IbQseZ8QCW+1cb6yM+" +
-        "ArKLJDnXx8zmTHSHQCpw3G7xhGsxA1btm0cSC5P/1bw/kFWsSLRe2NFF6oKU+7c+cgIUMB" +
-        "kzyXk+kpWAQRb7hcb50iKdKFtO8gMNGMAxlHRI05/1tThyAs9suI4TrxTS9QIDAQABo3Aw" +
-        "bjAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAjBgNVHSAEHDAaMAsGCWCGSA" +
-        "FlAwEwATALBglghkgBZQMBMAIwEQYDVR0OBAoECFxr9vgF31fKMBMGA1UdIwQMMAqACKua" +
-        "6/nC51SPMA0GCSqGSIb3DQEBBQUAA4GBABaX7TYfmSyVmzGCVbTFweUuPilo4wzy7z/w0x" +
-        "y4uSaM/YMtixUdDPpTHOJNYDdeV85v+w9oezdL2ZYAaGn7tldC6k8ouq/6hOGGST+ziHJS" +
-        "gTOD8UVBQPRPvWEwgmDIprnzrVRz8rG6uqslXNiBDnO9BMGpRo4dy8YpOmV6BPCD";
-    public static final String Intermediate_Certificate_2_PP_01_08_crt = 
-        "MIIClTCCAf6gAwIBAgIBWTANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1" +
-        "UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3Rpbmcx" +
-        "FTATBgNVBAMTDENBMS1QUC4wMS4wODAeFw05ODAxMDExMjAxMDBaFw00ODAxMDExMjAxMD" +
-        "BaMF4xCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9VLlMuIEdvdmVybm1lbnQxDDAKBgNVBAsT" +
-        "A0RvZDEQMA4GA1UECxMHVGVzdGluZzEVMBMGA1UEAxMMQ0EyLVBQLjAxLjA4MIGfMA0GCS" +
-        "qGSIb3DQEBAQUAA4GNADCBiQKBgQC8nLZcMLHYKxVqbhwJiqQbAYhf7S6ck2O9AhNor935" +
-        "Bfm7/8qVZbBAotQy1PoCjSW0UYdknDolWvi8aAtO0f9XVrAv6BZVVW9j3osIGN/XUThaN+" +
-        "9dZ83kGpyjeoitpGK4wbFNDteuBFYp+8gFNupnX7JQwUK3aGwBUucbe7puRQIDAQABo2Mw" +
-        "YTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAWBgNVHSAEDzANMAsGCWCGSA" +
-        "FlAwEwATARBgNVHQ4ECgQIL0xyFYBk4OcwEwYDVR0jBAwwCoAIXGv2+AXfV8owDQYJKoZI" +
-        "hvcNAQEFBQADgYEAPk+Lys0Ueoyhp544EH9Hqy9+gY+l/+N99v7KvBlZWKuhkwZDE+qAYT" +
-        "P/SOPsWe8ADZE2iQ4pOlpK8jSqtJSdK69RgGL9omLnR04L9c/zKLArBE+VmoV7mohcQp8x" +
-        "aB4q/g3QnAqwfFYDjIWW3H6gRAeQ5MOtKdz/4042fJxc5L8=";
-    public static final String Intermediate_Certificate_3_PP_01_08_crt = 
-        "MIIClTCCAf6gAwIBAgIBWjANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1" +
-        "UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3Rpbmcx" +
-        "FTATBgNVBAMTDENBMi1QUC4wMS4wODAeFw05ODAxMDExMjAxMDBaFw00ODAxMDExMjAxMD" +
-        "BaMF4xCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9VLlMuIEdvdmVybm1lbnQxDDAKBgNVBAsT" +
-        "A0RvZDEQMA4GA1UECxMHVGVzdGluZzEVMBMGA1UEAxMMQ0EzLVBQLjAxLjA4MIGfMA0GCS" +
-        "qGSIb3DQEBAQUAA4GNADCBiQKBgQCvy6bNOyVaP8JTwiySFa3Sj+rdSqzkalK5gA7DLk4q" +
-        "AyvnAK64HgbCsb8dpnSi94WBDsocrQ4C1Ltoahc/AZyRVLA/REsAh1r3/0FALZgYiIxvSF" +
-        "m3ihKb3P9URBbotzhl1ahRZPSrcxKwNXEmxB0gjixGW7GZTARq3Il5ressRwIDAQABo2Mw" +
-        "YTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAWBgNVHSAEDzANMAsGCWCGSA" +
-        "FlAwEwAjARBgNVHQ4ECgQIwFtfZBe/KqUwEwYDVR0jBAwwCoAIL0xyFYBk4OcwDQYJKoZI" +
-        "hvcNAQEFBQADgYEAeZhpIDEYyV/LkOtUf1TryemJExQ1jdfirJ3AUtoFIoWz1p9aqnV6Po" +
-        "GAMozjtdyotfSA2O8c065DwD+CvUXPmdD+2vWpX/2hJPj+x++UvvntAokD2UE9HCeEvBHK" +
-        "rr59hvKKd6GChyhAjLris202eTLIiMEoyZy9X/Wt1nXF8/g=";
-    public static final String Intermediate_CRL_1_PP_01_08_crl = 
-        "MIIBSzCBtQIBATANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS" +
-        "5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNV" +
-        "BAMTDENBMS1QUC4wMS4wOBcNOTkwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMTAwWqAjMCEwCg" +
-        "YDVR0UBAMCAQEwEwYDVR0jBAwwCoAIXGv2+AXfV8owDQYJKoZIhvcNAQEFBQADgYEAhkwT" +
-        "E/EGAe32J883qVrh1wG5xQzO/GGfp/zuDYGL2k1zZ2zq7MajKfzBoXXQ3WPh5dTK1sy5o5" +
-        "boPHG0pge0B4/2JvuDVS539+9HAPansUNsrMXzOblg1acjdKtuk4oS8PIYkM/lbA6yJl6F" +
-        "QMbdIthWqa2gjaWKll3R8fVUjxI=";
-    public static final String Intermediate_CRL_2_PP_01_08_crl = 
-        "MIIBSzCBtQIBATANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS" +
-        "5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNV" +
-        "BAMTDENBMi1QUC4wMS4wOBcNOTkwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMTAwWqAjMCEwCg" +
-        "YDVR0UBAMCAQEwEwYDVR0jBAwwCoAIL0xyFYBk4OcwDQYJKoZIhvcNAQEFBQADgYEAN6BQ" +
-        "sEQT5YCvs9vlUSdG4gjTgNkyQTCdmSIcufpK4MG/AoW/Fn5zJXxiMyHmvT/dkk/UOf82/s" +
-        "41YI/Inz4qRmGF4IL7jo+l7V+OI1n+Vf4ClgZU6ocb9d1dFoBkJu3xI9dcWK6ExpzaBUXw" +
-        "rPJilV4M5luGbszdDCs9cLjmiRA=";
-    public static final String Intermediate_CRL_3_PP_01_08_crl = 
-        "MIIBSzCBtQIBATANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS" +
-        "5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNV" +
-        "BAMTDENBMy1QUC4wMS4wOBcNOTkwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMTAwWqAjMCEwCg" +
-        "YDVR0UBAMCAQEwEwYDVR0jBAwwCoAIwFtfZBe/KqUwDQYJKoZIhvcNAQEFBQADgYEAkmDx" +
-        "t+r59llppKmm9mSTof9/BX2rNyG9LfIH7wweoDi9be2vYOLy0NU1kJ8f3/muEw2v7hWDri" +
-        "k9ROLDFnb/S8MYVT0l4rymRhpshPF1uMTOZmfJUCfTX9jIaShztSScqcGSP0a3EUfDD14R" +
-        "1yMu2pdlMM35llE0lV3uf/eUNr0=";
-    public static final String End_Certificate_PP_01_08_crt = 
-        "MIIClTCCAf6gAwIBAgIBWzANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1" +
-        "UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3Rpbmcx" +
-        "FTATBgNVBAMTDENBMy1QUC4wMS4wODAeFw05ODAxMDExMjAxMDBaFw00ODAxMDExMjAxMD" +
-        "BaMF4xCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9VLlMuIEdvdmVybm1lbnQxDDAKBgNVBAsT" +
-        "A0RvZDEQMA4GA1UECxMHVGVzdGluZzEVMBMGA1UEAxMMQ0E0LVBQLjAxLjA4MIGfMA0GCS" +
-        "qGSIb3DQEBAQUAA4GNADCBiQKBgQDTWNp6Oz39wwU8AFDzYVs3UfVvXg+t6j/qFavnvllI" +
-        "NO6aU1o4Hnk1wfmTPZPErc00/MfizMSumTYYRl21hEZWhjNO5uQIHrF9V/4OToo2iOfsPd" +
-        "gxwpSokwxcl7CJyadwUxhRDYCLhSORXoCK1CPQZjwb+uQz799O5ozb0WVNYQIDAQABo2Mw" +
-        "YTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIF4DAWBgNVHSAEDzANMAsGCWCGSA" +
-        "FlAwEwAjARBgNVHQ4ECgQIO1TNJtWwaiIwEwYDVR0jBAwwCoAIwFtfZBe/KqUwDQYJKoZI" +
-        "hvcNAQEFBQADgYEANmP9hyFnYvi8gdtRe8ERoEG90NwoyPTsB8sXd40f+Sm1QxKqMPzKPL" +
-        "7bOtY12JGwZ55a6HFVgpw4PnU+0iOcCMHS5OQQLtyirxX2HfioiXEmcmRJT6FvLHrGIHGv" +
-        "KNcfc3rUiksdOb6+j2k8x4IwQ6pBEHQwY8U4Y4DgqALlqM0=";
-    public static final String[] TEST_41_DATA = new String[] {
-        Intermediate_Certificate_1_PP_01_08_crt,
-        Intermediate_Certificate_2_PP_01_08_crt,
-        Intermediate_Certificate_3_PP_01_08_crt,
-        Intermediate_CRL_1_PP_01_08_crl,
-        Intermediate_CRL_2_PP_01_08_crl,
-        Intermediate_CRL_3_PP_01_08_crl,
-        End_Certificate_PP_01_08_crt
-    };
-
-    /*  
-     *  test42
-     *  
-     */ 
-
-    public static final String Intermediate_Certificate_1_PP_01_09_crt = 
-        "MIICrzCCAhigAwIBAgIBXDANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1" +
-        "UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb0QxEDAOBgNVBAsTB1Rlc3Rpbmcx" +
-        "FTATBgNVBAMTDFRydXN0IEFuY2hvcjAeFw05ODAxMDExMjAxMDBaFw00ODAxMDExMjAxMD" +
-        "BaMF4xCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9VLlMuIEdvdmVybm1lbnQxDDAKBgNVBAsT" +
-        "A0RvZDEQMA4GA1UECxMHVGVzdGluZzEVMBMGA1UEAxMMQ0ExLVBQLjAxLjA5MIGfMA0GCS" +
-        "qGSIb3DQEBAQUAA4GNADCBiQKBgQDJqSSqGjgI3JUJfA/XkloAOg2QtZeAGp2nCq1Oiply" +
-        "MTjJpMpEOSRYrEIgKMGnBPq33seP7X/obCT2jgexmbFT2TmPirM+h1aqbGQ7QAqsx80BdE" +
-        "ofdcfiNosLbbzli9qFrbarO7fJfBhzraBFGDJj3N8nLi2YtP9IieFYJ/MhKwIDAQABo30w" +
-        "ezAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAwBgNVHSAEKTAnMAsGCWCGSA" +
-        "FlAwEwATALBglghkgBZQMBMAIwCwYJYIZIAWUDATADMBEGA1UdDgQKBAiVRMrZuHQ7VjAT" +
-        "BgNVHSMEDDAKgAirmuv5wudUjzANBgkqhkiG9w0BAQUFAAOBgQCetZy9JMzUVveSPE2fQY" +
-        "4fRVChyvIc9nCE4wbzhnRl3zduBGmAwTFr7dRWSFTnEq1c2b6B5nJtCzmt4Ovapf69sIlM" +
-        "s3iV16eBB1WTNCY8YlAsnmZ7q/AR0t0vX+hh6QV6zN5xqulOM4Y8csZEx3RWJzV/LjE5w7" +
-        "mKvofBEUoqQA==";
-    public static final String Intermediate_Certificate_2_PP_01_09_crt = 
-        "MIICojCCAgugAwIBAgIBXTANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1" +
-        "UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3Rpbmcx" +
-        "FTATBgNVBAMTDENBMS1QUC4wMS4wOTAeFw05ODAxMDExMjAxMDBaFw00ODAxMDExMjAxMD" +
-        "BaMF4xCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9VLlMuIEdvdmVybm1lbnQxDDAKBgNVBAsT" +
-        "A0RvZDEQMA4GA1UECxMHVGVzdGluZzEVMBMGA1UEAxMMQ0EyLVBQLjAxLjA5MIGfMA0GCS" +
-        "qGSIb3DQEBAQUAA4GNADCBiQKBgQDWUTlTieoi7aLGUYOAgqUC2J/6JarOWfv4vobpwjAA" +
-        "DjvQGqg/GCZP7FgD/72Z4YefZKJEFZTDnYfmy2qh6iBYxcvLsJ+PJGzPCObNSmyq8gpeXy" +
-        "KKEeCZtEev1tSywTT6E5Dhee4dX0QHE4ydZEliMMXGRW/8ffT6x54CPwVylQIDAQABo3Aw" +
-        "bjAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAjBgNVHSAEHDAaMAsGCWCGSA" +
-        "FlAwEwATALBglghkgBZQMBMAIwEQYDVR0OBAoECAMhmGN8+qXoMBMGA1UdIwQMMAqACJVE" +
-        "ytm4dDtWMA0GCSqGSIb3DQEBBQUAA4GBALNjokGrTnWsPn5KrlO+g3R8tAGM90JQDjfrap" +
-        "xWM+nN+dUVVdGU6w2pAOAq2UhfySiP42qiFChnPK9oOqPF2Or7/kcmXZzBfZkE/FnJGNUA" +
-        "gs9je1nZvTPQYsF094OqE7QdJi2k3seA1tqejA1kihMHpwQNmIp8bFpqn4dPO6ys";
-    public static final String Intermediate_Certificate_3_PP_01_09_crt = 
-        "MIIClTCCAf6gAwIBAgIBXjANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1" +
-        "UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3Rpbmcx" +
-        "FTATBgNVBAMTDENBMi1QUC4wMS4wOTAeFw05ODAxMDExMjAxMDBaFw00ODAxMDExMjAxMD" +
-        "BaMF4xCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9VLlMuIEdvdmVybm1lbnQxDDAKBgNVBAsT" +
-        "A0RvZDEQMA4GA1UECxMHVGVzdGluZzEVMBMGA1UEAxMMQ0EzLVBQLjAxLjA5MIGfMA0GCS" +
-        "qGSIb3DQEBAQUAA4GNADCBiQKBgQDHUpHhF4ANNLOywnvpqyDgzLMtatW3ZxgLBBRYk6TE" +
-        "jMgTVKmRasVRTA9uatGG4b2f70YWs9cOd4ylQDqPEDdKNZ47bqZdX6RAU3j1dO9LBwWDbp" +
-        "NvZ3zuDBRDoCZClIcBESDYweaZ9nUgKl/WxTeCnMwqkfSJGYBBcHIonRPnGwIDAQABo2Mw" +
-        "YTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAWBgNVHSAEDzANMAsGCWCGSA" +
-        "FlAwEwAjARBgNVHQ4ECgQIyppef22OmjEwEwYDVR0jBAwwCoAIAyGYY3z6pegwDQYJKoZI" +
-        "hvcNAQEFBQADgYEAOySUCY+PZxomhWgTRSKRodOIe/QSfCMSC+0iw24a2TuJzFLjN9pSm9" +
-        "0C2PqWbfwD1uDjrteO1NK+1yhtIDySiptR9GmR/fhL7NJ+z7M4fEJBjjeeI9/aEIuHuBFT" +
-        "TVHfwsJxnZtjujtOdl56B825LsKW8Otumd2A43N9wIgSyBg=";
-    public static final String Intermediate_Certificate_4_PP_01_09_crt = 
-        "MIIClTCCAf6gAwIBAgIBXzANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1" +
-        "UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3Rpbmcx" +
-        "FTATBgNVBAMTDENBMy1QUC4wMS4wOTAeFw05ODAxMDExMjAxMDBaFw00ODAxMDExMjAxMD" +
-        "BaMF4xCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9VLlMuIEdvdmVybm1lbnQxDDAKBgNVBAsT" +
-        "A0RvZDEQMA4GA1UECxMHVGVzdGluZzEVMBMGA1UEAxMMQ0E0LVBQLjAxLjA5MIGfMA0GCS" +
-        "qGSIb3DQEBAQUAA4GNADCBiQKBgQDR8/c35YqAswoRMgQswlTbKB9oYEzrFSC0G4dt8ydP" +
-        "O4PyQs+J8wUVrRVMiVDTLO9rUnzR1T3iA0dqM+SvWMIA8pMWKyNV58f73ZPJIejhxMmOZa" +
-        "sSLHceMmmMRy1zyk38i3ZJP3YhvxffTjWyTZ9k2xSDX+6KNnkiKkJSKpl6nwIDAQABo2Mw" +
-        "YTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAWBgNVHSAEDzANMAsGCWCGSA" +
-        "FlAwEwATARBgNVHQ4ECgQIpcWcVIIu63kwEwYDVR0jBAwwCoAIyppef22OmjEwDQYJKoZI" +
-        "hvcNAQEFBQADgYEAckgV11ND/D1vfPEMUbDGUvtmsziHiSuEoDLJqSAhOmcX+evKWOfoVo" +
-        "f7og+0ajuul7yuB+7YX1AakOw+33k++Rsgg4o+ImZq3+VScpgnIQ037OOhgH3umwFRC0r3" +
-        "NpWqhmQuz+mHnKiK3X+IDsQOFkhnpNs06CQSZzmrzbYlQU0=";
-    public static final String Intermediate_CRL_1_PP_01_09_crl = 
-        "MIIBSzCBtQIBATANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS" +
-        "5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNV" +
-        "BAMTDENBMS1QUC4wMS4wORcNOTkwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMTAwWqAjMCEwCg" +
-        "YDVR0UBAMCAQEwEwYDVR0jBAwwCoAIlUTK2bh0O1YwDQYJKoZIhvcNAQEFBQADgYEAkEc6" +
-        "qHGOWZXYTQ5fsWyJgEtuJyl8uJ+gMcikcMut5SIJTTtOz+q3wclYDevT8z1MM25kNdgwyg" +
-        "b1bwHNAG8I72eIDtGfLrChFwU3qpvVMTG9gPYJb05Q8On56nsBu/PnnzJervzxjViaeOuv" +
-        "kjwwfmWqGkyiK433WxzgPqE48eA=";
-    public static final String Intermediate_CRL_2_PP_01_09_crl = 
-        "MIIBSzCBtQIBATANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS" +
-        "5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNV" +
-        "BAMTDENBMi1QUC4wMS4wORcNOTkwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMTAwWqAjMCEwCg" +
-        "YDVR0UBAMCAQEwEwYDVR0jBAwwCoAIAyGYY3z6pegwDQYJKoZIhvcNAQEFBQADgYEAV9Md" +
-        "8PaNoIlT7WIwnelqrbwsR66vAaT8w3gu8XDYXu+MOYThfyERUvtH6AUrHWfiRvWEzKljHH" +
-        "3BQB0Zsa9Zz3U5cLzJcqtqDc1lH53aIA8MflrfMVrYSF684s28FikcukmA5Fw3+7S3TJ18" +
-        "Hq7plHwTCidVD6yG35hsPwcjTrE=";
-    public static final String Intermediate_CRL_3_PP_01_09_crl = 
-        "MIIBSzCBtQIBATANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS" +
-        "5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNV" +
-        "BAMTDENBMy1QUC4wMS4wORcNOTkwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMTAwWqAjMCEwCg" +
-        "YDVR0UBAMCAQEwEwYDVR0jBAwwCoAIyppef22OmjEwDQYJKoZIhvcNAQEFBQADgYEAjBaP" +
-        "V/TFQtDLxQFIBCbfqhlgpOfvJBatjNuvB0TuD2rsGS1eaLNfTfyVKlOLpxoKwKYMu36kIO" +
-        "l/+KEPDq+ofy7uDZ6GLK3KZ/WiJyriqBQjFCvlhNTW1cjA7Ejk2lOM/A46mrUS9xC+aITh" +
-        "d+/UYGt6O/e256cOwQCUaF2z328=";
-    public static final String Intermediate_CRL_4_PP_01_09_crl = 
-        "MIIBSzCBtQIBATANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS" +
-        "5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNV" +
-        "BAMTDENBNC1QUC4wMS4wORcNOTkwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMTAwWqAjMCEwCg" +
-        "YDVR0UBAMCAQEwEwYDVR0jBAwwCoAIpcWcVIIu63kwDQYJKoZIhvcNAQEFBQADgYEApZ1l" +
-        "w5SJoU8zeKwX5jpVWiFFFomDgKsNlkkX5mF88l0B6MiYbGqJIowJRfeIlxvPOf20imN7Z8" +
-        "l38DRXFacDQP4y5kxM420dp+ljQL5q9RsrC1+OS7I7TGgGwPoZTO4mHVk8nx9MyT+kW1OU" +
-        "x9qRYWN0CLmP22kutYBndny222Y=";
-    public static final String End_Certificate_PP_01_09_crt = 
-        "MIIChjCCAe+gAwIBAgIBYDANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1" +
-        "UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3Rpbmcx" +
-        "FTATBgNVBAMTDENBNC1QUC4wMS4wOTAeFw05ODAxMDExMjAxMDBaFw00ODAxMDExMjAxMD" +
-        "BaMGAxCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9VLlMuIEdvdmVybm1lbnQxDDAKBgNVBAsT" +
-        "A0RvRDEQMA4GA1UECxMHVGVzdGluZzEXMBUGA1UEAxMOVXNlcjEtUFAuMDEuMDkwgZ8wDQ" +
-        "YJKoZIhvcNAQEBBQADgY0AMIGJAoGBALiOjwwwUk1HNwf2rdzPL2okKTgL+lMdzhC7cbq3" +
-        "6A409EY7iipPCcsDsheo9EaTNOHV9xjWDqOhqjA38h4hGNkRUVOlTW2r8SoHISn3gDXfrh" +
-        "aHbU3owscAmt1nuA7rzo7L1eBPsisIIxAY16uAmVN5RdiAAaP8VUdshcNI4/1jAgMBAAGj" +
-        "UjBQMA4GA1UdDwEB/wQEAwIF4DAWBgNVHSAEDzANMAsGCWCGSAFlAwEwATARBgNVHQ4ECg" +
-        "QIGZIY3nffEXowEwYDVR0jBAwwCoAIpcWcVIIu63kwDQYJKoZIhvcNAQEFBQADgYEA0Svm" +
-        "aqjaeQx/lnF223xlCTsU7XzOxbHetRWfeCTw0QrWQaTrKjWTS/TNyzLhGuPBFg+NTTvWML" +
-        "gzteo/WWdF8+d2rOis9FVRCe/Euok6ZCL/xgzaE86ZSQg0jj6458TpuC2cszSaifRSlhL5" +
-        "ogy4ADWgJxdVcBrgADo6QZXkXXw=";
-    public static final String[] TEST_42_DATA = new String[] {
-        Intermediate_Certificate_1_PP_01_09_crt,
-        Intermediate_Certificate_2_PP_01_09_crt,
-        Intermediate_Certificate_3_PP_01_09_crt,
-        Intermediate_Certificate_4_PP_01_09_crt,
-        Intermediate_CRL_1_PP_01_09_crl,
-        Intermediate_CRL_2_PP_01_09_crl,
-        Intermediate_CRL_3_PP_01_09_crl,
-        Intermediate_CRL_4_PP_01_09_crl,
-        End_Certificate_PP_01_09_crt
-    };
-
-    /*  
-     *  test43
-     *  
-     */ 
-
-    public static final String Intermediate_Certificate_1_PP_06_01_crt = 
-        "MIICozCCAgygAwIBAgIBYTANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1" +
-        "UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb0QxEDAOBgNVBAsTB1Rlc3Rpbmcx" +
-        "FTATBgNVBAMTDFRydXN0IEFuY2hvcjAeFw05ODAxMDExMjAxMDBaFw00ODAxMDExMjAxMD" +
-        "BaMF4xCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9VLlMuIEdvdmVybm1lbnQxDDAKBgNVBAsT" +
-        "A0RvZDEQMA4GA1UECxMHVGVzdGluZzEVMBMGA1UEAxMMQ0ExLVBQLjA2LjAxMIGfMA0GCS" +
-        "qGSIb3DQEBAQUAA4GNADCBiQKBgQC4mu1oBHB9BeorCFJIuSw5tszmmYBD4bjTklsAfjrz" +
-        "OknQsYxEoHfifpdgivh1fMUk+mK5YWUz0G8/edquKbJhPBTTWp8opsGzTATsTLSEzkKbVM" +
-        "DQ84ttxrhJWlrVRlouZTnD5HoLUvujY4EdydmKsjj6UBt/tGL5EKodymcEtwIDAQABo3Ew" +
-        "bzAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAWBgNVHSAEDzANMAsGCWCGSA" +
-        "FlAwEwATAMBgNVHSQEBTADgAEKMBEGA1UdDgQKBAiGRi8YRte8PzATBgNVHSMEDDAKgAir" +
-        "muv5wudUjzANBgkqhkiG9w0BAQUFAAOBgQDHOaIki9TogVJn54FRPl+7FyzBJ2DnR4RTM/" +
-        "q1K3COWRdtvmGqtBBtAccxWziQJ5TnAQn1XA0cFPoCgymGPRcUz+0+C+3VhJ/m9LggVP3/" +
-        "pjJEG0fsmJtUYPyphUlXeUzf4qSj34SlJws3DIHTR8ozAR75HZmlMRnxyZBLl+jAng==";
-    public static final String Intermediate_Certificate_2_PP_06_01_crt = 
-        "MIIClTCCAf6gAwIBAgIBYjANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1" +
-        "UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3Rpbmcx" +
-        "FTATBgNVBAMTDENBMS1QUC4wNi4wMTAeFw05ODAxMDExMjAxMDBaFw00ODAxMDExMjAxMD" +
-        "BaMF4xCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9VLlMuIEdvdmVybm1lbnQxDDAKBgNVBAsT" +
-        "A0RvZDEQMA4GA1UECxMHVGVzdGluZzEVMBMGA1UEAxMMQ0EyLVBQLjA2LjAxMIGfMA0GCS" +
-        "qGSIb3DQEBAQUAA4GNADCBiQKBgQC2rptuREzhGfEJ3U8ILPBq+z0s+aafMvBRHpqkipDq" +
-        "bC7v9zpwg1K18F4MYiATpPAEfdEeprKs0mWfdusF93BoMBVm1y0zRgDRUNdyB5GFO8g8+2" +
-        "yNEO6L37c1PwrMLnvJakaqwbbnwlcMcKtLHoX19fyveQQg5DNj8WcKZj397wIDAQABo2Mw" +
-        "YTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAWBgNVHSAEDzANMAsGCWCGSA" +
-        "FlAwEwATARBgNVHQ4ECgQIJPt6qKdFeYEwEwYDVR0jBAwwCoAIhkYvGEbXvD8wDQYJKoZI" +
-        "hvcNAQEFBQADgYEAkFJGNze9/6YX7Rv8FR9obFGACIJ7Om4YQQRW9WM9pEDgKls7g9b9El" +
-        "dJxLKOlWoRoYZIrbEam19traE2O3dxqRevPoYvfAqkR089BkxH/cFYyfqw64IpjDG84dsY" +
-        "XieajI/Ov/HjgF0VQKF3+Y1ZiDjb2OHNgMkqs9VmUHaE+94=";
-    public static final String Intermediate_Certificate_3_PP_06_01_crt = 
-        "MIIClTCCAf6gAwIBAgIBYzANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1" +
-        "UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3Rpbmcx" +
-        "FTATBgNVBAMTDENBMi1QUC4wNi4wMTAeFw05ODAxMDExMjAxMDBaFw00ODAxMDExMjAxMD" +
-        "BaMF4xCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9VLlMuIEdvdmVybm1lbnQxDDAKBgNVBAsT" +
-        "A0RvZDEQMA4GA1UECxMHVGVzdGluZzEVMBMGA1UEAxMMQ0EzLVBQLjA2LjAxMIGfMA0GCS" +
-        "qGSIb3DQEBAQUAA4GNADCBiQKBgQCzxfyi52gw/5tt6/9aNAXdY3wZYH1GifzGoN4cg8Mt" +
-        "++5xmTdrc2A9/5biaTUVC0x/Ml6mm940NA9mM/EoEu4SdnP2crNCIFHWNlYz3cJtYJ68rE" +
-        "rEU+S0gnYaYRiwNGhVpAjV+FPDr0Ghgp5rYQ61evAhmRuNAFwYocUw80G6JQIDAQABo2Mw" +
-        "YTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAWBgNVHSAEDzANMAsGCWCGSA" +
-        "FlAwEwATARBgNVHQ4ECgQIZ9yMlboxCIEwEwYDVR0jBAwwCoAIJPt6qKdFeYEwDQYJKoZI" +
-        "hvcNAQEFBQADgYEATNnRMQmvTxRcSMUL4pa5bejuX2Ixy/OfZIAlJWt9AfLW2tHmdAaGpD" +
-        "GhTHKfyQQ+HrIMQ+lXau8Yu6nzWXAY8pKpKD1Hbd355VE4dYZ7aPvcAulZHeV0F2EFn09x" +
-        "qQ1frHDRoCOc11B5qV5hnwgDE/ByZh1+OWUcR4tBQKyEF4g=";
-    public static final String Intermediate_Certificate_4_PP_06_01_crt = 
-        "MIIClTCCAf6gAwIBAgIBZDANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1" +
-        "UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3Rpbmcx" +
-        "FTATBgNVBAMTDENBMy1QUC4wNi4wMTAeFw05ODAxMDExMjAxMDBaFw00ODAxMDExMjAxMD" +
-        "BaMF4xCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9VLlMuIEdvdmVybm1lbnQxDDAKBgNVBAsT" +
-        "A0RvZDEQMA4GA1UECxMHVGVzdGluZzEVMBMGA1UEAxMMQ0E0LVBQLjA2LjAxMIGfMA0GCS" +
-        "qGSIb3DQEBAQUAA4GNADCBiQKBgQDB66hLZx1WGcCqmOxHK/rotXOpccJQOB2L3kpWP1M2" +
-        "ZiWufUguLw45XShdqu31OgmGw0/w9ugwy96aRL+Tiluj4xjIAxJCav5cXF8Dt2Ex7hjIHm" +
-        "XV0rHbJUiduHEh3fQphgtzlR4QxG6i/i4SbcsoJzsws8x3qOqRPaWDtyWs0QIDAQABo2Mw" +
-        "YTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAWBgNVHSAEDzANMAsGCWCGSA" +
-        "FlAwEwATARBgNVHQ4ECgQIyZsLNvyyIZEwEwYDVR0jBAwwCoAIZ9yMlboxCIEwDQYJKoZI" +
-        "hvcNAQEFBQADgYEAc7G4BAUsQeqNp/Kv8TKJckfxWygz54PrkBICNw/eGuGamVJMRkYCP3" +
-        "yJ8NW4jY/rfxzKKyjVB09XuNBLDwYdR5Z5UHSg6Ijes3j8tehZ+9DwEQrR+WQf/adHIsxn" +
-        "/347MHrSQF7CJzE9tAu6AOu53lKxLeH6C/5YI611or2Ql1I=";
-    public static final String Intermediate_CRL_1_PP_06_01_crl = 
-        "MIIBSzCBtQIBATANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS" +
-        "5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNV" +
-        "BAMTDENBMS1QUC4wNi4wMRcNOTkwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMTAwWqAjMCEwCg" +
-        "YDVR0UBAMCAQEwEwYDVR0jBAwwCoAIhkYvGEbXvD8wDQYJKoZIhvcNAQEFBQADgYEAC7ev" +
-        "Pqe0veUX+zF51d/NiG6VwgEwOP1HlzD/saDn/FYXStTQDwoIyFjmZ9z0yLGIaVI1O9BWVD" +
-        "CTU3bCU1dBg61Blo3rI3TlNqmGrYRUSJ857QM9c/G+/+V0XJ/HgId39Pufd9Tob150XNMs" +
-        "9h0PvqjhYjG1bARMRa8JB4KTBU4=";
-    public static final String Intermediate_CRL_2_PP_06_01_crl = 
-        "MIIBSzCBtQIBATANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS" +
-        "5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNV" +
-        "BAMTDENBMi1QUC4wNi4wMRcNOTkwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMTAwWqAjMCEwCg" +
-        "YDVR0UBAMCAQEwEwYDVR0jBAwwCoAIJPt6qKdFeYEwDQYJKoZIhvcNAQEFBQADgYEAiUbi" +
-        "qQ3X/hTgjhpQGDZi/7EnZcqSgiAFMreV30/mav2NtXDITE9DqZzCS9x1vHBp4BBsQwYVvp" +
-        "XvLVSgns4pFwR+0Whc+tPo2j9ScePq3sICsqleWTN1DvuoP9rBe8w7pDN4guA59Kbeku75" +
-        "5CMA5YjiTUomK4UaqI3htwkBlWo=";
-    public static final String Intermediate_CRL_3_PP_06_01_crl = 
-        "MIIBSzCBtQIBATANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS" +
-        "5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNV" +
-        "BAMTDENBMy1QUC4wNi4wMRcNOTkwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMTAwWqAjMCEwCg" +
-        "YDVR0UBAMCAQEwEwYDVR0jBAwwCoAIZ9yMlboxCIEwDQYJKoZIhvcNAQEFBQADgYEANowv" +
-        "f/scWT6FFT393XEpWcTnA18hBT5Nkddw6mHjKBq7ndtBQkydMO8Wym1IeQ2qYbAqu3ifNZ" +
-        "SKF3PfgJjYPBKImzJdHTKfcclMC5H8Y9JDN0voeyONr9NiXcoj+p24YNYjb+PFI6avRYo7" +
-        "Xyrqvwnvng/IY9zLtc7SYYUIODk=";
-    public static final String Intermediate_CRL_4_PP_06_01_crl = 
-        "MIIBSzCBtQIBATANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS" +
-        "5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNV" +
-        "BAMTDENBNC1QUC4wNi4wMRcNOTkwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMTAwWqAjMCEwCg" +
-        "YDVR0UBAMCAQEwEwYDVR0jBAwwCoAIyZsLNvyyIZEwDQYJKoZIhvcNAQEFBQADgYEAsnA9" +
-        "ERwsi2mK540oPL45mLdOjGnet7+HhNk14q0hvALTYGB1vEjijc+Yvf6mHJGRbiG207BpJ1" +
-        "DWeWBY8TLe4YJXlSrWwx1jD46rCt7gdqXAdLpMo+i35yfQ19ZqeWcRLkspmczoUJLJaJza" +
-        "eLRrnjv62GLJ09KVKpZBGhV3SUM=";
-    public static final String End_Certificate_PP_06_01_crt = 
-        "MIICbjCCAdegAwIBAgIBZTANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1" +
-        "UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3Rpbmcx" +
-        "FTATBgNVBAMTDENBNC1QUC4wNi4wMTAeFw05ODAxMDExMjAxMDBaFw00ODAxMDExMjAxMD" +
-        "BaMGAxCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9VLlMuIEdvdmVybm1lbnQxDDAKBgNVBAsT" +
-        "A0RvRDEQMA4GA1UECxMHVGVzdGluZzEXMBUGA1UEAxMOVXNlcjEtUFAuMDYuMDEwgZ8wDQ" +
-        "YJKoZIhvcNAQEBBQADgY0AMIGJAoGBAKrLB7XA0PKY0qtSC5lMBvvIvbyjBM8XmANrN9Wx" +
-        "66QxEuloRAz0D5uAu7TnJBv6qNuIPGFl74yusKCSkjEkBMdVpBCfDvpG1/Tz3sALSlxmnz" +
-        "xbK2ytOncbYuYrzvXttx6wkhLrBLlnfuwpZwGZOr/Pt6WwQJWjXxgTNJ6dcgXbAgMBAAGj" +
-        "OjA4MA4GA1UdDwEB/wQEAwIF4DARBgNVHQ4ECgQIv0gg7LxDM+swEwYDVR0jBAwwCoAIyZ" +
-        "sLNvyyIZEwDQYJKoZIhvcNAQEFBQADgYEAgzlxBGGOBvHw20eOzSswMqrHopNMcvwuEO+Z" +
-        "Mr0h8U2/HIiRqKWQaxMyM8A0oULGJny3B/0WtkfVQ2EIibZGiKIjC1RPAB3QmL0vgSyUmF" +
-        "s/LZbzugpJW6jvfov7N4O+u0J5rYniRxa4bgrXa89TY9kwDMbr6/z4oiI8bq3gEsw=";
-    public static final String[] TEST_43_DATA = new String[] {
-        Intermediate_Certificate_1_PP_06_01_crt,
-        Intermediate_Certificate_2_PP_06_01_crt,
-        Intermediate_Certificate_3_PP_06_01_crt,
-        Intermediate_Certificate_4_PP_06_01_crt,
-        Intermediate_CRL_1_PP_06_01_crl,
-        Intermediate_CRL_2_PP_06_01_crl,
-        Intermediate_CRL_3_PP_06_01_crl,
-        Intermediate_CRL_4_PP_06_01_crl,
-        End_Certificate_PP_06_01_crt
-    };
-
-    /*  
-     *  test44
-     *  
-     */ 
-
-    public static final String Intermediate_Certificate_1_PP_06_02_crt = 
-        "MIICozCCAgygAwIBAgIBZjANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1" +
-        "UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb0QxEDAOBgNVBAsTB1Rlc3Rpbmcx" +
-        "FTATBgNVBAMTDFRydXN0IEFuY2hvcjAeFw05ODAxMDExMjAxMDBaFw00ODAxMDExMjAxMD" +
-        "BaMF4xCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9VLlMuIEdvdmVybm1lbnQxDDAKBgNVBAsT" +
-        "A0RvZDEQMA4GA1UECxMHVGVzdGluZzEVMBMGA1UEAxMMQ0ExLVBQLjA2LjAyMIGfMA0GCS" +
-        "qGSIb3DQEBAQUAA4GNADCBiQKBgQDjg5+XWZwW1gLAOldsRshbCXmUCmt1Vs+oZsvyH+6d" +
-        "2PwKs8ydrz+oD0/D8V7cRXucj7q7cJSLhEY1wJoTTgrWeRg1hQioAXzPW3ZkaZuzhpi+cC" +
-        "qeZzN5nPvqK18GWvpffNbUUVfOuaHzzHmhmhgQyZaNG7JHwpWM10UMzMawOwIDAQABo3Ew" +
-        "bzAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAWBgNVHSAEDzANMAsGCWCGSA" +
-        "FlAwEwATAMBgNVHSQEBTADgAEFMBEGA1UdDgQKBAh5am+tkndt5zATBgNVHSMEDDAKgAir" +
-        "muv5wudUjzANBgkqhkiG9w0BAQUFAAOBgQAF0h1iaxxZUp43AjP5gSvbW6JfFRW/ugH9SU" +
-        "n3e1B29LMH3F/ML0joVhPx5CIVpX4nfaYzdeje9+E2/bHMBGSCFeHz9S/KoBLLiI0GNhzh" +
-        "I6MytvPMPRx7hkuROouQ69TnslJiGCcoo+MD0fA2YwO1bCtyLdeVHYhJZWQ2Sg8PHQ==";
-    public static final String Intermediate_Certificate_2_PP_06_02_crt = 
-        "MIIClTCCAf6gAwIBAgIBZzANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1" +
-        "UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3Rpbmcx" +
-        "FTATBgNVBAMTDENBMS1QUC4wNi4wMjAeFw05ODAxMDExMjAxMDBaFw00ODAxMDExMjAxMD" +
-        "BaMF4xCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9VLlMuIEdvdmVybm1lbnQxDDAKBgNVBAsT" +
-        "A0RvZDEQMA4GA1UECxMHVGVzdGluZzEVMBMGA1UEAxMMQ0EyLVBQLjA2LjAyMIGfMA0GCS" +
-        "qGSIb3DQEBAQUAA4GNADCBiQKBgQDF4KSKxo8HvQ59E77LcuLpZ7ujNDjb30KB+EbIuRmy" +
-        "khXAkhq2Rp2Iqd3OhC0AXmhSF+enJq3h0dqyxNWP08SIuK5ia3OIeatl1UgEyukuAnrLuI" +
-        "A7PFUQAGZmDG4OuHv28zza4n/SwfCaKfi8qatIwpwF/29ycB8wYBrHThQD0wIDAQABo2Mw" +
-        "YTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAWBgNVHSAEDzANMAsGCWCGSA" +
-        "FlAwEwATARBgNVHQ4ECgQIKFZV4vjfOOQwEwYDVR0jBAwwCoAIeWpvrZJ3becwDQYJKoZI" +
-        "hvcNAQEFBQADgYEAuj8P5ga8Xv9eFjk4AdRMx/Fj/doRAOLZfs+OnrduRXPLe7CFKDxhFx" +
-        "xYOma8In08cgXVVnRR+2nZ54h5qjCYpskGNx+yZRY8+HW3XXE3KpS7QgTnc/1XshUy9VGm" +
-        "2qX0k661f2d3KnSKiKVKtM/y/j/nNyxPugDz1Yy50NtzQOE=";
-    public static final String Intermediate_Certificate_3_PP_06_02_crt = 
-        "MIIClTCCAf6gAwIBAgIBaDANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1" +
-        "UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3Rpbmcx" +
-        "FTATBgNVBAMTDENBMi1QUC4wNi4wMjAeFw05ODAxMDExMjAxMDBaFw00ODAxMDExMjAxMD" +
-        "BaMF4xCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9VLlMuIEdvdmVybm1lbnQxDDAKBgNVBAsT" +
-        "A0RvZDEQMA4GA1UECxMHVGVzdGluZzEVMBMGA1UEAxMMQ0EzLVBQLjA2LjAyMIGfMA0GCS" +
-        "qGSIb3DQEBAQUAA4GNADCBiQKBgQCitrzXkbO4hAQpBRQE880MFBPq84umX9pyKbV3iMqK" +
-        "Z7HBYwZOvEwGQxG+TX1PIj0Jz27oyvoqpLeMkbn9L3K0BuS0AZKlWIOGPPHWpYTDoQCCs9" +
-        "Mba1evVT/1CMxESsv2kgf49YHMs/6TtxQX0qj5TQzXrkM6CMBc5zyPBDWORQIDAQABo2Mw" +
-        "YTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAWBgNVHSAEDzANMAsGCWCGSA" +
-        "FlAwEwATARBgNVHQ4ECgQIxLES0WIVZQYwEwYDVR0jBAwwCoAIKFZV4vjfOOQwDQYJKoZI" +
-        "hvcNAQEFBQADgYEAdQeDAOFys//2xUFwBilhqr32/jh4gT/ijxRjG0msKTYXmWcCQv9Tms" +
-        "smtIMtiwwnByhjTdQAtOmEyDm/CFW0/NBnxlRvqZKt+PRtscpExVy7xnnm2MBITTa+9xkC" +
-        "A361jSDPnRPEOZoKdMRRzNnW4f59m0huibeFNRYJ7y8BnHs=";
-    public static final String Intermediate_Certificate_4_PP_06_02_crt = 
-        "MIIClTCCAf6gAwIBAgIBaTANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1" +
-        "UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3Rpbmcx" +
-        "FTATBgNVBAMTDENBMy1QUC4wNi4wMjAeFw05ODAxMDExMjAxMDBaFw00ODAxMDExMjAxMD" +
-        "BaMF4xCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9VLlMuIEdvdmVybm1lbnQxDDAKBgNVBAsT" +
-        "A0RvZDEQMA4GA1UECxMHVGVzdGluZzEVMBMGA1UEAxMMQ0E0LVBQLjA2LjAyMIGfMA0GCS" +
-        "qGSIb3DQEBAQUAA4GNADCBiQKBgQCg0yQG7oewLD2eFfPuj2DPBgT47iEri2IVeS/r5hUD" +
-        "nZhxzT2/+UsQfiS+ufdC2Xq+QAcXFcAifPbvRs9xo2q0uLz26mwSq1TH8ilHLKatKwJ/Yf" +
-        "hcRAfEWDwhLJGRhZ7YrKu8xczZgyxwaeu5m38lEaLIRyaVfVSrw8WhN4z4ewIDAQABo2Mw" +
-        "YTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAWBgNVHSAEDzANMAsGCWCGSA" +
-        "FlAwEwATARBgNVHQ4ECgQI/dKmuI1u6I0wEwYDVR0jBAwwCoAIxLES0WIVZQYwDQYJKoZI" +
-        "hvcNAQEFBQADgYEAOEcMpdSAVKUzQ1A7LJnWOh5Tul6yXw6qMsdZNGOZ3vYBXH3vHnSHvp" +
-        "MqJQ1JIX/4XSiKF8En5dVI/ooNabgyORpPnLGDvrshvO/09iaDlQXxWRsoGAFhcIe7Ibp+" +
-        "3g6hnBO5U+0pbInioKVYf/1VyZSUK1QQMutshMIye/8gyZw=";
-    public static final String Intermediate_CRL_1_PP_06_02_crl = 
-        "MIIBSzCBtQIBATANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS" +
-        "5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNV" +
-        "BAMTDENBMS1QUC4wNi4wMhcNOTkwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMTAwWqAjMCEwCg" +
-        "YDVR0UBAMCAQEwEwYDVR0jBAwwCoAIeWpvrZJ3becwDQYJKoZIhvcNAQEFBQADgYEAEJ28" +
-        "g5iyw3ZOqs5ly7O2X0YWtgKK3BnPztxygCUWO1xVy/QbMM5ybAU/UPbJC2pUnkOZMX+h30" +
-        "RYp/kV9w2o15V1hxj2M0tR8fQ0WXudwi20pZO56uHb+WSaETOmPVoNH5efeXsTvtbHQR5w" +
-        "95L2vNeEzJEy1l7S/sasUUoQvqY=";
-    public static final String Intermediate_CRL_2_PP_06_02_crl = 
-        "MIIBSzCBtQIBATANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS" +
-        "5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNV" +
-        "BAMTDENBMi1QUC4wNi4wMhcNOTkwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMTAwWqAjMCEwCg" +
-        "YDVR0UBAMCAQEwEwYDVR0jBAwwCoAIKFZV4vjfOOQwDQYJKoZIhvcNAQEFBQADgYEApLIK" +
-        "X/YJYhSfn7yLTAlKjnhpH1QDlFeaE6/+uj6j7ZgpK6HBjHOvfwbrjurl+L3ZTLrY1FCL4/" +
-        "SUgXrJxbAyMANlg4Z8u6o73F9cur2gi3sgv5d6FjJ8VwuKYWY2dwZNeXwlWE/W0h01Vd9H" +
-        "QVuctFxzQaJQdQBadw/XqzvLlyw=";
-    public static final String Intermediate_CRL_3_PP_06_02_crl = 
-        "MIIBSzCBtQIBATANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS" +
-        "5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNV" +
-        "BAMTDENBMy1QUC4wNi4wMhcNOTkwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMTAwWqAjMCEwCg" +
-        "YDVR0UBAMCAQEwEwYDVR0jBAwwCoAIxLES0WIVZQYwDQYJKoZIhvcNAQEFBQADgYEAE5J9" +
-        "wJKAb3veF4GhHeoIgy6JvMsrjv7d7dhT+ZIKq+wPNk1909X/Zo1GXxJSjMaMgkLlXa0QN6" +
-        "LtSJxbyMRCKSJfqTKOezFXirZ7MEQ04FT0z6Hp0m+E2Q7dGs52ZOV3YZBhQUlH+aQ8WNu2" +
-        "6clf4VqBiUYgGhkE95PhN5AAnOU=";
-    public static final String Intermediate_CRL_4_PP_06_02_crl = 
-        "MIIBSzCBtQIBATANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS" +
-        "5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNV" +
-        "BAMTDENBNC1QUC4wNi4wMhcNOTkwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMTAwWqAjMCEwCg" +
-        "YDVR0UBAMCAQEwEwYDVR0jBAwwCoAI/dKmuI1u6I0wDQYJKoZIhvcNAQEFBQADgYEAKgk1" +
-        "HJ7OW203z9H7jNGxoLCN9bGDKOFcWlWuruzXWOAn+AomjSZpqZkZU1qyKrFaKM320sfn8C" +
-        "ZJPnVWaVMLBLNddDRWUjJrUHtNdnnZEuYPYlRVb0MmwaxHHR0ZBUIaniqoLuvtQIB9N++T" +
-        "bu4cjx33mN6MX0oWr4Bbq7ovPnE=";
-    public static final String End_Certificate_PP_06_02_crt = 
-        "MIICbjCCAdegAwIBAgIBajANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1" +
-        "UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3Rpbmcx" +
-        "FTATBgNVBAMTDENBNC1QUC4wNi4wMjAeFw05ODAxMDExMjAxMDBaFw00ODAxMDExMjAxMD" +
-        "BaMGAxCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9VLlMuIEdvdmVybm1lbnQxDDAKBgNVBAsT" +
-        "A0RvRDEQMA4GA1UECxMHVGVzdGluZzEXMBUGA1UEAxMOVXNlcjEtUFAuMDYuMDIwgZ8wDQ" +
-        "YJKoZIhvcNAQEBBQADgY0AMIGJAoGBANAr4hFku3Y6jI+vD6JTRFc7ZLL9tIxT7Mq+QcDd" +
-        "rRHgSEXhPL3MM//3ZFXca3w4rXOUVQyANQncywNM3uwl7T9jC0MD2kJ9PsNGQL2bQcSajX" +
-        "jrxT403PVFsa6ZrLMU0hwomSO4nJBLCJj3i1rlX9esYbRNCqzep2OMWgAWRUsrAgMBAAGj" +
-        "OjA4MA4GA1UdDwEB/wQEAwIF4DARBgNVHQ4ECgQIMBvQP4Q8w2UwEwYDVR0jBAwwCoAI/d" +
-        "KmuI1u6I0wDQYJKoZIhvcNAQEFBQADgYEAnmNf+3jJp4mo4YDznASTMnrBBdXuskhnRXSQ" +
-        "Gj5dNq6PxEXM+CmBhaNlnFYcr7UCtcD8XwampfyO52tvAZW5kWQKsxyowVtsxtwkAtj6/f" +
-        "trIeulIM0B1xjyXJshmVST5u6gZ3OegsAyuqyAbo9B1IvkNFOldt624aEG43jq7ho=";
-    public static final String[] TEST_44_DATA = new String[] {
-        Intermediate_Certificate_1_PP_06_02_crt,
-        Intermediate_Certificate_2_PP_06_02_crt,
-        Intermediate_Certificate_3_PP_06_02_crt,
-        Intermediate_Certificate_4_PP_06_02_crt,
-        Intermediate_CRL_1_PP_06_02_crl,
-        Intermediate_CRL_2_PP_06_02_crl,
-        Intermediate_CRL_3_PP_06_02_crl,
-        Intermediate_CRL_4_PP_06_02_crl,
-        End_Certificate_PP_06_02_crt
-    };
-
-    /*  
-     *  test45
-     *  
-     */ 
-
-    public static final String Intermediate_Certificate_1_PP_06_03_crt = 
-        "MIICozCCAgygAwIBAgIBazANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1" +
-        "UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb0QxEDAOBgNVBAsTB1Rlc3Rpbmcx" +
-        "FTATBgNVBAMTDFRydXN0IEFuY2hvcjAeFw05ODAxMDExMjAxMDBaFw00ODAxMDExMjAxMD" +
-        "BaMF4xCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9VLlMuIEdvdmVybm1lbnQxDDAKBgNVBAsT" +
-        "A0RvZDEQMA4GA1UECxMHVGVzdGluZzEVMBMGA1UEAxMMQ0ExLVBQLjA2LjAzMIGfMA0GCS" +
-        "qGSIb3DQEBAQUAA4GNADCBiQKBgQCrUMqMxZ4sSrH6sKv2y6nYKagLvUHaforCnf4z/5O1" +
-        "PeldaW4ANtNPA8SkVBES/zoKgvrLJUmqRi4b+BGhCVqLU77PvWyiPOS40tpJfw7m9pPK53" +
-        "aeaLC9M6rarjdOvF8MkdtytCMU/Ef1NsuJULwEP+XB90k4lHr9EzbgKhXvoQIDAQABo3Ew" +
-        "bzAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAWBgNVHSAEDzANMAsGCWCGSA" +
-        "FlAwEwATAMBgNVHSQEBTADgAEEMBEGA1UdDgQKBAhF0iXZmlIKsTATBgNVHSMEDDAKgAir" +
-        "muv5wudUjzANBgkqhkiG9w0BAQUFAAOBgQCmab7noekyx5TzxAqWoQiC9S/aZJtvLkuH1p" +
-        "KiZnclMpRvIL1CVOukkzLTZXY0EcCHnXuVGjw+9vmiQWGGw8t6TGCXo/CtCo934HGBxOfQ" +
-        "MVysEjst7L7TDQsqxk4j9O8cU/TFWsghW9Ihu7SVIn8RJmknKMB2xkIhcDe8S8dmxw==";
-    public static final String Intermediate_Certificate_2_PP_06_03_crt = 
-        "MIIClTCCAf6gAwIBAgIBbDANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1" +
-        "UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3Rpbmcx" +
-        "FTATBgNVBAMTDENBMS1QUC4wNi4wMzAeFw05ODAxMDExMjAxMDBaFw00ODAxMDExMjAxMD" +
-        "BaMF4xCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9VLlMuIEdvdmVybm1lbnQxDDAKBgNVBAsT" +
-        "A0RvZDEQMA4GA1UECxMHVGVzdGluZzEVMBMGA1UEAxMMQ0EyLVBQLjA2LjAzMIGfMA0GCS" +
-        "qGSIb3DQEBAQUAA4GNADCBiQKBgQCmT7wL9WwWBr1oY9bHIq4IrJOkbOARK3zOeyZSbBBB" +
-        "zxcky5kjC9pamMpyZjga+q0CGd2rq9eUjQ2FXZsBSgf/X9B0/g9trNMebYgGnYmHHX2JK+" +
-        "doyAX+h3afDbZzZ696S0Hw7yRx00+teQe/Gx4h4qKPwbJIW5Bep9SBysikJQIDAQABo2Mw" +
-        "YTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAWBgNVHSAEDzANMAsGCWCGSA" +
-        "FlAwEwATARBgNVHQ4ECgQInXHgY/+onu4wEwYDVR0jBAwwCoAIRdIl2ZpSCrEwDQYJKoZI" +
-        "hvcNAQEFBQADgYEAhlboR5gzYWluWIaFM5R1Ko0/rprrv5BHONRiXjLfAPkzZmd7FLDE2j" +
-        "BlU7s7IenICeST4c7HG5zqBigK1814GG75nq5htCGUnM6pn8/gvc58+ckKeWgbJxC5I/0u" +
-        "olCCs8ORbWIEGWmghGg1USxeI1RQwXGgE8XwtabVibJOVBk=";
-    public static final String Intermediate_Certificate_3_PP_06_03_crt = 
-        "MIIClTCCAf6gAwIBAgIBbTANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1" +
-        "UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3Rpbmcx" +
-        "FTATBgNVBAMTDENBMi1QUC4wNi4wMzAeFw05ODAxMDExMjAxMDBaFw00ODAxMDExMjAxMD" +
-        "BaMF4xCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9VLlMuIEdvdmVybm1lbnQxDDAKBgNVBAsT" +
-        "A0RvZDEQMA4GA1UECxMHVGVzdGluZzEVMBMGA1UEAxMMQ0EzLVBQLjA2LjAzMIGfMA0GCS" +
-        "qGSIb3DQEBAQUAA4GNADCBiQKBgQDEouRlqTFQiJQSwc+yhjpvA0dUIbRrNwLF+EPfUWq0" +
-        "FV1UV0a5lb5BGPW4RGUEbFwsgGCHsfLiY7WmUpC1e6332PZPnrnoJbf28paeiZ8KqcAKZE" +
-        "pGPWKCmFBwBW23q1w/v/CxcXJoBx5OC1yxG3fGH7CZSzc+4Z/+PxLk9yoASwIDAQABo2Mw" +
-        "YTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAWBgNVHSAEDzANMAsGCWCGSA" +
-        "FlAwEwATARBgNVHQ4ECgQIc24GzUM6/LswEwYDVR0jBAwwCoAInXHgY/+onu4wDQYJKoZI" +
-        "hvcNAQEFBQADgYEANLxcLvJqjyu94HN+X6tTxGcN1s43kQh8yRGotW2ptuA2jmGlAhI8QQ" +
-        "sXHO0o0bFLBC/Uv0L0YlEJhK1w0ct7Awwn4UYgqupxug2f84yamcvFa1es3osIMJoi0GPz" +
-        "1WDBM711efRtbzvK6t/4fJ01nG2BlMeEbctVqrehuAip4p4=";
-    public static final String Intermediate_Certificate_4_PP_06_03_crt = 
-        "MIIClTCCAf6gAwIBAgIBbjANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1" +
-        "UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3Rpbmcx" +
-        "FTATBgNVBAMTDENBMy1QUC4wNi4wMzAeFw05ODAxMDExMjAxMDBaFw00ODAxMDExMjAxMD" +
-        "BaMF4xCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9VLlMuIEdvdmVybm1lbnQxDDAKBgNVBAsT" +
-        "A0RvZDEQMA4GA1UECxMHVGVzdGluZzEVMBMGA1UEAxMMQ0E0LVBQLjA2LjAzMIGfMA0GCS" +
-        "qGSIb3DQEBAQUAA4GNADCBiQKBgQDNuzSN3BiT84M3Dy6KeTQkMqWNuYGTENWPP8WvQ0Ot" +
-        "ggue/lemC+IqYBtIEYtk3A30eKKnF28WIbPlB3oSykrPVV5dMhYGF9ysOtp4wyETHtzdv0" +
-        "7HyqlMHOCPiFplbwjUSo0uEIRVgS3luBJi9onTpcn97/i0S7VsM2nooooaowIDAQABo2Mw" +
-        "YTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAWBgNVHSAEDzANMAsGCWCGSA" +
-        "FlAwEwATARBgNVHQ4ECgQIDjpr8w0dRq0wEwYDVR0jBAwwCoAIc24GzUM6/LswDQYJKoZI" +
-        "hvcNAQEFBQADgYEArE6qUMnjXiB5eKiAFc9Elw1dYsQArtnDQAfFGtShDulxYKq9+pxory" +
-        "4kTMUZZCJc7awEC11tdJp7xJGcpjCJl4I2wBcHiCcVcnwQijqM719PqoQKydXB9MSrXqmU" +
-        "2CyakSzBpb82VooVNx0IZ3h0nXQSE3V0qSXXCaImJcOIGMo=";
-    public static final String Intermediate_CRL_1_PP_06_03_crl = 
-        "MIIBSzCBtQIBATANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS" +
-        "5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNV" +
-        "BAMTDENBMS1QUC4wNi4wMxcNOTkwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMTAwWqAjMCEwCg" +
-        "YDVR0UBAMCAQEwEwYDVR0jBAwwCoAIRdIl2ZpSCrEwDQYJKoZIhvcNAQEFBQADgYEAQrHK" +
-        "VV2MJPJLNdPoEuqFXRTEclSmYhUWC5lthK0JnKUbCUj2cMAku2UdN5sRgVG0475dXV2nvn" +
-        "huxy+IQVt5OJ+PNZ9MYZlC2CfYsBiW9DEYMA603XhVvX/bxx80MwxNby18oyo/V9ycSyJw" +
-        "XzUmzYRUtohHk39r3eUSAt5H7zM=";
-    public static final String Intermediate_CRL_2_PP_06_03_crl = 
-        "MIIBSzCBtQIBATANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS" +
-        "5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNV" +
-        "BAMTDENBMi1QUC4wNi4wMxcNOTkwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMTAwWqAjMCEwCg" +
-        "YDVR0UBAMCAQEwEwYDVR0jBAwwCoAInXHgY/+onu4wDQYJKoZIhvcNAQEFBQADgYEADOEh" +
-        "jV8V8y17mFstkVwigOAKURbi7sD24RkLd1QG0Bn21JiwpkGY8Z4vetQps+VX586xKzz6v6" +
-        "Sj+TJk3jfHCiEAk6a7PLxRcVCCi6y70mzEBCwn6fS5NDfxzxYYLgq+dlUiVwqXsHksEvUz" +
-        "2Z5dpuLhbUGxHiqazNE9iq9pEEE=";
-    public static final String Intermediate_CRL_3_PP_06_03_crl = 
-        "MIIBSzCBtQIBATANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS" +
-        "5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNV" +
-        "BAMTDENBMy1QUC4wNi4wMxcNOTkwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMTAwWqAjMCEwCg" +
-        "YDVR0UBAMCAQEwEwYDVR0jBAwwCoAIc24GzUM6/LswDQYJKoZIhvcNAQEFBQADgYEAK/zi" +
-        "r7ASgtWA0xGQVrqhHsXH9bdaj+FceW6ivoXo3z6xCFLvzu2uenEu5g849+YI0KMomHsDAY" +
-        "tX8qO3XEaLGchbhIfywgRVDlSF8ytMKhJTS05R/vZSZAl+eoT3mC92Grihsd3wublyNZ7a" +
-        "d925Py/oFp3J+geUkKJQK+RVu4M=";
-    public static final String Intermediate_CRL_4_PP_06_03_crl = 
-        "MIIBSzCBtQIBATANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS" +
-        "5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNV" +
-        "BAMTDENBNC1QUC4wNi4wMxcNOTkwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMTAwWqAjMCEwCg" +
-        "YDVR0UBAMCAQEwEwYDVR0jBAwwCoAIDjpr8w0dRq0wDQYJKoZIhvcNAQEFBQADgYEAcBag" +
-        "81RFYMBAf8aRP5VXPcfu0OxgJvVE25ZHGLCkLD4TPKAXMjZMHWrf34+5FW7aigDO1YhGA+" +
-        "2zVtVj8k71DichiCCGXQvH50AqFgeNXNQwn9WcpQ8rRkfmyhlccfeM+MzHI1giRw/RjvCN" +
-        "0dfJL9g3c7peW+VCKn85REZ1ne4=";
-    public static final String End_Certificate_PP_06_03_crt = 
-        "MIICbjCCAdegAwIBAgIBbzANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1" +
-        "UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3Rpbmcx" +
-        "FTATBgNVBAMTDENBNC1QUC4wNi4wMzAeFw05ODAxMDExMjAxMDBaFw00ODAxMDExMjAxMD" +
-        "BaMGAxCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9VLlMuIEdvdmVybm1lbnQxDDAKBgNVBAsT" +
-        "A0RvRDEQMA4GA1UECxMHVGVzdGluZzEXMBUGA1UEAxMOVXNlcjEtUFAuMDYuMDMwgZ8wDQ" +
-        "YJKoZIhvcNAQEBBQADgY0AMIGJAoGBAKBSOacrUg5H5yuISkqmJuQcK2ao+Ib0FmIKCuek" +
-        "8mm2HEiux+K5/yIAYsQnz9eDKzKWaS73exPniKOXABHaL6dxsptbdBqWB6II2kIl0BFz9P" +
-        "82qjz6DMwpUhj5Pwfy5q0Bz8grTe31ZYP19y8AHgcWna+eiY4fNVXVkIEJOJ6tAgMBAAGj" +
-        "OjA4MA4GA1UdDwEB/wQEAwIF4DARBgNVHQ4ECgQIaZQ3Q55so58wEwYDVR0jBAwwCoAIDj" +
-        "pr8w0dRq0wDQYJKoZIhvcNAQEFBQADgYEAnNYKc2pSFZ9PtR4gQyVI3j+gQ97tcWu6Alxm" +
-        "4T48fSb2KtFGuozJyCv0aYjtuZ9ava9r4v04lyFPoAjWYbALHC9F+vz7JLNr4VstuMdy5O" +
-        "ax+PvJjKGACSXD7QjXJ48qvm+v8OnMbkzf8+rY3LoTJ2KhXo9Ey4+UmU/YuZ0PXuY=";
-    public static final String[] TEST_45_DATA = new String[] {
-        Intermediate_Certificate_1_PP_06_03_crt,
-        Intermediate_Certificate_2_PP_06_03_crt,
-        Intermediate_Certificate_3_PP_06_03_crt,
-        Intermediate_Certificate_4_PP_06_03_crt,
-        Intermediate_CRL_1_PP_06_03_crl,
-        Intermediate_CRL_2_PP_06_03_crl,
-        Intermediate_CRL_3_PP_06_03_crl,
-        Intermediate_CRL_4_PP_06_03_crl,
-        End_Certificate_PP_06_03_crt
-    };
-
-    /*  
-     *  test46
-     *  
-     */ 
-
-    public static final String Intermediate_Certificate_1_PP_06_04_crt = 
-        "MIICozCCAgygAwIBAgIBcDANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1" +
-        "UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb0QxEDAOBgNVBAsTB1Rlc3Rpbmcx" +
-        "FTATBgNVBAMTDFRydXN0IEFuY2hvcjAeFw05ODAxMDExMjAxMDBaFw00ODAxMDExMjAxMD" +
-        "BaMF4xCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9VLlMuIEdvdmVybm1lbnQxDDAKBgNVBAsT" +
-        "A0RvZDEQMA4GA1UECxMHVGVzdGluZzEVMBMGA1UEAxMMQ0ExLVBQLjA2LjA0MIGfMA0GCS" +
-        "qGSIb3DQEBAQUAA4GNADCBiQKBgQDFoR/YTJlGYenu2IRsTiT6jwIA7yOnFbM9JXcqYIP5" +
-        "jSgtn/wVztPHgVWP+582foXJ+oEcThQVZ+RBXYt6VU5o7eVCsGJjqMd0DbRzTO+poelVoY" +
-        "1UEJMrKG0xSEex0T6XLQ+jPU9o5tlXoLYsXvpvbIrCJ0o8kuk4MWTzenDKJwIDAQABo3Ew" +
-        "bzAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAWBgNVHSAEDzANMAsGCWCGSA" +
-        "FlAwEwATAMBgNVHSQEBTADgAEAMBEGA1UdDgQKBAgVwXynYDSYEDATBgNVHSMEDDAKgAir" +
-        "muv5wudUjzANBgkqhkiG9w0BAQUFAAOBgQC6MnYM9cY3CNb7/KKZvoaSwF/Se5iZYnbdPn" +
-        "WCnKydnN1AhlDN3kEw0gjTmZo/MkvPqku2aPzg5EiZ0eyeJaR6a4aiICU9z/Hiet19mBF6" +
-        "BtAUdt0fJ7aL5WPAc4BKXUbONd6vkQNv8uLcBmsqZ4wXDj7ZVBMGKcuDq7uClb0xYw==";
-    public static final String Intermediate_Certificate_2_PP_06_04_crt = 
-        "MIIClTCCAf6gAwIBAgIBcTANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1" +
-        "UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3Rpbmcx" +
-        "FTATBgNVBAMTDENBMS1QUC4wNi4wNDAeFw05ODAxMDExMjAxMDBaFw00ODAxMDExMjAxMD" +
-        "BaMF4xCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9VLlMuIEdvdmVybm1lbnQxDDAKBgNVBAsT" +
-        "A0RvZDEQMA4GA1UECxMHVGVzdGluZzEVMBMGA1UEAxMMQ0EyLVBQLjA2LjA0MIGfMA0GCS" +
-        "qGSIb3DQEBAQUAA4GNADCBiQKBgQDHqX/4IZpOCsHWgdJ6mICN94nXz/KqsXPNymadVdZA" +
-        "nVU0fHdMcxehAvsBKju5d791Psly1Xyyda8KQ0BKPgGed6jNKb89JzuEtPBov0VMzskqwR" +
-        "irjaDCwYKtibiDe+T/kEN9Sq5pbexHcaTbAIeQrAIoSUmGdQ/Up6PYplb0jwIDAQABo2Mw" +
-        "YTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAWBgNVHSAEDzANMAsGCWCGSA" +
-        "FlAwEwATARBgNVHQ4ECgQISKcQDqdBecUwEwYDVR0jBAwwCoAIFcF8p2A0mBAwDQYJKoZI" +
-        "hvcNAQEFBQADgYEAkAQaOoZYAZOCk881Ro+SIclAj2lp+arAkWPP/gwN4/0lpH62eWqlmY" +
-        "okWRBjk6+iwCgRxQ56uUjJhE08p5juZ5V32ie3RW+S1ZBPtL/T/+Tqp9HNQQ3GjW1yc/yI" +
-        "sWQxrd7QKzTER37HBiOr5WjEjn+dzuWlJtClcQetqMLtMgM=";
-    public static final String Intermediate_Certificate_3_PP_06_04_crt = 
-        "MIIClTCCAf6gAwIBAgIBcjANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1" +
-        "UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3Rpbmcx" +
-        "FTATBgNVBAMTDENBMi1QUC4wNi4wNDAeFw05ODAxMDExMjAxMDBaFw00ODAxMDExMjAxMD" +
-        "BaMF4xCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9VLlMuIEdvdmVybm1lbnQxDDAKBgNVBAsT" +
-        "A0RvZDEQMA4GA1UECxMHVGVzdGluZzEVMBMGA1UEAxMMQ0EzLVBQLjA2LjA0MIGfMA0GCS" +
-        "qGSIb3DQEBAQUAA4GNADCBiQKBgQC2tnVj8KHGCm8XBPvDYWZMp3yOKQxuORze6a764qIC" +
-        "hkdO7hQbgJ9YiuAF/y62W17FnbhKPX6ninaZG0N77bznKvivSC3+T1jIVhw+kpxRh9MRya" +
-        "L2p+zHJEyO/9JaKWzJZiVi4kebW+hwNgSZc7FSYsAbW7lr4ujDei/yn/AJEwIDAQABo2Mw" +
-        "YTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAWBgNVHSAEDzANMAsGCWCGSA" +
-        "FlAwEwATARBgNVHQ4ECgQIaAEiWf4JpfQwEwYDVR0jBAwwCoAISKcQDqdBecUwDQYJKoZI" +
-        "hvcNAQEFBQADgYEAHNsZDCWtOqt741IJNA9OwpymTA4ES1BRJquEvGj5+4RH2pxi67bYd1" +
-        "kWTPF1qFC2R1sugSNhbU0wOBMdKUJtKWNacPsK0HbD7CPqt4THOcMXFO36b/2gqHqy9rc/" +
-        "slWuIwbtT/tEC+Mk67GEATWNPifoPT7TjWHM3RhsDnagZXw=";
-    public static final String Intermediate_Certificate_4_PP_06_04_crt = 
-        "MIIClTCCAf6gAwIBAgIBczANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1" +
-        "UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3Rpbmcx" +
-        "FTATBgNVBAMTDENBMy1QUC4wNi4wNDAeFw05ODAxMDExMjAxMDBaFw00ODAxMDExMjAxMD" +
-        "BaMF4xCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9VLlMuIEdvdmVybm1lbnQxDDAKBgNVBAsT" +
-        "A0RvZDEQMA4GA1UECxMHVGVzdGluZzEVMBMGA1UEAxMMQ0E0LVBQLjA2LjA0MIGfMA0GCS" +
-        "qGSIb3DQEBAQUAA4GNADCBiQKBgQDgdk/smDJ5yZYJDH4SG7pIDCzGNZeLO9RI3ybOx4/B" +
-        "M3YQu3DDFSOv8kq6PgL8ThC8Dk6t1jSbT8QVzaGgx0KMV3p6pIMdaVNkOjVjUb+L0nXVfr" +
-        "XYpFLON6tZLgh8oIbiz4KznKmsxo6VdYwyUeHmkpGcL5y+8qLspCNdRJnDGwIDAQABo2Mw" +
-        "YTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAWBgNVHSAEDzANMAsGCWCGSA" +
-        "FlAwEwATARBgNVHQ4ECgQIgSY376EamQowEwYDVR0jBAwwCoAIaAEiWf4JpfQwDQYJKoZI" +
-        "hvcNAQEFBQADgYEAEztvmGSVnDGGeNlIoR+wfRM8ndJogvUxLBZm4N96mDZ9Y+Nr99Dqvw" +
-        "+mMI3BU0miA5kDO9aFrKIgow3cpruoedhnBUsxTfhrNaFEwp+ORUb3tWn7sSxLfnTim4Vq" +
-        "y6j/EfUK2CS4ZAy7J5BADWSqDezPnrb5UaY1JFKMuLyGRac=";
-    public static final String Intermediate_CRL_1_PP_06_04_crl = 
-        "MIIBSzCBtQIBATANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS" +
-        "5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNV" +
-        "BAMTDENBMS1QUC4wNi4wNBcNOTkwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMTAwWqAjMCEwCg" +
-        "YDVR0UBAMCAQEwEwYDVR0jBAwwCoAIFcF8p2A0mBAwDQYJKoZIhvcNAQEFBQADgYEAPlIW" +
-        "SxwW2LE8qxeD+M+HypNwai7j9XxUA2MhBbGVnsrhH+DKX5VeyP/nyZn2hBoGWhs05IpG2P" +
-        "S0odnyhbgGSXSj+IOfkZkVT0BmuEJmqv75R15LBzeyONks+eSEhoOIGAaIN4WgJ5mzjSrI" +
-        "ddDu3c4s6QO/OFVrNF1F6e4laSU=";
-    public static final String Intermediate_CRL_2_PP_06_04_crl = 
-        "MIIBSzCBtQIBATANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS" +
-        "5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNV" +
-        "BAMTDENBMi1QUC4wNi4wNBcNOTkwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMTAwWqAjMCEwCg" +
-        "YDVR0UBAMCAQEwEwYDVR0jBAwwCoAISKcQDqdBecUwDQYJKoZIhvcNAQEFBQADgYEAE5wt" +
-        "y3+jVnr8de/Yi0LV70v3JDHimwG2pQcuDRhR1NLPr4oC+2uxMqwxVzdHITDb3yI2ZT9pVh" +
-        "PV3UvX85avMdA0/JyaMWSKNpbSah1eNfMwMBY2vzh1Q7f5n+7HYYM+I2kz7HARPvwsLP9d" +
-        "j4mY7Kq7uiOFdnQzJ6LWjm8qEMs=";
-    public static final String Intermediate_CRL_3_PP_06_04_crl = 
-        "MIIBSzCBtQIBATANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS" +
-        "5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNV" +
-        "BAMTDENBMy1QUC4wNi4wNBcNOTkwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMTAwWqAjMCEwCg" +
-        "YDVR0UBAMCAQEwEwYDVR0jBAwwCoAIaAEiWf4JpfQwDQYJKoZIhvcNAQEFBQADgYEAOm2f" +
-        "m3IdcDnIS915tEZzDmIbTFPBkIn0wjUreZKb9uNxE2a8Jixq+UP2uiyYWiWmXnRdVB1Gsb" +
-        "ofc5f8ctNgSPVTSYB0U5apIauXjV0y7WMUrLNrDFa5m9lxLRhF9kvXVL8zPhVfMpujnXre" +
-        "A8WS4UjDMuveyQL6yASGoZvB+Ps=";
-    public static final String Intermediate_CRL_4_PP_06_04_crl = 
-        "MIIBSzCBtQIBATANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS" +
-        "5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNV" +
-        "BAMTDENBNC1QUC4wNi4wNBcNOTkwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMTAwWqAjMCEwCg" +
-        "YDVR0UBAMCAQEwEwYDVR0jBAwwCoAIgSY376EamQowDQYJKoZIhvcNAQEFBQADgYEAznK9" +
-        "ekskl4uWU+2Xqp3Pj14wvXuzfPAqFlHR0jl5By7T82JRiRa6LGX6T953vcwwJBsYG1hMqH" +
-        "pgbnUGB8APQ6YNXN+7ZkudaG6fMVX6bCr8zT+nVSj7PHIK2VFsC1Jpm5SoQMHH6DFit/oH" +
-        "tm4tdV8+nupMBQn1ZtxQHgUUF14=";
-    public static final String End_Certificate_PP_06_04_crt = 
-        "MIIChjCCAe+gAwIBAgIBdDANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1" +
-        "UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3Rpbmcx" +
-        "FTATBgNVBAMTDENBNC1QUC4wNi4wNDAeFw05ODAxMDExMjAxMDBaFw00ODAxMDExMjAxMD" +
-        "BaMGAxCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9VLlMuIEdvdmVybm1lbnQxDDAKBgNVBAsT" +
-        "A0RvRDEQMA4GA1UECxMHVGVzdGluZzEXMBUGA1UEAxMOVXNlcjEtUFAuMDYuMDQwgZ8wDQ" +
-        "YJKoZIhvcNAQEBBQADgY0AMIGJAoGBAOCVJmtrW8Z2WGGRNjEgyp2NJn1xaIVDwlxL4C0n" +
-        "UAPpo1WM/rarQTYejT2Yo8H39TdRfiAlggF0Qsce0W//atey8WewGsFlUem6a4OFwg1X2h" +
-        "CN/COL0eC4a6lwkdOKmqgxSyWNWeKxXRTM8+EYQIem78uY7A8XuzVUmOpzYWoLAgMBAAGj" +
-        "UjBQMA4GA1UdDwEB/wQEAwIF4DAWBgNVHSAEDzANMAsGCWCGSAFlAwEwATARBgNVHQ4ECg" +
-        "QION6UOZ2Eky4wEwYDVR0jBAwwCoAIgSY376EamQowDQYJKoZIhvcNAQEFBQADgYEAXota" +
-        "1N1UrMxj2a/vdII92Wi8uEetcHo9vmiJVYxwPFkp+qo1q93Ww8Qnfp7xzaZwLgVoUOAF8U" +
-        "TRUVnzqoSwmRrfyEMfrgej3eiBjcU+zS9mNlx9mUUSLmlY+xMeejyVDCntRn6YJWWLesVq" +
-        "eFOjyNux97/XnGT3T1w0J+wShu4=";
-    public static final String[] TEST_46_DATA = new String[] {
-        Intermediate_Certificate_1_PP_06_04_crt,
-        Intermediate_Certificate_2_PP_06_04_crt,
-        Intermediate_Certificate_3_PP_06_04_crt,
-        Intermediate_Certificate_4_PP_06_04_crt,
-        Intermediate_CRL_1_PP_06_04_crl,
-        Intermediate_CRL_2_PP_06_04_crl,
-        Intermediate_CRL_3_PP_06_04_crl,
-        Intermediate_CRL_4_PP_06_04_crl,
-        End_Certificate_PP_06_04_crt
-    };
-
-    /*  
-     *  test47
-     *  
-     */ 
-
-    public static final String Intermediate_Certificate_1_PP_06_05_crt = 
-        "MIICozCCAgygAwIBAgIBdTANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1" +
-        "UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb0QxEDAOBgNVBAsTB1Rlc3Rpbmcx" +
-        "FTATBgNVBAMTDFRydXN0IEFuY2hvcjAeFw05ODAxMDExMjAxMDBaFw00ODAxMDExMjAxMD" +
-        "BaMF4xCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9VLlMuIEdvdmVybm1lbnQxDDAKBgNVBAsT" +
-        "A0RvZDEQMA4GA1UECxMHVGVzdGluZzEVMBMGA1UEAxMMQ0ExLVBQLjA2LjA1MIGfMA0GCS" +
-        "qGSIb3DQEBAQUAA4GNADCBiQKBgQDMIUtQ/CgudxHAwAAn8jUsdAY8u7WDslOC4nNbWn5C" +
-        "tILgZ2hGIZhEnhzP+VCV8ke8zLo1DX0hCRYAgzk5XTGAimExHFv/yDdhpJWEnqMRljkCHx" +
-        "Hg3XE1439qutBdmWvGUlRF0hQrd9Q/Ubr+PjEzP3a0EUmXo7LYuQKMcFsC4wIDAQABo3Ew" +
-        "bzAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAWBgNVHSAEDzANMAsGCWCGSA" +
-        "FlAwEwATAMBgNVHSQEBTADgAEHMBEGA1UdDgQKBAgha8GqGbO1nDATBgNVHSMEDDAKgAir" +
-        "muv5wudUjzANBgkqhkiG9w0BAQUFAAOBgQAEG5C3P1A/MYpNJ0qvi26v04GGUWDQWRW1q9" +
-        "1392XpAxDdv7kODf1FUMpfBpcUblagxrX7Npthv6/6W8poBTjvJuq5BfnnOMQrCwnsNfRy" +
-        "Y7b1mAZIvcOBhWe+bFVqRLUqZ+JseWkw0YgZIGtX41Znwl0VcFQKJ4lNkuaBgXXdGw==";
-    public static final String Intermediate_Certificate_2_PP_06_05_crt = 
-        "MIICozCCAgygAwIBAgIBdjANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1" +
-        "UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3Rpbmcx" +
-        "FTATBgNVBAMTDENBMS1QUC4wNi4wNTAeFw05ODAxMDExMjAxMDBaFw00ODAxMDExMjAxMD" +
-        "BaMF4xCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9VLlMuIEdvdmVybm1lbnQxDDAKBgNVBAsT" +
-        "A0RvZDEQMA4GA1UECxMHVGVzdGluZzEVMBMGA1UEAxMMQ0EyLVBQLjA2LjA1MIGfMA0GCS" +
-        "qGSIb3DQEBAQUAA4GNADCBiQKBgQC36j0YkXZZSw3qQaxD0g2BfrKYperkGjVAfLwOtOxB" +
-        "0A3Ufx2ECl/MqNOvi/QWlTkKwnrqw0aEnD25iS1DFM4jMZBmdfJg80oa+y6TJoZcIb+3bv" +
-        "SK5o3ArCFWkhTHHggIIY3H9dQOgAeYQF57Vb0iu59GPfnYJO8y8ZpxGIYcjQIDAQABo3Ew" +
-        "bzAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAWBgNVHSAEDzANMAsGCWCGSA" +
-        "FlAwEwATAMBgNVHSQEBTADgAECMBEGA1UdDgQKBAhUpoGZzfV7EjATBgNVHSMEDDAKgAgh" +
-        "a8GqGbO1nDANBgkqhkiG9w0BAQUFAAOBgQAjrFHzC1FLvssJTfV5YsGfw7Luj4EqLDQd6b" +
-        "MgtBSwPnXqMTUAZpDETyeYvcgM+L2tasB26MSy6IttSKsaJpHPCP+BIs0jji5xosuCX6Cs" +
-        "wI2gE/LjF85rjZnldrlDShw01DlcmWlWwudit/ieO71Xc8i0F4EhSaTUJX12po5Xkg==";
-    public static final String Intermediate_Certificate_3_PP_06_05_crt = 
-        "MIICozCCAgygAwIBAgIBdzANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1" +
-        "UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3Rpbmcx" +
-        "FTATBgNVBAMTDENBMi1QUC4wNi4wNTAeFw05ODAxMDExMjAxMDBaFw00ODAxMDExMjAxMD" +
-        "BaMF4xCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9VLlMuIEdvdmVybm1lbnQxDDAKBgNVBAsT" +
-        "A0RvZDEQMA4GA1UECxMHVGVzdGluZzEVMBMGA1UEAxMMQ0EzLVBQLjA2LjA1MIGfMA0GCS" +
-        "qGSIb3DQEBAQUAA4GNADCBiQKBgQDFWhChPQNFYQpLBmVmXSGF2py1wcfhZgZurv0E5AgE" +
-        "BZwBo2bxSeC36lBQyR3OABGI4nQoEegSQWwuS2Pk3+emG2MZ8R5QINAkMlAKTp5Gj7KTlm" +
-        "3VVJRx7/VduoFx8sZPjkpvF1bSL+KOH4UZny1xqqTj4bJ+oGu58INeSNVa+wIDAQABo3Ew" +
-        "bzAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAWBgNVHSAEDzANMAsGCWCGSA" +
-        "FlAwEwATAMBgNVHSQEBTADgAEEMBEGA1UdDgQKBAjN4PvsHY9+YzATBgNVHSMEDDAKgAhU" +
-        "poGZzfV7EjANBgkqhkiG9w0BAQUFAAOBgQA8KmWbAQOnM59zry9TNtLbA2P5y8R/sO771S" +
-        "yQYcu6undt9t7UEiOepDp/z3CGsITm9RdtXAobZ5ZqhW+3Ll+UnML1itiCytOPbfC7iiUO" +
-        "S5jviQnpgJncZD2Lp65yNAB7lMmMleFO15Bsk8VNmzMDMsFtzo508Bs6T33ZW69/vg==";
-    public static final String Intermediate_Certificate_4_PP_06_05_crt = 
-        "MIIClTCCAf6gAwIBAgIBeDANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1" +
-        "UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3Rpbmcx" +
-        "FTATBgNVBAMTDENBMy1QUC4wNi4wNTAeFw05ODAxMDExMjAxMDBaFw00ODAxMDExMjAxMD" +
-        "BaMF4xCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9VLlMuIEdvdmVybm1lbnQxDDAKBgNVBAsT" +
-        "A0RvZDEQMA4GA1UECxMHVGVzdGluZzEVMBMGA1UEAxMMQ0E0LVBQLjA2LjA1MIGfMA0GCS" +
-        "qGSIb3DQEBAQUAA4GNADCBiQKBgQDxx57R4j64xdbjpTl7reLby/T2ym4rESC90aBkC2/E" +
-        "/YUSjsuGG9GiHEVgoGzoQGQNQV0v9ZMIvuoI6q7Fd6VZhIVGE0MGzTFNA9QEEDGPc10ZxC" +
-        "Gyh9mZYp77PMuhQ12Iv3aDW9KNTr09+HyhK7d3Se7toXLwjE5pKt+A4ZvBFQIDAQABo2Mw" +
-        "YTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAWBgNVHSAEDzANMAsGCWCGSA" +
-        "FlAwEwATARBgNVHQ4ECgQIwmq0fugIX0kwEwYDVR0jBAwwCoAIzeD77B2PfmMwDQYJKoZI" +
-        "hvcNAQEFBQADgYEAbAbRorTyh6zfAmdg0lfeZyCyW9k4NWfhUs46iSOl6lkZH8c1eoAF5/" +
-        "q0pOF+CtI3F9VMhfUXChEbVj7QENctU7kDiFe8300OWD5h1VUi+WTK4CG7B36/BjkrVOuG" +
-        "Os76P9l1WaC+/WRZdcqgFMfPjpn3R179dImBDwZiCMMbVqc=";
-    public static final String Intermediate_CRL_1_PP_06_05_crl = 
-        "MIIBSzCBtQIBATANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS" +
-        "5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNV" +
-        "BAMTDENBMS1QUC4wNi4wNRcNOTkwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMTAwWqAjMCEwCg" +
-        "YDVR0UBAMCAQEwEwYDVR0jBAwwCoAIIWvBqhmztZwwDQYJKoZIhvcNAQEFBQADgYEADX3u" +
-        "wxpN+p8N2HqmhFw8w9LCeoR3Xa/uaqgqh4i/VkDuAC4Bi7VbIO6rcxDO2uAdZgNhb/hnRq" +
-        "cvKLcy0vrovCa2EPHcFo7dJl7si2q09EeuHT4+lZt/Ek/VOkwHhvh2o6yEvKOGXCnF9hZr" +
-        "8YbOIknboEz+tRfxoJArRBwpJkE=";
-    public static final String Intermediate_CRL_2_PP_06_05_crl = 
-        "MIIBSzCBtQIBATANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS" +
-        "5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNV" +
-        "BAMTDENBMi1QUC4wNi4wNRcNOTkwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMTAwWqAjMCEwCg" +
-        "YDVR0UBAMCAQEwEwYDVR0jBAwwCoAIVKaBmc31exIwDQYJKoZIhvcNAQEFBQADgYEAQz7u" +
-        "dfU4yAHFLH5BgeZkYh0l2lZ95af+E/67MSCjQSF7RWWWTffbDMc4HmiRlZLvQdltyGCKmi" +
-        "kuzcPP8vyYOBQmoIKQ6c2LItBjXVavLdpe91yCOhCWXVVlnMFq5ztrvBEpfO0GVUOnPWfG" +
-        "1Ugit3SEd4DbhYFTBYHbbOKRWsU=";
-    public static final String Intermediate_CRL_3_PP_06_05_crl = 
-        "MIIBSzCBtQIBATANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS" +
-        "5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNV" +
-        "BAMTDENBMy1QUC4wNi4wNRcNOTkwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMTAwWqAjMCEwCg" +
-        "YDVR0UBAMCAQEwEwYDVR0jBAwwCoAIzeD77B2PfmMwDQYJKoZIhvcNAQEFBQADgYEAkiW6" +
-        "h9a8v+IITd+p0jxukj2FYfmED59ZXAlYhQdQAGlPE71rOXn6ZPURYoGf7qlmBwQffpksOb" +
-        "Byb+PX+CBTUNXzhgTzD7ifM9xOhCEKVKai9acQfvokU56OHwfq5AnkRykLZ7IdvdYCP57k" +
-        "ynrNNV35dsMZXg23/PpreumlOkE=";
-    public static final String Intermediate_CRL_4_PP_06_05_crl = 
-        "MIIBSzCBtQIBATANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS" +
-        "5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNV" +
-        "BAMTDENBNC1QUC4wNi4wNRcNOTkwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMTAwWqAjMCEwCg" +
-        "YDVR0UBAMCAQEwEwYDVR0jBAwwCoAIwmq0fugIX0kwDQYJKoZIhvcNAQEFBQADgYEAnTbS" +
-        "MBWyoPaslaLpAMmJ+D6kmmKAdRYurA0okU/QP+0W+YNPV4DducAQUDy8Cg3RkpRK2ze0ad" +
-        "l6TUW8g83hj9TXSBp+XZuVvzerMCjOeBqhskZN4Ly8101ZZmMmdYdSc3PEhqkme6iZzjwB" +
-        "ZooAN2dIYjuBj1c1/t5qH80CMAI=";
-    public static final String End_Certificate_PP_06_05_crt = 
-        "MIICbjCCAdegAwIBAgIBeTANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1" +
-        "UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3Rpbmcx" +
-        "FTATBgNVBAMTDENBNC1QUC4wNi4wNTAeFw05ODAxMDExMjAxMDBaFw00ODAxMDExMjAxMD" +
-        "BaMGAxCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9VLlMuIEdvdmVybm1lbnQxDDAKBgNVBAsT" +
-        "A0RvRDEQMA4GA1UECxMHVGVzdGluZzEXMBUGA1UEAxMOVXNlcjEtUFAuMDYuMDUwgZ8wDQ" +
-        "YJKoZIhvcNAQEBBQADgY0AMIGJAoGBALyVMklPv3uwTPzLG70sXIwKSEt65yiU71ibHyhH" +
-        "wJ/6dXy3HK2UETkRBK7UVSOYq005EbO9s/3oR3zt7QTFifvRTsIjl1L4TCLC2a8ApBr3BH" +
-        "xmBWcJDf427Pk1fm5qDdEmZnpyIlpKaKIiBcdtwZfjr0lROL8RNcvgtJPdu/ndAgMBAAGj" +
-        "OjA4MA4GA1UdDwEB/wQEAwIF4DARBgNVHQ4ECgQISjAUfyAwSA0wEwYDVR0jBAwwCoAIwm" +
-        "q0fugIX0kwDQYJKoZIhvcNAQEFBQADgYEAC6Af3cJUh/IQgWdbC2Vmk96sYjDlAsbA2keY" +
-        "J0bgBcNaIVoJ/W0B3rSawqSU+Vv64p7kcuAl6cbvIXPB++19V23jj6HUs1JxtPJZ9IWkS/" +
-        "FRakv6lD7+j1OdzJvDR8AMZWmPFHJdQnJwQ+I1YOU/O/ShawOnGCmihpIULUINFhk=";
-    public static final String[] TEST_47_DATA = new String[] {
-        Intermediate_Certificate_1_PP_06_05_crt,
-        Intermediate_Certificate_2_PP_06_05_crt,
-        Intermediate_Certificate_3_PP_06_05_crt,
-        Intermediate_Certificate_4_PP_06_05_crt,
-        Intermediate_CRL_1_PP_06_05_crl,
-        Intermediate_CRL_2_PP_06_05_crl,
-        Intermediate_CRL_3_PP_06_05_crl,
-        Intermediate_CRL_4_PP_06_05_crl,
-        End_Certificate_PP_06_05_crt
-    };
-
-    /*  
-     *  test48
-     *  
-     */ 
-
-    public static final String Intermediate_Certificate_PP_08_01_crt = 
-        "MIIClTCCAf6gAwIBAgIBejANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1" +
-        "UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb0QxEDAOBgNVBAsTB1Rlc3Rpbmcx" +
-        "FTATBgNVBAMTDFRydXN0IEFuY2hvcjAeFw05ODAxMDExMjAxMDBaFw00ODAxMDExMjAxMD" +
-        "BaMF4xCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9VLlMuIEdvdmVybm1lbnQxDDAKBgNVBAsT" +
-        "A0RvZDEQMA4GA1UECxMHVGVzdGluZzEVMBMGA1UEAxMMQ0ExLVBQLjA4LjAxMIGfMA0GCS" +
-        "qGSIb3DQEBAQUAA4GNADCBiQKBgQCp2vHVX08nyKe+S8NPkNJOZ9Xng22TbYXhUHtXw9yv" +
-        "ZmPkRhwDrZfBLXZcdZFixidkky3kCzv8Q3aPyPByM2ozH+AHJzEMbwifhyvUbANcS+Jts3" +
-        "lsZHarN7VyiXO+8J2OtYqX9qzmrAOHGleB2cJopEcmAMdrzgt1JIo98SUs4wIDAQABo2Mw" +
-        "YTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAWBgNVHSAEDzANMAsGCWCGSA" +
-        "FlAwEwATARBgNVHQ4ECgQIoRYqHNcbLacwEwYDVR0jBAwwCoAIq5rr+cLnVI8wDQYJKoZI" +
-        "hvcNAQEFBQADgYEAXchRFC94Pl25d3Kl4wBcueQLyWPRuH9zS0ZPLAqKLcWVdcg3fYMuJ5" +
-        "SypMMpxLaVjN7xq0KjML1gLiPQPk18iA2TOAUMblvjUl1uFzDdD6SqQidEZh2h3wxFtbLP" +
-        "U7qBBki7i1+Xn072Bpn2paw/vlh4K+ut0tFQ2BAhqVnQGJ8=";
-    public static final String Intermediate_CRL_PP_08_01_crl = 
-        "MIIBSzCBtQIBATANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS" +
-        "5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNV" +
-        "BAMTDENBMS1QUC4wOC4wMRcNOTkwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMTAwWqAjMCEwCg" +
-        "YDVR0UBAMCAQEwEwYDVR0jBAwwCoAIoRYqHNcbLacwDQYJKoZIhvcNAQEFBQADgYEARyX9" +
-        "2+LoXD2fIAACBMPDgds6m3Equ+Aawlr0kuppPO4ydCU4kiEgtVGK+kY5GzP6fUpAKjC8mh" +
-        "BrozojhAbkJekDoN0BIJ42Iab70VmdWXRQhPsUDhQwEt+9eSgy+HfiFfpcL1VJx8uY4XMh" +
-        "VB3hmapIe99P/T2QkZ+Pl8j0MgY=";
-    public static final String End_Certificate_PP_08_01_crt = 
-        "MIIChjCCAe+gAwIBAgIBezANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1" +
-        "UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3Rpbmcx" +
-        "FTATBgNVBAMTDENBMS1QUC4wOC4wMTAeFw05ODAxMDExMjAxMDBaFw00ODAxMDExMjAxMD" +
-        "BaMGAxCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9VLlMuIEdvdmVybm1lbnQxDDAKBgNVBAsT" +
-        "A0RvRDEQMA4GA1UECxMHVGVzdGluZzEXMBUGA1UEAxMOVXNlcjEtUFAuMDguMDEwgZ8wDQ" +
-        "YJKoZIhvcNAQEBBQADgY0AMIGJAoGBANYtrtpgxNl+9jF3TN1B9bSEGQci+cQOKpFsmrtF" +
-        "AyiGBxKONgGSgSFFuFIhyBKZF5ROaKX1P8lsQkrpnuybUi+Z9ADdyoaLUDD/z/kp5sebAZ" +
-        "ujmF8HVlqHYj5Ls2smS9EdSN1zgPTXIOTeZd/lv1iFppRZv6cBqlaoapQJsb1JAgMBAAGj" +
-        "UjBQMA4GA1UdDwEB/wQEAwIF4DAWBgNVHSAEDzANMAsGCWCGSAFlAwEwATARBgNVHQ4ECg" +
-        "QIZjcOdw0ZTCYwEwYDVR0jBAwwCoAIoRYqHNcbLacwDQYJKoZIhvcNAQEFBQADgYEAarsn" +
-        "13/g0vOKxy0okOp2JXEsPdsP7aWnCfR8N4+7gFD6dVnkgCIyc5Kbs7MbhB9gtIxYhHOV9W" +
-        "MaW9QAcBH+eXciFDfQBfaMBkL34ssE/TsZ92r/bhBwKRcH54f96G0QWUnoNMt4U/1j2mKn" +
-        "faFirltqEPUu9mv4FiQ0pNT9yH0=";
-    public static final String[] TEST_48_DATA = new String[] {
-        Intermediate_Certificate_PP_08_01_crt,
-        Intermediate_CRL_PP_08_01_crl,
-        End_Certificate_PP_08_01_crt
-    };
-
-    /*  
-     *  test49
-     *  
-     */ 
-
-    public static final String Intermediate_Certificate_PP_08_02_crt = 
-        "MIICojCCAgugAwIBAgIBfDANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1" +
-        "UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb0QxEDAOBgNVBAsTB1Rlc3Rpbmcx" +
-        "FTATBgNVBAMTDFRydXN0IEFuY2hvcjAeFw05ODAxMDExMjAxMDBaFw00ODAxMDExMjAxMD" +
-        "BaMF4xCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9VLlMuIEdvdmVybm1lbnQxDDAKBgNVBAsT" +
-        "A0RvZDEQMA4GA1UECxMHVGVzdGluZzEVMBMGA1UEAxMMQ0ExLVBQLjA4LjAyMIGfMA0GCS" +
-        "qGSIb3DQEBAQUAA4GNADCBiQKBgQCmAgNA68ABUEppM9Oo3guiGvguvtrWQzsQIJfMBrE4" +
-        "/Scwc4SPK4PiJD+kVwtXinXpVclBMQge10uZ48lSJTihfZscJw3RSHt70H4CpPQm44QS7P" +
-        "7fQqpcZKZvMWmY6A8jju3Phbuq2WgJCIxxVw886GNIAXW8C4ZFmXCjwiGGHwIDAQABo3Aw" +
-        "bjAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAjBgNVHSAEHDAaMAsGCWCGSA" +
-        "FlAwEwATALBglghkgBZQMBMAIwEQYDVR0OBAoECOhZ4RAlqGGcMBMGA1UdIwQMMAqACKua" +
-        "6/nC51SPMA0GCSqGSIb3DQEBBQUAA4GBAGEVSOcNaUu50f6AgGBtz1MDdRiHe08W/nzCNn" +
-        "0K1/UqrIXVJ7IYgbOLkL3cdHy4PdngCyEblzl5Cwp9chh2zL0PTUbV1uJIBW32ks1HuAVQ" +
-        "FTZqx0iuopY5AqRCJVDJt4HB5PKObwnmLPNWicI4Juap13j/Tcnw1EP7E7n6OejC";
-    public static final String Intermediate_CRL_PP_08_02_crl = 
-        "MIIBSzCBtQIBATANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS" +
-        "5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNV" +
-        "BAMTDENBMS1QUC4wOC4wMhcNOTkwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMTAwWqAjMCEwCg" +
-        "YDVR0UBAMCAQEwEwYDVR0jBAwwCoAI6FnhECWoYZwwDQYJKoZIhvcNAQEFBQADgYEACLHw" +
-        "iDARFoF4GauIHnoZlfj6nlOHAFfNSXq06Vvl713bsoAiOSV+2goZjRG62uxhampE+gCdXx" +
-        "1nwhKQ5R5jOGGOxgLtBFNZwKmD0KiDOSvfIVJ0kYCcaB4mSm0a/7pcCPrrE5ofvkmTW6Wx" +
-        "k/YIuBZdDoqZC91v4tnu0fSch9Q=";
-    public static final String End_Certificate_PP_08_02_crt = 
-        "MIICkzCCAfygAwIBAgIBfTANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1" +
-        "UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3Rpbmcx" +
-        "FTATBgNVBAMTDENBMS1QUC4wOC4wMjAeFw05ODAxMDExMjAxMDBaFw00ODAxMDExMjAxMD" +
-        "BaMGAxCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9VLlMuIEdvdmVybm1lbnQxDDAKBgNVBAsT" +
-        "A0RvRDEQMA4GA1UECxMHVGVzdGluZzEXMBUGA1UEAxMOVXNlcjEtUFAuMDguMDIwgZ8wDQ" +
-        "YJKoZIhvcNAQEBBQADgY0AMIGJAoGBAOJsz8ys71e8UB+VDTBAocVQvADiqh0LjdML3pET" +
-        "B6VvikiHgbB1PJufxDses+v0WD74ChZEa/octNcMFqMgBlhVBEfvbyGTjiN97LzdZ7SPyd" +
-        "DsDulqwBG9sACryUGHqwHYnUbjOqsThOXFB8Sg/CGGawpZAosm2AuH2gqNvNuJAgMBAAGj" +
-        "XzBdMA4GA1UdDwEB/wQEAwIF4DAjBgNVHSAEHDAaMAsGCWCGSAFlAwEwATALBglghkgBZQ" +
-        "MBMAIwEQYDVR0OBAoECOiMLE2l5u16MBMGA1UdIwQMMAqACOhZ4RAlqGGcMA0GCSqGSIb3" +
-        "DQEBBQUAA4GBAFf4BCbNtduwn5InkfdtFbQOqhPLAn/5eIhxhVhUu7TekWT7ktdaVQFzGF" +
-        "G2h1+gXgFP+YKjJy7kGzEVQjlWtuC0l74EwybNHnYAoDg4itKe+0OSNNXdyOmn+i0tE0nx" +
-        "sWN19VvhLGFC8p38gd0oDr1ziYdg0z2Mx4IlMDxl7QhT";
-    public static final String[] TEST_49_DATA = new String[] {
-        Intermediate_Certificate_PP_08_02_crt,
-        Intermediate_CRL_PP_08_02_crl,
-        End_Certificate_PP_08_02_crt
-    };
-
-    /*  
-     *  test50
-     *  
-     */ 
-
-    public static final String Intermediate_Certificate_PP_08_03_crt = 
-        "MIICkDCCAfmgAwIBAgIBfjANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1" +
-        "UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb0QxEDAOBgNVBAsTB1Rlc3Rpbmcx" +
-        "FTATBgNVBAMTDFRydXN0IEFuY2hvcjAeFw05ODAxMDExMjAxMDBaFw00ODAxMDExMjAxMD" +
-        "BaMF4xCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9VLlMuIEdvdmVybm1lbnQxDDAKBgNVBAsT" +
-        "A0RvZDEQMA4GA1UECxMHVGVzdGluZzEVMBMGA1UEAxMMQ0ExLVBQLjA4LjAzMIGfMA0GCS" +
-        "qGSIb3DQEBAQUAA4GNADCBiQKBgQDKZDgBum5Ud5i8HWlCKInJ1x9goZ7TQJ+LdfA9iGU1" +
-        "47xJL5eFcERWy4dr5wM5GNRW/DHXlnA/qsRVE29EuRh6qAVgcPGAfmJxz7s5yhmErfmiQ3" +
-        "0rh6+pma/EhcjntXqwIqnk1qt6mEk7x9UKO3ksFCVsDEA67/dvownjcZB59wIDAQABo14w" +
-        "XDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjARBgNVHSAECjAIMAYGBFUdIA" +
-        "AwEQYDVR0OBAoECGtTrZIwYYHbMBMGA1UdIwQMMAqACKua6/nC51SPMA0GCSqGSIb3DQEB" +
-        "BQUAA4GBAM3t13xJJraRiJDAwZFxhTNR570wMdSRiF3yWSRtOjEv8NTVFj/T1oJJ8h9Gqh" +
-        "hMpTTHU7uGCyVB9S1HCelmS+1zteKr0B+WVzBl9yuhvku3farz6zgIVK3v5hQ6xC4H4Lac" +
-        "NDhTTKBkRfDf9KskFoxJ/AGxPdZtIEC92DFSblQB";
-    public static final String Intermediate_CRL_PP_08_03_crl = 
-        "MIIBSzCBtQIBATANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS" +
-        "5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNV" +
-        "BAMTDENBMS1QUC4wOC4wMxcNOTkwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMTAwWqAjMCEwCg" +
-        "YDVR0UBAMCAQEwEwYDVR0jBAwwCoAIa1OtkjBhgdswDQYJKoZIhvcNAQEFBQADgYEAcUHo" +
-        "D00X/pd3D5KGa5C6dY18RsnUovkjUkegGTpbhQfmYZIdBatj7Kv75FeUJ9UpqCUjxHgdiE" +
-        "EVy60NLVGP2VRuJ1m8vfDz8hu5PaiVjneQoRw2M9ieBnz3PjSETDdBGJLWHyCBZbp/W2+0" +
-        "iqcZK7Fm9O5EL4PUO6QIwuH76q0=";
-    public static final String End_Certificate_PP_08_03_crt = 
-        "MIICgTCCAeqgAwIBAgIBfzANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1" +
-        "UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3Rpbmcx" +
-        "FTATBgNVBAMTDENBMS1QUC4wOC4wMzAeFw05ODAxMDExMjAxMDBaFw00ODAxMDExMjAxMD" +
-        "BaMGAxCzAJBgNVBAYTAlVTMRgwFgYDVQQKEw9VLlMuIEdvdmVybm1lbnQxDDAKBgNVBAsT" +
-        "A0RvRDEQMA4GA1UECxMHVGVzdGluZzEXMBUGA1UEAxMOVXNlcjEtUFAuMDguMDMwgZ8wDQ" +
-        "YJKoZIhvcNAQEBBQADgY0AMIGJAoGBALsXEPrCg91CObTl5OrHIB5GshIDXgqBmjzxfWPK" +
-        "ih4STWeBe2eIFO9pONXcM5lstEu2XLBPP6QBMUMWOrphJejrJ3eDQHs404bBnt95O/x17i" +
-        "665CZtg1jUqoO1kOBOComx2AJGZ46RdBExbfd0tTtdHWtRhMsnQchI+WtEyotdAgMBAAGj" +
-        "TTBLMA4GA1UdDwEB/wQEAwIF4DARBgNVHSAECjAIMAYGBFUdIAAwEQYDVR0OBAoECEWZkJ" +
-        "TYQ3z5MBMGA1UdIwQMMAqACGtTrZIwYYHbMA0GCSqGSIb3DQEBBQUAA4GBAHki/TrpHiKW" +
-        "gvERhguQ/uOqHHZNXsog+fgGVFFMOWwJ9bq4aHKd1fDZpyZF4vBxW7llbhuSt+ob2TNlkR" +
-        "wkqzfGL+3xOTKNRgzDwJcil8akC1N5uBftrQk+eL7rM1PezWRM7fIbpmv5ZieIVswtTPF5" +
-        "1Rl3G+JXUBy9E95espls";
-    public static final String[] TEST_50_DATA = new String[] {
-        Intermediate_Certificate_PP_08_03_crt,
-        Intermediate_CRL_PP_08_03_crl,
-        End_Certificate_PP_08_03_crt
-    };
-
-    /*  
-     *  test51
-     *  
-     */ 
-
-    public static final String Intermediate_Certificate_PP_08_04_crt = 
-        "MIICljCCAf+gAwIBAgICAIAwDQYJKoZIhvcNAQEFBQAwXjELMAkGA1UEBhMCVVMxGDAWBg" +
-        "NVBAoTD1UuUy4gR292ZXJubWVudDEMMAoGA1UECxMDRG9EMRAwDgYDVQQLEwdUZXN0aW5n" +
-        "MRUwEwYDVQQDEwxUcnVzdCBBbmNob3IwHhcNOTgwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMT" +
-        "AwWjBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQL" +
-        "EwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNVBAMTDENBMS1QUC4wOC4wNDCBnzANBg" +
-        "kqhkiG9w0BAQEFAAOBjQAwgYkCgYEAsrM3A06j1zDz6VuZh+O2UrAPcKtwSA6KxTShUpgr" +
-        "t9UB5iIAEvxcDTwDlubEv/cJjDcFj9N57otzW4ppnuT2ztE4ROmkNb0xL6u00deS1yGjXB" +
-        "wy1G9g8bYDdAXOJlv0tjHOBqXlyKoMny82BOBL2vsCstiqxl14Q3/wBD1w29MCAwEAAaNj" +
-        "MGEwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwFgYDVR0gBA8wDTALBglghk" +
-        "gBZQMBMAMwEQYDVR0OBAoECJiAkexK6/c7MBMGA1UdIwQMMAqACKua6/nC51SPMA0GCSqG" +
-        "SIb3DQEBBQUAA4GBAL4xwcpXZQPTTPYIQ8CMoVla/5P1x6BPmPqSkvh1D/o4ds9Ll9kHBz" +
-        "//X1ZM8SzYcEO+1r75JUzoHsvDw9yYAk2oclLsCORAPqD8Owhv3jv0QQtYSmf0Sxt5FLx0" +
-        "MRP9keY/DURRf9KitO4glOawtRtYMq2BeeJk1xusY0KqEnQr";
-    public static final String Intermediate_CRL_PP_08_04_crl = 
-        "MIIBSzCBtQIBATANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS" +
-        "5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNV" +
-        "BAMTDENBMS1QUC4wOC4wNBcNOTkwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMTAwWqAjMCEwCg" +
-        "YDVR0UBAMCAQEwEwYDVR0jBAwwCoAImICR7Err9zswDQYJKoZIhvcNAQEFBQADgYEAcN3a" +
-        "jIEcXsQatb0fvVcFnO7d7lzNtgbqL3MtaqJ/PjkRJ/rO7JAXQRwdajUZF4ECHylZKE2HUG" +
-        "Dk+vidV98T8mNmb0TEuuLV+J1G0q8ezMXRJtDt/2m3y1VBireXlEMd1DdgpsDdCQ4va+XJ" +
-        "qv0TvVhfxWry+LrVb6Bf5ItexXg=";
-    public static final String End_Certificate_PP_08_04_crt = 
-        "MIIChzCCAfCgAwIBAgICAIEwDQYJKoZIhvcNAQEFBQAwXjELMAkGA1UEBhMCVVMxGDAWBg" +
-        "NVBAoTD1UuUy4gR292ZXJubWVudDEMMAoGA1UECxMDRG9kMRAwDgYDVQQLEwdUZXN0aW5n" +
-        "MRUwEwYDVQQDEwxDQTEtUFAuMDguMDQwHhcNOTgwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMT" +
-        "AwWjBgMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQL" +
-        "EwNEb0QxEDAOBgNVBAsTB1Rlc3RpbmcxFzAVBgNVBAMTDlVzZXIxLVBQLjA4LjA0MIGfMA" +
-        "0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDPJWa/cB7WW7tkGxFhcwxqE+BycXe3Ru2qGbun" +
-        "NPQZ/j44UT2C6rl1wZwugCY0sR6mXR/P/NR7czZvg4Tt6lwcNtc8PeafFMUeu0u0Kg9uWn" +
-        "fzQQKeIgRVcEzGTGMPGWXS0ed6X/1+Dj8A+T/tqXKUtM3Jpe0pCmm9CIrYCXLPRQIDAQAB" +
-        "o1IwUDAOBgNVHQ8BAf8EBAMCBeAwFgYDVR0gBA8wDTALBglghkgBZQMBMAQwEQYDVR0OBA" +
-        "oECKm9IOyOM1h+MBMGA1UdIwQMMAqACJiAkexK6/c7MA0GCSqGSIb3DQEBBQUAA4GBAEXy" +
-        "dlTkkZaYK6sUJCiPeCPxfj5cdo/G4RGBImMJbTeDyVTvXSH9G2yWUMqBGnYLrwdJJeXjF3" +
-        "89miJgnJ+1r/r3r2/NeAUuJDsOHRMFh0KXFmgubyw/kGsZBe3279hDnND8ZjfQBmKQD17f" +
-        "PycWTTAC5p6GM8tGERiDSnMc5rmm";
-    public static final String[] TEST_51_DATA = new String[] {
-        Intermediate_Certificate_PP_08_04_crt,
-        Intermediate_CRL_PP_08_04_crl,
-        End_Certificate_PP_08_04_crt
-    };
-
-    /*  
-     *  test52
-     *  
-     */ 
-
-    public static final String Intermediate_Certificate_PP_08_05_crt = 
-        "MIICljCCAf+gAwIBAgICAIIwDQYJKoZIhvcNAQEFBQAwXjELMAkGA1UEBhMCVVMxGDAWBg" +
-        "NVBAoTD1UuUy4gR292ZXJubWVudDEMMAoGA1UECxMDRG9EMRAwDgYDVQQLEwdUZXN0aW5n" +
-        "MRUwEwYDVQQDEwxUcnVzdCBBbmNob3IwHhcNOTgwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMT" +
-        "AwWjBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQL" +
-        "EwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNVBAMTDENBMS1QUC4wOC4wNTCBnzANBg" +
-        "kqhkiG9w0BAQEFAAOBjQAwgYkCgYEAwH2d+D0pH8y4QJAPpE0s2oWucV1jlE4pBMGNNPJ5" +
-        "FIRmyRCt90IpzmK/EuqT6iSZYd9hIB9wa180ByN67PK1z4loLFMUL2RmbWeAFlGy5eEFOy" +
-        "4d479qfy6JCOzt0TKhYzhukLUqGLa4DDTzvnnUx0o86aLvGq0K5s6DRlNyc08CAwEAAaNj" +
-        "MGEwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwFgYDVR0gBA8wDTALBglghk" +
-        "gBZQMBMAMwEQYDVR0OBAoECDSeuxr4EVgaMBMGA1UdIwQMMAqACKua6/nC51SPMA0GCSqG" +
-        "SIb3DQEBBQUAA4GBAKoGi6qlODB8Lc86PtGXfBhW769jB8xzgmENE59sqNBEvYa/oK9Xxm" +
-        "1JX1OGEQMq/mqwZXg6hSczpexCIO4tUH8QKTU68yvqcZoZCDV8FLM8aEUPtUoPIpluhAtN" +
-        "scGfb3uXoV9fg7q1Pi5YlKMnNrDIq1tH1CAGKMDRrjW63Q8C";
-    public static final String Intermediate_CRL_PP_08_05_crl = 
-        "MIIBSzCBtQIBATANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS" +
-        "5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNV" +
-        "BAMTDENBMS1QUC4wOC4wNRcNOTkwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMTAwWqAjMCEwCg" +
-        "YDVR0UBAMCAQEwEwYDVR0jBAwwCoAINJ67GvgRWBowDQYJKoZIhvcNAQEFBQADgYEAv5Hs" +
-        "nYPZO1fGC/Z2lIbbUKjIv0+BrR9HbG+b76wXeJTVxfXMlZe0cpOR/KD29DyxI3G4IedHRy" +
-        "zL8iCDWYbA86arJzl5GZJ1MC2A586vNn/6wiiT6nP3iMj2z/nyvan8L30KNBm9IDXQExOu" +
-        "PNE/wOWYBxxCjg551fpXfJKqDIo=";
-    public static final String End_Certificate_PP_08_05_crt = 
-        "MIIChzCCAfCgAwIBAgICAIMwDQYJKoZIhvcNAQEFBQAwXjELMAkGA1UEBhMCVVMxGDAWBg" +
-        "NVBAoTD1UuUy4gR292ZXJubWVudDEMMAoGA1UECxMDRG9kMRAwDgYDVQQLEwdUZXN0aW5n" +
-        "MRUwEwYDVQQDEwxDQTEtUFAuMDguMDUwHhcNOTgwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMT" +
-        "AwWjBgMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQL" +
-        "EwNEb0QxEDAOBgNVBAsTB1Rlc3RpbmcxFzAVBgNVBAMTDlVzZXIxLVBQLjA4LjA1MIGfMA" +
-        "0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC4BZFTwOqI+71v8CdiYbe7x0qYveN524h6+iLh" +
-        "oEqvzuVKVqvQgVSaSLPcMhoCGDv3nqyP57Znl/3I09vLU6F4HKLtjO9E0PZu8EXOKLjeWP" +
-        "XmJQkdHfODj/TrrWSsrdorl7s7gdWEUFlbiWvUVUtkqLNbGLJZ5Q1xZvBRLS7loQIDAQAB" +
-        "o1IwUDAOBgNVHQ8BAf8EBAMCBeAwFgYDVR0gBA8wDTALBglghkgBZQMBMAMwEQYDVR0OBA" +
-        "oECBDaTXbN11BBMBMGA1UdIwQMMAqACDSeuxr4EVgaMA0GCSqGSIb3DQEBBQUAA4GBAGVa" +
-        "QNtd4LgoVZQ+Uy1lSr6sog4fsGaoQJCZcvrMJwGpMF0FJsGtOb0R2mfwHi1YXqPF5qZY2I" +
-        "7cVbwVtRQzbXunk1z12k0iIesMtYUncxb/SBstC7VNS8HNZm9ese+YM6Ac8mGT+IUZsPcP" +
-        "gI9fQ1L/2u+/3L4fweca1R45xm5M";
-    public static final String[] TEST_52_DATA = new String[] {
-        Intermediate_Certificate_PP_08_05_crt,
-        Intermediate_CRL_PP_08_05_crl,
-        End_Certificate_PP_08_05_crt
-    };
-
-    /*  
-     *  test53
-     *  
-     */ 
-
-    public static final String Intermediate_Certificate_PP_08_06_crt = 
-        "MIICsDCCAhmgAwIBAgICAIQwDQYJKoZIhvcNAQEFBQAwXjELMAkGA1UEBhMCVVMxGDAWBg" +
-        "NVBAoTD1UuUy4gR292ZXJubWVudDEMMAoGA1UECxMDRG9EMRAwDgYDVQQLEwdUZXN0aW5n" +
-        "MRUwEwYDVQQDEwxUcnVzdCBBbmNob3IwHhcNOTgwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMT" +
-        "AwWjBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQL" +
-        "EwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNVBAMTDENBMS1QUC4wOC4wNjCBnzANBg" +
-        "kqhkiG9w0BAQEFAAOBjQAwgYkCgYEAlSIH/+6DEL1P9tkgbsI2PcW0w9dmqMTLP3jKYPsr" +
-        "sSWI5bcv55sk6RItVr3hGgkaskZoHeamUBAiGPksVyrqmRwSCJzQDLnLdMnjjudvPjp1ZZ" +
-        "9UCufTtMPFvnEuVBx5e8A13AQ4OyHqaJgWRVoRJd6vwTa5jzfYCCMJZHHKpcUCAwEAAaN9" +
-        "MHswDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwMAYDVR0gBCkwJzALBglghk" +
-        "gBZQMBMAEwCwYJYIZIAWUDATACMAsGCWCGSAFlAwEwAzARBgNVHQ4ECgQI8837JGF7vMAw" +
-        "EwYDVR0jBAwwCoAIq5rr+cLnVI8wDQYJKoZIhvcNAQEFBQADgYEAKmgbxzWI6V2twYDp65" +
-        "Gu8zn883CnI08s2FEVupvrKduxYmg+ZDkTBE3ZJFxcOuxJf58MRfDWy8C4jJhLnT3JSSSg" +
-        "sY3n93jzc0s2h5y2wd1bUTDLqhqWCshisDG/88rpv938O8luiUEwltolzKTa+ScA6nXSQt" +
-        "LT4I6O3vbTx2g=";
-    public static final String Intermediate_CRL_PP_08_06_crl = 
-        "MIIBSzCBtQIBATANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS" +
-        "5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNV" +
-        "BAMTDENBMS1QUC4wOC4wNhcNOTkwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMTAwWqAjMCEwCg" +
-        "YDVR0UBAMCAQEwEwYDVR0jBAwwCoAI8837JGF7vMAwDQYJKoZIhvcNAQEFBQADgYEAHua+" +
-        "lC3wP4G6796jjr6wuu7xEQqY1azsLVsGtL7YL8fm42rl7hgU40SuFIc7Kc+A7oEEkKgvmu" +
-        "SLMIv7q5O8J26fQOuduGWQAncPYB8w7sNWjCZbdjVbjp1XIApcAL3djCbLZ8/NYsCoOuwx" +
-        "hRQKX1hIn+rNDi1DMD4H99QdDGE=";
-    public static final String End_Certificate_PP_08_06_crt = 
-        "MIICoTCCAgqgAwIBAgICAIUwDQYJKoZIhvcNAQEFBQAwXjELMAkGA1UEBhMCVVMxGDAWBg" +
-        "NVBAoTD1UuUy4gR292ZXJubWVudDEMMAoGA1UECxMDRG9kMRAwDgYDVQQLEwdUZXN0aW5n" +
-        "MRUwEwYDVQQDEwxDQTEtUFAuMDguMDYwHhcNOTgwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMT" +
-        "AwWjBgMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQL" +
-        "EwNEb0QxEDAOBgNVBAsTB1Rlc3RpbmcxFzAVBgNVBAMTDlVzZXIxLVBQLjA4LjA2MIGfMA" +
-        "0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDnaYU/lu+u+LmLQwyACSsRyxQEEvgriE7ApmHj" +
-        "sNBcd3lovFQMfw9MyOOMsInOgQZU8p/invnhx11/pwi77ViQQ780unhHt5H/tteaYwcsDR" +
-        "cUxR/8jK0DBnbVWvm8S/NGb8BxfbRmDHBTWGZ70hDSCJypWRfHQj0I/SAqAW/VuwIDAQAB" +
-        "o2wwajAOBgNVHQ8BAf8EBAMCBeAwMAYDVR0gBCkwJzALBglghkgBZQMBMAEwCwYJYIZIAW" +
-        "UDATACMAsGCWCGSAFlAwEwAzARBgNVHQ4ECgQIhh/KikcKA7EwEwYDVR0jBAwwCoAI8837" +
-        "JGF7vMAwDQYJKoZIhvcNAQEFBQADgYEAbHK3lkqbGy61lu9d22uO2H3hzwvjmlccZo8pro" +
-        "ord45d2nRIxw2ag4dS1YRFrefVdxZtKeR9+5o+tQtvmTcDOer4u6NZ/sVVElTb1d6axtL0" +
-        "i4cmqv6bGWYECEwtwmPGqAavp9pPZjNRbkBGy9qhVNTXfDQYpA8yzXWO/xUrwNU=";
-    public static final String[] TEST_53_DATA = new String[] {
-        Intermediate_Certificate_PP_08_06_crt,
-        Intermediate_CRL_PP_08_06_crl,
-        End_Certificate_PP_08_06_crt
-    };
-
-    /*  
-     *  test54
-     *  
-     */ 
-
-    public static final String Intermediate_Certificate_1_PL_01_01_crt = 
-        "MIICmTCCAgKgAwIBAgICAIYwDQYJKoZIhvcNAQEFBQAwXjELMAkGA1UEBhMCVVMxGDAWBg" +
-        "NVBAoTD1UuUy4gR292ZXJubWVudDEMMAoGA1UECxMDRG9EMRAwDgYDVQQLEwdUZXN0aW5n" +
-        "MRUwEwYDVQQDEwxUcnVzdCBBbmNob3IwHhcNOTgwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMT" +
-        "AwWjBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQL" +
-        "EwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNVBAMTDENBMS1QTC4wMS4wMTCBnzANBg" +
-        "kqhkiG9w0BAQEFAAOBjQAwgYkCgYEAxDV2d7qXbpCvOzBimskBLsgexpEYaHv0s7gOaqhC" +
-        "4A3K8sxdjyW6QdGZhKX8tCMqnlPp9CNbpY4tQQ5oTSk5pj6HwAsTfGcDwXJnjKWx1FJ7rD" +
-        "meZZ8c2K7a8voBl6FoPGn8CMhO0WmM9Eyb/vDUPdCZzScb+z/BxTcV1BPFdq0CAwEAAaNm" +
-        "MGQwEgYDVR0TAQH/BAgwBgEB/wIBADAOBgNVHQ8BAf8EBAMCAQYwFgYDVR0gBA8wDTALBg" +
-        "lghkgBZQMBMAEwEQYDVR0OBAoECBpj0+Gcq32oMBMGA1UdIwQMMAqACKua6/nC51SPMA0G" +
-        "CSqGSIb3DQEBBQUAA4GBAB/9veHrkLeu8jkwXggJtwqPTmkrIBcX+pz85BTSETYeLOzF46" +
-        "onk+qt+IHptlrm3D7ny2Y5M0dQQ6tPzhGZxCEg9RoDibZGtsx+qeAh1ZjeEpEcQyp/idWY" +
-        "asH+EIuEIOZA9c1ySxI/3v3ZfzaSGS8jsgSDkLB4JumrE9ZkLNd1";
-    public static final String Intermediate_Certificate_2_PL_01_01_crt = 
-        "MIICljCCAf+gAwIBAgICAIcwDQYJKoZIhvcNAQEFBQAwXjELMAkGA1UEBhMCVVMxGDAWBg" +
-        "NVBAoTD1UuUy4gR292ZXJubWVudDEMMAoGA1UECxMDRG9kMRAwDgYDVQQLEwdUZXN0aW5n" +
-        "MRUwEwYDVQQDEwxDQTEtUEwuMDEuMDEwHhcNOTgwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMT" +
-        "AwWjBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQL" +
-        "EwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNVBAMTDENBMi1QTC4wMS4wMTCBnzANBg" +
-        "kqhkiG9w0BAQEFAAOBjQAwgYkCgYEA3B3UKG3tEL6FQz6dL6iqSvzgGsm1Fg5uzK8npkEq" +
-        "g2caUM7huYFfXeur1mu6iKiROcGX8ZYxrPi9Orh39YVrSu2EUWvqQui4QScf4dIlzAOunv" +
-        "0gAa/lIVTHgZhIomKND6/tZLU251dJiFhoV6bXx2tor83vWFVPx2oVd5LL5S0CAwEAAaNj" +
-        "MGEwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwFgYDVR0gBA8wDTALBglghk" +
-        "gBZQMBMAEwEQYDVR0OBAoECJmK3jFTIl6lMBMGA1UdIwQMMAqACBpj0+Gcq32oMA0GCSqG" +
-        "SIb3DQEBBQUAA4GBADkYLTg4RncTpAFmpUy7WGOMvoFV15nDoi91OMxhxVkbGSE0DJFxi3" +
-        "hPKcfUNvzy0bEUUTaqOXdbIkoLTG77NTckJxurSRyam0jA0+6SUYZ6F9fVotwMul2EiVl9" +
-        "XP5oCt7LkgqVgMASuwfzMnQozB6Oi/YP2OdSPXLipI6rl2dx";
-    public static final String Intermediate_CRL_1_PL_01_01_crl = 
-        "MIIBSzCBtQIBATANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS" +
-        "5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNV" +
-        "BAMTDENBMS1QTC4wMS4wMRcNOTkwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMTAwWqAjMCEwCg" +
-        "YDVR0UBAMCAQEwEwYDVR0jBAwwCoAIGmPT4ZyrfagwDQYJKoZIhvcNAQEFBQADgYEAd8YZ" +
-        "8jibr8yjcGYSDicJuyUvHBZntTVQ1sP5XVmtCZcYcQCVjbC0auYTEP5snXbGPW5qeEaaXB" +
-        "MhekMr776hP4Kl3g4AjguFl3XQGcURlgNd8LsTpMMdNWC7XwooOF2FzFjD1ru0BSEWabzW" +
-        "NNaVeuMMbu2N0lc6NDJvRC8LkhA=";
-    public static final String Intermediate_CRL_2_PL_01_01_crl = 
-        "MIIBSzCBtQIBATANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS" +
-        "5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNV" +
-        "BAMTDENBMi1QTC4wMS4wMRcNOTkwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMTAwWqAjMCEwCg" +
-        "YDVR0UBAMCAQEwEwYDVR0jBAwwCoAImYreMVMiXqUwDQYJKoZIhvcNAQEFBQADgYEAZFec" +
-        "GtjOfp8pT0n1dMF/x9n8y5tM+G3LLnZvDJspLc/sqP3E3B/sHBiis81caEkQQAOTBU5goJ" +
-        "0KOFAUOfEq+IX5uvNhuPuinx0OsSak+2Annvi12zodMQKPNm1uMVt2bMHHHZVEVTqcv36g" +
-        "xgdbp0YKTmuvSy6s8NtGFpkNmnU=";
-    public static final String End_Certificate_PL_01_01_crt = 
-        "MIIChzCCAfCgAwIBAgICAIgwDQYJKoZIhvcNAQEFBQAwXjELMAkGA1UEBhMCVVMxGDAWBg" +
-        "NVBAoTD1UuUy4gR292ZXJubWVudDEMMAoGA1UECxMDRG9kMRAwDgYDVQQLEwdUZXN0aW5n" +
-        "MRUwEwYDVQQDEwxDQTItUEwuMDEuMDEwHhcNOTgwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMT" +
-        "AwWjBgMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQL" +
-        "EwNEb0QxEDAOBgNVBAsTB1Rlc3RpbmcxFzAVBgNVBAMTDlVzZXIxLVBMLjAxLjAxMIGfMA" +
-        "0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDCAUPp5j4V5XTA44Ra1EWkp9HgS4w3uXJ7/Vhi" +
-        "K5bARFrDOOxjV8nmr5hoUYr4jwdi2Rl+60TQK/F08gdcGxdyc9p/yiU5HyAP6i+4iqmvaW" +
-        "9b2egNyZ5tOmpl/Q9FSFWa9d/PYBKM5Sj/r73RtA+/chc4uq3uyLekSRQGh1MieQIDAQAB" +
-        "o1IwUDAOBgNVHQ8BAf8EBAMCBeAwFgYDVR0gBA8wDTALBglghkgBZQMBMAEwEQYDVR0OBA" +
-        "oECAiL3A4CkaFyMBMGA1UdIwQMMAqACJmK3jFTIl6lMA0GCSqGSIb3DQEBBQUAA4GBAJtH" +
-        "mNNvCt/0uFbHdvUvCuBeZ9cggfpTyUS4X8zgcLDPFbw6VvX65umOZpceZI6hwcre+LZahi" +
-        "gUEPvXppncEObkeVTcYdOTSDoxh5tZyee1P4sbD9H+suGWeewqUDvFs2ymHtxlkpOttitR" +
-        "xQc2U6VlCuZ4XU8SwucyhW0z51e4";
-    public static final String[] TEST_54_DATA = new String[] {
-        Intermediate_Certificate_1_PL_01_01_crt,
-        Intermediate_Certificate_2_PL_01_01_crt,
-        Intermediate_CRL_1_PL_01_01_crl,
-        Intermediate_CRL_2_PL_01_01_crl,
-        End_Certificate_PL_01_01_crt
-    };
-
-    /*  
-     *  test55
-     *  
-     */ 
-
-    public static final String Intermediate_Certificate_1_PL_01_02_crt = 
-        "MIICmTCCAgKgAwIBAgICAIkwDQYJKoZIhvcNAQEFBQAwXjELMAkGA1UEBhMCVVMxGDAWBg" +
-        "NVBAoTD1UuUy4gR292ZXJubWVudDEMMAoGA1UECxMDRG9EMRAwDgYDVQQLEwdUZXN0aW5n" +
-        "MRUwEwYDVQQDEwxUcnVzdCBBbmNob3IwHhcNOTgwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMT" +
-        "AwWjBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQL" +
-        "EwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNVBAMTDENBMS1QTC4wMS4wMjCBnzANBg" +
-        "kqhkiG9w0BAQEFAAOBjQAwgYkCgYEA4QmGXEeVKCn1aQx27r+EBuQqfi8fP7gyV5JLkaSu" +
-        "DOUrqXg8dQxHsBNCf3XilGIvjNFZjVUPdS8FNqC+if9D164VyGQlv/JUor/GlvwVfyotUO" +
-        "U1PqSzFrAALYTmfm/ZqhMvGYloStSDxlzjDmyKadskzOxZZDNSe5s8dvUpYn0CAwEAAaNm" +
-        "MGQwEgYDVR0TAQH/BAgwBgEB/wIBADAOBgNVHQ8BAf8EBAMCAQYwFgYDVR0gBA8wDTALBg" +
-        "lghkgBZQMBMAEwEQYDVR0OBAoECGk7qDbbBgRbMBMGA1UdIwQMMAqACKua6/nC51SPMA0G" +
-        "CSqGSIb3DQEBBQUAA4GBAD+eI+jg4jmeC3pJRGEF/hbPPYvL6aocjqqbZyNKN5FWItccQo" +
-        "PWg/GK1GpusDZadesZBDo6fLIUJzL+OumrIYJLB3HxQsmyOXB1gRg1hcva71RWFJYzx01U" +
-        "eB8lCbk8Zu24HzLzqjfVuwKOFFELWDEq7bd6Re/aKSHtNnDbsgSE";
-    public static final String Intermediate_Certificate_2_PL_01_02_crt = 
-        "MIICljCCAf+gAwIBAgICAIowDQYJKoZIhvcNAQEFBQAwXjELMAkGA1UEBhMCVVMxGDAWBg" +
-        "NVBAoTD1UuUy4gR292ZXJubWVudDEMMAoGA1UECxMDRG9kMRAwDgYDVQQLEwdUZXN0aW5n" +
-        "MRUwEwYDVQQDEwxDQTEtUEwuMDEuMDIwHhcNOTgwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMT" +
-        "AwWjBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQL" +
-        "EwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNVBAMTDENBMi1QTC4wMS4wMjCBnzANBg" +
-        "kqhkiG9w0BAQEFAAOBjQAwgYkCgYEAl/HiHoos7eHaDIFhMmvIPk63UT33Z+0iiCIuKLW7" +
-        "tgkT8ia1Yg++np1pC3oqYVeKkXqMcjgonPGQhcek12vLt3/+2PYyYirOTVZaiO9pKQ5An8" +
-        "ZMWXIJmCEAMHabPO1RnetvRv5JZFxZY9jIUnD2fUADzzUh/eHN6Pur0DDrI6sCAwEAAaNj" +
-        "MGEwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwFgYDVR0gBA8wDTALBglghk" +
-        "gBZQMBMAEwEQYDVR0OBAoECPk0C10KQLZuMBMGA1UdIwQMMAqACGk7qDbbBgRbMA0GCSqG" +
-        "SIb3DQEBBQUAA4GBAMJ4+BZQxpxWhNbo8bpGkbbcKT3kfKYrHjHsZADC+/gAJSVL854b1W" +
-        "VKsGr1YcCX10V1Gcqb6Jgziy+AzRLhcJngszcz0A7LxrMH+FIyWEPgZnOyQCa8B/9bnsh9" +
-        "bC1gEmXGOVtWboIFOEdGghEbm/ENnQyj+HbIk3jhF3QYbXhw";
-    public static final String Intermediate_CRL_1_PL_01_02_crl = 
-        "MIIBSzCBtQIBATANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS" +
-        "5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNV" +
-        "BAMTDENBMS1QTC4wMS4wMhcNOTkwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMTAwWqAjMCEwCg" +
-        "YDVR0UBAMCAQEwEwYDVR0jBAwwCoAIaTuoNtsGBFswDQYJKoZIhvcNAQEFBQADgYEAZEt+" +
-        "FjRuXgnOZg70geqS4hVsF1VWWawlAVGmjPsbRH7rADXPUE2bYL54wLdwt/6QYwHqy2KwCf" +
-        "d4OkWkwn9xwGS4j+XBCw9Y4nbWI+wrsZ9W7vgbeIaVUUUZu6hoin1GxrGDcfbM+bhYzQAA" +
-        "gNmKIWdlJ4tKD2KNgg0KmZPoj/k=";
-    public static final String Intermediate_CRL_2_PL_01_02_crl = 
-        "MIIBSzCBtQIBATANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS" +
-        "5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNV" +
-        "BAMTDENBMi1QTC4wMS4wMhcNOTkwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMTAwWqAjMCEwCg" +
-        "YDVR0UBAMCAQEwEwYDVR0jBAwwCoAI+TQLXQpAtm4wDQYJKoZIhvcNAQEFBQADgYEAXwZO" +
-        "wr9mrO6yUOoopNjcIcDssCUksYco1PFgWx9O/hGq9ktdoGoGcECGhdkHTLe2ab3WFl9jzW" +
-        "1/lkysD9Jl3VjbnbRB3dPQlrSfiv7cYBLnfKvyF/CxQg/wCtWo46GJJQgOx/WHzi9aF08m" +
-        "tQuJEtl7RgoByUSvLtmvKjQWEnc=";
-    public static final String End_Certificate_PL_01_02_crt = 
-        "MIICljCCAf+gAwIBAgICAIswDQYJKoZIhvcNAQEFBQAwXjELMAkGA1UEBhMCVVMxGDAWBg" +
-        "NVBAoTD1UuUy4gR292ZXJubWVudDEMMAoGA1UECxMDRG9kMRAwDgYDVQQLEwdUZXN0aW5n" +
-        "MRUwEwYDVQQDEwxDQTItUEwuMDEuMDIwHhcNOTgwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMT" +
-        "AwWjBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQL" +
-        "EwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNVBAMTDENBMy1QTC4wMS4wMjCBnzANBg" +
-        "kqhkiG9w0BAQEFAAOBjQAwgYkCgYEA0/rXOZwUebRaHcPPFeKTB2OWIzIAgavqb5HerPAe" +
-        "c3sJCdNOSLc0OX0dFblso97WR8uueF9I7QeGg3ayQjzDVqm5Tu77ZaCuyb6UU8+fY2eqwD" +
-        "5lCVuLfJr9U2JD5b2TcdvAD9RqfhefclVjDj9rObLjvzLg3AefO3drsfBtAIMCAwEAAaNj" +
-        "MGEwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAeYwFgYDVR0gBA8wDTALBglghk" +
-        "gBZQMBMAEwEQYDVR0OBAoECDBWCFTOp3evMBMGA1UdIwQMMAqACPk0C10KQLZuMA0GCSqG" +
-        "SIb3DQEBBQUAA4GBAI/JpU3gHo8Izsbjlx6bkQo/e/hD634N5lSMtVHIGnoVLu99dvroRu" +
-        "2DO8Fhnv6VZpMvYoAc5oEgUqx9hw3bfS/XN9GXaeMssjwN/qM6lzCsvMG7DA9sf59xjf4Y" +
-        "2+u4KTye4PdpmWaseDDJ1wAihTHEaofnQdaoUffxQgw5UcAf";
-    public static final String[] TEST_55_DATA = new String[] {
-        Intermediate_Certificate_1_PL_01_02_crt,
-        Intermediate_Certificate_2_PL_01_02_crt,
-        Intermediate_CRL_1_PL_01_02_crl,
-        Intermediate_CRL_2_PL_01_02_crl,
-        End_Certificate_PL_01_02_crt
-    };
-
-    /*  
-     *  test56
-     *  
-     */ 
-
-    public static final String Intermediate_Certificate_PL_01_03_crt = 
-        "MIICmTCCAgKgAwIBAgICAIwwDQYJKoZIhvcNAQEFBQAwXjELMAkGA1UEBhMCVVMxGDAWBg" +
-        "NVBAoTD1UuUy4gR292ZXJubWVudDEMMAoGA1UECxMDRG9EMRAwDgYDVQQLEwdUZXN0aW5n" +
-        "MRUwEwYDVQQDEwxUcnVzdCBBbmNob3IwHhcNOTgwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMT" +
-        "AwWjBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQL" +
-        "EwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNVBAMTDENBMS1QTC4wMS4wMzCBnzANBg" +
-        "kqhkiG9w0BAQEFAAOBjQAwgYkCgYEA60y6V2WkNCB34dcGfu+Jo3YHQZXzgp76+HgnyFmP" +
-        "DLj9DjZHqifD3gW8Zk7L+yK4PfLDSHjbrXM9GY1ser6XwhaJQDPUBBYW5X3XTOmDWmV63J" +
-        "YeRF5r7cfF2h3eEZ460GRLK5tt0Zr8V+hA9oOvwqynrIhDYC/tCzE28ciqA+sCAwEAAaNm" +
-        "MGQwEgYDVR0TAQH/BAgwBgEB/wIBADAOBgNVHQ8BAf8EBAMCAQYwFgYDVR0gBA8wDTALBg" +
-        "lghkgBZQMBMAEwEQYDVR0OBAoECPE2FCetVerZMBMGA1UdIwQMMAqACKua6/nC51SPMA0G" +
-        "CSqGSIb3DQEBBQUAA4GBABUOUWwyfyrRIw7dRIVfLlWyp5R1I+Kmq5e8st0AEMVpPAmLoy" +
-        "0s+46Xf+THXZy5em1P3bSVTSUhTs+XD6tbFFUcTrX0mQJlshR7yD/A0siMDUNzzt9LJQvP" +
-        "dwNjQSA2keOrV9q/2CAGce4daL4Wz54jfh33YVqJ8sHT4E8CxQb7";
-    public static final String Intermediate_CRL_PL_01_03_crl = 
-        "MIIBSzCBtQIBATANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS" +
-        "5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNV" +
-        "BAMTDENBMS1QTC4wMS4wMxcNOTkwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMTAwWqAjMCEwCg" +
-        "YDVR0UBAMCAQEwEwYDVR0jBAwwCoAI8TYUJ61V6tkwDQYJKoZIhvcNAQEFBQADgYEA6FnB" +
-        "LXWt4B/3oP0PXERYh7ZV39yu/tm9DHBQGcGDF8JIspU7F+mH/+37U/lT6BQxpKOpgOgGeP" +
-        "nTQeQzN9sRsXxFO22SkHbdPCao84qvv485epgzqFcVsCRBwBBLcnNLMg891q0EYsTW9vSw" +
-        "Dx7V4CawyYAYGz1MqYuY6SSs6Q0=";
-    public static final String End_Certificate_PL_01_03_crt = 
-        "MIIChzCCAfCgAwIBAgICAI0wDQYJKoZIhvcNAQEFBQAwXjELMAkGA1UEBhMCVVMxGDAWBg" +
-        "NVBAoTD1UuUy4gR292ZXJubWVudDEMMAoGA1UECxMDRG9kMRAwDgYDVQQLEwdUZXN0aW5n" +
-        "MRUwEwYDVQQDEwxDQTEtUEwuMDEuMDMwHhcNOTgwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMT" +
-        "AwWjBgMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQL" +
-        "EwNEb0QxEDAOBgNVBAsTB1Rlc3RpbmcxFzAVBgNVBAMTDlVzZXIxLVBMLjAxLjAzMIGfMA" +
-        "0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCwt6B9gpDz/x/vnowXf1MdkAPeaCWZ3pYikgxE" +
-        "ZLrMuulFaI1UDnAzgSuSvoHE80VKGKjSkrzIX9OFfeilW5rNZAXoZrjtkaJd1Q8l5AtjFn" +
-        "0tlLytDzIMYo5Tiq/n3IiTdbEzGYzEOCcSyVaQdB7K1WgYI/z/UAaWV/GbqCX1zQIDAQAB" +
-        "o1IwUDAOBgNVHQ8BAf8EBAMCBeAwFgYDVR0gBA8wDTALBglghkgBZQMBMAEwEQYDVR0OBA" +
-        "oECMQHLiufEm0IMBMGA1UdIwQMMAqACPE2FCetVerZMA0GCSqGSIb3DQEBBQUAA4GBAD5/" +
-        "vGn/rpoHvny/mfh6n2zVNNQLTEBiddfAdCWpeBFcwxS5lpxfm4dAWgHhprZTMirF9yS+wO" +
-        "wWQ4G9/wiqfAtoaNN1qkHMlUMOAPsOSff6ClgP+1uzKVqQa9NTd5HAeMdYfYjMa/fcF/37" +
-        "plCs5ZsJjb9lhEjNd/tq4/aALQmt";
-    public static final String[] TEST_56_DATA = new String[] {
-        Intermediate_Certificate_PL_01_03_crt,
-        Intermediate_CRL_PL_01_03_crl,
-        End_Certificate_PL_01_03_crt
-    };
-
-    /*  
-     *  test57
-     *  
-     */ 
-
-    public static final String Intermediate_Certificate_PL_01_04_crt = 
-        "MIICmTCCAgKgAwIBAgICAI4wDQYJKoZIhvcNAQEFBQAwXjELMAkGA1UEBhMCVVMxGDAWBg" +
-        "NVBAoTD1UuUy4gR292ZXJubWVudDEMMAoGA1UECxMDRG9EMRAwDgYDVQQLEwdUZXN0aW5n" +
-        "MRUwEwYDVQQDEwxUcnVzdCBBbmNob3IwHhcNOTgwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMT" +
-        "AwWjBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQL" +
-        "EwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNVBAMTDENBMS1QTC4wMS4wNDCBnzANBg" +
-        "kqhkiG9w0BAQEFAAOBjQAwgYkCgYEA06yd2NQEAgpv0kQQEOzhHHU4YqHgtvJgkdLYxb2W" +
-        "Zordrm4b/43UDnLmsI0790V76y9Aa+Y8SIMBBRBJgnlppFJrFsPaOMO98M3/mXkQotVbY1" +
-        "59P/AjWMxpzP9h8Bs8KuoPqnl5jN0UZAF4kRoNXHzyS445VBp4DtWz/jcCPm8CAwEAAaNm" +
-        "MGQwEgYDVR0TAQH/BAgwBgEB/wIBADAOBgNVHQ8BAf8EBAMCAQYwFgYDVR0gBA8wDTALBg" +
-        "lghkgBZQMBMAEwEQYDVR0OBAoECHxLORDZ1KKNMBMGA1UdIwQMMAqACKua6/nC51SPMA0G" +
-        "CSqGSIb3DQEBBQUAA4GBACHmDOaoC0Hr2cmfuQvdyGDF7/RlvTUJ7cvGypCa724SwAZGZk" +
-        "Tf5GwxgjVcLHY5RlX2kDm9vjneDzP88U3587qA2ZRwxhheK0RGp1kudNQ5y2gAGKZ7YSc0" +
-        "SENMDxUAa6HUkn9Rfo4rf5ULuGNJZXQZ3DtP+lZSwzkUeCVjKhyQ";
-    public static final String Intermediate_CRL_PL_01_04_crl = 
-        "MIIBSzCBtQIBATANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS" +
-        "5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNV" +
-        "BAMTDENBMS1QTC4wMS4wNBcNOTkwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMTAwWqAjMCEwCg" +
-        "YDVR0UBAMCAQEwEwYDVR0jBAwwCoAIfEs5ENnUoo0wDQYJKoZIhvcNAQEFBQADgYEAb8lX" +
-        "19SlVNRkc9SKNpRLZQom67djZfMSIPIDkBALfMepdevbquzgO7AufTuiDn5Zqe6J6odTv6" +
-        "RrQReo64XB4+Lx2pXOe8bZEbzZk0HvzLl9DjN7zxyNglNK+Hd2xS4yT4ps4fBdvXvWAXEx" +
-        "6DfvWHbGFDoH2auomCKJtCVXxCI=";
-    public static final String End_Certificate_PL_01_04_crt = 
-        "MIICljCCAf+gAwIBAgICAI8wDQYJKoZIhvcNAQEFBQAwXjELMAkGA1UEBhMCVVMxGDAWBg" +
-        "NVBAoTD1UuUy4gR292ZXJubWVudDEMMAoGA1UECxMDRG9kMRAwDgYDVQQLEwdUZXN0aW5n" +
-        "MRUwEwYDVQQDEwxDQTEtUEwuMDEuMDQwHhcNOTgwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMT" +
-        "AwWjBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQL" +
-        "EwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNVBAMTDENBMi1QTC4wMS4wNDCBnzANBg" +
-        "kqhkiG9w0BAQEFAAOBjQAwgYkCgYEA14bXc39XiWvb4r1jzbADzrpfbg2Y9sGBkefSQHsM" +
-        "QZ1SRLR7uexWD7MuDYh4ZYBL+WPhaJJr3a1jnAIp54h68m8mwS13DgrxBF2/hrVKEm9IRG" +
-        "s13hoM4Mjjogn/Lvc1xLvB5lctHjZrNRZjyrt+PqDDmqZqgCOmcD61PhrfAoECAwEAAaNj" +
-        "MGEwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAeYwFgYDVR0gBA8wDTALBglghk" +
-        "gBZQMBMAEwEQYDVR0OBAoECB9hXgJfzBvTMBMGA1UdIwQMMAqACHxLORDZ1KKNMA0GCSqG" +
-        "SIb3DQEBBQUAA4GBAB0HgiURRd/REVfc5DenIPhMu8riVcwVgTUwatsCWragUhXpCtvJmf" +
-        "z4vGo1rKYai2dltVX6am+NDvN5tROcM0bvC8lOCc/iPfI5eWTy9SJ2nxvs1+q809Rj0rno" +
-        "zS77TIE8rD7Q8ZUd3qNUiBwdjBoc9misgyN7zUulg4Ueebvv";
-    public static final String[] TEST_57_DATA = new String[] {
-        Intermediate_Certificate_PL_01_04_crt,
-        Intermediate_CRL_PL_01_04_crl,
-        End_Certificate_PL_01_04_crt
-    };
-
-    /*  
-     *  test58
-     *  
-     */ 
-
-    public static final String Intermediate_Certificate_1_PL_01_05_crt = 
-        "MIICmTCCAgKgAwIBAgICAJAwDQYJKoZIhvcNAQEFBQAwXjELMAkGA1UEBhMCVVMxGDAWBg" +
-        "NVBAoTD1UuUy4gR292ZXJubWVudDEMMAoGA1UECxMDRG9EMRAwDgYDVQQLEwdUZXN0aW5n" +
-        "MRUwEwYDVQQDEwxUcnVzdCBBbmNob3IwHhcNOTgwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMT" +
-        "AwWjBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQL" +
-        "EwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNVBAMTDENBMS1QTC4wMS4wNTCBnzANBg" +
-        "kqhkiG9w0BAQEFAAOBjQAwgYkCgYEA/rVBEGZ4jibDhREeRGV3jPnv05esRL8/En1Bu35y" +
-        "QrAHi32+kBu42vwwDbeuiTZd/B90bn5srJZoW83rxXxNnpxqbnjN3GgIcRiUVyaVRTp9/U" +
-        "IT8B9h09b9yT8gpQ5qR0+JDcOHCfJwpogAsyJJa6AM5p/q3TeF39ugfVOWt/cCAwEAAaNm" +
-        "MGQwEgYDVR0TAQH/BAgwBgEB/wIBBjAOBgNVHQ8BAf8EBAMCAQYwFgYDVR0gBA8wDTALBg" +
-        "lghkgBZQMBMAEwEQYDVR0OBAoECJ7/mkuLuEIGMBMGA1UdIwQMMAqACKua6/nC51SPMA0G" +
-        "CSqGSIb3DQEBBQUAA4GBADC0A2KMMSSmGI9p85WG7XZVMBX/xdDYOHO0e3ORTRFS3kj9rK" +
-        "a0yUjc1X+p22AA8kUyOLpYIulfDjPrLKN2E/hWSf3+XWMiC7JfX01F+BBl/avEZoymaZB4" +
-        "dkH1Hym4IMJoSaEOgf5HFKBnFEA6aUcr+oDYGUP+Sc1dmJMjBW72";
-    public static final String Intermediate_Certificate_2_PL_01_05_crt = 
-        "MIICmTCCAgKgAwIBAgICAJEwDQYJKoZIhvcNAQEFBQAwXjELMAkGA1UEBhMCVVMxGDAWBg" +
-        "NVBAoTD1UuUy4gR292ZXJubWVudDEMMAoGA1UECxMDRG9kMRAwDgYDVQQLEwdUZXN0aW5n" +
-        "MRUwEwYDVQQDEwxDQTEtUEwuMDEuMDUwHhcNOTgwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMT" +
-        "AwWjBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQL" +
-        "EwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNVBAMTDENBMi1QTC4wMS4wNTCBnzANBg" +
-        "kqhkiG9w0BAQEFAAOBjQAwgYkCgYEArir4GaS6r0Tv9PMbaOXYdPKADNpVbJe79G5t/F6x" +
-        "7Tz1rwUR+m10E+Jq9RsV+fU/nUzzjJXHbPLZnfodUVVmrXgzvQ8+B2N4jJtdNLG66j2PZG" +
-        "+P8GQzVK9drDh54VHXdvxAYCXs7GaIprWmCQsxZOKjhFU3YDiRRK8qJGpBG/cCAwEAAaNm" +
-        "MGQwEgYDVR0TAQH/BAgwBgEB/wIBADAOBgNVHQ8BAf8EBAMCAQYwFgYDVR0gBA8wDTALBg" +
-        "lghkgBZQMBMAEwEQYDVR0OBAoECMmrFr30fUzZMBMGA1UdIwQMMAqACJ7/mkuLuEIGMA0G" +
-        "CSqGSIb3DQEBBQUAA4GBAI4qJF6STCi+elUbpZIP7YmcaQsS0PE4G3+LJoMg1LT3rSeobK" +
-        "Aj/yUetmA7y0B5i0svKjRChLOpfClNPVPCx/+mc75+LG+dh1eVG/qk2UH/lrqLN0XLl8tA" +
-        "IwZeoPaegBQAIp9oEjhDN1fWtKIkOe6A6wYdH2VPvsqC8g02VcwD";
-    public static final String Intermediate_Certificate_3_PL_01_05_crt = 
-        "MIICmTCCAgKgAwIBAgICAJIwDQYJKoZIhvcNAQEFBQAwXjELMAkGA1UEBhMCVVMxGDAWBg" +
-        "NVBAoTD1UuUy4gR292ZXJubWVudDEMMAoGA1UECxMDRG9kMRAwDgYDVQQLEwdUZXN0aW5n" +
-        "MRUwEwYDVQQDEwxDQTItUEwuMDEuMDUwHhcNOTgwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMT" +
-        "AwWjBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQL" +
-        "EwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNVBAMTDENBMy1QTC4wMS4wNTCBnzANBg" +
-        "kqhkiG9w0BAQEFAAOBjQAwgYkCgYEAtRC2/PDG3kx8LpzfWC0yJph5h3LXZJZW0W2voss1" +
-        "HYPP1/MBoQY067dfbALilVRh9asCNL4F45uu0lT24qS9vjW8SzBOLA18GsVYRmWO7EP+Cd" +
-        "9f3mgPIMJ5n+UjW+yhBwh0Z2pzVElkX9CxECrs1Mt2ulyuwWA1lR8nRMaTUeMCAwEAAaNm" +
-        "MGQwEgYDVR0TAQH/BAgwBgEB/wIBADAOBgNVHQ8BAf8EBAMCAQYwFgYDVR0gBA8wDTALBg" +
-        "lghkgBZQMBMAEwEQYDVR0OBAoECAlV3mzXYPyuMBMGA1UdIwQMMAqACMmrFr30fUzZMA0G" +
-        "CSqGSIb3DQEBBQUAA4GBAG28iHdlA+nTs/b9pi+m9eMy7niELjIWL9fMgn1r4iXQ0TsPYi" +
-        "tgpoip+BB4G/jz7MPx/N4nwyAPV+C9wN8cAHALf/ka2MxAORYFVFI+5PDgXzm78ILqj91f" +
-        "vOFN4jemizTES4/dHxfmdctnsTRpU9ALQgfJLhxEQISOPwuemKB0";
-    public static final String Intermediate_CRL_1_PL_01_05_crl = 
-        "MIIBSzCBtQIBATANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS" +
-        "5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNV" +
-        "BAMTDENBMS1QTC4wMS4wNRcNOTkwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMTAwWqAjMCEwCg" +
-        "YDVR0UBAMCAQEwEwYDVR0jBAwwCoAInv+aS4u4QgYwDQYJKoZIhvcNAQEFBQADgYEA5i45" +
-        "gETFAw6l9Awex9IAVIqYTA1dnbDyrUYDRdzd0x6OxSPODvNfQCwqwlTJXrHidCPO8jRhMS" +
-        "Zcdn/MTlIeHa6OERFcjOiwOpeTgtchvpTdDchs5ve8Ik+myue+cfgpEVKOE+ZQ2T2tcyz/" +
-        "+DbeMptECfJ0lVfCKIY7ZOzBPaQ=";
-    public static final String Intermediate_CRL_2_PL_01_05_crl = 
-        "MIIBSzCBtQIBATANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS" +
-        "5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNV" +
-        "BAMTDENBMi1QTC4wMS4wNRcNOTkwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMTAwWqAjMCEwCg" +
-        "YDVR0UBAMCAQEwEwYDVR0jBAwwCoAIyasWvfR9TNkwDQYJKoZIhvcNAQEFBQADgYEAdsNe" +
-        "ugM8sd8bmIDkYXce2WmS5Zx6QUQ0yT6Ij4OR5/F4CG4Vl+k3JkNPuAiNSs2Z9HeML+F/W8" +
-        "3yEPe/mdLV4nLw4B/b1/8DmgZN4r1ojaWuHAg+KrA3Zz3Rc/hwQfvBy49mf4NGtY4ArbeB" +
-        "DYKz5sVlrwR+gOCR5jm4IC7WEDs=";
-    public static final String Intermediate_CRL_3_PL_01_05_crl = 
-        "MIIBSzCBtQIBATANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS" +
-        "5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNV" +
-        "BAMTDENBMy1QTC4wMS4wNRcNOTkwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMTAwWqAjMCEwCg" +
-        "YDVR0UBAMCAQEwEwYDVR0jBAwwCoAICVXebNdg/K4wDQYJKoZIhvcNAQEFBQADgYEAqYex" +
-        "FaIykZo17O2URpofe8x04L/VsfA9jV28zUgNFruAGld/kUh4rYvgwrdbNZ8NmEFDp9J9aL" +
-        "93af3bzoNvWCik2VrQLd5nccCFiC04B+LUH9Y2p+7vV2ojrtBks5SMW0q4HaNyPSQu8Fst" +
-        "4mYVf+QIYZC3iVAF4rsKnaxwzIU=";
-    public static final String End_Certificate_PL_01_05_crt = 
-        "MIIChzCCAfCgAwIBAgICAJMwDQYJKoZIhvcNAQEFBQAwXjELMAkGA1UEBhMCVVMxGDAWBg" +
-        "NVBAoTD1UuUy4gR292ZXJubWVudDEMMAoGA1UECxMDRG9kMRAwDgYDVQQLEwdUZXN0aW5n" +
-        "MRUwEwYDVQQDEwxDQTMtUEwuMDEuMDUwHhcNOTgwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMT" +
-        "AwWjBgMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQL" +
-        "EwNEb0QxEDAOBgNVBAsTB1Rlc3RpbmcxFzAVBgNVBAMTDlVzZXIxLVBMLjAxLjA1MIGfMA" +
-        "0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDCXJjzKGcLyONTyOa6sQHvIKZIAh0pWdteUiXf" +
-        "b7yjCn6Z52SCHxB9GZERHwR7fbJpoE3oDcYUY+8pH65bIVm1p3zr5deo4v85DEZQ50cU9a" +
-        "WEUAO/5X57P7pYb9/47abu0cdsLIWeE+O94HpZS8vz8mxRQKLj27gPY1KzzTbrZQIDAQAB" +
-        "o1IwUDAOBgNVHQ8BAf8EBAMCBeAwFgYDVR0gBA8wDTALBglghkgBZQMBMAEwEQYDVR0OBA" +
-        "oECG8ILlM9oqZwMBMGA1UdIwQMMAqACAlV3mzXYPyuMA0GCSqGSIb3DQEBBQUAA4GBAF6S" +
-        "x3aunfgnDmo42aPOzDh536WSkTTbX9bmUNyg3IQHl/3xhVqjS76bMqreYhx5nh4VNx/Z3N" +
-        "LD0W75XmASCk0wtW9S1MoxzJMFIozRruaE3oykrbyMMOt0Br5CV12ofUd0WybDkXfNAIze" +
-        "IRgps3nORHWjV1GwXe8uNoUn6/z7";
-    public static final String[] TEST_58_DATA = new String[] {
-        Intermediate_Certificate_1_PL_01_05_crt,
-        Intermediate_Certificate_2_PL_01_05_crt,
-        Intermediate_Certificate_3_PL_01_05_crt,
-        Intermediate_CRL_1_PL_01_05_crl,
-        Intermediate_CRL_2_PL_01_05_crl,
-        Intermediate_CRL_3_PL_01_05_crl,
-        End_Certificate_PL_01_05_crt
-    };
-
-    /*  
-     *  test59
-     *  
-     */ 
-
-    public static final String Intermediate_Certificate_1_PL_01_06_crt = 
-        "MIICmTCCAgKgAwIBAgICAJQwDQYJKoZIhvcNAQEFBQAwXjELMAkGA1UEBhMCVVMxGDAWBg" +
-        "NVBAoTD1UuUy4gR292ZXJubWVudDEMMAoGA1UECxMDRG9EMRAwDgYDVQQLEwdUZXN0aW5n" +
-        "MRUwEwYDVQQDEwxUcnVzdCBBbmNob3IwHhcNOTgwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMT" +
-        "AwWjBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQL" +
-        "EwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNVBAMTDENBMS1QTC4wMS4wNjCBnzANBg" +
-        "kqhkiG9w0BAQEFAAOBjQAwgYkCgYEAweCAiEGMLycmodjrUMIWEEFshkvhX2r90wGl+/pU" +
-        "Ia9NSdT23zYzE4Uo8Is1ywyV+YfvgR22j/RXF6j8OK+XZ8jlgfjVTAhjCnTWY9LDR7qAyk" +
-        "8zuuITxJrYpiPoxqZs9BXLfGkDbye5VpVJXvQdbJNxgKO0hkBBDfe+T9+qw6ECAwEAAaNm" +
-        "MGQwEgYDVR0TAQH/BAgwBgEB/wIBBjAOBgNVHQ8BAf8EBAMCAQYwFgYDVR0gBA8wDTALBg" +
-        "lghkgBZQMBMAEwEQYDVR0OBAoECG1DiuoAwV6aMBMGA1UdIwQMMAqACKua6/nC51SPMA0G" +
-        "CSqGSIb3DQEBBQUAA4GBAMFvtFiMDMP6n3CrqQLSzhpK5Qu0uxa56ARXIKSIqi0OUZAu9v" +
-        "sCXxMvaG/R5bElwi7ybYZ5KUSN+PnDmlUxWWL5Ib5RZdXgj7L83oyLTQmbDMvka6rSWHgw" +
-        "Jq8qHVslhh+l+YNOb4fzs8x9ctCrs/BgjX8wkORpQbigU0BUJ9sX";
-    public static final String Intermediate_Certificate_2_PL_01_06_crt = 
-        "MIICmTCCAgKgAwIBAgICAJUwDQYJKoZIhvcNAQEFBQAwXjELMAkGA1UEBhMCVVMxGDAWBg" +
-        "NVBAoTD1UuUy4gR292ZXJubWVudDEMMAoGA1UECxMDRG9kMRAwDgYDVQQLEwdUZXN0aW5n" +
-        "MRUwEwYDVQQDEwxDQTEtUEwuMDEuMDYwHhcNOTgwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMT" +
-        "AwWjBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQL" +
-        "EwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNVBAMTDENBMi1QTC4wMS4wNjCBnzANBg" +
-        "kqhkiG9w0BAQEFAAOBjQAwgYkCgYEAwf6Nf0+r7JvE6BO4MbDbS1T1SCzn78haBAmqGZLS" +
-        "Ac4xQTydvmzr9PwiWlU0xjFfKItqRMt7rfzTTPfvvnwxsAfQNPtxKzi30yCNq/VotMA7j5" +
-        "iQYaVe2OWVHu13agbXLEZ0pL/ZkmQ3Gvo6UhF4dRmCnjFbd5cMTxQVHUrwgyECAwEAAaNm" +
-        "MGQwEgYDVR0TAQH/BAgwBgEB/wIBADAOBgNVHQ8BAf8EBAMCAQYwFgYDVR0gBA8wDTALBg" +
-        "lghkgBZQMBMAEwEQYDVR0OBAoECE3tS4AYmwZDMBMGA1UdIwQMMAqACG1DiuoAwV6aMA0G" +
-        "CSqGSIb3DQEBBQUAA4GBADcBTKbhx8PCunjRVJkcLBCcVGHs9HfkChDafwBO51fe5uhHE2" +
-        "QBpW3J8ZsevuFQiEZvuy2RVFktE6ZoKD8wxwBFhs+OIxe2mergQPy6jHuxoSUiPzr3CVXZ" +
-        "UsNxe7j3IcJLqbJ15UqGFH5yph7Sa4Ym6x747miF6W9knNkjcx3K";
-    public static final String Intermediate_Certificate_3_PL_01_06_crt = 
-        "MIICmTCCAgKgAwIBAgICAJYwDQYJKoZIhvcNAQEFBQAwXjELMAkGA1UEBhMCVVMxGDAWBg" +
-        "NVBAoTD1UuUy4gR292ZXJubWVudDEMMAoGA1UECxMDRG9kMRAwDgYDVQQLEwdUZXN0aW5n" +
-        "MRUwEwYDVQQDEwxDQTItUEwuMDEuMDYwHhcNOTgwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMT" +
-        "AwWjBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQL" +
-        "EwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNVBAMTDENBMy1QTC4wMS4wNjCBnzANBg" +
-        "kqhkiG9w0BAQEFAAOBjQAwgYkCgYEAwq2YlDLHX4KktKnzLCYjnk079IDgXENrkRBuZHTB" +
-        "IQyZoiBH4ZWHreZKs3LvznP8uSd8eEL8keNw4PwZ6aT1LF/Jr/UlrFQNnpLzQVXwGGAuzh" +
-        "tFJYRlOfI5cCZYAcpjnyUV4GW+MuwBdoqDycMjmqIv/8A8vupjahffcmBAassCAwEAAaNm" +
-        "MGQwEgYDVR0TAQH/BAgwBgEB/wIBADAOBgNVHQ8BAf8EBAMCAQYwFgYDVR0gBA8wDTALBg" +
-        "lghkgBZQMBMAEwEQYDVR0OBAoECB+qYFJjEkJ5MBMGA1UdIwQMMAqACE3tS4AYmwZDMA0G" +
-        "CSqGSIb3DQEBBQUAA4GBADiXredACtRQTV2TKgu5SDdPlczj7cZZUARJiJKiRfjmxHCc1q" +
-        "m/Oh7sHkqRvlHqjoX8qp4iSchoZWdOAE5O/q4Ef6rViejDFVyN2ZmlhP6KIiRxznrvYfF1" +
-        "n08K7CHgHWvDaumm4pNmWeF03nuasHrY0W9h1uk5poVuzaWDpx3A";
-    public static final String Intermediate_CRL_1_PL_01_06_crl = 
-        "MIIBSzCBtQIBATANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS" +
-        "5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNV" +
-        "BAMTDENBMS1QTC4wMS4wNhcNOTkwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMTAwWqAjMCEwCg" +
-        "YDVR0UBAMCAQEwEwYDVR0jBAwwCoAIbUOK6gDBXpowDQYJKoZIhvcNAQEFBQADgYEAiHM1" +
-        "xFuYt6tDscqzwj0mLHPHULnR44/vNyPUg0KnV03Dd4XbFHz0FtwDKgVTBZ8x7ybp83ubJH" +
-        "tE/p8nPW5kN25WQOlYkZoAcMpEXjTzlo9evU0W3nyzJjmlT8YEI7vnmWFz/ahzy6WFwPue" +
-        "h862EKh2zVO4hoqZYEuDQI33fOc=";
-    public static final String Intermediate_CRL_2_PL_01_06_crl = 
-        "MIIBSzCBtQIBATANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS" +
-        "5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNV" +
-        "BAMTDENBMi1QTC4wMS4wNhcNOTkwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMTAwWqAjMCEwCg" +
-        "YDVR0UBAMCAQEwEwYDVR0jBAwwCoAITe1LgBibBkMwDQYJKoZIhvcNAQEFBQADgYEAuDSF" +
-        "W1KOc4x41HGvdRaw/NtipD2y6zSh3mtRoo7Q6J2BvJvunymZNEziozBOiUgT8zMgbdbm4a" +
-        "PEwlHRaoJP8+yxJIlKaHa9Hc7Yz4SOwSrLicf7EnBSct3Mze0b48UYqbn1q+lf/zKaUGrP" +
-        "M6oqtE8Fam06T+WUfutU53zTtSs=";
-    public static final String Intermediate_CRL_3_PL_01_06_crl = 
-        "MIIBSzCBtQIBATANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS" +
-        "5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNV" +
-        "BAMTDENBMy1QTC4wMS4wNhcNOTkwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMTAwWqAjMCEwCg" +
-        "YDVR0UBAMCAQEwEwYDVR0jBAwwCoAIH6pgUmMSQnkwDQYJKoZIhvcNAQEFBQADgYEAcPfO" +
-        "+Rj2KmO1CxjuKLEiOUAIq5YmR4U06IcCBGMxlrdHVXHM3vepBKUlMDaT4UGcleABMPX9Iz" +
-        "/31ofyXlZ/fQJOoTZt0CI7SOPQE5ZkUsR3BDuUqf1+sWwBYyBHkrC95JhJkM4LfGS5K19p" +
-        "fp0j0bguzNCXSBRTfjSZhy80tcs=";
-    public static final String End_Certificate_PL_01_06_crt = 
-        "MIICljCCAf+gAwIBAgICAJcwDQYJKoZIhvcNAQEFBQAwXjELMAkGA1UEBhMCVVMxGDAWBg" +
-        "NVBAoTD1UuUy4gR292ZXJubWVudDEMMAoGA1UECxMDRG9kMRAwDgYDVQQLEwdUZXN0aW5n" +
-        "MRUwEwYDVQQDEwxDQTMtUEwuMDEuMDYwHhcNOTgwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMT" +
-        "AwWjBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQL" +
-        "EwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNVBAMTDENBNC1QTC4wMS4wNjCBnzANBg" +
-        "kqhkiG9w0BAQEFAAOBjQAwgYkCgYEA3asAqJcjXngEuyM/W3+TAE+Qr4JtNUdwBtmrpGlo" +
-        "fAvJdmXHARyiN/Zn6Si8bGI8Wz8J4Y+Ll7zLdaMU4MCZo6hwZiaQwkh9a+ZecCpLpjs4mz" +
-        "MSf5zHSwTYiXKMazlmnGEITVyKLmAiLSyGeeJvOJVqVo/NZXRGVlmnPxZFfgsCAwEAAaNj" +
-        "MGEwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAeYwFgYDVR0gBA8wDTALBglghk" +
-        "gBZQMBMAEwEQYDVR0OBAoECLZuS770NcDsMBMGA1UdIwQMMAqACB+qYFJjEkJ5MA0GCSqG" +
-        "SIb3DQEBBQUAA4GBAGM18aR2i8vSywsWhcLrRN1Xckl/HiBPNphobfKoER4NG29cFjUPQX" +
-        "zukjQcJl2clAXNCVtcsKCoYRP3YUyAB6At+yskuuJXtES7FIzM3rt/UpDS5ktVC3gh+jgE" +
-        "pPhMILYIXFzYY1hifkpagfO+mkcr7RqHU3tHAr6LCWjqrB9g";
-    public static final String[] TEST_59_DATA = new String[] {
-        Intermediate_Certificate_1_PL_01_06_crt,
-        Intermediate_Certificate_2_PL_01_06_crt,
-        Intermediate_Certificate_3_PL_01_06_crt,
-        Intermediate_CRL_1_PL_01_06_crl,
-        Intermediate_CRL_2_PL_01_06_crl,
-        Intermediate_CRL_3_PL_01_06_crl,
-        End_Certificate_PL_01_06_crt
-    };
-
-    /*  
-     *  test60
-     *  
-     */ 
-
-    public static final String Intermediate_Certificate_1_PL_01_07_crt = 
-        "MIICmTCCAgKgAwIBAgICAJgwDQYJKoZIhvcNAQEFBQAwXjELMAkGA1UEBhMCVVMxGDAWBg" +
-        "NVBAoTD1UuUy4gR292ZXJubWVudDEMMAoGA1UECxMDRG9EMRAwDgYDVQQLEwdUZXN0aW5n" +
-        "MRUwEwYDVQQDEwxUcnVzdCBBbmNob3IwHhcNOTgwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMT" +
-        "AwWjBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQL" +
-        "EwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNVBAMTDENBMS1QTC4wMS4wNzCBnzANBg" +
-        "kqhkiG9w0BAQEFAAOBjQAwgYkCgYEA5HkS45NLuqq9ZwF79+pTGtQnGWO7DFdetYeQTbeD" +
-        "sisjZMsK0sCCR5xAKYQsJSS4v/8LQUdxlQR30LMV0SQUKFMJyFsMiSsO8subb6sVINWn8A" +
-        "tL4zcQK0WiASUZOEkybAFJtP31PahzI5wfD1cikE1M4BlDij5WeaIjt/RTHKUCAwEAAaNm" +
-        "MGQwEgYDVR0TAQH/BAgwBgEB/wIBBjAOBgNVHQ8BAf8EBAMCAQYwFgYDVR0gBA8wDTALBg" +
-        "lghkgBZQMBMAEwEQYDVR0OBAoECLSUEn5d8YywMBMGA1UdIwQMMAqACKua6/nC51SPMA0G" +
-        "CSqGSIb3DQEBBQUAA4GBANLO+kEiswkGzEh4ZcF5LtfnPZlnG4gTPSNugeWJc+Xedqmttp" +
-        "jZ35fr1hiRe2Q1UcyTd4ThkPknawwZednbsZVPqw8u1mo7kuAeL9KrCk199vL4bV8Ag/kj" +
-        "HJ8TAy40UDB6hMm7l4j8mEKwV03THVrz1Vvz59CQXj+iseH6yUNO";
-    public static final String Intermediate_Certificate_2_PL_01_07_crt = 
-        "MIICmTCCAgKgAwIBAgICAJkwDQYJKoZIhvcNAQEFBQAwXjELMAkGA1UEBhMCVVMxGDAWBg" +
-        "NVBAoTD1UuUy4gR292ZXJubWVudDEMMAoGA1UECxMDRG9kMRAwDgYDVQQLEwdUZXN0aW5n" +
-        "MRUwEwYDVQQDEwxDQTEtUEwuMDEuMDcwHhcNOTgwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMT" +
-        "AwWjBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQL" +
-        "EwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNVBAMTDENBMi1QTC4wMS4wNzCBnzANBg" +
-        "kqhkiG9w0BAQEFAAOBjQAwgYkCgYEAu78gmT5HwmBHEe+K8fLLgGaPpcv13ZjrgL4twTBS" +
-        "OkZn5LL9GcfkPuA5WIAZkVYfCWSDPqcAGoOWUIDADfBfdcyLteUH+xI01rHKiLDVexMvU9" +
-        "vqCmcBKhxK3S6wraW5YhOO0bx4oPrZXVIjyG8fh4e5WTEykzvUWJ8ZbzSJ9JsCAwEAAaNm" +
-        "MGQwEgYDVR0TAQH/BAgwBgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwFgYDVR0gBA8wDTALBg" +
-        "lghkgBZQMBMAEwEQYDVR0OBAoECCT+fDEaN7GaMBMGA1UdIwQMMAqACLSUEn5d8YywMA0G" +
-        "CSqGSIb3DQEBBQUAA4GBANpKr98PiXAdcXlbgSgif0213H+tg3WwUNKZTw8MpqPyrN2/DZ" +
-        "HBi6e2KWXLTxttV9AZBRvcKwsveS6oc31eulMe8nHxRNRfadvF6dL3Tsig6HAQkartcJMI" +
-        "yfW4V3EhXbCdziQkre7XcR9WK5bpQoX04HWeew6YTxjG/cL9MIJR";
-    public static final String Intermediate_Certificate_3_PL_01_07_crt = 
-        "MIICmTCCAgKgAwIBAgICAJowDQYJKoZIhvcNAQEFBQAwXjELMAkGA1UEBhMCVVMxGDAWBg" +
-        "NVBAoTD1UuUy4gR292ZXJubWVudDEMMAoGA1UECxMDRG9kMRAwDgYDVQQLEwdUZXN0aW5n" +
-        "MRUwEwYDVQQDEwxDQTItUEwuMDEuMDcwHhcNOTgwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMT" +
-        "AwWjBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQL" +
-        "EwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNVBAMTDENBMy1QTC4wMS4wNzCBnzANBg" +
-        "kqhkiG9w0BAQEFAAOBjQAwgYkCgYEAr7YezMXvnkSuNCdXch2HRAEVuCqfzpVRCj6laJI9" +
-        "Q+NxgXwzaOwnImvwER3Hblh1l0MAt5/I/9hhqCN+918ueME50MkoM1wPbcmrRIlwWLGSVZ" +
-        "yBKeyPHrLbdPqVIexUlQk7PasLm/Qx4SvRGVe9IMLrEzPV3MFJtrJoWaMobQkCAwEAAaNm" +
-        "MGQwEgYDVR0TAQH/BAgwBgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwFgYDVR0gBA8wDTALBg" +
-        "lghkgBZQMBMAEwEQYDVR0OBAoECKw8JlHMvVfuMBMGA1UdIwQMMAqACCT+fDEaN7GaMA0G" +
-        "CSqGSIb3DQEBBQUAA4GBAA5JEDEDyqfZzTGzOoMV+8RVke+a4qgOo7rnOEdletgGFEwz8A" +
-        "tiMHBxR+UMxuHS82Hz3+F8XlyYIwlrG9wWVcB/tOyzgVyA28Yux9Q/meU7T6dco/AnmOdr" +
-        "2XL6Xm5iLnARG+PkUPHOsxuweyB/sSUSA8ZJPowNRWTik57ul/bO";
-    public static final String Intermediate_Certificate_4_PL_01_07_crt = 
-        "MIICljCCAf+gAwIBAgICAJswDQYJKoZIhvcNAQEFBQAwXjELMAkGA1UEBhMCVVMxGDAWBg" +
-        "NVBAoTD1UuUy4gR292ZXJubWVudDEMMAoGA1UECxMDRG9kMRAwDgYDVQQLEwdUZXN0aW5n" +
-        "MRUwEwYDVQQDEwxDQTMtUEwuMDEuMDcwHhcNOTgwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMT" +
-        "AwWjBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQL" +
-        "EwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNVBAMTDENBNC1QTC4wMS4wNzCBnzANBg" +
-        "kqhkiG9w0BAQEFAAOBjQAwgYkCgYEA7mNS8dGz0gkXDbBRzP2ypdNMahJbM3cSMHO0hYpn" +
-        "uRsiXGUhIB0K4WVbnz6tr7Hch3yltK4H1Y12Lf8cXEETR2sE9lCY2A3r8/VM5OUbou5Y8k" +
-        "wIf03VhP7cGKonaFtlj/WD77fidDePVp1Nk28gV0T2F/l4pM5TEJrq5C9PSUcCAwEAAaNj" +
-        "MGEwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwFgYDVR0gBA8wDTALBglghk" +
-        "gBZQMBMAEwEQYDVR0OBAoECJBEcZsMRq6CMBMGA1UdIwQMMAqACKw8JlHMvVfuMA0GCSqG" +
-        "SIb3DQEBBQUAA4GBACfbHKpuRJnZ5UU0sih8RuywhUo6Getwl/p6fsi87wYI61pvYru+hm" +
-        "4R4eAMZvg7MrAarS3Iu3zKBU1HKeq1i+hpwTIXrngR8eL2fU/X6GPzdte3+3tjhah38bqF" +
-        "zDon+N6ap4MKWRk033SsFYo1K88Mena2tGuFForJlV9DOF1l";
-    public static final String Intermediate_CRL_1_PL_01_07_crl = 
-        "MIIBSzCBtQIBATANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS" +
-        "5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNV" +
-        "BAMTDENBMS1QTC4wMS4wNxcNOTkwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMTAwWqAjMCEwCg" +
-        "YDVR0UBAMCAQEwEwYDVR0jBAwwCoAItJQSfl3xjLAwDQYJKoZIhvcNAQEFBQADgYEAJtaE" +
-        "I1+PCNL1/bgEVKWUIwvh58ugnWhxzbFW6hNJwNEz9/yt+FLZfNrT/Ezort4VVQFLQg7+Gj" +
-        "KrkIujqfRJG4LXrXAV8ZsvSPuwyQ+hM1GdHGDPhj9x6DkjFusxJYUEs5BzlX7ovpnaIPSW" +
-        "RPsatheSzu48pMOCmyTKE3MpuZg=";
-    public static final String Intermediate_CRL_2_PL_01_07_crl = 
-        "MIIBSzCBtQIBATANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS" +
-        "5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNV" +
-        "BAMTDENBMi1QTC4wMS4wNxcNOTkwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMTAwWqAjMCEwCg" +
-        "YDVR0UBAMCAQEwEwYDVR0jBAwwCoAIJP58MRo3sZowDQYJKoZIhvcNAQEFBQADgYEALiV+" +
-        "BFpXhgTjiMZBYLVuc/fqhHcXeXOGOmJZoKUnIXjETH3rzkkt5k4tMN00ycZVgpRwn3ZyQs" +
-        "cFLcW8taau1J7iQOmGY/7qIT0eFx2OlgNmxqirmwx4OM5VSH5mEpnp9NOr1rfut1GDRzw0" +
-        "tZ+nhD/PGDXYPu+QPX6jii0vdHo=";
-    public static final String Intermediate_CRL_3_PL_01_07_crl = 
-        "MIIBSzCBtQIBATANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS" +
-        "5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNV" +
-        "BAMTDENBMy1QTC4wMS4wNxcNOTkwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMTAwWqAjMCEwCg" +
-        "YDVR0UBAMCAQEwEwYDVR0jBAwwCoAIrDwmUcy9V+4wDQYJKoZIhvcNAQEFBQADgYEASY47" +
-        "p94jEh9FZ1TrPS82nWC3Z6ZKdaD9pUbaJpRnAId59QdBaD2Cxq+SfM3HTlz8grCAPKwulv" +
-        "jDDhXhp4H/m63Q/pJbyl3bbMxnphMOoDwB9wwKIUQPM5wagMovF/UYtC8MoC++m2kuZ1eb" +
-        "fR/OIJuQr+k/kD5Axhw/xolKPdE=";
-    public static final String Intermediate_CRL_4_PL_01_07_crl = 
-        "MIIBSzCBtQIBATANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS" +
-        "5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNV" +
-        "BAMTDENBNC1QTC4wMS4wNxcNOTkwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMTAwWqAjMCEwCg" +
-        "YDVR0UBAMCAQEwEwYDVR0jBAwwCoAIkERxmwxGroIwDQYJKoZIhvcNAQEFBQADgYEAMhIQ" +
-        "lE+BdCO6NBz+YgcH+tjP0n4OCdQ+7uxUxUYmPtPbsLwbDDEEZUjykgwiA6P47Cqh5fXB6G" +
-        "tfInh1cmQi3y2IEHK+bRSx321qczOh34Yx2hw5vp+JFttbQAEl/BHixklrFBrXjN0UsWGC" +
-        "ibXcZy0YjerWTp/yceoABz9p94U=";
-    public static final String End_Certificate_PL_01_07_crt = 
-        "MIIChzCCAfCgAwIBAgICAJwwDQYJKoZIhvcNAQEFBQAwXjELMAkGA1UEBhMCVVMxGDAWBg" +
-        "NVBAoTD1UuUy4gR292ZXJubWVudDEMMAoGA1UECxMDRG9kMRAwDgYDVQQLEwdUZXN0aW5n" +
-        "MRUwEwYDVQQDEwxDQTQtUEwuMDEuMDcwHhcNOTgwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMT" +
-        "AwWjBgMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQL" +
-        "EwNEb0QxEDAOBgNVBAsTB1Rlc3RpbmcxFzAVBgNVBAMTDlVzZXIxLVBMLjAxLjA3MIGfMA" +
-        "0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCdH60mBM1eInACvOB83zLrtiebq9B5UBlAAVS8" +
-        "9ucDwGx1HOJwhwk2AmvhN7pYuDc+BFzuNtgHojqZSDpRMA3rVsGlgOkZ3sOQzvxB73w+/X" +
-        "XmCYpwcEGLpK4egl8r1aOYm0Zm4OxqWhNu9+Do7nrJczDLi8k/qh8/+Rfdtvt4kwIDAQAB" +
-        "o1IwUDAOBgNVHQ8BAf8EBAMCBeAwFgYDVR0gBA8wDTALBglghkgBZQMBMAEwEQYDVR0OBA" +
-        "oECEmVurZ+7UXFMBMGA1UdIwQMMAqACJBEcZsMRq6CMA0GCSqGSIb3DQEBBQUAA4GBAANe" +
-        "AbvpAHwBu9+FlI4DOb65Z+h5f2Ok59FVbVqAj3zkMRkawppngK3CMY/1BQlGXOlHvE+CGz" +
-        "x/7DsiV0O3rxOUjutt00PNxCyIM2pcOZeGUaAu5DJWn0SRwzTMJa4M5K+7wh/4sSPWyxKi" +
-        "ueDq2VXvIgAfEVC8Lv44sxcOduSZ";
-    public static final String[] TEST_60_DATA = new String[] {
-        Intermediate_Certificate_1_PL_01_07_crt,
-        Intermediate_Certificate_2_PL_01_07_crt,
-        Intermediate_Certificate_3_PL_01_07_crt,
-        Intermediate_Certificate_4_PL_01_07_crt,
-        Intermediate_CRL_1_PL_01_07_crl,
-        Intermediate_CRL_2_PL_01_07_crl,
-        Intermediate_CRL_3_PL_01_07_crl,
-        Intermediate_CRL_4_PL_01_07_crl,
-        End_Certificate_PL_01_07_crt
-    };
-
-    /*  
-     *  test61
-     *  
-     */ 
-
-    public static final String Intermediate_Certificate_1_PL_01_08_crt = 
-        "MIICmTCCAgKgAwIBAgICAJ0wDQYJKoZIhvcNAQEFBQAwXjELMAkGA1UEBhMCVVMxGDAWBg" +
-        "NVBAoTD1UuUy4gR292ZXJubWVudDEMMAoGA1UECxMDRG9EMRAwDgYDVQQLEwdUZXN0aW5n" +
-        "MRUwEwYDVQQDEwxUcnVzdCBBbmNob3IwHhcNOTgwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMT" +
-        "AwWjBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQL" +
-        "EwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNVBAMTDENBMS1QTC4wMS4wODCBnzANBg" +
-        "kqhkiG9w0BAQEFAAOBjQAwgYkCgYEAsr+i9HxgO6LnOa6xOHfe9BeLVTo4iZd8rp6UTc02" +
-        "C0MmsSjvIgn3UiayU7aoHcTH8tAXSV5bn0CIH4B46qLym//oE69hUFImy6d1kKgNoaUKWB" +
-        "HztKVtswSSPjIUf7pbyp0wasYMN6fIKYyLpLXUxzA2DrD0kP2Y8ElQJKl2HocCAwEAAaNm" +
-        "MGQwEgYDVR0TAQH/BAgwBgEB/wIBBjAOBgNVHQ8BAf8EBAMCAQYwFgYDVR0gBA8wDTALBg" +
-        "lghkgBZQMBMAEwEQYDVR0OBAoECPMW3WMPtaowMBMGA1UdIwQMMAqACKua6/nC51SPMA0G" +
-        "CSqGSIb3DQEBBQUAA4GBAH2N6S9ggfmRJkzhs82uOPXaHF62YEg1pbNxaCyJJbSt2iIIyy" +
-        "NPSlE1OufPPH3pO7p5xcYi90LCI//0tlUL8y7aULFNygbshFY3B8MSgCz3KPA3UKdtIZYe" +
-        "7lqP9/ob5wmkjtLpx6oZ4/38jxqe37pH1IwVjaUnoeElSo3EkCI5";
-    public static final String Intermediate_Certificate_2_PL_01_08_crt = 
-        "MIICmTCCAgKgAwIBAgICAJ4wDQYJKoZIhvcNAQEFBQAwXjELMAkGA1UEBhMCVVMxGDAWBg" +
-        "NVBAoTD1UuUy4gR292ZXJubWVudDEMMAoGA1UECxMDRG9kMRAwDgYDVQQLEwdUZXN0aW5n" +
-        "MRUwEwYDVQQDEwxDQTEtUEwuMDEuMDgwHhcNOTgwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMT" +
-        "AwWjBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQL" +
-        "EwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNVBAMTDENBMi1QTC4wMS4wODCBnzANBg" +
-        "kqhkiG9w0BAQEFAAOBjQAwgYkCgYEAqZZolrig33i1rEwdP1pin8a5PgzSk7fT+qhrJRCg" +
-        "UTOW5WyPtakrLTUipDcR07t8tIe0NsjRoph7+fAwbjWBfbJdydndHHGx5BqWg8Xi4zFhFd" +
-        "6Mc5O6KO7Yqxs8lmthv/RAdL4Eiir9d9hqskKOtQKbLWz+Bz3+9NwfLGzwzPcCAwEAAaNm" +
-        "MGQwEgYDVR0TAQH/BAgwBgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwFgYDVR0gBA8wDTALBg" +
-        "lghkgBZQMBMAEwEQYDVR0OBAoECFjxM3RkbbhNMBMGA1UdIwQMMAqACPMW3WMPtaowMA0G" +
-        "CSqGSIb3DQEBBQUAA4GBAJOJKBubTS/kLnfXN5YbQfggxbO2c7DTxx2LhrnPiyVDEow+Xf" +
-        "lMv4YK5olH6UUm02D8cv6Wxg4NeTtBBnwKQG/GV4Ssgc/rrpEzM7jFRQcUzPu0jfya2fX8" +
-        "ZNBnSDjovlN6vmZHtiksjh66h3a0aVusEuOQXD29ogMR8qAGYQaZ";
-    public static final String Intermediate_Certificate_3_PL_01_08_crt = 
-        "MIICmTCCAgKgAwIBAgICAJ8wDQYJKoZIhvcNAQEFBQAwXjELMAkGA1UEBhMCVVMxGDAWBg" +
-        "NVBAoTD1UuUy4gR292ZXJubWVudDEMMAoGA1UECxMDRG9kMRAwDgYDVQQLEwdUZXN0aW5n" +
-        "MRUwEwYDVQQDEwxDQTItUEwuMDEuMDgwHhcNOTgwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMT" +
-        "AwWjBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQL" +
-        "EwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNVBAMTDENBMy1QTC4wMS4wODCBnzANBg" +
-        "kqhkiG9w0BAQEFAAOBjQAwgYkCgYEAogLtEcWxzzkkIYe+KrwKhaQjjGQqy2KDsW00U5lx" +
-        "+XJoT8eKd5pxFdCa0SPn/jkNILVeh07mIHec1WF8SOeveVT4Ewd3nG/6ZGoVVq6l0j+3RM" +
-        "jpJbp26BPR69nFn6rmFUMoSNq0VG8Zl+UBqnjq83G3umJCJMMRekUTULSFEGUCAwEAAaNm" +
-        "MGQwEgYDVR0TAQH/BAgwBgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwFgYDVR0gBA8wDTALBg" +
-        "lghkgBZQMBMAEwEQYDVR0OBAoECGAFYeJIhrRzMBMGA1UdIwQMMAqACFjxM3RkbbhNMA0G" +
-        "CSqGSIb3DQEBBQUAA4GBABHamiW7sPLQ83nXt3LZemcAp4QaDB8X94EuJGBwshEcKLoOHb" +
-        "/3cZkPRbOiRQUh/YdpfyApndGFSi0DtwM2Z7yup+MzdrR0wzQoNS95A51nHE7XdCuVFemc" +
-        "LTJ5rdd2BLK3OB5lQagVLzAY9Bs1vaeXKT2Cy+gSUkTIekWcsH3K";
-    public static final String Intermediate_Certificate_4_PL_01_08_crt = 
-        "MIICljCCAf+gAwIBAgICAKAwDQYJKoZIhvcNAQEFBQAwXjELMAkGA1UEBhMCVVMxGDAWBg" +
-        "NVBAoTD1UuUy4gR292ZXJubWVudDEMMAoGA1UECxMDRG9kMRAwDgYDVQQLEwdUZXN0aW5n" +
-        "MRUwEwYDVQQDEwxDQTMtUEwuMDEuMDgwHhcNOTgwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMT" +
-        "AwWjBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQL" +
-        "EwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNVBAMTDENBNC1QTC4wMS4wODCBnzANBg" +
-        "kqhkiG9w0BAQEFAAOBjQAwgYkCgYEAxVjjKlLlZzeZhamPO2NDnRtWM1oWZ3/kdwdBRn50" +
-        "o1NRXb60Ir2HjniK1dRdbijAvR5uItLe9tmj4nusBiaPUGM0HNlEdQWSzble8rvUsP0apw" +
-        "uJusV7zLvzwwbgLbMYT+8lMhxWXM34xszP+dgjWASQOVao1Uqs/MLLibOuueUCAwEAAaNj" +
-        "MGEwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwFgYDVR0gBA8wDTALBglghk" +
-        "gBZQMBMAEwEQYDVR0OBAoECFMFrvh2hQ18MBMGA1UdIwQMMAqACGAFYeJIhrRzMA0GCSqG" +
-        "SIb3DQEBBQUAA4GBAFsCOJ4DzuMOKti5PvF71ZKOtcTHSv123ZNdPIbK6OatT9YhVuUOYB" +
-        "AjMavggywrb+QOXOFfJMctQlS3y/JE9YyoNNt/4UTdx1jQ3I2ablonmzjt8eN5GJ9jUXth" +
-        "fHjxnmGUeWlAvwMjEdzdigkyuWCi9LJfjyHtTjSf9n7w2rU+";
-    public static final String Intermediate_CRL_1_PL_01_08_crl = 
-        "MIIBSzCBtQIBATANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS" +
-        "5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNV" +
-        "BAMTDENBMS1QTC4wMS4wOBcNOTkwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMTAwWqAjMCEwCg" +
-        "YDVR0UBAMCAQEwEwYDVR0jBAwwCoAI8xbdYw+1qjAwDQYJKoZIhvcNAQEFBQADgYEAG2Aq" +
-        "R1oelnrTgh56m6Mm+Lsm0Sf+Ot1W7LzZmMDwoZgmGLcTduVktx+XrtiDDWsf58hmneT1q0" +
-        "5wl4yNH8y/VCAA3SM/gOq4ddOEiS8GbuEYo5P/julH/U3g6M0vfPUZ5y+7V0s35jIbTkjX" +
-        "76n3Rhf88nvTscYvMdqrYyUhAmg=";
-    public static final String Intermediate_CRL_2_PL_01_08_crl = 
-        "MIIBSzCBtQIBATANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS" +
-        "5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNV" +
-        "BAMTDENBMi1QTC4wMS4wOBcNOTkwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMTAwWqAjMCEwCg" +
-        "YDVR0UBAMCAQEwEwYDVR0jBAwwCoAIWPEzdGRtuE0wDQYJKoZIhvcNAQEFBQADgYEAX/+I" +
-        "DkAx7PLTi2x6aYbLacPRaUSjMne84MDaEkYiA64Vo3eL6FbKe14z2mBsM2W7x8xDnxjZ0N" +
-        "RbhcFZ2E6A1ct6HMunuKxjoROIsdWhrYMqJfKKMTWMviz1UjtupsGUWS0dVQCquAr6DJmr" +
-        "W88P8wgiVH2VZsc+edDmCGDunrI=";
-    public static final String Intermediate_CRL_3_PL_01_08_crl = 
-        "MIIBSzCBtQIBATANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS" +
-        "5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNV" +
-        "BAMTDENBMy1QTC4wMS4wOBcNOTkwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMTAwWqAjMCEwCg" +
-        "YDVR0UBAMCAQEwEwYDVR0jBAwwCoAIYAVh4kiGtHMwDQYJKoZIhvcNAQEFBQADgYEASw1+" +
-        "6rGDKgpUtXcCziQCjy8mHFD2zV6x/Ppxm2Gj0U+5eFnIbMPmr4TUYwfSOROUycsiJX/Wa8" +
-        "HEuqWJhIdcsHMA7TYf0iSXK597Bljjg4F/1Rgz0wqLjgMuA59eFbKjJ6zP1E6Sv2Ck0Ea9" +
-        "HJsv5zFA1ljVnNWoQwoHsuLk/wk=";
-    public static final String Intermediate_CRL_4_PL_01_08_crl = 
-        "MIIBSzCBtQIBATANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS" +
-        "5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNV" +
-        "BAMTDENBNC1QTC4wMS4wOBcNOTkwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMTAwWqAjMCEwCg" +
-        "YDVR0UBAMCAQEwEwYDVR0jBAwwCoAIUwWu+HaFDXwwDQYJKoZIhvcNAQEFBQADgYEAHHKd" +
-        "U1SccTsK99BUDrvF930ejNRAvHQM9xv80wcUAy18x+TLwBH8vDTmP210/C5Zk9pQs+rLDd" +
-        "doQQbWJrQkznyB1OSK0T41KZ9L0UE+YmFGJjz0PEzYHV0Kc57j5uc7Fsi8Xu20Y8JeTaJs" +
-        "FUXVsvnCuoSxYmwY1futFWHJG7Q=";
-    public static final String End_Certificate_PL_01_08_crt = 
-        "MIICljCCAf+gAwIBAgICAKEwDQYJKoZIhvcNAQEFBQAwXjELMAkGA1UEBhMCVVMxGDAWBg" +
-        "NVBAoTD1UuUy4gR292ZXJubWVudDEMMAoGA1UECxMDRG9kMRAwDgYDVQQLEwdUZXN0aW5n" +
-        "MRUwEwYDVQQDEwxDQTQtUEwuMDEuMDgwHhcNOTgwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMT" +
-        "AwWjBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQL" +
-        "EwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNVBAMTDENBNS1QTC4wMS4wODCBnzANBg" +
-        "kqhkiG9w0BAQEFAAOBjQAwgYkCgYEAwgNkhQrcqmjhkES6DNAW3uQLKILcFlrFvOlWfDPo" +
-        "ngXzCKeed85npqL+Enxo4sLarEiywuDLrDgPf0gKnZXQWBmzWViZhvTsiAemH7iNsNS68s" +
-        "hhb0vnLzlPpDUJDv7KVKW8VbM7nvplKptlEE6g5kmj3iEmM4l2u8Z/pmQoTsMCAwEAAaNj" +
-        "MGEwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAeYwFgYDVR0gBA8wDTALBglghk" +
-        "gBZQMBMAEwEQYDVR0OBAoECLfApJ09y/ZNMBMGA1UdIwQMMAqACFMFrvh2hQ18MA0GCSqG" +
-        "SIb3DQEBBQUAA4GBAG2ANLc/ib9ayz0B0L6/XQf/xuwETEq8kb5vWml/PbcFD1b/uwRHI8" +
-        "vTvM559nZgtzkhS5ZAvNBTh1CB9Ox/nugHc4srbH6/Wcd94pMQx/sfCB/C6zZ5Tbm7Y4jp" +
-        "hkjnxwGUYTvgNzxmaAPLyCfqY7KwhCSzns2M+yuncEKqlzuT";
-    public static final String[] TEST_61_DATA = new String[] {
-        Intermediate_Certificate_1_PL_01_08_crt,
-        Intermediate_Certificate_2_PL_01_08_crt,
-        Intermediate_Certificate_3_PL_01_08_crt,
-        Intermediate_Certificate_4_PL_01_08_crt,
-        Intermediate_CRL_1_PL_01_08_crl,
-        Intermediate_CRL_2_PL_01_08_crl,
-        Intermediate_CRL_3_PL_01_08_crl,
-        Intermediate_CRL_4_PL_01_08_crl,
-        End_Certificate_PL_01_08_crt
-    };
-
-    /*  
-     *  test62
-     *  
-     */ 
-
-    public static final String Intermediate_Certificate_1_PL_01_09_crt = 
-        "MIICmTCCAgKgAwIBAgICAKIwDQYJKoZIhvcNAQEFBQAwXjELMAkGA1UEBhMCVVMxGDAWBg" +
-        "NVBAoTD1UuUy4gR292ZXJubWVudDEMMAoGA1UECxMDRG9EMRAwDgYDVQQLEwdUZXN0aW5n" +
-        "MRUwEwYDVQQDEwxUcnVzdCBBbmNob3IwHhcNOTgwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMT" +
-        "AwWjBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQL" +
-        "EwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNVBAMTDENBMS1QTC4wMS4wOTCBnzANBg" +
-        "kqhkiG9w0BAQEFAAOBjQAwgYkCgYEA4slldx8rhfz5l2i0rwib2McrCyQkadTjJRoEGQCV" +
-        "xT0dmw7GhDa6wJg2ozXLLk5y7ZCwlmBOTEoNbigHvcKSnJT8R/S+F4KqBz5d5dbRMNEKYz" +
-        "jdbD7Sm7id+eyfq1s5cpmta2lBJ5gTaC9YPSOY2mucGcJ1muYzdOc6h+PCCNMCAwEAAaNm" +
-        "MGQwEgYDVR0TAQH/BAgwBgEB/wIBBjAOBgNVHQ8BAf8EBAMCAQYwFgYDVR0gBA8wDTALBg" +
-        "lghkgBZQMBMAEwEQYDVR0OBAoECO7tq4dJC8OgMBMGA1UdIwQMMAqACKua6/nC51SPMA0G" +
-        "CSqGSIb3DQEBBQUAA4GBAHbth0HjAygIoWVrz59ZBPntOn5nzgUGpH60aSDOS6i9ZOKSoC" +
-        "7wCOEt6IpKO7M7SNznxaX2uhFTYotneyq3qENvqZVXKhE6wQRsdK4kG10cxSB5AXPHJRgk" +
-        "W9+p+Nb0iYVKwHdDCW8KHYIroGhSkKxuflwxhK6DcwQuA7y5q7r7";
-    public static final String Intermediate_Certificate_2_PL_01_09_crt = 
-        "MIICmTCCAgKgAwIBAgICAKMwDQYJKoZIhvcNAQEFBQAwXjELMAkGA1UEBhMCVVMxGDAWBg" +
-        "NVBAoTD1UuUy4gR292ZXJubWVudDEMMAoGA1UECxMDRG9kMRAwDgYDVQQLEwdUZXN0aW5n" +
-        "MRUwEwYDVQQDEwxDQTEtUEwuMDEuMDkwHhcNOTgwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMT" +
-        "AwWjBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQL" +
-        "EwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNVBAMTDENBMi1QTC4wMS4wOTCBnzANBg" +
-        "kqhkiG9w0BAQEFAAOBjQAwgYkCgYEA70v7BFxmToZHF5M29JK6N0Ha6n729cv1U912mH9O" +
-        "NTz9tafa+jv4W7njScv21CJbNlUO5rlAFcTlXY0U9vbqHEufhtwRQqi7+pkfa+Ig8bwl26" +
-        "4U8L5rgmSvZJpEiiKfkmF2Rz9+zPPhHjk58ZcKoAcyhOdZ60KqmaaU/TVtEq8CAwEAAaNm" +
-        "MGQwEgYDVR0TAQH/BAgwBgEB/wIBBDAOBgNVHQ8BAf8EBAMCAQYwFgYDVR0gBA8wDTALBg" +
-        "lghkgBZQMBMAEwEQYDVR0OBAoECKOwR13+P/BlMBMGA1UdIwQMMAqACO7tq4dJC8OgMA0G" +
-        "CSqGSIb3DQEBBQUAA4GBAN71oLHr0+uf6zCOC5L7oeCOGMUwvZyROu8eTztZrPYGjaamSm" +
-        "Z0ZmUPOJP3g5nO6tHf34Tb9CTkwPdPicEaXuxflkSbJBV3mUFQ1BUDlyYTuaL8uT2N61dg" +
-        "xt5RgYTIGsW3/2XrRvXsH91gSiEkccoUyjKnQcX3oZmEeITb6H8m";
-    public static final String Intermediate_Certificate_3_PL_01_09_crt = 
-        "MIICmTCCAgKgAwIBAgICAKQwDQYJKoZIhvcNAQEFBQAwXjELMAkGA1UEBhMCVVMxGDAWBg" +
-        "NVBAoTD1UuUy4gR292ZXJubWVudDEMMAoGA1UECxMDRG9kMRAwDgYDVQQLEwdUZXN0aW5n" +
-        "MRUwEwYDVQQDEwxDQTItUEwuMDEuMDkwHhcNOTgwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMT" +
-        "AwWjBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQL" +
-        "EwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNVBAMTDENBMy1QTC4wMS4wOTCBnzANBg" +
-        "kqhkiG9w0BAQEFAAOBjQAwgYkCgYEAwMLmDs63ai7i4xC/1ufMFWeigJAlbKWMti/PeEKi" +
-        "7LBfNJDRaO+1kde6QIo1vhkhKtokNu9ue3Rfo1+xGuZVohjRbHnmamEm5G3jihegPQgGCR" +
-        "fDZoJDI9HMbwBa0RWw1Nes5igIVjdSHQKO/XTul1yyF2Dt03K2qeLwes+2FyECAwEAAaNm" +
-        "MGQwEgYDVR0TAQH/BAgwBgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwFgYDVR0gBA8wDTALBg" +
-        "lghkgBZQMBMAEwEQYDVR0OBAoECPEAjG80q0FoMBMGA1UdIwQMMAqACKOwR13+P/BlMA0G" +
-        "CSqGSIb3DQEBBQUAA4GBAN9eiZXma2n0XgzdvYrlV/IEqBIhpcZ7gycjDumVBVITZJD2sJ" +
-        "bkBi+N8dg7uovgxGxWGsyxqgAboLhMgbpbFzGh+HyIhQu/CeAx93PWYc5rP2l2Y8d7KJvk" +
-        "p1GZEcG/nTakpjxTQ5MQYFsOHVsnDDOyaZYvqPuMrwGYsfoUa1wq";
-    public static final String Intermediate_Certificate_4_PL_01_09_crt = 
-        "MIICljCCAf+gAwIBAgICAKUwDQYJKoZIhvcNAQEFBQAwXjELMAkGA1UEBhMCVVMxGDAWBg" +
-        "NVBAoTD1UuUy4gR292ZXJubWVudDEMMAoGA1UECxMDRG9kMRAwDgYDVQQLEwdUZXN0aW5n" +
-        "MRUwEwYDVQQDEwxDQTMtUEwuMDEuMDkwHhcNOTgwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMT" +
-        "AwWjBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQL" +
-        "EwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNVBAMTDENBNC1QTC4wMS4wOTCBnzANBg" +
-        "kqhkiG9w0BAQEFAAOBjQAwgYkCgYEAo4L9QEqzq2VXzkZI3cvUWR5v6vreKKQPfJPfEwNH" +
-        "nMS0cgDjC4Fnw9ySI7Eb4A/OJGLIyg84mzTl6JX3kGoYr9/bJ8jOD7pN6CljXuHpwwmd7L" +
-        "6Nf5Hy0ltjAIr5s67e33OWdPi4gApS4FN6nPSDkZotY73d1xqJYQQZWuNEsGUCAwEAAaNj" +
-        "MGEwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwFgYDVR0gBA8wDTALBglghk" +
-        "gBZQMBMAEwEQYDVR0OBAoECLfU7BuxzXeCMBMGA1UdIwQMMAqACPEAjG80q0FoMA0GCSqG" +
-        "SIb3DQEBBQUAA4GBABmQZOvwRpVsTD8uazfQpLJUZkuTap4OOPHie5xJsvOhGend2k+LiP" +
-        "7btGoFrqmkyVV/+dNA8+45SRsnoOtgctiF2ubeqIvd7xf/J5C9Cmo+T89Mt7WEBEuDmEZm" +
-        "JPXvOvyh6lRcYVSBnvVW5ZSstNAQKa/8xuyN0OrE1hJWbucn";
-    public static final String Intermediate_CRL_1_PL_01_09_crl = 
-        "MIIBSzCBtQIBATANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS" +
-        "5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNV" +
-        "BAMTDENBMS1QTC4wMS4wORcNOTkwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMTAwWqAjMCEwCg" +
-        "YDVR0UBAMCAQEwEwYDVR0jBAwwCoAI7u2rh0kLw6AwDQYJKoZIhvcNAQEFBQADgYEAbXc1" +
-        "QgR2TAvOPqJmRFFrDQkPVIVyEEDTwZy5aNnoAKK+AmJ5FZkBtbPJ8qt9UeYRh8lbX8+EIk" +
-        "tyrAKw/1Kc3h7RDqAQ/p8t8kFwVQh2l4KTIukV8hYcj5sMKlt5f49ZwzWPyoOaLDomiUfI" +
-        "OY/jaDMw293AjQXxGCDtnaTvh0o=";
-    public static final String Intermediate_CRL_2_PL_01_09_crl = 
-        "MIIBSzCBtQIBATANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS" +
-        "5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNV" +
-        "BAMTDENBMi1QTC4wMS4wORcNOTkwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMTAwWqAjMCEwCg" +
-        "YDVR0UBAMCAQEwEwYDVR0jBAwwCoAIo7BHXf4/8GUwDQYJKoZIhvcNAQEFBQADgYEAq6en" +
-        "XtvIdh/DifGzWn11hqJIZxLQDGJZPoMmwSOLyB6OzsPrIg1xkOWZYEOELTR8+qP6emmx+D" +
-        "CaEbUDLj60rso0gRQCBwTgHgjeMRpv8fGnV8MJgMv5BdzsGAGQbLSSY9FxtqeCPfZ6olHC" +
-        "iUIopdZJZP8ZvGKQ6QGaMnLpJ78=";
-    public static final String Intermediate_CRL_3_PL_01_09_crl = 
-        "MIIBSzCBtQIBATANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS" +
-        "5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNV" +
-        "BAMTDENBMy1QTC4wMS4wORcNOTkwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMTAwWqAjMCEwCg" +
-        "YDVR0UBAMCAQEwEwYDVR0jBAwwCoAI8QCMbzSrQWgwDQYJKoZIhvcNAQEFBQADgYEAraCx" +
-        "ruxopFbKvxOx/CIF4niG27ABB2ZwU6n4NBGYHo1Y9NjuytjjMZvQjMHyoayqpnF5TA1vXL" +
-        "jXjI3VgQcK7A4ah/0FNLFGtczyY8kXXrpbmdg8+xdNJEG3/e5rDW5VSf7OY1XqU85ySUJQ" +
-        "ZR5uiy8LxlDdaIT4WT7X5ezs3wk=";
-    public static final String Intermediate_CRL_4_PL_01_09_crl = 
-        "MIIBSzCBtQIBATANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS" +
-        "5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNV" +
-        "BAMTDENBNC1QTC4wMS4wORcNOTkwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMTAwWqAjMCEwCg" +
-        "YDVR0UBAMCAQEwEwYDVR0jBAwwCoAIt9TsG7HNd4IwDQYJKoZIhvcNAQEFBQADgYEATtjA" +
-        "BdSZYnIbv1bCL+aSiioJg9S9yWGD1mjsA/CDzvkzSffeSpvqaSy+Zwwf+NDMMG6Cs+SgU+" +
-        "sxQdJALAbb4sYGEyXj/Exh9BYHvgoVahH4NWuhm6LIN8RTcMDAtGoGYFNGXGuT8XRBUJZ/" +
-        "tH9re3gpWaE1rjWeB/2ZBR5ONcM=";
-    public static final String End_Certificate_PL_01_09_crt = 
-        "MIIChzCCAfCgAwIBAgICAKYwDQYJKoZIhvcNAQEFBQAwXjELMAkGA1UEBhMCVVMxGDAWBg" +
-        "NVBAoTD1UuUy4gR292ZXJubWVudDEMMAoGA1UECxMDRG9kMRAwDgYDVQQLEwdUZXN0aW5n" +
-        "MRUwEwYDVQQDEwxDQTQtUEwuMDEuMDkwHhcNOTgwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMT" +
-        "AwWjBgMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQL" +
-        "EwNEb0QxEDAOBgNVBAsTB1Rlc3RpbmcxFzAVBgNVBAMTDlVzZXIxLVBMLjAxLjA5MIGfMA" +
-        "0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC+g1Puqjn+/Of35mqVVUricIV5x+bpZRCAgBDh" +
-        "VYcmZFXLB/XnRd/mYTu0RR4ISEerC1km5tjGeCN2k3NGdZwz/wEh9kEL8WikSqpxUSUD/N" +
-        "vQbliz4f3YECLcpNXKzkCvszeB5ZGHa0sLYDg3r62wy+1y2rtcrHzFEoMFgnnruwIDAQAB" +
-        "o1IwUDAOBgNVHQ8BAf8EBAMCBeAwFgYDVR0gBA8wDTALBglghkgBZQMBMAEwEQYDVR0OBA" +
-        "oECANGcL2klYf7MBMGA1UdIwQMMAqACLfU7BuxzXeCMA0GCSqGSIb3DQEBBQUAA4GBAHm+" +
-        "/vQ7VxDry3VqiqKnNoOhAHTTIUphNWF4jddRqVc32IsjVaeTbcGwCIRflRm/lUplRvXXxb" +
-        "JEbW9mP3nfTCREUdm49hjmo/szsPjgosFoEmuEKXThC81/y2vQkb4/jqRoOHEknU++38EU" +
-        "Juv6Y6psZNa37x8Yn3i7S+b3TM2q";
-    public static final String[] TEST_62_DATA = new String[] {
-        Intermediate_Certificate_1_PL_01_09_crt,
-        Intermediate_Certificate_2_PL_01_09_crt,
-        Intermediate_Certificate_3_PL_01_09_crt,
-        Intermediate_Certificate_4_PL_01_09_crt,
-        Intermediate_CRL_1_PL_01_09_crl,
-        Intermediate_CRL_2_PL_01_09_crl,
-        Intermediate_CRL_3_PL_01_09_crl,
-        Intermediate_CRL_4_PL_01_09_crl,
-        End_Certificate_PL_01_09_crt
-    };
-
-    /*  
-     *  test63
-     *  
-     */ 
-
-    public static final String Intermediate_Certificate_1_PL_01_10_crt = 
-        "MIICmTCCAgKgAwIBAgICAKcwDQYJKoZIhvcNAQEFBQAwXjELMAkGA1UEBhMCVVMxGDAWBg" +
-        "NVBAoTD1UuUy4gR292ZXJubWVudDEMMAoGA1UECxMDRG9EMRAwDgYDVQQLEwdUZXN0aW5n" +
-        "MRUwEwYDVQQDEwxUcnVzdCBBbmNob3IwHhcNOTgwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMT" +
-        "AwWjBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQL" +
-        "EwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNVBAMTDENBMS1QTC4wMS4xMDCBnzANBg" +
-        "kqhkiG9w0BAQEFAAOBjQAwgYkCgYEAr4LmuvhSms70CnuAHIHwz45csKvBPVtcDjA1tWNb" +
-        "NIvvNHBzyt6G8U4CTVKmsFAZOzrWJem3b/ZywM1WlDarGJAAa/SRIYZ/jQwaOIoPW4OUfK" +
-        "ZQI6MO7uAPcIQ4ugtPth10viVqZYLZn/6O26Q905YsFltuPFl64KrJVJJBlLECAwEAAaNm" +
-        "MGQwEgYDVR0TAQH/BAgwBgEB/wIBBjAOBgNVHQ8BAf8EBAMCAQYwFgYDVR0gBA8wDTALBg" +
-        "lghkgBZQMBMAEwEQYDVR0OBAoECGRn9ckrcsEdMBMGA1UdIwQMMAqACKua6/nC51SPMA0G" +
-        "CSqGSIb3DQEBBQUAA4GBANK+1qalm7Nl+PJHT9nQLVJ3ruQNAoMlH9fN52Q9BZCr30iWCd" +
-        "+GhQIPRjxZ4GWojMnqbWzYQsxIR2PLdFc6SwjQrq+i2ES/LePDtaLQddS44/+GP/+qDpM9" +
-        "Mqp3/Nbe1MfOKRBT57qgrxa8eUVieysoKeYX6yQpa8bab3qDwOTH";
-    public static final String Intermediate_Certificate_2_PL_01_10_crt = 
-        "MIICmTCCAgKgAwIBAgICAKgwDQYJKoZIhvcNAQEFBQAwXjELMAkGA1UEBhMCVVMxGDAWBg" +
-        "NVBAoTD1UuUy4gR292ZXJubWVudDEMMAoGA1UECxMDRG9kMRAwDgYDVQQLEwdUZXN0aW5n" +
-        "MRUwEwYDVQQDEwxDQTEtUEwuMDEuMTAwHhcNOTgwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMT" +
-        "AwWjBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQL" +
-        "EwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNVBAMTDENBMi1QTC4wMS4xMDCBnzANBg" +
-        "kqhkiG9w0BAQEFAAOBjQAwgYkCgYEAx5tMLJ3LRxi9jAzCSNkj8zyrSO0cImNGf6ZCIzEU" +
-        "V8LrmXjgiZboPTh9LWQ3msWDLpzaxVxDLBXG3eMO8ys46TfJKciyeoiB8wfuNGMKAccm8u" +
-        "43XjWs1KAdNikWEZupYPgdmA92oRlVcHshG9PqP4+xA6sydpu3V18Nyfa0n3MCAwEAAaNm" +
-        "MGQwEgYDVR0TAQH/BAgwBgEB/wIBBDAOBgNVHQ8BAf8EBAMCAQYwFgYDVR0gBA8wDTALBg" +
-        "lghkgBZQMBMAEwEQYDVR0OBAoECDE3dDXkS7TxMBMGA1UdIwQMMAqACGRn9ckrcsEdMA0G" +
-        "CSqGSIb3DQEBBQUAA4GBAE+8cyOUQ7y4atc4BlZNZvGNRZ63dbGDCM2AItTEAf4ETM9v7j" +
-        "biUWTirJyoWsGxm2eIUk1V+EKxcuO3FotFUe7lS6thmVd6OYOSW+02RXMNklmptzK9I3AK" +
-        "DZNh82ugLNyrrd06BSiED+0MoGVVI4gi3wdFtRiai+MgQVeWIB4i";
-    public static final String Intermediate_Certificate_3_PL_01_10_crt = 
-        "MIICmTCCAgKgAwIBAgICAKkwDQYJKoZIhvcNAQEFBQAwXjELMAkGA1UEBhMCVVMxGDAWBg" +
-        "NVBAoTD1UuUy4gR292ZXJubWVudDEMMAoGA1UECxMDRG9kMRAwDgYDVQQLEwdUZXN0aW5n" +
-        "MRUwEwYDVQQDEwxDQTItUEwuMDEuMTAwHhcNOTgwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMT" +
-        "AwWjBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQL" +
-        "EwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNVBAMTDENBMy1QTC4wMS4xMDCBnzANBg" +
-        "kqhkiG9w0BAQEFAAOBjQAwgYkCgYEAsmSUL/UZBYMdqU0PecjCd+9U+1Ld3mKkH303Fido" +
-        "K6k5S4ZObxVHKhYDJyp3CcVT2+nENjzIfQQQaA11UK7Uf/jmVs0IC8e2scWzq0W2BeOLef" +
-        "jVgNgXGsXyfLi9T4KJPPyGsKlIU2R2xKxgHmAOt/tw6OYX/OaEfM1jiQza5lkCAwEAAaNm" +
-        "MGQwEgYDVR0TAQH/BAgwBgEB/wIBATAOBgNVHQ8BAf8EBAMCAQYwFgYDVR0gBA8wDTALBg" +
-        "lghkgBZQMBMAEwEQYDVR0OBAoECHYI07i4owpIMBMGA1UdIwQMMAqACDE3dDXkS7TxMA0G" +
-        "CSqGSIb3DQEBBQUAA4GBAK23Kx99Y9HtFBVnHWW/NfvNro7I5Wx/ZCko6ulHm84FPAjhnL" +
-        "tvc4jmfAZd0wYPKQKWwUKUDWNEwIU1qkxyJYACckue35GLzj8aLY/z+h037vGonFmNutMM" +
-        "rcRdiV7gVD17dYLVTt0RgxsDVDtut+twqHgIaKtKyJnl9dSgFFv1";
-    public static final String Intermediate_Certificate_4_PL_01_10_crt = 
-        "MIICljCCAf+gAwIBAgICAKowDQYJKoZIhvcNAQEFBQAwXjELMAkGA1UEBhMCVVMxGDAWBg" +
-        "NVBAoTD1UuUy4gR292ZXJubWVudDEMMAoGA1UECxMDRG9kMRAwDgYDVQQLEwdUZXN0aW5n" +
-        "MRUwEwYDVQQDEwxDQTMtUEwuMDEuMTAwHhcNOTgwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMT" +
-        "AwWjBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQL" +
-        "EwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNVBAMTDENBNC1QTC4wMS4xMDCBnzANBg" +
-        "kqhkiG9w0BAQEFAAOBjQAwgYkCgYEArgBnLCnqI6Sa7gXkZOvIKH4EL5i3CoG6eGG2R8aA" +
-        "kjBs78IKGYj9gY7rRajAKSpf19zvfcW8+2gBDDj5AoCy6uDnBICmqdu+hkdokVi8dJHiTU" +
-        "9LdS2TeuvFv47eiXoEBjMEAquCuSyHvW3lNrA+ESTnK3s7V4lBoO+o5mZD6dsCAwEAAaNj" +
-        "MGEwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwFgYDVR0gBA8wDTALBglghk" +
-        "gBZQMBMAEwEQYDVR0OBAoECLTgYziQC9zmMBMGA1UdIwQMMAqACHYI07i4owpIMA0GCSqG" +
-        "SIb3DQEBBQUAA4GBAEx8wgBjBglU98rocddKAEKXkt4MNzrpUMq75C9HtnuOtFgM2oY/OC" +
-        "x67aZSTEph9ag6Hc+MyxWB5rzGD9j0y7OLsasE9AX8vjplUq50wq1xAFkGi1GnqRK/Oe7D" +
-        "S6R66+UFHW/3KAeNe96aaJuMcx0TRbfkGbW1ASSi/ixMd9Gi";
-    public static final String Intermediate_CRL_1_PL_01_10_crl = 
-        "MIIBSzCBtQIBATANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS" +
-        "5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNV" +
-        "BAMTDENBMS1QTC4wMS4xMBcNOTkwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMTAwWqAjMCEwCg" +
-        "YDVR0UBAMCAQEwEwYDVR0jBAwwCoAIZGf1yStywR0wDQYJKoZIhvcNAQEFBQADgYEAjkY5" +
-        "nXjLst8CMz0fyEM7Ft2d9TOOJXV4TMAfSAP9QCnit8qzrdVdJ6TJIsJNZYBz9Ryr5K/iSw" +
-        "KbYk0g6y/pskcMoHG3vJwNAxBbkf+fV7Eyve+90Z6oWDXHKLGCQQpdZ0a0wAqYeiScok8+" +
-        "YHypEVLfbjWARR9fsci2Ps3tdvA=";
-    public static final String Intermediate_CRL_2_PL_01_10_crl = 
-        "MIIBSzCBtQIBATANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS" +
-        "5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNV" +
-        "BAMTDENBMi1QTC4wMS4xMBcNOTkwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMTAwWqAjMCEwCg" +
-        "YDVR0UBAMCAQEwEwYDVR0jBAwwCoAIMTd0NeRLtPEwDQYJKoZIhvcNAQEFBQADgYEAdpTU" +
-        "xcywBjX2rD8Gu6zkDqlDmZfRXHDPtnf2RB4bHDx77kDEib6nH6DGoJdx8WnRTZsTjly3MG" +
-        "62LfVmjp/bJyKHUQqBDrilv21EWsaI9JOr673Nk5iTZa/645GdgyLzSmxvcVDN40BAH0py" +
-        "/2gvBQTPNzp2W1IR2mebuLdHwTI=";
-    public static final String Intermediate_CRL_3_PL_01_10_crl = 
-        "MIIBSzCBtQIBATANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS" +
-        "5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNV" +
-        "BAMTDENBMy1QTC4wMS4xMBcNOTkwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMTAwWqAjMCEwCg" +
-        "YDVR0UBAMCAQEwEwYDVR0jBAwwCoAIdgjTuLijCkgwDQYJKoZIhvcNAQEFBQADgYEATVf2" +
-        "cEEGphsIe0AsqNJ5rENLe8DeDAV8R4XCKdeP5qmHmLMm9Z4pX8bIfU7bCoXiNIwGvIU6ag" +
-        "FmHPNHEj70cQFVqCX/ZESc02hit+Os9g7pcl7s9QgwVUCMZdCiF/+pSEp3eCL5tFoKmAZe" +
-        "nxkL0KOSuKmBzuqRtZufbhDvmbw=";
-    public static final String Intermediate_CRL_4_PL_01_10_crl = 
-        "MIIBSzCBtQIBATANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS" +
-        "5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNV" +
-        "BAMTDENBNC1QTC4wMS4xMBcNOTkwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMTAwWqAjMCEwCg" +
-        "YDVR0UBAMCAQEwEwYDVR0jBAwwCoAItOBjOJAL3OYwDQYJKoZIhvcNAQEFBQADgYEAbG2B" +
-        "BhvRQ1pY/8VFeiCRFD8mBzq5iW5hWv2P7Zdp9zEbQo0fI4Kbis3OGemEttCxvAc/UPfogr" +
-        "UudImf3s8sLV9BS59xQUGQlxZ5XBNlripY8EjHNWrwgy7/x4hzlZ9yYBbqoNOqnHLy/gbM" +
-        "XZWoCbIK0co70lh1soOQ6eqLDKM=";
-    public static final String End_Certificate_PL_01_10_crt = 
-        "MIICljCCAf+gAwIBAgICAKswDQYJKoZIhvcNAQEFBQAwXjELMAkGA1UEBhMCVVMxGDAWBg" +
-        "NVBAoTD1UuUy4gR292ZXJubWVudDEMMAoGA1UECxMDRG9kMRAwDgYDVQQLEwdUZXN0aW5n" +
-        "MRUwEwYDVQQDEwxDQTQtUEwuMDEuMTAwHhcNOTgwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMT" +
-        "AwWjBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQL" +
-        "EwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNVBAMTDENBNS1QTC4wMS4xMDCBnzANBg" +
-        "kqhkiG9w0BAQEFAAOBjQAwgYkCgYEA3bx0qx8s4Zse6Ri6NqkLEKUPLIOhTFj/9Dh7sxvE" +
-        "HpemBlTjbp2in08WTxEb9n8iAIWuGs3Vqm82ttBQmayjIaWD5oE/BE0oV/e91NAv/aRLsl" +
-        "f7VtOb6vi8Ef6muOAjI2dUaUD6QONkqkJhnZ353uR3LZnsAEAW+InePGFNEGkCAwEAAaNj" +
-        "MGEwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAeYwFgYDVR0gBA8wDTALBglghk" +
-        "gBZQMBMAEwEQYDVR0OBAoECIokB8m8Vi4QMBMGA1UdIwQMMAqACLTgYziQC9zmMA0GCSqG" +
-        "SIb3DQEBBQUAA4GBAKBGQwZQLQFXb+/kjP5xAtq+1rRtrblytjpv3ujJrKH1v2VB2+9boB" +
-        "0YYYGJTy2Wuj0ZBEMeTzMO8Hol4Mq9pnYv5DCmfnZN3FuDidgnRsCjM3ZL7NcXXG9YwlKF" +
-        "G2SXj0YfkSwN9gnyN11W8i+F/OSjlm+TDKHB3ePMcY8EnnXy";
-    public static final String[] TEST_63_DATA = new String[] {
-        Intermediate_Certificate_1_PL_01_10_crt,
-        Intermediate_Certificate_2_PL_01_10_crt,
-        Intermediate_Certificate_3_PL_01_10_crt,
-        Intermediate_Certificate_4_PL_01_10_crt,
-        Intermediate_CRL_1_PL_01_10_crl,
-        Intermediate_CRL_2_PL_01_10_crl,
-        Intermediate_CRL_3_PL_01_10_crl,
-        Intermediate_CRL_4_PL_01_10_crl,
-        End_Certificate_PL_01_10_crt
-    };
-
-    /*  
-     *  test64
-     *  
-     */ 
-
-    public static final String Intermediate_Certificate_RL_02_01_crt = 
-        "MIICljCCAf+gAwIBAgICAKwwDQYJKoZIhvcNAQEFBQAwXjELMAkGA1UEBhMCVVMxGDAWBg" +
-        "NVBAoTD1UuUy4gR292ZXJubWVudDEMMAoGA1UECxMDRG9EMRAwDgYDVQQLEwdUZXN0aW5n" +
-        "MRUwEwYDVQQDEwxUcnVzdCBBbmNob3IwHhcNOTgwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMT" +
-        "AwWjBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQL" +
-        "EwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNVBAMTDENBMS1STC4wMi4wMTCBnzANBg" +
-        "kqhkiG9w0BAQEFAAOBjQAwgYkCgYEA3AN+Y3Hl/9V0nKXHQotb/cA2VfZc5vrRu+ZjwKgK" +
-        "6KasGegAorKSTybYX/fTbnaPwykDPfSscAnzAW5WdF9+wTLmvYc+6pkcx1ryKkGmofFMXi" +
-        "bZ5LUO/oK0iuNjBKfLdWoi+hpciKyPb9Bs8SO/svKSNqTEbn9ts3q6tpbngoECAwEAAaNj" +
-        "MGEwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwFgYDVR0gBA8wDTALBglghk" +
-        "gBZQMBMAEwEQYDVR0OBAoECGXQ07qiAqv2MBMGA1UdIwQMMAqACKua6/nC51SPMA0GCSqG" +
-        "SIb3DQEBBQUAA4GBADKtN3OOaRdte0X4xLC6nTGaK/u7IEKQ0DjduDHwJR5w27zefrx48Z" +
-        "dlq8t5lAfQJqWmfk7iCIW1QJPLcZOouWDP2S9Cb0YooGQRIEkMjpBn3Xufx0XUphtCDs3W" +
-        "9LAMVXqfuce1tpZ6Dvrh6/H2X8rJMU29Czsz949bh6tcsHJi";
-    public static final String Intermediate_CRL_RL_02_01_crl = 
-        "MIIBSzCBtQIBATANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS" +
-        "5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNV" +
-        "BAMTDENBMS1STC4wMi4wMRcNOTkwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMTAwWqAjMCEwCg" +
-        "YDVR0UBAMCAQEwEwYDVR0jBAwwCoAIZdDTuqICq/YwDQYJKoZIhvcNAQEFBQADgYEAxrDH" +
-        "zKno1mkJqPTub0c9To6jC3CGTilV1E12oD0kFjkXqL40+W251qQ2wMC+G7ZrzBIc5dRuJ9" +
-        "3feHZ7cc03/s3TziXDvSyfNOYpHzkPwT48HuSgBYgJ3uswwk+tDiA64NzbOJqssxxhFRok" +
-        "9OpwC8eQkzgpA3a6816v2I3XL9s=";
-    public static final String End_Certificate_RL_02_01_crt = 
-        "MIIChzCCAfCgAwIBAgICAK0wDQYJKoZIhvcNAQEFBQAwXjELMAkGA1UEBhMCVVMxGDAWBg" +
-        "NVBAoTD1UuUy4gR292ZXJubWVudDEMMAoGA1UECxMDRG9kMRAwDgYDVQQLEwdUZXN0aW5n" +
-        "MRUwEwYDVQQDEwxDQTEtUkwuMDIuMDEwHhcNOTgwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMT" +
-        "AwWjBgMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQL" +
-        "EwNEb0QxEDAOBgNVBAsTB1Rlc3RpbmcxFzAVBgNVBAMTDlVzZXIxLVJMLjAyLjAxMIGfMA" +
-        "0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCykRGcIKuxia47yRmJT8XpNNi2LTTbUUTteIBp" +
-        "DZBfz2ExeWLruO9Rn1/oB/EP+4apx4r9rQ2tGsvr/7qQYeQK8W7eJzZgvxFadY57IMfUNq" +
-        "1nEnj0ZvuWrOSf+K9v6FWX5Y2uyZS5Uvb1VVQv0Ev890+yXTtthPTjepk3JkkouwIDAQAB" +
-        "o1IwUDAOBgNVHQ8BAf8EBAMCBeAwFgYDVR0gBA8wDTALBglghkgBZQMBMAEwEQYDVR0OBA" +
-        "oECFIkVrx7NRAdMBMGA1UdIwQMMAqACGXQ07qiAqv2MA0GCSqGSIb3DQEBBQUAA4GBAI+B" +
-        "T6bFZruoeFHXsYVjkQ42jSdYB9JuQkG7JLKte5gGlhyR+jMlJBzxBgNIfvlmYSnbRFPbE8" +
-        "eqsGm90hJJoUuVMkm0i03H13uddlS494O6HhTGpaKcYwp3hbLhVcaY3wFTqTCuZk1T7Oxq" +
-        "ggTrCDYvNH+/ZpQuy6nB/FH3SAHS";
-    public static final String[] TEST_64_DATA = new String[] {
-        Intermediate_Certificate_RL_02_01_crt,
-        Intermediate_CRL_RL_02_01_crl,
-        End_Certificate_RL_02_01_crt
-    };
-
-    /*  
-     *  test65
-     *  
-     */ 
-
-    public static final String Intermediate_Certificate_1_RL_03_01_crt = 
-        "MIICljCCAf+gAwIBAgICAK4wDQYJKoZIhvcNAQEFBQAwXjELMAkGA1UEBhMCVVMxGDAWBg" +
-        "NVBAoTD1UuUy4gR292ZXJubWVudDEMMAoGA1UECxMDRG9EMRAwDgYDVQQLEwdUZXN0aW5n" +
-        "MRUwEwYDVQQDEwxUcnVzdCBBbmNob3IwHhcNOTgwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMT" +
-        "AwWjBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQL" +
-        "EwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNVBAMTDENBMS1STC4wMy4wMTCBnzANBg" +
-        "kqhkiG9w0BAQEFAAOBjQAwgYkCgYEAsZG8wsV3Kuo+jtnKxLYGBuAqQwUh6Cs7ioDTNUFI" +
-        "UDDJ0lOP1HVTMBA7DEcyTCGvnQ02dEVVuCddBTQvG5RvW7G7cCEW37cS56/3yPsU1bD/cp" +
-        "3C1pPJpoun04va91Sxtgcmx7jnz69QPVrucu6aI1sZyeOlvzb8K7DceaAfR98CAwEAAaNj" +
-        "MGEwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwFgYDVR0gBA8wDTALBglghk" +
-        "gBZQMBMAEwEQYDVR0OBAoECMNzJ3SpyOLxMBMGA1UdIwQMMAqACKua6/nC51SPMA0GCSqG" +
-        "SIb3DQEBBQUAA4GBABo7oKmQilgji3w1tGz1cMrWxZxqGJqOAKcHywli+oxFo2oxSfEuFS" +
-        "tN2aEd2Ja5HU5a0ySztvByXF1TTNurGez7ARxmcS2kpoQtQXTloywza4A5N7iQwk0yyo/E" +
-        "J4lrXUfVRwZHr7FwA7qMODtFb0+Zivv9JLaq19GhnRhzZyWp";
-    public static final String Intermediate_Certificate_2_RL_03_01_crt = 
-        "MIICljCCAf+gAwIBAgICAK8wDQYJKoZIhvcNAQEFBQAwXjELMAkGA1UEBhMCVVMxGDAWBg" +
-        "NVBAoTD1UuUy4gR292ZXJubWVudDEMMAoGA1UECxMDRG9EMRAwDgYDVQQLEwdUZXN0aW5n" +
-        "MRUwEwYDVQQDEwxUcnVzdCBBbmNob3IwHhcNOTgwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMT" +
-        "AwWjBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQL" +
-        "EwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNVBAMTDENBMi1STC4wMy4wMTCBnzANBg" +
-        "kqhkiG9w0BAQEFAAOBjQAwgYkCgYEAt7yNq1QZsV3p7OR8rgPuY7x7Bvs+nPhcLR7zFOgR" +
-        "+plQUwpWQ2PhuzReVV4jNasKtNK9MIWoeV+eV3pEiso5obb9+Byvha1F6gkYNZMPs9Iv86" +
-        "cJSMtownNJVGVAL9FEpof1QKLp7kfn08EjkoGmGy85xy9uFytd2S8n5TlrBqcCAwEAAaNj" +
-        "MGEwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwFgYDVR0gBA8wDTALBglghk" +
-        "gBZQMBMAEwEQYDVR0OBAoECAVwoCPFqMtqMBMGA1UdIwQMMAqACKua6/nC51SPMA0GCSqG" +
-        "SIb3DQEBBQUAA4GBAL9GufFieduzBJaMtsXtKHMf64O/KAGLSh1YDXS+a7Ku+EFw+WteKU" +
-        "Ob6+c1m7VH9P711eATQoACotCdKusPECqeYDEmT9keqA4f7cP4VcvGwhvSVQJsPuB3LL3S" +
-        "LIILE4zhT+O9G+5v+mkG/pEDirRYk6ZkdM91bsUuzsX40uyn";
-    public static final String Intermediate_CRL_RL_03_01_crl = 
-        "MIIBSzCBtQIBATANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS" +
-        "5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNV" +
-        "BAMTDENBMi1STC4wMy4wMRcNOTkwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMTAwWqAjMCEwCg" +
-        "YDVR0UBAMCAQEwEwYDVR0jBAwwCoAIBXCgI8Woy2owDQYJKoZIhvcNAQEFBQADgYEAkwyA" +
-        "I1rrz6tOmEpBHDzuJfqY2nbXCIXFN6dVuaKNZWHJ4ZNIc4/t29Wa5GgXYrVXyXRcXP/u5k" +
-        "NEhOX2/NwCm6vL8+tclYP5qPLrh/Dk4v3nvcTFLKCvclAbf4Il0zfMQx+RRnO5PPqPDu5i" +
-        "1tHHwOtA8Q+oO71lZEwPE+pX1Sc=";
-    public static final String End_Certificate_RL_03_01_crt = 
-        "MIIChzCCAfCgAwIBAgICALAwDQYJKoZIhvcNAQEFBQAwXjELMAkGA1UEBhMCVVMxGDAWBg" +
-        "NVBAoTD1UuUy4gR292ZXJubWVudDEMMAoGA1UECxMDRG9kMRAwDgYDVQQLEwdUZXN0aW5n" +
-        "MRUwEwYDVQQDEwxDQTEtUkwuMDMuMDEwHhcNOTgwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMT" +
-        "AwWjBgMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQL" +
-        "EwNEb0QxEDAOBgNVBAsTB1Rlc3RpbmcxFzAVBgNVBAMTDlVzZXIxLVJMLjAzLjAxMIGfMA" +
-        "0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDPGLfi8/T5p63cbGE98mqO5VzkeI1r2/2TLgvY" +
-        "RpL1h8i+CVYKoX37yYwNXf+HkHhj1OXJSNrm7853ctmDf2h1fv3f1+qJLg4VRVzlEgErNq" +
-        "74OR7XLXV77kGOmhip2g5BF5VKeqAdj0pCo1E5ZFHpRPFq/0DDmSda6GKJ6Dl8hwIDAQAB" +
-        "o1IwUDAOBgNVHQ8BAf8EBAMCBeAwFgYDVR0gBA8wDTALBglghkgBZQMBMAEwEQYDVR0OBA" +
-        "oECOHM3uWxFmcrMBMGA1UdIwQMMAqACMNzJ3SpyOLxMA0GCSqGSIb3DQEBBQUAA4GBAFBu" +
-        "doX0TZK/yoUcrSkP8AtFiv5c7QvyEtigFZTT+lbW/g4RX/oJGNZCu78yAxCczl+Z6ft+0V" +
-        "wInwahjyyAgw4QXxtw3b9CfqvT7HH7hcQ6r9ZA/NA9XpzNtxKfmXjzCZWdfmLJrd8KCnU/" +
-        "utKRAObRBKiaTGa178SEWvtkoIXd";
-    public static final String[] TEST_65_DATA = new String[] {
-        Intermediate_Certificate_1_RL_03_01_crt,
-        Intermediate_Certificate_2_RL_03_01_crt,
-        Intermediate_CRL_RL_03_01_crl,
-        End_Certificate_RL_03_01_crt
-    };
-
-    /*  
-     *  test66
-     *  
-     */ 
-
-    public static final String Intermediate_Certificate_RL_03_02_crt = 
-        "MIICljCCAf+gAwIBAgICALEwDQYJKoZIhvcNAQEFBQAwXjELMAkGA1UEBhMCVVMxGDAWBg" +
-        "NVBAoTD1UuUy4gR292ZXJubWVudDEMMAoGA1UECxMDRG9EMRAwDgYDVQQLEwdUZXN0aW5n" +
-        "MRUwEwYDVQQDEwxUcnVzdCBBbmNob3IwHhcNOTgwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMT" +
-        "AwWjBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQL" +
-        "EwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNVBAMTDENBMS1STC4wMy4wMjCBnzANBg" +
-        "kqhkiG9w0BAQEFAAOBjQAwgYkCgYEAvoTuc2LYBOhziBe02f6F8l9MwX74O1lknBcJjGvq" +
-        "JcirQx/6hQgBQT4hz4RRXNy7DSBr3swEw4eDNSeyd6kvG0h9oI3+SVmVyPPVi5eKDL1roI" +
-        "OBzmfx1+Nn/CnwOf8VroKDutBBQ0gJ24IEjwp6er/8hEAVN/yIjIi/MTFeoRkCAwEAAaNj" +
-        "MGEwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwFgYDVR0gBA8wDTALBglghk" +
-        "gBZQMBMAEwEQYDVR0OBAoECKtCUOlmMPu6MBMGA1UdIwQMMAqACKua6/nC51SPMA0GCSqG" +
-        "SIb3DQEBBQUAA4GBAI9x8O/JgJuZV/s4OBUy3AvcW9QP3HWWBQSdxUdjSosT2schjn7wrR" +
-        "gttL7vWjT1djsbATAHa5C3inG+VjGIq/NqWaPoHAucRNMs4oZX2ACZFuBLOb/qhywsKh5+" +
-        "bjv4QgtqkUedzEratY6yQiJSiMSJVJSMzHosTVMX7oOp+cll";
-    public static final String Intermediate_CRL_RL_03_02_crl = 
-        "MIIBcDCB2gIBATANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS" +
-        "5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNV" +
-        "BAMTDENBMS1STC4wMi4wMRcNOTkwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMTAwWjAjMCECAg" +
-        "CyFw05OTAxMDExMjAwMDBaMAwwCgYDVR0VBAMKAQGgIzAhMAoGA1UdFAQDAgEBMBMGA1Ud" +
-        "IwQMMAqACKtCUOlmMPu6MA0GCSqGSIb3DQEBBQUAA4GBAAEZ0Hg6sKiVXIeK6zbQrKtMMz" +
-        "Vz2K68+SqN1LAjlNW6u+HSTlAvhRIFO1Hv5Zj7qbO226rLxas/X2XWXpMlm84NHN8T4dZU" +
-        "4Yo5rhhpCHckRxNYn3AFcfcV4ra1rrTtdx8e7e7/m0Ghog9Ny52ZuQThasL9caF0JxUx6d" +
-        "zbBHPm";
-    public static final String End_Certificate_RL_03_02_crt = 
-        "MIIChzCCAfCgAwIBAgICALIwDQYJKoZIhvcNAQEFBQAwXjELMAkGA1UEBhMCVVMxGDAWBg" +
-        "NVBAoTD1UuUy4gR292ZXJubWVudDEMMAoGA1UECxMDRG9kMRAwDgYDVQQLEwdUZXN0aW5n" +
-        "MRUwEwYDVQQDEwxDQTEtUkwuMDMuMDIwHhcNOTgwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMT" +
-        "AwWjBgMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQL" +
-        "EwNEb0QxEDAOBgNVBAsTB1Rlc3RpbmcxFzAVBgNVBAMTDlVzZXIxLVJMLjAzLjAyMIGfMA" +
-        "0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDNb6HGPRDulLMCCyCq6w2X8rHPtm1gN68JXFkX" +
-        "j/BZsHhu29Z9hXj76hO//7O775EPVMSLyRy8t15yzYpXfZRHFaGB5bs8U2R5ClvsD2FR0H" +
-        "t0JVfU6Ggn1lhO+jOiguJtXVRjofsfvHuiOe75ctaJ9lBpgwiV8tk4VRKz2e5xVwIDAQAB" +
-        "o1IwUDAOBgNVHQ8BAf8EBAMCBeAwFgYDVR0gBA8wDTALBglghkgBZQMBMAEwEQYDVR0OBA" +
-        "oECI3Gy0TgXMrwMBMGA1UdIwQMMAqACKtCUOlmMPu6MA0GCSqGSIb3DQEBBQUAA4GBAISQ" +
-        "Qh9+7D6nk3FL5YQOzyZ0BSHQYjpbIVykJ+Lr4jBPKyGgCqW6jqWNg7X4waB77J2z/OkavY" +
-        "A6qtpsk8r2wmG9thi8JyZZNhYMxAszHzFbBmSoxGRMvI0XarxgIu8Ky6V7jKVDLz12C3o9" +
-        "H0yd+nZXilCD+p9BTjjg5bGUogJS";
-    public static final String[] TEST_66_DATA = new String[] {
-        Intermediate_Certificate_RL_03_02_crt,
-        Intermediate_CRL_RL_03_02_crl,
-        End_Certificate_RL_03_02_crt
-    };
-
-    /*  
-     *  test67
-     *  
-     */ 
-
-    public static final String Intermediate_Certificate_RL_03_03_crt = 
-        "MIICljCCAf+gAwIBAgICALMwDQYJKoZIhvcNAQEFBQAwXjELMAkGA1UEBhMCVVMxGDAWBg" +
-        "NVBAoTD1UuUy4gR292ZXJubWVudDEMMAoGA1UECxMDRG9EMRAwDgYDVQQLEwdUZXN0aW5n" +
-        "MRUwEwYDVQQDEwxUcnVzdCBBbmNob3IwHhcNOTgwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMT" +
-        "AwWjBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQL" +
-        "EwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNVBAMTDENBMS1STC4wMy4wMzCBnzANBg" +
-        "kqhkiG9w0BAQEFAAOBjQAwgYkCgYEAu/o0uxgTrAvNDrMNuG2eTla+AmkLVCIXBbsIo0gs" +
-        "tLm29tLwfBh/8l5OC0y6Xeh5lx+NLdelsiZGRNaaWmWHj9Ji5V6rclr8sXRDUjxe12zLeh" +
-        "0G+a0TfpL380cx9RItqQyA1ZRiUNymmJHnm13hwrf7LPirR9BMrtyTT2EI3cMCAwEAAaNj" +
-        "MGEwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwFgYDVR0gBA8wDTALBglghk" +
-        "gBZQMBMAEwEQYDVR0OBAoECHYt39LYdEn0MBMGA1UdIwQMMAqACKua6/nC51SPMA0GCSqG" +
-        "SIb3DQEBBQUAA4GBAIoSGa7MxnOuHoWM/BoJKsCeBmBHYCYDKmQ19JfsDHW8z8oAFiikFb" +
-        "Gtw1Qpc0GFfJgN0cppaXfe5lDS6BWL2dPorhu3URfXKu84ATLwGmNhqLDY7zh/zPvLtG2m" +
-        "izaMLC6ZwZL5KELpYpcP15EHPDquyP1xpV3fT17GjpG9IH8k";
-    public static final String Intermediate_CRL_1_RL_03_03_crl = 
-        "MIIBcDCB2gIBATANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS" +
-        "5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNV" +
-        "BAMTDENBMS1STC4wMi4wMRcNOTkwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMTAwWjAjMCECAg" +
-        "C0Fw05OTAxMDExMjAwMDBaMAwwCgYDVR0VBAMKAQGgIzAhMAoGA1UdFAQDAgEBMBMGA1Ud" +
-        "IwQMMAqACHYt39LYdEn0MA0GCSqGSIb3DQEBBQUAA4GBAI3HsXanos/N6uO3QVUaBZzmCt" +
-        "w1HCHMrLVG614YlUQiEedQ/oEc7dwCeD1rUbGNVkFPIRvMkmUQo1klhKAlEUmrtW+aH+If" +
-        "6oqumifqxvaycWidacbgNLIAMQtlQmniPF6Pq0dv8sNeKq4CE0gjRHOPJ2zIqy3kJ3tZYB" +
-        "pTguwO";
-    public static final String Intermediate_CRL_2_RL_03_03_crl = 
-        "MIIBSzCBtQIBATANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS" +
-        "5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNV" +
-        "BAMTDENBMS1STC4wMy4wMxcNOTkwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMTAwWqAjMCEwCg" +
-        "YDVR0UBAMCAQEwEwYDVR0jBAwwCoAIdi3f0th0SfQwDQYJKoZIhvcNAQEFBQADgYEAXZSZ" +
-        "ySsD7U6ETy9ZRmiKUCJMUV9CIhCY0mEihHjW0DhFTyV1Hr01yN5zUr/IFVuP/Xcx36IX4l" +
-        "dVv6/MgR1GeM/BUGZhm4z6YwfAosZ1N3zayIy/pP3fa1rVRl8cgCxc/8qxg9nH9p6yPpxM" +
-        "AOOu6TLYquk/dA7wJPEW7MPixXY=";
-    public static final String End_Certificate_RL_03_03_crt = 
-        "MIIChzCCAfCgAwIBAgICALQwDQYJKoZIhvcNAQEFBQAwXjELMAkGA1UEBhMCVVMxGDAWBg" +
-        "NVBAoTD1UuUy4gR292ZXJubWVudDEMMAoGA1UECxMDRG9kMRAwDgYDVQQLEwdUZXN0aW5n" +
-        "MRUwEwYDVQQDEwxDQTEtUkwuMDMuMDMwHhcNOTgwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMT" +
-        "AwWjBgMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQL" +
-        "EwNEb0QxEDAOBgNVBAsTB1Rlc3RpbmcxFzAVBgNVBAMTDlVzZXIxLVJMLjAzLjAzMIGfMA" +
-        "0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC5LNxAB+lm514Hk2ykrFUb7fCX0ryIEMg0mgeT" +
-        "/z8Iw7xisht57koK4PTXY863aunfNNh+8oFTHZnoLB5dbkROj1nFRgcWPezzv1wNkZEpxn" +
-        "NINtTPBogW22NPznoZ/rSk9JRFe0sCOVazkW9tZbY2ARqyJsYU1ez5tQIkDS47kQIDAQAB" +
-        "o1IwUDAOBgNVHQ8BAf8EBAMCBeAwFgYDVR0gBA8wDTALBglghkgBZQMBMAEwEQYDVR0OBA" +
-        "oECMWddsi+qmxKMBMGA1UdIwQMMAqACHYt39LYdEn0MA0GCSqGSIb3DQEBBQUAA4GBAAv8" +
-        "nrJaqEycAyIKdPBYTUqaxjkv4SmonDDJG9OqvD78/o9hUKKteoMkNUp8eexTkWk0L72L4N" +
-        "/eXB30+m65E841V+Dy8L4bXh15n4qz4cyMt8Kvm7nbCqcgpiyBJmBxzfaXDLSthlmhcJ4X" +
-        "zDFnav1LEw5fZklt7cnMl4YvLD8d";
-    public static final String[] TEST_67_DATA = new String[] {
-        Intermediate_Certificate_RL_03_03_crt,
-        Intermediate_CRL_1_RL_03_03_crl,
-        Intermediate_CRL_2_RL_03_03_crl,
-        End_Certificate_RL_03_03_crt
-    };
-
-    /*  
-     *  test68
-     *  
-     */ 
-
-    public static final String Intermediate_Certificate_1_RL_05_01_crt = 
-        "MIICljCCAf+gAwIBAgICALUwDQYJKoZIhvcNAQEFBQAwXjELMAkGA1UEBhMCVVMxGDAWBg" +
-        "NVBAoTD1UuUy4gR292ZXJubWVudDEMMAoGA1UECxMDRG9EMRAwDgYDVQQLEwdUZXN0aW5n" +
-        "MRUwEwYDVQQDEwxUcnVzdCBBbmNob3IwHhcNOTgwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMT" +
-        "AwWjBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQL" +
-        "EwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNVBAMTDENBMS1STC4wNS4wMTCBnzANBg" +
-        "kqhkiG9w0BAQEFAAOBjQAwgYkCgYEA59vHTe5A9AcT237mW7HdSfh8Pu4P2wJNLT7RXczN" +
-        "7DD/P6mAkugSgPTXwwlE1oSB/hCxAtEPhwONYZFYlRClFJidHDdVApalB7UbosTghsUzAg" +
-        "Lqw7NL+w9i3Un2G7JM2oWwugozQn/1hzr2Cii2TIB6K0RWKoPBJvaWUURS/G8CAwEAAaNj" +
-        "MGEwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwFgYDVR0gBA8wDTALBglghk" +
-        "gBZQMBMAEwEQYDVR0OBAoECP55Cc4eBca8MBMGA1UdIwQMMAqACKua6/nC51SPMA0GCSqG" +
-        "SIb3DQEBBQUAA4GBALX594y5uF4Rt7CoRHeKZ5h8QiG7mc+kQDMjaSU4KJwNVVL0mJatQG" +
-        "w90yFfhvprlgDt9UIAvpF6z5gysbrjHXJaEhVlXeg9D5mcxsL4THEc8f6oU1GjfT/SOD9l" +
-        "QrT/keX3D9lcFEaTOgi0HIZ7aFIJgoWjXF/9kNNMEAs8sJNI";
-    public static final String Intermediate_Certificate_2_RL_05_01_crt = 
-        "MIICljCCAf+gAwIBAgICALYwDQYJKoZIhvcNAQEFBQAwXjELMAkGA1UEBhMCVVMxGDAWBg" +
-        "NVBAoTD1UuUy4gR292ZXJubWVudDEMMAoGA1UECxMDRG9kMRAwDgYDVQQLEwdUZXN0aW5n" +
-        "MRUwEwYDVQQDEwxDQTEtUkwuMDUuMDEwHhcNOTgwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMT" +
-        "AwWjBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQL" +
-        "EwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNVBAMTDENBMi1STC4wNS4wMTCBnzANBg" +
-        "kqhkiG9w0BAQEFAAOBjQAwgYkCgYEAtl4hX6HlF0M+lSBTG8jHiB06hOy87LL81yAE2JQt" +
-        "/6F+LZjuOBTCIc2yO2bVM3XzUnjyYDBYGnBFp/7XpRoiADuPJSfmkzmezpyJc+hm96UR1g" +
-        "Bpo+pPKbRTWuM+FYy+vPtaDk5wKOrmyNx440PwbzxTN3JeWz17xeYE98bXMc0CAwEAAaNj" +
-        "MGEwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwFgYDVR0gBA8wDTALBglghk" +
-        "gBZQMBMAEwEQYDVR0OBAoECJOjtwEYV9VSMBMGA1UdIwQMMAqACP55Cc4eBca8MA0GCSqG" +
-        "SIb3DQEBBQUAA4GBAFbkOffoIjWSfxEuKszoK7Fj27Hf5jlV92xqXtBLURjNGi9jCLUIUd" +
-        "QLnONZLJYo70Z6XaGjpAK1EtZKVWsz11JDq5egE1zNES//9Tz8xDtJ7Lcq0mwneVFxmBuL" +
-        "gxkw4GKbBFKz10FoSP7VJWaeW080WwKnp96Me5GtZRe260N1";
-    public static final String Intermediate_CRL_1_RL_05_01_crl = 
-        "MIIBhTCB7wIBATANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS" +
-        "5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNV" +
-        "BAMTDENBMS1STC4wNS4wMRcNOTkwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMTAwWjA4MDYCAg" +
-        "C2Fw05OTAxMDExMjAwMDBaMCEwCgYDVR0VBAMKAQEwEwYJYIZIAWUCAQwCAQH/BAMCAQCg" +
-        "IzAhMAoGA1UdFAQDAgEBMBMGA1UdIwQMMAqACP55Cc4eBca8MA0GCSqGSIb3DQEBBQUAA4" +
-        "GBAIdOaBfpAEKWLrSvepVjk3UTfEfsSP6y+kFMl33YXy18xUvVpLarGu6YjQIpXiL+ulkP" +
-        "eF8TAc9AarUjvDf0kcslIOt3NhdMxR4/F614Ds/rPEXs4c7n4kCkvAlFg/19iIFeCaynx3" +
-        "X0s/v1SwzgAUHi3P+OwAGDApDTyKbnmzvt";
-    public static final String Intermediate_CRL_2_RL_05_01_crl = 
-        "MIIBSzCBtQIBATANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS" +
-        "5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNV" +
-        "BAMTDENBMi1STC4wNS4wMRcNOTkwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMTAwWqAjMCEwCg" +
-        "YDVR0UBAMCAQEwEwYDVR0jBAwwCoAIk6O3ARhX1VIwDQYJKoZIhvcNAQEFBQADgYEAfOOd" +
-        "JiLUCFSurAafQEBfxE9KVrgFC+W9m64cmERicO1QL9aDVIDGJAIY1pdvWVdhLBIKwSugwB" +
-        "ZH3ToptY+VizvFN1gkKGL2OuvDsXPHn1+QgmqvxYFPmvwDcwuxZ/3zD1VeHgEIKo9ugRnW" +
-        "F8G2Ph6SWUxJCjJQpB7WIbydowI=";
-    public static final String End_Certificate_RL_05_01_crt = 
-        "MIIChzCCAfCgAwIBAgICALcwDQYJKoZIhvcNAQEFBQAwXjELMAkGA1UEBhMCVVMxGDAWBg" +
-        "NVBAoTD1UuUy4gR292ZXJubWVudDEMMAoGA1UECxMDRG9kMRAwDgYDVQQLEwdUZXN0aW5n" +
-        "MRUwEwYDVQQDEwxDQTItUkwuMDUuMDEwHhcNOTgwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMT" +
-        "AwWjBgMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQL" +
-        "EwNEb0QxEDAOBgNVBAsTB1Rlc3RpbmcxFzAVBgNVBAMTDlVzZXIxLVJMLjA1LjAxMIGfMA" +
-        "0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC9NWkW/mia20c5gM3DpcTsBWTNC/d/Cob+OVrS" +
-        "lYytMjK4htO3MavavMZNTLAYFCXWhZ+Uo/uiAF0ddE4HaFI418eKJMSSbQyed0TG5Udw/t" +
-        "3dhYeLzLEmVc0r00q5v+CLINsCNQAKaPV71UvoHrE092zZjmtacuAetBS1Q2ufpwIDAQAB" +
-        "o1IwUDAOBgNVHQ8BAf8EBAMCBeAwFgYDVR0gBA8wDTALBglghkgBZQMBMAEwEQYDVR0OBA" +
-        "oECGNPOXdCLpZ3MBMGA1UdIwQMMAqACJOjtwEYV9VSMA0GCSqGSIb3DQEBBQUAA4GBALTo" +
-        "hfBEPdzZ6A9QNStakOhmhHYox70xOPuWqzSbIugZv4chKXNQGiUAoOGImTw1mcun/uPNtd" +
-        "0bT+O+a9yX5gzW55CSmR/teHkTkND1mJhOMuYOmaCaBHnqgIIe1iEhMZQgag70+/tSmmQm" +
-        "UpWGpxeK2c02tBK6gEmnqk75bKRT";
-    public static final String[] TEST_68_DATA = new String[] {
-        Intermediate_Certificate_1_RL_05_01_crt,
-        Intermediate_Certificate_2_RL_05_01_crt,
-        Intermediate_CRL_1_RL_05_01_crl,
-        Intermediate_CRL_2_RL_05_01_crl,
-        End_Certificate_RL_05_01_crt
-    };
-
-    /*  
-     *  test69
-     *  
-     */ 
-
-    public static final String Intermediate_Certificate_RL_05_02_crt = 
-        "MIICljCCAf+gAwIBAgICALgwDQYJKoZIhvcNAQEFBQAwXjELMAkGA1UEBhMCVVMxGDAWBg" +
-        "NVBAoTD1UuUy4gR292ZXJubWVudDEMMAoGA1UECxMDRG9EMRAwDgYDVQQLEwdUZXN0aW5n" +
-        "MRUwEwYDVQQDEwxUcnVzdCBBbmNob3IwHhcNOTgwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMT" +
-        "AwWjBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQL" +
-        "EwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNVBAMTDENBMS1STC4wNS4wMjCBnzANBg" +
-        "kqhkiG9w0BAQEFAAOBjQAwgYkCgYEAouNcO1wHvKHPR15L7Fohr/QbTkPWGr9QYp2MXEDy" +
-        "BRGHt63Ob+yNvsP/C74GJA+PzvcRELSnJxmBVbdRN5y/u4S6Zt4yTTcrvp4vl//luoGLOX" +
-        "NHhCXbrGavyoP/iKpbfP7fy948AN34i95HuZENoGPjG5stX0uk12P087S2tPcCAwEAAaNj" +
-        "MGEwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwFgYDVR0gBA8wDTALBglghk" +
-        "gBZQMBMAEwEQYDVR0OBAoECFi86MGPmMsXMBMGA1UdIwQMMAqACKua6/nC51SPMA0GCSqG" +
-        "SIb3DQEBBQUAA4GBAFVZVMZEsaVuL0qX5Ls94+x8gBklxPfxgfG5LeBR2/YcqW+7BhsVA1" +
-        "GQhjBtwqCU9SOL16oTrqgw2+YeWBjaYuNYVlxfdifd0pQydpE1iDQWxmoKLzSDmtWgRYhz" +
-        "v0TB6j8q+0x5Q0OOrHX0jdIiBnHrLmReCK8dY1x6fb6I0tTH";
-    public static final String Intermediate_CRL_RL_05_02_crl = 
-        "MIIBhTCB7wIBATANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS" +
-        "5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNV" +
-        "BAMTDENBMS1STC4wNS4wMhcNOTkwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMTAwWjA4MDYCAg" +
-        "C5Fw05OTAxMDExMjAwMDBaMCEwCgYDVR0VBAMKAQEwEwYJYIZIAWUCAQwCAQH/BAMCAQCg" +
-        "IzAhMAoGA1UdFAQDAgEBMBMGA1UdIwQMMAqACFi86MGPmMsXMA0GCSqGSIb3DQEBBQUAA4" +
-        "GBAFMN6PWjz2bA1RRySYNXde2rKiYkZYghbtT4ig2yDJBKOiPnjdx+jriFJxGYpt7BvcNx" +
-        "cDfijmDZ1clzprIvz0lFO6IwsQiWtLxOz4Doj6K2AD+7IxuGLceaXmubvi4e6VVC3xXGsu" +
-        "OYsNgFzsdUXIazi74+eOcj4dqrHAepbhXT";
-    public static final String End_Certificate_RL_05_02_crt = 
-        "MIIChzCCAfCgAwIBAgICALkwDQYJKoZIhvcNAQEFBQAwXjELMAkGA1UEBhMCVVMxGDAWBg" +
-        "NVBAoTD1UuUy4gR292ZXJubWVudDEMMAoGA1UECxMDRG9kMRAwDgYDVQQLEwdUZXN0aW5n" +
-        "MRUwEwYDVQQDEwxDQTEtUkwuMDUuMDIwHhcNOTgwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMT" +
-        "AwWjBgMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQL" +
-        "EwNEb0QxEDAOBgNVBAsTB1Rlc3RpbmcxFzAVBgNVBAMTDlVzZXIxLVJMLjA1LjAyMIGfMA" +
-        "0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCuWE1aFx3Zjk6gM0Wy6ijcUegbiGvhjBgqIGwv" +
-        "YissT0v3KGAKoh5wGeKC+rePQNbZ91j4XDLvUNUdNw8HVNdNG/igIwsuaJ9teKSbqrAw9X" +
-        "aD2YjJz/I6X6WXFd/eQ+g9lY3eidOXJkglYSwWMxUV62RUZbGyqjR1so+XpmYxCQIDAQAB" +
-        "o1IwUDAOBgNVHQ8BAf8EBAMCBeAwFgYDVR0gBA8wDTALBglghkgBZQMBMAEwEQYDVR0OBA" +
-        "oECLLbuNyVkkK9MBMGA1UdIwQMMAqACFi86MGPmMsXMA0GCSqGSIb3DQEBBQUAA4GBACKt" +
-        "GgxIRXYHZGZgwYHjNzquM1pUJTbxxm3qYA4U6r44oAo1UzQTDpHOalflreGFvG05l1BCnQ" +
-        "olQ8rcXU25v/CDfyww7cl8l7IxjYz7PNht7R97vjfMVqqButbn+BmU6D5kR9YXDCDPzaQ5" +
-        "DrKNk+3tIjJNj6YhxhqC2tPG9RIN";
-    public static final String[] TEST_69_DATA = new String[] {
-        Intermediate_Certificate_RL_05_02_crt,
-        Intermediate_CRL_RL_05_02_crl,
-        End_Certificate_RL_05_02_crt
-    };
-
-    /*  
-     *  test70
-     *  
-     */ 
-
-    public static final String Intermediate_Certificate_1_RL_06_01_crt = 
-        "MIICljCCAf+gAwIBAgICALowDQYJKoZIhvcNAQEFBQAwXjELMAkGA1UEBhMCVVMxGDAWBg" +
-        "NVBAoTD1UuUy4gR292ZXJubWVudDEMMAoGA1UECxMDRG9EMRAwDgYDVQQLEwdUZXN0aW5n" +
-        "MRUwEwYDVQQDEwxUcnVzdCBBbmNob3IwHhcNOTgwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMT" +
-        "AwWjBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQL" +
-        "EwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNVBAMTDENBMS1STC4wNi4wMTCBnzANBg" +
-        "kqhkiG9w0BAQEFAAOBjQAwgYkCgYEAmhxr4ckU5C3E57odZjgcxl46ZF2QVy+K86YoLOGT" +
-        "mq34NSHTFxP93mrNqMYdFKFedUTNI68HkecFVvVKoXsDNBnhyyCTQ3xXhBcMUXFByB+55k" +
-        "W5LeQ8l1G2ugsyZ7Z+P8uylrpeGJt4RjOTilhcI2mnfZ7S+arFGe4KYgnsaFUCAwEAAaNj" +
-        "MGEwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwFgYDVR0gBA8wDTALBglghk" +
-        "gBZQMBMAEwEQYDVR0OBAoECOS4X3XqhyJYMBMGA1UdIwQMMAqACKua6/nC51SPMA0GCSqG" +
-        "SIb3DQEBBQUAA4GBALCPtNwXGxVSUNGErkBHSYCHyqlA55jKQQvZ4P0PznWEQ/gBJx34hq" +
-        "LxiBO2G+iDomzHszeM77TXkQBpNxCUw26Jxv2HuvyBXuSprgjw5F1tvLqwsBAnD5vsb0uD" +
-        "NrkKIzJSIBFQ1SRhuCObaXnamfPJHBmkP25t4QqEvoXMtVHB";
-    public static final String Intermediate_Certificate_2_RL_06_01_crt = 
-        "MIICljCCAf+gAwIBAgICALswDQYJKoZIhvcNAQEFBQAwXjELMAkGA1UEBhMCVVMxGDAWBg" +
-        "NVBAoTD1UuUy4gR292ZXJubWVudDEMMAoGA1UECxMDRG9kMRAwDgYDVQQLEwdUZXN0aW5n" +
-        "MRUwEwYDVQQDEwxDQTEtUkwuMDYuMDEwHhcNOTgwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMT" +
-        "AwWjBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQL" +
-        "EwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNVBAMTDENBMi1STC4wNi4wMTCBnzANBg" +
-        "kqhkiG9w0BAQEFAAOBjQAwgYkCgYEA2IKrW6HDZJVFw3e4cC7v/jPGXAexI4B88707NhAc" +
-        "qxSVfGTPJBdfWo5pkptZKN5/L5n6+rixLItHnei/uwBCHvhwzeEIGo1yVCgz6R2MoNB966" +
-        "Q5CHWfT43BUjp0rZLJkK4hVKNyXB78NVv2Fly+XWBDEnzQvgVPWbGOvzE3zh0CAwEAAaNj" +
-        "MGEwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwFgYDVR0gBA8wDTALBglghk" +
-        "gBZQMBMAEwEQYDVR0OBAoECK/1z9Xbu2jGMBMGA1UdIwQMMAqACOS4X3XqhyJYMA0GCSqG" +
-        "SIb3DQEBBQUAA4GBAAa/MVC+8ozm9py40a4o/kHbkkmFNQr4s9yi3KXXuVxsNvquFMXm4a" +
-        "gC8GPoNjvV+RPRmU8wOM6I2/PPl2JEQRb7NDM8LkY/m/Au4GHVeln6FKlldiRm0A+YIr19" +
-        "ip2RHOldikAjUUYv7JT3SP34sjtq2e8bsXfWEPG5BA/wxtm7";
-    public static final String Intermediate_CRL_1_RL_06_01_crl = 
-        "MIIBhTCB7wIBATANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS" +
-        "5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNV" +
-        "BAMTDENBMS1STC4wNi4wMRcNOTkwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMTAwWjAjMCECAg" +
-        "C7Fw05OTAxMDExMjAwMDBaMAwwCgYDVR0VBAMKAQGgODA2MAoGA1UdFAQDAgEBMBMGCWCG" +
-        "SAFlAgEMAgEB/wQDAgEAMBMGA1UdIwQMMAqACOS4X3XqhyJYMA0GCSqGSIb3DQEBBQUAA4" +
-        "GBAJSexboWDaqLVY6iiWt8ZX5GwuNwDBN1R2TgM95H7JqjMgoWML887dKk24p4eKACFMWI" +
-        "Ji9nwsqdZ/h1FtPhYpSoJ8l8vo4imMKr+tTnMngDNpMMZPQyRY1AK1jSrLhEtUdjiEtrTY" +
-        "rG56RNt4YyUtNxxfkEymvwJxmO/4YcAz/l";
-    public static final String Intermediate_CRL_2_RL_06_01_crl = 
-        "MIIBSzCBtQIBATANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS" +
-        "5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNV" +
-        "BAMTDENBMi1STC4wNi4wMRcNOTkwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMTAwWqAjMCEwCg" +
-        "YDVR0UBAMCAQEwEwYDVR0jBAwwCoAIr/XP1du7aMYwDQYJKoZIhvcNAQEFBQADgYEAImRg" +
-        "n9A7px9exOJL4Se9jsSHzZ3sAd3y16LdAb+HLtYLl1swNB4KPE+OebtzEoYiSzVVwezdlm" +
-        "5WseZjfbd0q01srZI4FeACZe99iBSpKymdKxw2gRvfYZ8ZMwFpK2mQq9cmygFn53iOwP7j" +
-        "3KE+lllielu7sYyEnkliF9wsaG0=";
-    public static final String End_Certificate_RL_06_01_crt = 
-        "MIIChzCCAfCgAwIBAgICALwwDQYJKoZIhvcNAQEFBQAwXjELMAkGA1UEBhMCVVMxGDAWBg" +
-        "NVBAoTD1UuUy4gR292ZXJubWVudDEMMAoGA1UECxMDRG9kMRAwDgYDVQQLEwdUZXN0aW5n" +
-        "MRUwEwYDVQQDEwxDQTItUkwuMDYuMDEwHhcNOTgwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMT" +
-        "AwWjBgMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQL" +
-        "EwNEb0QxEDAOBgNVBAsTB1Rlc3RpbmcxFzAVBgNVBAMTDlVzZXIxLVJMLjA2LjAxMIGfMA" +
-        "0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDZVBNzD7LZW6mC2GSbVPjpcJ7sWISYsL2eHqXb" +
-        "/PuxtbOneOjYqx0GeL9pxDGSSNl2NrlG0G1HTU2MaEOVA6h96W9e5ADV/pzGPMr97z+3BV" +
-        "unxLX+ciM3T7rUQm/LueQTEC2Ww19T6QOg2i8rEadYT0OoW6OcvyuomemspxgClQIDAQAB" +
-        "o1IwUDAOBgNVHQ8BAf8EBAMCBeAwFgYDVR0gBA8wDTALBglghkgBZQMBMAEwEQYDVR0OBA" +
-        "oECK5pHDrhL7xjMBMGA1UdIwQMMAqACK/1z9Xbu2jGMA0GCSqGSIb3DQEBBQUAA4GBAF3J" +
-        "Kskjs4jp+BBoei9YWYtmOupn9w3oGyhknNh2jz7api5Gtgk2SyKfYFvN6EhWZJEab0hPFe" +
-        "WuYwO7zNCLGHw0cFXT/R48ogd6JkH6xDwj4afZDkWVTu8oaVD4h1rTYS6WPRzizAozOzhi" +
-        "tmIo+MV/lCG8+jdVtFgeKycI8aX7";
-    public static final String[] TEST_70_DATA = new String[] {
-        Intermediate_Certificate_1_RL_06_01_crt,
-        Intermediate_Certificate_2_RL_06_01_crt,
-        Intermediate_CRL_1_RL_06_01_crl,
-        Intermediate_CRL_2_RL_06_01_crl,
-        End_Certificate_RL_06_01_crt
-    };
-
-    /*  
-     *  test71
-     *  
-     */ 
-
-    public static final String Intermediate_Certificate_RL_06_02_crt = 
-        "MIICljCCAf+gAwIBAgICAL0wDQYJKoZIhvcNAQEFBQAwXjELMAkGA1UEBhMCVVMxGDAWBg" +
-        "NVBAoTD1UuUy4gR292ZXJubWVudDEMMAoGA1UECxMDRG9EMRAwDgYDVQQLEwdUZXN0aW5n" +
-        "MRUwEwYDVQQDEwxUcnVzdCBBbmNob3IwHhcNOTgwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMT" +
-        "AwWjBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQL" +
-        "EwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNVBAMTDENBMS1STC4wNi4wMjCBnzANBg" +
-        "kqhkiG9w0BAQEFAAOBjQAwgYkCgYEAxMlJ0vbkMRGzuEDTDGuPmwDzU1xn3dFDZ1Tx6ONP" +
-        "fwNN5gk6r9kYl5TZ8f5TbkQSnOzyhDSqX8dGumCSgukETXtYBU2+KiIAtliu5NJRbXe3La" +
-        "vn102HxaHDLGsR0FFLiFM9GVhOOXryJoXoGZqUwvqbWyaQQEzrV4RWmuOv7xMCAwEAAaNj" +
-        "MGEwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwFgYDVR0gBA8wDTALBglghk" +
-        "gBZQMBMAEwEQYDVR0OBAoECFNaMo88Vb5MMBMGA1UdIwQMMAqACKua6/nC51SPMA0GCSqG" +
-        "SIb3DQEBBQUAA4GBAJsjJG4/U1OWCJPB1u7UD3TPKRgOR9hT5l3LzFw5s0CEGt2Beg25LP" +
-        "GEGcr0sEdosVQI5m5CuPolpmlQv0FkZv5M1W+uXX+F/6edtMDEquDpdR97ihQSLZjFFqjE" +
-        "ytuaD4gqtL/BKBbz3e93mOmR9Wi+kWlXOYl0j8wpU9ePSjDV";
-    public static final String Intermediate_CRL_RL_06_02_crl = 
-        "MIIBhTCB7wIBATANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS" +
-        "5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNV" +
-        "BAMTDENBMS1STC4wNi4wMhcNOTkwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMTAwWjAjMCECAg" +
-        "C+Fw05OTAxMDExMjAwMDBaMAwwCgYDVR0VBAMKAQGgODA2MAoGA1UdFAQDAgEBMBMGCWCG" +
-        "SAFlAgEMAgEB/wQDAgEAMBMGA1UdIwQMMAqACFNaMo88Vb5MMA0GCSqGSIb3DQEBBQUAA4" +
-        "GBAAKNj5xmtE7wzO1p5igiAmCDV6KuYsiPAQPHPEBlmo85vzvWv2hpEtmk4nDhehogl0QX" +
-        "rhvRRqR+cPE5vBLB8mAStW+ZR6FXQPnmU5qGHqCQ4Wh6TWZesd7oyftoS7bJD5Xdf5ErA9" +
-        "qijWoz8FgxZHVnAFmjA0rUINkdQ5JfE5oj";
-    public static final String End_Certificate_RL_06_02_crt = 
-        "MIIChzCCAfCgAwIBAgICAL4wDQYJKoZIhvcNAQEFBQAwXjELMAkGA1UEBhMCVVMxGDAWBg" +
-        "NVBAoTD1UuUy4gR292ZXJubWVudDEMMAoGA1UECxMDRG9kMRAwDgYDVQQLEwdUZXN0aW5n" +
-        "MRUwEwYDVQQDEwxDQTEtUkwuMDYuMDIwHhcNOTgwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMT" +
-        "AwWjBgMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQL" +
-        "EwNEb0QxEDAOBgNVBAsTB1Rlc3RpbmcxFzAVBgNVBAMTDlVzZXIxLVJMLjA2LjAyMIGfMA" +
-        "0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQD3UzwrnwKRlP00Pn49iI35S0wLn7c1I3rsmzdm" +
-        "YFicetxHNeOKXLg1CN1bqkbAJ+N39fKjrkusqb2T+R3zhAV5LeLT4fzbHYdU7f4r6xgW2/" +
-        "b2WLv+QVR+ldTsVxgPp/ZUgYi4/vAow4Q/6IT+zWtlawMBob/nLjVl+jQ9N4coFwIDAQAB" +
-        "o1IwUDAOBgNVHQ8BAf8EBAMCBeAwFgYDVR0gBA8wDTALBglghkgBZQMBMAEwEQYDVR0OBA" +
-        "oECPhq75noL+9WMBMGA1UdIwQMMAqACFNaMo88Vb5MMA0GCSqGSIb3DQEBBQUAA4GBAIU2" +
-        "5bLX/NyDC8dKUxRwVn8oc3YPQjK0zXGdUr15Ib+cLdRyFVCuAyxVdpTf/csuga6tDhGuTL" +
-        "B18mTE/fAjhUOiKiOLD6m4P77Nj67l2NTi86RimsI/Z6r5+bU31ahrls/7kr788+f4oEIY" +
-        "TyOJecojsJUOG3qzK9J50iszclxg";
-    public static final String[] TEST_71_DATA = new String[] {
-        Intermediate_Certificate_RL_06_02_crt,
-        Intermediate_CRL_RL_06_02_crl,
-        End_Certificate_RL_06_02_crt
-    };
-
-    /*  
-     *  test72
-     *  
-     */ 
-
-    public static final String Intermediate_Certificate_RL_07_01_crt = 
-        "MIICljCCAf+gAwIBAgICAL8wDQYJKoZIhvcNAQEFBQAwXjELMAkGA1UEBhMCVVMxGDAWBg" +
-        "NVBAoTD1UuUy4gR292ZXJubWVudDEMMAoGA1UECxMDRG9EMRAwDgYDVQQLEwdUZXN0aW5n" +
-        "MRUwEwYDVQQDEwxUcnVzdCBBbmNob3IwHhcNOTgwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMT" +
-        "AwWjBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQL" +
-        "EwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNVBAMTDENBMS1STC4wNy4wMTCBnzANBg" +
-        "kqhkiG9w0BAQEFAAOBjQAwgYkCgYEAxjHxSRwJjEkLG9Al5uSQ22QI8N/hJ8hhkhh9qlaJ" +
-        "mHusM8sWpAp2vnuumlThTA2zZbptXZ8Krb7i/Kpym4wo3ZkEThwi/ijsM5QCunQJmESRGD" +
-        "yPZJjfhWjoC+lCjbmzsOGLMETpgSEMy+EyoXkRCnKmXcmCMS8HjLrqdnwiWBUCAwEAAaNj" +
-        "MGEwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwFgYDVR0gBA8wDTALBglghk" +
-        "gBZQMBMAEwEQYDVR0OBAoECHPEkeIs8GuwMBMGA1UdIwQMMAqACKua6/nC51SPMA0GCSqG" +
-        "SIb3DQEBBQUAA4GBABCmgEnb8dfnG9lWQKT5BmQm459WqRQAiqdfqf9w0qRMuVrdfLMwqx" +
-        "oq4uh10A3d+auHohgT2fT9RzNaWnRoNaH9K6qLQsdCUZdqjbEGdyiIFzvWP9MkV9nhDlo2" +
-        "GgiU68HfnpKO/WA9EaRHyEzwT9o4SA7hAbz+3L12hB2WLSOg";
-    public static final String Intermediate_CRL_RL_07_01_crl = 
-        "MIIBSzCBtQIBATANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS" +
-        "5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNV" +
-        "BAMTDENBMS1STC4wNy4wMRcNOTgwMTAxMDYwMTAwWhcNOTgwMTAxMTIwMTAwWqAjMCEwCg" +
-        "YDVR0UBAMCAQEwEwYDVR0jBAwwCoAIc8SR4izwa7AwDQYJKoZIhvcNAQEFBQADgYEAOyZr" +
-        "f1tRnuzoq7dgQo+eOYhb5JyRyrNaSwNnRy82wOP+/G3NH8V3NGonDFOOcd9SoLTbeW4o71" +
-        "vdOrKZgom5H2MZK5M4wTdfPAfXB1wBxOMzW5jXzsRtaha4l6EPI+GVL0eXN+aW3k/pscdA" +
-        "ToI+OxTmRRnCYS6yW3qL9RoTIXQ=";
-    public static final String End_Certificate_RL_07_01_crt = 
-        "MIIChzCCAfCgAwIBAgICAMAwDQYJKoZIhvcNAQEFBQAwXjELMAkGA1UEBhMCVVMxGDAWBg" +
-        "NVBAoTD1UuUy4gR292ZXJubWVudDEMMAoGA1UECxMDRG9kMRAwDgYDVQQLEwdUZXN0aW5n" +
-        "MRUwEwYDVQQDEwxDQTEtUkwuMDcuMDEwHhcNOTgwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMT" +
-        "AwWjBgMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQL" +
-        "EwNEb0QxEDAOBgNVBAsTB1Rlc3RpbmcxFzAVBgNVBAMTDlVzZXIxLVJMLjA3LjAxMIGfMA" +
-        "0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCrm/Zem9Tt2UJFUKdAhTNwvhLo03uOax74ZgbV" +
-        "YNTCpKeEWkV5d5d7DRC4mCTX1yjIlg6K4l7T+sRGI4XAcDRgYLuoyG1X958XCXSdIPTdbK" +
-        "Hxs/tFv4mrCwi1kU+zjyzDoqgjT6kUxgM39rfcvDMH6qSzHQKgTFp7Tj/DHiELqwIDAQAB" +
-        "o1IwUDAOBgNVHQ8BAf8EBAMCBeAwFgYDVR0gBA8wDTALBglghkgBZQMBMAEwEQYDVR0OBA" +
-        "oECGFR8c6rRbhcMBMGA1UdIwQMMAqACHPEkeIs8GuwMA0GCSqGSIb3DQEBBQUAA4GBAANZ" +
-        "TVR288mKpDDzm9XZMZ9+K1kPZ+eQYX+vUul11luVw27AIJGR8Fb4PIGl4+ALvqU3NQP/6v" +
-        "d+zvS7IfiR6q7aLS3w111BUCgDhTJAp3oSo12qfcp+2DB1M9QfjrM9nKgmh5bBJigdJwJM" +
-        "W8HHKStUMLdxg+qkZJgZpnyowCFM";
-    public static final String[] TEST_72_DATA = new String[] {
-        Intermediate_Certificate_RL_07_01_crt,
-        Intermediate_CRL_RL_07_01_crl,
-        End_Certificate_RL_07_01_crt
-    };
-
-    /*  
-     *  test73
-     *  
-     */ 
-
-    public static final String Intermediate_Certificate_RL_07_02_crt = 
-        "MIICljCCAf+gAwIBAgICAMEwDQYJKoZIhvcNAQEFBQAwXjELMAkGA1UEBhMCVVMxGDAWBg" +
-        "NVBAoTD1UuUy4gR292ZXJubWVudDEMMAoGA1UECxMDRG9EMRAwDgYDVQQLEwdUZXN0aW5n" +
-        "MRUwEwYDVQQDEwxUcnVzdCBBbmNob3IwHhcNNTAwMTAxMDYwMDMwWhcNNDgwMTAxMTIwMT" +
-        "AwWjBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQL" +
-        "EwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNVBAMTDENBMS1STC4wNy4wMjCBnzANBg" +
-        "kqhkiG9w0BAQEFAAOBjQAwgYkCgYEA0CvEneaAPtxZOTqlh/TXBM6V0bQgKbO58yEyURcO" +
-        "Zi7jzYsmNtN9Tsr0wAlD41/ZONsW4MMzZ13UCc0aGa+eE8XRULBe5cgaGxJKwVnEqz3W8z" +
-        "v1MjOk7Anb8TkxMSlWlptC6V3eRA85p5Id9gXbIrP3E3NuSfyx6246oLjNnbECAwEAAaNj" +
-        "MGEwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwFgYDVR0gBA8wDTALBglghk" +
-        "gBZQMBMAEwEQYDVR0OBAoECIb5Ia6wKcHtMBMGA1UdIwQMMAqACKua6/nC51SPMA0GCSqG" +
-        "SIb3DQEBBQUAA4GBAAYEHQY+Z4qv4bYLmd+sz4aNGwZF7FT6ZIQ43OSeb+t+ibL7rZ0X0y" +
-        "4SCTMs1mAB44IA6RFurmeCFk0ladRCn3A1xaVI1HlHen13ovzDA9ogL4CWbYXvCUv/znQY" +
-        "yVSQCTKwT8iVam8xS1MsNCe408iVjhRfR6u9Hi31M+Pf+AUe";
-    public static final String Intermediate_CRL_RL_07_02_crl = 
-        "MIIBSzCBtQIBATANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS" +
-        "5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNV" +
-        "BAMTDENBMS1STC4wNy4wMhcNNTAwMTAxMDYwMTAwWhcNNTAwMTAxMTIwMTAwWqAjMCEwCg" +
-        "YDVR0UBAMCAQEwEwYDVR0jBAwwCoAIhvkhrrApwe0wDQYJKoZIhvcNAQEFBQADgYEALVUq" +
-        "3Wq/Opvp9ifmQ4VXz4dgLNR+5Nz3muJ4RZt5R5b4R3RYllhgXNYw2EbEVCFjnfm97z73Ke" +
-        "wzVV+fo/u5GbqJHN2cAVEHarOpasLxySktNA1Cwq5OTzUF0dYISqYbyBvVcaOQBvU/Lwj7" +
-        "MQJJVVq96iDKnAJYBX03EHKbBeg=";
-    public static final String End_Certificate_RL_07_02_crt = 
-        "MIIChzCCAfCgAwIBAgICAMIwDQYJKoZIhvcNAQEFBQAwXjELMAkGA1UEBhMCVVMxGDAWBg" +
-        "NVBAoTD1UuUy4gR292ZXJubWVudDEMMAoGA1UECxMDRG9kMRAwDgYDVQQLEwdUZXN0aW5n" +
-        "MRUwEwYDVQQDEwxDQTEtUkwuMDcuMDIwHhcNOTgwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMT" +
-        "AwWjBgMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQL" +
-        "EwNEb0QxEDAOBgNVBAsTB1Rlc3RpbmcxFzAVBgNVBAMTDlVzZXIxLVJMLjA3LjAyMIGfMA" +
-        "0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQD6YgsbjW9IL7/SBORKssFUZBUxmluOpxJK/7d7" +
-        "JA2pxbg7L96xHFPWN36CYDJzTscNpbGrD3G2MPkg4GqoTo0rU28NYVzj4SwqYoSLIbXB+r" +
-        "SVgWcxNgbJ+4x9bK3YccNLR1PWEFxz1NckhCLBmb5pI4E34MCxQ6PvFO02I19FwQIDAQAB" +
-        "o1IwUDAOBgNVHQ8BAf8EBAMCBeAwFgYDVR0gBA8wDTALBglghkgBZQMBMAEwEQYDVR0OBA" +
-        "oECIutV9ItCIbZMBMGA1UdIwQMMAqACIb5Ia6wKcHtMA0GCSqGSIb3DQEBBQUAA4GBALQE" +
-        "cBr31h3jKUHcuf3yztr9NWUkGMDM0NCXHOpQl7JbV3P5BjvaiRYWlUrN7+92G8EaUFORto" +
-        "zp8GG+d/MvFooVQOvpOzyhautYWyqq3AWpZLppnxNk1mRAdjUAvJaONtv37eLsma0bhtLM" +
-        "j62sQQ6CdoKbMtIEGuJgpwWqHYwY";
-    public static final String[] TEST_73_DATA = new String[] {
-        Intermediate_Certificate_RL_07_02_crt,
-        Intermediate_CRL_RL_07_02_crl,
-        End_Certificate_RL_07_02_crt
-    };
-
-    /*  
-     *  test74
-     *  
-     */ 
-
-    public static final String Intermediate_Certificate_RL_07_03_crt = 
-        "MIICljCCAf+gAwIBAgICAMMwDQYJKoZIhvcNAQEFBQAwXjELMAkGA1UEBhMCVVMxGDAWBg" +
-        "NVBAoTD1UuUy4gR292ZXJubWVudDEMMAoGA1UECxMDRG9EMRAwDgYDVQQLEwdUZXN0aW5n" +
-        "MRUwEwYDVQQDEwxUcnVzdCBBbmNob3IwHhcNOTgwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMT" +
-        "AwWjBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQL" +
-        "EwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNVBAMTDENBMS1STC4wNy4wMzCBnzANBg" +
-        "kqhkiG9w0BAQEFAAOBjQAwgYkCgYEA8QzGjV0NVTNrOgkeqTkQFCOvl7M0qmjmYJjuw4R3" +
-        "YfQIXDN0m9HR2JKp5WKTSUedmWviGS7NbGSzLR7+6OkLwSoxN9PkA/fMko7O0KWBfduhvn" +
-        "jymlDMb2GPb1hBjScbq8fVJHwzqUm+BtEO2MXwXKYY2hZr+OEyEGhSEThp90MCAwEAAaNj" +
-        "MGEwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwFgYDVR0gBA8wDTALBglghk" +
-        "gBZQMBMAEwEQYDVR0OBAoECFwl2XphEZRSMBMGA1UdIwQMMAqACKua6/nC51SPMA0GCSqG" +
-        "SIb3DQEBBQUAA4GBAAb5GERgYVGuOb62gVZAAnhuk5K7CCkWZucOv6iI7pAgI6S7pvool/" +
-        "dXHC0tzgQ+/MkuWcr+22k/ya7f+iSfiYokjnQkgoYFYk3PkjyOXA3mzs5qhF0nOP6Gvmz4" +
-        "asONA+qZSqa4pjxF9Kn8L64f9yeyEXnckmbzdmbjAFCveQIP";
-    public static final String Intermediate_CRL_RL_07_03_crl = 
-        "MIIBTTCBtwIBATANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS" +
-        "5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNV" +
-        "BAMTDENBMS1STC4wNy4wMxcNOTkwMTAxMDYwMTAwWhgPMjA1MDAxMDExMjAxMDBaoCMwIT" +
-        "AKBgNVHRQEAwIBATATBgNVHSMEDDAKgAhcJdl6YRGUUjANBgkqhkiG9w0BAQUFAAOBgQAz" +
-        "DMl8P16hylNkUEw4z9//PJFObNPZCYdmzBfp0K3tNRrOAouUVegyX0gDHi8O+bmmJNgcnC" +
-        "tMRXx+D4qP7bx5fDS2MVQhSsncf6u4UZ8pxbRc0JmwR5oGZLPQabrctgmEmg8ZKGApKtsf" +
-        "pGyvvTwaAzM+GaWXD68bBEN3VfVdeQ==";
-    public static final String End_Certificate_RL_07_03_crt = 
-        "MIIChzCCAfCgAwIBAgICAMQwDQYJKoZIhvcNAQEFBQAwXjELMAkGA1UEBhMCVVMxGDAWBg" +
-        "NVBAoTD1UuUy4gR292ZXJubWVudDEMMAoGA1UECxMDRG9kMRAwDgYDVQQLEwdUZXN0aW5n" +
-        "MRUwEwYDVQQDEwxDQTEtUkwuMDcuMDMwHhcNOTgwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMT" +
-        "AwWjBgMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQL" +
-        "EwNEb0QxEDAOBgNVBAsTB1Rlc3RpbmcxFzAVBgNVBAMTDlVzZXIxLVJMLjA3LjAzMIGfMA" +
-        "0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDU6mec24uBaVip7fFWHas+o/lpZBOfj/IPHXQ9" +
-        "QaRZwmJZBB81AX3BJ60DD12o/+RXdHl7B2Eh9kYv/QEXOKmyhJFSPa0Lv7MQ/hCIcL4m1U" +
-        "FDGtJ3SUixZMqVBP0xjwXoNS88zzaCBL+co2TxhBrYMzeNQOX1eEkXMT4pvULmAwIDAQAB" +
-        "o1IwUDAOBgNVHQ8BAf8EBAMCBeAwFgYDVR0gBA8wDTALBglghkgBZQMBMAEwEQYDVR0OBA" +
-        "oECBBgFdYLuvk9MBMGA1UdIwQMMAqACFwl2XphEZRSMA0GCSqGSIb3DQEBBQUAA4GBAAof" +
-        "dPOGa4ZxRPcLw6zWM/NLzF3XYDqXAsZBsC75r0GRrogqEYn07tVUDNaQczDtjRLBRNmxWE" +
-        "+qCkJwc+wOBJqOFUxcuhK9oag6OE94+UIHdh3Td9i2ELZXj9RSNchnjyFohj5gk1dJSO41" +
-        "86Ls3mCT9JcssR0dSxxkF0ENfZCG";
-    public static final String[] TEST_74_DATA = new String[] {
-        Intermediate_Certificate_RL_07_03_crt,
-        Intermediate_CRL_RL_07_03_crl,
-        End_Certificate_RL_07_03_crt
-    };
-
-    /*  
-     *  test75
-     *  
-     */ 
-
-    public static final String Intermediate_Certificate_RL_08_01_crt = 
-        "MIICljCCAf+gAwIBAgICAMUwDQYJKoZIhvcNAQEFBQAwXjELMAkGA1UEBhMCVVMxGDAWBg" +
-        "NVBAoTD1UuUy4gR292ZXJubWVudDEMMAoGA1UECxMDRG9EMRAwDgYDVQQLEwdUZXN0aW5n" +
-        "MRUwEwYDVQQDEwxUcnVzdCBBbmNob3IwHhcNOTgwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMT" +
-        "AwWjBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQL" +
-        "EwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNVBAMTDENBMS1STC4wOC4wMTCBnzANBg" +
-        "kqhkiG9w0BAQEFAAOBjQAwgYkCgYEAs2YRTEl3C1TmmneJ6K110nSACn+KXxSOTGAGN5xv" +
-        "XW751StpE2iEQIbRVPQdMzmcQX0bcg/WpdrewPQld9NRjFj7it+9YNQh7vMKhZwoAPoDmv" +
-        "TnTdTEuV0c1FLVDVhiaAD9KMBa4fBLRfTKVzgzAr+oNqLhm3YBd2JWRHg+fA8CAwEAAaNj" +
-        "MGEwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwFgYDVR0gBA8wDTALBglghk" +
-        "gBZQMBMAEwEQYDVR0OBAoECB4we8+hIrkKMBMGA1UdIwQMMAqACKua6/nC51SPMA0GCSqG" +
-        "SIb3DQEBBQUAA4GBABTQI82uCMwQ4bgUWr9lawSI5DyWg3KY13F45rAlmKyckgne9SHbCH" +
-        "+Lvm3XkkIqKmeHfJ3QTf7bpz6eErn3CxRrGm5JWblcYbVT+smjboJ9A0BXifqINYLy3qGc" +
-        "AnNRkPq8OUREj2sU1qWKagUIgA/Vk2WyZhcUiApJPHI4fwv9";
-    public static final String Intermediate_CRL_RL_08_01_crl = 
-        "MIIBWjCBxAIBATANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS" +
-        "5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNV" +
-        "BAMTDENBMS1STC4wOC4wMRcNOTkwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMTAwWqAyMDAwCg" +
-        "YDVR0UBAMCAQEwDQYDVR0bAQH/BAMCAQEwEwYDVR0jBAwwCoAIHjB7z6EiuQowDQYJKoZI" +
-        "hvcNAQEFBQADgYEAkjF0oERt5XW2i70gyspkEYIHyGCHnqngky5yuwQSRrlW7t0vGdKV7W" +
-        "50evTeSVV41uhi1MBcccpx1MdRcB5vsatFSSKcKx4NF3PuHXxXCm2HkfXQy4K5zftE3jOZ" +
-        "5s+yTHiw3s/QSErtHRca+TQcEZwamI+p402TEa6e82l6xHI=";
-    public static final String End_Certificate_RL_08_01_crt = 
-        "MIIChzCCAfCgAwIBAgICAMYwDQYJKoZIhvcNAQEFBQAwXjELMAkGA1UEBhMCVVMxGDAWBg" +
-        "NVBAoTD1UuUy4gR292ZXJubWVudDEMMAoGA1UECxMDRG9kMRAwDgYDVQQLEwdUZXN0aW5n" +
-        "MRUwEwYDVQQDEwxDQTEtUkwuMDguMDEwHhcNOTgwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMT" +
-        "AwWjBgMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQL" +
-        "EwNEb0QxEDAOBgNVBAsTB1Rlc3RpbmcxFzAVBgNVBAMTDlVzZXIxLVJMLjA4LjAxMIGfMA" +
-        "0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDfEMqWMqk3Rre5m4ILtQIz45JImvU379Al/S6t" +
-        "2y/TzimJc4nhIKQp80VaZA/gwu/DcvMgJPM+FFz5U5rRkDaYASsc34tZUESF5LC6ZbtGqf" +
-        "J96IKdajvkGLsHyI7dseuwaQ0FlOwcmKMSR898MGNNbKxaQNLEXsIFypRDsN6JhwIDAQAB" +
-        "o1IwUDAOBgNVHQ8BAf8EBAMCBeAwFgYDVR0gBA8wDTALBglghkgBZQMBMAEwEQYDVR0OBA" +
-        "oECMT22ARjB1ABMBMGA1UdIwQMMAqACB4we8+hIrkKMA0GCSqGSIb3DQEBBQUAA4GBAIaP" +
-        "EqI7oHl/+h3MszG4VB1Va9NTN0kaysTyjQSVBi9jhOlPkzuXc2wI1bymBhatHEn6OrgP13" +
-        "vsOiH2BiyudYcYjKpwI4FUiyKLIc0CXzM0VYFoMzb91QtsK1EnvAPDKNYVVFXrL7ABVIK4" +
-        "hU6HfMMUbnpKWBxT5274iHScX8tL";
-    public static final String[] TEST_75_DATA = new String[] {
-        Intermediate_Certificate_RL_08_01_crt,
-        Intermediate_CRL_RL_08_01_crl,
-        End_Certificate_RL_08_01_crt
-    };
-
-    /*  
-     *  test76
-     *  
-     */ 
-
-    public static final String Intermediate_Certificate_RL_09_01_crt = 
-        "MIICljCCAf+gAwIBAgICAMcwDQYJKoZIhvcNAQEFBQAwXjELMAkGA1UEBhMCVVMxGDAWBg" +
-        "NVBAoTD1UuUy4gR292ZXJubWVudDEMMAoGA1UECxMDRG9EMRAwDgYDVQQLEwdUZXN0aW5n" +
-        "MRUwEwYDVQQDEwxUcnVzdCBBbmNob3IwHhcNOTgwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMT" +
-        "AwWjBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQL" +
-        "EwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNVBAMTDENBMS1STC4wOS4wMTCBnzANBg" +
-        "kqhkiG9w0BAQEFAAOBjQAwgYkCgYEAsvkvLv5fMFYvohaXO8a7GgU4rDHe9iL7LP1VeNUg" +
-        "GIdJGqPEnuggQ/guhrBHafGh1NtmlEbmPJ4WQ99dBbPHHeO8sfCgkmWC0SqPODoI+t3qJE" +
-        "kf2z9dWoAij15RXPliywZz+S6bTtcEQAREyBQ6M8/HJ83wRXp/uCpdPOSxVPkCAwEAAaNj" +
-        "MGEwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwFgYDVR0gBA8wDTALBglghk" +
-        "gBZQMBMAEwEQYDVR0OBAoECISY4bvGMEBTMBMGA1UdIwQMMAqACKua6/nC51SPMA0GCSqG" +
-        "SIb3DQEBBQUAA4GBAAd7g+dWso4V/Vr+QIoNLueCBAYWdOF+Yz3VeomcsDAs2V8E+xcZaq" +
-        "jo2LrMygYCeMxVfXx/ZdhLPOaZ+ahNAbk+nWRwj35JdTNAAbMMWFdZUgR6N+uzx1v7i86p" +
-        "AWUpRJ9IYPgUoQ5pmjdf3Ru1nrLfRt4yp+kNHWp6IL/+MwcM";
-    public static final String Intermediate_CRL_RL_09_01_crl = 
-        "MIIBXDCBxgIBATANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS" +
-        "5TLiBHb3Zlcm5tZW50MQwwCgYDVQQLEwNEb2QxEDAOBgNVBAsTB1Rlc3RpbmcxFTATBgNV" +
-        "BAMTDENBMS1STC4wOS4wMRcNOTkwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMTAwWqA0MDIwCg" +
-        "YDVR0UBAMCAQEwDwYDVR0cAQH/BAUwA4IB/zATBgNVHSMEDDAKgAiEmOG7xjBAUzANBgkq" +
-        "hkiG9w0BAQUFAAOBgQAKTXYgqlP+upFIwOSpdaVKDT8aqFzY9nSIsxHg5Wdl43U7p44LvQ" +
-        "lW8XKhw74oQl1ExU5s7mDaEqB0JIozGzmoNyKsErgWKNW+lpKSxR5+1EHOB6Oo2KijpTsv" +
-        "GFrHFCnF09f9JaTaMRIXOljx3rMO1UZsftKy/L9z3aUz8hQRnQ==";
-    public static final String End_Certificate_RL_09_01_crt = 
-        "MIIChzCCAfCgAwIBAgICAMgwDQYJKoZIhvcNAQEFBQAwXjELMAkGA1UEBhMCVVMxGDAWBg" +
-        "NVBAoTD1UuUy4gR292ZXJubWVudDEMMAoGA1UECxMDRG9kMRAwDgYDVQQLEwdUZXN0aW5n" +
-        "MRUwEwYDVQQDEwxDQTEtUkwuMDkuMDEwHhcNOTgwMTAxMTIwMTAwWhcNNDgwMTAxMTIwMT" +
-        "AwWjBgMQswCQYDVQQGEwJVUzEYMBYGA1UEChMPVS5TLiBHb3Zlcm5tZW50MQwwCgYDVQQL" +
-        "EwNEb0QxEDAOBgNVBAsTB1Rlc3RpbmcxFzAVBgNVBAMTDlVzZXIxLVJMLjA5LjAxMIGfMA" +
-        "0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDpz09VCXzAhH4/ifMk0RAzaBqJCXaHHqAdO/TW" +
-        "6uvOVtl+fGvWXhXmSSCUfzg5xBqdUXrqcyxOME3vdgF1uOFZ4q2K6+Zuxmm+GCOCIpe+Gl" +
-        "Jzqz4WKXG0iaXXQOYa56itNc/6Z6D/aAjNJavI19w0lmb9l6U2WBfn3LywxHp4dwIDAQAB" +
-        "o1IwUDAOBgNVHQ8BAf8EBAMCBeAwFgYDVR0gBA8wDTALBglghkgBZQMBMAEwEQYDVR0OBA" +
-        "oECOri1JgnJfLjMBMGA1UdIwQMMAqACISY4bvGMEBTMA0GCSqGSIb3DQEBBQUAA4GBADmV" +
-        "Ee0xy25Z0HtmWwprKPjJDr/p7TgzbmNC58pUPkgtxnJFP4yrzNB9FQBWSfnjZpzQkLSU7i" +
-        "7O6cf5HkqjQqoPErDnJLWgGzjbF80v2IIyZk7rEpAAM4MwjIk7hFvJK8QkTht9F4N1zj2X" +
-        "0TQkmlbo9Z4SFj/3fsbl9h2GdKuU";
-    public static final String[] TEST_76_DATA = new String[] {
-        Intermediate_Certificate_RL_09_01_crt,
-        Intermediate_CRL_RL_09_01_crl,
-        End_Certificate_RL_09_01_crt
-    };
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/NamedCurveTest.java b/bcprov/src/main/java/org/bouncycastle/jce/provider/test/NamedCurveTest.java
deleted file mode 100644
index aeb0871..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/NamedCurveTest.java
+++ /dev/null
@@ -1,341 +0,0 @@
-package org.bouncycastle.jce.provider.test;
-
-import org.bouncycastle.asn1.nist.NISTNamedCurves;
-import org.bouncycastle.asn1.sec.SECNamedCurves;
-import org.bouncycastle.asn1.teletrust.TeleTrusTNamedCurves;
-import org.bouncycastle.asn1.x9.X962NamedCurves;
-import org.bouncycastle.asn1.cryptopro.ECGOST3410NamedCurves;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.jce.spec.ECNamedCurveSpec;
-import org.bouncycastle.util.test.SimpleTest;
-
-import javax.crypto.KeyAgreement;
-import java.math.BigInteger;
-import java.security.KeyFactory;
-import java.security.KeyPair;
-import java.security.KeyPairGenerator;
-import java.security.PrivateKey;
-import java.security.PublicKey;
-import java.security.SecureRandom;
-import java.security.Security;
-import java.security.Signature;
-import java.security.interfaces.ECPrivateKey;
-import java.security.interfaces.ECPublicKey;
-import java.security.spec.ECGenParameterSpec;
-import java.security.spec.PKCS8EncodedKeySpec;
-import java.security.spec.X509EncodedKeySpec;
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Set;
-import java.util.HashSet;
-
-public class NamedCurveTest
-    extends SimpleTest
-{
-    private static Hashtable CURVE_NAMES = new Hashtable();
-    private static Hashtable CURVE_ALIASES = new Hashtable();
-
-    static
-    {
-        CURVE_NAMES.put("prime192v1", "prime192v1"); // X9.62
-        CURVE_NAMES.put("sect571r1", "sect571r1"); // sec
-        CURVE_NAMES.put("secp224r1", "secp224r1");
-        CURVE_NAMES.put("B-409", SECNamedCurves.getName(NISTNamedCurves.getOID("B-409")));   // nist
-        CURVE_NAMES.put("P-521", SECNamedCurves.getName(NISTNamedCurves.getOID("P-521")));
-        CURVE_NAMES.put("brainpoolp160r1", "brainpoolp160r1");         // TeleTrusT
-
-        CURVE_ALIASES.put("secp192r1", "prime192v1");
-        CURVE_ALIASES.put("secp256r1", "prime256v1");
-    }
-    
-    public void testCurve(
-        String name)
-        throws Exception
-    {
-        ECGenParameterSpec     ecSpec = new ECGenParameterSpec(name);
-
-        KeyPairGenerator    g = KeyPairGenerator.getInstance("ECDH", "BC");
-
-        g.initialize(ecSpec, new SecureRandom());
-
-        //
-        // a side
-        //
-        KeyPair aKeyPair = g.generateKeyPair();
-
-        KeyAgreement aKeyAgree = KeyAgreement.getInstance("ECDHC", "BC");
-
-        aKeyAgree.init(aKeyPair.getPrivate());
-
-        //
-        // b side
-        //
-        KeyPair bKeyPair = g.generateKeyPair();
-
-        KeyAgreement bKeyAgree = KeyAgreement.getInstance("ECDHC", "BC");
-
-        bKeyAgree.init(bKeyPair.getPrivate());
-
-        //
-        // agreement
-        //
-        aKeyAgree.doPhase(bKeyPair.getPublic(), true);
-        bKeyAgree.doPhase(aKeyPair.getPublic(), true);
-
-        BigInteger  k1 = new BigInteger(aKeyAgree.generateSecret());
-        BigInteger  k2 = new BigInteger(bKeyAgree.generateSecret());
-
-        if (!k1.equals(k2))
-        {
-            fail("2-way test failed");
-        }
-
-        //
-        // public key encoding test
-        //
-        byte[]              pubEnc = aKeyPair.getPublic().getEncoded();
-        KeyFactory          keyFac = KeyFactory.getInstance("ECDH", "BC");
-        X509EncodedKeySpec  pubX509 = new X509EncodedKeySpec(pubEnc);
-        ECPublicKey         pubKey = (ECPublicKey)keyFac.generatePublic(pubX509);
-
-        if (!pubKey.getW().equals(((ECPublicKey)aKeyPair.getPublic()).getW()))
-        {
-            fail("public key encoding (Q test) failed");
-        }
-
-        if (!(pubKey.getParams() instanceof ECNamedCurveSpec))
-        {
-            fail("public key encoding not named curve");
-        }
-
-        //
-        // private key encoding test
-        //
-        byte[]              privEnc = aKeyPair.getPrivate().getEncoded();
-        PKCS8EncodedKeySpec privPKCS8 = new PKCS8EncodedKeySpec(privEnc);
-        ECPrivateKey        privKey = (ECPrivateKey)keyFac.generatePrivate(privPKCS8);
-
-        if (!privKey.getS().equals(((ECPrivateKey)aKeyPair.getPrivate()).getS()))
-        {
-            fail("private key encoding (S test) failed");
-        }
-
-        if (!(privKey.getParams() instanceof ECNamedCurveSpec))
-        {
-            fail("private key encoding not named curve");
-        }
-
-        ECNamedCurveSpec privSpec = (ECNamedCurveSpec)privKey.getParams();
-        if (!(privSpec.getName().equals(name) || privSpec.getName().equals(CURVE_NAMES.get(name))))
-        {
-            fail("private key encoding wrong named curve. Expected: " + CURVE_NAMES.get(name) + " got " + privSpec.getName());
-        }
-    }
-
-    public void testECDSA(
-        String name)
-        throws Exception
-    {
-        ECGenParameterSpec     ecSpec = new ECGenParameterSpec(name);
-
-        KeyPairGenerator    g = KeyPairGenerator.getInstance("ECDSA", "BC");
-
-        g.initialize(ecSpec, new SecureRandom());
-
-        Signature sgr = Signature.getInstance("ECDSA", "BC");
-        KeyPair   pair = g.generateKeyPair();
-        PrivateKey sKey = pair.getPrivate();
-        PublicKey vKey = pair.getPublic();
-
-        sgr.initSign(sKey);
-
-        byte[] message = new byte[] { (byte)'a', (byte)'b', (byte)'c' };
-
-        sgr.update(message);
-
-        byte[]  sigBytes = sgr.sign();
-
-        sgr.initVerify(vKey);
-
-        sgr.update(message);
-
-        if (!sgr.verify(sigBytes))
-        {
-            fail(name + " verification failed");
-        }
-
-        //
-        // public key encoding test
-        //
-        byte[]              pubEnc = vKey.getEncoded();
-        KeyFactory          keyFac = KeyFactory.getInstance("ECDH", "BC");
-        X509EncodedKeySpec  pubX509 = new X509EncodedKeySpec(pubEnc);
-        ECPublicKey         pubKey = (ECPublicKey)keyFac.generatePublic(pubX509);
-
-        if (!pubKey.getW().equals(((ECPublicKey)vKey).getW()))
-        {
-            fail("public key encoding (Q test) failed");
-        }
-
-        if (!(pubKey.getParams() instanceof ECNamedCurveSpec))
-        {
-            fail("public key encoding not named curve");
-        }
-
-        //
-        // private key encoding test
-        //
-        byte[]              privEnc = sKey.getEncoded();
-        PKCS8EncodedKeySpec privPKCS8 = new PKCS8EncodedKeySpec(privEnc);
-        ECPrivateKey        privKey = (ECPrivateKey)keyFac.generatePrivate(privPKCS8);
-
-        if (!privKey.getS().equals(((ECPrivateKey)sKey).getS()))
-        {
-            fail("private key encoding (S test) failed");
-        }
-
-        if (!(privKey.getParams() instanceof ECNamedCurveSpec))
-        {
-            fail("private key encoding not named curve");
-        }
-
-        ECNamedCurveSpec privSpec = (ECNamedCurveSpec)privKey.getParams();
-        if (!privSpec.getName().equalsIgnoreCase(name)
-            && !privSpec.getName().equalsIgnoreCase((String)CURVE_ALIASES.get(name)))
-        {
-            fail("private key encoding wrong named curve. Expected: " + name + " got " + privSpec.getName());
-        }
-    }
-
-    public void testECGOST(
-        String name)
-        throws Exception
-    {
-        ECGenParameterSpec     ecSpec = new ECGenParameterSpec(name);
-
-        KeyPairGenerator    g = KeyPairGenerator.getInstance("ECGOST3410", "BC");
-
-        g.initialize(ecSpec, new SecureRandom());
-
-        Signature sgr = Signature.getInstance("ECGOST3410", "BC");
-        KeyPair   pair = g.generateKeyPair();
-        PrivateKey sKey = pair.getPrivate();
-        PublicKey vKey = pair.getPublic();
-
-        sgr.initSign(sKey);
-
-        byte[] message = new byte[] { (byte)'a', (byte)'b', (byte)'c' };
-
-        sgr.update(message);
-
-        byte[]  sigBytes = sgr.sign();
-
-        sgr.initVerify(vKey);
-
-        sgr.update(message);
-
-        if (!sgr.verify(sigBytes))
-        {
-            fail(name + " verification failed");
-        }
-
-        //
-        // public key encoding test
-        //
-        byte[]              pubEnc = vKey.getEncoded();
-        KeyFactory          keyFac = KeyFactory.getInstance("ECGOST3410", "BC");
-        X509EncodedKeySpec  pubX509 = new X509EncodedKeySpec(pubEnc);
-        ECPublicKey         pubKey = (ECPublicKey)keyFac.generatePublic(pubX509);
-
-        if (!pubKey.getW().equals(((ECPublicKey)vKey).getW()))
-        {
-            fail("public key encoding (Q test) failed");
-        }
-
-        if (!(pubKey.getParams() instanceof ECNamedCurveSpec))
-        {
-            fail("public key encoding not named curve");
-        }
-
-        //
-        // private key encoding test
-        //
-        byte[]              privEnc = sKey.getEncoded();
-        PKCS8EncodedKeySpec privPKCS8 = new PKCS8EncodedKeySpec(privEnc);
-        ECPrivateKey        privKey = (ECPrivateKey)keyFac.generatePrivate(privPKCS8);
-
-        if (!privKey.getS().equals(((ECPrivateKey)sKey).getS()))
-        {
-            fail("GOST private key encoding (S test) failed");
-        }
-
-        if (!(privKey.getParams() instanceof ECNamedCurveSpec))
-        {
-            fail("GOST private key encoding not named curve");
-        }
-
-        ECNamedCurveSpec privSpec = (ECNamedCurveSpec)privKey.getParams();
-        if (!privSpec.getName().equalsIgnoreCase(name)
-            && !privSpec.getName().equalsIgnoreCase((String)CURVE_ALIASES.get(name)))
-        {
-            fail("GOST private key encoding wrong named curve. Expected: " + name + " got " + privSpec.getName());
-        }
-    }
-
-    public String getName()
-    {
-        return "NamedCurve";
-    }
-    
-    public void performTest()
-        throws Exception
-    {
-        testCurve("prime192v1"); // X9.62
-        testCurve("sect571r1"); // sec
-        testCurve("secp224r1");
-        testCurve("B-409");   // nist
-        testCurve("P-521");
-        testCurve("brainpoolp160r1");    // TeleTrusT
-
-        for (Enumeration en = X962NamedCurves.getNames(); en.hasMoreElements();)
-        {
-            testECDSA((String)en.nextElement());
-        }
-
-        // these curves can't be used under JDK 1.5
-        Set  problemCurves = new HashSet();
-
-        problemCurves.add("secp256k1");
-        problemCurves.add("secp160k1");
-        problemCurves.add("secp224k1");
-        problemCurves.add("secp192k1");
-        
-        for (Enumeration en = SECNamedCurves.getNames(); en.hasMoreElements();)
-        {
-            String curveName = (String)en.nextElement();
-
-            if (!problemCurves.contains(curveName))
-            {
-                testECDSA(curveName);
-            }
-        }
-
-        for (Enumeration en = TeleTrusTNamedCurves.getNames(); en.hasMoreElements();)
-        {
-            testECDSA((String)en.nextElement());
-        }
-
-        for (Enumeration en = ECGOST3410NamedCurves.getNames(); en.hasMoreElements();)
-        {
-            testECGOST((String)en.nextElement());
-        }
-    }
-    
-    public static void main(
-        String[]    args)
-    {
-        Security.addProvider(new BouncyCastleProvider());
-    
-        runTest(new NamedCurveTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/NetscapeCertRequestTest.java b/bcprov/src/main/java/org/bouncycastle/jce/provider/test/NetscapeCertRequestTest.java
deleted file mode 100644
index d670f54..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/NetscapeCertRequestTest.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package org.bouncycastle.jce.provider.test;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.security.KeyPair;
-import java.security.KeyPairGenerator;
-import java.security.Security;
-
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DEROutputStream;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.jce.netscape.NetscapeCertRequest;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.util.encoders.Base64;
-import org.bouncycastle.util.test.SimpleTestResult;
-import org.bouncycastle.util.test.Test;
-import org.bouncycastle.util.test.TestResult;
-
-/**
- */
-public class NetscapeCertRequestTest
-    implements Test
-{
-    /* from NS 4.75 */
-    static final String test1 =
-    "MIIBRzCBsTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAmwdh+LJXQ8AtXczo"+
-    "4EIGfXjpmDwsoIRpPaXEx1CBHhpon/Dpo/o5Vw2WoWNICXj5lmqhftIpCPO9qKxx"+
-    "85x6k/fuyTPH8P02hkmscAYsgqOgb/1yRCNXFryuFOATqxw1tsuye5Q3lTU9JCLU"+
-    "UilQ6BV8n3fm2egtPPUaJEuCvcsCAwEAARYNZml4ZWQtZm9yLW5vdzANBgkqhkiG"+
-    "9w0BAQQFAAOBgQAImbJD6xHbJtXl6kOTbCFoMnDk7U0o6pHy9l56DYVsiluXegiY"+
-    "6twB4o7OWsrqTb+gVvzK65FfP+NBVVzxY8UzcjbqC51yvO/9wnpUsIBqD/Gvi1gE"+
-    "qvw7RHwVEhdzsvLwlL22G8CfDxHnWLww39j8uRJsmoNiKJly3BcsZkLd9g==";
-    
-    public String getName()
-    {
-        return "NetscapeCertRequest";
-    }
-
-    public TestResult perform()
-    {
-        try
-        {
-            String    challenge = "fixed-for-now";
-        
-            byte data [] = Base64.decode (test1);
-
-            ASN1InputStream    in = new ASN1InputStream (new ByteArrayInputStream(data));
-            ASN1Sequence    spkac = (ASN1Sequence)in.readObject ();
-            // System.out.println("SPKAC: \n"+DERDump.dumpAsString (spkac));
-
-
-            NetscapeCertRequest nscr = new NetscapeCertRequest (spkac);
-
-            if (!nscr.verify (challenge)) 
-            {
-                return new SimpleTestResult(false, getName() + ": 1 - not verified");
-            }
-
-            //now try to generate one
-            KeyPairGenerator kpg =
-                KeyPairGenerator.getInstance (nscr.getKeyAlgorithm().getObjectId ().getId(), "BC");
-
-            kpg.initialize (1024);
-
-            KeyPair kp = kpg.genKeyPair();
-
-            nscr.setPublicKey (kp.getPublic());
-            nscr.sign (kp.getPrivate());
-            
-            ByteArrayOutputStream baos = new ByteArrayOutputStream();
-            DEROutputStream deros = new DEROutputStream (baos);
-            deros.writeObject (nscr);
-            deros.close();
-
-            
-            ASN1InputStream     in2 =
-                new ASN1InputStream (new ByteArrayInputStream(baos.toByteArray()));
-            ASN1Sequence        spkac2 = (ASN1Sequence)in2.readObject ();
-
-            // System.out.println("SPKAC2: \n"+DERDump.dumpAsString (spkac2));
-
-            NetscapeCertRequest nscr2 = new NetscapeCertRequest (spkac2);
-
-            if (!nscr2.verify (challenge)) 
-            {
-                return new SimpleTestResult(false, getName() + ": 2 - not verified");
-            }
-
-            //lets build it from scratch
-
-
-            challenge = "try it";
-
-            NetscapeCertRequest nscr3 =
-                new NetscapeCertRequest (challenge,
-                                         new AlgorithmIdentifier(PKCSObjectIdentifiers.sha1WithRSAEncryption, null),
-                                         kp.getPublic());
-            
-            nscr3.sign (kp.getPrivate());
-            
-            // System.out.println("SPKAC3: \n"+DERDump.dumpAsString (nscr3));
-            
-            if (nscr3.verify (challenge)) 
-            {
-                return new SimpleTestResult(true, getName() + ": Okay");
-            }
-            else
-            {
-                return new SimpleTestResult(false, getName() + ": 3 - not verified");
-            }
-        }
-        catch (Exception e)
-        {
-            return new SimpleTestResult(false, getName() + ": exception - " + e.toString());
-        }
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        Security.addProvider(new BouncyCastleProvider());
-
-        Test            test = new NetscapeCertRequestTest();
-        TestResult      result = test.perform();
-
-        System.out.println(result.toString());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/NoekeonTest.java b/bcprov/src/main/java/org/bouncycastle/jce/provider/test/NoekeonTest.java
deleted file mode 100644
index c1c7b66..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/NoekeonTest.java
+++ /dev/null
@@ -1,152 +0,0 @@
-package org.bouncycastle.jce.provider.test;
-
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.util.encoders.Hex;
-
-import javax.crypto.Cipher;
-import javax.crypto.CipherInputStream;
-import javax.crypto.CipherOutputStream;
-import javax.crypto.spec.SecretKeySpec;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.DataInputStream;
-import java.io.IOException;
-import java.security.Key;
-import java.security.Security;
-
-/**
- * basic test class for SEED
- */
-public class NoekeonTest
-    extends BaseBlockCipherTest
-{
-    static String[] cipherTests =
-    {
-        "128",
-        "b1656851699e29fa24b70148503d2dfc",
-        "2a78421b87c7d0924f26113f1d1349b2",
-        "e2f687e07b75660ffc372233bc47532c"
-    };
-
-    public NoekeonTest()
-    {
-        super("Noekeon");
-    }
-
-    public void test(
-        int         strength,
-        byte[]      keyBytes,
-        byte[]      input,
-        byte[]      output)
-        throws Exception
-    {
-        Key key;
-        Cipher in, out;
-        CipherInputStream cIn;
-        CipherOutputStream cOut;
-        ByteArrayInputStream bIn;
-        ByteArrayOutputStream bOut;
-
-        key = new SecretKeySpec(keyBytes, "Noekeon");
-
-        in = Cipher.getInstance("Noekeon/ECB/NoPadding", "BC");
-        out = Cipher.getInstance("Noekeon/ECB/NoPadding", "BC");
-
-        try
-        {
-            out.init(Cipher.ENCRYPT_MODE, key);
-        }
-        catch (Exception e)
-        {
-            fail("Noekeon failed initialisation - " + e.toString(), e);
-        }
-
-        try
-        {
-            in.init(Cipher.DECRYPT_MODE, key);
-        }
-        catch (Exception e)
-        {
-            fail("Noekeoen failed initialisation - " + e.toString(), e);
-        }
-
-        //
-        // encryption pass
-        //
-        bOut = new ByteArrayOutputStream();
-
-        cOut = new CipherOutputStream(bOut, out);
-
-        try
-        {
-            for (int i = 0; i != input.length / 2; i++)
-            {
-                cOut.write(input[i]);
-            }
-            cOut.write(input, input.length / 2, input.length - input.length / 2);
-            cOut.close();
-        }
-        catch (IOException e)
-        {
-            fail("Noekeon failed encryption - " + e.toString(), e);
-        }
-
-        byte[]    bytes;
-
-        bytes = bOut.toByteArray();
-
-        if (!areEqual(bytes, output))
-        {
-            fail("Noekeon failed encryption - expected " + new String(Hex.encode(output)) + " got " + new String(Hex.encode(bytes)));
-        }
-
-        //
-        // decryption pass
-        //
-        bIn = new ByteArrayInputStream(bytes);
-
-        cIn = new CipherInputStream(bIn, in);
-
-        try
-        {
-            DataInputStream dIn = new DataInputStream(cIn);
-
-            bytes = new byte[input.length];
-
-            for (int i = 0; i != input.length / 2; i++)
-            {
-                bytes[i] = (byte)dIn.read();
-            }
-            dIn.readFully(bytes, input.length / 2, bytes.length - input.length / 2);
-        }
-        catch (Exception e)
-        {
-            fail("Noekeon failed encryption - " + e.toString(), e);
-        }
-
-        if (!areEqual(bytes, input))
-        {
-            fail("Noekeon failed decryption - expected " + new String(Hex.encode(input)) + " got " + new String(Hex.encode(bytes)));
-        }
-    }
-
-    public void performTest()
-        throws Exception
-    {
-        for (int i = 0; i != cipherTests.length; i += 4)
-        {
-            test(Integer.parseInt(cipherTests[i]),
-                            Hex.decode(cipherTests[i + 1]),
-                            Hex.decode(cipherTests[i + 2]),
-                            Hex.decode(cipherTests[i + 3]));
-        }
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        Security.addProvider(new BouncyCastleProvider());
-
-        runTest(new NoekeonTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/OCBTest.java b/bcprov/src/main/java/org/bouncycastle/jce/provider/test/OCBTest.java
deleted file mode 100644
index c693ce8..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/OCBTest.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package org.bouncycastle.jce.provider.test;
-
-import java.security.Key;
-import java.security.Security;
-
-import javax.crypto.Cipher;
-import javax.crypto.NoSuchPaddingException;
-import javax.crypto.spec.IvParameterSpec;
-import javax.crypto.spec.SecretKeySpec;
-
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-
-public class OCBTest
-    extends SimpleTest
-{
-    public String getName()
-    {
-        return "OCB";
-    }
-
-    public void performTest()
-        throws Exception
-    {
-        checkRegistrations();
-    }
-
-    private void checkRegistrations()
-        throws Exception
-    {
-        String[] ciphers = new String[] { "AES", "NOEKEON", "Twofish", "CAST6", "SEED", "Serpent", "RC6", "CAMELLIA" };
-        String[] cipherText = new String[]
-            {
-                "BEA5E8798DBE7110031C144DA0B2612213CC8B747807121A4CBB3E4BD6B456AF",
-                "a2545b927e0f2e6db2998e20b17d5fc0564dcab63b748327e2ef4eaed88cb059",
-                "1cfafe72f7181cae331610c116345e51fc356b379aca04da2a53337c5428d8e4",
-                "5b9b738b2ac7000b33b89dd4eec18dd853f4f7c1d9e17b565405f17a0a8c8b63",
-                "fcdbcee69d02c69858ed4569f78b81920b3027cdb7f1f154634aa5ace9e6ba29",
-                "4f7154cb34558940e85db7d3e96ac6c9cb0d9c1b00b18e82e15d1be83deef9df",
-                "23f3e450c4c7199563a0ed601a5c60d75eb88db2a0d090ae5e84d98438a146aa",
-                "ac13ce9db4af148e910a813fc728e5785e23b1bf1d04a961a3f95f356b9417ab"
-            };
-
-        for (int i = 0; i < ciphers.length; i++)
-        {
-            ocbTest(ciphers[i], cipherText[i]);
-        }
-    }
-
-    private void ocbTest(String cipher, String cText)
-        throws Exception
-    {
-        byte[] K = Hex.decode(
-              "000102030405060708090A0B0C0D0E0F");
-        byte[] P = Hex.decode(
-              "000102030405060708090A0B0C0D0E0F");
-        byte[] N = Hex.decode("000102030405060708090A0B");
-        String T = "4CBB3E4BD6B456AF";
-        byte[] C = Hex.decode(cText);
-
-        Key key;
-        Cipher                  in, out;
-
-        key = new SecretKeySpec(K, cipher);
-
-        in = Cipher.getInstance(cipher + "/OCB/NoPadding", "BC");
-        out = Cipher.getInstance(cipher + "/OCB/NoPadding", "BC");
-
-        in.init(Cipher.ENCRYPT_MODE, key, new IvParameterSpec(N));
-
-        byte[] enc = in.doFinal(P);
-        if (!areEqual(enc, C))
-        {
-            fail("ciphertext doesn't match in OCB got " + new String(Hex.encode(enc)));
-        }
-
-        out.init(Cipher.DECRYPT_MODE, key, new IvParameterSpec(N));
-
-        byte[] dec = out.doFinal(C);
-        if (!areEqual(dec, P))
-        {
-            fail("plaintext doesn't match in OCB");
-        }
-
-        try
-        {
-            in = Cipher.getInstance(cipher + "/OCB/PKCS5Padding", "BC");
-
-            fail("bad padding missed in OCB");
-        }
-        catch (NoSuchPaddingException e)
-        {
-            // expected
-        }
-    }
-
-    public static void main(String[] args)
-    {
-        Security.addProvider(new BouncyCastleProvider());
-
-        runTest(new OCBTest());
-    }
-}
\ No newline at end of file
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/PBETest.java b/bcprov/src/main/java/org/bouncycastle/jce/provider/test/PBETest.java
deleted file mode 100644
index d5781f4..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/PBETest.java
+++ /dev/null
@@ -1,672 +0,0 @@
-package org.bouncycastle.jce.provider.test;
-
-import java.security.AlgorithmParameters;
-import java.security.SecureRandom;
-import java.security.Security;
-import java.security.spec.InvalidParameterSpecException;
-import java.security.spec.KeySpec;
-
-import javax.crypto.Cipher;
-import javax.crypto.KeyGenerator;
-import javax.crypto.Mac;
-import javax.crypto.SecretKey;
-import javax.crypto.SecretKeyFactory;
-import javax.crypto.spec.IvParameterSpec;
-import javax.crypto.spec.PBEKeySpec;
-import javax.crypto.spec.PBEParameterSpec;
-import javax.crypto.spec.SecretKeySpec;
-
-import org.bouncycastle.asn1.bc.BCObjectIdentifiers;
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.PBEParametersGenerator;
-import org.bouncycastle.crypto.digests.SHA1Digest;
-import org.bouncycastle.crypto.digests.SHA256Digest;
-import org.bouncycastle.crypto.generators.OpenSSLPBEParametersGenerator;
-import org.bouncycastle.crypto.generators.PKCS12ParametersGenerator;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.crypto.params.ParametersWithIV;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-
-/**
- * test out the various PBE modes, making sure the JCE implementations
- * are compatible woth the light weight ones.
- */
-public class PBETest
-    extends SimpleTest
-{
-    private class OpenSSLTest
-        extends SimpleTest
-    {
-        char[]    password;
-        String    baseAlgorithm;
-        String    algorithm;
-        int       keySize;
-        int       ivSize;
-        
-        OpenSSLTest(
-            String    baseAlgorithm,
-            String    algorithm,
-            int       keySize,
-            int       ivSize)
-        {
-            this.password = algorithm.toCharArray();
-            this.baseAlgorithm = baseAlgorithm;
-            this.algorithm = algorithm;
-            this.keySize = keySize;
-            this.ivSize = ivSize;
-        }
-        
-        public String getName()
-        {
-            return "OpenSSLPBE";
-        }
-    
-        public void performTest()
-            throws Exception
-        {
-            byte[] salt = new byte[16];
-            int    iCount = 100;
-            
-            for (int i = 0; i != salt.length; i++)
-            {
-                salt[i] = (byte)i;
-            }
-
-            OpenSSLPBEParametersGenerator   pGen = new OpenSSLPBEParametersGenerator();
-
-            pGen.init(
-                    PBEParametersGenerator.PKCS5PasswordToBytes(password),
-                    salt,
-                    iCount);
-
-            ParametersWithIV params = (ParametersWithIV)pGen.generateDerivedParameters(keySize, ivSize);
-
-            SecretKeySpec   encKey = new SecretKeySpec(((KeyParameter)params.getParameters()).getKey(), baseAlgorithm);
-
-            Cipher          c;
-
-            if (baseAlgorithm.equals("RC4"))
-            {
-                c = Cipher.getInstance(baseAlgorithm, "BC");
-
-                c.init(Cipher.ENCRYPT_MODE, encKey);
-            }
-            else
-            {
-                c = Cipher.getInstance(baseAlgorithm + "/CBC/PKCS7Padding", "BC");
-
-                c.init(Cipher.ENCRYPT_MODE, encKey, new IvParameterSpec(params.getIV()));
-            }
-
-            byte[]          enc = c.doFinal(salt);
-
-            c = Cipher.getInstance(algorithm, "BC");
-
-            PBEKeySpec          keySpec = new PBEKeySpec(password, salt, iCount);
-            SecretKeyFactory    fact = SecretKeyFactory.getInstance(algorithm, "BC");
-
-            c.init(Cipher.DECRYPT_MODE, fact.generateSecret(keySpec));
-
-            byte[]          dec = c.doFinal(enc);
-
-            if (!Arrays.areEqual(salt, dec))
-            {
-                fail("" + algorithm + "failed encryption/decryption test");
-            }
-        }
-    }
-    
-    private class PKCS12Test
-        extends SimpleTest
-    {
-        char[]    password;
-        String    baseAlgorithm;
-        String    algorithm;
-        Digest    digest;
-        int       keySize;
-        int       ivSize;
-        
-        PKCS12Test(
-            String    baseAlgorithm,
-            String    algorithm,
-            Digest    digest,
-            int       keySize,
-            int       ivSize)
-        {
-            this.password = algorithm.toCharArray();
-            this.baseAlgorithm = baseAlgorithm;
-            this.algorithm = algorithm;
-            this.digest = digest;
-            this.keySize = keySize;
-            this.ivSize = ivSize;
-        }
-        
-        public String getName()
-        {
-            return "PKCS12PBE";
-        }
-    
-        public void performTest()
-            throws Exception
-        {
-            byte[] salt = new byte[digest.getDigestSize()];
-            int    iCount = 100;
-            
-            digest.doFinal(salt, 0);
-
-            PKCS12ParametersGenerator   pGen = new PKCS12ParametersGenerator(digest);
-
-            pGen.init(
-                    PBEParametersGenerator.PKCS12PasswordToBytes(password),
-                    salt,
-                    iCount);
-
-            ParametersWithIV params = (ParametersWithIV)pGen.generateDerivedParameters(keySize, ivSize);
-
-            SecretKeySpec   encKey = new SecretKeySpec(((KeyParameter)params.getParameters()).getKey(), baseAlgorithm);
-
-            Cipher          c;
-
-            if (baseAlgorithm.equals("RC4"))
-            {
-                c = Cipher.getInstance(baseAlgorithm, "BC");
-
-                c.init(Cipher.ENCRYPT_MODE, encKey);
-            }
-            else
-            {
-                c = Cipher.getInstance(baseAlgorithm + "/CBC/PKCS7Padding", "BC");
-
-                c.init(Cipher.ENCRYPT_MODE, encKey, new IvParameterSpec(params.getIV()));
-            }
-
-            byte[]          enc = c.doFinal(salt);
-
-            c = Cipher.getInstance(algorithm, "BC");
-
-            PBEKeySpec          keySpec = new PBEKeySpec(password, salt, iCount);
-            SecretKeyFactory    fact = SecretKeyFactory.getInstance(algorithm, "BC");
-
-            c.init(Cipher.DECRYPT_MODE, fact.generateSecret(keySpec));
-
-            byte[]          dec = c.doFinal(enc);
-
-            if (!Arrays.areEqual(salt, dec))
-            {
-                fail("" + algorithm + "failed encryption/decryption test");
-            }
-
-            //
-            // get the parameters
-            //
-            AlgorithmParameters param = checkParameters(c, salt, iCount);
-
-            //
-            // try using parameters
-            //
-            c = Cipher.getInstance(algorithm, "BC");
-
-            keySpec = new PBEKeySpec(password);
-
-            c.init(Cipher.DECRYPT_MODE, fact.generateSecret(keySpec), param);
-
-            checkParameters(c, salt, iCount);
-
-            dec = c.doFinal(enc);
-
-            if (!Arrays.areEqual(salt, dec))
-            {
-                fail("" + algorithm + "failed encryption/decryption test");
-            }
-
-            //
-            // try using PBESpec
-            //
-            c = Cipher.getInstance(algorithm, "BC");
-
-            keySpec = new PBEKeySpec(password);
-
-            c.init(Cipher.DECRYPT_MODE, fact.generateSecret(keySpec), param.getParameterSpec(PBEParameterSpec.class));
-
-            checkParameters(c, salt, iCount);
-
-            dec = c.doFinal(enc);
-
-            if (!Arrays.areEqual(salt, dec))
-            {
-                fail("" + algorithm + "failed encryption/decryption test");
-            }
-        }
-
-        private AlgorithmParameters checkParameters(Cipher c, byte[] salt, int iCount)
-            throws InvalidParameterSpecException
-        {
-            AlgorithmParameters param = c.getParameters();
-            PBEParameterSpec spec = (PBEParameterSpec)param.getParameterSpec(PBEParameterSpec.class);
-
-            if (!Arrays.areEqual(salt, spec.getSalt()))
-            {
-                fail("" + algorithm + "failed salt test");
-            }
-
-            if (iCount != spec.getIterationCount())
-            {
-                fail("" + algorithm + "failed count test");
-            }
-            return param;
-        }
-    }
-    
-    private PKCS12Test[] pkcs12Tests = {
-        new PKCS12Test("DESede", "PBEWITHSHAAND3-KEYTRIPLEDES-CBC",  new SHA1Digest(),   192,  64),
-        new PKCS12Test("DESede", "PBEWITHSHAAND2-KEYTRIPLEDES-CBC",  new SHA1Digest(),   128,  64),
-        new PKCS12Test("RC4",    "PBEWITHSHAAND128BITRC4",           new SHA1Digest(),   128,   0),
-        new PKCS12Test("RC4",    "PBEWITHSHAAND40BITRC4",            new SHA1Digest(),    40,   0),
-        new PKCS12Test("RC2",    "PBEWITHSHAAND128BITRC2-CBC",       new SHA1Digest(),   128,  64),
-        new PKCS12Test("RC2",    "PBEWITHSHAAND40BITRC2-CBC",        new SHA1Digest(),    40,  64),
-        new PKCS12Test("AES",    "PBEWithSHA1And128BitAES-CBC-BC",   new SHA1Digest(),   128, 128),
-        new PKCS12Test("AES",    "PBEWithSHA1And192BitAES-CBC-BC",   new SHA1Digest(),   192, 128),
-        new PKCS12Test("AES",    "PBEWithSHA1And256BitAES-CBC-BC",   new SHA1Digest(),   256, 128),
-        new PKCS12Test("AES",    "PBEWithSHA256And128BitAES-CBC-BC", new SHA256Digest(), 128, 128),
-        new PKCS12Test("AES",    "PBEWithSHA256And192BitAES-CBC-BC", new SHA256Digest(), 192, 128),   
-        new PKCS12Test("AES",    "PBEWithSHA256And256BitAES-CBC-BC", new SHA256Digest(), 256, 128),
-        new PKCS12Test("Twofish","PBEWithSHAAndTwofish-CBC",         new SHA1Digest(),   256, 128),
-        new PKCS12Test("IDEA",   "PBEWithSHAAndIDEA-CBC",            new SHA1Digest(),   128,  64),
-        new PKCS12Test("AES",    BCObjectIdentifiers.bc_pbe_sha1_pkcs12_aes128_cbc.getId(),   new SHA1Digest(),   128, 128),
-        new PKCS12Test("AES",    BCObjectIdentifiers.bc_pbe_sha1_pkcs12_aes192_cbc.getId(),   new SHA1Digest(),   192, 128),
-        new PKCS12Test("AES",    BCObjectIdentifiers.bc_pbe_sha1_pkcs12_aes256_cbc.getId(),   new SHA1Digest(),   256, 128),
-        new PKCS12Test("AES",    BCObjectIdentifiers.bc_pbe_sha256_pkcs12_aes128_cbc.getId(), new SHA256Digest(), 128, 128),
-        new PKCS12Test("AES",    BCObjectIdentifiers.bc_pbe_sha256_pkcs12_aes192_cbc.getId(), new SHA256Digest(), 192, 128),
-        new PKCS12Test("AES",    BCObjectIdentifiers.bc_pbe_sha256_pkcs12_aes256_cbc.getId(), new SHA256Digest(), 256, 128),
-    };
-    
-    private OpenSSLTest openSSLTests[] = {
-        new OpenSSLTest("AES", "PBEWITHMD5AND128BITAES-CBC-OPENSSL", 128, 128),
-        new OpenSSLTest("AES", "PBEWITHMD5AND192BITAES-CBC-OPENSSL", 192, 128),
-        new OpenSSLTest("AES", "PBEWITHMD5AND256BITAES-CBC-OPENSSL", 256, 128)
-    };
-    
-    static byte[]   message = Hex.decode("4869205468657265");
-    
-    private byte[] hMac1 = Hex.decode("bcc42174ccb04f425d9a5c8c4a95d6fd7c372911");
-    private byte[] hMac2 = Hex.decode("cb1d8bdb6aca9e3fa8980d6eb41ab28a7eb2cfd6");
-    private byte[] hMac3 = Hex.decode("514aa173a302c770689269aac08eb8698e5879ac");
-
-    private Cipher makePBECipherUsingParam(
-        String  algorithm,
-        int     mode,
-        char[]  password,
-        byte[]  salt,
-        int     iterationCount)
-        throws Exception
-    {
-        PBEKeySpec          pbeSpec = new PBEKeySpec(password);
-        SecretKeyFactory    keyFact = SecretKeyFactory.getInstance(algorithm, "BC");
-        PBEParameterSpec    defParams = new PBEParameterSpec(salt, iterationCount);
-
-        Cipher cipher = Cipher.getInstance(algorithm, "BC");
-
-        cipher.init(mode, keyFact.generateSecret(pbeSpec), defParams);
-
-        return cipher;
-    }
-
-    private Cipher makePBECipherWithoutParam(
-        String  algorithm,
-        int     mode,
-        char[]  password,
-        byte[]  salt,
-        int     iterationCount)
-        throws Exception
-    {
-        PBEKeySpec          pbeSpec = new PBEKeySpec(password, salt, iterationCount);
-        SecretKeyFactory    keyFact = SecretKeyFactory.getInstance(algorithm, "BC");
-
-        Cipher cipher = Cipher.getInstance(algorithm, "BC");
-
-        cipher.init(mode, keyFact.generateSecret(pbeSpec));
-
-        return cipher;
-    }
-
-    public void testPBEHMac(
-        String  hmacName,
-        byte[]  output)
-    {
-        SecretKey           key;
-        byte[]              out;
-        Mac                 mac;
-
-        try
-        {
-            SecretKeyFactory    fact = SecretKeyFactory.getInstance(hmacName, "BC");
-
-            key = fact.generateSecret(new PBEKeySpec("hello".toCharArray()));
-            
-            mac = Mac.getInstance(hmacName, "BC");
-        }
-        catch (Exception e)
-        {
-            fail("Failed - exception " + e.toString(), e);
-            return;
-        }
-
-        try
-        {
-            mac.init(key, new PBEParameterSpec(new byte[20], 100));
-        }
-        catch (Exception e)
-        {
-            fail("Failed - exception " + e.toString(), e);
-            return;
-        }
-
-        mac.reset();
-        
-        mac.update(message, 0, message.length);
-
-        out = mac.doFinal();
-
-        if (!Arrays.areEqual(out, output))
-        {
-            fail("Failed - expected " + new String(Hex.encode(output)) + " got " + new String(Hex.encode(out)));
-        }
-    }
-
-    public void testPBEonSecretKeyHmac(
-        String  hmacName,
-        byte[]  output)
-    {
-        SecretKey           key;
-        byte[]              out;
-        Mac                 mac;
-
-        try
-        {
-            SecretKeyFactory    fact = SecretKeyFactory.getInstance(hmacName, "BC");
-
-            key = fact.generateSecret(new PBEKeySpec("hello".toCharArray(), new byte[20], 100, 160));
-
-            mac = Mac.getInstance("HMAC-SHA1", "BC");
-        }
-        catch (Exception e)
-        {
-            fail("Failed - exception " + e.toString(), e);
-            return;
-        }
-
-        try
-        {
-            mac.init(key);
-        }
-        catch (Exception e)
-        {
-            fail("Failed - exception " + e.toString(), e);
-            return;
-        }
-
-        mac.reset();
-
-        mac.update(message, 0, message.length);
-
-        out = mac.doFinal();
-
-        if (!Arrays.areEqual(out, output))
-        {
-            fail("Failed - expected " + new String(Hex.encode(output)) + " got " + new String(Hex.encode(out)));
-        }
-    }
-
-    private void testCipherNameWithWrap(String name, String simpleName)
-        throws Exception
-    {
-        KeyGenerator kg = KeyGenerator.getInstance("AES");
-        kg.init(new SecureRandom());
-        SecretKey key = kg.generateKey();
-
-        byte[] salt = {
-                        (byte)0xc7, (byte)0x73, (byte)0x21, (byte)0x8c,
-                        (byte)0x7e, (byte)0xc8, (byte)0xee, (byte)0x99
-                        };
-        char[] password = { 'p','a','s','s','w','o','r','d' };
-
-        PBEParameterSpec pbeParamSpec = new PBEParameterSpec(salt, 20);
-        PBEKeySpec pbeKeySpec = new PBEKeySpec(password);
-        SecretKeyFactory keyFac =
-        SecretKeyFactory.getInstance(name);
-        SecretKey pbeKey = keyFac.generateSecret(pbeKeySpec);
-        Cipher pbeEncryptCipher = Cipher.getInstance(name, "BC");
-
-        pbeEncryptCipher.init(Cipher.WRAP_MODE, pbeKey, pbeParamSpec);
-
-        byte[] symKeyBytes = pbeEncryptCipher.wrap(key);
-
-        Cipher simpleCipher = Cipher.getInstance(simpleName, "BC");
-
-        simpleCipher.init(Cipher.UNWRAP_MODE, pbeKey, pbeParamSpec);
-
-        SecretKey unwrappedKey = (SecretKey)simpleCipher.unwrap(symKeyBytes, "AES", Cipher.SECRET_KEY);
-
-        if (!Arrays.areEqual(unwrappedKey.getEncoded(), key.getEncoded()))
-        {
-            fail("key mismatch on unwrapping");
-        }
-    }
-
-    public void performTest()
-        throws Exception
-    {
-        byte[] input = Hex.decode("1234567890abcdefabcdef1234567890fedbca098765");
-
-        //
-        // DES
-        //
-        Cipher  cEnc = Cipher.getInstance("DES/CBC/PKCS7Padding", "BC");
-
-        cEnc.init(Cipher.ENCRYPT_MODE,
-            new SecretKeySpec(Hex.decode("30e69252758e5346"), "DES"),
-            new IvParameterSpec(Hex.decode("7c1c1ab9c454a688")));
-
-        byte[]  out = cEnc.doFinal(input);
-
-        char[]  password = { 'p', 'a', 's', 's', 'w', 'o', 'r', 'd' };
-
-        Cipher  cDec = makePBECipherUsingParam(
-                            "PBEWithSHA1AndDES",
-                            Cipher.DECRYPT_MODE,
-                            password,
-                            Hex.decode("7d60435f02e9e0ae"),
-                            2048);
-
-        byte[]  in = cDec.doFinal(out);
-
-        if (!Arrays.areEqual(input, in))
-        {
-            fail("DES failed");
-        }
-
-        cDec = makePBECipherWithoutParam(
-                "PBEWithSHA1AndDES",
-                Cipher.DECRYPT_MODE,
-                password,
-                Hex.decode("7d60435f02e9e0ae"),
-                2048);
-
-        in = cDec.doFinal(out);
-        
-        if (!Arrays.areEqual(input, in))
-        {
-            fail("DES failed without param");
-        }
-        
-        //
-        // DESede
-        //
-        cEnc = Cipher.getInstance("DESede/CBC/PKCS7Padding", "BC");
-
-        cEnc.init(Cipher.ENCRYPT_MODE,
-            new SecretKeySpec(Hex.decode("732f2d33c801732b7206756cbd44f9c1c103ddd97c7cbe8e"), "DES"),
-            new IvParameterSpec(Hex.decode("b07bf522c8d608b8")));
-
-        out = cEnc.doFinal(input);
-
-        cDec = makePBECipherUsingParam(
-                            "PBEWithSHAAnd3-KeyTripleDES-CBC",
-                            Cipher.DECRYPT_MODE,
-                            password,
-                            Hex.decode("7d60435f02e9e0ae"),
-                            2048);
-
-        in = cDec.doFinal(out);
-
-        if (!Arrays.areEqual(input, in))
-        {
-            fail("DESede failed");
-        }
-
-        //
-        // 40Bit RC2
-        //
-        cEnc = Cipher.getInstance("RC2/CBC/PKCS7Padding", "BC");
-
-        cEnc.init(Cipher.ENCRYPT_MODE,
-            new SecretKeySpec(Hex.decode("732f2d33c8"), "RC2"),
-            new IvParameterSpec(Hex.decode("b07bf522c8d608b8")));
-
-        out = cEnc.doFinal(input);
-
-        cDec = makePBECipherUsingParam(
-                            "PBEWithSHAAnd40BitRC2-CBC",
-                            Cipher.DECRYPT_MODE,
-                            password,
-                            Hex.decode("7d60435f02e9e0ae"),
-                            2048);
-
-        in = cDec.doFinal(out);
-
-        if (!Arrays.areEqual(input, in))
-        {
-            fail("RC2 failed");
-        }
-
-        //
-        // 128bit RC4
-        //
-        cEnc = Cipher.getInstance("RC4", "BC");
-
-        cEnc.init(Cipher.ENCRYPT_MODE,
-            new SecretKeySpec(Hex.decode("732f2d33c801732b7206756cbd44f9c1"), "RC4"));
-
-        out = cEnc.doFinal(input);
-
-        cDec = makePBECipherUsingParam(
-                            "PBEWithSHAAnd128BitRC4",
-                            Cipher.DECRYPT_MODE,
-                            password,
-                            Hex.decode("7d60435f02e9e0ae"),
-                            2048);
-
-        in = cDec.doFinal(out);
-
-        if (!Arrays.areEqual(input, in))
-        {
-            fail("RC4 failed");
-        }
-
-        cDec = makePBECipherWithoutParam(
-                "PBEWithSHAAnd128BitRC4",
-                Cipher.DECRYPT_MODE,
-                password,
-                Hex.decode("7d60435f02e9e0ae"),
-                2048);
-
-        in = cDec.doFinal(out);
-        
-        if (!Arrays.areEqual(input, in))
-        {
-            fail("RC4 failed without param");
-        }
-
-        for (int i = 0; i != pkcs12Tests.length; i++)
-        {
-            pkcs12Tests[i].perform();
-        }
-        
-        for (int i = 0; i != openSSLTests.length; i++)
-        {
-            openSSLTests[i].perform();
-        }
-
-        testPBEHMac("PBEWithHMacSHA1", hMac1);
-        testPBEHMac("PBEWithHMacRIPEMD160", hMac2);
-
-        testPBEonSecretKeyHmac("PBKDF2WithHmacSHA1", hMac3);
-
-        testCipherNameWithWrap("PBEWITHSHA256AND128BITAES-CBC-BC", "AES/CBC/PKCS5Padding");
-        testCipherNameWithWrap("PBEWITHSHAAND40BITRC4", "RC4");
-        testCipherNameWithWrap("PBEWITHSHAAND128BITRC4", "RC4");
-
-        checkPBE("PBKDF2WithHmacSHA1", true, "f14687fc31a66e2f7cc01d0a65f687961bd27e20", "6f6579193d6433a3e4600b243bb390674f04a615");
-    }
-
-    private void checkPBE(String baseAlg, boolean defIsUTF8, String utf8, String eightBit)
-        throws Exception
-    {
-        byte[] utf8K = Hex.decode(utf8);
-        byte[] ascK = Hex.decode(eightBit);
-
-        SecretKeyFactory f = SecretKeyFactory.getInstance(baseAlg, "BC");
-        KeySpec ks1 = new PBEKeySpec("\u0141\u0142".toCharArray(), new byte[20], 4096, 160);
-        if (!Arrays.areEqual((defIsUTF8) ? utf8K : ascK, f.generateSecret(ks1).getEncoded()))
-        {
-            fail(baseAlg + " wrong PBKDF2 k1 key generated, got : " + new String(Hex.encode(f.generateSecret(ks1).getEncoded())));
-        }
-
-        KeySpec ks2 = new PBEKeySpec("\u0041\u0042".toCharArray(), new byte[20], 4096, 160);
-        if (!Arrays.areEqual(ascK, f.generateSecret(ks2).getEncoded()))
-        {
-            fail(baseAlg + " wrong PBKDF2 k2 key generated");
-        }
-        f = SecretKeyFactory.getInstance(baseAlg + "AndUTF8", "BC");
-        ks1 = new PBEKeySpec("\u0141\u0142".toCharArray(), new byte[20], 4096, 160);
-        if (!Arrays.areEqual(utf8K, f.generateSecret(ks1).getEncoded()))
-        {
-            fail(baseAlg + " wrong PBKDF2 k1 utf8 key generated");
-        }
-
-        ks2 = new PBEKeySpec("\u0041\u0042".toCharArray(), new byte[20], 4096, 160);
-        if (!Arrays.areEqual(ascK, f.generateSecret(ks2).getEncoded()))
-        {
-            fail(baseAlg + " wrong PBKDF2 k2 utf8 key generated");
-        }
-        f = SecretKeyFactory.getInstance(baseAlg + "And8BIT", "BC");
-        ks1 = new PBEKeySpec("\u0141\u0142".toCharArray(), new byte[20], 4096, 160);
-        if (!Arrays.areEqual(ascK, f.generateSecret(ks1).getEncoded()))
-        {
-            fail(baseAlg + " wrong PBKDF2 k1 8bit key generated");
-        }
-
-        ks2 = new PBEKeySpec("\u0041\u0042".toCharArray(), new byte[20], 4096, 160);
-        if (!Arrays.areEqual(ascK, f.generateSecret(ks2).getEncoded()))
-        {
-            fail(baseAlg + " wrong PBKDF2 k2 8bit key generated");
-        }
-    }
-
-    public String getName()
-    {
-        return "PBETest";
-    }
-
-
-    public static void main(
-        String[]    args)
-    {
-        Security.addProvider(new BouncyCastleProvider());
-
-        runTest(new PBETest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/PEMData.java b/bcprov/src/main/java/org/bouncycastle/jce/provider/test/PEMData.java
deleted file mode 100644
index e78d4c8..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/PEMData.java
+++ /dev/null
@@ -1,114 +0,0 @@
-package org.bouncycastle.jce.provider.test;
-
-public class PEMData
-{
-    public static String CERTIFICATE_1 =
-       "-----BEGIN X509 CERTIFICATE-----\r"
-     + "MIIDXjCCAsegAwIBAgIBBzANBgkqhkiG9w0BAQQFADCBtzELMAkGA1UEBhMCQVUx\r"
-     + "ETAPBgNVBAgTCFZpY3RvcmlhMRgwFgYDVQQHEw9Tb3V0aCBNZWxib3VybmUxGjAY\r"
-     + "BgNVBAoTEUNvbm5lY3QgNCBQdHkgTHRkMR4wHAYDVQQLExVDZXJ0aWZpY2F0ZSBB\r"
-     + "dXRob3JpdHkxFTATBgNVBAMTDENvbm5lY3QgNCBDQTEoMCYGCSqGSIb3DQEJARYZ\r"
-     + "d2VibWFzdGVyQGNvbm5lY3Q0LmNvbS5hdTAeFw0wMDA2MDIwNzU2MjFaFw0wMTA2\r"
-     + "MDIwNzU2MjFaMIG4MQswCQYDVQQGEwJBVTERMA8GA1UECBMIVmljdG9yaWExGDAW\r"
-     + "BgNVBAcTD1NvdXRoIE1lbGJvdXJuZTEaMBgGA1UEChMRQ29ubmVjdCA0IFB0eSBM\r"
-     + "dGQxFzAVBgNVBAsTDldlYnNlcnZlciBUZWFtMR0wGwYDVQQDExR3d3cyLmNvbm5l\r"
-     + "Y3Q0LmNvbS5hdTEoMCYGCSqGSIb3DQEJARYZd2VibWFzdGVyQGNvbm5lY3Q0LmNv\r"
-     + "bS5hdTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEArvDxclKAhyv7Q/Wmr2re\r"
-     + "Gw4XL9Cnh9e+6VgWy2AWNy/MVeXdlxzd7QAuc1eOWQkGQEiLPy5XQtTY+sBUJ3AO\r"
-     + "Rvd2fEVJIcjf29ey7bYua9J/vz5MG2KYo9/WCHIwqD9mmG9g0xLcfwq/s8ZJBswE\r"
-     + "7sb85VU+h94PTvsWOsWuKaECAwEAAaN3MHUwJAYDVR0RBB0wG4EZd2VibWFzdGVy\r"
-     + "QGNvbm5lY3Q0LmNvbS5hdTA6BglghkgBhvhCAQ0ELRYrbW9kX3NzbCBnZW5lcmF0\r"
-     + "ZWQgY3VzdG9tIHNlcnZlciBjZXJ0aWZpY2F0ZTARBglghkgBhvhCAQEEBAMCBkAw\r"
-     + "DQYJKoZIhvcNAQEEBQADgYEAotccfKpwSsIxM1Hae8DR7M/Rw8dg/RqOWx45HNVL\r"
-     + "iBS4/3N/TO195yeQKbfmzbAA2jbPVvIvGgTxPgO1MP4ZgvgRhasaa0qCJCkWvpM4\r"
-     + "yQf33vOiYQbpv4rTwzU8AmRlBG45WdjyNIigGV+oRc61aKCTnLq7zB8N3z1TF/bF\r"
-     + "5/8=\r"
-     + "-----END X509 CERTIFICATE-----\r";
-
-    public static String CERTIFICATE_2 =
-       "-----BEGIN CERTIFICATE-----\n"
-     + "MIIDXjCCAsegAwIBAgIBBzANBgkqhkiG9w0BAQQFADCBtzELMAkGA1UEBhMCQVUx\n"
-     + "ETAPBgNVBAgTCFZpY3RvcmlhMRgwFgYDVQQHEw9Tb3V0aCBNZWxib3VybmUxGjAY\n"
-     + "BgNVBAoTEUNvbm5lY3QgNCBQdHkgTHRkMR4wHAYDVQQLExVDZXJ0aWZpY2F0ZSBB\n"
-     + "dXRob3JpdHkxFTATBgNVBAMTDENvbm5lY3QgNCBDQTEoMCYGCSqGSIb3DQEJARYZ\n"
-     + "d2VibWFzdGVyQGNvbm5lY3Q0LmNvbS5hdTAeFw0wMDA2MDIwNzU2MjFaFw0wMTA2\n"
-     + "MDIwNzU2MjFaMIG4MQswCQYDVQQGEwJBVTERMA8GA1UECBMIVmljdG9yaWExGDAW\n"
-     + "BgNVBAcTD1NvdXRoIE1lbGJvdXJuZTEaMBgGA1UEChMRQ29ubmVjdCA0IFB0eSBM\n"
-     + "dGQxFzAVBgNVBAsTDldlYnNlcnZlciBUZWFtMR0wGwYDVQQDExR3d3cyLmNvbm5l\n"
-     + "Y3Q0LmNvbS5hdTEoMCYGCSqGSIb3DQEJARYZd2VibWFzdGVyQGNvbm5lY3Q0LmNv\n"
-     + "bS5hdTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEArvDxclKAhyv7Q/Wmr2re\n"
-     + "Gw4XL9Cnh9e+6VgWy2AWNy/MVeXdlxzd7QAuc1eOWQkGQEiLPy5XQtTY+sBUJ3AO\n"
-     + "Rvd2fEVJIcjf29ey7bYua9J/vz5MG2KYo9/WCHIwqD9mmG9g0xLcfwq/s8ZJBswE\n"
-     + "7sb85VU+h94PTvsWOsWuKaECAwEAAaN3MHUwJAYDVR0RBB0wG4EZd2VibWFzdGVy\n"
-     + "QGNvbm5lY3Q0LmNvbS5hdTA6BglghkgBhvhCAQ0ELRYrbW9kX3NzbCBnZW5lcmF0\n"
-     + "ZWQgY3VzdG9tIHNlcnZlciBjZXJ0aWZpY2F0ZTARBglghkgBhvhCAQEEBAMCBkAw\n"
-     + "DQYJKoZIhvcNAQEEBQADgYEAotccfKpwSsIxM1Hae8DR7M/Rw8dg/RqOWx45HNVL\n"
-     + "iBS4/3N/TO195yeQKbfmzbAA2jbPVvIvGgTxPgO1MP4ZgvgRhasaa0qCJCkWvpM4\n"
-     + "yQf33vOiYQbpv4rTwzU8AmRlBG45WdjyNIigGV+oRc61aKCTnLq7zB8N3z1TF/bF\n"
-     + "5/8=\n"
-     + "-----END CERTIFICATE-----\n";
-
-    public static String CRL_1 =
-       "-----BEGIN X509 CRL-----\r\n"
-     + "MIICjTCCAfowDQYJKoZIhvcNAQECBQAwXzELMAkGA1UEBhMCVVMxIDAeBgNVBAoT\r\n"
-     + "F1JTQSBEYXRhIFNlY3VyaXR5LCBJbmMuMS4wLAYDVQQLEyVTZWN1cmUgU2VydmVy\r\n"
-     + "IENlcnRpZmljYXRpb24gQXV0aG9yaXR5Fw05NTA1MDIwMjEyMjZaFw05NTA2MDEw\r\n"
-     + "MDAxNDlaMIIBaDAWAgUCQQAABBcNOTUwMjAxMTcyNDI2WjAWAgUCQQAACRcNOTUw\r\n"
-     + "MjEwMDIxNjM5WjAWAgUCQQAADxcNOTUwMjI0MDAxMjQ5WjAWAgUCQQAADBcNOTUw\r\n"
-     + "MjI1MDA0NjQ0WjAWAgUCQQAAGxcNOTUwMzEzMTg0MDQ5WjAWAgUCQQAAFhcNOTUw\r\n"
-     + "MzE1MTkxNjU0WjAWAgUCQQAAGhcNOTUwMzE1MTk0MDQxWjAWAgUCQQAAHxcNOTUw\r\n"
-     + "MzI0MTk0NDMzWjAWAgUCcgAABRcNOTUwMzI5MjAwNzExWjAWAgUCcgAAERcNOTUw\r\n"
-     + "MzMwMDIzNDI2WjAWAgUCQQAAIBcNOTUwNDA3MDExMzIxWjAWAgUCcgAAHhcNOTUw\r\n"
-     + "NDA4MDAwMjU5WjAWAgUCcgAAQRcNOTUwNDI4MTcxNzI0WjAWAgUCcgAAOBcNOTUw\r\n"
-     + "NDI4MTcyNzIxWjAWAgUCcgAATBcNOTUwNTAyMDIxMjI2WjANBgkqhkiG9w0BAQIF\r\n"
-     + "AAN+AHqOEJXSDejYy0UwxxrH/9+N2z5xu/if0J6qQmK92W0hW158wpJg+ovV3+wQ\r\n"
-     + "wvIEPRL2rocL0tKfAsVq1IawSJzSNgxG0lrcla3MrJBnZ4GaZDu4FutZh72MR3Gt\r\n"
-     + "JaAL3iTJHJD55kK2D/VoyY1djlsPuNh6AEgdVwFAyp0v\r\n"
-     + "-----END X509 CRL-----\r\n";
-
-    public static String CRL_2 =
-       "-----BEGIN CRL-----\r\n"
-     + "MIICjTCCAfowDQYJKoZIhvcNAQECBQAwXzELMAkGA1UEBhMCVVMxIDAeBgNVBAoT\r\n"
-     + "F1JTQSBEYXRhIFNlY3VyaXR5LCBJbmMuMS4wLAYDVQQLEyVTZWN1cmUgU2VydmVy\r\n"
-     + "IENlcnRpZmljYXRpb24gQXV0aG9yaXR5Fw05NTA1MDIwMjEyMjZaFw05NTA2MDEw\r\n"
-     + "MDAxNDlaMIIBaDAWAgUCQQAABBcNOTUwMjAxMTcyNDI2WjAWAgUCQQAACRcNOTUw\r\n"
-     + "MjEwMDIxNjM5WjAWAgUCQQAADxcNOTUwMjI0MDAxMjQ5WjAWAgUCQQAADBcNOTUw\r\n"
-     + "MjI1MDA0NjQ0WjAWAgUCQQAAGxcNOTUwMzEzMTg0MDQ5WjAWAgUCQQAAFhcNOTUw\r\n"
-     + "MzE1MTkxNjU0WjAWAgUCQQAAGhcNOTUwMzE1MTk0MDQxWjAWAgUCQQAAHxcNOTUw\r\n"
-     + "MzI0MTk0NDMzWjAWAgUCcgAABRcNOTUwMzI5MjAwNzExWjAWAgUCcgAAERcNOTUw\r\n"
-     + "MzMwMDIzNDI2WjAWAgUCQQAAIBcNOTUwNDA3MDExMzIxWjAWAgUCcgAAHhcNOTUw\r\n"
-     + "NDA4MDAwMjU5WjAWAgUCcgAAQRcNOTUwNDI4MTcxNzI0WjAWAgUCcgAAOBcNOTUw\r\n"
-     + "NDI4MTcyNzIxWjAWAgUCcgAATBcNOTUwNTAyMDIxMjI2WjANBgkqhkiG9w0BAQIF\r\n"
-     + "AAN+AHqOEJXSDejYy0UwxxrH/9+N2z5xu/if0J6qQmK92W0hW158wpJg+ovV3+wQ\r\n"
-     + "wvIEPRL2rocL0tKfAsVq1IawSJzSNgxG0lrcla3MrJBnZ4GaZDu4FutZh72MR3Gt\r\n"
-     + "JaAL3iTJHJD55kK2D/VoyY1djlsPuNh6AEgdVwFAyp0v\r\n"
-     + "-----END CRL-----\r\n";
-
-    static String ATTRIBUTE_CERTIFICATE_1 =
-       "-----BEGIN X509 ATTRIBUTE CERTIFICATE-----\r\n"
-     + "MIIBuDCCASECAQEwZ6BlMGCkXjBcMQswCQYDVQQGEwJBVTEoMCYGA1UEChMfVGhl\r\n"
-     + "IExlZ2lvbiBvZiB0aGUgQm91bmN5IENhc3RsZTEjMCEGA1UECxMaQm91bmN5IFBy\r\n"
-     + "aW1hcnkgQ2VydGlmaWNhdGUCARSgYjBgpF4wXDELMAkGA1UEBhMCQVUxKDAmBgNV\r\n"
-     + "BAoTH1RoZSBMZWdpb24gb2YgdGhlIEJvdW5jeSBDYXN0bGUxIzAhBgNVBAsTGkJv\r\n"
-     + "dW5jeSBQcmltYXJ5IENlcnRpZmljYXRlMA0GCSqGSIb3DQEBBQUAAgEBMCIYDzIw\r\n"
-     + "MDUwNjEwMDI0MTMzWhgPMjAwNTA2MTAwMjQzMTNaMBkwFwYDVRhIMRAwDoEMREFV\r\n"
-     + "MTIzNDU2Nzg5MA0GCSqGSIb3DQEBBQUAA4GBALAYXT9zdxSR5zdPLAon1xIPehgI\r\n"
-     + "NZhjM7w0uu3OdzSV5sC31X1Kx9vi5RIWiM9VimRTwbQIod9POttD5QMXCwQb/fm7\r\n"
-     + "eiJqL2YBIXOeClB19VrQe8xQtMFbyuFpDiM7QdvIam9ShZZMEMGjv9QHI64M4b0G\r\n"
-     + "odUBlSsJwPPQjZSU\r\n"
-     + "-----END X509 ATTRIBUTE CERTIFICATE-----\r\n";
-
-    static String ATTRIBUTE_CERTIFICATE_2 =
-       "-----BEGIN ATTRIBUTE CERTIFICATE-----\r\n"
-     + "MIIBuDCCASECAQEwZ6BlMGCkXjBcMQswCQYDVQQGEwJBVTEoMCYGA1UEChMfVGhl\r\n"
-     + "IExlZ2lvbiBvZiB0aGUgQm91bmN5IENhc3RsZTEjMCEGA1UECxMaQm91bmN5IFBy\r\n"
-     + "aW1hcnkgQ2VydGlmaWNhdGUCARSgYjBgpF4wXDELMAkGA1UEBhMCQVUxKDAmBgNV\r\n"
-     + "BAoTH1RoZSBMZWdpb24gb2YgdGhlIEJvdW5jeSBDYXN0bGUxIzAhBgNVBAsTGkJv\r\n"
-     + "dW5jeSBQcmltYXJ5IENlcnRpZmljYXRlMA0GCSqGSIb3DQEBBQUAAgEBMCIYDzIw\r\n"
-     + "MDUwNjEwMDI0MTMzWhgPMjAwNTA2MTAwMjQzMTNaMBkwFwYDVRhIMRAwDoEMREFV\r\n"
-     + "MTIzNDU2Nzg5MA0GCSqGSIb3DQEBBQUAA4GBALAYXT9zdxSR5zdPLAon1xIPehgI\r\n"
-     + "NZhjM7w0uu3OdzSV5sC31X1Kx9vi5RIWiM9VimRTwbQIod9POttD5QMXCwQb/fm7\r\n"
-     + "eiJqL2YBIXOeClB19VrQe8xQtMFbyuFpDiM7QdvIam9ShZZMEMGjv9QHI64M4b0G\r\n"
-     + "odUBlSsJwPPQjZSU\r\n"
-     + "-----END ATTRIBUTE CERTIFICATE-----\r\n";
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/PKCS10CertRequestTest.java b/bcprov/src/main/java/org/bouncycastle/jce/provider/test/PKCS10CertRequestTest.java
deleted file mode 100644
index 65ed291..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/PKCS10CertRequestTest.java
+++ /dev/null
@@ -1,556 +0,0 @@
-package org.bouncycastle.jce.provider.test;
-
-import java.math.BigInteger;
-import java.security.KeyFactory;
-import java.security.KeyPair;
-import java.security.KeyPairGenerator;
-import java.security.PrivateKey;
-import java.security.PublicKey;
-import java.security.SecureRandom;
-import java.security.Security;
-import java.security.Signature;
-import java.security.spec.RSAPrivateCrtKeySpec;
-import java.security.spec.RSAPublicKeySpec;
-import java.util.Hashtable;
-import java.util.Vector;
-
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.DEROctetString;
-import org.bouncycastle.asn1.DERSet;
-import org.bouncycastle.asn1.cryptopro.CryptoProObjectIdentifiers;
-import org.bouncycastle.asn1.pkcs.Attribute;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.asn1.x509.BasicConstraints;
-import org.bouncycastle.asn1.x509.KeyUsage;
-import org.bouncycastle.asn1.x509.SubjectKeyIdentifier;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.bouncycastle.asn1.x509.X509Extension;
-import org.bouncycastle.asn1.x509.X509Extensions;
-import org.bouncycastle.asn1.x509.X509Name;
-import org.bouncycastle.asn1.x9.X9ObjectIdentifiers;
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.digests.SHA1Digest;
-import org.bouncycastle.jce.ECGOST3410NamedCurveTable;
-import org.bouncycastle.jce.ECNamedCurveTable;
-import org.bouncycastle.jce.PKCS10CertificationRequest;
-import org.bouncycastle.jce.X509Principal;
-import org.bouncycastle.jce.interfaces.ECPointEncoder;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.jce.spec.ECNamedCurveParameterSpec;
-import org.bouncycastle.jce.spec.ECParameterSpec;
-import org.bouncycastle.jce.spec.ECPrivateKeySpec;
-import org.bouncycastle.jce.spec.ECPublicKeySpec;
-import org.bouncycastle.math.ec.ECCurve;
-import org.bouncycastle.util.encoders.Base64;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-
-/**
- **/
-public class PKCS10CertRequestTest
-    extends SimpleTest
-{
-    private byte[] gost3410EC_A = Base64.decode(
-  "MIIBOzCB6wIBADB/MQ0wCwYDVQQDEwR0ZXN0MRUwEwYDVQQKEwxEZW1vcyBDbyBMdGQxHjAcBgNV"
- +"BAsTFUNyeXB0b2dyYXBoeSBkaXZpc2lvbjEPMA0GA1UEBxMGTW9zY293MQswCQYDVQQGEwJydTEZ"
- +"MBcGCSqGSIb3DQEJARYKc2RiQGRvbC5ydTBjMBwGBiqFAwICEzASBgcqhQMCAiMBBgcqhQMCAh4B"
- +"A0MABEBYx0P2D7YuuZo5HgdIAUKAXcLBDZ+4LYFgbKjrfStVfH59lc40BQ2FZ7M703hLpXK8GiBQ"
- +"GEYpKaAuQZnMIpByoAAwCAYGKoUDAgIDA0EAgXMcTrhdOY2Er2tHOSAgnMezqrYxocZTWhxmW5Rl"
- +"JY6lbXH5rndCn4swFzXU+YhgAsJv1wQBaoZEWRl5WV4/nA==");
-
-    private byte[] gost3410EC_B = Base64.decode(
-  "MIIBPTCB7QIBADCBgDENMAsGA1UEAxMEdGVzdDEWMBQGA1UEChMNRGVtb3MgQ28gTHRkLjEeMBwG"
- +"A1UECxMVQ3J5cHRvZ3JhcGh5IGRpdmlzaW9uMQ8wDQYDVQQHEwZNb3Njb3cxCzAJBgNVBAYTAnJ1"
- +"MRkwFwYJKoZIhvcNAQkBFgpzZGJAZG9sLnJ1MGMwHAYGKoUDAgITMBIGByqFAwICIwIGByqFAwIC"
- +"HgEDQwAEQI5SLoWT7dZVilbV9j5B/fyIDuDs6x4pjqNC2TtFYbpRHrk/Wc5g/mcHvD80tsm5o1C7"
- +"7cizNzkvAVUM4VT4Dz6gADAIBgYqhQMCAgMDQQAoT5TwJ8o+bSrxckymyo3diwG7ZbSytX4sRiKy"
- +"wXPWRS9LlBvPO2NqwpS2HUnxSU8rzfL9fJcybATf7Yt1OEVq");
-
-    private byte[] gost3410EC_C = Base64.decode(
-  "MIIBRDCB9AIBADCBhzEVMBMGA1UEAxMMdGVzdCByZXF1ZXN0MRUwEwYDVQQKEwxEZW1vcyBDbyBM"
- +"dGQxHjAcBgNVBAsTFUNyeXB0b2dyYXBoeSBkaXZpc2lvbjEPMA0GA1UEBxMGTW9zY293MQswCQYD"
- +"VQQGEwJydTEZMBcGCSqGSIb3DQEJARYKc2RiQGRvbC5ydTBjMBwGBiqFAwICEzASBgcqhQMCAiMD"
- +"BgcqhQMCAh4BA0MABEBcmGh7OmR4iqqj+ycYo1S1fS7r5PhisSQU2Ezuz8wmmmR2zeTZkdMYCOBa"
- +"UTMNms0msW3wuYDho7nTDNscHTB5oAAwCAYGKoUDAgIDA0EAVoOMbfyo1Un4Ss7WQrUjHJoiaYW8"
- +"Ime5LeGGU2iW3ieAv6es/FdMrwTKkqn5dhd3aL/itFg5oQbhyfXw5yw/QQ==");
-    
-    private byte[] gost3410EC_ExA = Base64.decode(
-     "MIIBOzCB6wIBADB/MQ0wCwYDVQQDEwR0ZXN0MRUwEwYDVQQKEwxEZW1vcyBDbyBMdGQxHjAcBgNV"
-   + "BAsTFUNyeXB0b2dyYXBoeSBkaXZpc2lvbjEPMA0GA1UEBxMGTW9zY293MQswCQYDVQQGEwJydTEZ"
-   + "MBcGCSqGSIb3DQEJARYKc2RiQGRvbC5ydTBjMBwGBiqFAwICEzASBgcqhQMCAiQABgcqhQMCAh4B"
-   + "A0MABEDkqNT/3f8NHj6EUiWnK4JbVZBh31bEpkwq9z3jf0u8ZndG56Vt+K1ZB6EpFxLT7hSIos0w"
-   + "weZ2YuTZ4w43OgodoAAwCAYGKoUDAgIDA0EASk/IUXWxoi6NtcUGVF23VRV1L3undB4sRZLp4Vho"
-   + "gQ7m3CMbZFfJ2cPu6QyarseXGYHmazoirH5lGjEo535c1g==");
-
-    private byte[] gost3410EC_ExB = Base64.decode(
-      "MIIBPTCB7QIBADCBgDENMAsGA1UEAxMEdGVzdDEWMBQGA1UEChMNRGVtb3MgQ28gTHRkLjEeMBwG"
-    + "A1UECxMVQ3J5cHRvZ3JhcGh5IGRpdmlzaW9uMQ8wDQYDVQQHEwZNb3Njb3cxCzAJBgNVBAYTAnJ1"
-    + "MRkwFwYJKoZIhvcNAQkBFgpzZGJAZG9sLnJ1MGMwHAYGKoUDAgITMBIGByqFAwICJAEGByqFAwIC"
-    + "HgEDQwAEQMBWYUKPy/1Kxad9ChAmgoSWSYOQxRnXo7KEGLU5RNSXA4qMUvArWzvhav+EYUfTbWLh"
-    + "09nELDyHt2XQcvgQHnSgADAIBgYqhQMCAgMDQQAdaNhgH/ElHp64mbMaEo1tPCg9Q22McxpH8rCz"
-    + "E0QBpF4H5mSSQVGI5OAXHToetnNuh7gHHSynyCupYDEHTbkZ");
-
-    public String getName()
-    {
-        return "PKCS10CertRequest";
-    }
-
-    private void generationTest(int keySize, String keyName, String sigName, String provider)
-        throws Exception
-    {
-        KeyPairGenerator kpg = KeyPairGenerator.getInstance(keyName, "BC");
-
-        kpg.initialize(keySize);
-
-        KeyPair kp = kpg.genKeyPair();
-
-        Hashtable                   attrs = new Hashtable();
-
-        attrs.put(X509Principal.C, "AU");
-        attrs.put(X509Principal.O, "The Legion of the Bouncy Castle");
-        attrs.put(X509Principal.L, "Melbourne");
-        attrs.put(X509Principal.ST, "Victoria");
-        attrs.put(X509Principal.EmailAddress, "feedback-crypto@bouncycastle.org");
-
-        Vector                      order = new Vector();
-
-        order.addElement(X509Principal.C);
-        order.addElement(X509Principal.O);
-        order.addElement(X509Principal.L);
-        order.addElement(X509Principal.ST);
-        order.addElement(X509Principal.EmailAddress);
-
-        X509Name    subject = new X509Name(order, attrs);
-
-        PKCS10CertificationRequest req1 = new PKCS10CertificationRequest(
-                                                    sigName,
-                                                    subject,
-                                                    kp.getPublic(),
-                                                    null,
-                                                    kp.getPrivate(), provider);
-                            
-        byte[]  bytes = req1.getEncoded();
-
-        PKCS10CertificationRequest req2 = new PKCS10CertificationRequest(bytes);
-
-        if (!req2.verify(provider))
-        {
-            fail(sigName + ": Failed verify check.");
-        }
-
-        if (!req2.getPublicKey(provider).equals(req1.getPublicKey(provider)))
-        {
-            fail(keyName + ": Failed public key check.");
-        }
-    }
-    
-    /*
-     * we generate a self signed certificate for the sake of testing - SHA224withECDSA
-     */
-    private void createECRequest(String algorithm, ASN1ObjectIdentifier algOid, ASN1ObjectIdentifier curveOid)
-        throws Exception
-    {
-        ECNamedCurveParameterSpec spec = ECNamedCurveTable.getParameterSpec(curveOid.getId());
-        KeyPairGenerator ecGen = KeyPairGenerator.getInstance("ECDSA", "BC");
-
-        ecGen.initialize(spec);
-
-        //
-        // set up the keys
-        //
-        PrivateKey          privKey;
-        PublicKey           pubKey;
-
-        KeyPair pair = ecGen.generateKeyPair();
-
-        privKey = pair.getPrivate();
-        pubKey = pair.getPublic();
-
-        PKCS10CertificationRequest req = new PKCS10CertificationRequest(
-                        algorithm, new X509Name("CN=XXX"), pubKey, null, privKey);
-        if (!req.verify())
-        {
-            fail("Failed verify check EC.");
-        }
-
-        req = new PKCS10CertificationRequest(req.getEncoded());
-        if (!req.verify())
-        {
-            fail("Failed verify check EC encoded.");
-        }
-        
-        //
-        // try with point compression turned off
-        //
-        ((ECPointEncoder)pubKey).setPointFormat("UNCOMPRESSED");
-        
-        req = new PKCS10CertificationRequest(
-                        algorithm, new X509Name("CN=XXX"), pubKey, null, privKey);
-        if (!req.verify())
-        {
-            fail("Failed verify check EC uncompressed.");
-        }
-        
-        req = new PKCS10CertificationRequest(req.getEncoded());
-        if (!req.verify())
-        {
-            fail("Failed verify check EC uncompressed encoded.");
-        }
-        
-        if (!req.getSignatureAlgorithm().getObjectId().equals(algOid))
-        {
-            fail("ECDSA oid incorrect.");
-        }
-        
-        if (req.getSignatureAlgorithm().getParameters() != null)
-        {
-            fail("ECDSA parameters incorrect.");
-        }
-        
-        Signature sig = Signature.getInstance(algorithm, "BC");
-        
-        sig.initVerify(pubKey);
-        
-        sig.update(req.getCertificationRequestInfo().getEncoded());
-        
-        if (!sig.verify(req.getSignature().getBytes()))
-        {
-            fail("signature not mapped correctly.");
-        }
-    }
-
-    private void createECRequest(String algorithm, ASN1ObjectIdentifier algOid)
-        throws Exception
-    {
-        ECCurve.Fp curve = new ECCurve.Fp(
-            new BigInteger("6864797660130609714981900799081393217269435300143305409394463459185543183397656052122559640661454554977296311391480858037121987999716643812574028291115057151"), // q (or p)
-            new BigInteger("01FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFC", 16),   // a
-            new BigInteger("0051953EB9618E1C9A1F929A21A0B68540EEA2DA725B99B315F3B8B489918EF109E156193951EC7E937B1652C0BD3BB1BF073573DF883D2C34F1EF451FD46B503F00", 16));  // b
-
-        ECParameterSpec spec = new ECParameterSpec(
-            curve,
-            curve.decodePoint(Hex.decode("0200C6858E06B70404E9CD9E3ECB662395B4429C648139053FB521F828AF606B4D3DBAA14B5E77EFE75928FE1DC127A2FFA8DE3348B3C1856A429BF97E7E31C2E5BD66")), // G
-            new BigInteger("01FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFA51868783BF2F966B7FCC0148F709A5D03BB5C9B8899C47AEBB6FB71E91386409", 16)); // n
-
-        ECPrivateKeySpec privKeySpec = new ECPrivateKeySpec(
-            new BigInteger("5769183828869504557786041598510887460263120754767955773309066354712783118202294874205844512909370791582896372147797293913785865682804434049019366394746072023"), // d
-            spec);
-
-        ECPublicKeySpec pubKeySpec = new ECPublicKeySpec(
-            curve.decodePoint(Hex.decode("02006BFDD2C9278B63C92D6624F151C9D7A822CC75BD983B17D25D74C26740380022D3D8FAF304781E416175EADF4ED6E2B47142D2454A7AC7801DD803CF44A4D1F0AC")), // Q
-            spec);
-
-        //
-        // set up the keys
-        //
-        PrivateKey          privKey;
-        PublicKey           pubKey;
-
-        KeyFactory     fact = KeyFactory.getInstance("ECDSA", "BC");
-
-        privKey = fact.generatePrivate(privKeySpec);
-        pubKey = fact.generatePublic(pubKeySpec);
-
-        PKCS10CertificationRequest req = new PKCS10CertificationRequest(
-                        algorithm, new X509Name("CN=XXX"), pubKey, null, privKey);
-        if (!req.verify())
-        {
-            fail("Failed verify check EC.");
-        }
-
-        req = new PKCS10CertificationRequest(req.getEncoded());
-        if (!req.verify())
-        {
-            fail("Failed verify check EC encoded.");
-        }
-
-        //
-        // try with point compression turned off
-        //
-        ((ECPointEncoder)pubKey).setPointFormat("UNCOMPRESSED");
-
-        req = new PKCS10CertificationRequest(
-                        algorithm, new X509Name("CN=XXX"), pubKey, null, privKey);
-        if (!req.verify())
-        {
-            fail("Failed verify check EC uncompressed.");
-        }
-
-        req = new PKCS10CertificationRequest(req.getEncoded());
-        if (!req.verify())
-        {
-            fail("Failed verify check EC uncompressed encoded.");
-        }
-
-        if (!req.getSignatureAlgorithm().getObjectId().equals(algOid))
-        {
-            fail("ECDSA oid incorrect.");
-        }
-
-        if (req.getSignatureAlgorithm().getParameters() != null)
-        {
-            fail("ECDSA parameters incorrect.");
-        }
-
-        Signature sig = Signature.getInstance(algorithm, "BC");
-
-        sig.initVerify(pubKey);
-
-        sig.update(req.getCertificationRequestInfo().getEncoded());
-
-        if (!sig.verify(req.getSignature().getBytes()))
-        {
-            fail("signature not mapped correctly.");
-        }
-    }
-
-    private void createECGOSTRequest()
-        throws Exception
-    {
-        String           algorithm = "GOST3411withECGOST3410";
-        KeyPairGenerator ecGostKpg = KeyPairGenerator.getInstance("ECGOST3410", "BC");
-
-        ecGostKpg.initialize(ECGOST3410NamedCurveTable.getParameterSpec("GostR3410-2001-CryptoPro-A"), new SecureRandom());
-
-        //
-        // set up the keys
-        //
-        KeyPair             pair = ecGostKpg.generateKeyPair();
-        PrivateKey          privKey = pair.getPrivate();
-        PublicKey           pubKey = pair.getPublic();
-
-        PKCS10CertificationRequest req = new PKCS10CertificationRequest(
-                        algorithm, new X509Name("CN=XXX"), pubKey, null, privKey);
-        if (!req.verify())
-        {
-            fail("Failed verify check EC.");
-        }
-
-        req = new PKCS10CertificationRequest(req.getEncoded());
-        if (!req.verify())
-        {
-            fail("Failed verify check EC encoded.");
-        }
-
-        if (!req.getSignatureAlgorithm().getObjectId().equals(CryptoProObjectIdentifiers.gostR3411_94_with_gostR3410_2001))
-        {
-            fail("ECGOST oid incorrect.");
-        }
-
-        if (req.getSignatureAlgorithm().getParameters() != null)
-        {
-            fail("ECGOST parameters incorrect.");
-        }
-
-        Signature sig = Signature.getInstance(algorithm, "BC");
-
-        sig.initVerify(pubKey);
-
-        sig.update(req.getCertificationRequestInfo().getEncoded());
-
-        if (!sig.verify(req.getSignature().getBytes()))
-        {
-            fail("signature not mapped correctly.");
-        }
-    }
-
-    private void createPSSTest(String algorithm)
-        throws Exception
-    {
-        RSAPublicKeySpec pubKeySpec = new RSAPublicKeySpec(
-            new BigInteger("a56e4a0e701017589a5187dc7ea841d156f2ec0e36ad52a44dfeb1e61f7ad991d8c51056ffedb162b4c0f283a12a88a394dff526ab7291cbb307ceabfce0b1dfd5cd9508096d5b2b8b6df5d671ef6377c0921cb23c270a70e2598e6ff89d19f105acc2d3f0cb35f29280e1386b6f64c4ef22e1e1f20d0ce8cffb2249bd9a2137",16),
-            new BigInteger("010001",16));
-
-        RSAPrivateCrtKeySpec privKeySpec = new RSAPrivateCrtKeySpec(
-            new BigInteger("a56e4a0e701017589a5187dc7ea841d156f2ec0e36ad52a44dfeb1e61f7ad991d8c51056ffedb162b4c0f283a12a88a394dff526ab7291cbb307ceabfce0b1dfd5cd9508096d5b2b8b6df5d671ef6377c0921cb23c270a70e2598e6ff89d19f105acc2d3f0cb35f29280e1386b6f64c4ef22e1e1f20d0ce8cffb2249bd9a2137",16),
-            new BigInteger("010001",16),
-            new BigInteger("33a5042a90b27d4f5451ca9bbbd0b44771a101af884340aef9885f2a4bbe92e894a724ac3c568c8f97853ad07c0266c8c6a3ca0929f1e8f11231884429fc4d9ae55fee896a10ce707c3ed7e734e44727a39574501a532683109c2abacaba283c31b4bd2f53c3ee37e352cee34f9e503bd80c0622ad79c6dcee883547c6a3b325",16),
-            new BigInteger("e7e8942720a877517273a356053ea2a1bc0c94aa72d55c6e86296b2dfc967948c0a72cbccca7eacb35706e09a1df55a1535bd9b3cc34160b3b6dcd3eda8e6443",16),
-            new BigInteger("b69dca1cf7d4d7ec81e75b90fcca874abcde123fd2700180aa90479b6e48de8d67ed24f9f19d85ba275874f542cd20dc723e6963364a1f9425452b269a6799fd",16),
-            new BigInteger("28fa13938655be1f8a159cbaca5a72ea190c30089e19cd274a556f36c4f6e19f554b34c077790427bbdd8dd3ede2448328f385d81b30e8e43b2fffa027861979",16),
-            new BigInteger("1a8b38f398fa712049898d7fb79ee0a77668791299cdfa09efc0e507acb21ed74301ef5bfd48be455eaeb6e1678255827580a8e4e8e14151d1510a82a3f2e729",16),
-            new BigInteger("27156aba4126d24a81f3a528cbfb27f56886f840a9f6e86e17a44b94fe9319584b8e22fdde1e5a2e3bd8aa5ba8d8584194eb2190acf832b847f13a3d24a79f4d",16));
-
-        KeyFactory  fact = KeyFactory.getInstance("RSA", "BC");
-
-        PrivateKey privKey = fact.generatePrivate(privKeySpec);
-        PublicKey pubKey = fact.generatePublic(pubKeySpec);
-
-        PKCS10CertificationRequest req = new PKCS10CertificationRequest(
-                        algorithm, new X509Name("CN=XXX"), pubKey, null, privKey);
-        if (!req.verify())
-        {
-            fail("Failed verify check PSS.");
-        }
-
-        req = new PKCS10CertificationRequest(req.getEncoded());
-        if (!req.verify())
-        {
-            fail("Failed verify check PSS encoded.");
-        }
-
-        if (!req.getSignatureAlgorithm().getObjectId().equals(PKCSObjectIdentifiers.id_RSASSA_PSS))
-        {
-            fail("PSS oid incorrect.");
-        }
-
-        if (req.getSignatureAlgorithm().getParameters() == null)
-        {
-            fail("PSS parameters incorrect.");
-        }
-
-        Signature sig = Signature.getInstance(algorithm, "BC");
-
-        sig.initVerify(pubKey);
-
-        sig.update(req.getCertificationRequestInfo().getEncoded());
-
-        if (!sig.verify(req.getSignature().getBytes()))
-        {
-            fail("signature not mapped correctly.");
-        }
-    }
-
-     // previous code found to cause a NullPointerException
-    private void nullPointerTest()
-        throws Exception
-    {
-        KeyPairGenerator keyGen = KeyPairGenerator.getInstance("RSA", "BC");
-        keyGen.initialize(1024, new SecureRandom());
-        KeyPair pair = keyGen.generateKeyPair();
-
-        Vector oids = new Vector();
-        Vector values = new Vector();
-        oids.add(X509Extensions.BasicConstraints);
-        values.add(new X509Extension(true, new DEROctetString(new BasicConstraints(true))));
-        oids.add(X509Extensions.KeyUsage);
-        values.add(new X509Extension(true, new DEROctetString(
-            new KeyUsage(KeyUsage.keyCertSign | KeyUsage.cRLSign))));
-        SubjectKeyIdentifier subjectKeyIdentifier = new SubjectKeyIdentifier(getDigest(SubjectPublicKeyInfo.getInstance(pair.getPublic().getEncoded())));
-        X509Extension ski = new X509Extension(false, new DEROctetString(subjectKeyIdentifier));
-        oids.add(X509Extensions.SubjectKeyIdentifier);
-        values.add(ski);
-
-        Attribute attribute = new Attribute(PKCSObjectIdentifiers.pkcs_9_at_extensionRequest,
-            new DERSet(new X509Extensions(oids, values)));
-        
-        PKCS10CertificationRequest p1 = new PKCS10CertificationRequest(
-            "SHA1WithRSA", new X509Principal("cn=csr"),
-            pair.getPublic(), new DERSet(attribute), pair.getPrivate(), "BC");
-        PKCS10CertificationRequest p2 = new PKCS10CertificationRequest(
-            "SHA1WithRSA", new X509Principal("cn=csr"),
-            pair.getPublic(), new DERSet(attribute), pair.getPrivate(), "BC");
-
-        if (!p1.equals(p2))
-        {
-            fail("cert request comparison failed");
-        }
-    }
-
-    public void performTest()
-        throws Exception
-    {
-        generationTest(512, "RSA", "SHA1withRSA", "BC");       
-        generationTest(512, "GOST3410", "GOST3411withGOST3410", "BC");
-        
-        if (Security.getProvider("SunRsaSign") != null)
-        {
-            generationTest(512, "RSA", "SHA1withRSA", "SunRsaSign"); 
-        }
-        
-        // elliptic curve GOST A parameter set
-        PKCS10CertificationRequest req = new PKCS10CertificationRequest(gost3410EC_A);
-        if (!req.verify())
-        {
-            fail("Failed verify check gost3410EC_A.");
-        }
-
-        // elliptic curve GOST B parameter set
-        req = new PKCS10CertificationRequest(gost3410EC_B);
-        if (!req.verify())
-        {
-            fail("Failed verify check gost3410EC_B.");
-        }
-
-        // elliptic curve GOST C parameter set
-        req = new PKCS10CertificationRequest(gost3410EC_C);
-        if (!req.verify())
-        {
-            fail("Failed verify check gost3410EC_C.");
-        }
-        
-        // elliptic curve GOST ExA parameter set
-        req = new PKCS10CertificationRequest(gost3410EC_ExA);
-        if (!req.verify())
-        {
-            fail("Failed verify check gost3410EC_ExA.");
-        }
-
-        // elliptic curve GOST ExB parameter set
-        req = new PKCS10CertificationRequest(gost3410EC_ExB);
-        if (!req.verify())
-        {
-            fail("Failed verify check gost3410EC_ExA.");
-        }
-
-        // elliptic curve openSSL
-        KeyPairGenerator g = KeyPairGenerator.getInstance("ECDSA", "BC");
-
-        ECCurve curve = new ECCurve.Fp(
-            new BigInteger("883423532389192164791648750360308885314476597252960362792450860609699839"), // q
-            new BigInteger("7fffffffffffffffffffffff7fffffffffff8000000000007ffffffffffc", 16), // a
-            new BigInteger("6b016c3bdcf18941d0d654921475ca71a9db2fb27d1d37796185c2942c0a", 16)); // b
-
-        ECParameterSpec ecSpec = new ECParameterSpec(
-            curve,
-            curve.decodePoint(Hex.decode("020ffa963cdca8816ccc33b8642bedf905c3d358573d3f27fbbd3b3cb9aaaf")), // G
-            new BigInteger("883423532389192164791648750360308884807550341691627752275345424702807307")); // n
-
-        g.initialize(ecSpec, new SecureRandom());
-
-        KeyPair kp = g.generateKeyPair();
-
-        req = new PKCS10CertificationRequest(
-                "ECDSAWITHSHA1", new X509Name("CN=XXX"), kp.getPublic(), null, kp.getPrivate());
-        if (!req.verify())
-        {
-            fail("Failed verify check EC.");
-        }
-        
-        createECRequest("SHA1withECDSA", X9ObjectIdentifiers.ecdsa_with_SHA1);
-        createECRequest("SHA224withECDSA", X9ObjectIdentifiers.ecdsa_with_SHA224);
-        createECRequest("SHA256withECDSA", X9ObjectIdentifiers.ecdsa_with_SHA256);
-        createECRequest("SHA384withECDSA", X9ObjectIdentifiers.ecdsa_with_SHA384);
-        createECRequest("SHA512withECDSA", X9ObjectIdentifiers.ecdsa_with_SHA512);
-
-        createECRequest("SHA1withECDSA", X9ObjectIdentifiers.ecdsa_with_SHA1, new ASN1ObjectIdentifier("1.3.132.0.34"));
-
-        createECGOSTRequest();
-
-        createPSSTest("SHA1withRSAandMGF1");
-        createPSSTest("SHA224withRSAandMGF1");
-        createPSSTest("SHA256withRSAandMGF1");
-        createPSSTest("SHA384withRSAandMGF1");
-
-        nullPointerTest();
-    }
-
-    private static byte[] getDigest(SubjectPublicKeyInfo spki)
-    {
-        Digest digest = new SHA1Digest();
-        byte[]  resBuf = new byte[digest.getDigestSize()];
-
-        byte[] bytes = spki.getPublicKeyData().getBytes();
-        digest.update(bytes, 0, bytes.length);
-        digest.doFinal(resBuf, 0);
-        return resBuf;
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        Security.addProvider(new BouncyCastleProvider());
-
-        runTest(new PKCS10CertRequestTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/PKCS12StoreTest.java b/bcprov/src/main/java/org/bouncycastle/jce/provider/test/PKCS12StoreTest.java
deleted file mode 100644
index 1faa65d..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/PKCS12StoreTest.java
+++ /dev/null
@@ -1,1227 +0,0 @@
-package org.bouncycastle.jce.provider.test;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.math.BigInteger;
-import java.security.Key;
-import java.security.KeyFactory;
-import java.security.KeyPair;
-import java.security.KeyPairGenerator;
-import java.security.KeyStore;
-import java.security.PrivateKey;
-import java.security.PublicKey;
-import java.security.Security;
-import java.security.Signature;
-import java.security.cert.Certificate;
-import java.security.cert.X509Certificate;
-import java.security.interfaces.RSAPrivateKey;
-import java.security.spec.RSAPrivateCrtKeySpec;
-import java.security.spec.RSAPublicKeySpec;
-import java.util.Date;
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Vector;
-
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.ASN1StreamParser;
-import org.bouncycastle.asn1.DERBMPString;
-import org.bouncycastle.asn1.DERSequenceParser;
-import org.bouncycastle.asn1.pkcs.ContentInfo;
-import org.bouncycastle.asn1.pkcs.EncryptedData;
-import org.bouncycastle.asn1.pkcs.EncryptedPrivateKeyInfo;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.asn1.pkcs.Pfx;
-import org.bouncycastle.asn1.pkcs.SafeBag;
-import org.bouncycastle.jcajce.PKCS12StoreParameter;
-import org.bouncycastle.jce.PKCS12Util;
-import org.bouncycastle.jce.X509Principal;
-import org.bouncycastle.jce.interfaces.PKCS12BagAttributeCarrier;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.jce.provider.JDKPKCS12StoreParameter;
-import org.bouncycastle.jce.provider.X509CertificateObject;
-import org.bouncycastle.util.encoders.Base64;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-import org.bouncycastle.x509.X509V3CertificateGenerator;
-
-/**
- * Exercise the various key stores, making sure we at least get back what we put in!
- * <p>
- * This tests both the PKCS12 key store.
- */
-public class PKCS12StoreTest
-    extends SimpleTest
-{
-    static char[]   passwd = { 'h', 'e', 'l', 'l', 'o', ' ', 'w', 'o', 'r', 'l', 'd' };
-
-    //
-    // pkcs-12 pfx-pdu
-    //
-    byte[]  pkcs12 = Base64.decode(
-          "MIACAQMwgAYJKoZIhvcNAQcBoIAkgAQBMAQBgAQBMAQBgAQBBgQBCQQJKoZI"
-        + "hvcNAQcBBAGgBAGABAEkBAGABAEEBAEBBAEwBAEEBAEDBAOCAzQEAQQEAQEE"
-        + "ATAEAQQEAQMEA4IDMAQBBAQBAQQBBgQBBAQBAQQBCwQBBAQBCwQLKoZIhvcN"
-        + "AQwKAQIEAQQEAQEEAaAEAQQEAQMEA4ICpQQBBAQBAQQBMAQBBAQBAwQDggKh"
-        + "BAEEBAEBBAEwBAEEBAEBBAEbBAEEBAEBBAEGBAEEBAEBBAEKBAEEBAEKBAoq"
-        + "hkiG9w0BDAEDBAEEBAEPBA8wDQQIoagiwNZPJR4CAQEEAQQEAQEEAQQEAQQE"
-        + "AQMEA4ICgAQBBAQDggKABIICgEPG0XlhMFyrs4ZWDrvEzl51ICfXd6K2ql2l"
-        + "nnxhszUbigtSj6x49VEx4PfOB9fQFeidc5L5An+nKp646NBMIY0UwXGs8BLQ"
-        + "au59jtOs987+l7QYIvl6fdGUIuLPhVSnZZDyqD+HQjU/0/ccKFHRif4tlEQq"
-        + "aErvZbFeH0pg4ijf1HfgX6gBJGRKdO+msa4qKGnZdHCSLZehyyxvxAmURetg"
-        + "yhtEl7RmedTB+4TDs7atekqxkNlD9tfwDUX6sb0IH6qbEA6P/DlVMdaD54Cl"
-        + "QDxRzOfIIjklZhv5OMFWtPK0aYPcqyxzLpw1qRAyoTVXpidkj/hpIpgCVBP/"
-        + "k5s2+WdGbLgA/4/zSrF6feRCE5llzM2IGxiHVq4oPzzngl3R+Fi5VCPDMcuW"
-        + "NRuIOzJA+RNV2NPOE/P3knThDnwiImq+rfxmvZ1u6T06s20RmWK6cxp7fTEw"
-        + "lQ9BOsv+mmyV8dr6cYJq4IlRzHdFOyEUBDwfHThyribNKKobO50xh2f93xYj"
-        + "Rn5UMOQBJIe3b7OKZt5HOIMrJSZO02IZgvImi9yQWi96PnWa419D1cAsLWvM"
-        + "xiN0HqZMbDFfxVM2BZmsxiexLhkHWKwLqfQDzRjJfmVww8fnXpWZhFXKyut9"
-        + "gMGEyCNoba4RU3QI/wHKWYaK74qtJpsucuLWBH6UcsHsCry6VZkwRxWwC0lb"
-        + "/F3Bm5UKHax5n9JHJ2amQm9zW3WJ0S5stpPObfmg5ArhbPY+pVOsTqBRlop1"
-        + "bYJLD/X8Qbs468Bwzej0FhoEU59ZxFrbjLSBsMUYrVrwD83JE9kEazMLVchc"
-        + "uCB9WT1g0hxYb7VA0BhOrWhL8F5ZH72RMCYLPI0EAQQEAQEEATEEAQQEAQEE"
-        + "AXgEAQQEAQEEATAEAQQEAQEEAVEEAQQEAQEEAQYEAQQEAQEEAQkEAQQEAQkE"
-        + "CSqGSIb3DQEJFAQBBAQBAQQBMQQBBAQBAQQBRAQBBAQBAQQBHgQBBAQBAQQB"
-        + "QgQBBAQBQgRCAEQAYQB2AGkAZAAgAEcALgAgAEgAbwBvAGsAJwBzACAAVgBl"
-        + "AHIAaQBTAGkAZwBuACwAIABJAG4AYwAuACAASQBEBAEEBAEBBAEwBAEEBAEB"
-        + "BAEjBAEEBAEBBAEGBAEEBAEBBAEJBAEEBAEJBAkqhkiG9w0BCRUEAQQEAQEE"
-        + "ATEEAQQEAQEEARYEAQQEAQEEAQQEAQQEAQEEARQEAQQEARQEFKEcMJ798oZL"
-        + "FkH0OnpbUBnrTLgWBAIAAAQCAAAEAgAABAEwBAGABAEGBAEJBAkqhkiG9w0B"
-        + "BwYEAaAEAYAEATAEAYAEAQIEAQEEAQAEATAEAYAEAQYEAQkECSqGSIb3DQEH"
-        + "AQQBMAQBGwQBBgQBCgQKKoZIhvcNAQwBBgQPMA0ECEE7euvmxxwYAgEBBAGg"
-        + "BAGABAEEBAEIBAgQIWDGlBWxnwQBBAQBCAQI2WsMhavhSCcEAQQEAQgECPol"
-        + "uHJy9bm/BAEEBAEQBBCiRxtllKXkJS2anKD2q3FHBAEEBAEIBAjKy6BRFysf"
-        + "7gQBBAQDggMwBIIDMJWRGu2ZLZild3oz7UBdpBDUVMOA6eSoWiRIfVTo4++l"
-        + "RUBm8TpmmGrVkV32PEoLkoV+reqlyWCvqqSjRzi3epQiVwPQ6PV+ccLqxDhV"
-        + "pGWDRQ5UttDBC2+u4fUQVZi2Z1i1g2tsk6SzB3MKUCrjoWKvaDUUwXo5k9Vz"
-        + "qSLWCLTZCjs3RaY+jg3NbLZYtfMDdYovhCU2jMYV9adJ8MxxmJRz+zPWAJph"
-        + "LH8hhfkKG+wJOSszqk9BqGZUa/mnZyzeQSMTEFga1ZB/kt2e8SZFWrTZEBgJ"
-        + "oszsL5MObbwMDowNurnZsnS+Mf7xi01LeG0VT1fjd6rn9BzVwuMwhoqyoCNo"
-        + "ziUqSUyLEwnGTYYpvXLxzhNiYzW8546KdoEKDkEjhfYsc4XqSjm9NYy/BW/M"
-        + "qR+aL92j8hqnkrWkrWyvocUe3mWaiqt7/oOzNZiMTcV2dgjjh9HfnjSHjFGe"
-        + "CVhnEWzV7dQIVyc/qvNzOuND8X5IyJ28xb6a/i1vScwGuo/UDgPAaMjGw28f"
-        + "siOZBShzde0Kj82y8NilfYLHHeIGRW+N/grUFWhW25mAcBReXDd5JwOqM/eF"
-        + "y+4+zBzlO84ws88T1pkSifwtMldglN0APwr4hvUH0swfiqQOWtwyeM4t+bHd"
-        + "5buAlXOkSeF5rrLzZ2/Lx+JJmI2pJ/CQx3ej3bxPlx/BmarUGAxaI4le5go4"
-        + "KNfs4GV8U+dbEHQz+yDYL+ksYNs1eb+DjI2khbl28jhoeAFKBtu2gGOL5M9M"
-        + "CIP/JDOCHimu1YZRuOTAf6WISnG/0Ri3pYZsgQ0i4cXj+WfYwYVjhKX5AcDj"
-        + "UKnc4/Cxp+TbbgZqEKRcYVb2q0kOAxkeaNo3WCm+qvUYrwAmKp4nVB+/24rK"
-        + "khHiyYJQsETxtOEyvJkVxAS01djY4amuJ4jL0sYnXIhW3Ag93eavbzksGT7W"
-        + "Fg1ywpr1x1xpXWIIuVt1k4e+g9fy7Yx7rx0IK1qCSjNwU3QPWbaef1rp0Q/X"
-        + "P9IVXYkqo1g/T3SyXqrbZLO+sDjiG4IT3z3fJJqt81sRSVT0QN1ND8l93BG4"
-        + "QKzghYw8sZ4FwKPtLky1dDcVTgQBBAQBCAQIK/85VMKWDWYEAQQEAQgECGsO"
-        + "Q85CcFwPBAEEBAEIBAhaup6ot9XnQAQBBAQCgaAEgaCeCMadSm5fkLfhErYQ"
-        + "DgePZl/rrjP9FQ3VJZ13XrjTSjTRknAbXi0DEu2tvAbmCf0sdoVNuZIZ92W0"
-        + "iyaa2/A3RHA2RLPNQz5meTi1RE2N361yR0q181dC3ztkkJ8PLyd74nCtgPUX"
-        + "0JlsvLRrdSjPBpBQ14GiM8VjqeIY7EVFy3vte6IbPzodxaviuSc70iXM4Yko"
-        + "fQq6oaSjNBFRqkHrBAEEBAEIBAjlIvOf8SnfugQBBAQBCAQIutCF3Jovvl0E"
-        + "AQQEAQgECO7jxbucdp/3BAEEBAEIBAidxK3XDLj+BwQBBAQBCAQI3m/HMbd3"
-        + "TwwEAQQEA4ICOASCAjgtoCiMfTkjpCRuMhF5gNLRBiNv+xjg6GvZftR12qiJ"
-        + "dLeCERI5bvXbh9GD6U+DjTUfhEab/37TbiI7VOFzsI/R137sYy9Tbnu7qkSx"
-        + "u0bTvyXSSmio6sMRiWIcakmDbv+TDWR/xgtj7+7C6p+1jfUGXn/RjB3vlyjL"
-        + "Q9lFe5F84qkZjnADo66p9gor2a48fgGm/nkABIUeyzFWCiTp9v6FEzuBfeuP"
-        + "T9qoKSnCitaXRCru5qekF6L5LJHLNXLtIMSrbO0bS3hZK58FZAUVMaqawesJ"
-        + "e/sVfQip9x/aFQ6U3KlSpJkmZK4TAqp9jIfxBC8CclbuwmoXPMomiCH57ykr"
-        + "vkFHOGcxRcCxax5HySCwSyPDr8I4+6Kocty61i/1Xr4xJjb+3oyFStIpB24x"
-        + "+ALb0Mz6mUa1ls76o+iQv0VM2YFwnx+TC8KC1+O4cNOE/gKeh0ircenVX83h"
-        + "GNez8C5Ltg81g6p9HqZPc2pkwsneX2sJ4jMsjDhewV7TyyS3x3Uy3vTpZPek"
-        + "VdjYeVIcgAz8VLJOpsIjyHMB57AyT7Yj87hVVy//VODnE1T88tRXZb+D+fCg"
-        + "lj2weQ/bZtFzDX0ReiEQP6+yklGah59omeklIy9wctGV1o9GNZnGBSLvQ5NI"
-        + "61e9zmQTJD2iDjihvQA/6+edKswCjGRX6rMjRWXT5Jv436l75DVoUj09tgR9"
-        + "ytXSathCjQUL9MNXzUMtr7mgEUPETjM/kYBR7CNrsc+gWTWHYaSWuqKVBAEE"
-        + "BAEIBAh6slfZ6iqkqwQBBAQBCAQI9McJKl5a+UwEAQQEATgEOBelrmiYMay3"
-        + "q0OW2x2a8QQodYqdUs1TCUU4JhfFGFRy+g3yU1cP/9ZSI8gcI4skdPc31cFG"
-        + "grP7BAEEBAEIBAhzv/wSV+RBJQQBBAQBCAQI837ImVqqlr4EAQQEAQgECGeU"
-        + "gjULLnylBAEEBAEIBAjD3P4hlSBCvQQBBAQBCAQISP/qivIzf50EAQQEAQgE"
-        + "CKIDMX9PKxICBAEEBAOCBOgEggTocP5VVT1vWvpAV6koZupKN1btJ3C01dR6"
-        + "16g1zJ5FK5xL1PTdA0r6iAwVtgYdxQYnU8tht3bkNXdPJC1BdsC9oTkBg9Nr"
-        + "dqlF5cCzXWIezcR3ObjGLpXu49SAHvChH4emT5rytv81MYxZ7bGmlQfp8BNa"
-        + "0cMZz05A56LXw//WWDEzZcbKSk4tCsfMXBdGk/ngs7aILZ4FGM620PBPtD92"
-        + "pz2Ui/tUZqtQ0WKdLzwga1E/rl02a/x78/OdlVRNeaIYWJWLmLavX98w0PhY"
-        + "ha3Tbj/fqq+H3ua6Vv2Ff4VeXazkXpp4tTiqUxhc6aAGiRYckwZaP7OPSbos"
-        + "RKFlRLVofSGu1IVSKO+7faxV4IrVaAAzqRwLGkpJZLV7NkzkU1BwgvsAZAI4"
-        + "WClPDF228ygbhLwrSN2NK0s+5bKhTCNAR/LCUf3k7uip3ZSe18IwEkUMWiaZ"
-        + "ayktcTYn2ZjmfIfV7wIxHgWPkP1DeB+RMS7VZe9zEgJKOA16L+9SNBwJSSs9"
-        + "5Sb1+nmhquZmnAltsXMgwOrR12JLIgdfyyqGcNq997U0/KuHybqBVDVu0Fyr"
-        + "6O+q5oRmQZq6rju7h+Hb/ZUqRxRoTTSPjGD4Cu9vUqkoNVgwYOT+88FIMYun"
-        + "g9eChhio2kwPYwU/9BNGGzh+hAvAKcUpO016mGLImYin+FpQxodJXfpNCFpG"
-        + "4v4HhIwKh71OOfL6ocM/518dYwuU4Ds2/JrDhYYFsn+KprLftjrnTBnSsfYS"
-        + "t68b+Xr16qv9r6sseEkXbsaNbrGiZAhfHEVBOxQ4lchHrMp4zpduxG4crmpc"
-        + "+Jy4SadvS0uaJvADgI03DpsDYffUdriECUqAfOg/Hr7HHyr6Q9XMo1GfIarz"
-        + "eUHBgi1Ny0nDTWkdb7I3bIajG+Unr3KfK6dZz5Lb3g5NeclU5zintB1045Jr"
-        + "j9fvGGk0/2lG0n17QViBiOzGs2poTlhn7YxmiskwlkRKVafxPZNPxKILpN9s"
-        + "YaWGz93qER/pGMJarGJxu8sFi3+yt6FZ4pVPkvKE8JZMEPBBrmH41batS3sw"
-        + "sfnJ5CicAkwd8bluQpoc6qQd81HdNpS6u7djaRSDwPtYnZWu/8Hhj4DXisje"
-        + "FJBAjQdn2nK4MV7WKVwr+mNcVgOdc5IuOZbRLOfc3Sff6kYVuQFfcCGgAFpd"
-        + "nbprF/FnYXR/rghWE7fT1gfzSMNv+z5UjZ5Rtg1S/IQfUM/P7t0UqQ01/w58"
-        + "bTlMGihTxHiJ4Qf3o5GUzNmAyryLvID+nOFqxpr5es6kqSN4GPRHsmUIpB9t"
-        + "f9Nw952vhsXI9uVkhQap3JvmdAKJaIyDz6Qi7JBZvhxpghVIDh73BQTaAFP9"
-        + "5GUcPbYOYJzKaU5MeYEsorGoanSqPDeKDeZxjxJD4xFsqJCoutyssqIxnXUN"
-        + "Y3Uojbz26IJOhqIBLaUn6QVFX79buWYjJ5ZkDS7D8kq6DZeqZclt5711AO5U"
-        + "uz/eDSrx3d4iVHR+kSeopxFKsrK+KCH3CbBUMIFGX/GE9WPhDWCtjjNKEe8W"
-        + "PinQtxvv8MlqGXtv3v7ObJ2BmfIfLD0rh3EB5WuRNKL7Ssxaq14KZGEBvc7G"
-        + "Fx7jXLOW6ZV3SH+C3deJGlKM2kVhDdIVjjODvQzD8qw8a/ZKqDO5hGGKUTGD"
-        + "Psdd7O/k/Wfn+XdE+YuKIhcEAQQEAQgECJJCZNJdIshRBAEEBAEIBAiGGrlG"
-        + "HlKwrAQBBAQBCAQIkdvKinJYjJcEAQQEAUAEQBGiIgN/s1bvPQr+p1aQNh/X"
-        + "UQFmay6Vm5HIvPhoNrX86gmMjr6/sg28/WCRtSfyuYjwQkK91n7MwFLOBaU3"
-        + "RrsEAQQEAQgECLRqESFR50+zBAEEBAEIBAguqbAEWMTiPwQBBAQBGAQYKzUv"
-        + "EetQEAe3cXEGlSsY4a/MNTbzu1WbBAEEBAEIBAiVpOv1dOWZ1AQCAAAEAgAA"
-        + "BAIAAAQCAAAEAgAABAIAAAAAAAAAADA1MCEwCQYFKw4DAhoFAAQUvMkeVqe6"
-        + "D4UmMHGEQwcb8O7ZwhgEEGiX9DeqtRwQnVi+iY/6Re8AAA==");
-
-    byte[] certUTF = Base64.decode(
-        "MIIGVQIBAzCCBg8GCSqGSIb3DQEHAaCCBgAEggX8MIIF+DCCAsUGCSqGSIb3"
-      + "DQEHAaCCArYEggKyMIICrjCCAqoGCyqGSIb3DQEMCgEDoIIChTCCAoEGCiqG"
-      + "SIb3DQEJFgGgggJxBIICbTCCAmkwggHSoAMCAQICAQcwDQYJKoZIhvcNAQEF"
-      + "BQAwOTEPMA0GA1UEBxMGTGV1dmVuMRkwFwYDVQQKExBVdGltYWNvIFN1YiBD"
-      + "QSAyMQswCQYDVQQGEwJCRTAeFw05OTEyMzEyMzAwMDBaFw0xOTEyMzEyMzAw"
-      + "MDBaMFcxCzAJBgNVBAYTAkJFMQ8wDQYDVQQHEwZIYWFjaHQxEDAOBgNVBAoT"
-      + "B1V0aW1hY28xDDAKBgNVBAsMA1ImRDEXMBUGA1UEAxMOR2VlcnQgRGUgUHJp"
-      + "bnMwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANYGIyhTn/p0IA41ElLD"
-      + "fZ44PS88AAcDCiOd2DIMLck56ea+5nhI0JLyz1XgPHecc8SLFdl7vSIBA0eb"
-      + "tm/A7WIqIp0lcvgoyQ0qsak/dvzs+xw6r2xLCVogku4+/To6UebtfRsukXNI"
-      + "ckP5lWV/Ui4l+XvGdmENlEE9/BvOZIvLAgMBAAGjYzBhMBEGA1UdIwQKMAiA"
-      + "BlN1YkNBMjAQBgNVHQ4ECQQHVXNlcklEMjAOBgNVHQ8BAf8EBAMCBLAwGQYD"
-      + "VR0RBBIwEIEOVXNlcklEMkB1dGkuYmUwDwYDVR0TAQH/BAUwAwEBADANBgkq"
-      + "hkiG9w0BAQUFAAOBgQACS7iLLgMV4O5gFdriI7dqX55l7Qn6HiRNxlSH2kCX"
-      + "41X82gae4MHFc41qqsC4qm6KZWi1yvTN9XgSBCXTaw1SXGTK7SuNdoYh6ufC"
-      + "KuAwy5lsaetyARDksRiOIrNV9j+MRIjJMjPNg+S+ysIHTWZo2NTUuVuZ01D2"
-      + "jDtYPhcDFDESMBAGCSqGSIb3DQEJFTEDBAE3MIIDKwYJKoZIhvcNAQcGoIID"
-      + "HDCCAxgCAQAwggMRBgkqhkiG9w0BBwEwKAYKKoZIhvcNAQwBAzAaBBS5KxQC"
-      + "BMuZ1To+yed2j/TT45td6gICCACAggLYxQS+fu7W2sLQTkslI0EoNxLoH/WO"
-      + "L8NgiIgZ5temV3mgC2q0MxjVVq+SCvG89ZSTfptxOaSmYV772irFdzlrtotZ"
-      + "wmYk1axuFDYQ1gH0M6i9FWuhOnbk7qHclmOroXqrrbP6g3IsjwztH0+iwBCg"
-      + "39f63V0rr8DHiu7zZ2hBkU4/RHEsXLjaCBVNTUSssWhVLisLh2sqBJccPC2E"
-      + "1lw4c4WrshGQ+syLGG38ttFgXT1c+xYNpUKqJiJTLVouOH9kK3nH1hPRHKMN"
-      + "9CucBdUzibvkcRk1L53F3MfvjhCSNeWEmd9PKN+FtUtzRWQG3L84VGTM37Ws"
-      + "YcxaDwDFGcw3u1W8WFsCCkjpZecKN8P2Kp/ai/iugcXY77bYwAwpETDvQFvD"
-      + "nnL9oGi03HYdfeiXglC7x7dlojvnpkXDbE0nJiFwhe8Mxpx8GVlGHtP+siXg"
-      + "tklubg1eTCSoG9m1rsBJM717ZHXUGf32HNun2dn4vOWGocgBmokZ46KKMb9v"
-      + "reT39JTxi8Jlp+2cYb6Qr/oBzudR+D4iAiiVhhhEbJKPNHa61YyxF810fNI2"
-      + "GWlNIyN3KcI8XU6WJutm/0H3X8Y+iCSWrJ2exUktj8GiqNQ6Yx0YgEk9HI7W"
-      + "t9UVTIsPCgCqrV4SWCOPf6so1JqnpvlPvvNyNxSsAJ7DaJx1+oD2QQfhowk/"
-      + "bygkKnRo5Y15ThrTsIyQKsJHTIVy+6K5uFZnlT1DGV3DcNpuk3AY26hrAzWO"
-      + "TuWXsULZe7M6h6U2hTT/eplZ/mwHlXdF1VErIuusaCdkSI0doY4/Q223H40L"
-      + "BNU3pTezl41PLceSll00WGVr2MunlNeXKnXDJW06lnfs9BmnpV2+Lkfmf30W"
-      + "Pn4RKJQc+3D3SV4fCoQLIGrKiZLFfEdGJcMlySr+dJYcEtoZPuo6i/hb5xot"
-      + "le63h65ihNtXlEDrNpYSQqnfhjOzk5/+ZvYEcOtDObEwPTAhMAkGBSsOAwIa"
-      + "BQAEFMIeDI9l2Da24mtA1fbQIPc6+4dUBBQ8a4lD7j1CA1vRLhdEgPM+5hpD"
-      + "RgICCAA=");
-
-    byte[] pkcs12noFriendly = Base64.decode(
-        "MIACAQMwgAYJKoZIhvcNAQcBoIAkgASCBAAwgDCABgkqhkiG9w0BBwGggCSA"
-      + "BIICvjCCArowggK2BgsqhkiG9w0BDAoBAqCCAqUwggKhMBsGCiqGSIb3DQEM"
-      + "AQMwDQQIyJDupEHvySECAQEEggKAupvM7RuZL3G4qNeJM3afElt03TVfynRT"
-      + "xUxAZOfx+zekHJTlnEuHJ+a16cOV6dQUgYfyMw1xcq4E+l59rVeMX9V3Zr0K"
-      + "tsMN9VYB/9zn62Kw6LQnY0rMlWYf4bt9Ut5ysq0hE5t9FL+NZ5FbFdWBOKsj"
-      + "/3oC6eNXOkOFyrY2haPJtD1hVHUosrlC0ffecV0YxPDsReeyx0R4CiYZpAUy"
-      + "ZD7rkxL+mSX7zTsShRiga2Q/NEhC1KZpbhO/qbyOgvH0r7CRumSMvijzDgaV"
-      + "IGqtrIZ2E2k5kscjcuFTW0x3OZTLAW/UnAh4JXJzC6isbdiWuswbAEBHifUC"
-      + "rk2f+bDJKe2gkH67J2K0yDQ3YSSibpjDX/bVfbtfmOoggK9MKQwqEeE0nbYE"
-      + "jzInH2OK5jPtmwppjmVA7i3Uk25w2+z7b/suUbft9hPCNjxFvzdbyCcXK4Vv"
-      + "xAgEbVWnIkvOQNbyaQi+DEF/4P26GwgJgXuJpMBn0zzsSZSIDLNl8eJHoKp2"
-      + "ZXknTi0SZkLaYlBxZlNhFoyXLfvQd6TI2aR5aCVqg1aZMBXyOWfz5t0JTVX8"
-      + "HTIcdXKis91iEsLB7vjcxIOASTAjKARr5tRp6OvaVterAyDOn2awYQJLLic5"
-      + "pQfditRAlsLkTxlDdu0/QBMXSPptO8g3R+dS7ntvCjXgZZyxpOeKkssS2l5v"
-      + "/B2EsfKmYA9hU4aBdW1S9o/PcF1wpVqABd8664TGJ77tCAkbdHe0VJ3Bop2X"
-      + "lNxlWeEeD0v0QUZLqkJoMEwi5SUE6HAWjbqGhRuHyey9E+UsdCVnQ8AxXQzL"
-      + "2UKOmIrXc6R25GsLPCysXuXPRFBB2Tul0V3re3hPcAAAAAAAADCABgkqhkiG"
-      + "9w0BBwaggDCAAgEAMIAGCSqGSIb3DQEHATAbBgoqhkiG9w0BDAEGMA0ECDXn"
-      + "UZu6xckzAgEBoIAEggTYQMbzAoGnRVJMbCaJJUYgaARJ4zMfxt2e12H4pX/e"
-      + "vnZrR1eKAMck5c2vJoEasr0i2VUcAcK12AntVIEnBwuRBcA2WrZnC28WR+O7"
-      + "rLdu9ymG2V3zmk66aTizaB6rcHAzs2lD74n+/zJhZNaDMBfu9LzAdWb/u6Rb"
-      + "AThmbw764Zyv9802pET6xrB8ureffgyvQAdlcGHM+yxaOV3ZEtS0cp7i+pb/"
-      + "NTiET4jAFoO1tbBrWGJSRrMKvx4ZREppMhG3e/pYglfMFl+1ejbDsOvEUKSt"
-      + "H+MVrgDgAv4NsUtNmBu+BIIEAIOCjrBSK3brtV0NZOWsa6hZSSGBhflbEY8s"
-      + "U1bDsgZIW4ZaJJvSYEXLmiWSBOgq9VxojMfjowY+zj6ePJJMyI3E7AcFa+on"
-      + "zZjeKxkKypER+TtpBeraqUfgf01b6olH8L2i4+1yotCQ0PS+15qRYPK6D+d3"
-      + "S+R4veOA6wEsNRijVcB3oQsBCi0FVdf+6MVDvjNzBCZXj0heVi+x0EE106Sz"
-      + "B3HaDbB/KNHMPZvvs3J3z2lWLj5w7YZ9eVmrVJKsgG2HRKxtt2IQquRj4BkS"
-      + "upFnMTBVgWxXgwXycauC9bgYZurs+DbijqhHfWpUrttDfavsP8aX6+i3gabK"
-      + "DH4LQRL7xrTcKkcUHxOTcPHLgDPhi+RevkV+BX9tdajbk4tqw1d+0wOkf1pW"
-      + "aTG8fUp0lUpra7EJ0lGy8t/MB3NEk/5tLk9qA2nsKKdNoEdZWiEBE0fMrH1o"
-      + "tWJDew3VhspT+Lkor2dLN5ydjcr3wkb76OETPeMxS91onNj5mrAMUBt66vb6"
-      + "Gx4CL8FTRNZ/l8Kzngzdv9PmmKPTIXbhYbn3XRGg3od2tC/oVfsqYlGAMgFO"
-      + "STt+BZ1BR9Phyi4jsiy8R0seCEDRWYQLbwgwVj0V8Rx9VptqRoCnB4XhGJoJ"
-      + "TdAz/MT7KOSxIh2F2FymTJpyImcV6X4Kcj9iY0AZQ4zj712g4yMR6xKGzRu6"
-      + "oIBDkFW2bdA3Lb9ePpo5GFtNyA7IbggIko6VOeeOKxaq9nALS2gsZc1yaYtp"
-      + "aKL8kB+dVTCXiLgQniO6eMzgonsuwFnG+42XM1vhEpAvFzeJRC0CYzebEK9n"
-      + "nGXKCPoqPFuw3gcPMn57NCZJ8MjT/p0wANIEm6AsgqrdFKwTRVJ1ytB/X9Ri"
-      + "ysmjMBs9zbFKjU9jVDg1vGBNtb7YnYg9IrYHa3e4yTu2wUJKGP2XWHVgjDR7"
-      + "6RtzlO4ljw0kkSMMEDle2ZbGZ6lVXbFwV0wPNPmGA6+XGJRxcddTnrM6R/41"
-      + "zqksFLgoNL2BdofMXwv7SzxGyvFhHdRRdBZ5dKj2K9OfXakEcm/asZGu87u8"
-      + "y9m7Cckw8ilSNPMdvYiFRoThICx9NiwYl1IIKGcWlb9p6RAx6XNSkY6ZZ6pE"
-      + "Vla1E26rbd7is1ssSeqxLXXV9anuG5HDwMIt+CIbD8fZmNTcWMzZRiaFajvR"
-      + "gXdyTu/UhVdhiQPF+lrxp4odgF0cXrpcGaKvOtPq04F4ad3O5EkSGucI210Q"
-      + "pR/jQs07Yp5xDPzsXAb8naHb84FvK1iONAEjWbfhDxqtH7KGrBbW4KEzJrv3"
-      + "B8GLDp+wOAFjGEdGDPkOx3y2L2HuI1XiS9LwL+psCily/A96OiUyRU8yEz4A"
-      + "AAAAAAAAAAAEAwAAAAAAAAAAADAtMCEwCQYFKw4DAhoFAAQU1NQjgVRH6Vg3"
-      + "tTy3wnQisALy9aYECKiM2gZrLi+fAAA=");
-
-    static char[]   noFriendlyPassword = "sschette12".toCharArray();
-
-    byte[] pkcs12StorageIssue = Base64.decode(
-        "MIIO8QIBAzCCDrEGCSqGSIb3DQEHAaCCDqIEgg6eMIIOmjCCBBMGCSqGSIb3"
-      + "DQEHAaCCBAQEggQAMIID/DCCA/gGCyqGSIb3DQEMCgECoIICtjCCArIwHAYK"
-      + "KoZIhvcNAQwBAzAOBAgURJ+/5hA2pgICB9AEggKQYZ4POE8clgH9Bjd1XO8m"
-      + "sr6NiRBiA08CllHSOn2RzyAgHTa+cKaWrEVVJ9mCd9XveSUCoBF9E1C3jSl0"
-      + "XIqLNgYd6mWK9BpeMRImM/5crjy///K4ab9kymzkc5qc0pIpdCQCZ04YmtFP"
-      + "B80VCgyaoh2xoxqgjBCIgdSg5XdepdA5nXkG9EsQ1oVUyCykv20lKgKKRseG"
-      + "Jo23AX8YUYR7ANqP2gz9lvlX6RBczuoZ62ujopUexiQgt5SZx97sgo3o/b/C"
-      + "px17A2L4wLdeAYCMCsZhC2UeaqnZCHSsvnPZfRGiuSEGbV5gHLmXszLDaEdQ"
-      + "Bo873GTpKTTzBfRFzNCtYtZRqh2AUsInWZWQUcCeX6Ogwa0wTonkp18/tqsh"
-      + "Fj1fVpnsRmjJTTXFxkPtUw5GPJnDAM0t1xqV7kOjN76XnZrMyk2azQ1Mf3Hn"
-      + "sGpF+VRGH6JtxbM0Jm5zD9uHcmkSfNR3tP/+vHOB1mkIR9tD2cHvBg7pAlPD"
-      + "RfDVWynhS+UBNlQ0SEM/pgR7PytRSUoKc/hhe3N8VerF7VL3BwWfBLlZFYZH"
-      + "FvPQg4coxF7+We7nrSQfXvdVBP9Zf0PTdf3pbZelGCPVjOzbzY/o/cB23IwC"
-      + "ONxlY8SC1nJDXrPZ5sY51cg/qUqor056YqipRlI6I+FoTMmMDKPAiV1V5ibo"
-      + "DNQJkyv/CAbTX4+oFlxgddTwYcPZgd/GoGjiP9yBHHdRISatHwMcM06CzXJS"
-      + "s3MhzXWD4aNxvvSpXAngDLdlB7cm4ja2klmMzL7IuxzLXFQFFvYf7IF5I1pC"
-      + "YZOmTlJgp0efL9bHjuHFnh0S0lPtlGDOjJ/4YpWvSKDplcPiXhaFVjsUtclE"
-      + "oxCC5xppRm8QWS8xggEtMA0GCSsGAQQBgjcRAjEAMBMGCSqGSIb3DQEJFTEG"
-      + "BAQBAAAAMGkGCSsGAQQBgjcRATFcHloATQBpAGMAcgBvAHMAbwBmAHQAIABS"
-      + "AFMAQQAgAFMAQwBoAGEAbgBuAGUAbAAgAEMAcgB5AHAAdABvAGcAcgBhAHAA"
-      + "aABpAGMAIABQAHIAbwB2AGkAZABlAHIwgZsGCSqGSIb3DQEJFDGBjR6BigA3"
-      + "AGQAZQBmADUAYgA0ADMANgBjAGEAYgBkADAAMAAyAGQAZAAyADkAMAAzAGIA"
-      + "MQA2ADgANgBjADcAOQA0ADgAXwA0ADYAZgAyADYAZgBkADQALQA4ADEAMgBk"
-      + "AC0ANABlAGYAYgAtADgAMAA4ADgALQA0ADUAYQBiADkAMQA5ADEAMAA3AGMA"
-      + "YzCCCn8GCSqGSIb3DQEHBqCCCnAwggpsAgEAMIIKZQYJKoZIhvcNAQcBMBwG"
-      + "CiqGSIb3DQEMAQYwDgQIbr2xdnQ9inMCAgfQgIIKOHg9VKz+jlM+3abi3cp6"
-      + "/XMathxDSEJLrxJs6j5DAVX17S4sw1Q/1pptjdMdd8QtTfUB6JpfgJ5Kpn+h"
-      + "gZMf6M8wWue0U/RZN0D9w7o+2n+X3ItdEXu80eJVDOm7I2p8qiXtijbMbXRL"
-      + "Cup1lgfPM5uv2D63/hmWRXLeG8eySrJnKENngpM559V8TI2JcTUBy1ZP3kcH"
-      + "KbcJ/tVPnIIe4qguxfsTmDtAQviGvWUohbt+RGFmtqfgntK7o6b+S8uRSwEs"
-      + "fOU/pnVE9M1ugtNJZI/xeGJq6umZWXA/OrAcK7feWUwqRvfivDGQJEoggByd"
-      + "4/g92PhK1JGkwlCb1HdfhOOKKChowQ4zVvSOm+uBxARGhk2i5uW9I20I0vSJ"
-      + "px42O2VFVJweOchfp+wBtSHBKYP1ZXyXWMvOtULClosSeesbYMAwvyBfpYEz"
-      + "3rQt/1iZkqDmEisXk8X1aEKG1KSWaSPyb/+6glWikDm+YdQw3Khu7IZt1l/H"
-      + "qWGecccel+R9mT4YjRzHlahUYk4U+RNVasVpH1Kxz2j3CZqL+b3jQOwSAPd/"
-      + "hKI+S/pjIpBPfiC4WxORAzGZzY2j+a79B70h1DO1D9jGur3vJDbdmGBNgs6d"
-      + "nonE1B527SICcGeXY1MtnZCLOPvySih0AvOekbN9x2CJg+Hp9e7A3Fxni53/"
-      + "oMLr9wGRRDki72eXCXW98mU8VJofoWYS1/VBLXGf/f+tJ9J02PpzxleqPH9T"
-      + "4mE+YHnZId6cqjCXmwvMr2cMw2clDVfvkbAJRE3eZHzL7IWSO8+giXzzrTsl"
-      + "VbMuXVkT4oniTN7TSRsBCT3zVVmCy1QL2hPBD6KsVc+bvLgAHRov84FPrI3f"
-      + "kY/oJufT36VE34Eu+QjzULlvVsLE3lhjutOerVIGSP//FM4LE99hp214P0JF"
-      + "DgBK+3J+ihmFdW8hUXOt6BU8/MBeiroiJMWo1/f/XcduekG2ZsdGv+GNPzXI"
-      + "PyHRpCgAgmck1+qoUPXxHRJuNqv223OZ5MN14X7iLl5OZ+f8IWfxUnZeZ9gj"
-      + "HNeceElwZ+YOup1CAi3haD9jxRWhZG4NDfB4IYi4Bc/TAkXE3jCPkYEvIbj9"
-      + "ExaU1Ts0+lqOOcwRmBoYjVrz0xbtfR/OWlopyrDHbeL5iQcQCW/loYRapWCZ"
-      + "E4ekHknpX9yoAwT355vtTkl0VKXeSZHE8jREhN95aY9zCoLYwbTQDTw7qUR5"
-      + "UamabLew0oS0XALtuOrfX4OUOZZUstUsGBle/Pw1TE3Bhe1clhrikp0F+Xgb"
-      + "Xx90KqxZX/36RMnCMAD7/q+57rV7WXp2Y5tT0AUgyUMjy1F1X/b1olUfqO1u"
-      + "rlWIUTl2znmQ3D9uO3W4ytfgGd5DpKcl2w84MBAT9qGwKuQg/UYKbP4K/+4L"
-      + "Y1DWCy3utmohQ28IJtlIUkPL1G7lHX1tfq/VA+bRNTJIhMrNn06ZJpuEJHDs"
-      + "/ferdlMFt/d6MrwVivmPVYkb8mSbHSiI8jZOFE44sA974depsDyXafFaSsl0"
-      + "bVzqOAu0C/n9dIednU0xxxgDF/djdZ/QhbaDIg2VJf11wx0nw9n76B0+eeyu"
-      + "QLaapzxCpQNDVOAM9doBb5F1I5pXQHFQqzTNtLmqDC4x0g8IH7asyk5LCglT"
-      + "b1pwMqPJOL2vGWKRLhPzT+9OfSpCmYGKytf593hmGmwIgEO13hQrw31F5TYt"
-      + "btkbDr+Q5XilOKEczhEM+Ug7YHU7bxkckOAbxu0YeRp/57GdGLokeLJ0dRlQ"
-      + "+V2CfQvWJoVC6PS4PUQtjwgK2p/LU10QsEFwM/S621fGq9zGrv7+FPBATRDb"
-      + "k4E9D/WaRylnW11ZTrOlTchQkoHcOh0xztlFxU8jzuIuDrPQQWkoqdl6B+yf"
-      + "lykRNJKKxwzFiPl40nLC3nEdIzCEvR4r/9QHiWQxAVSc/wQX+an5vakUmSXS"
-      + "oLFjgVdY1jmvdsx2r5BQPuOR8ONGmw/muvVSMaHV85brA4uk0lxn00HD9/a0"
-      + "A1LCeFkabNLn9wJT8RaJeOSNmFFllLR70OHaoPSb3GyzHpvd1e6aeaimdyVH"
-      + "BQWJ6Ufx+HjbOGuOiN46WyE6Q27dnWxx8qF89dKB4T/J0mEXqueiUjAUnnnR"
-      + "Cs4zPaX53hmNBdrZGaLs+xNG8xy+iyBUJIWWfQAQjCjfHYlT9nygiUWIbVQq"
-      + "RHkGkAN62jsSNLgHvWVzQPNNsYq0U8TPhyyci/vc8MJytujjptcz8FPqUjg2"
-      + "TPv34ef9buErsm4vsdEv/8Z+9aDaNex+O3Lo3N0Aw7M5NcntFBHjFY/nBFNZ"
-      + "whH5YA4gQ8PLZ5qshlGvb0DFXHV/9zxnsdPkLwH47ERm5IlEAuoaWtZFxg27"
-      + "BjLfwU1Opk+ybDSb5WZVZrs7ljsU85p3Vaf3a//yoyr9ITYj15tTXxSPoct0"
-      + "fDUy1I6LjJH/+eZXKA1WSda9mDQlRocvJ0IIIlI4weJpTdm8aHIJ8OngCqOF"
-      + "TufcSLDM41+nxEK1LqXeAScVy74kVvvqngj6mIrbylrINZOHheEgTXrUWEc0"
-      + "uXS8l1YqY6K6Ru5km2jVyWi/ujrDGb6QGShC09oiDYUuUGy4gwJ3XLVX/dR3"
-      + "pmMExohTGiVefFP400wVZaxB9g1BQmjSEZxIaW1U1K6fk8Yni8yWB3/L/PuD"
-      + "0+OV+98i1sQGaPe35crIpEc7R2XJdngL0Ol1ZuvCIBfy5DQwGIawTtBnjPdi"
-      + "hy//QTt/isdu7C5pGaJDkZFMrfxMibr6c3xXr7wwR75sTzPNmS8mquEdLsmG"
-      + "h8gTUnB8/K6V11JtUExMqTimTbUw+j8PggpeBelG36breWJIz1O+dmCTGuLM"
-      + "x/sK/i8eiUeRvWjqYpq5DYt4URWg2WlcpcKiUxQp07/NMx0svDC+mlQGwMnJ"
-      + "8KOJMW1qr3TGEJ/VVKKVn6sXn/RxA+VPofYzhwZByRX87XmNdPeQKC2DHQsW"
-      + "6v83dua5gcnv0cv/smXt7Yr/c12i0fbIaQvj3qjtUCDucjARoBey3eCyG5H6"
-      + "5VHSsFnPZ2HCTum+jRSw/ENsu/77XU4BIM2fjAfswp7iIr2Xi4OZWKIj6o6q"
-      + "+fNgnOJjemDYHAFK+hWxClrG8b+9Eaf21o4zcHkhCfBlYv4d+xcZOIDsDPwI"
-      + "sf+4V+CfoBLALsa2K0pXlPplGom/a8h7CjlyaICbWpEDItqwu7NQwdMRCa7i"
-      + "yAyM1sVjXUdcZByS1bjOFSeBe7ygAvEl78vApLxqt8Cw11XSsOtmwssecUN/"
-      + "pb7iHE4OMyOgsYx9u7rZ2hMyl42n3c29IwDYMumiNqk9cwCBpQTJAQEv4VzO"
-      + "QE5xYDBY9SEozni+4f7B7e2Wj/LOGb3vfNVYGNpDczBFxvr2FXTQla0lNYD/"
-      + "aePuC++QW4KvwiGL1Zx4Jo0eoDKWYlYj0qiNlQbWfVw+raaaFnlrq+je0W6P"
-      + "+BrKZCncho145y+CFKRLZrN5yl/cDxwsePMVhAIMr1DzVhgBXzA3MB8wBwYF"
-      + "Kw4DAhoEFN4Cwj9AtArnRbOIAsRhaaoZlTNJBBTIVPqCrloqLns145CWXjb0"
-      + "g141BQ==");
-
-    static char[]   storagePassword = "pass".toCharArray();
-
-    byte[] pkcs12nopass = Base64.decode(
-        "MIIMvgIBAzCCDIQGCSqGSIb3DQEHAaCCDHUEggxxMIIMbTCCCS8GCSqGSIb3"
-      + "DQEHBqCCCSAwggkcAgEAMIIJFQYJKoZIhvcNAQcBMBwGCiqGSIb3DQEMAQYw"
-      + "DgQIfnlhuZRR6/YCAggAgIII6DYgeRwq5n9kzvohZ3JuK+fB+9jZ7Or6EGBA"
-      + "GDxtBfHmSNUBWJEV/I8wV1zrKKoW/CaoZfA61pyrVZRd/roaqBx/koTFoh/g"
-      + "woyyWTRV9gYTXSVqPQgCH+e2dISAa6UGO+/YOWOOwG2X3t8tS+3FduFQFLt5"
-      + "cvUP98zENdm57Aef5pKpBSZDLIAoTASfmqwszWABRh2p/wKOHcCQ9Aj2e2vs"
-      + "pls/ntIv81MqPuxHttwX8e+3dKWGFrJRztLpCD2aua8VkSsHFsPxEHkezX4O"
-      + "6/VCjMCRFGophTS4dgKKtQIhZ9i/ESlr6sGKgIpyG99ALFpNEhtTKe+T3boE"
-      + "sEkhGDquSpu4PGz2m0W5sej1DyFkKX4zIbeMDAb1y3O7aP0F+Llo9QSeGsOA"
-      + "aCwND3NUAKBMOHzwdyNQcuCGCqY8j5rrSt99A5FMs3UVW3XU6hRCx7JlzO05"
-      + "PNCkcPRSnKSNzBhIR5W0qj4PAZnQTfX+wbtUaDLIqsObX4Muh2l3gl+JmdpO"
-      + "53U7ILqN8PAPly1eT+fIrUmlMmFhvo6LbTB7B2K728wsA/5wROlud/mOQz4s"
-      + "quS288YsnVc9ExSZKodWa3Pqcdb/cgKNJYDxrR6/eBHOj+0RLK/1yTK9ghj7"
-      + "IPYHoEqQbw768WK92RjM+RFGlXASkQhR9y4weWj/388uAWMIbQ+R2Zi4nb31"
-      + "knjqRPFThysG1bsRL04/9PgysaasfS9KYOeAlLqp+Ar4gJrof5fytBuY+6wm"
-      + "/J8eEdNw7VPV1cz/4rhrd2sfJQwDEN/iZoy8rTwe7wozpwZI0lwH11BBbav+"
-      + "1AMfI79jjxhqOeo7uxE2NzUmSd05JYI7a94tcRzGQyGEKpGxYCRamzFW23qb"
-      + "vG5Hcqi7Tdd7eTxw4c60l/vQLSo38g6ST5yZrK3URLiAtpioPyjrq2jnVfie"
-      + "QLsiAHhpHF01+t+OcKv3UjwdEyBmQ34h9klwiG7iwBFXZaPXFCF2Np1TqFVG"
-      + "jjBzmB+hRddEiYwN+XGCKB2Cvgc5ZMQ8LG9jQmEKLmOjuumz1ciAVY2qtl1s"
-      + "HYSvfNsIAV/gGzHshOVF19JmGtcQt3pMtupoRh+sh8jY2/x5eIKrj2Jx6HPd"
-      + "p/6IPUr54j0xSd6j7gWuXMj/eKp/utMNuBzAhkydnhXYedvTDYIj7SyPPIHa"
-      + "qtam8rxTDWn2AOxp7OXTgPmo1GU2zW1OLL1D3MFlS+oaRMfhgNrhW+QP5ay6"
-      + "ge4QLijpnSM+p0CbFAOClwzgdJV56bBVV09sDqSBXnG9MeEv5nDaH3I+GpPA"
-      + "UgDkaI4zT61kaGgk0uNMf3czy2ycoQzTx0iHDTXSdSqvUC1yFza8UG4AYaKz"
-      + "14gtSL7StvZtK0Y8oI084BINI1LgrWyrOLj7vkds4WrKhXm21BtM1GbN/pFh"
-      + "XI41h+XoD8KnEPqJ36rAgBo1uHqTNJCC7YikDE/dEvq6MkOx+Nug1YZRHEyi"
-      + "3AHry5u1HJHtxT34HXBwRXvnstuFhvU6cjc1WY1dJhu1p82TGnx7OBo/QbcM"
-      + "8MRrWmWuU5eW4jWbriGNGYfvZy+tHnGwy0bIeqrsHOG6/JwvfmYYXe64sryH"
-      + "5Qo96SZtcTJZaNFwuBY+bFUuOWm8YrT1L7Gl2Muf3pEVtNHLeYARBo1jEAym"
-      + "Cb4jw0oodZqbPKdyyzUZu69fdTJiQkMUcKDfHJEGK0Li9SvtdqJLiiJs57Tb"
-      + "YfOvn+TIuC40ssJFtmtlGCVH/0vtKLWYeW1NYAMzgI/nlhQ7W6Aroh8sZnqv"
-      + "SwxeQmRJaVLxiV6YveTKuVlCbqNVLeEtKYAujgnJtPemGCPbwZpwlBw6V+Dz"
-      + "oXveOBcUqATztWJeNv7RbU0Mk7k057+DNxXBIU+eHRGquyHQSBXxBbA+OFuu"
-      + "4SPfEAyoYed0HEaoKN9lIsBW1xTROI30MZvaJXvPdLsa8izXGPLnTGmoI+fv"
-      + "tJ644HtBCCCr3Reu82ZsTSDMxspZ9aa4ro9Oza+R5eULXDhVXedbhJBYiPPo"
-      + "J37El5lRqOgu2SEilhhVQq3ZCugsinCaY9P/RtWG4CFnH1IcIT5+/mivB48I"
-      + "2XfH6Xq6ziJdj2/r86mhEnz9sKunNvYPBDGlOvI7xucEf9AiEQoTR1xyFDbW"
-      + "ljL4BsJqgsHN02LyUzLwqMstwv+/JH1wUuXSK40Kik/N7+jEFW2C+/N8tN7l"
-      + "RPKSLaTjxVuTfdv/BH1dkV4iGFgpQrdWkWgkb+VZP9xE2mLz715eIAg13x6+"
-      + "n97tc9Hh375xZJqwr3QyYTXWpsK/vx04RThv8p0qMdqKvf3jVQWwnCnoeBv2"
-      + "L4h/uisOLY18qka/Y48ttympG+6DpmzXTwD1LycoG2SOWckCMmJhZK40+zr3"
-      + "NVmWf6iJtbLGMxI/kzTqbTaOfXc2MroertyM1rILRSpgnJFxJfai5Enspr9b"
-      + "SCwlP718jG2lQsnYlw8CuxoZAiaNy4MmC5Y3qNl3hlcggcHeLodyGkSyRsBg"
-      + "cEiKSL7JNvqr0X/nUeW28zVxkmQsWlp3KmST8agf+r+sQvw52fXNLdYznGZV"
-      + "rJrwgNOoRj0Z70MwTns3s/tCqDEsy5Sv/5dZW2uQEe7/wvmsP2WLu73Rwplg"
-      + "1dwi/Uo9lO9dkEzmoIK5wMPCDINxL1K+0Y79q0tIAEMDgaIxmtRpEh8/TEsA"
-      + "UwyEErkDsQqgGviH+ePmawJ/yehYHTRfYUgdUflwApJxRx65pDeSYkiYboMU"
-      + "8WSAQY2nh/p9hLlS4zbz9dCK2tzVyRkJgqNy/c4IpiHEx2l1iipW9vENglqx"
-      + "dYP4uqD8e3OOLjDQKizWx2t1u7GRwoEVQ3d3QzzOvsRcv7h+6vNsmYqE6phe"
-      + "wKFZLctpSn21zkyut444ij4sSr1OG68dEXLY0t0mATfTmXXy5GJBsdK/lLfk"
-      + "YTIPYYeDMle9aEicDqaKqkZUuYPnVchGp8UFMJ3M0n48OMDdDvpzBLTxxZeW"
-      + "cK5v/m3OEo3jgxy9wXfZdz//J3zXXqvX8LpMy1K9X0uCBTz6ERlawviMQhg1"
-      + "1okD5zCCAzYGCSqGSIb3DQEHAaCCAycEggMjMIIDHzCCAxsGCyqGSIb3DQEM"
-      + "CgECoIICpjCCAqIwHAYKKoZIhvcNAQwBAzAOBAj3QoojTSbZqgICCAAEggKA"
-      + "YOSp5XGdnG1pdm9CfvlAaUSHRCOyNLndoUTqteTZjHTEM9bGwNXAx4/R5H2Q"
-      + "PnPm5HB/ynVSXX0uKdW6YlbqUyAdV3eqE4X3Nl+K7ZoXmgAFnMr0tveBhT1b"
-      + "7rTi0TN4twjJzBTkKcxT8XKjvpVizUxGo+Ss5Wk8FrWLHAiC5dZvgRemtGcM"
-      + "w5S09Pwj+qXpjUhX1pB5/63qWPrjVf+Bfmlz4bWcqogGk0i7eg+OdTeWMrW0"
-      + "KR9nD1+/uNEyc4FdGtdIPnM+ax0E+vcco0ExQpTXe0xoX4JW7O71d550Wp89"
-      + "hAVPNrJA5eUbSWNsuz+38gjUJ+4XaAEhcA7HZIp6ZyxtzSJUoh7oqpRktoxu"
-      + "3cSVqVxIqAEqlNn6j0vbKfW91Od5DI5L+BIxY4xqXS7fdwipj9r6qWA8t9QU"
-      + "C2r1A+xXpZ4jEh6inHW9qlfACBBrYf8pSDakSR6yTbaA07LExw0IXz5oiQYt"
-      + "s7yx231CZlOH88bBmruLOIZsJjeg/lf63zI7Gg4F85QG3RqEJnY2pinLUTP7"
-      + "R62VErFZPc2a85r2dbFH1mSQIj/rT1IKe32zIW8xoHC4VwrPkT3bcLFAu2TH"
-      + "5k5zSI/gZUKjPDxb2dwLM4pvsj3gJ9vcFZp6BCuLkZc5rd7CyD8HK9PrBLKd"
-      + "H3Yngy4A08W4U3XUtIux95WE+5O/UEmSF7fr2vT//DwZArGUpBPq4Bikb8cv"
-      + "0wpOwUv8r0DXveeaPsxdipXlt29Ayywcs6KIidLtCaCX6/0u/XtMsGNFS+ah"
-      + "OlumTGBFpbLnagvIf0GKNhbg2lTjflACnxIj8d+QWsnrIU1uC1JRRKCnhpi2"
-      + "veeWd1m8GUb3aTFiMCMGCSqGSIb3DQEJFTEWBBS9g+Xmq/8B462FWFfaLWd/"
-      + "rlFxOTA7BgkqhkiG9w0BCRQxLh4sAEMAZQByAHQAeQBmAGkAawBhAHQAIAB1"
-      + "AHoAeQB0AGsAbwB3AG4AaQBrAGEwMTAhMAkGBSsOAwIaBQAEFKJpUOIj0OtI"
-      + "j2CPp38YIFBEqvjsBAi8G+yhJe3A/wICCAA=");
-
-    private byte[] gostPfx = Base64.decode(
-        "MIIHEgIBAzCCBssGCSqGSIb3DQEHAaCCBrwEgga4MIIGtDCCBYEGCSqGSIb3"
-      + "DQEHBqCCBXIwggVuAgEAMIIFZwYJKoZIhvcNAQcBMFUGCSqGSIb3DQEFDTBI"
-      + "MCcGCSqGSIb3DQEFDDAaBAi114+lRrpkXAICCAAwCgYGKoUDAgIKBQAwHQYG"
-      + "KoUDAgIVMBMECLEIQPMsz/ZZBgcqhQMCAh8BgIIFAbu13yJiW/BnSKYKbtv9"
-      + "tDJoTv6l9BVpCCI4tvpzJnMeLBJyVZU4JevcJNii+R1LilVuuB+xc8e7/P4G"
-      + "6TILWmnnispr9KPRAbYRfoCJOa59+TYJMur58wwDuYgMapQAFzsvpzyUWi62"
-      + "o3uQbbLKO9hQCeJW2L+K9cbg8k33MjXMLpnblKpqmZbHTmBJDFR3xGw7IEjD"
-      + "UNqruu7DlHY6jctiVJSii9UNEVetSo9AAzfROxRjROg38VsWxLyO9wEMBv/8"
-      + "H8ur+zOtmQPGqirNXmN+pa08OvZin9kh7CgswW03xIbfsdGGGLRAWtvCnEwJ"
-      + "mS2tEfH1SZcuVLpMomhq3FU/jsc12k+vq/jw4I2cmfDL41ieK72bwNj8xUXu"
-      + "JHeoFSPGX4z+nsJUrFbFG4VBuDs2Y0SCWLyYZvdjvJwYjfqtyi/RoFSZjGHF"
-      + "crstf9YNQ0vW0efCJ7pUBH44OrbnCx5ng2U5jFm1b3HBIKA2RX+Tlhv14MgT"
-      + "KSftPZ67eSmgdsyPuQAdMu6fEdBMpVKMNZNRV565690sqi+1jOmH94TUX8XU"
-      + "2pRQj6eGGLq6lgGnnDabcePUEPXW8zW2KYrDKYJ/1QZmVGldvlqnjZMNhIO+"
-      + "Afsqax/P8RBjMduGqdilGdRzbN8PdhVaN0Ys+WzFxiS9gtaA2yPzcQuedWDN"
-      + "T7sIrfIapgFYmmHRQ7ht4AKj+lmOyNadONYw+ww+8RzHB1d2Kk+iXeZCtvH0"
-      + "XFWJZtuoGKSt/gkI0E2vpDfMbLaczaRC7ityO0iJs25ozP4JhZRBVvOmpxc9"
-      + "YuIetbTnTf1TLJKXDgt1IwPZeugbofSeiNv117lx8VgtvMYFD4W+WQlB8HnO"
-      + "C8NOYjkMPElc6PCMB9gGm0cIu1fKLvY8ycLav93JJjdDuC0kgKLb2+8mC5+2"
-      + "DdMkcfgW6hy4c98xnJs8enCww3A4xkRbMU13zMq70liqmKHV2SSurg5hwUHM"
-      + "ZthT8p988ZBrnqW24lXfMBqTK4YtIBMeMnvKocYBXr96ig3GfahI1Aj2Bw2e"
-      + "bpZTVeayYUd+2xX8JJMdqna6Q61AL8/eUhJUETz5+fgQJtPjcKmdJfVHO6nB"
-      + "vOk1t/rjK17eiXLxHCyvfP+Tw8lSFOhcvr4eIeG8WfsWNRu2eKKosOU7uash"
-      + "QpnvQieqDeijuRxf+tbbJ5D86inwbJqdxra7wNuZXmiaB9gFDzNbNjhtL+6i"
-      + "gUyX/iQHKi9bNK+PH6pdH/gkwnG/juhdgqoNY6GRty/LUOPgXD+r5e/ST16R"
-      + "vnlwrlKp5FzRWBEkem+dhelj3rb+cxKEyvPe3TvIUFcmIlV1VCRQ1fBHtX18"
-      + "eC3a3GprH8c40z3S/kdyk7GlFQ27DRLka+iDN05b+MP5jlgvfqYBKxwLfeNu"
-      + "MpxWoCUvYWiQdMih86/l0H+0o5UB8SqRbpuvr6fY910JCk0hDaO1pgB3HlRz"
-      + "k1vb46pg25heXQm3JmO+ghxjOGliYBWjl8p7AfRS9cjS8ca+X02Mv9Viv7Ce"
-      + "3+Gz0MVwfK98viJ3CFxkaEBlM2LM0IeUQbkHG+YwYaTSfl4GYyrug4F0ZdrA"
-      + "KeY9/kIxa/OJxjcIMs2H+2mSpxmrb7ylmHZ2RB8ITiduRVtO091hn/J7N+eT"
-      + "h6BvLBKIFU+UFUdgjxoDNDk7ao++Mu9T3dQfceFBOYzW9vMQgX30yaPLSdan"
-      + "ZMAP0VtiNjCCASsGCSqGSIb3DQEHAaCCARwEggEYMIIBFDCCARAGCyqGSIb3"
-      + "DQEMCgECoIGyMIGvMFUGCSqGSIb3DQEFDTBIMCcGCSqGSIb3DQEFDDAaBAiQ"
-      + "Owewo16xzQICCAAwCgYGKoUDAgIKBQAwHQYGKoUDAgIVMBMECHSCNJJcQ2VI"
-      + "BgcqhQMCAh8BBFYCyRRpFtZgnsxeK7ZHT+aOyoVmzhtnLrqoBHgV4nJJW2/e"
-      + "UcJjc2Rlbzfd+3L/GWcRGF8Bgn+MjiaAqE64Rzaao9t2hc3myw1WrCfPnoEx"
-      + "VI7OPBM5FzFMMCMGCSqGSIb3DQEJFTEWBBTV7LvI27QWRmHD45X2WKXYs3ct"
-      + "AzAlBgkqhkiG9w0BCRQxGB4WAGMAcABfAGUAeABwAG8AcgB0AGUAZDA+MC4w"
-      + "CgYGKoUDAgIJBQAEIJbGZorQsNM63+xozwEI561cTFVCbyHAEEpkvF3eijT8"
-      + "BAgY5sDtkrVeBQICCAA=");
-
-    /**
-     * we generate a self signed certificate for the sake of testing - RSA
-     */
-    public Certificate createCert(
-        PublicKey       pubKey,
-        PrivateKey      privKey,
-        String          issuerEmail,
-        String          subjectEmail)
-        throws Exception
-    {
-        //
-        // distinguished name table.
-        //
-        Hashtable                   issuerAttrs = new Hashtable();
-
-        issuerAttrs.put(X509Principal.C, "AU");
-        issuerAttrs.put(X509Principal.O, "The Legion of the Bouncy Castle");
-        issuerAttrs.put(X509Principal.L, "Melbourne");
-        issuerAttrs.put(X509Principal.ST, "Victoria");
-        issuerAttrs.put(X509Principal.EmailAddress, issuerEmail);
-
-        Hashtable                   subjectAttrs = new Hashtable();
-
-        subjectAttrs.put(X509Principal.C, "AU");
-        subjectAttrs.put(X509Principal.O, "The Legion of the Bouncy Castle");
-        subjectAttrs.put(X509Principal.L, "Melbourne");
-        subjectAttrs.put(X509Principal.ST, "Victoria");
-        subjectAttrs.put(X509Principal.EmailAddress, subjectEmail);
-
-        Vector order = new Vector();
-        order.add(X509Principal.C);
-        order.add(X509Principal.O);
-        order.add(X509Principal.L);
-        order.add(X509Principal.ST);
-        order.add(X509Principal.EmailAddress);
-
-        //
-        // extensions
-        //
-
-        //
-        // create the certificate - version 3
-        //
-        X509V3CertificateGenerator  certGen = new X509V3CertificateGenerator();
-
-        certGen.setSerialNumber(BigInteger.valueOf(1));
-        certGen.setIssuerDN(new X509Principal(order, issuerAttrs));
-        certGen.setNotBefore(new Date(System.currentTimeMillis() - 1000L * 60 * 60 * 24 * 30));
-        certGen.setNotAfter(new Date(System.currentTimeMillis() + (1000L * 60 * 60 * 24 * 30)));
-        certGen.setSubjectDN(new X509Principal(order, subjectAttrs));
-        certGen.setPublicKey(pubKey);
-        certGen.setSignatureAlgorithm("MD5WithRSAEncryption");
-
-        return certGen.generate(privKey);
-    }
-
-    private void testGOSTStore()
-        throws Exception
-    {
-        byte[] data = Hex.decode("deadbeef");
-
-        KeyStore pkcs12 = KeyStore.getInstance("PKCS12", "BC");
-
-        pkcs12.load(new ByteArrayInputStream(gostPfx), "1".toCharArray());
-
-        PrivateKey pk = (PrivateKey)pkcs12.getKey("cp_exported", null);
-        Certificate[] pubCerts = pkcs12.getCertificateChain("cp_exported");
-
-        Signature sig = Signature.getInstance("ECGOST3410", "BC");
-
-        sig.initSign(pk);
-
-        sig.update(data);
-
-        byte[] signature = sig.sign();
-
-        sig = Signature.getInstance("ECGOST3410", "BC");
-
-        sig.initVerify(pubCerts[0].getPublicKey());
-
-        sig.update(data);
-
-        if (!sig.verify(signature))
-        {
-            fail("key test failed in GOST store");
-        }
-    }
-
-    public void testPKCS12Store()
-        throws Exception
-    {
-        BigInteger  mod = new BigInteger("bb1be8074e4787a8d77967f1575ef72dd7582f9b3347724413c021beafad8f32dba5168e280cbf284df722283dad2fd4abc750e3d6487c2942064e2d8d80641aa5866d1f6f1f83eec26b9b46fecb3b1c9856a303148a5cc899c642fb16f3d9d72f52526c751dc81622c420c82e2cfda70fe8d13f16cc7d6a613a5b2a2b5894d1", 16);
-        KeyStore store = KeyStore.getInstance("PKCS12", "BC");
-        ByteArrayInputStream stream = new ByteArrayInputStream(pkcs12);
-
-        store.load(stream, passwd);
-
-        Enumeration en = store.aliases();
-        String      pName = null;
-
-        while (en.hasMoreElements())
-        {
-            String  n = (String)en.nextElement();
-            if (store.isKeyEntry(n))
-            {
-                pName = n;
-            }
-            else
-            {
-                // the store's we're using here are consistent so this test will pass - it's actually
-                // possible for this test to fail in other circumstances as PKCS#12 allows certificates
-                // to be stored multiple times under different aliases.
-                X509Certificate cert = (X509Certificate)store.getCertificate(n);
-
-                if (!store.getCertificateAlias(cert).equals(n))
-                {
-                    fail("certificate alias check fails");
-                }
-            }
-        }
-
-        PrivateKey key = (PrivateKey)store.getKey(pName, null);
-
-        if (!((RSAPrivateKey)key).getModulus().equals(mod))
-        {
-            fail("Modulus doesn't match.");
-        }
-
-        Certificate[]    ch = store.getCertificateChain(pName);
-
-        if (ch.length != 3)
-        {
-            fail("chain was wrong length");
-        }
-
-        if (!((X509Certificate)ch[0]).getSerialNumber().equals(new BigInteger("96153094170511488342715101755496684211")))
-        {
-            fail("chain[0] wrong certificate.");
-        }
-
-        if (!((X509Certificate)ch[1]).getSerialNumber().equals(new BigInteger("279751514312356623147411505294772931957")))
-        {
-            fail("chain[1] wrong certificate.");
-        }
-
-        if (!((X509Certificate)ch[2]).getSerialNumber().equals(new BigInteger("11341398017")))
-        {
-            fail("chain[2] wrong certificate.");
-        }
-
-        //
-        // save test
-        //
-        ByteArrayOutputStream bOut = new ByteArrayOutputStream();
-
-        store.store(bOut, passwd);
-
-        stream = new ByteArrayInputStream(bOut.toByteArray());
-
-        store.load(stream, passwd);
-
-        key = (PrivateKey)store.getKey(pName, null);
-
-        if (!((RSAPrivateKey)key).getModulus().equals(mod))
-        {
-            fail("Modulus doesn't match.");
-        }
-
-        //
-        // save test using LoadStoreParameter
-        //
-        bOut = new ByteArrayOutputStream();
-
-        PKCS12StoreParameter storeParam = new PKCS12StoreParameter(bOut, passwd, true);
-
-        store.store(storeParam);
-
-        byte[] data = bOut.toByteArray();
-
-        stream = new ByteArrayInputStream(data);
-        store.load(stream, passwd);
-
-        key = (PrivateKey)store.getKey(pName, null);
-
-        if (!((RSAPrivateKey)key).getModulus().equals(mod))
-        {
-            fail("Modulus doesn't match.");
-        }
-
-        ASN1Encodable outer = new ASN1StreamParser(data).readObject();
-        if (!(outer instanceof DERSequenceParser))
-        {
-            fail("Failed DER encoding test.");
-        }
-
-
-        //
-        // save test using LoadStoreParameter  - old version
-        //
-        bOut = new ByteArrayOutputStream();
-
-        storeParam = new org.bouncycastle.jcajce.provider.config.PKCS12StoreParameter(bOut, passwd, true);
-
-        store.store(storeParam);
-
-        data = bOut.toByteArray();
-
-        stream = new ByteArrayInputStream(data);
-        store.load(stream, passwd);
-
-        key = (PrivateKey)store.getKey(pName, null);
-
-        if (!((RSAPrivateKey)key).getModulus().equals(mod))
-        {
-            fail("Modulus doesn't match.");
-        }
-
-        outer = new ASN1StreamParser(data).readObject();
-        if (!(outer instanceof DERSequenceParser))
-        {
-            fail("Failed DER encoding test.");
-        }
-
-        //
-        // save test using LoadStoreParameter
-        //
-        bOut = new ByteArrayOutputStream();
-
-        JDKPKCS12StoreParameter oldParam = new JDKPKCS12StoreParameter();
-        oldParam.setOutputStream(bOut);
-        oldParam.setPassword(passwd);
-        oldParam.setUseDEREncoding(true);
-
-        store.store(oldParam);
-
-        data = bOut.toByteArray();
-
-        stream = new ByteArrayInputStream(data);
-        store.load(stream, passwd);
-
-        key = (PrivateKey)store.getKey(pName, null);
-
-        if (!((RSAPrivateKey)key).getModulus().equals(mod))
-        {
-            fail("Modulus doesn't match.");
-        }
-
-        outer = new ASN1StreamParser(data).readObject();
-        if (!(outer instanceof DERSequenceParser))
-        {
-            fail("Failed DER encoding test.");
-        }
-
-        //
-        // delete test
-        //
-        store.deleteEntry(pName);
-
-        if (store.getKey(pName, null) != null)
-        {
-            fail("Failed deletion test.");
-        }
-        
-        // cert chain test
-        //
-        store.setCertificateEntry("testCert", ch[2]);
-        
-        if (store.getCertificateChain("testCert") != null)
-        {
-            fail("Failed null chain test.");
-        }
-
-        //
-        // UTF 8 single cert test
-        //
-        store = KeyStore.getInstance("PKCS12", "BC");
-        stream = new ByteArrayInputStream(certUTF);
-
-        store.load(stream, "user".toCharArray());
-
-        if (store.getCertificate("37") == null)
-        {
-            fail("Failed to find UTF cert.");
-        }
-
-        //
-        // try for a self generated certificate
-        //
-        RSAPublicKeySpec pubKeySpec = new RSAPublicKeySpec(
-            new BigInteger("b4a7e46170574f16a97082b22be58b6a2a629798419be12872a4bdba626cfae9900f76abfb12139dce5de56564fab2b6543165a040c606887420e33d91ed7ed7", 16),
-            new BigInteger("11", 16));
-
-        RSAPrivateCrtKeySpec privKeySpec = new RSAPrivateCrtKeySpec(
-            new BigInteger("b4a7e46170574f16a97082b22be58b6a2a629798419be12872a4bdba626cfae9900f76abfb12139dce5de56564fab2b6543165a040c606887420e33d91ed7ed7", 16),
-            new BigInteger("11", 16),
-            new BigInteger("9f66f6b05410cd503b2709e88115d55daced94d1a34d4e32bf824d0dde6028ae79c5f07b580f5dce240d7111f7ddb130a7945cd7d957d1920994da389f490c89", 16),
-            new BigInteger("c0a0758cdf14256f78d4708c86becdead1b50ad4ad6c5c703e2168fbf37884cb", 16),
-            new BigInteger("f01734d7960ea60070f1b06f2bb81bfac48ff192ae18451d5e56c734a5aab8a5", 16),
-            new BigInteger("b54bb9edff22051d9ee60f9351a48591b6500a319429c069a3e335a1d6171391", 16),
-            new BigInteger("d3d83daf2a0cecd3367ae6f8ae1aeb82e9ac2f816c6fc483533d8297dd7884cd", 16),
-            new BigInteger("b8f52fc6f38593dabb661d3f50f8897f8106eee68b1bce78a95b132b4e5b5d19", 16));
-
-        //
-        // set up the keys
-        //
-        PrivateKey          privKey = null;
-        PublicKey           pubKey = null;
-
-        try
-        {
-            KeyFactory  fact = KeyFactory.getInstance("RSA", "BC");
-
-            privKey = fact.generatePrivate(privKeySpec);
-            pubKey = fact.generatePublic(pubKeySpec);
-        }
-        catch (Exception e)
-        {
-            fail("error setting up keys - " + e.toString());
-        }
-
-        Certificate[] chain = new Certificate[1];
-
-        chain[0] = createCert(pubKey, privKey, "issuer@bouncycastle.org", "subject@bouncycastle.org");
-
-        testSupportedTypes(privKey, chain);
-
-        store = KeyStore.getInstance("PKCS12", "BC");
-
-        store.load(null, null);
-
-        store.setKeyEntry("privateKey", privKey, null, chain);
-        
-        if (!store.containsAlias("privateKey") || !store.containsAlias("PRIVATEKEY"))
-        {
-            fail("couldn't find alias privateKey");
-        }
-        
-        if (store.isCertificateEntry("privateKey"))
-        {
-            fail("key identified as certificate entry");
-        }
-        
-        if (!store.isKeyEntry("privateKey") || !store.isKeyEntry("PRIVATEKEY"))
-        {
-            fail("key not identified as key entry");
-        }
-        
-        if (!"privateKey".equals(store.getCertificateAlias(chain[0])))
-        {
-            fail("Did not return alias for key certificate privateKey");
-        }
-
-        ByteArrayOutputStream store1Stream = new ByteArrayOutputStream();
-
-        store.store(store1Stream, passwd);
-
-        testNoExtraLocalKeyID(store1Stream.toByteArray());
-
-        //
-        // no friendly name test
-        //
-        store = KeyStore.getInstance("PKCS12", "BC");
-        stream = new ByteArrayInputStream(pkcs12noFriendly);
-
-        store.load(stream, noFriendlyPassword);
-
-        en = store.aliases();
-        pName = null;
-
-        while (en.hasMoreElements())
-        {
-             String  n = (String)en.nextElement();
-
-             if (store.isKeyEntry(n))
-             {
-                 pName = n;
-             }
-        }
-        
-        ch = store.getCertificateChain(pName);
-
-        for (int i = 0; i != ch.length; i++)
-        {
-            //System.out.println(ch[i]);
-        }
-        
-        if (ch.length != 1)
-        {
-            fail("no cert found in pkcs12noFriendly");
-        }
-        
-        //
-        // failure tests
-        //
-        ch = store.getCertificateChain("dummy");
-
-        store.getCertificateChain("DUMMY");
-        
-        store.getCertificate("dummy");
-
-        store.getCertificate("DUMMY");
-
-        //
-        // storage test
-        //
-        store = KeyStore.getInstance("PKCS12", "BC");
-        stream = new ByteArrayInputStream(pkcs12StorageIssue);
-
-        store.load(stream, storagePassword);
-
-        en = store.aliases();
-        pName = null;
-
-        while (en.hasMoreElements())
-        {
-             String  n = (String)en.nextElement();
-
-             if (store.isKeyEntry(n))
-             {
-                 pName = n;
-             }
-        }
-        
-        ch = store.getCertificateChain(pName);
-        if (ch.length != 2)
-        {
-            fail("Certificate chain wrong length");
-        }
-
-        store.store(new ByteArrayOutputStream(), storagePassword);
-        
-        //
-        // basic certificate check
-        //
-        store.setCertificateEntry("cert", ch[1]);
-        
-        if (!store.containsAlias("cert") || !store.containsAlias("CERT"))
-        {
-            fail("couldn't find alias cert");
-        }
-        
-        if (!store.isCertificateEntry("cert") || !store.isCertificateEntry("CERT"))
-        {
-            fail("cert not identified as certificate entry");
-        }
-        
-        if (store.isKeyEntry("cert") || store.isKeyEntry("CERT"))
-        {
-            fail("cert identified as key entry");
-        }
-        
-        if (!store.entryInstanceOf("cert", KeyStore.TrustedCertificateEntry.class))
-        {
-            fail("cert not identified as TrustedCertificateEntry");
-        }
-        
-        if (!store.entryInstanceOf("CERT", KeyStore.TrustedCertificateEntry.class))
-        {
-            fail("CERT not identified as TrustedCertificateEntry");
-        }
-
-        if (store.entryInstanceOf("cert", KeyStore.PrivateKeyEntry.class))
-        {
-            fail("cert identified as key entry via PrivateKeyEntry");
-        }
-    
-        if (!"cert".equals(store.getCertificateAlias(ch[1])))
-        {
-            fail("Did not return alias for certificate entry");
-        }
-
-        //
-        // test restoring of a certificate with private key originally as a ca certificate
-        //
-        store = KeyStore.getInstance("PKCS12", "BC");
-        
-        store.load(null, null);
-        
-        store.setCertificateEntry("cert", ch[0]);
-
-        if (!store.containsAlias("cert") || !store.containsAlias("CERT"))
-        {
-            fail("restore: couldn't find alias cert");
-        }
-        
-        if (!store.isCertificateEntry("cert") || !store.isCertificateEntry("CERT"))
-        {
-            fail("restore: cert not identified as certificate entry");
-        }
-        
-        if (store.isKeyEntry("cert") || store.isKeyEntry("CERT"))
-        {
-            fail("restore: cert identified as key entry");
-        }
-        
-        if (store.entryInstanceOf("cert", KeyStore.PrivateKeyEntry.class))
-        {
-            fail("restore: cert identified as key entry via PrivateKeyEntry");
-        }
-        
-        if (store.entryInstanceOf("CERT", KeyStore.PrivateKeyEntry.class))
-        {
-            fail("restore: cert identified as key entry via PrivateKeyEntry");
-        }
-        
-        if (!store.entryInstanceOf("cert", KeyStore.TrustedCertificateEntry.class))
-        {
-            fail("restore: cert not identified as TrustedCertificateEntry");
-        }
-        
-        //
-        // test of reading incorrect zero-length encoding
-        //
-        store = KeyStore.getInstance("PKCS12", "BC");
-        stream = new ByteArrayInputStream(pkcs12nopass);
-        
-        store.load(stream, "".toCharArray());
-    }
-
-    private void testSupportedTypes(PrivateKey privKey, Certificate[] chain)
-        throws Exception
-    {
-        basicStoreTest(privKey, chain, "PKCS12");
-        basicStoreTest(privKey, chain, "BCPKCS12");
-        basicStoreTest(privKey, chain, "PKCS12-DEF");
-
-        basicStoreTest(privKey, chain, "PKCS12-3DES-40RC2");
-        basicStoreTest(privKey, chain, "PKCS12-3DES-3DES");
-
-        basicStoreTest(privKey, chain, "PKCS12-DEF-3DES-40RC2");
-        basicStoreTest(privKey, chain, "PKCS12-DEF-3DES-3DES");
-    }
-
-    private void basicStoreTest(PrivateKey privKey, Certificate[] chain, String type)
-        throws Exception
-    {
-        KeyStore store = KeyStore.getInstance(type, "BC");
-
-        store.load(null, null);
-
-        store.setKeyEntry("key", privKey, null, chain);
-
-        ByteArrayOutputStream bOut = new ByteArrayOutputStream();
-
-        store.store(bOut, passwd);
-
-        store.load(new ByteArrayInputStream(bOut.toByteArray()), passwd);
-
-        Key k = store.getKey("key", null);
-
-        if (!k.equals(privKey))
-        {
-            fail("private key didn't match");
-        }
-
-        Certificate[] c = store.getCertificateChain("key");
-
-        if (c.length != chain.length || !c[0].equals(chain[0]))
-        {
-            fail("certificates didn't match");
-        }
-
-        if (type.contains("DEF"))
-        {
-            if (c[0] instanceof X509CertificateObject)
-            {
-                fail("wrong certificate type found");
-            }
-        }
-
-        // check attributes
-        PKCS12BagAttributeCarrier b1 = (PKCS12BagAttributeCarrier)k;
-        PKCS12BagAttributeCarrier b2 = (PKCS12BagAttributeCarrier)chain[0];
-
-        if (b1.getBagAttribute(PKCSObjectIdentifiers.pkcs_9_at_friendlyName) != null)
-        {
-            DERBMPString name = (DERBMPString)b1.getBagAttribute(PKCSObjectIdentifiers.pkcs_9_at_friendlyName);
-
-            if (!name.equals(new DERBMPString("key")))
-            {
-                fail("friendly name wrong");
-            }
-        }
-        else
-        {
-            fail("no friendly name found on key");
-        }
-
-        if (b1.getBagAttribute(PKCSObjectIdentifiers.pkcs_9_at_localKeyId) != null)
-        {
-            ASN1OctetString id = (ASN1OctetString)b1.getBagAttribute(PKCSObjectIdentifiers.pkcs_9_at_localKeyId);
-
-            if (!id.equals(b2.getBagAttribute(PKCSObjectIdentifiers.pkcs_9_at_localKeyId)))
-            {
-                fail("local key id mismatch");
-            }
-        }
-        else
-        {
-            fail("no local key id found");
-        }
-
-        //
-        // check algorithm types.
-        //
-        ASN1InputStream aIn = new ASN1InputStream(bOut.toByteArray());
-
-        Pfx pfx = Pfx.getInstance(aIn.readObject());
-
-        ContentInfo cInfo = pfx.getAuthSafe();
-
-        ASN1OctetString auth = (ASN1OctetString)cInfo.getContent();
-
-        aIn = new ASN1InputStream(auth.getOctets());
-        ASN1Sequence s1 = (ASN1Sequence)aIn.readObject();
-
-        ContentInfo c1 = ContentInfo.getInstance(s1.getObjectAt(0));
-        ContentInfo c2 = ContentInfo.getInstance(s1.getObjectAt(1));
-
-        aIn = new ASN1InputStream(((ASN1OctetString)c1.getContent()).getOctets());
-
-        SafeBag sb = SafeBag.getInstance((((ASN1Sequence)aIn.readObject()).getObjectAt(0)));
-
-        EncryptedPrivateKeyInfo encInfo = EncryptedPrivateKeyInfo.getInstance(sb.getBagValue());
-
-        if (!encInfo.getEncryptionAlgorithm().getAlgorithm().equals(PKCSObjectIdentifiers.pbeWithSHAAnd3_KeyTripleDES_CBC))
-        {
-            fail("key encryption algorithm wrong");
-        }
-
-        // check the key encryption
-
-        // check the certificate encryption
-        EncryptedData cb = EncryptedData.getInstance(c2.getContent());
-
-        if (type.endsWith("3DES"))
-        {
-            if (!cb.getEncryptionAlgorithm().getAlgorithm().equals(PKCSObjectIdentifiers.pbeWithSHAAnd3_KeyTripleDES_CBC))
-            {
-                fail("expected 3DES found: " + cb.getEncryptionAlgorithm().getAlgorithm());
-            }
-        }
-        else if (type.endsWith("40RC2"))
-        {
-            if (!cb.getEncryptionAlgorithm().getAlgorithm().equals(PKCSObjectIdentifiers.pbeWithSHAAnd40BitRC2_CBC))
-            {
-                fail("expected 40 bit RC2 found: " + cb.getEncryptionAlgorithm().getAlgorithm());
-            }
-        }
-        else
-        {
-            if (!cb.getEncryptionAlgorithm().getAlgorithm().equals(PKCSObjectIdentifiers.pbeWithSHAAnd40BitRC2_CBC))
-            {
-                fail("expected 40 bit RC2 found: " + cb.getEncryptionAlgorithm().getAlgorithm());
-            }
-        }
-    }
-
-    private void testNoExtraLocalKeyID(byte[] store1data)
-        throws Exception
-    {
-        KeyPairGenerator kpg = KeyPairGenerator.getInstance("RSA", "BC");
-
-        kpg.initialize(512);
-
-        KeyPair newPair = kpg.genKeyPair();
-
-        KeyStore store1 = KeyStore.getInstance("PKCS12", "BC");
-
-        store1.load(new ByteArrayInputStream(store1data), passwd);
-
-        KeyStore store2 = KeyStore.getInstance("PKCS12", "BC");
-
-        store2.load(null, null);
-        
-        PrivateKey k1 = (PrivateKey)store1.getKey("privatekey", null);
-        Certificate[] chain1 = store1.getCertificateChain("privatekey");
-
-        Certificate[] chain2 = new Certificate[chain1.length + 1];
-
-        System.arraycopy(chain1, 0, chain2, 1, chain1.length);
-
-        chain2[0] = createCert(newPair.getPublic(), k1, "subject@bouncycastle.org", "extra@bouncycaste.org");
-
-        if (((PKCS12BagAttributeCarrier)chain1[0]).getBagAttribute(PKCSObjectIdentifiers.pkcs_9_at_localKeyId) == null)
-        {
-            fail("localKeyID not found initially");
-        }
-        
-        store2.setKeyEntry("new", newPair.getPrivate(), null, chain2);
-
-        ByteArrayOutputStream bOut = new ByteArrayOutputStream();
-
-        store2.store(bOut, passwd);
-
-        store2.load(new ByteArrayInputStream(bOut.toByteArray()), passwd);
-
-        chain2 = store2.getCertificateChain("new");
-
-        if (((PKCS12BagAttributeCarrier)chain2[1]).getBagAttribute(PKCSObjectIdentifiers.pkcs_9_at_localKeyId) != null)
-        {
-            fail("localKeyID found after save");
-        }
-    }
-
-    public String getName()
-    {
-        return "PKCS12Store";
-    }
-
-    public void performTest()
-        throws Exception
-    {
-        testPKCS12Store();
-        testGOSTStore();
-
-        // converter tests
-
-        KeyStore kS = KeyStore.getInstance("PKCS12", "BC");
-
-        byte[] data = PKCS12Util.convertToDefiniteLength(pkcs12);
-        kS.load(new ByteArrayInputStream(data), passwd);     // check MAC
-
-        ASN1Encodable obj = new ASN1StreamParser(data).readObject();
-        if (!(obj instanceof DERSequenceParser))
-        {
-            fail("Failed DER conversion test.");
-        }
-
-        data = PKCS12Util.convertToDefiniteLength(pkcs12, passwd, "BC");
-        kS.load(new ByteArrayInputStream(data), passwd); //check MAC
-
-        obj = new ASN1StreamParser(data).readObject();
-        if (!(obj instanceof DERSequenceParser))
-        {
-            fail("Failed deep DER conversion test - outer.");
-        }
-
-        Pfx pfx = Pfx.getInstance(obj);
-
-        obj = new ASN1StreamParser(ASN1OctetString.getInstance(pfx.getAuthSafe().getContent()).getOctets()).readObject();
-        if (!(obj instanceof DERSequenceParser))
-        {
-            fail("Failed deep DER conversion test - inner.");
-        }
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        Security.addProvider(new BouncyCastleProvider());
-
-        runTest(new PKCS12StoreTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/PKIXNameConstraintsTest.java b/bcprov/src/main/java/org/bouncycastle/jce/provider/test/PKIXNameConstraintsTest.java
deleted file mode 100644
index df8e8b5..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/PKIXNameConstraintsTest.java
+++ /dev/null
@@ -1,452 +0,0 @@
-package org.bouncycastle.jce.provider.test;
-
-import org.bouncycastle.asn1.DEROctetString;
-import org.bouncycastle.asn1.x509.GeneralName;
-import org.bouncycastle.asn1.x509.GeneralSubtree;
-import org.bouncycastle.jce.provider.PKIXNameConstraintValidator;
-import org.bouncycastle.jce.provider.PKIXNameConstraintValidatorException;
-import org.bouncycastle.util.test.SimpleTest;
-
-/**
- * Test class for {@link PKIXNameConstraintValidator}.
- * <p>
- * The field testXYZ is the name to test.
- * <p>
- * The field testXYZIsConstraint must be tested if it is permitted and excluded.
- * <p>
- * The field testXYZIsNotConstraint must be tested if it is not permitted and
- * not excluded.
- * <p>
- * Furthermore there are tests for the intersection and union of test names.
- * 
- */
-public class PKIXNameConstraintsTest
-    extends SimpleTest
-{
-
-    private final static String testEmail = "test@abc.test.com";
-
-    private final static String testEmailIsConstraint[] =
-    { "test@abc.test.com", "abc.test.com", ".test.com" };
-
-    private final static String testEmailIsNotConstraint[] =
-    { ".abc.test.com", "www.test.com", "test1@abc.test.com", "bc.test.com" };
-
-    private final static String email1[] =
-    { "test@test.com", "test@test.com", "test@test.com", "test@abc.test.com",
-            "test@test.com", "test@test.com", ".test.com", ".test.com",
-            ".test.com", ".test.com", "test.com", "abc.test.com",
-            "abc.test1.com", "test.com", "test.com", ".test.com" };
-
-    private final static String email2[] =
-    { "test@test.abc.com", "test@test.com", ".test.com", ".test.com",
-            "test.com", "test1.com", "test@test.com", ".test.com",
-            ".test1.com", "test.com", "test.com", ".test.com", ".test.com",
-            "test1.com", ".test.com", "abc.test.com" };
-
-    private final static String emailintersect[] =
-    { null, "test@test.com", null, "test@abc.test.com", "test@test.com", null,
-            null, ".test.com", null, null, "test.com", "abc.test.com", null,
-            null, null, "abc.test.com" };
-
-    private final static String emailunion[][] =
-    {
-    { "test@test.com", "test@test.abc.com" },
-    { "test@test.com" },
-    { "test@test.com", ".test.com" },
-    { ".test.com" },
-    { "test.com" },
-    { "test@test.com", "test1.com" },
-    { ".test.com", "test@test.com" },
-    { ".test.com" },
-    { ".test.com", ".test1.com" },
-    { ".test.com", "test.com" },
-    { "test.com" },
-    { ".test.com" },
-    { ".test.com", "abc.test1.com" },
-    { "test1.com", "test.com" },
-    { ".test.com", "test.com" },
-    { ".test.com" } };
-
-    private final static String[] dn1 =
-    { "O=test org, OU=test org unit, CN=John Doe" };
-
-    private final static String[] dn2 =
-    { "O=test org, OU=test org unit" };
-
-    private final static String[][] dnUnion =
-    {
-    { "O=test org, OU=test org unit" } };
-
-    private final static String[] dnIntersection =
-    { "O=test org, OU=test org unit, CN=John Doe" };
-
-    private final static String testDN = "O=test org, OU=test org unit, CN=John Doe";
-
-    private final static String testDNIsConstraint[] =
-    { "O=test org, OU=test org unit",
-            "O=test org, OU=test org unit, CN=John Doe" };
-
-    private final static String testDNIsNotConstraint[] =
-    { "O=test org, OU=test org unit, CN=John Doe2",
-            "O=test org, OU=test org unit2",
-            "OU=test org unit, O=test org, CN=John Doe",
-            "O=test org, OU=test org unit, CN=John Doe, L=USA" };
-
-    private final static String testDNS = "abc.test.com";
-
-    private final static String testDNSIsConstraint[] =
-    { "test.com", "abc.test.com", "test.com" };
-
-    private final static String testDNSIsNotConstraint[] =
-    { "wwww.test.com", "ww.test.com", "www.test.com" };
-
-    private final static String dns1[] =
-    { "www.test.de", "www.test1.de", "www.test.de" };
-
-    private final static String dns2[] =
-    { "test.de", "www.test.de", "www.test.de" };
-
-    private final static String dnsintersect[] =
-    { "www.test.de", null, null };
-
-    private final static String dnsunion[][] =
-    {
-    { "test.de" },
-    { "www.test1.de", "www.test.de" },
-    { "www.test.de" } };
-
-    private final static String testURI = "http://karsten:password@abc.test.com:8080";
-
-    private final static String testURIIsConstraint[] =
-    { "abc.test.com", ".test.com" };
-
-    private final static String testURIIsNotConstraint[] =
-    { "xyz.test.com", ".abc.test.com" };
-
-    private final static String uri1[] =
-    { "www.test.de", ".test.de", "test1.de", ".test.de" };
-
-    private final static String uri2[] =
-    { "test.de", "www.test.de", "test1.de", ".test.de" };
-
-    private final static String uriintersect[] =
-    { null, "www.test.de", "test1.de", ".test.de" };
-
-    private final static String uriunion[][] =
-    {
-    { "www.test.de", "test.de" },
-    { ".test.de" },
-    { "test1.de" },
-    { ".test.de" } };
-
-    private final static byte[] testIP =
-
-    { (byte) 192, (byte) 168, 1, 2 };
-
-    private final static byte[][] testIPIsConstraint =
-    {
-    { (byte) 192, (byte) 168, 1, 1, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, 0 },
-    { (byte) 192, (byte) 168, 1, 1, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, 4 } };
-
-    private final static byte[][] testIPIsNotConstraint =
-    {
-    { (byte) 192, (byte) 168, 3, 1, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, 2 },
-    { (byte) 192, (byte) 168, 1, 1, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, 3 } };
-
-    private final static byte[][] ip1 =
-    {
-            { (byte) 192, (byte) 168, 1, 1, (byte) 0xFF, (byte) 0xFF,
-                    (byte) 0xFE, (byte) 0xFF },
-            { (byte) 192, (byte) 168, 1, 1, (byte) 0xFF, (byte) 0xFF,
-                    (byte) 0xFF, (byte) 0xFF },
-            { (byte) 192, (byte) 168, 1, 1, (byte) 0xFF, (byte) 0xFF,
-                    (byte) 0xFF, (byte) 0x00 } };
-
-    private final static byte[][] ip2 =
-    {
-            { (byte) 192, (byte) 168, 0, 1, (byte) 0xFF, (byte) 0xFF,
-                    (byte) 0xFC, 3 },
-            { (byte) 192, (byte) 168, 1, 1, (byte) 0xFF, (byte) 0xFF,
-                    (byte) 0xFF, (byte) 0xFF },
-            { (byte) 192, (byte) 168, 0, 1, (byte) 0xFF, (byte) 0xFF,
-                    (byte) 0xFF, (byte) 0x00 } };
-
-    private final static byte[][] ipintersect =
-    {
-            { (byte) 192, (byte) 168, 0, 1, (byte) 0xFF, (byte) 0xFF,
-                    (byte) 0xFE, (byte) 0xFF },
-            { (byte) 192, (byte) 168, 1, 1, (byte) 0xFF, (byte) 0xFF,
-                    (byte) 0xFF, (byte) 0xFF }, null };
-
-    private final static byte[][][] ipunion =
-    {
-            {
-                    { (byte) 192, (byte) 168, 1, 1, (byte) 0xFF, (byte) 0xFF,
-                            (byte) 0xFE, (byte) 0xFF },
-                    { (byte) 192, (byte) 168, 0, 1, (byte) 0xFF, (byte) 0xFF,
-                            (byte) 0xFC, 3 } },
-            {
-            { (byte) 192, (byte) 168, 1, 1, (byte) 0xFF, (byte) 0xFF,
-                    (byte) 0xFF, (byte) 0xFF } },
-            {
-                    { (byte) 192, (byte) 168, 1, 1, (byte) 0xFF, (byte) 0xFF,
-                            (byte) 0xFF, (byte) 0x00 },
-                    { (byte) 192, (byte) 168, 0, 1, (byte) 0xFF, (byte) 0xFF,
-                            (byte) 0xFF, (byte) 0x00 } } };
-
-    public String getName()
-    {
-        return "PKIXNameConstraintsTest";
-    }
-
-    public void performTest() throws Exception
-    {
-        testConstraints(GeneralName.rfc822Name, testEmail,
-            testEmailIsConstraint, testEmailIsNotConstraint, email1, email2,
-            emailunion, emailintersect);
-        testConstraints(GeneralName.dNSName, testDNS, testDNSIsConstraint,
-            testDNSIsNotConstraint, dns1, dns2, dnsunion, dnsintersect);
-        testConstraints(GeneralName.directoryName, testDN, testDNIsConstraint,
-            testDNIsNotConstraint, dn1, dn2, dnUnion, dnIntersection);
-        testConstraints(GeneralName.uniformResourceIdentifier, testURI,
-            testURIIsConstraint, testURIIsNotConstraint, uri1, uri2, uriunion,
-            uriintersect);
-        testConstraints(GeneralName.iPAddress, testIP, testIPIsConstraint,
-            testIPIsNotConstraint, ip1, ip2, ipunion, ipintersect);
-    }
-
-    /**
-     * Tests string based GeneralNames for inclusion or exclusion.
-     * 
-     * @param nameType The {@link GeneralName} type to test.
-     * @param testName The name to test.
-     * @param testNameIsConstraint The names where <code>testName</code> must
-     *            be included and excluded.
-     * @param testNameIsNotConstraint The names where <code>testName</code>
-     *            must not be excluded and included.
-     * @param testNames1 Operand 1 of test names to use for union and
-     *            intersection testing.
-     * @param testNames2 Operand 2 of test names to use for union and
-     *            intersection testing.
-     * @param testUnion The union results.
-     * @param testInterSection The intersection results.
-     * @throws Exception If an unexpected exception occurs.
-     */
-    private void testConstraints(
-        int nameType,
-        String testName,
-        String[] testNameIsConstraint,
-        String[] testNameIsNotConstraint,
-        String[] testNames1,
-        String[] testNames2,
-        String[][] testUnion,
-        String[] testInterSection) throws Exception
-    {
-        for (int i = 0; i < testNameIsConstraint.length; i++)
-        {
-            PKIXNameConstraintValidator constraintValidator = new PKIXNameConstraintValidator();
-            constraintValidator.intersectPermittedSubtree(new GeneralSubtree(
-                new GeneralName(nameType, testNameIsConstraint[i])));
-            constraintValidator.checkPermitted(new GeneralName(nameType, testName));
-        }
-        for (int i = 0; i < testNameIsNotConstraint.length; i++)
-        {
-            PKIXNameConstraintValidator constraintValidator = new PKIXNameConstraintValidator();
-            constraintValidator.intersectPermittedSubtree(new GeneralSubtree(
-                new GeneralName(nameType, testNameIsNotConstraint[i])));
-            try
-            {
-                constraintValidator.checkPermitted(new GeneralName(nameType, testName));
-                fail("not permitted name allowed: " + nameType);
-            }
-            catch (PKIXNameConstraintValidatorException e)
-            {
-                // expected
-            }
-        }
-        for (int i = 0; i < testNameIsConstraint.length; i++)
-        {
-            PKIXNameConstraintValidator constraintValidator = new PKIXNameConstraintValidator();
-            constraintValidator.addExcludedSubtree(new GeneralSubtree(new GeneralName(
-                nameType, testNameIsConstraint[i])));
-            try
-            {
-                constraintValidator.checkExcluded(new GeneralName(nameType, testName));
-                fail("excluded name missed: " + nameType);
-            }
-            catch (PKIXNameConstraintValidatorException e)
-            {
-                // expected
-            }
-        }
-        for (int i = 0; i < testNameIsNotConstraint.length; i++)
-        {
-            PKIXNameConstraintValidator constraintValidator = new PKIXNameConstraintValidator();
-            constraintValidator.addExcludedSubtree(new GeneralSubtree(new GeneralName(
-                nameType, testNameIsNotConstraint[i])));
-            constraintValidator.checkExcluded(new GeneralName(nameType, testName));
-        }
-        for (int i = 0; i < testNames1.length; i++)
-        {
-            PKIXNameConstraintValidator constraintValidator = new PKIXNameConstraintValidator();
-            constraintValidator.addExcludedSubtree(new GeneralSubtree(new GeneralName(
-                nameType, testNames1[i])));
-            constraintValidator.addExcludedSubtree(new GeneralSubtree(new GeneralName(
-                nameType, testNames2[i])));
-            PKIXNameConstraintValidator constraints2 = new PKIXNameConstraintValidator();
-            for (int j = 0; j < testUnion[i].length; j++)
-            {
-                constraints2.addExcludedSubtree(new GeneralSubtree(
-                    new GeneralName(nameType, testUnion[i][j])));
-            }
-            if (!constraints2.equals(constraintValidator))
-            {
-                fail("union wrong: " + nameType);
-            }
-            constraintValidator = new PKIXNameConstraintValidator();
-            constraintValidator.intersectPermittedSubtree(new GeneralSubtree(
-                new GeneralName(nameType, testNames1[i])));
-            constraintValidator.intersectPermittedSubtree(new GeneralSubtree(
-                new GeneralName(nameType, testNames2[i])));
-            constraints2 = new PKIXNameConstraintValidator();
-            if (testInterSection[i] != null)
-            {
-                constraints2.intersectPermittedSubtree(new GeneralSubtree(
-                    new GeneralName(nameType, testInterSection[i])));
-            }
-            else
-            {
-                constraints2.intersectEmptyPermittedSubtree(nameType);
-            }
-            if (!constraints2.equals(constraintValidator))
-            {
-                fail("intersection wrong: " + nameType);
-            }
-        }
-    }
-
-    /**
-     * Tests byte array based GeneralNames for inclusion or exclusion.
-     * 
-     * @param nameType The {@link GeneralName} type to test.
-     * @param testName The name to test.
-     * @param testNameIsConstraint The names where <code>testName</code> must
-     *            be included and excluded.
-     * @param testNameIsNotConstraint The names where <code>testName</code>
-     *            must not be excluded and included.
-     * @param testNames1 Operand 1 of test names to use for union and
-     *            intersection testing.
-     * @param testNames2 Operand 2 of test names to use for union and
-     *            intersection testing.
-     * @param testUnion The union results.
-     * @param testInterSection The intersection results.
-     * @throws Exception If an unexpected exception occurs.
-     */
-    private void testConstraints(
-        int nameType,
-        byte[] testName,
-        byte[][] testNameIsConstraint,
-        byte[][] testNameIsNotConstraint,
-        byte[][] testNames1,
-        byte[][] testNames2,
-        byte[][][] testUnion,
-        byte[][] testInterSection) throws Exception
-    {
-        for (int i = 0; i < testNameIsConstraint.length; i++)
-        {
-            PKIXNameConstraintValidator constraintValidator = new PKIXNameConstraintValidator();
-            constraintValidator.intersectPermittedSubtree(new GeneralSubtree(
-                new GeneralName(nameType, new DEROctetString(
-                    testNameIsConstraint[i]))));
-            constraintValidator.checkPermitted(new GeneralName(nameType,
-                new DEROctetString(testName)));
-        }
-        for (int i = 0; i < testNameIsNotConstraint.length; i++)
-        {
-            PKIXNameConstraintValidator constraintValidator = new PKIXNameConstraintValidator();
-            constraintValidator.intersectPermittedSubtree(new GeneralSubtree(
-                new GeneralName(nameType, new DEROctetString(
-                    testNameIsNotConstraint[i]))));
-            try
-            {
-                constraintValidator.checkPermitted(new GeneralName(nameType,
-                    new DEROctetString(testName)));
-                fail("not permitted name allowed: " + nameType);
-            }
-            catch (PKIXNameConstraintValidatorException e)
-            {
-                // expected
-            }
-        }
-        for (int i = 0; i < testNameIsConstraint.length; i++)
-        {
-            PKIXNameConstraintValidator constraintValidator = new PKIXNameConstraintValidator();
-            constraintValidator.addExcludedSubtree(new GeneralSubtree(new GeneralName(
-                nameType, new DEROctetString(testNameIsConstraint[i]))));
-            try
-            {
-                constraintValidator.checkExcluded(new GeneralName(nameType,
-                    new DEROctetString(testName)));
-                fail("excluded name missed: " + nameType);
-            }
-            catch (PKIXNameConstraintValidatorException e)
-            {
-                // expected
-            }
-        }
-        for (int i = 0; i < testNameIsNotConstraint.length; i++)
-        {
-            PKIXNameConstraintValidator constraintValidator = new PKIXNameConstraintValidator();
-            constraintValidator.addExcludedSubtree(new GeneralSubtree(new GeneralName(
-                nameType, new DEROctetString(testNameIsNotConstraint[i]))));
-            constraintValidator.checkExcluded(new GeneralName(nameType,
-                new DEROctetString(testName)));
-        }
-        for (int i = 0; i < testNames1.length; i++)
-        {
-            PKIXNameConstraintValidator constraintValidator = new PKIXNameConstraintValidator();
-            constraintValidator.addExcludedSubtree(new GeneralSubtree(new GeneralName(
-                nameType, new DEROctetString(testNames1[i]))));
-            constraintValidator.addExcludedSubtree(new GeneralSubtree(new GeneralName(
-                nameType, new DEROctetString(testNames2[i]))));
-            PKIXNameConstraintValidator constraints2 = new PKIXNameConstraintValidator();
-            for (int j = 0; j < testUnion[i].length; j++)
-            {
-                constraints2.addExcludedSubtree(new GeneralSubtree(
-                    new GeneralName(nameType, new DEROctetString(
-                        testUnion[i][j]))));
-            }
-            if (!constraints2.equals(constraintValidator))
-            {
-                fail("union wrong: " + nameType);
-            }
-            constraintValidator = new PKIXNameConstraintValidator();
-            constraintValidator.intersectPermittedSubtree(new GeneralSubtree(
-                new GeneralName(nameType, new DEROctetString(testNames1[i]))));
-            constraintValidator.intersectPermittedSubtree(new GeneralSubtree(
-                new GeneralName(nameType, new DEROctetString(testNames2[i]))));
-            constraints2 = new PKIXNameConstraintValidator();
-            if (testInterSection[i] != null)
-            {
-                constraints2.intersectPermittedSubtree(new GeneralSubtree(
-                new GeneralName(nameType, new DEROctetString(
-                    testInterSection[i]))));
-            }
-            else
-            {
-                constraints2.intersectEmptyPermittedSubtree(nameType);
-            }
-
-            if (!constraints2.equals(constraintValidator))
-            {
-                fail("intersection wrong: " + nameType);
-            }
-        }
-    }
-
-    public static void main(String[] args)
-    {
-        runTest(new PKIXNameConstraintsTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/PKIXPolicyMappingTest.java b/bcprov/src/main/java/org/bouncycastle/jce/provider/test/PKIXPolicyMappingTest.java
deleted file mode 100644
index 069a006..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/PKIXPolicyMappingTest.java
+++ /dev/null
@@ -1,450 +0,0 @@
-package org.bouncycastle.jce.provider.test;
-
-import java.io.IOException;
-import java.math.BigInteger;
-import java.security.InvalidAlgorithmParameterException;
-import java.security.KeyFactory;
-import java.security.NoSuchAlgorithmException;
-import java.security.NoSuchProviderException;
-import java.security.PrivateKey;
-import java.security.PublicKey;
-import java.security.Security;
-import java.security.cert.CertPathBuilder;
-import java.security.cert.CertStore;
-import java.security.cert.CollectionCertStoreParameters;
-import java.security.cert.PKIXBuilderParameters;
-import java.security.cert.PKIXCertPathBuilderResult;
-import java.security.cert.TrustAnchor;
-import java.security.cert.X509CertSelector;
-import java.security.cert.X509Certificate;
-import java.security.spec.RSAPrivateCrtKeySpec;
-import java.security.spec.RSAPublicKeySpec;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.Hashtable;
-import java.util.Set;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.x509.BasicConstraints;
-import org.bouncycastle.asn1.x509.CertificatePolicies;
-import org.bouncycastle.asn1.x509.PolicyInformation;
-import org.bouncycastle.asn1.x509.PolicyMappings;
-import org.bouncycastle.asn1.x509.X509Extensions;
-import org.bouncycastle.jce.X509Principal;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.util.test.SimpleTest;
-import org.bouncycastle.util.test.TestFailedException;
-import org.bouncycastle.x509.X509V3CertificateGenerator;
-
-public class PKIXPolicyMappingTest
-    extends SimpleTest
-{
-    static X509V3CertificateGenerator  v3CertGen = new X509V3CertificateGenerator();
-    
-    public String getName()
-    {
-        return "PKIXPolicyMapping";
-    }
-    
-    /**
-     * TrustAnchor's Cert
-     */
-    private X509Certificate createTrustCert(
-        PublicKey       pubKey,
-        PrivateKey      privKey)
-        throws Exception
-    {
-        String  issuer  = "C=JP, O=policyMappingAdditionalTest, OU=trustAnchor";
-        String  subject = "C=JP, O=policyMappingAdditionalTest, OU=trustAnchor";
-        v3CertGen.setSerialNumber(BigInteger.valueOf(10));
-        v3CertGen.setIssuerDN(new X509Principal(issuer));
-        v3CertGen.setNotBefore(new Date(System.currentTimeMillis() - 1000L * 60 * 60 * 24 * 30));
-        v3CertGen.setNotAfter(new Date(System.currentTimeMillis() + (1000L * 60 * 60 * 24 * 30)));
-        v3CertGen.setSubjectDN(new X509Principal(subject));
-        v3CertGen.setPublicKey(pubKey);
-        v3CertGen.setSignatureAlgorithm("SHA1WithRSAEncryption");
-        X509Certificate cert = v3CertGen.generate(privKey);
-        return cert;
-    }
-    
-    /**
-     * intermediate cert
-     */
-    private X509Certificate createIntmedCert(
-        PublicKey           pubKey,
-        PrivateKey          caPrivKey,
-        PublicKey           caPubKey,
-        CertificatePolicies policies,
-        Hashtable           policyMap)
-        throws Exception
-    {
-        String  issuer  = "C=JP, O=policyMappingAdditionalTest, OU=trustAnchor";
-        String  subject = "C=JP, O=policyMappingAdditionalTest, OU=intmedCA";
-        v3CertGen.reset();
-        v3CertGen.setSerialNumber(BigInteger.valueOf(20));
-        v3CertGen.setIssuerDN(new X509Principal(issuer));
-        v3CertGen.setNotBefore(new Date(System.currentTimeMillis() - 1000L * 60 * 60 * 24 * 30));
-        v3CertGen.setNotAfter(new Date(System.currentTimeMillis() + (1000L * 60 * 60 * 24 * 30)));
-        v3CertGen.setSubjectDN(new X509Principal(subject));
-        v3CertGen.setPublicKey(pubKey);
-        v3CertGen.setSignatureAlgorithm("SHA1WithRSAEncryption");
-        v3CertGen.addExtension(X509Extensions.CertificatePolicies, true, policies);
-        v3CertGen.addExtension(X509Extensions.BasicConstraints, true, new BasicConstraints(true));
-        v3CertGen.addExtension(X509Extensions.PolicyMappings, true, new PolicyMappings(policyMap));
-        X509Certificate cert = v3CertGen.generate(caPrivKey);
-        return cert;
-    }
-    
-    /**
-     * endEntity cert
-     */
-    private X509Certificate createEndEntityCert(
-        PublicKey           pubKey,
-        PrivateKey          caPrivKey,
-        PublicKey           caPubKey,
-        ASN1EncodableVector policies)
-        throws Exception
-    {
-        String  issuer  = "C=JP, O=policyMappingAdditionalTest, OU=intMedCA";
-        String  subject = "C=JP, O=policyMappingAdditionalTest, OU=endEntity";
-        v3CertGen.reset();
-        v3CertGen.setSerialNumber(BigInteger.valueOf(20));
-        v3CertGen.setIssuerDN(new X509Principal(issuer));
-        v3CertGen.setNotBefore(new Date(System.currentTimeMillis() - 1000L * 60 * 60 * 24 * 30));
-        v3CertGen.setNotAfter(new Date(System.currentTimeMillis() + (1000L * 60 * 60 * 24 * 30)));
-        v3CertGen.setSubjectDN(new X509Principal(subject));
-        v3CertGen.setPublicKey(pubKey);
-        v3CertGen.setSignatureAlgorithm("SHA1WithRSAEncryption");
-        v3CertGen.addExtension(X509Extensions.CertificatePolicies,true,new DERSequence(policies));
-        X509Certificate cert = v3CertGen.generate(caPrivKey);
-        return cert;
-    }
-    
-    private String testPolicies(
-        int             index,
-        X509Certificate trustCert, 
-        X509Certificate intCert, 
-        X509Certificate endCert,
-        Set             requirePolicies,
-        boolean         okay) 
-        throws IOException, InvalidAlgorithmParameterException, NoSuchAlgorithmException, NoSuchProviderException
-    {
-        Set trust = new HashSet();
-        trust.add(new TrustAnchor(trustCert, null));
-        X509CertSelector targetConstraints = new X509CertSelector();
-        targetConstraints.setSubject(endCert.getSubjectX500Principal().getEncoded());
-        PKIXBuilderParameters params = new PKIXBuilderParameters(trust, targetConstraints);
-        
-        Set certs = new HashSet();
-        certs.add(intCert);
-        certs.add(endCert);
-        CollectionCertStoreParameters pr = new CollectionCertStoreParameters(certs);
-        CertStore store = CertStore.getInstance("Collection",pr);
-        params.addCertStore(store);
-        
-        params.setRevocationEnabled(false);
-        if (requirePolicies != null)
-        {
-            params.setExplicitPolicyRequired(true);
-            params.setInitialPolicies(requirePolicies);
-        }
-        
-        CertPathBuilder cpb = CertPathBuilder.getInstance("PKIX","BC");  
-//      CertPathBuilder cpb = CertPathBuilder.getInstance("PKIX","SUN");  
-        PKIXCertPathBuilderResult result = null;
-        try
-        {
-            result = (PKIXCertPathBuilderResult)cpb.build(params);
-            
-            if (!okay)
-            {
-                fail(index + ": path validated when failure expected.");
-            }
-            
-//            if (result.getPolicyTree() != null)
-//            {
-//                System.out.println("OK");
-//                System.out.println("policy: " + result.getPolicyTree());
-//            }
-//            else
-//            {
-//                System.out.println("OK: policy tree = null");
-//            }
-            
-            return "";
-        }
-        catch (TestFailedException e)
-        {
-            throw e;
-        }
-        catch (Exception e)
-        {
-            if (okay)
-            {
-                fail(index + ": path failed to validate when success expected.");
-            }
-
-            Throwable ee = e.getCause();
-            if (ee != null)
-            {
-                return ee.getMessage();
-            }
-
-            return e.getMessage();
-        }  
-    }
-    
-    public void performTest()
-        throws Exception
-    {   
-        //
-        // personal keys
-        //
-        RSAPublicKeySpec pubKeySpec = new RSAPublicKeySpec(
-                new BigInteger("b4a7e46170574f16a97082b22be58b6a2a629798419be12872a4bdba626cfae9900f76abfb12139dce5de56564fab2b6543165a040c606887420e33d91ed7ed7", 16),
-                new BigInteger("11", 16));
-        
-        RSAPrivateCrtKeySpec privKeySpec = new RSAPrivateCrtKeySpec(
-                new BigInteger("b4a7e46170574f16a97082b22be58b6a2a629798419be12872a4bdba626cfae9900f76abfb12139dce5de56564fab2b6543165a040c606887420e33d91ed7ed7", 16),
-                new BigInteger("11", 16),
-                new BigInteger("9f66f6b05410cd503b2709e88115d55daced94d1a34d4e32bf824d0dde6028ae79c5f07b580f5dce240d7111f7ddb130a7945cd7d957d1920994da389f490c89", 16),
-                new BigInteger("c0a0758cdf14256f78d4708c86becdead1b50ad4ad6c5c703e2168fbf37884cb", 16),
-                new BigInteger("f01734d7960ea60070f1b06f2bb81bfac48ff192ae18451d5e56c734a5aab8a5", 16),
-                new BigInteger("b54bb9edff22051d9ee60f9351a48591b6500a319429c069a3e335a1d6171391", 16),
-                new BigInteger("d3d83daf2a0cecd3367ae6f8ae1aeb82e9ac2f816c6fc483533d8297dd7884cd", 16),
-                new BigInteger("b8f52fc6f38593dabb661d3f50f8897f8106eee68b1bce78a95b132b4e5b5d19", 16));
-        
-        //
-        // intermediate keys.
-        //
-        RSAPublicKeySpec intPubKeySpec = new RSAPublicKeySpec(
-                new BigInteger("8de0d113c5e736969c8d2b047a243f8fe18edad64cde9e842d3669230ca486f7cfdde1f8eec54d1905fff04acc85e61093e180cadc6cea407f193d44bb0e9449b8dbb49784cd9e36260c39e06a947299978c6ed8300724e887198cfede20f3fbde658fa2bd078be946a392bd349f2b49c486e20c405588e306706c9017308e69", 16),
-                new BigInteger("ffff", 16));
-        
-        
-        RSAPrivateCrtKeySpec intPrivKeySpec = new RSAPrivateCrtKeySpec(
-                new BigInteger("8de0d113c5e736969c8d2b047a243f8fe18edad64cde9e842d3669230ca486f7cfdde1f8eec54d1905fff04acc85e61093e180cadc6cea407f193d44bb0e9449b8dbb49784cd9e36260c39e06a947299978c6ed8300724e887198cfede20f3fbde658fa2bd078be946a392bd349f2b49c486e20c405588e306706c9017308e69", 16),
-                new BigInteger("ffff", 16),
-                new BigInteger("7deb1b194a85bcfd29cf871411468adbc987650903e3bacc8338c449ca7b32efd39ffc33bc84412fcd7df18d23ce9d7c25ea910b1ae9985373e0273b4dca7f2e0db3b7314056ac67fd277f8f89cf2fd73c34c6ca69f9ba477143d2b0e2445548aa0b4a8473095182631da46844c356f5e5c7522eb54b5a33f11d730ead9c0cff", 16),
-                new BigInteger("ef4cede573cea47f83699b814de4302edb60eefe426c52e17bd7870ec7c6b7a24fe55282ebb73775f369157726fcfb988def2b40350bdca9e5b418340288f649", 16),
-                new BigInteger("97c7737d1b9a0088c3c7b528539247fd2a1593e7e01cef18848755be82f4a45aa093276cb0cbf118cb41117540a78f3fc471ba5d69f0042274defc9161265721", 16),
-                new BigInteger("6c641094e24d172728b8da3c2777e69adfd0839085be7e38c7c4a2dd00b1ae969f2ec9d23e7e37090fcd449a40af0ed463fe1c612d6810d6b4f58b7bfa31eb5f", 16),
-                new BigInteger("70b7123e8e69dfa76feb1236d0a686144b00e9232ed52b73847e74ef3af71fb45ccb24261f40d27f98101e230cf27b977a5d5f1f15f6cf48d5cb1da2a3a3b87f", 16),
-                new BigInteger("e38f5750d97e270996a286df2e653fd26c242106436f5bab0f4c7a9e654ce02665d5a281f2c412456f2d1fa26586ef04a9adac9004ca7f913162cb28e13bf40d", 16));
-        
-        //
-        // ca keys
-        //
-        RSAPublicKeySpec caPubKeySpec = new RSAPublicKeySpec(
-                new BigInteger("b259d2d6e627a768c94be36164c2d9fc79d97aab9253140e5bf17751197731d6f7540d2509e7b9ffee0a70a6e26d56e92d2edd7f85aba85600b69089f35f6bdbf3c298e05842535d9f064e6b0391cb7d306e0a2d20c4dfb4e7b49a9640bdea26c10ad69c3f05007ce2513cee44cfe01998e62b6c3637d3fc0391079b26ee36d5", 16),
-                new BigInteger("11", 16));
-        
-        RSAPrivateCrtKeySpec   caPrivKeySpec = new RSAPrivateCrtKeySpec(
-                new BigInteger("b259d2d6e627a768c94be36164c2d9fc79d97aab9253140e5bf17751197731d6f7540d2509e7b9ffee0a70a6e26d56e92d2edd7f85aba85600b69089f35f6bdbf3c298e05842535d9f064e6b0391cb7d306e0a2d20c4dfb4e7b49a9640bdea26c10ad69c3f05007ce2513cee44cfe01998e62b6c3637d3fc0391079b26ee36d5", 16),
-                new BigInteger("11", 16),
-                new BigInteger("92e08f83cc9920746989ca5034dcb384a094fb9c5a6288fcc4304424ab8f56388f72652d8fafc65a4b9020896f2cde297080f2a540e7b7ce5af0b3446e1258d1dd7f245cf54124b4c6e17da21b90a0ebd22605e6f45c9f136d7a13eaac1c0f7487de8bd6d924972408ebb58af71e76fd7b012a8d0e165f3ae2e5077a8648e619", 16),
-                new BigInteger("f75e80839b9b9379f1cf1128f321639757dba514642c206bbbd99f9a4846208b3e93fbbe5e0527cc59b1d4b929d9555853004c7c8b30ee6a213c3d1bb7415d03", 16),
-                new BigInteger("b892d9ebdbfc37e397256dd8a5d3123534d1f03726284743ddc6be3a709edb696fc40c7d902ed804c6eee730eee3d5b20bf6bd8d87a296813c87d3b3cc9d7947", 16),
-                new BigInteger("1d1a2d3ca8e52068b3094d501c9a842fec37f54db16e9a67070a8b3f53cc03d4257ad252a1a640eadd603724d7bf3737914b544ae332eedf4f34436cac25ceb5", 16),
-                new BigInteger("6c929e4e81672fef49d9c825163fec97c4b7ba7acb26c0824638ac22605d7201c94625770984f78a56e6e25904fe7db407099cad9b14588841b94f5ab498dded", 16),
-                new BigInteger("dae7651ee69ad1d081ec5e7188ae126f6004ff39556bde90e0b870962fa7b926d070686d8244fe5a9aa709a95686a104614834b0ada4b10f53197a5cb4c97339", 16));
-        
-        //
-        // set up the keys
-        //
-        KeyFactory          fact = KeyFactory.getInstance("RSA", "BC");
-        PrivateKey          caPrivKey  = fact.generatePrivate(caPrivKeySpec);
-        PublicKey           caPubKey   = fact.generatePublic(caPubKeySpec);
-        PrivateKey          intPrivKey = fact.generatePrivate(intPrivKeySpec);
-        PublicKey           intPubKey  = fact.generatePublic(intPubKeySpec);
-        PrivateKey          privKey    = fact.generatePrivate(privKeySpec);
-        PublicKey           pubKey     = fact.generatePublic(pubKeySpec);
-        
-        X509Certificate     trustCert       = createTrustCert(caPubKey, caPrivKey);
-        CertificatePolicies intPolicies     = null;
-        Hashtable           map             = null;
-        ASN1EncodableVector policies        = null;
-        Set                 requirePolicies = null;
-        X509Certificate     intCert         = null;
-        X509Certificate     endCert         = null;
-        
-        /**
-         * valid test_00
-         */
-        intPolicies = new CertificatePolicies(new PolicyInformation(new ASN1ObjectIdentifier("2.5.29.32.0")));
-        map = new Hashtable();
-        map.put("2.16.840.1.101.3.2.1.48.1","2.16.840.1.101.3.2.1.48.2");
-        intCert = createIntmedCert(intPubKey, caPrivKey, caPubKey, intPolicies, map);
-        
-        policies   = new ASN1EncodableVector();
-        policies.add(new PolicyInformation(new ASN1ObjectIdentifier("2.16.840.1.101.3.2.1.48.2")));
-        endCert = createEndEntityCert(pubKey, intPrivKey, intPubKey, policies);
-        
-        requirePolicies = null;
-        String msg = testPolicies(0, trustCert, intCert, endCert, requirePolicies, true);
-        checkMessage(0, msg, "");
-        
-        /**
-         * test_01
-         */
-        intPolicies = new CertificatePolicies(new PolicyInformation(new ASN1ObjectIdentifier("2.5.29.32.0")));
-        map = new Hashtable();
-        map.put("2.16.840.1.101.3.2.1.48.1","2.16.840.1.101.3.2.1.48.2");
-        intCert = createIntmedCert(intPubKey, caPrivKey, caPubKey, intPolicies, map);
-        
-        policies   = new ASN1EncodableVector();
-        policies.add(new PolicyInformation(new ASN1ObjectIdentifier("2.16.840.1.101.3.2.1.48.2")));
-        endCert = createEndEntityCert(pubKey, intPrivKey, intPubKey, policies);
-        
-        requirePolicies = new HashSet();
-        requirePolicies.add("2.16.840.1.101.3.2.1.48.1");
-        msg = testPolicies(1, trustCert, intCert, endCert, requirePolicies, true);
-        checkMessage(1, msg, "");
-        
-        /**
-         * test_02
-         */
-        intPolicies = new CertificatePolicies(new PolicyInformation(new ASN1ObjectIdentifier("2.5.29.32.0")));
-        map = new Hashtable();
-        map.put("2.16.840.1.101.3.2.1.48.1","2.16.840.1.101.3.2.1.48.2");
-        intCert = createIntmedCert(intPubKey, caPrivKey, caPubKey, intPolicies, map);
-        
-        policies   = new ASN1EncodableVector();
-        policies.add(new PolicyInformation(new ASN1ObjectIdentifier("2.16.840.1.101.3.2.1.48.2")));
-        endCert = createEndEntityCert(pubKey, intPrivKey, intPubKey, policies);
-        
-        requirePolicies = new HashSet();
-        requirePolicies.add("2.5.29.32.0");
-        msg = testPolicies(2, trustCert, intCert, endCert, requirePolicies, true);
-        checkMessage(2, msg, "");
-   
-        /**
-         * test_03
-         */
-        intPolicies = new CertificatePolicies(new PolicyInformation[]
-            { new PolicyInformation(new ASN1ObjectIdentifier("2.16.840.1.101.3.2.1.48.3")),
-              new PolicyInformation(new ASN1ObjectIdentifier("2.5.29.32.0")) });
-
-        map = new Hashtable();
-        map.put("2.16.840.1.101.3.2.1.48.1","2.16.840.1.101.3.2.1.48.2");
-        intCert = createIntmedCert(intPubKey, caPrivKey, caPubKey, intPolicies, map);
-        
-        policies   = new ASN1EncodableVector();
-        policies.add(new PolicyInformation(new ASN1ObjectIdentifier("2.16.840.1.101.3.2.1.48.2")));
-        endCert = createEndEntityCert(pubKey, intPrivKey, intPubKey, policies);
-        
-        requirePolicies = new HashSet();
-        requirePolicies.add("2.16.840.1.101.3.2.1.48.1");
-        msg = testPolicies(3, trustCert, intCert, endCert, requirePolicies, true);
-        checkMessage(3, msg, "");
-        
-        /**
-         * test_04
-         */
-        intPolicies = new CertificatePolicies(new PolicyInformation[]
-            { new PolicyInformation(new ASN1ObjectIdentifier("2.16.840.1.101.3.2.1.48.3")),
-              new PolicyInformation(new ASN1ObjectIdentifier("2.5.29.32.0")) } );
-        map = new Hashtable();
-        map.put("2.16.840.1.101.3.2.1.48.1", "2.16.840.1.101.3.2.1.48.2");
-        intCert = createIntmedCert(intPubKey, caPrivKey, caPubKey, intPolicies, map);
-        
-        policies   = new ASN1EncodableVector();
-        policies.add(new PolicyInformation(new ASN1ObjectIdentifier("2.16.840.1.101.3.2.1.48.3")));
-        endCert = createEndEntityCert(pubKey, intPrivKey, intPubKey, policies);
-        
-        requirePolicies = new HashSet();
-        requirePolicies.add("2.16.840.1.101.3.2.1.48.3");
-        msg = testPolicies(4, trustCert, intCert, endCert, requirePolicies, true);
-        checkMessage(4, msg, "");
-        
-        /**
-         * test_05
-         */
-        intPolicies = new CertificatePolicies(new PolicyInformation(new ASN1ObjectIdentifier("2.5.29.32.0")));
-        map = new Hashtable();
-        map.put("2.16.840.1.101.3.2.1.48.1", "2.16.840.1.101.3.2.1.48.2");
-        intCert = createIntmedCert(intPubKey, caPrivKey, caPubKey, intPolicies, map);
-        
-        policies   = new ASN1EncodableVector();
-        policies.add(new PolicyInformation(new ASN1ObjectIdentifier("2.16.840.1.101.3.2.1.48.2")));
-        endCert = createEndEntityCert(pubKey, intPrivKey, intPubKey, policies);
-        
-        requirePolicies = new HashSet();
-        requirePolicies.add("2.16.840.1.101.3.2.1.48.2");
-        msg = testPolicies(5, trustCert, intCert, endCert, requirePolicies, false);
-        checkMessage(5, msg, "Path processing failed on policy.");
-        
-        /**
-         * test_06
-         */
-        intPolicies = new CertificatePolicies(new PolicyInformation(new ASN1ObjectIdentifier("2.5.29.32.0")));
-        map = new Hashtable();
-        map.put("2.16.840.1.101.3.2.1.48.1", "2.16.840.1.101.3.2.1.48.2");
-        intCert = createIntmedCert(intPubKey, caPrivKey, caPubKey, intPolicies, map);
-        
-        policies   = new ASN1EncodableVector();
-        policies.add(new PolicyInformation(new ASN1ObjectIdentifier("2.16.840.1.101.3.2.1.48.1")));
-        endCert = createEndEntityCert(pubKey, intPrivKey, intPubKey, policies);
-        
-        requirePolicies = new HashSet();
-        requirePolicies.add("2.16.840.1.101.3.2.1.48.1");
-        msg = testPolicies(6, trustCert, intCert, endCert, requirePolicies, true);
-        checkMessage(6, msg, "");
-        
-        /**
-         * test_07
-         */
-        intPolicies = new CertificatePolicies(new PolicyInformation(new ASN1ObjectIdentifier("2.5.29.32.0")));
-        map = new Hashtable();
-        map.put("2.16.840.1.101.3.2.1.48.1", "2.16.840.1.101.3.2.1.48.2");
-        intCert = createIntmedCert(intPubKey, caPrivKey, caPubKey, intPolicies, map);
-        
-        policies   = new ASN1EncodableVector();
-        policies.add(new PolicyInformation(new ASN1ObjectIdentifier("2.16.840.1.101.3.2.1.48.2")));
-        endCert = createEndEntityCert(pubKey, intPrivKey, intPubKey, policies);
-        
-        requirePolicies = new HashSet();
-        requirePolicies.add("2.16.840.1.101.3.2.1.48.3");
-        msg = testPolicies(7, trustCert, intCert, endCert, requirePolicies, false);
-        checkMessage(7, msg, "Path processing failed on policy.");
-        
-        /**
-         * test_08
-         */
-        intPolicies = new CertificatePolicies(new PolicyInformation(new ASN1ObjectIdentifier("2.5.29.32.0")));
-        map = new Hashtable();
-        map.put("2.16.840.1.101.3.2.1.48.1", "2.16.840.1.101.3.2.1.48.2");
-        intCert = createIntmedCert(intPubKey, caPrivKey, caPubKey, intPolicies, map);
-        
-        policies   = new ASN1EncodableVector();
-        policies.add(new PolicyInformation(new ASN1ObjectIdentifier("2.16.840.1.101.3.2.1.48.3")));
-        endCert = createEndEntityCert(pubKey, intPrivKey, intPubKey, policies);
-        
-        requirePolicies = new HashSet();
-        requirePolicies.add("2.16.840.1.101.3.2.1.48.1");
-        msg = testPolicies(8, trustCert, intCert, endCert, requirePolicies, false);
-        checkMessage(8, msg, "Path processing failed on policy.");
-    }
-    
-
-    private void checkMessage(
-        int index, 
-        String msg, 
-        String expected)
-    {
-        if (!msg.equals(expected))
-        {
-            fail("test " + index + " failed got: " + msg + " expected: " + expected);
-        } 
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        Security.addProvider(new BouncyCastleProvider());
-
-        runTest(new PKIXPolicyMappingTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/PKIXTest.java b/bcprov/src/main/java/org/bouncycastle/jce/provider/test/PKIXTest.java
deleted file mode 100644
index 99d21b0..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/PKIXTest.java
+++ /dev/null
@@ -1,248 +0,0 @@
-
-package org.bouncycastle.jce.provider.test;
- 
-import java.io.ByteArrayInputStream;
-import java.security.Security;
-import java.security.cert.CertificateFactory;
-import java.security.cert.X509CRL;
-import java.security.cert.X509Certificate;
-
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTestResult;
-import org.bouncycastle.util.test.Test;
-import org.bouncycastle.util.test.TestResult;
-
-public class PKIXTest
-    implements Test
-{
-    /*
-     * The following certs and crls are described in:
-     * http://www.ietf.org/internet-drafts/draft-ietf-pkix-new-part1-08.txt
-     *
-     *   This section contains four examples: three certificates and a CRL.
-     *   The first two certificates and the CRL comprise a minimal
-     *   certification path.
-     *
-     *   Section C.1 contains an annotated hex dump of a "self-signed"
-     *   certificate issued by a CA whose distinguished name is
-     *   cn=us,o=gov,ou=nist.  The certificate contains a DSA public key with
-     *   parameters, and is signed by the corresponding DSA private key.
-     *
-     *   Section C.2 contains an annotated hex dump of an end entity
-     *   certificate.  The end entity certificate contains a DSA public key,
-     *   and is signed by the private key corresponding to the "self-signed"
-     *   certificate in section C.1.
-     *
-     *   Section C.3 contains a dump of an end entity certificate which
-     *   contains an RSA public key and is signed with RSA and MD5.  This
-     *   certificate is not part of the minimal certification path.
-     *
-     *   Section C.4 contains an annotated hex dump of a CRL.  The CRL is
-     *   issued by the CA whose distinguished name is cn=us,o=gov,ou=nist and
-     *   the list of revoked certificates includes the end entity certificate
-     *   presented in C.2.
-     */
-
-    /**
-     * C.1  Certificate
-     * 
-        * This section contains an annotated hex dump of a 699 byte version 3
-        * certificate.  The certificate contains the following information:
-        * (a)  the serial number is 23 (17 hex);
-        * (b)  the certificate is signed with DSA and the SHA-1 hash algorithm;
-        * (c)  the issuer's distinguished name is OU=NIST; O=gov; C=US
-        * (d)  and the subject's distinguished name is OU=NIST; O=gov; C=US
-        * (e)  the certificate was issued on June 30, 1997 and will expire on
-        * December 31, 1997;
-        * (f)  the certificate contains a 1024 bit DSA public key with
-        * parameters;
-        * (g)  the certificate contains a subject key identifier extension
-        * generated using method (1) of section 4.2.1.2; and
-        * (h)  the certificate is a CA certificate (as indicated through the
-        * basic constraints extension.)
-     */
-    static byte[] rootCertBin = Hex.decode(
-        "308202bb3082027ba003020102020111300906072a8648ce380403302a310b30"
-        + "09060355040613025553310c300a060355040a1303676f76310d300b06035504"
-        + "0b13044e495354301e170d3937303633303030303030305a170d393731323331"
-        + "3030303030305a302a310b3009060355040613025553310c300a060355040a13"
-        + "03676f76310d300b060355040b13044e495354308201b83082012c06072a8648"
-        + "ce3804013082011f02818100b68b0f942b9acea525c6f2edfcfb9532ac011233"
-        + "b9e01cad909bbc48549ef394773c2c713555e6fe4f22cbd5d83e8993334dfcbd"
-        + "4f41643ea29870ec31b450deebf198280ac93e44b3fd22979683d018a3e3bd35"
-        + "5bffeea321726a7b96dab93f1e5a90af24d620f00d21a7d402b91afcac21fb9e"
-        + "949e4b42459e6ab24863fe43021500b20db0b101df0c6624fc1392ba55f77d57"
-        + "7481e5028181009abf46b1f53f443dc9a565fb91c08e47f10ac30147c2444236"
-        + "a99281de57c5e0688658007b1ff99b77a1c510a580917851513cf6fcfccc46c6"
-        + "817892843df4933d0c387e1a5b994eab1464f60c21224e28089c92b9669f40e8"
-        + "95f6d5312aef39a262c7b26d9e58c43aa81181846daff8b419b4c211aed0223b"
-        + "aa207fee1e57180381850002818100b59e1f490447d1dbf53addca0475e8dd75"
-        + "f69b8ab197d6596982d3034dfd3b365f4af2d14ec107f5d12ad378776356ea96"
-        + "614d420b7a1dfbab91a4cedeef77c8e5ef20aea62848afbe69c36aa530f2c2b9"
-        + "d9822b7dd9c4841fde0de854d71b992eb3d088f6d6639ba7e20e82d43b8a681b"
-        + "065631590b49eb99a5d581417bc955a3323030301d0603551d0e0416041486ca"
-        + "a5228162efad0a89bcad72412c2949f48656300f0603551d130101ff04053003"
-        + "0101ff300906072a8648ce380403032f00302c0214431bcf292545c04e52e77d"
-        + "d6fcb1664c83cf2d7702140b5b9a241198e8f3869004f608a9e18da5cc3ad4");
-
-
-    /**
-     * C.2  Certificate
-     * 
-        * This section contains an annotated hex dump of a 730 byte version 3
-        * certificate.  The certificate contains the following information:
-        * (a the serial number is 18 (12 hex);
-        * (b)  the certificate is signed with DSA and the SHA-1 hash algorithm;
-        * (c)  the issuer's distinguished name is OU=nist; O=gov; C=US
-        * (d)  and the subject's distinguished name is CN=Tim Polk; OU=nist;
-        * O=gov; C=US
-        * (e)  the certificate was valid from July 30, 1997 through December 1,
-        * 1997;
-        * (f)  the certificate contains a 1024 bit DSA public key;
-        * (g)  the certificate is an end entity certificate, as the basic
-        * constraints extension is not present;
-        * (h)  the certificate contains an authority key identifier extension
-        * matching the subject key identifier of the certificate in Appendix
-        * C.1; and
-        * (i)  the certificate includes one alternative name - an RFC 822
-        * address of "wpolk@nist.gov".
-     */
-    static byte[] userCert1Bin = Hex.decode(
-        "308202da30820299a003020102020112300906072a8648ce380403302a310b30"
-        + "09060355040613025553310c300a060355040a1303676f76310d300b06035504"
-        + "0b13044e495354301e170d3937303733303030303030305a170d393731323031"
-        + "3030303030305a303d310b3009060355040613025553310c300a060355040a13"
-        + "03676f76310d300b060355040b13044e4953543111300f060355040313085469"
-        + "6d20506f6c6b308201b73082012c06072a8648ce3804013082011f02818100b6"
-        + "8b0f942b9acea525c6f2edfcfb9532ac011233b9e01cad909bbc48549ef39477"
-        + "3c2c713555e6fe4f22cbd5d83e8993334dfcbd4f41643ea29870ec31b450deeb"
-        + "f198280ac93e44b3fd22979683d018a3e3bd355bffeea321726a7b96dab93f1e"
-        + "5a90af24d620f00d21a7d402b91afcac21fb9e949e4b42459e6ab24863fe4302"
-        + "1500b20db0b101df0c6624fc1392ba55f77d577481e5028181009abf46b1f53f"
-        + "443dc9a565fb91c08e47f10ac30147c2444236a99281de57c5e0688658007b1f"
-        + "f99b77a1c510a580917851513cf6fcfccc46c6817892843df4933d0c387e1a5b"
-        + "994eab1464f60c21224e28089c92b9669f40e895f6d5312aef39a262c7b26d9e"
-        + "58c43aa81181846daff8b419b4c211aed0223baa207fee1e5718038184000281"
-        + "8030b675f77c2031ae38bb7e0d2baba09c4bdf20d524133ccd98e55f6cb7c1ba"
-        + "4abaa9958053f00d72dc3337f4010bf5041f9d2e1f62d8843a9b25095a2dc846"
-        + "8e2bd4f50d3bc72dc66cb998c1253a444e8eca9561357cce15315c23131ea205"
-        + "d17a241ccbd3720990ff9b9d28c0a10aec469f0db8d0dcd018a62b5ef98fb595"
-        + "bea33e303c30190603551d1104123010810e77706f6c6b406e6973742e676f76"
-        + "301f0603551d2304183016801486caa5228162efad0a89bcad72412c2949f486"
-        + "56300906072a8648ce380403033000302d02143697cbe3b42ce1bb61a9d3cc24"
-        + "cc22929ff4f587021500abc979afd2161ca9e368a91410b4a02eff225a73");
-
-
-    /**
-     * C.3  End Entity Certificate Using RSA
-     * 
-        * This section contains an annotated hex dump of a 654 byte version 3
-        * certificate.  The certificate contains the following information:
-        * (a)  the serial number is 256;
-        * (b)  the certificate is signed with RSA and the SHA-1 hash algorithm;
-        * (c)  the issuer's distinguished name is OU=NIST; O=gov; C=US
-        * (d)  and the subject's distinguished name is CN=Tim Polk; OU=NIST;
-        * O=gov; C=US
-        * (e)  the certificate was issued on May 21, 1996 at 09:58:26 and
-        * expired on May 21, 1997 at 09:58:26;
-        * (f)  the certificate contains a 1024 bit RSA public key;
-        * (g)  the certificate is an end entity certificate (not a CA
-        * certificate);
-        * (h)  the certificate includes an alternative subject name of
-     *    "<http://www.itl.nist.gov/div893/staff/polk/index.html>" and an
-        * alternative issuer name of "<http://www.nist.gov/>" - both are URLs;
-        * (i)  the certificate include an authority key identifier extension
-        * and a certificate policies extension psecifying the policy OID
-        * 2.16.840.1.101.3.2.1.48.9; and
-        * (j)  the certificate includes a critical key usage extension
-        * specifying that the public key is intended for verification of
-        * digital signatures.
-     */
-    static byte[] userCert2Bin = Hex.decode(
-        "3082028e308201f7a00302010202020100300d06092a864886f70d0101050500"
-        + "302a310b3009060355040613025553310c300a060355040b1303676f76310d30"
-        + "0b060355040a13044e495354301e170d3936303532313039353832365a170d39"
-        + "37303532313039353832365a303d310b3009060355040613025553310c300a06"
-        + "0355040b1303676f76310d300b060355040a13044e4953543111300f06035504"
-        + "03130854696d20506f6c6b30819f300d06092a864886f70d010101050003818d"
-        + "0030818902818100e16ae4033097023cf410f3b51e4d7f147bf6f5d078e9a48a"
-        + "f0a375ecedb656967f8899859af23e687787eb9ed19fc0b417dcab8923a41d7e"
-        + "16234c4fa84df531b87caae31a4909f44b26db2767308212014ae91ab6c10c53"
-        + "8b6cfc2f7a43ec33367e32b27bd5aacf0114c612ec13f22d147a8b215814134c"
-        + "46a39af21695ff230203010001a381af3081ac303f0603551d11043830368634"
-        + "687474703a2f2f7777772e69746c2e6e6973742e676f762f6469763839332f73"
-        + "746166662f706f6c6b2f696e6465782e68746d6c301f0603551d120418301686"
-        + "14687474703a2f2f7777772e6e6973742e676f762f301f0603551d2304183016"
-        + "80140868af8533c8394a7af882938e706a4a20842c3230170603551d20041030"
-        + "0e300c060a60864801650302013009300e0603551d0f0101ff04040302078030"
-        + "0d06092a864886f70d0101050500038181008e8e3656788bbfa13975172ee310"
-        + "dc832b6834521cf66c1d525e5420105e4ca940f94b729e82b961dceb32a5bdb1"
-        + "b148f99b01bbebaf9b83f6528cb06d7cd09a39543e6d206fcdd0debe275f204f"
-        + "b6ab0df5b7e1bab4dfdf3dd4f6ed01fb6ecb9859ac41fb489c1ff65b46e029e2"
-        + "76ecc43a0afc92c5c0d2a9c9d32952876533");
-
-    /**
-     * This section contains an annotated hex dump of a version 2 CRL with
-     * one extension (cRLNumber). The CRL was issued by OU=NIST; O=gov; C=US
-     * on August 7, 1997; the next scheduled issuance was September 7, 1997.
-     * The CRL includes one revoked certificates: serial number 18 (12 hex),
-     * which was revoked on July 31, 1997 due to keyCompromise.  The CRL
-     * itself is number 18, and it was signed with DSA and SHA-1.
-     */
-    static byte[] crlBin = Hex.decode(
-        "3081cb30818c020101300906072a8648ce380403302a310b3009060355040613025553310c300a060355040a1303676f76310d300b060355040b13044e495354170d3937303830373030303030305a170d3937303930373030303030305a30223020020112170d3937303733313030303030305a300c300a0603551d1504030a0101a00e300c300a0603551d14040302010c300906072a8648ce380403032f00302c0214224e9f43ba950634f2bb5e65dba68005c03a29470214591a57c982d7022114c3d40b321b9616b11f465a");
-
-
-    public TestResult perform()
-    {
-        try
-        {
-            CertificateFactory cf = CertificateFactory.getInstance("X.509", "BC");
-
-            X509Certificate rootCert = (X509Certificate)cf.generateCertificate(new ByteArrayInputStream(rootCertBin));
-            X509Certificate userCert1 = (X509Certificate)cf.generateCertificate(new ByteArrayInputStream(userCert1Bin));
-            X509Certificate userCert2 = (X509Certificate)cf.generateCertificate(new ByteArrayInputStream(userCert2Bin));
-            X509CRL crl = (X509CRL)cf.generateCRL(new ByteArrayInputStream(crlBin));
-            rootCert.verify(rootCert.getPublicKey(), "BC");
-            userCert1.verify(rootCert.getPublicKey(), "BC");
-
-            crl.verify(rootCert.getPublicKey(), "BC");
-
-            if (!crl.isRevoked(userCert1))
-            {
-                return new SimpleTestResult(false, this.getName() + ": usercert1 not revoked.");
-            }
-
-            if (crl.isRevoked(userCert2))
-            {
-                return new SimpleTestResult(false, this.getName() + ": usercert2 revoked.");
-            }
-
-        }
-        catch (Exception e)
-        {
-            return new SimpleTestResult(false, this.getName() + ": exception - " + e.toString());
-        }
-
-        return new SimpleTestResult(true, this.getName() + ": Okay");
-    }
-
-    public String getName()
-    {
-        return "PKIX";
-    }
-
-    public static void main(
-        String[] args)
-    {
-        Security.addProvider(new BouncyCastleProvider());
-
-        Test            test = new PKIXTest();
-        TestResult        result = test.perform();
-
-        System.out.println(result.toString());
-    }
-
-}
-
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/PSSTest.java b/bcprov/src/main/java/org/bouncycastle/jce/provider/test/PSSTest.java
deleted file mode 100644
index 44d18ab..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/PSSTest.java
+++ /dev/null
@@ -1,261 +0,0 @@
-package org.bouncycastle.jce.provider.test;
-
-import java.math.BigInteger;
-import java.security.AlgorithmParameters;
-import java.security.KeyFactory;
-import java.security.MessageDigest;
-import java.security.PrivateKey;
-import java.security.PublicKey;
-import java.security.SecureRandom;
-import java.security.Security;
-import java.security.Signature;
-import java.security.spec.MGF1ParameterSpec;
-import java.security.spec.PSSParameterSpec;
-import java.security.spec.RSAPrivateCrtKeySpec;
-import java.security.spec.RSAPublicKeySpec;
-
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.nist.NISTObjectIdentifiers;
-import org.bouncycastle.asn1.x509.X509ObjectIdentifiers;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.FixedSecureRandom;
-import org.bouncycastle.util.test.SimpleTest;
-
-public class PSSTest
-    extends SimpleTest
-{
-    private class FixedRandom
-        extends SecureRandom
-    {
-        byte[]  vals;
-
-        FixedRandom(
-            byte[]  vals)
-        {
-            this.vals = vals;
-        }
-
-        public void nextBytes(
-            byte[]  bytes)
-        {
-            System.arraycopy(vals, 0, bytes, 0, vals.length);
-        }
-    }
-
-    private boolean arrayEquals(
-        byte[]  a,
-        byte[]  b)
-    {
-        if (a.length != b.length)
-        {
-            return false;
-        }
-
-        for (int i = 0; i != a.length; i++)
-        {
-            if (a[i] != b[i])
-            {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-
-    private RSAPublicKeySpec pubKeySpec = new RSAPublicKeySpec(
-        new BigInteger("a56e4a0e701017589a5187dc7ea841d156f2ec0e36ad52a44dfeb1e61f7ad991d8c51056ffedb162b4c0f283a12a88a394dff526ab7291cbb307ceabfce0b1dfd5cd9508096d5b2b8b6df5d671ef6377c0921cb23c270a70e2598e6ff89d19f105acc2d3f0cb35f29280e1386b6f64c4ef22e1e1f20d0ce8cffb2249bd9a2137",16),
-        new BigInteger("010001",16));
-
-    private RSAPrivateCrtKeySpec privKeySpec = new RSAPrivateCrtKeySpec(
-        new BigInteger("a56e4a0e701017589a5187dc7ea841d156f2ec0e36ad52a44dfeb1e61f7ad991d8c51056ffedb162b4c0f283a12a88a394dff526ab7291cbb307ceabfce0b1dfd5cd9508096d5b2b8b6df5d671ef6377c0921cb23c270a70e2598e6ff89d19f105acc2d3f0cb35f29280e1386b6f64c4ef22e1e1f20d0ce8cffb2249bd9a2137",16),
-        new BigInteger("010001",16),
-        new BigInteger("33a5042a90b27d4f5451ca9bbbd0b44771a101af884340aef9885f2a4bbe92e894a724ac3c568c8f97853ad07c0266c8c6a3ca0929f1e8f11231884429fc4d9ae55fee896a10ce707c3ed7e734e44727a39574501a532683109c2abacaba283c31b4bd2f53c3ee37e352cee34f9e503bd80c0622ad79c6dcee883547c6a3b325",16),
-        new BigInteger("e7e8942720a877517273a356053ea2a1bc0c94aa72d55c6e86296b2dfc967948c0a72cbccca7eacb35706e09a1df55a1535bd9b3cc34160b3b6dcd3eda8e6443",16),
-        new BigInteger("b69dca1cf7d4d7ec81e75b90fcca874abcde123fd2700180aa90479b6e48de8d67ed24f9f19d85ba275874f542cd20dc723e6963364a1f9425452b269a6799fd",16),
-        new BigInteger("28fa13938655be1f8a159cbaca5a72ea190c30089e19cd274a556f36c4f6e19f554b34c077790427bbdd8dd3ede2448328f385d81b30e8e43b2fffa027861979",16),
-        new BigInteger("1a8b38f398fa712049898d7fb79ee0a77668791299cdfa09efc0e507acb21ed74301ef5bfd48be455eaeb6e1678255827580a8e4e8e14151d1510a82a3f2e729",16),
-        new BigInteger("27156aba4126d24a81f3a528cbfb27f56886f840a9f6e86e17a44b94fe9319584b8e22fdde1e5a2e3bd8aa5ba8d8584194eb2190acf832b847f13a3d24a79f4d",16));
-
-    // PSSExample1.1
-
-    private byte[] msg1a = Hex.decode("cdc87da223d786df3b45e0bbbc721326d1ee2af806cc315475cc6f0d9c66e1b62371d45ce2392e1ac92844c310102f156a0d8d52c1f4c40ba3aa65095786cb769757a6563ba958fed0bcc984e8b517a3d5f515b23b8a41e74aa867693f90dfb061a6e86dfaaee64472c00e5f20945729cbebe77f06ce78e08f4098fba41f9d6193c0317e8b60d4b6084acb42d29e3808a3bc372d85e331170fcbf7cc72d0b71c296648b3a4d10f416295d0807aa625cab2744fd9ea8fd223c42537029828bd16be02546f130fd2e33b936d2676e08aed1b73318b750a0167d0");
-
-    private byte[] slt1a = Hex.decode("dee959c7e06411361420ff80185ed57f3e6776af");
-
-    private byte[] sig1a = Hex.decode("9074308fb598e9701b2294388e52f971faac2b60a5145af185df5287b5ed2887e57ce7fd44dc8634e407c8e0e4360bc226f3ec227f9d9e54638e8d31f5051215df6ebb9c2f9579aa77598a38f914b5b9c1bd83c4e2f9f382a0d0aa3542ffee65984a601bc69eb28deb27dca12c82c2d4c3f66cd500f1ff2b994d8a4e30cbb33c");
-
-    private byte[] sig1b = Hex.decode("96ea348db4db2947aee807bd687411a880913706f21b383a1002b97e43656e5450a9d1812efbedd1ed159f8307986adf48bada66a8efd14bd9e2f6f6f458e73b50c8ce6e3079011c5b4bd1600a2601a66198a1582574a43f13e0966c6c2337e6ca0886cd9e1b1037aeadef1382117d22b35e7e4403f90531c8cfccdf223f98e4");
-
-    private byte[] sig1c = Hex.decode("9e64cc1062c537b142480bc5af407b55904ead970e20e0f8f6664279c96c6da6b03522160f224a85cc413dfe6bd00621485b665abac6d90ff38c9af06f4ddd6c7c81540439e5795601a1343d9feb465712ff8a5f5150391522fb5a9b8e2225a555f4efaa5e5c0ed7a19b27074c2d9f6dbbd0c893ba02c4a35b115d337bccd7a2");
-    
-    public void performTest() throws Exception
-    {
-        KeyFactory fact = KeyFactory.getInstance("RSA", "BC");
-
-        PrivateKey  privKey = fact.generatePrivate(privKeySpec);
-        PublicKey   pubKey = fact.generatePublic(pubKeySpec);
-
-        Signature s = Signature.getInstance("SHA1withRSA/PSS", "BC");
-
-        s.initSign(privKey, new FixedRandom(slt1a));
-        s.update(msg1a);
-        byte[] sig = s.sign();
-
-        if (!arrayEquals(sig1a, sig))
-        {
-           fail("PSS Sign test expected " + new String(Hex.encode(sig1a)) + " got " + new String(Hex.encode(sig)));
-        }
-
-        s = Signature.getInstance("SHA1withRSAandMGF1", "BC");
-        
-        s.initVerify(pubKey);
-        s.update(msg1a);
-        if (!s.verify(sig1a))
-        {
-            fail("SHA1 signature verification failed");
-        }
-
-        s = Signature.getInstance("SHA1withRSAandMGF1", "BC");
-        
-        s.setParameter(PSSParameterSpec.DEFAULT);
-        
-        s.initVerify(pubKey);
-        s.update(msg1a);
-        if (!s.verify(sig1a))
-        {
-            fail("SHA1 signature verification with default parameters failed");
-        }
-        
-        AlgorithmParameters pss = s.getParameters();
-        if (!arrayEquals(pss.getEncoded(), new byte[] { 0x30, 0x00 }))
-        {
-            fail("failed default encoding test.");
-        }
-        
-        s = Signature.getInstance("SHA256withRSA/PSS", "BC");
-
-        s.initSign(privKey, new FixedRandom(slt1a));
-        s.update(msg1a);
-        sig = s.sign();
-
-        pss = s.getParameters();
-        
-        if (!arrayEquals(sig1b, sig))
-        {
-            fail("PSS Sign test expected " + new String(Hex.encode(sig1b)) + " got " + new String(Hex.encode(sig)));
-        }
-
-        s = Signature.getInstance("SHA256withRSAandMGF1", "BC");
-        
-        s.setParameter(pss.getParameterSpec(PSSParameterSpec.class));
-        
-        s.initVerify(pubKey);
-        s.update(msg1a);
-        if (!s.verify(sig1b))
-        {
-            fail("SHA256 signature verification failed");
-        }
-
-        //
-        // 512 test -with zero salt length
-        //
-        s = Signature.getInstance("SHA512withRSAandMGF1", "BC");
-        
-        s.setParameter(new PSSParameterSpec("SHA-512", "MGF1", new MGF1ParameterSpec("SHA-512"), 0, 1));
-        s.initSign(privKey);
-
-        s.update(msg1a);
-        sig = s.sign();
-
-        pss = s.getParameters();
-        
-        if (!arrayEquals(sig1c, sig))
-        {
-            fail("PSS Sign test expected " + new String(Hex.encode(sig1c)) + " got " + new String(Hex.encode(sig)));
-        }
-
-        s = Signature.getInstance("SHA512withRSAandMGF1", "BC");
-        
-        s.setParameter(pss.getParameterSpec(PSSParameterSpec.class));
-        
-        s.initVerify(pubKey);
-        s.update(msg1a);
-        if (!s.verify(sig1c))
-        {
-            fail("SHA512 signature verification failed");
-        }
-
-        SecureRandom random = new SecureRandom();
-
-        // Note: PSS minimum key size determined by hash/salt lengths
-        PrivateKey priv2048Key = fact.generatePrivate(RSATest.priv2048KeySpec);
-        PublicKey pub2048Key = fact.generatePublic(RSATest.pub2048KeySpec);
-
-        rawModeTest("SHA1withRSA/PSS", X509ObjectIdentifiers.id_SHA1, priv2048Key, pub2048Key, random);
-        rawModeTest("SHA224withRSA/PSS", NISTObjectIdentifiers.id_sha224, priv2048Key, pub2048Key, random);
-        rawModeTest("SHA256withRSA/PSS", NISTObjectIdentifiers.id_sha256, priv2048Key, pub2048Key, random);
-        rawModeTest("SHA384withRSA/PSS", NISTObjectIdentifiers.id_sha384, priv2048Key, pub2048Key, random);
-        rawModeTest("SHA512withRSA/PSS", NISTObjectIdentifiers.id_sha512, priv2048Key, pub2048Key, random);
-    }
-
-    private void rawModeTest(String sigName, ASN1ObjectIdentifier digestOID,
-            PrivateKey privKey, PublicKey pubKey, SecureRandom random) throws Exception
-    {
-        byte[] sampleMessage = new byte[1000 + random.nextInt(100)];
-        random.nextBytes(sampleMessage);
-
-        Signature normalSig = Signature.getInstance(sigName, "BC");
-
-        PSSParameterSpec spec = (PSSParameterSpec)normalSig.getParameters().getParameterSpec(PSSParameterSpec.class);
-
-        // Make sure we generate the same 'random' salt for both normal and raw signers
-        int saltLen = spec.getSaltLength();
-        byte[] fixedRandomBytes = new byte[saltLen];
-        random.nextBytes(fixedRandomBytes);
-
-        normalSig.initSign(privKey, new FixedSecureRandom(fixedRandomBytes));
-        normalSig.update(sampleMessage);
-        byte[] normalResult = normalSig.sign();
-
-        MessageDigest digest = MessageDigest.getInstance(digestOID.getId(), "BC");
-        byte[] hash = digest.digest(sampleMessage);
-
-        Signature rawSig = Signature.getInstance("RAWRSASSA-PSS", "BC");
-
-        // Need to init the params explicitly to avoid having a 'raw' variety of every PSS algorithm
-        rawSig.setParameter(spec);
-
-        rawSig.initSign(privKey, new FixedSecureRandom(fixedRandomBytes));
-        rawSig.update(hash);
-        byte[] rawResult = rawSig.sign();
-
-        if (!Arrays.areEqual(normalResult, rawResult))
-        {
-            fail("raw mode signature differs from normal one");
-        }
-
-        rawSig.initVerify(pubKey);
-        rawSig.update(hash);
-
-        if (!rawSig.verify(rawResult))
-        {
-            fail("raw mode signature verification failed");
-        }
-    }
-
-    public String getName()
-    {
-        return "PSSTest";
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        Security.addProvider(new BouncyCastleProvider());
-
-        runTest(new PSSTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/Poly1305Test.java b/bcprov/src/main/java/org/bouncycastle/jce/provider/test/Poly1305Test.java
deleted file mode 100644
index c147c17..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/Poly1305Test.java
+++ /dev/null
@@ -1,150 +0,0 @@
-package org.bouncycastle.jce.provider.test;
-
-import java.security.NoSuchAlgorithmException;
-import java.security.Security;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.crypto.Cipher;
-import javax.crypto.KeyGenerator;
-import javax.crypto.Mac;
-import javax.crypto.SecretKey;
-import javax.crypto.spec.IvParameterSpec;
-import javax.crypto.spec.SecretKeySpec;
-
-import org.bouncycastle.crypto.generators.Poly1305KeyGenerator;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-import org.bouncycastle.util.test.TestFailedException;
-
-public class Poly1305Test
-    extends SimpleTest
-{
-    private static final byte[] MASTER_KEY = Hex
-            .decode("95cc0e44d0b79a8856afcae1bec4fe3c01bcb20bfc8b6e03609ddd09f44b060f");
-
-    public String getName()
-    {
-        return "Poly1305";
-    }
-
-    public void performTest()
-        throws Exception
-    {
-        checkRegistrations();
-    }
-
-    private void checkRegistrations()
-        throws Exception
-    {
-        List missingMacs = new ArrayList();
-        List missingKeyGens = new ArrayList();
-
-        String[] ciphers = new String[]{"AES", "NOEKEON", "Twofish", "CAST6", "SEED", "Serpent", "RC6", "CAMELLIA"};
-        String[] macs = new String[]{
-                "4bb5e21dd13001ed5faccfcfdaf8a854",
-                "6d601be3d5ebbb9972a64ed3223d913d",
-                "211195296d9afc7b35a1223a79487c87",
-                "f328857a1b653684e73760c804c55b1d",
-                "21cd8adb23ca84eb4dbb12780595bf28",
-                "211195296d9afc7b35a1223a79487c87",
-                "db86de7b1fcae429753d68b1263d7ca0",
-                "11918174f33a2f278fb86554da094112"};
-
-        for (int i = 0; i < ciphers.length; i++)
-        {
-            String cipherName = ciphers[i];
-            Cipher cipher;
-            try
-            {
-                cipher = Cipher.getInstance(cipherName, "BC");
-            } catch (Exception e)
-            {
-                System.err.println(cipherName + ": " + e.getMessage());
-                continue;
-            }
-            int blocksize;
-            try
-            {
-                blocksize = cipher.getBlockSize();
-            } catch (Exception e)
-            {
-                System.err.println(cipherName + ": " + e.getMessage());
-                continue;
-            }
-            // Poly1305 is defined over 128 bit block ciphers
-            if (blocksize == 16)
-            {
-                String macName = "Poly1305-" + cipherName;
-                String macNameAlt = "Poly1305" + cipherName;
-
-                // Check we have a Poly1305 registered for each name
-                checkMac(macName, missingMacs, missingKeyGens, macs[i]);
-                checkMac(macNameAlt, missingMacs, missingKeyGens, macs[i]);
-            }
-        }
-        if (missingMacs.size() != 0)
-        {
-            fail("Did not find Poly1305 registrations for the following ciphers: " + missingMacs);
-        }
-        if (missingKeyGens.size() != 0)
-        {
-            fail("Did not find Poly1305 KeyGenerator registrations for the following macs: " + missingKeyGens);
-        }
-    }
-
-    private void checkMac(String name, List missingMacs, List missingKeyGens, String macOutput)
-    {
-        try
-        {
-            try
-            {
-                KeyGenerator kg = KeyGenerator.getInstance(name);
-                SecretKey key = kg.generateKey();
-
-                try
-                {
-                    Poly1305KeyGenerator.checkKey(key.getEncoded());
-                } catch (IllegalArgumentException e)
-                {
-                    fail("Generated key for algo " + name + " does not match required Poly1305 format.");
-                }
-
-                try
-                {
-                    Mac mac = Mac.getInstance(name);
-                    mac.init(new SecretKeySpec(MASTER_KEY, name), new IvParameterSpec(new byte[16]));
-                    mac.update(new byte[128]);
-                    byte[] bytes = mac.doFinal();
-
-                    if (!Arrays.areEqual(bytes, Hex.decode(macOutput)))
-                    {
-                        fail("wrong mac value computed for " + name, macOutput, new String(Hex.encode(bytes)));
-                    }
-                } catch (NoSuchAlgorithmException e)
-                {
-                    missingMacs.add(name);
-                }
-
-            } catch (NoSuchAlgorithmException e)
-            {
-                missingKeyGens.add(name);
-            }
-        } catch (TestFailedException e)
-        {
-            throw e;
-        } catch (Exception e)
-        {
-            fail("Unexpected error", e);
-        }
-    }
-
-    public static void main(String[] args)
-    {
-        Security.addProvider(new BouncyCastleProvider());
-
-        runTest(new Poly1305Test());
-    }
-}
\ No newline at end of file
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/RSATest.java b/bcprov/src/main/java/org/bouncycastle/jce/provider/test/RSATest.java
deleted file mode 100644
index ba138ec..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/RSATest.java
+++ /dev/null
@@ -1,834 +0,0 @@
-package org.bouncycastle.jce.provider.test;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.math.BigInteger;
-import java.security.AlgorithmParameters;
-import java.security.KeyFactory;
-import java.security.KeyPair;
-import java.security.KeyPairGenerator;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-import java.security.PrivateKey;
-import java.security.PublicKey;
-import java.security.SecureRandom;
-import java.security.Security;
-import java.security.Signature;
-import java.security.interfaces.RSAPrivateCrtKey;
-import java.security.interfaces.RSAPublicKey;
-import java.security.spec.MGF1ParameterSpec;
-import java.security.spec.PKCS8EncodedKeySpec;
-import java.security.spec.RSAKeyGenParameterSpec;
-import java.security.spec.RSAPrivateCrtKeySpec;
-import java.security.spec.RSAPrivateKeySpec;
-import java.security.spec.RSAPublicKeySpec;
-import java.security.spec.X509EncodedKeySpec;
-
-import javax.crypto.Cipher;
-import javax.crypto.NoSuchPaddingException;
-import javax.crypto.spec.OAEPParameterSpec;
-import javax.crypto.spec.PSource;
-
-import org.bouncycastle.asn1.ASN1Encoding;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.DERNull;
-import org.bouncycastle.asn1.DEROctetString;
-import org.bouncycastle.asn1.nist.NISTObjectIdentifiers;
-import org.bouncycastle.asn1.oiw.OIWObjectIdentifiers;
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
-import org.bouncycastle.asn1.pkcs.RSAESOAEPparams;
-import org.bouncycastle.asn1.teletrust.TeleTrusTObjectIdentifiers;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.asn1.x509.DigestInfo;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.bouncycastle.asn1.x509.X509ObjectIdentifiers;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-
-public class RSATest
-    extends SimpleTest
-{
-    /**
-     * a fake random number generator - we just want to make sure the random numbers
-     * aren't random so that we get the same output, while still getting to test the
-     * key generation facilities.
-     */
-    private class FixedSecureRandom
-        extends SecureRandom
-    {
-        byte[]  seed = {
-                (byte)0xaa, (byte)0xfd, (byte)0x12, (byte)0xf6, (byte)0x59,
-                (byte)0xca, (byte)0xe6, (byte)0x34, (byte)0x89, (byte)0xb4,
-                (byte)0x79, (byte)0xe5, (byte)0x07, (byte)0x6d, (byte)0xde,
-                (byte)0xc2, (byte)0xf0, (byte)0x6c, (byte)0xb5, (byte)0x8f
-        };
-
-        public void nextBytes(
-            byte[]  bytes)
-        {
-            int offset = 0;
-
-            while ((offset + seed.length) < bytes.length)
-            {
-                System.arraycopy(seed, 0, bytes, offset, seed.length);
-                offset += seed.length;
-            }
-
-            System.arraycopy(seed, 0, bytes, offset, bytes.length - offset);
-        }
-    }
-
-    private RSAPublicKeySpec pubKeySpec = new RSAPublicKeySpec(
-        new BigInteger("b4a7e46170574f16a97082b22be58b6a2a629798419be12872a4bdba626cfae9900f76abfb12139dce5de56564fab2b6543165a040c606887420e33d91ed7ed7", 16),
-        new BigInteger("11", 16));
-
-    private RSAPrivateCrtKeySpec privKeySpec = new RSAPrivateCrtKeySpec(
-        new BigInteger("b4a7e46170574f16a97082b22be58b6a2a629798419be12872a4bdba626cfae9900f76abfb12139dce5de56564fab2b6543165a040c606887420e33d91ed7ed7", 16),
-        new BigInteger("11", 16),
-        new BigInteger("9f66f6b05410cd503b2709e88115d55daced94d1a34d4e32bf824d0dde6028ae79c5f07b580f5dce240d7111f7ddb130a7945cd7d957d1920994da389f490c89", 16),
-        new BigInteger("c0a0758cdf14256f78d4708c86becdead1b50ad4ad6c5c703e2168fbf37884cb", 16),
-        new BigInteger("f01734d7960ea60070f1b06f2bb81bfac48ff192ae18451d5e56c734a5aab8a5", 16),
-        new BigInteger("b54bb9edff22051d9ee60f9351a48591b6500a319429c069a3e335a1d6171391", 16),
-        new BigInteger("d3d83daf2a0cecd3367ae6f8ae1aeb82e9ac2f816c6fc483533d8297dd7884cd", 16),
-        new BigInteger("b8f52fc6f38593dabb661d3f50f8897f8106eee68b1bce78a95b132b4e5b5d19", 16));
-
-    private RSAPublicKeySpec isoPubKeySpec = new RSAPublicKeySpec(
-        new BigInteger("0100000000000000000000000000000000bba2d15dbb303c8a21c5ebbcbae52b7125087920dd7cdf358ea119fd66fb064012ec8ce692f0a0b8e8321b041acd40b7", 16),
-        new BigInteger("03", 16));
-
-    private RSAPrivateKeySpec isoPrivKeySpec = new RSAPrivateKeySpec(
-        new BigInteger("0100000000000000000000000000000000bba2d15dbb303c8a21c5ebbcbae52b7125087920dd7cdf358ea119fd66fb064012ec8ce692f0a0b8e8321b041acd40b7", 16),
-        new BigInteger("2aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaac9f0783a49dd5f6c5af651f4c9d0dc9281c96a3f16a85f9572d7cc3f2d0f25a9dbf1149e4cdc32273faadd3fda5dcda7", 16));
-
-    static RSAPublicKeySpec pub2048KeySpec = new RSAPublicKeySpec(
-            new BigInteger("a7295693155b1813bb84877fb45343556e0568043de5910872a3a518cc11e23e2db74eaf4545068c4e3d258a2718fbacdcc3eafa457695b957e88fbf110aed049a992d9c430232d02f3529c67a3419935ea9b569f85b1bcd37de6b899cd62697e843130ff0529d09c97d813cb15f293751ff56f943fbdabb63971cc7f4f6d5bff1594416b1f5907bde5a84a44f9802ef29b43bda1960f948f8afb8766c1ab80d32eec88ed66d0b65aebe44a6d0b3c5e0ab051aaa1b912fbcc17b8e751ddecc5365b6db6dab0020c3057db4013a51213a5798a3aab67985b0f4d88627a54a0f3f0285fbcb4afdfeb65cb153af66825656d43238b75503231500753f4e421e3c57", 16),
-            new BigInteger("10001", 16));
-
-    static RSAPrivateCrtKeySpec priv2048KeySpec = new RSAPrivateCrtKeySpec(
-            new BigInteger("a7295693155b1813bb84877fb45343556e0568043de5910872a3a518cc11e23e2db74eaf4545068c4e3d258a2718fbacdcc3eafa457695b957e88fbf110aed049a992d9c430232d02f3529c67a3419935ea9b569f85b1bcd37de6b899cd62697e843130ff0529d09c97d813cb15f293751ff56f943fbdabb63971cc7f4f6d5bff1594416b1f5907bde5a84a44f9802ef29b43bda1960f948f8afb8766c1ab80d32eec88ed66d0b65aebe44a6d0b3c5e0ab051aaa1b912fbcc17b8e751ddecc5365b6db6dab0020c3057db4013a51213a5798a3aab67985b0f4d88627a54a0f3f0285fbcb4afdfeb65cb153af66825656d43238b75503231500753f4e421e3c57", 16),
-            new BigInteger("10001", 16),
-            new BigInteger("65dad56ac7df7abb434e4cb5eeadb16093aa6da7f0033aad3815289b04757d32bfee6ade7749c8e4a323b5050a2fb9e2a99e23469e1ed4ba5bab54336af20a5bfccb8b3424cc6923db2ffca5787ed87aa87aa614cd04cedaebc8f623a2d2063017910f436dff18bb06f01758610787f8b258f0a8efd8bd7de30007c47b2a1031696c7d6523bc191d4d918927a7e0b09584ed205bd2ff4fc4382678df82353f7532b3bbb81d69e3f39070aed3fb64fce032a089e8e64955afa5213a6eb241231bd98d702fba725a9b205952fda186412d9e0d9344d2998c455ad8c2bae85ee672751466d5288304032b5b7e02f7e558c7af82c7fbf58eea0bb4ef0f001e6cd0a9", 16),
-            new BigInteger("d4fd9ac3474fb83aaf832470643609659e511b322632b239b688f3cd2aad87527d6cf652fb9c9ca67940e84789444f2e99b0cb0cfabbd4de95396106c865f38e2fb7b82b231260a94df0e01756bf73ce0386868d9c41645560a81af2f53c18e4f7cdf3d51d80267372e6e0216afbf67f655c9450769cca494e4f6631b239ce1b", 16),
-            new BigInteger("c8eaa0e2a1b3a4412a702bccda93f4d150da60d736c99c7c566fdea4dd1b401cbc0d8c063daaf0b579953d36343aa18b33dbf8b9eae94452490cc905245f8f7b9e29b1a288bc66731a29e1dd1a45c9fd7f8238ff727adc49fff73991d0dc096206b9d3a08f61e7462e2b804d78cb8c5eccdb9b7fbd2ad6a8fea46c1053e1be75", 16),
-            new BigInteger("10edcb544421c0f9e123624d1099feeb35c72a8b34e008ac6fa6b90210a7543f293af4e5299c8c12eb464e70092805c7256e18e5823455ba0f504d36f5ccacac1b7cd5c58ff710f9c3f92646949d88fdd1e7ea5fed1081820bb9b0d2a8cd4b093fecfdb96dabd6e28c3a6f8c186dc86cddc89afd3e403e0fcf8a9e0bcb27af0b", 16),
-            new BigInteger("97fc25484b5a415eaa63c03e6efa8dafe9a1c8b004d9ee6e80548fefd6f2ce44ee5cb117e77e70285798f57d137566ce8ea4503b13e0f1b5ed5ca6942537c4aa96b2a395782a4cb5b58d0936e0b0fa63b1192954d39ced176d71ef32c6f42c84e2e19f9d4dd999c2151b032b97bd22aa73fd8c5bcd15a2dca4046d5acc997021", 16),
-            new BigInteger("4bb8064e1eff7e9efc3c4578fcedb59ca4aef0993a8312dfdcb1b3decf458aa6650d3d0866f143cbf0d3825e9381181170a0a1651eefcd7def786b8eb356555d9fa07c85b5f5cbdd74382f1129b5e36b4166b6cc9157923699708648212c484958351fdc9cf14f218dbe7fbf7cbd93a209a4681fe23ceb44bab67d66f45d1c9d", 16));
-
-    public void performTest()
-        throws Exception
-    {
-        KeyFactory          fact;
-        byte[]              input = new byte[]
-                                { (byte)0x54, (byte)0x85, (byte)0x9b, (byte)0x34, (byte)0x2c, (byte)0x49, (byte)0xea, (byte)0x2a };
-        byte[][]            output = new byte[][]
-                                {
-                                    Hex.decode("8b427f781a2e59dd9def386f1956b996ee07f48c96880e65a368055ed8c0a8831669ef7250b40918b2b1d488547e72c84540e42bd07b03f14e226f04fbc2d929"),
-                                    Hex.decode("2ec6e1a1711b6c7b8cd3f6a25db21ab8bb0a5f1d6df2ef375fa708a43997730ffc7c98856dbbe36edddcdd1b2d2a53867d8355af94fea3aeec128da908e08f4c"),
-                                    Hex.decode("0850ac4e5a8118323200c8ed1e5aaa3d5e635172553ccac66a8e4153d35c79305c4440f11034ab147fccce21f18a50cf1c0099c08a577eb68237a91042278965"),
-                                    Hex.decode("1c9649bdccb51056751fe43837f4eb43bada472accf26f65231666d5de7d11950d8379b3596dfdf75c6234274896fa8d18ad0865d3be2ac4d6687151abdf01e93941dcef18fa63186c9351d1506c89d09733c5ff4304208c812bdd21a50f56fde115e629e0e973721c9fcc87e89295a79853dee613962a0b2f2fc57163fd99057a3c776f13c20c26407eb8863998d7e53b543ba8d0a295a9a68d1a149833078c9809ad6a6dad7fc22a95ad615a73138c54c018f40d99bf8eeecd45f5be526f2d6b01aeb56381991c1ab31a2e756f15e052b9cd5638b2eff799795c5bae493307d5eb9f8c21d438de131fe505a4e7432547ab19224094f9e4be1968bd0793b79d"),
-                                    Hex.decode("4c4afc0c24dddaedd4f9a3b23be30d35d8e005ffd36b3defc5d18acc830c3ed388ce20f43a00e614fd087c814197bc9fc2eff9ad4cc474a7a2ef3ed9c0f0a55eb23371e41ee8f2e2ed93ea3a06ca482589ab87e0d61dcffda5eea1241408e43ea1108726cdb87cc3aa5e9eaaa9f72507ca1352ac54a53920c94dccc768147933d8c50aefd9d1da10522a40133cd33dbc0524669e70f771a88d65c4716d471cd22b08b9f01f24e4e9fc7ffbcfa0e0a7aed47b345826399b26a73be112eb9c5e06fc6742fc3d0ef53d43896403c5105109cfc12e6deeaf4a48ba308e039774b9bdb31a9b9e133c81c321630cf0b4b2d1f90717b24c3268e1fea681ea9cdc709342"),
-                                    Hex.decode("06b5b26bd13515f799e5e37ca43cace15cd82fd4bf36b25d285a6f0998d97c8cb0755a28f0ae66618b1cd03e27ac95eaaa4882bc6dc0078cd457d4f7de4154173a9c7a838cfc2ac2f74875df462aae0cfd341645dc51d9a01da9bdb01507f140fa8a016534379d838cc3b2a53ac33150af1b242fc88013cb8d914e66c8182864ee6de88ce2879d4c05dd125409620a96797c55c832fb2fb31d4310c190b8ed2c95fdfda2ed87f785002faaec3f35ec05cf70a3774ce185e4882df35719d582dd55ac31257344a9cba95189dcbea16e8c6cb7a235a0384bc83b6183ca8547e670fe33b1b91725ae0c250c9eca7b5ba78bd77145b70270bf8ac31653006c02ca9c"),
-                                    Hex.decode("135f1be3d045526235bf9d5e43499d4ee1bfdf93370769ae56e85dbc339bc5b7ea3bee49717497ee8ac3f7cd6adb6fc0f17812390dcd65ac7b87fef7970d9ff9"),
-                                    Hex.decode("03c05add1e030178c352face07cafc9447c8f369b8f95125c0d311c16b6da48ca2067104cce6cd21ae7b163cd18ffc13001aecebdc2eb02b9e92681f84033a98"),
-                                    Hex.decode("00319bb9becb49f3ed1bca26d0fcf09b0b0a508e4d0bd43b350f959b72cd25b3af47d608fdcd248eada74fbe19990dbeb9bf0da4b4e1200243a14e5cab3f7e610c")
-                                };
-        SecureRandom        rand = new FixedSecureRandom();
-
-
-        fact = KeyFactory.getInstance("RSA", "BC");
-
-        PrivateKey  privKey = fact.generatePrivate(privKeySpec);
-        PublicKey   pubKey = fact.generatePublic(pubKeySpec);
-        
-        PrivateKey  priv2048Key = fact.generatePrivate(priv2048KeySpec);
-        PublicKey   pub2048Key = fact.generatePublic(pub2048KeySpec);
-
-        //
-        // key without CRT coefficients
-        //
-        PrivateKeyInfo keyInfo = PrivateKeyInfo.getInstance(privKey.getEncoded());
-        BigInteger zero = BigInteger.valueOf(0);
-        PKCS8EncodedKeySpec noCrtSpec = new PKCS8EncodedKeySpec(new PrivateKeyInfo(keyInfo.getPrivateKeyAlgorithm(),
-                                                   new org.bouncycastle.asn1.pkcs.RSAPrivateKey(privKeySpec.getModulus(), privKeySpec.getPublicExponent(), privKeySpec.getPrivateExponent(), zero, zero, zero, zero, zero)).getEncoded());
-
-        PrivateKey noCrtKey = fact.generatePrivate(noCrtSpec);
-        if (noCrtKey instanceof RSAPrivateCrtKey)
-        {
-            fail("private key without CRT coefficients returned as CRT key");
-        }
-
-        //
-        // No Padding
-        //
-        Cipher c = Cipher.getInstance("RSA", "BC");
-
-        c.init(Cipher.ENCRYPT_MODE, pubKey, rand);
-
-        byte[]  out = c.doFinal(input);
-
-        if (!areEqual(out, output[0]))
-        {
-            fail("NoPadding test failed on encrypt expected " + new String(Hex.encode(output[0])) + " got " + new String(Hex.encode(out)));
-        }
-
-        c.init(Cipher.DECRYPT_MODE, privKey);
-
-        out = c.doFinal(out);
-
-        if (!areEqual(out, input))
-        {
-            fail("NoPadding test failed on decrypt expected " + new String(Hex.encode(input)) + " got " + new String(Hex.encode(out)));
-        }
-
-        //
-        // No Padding - incremental
-        //
-        c = Cipher.getInstance("RSA", "BC");
-
-        c.init(Cipher.ENCRYPT_MODE, pubKey, rand);
-
-        c.update(input);
-
-        out = c.doFinal();
-
-        if (!areEqual(out, output[0]))
-        {
-            fail("NoPadding test failed on encrypt expected " + new String(Hex.encode(output[0])) + " got " + new String(Hex.encode(out)));
-        }
-
-        c.init(Cipher.DECRYPT_MODE, privKey);
-
-        out = c.doFinal(out);
-
-        if (!areEqual(out, input))
-        {
-            fail("NoPadding test failed on decrypt expected " + new String(Hex.encode(input)) + " got " + new String(Hex.encode(out)));
-        }
-
-        //
-        // No Padding - incremental - explicit use of NONE in mode.
-        //
-        c = Cipher.getInstance("RSA/NONE/NoPadding", "BC");
-
-        c.init(Cipher.ENCRYPT_MODE, pubKey, rand);
-
-        c.update(input);
-
-        out = c.doFinal();
-
-        if (!areEqual(out, output[0]))
-        {
-            fail("NoPadding test failed on encrypt expected " + new String(Hex.encode(output[0])) + " got " + new String(Hex.encode(out)));
-        }
-
-        c.init(Cipher.DECRYPT_MODE, privKey);
-
-        out = c.doFinal(out);
-
-        if (!areEqual(out, input))
-        {
-            fail("NoPadding test failed on decrypt expected " + new String(Hex.encode(input)) + " got " + new String(Hex.encode(out)));
-        }
-
-        //
-        // No Padding - maximum length
-        //
-        c = Cipher.getInstance("RSA", "BC");
-
-        byte[]  modBytes = ((RSAPublicKey)pubKey).getModulus().toByteArray();
-        byte[]  maxInput = new byte[modBytes.length - 1];
-
-        maxInput[0] |= 0x7f;
-
-        c.init(Cipher.ENCRYPT_MODE, pubKey, rand);
-
-        out = c.doFinal(maxInput);
-
-        c.init(Cipher.DECRYPT_MODE, privKey);
-
-        out = c.doFinal(out);
-
-        if (!areEqual(out, maxInput))
-        {
-            fail("NoPadding test failed on decrypt expected " + new String(Hex.encode(maxInput)) + " got " + new String(Hex.encode(out)));
-        }
-
-        //
-        // PKCS1 V 1.5
-        //
-        c = Cipher.getInstance("RSA/ECB/PKCS1Padding", "BC");
-
-        c.init(Cipher.ENCRYPT_MODE, pubKey, rand);
-
-        out = c.doFinal(input);
-
-        if (!areEqual(out, output[1]))
-        {
-            fail("PKCS1 test failed on encrypt expected " + new String(Hex.encode(output[1])) + " got " + new String(Hex.encode(out)));
-        }
-
-        c.init(Cipher.DECRYPT_MODE, privKey);
-
-        out = c.doFinal(out);
-
-        if (!areEqual(out, input))
-        {
-            fail("PKCS1 test failed on decrypt expected " + new String(Hex.encode(input)) + " got " + new String(Hex.encode(out)));
-        }
-
-        //
-        // PKCS1 V 1.5 - NONE
-        //
-        c = Cipher.getInstance("RSA/NONE/PKCS1Padding", "BC");
-
-        c.init(Cipher.ENCRYPT_MODE, pubKey, rand);
-
-        out = c.doFinal(input);
-
-        if (!areEqual(out, output[1]))
-        {
-            fail("PKCS1 test failed on encrypt expected " + new String(Hex.encode(output[1])) + " got " + new String(Hex.encode(out)));
-        }
-
-        c.init(Cipher.DECRYPT_MODE, privKey);
-
-        out = c.doFinal(out);
-
-        if (!areEqual(out, input))
-        {
-            fail("PKCS1 test failed on decrypt expected " + new String(Hex.encode(input)) + " got " + new String(Hex.encode(out)));
-        }
-
-        //
-        // OAEP - SHA1
-        //
-        c = Cipher.getInstance("RSA/NONE/OAEPPadding", "BC");
-
-        c.init(Cipher.ENCRYPT_MODE, pubKey, rand);
-
-        out = c.doFinal(input);
-
-        if (!areEqual(out, output[2]))
-        {
-            fail("OAEP test failed on encrypt expected " + new String(Hex.encode(output[2])) + " got " + new String(Hex.encode(out)));
-        }
-
-        c = Cipher.getInstance("RSA/NONE/OAEPWithSHA1AndMGF1Padding", "BC");
-        
-        c.init(Cipher.DECRYPT_MODE, privKey);
-
-        out = c.doFinal(out);
-
-        if (!areEqual(out, input))
-        {
-            fail("OAEP test failed on decrypt expected " + new String(Hex.encode(input)) + " got " + new String(Hex.encode(out)));
-        }
-        
-        AlgorithmParameters oaepP = c.getParameters();
-        
-        if (!areEqual(oaepP.getEncoded(), 
-                new RSAESOAEPparams(
-                        new AlgorithmIdentifier(OIWObjectIdentifiers.idSHA1, DERNull.INSTANCE), 
-                        new AlgorithmIdentifier(PKCSObjectIdentifiers.id_mgf1, new AlgorithmIdentifier(OIWObjectIdentifiers.idSHA1, DERNull.INSTANCE)),
-                        new AlgorithmIdentifier(PKCSObjectIdentifiers.id_pSpecified, new DEROctetString(new byte[0]))).getEncoded()))
-        {
-            fail("OAEP test failed default sha-1 parameters");
-        }
-        
-        //
-        // OAEP - SHA224
-        //
-        c = Cipher.getInstance("RSA/NONE/OAEPWithSHA224AndMGF1Padding", "BC");
-
-        c.init(Cipher.ENCRYPT_MODE, pub2048Key, rand);
-
-        out = c.doFinal(input);
-
-        if (!areEqual(out, output[3]))
-        {
-            fail("OAEP SHA-224 test failed on encrypt expected " + new String(Hex.encode(output[2])) + " got " + new String(Hex.encode(out)));
-        }
-
-        c.init(Cipher.DECRYPT_MODE, priv2048Key);
-
-        out = c.doFinal(out);
-
-        if (!areEqual(out, input))
-        {
-            fail("OAEP SHA-224 test failed on decrypt expected " + new String(Hex.encode(input)) + " got " + new String(Hex.encode(out)));
-        }
-        
-        oaepP = c.getParameters();
-        
-        if (!areEqual(oaepP.getEncoded(), 
-                new RSAESOAEPparams(
-                        new AlgorithmIdentifier(NISTObjectIdentifiers.id_sha224, DERNull.INSTANCE), 
-                        new AlgorithmIdentifier(PKCSObjectIdentifiers.id_mgf1, new AlgorithmIdentifier(NISTObjectIdentifiers.id_sha224, DERNull.INSTANCE)),
-                        new AlgorithmIdentifier(PKCSObjectIdentifiers.id_pSpecified, new DEROctetString(new byte[0]))).getEncoded()))
-        {
-            fail("OAEP test failed default sha-224 parameters");
-        }
-        
-        //
-        // OAEP - SHA 256
-        //
-        c = Cipher.getInstance("RSA/NONE/OAEPWithSHA256AndMGF1Padding", "BC");
-
-        c.init(Cipher.ENCRYPT_MODE, pub2048Key, rand);
-
-        out = c.doFinal(input);
-
-        if (!areEqual(out, output[4]))
-        {
-            fail("OAEP SHA-256 test failed on encrypt expected " + new String(Hex.encode(output[2])) + " got " + new String(Hex.encode(out)));
-        }
-
-        c.init(Cipher.DECRYPT_MODE, priv2048Key);
-
-        out = c.doFinal(out);
-
-        if (!areEqual(out, input))
-        {
-            fail("OAEP SHA-256 test failed on decrypt expected " + new String(Hex.encode(input)) + " got " + new String(Hex.encode(out)));
-        }
-        
-        oaepP = c.getParameters();
-        
-        if (!areEqual(oaepP.getEncoded(), 
-                new RSAESOAEPparams(
-                        new AlgorithmIdentifier(NISTObjectIdentifiers.id_sha256, DERNull.INSTANCE), 
-                        new AlgorithmIdentifier(PKCSObjectIdentifiers.id_mgf1, new AlgorithmIdentifier(NISTObjectIdentifiers.id_sha256, DERNull.INSTANCE)),
-                        new AlgorithmIdentifier(PKCSObjectIdentifiers.id_pSpecified, new DEROctetString(new byte[0]))).getEncoded()))
-        {
-            fail("OAEP test failed default sha-256 parameters");
-        }
-        
-        //
-        // OAEP - SHA 384
-        //
-        c = Cipher.getInstance("RSA/NONE/OAEPWithSHA384AndMGF1Padding", "BC");
-
-        c.init(Cipher.ENCRYPT_MODE, pub2048Key, rand);
-
-        out = c.doFinal(input);
-
-        if (!areEqual(out, output[5]))
-        {
-            fail("OAEP SHA-384 test failed on encrypt expected " + new String(Hex.encode(output[2])) + " got " + new String(Hex.encode(out)));
-        }
-
-        c.init(Cipher.DECRYPT_MODE, priv2048Key);
-
-        out = c.doFinal(out);
-
-        if (!areEqual(out, input))
-        {
-            fail("OAEP SHA-384 test failed on decrypt expected " + new String(Hex.encode(input)) + " got " + new String(Hex.encode(out)));
-        }
-        
-        oaepP = c.getParameters();
-        
-        if (!areEqual(oaepP.getEncoded(), 
-                new RSAESOAEPparams(
-                        new AlgorithmIdentifier(NISTObjectIdentifiers.id_sha384, DERNull.INSTANCE), 
-                        new AlgorithmIdentifier(PKCSObjectIdentifiers.id_mgf1, new AlgorithmIdentifier(NISTObjectIdentifiers.id_sha384, DERNull.INSTANCE)),
-                        new AlgorithmIdentifier(PKCSObjectIdentifiers.id_pSpecified, new DEROctetString(new byte[0]))).getEncoded()))
-        {
-            fail("OAEP test failed default sha-384 parameters");
-        }
-        
-        //
-        // OAEP - MD5
-        //
-        c = Cipher.getInstance("RSA/NONE/OAEPWithMD5AndMGF1Padding", "BC");
-
-        c.init(Cipher.ENCRYPT_MODE, pubKey, rand);
-
-        out = c.doFinal(input);
-
-        if (!areEqual(out, output[6]))
-        {
-            fail("OAEP MD5 test failed on encrypt expected " + new String(Hex.encode(output[2])) + " got " + new String(Hex.encode(out)));
-        }
-
-        c.init(Cipher.DECRYPT_MODE, privKey);
-
-        out = c.doFinal(out);
-
-        if (!areEqual(out, input))
-        {
-            fail("OAEP MD5 test failed on decrypt expected " + new String(Hex.encode(input)) + " got " + new String(Hex.encode(out)));
-        }
-        
-        oaepP = c.getParameters();
-        
-        if (!areEqual(oaepP.getEncoded(), 
-                new RSAESOAEPparams(
-                        new AlgorithmIdentifier(PKCSObjectIdentifiers.md5, DERNull.INSTANCE), 
-                        new AlgorithmIdentifier(PKCSObjectIdentifiers.id_mgf1, new AlgorithmIdentifier(PKCSObjectIdentifiers.md5, DERNull.INSTANCE)),
-                        new AlgorithmIdentifier(PKCSObjectIdentifiers.id_pSpecified, new DEROctetString(new byte[0]))).getEncoded()))
-        {
-            fail("OAEP test failed default md5 parameters");
-        }
-        
-        //
-        // OAEP - SHA1 with default parameters
-        //
-        c = Cipher.getInstance("RSA/NONE/OAEPPadding", "BC");
-
-        c.init(Cipher.ENCRYPT_MODE, pubKey, OAEPParameterSpec.DEFAULT, rand);
-
-        out = c.doFinal(input);
-
-        if (!areEqual(out, output[2]))
-        {
-            fail("OAEP test failed on encrypt expected " + new String(Hex.encode(output[2])) + " got " + new String(Hex.encode(out)));
-        }
-
-        c = Cipher.getInstance("RSA/NONE/OAEPWithSHA1AndMGF1Padding", "BC");
-        
-        c.init(Cipher.DECRYPT_MODE, privKey);
-
-        out = c.doFinal(out);
-        
-        if (!areEqual(out, input))
-        {
-            fail("OAEP test failed on decrypt expected " + new String(Hex.encode(input)) + " got " + new String(Hex.encode(out)));
-        }
-        
-        oaepP = c.getParameters();
-        
-        if (!areEqual(oaepP.getEncoded(), new byte[] { 0x30, 0x00 }))
-        {
-            fail("OAEP test failed default parameters");
-        }
-
-        //
-        // OAEP - SHA1 with specified string
-        //
-        c = Cipher.getInstance("RSA/NONE/OAEPPadding", "BC");
-
-        c.init(Cipher.ENCRYPT_MODE, pubKey, new OAEPParameterSpec("SHA1", "MGF1", new MGF1ParameterSpec("SHA1"), new PSource.PSpecified(new byte[] { 1, 2, 3, 4, 5 })), rand);
-
-        out = c.doFinal(input);
-
-        oaepP = c.getParameters();
-        
-        if (!areEqual(oaepP.getEncoded(), 
-                new RSAESOAEPparams(
-                        new AlgorithmIdentifier(OIWObjectIdentifiers.idSHA1, DERNull.INSTANCE), 
-                        new AlgorithmIdentifier(PKCSObjectIdentifiers.id_mgf1, new AlgorithmIdentifier(OIWObjectIdentifiers.idSHA1, DERNull.INSTANCE)),
-                        new AlgorithmIdentifier(PKCSObjectIdentifiers.id_pSpecified, new DEROctetString(new byte[] { 1, 2, 3, 4, 5 }))).getEncoded()))
-        {
-            fail("OAEP test failed changed sha-1 parameters");
-        }
-        
-        if (!areEqual(out, output[7]))
-        {
-            fail("OAEP test failed on encrypt expected " + new String(Hex.encode(output[2])) + " got " + new String(Hex.encode(out)));
-        }
-
-        c = Cipher.getInstance("RSA/NONE/OAEPWithSHA1AndMGF1Padding", "BC");
-        
-        c.init(Cipher.DECRYPT_MODE, privKey, oaepP);
-
-        out = c.doFinal(out);
-
-        if (!areEqual(out, input))
-        {
-            fail("OAEP test failed on decrypt expected " + new String(Hex.encode(input)) + " got " + new String(Hex.encode(out)));
-        }
-        
-        //
-        // ISO9796-1
-        //
-        byte[]      isoInput =  Hex.decode("fedcba9876543210fedcba9876543210fedcba9876543210fedcba9876543210");
-        PrivateKey  isoPrivKey = fact.generatePrivate(isoPrivKeySpec);
-        PublicKey   isoPubKey = fact.generatePublic(isoPubKeySpec);
-
-        c = Cipher.getInstance("RSA/NONE/ISO9796-1Padding", "BC");
-
-        c.init(Cipher.ENCRYPT_MODE, isoPrivKey);
-
-        out = c.doFinal(isoInput);
-
-        if (!areEqual(out, output[8]))
-        {
-            fail("ISO9796-1 test failed on encrypt expected " + new String(Hex.encode(output[3])) + " got " + new String(Hex.encode(out)));
-        }
-
-        c.init(Cipher.DECRYPT_MODE, isoPubKey);
-
-        out = c.doFinal(out);
-
-        if (!areEqual(out, isoInput))
-        {
-            fail("ISO9796-1 test failed on decrypt expected " + new String(Hex.encode(input)) + " got " + new String(Hex.encode(out)));
-        }
-
-        //
-        //
-        // generation with parameters test.
-        //
-        KeyPairGenerator keyPairGen =
-                KeyPairGenerator.getInstance("RSA", "BC");
-
-        //
-        // 768 bit RSA with e = 2^16-1
-        //
-        keyPairGen.initialize(
-            new RSAKeyGenParameterSpec(768,
-            BigInteger.valueOf(65537)),
-            new SecureRandom());
-
-        KeyPair kp = keyPairGen.generateKeyPair();
-
-        pubKey = kp.getPublic();
-        privKey = kp.getPrivate();
-
-        c.init(Cipher.ENCRYPT_MODE, pubKey, rand);
-
-        out = c.doFinal(input);
-
-        c.init(Cipher.DECRYPT_MODE, privKey);
-
-        out = c.doFinal(out);
-
-        if (!areEqual(out, input))
-        {
-            fail("key generation test failed on decrypt expected " + new String(Hex.encode(input)) + " got " + new String(Hex.encode(out)));
-        }
-
-        //
-        // comparison check
-        //
-        KeyFactory keyFact = KeyFactory.getInstance("RSA", "BC");
-        
-        RSAPrivateCrtKey crtKey = (RSAPrivateCrtKey)keyFact.translateKey(privKey);
-        
-        if (!privKey.equals(crtKey))
-        {
-            fail("private key equality check failed");
-        }
-
-        crtKey = (RSAPrivateCrtKey)keyFact.generatePrivate(new PKCS8EncodedKeySpec(privKey.getEncoded()));
-
-        if (!privKey.equals(crtKey))
-        {
-            fail("private key equality check failed");
-        }
-
-        crtKey = (RSAPrivateCrtKey)serializeDeserialize(privKey);
-
-        if (!privKey.equals(crtKey))
-        {
-            fail("private key equality check failed");
-        }
-
-        if (privKey.hashCode() != crtKey.hashCode())
-        {
-            fail("private key hashCode check failed");
-        }
-
-        RSAPublicKey copyKey = (RSAPublicKey)keyFact.translateKey(pubKey);
-        
-        if (!pubKey.equals(copyKey))
-        {
-            fail("public key equality check failed");
-        }
-
-        copyKey = (RSAPublicKey)keyFact.generatePublic(new X509EncodedKeySpec(pubKey.getEncoded()));
-
-        if (!pubKey.equals(copyKey))
-        {
-            fail("public key equality check failed");
-        }
-
-        copyKey = (RSAPublicKey)serializeDeserialize(pubKey);
-
-        if (!pubKey.equals(copyKey))
-        {
-            fail("public key equality check failed");
-        }
-
-        if (pubKey.hashCode() != copyKey.hashCode())
-        {
-            fail("public key hashCode check failed");
-        }
-
-        //
-        // test an OAEP key
-        //
-        SubjectPublicKeyInfo oaepKey = new SubjectPublicKeyInfo(new AlgorithmIdentifier(PKCSObjectIdentifiers.id_RSAES_OAEP, new RSAESOAEPparams()),
-                                                  SubjectPublicKeyInfo.getInstance(pubKey.getEncoded()).parsePublicKey());
-
-        copyKey = (RSAPublicKey)serializeDeserialize(keyFact.generatePublic(new X509EncodedKeySpec(oaepKey.getEncoded())));
-
-        if (!pubKey.equals(copyKey))
-        {
-            fail("public key equality check failed");
-        }
-
-        if (pubKey.hashCode() != copyKey.hashCode())
-        {
-            fail("public key hashCode check failed");
-        }
-
-        if (!Arrays.areEqual(copyKey.getEncoded(), oaepKey.getEncoded()))
-        {
-            fail("encoding does not match");
-        }
-
-        oaepCompatibilityTest("SHA-1", priv2048Key, pub2048Key);
-        // TODO: oaepCompatibilityTest("SHA-224", priv2048Key, pub2048Key);      commented out as fails in JDK 1.7
-        oaepCompatibilityTest("SHA-256", priv2048Key, pub2048Key);
-        oaepCompatibilityTest("SHA-384", priv2048Key, pub2048Key);
-        oaepCompatibilityTest("SHA-512", priv2048Key, pub2048Key);
-
-        SecureRandom random = new SecureRandom();
-        rawModeTest("SHA1withRSA", X509ObjectIdentifiers.id_SHA1, priv2048Key, pub2048Key, random);
-        rawModeTest("MD5withRSA", PKCSObjectIdentifiers.md5, priv2048Key, pub2048Key, random);
-        rawModeTest("RIPEMD128withRSA", TeleTrusTObjectIdentifiers.ripemd128, priv2048Key, pub2048Key, random);
-
-        // init reset test
-        c.init(Cipher.ENCRYPT_MODE, pubKey, rand);
-
-        out = c.update(new byte[40]);
-
-        c.init(Cipher.ENCRYPT_MODE, pubKey, rand);
-
-        out = c.update(new byte[40]);
-    }
-
-    private void oaepCompatibilityTest(String digest, PrivateKey privKey, PublicKey pubKey)
-        throws Exception
-    {
-        if (Security.getProvider("SunJCE") == null || Security.getProvider("SunRsaSign") == null)
-        {
-            return;
-        }
-
-        KeyFactory  fact = KeyFactory.getInstance("RSA", "SunRsaSign");
-        PrivateKey  priv2048Key = fact.generatePrivate(priv2048KeySpec);
-        PublicKey   pub2048Key = fact.generatePublic(pub2048KeySpec);
-
-        byte[] data = new byte[] { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16 };
-
-        Cipher sCipher;
-        try
-        {
-            sCipher = Cipher.getInstance("RSA/ECB/OAEPWith" + digest + "AndMGF1Padding", "SunJCE");
-        }
-        catch (NoSuchAlgorithmException e)
-        {
-            return;
-        }
-        catch (NoSuchPaddingException e)
-        {
-            return;
-        }
-
-        sCipher.init(Cipher.ENCRYPT_MODE, pub2048Key);
-
-        byte[] enctext = sCipher.doFinal(data);
-
-        Cipher bcCipher = Cipher.getInstance("RSA/ECB/OAEPWith" + digest + "AndMGF1Padding", "BC");
-
-        bcCipher.init(Cipher.DECRYPT_MODE, privKey, new OAEPParameterSpec(digest, "MGF1", MGF1ParameterSpec.SHA1, PSource.PSpecified.DEFAULT));
-
-        byte[] plaintext = bcCipher.doFinal(enctext);
-
-        if (!Arrays.areEqual(plaintext, data))
-        {
-            fail("data did not decrypt first time");
-        }
-
-        bcCipher.init(Cipher.ENCRYPT_MODE, pubKey, new OAEPParameterSpec(digest, "MGF1", MGF1ParameterSpec.SHA1, PSource.PSpecified.DEFAULT));
-
-        enctext = bcCipher.doFinal(data);
-
-        sCipher.init(Cipher.DECRYPT_MODE, priv2048Key);
-
-        plaintext = sCipher.doFinal(enctext);
-
-        if (!Arrays.areEqual(plaintext, data))
-        {
-            fail("data did not decrypt second time");
-        }
-    }
-
-    private void rawModeTest(String sigName, ASN1ObjectIdentifier digestOID,
-        PrivateKey privKey, PublicKey pubKey, SecureRandom random) throws Exception
-    {
-        byte[] sampleMessage = new byte[1000 + random.nextInt(100)];
-        random.nextBytes(sampleMessage);
-
-        Signature normalSig = Signature.getInstance(sigName, "BC");
-        normalSig.initSign(privKey);
-        normalSig.update(sampleMessage);
-        byte[] normalResult = normalSig.sign();
-
-        MessageDigest digest = MessageDigest.getInstance(digestOID.getId(), "BC");
-        byte[] hash = digest.digest(sampleMessage);
-        byte[] digInfo = derEncode(digestOID, hash);
-
-        Signature rawSig = Signature.getInstance("RSA", "BC");
-        rawSig.initSign(privKey);
-        rawSig.update(digInfo);
-        byte[] rawResult = rawSig.sign();
-
-        if (!Arrays.areEqual(normalResult, rawResult))
-        {
-            fail("raw mode signature differs from normal one");
-        }
-
-        rawSig.initVerify(pubKey);
-        rawSig.update(digInfo);
-
-        if (!rawSig.verify(rawResult))
-        {
-            fail("raw mode signature verification failed");
-        }
-    }
-
-    private Object serializeDeserialize(Object o)
-        throws Exception
-    {
-        ByteArrayOutputStream bOut = new ByteArrayOutputStream();
-        ObjectOutputStream oOut = new ObjectOutputStream(bOut);
-
-        oOut.writeObject(o);
-        oOut.close();
-
-        ObjectInputStream oIn = new ObjectInputStream(new ByteArrayInputStream(bOut.toByteArray()));
-
-        return oIn.readObject();
-    }
-
-    private byte[] derEncode(ASN1ObjectIdentifier oid, byte[] hash) throws IOException
-    {
-        AlgorithmIdentifier algId = new AlgorithmIdentifier(oid, DERNull.INSTANCE);
-        DigestInfo dInfo = new DigestInfo(algId, hash);
-
-        return dInfo.getEncoded(ASN1Encoding.DER);
-    }
-
-    public String getName()
-    {
-        return "RSATest";
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        Security.addProvider(new BouncyCastleProvider());
-
-        runTest(new RSATest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/RegressionTest.java b/bcprov/src/main/java/org/bouncycastle/jce/provider/test/RegressionTest.java
deleted file mode 100644
index 2dce85e..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/RegressionTest.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package org.bouncycastle.jce.provider.test;
-
-import java.security.Security;
-
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.util.test.Test;
-import org.bouncycastle.util.test.TestResult;
-
-public class RegressionTest
-{
-    public static Test[]    tests = {
-        new FIPSDESTest(),
-        new DESedeTest(),
-        new AESTest(),
-        new AEADTest(),
-        new CamelliaTest(),
-        new SEEDTest(),
-        new AESSICTest(),
-        new GOST28147Test(),
-        new PBETest(),
-        new BlockCipherTest(),
-        new MacTest(),
-        new HMacTest(),
-        new SealedTest(),
-        new RSATest(),
-        new DHTest(),
-        new DHIESTest(),
-        new DSATest(),
-        new ImplicitlyCaTest(),
-        new ECNRTest(),
-        new ECIESTest(),
-        new ECDSA5Test(),
-        new GOST3410Test(),
-        new ElGamalTest(),
-        new IESTest(),
-        new SigTest(),
-        new CertTest(),
-        new PKCS10CertRequestTest(),
-        new EncryptedPrivateKeyInfoTest(),
-        new KeyStoreTest(),
-        new PKCS12StoreTest(),
-        new DigestTest(),
-        new PSSTest(),
-        new WrapTest(),
-        new DoFinalTest(),
-        new CipherStreamTest(),
-        new CipherStreamTest2(),
-        new NamedCurveTest(),
-        new PKIXTest(),
-        new NetscapeCertRequestTest(),
-        new X509StreamParserTest(),
-        new X509CertificatePairTest(),
-        new CertPathTest(),
-        new CertStoreTest(),
-        new CertPathValidatorTest(),
-        new CertPathBuilderTest(),
-        new ECEncodingTest(),
-        new AlgorithmParametersTest(),
-        new NISTCertPathTest(),
-        new PKIXPolicyMappingTest(),
-        new SlotTwoTest(),
-        new PKIXNameConstraintsTest(),
-        new MultiCertStoreTest(),
-        new NoekeonTest(),
-        new SerialisationTest(),
-        new SigNameTest(),
-        new MQVTest(),
-        new CMacTest(),
-        new GMacTest(),
-        new OCBTest(),
-        new DSTU4145Test(),
-        new CRL5Test(),
-        new Poly1305Test(),
-        new SipHashTest(),
-        new SHA3Test(),
-        new SkeinTest(),
-        new Shacal2Test(),
-        new DetDSATest(),
-        new ThreefishTest()
-    };
-
-    public static void main(
-        String[]    args)
-    {
-        Security.addProvider(new BouncyCastleProvider());
-
-        System.out.println("Testing " + Security.getProvider("BC").getInfo() + " version: " + Security.getProvider("BC").getVersion());
-        
-        for (int i = 0; i != tests.length; i++)
-        {
-            TestResult  result = tests[i].perform();
-            
-            if (result.getException() != null)
-            {
-                result.getException().printStackTrace();
-            }
-            
-            System.out.println(result);
-        }
-    }
-}
-
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/SEEDTest.java b/bcprov/src/main/java/org/bouncycastle/jce/provider/test/SEEDTest.java
deleted file mode 100644
index 2036464..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/SEEDTest.java
+++ /dev/null
@@ -1,175 +0,0 @@
-package org.bouncycastle.jce.provider.test;
-
-import org.bouncycastle.asn1.kisa.KISAObjectIdentifiers;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.util.encoders.Hex;
-
-import javax.crypto.Cipher;
-import javax.crypto.CipherInputStream;
-import javax.crypto.CipherOutputStream;
-import javax.crypto.spec.SecretKeySpec;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.DataInputStream;
-import java.io.IOException;
-import java.security.Key;
-import java.security.Security;
-
-/**
- * basic test class for SEED
- */
-public class SEEDTest
-    extends BaseBlockCipherTest
-{
-    static String[] cipherTests =
-    {
-        "128",
-        "28DBC3BC49FFD87DCFA509B11D422BE7",
-        "B41E6BE2EBA84A148E2EED84593C5EC7",
-        "9B9B7BFCD1813CB95D0B3618F40F5122"
-    };
-
-    public SEEDTest()
-    {
-        super("SEED");
-    }
-
-    public void test(
-        int         strength,
-        byte[]      keyBytes,
-        byte[]      input,
-        byte[]      output)
-        throws Exception
-    {
-        Key key;
-        Cipher in, out;
-        CipherInputStream cIn;
-        CipherOutputStream cOut;
-        ByteArrayInputStream bIn;
-        ByteArrayOutputStream bOut;
-
-        key = new SecretKeySpec(keyBytes, "SEED");
-
-        in = Cipher.getInstance("SEED/ECB/NoPadding", "BC");
-        out = Cipher.getInstance("SEED/ECB/NoPadding", "BC");
-
-        try
-        {
-            out.init(Cipher.ENCRYPT_MODE, key);
-        }
-        catch (Exception e)
-        {
-            fail("SEED failed initialisation - " + e.toString(), e);
-        }
-
-        try
-        {
-            in.init(Cipher.DECRYPT_MODE, key);
-        }
-        catch (Exception e)
-        {
-            fail("SEED failed initialisation - " + e.toString(), e);
-        }
-
-        //
-        // encryption pass
-        //
-        bOut = new ByteArrayOutputStream();
-
-        cOut = new CipherOutputStream(bOut, out);
-
-        try
-        {
-            for (int i = 0; i != input.length / 2; i++)
-            {
-                cOut.write(input[i]);
-            }
-            cOut.write(input, input.length / 2, input.length - input.length / 2);
-            cOut.close();
-        }
-        catch (IOException e)
-        {
-            fail("SEED failed encryption - " + e.toString(), e);
-        }
-
-        byte[]    bytes;
-
-        bytes = bOut.toByteArray();
-
-        if (!areEqual(bytes, output))
-        {
-            fail("SEED failed encryption - expected " + new String(Hex.encode(output)) + " got " + new String(Hex.encode(bytes)));
-        }
-
-        //
-        // decryption pass
-        //
-        bIn = new ByteArrayInputStream(bytes);
-
-        cIn = new CipherInputStream(bIn, in);
-
-        try
-        {
-            DataInputStream dIn = new DataInputStream(cIn);
-
-            bytes = new byte[input.length];
-
-            for (int i = 0; i != input.length / 2; i++)
-            {
-                bytes[i] = (byte)dIn.read();
-            }
-            dIn.readFully(bytes, input.length / 2, bytes.length - input.length / 2);
-        }
-        catch (Exception e)
-        {
-            fail("SEED failed encryption - " + e.toString(), e);
-        }
-
-        if (!areEqual(bytes, input))
-        {
-            fail("SEED failed decryption - expected " + new String(Hex.encode(input)) + " got " + new String(Hex.encode(bytes)));
-        }
-    }
-
-    public void performTest()
-        throws Exception
-    {
-        for (int i = 0; i != cipherTests.length; i += 4)
-        {
-            test(Integer.parseInt(cipherTests[i]),
-                            Hex.decode(cipherTests[i + 1]),
-                            Hex.decode(cipherTests[i + 2]),
-                            Hex.decode(cipherTests[i + 3]));
-        }
-
-        byte[]  kek1 = Hex.decode("000102030405060708090a0b0c0d0e0f");
-        byte[]  in1 = Hex.decode("00112233445566778899aabbccddeeff");
-        byte[]  out1 = Hex.decode("bf71f77138b5afea05232a8dad54024e812dc8dd7d132559");
-
-        wrapTest(1, "SEEDWrap", kek1, in1, out1);
-
-        String[] oids = {
-                KISAObjectIdentifiers.id_seedCBC.getId()
-        };
-
-        String[] names = {
-                "SEED/CBC/PKCS7Padding"
-        };
-
-        oidTest(oids, names, 1);
-
-        String[] wrapOids = {
-                KISAObjectIdentifiers.id_npki_app_cmsSeed_wrap.getId()
-        };
-
-        wrapOidTest(wrapOids, "SEEDWrap");
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        Security.addProvider(new BouncyCastleProvider());
-
-        runTest(new SEEDTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/SHA3Test.java b/bcprov/src/main/java/org/bouncycastle/jce/provider/test/SHA3Test.java
deleted file mode 100644
index 89b85ae..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/SHA3Test.java
+++ /dev/null
@@ -1,136 +0,0 @@
-package org.bouncycastle.jce.provider.test;
-
-import java.security.MessageDigest;
-import java.security.Security;
-
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-
-public class SHA3Test
-    extends SimpleTest
-{
-    final static String provider = "BC";
-
-    static private byte[] nullMsg = new byte[0];
-
-    static private String[][] nullVectors =
-    {
-        { "SHA3-224", "f71837502ba8e10837bdd8d365adb85591895602fc552b48b7390abd" },
-        { "SHA3-256", "c5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470" },
-        { "SHA3-384", "2c23146a63a29acf99e73b88f8c24eaa7dc60aa771780ccc006afbfa8fe2479b2dd2b21362337441ac12b515911957ff" },
-        { "SHA3-512", "0eab42de4c3ceb9235fc91acffe746b29c29a8c366b7c60e4e67c466f36a4304c00fa9caf9d87976ba469bcbe06713b435f091ef2769fb160cdab33d3670680e" },
-    };
-
-    static private byte[] shortMsg = Hex.decode("54686520717569636b2062726f776e20666f78206a756d7073206f76657220746865206c617a7920646f67");
-
-    static private String[][] shortVectors =
-    {
-        { "SHA3-224", "310aee6b30c47350576ac2873fa89fd190cdc488442f3ef654cf23fe" },
-        { "SHA3-256", "4d741b6f1eb29cb2a9b9911c82f56fa8d73b04959d3d9d222895df6c0b28aa15" },
-        { "SHA3-384", "283990fa9d5fb731d786c5bbee94ea4db4910f18c62c03d173fc0a5e494422e8a0b3da7574dae7fa0baf005e504063b3" },
-        { "SHA3-512", "d135bb84d0439dbac432247ee573a23ea7d3c9deb2a968eb31d47c4fb45f1ef4422d6c531b5b9bd6f449ebcc449ea94d0a8f05f62130fda612da53c79659f609" },
-    };
-
-    public String getName()
-    {
-        return "SHA3";
-    }
-
-    void test(String algorithm, byte[] message, String expected)
-        throws Exception
-    {
-        MessageDigest digest = MessageDigest.getInstance(algorithm, provider);
-
-        byte[] result = digest.digest(message);
-        byte[] result2 = digest.digest(message);
-
-        // test zero results valid
-        if (!MessageDigest.isEqual(result, Hex.decode(expected)))
-        {
-            fail("null result not equal for " + algorithm);
-        }
-        
-        // test one digest the same message with the same instance
-        if (!MessageDigest.isEqual(result, result2))
-        {
-            fail("Result object 1 not equal");
-        }
-
-        if (!MessageDigest.isEqual(result, Hex.decode(expected)))
-        {
-            fail("Result object 1 not equal");
-        }
-
-        // test two, single byte updates
-        for (int i = 0; i < message.length; i++)
-        {
-            digest.update(message[i]);
-        }
-        result2 = digest.digest();
-
-        if (!MessageDigest.isEqual(result, result2))
-        {
-            fail("Result object 2 not equal");
-        }
-
-        // test three, two half updates
-        digest.update(message, 0, message.length/2);
-        digest.update(message, message.length/2, message.length-message.length/2);
-        result2 = digest.digest();
-
-        if (!MessageDigest.isEqual(result, result2))
-        {
-            fail("Result object 3 not equal");
-        }
-
-        // test four, clone test
-        digest.update(message, 0, message.length/2);
-        MessageDigest d = (MessageDigest)digest.clone();
-        digest.update(message, message.length/2, message.length-message.length/2);
-        result2 = digest.digest();
-
-        if (!MessageDigest.isEqual(result, result2))
-        {
-            fail("Result object 4(a) not equal");
-        }
-
-        d.update(message, message.length/2, message.length-message.length/2);
-        result2 = d.digest();
-
-        if (!MessageDigest.isEqual(result, result2))
-        {
-            fail("Result object 4(b) not equal");
-        }
-
-        // test five, check reset() method
-        digest.update(message, 0, message.length/2);
-        digest.reset();
-        digest.update(message, 0, message.length/2);
-        digest.update(message, message.length/2, message.length-message.length/2);
-        result2 = digest.digest();
-
-        if (!MessageDigest.isEqual(result, result2))
-        {
-            fail("Result object 5 not equal");
-        }
-        
-    }
-
-    public void performTest()
-        throws Exception
-    {
-        for (int i = 0; i != nullVectors.length; i++)
-        {
-            test(nullVectors[i][0], nullMsg, nullVectors[i][1]);
-            test(shortVectors[i][0], shortMsg, shortVectors[i][1]);
-        }
-    }
-
-    public static void main(String[] args)
-    {
-        Security.addProvider(new BouncyCastleProvider());
-
-        runTest(new SHA3Test());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/SealedTest.java b/bcprov/src/main/java/org/bouncycastle/jce/provider/test/SealedTest.java
deleted file mode 100644
index 9a7e314..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/SealedTest.java
+++ /dev/null
@@ -1,79 +0,0 @@
-
-package org.bouncycastle.jce.provider.test;
-
-import java.security.Key;
-import java.security.Security;
-
-import javax.crypto.Cipher;
-import javax.crypto.KeyGenerator;
-import javax.crypto.SealedObject;
-
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.util.test.SimpleTestResult;
-import org.bouncycastle.util.test.Test;
-import org.bouncycastle.util.test.TestResult;
-
-public class SealedTest
-    implements Test
-{
-    final static String provider = "BC";
-
-    public String getName()
-    {
-        return "SealedObject";
-    }
-
-    public TestResult perform()
-    {
-        try
-        {
-            KeyGenerator keyGen = KeyGenerator.getInstance("DES", provider);
-            Key key = keyGen.generateKey();
-            Cipher c = Cipher.getInstance("DES/ECB/PKCS5Padding", provider);
-
-            c.init(Cipher.ENCRYPT_MODE, key);
-            String object = "Hello world";
-            SealedObject so = new SealedObject(object, c);
-            c.init(Cipher.DECRYPT_MODE, key);
-
-            Object o = so.getObject(c);
-            if (!o.equals(object))
-            {
-                return new SimpleTestResult(false, "Result object 1 not equal"
-                        + "orig: " + object + " res: " + o);
-            }
-
-            o = so.getObject(key);
-            if (!o.equals(object))
-            {
-                return new SimpleTestResult(false, "Result object 2 not equal"
-                        + "orig: " + object + " res: " + o);
-            }
-
-            o = so.getObject(key, provider);
-            if (!o.equals(object))
-            {
-                return new SimpleTestResult(false, "Result object 3 not equal"
-                        + "orig: " + object + " res: " + o);
-            }
-
-            return new SimpleTestResult(true, getName() + ": Okay");
-        }
-        catch (Exception e)
-        {
-            return new SimpleTestResult(false, getName()
-                    + ": failed excpetion - " + e.toString(), e);
-        }
-    }
-
-    public static void main(String[] args)
-    {
-        Security.addProvider(new BouncyCastleProvider());
-
-        Test            test = new SealedTest();
-        TestResult      result = test.perform();
-
-        System.out.println(result.toString());
-    }
-}
-
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/SerialisationTest.java b/bcprov/src/main/java/org/bouncycastle/jce/provider/test/SerialisationTest.java
deleted file mode 100644
index 6d04f97..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/SerialisationTest.java
+++ /dev/null
@@ -1,342 +0,0 @@
-package org.bouncycastle.jce.provider.test;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.math.BigInteger;
-import java.security.interfaces.DSAPrivateKey;
-import java.security.interfaces.DSAPublicKey;
-import java.security.interfaces.RSAPrivateCrtKey;
-import java.security.interfaces.RSAPublicKey;
-
-import javax.crypto.interfaces.DHPrivateKey;
-import javax.crypto.interfaces.DHPublicKey;
-
-import org.bouncycastle.jce.interfaces.ElGamalPrivateKey;
-import org.bouncycastle.jce.interfaces.ElGamalPublicKey;
-import org.bouncycastle.util.encoders.Base64;
-import org.bouncycastle.util.test.SimpleTest;
-
-public class SerialisationTest
-    extends SimpleTest
-{
-    private static BigInteger mod = new BigInteger("69919157209851583596607278525201743749468350078269839551939850344506918649679");
-    private static BigInteger pubExp = new BigInteger("65537");
-    private static BigInteger privExp = new BigInteger("6387323103214694462561419908301918608189256611651974386490887304224030221257");
-    private static BigInteger crtExp = new BigInteger("49050879172577973803420172068797326635");
-    private static BigInteger p = new BigInteger("272712035519670228866910009292918035133");
-    private static BigInteger q = new BigInteger("256384567247338962716621434774670631163");
-    private static BigInteger expP = new BigInteger("121540093892892992427860713054115232161");
-    private static BigInteger expQ = new BigInteger("169333445127196347119779037859859594883");
-
-    private static byte[] rsaPub = Base64.decode(
-                "rO0ABXNyAC1vcmcuYm91bmN5Y2FzdGxlLmpjZS5wcm92aWRlci5KQ0VSU0FQdWJsaWNLZXklImoOW/pshAIAAkwAB21vZHV"
-              + "sdXN0ABZMamF2YS9tYXRoL0JpZ0ludGVnZXI7TAAOcHVibGljRXhwb25lbnRxAH4AAXhwc3IAFGphdmEubWF0aC5CaWdJbn"
-              + "RlZ2VyjPyfH6k7+x0DAAZJAAhiaXRDb3VudEkACWJpdExlbmd0aEkAE2ZpcnN0Tm9uemVyb0J5dGVOdW1JAAxsb3dlc3RTZ"
-              + "XRCaXRJAAZzaWdudW1bAAltYWduaXR1ZGV0AAJbQnhyABBqYXZhLmxhbmcuTnVtYmVyhqyVHQuU4IsCAAB4cP//////////"
-              + "/////v////4AAAABdXIAAltCrPMX+AYIVOACAAB4cAAAACCalNcvvJNMM944KWzzuH2MXkKbiW10OEzGQb9B9MM/T3hzcQB"
-              + "+AAP///////////////7////+AAAAAXVxAH4ABwAAAAMBAAF4");
-
-    private static byte[] rsaPriv = Base64.decode(
-                "rO0ABXNyADFvcmcuYm91bmN5Y2FzdGxlLmpjZS5wcm92aWRlci5KQ0VSU0FQcml2YXRlQ3J0S2V5bLqHzgJzVS4CAAZMAA5"
-              + "jcnRDb2VmZmljaWVudHQAFkxqYXZhL21hdGgvQmlnSW50ZWdlcjtMAA5wcmltZUV4cG9uZW50UHEAfgABTAAOcHJpbWVFeH"
-              + "BvbmVudFFxAH4AAUwABnByaW1lUHEAfgABTAAGcHJpbWVRcQB+AAFMAA5wdWJsaWNFeHBvbmVudHEAfgABeHIALm9yZy5ib"
-              + "3VuY3ljYXN0bGUuamNlLnByb3ZpZGVyLkpDRVJTQVByaXZhdGVLZXlG6wnAB89BHAMABEwAB21vZHVsdXNxAH4AAUwAEHBr"
-              + "Y3MxMkF0dHJpYnV0ZXN0ABVMamF2YS91dGlsL0hhc2h0YWJsZTtMAA5wa2NzMTJPcmRlcmluZ3QAEkxqYXZhL3V0aWwvVmV"
-              + "jdG9yO0wAD3ByaXZhdGVFeHBvbmVudHEAfgABeHBzcgAUamF2YS5tYXRoLkJpZ0ludGVnZXKM/J8fqTv7HQMABkkACGJpdE"
-              + "NvdW50SQAJYml0TGVuZ3RoSQATZmlyc3ROb256ZXJvQnl0ZU51bUkADGxvd2VzdFNldEJpdEkABnNpZ251bVsACW1hZ25pd"
-              + "HVkZXQAAltCeHIAEGphdmEubGFuZy5OdW1iZXKGrJUdC5TgiwIAAHhw///////////////+/////gAAAAF1cgACW0Ks8xf4"
-              + "BghU4AIAAHhwAAAAIJqU1y+8k0wz3jgpbPO4fYxeQpuJbXQ4TMZBv0H0wz9PeHNyABNqYXZhLnV0aWwuSGFzaHRhYmxlE7s"
-              + "PJSFK5LgDAAJGAApsb2FkRmFjdG9ySQAJdGhyZXNob2xkeHA/QAAAAAAACHcIAAAACwAAAAB4c3IAEGphdmEudXRpbC5WZW"
-              + "N0b3LZl31bgDuvAQMAA0kAEWNhcGFjaXR5SW5jcmVtZW50SQAMZWxlbWVudENvdW50WwALZWxlbWVudERhdGF0ABNbTGphd"
-              + "mEvbGFuZy9PYmplY3Q7eHAAAAAAAAAAAHVyABNbTGphdmEubGFuZy5PYmplY3Q7kM5YnxBzKWwCAAB4cAAAAApwcHBwcHBw"
-              + "cHBweHNxAH4ABv///////////////v////4AAAABdXEAfgAKAAAAIA4fGMVoocAtYNiamDRvnzBmMv/l8FibkQsOUJjxrmP"
-              + "JeHhzcQB+AAb///////////////7////+AAAAAXVxAH4ACgAAABAk5tsPIq2YfF0nfLPvAKUreHNxAH4ABv////////////"
-              + "///v////4AAAABdXEAfgAKAAAAEFtvxUfS67k0bWmAU9/geaF4c3EAfgAG///////////////+/////gAAAAF1cQB+AAoAA"
-              + "AAQf2RvbOpsxhCjGK1vhd7+g3hzcQB+AAb///////////////7////+AAAAAXVxAH4ACgAAABDNKm1zRn/cYal03dRjdxK9"
-              + "eHNxAH4ABv///////////////v////4AAAABdXEAfgAKAAAAEMDh3xza3MJ4XNak/35BYPt4c3EAfgAG///////////////"
-              + "+/////gAAAAF1cQB+AAoAAAADAQABeA==");
-
-    private static byte[] rsaPub2 = Base64.decode(
-                 "rO0ABXNyAD5vcmcuYm91bmN5Y2FzdGxlLmpjYWpjZS5wcm92aWRlci5hc3ltbWV0cmljLnJzYS5CQ1JTQVB1YmxpY0tleS"
-              +  "Uiag5b+myEAgACTAAHbW9kdWx1c3QAFkxqYXZhL21hdGgvQmlnSW50ZWdlcjtMAA5wdWJsaWNFeHBvbmVudHEAfgABeHBz"
-              +  "cgAUamF2YS5tYXRoLkJpZ0ludGVnZXKM/J8fqTv7HQMABkkACGJpdENvdW50SQAJYml0TGVuZ3RoSQATZmlyc3ROb256ZXJvQnl0ZU51bUkADGxvd2VzdFNldEJpdEkABnNpZ251bVsACW1hZ25pdHVkZXQAAltCeHIAEGphdmEubGFuZy5OdW1iZXKGrJUdC5TgiwIAAHhw///////////////+/////gAAAAF1cgACW0Ks8xf4BghU4AIAAHhwAAAAIJqU1y+8k0wz3jgpbPO4fYxeQpuJbXQ4TMZBv0H0wz9PeHNxAH4AA////////////////v////4AAAABdXEAfgAHAAAAAwEAAXg=");
-
-    private static BigInteger elGamalY = new BigInteger("89822212135401014750127909969755994242838935150891306006689219384134393835581");
-    private static BigInteger elGamalX = new BigInteger("23522982289275336984843296896007818700866293719703239515258104457243931686357");
-    private static BigInteger elGamalG = new BigInteger("29672625807664138507782226105202719390719480236799714903174779490259822385963");
-    private static BigInteger elGamalP = new BigInteger("98263422916834911205348180460395783697757584103849580149025105739079617780363");
-    
-    private static byte[] elGamalPub = Base64.decode(
-                "rO0ABXNyADFvcmcuYm91bmN5Y2FzdGxlLmpjZS5wcm92aWRlci5KQ0VFbEdhbWFsUHVibGljS2V5eOnUVVUsZjQDAAJMAAZ"
-              + "lbFNwZWN0ADBMb3JnL2JvdW5jeWNhc3RsZS9qY2Uvc3BlYy9FbEdhbWFsUGFyYW1ldGVyU3BlYztMAAF5dAAWTGphdmEvbW"
-              + "F0aC9CaWdJbnRlZ2VyO3hwc3IAFGphdmEubWF0aC5CaWdJbnRlZ2VyjPyfH6k7+x0DAAZJAAhiaXRDb3VudEkACWJpdExlb"
-              + "md0aEkAE2ZpcnN0Tm9uemVyb0J5dGVOdW1JAAxsb3dlc3RTZXRCaXRJAAZzaWdudW1bAAltYWduaXR1ZGV0AAJbQnhyABBq"
-              + "YXZhLmxhbmcuTnVtYmVyhqyVHQuU4IsCAAB4cP///////////////v////4AAAABdXIAAltCrPMX+AYIVOACAAB4cAAAACD"
-              + "GlZIJNbVQCnj4wiR0o8gGbKtJEWJBllz8NAELXcqwPXhzcQB+AAT///////////////7////+AAAAAXVxAH4ACAAAACDZPy"
-              + "BetQ1Ed8NUnTfXb+MBhFVK1KRe2LzQP7oVz2Kai3hzcQB+AAT///////////////7////+AAAAAXVxAH4ACAAAACBBmhxth"
-              + "0FhU4SsG01Wjyi1dlZFZvOy1zFC12XRGO8bK3h4");
-
-    private static byte[] elGamalPriv = Base64.decode(
-                "rO0ABXNyADJvcmcuYm91bmN5Y2FzdGxlLmpjZS5wcm92aWRlci5KQ0VFbEdhbWFsUHJpdmF0ZUtleULhxV+2vMBOAwAETAA"
-              + "GZWxTcGVjdAAwTG9yZy9ib3VuY3ljYXN0bGUvamNlL3NwZWMvRWxHYW1hbFBhcmFtZXRlclNwZWM7TAAQcGtjczEyQXR0cm"
-              + "lidXRlc3QAFUxqYXZhL3V0aWwvSGFzaHRhYmxlO0wADnBrY3MxMk9yZGVyaW5ndAASTGphdmEvdXRpbC9WZWN0b3I7TAABe"
-              + "HQAFkxqYXZhL21hdGgvQmlnSW50ZWdlcjt4cHNyABRqYXZhLm1hdGguQmlnSW50ZWdlcoz8nx+pO/sdAwAGSQAIYml0Q291"
-              + "bnRJAAliaXRMZW5ndGhJABNmaXJzdE5vbnplcm9CeXRlTnVtSQAMbG93ZXN0U2V0Qml0SQAGc2lnbnVtWwAJbWFnbml0dWR"
-              + "ldAACW0J4cgAQamF2YS5sYW5nLk51bWJlcoaslR0LlOCLAgAAeHD///////////////7////+AAAAAXVyAAJbQqzzF/gGCF"
-              + "TgAgAAeHAAAAAgNAGJQeYfM6ToYoA3ePFdEe7yh8hKecr+WZA0AwxrtdV4c3EAfgAG///////////////+/////gAAAAF1c"
-              + "QB+AAoAAAAg2T8gXrUNRHfDVJ0312/jAYRVStSkXti80D+6Fc9imot4c3EAfgAG///////////////+/////gAAAAF1cQB+"
-              + "AAoAAAAgQZocbYdBYVOErBtNVo8otXZWRWbzstcxQtdl0RjvGyt4eA==");
-
-    private static BigInteger dhY = new BigInteger("1925747248304483170395506065378568192931506039297732684689153183373019672434");
-    private static BigInteger dhX = new BigInteger("3");
-    private static BigInteger dhG = new BigInteger("3493483775405590747011712302510626058005717040655777294576367636428413099058");
-    private static BigInteger dhP = new BigInteger("106557663805518855012633095511067237673895862256610675920943888960856082029127");
-
-    private static byte[] dhPub = Base64.decode(
-                "rO0ABXNyACxvcmcuYm91bmN5Y2FzdGxlLmpjZS5wcm92aWRlci5KQ0VESFB1YmxpY0tlefz+KCkPI+T8AwACTAAGZGhTcGV"
-              + "jdAAjTGphdmF4L2NyeXB0by9zcGVjL0RIUGFyYW1ldGVyU3BlYztMAAF5dAAWTGphdmEvbWF0aC9CaWdJbnRlZ2VyO3hwc3"
-              + "IAFGphdmEubWF0aC5CaWdJbnRlZ2VyjPyfH6k7+x0DAAZJAAhiaXRDb3VudEkACWJpdExlbmd0aEkAE2ZpcnN0Tm9uemVyb"
-              + "0J5dGVOdW1JAAxsb3dlc3RTZXRCaXRJAAZzaWdudW1bAAltYWduaXR1ZGV0AAJbQnhyABBqYXZhLmxhbmcuTnVtYmVyhqyV"
-              + "HQuU4IsCAAB4cP///////////////v////4AAAABdXIAAltCrPMX+AYIVOACAAB4cAAAACAEQe8vYXxZPS5oAUy0e0yRYxK"
-              + "EAO3GjhMWZKNw8flvcnhzcQB+AAT///////////////7////+AAAAAXVxAH4ACAAAACDrlYAb5zOABHPgsK6oIKtMFgPD3v"
-              + "nbTosOnokaSVsaR3hzcQB+AAT///////////////7////+AAAAAXVxAH4ACAAAACAHuT3jEhOVRGfaKdFOX6J2vDYxiMPQW"
-              + "ljjL/3Xz85cMnh3BAAAAAB4");
-
-    private static byte[] dhPriv = Base64.decode(
-                "rO0ABXNyAC1vcmcuYm91bmN5Y2FzdGxlLmpjZS5wcm92aWRlci5KQ0VESFByaXZhdGVLZXkEURpYQRlitAMABEwABmRoU3B"
-              + "lY3QAI0xqYXZheC9jcnlwdG8vc3BlYy9ESFBhcmFtZXRlclNwZWM7TAAQcGtjczEyQXR0cmlidXRlc3QAFUxqYXZhL3V0aW"
-              + "wvSGFzaHRhYmxlO0wADnBrY3MxMk9yZGVyaW5ndAASTGphdmEvdXRpbC9WZWN0b3I7TAABeHQAFkxqYXZhL21hdGgvQmlnS"
-              + "W50ZWdlcjt4cHNyABRqYXZhLm1hdGguQmlnSW50ZWdlcoz8nx+pO/sdAwAGSQAIYml0Q291bnRJAAliaXRMZW5ndGhJABNm"
-              + "aXJzdE5vbnplcm9CeXRlTnVtSQAMbG93ZXN0U2V0Qml0SQAGc2lnbnVtWwAJbWFnbml0dWRldAACW0J4cgAQamF2YS5sYW5"
-              + "nLk51bWJlcoaslR0LlOCLAgAAeHD///////////////7////+AAAAAXVyAAJbQqzzF/gGCFTgAgAAeHAAAAABA3hzcQB+AA"
-              + "b///////////////7////+AAAAAXVxAH4ACgAAACDrlYAb5zOABHPgsK6oIKtMFgPD3vnbTosOnokaSVsaR3hzcQB+AAb//"
-              + "/////////////7////+AAAAAXVxAH4ACgAAACAHuT3jEhOVRGfaKdFOX6J2vDYxiMPQWljjL/3Xz85cMnh3BAAAAAB4");
-
-    private static BigInteger dsaY = new BigInteger("6189794363048388077684611193598066807847399153242870209962581468350882042922904596556915269714052441467859854436813271130403014368908908961326314287317209");
-    private static BigInteger dsaX = new BigInteger("45673695048287886591258561084679393738177012644");
-    private static BigInteger dsaG = new BigInteger("3245524385217980657302535456606469153364622623109429686740209357408427939040123729832874550911504858612362156241316117434271994372338032643547044203024422");
-    private static BigInteger dsaP = new BigInteger("8836853285188714261909188099204635517862922237850722644742752953058083563923137941667883080809922365262319540202714582925718707421743492259382127680083261");
-
-    private static byte[] dsaPub = Base64.decode(
-                "rO0ABXNyAC1vcmcuYm91bmN5Y2FzdGxlLmpjZS5wcm92aWRlci5KREtEU0FQdWJsaWNLZXkYUfY34kLIBwMAAkwAB2RzYVN"
-              + "wZWN0ACRMamF2YS9zZWN1cml0eS9pbnRlcmZhY2VzL0RTQVBhcmFtcztMAAF5dAAWTGphdmEvbWF0aC9CaWdJbnRlZ2VyO3"
-              + "hwc3IAFGphdmEubWF0aC5CaWdJbnRlZ2VyjPyfH6k7+x0DAAZJAAhiaXRDb3VudEkACWJpdExlbmd0aEkAE2ZpcnN0Tm9ue"
-              + "mVyb0J5dGVOdW1JAAxsb3dlc3RTZXRCaXRJAAZzaWdudW1bAAltYWduaXR1ZGV0AAJbQnhyABBqYXZhLmxhbmcuTnVtYmVy"
-              + "hqyVHQuU4IsCAAB4cP///////////////v////4AAAABdXIAAltCrPMX+AYIVOACAAB4cAAAAEB2LxWpG2UqKz0HcWZwDii"
-              + "fO0+3sXqWwmnAnHw8HbPRbtJUozr0As4FX7loWxvWyV+CJDse2KwdxISyMmq6hMDZeHNxAH4ABP///////////////v////"
-              + "4AAAABdXEAfgAIAAAAQKi5o5xNZaCAFFAV6dWnHHjG0TVoA7d34RUNF0GhquH6BH/W3BvW4fy428+NPnCgUvJM9iLBTpuBn"
-              + "oepupEE1T14c3EAfgAE///////////////+/////gAAAAF1cQB+AAgAAAAU/tVyr5rbnY4WkK7C6NK21c9jn8V4c3EAfgAE"
-              + "///////////////+/////gAAAAF1cQB+AAgAAABAPffK8RBcfUspb5PsGDyjZf4Tqcmo5UhuaABmUnq8Vqb3P7jc1+LNaTh"
-              + "mUJSnjWQ4+kyCeeJgPH9d3iBd5blQJnh4");
-
-    private static byte[] dsaPriv = Base64.decode(
-                "rO0ABXNyAC5vcmcuYm91bmN5Y2FzdGxlLmpjZS5wcm92aWRlci5KREtEU0FQcml2YXRlS2V5vxcJOSU9rboDAANMAAthdHR"
-              + "yQ2FycmllcnQAPUxvcmcvYm91bmN5Y2FzdGxlL2pjZS9wcm92aWRlci9QS0NTMTJCYWdBdHRyaWJ1dGVDYXJyaWVySW1wbD"
-              + "tMAAdkc2FTcGVjdAAkTGphdmEvc2VjdXJpdHkvaW50ZXJmYWNlcy9EU0FQYXJhbXM7TAABeHQAFkxqYXZhL21hdGgvQmlnS"
-              + "W50ZWdlcjt4cHNyABRqYXZhLm1hdGguQmlnSW50ZWdlcoz8nx+pO/sdAwAGSQAIYml0Q291bnRJAAliaXRMZW5ndGhJABNm"
-              + "aXJzdE5vbnplcm9CeXRlTnVtSQAMbG93ZXN0U2V0Qml0SQAGc2lnbnVtWwAJbWFnbml0dWRldAACW0J4cgAQamF2YS5sYW5"
-              + "nLk51bWJlcoaslR0LlOCLAgAAeHD///////////////7////+AAAAAXVyAAJbQqzzF/gGCFTgAgAAeHAAAAAUCAAUTkau3a"
-              + "uChEXbN4isGH4aY6R4c3EAfgAF///////////////+/////gAAAAF1cQB+AAkAAABAqLmjnE1loIAUUBXp1acceMbRNWgDt"
-              + "3fhFQ0XQaGq4foEf9bcG9bh/Ljbz40+cKBS8kz2IsFOm4Geh6m6kQTVPXhzcQB+AAX///////////////7////+AAAAAXVx"
-              + "AH4ACQAAABT+1XKvmtudjhaQrsLo0rbVz2OfxXhzcQB+AAX///////////////7////+AAAAAXVxAH4ACQAAAEA998rxEFx"
-              + "9Sylvk+wYPKNl/hOpyajlSG5oAGZSerxWpvc/uNzX4s1pOGZQlKeNZDj6TIJ54mA8f13eIF3luVAmeHNyABNqYXZhLnV0aW"
-              + "wuSGFzaHRhYmxlE7sPJSFK5LgDAAJGAApsb2FkRmFjdG9ySQAJdGhyZXNob2xkeHA/QAAAAAAACHcIAAAACwAAAAB4c3IAE"
-              + "GphdmEudXRpbC5WZWN0b3LZl31bgDuvAQMAA0kAEWNhcGFjaXR5SW5jcmVtZW50SQAMZWxlbWVudENvdW50WwALZWxlbWVu"
-              + "dERhdGF0ABNbTGphdmEvbGFuZy9PYmplY3Q7eHAAAAAAAAAAAHVyABNbTGphdmEubGFuZy5PYmplY3Q7kM5YnxBzKWwCAAB"
-              + "4cAAAAApwcHBwcHBwcHBweHg=");
-
-    public String getName()
-    {
-        return "Serialisation";
-    }
-
-    public void performTest() throws Exception
-    {
-        rsaTest();
-        elGamalTest();
-        dhTest();
-        dsaTest();
-    }
-
-    private void rsaTest()
-        throws IOException, ClassNotFoundException
-    {
-        RSAPublicKey pub = (RSAPublicKey)readObject(rsaPub);
-
-        if (!mod.equals(pub.getModulus()))
-        {
-            fail("public key modulus mismatch");
-        }
-        if (!pubExp.equals(pub.getPublicExponent()))
-        {
-            fail("public key exponent mismatch");
-        }
-
-        RSAPublicKey pub2 = (RSAPublicKey)readObject(rsaPub2);
-
-        if (!mod.equals(pub2.getModulus()))
-        {
-            fail("public key 2 modulus mismatch");
-        }
-        if (!pubExp.equals(pub2.getPublicExponent()))
-        {
-            fail("public key 2 exponent mismatch");
-        }
-
-        RSAPrivateCrtKey priv = (RSAPrivateCrtKey)readObject(rsaPriv);
-
-        if (!mod.equals(priv.getModulus()))
-        {
-            fail("private key modulus mismatch");
-        }
-        if (!privExp.equals(priv.getPrivateExponent()))
-        {
-            fail("private key exponent mismatch");
-        }
-        if (!p.equals(priv.getPrimeP()))
-        {
-            fail("private key p mismatch");
-        }
-        if (!q.equals(priv.getPrimeQ()))
-        {
-            fail("private key q mismatch");
-        }
-        if (!expP.equals(priv.getPrimeExponentP()))
-        {
-            fail("private key p exponent mismatch");
-        }
-        if (!expQ.equals(priv.getPrimeExponentQ()))
-        {
-            fail("private key q exponent mismatch");
-        }
-        if (!crtExp.equals(priv.getCrtCoefficient()))
-        {
-            fail("private key crt exponent mismatch");
-        }
-    }
-
-    private void elGamalTest()
-        throws IOException, ClassNotFoundException
-    {
-        ElGamalPublicKey pub = (ElGamalPublicKey)readObject(elGamalPub);
-
-        if (!elGamalY.equals(pub.getY()))
-        {
-            fail("public key y mismatch");
-        }
-        if (!elGamalG.equals(pub.getParameters().getG()))
-        {
-            fail("public key g mismatch");
-        }
-        if (!elGamalP.equals(pub.getParameters().getP()))
-        {
-            fail("public key p mismatch");
-        }
-        
-        ElGamalPrivateKey priv = (ElGamalPrivateKey)readObject(elGamalPriv);
-
-        if (!elGamalX.equals(priv.getX()))
-        {
-            fail("private key x mismatch");
-        }
-        if (!elGamalG.equals(priv.getParameters().getG()))
-        {
-            fail("private key g mismatch");
-        }
-        if (!elGamalP.equals(priv.getParameters().getP()))
-        {
-            fail("private key p mismatch");
-        }
-    }
-
-    private void dhTest()
-        throws IOException, ClassNotFoundException
-    {
-        DHPublicKey pub = (DHPublicKey)readObject(dhPub);
-
-        if (!dhY.equals(pub.getY()))
-        {
-            fail("dh public key y mismatch");
-        }
-        if (!dhG.equals(pub.getParams().getG()))
-        {
-            fail("dh public key g mismatch");
-        }
-        if (!dhP.equals(pub.getParams().getP()))
-        {
-            fail("dh public key p mismatch");
-        }
-        if (0 != pub.getParams().getL())
-        {
-            fail("dh public key l mismatch");
-        }
-
-        DHPrivateKey priv = (DHPrivateKey)readObject(dhPriv);
-
-        if (!dhX.equals(priv.getX()))
-        {
-            fail("dh private key x mismatch");
-        }
-        if (!dhG.equals(priv.getParams().getG()))
-        {
-            fail("dh private key g mismatch");
-        }
-        if (!dhP.equals(priv.getParams().getP()))
-        {
-            fail("dh private key p mismatch");
-        }
-        if (0 != priv.getParams().getL())
-        {
-            fail("dh private key l mismatch");
-        }
-    }
-
-    private void dsaTest()
-        throws IOException, ClassNotFoundException
-    {
-        DSAPublicKey pub = (DSAPublicKey)readObject(dsaPub);
-
-        if (!dsaY.equals(pub.getY()))
-        {
-            fail("dsa public key y mismatch");
-        }
-        if (!dsaG.equals(pub.getParams().getG()))
-        {
-            fail("dsa public key g mismatch");
-        }
-        if (!dsaP.equals(pub.getParams().getP()))
-        {
-            fail("dsa public key p mismatch");
-        }
-
-        DSAPrivateKey priv = (DSAPrivateKey)readObject(dsaPriv);
-
-        if (!dsaX.equals(priv.getX()))
-        {
-            fail("dsa private key x mismatch");
-        }
-        if (!dsaG.equals(priv.getParams().getG()))
-        {
-            fail("dsa private key g mismatch");
-        }
-        if (!dsaP.equals(priv.getParams().getP()))
-        {
-            fail("dsa private key p mismatch");
-        }
-    }
-
-    private Object readObject(byte[] key)
-        throws IOException, ClassNotFoundException
-    {
-        ObjectInputStream oIn = new ObjectInputStream(new ByteArrayInputStream(key));
-
-        return oIn.readObject();
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        runTest(new SerialisationTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/Shacal2Test.java b/bcprov/src/main/java/org/bouncycastle/jce/provider/test/Shacal2Test.java
deleted file mode 100644
index 14157b1..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/Shacal2Test.java
+++ /dev/null
@@ -1,202 +0,0 @@
-package org.bouncycastle.jce.provider.test;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.DataInputStream;
-import java.io.IOException;
-import java.security.Key;
-import java.security.SecureRandom;
-import java.security.Security;
-import java.security.spec.KeySpec;
-
-import javax.crypto.Cipher;
-import javax.crypto.CipherInputStream;
-import javax.crypto.CipherOutputStream;
-import javax.crypto.SecretKey;
-import javax.crypto.SecretKeyFactory;
-import javax.crypto.spec.IvParameterSpec;
-import javax.crypto.spec.PBEKeySpec;
-import javax.crypto.spec.SecretKeySpec;
-
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-
-/**
- * basic test class for the Shacal2 cipher, vector from NESSIE (Test vectors set 8, vector# 0)
- */
-public class Shacal2Test
-    extends SimpleTest
-{
-    static String[] cipherTests =
-        {
-            "512",
-            "000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F202122232425262728292A2B2C2D2E2F303132333435363738393A3B3C3D3E3F",
-            "98BCC10405AB0BFC686BECECAAD01AC19B452511BCEB9CB094F905C51CA45430",
-            "00112233445566778899AABBCCDDEEFF102132435465768798A9BACBDCEDFE0F",
-
-        };
-
-    public String getName()
-    {
-        return "Shacal2";
-    }
-
-    private static final int KEY_SIZE_BITS = 512;
-
-        private static final byte[] TEST_BYTES = new byte[ 1536 ];
-
-        private static final char[] TEST_PASSWORD = new char[ 1536 ];
-
-        static
-        {
-            new SecureRandom().nextBytes( TEST_BYTES );
-            int total = TEST_PASSWORD.length;
-            for ( char c = 'A'; c <= 'Z' && total > 0; TEST_PASSWORD[TEST_PASSWORD.length - total] = c, c++, total-- );
-        }
-
-        private void blockTest()
-            throws Exception
-        {
-            final byte[] salt = new byte[KEY_SIZE_BITS / 8];
-            new SecureRandom().nextBytes(salt);
-
-            final KeySpec keySpec = new PBEKeySpec(TEST_PASSWORD, salt, 262144, KEY_SIZE_BITS);
-            final SecretKey secretKey = new SecretKeySpec(SecretKeyFactory.getInstance("PBKDF2", "BC").
-                generateSecret(keySpec).getEncoded(), "Shacal2");
-
-            final Cipher cipher = Cipher.getInstance("Shacal2/CBC/ISO10126Padding", "BC");
-            cipher.init(Cipher.ENCRYPT_MODE, secretKey);
-
-            final byte[] iv = cipher.getIV();
-            final byte[] ciphertext = cipher.doFinal(TEST_BYTES);
-
-            cipher.init(Cipher.DECRYPT_MODE, secretKey, new IvParameterSpec(iv));
-
-            final byte[] cleartext = cipher.doFinal(ciphertext);
-
-            if (!Arrays.areEqual(TEST_BYTES, cleartext))
-            {
-                fail("Invalid cleartext.");
-            }
-        }
-
-    public void testECB(
-        int strength,
-        byte[] keyBytes,
-        byte[] input,
-        byte[] output)
-        throws Exception
-    {
-        Key key;
-        Cipher in, out;
-        CipherInputStream cIn;
-        CipherOutputStream cOut;
-        ByteArrayInputStream bIn;
-        ByteArrayOutputStream bOut;
-
-        key = new SecretKeySpec(keyBytes, "Shacal2");
-
-        in = Cipher.getInstance("Shacal2/ECB/NoPadding", "BC");
-        out = Cipher.getInstance("Shacal2/ECB/NoPadding", "BC");
-        try
-        {
-            out.init(Cipher.ENCRYPT_MODE, key);
-        }
-        catch (Exception e)
-        {
-            fail("Shacal2 failed initialisation - " + e.toString(), e);
-        }
-
-        try
-        {
-            in.init(Cipher.DECRYPT_MODE, key);
-        }
-        catch (Exception e)
-        {
-            fail("Shacal2 failed initialisation - " + e.toString(), e);
-        }
-
-        //
-        // encryption pass
-        //
-        bOut = new ByteArrayOutputStream();
-
-        cOut = new CipherOutputStream(bOut, out);
-
-        try
-        {
-            for (int i = 0; i != input.length / 2; i++)
-            {
-                cOut.write(input[i]);
-            }
-            cOut.write(input, input.length / 2, input.length - input.length / 2);
-            cOut.close();
-        }
-        catch (IOException e)
-        {
-            fail("Shacal2 failed encryption - " + e.toString(), e);
-        }
-
-        byte[] bytes;
-
-        bytes = bOut.toByteArray();
-
-        if (!areEqual(bytes, output))
-        {
-            fail("Shacal2 failed encryption - expected " + new String(Hex.encode(output)) + " got " + new String(Hex.encode(bytes)));
-        }
-
-        //
-        // decryption pass
-        //
-        bIn = new ByteArrayInputStream(bytes);
-
-        cIn = new CipherInputStream(bIn, in);
-
-        try
-        {
-            DataInputStream dIn = new DataInputStream(cIn);
-
-            bytes = new byte[input.length];
-
-            for (int i = 0; i != input.length / 2; i++)
-            {
-                bytes[i] = (byte)dIn.read();
-            }
-            dIn.readFully(bytes, input.length / 2, bytes.length - input.length / 2);
-        }
-        catch (Exception e)
-        {
-            fail("Shacal2 failed encryption - " + e.toString(), e);
-        }
-
-        if (!areEqual(bytes, input))
-        {
-            fail("Shacal2 failed decryption - expected " + new String(Hex.encode(input)) + " got " + new String(Hex.encode(bytes)));
-        }
-    }
-
-    public void performTest()
-        throws Exception
-    {
-        for (int i = 0; i != cipherTests.length; i += 4)
-        {
-            testECB(Integer.parseInt(cipherTests[i]),
-                Hex.decode(cipherTests[i + 1]),
-                Hex.decode(cipherTests[i + 2]),
-                Hex.decode(cipherTests[i + 3]));
-        }
-
-        blockTest();
-    }
-
-    public static void main(
-        String[] args)
-    {
-        Security.addProvider(new BouncyCastleProvider());
-
-        runTest(new Shacal2Test());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/SigNameTest.java b/bcprov/src/main/java/org/bouncycastle/jce/provider/test/SigNameTest.java
deleted file mode 100644
index 19f9e6d..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/SigNameTest.java
+++ /dev/null
@@ -1,92 +0,0 @@
-package org.bouncycastle.jce.provider.test;
-
-import java.security.NoSuchAlgorithmException;
-import java.security.NoSuchProviderException;
-import java.security.Security;
-import java.security.Signature;
-
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.util.test.SimpleTest;
-
-public class SigNameTest
-    extends SimpleTest
-{
-    private void checkName(String name)
-        throws NoSuchProviderException, NoSuchAlgorithmException
-    {
-        if (!name.equals(Signature.getInstance(name, "BC").getAlgorithm()))
-        {
-            fail("name misatch on " + name);
-        }
-    }
-
-    public void performTest()
-        throws Exception
-    {
-        checkName("SHA1withRSA");
-        checkName("SHA224withRSA");
-        checkName("SHA256withRSA");
-        checkName("SHA384withRSA");
-        checkName("SHA512withRSA");
-        checkName("MD2withRSA");
-        checkName("MD4withRSA");
-        checkName("MD5withRSA");
-        checkName("RIPEMD160withRSA");
-        checkName("RIPEMD128withRSA");
-        checkName("RIPEMD256withRSA");
-
-        checkName("SHA1withDSA");
-        checkName("SHA224withDSA");
-        checkName("SHA256withDSA");
-        checkName("SHA384withDSA");
-        checkName("SHA512withDSA");
-        checkName("NONEwithDSA");
-        checkName("SHA1withECDSA");
-        checkName("SHA224withECDSA");
-        checkName("SHA256withECDSA");
-        checkName("SHA384withECDSA");
-        checkName("SHA512withECDSA");
-        checkName("RIPEMD160withECDSA");
-        checkName("SHA1withECNR");
-        checkName("SHA224withECNR");
-        checkName("SHA256withECNR");
-        checkName("SHA384withECNR");
-        checkName("SHA512withECNR");
-
-        checkName("SHA1withRSAandMGF1");
-        checkName("SHA1withRSAandMGF1");
-        checkName("SHA224withRSAandMGF1");
-        checkName("SHA256withRSAandMGF1");
-        checkName("SHA384withRSAandMGF1");
-        checkName("SHA512withRSAandMGF1");
-
-        checkName("GOST3411withGOST3410");
-        checkName("GOST3411withECGOST3410");
-
-        checkName("SHA1withRSA/ISO9796-2");
-        checkName("MD5withRSA/ISO9796-2");
-        checkName("RIPEMD160withRSA/ISO9796-2");
-
-        checkName("RIPEMD128withRSA/X9.31");
-        checkName("RIPEMD160withRSA/X9.31");
-        checkName("SHA1withRSA/X9.31");
-        checkName("SHA224withRSA/X9.31");
-        checkName("SHA256withRSA/X9.31");
-        checkName("SHA384withRSA/X9.31");
-        checkName("SHA512withRSA/X9.31");
-        checkName("WhirlpoolwithRSA/X9.31");
-    }
-
-    public String getName()
-    {
-        return "SigNameTest";
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        Security.addProvider(new BouncyCastleProvider());
-
-        runTest(new SigNameTest());
-    }
-}
\ No newline at end of file
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/SigTest.java b/bcprov/src/main/java/org/bouncycastle/jce/provider/test/SigTest.java
deleted file mode 100644
index 2c2f512..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/SigTest.java
+++ /dev/null
@@ -1,506 +0,0 @@
-package org.bouncycastle.jce.provider.test;
-
-import java.math.BigInteger;
-import java.security.InvalidKeyException;
-import java.security.KeyFactory;
-import java.security.KeyPair;
-import java.security.KeyPairGenerator;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-import java.security.NoSuchProviderException;
-import java.security.PrivateKey;
-import java.security.PublicKey;
-import java.security.SecureRandom;
-import java.security.Security;
-import java.security.Signature;
-import java.security.SignatureException;
-import java.security.spec.RSAPrivateKeySpec;
-import java.security.spec.RSAPublicKeySpec;
-
-import javax.crypto.Cipher;
-
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-
-public class SigTest
-    extends SimpleTest
-{
-    /**
-     * signature with a "forged signature" (sig block not at end of plain text)
-     */
-    private void testBadSig(PrivateKey priv, PublicKey pub) throws Exception
-    {
-        MessageDigest sha1 = MessageDigest.getInstance("SHA1", "BC");
-        Cipher signer = Cipher.getInstance("RSA/ECB/PKCS1Padding", "BC");
-        
-        signer.init(Cipher.ENCRYPT_MODE, priv);
-        
-        byte[] block = new byte[signer.getBlockSize()];
-        
-        sha1.update((byte)0);
-        
-        byte[] sigHeader = Hex.decode("3021300906052b0e03021a05000414");
-        System.arraycopy(sigHeader, 0, block, 0, sigHeader.length);
-        
-        byte[] dig = sha1.digest();
-
-        System.arraycopy(dig, 0, block, sigHeader.length, dig.length);
-
-        System.arraycopy(sigHeader, 0, block, 
-                        sigHeader.length + dig.length, sigHeader.length);
-        
-        byte[] sig = signer.doFinal(block);
-        
-        Signature verifier = Signature.getInstance("SHA1WithRSA", "BC");
-        
-        verifier.initVerify(pub);
-        
-        verifier.update((byte)0);
-        
-        if (verifier.verify(sig))
-        {
-            fail("bad signature passed");
-        }
-    }
-
-    public void performTest()
-        throws Exception
-    {   
-        Signature           sig = Signature.getInstance("SHA1WithRSAEncryption", "BC");
-        KeyPairGenerator    fact;
-        KeyPair             keyPair;
-        byte[]              data = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 0 };
-
-        fact = KeyPairGenerator.getInstance("RSA", "BC");
-
-        fact.initialize(768, new SecureRandom());
-
-        keyPair = fact.generateKeyPair();
-
-        PrivateKey  signingKey = keyPair.getPrivate();
-        PublicKey   verifyKey = keyPair.getPublic();
-        
-        testBadSig(signingKey, verifyKey);
-
-        sig.initSign(signingKey);
-
-        sig.update(data);
-
-        byte[]  sigBytes = sig.sign();
-
-        sig.initVerify(verifyKey);
-
-        sig.update(data);
-
-        if (!sig.verify(sigBytes))
-        {
-            fail("SHA1 verification failed");
-        }
-
-        sig = Signature.getInstance("MD2WithRSAEncryption", "BC");
-
-        sig.initSign(signingKey);
-
-        sig.update(data);
-
-        sigBytes = sig.sign();
-
-        sig.initVerify(verifyKey);
-
-        sig.update(data);
-
-        if (!sig.verify(sigBytes))
-        {
-            fail("MD2 verification failed");
-        }
-
-        sig = Signature.getInstance("MD5WithRSAEncryption", "BC");
-
-        sig.initSign(signingKey);
-
-        sig.update(data);
-
-        sigBytes = sig.sign();
-
-        sig.initVerify(verifyKey);
-
-        sig.update(data);
-
-        if (!sig.verify(sigBytes))
-        {
-            fail("MD5 verification failed");
-        }
-
-        sig = Signature.getInstance("RIPEMD160WithRSAEncryption", "BC");
-
-        sig.initSign(signingKey);
-
-        sig.update(data);
-
-        sigBytes = sig.sign();
-
-        sig.initVerify(verifyKey);
-
-        sig.update(data);
-
-        if (!sig.verify(sigBytes))
-        {
-            fail("RIPEMD160 verification failed");
-        }
-
-        //
-        // RIPEMD-128
-        //
-        sig = Signature.getInstance("RIPEMD128WithRSAEncryption", "BC");
-
-        sig.initSign(signingKey);
-
-        sig.update(data);
-
-        sigBytes = sig.sign();
-
-        sig.initVerify(verifyKey);
-
-        sig.update(data);
-
-        if (!sig.verify(sigBytes))
-        {
-            fail("RIPEMD128 verification failed");
-        }
-
-        //
-        // RIPEMD256
-        //
-        sig = Signature.getInstance("RIPEMD256WithRSAEncryption", "BC");
-
-        sig.initSign(signingKey);
-
-        sig.update(data);
-
-        sigBytes = sig.sign();
-
-        sig.initVerify(verifyKey);
-
-        sig.update(data);
-
-        if (!sig.verify(sigBytes))
-        {
-            fail("RIPEMD256 verification failed");
-        }
-
-        //
-        // SHA-224
-        //
-        sig = Signature.getInstance("SHA224WithRSAEncryption", "BC");
-
-        sig.initSign(signingKey);
-
-        sig.update(data);
-
-        sigBytes = sig.sign();
-
-        sig.initVerify(verifyKey);
-
-        sig.update(data);
-
-        if (!sig.verify(sigBytes))
-        {
-            fail("SHA224 verification failed");
-        }
-        
-        //
-        // SHA-256
-        //
-        sig = Signature.getInstance("SHA256WithRSAEncryption", "BC");
-
-        sig.initSign(signingKey);
-
-        sig.update(data);
-
-        sigBytes = sig.sign();
-
-        sig.initVerify(verifyKey);
-
-        sig.update(data);
-
-        if (!sig.verify(sigBytes))
-        {
-            fail("SHA256 verification failed");
-        }
-        
-        //
-        // SHA-384
-        //
-        sig = Signature.getInstance("SHA384WithRSAEncryption", "BC");
-
-        sig.initSign(signingKey);
-
-        sig.update(data);
-
-        sigBytes = sig.sign();
-
-        sig.initVerify(verifyKey);
-
-        sig.update(data);
-
-        if (!sig.verify(sigBytes))
-        {
-            fail("SHA384 verification failed");
-        }
-        
-        //
-        // SHA-512
-        //
-        sig = Signature.getInstance("SHA512WithRSAEncryption", "BC");
-
-        sig.initSign(signingKey);
-
-        sig.update(data);
-
-        sigBytes = sig.sign();
-
-        sig.initVerify(verifyKey);
-
-        sig.update(data);
-
-        if (!sig.verify(sigBytes))
-        {
-            fail("SHA512 verification failed");
-        }
-
-        //
-        // ISO Sigs.
-        //
-        sig = Signature.getInstance("MD5WithRSA/ISO9796-2", "BC");
-
-        sig.initSign(signingKey);
-
-        sig.update(data);
-
-        sigBytes = sig.sign();
-
-        sig.initVerify(verifyKey);
-
-        sig.update(data);
-
-        if (!sig.verify(sigBytes))
-        {
-            fail("MD5/ISO verification failed");
-        }
-
-        sig = Signature.getInstance("SHA1WithRSA/ISO9796-2", "BC");
-
-        sig.initSign(signingKey);
-
-        sig.update(data);
-
-        sigBytes = sig.sign();
-
-        sig.initVerify(verifyKey);
-
-        sig.update(data);
-
-        if (!sig.verify(sigBytes))
-        {
-            fail("SHA1/ISO verification failed");
-        }
-
-        trySig("RIPEMD160WithRSA/ISO9796-2", data, signingKey, verifyKey);
-
-        trySig("RIPEMD128WithRSA/X9.31", data, signingKey, verifyKey);
-        trySig("RIPEMD160WithRSA/X9.31", data, signingKey, verifyKey);
-        trySig("SHA1WithRSA/X9.31", data, signingKey, verifyKey);
-        trySig("SHA224WithRSA/X9.31", data, signingKey, verifyKey);
-        trySig("SHA256withRSA/X9.31", data, signingKey, verifyKey);
-        trySig("SHA384WithRSA/X9.31", data, signingKey, verifyKey);
-        trySig("SHA512WithRSA/X9.31", data, signingKey, verifyKey);
-        trySig("WhirlpoolWithRSA/X9.31", data, signingKey, verifyKey);
-
-        shouldPassSignatureX931Test1();
-        shouldPassSignatureX931Test2();
-        shouldPassSignatureX931Test3();
-
-        //
-        // standard vector test - B.1.3 RIPEMD160, implicit.
-        //
-        BigInteger  mod = new BigInteger("ffffffff78f6c55506c59785e871211ee120b0b5dd644aa796d82413a47b24573f1be5745b5cd9950f6b389b52350d4e01e90009669a8720bf265a2865994190a661dea3c7828e2e7ca1b19651adc2d5", 16);
-        BigInteger  pub = new BigInteger("03", 16);
-        BigInteger  pri = new BigInteger("2aaaaaaa942920e38120ee965168302fd0301d73a4e60c7143ceb0adf0bf30b9352f50e8b9e4ceedd65343b2179005b2f099915e4b0c37e41314bb0821ad8330d23cba7f589e0f129b04c46b67dfce9d", 16);
-
-        KeyFactory  f = KeyFactory.getInstance("RSA", "BC");
-
-        PrivateKey  privKey = f.generatePrivate(new RSAPrivateKeySpec(mod, pri));
-        PublicKey   pubKey = f.generatePublic(new RSAPublicKeySpec(mod, pub));
-        byte[]      testSig = Hex.decode("5cf9a01854dbacaec83aae8efc563d74538192e95466babacd361d7c86000fe42dcb4581e48e4feb862d04698da9203b1803b262105104d510b365ee9c660857ba1c001aa57abfd1c8de92e47c275cae");
-
-        data = Hex.decode("fedcba9876543210fedcba9876543210fedcba9876543210fedcba9876543210fedcba9876543210fedcba9876543210fedcba9876543210fedcba9876543210fedcba9876543210fedcba9876543210fedcba9876543210fedcba9876543210fedcba9876543210fedcba9876543210");
-
-        sig = Signature.getInstance("RIPEMD160WithRSA/ISO9796-2", "BC");
-
-        sig.initSign(privKey);
-
-        sig.update(data);
-
-        sigBytes = sig.sign();
-
-        if (!Arrays.areEqual(testSig, sigBytes))
-        {
-            fail("SigTest: failed ISO9796-2 generation Test");
-        }
-
-        sig.initVerify(pubKey);
-
-        sig.update(data);
-
-        if (!sig.verify(sigBytes))
-        {
-            fail("RIPEMD160/ISO verification failed");
-        }
-    }
-
-    private void trySig(String algorithm, byte[] data, PrivateKey signingKey, PublicKey verifyKey)
-        throws NoSuchAlgorithmException, NoSuchProviderException, InvalidKeyException, SignatureException
-    {
-        Signature sig;
-        byte[] sigBytes;
-        sig = Signature.getInstance(algorithm, "BC");
-
-        sig.initSign(signingKey);
-
-        sig.update(data);
-
-        sigBytes = sig.sign();
-
-        sig.initVerify(verifyKey);
-
-        sig.update(data);
-
-        if (!sig.verify(sigBytes))
-        {
-            fail(algorithm + " verification failed");
-        }
-    }
-
-    private void shouldPassSignatureX931Test1()
-        throws Exception
-    {
-        BigInteger n = new BigInteger("c9be1b28f8caccca65d86cc3c9bbcc13eccc059df3b80bd2292b811eff3aa0dd75e1e85c333b8e3fa9bed53bb20f5359ff4e6900c5e9a388e3a4772a583a79e2299c76582c2b27694b65e9ba22e66bfb817f8b70b22206d7d8ae488c86dbb7137c26d5eff9b33c90e6cee640630313b7a715802e15142fef498c404a8de19674974785f0f852e2d470fe85a2e54ffca9f5851f672b71df691785a5cdabe8f14aa628942147de7593b2cf962414a5b59c632c4e14f1768c0ab2e9250824beea60a3529f11bf5e070ce90a47686eb0be1086fb21f0827f55295b4a48307db0b048c05a4aec3f488c576ca6f1879d354224c7e84cbcd8e76dd217a3de54dba73c35", 16);
-        BigInteger e = new BigInteger("e75b1b", 16);
-        byte[] msg = Hex.decode("5bb0d1c0ef9b5c7af2477fe08d45523d3842a4b2db943f7033126c2a7829bacb3d2cfc6497ec91688189e81b7f8742488224ba320ce983ce9480722f2cc5bc42611f00bb6311884f660ccc244788378673532edb05284fd92e83f6f6dab406209032e6af9a33c998677933e32d6fb95fd27408940d7728f9c9c40267ca1d20ce");
-        byte[] sig = Hex.decode("0fe8bb8e3109a1eb7489ef35bf4c1a0780071da789c8bd226a4170538eafefdd30b732d628f0e87a0b9450051feae9754d4fb61f57862d10f0bacc4f660d13281d0cd1141c006ade5186ff7d961a4c6cd0a4b352fc1295c5afd088f80ac1f8e192ef116a010a442655fe8ff5eeacea15807906fb0f0dfa86e680d4c005872357f7ece9aa4e20b15d5f709b30f08648ecaa34f2fbf54eb6b414fa2ff6f87561f70163235e69ccb4ac82a2e46d3be214cc2ef5263b569b2d8fd839b21a9e102665105ea762bda25bb446cfd831487a6b846100dee113ae95ae64f4af22c428c87bab809541c962bb3a56d4c86588e0af4ebc7fcc66dadced311051356d3ea745f7");
-
-        RSAPublicKeySpec rsaPublic = new RSAPublicKeySpec(n, e);
-        Signature signer = Signature.getInstance("SHA1withRSA/X9.31", "BC");
-
-        signer.initVerify(KeyFactory.getInstance("RSA", "BC").generatePublic(rsaPublic));
-
-        signer.update(msg, 0, msg.length);
-
-        if (!signer.verify(sig))
-        {
-            fail("RSA X931 verify test 1 failed.");
-        }
-    }
-
-    private void shouldPassSignatureX931Test2()
-        throws Exception
-    {
-        BigInteger n = new BigInteger("b746ba6c3c0be64bbe33aa55b2929b0af4e86d773d44bfe5914db9287788c4663984b61a418d2eecca30d752ff6b620a07ec72eeb2b422d2429da352407b99982800b9dd7697be6a7b1baa98ca5f4fc2fe33400f20b9dba337ac25c987804165d4a6e0ee4d18eabd6de5abdfe578cae6713ff91d16c80a5bb20217fe614d9509e75a43e1825327b9da8f0a9f6eeaa1c04b69fb4bacc073569fff4ab491becbe6d0441d437fc3fa823239c4a0f75321666b68dd3f66e2dd394089a15bcc288a68a4eb0a48e17d639743b9dea0a91cc35820544732aff253f8ca9967c609dc01c2f8cd0313a7a91cfa94ff74289a1d2b6f19d1811f4b9a65f4cce9e5759b4cc64f", 16);
-        BigInteger e = new BigInteger("dcbbdb", 16);
-        byte[] msg = Hex.decode("a5d3c8a060f897bbbc20ae0955052f37fbc70986b6e11c65075c9f457142bfa93856897c69020aa81a91b5e4f39e05cdeecc63395ab849c8262ca8bc5c96870aecb8edb0aba0024a9bdb71e06de6100344e5c318bc979ef32b8a49a8278ba99d4861bce42ebbc5c8c666aaa6cac39aff8779f2cae367620f9edd4cb1d80b6c8c");
-        byte[] sig = Hex.decode("39fbbd1804c689a533b0043f84da0f06081038c0fbf31e443e46a05e58f50de5198bbca40522afefaba3aed7082a6cb93b1da39f1f5a42246bf64930781948d300549bef0f8d554ecfca60a1b1ecba95a7014ee4545ad4f0c4e3a31942c6738b4ccd6244b6a21267dadf0826a5f713f13b1f5a9ab8501d957a26d4948278ac67851071a315674bdab173bfef2c2690c8373da6bf3d69f30c0e5da8883de872f59521b40793854085641adf98d13db991c5d0a8aaa0222934fa33332e90ef0b954e195cb267d6ffb36c96e14d1ec7b915a87598b4461a3146566354dc2ae748c84ee0cd46543b53ebff8cdf47725b280a1f799fb6ebb4a31ad2bdd5178250f83a");
-
-        RSAPublicKeySpec rsaPublic = new RSAPublicKeySpec(n, e);
-        Signature signer = Signature.getInstance("SHA224withRSA/X9.31", "BC");
-
-        signer.initVerify(KeyFactory.getInstance("RSA", "BC").generatePublic(rsaPublic));
-
-        signer.update(msg, 0, msg.length);
-
-        if (!signer.verify(sig))
-        {
-            fail("RSA X931 verify test 2 failed.");
-        }
-    }
-
-    private void shouldPassSignatureX931Test3()
-        throws Exception
-    {
-        BigInteger n = new BigInteger("dcb5686a3d2063a3f9cf7b9b32d2d3765b4c449b09b4960245a9111cd3b0cbd3260496885b8e1fa5db33b03efcc759d9c1afe29d93c6faebc7e0efada334b5b9a29655e2da2c8f11103d8203be311feab7ae88e9f1b2ec7d8fc655d77202b1681dd9717ec0f525b35584987e19539635a1ed23ca482a00149c609a23dc1645fd", 16);
-        BigInteger e = new BigInteger("00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000dc9f7", 16);
-        BigInteger d = new BigInteger("189d6345099098992e0c9ca5f281e1338092342fa0acc85cc2a111f30f9bd2fb4753cd1a48ef0ddca9bf1af33ec76fb2e23a9fb4896c26f2235b516f7c05ef7ae81e70f4b491a5fedba9b935e9c76d761a813ce7776ff8a1e5efe1166ff2eca26aa900da88c908d51af9de26977fe39719cc781df32216fa41b838f0c63803c3", 16);
-
-        RSAPublicKeySpec rsaPublic = new RSAPublicKeySpec(n, e);
-        RSAPrivateKeySpec rsaPriv = new RSAPrivateKeySpec(n, d);
-
-        PrivateKey privateKey = KeyFactory.getInstance("RSA", "BC").generatePrivate(rsaPriv);
-        PublicKey publicKey = KeyFactory.getInstance("RSA", "BC").generatePublic(rsaPublic);
-
-
-        byte[] msg = Hex.decode("911475c6e210ef4ac65b6fe8d2bfe5e01b959771b137c4ef69b88716e0d2ff9ebc1fad0f358c1dd7d50cc99a7b893ac9a6207076f08d8467d9e48c69c683bfe64a44dabaa3f7c243880f6ab7229bf7bb587822314fc5de5131983bfb2eef8b4bc1eac36f353724b567cd1ae8cddd64ddb7057549d5c81ad5fa3b5e751f00abf5");
-        byte[] sig = Hex.decode("02c50ec0ac8a7f38ef5630c396964d6a6daaa7e3083ab5b57fa2a2632f3b70e2e85c8456cd774d45d7e44fcb063f0f04fff9f1e3adfda11272535a92cb59320b190b5ee4261f23d6ceaa925df3a7bfa42e26bf61ea9645d9d64b3c90a820802768a6e209c9f83705375a3867afccc037e8242a98fa4c3db6b2d9877754d47289");
-
-        doGenVerify("SHA1withRSA/X9.31", privateKey, publicKey, msg, sig);
-
-        msg = Hex.decode("911475c6e210ef4ac65b6fe8d2bfe5e01b959771b137c4ef69b88716e0d2ff9ebc1fad0f358c1dd7d50cc99a7b893ac9a6207076f08d8467d9e48c69c683bfe64a44dabaa3f7c243880f6ab7229bf7bb587822314fc5de5131983bfb2eef8b4bc1eac36f353724b567cd1ae8cddd64ddb7057549d5c81ad5fa3b5e751f00abf5");
-        sig = Hex.decode("2e2e279850ce21e34228a8e810d3ba835c51932e03c5e8886e99036f25a9a43aa5e33168274b7bfc1745ce8fc7ff3335f0927920f09fe9d4a6fac5e546eaf5aedc7e11ba75d33ae1487857b017930e69ec63a10971ca062c0e24f5b08226e59446d02a7827ceecbbcf6ecf0ffa7b3dff3e1a76b5f7432f804a4aa858e18877a5");
-
-        doGenVerify("SHA224withRSA/X9.31", privateKey, publicKey, msg, sig);
-
-        msg = Hex.decode("911475c6e210ef4ac65b6fe8d2bfe5e01b959771b137c4ef69b88716e0d2ff9ebc1fad0f358c1dd7d50cc99a7b893ac9a6207076f08d8467d9e48c69c683bfe64a44dabaa3f7c243880f6ab7229bf7bb587822314fc5de5131983bfb2eef8b4bc1eac36f353724b567cd1ae8cddd64ddb7057549d5c81ad5fa3b5e751f00abf5");
-        sig = Hex.decode("4f917837c2aedfb13e8c039cb076e399de39c2a964e418ad541745ff8062ca967d2ce6d51190732d3db089e48e31e95746f306314468c7d2248ace2cfbf4d67c59629a6e61813d52c1a84ea9d21a73b0afa7e871217f2ebeffeaa1268278edfcb7f2f98d1d32ef835123906e8d5f896d1af6877e304a39b03cf014ddaf850911");
-
-        doGenVerify("SHA256withRSA/X9.31", privateKey, publicKey, msg, sig);
-
-        msg = Hex.decode("7d1f36e728dd03b07825c5dcdf6ea933136e1eb819dd8a8aa27c3b0c9b56a0440045b981f1b9cc4107b55a51e81a5136192883cc1442572d9bf1bed44b2c690374d73a612889f8e8929246fe893dd6e26552da4a12dfbb4b63380e78a83dc44e82dba0d0f6d6ef6ec1c5732beb5ea0ff9ff30b7a3a3d1faba2591140d91017ee");
-        sig = Hex.decode("1210a59883326234d363155876818f43bdbe7ba758c44104ad771984636e13ecfbad97beb138a836b2d94dafd910ecb5b6ba7de6125a15f683af96220b3370e92ea2e1fb22fcd5e83def31728d9196b59308eb4498dadeddad66e26152b456e613ecc5fc8a7ed33f0608ea1ef886949f3741ab8c41ee453de877e5acea33a557");
-
-        doGenVerify("SHA384withRSA/X9.31", privateKey, publicKey, msg, sig);
-
-        msg = Hex.decode("911475c6e210ef4ac65b6fe8d2bfe5e01b959771b137c4ef69b88716e0d2ff9ebc1fad0f358c1dd7d50cc99a7b893ac9a6207076f08d8467d9e48c69c683bfe64a44dabaa3f7c243880f6ab7229bf7bb587822314fc5de5131983bfb2eef8b4bc1eac36f353724b567cd1ae8cddd64ddb7057549d5c81ad5fa3b5e751f00abf5");
-        sig = Hex.decode("154bbde6991b6c8c137a62595619e0038e6787703568a213cff95dac33bc871f7a45f8a3471b823451d1262f7a8932f11d5f93cadbc63daf840e0bbd7d317b57d385be706b58670afac7f055f67d8834f574863b1e295b2a85905bb9926f3114be2be59ad7782321578a451b91587bda7cd6a5051c0fd934af28d5d479463642");
-
-        doGenVerify("SHA512withRSA/X9.31", privateKey, publicKey, msg, sig);
-    }
-
-    private void doGenVerify(String algorithm, PrivateKey privateKey, PublicKey publicKey, byte[] msg, byte[] sig)
-        throws NoSuchAlgorithmException, NoSuchProviderException, InvalidKeyException, SignatureException
-    {
-        Signature signer = Signature.getInstance(algorithm, "BC");
-
-        signer.initSign(privateKey);
-
-        signer.update(msg, 0, msg.length);
-
-        byte[] s = signer.sign();
-
-        if (!Arrays.areEqual(sig, s))
-        {
-           fail(algorithm + " sig test 3 failed.");
-        }
-
-        signer.initVerify(publicKey);
-
-        signer.update(msg, 0, msg.length);
-
-        if (!signer.verify(sig))
-        {
-            fail(algorithm + " verify test 3 failed.");
-        }
-    }
-
-    public String getName()
-    {
-        return "SigTest";
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        Security.addProvider(new BouncyCastleProvider());
-
-        runTest(new SigTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/SipHashTest.java b/bcprov/src/main/java/org/bouncycastle/jce/provider/test/SipHashTest.java
deleted file mode 100644
index 5986141..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/SipHashTest.java
+++ /dev/null
@@ -1,129 +0,0 @@
-package org.bouncycastle.jce.provider.test;
-
-import java.security.InvalidKeyException;
-import java.security.NoSuchAlgorithmException;
-import java.security.NoSuchProviderException;
-import java.security.Security;
-
-import javax.crypto.KeyGenerator;
-import javax.crypto.Mac;
-import javax.crypto.SecretKey;
-import javax.crypto.spec.SecretKeySpec;
-
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-
-public class SipHashTest
-    extends SimpleTest
-{
-    public void performTest()
-        throws Exception
-    {
-        testMac();
-        testKeyGenerator();
-    }
-
-    private void testKeyGenerator()
-        throws NoSuchAlgorithmException,
-        NoSuchProviderException
-    {
-        testKeyGen("SipHash");
-        testKeyGen("SipHash-2-4");
-        testKeyGen("SipHash-4-8");
-    }
-
-    private void testKeyGen(String algorithm)
-        throws NoSuchAlgorithmException,
-        NoSuchProviderException
-    {
-        KeyGenerator kg = KeyGenerator.getInstance(algorithm, "BC");
-
-        SecretKey key = kg.generateKey();
-
-        if (!key.getAlgorithm().equalsIgnoreCase("SipHash"))
-        {
-            fail("Unexpected algorithm name in key", "SipHash", key.getAlgorithm());
-        }
-        if (key.getEncoded().length != 16)
-        {
-            fail("Expected 128 bit key");
-        }
-    }
-
-    private void testMac()
-        throws NoSuchAlgorithmException,
-        NoSuchProviderException,
-        InvalidKeyException
-    {
-        byte[] key = Hex.decode("000102030405060708090a0b0c0d0e0f");
-        byte[] input = Hex.decode("000102030405060708090a0b0c0d0e");
-
-        byte[] expected = Hex.decode("e545be4961ca29a1");
-
-        Mac mac = Mac.getInstance("SipHash", "BC");
-
-        mac.init(new SecretKeySpec(key, "SipHash"));
-
-        mac.update(input, 0, input.length);
-
-        byte[] result = mac.doFinal();
-
-        if (!Arrays.areEqual(expected, result))
-        {
-            fail("Result does not match expected value for doFinal()");
-        }
-
-        mac.init(new SecretKeySpec(key, "SipHash-2-4"));
-
-        mac.update(input, 0, input.length);
-
-        result = mac.doFinal();
-        if (!Arrays.areEqual(expected, result))
-        {
-            fail("Result does not match expected value for second doFinal()");
-        }
-
-        mac = Mac.getInstance("SipHash-2-4", "BC");
-
-        mac.init(new SecretKeySpec(key, "SipHash-2-4"));
-
-        mac.update(input, 0, input.length);
-
-        result = mac.doFinal();
-        if (!Arrays.areEqual(expected, result))
-        {
-            fail("Result does not match expected value for alias");
-        }
-
-        // SipHash 4-8
-        expected = Hex.decode("e0a6a97dd589d383");
-
-        mac = Mac.getInstance("SipHash-4-8", "BC");
-
-        mac.init(new SecretKeySpec(key, "SipHash"));
-
-        mac.update(input, 0, input.length);
-
-        result = mac.doFinal();
-
-        if (!Arrays.areEqual(expected, result))
-        {
-            fail("Result does not match expected value for SipHash 4-8");
-        }
-    }
-
-    public String getName()
-    {
-        return "SipHash";
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        Security.addProvider(new BouncyCastleProvider());
-
-        runTest(new SipHashTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/SkeinTest.java b/bcprov/src/main/java/org/bouncycastle/jce/provider/test/SkeinTest.java
deleted file mode 100644
index 5bc5387..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/SkeinTest.java
+++ /dev/null
@@ -1,316 +0,0 @@
-package org.bouncycastle.jce.provider.test;
-
-import java.security.MessageDigest;
-import java.security.Security;
-
-import javax.crypto.KeyGenerator;
-import javax.crypto.Mac;
-import javax.crypto.SecretKey;
-import javax.crypto.spec.SecretKeySpec;
-
-import org.bouncycastle.jcajce.spec.SkeinParameterSpec;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.SimpleTest;
-
-public class SkeinTest
-    extends SimpleTest
-{
-    final static String provider = "BC";
-
-    static private byte[] nullMsg = new byte[0];
-
-    static private String[][] nullVectors =
-    {
-        { "Skein-256-128", "07e8ff2191c5052e1a25914c7c213078" },
-        { "Skein-256-160", "ff800bed6d2044ee9d604a674e3fda50d9b24a72" },
-        { "Skein-256-224", "0fadf1fa39e3837a95b3660b4184d9c2f3cfc94b55d8e7a083278bf8" },
-        { "Skein-256-256", "c8877087da56e072870daa843f176e9453115929094c3a40c463a196c29bf7ba" },
-        { "Skein-512-128", "7c9aff5c3738e3faadc7a5265768def1" },
-        { "Skein-512-160", "49daf1ccebb3544bc93cb5019ba91b0eea8876ee" },
-        { "Skein-512-224", "1541ae9fc3ebe24eb758ccb1fd60c2c31a9ebfe65b220086e7819e25" },
-        { "Skein-512-256", "39ccc4554a8b31853b9de7a1fe638a24cce6b35a55f2431009e18780335d2621" },
-        { "Skein-512-384", "dd5aaf4589dc227bd1eb7bc68771f5baeaa3586ef6c7680167a023ec8ce26980f06c4082c488b4ac9ef313f8cbe70808" },
-        { "Skein-512-512", "bc5b4c50925519c290cc634277ae3d6257212395cba733bbad37a4af0fa06af41fca7903d06564fea7a2d3730dbdb80c1f85562dfcc070334ea4d1d9e72cba7a" },
-        { "Skein-1024-384", "1fdb081963b960e89eaa11b87dda55e8a55a3e1066b30e38d8ae2a45242f7dadfaf06d80ca8a73cd8242ce5eab84c164" },
-        { "Skein-1024-512", "e2943eb0bc0efabd49503a76edf7cfcf072db25bad94ed44fe537284163f3119c47ac6f78699b4272255966e0aba65c75a0a64bd23df6996d1bc3174afd9fa8b" },
-        { "Skein-1024-1024", "0fff9563bb3279289227ac77d319b6fff8d7e9f09da1247b72a0a265cd6d2a62645ad547ed8193db48cff847c06494a03f55666d3b47eb4c20456c9373c86297d630d5578ebd34cb40991578f9f52b18003efa35d3da6553ff35db91b81ab890bec1b189b7f52cb2a783ebb7d823d725b0b4a71f6824e88f68f982eefc6d19c6" },
-    };
-
-    static private byte[] shortMsg = Hex.decode("fbd17c26b61a82e12e125f0d459b96c91ab4837dff22b39b78439430cdfc5dc8"
-            + "78bb393a1a5f79bef30995a85a12923339ba8ab7d8fc6dc5fec6f4ed22c122bb"
-            + "e7eb61981892966de5cef576f71fc7a80d14dab2d0c03940b95b9fb3a727c66a"
-            + "6e1ff0dc311b9aa21a3054484802154c1826c2a27a0914152aeb76f1168d4410");
-
-    static private String[][] shortVectors =
-    {
-        { "Skein-256-128", "9703382ea27dc2913e9d02cd976c582f" },
-        { "Skein-256-160", "0cd491b7715704c3a15a45a1ca8d93f8f646d3a1" },
-        { "Skein-256-224", "afd1e2d0f5b6cd4e1f8b3935fa2497d27ee97e72060adac099543487" },
-        { "Skein-256-256", "4de6fe2bfdaa3717a4261030ef0e044ced9225d066354610842a24a3eafd1dcf" },
-        { "Skein-512-128", "c901b1c04af3da4dce05d7975c419224" },
-        { "Skein-512-160", "ef03079d61b57c6047e15fa2b35b46fa24279539" },
-        { "Skein-512-224", "d9e3219b214e15246a2038f76a573e018ef69b385b3bd0576b558231" },
-        { "Skein-512-256", "809dd3f763a11af90912bbb92bc0d94361cbadab10142992000c88b4ceb88648" },
-        { "Skein-512-384", "825f5cbd5da8807a7b4d3e7bd9cd089ca3a256bcc064cd73a9355bf3ae67f2bf93ac7074b3b19907a0665ba3a878b262" },
-        { "Skein-512-512", "1a0d5abf4432e7c612d658f8dcfa35b0d1ab68b8d6bd4dd115c23cc57b5c5bcdde9bff0ece4208596e499f211bc07594d0cb6f3c12b0e110174b2a9b4b2cb6a9" },
-        { "Skein-1024-384", "9c3d0648c11f31c18395d5e6c8ebd73f43d189843fc45235e2c35e345e12d62bc21a41f65896ddc6a04969654c2e2ce9" },
-        { "Skein-1024-512", "5d0416f49c2d08dfd40a1446169dc6a1d516e23b8b853be4933513051de8d5c26baccffb08d3b16516ba3c6ccf3e9a6c78fff6ef955f2dbc56e1459a7cdba9a5" },
-        { "Skein-1024-1024", "96ca81f586c825d0360aef5acaec49ad55289e1797072eee198b64f349ce65b6e6ed804fe38f05135fe769cc56240ddda5098f620865ce4a4278c77fa2ec6bc31c0f354ca78c7ca81665bfcc5dc54258c3b8310ed421d9157f36c093814d9b25103d83e0ddd89c52d0050e13a64c6140e6388431961685734b1f138fe2243086" },
-    };
-    
-    static private String[][] shortMacVectors = 
-    {
-        { "Skein-Mac-256-128", "738f8b23541d50f691ab60af664c1583" },
-        { "Skein-Mac-256-160", "fe07fe50f99b7683bc16980041d8c045857f1189" },
-        { "Skein-Mac-256-224", "0bc19b185f5bfe50f0dba7ab49cd8ca9440260edd5a392d4bdcd2216" },
-        { "Skein-Mac-256-256", "9837ba53d23afcdabd9fcd614ce9e51c0ebecec7a210df4d3724ed591f026ef1" },
-        { "Skein-Mac-512-128", "6d34f46f2033947da7a9dfb068f4102d" },
-        { "Skein-Mac-512-160", "83cb2effecaa60674c2f9fb2fb6771a9899708ba" },
-        { "Skein-Mac-512-224", "e5f83c032875451f31977cd649c866708cb283a509e99cdfd4d995c5" },
-        { "Skein-Mac-512-256", "ed5507ec551ec944c6ed531990c32907eca885dd3af3d50dd09f1dbef422bb11" },
-        { "Skein-Mac-512-384", "b8f84a212723b92a591d6dc145c1655c70df710e9f3365064abdf79e9288dced2f0f895d81f465c811f1207b43b8cfce" },
-        { "Skein-Mac-512-512", "d13ba582467096a0f862114d97baa218512f39c82c984aa29deee724950d7f0929f726173dd42bc35566b0dbfbf5d2a1552ba6f132de301846714215b64e7f82" },
-        { "Skein-Mac-1024-384", "490dbbd049403e602ee3535181a70ee2eb5ade6d83b519953dd0d93c45729f098b679efcd64b5e3f03cd2fa9f1e70d69" },
-        { "Skein-Mac-1024-512", "ce7f1052fa486309d73058d1d4986f886d966a849c72d196bb2b97fc9fb0b1e69f43a521ebd979f5a5581bd12a0dbd0d1ee27af0929881f1d35c875cc0542ecf" },
-        { "Skein-Mac-1024-1024", "60cd8c755b331bcefe97be5a9fe6f63146d12520ca7b20dbc5c5370dae2ff9815c95fab564329a01eced76f0ecb1944ad52a74e89fa1b6cdcdcee4c71c2c18909c4d1324d279fac5ca2280eea0fa70521cf4ea8c616a3ac6082c2244bec5c1ab3a173faf29d84bec7fb852e278ed57785535c979b33b81465c437cd998c04b95" },
-    };
-
-    static private String[][] shortHMacVectors = 
-        {
-        { "HMAC-Skein-256-128", "926a445d5218605286dfe0542a437012" },
-        { "HMAC-Skein-256-160", "5ebc30295e4562a879f94db531ada465073b8bb7" },
-        { "HMAC-Skein-256-224", "a05b3cfc6b86fda7f5dcf0afbb707dc745fa55279a3f80e2c9977ff1" },
-        { "HMAC-Skein-256-256", "51741f6e8ebf133216ac8e05c7a75a6339351fd2dcc4db04e418521c628a2111" },
-        { "HMAC-Skein-512-128", "ad51f8c7b1b347fe52f0f5c71ae9b8eb" },
-        { "HMAC-Skein-512-160", "e0d06c2d406f32bb14dbb2129176219b62d4f89f" },
-        { "HMAC-Skein-512-224", "e7e5327e2aaa88d0038049e8112db31df223be4c31da24abf03731a8" },
-        { "HMAC-Skein-512-256", "30177414f6e35019cacc2e3ae474b25765e6e0e541e16d754c3dad19df763ab0" },
-        { "HMAC-Skein-512-384", "7f0ba3c1c642cf09eb03d0e3760fe172f22fb263006b1fba5bdea1bfaf6e971c17e039abb0030d1a40ac94a747732cce" },
-        { "HMAC-Skein-512-512", "70d864e7f6cbd446778914a951d1961e646ee17a3da8eae551d29f4fafc540b0457cc9f8064c511b80dc29f8369fb5dc258559542abb5342c4892f22934bf5f1" },
-        { "HMAC-Skein-1024-384", "e7d3465b30b5089e24244e747a91f7cb255596b49843466497c07e120c5c2232f51151b185a1e8a5610f041a85cc59ee" },
-        { "HMAC-Skein-1024-512", "c428059ae2d17ba13e461384c4a64cb0be694909e7a04e4983a4fc16476d644c7764e0019b33ea2a8719f731a579f4f7015da7ec1bc56a4920071ac41da836fe" },
-        { "HMAC-Skein-1024-1024", "3ebd13ec7bf1533c343ac78e1b5146225ce7629787f3997b646139c1b80d6f54cd562b7625419ede8710d76410dfb8617514ca3f7abf17657d2bc96722071adb2a6ecd9795a1ef5e4734b450d588efcbc3220faf53c880e61438bb953e024e48db6a745d2368375ac792be858cd01915e28590d4d6d599be95f6e6ceed7d7d91" },
-        };
-    
-    static private byte[] shortMacMessage = Hex.decode("d3090c72167517f7");
-    static private byte[] shortMacKey = Hex.decode("cb41f1706cde09651203c2d0efbaddf8");
-
-    static private byte[] keyIdentifier = "asecretkey".getBytes();
-    static private byte[] keyIdentifierVector = Hex.decode("ca9970a83997e1c346c4348b54cfc9ba7e19bfba");
-
-    public String getName()
-    {
-        return "Skein";
-    }
-
-    void test(String type, String algorithm, byte[] message, String expected) throws Exception
-    {
-        MessageDigest digest = MessageDigest.getInstance(algorithm, provider);
-
-        byte[] result = digest.digest(message);
-        byte[] result2 = digest.digest(message);
-
-        // test zero results valid
-        if (!MessageDigest.isEqual(result, Hex.decode(expected)))
-        {
-            fail(type + " result not equal for " + algorithm, expected, new String(Hex.encode(result)));
-        }
-
-        // test one digest the same message with the same instance
-        if (!MessageDigest.isEqual(result, result2))
-        {
-            fail(type + " result object 1 not equal");
-        }
-
-        if (!MessageDigest.isEqual(result, Hex.decode(expected)))
-        {
-            fail(type + " result object 1 not equal");
-        }
-
-        // test two, single byte updates
-        for (int i = 0; i < message.length; i++)
-        {
-            digest.update(message[i]);
-        }
-        result2 = digest.digest();
-
-        if (!MessageDigest.isEqual(result, result2))
-        {
-            fail(type + " result object 2 not equal");
-        }
-
-        // test three, two half updates
-        digest.update(message, 0, message.length / 2);
-        digest.update(message, message.length / 2, message.length - message.length / 2);
-        result2 = digest.digest();
-
-        if (!MessageDigest.isEqual(result, result2))
-        {
-            fail(type + " result object 3 not equal");
-        }
-
-        // test four, clone test
-        digest.update(message, 0, message.length / 2);
-        MessageDigest d = (MessageDigest)digest.clone();
-        digest.update(message, message.length / 2, message.length - message.length / 2);
-        result2 = digest.digest();
-
-        if (!MessageDigest.isEqual(result, result2))
-        {
-            fail(type + " result object 4(a) not equal");
-        }
-
-        d.update(message, message.length / 2, message.length - message.length / 2);
-        result2 = d.digest();
-
-        if (!MessageDigest.isEqual(result, result2))
-        {
-            fail(type + " result object 4(b) not equal");
-        }
-
-        // test five, check reset() method
-        digest.update(message, 0, message.length / 2);
-        digest.reset();
-        digest.update(message, 0, message.length / 2);
-        digest.update(message, message.length / 2, message.length - message.length / 2);
-        result2 = digest.digest();
-
-        if (!MessageDigest.isEqual(result, result2))
-        {
-            fail(type + " result object 5 not equal");
-        }
-    }
-
-    private void testMac(String algorithm, byte[] message, byte[] key, String expected) throws Exception
-    {
-        Mac mac = Mac.getInstance(algorithm, provider);
-
-        mac.init(new SecretKeySpec(key, algorithm));
-
-        byte[] result = mac.doFinal(message);
-        byte[] result2 = mac.doFinal(message);
-
-        // test zero results valid
-        if (!MessageDigest.isEqual(result, Hex.decode(expected)))
-        {
-            fail("null result not equal for " + algorithm, expected, new String(Hex.encode(result)));
-        }
-
-        // test one digest the same message with the same instance
-        if (!MessageDigest.isEqual(result, result2))
-        {
-            fail("Result object 1 not equal");
-        }
-
-        if (!MessageDigest.isEqual(result, Hex.decode(expected)))
-        {
-            fail("Result object 1 not equal");
-        }
-
-        // test two, single byte updates
-        for (int i = 0; i < message.length; i++)
-        {
-            mac.update(message[i]);
-        }
-        result2 = mac.doFinal();
-
-        if (!MessageDigest.isEqual(result, result2))
-        {
-            fail("Result object 2 not equal");
-        }
-
-        // test three, two half updates
-        mac.update(message, 0, message.length / 2);
-        mac.update(message, message.length / 2, message.length - message.length / 2);
-        result2 = mac.doFinal();
-
-        if (!MessageDigest.isEqual(result, result2))
-        {
-            fail("Result object 3 not equal");
-        }
-
-        // test five, check reset() method
-        mac.update(message, 0, message.length / 2);
-        mac.reset();
-        mac.update(message, 0, message.length / 2);
-        mac.update(message, message.length / 2, message.length - message.length / 2);
-        result2 = mac.doFinal();
-
-        if (!MessageDigest.isEqual(result, result2))
-        {
-            fail("Result object 5 not equal");
-        }
-
-        // test six, check KeyGenerator
-        KeyGenerator generator = KeyGenerator.getInstance(algorithm, provider);
-
-        mac = Mac.getInstance(algorithm, provider);
-        final SecretKey generatedKey = generator.generateKey();
-        if (generatedKey.getEncoded().length != mac.getMacLength())
-        {
-            fail("Default mac key length for " + algorithm);
-        }
-        mac.init(generatedKey);
-        mac.update(message);
-        mac.doFinal();
-    }
-
-    private void testParameters() throws Exception
-    {
-        Mac mac = Mac.getInstance("Skein-Mac-512-160", provider);
-
-        // test six, init using SkeinParameters
-        mac.init(new SecretKeySpec(shortMacKey, "Skein-Mac-512-160"),
-                new SkeinParameterSpec.Builder().setKeyIdentifier(keyIdentifier).build());
-        byte[] result = mac.doFinal(shortMacMessage);
-
-        if (!MessageDigest.isEqual(result, keyIdentifierVector))
-        {
-            fail("Mac with key identifier failed.", new String(Hex.encode(keyIdentifierVector)),  new String(Hex.encode(result)));
-        }
-    }
-
-    private void testMacKeyGenerators(String algorithm) throws Exception
-    {
-        KeyGenerator gen = KeyGenerator.getInstance(algorithm);
-        
-        int outputSize = Integer.parseInt(algorithm.substring(algorithm.lastIndexOf('-') + 1));
-        SecretKey key = gen.generateKey();
-        
-        if (key.getEncoded().length != (outputSize / 8)) {
-            fail(algorithm + " key length should be equal to output size " + (outputSize) + ", but was " + key.getEncoded().length * 8);
-        }
-    }
-
-    public void performTest() throws Exception
-    {
-        for (int i = 0; i < nullVectors.length; i++)
-        {
-            test("Null message", nullVectors[i][0], nullMsg, nullVectors[i][1]);
-        }
-        for (int i = 0; i < shortVectors.length; i++)
-        {
-            test("Short message", shortVectors[i][0], shortMsg, shortVectors[i][1]);
-        }
-        for (int i = 0; i < shortMacVectors.length; i++)
-        {
-            testMac(shortMacVectors[i][0], shortMacMessage, shortMacKey, shortMacVectors[i][1]);
-            testMacKeyGenerators(shortMacVectors[i][0]);
-        }
-
-        for (int i = 0; i < shortHMacVectors.length; i++)
-        {
-            testMac(shortHMacVectors[i][0], shortMacMessage, shortMacKey, shortHMacVectors[i][1]);
-            testMacKeyGenerators(shortHMacVectors[i][0]);
-        }
-        testParameters();
-    }
-
-    public static void main(String[] args)
-    {
-        Security.addProvider(new BouncyCastleProvider());
-
-        runTest(new SkeinTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/SlotTwoTest.java b/bcprov/src/main/java/org/bouncycastle/jce/provider/test/SlotTwoTest.java
deleted file mode 100644
index 7a2a880..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/SlotTwoTest.java
+++ /dev/null
@@ -1,90 +0,0 @@
-package org.bouncycastle.jce.provider.test;
-
-import java.security.Key;
-import java.security.SecureRandom;
-import java.security.Security;
-
-import javax.crypto.Cipher;
-import javax.crypto.KeyGenerator;
-import javax.crypto.spec.IvParameterSpec;
-
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.util.test.SimpleTest;
-
-public class SlotTwoTest 
-    extends SimpleTest
-{
-    byte[] plainData = "abcdefghijklmnopqrstuvwxyz".getBytes();
-
-    public String getName()
-    {
-        return "SlotTwo";
-    }
-
-    public void performTest() 
-        throws Exception
-    {
-        Security.removeProvider("BC");
-        Security.insertProviderAt(new BouncyCastleProvider(), 2);
-
-        KeyGenerator keyGen = KeyGenerator.getInstance("DESede", "BC");
-        
-        keyGen.init(new SecureRandom());
-
-        Key key = keyGen.generateKey();
-
-        testDesEde(key, "ECB", "PKCS7Padding");
-        testDesEde(key, "CBC", "PKCS7Padding");
-        testDesEde(key, "CTR", "NoPadding");
-        testDesEde(key, "CTR", "PKCS7Padding");
-        testDesEde(key, "OFB", "PKCS7Padding");
-        testDesEde(key, "CFB", "PKCS7Padding");
-        
-        Security.removeProvider("BC");
-        Security.addProvider(new BouncyCastleProvider());
-    }
-
-    private void testDesEde(
-        Key key, 
-        String mode, 
-        String padding) 
-        throws Exception
-    {
-        Cipher encrypt = Cipher.getInstance("DESede/" + mode + "/" + padding, "BC");
-        Cipher decrypt = Cipher.getInstance("DESede/" + mode + "/" + padding);
-        
-        if (!decrypt.getProvider().getName().equals("BC"))
-        {
-            fail("BC provider not returned for DESede/" + mode + "/" + padding + " got " + decrypt.getProvider().getName());
-        }
-
-        encrypt.init(Cipher.ENCRYPT_MODE, key);
-
-        byte[] encryptedBytes = encrypt.doFinal(plainData);
-        byte[] ivBytes = encrypt.getIV();
-        
-        if (ivBytes != null)
-        {
-            IvParameterSpec ivp = new IvParameterSpec(ivBytes);
-    
-            decrypt.init(Cipher.DECRYPT_MODE, key, ivp);
-        }
-        else
-        {
-            decrypt.init(Cipher.DECRYPT_MODE, key);
-        }
-
-        byte[] plainBytes = decrypt.doFinal(encryptedBytes, 0, encryptedBytes.length);
-        
-        if (!areEqual(plainData, plainBytes))
-        {
-            fail("decryption test failed.");
-        }
-    }
-    
-    public static void main(
-        String[]    args)
-    {
-        runTest(new SlotTwoTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/TestUtils.java b/bcprov/src/main/java/org/bouncycastle/jce/provider/test/TestUtils.java
deleted file mode 100644
index 4d57efe..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/TestUtils.java
+++ /dev/null
@@ -1,301 +0,0 @@
-package org.bouncycastle.jce.provider.test;
-
-import java.math.BigInteger;
-import java.security.InvalidKeyException;
-import java.security.KeyPair;
-import java.security.KeyPairGenerator;
-import java.security.NoSuchAlgorithmException;
-import java.security.NoSuchProviderException;
-import java.security.Principal;
-import java.security.PrivateKey;
-import java.security.PublicKey;
-import java.security.SecureRandom;
-import java.security.SignatureException;
-import java.security.cert.CertificateEncodingException;
-import java.security.cert.CertificateException;
-import java.security.cert.CertificateExpiredException;
-import java.security.cert.CertificateNotYetValidException;
-import java.security.cert.X509CRL;
-import java.security.cert.X509Certificate;
-import java.util.Date;
-import java.util.Set;
-
-import org.bouncycastle.asn1.x509.BasicConstraints;
-import org.bouncycastle.asn1.x509.CRLNumber;
-import org.bouncycastle.asn1.x509.CRLReason;
-import org.bouncycastle.asn1.x509.KeyUsage;
-import org.bouncycastle.asn1.x509.SubjectKeyIdentifier;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.bouncycastle.asn1.x509.X509Extensions;
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.digests.SHA1Digest;
-import org.bouncycastle.jce.PrincipalUtil;
-import org.bouncycastle.jce.X509Principal;
-import org.bouncycastle.x509.X509V1CertificateGenerator;
-import org.bouncycastle.x509.X509V2CRLGenerator;
-import org.bouncycastle.x509.X509V3CertificateGenerator;
-import org.bouncycastle.x509.extension.AuthorityKeyIdentifierStructure;
-
-/**
- * Test Utils
- */
-class TestUtils
-{
-    /**
-     * Create a random 1024 bit RSA key pair
-     */
-    public static KeyPair generateRSAKeyPair()
-        throws Exception
-    {
-        KeyPairGenerator  kpGen = KeyPairGenerator.getInstance("RSA", "BC");
-    
-        kpGen.initialize(1024, new SecureRandom());
-    
-        return kpGen.generateKeyPair();
-    }
-    
-    public static X509Certificate generateRootCert(KeyPair pair)
-        throws Exception
-    {
-        X509V1CertificateGenerator  certGen = new X509V1CertificateGenerator();
-    
-        certGen.setSerialNumber(BigInteger.valueOf(1));
-        certGen.setIssuerDN(new X509Principal("CN=Test CA Certificate"));
-        certGen.setNotBefore(new Date(System.currentTimeMillis() - 50000));
-        certGen.setNotAfter(new Date(System.currentTimeMillis() + 50000));
-        certGen.setSubjectDN(new X509Principal("CN=Test CA Certificate"));
-        certGen.setPublicKey(pair.getPublic());
-        certGen.setSignatureAlgorithm("SHA256WithRSAEncryption");
-    
-        return certGen.generate(pair.getPrivate(), "BC");
-    }
-    
-    public static X509Certificate generateIntermediateCert(PublicKey intKey, PrivateKey caKey, X509Certificate caCert)
-        throws Exception
-    {
-        X509V3CertificateGenerator  certGen = new X509V3CertificateGenerator();
-
-        certGen.setSerialNumber(BigInteger.valueOf(1));
-        certGen.setIssuerDN(PrincipalUtil.getSubjectX509Principal(caCert));
-        certGen.setNotBefore(new Date(System.currentTimeMillis() - 50000));
-        certGen.setNotAfter(new Date(System.currentTimeMillis() + 50000));
-        certGen.setSubjectDN(new X509Principal("CN=Test Intermediate Certificate"));
-        certGen.setPublicKey(intKey);
-        certGen.setSignatureAlgorithm("SHA256WithRSAEncryption");
-    
-        certGen.addExtension(X509Extensions.AuthorityKeyIdentifier, false, new AuthorityKeyIdentifierStructure(caCert));
-        certGen.addExtension(X509Extensions.SubjectKeyIdentifier, false, new SubjectKeyIdentifier(getDigest(SubjectPublicKeyInfo.getInstance(intKey.getEncoded()))));
-        certGen.addExtension(X509Extensions.BasicConstraints, true, new BasicConstraints(0));
-        certGen.addExtension(X509Extensions.KeyUsage, true, new KeyUsage(KeyUsage.digitalSignature | KeyUsage.keyCertSign | KeyUsage.cRLSign));
-
-        return certGen.generate(caKey, "BC");
-    }
-    
-    public static X509Certificate generateEndEntityCert(PublicKey entityKey, PrivateKey caKey, X509Certificate caCert)
-        throws Exception
-    {
-        X509V3CertificateGenerator  certGen = new X509V3CertificateGenerator();
-
-        certGen.setSerialNumber(BigInteger.valueOf(1));
-        certGen.setIssuerDN(PrincipalUtil.getSubjectX509Principal(caCert));
-        certGen.setNotBefore(new Date(System.currentTimeMillis() - 50000));
-        certGen.setNotAfter(new Date(System.currentTimeMillis() + 50000));
-        certGen.setSubjectDN(new X509Principal("CN=Test End Certificate"));
-        certGen.setPublicKey(entityKey);
-        certGen.setSignatureAlgorithm("SHA256WithRSAEncryption");
-        
-        certGen.addExtension(X509Extensions.AuthorityKeyIdentifier, false, new AuthorityKeyIdentifierStructure(caCert));
-        certGen.addExtension(X509Extensions.SubjectKeyIdentifier, false, new SubjectKeyIdentifier(getDigest(SubjectPublicKeyInfo.getInstance(entityKey.getEncoded()))));
-        certGen.addExtension(X509Extensions.BasicConstraints, true, new BasicConstraints(false));
-        certGen.addExtension(X509Extensions.KeyUsage, true, new KeyUsage(KeyUsage.digitalSignature | KeyUsage.keyEncipherment));
-
-        return certGen.generate(caKey, "BC");
-    }
-    
-    public static X509CRL createCRL(
-        X509Certificate caCert, 
-        PrivateKey      caKey, 
-        BigInteger      serialNumber)
-        throws Exception
-    {
-        X509V2CRLGenerator   crlGen = new X509V2CRLGenerator();
-        Date                 now = new Date();
-        BigInteger           revokedSerialNumber = BigInteger.valueOf(2);
-        
-        crlGen.setIssuerDN(PrincipalUtil.getSubjectX509Principal(caCert));
-        
-        crlGen.setThisUpdate(now);
-        crlGen.setNextUpdate(new Date(now.getTime() + 100000));
-        crlGen.setSignatureAlgorithm("SHA256WithRSAEncryption");
-        
-        crlGen.addCRLEntry(serialNumber, now, CRLReason.privilegeWithdrawn);
-        
-        crlGen.addExtension(X509Extensions.AuthorityKeyIdentifier, false, new AuthorityKeyIdentifierStructure(caCert));
-        crlGen.addExtension(X509Extensions.CRLNumber, false, new CRLNumber(BigInteger.valueOf(1)));
-        
-        return crlGen.generate(caKey, "BC");
-    }
-
-    public static X509Certificate createExceptionCertificate(boolean exceptionOnEncode)
-    {
-        return new ExceptionCertificate(exceptionOnEncode);
-    }
-
-    private static class ExceptionCertificate
-        extends X509Certificate
-    {
-        private boolean _exceptionOnEncode;
-
-        public ExceptionCertificate(boolean exceptionOnEncode)
-        {
-            _exceptionOnEncode = exceptionOnEncode;
-        }
-
-        public void checkValidity() throws CertificateExpiredException, CertificateNotYetValidException
-        {
-            throw new CertificateNotYetValidException();
-        }
-
-        public void checkValidity(Date date) throws CertificateExpiredException, CertificateNotYetValidException
-        {
-            throw new CertificateExpiredException();
-        }
-
-        public int getVersion()
-        {
-            return 0;
-        }
-
-        public BigInteger getSerialNumber()
-        {
-            return null;
-        }
-
-        public Principal getIssuerDN()
-        {
-            return null;
-        }
-
-        public Principal getSubjectDN()
-        {
-            return null;
-        }
-
-        public Date getNotBefore()
-        {
-            return null;
-        }
-
-        public Date getNotAfter()
-        {
-            return null;
-        }
-
-        public byte[] getTBSCertificate() throws CertificateEncodingException
-        {
-            throw new CertificateEncodingException();
-        }
-
-        public byte[] getSignature()
-        {
-            return new byte[0];
-        }
-
-        public String getSigAlgName()
-        {
-            return null;
-        }
-
-        public String getSigAlgOID()
-        {
-            return null;
-        }
-
-        public byte[] getSigAlgParams()
-        {
-            return new byte[0];
-        }
-
-        public boolean[] getIssuerUniqueID()
-        {
-            return new boolean[0];
-        }
-
-        public boolean[] getSubjectUniqueID()
-        {
-            return new boolean[0];
-        }
-
-        public boolean[] getKeyUsage()
-        {
-            return new boolean[0];
-        }
-
-        public int getBasicConstraints()
-        {
-            return 0;
-        }
-
-        public byte[] getEncoded() throws CertificateEncodingException
-        {
-            if (_exceptionOnEncode)
-            {
-                throw new CertificateEncodingException();
-            }
-            
-            return new byte[0];
-        }
-
-        public void verify(PublicKey key) throws CertificateException, NoSuchAlgorithmException, InvalidKeyException, NoSuchProviderException, SignatureException
-        {
-            throw new CertificateException();
-        }
-
-        public void verify(PublicKey key, String sigProvider) throws CertificateException, NoSuchAlgorithmException, InvalidKeyException, NoSuchProviderException, SignatureException
-        {
-            throw new CertificateException();
-        }
-
-        public String toString()
-        {
-            return null;
-        }
-
-        public PublicKey getPublicKey()
-        {
-            return null;
-        }
-
-        public boolean hasUnsupportedCriticalExtension()
-        {
-            return false;
-        }
-
-        public Set getCriticalExtensionOIDs()
-        {
-            return null;
-        }
-
-        public Set getNonCriticalExtensionOIDs()
-        {
-            return null;
-        }
-
-        public byte[] getExtensionValue(String oid)
-        {
-            return new byte[0];
-        }
-
-    }
-
-    private static byte[] getDigest(SubjectPublicKeyInfo spki)
-    {
-        Digest digest = new SHA1Digest();
-        byte[]  resBuf = new byte[digest.getDigestSize()];
-
-        byte[] bytes = spki.getPublicKeyData().getBytes();
-        digest.update(bytes, 0, bytes.length);
-        digest.doFinal(resBuf, 0);
-        return resBuf;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/ThreefishTest.java b/bcprov/src/main/java/org/bouncycastle/jce/provider/test/ThreefishTest.java
deleted file mode 100644
index c278787..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/ThreefishTest.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package org.bouncycastle.jce.provider.test;
-
-import java.security.Security;
-
-import javax.crypto.Cipher;
-import javax.crypto.SecretKey;
-import javax.crypto.spec.IvParameterSpec;
-import javax.crypto.spec.SecretKeySpec;
-
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.test.SimpleTest;
-
-public class ThreefishTest
-    extends SimpleTest
-{
-
-    private static final byte[] SECRET_KEY_1024 =
-        {
-            -15, -32, 56, 110, 22, -42, -26, 34, 25, 17, -83, -2, -78, 112, 49, 127, -4, 70, -110, -21, -10, -114, -82, -122,
-            78, 53, -105, -44, 34, 45, -102, -19, -30, 73, 87, 19, 25, -92, -64, -72, 11, 125, -92, -124, -126, -70, -92, 54,
-            46, 3, 86, -108, 71, -42, 44, -110, -36, -31, -48, -84, -19, 102, 124, -118, 17, -84, -119, 126, 37, -8, -13, 21,
-            -4, 86, 104, -85, -44, 82, 60, -61, -95, -9, -92, 68, -123, -111, -53, -36, -47, 36, -92, 121, 95, 25, 73, 124,
-            -13, -7, -106, -32, 75, -30, -25, -95, 120, 88, 2, 55, 68, -113, -60, 104, 59, 57, -86, -79, -110, -126, -44,
-            -18, 73, -37, -128, -40, -62, -15, 23, 87
-        };
-
-    private static final byte[] TEST_BYTES = new byte[1536];
-
-    public String getName()
-    {
-        return "Threefish";
-    }
-
-    public void performTest()
-        throws Exception
-    {
-        // padding test at 128 pad bytes.
-
-        final SecretKey secretKey = new SecretKeySpec(SECRET_KEY_1024, "Threefish-1024");
-
-        Cipher cipher = Cipher.getInstance("Threefish-1024/CBC/ISO10126Padding", "BC");
-        cipher.init(Cipher.ENCRYPT_MODE, secretKey, new IvParameterSpec(new byte[128]));
-
-        byte[] iv = cipher.getIV();
-        byte[] ciphertext = cipher.doFinal(TEST_BYTES);
-
-        cipher.init(Cipher.DECRYPT_MODE, secretKey, new IvParameterSpec(iv));
-
-        byte[] cleartext = cipher.doFinal(ciphertext);
-
-        if (!Arrays.areEqual(TEST_BYTES, cleartext))
-        {
-            fail("Invalid cleartext - ISO10126Padding.");
-        }
-
-        cipher = Cipher.getInstance("Threefish-1024/CBC/PKCS7Padding", "BC");
-        cipher.init(Cipher.ENCRYPT_MODE, secretKey);
-
-        iv = cipher.getIV();
-        ciphertext = cipher.doFinal(TEST_BYTES);
-
-        cipher.init(Cipher.DECRYPT_MODE, secretKey, new IvParameterSpec(iv));
-
-        cleartext = cipher.doFinal(ciphertext);
-
-        if (!Arrays.areEqual(TEST_BYTES, cleartext))
-        {
-            fail("Invalid cleartext - PKCS7.");
-        }
-    }
-
-    public static void main(final String[] args)
-        throws Exception
-    {
-        Security.addProvider(new BouncyCastleProvider());
-
-        runTest(new ThreefishTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/WrapTest.java b/bcprov/src/main/java/org/bouncycastle/jce/provider/test/WrapTest.java
deleted file mode 100644
index 118e182..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/WrapTest.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package org.bouncycastle.jce.provider.test;
-
-import java.security.Key;
-import java.security.KeyPair;
-import java.security.KeyPairGenerator;
-import java.security.MessageDigest;
-import java.security.PrivateKey;
-import java.security.PublicKey;
-import java.security.SecureRandom;
-import java.security.Security;
-
-import javax.crypto.Cipher;
-import javax.crypto.KeyGenerator;
-
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.util.test.SimpleTestResult;
-import org.bouncycastle.util.test.Test;
-import org.bouncycastle.util.test.TestResult;
-
-public class WrapTest
-    implements Test
-{
-    public TestResult perform()
-    {
-        try
-        {
-            Cipher cipher = Cipher.getInstance("DES/ECB/PKCS5Padding", "BC");
-            KeyPairGenerator fact = KeyPairGenerator.getInstance("RSA", "BC");
-            fact.initialize(512, new SecureRandom());
-
-            KeyPair keyPair = fact.generateKeyPair();
-
-            PrivateKey  priKey = keyPair.getPrivate();
-            PublicKey   pubKey = keyPair.getPublic();
-
-            KeyGenerator keyGen = KeyGenerator.getInstance("DES", "BC");
-            Key wrapKey = keyGen.generateKey();
-            cipher.init(Cipher.WRAP_MODE, wrapKey);
-            byte[] wrappedKey = cipher.wrap(priKey);
-
-            cipher.init(Cipher.UNWRAP_MODE, wrapKey);
-            Key key = cipher.unwrap(wrappedKey, "RSA", Cipher.PRIVATE_KEY);
-
-            if (!MessageDigest.isEqual(priKey.getEncoded(), key.getEncoded()))
-            {
-                return new SimpleTestResult(false, "Unwrapped key does not match");
-            }
-
-            return new SimpleTestResult(true, getName() + ": Okay");
-        }
-        catch (Exception e)
-        {
-            return new SimpleTestResult(false, getName() + ": exception - " + e.toString(), e);
-        }
-    }
-
-    public String getName()
-    {
-        return "WrapTest";
-    }
-
-    public static void main(
-        String[]    args)
-    {
-        Security.addProvider(new BouncyCastleProvider());
-
-        Test            test = new WrapTest();
-        TestResult      result = test.perform();
-
-        System.out.println(result.toString());
-        if (result.getException() != null)
-        {
-            result.getException().printStackTrace();
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/X509CertificatePairTest.java b/bcprov/src/main/java/org/bouncycastle/jce/provider/test/X509CertificatePairTest.java
deleted file mode 100644
index 4eecef8..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/X509CertificatePairTest.java
+++ /dev/null
@@ -1,147 +0,0 @@
-package org.bouncycastle.jce.provider.test;
-
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.util.test.SimpleTest;
-import org.bouncycastle.x509.X509CertificatePair;
-
-import java.io.ByteArrayInputStream;
-import java.security.Security;
-import java.security.cert.CertificateEncodingException;
-import java.security.cert.CertificateFactory;
-import java.security.cert.X509Certificate;
-
-public class X509CertificatePairTest
-    extends SimpleTest
-{
-    public void performTest()
-        throws Exception
-    {
-        CertificateFactory cf = CertificateFactory.getInstance("X.509", "BC");
-
-        X509Certificate rootCert = (X509Certificate)cf.generateCertificate(
-                                        new ByteArrayInputStream(CertPathTest.rootCertBin));
-        X509Certificate interCert = (X509Certificate)cf.generateCertificate(
-                                         new ByteArrayInputStream(CertPathTest.interCertBin));
-        X509Certificate finalCert = (X509Certificate)cf.generateCertificate(
-                                          new ByteArrayInputStream(CertPathTest.finalCertBin));
-
-
-        X509CertificatePair pair1 = new X509CertificatePair(rootCert, interCert);
-        X509CertificatePair pair2 = new X509CertificatePair(rootCert, interCert);
-        X509CertificatePair pair3 = new X509CertificatePair(interCert, finalCert);
-        X509CertificatePair pair4 = new X509CertificatePair(rootCert, finalCert);
-        X509CertificatePair pair5 = new X509CertificatePair(rootCert, null);
-        X509CertificatePair pair6 = new X509CertificatePair(rootCert, null);
-        X509CertificatePair pair7 = new X509CertificatePair(null, rootCert);
-        X509CertificatePair pair8 = new X509CertificatePair(null, rootCert);
-
-        if (!pair1.equals(pair2))
-        {
-            fail("pair1 pair2 equality test");
-        }
-
-        if (!pair5.equals(pair6))
-        {
-            fail("pair1 pair2 equality test");
-        }
-
-        if (!pair7.equals(pair8))
-        {
-            fail("pair1 pair2 equality test");
-        }
-
-        if (pair1.equals(null))
-        {
-            fail("pair1 null equality test");
-        }
-
-        if (pair1.hashCode() != pair2.hashCode())
-        {
-            fail("pair1 pair2 hashCode equality test");
-        }
-
-        if (pair1.equals(pair3))
-        {
-            fail("pair1 pair3 inequality test");
-        }
-
-        if (pair1.equals(pair4))
-        {
-            fail("pair1 pair4 inequality test");
-        }
-
-        if (pair1.equals(pair5))
-        {
-            fail("pair1 pair5 inequality test");
-        }
-
-        if (pair1.equals(pair7))
-        {
-            fail("pair1 pair7 inequality test");
-        }
-
-        if (pair5.equals(pair1))
-        {
-            fail("pair5 pair1 inequality test");
-        }
-
-        if (pair7.equals(pair1))
-        {
-            fail("pair7 pair1 inequality test");
-        }
-
-        if (pair1.getForward() != rootCert)
-        {
-            fail("pair1 forward test");
-        }
-
-        if (pair1.getReverse() != interCert)
-        {
-            fail("pair1 reverse test");
-        }
-
-        if (!areEqual(pair1.getEncoded(), pair2.getEncoded()))
-        {
-            fail("encoding check");
-        }
-
-        pair4 = new X509CertificatePair(rootCert, TestUtils.createExceptionCertificate(false));
-
-        try
-        {
-            pair4.getEncoded();
-
-            fail("no exception on bad getEncoded()");
-        }
-        catch (CertificateEncodingException e)
-        {
-            // expected
-        }
-
-        pair4 = new X509CertificatePair(rootCert, TestUtils.createExceptionCertificate(true));
-
-        try
-        {
-            pair4.getEncoded();
-
-            fail("no exception on exception getEncoded()");
-        }
-        catch (CertificateEncodingException e)
-        {
-            // expected
-        }
-    }
-
-    public String getName()
-    {
-        return "X509CertificatePair";
-    }
-
-    public static void main(String[] args)
-    {
-        Security.addProvider(new BouncyCastleProvider());
-
-        runTest(new X509CertificatePairTest());
-    }
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/X509LDAPCertStoreTest.java b/bcprov/src/main/java/org/bouncycastle/jce/provider/test/X509LDAPCertStoreTest.java
deleted file mode 100644
index 2716712..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/X509LDAPCertStoreTest.java
+++ /dev/null
@@ -1,467 +0,0 @@
-package org.bouncycastle.jce.provider.test;
-
-import org.bouncycastle.jce.PrincipalUtil;
-import org.bouncycastle.jce.X509LDAPCertStoreParameters;
-import org.bouncycastle.jce.X509Principal;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.util.encoders.Base64;
-import org.bouncycastle.util.test.SimpleTest;
-import org.bouncycastle.x509.X509CRLStoreSelector;
-import org.bouncycastle.x509.X509CertStoreSelector;
-import org.bouncycastle.x509.X509Store;
-
-import java.io.ByteArrayInputStream;
-import java.security.Security;
-import java.security.cert.CRLException;
-import java.security.cert.CertStore;
-import java.security.cert.CertificateEncodingException;
-import java.security.cert.CertificateFactory;
-import java.security.cert.X509CRL;
-import java.security.cert.X509CRLSelector;
-import java.security.cert.X509CertSelector;
-import java.security.cert.X509Certificate;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Iterator;
-
-public class X509LDAPCertStoreTest extends SimpleTest
-{
-    private static final byte cert1[] = Base64
-        .decode("MIIDyTCCAzKgAwIBAgIEL64+8zANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQGEwJE"
-            + "RTEcMBoGA1UEChQTRGV1dHNjaGUgVGVsZWtvbSBBRzEoMAwGBwKCBgEKBxQTATEw"
-            + "GAYDVQQDFBFUVEMgVGVzdCBDQSAxMTpQTjAeFw0wMzAzMjUxNDM1MzFaFw0wNjAz"
-            + "MjUxNDM1MzFaMGIxCzAJBgNVBAYTAkRFMRswGQYDVQQKDBJHRlQgU29sdXRpb25z"
-            + "IEdtYkgxEjAQBgNVBAsMCUhZUEFSQ0hJVjEWMBQGA1UEAwwNRGllZ2UsIFNpbW9u"
-            + "ZTEKMAgGA1UEBRMBMTCBoDANBgkqhkiG9w0BAQEFAAOBjgAwgYoCgYEAiEYsFbs4"
-            + "FesQpMjBkzJB92c0p8tJ02nbCNA5l17VVbbrv6/twnQHW4kgA+9lZlXfzI8iunT1"
-            + "KuiwVupWObHgFaGPkelIN/qIbuwbQzh7T+IUKdKETE12Lc+xk9YvQ6mJVgosmwpr"
-            + "nMMjezymh8DjPhe7MC7/H3AotrHVNM3mEJcCBEAAAIGjggGWMIIBkjAfBgNVHSME"
-            + "GDAWgBTQc8wTeltcAM3iTE63fk/wTA+IJTAdBgNVHQ4EFgQUq6ChBvXPiqhMHLS3"
-            + "kiKpSeGWDz4wDgYDVR0PAQH/BAQDAgQwMB8GA1UdEQQYMBaBFHNpbW9uZS5kaWVn"
-            + "ZUBnZnQuY29tMIHoBgNVHR8EgeAwgd0wgdqgaqBohjVsZGFwOi8vcGtzbGRhcC50"
-            + "dHRjLmRlOjM4OS9jPWRlLG89RGV1dHNjaGUgVGVsZWtvbSBBR4YvaHR0cDovL3d3"
-            + "dy50dHRjLmRlL3RlbGVzZWMvc2VydmxldC9kb3dubG9hZF9jcmyibKRqMGgxCzAJ"
-            + "BgNVBAYTAkRFMRwwGgYDVQQKFBNEZXV0c2NoZSBUZWxla29tIEFHMTswDAYHAoIG"
-            + "AQoHFBMBMTArBgNVBAMUJFRlbGVTZWMgRGlyZWN0b3J5IFNlcnZpY2UgU2lnRyAx"
-            + "MDpQTjA0BggrBgEFBQcBAQQoMCYwJAYIKwYBBQUHMAGGGGh0dHA6Ly93d3cudHR0"
-            + "Yy5kZS9vY3NwcjANBgkqhkiG9w0BAQUFAAOBgQBCPudAtrP9Bx7GRhHQgYS6kaoN"
-            + "vYb/yDss86pyn0uiFuwT+mT1popcAfxPo2yxL0jqqlsDNFBC2hJob5rjihsKPmqV"
-            + "rSaW0VJu/zBihsX7hLKOVMf5gvUYMS5ulq/bp8jOj8a+5SmxVY+WWZVFghWjISse"
-            + "T3WABdTS9S3zjnQiyg==");
-
-    private static final byte[] directCRL = Base64
-        .decode("MIIGXTCCBckCAQEwCgYGKyQDAwECBQAwdDELMAkGA1UEBhMCREUxHDAaBgNVBAoU"
-            + "E0RldXRzY2hlIFRlbGVrb20gQUcxFzAVBgNVBAsUDlQtVGVsZVNlYyBUZXN0MS4w"
-            + "DAYHAoIGAQoHFBMBMTAeBgNVBAMUF1QtVGVsZVNlYyBUZXN0IERJUiA4OlBOFw0w"
-            + "NjA4MDQwODQ1MTRaFw0wNjA4MDQxNDQ1MTRaMIIElTAVAgQvrj/pFw0wMzA3MjIw"
-            + "NTQxMjhaMBUCBC+uP+oXDTAzMDcyMjA1NDEyOFowFQIEL64/5xcNMDQwNDA1MTMx"
-            + "ODE3WjAVAgQvrj/oFw0wNDA0MDUxMzE4MTdaMBUCBC+uP+UXDTAzMDExMzExMTgx"
-            + "MVowFQIEL64/5hcNMDMwMTEzMTExODExWjAVAgQvrj/jFw0wMzAxMTMxMTI2NTZa"
-            + "MBUCBC+uP+QXDTAzMDExMzExMjY1NlowFQIEL64/4hcNMDQwNzEzMDc1ODM4WjAV"
-            + "AgQvrj/eFw0wMzAyMTcwNjMzMjVaMBUCBC+uP98XDTAzMDIxNzA2MzMyNVowFQIE"
-            + "L64/0xcNMDMwMjE3MDYzMzI1WjAVAgQvrj/dFw0wMzAxMTMxMTI4MTRaMBUCBC+u"
-            + "P9cXDTAzMDExMzExMjcwN1owFQIEL64/2BcNMDMwMTEzMTEyNzA3WjAVAgQvrj/V"
-            + "Fw0wMzA0MzAxMjI3NTNaMBUCBC+uP9YXDTAzMDQzMDEyMjc1M1owFQIEL64/xhcN"
-            + "MDMwMjEyMTM0NTQwWjAVAgQvrj/FFw0wMzAyMTIxMzQ1NDBaMBUCBC+uP8IXDTAz"
-            + "MDIxMjEzMDkxNlowFQIEL64/wRcNMDMwMjEyMTMwODQwWjAVAgQvrj++Fw0wMzAy"
-            + "MTcwNjM3MjVaMBUCBC+uP70XDTAzMDIxNzA2MzcyNVowFQIEL64/sBcNMDMwMjEy"
-            + "MTMwODU5WjAVAgQvrj+vFw0wMzAyMTcwNjM3MjVaMBUCBC+uP5MXDTAzMDQxMDA1"
-            + "MjYyOFowFQIEL64/khcNMDMwNDEwMDUyNjI4WjAVAgQvrj8/Fw0wMzAyMjYxMTA0"
-            + "NDRaMBUCBC+uPz4XDTAzMDIyNjExMDQ0NFowFQIEL64+zRcNMDMwNTIwMDUyNzM2"
-            + "WjAVAgQvrj7MFw0wMzA1MjAwNTI3MzZaMBUCBC+uPjwXDTAzMDYxNzEwMzQxNlow"
-            + "FQIEL64+OxcNMDMwNjE3MTAzNDE2WjAVAgQvrj46Fw0wMzA2MTcxMDM0MTZaMBUC"
-            + "BC+uPjkXDTAzMDYxNzEzMDEwMFowFQIEL64+OBcNMDMwNjE3MTMwMTAwWjAVAgQv"
-            + "rj43Fw0wMzA2MTcxMzAxMDBaMBUCBC+uPjYXDTAzMDYxNzEzMDEwMFowFQIEL64+"
-            + "MxcNMDMwNjE3MTAzNzQ5WjAVAgQvrj4xFw0wMzA2MTcxMDQyNThaMBUCBC+uPjAX"
-            + "DTAzMDYxNzEwNDI1OFowFQIEL649qRcNMDMxMDIyMTEzMjI0WjAVAgQvrjyyFw0w"
-            + "NTAzMTEwNjQ0MjRaMBUCBC+uPKsXDTA0MDQwMjA3NTQ1M1owFQIEL6466BcNMDUw"
-            + "MTI3MTIwMzI0WjAVAgQvrjq+Fw0wNTAyMTYwNzU3MTZaMBUCBC+uOqcXDTA1MDMx"
-            + "MDA1NTkzNVowFQIEL646PBcNMDUwNTExMTA0OTQ2WjAVAgQvrG3VFw0wNTExMTEx"
-            + "MDAzMjFaMBUCBC+uLmgXDTA2MDEyMzEwMjU1NVowFQIEL64mxxcNMDYwODAxMDk0"
-            + "ODQ0WqCBijCBhzALBgNVHRQEBAICEQwwHwYDVR0jBBgwFoAUA1vI26YMj3njkfCU"
-            + "IXbo244kLjkwVwYDVR0SBFAwToZMbGRhcDovL3Brc2xkYXAudHR0Yy5kZS9vdT1U"
-            + "LVRlbGVTZWMgVGVzdCBESVIgODpQTixvPURldXRzY2hlIFRlbGVrb20gQUcsYz1k"
-            + "ZTAKBgYrJAMDAQIFAAOBgQArj4eMlbAwuA2aS5O4UUUHQMKKdK/dtZi60+LJMiMY"
-            + "ojrMIf4+ZCkgm1Ca0Cd5T15MJxVHhh167Ehn/Hd48pdnAP6Dfz/6LeqkIHGWMHR+"
-            + "z6TXpwWB+P4BdUec1ztz04LypsznrHcLRa91ixg9TZCb1MrOG+InNhleRs1ImXk8"
-            + "MQ==");
-
-    private static final String ldapURL1 = "ldap://pksldap.tttc.de:389";
-
-    private static final X509LDAPCertStoreParameters params1 = new X509LDAPCertStoreParameters.Builder(
-        ldapURL1, "o=Deutsche Telekom AG, c=DE").
-        setAACertificateSubjectAttributeName("ou cn").
-        setAttributeAuthorityRevocationListIssuerAttributeName("cn").
-        setAttributeCertificateAttributeSubjectAttributeName("cn").
-        setAttributeCertificateRevocationListIssuerAttributeName("cn").
-        setAttributeDescriptorCertificateSubjectAttributeName("ou cn").
-        setAuthorityRevocationListIssuerAttributeName("cn").
-        setCACertificateSubjectAttributeName("ou cn").
-        setCertificateRevocationListIssuerAttributeName("cn").
-        setCrossCertificateSubjectAttributeName("cn").
-        setDeltaRevocationListIssuerAttributeName("cn").
-        setSearchForSerialNumberIn("cn")
-        .build();
-
-    private static final String ldapURL2 = "ldap://directory.d-trust.de:389";
-
-    private static final X509LDAPCertStoreParameters params2 = new X509LDAPCertStoreParameters.Builder(
-        ldapURL2, "o=D-Trust GmbH, c=DE").
-        setAACertificateSubjectAttributeName("cn o").
-        setAttributeAuthorityRevocationListIssuerAttributeName("cn").
-        setAttributeCertificateAttributeSubjectAttributeName("cn").
-        setAttributeCertificateRevocationListIssuerAttributeName("cn").
-        setAttributeDescriptorCertificateSubjectAttributeName("cn o").
-        setAuthorityRevocationListIssuerAttributeName("cn").
-        setCACertificateSubjectAttributeName("cn o").
-        setCertificateRevocationListIssuerAttributeName("cn").
-        setCrossCertificateSubjectAttributeName("cn o").
-        setDeltaRevocationListIssuerAttributeName("cn").
-        setSearchForSerialNumberIn("uid")
-        .build();
-
-    private static final byte[] cert2 = Base64
-        .decode("MIIEADCCAuigAwIBAgIDAJ/QMA0GCSqGSIb3DQEBBQUAMD8xCzAJBgNVBAYTAkRF"
-            + "MRUwEwYDVQQKDAxELVRydXN0IEdtYkgxGTAXBgNVBAMMEEQtVFJVU1QgRGVtbyBD"
-            + "QTEwHhcNMDYwMzAyMTYxNTU3WhcNMDgwMzEyMTYxNTU3WjB+MQswCQYDVQQGEwJE"
-            + "RTEUMBIGA1UECgwLTXVzdGVyIEdtYkgxFzAVBgNVBAMMDk1heCBNdXN0ZXJtYW5u"
-            + "MRMwEQYDVQQEDApNdXN0ZXJtYW5uMQwwCgYDVQQqDANNYXgxHTAbBgNVBAUTFERU"
-            + "UldFMTQxMjk5NDU1MTgwMTIxMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC"
-            + "AQEAjLDFeviSZDEZgLzTdptU4biPgNV7SvLqsNholfqkyQm2r5WSghGZSjhKYIne"
-            + "qKmZ08W59a51bGqDEsifYR7Tw9JC/AhH19fyK01+1ZAXHalgVthaRtLw31lcoTVJ"
-            + "R7j9fvrnW0sMPVP4m5gePb3P5/pYHVmN1MjdPIm38us5aJOytOO5Li2IwQIG0t4M"
-            + "bEC6/1horBR5TgRl7ACamrdaPHOvO1QVweOqYU7uVxLgDTK4mSV6heyrisFMfkbj"
-            + "7jT/c44kXM7dtgNcmESINudu6bnqaB1CxOFTJ/Jzv81R5lf7pBX2LOG1Bu94Yw2x"
-            + "cHUVROs2UWY8kQrNUozsBHzQ0QIDAKq5o4HFMIHCMBMGA1UdIwQMMAqACEITKrPL"
-            + "WuYiMDMGCCsGAQUFBwEBBCcwJTAjBggrBgEFBQcwAYYXaHR0cDovL29jc3AuZC10"
-            + "cnVzdC5uZXQwEAYDVR0gBAkwBzAFBgMqAwQwEQYDVR0OBAoECEvE8bXFHkFLMA4G"
-            + "A1UdDwEB/wQEAwIGQDAPBgUrJAgDCAQGDARUZXN0MB8GA1UdEQQYMBaBFG0ubXVz"
-            + "dGVybWFubkB0ZXN0LmRlMA8GBSskCAMPBAYMBFRlc3QwDQYJKoZIhvcNAQEFBQAD"
-            + "ggEBADD/X+UZZN30nCBDzJ7MtmgwvMBVDAU6HkPlzfyn9pxIKFrq3uR9wcY2pedM"
-            + "yQQk0NpTDCIhAYIjAHysMue0ViQnW5qq8uUCFn0+fsgMqqTQNRmE4NIqUrnYO40g"
-            + "WjcepCEApkTqGf3RFaDMf9zpRvj9qUx18De+V0GC22uD2vPKpqRcvS2dSw6pHBW2"
-            + "NwEU+RgNhoPXrHt332PEYdwO0zOL7eSLBD9AmkpP2uDjpMQ02Lu9kXG6OOfanwfS"
-            + "jHioCvDXyl5pwSHwrHNWQRb5dLF12Fg41LMapDwR7awAKE9h6qHBonvCMBPMvqrr"
-            + "NktqQcoQkluR9MItONJI5XHADtU=");
-
-    private static final String ldapURL3 = "ldap://dir.signtrust.de:389";
-
-    private static final X509LDAPCertStoreParameters params3 = new X509LDAPCertStoreParameters.Builder(
-        ldapURL3, "o=Deutsche Post AG, c=de").
-        setAACertificateSubjectAttributeName("ou").
-        setAttributeAuthorityRevocationListIssuerAttributeName("cn").
-        setAttributeCertificateAttributeSubjectAttributeName("cn").
-        setAttributeCertificateRevocationListIssuerAttributeName("o").
-        setAttributeDescriptorCertificateSubjectAttributeName("ou").
-        setAuthorityRevocationListIssuerAttributeName("o").
-        setCACertificateSubjectAttributeName("ou").
-        setCertificateRevocationListIssuerAttributeName("o").
-        setCrossCertificateSubjectAttributeName("o").
-        setDeltaRevocationListIssuerAttributeName("o").
-        setSearchForSerialNumberIn("serialNumber")
-        .build();
-
-    private static final byte[] cert3 = Base64
-        .decode("MIICwDCCAimgAwIBAgIBKzANBgkqhkiG9w0BAQUFADA6MRAwDgYDVQQDEwdQQ0Ex"
-            + "OlBOMRkwFwYDVQQKExBEZXV0c2NoZSBQb3N0IEFHMQswCQYDVQQGEwJERTAeFw0w"
-            + "MDA0MTkyMjAwMDBaFw0wMzA0MTkyMjAwMDBaMIGOMRAwDgYDVQQEFAdN5G5jaGVy"
-            + "MQ4wDAYDVQQqEwVLbGF1czEWMBQGA1UEAxQNS2xhdXMgTeRuY2hlcjEVMBMGA1UE"
-            + "CRMMV2llc2Vuc3RyLiAzMQ4wDAYDVQQREwU2MzMyOTESMBAGA1UEBxMJRWdlbHNi"
-            + "YWNoMQswCQYDVQQGEwJERTEKMAgGA1UEBRMBMTCBnzANBgkqhkiG9w0BAQEFAAOB"
-            + "jQAwgYkCgYEAn7z6Ba9wpv/mNBIaricY/d0KpxGpqGAXdqKlvqkk/seJEoBLvmL7"
-            + "wZz88RPELQqzDhc4oXYohS2dh3NHus9FpSPMq0JzKAcE3ArrVDxwtXtlcwN2v7iS"
-            + "TcHurgLOb9C/r8JdsMHNgwHMkkdp96cJk/sioyP5sLPYmgWxg1JH0vMCAwEAAaOB"
-            + "gDB+MAwGA1UdEwEB/wQCMAAwDwYDVR0PAQH/BAUDAwfAADBKBgNVHSMEQzBBoTyk"
-            + "OjEQMA4GA1UEAxMHUENBMTpQTjEZMBcGA1UEChMQRGV1dHNjaGUgUG9zdCBBRzEL"
-            + "MAkGA1UEBhMCREWCAQEwEQYDVR0OBAoECEAeJ6R3USjxMA0GCSqGSIb3DQEBBQUA"
-            + "A4GBADMRtdiQJF2fg7IcedTjnAW+QGl/wNSKy7A4oaBQeahcruo+hzH+ZU+DsiSu"
-            + "TJZaf2X1eUUEPmV+5zZlopGa3HvFfgmIYIXBw9ZO3Qb/HWGsPNgW0yg5eXEGwNEt"
-            + "vV85BTMGuMjiuDw841IuAZaMKqOKnVXHmd2pLJz7Wv0MLJhw");
-
-    private static final byte[] caCert3 = Base64
-        .decode("MIICUjCCAb6gAwIBAgIDD2ptMAoGBiskAwMBAgUAMG8xCzAJBgNVBAYTAkRFMT0w"
-            + "OwYDVQQKFDRSZWd1bGllcnVuZ3NiZWjIb3JkZSBmyHVyIFRlbGVrb21tdW5pa2F0"
-            + "aW9uIHVuZCBQb3N0MSEwDAYHAoIGAQoHFBMBMTARBgNVBAMUCjRSLUNBIDE6UE4w"
-            + "IhgPMjAwMDA0MTIwODIyMDNaGA8yMDA0MDQxMjA4MjIwM1owWzELMAkGA1UEBhMC"
-            + "REUxGTAXBgNVBAoUEERldXRzY2hlIFBvc3QgQUcxMTAMBgcCggYBCgcUEwExMCEG"
-            + "A1UEAxQaQ0EgREVSIERFVVRTQ0hFTiBQT1NUIDU6UE4wgZ8wDQYJKoZIhvcNAQEB"
-            + "BQADgY0AMIGJAoGBAIH3c+gig1KkY5ceR6n/AMq+xz7hi3f0PMdpwIe2v2w6Hu5k"
-            + "jipe++NvU3r6wakIY2royHl3gKWrExOisBico9aQmn8lMJnWZ7SUbB+WpRn0mAWN"
-            + "ZM9YT+/U5hRCffeeuLWClzrbScaWnAeaaI0G+N/QKnSSjrV/l64jogyADWCTAgMB"
-            + "AAGjEjAQMA4GA1UdDwEB/wQEAwIBBjAKBgYrJAMDAQIFAAOBgQAaV5WClEneXk9s"
-            + "LO8zTQAsf4KvDaLd1BFcFeYM7kLLRHKeWQ0MAd0xkuAMme5NVwWNpNZP74B4HX7Q"
-            + "/Q0h/wo/9LTgQaxw52lLs4Ml0HUyJbSFjoQ+sqgjg2fGNGw7aGkVNY5dQTAy8oSv"
-            + "iG8mxTsQ7Fxaush3cIB0qDDwXar/hg==");
-
-    private static final byte[] crossCert3 = Base64
-        .decode("MIICVDCCAcCgAwIBAgIDDIOsMAoGBiskAwMBAgUAMG8xCzAJBgNVBAYTAkRFMT0w"
-            + "OwYDVQQKFDRSZWd1bGllcnVuZ3NiZWjIb3JkZSBmyHVyIFRlbGVrb21tdW5pa2F0"
-            + "aW9uIHVuZCBQb3N0MSEwDAYHAoIGAQoHFBMBMTARBgNVBAMUCjRSLUNBIDE6UE4w"
-            + "IhgPMjAwMDAzMjIwOTQzNTBaGA8yMDA0MDEyMTE2MDQ1M1owbzELMAkGA1UEBhMC"
-            + "REUxPTA7BgNVBAoUNFJlZ3VsaWVydW5nc2JlaMhvcmRlIGbIdXIgVGVsZWtvbW11"
-            + "bmlrYXRpb24gdW5kIFBvc3QxITAMBgcCggYBCgcUEwExMBEGA1UEAxQKNVItQ0Eg"
-            + "MTpQTjCBoTANBgkqhkiG9w0BAQEFAAOBjwAwgYsCgYEAih5BUycfBpqKhU8RDsaS"
-            + "vV5AtzWeXQRColL9CH3t0DKnhjKAlJ8iccFtJNv+d3bh8bb9sh0maRSo647xP7hs"
-            + "HTjKgTE4zM5BYNfXvST79OtcMgAzrnDiGjQIIWv8xbfV1MqxxdtZJygrwzRMb9jG"
-            + "CAGoJEymoyzAMNG7tSdBWnUCBQDAAAABMAoGBiskAwMBAgUAA4GBAIBWrl6aEy4d"
-            + "2d6U/924YK8Tv9oChmaKVhklkiTzcKv1N8dhLnLTibq4/stop03CY3rKU4X5aTfu"
-            + "0J77FIV1Poy9jLT5Tm1NBpi71m4uO3AUoSeyhJXGQGsYFjAc3URqkznbTL/nr9re"
-            + "IoBhf6u9cX+idnN6Uy1q+j/LOrcy3zgj");
-
-    public void performTest() throws Exception
-    {
-        certStoretest();
-        x509StoreTest();
-    }
-
-    private void certStoretest() throws Exception
-    {
-        CertStore cs = CertStore.getInstance("X509LDAP", params1, "BC");
-        X509CertSelector sl = new X509CertSelector();
-        CertificateFactory cf = CertificateFactory.getInstance("X.509", "BC");
-        X509Certificate xcert = (X509Certificate)cf
-            .generateCertificate(new ByteArrayInputStream(cert1));
-        sl.setCertificate(xcert);
-        Collection coll = cs.getCertificates(sl);
-        if (coll.isEmpty() || !coll.iterator().next().equals(xcert))
-        {
-            fail("certificate could not be picked from LDAP directory.");
-        }
-
-        // System.out.println(coll.toArray()[0]);
-
-        sl.setCertificate(null);
-        sl.setSubject(getSubject(xcert).getEncoded());
-        coll = cs.getCertificates(sl);
-        if (coll.isEmpty() || !coll.iterator().next().equals(xcert))
-        {
-            fail("certificate could not be picked from LDAP directory.");
-        }
-        X509CRLSelector sl2 = new X509CRLSelector();
-        X509CRL crl = (X509CRL)cf.generateCRL(new
-            ByteArrayInputStream(directCRL));
-        sl2.addIssuerName(getCRLIssuer(crl).getEncoded());
-        coll = cs.getCRLs(sl2);
-        if (!coll.iterator().hasNext())
-        {
-            fail("CRL could not be picked from LDAP directory.");
-        }
-        // System.out.println(coll.toArray()[0]);
-
-        cs = CertStore.getInstance("X509LDAP", params2, "BC");
-        sl = new X509CertSelector();
-        xcert = (X509Certificate)cf
-            .generateCertificate(new ByteArrayInputStream(cert2));
-        sl.setCertificate(xcert);
-        coll = cs.getCertificates(sl);
-        if (coll.isEmpty() || !coll.iterator().next().equals(xcert))
-        {
-            fail("Certificate could not be picked from LDAP directory.");
-        }
-
-        // System.out.println(coll.toArray()[0]);
-
-        cs = CertStore.getInstance("X509LDAP", params3, "BC");
-        sl = new X509CertSelector();
-        xcert = (X509Certificate)cf
-            .generateCertificate(new ByteArrayInputStream(cert3));
-        sl.setCertificate(xcert);
-        coll = cs.getCertificates(sl);
-        if (coll.isEmpty() || !coll.iterator().next().equals(xcert))
-        {
-            fail("Certificate could not be picked from LDAP directory.");
-        }
-
-        // System.out.println(coll.toArray()[0]);
-
-        xcert = (X509Certificate)cf
-            .generateCertificate(new ByteArrayInputStream(caCert3));
-        sl = new X509CertSelector();
-        sl.setSubject(getSubject(xcert).getEncoded());
-        coll = cs.getCertificates(sl);
-        boolean found = false;
-        if (coll.isEmpty())
-        {
-            fail("Certificate could not be picked from LDAP directory.");
-        }
-
-        for (Iterator it = coll.iterator(); it.hasNext();)
-        {
-            if (it.next().equals(xcert))
-            {
-                found = true;
-                break;
-            }
-        }
-        if (!found)
-        {
-            fail("Certificate could not be picked from LDAP directory.");
-        }
-
-        // System.out.println(coll.toArray()[0]);
-
-        sl = new X509CertSelector();
-        xcert = (X509Certificate)cf
-            .generateCertificate(new ByteArrayInputStream(crossCert3));
-        sl = new X509CertSelector();
-        sl.setSubject(getSubject(xcert).getEncoded());
-        coll = cs.getCertificates(sl);
-        if (coll.isEmpty())
-        {
-            fail("Cross certificate pair could not be picked from LDAP directory.");
-        }
-        found = false;
-        for (Iterator it = coll.iterator(); it.hasNext();)
-        {
-            if (it.next().equals(xcert))
-            {
-                found = true;
-                break;
-            }
-        }
-        if (!found)
-        {
-            fail("Cross certificate pair could not be picked from LDAP directory.");
-        }
-
-        // System.out.println(coll.toArray()[0]);
-    }
-
-    private void x509StoreTest() throws Exception
-    {
-        X509Store cs = X509Store.getInstance("CERTIFICATE/LDAP", params1, "BC");
-
-        X509CertStoreSelector sl = new X509CertStoreSelector();
-        CertificateFactory cf = CertificateFactory.getInstance("X.509", "BC");
-        X509Certificate xcert = (X509Certificate)cf
-            .generateCertificate(new ByteArrayInputStream(cert1));
-        sl.setCertificate(xcert);
-        Collection coll = cs.getMatches(sl);
-        if (coll.isEmpty() || !coll.iterator().next().equals(xcert))
-        {
-            fail("certificate could not be picked from LDAP directory.");
-        }
-
-        // System.out.println(coll.toArray()[0]);
-
-        sl.setCertificate(null);
-        sl.setSubject(getSubject(xcert).getEncoded());
-        coll = cs.getMatches(sl);
-        if (coll.isEmpty() || !coll.iterator().next().equals(xcert))
-        {
-            fail("certificate could not be picked from LDAP directory.");
-        }
-        X509CRLStoreSelector sl2 = new X509CRLStoreSelector();
-        X509CRL crl = (X509CRL)cf.generateCRL(new
-            ByteArrayInputStream(directCRL));
-        sl2.setIssuers(Collections.singleton(crl.getIssuerX500Principal()));
-        cs = X509Store.getInstance("CRL/LDAP", params1, "BC");
-        coll = cs.getMatches(sl2);
-        if (!coll.iterator().hasNext())
-        {
-            fail("CRL could not be picked from LDAP directory.");
-        }
-        // System.out.println(coll.toArray()[0]);
-
-        cs = X509Store.getInstance("CERTIFICATE/LDAP", params2, "BC");
-        sl = new X509CertStoreSelector();
-        xcert = (X509Certificate)cf
-            .generateCertificate(new ByteArrayInputStream(cert2));
-        sl.setCertificate(xcert);
-        coll = cs.getMatches(sl);
-        if (coll.isEmpty() || !coll.iterator().next().equals(xcert))
-        {
-            fail("Certificate could not be picked from LDAP directory.");
-        }
-
-        // System.out.println(coll.toArray()[0]);
-
-        cs = X509Store.getInstance("CERTIFICATE/LDAP", params3, "BC");
-        sl = new X509CertStoreSelector();
-        xcert = (X509Certificate)cf
-            .generateCertificate(new ByteArrayInputStream(cert3));
-        sl.setCertificate(xcert);
-        coll = cs.getMatches(sl);
-        if (coll.isEmpty() || !coll.iterator().next().equals(xcert))
-        {
-            fail("Certificate could not be picked from LDAP directory.");
-        }
-
-        // System.out.println(coll.toArray()[0]);
-
-        xcert = (X509Certificate)cf
-            .generateCertificate(new ByteArrayInputStream(caCert3));
-        sl = new X509CertStoreSelector();
-        sl.setSubject(getSubject(xcert).getEncoded());
-        coll = cs.getMatches(sl);
-        boolean found = false;
-        if (coll.isEmpty())
-        {
-            fail("Certificate could not be picked from LDAP directory.");
-        }
-
-        for (Iterator it = coll.iterator(); it.hasNext();)
-        {
-            if (it.next().equals(xcert))
-            {
-                found = true;
-                break;
-            }
-        }
-        if (!found)
-        {
-            fail("Certificate could not be picked from LDAP directory.");
-        }
-
-        // System.out.println(coll.toArray()[0]);
-
-        sl = new X509CertStoreSelector();
-        xcert = (X509Certificate)cf
-            .generateCertificate(new ByteArrayInputStream(crossCert3));
-        sl.setSubject(getSubject(xcert).getEncoded());
-        coll = cs.getMatches(sl);
-        if (coll.isEmpty())
-        {
-            fail("Cross certificate pair could not be picked from LDAP directory.");
-        }
-        found = false;
-        for (Iterator it = coll.iterator(); it.hasNext();)
-        {
-            if (it.next().equals(xcert))
-            {
-                found = true;
-                break;
-            }
-        }
-        if (!found)
-        {
-            fail("Cross certificate pair could not be picked from LDAP directory.");
-        }
-
-        // System.out.println(coll.toArray()[0]);
-
-    }
-
-    private X509Principal getSubject(X509Certificate cert)
-        throws CertificateEncodingException
-    {
-        return PrincipalUtil.getSubjectX509Principal(cert);
-    }
-
-    private X509Principal getCRLIssuer(X509CRL crl)
-        throws CRLException
-    {
-        return PrincipalUtil.getIssuerX509Principal(crl);
-    }
-
-    public String getName()
-    {
-        return "LDAPCertStoreTest";
-    }
-
-    public static void main(String[] args)
-    {
-        Security.addProvider(new BouncyCastleProvider());
-        runTest(new X509LDAPCertStoreTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/X509StreamParserTest.java b/bcprov/src/main/java/org/bouncycastle/jce/provider/test/X509StreamParserTest.java
deleted file mode 100644
index 8f3c7fe..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/X509StreamParserTest.java
+++ /dev/null
@@ -1,360 +0,0 @@
-package org.bouncycastle.jce.provider.test;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.DERSet;
-import org.bouncycastle.asn1.DERTaggedObject;
-import org.bouncycastle.asn1.cms.CMSObjectIdentifiers;
-import org.bouncycastle.asn1.cms.ContentInfo;
-import org.bouncycastle.asn1.cms.SignedData;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.util.encoders.Base64;
-import org.bouncycastle.util.test.SimpleTest;
-import org.bouncycastle.x509.X509AttributeCertificate;
-import org.bouncycastle.x509.X509CertificatePair;
-import org.bouncycastle.x509.X509StreamParser;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.security.Security;
-import java.security.cert.X509CRL;
-import java.security.cert.X509Certificate;
-import java.util.Collection;
-
-public class X509StreamParserTest
-    extends SimpleTest
-{
-    byte[]  attrCert = Base64.decode(
-        "MIIHQDCCBqkCAQEwgZChgY2kgYowgYcxHDAaBgkqhkiG9w0BCQEWDW1sb3JjaEB2"
-      + "dC5lZHUxHjAcBgNVBAMTFU1hcmt1cyBMb3JjaCAobWxvcmNoKTEbMBkGA1UECxMS"
-      + "VmlyZ2luaWEgVGVjaCBVc2VyMRAwDgYDVQQLEwdDbGFzcyAyMQswCQYDVQQKEwJ2"
-      + "dDELMAkGA1UEBhMCVVMwgYmkgYYwgYMxGzAZBgkqhkiG9w0BCQEWDHNzaGFoQHZ0"
-      + "LmVkdTEbMBkGA1UEAxMSU3VtaXQgU2hhaCAoc3NoYWgpMRswGQYDVQQLExJWaXJn"
-      + "aW5pYSBUZWNoIFVzZXIxEDAOBgNVBAsTB0NsYXNzIDExCzAJBgNVBAoTAnZ0MQsw"
-      + "CQYDVQQGEwJVUzANBgkqhkiG9w0BAQQFAAIBBTAiGA8yMDAzMDcxODE2MDgwMloY"
-      + "DzIwMDMwNzI1MTYwODAyWjCCBU0wggVJBgorBgEEAbRoCAEBMYIFORaCBTU8UnVs"
-      + "ZSBSdWxlSWQ9IkZpbGUtUHJpdmlsZWdlLVJ1bGUiIEVmZmVjdD0iUGVybWl0Ij4K"
-      + "IDxUYXJnZXQ+CiAgPFN1YmplY3RzPgogICA8U3ViamVjdD4KICAgIDxTdWJqZWN0"
-      + "TWF0Y2ggTWF0Y2hJZD0idXJuOm9hc2lzOm5hbWVzOnRjOnhhY21sOjEuMDpmdW5j"
-      + "dGlvbjpzdHJpbmctZXF1YWwiPgogICAgIDxBdHRyaWJ1dGVWYWx1ZSBEYXRhVHlw"
-      + "ZT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS9YTUxTY2hlbWEjc3RyaW5nIj4KICAg"
-      + "ICAgIENOPU1hcmt1cyBMb3JjaDwvQXR0cmlidXRlVmFsdWU+CiAgICAgPFN1Ympl"
-      + "Y3RBdHRyaWJ1dGVEZXNpZ25hdG9yIEF0dHJpYnV0ZUlkPSJ1cm46b2FzaXM6bmFt"
-      + "ZXM6dGM6eGFjbWw6MS4wOnN1YmplY3Q6c3ViamVjdC1pZCIgRGF0YVR5cGU9Imh0"
-      + "dHA6Ly93d3cudzMub3JnLzIwMDEvWE1MU2NoZW1hI3N0cmluZyIgLz4gCiAgICA8"
-      + "L1N1YmplY3RNYXRjaD4KICAgPC9TdWJqZWN0PgogIDwvU3ViamVjdHM+CiAgPFJl"
-      + "c291cmNlcz4KICAgPFJlc291cmNlPgogICAgPFJlc291cmNlTWF0Y2ggTWF0Y2hJ"
-      + "ZD0idXJuOm9hc2lzOm5hbWVzOnRjOnhhY21sOjEuMDpmdW5jdGlvbjpzdHJpbmct"
-      + "ZXF1YWwiPgogICAgIDxBdHRyaWJ1dGVWYWx1ZSBEYXRhVHlwZT0iaHR0cDovL3d3"
-      + "dy53My5vcmcvMjAwMS9YTUxTY2hlbWEjYW55VVJJIj4KICAgICAgaHR0cDovL3p1"
-      + "bmkuY3MudnQuZWR1PC9BdHRyaWJ1dGVWYWx1ZT4KICAgICA8UmVzb3VyY2VBdHRy"
-      + "aWJ1dGVEZXNpZ25hdG9yIEF0dHJpYnV0ZUlkPSJ1cm46b2FzaXM6bmFtZXM6dGM6"
-      + "eGFjbWw6MS4wOnJlc291cmNlOnJlc291cmNlLWlkIiBEYXRhVHlwZT0iaHR0cDov"
-      + "L3d3dy53My5vcmcvMjAwMS9YTUxTY2hlbWEjYW55VVJJIiAvPiAKICAgIDwvUmVz"
-      + "b3VyY2VNYXRjaD4KICAgPC9SZXNvdXJjZT4KICA8L1Jlc291cmNlcz4KICA8QWN0"
-      + "aW9ucz4KICAgPEFjdGlvbj4KICAgIDxBY3Rpb25NYXRjaCBNYXRjaElkPSJ1cm46"
-      + "b2FzaXM6bmFtZXM6dGM6eGFjbWw6MS4wOmZ1bmN0aW9uOnN0cmluZy1lcXVhbCI+"
-      + "CiAgICAgPEF0dHJpYnV0ZVZhbHVlIERhdGFUeXBlPSJodHRwOi8vd3d3LnczLm9y"
-      + "Zy8yMDAxL1hNTFNjaGVtYSNzdHJpbmciPgpEZWxlZ2F0ZSBBY2Nlc3MgICAgIDwv"
-      + "QXR0cmlidXRlVmFsdWU+CgkgIDxBY3Rpb25BdHRyaWJ1dGVEZXNpZ25hdG9yIEF0"
-      + "dHJpYnV0ZUlkPSJ1cm46b2FzaXM6bmFtZXM6dGM6eGFjbWw6MS4wOmFjdGlvbjph"
-      + "Y3Rpb24taWQiIERhdGFUeXBlPSJodHRwOi8vd3d3LnczLm9yZy8yMDAxL1hNTFNj"
-      + "aGVtYSNzdHJpbmciIC8+IAogICAgPC9BY3Rpb25NYXRjaD4KICAgPC9BY3Rpb24+"
-      + "CiAgPC9BY3Rpb25zPgogPC9UYXJnZXQ+CjwvUnVsZT4KMA0GCSqGSIb3DQEBBAUA"
-      + "A4GBAGiJSM48XsY90HlYxGmGVSmNR6ZW2As+bot3KAfiCIkUIOAqhcphBS23egTr"
-      + "6asYwy151HshbPNYz+Cgeqs45KkVzh7bL/0e1r8sDVIaaGIkjHK3CqBABnfSayr3"
-      + "Rd1yBoDdEv8Qb+3eEPH6ab9021AsLEnJ6LWTmybbOpMNZ3tv");
-
-    public void performTest()
-        throws Exception
-    {
-        X509StreamParser parser = X509StreamParser.getInstance("Certificate", "BC");
-
-        parser.init(new ByteArrayInputStream(CertPathTest.rootCertBin));
-        X509Certificate rootCert = (X509Certificate)parser.read();
-
-        parser = X509StreamParser.getInstance("CRL", "BC");
-
-        parser.init(new ByteArrayInputStream(CertPathTest.rootCrlBin));
-
-
-        X509CRL rootCrl = (X509CRL)parser.read();
-
-        parser = X509StreamParser.getInstance("AttributeCertificate", "BC");
-
-        parser.init(new ByteArrayInputStream(attrCert));
-
-        X509AttributeCertificate aCert = (X509AttributeCertificate)parser.read();
-
-        ByteArrayOutputStream  bOut = new ByteArrayOutputStream();
-
-        bOut.write(CertPathTest.rootCertBin);
-        bOut.write(CertPathTest.interCertBin);
-        bOut.write(CertPathTest.finalCertBin);
-
-        parser = X509StreamParser.getInstance("Certificate", "BC");
-
-        parser.init(bOut.toByteArray());
-
-        Collection res = parser.readAll();
-
-        if (res.size() != 3)
-        {
-            fail("wrong number of certificates found");
-        }
-
-        bOut = new ByteArrayOutputStream();
-
-        bOut.write(CertPathTest.rootCrlBin);
-        bOut.write(CertPathTest.interCrlBin);
-
-        parser = X509StreamParser.getInstance("CRL", "BC");
-
-        parser.init(bOut.toByteArray());
-
-        res = parser.readAll();
-
-        if (res.size() != 2)
-        {
-            fail("wrong number of CRLs found");
-        }
-
-        bOut = new ByteArrayOutputStream();
-
-        bOut.write(attrCert);
-        bOut.write(attrCert);
-
-        parser = X509StreamParser.getInstance("AttributeCertificate", "BC");
-
-        parser.init(bOut.toByteArray());
-
-        res = parser.readAll();
-
-        if (res.size() != 2)
-        {
-            fail("wrong number of Attribute Certificates found");
-        }
-
-        //
-        // PEM tests
-        //
-        parser = X509StreamParser.getInstance("Certificate", "BC");
-
-        parser.init(PEMData.CERTIFICATE_1.getBytes("US-ASCII"));
-
-        res = parser.readAll();
-
-        if (res.size() != 1)
-        {
-            fail("wrong number of Certificates found");
-        }
-
-        parser = X509StreamParser.getInstance("Certificate", "BC");
-
-        parser.init(PEMData.CERTIFICATE_2.getBytes("US-ASCII"));
-
-        res = parser.readAll();
-
-        if (res.size() != 1)
-        {
-            fail("wrong number of Certificates found");
-        }
-
-        parser = X509StreamParser.getInstance("CRL", "BC");
-
-        parser.init(PEMData.CRL_1.getBytes("US-ASCII"));
-
-        res = parser.readAll();
-
-        if (res.size() != 1)
-        {
-            fail("wrong number of CRLs found");
-        }
-
-        parser = X509StreamParser.getInstance("CRL", "BC");
-
-        parser.init(PEMData.CRL_2.getBytes("US-ASCII"));
-
-        res = parser.readAll();
-
-        if (res.size() != 1)
-        {
-            fail("wrong number of CRLs found");
-        }
-
-        parser = X509StreamParser.getInstance("AttributeCertificate", "BC");
-
-        parser.init(PEMData.ATTRIBUTE_CERTIFICATE_1.getBytes("US-ASCII"));
-
-        res = parser.readAll();
-
-        if (res.size() != 1)
-        {
-            fail("wrong number of Attribute Certificates found");
-        }
-
-        parser = X509StreamParser.getInstance("AttributeCertificate", "BC");
-
-        parser.init(PEMData.ATTRIBUTE_CERTIFICATE_2.getBytes("US-ASCII"));
-
-        res = parser.readAll();
-
-        if (res.size() != 1)
-        {
-            fail("wrong number of Attribute Certificates found");
-        }
-
-        ASN1EncodableVector certs = new ASN1EncodableVector();
-
-        certs.add(new ASN1InputStream(CertPathTest.rootCertBin).readObject());
-        certs.add(new DERTaggedObject(false, 2, new ASN1InputStream(attrCert).readObject()));
-
-        ASN1EncodableVector crls = new ASN1EncodableVector();
-
-        crls.add(new ASN1InputStream(CertPathTest.rootCrlBin).readObject());
-
-        //
-        // cross certificate pairs
-        //
-        parser = X509StreamParser.getInstance("CertificatePair", "BC");
-
-        parser.init(new X509CertificatePair(rootCert, rootCert).getEncoded());
-
-        res = parser.readAll();
-
-        if (res.size() != 1)
-        {
-            fail("wrong number of CertificatePairs found");
-        }
-
-        //
-        // PKCS7
-        //
-        SignedData sigData = new SignedData(new DERSet(), new ContentInfo(CMSObjectIdentifiers.data, null), new DERSet(certs), new DERSet(crls), new DERSet());
-
-        ContentInfo info = new ContentInfo(CMSObjectIdentifiers.signedData, sigData);
-
-        parser = X509StreamParser.getInstance("Certificate", "BC");
-
-        parser.init(info.getEncoded());
-
-        res = parser.readAll();
-
-        if (res.size() != 1)
-        {
-            fail("wrong number of Certificates found");
-        }
-
-        parser = X509StreamParser.getInstance("CRL", "BC");
-
-        parser.init(info.getEncoded());
-
-        res = parser.readAll();
-
-        if (res.size() != 1)
-        {
-            fail("wrong number of CRLs found");
-        }
-
-        parser = X509StreamParser.getInstance("AttributeCertificate", "BC");
-
-        parser.init(info.getEncoded());
-
-        res = parser.readAll();
-
-        if (res.size() != 1)
-        {
-            fail("wrong number of Attribute Certificates found");
-        }
-
-        // data with no certificates or CRLs
-
-        sigData = new SignedData(new DERSet(), new ContentInfo(CMSObjectIdentifiers.data, null), new DERSet(), new DERSet(), new DERSet());
-
-        info = new ContentInfo(CMSObjectIdentifiers.signedData, sigData);
-
-        parser = X509StreamParser.getInstance("Certificate", "BC");
-
-        parser.init(info.getEncoded());
-
-        res = parser.readAll();
-
-        if (res.size() != 0)
-        {
-            fail("wrong number of Certificates found - expected 0");
-        }
-
-        parser = X509StreamParser.getInstance("CRL", "BC");
-
-        parser.init(info.getEncoded());
-
-        res = parser.readAll();
-
-        if (res.size() != 0)
-        {
-            fail("wrong number of CRLs found - expected 0");
-        }
-
-        parser = X509StreamParser.getInstance("AttributeCertificate", "BC");
-
-        parser.init(info.getEncoded());
-
-        res = parser.readAll();
-
-        if (res.size() != 0)
-        {
-            fail("wrong number of Attribute Certificates found - expected 0");
-        }
-
-        // data with absent certificates and CRLs
-        sigData = new SignedData(new DERSet(), new ContentInfo(CMSObjectIdentifiers.data, null), null, null, new DERSet());
-
-        info = new ContentInfo(CMSObjectIdentifiers.signedData, sigData);
-
-        parser = X509StreamParser.getInstance("Certificate", "BC");
-
-        parser.init(info.getEncoded());
-
-        res = parser.readAll();
-
-        if (res.size() != 0)
-        {
-            fail("wrong number of Certificates found - expected 0");
-        }
-
-        parser = X509StreamParser.getInstance("CRL", "BC");
-
-        parser.init(info.getEncoded());
-
-        res = parser.readAll();
-
-        if (res.size() != 0)
-        {
-            fail("wrong number of CRLs found - expected 0");
-        }
-
-        parser = X509StreamParser.getInstance("AttributeCertificate", "BC");
-
-        parser.init(info.getEncoded());
-
-        res = parser.readAll();
-
-        if (res.size() != 0)
-        {
-            fail("wrong number of Attribute Certificates found - expected 0");
-        }
-    }
-
-    public String getName()
-    {
-        return "X509StreamParser";
-    }
-
-    public static void main(String[] args)
-    {
-        Security.addProvider(new BouncyCastleProvider());
-
-        runTest(new X509StreamParserTest());
-    }
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/nist/NistCertPathReviewerTest.java b/bcprov/src/main/java/org/bouncycastle/jce/provider/test/nist/NistCertPathReviewerTest.java
deleted file mode 100644
index 1ee8ded..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/nist/NistCertPathReviewerTest.java
+++ /dev/null
@@ -1,713 +0,0 @@
-package org.bouncycastle.jce.provider.test.nist;
-
-import java.io.FileInputStream;
-import java.io.InputStream;
-import java.security.Security;
-import java.security.cert.CertPath;
-import java.security.cert.CertStore;
-import java.security.cert.CertificateFactory;
-import java.security.cert.CollectionCertStoreParameters;
-import java.security.cert.PKIXParameters;
-import java.security.cert.TrustAnchor;
-import java.security.cert.X509CRL;
-import java.security.cert.X509Certificate;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.GregorianCalendar;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Set;
-import java.util.TimeZone;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import org.bouncycastle.asn1.ASN1Encoding;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.x509.X509Extension;
-import org.bouncycastle.i18n.ErrorBundle;
-import org.bouncycastle.x509.PKIXCertPathReviewer;
-import org.bouncycastle.x509.extension.X509ExtensionUtil;
-
-/**
- * NIST CertPath test data for RFC 3280
- */
-public class NistCertPathReviewerTest
-    extends TestCase
-{
-    private static final String TEST_DATA_HOME = "bc.test.data.home";
-
-    private static final String GOOD_CA_CERT = "GoodCACert";
-
-    private static final String GOOD_CA_CRL = "GoodCACRL";
-
-    private static final String TRUST_ANCHOR_ROOT_CRL = "TrustAnchorRootCRL";
-
-    private static final String TRUST_ANCHOR_ROOT_CERTIFICATE = "TrustAnchorRootCertificate";
-
-    private static final char[] PKCS12_PASSWORD = "password".toCharArray();
-    
-    private static String NIST_TEST_POLICY_1 = "2.16.840.1.101.3.2.1.48.1";
-    private static String NIST_TEST_POLICY_2 = "2.16.840.1.101.3.2.1.48.2";
-    private static String NIST_TEST_POLICY_3 = "2.16.840.1.101.3.2.1.48.3";
-    
-    private static Map   certs = new HashMap();
-    private static Map   crls = new HashMap();
-    
-    private static Set   noPolicies = Collections.EMPTY_SET;
-    private static Set   nistTestPolicy1 = Collections.singleton(NIST_TEST_POLICY_1);
-    private static Set   nistTestPolicy2 = Collections.singleton(NIST_TEST_POLICY_2);
-    private static Set   nistTestPolicy3 = Collections.singleton(NIST_TEST_POLICY_3);
-    private static Set   nistTestPolicy1And2 = new HashSet(Arrays.asList(new String[] { NIST_TEST_POLICY_1, NIST_TEST_POLICY_2 }));
-        
-    public void testValidSignaturesTest1()
-        throws Exception
-    {
-        doAcceptingTest(TRUST_ANCHOR_ROOT_CERTIFICATE, 
-                new String[] { "ValidCertificatePathTest1EE", GOOD_CA_CERT}, 
-                new String[] { GOOD_CA_CRL, TRUST_ANCHOR_ROOT_CRL });
-    }
-    
-    public void testInvalidCASignatureTest2()
-        throws Exception
-    {
-        doErrorTest(TRUST_ANCHOR_ROOT_CERTIFICATE, 
-                new String[] { "ValidCertificatePathTest1EE", "BadSignedCACert" }, 
-                new String[] { "BadSignedCACRL", TRUST_ANCHOR_ROOT_CRL},
-                1,
-                "CertPathReviewer.signatureNotVerified",
-                "The certificate signature is invalid. A java.security.SignatureException occurred.");
-    }
-    
-    public void testInvalidEESignatureTest3()
-        throws Exception
-    {
-        doErrorTest(TRUST_ANCHOR_ROOT_CERTIFICATE, 
-            new String[] { GOOD_CA_CERT, "InvalidEESignatureTest3EE" }, 
-            new String[] { TRUST_ANCHOR_ROOT_CRL, GOOD_CA_CRL },
-            0,
-            "CertPathReviewer.signatureNotVerified",
-            "The certificate signature is invalid. A java.security.SignatureException occurred.");
-    }
-    
-    public void testValidDSASignaturesTest4()
-        throws Exception
-    {
-        doAcceptingTest(TRUST_ANCHOR_ROOT_CERTIFICATE, 
-                new String[] { "DSACACert", "ValidDSASignaturesTest4EE" }, 
-                new String[] { TRUST_ANCHOR_ROOT_CRL, "DSACACRL" });
-    }
-    /*
-    public void testValidDSAParameterInheritanceTest5()
-        throws Exception
-    {
-        doTest(TRUST_ANCHOR_ROOT_CERTIFICATE, 
-                new String[] { "DSACACert", "DSAParametersInheritedCACert", "ValidDSAParameterInheritanceTest5EE" }, 
-                new String[] { TRUST_ANCHOR_ROOT_CRL, "DSACACRL", "DSAParametersInheritedCACRL" });
-    }
-    */
-    public void testInvalidDSASignaturesTest6()
-        throws Exception
-    {
-        doErrorTest(TRUST_ANCHOR_ROOT_CERTIFICATE, 
-                new String[] { "DSACACert", "InvalidDSASignatureTest6EE" }, 
-                new String[] { TRUST_ANCHOR_ROOT_CRL, "DSACACRL" },
-                0,
-                "CertPathReviewer.signatureNotVerified",
-                "The certificate signature is invalid. A java.security.SignatureException occurred.");
-    }
-    
-    public void testCANotBeforeDateTest1()
-        throws Exception
-    {
-        doErrorTest(TRUST_ANCHOR_ROOT_CERTIFICATE, 
-                new String[] { "BadnotBeforeDateCACert", "InvalidCAnotBeforeDateTest1EE" }, 
-                new String[] { TRUST_ANCHOR_ROOT_CRL, "BadnotBeforeDateCACRL" },
-                1,
-                "CertPathReviewer.certificateNotYetValid",
-                "Could not validate the certificate. Certificate is not valid until Jan 1, 2047 12:01:00 PM GMT.");
-    }
-    
-    public void testInvalidEENotBeforeDateTest2()
-        throws Exception
-    {
-        doErrorTest(TRUST_ANCHOR_ROOT_CERTIFICATE, 
-                new String[] { GOOD_CA_CERT, "InvalidEEnotBeforeDateTest2EE" }, 
-                new String[] { TRUST_ANCHOR_ROOT_CRL, GOOD_CA_CRL },
-                0,
-                "CertPathReviewer.certificateNotYetValid",
-                "Could not validate the certificate. Certificate is not valid until Jan 1, 2047 12:01:00 PM GMT.");
-    }
-    
-    public void testValidPre2000UTCNotBeforeDateTest3()
-        throws Exception
-    {
-        doAcceptingTest(TRUST_ANCHOR_ROOT_CERTIFICATE, 
-                new String[] { GOOD_CA_CERT, "Validpre2000UTCnotBeforeDateTest3EE" }, 
-                new String[] { TRUST_ANCHOR_ROOT_CRL, GOOD_CA_CRL });
-    }
-    
-    public void testValidGeneralizedTimeNotBeforeDateTest4()
-        throws Exception
-    {
-        doAcceptingTest(TRUST_ANCHOR_ROOT_CERTIFICATE, 
-                new String[] { GOOD_CA_CERT, "ValidGeneralizedTimenotBeforeDateTest4EE" }, 
-                new String[] { TRUST_ANCHOR_ROOT_CRL, GOOD_CA_CRL });
-    }
-    
-    public void testInvalidCANotAfterDateTest5()
-        throws Exception
-    {
-        doErrorTest(TRUST_ANCHOR_ROOT_CERTIFICATE, 
-                new String[] { "BadnotAfterDateCACert", "InvalidCAnotAfterDateTest5EE" }, 
-                new String[] { TRUST_ANCHOR_ROOT_CRL, "BadnotAfterDateCACRL" },
-                1,
-                "CertPathReviewer.certificateExpired",
-                "Could not validate the certificate. Certificate expired on Jan 1, 2002 12:01:00 PM GMT.");
-    }
-    
-    public void testInvalidEENotAfterDateTest6()
-        throws Exception
-    {
-        doErrorTest(TRUST_ANCHOR_ROOT_CERTIFICATE, 
-                new String[] { GOOD_CA_CERT, "InvalidEEnotAfterDateTest6EE" }, 
-                new String[] { TRUST_ANCHOR_ROOT_CRL, GOOD_CA_CRL },
-                0,
-                "CertPathReviewer.certificateExpired",
-                "Could not validate the certificate. Certificate expired on Jan 1, 2002 12:01:00 PM GMT.");
-    }
-    
-    public void testInvalidValidPre2000UTCNotAfterDateTest7()
-        throws Exception
-    {
-        doErrorTest(TRUST_ANCHOR_ROOT_CERTIFICATE, 
-                new String[] { GOOD_CA_CERT, "Invalidpre2000UTCEEnotAfterDateTest7EE" }, 
-                new String[] { TRUST_ANCHOR_ROOT_CRL, GOOD_CA_CRL },
-                0,
-                "CertPathReviewer.certificateExpired",
-                "Could not validate the certificate. Certificate expired on Jan 1, 1999 12:01:00 PM GMT.");
-    }
-    
-    public void testInvalidNegativeSerialNumberTest15()
-        throws Exception
-    {
-        doErrorTest(TRUST_ANCHOR_ROOT_CERTIFICATE, 
-                new String[] { "NegativeSerialNumberCACert", "InvalidNegativeSerialNumberTest15EE" }, 
-                new String[] { TRUST_ANCHOR_ROOT_CRL, "NegativeSerialNumberCACRL" },
-                0,
-                "CertPathReviewer.certRevoked",
-                "The certificate was revoked at Apr 19, 2001 2:57:20 PM GMT. Reason: Key Compromise.");
-    }
-    
-    //
-    // 4.8 Certificate Policies
-    //
-    public void testAllCertificatesSamePolicyTest1()
-        throws Exception
-    {
-        String[] certList = new String[] { GOOD_CA_CERT, "ValidCertificatePathTest1EE" };
-        String[] crlList = new String[] { TRUST_ANCHOR_ROOT_CRL, GOOD_CA_CRL };
-        
-        doAcceptingTest(TRUST_ANCHOR_ROOT_CERTIFICATE, 
-                certList, 
-                crlList,
-                noPolicies); 
-        
-        doAcceptingTest(TRUST_ANCHOR_ROOT_CERTIFICATE, 
-                certList, 
-                crlList,
-                nistTestPolicy1);
-        
-        doErrorTest(TRUST_ANCHOR_ROOT_CERTIFICATE, 
-                certList, 
-                crlList,
-                nistTestPolicy2,
-                -1,
-                "CertPathReviewer.invalidPolicy",
-                "Path processing failed on policy.");
-        
-        doAcceptingTest(TRUST_ANCHOR_ROOT_CERTIFICATE, 
-                certList, 
-                crlList,
-                nistTestPolicy1And2);
-    }
-    
-    public void testAllCertificatesNoPoliciesTest2()
-        throws Exception
-    {
-        doAcceptingTest(TRUST_ANCHOR_ROOT_CERTIFICATE, 
-                new String[] { "NoPoliciesCACert", "AllCertificatesNoPoliciesTest2EE" }, 
-                new String[] { TRUST_ANCHOR_ROOT_CRL, "NoPoliciesCACRL" });
-        
-        doErrorTest(TRUST_ANCHOR_ROOT_CERTIFICATE, 
-                new String[] { "NoPoliciesCACert", "AllCertificatesNoPoliciesTest2EE" }, 
-                new String[] { TRUST_ANCHOR_ROOT_CRL, "NoPoliciesCACRL" },
-                noPolicies,
-                -1,
-                "CertPathReviewer.noValidPolicyTree",
-                "Policy checking failed: no valid policy tree found when one expected.");
-    }
-    
-    public void testDifferentPoliciesTest3()
-        throws Exception
-    {
-        doAcceptingTest(TRUST_ANCHOR_ROOT_CERTIFICATE, 
-                new String[] { GOOD_CA_CERT, "PoliciesP2subCACert", "DifferentPoliciesTest3EE" }, 
-                new String[] { TRUST_ANCHOR_ROOT_CRL, GOOD_CA_CRL, "PoliciesP2subCACRL" });
-        
-        doErrorTest(TRUST_ANCHOR_ROOT_CERTIFICATE, 
-                new String[] { GOOD_CA_CERT, "PoliciesP2subCACert", "DifferentPoliciesTest3EE" }, 
-                new String[] { TRUST_ANCHOR_ROOT_CRL, GOOD_CA_CRL, "PoliciesP2subCACRL" },
-                noPolicies,
-                -1,
-                "CertPathReviewer.noValidPolicyTree",
-                "Policy checking failed: no valid policy tree found when one expected.");
-        
-        doErrorTest(TRUST_ANCHOR_ROOT_CERTIFICATE, 
-                new String[] { GOOD_CA_CERT, "PoliciesP2subCACert", "DifferentPoliciesTest3EE" }, 
-                new String[] { TRUST_ANCHOR_ROOT_CRL, GOOD_CA_CRL, "PoliciesP2subCACRL" },
-                nistTestPolicy1And2,
-                -1,
-                "CertPathReviewer.noValidPolicyTree",
-                "Policy checking failed: no valid policy tree found when one expected.");
-    }
-    
-    public void testDifferentPoliciesTest4()
-        throws Exception
-    {
-        doErrorTest(TRUST_ANCHOR_ROOT_CERTIFICATE, 
-                new String[] { GOOD_CA_CERT, "GoodsubCACert", "DifferentPoliciesTest4EE" }, 
-                new String[] { TRUST_ANCHOR_ROOT_CRL, GOOD_CA_CRL, "GoodsubCACRL" },
-                -1,
-                "CertPathReviewer.noValidPolicyTree",
-                "Policy checking failed: no valid policy tree found when one expected."); 
-    }
-    
-    public void testDifferentPoliciesTest5()
-        throws Exception
-    {
-        doErrorTest(TRUST_ANCHOR_ROOT_CERTIFICATE, 
-                new String[] { GOOD_CA_CERT, "PoliciesP2subCA2Cert", "DifferentPoliciesTest5EE" }, 
-                new String[] { TRUST_ANCHOR_ROOT_CRL, GOOD_CA_CRL, "PoliciesP2subCA2CRL" },
-                -1,
-                "CertPathReviewer.noValidPolicyTree",
-                "Policy checking failed: no valid policy tree found when one expected."); 
-    }
-    
-    public void testOverlappingPoliciesTest6()
-        throws Exception
-    {
-        String[] certList = new String[] { "PoliciesP1234CACert", "PoliciesP1234subCAP123Cert", "PoliciesP1234subsubCAP123P12Cert", "OverlappingPoliciesTest6EE" };
-        String[] crlList = new String[] { TRUST_ANCHOR_ROOT_CRL, "PoliciesP1234CACRL", "PoliciesP1234subCAP123CRL", "PoliciesP1234subsubCAP123P12CRL" };
-        
-        doAcceptingTest(TRUST_ANCHOR_ROOT_CERTIFICATE, certList, crlList);
-        
-        doAcceptingTest(TRUST_ANCHOR_ROOT_CERTIFICATE, certList, crlList, nistTestPolicy1);
-        
-        doErrorTest(TRUST_ANCHOR_ROOT_CERTIFICATE, certList, crlList, nistTestPolicy2,
-                -1,
-                "CertPathReviewer.invalidPolicy",
-                "Path processing failed on policy.");
-    }
-    
-    public void testDifferentPoliciesTest7()
-        throws Exception
-    {
-        String[] certList = new String[] { "PoliciesP123CACert", "PoliciesP123subCAP12Cert", "PoliciesP123subsubCAP12P1Cert", "DifferentPoliciesTest7EE" };
-        String[] crlList = new String[] { TRUST_ANCHOR_ROOT_CRL, "PoliciesP123CACRL", "PoliciesP123subCAP12CRL", "PoliciesP123subsubCAP12P1CRL" };
-        
-        doErrorTest(TRUST_ANCHOR_ROOT_CERTIFICATE, certList, crlList,
-                -1,
-                "CertPathReviewer.noValidPolicyTree",
-                "Policy checking failed: no valid policy tree found when one expected."); 
-    }
-    
-    public void testDifferentPoliciesTest8()
-        throws Exception
-    {
-        String[] certList = new String[] { "PoliciesP12CACert", "PoliciesP12subCAP1Cert", "PoliciesP12subsubCAP1P2Cert", "DifferentPoliciesTest8EE" };
-        String[] crlList = new String[] { TRUST_ANCHOR_ROOT_CRL, "PoliciesP12CACRL", "PoliciesP12subCAP1CRL", "PoliciesP12subsubCAP1P2CRL" };
-        
-        doErrorTest(TRUST_ANCHOR_ROOT_CERTIFICATE, certList, crlList,
-                -1,
-                "CertPathReviewer.noValidPolicyTree",
-                "Policy checking failed: no valid policy tree found when one expected.");
-    }
-    
-    public void testDifferentPoliciesTest9()
-        throws Exception
-    {
-        String[] certList = new String[] { "PoliciesP123CACert", "PoliciesP123subCAP12Cert", "PoliciesP123subsubCAP12P2Cert", "PoliciesP123subsubsubCAP12P2P1Cert", "DifferentPoliciesTest9EE" };
-        String[] crlList = new String[] { TRUST_ANCHOR_ROOT_CRL, "PoliciesP123CACRL", "PoliciesP123subCAP12CRL", "PoliciesP123subsubCAP2P2CRL", "PoliciesP123subsubsubCAP12P2P1CRL" };
-        
-        doErrorTest(TRUST_ANCHOR_ROOT_CERTIFICATE, certList, crlList,
-                -1,
-                "CertPathReviewer.noValidPolicyTree",
-                "Policy checking failed: no valid policy tree found when one expected.");
-    }
-    
-    public void testAllCertificatesSamePoliciesTest10()
-        throws Exception
-    {
-        String[] certList = new String[] { "PoliciesP12CACert", "AllCertificatesSamePoliciesTest10EE" };
-        String[] crlList = new String[] { TRUST_ANCHOR_ROOT_CRL, "PoliciesP12CACRL" };
-        
-        doAcceptingTest(TRUST_ANCHOR_ROOT_CERTIFICATE, certList, crlList);
-        doAcceptingTest(TRUST_ANCHOR_ROOT_CERTIFICATE, certList, crlList, nistTestPolicy1);
-        doAcceptingTest(TRUST_ANCHOR_ROOT_CERTIFICATE, certList, crlList, nistTestPolicy2);
-    }
-    
-    public void testAllCertificatesAnyPolicyTest11()
-        throws Exception
-    {
-        String[] certList = new String[] { "anyPolicyCACert", "AllCertificatesanyPolicyTest11EE" };
-        String[] crlList = new String[] { TRUST_ANCHOR_ROOT_CRL, "anyPolicyCACRL" };
-        
-        doAcceptingTest(TRUST_ANCHOR_ROOT_CERTIFICATE, certList, crlList);
-
-        doAcceptingTest(TRUST_ANCHOR_ROOT_CERTIFICATE, certList, crlList, nistTestPolicy1);
-    }
-    
-    public void testDifferentPoliciesTest12()
-        throws Exception
-    {
-        String[] certList = new String[] { "PoliciesP3CACert", "DifferentPoliciesTest12EE" };
-        String[] crlList = new String[] { TRUST_ANCHOR_ROOT_CRL, "PoliciesP3CACRL" };
-        
-        doErrorTest(TRUST_ANCHOR_ROOT_CERTIFICATE, certList, crlList,
-                -1,
-                "CertPathReviewer.noValidPolicyTree",
-                "Policy checking failed: no valid policy tree found when one expected.");
-    }
-    
-    public void testAllCertificatesSamePoliciesTest13()
-        throws Exception
-    {
-        String[] certList = new String[] { "PoliciesP123CACert", "AllCertificatesSamePoliciesTest13EE" };
-        String[] crlList = new String[] { TRUST_ANCHOR_ROOT_CRL, "PoliciesP123CACRL" };
-        
-        doAcceptingTest(TRUST_ANCHOR_ROOT_CERTIFICATE, certList, crlList, nistTestPolicy1);
-        doAcceptingTest(TRUST_ANCHOR_ROOT_CERTIFICATE, certList, crlList, nistTestPolicy2);
-        doAcceptingTest(TRUST_ANCHOR_ROOT_CERTIFICATE, certList, crlList, nistTestPolicy3);
-    }
-    
-    public void testAnyPolicyTest14()
-        throws Exception
-    {
-        String[] certList = new String[] { "anyPolicyCACert", "AnyPolicyTest14EE" };
-        String[] crlList = new String[] { TRUST_ANCHOR_ROOT_CRL, "anyPolicyCACRL" };
-        
-        doAcceptingTest(TRUST_ANCHOR_ROOT_CERTIFICATE, certList, crlList, nistTestPolicy1);
-        doErrorTest(TRUST_ANCHOR_ROOT_CERTIFICATE, certList, crlList, nistTestPolicy2,
-                -1,
-                "CertPathReviewer.invalidPolicy",
-                "Path processing failed on policy.");
-    }
-    
-    public void testUserNoticeQualifierTest15()
-        throws Exception
-    {
-        String[] certList = new String[] { "UserNoticeQualifierTest15EE" };
-        String[] crlList = new String[] { TRUST_ANCHOR_ROOT_CRL };
-        
-        doAcceptingTest(TRUST_ANCHOR_ROOT_CERTIFICATE, certList, crlList);
-        doAcceptingTest(TRUST_ANCHOR_ROOT_CERTIFICATE, certList, crlList, nistTestPolicy1);
-        doErrorTest(TRUST_ANCHOR_ROOT_CERTIFICATE, certList, crlList, nistTestPolicy2,
-                -1,
-                "CertPathReviewer.invalidPolicy",
-                "Path processing failed on policy.");
-    }
-    
-    public void testUserNoticeQualifierTest16()
-        throws Exception
-    {
-        String[] certList = new String[] { GOOD_CA_CERT, "UserNoticeQualifierTest16EE" };
-        String[] crlList = new String[] { TRUST_ANCHOR_ROOT_CRL, GOOD_CA_CRL };
-        
-        doAcceptingTest(TRUST_ANCHOR_ROOT_CERTIFICATE, certList, crlList);
-        
-        doAcceptingTest(TRUST_ANCHOR_ROOT_CERTIFICATE, certList, crlList, nistTestPolicy1);
-        
-        doErrorTest(TRUST_ANCHOR_ROOT_CERTIFICATE, certList, crlList, nistTestPolicy2,
-                -1,
-                "CertPathReviewer.invalidPolicy",
-                "Path processing failed on policy.");
-    }
-    
-    public void testUserNoticeQualifierTest17()
-        throws Exception
-    {
-        String[] certList = new String[] { GOOD_CA_CERT, "UserNoticeQualifierTest17EE" };
-        String[] crlList = new String[] { TRUST_ANCHOR_ROOT_CRL, GOOD_CA_CRL };
-        
-        doAcceptingTest(TRUST_ANCHOR_ROOT_CERTIFICATE, certList, crlList);
-        doAcceptingTest(TRUST_ANCHOR_ROOT_CERTIFICATE, certList, crlList, nistTestPolicy1);
-        doErrorTest(TRUST_ANCHOR_ROOT_CERTIFICATE, certList, crlList, nistTestPolicy2,
-                -1,
-                "CertPathReviewer.invalidPolicy",
-                "Path processing failed on policy.");
-    }
-    
-    public void testUserNoticeQualifierTest18()
-        throws Exception
-    {
-        String[] certList = new String[] { "PoliciesP12CACert", "UserNoticeQualifierTest18EE" };
-        String[] crlList = new String[] { TRUST_ANCHOR_ROOT_CRL, "PoliciesP12CACRL" };
-        
-        doAcceptingTest(TRUST_ANCHOR_ROOT_CERTIFICATE, certList, crlList, nistTestPolicy1);
-        doAcceptingTest(TRUST_ANCHOR_ROOT_CERTIFICATE, certList, crlList, nistTestPolicy2);
-    }
-    
-    public void testUserNoticeQualifierTest19()
-        throws Exception
-    {
-        String[] certList = new String[] { "UserNoticeQualifierTest19EE" };
-        String[] crlList = new String[] { TRUST_ANCHOR_ROOT_CRL };
-        
-        doAcceptingTest(TRUST_ANCHOR_ROOT_CERTIFICATE, certList, crlList, nistTestPolicy1);
-        doErrorTest(TRUST_ANCHOR_ROOT_CERTIFICATE, certList, crlList, nistTestPolicy2,
-                -1,
-                "CertPathReviewer.invalidPolicy",
-                "Path processing failed on policy.");
-    }
-    
-    private void doAcceptingTest(
-        String      trustAnchor,
-        String[]    certs,
-        String[]    crls)
-        throws Exception
-    {
-        PKIXCertPathReviewer result = doTest(trustAnchor,certs,crls);
-        if (!result.isValidCertPath())
-        {
-            fail("path rejected when should be accepted");
-        }
-    }
-    
-    private void doAcceptingTest(
-        String      trustAnchor,
-        String[]    certs,
-        String[]    crls,
-        Set         policies)
-        throws Exception
-    {
-        PKIXCertPathReviewer result = doTest(trustAnchor,certs,crls,policies);
-        if (!result.isValidCertPath())
-        {
-            fail("path rejected when should be accepted");
-        }
-    }
-    
-    private void doErrorTest(
-        String      trustAnchor,
-        String[]    certs,
-        String[]    crls,
-        int         index,
-        String      messageId,
-        String      message)
-        throws Exception
-    {
-        PKIXCertPathReviewer result = doTest(trustAnchor, certs, crls);
-        if (result.isValidCertPath()) 
-        {
-            fail("path accepted when should be rejected");
-        }
-        else
-        {
-            ErrorBundle msg = (ErrorBundle) result.getErrors(index).iterator().next();
-            assertEquals(messageId,msg.getId());
-            assertEquals(message,msg.getText(Locale.ENGLISH,TimeZone.getTimeZone("GMT")));
-        }
-    }
-    
-    private void doErrorTest(
-        String      trustAnchor,
-        String[]    certs,
-        String[]    crls,
-        Set         policies,
-        int         index,
-        String      messageId,
-        String      message)
-        throws Exception
-    {
-        PKIXCertPathReviewer result = doTest(trustAnchor, certs, crls, policies);
-        if (result.isValidCertPath()) 
-        {
-            fail("path accepted when should be rejected");
-        }
-        else
-        {
-            ErrorBundle msg = (ErrorBundle) result.getErrors(index).iterator().next();
-            assertEquals(messageId,msg.getId());
-            assertEquals(message,msg.getText(Locale.ENGLISH,TimeZone.getTimeZone("GMT")));
-        }
-    }
-    
-    private PKIXCertPathReviewer doTest(
-        String      trustAnchor,
-        String[]    certs,
-        String[]    crls)
-        throws Exception
-    {
-        return doTest(trustAnchor, certs, crls, null);
-    }
-    
-    private PKIXCertPathReviewer doTest(
-        String      trustAnchor,
-        String[]    certs,
-        String[]    crls,
-        Set         policies)
-        throws Exception
-    {
-        Set  trustedSet = Collections.singleton(getTrustAnchor(trustAnchor));
-        List certsAndCrls = new ArrayList();
-        X509Certificate endCert = loadCert(certs[certs.length - 1]);
-        
-        for (int i = 0; i != certs.length - 1; i++)
-        {
-            certsAndCrls.add(loadCert(certs[i]));
-        }
-        
-        certsAndCrls.add(endCert);
-    
-        CertPath certPath = CertificateFactory.getInstance("X.509","BC").generateCertPath(certsAndCrls);
-    
-        for (int i = 0; i != crls.length; i++)
-        {
-            certsAndCrls.add(loadCrl(crls[i]));
-        }
-    
-        CertStore  store = CertStore.getInstance("Collection", new CollectionCertStoreParameters(certsAndCrls), "BC");
-        
-        //CertPathValidator validator = CertPathValidator.getInstance("PKIX","BC");
-        PKIXCertPathReviewer reviewer;
-        PKIXParameters    params = new PKIXParameters(trustedSet);
-        
-        params.addCertStore(store);
-        params.setRevocationEnabled(true);
-        params.setDate(new GregorianCalendar(2010, 1, 1).getTime());
-
-        if (policies != null)
-        {
-            params.setExplicitPolicyRequired(true);
-            params.setInitialPolicies(policies);
-        }
-        
-        reviewer = new PKIXCertPathReviewer(certPath,params);
-        
-        return reviewer;
-    }
-
-    private X509Certificate loadCert(
-        String certName)
-    {
-        X509Certificate cert = (X509Certificate)certs.get(certName);
-        
-        if (cert != null)
-        {
-            return cert;
-        }
-        
-        try
-        {
-            InputStream in = new FileInputStream(getPkitsHome() + "/certs/" + certName + ".crt");
-            
-            CertificateFactory fact = CertificateFactory.getInstance("X.509", "BC");
-            
-            cert = (X509Certificate)fact.generateCertificate(in);
-    
-            certs.put(certName, cert);
-            
-            return cert;
-        }
-        catch (Exception e)
-        {
-            throw new IllegalStateException("exception loading certificate " + certName + ": " + e);
-        }
-    }
-    
-    private X509CRL loadCrl(
-        String crlName)
-        throws Exception
-    {
-        X509CRL crl = (X509CRL)certs.get(crlName);
-        
-        if (crl != null)
-        {
-            return crl;
-        }
-        
-        try
-        {
-            InputStream in = new FileInputStream(getPkitsHome() + "/crls/" + crlName + ".crl");
-            
-            CertificateFactory fact = CertificateFactory.getInstance("X.509", "BC");
-            
-            crl = (X509CRL)fact.generateCRL(in);
-            
-            crls.put(crlName, crl);
-            
-            return crl;
-        }
-        catch (Exception e)
-        {
-            throw new IllegalStateException("exception loading CRL: " + crlName);
-        }
-    }
-
-    private TrustAnchor getTrustAnchor(String trustAnchorName)
-        throws Exception
-    {
-        X509Certificate cert = loadCert(trustAnchorName);
-        byte[]          extBytes = cert.getExtensionValue(X509Extension.nameConstraints.getId());
-        
-        if (extBytes != null)
-        {
-            ASN1Primitive extValue = X509ExtensionUtil.fromExtensionValue(extBytes);
-            
-            return new TrustAnchor(cert, extValue.getEncoded(ASN1Encoding.DER));
-        }
-        
-        return new TrustAnchor(cert, null);
-    }
-    
-    private String getPkitsHome()
-    {
-        String dataHome = System.getProperty(TEST_DATA_HOME);
-        
-        if (dataHome == null)
-        {
-            throw new IllegalStateException(TEST_DATA_HOME + " property not set");
-        }
-        
-        return dataHome + "/PKITS";
-    }
-    
-    public static void main (String[] args) 
-        throws Exception
-    {   
-        junit.textui.TestRunner.run(suite());
-    }
-    
-    public void setUp()
-    {
-        if (Security.getProvider("BC") == null)
-        {
-            Security.addProvider(new org.bouncycastle.jce.provider.BouncyCastleProvider());
-        }
-    }
-    
-    public static Test suite() 
-        throws Exception
-    {   
-        TestSuite suite = new TestSuite("NIST CertPath Tests");
-        
-        suite.addTestSuite(NistCertPathReviewerTest.class);
-        
-        return suite;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/nist/NistCertPathTest.java b/bcprov/src/main/java/org/bouncycastle/jce/provider/test/nist/NistCertPathTest.java
deleted file mode 100644
index af94e4e..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/nist/NistCertPathTest.java
+++ /dev/null
@@ -1,873 +0,0 @@
-package org.bouncycastle.jce.provider.test.nist;
-
-import java.io.FileInputStream;
-import java.io.InputStream;
-import java.security.Security;
-import java.security.cert.CertPath;
-import java.security.cert.CertPathBuilder;
-import java.security.cert.CertPathBuilderException;
-import java.security.cert.CertPathValidator;
-import java.security.cert.CertPathValidatorException;
-import java.security.cert.CertStore;
-import java.security.cert.CertificateFactory;
-import java.security.cert.CollectionCertStoreParameters;
-import java.security.cert.PKIXBuilderParameters;
-import java.security.cert.PKIXCertPathBuilderResult;
-import java.security.cert.PKIXCertPathValidatorResult;
-import java.security.cert.PKIXParameters;
-import java.security.cert.TrustAnchor;
-import java.security.cert.X509CRL;
-import java.security.cert.X509CertSelector;
-import java.security.cert.X509Certificate;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.GregorianCalendar;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1Encoding;
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.x509.Extension;
-
-/**
- * NIST CertPath test data for RFC 3280
- */
-public class NistCertPathTest
-    extends TestCase
-{
-    private static final String TEST_DATA_HOME = "bc.test.data.home";
-
-    private static final String GOOD_CA_CERT = "GoodCACert";
-
-    private static final String GOOD_CA_CRL = "GoodCACRL";
-
-    private static final String TRUST_ANCHOR_ROOT_CRL = "TrustAnchorRootCRL";
-
-    private static final String TRUST_ANCHOR_ROOT_CERTIFICATE = "TrustAnchorRootCertificate";
-
-    private static final char[] PKCS12_PASSWORD = "password".toCharArray();
-
-    private static final String ANY_POLICY = "2.5.29.32.0";
-    private static final String NIST_TEST_POLICY_1 = "2.16.840.1.101.3.2.1.48.1";
-    private static final String NIST_TEST_POLICY_2 = "2.16.840.1.101.3.2.1.48.2";
-    private static final String NIST_TEST_POLICY_3 = "2.16.840.1.101.3.2.1.48.3";
-    
-    private static Map   certs = new HashMap();
-    private static Map   crls = new HashMap();
-    
-    private static Set   noPolicies = Collections.EMPTY_SET;
-    private static Set   anyPolicy = Collections.singleton(ANY_POLICY);
-    private static Set   nistTestPolicy1 = Collections.singleton(NIST_TEST_POLICY_1);
-    private static Set   nistTestPolicy2 = Collections.singleton(NIST_TEST_POLICY_2);
-    private static Set   nistTestPolicy3 = Collections.singleton(NIST_TEST_POLICY_3);
-    private static Set   nistTestPolicy1And2 = new HashSet(Arrays.asList(new String[] { NIST_TEST_POLICY_1, NIST_TEST_POLICY_2 }));
-    
-    public void setUp()
-    {
-        if (Security.getProvider("BC") == null)
-        {
-            Security.addProvider(new org.bouncycastle.jce.provider.BouncyCastleProvider());
-        }
-    }
-
-    public void testValidSignaturesTest1()
-        throws Exception
-    {
-        doTest(TRUST_ANCHOR_ROOT_CERTIFICATE, 
-                new String[] { "ValidCertificatePathTest1EE", GOOD_CA_CERT}, 
-                new String[] { GOOD_CA_CRL, TRUST_ANCHOR_ROOT_CRL });
-    }
-    
-    public void testInvalidCASignatureTest2()
-        throws Exception
-    {
-        doExceptionTest(TRUST_ANCHOR_ROOT_CERTIFICATE, 
-                new String[] { "ValidCertificatePathTest1EE", "BadSignedCACert" }, 
-                new String[] { "BadSignedCACRL", TRUST_ANCHOR_ROOT_CRL},
-                1,
-                "TrustAnchor found but certificate validation failed.");
-    }
-    
-    public void testInvalidEESignatureTest3()
-        throws Exception
-    {
-        doExceptionTest(TRUST_ANCHOR_ROOT_CERTIFICATE, 
-            new String[] { GOOD_CA_CERT, "InvalidEESignatureTest3EE" }, 
-            new String[] { TRUST_ANCHOR_ROOT_CRL, GOOD_CA_CRL },
-            0,
-            "Could not validate certificate signature.");
-    }
-    
-    public void testValidDSASignaturesTest4()
-        throws Exception
-    {
-        doTest(TRUST_ANCHOR_ROOT_CERTIFICATE, 
-                new String[] { "DSACACert", "ValidDSASignaturesTest4EE" }, 
-                new String[] { TRUST_ANCHOR_ROOT_CRL, "DSACACRL" });
-    }
-
-    // 4.1.5
-    public void testValidDSAParameterInheritanceTest5()
-        throws Exception
-    {
-        doTest(TRUST_ANCHOR_ROOT_CERTIFICATE, 
-                new String[] { "DSACACert", "DSAParametersInheritedCACert", "ValidDSAParameterInheritanceTest5EE" }, 
-                new String[] { TRUST_ANCHOR_ROOT_CRL, "DSACACRL", "DSAParametersInheritedCACRL" });
-    }
-
-    public void testInvalidDSASignaturesTest6()
-        throws Exception
-    {
-        doExceptionTest(TRUST_ANCHOR_ROOT_CERTIFICATE, 
-                new String[] { "DSACACert", "InvalidDSASignatureTest6EE" }, 
-                new String[] { TRUST_ANCHOR_ROOT_CRL, "DSACACRL" },
-                0,
-                "Could not validate certificate signature.");
-    }
-    
-    public void testCANotBeforeDateTest1()
-        throws Exception
-    {
-        doExceptionTest(TRUST_ANCHOR_ROOT_CERTIFICATE, 
-                new String[] { "BadnotBeforeDateCACert", "InvalidCAnotBeforeDateTest1EE" }, 
-                new String[] { TRUST_ANCHOR_ROOT_CRL, "BadnotBeforeDateCACRL" },
-                1,
-                "Could not validate certificate: certificate not valid till 20470101120100GMT+00:00");
-    }
-    
-    public void testInvalidEENotBeforeDateTest2()
-        throws Exception
-    {
-        doExceptionTest(TRUST_ANCHOR_ROOT_CERTIFICATE, 
-                new String[] { GOOD_CA_CERT, "InvalidEEnotBeforeDateTest2EE" }, 
-                new String[] { TRUST_ANCHOR_ROOT_CRL, GOOD_CA_CRL },
-                0,
-                "Could not validate certificate: certificate not valid till 20470101120100GMT+00:00");
-    }
-    
-    public void testValidPre2000UTCNotBeforeDateTest3()
-        throws Exception
-    {
-        doTest(TRUST_ANCHOR_ROOT_CERTIFICATE, 
-                new String[] { GOOD_CA_CERT, "Validpre2000UTCnotBeforeDateTest3EE" }, 
-                new String[] { TRUST_ANCHOR_ROOT_CRL, GOOD_CA_CRL });
-    }
-    
-    public void testValidGeneralizedTimeNotBeforeDateTest4()
-        throws Exception
-    {
-        doTest(TRUST_ANCHOR_ROOT_CERTIFICATE, 
-                new String[] { GOOD_CA_CERT, "ValidGeneralizedTimenotBeforeDateTest4EE" }, 
-                new String[] { TRUST_ANCHOR_ROOT_CRL, GOOD_CA_CRL });
-    }
-    
-    public void testInvalidCANotAfterDateTest5()
-        throws Exception
-    {
-        doExceptionTest(TRUST_ANCHOR_ROOT_CERTIFICATE, 
-                new String[] { "BadnotAfterDateCACert", "InvalidCAnotAfterDateTest5EE" }, 
-                new String[] { TRUST_ANCHOR_ROOT_CRL, "BadnotAfterDateCACRL" },
-                1,
-                "Could not validate certificate: certificate expired on 20020101120100GMT+00:00");
-    }
-    
-    public void testInvalidEENotAfterDateTest6()
-        throws Exception
-    {
-        doExceptionTest(TRUST_ANCHOR_ROOT_CERTIFICATE, 
-                new String[] { GOOD_CA_CERT, "InvalidEEnotAfterDateTest6EE" }, 
-                new String[] { TRUST_ANCHOR_ROOT_CRL, GOOD_CA_CRL },
-                0,
-                "Could not validate certificate: certificate expired on 20020101120100GMT+00:00");
-    }
-    
-    public void testInvalidValidPre2000UTCNotAfterDateTest7()
-        throws Exception
-    {
-        doExceptionTest(TRUST_ANCHOR_ROOT_CERTIFICATE, 
-                new String[] { GOOD_CA_CERT, "Invalidpre2000UTCEEnotAfterDateTest7EE" }, 
-                new String[] { TRUST_ANCHOR_ROOT_CRL, GOOD_CA_CRL },
-                0,
-                "Could not validate certificate: certificate expired on 19990101120100GMT+00:00");
-    }
-    
-    public void testInvalidNegativeSerialNumberTest15()
-        throws Exception
-    {
-        doExceptionTest(TRUST_ANCHOR_ROOT_CERTIFICATE, 
-                new String[] { "NegativeSerialNumberCACert", "InvalidNegativeSerialNumberTest15EE" }, 
-                new String[] { TRUST_ANCHOR_ROOT_CRL, "NegativeSerialNumberCACRL" },
-                0,
-                "Certificate revocation after 2001-04-19 14:57:20 +0000", "reason: keyCompromise");
-    }
-    
-    //
-    // 4.8 Certificate Policies
-    //
-    public void testAllCertificatesSamePolicyTest1()
-        throws Exception
-    {
-        String[] certList = new String[] { GOOD_CA_CERT, "ValidCertificatePathTest1EE" };
-        String[] crlList = new String[] { TRUST_ANCHOR_ROOT_CRL, GOOD_CA_CRL };
-        
-        doTest(TRUST_ANCHOR_ROOT_CERTIFICATE, 
-                certList, 
-                crlList,
-                noPolicies);
-        
-        doTest(TRUST_ANCHOR_ROOT_CERTIFICATE, 
-                certList, 
-                crlList,
-                nistTestPolicy1);
-        
-        doExceptionTest(TRUST_ANCHOR_ROOT_CERTIFICATE, 
-                certList, 
-                crlList,
-                nistTestPolicy2,
-                -1,
-                "Path processing failed on policy.");
-        
-        doTest(TRUST_ANCHOR_ROOT_CERTIFICATE, 
-                certList, 
-                crlList,
-                nistTestPolicy1And2);
-    }
-    
-    public void testAllCertificatesNoPoliciesTest2()
-        throws Exception
-    {
-        doTest(TRUST_ANCHOR_ROOT_CERTIFICATE, 
-                new String[] { "NoPoliciesCACert", "AllCertificatesNoPoliciesTest2EE" }, 
-                new String[] { TRUST_ANCHOR_ROOT_CRL, "NoPoliciesCACRL" });
-        
-        doExceptionTest(TRUST_ANCHOR_ROOT_CERTIFICATE, 
-                new String[] { "NoPoliciesCACert", "AllCertificatesNoPoliciesTest2EE" }, 
-                new String[] { TRUST_ANCHOR_ROOT_CRL, "NoPoliciesCACRL" },
-                noPolicies,
-                1,
-                "No valid policy tree found when one expected.");
-    }
-    
-    public void testDifferentPoliciesTest3()
-        throws Exception
-    {
-        doTest(TRUST_ANCHOR_ROOT_CERTIFICATE, 
-                new String[] { GOOD_CA_CERT, "PoliciesP2subCACert", "DifferentPoliciesTest3EE" }, 
-                new String[] { TRUST_ANCHOR_ROOT_CRL, GOOD_CA_CRL, "PoliciesP2subCACRL" });
-        
-        doExceptionTest(TRUST_ANCHOR_ROOT_CERTIFICATE, 
-                new String[] { GOOD_CA_CERT, "PoliciesP2subCACert", "DifferentPoliciesTest3EE" }, 
-                new String[] { TRUST_ANCHOR_ROOT_CRL, GOOD_CA_CRL, "PoliciesP2subCACRL" },
-                noPolicies,
-                1,
-                "No valid policy tree found when one expected.");
-        
-        doExceptionTest(TRUST_ANCHOR_ROOT_CERTIFICATE, 
-                new String[] { GOOD_CA_CERT, "PoliciesP2subCACert", "DifferentPoliciesTest3EE" }, 
-                new String[] { TRUST_ANCHOR_ROOT_CRL, GOOD_CA_CRL, "PoliciesP2subCACRL" },
-                nistTestPolicy1And2,
-                1,
-                "No valid policy tree found when one expected.");
-    }
-    
-    public void testDifferentPoliciesTest4()
-        throws Exception
-    {
-        doExceptionTest(TRUST_ANCHOR_ROOT_CERTIFICATE, 
-                new String[] { GOOD_CA_CERT, "GoodsubCACert", "DifferentPoliciesTest4EE" }, 
-                new String[] { TRUST_ANCHOR_ROOT_CRL, GOOD_CA_CRL, "GoodsubCACRL" },
-                0,
-                "No valid policy tree found when one expected."); 
-    }
-    
-    public void testDifferentPoliciesTest5()
-        throws Exception
-    {
-        doExceptionTest(TRUST_ANCHOR_ROOT_CERTIFICATE, 
-                new String[] { GOOD_CA_CERT, "PoliciesP2subCA2Cert", "DifferentPoliciesTest5EE" }, 
-                new String[] { TRUST_ANCHOR_ROOT_CRL, GOOD_CA_CRL, "PoliciesP2subCA2CRL" },
-                0,
-                "No valid policy tree found when one expected."); 
-    }
-    
-    public void testOverlappingPoliciesTest6()
-        throws Exception
-    {
-        String[] certList = new String[] { "PoliciesP1234CACert", "PoliciesP1234subCAP123Cert", "PoliciesP1234subsubCAP123P12Cert", "OverlappingPoliciesTest6EE" };
-        String[] crlList = new String[] { TRUST_ANCHOR_ROOT_CRL, "PoliciesP1234CACRL", "PoliciesP1234subCAP123CRL", "PoliciesP1234subsubCAP123P12CRL" };
-        
-        doTest(TRUST_ANCHOR_ROOT_CERTIFICATE, certList, crlList);
-        
-        doTest(TRUST_ANCHOR_ROOT_CERTIFICATE, certList, crlList, nistTestPolicy1);
-        
-        doExceptionTest(TRUST_ANCHOR_ROOT_CERTIFICATE, certList, crlList, nistTestPolicy2,
-                -1,
-                "Path processing failed on policy.");
-    }
-    
-    public void testDifferentPoliciesTest7()
-        throws Exception
-    {
-        String[] certList = new String[] { "PoliciesP123CACert", "PoliciesP123subCAP12Cert", "PoliciesP123subsubCAP12P1Cert", "DifferentPoliciesTest7EE" };
-        String[] crlList = new String[] { TRUST_ANCHOR_ROOT_CRL, "PoliciesP123CACRL", "PoliciesP123subCAP12CRL", "PoliciesP123subsubCAP12P1CRL" };
-        
-        doExceptionTest(TRUST_ANCHOR_ROOT_CERTIFICATE, certList, crlList,
-                0,
-                "No valid policy tree found when one expected."); 
-    }
-    
-    public void testDifferentPoliciesTest8()
-        throws Exception
-    {
-        String[] certList = new String[] { "PoliciesP12CACert", "PoliciesP12subCAP1Cert", "PoliciesP12subsubCAP1P2Cert", "DifferentPoliciesTest8EE" };
-        String[] crlList = new String[] { TRUST_ANCHOR_ROOT_CRL, "PoliciesP12CACRL", "PoliciesP12subCAP1CRL", "PoliciesP12subsubCAP1P2CRL" };
-        
-        doExceptionTest(TRUST_ANCHOR_ROOT_CERTIFICATE, certList, crlList,
-                1,
-                "No valid policy tree found when one expected.");
-    }
-    
-    public void testDifferentPoliciesTest9()
-        throws Exception
-    {
-        String[] certList = new String[] { "PoliciesP123CACert", "PoliciesP123subCAP12Cert", "PoliciesP123subsubCAP12P2Cert", "PoliciesP123subsubsubCAP12P2P1Cert", "DifferentPoliciesTest9EE" };
-        String[] crlList = new String[] { TRUST_ANCHOR_ROOT_CRL, "PoliciesP123CACRL", "PoliciesP123subCAP12CRL", "PoliciesP123subsubCAP2P2CRL", "PoliciesP123subsubsubCAP12P2P1CRL" };
-        
-        doExceptionTest(TRUST_ANCHOR_ROOT_CERTIFICATE, certList, crlList,
-                1,
-                "No valid policy tree found when one expected.");
-    }
-    
-    public void testAllCertificatesSamePoliciesTest10()
-        throws Exception
-    {
-        String[] certList = new String[] { "PoliciesP12CACert", "AllCertificatesSamePoliciesTest10EE" };
-        String[] crlList = new String[] { TRUST_ANCHOR_ROOT_CRL, "PoliciesP12CACRL" };
-        
-        doTest(TRUST_ANCHOR_ROOT_CERTIFICATE, certList, crlList);
-        doTest(TRUST_ANCHOR_ROOT_CERTIFICATE, certList, crlList, nistTestPolicy1);
-        doTest(TRUST_ANCHOR_ROOT_CERTIFICATE, certList, crlList, nistTestPolicy2);
-    }
-    
-    public void testAllCertificatesAnyPolicyTest11()
-        throws Exception
-    {
-        String[] certList = new String[] { "anyPolicyCACert", "AllCertificatesanyPolicyTest11EE" };
-        String[] crlList = new String[] { TRUST_ANCHOR_ROOT_CRL, "anyPolicyCACRL" };
-        
-        PKIXCertPathValidatorResult result = doTest(TRUST_ANCHOR_ROOT_CERTIFICATE, certList, crlList);
-
-        result = doTest(TRUST_ANCHOR_ROOT_CERTIFICATE, certList, crlList, nistTestPolicy1);
-    }
-    
-    public void testDifferentPoliciesTest12()
-        throws Exception
-    {
-        String[] certList = new String[] { "PoliciesP3CACert", "DifferentPoliciesTest12EE" };
-        String[] crlList = new String[] { TRUST_ANCHOR_ROOT_CRL, "PoliciesP3CACRL" };
-        
-        doExceptionTest(TRUST_ANCHOR_ROOT_CERTIFICATE, certList, crlList,
-                0,
-                "No valid policy tree found when one expected.");
-    }
-    
-    public void testAllCertificatesSamePoliciesTest13()
-        throws Exception
-    {
-        String[] certList = new String[] { "PoliciesP123CACert", "AllCertificatesSamePoliciesTest13EE" };
-        String[] crlList = new String[] { TRUST_ANCHOR_ROOT_CRL, "PoliciesP123CACRL" };
-        
-        doTest(TRUST_ANCHOR_ROOT_CERTIFICATE, certList, crlList, nistTestPolicy1);
-        doTest(TRUST_ANCHOR_ROOT_CERTIFICATE, certList, crlList, nistTestPolicy2);
-        doTest(TRUST_ANCHOR_ROOT_CERTIFICATE, certList, crlList, nistTestPolicy3);
-    }
-    
-    public void testAnyPolicyTest14()
-        throws Exception
-    {
-        String[] certList = new String[] { "anyPolicyCACert", "AnyPolicyTest14EE" };
-        String[] crlList = new String[] { TRUST_ANCHOR_ROOT_CRL, "anyPolicyCACRL" };
-        
-        doTest(TRUST_ANCHOR_ROOT_CERTIFICATE, certList, crlList, nistTestPolicy1);
-        doExceptionTest(TRUST_ANCHOR_ROOT_CERTIFICATE, certList, crlList, nistTestPolicy2,
-                -1,
-                "Path processing failed on policy.");
-    }
-    
-    public void testUserNoticeQualifierTest15()
-        throws Exception
-    {
-        String[] certList = new String[] { "UserNoticeQualifierTest15EE" };
-        String[] crlList = new String[] { TRUST_ANCHOR_ROOT_CRL };
-        
-        doTest(TRUST_ANCHOR_ROOT_CERTIFICATE, certList, crlList);
-        doTest(TRUST_ANCHOR_ROOT_CERTIFICATE, certList, crlList, nistTestPolicy1);
-        doExceptionTest(TRUST_ANCHOR_ROOT_CERTIFICATE, certList, crlList, nistTestPolicy2,
-                -1,
-                "Path processing failed on policy.");
-    }
-    
-    public void testUserNoticeQualifierTest16()
-        throws Exception
-    {
-        String[] certList = new String[] { GOOD_CA_CERT, "UserNoticeQualifierTest16EE" };
-        String[] crlList = new String[] { TRUST_ANCHOR_ROOT_CRL, GOOD_CA_CRL };
-        
-        PKIXCertPathValidatorResult result = doTest(TRUST_ANCHOR_ROOT_CERTIFICATE, certList, crlList);
-        
-        result = doTest(TRUST_ANCHOR_ROOT_CERTIFICATE, certList, crlList, nistTestPolicy1);
-        
-        doExceptionTest(TRUST_ANCHOR_ROOT_CERTIFICATE, certList, crlList, nistTestPolicy2,
-                -1,
-                "Path processing failed on policy.");
-    }
-    
-    public void testUserNoticeQualifierTest17()
-        throws Exception
-    {
-        String[] certList = new String[] { GOOD_CA_CERT, "UserNoticeQualifierTest17EE" };
-        String[] crlList = new String[] { TRUST_ANCHOR_ROOT_CRL, GOOD_CA_CRL };
-        
-        doTest(TRUST_ANCHOR_ROOT_CERTIFICATE, certList, crlList);
-        doTest(TRUST_ANCHOR_ROOT_CERTIFICATE, certList, crlList, nistTestPolicy1);
-        doExceptionTest(TRUST_ANCHOR_ROOT_CERTIFICATE, certList, crlList, nistTestPolicy2,
-                -1,
-                "Path processing failed on policy.");
-    }
-    
-    public void testUserNoticeQualifierTest18()
-        throws Exception
-    {
-        String[] certList = new String[] { "PoliciesP12CACert", "UserNoticeQualifierTest18EE" };
-        String[] crlList = new String[] { TRUST_ANCHOR_ROOT_CRL, "PoliciesP12CACRL" };
-        
-        doTest(TRUST_ANCHOR_ROOT_CERTIFICATE, certList, crlList, nistTestPolicy1);
-        doTest(TRUST_ANCHOR_ROOT_CERTIFICATE, certList, crlList, nistTestPolicy2);
-    }
-    
-    public void testUserNoticeQualifierTest19()
-        throws Exception
-    {
-        String[] certList = new String[] { "UserNoticeQualifierTest19EE" };
-        String[] crlList = new String[] { TRUST_ANCHOR_ROOT_CRL };
-        
-        doTest(TRUST_ANCHOR_ROOT_CERTIFICATE, certList, crlList, nistTestPolicy1);
-        doExceptionTest(TRUST_ANCHOR_ROOT_CERTIFICATE, certList, crlList, nistTestPolicy2,
-                -1,
-                "Path processing failed on policy.");
-    }
-
-    public void testInvalidInhibitPolicyMappingTest1()
-        throws Exception
-    {
-        String[] certList = new String[] { "inhibitPolicyMapping0CACert", "inhibitPolicyMapping0subCACert", "InvalidinhibitPolicyMappingTest1EE" };
-        String[] crlList = new String[] { TRUST_ANCHOR_ROOT_CRL, "inhibitPolicyMapping0CACRL", "inhibitPolicyMapping0subCACRL" };
-
-        doExceptionTest(TRUST_ANCHOR_ROOT_CERTIFICATE, certList, crlList, null,
-                0,
-                "No valid policy tree found when one expected.");
-    }
-
-    public void testValidinhibitPolicyMappingTest2()
-        throws Exception
-    {
-        String[] certList = new String[] { "inhibitPolicyMapping1P12CACert", "inhibitPolicyMapping1P12subCACert", "ValidinhibitPolicyMappingTest2EE" };
-        String[] crlList = new String[] { TRUST_ANCHOR_ROOT_CRL, "inhibitPolicyMapping1P12CACRL", "inhibitPolicyMapping1P12subCACRL" };
-
-        doTest(TRUST_ANCHOR_ROOT_CERTIFICATE, certList, crlList, nistTestPolicy1);
-    }
-
-    // 4.12.7
-    public void testValidSelfIssuedinhibitAnyPolicyTest7()
-        throws Exception
-    {
-        String[] certList = new String[] { "inhibitAnyPolicy1CACert", "inhibitAnyPolicy1SelfIssuedCACert", "inhibitAnyPolicy1subCA2Cert", "ValidSelfIssuedinhibitAnyPolicyTest7EE" };
-        String[] crlList = new String[] { TRUST_ANCHOR_ROOT_CRL, "inhibitAnyPolicy1CACRL", "inhibitAnyPolicy1subCA2CRL" };
-
-        doBuilderTest(TRUST_ANCHOR_ROOT_CERTIFICATE, certList, crlList, null, false, false);
-    }
-
-    // 4.4.19
-    public void testValidSeparateCertificateandCRLKeysTest19()
-        throws Exception
-    {
-        String[] certList = new String[] { "SeparateCertificateandCRLKeysCertificateSigningCACert", "SeparateCertificateandCRLKeysCRLSigningCert", "ValidSeparateCertificateandCRLKeysTest19EE" };
-        String[] crlList = new String[] { TRUST_ANCHOR_ROOT_CRL, "SeparateCertificateandCRLKeysCRL" };
-
-        doBuilderTest(TRUST_ANCHOR_ROOT_CERTIFICATE, certList, crlList, null, false, false);
-    }
-
-    public void testValidpathLenConstraintTest13()
-        throws Exception
-    {
-        String[] certList = new String[] { "pathLenConstraint6CACert", "pathLenConstraint6subCA4Cert", "pathLenConstraint6subsubCA41Cert", "pathLenConstraint6subsubsubCA41XCert", "ValidpathLenConstraintTest13EE" };
-        String[] crlList = new String[] { TRUST_ANCHOR_ROOT_CRL, "pathLenConstraint6CACRL", "pathLenConstraint6subCA4CRL", "pathLenConstraint6subsubCA41CRL", "pathLenConstraint6subsubsubCA41XCRL" };
-
-        doTest(TRUST_ANCHOR_ROOT_CERTIFICATE, certList, crlList, null);
-    }
-
-    // 4.4.10
-    public void testInvalidUnknownCRLExtensionTest10()
-        throws Exception
-    {
-        String[] certList = new String[] { "UnknownCRLExtensionCACert", "InvalidUnknownCRLExtensionTest10EE" };
-        String[] crlList = new String[] { TRUST_ANCHOR_ROOT_CRL, "UnknownCRLExtensionCACRL" };
-
-        doExceptionTest(TRUST_ANCHOR_ROOT_CERTIFICATE, certList, crlList, null,
-                0,
-                "CRL contains unsupported critical extensions.");
-        
-    }
-
-    // 4.14.3
-    public void testInvaliddistributionPointTest3()
-        throws Exception
-    {
-        String[] certList = new String[] { "distributionPoint1CACert", "InvaliddistributionPointTest3EE" };
-        String[] crlList = new String[] { TRUST_ANCHOR_ROOT_CRL, "distributionPoint1CACRL" };
-
-        doExceptionTest(TRUST_ANCHOR_ROOT_CERTIFICATE, certList, crlList, null,
-                0,
-                "No match for certificate CRL issuing distribution point name to cRLIssuer CRL distribution point.");
-    }
-
-    // 4.14.5
-    public void testValiddistributionPointTest5()
-        throws Exception
-    {
-        String[] certList = new String[] { "distributionPoint2CACert", "ValiddistributionPointTest5EE" };
-        String[] crlList = new String[] { TRUST_ANCHOR_ROOT_CRL, "distributionPoint2CACRL" };
-
-        doTest(TRUST_ANCHOR_ROOT_CERTIFICATE, certList, crlList, null);
-    }
-
-
-    // 4.14.8
-    public void testInvaliddistributionPointTest8()
-        throws Exception
-    {
-        String[] certList = new String[] { "distributionPoint2CACert", "InvaliddistributionPointTest8EE" };
-        String[] crlList = new String[] { TRUST_ANCHOR_ROOT_CRL, "distributionPoint2CACRL" };
-
-        doExceptionTest(TRUST_ANCHOR_ROOT_CERTIFICATE, certList, crlList, null,
-                0,
-                "No match for certificate CRL issuing distribution point name to cRLIssuer CRL distribution point.");
-    }
-
-    // 4.14.9
-    public void testInvaliddistributionPointTest9()
-        throws Exception
-    {
-        String[] certList = new String[] { "distributionPoint2CACert", "InvaliddistributionPointTest9EE" };
-        String[] crlList = new String[] { TRUST_ANCHOR_ROOT_CRL, "distributionPoint2CACRL" };
-
-        doExceptionTest(TRUST_ANCHOR_ROOT_CERTIFICATE, certList, crlList, null,
-                0,
-                "No match for certificate CRL issuing distribution point name to cRLIssuer CRL distribution point.");
-    }
-
-    // 4.14.17
-    public void testInvalidonlySomeReasonsTest17()
-        throws Exception
-    {
-        String[] certList = new String[] { "onlySomeReasonsCA2Cert", "InvalidonlySomeReasonsTest17EE" };
-        String[] crlList = new String[] { TRUST_ANCHOR_ROOT_CRL, "onlySomeReasonsCA2CRL1", "onlySomeReasonsCA2CRL2" };
-
-        doExceptionTest(TRUST_ANCHOR_ROOT_CERTIFICATE, certList, crlList, null,
-                0,
-                "Certificate status could not be determined.");
-    }
-
-    // section 4.14: tests 17, 24, 25, 30, 31, 32, 33, 35
-
-    // section 4.15: tests 5, 7
-    private void doExceptionTest(
-        String      trustAnchor,
-        String[]    certs,
-        String[]    crls,
-        int         index,
-        String      message)
-        throws Exception
-    {
-        try
-        {
-            doTest(trustAnchor, certs, crls);
-            
-            fail("path accepted when should be rejected");
-        }
-        catch (CertPathValidatorException e)
-        {
-            assertEquals(index, e.getIndex());
-            assertEquals(message, e.getMessage());
-        }
-    }
-    
-    private void doExceptionTest(
-        String      trustAnchor,
-        String[]    certs,
-        String[]    crls,
-        Set         policies,
-        int         index,
-        String      message)
-        throws Exception
-    {
-        try
-        {
-            doTest(trustAnchor, certs, crls, policies);
-            
-            fail("path accepted when should be rejected");
-        }
-        catch (CertPathValidatorException e)
-        {
-            assertEquals(index, e.getIndex());
-            assertEquals(message, e.getMessage());
-        }
-    }
-
-    private void doExceptionTest(
-        String      trustAnchor,
-        String[]    certs,
-        String[]    crls,
-        int         index,
-        String      mesStart,
-        String      mesEnd)
-        throws Exception
-    {
-        try
-        {
-            doTest(trustAnchor, certs, crls);
-            
-            fail("path accepted when should be rejected");
-        }
-        catch (CertPathValidatorException e)
-        {
-            assertEquals(index, e.getIndex());
-            assertTrue(e.getMessage().startsWith(mesStart));
-            assertTrue(e.getMessage().endsWith(mesEnd));
-        }
-    }
-    
-    private PKIXCertPathValidatorResult doTest(
-        String      trustAnchor,
-        String[]    certs,
-        String[]    crls)
-        throws Exception
-    {
-        return doTest(trustAnchor, certs, crls, null);
-    }
-    
-    private PKIXCertPathValidatorResult doTest(
-        String      trustAnchor,
-        String[]    certs,
-        String[]    crls,
-        Set         policies)
-        throws Exception
-    {
-        Set  trustedSet = Collections.singleton(getTrustAnchor(trustAnchor));
-        List certsAndCrls = new ArrayList();
-        X509Certificate endCert = loadCert(certs[certs.length - 1]);
-        
-        for (int i = 0; i != certs.length - 1; i++)
-        {
-            certsAndCrls.add(loadCert(certs[i]));
-        }
-        
-        certsAndCrls.add(endCert);
-
-        CertPath certPath = CertificateFactory.getInstance("X.509","BC").generateCertPath(certsAndCrls);
-
-        for (int i = 0; i != crls.length; i++)
-        {
-            certsAndCrls.add(loadCrl(crls[i]));
-        }
-    
-        CertStore  store = CertStore.getInstance("Collection", new CollectionCertStoreParameters(certsAndCrls), "BC");
-        
-        CertPathValidator validator = CertPathValidator.getInstance("PKIX","BC");
-        PKIXParameters    params = new PKIXParameters(trustedSet);
-        
-        params.addCertStore(store);
-        params.setRevocationEnabled(true);
-        params.setDate(new GregorianCalendar(2010, 1, 1).getTime());
-
-        if (policies != null)
-        {
-            params.setExplicitPolicyRequired(true);
-            params.setInitialPolicies(policies);
-        }
-        
-        return (PKIXCertPathValidatorResult)validator.validate(certPath, params);
-    }
-
-    private PKIXCertPathBuilderResult doBuilderTest(
-        String trustAnchor,
-        String[] certs,
-        String[] crls,
-        Set initialPolicies,
-        boolean policyMappingInhibited,
-        boolean anyPolicyInhibited)
-        throws Exception
-    {
-        Set  trustedSet = Collections.singleton(getTrustAnchor(trustAnchor));
-        List certsAndCrls = new ArrayList();
-        X509Certificate endCert = loadCert(certs[certs.length - 1]);
-        
-        for (int i = 0; i != certs.length - 1; i++)
-        {
-            certsAndCrls.add(loadCert(certs[i]));
-        }
-        
-        certsAndCrls.add(endCert);
-
-        for (int i = 0; i != crls.length; i++)
-        {
-            certsAndCrls.add(loadCrl(crls[i]));
-        }
-    
-        CertStore  store = CertStore.getInstance("Collection", new CollectionCertStoreParameters(certsAndCrls), "BC");
-
-        CertPathBuilder builder = CertPathBuilder.getInstance("PKIX", "BC");
-
-        X509CertSelector endSelector = new X509CertSelector();
-
-        endSelector.setCertificate(endCert);
-
-        PKIXBuilderParameters builderParams = new PKIXBuilderParameters(trustedSet, endSelector);
-
-        if (initialPolicies != null)
-        {
-            builderParams.setInitialPolicies(initialPolicies);
-            builderParams.setExplicitPolicyRequired(true);
-        }
-        if (policyMappingInhibited)
-        {
-            builderParams.setPolicyMappingInhibited(policyMappingInhibited);
-        }
-        if (anyPolicyInhibited)
-        {
-            builderParams.setAnyPolicyInhibited(anyPolicyInhibited);
-        }
-
-        builderParams.addCertStore(store);
-        builderParams.setDate(new GregorianCalendar(2010, 1, 1).getTime());
-
-        try
-        {
-            return (PKIXCertPathBuilderResult)builder.build(builderParams);
-        }
-        catch (CertPathBuilderException e)
-        {
-            throw (Exception)e.getCause();
-        }
-    }
-
-    private X509Certificate loadCert(
-        String certName)
-    {
-        X509Certificate cert = (X509Certificate)certs.get(certName);
-        
-        if (cert != null)
-        {
-            return cert;
-        }
-        
-        try
-        {
-            InputStream in = new FileInputStream(getPkitsHome() + "/certs/" + certName + ".crt");
-            
-            CertificateFactory fact = CertificateFactory.getInstance("X.509", "BC");
-            
-            cert = (X509Certificate)fact.generateCertificate(in);
-    
-            certs.put(certName, cert);
-            
-            return cert;
-        }
-        catch (Exception e)
-        {
-            throw new IllegalStateException("exception loading certificate " + certName + ": " + e);
-        }
-    }
-    
-    private X509CRL loadCrl(
-        String crlName)
-        throws Exception
-    {
-        X509CRL crl = (X509CRL)certs.get(crlName);
-        
-        if (crl != null)
-        {
-            return crl;
-        }
-        
-        try
-        {
-            InputStream in = new FileInputStream(getPkitsHome() + "/crls/" + crlName + ".crl");
-            
-            CertificateFactory fact = CertificateFactory.getInstance("X.509", "BC");
-            
-            crl = (X509CRL)fact.generateCRL(in);
-            
-            crls.put(crlName, crl);
-            
-            return crl;
-        }
-        catch (Exception e)
-        {
-            throw new IllegalStateException("exception loading CRL: " + crlName);
-        }
-    }
-
-    private TrustAnchor getTrustAnchor(String trustAnchorName)
-        throws Exception
-    {
-        X509Certificate cert = loadCert(trustAnchorName);
-        byte[]          extBytes = cert.getExtensionValue(Extension.nameConstraints.getId());
-        
-        if (extBytes != null)
-        {
-            ASN1Encodable extValue = ASN1Primitive.fromByteArray(ASN1OctetString.getInstance(extBytes).getOctets());
-            
-            return new TrustAnchor(cert, extValue.toASN1Primitive().getEncoded(ASN1Encoding.DER));
-        }
-        
-        return new TrustAnchor(cert, null);
-    }
-    
-    private String getPkitsHome()
-    {
-        String dataHome = System.getProperty(TEST_DATA_HOME);
-        
-        if (dataHome == null)
-        {
-            throw new IllegalStateException(TEST_DATA_HOME + " property not set");
-        }
-        
-        return dataHome + "/PKITS";
-    }
-    
-    public static void main (String[] args) 
-        throws Exception
-    {
-        junit.textui.TestRunner.run(suite());
-    }
-    
-    public static Test suite() 
-        throws Exception
-    {   
-        TestSuite suite = new TestSuite("NIST CertPath Tests");
-        
-        suite.addTestSuite(NistCertPathTest.class);
-        
-        return suite;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/rsa3/RSA3CertTest.java b/bcprov/src/main/java/org/bouncycastle/jce/provider/test/rsa3/RSA3CertTest.java
deleted file mode 100644
index 08ca102..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/provider/test/rsa3/RSA3CertTest.java
+++ /dev/null
@@ -1,131 +0,0 @@
-package org.bouncycastle.jce.provider.test.rsa3;
-
-import java.security.Security;
-import java.security.Signature;
-import java.security.cert.CertificateFactory;
-import java.security.cert.X509Certificate;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * Marius Schilder's Bleichenbacher's Forgery Attack Tests
- */
-public class RSA3CertTest
-    extends TestCase
-{
-    public void setUp()
-    {
-        if (Security.getProvider("BC") == null)
-        {
-            Security.addProvider(new org.bouncycastle.jce.provider.BouncyCastleProvider());
-        }
-    }
-    
-    public void testA()
-        throws Exception
-    {
-        doTest("self-testcase-A.pem");
-    }
-
-    public void testB()
-        throws Exception
-    {
-        doTest("self-testcase-B.pem");
-    }
-    
-    public void testC()
-        throws Exception
-    {
-        doTest("self-testcase-C.pem");
-    }
-    
-    public void testD()
-        throws Exception
-    {
-        doTest("self-testcase-D.pem");
-    }
-    
-    public void testE()
-        throws Exception
-    {
-        doTest("self-testcase-E.pem");
-    }
-    
-    public void testF()
-        throws Exception
-    {
-        doTest("self-testcase-F.pem");
-    }
-    
-    public void testG()
-        throws Exception
-    {
-        doTest("self-testcase-G.pem");
-    }
-    
-    public void testH()
-        throws Exception
-    {
-        doTest("self-testcase-H.pem");
-    }
-    
-    public void testI()
-        throws Exception
-    {
-        doTest("self-testcase-I.pem");
-    }
-    
-    public void testJ()
-        throws Exception
-    {
-        doTest("self-testcase-J.pem");
-    }
-    
-    public void testL()
-        throws Exception
-    {
-        doTest("self-testcase-L.pem");
-    }
-    
-    private void doTest(
-        String      certName)
-        throws Exception
-    {
-        X509Certificate  cert = loadCert(certName);
-        byte[]           tbs = cert.getTBSCertificate();
-        Signature        sig = Signature.getInstance(cert.getSigAlgName(), "BC");
-        
-        sig.initVerify(cert.getPublicKey());
-        
-        sig.update(tbs);
-        
-        assertFalse(sig.verify(cert.getSignature()));
-    }
-
-    private X509Certificate loadCert(
-        String certName)
-        throws Exception
-    {
-        CertificateFactory rd = CertificateFactory.getInstance("X.509", "BC");
-        
-        return (X509Certificate)rd.generateCertificate(getClass().getResourceAsStream(certName));
-    }
-    
-    public static void main (String[] args) 
-        throws Exception
-    {
-        junit.textui.TestRunner.run(suite());
-    }
-    
-    public static Test suite() 
-        throws Exception
-    {   
-        TestSuite suite = new TestSuite("Bleichenbacher's Forgery Attack Tests");
-        
-        suite.addTestSuite(RSA3CertTest.class);
-        
-        return suite;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/spec/ElGamalGenParameterSpec.java b/bcprov/src/main/java/org/bouncycastle/jce/spec/ElGamalGenParameterSpec.java
deleted file mode 100644
index 200d2b4..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/spec/ElGamalGenParameterSpec.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package org.bouncycastle.jce.spec;
-
-import java.security.spec.AlgorithmParameterSpec;
-
-public class ElGamalGenParameterSpec
-    implements AlgorithmParameterSpec
-{
-    private int primeSize;
-
-    /*
-     * @param primeSize the size (in bits) of the prime modulus.
-     */
-    public ElGamalGenParameterSpec(
-        int     primeSize)
-    {
-        this.primeSize = primeSize;
-    }
-
-    /**
-     * Returns the size in bits of the prime modulus.
-     *
-     * @return the size in bits of the prime modulus
-     */
-    public int getPrimeSize()
-    {
-        return primeSize;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/spec/ElGamalKeySpec.java b/bcprov/src/main/java/org/bouncycastle/jce/spec/ElGamalKeySpec.java
deleted file mode 100644
index 5e3eb66..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/spec/ElGamalKeySpec.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package org.bouncycastle.jce.spec;
-
-import java.security.spec.KeySpec;
-
-public class ElGamalKeySpec
-    implements KeySpec
-{
-    private ElGamalParameterSpec  spec;
-
-    public ElGamalKeySpec(
-        ElGamalParameterSpec  spec)
-    {
-        this.spec = spec;
-    }
-
-    public ElGamalParameterSpec getParams()
-    {
-        return spec;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/spec/ElGamalParameterSpec.java b/bcprov/src/main/java/org/bouncycastle/jce/spec/ElGamalParameterSpec.java
deleted file mode 100644
index 10ed1c5..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/spec/ElGamalParameterSpec.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package org.bouncycastle.jce.spec;
-
-import java.math.BigInteger;
-import java.security.spec.AlgorithmParameterSpec;
-
-public class ElGamalParameterSpec
-    implements AlgorithmParameterSpec
-{
-    private BigInteger  p;
-    private BigInteger  g;
-
-    /**
-     * Constructs a parameter set for Diffie-Hellman, using a prime modulus
-     * <code>p</code> and a base generator <code>g</code>.
-     * 
-     * @param p the prime modulus
-     * @param g the base generator
-     */
-    public ElGamalParameterSpec(
-        BigInteger  p,
-        BigInteger  g)
-    {
-        this.p = p;
-        this.g = g;
-    }
-
-    /**
-     * Returns the prime modulus <code>p</code>.
-     *
-     * @return the prime modulus <code>p</code>
-     */
-    public BigInteger getP()
-    {
-        return p;
-    }
-
-    /**
-     * Returns the base generator <code>g</code>.
-     *
-     * @return the base generator <code>g</code>
-     */
-    public BigInteger getG()
-    {
-        return g;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/spec/ElGamalPrivateKeySpec.java b/bcprov/src/main/java/org/bouncycastle/jce/spec/ElGamalPrivateKeySpec.java
deleted file mode 100644
index 3a3c6e4..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/spec/ElGamalPrivateKeySpec.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package org.bouncycastle.jce.spec;
-
-import java.math.BigInteger;
-
-/**
- * This class specifies an ElGamal private key with its associated parameters.
- *
- * @see ElGamalPublicKeySpec
- */
-public class ElGamalPrivateKeySpec
-    extends ElGamalKeySpec
-{
-    private BigInteger  x;
-
-    public ElGamalPrivateKeySpec(
-        BigInteger              x,
-        ElGamalParameterSpec    spec)
-    {
-        super(spec);
-
-        this.x = x;
-    }
-
-    /**
-     * Returns the private value <code>x</code>.
-     *
-     * @return the private value <code>x</code>
-     */
-    public BigInteger getX()
-    {
-        return x;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/spec/ElGamalPublicKeySpec.java b/bcprov/src/main/java/org/bouncycastle/jce/spec/ElGamalPublicKeySpec.java
deleted file mode 100644
index c0e6dba..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/spec/ElGamalPublicKeySpec.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package org.bouncycastle.jce.spec;
-
-import java.math.BigInteger;
-
-/**
- * This class specifies an ElGamal public key with its associated parameters.
- *
- * @see ElGamalPrivateKeySpec
- */
-public class ElGamalPublicKeySpec
-    extends ElGamalKeySpec
-{
-    private BigInteger  y;
-
-    public ElGamalPublicKeySpec(
-        BigInteger              y,
-        ElGamalParameterSpec    spec)
-    {
-        super(spec);
-
-        this.y = y;
-    }
-
-    /**
-     * Returns the public value <code>y</code>.
-     *
-     * @return the public value <code>y</code>
-     */
-    public BigInteger getY()
-    {
-        return y;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/spec/GOST28147ParameterSpec.java b/bcprov/src/main/java/org/bouncycastle/jce/spec/GOST28147ParameterSpec.java
deleted file mode 100644
index d03fbfe..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/spec/GOST28147ParameterSpec.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package org.bouncycastle.jce.spec;
-
-/**
- * A parameter spec for the GOST-28147 cipher.
- * @deprecated use  org.bouncycastle.jcajce.spec.GOST28147ParameterSpec
- */
-public class GOST28147ParameterSpec
-    extends org.bouncycastle.jcajce.spec.GOST28147ParameterSpec
-{
-    /**
-     * @deprecated
-     */
-    public GOST28147ParameterSpec(
-        byte[] sBox)
-    {
-        super(sBox);
-    }
-
-    /**
-     * @deprecated
-     */
-    public GOST28147ParameterSpec(
-        byte[] sBox,
-        byte[] iv)
-    {
-        super(sBox, iv);
-
-    }
-
-    /**
-     * @deprecated
-     */
-    public GOST28147ParameterSpec(
-        String  sBoxName)
-    {
-        super(sBoxName);
-    }
-
-    /**
-     * @deprecated
-     */
-    public GOST28147ParameterSpec(
-        String  sBoxName,
-        byte[]  iv)
-    {
-        super(sBoxName, iv);
-    }
-}
\ No newline at end of file
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/spec/GOST3410ParameterSpec.java b/bcprov/src/main/java/org/bouncycastle/jce/spec/GOST3410ParameterSpec.java
deleted file mode 100644
index 6e0980d..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/spec/GOST3410ParameterSpec.java
+++ /dev/null
@@ -1,133 +0,0 @@
-package org.bouncycastle.jce.spec;
-
-import java.security.spec.AlgorithmParameterSpec;
-
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.cryptopro.CryptoProObjectIdentifiers;
-import org.bouncycastle.asn1.cryptopro.GOST3410NamedParameters;
-import org.bouncycastle.asn1.cryptopro.GOST3410ParamSetParameters;
-import org.bouncycastle.asn1.cryptopro.GOST3410PublicKeyAlgParameters;
-import org.bouncycastle.jce.interfaces.GOST3410Params;
-
-/**
- * ParameterSpec for a GOST 3410-94 key.
- */
-public class GOST3410ParameterSpec
-    implements AlgorithmParameterSpec, GOST3410Params
-{
-    private GOST3410PublicKeyParameterSetSpec keyParameters;
-    private String                            keyParamSetOID;
-    private String                            digestParamSetOID;
-    private String                            encryptionParamSetOID;
-    
-    public GOST3410ParameterSpec(
-        String  keyParamSetID,
-        String  digestParamSetOID,
-        String  encryptionParamSetOID)
-    {
-        GOST3410ParamSetParameters  ecP = null;
-        
-        try
-        {
-            ecP = GOST3410NamedParameters.getByOID(new ASN1ObjectIdentifier(keyParamSetID));
-        }
-        catch (IllegalArgumentException e)
-        {
-            ASN1ObjectIdentifier oid = GOST3410NamedParameters.getOID(keyParamSetID);
-            if (oid != null)
-            {
-                keyParamSetID = oid.getId();
-                ecP = GOST3410NamedParameters.getByOID(oid);
-            }
-        }
-        
-        if (ecP == null)
-        {
-            throw new IllegalArgumentException("no key parameter set for passed in name/OID.");
-        }
-
-        this.keyParameters = new GOST3410PublicKeyParameterSetSpec(
-                                        ecP.getP(),
-                                        ecP.getQ(),
-                                        ecP.getA());
-        
-        this.keyParamSetOID = keyParamSetID;
-        this.digestParamSetOID = digestParamSetOID;
-        this.encryptionParamSetOID = encryptionParamSetOID;
-    }
-    
-    public GOST3410ParameterSpec(
-        String  keyParamSetID,
-        String  digestParamSetOID)
-    {
-        this(keyParamSetID, digestParamSetOID, null);
-    }
-    
-    public GOST3410ParameterSpec(
-        String  keyParamSetID)
-    {
-        this(keyParamSetID, CryptoProObjectIdentifiers.gostR3411_94_CryptoProParamSet.getId(), null);
-    }
-    
-    public GOST3410ParameterSpec(
-        GOST3410PublicKeyParameterSetSpec spec)
-    {
-        this.keyParameters = spec;
-        this.digestParamSetOID = CryptoProObjectIdentifiers.gostR3411_94_CryptoProParamSet.getId();
-        this.encryptionParamSetOID = null;
-    }
-    
-    public String getPublicKeyParamSetOID()
-    {
-        return this.keyParamSetOID;
-    }
-
-    public GOST3410PublicKeyParameterSetSpec getPublicKeyParameters()
-    {
-        return keyParameters;
-    }
-    
-    public String getDigestParamSetOID()
-    {
-        return this.digestParamSetOID;
-    }
-
-    public String getEncryptionParamSetOID()
-    {
-        return this.encryptionParamSetOID;
-    }
-    
-    public boolean equals(Object o)
-    {
-        if (o instanceof GOST3410ParameterSpec)
-        {
-            GOST3410ParameterSpec other = (GOST3410ParameterSpec)o;
-            
-            return this.keyParameters.equals(other.keyParameters) 
-                && this.digestParamSetOID.equals(other.digestParamSetOID)
-                && (this.encryptionParamSetOID == other.encryptionParamSetOID
-                    || (this.encryptionParamSetOID != null && this.encryptionParamSetOID.equals(other.encryptionParamSetOID)));
-        }
-        
-        return false;
-    }
-    
-    public int hashCode()
-    {
-        return this.keyParameters.hashCode() ^ this.digestParamSetOID.hashCode() 
-                       ^ (this.encryptionParamSetOID != null ? this.encryptionParamSetOID.hashCode() : 0);
-    }
-
-    public static GOST3410ParameterSpec fromPublicKeyAlg(
-        GOST3410PublicKeyAlgParameters params)
-    {
-        if (params.getEncryptionParamSet() != null)
-        {
-            return new GOST3410ParameterSpec(params.getPublicKeyParamSet().getId(), params.getDigestParamSet().getId(), params.getEncryptionParamSet().getId());
-        }
-        else
-        {
-            return new GOST3410ParameterSpec(params.getPublicKeyParamSet().getId(), params.getDigestParamSet().getId());
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/spec/GOST3410PrivateKeySpec.java b/bcprov/src/main/java/org/bouncycastle/jce/spec/GOST3410PrivateKeySpec.java
deleted file mode 100644
index 5ea1385..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/spec/GOST3410PrivateKeySpec.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package org.bouncycastle.jce.spec;
-
-import java.math.BigInteger;
-import java.security.spec.KeySpec;
-
-/**
- * This class specifies a GOST3410-94 private key with its associated parameters.
- */
-
-public class GOST3410PrivateKeySpec
-    implements KeySpec
-{
-    private BigInteger x;
-    private BigInteger p;
-    private BigInteger q;
-    private BigInteger a;
-
-    /**
-     * Creates a new GOST3410PrivateKeySpec with the specified parameter values.
-     *
-     * @param x the private key.
-     * @param p the prime.
-     * @param q the sub-prime.
-     * @param a the base.
-     */
-    public GOST3410PrivateKeySpec(BigInteger x, BigInteger p, BigInteger q,
-         BigInteger a)
-    {
-        this.x = x;
-        this.p = p;
-        this.q = q;
-        this.a = a;
-    }
-
-    /**
-     * Returns the private key <code>x</code>.
-     * @return the private key <code>x</code>.
-     */
-    public BigInteger getX()
-    {
-        return this.x;
-    }
-
-    /**
-     * Returns the prime <code>p</code>.
-     * @return the prime <code>p</code>.
-     */
-    public BigInteger getP()
-    {
-        return this.p;
-    }
-
-    /**
-     * Returns the sub-prime <code>q</code>.
-     * @return the sub-prime <code>q</code>.
-     */
-    public BigInteger getQ()
-    {
-        return this.q;
-    }
-
-    /**
-     * Returns the base <code>a</code>.
-     * @return the base <code>a</code>.
-     */
-    public BigInteger getA()
-    {
-        return this.a;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/spec/GOST3410PublicKeyParameterSetSpec.java b/bcprov/src/main/java/org/bouncycastle/jce/spec/GOST3410PublicKeyParameterSetSpec.java
deleted file mode 100644
index 9e4e650..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/spec/GOST3410PublicKeyParameterSetSpec.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package org.bouncycastle.jce.spec;
-
-import java.math.BigInteger;
-
-/**
- * ParameterSpec for a GOST 3410-94 key parameters.
- */
-public class GOST3410PublicKeyParameterSetSpec
-{
-    private BigInteger p;
-    private BigInteger q;
-    private BigInteger a;
-    
-    /**
-     * Creates a new GOST3410ParameterSpec with the specified parameter values.
-     * 
-     * @param p the prime.
-     * @param q the sub-prime.
-     * @param a the base.
-     */
-    public GOST3410PublicKeyParameterSetSpec(
-        BigInteger p,
-        BigInteger q,
-        BigInteger a)
-    {
-        this.p = p;
-        this.q = q;
-        this.a = a;
-    }
-    
-    /**
-     * Returns the prime <code>p</code>.
-     *
-     * @return the prime <code>p</code>.
-     */
-    public BigInteger getP() 
-    {
-        return this.p;
-    }
-    
-    /**
-     * Returns the sub-prime <code>q</code>.
-     *
-     * @return the sub-prime <code>q</code>.
-     */
-    public BigInteger getQ() 
-    {
-        return this.q;
-    }
-    
-    /**
-     * Returns the base <code>a</code>.
-     *
-     * @return the base <code>a</code>.
-     */
-    public BigInteger getA() 
-    {
-        return this.a;
-    }
-    
-    public boolean equals(
-        Object o)
-    {
-        if (o instanceof GOST3410PublicKeyParameterSetSpec)
-        {
-            GOST3410PublicKeyParameterSetSpec other = (GOST3410PublicKeyParameterSetSpec)o;
-            
-            return this.a.equals(other.a) && this.p.equals(other.p) && this.q.equals(other.q);
-        }
-        
-        return false;
-    }
-    
-    public int hashCode()
-    {
-        return a.hashCode() ^ p.hashCode() ^ q.hashCode();
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/spec/GOST3410PublicKeySpec.java b/bcprov/src/main/java/org/bouncycastle/jce/spec/GOST3410PublicKeySpec.java
deleted file mode 100644
index 7b65c06..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/spec/GOST3410PublicKeySpec.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package org.bouncycastle.jce.spec;
-
-import java.math.BigInteger;
-import java.security.spec.KeySpec;
-
-/**
- * This class specifies a GOST3410-94 public key with its associated parameters.
- */
-
-public class GOST3410PublicKeySpec
-    implements KeySpec
-{
-
-    private BigInteger y;
-    private BigInteger p;
-    private BigInteger q;
-    private BigInteger a;
-
-    /**
-     * Creates a new GOST3410PublicKeySpec with the specified parameter values.
-     *
-     * @param y the public key.
-     * @param p the prime.
-     * @param q the sub-prime.
-     * @param a the base.
-     */
-    public GOST3410PublicKeySpec(
-        BigInteger y,
-        BigInteger p,
-        BigInteger q,
-        BigInteger a)
-    {
-        this.y = y;
-        this.p = p;
-        this.q = q;
-        this.a = a;
-    }
-
-    /**
-     * Returns the public key <code>y</code>.
-     *
-     * @return the public key <code>y</code>.
-     */
-    public BigInteger getY()
-    {
-        return this.y;
-    }
-
-    /**
-     * Returns the prime <code>p</code>.
-     *
-     * @return the prime <code>p</code>.
-     */
-    public BigInteger getP()
-    {
-        return this.p;
-    }
-
-    /**
-     * Returns the sub-prime <code>q</code>.
-     *
-     * @return the sub-prime <code>q</code>.
-     */
-    public BigInteger getQ()
-    {
-        return this.q;
-    }
-
-    /**
-     * Returns the base <code>g</code>.
-     *
-     * @return the base <code>g</code>.
-     */
-    public BigInteger getA()
-    {
-        return this.a;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/spec/IEKeySpec.java b/bcprov/src/main/java/org/bouncycastle/jce/spec/IEKeySpec.java
deleted file mode 100644
index 9859a22..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/spec/IEKeySpec.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package org.bouncycastle.jce.spec;
-
-import java.security.PrivateKey;
-import java.security.PublicKey;
-import java.security.spec.KeySpec;
-
-import org.bouncycastle.jce.interfaces.IESKey;
-
-/**
- * key pair for use with an integrated encryptor - together
- * they provide what's required to generate the message.
- */
-public class IEKeySpec
-    implements KeySpec, IESKey
-{
-    private PublicKey   pubKey;
-    private PrivateKey  privKey;
-
-    /**
-     * @param privKey our private key.
-     * @param pubKey the public key of the sender/recipient.
-     */
-    public IEKeySpec(
-        PrivateKey  privKey,
-        PublicKey   pubKey)
-    {
-        this.privKey = privKey;
-        this.pubKey = pubKey;
-    }
-
-    /**
-     * return the intended recipient's/sender's public key.
-     */
-    public PublicKey getPublic()
-    {
-        return pubKey;
-    }
-
-    /**
-     * return the local private key.
-     */
-    public PrivateKey getPrivate()
-    {
-        return privKey;
-    }
-
-    /**
-     * return "IES"
-     */
-    public String getAlgorithm()
-    {
-        return "IES";
-    }
-
-    /**
-     * return null
-     */
-    public String getFormat()
-    {
-        return null;
-    }
-
-    /**
-     * returns null
-     */
-    public byte[] getEncoded()
-    {
-        return null;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/spec/IESParameterSpec.java b/bcprov/src/main/java/org/bouncycastle/jce/spec/IESParameterSpec.java
deleted file mode 100644
index c18a88f..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/spec/IESParameterSpec.java
+++ /dev/null
@@ -1,176 +0,0 @@
-package org.bouncycastle.jce.spec;
-
-import java.security.spec.AlgorithmParameterSpec;
-
-import org.bouncycastle.util.Arrays;
-
-/**
- * Parameter spec for an integrated encryptor, as in IEEE P1363a
- */
-public class IESParameterSpec
-    implements AlgorithmParameterSpec
-{
-    private byte[] derivation;
-    private byte[] encoding;
-    private int macKeySize;
-    private int cipherKeySize;
-    private byte[] nonce;
-    private boolean usePointCompression;
-
-
-    /**
-     * Set the IES engine parameters.
-     *
-     * @param derivation the optional derivation vector for the KDF.
-     * @param encoding   the optional encoding vector for the KDF.
-     * @param macKeySize the key size (in bits) for the MAC.
-     */
-    public IESParameterSpec(
-        byte[] derivation,
-        byte[] encoding,
-        int macKeySize)
-    {
-        this(derivation, encoding, macKeySize, -1, null, false);
-    }
-
-
-    /**
-     * Set the IES engine parameters.
-     *
-     * @param derivation    the optional derivation vector for the KDF.
-     * @param encoding      the optional encoding vector for the KDF.
-     * @param macKeySize    the key size (in bits) for the MAC.
-     * @param cipherKeySize the key size (in bits) for the block cipher.
-     */
-    public IESParameterSpec(
-        byte[] derivation,
-        byte[] encoding,
-        int macKeySize,
-        int cipherKeySize)
-    {
-        this(derivation, encoding, macKeySize, cipherKeySize, null, false);
-    }
-
-    /**
-     * Set the IES engine parameters.
-     *
-     * @param derivation    the optional derivation vector for the KDF.
-     * @param encoding      the optional encoding vector for the KDF.
-     * @param macKeySize    the key size (in bits) for the MAC.
-     * @param cipherKeySize the key size (in bits) for the block cipher.
-     * @param nonce         an IV to use initialising the block cipher.
-     */
-    public IESParameterSpec(
-        byte[] derivation,
-        byte[] encoding,
-        int macKeySize,
-        int cipherKeySize,
-        byte[] nonce)
-    {
-        this(derivation, encoding, macKeySize, cipherKeySize, nonce, false);
-    }
-
-    /**
-     * Set the IES engine parameters.
-     *
-     * @param derivation    the optional derivation vector for the KDF.
-     * @param encoding      the optional encoding vector for the KDF.
-     * @param macKeySize    the key size (in bits) for the MAC.
-     * @param cipherKeySize the key size (in bits) for the block cipher.
-     * @param nonce         an IV to use initialising the block cipher.
-     * @param usePointCompression whether to use EC point compression or not (false by default)
-     */
-    public IESParameterSpec(
-        byte[] derivation,
-        byte[] encoding,
-        int macKeySize,
-        int cipherKeySize,
-        byte[] nonce,
-        boolean usePointCompression)
-    {
-        if (derivation != null)
-        {
-            this.derivation = new byte[derivation.length];
-            System.arraycopy(derivation, 0, this.derivation, 0, derivation.length);
-        }
-        else
-        {
-            this.derivation = null;
-        }
-
-        if (encoding != null)
-        {
-            this.encoding = new byte[encoding.length];
-            System.arraycopy(encoding, 0, this.encoding, 0, encoding.length);
-        }
-        else
-        {
-            this.encoding = null;
-        }
-
-        this.macKeySize = macKeySize;
-        this.cipherKeySize = cipherKeySize;
-        this.nonce = Arrays.clone(nonce);
-        this.usePointCompression = usePointCompression;
-    }
-
-    /**
-     * return the derivation vector.
-     */
-    public byte[] getDerivationV()
-    {
-        return Arrays.clone(derivation);
-    }
-
-    /**
-     * return the encoding vector.
-     */
-    public byte[] getEncodingV()
-    {
-        return Arrays.clone(encoding);
-    }
-
-    /**
-     * return the key size in bits for the MAC used with the message
-     */
-    public int getMacKeySize()
-    {
-        return macKeySize;
-    }
-
-    /**
-     * return the key size in bits for the block cipher used with the message
-     */
-    public int getCipherKeySize()
-    {
-        return cipherKeySize;
-    }
-
-    /**
-     * Return the nonce (IV) value to be associated with message.
-     *
-     * @return block cipher IV for message.
-     */
-    public byte[] getNonce()
-    {
-        return Arrays.clone(nonce);
-    }
-
-    /**
-     * Set the 'point compression' flag.
-     */
-    public void setPointCompression(boolean usePointCompression)
-    {
-        this.usePointCompression = usePointCompression;
-    }
-
-    /**
-     * Return the 'point compression' flag.
-     *
-     * @return the point compression flag
-     */
-    public boolean getPointCompression()
-    {
-        return usePointCompression;
-    }
-}
\ No newline at end of file
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/spec/MQVPrivateKeySpec.java b/bcprov/src/main/java/org/bouncycastle/jce/spec/MQVPrivateKeySpec.java
deleted file mode 100644
index bdd988d..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/spec/MQVPrivateKeySpec.java
+++ /dev/null
@@ -1,93 +0,0 @@
-package org.bouncycastle.jce.spec;
-
-import java.security.PrivateKey;
-import java.security.PublicKey;
-import java.security.spec.KeySpec;
-
-import org.bouncycastle.jce.interfaces.MQVPrivateKey;
-
-/**
- * Static/ephemeral private key (pair) for use with ECMQV key agreement
- * (Optionally provides the ephemeral public key)
- */
-public class MQVPrivateKeySpec
-    implements KeySpec, MQVPrivateKey
-{
-    private PrivateKey staticPrivateKey;
-    private PrivateKey ephemeralPrivateKey;
-    private PublicKey ephemeralPublicKey;
-
-    /**
-     * @param staticPrivateKey the static private key.
-     * @param ephemeralPrivateKey the ephemeral private key.
-     */
-    public MQVPrivateKeySpec(
-            PrivateKey  staticPrivateKey,
-            PrivateKey  ephemeralPrivateKey)
-    {
-        this(staticPrivateKey, ephemeralPrivateKey, null);
-    }
-
-    /**
-     * @param staticPrivateKey the static private key.
-     * @param ephemeralPrivateKey the ephemeral private key.
-     * @param ephemeralPublicKey the ephemeral public key (may be null).
-     */
-    public MQVPrivateKeySpec(
-        PrivateKey  staticPrivateKey,
-        PrivateKey  ephemeralPrivateKey,
-        PublicKey   ephemeralPublicKey)
-    {
-        this.staticPrivateKey = staticPrivateKey;
-        this.ephemeralPrivateKey = ephemeralPrivateKey;
-        this.ephemeralPublicKey = ephemeralPublicKey;
-    }
-
-    /**
-     * return the static private key
-     */
-    public PrivateKey getStaticPrivateKey()
-    {
-        return staticPrivateKey;
-    }
-
-    /**
-     * return the ephemeral private key
-     */
-    public PrivateKey getEphemeralPrivateKey()
-    {
-        return ephemeralPrivateKey;
-    }
-
-    /**
-     * return the ephemeral public key (may be null)
-     */
-    public PublicKey getEphemeralPublicKey()
-    {
-        return ephemeralPublicKey;
-    }
-
-    /**
-     * return "ECMQV"
-     */
-    public String getAlgorithm()
-    {
-        return "ECMQV";
-    }
-
-    /**
-     * return null
-     */
-    public String getFormat()
-    {
-        return null;
-    }
-
-    /**
-     * returns null
-     */
-    public byte[] getEncoded()
-    {
-        return null;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/spec/MQVPublicKeySpec.java b/bcprov/src/main/java/org/bouncycastle/jce/spec/MQVPublicKeySpec.java
deleted file mode 100644
index 8b50d05..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/spec/MQVPublicKeySpec.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package org.bouncycastle.jce.spec;
-
-import java.security.PublicKey;
-import java.security.spec.KeySpec;
-
-import org.bouncycastle.jce.interfaces.MQVPublicKey;
-
-/**
- * Static/ephemeral public key pair for use with ECMQV key agreement
- */
-public class MQVPublicKeySpec
-    implements KeySpec, MQVPublicKey
-{
-    private PublicKey staticKey;
-    private PublicKey ephemeralKey;
-
-    /**
-     * @param staticKey the static public key.
-     * @param ephemeralKey the ephemeral public key.
-     */
-    public MQVPublicKeySpec(
-        PublicKey staticKey,
-        PublicKey ephemeralKey)
-    {
-        this.staticKey = staticKey;
-        this.ephemeralKey = ephemeralKey;
-    }
-
-    /**
-     * return the static public key
-     */
-    public PublicKey getStaticKey()
-    {
-        return staticKey;
-    }
-    
-    /**
-     * return the ephemeral public key
-     */
-    public PublicKey getEphemeralKey()
-    {
-        return ephemeralKey;
-    }
-
-    /**
-     * return "ECMQV"
-     */
-    public String getAlgorithm()
-    {
-        return "ECMQV";
-    }
-
-    /**
-     * return null
-     */
-    public String getFormat()
-    {
-        return null;
-    }
-
-    /**
-     * returns null
-     */
-    public byte[] getEncoded()
-    {
-        return null;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/spec/RepeatedSecretKeySpec.java b/bcprov/src/main/java/org/bouncycastle/jce/spec/RepeatedSecretKeySpec.java
deleted file mode 100644
index 4111072..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/spec/RepeatedSecretKeySpec.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.bouncycastle.jce.spec;
-
-/**
- * A simple object to indicate that a symmetric cipher should reuse the
- * last key provided.
- * @deprecated use super class org.bouncycastle.jcajce.spec.RepeatedSecretKeySpec
- */
-public class RepeatedSecretKeySpec
-    extends org.bouncycastle.jcajce.spec.RepeatedSecretKeySpec
-{
-    private String algorithm;
-
-    public RepeatedSecretKeySpec(String algorithm)
-    {
-        super(algorithm);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/jce/spec/package.html b/bcprov/src/main/java/org/bouncycastle/jce/spec/package.html
deleted file mode 100644
index 6f37057..0000000
--- a/bcprov/src/main/java/org/bouncycastle/jce/spec/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body bgcolor="#ffffff">
-Parameter specifications for supporting El Gamal, and Elliptic Curve.
-</body>
-</html>
diff --git a/bcprov/src/main/java/org/bouncycastle/math/ec/DoubleAddMultiplier.java b/bcprov/src/main/java/org/bouncycastle/math/ec/DoubleAddMultiplier.java
deleted file mode 100644
index aae2e00..0000000
--- a/bcprov/src/main/java/org/bouncycastle/math/ec/DoubleAddMultiplier.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.bouncycastle.math.ec;
-
-import java.math.BigInteger;
-
-public class DoubleAddMultiplier extends AbstractECMultiplier
-{
-    /**
-     * Joye's double-add algorithm.
-     */
-    protected ECPoint multiplyPositive(ECPoint p, BigInteger k)
-    {
-        ECPoint[] R = new ECPoint[]{ p.getCurve().getInfinity(), p };
-
-        int n = k.bitLength();
-        for (int i = 0; i < n; ++i)
-        {
-            int b = k.testBit(i) ? 1 : 0;
-            int bp = 1 - b;
-            R[bp] = R[bp].twicePlus(R[b]);
-        }
-
-        return R[0];
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/math/ec/MixedNafR2LMultiplier.java b/bcprov/src/main/java/org/bouncycastle/math/ec/MixedNafR2LMultiplier.java
deleted file mode 100644
index 6d5fe92..0000000
--- a/bcprov/src/main/java/org/bouncycastle/math/ec/MixedNafR2LMultiplier.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package org.bouncycastle.math.ec;
-
-import java.math.BigInteger;
-
-/**
- * Class implementing the NAF (Non-Adjacent Form) multiplication algorithm (right-to-left) using
- * mixed coordinates.
- */
-public class MixedNafR2LMultiplier extends AbstractECMultiplier
-{
-    protected int additionCoord, doublingCoord;
-
-    /**
-     * By default, addition will be done in Jacobian coordinates, and doubling will be done in
-     * Modified Jacobian coordinates (independent of the original coordinate system of each point).
-     */
-    public MixedNafR2LMultiplier()
-    {
-        this(ECCurve.COORD_JACOBIAN, ECCurve.COORD_JACOBIAN_MODIFIED);
-    }
-
-    public MixedNafR2LMultiplier(int additionCoord, int doublingCoord)
-    {
-        this.additionCoord = additionCoord;
-        this.doublingCoord = doublingCoord;
-    }
-
-    protected ECPoint multiplyPositive(ECPoint p, BigInteger k)
-    {
-        ECCurve curveOrig = p.getCurve();
-
-        ECCurve curveAdd = configureCurve(curveOrig, additionCoord);
-        ECCurve curveDouble = configureCurve(curveOrig, doublingCoord);
-
-        int[] naf = WNafUtil.generateCompactNaf(k);
-
-        ECPoint Ra = curveAdd.getInfinity();
-        ECPoint Td = curveDouble.importPoint(p);
-
-        int zeroes = 0;
-        for (int i = 0; i < naf.length; ++i)
-        {
-            int ni = naf[i];
-            int digit = ni >> 16;
-            zeroes += ni & 0xFFFF;
-
-            Td = Td.timesPow2(zeroes);
-
-            ECPoint Tj = curveAdd.importPoint(Td);
-            if (digit < 0)
-            {
-                Tj = Tj.negate();
-            }
-
-            Ra = Ra.add(Tj);
-
-            zeroes = 1;
-        }
-
-        return curveOrig.importPoint(Ra);
-    }
-
-    protected ECCurve configureCurve(ECCurve c, int coord)
-    {
-        if (c.getCoordinateSystem() == coord)
-        {
-            return c;
-        }
-
-        if (!c.supportsCoordinateSystem(coord))
-        {
-            throw new IllegalArgumentException("Coordinate system " + coord + " not supported by this curve");
-        }
-
-        return c.configure().setCoordinateSystem(coord).create();
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/math/ec/MontgomeryLadderMultiplier.java b/bcprov/src/main/java/org/bouncycastle/math/ec/MontgomeryLadderMultiplier.java
deleted file mode 100644
index cd969b5..0000000
--- a/bcprov/src/main/java/org/bouncycastle/math/ec/MontgomeryLadderMultiplier.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package org.bouncycastle.math.ec;
-
-import java.math.BigInteger;
-
-public class MontgomeryLadderMultiplier extends AbstractECMultiplier
-{
-    /**
-     * Montgomery ladder.
-     */
-    protected ECPoint multiplyPositive(ECPoint p, BigInteger k)
-    {
-        ECPoint[] R = new ECPoint[]{ p.getCurve().getInfinity(), p };
-
-        int n = k.bitLength();
-        int i = n;
-        while (--i >= 0)
-        {
-            int b = k.testBit(i) ? 1 : 0;
-            int bp = 1 - b;
-            R[bp] = R[bp].add(R[b]);
-            R[b] = R[b].twice();
-        }
-        return R[0];
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/math/ec/NafL2RMultiplier.java b/bcprov/src/main/java/org/bouncycastle/math/ec/NafL2RMultiplier.java
deleted file mode 100644
index 91d91d1..0000000
--- a/bcprov/src/main/java/org/bouncycastle/math/ec/NafL2RMultiplier.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package org.bouncycastle.math.ec;
-
-import java.math.BigInteger;
-
-/**
- * Class implementing the NAF (Non-Adjacent Form) multiplication algorithm (left-to-right).
- */
-public class NafL2RMultiplier extends AbstractECMultiplier
-{
-    protected ECPoint multiplyPositive(ECPoint p, BigInteger k)
-    {
-        int[] naf = WNafUtil.generateCompactNaf(k);
-
-        ECPoint addP = p.normalize(), subP = addP.negate();
-
-        ECPoint R = p.getCurve().getInfinity();
-
-        int i = naf.length;
-        while (--i >= 0)
-        {
-            int ni = naf[i];
-            int digit = ni >> 16, zeroes = ni & 0xFFFF;
-
-            R = R.twicePlus(digit < 0 ? subP : addP);
-            R = R.timesPow2(zeroes);
-        }
-
-        return R;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/math/ec/NafR2LMultiplier.java b/bcprov/src/main/java/org/bouncycastle/math/ec/NafR2LMultiplier.java
deleted file mode 100644
index aed2336..0000000
--- a/bcprov/src/main/java/org/bouncycastle/math/ec/NafR2LMultiplier.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package org.bouncycastle.math.ec;
-
-import java.math.BigInteger;
-
-/**
- * Class implementing the NAF (Non-Adjacent Form) multiplication algorithm (right-to-left).
- */
-public class NafR2LMultiplier extends AbstractECMultiplier
-{
-    protected ECPoint multiplyPositive(ECPoint p, BigInteger k)
-    {
-        int[] naf = WNafUtil.generateCompactNaf(k);
-
-        ECPoint R0 = p.getCurve().getInfinity(), R1 = p;
-
-        int zeroes = 0;
-        for (int i = 0; i < naf.length; ++i)
-        {
-            int ni = naf[i];
-            int digit = ni >> 16;
-            zeroes += ni & 0xFFFF;
-
-            R1 = R1.timesPow2(zeroes);
-            R0 = R0.add(digit < 0 ? R1.negate() : R1);
-
-            zeroes = 1;
-        }
-
-        return R0;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/math/ec/ReferenceMultiplier.java b/bcprov/src/main/java/org/bouncycastle/math/ec/ReferenceMultiplier.java
deleted file mode 100644
index 107e193..0000000
--- a/bcprov/src/main/java/org/bouncycastle/math/ec/ReferenceMultiplier.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package org.bouncycastle.math.ec;
-
-import java.math.BigInteger;
-
-public class ReferenceMultiplier extends AbstractECMultiplier
-{
-    protected ECPoint multiplyPositive(ECPoint p, BigInteger k)
-    {
-        return ECAlgorithms.referenceMultiply(p, k);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/math/ec/ScaleYPointMap.java b/bcprov/src/main/java/org/bouncycastle/math/ec/ScaleYPointMap.java
deleted file mode 100644
index a7a8790..0000000
--- a/bcprov/src/main/java/org/bouncycastle/math/ec/ScaleYPointMap.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.bouncycastle.math.ec;
-
-public class ScaleYPointMap implements ECPointMap
-{
-    protected final ECFieldElement scale;
-
-    public ScaleYPointMap(ECFieldElement scale)
-    {
-        this.scale = scale;
-    }
-
-    public ECPoint map(ECPoint p)
-    {
-        return p.scaleY(scale);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/math/ec/ZSignedDigitL2RMultiplier.java b/bcprov/src/main/java/org/bouncycastle/math/ec/ZSignedDigitL2RMultiplier.java
deleted file mode 100644
index b478dc7..0000000
--- a/bcprov/src/main/java/org/bouncycastle/math/ec/ZSignedDigitL2RMultiplier.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package org.bouncycastle.math.ec;
-
-import java.math.BigInteger;
-
-public class ZSignedDigitL2RMultiplier extends AbstractECMultiplier
-{
-    /**
-     * 'Zeroless' Signed Digit Left-to-Right.
-     */
-    protected ECPoint multiplyPositive(ECPoint p, BigInteger k)
-    {
-        ECPoint addP = p.normalize(), subP = addP.negate();
-
-        ECPoint R0 = addP;
-
-        int n = k.bitLength();
-        int s = k.getLowestSetBit();
-
-        int i = n;
-        while (--i > s)
-        {
-            R0 = R0.twicePlus(k.testBit(i) ? addP : subP);
-        }
-
-        R0 = R0.timesPow2(s);
-
-        return R0;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/math/ec/ZSignedDigitR2LMultiplier.java b/bcprov/src/main/java/org/bouncycastle/math/ec/ZSignedDigitR2LMultiplier.java
deleted file mode 100644
index baa702f..0000000
--- a/bcprov/src/main/java/org/bouncycastle/math/ec/ZSignedDigitR2LMultiplier.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package org.bouncycastle.math.ec;
-
-import java.math.BigInteger;
-
-public class ZSignedDigitR2LMultiplier extends AbstractECMultiplier
-{
-    /**
-     * 'Zeroless' Signed Digit Right-to-Left.
-     */
-    protected ECPoint multiplyPositive(ECPoint p, BigInteger k)
-    {
-        ECPoint R0 = p.getCurve().getInfinity(), R1 = p;
-
-        int n = k.bitLength();
-        int s = k.getLowestSetBit();
-
-        R1 = R1.timesPow2(s);
-
-        int i = s;
-        while (++i < n)
-        {
-            R0 = R0.add(k.testBit(i) ? R1 : R1.negate());
-            R1 = R1.twice();
-        }
-
-        R0 = R0.add(R1);
-
-        return R0;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/math/ec/custom/djb/Curve25519.java b/bcprov/src/main/java/org/bouncycastle/math/ec/custom/djb/Curve25519.java
deleted file mode 100644
index e7839ce..0000000
--- a/bcprov/src/main/java/org/bouncycastle/math/ec/custom/djb/Curve25519.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package org.bouncycastle.math.ec.custom.djb;
-
-import java.math.BigInteger;
-
-import org.bouncycastle.math.ec.ECCurve;
-import org.bouncycastle.math.ec.ECFieldElement;
-import org.bouncycastle.math.ec.ECPoint;
-import org.bouncycastle.math.raw.Nat256;
-import org.bouncycastle.util.encoders.Hex;
-
-public class Curve25519 extends ECCurve.AbstractFp
-{
-    public static final BigInteger q = Nat256.toBigInteger(Curve25519Field.P);
-
-    private static final int Curve25519_DEFAULT_COORDS = COORD_JACOBIAN_MODIFIED;
-
-    protected Curve25519Point infinity;
-
-    public Curve25519()
-    {
-        super(q);
-
-        this.infinity = new Curve25519Point(this, null, null);
-
-        this.a = fromBigInteger(new BigInteger(1,
-            Hex.decode("2AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA984914A144")));
-        this.b = fromBigInteger(new BigInteger(1,
-            Hex.decode("7B425ED097B425ED097B425ED097B425ED097B425ED097B4260B5E9C7710C864")));
-        this.order = new BigInteger(1, Hex.decode("1000000000000000000000000000000014DEF9DEA2F79CD65812631A5CF5D3ED"));
-        this.cofactor = BigInteger.valueOf(8);
-
-        this.coord = Curve25519_DEFAULT_COORDS;
-    }
-
-    protected ECCurve cloneCurve()
-    {
-        return new Curve25519();
-    }
-
-    public boolean supportsCoordinateSystem(int coord)
-    {
-        switch (coord)
-        {
-        case COORD_JACOBIAN_MODIFIED:
-            return true;
-        default:
-            return false;
-        }
-    }
-
-    public BigInteger getQ()
-    {
-        return q;
-    }
-
-    public int getFieldSize()
-    {
-        return q.bitLength();
-    }
-
-    public ECFieldElement fromBigInteger(BigInteger x)
-    {
-        return new Curve25519FieldElement(x);
-    }
-
-    protected ECPoint createRawPoint(ECFieldElement x, ECFieldElement y, boolean withCompression)
-    {
-        return new Curve25519Point(this, x, y, withCompression);
-    }
-
-    protected ECPoint createRawPoint(ECFieldElement x, ECFieldElement y, ECFieldElement[] zs, boolean withCompression)
-    {
-        return new Curve25519Point(this, x, y, zs, withCompression);
-    }
-
-    public ECPoint getInfinity()
-    {
-        return infinity;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/math/ec/custom/djb/Curve25519Field.java b/bcprov/src/main/java/org/bouncycastle/math/ec/custom/djb/Curve25519Field.java
deleted file mode 100644
index 2e8e335..0000000
--- a/bcprov/src/main/java/org/bouncycastle/math/ec/custom/djb/Curve25519Field.java
+++ /dev/null
@@ -1,254 +0,0 @@
-package org.bouncycastle.math.ec.custom.djb;
-
-import java.math.BigInteger;
-
-import org.bouncycastle.math.raw.Nat;
-import org.bouncycastle.math.raw.Nat256;
-
-public class Curve25519Field
-{
-    private static final long M = 0xFFFFFFFFL;
-
-    // 2^255 - 2^4 - 2^1 - 1
-    static final int[] P = new int[]{ 0xFFFFFFED, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-        0xFFFFFFFF, 0x7FFFFFFF };
-    private static final int P7 = 0x7FFFFFFF;
-    private static final int[] PExt = new int[]{ 0x00000169, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-        0x00000000, 0x00000000, 0x00000000, 0xFFFFFFED, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-        0xFFFFFFFF, 0x3FFFFFFF };
-    private static final int PInv = 0x13;
-
-    public static void add(int[] x, int[] y, int[] z)
-    {
-        Nat256.add(x, y, z);
-        if (Nat256.gte(z, P))
-        {
-            subPFrom(z);
-        }
-    }
-
-    public static void addExt(int[] xx, int[] yy, int[] zz)
-    {
-        Nat.add(16, xx, yy, zz);
-        if (Nat.gte(16, zz, PExt))
-        {
-            subPExtFrom(zz);
-        }
-    }
-
-    public static void addOne(int[] x, int[] z)
-    {
-        Nat.inc(8, x, z);
-        if (Nat256.gte(z, P))
-        {
-            subPFrom(z);
-        }
-    }
-
-    public static int[] fromBigInteger(BigInteger x)
-    {
-        int[] z = Nat256.fromBigInteger(x);
-        while (Nat256.gte(z, P))
-        {
-            Nat256.subFrom(P, z);
-        }
-        return z;
-    }
-
-    public static void half(int[] x, int[] z)
-    {
-        if ((x[0] & 1) == 0)
-        {
-            Nat.shiftDownBit(8, x, 0, z);
-        }
-        else
-        {
-            Nat256.add(x, P, z);
-            Nat.shiftDownBit(8, z, 0);
-        }
-    }
-
-    public static void multiply(int[] x, int[] y, int[] z)
-    {
-        int[] tt = Nat256.createExt();
-        Nat256.mul(x, y, tt);
-        reduce(tt, z);
-    }
-
-    public static void multiplyAddToExt(int[] x, int[] y, int[] zz)
-    {
-        Nat256.mulAddTo(x, y, zz);
-        if (Nat.gte(16, zz, PExt))
-        {
-            subPExtFrom(zz);
-        }
-    }
-
-    public static void negate(int[] x, int[] z)
-    {
-        if (Nat256.isZero(x))
-        {
-            Nat256.zero(z);
-        }
-        else
-        {
-            Nat256.sub(P, x, z);
-        }
-    }
-
-    public static void reduce(int[] xx, int[] z)
-    {
-//        assert xx[15] >>> 30 == 0;
-
-        int xx07 = xx[7];
-        Nat.shiftUpBit(8, xx, 8, xx07, z, 0);
-        int c = Nat256.mulByWordAddTo(PInv, xx, z) << 1;
-        int z7 = z[7];
-        c += (z7 >>> 31) - (xx07 >>> 31);
-        z7 &= P7;
-        z7 += Nat.addWordTo(7, c * PInv, z);
-        z[7] = z7;
-        if (Nat256.gte(z, P))
-        {
-            subPFrom(z);
-        }
-    }
-
-    public static void reduce27(int x, int[] z)
-    {
-//        assert x >>> 26 == 0;
-
-        int z7 = z[7];
-        int c = (x << 1 | z7 >>> 31);
-        z7 &= P7;
-        z7 += Nat.addWordTo(7, c * PInv, z);
-        z[7] = z7;
-        if (Nat256.gte(z, P))
-        {
-            subPFrom(z);
-        }
-    }
-
-    public static void square(int[] x, int[] z)
-    {
-        int[] tt = Nat256.createExt();
-        Nat256.square(x, tt);
-        reduce(tt, z);
-    }
-
-    public static void squareN(int[] x, int n, int[] z)
-    {
-//        assert n > 0;
-
-        int[] tt = Nat256.createExt();
-        Nat256.square(x, tt);
-        reduce(tt, z);
-
-        while (--n > 0)
-        {
-            Nat256.square(z, tt);
-            reduce(tt, z);
-        }
-    }
-
-    public static void subtract(int[] x, int[] y, int[] z)
-    {
-        int c = Nat256.sub(x, y, z);
-        if (c != 0)
-        {
-            addPTo(z);
-        }
-    }
-
-    public static void subtractExt(int[] xx, int[] yy, int[] zz)
-    {
-        int c = Nat.sub(16, xx, yy, zz);
-        if (c != 0)
-        {
-            addPExtTo(zz);
-        }
-    }
-
-    public static void twice(int[] x, int[] z)
-    {
-        Nat.shiftUpBit(8, x, 0, z);
-        if (Nat256.gte(z, P))
-        {
-            subPFrom(z);
-        }
-    }
-
-    private static int addPTo(int[] z)
-    {
-        long c = (z[0] & M) - PInv;
-        z[0] = (int)c;
-        c >>= 32;
-        if (c != 0)
-        {
-            c = Nat.decAt(7, z, 1);
-        }
-        c += (z[7] & M) + ((P7 + 1) & M);
-        z[7] = (int)c;
-        c >>= 32;
-        return (int)c;
-    }
-
-    private static int addPExtTo(int[] zz)
-    {
-        long c = (zz[0] & M) + (PExt[0] & M);
-        zz[0] = (int)c;
-        c >>= 32;
-        if (c != 0)
-        {
-            c = Nat.incAt(8, zz, 1);
-        }
-        c += (zz[8] & M) - PInv;
-        zz[8] = (int)c;
-        c >>= 32;
-        if (c != 0)
-        {
-            c = Nat.decAt(15, zz, 9);
-        }
-        c += (zz[15] & M) + ((PExt[15] + 1) & M);
-        zz[15] = (int)c;
-        c >>= 32;
-        return (int)c;
-    }
-
-    private static int subPFrom(int[] z)
-    {
-        long c = (z[0] & M) + PInv;
-        z[0] = (int)c;
-        c >>= 32;
-        if (c != 0)
-        {
-            c = Nat.incAt(7, z, 1);
-        }
-        c += (z[7] & M) - ((P7 + 1) & M);
-        z[7] = (int)c;
-        c >>= 32;
-        return (int)c;
-    }
-
-    private static int subPExtFrom(int[] zz)
-    {
-        long c = (zz[0] & M) - (PExt[0] & M);
-        zz[0] = (int)c;
-        c >>= 32;
-        if (c != 0)
-        {
-            c = Nat.decAt(8, zz, 1);
-        }
-        c += (zz[8] & M) + PInv;
-        zz[8] = (int)c;
-        c >>= 32;
-        if (c != 0)
-        {
-            c = Nat.incAt(15, zz, 9);
-        }
-        c += (zz[15] & M) - ((PExt[15] + 1) & M);
-        zz[15] = (int)c;
-        c >>= 32;
-        return (int)c;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/math/ec/custom/djb/Curve25519FieldElement.java b/bcprov/src/main/java/org/bouncycastle/math/ec/custom/djb/Curve25519FieldElement.java
deleted file mode 100644
index 010b6f5..0000000
--- a/bcprov/src/main/java/org/bouncycastle/math/ec/custom/djb/Curve25519FieldElement.java
+++ /dev/null
@@ -1,234 +0,0 @@
-package org.bouncycastle.math.ec.custom.djb;
-
-import java.math.BigInteger;
-
-import org.bouncycastle.math.ec.ECFieldElement;
-import org.bouncycastle.math.raw.Mod;
-import org.bouncycastle.math.raw.Nat256;
-import org.bouncycastle.util.Arrays;
-
-public class Curve25519FieldElement extends ECFieldElement
-{
-    public static final BigInteger Q = Curve25519.q;
-
-    // Calculated as ECConstants.TWO.modPow(Q.shiftRight(2), Q)
-    private static final int[] PRECOMP_POW2 = new int[]{ 0x4a0ea0b0, 0xc4ee1b27, 0xad2fe478, 0x2f431806,
-        0x3dfbd7a7, 0x2b4d0099, 0x4fc1df0b, 0x2b832480 };
-
-    protected int[] x;
-
-    public Curve25519FieldElement(BigInteger x)
-    {
-        if (x == null || x.signum() < 0 || x.compareTo(Q) >= 0)
-        {
-            throw new IllegalArgumentException("x value invalid for Curve25519FieldElement");
-        }
-
-        this.x = Curve25519Field.fromBigInteger(x);
-    }
-
-    public Curve25519FieldElement()
-    {
-        this.x = Nat256.create();
-    }
-
-    protected Curve25519FieldElement(int[] x)
-    {
-        this.x = x;
-    }
-
-    public boolean isZero()
-    {
-        return Nat256.isZero(x);
-    }
-
-    public boolean isOne()
-    {
-        return Nat256.isOne(x);
-    }
-
-    public boolean testBitZero()
-    {
-        return Nat256.getBit(x, 0) == 1;
-    }
-
-    public BigInteger toBigInteger()
-    {
-        return Nat256.toBigInteger(x);
-    }
-
-    public String getFieldName()
-    {
-        return "Curve25519Field";
-    }
-
-    public int getFieldSize()
-    {
-        return Q.bitLength();
-    }
-
-    public ECFieldElement add(ECFieldElement b)
-    {
-        int[] z = Nat256.create();
-        Curve25519Field.add(x, ((Curve25519FieldElement)b).x, z);
-        return new Curve25519FieldElement(z);
-    }
-
-    public ECFieldElement addOne()
-    {
-        int[] z = Nat256.create();
-        Curve25519Field.addOne(x, z);
-        return new Curve25519FieldElement(z);
-    }
-
-    public ECFieldElement subtract(ECFieldElement b)
-    {
-        int[] z = Nat256.create();
-        Curve25519Field.subtract(x, ((Curve25519FieldElement)b).x, z);
-        return new Curve25519FieldElement(z);
-    }
-
-    public ECFieldElement multiply(ECFieldElement b)
-    {
-        int[] z = Nat256.create();
-        Curve25519Field.multiply(x, ((Curve25519FieldElement)b).x, z);
-        return new Curve25519FieldElement(z);
-    }
-
-    public ECFieldElement divide(ECFieldElement b)
-    {
-//        return multiply(b.invert());
-        int[] z = Nat256.create();
-        Mod.invert(Curve25519Field.P, ((Curve25519FieldElement)b).x, z);
-        Curve25519Field.multiply(z, x, z);
-        return new Curve25519FieldElement(z);
-    }
-
-    public ECFieldElement negate()
-    {
-        int[] z = Nat256.create();
-        Curve25519Field.negate(x, z);
-        return new Curve25519FieldElement(z);
-    }
-
-    public ECFieldElement square()
-    {
-        int[] z = Nat256.create();
-        Curve25519Field.square(x, z);
-        return new Curve25519FieldElement(z);
-    }
-
-    public ECFieldElement invert()
-    {
-//        return new Curve25519FieldElement(toBigInteger().modInverse(Q));
-        int[] z = Nat256.create();
-        Mod.invert(Curve25519Field.P, x, z);
-        return new Curve25519FieldElement(z);
-    }
-
-    /**
-     * return a sqrt root - the routine verifies that the calculation returns the right value - if
-     * none exists it returns null.
-     */
-    public ECFieldElement sqrt()
-    {
-        /*
-         * Q == 8m + 5, so we use Pocklington's method for this case.
-         *
-         * First, raise this element to the exponent 2^252 - 2^1 (i.e. m + 1)
-         * 
-         * Breaking up the exponent's binary representation into "repunits", we get:
-         * { 251 1s } { 1 0s }
-         * 
-         * Therefore we need an addition chain containing 251 (the lengths of the repunits)
-         * We use: 1, 2, 3, 4, 7, 11, 15, 30, 60, 120, 131, [251]
-         */
-
-        int[] x1 = this.x;
-        if (Nat256.isZero(x1) || Nat256.isOne(x1))
-        {
-            return this;
-        }
-
-        int[] x2 = Nat256.create();
-        Curve25519Field.square(x1, x2);
-        Curve25519Field.multiply(x2, x1, x2);
-        int[] x3 = x2;
-        Curve25519Field.square(x2, x3);
-        Curve25519Field.multiply(x3, x1, x3);
-        int[] x4 = Nat256.create();
-        Curve25519Field.square(x3, x4);
-        Curve25519Field.multiply(x4, x1, x4);
-        int[] x7 = Nat256.create();
-        Curve25519Field.squareN(x4, 3, x7);
-        Curve25519Field.multiply(x7, x3, x7);
-        int[] x11 = x3;
-        Curve25519Field.squareN(x7, 4, x11);
-        Curve25519Field.multiply(x11, x4, x11);
-        int[] x15 = x7;
-        Curve25519Field.squareN(x11, 4, x15);
-        Curve25519Field.multiply(x15, x4, x15);
-        int[] x30 = x4;
-        Curve25519Field.squareN(x15, 15, x30);
-        Curve25519Field.multiply(x30, x15, x30);
-        int[] x60 = x15;
-        Curve25519Field.squareN(x30, 30, x60);
-        Curve25519Field.multiply(x60, x30, x60);
-        int[] x120 = x30;
-        Curve25519Field.squareN(x60, 60, x120);
-        Curve25519Field.multiply(x120, x60, x120);
-        int[] x131 = x60;
-        Curve25519Field.squareN(x120, 11, x131);
-        Curve25519Field.multiply(x131, x11, x131);
-        int[] x251 = x11;
-        Curve25519Field.squareN(x131, 120, x251);
-        Curve25519Field.multiply(x251, x120, x251);
-
-        int[] t1 = x251;
-        Curve25519Field.square(t1, t1);
-
-        int[] t2 = x120;
-        Curve25519Field.square(t1, t2);
-
-        if (Nat256.eq(x1, t2))
-        {
-            return new Curve25519FieldElement(t1);
-        }
-
-        /*
-         * If the first guess is incorrect, we multiply by a precomputed power of 2 to get the second guess,
-         * which is ((4x)^(m + 1))/2 mod Q
-         */
-        Curve25519Field.multiply(t1, PRECOMP_POW2, t1);
-
-        Curve25519Field.square(t1, t2);
-
-        if (Nat256.eq(x1, t2))
-        {
-            return new Curve25519FieldElement(t1);
-        }
-
-        return null;
-    }
-
-    public boolean equals(Object other)
-    {
-        if (other == this)
-        {
-            return true;
-        }
-
-        if (!(other instanceof Curve25519FieldElement))
-        {
-            return false;
-        }
-
-        Curve25519FieldElement o = (Curve25519FieldElement)other;
-        return Nat256.eq(x, o.x);
-    }
-
-    public int hashCode()
-    {
-        return Q.hashCode() ^ Arrays.hashCode(x, 0, 8);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/math/ec/custom/djb/Curve25519Point.java b/bcprov/src/main/java/org/bouncycastle/math/ec/custom/djb/Curve25519Point.java
deleted file mode 100644
index b2700e3..0000000
--- a/bcprov/src/main/java/org/bouncycastle/math/ec/custom/djb/Curve25519Point.java
+++ /dev/null
@@ -1,348 +0,0 @@
-package org.bouncycastle.math.ec.custom.djb;
-
-import org.bouncycastle.math.ec.ECCurve;
-import org.bouncycastle.math.ec.ECFieldElement;
-import org.bouncycastle.math.ec.ECPoint;
-import org.bouncycastle.math.raw.Nat256;
-
-public class Curve25519Point extends ECPoint.AbstractFp
-{
-    /**
-     * Create a point which encodes with point compression.
-     * 
-     * @param curve the curve to use
-     * @param x affine x co-ordinate
-     * @param y affine y co-ordinate
-     * 
-     * @deprecated Use ECCurve.createPoint to construct points
-     */
-    public Curve25519Point(ECCurve curve, ECFieldElement x, ECFieldElement y)
-    {
-        this(curve, x, y, false);
-    }
-
-    /**
-     * Create a point that encodes with or without point compresion.
-     * 
-     * @param curve the curve to use
-     * @param x affine x co-ordinate
-     * @param y affine y co-ordinate
-     * @param withCompression if true encode with point compression
-     * 
-     * @deprecated per-point compression property will be removed, refer {@link #getEncoded(boolean)}
-     */
-    public Curve25519Point(ECCurve curve, ECFieldElement x, ECFieldElement y, boolean withCompression)
-    {
-        super(curve, x, y);
-
-        if ((x == null) != (y == null))
-        {
-            throw new IllegalArgumentException("Exactly one of the field elements is null");
-        }
-
-        this.withCompression = withCompression;
-    }
-
-    Curve25519Point(ECCurve curve, ECFieldElement x, ECFieldElement y, ECFieldElement[] zs, boolean withCompression)
-    {
-        super(curve, x, y, zs);
-
-        this.withCompression = withCompression;
-    }
-
-    protected ECPoint detach()
-    {
-        return new Curve25519Point(null, getAffineXCoord(), getAffineYCoord());
-    }
-
-    public ECFieldElement getZCoord(int index)
-    {
-        if (index == 1)
-        {
-            return getJacobianModifiedW();
-        }
-
-        return super.getZCoord(index);
-    }
-
-    public ECPoint add(ECPoint b)
-    {
-        if (this.isInfinity())
-        {
-            return b;
-        }
-        if (b.isInfinity())
-        {
-            return this;
-        }
-        if (this == b)
-        {
-            return twice();
-        }
-
-        ECCurve curve = this.getCurve();
-
-        Curve25519FieldElement X1 = (Curve25519FieldElement)this.x, Y1 = (Curve25519FieldElement)this.y,
-            Z1 = (Curve25519FieldElement)this.zs[0];
-        Curve25519FieldElement X2 = (Curve25519FieldElement)b.getXCoord(), Y2 = (Curve25519FieldElement)b.getYCoord(),
-            Z2 = (Curve25519FieldElement)b.getZCoord(0);
-
-        int c;
-        int[] tt1 = Nat256.createExt();
-        int[] t2 = Nat256.create();
-        int[] t3 = Nat256.create();
-        int[] t4 = Nat256.create();
-
-        boolean Z1IsOne = Z1.isOne();
-        int[] U2, S2;
-        if (Z1IsOne)
-        {
-            U2 = X2.x;
-            S2 = Y2.x;
-        }
-        else
-        {
-            S2 = t3;
-            Curve25519Field.square(Z1.x, S2);
-
-            U2 = t2;
-            Curve25519Field.multiply(S2, X2.x, U2);
-
-            Curve25519Field.multiply(S2, Z1.x, S2);
-            Curve25519Field.multiply(S2, Y2.x, S2);
-        }
-
-        boolean Z2IsOne = Z2.isOne();
-        int[] U1, S1;
-        if (Z2IsOne)
-        {
-            U1 = X1.x;
-            S1 = Y1.x;
-        }
-        else
-        {
-            S1 = t4;
-            Curve25519Field.square(Z2.x, S1);
-
-            U1 = tt1;
-            Curve25519Field.multiply(S1, X1.x, U1);
-
-            Curve25519Field.multiply(S1, Z2.x, S1);
-            Curve25519Field.multiply(S1, Y1.x, S1);
-        }
-
-        int[] H = Nat256.create();
-        Curve25519Field.subtract(U1, U2, H);
-
-        int[] R = t2;
-        Curve25519Field.subtract(S1, S2, R);
-
-        // Check if b == this or b == -this
-        if (Nat256.isZero(H))
-        {
-            if (Nat256.isZero(R))
-            {
-                // this == b, i.e. this must be doubled
-                return this.twice();
-            }
-
-            // this == -b, i.e. the result is the point at infinity
-            return curve.getInfinity();
-        }
-
-        int[] HSquared = Nat256.create();
-        Curve25519Field.square(H, HSquared);
-
-        int[] G = Nat256.create();
-        Curve25519Field.multiply(HSquared, H, G);
-
-        int[] V = t3;
-        Curve25519Field.multiply(HSquared, U1, V);
-
-        Curve25519Field.negate(G, G);
-        Nat256.mul(S1, G, tt1);
-
-        c = Nat256.addBothTo(V, V, G);
-        Curve25519Field.reduce27(c, G);
-
-        Curve25519FieldElement X3 = new Curve25519FieldElement(t4);
-        Curve25519Field.square(R, X3.x);
-        Curve25519Field.subtract(X3.x, G, X3.x);
-
-        Curve25519FieldElement Y3 = new Curve25519FieldElement(G);
-        Curve25519Field.subtract(V, X3.x, Y3.x);
-        Curve25519Field.multiplyAddToExt(Y3.x, R, tt1);
-        Curve25519Field.reduce(tt1, Y3.x);
-
-        Curve25519FieldElement Z3 = new Curve25519FieldElement(H);
-        if (!Z1IsOne)
-        {
-            Curve25519Field.multiply(Z3.x, Z1.x, Z3.x);
-        }
-        if (!Z2IsOne)
-        {
-            Curve25519Field.multiply(Z3.x, Z2.x, Z3.x);
-        }
-
-        int[] Z3Squared = (Z1IsOne && Z2IsOne) ? HSquared : null;
-
-        // TODO If the result will only be used in a subsequent addition, we don't need W3
-        Curve25519FieldElement W3 = calculateJacobianModifiedW((Curve25519FieldElement)Z3, Z3Squared);
-
-        ECFieldElement[] zs = new ECFieldElement[]{ Z3, W3 };
-
-        return new Curve25519Point(curve, X3, Y3, zs, this.withCompression);
-    }
-
-    public ECPoint twice()
-    {
-        if (this.isInfinity())
-        {
-            return this;
-        }
-
-        ECCurve curve = this.getCurve();
-
-        ECFieldElement Y1 = this.y;
-        if (Y1.isZero()) 
-        {
-            return curve.getInfinity();
-        }
-
-        return twiceJacobianModified(true);
-    }
-
-    public ECPoint twicePlus(ECPoint b)
-    {
-        if (this == b)
-        {
-            return threeTimes();
-        }
-        if (this.isInfinity())
-        {
-            return b;
-        }
-        if (b.isInfinity())
-        {
-            return twice();
-        }
-
-        ECFieldElement Y1 = this.y;
-        if (Y1.isZero()) 
-        {
-            return b;
-        }
-
-        return twiceJacobianModified(false).add(b);
-    }
-
-    public ECPoint threeTimes()
-    {
-        if (this.isInfinity())
-        {
-            return this;
-        }
-
-        ECFieldElement Y1 = this.y;
-        if (Y1.isZero())
-        {
-            return this;
-        }
-
-        return twiceJacobianModified(false).add(this);
-    }
-
-    public ECPoint negate()
-    {
-        if (this.isInfinity())
-        {
-            return this;
-        }
-
-        return new Curve25519Point(this.getCurve(), this.x, this.y.negate(), this.zs, this.withCompression);
-    }
-
-    protected Curve25519FieldElement calculateJacobianModifiedW(Curve25519FieldElement Z, int[] ZSquared)
-    {
-        Curve25519FieldElement a4 = (Curve25519FieldElement)this.getCurve().getA();
-        if (Z.isOne())
-        {
-            return a4;
-        }
-
-        Curve25519FieldElement W = new Curve25519FieldElement();
-        if (ZSquared == null)
-        {
-            ZSquared = W.x;
-            Curve25519Field.square(Z.x, ZSquared);
-        }
-        Curve25519Field.square(ZSquared, W.x);
-        Curve25519Field.multiply(W.x, a4.x, W.x);
-        return W;
-    }
-
-    protected Curve25519FieldElement getJacobianModifiedW()
-    {
-        Curve25519FieldElement W = (Curve25519FieldElement)this.zs[1];
-        if (W == null)
-        {
-            // NOTE: Rarely, twicePlus will result in the need for a lazy W1 calculation here
-            this.zs[1] = W = calculateJacobianModifiedW((Curve25519FieldElement)this.zs[0], null);
-        }
-        return W;
-    }
-
-    protected Curve25519Point twiceJacobianModified(boolean calculateW)
-    {
-        Curve25519FieldElement X1 = (Curve25519FieldElement)this.x, Y1 = (Curve25519FieldElement)this.y,
-            Z1 = (Curve25519FieldElement)this.zs[0], W1 = getJacobianModifiedW();
-
-        int c;
-
-        int[] M = Nat256.create();
-        Curve25519Field.square(X1.x, M);
-        c = Nat256.addBothTo(M, M, M);
-        c += Nat256.addTo(W1.x, M);
-        Curve25519Field.reduce27(c, M);
-
-        int[] _2Y1 = Nat256.create();
-        Curve25519Field.twice(Y1.x, _2Y1);
-
-        int[] _2Y1Squared = Nat256.create();
-        Curve25519Field.multiply(_2Y1, Y1.x, _2Y1Squared);
-
-        int[] S = Nat256.create();
-        Curve25519Field.multiply(_2Y1Squared, X1.x, S);
-        Curve25519Field.twice(S, S);
-
-        int[] _8T = Nat256.create();
-        Curve25519Field.square(_2Y1Squared, _8T);
-        Curve25519Field.twice(_8T, _8T);
-
-        Curve25519FieldElement X3 = new Curve25519FieldElement(_2Y1Squared);
-        Curve25519Field.square(M, X3.x);
-        Curve25519Field.subtract(X3.x, S, X3.x);
-        Curve25519Field.subtract(X3.x, S, X3.x);
-
-        Curve25519FieldElement Y3 = new Curve25519FieldElement(S);
-        Curve25519Field.subtract(S, X3.x, Y3.x);
-        Curve25519Field.multiply(Y3.x, M, Y3.x);
-        Curve25519Field.subtract(Y3.x, _8T, Y3.x);
-
-        Curve25519FieldElement Z3 = new Curve25519FieldElement(_2Y1);
-        if (!Nat256.isOne(Z1.x))
-        {
-            Curve25519Field.multiply(Z3.x, Z1.x, Z3.x);
-        }
-
-        Curve25519FieldElement W3 = null;
-        if (calculateW)
-        {
-            W3 = new Curve25519FieldElement(_8T);
-            Curve25519Field.multiply(W3.x, W1.x, W3.x);
-            Curve25519Field.twice(W3.x, W3.x);
-        }
-
-        return new Curve25519Point(this.getCurve(), X3, Y3, new ECFieldElement[]{ Z3, W3 }, this.withCompression);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/math/ec/custom/djb/package.html b/bcprov/src/main/java/org/bouncycastle/math/ec/custom/djb/package.html
deleted file mode 100644
index 344418b..0000000
--- a/bcprov/src/main/java/org/bouncycastle/math/ec/custom/djb/package.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<html>
-<body bgcolor="#ffffff">
-Experimental implementation of curve25519. Note that the curve implementation is in the short-Weierstrass form,
-which is not the recommended (nor most suitable) approach. In particular, the input/output conventions are not
-compliant with standard implementations, and point conversions would be needed to interoperate.
-</body>
-</html>
diff --git a/bcprov/src/main/java/org/bouncycastle/math/ec/custom/sec/package.html b/bcprov/src/main/java/org/bouncycastle/math/ec/custom/sec/package.html
deleted file mode 100644
index bb2845c..0000000
--- a/bcprov/src/main/java/org/bouncycastle/math/ec/custom/sec/package.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<html>
-<body bgcolor="#ffffff">
-Custom implementations of (most of) the curves over Fp from the SEC specification. Uses the new "raw" math classes
-in place of BigInteger, and includes customized modular reductions taking advantage of the special forms of the primes.
-</body>
-</html>
diff --git a/bcprov/src/main/java/org/bouncycastle/math/ec/package.html b/bcprov/src/main/java/org/bouncycastle/math/ec/package.html
deleted file mode 100644
index a02605b..0000000
--- a/bcprov/src/main/java/org/bouncycastle/math/ec/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body bgcolor="#ffffff">
-Math support for Elliptic Curve.
-</body>
-</html>
diff --git a/bcprov/src/main/java/org/bouncycastle/math/ec/tools/DiscoverEndomorphisms.java b/bcprov/src/main/java/org/bouncycastle/math/ec/tools/DiscoverEndomorphisms.java
deleted file mode 100644
index 4ee2de6..0000000
--- a/bcprov/src/main/java/org/bouncycastle/math/ec/tools/DiscoverEndomorphisms.java
+++ /dev/null
@@ -1,373 +0,0 @@
-package org.bouncycastle.math.ec.tools;
-
-import java.math.BigInteger;
-import java.security.SecureRandom;
-
-import org.bouncycastle.asn1.x9.ECNamedCurveTable;
-import org.bouncycastle.asn1.x9.X9ECParameters;
-import org.bouncycastle.math.ec.ECAlgorithms;
-import org.bouncycastle.math.ec.ECConstants;
-import org.bouncycastle.math.ec.ECCurve;
-import org.bouncycastle.math.ec.ECFieldElement;
-import org.bouncycastle.math.ec.ECPoint;
-import org.bouncycastle.util.BigIntegers;
-
-public class DiscoverEndomorphisms
-{
-    private static final int radix = 16;
-
-    public static void main(String[] args)
-    {
-        if (args.length < 1)
-        {
-            System.err.println("Expected a list of curve names as arguments");
-            return;
-        }
-
-        for (int i = 0; i < args.length; ++i)
-        {
-            discoverEndomorphism(args[i]);
-        }
-    }
-
-    private static void discoverEndomorphism(String curveName)
-    {
-        X9ECParameters x9 = ECNamedCurveTable.getByName(curveName);
-        if (x9 == null)
-        {
-            System.err.println("Unknown curve: " + curveName);
-            return;
-        }
-
-        ECCurve c = x9.getCurve();
-        if (ECAlgorithms.isFpCurve(c))
-        {
-            BigInteger characteristic = c.getField().getCharacteristic();
-
-            if (c.getA().isZero() && characteristic.mod(ECConstants.THREE).equals(ECConstants.ONE))
-            {
-                System.out.println("Curve '" + curveName + "' has a 'GLV Type B' endomorphism with these parameters: ");
-                printGLVTypeBParameters(x9);
-            }
-        }
-    }
-
-    private static void printGLVTypeBParameters(X9ECParameters x9)
-    {
-        BigInteger n = x9.getN();
-        BigInteger[] v1 = null;
-        BigInteger[] v2 = null;
-
-        // x^2 + x + 1 = 0 mod n
-        BigInteger lambda = solveQuadraticEquation(n, ECConstants.ONE, ECConstants.ONE);
-
-        BigInteger[] rt = extEuclidGLV(n, lambda);
-        v1 = new BigInteger[]{ rt[2], rt[3].negate() };
-        v2 = chooseShortest(new BigInteger[]{ rt[0], rt[1].negate() }, new BigInteger[]{ rt[4], rt[5].negate() });
-
-        /*
-         * If elements of v2 are not bounded by sqrt(n), then if r1/t1 are relatively prime there
-         * _may_ yet be a GLV generator, so search for it. See
-         * "Integer Decomposition for Fast Scalar Multiplication on Elliptic Curves", D. Kim, S. Lim
-         * (SAC 2002)
-         */
-        if (!isVectorBoundedBySqrt(v2, n) && areRelativelyPrime(v1[0], v1[1]))
-        {
-            BigInteger r = v1[0], t = v1[1], s = r.add(t.multiply(lambda)).divide(n);
-
-            BigInteger[] vw = extEuclidBezout(new BigInteger[]{ s.abs(), t.abs() });
-            BigInteger v = vw[0], w = vw[1];
-
-            if (s.signum() < 0)
-            {
-                v = v.negate();
-            }
-            if (t.signum() > 0)
-            {
-                w = w.negate();
-            }
-
-            BigInteger check = s.multiply(v).subtract(t.multiply(w));
-            if (!check.equals(ECConstants.ONE))
-            {
-                throw new IllegalStateException();
-            }
-
-            BigInteger x = w.multiply(n).subtract(v.multiply(lambda));
-
-            BigInteger base1 = v.negate();
-            BigInteger base2 = x.negate();
-
-            /*
-             * We calculate the range(s) conservatively large to avoid messy rounding issues, so
-             * there may be spurious candidate generators, but we won't miss any.
-             */
-            BigInteger sqrtN = isqrt(n.subtract(ECConstants.ONE)).add(ECConstants.ONE);
-
-            BigInteger[] I1 = calculateRange(base1, sqrtN, t);
-            BigInteger[] I2 = calculateRange(base2, sqrtN, r);
-
-            BigInteger[] range = intersect(I1, I2);
-            if (range != null)
-            {
-                for (BigInteger alpha = range[0]; alpha.compareTo(range[1]) <= 0; alpha = alpha.add(ECConstants.ONE))
-                {
-                    BigInteger[] candidate = new BigInteger[]{ x.add(alpha.multiply(r)), v.add(alpha.multiply(t)) };
-                    if (isShorter(candidate, v2))
-                    {
-                        v2 = candidate;
-                    }
-                }
-            }
-        }
-
-        /*
-         * 'Beta' is a field element of order 3. There are only two such values besides 1; determine which of them
-         * corresponds to our choice for 'Lambda'.
-         */
-        ECFieldElement beta;
-        {
-            ECPoint G = x9.getG().normalize();
-            ECPoint mapG = G.multiply(lambda).normalize();
-            if (!G.getYCoord().equals(mapG.getYCoord()))
-            {
-                throw new IllegalStateException("Derivation of GLV Type B parameters failed unexpectedly");
-            }
-    
-            BigInteger q = x9.getCurve().getField().getCharacteristic();
-            BigInteger e = q.divide(ECConstants.THREE);
-
-            SecureRandom random = new SecureRandom();
-            BigInteger b;
-            do
-            {
-                BigInteger r = BigIntegers.createRandomInRange(ECConstants.TWO, q.subtract(ECConstants.TWO), random);
-                b = r.modPow(e, q);
-            }
-            while (b.equals(ECConstants.ONE));
-
-            beta = x9.getCurve().fromBigInteger(ECConstants.TWO.modPow(e, q));
-
-            if (!G.getXCoord().multiply(beta).equals(mapG.getXCoord()))
-            {
-                beta = beta.square();
-                if (!G.getXCoord().multiply(beta).equals(mapG.getXCoord()))
-                {
-                    throw new IllegalStateException("Derivation of GLV Type B parameters failed unexpectedly");
-                }
-            }
-        }
-
-        /*
-         * These parameters are used to avoid division when decomposing the scalar in a GLV point multiplication
-         */
-        BigInteger d = (v1[0].multiply(v2[1])).subtract(v1[1].multiply(v2[0]));
-
-        int bits = n.bitLength() + 16 - (n.bitLength() & 7);
-        BigInteger g1 = roundQuotient(v2[1].shiftLeft(bits), d);
-        BigInteger g2 = roundQuotient(v1[1].shiftLeft(bits), d).negate();
-
-        printProperty("Beta", beta.toBigInteger().toString(radix));
-        printProperty("Lambda", lambda.toString(radix));
-        printProperty("v1", "{ " + v1[0].toString(radix) + ", " + v1[1].toString(radix) + " }");
-        printProperty("v2", "{ " + v2[0].toString(radix) + ", " + v2[1].toString(radix) + " }");
-        printProperty("(OPT) g1", g1.toString(radix));
-        printProperty("(OPT) g2", g2.toString(radix));
-        printProperty("(OPT) bits", Integer.toString(bits));
-    }
-
-    private static void printProperty(String name, Object value)
-    {
-        StringBuffer sb = new StringBuffer("  ");
-        sb.append(name);
-        while (sb.length() < 20)
-        {
-            sb.append(' ');
-        }
-        sb.append("= ");
-        sb.append(value.toString());
-        System.out.println(sb.toString());
-    }
-
-    private static boolean areRelativelyPrime(BigInteger a, BigInteger b)
-    {
-        return a.gcd(b).equals(ECConstants.ONE);
-    }
-
-    private static BigInteger[] calculateRange(BigInteger mid, BigInteger off, BigInteger div)
-    {
-        BigInteger i1 = mid.subtract(off).divide(div);
-        BigInteger i2 = mid.add(off).divide(div);
-        return order(i1, i2);
-    }
-
-    private static BigInteger[] extEuclidBezout(BigInteger[] ab)
-    {
-        boolean swap = ab[0].compareTo(ab[1]) < 0;
-        if (swap)
-        {
-            swap(ab);
-        }
-
-        BigInteger r0 = ab[0], r1 = ab[1];
-        BigInteger s0 = ECConstants.ONE, s1 = ECConstants.ZERO;
-        BigInteger t0 = ECConstants.ZERO, t1 = ECConstants.ONE;
-
-        while (r1.compareTo(ECConstants.ONE) > 0)
-        {
-            BigInteger[] qr = r0.divideAndRemainder(r1);
-            BigInteger q = qr[0], r2 = qr[1];
-
-            BigInteger s2 = s0.subtract(q.multiply(s1));
-            BigInteger t2 = t0.subtract(q.multiply(t1));
-
-            r0 = r1;
-            r1 = r2;
-            s0 = s1;
-            s1 = s2;
-            t0 = t1;
-            t1 = t2;
-        }
-
-        if (r1.signum() <= 0)
-        {
-            throw new IllegalStateException();
-        }
-
-        BigInteger[] st = new BigInteger[]{ s1, t1 };
-        if (swap)
-        {
-            swap(st);
-        }
-        return st;
-    }
-
-    private static BigInteger[] extEuclidGLV(BigInteger n, BigInteger lambda)
-    {
-        BigInteger r0 = n, r1 = lambda;
-        // BigInteger s0 = ECConstants.ONE, s1 = ECConstants.ZERO;
-        BigInteger t0 = ECConstants.ZERO, t1 = ECConstants.ONE;
-
-        for (;;)
-        {
-            BigInteger[] qr = r0.divideAndRemainder(r1);
-            BigInteger q = qr[0], r2 = qr[1];
-
-            // BigInteger s2 = s0.subtract(q.multiply(s1));
-            BigInteger t2 = t0.subtract(q.multiply(t1));
-
-            if (isLessThanSqrt(r1, n))
-            {
-                return new BigInteger[]{ r0, t0, r1, t1, r2, t2 };
-            }
-
-            r0 = r1;
-            r1 = r2;
-            // s0 = s1;
-            // s1 = s2;
-            t0 = t1;
-            t1 = t2;
-        }
-    }
-
-    private static BigInteger[] chooseShortest(BigInteger[] u, BigInteger[] v)
-    {
-        return isShorter(u, v) ? u : v;
-    }
-
-    private static BigInteger[] intersect(BigInteger[] ab, BigInteger[] cd)
-    {
-        BigInteger min = ab[0].max(cd[0]);
-        BigInteger max = ab[1].min(cd[1]);
-        if (min.compareTo(max) > 0)
-        {
-            return null;
-        }
-        return new BigInteger[]{ min, max };
-    }
-
-    private static boolean isLessThanSqrt(BigInteger a, BigInteger b)
-    {
-        a = a.abs();
-        b = b.abs();
-        int target = b.bitLength(), maxBits = a.bitLength() * 2, minBits = maxBits - 1;
-        return minBits <= target && (maxBits < target || a.multiply(a).compareTo(b) < 0);
-    }
-
-    private static boolean isShorter(BigInteger[] u, BigInteger[] v)
-    {
-        BigInteger u1 = u[0].abs(), u2 = u[1].abs(), v1 = v[0].abs(), v2 = v[1].abs();
-
-        // TODO Check whether "shorter" just means by rectangle norm:
-        // return u1.max(u2).compareTo(v1.max(v2)) < 0;
-
-        boolean c1 = u1.compareTo(v1) < 0, c2 = u2.compareTo(v2) < 0;
-        if (c1 == c2)
-        {
-            return c1;
-        }
-
-        BigInteger du = u1.multiply(u1).add(u2.multiply(u2));
-        BigInteger dv = v1.multiply(v1).add(v2.multiply(v2));
-
-        return du.compareTo(dv) < 0;
-    }
-
-    private static boolean isVectorBoundedBySqrt(BigInteger[] v, BigInteger n)
-    {
-        BigInteger max = v[0].abs().max(v[1].abs());
-        return isLessThanSqrt(max, n);
-    }
-
-    private static BigInteger[] order(BigInteger a, BigInteger b)
-    {
-        if (a.compareTo(b) <= 0)
-        {
-            return new BigInteger[]{ a, b };
-        }
-        return new BigInteger[]{ b, a };
-    }
-
-    private static BigInteger roundQuotient(BigInteger x, BigInteger y)
-    {
-        boolean negative = (x.signum() != y.signum());
-        x = x.abs();
-        y = y.abs();
-        BigInteger result = x.add(y.shiftRight(1)).divide(y);
-        return negative ? result.negate() : result;
-    }
-
-    private static BigInteger solveQuadraticEquation(BigInteger n, BigInteger r, BigInteger s)
-    {
-        BigInteger det = r.multiply(r).subtract(s.shiftLeft(2)).mod(n);
-
-        BigInteger root = new ECFieldElement.Fp(n, det).sqrt().toBigInteger();
-        if (!root.testBit(0))
-        {
-            root = n.subtract(root);
-        }
-
-        return root.shiftRight(1); // NOTE: implicit -1 of the low-bit
-    }
-
-    private static BigInteger isqrt(BigInteger x)
-    {
-        BigInteger g0 = x.shiftRight(x.bitLength() / 2);
-        for (;;)
-        {
-            BigInteger g1 = g0.add(x.divide(g0)).shiftRight(1);
-            if (g1.equals(g0))
-            {
-                return g1;
-            }
-            g0 = g1;
-        }
-    }
-
-    private static void swap(BigInteger[] ab)
-    {
-        BigInteger tmp = ab[0];
-        ab[0] = ab[1];
-        ab[1] = tmp;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/math/raw/Mont256.java b/bcprov/src/main/java/org/bouncycastle/math/raw/Mont256.java
deleted file mode 100644
index 750221f..0000000
--- a/bcprov/src/main/java/org/bouncycastle/math/raw/Mont256.java
+++ /dev/null
@@ -1,152 +0,0 @@
-package org.bouncycastle.math.raw;
-
-public abstract class Mont256
-{
-    private static final long M = 0xFFFFFFFFL;
-
-    public static int inverse32(int x)
-    {
-        // assert (x & 1) == 1;
-        int z = x; // x.z == 1 mod 2**3
-        z *= 2 - x * z; // x.z == 1 mod 2**6
-        z *= 2 - x * z; // x.z == 1 mod 2**12
-        z *= 2 - x * z; // x.z == 1 mod 2**24
-        z *= 2 - x * z; // x.z == 1 mod 2**48
-        // assert x * z == 1;
-        return z;
-    }
-
-    public static void multAdd(int[] x, int[] y, int[] z, int[] m, int mInv32)
-    {
-        int z_8 = 0;
-        long y_0 = y[0] & M;
-
-        for (int i = 0; i < 8; ++i)
-        {
-            long z_0 = z[0] & M;
-            long x_i = x[i] & M;
-
-            long prod1 = x_i * y_0;
-            long carry = (prod1 & M) + z_0;
-
-            long t = ((int)carry * mInv32) & M;
-
-            long prod2 = t * (m[0] & M);
-            carry += (prod2 & M);
-            // assert (int)carry == 0;
-            carry = (carry >>> 32) + (prod1 >>> 32) + (prod2 >>> 32);
-
-            for (int j = 1; j < 8; ++j)
-            {
-                prod1 = x_i * (y[j] & M);
-                prod2 = t * (m[j] & M);
-
-                carry += (prod1 & M) + (prod2 & M) + (z[j] & M);
-                z[j - 1] = (int)carry;
-                carry = (carry >>> 32) + (prod1 >>> 32) + (prod2 >>> 32);
-            }
-
-            carry += (z_8 & M);
-            z[7] = (int)carry;
-            z_8 = (int)(carry >>> 32);
-        }
-
-        if (z_8 != 0 || Nat256.gte(z, m))
-        {
-            Nat256.sub(z, m, z);
-        }
-    }
-
-    public static void multAddXF(int[] x, int[] y, int[] z, int[] m)
-    {
-        // assert m[0] == M;
-
-        int z_8 = 0;
-        long y_0 = y[0] & M;
-
-        for (int i = 0; i < 8; ++i)
-        {
-            long x_i = x[i] & M;
-
-            long carry = x_i * y_0 + (z[0] & M);
-            long t = carry & M;
-            carry = (carry >>> 32) + t;
-
-            for (int j = 1; j < 8; ++j)
-            {
-                long prod1 = x_i * (y[j] & M);
-                long prod2 = t * (m[j] & M);
-
-                carry += (prod1 & M) + (prod2 & M) + (z[j] & M);
-                z[j - 1] = (int)carry;
-                carry = (carry >>> 32) + (prod1 >>> 32) + (prod2 >>> 32);
-            }
-
-            carry += (z_8 & M);
-            z[7] = (int)carry;
-            z_8 = (int)(carry >>> 32);
-        }
-
-        if (z_8 != 0 || Nat256.gte(z, m))
-        {
-            Nat256.sub(z, m, z);
-        }
-    }
-
-    public static void reduce(int[] z, int[] m, int mInv32)
-    {
-        for (int i = 0; i < 8; ++i)
-        {
-            int z_0 = z[0];
-
-            long t = (z_0 * mInv32) & M;
-
-            long carry = t * (m[0] & M) + (z_0 & M);
-            // assert (int)carry == 0;
-            carry >>>= 32;
-
-            for (int j = 1; j < 8; ++j)
-            {
-                carry += t * (m[j] & M) + (z[j] & M);
-                z[j - 1] = (int)carry;
-                carry >>>= 32;
-            }
-
-            z[7] = (int)carry;
-            // assert carry >>> 32 == 0;
-        }
-
-        if (Nat256.gte(z, m))
-        {
-            Nat256.sub(z, m, z);
-        }
-    }
-
-    public static void reduceXF(int[] z, int[] m)
-    {
-        // assert m[0] == M;
-
-        for (int i = 0; i < 8; ++i)
-        {
-            int z_0 = z[0];
-
-            long t = z_0 & M;
-            long carry = t;
-
-            for (int j = 1; j < 8; ++j)
-            {
-                carry += t * (m[j] & M) + (z[j] & M);
-                z[j - 1] = (int)carry;
-                carry >>>= 32;
-            }
-
-            z[7] = (int)carry;
-            // assert carry >>> 32 == 0;
-        }
-
-        if (Nat256.gte(z, m))
-        {
-            Nat256.sub(z, m, z);
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/math/raw/package.html b/bcprov/src/main/java/org/bouncycastle/math/raw/package.html
deleted file mode 100644
index 061958b..0000000
--- a/bcprov/src/main/java/org/bouncycastle/math/raw/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body bgcolor="#ffffff">
-Math support for raw multi-precision calculations.
-</body>
-</html>
diff --git a/bcprov/src/main/java/org/bouncycastle/ocsp/package.html b/bcprov/src/main/java/org/bouncycastle/ocsp/package.html
deleted file mode 100644
index ca4f531..0000000
--- a/bcprov/src/main/java/org/bouncycastle/ocsp/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body bgcolor="#ffffff">
-Classes for dealing Online Certificate Status Protocol (OCSP) - RFC 2560.
-</body>
-</html>
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/asn1/GMSSPrivateKey.java b/bcprov/src/main/java/org/bouncycastle/pqc/asn1/GMSSPrivateKey.java
deleted file mode 100644
index 4e182c5..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/asn1/GMSSPrivateKey.java
+++ /dev/null
@@ -1,1312 +0,0 @@
-package org.bouncycastle.pqc.asn1;
-
-import java.math.BigInteger;
-import java.util.Vector;
-
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DEROctetString;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.pqc.crypto.gmss.GMSSLeaf;
-import org.bouncycastle.pqc.crypto.gmss.GMSSParameters;
-import org.bouncycastle.pqc.crypto.gmss.GMSSRootCalc;
-import org.bouncycastle.pqc.crypto.gmss.GMSSRootSig;
-import org.bouncycastle.pqc.crypto.gmss.Treehash;
-
-public class GMSSPrivateKey
-    extends ASN1Object
-{
-    private ASN1Primitive primitive;
-
-    private GMSSPrivateKey(ASN1Sequence mtsPrivateKey)
-    {
-        // --- Decode <index>.
-        ASN1Sequence indexPart = (ASN1Sequence)mtsPrivateKey.getObjectAt(0);
-        int[] index = new int[indexPart.size()];
-        for (int i = 0; i < indexPart.size(); i++)
-        {
-            index[i] = checkBigIntegerInIntRange(indexPart.getObjectAt(i));
-        }
-
-        // --- Decode <curSeeds>.
-        ASN1Sequence curSeedsPart = (ASN1Sequence)mtsPrivateKey.getObjectAt(1);
-        byte[][] curSeeds = new byte[curSeedsPart.size()][];
-        for (int i = 0; i < curSeeds.length; i++)
-        {
-            curSeeds[i] = ((DEROctetString)curSeedsPart.getObjectAt(i)).getOctets();
-        }
-
-        // --- Decode <nextNextSeeds>.
-        ASN1Sequence nextNextSeedsPart = (ASN1Sequence)mtsPrivateKey.getObjectAt(2);
-        byte[][] nextNextSeeds = new byte[nextNextSeedsPart.size()][];
-        for (int i = 0; i < nextNextSeeds.length; i++)
-        {
-            nextNextSeeds[i] = ((DEROctetString)nextNextSeedsPart.getObjectAt(i)).getOctets();
-        }
-
-        // --- Decode <curAuth>.
-        ASN1Sequence curAuthPart0 = (ASN1Sequence)mtsPrivateKey.getObjectAt(3);
-        ASN1Sequence curAuthPart1;
-
-        byte[][][] curAuth = new byte[curAuthPart0.size()][][];
-        for (int i = 0; i < curAuth.length; i++)
-        {
-            curAuthPart1 = (ASN1Sequence)curAuthPart0.getObjectAt(i);
-            curAuth[i] = new byte[curAuthPart1.size()][];
-            for (int j = 0; j < curAuth[i].length; j++)
-            {
-                curAuth[i][j] = ((DEROctetString)curAuthPart1.getObjectAt(j)).getOctets();
-            }
-        }
-
-        // --- Decode <nextAuth>.
-        ASN1Sequence nextAuthPart0 = (ASN1Sequence)mtsPrivateKey.getObjectAt(4);
-        ASN1Sequence nextAuthPart1;
-
-        byte[][][] nextAuth = new byte[nextAuthPart0.size()][][];
-        for (int i = 0; i < nextAuth.length; i++)
-        {
-            nextAuthPart1 = (ASN1Sequence)nextAuthPart0.getObjectAt(i);
-            nextAuth[i] = new byte[nextAuthPart1.size()][];
-            for (int j = 0; j < nextAuth[i].length; j++)
-            {
-                nextAuth[i][j] = ((DEROctetString)nextAuthPart1.getObjectAt(j)).getOctets();
-            }
-        }
-
-        // --- Decode <curTreehash>.
-        ASN1Sequence seqOfcurTreehash0 = (ASN1Sequence)mtsPrivateKey.getObjectAt(5);
-        ASN1Sequence seqOfcurTreehash1;
-        ASN1Sequence seqOfcurTreehashStat;
-        ASN1Sequence seqOfcurTreehashBytes;
-        ASN1Sequence seqOfcurTreehashInts;
-        ASN1Sequence seqOfcurTreehashString;
-
-        Treehash[][] curTreehash = new Treehash[seqOfcurTreehash0.size()][];
-        /*
-        for (int i = 0; i < curTreehash.length; i++)
-        {
-            seqOfcurTreehash1 = (ASN1Sequence)seqOfcurTreehash0.getObjectAt(i);
-            curTreehash[i] = new Treehash[seqOfcurTreehash1.size()];
-            for (int j = 0; j < curTreehash[i].length; j++)
-            {
-                seqOfcurTreehashStat = (ASN1Sequence)seqOfcurTreehash1.getObjectAt(j);
-                seqOfcurTreehashString = (ASN1Sequence)seqOfcurTreehashStat
-                    .getObjectAt(0);
-                seqOfcurTreehashBytes = (ASN1Sequence)seqOfcurTreehashStat
-                    .getObjectAt(1);
-                seqOfcurTreehashInts = (ASN1Sequence)seqOfcurTreehashStat
-                    .getObjectAt(2);
-
-                String[] name = new String[2];
-                name[0] = ((DERIA5String)seqOfcurTreehashString.getObjectAt(0)).getString();
-                name[1] = ((DERIA5String)seqOfcurTreehashString.getObjectAt(1)).getString();
-
-                int tailLength = checkBigIntegerInIntRange(seqOfcurTreehashInts.getObjectAt(1));
-                byte[][] statByte = new byte[3 + tailLength][];
-                statByte[0] = ((DEROctetString)seqOfcurTreehashBytes.getObjectAt(0)).getOctets();
-
-                if (statByte[0].length == 0)
-                { // if null was encoded
-                    statByte[0] = null;
-                }
-
-                statByte[1] = ((DEROctetString)seqOfcurTreehashBytes.getObjectAt(1)).getOctets();
-                statByte[2] = ((DEROctetString)seqOfcurTreehashBytes.getObjectAt(2)).getOctets();
-                for (int k = 0; k < tailLength; k++)
-                {
-                    statByte[3 + k] = ((DEROctetString)seqOfcurTreehashBytes
-                        .getObjectAt(3 + k)).getOctets();
-                }
-                int[] statInt = new int[6 + tailLength];
-                statInt[0] = checkBigIntegerInIntRange(seqOfcurTreehashInts.getObjectAt(0));
-                statInt[1] = tailLength;
-                statInt[2] = checkBigIntegerInIntRange(seqOfcurTreehashInts.getObjectAt(2));
-                statInt[3] = checkBigIntegerInIntRange(seqOfcurTreehashInts.getObjectAt(3));
-                statInt[4] = checkBigIntegerInIntRange(seqOfcurTreehashInts.getObjectAt(4));
-                statInt[5] = checkBigIntegerInIntRange(seqOfcurTreehashInts.getObjectAt(5));
-                for (int k = 0; k < tailLength; k++)
-                {
-                    statInt[6 + k] = checkBigIntegerInIntRange(seqOfcurTreehashInts.getObjectAt(6 + k));
-                }
-
-                // TODO: Check if we can do better than throwing away name[1] !!!
-                curTreehash[i][j] = new Treehash(DigestFactory.getDigest(name[0]).getClass(), statByte, statInt);
-            }
-        }
-
-
-        // --- Decode <nextTreehash>.
-        ASN1Sequence seqOfNextTreehash0 = (ASN1Sequence)mtsPrivateKey.getObjectAt(6);
-        ASN1Sequence seqOfNextTreehash1;
-        ASN1Sequence seqOfNextTreehashStat;
-        ASN1Sequence seqOfNextTreehashBytes;
-        ASN1Sequence seqOfNextTreehashInts;
-        ASN1Sequence seqOfNextTreehashString;
-
-        Treehash[][] nextTreehash = new Treehash[seqOfNextTreehash0.size()][];
-
-        for (int i = 0; i < nextTreehash.length; i++)
-        {
-            seqOfNextTreehash1 = (ASN1Sequence)seqOfNextTreehash0.getObjectAt(i);
-            nextTreehash[i] = new Treehash[seqOfNextTreehash1.size()];
-            for (int j = 0; j < nextTreehash[i].length; j++)
-            {
-                seqOfNextTreehashStat = (ASN1Sequence)seqOfNextTreehash1
-                    .getObjectAt(j);
-                seqOfNextTreehashString = (ASN1Sequence)seqOfNextTreehashStat
-                    .getObjectAt(0);
-                seqOfNextTreehashBytes = (ASN1Sequence)seqOfNextTreehashStat
-                    .getObjectAt(1);
-                seqOfNextTreehashInts = (ASN1Sequence)seqOfNextTreehashStat
-                    .getObjectAt(2);
-
-                String[] name = new String[2];
-                name[0] = ((DERIA5String)seqOfNextTreehashString.getObjectAt(0))
-                    .getString();
-                name[1] = ((DERIA5String)seqOfNextTreehashString.getObjectAt(1))
-                    .getString();
-
-                int tailLength = checkBigIntegerInIntRange(seqOfNextTreehashInts.getObjectAt(1));
-
-                byte[][] statByte = new byte[3 + tailLength][];
-                statByte[0] = ((DEROctetString)seqOfNextTreehashBytes.getObjectAt(0)).getOctets();
-                if (statByte[0].length == 0)
-                { // if null was encoded
-                    statByte[0] = null;
-                }
-
-                statByte[1] = ((DEROctetString)seqOfNextTreehashBytes.getObjectAt(1)).getOctets();
-                statByte[2] = ((DEROctetString)seqOfNextTreehashBytes.getObjectAt(2)).getOctets();
-                for (int k = 0; k < tailLength; k++)
-                {
-                    statByte[3 + k] = ((DEROctetString)seqOfNextTreehashBytes
-                        .getObjectAt(3 + k)).getOctets();
-                }
-                int[] statInt = new int[6 + tailLength];
-                statInt[0] = checkBigIntegerInIntRange(seqOfNextTreehashInts.getObjectAt(0));
-
-                statInt[1] = tailLength;
-                statInt[2] = checkBigIntegerInIntRange(seqOfNextTreehashInts.getObjectAt(2));
-
-                statInt[3] = checkBigIntegerInIntRange(seqOfNextTreehashInts.getObjectAt(3));
-
-                statInt[4] = checkBigIntegerInIntRange(seqOfNextTreehashInts.getObjectAt(4));
-
-                statInt[5] = checkBigIntegerInIntRange(seqOfNextTreehashInts.getObjectAt(5));
-
-                for (int k = 0; k < tailLength; k++)
-                {
-                    statInt[6 + k] = checkBigIntegerInIntRange(seqOfNextTreehashInts.getObjectAt(6 + k));
-
-                }
-                nextTreehash[i][j] = new Treehash(DigestFactory.getDigest(name[0]).getClass(), statByte, statInt);
-            }
-        }
-
-
-        // --- Decode <keep>.
-        ASN1Sequence keepPart0 = (ASN1Sequence)mtsPrivateKey.getObjectAt(7);
-        ASN1Sequence keepPart1;
-
-        byte[][][] keep = new byte[keepPart0.size()][][];
-        for (int i = 0; i < keep.length; i++)
-        {
-            keepPart1 = (ASN1Sequence)keepPart0.getObjectAt(i);
-            keep[i] = new byte[keepPart1.size()][];
-            for (int j = 0; j < keep[i].length; j++)
-            {
-                keep[i][j] = ((DEROctetString)keepPart1.getObjectAt(j)).getOctets();
-            }
-        }
-
-        // --- Decode <curStack>.
-        ASN1Sequence curStackPart0 = (ASN1Sequence)mtsPrivateKey.getObjectAt(8);
-        ASN1Sequence curStackPart1;
-
-        Vector[] curStack = new Vector[curStackPart0.size()];
-        for (int i = 0; i < curStack.length; i++)
-        {
-            curStackPart1 = (ASN1Sequence)curStackPart0.getObjectAt(i);
-            curStack[i] = new Vector();
-            for (int j = 0; j < curStackPart1.size(); j++)
-            {
-                curStack[i].addElement(((DEROctetString)curStackPart1.getObjectAt(j)).getOctets());
-            }
-        }
-
-        // --- Decode <nextStack>.
-        ASN1Sequence nextStackPart0 = (ASN1Sequence)mtsPrivateKey.getObjectAt(9);
-        ASN1Sequence nextStackPart1;
-
-        Vector[] nextStack = new Vector[nextStackPart0.size()];
-        for (int i = 0; i < nextStack.length; i++)
-        {
-            nextStackPart1 = (ASN1Sequence)nextStackPart0.getObjectAt(i);
-            nextStack[i] = new Vector();
-            for (int j = 0; j < nextStackPart1.size(); j++)
-            {
-                nextStack[i].addElement(((DEROctetString)nextStackPart1
-                    .getObjectAt(j)).getOctets());
-            }
-        }
-
-        // --- Decode <curRetain>.
-        ASN1Sequence curRetainPart0 = (ASN1Sequence)mtsPrivateKey.getObjectAt(10);
-        ASN1Sequence curRetainPart1;
-        ASN1Sequence curRetainPart2;
-
-        Vector[][] curRetain = new Vector[curRetainPart0.size()][];
-        for (int i = 0; i < curRetain.length; i++)
-        {
-            curRetainPart1 = (ASN1Sequence)curRetainPart0.getObjectAt(i);
-            curRetain[i] = new Vector[curRetainPart1.size()];
-            for (int j = 0; j < curRetain[i].length; j++)
-            {
-                curRetainPart2 = (ASN1Sequence)curRetainPart1.getObjectAt(j);
-                curRetain[i][j] = new Vector();
-                for (int k = 0; k < curRetainPart2.size(); k++)
-                {
-                    curRetain[i][j]
-                        .addElement(((DEROctetString)curRetainPart2
-                            .getObjectAt(k)).getOctets());
-                }
-            }
-        }
-
-        // --- Decode <nextRetain>.
-        ASN1Sequence nextRetainPart0 = (ASN1Sequence)mtsPrivateKey.getObjectAt(11);
-        ASN1Sequence nextRetainPart1;
-        ASN1Sequence nextRetainPart2;
-
-        Vector[][] nextRetain = new Vector[nextRetainPart0.size()][];
-        for (int i = 0; i < nextRetain.length; i++)
-        {
-            nextRetainPart1 = (ASN1Sequence)nextRetainPart0.getObjectAt(i);
-            nextRetain[i] = new Vector[nextRetainPart1.size()];
-            for (int j = 0; j < nextRetain[i].length; j++)
-            {
-                nextRetainPart2 = (ASN1Sequence)nextRetainPart1.getObjectAt(j);
-                nextRetain[i][j] = new Vector();
-                for (int k = 0; k < nextRetainPart2.size(); k++)
-                {
-                    nextRetain[i][j]
-                        .addElement(((DEROctetString)nextRetainPart2
-                            .getObjectAt(k)).getOctets());
-                }
-            }
-        }
-
-        // --- Decode <nextNextLeaf>.
-        ASN1Sequence seqOfLeafs = (ASN1Sequence)mtsPrivateKey.getObjectAt(12);
-        ASN1Sequence seqOfLeafStat;
-        ASN1Sequence seqOfLeafBytes;
-        ASN1Sequence seqOfLeafInts;
-        ASN1Sequence seqOfLeafString;
-
-        GMSSLeaf[] nextNextLeaf = new GMSSLeaf[seqOfLeafs.size()];
-
-        for (int i = 0; i < nextNextLeaf.length; i++)
-        {
-            seqOfLeafStat = (ASN1Sequence)seqOfLeafs.getObjectAt(i);
-            // nextNextAuth[i]= new byte[nextNextAuthPart1.size()][];
-            seqOfLeafString = (ASN1Sequence)seqOfLeafStat.getObjectAt(0);
-            seqOfLeafBytes = (ASN1Sequence)seqOfLeafStat.getObjectAt(1);
-            seqOfLeafInts = (ASN1Sequence)seqOfLeafStat.getObjectAt(2);
-
-            String[] name = new String[2];
-            name[0] = ((DERIA5String)seqOfLeafString.getObjectAt(0)).getString();
-            name[1] = ((DERIA5String)seqOfLeafString.getObjectAt(1)).getString();
-            byte[][] statByte = new byte[4][];
-            statByte[0] = ((DEROctetString)seqOfLeafBytes.getObjectAt(0))
-                .getOctets();
-            statByte[1] = ((DEROctetString)seqOfLeafBytes.getObjectAt(1))
-                .getOctets();
-            statByte[2] = ((DEROctetString)seqOfLeafBytes.getObjectAt(2))
-                .getOctets();
-            statByte[3] = ((DEROctetString)seqOfLeafBytes.getObjectAt(3))
-                .getOctets();
-            int[] statInt = new int[4];
-            statInt[0] = checkBigIntegerInIntRange(seqOfLeafInts.getObjectAt(0));
-            statInt[1] = checkBigIntegerInIntRange(seqOfLeafInts.getObjectAt(1));
-            statInt[2] = checkBigIntegerInIntRange(seqOfLeafInts.getObjectAt(2));
-            statInt[3] = checkBigIntegerInIntRange(seqOfLeafInts.getObjectAt(3));
-            nextNextLeaf[i] = new GMSSLeaf(DigestFactory.getDigest(name[0]).getClass(), statByte, statInt);
-        }
-
-        // --- Decode <upperLeaf>.
-        ASN1Sequence seqOfUpperLeafs = (ASN1Sequence)mtsPrivateKey.getObjectAt(13);
-        ASN1Sequence seqOfUpperLeafStat;
-        ASN1Sequence seqOfUpperLeafBytes;
-        ASN1Sequence seqOfUpperLeafInts;
-        ASN1Sequence seqOfUpperLeafString;
-
-        GMSSLeaf[] upperLeaf = new GMSSLeaf[seqOfUpperLeafs.size()];
-
-        for (int i = 0; i < upperLeaf.length; i++)
-        {
-            seqOfUpperLeafStat = (ASN1Sequence)seqOfUpperLeafs.getObjectAt(i);
-            seqOfUpperLeafString = (ASN1Sequence)seqOfUpperLeafStat.getObjectAt(0);
-            seqOfUpperLeafBytes = (ASN1Sequence)seqOfUpperLeafStat.getObjectAt(1);
-            seqOfUpperLeafInts = (ASN1Sequence)seqOfUpperLeafStat.getObjectAt(2);
-
-            String[] name = new String[2];
-            name[0] = ((DERIA5String)seqOfUpperLeafString.getObjectAt(0)).getString();
-            name[1] = ((DERIA5String)seqOfUpperLeafString.getObjectAt(1)).getString();
-            byte[][] statByte = new byte[4][];
-            statByte[0] = ((DEROctetString)seqOfUpperLeafBytes.getObjectAt(0))
-                .getOctets();
-            statByte[1] = ((DEROctetString)seqOfUpperLeafBytes.getObjectAt(1))
-                .getOctets();
-            statByte[2] = ((DEROctetString)seqOfUpperLeafBytes.getObjectAt(2))
-                .getOctets();
-            statByte[3] = ((DEROctetString)seqOfUpperLeafBytes.getObjectAt(3))
-                .getOctets();
-            int[] statInt = new int[4];
-            statInt[0] = checkBigIntegerInIntRange(seqOfUpperLeafInts.getObjectAt(0));
-            statInt[1] = checkBigIntegerInIntRange(seqOfUpperLeafInts.getObjectAt(1));
-            statInt[2] = checkBigIntegerInIntRange(seqOfUpperLeafInts.getObjectAt(2));
-            statInt[3] = checkBigIntegerInIntRange(seqOfUpperLeafInts.getObjectAt(3));
-            upperLeaf[i] = new GMSSLeaf(DigestFactory.getDigest(name[0]).getClass(), statByte, statInt);
-        }
-
-        // --- Decode <upperTreehashLeaf>.
-        ASN1Sequence seqOfUpperTHLeafs = (ASN1Sequence)mtsPrivateKey.getObjectAt(14);
-        ASN1Sequence seqOfUpperTHLeafStat;
-        ASN1Sequence seqOfUpperTHLeafBytes;
-        ASN1Sequence seqOfUpperTHLeafInts;
-        ASN1Sequence seqOfUpperTHLeafString;
-
-        GMSSLeaf[] upperTHLeaf = new GMSSLeaf[seqOfUpperTHLeafs.size()];
-
-        for (int i = 0; i < upperTHLeaf.length; i++)
-        {
-            seqOfUpperTHLeafStat = (ASN1Sequence)seqOfUpperTHLeafs.getObjectAt(i);
-            seqOfUpperTHLeafString = (ASN1Sequence)seqOfUpperTHLeafStat.getObjectAt(0);
-            seqOfUpperTHLeafBytes = (ASN1Sequence)seqOfUpperTHLeafStat.getObjectAt(1);
-            seqOfUpperTHLeafInts = (ASN1Sequence)seqOfUpperTHLeafStat.getObjectAt(2);
-
-            String[] name = new String[2];
-            name[0] = ((DERIA5String)seqOfUpperTHLeafString.getObjectAt(0))
-                .getString();
-            name[1] = ((DERIA5String)seqOfUpperTHLeafString.getObjectAt(1))
-                .getString();
-            byte[][] statByte = new byte[4][];
-            statByte[0] = ((DEROctetString)seqOfUpperTHLeafBytes.getObjectAt(0))
-                .getOctets();
-            statByte[1] = ((DEROctetString)seqOfUpperTHLeafBytes.getObjectAt(1))
-                .getOctets();
-            statByte[2] = ((DEROctetString)seqOfUpperTHLeafBytes.getObjectAt(2))
-                .getOctets();
-            statByte[3] = ((DEROctetString)seqOfUpperTHLeafBytes.getObjectAt(3))
-                .getOctets();
-            int[] statInt = new int[4];
-            statInt[0] = checkBigIntegerInIntRange(seqOfUpperTHLeafInts.getObjectAt(0));
-            statInt[1] = checkBigIntegerInIntRange(seqOfUpperTHLeafInts.getObjectAt(1));
-            statInt[2] = checkBigIntegerInIntRange(seqOfUpperTHLeafInts.getObjectAt(2));
-            statInt[3] = checkBigIntegerInIntRange(seqOfUpperTHLeafInts.getObjectAt(3));
-            upperTHLeaf[i] = new GMSSLeaf(DigestFactory.getDigest(name[0]).getClass(), statByte, statInt);
-        }
-
-        // --- Decode <minTreehash>.
-        ASN1Sequence minTreehashPart = (ASN1Sequence)mtsPrivateKey.getObjectAt(15);
-        int[] minTreehash = new int[minTreehashPart.size()];
-        for (int i = 0; i < minTreehashPart.size(); i++)
-        {
-            minTreehash[i] = checkBigIntegerInIntRange(minTreehashPart.getObjectAt(i));
-        }
-
-        // --- Decode <nextRoot>.
-        ASN1Sequence seqOfnextRoots = (ASN1Sequence)mtsPrivateKey.getObjectAt(16);
-        byte[][] nextRoot = new byte[seqOfnextRoots.size()][];
-        for (int i = 0; i < nextRoot.length; i++)
-        {
-            nextRoot[i] = ((DEROctetString)seqOfnextRoots.getObjectAt(i))
-                .getOctets();
-        }
-
-        // --- Decode <nextNextRoot>.
-        ASN1Sequence seqOfnextNextRoot = (ASN1Sequence)mtsPrivateKey.getObjectAt(17);
-        ASN1Sequence seqOfnextNextRootStat;
-        ASN1Sequence seqOfnextNextRootBytes;
-        ASN1Sequence seqOfnextNextRootInts;
-        ASN1Sequence seqOfnextNextRootString;
-        ASN1Sequence seqOfnextNextRootTreeH;
-        ASN1Sequence seqOfnextNextRootRetain;
-
-        GMSSRootCalc[] nextNextRoot = new GMSSRootCalc[seqOfnextNextRoot.size()];
-
-        for (int i = 0; i < nextNextRoot.length; i++)
-        {
-            seqOfnextNextRootStat = (ASN1Sequence)seqOfnextNextRoot.getObjectAt(i);
-            seqOfnextNextRootString = (ASN1Sequence)seqOfnextNextRootStat
-                .getObjectAt(0);
-            seqOfnextNextRootBytes = (ASN1Sequence)seqOfnextNextRootStat
-                .getObjectAt(1);
-            seqOfnextNextRootInts = (ASN1Sequence)seqOfnextNextRootStat.getObjectAt(2);
-            seqOfnextNextRootTreeH = (ASN1Sequence)seqOfnextNextRootStat
-                .getObjectAt(3);
-            seqOfnextNextRootRetain = (ASN1Sequence)seqOfnextNextRootStat
-                .getObjectAt(4);
-
-            // decode treehash of nextNextRoot
-            // ---------------------------------
-            ASN1Sequence seqOfnextNextRootTreeHStat;
-            ASN1Sequence seqOfnextNextRootTreeHBytes;
-            ASN1Sequence seqOfnextNextRootTreeHInts;
-            ASN1Sequence seqOfnextNextRootTreeHString;
-
-            Treehash[] nnRTreehash = new Treehash[seqOfnextNextRootTreeH.size()];
-
-            for (int k = 0; k < nnRTreehash.length; k++)
-            {
-                seqOfnextNextRootTreeHStat = (ASN1Sequence)seqOfnextNextRootTreeH
-                    .getObjectAt(k);
-                seqOfnextNextRootTreeHString = (ASN1Sequence)seqOfnextNextRootTreeHStat
-                    .getObjectAt(0);
-                seqOfnextNextRootTreeHBytes = (ASN1Sequence)seqOfnextNextRootTreeHStat
-                    .getObjectAt(1);
-                seqOfnextNextRootTreeHInts = (ASN1Sequence)seqOfnextNextRootTreeHStat
-                    .getObjectAt(2);
-
-                String[] name = new String[2];
-                name[0] = ((DERIA5String)seqOfnextNextRootTreeHString.getObjectAt(0))
-                    .getString();
-                name[1] = ((DERIA5String)seqOfnextNextRootTreeHString.getObjectAt(1))
-                    .getString();
-
-                int tailLength = checkBigIntegerInIntRange(seqOfnextNextRootTreeHInts.getObjectAt(1));
-
-                byte[][] statByte = new byte[3 + tailLength][];
-                statByte[0] = ((DEROctetString)seqOfnextNextRootTreeHBytes
-                    .getObjectAt(0)).getOctets();
-                if (statByte[0].length == 0)
-                { // if null was encoded
-                    statByte[0] = null;
-                }
-
-                statByte[1] = ((DEROctetString)seqOfnextNextRootTreeHBytes
-                    .getObjectAt(1)).getOctets();
-                statByte[2] = ((DEROctetString)seqOfnextNextRootTreeHBytes
-                    .getObjectAt(2)).getOctets();
-                for (int j = 0; j < tailLength; j++)
-                {
-                    statByte[3 + j] = ((DEROctetString)seqOfnextNextRootTreeHBytes
-                        .getObjectAt(3 + j)).getOctets();
-                }
-                int[] statInt = new int[6 + tailLength];
-                statInt[0] = checkBigIntegerInIntRange(seqOfnextNextRootTreeHInts.getObjectAt(0));
-
-                statInt[1] = tailLength;
-                statInt[2] = checkBigIntegerInIntRange(seqOfnextNextRootTreeHInts.getObjectAt(2));
-
-                statInt[3] = checkBigIntegerInIntRange(seqOfnextNextRootTreeHInts.getObjectAt(3));
-
-                statInt[4] = checkBigIntegerInIntRange(seqOfnextNextRootTreeHInts.getObjectAt(4));
-
-                statInt[5] = checkBigIntegerInIntRange(seqOfnextNextRootTreeHInts.getObjectAt(5));
-
-                for (int j = 0; j < tailLength; j++)
-                {
-                    statInt[6 + j] = checkBigIntegerInIntRange(seqOfnextNextRootTreeHInts
-                        .getObjectAt(6 + j));
-                }
-                nnRTreehash[k] = new Treehash(DigestFactory.getDigest(name[0]).getClass(), statByte, statInt);
-            }
-            // ---------------------------------
-
-            // decode retain of nextNextRoot
-            // ---------------------------------
-            // ASN1Sequence seqOfnextNextRootRetainPart0 =
-            // (ASN1Sequence)seqOfnextNextRootRetain.get(0);
-            ASN1Sequence seqOfnextNextRootRetainPart1;
-
-            Vector[] nnRRetain = new Vector[seqOfnextNextRootRetain.size()];
-            for (int j = 0; j < nnRRetain.length; j++)
-            {
-                seqOfnextNextRootRetainPart1 = (ASN1Sequence)seqOfnextNextRootRetain
-                    .getObjectAt(j);
-                nnRRetain[j] = new Vector();
-                for (int k = 0; k < seqOfnextNextRootRetainPart1.size(); k++)
-                {
-                    nnRRetain[j]
-                        .addElement(((DEROctetString)seqOfnextNextRootRetainPart1
-                            .getObjectAt(k)).getOctets());
-                }
-            }
-            // ---------------------------------
-
-            String[] name = new String[2];
-            name[0] = ((DERIA5String)seqOfnextNextRootString.getObjectAt(0))
-                .getString();
-            name[1] = ((DERIA5String)seqOfnextNextRootString.getObjectAt(1))
-                .getString();
-
-            int heightOfTree = checkBigIntegerInIntRange(seqOfnextNextRootInts.getObjectAt(0));
-            int tailLength = checkBigIntegerInIntRange(seqOfnextNextRootInts.getObjectAt(7));
-            byte[][] statByte = new byte[1 + heightOfTree + tailLength][];
-            statByte[0] = ((DEROctetString)seqOfnextNextRootBytes.getObjectAt(0))
-                .getOctets();
-            for (int j = 0; j < heightOfTree; j++)
-            {
-                statByte[1 + j] = ((DEROctetString)seqOfnextNextRootBytes
-                    .getObjectAt(1 + j)).getOctets();
-            }
-            for (int j = 0; j < tailLength; j++)
-            {
-                statByte[1 + heightOfTree + j] = ((DEROctetString)seqOfnextNextRootBytes
-                    .getObjectAt(1 + heightOfTree + j)).getOctets();
-            }
-            int[] statInt = new int[8 + heightOfTree + tailLength];
-            statInt[0] = heightOfTree;
-            statInt[1] = checkBigIntegerInIntRange(seqOfnextNextRootInts.getObjectAt(1));
-            statInt[2] = checkBigIntegerInIntRange(seqOfnextNextRootInts.getObjectAt(2));
-            statInt[3] = checkBigIntegerInIntRange(seqOfnextNextRootInts.getObjectAt(3));
-            statInt[4] = checkBigIntegerInIntRange(seqOfnextNextRootInts.getObjectAt(4));
-            statInt[5] = checkBigIntegerInIntRange(seqOfnextNextRootInts.getObjectAt(5));
-            statInt[6] = checkBigIntegerInIntRange(seqOfnextNextRootInts.getObjectAt(6));
-            statInt[7] = tailLength;
-            for (int j = 0; j < heightOfTree; j++)
-            {
-                statInt[8 + j] = checkBigIntegerInIntRange(seqOfnextNextRootInts.getObjectAt(8 + j));
-            }
-            for (int j = 0; j < tailLength; j++)
-            {
-                statInt[8 + heightOfTree + j] = checkBigIntegerInIntRange(seqOfnextNextRootInts.getObjectAt(8
-                    + heightOfTree + j));
-            }
-            nextNextRoot[i] = new GMSSRootCalc(DigestFactory.getDigest(name[0]).getClass(), statByte, statInt,
-                nnRTreehash, nnRRetain);
-        }
-
-        // --- Decode <curRootSig>.
-        ASN1Sequence seqOfcurRootSig = (ASN1Sequence)mtsPrivateKey.getObjectAt(18);
-        byte[][] curRootSig = new byte[seqOfcurRootSig.size()][];
-        for (int i = 0; i < curRootSig.length; i++)
-        {
-            curRootSig[i] = ((DEROctetString)seqOfcurRootSig.getObjectAt(i))
-                .getOctets();
-        }
-
-        // --- Decode <nextRootSig>.
-        ASN1Sequence seqOfnextRootSigs = (ASN1Sequence)mtsPrivateKey.getObjectAt(19);
-        ASN1Sequence seqOfnRSStats;
-        ASN1Sequence seqOfnRSStrings;
-        ASN1Sequence seqOfnRSInts;
-        ASN1Sequence seqOfnRSBytes;
-
-        GMSSRootSig[] nextRootSig = new GMSSRootSig[seqOfnextRootSigs.size()];
-
-        for (int i = 0; i < nextRootSig.length; i++)
-        {
-            seqOfnRSStats = (ASN1Sequence)seqOfnextRootSigs.getObjectAt(i);
-            // nextNextAuth[i]= new byte[nextNextAuthPart1.size()][];
-            seqOfnRSStrings = (ASN1Sequence)seqOfnRSStats.getObjectAt(0);
-            seqOfnRSBytes = (ASN1Sequence)seqOfnRSStats.getObjectAt(1);
-            seqOfnRSInts = (ASN1Sequence)seqOfnRSStats.getObjectAt(2);
-
-            String[] name = new String[2];
-            name[0] = ((DERIA5String)seqOfnRSStrings.getObjectAt(0)).getString();
-            name[1] = ((DERIA5String)seqOfnRSStrings.getObjectAt(1)).getString();
-            byte[][] statByte = new byte[5][];
-            statByte[0] = ((DEROctetString)seqOfnRSBytes.getObjectAt(0))
-                .getOctets();
-            statByte[1] = ((DEROctetString)seqOfnRSBytes.getObjectAt(1))
-                .getOctets();
-            statByte[2] = ((DEROctetString)seqOfnRSBytes.getObjectAt(2))
-                .getOctets();
-            statByte[3] = ((DEROctetString)seqOfnRSBytes.getObjectAt(3))
-                .getOctets();
-            statByte[4] = ((DEROctetString)seqOfnRSBytes.getObjectAt(4))
-                .getOctets();
-            int[] statInt = new int[9];
-            statInt[0] = checkBigIntegerInIntRange(seqOfnRSInts.getObjectAt(0));
-            statInt[1] = checkBigIntegerInIntRange(seqOfnRSInts.getObjectAt(1));
-            statInt[2] = checkBigIntegerInIntRange(seqOfnRSInts.getObjectAt(2));
-            statInt[3] = checkBigIntegerInIntRange(seqOfnRSInts.getObjectAt(3));
-            statInt[4] = checkBigIntegerInIntRange(seqOfnRSInts.getObjectAt(4));
-            statInt[5] = checkBigIntegerInIntRange(seqOfnRSInts.getObjectAt(5));
-            statInt[6] = checkBigIntegerInIntRange(seqOfnRSInts.getObjectAt(6));
-            statInt[7] = checkBigIntegerInIntRange(seqOfnRSInts.getObjectAt(7));
-            statInt[8] = checkBigIntegerInIntRange(seqOfnRSInts.getObjectAt(8));
-            nextRootSig[i] = new GMSSRootSig(DigestFactory.getDigest(name[0]).getClass(), statByte, statInt);
-        }
-
-        // --- Decode <name>.
-
-        // TODO: Really check, why there are multiple algorithms, we only
-        //       use the first one!!!
-        ASN1Sequence namePart = (ASN1Sequence)mtsPrivateKey.getObjectAt(20);
-        String[] name = new String[namePart.size()];
-        for (int i = 0; i < name.length; i++)
-        {
-            name[i] = ((DERIA5String)namePart.getObjectAt(i)).getString();
-        }
-        */
-    }
-
-    public GMSSPrivateKey(int[] index, byte[][] currentSeed,
-                          byte[][] nextNextSeed, byte[][][] currentAuthPath,
-                          byte[][][] nextAuthPath, Treehash[][] currentTreehash,
-                          Treehash[][] nextTreehash, Vector[] currentStack,
-                          Vector[] nextStack, Vector[][] currentRetain,
-                          Vector[][] nextRetain, byte[][][] keep, GMSSLeaf[] nextNextLeaf,
-                          GMSSLeaf[] upperLeaf, GMSSLeaf[] upperTreehashLeaf,
-                          int[] minTreehash, byte[][] nextRoot, GMSSRootCalc[] nextNextRoot,
-                          byte[][] currentRootSig, GMSSRootSig[] nextRootSig,
-                          GMSSParameters gmssParameterset, AlgorithmIdentifier digestAlg)
-    {
-        AlgorithmIdentifier[] names = new AlgorithmIdentifier[] { digestAlg };
-        this.primitive = encode(index, currentSeed, nextNextSeed, currentAuthPath, nextAuthPath, keep, currentTreehash, nextTreehash, currentStack, nextStack, currentRetain, nextRetain, nextNextLeaf, upperLeaf, upperTreehashLeaf, minTreehash, nextRoot, nextNextRoot, currentRootSig, nextRootSig, gmssParameterset, names);
-    }
-
-
-    // TODO: change method signature to something more integrated into BouncyCastle
-
-    /**
-     * @param index             tree indices
-     * @param currentSeeds      seed for the generation of private OTS keys for the
-     *                          current subtrees (TREE)
-     * @param nextNextSeeds     seed for the generation of private OTS keys for the
-     *                          subtrees after next (TREE++)
-     * @param currentAuthPaths  array of current authentication paths (AUTHPATH)
-     * @param nextAuthPaths     array of next authentication paths (AUTHPATH+)
-     * @param keep              keep array for the authPath algorithm
-     * @param currentTreehash   treehash for authPath algorithm of current tree
-     * @param nextTreehash      treehash for authPath algorithm of next tree (TREE+)
-     * @param currentStack      shared stack for authPath algorithm of current tree
-     * @param nextStack         shared stack for authPath algorithm of next tree (TREE+)
-     * @param currentRetain     retain stack for authPath algorithm of current tree
-     * @param nextRetain        retain stack for authPath algorithm of next tree (TREE+)
-     * @param nextNextLeaf      array of upcoming leafs of the tree after next (LEAF++) of
-     *                          each layer
-     * @param upperLeaf         needed for precomputation of upper nodes
-     * @param upperTreehashLeaf needed for precomputation of upper treehash nodes
-     * @param minTreehash       index of next treehash instance to receive an update
-     * @param nextRoot          the roots of the next trees (ROOT+)
-     * @param nextNextRoot      the roots of the tree after next (ROOT++)
-     * @param currentRootSig    array of signatures of the roots of the current subtrees
-     *                          (SIG)
-     * @param nextRootSig       array of signatures of the roots of the next subtree
-     *                          (SIG+)
-     * @param gmssParameterset  the GMSS Parameterset
-     * @param algorithms        An array of algorithm identifiers, containing the hash function details
-     */
-    private ASN1Primitive encode(int[] index, byte[][] currentSeeds,
-                                byte[][] nextNextSeeds, byte[][][] currentAuthPaths,
-                                byte[][][] nextAuthPaths, byte[][][] keep,
-                                Treehash[][] currentTreehash, Treehash[][] nextTreehash,
-                                Vector[] currentStack, Vector[] nextStack,
-                                Vector[][] currentRetain, Vector[][] nextRetain,
-                                GMSSLeaf[] nextNextLeaf, GMSSLeaf[] upperLeaf,
-                                GMSSLeaf[] upperTreehashLeaf, int[] minTreehash, byte[][] nextRoot,
-                                GMSSRootCalc[] nextNextRoot, byte[][] currentRootSig,
-                                GMSSRootSig[] nextRootSig, GMSSParameters gmssParameterset,
-                                AlgorithmIdentifier[] algorithms)
-    {
-
-        ASN1EncodableVector result = new ASN1EncodableVector();
-
-        // --- Encode <index>.
-        ASN1EncodableVector indexPart = new ASN1EncodableVector();
-        for (int i = 0; i < index.length; i++)
-        {
-            indexPart.add(new ASN1Integer(index[i]));
-        }
-        result.add(new DERSequence(indexPart));
-
-        // --- Encode <curSeeds>.
-        ASN1EncodableVector curSeedsPart = new ASN1EncodableVector();
-        for (int i = 0; i < currentSeeds.length; i++)
-        {
-            curSeedsPart.add(new DEROctetString(currentSeeds[i]));
-        }
-        result.add(new DERSequence(curSeedsPart));
-
-        // --- Encode <nextNextSeeds>.
-        ASN1EncodableVector nextNextSeedsPart = new ASN1EncodableVector();
-        for (int i = 0; i < nextNextSeeds.length; i++)
-        {
-            nextNextSeedsPart.add(new DEROctetString(nextNextSeeds[i]));
-        }
-        result.add(new DERSequence(nextNextSeedsPart));
-
-        // --- Encode <curAuth>.
-        ASN1EncodableVector curAuthPart0 = new ASN1EncodableVector();
-        ASN1EncodableVector curAuthPart1 = new ASN1EncodableVector();
-        for (int i = 0; i < currentAuthPaths.length; i++)
-        {
-            for (int j = 0; j < currentAuthPaths[i].length; j++)
-            {
-                curAuthPart0.add(new DEROctetString(currentAuthPaths[i][j]));
-            }
-            curAuthPart1.add(new DERSequence(curAuthPart0));
-            curAuthPart0 = new ASN1EncodableVector();
-        }
-        result.add(new DERSequence(curAuthPart1));
-
-        // --- Encode <nextAuth>.
-        ASN1EncodableVector nextAuthPart0 = new ASN1EncodableVector();
-        ASN1EncodableVector nextAuthPart1 = new ASN1EncodableVector();
-        for (int i = 0; i < nextAuthPaths.length; i++)
-        {
-            for (int j = 0; j < nextAuthPaths[i].length; j++)
-            {
-                nextAuthPart0.add(new DEROctetString(nextAuthPaths[i][j]));
-            }
-            nextAuthPart1.add(new DERSequence(nextAuthPart0));
-            nextAuthPart0 = new ASN1EncodableVector();
-        }
-        result.add(new DERSequence(nextAuthPart1));
-
-        // --- Encode <curTreehash>.
-        ASN1EncodableVector seqOfTreehash0 = new ASN1EncodableVector();
-        ASN1EncodableVector seqOfTreehash1 = new ASN1EncodableVector();
-        ASN1EncodableVector seqOfStat = new ASN1EncodableVector();
-        ASN1EncodableVector seqOfByte = new ASN1EncodableVector();
-        ASN1EncodableVector seqOfInt = new ASN1EncodableVector();
-
-        for (int i = 0; i < currentTreehash.length; i++)
-        {
-            for (int j = 0; j < currentTreehash[i].length; j++)
-            {
-                seqOfStat.add(new DERSequence(algorithms[0]));
-
-                int tailLength = currentTreehash[i][j].getStatInt()[1];
-
-                seqOfByte.add(new DEROctetString(currentTreehash[i][j]
-                    .getStatByte()[0]));
-                seqOfByte.add(new DEROctetString(currentTreehash[i][j]
-                    .getStatByte()[1]));
-                seqOfByte.add(new DEROctetString(currentTreehash[i][j]
-                    .getStatByte()[2]));
-                for (int k = 0; k < tailLength; k++)
-                {
-                    seqOfByte.add(new DEROctetString(currentTreehash[i][j]
-                        .getStatByte()[3 + k]));
-                }
-                seqOfStat.add(new DERSequence(seqOfByte));
-                seqOfByte = new ASN1EncodableVector();
-
-                seqOfInt.add(new ASN1Integer(
-                    currentTreehash[i][j].getStatInt()[0]));
-                seqOfInt.add(new ASN1Integer(tailLength));
-                seqOfInt.add(new ASN1Integer(
-                    currentTreehash[i][j].getStatInt()[2]));
-                seqOfInt.add(new ASN1Integer(
-                    currentTreehash[i][j].getStatInt()[3]));
-                seqOfInt.add(new ASN1Integer(
-                    currentTreehash[i][j].getStatInt()[4]));
-                seqOfInt.add(new ASN1Integer(
-                    currentTreehash[i][j].getStatInt()[5]));
-                for (int k = 0; k < tailLength; k++)
-                {
-                    seqOfInt.add(new ASN1Integer(currentTreehash[i][j]
-                        .getStatInt()[6 + k]));
-                }
-                seqOfStat.add(new DERSequence(seqOfInt));
-                seqOfInt = new ASN1EncodableVector();
-
-                seqOfTreehash1.add(new DERSequence(seqOfStat));
-                seqOfStat = new ASN1EncodableVector();
-            }
-            seqOfTreehash0.add(new DERSequence(seqOfTreehash1));
-            seqOfTreehash1 = new ASN1EncodableVector();
-        }
-        result.add(new DERSequence(seqOfTreehash0));
-
-        // --- Encode <nextTreehash>.
-        seqOfTreehash0 = new ASN1EncodableVector();
-        seqOfTreehash1 = new ASN1EncodableVector();
-        seqOfStat = new ASN1EncodableVector();
-        seqOfByte = new ASN1EncodableVector();
-        seqOfInt = new ASN1EncodableVector();
-
-        for (int i = 0; i < nextTreehash.length; i++)
-        {
-            for (int j = 0; j < nextTreehash[i].length; j++)
-            {
-                seqOfStat.add(new DERSequence(algorithms[0]));
-
-                int tailLength = nextTreehash[i][j].getStatInt()[1];
-
-                seqOfByte.add(new DEROctetString(nextTreehash[i][j]
-                    .getStatByte()[0]));
-                seqOfByte.add(new DEROctetString(nextTreehash[i][j]
-                    .getStatByte()[1]));
-                seqOfByte.add(new DEROctetString(nextTreehash[i][j]
-                    .getStatByte()[2]));
-                for (int k = 0; k < tailLength; k++)
-                {
-                    seqOfByte.add(new DEROctetString(nextTreehash[i][j]
-                        .getStatByte()[3 + k]));
-                }
-                seqOfStat.add(new DERSequence(seqOfByte));
-                seqOfByte = new ASN1EncodableVector();
-
-                seqOfInt
-                    .add(new ASN1Integer(nextTreehash[i][j].getStatInt()[0]));
-                seqOfInt.add(new ASN1Integer(tailLength));
-                seqOfInt
-                    .add(new ASN1Integer(nextTreehash[i][j].getStatInt()[2]));
-                seqOfInt
-                    .add(new ASN1Integer(nextTreehash[i][j].getStatInt()[3]));
-                seqOfInt
-                    .add(new ASN1Integer(nextTreehash[i][j].getStatInt()[4]));
-                seqOfInt
-                    .add(new ASN1Integer(nextTreehash[i][j].getStatInt()[5]));
-                for (int k = 0; k < tailLength; k++)
-                {
-                    seqOfInt.add(new ASN1Integer(nextTreehash[i][j]
-                        .getStatInt()[6 + k]));
-                }
-                seqOfStat.add(new DERSequence(seqOfInt));
-                seqOfInt = new ASN1EncodableVector();
-
-                seqOfTreehash1.add(new DERSequence(seqOfStat));
-                seqOfStat = new ASN1EncodableVector();
-            }
-            seqOfTreehash0.add(new DERSequence(new DERSequence(seqOfTreehash1)));
-            seqOfTreehash1 = new ASN1EncodableVector();
-        }
-        result.add(new DERSequence(seqOfTreehash0));
-
-        // --- Encode <keep>.
-        ASN1EncodableVector keepPart0 = new ASN1EncodableVector();
-        ASN1EncodableVector keepPart1 = new ASN1EncodableVector();
-        for (int i = 0; i < keep.length; i++)
-        {
-            for (int j = 0; j < keep[i].length; j++)
-            {
-                keepPart0.add(new DEROctetString(keep[i][j]));
-            }
-            keepPart1.add(new DERSequence(keepPart0));
-            keepPart0 = new ASN1EncodableVector();
-        }
-        result.add(new DERSequence(keepPart1));
-
-        // --- Encode <curStack>.
-        ASN1EncodableVector curStackPart0 = new ASN1EncodableVector();
-        ASN1EncodableVector curStackPart1 = new ASN1EncodableVector();
-        for (int i = 0; i < currentStack.length; i++)
-        {
-            for (int j = 0; j < currentStack[i].size(); j++)
-            {
-                curStackPart0.add(new DEROctetString((byte[])currentStack[i]
-                    .elementAt(j)));
-            }
-            curStackPart1.add(new DERSequence(curStackPart0));
-            curStackPart0 = new ASN1EncodableVector();
-        }
-        result.add(new DERSequence(curStackPart1));
-
-        // --- Encode <nextStack>.
-        ASN1EncodableVector nextStackPart0 = new ASN1EncodableVector();
-        ASN1EncodableVector nextStackPart1 = new ASN1EncodableVector();
-        for (int i = 0; i < nextStack.length; i++)
-        {
-            for (int j = 0; j < nextStack[i].size(); j++)
-            {
-                nextStackPart0.add(new DEROctetString((byte[])nextStack[i]
-                    .elementAt(j)));
-            }
-            nextStackPart1.add(new DERSequence(nextStackPart0));
-            nextStackPart0 = new ASN1EncodableVector();
-        }
-        result.add(new DERSequence(nextStackPart1));
-
-        // --- Encode <curRetain>.
-        ASN1EncodableVector currentRetainPart0 = new ASN1EncodableVector();
-        ASN1EncodableVector currentRetainPart1 = new ASN1EncodableVector();
-        ASN1EncodableVector currentRetainPart2 = new ASN1EncodableVector();
-        for (int i = 0; i < currentRetain.length; i++)
-        {
-            for (int j = 0; j < currentRetain[i].length; j++)
-            {
-                for (int k = 0; k < currentRetain[i][j].size(); k++)
-                {
-                    currentRetainPart0.add(new DEROctetString(
-                        (byte[])currentRetain[i][j].elementAt(k)));
-                }
-                currentRetainPart1.add(new DERSequence(currentRetainPart0));
-                currentRetainPart0 = new ASN1EncodableVector();
-            }
-            currentRetainPart2.add(new DERSequence(currentRetainPart1));
-            currentRetainPart1 = new ASN1EncodableVector();
-        }
-        result.add(new DERSequence(currentRetainPart2));
-
-        // --- Encode <nextRetain>.
-        ASN1EncodableVector nextRetainPart0 = new ASN1EncodableVector();
-        ASN1EncodableVector nextRetainPart1 = new ASN1EncodableVector();
-        ASN1EncodableVector nextRetainPart2 = new ASN1EncodableVector();
-        for (int i = 0; i < nextRetain.length; i++)
-        {
-            for (int j = 0; j < nextRetain[i].length; j++)
-            {
-                for (int k = 0; k < nextRetain[i][j].size(); k++)
-                {
-                    nextRetainPart0.add(new DEROctetString(
-                        (byte[])nextRetain[i][j].elementAt(k)));
-                }
-                nextRetainPart1.add(new DERSequence(nextRetainPart0));
-                nextRetainPart0 = new ASN1EncodableVector();
-            }
-            nextRetainPart2.add(new DERSequence(nextRetainPart1));
-            nextRetainPart1 = new ASN1EncodableVector();
-        }
-        result.add(new DERSequence(nextRetainPart2));
-
-        // --- Encode <nextNextLeaf>.
-        ASN1EncodableVector seqOfLeaf = new ASN1EncodableVector();
-        seqOfStat = new ASN1EncodableVector();
-        seqOfByte = new ASN1EncodableVector();
-        seqOfInt = new ASN1EncodableVector();
-
-        for (int i = 0; i < nextNextLeaf.length; i++)
-        {
-            seqOfStat.add(new DERSequence(algorithms[0]));
-
-            byte[][] tempByte = nextNextLeaf[i].getStatByte();
-            seqOfByte.add(new DEROctetString(tempByte[0]));
-            seqOfByte.add(new DEROctetString(tempByte[1]));
-            seqOfByte.add(new DEROctetString(tempByte[2]));
-            seqOfByte.add(new DEROctetString(tempByte[3]));
-            seqOfStat.add(new DERSequence(seqOfByte));
-            seqOfByte = new ASN1EncodableVector();
-
-            int[] tempInt = nextNextLeaf[i].getStatInt();
-            seqOfInt.add(new ASN1Integer(tempInt[0]));
-            seqOfInt.add(new ASN1Integer(tempInt[1]));
-            seqOfInt.add(new ASN1Integer(tempInt[2]));
-            seqOfInt.add(new ASN1Integer(tempInt[3]));
-            seqOfStat.add(new DERSequence(seqOfInt));
-            seqOfInt = new ASN1EncodableVector();
-
-            seqOfLeaf.add(new DERSequence(seqOfStat));
-            seqOfStat = new ASN1EncodableVector();
-        }
-        result.add(new DERSequence(seqOfLeaf));
-
-        // --- Encode <upperLEAF>.
-        ASN1EncodableVector seqOfUpperLeaf = new ASN1EncodableVector();
-        seqOfStat = new ASN1EncodableVector();
-        seqOfByte = new ASN1EncodableVector();
-        seqOfInt = new ASN1EncodableVector();
-
-        for (int i = 0; i < upperLeaf.length; i++)
-        {
-            seqOfStat.add(new DERSequence(algorithms[0]));
-
-            byte[][] tempByte = upperLeaf[i].getStatByte();
-            seqOfByte.add(new DEROctetString(tempByte[0]));
-            seqOfByte.add(new DEROctetString(tempByte[1]));
-            seqOfByte.add(new DEROctetString(tempByte[2]));
-            seqOfByte.add(new DEROctetString(tempByte[3]));
-            seqOfStat.add(new DERSequence(seqOfByte));
-            seqOfByte = new ASN1EncodableVector();
-
-            int[] tempInt = upperLeaf[i].getStatInt();
-            seqOfInt.add(new ASN1Integer(tempInt[0]));
-            seqOfInt.add(new ASN1Integer(tempInt[1]));
-            seqOfInt.add(new ASN1Integer(tempInt[2]));
-            seqOfInt.add(new ASN1Integer(tempInt[3]));
-            seqOfStat.add(new DERSequence(seqOfInt));
-            seqOfInt = new ASN1EncodableVector();
-
-            seqOfUpperLeaf.add(new DERSequence(seqOfStat));
-            seqOfStat = new ASN1EncodableVector();
-        }
-        result.add(new DERSequence(seqOfUpperLeaf));
-
-        // encode <upperTreehashLeaf>
-        ASN1EncodableVector seqOfUpperTreehashLeaf = new ASN1EncodableVector();
-        seqOfStat = new ASN1EncodableVector();
-        seqOfByte = new ASN1EncodableVector();
-        seqOfInt = new ASN1EncodableVector();
-
-        for (int i = 0; i < upperTreehashLeaf.length; i++)
-        {
-            seqOfStat.add(new DERSequence(algorithms[0]));
-
-            byte[][] tempByte = upperTreehashLeaf[i].getStatByte();
-            seqOfByte.add(new DEROctetString(tempByte[0]));
-            seqOfByte.add(new DEROctetString(tempByte[1]));
-            seqOfByte.add(new DEROctetString(tempByte[2]));
-            seqOfByte.add(new DEROctetString(tempByte[3]));
-            seqOfStat.add(new DERSequence(seqOfByte));
-            seqOfByte = new ASN1EncodableVector();
-
-            int[] tempInt = upperTreehashLeaf[i].getStatInt();
-            seqOfInt.add(new ASN1Integer(tempInt[0]));
-            seqOfInt.add(new ASN1Integer(tempInt[1]));
-            seqOfInt.add(new ASN1Integer(tempInt[2]));
-            seqOfInt.add(new ASN1Integer(tempInt[3]));
-            seqOfStat.add(new DERSequence(seqOfInt));
-            seqOfInt = new ASN1EncodableVector();
-
-            seqOfUpperTreehashLeaf.add(new DERSequence(seqOfStat));
-            seqOfStat = new ASN1EncodableVector();
-        }
-        result.add(new DERSequence(seqOfUpperTreehashLeaf));
-
-        // --- Encode <minTreehash>.
-        ASN1EncodableVector minTreehashPart = new ASN1EncodableVector();
-        for (int i = 0; i < minTreehash.length; i++)
-        {
-            minTreehashPart.add(new ASN1Integer(minTreehash[i]));
-        }
-        result.add(new DERSequence(minTreehashPart));
-
-        // --- Encode <nextRoot>.
-        ASN1EncodableVector nextRootPart = new ASN1EncodableVector();
-        for (int i = 0; i < nextRoot.length; i++)
-        {
-            nextRootPart.add(new DEROctetString(nextRoot[i]));
-        }
-        result.add(new DERSequence(nextRootPart));
-
-        // --- Encode <nextNextRoot>.
-        ASN1EncodableVector seqOfnextNextRoot = new ASN1EncodableVector();
-        ASN1EncodableVector seqOfnnRStats = new ASN1EncodableVector();
-        ASN1EncodableVector seqOfnnRStrings = new ASN1EncodableVector();
-        ASN1EncodableVector seqOfnnRBytes = new ASN1EncodableVector();
-        ASN1EncodableVector seqOfnnRInts = new ASN1EncodableVector();
-        ASN1EncodableVector seqOfnnRTreehash = new ASN1EncodableVector();
-        ASN1EncodableVector seqOfnnRRetain = new ASN1EncodableVector();
-
-        for (int i = 0; i < nextNextRoot.length; i++)
-        {
-            seqOfnnRStats.add(new DERSequence(algorithms[0]));
-            seqOfnnRStrings = new ASN1EncodableVector();
-
-            int heightOfTree = nextNextRoot[i].getStatInt()[0];
-            int tailLength = nextNextRoot[i].getStatInt()[7];
-
-            seqOfnnRBytes.add(new DEROctetString(
-                nextNextRoot[i].getStatByte()[0]));
-            for (int j = 0; j < heightOfTree; j++)
-            {
-                seqOfnnRBytes.add(new DEROctetString(nextNextRoot[i]
-                    .getStatByte()[1 + j]));
-            }
-            for (int j = 0; j < tailLength; j++)
-            {
-                seqOfnnRBytes.add(new DEROctetString(nextNextRoot[i]
-                    .getStatByte()[1 + heightOfTree + j]));
-            }
-
-            seqOfnnRStats.add(new DERSequence(seqOfnnRBytes));
-            seqOfnnRBytes = new ASN1EncodableVector();
-
-            seqOfnnRInts.add(new ASN1Integer(heightOfTree));
-            seqOfnnRInts.add(new ASN1Integer(nextNextRoot[i].getStatInt()[1]));
-            seqOfnnRInts.add(new ASN1Integer(nextNextRoot[i].getStatInt()[2]));
-            seqOfnnRInts.add(new ASN1Integer(nextNextRoot[i].getStatInt()[3]));
-            seqOfnnRInts.add(new ASN1Integer(nextNextRoot[i].getStatInt()[4]));
-            seqOfnnRInts.add(new ASN1Integer(nextNextRoot[i].getStatInt()[5]));
-            seqOfnnRInts.add(new ASN1Integer(nextNextRoot[i].getStatInt()[6]));
-            seqOfnnRInts.add(new ASN1Integer(tailLength));
-            for (int j = 0; j < heightOfTree; j++)
-            {
-                seqOfnnRInts.add(new ASN1Integer(
-                    nextNextRoot[i].getStatInt()[8 + j]));
-            }
-            for (int j = 0; j < tailLength; j++)
-            {
-                seqOfnnRInts.add(new ASN1Integer(nextNextRoot[i].getStatInt()[8
-                    + heightOfTree + j]));
-            }
-
-            seqOfnnRStats.add(new DERSequence(seqOfnnRInts));
-            seqOfnnRInts = new ASN1EncodableVector();
-
-            // add treehash of nextNextRoot object
-            // ----------------------------
-            seqOfStat = new ASN1EncodableVector();
-            seqOfByte = new ASN1EncodableVector();
-            seqOfInt = new ASN1EncodableVector();
-
-            if (nextNextRoot[i].getTreehash() != null)
-            {
-                for (int j = 0; j < nextNextRoot[i].getTreehash().length; j++)
-                {
-                    seqOfStat.add(new DERSequence(algorithms[0]));
-
-                    tailLength = nextNextRoot[i].getTreehash()[j].getStatInt()[1];
-
-                    seqOfByte.add(new DEROctetString(nextNextRoot[i]
-                        .getTreehash()[j].getStatByte()[0]));
-                    seqOfByte.add(new DEROctetString(nextNextRoot[i]
-                        .getTreehash()[j].getStatByte()[1]));
-                    seqOfByte.add(new DEROctetString(nextNextRoot[i]
-                        .getTreehash()[j].getStatByte()[2]));
-                    for (int k = 0; k < tailLength; k++)
-                    {
-                        seqOfByte.add(new DEROctetString(nextNextRoot[i]
-                            .getTreehash()[j].getStatByte()[3 + k]));
-                    }
-                    seqOfStat.add(new DERSequence(seqOfByte));
-                    seqOfByte = new ASN1EncodableVector();
-
-                    seqOfInt.add(new ASN1Integer(
-                        nextNextRoot[i].getTreehash()[j].getStatInt()[0]));
-                    seqOfInt.add(new ASN1Integer(tailLength));
-                    seqOfInt.add(new ASN1Integer(
-                        nextNextRoot[i].getTreehash()[j].getStatInt()[2]));
-                    seqOfInt.add(new ASN1Integer(
-                        nextNextRoot[i].getTreehash()[j].getStatInt()[3]));
-                    seqOfInt.add(new ASN1Integer(
-                        nextNextRoot[i].getTreehash()[j].getStatInt()[4]));
-                    seqOfInt.add(new ASN1Integer(
-                        nextNextRoot[i].getTreehash()[j].getStatInt()[5]));
-                    for (int k = 0; k < tailLength; k++)
-                    {
-                        seqOfInt.add(new ASN1Integer(nextNextRoot[i]
-                            .getTreehash()[j].getStatInt()[6 + k]));
-                    }
-                    seqOfStat.add(new DERSequence(seqOfInt));
-                    seqOfInt = new ASN1EncodableVector();
-
-                    seqOfnnRTreehash.add(new DERSequence(seqOfStat));
-                    seqOfStat = new ASN1EncodableVector();
-                }
-            }
-            // ----------------------------
-            seqOfnnRStats.add(new DERSequence(seqOfnnRTreehash));
-            seqOfnnRTreehash = new ASN1EncodableVector();
-
-            // encode retain of nextNextRoot
-            // ----------------------------
-            // --- Encode <curRetain>.
-            currentRetainPart0 = new ASN1EncodableVector();
-            if (nextNextRoot[i].getRetain() != null)
-            {
-                for (int j = 0; j < nextNextRoot[i].getRetain().length; j++)
-                {
-                    for (int k = 0; k < nextNextRoot[i].getRetain()[j].size(); k++)
-                    {
-                        currentRetainPart0.add(new DEROctetString(
-                            (byte[])nextNextRoot[i].getRetain()[j]
-                                .elementAt(k)));
-                    }
-                    seqOfnnRRetain.add(new DERSequence(currentRetainPart0));
-                    currentRetainPart0 = new ASN1EncodableVector();
-                }
-            }
-            // ----------------------------
-            seqOfnnRStats.add(new DERSequence(seqOfnnRRetain));
-            seqOfnnRRetain = new ASN1EncodableVector();
-
-            seqOfnextNextRoot.add(new DERSequence(seqOfnnRStats));
-            seqOfnnRStats = new ASN1EncodableVector();
-        }
-        result.add(new DERSequence(seqOfnextNextRoot));
-
-        // --- Encode <curRootSig>.
-        ASN1EncodableVector curRootSigPart = new ASN1EncodableVector();
-        for (int i = 0; i < currentRootSig.length; i++)
-        {
-            curRootSigPart.add(new DEROctetString(currentRootSig[i]));
-        }
-        result.add(new DERSequence(curRootSigPart));
-
-        // --- Encode <nextRootSig>.
-        ASN1EncodableVector seqOfnextRootSigs = new ASN1EncodableVector();
-        ASN1EncodableVector seqOfnRSStats = new ASN1EncodableVector();
-        ASN1EncodableVector seqOfnRSStrings = new ASN1EncodableVector();
-        ASN1EncodableVector seqOfnRSBytes = new ASN1EncodableVector();
-        ASN1EncodableVector seqOfnRSInts = new ASN1EncodableVector();
-
-        for (int i = 0; i < nextRootSig.length; i++)
-        {
-            seqOfnRSStats.add(new DERSequence(algorithms[0]));
-            seqOfnRSStrings = new ASN1EncodableVector();
-
-            seqOfnRSBytes.add(new DEROctetString(
-                nextRootSig[i].getStatByte()[0]));
-            seqOfnRSBytes.add(new DEROctetString(
-                nextRootSig[i].getStatByte()[1]));
-            seqOfnRSBytes.add(new DEROctetString(
-                nextRootSig[i].getStatByte()[2]));
-            seqOfnRSBytes.add(new DEROctetString(
-                nextRootSig[i].getStatByte()[3]));
-            seqOfnRSBytes.add(new DEROctetString(
-                nextRootSig[i].getStatByte()[4]));
-
-            seqOfnRSStats.add(new DERSequence(seqOfnRSBytes));
-            seqOfnRSBytes = new ASN1EncodableVector();
-
-            seqOfnRSInts.add(new ASN1Integer(nextRootSig[i].getStatInt()[0]));
-            seqOfnRSInts.add(new ASN1Integer(nextRootSig[i].getStatInt()[1]));
-            seqOfnRSInts.add(new ASN1Integer(nextRootSig[i].getStatInt()[2]));
-            seqOfnRSInts.add(new ASN1Integer(nextRootSig[i].getStatInt()[3]));
-            seqOfnRSInts.add(new ASN1Integer(nextRootSig[i].getStatInt()[4]));
-            seqOfnRSInts.add(new ASN1Integer(nextRootSig[i].getStatInt()[5]));
-            seqOfnRSInts.add(new ASN1Integer(nextRootSig[i].getStatInt()[6]));
-            seqOfnRSInts.add(new ASN1Integer(nextRootSig[i].getStatInt()[7]));
-            seqOfnRSInts.add(new ASN1Integer(nextRootSig[i].getStatInt()[8]));
-
-            seqOfnRSStats.add(new DERSequence(seqOfnRSInts));
-            seqOfnRSInts = new ASN1EncodableVector();
-
-            seqOfnextRootSigs.add(new DERSequence(seqOfnRSStats));
-            seqOfnRSStats = new ASN1EncodableVector();
-        }
-        result.add(new DERSequence(seqOfnextRootSigs));
-
-        // --- Encode <parameterset>.
-        ASN1EncodableVector parSetPart0 = new ASN1EncodableVector();
-        ASN1EncodableVector parSetPart1 = new ASN1EncodableVector();
-        ASN1EncodableVector parSetPart2 = new ASN1EncodableVector();
-        ASN1EncodableVector parSetPart3 = new ASN1EncodableVector();
-
-        for (int i = 0; i < gmssParameterset.getHeightOfTrees().length; i++)
-        {
-            parSetPart1.add(new ASN1Integer(
-                gmssParameterset.getHeightOfTrees()[i]));
-            parSetPart2.add(new ASN1Integer(gmssParameterset
-                .getWinternitzParameter()[i]));
-            parSetPart3.add(new ASN1Integer(gmssParameterset.getK()[i]));
-        }
-        parSetPart0.add(new ASN1Integer(gmssParameterset.getNumOfLayers()));
-        parSetPart0.add(new DERSequence(parSetPart1));
-        parSetPart0.add(new DERSequence(parSetPart2));
-        parSetPart0.add(new DERSequence(parSetPart3));
-        result.add(new DERSequence(parSetPart0));
-
-        // --- Encode <names>.
-        ASN1EncodableVector namesPart = new ASN1EncodableVector();
-
-        for (int i = 0; i < algorithms.length; i++)
-        {
-            namesPart.add(algorithms[i]);
-        }
-
-        result.add(new DERSequence(namesPart));
-        return new DERSequence(result);
-
-    }
-
-    private static int checkBigIntegerInIntRange(ASN1Encodable a)
-    {
-        BigInteger b = ((ASN1Integer)a).getValue();
-        if ((b.compareTo(BigInteger.valueOf(Integer.MAX_VALUE)) > 0) ||
-            (b.compareTo(BigInteger.valueOf(Integer.MIN_VALUE)) < 0))
-        {
-            throw new IllegalArgumentException("BigInteger not in Range: " + b.toString());
-        }
-        return b.intValue();
-    }
-
-
-    public ASN1Primitive toASN1Primitive()
-    {
-        return this.primitive;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/asn1/GMSSPublicKey.java b/bcprov/src/main/java/org/bouncycastle/pqc/asn1/GMSSPublicKey.java
deleted file mode 100644
index fc5c4f2..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/asn1/GMSSPublicKey.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package org.bouncycastle.pqc.asn1;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DEROctetString;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.util.Arrays;
-
-/**
- * This class implements an ASN.1 encoded GMSS public key. The ASN.1 definition
- * of this structure is:
- * <pre>
- *  GMSSPublicKey        ::= SEQUENCE{
- *      version         INTEGER
- *      publicKey       OCTET STRING
- *  }
- * </pre>
- */
-public class GMSSPublicKey
-    extends ASN1Object
-{
-    private ASN1Integer version;
-    private byte[] publicKey;
-
-    private GMSSPublicKey(ASN1Sequence seq)
-    {
-        if (seq.size() != 2)
-        {
-            throw new IllegalArgumentException("size of seq = " + seq.size());
-        }
-
-        this.version = ASN1Integer.getInstance(seq.getObjectAt(0));
-        this.publicKey = ASN1OctetString.getInstance(seq.getObjectAt(1)).getOctets();
-    }
-
-    public GMSSPublicKey(byte[] publicKeyBytes)
-    {
-        this.version = new ASN1Integer(0);
-        this.publicKey = publicKeyBytes;
-    }
-
-    public static GMSSPublicKey getInstance(Object o)
-    {
-        if (o instanceof GMSSPublicKey)
-        {
-            return (GMSSPublicKey)o;
-        }
-        else if (o != null)
-        {
-            return new GMSSPublicKey(ASN1Sequence.getInstance(o));
-        }
-
-        return null;
-    }
-
-    public byte[] getPublicKey()
-    {
-        return Arrays.clone(publicKey);
-    }
-
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector v = new ASN1EncodableVector();
-
-        v.add(version);
-        v.add(new DEROctetString(publicKey));
-
-        return new DERSequence(v);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/asn1/McElieceCCA2PrivateKey.java b/bcprov/src/main/java/org/bouncycastle/pqc/asn1/McElieceCCA2PrivateKey.java
deleted file mode 100644
index 192484f..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/asn1/McElieceCCA2PrivateKey.java
+++ /dev/null
@@ -1,173 +0,0 @@
-package org.bouncycastle.pqc.asn1;
-
-import java.math.BigInteger;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DEROctetString;
-import org.bouncycastle.asn1.DERSequence;
-
-import org.bouncycastle.pqc.math.linearalgebra.GF2Matrix;
-import org.bouncycastle.pqc.math.linearalgebra.GF2mField;
-import org.bouncycastle.pqc.math.linearalgebra.Permutation;
-import org.bouncycastle.pqc.math.linearalgebra.PolynomialGF2mSmallM;
-
-public class McElieceCCA2PrivateKey
-    extends ASN1Object
-{
-    private ASN1ObjectIdentifier oid;
-    private int n;
-    private int k;
-    private byte[] encField;
-    private byte[] encGp;
-    private byte[] encP;
-    private byte[] encH;
-    private byte[][] encqInv;
-
-
-    public McElieceCCA2PrivateKey(ASN1ObjectIdentifier oid, int n, int k, GF2mField field, PolynomialGF2mSmallM goppaPoly, Permutation p, GF2Matrix h, PolynomialGF2mSmallM[] qInv)
-    {
-        this.oid = oid;
-        this.n = n;
-        this.k = k;
-        this.encField = field.getEncoded();
-        this.encGp = goppaPoly.getEncoded();
-        this.encP = p.getEncoded();
-        this.encH = h.getEncoded();
-        this.encqInv = new byte[qInv.length][];
-
-        for (int i = 0; i != qInv.length; i++)
-        {
-            encqInv[i] = qInv[i].getEncoded();
-        }
-    }
-
-    private McElieceCCA2PrivateKey(ASN1Sequence seq)
-    {
-        oid = ((ASN1ObjectIdentifier)seq.getObjectAt(0));
-
-        BigInteger bigN = ((ASN1Integer)seq.getObjectAt(1)).getValue();
-        n = bigN.intValue();
-
-        BigInteger bigK = ((ASN1Integer)seq.getObjectAt(2)).getValue();
-        k = bigK.intValue();
-
-        encField = ((ASN1OctetString)seq.getObjectAt(3)).getOctets();
-
-        encGp = ((ASN1OctetString)seq.getObjectAt(4)).getOctets();
-
-        encP = ((ASN1OctetString)seq.getObjectAt(5)).getOctets();
-
-        encH = ((ASN1OctetString)seq.getObjectAt(6)).getOctets();
-
-        ASN1Sequence asnQInv = (ASN1Sequence)seq.getObjectAt(7);
-        encqInv = new byte[asnQInv.size()][];
-        for (int i = 0; i < asnQInv.size(); i++)
-        {
-            encqInv[i] = ((ASN1OctetString)asnQInv.getObjectAt(i)).getOctets();
-        }
-    }
-
-    public ASN1ObjectIdentifier getOID()
-    {
-        return oid;
-    }
-
-    public int getN()
-    {
-        return n;
-    }
-
-    public int getK()
-    {
-        return k;
-    }
-
-    public GF2mField getField()
-    {
-        return new GF2mField(encField);
-    }
-
-    public PolynomialGF2mSmallM getGoppaPoly()
-    {
-        return new PolynomialGF2mSmallM(this.getField(), encGp);
-    }
-
-    public Permutation getP()
-    {
-        return new Permutation(encP);
-    }
-
-    public GF2Matrix getH()
-    {
-        return new GF2Matrix(encH);
-    }
-
-    public PolynomialGF2mSmallM[] getQInv()
-    {
-        PolynomialGF2mSmallM[] qInv = new PolynomialGF2mSmallM[encqInv.length];
-        GF2mField field = this.getField();
-
-        for (int i = 0; i < encqInv.length; i++)
-        {
-            qInv[i] = new PolynomialGF2mSmallM(field, encqInv[i]);
-        }
-
-        return qInv;
-    }
-
-    public ASN1Primitive toASN1Primitive()
-    {
-
-        ASN1EncodableVector v = new ASN1EncodableVector();
-        // encode <oidString>
-        v.add(oid);
-        // encode <n>
-        v.add(new ASN1Integer(n));
-
-        // encode <k>
-        v.add(new ASN1Integer(k));
-
-        // encode <field>
-        v.add(new DEROctetString(encField));
-
-        // encode <gp>
-        v.add(new DEROctetString(encGp));
-
-        // encode <p>
-        v.add(new DEROctetString(encP));
-
-        // encode <h>
-        v.add(new DEROctetString(encH));
-
-        // encode <q>
-        ASN1EncodableVector asnQInv = new ASN1EncodableVector();
-        for (int i = 0; i < encqInv.length; i++)
-        {
-            asnQInv.add(new DEROctetString(encqInv[i]));
-        }
-
-        v.add(new DERSequence(asnQInv));
-
-        return new DERSequence(v);
-    }
-
-    public static McElieceCCA2PrivateKey getInstance(Object o)
-    {
-        if (o instanceof McElieceCCA2PrivateKey)
-        {
-            return (McElieceCCA2PrivateKey)o;
-        }
-        else if (o != null)
-        {
-            return new McElieceCCA2PrivateKey(ASN1Sequence.getInstance(o));
-        }
-
-        return null;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/asn1/McElieceCCA2PublicKey.java b/bcprov/src/main/java/org/bouncycastle/pqc/asn1/McElieceCCA2PublicKey.java
deleted file mode 100644
index adb5e46..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/asn1/McElieceCCA2PublicKey.java
+++ /dev/null
@@ -1,96 +0,0 @@
-package org.bouncycastle.pqc.asn1;
-
-import java.math.BigInteger;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DEROctetString;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.pqc.math.linearalgebra.GF2Matrix;
-
-public class McElieceCCA2PublicKey
-    extends ASN1Object
-{
-    private ASN1ObjectIdentifier oid;
-    private int n;
-    private int t;
-
-    private byte[] matrixG;
-
-    public McElieceCCA2PublicKey(ASN1ObjectIdentifier oid, int n, int t, GF2Matrix g)
-    {
-        this.oid = oid;
-        this.n = n;
-        this.t = t;
-        this.matrixG = g.getEncoded();
-    }
-
-    private McElieceCCA2PublicKey(ASN1Sequence seq)
-    {
-        oid = ((ASN1ObjectIdentifier)seq.getObjectAt(0));
-        BigInteger bigN = ((ASN1Integer)seq.getObjectAt(1)).getValue();
-        n = bigN.intValue();
-
-        BigInteger bigT = ((ASN1Integer)seq.getObjectAt(2)).getValue();
-        t = bigT.intValue();
-
-        matrixG = ((ASN1OctetString)seq.getObjectAt(3)).getOctets();
-    }
-
-    public ASN1ObjectIdentifier getOID()
-    {
-        return oid;
-    }
-
-    public int getN()
-    {
-        return n;
-    }
-
-    public int getT()
-    {
-        return t;
-    }
-
-    public GF2Matrix getG()
-    {
-        return new GF2Matrix(matrixG);
-    }
-
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector v = new ASN1EncodableVector();
-        // encode <oidString>
-        v.add(oid);
-
-        // encode <n>
-        v.add(new ASN1Integer(n));
-
-        // encode <t>
-        v.add(new ASN1Integer(t));
-
-        // encode <matrixG>
-        v.add(new DEROctetString(matrixG));
-
-        return new DERSequence(v);
-    }
-
-    public static McElieceCCA2PublicKey getInstance(Object o)
-    {
-        if (o instanceof McElieceCCA2PublicKey)
-        {
-            return (McElieceCCA2PublicKey)o;
-        }
-        else if (o != null)
-        {
-            return new McElieceCCA2PublicKey(ASN1Sequence.getInstance(o));
-        }
-
-        return null;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/asn1/McEliecePrivateKey.java b/bcprov/src/main/java/org/bouncycastle/pqc/asn1/McEliecePrivateKey.java
deleted file mode 100644
index 4bf2f82..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/asn1/McEliecePrivateKey.java
+++ /dev/null
@@ -1,197 +0,0 @@
-package org.bouncycastle.pqc.asn1;
-
-import java.math.BigInteger;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DEROctetString;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.pqc.math.linearalgebra.GF2Matrix;
-import org.bouncycastle.pqc.math.linearalgebra.GF2mField;
-import org.bouncycastle.pqc.math.linearalgebra.Permutation;
-import org.bouncycastle.pqc.math.linearalgebra.PolynomialGF2mSmallM;
-
-public class McEliecePrivateKey
-    extends ASN1Object
-{
-    private ASN1ObjectIdentifier oid;
-    private int n;
-    private int k;
-    private byte[] encField;
-    private byte[] encGp;
-    private byte[] encSInv;
-    private byte[] encP1;
-    private byte[] encP2;
-    private byte[] encH;
-    private byte[][] encqInv;
-
-
-    public McEliecePrivateKey(ASN1ObjectIdentifier oid, int n, int k, GF2mField field, PolynomialGF2mSmallM goppaPoly, GF2Matrix sInv, Permutation p1, Permutation p2, GF2Matrix h, PolynomialGF2mSmallM[] qInv)
-    {
-        this.oid = oid;
-        this.n = n;
-        this.k = k;
-        this.encField = field.getEncoded();
-        this.encGp = goppaPoly.getEncoded();
-        this.encSInv = sInv.getEncoded();
-        this.encP1 = p1.getEncoded();
-        this.encP2 = p2.getEncoded();
-        this.encH = h.getEncoded();
-        this.encqInv = new byte[qInv.length][];
-
-        for (int i = 0; i != qInv.length; i++)
-        {
-            encqInv[i] = qInv[i].getEncoded();
-        }
-    }
-
-    public static McEliecePrivateKey getInstance(Object o)
-    {
-        if (o instanceof McEliecePrivateKey)
-        {
-            return (McEliecePrivateKey)o;
-        }
-        else if (o != null)
-        {
-            return new McEliecePrivateKey(ASN1Sequence.getInstance(o));
-        }
-
-        return null;
-    }
-
-    private McEliecePrivateKey(ASN1Sequence seq)
-    {
-        // <oidString>
-        oid = ((ASN1ObjectIdentifier)seq.getObjectAt(0));
-
-        BigInteger bigN = ((ASN1Integer)seq.getObjectAt(1)).getValue();
-        n = bigN.intValue();
-
-        BigInteger bigK = ((ASN1Integer)seq.getObjectAt(2)).getValue();
-        k = bigK.intValue();
-
-        encField = ((ASN1OctetString)seq.getObjectAt(3)).getOctets();
-
-        encGp = ((ASN1OctetString)seq.getObjectAt(4)).getOctets();
-
-        encSInv = ((ASN1OctetString)seq.getObjectAt(5)).getOctets();
-
-        encP1 = ((ASN1OctetString)seq.getObjectAt(6)).getOctets();
-
-        encP2 = ((ASN1OctetString)seq.getObjectAt(7)).getOctets();
-
-        encH = ((ASN1OctetString)seq.getObjectAt(8)).getOctets();
-
-        ASN1Sequence asnQInv = (ASN1Sequence)seq.getObjectAt(9);
-        encqInv = new byte[asnQInv.size()][];
-        for (int i = 0; i < asnQInv.size(); i++)
-        {
-            encqInv[i] = ((ASN1OctetString)asnQInv.getObjectAt(i)).getOctets();
-        }
-    }
-
-    public ASN1ObjectIdentifier getOID()
-    {
-        return oid;
-    }
-
-    public int getN()
-    {
-        return n;
-    }
-
-    public int getK()
-    {
-        return k;
-    }
-
-    public GF2mField getField()
-    {
-        return new GF2mField(encField);
-    }
-
-    public PolynomialGF2mSmallM getGoppaPoly()
-    {
-        return new PolynomialGF2mSmallM(this.getField(), encGp);
-    }
-
-    public GF2Matrix getSInv()
-    {
-        return new GF2Matrix(encSInv);
-    }
-
-    public Permutation getP1()
-    {
-        return new Permutation(encP1);
-    }
-
-    public Permutation getP2()
-    {
-        return new Permutation(encP2);
-    }
-
-    public GF2Matrix getH()
-    {
-        return new GF2Matrix(encH);
-    }
-
-    public PolynomialGF2mSmallM[] getQInv()
-    {
-        PolynomialGF2mSmallM[] qInv = new PolynomialGF2mSmallM[encqInv.length];
-        GF2mField field = this.getField();
-
-        for (int i = 0; i < encqInv.length; i++)
-        {
-            qInv[i] = new PolynomialGF2mSmallM(field, encqInv[i]);
-        }
-
-        return qInv;
-    }
-
-    public ASN1Primitive toASN1Primitive()
-    {
-
-        ASN1EncodableVector v = new ASN1EncodableVector();
-        // encode <oidString>
-        v.add(oid);
-        // encode <n>
-        v.add(new ASN1Integer(n));
-
-        // encode <k>
-        v.add(new ASN1Integer(k));
-
-        // encode <fieldPoly>
-        v.add(new DEROctetString(encField));
-
-        // encode <goppaPoly>
-        v.add(new DEROctetString(encGp));
-
-        // encode <sInv>
-        v.add(new DEROctetString(encSInv));
-
-        // encode <p1>
-        v.add(new DEROctetString(encP1));
-
-        // encode <p2>
-        v.add(new DEROctetString(encP2));
-
-        // encode <h>
-        v.add(new DEROctetString(encH));
-
-        // encode <q>
-        ASN1EncodableVector asnQInv = new ASN1EncodableVector();
-        for (int i = 0; i < encqInv.length; i++)
-        {
-            asnQInv.add(new DEROctetString(encqInv[i]));
-        }
-
-        v.add(new DERSequence(asnQInv));
-
-        return new DERSequence(v);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/asn1/McEliecePublicKey.java b/bcprov/src/main/java/org/bouncycastle/pqc/asn1/McEliecePublicKey.java
deleted file mode 100644
index 6f1efc0..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/asn1/McEliecePublicKey.java
+++ /dev/null
@@ -1,97 +0,0 @@
-package org.bouncycastle.pqc.asn1;
-
-import java.math.BigInteger;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DEROctetString;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.pqc.math.linearalgebra.GF2Matrix;
-
-public class McEliecePublicKey
-    extends ASN1Object
-{
-
-    private ASN1ObjectIdentifier oid;
-    private int n;
-    private int t;
-
-    private byte[] matrixG;
-
-    public McEliecePublicKey(ASN1ObjectIdentifier oid, int n, int t, GF2Matrix g)
-    {
-        this.oid = oid;
-        this.n = n;
-        this.t = t;
-        this.matrixG = g.getEncoded();
-    }
-
-    private McEliecePublicKey(ASN1Sequence seq)
-    {
-        oid = ((ASN1ObjectIdentifier)seq.getObjectAt(0));
-        BigInteger bigN = ((ASN1Integer)seq.getObjectAt(1)).getValue();
-        n = bigN.intValue();
-
-        BigInteger bigT = ((ASN1Integer)seq.getObjectAt(2)).getValue();
-        t = bigT.intValue();
-
-        matrixG = ((ASN1OctetString)seq.getObjectAt(3)).getOctets();
-    }
-
-    public ASN1ObjectIdentifier getOID()
-    {
-        return oid;
-    }
-
-    public int getN()
-    {
-        return n;
-    }
-
-    public int getT()
-    {
-        return t;
-    }
-
-    public GF2Matrix getG()
-    {
-        return new GF2Matrix(matrixG);
-    }
-
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector v = new ASN1EncodableVector();
-        // encode <oidString>
-        v.add(oid);
-
-        // encode <n>
-        v.add(new ASN1Integer(n));
-
-        // encode <t>
-        v.add(new ASN1Integer(t));
-
-        // encode <matrixG>
-        v.add(new DEROctetString(matrixG));
-
-        return new DERSequence(v);
-    }
-
-    public static McEliecePublicKey getInstance(Object o)
-    {
-        if (o instanceof McEliecePublicKey)
-        {
-            return (McEliecePublicKey)o;
-        }
-        else if (o != null)
-        {
-            return new McEliecePublicKey(ASN1Sequence.getInstance(o));
-        }
-
-        return null;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/asn1/PQCObjectIdentifiers.java b/bcprov/src/main/java/org/bouncycastle/pqc/asn1/PQCObjectIdentifiers.java
deleted file mode 100644
index d93d995..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/asn1/PQCObjectIdentifiers.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package org.bouncycastle.pqc.asn1;
-
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-
-/**
- * PQC:
- * <p>
- * { iso(1) identifier-organization(3) dod(6) internet(1) private(4) 1 8301 3 1 3 5 3 ... }
- */
-public interface PQCObjectIdentifiers
-{
-    /** 1.3.6.1.4.1.8301.3.1.3.5.3.2 */
-    public static final ASN1ObjectIdentifier rainbow = new ASN1ObjectIdentifier("1.3.6.1.4.1.8301.3.1.3.5.3.2");
-
-    /** 1.3.6.1.4.1.8301.3.1.3.5.3.2.1 */
-    public static final ASN1ObjectIdentifier rainbowWithSha1   = rainbow.branch("1");
-    /** 1.3.6.1.4.1.8301.3.1.3.5.3.2.2 */
-    public static final ASN1ObjectIdentifier rainbowWithSha224 = rainbow.branch("2");
-    /** 1.3.6.1.4.1.8301.3.1.3.5.3.2.3 */
-    public static final ASN1ObjectIdentifier rainbowWithSha256 = rainbow.branch("3");
-    /** 1.3.6.1.4.1.8301.3.1.3.5.3.2.4 */
-    public static final ASN1ObjectIdentifier rainbowWithSha384 = rainbow.branch("4");
-    /** 1.3.6.1.4.1.8301.3.1.3.5.3.2.5 */
-    public static final ASN1ObjectIdentifier rainbowWithSha512 = rainbow.branch("5");
-
-    /** 1.3.6.1.4.1.8301.3.1.3.3 */
-    public static final ASN1ObjectIdentifier gmss = new ASN1ObjectIdentifier("1.3.6.1.4.1.8301.3.1.3.3");
-
-    /** 1.3.6.1.4.1.8301.3.1.3.3.1 */
-    public static final ASN1ObjectIdentifier gmssWithSha1   = gmss.branch("1");
-    /** 1.3.6.1.4.1.8301.3.1.3.3.2 */
-    public static final ASN1ObjectIdentifier gmssWithSha224 = gmss.branch("2");
-    /** 1.3.6.1.4.1.8301.3.1.3.3.3 */
-    public static final ASN1ObjectIdentifier gmssWithSha256 = gmss.branch("3");
-    /** 1.3.6.1.4.1.8301.3.1.3.3.4 */
-    public static final ASN1ObjectIdentifier gmssWithSha384 = gmss.branch("4");
-    /** 1.3.6.1.4.1.8301.3.1.3.3.5 */
-    public static final ASN1ObjectIdentifier gmssWithSha512 = gmss.branch("5");
-
-    /** 1.3.6.1.4.1.8301.3.1.3.4.1 */
-    public static final ASN1ObjectIdentifier mcEliece       = new ASN1ObjectIdentifier("1.3.6.1.4.1.8301.3.1.3.4.1");
-
-    /** 1.3.6.1.4.1.8301.3.1.3.4.2 */
-    public static final ASN1ObjectIdentifier mcElieceCca2   = new ASN1ObjectIdentifier("1.3.6.1.4.1.8301.3.1.3.4.2");
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/asn1/ParSet.java b/bcprov/src/main/java/org/bouncycastle/pqc/asn1/ParSet.java
deleted file mode 100644
index dee56a5..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/asn1/ParSet.java
+++ /dev/null
@@ -1,140 +0,0 @@
-package org.bouncycastle.pqc.asn1;
-
-import java.math.BigInteger;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.util.Arrays;
-
-/**
- * <pre>
- *  ParSet              ::= SEQUENCE {
- *      T               INTEGER
- *      h               SEQUENCE OF INTEGER
- *      w               SEQUENCE OF INTEGER
- *      K               SEQUENCE OF INTEGER
- *  }
- * </pre>
- */
-public class ParSet
-    extends ASN1Object
-{
-    private static final BigInteger ZERO = BigInteger.valueOf(0);
-
-    private int   t;
-    private int[] h;
-    private int[] w;
-    private int[] k;
-
-    private static int checkBigIntegerInIntRangeAndPositive(BigInteger b)
-    {
-        if ((b.compareTo(BigInteger.valueOf(Integer.MAX_VALUE)) > 0) ||
-            (b.compareTo(ZERO) <= 0))
-        {
-            throw new IllegalArgumentException("BigInteger not in Range: " + b.toString());
-        }
-        return b.intValue();
-    }
-
-    private ParSet(ASN1Sequence seq)
-    {
-        if (seq.size() != 4)
-        {
-            throw new IllegalArgumentException("sie of seqOfParams = " + seq.size());
-        }
-        BigInteger asn1int = ((ASN1Integer)seq.getObjectAt(0)).getValue();
-
-        t = checkBigIntegerInIntRangeAndPositive(asn1int);
-
-        ASN1Sequence seqOfPSh = (ASN1Sequence)seq.getObjectAt(1);
-        ASN1Sequence seqOfPSw = (ASN1Sequence)seq.getObjectAt(2);
-        ASN1Sequence seqOfPSK = (ASN1Sequence)seq.getObjectAt(3);
-
-        if ((seqOfPSh.size() != t) ||
-            (seqOfPSw.size() != t) ||
-            (seqOfPSK.size() != t))
-        {
-            throw new IllegalArgumentException("invalid size of sequences");
-        }
-
-        h = new int[seqOfPSh.size()];
-        w = new int[seqOfPSw.size()];
-        k = new int[seqOfPSK.size()];
-
-        for (int i = 0; i < t; i++)
-        {
-            h[i] = checkBigIntegerInIntRangeAndPositive((((ASN1Integer)seqOfPSh.getObjectAt(i))).getValue());
-            w[i] = checkBigIntegerInIntRangeAndPositive((((ASN1Integer)seqOfPSw.getObjectAt(i))).getValue());
-            k[i] = checkBigIntegerInIntRangeAndPositive((((ASN1Integer)seqOfPSK.getObjectAt(i))).getValue());
-        }
-    }
-
-    public ParSet(int t, int[] h, int[] w, int[] k)
-    {
-        this.t = t;
-        this.h = h;
-        this.w = w;
-        this.k = k;
-    }
-
-    public static ParSet getInstance(Object o)
-    {
-        if (o instanceof ParSet)
-        {
-            return (ParSet)o;
-        }
-        else if (o != null)
-        {
-            return new ParSet(ASN1Sequence.getInstance(o));
-        }
-
-        return null;
-    }
-
-    public int getT()
-    {
-        return t;
-    }
-
-    public int[] getH()
-    {
-        return Arrays.clone(h);
-    }
-
-    public int[] getW()
-    {
-        return Arrays.clone(w);
-    }
-
-    public int[] getK()
-    {
-        return Arrays.clone(k);
-    }
-
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector seqOfPSh = new ASN1EncodableVector();
-        ASN1EncodableVector seqOfPSw = new ASN1EncodableVector();
-        ASN1EncodableVector seqOfPSK = new ASN1EncodableVector();
-
-        for (int i = 0; i < h.length; i++)
-        {
-            seqOfPSh.add(new ASN1Integer(h[i]));
-            seqOfPSw.add(new ASN1Integer(w[i]));
-            seqOfPSK.add(new ASN1Integer(k[i]));
-        }
-
-        ASN1EncodableVector v = new ASN1EncodableVector();
-
-        v.add(new ASN1Integer(t));
-        v.add(new DERSequence(seqOfPSh));
-        v.add(new DERSequence(seqOfPSw));
-        v.add(new DERSequence(seqOfPSK));
-
-        return new DERSequence(v);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/asn1/RainbowPrivateKey.java b/bcprov/src/main/java/org/bouncycastle/pqc/asn1/RainbowPrivateKey.java
deleted file mode 100644
index 7c21691..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/asn1/RainbowPrivateKey.java
+++ /dev/null
@@ -1,349 +0,0 @@
-package org.bouncycastle.pqc.asn1;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DEROctetString;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.pqc.crypto.rainbow.Layer;
-import org.bouncycastle.pqc.crypto.rainbow.util.RainbowUtil;
-
-/**
- * Return the key data to encode in the PrivateKeyInfo structure.
- * <p>
- * The ASN.1 definition of the key structure is
- * <pre>
- *   RainbowPrivateKey ::= SEQUENCE {
- *         CHOICE
- *         {
- *         oid        OBJECT IDENTIFIER         -- OID identifying the algorithm
- *         version    INTEGER                    -- 0
- *         }
- *     A1inv      SEQUENCE OF OCTET STRING  -- inversed matrix of L1
- *     b1         OCTET STRING              -- translation vector of L1
- *     A2inv      SEQUENCE OF OCTET STRING  -- inversed matrix of L2
- *     b2         OCTET STRING              -- translation vector of L2
- *     vi         OCTET STRING              -- num of elmts in each Set S
- *     layers     SEQUENCE OF Layer         -- layers of F
- *   }
- *
- *   Layer             ::= SEQUENCE OF Poly
- *
- *   Poly              ::= SEQUENCE {
- *     alpha      SEQUENCE OF OCTET STRING
- *     beta       SEQUENCE OF OCTET STRING
- *     gamma      OCTET STRING
- *     eta        INTEGER
- *   }
- * </pre>
- */
-public class RainbowPrivateKey
-    extends ASN1Object
-{
-    private ASN1Integer  version;
-    private ASN1ObjectIdentifier oid;
-
-    private byte[][] invA1;
-    private byte[] b1;
-    private byte[][] invA2;
-    private byte[] b2;
-    private byte[] vi;
-    private Layer[] layers;
-
-    private RainbowPrivateKey(ASN1Sequence seq)
-    {
-        // <oidString>  or version
-        if (seq.getObjectAt(0) instanceof ASN1Integer)
-        {
-            version = ASN1Integer.getInstance(seq.getObjectAt(0));
-        }
-        else
-        {
-            oid = ASN1ObjectIdentifier.getInstance(seq.getObjectAt(0));
-        }
-
-        // <A1inv>
-        ASN1Sequence asnA1 = (ASN1Sequence)seq.getObjectAt(1);
-        invA1 = new byte[asnA1.size()][];
-        for (int i = 0; i < asnA1.size(); i++)
-        {
-            invA1[i] = ((ASN1OctetString)asnA1.getObjectAt(i)).getOctets();
-        }
-
-        // <b1>
-        ASN1Sequence asnb1 = (ASN1Sequence)seq.getObjectAt(2);
-        b1 = ((ASN1OctetString)asnb1.getObjectAt(0)).getOctets();
-
-        // <A2inv>
-        ASN1Sequence asnA2 = (ASN1Sequence)seq.getObjectAt(3);
-        invA2 = new byte[asnA2.size()][];
-        for (int j = 0; j < asnA2.size(); j++)
-        {
-            invA2[j] = ((ASN1OctetString)asnA2.getObjectAt(j)).getOctets();
-        }
-
-        // <b2>
-        ASN1Sequence asnb2 = (ASN1Sequence)seq.getObjectAt(4);
-        b2 = ((ASN1OctetString)asnb2.getObjectAt(0)).getOctets();
-
-        // <vi>
-        ASN1Sequence asnvi = (ASN1Sequence)seq.getObjectAt(5);
-        vi = ((ASN1OctetString)asnvi.getObjectAt(0)).getOctets();
-
-        // <layers>
-        ASN1Sequence asnLayers = (ASN1Sequence)seq.getObjectAt(6);
-
-        byte[][][][] alphas = new byte[asnLayers.size()][][][];
-        byte[][][][] betas = new byte[asnLayers.size()][][][];
-        byte[][][] gammas = new byte[asnLayers.size()][][];
-        byte[][] etas = new byte[asnLayers.size()][];
-        // a layer:
-        for (int l = 0; l < asnLayers.size(); l++)
-        {
-            ASN1Sequence asnLayer = (ASN1Sequence)asnLayers.getObjectAt(l);
-
-            // alphas (num of alpha-2d-array = oi)
-            ASN1Sequence alphas3d = (ASN1Sequence)asnLayer.getObjectAt(0);
-            alphas[l] = new byte[alphas3d.size()][][];
-            for (int m = 0; m < alphas3d.size(); m++)
-            {
-                ASN1Sequence alphas2d = (ASN1Sequence)alphas3d.getObjectAt(m);
-                alphas[l][m] = new byte[alphas2d.size()][];
-                for (int n = 0; n < alphas2d.size(); n++)
-                {
-                    alphas[l][m][n] = ((ASN1OctetString)alphas2d.getObjectAt(n)).getOctets();
-                }
-            }
-
-            // betas ....
-            ASN1Sequence betas3d = (ASN1Sequence)asnLayer.getObjectAt(1);
-            betas[l] = new byte[betas3d.size()][][];
-            for (int mb = 0; mb < betas3d.size(); mb++)
-            {
-                ASN1Sequence betas2d = (ASN1Sequence)betas3d.getObjectAt(mb);
-                betas[l][mb] = new byte[betas2d.size()][];
-                for (int nb = 0; nb < betas2d.size(); nb++)
-                {
-                    betas[l][mb][nb] = ((ASN1OctetString)betas2d.getObjectAt(nb)).getOctets();
-                }
-            }
-
-            // gammas ...
-            ASN1Sequence gammas2d = (ASN1Sequence)asnLayer.getObjectAt(2);
-            gammas[l] = new byte[gammas2d.size()][];
-            for (int mg = 0; mg < gammas2d.size(); mg++)
-            {
-                gammas[l][mg] = ((ASN1OctetString)gammas2d.getObjectAt(mg)).getOctets();
-            }
-
-            // eta ...
-            etas[l] = ((ASN1OctetString)asnLayer.getObjectAt(3)).getOctets();
-        }
-
-        int numOfLayers = vi.length - 1;
-        this.layers = new Layer[numOfLayers];
-        for (int i = 0; i < numOfLayers; i++)
-        {
-            Layer l = new Layer(vi[i], vi[i + 1], RainbowUtil.convertArray(alphas[i]),
-                RainbowUtil.convertArray(betas[i]), RainbowUtil.convertArray(gammas[i]), RainbowUtil.convertArray(etas[i]));
-            this.layers[i] = l;
-
-        }
-    }
-
-    public RainbowPrivateKey(short[][] invA1, short[] b1, short[][] invA2,
-                                   short[] b2, int[] vi, Layer[] layers)
-    {
-        this.version = new ASN1Integer(1);
-        this.invA1 = RainbowUtil.convertArray(invA1);
-        this.b1 = RainbowUtil.convertArray(b1);
-        this.invA2 = RainbowUtil.convertArray(invA2);
-        this.b2 = RainbowUtil.convertArray(b2);
-        this.vi = RainbowUtil.convertIntArray(vi);
-        this.layers = layers;
-    }
-    
-    public static RainbowPrivateKey getInstance(Object o)
-    {
-        if (o instanceof RainbowPrivateKey)
-        {
-            return (RainbowPrivateKey)o;
-        }
-        else if (o != null)
-        {
-            return new RainbowPrivateKey(ASN1Sequence.getInstance(o));
-        }
-
-        return null;
-    }
-
-    public ASN1Integer getVersion()
-    {
-        return version;
-    }
-
-    /**
-     * Getter for the inverse matrix of A1.
-     *
-     * @return the A1inv inverse
-     */
-    public short[][] getInvA1()
-    {
-        return RainbowUtil.convertArray(invA1);
-    }
-
-    /**
-     * Getter for the translation part of the private quadratic map L1.
-     *
-     * @return b1 the translation part of L1
-     */
-    public short[] getB1()
-    {
-        return RainbowUtil.convertArray(b1);
-    }
-
-    /**
-     * Getter for the translation part of the private quadratic map L2.
-     *
-     * @return b2 the translation part of L2
-     */
-    public short[] getB2()
-    {
-        return RainbowUtil.convertArray(b2);
-    }
-
-    /**
-     * Getter for the inverse matrix of A2
-     *
-     * @return the A2inv
-     */
-    public short[][] getInvA2()
-    {
-        return RainbowUtil.convertArray(invA2);
-    }
-
-    /**
-     * Returns the layers contained in the private key
-     *
-     * @return layers
-     */
-    public Layer[] getLayers()
-    {
-        return this.layers;
-    }
-
-    /**
-     * Returns the array of vi-s
-     *
-     * @return the vi
-     */
-    public int[] getVi()
-    {
-        return RainbowUtil.convertArraytoInt(vi);
-    }
-    
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector v = new ASN1EncodableVector();
-
-        // encode <oidString>  or version
-        if (version != null)
-        {
-            v.add(version);
-        }
-        else
-        {
-            v.add(oid);
-        }
-
-        // encode <A1inv>
-        ASN1EncodableVector asnA1 = new ASN1EncodableVector();
-        for (int i = 0; i < invA1.length; i++)
-        {
-            asnA1.add(new DEROctetString(invA1[i]));
-        }
-        v.add(new DERSequence(asnA1));
-
-        // encode <b1>
-        ASN1EncodableVector asnb1 = new ASN1EncodableVector();
-        asnb1.add(new DEROctetString(b1));
-        v.add(new DERSequence(asnb1));
-
-        // encode <A2inv>
-        ASN1EncodableVector asnA2 = new ASN1EncodableVector();
-        for (int i = 0; i < invA2.length; i++)
-        {
-            asnA2.add(new DEROctetString(invA2[i]));
-        }
-        v.add(new DERSequence(asnA2));
-
-        // encode <b2>
-        ASN1EncodableVector asnb2 = new ASN1EncodableVector();
-        asnb2.add(new DEROctetString(b2));
-        v.add(new DERSequence(asnb2));
-
-        // encode <vi>
-        ASN1EncodableVector asnvi = new ASN1EncodableVector();
-        asnvi.add(new DEROctetString(vi));
-        v.add(new DERSequence(asnvi));
-
-        // encode <layers>
-        ASN1EncodableVector asnLayers = new ASN1EncodableVector();
-        // a layer:
-        for (int l = 0; l < layers.length; l++)
-        {
-            ASN1EncodableVector aLayer = new ASN1EncodableVector();
-
-            // alphas (num of alpha-2d-array = oi)
-            byte[][][] alphas = RainbowUtil.convertArray(layers[l].getCoeffAlpha());
-            ASN1EncodableVector alphas3d = new ASN1EncodableVector();
-            for (int i = 0; i < alphas.length; i++)
-            {
-                ASN1EncodableVector alphas2d = new ASN1EncodableVector();
-                for (int j = 0; j < alphas[i].length; j++)
-                {
-                    alphas2d.add(new DEROctetString(alphas[i][j]));
-                }
-                alphas3d.add(new DERSequence(alphas2d));
-            }
-            aLayer.add(new DERSequence(alphas3d));
-
-            // betas ....
-            byte[][][] betas = RainbowUtil.convertArray(layers[l].getCoeffBeta());
-            ASN1EncodableVector betas3d = new ASN1EncodableVector();
-            for (int i = 0; i < betas.length; i++)
-            {
-                ASN1EncodableVector betas2d = new ASN1EncodableVector();
-                for (int j = 0; j < betas[i].length; j++)
-                {
-                    betas2d.add(new DEROctetString(betas[i][j]));
-                }
-                betas3d.add(new DERSequence(betas2d));
-            }
-            aLayer.add(new DERSequence(betas3d));
-
-            // gammas ...
-            byte[][] gammas = RainbowUtil.convertArray(layers[l].getCoeffGamma());
-            ASN1EncodableVector asnG = new ASN1EncodableVector();
-            for (int i = 0; i < gammas.length; i++)
-            {
-                asnG.add(new DEROctetString(gammas[i]));
-            }
-            aLayer.add(new DERSequence(asnG));
-
-            // eta
-            aLayer.add(new DEROctetString(RainbowUtil.convertArray(layers[l].getCoeffEta())));
-
-            // now, layer built up. add it!
-            asnLayers.add(new DERSequence(aLayer));
-        }
-
-        v.add(new DERSequence(asnLayers));
-
-        return new DERSequence(v);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/asn1/RainbowPublicKey.java b/bcprov/src/main/java/org/bouncycastle/pqc/asn1/RainbowPublicKey.java
deleted file mode 100644
index febe538..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/asn1/RainbowPublicKey.java
+++ /dev/null
@@ -1,174 +0,0 @@
-package org.bouncycastle.pqc.asn1;
-
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1Object;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DEROctetString;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.pqc.crypto.rainbow.util.RainbowUtil;
-
-/**
- * This class implements an ASN.1 encoded Rainbow public key. The ASN.1 definition
- * of this structure is:
- * <pre>
- *       RainbowPublicKey ::= SEQUENCE {
- *         CHOICE
- *         {
- *         oid        OBJECT IDENTIFIER         -- OID identifying the algorithm
- *         version    INTEGER                    -- 0
- *         }
- *         docLength        Integer               -- length of the code
- *         coeffquadratic   SEQUENCE OF OCTET STRING -- quadratic (mixed) coefficients
- *         coeffsingular    SEQUENCE OF OCTET STRING -- singular coefficients
- *         coeffscalar    SEQUENCE OF OCTET STRING -- scalar coefficients
- *       }
- * </pre>
- */
-public class RainbowPublicKey
-    extends ASN1Object
-{
-    private ASN1Integer version;
-    private ASN1ObjectIdentifier oid;
-    private ASN1Integer docLength;
-    private byte[][] coeffQuadratic;
-    private byte[][] coeffSingular;
-    private byte[] coeffScalar;
-
-    private RainbowPublicKey(ASN1Sequence seq)
-    {
-        // <oidString>  or version
-        if (seq.getObjectAt(0) instanceof ASN1Integer)
-        {
-            version = ASN1Integer.getInstance(seq.getObjectAt(0));
-        }
-        else
-        {
-            oid = ASN1ObjectIdentifier.getInstance(seq.getObjectAt(0));
-        }
-
-        docLength = ASN1Integer.getInstance(seq.getObjectAt(1));
-
-        ASN1Sequence asnCoeffQuad = ASN1Sequence.getInstance(seq.getObjectAt(2));
-        coeffQuadratic = new byte[asnCoeffQuad.size()][];
-        for (int quadSize = 0; quadSize < asnCoeffQuad.size(); quadSize++)
-        {
-            coeffQuadratic[quadSize] = ASN1OctetString.getInstance(asnCoeffQuad.getObjectAt(quadSize)).getOctets();
-        }
-
-        ASN1Sequence asnCoeffSing = (ASN1Sequence)seq.getObjectAt(3);
-        coeffSingular = new byte[asnCoeffSing.size()][];
-        for (int singSize = 0; singSize < asnCoeffSing.size(); singSize++)
-        {
-            coeffSingular[singSize] = ASN1OctetString.getInstance(asnCoeffSing.getObjectAt(singSize)).getOctets();
-        }
-
-        ASN1Sequence asnCoeffScalar = (ASN1Sequence)seq.getObjectAt(4);
-        coeffScalar = ASN1OctetString.getInstance(asnCoeffScalar.getObjectAt(0)).getOctets();
-    }
-
-    public RainbowPublicKey(int docLength, short[][] coeffQuadratic, short[][] coeffSingular, short[] coeffScalar)
-    {
-        this.version = new ASN1Integer(0);
-        this.docLength = new ASN1Integer(docLength);
-        this.coeffQuadratic = RainbowUtil.convertArray(coeffQuadratic);
-        this.coeffSingular = RainbowUtil.convertArray(coeffSingular);
-        this.coeffScalar = RainbowUtil.convertArray(coeffScalar);
-    }
-
-    public static RainbowPublicKey getInstance(Object o)
-    {
-        if (o instanceof RainbowPublicKey)
-        {
-            return (RainbowPublicKey)o;
-        }
-        else if (o != null)
-        {
-            return new RainbowPublicKey(ASN1Sequence.getInstance(o));
-        }
-
-        return null;
-    }
-
-    public ASN1Integer getVersion()
-    {
-        return version;
-    }
-
-    /**
-     * @return the docLength
-     */
-    public int getDocLength()
-    {
-        return this.docLength.getValue().intValue();
-    }
-
-    /**
-     * @return the coeffquadratic
-     */
-    public short[][] getCoeffQuadratic()
-    {
-        return RainbowUtil.convertArray(coeffQuadratic);
-    }
-
-    /**
-     * @return the coeffsingular
-     */
-    public short[][] getCoeffSingular()
-    {
-        return RainbowUtil.convertArray(coeffSingular);
-    }
-
-    /**
-     * @return the coeffscalar
-     */
-    public short[] getCoeffScalar()
-    {
-        return RainbowUtil.convertArray(coeffScalar);
-    }
-
-    public ASN1Primitive toASN1Primitive()
-    {
-        ASN1EncodableVector v = new ASN1EncodableVector();
-
-        // encode <oidString>  or version
-        if (version != null)
-        {
-            v.add(version);
-        }
-        else
-        {
-            v.add(oid);
-        }
-
-        // encode <docLength>
-        v.add(docLength);
-
-        // encode <coeffQuadratic>
-        ASN1EncodableVector asnCoeffQuad = new ASN1EncodableVector();
-        for (int i = 0; i < coeffQuadratic.length; i++)
-        {
-            asnCoeffQuad.add(new DEROctetString(coeffQuadratic[i]));
-        }
-        v.add(new DERSequence(asnCoeffQuad));
-
-        // encode <coeffSingular>
-        ASN1EncodableVector asnCoeffSing = new ASN1EncodableVector();
-        for (int i = 0; i < coeffSingular.length; i++)
-        {
-            asnCoeffSing.add(new DEROctetString(coeffSingular[i]));
-        }
-        v.add(new DERSequence(asnCoeffSing));
-
-        // encode <coeffScalar>
-        ASN1EncodableVector asnCoeffScalar = new ASN1EncodableVector();
-        asnCoeffScalar.add(new DEROctetString(coeffScalar));
-        v.add(new DERSequence(asnCoeffScalar));
-
-
-        return new DERSequence(v);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/DigestingMessageSigner.java b/bcprov/src/main/java/org/bouncycastle/pqc/crypto/DigestingMessageSigner.java
deleted file mode 100644
index 6b5b251..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/DigestingMessageSigner.java
+++ /dev/null
@@ -1,117 +0,0 @@
-package org.bouncycastle.pqc.crypto;
-
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.Signer;
-import org.bouncycastle.crypto.params.AsymmetricKeyParameter;
-import org.bouncycastle.crypto.params.ParametersWithRandom;
-
-
-/**
- * Implements the sign and verify functions for a Signature Scheme which can use a hash function.
- */
-public class DigestingMessageSigner
-    implements Signer
-{
-    private final Digest messDigest;
-    private final MessageSigner messSigner;
-    private boolean forSigning;
-
-    public DigestingMessageSigner(MessageSigner messSigner, Digest messDigest)
-    {
-        this.messSigner = messSigner;
-        this.messDigest = messDigest;
-    }
-
-    public void init(boolean forSigning,
-                     CipherParameters param)
-    {
-
-        this.forSigning = forSigning;
-        AsymmetricKeyParameter k;
-
-        if (param instanceof ParametersWithRandom)
-        {
-            k = (AsymmetricKeyParameter)((ParametersWithRandom)param).getParameters();
-        }
-        else
-        {
-            k = (AsymmetricKeyParameter)param;
-        }
-
-        if (forSigning && !k.isPrivate())
-        {
-            throw new IllegalArgumentException("Signing Requires Private Key.");
-        }
-
-        if (!forSigning && k.isPrivate())
-        {
-            throw new IllegalArgumentException("Verification Requires Public Key.");
-        }
-
-        reset();
-
-        messSigner.init(forSigning, param);
-    }
-
-
-    /**
-     * This function signs the message that has been updated, making use of the
-     * private key.
-     *
-     * @return the signature of the message.
-     */
-    public byte[] generateSignature()
-    {
-        if (!forSigning)
-        {
-            throw new IllegalStateException("RainbowDigestSigner not initialised for signature generation.");
-        }
-
-        byte[] hash = new byte[messDigest.getDigestSize()];
-        messDigest.doFinal(hash, 0);
-
-        return messSigner.generateSignature(hash);
-    }
-
-    /**
-     * This function verifies the signature of the message that has been
-     * updated, with the aid of the public key.
-     *
-     * @param signature the signature of the message is given as a byte array.
-     * @return true if the signature has been verified, false otherwise.
-     */
-    public boolean verify(byte[] signature)
-    {
-        if (forSigning)
-        {
-            throw new IllegalStateException("RainbowDigestSigner not initialised for verification");
-        }
-
-        byte[] hash = new byte[messDigest.getDigestSize()];
-        messDigest.doFinal(hash, 0);
-
-        return messSigner.verifySignature(hash, signature);
-
-    }
-
-    public void update(byte b)
-    {
-        messDigest.update(b);
-    }
-
-    public void update(byte[] in, int off, int len)
-    {
-        messDigest.update(in, off, len);
-    }
-
-    public void reset()
-    {
-        messDigest.reset();
-    }
-
-    public boolean verifySignature(byte[] signature)
-    {
-        return this.verify(signature);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/MessageEncryptor.java b/bcprov/src/main/java/org/bouncycastle/pqc/crypto/MessageEncryptor.java
deleted file mode 100644
index 8d67c5c..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/MessageEncryptor.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package org.bouncycastle.pqc.crypto;
-
-
-import org.bouncycastle.crypto.CipherParameters;
-
-public interface MessageEncryptor
-{
-
-    /**
-     *
-     * @param forEncrypting true if we are encrypting a signature, false
-     * otherwise.
-     * @param param key parameters for encryption or decryption.
-     */
-    public void init(boolean forEncrypting, CipherParameters param);
-
-    /**
-     *
-     * @param message the message to be signed.
-     * @throws Exception 
-     */
-    public byte[] messageEncrypt(byte[] message) throws Exception;
-
-    /**
-     *
-     * @param cipher the cipher text of the message
-     * @throws Exception 
-     */
-    public byte[] messageDecrypt(byte[] cipher) throws Exception;
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/MessageSigner.java b/bcprov/src/main/java/org/bouncycastle/pqc/crypto/MessageSigner.java
deleted file mode 100644
index 50243f7..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/MessageSigner.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package org.bouncycastle.pqc.crypto;
-
-import org.bouncycastle.crypto.CipherParameters;
-
-public interface MessageSigner
-{
-    /**
-     * initialise the signer for signature generation or signature
-     * verification.
-     *
-     * @param forSigning true if we are generating a signature, false
-     *                   otherwise.
-     * @param param      key parameters for signature generation.
-     */
-    public void init(boolean forSigning, CipherParameters param);
-
-    /**
-     * sign the passed in message (usually the output of a hash function).
-     *
-     * @param message the message to be signed.
-     * @return the signature of the message
-     */
-    public byte[] generateSignature(byte[] message);
-
-    /**
-     * verify the message message against the signature values r and s.
-     *
-     * @param message the message that was supposed to have been signed.
-     * @param signature the signature of the message
-     */
-    public boolean verifySignature(byte[] message, byte[] signature);
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/gmss/GMSSDigestProvider.java b/bcprov/src/main/java/org/bouncycastle/pqc/crypto/gmss/GMSSDigestProvider.java
deleted file mode 100644
index 4af1a8b..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/gmss/GMSSDigestProvider.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package org.bouncycastle.pqc.crypto.gmss;
-
-import org.bouncycastle.crypto.Digest;
-
-public interface GMSSDigestProvider
-{
-    Digest get();
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/gmss/GMSSKeyGenerationParameters.java b/bcprov/src/main/java/org/bouncycastle/pqc/crypto/gmss/GMSSKeyGenerationParameters.java
deleted file mode 100644
index eace4d0..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/gmss/GMSSKeyGenerationParameters.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package org.bouncycastle.pqc.crypto.gmss;
-
-import java.security.SecureRandom;
-
-import org.bouncycastle.crypto.KeyGenerationParameters;
-
-public class GMSSKeyGenerationParameters
-    extends KeyGenerationParameters
-{
-
-    private GMSSParameters params;
-
-    public GMSSKeyGenerationParameters(
-        SecureRandom random,
-        GMSSParameters params)
-    {
-        // XXX key size?
-        super(random, 1);
-        this.params = params;
-    }
-
-    public GMSSParameters getParameters()
-    {
-        return params;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/gmss/GMSSKeyPairGenerator.java b/bcprov/src/main/java/org/bouncycastle/pqc/crypto/gmss/GMSSKeyPairGenerator.java
deleted file mode 100644
index 013441e..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/gmss/GMSSKeyPairGenerator.java
+++ /dev/null
@@ -1,476 +0,0 @@
-package org.bouncycastle.pqc.crypto.gmss;
-
-import java.security.SecureRandom;
-import java.util.Vector;
-
-import org.bouncycastle.crypto.AsymmetricCipherKeyPair;
-import org.bouncycastle.crypto.AsymmetricCipherKeyPairGenerator;
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.KeyGenerationParameters;
-import org.bouncycastle.pqc.crypto.gmss.util.GMSSRandom;
-import org.bouncycastle.pqc.crypto.gmss.util.WinternitzOTSVerify;
-import org.bouncycastle.pqc.crypto.gmss.util.WinternitzOTSignature;
-
-
-/**
- * This class implements key pair generation of the generalized Merkle signature
- * scheme (GMSS).
- *
- * @see GMSSSigner
- */
-public class GMSSKeyPairGenerator
-    implements AsymmetricCipherKeyPairGenerator
-{
-    /**
-     * The source of randomness for OTS private key generation
-     */
-    private GMSSRandom gmssRandom;
-
-    /**
-     * The hash function used for the construction of the authentication trees
-     */
-    private Digest messDigestTree;
-
-    /**
-     * An array of the seeds for the PRGN (for main tree, and all current
-     * subtrees)
-     */
-    private byte[][] currentSeeds;
-
-    /**
-     * An array of seeds for the PRGN (for all subtrees after next)
-     */
-    private byte[][] nextNextSeeds;
-
-    /**
-     * An array of the RootSignatures
-     */
-    private byte[][] currentRootSigs;
-
-    /**
-     * Class of hash function to use
-     */
-    private GMSSDigestProvider digestProvider;
-
-    /**
-     * The length of the seed for the PRNG
-     */
-    private int mdLength;
-
-    /**
-     * the number of Layers
-     */
-    private int numLayer;
-
-
-    /**
-     * Flag indicating if the class already has been initialized
-     */
-    private boolean initialized = false;
-
-    /**
-     * Instance of GMSSParameterset
-     */
-    private GMSSParameters gmssPS;
-
-    /**
-     * An array of the heights of the authentication trees of each layer
-     */
-    private int[] heightOfTrees;
-
-    /**
-     * An array of the Winternitz parameter 'w' of each layer
-     */
-    private int[] otsIndex;
-
-    /**
-     * The parameter K needed for the authentication path computation
-     */
-    private int[] K;
-
-    private GMSSKeyGenerationParameters gmssParams;
-
-    /**
-     * The GMSS OID.
-     */
-    public static final String OID = "1.3.6.1.4.1.8301.3.1.3.3";
-
-    /**
-     * The standard constructor tries to generate the GMSS algorithm identifier
-     * with the corresponding OID.
-     *
-     * @param digestProvider     provider for digest implementations.
-     */
-    public GMSSKeyPairGenerator(GMSSDigestProvider digestProvider)
-    {
-        this.digestProvider = digestProvider;
-        messDigestTree = digestProvider.get();
-
-        // set mdLength
-        this.mdLength = messDigestTree.getDigestSize();
-        // construct randomizer
-        this.gmssRandom = new GMSSRandom(messDigestTree);
-
-    }
-
-    /**
-     * Generates the GMSS key pair. The public key is an instance of
-     * JDKGMSSPublicKey, the private key is an instance of JDKGMSSPrivateKey.
-     *
-     * @return Key pair containing a JDKGMSSPublicKey and a JDKGMSSPrivateKey
-     */
-    private AsymmetricCipherKeyPair genKeyPair()
-    {
-        if (!initialized)
-        {
-            initializeDefault();
-        }
-
-        // initialize authenticationPaths and treehash instances
-        byte[][][] currentAuthPaths = new byte[numLayer][][];
-        byte[][][] nextAuthPaths = new byte[numLayer - 1][][];
-        Treehash[][] currentTreehash = new Treehash[numLayer][];
-        Treehash[][] nextTreehash = new Treehash[numLayer - 1][];
-
-        Vector[] currentStack = new Vector[numLayer];
-        Vector[] nextStack = new Vector[numLayer - 1];
-
-        Vector[][] currentRetain = new Vector[numLayer][];
-        Vector[][] nextRetain = new Vector[numLayer - 1][];
-
-        for (int i = 0; i < numLayer; i++)
-        {
-            currentAuthPaths[i] = new byte[heightOfTrees[i]][mdLength];
-            currentTreehash[i] = new Treehash[heightOfTrees[i] - K[i]];
-
-            if (i > 0)
-            {
-                nextAuthPaths[i - 1] = new byte[heightOfTrees[i]][mdLength];
-                nextTreehash[i - 1] = new Treehash[heightOfTrees[i] - K[i]];
-            }
-
-            currentStack[i] = new Vector();
-            if (i > 0)
-            {
-                nextStack[i - 1] = new Vector();
-            }
-        }
-
-        // initialize roots
-        byte[][] currentRoots = new byte[numLayer][mdLength];
-        byte[][] nextRoots = new byte[numLayer - 1][mdLength];
-        // initialize seeds
-        byte[][] seeds = new byte[numLayer][mdLength];
-        // initialize seeds[] by copying starting-seeds of first trees of each
-        // layer
-        for (int i = 0; i < numLayer; i++)
-        {
-            System.arraycopy(currentSeeds[i], 0, seeds[i], 0, mdLength);
-        }
-
-        // initialize rootSigs
-        currentRootSigs = new byte[numLayer - 1][mdLength];
-
-        // -------------------------
-        // -------------------------
-        // --- calculation of current authpaths and current rootsigs (AUTHPATHS,
-        // SIG)------
-        // from bottom up to the root
-        for (int h = numLayer - 1; h >= 0; h--)
-        {
-            GMSSRootCalc tree = new GMSSRootCalc(this.heightOfTrees[h], this.K[h], digestProvider);
-            try
-            {
-                // on lowest layer no lower root is available, so just call
-                // the method with null as first parameter
-                if (h == numLayer - 1)
-                {
-                    tree = this.generateCurrentAuthpathAndRoot(null, currentStack[h], seeds[h], h);
-                }
-                else
-                // otherwise call the method with the former computed root
-                // value
-                {
-                    tree = this.generateCurrentAuthpathAndRoot(currentRoots[h + 1], currentStack[h], seeds[h], h);
-                }
-
-            }
-            catch (Exception e1)
-            {
-                e1.printStackTrace();
-            }
-
-            // set initial values needed for the private key construction
-            for (int i = 0; i < heightOfTrees[h]; i++)
-            {
-                System.arraycopy(tree.getAuthPath()[i], 0, currentAuthPaths[h][i], 0, mdLength);
-            }
-            currentRetain[h] = tree.getRetain();
-            currentTreehash[h] = tree.getTreehash();
-            System.arraycopy(tree.getRoot(), 0, currentRoots[h], 0, mdLength);
-        }
-
-        // --- calculation of next authpaths and next roots (AUTHPATHS+, ROOTS+)
-        // ------
-        for (int h = numLayer - 2; h >= 0; h--)
-        {
-            GMSSRootCalc tree = this.generateNextAuthpathAndRoot(nextStack[h], seeds[h + 1], h + 1);
-
-            // set initial values needed for the private key construction
-            for (int i = 0; i < heightOfTrees[h + 1]; i++)
-            {
-                System.arraycopy(tree.getAuthPath()[i], 0, nextAuthPaths[h][i], 0, mdLength);
-            }
-            nextRetain[h] = tree.getRetain();
-            nextTreehash[h] = tree.getTreehash();
-            System.arraycopy(tree.getRoot(), 0, nextRoots[h], 0, mdLength);
-
-            // create seed for the Merkle tree after next (nextNextSeeds)
-            // SEEDs++
-            System.arraycopy(seeds[h + 1], 0, this.nextNextSeeds[h], 0, mdLength);
-        }
-        // ------------
-
-        // generate JDKGMSSPublicKey
-        GMSSPublicKeyParameters publicKey = new GMSSPublicKeyParameters(currentRoots[0], gmssPS);
-
-        // generate the JDKGMSSPrivateKey
-        GMSSPrivateKeyParameters privateKey = new GMSSPrivateKeyParameters(currentSeeds, nextNextSeeds, currentAuthPaths,
-            nextAuthPaths, currentTreehash, nextTreehash, currentStack, nextStack, currentRetain, nextRetain, nextRoots, currentRootSigs, gmssPS, digestProvider);
-
-        // return the KeyPair
-        return (new AsymmetricCipherKeyPair(publicKey, privateKey));
-    }
-
-    /**
-     * calculates the authpath for tree in layer h which starts with seed[h]
-     * additionally computes the rootSignature of underlaying root
-     *
-     * @param currentStack stack used for the treehash instance created by this method
-     * @param lowerRoot    stores the root of the lower tree
-     * @param seed        starting seeds
-     * @param h            actual layer
-     */
-    private GMSSRootCalc generateCurrentAuthpathAndRoot(byte[] lowerRoot, Vector currentStack, byte[] seed, int h)
-    {
-        byte[] help = new byte[mdLength];
-
-        byte[] OTSseed = new byte[mdLength];
-        OTSseed = gmssRandom.nextSeed(seed);
-
-        WinternitzOTSignature ots;
-
-        // data structure that constructs the whole tree and stores
-        // the initial values for treehash, Auth and retain
-        GMSSRootCalc treeToConstruct = new GMSSRootCalc(this.heightOfTrees[h], this.K[h], digestProvider);
-
-        treeToConstruct.initialize(currentStack);
-
-        // generate the first leaf
-        if (h == numLayer - 1)
-        {
-            ots = new WinternitzOTSignature(OTSseed, digestProvider.get(), otsIndex[h]);
-            help = ots.getPublicKey();
-        }
-        else
-        {
-            // for all layers except the lowest, generate the signature of the
-            // underlying root
-            // and reuse this signature to compute the first leaf of acual layer
-            // more efficiently (by verifiing the signature)
-            ots = new WinternitzOTSignature(OTSseed, digestProvider.get(), otsIndex[h]);
-            currentRootSigs[h] = ots.getSignature(lowerRoot);
-            WinternitzOTSVerify otsver = new WinternitzOTSVerify(digestProvider.get(), otsIndex[h]);
-            help = otsver.Verify(lowerRoot, currentRootSigs[h]);
-        }
-        // update the tree with the first leaf
-        treeToConstruct.update(help);
-
-        int seedForTreehashIndex = 3;
-        int count = 0;
-
-        // update the tree 2^(H) - 1 times, from the second to the last leaf
-        for (int i = 1; i < (1 << this.heightOfTrees[h]); i++)
-        {
-            // initialize the seeds for the leaf generation with index 3 * 2^h
-            if (i == seedForTreehashIndex && count < this.heightOfTrees[h] - this.K[h])
-            {
-                treeToConstruct.initializeTreehashSeed(seed, count);
-                seedForTreehashIndex *= 2;
-                count++;
-            }
-
-            OTSseed = gmssRandom.nextSeed(seed);
-            ots = new WinternitzOTSignature(OTSseed, digestProvider.get(), otsIndex[h]);
-            treeToConstruct.update(ots.getPublicKey());
-        }
-
-        if (treeToConstruct.wasFinished())
-        {
-            return treeToConstruct;
-        }
-        System.err.println("Baum noch nicht fertig konstruiert!!!");
-        return null;
-    }
-
-    /**
-     * calculates the authpath and root for tree in layer h which starts with
-     * seed[h]
-     *
-     * @param nextStack stack used for the treehash instance created by this method
-     * @param seed      starting seeds
-     * @param h         actual layer
-     */
-    private GMSSRootCalc generateNextAuthpathAndRoot(Vector nextStack, byte[] seed, int h)
-    {
-        byte[] OTSseed = new byte[numLayer];
-        WinternitzOTSignature ots;
-
-        // data structure that constructs the whole tree and stores
-        // the initial values for treehash, Auth and retain
-        GMSSRootCalc treeToConstruct = new GMSSRootCalc(this.heightOfTrees[h], this.K[h], this.digestProvider);
-        treeToConstruct.initialize(nextStack);
-
-        int seedForTreehashIndex = 3;
-        int count = 0;
-
-        // update the tree 2^(H) times, from the first to the last leaf
-        for (int i = 0; i < (1 << this.heightOfTrees[h]); i++)
-        {
-            // initialize the seeds for the leaf generation with index 3 * 2^h
-            if (i == seedForTreehashIndex && count < this.heightOfTrees[h] - this.K[h])
-            {
-                treeToConstruct.initializeTreehashSeed(seed, count);
-                seedForTreehashIndex *= 2;
-                count++;
-            }
-
-            OTSseed = gmssRandom.nextSeed(seed);
-            ots = new WinternitzOTSignature(OTSseed, digestProvider.get(), otsIndex[h]);
-            treeToConstruct.update(ots.getPublicKey());
-        }
-
-        if (treeToConstruct.wasFinished())
-        {
-            return treeToConstruct;
-        }
-        System.err.println("N�chster Baum noch nicht fertig konstruiert!!!");
-        return null;
-    }
-
-    /**
-     * This method initializes the GMSS KeyPairGenerator using an integer value
-     * <code>keySize</code> as input. It provides a simple use of the GMSS for
-     * testing demands.
-     * <p>
-     * A given <code>keysize</code> of less than 10 creates an amount 2^10
-     * signatures. A keySize between 10 and 20 creates 2^20 signatures. Given an
-     * integer greater than 20 the key pair generator creates 2^40 signatures.
-     *
-     * @param keySize      Assigns the parameters used for the GMSS signatures. There are
-     *                     3 choices:<br>
-     *                     1. keysize &lt;= 10: creates 2^10 signatures using the
-     *                     parameterset<br>
-     *                     P = (2, (5, 5), (3, 3), (3, 3))<br>
-     *                     2. keysize &gt; 10 and &lt;= 20: creates 2^20 signatures using the
-     *                     parameterset<br>
-     *                     P = (2, (10, 10), (5, 4), (2, 2))<br>
-     *                     3. keysize &gt; 20: creates 2^40 signatures using the
-     *                     parameterset<br>
-     *                     P = (2, (10, 10, 10, 10), (9, 9, 9, 3), (2, 2, 2, 2))
-     * @param secureRandom not used by GMSS, the SHA1PRNG of the SUN Provider is always
-     *                     used
-     */
-    public void initialize(int keySize, SecureRandom secureRandom)
-    {
-
-        KeyGenerationParameters kgp;
-        if (keySize <= 10)
-        { // create 2^10 keys
-            int[] defh = {10};
-            int[] defw = {3};
-            int[] defk = {2};
-            // XXX sec random neede?
-            kgp = new GMSSKeyGenerationParameters(secureRandom, new GMSSParameters(defh.length, defh, defw, defk));
-        }
-        else if (keySize <= 20)
-        { // create 2^20 keys
-            int[] defh = {10, 10};
-            int[] defw = {5, 4};
-            int[] defk = {2, 2};
-            kgp = new GMSSKeyGenerationParameters(secureRandom, new GMSSParameters(defh.length, defh, defw, defk));
-        }
-        else
-        { // create 2^40 keys, keygen lasts around 80 seconds
-            int[] defh = {10, 10, 10, 10};
-            int[] defw = {9, 9, 9, 3};
-            int[] defk = {2, 2, 2, 2};
-            kgp = new GMSSKeyGenerationParameters(secureRandom, new GMSSParameters(defh.length, defh, defw, defk));
-        }
-
-        // call the initializer with the chosen parameters
-        this.initialize(kgp);
-
-    }
-
-
-    /**
-     * Initalizes the key pair generator using a parameter set as input
-     */
-    public void initialize(KeyGenerationParameters param)
-    {
-
-        this.gmssParams = (GMSSKeyGenerationParameters)param;
-
-        // generate GMSSParameterset
-        this.gmssPS = new GMSSParameters(gmssParams.getParameters().getNumOfLayers(), gmssParams.getParameters().getHeightOfTrees(),
-            gmssParams.getParameters().getWinternitzParameter(), gmssParams.getParameters().getK());
-
-        this.numLayer = gmssPS.getNumOfLayers();
-        this.heightOfTrees = gmssPS.getHeightOfTrees();
-        this.otsIndex = gmssPS.getWinternitzParameter();
-        this.K = gmssPS.getK();
-
-        // seeds
-        this.currentSeeds = new byte[numLayer][mdLength];
-        this.nextNextSeeds = new byte[numLayer - 1][mdLength];
-
-        // construct SecureRandom for initial seed generation
-        SecureRandom secRan = new SecureRandom();
-
-        // generation of initial seeds
-        for (int i = 0; i < numLayer; i++)
-        {
-            secRan.nextBytes(currentSeeds[i]);
-            gmssRandom.nextSeed(currentSeeds[i]);
-        }
-
-        this.initialized = true;
-    }
-
-    /**
-     * This method is called by generateKeyPair() in case that no other
-     * initialization method has been called by the user
-     */
-    private void initializeDefault()
-    {
-        int[] defh = {10, 10, 10, 10};
-        int[] defw = {3, 3, 3, 3};
-        int[] defk = {2, 2, 2, 2};
-
-        KeyGenerationParameters kgp = new GMSSKeyGenerationParameters(new SecureRandom(), new GMSSParameters(defh.length, defh, defw, defk));
-        this.initialize(kgp);
-
-    }
-
-    public void init(KeyGenerationParameters param)
-    {
-        this.initialize(param);
-
-    }
-
-    public AsymmetricCipherKeyPair generateKeyPair()
-    {
-        return genKeyPair();
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/gmss/GMSSKeyParameters.java b/bcprov/src/main/java/org/bouncycastle/pqc/crypto/gmss/GMSSKeyParameters.java
deleted file mode 100644
index 53f6e43..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/gmss/GMSSKeyParameters.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package org.bouncycastle.pqc.crypto.gmss;
-
-import org.bouncycastle.crypto.params.AsymmetricKeyParameter;
-
-public class GMSSKeyParameters
-    extends AsymmetricKeyParameter
-{
-    private GMSSParameters params;
-
-    public GMSSKeyParameters(
-        boolean isPrivate,
-        GMSSParameters params)
-    {
-        super(isPrivate);
-        this.params = params;
-    }
-
-    public GMSSParameters getParameters()
-    {
-        return params;
-    }
-}
\ No newline at end of file
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/gmss/GMSSLeaf.java b/bcprov/src/main/java/org/bouncycastle/pqc/crypto/gmss/GMSSLeaf.java
deleted file mode 100644
index 6823ce3..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/gmss/GMSSLeaf.java
+++ /dev/null
@@ -1,376 +0,0 @@
-package org.bouncycastle.pqc.crypto.gmss;
-
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.pqc.crypto.gmss.util.GMSSRandom;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.encoders.Hex;
-
-
-/**
- * This class implements the distributed computation of the public key of the
- * Winternitz one-time signature scheme (OTSS). The class is used by the GMSS
- * classes for calculation of upcoming leafs.
- */
-public class GMSSLeaf
-{
-
-    /**
-     * The hash function used by the OTS and the PRNG
-     */
-    private Digest messDigestOTS;
-
-    /**
-     * The length of the message digest and private key
-     */
-    private int mdsize, keysize;
-
-    /**
-     * The source of randomness for OTS private key generation
-     */
-    private GMSSRandom gmssRandom;
-
-    /**
-     * Byte array for distributed computation of the upcoming leaf
-     */
-    private byte[] leaf;
-
-    /**
-     * Byte array for storing the concatenated hashes of private key parts
-     */
-    private byte[] concHashs;
-
-    /**
-     * indices for distributed computation
-     */
-    private int i, j;
-
-    /**
-     * storing 2^w
-     */
-    private int two_power_w;
-
-    /**
-     * Winternitz parameter w
-     */
-    private int w;
-
-    /**
-     * the amount of distributed computation steps when updateLeaf is called
-     */
-    private int steps;
-
-    /**
-     * the internal seed
-     */
-    private byte[] seed;
-
-    /**
-     * the OTS privateKey parts
-     */
-    byte[] privateKeyOTS;
-
-    /**
-     * This constructor regenerates a prior GMSSLeaf object
-     *
-     * @param digest   an array of strings, containing the name of the used hash
-     *                 function and PRNG and the name of the corresponding
-     *                 provider
-     * @param otsIndex status bytes
-     * @param numLeafs status ints
-     */
-    public GMSSLeaf(Digest digest, byte[][] otsIndex, int[] numLeafs)
-    {
-        this.i = numLeafs[0];
-        this.j = numLeafs[1];
-        this.steps = numLeafs[2];
-        this.w = numLeafs[3];
-
-        messDigestOTS = digest;
-
-        gmssRandom = new GMSSRandom(messDigestOTS);
-
-        // calulate keysize for private key and the help array
-        mdsize = messDigestOTS.getDigestSize();
-        int mdsizeBit = mdsize << 3;
-        int messagesize = (int)Math.ceil((double)(mdsizeBit) / (double)w);
-        int checksumsize = getLog((messagesize << w) + 1);
-        this.keysize = messagesize
-            + (int)Math.ceil((double)checksumsize / (double)w);
-        this.two_power_w = 1 << w;
-
-        // calculate steps
-        // ((2^w)-1)*keysize + keysize + 1 / (2^h -1)
-
-        // initialize arrays
-        this.privateKeyOTS = otsIndex[0];
-        this.seed = otsIndex[1];
-        this.concHashs = otsIndex[2];
-        this.leaf = otsIndex[3];
-    }
-
-    /**
-     * The constructor precomputes some needed variables for distributed leaf
-     * calculation
-     *
-     * @param digest     an array of strings, containing the digest of the used hash
-     *                 function and PRNG and the digest of the corresponding
-     *                 provider
-     * @param w        the winterniz parameter of that tree the leaf is computed
-     *                 for
-     * @param numLeafs the number of leafs of the tree from where the distributed
-     *                 computation is called
-     */
-    GMSSLeaf(Digest digest, int w, int numLeafs)
-    {
-        this.w = w;
-
-        messDigestOTS = digest;
-
-        gmssRandom = new GMSSRandom(messDigestOTS);
-
-        // calulate keysize for private key and the help array
-        mdsize = messDigestOTS.getDigestSize();
-        int mdsizeBit = mdsize << 3;
-        int messagesize = (int)Math.ceil((double)(mdsizeBit) / (double)w);
-        int checksumsize = getLog((messagesize << w) + 1);
-        this.keysize = messagesize
-            + (int)Math.ceil((double)checksumsize / (double)w);
-        this.two_power_w = 1 << w;
-
-        // calculate steps
-        // ((2^w)-1)*keysize + keysize + 1 / (2^h -1)
-        this.steps = (int)Math
-            .ceil((double)(((1 << w) - 1) * keysize + 1 + keysize)
-                / (double)(numLeafs));
-
-        // initialize arrays
-        this.seed = new byte[mdsize];
-        this.leaf = new byte[mdsize];
-        this.privateKeyOTS = new byte[mdsize];
-        this.concHashs = new byte[mdsize * keysize];
-    }
-
-    public GMSSLeaf(Digest digest, int w, int numLeafs, byte[] seed0)
-    {
-        this.w = w;
-
-        messDigestOTS = digest;
-
-        gmssRandom = new GMSSRandom(messDigestOTS);
-
-        // calulate keysize for private key and the help array
-        mdsize = messDigestOTS.getDigestSize();
-        int mdsizeBit = mdsize << 3;
-        int messagesize = (int)Math.ceil((double)(mdsizeBit) / (double)w);
-        int checksumsize = getLog((messagesize << w) + 1);
-        this.keysize = messagesize
-            + (int)Math.ceil((double)checksumsize / (double)w);
-        this.two_power_w = 1 << w;
-
-        // calculate steps
-        // ((2^w)-1)*keysize + keysize + 1 / (2^h -1)
-        this.steps = (int)Math
-            .ceil((double)(((1 << w) - 1) * keysize + 1 + keysize)
-                / (double)(numLeafs));
-
-        // initialize arrays
-        this.seed = new byte[mdsize];
-        this.leaf = new byte[mdsize];
-        this.privateKeyOTS = new byte[mdsize];
-        this.concHashs = new byte[mdsize * keysize];
-
-        initLeafCalc(seed0);
-    }
-
-    private GMSSLeaf(GMSSLeaf original)
-    {
-        this.messDigestOTS = original.messDigestOTS;
-        this.mdsize = original.mdsize;
-        this.keysize = original.keysize;
-        this.gmssRandom = original.gmssRandom;
-        this.leaf = Arrays.clone(original.leaf);
-        this.concHashs = Arrays.clone(original.concHashs);
-        this.i = original.i;
-        this.j = original.j;
-        this.two_power_w = original.two_power_w;
-        this.w = original.w;
-        this.steps = original.steps;
-        this.seed = Arrays.clone(original.seed);
-        this.privateKeyOTS = Arrays.clone(original.privateKeyOTS);
-    }
-
-    /**
-     * initialize the distributed leaf calculation reset i,j and compute OTSseed
-     * with seed0
-     *
-     * @param seed0 the starting seed
-     */
-    // TODO: this really looks like it should be either always called from a constructor or nextLeaf.
-    void initLeafCalc(byte[] seed0)
-    {
-        this.i = 0;
-        this.j = 0;
-        byte[] dummy = new byte[mdsize];
-        System.arraycopy(seed0, 0, dummy, 0, seed.length);
-        this.seed = gmssRandom.nextSeed(dummy);
-    }
-
-    GMSSLeaf nextLeaf()
-    {
-        GMSSLeaf nextLeaf = new GMSSLeaf(this);
-
-        nextLeaf.updateLeafCalc();
-
-        return nextLeaf;
-    }
-
-    /**
-     * Processes <code>steps</code> steps of distributed leaf calculation
-     *
-     * @return true if leaf is completed, else false
-     */
-    private void updateLeafCalc()
-    {
-         byte[] buf = new byte[messDigestOTS.getDigestSize()];
-
-        // steps times do
-        // TODO: this really needs to be looked at, the 10000 has been added as
-        // prior to this the leaf value always ended up as zeros.
-        for (int s = 0; s < steps + 10000; s++)
-        {
-            if (i == keysize && j == two_power_w - 1)
-            { // [3] at last hash the
-                // concatenation
-                messDigestOTS.update(concHashs, 0, concHashs.length);
-                leaf = new byte[messDigestOTS.getDigestSize()];
-                messDigestOTS.doFinal(leaf, 0);
-                return;
-            }
-            else if (i == 0 || j == two_power_w - 1)
-            { // [1] at the
-                // beginning and
-                // when [2] is
-                // finished: get the
-                // next private key
-                // part
-                i++;
-                j = 0;
-                // get next privKey part
-                this.privateKeyOTS = gmssRandom.nextSeed(seed);
-            }
-            else
-            { // [2] hash the privKey part
-                messDigestOTS.update(privateKeyOTS, 0, privateKeyOTS.length);
-                privateKeyOTS = buf;
-                messDigestOTS.doFinal(privateKeyOTS, 0);
-                j++;
-                if (j == two_power_w - 1)
-                { // after w hashes add to the
-                    // concatenated array
-                    System.arraycopy(privateKeyOTS, 0, concHashs, mdsize
-                        * (i - 1), mdsize);
-                }
-            }
-        }
-
-       throw new IllegalStateException("unable to updateLeaf in steps: " + steps + " " + i + " " + j);
-    }
-
-    /**
-     * Returns the leaf value.
-     *
-     * @return the leaf value
-     */
-    public byte[] getLeaf()
-    {
-        return Arrays.clone(leaf);
-    }
-
-    /**
-     * This method returns the least integer that is greater or equal to the
-     * logarithm to the base 2 of an integer <code>intValue</code>.
-     *
-     * @param intValue an integer
-     * @return The least integer greater or equal to the logarithm to the base 2
-     *         of <code>intValue</code>
-     */
-    private int getLog(int intValue)
-    {
-        int log = 1;
-        int i = 2;
-        while (i < intValue)
-        {
-            i <<= 1;
-            log++;
-        }
-        return log;
-    }
-
-    /**
-     * Returns the status byte array used by the GMSSPrivateKeyASN.1 class
-     *
-     * @return The status bytes
-     */
-    public byte[][] getStatByte()
-    {
-
-        byte[][] statByte = new byte[4][];
-        statByte[0] = new byte[mdsize];
-        statByte[1] = new byte[mdsize];
-        statByte[2] = new byte[mdsize * keysize];
-        statByte[3] = new byte[mdsize];
-        statByte[0] = privateKeyOTS;
-        statByte[1] = seed;
-        statByte[2] = concHashs;
-        statByte[3] = leaf;
-
-        return statByte;
-    }
-
-    /**
-     * Returns the status int array used by the GMSSPrivateKeyASN.1 class
-     *
-     * @return The status ints
-     */
-    public int[] getStatInt()
-    {
-
-        int[] statInt = new int[4];
-        statInt[0] = i;
-        statInt[1] = j;
-        statInt[2] = steps;
-        statInt[3] = w;
-        return statInt;
-    }
-
-    /**
-     * Returns a String representation of the main part of this element
-     *
-     * @return a String representation of the main part of this element
-     */
-    public String toString()
-    {
-        String out = "";
-
-        for (int i = 0; i < 4; i++)
-        {
-            out = out + this.getStatInt()[i] + " ";
-        }
-        out = out + " " + this.mdsize + " " + this.keysize + " "
-            + this.two_power_w + " ";
-
-        byte[][] temp = this.getStatByte();
-        for (int i = 0; i < 4; i++)
-        {
-            if (temp[i] != null)
-            {
-                out = out + new String(Hex.encode(temp[i])) + " ";
-            }
-            else
-            {
-                out = out + "null ";
-            }
-        }
-        return out;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/gmss/GMSSParameters.java b/bcprov/src/main/java/org/bouncycastle/pqc/crypto/gmss/GMSSParameters.java
deleted file mode 100644
index aa89f76..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/gmss/GMSSParameters.java
+++ /dev/null
@@ -1,155 +0,0 @@
-package org.bouncycastle.pqc.crypto.gmss;
-
-import org.bouncycastle.util.Arrays;
-
-/**
- * This class provides a specification for the GMSS parameters that are used by
- * the GMSSKeyPairGenerator and GMSSSignature classes.
- *
- * @see org.bouncycastle.pqc.crypto.gmss.GMSSKeyPairGenerator
- */
-public class GMSSParameters
-{
-    /**
-     * The number of authentication tree layers.
-     */
-    private int numOfLayers;
-
-    /**
-     * The height of the authentication trees of each layer.
-     */
-    private int[] heightOfTrees;
-
-    /**
-     * The Winternitz Parameter 'w' of each layer.
-     */
-    private int[] winternitzParameter;
-
-    /**
-     * The parameter K needed for the authentication path computation
-     */
-    private int[] K;
-
-    /**
-     * The constructor for the parameters of the GMSSKeyPairGenerator.
-     *
-     * @param layers              the number of authentication tree layers
-     * @param heightOfTrees       the height of the authentication trees
-     * @param winternitzParameter the Winternitz Parameter 'w' of each layer
-     * @param K                   parameter for authpath computation
-     */
-    public GMSSParameters(int layers, int[] heightOfTrees, int[] winternitzParameter, int[] K)
-        throws IllegalArgumentException
-    {
-        init(layers, heightOfTrees, winternitzParameter, K);
-    }
-
-    private void init(int layers, int[] heightOfTrees,
-                      int[] winternitzParameter, int[] K)
-        throws IllegalArgumentException
-    {
-        boolean valid = true;
-        String errMsg = "";
-        this.numOfLayers = layers;
-        if ((numOfLayers != winternitzParameter.length)
-            || (numOfLayers != heightOfTrees.length)
-            || (numOfLayers != K.length))
-        {
-            valid = false;
-            errMsg = "Unexpected parameterset format";
-        }
-        for (int i = 0; i < numOfLayers; i++)
-        {
-            if ((K[i] < 2) || ((heightOfTrees[i] - K[i]) % 2 != 0))
-            {
-                valid = false;
-                errMsg = "Wrong parameter K (K >= 2 and H-K even required)!";
-            }
-
-            if ((heightOfTrees[i] < 4) || (winternitzParameter[i] < 2))
-            {
-                valid = false;
-                errMsg = "Wrong parameter H or w (H > 3 and w > 1 required)!";
-            }
-        }
-
-        if (valid)
-        {
-            this.heightOfTrees = Arrays.clone(heightOfTrees);
-            this.winternitzParameter = Arrays.clone(winternitzParameter);
-            this.K = Arrays.clone(K);
-        }
-        else
-        {
-            throw new IllegalArgumentException(errMsg);
-        }
-    }
-
-    public GMSSParameters(int keySize)
-        throws IllegalArgumentException
-    {
-        if (keySize <= 10)
-        { // create 2^10 keys
-            int[] defh = {10};
-            int[] defw = {3};
-            int[] defk = {2};
-            this.init(defh.length, defh, defw, defk);
-        }
-        else if (keySize <= 20)
-        { // create 2^20 keys
-            int[] defh = {10, 10};
-            int[] defw = {5, 4};
-            int[] defk = {2, 2};
-            this.init(defh.length, defh, defw, defk);
-        }
-        else
-        { // create 2^40 keys, keygen lasts around 80 seconds
-            int[] defh = {10, 10, 10, 10};
-            int[] defw = {9, 9, 9, 3};
-            int[] defk = {2, 2, 2, 2};
-            this.init(defh.length, defh, defw, defk);
-        }
-    }
-
-    /**
-     * Returns the number of levels of the authentication trees.
-     *
-     * @return The number of levels of the authentication trees.
-     */
-    public int getNumOfLayers()
-    {
-        return numOfLayers;
-    }
-
-    /**
-     * Returns the array of height (for each layer) of the authentication trees
-     *
-     * @return The array of height (for each layer) of the authentication trees
-     */
-    public int[] getHeightOfTrees()
-    {
-        return Arrays.clone(heightOfTrees);
-    }
-
-    /**
-     * Returns the array of WinternitzParameter (for each layer) of the
-     * authentication trees
-     *
-     * @return The array of WinternitzParameter (for each layer) of the
-     *         authentication trees
-     */
-    public int[] getWinternitzParameter()
-    {
-        return Arrays.clone(winternitzParameter);
-    }
-
-    /**
-     * Returns the parameter K needed for authentication path computation
-     *
-     * @return The parameter K needed for authentication path computation
-     */
-    public int[] getK()
-    {
-        return Arrays.clone(K);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/gmss/GMSSPrivateKeyParameters.java b/bcprov/src/main/java/org/bouncycastle/pqc/crypto/gmss/GMSSPrivateKeyParameters.java
deleted file mode 100644
index 83cf797..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/gmss/GMSSPrivateKeyParameters.java
+++ /dev/null
@@ -1,1041 +0,0 @@
-package org.bouncycastle.pqc.crypto.gmss;
-
-import java.util.Vector;
-
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.pqc.crypto.gmss.util.GMSSRandom;
-import org.bouncycastle.pqc.crypto.gmss.util.WinternitzOTSignature;
-import org.bouncycastle.util.Arrays;
-
-
-/**
- * This class provides a specification for a GMSS private key.
- */
-public class GMSSPrivateKeyParameters
-    extends GMSSKeyParameters
-{
-    private int[] index;
-
-    private byte[][] currentSeeds;
-    private byte[][] nextNextSeeds;
-
-    private byte[][][] currentAuthPaths;
-    private byte[][][] nextAuthPaths;
-
-    private Treehash[][] currentTreehash;
-    private Treehash[][] nextTreehash;
-
-    private Vector[] currentStack;
-    private Vector[] nextStack;
-
-    private Vector[][] currentRetain;
-    private Vector[][] nextRetain;
-
-    private byte[][][] keep;
-
-    private GMSSLeaf[] nextNextLeaf;
-    private GMSSLeaf[] upperLeaf;
-    private GMSSLeaf[] upperTreehashLeaf;
-
-    private int[] minTreehash;
-
-    private GMSSParameters gmssPS;
-
-    private byte[][] nextRoot;
-    private GMSSRootCalc[] nextNextRoot;
-
-    private byte[][] currentRootSig;
-    private GMSSRootSig[] nextRootSig;
-
-    private GMSSDigestProvider digestProvider;
-
-    private boolean used = false;
-
-    /**
-     * An array of the heights of the authentication trees of each layer
-     */
-    private int[] heightOfTrees;
-
-    /**
-     * An array of the Winternitz parameter 'w' of each layer
-     */
-    private int[] otsIndex;
-
-    /**
-     * The parameter K needed for the authentication path computation
-     */
-    private int[] K;
-
-    /**
-     * the number of Layers
-     */
-    private int numLayer;
-
-    /**
-     * The hash function used to construct the authentication trees
-     */
-    private Digest messDigestTrees;
-
-    /**
-     * The message digest length
-     */
-    private int mdLength;
-
-    /**
-     * The PRNG used for private key generation
-     */
-    private GMSSRandom gmssRandom;
-
-
-    /**
-     * The number of leafs of one tree of each layer
-     */
-    private int[] numLeafs;
-
-
-    /**
-     * Generates a new GMSS private key
-     *
-     * @param currentSeed      seed for the generation of private OTS keys for the
-     *                         current subtrees
-     * @param nextNextSeed     seed for the generation of private OTS keys for the next
-     *                         subtrees
-     * @param currentAuthPath  array of current authentication paths
-     * @param nextAuthPath     array of next authentication paths
-     * @param currentTreehash  array of current treehash instances
-     * @param nextTreehash     array of next treehash instances
-     * @param currentStack     array of current shared stacks
-     * @param nextStack        array of next shared stacks
-     * @param currentRetain    array of current retain stacks
-     * @param nextRetain       array of next retain stacks
-     * @param nextRoot         the roots of the next subtree
-     * @param currentRootSig   array of signatures of the roots of the current subtrees
-     * @param gmssParameterset the GMSS Parameterset
-     * @see org.bouncycastle.pqc.crypto.gmss.GMSSKeyPairGenerator
-     */
-
-    public GMSSPrivateKeyParameters(byte[][] currentSeed, byte[][] nextNextSeed,
-                                    byte[][][] currentAuthPath, byte[][][] nextAuthPath,
-                                    Treehash[][] currentTreehash, Treehash[][] nextTreehash,
-                                    Vector[] currentStack, Vector[] nextStack,
-                                    Vector[][] currentRetain, Vector[][] nextRetain, byte[][] nextRoot,
-                                    byte[][] currentRootSig, GMSSParameters gmssParameterset,
-                                    GMSSDigestProvider digestProvider)
-    {
-        this(null, currentSeed, nextNextSeed, currentAuthPath, nextAuthPath,
-            null, currentTreehash, nextTreehash, currentStack, nextStack,
-            currentRetain, nextRetain, null, null, null, null, nextRoot,
-            null, currentRootSig, null, gmssParameterset, digestProvider);
-    }
-
-    /**
-     * /**
-     *
-     * @param index             tree indices
-     * @param keep              keep array for the authPath algorithm
-     * @param currentTreehash   treehash for authPath algorithm of current tree
-     * @param nextTreehash      treehash for authPath algorithm of next tree (TREE+)
-     * @param currentStack      shared stack for authPath algorithm of current tree
-     * @param nextStack         shared stack for authPath algorithm of next tree (TREE+)
-     * @param currentRetain     retain stack for authPath algorithm of current tree
-     * @param nextRetain        retain stack for authPath algorithm of next tree (TREE+)
-     * @param nextNextLeaf      array of upcoming leafs of the tree after next (LEAF++) of
-     *                          each layer
-     * @param upperLeaf         needed for precomputation of upper nodes
-     * @param upperTreehashLeaf needed for precomputation of upper treehash nodes
-     * @param minTreehash       index of next treehash instance to receive an update
-     * @param nextRoot          the roots of the next trees (ROOT+)
-     * @param nextNextRoot      the roots of the tree after next (ROOT++)
-     * @param currentRootSig    array of signatures of the roots of the current subtrees
-     *                          (SIG)
-     * @param nextRootSig       array of signatures of the roots of the next subtree
-     *                          (SIG+)
-     * @param gmssParameterset  the GMSS Parameterset
-     */
-    public GMSSPrivateKeyParameters(int[] index, byte[][] currentSeeds,
-                                    byte[][] nextNextSeeds, byte[][][] currentAuthPaths,
-                                    byte[][][] nextAuthPaths, byte[][][] keep,
-                                    Treehash[][] currentTreehash, Treehash[][] nextTreehash,
-                                    Vector[] currentStack, Vector[] nextStack,
-                                    Vector[][] currentRetain, Vector[][] nextRetain,
-                                    GMSSLeaf[] nextNextLeaf, GMSSLeaf[] upperLeaf,
-                                    GMSSLeaf[] upperTreehashLeaf, int[] minTreehash, byte[][] nextRoot,
-                                    GMSSRootCalc[] nextNextRoot, byte[][] currentRootSig,
-                                    GMSSRootSig[] nextRootSig, GMSSParameters gmssParameterset,
-                                    GMSSDigestProvider digestProvider)
-    {
-
-        super(true, gmssParameterset);
-
-        // construct message digest
-
-        this.messDigestTrees = digestProvider.get();
-        this.mdLength = messDigestTrees.getDigestSize();
-
-
-        // Parameter
-        this.gmssPS = gmssParameterset;
-        this.otsIndex = gmssParameterset.getWinternitzParameter();
-        this.K = gmssParameterset.getK();
-        this.heightOfTrees = gmssParameterset.getHeightOfTrees();
-        // initialize numLayer
-        this.numLayer = gmssPS.getNumOfLayers();
-
-        // initialize index if null
-        if (index == null)
-        {
-            this.index = new int[numLayer];
-            for (int i = 0; i < numLayer; i++)
-            {
-                this.index[i] = 0;
-            }
-        }
-        else
-        {
-            this.index = index;
-        }
-
-        this.currentSeeds = currentSeeds;
-        this.nextNextSeeds = nextNextSeeds;
-
-        this.currentAuthPaths = currentAuthPaths;
-        this.nextAuthPaths = nextAuthPaths;
-
-        // initialize keep if null
-        if (keep == null)
-        {
-            this.keep = new byte[numLayer][][];
-            for (int i = 0; i < numLayer; i++)
-            {
-                this.keep[i] = new byte[(int)Math.floor(heightOfTrees[i] / 2)][mdLength];
-            }
-        }
-        else
-        {
-            this.keep = keep;
-        }
-
-        // initialize stack if null
-        if (currentStack == null)
-        {
-            this.currentStack = new Vector[numLayer];
-            for (int i = 0; i < numLayer; i++)
-            {
-                this.currentStack[i] = new Vector();
-            }
-        }
-        else
-        {
-            this.currentStack = currentStack;
-        }
-
-        // initialize nextStack if null
-        if (nextStack == null)
-        {
-            this.nextStack = new Vector[numLayer - 1];
-            for (int i = 0; i < numLayer - 1; i++)
-            {
-                this.nextStack[i] = new Vector();
-            }
-        }
-        else
-        {
-            this.nextStack = nextStack;
-        }
-
-        this.currentTreehash = currentTreehash;
-        this.nextTreehash = nextTreehash;
-
-        this.currentRetain = currentRetain;
-        this.nextRetain = nextRetain;
-
-        this.nextRoot = nextRoot;
-
-        this.digestProvider = digestProvider;
-
-        if (nextNextRoot == null)
-        {
-            this.nextNextRoot = new GMSSRootCalc[numLayer - 1];
-            for (int i = 0; i < numLayer - 1; i++)
-            {
-                this.nextNextRoot[i] = new GMSSRootCalc(
-                    this.heightOfTrees[i + 1], this.K[i + 1], this.digestProvider);
-            }
-        }
-        else
-        {
-            this.nextNextRoot = nextNextRoot;
-        }
-        this.currentRootSig = currentRootSig;
-
-        // calculate numLeafs
-        numLeafs = new int[numLayer];
-        for (int i = 0; i < numLayer; i++)
-        {
-            numLeafs[i] = 1 << heightOfTrees[i];
-        }
-        // construct PRNG
-        this.gmssRandom = new GMSSRandom(messDigestTrees);
-
-        if (numLayer > 1)
-        {
-            // construct the nextNextLeaf (LEAFs++) array for upcoming leafs in
-            // tree after next (TREE++)
-            if (nextNextLeaf == null)
-            {
-                this.nextNextLeaf = new GMSSLeaf[numLayer - 2];
-                for (int i = 0; i < numLayer - 2; i++)
-                {
-                    this.nextNextLeaf[i] = new GMSSLeaf(digestProvider.get(), otsIndex[i + 1], numLeafs[i + 2], this.nextNextSeeds[i]);
-                }
-            }
-            else
-            {
-                this.nextNextLeaf = nextNextLeaf;
-            }
-        }
-        else
-        {
-            this.nextNextLeaf = new GMSSLeaf[0];
-        }
-
-        // construct the upperLeaf array for upcoming leafs in tree over the
-        // actual
-        if (upperLeaf == null)
-        {
-            this.upperLeaf = new GMSSLeaf[numLayer - 1];
-            for (int i = 0; i < numLayer - 1; i++)
-            {
-                this.upperLeaf[i] = new GMSSLeaf(digestProvider.get(), otsIndex[i],
-                    numLeafs[i + 1], this.currentSeeds[i]);
-            }
-        }
-        else
-        {
-            this.upperLeaf = upperLeaf;
-        }
-
-        // construct the leafs for upcoming leafs in treehashs in tree over the
-        // actual
-        if (upperTreehashLeaf == null)
-        {
-            this.upperTreehashLeaf = new GMSSLeaf[numLayer - 1];
-            for (int i = 0; i < numLayer - 1; i++)
-            {
-                this.upperTreehashLeaf[i] = new GMSSLeaf(digestProvider.get(), otsIndex[i], numLeafs[i + 1]);
-            }
-        }
-        else
-        {
-            this.upperTreehashLeaf = upperTreehashLeaf;
-        }
-
-        if (minTreehash == null)
-        {
-            this.minTreehash = new int[numLayer - 1];
-            for (int i = 0; i < numLayer - 1; i++)
-            {
-                this.minTreehash[i] = -1;
-            }
-        }
-        else
-        {
-            this.minTreehash = minTreehash;
-        }
-
-        // construct the nextRootSig (RootSig++)
-        byte[] dummy = new byte[mdLength];
-        byte[] OTSseed = new byte[mdLength];
-        if (nextRootSig == null)
-        {
-            this.nextRootSig = new GMSSRootSig[numLayer - 1];
-            for (int i = 0; i < numLayer - 1; i++)
-            {
-                System.arraycopy(currentSeeds[i], 0, dummy, 0, mdLength);
-                gmssRandom.nextSeed(dummy);
-                OTSseed = gmssRandom.nextSeed(dummy);
-                this.nextRootSig[i] = new GMSSRootSig(digestProvider.get(), otsIndex[i],
-                    heightOfTrees[i + 1]);
-                this.nextRootSig[i].initSign(OTSseed, nextRoot[i]);
-            }
-        }
-        else
-        {
-            this.nextRootSig = nextRootSig;
-        }
-    }
-
-    // we assume this only gets called from nextKey so used is never copied.
-    private GMSSPrivateKeyParameters(GMSSPrivateKeyParameters original)
-    {
-        super(true, original.getParameters());
-
-        this.index = Arrays.clone(original.index);
-        this.currentSeeds = Arrays.clone(original.currentSeeds);
-        this.nextNextSeeds = Arrays.clone(original.nextNextSeeds);
-        this.currentAuthPaths = Arrays.clone(original.currentAuthPaths);
-        this.nextAuthPaths = Arrays.clone(original.nextAuthPaths);
-        this.currentTreehash = original.currentTreehash;
-        this.nextTreehash = original.nextTreehash;
-        this.currentStack = original.currentStack;
-        this.nextStack = original.nextStack;
-        this.currentRetain = original.currentRetain;
-        this.nextRetain = original.nextRetain;
-        this.keep = Arrays.clone(original.keep);
-        this.nextNextLeaf = original.nextNextLeaf;
-        this.upperLeaf = original.upperLeaf;
-        this.upperTreehashLeaf = original.upperTreehashLeaf;
-        this.minTreehash = original.minTreehash;
-        this.gmssPS = original.gmssPS;
-        this.nextRoot = Arrays.clone(original.nextRoot);
-        this.nextNextRoot = original.nextNextRoot;
-        this.currentRootSig = original.currentRootSig;
-        this.nextRootSig = original.nextRootSig;
-        this.digestProvider = original.digestProvider;
-        this.heightOfTrees = original.heightOfTrees;
-        this.otsIndex = original.otsIndex;
-        this.K = original.K;
-        this.numLayer = original.numLayer;
-        this.messDigestTrees = original.messDigestTrees;
-        this.mdLength = original.mdLength;
-        this.gmssRandom = original.gmssRandom;
-        this.numLeafs = original.numLeafs;
-    }
-
-    public boolean isUsed()
-    {
-        return this.used;
-    }
-
-    public void markUsed()
-    {
-        this.used = true;
-    }
-
-    public GMSSPrivateKeyParameters nextKey()
-    {
-        GMSSPrivateKeyParameters nKey = new GMSSPrivateKeyParameters(this);
-
-        nKey.nextKey(gmssPS.getNumOfLayers() - 1);
-
-        return nKey;
-    }
-
-    /**
-     * This method updates the GMSS private key for the next signature
-     *
-     * @param layer the layer where the next key is processed
-     */
-    private void nextKey(int layer)
-    {
-        // only for lowest layer ( other layers indices are raised in nextTree()
-        // method )
-        if (layer == numLayer - 1)
-        {
-            index[layer]++;
-        } // else System.out.println(" --- nextKey on layer " + layer + "
-        // index is now : " + index[layer]);
-
-        // if tree of this layer is depleted
-        if (index[layer] == numLeafs[layer])
-        {
-            if (numLayer != 1)
-            {
-                nextTree(layer);
-                index[layer] = 0;
-            }
-        }
-        else
-        {
-            updateKey(layer);
-        }
-    }
-
-    /**
-     * Switch to next subtree if the current one is depleted
-     *
-     * @param layer the layer where the next tree is processed
-     */
-    private void nextTree(int layer)
-    {
-        // System.out.println("NextTree method called on layer " + layer);
-        // dont create next tree for the top layer
-        if (layer > 0)
-        {
-            // raise index for upper layer
-            index[layer - 1]++;
-
-            // test if it is already the last tree
-            boolean lastTree = true;
-            int z = layer;
-            do
-            {
-                z--;
-                if (index[z] < numLeafs[z])
-                {
-                    lastTree = false;
-                }
-            }
-            while (lastTree && (z > 0));
-
-            // only construct next subtree if last one is not already in use
-            if (!lastTree)
-            {
-                gmssRandom.nextSeed(currentSeeds[layer]);
-
-                // last step of distributed signature calculation
-                nextRootSig[layer - 1].updateSign();
-
-                // last step of distributed leaf calculation for nextNextLeaf
-                if (layer > 1)
-                {
-                    nextNextLeaf[layer - 1 - 1] = nextNextLeaf[layer - 1 - 1].nextLeaf();
-                }
-
-                // last step of distributed leaf calculation for upper leaf
-                upperLeaf[layer - 1] = upperLeaf[layer - 1].nextLeaf();
-
-                // last step of distributed leaf calculation for all treehashs
-
-                if (minTreehash[layer - 1] >= 0)
-                {
-                    upperTreehashLeaf[layer - 1] = upperTreehashLeaf[layer - 1].nextLeaf();
-                    byte[] leaf = this.upperTreehashLeaf[layer - 1].getLeaf();
-                    // if update is required use the precomputed leaf to update
-                    // treehash
-                    try
-                    {
-                        currentTreehash[layer - 1][minTreehash[layer - 1]]
-                            .update(this.gmssRandom, leaf);
-                        // System.out.println("UUUpdated TH " +
-                        // minTreehash[layer - 1]);
-                        if (currentTreehash[layer - 1][minTreehash[layer - 1]]
-                            .wasFinished())
-                        {
-                            // System.out.println("FFFinished TH " +
-                            // minTreehash[layer - 1]);
-                        }
-                    }
-                    catch (Exception e)
-                    {
-                        System.out.println(e);
-                    }
-                }
-
-                // last step of nextNextAuthRoot calculation
-                this.updateNextNextAuthRoot(layer);
-
-                // ******************************************************** /
-
-                // NOW: advance to next tree on layer 'layer'
-
-                // NextRootSig --> currentRootSigs
-                this.currentRootSig[layer - 1] = nextRootSig[layer - 1]
-                    .getSig();
-
-                // -----------------------
-
-                // nextTreehash --> currentTreehash
-                // nextNextTreehash --> nextTreehash
-                for (int i = 0; i < heightOfTrees[layer] - K[layer]; i++)
-                {
-                    this.currentTreehash[layer][i] = this.nextTreehash[layer - 1][i];
-                    this.nextTreehash[layer - 1][i] = this.nextNextRoot[layer - 1]
-                        .getTreehash()[i];
-                }
-
-                // NextAuthPath --> currentAuthPath
-                // nextNextAuthPath --> nextAuthPath
-                for (int i = 0; i < heightOfTrees[layer]; i++)
-                {
-                    System.arraycopy(nextAuthPaths[layer - 1][i], 0,
-                        currentAuthPaths[layer][i], 0, mdLength);
-                    System.arraycopy(nextNextRoot[layer - 1].getAuthPath()[i],
-                        0, nextAuthPaths[layer - 1][i], 0, mdLength);
-                }
-
-                // nextRetain --> currentRetain
-                // nextNextRetain --> nextRetain
-                for (int i = 0; i < K[layer] - 1; i++)
-                {
-                    this.currentRetain[layer][i] = this.nextRetain[layer - 1][i];
-                    this.nextRetain[layer - 1][i] = this.nextNextRoot[layer - 1]
-                        .getRetain()[i];
-                }
-
-                // nextStack --> currentStack
-                this.currentStack[layer] = this.nextStack[layer - 1];
-                // nextNextStack --> nextStack
-                this.nextStack[layer - 1] = this.nextNextRoot[layer - 1]
-                    .getStack();
-
-                // nextNextRoot --> nextRoot
-                this.nextRoot[layer - 1] = this.nextNextRoot[layer - 1]
-                    .getRoot();
-                // -----------------------
-
-                // -----------------
-                byte[] OTSseed = new byte[mdLength];
-                byte[] dummy = new byte[mdLength];
-                // gmssRandom.setSeed(currentSeeds[layer]);
-                System
-                    .arraycopy(currentSeeds[layer - 1], 0, dummy, 0,
-                        mdLength);
-                OTSseed = gmssRandom.nextSeed(dummy); // only need OTSSeed
-                OTSseed = gmssRandom.nextSeed(dummy);
-                OTSseed = gmssRandom.nextSeed(dummy);
-                // nextWinSig[layer-1]=new
-                // GMSSWinSig(OTSseed,algNames,otsIndex[layer-1],heightOfTrees[layer],nextRoot[layer-1]);
-                nextRootSig[layer - 1].initSign(OTSseed, nextRoot[layer - 1]);
-
-                // nextKey for upper layer
-                nextKey(layer - 1);
-            }
-        }
-    }
-
-    /**
-     * This method computes the authpath (AUTH) for the current tree,
-     * Additionally the root signature for the next tree (SIG+), the authpath
-     * (AUTH++) and root (ROOT++) for the tree after next in layer
-     * <code>layer</code>, and the LEAF++^1 for the next next tree in the
-     * layer above are updated This method is used by nextKey()
-     *
-     * @param layer
-     */
-    private void updateKey(int layer)
-    {
-        // ----------current tree processing of actual layer---------
-        // compute upcoming authpath for current Tree (AUTH)
-        computeAuthPaths(layer);
-
-        // -----------distributed calculations part------------
-        // not for highest tree layer
-        if (layer > 0)
-        {
-
-            // compute (partial) next leaf on TREE++ (not on layer 1 and 0)
-            if (layer > 1)
-            {
-                nextNextLeaf[layer - 1 - 1] = nextNextLeaf[layer - 1 - 1].nextLeaf();
-            }
-
-            // compute (partial) next leaf on tree above (not on layer 0)
-            upperLeaf[layer - 1] = upperLeaf[layer - 1].nextLeaf();
-
-            // compute (partial) next leaf for all treehashs on tree above (not
-            // on layer 0)
-
-            int t = (int)Math
-                .floor((double)(this.getNumLeafs(layer) * 2)
-                    / (double)(this.heightOfTrees[layer - 1] - this.K[layer - 1]));
-
-            if (index[layer] % t == 1)
-            {
-                // System.out.println(" layer: " + layer + " index: " +
-                // index[layer] + " t : " + t);
-
-                // take precomputed node for treehash update
-                // ------------------------------------------------
-                if (index[layer] > 1 && minTreehash[layer - 1] >= 0)
-                {
-                    byte[] leaf = this.upperTreehashLeaf[layer - 1].getLeaf();
-                    // if update is required use the precomputed leaf to update
-                    // treehash
-                    try
-                    {
-                        currentTreehash[layer - 1][minTreehash[layer - 1]]
-                            .update(this.gmssRandom, leaf);
-                        // System.out.println("Updated TH " + minTreehash[layer
-                        // - 1]);
-                        if (currentTreehash[layer - 1][minTreehash[layer - 1]]
-                            .wasFinished())
-                        {
-                            // System.out.println("Finished TH " +
-                            // minTreehash[layer - 1]);
-                        }
-                    }
-                    catch (Exception e)
-                    {
-                        System.out.println(e);
-                    }
-                    // ------------------------------------------------
-                }
-
-                // initialize next leaf precomputation
-                // ------------------------------------------------
-
-                // get lowest index of treehashs
-                this.minTreehash[layer - 1] = getMinTreehashIndex(layer - 1);
-
-                if (this.minTreehash[layer - 1] >= 0)
-                {
-                    // initialize leaf
-                    byte[] seed = this.currentTreehash[layer - 1][this.minTreehash[layer - 1]]
-                        .getSeedActive();
-                    this.upperTreehashLeaf[layer - 1] = new GMSSLeaf(
-                        this.digestProvider.get(), this.otsIndex[layer - 1], t, seed);
-                    this.upperTreehashLeaf[layer - 1] = this.upperTreehashLeaf[layer - 1].nextLeaf();
-                    // System.out.println("restarted treehashleaf (" + (layer -
-                    // 1) + "," + this.minTreehash[layer - 1] + ")");
-                }
-                // ------------------------------------------------
-
-            }
-            else
-            {
-                // update the upper leaf for the treehash one step
-                if (this.minTreehash[layer - 1] >= 0)
-                {
-                    this.upperTreehashLeaf[layer - 1] = this.upperTreehashLeaf[layer - 1].nextLeaf();
-                    // if (minTreehash[layer - 1] > 3)
-                    // System.out.print("#");
-                }
-            }
-
-            // compute (partial) the signature of ROOT+ (RootSig+) (not on top
-            // layer)
-            nextRootSig[layer - 1].updateSign();
-
-            // compute (partial) AUTHPATH++ & ROOT++ (not on top layer)
-            if (index[layer] == 1)
-            {
-                // init root and authpath calculation for tree after next
-                // (AUTH++, ROOT++)
-                this.nextNextRoot[layer - 1].initialize(new Vector());
-            }
-
-            // update root and authpath calculation for tree after next (AUTH++,
-            // ROOT++)
-            this.updateNextNextAuthRoot(layer);
-        }
-        // ----------- end distributed calculations part-----------------
-    }
-
-    /**
-     * This method returns the index of the next Treehash instance that should
-     * receive an update
-     *
-     * @param layer the layer of the GMSS tree
-     * @return index of the treehash instance that should get the update
-     */
-    private int getMinTreehashIndex(int layer)
-    {
-        int minTreehash = -1;
-        for (int h = 0; h < heightOfTrees[layer] - K[layer]; h++)
-        {
-            if (currentTreehash[layer][h].wasInitialized()
-                && !currentTreehash[layer][h].wasFinished())
-            {
-                if (minTreehash == -1)
-                {
-                    minTreehash = h;
-                }
-                else if (currentTreehash[layer][h].getLowestNodeHeight() < currentTreehash[layer][minTreehash]
-                    .getLowestNodeHeight())
-                {
-                    minTreehash = h;
-                }
-            }
-        }
-        return minTreehash;
-    }
-
-    /**
-     * Computes the upcoming currentAuthpath of layer <code>layer</code> using
-     * the revisited authentication path computation of Dahmen/Schneider 2008
-     *
-     * @param layer the actual layer
-     */
-    private void computeAuthPaths(int layer)
-    {
-
-        int Phi = index[layer];
-        int H = heightOfTrees[layer];
-        int K = this.K[layer];
-
-        // update all nextSeeds for seed scheduling
-        for (int i = 0; i < H - K; i++)
-        {
-            currentTreehash[layer][i].updateNextSeed(gmssRandom);
-        }
-
-        // STEP 1 of Algorithm
-        int Tau = heightOfPhi(Phi);
-
-        byte[] OTSseed = new byte[mdLength];
-        OTSseed = gmssRandom.nextSeed(currentSeeds[layer]);
-
-        // STEP 2 of Algorithm
-        // if phi's parent on height tau + 1 if left node, store auth_tau
-        // in keep_tau.
-        // TODO check it, formerly was
-        // int L = Phi / (int) Math.floor(Math.pow(2, Tau + 1));
-        // L %= 2;
-        int L = (Phi >>> (Tau + 1)) & 1;
-
-        byte[] tempKeep = new byte[mdLength];
-        // store the keep node not in keep[layer][tau/2] because it might be in
-        // use
-        // wait until the space is freed in step 4a
-        if (Tau < H - 1 && L == 0)
-        {
-            System.arraycopy(currentAuthPaths[layer][Tau], 0, tempKeep, 0,
-                mdLength);
-        }
-
-        byte[] help = new byte[mdLength];
-        // STEP 3 of Algorithm
-        // if phi is left child, compute and store leaf for next currentAuthPath
-        // path,
-        // (obtained by veriying current signature)
-        if (Tau == 0)
-        {
-            // LEAFCALC !!!
-            if (layer == numLayer - 1)
-            { // lowest layer computes the
-                // necessary leaf completely at this
-                // time
-                WinternitzOTSignature ots = new WinternitzOTSignature(OTSseed,
-                    digestProvider.get(), otsIndex[layer]);
-                help = ots.getPublicKey();
-            }
-            else
-            { // other layers use the precomputed leafs in
-                // nextNextLeaf
-                byte[] dummy = new byte[mdLength];
-                System.arraycopy(currentSeeds[layer], 0, dummy, 0, mdLength);
-                gmssRandom.nextSeed(dummy);
-                help = upperLeaf[layer].getLeaf();
-                this.upperLeaf[layer].initLeafCalc(dummy);
-
-                // WinternitzOTSVerify otsver = new
-                // WinternitzOTSVerify(algNames, otsIndex[layer]);
-                // byte[] help2 = otsver.Verify(currentRoot[layer],
-                // currentRootSig[layer]);
-                // System.out.println(" --- " + layer + " " +
-                // ByteUtils.toHexString(help) + " " +
-                // ByteUtils.toHexString(help2));
-            }
-            System.arraycopy(help, 0, currentAuthPaths[layer][0], 0, mdLength);
-        }
-        else
-        {
-            // STEP 4a of Algorithm
-            // get new left currentAuthPath node on height tau
-            byte[] toBeHashed = new byte[mdLength << 1];
-            System.arraycopy(currentAuthPaths[layer][Tau - 1], 0, toBeHashed,
-                0, mdLength);
-            // free the shared keep[layer][tau/2]
-            System.arraycopy(keep[layer][(int)Math.floor((Tau - 1) / 2)], 0,
-                toBeHashed, mdLength, mdLength);
-            messDigestTrees.update(toBeHashed, 0, toBeHashed.length);
-            currentAuthPaths[layer][Tau] = new byte[messDigestTrees.getDigestSize()];
-            messDigestTrees.doFinal(currentAuthPaths[layer][Tau], 0);
-
-            // STEP 4b and 4c of Algorithm
-            // copy right nodes to currentAuthPath on height 0..Tau-1
-            for (int i = 0; i < Tau; i++)
-            {
-
-                // STEP 4b of Algorithm
-                // 1st: copy from treehashs
-                if (i < H - K)
-                {
-                    if (currentTreehash[layer][i].wasFinished())
-                    {
-                        System.arraycopy(currentTreehash[layer][i]
-                            .getFirstNode(), 0, currentAuthPaths[layer][i],
-                            0, mdLength);
-                        currentTreehash[layer][i].destroy();
-                    }
-                    else
-                    {
-                        System.err
-                            .println("Treehash ("
-                                + layer
-                                + ","
-                                + i
-                                + ") not finished when needed in AuthPathComputation");
-                    }
-                }
-
-                // 2nd: copy precomputed values from Retain
-                if (i < H - 1 && i >= H - K)
-                {
-                    if (currentRetain[layer][i - (H - K)].size() > 0)
-                    {
-                        // pop element from retain
-                        System.arraycopy(currentRetain[layer][i - (H - K)]
-                            .lastElement(), 0, currentAuthPaths[layer][i],
-                            0, mdLength);
-                        currentRetain[layer][i - (H - K)]
-                            .removeElementAt(currentRetain[layer][i
-                                - (H - K)].size() - 1);
-                    }
-                }
-
-                // STEP 4c of Algorithm
-                // initialize new stack at heights 0..Tau-1
-                if (i < H - K)
-                {
-                    // create stacks anew
-                    int startPoint = Phi + 3 * (1 << i);
-                    if (startPoint < numLeafs[layer])
-                    {
-                        // if (layer < 2) {
-                        // System.out.println("initialized TH " + i + " on layer
-                        // " + layer);
-                        // }
-                        currentTreehash[layer][i].initialize();
-                    }
-                }
-            }
-        }
-
-        // now keep space is free to use
-        if (Tau < H - 1 && L == 0)
-        {
-            System.arraycopy(tempKeep, 0,
-                keep[layer][(int)Math.floor(Tau / 2)], 0, mdLength);
-        }
-
-        // only update empty stack at height h if all other stacks have
-        // tailnodes with height >h
-        // finds active stack with lowest node height, choses lower index in
-        // case of tie
-
-        // on the lowest layer leafs must be computed at once, no precomputation
-        // is possible. So all treehash updates are done at once here
-        if (layer == numLayer - 1)
-        {
-            for (int tmp = 1; tmp <= (H - K) / 2; tmp++)
-            {
-                // index of the treehash instance that receives the next update
-                int minTreehash = getMinTreehashIndex(layer);
-
-                // if active treehash is found update with a leaf
-                if (minTreehash >= 0)
-                {
-                    try
-                    {
-                        byte[] seed = new byte[mdLength];
-                        System.arraycopy(
-                            this.currentTreehash[layer][minTreehash]
-                                .getSeedActive(), 0, seed, 0, mdLength);
-                        byte[] seed2 = gmssRandom.nextSeed(seed);
-                        WinternitzOTSignature ots = new WinternitzOTSignature(
-                            seed2, this.digestProvider.get(), this.otsIndex[layer]);
-                        byte[] leaf = ots.getPublicKey();
-                        currentTreehash[layer][minTreehash].update(
-                            this.gmssRandom, leaf);
-                    }
-                    catch (Exception e)
-                    {
-                        System.out.println(e);
-                    }
-                }
-            }
-        }
-        else
-        { // on higher layers the updates are done later
-            this.minTreehash[layer] = getMinTreehashIndex(layer);
-        }
-    }
-
-    /**
-     * Returns the largest h such that 2^h | Phi
-     *
-     * @param Phi the leaf index
-     * @return The largest <code>h</code> with <code>2^h | Phi</code> if
-     *         <code>Phi!=0</code> else return <code>-1</code>
-     */
-    private int heightOfPhi(int Phi)
-    {
-        if (Phi == 0)
-        {
-            return -1;
-        }
-        int Tau = 0;
-        int modul = 1;
-        while (Phi % modul == 0)
-        {
-            modul *= 2;
-            Tau += 1;
-        }
-        return Tau - 1;
-    }
-
-    /**
-     * Updates the authentication path and root calculation for the tree after
-     * next (AUTH++, ROOT++) in layer <code>layer</code>
-     *
-     * @param layer
-     */
-    private void updateNextNextAuthRoot(int layer)
-    {
-
-        byte[] OTSseed = new byte[mdLength];
-        OTSseed = gmssRandom.nextSeed(nextNextSeeds[layer - 1]);
-
-        // get the necessary leaf
-        if (layer == numLayer - 1)
-        { // lowest layer computes the necessary
-            // leaf completely at this time
-            WinternitzOTSignature ots = new WinternitzOTSignature(OTSseed,
-                digestProvider.get(), otsIndex[layer]);
-            this.nextNextRoot[layer - 1].update(nextNextSeeds[layer - 1], ots
-                .getPublicKey());
-        }
-        else
-        { // other layers use the precomputed leafs in nextNextLeaf
-            this.nextNextRoot[layer - 1].update(nextNextSeeds[layer - 1], nextNextLeaf[layer - 1].getLeaf());
-            this.nextNextLeaf[layer - 1].initLeafCalc(nextNextSeeds[layer - 1]);
-        }
-    }
-
-    public int[] getIndex()
-    {
-        return index;
-    }
-
-    /**
-     * @return The current index of layer i
-     */
-    public int getIndex(int i)
-    {
-        return index[i];
-    }
-
-    public byte[][] getCurrentSeeds()
-    {
-        return Arrays.clone(currentSeeds);
-    }
-
-    public byte[][][] getCurrentAuthPaths()
-    {
-        return Arrays.clone(currentAuthPaths);
-    }
-
-    /**
-     * @return The one-time signature of the root of the current subtree
-     */
-    public byte[] getSubtreeRootSig(int i)
-    {
-        return currentRootSig[i];
-    }
-
-
-    public GMSSDigestProvider getName()
-    {
-        return digestProvider;
-    }
-
-    /**
-     * @return The number of leafs of each tree of layer i
-     */
-    public int getNumLeafs(int i)
-    {
-        return numLeafs[i];
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/gmss/GMSSPublicKeyParameters.java b/bcprov/src/main/java/org/bouncycastle/pqc/crypto/gmss/GMSSPublicKeyParameters.java
deleted file mode 100644
index 492802d..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/gmss/GMSSPublicKeyParameters.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package org.bouncycastle.pqc.crypto.gmss;
-
-
-public class GMSSPublicKeyParameters
-    extends GMSSKeyParameters
-{
-    /**
-     * The GMSS public key
-     */
-    private byte[] gmssPublicKey;
-
-    /**
-     * The constructor.
-     *
-     * @param key              a raw GMSS public key
-     * @param gmssParameterSet an instance of GMSSParameterset
-     */
-    public GMSSPublicKeyParameters(byte[] key, GMSSParameters gmssParameterSet)
-    {
-        super(false, gmssParameterSet);
-        this.gmssPublicKey = key;
-    }
-
-    /**
-     * Returns the GMSS public key
-     *
-     * @return The GMSS public key
-     */
-    public byte[] getPublicKey()
-    {
-        return gmssPublicKey;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/gmss/GMSSRootCalc.java b/bcprov/src/main/java/org/bouncycastle/pqc/crypto/gmss/GMSSRootCalc.java
deleted file mode 100644
index 35ac2e3..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/gmss/GMSSRootCalc.java
+++ /dev/null
@@ -1,596 +0,0 @@
-package org.bouncycastle.pqc.crypto.gmss;
-
-import java.util.Enumeration;
-import java.util.Vector;
-
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.util.Arrays;
-import org.bouncycastle.util.Integers;
-import org.bouncycastle.util.encoders.Hex;
-
-
-/**
- * This class computes a whole Merkle tree and saves the needed values for
- * AuthPath computation. It is used for precomputation of the root of a
- * following tree. After initialization, 2^H updates are required to complete
- * the root. Every update requires one leaf value as parameter. While computing
- * the root all initial values for the authentication path algorithm (treehash,
- * auth, retain) are stored for later use.
- */
-public class GMSSRootCalc
-{
-
-    /**
-     * max height of the tree
-     */
-    private int heightOfTree;
-
-    /**
-     * length of the messageDigest
-     */
-    private int mdLength;
-
-    /**
-     * the treehash instances of the tree
-     */
-    private Treehash[] treehash;
-
-    /**
-     * stores the retain nodes for authPath computation
-     */
-    private Vector[] retain;
-
-    /**
-     * finally stores the root of the tree when finished
-     */
-    private byte[] root;
-
-    /**
-     * stores the authentication path y_1(i), i = 0..H-1
-     */
-    private byte[][] AuthPath;
-
-    /**
-     * the value K for the authentication path computation
-     */
-    private int K;
-
-    /**
-     * Vector element that stores the nodes on the stack
-     */
-    private Vector tailStack;
-
-    /**
-     * stores the height of all nodes laying on the tailStack
-     */
-    private Vector heightOfNodes;
-    /**
-     * The hash function used for the construction of the authentication trees
-     */
-    private Digest messDigestTree;
-
-    /**
-     * An array of strings containing the name of the hash function used to
-     * construct the authentication trees and used by the OTS.
-     */
-    private GMSSDigestProvider digestProvider;
-
-    /**
-     * stores the index of the current node on each height of the tree
-     */
-    private int[] index;
-
-    /**
-     * true if instance was already initialized, false otherwise
-     */
-    private boolean isInitialized;
-
-    /**
-     * true it instance was finished
-     */
-    private boolean isFinished;
-
-    /**
-     * Integer that stores the index of the next seed that has to be omitted to
-     * the treehashs
-     */
-    private int indexForNextSeed;
-
-    /**
-     * temporary integer that stores the height of the next treehash instance
-     * that gets initialized with a seed
-     */
-    private int heightOfNextSeed;
-
-    /**
-     * This constructor regenerates a prior treehash object
-     *
-     * @param digest     an array of strings, containing the digest of the used hash
-     *                 function and PRNG and the digest of the corresponding
-     *                 provider
-     * @param statByte status bytes
-     * @param statInt  status ints
-     */
-    public GMSSRootCalc(Digest digest, byte[][] statByte, int[] statInt,
-                        Treehash[] treeH, Vector[] ret)
-    {
-        this.messDigestTree = digestProvider.get();
-        this.digestProvider = digestProvider;
-        // decode statInt
-        this.heightOfTree = statInt[0];
-        this.mdLength = statInt[1];
-        this.K = statInt[2];
-        this.indexForNextSeed = statInt[3];
-        this.heightOfNextSeed = statInt[4];
-        if (statInt[5] == 1)
-        {
-            this.isFinished = true;
-        }
-        else
-        {
-            this.isFinished = false;
-        }
-        if (statInt[6] == 1)
-        {
-            this.isInitialized = true;
-        }
-        else
-        {
-            this.isInitialized = false;
-        }
-
-        int tailLength = statInt[7];
-
-        this.index = new int[heightOfTree];
-        for (int i = 0; i < heightOfTree; i++)
-        {
-            this.index[i] = statInt[8 + i];
-        }
-
-        this.heightOfNodes = new Vector();
-        for (int i = 0; i < tailLength; i++)
-        {
-            this.heightOfNodes.addElement(Integers.valueOf(statInt[8 + heightOfTree
-                + i]));
-        }
-
-        // decode statByte
-        this.root = statByte[0];
-
-        this.AuthPath = new byte[heightOfTree][mdLength];
-        for (int i = 0; i < heightOfTree; i++)
-        {
-            this.AuthPath[i] = statByte[1 + i];
-        }
-
-        this.tailStack = new Vector();
-        for (int i = 0; i < tailLength; i++)
-        {
-            this.tailStack.addElement(statByte[1 + heightOfTree + i]);
-        }
-
-        // decode treeH
-        this.treehash = GMSSUtils.clone(treeH);
-
-        // decode ret
-        this.retain = GMSSUtils.clone(ret);
-    }
-
-    /**
-     * Constructor
-     *
-     * @param heightOfTree maximal height of the tree
-     * @param digestProvider       an array of strings, containing the name of the used hash
-     *                     function and PRNG and the name of the corresponding
-     *                     provider
-     */
-    public GMSSRootCalc(int heightOfTree, int K, GMSSDigestProvider digestProvider)
-    {
-        this.heightOfTree = heightOfTree;
-        this.digestProvider = digestProvider;
-        this.messDigestTree = digestProvider.get();
-        this.mdLength = messDigestTree.getDigestSize();
-        this.K = K;
-        this.index = new int[heightOfTree];
-        this.AuthPath = new byte[heightOfTree][mdLength];
-        this.root = new byte[mdLength];
-        // this.treehash = new Treehash[this.heightOfTree - this.K];
-        this.retain = new Vector[this.K - 1];
-        for (int i = 0; i < K - 1; i++)
-        {
-            this.retain[i] = new Vector();
-        }
-
-    }
-
-    /**
-     * Initializes the calculation of a new root
-     *
-     * @param sharedStack the stack shared by all treehash instances of this tree
-     */
-    public void initialize(Vector sharedStack)
-    {
-        this.treehash = new Treehash[this.heightOfTree - this.K];
-        for (int i = 0; i < this.heightOfTree - this.K; i++)
-        {
-            this.treehash[i] = new Treehash(sharedStack, i, this.digestProvider.get());
-        }
-
-        this.index = new int[heightOfTree];
-        this.AuthPath = new byte[heightOfTree][mdLength];
-        this.root = new byte[mdLength];
-
-        this.tailStack = new Vector();
-        this.heightOfNodes = new Vector();
-        this.isInitialized = true;
-        this.isFinished = false;
-
-        for (int i = 0; i < heightOfTree; i++)
-        {
-            this.index[i] = -1;
-        }
-
-        this.retain = new Vector[this.K - 1];
-        for (int i = 0; i < K - 1; i++)
-        {
-            this.retain[i] = new Vector();
-        }
-
-        this.indexForNextSeed = 3;
-        this.heightOfNextSeed = 0;
-    }
-
-    /**
-     * updates the root with one leaf and stores needed values in retain,
-     * treehash or authpath. Additionally counts the seeds used. This method is
-     * used when performing the updates for TREE++.
-     *
-     * @param seed the initial seed for treehash: seedNext
-     * @param leaf the height of the treehash
-     */
-    public void update(byte[] seed, byte[] leaf)
-    {
-        if (this.heightOfNextSeed < (this.heightOfTree - this.K)
-            && this.indexForNextSeed - 2 == index[0])
-        {
-            this.initializeTreehashSeed(seed, this.heightOfNextSeed);
-            this.heightOfNextSeed++;
-            this.indexForNextSeed *= 2;
-        }
-        // now call the simple update
-        this.update(leaf);
-    }
-
-    /**
-     * Updates the root with one leaf and stores the needed values in retain,
-     * treehash or authpath
-     */
-    public void update(byte[] leaf)
-    {
-
-        if (isFinished)
-        {
-            System.out.print("Too much updates for Tree!!");
-            return;
-        }
-        if (!isInitialized)
-        {
-            System.err.println("GMSSRootCalc not initialized!");
-            return;
-        }
-
-        // a new leaf was omitted, so raise index on lowest layer
-        index[0]++;
-
-        // store the nodes on the lowest layer in treehash or authpath
-        if (index[0] == 1)
-        {
-            System.arraycopy(leaf, 0, AuthPath[0], 0, mdLength);
-        }
-        else if (index[0] == 3)
-        {
-            // store in treehash only if K < H
-            if (heightOfTree > K)
-            {
-                treehash[0].setFirstNode(leaf);
-            }
-        }
-
-        if ((index[0] - 3) % 2 == 0 && index[0] >= 3)
-        {
-            // store in retain if K = H
-            if (heightOfTree == K)
-            // TODO: check it
-            {
-                retain[0].insertElementAt(leaf, 0);
-            }
-        }
-
-        // if first update to this tree is made
-        if (index[0] == 0)
-        {
-            tailStack.addElement(leaf);
-            heightOfNodes.addElement(Integers.valueOf(0));
-        }
-        else
-        {
-
-            byte[] help = new byte[mdLength];
-            byte[] toBeHashed = new byte[mdLength << 1];
-
-            // store the new leaf in help
-            System.arraycopy(leaf, 0, help, 0, mdLength);
-            int helpHeight = 0;
-            // while top to nodes have same height
-            while (tailStack.size() > 0
-                && helpHeight == ((Integer)heightOfNodes.lastElement())
-                .intValue())
-            {
-
-                // help <-- hash(stack top element || help)
-                System.arraycopy(tailStack.lastElement(), 0, toBeHashed, 0,
-                    mdLength);
-                tailStack.removeElementAt(tailStack.size() - 1);
-                heightOfNodes.removeElementAt(heightOfNodes.size() - 1);
-                System.arraycopy(help, 0, toBeHashed, mdLength, mdLength);
-
-                messDigestTree.update(toBeHashed, 0, toBeHashed.length);
-                help = new byte[messDigestTree.getDigestSize()];
-                messDigestTree.doFinal(help, 0);
-
-                // the new help node is one step higher
-                helpHeight++;
-                if (helpHeight < heightOfTree)
-                {
-                    index[helpHeight]++;
-
-                    // add index 1 element to initial authpath
-                    if (index[helpHeight] == 1)
-                    {
-                        System.arraycopy(help, 0, AuthPath[helpHeight], 0,
-                            mdLength);
-                    }
-
-                    if (helpHeight >= heightOfTree - K)
-                    {
-                        if (helpHeight == 0)
-                        {
-                            System.out.println("M���P");
-                        }
-                        // add help element to retain stack if it is a right
-                        // node
-                        // and not stored in treehash
-                        if ((index[helpHeight] - 3) % 2 == 0
-                            && index[helpHeight] >= 3)
-                        // TODO: check it
-                        {
-                            retain[helpHeight - (heightOfTree - K)]
-                                .insertElementAt(help, 0);
-                        }
-                    }
-                    else
-                    {
-                        // if element is third in his line add it to treehash
-                        if (index[helpHeight] == 3)
-                        {
-                            treehash[helpHeight].setFirstNode(help);
-                        }
-                    }
-                }
-            }
-            // push help element to the stack
-            tailStack.addElement(help);
-            heightOfNodes.addElement(Integers.valueOf(helpHeight));
-
-            // is the root calculation finished?
-            if (helpHeight == heightOfTree)
-            {
-                isFinished = true;
-                isInitialized = false;
-                root = (byte[])tailStack.lastElement();
-            }
-        }
-
-    }
-
-    /**
-     * initializes the seeds for the treehashs of the tree precomputed by this
-     * class
-     *
-     * @param seed  the initial seed for treehash: seedNext
-     * @param index the height of the treehash
-     */
-    public void initializeTreehashSeed(byte[] seed, int index)
-    {
-        treehash[index].initializeSeed(seed);
-    }
-
-    /**
-     * Method to check whether the instance has been initialized or not
-     *
-     * @return true if treehash was already initialized
-     */
-    public boolean wasInitialized()
-    {
-        return isInitialized;
-    }
-
-    /**
-     * Method to check whether the instance has been finished or not
-     *
-     * @return true if tree has reached its maximum height
-     */
-    public boolean wasFinished()
-    {
-        return isFinished;
-    }
-
-    /**
-     * returns the authentication path of the first leaf of the tree
-     *
-     * @return the authentication path of the first leaf of the tree
-     */
-    public byte[][] getAuthPath()
-    {
-        return GMSSUtils.clone(AuthPath);
-    }
-
-    /**
-     * returns the initial treehash instances, storing value y_3(i)
-     *
-     * @return the initial treehash instances, storing value y_3(i)
-     */
-    public Treehash[] getTreehash()
-    {
-        return GMSSUtils.clone(treehash);
-    }
-
-    /**
-     * returns the retain stacks storing all right nodes near to the root
-     *
-     * @return the retain stacks storing all right nodes near to the root
-     */
-    public Vector[] getRetain()
-    {
-        return GMSSUtils.clone(retain);
-    }
-
-    /**
-     * returns the finished root value
-     *
-     * @return the finished root value
-     */
-    public byte[] getRoot()
-    {
-        return Arrays.clone(root);
-    }
-
-    /**
-     * returns the shared stack
-     *
-     * @return the shared stack
-     */
-    public Vector getStack()
-    {
-        Vector copy = new Vector();
-        for (Enumeration en = tailStack.elements(); en.hasMoreElements();)
-        {
-            copy.addElement(en.nextElement());
-        }
-        return copy;
-    }
-
-    /**
-     * Returns the status byte array used by the GMSSPrivateKeyASN.1 class
-     *
-     * @return The status bytes
-     */
-    public byte[][] getStatByte()
-    {
-
-        int tailLength;
-        if (tailStack == null)
-        {
-            tailLength = 0;
-        }
-        else
-        {
-            tailLength = tailStack.size();
-        }
-        byte[][] statByte = new byte[1 + heightOfTree + tailLength][64]; //FIXME: messDigestTree.getByteLength()
-        statByte[0] = root;
-
-        for (int i = 0; i < heightOfTree; i++)
-        {
-            statByte[1 + i] = AuthPath[i];
-        }
-        for (int i = 0; i < tailLength; i++)
-        {
-            statByte[1 + heightOfTree + i] = (byte[])tailStack.elementAt(i);
-        }
-
-        return statByte;
-    }
-
-    /**
-     * Returns the status int array used by the GMSSPrivateKeyASN.1 class
-     *
-     * @return The status ints
-     */
-    public int[] getStatInt()
-    {
-
-        int tailLength;
-        if (tailStack == null)
-        {
-            tailLength = 0;
-        }
-        else
-        {
-            tailLength = tailStack.size();
-        }
-        int[] statInt = new int[8 + heightOfTree + tailLength];
-        statInt[0] = heightOfTree;
-        statInt[1] = mdLength;
-        statInt[2] = K;
-        statInt[3] = indexForNextSeed;
-        statInt[4] = heightOfNextSeed;
-        if (isFinished)
-        {
-            statInt[5] = 1;
-        }
-        else
-        {
-            statInt[5] = 0;
-        }
-        if (isInitialized)
-        {
-            statInt[6] = 1;
-        }
-        else
-        {
-            statInt[6] = 0;
-        }
-        statInt[7] = tailLength;
-
-        for (int i = 0; i < heightOfTree; i++)
-        {
-            statInt[8 + i] = index[i];
-        }
-        for (int i = 0; i < tailLength; i++)
-        {
-            statInt[8 + heightOfTree + i] = ((Integer)heightOfNodes
-                .elementAt(i)).intValue();
-        }
-
-        return statInt;
-    }
-
-    /**
-     * @return a human readable version of the structure
-     */
-    public String toString()
-    {
-        String out = "";
-        int tailLength;
-        if (tailStack == null)
-        {
-            tailLength = 0;
-        }
-        else
-        {
-            tailLength = tailStack.size();
-        }
-
-        for (int i = 0; i < 8 + heightOfTree + tailLength; i++)
-        {
-            out = out + getStatInt()[i] + " ";
-        }
-        for (int i = 0; i < 1 + heightOfTree + tailLength; i++)
-        {
-            out = out + new String(Hex.encode(getStatByte()[i])) + " ";
-        }
-        out = out + "  " + digestProvider.get().getDigestSize();
-        return out;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/gmss/GMSSRootSig.java b/bcprov/src/main/java/org/bouncycastle/pqc/crypto/gmss/GMSSRootSig.java
deleted file mode 100644
index 8a4796f..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/gmss/GMSSRootSig.java
+++ /dev/null
@@ -1,666 +0,0 @@
-package org.bouncycastle.pqc.crypto.gmss;
-
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.pqc.crypto.gmss.util.GMSSRandom;
-import org.bouncycastle.util.encoders.Hex;
-
-
-/**
- * This class implements the distributed signature generation of the Winternitz
- * one-time signature scheme (OTSS), described in C.Dods, N.P. Smart, and M.
- * Stam, "Hash Based Digital Signature Schemes", LNCS 3796, pages 96&#8211;115,
- * 2005. The class is used by the GMSS classes.
- */
-public class GMSSRootSig
-{
-
-    /**
-     * The hash function used by the OTS
-     */
-    private Digest messDigestOTS;
-
-    /**
-     * The length of the message digest and private key
-     */
-    private int mdsize, keysize;
-
-    /**
-     * The private key
-     */
-    private byte[] privateKeyOTS;
-
-    /**
-     * The message bytes
-     */
-    private byte[] hash;
-
-    /**
-     * The signature bytes
-     */
-    private byte[] sign;
-
-    /**
-     * The Winternitz parameter
-     */
-    private int w;
-
-    /**
-     * The source of randomness for OTS private key generation
-     */
-    private GMSSRandom gmssRandom;
-
-    /**
-     * Sizes of the message
-     */
-    private int messagesize;
-
-    /**
-     * Some precalculated values
-     */
-    private int k;
-
-    /**
-     * Some variables for storing the actual status of distributed signing
-     */
-    private int r, test, counter, ii;
-
-    /**
-     * variables for storing big numbers for the actual status of distributed
-     * signing
-     */
-    private long test8, big8;
-
-    /**
-     * The necessary steps of each updateSign() call
-     */
-    private int steps;
-
-    /**
-     * The checksum part
-     */
-    private int checksum;
-
-    /**
-     * The height of the tree
-     */
-    private int height;
-
-    /**
-     * The current intern OTSseed
-     */
-    private byte[] seed;
-
-    /**
-     * This constructor regenerates a prior GMSSRootSig object used by the
-     * GMSSPrivateKeyASN.1 class
-     *
-     * @param digest     an array of strings, containing the digest of the used hash
-     *                 function, the digest of the PRGN and the names of the
-     *                 corresponding providers
-     * @param statByte status byte array
-     * @param statInt  status int array
-     */
-    public GMSSRootSig(Digest digest, byte[][] statByte, int[] statInt)
-    {
-        messDigestOTS = digest;
-        gmssRandom = new GMSSRandom(messDigestOTS);
-
-        this.counter = statInt[0];
-        this.test = statInt[1];
-        this.ii = statInt[2];
-        this.r = statInt[3];
-        this.steps = statInt[4];
-        this.keysize = statInt[5];
-        this.height = statInt[6];
-        this.w = statInt[7];
-        this.checksum = statInt[8];
-
-        this.mdsize = messDigestOTS.getDigestSize();
-
-        this.k = (1 << w) - 1;
-
-        int mdsizeBit = mdsize << 3;
-        this.messagesize = (int)Math.ceil((double)(mdsizeBit) / (double)w);
-
-        this.privateKeyOTS = statByte[0];
-        this.seed = statByte[1];
-        this.hash = statByte[2];
-
-        this.sign = statByte[3];
-
-        this.test8 = ((statByte[4][0] & 0xff))
-            | ((long)(statByte[4][1] & 0xff) << 8)
-            | ((long)(statByte[4][2] & 0xff) << 16)
-            | ((long)(statByte[4][3] & 0xff)) << 24
-            | ((long)(statByte[4][4] & 0xff)) << 32
-            | ((long)(statByte[4][5] & 0xff)) << 40
-            | ((long)(statByte[4][6] & 0xff)) << 48
-            | ((long)(statByte[4][7] & 0xff)) << 56;
-
-        this.big8 = ((statByte[4][8] & 0xff))
-            | ((long)(statByte[4][9] & 0xff) << 8)
-            | ((long)(statByte[4][10] & 0xff) << 16)
-            | ((long)(statByte[4][11] & 0xff)) << 24
-            | ((long)(statByte[4][12] & 0xff)) << 32
-            | ((long)(statByte[4][13] & 0xff)) << 40
-            | ((long)(statByte[4][14] & 0xff)) << 48
-            | ((long)(statByte[4][15] & 0xff)) << 56;
-    }
-
-    /**
-     * The constructor generates the PRNG and initializes some variables
-     *
-     * @param digest   an array of strings, containing the digest of the used hash
-     *               function, the digest of the PRGN and the names of the
-     *               corresponding providers
-     * @param w      the winternitz parameter
-     * @param height the heigth of the tree
-     */
-    public GMSSRootSig(Digest digest, int w, int height)
-    {
-        messDigestOTS = digest;
-        gmssRandom = new GMSSRandom(messDigestOTS);
-
-        this.mdsize = messDigestOTS.getDigestSize();
-        this.w = w;
-        this.height = height;
-
-        this.k = (1 << w) - 1;
-
-        int mdsizeBit = mdsize << 3;
-        this.messagesize = (int)Math.ceil((double)(mdsizeBit) / (double)w);
-    }
-
-    /**
-     * This method initializes the distributed sigature calculation. Variables
-     * are reseted and necessary steps are calculated
-     *
-     * @param seed0   the initial OTSseed
-     * @param message the massage which will be signed
-     */
-    public void initSign(byte[] seed0, byte[] message)
-    {
-
-        // create hash of message m
-        this.hash = new byte[mdsize];
-        messDigestOTS.update(message, 0, message.length);
-        this.hash = new byte[messDigestOTS.getDigestSize()];
-        messDigestOTS.doFinal(this.hash, 0);
-
-        // variables for calculation of steps
-        byte[] messPart = new byte[mdsize];
-        System.arraycopy(hash, 0, messPart, 0, mdsize);
-        int checkPart = 0;
-        int sumH = 0;
-        int checksumsize = getLog((messagesize << w) + 1);
-
-        // ------- calculation of necessary steps ------
-        if (8 % w == 0)
-        {
-            int dt = 8 / w;
-            // message part
-            for (int a = 0; a < mdsize; a++)
-            {
-                // count necessary hashs in 'sumH'
-                for (int b = 0; b < dt; b++)
-                {
-                    sumH += messPart[a] & k;
-                    messPart[a] = (byte)(messPart[a] >>> w);
-                }
-            }
-            // checksum part
-            this.checksum = (messagesize << w) - sumH;
-            checkPart = checksum;
-            // count necessary hashs in 'sumH'
-            for (int b = 0; b < checksumsize; b += w)
-            {
-                sumH += checkPart & k;
-                checkPart >>>= w;
-            }
-        } // end if ( 8 % w == 0 )
-        else if (w < 8)
-        {
-            long big8;
-            int ii = 0;
-            int dt = mdsize / w;
-
-            // first d*w bytes of hash (main message part)
-            for (int i = 0; i < dt; i++)
-            {
-                big8 = 0;
-                for (int j = 0; j < w; j++)
-                {
-                    big8 ^= (messPart[ii] & 0xff) << (j << 3);
-                    ii++;
-                }
-                // count necessary hashs in 'sumH'
-                for (int j = 0; j < 8; j++)
-                {
-                    sumH += (int)(big8 & k);
-                    big8 >>>= w;
-                }
-            }
-            // rest of message part
-            dt = mdsize % w;
-            big8 = 0;
-            for (int j = 0; j < dt; j++)
-            {
-                big8 ^= (messPart[ii] & 0xff) << (j << 3);
-                ii++;
-            }
-            dt <<= 3;
-            // count necessary hashs in 'sumH'
-            for (int j = 0; j < dt; j += w)
-            {
-                sumH += (int)(big8 & k);
-                big8 >>>= w;
-            }
-            // checksum part
-            this.checksum = (messagesize << w) - sumH;
-            checkPart = checksum;
-            // count necessary hashs in 'sumH'
-            for (int i = 0; i < checksumsize; i += w)
-            {
-                sumH += checkPart & k;
-                checkPart >>>= w;
-            }
-        }// end if(w<8)
-        else if (w < 57)
-        {
-            long big8;
-            int r = 0;
-            int s, f, rest, ii;
-
-            // first a*w bits of hash where a*w <= 8*mdsize < (a+1)*w (main
-            // message part)
-            while (r <= ((mdsize << 3) - w))
-            {
-                s = r >>> 3;
-                rest = r % 8;
-                r += w;
-                f = (r + 7) >>> 3;
-                big8 = 0;
-                ii = 0;
-                for (int j = s; j < f; j++)
-                {
-                    big8 ^= (messPart[j] & 0xff) << (ii << 3);
-                    ii++;
-                }
-                big8 >>>= rest;
-                // count necessary hashs in 'sumH'
-                sumH += (big8 & k);
-
-            }
-            // rest of message part
-            s = r >>> 3;
-            if (s < mdsize)
-            {
-                rest = r % 8;
-                big8 = 0;
-                ii = 0;
-                for (int j = s; j < mdsize; j++)
-                {
-                    big8 ^= (messPart[j] & 0xff) << (ii << 3);
-                    ii++;
-                }
-
-                big8 >>>= rest;
-                // count necessary hashs in 'sumH'
-                sumH += (big8 & k);
-            }
-            // checksum part
-            this.checksum = (messagesize << w) - sumH;
-            checkPart = checksum;
-            // count necessary hashs in 'sumH'
-            for (int i = 0; i < checksumsize; i += w)
-            {
-                sumH += (checkPart & k);
-                checkPart >>>= w;
-            }
-        }// end if(w<57)
-
-        // calculate keysize
-        this.keysize = messagesize
-            + (int)Math.ceil((double)checksumsize / (double)w);
-
-        // calculate steps: 'keysize' times PRNG, 'sumH' times hashing,
-        // (1<<height)-1 updateSign() calls
-        this.steps = (int)Math.ceil((double)(keysize + sumH)
-            / (double)((1 << height)));
-        // ----------------------------
-
-        // reset variables
-        this.sign = new byte[keysize * mdsize];
-        this.counter = 0;
-        this.test = 0;
-        this.ii = 0;
-        this.test8 = 0;
-        this.r = 0;
-        // define the private key messagesize
-        this.privateKeyOTS = new byte[mdsize];
-        // copy the seed
-        this.seed = new byte[mdsize];
-        System.arraycopy(seed0, 0, this.seed, 0, mdsize);
-
-    }
-
-    /**
-     * This Method performs <code>steps</code> steps of distributed signature
-     * calculaion
-     *
-     * @return true if signature is generated completly, else false
-     */
-    public boolean updateSign()
-    {
-        // steps times do
-
-        for (int s = 0; s < steps; s++)
-        { // do 'step' times
-
-            if (counter < keysize)
-            { // generate the private key or perform
-                // the next hash
-                oneStep();
-            }
-            if (counter == keysize)
-            {// finish
-                return true;
-            }
-        }
-
-        return false; // leaf not finished yet
-    }
-
-    /**
-     * @return The private OTS key
-     */
-    public byte[] getSig()
-    {
-
-        return sign;
-    }
-
-    /**
-     * @return The one-time signature of the message, generated step by step
-     */
-    private void oneStep()
-    {
-        // -------- if (8 % w == 0) ----------
-        if (8 % w == 0)
-        {
-            if (test == 0)
-            {
-                // get current OTSprivateKey
-                this.privateKeyOTS = gmssRandom.nextSeed(seed);
-                // System.arraycopy(privateKeyOTS, 0, hlp, 0, mdsize);
-
-                if (ii < mdsize)
-                { // for main message part
-                    test = hash[ii] & k;
-                    hash[ii] = (byte)(hash[ii] >>> w);
-                }
-                else
-                { // for checksum part
-                    test = checksum & k;
-                    checksum >>>= w;
-                }
-            }
-            else if (test > 0)
-            { // hash the private Key 'test' times (on
-                // time each step)
-                messDigestOTS.update(privateKeyOTS, 0, privateKeyOTS.length);
-                privateKeyOTS = new byte[messDigestOTS.getDigestSize()];
-                messDigestOTS.doFinal(privateKeyOTS, 0);
-                test--;
-            }
-            if (test == 0)
-            { // if all hashes done copy result to siganture
-                // array
-                System.arraycopy(privateKeyOTS, 0, sign, counter * mdsize,
-                    mdsize);
-                counter++;
-
-                if (counter % (8 / w) == 0)
-                { // raise array index for main
-                    // massage part
-                    ii++;
-                }
-            }
-
-        }// ----- end if (8 % w == 0) -----
-        // ---------- if ( w < 8 ) ----------------
-        else if (w < 8)
-        {
-
-            if (test == 0)
-            {
-                if (counter % 8 == 0 && ii < mdsize)
-                { // after every 8th "add
-                    // to signature"-step
-                    big8 = 0;
-                    if (counter < ((mdsize / w) << 3))
-                    {// main massage
-                        // (generate w*8 Bits
-                        // every time) part
-                        for (int j = 0; j < w; j++)
-                        {
-                            big8 ^= (hash[ii] & 0xff) << (j << 3);
-                            ii++;
-                        }
-                    }
-                    else
-                    { // rest of massage part (once)
-                        for (int j = 0; j < mdsize % w; j++)
-                        {
-                            big8 ^= (hash[ii] & 0xff) << (j << 3);
-                            ii++;
-                        }
-                    }
-                }
-                if (counter == messagesize)
-                { // checksum part (once)
-                    big8 = checksum;
-                }
-
-                test = (int)(big8 & k);
-                // generate current OTSprivateKey
-                this.privateKeyOTS = gmssRandom.nextSeed(seed);
-                // System.arraycopy(privateKeyOTS, 0, hlp, 0, mdsize);
-
-            }
-            else if (test > 0)
-            { // hash the private Key 'test' times (on
-                // time each step)
-                messDigestOTS.update(privateKeyOTS, 0, privateKeyOTS.length);
-                privateKeyOTS = new byte[messDigestOTS.getDigestSize()];
-                messDigestOTS.doFinal(privateKeyOTS, 0);
-                test--;
-            }
-            if (test == 0)
-            { // if all hashes done copy result to siganture
-                // array
-                System.arraycopy(privateKeyOTS, 0, sign, counter * mdsize,
-                    mdsize);
-                big8 >>>= w;
-                counter++;
-            }
-
-        }// ------- end if(w<8)--------------------------------
-        // --------- if w < 57 -----------------------------
-        else if (w < 57)
-        {
-
-            if (test8 == 0)
-            {
-                int s, f, rest;
-                big8 = 0;
-                ii = 0;
-                rest = r % 8;
-                s = r >>> 3;
-                // --- message part---
-                if (s < mdsize)
-                {
-                    if (r <= ((mdsize << 3) - w))
-                    { // first message part
-                        r += w;
-                        f = (r + 7) >>> 3;
-                    }
-                    else
-                    { // rest of message part (once)
-                        f = mdsize;
-                        r += w;
-                    }
-                    // generate long 'big8' with minimum w next bits of the
-                    // message array
-                    for (int i = s; i < f; i++)
-                    {
-                        big8 ^= (hash[i] & 0xff) << (ii << 3);
-                        ii++;
-                    }
-                    // delete bits on the right side, which were used already by
-                    // the last loop
-                    big8 >>>= rest;
-                    test8 = (big8 & k);
-                }
-                // --- checksum part
-                else
-                {
-                    test8 = (checksum & k);
-                    checksum >>>= w;
-                }
-                // generate current OTSprivateKey
-                this.privateKeyOTS = gmssRandom.nextSeed(seed);
-                // System.arraycopy(privateKeyOTS, 0, hlp, 0, mdsize);
-
-            }
-            else if (test8 > 0)
-            { // hash the private Key 'test' times (on
-                // time each step)
-                messDigestOTS.update(privateKeyOTS, 0, privateKeyOTS.length);
-                privateKeyOTS = new byte[messDigestOTS.getDigestSize()];
-                messDigestOTS.doFinal(privateKeyOTS, 0);
-                test8--;
-            }
-            if (test8 == 0)
-            { // if all hashes done copy result to siganture
-                // array
-                System.arraycopy(privateKeyOTS, 0, sign, counter * mdsize,
-                    mdsize);
-                counter++;
-            }
-
-        }
-    }
-
-    /**
-     * This method returns the least integer that is greater or equal to the
-     * logarithm to the base 2 of an integer <code>intValue</code>.
-     *
-     * @param intValue an integer
-     * @return The least integer greater or equal to the logarithm to the base 2
-     *         of <code>intValue</code>
-     */
-    public int getLog(int intValue)
-    {
-        int log = 1;
-        int i = 2;
-        while (i < intValue)
-        {
-            i <<= 1;
-            log++;
-        }
-        return log;
-    }
-
-    /**
-     * This method returns the status byte array
-     *
-     * @return statBytes
-     */
-    public byte[][] getStatByte()
-    {
-
-        byte[][] statByte = new byte[5][mdsize];
-        statByte[0] = privateKeyOTS;
-        statByte[1] = seed;
-        statByte[2] = hash;
-        statByte[3] = sign;
-        statByte[4] = this.getStatLong();
-
-        return statByte;
-    }
-
-    /**
-     * This method returns the status int array
-     *
-     * @return statInt
-     */
-    public int[] getStatInt()
-    {
-        int[] statInt = new int[9];
-        statInt[0] = counter;
-        statInt[1] = test;
-        statInt[2] = ii;
-        statInt[3] = r;
-        statInt[4] = steps;
-        statInt[5] = keysize;
-        statInt[6] = height;
-        statInt[7] = w;
-        statInt[8] = checksum;
-        return statInt;
-    }
-
-    /**
-     * Converts the long parameters into byte arrays to store it in
-     * statByte-Array
-     */
-    public byte[] getStatLong()
-    {
-        byte[] bytes = new byte[16];
-
-        bytes[0] = (byte)((test8) & 0xff);
-        bytes[1] = (byte)((test8 >> 8) & 0xff);
-        bytes[2] = (byte)((test8 >> 16) & 0xff);
-        bytes[3] = (byte)((test8 >> 24) & 0xff);
-        bytes[4] = (byte)((test8) >> 32 & 0xff);
-        bytes[5] = (byte)((test8 >> 40) & 0xff);
-        bytes[6] = (byte)((test8 >> 48) & 0xff);
-        bytes[7] = (byte)((test8 >> 56) & 0xff);
-
-        bytes[8] = (byte)((big8) & 0xff);
-        bytes[9] = (byte)((big8 >> 8) & 0xff);
-        bytes[10] = (byte)((big8 >> 16) & 0xff);
-        bytes[11] = (byte)((big8 >> 24) & 0xff);
-        bytes[12] = (byte)((big8) >> 32 & 0xff);
-        bytes[13] = (byte)((big8 >> 40) & 0xff);
-        bytes[14] = (byte)((big8 >> 48) & 0xff);
-        bytes[15] = (byte)((big8 >> 56) & 0xff);
-
-        return bytes;
-    }
-
-    /**
-     * returns a string representation of the instance
-     *
-     * @return a string representation of the instance
-     */
-    public String toString()
-    {
-        String out = "" + this.big8 + "  ";
-        int[] statInt = new int[9];
-        statInt = this.getStatInt();
-        byte[][] statByte = new byte[5][mdsize];
-        statByte = this.getStatByte();
-        for (int i = 0; i < 9; i++)
-        {
-            out = out + statInt[i] + " ";
-        }
-        for (int i = 0; i < 5; i++)
-        {
-            out = out + new String(Hex.encode(statByte[i])) + " ";
-        }
-
-        return out;
-    }
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/gmss/GMSSSigner.java b/bcprov/src/main/java/org/bouncycastle/pqc/crypto/gmss/GMSSSigner.java
deleted file mode 100644
index 8832fb3..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/gmss/GMSSSigner.java
+++ /dev/null
@@ -1,403 +0,0 @@
-package org.bouncycastle.pqc.crypto.gmss;
-
-import java.security.SecureRandom;
-
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.params.ParametersWithRandom;
-import org.bouncycastle.pqc.crypto.MessageSigner;
-import org.bouncycastle.pqc.crypto.gmss.util.GMSSRandom;
-import org.bouncycastle.pqc.crypto.gmss.util.GMSSUtil;
-import org.bouncycastle.pqc.crypto.gmss.util.WinternitzOTSVerify;
-import org.bouncycastle.pqc.crypto.gmss.util.WinternitzOTSignature;
-import org.bouncycastle.util.Arrays;
-
-/**
- * This class implements the GMSS signature scheme.
- */
-public class GMSSSigner
-    implements MessageSigner
-{
-
-    /**
-     * Instance of GMSSParameterSpec
-     */
-    //private GMSSParameterSpec gmssParameterSpec;
-
-    /**
-     * Instance of GMSSUtilities
-     */
-    private GMSSUtil gmssUtil = new GMSSUtil();
-
-
-    /**
-     * The raw GMSS public key
-     */
-    private byte[] pubKeyBytes;
-
-    /**
-     * Hash function for the construction of the authentication trees
-     */
-    private Digest messDigestTrees;
-
-    /**
-     * The length of the hash function output
-     */
-    private int mdLength;
-
-    /**
-     * The number of tree layers
-     */
-    private int numLayer;
-
-    /**
-     * The hash function used by the OTS
-     */
-    private Digest messDigestOTS;
-
-    /**
-     * An instance of the Winternitz one-time signature
-     */
-    private WinternitzOTSignature ots;
-
-    /**
-     * Array of strings containing the name of the hash function used by the OTS
-     * and the corresponding provider name
-     */
-    private GMSSDigestProvider digestProvider;
-
-    /**
-     * The current main tree and subtree indices
-     */
-    private int[] index;
-
-    /**
-     * Array of the authentication paths for the current trees of all layers
-     */
-    private byte[][][] currentAuthPaths;
-
-    /**
-     * The one-time signature of the roots of the current subtrees
-     */
-    private byte[][] subtreeRootSig;
-
-
-    /**
-     * The GMSSParameterset
-     */
-    private GMSSParameters gmssPS;
-
-    /**
-     * The PRNG
-     */
-    private GMSSRandom gmssRandom;
-
-    GMSSKeyParameters key;
-
-    // XXX needed? Source of randomness
-    private SecureRandom random;
-
-
-    /**
-     * The standard constructor tries to generate the MerkleTree Algorithm
-     * identifier with the corresponding OID.
-     *
-     * @param digest     the digest to use
-     */
-    // TODO
-    public GMSSSigner(GMSSDigestProvider digest)
-    {
-        digestProvider = digest;
-        messDigestTrees = digest.get();
-        messDigestOTS = messDigestTrees;
-        mdLength = messDigestTrees.getDigestSize();
-        gmssRandom = new GMSSRandom(messDigestTrees);
-    }
-
-    public void init(boolean forSigning,
-                     CipherParameters param)
-    {
-
-        if (forSigning)
-        {
-            if (param instanceof ParametersWithRandom)
-            {
-                ParametersWithRandom rParam = (ParametersWithRandom)param;
-
-                // XXX random needed?
-                this.random = rParam.getRandom();
-                this.key = (GMSSPrivateKeyParameters)rParam.getParameters();
-                initSign();
-
-            }
-            else
-            {
-
-                this.random = new SecureRandom();
-                this.key = (GMSSPrivateKeyParameters)param;
-                initSign();
-            }
-        }
-        else
-        {
-            this.key = (GMSSPublicKeyParameters)param;
-            initVerify();
-
-        }
-
-    }
-
-
-    /**
-     * Initializes the signature algorithm for signing a message.
-     */
-    private void initSign()
-    {
-        messDigestTrees.reset();
-        // set private key and take from it ots key, auth, tree and key
-        // counter, rootSign
-        GMSSPrivateKeyParameters gmssPrivateKey = (GMSSPrivateKeyParameters)key;
-
-        if (gmssPrivateKey.isUsed())
-        {
-            throw new IllegalStateException("Private key already used");
-        }
-
-        // check if last signature has been generated
-        if (gmssPrivateKey.getIndex(0) >= gmssPrivateKey.getNumLeafs(0))
-        {
-            throw new IllegalStateException("No more signatures can be generated");
-        }
-
-        // get Parameterset
-        this.gmssPS = gmssPrivateKey.getParameters();
-        // get numLayer
-        this.numLayer = gmssPS.getNumOfLayers();
-
-        // get OTS Instance of lowest layer
-        byte[] seed = gmssPrivateKey.getCurrentSeeds()[numLayer - 1];
-        byte[] OTSSeed = new byte[mdLength];
-        byte[] dummy = new byte[mdLength];
-        System.arraycopy(seed, 0, dummy, 0, mdLength);
-        OTSSeed = gmssRandom.nextSeed(dummy); // secureRandom.nextBytes(currentSeeds[currentSeeds.length-1]);secureRandom.nextBytes(OTSseed);
-        this.ots = new WinternitzOTSignature(OTSSeed, digestProvider.get(), gmssPS.getWinternitzParameter()[numLayer - 1]);
-
-        byte[][][] helpCurrentAuthPaths = gmssPrivateKey.getCurrentAuthPaths();
-        currentAuthPaths = new byte[numLayer][][];
-
-        // copy the main tree authentication path
-        for (int j = 0; j < numLayer; j++)
-        {
-            currentAuthPaths[j] = new byte[helpCurrentAuthPaths[j].length][mdLength];
-            for (int i = 0; i < helpCurrentAuthPaths[j].length; i++)
-            {
-                System.arraycopy(helpCurrentAuthPaths[j][i], 0, currentAuthPaths[j][i], 0, mdLength);
-            }
-        }
-
-        // copy index
-        index = new int[numLayer];
-        System.arraycopy(gmssPrivateKey.getIndex(), 0, index, 0, numLayer);
-
-        // copy subtreeRootSig
-        byte[] helpSubtreeRootSig;
-        subtreeRootSig = new byte[numLayer - 1][];
-        for (int i = 0; i < numLayer - 1; i++)
-        {
-            helpSubtreeRootSig = gmssPrivateKey.getSubtreeRootSig(i);
-            subtreeRootSig[i] = new byte[helpSubtreeRootSig.length];
-            System.arraycopy(helpSubtreeRootSig, 0, subtreeRootSig[i], 0, helpSubtreeRootSig.length);
-        }
-
-        gmssPrivateKey.markUsed();
-    }
-
-    /**
-     * Signs a message.
-     *
-     * @return the signature.
-     */
-    public byte[] generateSignature(byte[] message)
-    {
-
-        byte[] otsSig = new byte[mdLength];
-        byte[] authPathBytes;
-        byte[] indexBytes;
-
-        otsSig = ots.getSignature(message);
-
-        // get concatenated lowest layer tree authentication path
-        authPathBytes = gmssUtil.concatenateArray(currentAuthPaths[numLayer - 1]);
-
-        // put lowest layer index into a byte array
-        indexBytes = gmssUtil.intToBytesLittleEndian(index[numLayer - 1]);
-
-        // create first part of GMSS signature
-        byte[] gmssSigFirstPart = new byte[indexBytes.length + otsSig.length + authPathBytes.length];
-        System.arraycopy(indexBytes, 0, gmssSigFirstPart, 0, indexBytes.length);
-        System.arraycopy(otsSig, 0, gmssSigFirstPart, indexBytes.length, otsSig.length);
-        System.arraycopy(authPathBytes, 0, gmssSigFirstPart, (indexBytes.length + otsSig.length), authPathBytes.length);
-        // --- end first part
-
-        // --- next parts of the signature
-        // create initial array with length 0 for iteration
-        byte[] gmssSigNextPart = new byte[0];
-
-        for (int i = numLayer - 1 - 1; i >= 0; i--)
-        {
-
-            // get concatenated next tree authentication path
-            authPathBytes = gmssUtil.concatenateArray(currentAuthPaths[i]);
-
-            // put next tree index into a byte array
-            indexBytes = gmssUtil.intToBytesLittleEndian(index[i]);
-
-            // create next part of GMSS signature
-
-            // create help array and copy actual gmssSig into it
-            byte[] helpGmssSig = new byte[gmssSigNextPart.length];
-            System.arraycopy(gmssSigNextPart, 0, helpGmssSig, 0, gmssSigNextPart.length);
-            // adjust length of gmssSigNextPart for adding next part
-            gmssSigNextPart = new byte[helpGmssSig.length + indexBytes.length + subtreeRootSig[i].length + authPathBytes.length];
-
-            // copy old data (help array) and new data in gmssSigNextPart
-            System.arraycopy(helpGmssSig, 0, gmssSigNextPart, 0, helpGmssSig.length);
-            System.arraycopy(indexBytes, 0, gmssSigNextPart, helpGmssSig.length, indexBytes.length);
-            System.arraycopy(subtreeRootSig[i], 0, gmssSigNextPart, (helpGmssSig.length + indexBytes.length), subtreeRootSig[i].length);
-            System.arraycopy(authPathBytes, 0, gmssSigNextPart, (helpGmssSig.length + indexBytes.length + subtreeRootSig[i].length), authPathBytes.length);
-
-        }
-        // --- end next parts
-
-        // concatenate the two parts of the GMSS signature
-        byte[] gmssSig = new byte[gmssSigFirstPart.length + gmssSigNextPart.length];
-        System.arraycopy(gmssSigFirstPart, 0, gmssSig, 0, gmssSigFirstPart.length);
-        System.arraycopy(gmssSigNextPart, 0, gmssSig, gmssSigFirstPart.length, gmssSigNextPart.length);
-
-        // return the GMSS signature
-        return gmssSig;
-    }
-
-    /**
-     * Initializes the signature algorithm for verifying a signature.
-     */
-    private void initVerify()
-    {
-        messDigestTrees.reset();
-
-        GMSSPublicKeyParameters gmssPublicKey = (GMSSPublicKeyParameters)key;
-        pubKeyBytes = gmssPublicKey.getPublicKey();
-        gmssPS = gmssPublicKey.getParameters();
-        // get numLayer
-        this.numLayer = gmssPS.getNumOfLayers();
-
-
-    }
-
-    /**
-     * This function verifies the signature of the message that has been
-     * updated, with the aid of the public key.
-     *
-     * @param message the message
-     * @param signature the signature associated with the message
-     * @return true if the signature has been verified, false otherwise.
-     */
-    public boolean verifySignature(byte[] message, byte[] signature)
-    {
-
-        boolean success = false;
-        // int halfSigLength = signature.length >>> 1;
-        messDigestOTS.reset();
-        WinternitzOTSVerify otsVerify;
-        int otsSigLength;
-
-        byte[] help = message;
-
-        byte[] otsSig;
-        byte[] otsPublicKey;
-        byte[][] authPath;
-        byte[] dest;
-        int nextEntry = 0;
-        int index;
-        // Verify signature
-
-        // --- begin with message = 'message that was signed'
-        // and then in each step message = subtree root
-        for (int j = numLayer - 1; j >= 0; j--)
-        {
-            otsVerify = new WinternitzOTSVerify(digestProvider.get(), gmssPS.getWinternitzParameter()[j]);
-            otsSigLength = otsVerify.getSignatureLength();
-
-            message = help;
-            // get the subtree index
-            index = gmssUtil.bytesToIntLittleEndian(signature, nextEntry);
-
-            // 4 is the number of bytes in integer
-            nextEntry += 4;
-
-            // get one-time signature
-            otsSig = new byte[otsSigLength];
-            System.arraycopy(signature, nextEntry, otsSig, 0, otsSigLength);
-            nextEntry += otsSigLength;
-
-            // compute public OTS key from the one-time signature
-            otsPublicKey = otsVerify.Verify(message, otsSig);
-
-            // test if OTSsignature is correct
-            if (otsPublicKey == null)
-            {
-                System.err.println("OTS Public Key is null in GMSSSignature.verify");
-                return false;
-            }
-
-            // get authentication path from the signature
-            authPath = new byte[gmssPS.getHeightOfTrees()[j]][mdLength];
-            for (int i = 0; i < authPath.length; i++)
-            {
-                System.arraycopy(signature, nextEntry, authPath[i], 0, mdLength);
-                nextEntry = nextEntry + mdLength;
-            }
-
-            // compute the root of the subtree from the authentication path
-            help = new byte[mdLength];
-
-            help = otsPublicKey;
-
-            int count = 1 << authPath.length;
-            count = count + index;
-
-            for (int i = 0; i < authPath.length; i++)
-            {
-                dest = new byte[mdLength << 1];
-
-                if ((count % 2) == 0)
-                {
-                    System.arraycopy(help, 0, dest, 0, mdLength);
-                    System.arraycopy(authPath[i], 0, dest, mdLength, mdLength);
-                    count = count / 2;
-                }
-                else
-                {
-                    System.arraycopy(authPath[i], 0, dest, 0, mdLength);
-                    System.arraycopy(help, 0, dest, mdLength, help.length);
-                    count = (count - 1) / 2;
-                }
-                messDigestTrees.update(dest, 0, dest.length);
-                help = new byte[messDigestTrees.getDigestSize()];
-                messDigestTrees.doFinal(help, 0);
-            }
-        }
-
-        // now help contains the root of the maintree
-
-        // test if help is equal to the GMSS public key
-        if (Arrays.areEqual(pubKeyBytes, help))
-        {
-            success = true;
-        }
-
-        return success;
-    }
-
-
-}
\ No newline at end of file
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/gmss/GMSSUtils.java b/bcprov/src/main/java/org/bouncycastle/pqc/crypto/gmss/GMSSUtils.java
deleted file mode 100644
index 9d28951..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/gmss/GMSSUtils.java
+++ /dev/null
@@ -1,145 +0,0 @@
-package org.bouncycastle.pqc.crypto.gmss;
-
-import java.util.Enumeration;
-import java.util.Vector;
-
-import org.bouncycastle.util.Arrays;
-
-class GMSSUtils
-{
-    static GMSSLeaf[] clone(GMSSLeaf[] data)
-    {
-        if (data == null)
-        {
-            return null;
-        }
-        GMSSLeaf[] copy = new GMSSLeaf[data.length];
-
-        System.arraycopy(data, 0, copy, 0, data.length);
-
-        return copy;
-    }
-
-    static GMSSRootCalc[] clone(GMSSRootCalc[] data)
-    {
-        if (data == null)
-        {
-            return null;
-        }
-        GMSSRootCalc[] copy = new GMSSRootCalc[data.length];
-
-        System.arraycopy(data, 0, copy, 0, data.length);
-
-        return copy;
-    }
-
-    static GMSSRootSig[] clone(GMSSRootSig[] data)
-    {
-        if (data == null)
-        {
-            return null;
-        }
-        GMSSRootSig[] copy = new GMSSRootSig[data.length];
-
-        System.arraycopy(data, 0, copy, 0, data.length);
-
-        return copy;
-    }
-
-    static byte[][] clone(byte[][] data)
-    {
-        if (data == null)
-        {
-            return null;
-        }
-        byte[][] copy = new byte[data.length][];
-
-        for (int i = 0; i != data.length; i++)
-        {
-            copy[i] = Arrays.clone(data[i]);
-        }
-
-        return copy;
-    }
-
-    static byte[][][] clone(byte[][][] data)
-    {
-        if (data == null)
-        {
-            return null;
-        }
-        byte[][][] copy = new byte[data.length][][];
-
-        for (int i = 0; i != data.length; i++)
-        {
-            copy[i] = clone(data[i]);
-        }
-
-        return copy;
-    }
-
-    static Treehash[] clone(Treehash[] data)
-    {
-        if (data == null)
-        {
-            return null;
-        }
-        Treehash[] copy = new Treehash[data.length];
-
-        System.arraycopy(data, 0, copy, 0, data.length);
-
-        return copy;
-    }
-
-    static Treehash[][] clone(Treehash[][] data)
-    {
-        if (data == null)
-        {
-            return null;
-        }
-        Treehash[][] copy = new Treehash[data.length][];
-
-        for (int i = 0; i != data.length; i++)
-        {
-            copy[i] = clone(data[i]);
-        }
-
-        return copy;
-    }
-
-    static Vector[] clone(Vector[] data)
-    {
-        if (data == null)
-        {
-            return null;
-        }
-        Vector[] copy = new Vector[data.length];
-
-        for (int i = 0; i != data.length; i++)
-        {
-            copy[i] = new Vector();
-            for (Enumeration en = data[i].elements(); en.hasMoreElements();)
-            {
-                copy[i].addElement(en.nextElement());
-            }
-        }
-
-        return copy;
-    }
-
-    static Vector[][] clone(Vector[][] data)
-    {
-        if (data == null)
-        {
-            return null;
-        }
-        Vector[][] copy = new Vector[data.length][];
-
-        for (int i = 0; i != data.length; i++)
-        {
-            copy[i] = clone(data[i]);
-        }
-
-        return copy;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/gmss/Treehash.java b/bcprov/src/main/java/org/bouncycastle/pqc/crypto/gmss/Treehash.java
deleted file mode 100644
index 797355c..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/gmss/Treehash.java
+++ /dev/null
@@ -1,525 +0,0 @@
-package org.bouncycastle.pqc.crypto.gmss;
-
-import java.util.Vector;
-
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.pqc.crypto.gmss.util.GMSSRandom;
-import org.bouncycastle.util.Integers;
-import org.bouncycastle.util.encoders.Hex;
-
-
-/**
- * This class implements a treehash instance for the Merkle tree traversal
- * algorithm. The first node of the stack is stored in this instance itself,
- * additional tail nodes are stored on a tailstack.
- */
-public class Treehash
-{
-
-    /**
-     * max height of current treehash instance.
-     */
-    private int maxHeight;
-
-    /**
-     * Vector element that stores the nodes on the stack
-     */
-    private Vector tailStack;
-
-    /**
-     * Vector element that stores the height of the nodes on the stack
-     */
-    private Vector heightOfNodes;
-
-    /**
-     * the first node is stored in the treehash instance itself, not on stack
-     */
-    private byte[] firstNode;
-
-    /**
-     * seedActive needed for the actual node
-     */
-    private byte[] seedActive;
-
-    /**
-     * the seed needed for the next re-initialization of the treehash instance
-     */
-    private byte[] seedNext;
-
-    /**
-     * number of nodes stored on the stack and belonging to this treehash
-     * instance
-     */
-    private int tailLength;
-
-    /**
-     * the height in the tree of the first node stored in treehash
-     */
-    private int firstNodeHeight;
-
-    /**
-     * true if treehash instance was already initialized, false otherwise
-     */
-    private boolean isInitialized;
-
-    /**
-     * true if the first node's height equals the maxHeight of the treehash
-     */
-    private boolean isFinished;
-
-    /**
-     * true if the nextSeed has been initialized with index 3*2^h needed for the
-     * seed scheduling
-     */
-    private boolean seedInitialized;
-
-    /**
-     * denotes the Message Digest used by the tree to create nodes
-     */
-    private Digest messDigestTree;
-
-    /**
-     * This constructor regenerates a prior treehash object
-     *
-     * @param name     an array of strings, containing the name of the used hash
-     *                 function and PRNG and the name of the corresponding provider
-     * @param statByte status bytes
-     * @param statInt  status ints
-     */
-    public Treehash(Digest name, byte[][] statByte, int[] statInt)
-    {
-        this.messDigestTree = name;
-
-        // decode statInt
-        this.maxHeight = statInt[0];
-        this.tailLength = statInt[1];
-        this.firstNodeHeight = statInt[2];
-
-        if (statInt[3] == 1)
-        {
-            this.isFinished = true;
-        }
-        else
-        {
-            this.isFinished = false;
-        }
-        if (statInt[4] == 1)
-        {
-            this.isInitialized = true;
-        }
-        else
-        {
-            this.isInitialized = false;
-        }
-        if (statInt[5] == 1)
-        {
-            this.seedInitialized = true;
-        }
-        else
-        {
-            this.seedInitialized = false;
-        }
-
-        this.heightOfNodes = new Vector();
-        for (int i = 0; i < tailLength; i++)
-        {
-            this.heightOfNodes.addElement(Integers.valueOf(statInt[6 + i]));
-        }
-
-        // decode statByte
-        this.firstNode = statByte[0];
-        this.seedActive = statByte[1];
-        this.seedNext = statByte[2];
-
-        this.tailStack = new Vector();
-        for (int i = 0; i < tailLength; i++)
-        {
-            this.tailStack.addElement(statByte[3 + i]);
-        }
-    }
-
-    /**
-     * Constructor
-     *
-     * @param tailStack a vector element where the stack nodes are stored
-     * @param maxHeight maximal height of the treehash instance
-     * @param digest    an array of strings, containing the name of the used hash
-     *                  function and PRNG and the name of the corresponding provider
-     */
-    public Treehash(Vector tailStack, int maxHeight, Digest digest)
-    {
-        this.tailStack = tailStack;
-        this.maxHeight = maxHeight;
-        this.firstNode = null;
-        this.isInitialized = false;
-        this.isFinished = false;
-        this.seedInitialized = false;
-        this.messDigestTree = digest;
-
-        this.seedNext = new byte[messDigestTree.getDigestSize()];
-        this.seedActive = new byte[messDigestTree.getDigestSize()];
-    }
-
-    /**
-     * Method to initialize the seeds needed for the precomputation of right
-     * nodes. Should be initialized with index 3*2^i for treehash_i
-     *
-     * @param seedIn
-     */
-    public void initializeSeed(byte[] seedIn)
-    {
-        System.arraycopy(seedIn, 0, this.seedNext, 0, this.messDigestTree
-            .getDigestSize());
-        this.seedInitialized = true;
-    }
-
-    /**
-     * initializes the treehash instance. The seeds must already have been
-     * initialized to work correctly.
-     */
-    public void initialize()
-    {
-        if (!this.seedInitialized)
-        {
-            System.err.println("Seed " + this.maxHeight + " not initialized");
-            return;
-        }
-
-        this.heightOfNodes = new Vector();
-        this.tailLength = 0;
-        this.firstNode = null;
-        this.firstNodeHeight = -1;
-        this.isInitialized = true;
-        System.arraycopy(this.seedNext, 0, this.seedActive, 0, messDigestTree
-            .getDigestSize());
-    }
-
-    /**
-     * Calculates one update of the treehash instance, i.e. creates a new leaf
-     * and hashes if possible
-     *
-     * @param gmssRandom an instance of the PRNG
-     * @param leaf       The byte value of the leaf needed for the update
-     */
-    public void update(GMSSRandom gmssRandom, byte[] leaf)
-    {
-
-        if (this.isFinished)
-        {
-            System.err
-                .println("No more update possible for treehash instance!");
-            return;
-        }
-        if (!this.isInitialized)
-        {
-            System.err
-                .println("Treehash instance not initialized before update");
-            return;
-        }
-
-        byte[] help = new byte[this.messDigestTree.getDigestSize()];
-        int helpHeight = -1;
-
-        gmssRandom.nextSeed(this.seedActive);
-
-        // if treehash gets first update
-        if (this.firstNode == null)
-        {
-            this.firstNode = leaf;
-            this.firstNodeHeight = 0;
-        }
-        else
-        {
-            // store the new node in help array, do not push it on the stack
-            help = leaf;
-            helpHeight = 0;
-
-            // hash the nodes on the stack if possible
-            while (this.tailLength > 0
-                && helpHeight == ((Integer)heightOfNodes.lastElement())
-                .intValue())
-            {
-                // put top element of the stack and help node in array
-                // 'tobehashed'
-                // and hash them together, put result again in help array
-                byte[] toBeHashed = new byte[this.messDigestTree
-                    .getDigestSize() << 1];
-
-                // pop element from stack
-                System.arraycopy(this.tailStack.lastElement(), 0, toBeHashed,
-                    0, this.messDigestTree.getDigestSize());
-                this.tailStack.removeElementAt(this.tailStack.size() - 1);
-                this.heightOfNodes
-                    .removeElementAt(this.heightOfNodes.size() - 1);
-
-                System.arraycopy(help, 0, toBeHashed, this.messDigestTree
-                    .getDigestSize(), this.messDigestTree
-                    .getDigestSize());
-                messDigestTree.update(toBeHashed, 0, toBeHashed.length);
-                help = new byte[messDigestTree.getDigestSize()];
-                messDigestTree.doFinal(help, 0);
-
-                // increase help height, stack was reduced by one element
-                helpHeight++;
-                this.tailLength--;
-            }
-
-            // push the new node on the stack
-            this.tailStack.addElement(help);
-            this.heightOfNodes.addElement(Integers.valueOf(helpHeight));
-            this.tailLength++;
-
-            // finally check whether the top node on stack and the first node
-            // in treehash have same height. If so hash them together
-            // and store them in treehash
-            if (((Integer)heightOfNodes.lastElement()).intValue() == this.firstNodeHeight)
-            {
-                byte[] toBeHashed = new byte[this.messDigestTree
-                    .getDigestSize() << 1];
-                System.arraycopy(this.firstNode, 0, toBeHashed, 0,
-                    this.messDigestTree.getDigestSize());
-
-                // pop element from tailStack and copy it into help2 array
-                System.arraycopy(this.tailStack.lastElement(), 0, toBeHashed,
-                    this.messDigestTree.getDigestSize(),
-                    this.messDigestTree.getDigestSize());
-                this.tailStack.removeElementAt(this.tailStack.size() - 1);
-                this.heightOfNodes
-                    .removeElementAt(this.heightOfNodes.size() - 1);
-
-                // store new element in firstNode, stack is then empty
-                messDigestTree.update(toBeHashed, 0, toBeHashed.length);
-                this.firstNode = new byte[messDigestTree.getDigestSize()];
-                messDigestTree.doFinal(this.firstNode, 0);
-                this.firstNodeHeight++;
-
-                // empty the stack
-                this.tailLength = 0;
-            }
-        }
-
-        // check if treehash instance is completed
-        if (this.firstNodeHeight == this.maxHeight)
-        {
-            this.isFinished = true;
-        }
-    }
-
-    /**
-     * Destroys a treehash instance after the top node was taken for
-     * authentication path.
-     */
-    public void destroy()
-    {
-        this.isInitialized = false;
-        this.isFinished = false;
-        this.firstNode = null;
-        this.tailLength = 0;
-        this.firstNodeHeight = -1;
-    }
-
-    /**
-     * Returns the height of the lowest node stored either in treehash or on the
-     * stack. It must not be set to infinity (as mentioned in the paper) because
-     * this cases are considered in the computeAuthPaths method of
-     * JDKGMSSPrivateKey
-     *
-     * @return Height of the lowest node
-     */
-    public int getLowestNodeHeight()
-    {
-        if (this.firstNode == null)
-        {
-            return this.maxHeight;
-        }
-        else if (this.tailLength == 0)
-        {
-            return this.firstNodeHeight;
-        }
-        else
-        {
-            return Math.min(this.firstNodeHeight, ((Integer)heightOfNodes
-                .lastElement()).intValue());
-        }
-    }
-
-    /**
-     * Returns the top node height
-     *
-     * @return Height of the first node, the top node
-     */
-    public int getFirstNodeHeight()
-    {
-        if (firstNode == null)
-        {
-            return maxHeight;
-        }
-        return firstNodeHeight;
-    }
-
-    /**
-     * Method to check whether the instance has been initialized or not
-     *
-     * @return true if treehash was already initialized
-     */
-    public boolean wasInitialized()
-    {
-        return this.isInitialized;
-    }
-
-    /**
-     * Method to check whether the instance has been finished or not
-     *
-     * @return true if treehash has reached its maximum height
-     */
-    public boolean wasFinished()
-    {
-        return this.isFinished;
-    }
-
-    /**
-     * returns the first node stored in treehash instance itself
-     *
-     * @return the first node stored in treehash instance itself
-     */
-    public byte[] getFirstNode()
-    {
-        return this.firstNode;
-    }
-
-    /**
-     * returns the active seed
-     *
-     * @return the active seed
-     */
-    public byte[] getSeedActive()
-    {
-        return this.seedActive;
-    }
-
-    /**
-     * This method sets the first node stored in the treehash instance itself
-     *
-     * @param hash
-     */
-    public void setFirstNode(byte[] hash)
-    {
-        if (!this.isInitialized)
-        {
-            this.initialize();
-        }
-        this.firstNode = hash;
-        this.firstNodeHeight = this.maxHeight;
-        this.isFinished = true;
-    }
-
-    /**
-     * updates the nextSeed of this treehash instance one step needed for the
-     * schedulng of the seeds
-     *
-     * @param gmssRandom the prng used for the seeds
-     */
-    public void updateNextSeed(GMSSRandom gmssRandom)
-    {
-        gmssRandom.nextSeed(seedNext);
-    }
-
-    /**
-     * Returns the tailstack
-     *
-     * @return the tailstack
-     */
-    public Vector getTailStack()
-    {
-        return this.tailStack;
-    }
-
-    /**
-     * Returns the status byte array used by the GMSSPrivateKeyASN.1 class
-     *
-     * @return The status bytes
-     */
-    public byte[][] getStatByte()
-    {
-
-        byte[][] statByte = new byte[3 + tailLength][this.messDigestTree
-            .getDigestSize()];
-        statByte[0] = firstNode;
-        statByte[1] = seedActive;
-        statByte[2] = seedNext;
-        for (int i = 0; i < tailLength; i++)
-        {
-            statByte[3 + i] = (byte[])tailStack.elementAt(i);
-        }
-        return statByte;
-    }
-
-    /**
-     * Returns the status int array used by the GMSSPrivateKeyASN.1 class
-     *
-     * @return The status ints
-     */
-    public int[] getStatInt()
-    {
-
-        int[] statInt = new int[6 + tailLength];
-        statInt[0] = maxHeight;
-        statInt[1] = tailLength;
-        statInt[2] = firstNodeHeight;
-        if (this.isFinished)
-        {
-            statInt[3] = 1;
-        }
-        else
-        {
-            statInt[3] = 0;
-        }
-        if (this.isInitialized)
-        {
-            statInt[4] = 1;
-        }
-        else
-        {
-            statInt[4] = 0;
-        }
-        if (this.seedInitialized)
-        {
-            statInt[5] = 1;
-        }
-        else
-        {
-            statInt[5] = 0;
-        }
-        for (int i = 0; i < tailLength; i++)
-        {
-            statInt[6 + i] = ((Integer)heightOfNodes.elementAt(i)).intValue();
-        }
-        return statInt;
-    }
-
-    /**
-     * returns a String representation of the treehash instance
-     */
-    public String toString()
-    {
-        String out = "Treehash    : ";
-        for (int i = 0; i < 6 + tailLength; i++)
-        {
-            out = out + this.getStatInt()[i] + " ";
-        }
-        for (int i = 0; i < 3 + tailLength; i++)
-        {
-            if (this.getStatByte()[i] != null)
-            {
-                out = out + new String(Hex.encode((this.getStatByte()[i]))) + " ";
-            }
-            else
-            {
-                out = out + "null ";
-            }
-        }
-        out = out + "  " + this.messDigestTree.getDigestSize();
-        return out;
-    }
-
-}
\ No newline at end of file
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/gmss/util/GMSSRandom.java b/bcprov/src/main/java/org/bouncycastle/pqc/crypto/gmss/util/GMSSRandom.java
deleted file mode 100644
index c6d3022..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/gmss/util/GMSSRandom.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package org.bouncycastle.pqc.crypto.gmss.util;
-
-import org.bouncycastle.crypto.Digest;
-
-/**
- * This class provides a PRNG for GMSS
- */
-public class GMSSRandom
-{
-    /**
-     * Hash function for the construction of the authentication trees
-     */
-    private Digest messDigestTree;
-
-    /**
-     * Constructor
-     *
-     * @param messDigestTree2
-     */
-    public GMSSRandom(Digest messDigestTree2)
-    {
-
-        this.messDigestTree = messDigestTree2;
-    }
-
-    /**
-     * computes the next seed value, returns a random byte array and sets
-     * outseed to the next value
-     *
-     * @param outseed byte array in which ((1 + SEEDin +RAND) mod 2^n) will be
-     *                stored
-     * @return byte array of H(SEEDin)
-     */
-    public byte[] nextSeed(byte[] outseed)
-    {
-        // RAND <-- H(SEEDin)
-        byte[] rand = new byte[outseed.length];
-        messDigestTree.update(outseed, 0, outseed.length);
-        rand = new byte[messDigestTree.getDigestSize()];
-        messDigestTree.doFinal(rand, 0);
-
-        // SEEDout <-- (1 + SEEDin +RAND) mod 2^n
-        addByteArrays(outseed, rand);
-        addOne(outseed);
-
-        // System.arraycopy(outseed, 0, outseed, 0, outseed.length);
-
-        return rand;
-    }
-
-    private void addByteArrays(byte[] a, byte[] b)
-    {
-
-        byte overflow = 0;
-        int temp;
-
-        for (int i = 0; i < a.length; i++)
-        {
-            temp = (0xFF & a[i]) + (0xFF & b[i]) + overflow;
-            a[i] = (byte)temp;
-            overflow = (byte)(temp >> 8);
-        }
-    }
-
-    private void addOne(byte[] a)
-    {
-
-        byte overflow = 1;
-        int temp;
-
-        for (int i = 0; i < a.length; i++)
-        {
-            temp = (0xFF & a[i]) + overflow;
-            a[i] = (byte)temp;
-            overflow = (byte)(temp >> 8);
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/gmss/util/GMSSUtil.java b/bcprov/src/main/java/org/bouncycastle/pqc/crypto/gmss/util/GMSSUtil.java
deleted file mode 100644
index 80f8828..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/gmss/util/GMSSUtil.java
+++ /dev/null
@@ -1,151 +0,0 @@
-package org.bouncycastle.pqc.crypto.gmss.util;
-
-/**
- * This class provides several methods that are required by the GMSS classes.
- */
-public class GMSSUtil
-{
-    /**
-     * Converts a 32 bit integer into a byte array beginning at
-     * <code>offset</code> (little-endian representation)
-     *
-     * @param value the integer to convert
-     */
-    public byte[] intToBytesLittleEndian(int value)
-    {
-        byte[] bytes = new byte[4];
-
-        bytes[0] = (byte)((value) & 0xff);
-        bytes[1] = (byte)((value >> 8) & 0xff);
-        bytes[2] = (byte)((value >> 16) & 0xff);
-        bytes[3] = (byte)((value >> 24) & 0xff);
-        return bytes;
-    }
-
-    /**
-     * Converts a byte array beginning at <code>offset</code> into a 32 bit
-     * integer (little-endian representation)
-     *
-     * @param bytes the byte array
-     * @return The resulting integer
-     */
-    public int bytesToIntLittleEndian(byte[] bytes)
-    {
-
-        return ((bytes[0] & 0xff)) | ((bytes[1] & 0xff) << 8)
-            | ((bytes[2] & 0xff) << 16) | ((bytes[3] & 0xff)) << 24;
-    }
-
-    /**
-     * Converts a byte array beginning at <code>offset</code> into a 32 bit
-     * integer (little-endian representation)
-     *
-     * @param bytes  the byte array
-     * @param offset the integer offset into the byte array
-     * @return The resulting integer
-     */
-    public int bytesToIntLittleEndian(byte[] bytes, int offset)
-    {
-        return ((bytes[offset++] & 0xff)) | ((bytes[offset++] & 0xff) << 8)
-            | ((bytes[offset++] & 0xff) << 16)
-            | ((bytes[offset] & 0xff)) << 24;
-    }
-
-    /**
-     * This method concatenates a 2-dimensional byte array into a 1-dimensional
-     * byte array
-     *
-     * @param arraycp a 2-dimensional byte array.
-     * @return 1-dimensional byte array with concatenated input array
-     */
-    public byte[] concatenateArray(byte[][] arraycp)
-    {
-        byte[] dest = new byte[arraycp.length * arraycp[0].length];
-        int indx = 0;
-        for (int i = 0; i < arraycp.length; i++)
-        {
-            System.arraycopy(arraycp[i], 0, dest, indx, arraycp[i].length);
-            indx = indx + arraycp[i].length;
-        }
-        return dest;
-    }
-
-    /**
-     * This method prints the values of a 2-dimensional byte array
-     *
-     * @param text  a String
-     * @param array a 2-dimensional byte array
-     */
-    public void printArray(String text, byte[][] array)
-    {
-        System.out.println(text);
-        int counter = 0;
-        for (int i = 0; i < array.length; i++)
-        {
-            for (int j = 0; j < array[0].length; j++)
-            {
-                System.out.println(counter + "; " + array[i][j]);
-                counter++;
-            }
-        }
-    }
-
-    /**
-     * This method prints the values of a 1-dimensional byte array
-     *
-     * @param text  a String
-     * @param array a 1-dimensional byte array.
-     */
-    public void printArray(String text, byte[] array)
-    {
-        System.out.println(text);
-        int counter = 0;
-        for (int i = 0; i < array.length; i++)
-        {
-            System.out.println(counter + "; " + array[i]);
-            counter++;
-        }
-    }
-
-    /**
-     * This method tests if an integer is a power of 2.
-     *
-     * @param testValue an integer
-     * @return <code>TRUE</code> if <code>testValue</code> is a power of 2,
-     *         <code>FALSE</code> otherwise
-     */
-    public boolean testPowerOfTwo(int testValue)
-    {
-        int a = 1;
-        while (a < testValue)
-        {
-            a <<= 1;
-        }
-        if (testValue == a)
-        {
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * This method returns the least integer that is greater or equal to the
-     * logarithm to the base 2 of an integer <code>intValue</code>.
-     *
-     * @param intValue an integer
-     * @return The least integer greater or equal to the logarithm to the base 2
-     *         of <code>intValue</code>
-     */
-    public int getLog(int intValue)
-    {
-        int log = 1;
-        int i = 2;
-        while (i < intValue)
-        {
-            i <<= 1;
-            log++;
-        }
-        return log;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/gmss/util/WinternitzOTSVerify.java b/bcprov/src/main/java/org/bouncycastle/pqc/crypto/gmss/util/WinternitzOTSVerify.java
deleted file mode 100644
index d012ce7..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/gmss/util/WinternitzOTSVerify.java
+++ /dev/null
@@ -1,344 +0,0 @@
-package org.bouncycastle.pqc.crypto.gmss.util;
-
-import org.bouncycastle.crypto.Digest;
-
-/**
- * This class implements signature verification of the Winternitz one-time
- * signature scheme (OTSS), described in C.Dods, N.P. Smart, and M. Stam, "Hash
- * Based Digital Signature Schemes", LNCS 3796, pages 96&#8211;115, 2005. The
- * class is used by the GMSS classes.
- */
-public class WinternitzOTSVerify
-{
-
-    private Digest messDigestOTS;
-
-    /**
-     * The Winternitz parameter
-     */
-    private int w;
-
-    /**
-     * The constructor
-     *
-     * @param digest the name of the hash function used by the OTS and the provider
-     *               name of the hash function
-     * @param w      the Winternitz parameter
-     */
-    public WinternitzOTSVerify(Digest digest, int w)
-    {
-        this.w = w;
-
-        messDigestOTS = digest;
-    }
-
-    /**
-     * @return The length of the one-time signature
-     */
-    public int getSignatureLength()
-    {
-        int mdsize = messDigestOTS.getDigestSize();
-        int size = ((mdsize << 3) + (w - 1)) / w;
-        int logs = getLog((size << w) + 1);
-        size += (logs + w - 1) / w;
-
-        return mdsize * size;
-    }
-
-    /**
-     * This method computes the public OTS key from the one-time signature of a
-     * message. This is *NOT* a complete OTS signature verification, but it
-     * suffices for usage with CMSS.
-     *
-     * @param message   the message
-     * @param signature the one-time signature
-     * @return The public OTS key
-     */
-    public byte[] Verify(byte[] message, byte[] signature)
-    {
-
-        int mdsize = messDigestOTS.getDigestSize();
-        byte[] hash = new byte[mdsize]; // hash of message m
-
-        // create hash of message m
-        messDigestOTS.update(message, 0, message.length);
-        hash = new byte[messDigestOTS.getDigestSize()];
-        messDigestOTS.doFinal(hash, 0);
-
-        int size = ((mdsize << 3) + (w - 1)) / w;
-        int logs = getLog((size << w) + 1);
-        int keysize = size + (logs + w - 1) / w;
-
-        int testKeySize = mdsize * keysize;
-
-        if (testKeySize != signature.length)
-        {
-            return null;
-        }
-
-        byte[] testKey = new byte[testKeySize];
-
-        int c = 0;
-        int counter = 0;
-        int test;
-
-        if (8 % w == 0)
-        {
-            int d = 8 / w;
-            int k = (1 << w) - 1;
-            byte[] hlp = new byte[mdsize];
-
-            // verify signature
-            for (int i = 0; i < hash.length; i++)
-            {
-                for (int j = 0; j < d; j++)
-                {
-                    test = hash[i] & k;
-                    c += test;
-
-                    System.arraycopy(signature, counter * mdsize, hlp, 0, mdsize);
-
-                    while (test < k)
-                    {
-                        messDigestOTS.update(hlp, 0, hlp.length);
-                        hlp = new byte[messDigestOTS.getDigestSize()];
-                        messDigestOTS.doFinal(hlp, 0);
-                        test++;
-                    }
-
-                    System.arraycopy(hlp, 0, testKey, counter * mdsize, mdsize);
-                    hash[i] = (byte)(hash[i] >>> w);
-                    counter++;
-                }
-            }
-
-            c = (size << w) - c;
-            for (int i = 0; i < logs; i += w)
-            {
-                test = c & k;
-
-                System.arraycopy(signature, counter * mdsize, hlp, 0, mdsize);
-
-                while (test < k)
-                {
-                    messDigestOTS.update(hlp, 0, hlp.length);
-                    hlp = new byte[messDigestOTS.getDigestSize()];
-                    messDigestOTS.doFinal(hlp, 0);
-                    test++;
-                }
-                System.arraycopy(hlp, 0, testKey, counter * mdsize, mdsize);
-                c >>>= w;
-                counter++;
-            }
-        }
-        else if (w < 8)
-        {
-            int d = mdsize / w;
-            int k = (1 << w) - 1;
-            byte[] hlp = new byte[mdsize];
-            long big8;
-            int ii = 0;
-            // create signature
-            // first d*w bytes of hash
-            for (int i = 0; i < d; i++)
-            {
-                big8 = 0;
-                for (int j = 0; j < w; j++)
-                {
-                    big8 ^= (hash[ii] & 0xff) << (j << 3);
-                    ii++;
-                }
-                for (int j = 0; j < 8; j++)
-                {
-                    test = (int)(big8 & k);
-                    c += test;
-
-                    System.arraycopy(signature, counter * mdsize, hlp, 0, mdsize);
-
-                    while (test < k)
-                    {
-                        messDigestOTS.update(hlp, 0, hlp.length);
-                        hlp = new byte[messDigestOTS.getDigestSize()];
-                        messDigestOTS.doFinal(hlp, 0);
-                        test++;
-                    }
-
-                    System.arraycopy(hlp, 0, testKey, counter * mdsize, mdsize);
-                    big8 >>>= w;
-                    counter++;
-                }
-            }
-            // rest of hash
-            d = mdsize % w;
-            big8 = 0;
-            for (int j = 0; j < d; j++)
-            {
-                big8 ^= (hash[ii] & 0xff) << (j << 3);
-                ii++;
-            }
-            d <<= 3;
-            for (int j = 0; j < d; j += w)
-            {
-                test = (int)(big8 & k);
-                c += test;
-
-                System.arraycopy(signature, counter * mdsize, hlp, 0, mdsize);
-
-                while (test < k)
-                {
-                    messDigestOTS.update(hlp, 0, hlp.length);
-                    hlp = new byte[messDigestOTS.getDigestSize()];
-                    messDigestOTS.doFinal(hlp, 0);
-                    test++;
-                }
-
-                System.arraycopy(hlp, 0, testKey, counter * mdsize, mdsize);
-                big8 >>>= w;
-                counter++;
-            }
-
-            // check bytes
-            c = (size << w) - c;
-            for (int i = 0; i < logs; i += w)
-            {
-                test = c & k;
-
-                System.arraycopy(signature, counter * mdsize, hlp, 0, mdsize);
-
-                while (test < k)
-                {
-                    messDigestOTS.update(hlp, 0, hlp.length);
-                    hlp = new byte[messDigestOTS.getDigestSize()];
-                    messDigestOTS.doFinal(hlp, 0);
-                    test++;
-                }
-
-                System.arraycopy(hlp, 0, testKey, counter * mdsize, mdsize);
-                c >>>= w;
-                counter++;
-            }
-        }// end if(w<8)
-        else if (w < 57)
-        {
-            int d = (mdsize << 3) - w;
-            int k = (1 << w) - 1;
-            byte[] hlp = new byte[mdsize];
-            long big8, test8;
-            int r = 0;
-            int s, f, rest, ii;
-            // create signature
-            // first a*w bits of hash where a*w <= 8*mdsize < (a+1)*w
-            while (r <= d)
-            {
-                s = r >>> 3;
-                rest = r % 8;
-                r += w;
-                f = (r + 7) >>> 3;
-                big8 = 0;
-                ii = 0;
-                for (int j = s; j < f; j++)
-                {
-                    big8 ^= (hash[j] & 0xff) << (ii << 3);
-                    ii++;
-                }
-
-                big8 >>>= rest;
-                test8 = (big8 & k);
-                c += test8;
-
-                System.arraycopy(signature, counter * mdsize, hlp, 0, mdsize);
-
-                while (test8 < k)
-                {
-                    messDigestOTS.update(hlp, 0, hlp.length);
-                    hlp = new byte[messDigestOTS.getDigestSize()];
-                    messDigestOTS.doFinal(hlp, 0);
-                    test8++;
-                }
-
-                System.arraycopy(hlp, 0, testKey, counter * mdsize, mdsize);
-                counter++;
-
-            }
-            // rest of hash
-            s = r >>> 3;
-            if (s < mdsize)
-            {
-                rest = r % 8;
-                big8 = 0;
-                ii = 0;
-                for (int j = s; j < mdsize; j++)
-                {
-                    big8 ^= (hash[j] & 0xff) << (ii << 3);
-                    ii++;
-                }
-
-                big8 >>>= rest;
-                test8 = (big8 & k);
-                c += test8;
-
-                System.arraycopy(signature, counter * mdsize, hlp, 0, mdsize);
-
-                while (test8 < k)
-                {
-                    messDigestOTS.update(hlp, 0, hlp.length);
-                    hlp = new byte[messDigestOTS.getDigestSize()];
-                    messDigestOTS.doFinal(hlp, 0);
-                    test8++;
-                }
-
-                System.arraycopy(hlp, 0, testKey, counter * mdsize, mdsize);
-                counter++;
-            }
-            // check bytes
-            c = (size << w) - c;
-            for (int i = 0; i < logs; i += w)
-            {
-                test8 = (c & k);
-
-                System.arraycopy(signature, counter * mdsize, hlp, 0, mdsize);
-
-                while (test8 < k)
-                {
-                    messDigestOTS.update(hlp, 0, hlp.length);
-                    hlp = new byte[messDigestOTS.getDigestSize()];
-                    messDigestOTS.doFinal(hlp, 0);
-                    test8++;
-                }
-
-                System.arraycopy(hlp, 0, testKey, counter * mdsize, mdsize);
-                c >>>= w;
-                counter++;
-            }
-        }// end if(w<57)
-
-        byte[] TKey = new byte[mdsize];
-        messDigestOTS.update(testKey, 0, testKey.length);
-        TKey = new byte[messDigestOTS.getDigestSize()];
-        messDigestOTS.doFinal(TKey, 0);
-
-        return TKey;
-
-    }
-
-    /**
-     * This method returns the least integer that is greater or equal to the
-     * logarithm to the base 2 of an integer <code>intValue</code>.
-     *
-     * @param intValue an integer
-     * @return The least integer greater or equal to the logarithm to the base
-     *         256 of <code>intValue</code>
-     */
-    public int getLog(int intValue)
-    {
-        int log = 1;
-        int i = 2;
-        while (i < intValue)
-        {
-            i <<= 1;
-            log++;
-        }
-        return log;
-    }
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/gmss/util/WinternitzOTSignature.java b/bcprov/src/main/java/org/bouncycastle/pqc/crypto/gmss/util/WinternitzOTSignature.java
deleted file mode 100644
index 23bf3fa..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/gmss/util/WinternitzOTSignature.java
+++ /dev/null
@@ -1,404 +0,0 @@
-package org.bouncycastle.pqc.crypto.gmss.util;
-
-import org.bouncycastle.crypto.Digest;
-
-/**
- * This class implements key pair generation and signature generation of the
- * Winternitz one-time signature scheme (OTSS), described in C.Dods, N.P. Smart,
- * and M. Stam, "Hash Based Digital Signature Schemes", LNCS 3796, pages
- * 96&#8211;115, 2005. The class is used by the GMSS classes.
- */
-
-public class WinternitzOTSignature
-{
-
-    /**
-     * The hash function used by the OTS
-     */
-    private Digest messDigestOTS;
-
-    /**
-     * The length of the message digest and private key
-     */
-    private int mdsize, keysize;
-
-    /**
-     * An array of strings, containing the name of the used hash function, the
-     * name of the PRGN and the names of the corresponding providers
-     */
-    // private String[] name = new String[2];
-    /**
-     * The private key
-     */
-    private byte[][] privateKeyOTS;
-
-    /**
-     * The Winternitz parameter
-     */
-    private int w;
-
-    /**
-     * The source of randomness for OTS private key generation
-     */
-    private GMSSRandom gmssRandom;
-
-    /**
-     * Sizes of the message and the checksum, both
-     */
-    private int messagesize, checksumsize;
-
-    /**
-     * The constructor generates an OTS key pair, using <code>seed0</code> and
-     * the PRNG
-     *
-     * @param seed0    the seed for the PRGN
-     * @param digest an array of strings, containing the name of the used hash
-     *                 function, the name of the PRGN and the names of the
-     *                 corresponding providers
-     * @param w        the Winternitz parameter
-     */
-    public WinternitzOTSignature(byte[] seed0, Digest digest, int w)
-    {
-        // this.name = name;
-        this.w = w;
-
-        messDigestOTS = digest;
-
-        gmssRandom = new GMSSRandom(messDigestOTS);
-
-        // calulate keysize for private and public key and also the help
-        // array
-
-        mdsize = messDigestOTS.getDigestSize();
-        int mdsizeBit = mdsize << 3;
-        messagesize = (int)Math.ceil((double)(mdsizeBit) / (double)w);
-
-        checksumsize = getLog((messagesize << w) + 1);
-
-        keysize = messagesize
-            + (int)Math.ceil((double)checksumsize / (double)w);
-
-        /*
-           * mdsize = messDigestOTS.getDigestLength(); messagesize =
-           * ((mdsize<<3)+(w-1))/w;
-           *
-           * checksumsize = getlog((messagesize<<w)+1);
-           *
-           * keysize = messagesize + (checksumsize+w-1)/w;
-           */
-        // define the private key messagesize
-        privateKeyOTS = new byte[keysize][mdsize];
-
-        // gmssRandom.setSeed(seed0);
-        byte[] dummy = new byte[mdsize];
-        System.arraycopy(seed0, 0, dummy, 0, dummy.length);
-
-        // generate random bytes and
-        // assign them to the private key
-        for (int i = 0; i < keysize; i++)
-        {
-            privateKeyOTS[i] = gmssRandom.nextSeed(dummy);
-        }
-    }
-
-    /**
-     * @return The private OTS key
-     */
-    public byte[][] getPrivateKey()
-    {
-        return privateKeyOTS;
-    }
-
-    /**
-     * @return The public OTS key
-     */
-    public byte[] getPublicKey()
-    {
-        byte[] helppubKey = new byte[keysize * mdsize];
-
-        byte[] help = new byte[mdsize];
-        int two_power_t = 1 << w;
-
-        for (int i = 0; i < keysize; i++)
-        {
-            // hash w-1 time the private key and assign it to the public key
-            messDigestOTS.update(privateKeyOTS[i], 0, privateKeyOTS[i].length);
-            help = new byte[messDigestOTS.getDigestSize()];
-            messDigestOTS.doFinal(help, 0);
-            for (int j = 2; j < two_power_t; j++)
-            {
-                messDigestOTS.update(help, 0, help.length);
-                help = new byte[messDigestOTS.getDigestSize()];
-                messDigestOTS.doFinal(help, 0);
-            }
-            System.arraycopy(help, 0, helppubKey, mdsize * i, mdsize);
-        }
-
-        messDigestOTS.update(helppubKey, 0, helppubKey.length);
-        byte[] tmp = new byte[messDigestOTS.getDigestSize()];
-        messDigestOTS.doFinal(tmp, 0);
-        return tmp;
-    }
-
-    /**
-     * @return The one-time signature of the message, generated with the private
-     *         key
-     */
-    public byte[] getSignature(byte[] message)
-    {
-        byte[] sign = new byte[keysize * mdsize];
-        // byte [] message; // message m as input
-        byte[] hash = new byte[mdsize]; // hash of message m
-        int counter = 0;
-        int c = 0;
-        int test = 0;
-        // create hash of message m
-        messDigestOTS.update(message, 0, message.length);
-        hash = new byte[messDigestOTS.getDigestSize()];
-        messDigestOTS.doFinal(hash, 0);
-
-        if (8 % w == 0)
-        {
-            int d = 8 / w;
-            int k = (1 << w) - 1;
-            byte[] hlp = new byte[mdsize];
-
-            // create signature
-            for (int i = 0; i < hash.length; i++)
-            {
-                for (int j = 0; j < d; j++)
-                {
-                    test = hash[i] & k;
-                    c += test;
-
-                    System.arraycopy(privateKeyOTS[counter], 0, hlp, 0, mdsize);
-
-                    while (test > 0)
-                    {
-                        messDigestOTS.update(hlp, 0, hlp.length);
-                        hlp = new byte[messDigestOTS.getDigestSize()];
-                        messDigestOTS.doFinal(hlp, 0);
-                        test--;
-                    }
-                    System.arraycopy(hlp, 0, sign, counter * mdsize, mdsize);
-                    hash[i] = (byte)(hash[i] >>> w);
-                    counter++;
-                }
-            }
-
-            c = (messagesize << w) - c;
-            for (int i = 0; i < checksumsize; i += w)
-            {
-                test = c & k;
-
-                System.arraycopy(privateKeyOTS[counter], 0, hlp, 0, mdsize);
-
-                while (test > 0)
-                {
-                    messDigestOTS.update(hlp, 0, hlp.length);
-                    hlp = new byte[messDigestOTS.getDigestSize()];
-                    messDigestOTS.doFinal(hlp, 0);
-                    test--;
-                }
-                System.arraycopy(hlp, 0, sign, counter * mdsize, mdsize);
-                c >>>= w;
-                counter++;
-            }
-        }
-        else if (w < 8)
-        {
-            int d = mdsize / w;
-            int k = (1 << w) - 1;
-            byte[] hlp = new byte[mdsize];
-            long big8;
-            int ii = 0;
-            // create signature
-            // first d*w bytes of hash
-            for (int i = 0; i < d; i++)
-            {
-                big8 = 0;
-                for (int j = 0; j < w; j++)
-                {
-                    big8 ^= (hash[ii] & 0xff) << (j << 3);
-                    ii++;
-                }
-                for (int j = 0; j < 8; j++)
-                {
-                    test = (int)(big8 & k);
-                    c += test;
-
-                    System.arraycopy(privateKeyOTS[counter], 0, hlp, 0, mdsize);
-
-                    while (test > 0)
-                    {
-                        messDigestOTS.update(hlp, 0, hlp.length);
-                        hlp = new byte[messDigestOTS.getDigestSize()];
-                        messDigestOTS.doFinal(hlp, 0);
-                        test--;
-                    }
-                    System.arraycopy(hlp, 0, sign, counter * mdsize, mdsize);
-                    big8 >>>= w;
-                    counter++;
-                }
-            }
-            // rest of hash
-            d = mdsize % w;
-            big8 = 0;
-            for (int j = 0; j < d; j++)
-            {
-                big8 ^= (hash[ii] & 0xff) << (j << 3);
-                ii++;
-            }
-            d <<= 3;
-            for (int j = 0; j < d; j += w)
-            {
-                test = (int)(big8 & k);
-                c += test;
-
-                System.arraycopy(privateKeyOTS[counter], 0, hlp, 0, mdsize);
-
-                while (test > 0)
-                {
-                    messDigestOTS.update(hlp, 0, hlp.length);
-                    hlp = new byte[messDigestOTS.getDigestSize()];
-                    messDigestOTS.doFinal(hlp, 0);
-                    test--;
-                }
-                System.arraycopy(hlp, 0, sign, counter * mdsize, mdsize);
-                big8 >>>= w;
-                counter++;
-            }
-
-            // check bytes
-            c = (messagesize << w) - c;
-            for (int i = 0; i < checksumsize; i += w)
-            {
-                test = c & k;
-
-                System.arraycopy(privateKeyOTS[counter], 0, hlp, 0, mdsize);
-
-                while (test > 0)
-                {
-                    messDigestOTS.update(hlp, 0, hlp.length);
-                    hlp = new byte[messDigestOTS.getDigestSize()];
-                    messDigestOTS.doFinal(hlp, 0);
-                    test--;
-                }
-                System.arraycopy(hlp, 0, sign, counter * mdsize, mdsize);
-                c >>>= w;
-                counter++;
-            }
-        }// end if(w<8)
-        else if (w < 57)
-        {
-            int d = (mdsize << 3) - w;
-            int k = (1 << w) - 1;
-            byte[] hlp = new byte[mdsize];
-            long big8, test8;
-            int r = 0;
-            int s, f, rest, ii;
-            // create signature
-            // first a*w bits of hash where a*w <= 8*mdsize < (a+1)*w
-            while (r <= d)
-            {
-                s = r >>> 3;
-                rest = r % 8;
-                r += w;
-                f = (r + 7) >>> 3;
-                big8 = 0;
-                ii = 0;
-                for (int j = s; j < f; j++)
-                {
-                    big8 ^= (hash[j] & 0xff) << (ii << 3);
-                    ii++;
-                }
-
-                big8 >>>= rest;
-                test8 = (big8 & k);
-                c += test8;
-
-                System.arraycopy(privateKeyOTS[counter], 0, hlp, 0, mdsize);
-                while (test8 > 0)
-                {
-                    messDigestOTS.update(hlp, 0, hlp.length);
-                    hlp = new byte[messDigestOTS.getDigestSize()];
-                    messDigestOTS.doFinal(hlp, 0);
-                    test8--;
-                }
-                System.arraycopy(hlp, 0, sign, counter * mdsize, mdsize);
-                counter++;
-
-            }
-            // rest of hash
-            s = r >>> 3;
-            if (s < mdsize)
-            {
-                rest = r % 8;
-                big8 = 0;
-                ii = 0;
-                for (int j = s; j < mdsize; j++)
-                {
-                    big8 ^= (hash[j] & 0xff) << (ii << 3);
-                    ii++;
-                }
-
-                big8 >>>= rest;
-                test8 = (big8 & k);
-                c += test8;
-
-                System.arraycopy(privateKeyOTS[counter], 0, hlp, 0, mdsize);
-                while (test8 > 0)
-                {
-                    messDigestOTS.update(hlp, 0, hlp.length);
-                    hlp = new byte[messDigestOTS.getDigestSize()];
-                    messDigestOTS.doFinal(hlp, 0);
-                    test8--;
-                }
-                System.arraycopy(hlp, 0, sign, counter * mdsize, mdsize);
-                counter++;
-            }
-            // check bytes
-            c = (messagesize << w) - c;
-            for (int i = 0; i < checksumsize; i += w)
-            {
-                test8 = (c & k);
-
-                System.arraycopy(privateKeyOTS[counter], 0, hlp, 0, mdsize);
-
-                while (test8 > 0)
-                {
-                    messDigestOTS.update(hlp, 0, hlp.length);
-                    hlp = new byte[messDigestOTS.getDigestSize()];
-                    messDigestOTS.doFinal(hlp, 0);
-                    test8--;
-                }
-                System.arraycopy(hlp, 0, sign, counter * mdsize, mdsize);
-                c >>>= w;
-                counter++;
-            }
-        }// end if(w<57)
-
-        return sign;
-    }
-
-    /**
-     * This method returns the least integer that is greater or equal to the
-     * logarithm to the base 2 of an integer <code>intValue</code>.
-     *
-     * @param intValue an integer
-     * @return The least integer greater or equal to the logarithm to the base 2
-     *         of <code>intValue</code>
-     */
-    public int getLog(int intValue)
-    {
-        int log = 1;
-        int i = 2;
-        while (i < intValue)
-        {
-            i <<= 1;
-            log++;
-        }
-        return log;
-    }
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/mceliece/Conversions.java b/bcprov/src/main/java/org/bouncycastle/pqc/crypto/mceliece/Conversions.java
deleted file mode 100644
index 752d51c..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/mceliece/Conversions.java
+++ /dev/null
@@ -1,236 +0,0 @@
-package org.bouncycastle.pqc.crypto.mceliece;
-
-import java.math.BigInteger;
-
-import org.bouncycastle.pqc.math.linearalgebra.BigIntUtils;
-import org.bouncycastle.pqc.math.linearalgebra.GF2Vector;
-import org.bouncycastle.pqc.math.linearalgebra.IntegerFunctions;
-
-
-/**
- * Provides methods for CCA2-Secure Conversions of McEliece PKCS
- */
-final class Conversions
-{
-    private static final BigInteger ZERO = BigInteger.valueOf(0);
-    private static final BigInteger ONE = BigInteger.valueOf(1);
-    
-    /**
-     * Default constructor (private).
-     */
-    private Conversions()
-    {
-    }
-
-    /**
-     * Encode a number between 0 and (n|t) (binomial coefficient) into a binary
-     * vector of length n with weight t. The number is given as a byte array.
-     * Only the first s bits are used, where s = floor[log(n|t)].
-     *
-     * @param n integer
-     * @param t integer
-     * @param m the message as a byte array
-     * @return the encoded message as {@link GF2Vector}
-     */
-    public static GF2Vector encode(final int n, final int t, final byte[] m)
-    {
-        if (n < t)
-        {
-            throw new IllegalArgumentException("n < t");
-        }
-
-        // compute the binomial c = (n|t)
-        BigInteger c = IntegerFunctions.binomial(n, t);
-        // get the number encoded in m
-        BigInteger i = new BigInteger(1, m);
-        // compare
-        if (i.compareTo(c) >= 0)
-        {
-            throw new IllegalArgumentException("Encoded number too large.");
-        }
-
-        GF2Vector result = new GF2Vector(n);
-
-        int nn = n;
-        int tt = t;
-        for (int j = 0; j < n; j++)
-        {
-            c = c.multiply(BigInteger.valueOf(nn - tt)).divide(
-                BigInteger.valueOf(nn));
-            nn--;
-            if (c.compareTo(i) <= 0)
-            {
-                result.setBit(j);
-                i = i.subtract(c);
-                tt--;
-                if (nn == tt)
-                {
-                    c = ONE;
-                }
-                else
-                {
-                    c = (c.multiply(BigInteger.valueOf(tt + 1)))
-                        .divide(BigInteger.valueOf(nn - tt));
-                }
-            }
-        }
-
-        return result;
-    }
-
-    /**
-     * Decode a binary vector of length n and weight t into a number between 0
-     * and (n|t) (binomial coefficient). The result is given as a byte array of
-     * length floor[(s+7)/8], where s = floor[log(n|t)].
-     *
-     * @param n   integer
-     * @param t   integer
-     * @param vec the binary vector
-     * @return the decoded vector as a byte array
-     */
-    public static byte[] decode(int n, int t, GF2Vector vec)
-    {
-        if ((vec.getLength() != n) || (vec.getHammingWeight() != t))
-        {
-            throw new IllegalArgumentException(
-                "vector has wrong length or hamming weight");
-        }
-        int[] vecArray = vec.getVecArray();
-
-        BigInteger bc = IntegerFunctions.binomial(n, t);
-        BigInteger d = ZERO;
-        int nn = n;
-        int tt = t;
-        for (int i = 0; i < n; i++)
-        {
-            bc = bc.multiply(BigInteger.valueOf(nn - tt)).divide(
-                BigInteger.valueOf(nn));
-            nn--;
-
-            int q = i >> 5;
-            int e = vecArray[q] & (1 << (i & 0x1f));
-            if (e != 0)
-            {
-                d = d.add(bc);
-                tt--;
-                if (nn == tt)
-                {
-                    bc = ONE;
-                }
-                else
-                {
-                    bc = bc.multiply(BigInteger.valueOf(tt + 1)).divide(
-                        BigInteger.valueOf(nn - tt));
-                }
-
-            }
-        }
-
-        return BigIntUtils.toMinimalByteArray(d);
-    }
-
-    /**
-     * Compute a message representative of a message given as a vector of length
-     * <tt>n</tt> bit and of hamming weight <tt>t</tt>. The result is a
-     * byte array of length <tt>(s+7)/8</tt>, where
-     * <tt>s = floor[log(n|t)]</tt>.
-     *
-     * @param n integer
-     * @param t integer
-     * @param m the message vector as a byte array
-     * @return a message representative for <tt>m</tt>
-     */
-    public static byte[] signConversion(int n, int t, byte[] m)
-    {
-        if (n < t)
-        {
-            throw new IllegalArgumentException("n < t");
-        }
-
-        BigInteger bc = IntegerFunctions.binomial(n, t);
-        // finds s = floor[log(binomial(n,t))]
-        int s = bc.bitLength() - 1;
-        // s = sq*8 + sr;
-        int sq = s >> 3;
-        int sr = s & 7;
-        if (sr == 0)
-        {
-            sq--;
-            sr = 8;
-        }
-
-        // n = nq*8+nr;
-        int nq = n >> 3;
-        int nr = n & 7;
-        if (nr == 0)
-        {
-            nq--;
-            nr = 8;
-        }
-        // take s bit from m
-        byte[] data = new byte[nq + 1];
-        if (m.length < data.length)
-        {
-            System.arraycopy(m, 0, data, 0, m.length);
-            for (int i = m.length; i < data.length; i++)
-            {
-                data[i] = 0;
-            }
-        }
-        else
-        {
-            System.arraycopy(m, 0, data, 0, nq);
-            int h = (1 << nr) - 1;
-            data[nq] = (byte)(h & m[nq]);
-        }
-
-        BigInteger d = ZERO;
-        int nn = n;
-        int tt = t;
-        for (int i = 0; i < n; i++)
-        {
-            bc = (bc.multiply(new BigInteger(Integer.toString(nn - tt))))
-                .divide(new BigInteger(Integer.toString(nn)));
-            nn--;
-
-            int q = i >>> 3;
-            int r = i & 7;
-            r = 1 << r;
-            byte e = (byte)(r & data[q]);
-            if (e != 0)
-            {
-                d = d.add(bc);
-                tt--;
-                if (nn == tt)
-                {
-                    bc = ONE;
-                }
-                else
-                {
-                    bc = (bc
-                        .multiply(new BigInteger(Integer.toString(tt + 1))))
-                        .divide(new BigInteger(Integer.toString(nn - tt)));
-                }
-            }
-        }
-
-        byte[] result = new byte[sq + 1];
-        byte[] help = d.toByteArray();
-        if (help.length < result.length)
-        {
-            System.arraycopy(help, 0, result, 0, help.length);
-            for (int i = help.length; i < result.length; i++)
-            {
-                result[i] = 0;
-            }
-        }
-        else
-        {
-            System.arraycopy(help, 0, result, 0, sq);
-            result[sq] = (byte)(((1 << sr) - 1) & help[sq]);
-        }
-
-        return result;
-    }
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/mceliece/McElieceCCA2KeyGenerationParameters.java b/bcprov/src/main/java/org/bouncycastle/pqc/crypto/mceliece/McElieceCCA2KeyGenerationParameters.java
deleted file mode 100644
index dbd5a82..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/mceliece/McElieceCCA2KeyGenerationParameters.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package org.bouncycastle.pqc.crypto.mceliece;
-
-import java.security.SecureRandom;
-
-import org.bouncycastle.crypto.KeyGenerationParameters;
-
-public class McElieceCCA2KeyGenerationParameters
-    extends KeyGenerationParameters
-{
-    private McElieceCCA2Parameters params;
-
-    public McElieceCCA2KeyGenerationParameters(
-        SecureRandom random,
-        McElieceCCA2Parameters params)
-    {
-        // XXX key size?
-        super(random, 128);
-        this.params = params;
-    }
-
-    public McElieceCCA2Parameters getParameters()
-    {
-        return params;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/mceliece/McElieceCCA2KeyPairGenerator.java b/bcprov/src/main/java/org/bouncycastle/pqc/crypto/mceliece/McElieceCCA2KeyPairGenerator.java
deleted file mode 100644
index 198e5d2..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/mceliece/McElieceCCA2KeyPairGenerator.java
+++ /dev/null
@@ -1,119 +0,0 @@
-package org.bouncycastle.pqc.crypto.mceliece;
-
-
-import java.security.SecureRandom;
-
-import org.bouncycastle.crypto.AsymmetricCipherKeyPair;
-import org.bouncycastle.crypto.AsymmetricCipherKeyPairGenerator;
-import org.bouncycastle.crypto.KeyGenerationParameters;
-import org.bouncycastle.pqc.math.linearalgebra.GF2Matrix;
-import org.bouncycastle.pqc.math.linearalgebra.GF2mField;
-import org.bouncycastle.pqc.math.linearalgebra.GoppaCode;
-import org.bouncycastle.pqc.math.linearalgebra.GoppaCode.MaMaPe;
-import org.bouncycastle.pqc.math.linearalgebra.Permutation;
-import org.bouncycastle.pqc.math.linearalgebra.PolynomialGF2mSmallM;
-import org.bouncycastle.pqc.math.linearalgebra.PolynomialRingGF2m;
-
-
-/**
- * This class implements key pair generation of the McEliece Public Key
- * Cryptosystem (McEliecePKC).
- */
-public class McElieceCCA2KeyPairGenerator
-    implements AsymmetricCipherKeyPairGenerator
-{
-
-
-    /**
-     * The OID of the algorithm.
-     */
-    public static final String OID = "1.3.6.1.4.1.8301.3.1.3.4.2";
-
-    private McElieceCCA2KeyGenerationParameters mcElieceCCA2Params;
-
-    // the extension degree of the finite field GF(2^m)
-    private int m;
-
-    // the length of the code
-    private int n;
-
-    // the error correction capability
-    private int t;
-
-    // the field polynomial
-    private int fieldPoly;
-
-    // the source of randomness
-    private SecureRandom random;
-
-    // flag indicating whether the key pair generator has been initialized
-    private boolean initialized = false;
-
-    /**
-     * Default initialization of the key pair generator.
-     */
-    private void initializeDefault()
-    {
-        McElieceCCA2KeyGenerationParameters mcCCA2Params = new McElieceCCA2KeyGenerationParameters(new SecureRandom(), new McElieceCCA2Parameters());
-        init(mcCCA2Params);
-    }
-
-    // TODO
-    public void init(
-        KeyGenerationParameters param)
-    {
-        this.mcElieceCCA2Params = (McElieceCCA2KeyGenerationParameters)param;
-
-        // set source of randomness
-        this.random = new SecureRandom();
-
-        this.m = this.mcElieceCCA2Params.getParameters().getM();
-        this.n = this.mcElieceCCA2Params.getParameters().getN();
-        this.t = this.mcElieceCCA2Params.getParameters().getT();
-        this.fieldPoly = this.mcElieceCCA2Params.getParameters().getFieldPoly();
-        this.initialized = true;
-    }
-
-
-    public AsymmetricCipherKeyPair generateKeyPair()
-    {
-
-        if (!initialized)
-        {
-            initializeDefault();
-        }
-
-        // finite field GF(2^m)
-        GF2mField field = new GF2mField(m, fieldPoly);
-
-        // irreducible Goppa polynomial
-        PolynomialGF2mSmallM gp = new PolynomialGF2mSmallM(field, t,
-            PolynomialGF2mSmallM.RANDOM_IRREDUCIBLE_POLYNOMIAL, random);
-        PolynomialRingGF2m ring = new PolynomialRingGF2m(field, gp);
-
-        // matrix for computing square roots in (GF(2^m))^t
-        PolynomialGF2mSmallM[] qInv = ring.getSquareRootMatrix();
-
-        // generate canonical check matrix
-        GF2Matrix h = GoppaCode.createCanonicalCheckMatrix(field, gp);
-
-        // compute short systematic form of check matrix
-        MaMaPe mmp = GoppaCode.computeSystematicForm(h, random);
-        GF2Matrix shortH = mmp.getSecondMatrix();
-        Permutation p = mmp.getPermutation();
-
-        // compute short systematic form of generator matrix
-        GF2Matrix shortG = (GF2Matrix)shortH.computeTranspose();
-
-        // obtain number of rows of G (= dimension of the code)
-        int k = shortG.getNumRows();
-
-        // generate keys
-        McElieceCCA2PublicKeyParameters pubKey = new McElieceCCA2PublicKeyParameters(OID, n, t, shortG, mcElieceCCA2Params.getParameters());
-        McElieceCCA2PrivateKeyParameters privKey = new McElieceCCA2PrivateKeyParameters(OID, n, k,
-            field, gp, p, h, qInv, mcElieceCCA2Params.getParameters());
-
-        // return key pair
-        return new AsymmetricCipherKeyPair(pubKey, privKey);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/mceliece/McElieceCCA2KeyParameters.java b/bcprov/src/main/java/org/bouncycastle/pqc/crypto/mceliece/McElieceCCA2KeyParameters.java
deleted file mode 100644
index 8011476..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/mceliece/McElieceCCA2KeyParameters.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package org.bouncycastle.pqc.crypto.mceliece;
-
-import org.bouncycastle.crypto.params.AsymmetricKeyParameter;
-
-
-public class McElieceCCA2KeyParameters
-    extends AsymmetricKeyParameter
-{
-    private McElieceCCA2Parameters params;
-
-    public McElieceCCA2KeyParameters(
-        boolean isPrivate,
-        McElieceCCA2Parameters params)
-    {
-        super(isPrivate);
-        this.params = params;
-    }
-
-
-    public McElieceCCA2Parameters getParameters()
-    {
-        return params;
-    }
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/mceliece/McElieceCCA2Parameters.java b/bcprov/src/main/java/org/bouncycastle/pqc/crypto/mceliece/McElieceCCA2Parameters.java
deleted file mode 100644
index 7f80010..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/mceliece/McElieceCCA2Parameters.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package org.bouncycastle.pqc.crypto.mceliece;
-
-
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.digests.SHA256Digest;
-
-/**
- * This class provides a specification for the parameters of the CCA2-secure
- * variants of the McEliece PKCS that are used with
- * {@link McElieceFujisakiCipher}, {@link McElieceKobaraImaiCipher}, and
- * {@link McEliecePointchevalCipher}.
- *
- * @see McElieceFujisakiCipher
- * @see McElieceKobaraImaiCipher
- * @see McEliecePointchevalCipher
- */
-public class McElieceCCA2Parameters
-    extends McElieceParameters
-{
-
-
-    public Digest digest;
-
-
-    /**
-     * Construct the default parameters.
-     * The default message digest is SHA256.
-     */
-    public McElieceCCA2Parameters()
-    {
-        this.digest = new SHA256Digest();
-    }
-
-    public McElieceCCA2Parameters(int m, int t)
-    {
-        super(m, t);
-        this.digest = new SHA256Digest();
-    }
-
-    public McElieceCCA2Parameters(Digest digest)
-    {
-        this.digest = digest;
-    }
-
-    public Digest getDigest()
-    {
-        return this.digest;
-    }
-
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/mceliece/McElieceCCA2Primitives.java b/bcprov/src/main/java/org/bouncycastle/pqc/crypto/mceliece/McElieceCCA2Primitives.java
deleted file mode 100644
index 726add1..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/mceliece/McElieceCCA2Primitives.java
+++ /dev/null
@@ -1,86 +0,0 @@
-package org.bouncycastle.pqc.crypto.mceliece;
-
-import org.bouncycastle.pqc.math.linearalgebra.GF2Matrix;
-import org.bouncycastle.pqc.math.linearalgebra.GF2Vector;
-import org.bouncycastle.pqc.math.linearalgebra.GF2mField;
-import org.bouncycastle.pqc.math.linearalgebra.GoppaCode;
-import org.bouncycastle.pqc.math.linearalgebra.Permutation;
-import org.bouncycastle.pqc.math.linearalgebra.PolynomialGF2mSmallM;
-import org.bouncycastle.pqc.math.linearalgebra.Vector;
-
-/**
- * Core operations for the CCA-secure variants of McEliece.
- */
-public final class McElieceCCA2Primitives
-{
-
-    /**
-     * Default constructor (private).
-     */
-    private McElieceCCA2Primitives()
-    {
-    }
-
-    /**
-     * The McEliece encryption primitive.
-     *
-     * @param pubKey the public key
-     * @param m      the message vector
-     * @param z      the error vector
-     * @return <tt>m*G + z</tt>
-     */
-
-
-    public static GF2Vector encryptionPrimitive(McElieceCCA2PublicKeyParameters pubKey,
-                                                GF2Vector m, GF2Vector z)
-    {
-
-        GF2Matrix matrixG = pubKey.getMatrixG();
-        Vector mG = matrixG.leftMultiplyLeftCompactForm(m);
-        return (GF2Vector)mG.add(z);
-    }
-
-    /**
-     * The McEliece decryption primitive.
-     *
-     * @param privKey the private key
-     * @param c       the ciphertext vector <tt>c = m*G + z</tt>
-     * @return the message vector <tt>m</tt> and the error vector <tt>z</tt>
-     */
-    public static GF2Vector[] decryptionPrimitive(
-        McElieceCCA2PrivateKeyParameters privKey, GF2Vector c)
-    {
-
-        // obtain values from private key
-        int k = privKey.getK();
-        Permutation p = privKey.getP();
-        GF2mField field = privKey.getField();
-        PolynomialGF2mSmallM gp = privKey.getGoppaPoly();
-        GF2Matrix h = privKey.getH();
-        PolynomialGF2mSmallM[] q = privKey.getQInv();
-
-        // compute inverse permutation P^-1
-        Permutation pInv = p.computeInverse();
-
-        // multiply c with permutation P^-1
-        GF2Vector cPInv = (GF2Vector)c.multiply(pInv);
-
-        // compute syndrome of cP^-1
-        GF2Vector syndVec = (GF2Vector)h.rightMultiply(cPInv);
-
-        // decode syndrome
-        GF2Vector errors = GoppaCode.syndromeDecode(syndVec, field, gp, q);
-        GF2Vector mG = (GF2Vector)cPInv.add(errors);
-
-        // multiply codeword and error vector with P
-        mG = (GF2Vector)mG.multiply(p);
-        errors = (GF2Vector)errors.multiply(p);
-
-        // extract plaintext vector (last k columns of mG)
-        GF2Vector m = mG.extractRightVector(k);
-
-        // return vectors
-        return new GF2Vector[]{m, errors};
-    }
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/mceliece/McElieceCCA2PrivateKeyParameters.java b/bcprov/src/main/java/org/bouncycastle/pqc/crypto/mceliece/McElieceCCA2PrivateKeyParameters.java
deleted file mode 100644
index 980ecdc..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/mceliece/McElieceCCA2PrivateKeyParameters.java
+++ /dev/null
@@ -1,172 +0,0 @@
-package org.bouncycastle.pqc.crypto.mceliece;
-
-
-import org.bouncycastle.pqc.math.linearalgebra.GF2Matrix;
-import org.bouncycastle.pqc.math.linearalgebra.GF2mField;
-import org.bouncycastle.pqc.math.linearalgebra.Permutation;
-import org.bouncycastle.pqc.math.linearalgebra.PolynomialGF2mSmallM;
-
-/**
- *
- *
- *
- */
-public class McElieceCCA2PrivateKeyParameters
-    extends McElieceCCA2KeyParameters
-{
-
-    // the OID of the algorithm
-    private String oid;
-
-    // the length of the code
-    private int n;
-
-    // the dimension of the code
-    private int k;
-
-    // the finte field GF(2^m)
-    private GF2mField field;
-
-    // the irreducible Goppa polynomial
-    private PolynomialGF2mSmallM goppaPoly;
-
-    // the permutation
-    private Permutation p;
-
-    // the canonical check matrix
-    private GF2Matrix h;
-
-    // the matrix used to compute square roots in (GF(2^m))^t
-    private PolynomialGF2mSmallM[] qInv;
-
-    /**
-     * Constructor.
-     *
-     * @param n      the length of the code
-     * @param k      the dimension of the code
-     * @param field  the finite field <tt>GF(2<sup>m</sup>)</tt>
-     * @param gp     the irreducible Goppa polynomial
-     * @param p      the permutation
-     * @param h      the canonical check matrix
-     * @param qInv   the matrix used to compute square roots in
-     *               <tt>(GF(2^m))^t</tt>
-     * @param params McElieceCCA2Parameters
-     */
-    public McElieceCCA2PrivateKeyParameters(String oid, int n, int k, GF2mField field,
-                                            PolynomialGF2mSmallM gp, Permutation p, GF2Matrix h,
-                                            PolynomialGF2mSmallM[] qInv, McElieceCCA2Parameters params)
-    {
-        super(true, params);
-        this.oid = oid;
-        this.n = n;
-        this.k = k;
-        this.field = field;
-        this.goppaPoly = gp;
-        this.p = p;
-        this.h = h;
-        this.qInv = qInv;
-    }
-
-    /**
-     * Constructor used by the {@link McElieceKeyFactory}.
-     *
-     * @param n            the length of the code
-     * @param k            the dimension of the code
-     * @param encFieldPoly the encoded field polynomial defining the finite field
-     *                     <tt>GF(2<sup>m</sup>)</tt>
-     * @param encGoppaPoly the encoded irreducible Goppa polynomial
-     * @param encP         the encoded permutation
-     * @param encH         the encoded canonical check matrix
-     * @param encQInv      the encoded matrix used to compute square roots in
-     *                     <tt>(GF(2^m))^t</tt>
-     * @param params       McElieceCCA2Parameters
-     */
-    public McElieceCCA2PrivateKeyParameters(String oid, int n, int k, byte[] encFieldPoly,
-                                            byte[] encGoppaPoly, byte[] encP, byte[] encH, byte[][] encQInv, McElieceCCA2Parameters params)
-    {
-        super(true, params);
-        this.oid = oid;
-        this.n = n;
-        this.k = k;
-        field = new GF2mField(encFieldPoly);
-        goppaPoly = new PolynomialGF2mSmallM(field, encGoppaPoly);
-        p = new Permutation(encP);
-        h = new GF2Matrix(encH);
-        qInv = new PolynomialGF2mSmallM[encQInv.length];
-        for (int i = 0; i < encQInv.length; i++)
-        {
-            qInv[i] = new PolynomialGF2mSmallM(field, encQInv[i]);
-        }
-    }
-
-    /**
-     * @return the length of the code
-     */
-    public int getN()
-    {
-        return n;
-    }
-
-    /**
-     * @return the dimension of the code
-     */
-    public int getK()
-    {
-        return k;
-    }
-
-    /**
-     * @return the degree of the Goppa polynomial (error correcting capability)
-     */
-    public int getT()
-    {
-        return goppaPoly.getDegree();
-    }
-
-    /**
-     * @return the finite field
-     */
-    public GF2mField getField()
-    {
-        return field;
-    }
-
-    /**
-     * @return the irreducible Goppa polynomial
-     */
-    public PolynomialGF2mSmallM getGoppaPoly()
-    {
-        return goppaPoly;
-    }
-
-    /**
-     * @return the permutation P
-     */
-    public Permutation getP()
-    {
-        return p;
-    }
-
-    /**
-     * @return the canonical check matrix H
-     */
-    public GF2Matrix getH()
-    {
-        return h;
-    }
-
-    /**
-     * @return the matrix used to compute square roots in <tt>(GF(2^m))^t</tt>
-     */
-    public PolynomialGF2mSmallM[] getQInv()
-    {
-        return qInv;
-    }
-
-    public String getOIDString()
-    {
-        return oid;
-
-    }
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/mceliece/McElieceCCA2PublicKeyParameters.java b/bcprov/src/main/java/org/bouncycastle/pqc/crypto/mceliece/McElieceCCA2PublicKeyParameters.java
deleted file mode 100644
index e63377c..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/mceliece/McElieceCCA2PublicKeyParameters.java
+++ /dev/null
@@ -1,97 +0,0 @@
-package org.bouncycastle.pqc.crypto.mceliece;
-
-import org.bouncycastle.pqc.math.linearalgebra.GF2Matrix;
-
-/**
- *
- *
- *
- */
-public class McElieceCCA2PublicKeyParameters
-    extends McElieceCCA2KeyParameters
-{
-
-    // the OID of the algorithm
-    private String oid;
-
-    // the length of the code
-    private int n;
-
-    // the error correction capability of the code
-    private int t;
-
-    // the generator matrix
-    private GF2Matrix matrixG;
-
-    /**
-     * Constructor.
-     *
-     * @param n      length of the code
-     * @param t      error correction capability
-     * @param matrix generator matrix
-     * @param params McElieceCCA2Parameters
-     */
-    public McElieceCCA2PublicKeyParameters(String oid, int n, int t, GF2Matrix matrix, McElieceCCA2Parameters params)
-    {
-        super(false, params);
-        this.oid = oid;
-        this.n = n;
-        this.t = t;
-        this.matrixG = new GF2Matrix(matrix);
-    }
-
-    /**
-     * Constructor (used by {@link McElieceKeyFactory}).
-     *
-     * @param n         length of the code
-     * @param t         error correction capability of the code
-     * @param encMatrix encoded generator matrix
-     * @param params    McElieceCCA2Parameters
-     */
-    public McElieceCCA2PublicKeyParameters(String oid, int n, int t, byte[] encMatrix, McElieceCCA2Parameters params)
-    {
-        super(false, params);
-        this.oid = oid;
-        this.n = n;
-        this.t = t;
-        this.matrixG = new GF2Matrix(encMatrix);
-    }
-
-    /**
-     * @return the length of the code
-     */
-    public int getN()
-    {
-        return n;
-    }
-
-    /**
-     * @return the error correction capability of the code
-     */
-    public int getT()
-    {
-        return t;
-    }
-
-    /**
-     * @return the generator matrix
-     */
-    public GF2Matrix getMatrixG()
-    {
-        return matrixG;
-    }
-
-    /**
-     * @return the dimension of the code
-     */
-    public int getK()
-    {
-        return matrixG.getNumRows();
-    }
-
-    public String getOIDString()
-    {
-        return oid;
-
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/mceliece/McElieceFujisakiCipher.java b/bcprov/src/main/java/org/bouncycastle/pqc/crypto/mceliece/McElieceFujisakiCipher.java
deleted file mode 100644
index c414540..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/mceliece/McElieceFujisakiCipher.java
+++ /dev/null
@@ -1,218 +0,0 @@
-package org.bouncycastle.pqc.crypto.mceliece;
-
-import java.security.SecureRandom;
-
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.digests.SHA1Digest;
-import org.bouncycastle.crypto.params.ParametersWithRandom;
-import org.bouncycastle.crypto.prng.DigestRandomGenerator;
-import org.bouncycastle.pqc.crypto.MessageEncryptor;
-import org.bouncycastle.pqc.math.linearalgebra.ByteUtils;
-import org.bouncycastle.pqc.math.linearalgebra.GF2Vector;
-
-/**
- * This class implements the Fujisaki/Okamoto conversion of the McEliecePKCS.
- * Fujisaki and Okamoto propose hybrid encryption that merges a symmetric
- * encryption scheme which is secure in the find-guess model with an asymmetric
- * one-way encryption scheme which is sufficiently probabilistic to obtain a
- * public key cryptosystem which is CCA2-secure. For details, see D. Engelbert,
- * R. Overbeck, A. Schmidt, "A summary of the development of the McEliece
- * Cryptosystem", technical report.
- */
-public class McElieceFujisakiCipher
-    implements MessageEncryptor
-{
-
-
-    /**
-     * The OID of the algorithm.
-     */
-    public static final String OID = "1.3.6.1.4.1.8301.3.1.3.4.2.1";
-
-    private static final String DEFAULT_PRNG_NAME = "SHA1PRNG";
-
-    private Digest messDigest;
-
-    private SecureRandom sr;
-
-    /**
-     * The McEliece main parameters
-     */
-    private int n, k, t;
-
-    McElieceCCA2KeyParameters key;
-
-
-    public void init(boolean forSigning,
-                     CipherParameters param)
-    {
-
-        if (forSigning)
-        {
-            if (param instanceof ParametersWithRandom)
-            {
-                ParametersWithRandom rParam = (ParametersWithRandom)param;
-
-                this.sr = rParam.getRandom();
-                this.key = (McElieceCCA2PublicKeyParameters)rParam.getParameters();
-                this.initCipherEncrypt((McElieceCCA2PublicKeyParameters)key);
-
-            }
-            else
-            {
-                this.sr = new SecureRandom();
-                this.key = (McElieceCCA2PublicKeyParameters)param;
-                this.initCipherEncrypt((McElieceCCA2PublicKeyParameters)key);
-            }
-        }
-        else
-        {
-            this.key = (McElieceCCA2PrivateKeyParameters)param;
-            this.initCipherDecrypt((McElieceCCA2PrivateKeyParameters)key);
-        }
-
-    }
-
-
-    public int getKeySize(McElieceCCA2KeyParameters key)
-        throws IllegalArgumentException
-    {
-
-        if (key instanceof McElieceCCA2PublicKeyParameters)
-        {
-            return ((McElieceCCA2PublicKeyParameters)key).getN();
-
-        }
-        if (key instanceof McElieceCCA2PrivateKeyParameters)
-        {
-            return ((McElieceCCA2PrivateKeyParameters)key).getN();
-        }
-        throw new IllegalArgumentException("unsupported type");
-
-    }
-
-
-    private void initCipherEncrypt(McElieceCCA2PublicKeyParameters pubKey)
-    {
-        this.sr = sr != null ? sr : new SecureRandom();
-        this.messDigest = pubKey.getParameters().getDigest();
-        n = pubKey.getN();
-        k = pubKey.getK();
-        t = pubKey.getT();
-    }
-
-
-    public void initCipherDecrypt(McElieceCCA2PrivateKeyParameters privKey)
-    {
-        this.messDigest = privKey.getParameters().getDigest();
-        n = privKey.getN();
-        t = privKey.getT();
-    }
-
-
-    public byte[] messageEncrypt(byte[] input)
-        throws Exception
-    {
-
-        // generate random vector r of length k bits
-        GF2Vector r = new GF2Vector(k, sr);
-
-        // convert r to byte array
-        byte[] rBytes = r.getEncoded();
-
-        // compute (r||input)
-        byte[] rm = ByteUtils.concatenate(rBytes, input);
-
-        // compute H(r||input)
-        messDigest.update(rm, 0, rm.length);
-        byte[] hrm = new byte[messDigest.getDigestSize()];
-        messDigest.doFinal(hrm, 0);
-
-        // convert H(r||input) to error vector z
-        GF2Vector z = Conversions.encode(n, t, hrm);
-
-        // compute c1 = E(r, z)
-        byte[] c1 = McElieceCCA2Primitives.encryptionPrimitive((McElieceCCA2PublicKeyParameters)key, r, z)
-            .getEncoded();
-
-        // get PRNG object
-        DigestRandomGenerator sr0 = new DigestRandomGenerator(new SHA1Digest());
-
-        // seed PRNG with r'
-        sr0.addSeedMaterial(rBytes);
-
-        // generate random c2
-        byte[] c2 = new byte[input.length];
-        sr0.nextBytes(c2);
-
-        // XOR with input
-        for (int i = 0; i < input.length; i++)
-        {
-            c2[i] ^= input[i];
-        }
-
-        // return (c1||c2)
-        return ByteUtils.concatenate(c1, c2);
-    }
-
-    public byte[] messageDecrypt(byte[] input)
-        throws Exception
-    {
-
-        int c1Len = (n + 7) >> 3;
-        int c2Len = input.length - c1Len;
-
-        // split ciphertext (c1||c2)
-        byte[][] c1c2 = ByteUtils.split(input, c1Len);
-        byte[] c1 = c1c2[0];
-        byte[] c2 = c1c2[1];
-
-        // decrypt c1 ...
-        GF2Vector hrmVec = GF2Vector.OS2VP(n, c1);
-        GF2Vector[] decC1 = McElieceCCA2Primitives.decryptionPrimitive((McElieceCCA2PrivateKeyParameters)key,
-            hrmVec);
-        byte[] rBytes = decC1[0].getEncoded();
-        // ... and obtain error vector z
-        GF2Vector z = decC1[1];
-
-        // get PRNG object
-        DigestRandomGenerator sr0 = new DigestRandomGenerator(new SHA1Digest());
-
-        // seed PRNG with r'
-        sr0.addSeedMaterial(rBytes);
-
-        // generate random sequence
-        byte[] mBytes = new byte[c2Len];
-        sr0.nextBytes(mBytes);
-
-        // XOR with c2 to obtain m
-        for (int i = 0; i < c2Len; i++)
-        {
-            mBytes[i] ^= c2[i];
-        }
-
-        // compute H(r||m)
-        byte[] rmBytes = ByteUtils.concatenate(rBytes, mBytes);
-        byte[] hrm = new byte[messDigest.getDigestSize()];
-        messDigest.update(rmBytes, 0, rmBytes.length);
-        messDigest.doFinal(hrm, 0);
-
-
-        // compute Conv(H(r||m))
-        hrmVec = Conversions.encode(n, t, hrm);
-
-        // check that Conv(H(m||r)) = z
-        if (!hrmVec.equals(z))
-        {
-
-            throw new Exception("Bad Padding: invalid ciphertext");
-
-        }
-
-        // return plaintext m
-        return mBytes;
-    }
-
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/mceliece/McElieceFujisakiDigestCipher.java b/bcprov/src/main/java/org/bouncycastle/pqc/crypto/mceliece/McElieceFujisakiDigestCipher.java
deleted file mode 100644
index 423e6ff..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/mceliece/McElieceFujisakiDigestCipher.java
+++ /dev/null
@@ -1,128 +0,0 @@
-package org.bouncycastle.pqc.crypto.mceliece;
-
-
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.params.AsymmetricKeyParameter;
-import org.bouncycastle.crypto.params.ParametersWithRandom;
-import org.bouncycastle.pqc.crypto.MessageEncryptor;
-
-// TODO should implement some interface?
-public class McElieceFujisakiDigestCipher
-{
-
-    private final Digest messDigest;
-
-    private final MessageEncryptor mcElieceCCA2Cipher;
-
-    private boolean forEncrypting;
-
-
-    public McElieceFujisakiDigestCipher(MessageEncryptor mcElieceCCA2Cipher, Digest messDigest)
-    {
-        this.mcElieceCCA2Cipher = mcElieceCCA2Cipher;
-        this.messDigest = messDigest;
-    }
-
-
-    public void init(boolean forEncrypting,
-                     CipherParameters param)
-    {
-
-        this.forEncrypting = forEncrypting;
-        AsymmetricKeyParameter k;
-
-        if (param instanceof ParametersWithRandom)
-        {
-            k = (AsymmetricKeyParameter)((ParametersWithRandom)param).getParameters();
-        }
-        else
-        {
-            k = (AsymmetricKeyParameter)param;
-        }
-
-        if (forEncrypting && k.isPrivate())
-        {
-            throw new IllegalArgumentException("Encrypting Requires Public Key.");
-        }
-
-        if (!forEncrypting && !k.isPrivate())
-        {
-            throw new IllegalArgumentException("Decrypting Requires Private Key.");
-        }
-
-        reset();
-
-        mcElieceCCA2Cipher.init(forEncrypting, param);
-    }
-
-
-    public byte[] messageEncrypt()
-    {
-        if (!forEncrypting)
-        {
-            throw new IllegalStateException("McElieceFujisakiDigestCipher not initialised for encrypting.");
-        }
-
-        byte[] hash = new byte[messDigest.getDigestSize()];
-        messDigest.doFinal(hash, 0);
-        byte[] enc = null;
-
-        try
-        {
-            enc = mcElieceCCA2Cipher.messageEncrypt(hash);
-        }
-        catch (Exception e)
-        {
-            e.printStackTrace();
-        }
-
-
-        return enc;
-    }
-
-
-    public byte[] messageDecrypt(byte[] ciphertext)
-    {
-        byte[] output = null;
-        if (forEncrypting)
-        {
-            throw new IllegalStateException("McElieceFujisakiDigestCipher not initialised for decrypting.");
-        }
-
-
-        try
-        {
-            output = mcElieceCCA2Cipher.messageDecrypt(ciphertext);
-        }
-        catch (Exception e)
-        {
-            e.printStackTrace();
-        }
-
-
-        return output;
-    }
-
-
-    public void update(byte b)
-    {
-        messDigest.update(b);
-
-    }
-
-    public void update(byte[] in, int off, int len)
-    {
-        messDigest.update(in, off, len);
-
-    }
-
-
-    public void reset()
-    {
-        messDigest.reset();
-
-    }
-
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/mceliece/McElieceKeyGenerationParameters.java b/bcprov/src/main/java/org/bouncycastle/pqc/crypto/mceliece/McElieceKeyGenerationParameters.java
deleted file mode 100644
index 1b1fa65..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/mceliece/McElieceKeyGenerationParameters.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package org.bouncycastle.pqc.crypto.mceliece;
-
-import java.security.SecureRandom;
-
-import org.bouncycastle.crypto.KeyGenerationParameters;
-
-public class McElieceKeyGenerationParameters
-    extends KeyGenerationParameters
-{
-    private McElieceParameters params;
-
-    public McElieceKeyGenerationParameters(
-        SecureRandom random,
-        McElieceParameters params)
-    {
-        // XXX key size?
-        super(random, 256);
-        this.params = params;
-    }
-
-    public McElieceParameters getParameters()
-    {
-        return params;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/mceliece/McElieceKeyPairGenerator.java b/bcprov/src/main/java/org/bouncycastle/pqc/crypto/mceliece/McElieceKeyPairGenerator.java
deleted file mode 100644
index 6ad7fc2..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/mceliece/McElieceKeyPairGenerator.java
+++ /dev/null
@@ -1,151 +0,0 @@
-package org.bouncycastle.pqc.crypto.mceliece;
-
-import java.security.SecureRandom;
-
-import org.bouncycastle.crypto.AsymmetricCipherKeyPair;
-import org.bouncycastle.crypto.AsymmetricCipherKeyPairGenerator;
-import org.bouncycastle.crypto.KeyGenerationParameters;
-import org.bouncycastle.pqc.math.linearalgebra.GF2Matrix;
-import org.bouncycastle.pqc.math.linearalgebra.GF2mField;
-import org.bouncycastle.pqc.math.linearalgebra.GoppaCode;
-import org.bouncycastle.pqc.math.linearalgebra.GoppaCode.MaMaPe;
-import org.bouncycastle.pqc.math.linearalgebra.Permutation;
-import org.bouncycastle.pqc.math.linearalgebra.PolynomialGF2mSmallM;
-import org.bouncycastle.pqc.math.linearalgebra.PolynomialRingGF2m;
-
-
-/**
- * This class implements key pair generation of the McEliece Public Key
- * Cryptosystem (McEliecePKC).
- */
-public class McElieceKeyPairGenerator
-    implements AsymmetricCipherKeyPairGenerator
-{
-
-
-    public McElieceKeyPairGenerator()
-    {
-
-    }
-
-
-    /**
-     * The OID of the algorithm.
-     */
-    private static final String OID = "1.3.6.1.4.1.8301.3.1.3.4.1";
-
-    private McElieceKeyGenerationParameters mcElieceParams;
-
-    // the extension degree of the finite field GF(2^m)
-    private int m;
-
-    // the length of the code
-    private int n;
-
-    // the error correction capability
-    private int t;
-
-    // the field polynomial
-    private int fieldPoly;
-
-    // the source of randomness
-    private SecureRandom random;
-
-    // flag indicating whether the key pair generator has been initialized
-    private boolean initialized = false;
-
-
-    /**
-     * Default initialization of the key pair generator.
-     */
-    private void initializeDefault()
-    {
-        McElieceKeyGenerationParameters mcParams = new McElieceKeyGenerationParameters(new SecureRandom(), new McElieceParameters());
-        initialize(mcParams);
-    }
-
-    private void initialize(
-        KeyGenerationParameters param)
-    {
-        this.mcElieceParams = (McElieceKeyGenerationParameters)param;
-
-        // set source of randomness
-        this.random = new SecureRandom();
-
-        this.m = this.mcElieceParams.getParameters().getM();
-        this.n = this.mcElieceParams.getParameters().getN();
-        this.t = this.mcElieceParams.getParameters().getT();
-        this.fieldPoly = this.mcElieceParams.getParameters().getFieldPoly();
-        this.initialized = true;
-    }
-
-
-    private AsymmetricCipherKeyPair genKeyPair()
-    {
-
-        if (!initialized)
-        {
-            initializeDefault();
-        }
-
-        // finite field GF(2^m)
-        GF2mField field = new GF2mField(m, fieldPoly);
-
-        // irreducible Goppa polynomial
-        PolynomialGF2mSmallM gp = new PolynomialGF2mSmallM(field, t,
-            PolynomialGF2mSmallM.RANDOM_IRREDUCIBLE_POLYNOMIAL, random);
-        PolynomialRingGF2m ring = new PolynomialRingGF2m(field, gp);
-
-        // matrix used to compute square roots in (GF(2^m))^t
-        PolynomialGF2mSmallM[] sqRootMatrix = ring.getSquareRootMatrix();
-
-        // generate canonical check matrix
-        GF2Matrix h = GoppaCode.createCanonicalCheckMatrix(field, gp);
-
-        // compute short systematic form of check matrix
-        MaMaPe mmp = GoppaCode.computeSystematicForm(h, random);
-        GF2Matrix shortH = mmp.getSecondMatrix();
-        Permutation p1 = mmp.getPermutation();
-
-        // compute short systematic form of generator matrix
-        GF2Matrix shortG = (GF2Matrix)shortH.computeTranspose();
-
-        // extend to full systematic form
-        GF2Matrix gPrime = shortG.extendLeftCompactForm();
-
-        // obtain number of rows of G (= dimension of the code)
-        int k = shortG.getNumRows();
-
-        // generate random invertible (k x k)-matrix S and its inverse S^-1
-        GF2Matrix[] matrixSandInverse = GF2Matrix
-            .createRandomRegularMatrixAndItsInverse(k, random);
-
-        // generate random permutation P2
-        Permutation p2 = new Permutation(n, random);
-
-        // compute public matrix G=S*G'*P2
-        GF2Matrix g = (GF2Matrix)matrixSandInverse[0].rightMultiply(gPrime);
-        g = (GF2Matrix)g.rightMultiply(p2);
-
-
-        // generate keys
-        McEliecePublicKeyParameters pubKey = new McEliecePublicKeyParameters(OID, n, t, g, mcElieceParams.getParameters());
-        McEliecePrivateKeyParameters privKey = new McEliecePrivateKeyParameters(OID, n, k,
-            field, gp, matrixSandInverse[1], p1, p2, h, sqRootMatrix, mcElieceParams.getParameters());
-
-        // return key pair
-        return new AsymmetricCipherKeyPair(pubKey, privKey);
-    }
-
-    public void init(KeyGenerationParameters param)
-    {
-        this.initialize(param);
-
-    }
-
-    public AsymmetricCipherKeyPair generateKeyPair()
-    {
-        return genKeyPair();
-    }
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/mceliece/McElieceKeyParameters.java b/bcprov/src/main/java/org/bouncycastle/pqc/crypto/mceliece/McElieceKeyParameters.java
deleted file mode 100644
index 007e743..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/mceliece/McElieceKeyParameters.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package org.bouncycastle.pqc.crypto.mceliece;
-
-import org.bouncycastle.crypto.params.AsymmetricKeyParameter;
-
-
-public class McElieceKeyParameters
-    extends AsymmetricKeyParameter
-{
-    private McElieceParameters params;
-
-    public McElieceKeyParameters(
-        boolean isPrivate,
-        McElieceParameters params)
-    {
-        super(isPrivate);
-        this.params = params;
-    }
-
-
-    public McElieceParameters getParameters()
-    {
-        return params;
-    }
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/mceliece/McElieceKobaraImaiCipher.java b/bcprov/src/main/java/org/bouncycastle/pqc/crypto/mceliece/McElieceKobaraImaiCipher.java
deleted file mode 100644
index fe3ebf9..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/mceliece/McElieceKobaraImaiCipher.java
+++ /dev/null
@@ -1,319 +0,0 @@
-package org.bouncycastle.pqc.crypto.mceliece;
-
-import java.security.SecureRandom;
-
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.digests.SHA1Digest;
-import org.bouncycastle.crypto.params.ParametersWithRandom;
-import org.bouncycastle.crypto.prng.DigestRandomGenerator;
-import org.bouncycastle.pqc.crypto.MessageEncryptor;
-import org.bouncycastle.pqc.math.linearalgebra.ByteUtils;
-import org.bouncycastle.pqc.math.linearalgebra.GF2Vector;
-import org.bouncycastle.pqc.math.linearalgebra.IntegerFunctions;
-
-/**
- * This class implements the Kobara/Imai conversion of the McEliecePKCS. This is
- * a conversion of the McEliecePKCS which is CCA2-secure. For details, see D.
- * Engelbert, R. Overbeck, A. Schmidt, "A summary of the development of the
- * McEliece Cryptosystem", technical report.
- */
-public class McElieceKobaraImaiCipher
-    implements MessageEncryptor
-{
-
-    /**
-     * The OID of the algorithm.
-     */
-    public static final String OID = "1.3.6.1.4.1.8301.3.1.3.4.2.3";
-
-    private static final String DEFAULT_PRNG_NAME = "SHA1PRNG";
-
-    /**
-     * A predetermined public constant.
-     */
-    public static final byte[] PUBLIC_CONSTANT = "a predetermined public constant"
-        .getBytes();
-
-
-    private Digest messDigest;
-
-    private SecureRandom sr;
-
-    McElieceCCA2KeyParameters key;
-
-    /**
-     * The McEliece main parameters
-     */
-    private int n, k, t;
-
-
-    public void init(boolean forSigning,
-                     CipherParameters param)
-    {
-
-        if (forSigning)
-        {
-            if (param instanceof ParametersWithRandom)
-            {
-                ParametersWithRandom rParam = (ParametersWithRandom)param;
-
-                this.sr = rParam.getRandom();
-                this.key = (McElieceCCA2PublicKeyParameters)rParam.getParameters();
-                this.initCipherEncrypt((McElieceCCA2PublicKeyParameters)key);
-
-            }
-            else
-            {
-                this.sr = new SecureRandom();
-                this.key = (McElieceCCA2PublicKeyParameters)param;
-                this.initCipherEncrypt((McElieceCCA2PublicKeyParameters)key);
-            }
-        }
-        else
-        {
-            this.key = (McElieceCCA2PrivateKeyParameters)param;
-            this.initCipherDecrypt((McElieceCCA2PrivateKeyParameters)key);
-        }
-
-    }
-
-    /**
-     * Return the key size of the given key object.
-     *
-     * @param key the McElieceCCA2KeyParameters object
-     * @return the key size of the given key object
-     */
-    public int getKeySize(McElieceCCA2KeyParameters key)
-    {
-        if (key instanceof McElieceCCA2PublicKeyParameters)
-        {
-            return ((McElieceCCA2PublicKeyParameters)key).getN();
-
-        }
-        if (key instanceof McElieceCCA2PrivateKeyParameters)
-        {
-            return ((McElieceCCA2PrivateKeyParameters)key).getN();
-        }
-        throw new IllegalArgumentException("unsupported type");
-    }
-
-    private void initCipherEncrypt(McElieceCCA2PublicKeyParameters pubKey)
-    {
-        this.messDigest = pubKey.getParameters().getDigest();
-        n = pubKey.getN();
-        k = pubKey.getK();
-        t = pubKey.getT();
-
-    }
-
-    public void initCipherDecrypt(McElieceCCA2PrivateKeyParameters privKey)
-    {
-        this.messDigest = privKey.getParameters().getDigest();
-        n = privKey.getN();
-        k = privKey.getK();
-        t = privKey.getT();
-    }
-
-    public byte[] messageEncrypt(byte[] input)
-        throws Exception
-    {
-
-        int c2Len = messDigest.getDigestSize();
-        int c4Len = k >> 3;
-        int c5Len = (IntegerFunctions.binomial(n, t).bitLength() - 1) >> 3;
-
-
-        int mLen = c4Len + c5Len - c2Len - PUBLIC_CONSTANT.length;
-        if (input.length > mLen)
-        {
-            mLen = input.length;
-        }
-
-        int c1Len = mLen + PUBLIC_CONSTANT.length;
-        int c6Len = c1Len + c2Len - c4Len - c5Len;
-
-        // compute (m||const)
-        byte[] mConst = new byte[c1Len];
-        System.arraycopy(input, 0, mConst, 0, input.length);
-        System.arraycopy(PUBLIC_CONSTANT, 0, mConst, mLen,
-            PUBLIC_CONSTANT.length);
-
-        // generate random r of length c2Len bytes
-        byte[] r = new byte[c2Len];
-        sr.nextBytes(r);
-
-        // get PRNG object
-                // get PRNG object
-        DigestRandomGenerator sr0 = new DigestRandomGenerator(new SHA1Digest());
-
-        // seed PRNG with r'
-        sr0.addSeedMaterial(r);
-
-        // generate random sequence ...
-        byte[] c1 = new byte[c1Len];
-        sr0.nextBytes(c1);
-
-        // ... and XOR with (m||const) to obtain c1
-        for (int i = c1Len - 1; i >= 0; i--)
-        {
-            c1[i] ^= mConst[i];
-        }
-
-        // compute H(c1) ...
-        byte[] c2 = new byte[messDigest.getDigestSize()];
-        messDigest.update(c1, 0, c1.length);
-        messDigest.doFinal(c2, 0);
-
-        // ... and XOR with r
-        for (int i = c2Len - 1; i >= 0; i--)
-        {
-            c2[i] ^= r[i];
-        }
-
-        // compute (c2||c1)
-        byte[] c2c1 = ByteUtils.concatenate(c2, c1);
-
-        // split (c2||c1) into (c6||c5||c4), where c4Len is k/8 bytes, c5Len is
-        // floor[log(n|t)]/8 bytes, and c6Len is c1Len+c2Len-c4Len-c5Len (may be
-        // 0).
-        byte[] c6 = new byte[0];
-        if (c6Len > 0)
-        {
-            c6 = new byte[c6Len];
-            System.arraycopy(c2c1, 0, c6, 0, c6Len);
-        }
-
-        byte[] c5 = new byte[c5Len];
-        System.arraycopy(c2c1, c6Len, c5, 0, c5Len);
-
-        byte[] c4 = new byte[c4Len];
-        System.arraycopy(c2c1, c6Len + c5Len, c4, 0, c4Len);
-
-        // convert c4 to vector over GF(2)
-        GF2Vector c4Vec = GF2Vector.OS2VP(k, c4);
-
-        // convert c5 to error vector z
-        GF2Vector z = Conversions.encode(n, t, c5);
-
-        // compute encC4 = E(c4, z)
-        byte[] encC4 = McElieceCCA2Primitives.encryptionPrimitive((McElieceCCA2PublicKeyParameters)key,
-            c4Vec, z).getEncoded();
-
-        // if c6Len > 0
-        if (c6Len > 0)
-        {
-            // return (c6||encC4)
-            return ByteUtils.concatenate(c6, encC4);
-        }
-        // else, return encC4
-        return encC4;
-    }
-
-
-    public byte[] messageDecrypt(byte[] input)
-        throws Exception
-    {
-
-        int nDiv8 = n >> 3;
-
-        if (input.length < nDiv8)
-        {
-            throw new Exception("Bad Padding: Ciphertext too short.");
-        }
-
-        int c2Len = messDigest.getDigestSize();
-        int c4Len = k >> 3;
-        int c6Len = input.length - nDiv8;
-
-        // split cipher text (c6||encC4), where c6 may be empty
-        byte[] c6, encC4;
-        if (c6Len > 0)
-        {
-            byte[][] c6EncC4 = ByteUtils.split(input, c6Len);
-            c6 = c6EncC4[0];
-            encC4 = c6EncC4[1];
-        }
-        else
-        {
-            c6 = new byte[0];
-            encC4 = input;
-        }
-
-        // convert encC4 into vector over GF(2)
-        GF2Vector encC4Vec = GF2Vector.OS2VP(n, encC4);
-
-        // decrypt encC4Vec to obtain c4 and error vector z
-        GF2Vector[] c4z = McElieceCCA2Primitives.decryptionPrimitive((McElieceCCA2PrivateKeyParameters)key,
-            encC4Vec);
-        byte[] c4 = c4z[0].getEncoded();
-        GF2Vector z = c4z[1];
-
-        // if length of c4 is greater than c4Len (because of padding) ...
-        if (c4.length > c4Len)
-        {
-            // ... truncate the padding bytes
-            c4 = ByteUtils.subArray(c4, 0, c4Len);
-        }
-
-        // compute c5 = Conv^-1(z)
-        byte[] c5 = Conversions.decode(n, t, z);
-
-        // compute (c6||c5||c4)
-        byte[] c6c5c4 = ByteUtils.concatenate(c6, c5);
-        c6c5c4 = ByteUtils.concatenate(c6c5c4, c4);
-
-        // split (c6||c5||c4) into (c2||c1), where c2Len = mdLen and c1Len =
-        // input.length-c2Len bytes.
-        int c1Len = c6c5c4.length - c2Len;
-        byte[][] c2c1 = ByteUtils.split(c6c5c4, c2Len);
-        byte[] c2 = c2c1[0];
-        byte[] c1 = c2c1[1];
-
-        // compute H(c1) ...
-        byte[] rPrime = new byte[messDigest.getDigestSize()];
-        messDigest.update(c1, 0, c1.length);
-        messDigest.doFinal(rPrime, 0);
-
-        // ... and XOR with c2 to obtain r'
-        for (int i = c2Len - 1; i >= 0; i--)
-        {
-            rPrime[i] ^= c2[i];
-        }
-
-        // get PRNG object
-        DigestRandomGenerator sr0 = new DigestRandomGenerator(new SHA1Digest());
-
-        // seed PRNG with r'
-        sr0.addSeedMaterial(rPrime);
-
-        // generate random sequence R(r') ...
-        byte[] mConstPrime = new byte[c1Len];
-        sr0.nextBytes(mConstPrime);
-
-        // ... and XOR with c1 to obtain (m||const')
-        for (int i = c1Len - 1; i >= 0; i--)
-        {
-            mConstPrime[i] ^= c1[i];
-        }
-
-        if (mConstPrime.length < c1Len)
-        {
-            throw new Exception("Bad Padding: invalid ciphertext");
-        }
-
-        byte[][] temp = ByteUtils.split(mConstPrime, c1Len
-            - PUBLIC_CONSTANT.length);
-        byte[] mr = temp[0];
-        byte[] constPrime = temp[1];
-
-        if (!ByteUtils.equals(constPrime, PUBLIC_CONSTANT))
-        {
-            throw new Exception("Bad Padding: invalid ciphertext");
-        }
-
-        return mr;
-    }
-
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/mceliece/McElieceKobaraImaiDigestCipher.java b/bcprov/src/main/java/org/bouncycastle/pqc/crypto/mceliece/McElieceKobaraImaiDigestCipher.java
deleted file mode 100644
index 365f387..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/mceliece/McElieceKobaraImaiDigestCipher.java
+++ /dev/null
@@ -1,128 +0,0 @@
-package org.bouncycastle.pqc.crypto.mceliece;
-
-
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.params.AsymmetricKeyParameter;
-import org.bouncycastle.crypto.params.ParametersWithRandom;
-import org.bouncycastle.pqc.crypto.MessageEncryptor;
-
-// TODO should implement some interface?
-public class McElieceKobaraImaiDigestCipher
-{
-
-    private final Digest messDigest;
-
-    private final MessageEncryptor mcElieceCCA2Cipher;
-
-    private boolean forEncrypting;
-
-
-    public McElieceKobaraImaiDigestCipher(MessageEncryptor mcElieceCCA2Cipher, Digest messDigest)
-    {
-        this.mcElieceCCA2Cipher = mcElieceCCA2Cipher;
-        this.messDigest = messDigest;
-    }
-
-
-    public void init(boolean forEncrypting,
-                     CipherParameters param)
-    {
-
-        this.forEncrypting = forEncrypting;
-        AsymmetricKeyParameter k;
-
-        if (param instanceof ParametersWithRandom)
-        {
-            k = (AsymmetricKeyParameter)((ParametersWithRandom)param).getParameters();
-        }
-        else
-        {
-            k = (AsymmetricKeyParameter)param;
-        }
-
-        if (forEncrypting && k.isPrivate())
-        {
-            throw new IllegalArgumentException("Encrypting Requires Public Key.");
-        }
-
-        if (!forEncrypting && !k.isPrivate())
-        {
-            throw new IllegalArgumentException("Decrypting Requires Private Key.");
-        }
-
-        reset();
-
-        mcElieceCCA2Cipher.init(forEncrypting, param);
-    }
-
-
-    public byte[] messageEncrypt()
-    {
-        if (!forEncrypting)
-        {
-            throw new IllegalStateException("McElieceKobaraImaiDigestCipher not initialised for encrypting.");
-        }
-
-        byte[] hash = new byte[messDigest.getDigestSize()];
-        messDigest.doFinal(hash, 0);
-        byte[] enc = null;
-
-        try
-        {
-            enc = mcElieceCCA2Cipher.messageEncrypt(hash);
-        }
-        catch (Exception e)
-        {
-            e.printStackTrace();
-        }
-
-
-        return enc;
-    }
-
-
-    public byte[] messageDecrypt(byte[] ciphertext)
-    {
-        byte[] output = null;
-        if (forEncrypting)
-        {
-            throw new IllegalStateException("McElieceKobaraImaiDigestCipher not initialised for decrypting.");
-        }
-
-
-        try
-        {
-            output = mcElieceCCA2Cipher.messageDecrypt(ciphertext);
-        }
-        catch (Exception e)
-        {
-            e.printStackTrace();
-        }
-
-
-        return output;
-    }
-
-
-    public void update(byte b)
-    {
-        messDigest.update(b);
-
-    }
-
-    public void update(byte[] in, int off, int len)
-    {
-        messDigest.update(in, off, len);
-
-    }
-
-
-    public void reset()
-    {
-        messDigest.reset();
-
-    }
-
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/mceliece/McEliecePKCSCipher.java b/bcprov/src/main/java/org/bouncycastle/pqc/crypto/mceliece/McEliecePKCSCipher.java
deleted file mode 100644
index b4eecfb..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/mceliece/McEliecePKCSCipher.java
+++ /dev/null
@@ -1,224 +0,0 @@
-package org.bouncycastle.pqc.crypto.mceliece;
-
-import java.security.SecureRandom;
-
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.params.ParametersWithRandom;
-import org.bouncycastle.pqc.crypto.MessageEncryptor;
-import org.bouncycastle.pqc.math.linearalgebra.GF2Matrix;
-import org.bouncycastle.pqc.math.linearalgebra.GF2Vector;
-import org.bouncycastle.pqc.math.linearalgebra.GF2mField;
-import org.bouncycastle.pqc.math.linearalgebra.GoppaCode;
-import org.bouncycastle.pqc.math.linearalgebra.Permutation;
-import org.bouncycastle.pqc.math.linearalgebra.PolynomialGF2mSmallM;
-import org.bouncycastle.pqc.math.linearalgebra.Vector;
-
-/**
- * This class implements the McEliece Public Key cryptosystem (McEliecePKCS). It
- * was first described in R.J. McEliece, "A public key cryptosystem based on
- * algebraic coding theory", DSN progress report, 42-44:114-116, 1978. The
- * McEliecePKCS is the first cryptosystem which is based on error correcting
- * codes. The trapdoor for the McEliece cryptosystem using Goppa codes is the
- * knowledge of the Goppa polynomial used to generate the code.
- */
-public class McEliecePKCSCipher
-    implements MessageEncryptor
-{
-
-    /**
-     * The OID of the algorithm.
-     */
-    public static final String OID = "1.3.6.1.4.1.8301.3.1.3.4.1";
-
-
-    // the source of randomness
-    private SecureRandom sr;
-
-    // the McEliece main parameters
-    private int n, k, t;
-
-    // The maximum number of bytes the cipher can decrypt
-    public int maxPlainTextSize;
-
-    // The maximum number of bytes the cipher can encrypt
-    public int cipherTextSize;
-
-    McElieceKeyParameters key;
-
-
-    public void init(boolean forSigning,
-                     CipherParameters param)
-    {
-
-        if (forSigning)
-        {
-            if (param instanceof ParametersWithRandom)
-            {
-                ParametersWithRandom rParam = (ParametersWithRandom)param;
-
-                this.sr = rParam.getRandom();
-                this.key = (McEliecePublicKeyParameters)rParam.getParameters();
-                this.initCipherEncrypt((McEliecePublicKeyParameters)key);
-
-            }
-            else
-            {
-                this.sr = new SecureRandom();
-                this.key = (McEliecePublicKeyParameters)param;
-                this.initCipherEncrypt((McEliecePublicKeyParameters)key);
-            }
-        }
-        else
-        {
-            this.key = (McEliecePrivateKeyParameters)param;
-            this.initCipherDecrypt((McEliecePrivateKeyParameters)key);
-        }
-
-    }
-
-
-    /**
-     * Return the key size of the given key object.
-     *
-     * @param key the McElieceKeyParameters object
-     * @return the keysize of the given key object
-     */
-
-    public int getKeySize(McElieceKeyParameters key)
-    {
-
-        if (key instanceof McEliecePublicKeyParameters)
-        {
-            return ((McEliecePublicKeyParameters)key).getN();
-
-        }
-        if (key instanceof McEliecePrivateKeyParameters)
-        {
-            return ((McEliecePrivateKeyParameters)key).getN();
-        }
-        throw new IllegalArgumentException("unsupported type");
-
-    }
-
-
-    public void initCipherEncrypt(McEliecePublicKeyParameters pubKey)
-    {
-        this.sr = sr != null ? sr : new SecureRandom();
-        n = pubKey.getN();
-        k = pubKey.getK();
-        t = pubKey.getT();
-        cipherTextSize = n >> 3;
-        maxPlainTextSize = (k >> 3);
-    }
-
-
-    public void initCipherDecrypt(McEliecePrivateKeyParameters privKey)
-    {
-        n = privKey.getN();
-        k = privKey.getK();
-
-        maxPlainTextSize = (k >> 3);
-        cipherTextSize = n >> 3;
-    }
-
-    /**
-     * Encrypt a plain text.
-     *
-     * @param input the plain text
-     * @return the cipher text
-     */
-    public byte[] messageEncrypt(byte[] input)
-    {
-        GF2Vector m = computeMessageRepresentative(input);
-        GF2Vector z = new GF2Vector(n, t, sr);
-
-        GF2Matrix g = ((McEliecePublicKeyParameters)key).getG();
-        Vector mG = g.leftMultiply(m);
-        GF2Vector mGZ = (GF2Vector)mG.add(z);
-
-        return mGZ.getEncoded();
-    }
-
-    private GF2Vector computeMessageRepresentative(byte[] input)
-    {
-        byte[] data = new byte[maxPlainTextSize + ((k & 0x07) != 0 ? 1 : 0)];
-        System.arraycopy(input, 0, data, 0, input.length);
-        data[input.length] = 0x01;
-        return GF2Vector.OS2VP(k, data);
-    }
-
-    /**
-     * Decrypt a cipher text.
-     *
-     * @param input the cipher text
-     * @return the plain text
-     * @throws Exception if the cipher text is invalid.
-     */
-    public byte[] messageDecrypt(byte[] input)
-        throws Exception
-    {
-        GF2Vector vec = GF2Vector.OS2VP(n, input);
-        McEliecePrivateKeyParameters privKey = (McEliecePrivateKeyParameters)key;
-        GF2mField field = privKey.getField();
-        PolynomialGF2mSmallM gp = privKey.getGoppaPoly();
-        GF2Matrix sInv = privKey.getSInv();
-        Permutation p1 = privKey.getP1();
-        Permutation p2 = privKey.getP2();
-        GF2Matrix h = privKey.getH();
-        PolynomialGF2mSmallM[] qInv = privKey.getQInv();
-
-        // compute permutation P = P1 * P2
-        Permutation p = p1.rightMultiply(p2);
-
-        // compute P^-1
-        Permutation pInv = p.computeInverse();
-
-        // compute c P^-1
-        GF2Vector cPInv = (GF2Vector)vec.multiply(pInv);
-
-        // compute syndrome of c P^-1
-        GF2Vector syndrome = (GF2Vector)h.rightMultiply(cPInv);
-
-        // decode syndrome
-        GF2Vector z = GoppaCode.syndromeDecode(syndrome, field, gp, qInv);
-        GF2Vector mSG = (GF2Vector)cPInv.add(z);
-
-        // multiply codeword with P1 and error vector with P
-        mSG = (GF2Vector)mSG.multiply(p1);
-        z = (GF2Vector)z.multiply(p);
-
-        // extract mS (last k columns of mSG)
-        GF2Vector mS = mSG.extractRightVector(k);
-
-        // compute plaintext vector
-        GF2Vector mVec = (GF2Vector)sInv.leftMultiply(mS);
-
-        // compute and return plaintext
-        return computeMessage(mVec);
-    }
-
-    private byte[] computeMessage(GF2Vector mr)
-        throws Exception
-    {
-        byte[] mrBytes = mr.getEncoded();
-        // find first non-zero byte
-        int index;
-        for (index = mrBytes.length - 1; index >= 0 && mrBytes[index] == 0; index--)
-        {
-            ;
-        }
-
-        // check if padding byte is valid
-        if (index<0 || mrBytes[index] != 0x01)
-        {
-            throw new Exception("Bad Padding: invalid ciphertext");
-        }
-
-        // extract and return message
-        byte[] mBytes = new byte[index];
-        System.arraycopy(mrBytes, 0, mBytes, 0, index);
-        return mBytes;
-    }
-
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/mceliece/McEliecePKCSDigestCipher.java b/bcprov/src/main/java/org/bouncycastle/pqc/crypto/mceliece/McEliecePKCSDigestCipher.java
deleted file mode 100644
index d8e6ba2..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/mceliece/McEliecePKCSDigestCipher.java
+++ /dev/null
@@ -1,128 +0,0 @@
-package org.bouncycastle.pqc.crypto.mceliece;
-
-
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.params.AsymmetricKeyParameter;
-import org.bouncycastle.crypto.params.ParametersWithRandom;
-import org.bouncycastle.pqc.crypto.MessageEncryptor;
-
-// TODO should implement some interface?
-public class McEliecePKCSDigestCipher
-{
-
-    private final Digest messDigest;
-
-    private final MessageEncryptor mcElieceCipher;
-
-    private boolean forEncrypting;
-
-
-    public McEliecePKCSDigestCipher(MessageEncryptor mcElieceCipher, Digest messDigest)
-    {
-        this.mcElieceCipher = mcElieceCipher;
-        this.messDigest = messDigest;
-    }
-
-
-    public void init(boolean forEncrypting,
-                     CipherParameters param)
-    {
-
-        this.forEncrypting = forEncrypting;
-        AsymmetricKeyParameter k;
-
-        if (param instanceof ParametersWithRandom)
-        {
-            k = (AsymmetricKeyParameter)((ParametersWithRandom)param).getParameters();
-        }
-        else
-        {
-            k = (AsymmetricKeyParameter)param;
-        }
-
-        if (forEncrypting && k.isPrivate())
-        {
-            throw new IllegalArgumentException("Encrypting Requires Public Key.");
-        }
-
-        if (!forEncrypting && !k.isPrivate())
-        {
-            throw new IllegalArgumentException("Decrypting Requires Private Key.");
-        }
-
-        reset();
-
-        mcElieceCipher.init(forEncrypting, param);
-    }
-
-
-    public byte[] messageEncrypt()
-    {
-        if (!forEncrypting)
-        {
-            throw new IllegalStateException("McEliecePKCSDigestCipher not initialised for encrypting.");
-        }
-
-        byte[] hash = new byte[messDigest.getDigestSize()];
-        messDigest.doFinal(hash, 0);
-        byte[] enc = null;
-
-        try
-        {
-            enc = mcElieceCipher.messageEncrypt(hash);
-        }
-        catch (Exception e)
-        {
-            e.printStackTrace();
-        }
-
-
-        return enc;
-    }
-
-
-    public byte[] messageDecrypt(byte[] ciphertext)
-    {
-        byte[] output = null;
-        if (forEncrypting)
-        {
-            throw new IllegalStateException("McEliecePKCSDigestCipher not initialised for decrypting.");
-        }
-
-
-        try
-        {
-            output = mcElieceCipher.messageDecrypt(ciphertext);
-        }
-        catch (Exception e)
-        {
-            e.printStackTrace();
-        }
-
-
-        return output;
-    }
-
-
-    public void update(byte b)
-    {
-        messDigest.update(b);
-
-    }
-
-    public void update(byte[] in, int off, int len)
-    {
-        messDigest.update(in, off, len);
-
-    }
-
-
-    public void reset()
-    {
-        messDigest.reset();
-
-    }
-
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/mceliece/McElieceParameters.java b/bcprov/src/main/java/org/bouncycastle/pqc/crypto/mceliece/McElieceParameters.java
deleted file mode 100644
index e90c784..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/mceliece/McElieceParameters.java
+++ /dev/null
@@ -1,181 +0,0 @@
-package org.bouncycastle.pqc.crypto.mceliece;
-
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.pqc.math.linearalgebra.PolynomialRingGF2;
-
-public class McElieceParameters
-    implements CipherParameters
-{
-
-    /**
-     * The default extension degree
-     */
-    public static final int DEFAULT_M = 11;
-
-    /**
-     * The default error correcting capability.
-     */
-    public static final int DEFAULT_T = 50;
-
-    /**
-     * extension degree of the finite field GF(2^m)
-     */
-    private int m;
-
-    /**
-     * error correction capability of the code
-     */
-    private int t;
-
-    /**
-     * length of the code
-     */
-    private int n;
-
-    /**
-     * the field polynomial
-     */
-    private int fieldPoly;
-
-    /**
-     * Constructor. Set the default parameters: extension degree.
-     */
-    public McElieceParameters()
-    {
-        this(DEFAULT_M, DEFAULT_T);
-    }
-
-    /**
-     * Constructor.
-     *
-     * @param keysize the length of a Goppa code
-     * @throws IllegalArgumentException if <tt>keysize &lt; 1</tt>.
-     */
-    public McElieceParameters(int keysize)
-        throws IllegalArgumentException
-    {
-        if (keysize < 1)
-        {
-            throw new IllegalArgumentException("key size must be positive");
-        }
-        m = 0;
-        n = 1;
-        while (n < keysize)
-        {
-            n <<= 1;
-            m++;
-        }
-        t = n >>> 1;
-        t /= m;
-        fieldPoly = PolynomialRingGF2.getIrreduciblePolynomial(m);
-    }
-
-    /**
-     * Constructor.
-     *
-     * @param m degree of the finite field GF(2^m)
-     * @param t error correction capability of the code
-     * @throws IllegalArgumentException if <tt>m &lt; 1</tt> or <tt>m &gt; 32</tt> or
-     * <tt>t &lt; 0</tt> or <tt>t &gt; n</tt>.
-     */
-    public McElieceParameters(int m, int t)
-        throws IllegalArgumentException
-    {
-        if (m < 1)
-        {
-            throw new IllegalArgumentException("m must be positive");
-        }
-        if (m > 32)
-        {
-            throw new IllegalArgumentException("m is too large");
-        }
-        this.m = m;
-        n = 1 << m;
-        if (t < 0)
-        {
-            throw new IllegalArgumentException("t must be positive");
-        }
-        if (t > n)
-        {
-            throw new IllegalArgumentException("t must be less than n = 2^m");
-        }
-        this.t = t;
-        fieldPoly = PolynomialRingGF2.getIrreduciblePolynomial(m);
-    }
-
-    /**
-     * Constructor.
-     *
-     * @param m    degree of the finite field GF(2^m)
-     * @param t    error correction capability of the code
-     * @param poly the field polynomial
-     * @throws IllegalArgumentException if <tt>m &lt; 1</tt> or <tt>m &gt; 32</tt> or
-     * <tt>t &lt; 0</tt> or <tt>t &gt; n</tt> or
-     * <tt>poly</tt> is not an irreducible field polynomial.
-     */
-    public McElieceParameters(int m, int t, int poly)
-        throws IllegalArgumentException
-    {
-        this.m = m;
-        if (m < 1)
-        {
-            throw new IllegalArgumentException("m must be positive");
-        }
-        if (m > 32)
-        {
-            throw new IllegalArgumentException(" m is too large");
-        }
-        this.n = 1 << m;
-        this.t = t;
-        if (t < 0)
-        {
-            throw new IllegalArgumentException("t must be positive");
-        }
-        if (t > n)
-        {
-            throw new IllegalArgumentException("t must be less than n = 2^m");
-        }
-        if ((PolynomialRingGF2.degree(poly) == m)
-            && (PolynomialRingGF2.isIrreducible(poly)))
-        {
-            this.fieldPoly = poly;
-        }
-        else
-        {
-            throw new IllegalArgumentException(
-                "polynomial is not a field polynomial for GF(2^m)");
-        }
-    }
-
-    /**
-     * @return the extension degree of the finite field GF(2^m)
-     */
-    public int getM()
-    {
-        return m;
-    }
-
-    /**
-     * @return the length of the code
-     */
-    public int getN()
-    {
-        return n;
-    }
-
-    /**
-     * @return the error correction capability of the code
-     */
-    public int getT()
-    {
-        return t;
-    }
-
-    /**
-     * @return the field polynomial
-     */
-    public int getFieldPoly()
-    {
-        return fieldPoly;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/mceliece/McEliecePointchevalCipher.java b/bcprov/src/main/java/org/bouncycastle/pqc/crypto/mceliece/McEliecePointchevalCipher.java
deleted file mode 100644
index 854d79e..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/mceliece/McEliecePointchevalCipher.java
+++ /dev/null
@@ -1,241 +0,0 @@
-package org.bouncycastle.pqc.crypto.mceliece;
-
-import java.security.SecureRandom;
-
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.digests.SHA1Digest;
-import org.bouncycastle.crypto.params.ParametersWithRandom;
-import org.bouncycastle.crypto.prng.DigestRandomGenerator;
-import org.bouncycastle.pqc.crypto.MessageEncryptor;
-import org.bouncycastle.pqc.math.linearalgebra.ByteUtils;
-import org.bouncycastle.pqc.math.linearalgebra.GF2Vector;
-
-/**
- * This class implements the Pointcheval conversion of the McEliecePKCS.
- * Pointcheval presents a generic technique to make a CCA2-secure cryptosystem
- * from any partially trapdoor one-way function in the random oracle model. For
- * details, see D. Engelbert, R. Overbeck, A. Schmidt, "A summary of the
- * development of the McEliece Cryptosystem", technical report.
- */
-public class McEliecePointchevalCipher
-    implements MessageEncryptor
-{
-
-
-    /**
-     * The OID of the algorithm.
-     */
-    public static final String OID = "1.3.6.1.4.1.8301.3.1.3.4.2.2";
-
-    private Digest messDigest;
-
-    private SecureRandom sr;
-
-    /**
-     * The McEliece main parameters
-     */
-    private int n, k, t;
-
-    McElieceCCA2KeyParameters key;
-
-    public void init(boolean forSigning,
-                     CipherParameters param)
-    {
-
-        if (forSigning)
-        {
-            if (param instanceof ParametersWithRandom)
-            {
-                ParametersWithRandom rParam = (ParametersWithRandom)param;
-
-                this.sr = rParam.getRandom();
-                this.key = (McElieceCCA2PublicKeyParameters)rParam.getParameters();
-                this.initCipherEncrypt((McElieceCCA2PublicKeyParameters)key);
-
-            }
-            else
-            {
-                this.sr = new SecureRandom();
-                this.key = (McElieceCCA2PublicKeyParameters)param;
-                this.initCipherEncrypt((McElieceCCA2PublicKeyParameters)key);
-            }
-        }
-        else
-        {
-            this.key = (McElieceCCA2PrivateKeyParameters)param;
-            this.initCipherDecrypt((McElieceCCA2PrivateKeyParameters)key);
-        }
-
-    }
-
-    /**
-     * Return the key size of the given key object.
-     *
-     * @param key the McElieceCCA2KeyParameters object
-     * @return the key size of the given key object
-     * @throws IllegalArgumentException if the key is invalid
-     */
-    public int getKeySize(McElieceCCA2KeyParameters key)
-        throws IllegalArgumentException
-    {
-
-        if (key instanceof McElieceCCA2PublicKeyParameters)
-        {
-            return ((McElieceCCA2PublicKeyParameters)key).getN();
-
-        }
-        if (key instanceof McElieceCCA2PrivateKeyParameters)
-        {
-            return ((McElieceCCA2PrivateKeyParameters)key).getN();
-        }
-        throw new IllegalArgumentException("unsupported type");
-
-    }
-
-
-    protected int decryptOutputSize(int inLen)
-    {
-        return 0;
-    }
-
-    protected int encryptOutputSize(int inLen)
-    {
-        return 0;
-    }
-
-
-    public void initCipherEncrypt(McElieceCCA2PublicKeyParameters pubKey)
-    {
-        this.sr = sr != null ? sr : new SecureRandom();
-        this.messDigest = pubKey.getParameters().getDigest();
-        n = pubKey.getN();
-        k = pubKey.getK();
-        t = pubKey.getT();
-    }
-
-    public void initCipherDecrypt(McElieceCCA2PrivateKeyParameters privKey)
-    {
-        this.messDigest = privKey.getParameters().getDigest();
-        n = privKey.getN();
-        k = privKey.getK();
-        t = privKey.getT();
-    }
-
-    public byte[] messageEncrypt(byte[] input)
-        throws Exception
-    {
-
-        int kDiv8 = k >> 3;
-
-        // generate random r of length k div 8 bytes
-        byte[] r = new byte[kDiv8];
-        sr.nextBytes(r);
-
-        // generate random vector r' of length k bits
-        GF2Vector rPrime = new GF2Vector(k, sr);
-
-        // convert r' to byte array
-        byte[] rPrimeBytes = rPrime.getEncoded();
-
-        // compute (input||r)
-        byte[] mr = ByteUtils.concatenate(input, r);
-
-        // compute H(input||r)
-        messDigest.update(mr, 0, mr.length);
-        byte[] hmr = new byte[messDigest.getDigestSize()];
-        messDigest.doFinal(hmr, 0);
-
-
-        // convert H(input||r) to error vector z
-        GF2Vector z = Conversions.encode(n, t, hmr);
-
-        // compute c1 = E(rPrime, z)
-        byte[] c1 = McElieceCCA2Primitives.encryptionPrimitive((McElieceCCA2PublicKeyParameters)key, rPrime,
-            z).getEncoded();
-
-        // get PRNG object
-        DigestRandomGenerator sr0 = new DigestRandomGenerator(new SHA1Digest());
-
-        // seed PRNG with r'
-        sr0.addSeedMaterial(rPrimeBytes);
-
-        // generate random c2
-        byte[] c2 = new byte[input.length + kDiv8];
-        sr0.nextBytes(c2);
-
-        // XOR with input
-        for (int i = 0; i < input.length; i++)
-        {
-            c2[i] ^= input[i];
-        }
-        // XOR with r
-        for (int i = 0; i < kDiv8; i++)
-        {
-            c2[input.length + i] ^= r[i];
-        }
-
-        // return (c1||c2)
-        return ByteUtils.concatenate(c1, c2);
-    }
-
-    public byte[] messageDecrypt(byte[] input)
-        throws Exception
-    {
-
-        int c1Len = (n + 7) >> 3;
-        int c2Len = input.length - c1Len;
-
-        // split cipher text (c1||c2)
-        byte[][] c1c2 = ByteUtils.split(input, c1Len);
-        byte[] c1 = c1c2[0];
-        byte[] c2 = c1c2[1];
-
-        // decrypt c1 ...
-        GF2Vector c1Vec = GF2Vector.OS2VP(n, c1);
-        GF2Vector[] c1Dec = McElieceCCA2Primitives.decryptionPrimitive((McElieceCCA2PrivateKeyParameters)key,
-            c1Vec);
-        byte[] rPrimeBytes = c1Dec[0].getEncoded();
-        // ... and obtain error vector z
-        GF2Vector z = c1Dec[1];
-
-        // get PRNG object
-        DigestRandomGenerator sr0 = new DigestRandomGenerator(new SHA1Digest());
-
-        // seed PRNG with r'
-        sr0.addSeedMaterial(rPrimeBytes);
-
-        // generate random sequence
-        byte[] mrBytes = new byte[c2Len];
-        sr0.nextBytes(mrBytes);
-
-        // XOR with c2 to obtain (m||r)
-        for (int i = 0; i < c2Len; i++)
-        {
-            mrBytes[i] ^= c2[i];
-        }
-
-        // compute H(m||r)
-        messDigest.update(mrBytes, 0, mrBytes.length);
-        byte[] hmr = new byte[messDigest.getDigestSize()];
-        messDigest.doFinal(hmr, 0);
-
-        // compute Conv(H(m||r))
-        c1Vec = Conversions.encode(n, t, hmr);
-
-        // check that Conv(H(m||r)) = z
-        if (!c1Vec.equals(z))
-        {
-            throw new Exception("Bad Padding: Invalid ciphertext.");
-        }
-
-        // split (m||r) to obtain m
-        int kDiv8 = k >> 3;
-        byte[][] mr = ByteUtils.split(mrBytes, c2Len - kDiv8);
-
-        // return plain text m
-        return mr[0];
-    }
-
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/mceliece/McEliecePointchevalDigestCipher.java b/bcprov/src/main/java/org/bouncycastle/pqc/crypto/mceliece/McEliecePointchevalDigestCipher.java
deleted file mode 100644
index 8a1ed62..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/mceliece/McEliecePointchevalDigestCipher.java
+++ /dev/null
@@ -1,128 +0,0 @@
-package org.bouncycastle.pqc.crypto.mceliece;
-
-
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.params.AsymmetricKeyParameter;
-import org.bouncycastle.crypto.params.ParametersWithRandom;
-import org.bouncycastle.pqc.crypto.MessageEncryptor;
-
-// TODO should implement some interface?
-public class McEliecePointchevalDigestCipher
-{
-
-    private final Digest messDigest;
-
-    private final MessageEncryptor mcElieceCCA2Cipher;
-
-    private boolean forEncrypting;
-
-
-    public McEliecePointchevalDigestCipher(MessageEncryptor mcElieceCCA2Cipher, Digest messDigest)
-    {
-        this.mcElieceCCA2Cipher = mcElieceCCA2Cipher;
-        this.messDigest = messDigest;
-    }
-
-
-    public void init(boolean forEncrypting,
-                     CipherParameters param)
-    {
-
-        this.forEncrypting = forEncrypting;
-        AsymmetricKeyParameter k;
-
-        if (param instanceof ParametersWithRandom)
-        {
-            k = (AsymmetricKeyParameter)((ParametersWithRandom)param).getParameters();
-        }
-        else
-        {
-            k = (AsymmetricKeyParameter)param;
-        }
-
-        if (forEncrypting && k.isPrivate())
-        {
-            throw new IllegalArgumentException("Encrypting Requires Public Key.");
-        }
-
-        if (!forEncrypting && !k.isPrivate())
-        {
-            throw new IllegalArgumentException("Decrypting Requires Private Key.");
-        }
-
-        reset();
-
-        mcElieceCCA2Cipher.init(forEncrypting, param);
-    }
-
-
-    public byte[] messageEncrypt()
-    {
-        if (!forEncrypting)
-        {
-            throw new IllegalStateException("McEliecePointchevalDigestCipher not initialised for encrypting.");
-        }
-
-        byte[] hash = new byte[messDigest.getDigestSize()];
-        messDigest.doFinal(hash, 0);
-        byte[] enc = null;
-
-        try
-        {
-            enc = mcElieceCCA2Cipher.messageEncrypt(hash);
-        }
-        catch (Exception e)
-        {
-            e.printStackTrace();
-        }
-
-
-        return enc;
-    }
-
-
-    public byte[] messageDecrypt(byte[] ciphertext)
-    {
-        byte[] output = null;
-        if (forEncrypting)
-        {
-            throw new IllegalStateException("McEliecePointchevalDigestCipher not initialised for decrypting.");
-        }
-
-
-        try
-        {
-            output = mcElieceCCA2Cipher.messageDecrypt(ciphertext);
-        }
-        catch (Exception e)
-        {
-            e.printStackTrace();
-        }
-
-
-        return output;
-    }
-
-
-    public void update(byte b)
-    {
-        messDigest.update(b);
-
-    }
-
-    public void update(byte[] in, int off, int len)
-    {
-        messDigest.update(in, off, len);
-
-    }
-
-
-    public void reset()
-    {
-        messDigest.reset();
-
-    }
-
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/mceliece/McEliecePrivateKeyParameters.java b/bcprov/src/main/java/org/bouncycastle/pqc/crypto/mceliece/McEliecePrivateKeyParameters.java
deleted file mode 100644
index 762c2a2..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/mceliece/McEliecePrivateKeyParameters.java
+++ /dev/null
@@ -1,197 +0,0 @@
-package org.bouncycastle.pqc.crypto.mceliece;
-
-import org.bouncycastle.pqc.math.linearalgebra.GF2Matrix;
-import org.bouncycastle.pqc.math.linearalgebra.GF2mField;
-import org.bouncycastle.pqc.math.linearalgebra.Permutation;
-import org.bouncycastle.pqc.math.linearalgebra.PolynomialGF2mSmallM;
-
-
-public class McEliecePrivateKeyParameters
-    extends McElieceKeyParameters
-{
-
-    // the OID of the algorithm
-    private String oid;
-
-    // the length of the code
-    private int n;
-
-    // the dimension of the code, where <tt>k &gt;= n - mt</tt>
-    private int k;
-
-    // the underlying finite field
-    private GF2mField field;
-
-    // the irreducible Goppa polynomial
-    private PolynomialGF2mSmallM goppaPoly;
-
-    // a k x k random binary non-singular matrix
-    private GF2Matrix sInv;
-
-    // the permutation used to generate the systematic check matrix
-    private Permutation p1;
-
-    // the permutation used to compute the public generator matrix
-    private Permutation p2;
-
-    // the canonical check matrix of the code
-    private GF2Matrix h;
-
-    // the matrix used to compute square roots in <tt>(GF(2^m))^t</tt>
-    private PolynomialGF2mSmallM[] qInv;
-
-    /**
-     * Constructor.
-     *
-     * @param oid
-     * @param n         the length of the code
-     * @param k         the dimension of the code
-     * @param field     the field polynomial defining the finite field
-     *                  <tt>GF(2<sup>m</sup>)</tt>
-     * @param goppaPoly the irreducible Goppa polynomial
-     * @param sInv      the matrix <tt>S<sup>-1</sup></tt>
-     * @param p1        the permutation used to generate the systematic check
-     *                  matrix
-     * @param p2        the permutation used to compute the public generator
-     *                  matrix
-     * @param h         the canonical check matrix
-     * @param qInv      the matrix used to compute square roots in
-     *                  <tt>(GF(2<sup>m</sup>))<sup>t</sup></tt>
-     * @param params    McElieceParameters
-     */
-    public McEliecePrivateKeyParameters(String oid, int n, int k, GF2mField field,
-                                        PolynomialGF2mSmallM goppaPoly, GF2Matrix sInv, Permutation p1,
-                                        Permutation p2, GF2Matrix h, PolynomialGF2mSmallM[] qInv, McElieceParameters params)
-    {
-        super(true, params);
-        this.oid = oid;
-        this.k = k;
-        this.n = n;
-        this.field = field;
-        this.goppaPoly = goppaPoly;
-        this.sInv = sInv;
-        this.p1 = p1;
-        this.p2 = p2;
-        this.h = h;
-        this.qInv = qInv;
-    }
-
-    /**
-     * Constructor (used by the {@link McElieceKeyFactory}).
-     *
-     * @param oid
-     * @param n            the length of the code
-     * @param k            the dimension of the code
-     * @param encField     the encoded field polynomial defining the finite field
-     *                     <tt>GF(2<sup>m</sup>)</tt>
-     * @param encGoppaPoly the encoded irreducible Goppa polynomial
-     * @param encSInv      the encoded matrix <tt>S<sup>-1</sup></tt>
-     * @param encP1        the encoded permutation used to generate the systematic
-     *                     check matrix
-     * @param encP2        the encoded permutation used to compute the public
-     *                     generator matrix
-     * @param encH         the encoded canonical check matrix
-     * @param encQInv      the encoded matrix used to compute square roots in
-     *                     <tt>(GF(2<sup>m</sup>))<sup>t</sup></tt>
-     * @param params       McElieceParameters
-     */
-    public McEliecePrivateKeyParameters(String oid, int n, int k, byte[] encField,
-                                        byte[] encGoppaPoly, byte[] encSInv, byte[] encP1, byte[] encP2,
-                                        byte[] encH, byte[][] encQInv, McElieceParameters params)
-    {
-        super(true, params);
-        this.oid = oid;
-        this.n = n;
-        this.k = k;
-        field = new GF2mField(encField);
-        goppaPoly = new PolynomialGF2mSmallM(field, encGoppaPoly);
-        sInv = new GF2Matrix(encSInv);
-        p1 = new Permutation(encP1);
-        p2 = new Permutation(encP2);
-        h = new GF2Matrix(encH);
-        qInv = new PolynomialGF2mSmallM[encQInv.length];
-        for (int i = 0; i < encQInv.length; i++)
-        {
-            qInv[i] = new PolynomialGF2mSmallM(field, encQInv[i]);
-        }
-    }
-
-    /**
-     * @return the length of the code
-     */
-    public int getN()
-    {
-        return n;
-    }
-
-    /**
-     * @return the dimension of the code
-     */
-    public int getK()
-    {
-        return k;
-    }
-
-    /**
-     * @return the finite field <tt>GF(2<sup>m</sup>)</tt>
-     */
-    public GF2mField getField()
-    {
-        return field;
-    }
-
-    /**
-     * @return the irreducible Goppa polynomial
-     */
-    public PolynomialGF2mSmallM getGoppaPoly()
-    {
-        return goppaPoly;
-    }
-
-    /**
-     * @return the k x k random binary non-singular matrix S^-1
-     */
-    public GF2Matrix getSInv()
-    {
-        return sInv;
-    }
-
-    /**
-     * @return the permutation used to generate the systematic check matrix
-     */
-    public Permutation getP1()
-    {
-        return p1;
-    }
-
-    /**
-     * @return the permutation used to compute the public generator matrix
-     */
-    public Permutation getP2()
-    {
-        return p2;
-    }
-
-    /**
-     * @return the canonical check matrix H
-     */
-    public GF2Matrix getH()
-    {
-        return h;
-    }
-
-    /**
-     * @return the matrix used to compute square roots in
-     *         <tt>(GF(2<sup>m</sup>))<sup>t</sup></tt>
-     */
-    public PolynomialGF2mSmallM[] getQInv()
-    {
-        return qInv;
-    }
-
-    public String getOIDString()
-    {
-        return oid;
-    }
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/mceliece/McEliecePublicKeyParameters.java b/bcprov/src/main/java/org/bouncycastle/pqc/crypto/mceliece/McEliecePublicKeyParameters.java
deleted file mode 100644
index 6059e2e..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/mceliece/McEliecePublicKeyParameters.java
+++ /dev/null
@@ -1,96 +0,0 @@
-package org.bouncycastle.pqc.crypto.mceliece;
-
-import org.bouncycastle.pqc.math.linearalgebra.GF2Matrix;
-
-
-public class McEliecePublicKeyParameters
-    extends McElieceKeyParameters
-{
-
-    // the OID of the algorithm
-    private String oid;
-
-    // the length of the code
-    private int n;
-
-    // the error correction capability of the code
-    private int t;
-
-    // the generator matrix
-    private GF2Matrix g;
-
-    /**
-     * Constructor (used by {@link McElieceKeyFactory}).
-     *
-     * @param oid
-     * @param n      the length of the code
-     * @param t      the error correction capability of the code
-     * @param g      the generator matrix
-     * @param params McElieceParameters
-     */
-    public McEliecePublicKeyParameters(String oid, int n, int t, GF2Matrix g, McElieceParameters params)
-    {
-        super(false, params);
-        this.oid = oid;
-        this.n = n;
-        this.t = t;
-        this.g = new GF2Matrix(g);
-    }
-
-    /**
-     * Constructor (used by {@link McElieceKeyFactory}).
-     *
-     * @param oid
-     * @param n      the length of the code
-     * @param t      the error correction capability of the code
-     * @param encG   the encoded generator matrix
-     * @param params McElieceParameters
-     */
-    public McEliecePublicKeyParameters(String oid, int t, int n, byte[] encG, McElieceParameters params)
-    {
-        super(false, params);
-        this.oid = oid;
-        this.n = n;
-        this.t = t;
-        this.g = new GF2Matrix(encG);
-    }
-
-    /**
-     * @return the length of the code
-     */
-    public int getN()
-    {
-        return n;
-    }
-
-    /**
-     * @return the error correction capability of the code
-     */
-    public int getT()
-    {
-        return t;
-    }
-
-    /**
-     * @return the generator matrix
-     */
-    public GF2Matrix getG()
-    {
-        return g;
-    }
-
-    public String getOIDString()
-    {
-        return oid;
-
-    }
-
-    /**
-     * @return the dimension of the code
-     */
-    public int getK()
-    {
-        return g.getNumRows();
-    }
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/ntru/IndexGenerator.java b/bcprov/src/main/java/org/bouncycastle/pqc/crypto/ntru/IndexGenerator.java
deleted file mode 100644
index 82974b3..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/ntru/IndexGenerator.java
+++ /dev/null
@@ -1,239 +0,0 @@
-package org.bouncycastle.pqc.crypto.ntru;
-
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.util.Arrays;
-
-/**
- * An implementation of the Index Generation Function in IEEE P1363.1.
- */
-public class IndexGenerator
-{
-    private byte[] seed;
-    private int N;
-    private int c;
-    private int minCallsR;
-    private int totLen;
-    private int remLen;
-    private BitString buf;
-    private int counter;
-    private boolean initialized;
-    private Digest hashAlg;
-    private int hLen;
-
-    /**
-     * Constructs a new index generator.
-     *
-     * @param seed   a seed of arbitrary length to initialize the index generator with
-     * @param params NtruEncrypt parameters
-     */
-    IndexGenerator(byte[] seed, NTRUEncryptionParameters params)
-    {
-        this.seed = seed;
-        N = params.N;
-        c = params.c;
-        minCallsR = params.minCallsR;
-
-        totLen = 0;
-        remLen = 0;
-        counter = 0;
-        hashAlg = params.hashAlg;
-
-        hLen = hashAlg.getDigestSize();   // hash length
-        initialized = false;
-    }
-
-    /**
-     * Returns a number <code>i</code> such that <code>0 &lt;= i &lt; N</code>.
-     *
-     * @return
-     */
-    int nextIndex()
-    {
-        if (!initialized)
-        {
-            buf = new BitString();
-            byte[] hash = new byte[hashAlg.getDigestSize()];
-            while (counter < minCallsR)
-            {
-                appendHash(buf, hash);
-                counter++;
-            }
-            totLen = minCallsR * 8 * hLen;
-            remLen = totLen;
-            initialized = true;
-        }
-
-        while (true)
-        {
-            totLen += c;
-            BitString M = buf.getTrailing(remLen);
-            if (remLen < c)
-            {
-                int tmpLen = c - remLen;
-                int cThreshold = counter + (tmpLen + hLen - 1) / hLen;
-                byte[] hash = new byte[hashAlg.getDigestSize()];
-                while (counter < cThreshold)
-                {
-                    appendHash(M, hash);
-                    counter++;
-                    if (tmpLen > 8 * hLen)
-                    {
-                        tmpLen -= 8 * hLen;
-                    }
-                }
-                remLen = 8 * hLen - tmpLen;
-                buf = new BitString();
-                buf.appendBits(hash);
-            }
-            else
-            {
-                remLen -= c;
-            }
-
-            int i = M.getLeadingAsInt(c);   // assume c<32
-            if (i < (1 << c) - ((1 << c) % N))
-            {
-                return i % N;
-            }
-        }
-    }
-
-    private void appendHash(BitString m, byte[] hash)
-    {
-        hashAlg.update(seed, 0, seed.length);
-
-        putInt(hashAlg, counter);
-
-        hashAlg.doFinal(hash, 0);
-
-        m.appendBits(hash);
-    }
-
-    private void putInt(Digest hashAlg, int counter)
-    {
-        hashAlg.update((byte)(counter >> 24));
-        hashAlg.update((byte)(counter >> 16));
-        hashAlg.update((byte)(counter >> 8));
-        hashAlg.update((byte)counter);
-    }
-
-    /**
-     * Represents a string of bits and supports appending, reading the head, and reading the tail.
-     */
-    public static class BitString
-    {
-        byte[] bytes = new byte[4];
-        int numBytes;   // includes the last byte even if only some of its bits are used
-        int lastByteBits;   // lastByteBits <= 8
-
-        /**
-         * Appends all bits in a byte array to the end of the bit string.
-         *
-         * @param bytes a byte array
-         */
-        void appendBits(byte[] bytes)
-        {
-            for (int i = 0; i != bytes.length; i++)
-            {
-                appendBits(bytes[i]);
-            }
-        }
-
-        /**
-         * Appends all bits in a byte to the end of the bit string.
-         *
-         * @param b a byte
-         */
-        public void appendBits(byte b)
-        {
-            if (numBytes == bytes.length)
-            {
-                bytes = copyOf(bytes, 2 * bytes.length);
-            }
-
-            if (numBytes == 0)
-            {
-                numBytes = 1;
-                bytes[0] = b;
-                lastByteBits = 8;
-            }
-            else if (lastByteBits == 8)
-            {
-                bytes[numBytes++] = b;
-            }
-            else
-            {
-                int s = 8 - lastByteBits;
-                bytes[numBytes - 1] |= (b & 0xFF) << lastByteBits;
-                bytes[numBytes++] = (byte)((b & 0xFF) >> s);
-            }
-        }
-
-        /**
-         * Returns the last <code>numBits</code> bits from the end of the bit string.
-         *
-         * @param numBits number of bits
-         * @return a new <code>BitString</code> of length <code>numBits</code>
-         */
-        public BitString getTrailing(int numBits)
-        {
-            BitString newStr = new BitString();
-            newStr.numBytes = (numBits + 7) / 8;
-            newStr.bytes = new byte[newStr.numBytes];
-            for (int i = 0; i < newStr.numBytes; i++)
-            {
-                newStr.bytes[i] = bytes[i];
-            }
-
-            newStr.lastByteBits = numBits % 8;
-            if (newStr.lastByteBits == 0)
-            {
-                newStr.lastByteBits = 8;
-            }
-            else
-            {
-                int s = 32 - newStr.lastByteBits;
-                newStr.bytes[newStr.numBytes - 1] = (byte)(newStr.bytes[newStr.numBytes - 1] << s >>> s);
-            }
-
-            return newStr;
-        }
-
-        /**
-         * Returns up to 32 bits from the beginning of the bit string.
-         *
-         * @param numBits number of bits
-         * @return an <code>int</code> whose lower <code>numBits</code> bits are the beginning of the bit string
-         */
-        public int getLeadingAsInt(int numBits)
-        {
-            int startBit = (numBytes - 1) * 8 + lastByteBits - numBits;
-            int startByte = startBit / 8;
-
-            int startBitInStartByte = startBit % 8;
-            int sum = (bytes[startByte] & 0xFF) >>> startBitInStartByte;
-            int shift = 8 - startBitInStartByte;
-            for (int i = startByte + 1; i < numBytes; i++)
-            {
-                sum |= (bytes[i] & 0xFF) << shift;
-                shift += 8;
-            }
-
-            return sum;
-        }
-
-        public byte[] getBytes()
-        {
-            return Arrays.clone(bytes);
-        }
-    }
-
-    private static byte[] copyOf(byte[] src, int len)
-    {
-        byte[] tmp = new byte[len];
-
-        System.arraycopy(src, 0, tmp, 0, len < src.length ? len : src.length);
-
-        return tmp;
-    }
-}
\ No newline at end of file
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/ntru/NTRUEncryptionKeyGenerationParameters.java b/bcprov/src/main/java/org/bouncycastle/pqc/crypto/ntru/NTRUEncryptionKeyGenerationParameters.java
deleted file mode 100644
index 8d64ae2..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/ntru/NTRUEncryptionKeyGenerationParameters.java
+++ /dev/null
@@ -1,463 +0,0 @@
-package org.bouncycastle.pqc.crypto.ntru;
-
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.security.SecureRandom;
-import java.util.Arrays;
-
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.KeyGenerationParameters;
-import org.bouncycastle.crypto.digests.SHA256Digest;
-import org.bouncycastle.crypto.digests.SHA512Digest;
-
-/**
- * A set of parameters for NtruEncrypt. Several predefined parameter sets are available and new ones can be created as well.
- */
-public class NTRUEncryptionKeyGenerationParameters
-    extends KeyGenerationParameters
-    implements Cloneable
-{
-    /**
-     * A conservative (in terms of security) parameter set that gives 256 bits of security and is optimized for key size.
-     */
-    public static final NTRUEncryptionKeyGenerationParameters EES1087EP2 = new NTRUEncryptionKeyGenerationParameters(1087, 2048, 120, 120, 256, 13, 25, 14, true, new byte[]{0, 6, 3}, true, false, new SHA512Digest());
-
-    /**
-     * A conservative (in terms of security) parameter set that gives 256 bits of security and is a tradeoff between key size and encryption/decryption speed.
-     */
-    public static final NTRUEncryptionKeyGenerationParameters EES1171EP1 = new NTRUEncryptionKeyGenerationParameters(1171, 2048, 106, 106, 256, 13, 20, 15, true, new byte[]{0, 6, 4}, true, false, new SHA512Digest());
-
-    /**
-     * A conservative (in terms of security) parameter set that gives 256 bits of security and is optimized for encryption/decryption speed.
-     */
-    public static final NTRUEncryptionKeyGenerationParameters EES1499EP1 = new NTRUEncryptionKeyGenerationParameters(1499, 2048, 79, 79, 256, 13, 17, 19, true, new byte[]{0, 6, 5}, true, false, new SHA512Digest());
-
-    /**
-     * A parameter set that gives 128 bits of security and uses simple ternary polynomials.
-     */
-    public static final NTRUEncryptionKeyGenerationParameters APR2011_439 = new NTRUEncryptionKeyGenerationParameters(439, 2048, 146, 130, 128, 9, 32, 9, true, new byte[]{0, 7, 101}, true, false, new SHA256Digest());
-
-    /**
-     * Like <code>APR2011_439</code>, this parameter set gives 128 bits of security but uses product-form polynomials and <code>f=1+pF</code>.
-     */
-    public static final NTRUEncryptionKeyGenerationParameters APR2011_439_FAST = new NTRUEncryptionKeyGenerationParameters(439, 2048, 9, 8, 5, 130, 128, 9, 32, 9, true, new byte[]{0, 7, 101}, true, true, new SHA256Digest());
-
-    /**
-     * A parameter set that gives 256 bits of security and uses simple ternary polynomials.
-     */
-    public static final NTRUEncryptionKeyGenerationParameters APR2011_743 = new NTRUEncryptionKeyGenerationParameters(743, 2048, 248, 220, 256, 10, 27, 14, true, new byte[]{0, 7, 105}, false, false, new SHA512Digest());
-
-    /**
-     * Like <code>APR2011_743</code>, this parameter set gives 256 bits of security but uses product-form polynomials and <code>f=1+pF</code>.
-     */
-    public static final NTRUEncryptionKeyGenerationParameters APR2011_743_FAST = new NTRUEncryptionKeyGenerationParameters(743, 2048, 11, 11, 15, 220, 256, 10, 27, 14, true, new byte[]{0, 7, 105}, false, true, new SHA512Digest());
-
-    public int N, q, df, df1, df2, df3;
-    public int dr;
-    public int dr1;
-    public int dr2;
-    public int dr3;
-    public int dg;
-    int llen;
-    public int maxMsgLenBytes;
-    public int db;
-    public int bufferLenBits;
-    int bufferLenTrits;
-    public int dm0;
-    public int pkLen;
-    public int c;
-    public int minCallsR;
-    public int minCallsMask;
-    public boolean hashSeed;
-    public byte[] oid;
-    public boolean sparse;
-    public boolean fastFp;
-    public int polyType;
-    public Digest hashAlg;
-
-    /**
-     * Constructs a parameter set that uses ternary private keys (i.e. <code>polyType=SIMPLE</code>).
-     *
-     * @param N            number of polynomial coefficients
-     * @param q            modulus
-     * @param df           number of ones in the private polynomial <code>f</code>
-     * @param dm0          minimum acceptable number of -1's, 0's, and 1's in the polynomial <code>m'</code> in the last encryption step
-     * @param db           number of random bits to prepend to the message
-     * @param c            a parameter for the Index Generation Function ({@link org.bouncycastle.pqc.crypto.ntru.IndexGenerator})
-     * @param minCallsR    minimum number of hash calls for the IGF to make
-     * @param minCallsMask minimum number of calls to generate the masking polynomial
-     * @param hashSeed     whether to hash the seed in the MGF first (true) or use the seed directly (false)
-     * @param oid          three bytes that uniquely identify the parameter set
-     * @param sparse       whether to treat ternary polynomials as sparsely populated ({@link org.bouncycastle.pqc.math.ntru.polynomial.SparseTernaryPolynomial} vs {@link org.bouncycastle.pqc.math.ntru.polynomial.DenseTernaryPolynomial})
-     * @param fastFp       whether <code>f=1+p*F</code> for a ternary <code>F</code> (true) or <code>f</code> is ternary (false)
-     * @param hashAlg      a valid identifier for a <code>java.security.MessageDigest</code> instance such as <code>SHA-256</code>. The <code>MessageDigest</code> must support the <code>getDigestLength()</code> method.
-     */
-    public NTRUEncryptionKeyGenerationParameters(int N, int q, int df, int dm0, int db, int c, int minCallsR, int minCallsMask, boolean hashSeed, byte[] oid, boolean sparse, boolean fastFp, Digest hashAlg)
-    {
-        super(new SecureRandom(), db);
-        this.N = N;
-        this.q = q;
-        this.df = df;
-        this.db = db;
-        this.dm0 = dm0;
-        this.c = c;
-        this.minCallsR = minCallsR;
-        this.minCallsMask = minCallsMask;
-        this.hashSeed = hashSeed;
-        this.oid = oid;
-        this.sparse = sparse;
-        this.fastFp = fastFp;
-        this.polyType = NTRUParameters.TERNARY_POLYNOMIAL_TYPE_SIMPLE;
-        this.hashAlg = hashAlg;
-        init();
-    }
-
-    /**
-     * Constructs a parameter set that uses product-form private keys (i.e. <code>polyType=PRODUCT</code>).
-     *
-     * @param N            number of polynomial coefficients
-     * @param q            modulus
-     * @param df1          number of ones in the private polynomial <code>f1</code>
-     * @param df2          number of ones in the private polynomial <code>f2</code>
-     * @param df3          number of ones in the private polynomial <code>f3</code>
-     * @param dm0          minimum acceptable number of -1's, 0's, and 1's in the polynomial <code>m'</code> in the last encryption step
-     * @param db           number of random bits to prepend to the message
-     * @param c            a parameter for the Index Generation Function ({@link org.bouncycastle.pqc.crypto.ntru.IndexGenerator})
-     * @param minCallsR    minimum number of hash calls for the IGF to make
-     * @param minCallsMask minimum number of calls to generate the masking polynomial
-     * @param hashSeed     whether to hash the seed in the MGF first (true) or use the seed directly (false)
-     * @param oid          three bytes that uniquely identify the parameter set
-     * @param sparse       whether to treat ternary polynomials as sparsely populated ({@link org.bouncycastle.pqc.math.ntru.polynomial.SparseTernaryPolynomial} vs {@link org.bouncycastle.pqc.math.ntru.polynomial.DenseTernaryPolynomial})
-     * @param fastFp       whether <code>f=1+p*F</code> for a ternary <code>F</code> (true) or <code>f</code> is ternary (false)
-     * @param hashAlg      a valid identifier for a <code>java.security.MessageDigest</code> instance such as <code>SHA-256</code>
-     */
-    public NTRUEncryptionKeyGenerationParameters(int N, int q, int df1, int df2, int df3, int dm0, int db, int c, int minCallsR, int minCallsMask, boolean hashSeed, byte[] oid, boolean sparse, boolean fastFp, Digest hashAlg)
-    {
-        super(new SecureRandom(), db);
-
-        this.N = N;
-        this.q = q;
-        this.df1 = df1;
-        this.df2 = df2;
-        this.df3 = df3;
-        this.db = db;
-        this.dm0 = dm0;
-        this.c = c;
-        this.minCallsR = minCallsR;
-        this.minCallsMask = minCallsMask;
-        this.hashSeed = hashSeed;
-        this.oid = oid;
-        this.sparse = sparse;
-        this.fastFp = fastFp;
-        this.polyType = NTRUParameters.TERNARY_POLYNOMIAL_TYPE_PRODUCT;
-        this.hashAlg = hashAlg;
-        init();
-    }
-
-    private void init()
-    {
-        dr = df;
-        dr1 = df1;
-        dr2 = df2;
-        dr3 = df3;
-        dg = N / 3;
-        llen = 1;   // ceil(log2(maxMsgLenBytes))
-        maxMsgLenBytes = N * 3 / 2 / 8 - llen - db / 8 - 1;
-        bufferLenBits = (N * 3 / 2 + 7) / 8 * 8 + 1;
-        bufferLenTrits = N - 1;
-        pkLen = db;
-    }
-
-    /**
-     * Reads a parameter set from an input stream.
-     *
-     * @param is an input stream
-     * @throws java.io.IOException
-     */
-    public NTRUEncryptionKeyGenerationParameters(InputStream is)
-        throws IOException
-    {
-        super(new SecureRandom(), -1);
-        DataInputStream dis = new DataInputStream(is);
-        N = dis.readInt();
-        q = dis.readInt();
-        df = dis.readInt();
-        df1 = dis.readInt();
-        df2 = dis.readInt();
-        df3 = dis.readInt();
-        db = dis.readInt();
-        dm0 = dis.readInt();
-        c = dis.readInt();
-        minCallsR = dis.readInt();
-        minCallsMask = dis.readInt();
-        hashSeed = dis.readBoolean();
-        oid = new byte[3];
-        dis.read(oid);
-        sparse = dis.readBoolean();
-        fastFp = dis.readBoolean();
-        polyType = dis.read();
-
-        String alg = dis.readUTF();
-
-        if ("SHA-512".equals(alg))
-        {
-            hashAlg = new SHA512Digest();
-        }
-        else if ("SHA-256".equals(alg))
-        {
-            hashAlg = new SHA256Digest();
-        }
-
-        init();
-    }
-
-    public NTRUEncryptionParameters getEncryptionParameters()
-    {
-        if (polyType == NTRUParameters.TERNARY_POLYNOMIAL_TYPE_SIMPLE)
-        {
-            return new NTRUEncryptionParameters(N, q, df, dm0, db, c, minCallsR, minCallsMask, hashSeed, oid, sparse, fastFp, hashAlg);
-        }
-        else
-        {
-            return new NTRUEncryptionParameters(N, q, df1, df2, df3, dm0, db, c, minCallsR, minCallsMask, hashSeed, oid, sparse, fastFp, hashAlg);
-        }
-    }
-
-    public NTRUEncryptionKeyGenerationParameters clone()
-    {
-        if (polyType == NTRUParameters.TERNARY_POLYNOMIAL_TYPE_SIMPLE)
-        {
-            return new NTRUEncryptionKeyGenerationParameters(N, q, df, dm0, db, c, minCallsR, minCallsMask, hashSeed, oid, sparse, fastFp, hashAlg);
-        }
-        else
-        {
-            return new NTRUEncryptionKeyGenerationParameters(N, q, df1, df2, df3, dm0, db, c, minCallsR, minCallsMask, hashSeed, oid, sparse, fastFp, hashAlg);
-        }
-    }
-
-    /**
-     * Returns the maximum length a plaintext message can be with this parameter set.
-     *
-     * @return the maximum length in bytes
-     */
-    public int getMaxMessageLength()
-    {
-        return maxMsgLenBytes;
-    }
-
-    /**
-     * Writes the parameter set to an output stream
-     *
-     * @param os an output stream
-     * @throws java.io.IOException
-     */
-    public void writeTo(OutputStream os)
-        throws IOException
-    {
-        DataOutputStream dos = new DataOutputStream(os);
-        dos.writeInt(N);
-        dos.writeInt(q);
-        dos.writeInt(df);
-        dos.writeInt(df1);
-        dos.writeInt(df2);
-        dos.writeInt(df3);
-        dos.writeInt(db);
-        dos.writeInt(dm0);
-        dos.writeInt(c);
-        dos.writeInt(minCallsR);
-        dos.writeInt(minCallsMask);
-        dos.writeBoolean(hashSeed);
-        dos.write(oid);
-        dos.writeBoolean(sparse);
-        dos.writeBoolean(fastFp);
-        dos.write(polyType);
-        dos.writeUTF(hashAlg.getAlgorithmName());
-    }
-
-
-    public int hashCode()
-    {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + N;
-        result = prime * result + bufferLenBits;
-        result = prime * result + bufferLenTrits;
-        result = prime * result + c;
-        result = prime * result + db;
-        result = prime * result + df;
-        result = prime * result + df1;
-        result = prime * result + df2;
-        result = prime * result + df3;
-        result = prime * result + dg;
-        result = prime * result + dm0;
-        result = prime * result + dr;
-        result = prime * result + dr1;
-        result = prime * result + dr2;
-        result = prime * result + dr3;
-        result = prime * result + (fastFp ? 1231 : 1237);
-        result = prime * result + ((hashAlg == null) ? 0 : hashAlg.getAlgorithmName().hashCode());
-        result = prime * result + (hashSeed ? 1231 : 1237);
-        result = prime * result + llen;
-        result = prime * result + maxMsgLenBytes;
-        result = prime * result + minCallsMask;
-        result = prime * result + minCallsR;
-        result = prime * result + Arrays.hashCode(oid);
-        result = prime * result + pkLen;
-        result = prime * result + polyType;
-        result = prime * result + q;
-        result = prime * result + (sparse ? 1231 : 1237);
-        return result;
-    }
-
-    public boolean equals(Object obj)
-    {
-        if (this == obj)
-        {
-            return true;
-        }
-        if (obj == null)
-        {
-            return false;
-        }
-        if (getClass() != obj.getClass())
-        {
-            return false;
-        }
-        NTRUEncryptionKeyGenerationParameters other = (NTRUEncryptionKeyGenerationParameters)obj;
-        if (N != other.N)
-        {
-            return false;
-        }
-        if (bufferLenBits != other.bufferLenBits)
-        {
-            return false;
-        }
-        if (bufferLenTrits != other.bufferLenTrits)
-        {
-            return false;
-        }
-        if (c != other.c)
-        {
-            return false;
-        }
-        if (db != other.db)
-        {
-            return false;
-        }
-        if (df != other.df)
-        {
-            return false;
-        }
-        if (df1 != other.df1)
-        {
-            return false;
-        }
-        if (df2 != other.df2)
-        {
-            return false;
-        }
-        if (df3 != other.df3)
-        {
-            return false;
-        }
-        if (dg != other.dg)
-        {
-            return false;
-        }
-        if (dm0 != other.dm0)
-        {
-            return false;
-        }
-        if (dr != other.dr)
-        {
-            return false;
-        }
-        if (dr1 != other.dr1)
-        {
-            return false;
-        }
-        if (dr2 != other.dr2)
-        {
-            return false;
-        }
-        if (dr3 != other.dr3)
-        {
-            return false;
-        }
-        if (fastFp != other.fastFp)
-        {
-            return false;
-        }
-        if (hashAlg == null)
-        {
-            if (other.hashAlg != null)
-            {
-                return false;
-            }
-        }
-        else if (!hashAlg.getAlgorithmName().equals(other.hashAlg.getAlgorithmName()))
-        {
-            return false;
-        }
-        if (hashSeed != other.hashSeed)
-        {
-            return false;
-        }
-        if (llen != other.llen)
-        {
-            return false;
-        }
-        if (maxMsgLenBytes != other.maxMsgLenBytes)
-        {
-            return false;
-        }
-        if (minCallsMask != other.minCallsMask)
-        {
-            return false;
-        }
-        if (minCallsR != other.minCallsR)
-        {
-            return false;
-        }
-        if (!Arrays.equals(oid, other.oid))
-        {
-            return false;
-        }
-        if (pkLen != other.pkLen)
-        {
-            return false;
-        }
-        if (polyType != other.polyType)
-        {
-            return false;
-        }
-        if (q != other.q)
-        {
-            return false;
-        }
-        if (sparse != other.sparse)
-        {
-            return false;
-        }
-        return true;
-    }
-
-    public String toString()
-    {
-        StringBuilder output = new StringBuilder("EncryptionParameters(N=" + N + " q=" + q);
-        if (polyType == NTRUParameters.TERNARY_POLYNOMIAL_TYPE_SIMPLE)
-        {
-            output.append(" polyType=SIMPLE df=" + df);
-        }
-        else
-        {
-            output.append(" polyType=PRODUCT df1=" + df1 + " df2=" + df2 + " df3=" + df3);
-        }
-        output.append(" dm0=" + dm0 + " db=" + db + " c=" + c + " minCallsR=" + minCallsR + " minCallsMask=" + minCallsMask +
-            " hashSeed=" + hashSeed + " hashAlg=" + hashAlg + " oid=" + Arrays.toString(oid) + " sparse=" + sparse + ")");
-        return output.toString();
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/ntru/NTRUEncryptionKeyPairGenerator.java b/bcprov/src/main/java/org/bouncycastle/pqc/crypto/ntru/NTRUEncryptionKeyPairGenerator.java
deleted file mode 100644
index f2751ca..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/ntru/NTRUEncryptionKeyPairGenerator.java
+++ /dev/null
@@ -1,113 +0,0 @@
-package org.bouncycastle.pqc.crypto.ntru;
-
-import org.bouncycastle.crypto.AsymmetricCipherKeyPair;
-import org.bouncycastle.crypto.AsymmetricCipherKeyPairGenerator;
-import org.bouncycastle.crypto.KeyGenerationParameters;
-import org.bouncycastle.pqc.math.ntru.polynomial.DenseTernaryPolynomial;
-import org.bouncycastle.pqc.math.ntru.polynomial.IntegerPolynomial;
-import org.bouncycastle.pqc.math.ntru.polynomial.Polynomial;
-import org.bouncycastle.pqc.math.ntru.polynomial.ProductFormPolynomial;
-import org.bouncycastle.pqc.math.ntru.util.Util;
-
-/**
- * Generates key pairs.<br>
- * The parameter p is hardcoded to 3.
- */
-public class NTRUEncryptionKeyPairGenerator
-    implements AsymmetricCipherKeyPairGenerator
-{
-    private NTRUEncryptionKeyGenerationParameters params;
-
-    /**
-     * Constructs a new instance with a set of encryption parameters.
-     *
-     * @param param encryption parameters
-     */
-    public void init(KeyGenerationParameters param)
-    {
-        this.params = (NTRUEncryptionKeyGenerationParameters)param;
-    }
-
-    /**
-     * Generates a new encryption key pair.
-     *
-     * @return a key pair
-     */
-    public AsymmetricCipherKeyPair generateKeyPair()
-    {
-        int N = params.N;
-        int q = params.q;
-        int df = params.df;
-        int df1 = params.df1;
-        int df2 = params.df2;
-        int df3 = params.df3;
-        int dg = params.dg;
-        boolean fastFp = params.fastFp;
-        boolean sparse = params.sparse;
-
-        Polynomial t;
-        IntegerPolynomial fq;
-        IntegerPolynomial fp = null;
-
-        // choose a random f that is invertible mod 3 and q
-        while (true)
-        {
-            IntegerPolynomial f;
-
-            // choose random t, calculate f and fp
-            if (fastFp)
-            {
-                // if fastFp=true, f is always invertible mod 3
-                t = params.polyType == NTRUParameters.TERNARY_POLYNOMIAL_TYPE_SIMPLE ? Util.generateRandomTernary(N, df, df, sparse, params.getRandom()) : ProductFormPolynomial.generateRandom(N, df1, df2, df3, df3, params.getRandom());
-                f = t.toIntegerPolynomial();
-                f.mult(3);
-                f.coeffs[0] += 1;
-            }
-            else
-            {
-                t = params.polyType == NTRUParameters.TERNARY_POLYNOMIAL_TYPE_SIMPLE ? Util.generateRandomTernary(N, df, df - 1, sparse, params.getRandom()) : ProductFormPolynomial.generateRandom(N, df1, df2, df3, df3 - 1, params.getRandom());
-                f = t.toIntegerPolynomial();
-                fp = f.invertF3();
-                if (fp == null)
-                {
-                    continue;
-                }
-            }
-
-            fq = f.invertFq(q);
-            if (fq == null)
-            {
-                continue;
-            }
-            break;
-        }
-
-        // if fastFp=true, fp=1
-        if (fastFp)
-        {
-            fp = new IntegerPolynomial(N);
-            fp.coeffs[0] = 1;
-        }
-
-        // choose a random g that is invertible mod q
-        DenseTernaryPolynomial g;
-        while (true)
-        {
-            g = DenseTernaryPolynomial.generateRandom(N, dg, dg - 1, params.getRandom());
-            if (g.invertFq(q) != null)
-            {
-                break;
-            }
-        }
-
-        IntegerPolynomial h = g.mult(fq, q);
-        h.mult3(q);
-        h.ensurePositive(q);
-        g.clear();
-        fq.clear();
-
-        NTRUEncryptionPrivateKeyParameters priv = new NTRUEncryptionPrivateKeyParameters(h, t, fp, params.getEncryptionParameters());
-        NTRUEncryptionPublicKeyParameters pub = new NTRUEncryptionPublicKeyParameters(h, params.getEncryptionParameters());
-        return new AsymmetricCipherKeyPair(pub, priv);
-    }
-}
\ No newline at end of file
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/ntru/NTRUEncryptionKeyParameters.java b/bcprov/src/main/java/org/bouncycastle/pqc/crypto/ntru/NTRUEncryptionKeyParameters.java
deleted file mode 100644
index 27a7987..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/ntru/NTRUEncryptionKeyParameters.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package org.bouncycastle.pqc.crypto.ntru;
-
-import org.bouncycastle.crypto.params.AsymmetricKeyParameter;
-
-public class NTRUEncryptionKeyParameters
-    extends AsymmetricKeyParameter
-{
-    final protected NTRUEncryptionParameters params;
-
-    public NTRUEncryptionKeyParameters(boolean privateKey, NTRUEncryptionParameters params)
-    {
-        super(privateKey);
-        this.params = params;
-    }
-
-    public NTRUEncryptionParameters getParameters()
-    {
-        return params;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/ntru/NTRUEncryptionParameters.java b/bcprov/src/main/java/org/bouncycastle/pqc/crypto/ntru/NTRUEncryptionParameters.java
deleted file mode 100644
index b387bc2..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/ntru/NTRUEncryptionParameters.java
+++ /dev/null
@@ -1,410 +0,0 @@
-package org.bouncycastle.pqc.crypto.ntru;
-
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.Arrays;
-
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.digests.SHA256Digest;
-import org.bouncycastle.crypto.digests.SHA512Digest;
-
-/**
- * A set of parameters for NtruEncrypt. Several predefined parameter sets are available and new ones can be created as well.
- */
-public class NTRUEncryptionParameters
-    implements Cloneable
-{
-
-    public int N, q, df, df1, df2, df3;
-    public int dr;
-    public int dr1;
-    public int dr2;
-    public int dr3;
-    public int dg;
-    int llen;
-    public int maxMsgLenBytes;
-    public int db;
-    public int bufferLenBits;
-    int bufferLenTrits;
-    public int dm0;
-    public int pkLen;
-    public int c;
-    public int minCallsR;
-    public int minCallsMask;
-    public boolean hashSeed;
-    public byte[] oid;
-    public boolean sparse;
-    public boolean fastFp;
-    public int polyType;
-    public Digest hashAlg;
-
-    /**
-     * Constructs a parameter set that uses ternary private keys (i.e. <code>polyType=SIMPLE</code>).
-     *
-     * @param N            number of polynomial coefficients
-     * @param q            modulus
-     * @param df           number of ones in the private polynomial <code>f</code>
-     * @param dm0          minimum acceptable number of -1's, 0's, and 1's in the polynomial <code>m'</code> in the last encryption step
-     * @param db           number of random bits to prepend to the message
-     * @param c            a parameter for the Index Generation Function ({@link org.bouncycastle.pqc.crypto.ntru.IndexGenerator})
-     * @param minCallsR    minimum number of hash calls for the IGF to make
-     * @param minCallsMask minimum number of calls to generate the masking polynomial
-     * @param hashSeed     whether to hash the seed in the MGF first (true) or use the seed directly (false)
-     * @param oid          three bytes that uniquely identify the parameter set
-     * @param sparse       whether to treat ternary polynomials as sparsely populated ({@link org.bouncycastle.pqc.math.ntru.polynomial.SparseTernaryPolynomial} vs {@link org.bouncycastle.pqc.math.ntru.polynomial.DenseTernaryPolynomial})
-     * @param fastFp       whether <code>f=1+p*F</code> for a ternary <code>F</code> (true) or <code>f</code> is ternary (false)
-     * @param hashAlg      a valid identifier for a <code>java.security.MessageDigest</code> instance such as <code>SHA-256</code>. The <code>MessageDigest</code> must support the <code>getDigestLength()</code> method.
-     */
-    public NTRUEncryptionParameters(int N, int q, int df, int dm0, int db, int c, int minCallsR, int minCallsMask, boolean hashSeed, byte[] oid, boolean sparse, boolean fastFp, Digest hashAlg)
-    {
-        this.N = N;
-        this.q = q;
-        this.df = df;
-        this.db = db;
-        this.dm0 = dm0;
-        this.c = c;
-        this.minCallsR = minCallsR;
-        this.minCallsMask = minCallsMask;
-        this.hashSeed = hashSeed;
-        this.oid = oid;
-        this.sparse = sparse;
-        this.fastFp = fastFp;
-        this.polyType = NTRUParameters.TERNARY_POLYNOMIAL_TYPE_SIMPLE;
-        this.hashAlg = hashAlg;
-        init();
-    }
-
-    /**
-     * Constructs a parameter set that uses product-form private keys (i.e. <code>polyType=PRODUCT</code>).
-     *
-     * @param N            number of polynomial coefficients
-     * @param q            modulus
-     * @param df1          number of ones in the private polynomial <code>f1</code>
-     * @param df2          number of ones in the private polynomial <code>f2</code>
-     * @param df3          number of ones in the private polynomial <code>f3</code>
-     * @param dm0          minimum acceptable number of -1's, 0's, and 1's in the polynomial <code>m'</code> in the last encryption step
-     * @param db           number of random bits to prepend to the message
-     * @param c            a parameter for the Index Generation Function ({@link  org.bouncycastle.pqc.crypto.ntru.IndexGenerator})
-     * @param minCallsR    minimum number of hash calls for the IGF to make
-     * @param minCallsMask minimum number of calls to generate the masking polynomial
-     * @param hashSeed     whether to hash the seed in the MGF first (true) or use the seed directly (false)
-     * @param oid          three bytes that uniquely identify the parameter set
-     * @param sparse       whether to treat ternary polynomials as sparsely populated ({@link org.bouncycastle.pqc.math.ntru.polynomial.SparseTernaryPolynomial} vs {@link org.bouncycastle.pqc.math.ntru.polynomial.DenseTernaryPolynomial})
-     * @param fastFp       whether <code>f=1+p*F</code> for a ternary <code>F</code> (true) or <code>f</code> is ternary (false)
-     * @param hashAlg      a valid identifier for a <code>java.security.MessageDigest</code> instance such as <code>SHA-256</code>
-     */
-    public NTRUEncryptionParameters(int N, int q, int df1, int df2, int df3, int dm0, int db, int c, int minCallsR, int minCallsMask, boolean hashSeed, byte[] oid, boolean sparse, boolean fastFp, Digest hashAlg)
-    {
-        this.N = N;
-        this.q = q;
-        this.df1 = df1;
-        this.df2 = df2;
-        this.df3 = df3;
-        this.db = db;
-        this.dm0 = dm0;
-        this.c = c;
-        this.minCallsR = minCallsR;
-        this.minCallsMask = minCallsMask;
-        this.hashSeed = hashSeed;
-        this.oid = oid;
-        this.sparse = sparse;
-        this.fastFp = fastFp;
-        this.polyType = NTRUParameters.TERNARY_POLYNOMIAL_TYPE_PRODUCT;
-        this.hashAlg = hashAlg;
-        init();
-    }
-
-    private void init()
-    {
-        dr = df;
-        dr1 = df1;
-        dr2 = df2;
-        dr3 = df3;
-        dg = N / 3;
-        llen = 1;   // ceil(log2(maxMsgLenBytes))
-        maxMsgLenBytes = N * 3 / 2 / 8 - llen - db / 8 - 1;
-        bufferLenBits = (N * 3 / 2 + 7) / 8 * 8 + 1;
-        bufferLenTrits = N - 1;
-        pkLen = db;
-    }
-
-    /**
-     * Reads a parameter set from an input stream.
-     *
-     * @param is an input stream
-     * @throws IOException
-     */
-    public NTRUEncryptionParameters(InputStream is)
-        throws IOException
-    {
-        DataInputStream dis = new DataInputStream(is);
-        N = dis.readInt();
-        q = dis.readInt();
-        df = dis.readInt();
-        df1 = dis.readInt();
-        df2 = dis.readInt();
-        df3 = dis.readInt();
-        db = dis.readInt();
-        dm0 = dis.readInt();
-        c = dis.readInt();
-        minCallsR = dis.readInt();
-        minCallsMask = dis.readInt();
-        hashSeed = dis.readBoolean();
-        oid = new byte[3];
-        dis.read(oid);
-        sparse = dis.readBoolean();
-        fastFp = dis.readBoolean();
-        polyType = dis.read();
-
-        String alg = dis.readUTF();
-
-        if ("SHA-512".equals(alg))
-        {
-            hashAlg = new SHA512Digest();
-        }
-        else if ("SHA-256".equals(alg))
-        {
-            hashAlg = new SHA256Digest();
-        }
-
-        init();
-    }
-
-    public NTRUEncryptionParameters clone()
-    {
-        if (polyType == NTRUParameters.TERNARY_POLYNOMIAL_TYPE_SIMPLE)
-        {
-            return new NTRUEncryptionParameters(N, q, df, dm0, db, c, minCallsR, minCallsMask, hashSeed, oid, sparse, fastFp, hashAlg);
-        }
-        else
-        {
-            return new NTRUEncryptionParameters(N, q, df1, df2, df3, dm0, db, c, minCallsR, minCallsMask, hashSeed, oid, sparse, fastFp, hashAlg);
-        }
-    }
-
-    /**
-     * Returns the maximum length a plaintext message can be with this parameter set.
-     *
-     * @return the maximum length in bytes
-     */
-    public int getMaxMessageLength()
-    {
-        return maxMsgLenBytes;
-    }
-
-    /**
-     * Writes the parameter set to an output stream
-     *
-     * @param os an output stream
-     * @throws IOException
-     */
-    public void writeTo(OutputStream os)
-        throws IOException
-    {
-        DataOutputStream dos = new DataOutputStream(os);
-        dos.writeInt(N);
-        dos.writeInt(q);
-        dos.writeInt(df);
-        dos.writeInt(df1);
-        dos.writeInt(df2);
-        dos.writeInt(df3);
-        dos.writeInt(db);
-        dos.writeInt(dm0);
-        dos.writeInt(c);
-        dos.writeInt(minCallsR);
-        dos.writeInt(minCallsMask);
-        dos.writeBoolean(hashSeed);
-        dos.write(oid);
-        dos.writeBoolean(sparse);
-        dos.writeBoolean(fastFp);
-        dos.write(polyType);
-        dos.writeUTF(hashAlg.getAlgorithmName());
-    }
-
-
-    public int hashCode()
-    {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + N;
-        result = prime * result + bufferLenBits;
-        result = prime * result + bufferLenTrits;
-        result = prime * result + c;
-        result = prime * result + db;
-        result = prime * result + df;
-        result = prime * result + df1;
-        result = prime * result + df2;
-        result = prime * result + df3;
-        result = prime * result + dg;
-        result = prime * result + dm0;
-        result = prime * result + dr;
-        result = prime * result + dr1;
-        result = prime * result + dr2;
-        result = prime * result + dr3;
-        result = prime * result + (fastFp ? 1231 : 1237);
-        result = prime * result + ((hashAlg == null) ? 0 : hashAlg.getAlgorithmName().hashCode());
-        result = prime * result + (hashSeed ? 1231 : 1237);
-        result = prime * result + llen;
-        result = prime * result + maxMsgLenBytes;
-        result = prime * result + minCallsMask;
-        result = prime * result + minCallsR;
-        result = prime * result + Arrays.hashCode(oid);
-        result = prime * result + pkLen;
-        result = prime * result + polyType;
-        result = prime * result + q;
-        result = prime * result + (sparse ? 1231 : 1237);
-        return result;
-    }
-
-    public boolean equals(Object obj)
-    {
-        if (this == obj)
-        {
-            return true;
-        }
-        if (obj == null)
-        {
-            return false;
-        }
-        if (getClass() != obj.getClass())
-        {
-            return false;
-        }
-        NTRUEncryptionParameters other = (NTRUEncryptionParameters)obj;
-        if (N != other.N)
-        {
-            return false;
-        }
-        if (bufferLenBits != other.bufferLenBits)
-        {
-            return false;
-        }
-        if (bufferLenTrits != other.bufferLenTrits)
-        {
-            return false;
-        }
-        if (c != other.c)
-        {
-            return false;
-        }
-        if (db != other.db)
-        {
-            return false;
-        }
-        if (df != other.df)
-        {
-            return false;
-        }
-        if (df1 != other.df1)
-        {
-            return false;
-        }
-        if (df2 != other.df2)
-        {
-            return false;
-        }
-        if (df3 != other.df3)
-        {
-            return false;
-        }
-        if (dg != other.dg)
-        {
-            return false;
-        }
-        if (dm0 != other.dm0)
-        {
-            return false;
-        }
-        if (dr != other.dr)
-        {
-            return false;
-        }
-        if (dr1 != other.dr1)
-        {
-            return false;
-        }
-        if (dr2 != other.dr2)
-        {
-            return false;
-        }
-        if (dr3 != other.dr3)
-        {
-            return false;
-        }
-        if (fastFp != other.fastFp)
-        {
-            return false;
-        }
-        if (hashAlg == null)
-        {
-            if (other.hashAlg != null)
-            {
-                return false;
-            }
-        }
-        else if (!hashAlg.getAlgorithmName().equals(other.hashAlg.getAlgorithmName()))
-        {
-            return false;
-        }
-        if (hashSeed != other.hashSeed)
-        {
-            return false;
-        }
-        if (llen != other.llen)
-        {
-            return false;
-        }
-        if (maxMsgLenBytes != other.maxMsgLenBytes)
-        {
-            return false;
-        }
-        if (minCallsMask != other.minCallsMask)
-        {
-            return false;
-        }
-        if (minCallsR != other.minCallsR)
-        {
-            return false;
-        }
-        if (!Arrays.equals(oid, other.oid))
-        {
-            return false;
-        }
-        if (pkLen != other.pkLen)
-        {
-            return false;
-        }
-        if (polyType != other.polyType)
-        {
-            return false;
-        }
-        if (q != other.q)
-        {
-            return false;
-        }
-        if (sparse != other.sparse)
-        {
-            return false;
-        }
-        return true;
-    }
-
-    public String toString()
-    {
-        StringBuilder output = new StringBuilder("EncryptionParameters(N=" + N + " q=" + q);
-        if (polyType == NTRUParameters.TERNARY_POLYNOMIAL_TYPE_SIMPLE)
-        {
-            output.append(" polyType=SIMPLE df=" + df);
-        }
-        else
-        {
-            output.append(" polyType=PRODUCT df1=" + df1 + " df2=" + df2 + " df3=" + df3);
-        }
-        output.append(" dm0=" + dm0 + " db=" + db + " c=" + c + " minCallsR=" + minCallsR + " minCallsMask=" + minCallsMask +
-            " hashSeed=" + hashSeed + " hashAlg=" + hashAlg + " oid=" + Arrays.toString(oid) + " sparse=" + sparse + ")");
-        return output.toString();
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/ntru/NTRUEncryptionPrivateKeyParameters.java b/bcprov/src/main/java/org/bouncycastle/pqc/crypto/ntru/NTRUEncryptionPrivateKeyParameters.java
deleted file mode 100644
index bcf9418..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/ntru/NTRUEncryptionPrivateKeyParameters.java
+++ /dev/null
@@ -1,199 +0,0 @@
-package org.bouncycastle.pqc.crypto.ntru;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-import org.bouncycastle.pqc.math.ntru.polynomial.DenseTernaryPolynomial;
-import org.bouncycastle.pqc.math.ntru.polynomial.IntegerPolynomial;
-import org.bouncycastle.pqc.math.ntru.polynomial.Polynomial;
-import org.bouncycastle.pqc.math.ntru.polynomial.ProductFormPolynomial;
-import org.bouncycastle.pqc.math.ntru.polynomial.SparseTernaryPolynomial;
-
-/**
- * A NtruEncrypt private key is essentially a polynomial named <code>f</code>
- * which takes different forms depending on whether product-form polynomials are used,
- * and on <code>fastP</code><br>
- * The inverse of <code>f</code> modulo <code>p</code> is precomputed on initialization.
- */
-public class NTRUEncryptionPrivateKeyParameters
-    extends NTRUEncryptionKeyParameters
-{
-    public Polynomial t;
-    public IntegerPolynomial fp;
-    public IntegerPolynomial h;
-
-    /**
-     * Constructs a new private key from a polynomial
-     *
-     * @param h the public polynomial for the key.
-     * @param t      the polynomial which determines the key: if <code>fastFp=true</code>, <code>f=1+3t</code>; otherwise, <code>f=t</code>
-     * @param fp     the inverse of <code>f</code>
-     * @param params the NtruEncrypt parameters to use
-     */
-    public NTRUEncryptionPrivateKeyParameters(IntegerPolynomial h, Polynomial t, IntegerPolynomial fp, NTRUEncryptionParameters params)
-    {
-        super(true, params);
-
-        this.h = h;
-        this.t = t;
-        this.fp = fp;
-    }
-
-    /**
-     * Converts a byte array to a polynomial <code>f</code> and constructs a new private key
-     *
-     * @param b      an encoded polynomial
-     * @param params the NtruEncrypt parameters to use
-     * @see #getEncoded()
-     */
-    public NTRUEncryptionPrivateKeyParameters(byte[] b, NTRUEncryptionParameters params)
-        throws IOException
-    {
-        this(new ByteArrayInputStream(b), params);
-    }
-
-    /**
-     * Reads a polynomial <code>f</code> from an input stream and constructs a new private key
-     *
-     * @param is     an input stream
-     * @param params the NtruEncrypt parameters to use
-     * @see #writeTo(OutputStream)
-     */
-    public NTRUEncryptionPrivateKeyParameters(InputStream is, NTRUEncryptionParameters params)
-        throws IOException
-    {
-        super(true, params);
-
-        if (params.polyType == NTRUParameters.TERNARY_POLYNOMIAL_TYPE_PRODUCT)
-        {
-            int N = params.N;
-            int df1 = params.df1;
-            int df2 = params.df2;
-            int df3Ones = params.df3;
-            int df3NegOnes = params.fastFp ? params.df3 : params.df3 - 1;
-            h = IntegerPolynomial.fromBinary(is, params.N, params.q);
-            t = ProductFormPolynomial.fromBinary(is, N, df1, df2, df3Ones, df3NegOnes);
-        }
-        else
-        {
-            h = IntegerPolynomial.fromBinary(is, params.N, params.q);
-            IntegerPolynomial fInt = IntegerPolynomial.fromBinary3Tight(is, params.N);
-            t = params.sparse ? new SparseTernaryPolynomial(fInt) : new DenseTernaryPolynomial(fInt);
-        }
-
-        init();
-    }
-
-    /**
-     * Initializes <code>fp</code> from t.
-     */
-    private void init()
-    {
-        if (params.fastFp)
-        {
-            fp = new IntegerPolynomial(params.N);
-            fp.coeffs[0] = 1;
-        }
-        else
-        {
-            fp = t.toIntegerPolynomial().invertF3();
-        }
-    }
-
-    /**
-     * Converts the key to a byte array
-     *
-     * @return the encoded key
-     * @see #NTRUEncryptionPrivateKeyParameters(byte[], NTRUEncryptionParameters)
-     */
-    public byte[] getEncoded()
-    {
-        byte[] hBytes = h.toBinary(params.q);
-        byte[] tBytes;
-
-        if (t instanceof ProductFormPolynomial)
-        {
-            tBytes = ((ProductFormPolynomial)t).toBinary();
-        }
-        else
-        {
-            tBytes = t.toIntegerPolynomial().toBinary3Tight();
-        }
-
-        byte[] res = new byte[hBytes.length + tBytes.length];
-
-        System.arraycopy(hBytes, 0, res, 0, hBytes.length);
-        System.arraycopy(tBytes, 0, res, hBytes.length, tBytes.length);
-
-        return res;
-    }
-
-    /**
-     * Writes the key to an output stream
-     *
-     * @param os an output stream
-     * @throws IOException
-     * @see #NTRUEncryptionPrivateKeyParameters(InputStream, NTRUEncryptionParameters)
-     */
-    public void writeTo(OutputStream os)
-        throws IOException
-    {
-        os.write(getEncoded());
-    }
-
-    public int hashCode()
-    {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + ((params == null) ? 0 : params.hashCode());
-        result = prime * result + ((t == null) ? 0 : t.hashCode());
-        result = prime * result + ((h == null) ? 0 : h.hashCode());
-        return result;
-    }
-
-    public boolean equals(Object obj)
-    {
-        if (this == obj)
-        {
-            return true;
-        }
-        if (obj == null)
-        {
-            return false;
-        }
-        if (!(obj instanceof NTRUEncryptionPrivateKeyParameters))
-        {
-            return false;
-        }
-        NTRUEncryptionPrivateKeyParameters other = (NTRUEncryptionPrivateKeyParameters)obj;
-        if (params == null)
-        {
-            if (other.params != null)
-            {
-                return false;
-            }
-        }
-        else if (!params.equals(other.params))
-        {
-            return false;
-        }
-        if (t == null)
-        {
-            if (other.t != null)
-            {
-                return false;
-            }
-        }
-        else if (!t.equals(other.t))
-        {
-            return false;
-        }
-        if (!h.equals(other.h))
-        {
-            return false;
-        }
-        return true;
-    }
-}
\ No newline at end of file
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/ntru/NTRUEncryptionPublicKeyParameters.java b/bcprov/src/main/java/org/bouncycastle/pqc/crypto/ntru/NTRUEncryptionPublicKeyParameters.java
deleted file mode 100644
index 0aa0357..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/ntru/NTRUEncryptionPublicKeyParameters.java
+++ /dev/null
@@ -1,131 +0,0 @@
-package org.bouncycastle.pqc.crypto.ntru;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-import org.bouncycastle.pqc.math.ntru.polynomial.IntegerPolynomial;
-
-/**
- * A NtruEncrypt public key is essentially a polynomial named <code>h</code>.
- */
-public class NTRUEncryptionPublicKeyParameters
-    extends NTRUEncryptionKeyParameters
-{
-    public IntegerPolynomial h;
-
-    /**
-     * Constructs a new public key from a polynomial
-     *
-     * @param h      the polynomial <code>h</code> which determines the key
-     * @param params the NtruEncrypt parameters to use
-     */
-    public NTRUEncryptionPublicKeyParameters(IntegerPolynomial h, NTRUEncryptionParameters params)
-    {
-        super(false, params);
-
-        this.h = h;
-    }
-
-    /**
-     * Converts a byte array to a polynomial <code>h</code> and constructs a new public key
-     *
-     * @param b      an encoded polynomial
-     * @param params the NtruEncrypt parameters to use
-     * @see #getEncoded()
-     */
-    public NTRUEncryptionPublicKeyParameters(byte[] b, NTRUEncryptionParameters params)
-    {
-        super(false, params);
-
-        h = IntegerPolynomial.fromBinary(b, params.N, params.q);
-    }
-
-    /**
-     * Reads a polynomial <code>h</code> from an input stream and constructs a new public key
-     *
-     * @param is     an input stream
-     * @param params the NtruEncrypt parameters to use
-     * @see #writeTo(OutputStream)
-     */
-    public NTRUEncryptionPublicKeyParameters(InputStream is, NTRUEncryptionParameters params)
-        throws IOException
-    {
-        super(false, params);
-
-        h = IntegerPolynomial.fromBinary(is, params.N, params.q);
-    }
-
-    /**
-     * Converts the key to a byte array
-     *
-     * @return the encoded key
-     * @see #NTRUEncryptionPublicKeyParameters(byte[], NTRUEncryptionParameters)
-     */
-    public byte[] getEncoded()
-    {
-        return h.toBinary(params.q);
-    }
-
-    /**
-     * Writes the key to an output stream
-     *
-     * @param os an output stream
-     * @throws IOException
-     * @see #NTRUEncryptionPublicKeyParameters(InputStream, NTRUEncryptionParameters)
-     */
-    public void writeTo(OutputStream os)
-        throws IOException
-    {
-        os.write(getEncoded());
-    }
-
-    public int hashCode()
-    {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + ((h == null) ? 0 : h.hashCode());
-        result = prime * result + ((params == null) ? 0 : params.hashCode());
-        return result;
-    }
-
-    public boolean equals(Object obj)
-    {
-        if (this == obj)
-        {
-            return true;
-        }
-        if (obj == null)
-        {
-            return false;
-        }
-        if (!(obj instanceof NTRUEncryptionPublicKeyParameters))
-        {
-            return false;
-        }
-        NTRUEncryptionPublicKeyParameters other = (NTRUEncryptionPublicKeyParameters)obj;
-        if (h == null)
-        {
-            if (other.h != null)
-            {
-                return false;
-            }
-        }
-        else if (!h.equals(other.h))
-        {
-            return false;
-        }
-        if (params == null)
-        {
-            if (other.params != null)
-            {
-                return false;
-            }
-        }
-        else if (!params.equals(other.params))
-        {
-            return false;
-        }
-        return true;
-    }
-}
\ No newline at end of file
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/ntru/NTRUEngine.java b/bcprov/src/main/java/org/bouncycastle/pqc/crypto/ntru/NTRUEngine.java
deleted file mode 100644
index 77ff1c3..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/ntru/NTRUEngine.java
+++ /dev/null
@@ -1,495 +0,0 @@
-package org.bouncycastle.pqc.crypto.ntru;
-
-import java.security.SecureRandom;
-
-import org.bouncycastle.crypto.AsymmetricBlockCipher;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.DataLengthException;
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.InvalidCipherTextException;
-import org.bouncycastle.crypto.params.ParametersWithRandom;
-import org.bouncycastle.pqc.math.ntru.polynomial.DenseTernaryPolynomial;
-import org.bouncycastle.pqc.math.ntru.polynomial.IntegerPolynomial;
-import org.bouncycastle.pqc.math.ntru.polynomial.Polynomial;
-import org.bouncycastle.pqc.math.ntru.polynomial.ProductFormPolynomial;
-import org.bouncycastle.pqc.math.ntru.polynomial.SparseTernaryPolynomial;
-import org.bouncycastle.pqc.math.ntru.polynomial.TernaryPolynomial;
-import org.bouncycastle.util.Arrays;
-
-/**
- * Encrypts, decrypts data and generates key pairs.<br>
- * The parameter p is hardcoded to 3.
- */
-public class NTRUEngine
-    implements AsymmetricBlockCipher
-{
-    private boolean forEncryption;
-    private NTRUEncryptionParameters params;
-    private NTRUEncryptionPublicKeyParameters pubKey;
-    private NTRUEncryptionPrivateKeyParameters privKey;
-    private SecureRandom random;
-
-    /**
-     * Constructs a new instance with a set of encryption parameters.
-     *
-     */
-    public NTRUEngine()
-    {
-    }
-
-    public void init(boolean forEncryption, CipherParameters parameters)
-    {
-        this.forEncryption = forEncryption;
-        if (forEncryption)
-        {
-            if (parameters instanceof ParametersWithRandom)
-            {
-                ParametersWithRandom p = (ParametersWithRandom)parameters;
-
-                this.random = p.getRandom();
-                this.pubKey = (NTRUEncryptionPublicKeyParameters)p.getParameters();
-            }
-            else
-            {
-                this.random = new SecureRandom();
-                this.pubKey = (NTRUEncryptionPublicKeyParameters)parameters;
-            }
-
-            this.params = pubKey.getParameters();
-        }
-        else
-        {
-            this.privKey = (NTRUEncryptionPrivateKeyParameters)parameters;
-            this.params = privKey.getParameters();
-        }
-    }
-
-    public int getInputBlockSize()
-    {
-        return params.maxMsgLenBytes;
-    }
-
-    public int getOutputBlockSize()
-    {
-        return ((params.N * log2(params.q)) + 7) / 8;
-    }
-
-    public byte[] processBlock(byte[] in, int inOff, int len)
-        throws InvalidCipherTextException
-    {
-        byte[] tmp = new byte[len];
-
-        System.arraycopy(in, inOff, tmp, 0, len);
-
-        if (forEncryption)
-        {
-            return encrypt(tmp, pubKey);
-        }
-        else
-        {
-            return decrypt(tmp, privKey);
-        }
-    }
-
-    /**
-     * Encrypts a message.<br/>
-     * See P1363.1 section 9.2.2.
-     *
-     * @param m      The message to encrypt
-     * @param pubKey the public key to encrypt the message with
-     * @return the encrypted message
-     */
-    private byte[] encrypt(byte[] m, NTRUEncryptionPublicKeyParameters pubKey)
-    {
-        IntegerPolynomial pub = pubKey.h;
-        int N = params.N;
-        int q = params.q;
-
-        int maxLenBytes = params.maxMsgLenBytes;
-        int db = params.db;
-        int bufferLenBits = params.bufferLenBits;
-        int dm0 = params.dm0;
-        int pkLen = params.pkLen;
-        int minCallsMask = params.minCallsMask;
-        boolean hashSeed = params.hashSeed;
-        byte[] oid = params.oid;
-
-        int l = m.length;
-        if (maxLenBytes > 255)
-        {
-            throw new IllegalArgumentException("llen values bigger than 1 are not supported");
-        }
-        if (l > maxLenBytes)
-        {
-            throw new DataLengthException("Message too long: " + l + ">" + maxLenBytes);
-        }
-
-        while (true)
-        {
-            // M = b|octL|m|p0
-            byte[] b = new byte[db / 8];
-            random.nextBytes(b);
-            byte[] p0 = new byte[maxLenBytes + 1 - l];
-            byte[] M = new byte[bufferLenBits / 8];
-
-            System.arraycopy(b, 0, M, 0, b.length);
-            M[b.length] = (byte)l;
-            System.arraycopy(m, 0, M, b.length + 1, m.length);
-            System.arraycopy(p0, 0, M, b.length + 1 + m.length, p0.length);
-
-            IntegerPolynomial mTrin = IntegerPolynomial.fromBinary3Sves(M, N);
-
-            // sData = OID|m|b|hTrunc
-            byte[] bh = pub.toBinary(q);
-            byte[] hTrunc = copyOf(bh, pkLen / 8);
-            byte[] sData = buildSData(oid, m, l, b, hTrunc);
-
-            Polynomial r = generateBlindingPoly(sData, M);
-            IntegerPolynomial R = r.mult(pub, q);
-            IntegerPolynomial R4 = (IntegerPolynomial)R.clone();
-            R4.modPositive(4);
-            byte[] oR4 = R4.toBinary(4);
-            IntegerPolynomial mask = MGF(oR4, N, minCallsMask, hashSeed);
-            mTrin.add(mask);
-            mTrin.mod3();
-
-            if (mTrin.count(-1) < dm0)
-            {
-                continue;
-            }
-            if (mTrin.count(0) < dm0)
-            {
-                continue;
-            }
-            if (mTrin.count(1) < dm0)
-            {
-                continue;
-            }
-
-            R.add(mTrin, q);
-            R.ensurePositive(q);
-            return R.toBinary(q);
-        }
-    }
-
-    private byte[] buildSData(byte[] oid, byte[] m, int l, byte[] b, byte[] hTrunc)
-    {
-        byte[] sData = new byte[oid.length + l + b.length + hTrunc.length];
-
-        System.arraycopy(oid, 0, sData, 0, oid.length);
-        System.arraycopy(m, 0, sData, oid.length, m.length);
-        System.arraycopy(b, 0, sData, oid.length + m.length, b.length);
-        System.arraycopy(hTrunc, 0, sData, oid.length + m.length + b.length, hTrunc.length);
-        return sData;
-    }
-
-    protected IntegerPolynomial encrypt(IntegerPolynomial m, TernaryPolynomial r, IntegerPolynomial pubKey)
-    {
-        IntegerPolynomial e = r.mult(pubKey, params.q);
-        e.add(m, params.q);
-        e.ensurePositive(params.q);
-        return e;
-    }
-
-    /**
-     * Deterministically generates a blinding polynomial from a seed and a message representative.
-     *
-     * @param seed
-     * @param M    message representative
-     * @return a blinding polynomial
-     */
-    private Polynomial generateBlindingPoly(byte[] seed, byte[] M)
-    {
-        IndexGenerator ig = new IndexGenerator(seed, params);
-
-        if (params.polyType == NTRUParameters.TERNARY_POLYNOMIAL_TYPE_PRODUCT)
-        {
-            SparseTernaryPolynomial r1 = new SparseTernaryPolynomial(generateBlindingCoeffs(ig, params.dr1));
-            SparseTernaryPolynomial r2 = new SparseTernaryPolynomial(generateBlindingCoeffs(ig, params.dr2));
-            SparseTernaryPolynomial r3 = new SparseTernaryPolynomial(generateBlindingCoeffs(ig, params.dr3));
-            return new ProductFormPolynomial(r1, r2, r3);
-        }
-        else
-        {
-            int dr = params.dr;
-            boolean sparse = params.sparse;
-            int[] r = generateBlindingCoeffs(ig, dr);
-            if (sparse)
-            {
-                return new SparseTernaryPolynomial(r);
-            }
-            else
-            {
-                return new DenseTernaryPolynomial(r);
-            }
-        }
-    }
-
-    /**
-     * Generates an <code>int</code> array containing <code>dr</code> elements equal to <code>1</code>
-     * and <code>dr</code> elements equal to <code>-1</code> using an index generator.
-     *
-     * @param ig an index generator
-     * @param dr number of ones / negative ones
-     * @return an array containing numbers between <code>-1</code> and <code>1</code>
-     */
-    private int[] generateBlindingCoeffs(IndexGenerator ig, int dr)
-    {
-        int N = params.N;
-
-        int[] r = new int[N];
-        for (int coeff = -1; coeff <= 1; coeff += 2)
-        {
-            int t = 0;
-            while (t < dr)
-            {
-                int i = ig.nextIndex();
-                if (r[i] == 0)
-                {
-                    r[i] = coeff;
-                    t++;
-                }
-            }
-        }
-
-        return r;
-    }
-
-    /**
-     * An implementation of MGF-TP-1 from P1363.1 section 8.4.1.1.
-     *
-     * @param seed
-     * @param N
-     * @param minCallsR
-     * @param hashSeed  whether to hash the seed
-     * @return
-     */
-    private IntegerPolynomial MGF(byte[] seed, int N, int minCallsR, boolean hashSeed)
-    {
-        Digest hashAlg = params.hashAlg;
-        int hashLen = hashAlg.getDigestSize();
-        byte[] buf = new byte[minCallsR * hashLen];
-        byte[] Z = hashSeed ? calcHash(hashAlg, seed) : seed;
-        int counter = 0;
-        while (counter < minCallsR)
-        {
-            hashAlg.update(Z, 0, Z.length);
-            putInt(hashAlg, counter);
-
-            byte[] hash = calcHash(hashAlg);
-            System.arraycopy(hash, 0, buf, counter * hashLen, hashLen);
-            counter++;
-        }
-
-        IntegerPolynomial i = new IntegerPolynomial(N);
-        while (true)
-        {
-            int cur = 0;
-            for (int index = 0; index != buf.length; index++)
-            {
-                int O = (int)buf[index] & 0xFF;
-                if (O >= 243)   // 243 = 3^5
-                {
-                    continue;
-                }
-
-                for (int terIdx = 0; terIdx < 4; terIdx++)
-                {
-                    int rem3 = O % 3;
-                    i.coeffs[cur] = rem3 - 1;
-                    cur++;
-                    if (cur == N)
-                    {
-                        return i;
-                    }
-                    O = (O - rem3) / 3;
-                }
-
-                i.coeffs[cur] = O - 1;
-                cur++;
-                if (cur == N)
-                {
-                    return i;
-                }
-            }
-
-            if (cur >= N)
-            {
-                return i;
-            }
-
-            hashAlg.update(Z, 0, Z.length);
-            putInt(hashAlg, counter);
-
-            byte[] hash = calcHash(hashAlg);
-
-            buf = hash;
-
-            counter++;
-        }
-    }
-
-    private void putInt(Digest hashAlg, int counter)
-    {
-        hashAlg.update((byte)(counter >> 24));
-        hashAlg.update((byte)(counter >> 16));
-        hashAlg.update((byte)(counter >> 8));
-        hashAlg.update((byte)counter);
-    }
-
-    private byte[] calcHash(Digest hashAlg)
-    {
-        byte[] tmp = new byte[hashAlg.getDigestSize()];
-
-        hashAlg.doFinal(tmp, 0);
-
-        return tmp;
-    }
-
-    private byte[] calcHash(Digest hashAlg, byte[] input)
-    {
-        byte[] tmp = new byte[hashAlg.getDigestSize()];
-
-        hashAlg.update(input, 0, input.length);
-        hashAlg.doFinal(tmp, 0);
-
-        return tmp;
-    }
-    /**
-     * Decrypts a message.<br/>
-     * See P1363.1 section 9.2.3.
-     *
-     * @param data The message to decrypt
-     * @param privKey   the corresponding private key
-     * @return the decrypted message
-     * @throws InvalidCipherTextException if  the encrypted data is invalid, or <code>maxLenBytes</code> is greater than 255
-     */
-    private byte[] decrypt(byte[] data, NTRUEncryptionPrivateKeyParameters privKey)
-        throws InvalidCipherTextException
-    {
-        Polynomial priv_t = privKey.t;
-        IntegerPolynomial priv_fp = privKey.fp;
-        IntegerPolynomial pub = privKey.h;
-        int N = params.N;
-        int q = params.q;
-        int db = params.db;
-        int maxMsgLenBytes = params.maxMsgLenBytes;
-        int dm0 = params.dm0;
-        int pkLen = params.pkLen;
-        int minCallsMask = params.minCallsMask;
-        boolean hashSeed = params.hashSeed;
-        byte[] oid = params.oid;
-
-        if (maxMsgLenBytes > 255)
-        {
-            throw new DataLengthException("maxMsgLenBytes values bigger than 255 are not supported");
-        }
-
-        int bLen = db / 8;
-
-        IntegerPolynomial e = IntegerPolynomial.fromBinary(data, N, q);
-        IntegerPolynomial ci = decrypt(e, priv_t, priv_fp);
-
-        if (ci.count(-1) < dm0)
-        {
-            throw new InvalidCipherTextException("Less than dm0 coefficients equal -1");
-        }
-        if (ci.count(0) < dm0)
-        {
-            throw new InvalidCipherTextException("Less than dm0 coefficients equal 0");
-        }
-        if (ci.count(1) < dm0)
-        {
-            throw new InvalidCipherTextException("Less than dm0 coefficients equal 1");
-        }
-
-        IntegerPolynomial cR = (IntegerPolynomial)e.clone();
-        cR.sub(ci);
-        cR.modPositive(q);
-        IntegerPolynomial cR4 = (IntegerPolynomial)cR.clone();
-        cR4.modPositive(4);
-        byte[] coR4 = cR4.toBinary(4);
-        IntegerPolynomial mask = MGF(coR4, N, minCallsMask, hashSeed);
-        IntegerPolynomial cMTrin = ci;
-        cMTrin.sub(mask);
-        cMTrin.mod3();
-        byte[] cM = cMTrin.toBinary3Sves();
-
-        byte[] cb = new byte[bLen];
-        System.arraycopy(cM, 0, cb, 0, bLen);
-        int cl = cM[bLen] & 0xFF;   // llen=1, so read one byte
-        if (cl > maxMsgLenBytes)
-        {
-            throw new InvalidCipherTextException("Message too long: " + cl + ">" + maxMsgLenBytes);
-        }
-        byte[] cm = new byte[cl];
-        System.arraycopy(cM, bLen + 1, cm, 0, cl);
-        byte[] p0 = new byte[cM.length - (bLen + 1 + cl)];
-        System.arraycopy(cM, bLen + 1 + cl, p0, 0, p0.length);
-        if (!Arrays.constantTimeAreEqual(p0, new byte[p0.length]))
-        {
-           throw new InvalidCipherTextException("The message is not followed by zeroes");
-        }
-
-        // sData = OID|m|b|hTrunc
-        byte[] bh = pub.toBinary(q);
-        byte[] hTrunc = copyOf(bh, pkLen / 8);
-        byte[] sData = buildSData(oid, cm, cl, cb, hTrunc);
-
-        Polynomial cr = generateBlindingPoly(sData, cm);
-        IntegerPolynomial cRPrime = cr.mult(pub);
-        cRPrime.modPositive(q);
-        if (!cRPrime.equals(cR))
-        {
-            throw new InvalidCipherTextException("Invalid message encoding");
-        }
-
-        return cm;
-    }
-
-    /**
-     * @param e
-     * @param priv_t  a polynomial such that if <code>fastFp=true</code>, <code>f=1+3*priv_t</code>; otherwise, <code>f=priv_t</code>
-     * @param priv_fp
-     * @return
-     */
-    protected IntegerPolynomial decrypt(IntegerPolynomial e, Polynomial priv_t, IntegerPolynomial priv_fp)
-    {
-        IntegerPolynomial a;
-        if (params.fastFp)
-        {
-            a = priv_t.mult(e, params.q);
-            a.mult(3);
-            a.add(e);
-        }
-        else
-        {
-            a = priv_t.mult(e, params.q);
-        }
-        a.center0(params.q);
-        a.mod3();
-
-        IntegerPolynomial c = params.fastFp ? a : new DenseTernaryPolynomial(a).mult(priv_fp, 3);
-        c.center0(3);
-        return c;
-    }
-
-    private byte[] copyOf(byte[] src, int len)
-    {
-        byte[] tmp = new byte[len];
-
-        System.arraycopy(src, 0, tmp, 0, len < src.length ? len : src.length);
-
-        return tmp;
-    }
-
-    private int log2(int value)
-    {
-        if (value == 2048)
-        {
-            return 11;
-        }
-
-        throw new IllegalStateException("log2 not fully implemented");
-    }
-}
\ No newline at end of file
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/ntru/NTRUParameters.java b/bcprov/src/main/java/org/bouncycastle/pqc/crypto/ntru/NTRUParameters.java
deleted file mode 100644
index 158c038..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/ntru/NTRUParameters.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package org.bouncycastle.pqc.crypto.ntru;
-
-public class NTRUParameters
-{
-    public static final int TERNARY_POLYNOMIAL_TYPE_SIMPLE = 0;
-    public static final int TERNARY_POLYNOMIAL_TYPE_PRODUCT = 1;
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/ntru/NTRUSigner.java b/bcprov/src/main/java/org/bouncycastle/pqc/crypto/ntru/NTRUSigner.java
deleted file mode 100644
index 19bf802..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/ntru/NTRUSigner.java
+++ /dev/null
@@ -1,263 +0,0 @@
-package org.bouncycastle.pqc.crypto.ntru;
-
-import java.nio.ByteBuffer;
-
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.pqc.math.ntru.polynomial.IntegerPolynomial;
-import org.bouncycastle.pqc.math.ntru.polynomial.Polynomial;
-
-/**
-* Signs, verifies data and generates key pairs.
-* @deprecated the NTRUSigner algorithm was broken in 2012 by Ducas and Nguyen. See
-* <a href="http://www.di.ens.fr/~ducas/NTRUSign_Cryptanalysis/DucasNguyen_Learning.pdf">
-* http://www.di.ens.fr/~ducas/NTRUSign_Cryptanalysis/DucasNguyen_Learning.pdf</a>
-* for details.
-*/
-public class NTRUSigner
-{
-    private NTRUSigningParameters params;
-    private Digest hashAlg;
-    private NTRUSigningPrivateKeyParameters signingKeyPair;
-    private NTRUSigningPublicKeyParameters verificationKey;
-
-    /**
-     * Constructs a new instance with a set of signature parameters.
-     *
-     * @param params signature parameters
-     */
-    public NTRUSigner(NTRUSigningParameters params)
-    {
-        this.params = params;
-    }
-
-    /**
-     * Resets the engine for signing a message.
-     *
-     * @param forSigning
-     * @param params
-     */
-    public void init(boolean forSigning, CipherParameters params)
-    {
-        if (forSigning)
-        {
-            this.signingKeyPair = (NTRUSigningPrivateKeyParameters)params;
-        }
-        else
-        {
-            this.verificationKey = (NTRUSigningPublicKeyParameters)params;
-        }
-        hashAlg = this.params.hashAlg;
-        hashAlg.reset();
-    }
-
-    /**
-      * Adds data to sign or verify.
-      *
-      * @param b data
-      */
-     public void update(byte b)
-     {
-         if (hashAlg == null)
-         {
-             throw new IllegalStateException("Call initSign or initVerify first!");
-         }
-
-         hashAlg.update(b);
-     }
-
-    /**
-     * Adds data to sign or verify.
-     *
-     * @param m data
-     * @param off offset
-     * @param length number of bytes
-     */
-    public void update(byte[] m, int off, int length)
-    {
-        if (hashAlg == null)
-        {
-            throw new IllegalStateException("Call initSign or initVerify first!");
-        }
-
-        hashAlg.update(m, off, length);
-    }
-
-    /**
-     * Adds data to sign and computes a signature over this data and any data previously added via {@link #update(byte[], int, int)}.
-     *
-     * @return a signature
-     * @throws IllegalStateException if <code>initSign</code> was not called
-     */
-    public byte[] generateSignature()
-    {
-        if (hashAlg == null || signingKeyPair == null)
-        {
-            throw new IllegalStateException("Call initSign first!");
-        }
-
-        byte[] msgHash = new byte[hashAlg.getDigestSize()];
-
-        hashAlg.doFinal(msgHash, 0);
-        return signHash(msgHash, signingKeyPair);
-    }
-
-    private byte[] signHash(byte[] msgHash, NTRUSigningPrivateKeyParameters kp)
-    {
-        int r = 0;
-        IntegerPolynomial s;
-        IntegerPolynomial i;
-
-        NTRUSigningPublicKeyParameters kPub = kp.getPublicKey();
-        do
-        {
-            r++;
-            if (r > params.signFailTolerance)
-            {
-                throw new IllegalStateException("Signing failed: too many retries (max=" + params.signFailTolerance + ")");
-            }
-            i = createMsgRep(msgHash, r);
-            s = sign(i, kp);
-        }
-        while (!verify(i, s, kPub.h));
-
-        byte[] rawSig = s.toBinary(params.q);
-        ByteBuffer sbuf = ByteBuffer.allocate(rawSig.length + 4);
-        sbuf.put(rawSig);
-        sbuf.putInt(r);
-        return sbuf.array();
-    }
-
-    private IntegerPolynomial sign(IntegerPolynomial i, NTRUSigningPrivateKeyParameters kp)
-    {
-        int N = params.N;
-        int q = params.q;
-        int perturbationBases = params.B;
-
-        NTRUSigningPrivateKeyParameters kPriv = kp;
-        NTRUSigningPublicKeyParameters kPub = kp.getPublicKey();
-
-        IntegerPolynomial s = new IntegerPolynomial(N);
-        int iLoop = perturbationBases;
-        while (iLoop >= 1)
-        {
-            Polynomial f = kPriv.getBasis(iLoop).f;
-            Polynomial fPrime = kPriv.getBasis(iLoop).fPrime;
-
-            IntegerPolynomial y = f.mult(i);
-            y.div(q);
-            y = fPrime.mult(y);
-
-            IntegerPolynomial x = fPrime.mult(i);
-            x.div(q);
-            x = f.mult(x);
-
-            IntegerPolynomial si = y;
-            si.sub(x);
-            s.add(si);
-
-            IntegerPolynomial hi = (IntegerPolynomial)kPriv.getBasis(iLoop).h.clone();
-            if (iLoop > 1)
-            {
-                hi.sub(kPriv.getBasis(iLoop - 1).h);
-            }
-            else
-            {
-                hi.sub(kPub.h);
-            }
-            i = si.mult(hi, q);
-
-            iLoop--;
-        }
-
-        Polynomial f = kPriv.getBasis(0).f;
-        Polynomial fPrime = kPriv.getBasis(0).fPrime;
-
-        IntegerPolynomial y = f.mult(i);
-        y.div(q);
-        y = fPrime.mult(y);
-
-        IntegerPolynomial x = fPrime.mult(i);
-        x.div(q);
-        x = f.mult(x);
-
-        y.sub(x);
-        s.add(y);
-        s.modPositive(q);
-        return s;
-    }
-
-    /**
-     * Verifies a signature for any data previously added via {@link #update(byte[], int, int)}.
-     *
-     * @param sig a signature
-     * @return whether the signature is valid
-     * @throws IllegalStateException if <code>initVerify</code> was not called
-     */
-    public boolean verifySignature(byte[] sig)
-    {
-        if (hashAlg == null || verificationKey == null)
-        {
-            throw new IllegalStateException("Call initVerify first!");
-        }
-
-        byte[] msgHash = new byte[hashAlg.getDigestSize()];
-
-        hashAlg.doFinal(msgHash, 0);
-
-        return verifyHash(msgHash, sig, verificationKey);
-    }
-
-    private boolean verifyHash(byte[] msgHash, byte[] sig, NTRUSigningPublicKeyParameters pub)
-    {
-        ByteBuffer sbuf = ByteBuffer.wrap(sig);
-        byte[] rawSig = new byte[sig.length - 4];
-        sbuf.get(rawSig);
-        IntegerPolynomial s = IntegerPolynomial.fromBinary(rawSig, params.N, params.q);
-        int r = sbuf.getInt();
-        return verify(createMsgRep(msgHash, r), s, pub.h);
-    }
-
-    private boolean verify(IntegerPolynomial i, IntegerPolynomial s, IntegerPolynomial h)
-    {
-        int q = params.q;
-        double normBoundSq = params.normBoundSq;
-        double betaSq = params.betaSq;
-
-        IntegerPolynomial t = h.mult(s, q);
-        t.sub(i);
-        long centeredNormSq = (long)(s.centeredNormSq(q) + betaSq * t.centeredNormSq(q));
-        return centeredNormSq <= normBoundSq;
-    }
-
-    protected IntegerPolynomial createMsgRep(byte[] msgHash, int r)
-    {
-        int N = params.N;
-        int q = params.q;
-
-        int c = 31 - Integer.numberOfLeadingZeros(q);
-        int B = (c + 7) / 8;
-        IntegerPolynomial i = new IntegerPolynomial(N);
-
-        ByteBuffer cbuf = ByteBuffer.allocate(msgHash.length + 4);
-        cbuf.put(msgHash);
-        cbuf.putInt(r);
-        NTRUSignerPrng prng = new NTRUSignerPrng(cbuf.array(), params.hashAlg);
-
-        for (int t = 0; t < N; t++)
-        {
-            byte[] o = prng.nextBytes(B);
-            int hi = o[o.length - 1];
-            hi >>= 8 * B - c;
-            hi <<= 8 * B - c;
-            o[o.length - 1] = (byte)hi;
-
-            ByteBuffer obuf = ByteBuffer.allocate(4);
-            obuf.put(o);
-            obuf.rewind();
-            // reverse byte order so it matches the endianness of java ints
-            i.coeffs[t] = Integer.reverseBytes(obuf.getInt());
-        }
-        return i;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/ntru/NTRUSignerPrng.java b/bcprov/src/main/java/org/bouncycastle/pqc/crypto/ntru/NTRUSignerPrng.java
deleted file mode 100644
index 77ed63a..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/ntru/NTRUSignerPrng.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package org.bouncycastle.pqc.crypto.ntru;
-
-import java.nio.ByteBuffer;
-
-import org.bouncycastle.crypto.Digest;
-
-/**
- * An implementation of the deterministic pseudo-random generator in EESS section 3.7.3.1
- */
-public class NTRUSignerPrng
-{
-    private int counter;
-    private byte[] seed;
-    private Digest hashAlg;
-
-    /**
-     * Constructs a new PRNG and seeds it with a byte array.
-     *
-     * @param seed    a seed
-     * @param hashAlg the hash algorithm to use
-     */
-    NTRUSignerPrng(byte[] seed, Digest hashAlg)
-    {
-        counter = 0;
-        this.seed = seed;
-        this.hashAlg = hashAlg;
-    }
-
-    /**
-     * Returns <code>n</code> random bytes
-     *
-     * @param n number of bytes to return
-     * @return the next <code>n</code> random bytes
-     */
-    byte[] nextBytes(int n)
-    {
-        ByteBuffer buf = ByteBuffer.allocate(n);
-
-        while (buf.hasRemaining())
-        {
-            ByteBuffer cbuf = ByteBuffer.allocate(seed.length + 4);
-            cbuf.put(seed);
-            cbuf.putInt(counter);
-            byte[] array = cbuf.array();
-            byte[] hash = new byte[hashAlg.getDigestSize()];
-
-            hashAlg.update(array, 0, array.length);
-
-            hashAlg.doFinal(hash, 0);
-
-            if (buf.remaining() < hash.length)
-            {
-                buf.put(hash, 0, buf.remaining());
-            }
-            else
-            {
-                buf.put(hash);
-            }
-            counter++;
-        }
-
-        return buf.array();
-    }
-}
\ No newline at end of file
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/ntru/NTRUSigningKeyGenerationParameters.java b/bcprov/src/main/java/org/bouncycastle/pqc/crypto/ntru/NTRUSigningKeyGenerationParameters.java
deleted file mode 100644
index b6ff8c5..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/ntru/NTRUSigningKeyGenerationParameters.java
+++ /dev/null
@@ -1,407 +0,0 @@
-package org.bouncycastle.pqc.crypto.ntru;
-
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.security.SecureRandom;
-import java.text.DecimalFormat;
-
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.KeyGenerationParameters;
-import org.bouncycastle.crypto.digests.SHA256Digest;
-import org.bouncycastle.crypto.digests.SHA512Digest;
-
-/**
- * A set of parameters for NtruSign. Several predefined parameter sets are available and new ones can be created as well.
- */
-public class NTRUSigningKeyGenerationParameters
-    extends KeyGenerationParameters
-    implements Cloneable
-{   
-    public static final int BASIS_TYPE_STANDARD = 0;
-    public static final int BASIS_TYPE_TRANSPOSE = 1;
-
-    public static final int KEY_GEN_ALG_RESULTANT = 0;
-    public static final int KEY_GEN_ALG_FLOAT = 1;
-    
-    /**
-     * Gives 128 bits of security
-     */
-    public static final NTRUSigningKeyGenerationParameters APR2011_439 = new NTRUSigningKeyGenerationParameters(439, 2048, 146, 1, BASIS_TYPE_TRANSPOSE, 0.165, 490, 280, false, true, KEY_GEN_ALG_RESULTANT, new SHA256Digest());
-
-    /**
-     * Like <code>APR2011_439</code>, this parameter set gives 128 bits of security but uses product-form polynomials
-     */
-    public static final NTRUSigningKeyGenerationParameters APR2011_439_PROD = new NTRUSigningKeyGenerationParameters(439, 2048, 9, 8, 5, 1, BASIS_TYPE_TRANSPOSE, 0.165, 490, 280, false, true, KEY_GEN_ALG_RESULTANT, new SHA256Digest());
-
-    /**
-     * Gives 256 bits of security
-     */
-    public static final NTRUSigningKeyGenerationParameters APR2011_743 = new NTRUSigningKeyGenerationParameters(743, 2048, 248, 1, BASIS_TYPE_TRANSPOSE, 0.127, 560, 360, true, false, KEY_GEN_ALG_RESULTANT, new SHA512Digest());
-
-    /**
-     * Like <code>APR2011_439</code>, this parameter set gives 256 bits of security but uses product-form polynomials
-     */
-    public static final NTRUSigningKeyGenerationParameters APR2011_743_PROD = new NTRUSigningKeyGenerationParameters(743, 2048, 11, 11, 15, 1, BASIS_TYPE_TRANSPOSE, 0.127, 560, 360, true, false, KEY_GEN_ALG_RESULTANT, new SHA512Digest());
-
-    /**
-     * Generates key pairs quickly. Use for testing only.
-     */
-    public static final NTRUSigningKeyGenerationParameters TEST157 = new NTRUSigningKeyGenerationParameters(157, 256, 29, 1, BASIS_TYPE_TRANSPOSE, 0.38, 200, 80, false, false, KEY_GEN_ALG_RESULTANT, new SHA256Digest());
-    /**
-     * Generates key pairs quickly. Use for testing only.
-     */
-    public static final NTRUSigningKeyGenerationParameters TEST157_PROD = new NTRUSigningKeyGenerationParameters(157, 256, 5, 5, 8, 1, BASIS_TYPE_TRANSPOSE, 0.38, 200, 80, false, false, KEY_GEN_ALG_RESULTANT, new SHA256Digest());
-
-
-    public int N;
-    public int q;
-    public int d, d1, d2, d3, B;
-    double beta;
-    public double betaSq;
-    double normBound;
-    public double normBoundSq;
-    public int signFailTolerance = 100;
-    double keyNormBound;
-    public double keyNormBoundSq;
-    public boolean primeCheck;   // true if N and 2N+1 are prime
-    public int basisType;
-    int bitsF = 6;   // max #bits needed to encode one coefficient of the polynomial F
-    public boolean sparse;   // whether to treat ternary polynomials as sparsely populated
-    public int keyGenAlg;
-    public Digest hashAlg;
-    public int polyType;
-
-    /**
-     * Constructs a parameter set that uses ternary private keys (i.e. <code>polyType=SIMPLE</code>).
-     *
-     * @param N            number of polynomial coefficients
-     * @param q            modulus
-     * @param d            number of -1's in the private polynomials <code>f</code> and <code>g</code>
-     * @param B            number of perturbations
-     * @param basisType    whether to use the standard or transpose lattice
-     * @param beta         balancing factor for the transpose lattice
-     * @param normBound    maximum norm for valid signatures
-     * @param keyNormBound maximum norm for the ploynomials <code>F</code> and <code>G</code>
-     * @param primeCheck   whether <code>2N+1</code> is prime
-     * @param sparse       whether to treat ternary polynomials as sparsely populated ({@link org.bouncycastle.pqc.math.ntru.polynomial.SparseTernaryPolynomial} vs {@link org.bouncycastle.pqc.math.ntru.polynomial.DenseTernaryPolynomial})
-     * @param keyGenAlg    <code>RESULTANT</code> produces better bases, <code>FLOAT</code> is slightly faster. <code>RESULTANT</code> follows the EESS standard while <code>FLOAT</code> is described in Hoffstein et al: An Introduction to Mathematical Cryptography.
-     * @param hashAlg      a valid identifier for a <code>java.security.MessageDigest</code> instance such as <code>SHA-256</code>. The <code>MessageDigest</code> must support the <code>getDigestLength()</code> method.
-     */
-    public NTRUSigningKeyGenerationParameters(int N, int q, int d, int B, int basisType, double beta, double normBound, double keyNormBound, boolean primeCheck, boolean sparse, int keyGenAlg, Digest hashAlg)
-    {
-        super(new SecureRandom(), N);
-        this.N = N;
-        this.q = q;
-        this.d = d;
-        this.B = B;
-        this.basisType = basisType;
-        this.beta = beta;
-        this.normBound = normBound;
-        this.keyNormBound = keyNormBound;
-        this.primeCheck = primeCheck;
-        this.sparse = sparse;
-        this.keyGenAlg = keyGenAlg;
-        this.hashAlg = hashAlg;
-        polyType = NTRUParameters.TERNARY_POLYNOMIAL_TYPE_SIMPLE;
-        init();
-    }
-
-    /**
-     * Constructs a parameter set that uses product-form private keys (i.e. <code>polyType=PRODUCT</code>).
-     *
-     * @param N            number of polynomial coefficients
-     * @param q            modulus
-     * @param d1           number of -1's in the private polynomials <code>f</code> and <code>g</code>
-     * @param d2           number of -1's in the private polynomials <code>f</code> and <code>g</code>
-     * @param d3           number of -1's in the private polynomials <code>f</code> and <code>g</code>
-     * @param B            number of perturbations
-     * @param basisType    whether to use the standard or transpose lattice
-     * @param beta         balancing factor for the transpose lattice
-     * @param normBound    maximum norm for valid signatures
-     * @param keyNormBound maximum norm for the ploynomials <code>F</code> and <code>G</code>
-     * @param primeCheck   whether <code>2N+1</code> is prime
-     * @param sparse       whether to treat ternary polynomials as sparsely populated ({@link org.bouncycastle.pqc.math.ntru.polynomial.SparseTernaryPolynomial} vs {@link org.bouncycastle.pqc.math.ntru.polynomial.DenseTernaryPolynomial})
-     * @param keyGenAlg    <code>RESULTANT</code> produces better bases, <code>FLOAT</code> is slightly faster. <code>RESULTANT</code> follows the EESS standard while <code>FLOAT</code> is described in Hoffstein et al: An Introduction to Mathematical Cryptography.
-     * @param hashAlg      a valid identifier for a <code>java.security.MessageDigest</code> instance such as <code>SHA-256</code>. The <code>MessageDigest</code> must support the <code>getDigestLength()</code> method.
-     */
-    public NTRUSigningKeyGenerationParameters(int N, int q, int d1, int d2, int d3, int B, int basisType, double beta, double normBound, double keyNormBound, boolean primeCheck, boolean sparse, int keyGenAlg, Digest hashAlg)
-    {
-        super(new SecureRandom(), N);
-        this.N = N;
-        this.q = q;
-        this.d1 = d1;
-        this.d2 = d2;
-        this.d3 = d3;
-        this.B = B;
-        this.basisType = basisType;
-        this.beta = beta;
-        this.normBound = normBound;
-        this.keyNormBound = keyNormBound;
-        this.primeCheck = primeCheck;
-        this.sparse = sparse;
-        this.keyGenAlg = keyGenAlg;
-        this.hashAlg = hashAlg;
-        polyType = NTRUParameters.TERNARY_POLYNOMIAL_TYPE_PRODUCT;
-        init();
-    }
-
-    private void init()
-    {
-        betaSq = beta * beta;
-        normBoundSq = normBound * normBound;
-        keyNormBoundSq = keyNormBound * keyNormBound;
-    }
-
-    /**
-     * Reads a parameter set from an input stream.
-     *
-     * @param is an input stream
-     * @throws java.io.IOException
-     */
-    public NTRUSigningKeyGenerationParameters(InputStream is)
-        throws IOException
-    {
-        super(new SecureRandom(), 0);     // TODO:
-        DataInputStream dis = new DataInputStream(is);
-        N = dis.readInt();
-        q = dis.readInt();
-        d = dis.readInt();
-        d1 = dis.readInt();
-        d2 = dis.readInt();
-        d3 = dis.readInt();
-        B = dis.readInt();
-        basisType = dis.readInt();
-        beta = dis.readDouble();
-        normBound = dis.readDouble();
-        keyNormBound = dis.readDouble();
-        signFailTolerance = dis.readInt();
-        primeCheck = dis.readBoolean();
-        sparse = dis.readBoolean();
-        bitsF = dis.readInt();
-        keyGenAlg = dis.read();
-        String alg = dis.readUTF();
-        if ("SHA-512".equals(alg))
-        {
-            hashAlg = new SHA512Digest();
-        }
-        else if ("SHA-256".equals(alg))
-        {
-            hashAlg = new SHA256Digest();
-        }
-        polyType = dis.read();
-        init();
-    }
-
-    /**
-     * Writes the parameter set to an output stream
-     *
-     * @param os an output stream
-     * @throws java.io.IOException
-     */
-    public void writeTo(OutputStream os)
-        throws IOException
-    {
-        DataOutputStream dos = new DataOutputStream(os);
-        dos.writeInt(N);
-        dos.writeInt(q);
-        dos.writeInt(d);
-        dos.writeInt(d1);
-        dos.writeInt(d2);
-        dos.writeInt(d3);
-        dos.writeInt(B);
-        dos.writeInt(basisType);
-        dos.writeDouble(beta);
-        dos.writeDouble(normBound);
-        dos.writeDouble(keyNormBound);
-        dos.writeInt(signFailTolerance);
-        dos.writeBoolean(primeCheck);
-        dos.writeBoolean(sparse);
-        dos.writeInt(bitsF);
-        dos.write(keyGenAlg);
-        dos.writeUTF(hashAlg.getAlgorithmName());
-        dos.write(polyType);
-    }
-
-    public NTRUSigningParameters getSigningParameters()
-    {
-        return new NTRUSigningParameters(N, q, d, B, beta, normBound, hashAlg);
-    }
-
-    public NTRUSigningKeyGenerationParameters clone()
-    {
-        if (polyType == NTRUParameters.TERNARY_POLYNOMIAL_TYPE_SIMPLE)
-        {
-            return new NTRUSigningKeyGenerationParameters(N, q, d, B, basisType, beta, normBound, keyNormBound, primeCheck, sparse, keyGenAlg, hashAlg);
-        }
-        else
-        {
-            return new NTRUSigningKeyGenerationParameters(N, q, d1, d2, d3, B, basisType, beta, normBound, keyNormBound, primeCheck, sparse, keyGenAlg, hashAlg);
-        }
-    }
-
-    public int hashCode()
-    {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + B;
-        result = prime * result + N;
-        result = prime * result + basisType;
-        long temp;
-        temp = Double.doubleToLongBits(beta);
-        result = prime * result + (int)(temp ^ (temp >>> 32));
-        temp = Double.doubleToLongBits(betaSq);
-        result = prime * result + (int)(temp ^ (temp >>> 32));
-        result = prime * result + bitsF;
-        result = prime * result + d;
-        result = prime * result + d1;
-        result = prime * result + d2;
-        result = prime * result + d3;
-        result = prime * result + ((hashAlg == null) ? 0 : hashAlg.getAlgorithmName().hashCode());
-        result = prime * result + keyGenAlg;
-        temp = Double.doubleToLongBits(keyNormBound);
-        result = prime * result + (int)(temp ^ (temp >>> 32));
-        temp = Double.doubleToLongBits(keyNormBoundSq);
-        result = prime * result + (int)(temp ^ (temp >>> 32));
-        temp = Double.doubleToLongBits(normBound);
-        result = prime * result + (int)(temp ^ (temp >>> 32));
-        temp = Double.doubleToLongBits(normBoundSq);
-        result = prime * result + (int)(temp ^ (temp >>> 32));
-        result = prime * result + polyType;
-        result = prime * result + (primeCheck ? 1231 : 1237);
-        result = prime * result + q;
-        result = prime * result + signFailTolerance;
-        result = prime * result + (sparse ? 1231 : 1237);
-        return result;
-    }
-
-    public boolean equals(Object obj)
-    {
-        if (this == obj)
-        {
-            return true;
-        }
-        if (obj == null)
-        {
-            return false;
-        }
-        if (!(obj instanceof NTRUSigningKeyGenerationParameters))
-        {
-            return false;
-        }
-        NTRUSigningKeyGenerationParameters other = (NTRUSigningKeyGenerationParameters)obj;
-        if (B != other.B)
-        {
-            return false;
-        }
-        if (N != other.N)
-        {
-            return false;
-        }
-        if (basisType != other.basisType)
-        {
-            return false;
-        }
-        if (Double.doubleToLongBits(beta) != Double.doubleToLongBits(other.beta))
-        {
-            return false;
-        }
-        if (Double.doubleToLongBits(betaSq) != Double.doubleToLongBits(other.betaSq))
-        {
-            return false;
-        }
-        if (bitsF != other.bitsF)
-        {
-            return false;
-        }
-        if (d != other.d)
-        {
-            return false;
-        }
-        if (d1 != other.d1)
-        {
-            return false;
-        }
-        if (d2 != other.d2)
-        {
-            return false;
-        }
-        if (d3 != other.d3)
-        {
-            return false;
-        }
-        if (hashAlg == null)
-        {
-            if (other.hashAlg != null)
-            {
-                return false;
-            }
-        }
-        else if (!hashAlg.getAlgorithmName().equals(other.hashAlg.getAlgorithmName()))
-        {
-            return false;
-        }
-        if (keyGenAlg != other.keyGenAlg)
-        {
-            return false;
-        }
-        if (Double.doubleToLongBits(keyNormBound) != Double.doubleToLongBits(other.keyNormBound))
-        {
-            return false;
-        }
-        if (Double.doubleToLongBits(keyNormBoundSq) != Double.doubleToLongBits(other.keyNormBoundSq))
-        {
-            return false;
-        }
-        if (Double.doubleToLongBits(normBound) != Double.doubleToLongBits(other.normBound))
-        {
-            return false;
-        }
-        if (Double.doubleToLongBits(normBoundSq) != Double.doubleToLongBits(other.normBoundSq))
-        {
-            return false;
-        }
-        if (polyType != other.polyType)
-        {
-            return false;
-        }
-        if (primeCheck != other.primeCheck)
-        {
-            return false;
-        }
-        if (q != other.q)
-        {
-            return false;
-        }
-        if (signFailTolerance != other.signFailTolerance)
-        {
-            return false;
-        }
-        if (sparse != other.sparse)
-        {
-            return false;
-        }
-        return true;
-    }
-
-    public String toString()
-    {
-        DecimalFormat format = new DecimalFormat("0.00");
-
-        StringBuilder output = new StringBuilder("SignatureParameters(N=" + N + " q=" + q);
-        if (polyType == NTRUParameters.TERNARY_POLYNOMIAL_TYPE_SIMPLE)
-        {
-            output.append(" polyType=SIMPLE d=" + d);
-        }
-        else
-        {
-            output.append(" polyType=PRODUCT d1=" + d1 + " d2=" + d2 + " d3=" + d3);
-        }
-        output.append(" B=" + B + " basisType=" + basisType + " beta=" + format.format(beta) +
-            " normBound=" + format.format(normBound) + " keyNormBound=" + format.format(keyNormBound) +
-            " prime=" + primeCheck + " sparse=" + sparse + " keyGenAlg=" + keyGenAlg + " hashAlg=" + hashAlg + ")");
-        return output.toString();
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/ntru/NTRUSigningKeyPairGenerator.java b/bcprov/src/main/java/org/bouncycastle/pqc/crypto/ntru/NTRUSigningKeyPairGenerator.java
deleted file mode 100644
index 1471509..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/ntru/NTRUSigningKeyPairGenerator.java
+++ /dev/null
@@ -1,357 +0,0 @@
-package org.bouncycastle.pqc.crypto.ntru;
-
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.security.SecureRandom;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-
-import org.bouncycastle.crypto.AsymmetricCipherKeyPair;
-import org.bouncycastle.crypto.AsymmetricCipherKeyPairGenerator;
-import org.bouncycastle.crypto.KeyGenerationParameters;
-import org.bouncycastle.pqc.math.ntru.euclid.BigIntEuclidean;
-import org.bouncycastle.pqc.math.ntru.polynomial.BigDecimalPolynomial;
-import org.bouncycastle.pqc.math.ntru.polynomial.BigIntPolynomial;
-import org.bouncycastle.pqc.math.ntru.polynomial.DenseTernaryPolynomial;
-import org.bouncycastle.pqc.math.ntru.polynomial.IntegerPolynomial;
-import org.bouncycastle.pqc.math.ntru.polynomial.Polynomial;
-import org.bouncycastle.pqc.math.ntru.polynomial.ProductFormPolynomial;
-import org.bouncycastle.pqc.math.ntru.polynomial.Resultant;
-
-import static java.math.BigInteger.ONE;
-import static java.math.BigInteger.ZERO;
-
-public class NTRUSigningKeyPairGenerator
-    implements AsymmetricCipherKeyPairGenerator
-{
-    private NTRUSigningKeyGenerationParameters params;
-
-    public void init(KeyGenerationParameters param)
-    {
-        this.params = (NTRUSigningKeyGenerationParameters)param;
-    }
-
-    /**
-     * Generates a new signature key pair. Starts <code>B+1</code> threads.
-     *
-     * @return a key pair
-     */
-    public AsymmetricCipherKeyPair generateKeyPair()
-    {
-        NTRUSigningPublicKeyParameters pub = null;
-        ExecutorService executor = Executors.newCachedThreadPool();
-        List<Future<NTRUSigningPrivateKeyParameters.Basis>> bases = new ArrayList<Future<NTRUSigningPrivateKeyParameters.Basis>>();
-        for (int k = params.B; k >= 0; k--)
-        {
-            bases.add(executor.submit(new BasisGenerationTask()));
-        }
-        executor.shutdown();
-
-        List<NTRUSigningPrivateKeyParameters.Basis> basises = new ArrayList<NTRUSigningPrivateKeyParameters.Basis>();
-
-        for (int k = params.B; k >= 0; k--)
-        {
-            Future<NTRUSigningPrivateKeyParameters.Basis> basis = bases.get(k);
-            try
-            {
-                basises.add(basis.get());
-                if (k == params.B)
-                {
-                    pub = new NTRUSigningPublicKeyParameters(basis.get().h, params.getSigningParameters());
-                }
-            }
-            catch (Exception e)
-            {
-                throw new IllegalStateException(e);
-            }
-        }
-        NTRUSigningPrivateKeyParameters priv = new NTRUSigningPrivateKeyParameters(basises, pub);
-        AsymmetricCipherKeyPair kp = new AsymmetricCipherKeyPair(pub, priv);
-        return kp;
-    }
-
-    /**
-     * Generates a new signature key pair. Runs in a single thread.
-     *
-     * @return a key pair
-     */
-    public AsymmetricCipherKeyPair generateKeyPairSingleThread()
-    {
-        List<NTRUSigningPrivateKeyParameters.Basis> basises = new ArrayList<NTRUSigningPrivateKeyParameters.Basis>();
-        NTRUSigningPublicKeyParameters pub = null;
-        for (int k = params.B; k >= 0; k--)
-        {
-            NTRUSigningPrivateKeyParameters.Basis basis = generateBoundedBasis();
-            basises.add(basis);
-            if (k == 0)
-            {
-                pub = new NTRUSigningPublicKeyParameters(basis.h, params.getSigningParameters());
-            }
-        }
-        NTRUSigningPrivateKeyParameters priv = new NTRUSigningPrivateKeyParameters(basises, pub);
-        return new AsymmetricCipherKeyPair(pub, priv);
-    }
-
-
-    /**
-     * Implementation of the optional steps 20 through 26 in EESS1v2.pdf, section 3.5.1.1.
-     * This doesn't seem to have much of an effect and sometimes actually increases the
-     * norm of F, but on average it slightly reduces the norm.<br/>
-     * This method changes <code>F</code> and <code>g</code> but leaves <code>f</code> and
-     * <code>g</code> unchanged.
-     *
-     * @param f
-     * @param g
-     * @param F
-     * @param G
-     * @param N
-     */
-    private void minimizeFG(IntegerPolynomial f, IntegerPolynomial g, IntegerPolynomial F, IntegerPolynomial G, int N)
-    {
-        int E = 0;
-        for (int j = 0; j < N; j++)
-        {
-            E += 2 * N * (f.coeffs[j] * f.coeffs[j] + g.coeffs[j] * g.coeffs[j]);
-        }
-
-        // [f(1)+g(1)]^2 = 4
-        E -= 4;
-
-        IntegerPolynomial u = (IntegerPolynomial)f.clone();
-        IntegerPolynomial v = (IntegerPolynomial)g.clone();
-        int j = 0;
-        int k = 0;
-        int maxAdjustment = N;
-        while (k < maxAdjustment && j < N)
-        {
-            int D = 0;
-            int i = 0;
-            while (i < N)
-            {
-                int D1 = F.coeffs[i] * f.coeffs[i];
-                int D2 = G.coeffs[i] * g.coeffs[i];
-                int D3 = 4 * N * (D1 + D2);
-                D += D3;
-                i++;
-            }
-            // f(1)+g(1) = 2
-            int D1 = 4 * (F.sumCoeffs() + G.sumCoeffs());
-            D -= D1;
-
-            if (D > E)
-            {
-                F.sub(u);
-                G.sub(v);
-                k++;
-                j = 0;
-            }
-            else if (D < -E)
-            {
-                F.add(u);
-                G.add(v);
-                k++;
-                j = 0;
-            }
-            j++;
-            u.rotate1();
-            v.rotate1();
-        }
-    }
-
-    /**
-     * Creates a NTRUSigner basis consisting of polynomials <code>f, g, F, G, h</code>.<br/>
-     * If <code>KeyGenAlg=FLOAT</code>, the basis may not be valid and this method must be rerun if that is the case.<br/>
-     *
-     * @see #generateBoundedBasis()
-     */
-    private FGBasis generateBasis()
-    {
-        int N = params.N;
-        int q = params.q;
-        int d = params.d;
-        int d1 = params.d1;
-        int d2 = params.d2;
-        int d3 = params.d3;
-        int basisType = params.basisType;
-
-        Polynomial f;
-        IntegerPolynomial fInt;
-        Polynomial g;
-        IntegerPolynomial gInt;
-        IntegerPolynomial fq;
-        Resultant rf;
-        Resultant rg;
-        BigIntEuclidean r;
-
-        int _2n1 = 2 * N + 1;
-        boolean primeCheck = params.primeCheck;
-
-        do
-        {
-            do
-            {
-                f = params.polyType== NTRUParameters.TERNARY_POLYNOMIAL_TYPE_SIMPLE ? DenseTernaryPolynomial.generateRandom(N, d + 1, d, new SecureRandom()) : ProductFormPolynomial.generateRandom(N, d1, d2, d3 + 1, d3, new SecureRandom());
-                fInt = f.toIntegerPolynomial();
-            }
-            while (primeCheck && fInt.resultant(_2n1).res.equals(ZERO));
-            fq = fInt.invertFq(q);
-        }
-        while (fq == null);
-        rf = fInt.resultant();
-
-        do
-        {
-            do
-            {
-                do
-                {
-                    g = params.polyType == NTRUParameters.TERNARY_POLYNOMIAL_TYPE_SIMPLE ? DenseTernaryPolynomial.generateRandom(N, d + 1, d, new SecureRandom()) : ProductFormPolynomial.generateRandom(N, d1, d2, d3 + 1, d3, new SecureRandom());
-                    gInt = g.toIntegerPolynomial();
-                }
-                while (primeCheck && gInt.resultant(_2n1).res.equals(ZERO));
-            }
-            while (gInt.invertFq(q) == null);
-            rg = gInt.resultant();
-            r = BigIntEuclidean.calculate(rf.res, rg.res);
-        }
-        while (!r.gcd.equals(ONE));
-
-        BigIntPolynomial A = (BigIntPolynomial)rf.rho.clone();
-        A.mult(r.x.multiply(BigInteger.valueOf(q)));
-        BigIntPolynomial B = (BigIntPolynomial)rg.rho.clone();
-        B.mult(r.y.multiply(BigInteger.valueOf(-q)));
-
-        BigIntPolynomial C;
-        if (params.keyGenAlg == NTRUSigningKeyGenerationParameters.KEY_GEN_ALG_RESULTANT)
-        {
-            int[] fRevCoeffs = new int[N];
-            int[] gRevCoeffs = new int[N];
-            fRevCoeffs[0] = fInt.coeffs[0];
-            gRevCoeffs[0] = gInt.coeffs[0];
-            for (int i = 1; i < N; i++)
-            {
-                fRevCoeffs[i] = fInt.coeffs[N - i];
-                gRevCoeffs[i] = gInt.coeffs[N - i];
-            }
-            IntegerPolynomial fRev = new IntegerPolynomial(fRevCoeffs);
-            IntegerPolynomial gRev = new IntegerPolynomial(gRevCoeffs);
-
-            IntegerPolynomial t = f.mult(fRev);
-            t.add(g.mult(gRev));
-            Resultant rt = t.resultant();
-            C = fRev.mult(B);   // fRev.mult(B) is actually faster than new SparseTernaryPolynomial(fRev).mult(B), possibly due to cache locality?
-            C.add(gRev.mult(A));
-            C = C.mult(rt.rho);
-            C.div(rt.res);
-        }
-        else
-        {   // KeyGenAlg.FLOAT
-            // calculate ceil(log10(N))
-            int log10N = 0;
-            for (int i = 1; i < N; i *= 10)
-            {
-                log10N++;
-            }
-
-            // * Cdec needs to be accurate to 1 decimal place so it can be correctly rounded;
-            // * fInv loses up to (#digits of longest coeff of B) places in fInv.mult(B);
-            // * multiplying fInv by B also multiplies the rounding error by a factor of N;
-            // so make #decimal places of fInv the sum of the above.
-            BigDecimalPolynomial fInv = rf.rho.div(new BigDecimal(rf.res), B.getMaxCoeffLength() + 1 + log10N);
-            BigDecimalPolynomial gInv = rg.rho.div(new BigDecimal(rg.res), A.getMaxCoeffLength() + 1 + log10N);
-
-            BigDecimalPolynomial Cdec = fInv.mult(B);
-            Cdec.add(gInv.mult(A));
-            Cdec.halve();
-            C = Cdec.round();
-        }
-
-        BigIntPolynomial F = (BigIntPolynomial)B.clone();
-        F.sub(f.mult(C));
-        BigIntPolynomial G = (BigIntPolynomial)A.clone();
-        G.sub(g.mult(C));
-
-        IntegerPolynomial FInt = new IntegerPolynomial(F);
-        IntegerPolynomial GInt = new IntegerPolynomial(G);
-        minimizeFG(fInt, gInt, FInt, GInt, N);
-
-        Polynomial fPrime;
-        IntegerPolynomial h;
-        if (basisType == NTRUSigningKeyGenerationParameters.BASIS_TYPE_STANDARD)
-        {
-            fPrime = FInt;
-            h = g.mult(fq, q);
-        }
-        else
-        {
-            fPrime = g;
-            h = FInt.mult(fq, q);
-        }
-        h.modPositive(q);
-
-        return new FGBasis(f, fPrime, h, FInt, GInt, params);
-    }
-
-    /**
-     * Creates a basis such that <code>|F| &lt; keyNormBound</code> and <code>|G| &lt; keyNormBound</code>
-     *
-     * @return a NTRUSigner basis
-     */
-    public NTRUSigningPrivateKeyParameters.Basis generateBoundedBasis()
-    {
-        while (true)
-        {
-            FGBasis basis = generateBasis();
-            if (basis.isNormOk())
-            {
-                return basis;
-            }
-        }
-    }
-
-    private class BasisGenerationTask
-        implements Callable<NTRUSigningPrivateKeyParameters.Basis>
-    {
-
-
-        public NTRUSigningPrivateKeyParameters.Basis call()
-            throws Exception
-        {
-            return generateBoundedBasis();
-        }
-    }
-
-    /**
-     * A subclass of Basis that additionally contains the polynomials <code>F</code> and <code>G</code>.
-     */
-    public class FGBasis
-        extends NTRUSigningPrivateKeyParameters.Basis
-    {
-        public IntegerPolynomial F;
-        public IntegerPolynomial G;
-
-        FGBasis(Polynomial f, Polynomial fPrime, IntegerPolynomial h, IntegerPolynomial F, IntegerPolynomial G, NTRUSigningKeyGenerationParameters params)
-        {
-            super(f, fPrime, h, params);
-            this.F = F;
-            this.G = G;
-        }
-
-        /**
-         * Returns <code>true</code> if the norms of the polynomials <code>F</code> and <code>G</code>
-         * are within {@link NTRUSigningKeyGenerationParameters#keyNormBound}.
-         *
-         * @return
-         */
-        boolean isNormOk()
-        {
-            double keyNormBoundSq = params.keyNormBoundSq;
-            int q = params.q;
-            return (F.centeredNormSq(q) < keyNormBoundSq && G.centeredNormSq(q) < keyNormBoundSq);
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/ntru/NTRUSigningParameters.java b/bcprov/src/main/java/org/bouncycastle/pqc/crypto/ntru/NTRUSigningParameters.java
deleted file mode 100644
index 2f018b0..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/ntru/NTRUSigningParameters.java
+++ /dev/null
@@ -1,269 +0,0 @@
-package org.bouncycastle.pqc.crypto.ntru;
-
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.text.DecimalFormat;
-
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.digests.SHA256Digest;
-import org.bouncycastle.crypto.digests.SHA512Digest;
-
-/**
- * A set of parameters for NtruSign. Several predefined parameter sets are available and new ones can be created as well.
- */
-public class NTRUSigningParameters
-    implements Cloneable
-{
-    public int N;
-    public int q;
-    public int d, d1, d2, d3, B;
-    double beta;
-    public double betaSq;
-    double normBound;
-    public double normBoundSq;
-    public int signFailTolerance = 100;
-    int bitsF = 6;   // max #bits needed to encode one coefficient of the polynomial F
-    public Digest hashAlg;
-
-    /**
-     * Constructs a parameter set that uses ternary private keys (i.e. <code>polyType=SIMPLE</code>).
-     *
-     * @param N            number of polynomial coefficients
-     * @param q            modulus
-     * @param d            number of -1's in the private polynomials <code>f</code> and <code>g</code>
-     * @param B            number of perturbations
-     * @param beta         balancing factor for the transpose lattice
-     * @param normBound    maximum norm for valid signatures
-     * @param hashAlg      a valid identifier for a <code>java.security.MessageDigest</code> instance such as <code>SHA-256</code>. The <code>MessageDigest</code> must support the <code>getDigestLength()</code> method.
-     */
-    public NTRUSigningParameters(int N, int q, int d, int B, double beta, double normBound, Digest hashAlg)
-    {
-        this.N = N;
-        this.q = q;
-        this.d = d;
-        this.B = B;
-        this.beta = beta;
-        this.normBound = normBound;
-        this.hashAlg = hashAlg;
-        init();
-    }
-
-    /**
-     * Constructs a parameter set that uses product-form private keys (i.e. <code>polyType=PRODUCT</code>).
-     *
-     * @param N            number of polynomial coefficients
-     * @param q            modulus
-     * @param d1           number of -1's in the private polynomials <code>f</code> and <code>g</code>
-     * @param d2           number of -1's in the private polynomials <code>f</code> and <code>g</code>
-     * @param d3           number of -1's in the private polynomials <code>f</code> and <code>g</code>
-     * @param B            number of perturbations
-     * @param beta         balancing factor for the transpose lattice
-     * @param normBound    maximum norm for valid signatures
-     * @param keyNormBound maximum norm for the ploynomials <code>F</code> and <code>G</code>
-     * @param hashAlg      a valid identifier for a <code>java.security.MessageDigest</code> instance such as <code>SHA-256</code>. The <code>MessageDigest</code> must support the <code>getDigestLength()</code> method.
-     */
-    public NTRUSigningParameters(int N, int q, int d1, int d2, int d3, int B, double beta, double normBound, double keyNormBound, Digest hashAlg)
-    {
-        this.N = N;
-        this.q = q;
-        this.d1 = d1;
-        this.d2 = d2;
-        this.d3 = d3;
-        this.B = B;
-        this.beta = beta;
-        this.normBound = normBound;
-        this.hashAlg = hashAlg;
-        init();
-    }
-
-    private void init()
-    {
-        betaSq = beta * beta;
-        normBoundSq = normBound * normBound;
-    }
-
-    /**
-     * Reads a parameter set from an input stream.
-     *
-     * @param is an input stream
-     * @throws IOException
-     */
-    public NTRUSigningParameters(InputStream is)
-        throws IOException
-    {
-        DataInputStream dis = new DataInputStream(is);
-        N = dis.readInt();
-        q = dis.readInt();
-        d = dis.readInt();
-        d1 = dis.readInt();
-        d2 = dis.readInt();
-        d3 = dis.readInt();
-        B = dis.readInt();
-        beta = dis.readDouble();
-        normBound = dis.readDouble();
-        signFailTolerance = dis.readInt();
-        bitsF = dis.readInt();
-        String alg = dis.readUTF();
-        if ("SHA-512".equals(alg))
-        {
-            hashAlg = new SHA512Digest();
-        }
-        else if ("SHA-256".equals(alg))
-        {
-            hashAlg = new SHA256Digest();
-        }
-        init();
-    }
-
-    /**
-     * Writes the parameter set to an output stream
-     *
-     * @param os an output stream
-     * @throws IOException
-     */
-    public void writeTo(OutputStream os)
-        throws IOException
-    {
-        DataOutputStream dos = new DataOutputStream(os);
-        dos.writeInt(N);
-        dos.writeInt(q);
-        dos.writeInt(d);
-        dos.writeInt(d1);
-        dos.writeInt(d2);
-        dos.writeInt(d3);
-        dos.writeInt(B);
-        dos.writeDouble(beta);
-        dos.writeDouble(normBound);
-        dos.writeInt(signFailTolerance);
-        dos.writeInt(bitsF);
-        dos.writeUTF(hashAlg.getAlgorithmName());
-    }
-
-    public NTRUSigningParameters clone()
-    {
-        return new NTRUSigningParameters(N, q, d, B, beta, normBound, hashAlg);
-    }
-
-    public int hashCode()
-    {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + B;
-        result = prime * result + N;
-        long temp;
-        temp = Double.doubleToLongBits(beta);
-        result = prime * result + (int)(temp ^ (temp >>> 32));
-        temp = Double.doubleToLongBits(betaSq);
-        result = prime * result + (int)(temp ^ (temp >>> 32));
-        result = prime * result + bitsF;
-        result = prime * result + d;
-        result = prime * result + d1;
-        result = prime * result + d2;
-        result = prime * result + d3;
-        result = prime * result + ((hashAlg == null) ? 0 : hashAlg.getAlgorithmName().hashCode());
-        temp = Double.doubleToLongBits(normBound);
-        result = prime * result + (int)(temp ^ (temp >>> 32));
-        temp = Double.doubleToLongBits(normBoundSq);
-        result = prime * result + (int)(temp ^ (temp >>> 32));
-        result = prime * result + q;
-        result = prime * result + signFailTolerance;
-        return result;
-    }
-
-    public boolean equals(Object obj)
-    {
-        if (this == obj)
-        {
-            return true;
-        }
-        if (obj == null)
-        {
-            return false;
-        }
-        if (!(obj instanceof NTRUSigningParameters))
-        {
-            return false;
-        }
-        NTRUSigningParameters other = (NTRUSigningParameters)obj;
-        if (B != other.B)
-        {
-            return false;
-        }
-        if (N != other.N)
-        {
-            return false;
-        }
-        if (Double.doubleToLongBits(beta) != Double.doubleToLongBits(other.beta))
-        {
-            return false;
-        }
-        if (Double.doubleToLongBits(betaSq) != Double.doubleToLongBits(other.betaSq))
-        {
-            return false;
-        }
-        if (bitsF != other.bitsF)
-        {
-            return false;
-        }
-        if (d != other.d)
-        {
-            return false;
-        }
-        if (d1 != other.d1)
-        {
-            return false;
-        }
-        if (d2 != other.d2)
-        {
-            return false;
-        }
-        if (d3 != other.d3)
-        {
-            return false;
-        }
-        if (hashAlg == null)
-        {
-            if (other.hashAlg != null)
-            {
-                return false;
-            }
-        }
-        else if (!hashAlg.getAlgorithmName().equals(other.hashAlg.getAlgorithmName()))
-        {
-            return false;
-        }
-        if (Double.doubleToLongBits(normBound) != Double.doubleToLongBits(other.normBound))
-        {
-            return false;
-        }
-        if (Double.doubleToLongBits(normBoundSq) != Double.doubleToLongBits(other.normBoundSq))
-        {
-            return false;
-        }
-        if (q != other.q)
-        {
-            return false;
-        }
-        if (signFailTolerance != other.signFailTolerance)
-        {
-            return false;
-        }
-
-        return true;
-    }
-
-    public String toString()
-    {
-        DecimalFormat format = new DecimalFormat("0.00");
-
-        StringBuilder output = new StringBuilder("SignatureParameters(N=" + N + " q=" + q);
-
-        output.append(" B=" + B + " beta=" + format.format(beta) +
-            " normBound=" + format.format(normBound) +
-            " hashAlg=" + hashAlg + ")");
-        return output.toString();
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/ntru/NTRUSigningPrivateKeyParameters.java b/bcprov/src/main/java/org/bouncycastle/pqc/crypto/ntru/NTRUSigningPrivateKeyParameters.java
deleted file mode 100644
index 451422e..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/ntru/NTRUSigningPrivateKeyParameters.java
+++ /dev/null
@@ -1,388 +0,0 @@
-package org.bouncycastle.pqc.crypto.ntru;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.bouncycastle.crypto.params.AsymmetricKeyParameter;
-import org.bouncycastle.pqc.math.ntru.polynomial.DenseTernaryPolynomial;
-import org.bouncycastle.pqc.math.ntru.polynomial.IntegerPolynomial;
-import org.bouncycastle.pqc.math.ntru.polynomial.Polynomial;
-import org.bouncycastle.pqc.math.ntru.polynomial.ProductFormPolynomial;
-import org.bouncycastle.pqc.math.ntru.polynomial.SparseTernaryPolynomial;
-
-/**
- * A NtruSign private key comprises one or more {@link NTRUSigningPrivateKeyParameters.Basis} of three polynomials each,
- * except the zeroth basis for which <code>h</code> is undefined.
- */
-public class NTRUSigningPrivateKeyParameters
-    extends AsymmetricKeyParameter
-{
-    private List<Basis> bases;
-    private NTRUSigningPublicKeyParameters publicKey;
-
-    /**
-     * Constructs a new private key from a byte array
-     *
-     * @param b      an encoded private key
-     * @param params the NtruSign parameters to use
-     */
-    public NTRUSigningPrivateKeyParameters(byte[] b, NTRUSigningKeyGenerationParameters params)
-        throws IOException
-    {
-        this(new ByteArrayInputStream(b), params);
-    }
-
-    /**
-     * Constructs a new private key from an input stream
-     *
-     * @param is     an input stream
-     * @param params the NtruSign parameters to use
-     */
-    public NTRUSigningPrivateKeyParameters(InputStream is, NTRUSigningKeyGenerationParameters params)
-        throws IOException
-    {
-        super(true);
-        bases = new ArrayList<Basis>();
-        for (int i = 0; i <= params.B; i++)
-        // include a public key h[i] in all bases except for the first one
-        {
-            add(new Basis(is, params, i != 0));
-        }
-        publicKey = new NTRUSigningPublicKeyParameters(is, params.getSigningParameters());
-    }
-
-    public NTRUSigningPrivateKeyParameters(List<Basis> bases, NTRUSigningPublicKeyParameters publicKey)
-    {
-        super(true);
-        this.bases = new ArrayList<Basis>(bases);
-        this.publicKey = publicKey;
-    }
-
-    /**
-     * Adds a basis to the key.
-     *
-     * @param b a NtruSign basis
-     */
-    private void add(Basis b)
-    {
-        bases.add(b);
-    }
-
-    /**
-     * Returns the <code>i</code>-th basis
-     *
-     * @param i the index
-     * @return the basis at index <code>i</code>
-     */
-    public Basis getBasis(int i)
-    {
-        return bases.get(i);
-    }
-
-    public NTRUSigningPublicKeyParameters getPublicKey()
-    {
-        return publicKey;
-    }
-
-    /**
-     * Converts the key to a byte array
-     *
-     * @return the encoded key
-     */
-    public byte[] getEncoded()
-        throws IOException
-    {
-        ByteArrayOutputStream os = new ByteArrayOutputStream();
-        for (int i = 0; i < bases.size(); i++)
-        {
-            // all bases except for the first one contain a public key
-            bases.get(i).encode(os, i != 0);
-        }
-
-        os.write(publicKey.getEncoded());
-
-        return os.toByteArray();
-    }
-
-    /**
-     * Writes the key to an output stream
-     *
-     * @param os an output stream
-     * @throws IOException
-     */
-    public void writeTo(OutputStream os)
-        throws IOException
-    {
-        os.write(getEncoded());
-    }
-
-    @Override
-    public int hashCode()
-    {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result;
-        if (bases==null) return result;
-        result += bases.hashCode();
-        for (Basis basis : bases)
-        {
-            result += basis.hashCode();
-        }
-        return result;
-    }
-
-    @Override
-    public boolean equals(Object obj)
-    {
-        if (this == obj)
-        {
-            return true;
-        }
-        if (obj == null)
-        {
-            return false;
-        }
-        if (getClass() != obj.getClass())
-        {
-            return false;
-        }
-        NTRUSigningPrivateKeyParameters other = (NTRUSigningPrivateKeyParameters)obj;
-        if ((bases == null) != (other.bases == null))
-        {
-            return false;
-        }
-        if (bases == null)
-        {
-            return true;
-        }
-        if (bases.size() != other.bases.size())
-        {
-            return false;
-        }
-        for (int i = 0; i < bases.size(); i++)
-        {
-            Basis basis1 = bases.get(i);
-            Basis basis2 = other.bases.get(i);
-            if (!basis1.f.equals(basis2.f))
-            {
-                return false;
-            }
-            if (!basis1.fPrime.equals(basis2.fPrime))
-            {
-                return false;
-            }
-            if (i != 0 && !basis1.h.equals(basis2.h))   // don't compare h for the 0th basis
-            {
-                return false;
-            }
-            if (!basis1.params.equals(basis2.params))
-            {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    /**
-     * A NtruSign basis. Contains three polynomials <code>f, f', h</code>.
-     */
-    public static class Basis
-    {
-        public Polynomial f;
-        public Polynomial fPrime;
-        public IntegerPolynomial h;
-        NTRUSigningKeyGenerationParameters params;
-
-        /**
-         * Constructs a new basis from polynomials <code>f, f', h</code>.
-         *
-         * @param f
-         * @param fPrime
-         * @param h
-         * @param params NtruSign parameters
-         */
-        protected Basis(Polynomial f, Polynomial fPrime, IntegerPolynomial h, NTRUSigningKeyGenerationParameters params)
-        {
-            this.f = f;
-            this.fPrime = fPrime;
-            this.h = h;
-            this.params = params;
-        }
-
-        /**
-         * Reads a basis from an input stream and constructs a new basis.
-         *
-         * @param is        an input stream
-         * @param params    NtruSign parameters
-         * @param include_h whether to read the polynomial <code>h</code> (<code>true</code>) or only <code>f</code> and <code>f'</code> (<code>false</code>)
-         */
-        Basis(InputStream is, NTRUSigningKeyGenerationParameters params, boolean include_h)
-            throws IOException
-        {
-            int N = params.N;
-            int q = params.q;
-            int d1 = params.d1;
-            int d2 = params.d2;
-            int d3 = params.d3;
-            boolean sparse = params.sparse;
-            this.params = params;
-
-            if (params.polyType == NTRUParameters.TERNARY_POLYNOMIAL_TYPE_PRODUCT)
-            {
-                f = ProductFormPolynomial.fromBinary(is, N, d1, d2, d3 + 1, d3);
-            }
-            else
-            {
-                IntegerPolynomial fInt = IntegerPolynomial.fromBinary3Tight(is, N);
-                f = sparse ? new SparseTernaryPolynomial(fInt) : new DenseTernaryPolynomial(fInt);
-            }
-
-            if (params.basisType == NTRUSigningKeyGenerationParameters.BASIS_TYPE_STANDARD)
-            {
-                IntegerPolynomial fPrimeInt = IntegerPolynomial.fromBinary(is, N, q);
-                for (int i = 0; i < fPrimeInt.coeffs.length; i++)
-                {
-                    fPrimeInt.coeffs[i] -= q / 2;
-                }
-                fPrime = fPrimeInt;
-            }
-            else if (params.polyType == NTRUParameters.TERNARY_POLYNOMIAL_TYPE_PRODUCT)
-            {
-                fPrime = ProductFormPolynomial.fromBinary(is, N, d1, d2, d3 + 1, d3);
-            }
-            else
-            {
-                fPrime = IntegerPolynomial.fromBinary3Tight(is, N);
-            }
-
-            if (include_h)
-            {
-                h = IntegerPolynomial.fromBinary(is, N, q);
-            }
-        }
-
-        /**
-         * Writes the basis to an output stream
-         *
-         * @param os        an output stream
-         * @param include_h whether to write the polynomial <code>h</code> (<code>true</code>) or only <code>f</code> and <code>f'</code> (<code>false</code>)
-         * @throws IOException
-         */
-        void encode(OutputStream os, boolean include_h)
-            throws IOException
-        {
-            int q = params.q;
-
-            os.write(getEncoded(f));
-            if (params.basisType == NTRUSigningKeyGenerationParameters.BASIS_TYPE_STANDARD)
-            {
-                IntegerPolynomial fPrimeInt = fPrime.toIntegerPolynomial();
-                for (int i = 0; i < fPrimeInt.coeffs.length; i++)
-                {
-                    fPrimeInt.coeffs[i] += q / 2;
-                }
-                os.write(fPrimeInt.toBinary(q));
-            }
-            else
-            {
-                os.write(getEncoded(fPrime));
-            }
-            if (include_h)
-            {
-                os.write(h.toBinary(q));
-            }
-        }
-
-        private byte[] getEncoded(Polynomial p)
-        {
-            if (p instanceof ProductFormPolynomial)
-            {
-                return ((ProductFormPolynomial)p).toBinary();
-            }
-            else
-            {
-                return p.toIntegerPolynomial().toBinary3Tight();
-            }
-        }
-
-        @Override
-        public int hashCode()
-        {
-            final int prime = 31;
-            int result = 1;
-            result = prime * result + ((f == null) ? 0 : f.hashCode());
-            result = prime * result + ((fPrime == null) ? 0 : fPrime.hashCode());
-            result = prime * result + ((h == null) ? 0 : h.hashCode());
-            result = prime * result + ((params == null) ? 0 : params.hashCode());
-            return result;
-        }
-
-        @Override
-        public boolean equals(Object obj)
-        {
-            if (this == obj)
-            {
-                return true;
-            }
-            if (obj == null)
-            {
-                return false;
-            }
-            if (!(obj instanceof Basis))
-            {
-                return false;
-            }
-            Basis other = (Basis)obj;
-            if (f == null)
-            {
-                if (other.f != null)
-                {
-                    return false;
-                }
-            }
-            else if (!f.equals(other.f))
-            {
-                return false;
-            }
-            if (fPrime == null)
-            {
-                if (other.fPrime != null)
-                {
-                    return false;
-                }
-            }
-            else if (!fPrime.equals(other.fPrime))
-            {
-                return false;
-            }
-            if (h == null)
-            {
-                if (other.h != null)
-                {
-                    return false;
-                }
-            }
-            else if (!h.equals(other.h))
-            {
-                return false;
-            }
-            if (params == null)
-            {
-                if (other.params != null)
-                {
-                    return false;
-                }
-            }
-            else if (!params.equals(other.params))
-            {
-                return false;
-            }
-            return true;
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/ntru/NTRUSigningPublicKeyParameters.java b/bcprov/src/main/java/org/bouncycastle/pqc/crypto/ntru/NTRUSigningPublicKeyParameters.java
deleted file mode 100644
index be51d0a..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/ntru/NTRUSigningPublicKeyParameters.java
+++ /dev/null
@@ -1,132 +0,0 @@
-package org.bouncycastle.pqc.crypto.ntru;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-import org.bouncycastle.crypto.params.AsymmetricKeyParameter;
-import org.bouncycastle.pqc.math.ntru.polynomial.IntegerPolynomial;
-
-/**
- * A NtruSign public key is essentially a polynomial named <code>h</code>.
- */
-public class NTRUSigningPublicKeyParameters
-    extends AsymmetricKeyParameter
-{
-    private NTRUSigningParameters params;
-    public IntegerPolynomial h;
-
-    /**
-     * Constructs a new public key from a polynomial
-     *
-     * @param h      the polynomial <code>h</code> which determines the key
-     * @param params the NtruSign parameters to use
-     */
-    public NTRUSigningPublicKeyParameters(IntegerPolynomial h, NTRUSigningParameters params)
-    {
-        super(false);
-        this.h = h;
-        this.params = params;
-    }
-
-    /**
-     * Converts a byte array to a polynomial <code>h</code> and constructs a new public key
-     *
-     * @param b      an encoded polynomial
-     * @param params the NtruSign parameters to use
-     */
-    public NTRUSigningPublicKeyParameters(byte[] b, NTRUSigningParameters params)
-    {
-        super(false);
-        h = IntegerPolynomial.fromBinary(b, params.N, params.q);
-        this.params = params;
-    }
-
-    /**
-     * Reads a polynomial <code>h</code> from an input stream and constructs a new public key
-     *
-     * @param is     an input stream
-     * @param params the NtruSign parameters to use
-     */
-    public NTRUSigningPublicKeyParameters(InputStream is, NTRUSigningParameters params)
-        throws IOException
-    {
-        super(false);
-        h = IntegerPolynomial.fromBinary(is, params.N, params.q);
-        this.params = params;
-    }
-
-
-    /**
-     * Converts the key to a byte array
-     *
-     * @return the encoded key
-     */
-    public byte[] getEncoded()
-    {
-        return h.toBinary(params.q);
-    }
-
-    /**
-     * Writes the key to an output stream
-     *
-     * @param os an output stream
-     * @throws IOException
-     */
-    public void writeTo(OutputStream os)
-        throws IOException
-    {
-        os.write(getEncoded());
-    }
-
-    @Override
-    public int hashCode()
-    {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + ((h == null) ? 0 : h.hashCode());
-        result = prime * result + ((params == null) ? 0 : params.hashCode());
-        return result;
-    }
-
-    @Override
-    public boolean equals(Object obj)
-    {
-        if (this == obj)
-        {
-            return true;
-        }
-        if (obj == null)
-        {
-            return false;
-        }
-        if (getClass() != obj.getClass())
-        {
-            return false;
-        }
-        NTRUSigningPublicKeyParameters other = (NTRUSigningPublicKeyParameters)obj;
-        if (h == null)
-        {
-            if (other.h != null)
-            {
-                return false;
-            }
-        }
-        else if (!h.equals(other.h))
-        {
-            return false;
-        }
-        if (params == null)
-        {
-            if (other.params != null)
-            {
-                return false;
-            }
-        }
-        else if (!params.equals(other.params))
-        {
-            return false;
-        }
-        return true;
-    }
-}
\ No newline at end of file
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/rainbow/Layer.java b/bcprov/src/main/java/org/bouncycastle/pqc/crypto/rainbow/Layer.java
deleted file mode 100644
index ae76922..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/rainbow/Layer.java
+++ /dev/null
@@ -1,322 +0,0 @@
-package org.bouncycastle.pqc.crypto.rainbow;
-
-import java.security.SecureRandom;
-
-import org.bouncycastle.pqc.crypto.rainbow.util.GF2Field;
-import org.bouncycastle.pqc.crypto.rainbow.util.RainbowUtil;
-import org.bouncycastle.util.Arrays;
-
-
-/**
- * This class represents a layer of the Rainbow Oil- and Vinegar Map. Each Layer
- * consists of oi polynomials with their coefficients, generated at random.
- * <p>
- * To sign a document, we solve a LES (linear equation system) for each layer in
- * order to find the oil variables of that layer and to be able to use the
- * variables to compute the signature. This functionality is implemented in the
- * RainbowSignature-class, by the aid of the private key.
- * <p>
- * Each layer is a part of the private key.
- * <p>
- * More information about the layer can be found in the paper of Jintai Ding,
- * Dieter Schmidt: Rainbow, a New Multivariable Polynomial Signature Scheme.
- * ACNS 2005: 164-175 (http://dx.doi.org/10.1007/11496137_12)
- */
-public class Layer
-{
-    private int vi; // number of vinegars in this layer
-    private int viNext; // number of vinegars in next layer
-    private int oi; // number of oils in this layer
-
-    /*
-      * k : index of polynomial
-      *
-      * i,j : indices of oil and vinegar variables
-      */
-    private short[/* k */][/* i */][/* j */] coeff_alpha;
-    private short[/* k */][/* i */][/* j */] coeff_beta;
-    private short[/* k */][/* i */] coeff_gamma;
-    private short[/* k */] coeff_eta;
-
-    /**
-     * Constructor
-     *
-     * @param vi         number of vinegar variables of this layer
-     * @param viNext     number of vinegar variables of next layer. It's the same as
-     *                   (num of oils) + (num of vinegars) of this layer.
-     * @param coeffAlpha alpha-coefficients in the polynomials of this layer
-     * @param coeffBeta  beta-coefficients in the polynomials of this layer
-     * @param coeffGamma gamma-coefficients in the polynomials of this layer
-     * @param coeffEta   eta-coefficients in the polynomials of this layer
-     */
-    public Layer(byte vi, byte viNext, short[][][] coeffAlpha,
-                 short[][][] coeffBeta, short[][] coeffGamma, short[] coeffEta)
-    {
-        this.vi = vi & 0xff;
-        this.viNext = viNext & 0xff;
-        this.oi = this.viNext - this.vi;
-
-        // the secret coefficients of all polynomials in this layer
-        this.coeff_alpha = coeffAlpha;
-        this.coeff_beta = coeffBeta;
-        this.coeff_gamma = coeffGamma;
-        this.coeff_eta = coeffEta;
-    }
-
-    /**
-     * This function generates the coefficients of all polynomials in this layer
-     * at random using random generator.
-     *
-     * @param sr the random generator which is to be used
-     */
-    public Layer(int vi, int viNext, SecureRandom sr)
-    {
-        this.vi = vi;
-        this.viNext = viNext;
-        this.oi = viNext - vi;
-
-        // the coefficients of all polynomials in this layer
-        this.coeff_alpha = new short[this.oi][this.oi][this.vi];
-        this.coeff_beta = new short[this.oi][this.vi][this.vi];
-        this.coeff_gamma = new short[this.oi][this.viNext];
-        this.coeff_eta = new short[this.oi];
-
-        int numOfPoly = this.oi; // number of polynomials per layer
-
-        // Alpha coeffs
-        for (int k = 0; k < numOfPoly; k++)
-        {
-            for (int i = 0; i < this.oi; i++)
-            {
-                for (int j = 0; j < this.vi; j++)
-                {
-                    coeff_alpha[k][i][j] = (short)(sr.nextInt() & GF2Field.MASK);
-                }
-            }
-        }
-        // Beta coeffs
-        for (int k = 0; k < numOfPoly; k++)
-        {
-            for (int i = 0; i < this.vi; i++)
-            {
-                for (int j = 0; j < this.vi; j++)
-                {
-                    coeff_beta[k][i][j] = (short)(sr.nextInt() & GF2Field.MASK);
-                }
-            }
-        }
-        // Gamma coeffs
-        for (int k = 0; k < numOfPoly; k++)
-        {
-            for (int i = 0; i < this.viNext; i++)
-            {
-                coeff_gamma[k][i] = (short)(sr.nextInt() & GF2Field.MASK);
-            }
-        }
-        // Eta
-        for (int k = 0; k < numOfPoly; k++)
-        {
-            coeff_eta[k] = (short)(sr.nextInt() & GF2Field.MASK);
-        }
-    }
-
-    /**
-     * This method plugs in the vinegar variables into the polynomials of this
-     * layer and computes the coefficients of the Oil-variables as well as the
-     * free coefficient in each polynomial.
-     * <p>
-     * It is needed for computing the Oil variables while signing.
-     *
-     * @param x vinegar variables of this layer that should be plugged into
-     *          the polynomials.
-     * @return coeff the coefficients of Oil variables and the free coeff in the
-     *         polynomials of this layer.
-     */
-    public short[][] plugInVinegars(short[] x)
-    {
-        // temporary variable needed for the multiplication
-        short tmpMult = 0;
-        // coeff: 1st index = which polynomial, 2nd index=which variable
-        short[][] coeff = new short[oi][oi + 1]; // gets returned
-        // free coefficient per polynomial
-        short[] sum = new short[oi];
-
-        /*
-           * evaluate the beta-part of the polynomials (it contains no oil
-           * variables)
-           */
-        for (int k = 0; k < oi; k++)
-        {
-            for (int i = 0; i < vi; i++)
-            {
-                for (int j = 0; j < vi; j++)
-                {
-                    // tmp = beta * xi (plug in)
-                    tmpMult = GF2Field.multElem(coeff_beta[k][i][j], x[i]);
-                    // tmp = tmp * xj
-                    tmpMult = GF2Field.multElem(tmpMult, x[j]);
-                    // accumulate into the array for the free coefficients.
-                    sum[k] = GF2Field.addElem(sum[k], tmpMult);
-                }
-            }
-        }
-
-        /* evaluate the alpha-part (it contains oils) */
-        for (int k = 0; k < oi; k++)
-        {
-            for (int i = 0; i < oi; i++)
-            {
-                for (int j = 0; j < vi; j++)
-                {
-                    // alpha * xj (plug in)
-                    tmpMult = GF2Field.multElem(coeff_alpha[k][i][j], x[j]);
-                    // accumulate
-                    coeff[k][i] = GF2Field.addElem(coeff[k][i], tmpMult);
-                }
-            }
-        }
-        /* evaluate the gama-part of the polynomial (containing no oils) */
-        for (int k = 0; k < oi; k++)
-        {
-            for (int i = 0; i < vi; i++)
-            {
-                // gamma * xi (plug in)
-                tmpMult = GF2Field.multElem(coeff_gamma[k][i], x[i]);
-                // accumulate in the array for the free coefficients (per
-                // polynomial).
-                sum[k] = GF2Field.addElem(sum[k], tmpMult);
-            }
-        }
-        /* evaluate the gama-part of the polynomial (but containing oils) */
-        for (int k = 0; k < oi; k++)
-        {
-            for (int i = vi; i < viNext; i++)
-            { // oils
-                // accumulate the coefficients of the oil variables (per
-                // polynomial).
-                coeff[k][i - vi] = GF2Field.addElem(coeff_gamma[k][i],
-                    coeff[k][i - vi]);
-            }
-        }
-        /* evaluate the eta-part of the polynomial */
-        for (int k = 0; k < oi; k++)
-        {
-            // accumulate in the array for the free coefficients per polynomial.
-            sum[k] = GF2Field.addElem(sum[k], coeff_eta[k]);
-        }
-
-        /* put the free coefficients (sum) into the coeff-array as last column */
-        for (int k = 0; k < oi; k++)
-        {
-            coeff[k][oi] = sum[k];
-        }
-        return coeff;
-    }
-
-    /**
-     * Getter for the number of vinegar variables of this layer.
-     *
-     * @return the number of vinegar variables of this layer.
-     */
-    public int getVi()
-    {
-        return vi;
-    }
-
-    /**
-     * Getter for the number of vinegar variables of the next layer.
-     *
-     * @return the number of vinegar variables of the next layer.
-     */
-    public int getViNext()
-    {
-        return viNext;
-    }
-
-    /**
-     * Getter for the number of Oil variables of this layer.
-     *
-     * @return the number of oil variables of this layer.
-     */
-    public int getOi()
-    {
-        return oi;
-    }
-
-    /**
-     * Getter for the alpha-coefficients of the polynomials in this layer.
-     *
-     * @return the coefficients of alpha-terms of this layer.
-     */
-    public short[][][] getCoeffAlpha()
-    {
-        return coeff_alpha;
-    }
-
-    /**
-     * Getter for the beta-coefficients of the polynomials in this layer.
-     *
-     * @return the coefficients of beta-terms of this layer.
-     */
-
-    public short[][][] getCoeffBeta()
-    {
-        return coeff_beta;
-    }
-
-    /**
-     * Getter for the gamma-coefficients of the polynomials in this layer.
-     *
-     * @return the coefficients of gamma-terms of this layer
-     */
-    public short[][] getCoeffGamma()
-    {
-        return coeff_gamma;
-    }
-
-    /**
-     * Getter for the eta-coefficients of the polynomials in this layer.
-     *
-     * @return the coefficients eta of this layer
-     */
-    public short[] getCoeffEta()
-    {
-        return coeff_eta;
-    }
-
-    /**
-     * This function compares this Layer with another object.
-     *
-     * @param other the other object
-     * @return the result of the comparison
-     */
-    public boolean equals(Object other)
-    {
-        if (other == null || !(other instanceof Layer))
-        {
-            return false;
-        }
-        Layer otherLayer = (Layer)other;
-
-        return  vi == otherLayer.getVi()
-                && viNext == otherLayer.getViNext()
-                && oi == otherLayer.getOi()
-                && RainbowUtil.equals(coeff_alpha, otherLayer.getCoeffAlpha())
-                && RainbowUtil.equals(coeff_beta, otherLayer.getCoeffBeta())
-                && RainbowUtil.equals(coeff_gamma, otherLayer.getCoeffGamma())
-                && RainbowUtil.equals(coeff_eta, otherLayer.getCoeffEta());
-    }
-
-    public int hashCode()
-    {
-        int hash = vi;
-        hash = hash * 37 + viNext;
-        hash = hash * 37 + oi;
-        hash = hash * 37 + Arrays.hashCode(coeff_alpha);
-        hash = hash * 37 + Arrays.hashCode(coeff_beta);
-        hash = hash * 37 + Arrays.hashCode(coeff_gamma);
-        hash = hash * 37 + Arrays.hashCode(coeff_eta);
-
-        return hash;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/rainbow/RainbowKeyGenerationParameters.java b/bcprov/src/main/java/org/bouncycastle/pqc/crypto/rainbow/RainbowKeyGenerationParameters.java
deleted file mode 100644
index b634f9c..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/rainbow/RainbowKeyGenerationParameters.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package org.bouncycastle.pqc.crypto.rainbow;
-
-import java.security.SecureRandom;
-
-import org.bouncycastle.crypto.KeyGenerationParameters;
-
-public class RainbowKeyGenerationParameters
-    extends KeyGenerationParameters
-{
-    private RainbowParameters params;
-
-    public RainbowKeyGenerationParameters(
-        SecureRandom random,
-        RainbowParameters params)
-    {
-        // TODO: key size?
-        super(random, params.getVi()[params.getVi().length - 1] - params.getVi()[0]);
-        this.params = params;
-    }
-
-    public RainbowParameters getParameters()
-    {
-        return params;
-    }
-}
-
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/rainbow/RainbowKeyPairGenerator.java b/bcprov/src/main/java/org/bouncycastle/pqc/crypto/rainbow/RainbowKeyPairGenerator.java
deleted file mode 100644
index 6b041cf..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/rainbow/RainbowKeyPairGenerator.java
+++ /dev/null
@@ -1,417 +0,0 @@
-package org.bouncycastle.pqc.crypto.rainbow;
-
-import java.security.SecureRandom;
-
-import org.bouncycastle.crypto.AsymmetricCipherKeyPair;
-import org.bouncycastle.crypto.AsymmetricCipherKeyPairGenerator;
-import org.bouncycastle.crypto.KeyGenerationParameters;
-import org.bouncycastle.pqc.crypto.rainbow.util.ComputeInField;
-import org.bouncycastle.pqc.crypto.rainbow.util.GF2Field;
-
-/**
- * This class implements AsymmetricCipherKeyPairGenerator. It is used
- * as a generator for the private and public key of the Rainbow Signature
- * Scheme.
- * <p>
- * Detailed information about the key generation is to be found in the paper of
- * Jintai Ding, Dieter Schmidt: Rainbow, a New Multivariable Polynomial
- * Signature Scheme. ACNS 2005: 164-175 (http://dx.doi.org/10.1007/11496137_12)
- */
-public class RainbowKeyPairGenerator
-    implements AsymmetricCipherKeyPairGenerator
-{
-    private boolean initialized = false;
-    private SecureRandom sr;
-    private RainbowKeyGenerationParameters rainbowParams;
-
-    /* linear affine map L1: */
-    private short[][] A1; // matrix of the lin. affine map L1(n-v1 x n-v1 matrix)
-    private short[][] A1inv; // inverted A1
-    private short[] b1; // translation element of the lin.affine map L1
-
-    /* linear affine map L2: */
-    private short[][] A2; // matrix of the lin. affine map (n x n matrix)
-    private short[][] A2inv; // inverted A2
-    private short[] b2; // translation elemt of the lin.affine map L2
-
-    /* components of F: */
-    private int numOfLayers; // u (number of sets S)
-    private Layer layers[]; // layers of polynomials of F
-    private int[] vi; // set of vinegar vars per layer.
-
-    /* components of Public Key */
-    private short[][] pub_quadratic; // quadratic(mixed) coefficients
-    private short[][] pub_singular; // singular coefficients
-    private short[] pub_scalar; // scalars
-
-    // TODO
-
-    /**
-     * The standard constructor tries to generate the Rainbow algorithm identifier
-     * with the corresponding OID.
-     */
-    public RainbowKeyPairGenerator()
-    {
-    }
-
-
-    /**
-     * This function generates a Rainbow key pair.
-     *
-     * @return the generated key pair
-     */
-    public AsymmetricCipherKeyPair genKeyPair()
-    {
-        RainbowPrivateKeyParameters privKey;
-        RainbowPublicKeyParameters pubKey;
-
-        if (!initialized)
-        {
-            initializeDefault();
-        }
-
-        /* choose all coefficients at random */
-        keygen();
-
-        /* now marshall them to PrivateKey */
-        privKey = new RainbowPrivateKeyParameters(A1inv, b1, A2inv, b2, vi, layers);
-
-
-        /* marshall to PublicKey */
-        pubKey = new RainbowPublicKeyParameters(vi[vi.length - 1] - vi[0], pub_quadratic, pub_singular, pub_scalar);
-
-        return new AsymmetricCipherKeyPair(pubKey, privKey);
-    }
-
-    // TODO
-    public void initialize(
-        KeyGenerationParameters param)
-    {
-        this.rainbowParams = (RainbowKeyGenerationParameters)param;
-
-        // set source of randomness
-        this.sr = new SecureRandom();
-
-        // unmarshalling:
-        this.vi = this.rainbowParams.getParameters().getVi();
-        this.numOfLayers = this.rainbowParams.getParameters().getNumOfLayers();
-
-        this.initialized = true;
-    }
-
-    private void initializeDefault()
-    {
-        RainbowKeyGenerationParameters rbKGParams = new RainbowKeyGenerationParameters(new SecureRandom(), new RainbowParameters());
-        initialize(rbKGParams);
-    }
-
-    /**
-     * This function calls the functions for the random generation of the coefficients
-     * and the matrices needed for the private key and the method for computing the public key.
-     */
-    private void keygen()
-    {
-        generateL1();
-        generateL2();
-        generateF();
-        computePublicKey();
-    }
-
-    /**
-     * This function generates the invertible affine linear map L1 = A1*x + b1
-     * <p>
-     * The translation part b1, is stored in a separate array. The inverse of
-     * the matrix-part of L1 A1inv is also computed here.
-     * </p><p>
-     * This linear map hides the output of the map F. It is on k^(n-v1).
-     * </p>
-     */
-    private void generateL1()
-    {
-
-        // dimension = n-v1 = vi[last] - vi[first]
-        int dim = vi[vi.length - 1] - vi[0];
-        this.A1 = new short[dim][dim];
-        this.A1inv = null;
-        ComputeInField c = new ComputeInField();
-
-        /* generation of A1 at random */
-        while (A1inv == null)
-        {
-            for (int i = 0; i < dim; i++)
-            {
-                for (int j = 0; j < dim; j++)
-                {
-                    A1[i][j] = (short)(sr.nextInt() & GF2Field.MASK);
-                }
-            }
-            A1inv = c.inverse(A1);
-        }
-
-        /* generation of the translation vector at random */
-        b1 = new short[dim];
-        for (int i = 0; i < dim; i++)
-        {
-            b1[i] = (short)(sr.nextInt() & GF2Field.MASK);
-        }
-    }
-
-    /**
-     * This function generates the invertible affine linear map L2 = A2*x + b2
-     * <p>
-     * The translation part b2, is stored in a separate array. The inverse of
-     * the matrix-part of L2 A2inv is also computed here.
-     * </p><p>
-     * This linear map hides the output of the map F. It is on k^(n).
-     * </p>
-     */
-    private void generateL2()
-    {
-
-        // dimension = n = vi[last]
-        int dim = vi[vi.length - 1];
-        this.A2 = new short[dim][dim];
-        this.A2inv = null;
-        ComputeInField c = new ComputeInField();
-
-        /* generation of A2 at random */
-        while (this.A2inv == null)
-        {
-            for (int i = 0; i < dim; i++)
-            {
-                for (int j = 0; j < dim; j++)
-                { // one col extra for b
-                    A2[i][j] = (short)(sr.nextInt() & GF2Field.MASK);
-                }
-            }
-            this.A2inv = c.inverse(A2);
-        }
-        /* generation of the translation vector at random */
-        b2 = new short[dim];
-        for (int i = 0; i < dim; i++)
-        {
-            b2[i] = (short)(sr.nextInt() & GF2Field.MASK);
-        }
-
-    }
-
-    /**
-     * This function generates the private map F, which consists of u-1 layers.
-     * Each layer consists of oi polynomials where oi = vi[i+1]-vi[i].
-     * <p>
-     * The methods for the generation of the coefficients of these polynomials
-     * are called here.
-     * </p>
-     */
-    private void generateF()
-    {
-
-        this.layers = new Layer[this.numOfLayers];
-        for (int i = 0; i < this.numOfLayers; i++)
-        {
-            layers[i] = new Layer(this.vi[i], this.vi[i + 1], sr);
-        }
-    }
-
-    /**
-     * This function computes the public key from the private key.
-     * <p>
-     * The composition of F with L2 is computed, followed by applying L1 to the
-     * composition's result. The singular and scalar values constitute to the
-     * public key as is, the quadratic terms are compacted in
-     * <tt>compactPublicKey()</tt>
-     * </p>
-     */
-    private void computePublicKey()
-    {
-
-        ComputeInField c = new ComputeInField();
-        int rows = this.vi[this.vi.length - 1] - this.vi[0];
-        int vars = this.vi[this.vi.length - 1];
-        // Fpub
-        short[][][] coeff_quadratic_3dim = new short[rows][vars][vars];
-        this.pub_singular = new short[rows][vars];
-        this.pub_scalar = new short[rows];
-
-        // Coefficients of layers of Private Key F
-        short[][][] coeff_alpha;
-        short[][][] coeff_beta;
-        short[][] coeff_gamma;
-        short[] coeff_eta;
-
-        // Needed for counters;
-        int oils = 0;
-        int vins = 0;
-        int crnt_row = 0; // current row (polynomial)
-
-        short vect_tmp[] = new short[vars]; // vector tmp;
-        short sclr_tmp = 0;
-
-        // Composition of F and L2: Insert L2 = A2*x+b2 in F
-        for (int l = 0; l < this.layers.length; l++)
-        {
-            // get coefficients of current layer
-            coeff_alpha = this.layers[l].getCoeffAlpha();
-            coeff_beta = this.layers[l].getCoeffBeta();
-            coeff_gamma = this.layers[l].getCoeffGamma();
-            coeff_eta = this.layers[l].getCoeffEta();
-            oils = coeff_alpha[0].length;// this.layers[l].getOi();
-            vins = coeff_beta[0].length;// this.layers[l].getVi();
-            // compute polynomials of layer
-            for (int p = 0; p < oils; p++)
-            {
-                // multiply alphas
-                for (int x1 = 0; x1 < oils; x1++)
-                {
-                    for (int x2 = 0; x2 < vins; x2++)
-                    {
-                        // multiply polynomial1 with polynomial2
-                        vect_tmp = c.multVect(coeff_alpha[p][x1][x2],
-                            this.A2[x1 + vins]);
-                        coeff_quadratic_3dim[crnt_row + p] = c.addSquareMatrix(
-                            coeff_quadratic_3dim[crnt_row + p], c
-                            .multVects(vect_tmp, this.A2[x2]));
-                        // mul poly1 with scalar2
-                        vect_tmp = c.multVect(this.b2[x2], vect_tmp);
-                        this.pub_singular[crnt_row + p] = c.addVect(vect_tmp,
-                            this.pub_singular[crnt_row + p]);
-                        // mul scalar1 with poly2
-                        vect_tmp = c.multVect(coeff_alpha[p][x1][x2],
-                            this.A2[x2]);
-                        vect_tmp = c.multVect(b2[x1 + vins], vect_tmp);
-                        this.pub_singular[crnt_row + p] = c.addVect(vect_tmp,
-                            this.pub_singular[crnt_row + p]);
-                        // mul scalar1 with scalar2
-                        sclr_tmp = GF2Field.multElem(coeff_alpha[p][x1][x2],
-                            this.b2[x1 + vins]);
-                        this.pub_scalar[crnt_row + p] = GF2Field.addElem(
-                            this.pub_scalar[crnt_row + p], GF2Field
-                            .multElem(sclr_tmp, this.b2[x2]));
-                    }
-                }
-                // multiply betas
-                for (int x1 = 0; x1 < vins; x1++)
-                {
-                    for (int x2 = 0; x2 < vins; x2++)
-                    {
-                        // multiply polynomial1 with polynomial2
-                        vect_tmp = c.multVect(coeff_beta[p][x1][x2],
-                            this.A2[x1]);
-                        coeff_quadratic_3dim[crnt_row + p] = c.addSquareMatrix(
-                            coeff_quadratic_3dim[crnt_row + p], c
-                            .multVects(vect_tmp, this.A2[x2]));
-                        // mul poly1 with scalar2
-                        vect_tmp = c.multVect(this.b2[x2], vect_tmp);
-                        this.pub_singular[crnt_row + p] = c.addVect(vect_tmp,
-                            this.pub_singular[crnt_row + p]);
-                        // mul scalar1 with poly2
-                        vect_tmp = c.multVect(coeff_beta[p][x1][x2],
-                            this.A2[x2]);
-                        vect_tmp = c.multVect(this.b2[x1], vect_tmp);
-                        this.pub_singular[crnt_row + p] = c.addVect(vect_tmp,
-                            this.pub_singular[crnt_row + p]);
-                        // mul scalar1 with scalar2
-                        sclr_tmp = GF2Field.multElem(coeff_beta[p][x1][x2],
-                            this.b2[x1]);
-                        this.pub_scalar[crnt_row + p] = GF2Field.addElem(
-                            this.pub_scalar[crnt_row + p], GF2Field
-                            .multElem(sclr_tmp, this.b2[x2]));
-                    }
-                }
-                // multiply gammas
-                for (int n = 0; n < vins + oils; n++)
-                {
-                    // mul poly with scalar
-                    vect_tmp = c.multVect(coeff_gamma[p][n], this.A2[n]);
-                    this.pub_singular[crnt_row + p] = c.addVect(vect_tmp,
-                        this.pub_singular[crnt_row + p]);
-                    // mul scalar with scalar
-                    this.pub_scalar[crnt_row + p] = GF2Field.addElem(
-                        this.pub_scalar[crnt_row + p], GF2Field.multElem(
-                        coeff_gamma[p][n], this.b2[n]));
-                }
-                // add eta
-                this.pub_scalar[crnt_row + p] = GF2Field.addElem(
-                    this.pub_scalar[crnt_row + p], coeff_eta[p]);
-            }
-            crnt_row = crnt_row + oils;
-        }
-
-        // Apply L1 = A1*x+b1 to composition of F and L2
-        {
-            // temporary coefficient arrays
-            short[][][] tmp_c_quad = new short[rows][vars][vars];
-            short[][] tmp_c_sing = new short[rows][vars];
-            short[] tmp_c_scal = new short[rows];
-            for (int r = 0; r < rows; r++)
-            {
-                for (int q = 0; q < A1.length; q++)
-                {
-                    tmp_c_quad[r] = c.addSquareMatrix(tmp_c_quad[r], c
-                        .multMatrix(A1[r][q], coeff_quadratic_3dim[q]));
-                    tmp_c_sing[r] = c.addVect(tmp_c_sing[r], c.multVect(
-                        A1[r][q], this.pub_singular[q]));
-                    tmp_c_scal[r] = GF2Field.addElem(tmp_c_scal[r], GF2Field
-                        .multElem(A1[r][q], this.pub_scalar[q]));
-                }
-                tmp_c_scal[r] = GF2Field.addElem(tmp_c_scal[r], b1[r]);
-            }
-            // set public key
-            coeff_quadratic_3dim = tmp_c_quad;
-            this.pub_singular = tmp_c_sing;
-            this.pub_scalar = tmp_c_scal;
-        }
-        compactPublicKey(coeff_quadratic_3dim);
-    }
-
-    /**
-     * The quadratic (or mixed) terms of the public key are compacted from a n x
-     * n matrix per polynomial to an upper diagonal matrix stored in one integer
-     * array of n (n + 1) / 2 elements per polynomial. The ordering of elements
-     * is lexicographic and the result is updating <tt>this.pub_quadratic</tt>,
-     * which stores the quadratic elements of the public key.
-     *
-     * @param coeff_quadratic_to_compact 3-dimensional array containing a n x n Matrix for each of the
-     *                                   n - v1 polynomials
-     */
-    private void compactPublicKey(short[][][] coeff_quadratic_to_compact)
-    {
-        int polynomials = coeff_quadratic_to_compact.length;
-        int n = coeff_quadratic_to_compact[0].length;
-        int entries = n * (n + 1) / 2;// the small gauss
-        this.pub_quadratic = new short[polynomials][entries];
-        int offset = 0;
-
-        for (int p = 0; p < polynomials; p++)
-        {
-            offset = 0;
-            for (int x = 0; x < n; x++)
-            {
-                for (int y = x; y < n; y++)
-                {
-                    if (y == x)
-                    {
-                        this.pub_quadratic[p][offset] = coeff_quadratic_to_compact[p][x][y];
-                    }
-                    else
-                    {
-                        this.pub_quadratic[p][offset] = GF2Field.addElem(
-                            coeff_quadratic_to_compact[p][x][y],
-                            coeff_quadratic_to_compact[p][y][x]);
-                    }
-                    offset++;
-                }
-            }
-        }
-    }
-
-    public void init(KeyGenerationParameters param)
-    {
-        this.initialize(param);
-    }
-
-    public AsymmetricCipherKeyPair generateKeyPair()
-    {
-        return genKeyPair();
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/rainbow/RainbowKeyParameters.java b/bcprov/src/main/java/org/bouncycastle/pqc/crypto/rainbow/RainbowKeyParameters.java
deleted file mode 100644
index 9dec685..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/rainbow/RainbowKeyParameters.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package org.bouncycastle.pqc.crypto.rainbow;
-
-import org.bouncycastle.crypto.params.AsymmetricKeyParameter;
-
-public class RainbowKeyParameters 
-    extends AsymmetricKeyParameter
-{
-    private int docLength;
-
-    public RainbowKeyParameters(
-            boolean         isPrivate,
-            int             docLength)
-    {
-        super(isPrivate);
-        this.docLength = docLength;
-    }
-
-    /**
-     * @return the docLength
-     */
-    public int getDocLength()
-    {
-        return this.docLength;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/rainbow/RainbowParameters.java b/bcprov/src/main/java/org/bouncycastle/pqc/crypto/rainbow/RainbowParameters.java
deleted file mode 100644
index 147c55e..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/rainbow/RainbowParameters.java
+++ /dev/null
@@ -1,111 +0,0 @@
-package org.bouncycastle.pqc.crypto.rainbow;
-
-import org.bouncycastle.crypto.CipherParameters;
-
-public class RainbowParameters
-    implements CipherParameters
-{
-
-    /**
-     * DEFAULT PARAMS
-     */
-    /*
-      * Vi = vinegars per layer whereas n is vu (vu = 33 = n) such that
-      *
-      * v1 = 6; o1 = 12-6 = 6
-      *
-      * v2 = 12; o2 = 17-12 = 5
-      *
-      * v3 = 17; o3 = 22-17 = 5
-      *
-      * v4 = 22; o4 = 33-22 = 11
-      *
-      * v5 = 33; (o5 = 0)
-      */
-    private final int[] DEFAULT_VI = {6, 12, 17, 22, 33};
-
-    private int[] vi;// set of vinegar vars per layer.
-
-    /**
-     * Default Constructor The elements of the array containing the number of
-     * Vinegar variables in each layer are set to the default values here.
-     */
-    public RainbowParameters()
-    {
-        this.vi = this.DEFAULT_VI;
-    }
-
-    /**
-     * Constructor with parameters
-     *
-     * @param vi The elements of the array containing the number of Vinegar
-     *           variables per layer are set to the values of the input array.
-     */
-    public RainbowParameters(int[] vi)
-    {
-        this.vi = vi;
-        try
-        {
-            checkParams();
-        }
-        catch (Exception e)
-        {
-            e.printStackTrace();
-        }
-    }
-
-    private void checkParams()
-        throws Exception
-    {
-        if (vi == null)
-        {
-            throw new Exception("no layers defined.");
-        }
-        if (vi.length > 1)
-        {
-            for (int i = 0; i < vi.length - 1; i++)
-            {
-                if (vi[i] >= vi[i + 1])
-                {
-                    throw new Exception(
-                        "v[i] has to be smaller than v[i+1]");
-                }
-            }
-        }
-        else
-        {
-            throw new Exception(
-                "Rainbow needs at least 1 layer, such that v1 < v2.");
-        }
-    }
-
-    /**
-     * Getter for the number of layers
-     *
-     * @return the number of layers
-     */
-    public int getNumOfLayers()
-    {
-        return this.vi.length - 1;
-    }
-
-    /**
-     * Getter for the number of all the polynomials in Rainbow
-     *
-     * @return the number of the polynomials
-     */
-    public int getDocLength()
-    {
-        return vi[vi.length - 1] - vi[0];
-    }
-
-    /**
-     * Getter for the array containing the number of Vinegar-variables per layer
-     *
-     * @return the numbers of vinegars per layer
-     */
-    public int[] getVi()
-    {
-        return this.vi;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/rainbow/RainbowPrivateKeyParameters.java b/bcprov/src/main/java/org/bouncycastle/pqc/crypto/rainbow/RainbowPrivateKeyParameters.java
deleted file mode 100644
index 9876882..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/rainbow/RainbowPrivateKeyParameters.java
+++ /dev/null
@@ -1,117 +0,0 @@
-package org.bouncycastle.pqc.crypto.rainbow;
-
-public class RainbowPrivateKeyParameters
-    extends RainbowKeyParameters
-{
-    /**
-     * Constructor
-     *
-     * @param A1inv  the inverse of A1(the matrix part of the affine linear map L1)
-     *               (n-v1 x n-v1 matrix)
-     * @param b1     translation vector, part of the linear affine map L1
-     * @param A2inv  the inverse of A2(the matrix part of the affine linear map L2)
- *               (n x n matrix)
-     * @param b2     translation vector, part of the linear affine map L2
-     * @param vi     the number of Vinegar-variables per layer
-     * @param layers the polynomials with their coefficients of private map F
-     */
-    public RainbowPrivateKeyParameters(short[][] A1inv, short[] b1,
-                                       short[][] A2inv, short[] b2, int[] vi, Layer[] layers)
-    {
-        super(true, vi[vi.length - 1] - vi[0]);
-
-        this.A1inv = A1inv;
-        this.b1 = b1;
-        this.A2inv = A2inv;
-        this.b2 = b2;
-        this.vi = vi;
-        this.layers = layers;
-    }
-
-    /*
-      * invertible affine linear map L1
-      */
-    // the inverse of A1, (n-v1 x n-v1 matrix)
-    private short[][] A1inv;
-
-    // translation vector of L1
-    private short[] b1;
-
-    /*
-      * invertible affine linear map L2
-      */
-    // the inverse of A2, (n x n matrix)
-    private short[][] A2inv;
-
-    // translation vector of L2
-    private short[] b2;
-
-    /*
-      * components of F
-      */
-    // the number of Vinegar-variables per layer.
-    private int[] vi;
-
-    // contains the polynomials with their coefficients of private map F
-    private Layer[] layers;
-
-    /**
-     * Getter for the translation part of the private quadratic map L1.
-     *
-     * @return b1 the translation part of L1
-     */
-    public short[] getB1()
-    {
-        return this.b1;
-    }
-
-    /**
-     * Getter for the inverse matrix of A1.
-     *
-     * @return the A1inv inverse
-     */
-    public short[][] getInvA1()
-    {
-        return this.A1inv;
-    }
-
-    /**
-     * Getter for the translation part of the private quadratic map L2.
-     *
-     * @return b2 the translation part of L2
-     */
-    public short[] getB2()
-    {
-        return this.b2;
-    }
-
-    /**
-     * Getter for the inverse matrix of A2
-     *
-     * @return the A2inv
-     */
-    public short[][] getInvA2()
-    {
-        return this.A2inv;
-    }
-
-    /**
-     * Returns the layers contained in the private key
-     *
-     * @return layers
-     */
-    public Layer[] getLayers()
-    {
-        return this.layers;
-    }
-
-    /**
-     * /** Returns the array of vi-s
-     *
-     * @return the vi
-     */
-    public int[] getVi()
-    {
-        return vi;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/rainbow/RainbowPublicKeyParameters.java b/bcprov/src/main/java/org/bouncycastle/pqc/crypto/rainbow/RainbowPublicKeyParameters.java
deleted file mode 100644
index 6f3e46f..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/rainbow/RainbowPublicKeyParameters.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package org.bouncycastle.pqc.crypto.rainbow;
-
-public class RainbowPublicKeyParameters
-    extends RainbowKeyParameters
-{
-    private short[][] coeffquadratic;
-    private short[][] coeffsingular;
-    private short[] coeffscalar;
-
-    /**
-     * Constructor
-     *
-     * @param docLength
-     * @param coeffQuadratic
-     * @param coeffSingular
-     * @param coeffScalar
-     */
-    public RainbowPublicKeyParameters(int docLength,
-                                      short[][] coeffQuadratic, short[][] coeffSingular,
-                                      short[] coeffScalar)
-    {
-        super(false, docLength);
-
-        this.coeffquadratic = coeffQuadratic;
-        this.coeffsingular = coeffSingular;
-        this.coeffscalar = coeffScalar;
-
-    }
-
-    /**
-     * @return the coeffquadratic
-     */
-    public short[][] getCoeffQuadratic()
-    {
-        return coeffquadratic;
-    }
-
-    /**
-     * @return the coeffsingular
-     */
-    public short[][] getCoeffSingular()
-    {
-        return coeffsingular;
-    }
-
-    /**
-     * @return the coeffscalar
-     */
-    public short[] getCoeffScalar()
-    {
-        return coeffscalar;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/rainbow/RainbowSigner.java b/bcprov/src/main/java/org/bouncycastle/pqc/crypto/rainbow/RainbowSigner.java
deleted file mode 100644
index 979e759..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/rainbow/RainbowSigner.java
+++ /dev/null
@@ -1,301 +0,0 @@
-package org.bouncycastle.pqc.crypto.rainbow;
-
-import java.security.SecureRandom;
-
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.params.ParametersWithRandom;
-import org.bouncycastle.pqc.crypto.MessageSigner;
-import org.bouncycastle.pqc.crypto.rainbow.util.ComputeInField;
-import org.bouncycastle.pqc.crypto.rainbow.util.GF2Field;
-
-/**
- * It implements the sign and verify functions for the Rainbow Signature Scheme.
- * Here the message, which has to be signed, is updated. The use of
- * different hash functions is possible.
- * <p>
- * Detailed information about the signature and the verify-method is to be found
- * in the paper of Jintai Ding, Dieter Schmidt: Rainbow, a New Multivariable
- * Polynomial Signature Scheme. ACNS 2005: 164-175
- * (http://dx.doi.org/10.1007/11496137_12)
- */
-public class RainbowSigner
-    implements MessageSigner
-{
-    // Source of randomness
-    private SecureRandom random;
-
-    // The length of a document that can be signed with the privKey
-    int signableDocumentLength;
-
-    // Container for the oil and vinegar variables of all the layers
-    private short[] x;
-
-    private ComputeInField cf = new ComputeInField();
-
-    RainbowKeyParameters key;
-
-    public void init(boolean forSigning,
-                     CipherParameters param)
-    {
-        if (forSigning)
-        {
-            if (param instanceof ParametersWithRandom)
-            {
-                ParametersWithRandom rParam = (ParametersWithRandom)param;
-
-                this.random = rParam.getRandom();
-                this.key = (RainbowPrivateKeyParameters)rParam.getParameters();
-
-            }
-            else
-            {
-
-                this.random = new SecureRandom();
-                this.key = (RainbowPrivateKeyParameters)param;
-            }
-        }
-        else
-        {
-            this.key = (RainbowPublicKeyParameters)param;
-        }
-
-        this.signableDocumentLength = this.key.getDocLength();
-    }
-
-
-    /**
-     * initial operations before solving the Linear equation system.
-     *
-     * @param layer the current layer for which a LES is to be solved.
-     * @param msg   the message that should be signed.
-     * @return Y_ the modified document needed for solving LES, (Y_ =
-     *         A1^{-1}*(Y-b1)) linear map L1 = A1 x + b1.
-     */
-    private short[] initSign(Layer[] layer, short[] msg)
-    {
-
-        /* preparation: Modifies the document with the inverse of L1 */
-        // tmp = Y - b1:
-        short[] tmpVec = new short[msg.length];
-
-        tmpVec = cf.addVect(((RainbowPrivateKeyParameters)this.key).getB1(), msg);
-
-        // Y_ = A1^{-1} * (Y - b1) :
-        short[] Y_ = cf.multiplyMatrix(((RainbowPrivateKeyParameters)this.key).getInvA1(), tmpVec);
-
-        /* generates the vinegar vars of the first layer at random */
-        for (int i = 0; i < layer[0].getVi(); i++)
-        {
-            x[i] = (short)random.nextInt();
-            x[i] = (short)(x[i] & GF2Field.MASK);
-        }
-
-        return Y_;
-    }
-
-    /**
-     * This function signs the message that has been updated, making use of the
-     * private key.
-     * <p>
-     * For computing the signature, L1 and L2 are needed, as well as LES should
-     * be solved for each layer in order to find the Oil-variables in the layer.
-     * <p>
-     * The Vinegar-variables of the first layer are random generated.
-     *
-     * @param message the message
-     * @return the signature of the message.
-     */
-    public byte[] generateSignature(byte[] message)
-    {
-        Layer[] layer = ((RainbowPrivateKeyParameters)this.key).getLayers();
-        int numberOfLayers = layer.length;
-
-        x = new short[((RainbowPrivateKeyParameters)this.key).getInvA2().length]; // all variables
-
-        short[] Y_; // modified document
-        short[] y_i; // part of Y_ each polynomial
-        int counter; // index of the current part of the doc
-
-        short[] solVec; // the solution of LES pro layer
-        short[] tmpVec;
-
-        // the signature as an array of shorts:
-        short[] signature;
-        // the signature as a byte-array:
-        byte[] S = new byte[layer[numberOfLayers - 1].getViNext()];
-
-        short[] msgHashVals = makeMessageRepresentative(message);
-
-        // shows if an exception is caught
-        boolean ok;
-        do
-        {
-            ok = true;
-            counter = 0;
-            try
-            {
-                Y_ = initSign(layer, msgHashVals);
-
-                for (int i = 0; i < numberOfLayers; i++)
-                {
-
-                    y_i = new short[layer[i].getOi()];
-                    solVec = new short[layer[i].getOi()]; // solution of LES
-
-                    /* copy oi elements of Y_ into y_i */
-                    for (int k = 0; k < layer[i].getOi(); k++)
-                    {
-                        y_i[k] = Y_[counter];
-                        counter++; // current index of Y_
-                    }
-
-                    /*
-                          * plug in the vars of the previous layer in order to get
-                          * the vars of the current layer
-                          */
-                    solVec = cf.solveEquation(layer[i].plugInVinegars(x), y_i);
-
-                    if (solVec == null)
-                    { // LES is not solveable
-                        throw new Exception("LES is not solveable!");
-                    }
-
-                    /* copy the new vars into the x-array */
-                    for (int j = 0; j < solVec.length; j++)
-                    {
-                        x[layer[i].getVi() + j] = solVec[j];
-                    }
-                }
-
-                /* apply the inverse of L2: (signature = A2^{-1}*(b2+x)) */
-                tmpVec = cf.addVect(((RainbowPrivateKeyParameters)this.key).getB2(), x);
-                signature = cf.multiplyMatrix(((RainbowPrivateKeyParameters)this.key).getInvA2(), tmpVec);
-
-                /* cast signature from short[] to byte[] */
-                for (int i = 0; i < S.length; i++)
-                {
-                    S[i] = ((byte)signature[i]);
-                }
-            }
-            catch (Exception se)
-            {
-                // if one of the LESs was not solveable - sign again
-                ok = false;
-            }
-        }
-        while (!ok);
-        /* return the signature in bytes */
-        return S;
-    }
-
-    /**
-     * This function verifies the signature of the message that has been
-     * updated, with the aid of the public key.
-     *
-     * @param message the message
-     * @param signature the signature of the message
-     * @return true if the signature has been verified, false otherwise.
-     */
-    public boolean verifySignature(byte[] message, byte[] signature)
-    {
-        short[] sigInt = new short[signature.length];
-        short tmp;
-
-        for (int i = 0; i < signature.length; i++)
-        {
-            tmp = (short)signature[i];
-            tmp &= (short)0xff;
-            sigInt[i] = tmp;
-        }
-
-        short[] msgHashVal = makeMessageRepresentative(message);
-
-        // verify
-        short[] verificationResult = verifySignatureIntern(sigInt);
-
-        // compare
-        boolean verified = true;
-        if (msgHashVal.length != verificationResult.length)
-        {
-            return false;
-        }
-        for (int i = 0; i < msgHashVal.length; i++)
-        {
-            verified = verified && msgHashVal[i] == verificationResult[i];
-        }
-
-        return verified;
-    }
-
-    /**
-     * Signature verification using public key
-     *
-     * @param signature vector of dimension n
-     * @return document hash of length n - v1
-     */
-    private short[] verifySignatureIntern(short[] signature)
-    {
-
-        short[][] coeff_quadratic = ((RainbowPublicKeyParameters)this.key).getCoeffQuadratic();
-        short[][] coeff_singular = ((RainbowPublicKeyParameters)this.key).getCoeffSingular();
-        short[] coeff_scalar = ((RainbowPublicKeyParameters)this.key).getCoeffScalar();
-
-        short[] rslt = new short[coeff_quadratic.length];// n - v1
-        int n = coeff_singular[0].length;
-        int offset = 0; // array position
-        short tmp = 0; // for scalar
-
-        for (int p = 0; p < coeff_quadratic.length; p++)
-        { // no of polynomials
-            offset = 0;
-            for (int x = 0; x < n; x++)
-            {
-                // calculate quadratic terms
-                for (int y = x; y < n; y++)
-                {
-                    tmp = GF2Field.multElem(coeff_quadratic[p][offset],
-                        GF2Field.multElem(signature[x], signature[y]));
-                    rslt[p] = GF2Field.addElem(rslt[p], tmp);
-                    offset++;
-                }
-                // calculate singular terms
-                tmp = GF2Field.multElem(coeff_singular[p][x], signature[x]);
-                rslt[p] = GF2Field.addElem(rslt[p], tmp);
-            }
-            // add scalar
-            rslt[p] = GF2Field.addElem(rslt[p], coeff_scalar[p]);
-        }
-
-        return rslt;
-    }
-
-    /**
-     * This function creates the representative of the message which gets signed
-     * or verified.
-     *
-     * @param message the message
-     * @return message representative
-     */
-    private short[] makeMessageRepresentative(byte[] message)
-    {
-        // the message representative
-        short[] output = new short[this.signableDocumentLength];
-
-        int h = 0;
-        int i = 0;
-        do
-        {
-            if (i >= message.length)
-            {
-                break;
-            }
-            output[i] = (short)message[h];
-            output[i] &= (short)0xff;
-            h++;
-            i++;
-        }
-        while (i < output.length);
-
-        return output;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/rainbow/util/ComputeInField.java b/bcprov/src/main/java/org/bouncycastle/pqc/crypto/rainbow/util/ComputeInField.java
deleted file mode 100644
index 5bf2573..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/rainbow/util/ComputeInField.java
+++ /dev/null
@@ -1,490 +0,0 @@
-package org.bouncycastle.pqc.crypto.rainbow.util;
-
-/**
- * This class offers different operations on matrices in field GF2^8.
- * <p>
- * Implemented are functions:
- * - finding inverse of a matrix
- * - solving linear equation systems using the Gauss-Elimination method
- * - basic operations like matrix multiplication, addition and so on.
- */
-
-public class ComputeInField
-{
-
-    private short[][] A; // used by solveEquation and inverse
-    short[] x;
-
-    /**
-     * Constructor with no parameters
-     */
-    public ComputeInField()
-    {
-    }
-
-
-    /**
-     * This function finds a solution of the equation Bx = b.
-     * Exception is thrown if the linear equation system has no solution
-     *
-     * @param B this matrix is the left part of the
-     *          equation (B in the equation above)
-     * @param b the right part of the equation
-     *          (b in the equation above)
-     * @return x  the solution of the equation if it is solvable
-     *         null otherwise
-     * @throws RuntimeException if LES is not solvable
-     */
-    public short[] solveEquation(short[][] B, short[] b)
-    {
-        try
-        {
-
-            if (B.length != b.length)
-            {
-                throw new RuntimeException(
-                    "The equation system is not solvable");
-            }
-
-            /** initialize **/
-            // this matrix stores B and b from the equation B*x = b
-            // b is stored as the last column.
-            // B contains one column more than rows.
-            // In this column we store a free coefficient that should be later subtracted from b
-            A = new short[B.length][B.length + 1];
-            // stores the solution of the LES
-            x = new short[B.length];
-
-            /** copy B into the global matrix A **/
-            for (int i = 0; i < B.length; i++)
-            { // rows
-                for (int j = 0; j < B[0].length; j++)
-                { // cols
-                    A[i][j] = B[i][j];
-                }
-            }
-
-            /** copy the vector b into the global A **/
-            //the free coefficient, stored in the last column of A( A[i][b.length]
-            // is to be subtracted from b
-            for (int i = 0; i < b.length; i++)
-            {
-                A[i][b.length] = GF2Field.addElem(b[i], A[i][b.length]);
-            }
-
-            /** call the methods for gauss elimination and backward substitution **/
-            computeZerosUnder(false);     // obtain zeros under the diagonal
-            substitute();
-
-            return x;
-
-        }
-        catch (RuntimeException rte)
-        {
-            return null; // the LES is not solvable!
-        }
-    }
-
-    /**
-     * This function computes the inverse of a given matrix using the Gauss-
-     * Elimination method.
-     * <p>
-     * An exception is thrown if the matrix has no inverse
-     *
-     * @param coef the matrix which inverse matrix is needed
-     * @return inverse matrix of the input matrix.
-     *         If the matrix is singular, null is returned.
-     * @throws RuntimeException if the given matrix is not invertible
-     */
-    public short[][] inverse(short[][] coef)
-    {
-        try
-        {
-            /** Initialization: **/
-            short factor;
-            short[][] inverse;
-            A = new short[coef.length][2 * coef.length];
-            if (coef.length != coef[0].length)
-            {
-                throw new RuntimeException(
-                    "The matrix is not invertible. Please choose another one!");
-            }
-
-            /** prepare: Copy coef and the identity matrix into the global A. **/
-            for (int i = 0; i < coef.length; i++)
-            {
-                for (int j = 0; j < coef.length; j++)
-                {
-                    //copy the input matrix coef into A
-                    A[i][j] = coef[i][j];
-                }
-                // copy the identity matrix into A.
-                for (int j = coef.length; j < 2 * coef.length; j++)
-                {
-                    A[i][j] = 0;
-                }
-                A[i][i + A.length] = 1;
-            }
-
-            /** Elimination operations to get the identity matrix from the left side of A. **/
-            // modify A to get 0s under the diagonal.
-            computeZerosUnder(true);
-
-            // modify A to get only 1s on the diagonal: A[i][j] =A[i][j]/A[i][i].
-            for (int i = 0; i < A.length; i++)
-            {
-                factor = GF2Field.invElem(A[i][i]);
-                for (int j = i; j < 2 * A.length; j++)
-                {
-                    A[i][j] = GF2Field.multElem(A[i][j], factor);
-                }
-            }
-
-            //modify A to get only 0s above the diagonal.
-            computeZerosAbove();
-
-            // copy the result (the second half of A) in the matrix inverse.
-            inverse = new short[A.length][A.length];
-            for (int i = 0; i < A.length; i++)
-            {
-                for (int j = A.length; j < 2 * A.length; j++)
-                {
-                    inverse[i][j - A.length] = A[i][j];
-                }
-            }
-            return inverse;
-
-        }
-        catch (RuntimeException rte)
-        {
-            // The matrix is not invertible! A new one should be generated!
-            return null;
-        }
-    }
-
-    /**
-     * Elimination under the diagonal.
-     * This function changes a matrix so that it contains only zeros under the
-     * diagonal(Ai,i) using only Gauss-Elimination operations.
-     * <p>
-     * It is used in solveEquaton as well as in the function for
-     * finding an inverse of a matrix: {@link}inverse. Both of them use the
-     * Gauss-Elimination Method.
-     * </p><p>
-     * The result is stored in the global matrix A
-     * </p>
-     * @param usedForInverse This parameter shows if the function is used by the
-     *                       solveEquation-function or by the inverse-function and according
-     *                       to this creates matrices of different sizes.
-     * @throws RuntimeException in case a multiplicative inverse of 0 is needed
-     */
-    private void computeZerosUnder(boolean usedForInverse)
-        throws RuntimeException
-    {
-
-        //the number of columns in the global A where the tmp results are stored
-        int length;
-        short tmp = 0;
-
-        //the function is used in inverse() - A should have 2 times more columns than rows
-        if (usedForInverse)
-        {
-            length = 2 * A.length;
-        }
-        //the function is used in solveEquation - A has 1 column more than rows
-        else
-        {
-            length = A.length + 1;
-        }
-
-        //elimination operations to modify A so that that it contains only 0s under the diagonal
-        for (int k = 0; k < A.length - 1; k++)
-        { // the fixed row
-            for (int i = k + 1; i < A.length; i++)
-            { // rows
-                short factor1 = A[i][k];
-                short factor2 = GF2Field.invElem(A[k][k]);
-
-                //The element which multiplicative inverse is needed, is 0
-                //in this case is the input matrix not invertible
-                if (factor2 == 0)
-                {
-                    throw new RuntimeException("Matrix not invertible! We have to choose another one!");
-                }
-
-                for (int j = k; j < length; j++)
-                {// columns
-                    // tmp=A[k,j] / A[k,k]
-                    tmp = GF2Field.multElem(A[k][j], factor2);
-                    // tmp = A[i,k] * A[k,j] / A[k,k]
-                    tmp = GF2Field.multElem(factor1, tmp);
-                    // A[i,j]=A[i,j]-A[i,k]/A[k,k]*A[k,j];
-                    A[i][j] = GF2Field.addElem(A[i][j], tmp);
-                }
-            }
-        }
-    }
-
-    /**
-     * Elimination above the diagonal.
-     * This function changes a matrix so that it contains only zeros above the
-     * diagonal(Ai,i) using only Gauss-Elimination operations.
-     * <p>
-     * It is used in the inverse-function
-     * The result is stored in the global matrix A
-     * </p>
-     * @throws RuntimeException in case a multiplicative inverse of 0 is needed
-     */
-    private void computeZerosAbove()
-        throws RuntimeException
-    {
-        short tmp = 0;
-        for (int k = A.length - 1; k > 0; k--)
-        { // the fixed row
-            for (int i = k - 1; i >= 0; i--)
-            { // rows
-                short factor1 = A[i][k];
-                short factor2 = GF2Field.invElem(A[k][k]);
-                if (factor2 == 0)
-                {
-                    throw new RuntimeException("The matrix is not invertible");
-                }
-                for (int j = k; j < 2 * A.length; j++)
-                { // columns
-                    // tmp = A[k,j] / A[k,k]
-                    tmp = GF2Field.multElem(A[k][j], factor2);
-                    // tmp = A[i,k] * A[k,j] / A[k,k]
-                    tmp = GF2Field.multElem(factor1, tmp);
-                    // A[i,j] = A[i,j] - A[i,k] / A[k,k] * A[k,j];
-                    A[i][j] = GF2Field.addElem(A[i][j], tmp);
-                }
-            }
-        }
-    }
-
-
-    /**
-     * This function uses backward substitution to find x
-     * of the linear equation system (LES) B*x = b,
-     * where A a triangle-matrix is (contains only zeros under the diagonal)
-     * and b is a vector
-     * <p>
-     * If the multiplicative inverse of 0 is needed, an exception is thrown.
-     * In this case is the LES not solvable
-     * </p>
-     * @throws RuntimeException in case a multiplicative inverse of 0 is needed
-     */
-    private void substitute()
-        throws RuntimeException
-    {
-
-        // for the temporary results of the operations in field
-        short tmp, temp;
-
-        temp = GF2Field.invElem(A[A.length - 1][A.length - 1]);
-        if (temp == 0)
-        {
-            throw new RuntimeException("The equation system is not solvable");
-        }
-
-        /** backward substitution **/
-        x[A.length - 1] = GF2Field.multElem(A[A.length - 1][A.length], temp);
-        for (int i = A.length - 2; i >= 0; i--)
-        {
-            tmp = A[i][A.length];
-            for (int j = A.length - 1; j > i; j--)
-            {
-                temp = GF2Field.multElem(A[i][j], x[j]);
-                tmp = GF2Field.addElem(tmp, temp);
-            }
-
-            temp = GF2Field.invElem(A[i][i]);
-            if (temp == 0)
-            {
-                throw new RuntimeException("Not solvable equation system");
-            }
-            x[i] = GF2Field.multElem(tmp, temp);
-        }
-    }
-
-
-    /**
-     * This function multiplies two given matrices.
-     * If the given matrices cannot be multiplied due
-     * to different sizes, an exception is thrown.
-     *
-     * @param M1 -the 1st matrix
-     * @param M2 -the 2nd matrix
-     * @return A = M1*M2
-     * @throws RuntimeException in case the given matrices cannot be multiplied
-     * due to different dimensions.
-     */
-    public short[][] multiplyMatrix(short[][] M1, short[][] M2)
-        throws RuntimeException
-    {
-
-        if (M1[0].length != M2.length)
-        {
-            throw new RuntimeException("Multiplication is not possible!");
-        }
-        short tmp = 0;
-        A = new short[M1.length][M2[0].length];
-        for (int i = 0; i < M1.length; i++)
-        {
-            for (int j = 0; j < M2.length; j++)
-            {
-                for (int k = 0; k < M2[0].length; k++)
-                {
-                    tmp = GF2Field.multElem(M1[i][j], M2[j][k]);
-                    A[i][k] = GF2Field.addElem(A[i][k], tmp);
-                }
-            }
-        }
-        return A;
-    }
-
-    /**
-     * This function multiplies a given matrix with a one-dimensional array.
-     * <p>
-     * An exception is thrown, if the number of columns in the matrix and
-     * the number of rows in the one-dim. array differ.
-     *
-     * @param M1 the matrix to be multiplied
-     * @param m  the one-dimensional array to be multiplied
-     * @return M1*m
-     * @throws RuntimeException in case of dimension inconsistency
-     */
-    public short[] multiplyMatrix(short[][] M1, short[] m)
-        throws RuntimeException
-    {
-        if (M1[0].length != m.length)
-        {
-            throw new RuntimeException("Multiplication is not possible!");
-        }
-        short tmp = 0;
-        short[] B = new short[M1.length];
-        for (int i = 0; i < M1.length; i++)
-        {
-            for (int j = 0; j < m.length; j++)
-            {
-                tmp = GF2Field.multElem(M1[i][j], m[j]);
-                B[i] = GF2Field.addElem(B[i], tmp);
-            }
-        }
-        return B;
-    }
-
-    /**
-     * Addition of two vectors
-     *
-     * @param vector1 first summand, always of dim n
-     * @param vector2 second summand, always of dim n
-     * @return addition of vector1 and vector2
-     * @throws RuntimeException in case the addition is impossible
-     * due to inconsistency in the dimensions
-     */
-    public short[] addVect(short[] vector1, short[] vector2)
-    {
-        if (vector1.length != vector2.length)
-        {
-            throw new RuntimeException("Multiplication is not possible!");
-        }
-        short rslt[] = new short[vector1.length];
-        for (int n = 0; n < rslt.length; n++)
-        {
-            rslt[n] = GF2Field.addElem(vector1[n], vector2[n]);
-        }
-        return rslt;
-    }
-
-    /**
-     * Multiplication of column vector with row vector
-     *
-     * @param vector1 column vector, always n x 1
-     * @param vector2 row vector, always 1 x n
-     * @return resulting n x n matrix of multiplication
-     * @throws RuntimeException in case the multiplication is impossible due to
-     * inconsistency in the dimensions
-     */
-    public short[][] multVects(short[] vector1, short[] vector2)
-    {
-        if (vector1.length != vector2.length)
-        {
-            throw new RuntimeException("Multiplication is not possible!");
-        }
-        short rslt[][] = new short[vector1.length][vector2.length];
-        for (int i = 0; i < vector1.length; i++)
-        {
-            for (int j = 0; j < vector2.length; j++)
-            {
-                rslt[i][j] = GF2Field.multElem(vector1[i], vector2[j]);
-            }
-        }
-        return rslt;
-    }
-
-    /**
-     * Multiplies vector with scalar
-     *
-     * @param scalar galois element to multiply vector with
-     * @param vector vector to be multiplied
-     * @return vector multiplied with scalar
-     */
-    public short[] multVect(short scalar, short[] vector)
-    {
-        short rslt[] = new short[vector.length];
-        for (int n = 0; n < rslt.length; n++)
-        {
-            rslt[n] = GF2Field.multElem(scalar, vector[n]);
-        }
-        return rslt;
-    }
-
-    /**
-     * Multiplies matrix with scalar
-     *
-     * @param scalar galois element to multiply matrix with
-     * @param matrix 2-dim n x n matrix to be multiplied
-     * @return matrix multiplied with scalar
-     */
-    public short[][] multMatrix(short scalar, short[][] matrix)
-    {
-        short[][] rslt = new short[matrix.length][matrix[0].length];
-        for (int i = 0; i < matrix.length; i++)
-        {
-            for (int j = 0; j < matrix[0].length; j++)
-            {
-                rslt[i][j] = GF2Field.multElem(scalar, matrix[i][j]);
-            }
-        }
-        return rslt;
-    }
-
-    /**
-     * Adds the n x n matrices matrix1 and matrix2
-     *
-     * @param matrix1 first summand
-     * @param matrix2 second summand
-     * @return addition of matrix1 and matrix2; both having the dimensions n x n
-     * @throws RuntimeException in case the addition is not possible because of
-     * different dimensions of the matrices
-     */
-    public short[][] addSquareMatrix(short[][] matrix1, short[][] matrix2)
-    {
-        if (matrix1.length != matrix2.length || matrix1[0].length != matrix2[0].length)
-        {
-            throw new RuntimeException("Addition is not possible!");
-        }
-
-        short[][] rslt = new short[matrix1.length][matrix1.length];//
-        for (int i = 0; i < matrix1.length; i++)
-        {
-            for (int j = 0; j < matrix2.length; j++)
-            {
-                rslt[i][j] = GF2Field.addElem(matrix1[i][j], matrix2[i][j]);
-            }
-        }
-        return rslt;
-    }
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/rainbow/util/GF2Field.java b/bcprov/src/main/java/org/bouncycastle/pqc/crypto/rainbow/util/GF2Field.java
deleted file mode 100644
index 8d54279..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/rainbow/util/GF2Field.java
+++ /dev/null
@@ -1,139 +0,0 @@
-package org.bouncycastle.pqc.crypto.rainbow.util;
-
-/**
- * This class provides the basic operations like addition, multiplication and
- * finding the multiplicative inverse of an element in GF2^8.
- * <p>
- * The operations are implemented using the irreducible polynomial
- * 1+x^2+x^3+x^6+x^8 ( 1 0100 1101 = 0x14d )
- * <p>
- * This class makes use of lookup tables(exps and logs) for implementing the
- * operations in order to increase the efficiency of Rainbow.
- */
-public class GF2Field
-{
-
-    public static final int MASK = 0xff;
-
-    /*
-      * this lookup table is needed for multiplication and computing the
-      * multiplicative inverse
-      */
-    static final short exps[] = {1, 2, 4, 8, 16, 32, 64, 128, 77, 154, 121, 242,
-        169, 31, 62, 124, 248, 189, 55, 110, 220, 245, 167, 3, 6, 12, 24,
-        48, 96, 192, 205, 215, 227, 139, 91, 182, 33, 66, 132, 69, 138, 89,
-        178, 41, 82, 164, 5, 10, 20, 40, 80, 160, 13, 26, 52, 104, 208,
-        237, 151, 99, 198, 193, 207, 211, 235, 155, 123, 246, 161, 15, 30,
-        60, 120, 240, 173, 23, 46, 92, 184, 61, 122, 244, 165, 7, 14, 28,
-        56, 112, 224, 141, 87, 174, 17, 34, 68, 136, 93, 186, 57, 114, 228,
-        133, 71, 142, 81, 162, 9, 18, 36, 72, 144, 109, 218, 249, 191, 51,
-        102, 204, 213, 231, 131, 75, 150, 97, 194, 201, 223, 243, 171, 27,
-        54, 108, 216, 253, 183, 35, 70, 140, 85, 170, 25, 50, 100, 200,
-        221, 247, 163, 11, 22, 44, 88, 176, 45, 90, 180, 37, 74, 148, 101,
-        202, 217, 255, 179, 43, 86, 172, 21, 42, 84, 168, 29, 58, 116, 232,
-        157, 119, 238, 145, 111, 222, 241, 175, 19, 38, 76, 152, 125, 250,
-        185, 63, 126, 252, 181, 39, 78, 156, 117, 234, 153, 127, 254, 177,
-        47, 94, 188, 53, 106, 212, 229, 135, 67, 134, 65, 130, 73, 146,
-        105, 210, 233, 159, 115, 230, 129, 79, 158, 113, 226, 137, 95, 190,
-        49, 98, 196, 197, 199, 195, 203, 219, 251, 187, 59, 118, 236, 149,
-        103, 206, 209, 239, 147, 107, 214, 225, 143, 83, 166, 1};
-
-    /*
-      * this lookup table is needed for multiplication and computing the
-      * multiplicative inverse
-      */
-    static final short logs[] = {0, 0, 1, 23, 2, 46, 24, 83, 3, 106, 47, 147,
-        25, 52, 84, 69, 4, 92, 107, 182, 48, 166, 148, 75, 26, 140, 53,
-        129, 85, 170, 70, 13, 5, 36, 93, 135, 108, 155, 183, 193, 49, 43,
-        167, 163, 149, 152, 76, 202, 27, 230, 141, 115, 54, 205, 130, 18,
-        86, 98, 171, 240, 71, 79, 14, 189, 6, 212, 37, 210, 94, 39, 136,
-        102, 109, 214, 156, 121, 184, 8, 194, 223, 50, 104, 44, 253, 168,
-        138, 164, 90, 150, 41, 153, 34, 77, 96, 203, 228, 28, 123, 231, 59,
-        142, 158, 116, 244, 55, 216, 206, 249, 131, 111, 19, 178, 87, 225,
-        99, 220, 172, 196, 241, 175, 72, 10, 80, 66, 15, 186, 190, 199, 7,
-        222, 213, 120, 38, 101, 211, 209, 95, 227, 40, 33, 137, 89, 103,
-        252, 110, 177, 215, 248, 157, 243, 122, 58, 185, 198, 9, 65, 195,
-        174, 224, 219, 51, 68, 105, 146, 45, 82, 254, 22, 169, 12, 139,
-        128, 165, 74, 91, 181, 151, 201, 42, 162, 154, 192, 35, 134, 78,
-        188, 97, 239, 204, 17, 229, 114, 29, 61, 124, 235, 232, 233, 60,
-        234, 143, 125, 159, 236, 117, 30, 245, 62, 56, 246, 217, 63, 207,
-        118, 250, 31, 132, 160, 112, 237, 20, 144, 179, 126, 88, 251, 226,
-        32, 100, 208, 221, 119, 173, 218, 197, 64, 242, 57, 176, 247, 73,
-        180, 11, 127, 81, 21, 67, 145, 16, 113, 187, 238, 191, 133, 200,
-        161};
-
-    /**
-     * This function calculates the sum of two elements as an operation in GF2^8
-     *
-     * @param x the first element that is to be added
-     * @param y the second element that should be add
-     * @return the sum of the two elements x and y in GF2^8
-     */
-    public static short addElem(short x, short y)
-    {
-        return (short)(x ^ y);
-    }
-
-    /**
-     * This function computes the multiplicative inverse of a given element in
-     * GF2^8 The 0 has no multiplicative inverse and in this case 0 is returned.
-     *
-     * @param x the element which multiplicative inverse is to be computed
-     * @return the multiplicative inverse of the given element, in case it
-     *         exists or 0, otherwise
-     */
-    public static short invElem(short x)
-    {
-        if (x == 0)
-        {
-            return 0;
-        }
-        return (exps[255 - logs[x]]);
-    }
-
-    /**
-     * This function multiplies two elements in GF2^8. If one of the two
-     * elements is 0, 0 is returned.
-     *
-     * @param x the first element to be multiplied.
-     * @param y the second element to be multiplied.
-     * @return the product of the two input elements in GF2^8.
-     */
-    public static short multElem(short x, short y)
-    {
-        if (x == 0 || y == 0)
-        {
-            return 0;
-        }
-        else
-        {
-            return (exps[(logs[x] + logs[y]) % 255]);
-        }
-    }
-
-    /**
-     * This function returns the values of exps-lookup table which correspond to
-     * the input
-     *
-     * @param x the index in the lookup table exps
-     * @return exps-value, corresponding to the input
-     */
-    public static short getExp(short x)
-    {
-        return exps[x];
-    }
-
-    /**
-     * This function returns the values of logs-lookup table which correspond to
-     * the input
-     *
-     * @param x the index in the lookup table logs
-     * @return logs-value, corresponding to the input
-     */
-    public static short getLog(short x)
-    {
-        return logs[x];
-    }
-
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/rainbow/util/RainbowUtil.java b/bcprov/src/main/java/org/bouncycastle/pqc/crypto/rainbow/util/RainbowUtil.java
deleted file mode 100644
index 2b073b1..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/rainbow/util/RainbowUtil.java
+++ /dev/null
@@ -1,230 +0,0 @@
-package org.bouncycastle.pqc.crypto.rainbow.util;
-
-/**
- * This class is needed for the conversions while encoding and decoding, as well as for
- * comparison between arrays of some dimensions
- */
-public class RainbowUtil
-{
-
-    /**
-     * This function converts an one-dimensional array of bytes into a
-     * one-dimensional array of int
-     *
-     * @param in the array to be converted
-     * @return out
-     *         the one-dimensional int-array that corresponds the input
-     */
-    public static int[] convertArraytoInt(byte[] in)
-    {
-        int[] out = new int[in.length];
-        for (int i = 0; i < in.length; i++)
-        {
-            out[i] = in[i] & GF2Field.MASK;
-        }
-        return out;
-    }
-
-    /**
-     * This function converts an one-dimensional array of bytes into a
-     * one-dimensional array of type short
-     *
-     * @param in the array to be converted
-     * @return out
-     *         one-dimensional short-array that corresponds the input
-     */
-    public static short[] convertArray(byte[] in)
-    {
-        short[] out = new short[in.length];
-        for (int i = 0; i < in.length; i++)
-        {
-            out[i] = (short)(in[i] & GF2Field.MASK);
-        }
-        return out;
-    }
-
-    /**
-     * This function converts a matrix of bytes into a matrix of type short
-     *
-     * @param in the matrix to be converted
-     * @return out
-     *         short-matrix that corresponds the input
-     */
-    public static short[][] convertArray(byte[][] in)
-    {
-        short[][] out = new short[in.length][in[0].length];
-        for (int i = 0; i < in.length; i++)
-        {
-            for (int j = 0; j < in[0].length; j++)
-            {
-                out[i][j] = (short)(in[i][j] & GF2Field.MASK);
-            }
-        }
-        return out;
-    }
-
-    /**
-     * This function converts a 3-dimensional array of bytes into a 3-dimensional array of type short
-     *
-     * @param in the array to be converted
-     * @return out
-     *         short-array that corresponds the input
-     */
-    public static short[][][] convertArray(byte[][][] in)
-    {
-        short[][][] out = new short[in.length][in[0].length][in[0][0].length];
-        for (int i = 0; i < in.length; i++)
-        {
-            for (int j = 0; j < in[0].length; j++)
-            {
-                for (int k = 0; k < in[0][0].length; k++)
-                {
-                    out[i][j][k] = (short)(in[i][j][k] & GF2Field.MASK);
-                }
-            }
-        }
-        return out;
-    }
-
-    /**
-     * This function converts an array of type int into an array of type byte
-     *
-     * @param in the array to be converted
-     * @return out
-     *         the byte-array that corresponds the input
-     */
-    public static byte[] convertIntArray(int[] in)
-    {
-        byte[] out = new byte[in.length];
-        for (int i = 0; i < in.length; i++)
-        {
-            out[i] = (byte)in[i];
-        }
-        return out;
-    }
-
-
-    /**
-     * This function converts an array of type short into an array of type byte
-     *
-     * @param in the array to be converted
-     * @return out
-     *         the byte-array that corresponds the input
-     */
-    public static byte[] convertArray(short[] in)
-    {
-        byte[] out = new byte[in.length];
-        for (int i = 0; i < in.length; i++)
-        {
-            out[i] = (byte)in[i];
-        }
-        return out;
-    }
-
-    /**
-     * This function converts a matrix of type short into a matrix of type byte
-     *
-     * @param in the matrix to be converted
-     * @return out
-     *         the byte-matrix that corresponds the input
-     */
-    public static byte[][] convertArray(short[][] in)
-    {
-        byte[][] out = new byte[in.length][in[0].length];
-        for (int i = 0; i < in.length; i++)
-        {
-            for (int j = 0; j < in[0].length; j++)
-            {
-                out[i][j] = (byte)in[i][j];
-            }
-        }
-        return out;
-    }
-
-    /**
-     * This function converts a 3-dimensional array of type short into a 3-dimensional array of type byte
-     *
-     * @param in the array to be converted
-     * @return out
-     *         the byte-array that corresponds the input
-     */
-    public static byte[][][] convertArray(short[][][] in)
-    {
-        byte[][][] out = new byte[in.length][in[0].length][in[0][0].length];
-        for (int i = 0; i < in.length; i++)
-        {
-            for (int j = 0; j < in[0].length; j++)
-            {
-                for (int k = 0; k < in[0][0].length; k++)
-                {
-                    out[i][j][k] = (byte)in[i][j][k];
-                }
-            }
-        }
-        return out;
-    }
-
-    /**
-     * Compare two short arrays. No null checks are performed.
-     *
-     * @param left  the first short array
-     * @param right the second short array
-     * @return the result of the comparison
-     */
-    public static boolean equals(short[] left, short[] right)
-    {
-        if (left.length != right.length)
-        {
-            return false;
-        }
-        boolean result = true;
-        for (int i = left.length - 1; i >= 0; i--)
-        {
-            result &= left[i] == right[i];
-        }
-        return result;
-    }
-
-    /**
-     * Compare two two-dimensional short arrays. No null checks are performed.
-     *
-     * @param left  the first short array
-     * @param right the second short array
-     * @return the result of the comparison
-     */
-    public static boolean equals(short[][] left, short[][] right)
-    {
-        if (left.length != right.length)
-        {
-            return false;
-        }
-        boolean result = true;
-        for (int i = left.length - 1; i >= 0; i--)
-        {
-            result &= equals(left[i], right[i]);
-        }
-        return result;
-    }
-
-    /**
-     * Compare two three-dimensional short arrays. No null checks are performed.
-     *
-     * @param left  the first short array
-     * @param right the second short array
-     * @return the result of the comparison
-     */
-    public static boolean equals(short[][][] left, short[][][] right)
-    {
-        if (left.length != right.length)
-        {
-            return false;
-        }
-        boolean result = true;
-        for (int i = left.length - 1; i >= 0; i--)
-        {
-            result &= equals(left[i], right[i]);
-        }
-        return result;
-    }
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/test/AllTests.java b/bcprov/src/main/java/org/bouncycastle/pqc/crypto/test/AllTests.java
deleted file mode 100644
index 4559fdb..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/test/AllTests.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package org.bouncycastle.pqc.crypto.test;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import org.bouncycastle.util.test.SimpleTestResult;
-
-public class AllTests
-    extends TestCase
-{   
-    public void testCrypto()
-    {   
-        org.bouncycastle.util.test.Test[] tests = RegressionTest.tests;
-        
-        for (int i = 0; i != tests.length; i++)
-        {
-            SimpleTestResult  result = (SimpleTestResult)tests[i].perform();
-
-            if (!result.isSuccessful())
-            {
-                fail(result.toString());
-            }
-        }
-    }
-    
-    public static void main (String[] args)
-    {
-        junit.textui.TestRunner.run(suite());
-    }
-    
-    public static Test suite()
-    {
-        TestSuite suite = new TestSuite("Lightweight PQ Crypto Tests");
-        
-        suite.addTestSuite(AllTests.class);
-        suite.addTestSuite(BitStringTest.class);
-        suite.addTestSuite(EncryptionKeyTest.class);
-        suite.addTestSuite(NTRUEncryptionParametersTest.class);
-        suite.addTestSuite(NTRUEncryptTest.class);
-        suite.addTestSuite(NTRUSignatureParametersTest.class);
-        suite.addTestSuite(NTRUSignatureKeyTest.class);
-        suite.addTestSuite(NTRUSignerTest.class);
-        suite.addTestSuite(NTRUSigningParametersTest.class);
-
-        return suite;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/test/BitStringTest.java b/bcprov/src/main/java/org/bouncycastle/pqc/crypto/test/BitStringTest.java
deleted file mode 100644
index 85e1ffa..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/test/BitStringTest.java
+++ /dev/null
@@ -1,88 +0,0 @@
-package org.bouncycastle.pqc.crypto.test;
-
-import junit.framework.TestCase;
-import org.bouncycastle.pqc.crypto.ntru.IndexGenerator.BitString;
-import org.bouncycastle.util.Arrays;
-
-public class BitStringTest
-    extends TestCase
-{
-    public void testAppendBitsByteArray()
-    {
-        BitString bs = new BitString();
-        bs.appendBits((byte)78);
-        assertBitStringEquals(bs, new byte[]{78});
-        bs.appendBits((byte)-5);
-        assertBitStringEquals(bs, new byte[]{78, -5});
-        bs.appendBits((byte)127);
-        assertBitStringEquals(bs, new byte[]{78, -5, 127});
-        bs.appendBits((byte)0);
-        assertBitStringEquals(bs, new byte[]{78, -5, 127, 0});
-        bs.appendBits((byte)100);
-        assertBitStringEquals(bs, new byte[]{78, -5, 127, 0, 100});
-    }
-
-    private void assertBitStringEquals(BitString bs, byte[] arr)
-    {
-        byte[] bsBytes = bs.getBytes();
-
-        assertTrue(bsBytes.length >= arr.length);
-        arr = copyOf(arr, bsBytes.length);
-        assertTrue(Arrays.areEqual(arr, bsBytes));
-    }
-
-    public void testGetTrailing()
-    {
-        BitString bs = new BitString();
-        bs.appendBits((byte)78);
-        BitString bs2 = bs.getTrailing(3);
-        assertBitStringEquals(bs2, new byte[]{6});
-
-        bs = new BitString();
-        bs.appendBits((byte)78);
-        bs.appendBits((byte)-5);
-        bs2 = bs.getTrailing(9);
-        assertBitStringEquals(bs2, new byte[]{78, 1});
-
-        bs2.appendBits((byte)100);
-        assertBitStringEquals(bs2, new byte[]{78, -55});
-        bs = bs2.getTrailing(13);
-        assertBitStringEquals(bs, new byte[]{78, 9});
-        bs2 = bs2.getTrailing(11);
-        assertBitStringEquals(bs2, new byte[]{78, 1});
-
-        bs2.appendBits((byte)100);
-        assertBitStringEquals(bs2, new byte[]{78, 33, 3});
-        bs2 = bs2.getTrailing(16);
-        assertBitStringEquals(bs2, new byte[]{78, 33});
-    }
-
-    public void testGetLeadingAsInt()
-    {
-        BitString bs = new BitString();
-        bs.appendBits((byte)78);
-        bs.appendBits((byte)42);
-        assertEquals(1, bs.getLeadingAsInt(3));
-        assertEquals(84, bs.getLeadingAsInt(9));
-        assertEquals(338, bs.getLeadingAsInt(11));
-
-        BitString bs2 = bs.getTrailing(11);
-        assertBitStringEquals(bs2, new byte[]{78, 2});
-        assertEquals(590, bs2.getLeadingAsInt(11));
-        assertEquals(9, bs2.getLeadingAsInt(5));
-
-        bs2.appendBits((byte)115);
-        assertEquals(230, bs2.getLeadingAsInt(9));
-        assertEquals(922, bs2.getLeadingAsInt(11));
-
-        bs2.appendBits((byte)-36);
-        assertEquals(55, bs2.getLeadingAsInt(6));
-    }
-
-    private byte[] copyOf(byte[] src, int length)
-    {
-        byte[] tmp = new byte[length];
-        System.arraycopy(src, 0, tmp, 0, tmp.length > src.length ? src.length : tmp.length);
-        return tmp;
-    }
-}
\ No newline at end of file
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/test/EncryptionKeyTest.java b/bcprov/src/main/java/org/bouncycastle/pqc/crypto/test/EncryptionKeyTest.java
deleted file mode 100644
index f023406..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/test/EncryptionKeyTest.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package org.bouncycastle.pqc.crypto.test;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-
-import junit.framework.TestCase;
-import org.bouncycastle.crypto.AsymmetricCipherKeyPair;
-import org.bouncycastle.pqc.crypto.ntru.NTRUEncryptionKeyPairGenerator;
-import org.bouncycastle.pqc.crypto.ntru.NTRUEncryptionKeyGenerationParameters;
-import org.bouncycastle.pqc.crypto.ntru.NTRUEncryptionPrivateKeyParameters;
-import org.bouncycastle.pqc.crypto.ntru.NTRUEncryptionPublicKeyParameters;
-
-public class EncryptionKeyTest
-    extends TestCase
-{
-    public void testEncode()
-        throws IOException
-    {
-        for (NTRUEncryptionKeyGenerationParameters params : new NTRUEncryptionKeyGenerationParameters[]{NTRUEncryptionKeyGenerationParameters.APR2011_743, NTRUEncryptionKeyGenerationParameters.APR2011_743_FAST, NTRUEncryptionKeyGenerationParameters.EES1499EP1})
-        {
-            testEncode(params);
-        }
-    }
-
-    private void testEncode(NTRUEncryptionKeyGenerationParameters params)
-        throws IOException
-    {
-        NTRUEncryptionKeyPairGenerator kpGen = new NTRUEncryptionKeyPairGenerator();
-
-        kpGen.init(params);
-
-        AsymmetricCipherKeyPair kp = kpGen.generateKeyPair();
-        byte[] priv = ((NTRUEncryptionPrivateKeyParameters)kp.getPrivate()).getEncoded();
-        byte[] pub = ((NTRUEncryptionPublicKeyParameters)kp.getPublic()).getEncoded();
-
-        AsymmetricCipherKeyPair kp2 = new AsymmetricCipherKeyPair(new NTRUEncryptionPublicKeyParameters(pub, params.getEncryptionParameters()), new NTRUEncryptionPrivateKeyParameters(priv, params.getEncryptionParameters()));
-        assertEquals(kp.getPublic(), kp2.getPublic());
-        assertEquals(kp.getPrivate(), kp2.getPrivate());
-
-        ByteArrayOutputStream bos1 = new ByteArrayOutputStream();
-        ByteArrayOutputStream bos2 = new ByteArrayOutputStream();
-        ((NTRUEncryptionPrivateKeyParameters)kp.getPrivate()).writeTo(bos1);
-        ((NTRUEncryptionPublicKeyParameters)kp.getPublic()).writeTo(bos2);
-        ByteArrayInputStream bis1 = new ByteArrayInputStream(bos1.toByteArray());
-        ByteArrayInputStream bis2 = new ByteArrayInputStream(bos2.toByteArray());
-        AsymmetricCipherKeyPair  kp3 = new AsymmetricCipherKeyPair(new NTRUEncryptionPublicKeyParameters(bis2, params.getEncryptionParameters()), new NTRUEncryptionPrivateKeyParameters(bis1, params.getEncryptionParameters()));
-        assertEquals(kp.getPublic(), kp3.getPublic());
-        assertEquals(kp.getPrivate(), kp3.getPrivate());
-    }
-}
\ No newline at end of file
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/test/GMSSSignerTest.java b/bcprov/src/main/java/org/bouncycastle/pqc/crypto/test/GMSSSignerTest.java
deleted file mode 100644
index 69b2842..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/test/GMSSSignerTest.java
+++ /dev/null
@@ -1,88 +0,0 @@
-package org.bouncycastle.pqc.crypto.test;
-
-import java.math.BigInteger;
-import java.security.SecureRandom;
-
-import org.bouncycastle.crypto.AsymmetricCipherKeyPair;
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.Signer;
-import org.bouncycastle.crypto.digests.SHA224Digest;
-import org.bouncycastle.crypto.params.ParametersWithRandom;
-import org.bouncycastle.pqc.crypto.DigestingMessageSigner;
-import org.bouncycastle.pqc.crypto.gmss.GMSSDigestProvider;
-import org.bouncycastle.pqc.crypto.gmss.GMSSKeyGenerationParameters;
-import org.bouncycastle.pqc.crypto.gmss.GMSSKeyPairGenerator;
-import org.bouncycastle.pqc.crypto.gmss.GMSSParameters;
-import org.bouncycastle.pqc.crypto.gmss.GMSSPrivateKeyParameters;
-import org.bouncycastle.pqc.crypto.gmss.GMSSSigner;
-import org.bouncycastle.util.BigIntegers;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.FixedSecureRandom;
-import org.bouncycastle.util.test.SimpleTest;
-
-
-public class GMSSSignerTest
-    extends SimpleTest
-{
-    byte[] keyData = Hex.decode("b5014e4b60ef2ba8b6211b4062ba3224e0427dd3");
-
-    SecureRandom keyRandom = new FixedSecureRandom(new byte[][]{keyData, keyData});
-
-    public String getName()
-    {
-        return "GMSS";
-    }
-
-    public void performTest()
-        throws Exception
-    {
-
-        GMSSParameters params = new GMSSParameters(3,
-            new int[]{15, 15, 10}, new int[]{5, 5, 4}, new int[]{3, 3, 2});
-
-        GMSSDigestProvider digProvider = new GMSSDigestProvider()
-        {
-            public Digest get()
-            {
-                return new SHA224Digest();
-            }
-        };
-
-        GMSSKeyPairGenerator gmssKeyGen = new GMSSKeyPairGenerator(digProvider);
-
-        GMSSKeyGenerationParameters genParam = new GMSSKeyGenerationParameters(keyRandom, params);
-
-        gmssKeyGen.init(genParam);
-
-        AsymmetricCipherKeyPair pair = gmssKeyGen.generateKeyPair();
-
-        ParametersWithRandom param = new ParametersWithRandom(pair.getPrivate(), keyRandom);
-
-        // TODO
-        Signer gmssSigner = new DigestingMessageSigner(new GMSSSigner(digProvider), new SHA224Digest());
-        gmssSigner.init(true, param);
-
-        byte[] message = BigIntegers.asUnsignedByteArray(new BigInteger("968236873715988614170569073515315707566766479517"));
-        gmssSigner.update(message, 0, message.length);
-        byte[] sig = gmssSigner.generateSignature();
-
-
-        gmssSigner.init(false, pair.getPublic());
-        gmssSigner.update(message, 0, message.length);
-        if (!gmssSigner.verifySignature(sig))
-        {
-            fail("verification fails");
-        }
-
-        if (!((GMSSPrivateKeyParameters)pair.getPrivate()).isUsed())
-        {
-            fail("private key not marked as used");
-        }
-    }
-
-    public static void main(
-        String[] args)
-    {
-        runTest(new GMSSSignerTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/test/McElieceFujisakiCipherTest.java b/bcprov/src/main/java/org/bouncycastle/pqc/crypto/test/McElieceFujisakiCipherTest.java
deleted file mode 100644
index dfc44b6..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/test/McElieceFujisakiCipherTest.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package org.bouncycastle.pqc.crypto.test;
-
-import java.security.SecureRandom;
-import java.util.Random;
-
-import org.bouncycastle.crypto.AsymmetricCipherKeyPair;
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.digests.SHA256Digest;
-import org.bouncycastle.crypto.params.ParametersWithRandom;
-import org.bouncycastle.pqc.crypto.mceliece.McElieceCCA2KeyGenerationParameters;
-import org.bouncycastle.pqc.crypto.mceliece.McElieceCCA2KeyPairGenerator;
-import org.bouncycastle.pqc.crypto.mceliece.McElieceCCA2Parameters;
-import org.bouncycastle.pqc.crypto.mceliece.McElieceFujisakiCipher;
-import org.bouncycastle.pqc.crypto.mceliece.McElieceFujisakiDigestCipher;
-import org.bouncycastle.util.test.SimpleTest;
-
-public class McElieceFujisakiCipherTest
-    extends SimpleTest
-{
-
-    SecureRandom keyRandom = new SecureRandom();
-
-    public String getName()
-    {
-        return "McElieceFujisaki";
-
-    }
-
-
-    public void performTest()
-    {
-        int numPassesKPG = 1;
-        int numPassesEncDec = 10;
-        Random rand = new Random();
-        byte[] mBytes;
-        for (int j = 0; j < numPassesKPG; j++)
-        {
-
-            McElieceCCA2Parameters params = new McElieceCCA2Parameters();
-            McElieceCCA2KeyPairGenerator mcElieceCCA2KeyGen = new McElieceCCA2KeyPairGenerator();
-            McElieceCCA2KeyGenerationParameters genParam = new McElieceCCA2KeyGenerationParameters(keyRandom, params);
-
-            mcElieceCCA2KeyGen.init(genParam);
-            AsymmetricCipherKeyPair pair = mcElieceCCA2KeyGen.generateKeyPair();
-
-            ParametersWithRandom param = new ParametersWithRandom(pair.getPublic(), keyRandom);
-            Digest msgDigest = new SHA256Digest();
-            McElieceFujisakiDigestCipher mcElieceFujisakiDigestCipher = new McElieceFujisakiDigestCipher(new McElieceFujisakiCipher(), msgDigest);
-
-
-            for (int k = 1; k <= numPassesEncDec; k++)
-            {
-                System.out.println("############### test: " + k);
-                // initialize for encryption
-                mcElieceFujisakiDigestCipher.init(true, param);
-
-                // generate random message
-                int mLength = (rand.nextInt() & 0x1f) + 1;;
-                mBytes = new byte[mLength];
-                rand.nextBytes(mBytes);
-
-                // encrypt
-                mcElieceFujisakiDigestCipher.update(mBytes, 0, mBytes.length);
-                byte[] enc = mcElieceFujisakiDigestCipher.messageEncrypt();
-
-                // initialize for decryption
-                mcElieceFujisakiDigestCipher.init(false, pair.getPrivate());
-                byte[] constructedmessage = mcElieceFujisakiDigestCipher.messageDecrypt(enc);
-
-                // XXX write in McElieceFujisakiDigestCipher?
-                msgDigest.update(mBytes, 0, mBytes.length);
-                byte[] hash = new byte[msgDigest.getDigestSize()];
-                msgDigest.doFinal(hash, 0);
-
-                boolean verified = true;
-                for (int i = 0; i < hash.length; i++)
-                {
-                    verified = verified && hash[i] == constructedmessage[i];
-                }
-
-                if (!verified)
-                {
-                    fail("en/decryption fails");
-                }
-                else
-                {
-                    System.out.println("test okay");
-                    System.out.println();
-                }
-
-            }
-        }
-
-    }
-
-    public static void main(
-        String[] args)
-    {
-        runTest(new McElieceFujisakiCipherTest());
-    }
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/test/McElieceKobaraImaiCipherTest.java b/bcprov/src/main/java/org/bouncycastle/pqc/crypto/test/McElieceKobaraImaiCipherTest.java
deleted file mode 100644
index 849e656..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/test/McElieceKobaraImaiCipherTest.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package org.bouncycastle.pqc.crypto.test;
-
-import java.security.SecureRandom;
-import java.util.Random;
-
-import org.bouncycastle.crypto.AsymmetricCipherKeyPair;
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.digests.SHA256Digest;
-import org.bouncycastle.crypto.params.ParametersWithRandom;
-import org.bouncycastle.pqc.crypto.mceliece.McElieceCCA2KeyGenerationParameters;
-import org.bouncycastle.pqc.crypto.mceliece.McElieceCCA2KeyPairGenerator;
-import org.bouncycastle.pqc.crypto.mceliece.McElieceCCA2Parameters;
-import org.bouncycastle.pqc.crypto.mceliece.McElieceKobaraImaiCipher;
-import org.bouncycastle.pqc.crypto.mceliece.McElieceKobaraImaiDigestCipher;
-import org.bouncycastle.util.test.SimpleTest;
-
-public class McElieceKobaraImaiCipherTest
-    extends SimpleTest
-{
-
-    SecureRandom keyRandom = new SecureRandom();
-
-    public String getName()
-    {
-        return "McElieceKobaraImai";
-
-    }
-
-
-    public void performTest()
-    {
-        int numPassesKPG = 1;
-        int numPassesEncDec = 10;
-        Random rand = new Random();
-        byte[] mBytes;
-        for (int j = 0; j < numPassesKPG; j++)
-        {
-
-            McElieceCCA2Parameters params = new McElieceCCA2Parameters();
-            McElieceCCA2KeyPairGenerator mcElieceCCA2KeyGen = new McElieceCCA2KeyPairGenerator();
-            McElieceCCA2KeyGenerationParameters genParam = new McElieceCCA2KeyGenerationParameters(keyRandom, params);
-
-            mcElieceCCA2KeyGen.init(genParam);
-            AsymmetricCipherKeyPair pair = mcElieceCCA2KeyGen.generateKeyPair();
-
-            ParametersWithRandom param = new ParametersWithRandom(pair.getPublic(), keyRandom);
-            Digest msgDigest = new SHA256Digest();
-            McElieceKobaraImaiDigestCipher mcElieceKobaraImaiDigestCipher = new McElieceKobaraImaiDigestCipher(new McElieceKobaraImaiCipher(), msgDigest);
-
-
-            for (int k = 1; k <= numPassesEncDec; k++)
-            {
-                System.out.println("############### test: " + k);
-                // initialize for encryption
-                mcElieceKobaraImaiDigestCipher.init(true, param);
-
-                // generate random message
-                int mLength = (rand.nextInt() & 0x1f) + 1;
-                mBytes = new byte[mLength];
-                rand.nextBytes(mBytes);
-
-                // encrypt
-                mcElieceKobaraImaiDigestCipher.update(mBytes, 0, mBytes.length);
-                byte[] enc = mcElieceKobaraImaiDigestCipher.messageEncrypt();
-
-                // initialize for decryption
-                mcElieceKobaraImaiDigestCipher.init(false, pair.getPrivate());
-                byte[] constructedmessage = mcElieceKobaraImaiDigestCipher.messageDecrypt(enc);
-
-                // XXX write in McElieceFujisakiDigestCipher?
-                msgDigest.update(mBytes, 0, mBytes.length);
-                byte[] hash = new byte[msgDigest.getDigestSize()];
-                msgDigest.doFinal(hash, 0);
-
-                boolean verified = true;
-                for (int i = 0; i < hash.length; i++)
-                {
-                    verified = verified && hash[i] == constructedmessage[i];
-                }
-
-                if (!verified)
-                {
-                    fail("en/decryption fails");
-                }
-                else
-                {
-                    System.out.println("test okay");
-                    System.out.println();
-                }
-
-            }
-        }
-
-    }
-
-    public static void main(
-        String[] args)
-    {
-        runTest(new McElieceKobaraImaiCipherTest());
-    }
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/test/McEliecePKCSCipherTest.java b/bcprov/src/main/java/org/bouncycastle/pqc/crypto/test/McEliecePKCSCipherTest.java
deleted file mode 100644
index edb1d60..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/test/McEliecePKCSCipherTest.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package org.bouncycastle.pqc.crypto.test;
-
-import java.security.SecureRandom;
-import java.util.Random;
-
-import org.bouncycastle.crypto.AsymmetricCipherKeyPair;
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.digests.SHA256Digest;
-import org.bouncycastle.crypto.params.ParametersWithRandom;
-import org.bouncycastle.pqc.crypto.mceliece.McElieceKeyGenerationParameters;
-import org.bouncycastle.pqc.crypto.mceliece.McElieceKeyPairGenerator;
-import org.bouncycastle.pqc.crypto.mceliece.McEliecePKCSCipher;
-import org.bouncycastle.pqc.crypto.mceliece.McEliecePKCSDigestCipher;
-import org.bouncycastle.pqc.crypto.mceliece.McElieceParameters;
-import org.bouncycastle.util.test.SimpleTest;
-
-public class McEliecePKCSCipherTest
-    extends SimpleTest
-{
-
-    SecureRandom keyRandom = new SecureRandom();
-
-    public String getName()
-    {
-        return "McEliecePKCS";
-
-    }
-
-
-    public void performTest()
-    {
-        int numPassesKPG = 1;
-        int numPassesEncDec = 10;
-        Random rand = new Random();
-        byte[] mBytes;
-        for (int j = 0; j < numPassesKPG; j++)
-        {
-
-            McElieceParameters params = new McElieceParameters();
-            McElieceKeyPairGenerator mcElieceKeyGen = new McElieceKeyPairGenerator();
-            McElieceKeyGenerationParameters genParam = new McElieceKeyGenerationParameters(keyRandom, params);
-
-            mcElieceKeyGen.init(genParam);
-            AsymmetricCipherKeyPair pair = mcElieceKeyGen.generateKeyPair();
-
-            ParametersWithRandom param = new ParametersWithRandom(pair.getPublic(), keyRandom);
-            Digest msgDigest = new SHA256Digest();
-            McEliecePKCSDigestCipher mcEliecePKCSDigestCipher = new McEliecePKCSDigestCipher(new McEliecePKCSCipher(), msgDigest);
-
-
-            for (int k = 1; k <= numPassesEncDec; k++)
-            {
-                System.out.println("############### test: " + k);
-                // initialize for encryption
-                mcEliecePKCSDigestCipher.init(true, param);
-
-                // generate random message
-                int mLength = (rand.nextInt() & 0x1f) + 1;
-                mBytes = new byte[mLength];
-                rand.nextBytes(mBytes);
-
-                // encrypt
-                mcEliecePKCSDigestCipher.update(mBytes, 0, mBytes.length);
-                byte[] enc = mcEliecePKCSDigestCipher.messageEncrypt();
-
-                // initialize for decryption
-                mcEliecePKCSDigestCipher.init(false, pair.getPrivate());
-                byte[] constructedmessage = mcEliecePKCSDigestCipher.messageDecrypt(enc);
-
-                // XXX write in McElieceFujisakiDigestCipher?
-                msgDigest.update(mBytes, 0, mBytes.length);
-                byte[] hash = new byte[msgDigest.getDigestSize()];
-                msgDigest.doFinal(hash, 0);
-
-                boolean verified = true;
-                for (int i = 0; i < hash.length; i++)
-                {
-                    verified = verified && hash[i] == constructedmessage[i];
-                }
-
-                if (!verified)
-                {
-                    fail("en/decryption fails");
-                }
-                else
-                {
-                    System.out.println("test okay");
-                    System.out.println();
-                }
-
-            }
-        }
-
-    }
-
-    public static void main(
-        String[] args)
-    {
-        runTest(new McEliecePKCSCipherTest());
-    }
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/test/McEliecePointchevalCipherTest.java b/bcprov/src/main/java/org/bouncycastle/pqc/crypto/test/McEliecePointchevalCipherTest.java
deleted file mode 100644
index 23ba3f9..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/test/McEliecePointchevalCipherTest.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package org.bouncycastle.pqc.crypto.test;
-
-import java.security.SecureRandom;
-import java.util.Random;
-
-import org.bouncycastle.crypto.AsymmetricCipherKeyPair;
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.digests.SHA256Digest;
-import org.bouncycastle.crypto.params.ParametersWithRandom;
-import org.bouncycastle.pqc.crypto.mceliece.McElieceCCA2KeyGenerationParameters;
-import org.bouncycastle.pqc.crypto.mceliece.McElieceCCA2KeyPairGenerator;
-import org.bouncycastle.pqc.crypto.mceliece.McElieceCCA2Parameters;
-import org.bouncycastle.pqc.crypto.mceliece.McEliecePointchevalCipher;
-import org.bouncycastle.pqc.crypto.mceliece.McEliecePointchevalDigestCipher;
-import org.bouncycastle.util.test.SimpleTest;
-
-public class McEliecePointchevalCipherTest
-    extends SimpleTest
-{
-
-    SecureRandom keyRandom = new SecureRandom();
-
-    public String getName()
-    {
-        return "McElieceFujisaki";
-
-    }
-
-
-    public void performTest()
-    {
-        int numPassesKPG = 1;
-        int numPassesEncDec = 10;
-        Random rand = new Random();
-        byte[] mBytes;
-        for (int j = 0; j < numPassesKPG; j++)
-        {
-
-            McElieceCCA2Parameters params = new McElieceCCA2Parameters();
-            McElieceCCA2KeyPairGenerator mcElieceCCA2KeyGen = new McElieceCCA2KeyPairGenerator();
-            McElieceCCA2KeyGenerationParameters genParam = new McElieceCCA2KeyGenerationParameters(keyRandom, params);
-
-            mcElieceCCA2KeyGen.init(genParam);
-            AsymmetricCipherKeyPair pair = mcElieceCCA2KeyGen.generateKeyPair();
-
-            ParametersWithRandom param = new ParametersWithRandom(pair.getPublic(), keyRandom);
-            Digest msgDigest = new SHA256Digest();
-            McEliecePointchevalDigestCipher mcEliecePointchevalDigestCipher = new McEliecePointchevalDigestCipher(new McEliecePointchevalCipher(), msgDigest);
-
-
-            for (int k = 1; k <= numPassesEncDec; k++)
-            {
-                System.out.println("############### test: " + k);
-                // initialize for encryption
-                mcEliecePointchevalDigestCipher.init(true, param);
-
-                // generate random message
-                int mLength = (rand.nextInt() & 0x1f) + 1;
-                mBytes = new byte[mLength];
-                rand.nextBytes(mBytes);
-
-                // encrypt
-                mcEliecePointchevalDigestCipher.update(mBytes, 0, mBytes.length);
-                byte[] enc = mcEliecePointchevalDigestCipher.messageEncrypt();
-
-                // initialize for decryption
-                mcEliecePointchevalDigestCipher.init(false, pair.getPrivate());
-                byte[] constructedmessage = mcEliecePointchevalDigestCipher.messageDecrypt(enc);
-
-                // XXX write in McElieceFujisakiDigestCipher?
-                msgDigest.update(mBytes, 0, mBytes.length);
-                byte[] hash = new byte[msgDigest.getDigestSize()];
-                msgDigest.doFinal(hash, 0);
-
-                boolean verified = true;
-                for (int i = 0; i < hash.length; i++)
-                {
-                    verified = verified && hash[i] == constructedmessage[i];
-                }
-
-                if (!verified)
-                {
-                    fail("en/decryption fails");
-                }
-                else
-                {
-                    System.out.println("test okay");
-                    System.out.println();
-                }
-
-            }
-        }
-
-    }
-
-    public static void main(
-        String[] args)
-    {
-        runTest(new McEliecePointchevalCipherTest());
-    }
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/test/NTRUEncryptTest.java b/bcprov/src/main/java/org/bouncycastle/pqc/crypto/test/NTRUEncryptTest.java
deleted file mode 100644
index df63a10..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/test/NTRUEncryptTest.java
+++ /dev/null
@@ -1,298 +0,0 @@
-package org.bouncycastle.pqc.crypto.test;
-
-import java.io.IOException;
-import java.security.SecureRandom;
-
-import junit.framework.TestCase;
-import org.bouncycastle.crypto.AsymmetricCipherKeyPair;
-import org.bouncycastle.crypto.DataLengthException;
-import org.bouncycastle.crypto.InvalidCipherTextException;
-import org.bouncycastle.pqc.crypto.ntru.NTRUEngine;
-import org.bouncycastle.pqc.crypto.ntru.NTRUEncryptionKeyPairGenerator;
-import org.bouncycastle.pqc.crypto.ntru.NTRUEncryptionKeyGenerationParameters;
-import org.bouncycastle.pqc.crypto.ntru.NTRUEncryptionPrivateKeyParameters;
-import org.bouncycastle.pqc.crypto.ntru.NTRUEncryptionPublicKeyParameters;
-import org.bouncycastle.pqc.crypto.ntru.NTRUParameters;
-import org.bouncycastle.pqc.math.ntru.polynomial.DenseTernaryPolynomial;
-import org.bouncycastle.pqc.math.ntru.polynomial.IntegerPolynomial;
-import org.bouncycastle.pqc.math.ntru.polynomial.Polynomial;
-import org.bouncycastle.pqc.math.ntru.polynomial.SparseTernaryPolynomial;
-import org.bouncycastle.pqc.math.ntru.polynomial.TernaryPolynomial;
-import org.bouncycastle.util.Arrays;
-
-public class NTRUEncryptTest
-    extends TestCase
-{
-    public void testEncryptDecrypt()
-        throws InvalidCipherTextException
-    {
-        NTRUEncryptionKeyGenerationParameters params = NTRUEncryptionKeyGenerationParameters.APR2011_743.clone();
-        // set df1..df3 and dr1..dr3 so params can be used for SIMPLE as well as PRODUCT
-        params.df1 = NTRUEncryptionKeyGenerationParameters.APR2011_743_FAST.df1;
-        params.df2 = NTRUEncryptionKeyGenerationParameters.APR2011_743_FAST.df2;
-        params.df3 = NTRUEncryptionKeyGenerationParameters.APR2011_743_FAST.df3;
-        params.dr1 = NTRUEncryptionKeyGenerationParameters.APR2011_743_FAST.dr1;
-        params.dr2 = NTRUEncryptionKeyGenerationParameters.APR2011_743_FAST.dr2;
-        params.dr3 = NTRUEncryptionKeyGenerationParameters.APR2011_743_FAST.dr3;
-
-        int[] values = new int[] { NTRUParameters.TERNARY_POLYNOMIAL_TYPE_SIMPLE, NTRUParameters.TERNARY_POLYNOMIAL_TYPE_PRODUCT };
-
-        for (int i = 0; i != values.length; i++)
-        {
-            int polyType = values[i];
-
-            boolean[] booleans = {true, false};
-            for (int j = 0; j != booleans.length; j++)
-            {
-                params.polyType = polyType;
-                params.fastFp = booleans[j];
-
-                VisibleNTRUEngine ntru = new VisibleNTRUEngine();
-                NTRUEncryptionKeyPairGenerator ntruGen = new NTRUEncryptionKeyPairGenerator();
-
-                ntruGen.init(params);
-
-                AsymmetricCipherKeyPair kp = ntruGen.generateKeyPair();
-
-                testPolynomial(ntru, kp, params);
-
-                testText(ntru, kp, params);
-                // sparse/dense
-                params.sparse = !params.sparse;
-                testText(ntru, kp, params);
-                params.sparse = !params.sparse;
-
-                testEmpty(ntru, kp, params);
-                testMaxLength(ntru, kp, params);
-                testTooLong(ntru, kp, params);
-                testInvalidEncoding(ntru, kp, params);
-            }
-        }
-    }
-
-    // encrypts and decrypts a polynomial
-    private void testPolynomial(VisibleNTRUEngine ntru, AsymmetricCipherKeyPair kp, NTRUEncryptionKeyGenerationParameters params)
-    {
-        SecureRandom random = new SecureRandom();
-        IntegerPolynomial m = DenseTernaryPolynomial.generateRandom(params.N, random);
-        SparseTernaryPolynomial r = SparseTernaryPolynomial.generateRandom(params.N, params.dr, params.dr, random);
-
-        ntru.init(true, kp.getPublic());  // just to set params
-
-        IntegerPolynomial e = ntru.encrypt(m, r, ((NTRUEncryptionPublicKeyParameters)kp.getPublic()).h);
-        IntegerPolynomial c = ntru.decrypt(e, ((NTRUEncryptionPrivateKeyParameters)kp.getPrivate()).t, ((NTRUEncryptionPrivateKeyParameters)kp.getPrivate()).fp);
-
-        assertTrue(Arrays.areEqual(m.coeffs, c.coeffs));
-    }
-
-    // encrypts and decrypts text
-    private void testText(NTRUEngine ntru, AsymmetricCipherKeyPair  kp, NTRUEncryptionKeyGenerationParameters params)
-        throws InvalidCipherTextException
-    {
-        byte[] plainText = "text to encrypt".getBytes();
-
-        ntru.init(true, kp.getPublic());
-
-        byte[] encrypted = ntru.processBlock(plainText, 0, plainText.length);
-
-        ntru.init(false, kp.getPrivate());
-
-        byte[] decrypted = ntru.processBlock(encrypted, 0, encrypted.length);
-
-        assertTrue(Arrays.areEqual(plainText, decrypted));
-    }
-
-    // tests an empty message
-    private void testEmpty(NTRUEngine ntru, AsymmetricCipherKeyPair kp, NTRUEncryptionKeyGenerationParameters params)
-        throws InvalidCipherTextException
-    {
-        byte[] plainText = "".getBytes();
-
-        ntru.init(true, kp.getPublic());
-
-        byte[] encrypted = ntru.processBlock(plainText, 0, plainText.length);
-
-        ntru.init(false, kp.getPrivate());
-
-        byte[] decrypted = ntru.processBlock(encrypted, 0, encrypted.length);
-
-        assertTrue(Arrays.areEqual(plainText, decrypted));
-    }
-
-    // tests a message of the maximum allowed length
-    private void testMaxLength(NTRUEngine ntru, AsymmetricCipherKeyPair kp, NTRUEncryptionKeyGenerationParameters params)
-        throws InvalidCipherTextException
-    {
-        byte[] plainText = new byte[params.maxMsgLenBytes];
-        System.arraycopy("secret encrypted text".getBytes(), 0, plainText, 0, 21);
-        ntru.init(true, kp.getPublic());
-
-        byte[] encrypted = ntru.processBlock(plainText, 0, plainText.length);
-
-        ntru.init(false, kp.getPrivate());
-
-        byte[] decrypted = ntru.processBlock(encrypted, 0, encrypted.length);
-
-        assertTrue(Arrays.areEqual(plainText, decrypted));
-    }
-
-    // tests a message that is too long
-    private void testTooLong(NTRUEngine ntru, AsymmetricCipherKeyPair kp, NTRUEncryptionKeyGenerationParameters params)
-    {
-        byte[] plainText = new byte[params.maxMsgLenBytes + 1];
-        try
-        {
-            System.arraycopy("secret encrypted text".getBytes(), 0, plainText, 0, 21);
-
-            ntru.init(true, kp.getPublic());
-
-            byte[] encrypted = ntru.processBlock(plainText, 0, plainText.length);
-
-            ntru.init(false, kp.getPrivate());
-
-            byte[] decrypted = ntru.processBlock(encrypted, 0, encrypted.length);
-
-            assertTrue(Arrays.areEqual(plainText, decrypted));
-            fail("An exception should have been thrown!");
-        }
-        catch (DataLengthException ex)
-        {
-            assertEquals("Message too long: " + plainText.length + ">" + params.maxMsgLenBytes, ex.getMessage());
-        }
-        catch (InvalidCipherTextException e)
-        {
-            e.printStackTrace();  //To change body of catch statement use File | Settings | File Templates.
-        }
-    }
-
-    // tests that altering the public key *AFTER* encryption causes the decrypted message to be rejected
-    private void testInvalidEncoding(NTRUEngine ntru, AsymmetricCipherKeyPair kp, NTRUEncryptionKeyGenerationParameters params)
-    {
-        try
-        {
-            byte[] plainText = "secret encrypted text".getBytes();
-            ntru.init(true, kp.getPublic());
-
-            byte[] encrypted = ntru.processBlock(plainText, 0, plainText.length);
-
-            NTRUEncryptionPrivateKeyParameters orig = (NTRUEncryptionPrivateKeyParameters)kp.getPrivate();
-            IntegerPolynomial h = (IntegerPolynomial)((NTRUEncryptionPublicKeyParameters)kp.getPublic()).h.clone();
-            h.coeffs[0] = (h.coeffs[0] + 111) % params.q;   // alter h
-            NTRUEncryptionPrivateKeyParameters privKey = new NTRUEncryptionPrivateKeyParameters(h, orig.t, orig.fp, params.getEncryptionParameters());
-
-            ntru.init(false, privKey);
-
-            ntru.processBlock(encrypted, 0, encrypted.length);
-
-            fail("An exception should have been thrown!");
-        }
-        catch (InvalidCipherTextException ex)
-        {
-            assertEquals("Invalid message encoding", ex.getMessage());
-        }
-    }
-
-    // encrypts and decrypts text using an encoded key pair (fastFp=false, simple ternary polynomials)
-    public void testEncodedKeysSlow()
-        throws IOException, InvalidCipherTextException
-    {
-        byte[] plainText = "secret encrypted text".getBytes();
-
-        // dense polynomials
-        NTRUEncryptionKeyGenerationParameters params = NTRUEncryptionKeyGenerationParameters.APR2011_743;
-        NTRUEngine ntru = new NTRUEngine();
-
-        byte[] privBytes = {2, -94, 95, 65, -107, 27, 98, 62, -15, -62, 21, -4, 119, -117, 7, 68, 100, 113, -36, -82, 87, -87, -82, 24, -45, -75, -74, -108, 105, 24, 123, 117, 124, 74, -27, 42, -106, -78, 114, 27, 18, 77, -41, 105, -113, 39, 49, 46, 109, -69, 61, 77, 49, 117, 14, -29, 42, 3, 120, -121, -120, -37, 95, 84, 60, -9, -31, -64, 31, 72, 115, -15, 21, -6, 27, -60, -73, -29, -33, -81, -43, 106, 65, 114, 102, -14, -115, -96, 9, 54, 23, -18, -24, -76, 84, -41, -79, 35, 88, 11, 41, 67, 44, -63, -28, 76, 84, -41, -103, 106, -22, 35, -2, -40, -48, -121, -128, 76, 63, 123, -11, 103, -35, -32, 21, -51, -99, -40, -103, -12, 64, -80, 57, -56, 1, -51, 103, 83, 50, 111, -87, -98, 7, -109, 25, -51, 23, -92};
-        byte[] pubBytes = {91, -66, -25, -81, -66, -33, 25, -31, 48, 23, -38, 20, -30, -120, -17, 1, 21, 51, -11, 102, -50, 62, 71, 79, 32, -49, -57, 105, 21, -34, -45, -67, 113, -46, -103, 57, 28, -54, -21, 94, -112, -63, 105, -100, -95, 21, -52, 50, 11, -22, -63, -35, -42, 50, 93, -40, 23, 0, 121, 23, -93, 111, -98, -14, 92, -24, -117, -8, -109, -118, -4, -107, -60, 100, -128, -47, -92, -117, -108, 39, -113, 43, 48, 68, 95, 123, -112, 41, -27, -99, 59, 33, -57, -120, -44, 72, -98, -105, -91, -52, -89, 107, 119, 87, -36, -102, -83, 67, -8, 30, -54, 74, 93, 119, -3, 126, 69, -104, -44, -24, 124, 108, -125, 73, 98, 121, -49, -37, -24, 87, -71, 91, 8, -31, -50, 95, 112, 27, 97, -93, 3, -73, -54, -16, -92, -108, -74, 88, -5, 23, 70, 69, -49, -46, -50, 65, 69, -54, -41, 109, 8, -80, -23, -84, 120, -77, 26, 99, -104, -33, 82, 91, 22, -17, 113, -29, 66, -7, -114, -101, -111, -47, -1, -3, -57, 62, 79, -70, -58, 45, 76, 28, -117, 59, -117, 113, 84, -55, 48, 119, 58, -105, -20, 80, 102, 14, -69, -69, 5, 11, -87, 107, 15, 105, -69, -27, -24, 47, -18, -54, -45, -67, 27, -52, -20, -94, 64, -26, -58, 98, 33, -61, 71, -101, 120, 28, 113, 72, 127, 50, 123, 36, -97, 78, 32, -74, 105, 62, 92, 84, -17, 21, -75, 24, -90, -78, -4, -121, 47, -82, 119, 27, -61, 17, -66, 43, 96, -49, -6, 66, -13, -75, -95, 64, -12, -39, 111, 46, -3, -123, 82, 12, -26, -30, -29, 71, -108, -79, -112, 13, 16, -70, 7, 100, 84, 89, -100, 114, 47, 56, 71, 83, 63, -61, -39, -53, -100, 23, -31, -52, -46, 36, -13, 62, 107, 28, -28, 92, 116, -59, 28, -111, -23, -44, 21, -2, 127, -112, 54, -126, 13, -104, 47, -43, -109, -19, 107, -94, -126, 50, 92, -69, 1, 115, -121, -52, -100, 25, 126, -7, 86, 77, 72, -2, -104, -42, 98, -16, 54, -67, 117, 14, -73, 4, 58, 121, 35, 1, 99, -127, -9, -60, 32, -37, -106, 6, -108, -13, -62, 23, -20, -9, 21, 15, 4, 126, -112, 123, 34, -67, -51, 43, -30, -75, 119, -112, -58, -55, -90, 2, -5, -46, -12, 119, 87, 24, -52, 2, -29, 113, 61, -82, -101, 57, -11, -107, -11, 67, -42, -43, -13, 112, -49, 82, 60, 13, -50, 108, 64, -64, 53, -107, -9, 102, -33, 75, -100, -115, 102, -113, -48, 19, -119, -72, -65, 22, -65, -93, 34, -71, 75, 101, 54, 126, 75, 34, -21, -53, -36, 127, -21, 70, 24, 89, -88, 63, -43, -4, 68, 97, -45, -101, -125, -38, 98, -118, -34, -63, 23, 78, 15, 17, 101, -107, 119, -41, 107, 117, 17, 108, 43, -93, -6, -23, -30, 49, -61, 27, 61, -125, -68, 51, 40, -106, -61, 51, 127, 2, 123, 7, -50, -115, -32, -95, -96, 67, 4, 5, 59, -45, 61, 95, 14, 2, -76, -121, 8, 125, 16, -126, 58, 118, -32, 19, -113, -113, 120, -101, 86, 76, -90, 50, -92, 51, -92, 1, 121, -74, -101, -33, 53, -53, -83, 46, 20, -87, -112, -61, -87, 106, -126, 64, 99, -60, 70, 120, 47, -53, 36, 20, -90, 110, 61, -93, 55, -10, 85, 45, 52, 79, 87, 100, -81, -85, 34, 55, -91, 27, 116, -18, -71, -11, 87, -11, 76, 48, 97, -78, 64, -100, -59, -12, 19, -90, 121, 48, -19, 64, 113, -70, -14, -70, 92, 124, 42, 95, 7, -115, 36, 127, 73, 33, 30, 121, 88, 16, -90, 99, 120, -68, 64, -125, -78, 76, 112, 68, 8, 105, 10, -47, -124, 39, -107, -101, 46, -61, 118, -74, 102, -62, -6, -128, 17, -45, 61, 76, 63, -10, -41, 50, -113, 75, -83, -59, -51, -23, -61, 47, 7, -80, 126, -2, 79, -53, 110, -93, -38, -91, -22, 20, -84, -113, -124, -73, 124, 0, 33, -58, 63, -26, 52, 7, 74, 65, 38, -33, 21, -9, -1, 120, -16, 47, -96, 59, -64, 74, 6, 48, -67, -32, -26, 35, 68, 47, 82, 36, 52, 41, 112, -28, -22, -51, -6, -49, 105, 16, -34, 99, -41, 75, 7, 79, -22, -125, -30, -126, 35, 119, -43, -30, 32, 8, 44, -42, -98, 78, -92, -95, -10, -94, -1, -91, -122, 77, 0, 40, -23, 36, 85, 123, -57, -74, -69, -90, 89, 111, -120, 22, 5, -48, 114, 59, 31, 31, -25, -3, 24, 110, -110, 73, -40, 92, -26, -12, 52, 83, -98, -119, -6, -117, -89, 95, 83, -25, 122, -26, 114, 81, 25, 110, 79, -49, -39, 10, -78, -65, 57, -90, -46, -126, 15, -124, -104, -89, -66, -87, 24, -45, 39, -34, -40, -13, 106, 12, -25, -116, -47, 79, -81, 64, -17, -31, -70, 87, 36, 46, 102, 107, 48, 88, 34, 46, 24, 63, -100, 106, 27, 58, -71, 38, 60, -66, 45, -89, 39, -60, -116, -14, -119, 118, 0, -24, -9, 38, -71, -79, 124, -119, -64, -9, 71, -56, -82, -73, -69, 127, -1, -20, 123, 32, -43, 49, 5, 49, 105, -5, -2, 5, -105, -111, 89, -30, -41, -49, 61, 80, 69, 44, -33, -116, -45, -96, 63, 28, -17, -106, -94, 90, -40, -88, 122, 116, 116, 113, -65, 104, 119, -3, 96, -45, 18, -120, -111, 83, 43, -5, 101, 71, 48, 104, -112, -95, -46, 53, -96, -93, -126, 96, 56, 104, -111, 114, -1, -44, -120, -112, -19, 100, 41, -122, 23, -78, 33, -35, 11, 57, -18, 106, -40, 74, 61, 66, 54, -77, 96, 70, 108, -128, 91, -97, -36, -23, -86, -91, 44, 58, 117, 2, 26, 44, 95, 79, -101, -81, -92, 110, -81, -12, -88, -21, -83, 60, 93, -121, -114, -48, -34, -119, -1, 127, -121, 54, -128, -106, -39, -108, 81, 17, -3, -13, -57, 74, 41, -122, -65, -107, -118, -65, -61, 103, -69, 19};
-
-        byte[] fullBytes = new byte[pubBytes.length + privBytes.length];
-
-        System.arraycopy(pubBytes, 0, fullBytes, 0, pubBytes.length);
-        System.arraycopy(privBytes, 0, fullBytes, pubBytes.length, privBytes.length);
-
-        NTRUEncryptionPrivateKeyParameters priv = new NTRUEncryptionPrivateKeyParameters(fullBytes, params.getEncryptionParameters());
-        NTRUEncryptionPublicKeyParameters pub = new NTRUEncryptionPublicKeyParameters(pubBytes, params.getEncryptionParameters());
-        AsymmetricCipherKeyPair kp = new AsymmetricCipherKeyPair(pub, priv);
-
-        ntru.init(true, kp.getPublic());
-
-        byte[] encrypted = ntru.processBlock(plainText, 0, plainText.length);
-
-        ntru.init(false, kp.getPrivate());
-
-        byte[] decrypted = ntru.processBlock(encrypted, 0, encrypted.length);
-        assertTrue(Arrays.areEqual(plainText, decrypted));
-
-        // sparse polynomials
-        params = NTRUEncryptionKeyGenerationParameters.EES1499EP1;
-        ntru = new NTRUEngine();
-        privBytes = new byte[] {116, 7, 118, 121, 6, 77, -36, 60, 65, 108, 10, -106, 12, 9, -22, -113, 122, -31, -31, 18, 120, 81, -33, 5, 122, -76, 109, -30, -101, -45, 21, 13, -11, -49, -111, 46, 91, 4, -28, -109, 121, -119, -121, -58, -113, -9, -10, -25, -53, 40, -86, -22, -50, 42, 52, 107, 119, 17, 33, 125, -26, 33, 55, 25, -77, -65, -106, 116, -67, 91, 105, -7, 42, -107, -54, 101, 12, -12, 57, -116, 45, -107, -17, 110, 35, -64, 19, -38, -122, 115, -93, 53, 69, 66, -106, 17, 20, -71, 121, 23, -21, -45, 108, 97, 23, -98, -12, -41, -31, -53, 30, -42, 15, 85, -21, -89, 118, 42, -117, -39, 69, 0, -63, 83, 48, -80, -14, -123, -4, -116, -90, -107, -89, 119, 29, -30, 69, 22, -84, 47, 117, -123, 102, -116, 35, 93, -13, 84, -9, -122, 58, 101, 93, -106, -119, -35, -75, 76, 27, -125, -22, 68, 101, 49, 103, -13, -98, 93, -56, -110, -19, -12, 74, 104, 7, 6, -11, 47, 57, 90, 75, -30, 47, 66, -58, 14, 14, 70, 11, -119, -36, -118, -55, -53, 101, -73, -77, 33, -29, 96, -86, 38, 47, 103, 19, -37, -17, -50, -82, -87, -119, 37, -54, 77, -69, -16, -48, -52, 110, -26, 111, 35, 26, -53, -10, 9, -108, -34, 102, 7, -18, -72, -26, 24, -50, -43, 92, 56, -94, 23, -36, 60, 28, -121, 27, 127, -93, -79, -45, -60, 105, -6, -88, 72, -41, 47, -51, 3, 91, 116, 75, 122, -94, -113, 28, -96, -62, -29, -74, -85, -93, 51, 58, 72, 44, 9, 18, -48, -24, 73, 122, 60, -23, 83, -110, -7, -111, -69, 106, 51, 118, -83, -18, 109, -32, 40, 22};
-
-        pubBytes = new byte[] {-62, 56, 59, -46, 30, -19, 22, -115, -20, 117, -14, 3, 2, -57, 85, -24, 27, 57, 49, -93, -52, 87, 49, 96, 15, 95, -95, -86, -61, 50, -18, 3, 109, -55, -110, -57, 82, 124, -5, -57, 68, -18, 126, 114, 6, -22, 8, 121, 125, 29, -16, 112, -81, 27, -7, 109, -44, -123, -15, -14, 74, -126, 95, -94, -91, 119, 80, -48, 41, 49, 6, 104, 93, -97, -108, -82, 93, 70, -127, -113, -22, -103, 35, -115, 20, -115, 63, 57, -84, -18, -107, 81, 44, -16, 83, 71, -27, -2, -125, 87, 26, 100, -116, 110, 94, -46, -56, -82, 119, -110, -127, -99, -8, -118, 90, 64, -29, 102, 99, 92, 86, -117, 26, -89, 32, 17, 55, -65, -10, -5, -74, 19, 13, 113, -15, -103, 17, 10, -127, -95, -79, 19, 11, -24, 59, 28, -70, -55, -69, -105, -20, -117, 66, 4, 77, 116, -124, -62, 19, 109, 49, -120, 10, -15, 108, 84, 126, 122, -46, -37, 114, -78, -72, 34, -12, 25, -104, -3, 114, -94, 16, 31, 31, -124, -109, -64, 57, -47, -113, -26, 97, -58, 112, -40, 49, 80, -54, -115, -98, -60, -123, 91, 14, 75, -86, 77, -93, 68, 112, 82, 79, 28, -25, 49, -27, -112, 103, 60, -128, 95, -63, 2, -51, 2, -107, 80, 113, 18, 123, 24, 70, 77, -56, -48, 33, 89, 88, 29, 112, -102, -15, 52, -96, 17, -9, 6, -11, -119, 29, -107, -84, -19, 84, 124, 19, 90, -60, -41, 123, -81, 96, -119, 17, -61, 62, 55, 95, -73, -13, -60, 56, 77, 24, -39, -107, -78, 47, -91, 88, 90, 34, 112, -80, 83, -58, 127, 76, -97, -40, 78, -20, -1, -62, 19, 6, -43, -46, -36, -53, -22, -28, -119, 8, 19, 79, -9, -54, -126, -3, -20, -110, -82, 51, 3, 1, -123, -41, -40, -11, 91, -52, 48, 104, -11, -2, 49, 45, 52, -33, 109, -44, -30, -44, -83, -108, -10, 77, 106, 82, 3, 14, -48, -18, -79, -64, -34, -63, -18, 122, 33, 25, 44, 82, -112, 111, 68, 97, -58, -38, 25, 62, 78, 97, -36, 57, -19, 122, -18, -74, 67, -127, -24, 32, -45, 67, -106, 90, 0, 1, 91, 30, -80, 95, 9, 78, -4, -14, 16, 111, -56, -102, -90, 52, -1, 116, 19, -127, -23, -87, 103, -94, -111, 118, 53, -69, 77, 17, -3, 31, -53, -21, -78, 124, -88, 52, 117, 34, -52, -77, -107, -38, -102, 23, 73, -76, -88, 95, 64, -85, 12, 36, -86, 86, -17, 77, 121, 90, 24, -49, -107, 33, -116, 65, 13, 91, 118, -107, -21, 65, -59, 18, 125, 61, -65, -68, -19, 23, 88, 60, -6, 78, -8, 69, -62, -118, -93, 97, -64, -67, 28, 28, -87, -97, 72, -125, -119, 4, -43, 7, 22, -15, 52, 52, -82, -5, -51, 99, 20, -59, -2, -54, -67, 40, -128, -20, -37, 50, 123, 32, 8, -39, -105, 93, 73, 77, 84, 43, 89, 88, -6, 7, -108, 81, 27, 1, 50, 16, -101, 67, 95, 119, 105, 70, 99, -127, 22, 127, -33, -19, -113, -55, -100, 122, -86, 98, 53, 27, -95, 4, -121, -96, 87, 67, -98, -37, -10, 92, 29, -3, -115, -23, 37, 8, -30, 99, -117, 62, 101, 83, 49, 60, -83, -47, -33, 41, -118, 76, -7, 111, -15, 123, -59, 53, 2, -20, -57, 24, 57, 62, 84, -26, -11, 93, -118, 54, -13, 56, 77, -66, 18, -62, -76, 80, 98, 26, 120, -93, 55, 103, -1, 78, -92, 120, -23, -60, -75, 11, 53, -62, -94, -80, 120, 113, 33, -24, -64, -5, 23, 120, -14, 61, 26, -1, 56, 79, 34, 116, -16, -95, -71, 40, -89, -50, 71, -117, -109, 2, -2, -34, 94, -78, -88, -27, 70, 94, -86, 123, -49, 107, -65, -67, 84, 90, 123, -61, -2, 43, -119, -93, 75, -4, -81, 98, -36, 125, -23, -37, 81, 104, 90, -63, -52, 88, -96, -44, 25, 3, -37, -123, -48, 113, -76, -94, -109, -115, 37, -39, 104, -124, 82, -73, 100, 48, -54, -40, -65, 81, 16, -85, -41, 60, 42, 117, 65, 77, 14, -8, -56, 52, -118, -109, 125, 13, 64, -20, 125, -37, -74, -28, 118, 112, -126, 18, -101, 11, 75, 30, -4, -121, -13, -65, -13, -122, -53, -52, 20, -2, 67, 18, -106, 67, 83, -111, 15, 106, 10, 113, 53, -112, -3, 118, 8, -56, 40, 53, 23, -123, 96, 87, -118, -97, -116, -47, 85, -73, -85, -82, 124, -55, 55, 61, 46, 12, -6, 34, 22, -22, 3, 115, -49, 102, 23, 46, 39, 0, 118, 3, -45, 48, -73, -38, 29, -36, 11, -127, -86, 30, 29, -2, -108, -114, 64, 110, 86, -46, -91, -64, 95, -40, -65, 49, -79, -126, -37, -103, -71, 53, -85, 45, -51, 33, -28, -126, 36, -77, -120, 55, -54, 72, -21, 58, -87, -73, 18, -12, 20, -100, 30, 118, -83, -22, -90, 71, -64, 108, 101, -46, 36, 105, -46, -91, 60, -113, 72, 100, 82, -90, 106, -127, 65, -94, 17, 77, -10, -112, 46, 118, 72, -84, 57, -86, -114, 88, 91, 79, 30, 107, -35, 61, 81, 71, 40, -29, -6, -107, 61, -62, -6, 65, -68, 118, 61, 110, -115, -119, -73, 104, 59, -66, -89, -127, -8, -67, 122, -38, 79, -13, 93, 1, -32, -47, -3, 62, 88, -112, 105, 73, 96, 73, -104, -126, -69, 21, -22, 16, -85, 116, 9, 82, 54, -15, -55, -67, 68, -23, 16, -89, 48, -17, -107, 60, -43, -34, 66, -114, 63, -3, -26, 68, 68, -86, 120, -111, 99, 61, 101, 27, 93, 31, 90, -33, -94, 29, -89, 41, -80, 26, -23, -80, 27, 107, 69, -45, -123, 62, 63, 80, 1, -28, 52, -8, 35, -86, -127, 76, 102, 83, -104, -79, -98, 77, -28, 118, 18, -15, -98, -39, 2, -58, 95, 64, 105, -82, -7, 96, 110, 104, 127, 126, -124, 26, 36, 33, -42, 59, 82, 127, 42, -24, -61, -50, -18, -87, 22, -32, -125, -70, 103, -121, -112, -94, 58, -95, -97, 53, 95, -61, -83, 42, 37, 80, 51, -118, 125, 15, 67, 41, -97, 41, -121, 29, -88, 100, -113, 39, 101, 47, 91, -36, 48, -56, -13, 12, 37, 0, 81, 3, -40, 8, 36, -65, -11, -32, 108, 62, 79, 70, 91, -83, 2, -47, 0, 91, 10, 87, -19, -40, 96, 106, 41, 120, -53, 40, -114, 90, 64, 59, -115, 39, 2, 53, -49, -72, -114, 94, 5, 49, 74, 13, 50, -14, 76, -123, -11, -81, 100, 120, 16, -41, -72, -118, 28, 41, 98, 122, 27, 18, -108, -43, 51, -71, 93, -13, -42, -64, -118, -106, 45, 108, 72, -128, 58, -123, -29, -114, 15, 52, -72, 108, -62, 75, -15, 105, -89, 25, 37, 13, -21, -109, 68, 5, -89, 69, 10, -46, 18, -57, 77, -103, -74, 57, -43, -110, 1, -80, 82, 5, -9, -49, -53, 83, 4, 44, 64, -117, -67, -11, 1, -65, -81, 34, -23, -71, 14, 105, -93, 2, -120, 90, 92, -6, -128, -16, -51, 27, 123, 71, -117, -72, -81, 26, 28, 5, -117, -30, 22, -72, -76, -32, -14, 82, 90, 69, 74, -94, -72, -30, -17, 12, -37, -3, -80, 72, 2, -40, 41, 0, -53, 48, -37, -117, -128, -120, -80, 28, 49, -52, 114, -119, 92, -42, -105, 125, -95, 78, 76, 123, -56, 32, -66, 69, -58, 57, -77, -100, -70, 125, 53, -115, 8, 116, 88, -34, 86, -75, 55, 64, 79, -113, -124, -91, 50, -82, -119, 50, 11, 87, -14, -25, 15, -1, -49, -127, -5, -50, 72, -29, -78, 101, -119, -21, -15, 97, -63, 57, -123, -94, -24, -8, 104, 86, 79, 49, 102, -8, -76, 8, 69, 99, -64, -108, 70, 36, 71, -127, 56, 39, 78, 109, 42, -42, -2, 126, 17, -88, -65, -23, -64, 78, 87, 7, 6, -82, -98, 41, -46, -10, -25, 90, -73, 24, 127, -27, 118, -9, 81, -3, 115, -4, 47, 86, -30, -9, -50, 32, 86, 114, 58, -5, 78, 74, 36, 29, -126, 116, 117, -114, -92, -121, -36, -86, -18, 55, 49, 112, 43, 111, -99, -116, 70, 60, -63, 87, -4, -35, 15, 28, -27, -65, 66, 115, -33, 112, 94, 74, -22, 104, -56, -27, 39, -8, -53, -120, 8, -109, 73, -68, 67, 40, -59, 59, 121, -76, -41, -80, -54, -88, -120, -121, -118, -58, 74, -120, 82, -88, -113, 30, -8, 54, -126, -106, 37, -43, -74, -56, 40, -76, 93, 91, 28, -59, -30, -2, 107, 6, -89, -69, -121, -125, -109, 5, -94, -7, -2, -5, -67, 54, -90, 39, 5, -80, 93, -99, 82, -100, -128, -8, -39, -109, 66, -11, 99, -41, 18, -32, -122, 69, 6, -95, -21, 9, 19, -117, -34, -42, 11, 20, 84, 89, 91, -61, -13, -7, 55, 90, -15, 62, 59, -4, 125, -127, -24, -124, -99, -63, -23, 52, 111, -52, -60, -113, -65, -26, 127, 57, 21, 102, 101, -77, 66, -116, 117, 80, 7, 1, -96, -29, -99, 75, -73, 44, -99, 61, -73, 15, -18, 89, 95, 104, -12, 94, 33, 13, -49, 118, -84, -122, -2, -121, 62, -32, -80, 11, -10, 102, -67, 20, -3, 25, -6, 51, -17, -123, -76, 103, 3, 127, -107, -5, 122, 65, 22, 113, 120, 6, -19, -110, 86, 55, -88, -124, 0, -54, 17, 112, 15, 105, -28, 111, -93, 85, -59, -88, 28, 123, 55, 117, 10, 76, 54, -98, 116, 40, -65, -53, -80, 46, 66, -8, -114, 102, 66, 67, -117, 46, 21, -116, -38, 58, -105, 101, 37, -16, 5, 55, -33, -87, 72, 122, -114, -91, 41, -114, 77, 50, 109, 35, -61, 9, -55, -118, 126, -35, -108, 5, 62, 125, -109, -115, -55, 32, -71, 69, 110, 87, -82, 119, 26, 103, -77, -38, -13, 113, 74, 69, 116, 94, -21, 5, 35, 73, -80, -87, 80, 13, 108, 1, 82, -56, -35, -21, -78, -98, 121, 112, -117, 72, 47, 76, -97, -84, -110, -35, -19, -120, -13, 127, 5, 56, 72, -22, 110, -8, -71, 0, -57, -125, -101, 60, -64, -32, 1, 126, -109, 9, 84, 117, 62, -68, -106, 28, -118, -52, -81, 112, 11, 55, 68, -86, -65, 123, 83, 55, -72, 110, 63, -90, 31, 11, 90, -60, 20, 14, -36, 5, -92, 11, -100, 64, -57, -72, -105, 7, 103, 125, 99, -88, 32, -5, 41, -115, -11, 89, 81, 77, -33, -7, -123, -17, 109, 59, 40, -12, -61, 98, -91, 19, -36, 108, 118, -124, -82, -40, -124, -66, 19, 127, -73, -39, 99, 43, -16, -44, -83, -77, -34, 68, -118, -71, -116, 114, 120, -34, -105, -32, -46, 102, 73, -79, 7, 42, 35, -66, 125, 34, 113, 66, 78, 71, 6, 44, -17, 4, -80, 38, -59, 12, -8, -78, 103, 8, 80, 18, -74, 20, 3, 56, -20, 106, -1, -12, 83, 4, 68, -119, 84, -87, 97, -53, 102, 119, 34, -85, 22, -26, 55, -107, 96, -70, 77, -68, -96, -15, -22, -77, -55, 5, 103, -42, -87, 122, -80, -103, -37, -120, -56, -16, -51, -7, -19, -104, 120, 9, 54, -85, 48, -76, -38, 58, -68, 116, -20, -44, 22, -32, 75, -46, -41, 13, -100, 16, -59, -93, -115, 54, 22, -110, -46, -119, 44, -98, -48, 4, -58, -115, -57, 103, -56, 36, -63, 104, -114, -125, 92, 65, 117, -21, -59, -31, 56, -98, -126, 56, 47, -116, 100, 122, -98, 4, 26, -29, -127, -113, 73, 48, 106, 125, -69, -127, 62, 56, -79, 76, 84, -46, -31, -17, 94, -98, 62, 63, 118, -24, 63, 123, -93, -46, 103, 117, -120, -35, 19, 25, 15, -110, -125, 12, -75, -50, 103, 49, 47, 98, 92, 10, -88, 54, -53, 19, 25, -90, 93, -49, 64, 126, -106, -30, -52, 58, 37, 68, -18, -60, 15, -27, 93, -124, 88, 110, -80, -106, 88, 55, 108, -58, -43, -70, 76, 85, 98, 27, -66, 18, 75, 69, 114, 90, -26, -10, -12, -126, 84, -109, 108, 15, -115, 90, 11, -127, 63, -7, 47, 92, -72, 38, -58, -35, 18, 25, 12, -103, 0};
-
-        fullBytes = new byte[pubBytes.length + privBytes.length];
-
-        System.arraycopy(pubBytes, 0, fullBytes, 0, pubBytes.length);
-        System.arraycopy(privBytes, 0, fullBytes, pubBytes.length, privBytes.length);
-
-        priv = new NTRUEncryptionPrivateKeyParameters(fullBytes, params.getEncryptionParameters());
-        pub = new NTRUEncryptionPublicKeyParameters(pubBytes, params.getEncryptionParameters());
-        kp = new AsymmetricCipherKeyPair(pub, priv);
-        ntru.init(true, kp.getPublic());
-
-        encrypted = ntru.processBlock(plainText, 0, plainText.length);
-
-        ntru.init(false, kp.getPrivate());
-
-        decrypted = ntru.processBlock(encrypted, 0, encrypted.length);
-
-        assertTrue(Arrays.areEqual(plainText, decrypted));
-    }
-
-    // encrypts and decrypts text using an encoded key pair (fastFp=true)
-    public void testEncodedKeysFast()
-        throws IOException, InvalidCipherTextException
-    {
-        byte[] plainText = "secret encrypted text".getBytes();
-
-        NTRUEncryptionKeyGenerationParameters params = NTRUEncryptionKeyGenerationParameters.APR2011_743_FAST;
-        NTRUEngine ntru = new NTRUEngine();
-        byte[] privBytes = {10, 16, 2, 30, -40, -63, -109, -77, -72, -122, 66, 23, -30, -44, -82, 0, 95, 64, 68, 48, -62, -14, 26, -19, -72, -25, 72, 123, 98, 84, -83, 0, 7, 40, 65, 35, 68, 113, 12, -112, 32, -123, 58, 85, -30, -109, -74, 0, 34, -8, -126, 57, 30, 98, -107, -45, -88, 102, 68, 42, -30, -108, -89, 0, 38, -40, -61, 37, 82, 113, -115, 123, -100, 5, 46, 125, -23, 78, -111, -76, 36, -90, 67, -31, 10, 2, 96, -127, 21, 50, -79, 13, -125, -124, 38, 55, -67, -95, 81, -107, 12, 117, -86, 99, -127, 11};
-        byte[] pubBytes = {108, -76, -104, -75, -87, -65, -18, -5, 45, -57, -100, -83, 51, 99, 94, 15, -73, 89, -100, 40, -114, 91, -107, 104, 127, 22, 13, 5, -16, 69, -104, -126, -44, 119, 47, -48, 75, 66, 83, -37, -66, -84, 73, 52, 23, -27, 53, 63, 56, 14, -2, 43, -59, -85, -80, 46, 38, -126, 75, -8, -63, 88, 104, 13, 72, -25, -10, -58, -51, 117, -84, 115, -24, -53, 83, -103, -97, 46, 90, -82, -61, 113, -49, -24, -72, 24, -124, -42, -36, 7, 41, 8, 14, -71, -75, -84, -24, -39, 56, 67, 88, 67, 66, -13, 70, -119, -64, 74, -100, -58, 35, 105, -20, 93, 80, -116, -55, 37, -52, 64, 0, -36, -71, 8, 77, -10, -41, -22, -73, 4, -115, -74, -74, -73, 23, -10, -26, 48, 125, -114, -32, -116, 74, 19, -104, 59, 43, 4, 97, -84, 112, 45, 16, 3, -110, -13, 119, -6, 29, -80, 109, 82, -31, 82, 30, 76, -111, -122, -50, -69, -41, -123, 107, 78, -35, 24, -121, -87, -108, 13, 70, 32, -74, 112, 104, -40, -61, 86, -125, 60, -94, -5, -18, 55, 54, -128, 83, -88, 71, 71, -66, 29, -113, 120, 30, 16, -38, 37, 96, -90, 38, -85, 88, 59, 15, -69, 6, -8, 1, 1, 71, 12, 60, -26, -110, 97, 77, 33, 58, 63, 104, 108, 83, 72, -21, -99, 115, -125, -16, 12, 99, 68, 39, -97, -6, 17, 26, -59, 123, -110, -37, -71, 47, 50, 5, 110, -34, 89, -74, 20, 79, -108, -7, 42, 106, -112, 44, 107, 106, -50, 55, 127, -124, 53, 123, -119, -46, -114, -52, -85, 75, 34, -39, -125, 58, -5, -31, -81, -37, -94, -123, 113, 11, -104, -124, 96, -103, 9, 108, 115, 97, -6, 98, -43, 26, -89, -23, 83, 60, 34, -86, -54, 107, 78, -48, 118, -31, -19, 29, -106, 108, 117, 83, 119, 51, -45, 115, 108, -13, -89, -29, 29, -120, 108, 20, 22, -3, 22, 78, -109, 95, 3, -68, -10, -53, -117, -96, -49, 9, 7, 38, 116, 33, -65, 31, 9, -5, -73, 127, 52, 113, 87, -39, 119, -96, 74, -105, 75, -89, 63, 69, -109, -127, 92, -54, 17, -98, -23, -69, 123, -125, 23, -93, 44, -11, -25, -101, 120, -29, 113, -33, 0, -117, -100, -114, 22, 41, -46, 29, -109, 107, 37, -94, 125, 46, 17, 16, -65, -14, 105, -118, 51, -21, 121, -5, 56, 29, 30, -69, -38, -10, -77, -74, 6, -105, 83, 110, 23, 114, -11, -123, -14, 30, -11, -9, 84, -90, -20, -29, 72, -85, 97, -74, -59, -112, -15, -51, -105, 117, 123, -17, -64, -127, 127, -33, -102, 88, 77, 122, -127, -15, 121, -125, -32, 53, 113, 45, -22, 84, -87, 20, 36, 65, 83, -84, -66, -22, 4, 15, -108, -92, 109, -128, -48, 4, -27, -13, 25, 51, -10, 34, 87, 88, 38, -87, 89, -64, -62, 20, 78, 35, -26, -2, 55, 3, -72, -64, 30, 28, -105, 6, -37, -38, -8, 26, -118, 105, -37, -30, 85, -66, 105, -46, -37, -11, -72, 71, 43, -65, -44, 17, -79, 98, 79, -77, -111, 95, 74, 101, -40, -106, 14, -108, -112, 86, 108, 49, 72, -38, -103, -31, 65, -119, 8, 78, -89, 100, -28, 116, 94, 15, -18, 108, 101, 85, 8, -6, 111, -82, -49, -66, -89, 28, -84, -85, -119, 111, 45, 83, -60, -40, -45, -101, -105, -35, 123, -1, 13, -112, 79, -80, -85, -109, -71, 69, 104, 95, -93, 121, -17, 83, 117, -73, -63, -65, -107, -72, 118, -102, -56, 38, 79, 121, -25, -86, -81, -38, 8, 122, 97, 37, 82, -40, 53, 11, 124, -94, -76, -107, -125, -9, -119, 63, 52, -34, -72, -21, 59, 3, -100, -127, 47, -102, 19, -37, -45, -114, -65, 39, -106, 6, -127, -110, -38, 96, -38, -51, 110, -3, 28, 8, 102, -102, 96, -127, 109, -56, -53, -13, 59, -98, 92, 80, 1, 55, -91, -122, -105, 28, 69, -85, 109, -38, 105, 87, -5, 3, -102, 62, -92, 60, 43, -20, -7, -23, -84, 106, 121, -48, 123, -112, 56, -17, -52, 14, -123, -122, 64, 14, -23, -71, 60, 70, -121, 6, 37, -15, 77, 96, 104, -34, 58, -125, -61, 1, -26, 118, -78, -35, -1, 0, 5, 33, -98, -86, -127, 25, 56, -91, 82, -33, 60, -64, -86, 27, 31, -80, -79, 118, -12, -18, 40, -72, 32, 119, -28, -62, 100, -121, -71, -79, -9, 38, -37, 25, 65, -46, 8, -112, 37, 9, -56, 123, -40, -44, -90, -21, -54, -2, -7, 107, -93, 24, -126, 69, 42, -111, -84, 57, 69, -119, 21, 60, 57, -122, 111, -99, 49, -46, -119, 100, 98, 24, -62, 112, 122, 46, 18, -35, -67, 89, 104, 82, 12, 125, 57, -70, -112, -109, 96, 51, -68, 1, -101, -59, -92, 54, 85, -41, 17, 31, 94, 75, -128, 53, 84, 0, -83, -94, -123, 49, -30, -24, 18, 46, 48, -33, 120, 66, -69, 70, 23, -124, -117, 81, 96, 46, 47, -33, 83, -13, -14, -94, 49, 66, -46, 84, -27, -77, 6, 0, -75, -18, 86, -119, -88, 82, -50, 55, -20, 63, 55, -57, 22, -108, -103, -17, -22, 64, 65, 90, -34, -96, -117, 51, 119, -103, -35, 95, -15, -118, 2, -31, 31, -9, -58, 84, -75, 80, 39, -101, -56, 16, -75, 59, 48, -63, -24, -95, 119, 73, -110, -115, 49, -18, 54, -124, 112, -61, -40, -105, -118, -66, 15, -107, 75, 82, -70, -87, -11, -11, 48, 41, 119, -42, -34, -33, 57, 23, -14, -45, -125, -108, -75, 3, 44, 44, 58, 126, -126, -20, -123, 58, 114, 79, -102, -115, 115, 12, 66, 108, 84, 43, -46, -80, -41, -70, 111, -114, 123, 21, 1, 34, -72, 23, 105, -52, -39, -54, -119, 45, 77, -16, -66, -105, -11, 91, -46, 77, -104, -93, 52, -3, 17, 55, -10, 67, -33, 43, 75, -103, 106, 7, -35, -65, -21, 68, 118, -38, 59, -115, 31};
-
-        byte[] fullBytes = new byte[pubBytes.length + privBytes.length];
-
-        System.arraycopy(pubBytes, 0, fullBytes, 0, pubBytes.length);
-        System.arraycopy(privBytes, 0, fullBytes, pubBytes.length, privBytes.length);
-
-        NTRUEncryptionPrivateKeyParameters priv = new NTRUEncryptionPrivateKeyParameters(fullBytes, params.getEncryptionParameters());
-        NTRUEncryptionPublicKeyParameters pub = new NTRUEncryptionPublicKeyParameters(pubBytes, params.getEncryptionParameters());
-        AsymmetricCipherKeyPair kp = new AsymmetricCipherKeyPair(pub, priv);
-
-        ntru.init(true, kp.getPublic());
-
-        byte[] encrypted = ntru.processBlock(plainText, 0, plainText.length);
-
-        assertEquals(encrypted.length, ntru.getOutputBlockSize());
-
-        ntru.init(false, kp.getPrivate());
-
-        byte[] decrypted = ntru.processBlock(encrypted, 0, encrypted.length);
-
-        assertTrue(Arrays.areEqual(plainText, decrypted));
-    }
-
-    private class VisibleNTRUEngine
-        extends NTRUEngine
-    {
-        public IntegerPolynomial encrypt(IntegerPolynomial m, TernaryPolynomial r, IntegerPolynomial pubKey)
-        {
-            return super.encrypt(m, r, pubKey);
-        }
-
-        public IntegerPolynomial decrypt(IntegerPolynomial e, Polynomial priv_t, IntegerPolynomial priv_fp)
-        {
-            return super.decrypt(e, priv_t, priv_fp);
-        }
-    }
-}
\ No newline at end of file
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/test/NTRUEncryptionParametersTest.java b/bcprov/src/main/java/org/bouncycastle/pqc/crypto/test/NTRUEncryptionParametersTest.java
deleted file mode 100644
index 54f53ad..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/test/NTRUEncryptionParametersTest.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package org.bouncycastle.pqc.crypto.test;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-
-import junit.framework.TestCase;
-import org.bouncycastle.pqc.crypto.ntru.NTRUEncryptionKeyGenerationParameters;
-
-public class NTRUEncryptionParametersTest
-    extends TestCase
-{
-    public void testLoadSave()
-        throws IOException
-    {
-        NTRUEncryptionKeyGenerationParameters params = NTRUEncryptionKeyGenerationParameters.EES1499EP1;
-        ByteArrayOutputStream os = new ByteArrayOutputStream();
-        params.writeTo(os);
-        ByteArrayInputStream is = new ByteArrayInputStream(os.toByteArray());
-        assertEquals(params, new NTRUEncryptionKeyGenerationParameters(is));
-    }
-
-    public void testEqualsHashCode()
-        throws IOException
-    {
-        ByteArrayOutputStream os = new ByteArrayOutputStream();
-        NTRUEncryptionKeyGenerationParameters.EES1499EP1.writeTo(os);
-        ByteArrayInputStream is = new ByteArrayInputStream(os.toByteArray());
-        NTRUEncryptionKeyGenerationParameters params = new NTRUEncryptionKeyGenerationParameters(is);
-
-        assertEquals(params, NTRUEncryptionKeyGenerationParameters.EES1499EP1);
-        assertEquals(params.hashCode(), NTRUEncryptionKeyGenerationParameters.EES1499EP1.hashCode());
-
-        params.N += 1;
-        assertFalse(params.equals(NTRUEncryptionKeyGenerationParameters.EES1499EP1));
-        assertFalse(NTRUEncryptionKeyGenerationParameters.EES1499EP1.equals(params));
-        assertFalse(params.hashCode() == NTRUEncryptionKeyGenerationParameters.EES1499EP1.hashCode());
-    }
-
-    public void testClone()
-    {
-        NTRUEncryptionKeyGenerationParameters params = NTRUEncryptionKeyGenerationParameters.APR2011_439;
-        assertEquals(params, params.clone());
-
-        params = NTRUEncryptionKeyGenerationParameters.APR2011_439_FAST;
-        assertEquals(params, params.clone());
-    }
-}
\ No newline at end of file
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/test/NTRUSignatureKeyTest.java b/bcprov/src/main/java/org/bouncycastle/pqc/crypto/test/NTRUSignatureKeyTest.java
deleted file mode 100644
index 509839a..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/test/NTRUSignatureKeyTest.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package org.bouncycastle.pqc.crypto.test;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-
-import junit.framework.TestCase;
-import org.bouncycastle.crypto.AsymmetricCipherKeyPair;
-import org.bouncycastle.pqc.crypto.ntru.NTRUSigner;
-import org.bouncycastle.pqc.crypto.ntru.NTRUSigningKeyGenerationParameters;
-import org.bouncycastle.pqc.crypto.ntru.NTRUSigningKeyPairGenerator;
-import org.bouncycastle.pqc.crypto.ntru.NTRUSigningPrivateKeyParameters;
-import org.bouncycastle.pqc.crypto.ntru.NTRUSigningPublicKeyParameters;
-
-public class NTRUSignatureKeyTest
-    extends TestCase
-{
-    public void testEncode()
-        throws IOException
-    {
-        for (NTRUSigningKeyGenerationParameters params : new NTRUSigningKeyGenerationParameters[]{NTRUSigningKeyGenerationParameters.TEST157, NTRUSigningKeyGenerationParameters.TEST157_PROD})
-        {
-            testEncode(params);
-        }
-    }
-
-    private void testEncode(NTRUSigningKeyGenerationParameters params)
-        throws IOException
-    {
-        NTRUSigner ntru = new NTRUSigner(params.getSigningParameters());
-        NTRUSigningKeyPairGenerator kGen = new NTRUSigningKeyPairGenerator();
-
-        kGen.init(params);
-
-        AsymmetricCipherKeyPair kp = kGen.generateKeyPair();
-
-        NTRUSigningPrivateKeyParameters kPriv = (NTRUSigningPrivateKeyParameters)kp.getPrivate();
-        NTRUSigningPublicKeyParameters kPub = (NTRUSigningPublicKeyParameters)kp.getPublic();
-
-        // encode to byte[] and reconstruct
-        byte[] priv = kPriv.getEncoded();
-        byte[] pub = kPub.getEncoded();
-        AsymmetricCipherKeyPair kp2 = new AsymmetricCipherKeyPair(new NTRUSigningPublicKeyParameters(pub, params.getSigningParameters()), new NTRUSigningPrivateKeyParameters(priv, params));
-        assertEquals(kPub, kp2.getPublic());
-        assertEquals(kPriv, kp2.getPrivate());
-
-        // encode to OutputStream and reconstruct
-        ByteArrayOutputStream bos1 = new ByteArrayOutputStream();
-        ByteArrayOutputStream bos2 = new ByteArrayOutputStream();
-        kPriv.writeTo(bos1);
-        kPub.writeTo(bos2);
-        ByteArrayInputStream bis1 = new ByteArrayInputStream(bos1.toByteArray());
-        ByteArrayInputStream bis2 = new ByteArrayInputStream(bos2.toByteArray());
-        AsymmetricCipherKeyPair kp3 = new AsymmetricCipherKeyPair(new NTRUSigningPublicKeyParameters(bis2, params.getSigningParameters()), new NTRUSigningPrivateKeyParameters(bis1, params));
-        assertEquals(kPub, kp3.getPublic());
-        assertEquals(kPriv, kp3.getPrivate());
-    }
-}
\ No newline at end of file
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/test/NTRUSignatureParametersTest.java b/bcprov/src/main/java/org/bouncycastle/pqc/crypto/test/NTRUSignatureParametersTest.java
deleted file mode 100644
index 4c5751e..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/test/NTRUSignatureParametersTest.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package org.bouncycastle.pqc.crypto.test;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-
-import junit.framework.TestCase;
-import org.bouncycastle.pqc.crypto.ntru.NTRUSigningKeyGenerationParameters;
-
-public class NTRUSignatureParametersTest
-    extends TestCase
-{
-    public void testLoadSave()
-        throws IOException
-    {
-        for (NTRUSigningKeyGenerationParameters params : new NTRUSigningKeyGenerationParameters[]{NTRUSigningKeyGenerationParameters.TEST157, NTRUSigningKeyGenerationParameters.TEST157_PROD, NTRUSigningKeyGenerationParameters.APR2011_743, NTRUSigningKeyGenerationParameters.APR2011_743_PROD})
-        {
-            testLoadSave(params);
-        }
-    }
-
-    private void testLoadSave(NTRUSigningKeyGenerationParameters params)
-        throws IOException
-    {
-        ByteArrayOutputStream os = new ByteArrayOutputStream();
-        params.writeTo(os);
-        ByteArrayInputStream is = new ByteArrayInputStream(os.toByteArray());
-        assertEquals(params, new NTRUSigningKeyGenerationParameters(is));
-    }
-
-    public void testEqualsHashCode()
-        throws IOException
-    {
-        for (NTRUSigningKeyGenerationParameters params : new NTRUSigningKeyGenerationParameters[]{NTRUSigningKeyGenerationParameters.TEST157, NTRUSigningKeyGenerationParameters.TEST157_PROD, NTRUSigningKeyGenerationParameters.APR2011_743, NTRUSigningKeyGenerationParameters.APR2011_743_PROD})
-        {
-            testEqualsHashCode(params);
-        }
-    }
-
-    private void testEqualsHashCode(NTRUSigningKeyGenerationParameters params)
-        throws IOException
-    {
-        ByteArrayOutputStream os = new ByteArrayOutputStream();
-        params.writeTo(os);
-        ByteArrayInputStream is = new ByteArrayInputStream(os.toByteArray());
-        NTRUSigningKeyGenerationParameters params2 = new NTRUSigningKeyGenerationParameters(is);
-
-        assertEquals(params, params2);
-        assertEquals(params.hashCode(), params2.hashCode());
-
-        params.N += 1;
-        assertFalse(params.equals(params2));
-        assertFalse(params.equals(params2));
-        assertFalse(params.hashCode() == params2.hashCode());
-    }
-
-    public void testClone()
-    {
-        for (NTRUSigningKeyGenerationParameters params : new NTRUSigningKeyGenerationParameters[]{NTRUSigningKeyGenerationParameters.TEST157, NTRUSigningKeyGenerationParameters.TEST157_PROD, NTRUSigningKeyGenerationParameters.APR2011_743, NTRUSigningKeyGenerationParameters.APR2011_743_PROD})
-        {
-            assertEquals(params, params.clone());
-        }
-    }
-}
\ No newline at end of file
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/test/NTRUSignerTest.java b/bcprov/src/main/java/org/bouncycastle/pqc/crypto/test/NTRUSignerTest.java
deleted file mode 100644
index 3a765af..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/test/NTRUSignerTest.java
+++ /dev/null
@@ -1,317 +0,0 @@
-package org.bouncycastle.pqc.crypto.test;
-
-
-import junit.framework.TestCase;
-
-/**
- * @deprecated algorithm no longer safe.
- */
-public class NTRUSignerTest
-    extends TestCase
-{
-    public void testStub()
-    {
-
-    }
-    /*
-    public void testCreateBasis()
-    {
-        for (NTRUSigningKeyGenerationParameters params : new NTRUSigningKeyGenerationParameters[]{NTRUSigningKeyGenerationParameters.TEST157.clone(), NTRUSigningKeyGenerationParameters.TEST157_PROD.clone()})
-        {
-            testCreateBasis(params);
-        }
-    }
-
-    private void testCreateBasis(NTRUSigningKeyGenerationParameters params)
-    {
-        NTRUSigningKeyPairGenerator ntru = new NTRUSigningKeyPairGenerator();
-
-        ntru.init(params);
-
-        NTRUSigningKeyPairGenerator.FGBasis basis = (NTRUSigningKeyPairGenerator.FGBasis)ntru.generateBoundedBasis();
-        assertTrue(equalsQ(basis.f, basis.fPrime, basis.F, basis.G, params.q, params.N));
-
-        // test KeyGenAlg.FLOAT (default=RESULTANT)
-        params.keyGenAlg = NTRUSigningKeyGenerationParameters.KEY_GEN_ALG_FLOAT;
-        ntru.init(params);
-        basis = (NTRUSigningKeyPairGenerator.FGBasis)ntru.generateBoundedBasis();
-        assertTrue(equalsQ(basis.f, basis.fPrime, basis.F, basis.G, params.q, params.N));
-    }
-
-    // verifies that f*G-g*F=q
-    private boolean equalsQ(Polynomial f, Polynomial g, IntegerPolynomial F, IntegerPolynomial G, int q, int N)
-    {
-        IntegerPolynomial x = f.mult(G);
-        x.sub(g.mult(F));
-        boolean equalsQ = true;
-        for (int i = 1; i < x.coeffs.length; i++)
-        {
-            equalsQ &= x.coeffs[i] == 0;
-        }
-        equalsQ &= x.coeffs[0] == q;
-        return equalsQ;
-    }
-
-    /**
-     * a test for the one-method-call variants: sign(byte, SignatureKeyPair) and verify(byte[], byte[], SignatureKeyPair)
-     *
-    public void testSignVerify157()
-        throws IOException
-    {
-        for (NTRUSigningKeyGenerationParameters params : new NTRUSigningKeyGenerationParameters[]{NTRUSigningKeyGenerationParameters.TEST157.clone(), NTRUSigningKeyGenerationParameters.TEST157_PROD.clone(), NTRUSigningKeyGenerationParameters.APR2011_439.clone(), NTRUSigningKeyGenerationParameters.APR2011_439_PROD.clone(), NTRUSigningKeyGenerationParameters.APR2011_743.clone(), NTRUSigningKeyGenerationParameters.APR2011_743_PROD.clone()})
-        {
-            testSignVerify(params);
-        }
-    }
-
-    public void testSignVerify439()
-        throws IOException
-    {
-        for (NTRUSigningKeyGenerationParameters params : new NTRUSigningKeyGenerationParameters[]{NTRUSigningKeyGenerationParameters.APR2011_439.clone(), NTRUSigningKeyGenerationParameters.APR2011_439_PROD.clone()})
-        {
-            testSignVerify(params);
-        }
-    }
-//
-//    public void testSignVerify743()
-//        throws IOException
-//    {
-//        for (NTRUSigningKeyGenerationParameters params :  new NTRUSigningKeyGenerationParameters[]{NTRUSigningKeyGenerationParameters.APR2011_743.clone(), NTRUSigningKeyGenerationParameters.APR2011_743_PROD.clone()})
-//        {
-//            testSignVerify(params);
-//        }
-//    }
-
-    private void testSignVerify(NTRUSigningKeyGenerationParameters params)
-        throws IOException
-    {
-        NTRUSigner ntru = new NTRUSigner(params.getSigningParameters());
-        NTRUSigningKeyPairGenerator kGen = new NTRUSigningKeyPairGenerator();
-
-        kGen.init(params);
-
-        AsymmetricCipherKeyPair kp = kGen.generateKeyPair();
-
-        Random rng = new Random();
-        byte[] msg = new byte[10 + rng.nextInt(1000)];
-        rng.nextBytes(msg);
-
-        // sign and verify
-        ntru.init(true, kp.getPrivate());
-
-        ntru.update(msg, 0, msg.length);
-
-        byte[] s = ntru.generateSignature();
-
-        ntru.init(false, kp.getPublic());
-
-        ntru.update(msg, 0, msg.length);
-
-        boolean valid = ntru.verifySignature(s);
-
-        assertTrue(valid);
-
-        // altering the signature should make it invalid
-        s[rng.nextInt(params.N)] += 1;
-        ntru.init(false, kp.getPublic());
-
-        ntru.update(msg, 0, msg.length);
-
-        valid = ntru.verifySignature(s);
-        assertFalse(valid);
-
-        // test that a random signature fails
-        rng.nextBytes(s);
-
-        ntru.init(false, kp.getPublic());
-
-        ntru.update(msg, 0, msg.length);
-
-        valid = ntru.verifySignature(s);
-        assertFalse(valid);
-
-        // encode, decode keypair, test
-        NTRUSigningPrivateKeyParameters priv = new NTRUSigningPrivateKeyParameters(((NTRUSigningPrivateKeyParameters)kp.getPrivate()).getEncoded(), params);
-        NTRUSigningPublicKeyParameters pub = new NTRUSigningPublicKeyParameters(((NTRUSigningPublicKeyParameters)kp.getPublic()).getEncoded(), params.getSigningParameters());
-        kp = new AsymmetricCipherKeyPair(pub, priv);
-
-        ntru.init(true, kp.getPrivate());
-        ntru.update(msg, 0, msg.length);
-
-        s = ntru.generateSignature();
-
-        ntru.init(false, kp.getPublic());
-        ntru.update(msg, 0, msg.length);
-
-        valid = ntru.verifySignature(s);
-        assertTrue(valid);
-
-        // altering the signature should make it invalid
-        s[rng.nextInt(s.length)] += 1;
-        ntru.init(false, kp.getPublic());
-        ntru.update(msg, 0, msg.length);
-        valid = ntru.verifySignature(s);
-        assertFalse(valid);
-
-        // sparse/dense
-        params.sparse = !params.sparse;
-
-        ntru.init(true, kp.getPrivate());
-        ntru.update(msg, 0, msg.length);
-
-        s = ntru.generateSignature();
-
-        ntru.init(false, kp.getPublic());
-        ntru.update(msg, 0, msg.length);
-        valid = ntru.verifySignature(s);
-        assertTrue(valid);
-
-        s[rng.nextInt(s.length)] += 1;
-        ntru.init(false, kp.getPublic());
-        ntru.update(msg, 0, msg.length);
-        valid = ntru.verifySignature(s);
-        assertFalse(valid);
-        params.sparse = !params.sparse;
-
-        // decrease NormBound to force multiple signing attempts
-        NTRUSigningKeyGenerationParameters params2 = params.clone();
-        params2.normBoundSq *= 4.0 / 9;
-        params2.signFailTolerance = 10000;
-        ntru = new NTRUSigner(params2.getSigningParameters());
-
-        ntru.init(true, kp.getPrivate());
-        ntru.update(msg, 0, msg.length);
-
-        s = ntru.generateSignature();
-
-        ntru.init(false, kp.getPublic());
-        ntru.update(msg, 0, msg.length);
-        valid = ntru.verifySignature(s);
-
-        assertTrue(valid);
-
-        // test KeyGenAlg.FLOAT (default=RESULTANT)
-        params2 = params.clone();
-        params.keyGenAlg = NTRUSigningKeyGenerationParameters.KEY_GEN_ALG_FLOAT;
-        ntru = new NTRUSigner(params.getSigningParameters());
-
-        kGen.init(params);
-
-        kp = kGen.generateKeyPair();
-        ntru.init(true, kp.getPrivate());
-        ntru.update(msg, 0, msg.length);
-
-        s = ntru.generateSignature();
-        ntru.init(false, kp.getPublic());
-        ntru.update(msg, 0, msg.length);
-        valid = ntru.verifySignature(s);
-        assertTrue(valid);
-        s[rng.nextInt(s.length)] += 1;
-        ntru.init(false, kp.getPublic());
-        ntru.update(msg, 0, msg.length);
-        valid = ntru.verifySignature(s);
-        assertFalse(valid);
-    }
-
-    /**
-     * test for the initSign/update/sign and initVerify/update/verify variant
-     *
-    public void testInitUpdateSign()
-    {
-        for (NTRUSigningKeyGenerationParameters params : new NTRUSigningKeyGenerationParameters[]{NTRUSigningKeyGenerationParameters.TEST157.clone(), NTRUSigningKeyGenerationParameters.TEST157_PROD.clone()})
-        {
-            testInitUpdateSign(params);
-        }
-    }
-
-    private void testInitUpdateSign(NTRUSigningKeyGenerationParameters params)
-    {
-        NTRUSigner ntru = new NTRUSigner(params.getSigningParameters());
-        NTRUSigningKeyPairGenerator kGen = new NTRUSigningKeyPairGenerator();
-
-        kGen.init(params);
-
-        AsymmetricCipherKeyPair kp = kGen.generateKeyPair();
-
-        Random rng = new Random();
-        byte[] msg = new byte[10 + rng.nextInt(1000)];
-        rng.nextBytes(msg);
-
-        // sign and verify a message in two pieces each
-        ntru.init(true, kp.getPrivate());
-        int splitIdx = rng.nextInt(msg.length);
-        ntru.update(msg[0]);   // first byte
-        ntru.update(msg, 1, splitIdx - 1);   // part 1 of msg
-        ntru.update(msg, splitIdx, msg.length - splitIdx);
-        byte[] s = ntru.generateSignature();   // part 2 of msg
-        ntru.init(false, kp.getPublic());
-        splitIdx = rng.nextInt(msg.length);
-        ntru.update(msg, 0, splitIdx);   // part 1 of msg
-        ntru.update(msg, splitIdx, msg.length - splitIdx);   // part 2 of msg
-        boolean valid = ntru.verifySignature(s);
-        assertTrue(valid);
-        // verify the same signature with the one-step method
-        ntru.init(false, (NTRUSigningPublicKeyParameters)kp.getPublic());
-        ntru.update(msg, 0, msg.length);   // part 1 of msg
-        valid = ntru.verifySignature(s);
-        assertTrue(valid);
-
-        // sign using the one-step method and verify using the multi-step method
-        ntru.init(true, kp.getPrivate());
-        ntru.update(msg, 0, msg.length);
-        s = ntru.generateSignature();
-        ntru.init(false, (NTRUSigningPublicKeyParameters)kp.getPublic());
-        splitIdx = rng.nextInt(msg.length);
-        ntru.update(msg, 0, splitIdx);   // part 1 of msg
-        ntru.update(msg, splitIdx, msg.length - splitIdx);   // part 2 of msg
-        valid = ntru.verifySignature(s);
-        assertTrue(valid);
-    }
-
-    public void testCreateMsgRep()
-    {
-        for (NTRUSigningKeyGenerationParameters params : new NTRUSigningKeyGenerationParameters[]{NTRUSigningKeyGenerationParameters.TEST157.clone(), NTRUSigningKeyGenerationParameters.TEST157_PROD.clone()})
-        {
-            testCreateMsgRep(params);
-        }
-    }
-
-    private void testCreateMsgRep(NTRUSigningKeyGenerationParameters params)
-    {
-        VisibleNTRUSigner ntru = new VisibleNTRUSigner(params.getSigningParameters());
-        byte[] msgHash = "adfsadfsdfs23234234".getBytes();
-
-        // verify that the message representative is reproducible
-        IntegerPolynomial i1 = ntru.createMsgRep(msgHash, 1);
-        IntegerPolynomial i2 = ntru.createMsgRep(msgHash, 1);
-        assertTrue(Arrays.areEqual(i1.coeffs, i2.coeffs));
-        i1 = ntru.createMsgRep(msgHash, 5);
-        i2 = ntru.createMsgRep(msgHash, 5);
-        assertTrue(Arrays.areEqual(i1.coeffs, i2.coeffs));
-
-        i1 = ntru.createMsgRep(msgHash, 2);
-        i2 = ntru.createMsgRep(msgHash, 3);
-        assertFalse(Arrays.areEqual(i1.coeffs, i2.coeffs));
-    }
-
-    private class VisibleNTRUSigner
-        extends NTRUSigner
-    {
-
-        /**
-         * Constructs a new instance with a set of signature parameters.
-         *
-         * @param params signature parameters
-         *
-        public VisibleNTRUSigner(NTRUSigningParameters params)
-        {
-            super(params);
-        }
-
-        public IntegerPolynomial createMsgRep(byte[] hash, int i)
-        {
-            return super.createMsgRep(hash, i);
-        }
-    }
-    */
-}
\ No newline at end of file
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/test/NTRUSigningParametersTest.java b/bcprov/src/main/java/org/bouncycastle/pqc/crypto/test/NTRUSigningParametersTest.java
deleted file mode 100644
index 7cf7de8..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/test/NTRUSigningParametersTest.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package org.bouncycastle.pqc.crypto.test;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-
-import junit.framework.TestCase;
-import org.bouncycastle.pqc.crypto.ntru.NTRUSigningKeyGenerationParameters;
-
-public class NTRUSigningParametersTest
-    extends TestCase
-{
-
-    public void testLoadSave()
-        throws IOException
-    {
-        for (NTRUSigningKeyGenerationParameters params : new NTRUSigningKeyGenerationParameters[]{NTRUSigningKeyGenerationParameters.TEST157, NTRUSigningKeyGenerationParameters.TEST157_PROD})
-        {
-            testLoadSave(params);
-        }
-    }
-
-    private void testLoadSave(NTRUSigningKeyGenerationParameters params)
-        throws IOException
-    {
-        ByteArrayOutputStream os = new ByteArrayOutputStream();
-        params.writeTo(os);
-        ByteArrayInputStream is = new ByteArrayInputStream(os.toByteArray());
-        assertEquals(params, new NTRUSigningKeyGenerationParameters(is));
-    }
-
-    public void testEqualsHashCode()
-        throws IOException
-    {
-        for (NTRUSigningKeyGenerationParameters params : new NTRUSigningKeyGenerationParameters[]{NTRUSigningKeyGenerationParameters.TEST157, NTRUSigningKeyGenerationParameters.TEST157_PROD})
-        {
-            testEqualsHashCode(params);
-        }
-    }
-
-    private void testEqualsHashCode(NTRUSigningKeyGenerationParameters params)
-        throws IOException
-    {
-        ByteArrayOutputStream os = new ByteArrayOutputStream();
-        params.writeTo(os);
-        ByteArrayInputStream is = new ByteArrayInputStream(os.toByteArray());
-        NTRUSigningKeyGenerationParameters params2 = new NTRUSigningKeyGenerationParameters(is);
-
-        assertEquals(params, params2);
-        assertEquals(params.hashCode(), params2.hashCode());
-
-        params.N += 1;
-        assertFalse(params.equals(params2));
-        assertFalse(params.equals(params2));
-        assertFalse(params.hashCode() == params2.hashCode());
-    }
-
-    public void testClone()
-    {
-        for (NTRUSigningKeyGenerationParameters params : new NTRUSigningKeyGenerationParameters[]{NTRUSigningKeyGenerationParameters.TEST157, NTRUSigningKeyGenerationParameters.TEST157_PROD})
-        {
-            assertEquals(params, params.clone());
-        }
-    }
-}
\ No newline at end of file
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/test/RainbowSignerTest.java b/bcprov/src/main/java/org/bouncycastle/pqc/crypto/test/RainbowSignerTest.java
deleted file mode 100644
index ae6774b..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/test/RainbowSignerTest.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package org.bouncycastle.pqc.crypto.test;
-
-
-import java.math.BigInteger;
-import java.security.SecureRandom;
-
-import org.bouncycastle.crypto.AsymmetricCipherKeyPair;
-import org.bouncycastle.crypto.digests.SHA224Digest;
-import org.bouncycastle.crypto.params.ParametersWithRandom;
-import org.bouncycastle.pqc.crypto.DigestingMessageSigner;
-import org.bouncycastle.pqc.crypto.rainbow.RainbowKeyGenerationParameters;
-import org.bouncycastle.pqc.crypto.rainbow.RainbowKeyPairGenerator;
-import org.bouncycastle.pqc.crypto.rainbow.RainbowParameters;
-import org.bouncycastle.pqc.crypto.rainbow.RainbowSigner;
-import org.bouncycastle.util.BigIntegers;
-import org.bouncycastle.util.encoders.Hex;
-import org.bouncycastle.util.test.FixedSecureRandom;
-import org.bouncycastle.util.test.SimpleTest;
-
-
-public class RainbowSignerTest
-extends SimpleTest
-{
-    byte[] keyData = Hex.decode("b5014e4b60ef2ba8b6211b4062ba3224e0427dd3");
-
-    SecureRandom    keyRandom = new FixedSecureRandom(new byte[][] { keyData, keyData });
-
-
-    public String getName()
-    {
-        return "Rainbow";
-    }
-
-    public void performTest()
-    {
-        RainbowParameters params = new RainbowParameters();
-
-        RainbowKeyPairGenerator rainbowKeyGen = new RainbowKeyPairGenerator();
-        RainbowKeyGenerationParameters genParam = new RainbowKeyGenerationParameters(keyRandom, params);
-
-        rainbowKeyGen.init(genParam);
-
-        AsymmetricCipherKeyPair pair = rainbowKeyGen.generateKeyPair();
-
-        ParametersWithRandom param = new ParametersWithRandom(pair.getPrivate(), keyRandom);
-
-        DigestingMessageSigner rainbowSigner = new DigestingMessageSigner(new RainbowSigner() , new SHA224Digest());
-        rainbowSigner.init(true, param);
-
-        byte[] message = BigIntegers.asUnsignedByteArray(new BigInteger("968236873715988614170569073515315707566766479517"));
-        rainbowSigner.update(message, 0, message.length);
-        byte[] sig = rainbowSigner.generateSignature();
-
-        rainbowSigner.init(false, pair.getPublic());
-        rainbowSigner.update(message, 0, message.length);
-        if (!rainbowSigner.verify(sig))
-        {
-            fail("verification fails");
-        }
-    }
-
-    public static void main(
-            String[]    args)
-    {
-        runTest(new RainbowSignerTest());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/test/RegressionTest.java b/bcprov/src/main/java/org/bouncycastle/pqc/crypto/test/RegressionTest.java
deleted file mode 100644
index bc5a979..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/crypto/test/RegressionTest.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package org.bouncycastle.pqc.crypto.test;
-
-import org.bouncycastle.util.test.Test;
-import org.bouncycastle.util.test.TestResult;
-
-public class RegressionTest
-{
-    public static Test[]    tests = {
-        new GMSSSignerTest(),
-        new McElieceFujisakiCipherTest(),
-        new McElieceKobaraImaiCipherTest(),
-        new McEliecePKCSCipherTest(),
-        new McEliecePointchevalCipherTest(),
-        new RainbowSignerTest()
-    };
-
-    public static void main(
-        String[]    args)
-    {
-        for (int i = 0; i != tests.length; i++)
-        {
-            TestResult  result = tests[i].perform();
-            
-            if (result.getException() != null)
-            {
-                result.getException().printStackTrace();
-            }
-            
-            System.out.println(result);
-        }
-    }
-}
-
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/provider/BouncyCastlePQCProvider.java b/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/provider/BouncyCastlePQCProvider.java
deleted file mode 100644
index 0ef3601..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/provider/BouncyCastlePQCProvider.java
+++ /dev/null
@@ -1,157 +0,0 @@
-package org.bouncycastle.pqc.jcajce.provider;
-
-import java.io.IOException;
-import java.security.AccessController;
-import java.security.PrivateKey;
-import java.security.PrivilegedAction;
-import java.security.Provider;
-import java.security.PublicKey;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
-import org.bouncycastle.jcajce.provider.config.ProviderConfiguration;
-import org.bouncycastle.jcajce.provider.util.AlgorithmProvider;
-import org.bouncycastle.jcajce.provider.util.AsymmetricKeyInfoConverter;
-
-public class BouncyCastlePQCProvider
-    extends Provider
-    implements ConfigurableProvider
-{
-    private static String info = "BouncyCastle Post-Quantum Security Provider v1.52";
-
-    public static String PROVIDER_NAME = "BCPQC";
-
-    public static final ProviderConfiguration CONFIGURATION = null;
-
-
-    private static final Map keyInfoConverters = new HashMap();
-
-    /*
-    * Configurable symmetric ciphers
-    */
-    private static final String ALGORITHM_PACKAGE = "org.bouncycastle.pqc.jcajce.provider.";
-    private static final String[] ALGORITHMS =
-        {
-            "Rainbow", "McEliece"
-        };
-
-    /**
-     * Construct a new provider.  This should only be required when
-     * using runtime registration of the provider using the
-     * <code>Security.addProvider()</code> mechanism.
-     */
-    public BouncyCastlePQCProvider()
-    {
-        super(PROVIDER_NAME, 1.52, info);
-
-        AccessController.doPrivileged(new PrivilegedAction()
-        {
-            public Object run()
-            {
-                setup();
-                return null;
-            }
-        });
-    }
-
-    private void setup()
-    {
-        loadAlgorithms(ALGORITHM_PACKAGE, ALGORITHMS);
-    }
-
-    private void loadAlgorithms(String packageName, String[] names)
-    {
-        for (int i = 0; i != names.length; i++)
-        {
-            Class clazz = null;
-            try
-            {
-                ClassLoader loader = this.getClass().getClassLoader();
-
-                if (loader != null)
-                {
-                    clazz = loader.loadClass(packageName + names[i] + "$Mappings");
-                }
-                else
-                {
-                    clazz = Class.forName(packageName + names[i] + "$Mappings");
-                }
-            }
-            catch (ClassNotFoundException e)
-            {
-                // ignore
-            }
-
-            if (clazz != null)
-            {
-                try
-                {
-                    ((AlgorithmProvider)clazz.newInstance()).configure(this);
-                }
-                catch (Exception e)
-                {   // this should never ever happen!!
-                    throw new InternalError("cannot create instance of "
-                        + packageName + names[i] + "$Mappings : " + e);
-                }
-            }
-        }
-    }
-
-    public void setParameter(String parameterName, Object parameter)
-    {
-        synchronized (CONFIGURATION)
-        {
-            //((BouncyCastleProviderConfiguration)CONFIGURATION).setParameter(parameterName, parameter);
-        }
-    }
-
-    public boolean hasAlgorithm(String type, String name)
-    {
-        return containsKey(type + "." + name) || containsKey("Alg.Alias." + type + "." + name);
-    }
-
-    public void addAlgorithm(String key, String value)
-    {
-        if (containsKey(key))
-        {
-            throw new IllegalStateException("duplicate provider key (" + key + ") found");
-        }
-
-        put(key, value);
-    }
-
-    public void addKeyInfoConverter(ASN1ObjectIdentifier oid, AsymmetricKeyInfoConverter keyInfoConverter)
-    {
-        keyInfoConverters.put(oid, keyInfoConverter);
-    }
-
-    public static PublicKey getPublicKey(SubjectPublicKeyInfo publicKeyInfo)
-        throws IOException
-    {
-        AsymmetricKeyInfoConverter converter = (AsymmetricKeyInfoConverter)keyInfoConverters.get(publicKeyInfo.getAlgorithm().getAlgorithm());
-
-        if (converter == null)
-        {
-            return null;
-        }
-
-        return converter.generatePublic(publicKeyInfo);
-    }
-
-    public static PrivateKey getPrivateKey(PrivateKeyInfo privateKeyInfo)
-        throws IOException
-    {
-        AsymmetricKeyInfoConverter converter = (AsymmetricKeyInfoConverter)keyInfoConverters.get(privateKeyInfo.getPrivateKeyAlgorithm().getAlgorithm());
-
-        if (converter == null)
-        {
-            return null;
-        }
-
-        return converter.generatePrivate(privateKeyInfo);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/provider/McEliece.java b/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/provider/McEliece.java
deleted file mode 100644
index cb5f648..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/provider/McEliece.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package org.bouncycastle.pqc.jcajce.provider;
-
-import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
-import org.bouncycastle.jcajce.provider.util.AsymmetricAlgorithmProvider;
-import org.bouncycastle.pqc.asn1.PQCObjectIdentifiers;
-
-public class McEliece
-{
-    private static final String PREFIX = "org.bouncycastle.pqc.jcajce.provider" + ".mceliece.";
-
-    public static class Mappings
-        extends AsymmetricAlgorithmProvider
-    {
-        public Mappings()
-        {
-        }
-
-        public void configure(ConfigurableProvider provider)
-        {
-            // McElieceKobaraImai
-            provider.addAlgorithm("KeyPairGenerator.McElieceKobaraImai", PREFIX + "McElieceKeyPairGeneratorSpi$McElieceCCA2");
-            // McEliecePointcheval
-            provider.addAlgorithm("KeyPairGenerator.McEliecePointcheval", PREFIX + "McElieceKeyPairGeneratorSpi$McElieceCCA2");
-            // McElieceFujisaki
-            provider.addAlgorithm("KeyPairGenerator.McElieceFujisaki", PREFIX + "McElieceKeyPairGeneratorSpi$McElieceCCA2");
-            // McEliecePKCS
-            provider.addAlgorithm("KeyPairGenerator.McEliecePKCS", PREFIX + "McElieceKeyPairGeneratorSpi$McEliece");
-
-            provider.addAlgorithm("KeyPairGenerator." + PQCObjectIdentifiers.mcEliece, PREFIX + "McElieceKeyPairGeneratorSpi$McEliece");
-            provider.addAlgorithm("KeyPairGenerator." + PQCObjectIdentifiers.mcElieceCca2, PREFIX + "McElieceKeyPairGeneratorSpi$McElieceCCA2");
-
-            provider.addAlgorithm("Cipher.McEliecePointcheval", PREFIX + "McEliecePointchevalCipherSpi$McEliecePointcheval");
-            provider.addAlgorithm("Cipher.McEliecePointchevalWithSHA1", PREFIX + "McEliecePointchevalCipherSpi$McEliecePointcheval");
-            provider.addAlgorithm("Cipher.McEliecePointchevalWithSHA224", PREFIX + "McEliecePointchevalCipherSpi$McEliecePointcheval224");
-            provider.addAlgorithm("Cipher.McEliecePointchevalWithSHA256", PREFIX + "McEliecePointchevalCipherSpi$McEliecePointcheval256");
-            provider.addAlgorithm("Cipher.McEliecePointchevalWithSHA384", PREFIX + "McEliecePointchevalCipherSpi$McEliecePointcheval384");
-            provider.addAlgorithm("Cipher.McEliecePointchevalWithSHA512", PREFIX + "McEliecePointchevalCipherSpi$McEliecePointcheval512");
-
-            provider.addAlgorithm("Cipher.McEliecePKCS", PREFIX + "McEliecePKCSCipherSpi$McEliecePKCS");
-            provider.addAlgorithm("Cipher.McEliecePKCSWithSHA1", PREFIX + "McEliecePKCSCipherSpi$McEliecePKCS");
-            provider.addAlgorithm("Cipher.McEliecePKCSWithSHA224", PREFIX + "McEliecePKCSCipherSpi$McEliecePKCS224");
-            provider.addAlgorithm("Cipher.McEliecePKCSWithSHA256", PREFIX + "McEliecePKCSCipherSpi$McEliecePKCS256");
-            provider.addAlgorithm("Cipher.McEliecePKCSWithSHA384", PREFIX + "McEliecePKCSCipherSpi$McEliecePKCS384");
-            provider.addAlgorithm("Cipher.McEliecePKCSWithSHA512", PREFIX + "McEliecePKCSCipherSpi$McEliecePKCS512");
-
-            provider.addAlgorithm("Cipher.McElieceKobaraImai", PREFIX + "McElieceKobaraImaiCipherSpi$McElieceKobaraImai");
-            provider.addAlgorithm("Cipher.McElieceKobaraImaiWithSHA1", PREFIX + "McElieceKobaraImaiCipherSpi$McElieceKobaraImai");
-            provider.addAlgorithm("Cipher.McElieceKobaraImaiWithSHA224", PREFIX + "McElieceKobaraImaiCipherSpi$McElieceKobaraImai224");
-            provider.addAlgorithm("Cipher.McElieceKobaraImaiWithSHA256", PREFIX + "McElieceKobaraImaiCipherSpi$McElieceKobaraImai256");
-            provider.addAlgorithm("Cipher.McElieceKobaraImaiWithSHA384", PREFIX + "McElieceKobaraImaiCipherSpi$McElieceKobaraImai384");
-            provider.addAlgorithm("Cipher.McElieceKobaraImaiWithSHA512", PREFIX + "McElieceKobaraImaiCipherSpi$McElieceKobaraImai512");
-
-            provider.addAlgorithm("Cipher.McElieceFujisaki", PREFIX + "McElieceFujisakiCipherSpi$McElieceFujisaki");
-            provider.addAlgorithm("Cipher.McElieceFujisakiWithSHA1", PREFIX + "McElieceFujisakiCipherSpi$McElieceFujisaki");
-            provider.addAlgorithm("Cipher.McElieceFujisakiWithSHA224", PREFIX + "McElieceFujisakiCipherSpi$McElieceFujisaki224");
-            provider.addAlgorithm("Cipher.McElieceFujisakiWithSHA256", PREFIX + "McElieceFujisakiCipherSpi$McElieceFujisaki256");
-            provider.addAlgorithm("Cipher.McElieceFujisakiWithSHA384", PREFIX + "McElieceFujisakiCipherSpi$McElieceFujisaki384");
-            provider.addAlgorithm("Cipher.McElieceFujisakiWithSHA512", PREFIX + "McElieceFujisakiCipherSpi$McElieceFujisaki512");
-
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/provider/Rainbow.java b/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/provider/Rainbow.java
deleted file mode 100644
index 2a66028..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/provider/Rainbow.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package org.bouncycastle.pqc.jcajce.provider;
-
-import org.bouncycastle.jcajce.provider.config.ConfigurableProvider;
-import org.bouncycastle.jcajce.provider.util.AsymmetricAlgorithmProvider;
-import org.bouncycastle.jcajce.provider.util.AsymmetricKeyInfoConverter;
-import org.bouncycastle.pqc.asn1.PQCObjectIdentifiers;
-import org.bouncycastle.pqc.jcajce.provider.rainbow.RainbowKeyFactorySpi;
-
-public class Rainbow
-{
-    private static final String PREFIX = "org.bouncycastle.pqc.jcajce.provider" + ".rainbow.";
-
-    public static class Mappings
-        extends AsymmetricAlgorithmProvider
-    {
-        public Mappings()
-        {
-        }
-
-        public void configure(ConfigurableProvider provider)
-        {
-            provider.addAlgorithm("KeyFactory.Rainbow", PREFIX + "RainbowKeyFactorySpi");
-            provider.addAlgorithm("KeyPairGenerator.Rainbow", PREFIX + "RainbowKeyPairGeneratorSpi");
-
-            addSignatureAlgorithm(provider, "SHA224", "Rainbow", PREFIX + "SignatureSpi$withSha224", PQCObjectIdentifiers.rainbowWithSha224);
-            addSignatureAlgorithm(provider, "SHA256", "Rainbow", PREFIX + "SignatureSpi$withSha256", PQCObjectIdentifiers.rainbowWithSha256);
-            addSignatureAlgorithm(provider, "SHA384", "Rainbow", PREFIX + "SignatureSpi$withSha384", PQCObjectIdentifiers.rainbowWithSha384);
-            addSignatureAlgorithm(provider, "SHA512", "Rainbow", PREFIX + "SignatureSpi$withSha512", PQCObjectIdentifiers.rainbowWithSha512);
-
-            AsymmetricKeyInfoConverter keyFact = new RainbowKeyFactorySpi();
-
-            registerOid(provider, PQCObjectIdentifiers.rainbow, "Rainbow", keyFact);
-            registerOidAlgorithmParameters(provider, PQCObjectIdentifiers.rainbow, "Rainbow");
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/provider/gmss/BCGMSSPublicKey.java b/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/provider/gmss/BCGMSSPublicKey.java
deleted file mode 100644
index eacefab..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/provider/gmss/BCGMSSPublicKey.java
+++ /dev/null
@@ -1,131 +0,0 @@
-package org.bouncycastle.pqc.jcajce.provider.gmss;
-
-import java.security.PublicKey;
-
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.pqc.asn1.GMSSPublicKey;
-import org.bouncycastle.pqc.asn1.PQCObjectIdentifiers;
-import org.bouncycastle.pqc.asn1.ParSet;
-import org.bouncycastle.pqc.crypto.gmss.GMSSParameters;
-import org.bouncycastle.pqc.crypto.gmss.GMSSPublicKeyParameters;
-import org.bouncycastle.pqc.jcajce.provider.util.KeyUtil;
-import org.bouncycastle.pqc.jcajce.spec.GMSSPublicKeySpec;
-import org.bouncycastle.util.encoders.Hex;
-
-/**
- * This class implements the GMSS public key and is usually initiated by the <a
- * href="GMSSKeyPairGenerator">GMSSKeyPairGenerator</a>.
- *
- * @see org.bouncycastle.pqc.crypto.gmss.GMSSKeyPairGenerator
- * @see org.bouncycastle.pqc.jcajce.spec.GMSSPublicKeySpec
- */
-public class BCGMSSPublicKey
-    implements CipherParameters, PublicKey
-{
-
-    /**
-     *
-     */
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * The GMSS public key
-     */
-    private byte[] publicKeyBytes;
-
-    /**
-     * The GMSSParameterSet
-     */
-    private GMSSParameters gmssParameterSet;
-
-
-    private GMSSParameters gmssParams;
-
-    /**
-     * The constructor
-     *
-     * @param pub              a raw GMSS public key
-     * @param gmssParameterSet an instance of GMSS Parameterset
-     * @see org.bouncycastle.pqc.crypto.gmss.GMSSKeyPairGenerator
-     */
-    public BCGMSSPublicKey(byte[] pub, GMSSParameters gmssParameterSet)
-    {
-        this.gmssParameterSet = gmssParameterSet;
-        this.publicKeyBytes = pub;
-    }
-
-    /**
-     * The constructor
-     *
-     * @param keySpec a GMSS key specification
-     */
-    protected BCGMSSPublicKey(GMSSPublicKeySpec keySpec)
-    {
-        this(keySpec.getPublicKey(), keySpec.getParameters());
-    }
-
-    public BCGMSSPublicKey(
-        GMSSPublicKeyParameters params)
-    {
-        this(params.getPublicKey(), params.getParameters());
-    }
-
-    /**
-     * Returns the name of the algorithm
-     *
-     * @return "GMSS"
-     */
-    public String getAlgorithm()
-    {
-        return "GMSS";
-    }
-
-    /**
-     * @return The GMSS public key byte array
-     */
-    public byte[] getPublicKeyBytes()
-    {
-        return publicKeyBytes;
-    }
-
-    /**
-     * @return The GMSS Parameterset
-     */
-    public GMSSParameters getParameterSet()
-    {
-        return gmssParameterSet;
-    }
-
-    /**
-     * Returns a human readable form of the GMSS public key
-     *
-     * @return A human readable form of the GMSS public key
-     */
-    public String toString()
-    {
-        String out = "GMSS public key : "
-            + new String(Hex.encode(publicKeyBytes)) + "\n"
-            + "Height of Trees: \n";
-
-        for (int i = 0; i < gmssParameterSet.getHeightOfTrees().length; i++)
-        {
-            out = out + "Layer " + i + " : "
-                + gmssParameterSet.getHeightOfTrees()[i]
-                + " WinternitzParameter: "
-                + gmssParameterSet.getWinternitzParameter()[i] + " K: "
-                + gmssParameterSet.getK()[i] + "\n";
-        }
-        return out;
-    }
-
-    public byte[] getEncoded()
-    {
-        return KeyUtil.getEncodedSubjectPublicKeyInfo(new AlgorithmIdentifier(PQCObjectIdentifiers.gmss, new ParSet(gmssParameterSet.getNumOfLayers(), gmssParameterSet.getHeightOfTrees(), gmssParameterSet.getWinternitzParameter(), gmssParameterSet.getK()).toASN1Primitive()), new GMSSPublicKey(publicKeyBytes));
-    }
-
-    public String getFormat()
-    {
-        return "X.509";
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/provider/mceliece/BCMcElieceCCA2PrivateKey.java b/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/provider/mceliece/BCMcElieceCCA2PrivateKey.java
deleted file mode 100644
index 92cdbca..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/provider/mceliece/BCMcElieceCCA2PrivateKey.java
+++ /dev/null
@@ -1,306 +0,0 @@
-package org.bouncycastle.pqc.jcajce.provider.mceliece;
-
-import java.io.IOException;
-import java.security.PrivateKey;
-
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.DERNull;
-import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.pqc.asn1.McElieceCCA2PrivateKey;
-import org.bouncycastle.pqc.crypto.mceliece.McElieceCCA2KeyPairGenerator;
-import org.bouncycastle.pqc.crypto.mceliece.McElieceCCA2Parameters;
-import org.bouncycastle.pqc.crypto.mceliece.McElieceCCA2PrivateKeyParameters;
-import org.bouncycastle.pqc.jcajce.spec.McElieceCCA2PrivateKeySpec;
-import org.bouncycastle.pqc.math.linearalgebra.GF2Matrix;
-import org.bouncycastle.pqc.math.linearalgebra.GF2mField;
-import org.bouncycastle.pqc.math.linearalgebra.Permutation;
-import org.bouncycastle.pqc.math.linearalgebra.PolynomialGF2mSmallM;
-
-/**
- * This class implements a McEliece CCA2 private key and is usually instantiated
- * by the {@link McElieceCCA2KeyPairGenerator} or {@link McElieceCCA2KeyFactorySpi}.
- *
- * @see McElieceCCA2KeyPairGenerator
- */
-public class BCMcElieceCCA2PrivateKey
-    implements CipherParameters, PrivateKey
-{
-
-
-    /**
-     *
-     */
-    private static final long serialVersionUID = 1L;
-
-    // the OID of the algorithm
-    private String oid;
-
-    // the length of the code
-    private int n;
-
-    // the dimension of the code, k>=n-mt
-    private int k;
-
-    // the finte field GF(2^m)
-    private GF2mField field;
-
-    // the irreducible Goppa polynomial
-    private PolynomialGF2mSmallM goppaPoly;
-
-    // the permutation
-    private Permutation p;
-
-    // the canonical check matrix
-    private GF2Matrix h;
-
-    // the matrix used to compute square roots in (GF(2^m))^t
-    private PolynomialGF2mSmallM[] qInv;
-
-    private McElieceCCA2Parameters mcElieceCCA2Params;
-
-    /**
-     * Constructor (used by the {@link McElieceCCA2KeyPairGenerator}).
-     *
-     * @param n     the length of the code
-     * @param k     the dimension of the code
-     * @param field the field polynomial
-     * @param gp    the irreducible Goppa polynomial
-     * @param p     the permutation
-     * @param h     the canonical check matrix
-     * @param qInv  the matrix used to compute square roots in
-     *              <tt>(GF(2^m))^t</tt>
-     */
-    public BCMcElieceCCA2PrivateKey(String oid, int n, int k, GF2mField field,
-                                    PolynomialGF2mSmallM gp, Permutation p, GF2Matrix h,
-                                    PolynomialGF2mSmallM[] qInv)
-    {
-        this.oid = oid;
-        this.n = n;
-        this.k = k;
-        this.field = field;
-        this.goppaPoly = gp;
-        this.p = p;
-        this.h = h;
-        this.qInv = qInv;
-    }
-
-    /**
-     * Constructor (used by the {@link McElieceCCA2KeyFactorySpi}).
-     *
-     * @param keySpec a {@link McElieceCCA2PrivateKeySpec}
-     */
-    public BCMcElieceCCA2PrivateKey(McElieceCCA2PrivateKeySpec keySpec)
-    {
-        this(keySpec.getOIDString(), keySpec.getN(), keySpec.getK(), keySpec.getField(), keySpec
-            .getGoppaPoly(), keySpec.getP(), keySpec.getH(), keySpec
-            .getQInv());
-    }
-
-    public BCMcElieceCCA2PrivateKey(McElieceCCA2PrivateKeyParameters params)
-    {
-        this(params.getOIDString(), params.getN(), params.getK(), params.getField(), params.getGoppaPoly(),
-            params.getP(), params.getH(), params.getQInv());
-        this.mcElieceCCA2Params = params.getParameters();
-    }
-
-    /**
-     * Return the name of the algorithm.
-     *
-     * @return "McEliece"
-     */
-    public String getAlgorithm()
-    {
-        return "McEliece";
-    }
-
-    /**
-     * @return the length of the code
-     */
-    public int getN()
-    {
-        return n;
-    }
-
-    /**
-     * @return the dimension of the code
-     */
-    public int getK()
-    {
-        return k;
-    }
-
-    /**
-     * @return the degree of the Goppa polynomial (error correcting capability)
-     */
-    public int getT()
-    {
-        return goppaPoly.getDegree();
-    }
-
-    /**
-     * @return the finite field
-     */
-    public GF2mField getField()
-    {
-        return field;
-    }
-
-    /**
-     * @return the irreducible Goppa polynomial
-     */
-    public PolynomialGF2mSmallM getGoppaPoly()
-    {
-        return goppaPoly;
-    }
-
-    /**
-     * @return the permutation vector
-     */
-    public Permutation getP()
-    {
-        return p;
-    }
-
-    /**
-     * @return the canonical check matrix
-     */
-    public GF2Matrix getH()
-    {
-        return h;
-    }
-
-    /**
-     * @return the matrix used to compute square roots in <tt>(GF(2^m))^t</tt>
-     */
-    public PolynomialGF2mSmallM[] getQInv()
-    {
-        return qInv;
-    }
-
-    /**
-     * @return a human readable form of the key
-     */
-    public String toString()
-    {
-        String result = "";
-        result += " extension degree of the field      : " + n + "\n";
-        result += " dimension of the code              : " + k + "\n";
-        result += " irreducible Goppa polynomial       : " + goppaPoly + "\n";
-        return result;
-    }
-
-    /**
-     * Compare this key with another object.
-     *
-     * @param other the other object
-     * @return the result of the comparison
-     */
-    public boolean equals(Object other)
-    {
-        if (other == null || !(other instanceof BCMcElieceCCA2PrivateKey))
-        {
-            return false;
-        }
-
-        BCMcElieceCCA2PrivateKey otherKey = (BCMcElieceCCA2PrivateKey)other;
-
-        return (n == otherKey.n) && (k == otherKey.k)
-            && field.equals(otherKey.field)
-            && goppaPoly.equals(otherKey.goppaPoly) && p.equals(otherKey.p)
-            && h.equals(otherKey.h);
-    }
-
-    /**
-     * @return the hash code of this key
-     */
-    public int hashCode()
-    {
-        return k + n + field.hashCode() + goppaPoly.hashCode() + p.hashCode()
-            + h.hashCode();
-    }
-
-    /**
-     * @return the OID of the algorithm
-     */
-    public String getOIDString()
-    {
-        return oid;
-    }
-
-    /**
-     * @return the OID to encode in the SubjectPublicKeyInfo structure
-     */
-    protected ASN1ObjectIdentifier getOID()
-    {
-        return new ASN1ObjectIdentifier(McElieceCCA2KeyFactorySpi.OID);
-    }
-
-    /**
-     * @return the algorithm parameters to encode in the SubjectPublicKeyInfo
-     *         structure
-     */
-    protected ASN1Primitive getAlgParams()
-    {
-        return null; // FIXME: needed at all?
-    }
-
-
-    /**
-     * Return the keyData to encode in the SubjectPublicKeyInfo structure.
-     * <p>
-     * The ASN.1 definition of the key structure is
-     * <pre>
-     *   McEliecePrivateKey ::= SEQUENCE {
-     *     m             INTEGER                  -- extension degree of the field
-     *     k             INTEGER                  -- dimension of the code
-     *     field         OCTET STRING             -- field polynomial
-     *     goppaPoly     OCTET STRING             -- irreducible Goppa polynomial
-     *     p             OCTET STRING             -- permutation vector
-     *     matrixH       OCTET STRING             -- canonical check matrix
-     *     sqRootMatrix  SEQUENCE OF OCTET STRING -- square root matrix
-     *   }
-     * </pre>
-     * </p>
-     * @return the keyData to encode in the SubjectPublicKeyInfo structure
-     */
-    public byte[] getEncoded()
-    {
-        McElieceCCA2PrivateKey privateKey = new McElieceCCA2PrivateKey(new ASN1ObjectIdentifier(oid), n, k, field, goppaPoly, p, h, qInv);
-        PrivateKeyInfo pki;
-        try
-        {
-            AlgorithmIdentifier algorithmIdentifier = new AlgorithmIdentifier(this.getOID(), DERNull.INSTANCE);
-            pki = new PrivateKeyInfo(algorithmIdentifier, privateKey);
-        }
-        catch (IOException e)
-        {
-            e.printStackTrace();
-            return null;
-        }
-        try
-        {
-            byte[] encoded = pki.getEncoded();
-            return encoded;
-        }
-        catch (IOException e)
-        {
-            e.printStackTrace();
-            return null;
-        }
-    }
-
-    public String getFormat()
-    {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    public McElieceCCA2Parameters getMcElieceCCA2Parameters()
-    {
-        return mcElieceCCA2Params;
-    }
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/provider/mceliece/BCMcElieceCCA2PublicKey.java b/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/provider/mceliece/BCMcElieceCCA2PublicKey.java
deleted file mode 100644
index f606464..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/provider/mceliece/BCMcElieceCCA2PublicKey.java
+++ /dev/null
@@ -1,226 +0,0 @@
-package org.bouncycastle.pqc.jcajce.provider.mceliece;
-
-
-import java.io.IOException;
-import java.security.PublicKey;
-
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.DERNull;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.pqc.asn1.McElieceCCA2PublicKey;
-import org.bouncycastle.pqc.crypto.mceliece.McElieceCCA2KeyPairGenerator;
-import org.bouncycastle.pqc.crypto.mceliece.McElieceCCA2Parameters;
-import org.bouncycastle.pqc.crypto.mceliece.McElieceCCA2PublicKeyParameters;
-import org.bouncycastle.pqc.jcajce.spec.McElieceCCA2PublicKeySpec;
-import org.bouncycastle.pqc.math.linearalgebra.GF2Matrix;
-
-/**
- * This class implements a McEliece CCA2 public key and is usually instantiated
- * by the {@link McElieceCCA2KeyPairGenerator} or {@link McElieceCCA2KeyFactorySpi}.
- */
-public class BCMcElieceCCA2PublicKey
-    implements CipherParameters, PublicKey
-{
-
-    /**
-     *
-     */
-    private static final long serialVersionUID = 1L;
-
-    // the OID of the algorithm
-    private String oid;
-
-    // the length of the code
-    private int n;
-
-    // the error correction capability of the code
-    private int t;
-
-    // the generator matrix
-    private GF2Matrix g;
-
-    private McElieceCCA2Parameters McElieceCCA2Params;
-
-    /**
-     * Constructor (used by the {@link McElieceCCA2KeyPairGenerator}).
-     *
-     * @param n the length of the code
-     * @param t the error correction capability of the code
-     * @param g the generator matrix
-     */
-    public BCMcElieceCCA2PublicKey(String oid, int n, int t, GF2Matrix g)
-    {
-        this.oid = oid;
-        this.n = n;
-        this.t = t;
-        this.g = g;
-    }
-
-    /**
-     * Constructor (used by the {@link McElieceCCA2KeyFactorySpi}).
-     *
-     * @param keySpec a {@link McElieceCCA2PublicKeySpec}
-     */
-    public BCMcElieceCCA2PublicKey(McElieceCCA2PublicKeySpec keySpec)
-    {
-        this(keySpec.getOIDString(), keySpec.getN(), keySpec.getT(), keySpec.getMatrixG());
-    }
-
-    public BCMcElieceCCA2PublicKey(McElieceCCA2PublicKeyParameters params)
-    {
-        this(params.getOIDString(), params.getN(), params.getT(), params.getMatrixG());
-        this.McElieceCCA2Params = params.getParameters();
-    }
-
-    /**
-     * Return the name of the algorithm.
-     *
-     * @return "McEliece"
-     */
-    public String getAlgorithm()
-    {
-        return "McEliece";
-    }
-
-    /**
-     * @return the length of the code
-     */
-    public int getN()
-    {
-        return n;
-    }
-
-    /**
-     * @return the dimension of the code
-     */
-    public int getK()
-    {
-        return g.getNumRows();
-    }
-
-    /**
-     * @return the error correction capability of the code
-     */
-    public int getT()
-    {
-        return t;
-    }
-
-    /**
-     * @return the generator matrix
-     */
-    public GF2Matrix getG()
-    {
-        return g;
-    }
-
-    /**
-     * @return a human readable form of the key
-     */
-    public String toString()
-    {
-        String result = "McEliecePublicKey:\n";
-        result += " length of the code         : " + n + "\n";
-        result += " error correction capability: " + t + "\n";
-        result += " generator matrix           : " + g.toString();
-        return result;
-    }
-
-    /**
-     * Compare this key with another object.
-     *
-     * @param other the other object
-     * @return the result of the comparison
-     */
-    public boolean equals(Object other)
-    {
-        if (other == null || !(other instanceof BCMcElieceCCA2PublicKey))
-        {
-            return false;
-        }
-
-        BCMcElieceCCA2PublicKey otherKey = (BCMcElieceCCA2PublicKey)other;
-
-        return (n == otherKey.n) && (t == otherKey.t) && (g.equals(otherKey.g));
-    }
-
-    /**
-     * @return the hash code of this key
-     */
-    public int hashCode()
-    {
-        return n + t + g.hashCode();
-    }
-
-    /**
-     * @return the OID of the algorithm
-     */
-    public String getOIDString()
-    {
-        return oid;
-    }
-
-    /**
-     * @return the OID to encode in the SubjectPublicKeyInfo structure
-     */
-    protected ASN1ObjectIdentifier getOID()
-    {
-        return new ASN1ObjectIdentifier(McElieceCCA2KeyFactorySpi.OID);
-    }
-
-    /**
-     * @return the algorithm parameters to encode in the SubjectPublicKeyInfo
-     *         structure
-     */
-    protected ASN1Primitive getAlgParams()
-    {
-        return null; // FIXME: needed at all?
-    }
-
-    /**
-     * Return the keyData to encode in the SubjectPublicKeyInfo structure.
-     * <p>
-     * The ASN.1 definition of the key structure is
-     * <pre>
-     *       McEliecePublicKey ::= SEQUENCE {
-     *         n           Integer      -- length of the code
-     *         t           Integer      -- error correcting capability
-     *         matrixG     OctetString  -- generator matrix as octet string
-     *       }
-     * </pre>
-     * </p>
-     * @return the keyData to encode in the SubjectPublicKeyInfo structure
-     */
-    public byte[] getEncoded()
-    {
-        McElieceCCA2PublicKey key = new McElieceCCA2PublicKey(new ASN1ObjectIdentifier(oid), n, t, g);
-        AlgorithmIdentifier algorithmIdentifier = new AlgorithmIdentifier(this.getOID(), DERNull.INSTANCE);
-
-        try
-        {
-            SubjectPublicKeyInfo subjectPublicKeyInfo = new SubjectPublicKeyInfo(algorithmIdentifier, key);
-
-            return subjectPublicKeyInfo.getEncoded();
-        }
-        catch (IOException e)
-        {
-            return null;
-        }
-
-    }
-
-    public String getFormat()
-    {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    public McElieceCCA2Parameters getMcElieceCCA2Parameters()
-    {
-        return McElieceCCA2Params;
-    }
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/provider/mceliece/BCMcEliecePrivateKey.java b/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/provider/mceliece/BCMcEliecePrivateKey.java
deleted file mode 100644
index 32ccd76..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/provider/mceliece/BCMcEliecePrivateKey.java
+++ /dev/null
@@ -1,335 +0,0 @@
-package org.bouncycastle.pqc.jcajce.provider.mceliece;
-
-import java.io.IOException;
-import java.security.PrivateKey;
-
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.DERNull;
-import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.pqc.asn1.McEliecePrivateKey;
-import org.bouncycastle.pqc.crypto.mceliece.McElieceKeyPairGenerator;
-import org.bouncycastle.pqc.crypto.mceliece.McElieceParameters;
-import org.bouncycastle.pqc.crypto.mceliece.McEliecePrivateKeyParameters;
-import org.bouncycastle.pqc.jcajce.spec.McEliecePrivateKeySpec;
-import org.bouncycastle.pqc.math.linearalgebra.GF2Matrix;
-import org.bouncycastle.pqc.math.linearalgebra.GF2mField;
-import org.bouncycastle.pqc.math.linearalgebra.Permutation;
-import org.bouncycastle.pqc.math.linearalgebra.PolynomialGF2mSmallM;
-
-/**
- * This class implements a McEliece private key and is usually instantiated by
- * the {@link McElieceKeyPairGenerator} or {@link McElieceKeyFactorySpi}.
- */
-public class BCMcEliecePrivateKey
-    implements CipherParameters, PrivateKey
-{
-
-    /**
-     *
-     */
-    private static final long serialVersionUID = 1L;
-
-    // the OID of the algorithm
-    private String oid;
-
-    // the length of the code
-    private int n;
-
-    // the dimension of the code, where <tt>k &gt;= n - mt</tt>
-    private int k;
-
-    // the underlying finite field
-    private GF2mField field;
-
-    // the irreducible Goppa polynomial
-    private PolynomialGF2mSmallM goppaPoly;
-
-    // the matrix S^-1
-    private GF2Matrix sInv;
-
-    // the permutation P1 used to generate the systematic check matrix
-    private Permutation p1;
-
-    // the permutation P2 used to compute the public generator matrix
-    private Permutation p2;
-
-    // the canonical check matrix of the code
-    private GF2Matrix h;
-
-    // the matrix used to compute square roots in <tt>(GF(2^m))^t</tt>
-    private PolynomialGF2mSmallM[] qInv;
-
-    private McElieceParameters mcElieceParams;
-
-
-    /**
-     * Constructor (used by the {@link McElieceKeyPairGenerator}).
-     *
-     * @param oid
-     * @param n         the length of the code
-     * @param k         the dimension of the code
-     * @param field     the field polynomial defining the finite field
-     *                  <tt>GF(2<sup>m</sup>)</tt>
-     * @param goppaPoly the irreducible Goppa polynomial
-     * @param sInv      the matrix <tt>S<sup>-1</sup></tt>
-     * @param p1        the permutation used to generate the systematic check
-     *                  matrix
-     * @param p2        the permutation used to compute the public generator
-     *                  matrix
-     * @param h         the canonical check matrix
-     * @param qInv      the matrix used to compute square roots in
-     *                  <tt>(GF(2<sup>m</sup>))<sup>t</sup></tt>
-     */
-    public BCMcEliecePrivateKey(String oid, int n, int k, GF2mField field,
-                                PolynomialGF2mSmallM goppaPoly, GF2Matrix sInv, Permutation p1,
-                                Permutation p2, GF2Matrix h, PolynomialGF2mSmallM[] qInv)
-    {
-        this.oid = oid;
-        this.n = n;
-        this.k = k;
-        this.field = field;
-        this.goppaPoly = goppaPoly;
-        this.sInv = sInv;
-        this.p1 = p1;
-        this.p2 = p2;
-        this.h = h;
-        this.qInv = qInv;
-    }
-
-    /**
-     * Constructor (used by the {@link McElieceKeyFactorySpi}).
-     *
-     * @param keySpec a {@link McEliecePrivateKeySpec}
-     */
-    public BCMcEliecePrivateKey(McEliecePrivateKeySpec keySpec)
-    {
-        this(keySpec.getOIDString(), keySpec.getN(), keySpec.getK(), keySpec.getField(), keySpec
-            .getGoppaPoly(), keySpec.getSInv(), keySpec.getP1(), keySpec
-            .getP2(), keySpec.getH(), keySpec.getQInv());
-    }
-
-    public BCMcEliecePrivateKey(McEliecePrivateKeyParameters params)
-    {
-        this(params.getOIDString(), params.getN(), params.getK(), params.getField(), params.getGoppaPoly(),
-            params.getSInv(), params.getP1(), params.getP2(), params.getH(), params.getQInv());
-
-        this.mcElieceParams = params.getParameters();
-    }
-
-
-    /**
-     * Return the name of the algorithm.
-     *
-     * @return "McEliece"
-     */
-    public String getAlgorithm()
-    {
-        return "McEliece";
-    }
-
-    /**
-     * @return the length of the code
-     */
-    public int getN()
-    {
-        return n;
-    }
-
-    /**
-     * @return the dimension of the code
-     */
-    public int getK()
-    {
-        return k;
-    }
-
-    /**
-     * @return the finite field
-     */
-    public GF2mField getField()
-    {
-        return field;
-    }
-
-    /**
-     * @return the irreducible Goppa polynomial
-     */
-    public PolynomialGF2mSmallM getGoppaPoly()
-    {
-        return goppaPoly;
-    }
-
-    /**
-     * @return the k x k random binary non-singular matrix S
-     */
-    public GF2Matrix getSInv()
-    {
-        return sInv;
-    }
-
-    /**
-     * @return the permutation used to generate the systematic check matrix
-     */
-    public Permutation getP1()
-    {
-        return p1;
-    }
-
-    /**
-     * @return the permutation used to compute the public generator matrix
-     */
-    public Permutation getP2()
-    {
-        return p2;
-    }
-
-    /**
-     * @return the canonical check matrix
-     */
-    public GF2Matrix getH()
-    {
-        return h;
-    }
-
-    /**
-     * @return the matrix for computing square roots in <tt>(GF(2^m))^t</tt>
-     */
-    public PolynomialGF2mSmallM[] getQInv()
-    {
-        return qInv;
-    }
-
-    /**
-     * @return the OID of the algorithm
-     */
-    public String getOIDString()
-    {
-        return oid;
-    }
-
-    /**
-     * @return a human readable form of the key
-     */
-    public String toString()
-    {
-        String result = " length of the code          : " + n + "\n";
-        result += " dimension of the code       : " + k + "\n";
-        result += " irreducible Goppa polynomial: " + goppaPoly + "\n";
-        result += " (k x k)-matrix S^-1         : " + sInv + "\n";
-        result += " permutation P1              : " + p1 + "\n";
-        result += " permutation P2              : " + p2;
-        return result;
-    }
-
-    /**
-     * Compare this key with another object.
-     *
-     * @param other the other object
-     * @return the result of the comparison
-     */
-    public boolean equals(Object other)
-    {
-        if (!(other instanceof BCMcEliecePrivateKey))
-        {
-            return false;
-        }
-        BCMcEliecePrivateKey otherKey = (BCMcEliecePrivateKey)other;
-
-        return (n == otherKey.n) && (k == otherKey.k)
-            && field.equals(otherKey.field)
-            && goppaPoly.equals(otherKey.goppaPoly)
-            && sInv.equals(otherKey.sInv) && p1.equals(otherKey.p1)
-            && p2.equals(otherKey.p2) && h.equals(otherKey.h);
-    }
-
-    /**
-     * @return the hash code of this key
-     */
-    public int hashCode()
-    {
-        return k + n + field.hashCode() + goppaPoly.hashCode()
-            + sInv.hashCode() + p1.hashCode() + p2.hashCode()
-            + h.hashCode();
-    }
-
-    /**
-     * @return the OID to encode in the SubjectPublicKeyInfo structure
-     */
-    protected ASN1ObjectIdentifier getOID()
-    {
-        return new ASN1ObjectIdentifier(McElieceKeyFactorySpi.OID);
-    }
-
-    /**
-     * @return the algorithm parameters to encode in the SubjectPublicKeyInfo
-     *         structure
-     */
-    protected ASN1Primitive getAlgParams()
-    {
-        return null; // FIXME: needed at all?
-    }
-
-    /**
-     * Return the key data to encode in the SubjectPublicKeyInfo structure.
-     * <p>
-     * The ASN.1 definition of the key structure is
-     * <p>
-     * <pre>
-     *   McEliecePrivateKey ::= SEQUENCE {
-     *     n          INTEGER                   -- length of the code
-     *     k          INTEGER                   -- dimension of the code
-     *     fieldPoly  OCTET STRING              -- field polynomial defining GF(2&circ;m)
-     *     goppaPoly  OCTET STRING              -- irreducible Goppa polynomial
-     *     sInv       OCTET STRING              -- matrix S&circ;-1
-     *     p1         OCTET STRING              -- permutation P1
-     *     p2         OCTET STRING              -- permutation P2
-     *     h          OCTET STRING              -- canonical check matrix
-     *     qInv       SEQUENCE OF OCTET STRING  -- matrix used to compute square roots
-     *   }
-     * </pre>
-     * </p>
-     *
-     * @return the key data to encode in the SubjectPublicKeyInfo structure
-     */
-    public byte[] getEncoded()
-    {
-        McEliecePrivateKey privateKey = new McEliecePrivateKey(new ASN1ObjectIdentifier(oid), n, k, field, goppaPoly, sInv, p1, p2, h, qInv);
-        PrivateKeyInfo pki;
-        try
-        {
-            AlgorithmIdentifier algorithmIdentifier = new AlgorithmIdentifier(this.getOID(), DERNull.INSTANCE);
-            pki = new PrivateKeyInfo(algorithmIdentifier, privateKey);
-        }
-        catch (IOException e)
-        {
-            e.printStackTrace();
-            return null;
-        }
-        try
-        {
-            byte[] encoded = pki.getEncoded();
-            return encoded;
-        }
-        catch (IOException e)
-        {
-            e.printStackTrace();
-            return null;
-        }
-    }
-
-    public String getFormat()
-    {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    public McElieceParameters getMcElieceParameters()
-    {
-        return mcElieceParams;
-    }
-
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/provider/mceliece/BCMcEliecePublicKey.java b/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/provider/mceliece/BCMcEliecePublicKey.java
deleted file mode 100644
index e5b1d22..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/provider/mceliece/BCMcEliecePublicKey.java
+++ /dev/null
@@ -1,230 +0,0 @@
-package org.bouncycastle.pqc.jcajce.provider.mceliece;
-
-import java.io.IOException;
-import java.security.PublicKey;
-
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.DERNull;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.pqc.asn1.McEliecePublicKey;
-import org.bouncycastle.pqc.crypto.mceliece.McElieceKeyPairGenerator;
-import org.bouncycastle.pqc.crypto.mceliece.McElieceParameters;
-import org.bouncycastle.pqc.crypto.mceliece.McEliecePublicKeyParameters;
-import org.bouncycastle.pqc.jcajce.spec.McEliecePublicKeySpec;
-import org.bouncycastle.pqc.math.linearalgebra.GF2Matrix;
-
-/**
- * This class implements a McEliece public key and is usually instantiated by
- * the {@link McElieceKeyPairGenerator} or {@link McElieceKeyFactorySpi}.
- */
-public class BCMcEliecePublicKey
-    implements CipherParameters, PublicKey
-{
-
-    /**
-     *
-     */
-    private static final long serialVersionUID = 1L;
-
-    // the OID of the algorithm
-    private String oid;
-
-    /**
-     * the length of the code
-     */
-    private int n;
-
-    /**
-     * the error correction capability of the code
-     */
-    private int t;
-
-    /**
-     * the generator matrix
-     */
-    private GF2Matrix g;
-
-    private McElieceParameters McElieceParams;
-
-    /**
-     * Constructor (used by the {@link McElieceKeyPairGenerator}).
-     *
-     * @param oid
-     * @param n   the length of the code
-     * @param t   the error correction capability of the code
-     * @param g   the generator matrix
-     */
-    public BCMcEliecePublicKey(String oid, int n, int t, GF2Matrix g)
-    {
-        this.oid = oid;
-        this.n = n;
-        this.t = t;
-        this.g = g;
-    }
-
-    /**
-     * Constructor (used by the {@link McElieceKeyFactorySpi}).
-     *
-     * @param keySpec a {@link McEliecePublicKeySpec}
-     */
-    public BCMcEliecePublicKey(McEliecePublicKeySpec keySpec)
-    {
-        this(keySpec.getOIDString(), keySpec.getN(), keySpec.getT(), keySpec.getG());
-    }
-
-    public BCMcEliecePublicKey(McEliecePublicKeyParameters params)
-    {
-        this(params.getOIDString(), params.getN(), params.getT(), params.getG());
-        this.McElieceParams = params.getParameters();
-    }
-
-    /**
-     * Return the name of the algorithm.
-     *
-     * @return "McEliece"
-     */
-    public String getAlgorithm()
-    {
-        return "McEliece";
-    }
-
-    /**
-     * @return the length of the code
-     */
-    public int getN()
-    {
-        return n;
-    }
-
-    /**
-     * @return the dimension of the code
-     */
-    public int getK()
-    {
-        return g.getNumRows();
-    }
-
-    /**
-     * @return the error correction capability of the code
-     */
-    public int getT()
-    {
-        return t;
-    }
-
-    /**
-     * @return the generator matrix
-     */
-    public GF2Matrix getG()
-    {
-        return g;
-    }
-
-    /**
-     * @return a human readable form of the key
-     */
-    public String toString()
-    {
-        String result = "McEliecePublicKey:\n";
-        result += " length of the code         : " + n + "\n";
-        result += " error correction capability: " + t + "\n";
-        result += " generator matrix           : " + g.toString();
-        return result;
-    }
-
-    /**
-     * Compare this key with another object.
-     *
-     * @param other the other object
-     * @return the result of the comparison
-     */
-    public boolean equals(Object other)
-    {
-        if (!(other instanceof BCMcEliecePublicKey))
-        {
-            return false;
-        }
-        BCMcEliecePublicKey otherKey = (BCMcEliecePublicKey)other;
-
-        return (n == otherKey.n) && (t == otherKey.t) && g.equals(otherKey.g);
-    }
-
-    /**
-     * @return the hash code of this key
-     */
-    public int hashCode()
-    {
-        return n + t + g.hashCode();
-    }
-
-
-    /**
-     * @return the OID of the algorithm
-     */
-    public String getOIDString()
-    {
-        return oid;
-    }
-
-    /**
-     * @return the OID to encode in the SubjectPublicKeyInfo structure
-     */
-    protected ASN1ObjectIdentifier getOID()
-    {
-        return new ASN1ObjectIdentifier(McElieceKeyFactorySpi.OID);
-    }
-
-    /**
-     * @return the algorithm parameters to encode in the SubjectPublicKeyInfo
-     *         structure
-     */
-    protected ASN1Primitive getAlgParams()
-    {
-        return null; // FIXME: needed at all?
-    }
-
-
-    /**
-     * Return the keyData to encode in the SubjectPublicKeyInfo structure.
-     * <p>
-     * The ASN.1 definition of the key structure is
-     * <pre>
-     *       McEliecePublicKey ::= SEQUENCE {
-     *         n           Integer      -- length of the code
-     *         t           Integer      -- error correcting capability
-     *         matrixG     OctetString  -- generator matrix as octet string
-     *       }
-     * </pre>
-     * </p>
-     * @return the keyData to encode in the SubjectPublicKeyInfo structure
-     */
-    public byte[] getEncoded()
-    {
-        McEliecePublicKey key = new McEliecePublicKey(new ASN1ObjectIdentifier(oid), n, t, g);
-        AlgorithmIdentifier algorithmIdentifier = new AlgorithmIdentifier(this.getOID(), DERNull.INSTANCE);
-
-        try
-        {
-            SubjectPublicKeyInfo subjectPublicKeyInfo = new SubjectPublicKeyInfo(algorithmIdentifier, key);
-
-            return subjectPublicKeyInfo.getEncoded();
-        }
-        catch (IOException e)
-        {
-            return null;
-        }
-    }
-
-    public String getFormat()
-    {
-        return null;
-    }
-
-    public McElieceParameters getMcElieceParameters()
-    {
-        return McElieceParams;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/provider/mceliece/McElieceCCA2KeyFactorySpi.java b/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/provider/mceliece/McElieceCCA2KeyFactorySpi.java
deleted file mode 100644
index c6ca7c2..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/provider/mceliece/McElieceCCA2KeyFactorySpi.java
+++ /dev/null
@@ -1,346 +0,0 @@
-package org.bouncycastle.pqc.jcajce.provider.mceliece;
-
-import java.io.IOException;
-import java.math.BigInteger;
-import java.security.InvalidKeyException;
-import java.security.Key;
-import java.security.KeyFactorySpi;
-import java.security.PrivateKey;
-import java.security.PublicKey;
-import java.security.spec.InvalidKeySpecException;
-import java.security.spec.KeySpec;
-import java.security.spec.PKCS8EncodedKeySpec;
-import java.security.spec.X509EncodedKeySpec;
-
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.bouncycastle.pqc.asn1.McElieceCCA2PrivateKey;
-import org.bouncycastle.pqc.asn1.McElieceCCA2PublicKey;
-import org.bouncycastle.pqc.jcajce.spec.McElieceCCA2PrivateKeySpec;
-import org.bouncycastle.pqc.jcajce.spec.McElieceCCA2PublicKeySpec;
-
-/**
- * This class is used to translate between McEliece CCA2 keys and key
- * specifications.
- *
- * @see BCMcElieceCCA2PrivateKey
- * @see McElieceCCA2PrivateKeySpec
- * @see BCMcElieceCCA2PublicKey
- * @see McElieceCCA2PublicKeySpec
- */
-public class McElieceCCA2KeyFactorySpi
-    extends KeyFactorySpi
-{
-
-    /**
-     * The OID of the algorithm.
-     */
-    public static final String OID = "1.3.6.1.4.1.8301.3.1.3.4.2";
-
-    /**
-     * Converts, if possible, a key specification into a
-     * {@link BCMcElieceCCA2PublicKey}. Currently, the following key
-     * specifications are supported: {@link McElieceCCA2PublicKeySpec},
-     * {@link X509EncodedKeySpec}.
-     *
-     * @param keySpec the key specification
-     * @return the McEliece CCA2 public key
-     * @throws InvalidKeySpecException if the key specification is not supported.
-     */
-    public PublicKey generatePublic(KeySpec keySpec)
-        throws InvalidKeySpecException
-    {
-        if (keySpec instanceof McElieceCCA2PublicKeySpec)
-        {
-            return new BCMcElieceCCA2PublicKey(
-                (McElieceCCA2PublicKeySpec)keySpec);
-        }
-        else if (keySpec instanceof X509EncodedKeySpec)
-        {
-            // get the DER-encoded Key according to X.509 from the spec
-            byte[] encKey = ((X509EncodedKeySpec)keySpec).getEncoded();
-
-            // decode the SubjectPublicKeyInfo data structure to the pki object
-            SubjectPublicKeyInfo pki;
-            try
-            {
-                pki = SubjectPublicKeyInfo.getInstance(ASN1Primitive.fromByteArray(encKey));
-            }
-            catch (IOException e)
-            {
-                throw new InvalidKeySpecException(e.toString());
-            }
-
-
-            try
-            {
-                // --- Build and return the actual key.
-                ASN1Primitive innerType = pki.parsePublicKey();
-                ASN1Sequence publicKey = (ASN1Sequence)innerType;
-
-                // decode oidString (but we don't need it right now)
-                String oidString = ((ASN1ObjectIdentifier)publicKey.getObjectAt(0))
-                    .toString();
-
-                // decode <n>
-                BigInteger bigN = ((ASN1Integer)publicKey.getObjectAt(1)).getValue();
-                int n = bigN.intValue();
-
-                // decode <t>
-                BigInteger bigT = ((ASN1Integer)publicKey.getObjectAt(2)).getValue();
-                int t = bigT.intValue();
-
-                // decode <matrixG>
-                byte[] matrixG = ((ASN1OctetString)publicKey.getObjectAt(3)).getOctets();
-
-                return new BCMcElieceCCA2PublicKey(new McElieceCCA2PublicKeySpec(
-                    OID, n, t, matrixG));
-            }
-            catch (IOException cce)
-            {
-                throw new InvalidKeySpecException(
-                    "Unable to decode X509EncodedKeySpec: "
-                        + cce.getMessage());
-            }
-        }
-
-        throw new InvalidKeySpecException("Unsupported key specification: "
-            + keySpec.getClass() + ".");
-    }
-
-    /**
-     * Converts, if possible, a key specification into a
-     * {@link BCMcElieceCCA2PrivateKey}. Currently, the following key
-     * specifications are supported: {@link McElieceCCA2PrivateKeySpec},
-     * {@link PKCS8EncodedKeySpec}.
-     *
-     * @param keySpec the key specification
-     * @return the McEliece CCA2 private key
-     * @throws InvalidKeySpecException if the KeySpec is not supported.
-     */
-    public PrivateKey generatePrivate(KeySpec keySpec)
-        throws InvalidKeySpecException
-    {
-        if (keySpec instanceof McElieceCCA2PrivateKeySpec)
-        {
-            return new BCMcElieceCCA2PrivateKey(
-                (McElieceCCA2PrivateKeySpec)keySpec);
-        }
-        else if (keySpec instanceof PKCS8EncodedKeySpec)
-        {
-            // get the DER-encoded Key according to PKCS#8 from the spec
-            byte[] encKey = ((PKCS8EncodedKeySpec)keySpec).getEncoded();
-
-            // decode the PKCS#8 data structure to the pki object
-            PrivateKeyInfo pki;
-
-            try
-            {
-                pki = PrivateKeyInfo.getInstance(ASN1Primitive.fromByteArray(encKey));
-            }
-            catch (IOException e)
-            {
-                throw new InvalidKeySpecException("Unable to decode PKCS8EncodedKeySpec: " + e);
-            }
-
-            try
-            {
-                // get the inner type inside the BIT STRING
-                ASN1Primitive innerType = pki.parsePrivateKey().toASN1Primitive();
-
-                // build and return the actual key
-                ASN1Sequence privKey = (ASN1Sequence)innerType;
-
-                // decode oidString (but we don't need it right now)
-                String oidString = ((ASN1ObjectIdentifier)privKey.getObjectAt(0))
-                    .toString();
-
-                // decode <n>
-                BigInteger bigN = ((ASN1Integer)privKey.getObjectAt(1)).getValue();
-                int n = bigN.intValue();
-
-                // decode <k>
-                BigInteger bigK = ((ASN1Integer)privKey.getObjectAt(2)).getValue();
-                int k = bigK.intValue();
-
-
-                // decode <fieldPoly>
-                byte[] encFieldPoly = ((ASN1OctetString)privKey.getObjectAt(3))
-                    .getOctets();
-                // decode <goppaPoly>
-                byte[] encGoppaPoly = ((ASN1OctetString)privKey.getObjectAt(4))
-                    .getOctets();
-                // decode <p>
-                byte[] encP = ((ASN1OctetString)privKey.getObjectAt(5)).getOctets();
-                // decode <h>
-                byte[] encH = ((ASN1OctetString)privKey.getObjectAt(6)).getOctets();
-                // decode <qInv>
-                ASN1Sequence qSeq = (ASN1Sequence)privKey.getObjectAt(7);
-                byte[][] encQInv = new byte[qSeq.size()][];
-                for (int i = 0; i < qSeq.size(); i++)
-                {
-                    encQInv[i] = ((ASN1OctetString)qSeq.getObjectAt(i)).getOctets();
-                }
-
-                return new BCMcElieceCCA2PrivateKey(
-                    new McElieceCCA2PrivateKeySpec(OID, n, k, encFieldPoly,
-                        encGoppaPoly, encP, encH, encQInv));
-
-            }
-            catch (IOException cce)
-            {
-                throw new InvalidKeySpecException(
-                    "Unable to decode PKCS8EncodedKeySpec.");
-            }
-        }
-
-        throw new InvalidKeySpecException("Unsupported key specification: "
-            + keySpec.getClass() + ".");
-    }
-
-    /**
-     * Converts, if possible, a given key into a key specification. Currently,
-     * the following key specifications are supported:
-     * <ul>
-     * <li>for McElieceCCA2PublicKey: {@link X509EncodedKeySpec},
-     * {@link McElieceCCA2PublicKeySpec}</li>
-     * <li>for McElieceCCA2PrivateKey: {@link PKCS8EncodedKeySpec},
-     * {@link McElieceCCA2PrivateKeySpec}</li>.
-     * </ul>
-     *
-     * @param key     the key
-     * @param keySpec the key specification
-     * @return the specification of the McEliece CCA2 key
-     * @throws InvalidKeySpecException if the key type or the key specification is not
-     * supported.
-     * @see BCMcElieceCCA2PrivateKey
-     * @see McElieceCCA2PrivateKeySpec
-     * @see BCMcElieceCCA2PublicKey
-     * @see McElieceCCA2PublicKeySpec
-     */
-    public KeySpec getKeySpec(Key key, Class keySpec)
-        throws InvalidKeySpecException
-    {
-        if (key instanceof BCMcElieceCCA2PrivateKey)
-        {
-            if (PKCS8EncodedKeySpec.class.isAssignableFrom(keySpec))
-            {
-                return new PKCS8EncodedKeySpec(key.getEncoded());
-            }
-            else if (McElieceCCA2PrivateKeySpec.class
-                .isAssignableFrom(keySpec))
-            {
-                BCMcElieceCCA2PrivateKey privKey = (BCMcElieceCCA2PrivateKey)key;
-                return new McElieceCCA2PrivateKeySpec(OID, privKey.getN(), privKey
-                    .getK(), privKey.getField(), privKey.getGoppaPoly(),
-                    privKey.getP(), privKey.getH(), privKey.getQInv());
-            }
-        }
-        else if (key instanceof BCMcElieceCCA2PublicKey)
-        {
-            if (X509EncodedKeySpec.class.isAssignableFrom(keySpec))
-            {
-                return new X509EncodedKeySpec(key.getEncoded());
-            }
-            else if (McElieceCCA2PublicKeySpec.class
-                .isAssignableFrom(keySpec))
-            {
-                BCMcElieceCCA2PublicKey pubKey = (BCMcElieceCCA2PublicKey)key;
-                return new McElieceCCA2PublicKeySpec(OID, pubKey.getN(), pubKey
-                    .getT(), pubKey.getG());
-            }
-        }
-        else
-        {
-            throw new InvalidKeySpecException("Unsupported key type: "
-                + key.getClass() + ".");
-        }
-
-        throw new InvalidKeySpecException("Unknown key specification: "
-            + keySpec + ".");
-    }
-
-    /**
-     * Translates a key into a form known by the FlexiProvider. Currently, only
-     * the following "source" keys are supported: {@link BCMcElieceCCA2PrivateKey},
-     * {@link BCMcElieceCCA2PublicKey}.
-     *
-     * @param key the key
-     * @return a key of a known key type
-     * @throws InvalidKeyException if the key type is not supported.
-     */
-    public Key translateKey(Key key)
-        throws InvalidKeyException
-    {
-        if ((key instanceof BCMcElieceCCA2PrivateKey)
-            || (key instanceof BCMcElieceCCA2PublicKey))
-        {
-            return key;
-        }
-        throw new InvalidKeyException("Unsupported key type.");
-
-    }
-
-
-    public PublicKey generatePublic(SubjectPublicKeyInfo pki)
-        throws InvalidKeySpecException
-    {
-        // get the inner type inside the BIT STRING
-        try
-        {
-            ASN1Primitive innerType = pki.parsePublicKey();
-            McElieceCCA2PublicKey key = McElieceCCA2PublicKey.getInstance((ASN1Sequence)innerType);
-            return new BCMcElieceCCA2PublicKey(key.getOID().getId(), key.getN(), key.getT(), key.getG());
-        }
-        catch (IOException cce)
-        {
-            throw new InvalidKeySpecException("Unable to decode X509EncodedKeySpec");
-        }
-    }
-
-
-    public PrivateKey generatePrivate(PrivateKeyInfo pki)
-        throws InvalidKeySpecException
-    {
-        // get the inner type inside the BIT STRING
-        try
-        {
-            ASN1Primitive innerType = pki.parsePrivateKey().toASN1Primitive();
-            McElieceCCA2PrivateKey key = McElieceCCA2PrivateKey.getInstance(innerType);
-            return new BCMcElieceCCA2PrivateKey(key.getOID().getId(), key.getN(), key.getK(), key.getField(), key.getGoppaPoly(), key.getP(), key.getH(), key.getQInv());
-        }
-        catch (IOException cce)
-        {
-            throw new InvalidKeySpecException("Unable to decode PKCS8EncodedKeySpec");
-        }
-    }
-
-    protected PublicKey engineGeneratePublic(KeySpec keySpec)
-        throws InvalidKeySpecException
-    {
-        return null;  //To change body of implemented methods use File | Settings | File Templates.
-    }
-
-    protected PrivateKey engineGeneratePrivate(KeySpec keySpec)
-        throws InvalidKeySpecException
-    {
-        return null;  //To change body of implemented methods use File | Settings | File Templates.
-    }
-
-    protected KeySpec engineGetKeySpec(Key key, Class tClass)
-        throws InvalidKeySpecException
-    {
-        return null;  //To change body of implemented methods use File | Settings | File Templates.
-    }
-
-    protected Key engineTranslateKey(Key key)
-        throws InvalidKeyException
-    {
-        return null;  //To change body of implemented methods use File | Settings | File Templates.
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/provider/mceliece/McElieceCCA2KeysToParams.java b/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/provider/mceliece/McElieceCCA2KeysToParams.java
deleted file mode 100644
index 03e7c1b..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/provider/mceliece/McElieceCCA2KeysToParams.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package org.bouncycastle.pqc.jcajce.provider.mceliece;
-
-import java.security.InvalidKeyException;
-import java.security.PrivateKey;
-import java.security.PublicKey;
-
-import org.bouncycastle.crypto.params.AsymmetricKeyParameter;
-import org.bouncycastle.pqc.crypto.mceliece.McElieceCCA2PrivateKeyParameters;
-import org.bouncycastle.pqc.crypto.mceliece.McElieceCCA2PublicKeyParameters;
-
-/**
- * utility class for converting jce/jca McElieceCCA2 objects
- * objects into their org.bouncycastle.crypto counterparts.
- */
-public class McElieceCCA2KeysToParams
-{
-
-
-    static public AsymmetricKeyParameter generatePublicKeyParameter(
-        PublicKey key)
-        throws InvalidKeyException
-    {
-        if (key instanceof BCMcElieceCCA2PublicKey)
-        {
-            BCMcElieceCCA2PublicKey k = (BCMcElieceCCA2PublicKey)key;
-
-            return new McElieceCCA2PublicKeyParameters(k.getOIDString(), k.getN(), k.getT(), k.getG(), k.getMcElieceCCA2Parameters());
-        }
-
-        throw new InvalidKeyException("can't identify McElieceCCA2 public key: " + key.getClass().getName());
-    }
-
-
-    static public AsymmetricKeyParameter generatePrivateKeyParameter(
-        PrivateKey key)
-        throws InvalidKeyException
-    {
-        if (key instanceof BCMcElieceCCA2PrivateKey)
-        {
-            BCMcElieceCCA2PrivateKey k = (BCMcElieceCCA2PrivateKey)key;
-            return new McElieceCCA2PrivateKeyParameters(k.getOIDString(), k.getN(), k.getK(), k.getField(), k.getGoppaPoly(),
-                k.getP(), k.getH(), k.getQInv(), k.getMcElieceCCA2Parameters());
-        }
-
-        throw new InvalidKeyException("can't identify McElieceCCA2 private key.");
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/provider/mceliece/McElieceCCA2Primitives.java b/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/provider/mceliece/McElieceCCA2Primitives.java
deleted file mode 100644
index 2650fff..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/provider/mceliece/McElieceCCA2Primitives.java
+++ /dev/null
@@ -1,131 +0,0 @@
-package org.bouncycastle.pqc.jcajce.provider.mceliece;
-
-import org.bouncycastle.pqc.crypto.mceliece.McElieceCCA2PrivateKeyParameters;
-import org.bouncycastle.pqc.crypto.mceliece.McElieceCCA2PublicKeyParameters;
-import org.bouncycastle.pqc.math.linearalgebra.GF2Matrix;
-import org.bouncycastle.pqc.math.linearalgebra.GF2Vector;
-import org.bouncycastle.pqc.math.linearalgebra.GF2mField;
-import org.bouncycastle.pqc.math.linearalgebra.GoppaCode;
-import org.bouncycastle.pqc.math.linearalgebra.Permutation;
-import org.bouncycastle.pqc.math.linearalgebra.PolynomialGF2mSmallM;
-import org.bouncycastle.pqc.math.linearalgebra.Vector;
-
-/**
- * Core operations for the CCA-secure variants of McEliece.
- */
-public final class McElieceCCA2Primitives
-{
-
-    /**
-     * Default constructor (private).
-     */
-    private McElieceCCA2Primitives()
-    {
-    }
-
-    /**
-     * The McEliece encryption primitive.
-     *
-     * @param pubKey the public key
-     * @param m      the message vector
-     * @param z      the error vector
-     * @return <tt>m*G + z</tt>
-     */
-    public static GF2Vector encryptionPrimitive(BCMcElieceCCA2PublicKey pubKey,
-                                                GF2Vector m, GF2Vector z)
-    {
-
-        GF2Matrix matrixG = pubKey.getG();
-        Vector mG = matrixG.leftMultiplyLeftCompactForm(m);
-        return (GF2Vector)mG.add(z);
-    }
-
-    public static GF2Vector encryptionPrimitive(McElieceCCA2PublicKeyParameters pubKey,
-                                                GF2Vector m, GF2Vector z)
-    {
-
-        GF2Matrix matrixG = pubKey.getMatrixG();
-        Vector mG = matrixG.leftMultiplyLeftCompactForm(m);
-        return (GF2Vector)mG.add(z);
-    }
-
-    /**
-     * The McEliece decryption primitive.
-     *
-     * @param privKey the private key
-     * @param c       the ciphertext vector <tt>c = m*G + z</tt>
-     * @return the message vector <tt>m</tt> and the error vector <tt>z</tt>
-     */
-    public static GF2Vector[] decryptionPrimitive(
-        BCMcElieceCCA2PrivateKey privKey, GF2Vector c)
-    {
-
-        // obtain values from private key
-        int k = privKey.getK();
-        Permutation p = privKey.getP();
-        GF2mField field = privKey.getField();
-        PolynomialGF2mSmallM gp = privKey.getGoppaPoly();
-        GF2Matrix h = privKey.getH();
-        PolynomialGF2mSmallM[] q = privKey.getQInv();
-
-        // compute inverse permutation P^-1
-        Permutation pInv = p.computeInverse();
-
-        // multiply c with permutation P^-1
-        GF2Vector cPInv = (GF2Vector)c.multiply(pInv);
-
-        // compute syndrome of cP^-1
-        GF2Vector syndVec = (GF2Vector)h.rightMultiply(cPInv);
-
-        // decode syndrome
-        GF2Vector errors = GoppaCode.syndromeDecode(syndVec, field, gp, q);
-        GF2Vector mG = (GF2Vector)cPInv.add(errors);
-
-        // multiply codeword and error vector with P
-        mG = (GF2Vector)mG.multiply(p);
-        errors = (GF2Vector)errors.multiply(p);
-
-        // extract plaintext vector (last k columns of mG)
-        GF2Vector m = mG.extractRightVector(k);
-
-        // return vectors
-        return new GF2Vector[]{m, errors};
-    }
-
-    public static GF2Vector[] decryptionPrimitive(
-        McElieceCCA2PrivateKeyParameters privKey, GF2Vector c)
-    {
-
-        // obtain values from private key
-        int k = privKey.getK();
-        Permutation p = privKey.getP();
-        GF2mField field = privKey.getField();
-        PolynomialGF2mSmallM gp = privKey.getGoppaPoly();
-        GF2Matrix h = privKey.getH();
-        PolynomialGF2mSmallM[] q = privKey.getQInv();
-
-        // compute inverse permutation P^-1
-        Permutation pInv = p.computeInverse();
-
-        // multiply c with permutation P^-1
-        GF2Vector cPInv = (GF2Vector)c.multiply(pInv);
-
-        // compute syndrome of cP^-1
-        GF2Vector syndVec = (GF2Vector)h.rightMultiply(cPInv);
-
-        // decode syndrome
-        GF2Vector errors = GoppaCode.syndromeDecode(syndVec, field, gp, q);
-        GF2Vector mG = (GF2Vector)cPInv.add(errors);
-
-        // multiply codeword and error vector with P
-        mG = (GF2Vector)mG.multiply(p);
-        errors = (GF2Vector)errors.multiply(p);
-
-        // extract plaintext vector (last k columns of mG)
-        GF2Vector m = mG.extractRightVector(k);
-
-        // return vectors
-        return new GF2Vector[]{m, errors};
-    }
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/provider/mceliece/McElieceFujisakiCipherSpi.java b/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/provider/mceliece/McElieceFujisakiCipherSpi.java
deleted file mode 100644
index 5320c22..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/provider/mceliece/McElieceFujisakiCipherSpi.java
+++ /dev/null
@@ -1,253 +0,0 @@
-package org.bouncycastle.pqc.jcajce.provider.mceliece;
-
-import java.io.ByteArrayOutputStream;
-import java.security.InvalidAlgorithmParameterException;
-import java.security.InvalidKeyException;
-import java.security.Key;
-import java.security.NoSuchAlgorithmException;
-import java.security.PrivateKey;
-import java.security.PublicKey;
-import java.security.SecureRandom;
-import java.security.spec.AlgorithmParameterSpec;
-
-import javax.crypto.BadPaddingException;
-import javax.crypto.IllegalBlockSizeException;
-
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.asn1.x509.X509ObjectIdentifiers;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.digests.SHA1Digest;
-import org.bouncycastle.crypto.digests.SHA224Digest;
-import org.bouncycastle.crypto.digests.SHA256Digest;
-import org.bouncycastle.crypto.digests.SHA384Digest;
-import org.bouncycastle.crypto.digests.SHA512Digest;
-import org.bouncycastle.crypto.params.ParametersWithRandom;
-import org.bouncycastle.pqc.crypto.mceliece.McElieceCCA2KeyParameters;
-import org.bouncycastle.pqc.crypto.mceliece.McElieceFujisakiCipher;
-import org.bouncycastle.pqc.jcajce.provider.util.AsymmetricHybridCipher;
-
-public class McElieceFujisakiCipherSpi
-    extends AsymmetricHybridCipher
-    implements PKCSObjectIdentifiers, X509ObjectIdentifiers
-{
-    // TODO digest needed?
-    private Digest digest;
-    private McElieceFujisakiCipher cipher;
-
-    /**
-     * buffer to store the input data
-     */
-    private ByteArrayOutputStream buf;
-
-
-    protected McElieceFujisakiCipherSpi(Digest digest, McElieceFujisakiCipher cipher)
-    {
-        this.digest = digest;
-        this.cipher = cipher;
-        buf = new ByteArrayOutputStream();
-
-    }
-
-    /**
-     * Continue a multiple-part encryption or decryption operation.
-     *
-     * @param input byte array containing the next part of the input
-     * @param inOff index in the array where the input starts
-     * @param inLen length of the input
-     * @return the processed byte array.
-     */
-    public byte[] update(byte[] input, int inOff, int inLen)
-    {
-        buf.write(input, inOff, inLen);
-        return new byte[0];
-    }
-
-
-    /**
-     * Encrypts or decrypts data in a single-part operation, or finishes a
-     * multiple-part operation. The data is encrypted or decrypted, depending on
-     * how this cipher was initialized.
-     *
-     * @param input the input buffer
-     * @param inOff the offset in input where the input starts
-     * @param inLen the input length
-     * @return the new buffer with the result
-     * @throws BadPaddingException on deryption errors.
-     */
-    public byte[] doFinal(byte[] input, int inOff, int inLen)
-        throws BadPaddingException
-    {
-        update(input, inOff, inLen);
-        byte[] data = buf.toByteArray();
-        buf.reset();
-        if (opMode == ENCRYPT_MODE)
-        {
-
-            try
-            {
-                return cipher.messageEncrypt(data);
-            }
-            catch (Exception e)
-            {
-                e.printStackTrace();
-            }
-
-        }
-        else if (opMode == DECRYPT_MODE)
-        {
-
-            try
-            {
-                return cipher.messageDecrypt(data);
-            }
-            catch (Exception e)
-            {
-                e.printStackTrace();
-            }
-
-        }
-        return null;
-    }
-
-
-    protected int encryptOutputSize(int inLen)
-    {
-        return 0;
-    }
-
-    protected int decryptOutputSize(int inLen)
-    {
-        return 0;
-    }
-
-    protected void initCipherEncrypt(Key key, AlgorithmParameterSpec params,
-                                     SecureRandom sr)
-        throws InvalidKeyException,
-        InvalidAlgorithmParameterException
-    {
-
-        CipherParameters param;
-        param = McElieceCCA2KeysToParams.generatePublicKeyParameter((PublicKey)key);
-
-        param = new ParametersWithRandom(param, sr);
-        digest.reset();
-        cipher.init(true, param);
-
-    }
-
-    protected void initCipherDecrypt(Key key, AlgorithmParameterSpec params)
-        throws InvalidKeyException, InvalidAlgorithmParameterException
-    {
-
-        CipherParameters param;
-        param = McElieceCCA2KeysToParams.generatePrivateKeyParameter((PrivateKey)key);
-
-        digest.reset();
-        cipher.init(false, param);
-    }
-
-    public String getName()
-    {
-        return "McElieceFujisakiCipher";
-    }
-
-    public int getKeySize(Key key)
-        throws InvalidKeyException
-    {
-        McElieceCCA2KeyParameters mcElieceCCA2KeyParameters;
-        if (key instanceof PublicKey)
-        {
-            mcElieceCCA2KeyParameters = (McElieceCCA2KeyParameters)McElieceCCA2KeysToParams.generatePublicKeyParameter((PublicKey)key);
-        }
-        else
-        {
-            mcElieceCCA2KeyParameters = (McElieceCCA2KeyParameters)McElieceCCA2KeysToParams.generatePrivateKeyParameter((PrivateKey)key);
-
-        }
-
-
-        return cipher.getKeySize(mcElieceCCA2KeyParameters);
-    }
-
-    public byte[] messageEncrypt(byte[] input)
-        throws IllegalBlockSizeException, BadPaddingException, NoSuchAlgorithmException
-    {
-        byte[] output = null;
-        try
-        {
-            output = cipher.messageEncrypt(input);
-        }
-        catch (Exception e)
-        {
-            e.printStackTrace();
-        }
-        return output;
-    }
-
-
-    public byte[] messageDecrypt(byte[] input)
-        throws IllegalBlockSizeException, BadPaddingException, NoSuchAlgorithmException
-    {
-        byte[] output = null;
-        try
-        {
-            output = cipher.messageDecrypt(input);
-        }
-        catch (Exception e)
-        {
-            e.printStackTrace();
-        }
-        return output;
-    }
-
-
-    //////////////////////////////////////////////////////////////////////////////////
-
-    static public class McElieceFujisaki
-        extends McElieceFujisakiCipherSpi
-    {
-        public McElieceFujisaki()
-        {
-            super(new SHA1Digest(), new McElieceFujisakiCipher());
-        }
-    }
-
-    static public class McElieceFujisaki224
-        extends McElieceFujisakiCipherSpi
-    {
-        public McElieceFujisaki224()
-        {
-            super(new SHA224Digest(), new McElieceFujisakiCipher());
-        }
-    }
-
-    static public class McElieceFujisaki256
-        extends McElieceFujisakiCipherSpi
-    {
-        public McElieceFujisaki256()
-        {
-            super(new SHA256Digest(), new McElieceFujisakiCipher());
-        }
-    }
-
-    static public class McElieceFujisaki384
-        extends McElieceFujisakiCipherSpi
-    {
-        public McElieceFujisaki384()
-        {
-            super(new SHA384Digest(), new McElieceFujisakiCipher());
-        }
-    }
-
-    static public class McElieceFujisaki512
-        extends McElieceFujisakiCipherSpi
-    {
-        public McElieceFujisaki512()
-        {
-            super(new SHA512Digest(), new McElieceFujisakiCipher());
-        }
-    }
-
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/provider/mceliece/McElieceKeyFactorySpi.java b/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/provider/mceliece/McElieceKeyFactorySpi.java
deleted file mode 100644
index c1df9e9..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/provider/mceliece/McElieceKeyFactorySpi.java
+++ /dev/null
@@ -1,343 +0,0 @@
-package org.bouncycastle.pqc.jcajce.provider.mceliece;
-
-import java.io.IOException;
-import java.math.BigInteger;
-import java.security.InvalidKeyException;
-import java.security.Key;
-import java.security.KeyFactorySpi;
-import java.security.PrivateKey;
-import java.security.PublicKey;
-import java.security.spec.InvalidKeySpecException;
-import java.security.spec.KeySpec;
-import java.security.spec.PKCS8EncodedKeySpec;
-import java.security.spec.X509EncodedKeySpec;
-
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.bouncycastle.pqc.asn1.McEliecePrivateKey;
-import org.bouncycastle.pqc.asn1.McEliecePublicKey;
-import org.bouncycastle.pqc.jcajce.spec.McEliecePrivateKeySpec;
-import org.bouncycastle.pqc.jcajce.spec.McEliecePublicKeySpec;
-
-/**
- * This class is used to translate between McEliece keys and key specifications.
- *
- * @see BCMcEliecePrivateKey
- * @see McEliecePrivateKeySpec
- * @see BCMcEliecePublicKey
- * @see McEliecePublicKeySpec
- */
-public class McElieceKeyFactorySpi
-    extends KeyFactorySpi
-{
-    /**
-     * The OID of the algorithm.
-     */
-    public static final String OID = "1.3.6.1.4.1.8301.3.1.3.4.1";
-
-    /**
-     * Converts, if possible, a key specification into a
-     * {@link BCMcEliecePublicKey}. Currently, the following key specifications
-     * are supported: {@link McEliecePublicKeySpec}, {@link X509EncodedKeySpec}.
-     *
-     * @param keySpec the key specification
-     * @return the McEliece public key
-     * @throws InvalidKeySpecException if the key specification is not supported.
-     */
-    public PublicKey generatePublic(KeySpec keySpec)
-        throws InvalidKeySpecException
-    {
-        if (keySpec instanceof McEliecePublicKeySpec)
-        {
-            return new BCMcEliecePublicKey((McEliecePublicKeySpec)keySpec);
-        }
-        else if (keySpec instanceof X509EncodedKeySpec)
-        {
-            // get the DER-encoded Key according to X.509 from the spec
-            byte[] encKey = ((X509EncodedKeySpec)keySpec).getEncoded();
-
-            // decode the SubjectPublicKeyInfo data structure to the pki object
-            SubjectPublicKeyInfo pki;
-            try
-            {
-                pki = SubjectPublicKeyInfo.getInstance(ASN1Primitive.fromByteArray(encKey));
-            }
-            catch (IOException e)
-            {
-                throw new InvalidKeySpecException(e.toString());
-            }
-
-            try
-            {
-                // --- Build and return the actual key.
-                ASN1Primitive innerType = pki.parsePublicKey();
-                ASN1Sequence publicKey = (ASN1Sequence)innerType;
-
-                // decode oidString (but we don't need it right now)
-                String oidString = ((ASN1ObjectIdentifier)publicKey.getObjectAt(0))
-                    .toString();
-
-                // decode <n>
-                BigInteger bigN = ((ASN1Integer)publicKey.getObjectAt(1)).getValue();
-                int n = bigN.intValue();
-
-                // decode <t>
-                BigInteger bigT = ((ASN1Integer)publicKey.getObjectAt(2)).getValue();
-                int t = bigT.intValue();
-
-                // decode <matrixG>
-                byte[] matrixG = ((ASN1OctetString)publicKey.getObjectAt(3)).getOctets();
-
-
-                return new BCMcEliecePublicKey(new McEliecePublicKeySpec(OID, t, n,
-                    matrixG));
-            }
-            catch (IOException cce)
-            {
-                throw new InvalidKeySpecException(
-                    "Unable to decode X509EncodedKeySpec: "
-                        + cce.getMessage());
-            }
-        }
-
-        throw new InvalidKeySpecException("Unsupported key specification: "
-            + keySpec.getClass() + ".");
-    }
-
-    /**
-     * Converts, if possible, a key specification into a
-     * {@link BCMcEliecePrivateKey}. Currently, the following key specifications
-     * are supported: {@link McEliecePrivateKeySpec},
-     * {@link PKCS8EncodedKeySpec}.
-     *
-     * @param keySpec the key specification
-     * @return the McEliece private key
-     * @throws InvalidKeySpecException if the KeySpec is not supported.
-     */
-    public PrivateKey generatePrivate(KeySpec keySpec)
-        throws InvalidKeySpecException
-    {
-        if (keySpec instanceof McEliecePrivateKeySpec)
-        {
-            return new BCMcEliecePrivateKey((McEliecePrivateKeySpec)keySpec);
-        }
-        else if (keySpec instanceof PKCS8EncodedKeySpec)
-        {
-            // get the DER-encoded Key according to PKCS#8 from the spec
-            byte[] encKey = ((PKCS8EncodedKeySpec)keySpec).getEncoded();
-
-            // decode the PKCS#8 data structure to the pki object
-            PrivateKeyInfo pki;
-
-            try
-            {
-                pki = PrivateKeyInfo.getInstance(ASN1Primitive.fromByteArray(encKey));
-            }
-            catch (IOException e)
-            {
-                throw new InvalidKeySpecException("Unable to decode PKCS8EncodedKeySpec: " + e);
-            }
-
-            try
-            {
-                ASN1Primitive innerType = pki.parsePrivateKey().toASN1Primitive();
-
-                // build and return the actual key
-                ASN1Sequence privKey = (ASN1Sequence)innerType;
-
-                // decode oidString (but we don't need it right now)
-                String oidString = ((ASN1ObjectIdentifier)privKey.getObjectAt(0))
-                    .toString();
-
-                // decode <n>
-                BigInteger bigN = ((ASN1Integer)privKey.getObjectAt(1)).getValue();
-                int n = bigN.intValue();
-
-                // decode <k>
-                BigInteger bigK = ((ASN1Integer)privKey.getObjectAt(2)).getValue();
-                int k = bigK.intValue();
-
-                // decode <fieldPoly>
-                byte[] encFieldPoly = ((ASN1OctetString)privKey.getObjectAt(3))
-                    .getOctets();
-                // decode <goppaPoly>
-                byte[] encGoppaPoly = ((ASN1OctetString)privKey.getObjectAt(4))
-                    .getOctets();
-
-                // decode <sInv>
-                byte[] encSInv = ((ASN1OctetString)privKey.getObjectAt(5)).getOctets();
-                // decode <p1>
-                byte[] encP1 = ((ASN1OctetString)privKey.getObjectAt(6)).getOctets();
-                // decode <p2>
-                byte[] encP2 = ((ASN1OctetString)privKey.getObjectAt(7)).getOctets();
-
-                //decode <h>
-                byte[] encH = ((ASN1OctetString)privKey.getObjectAt(8)).getOctets();
-
-                // decode <qInv>
-                ASN1Sequence qSeq = (ASN1Sequence)privKey.getObjectAt(9);
-                byte[][] encQInv = new byte[qSeq.size()][];
-                for (int i = 0; i < qSeq.size(); i++)
-                {
-                    encQInv[i] = ((ASN1OctetString)qSeq.getObjectAt(i)).getOctets();
-                }
-
-                return new BCMcEliecePrivateKey(new McEliecePrivateKeySpec(OID, n, k,
-                    encFieldPoly, encGoppaPoly, encSInv, encP1, encP2,
-                    encH, encQInv));
-
-            }
-            catch (IOException cce)
-            {
-                throw new InvalidKeySpecException(
-                    "Unable to decode PKCS8EncodedKeySpec.");
-            }
-        }
-
-        throw new InvalidKeySpecException("Unsupported key specification: "
-            + keySpec.getClass() + ".");
-    }
-
-    /**
-     * Converts, if possible, a given key into a key specification. Currently,
-     * the following key specifications are supported:
-     * <ul>
-     * <li>for McEliecePublicKey: {@link X509EncodedKeySpec},
-     * {@link McEliecePublicKeySpec}</li>
-     * <li>for McEliecePrivateKey: {@link PKCS8EncodedKeySpec},
-     * {@link McEliecePrivateKeySpec}</li>.
-     * </ul>
-     *
-     * @param key     the key
-     * @param keySpec the key specification
-     * @return the specification of the McEliece key
-     * @throws InvalidKeySpecException if the key type or the key specification is not
-     * supported.
-     * @see BCMcEliecePrivateKey
-     * @see McEliecePrivateKeySpec
-     * @see BCMcEliecePublicKey
-     * @see McEliecePublicKeySpec
-     */
-    public KeySpec getKeySpec(Key key, Class keySpec)
-        throws InvalidKeySpecException
-    {
-        if (key instanceof BCMcEliecePrivateKey)
-        {
-            if (PKCS8EncodedKeySpec.class.isAssignableFrom(keySpec))
-            {
-                return new PKCS8EncodedKeySpec(key.getEncoded());
-            }
-            else if (McEliecePrivateKeySpec.class.isAssignableFrom(keySpec))
-            {
-                BCMcEliecePrivateKey privKey = (BCMcEliecePrivateKey)key;
-                return new McEliecePrivateKeySpec(OID, privKey.getN(), privKey
-                    .getK(), privKey.getField(), privKey.getGoppaPoly(),
-                    privKey.getSInv(), privKey.getP1(), privKey.getP2(),
-                    privKey.getH(), privKey.getQInv());
-            }
-        }
-        else if (key instanceof BCMcEliecePublicKey)
-        {
-            if (X509EncodedKeySpec.class.isAssignableFrom(keySpec))
-            {
-                return new X509EncodedKeySpec(key.getEncoded());
-            }
-            else if (McEliecePublicKeySpec.class.isAssignableFrom(keySpec))
-            {
-                BCMcEliecePublicKey pubKey = (BCMcEliecePublicKey)key;
-                return new McEliecePublicKeySpec(OID, pubKey.getN(), pubKey.getT(),
-                    pubKey.getG());
-            }
-        }
-        else
-        {
-            throw new InvalidKeySpecException("Unsupported key type: "
-                + key.getClass() + ".");
-        }
-
-        throw new InvalidKeySpecException("Unknown key specification: "
-            + keySpec + ".");
-    }
-
-    /**
-     * Translates a key into a form known by the FlexiProvider. Currently, only
-     * the following "source" keys are supported: {@link BCMcEliecePrivateKey},
-     * {@link BCMcEliecePublicKey}.
-     *
-     * @param key the key
-     * @return a key of a known key type
-     * @throws InvalidKeyException if the key type is not supported.
-     */
-    public Key translateKey(Key key)
-        throws InvalidKeyException
-    {
-        if ((key instanceof BCMcEliecePrivateKey)
-            || (key instanceof BCMcEliecePublicKey))
-        {
-            return key;
-        }
-        throw new InvalidKeyException("Unsupported key type.");
-
-    }
-
-    public PublicKey generatePublic(SubjectPublicKeyInfo pki)
-        throws InvalidKeySpecException
-    {
-        // get the inner type inside the BIT STRING
-        try
-        {
-            ASN1Primitive innerType = pki.parsePublicKey();
-            McEliecePublicKey key = McEliecePublicKey.getInstance(innerType);
-            return new BCMcEliecePublicKey(key.getOID().getId(), key.getN(), key.getT(), key.getG());
-        }
-        catch (IOException cce)
-        {
-            throw new InvalidKeySpecException("Unable to decode X509EncodedKeySpec");
-        }
-    }
-
-    public PrivateKey generatePrivate(PrivateKeyInfo pki)
-        throws InvalidKeySpecException
-    {
-        // get the inner type inside the BIT STRING
-        try
-        {
-            ASN1Primitive innerType = pki.parsePrivateKey().toASN1Primitive();
-            McEliecePrivateKey key = McEliecePrivateKey.getInstance(innerType);
-            return new BCMcEliecePrivateKey(key.getOID().getId(), key.getN(), key.getK(), key.getField(), key.getGoppaPoly(), key.getSInv(), key.getP1(), key.getP2(), key.getH(), key.getQInv());
-        }
-        catch (IOException cce)
-        {
-            throw new InvalidKeySpecException("Unable to decode PKCS8EncodedKeySpec");
-        }
-    }
-
-    protected PublicKey engineGeneratePublic(KeySpec keySpec)
-        throws InvalidKeySpecException
-    {
-        return null;  //To change body of implemented methods use File | Settings | File Templates.
-    }
-
-    protected PrivateKey engineGeneratePrivate(KeySpec keySpec)
-        throws InvalidKeySpecException
-    {
-        return null;  //To change body of implemented methods use File | Settings | File Templates.
-    }
-
-    protected KeySpec engineGetKeySpec(Key key, Class tClass)
-        throws InvalidKeySpecException
-    {
-        return null;  //To change body of implemented methods use File | Settings | File Templates.
-    }
-
-    protected Key engineTranslateKey(Key key)
-        throws InvalidKeyException
-    {
-        return null;  //To change body of implemented methods use File | Settings | File Templates.
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/provider/mceliece/McElieceKeyPairGeneratorSpi.java b/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/provider/mceliece/McElieceKeyPairGeneratorSpi.java
deleted file mode 100644
index 75008fe..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/provider/mceliece/McElieceKeyPairGeneratorSpi.java
+++ /dev/null
@@ -1,146 +0,0 @@
-package org.bouncycastle.pqc.jcajce.provider.mceliece;
-
-import java.security.InvalidAlgorithmParameterException;
-import java.security.KeyPair;
-import java.security.KeyPairGenerator;
-import java.security.SecureRandom;
-import java.security.spec.AlgorithmParameterSpec;
-
-import org.bouncycastle.crypto.AsymmetricCipherKeyPair;
-import org.bouncycastle.pqc.crypto.mceliece.McElieceCCA2KeyGenerationParameters;
-import org.bouncycastle.pqc.crypto.mceliece.McElieceCCA2KeyPairGenerator;
-import org.bouncycastle.pqc.crypto.mceliece.McElieceCCA2Parameters;
-import org.bouncycastle.pqc.crypto.mceliece.McElieceCCA2PrivateKeyParameters;
-import org.bouncycastle.pqc.crypto.mceliece.McElieceCCA2PublicKeyParameters;
-import org.bouncycastle.pqc.crypto.mceliece.McElieceKeyGenerationParameters;
-import org.bouncycastle.pqc.crypto.mceliece.McElieceKeyPairGenerator;
-import org.bouncycastle.pqc.crypto.mceliece.McElieceParameters;
-import org.bouncycastle.pqc.crypto.mceliece.McEliecePrivateKeyParameters;
-import org.bouncycastle.pqc.crypto.mceliece.McEliecePublicKeyParameters;
-import org.bouncycastle.pqc.jcajce.spec.ECCKeyGenParameterSpec;
-import org.bouncycastle.pqc.jcajce.spec.McElieceCCA2ParameterSpec;
-
-public abstract class McElieceKeyPairGeneratorSpi
-    extends KeyPairGenerator
-{
-    public McElieceKeyPairGeneratorSpi(
-        String algorithmName)
-    {
-        super(algorithmName);
-    }
-
-    /**
-     *
-     *
-     *
-     */
-
-    public static class McElieceCCA2
-        extends McElieceKeyPairGeneratorSpi
-    {
-
-        McElieceCCA2KeyPairGenerator kpg;
-
-
-        public McElieceCCA2()
-        {
-            super("McElieceCCA-2");
-        }
-
-        public McElieceCCA2(String s)
-        {
-            super(s);
-        }
-
-        public void initialize(AlgorithmParameterSpec params)
-            throws InvalidAlgorithmParameterException
-        {
-            kpg = new McElieceCCA2KeyPairGenerator();
-            super.initialize(params);
-            ECCKeyGenParameterSpec ecc = (ECCKeyGenParameterSpec)params;
-
-            McElieceCCA2KeyGenerationParameters mccca2KGParams = new McElieceCCA2KeyGenerationParameters(new SecureRandom(), new McElieceCCA2Parameters(ecc.getM(), ecc.getT()));
-            kpg.init(mccca2KGParams);
-        }
-
-        public void initialize(int keySize, SecureRandom random)
-        {
-            McElieceCCA2ParameterSpec paramSpec = new McElieceCCA2ParameterSpec();
-
-            // call the initializer with the chosen parameters
-            try
-            {
-                this.initialize(paramSpec);
-            }
-            catch (InvalidAlgorithmParameterException ae)
-            {
-            }
-        }
-
-        public KeyPair generateKeyPair()
-        {
-            AsymmetricCipherKeyPair generateKeyPair = kpg.generateKeyPair();
-            McElieceCCA2PrivateKeyParameters sk = (McElieceCCA2PrivateKeyParameters)generateKeyPair.getPrivate();
-            McElieceCCA2PublicKeyParameters pk = (McElieceCCA2PublicKeyParameters)generateKeyPair.getPublic();
-
-            return new KeyPair(new BCMcElieceCCA2PublicKey(pk), new BCMcElieceCCA2PrivateKey(sk));
-
-        }
-
-    }
-
-    /**
-     *
-     *
-     *
-     */
-
-    public static class McEliece
-        extends McElieceKeyPairGeneratorSpi
-    {
-
-        McElieceKeyPairGenerator kpg;
-
-
-        public McEliece()
-        {
-            super("McEliece");
-        }
-
-        public void initialize(AlgorithmParameterSpec params)
-            throws InvalidAlgorithmParameterException
-        {
-            kpg = new McElieceKeyPairGenerator();
-            super.initialize(params);
-            ECCKeyGenParameterSpec ecc = (ECCKeyGenParameterSpec)params;
-
-            McElieceKeyGenerationParameters mccKGParams = new McElieceKeyGenerationParameters(new SecureRandom(), new McElieceParameters(ecc.getM(), ecc.getT()));
-            kpg.init(mccKGParams);
-        }
-
-        public void initialize(int keySize, SecureRandom random)
-        {
-            ECCKeyGenParameterSpec paramSpec = new ECCKeyGenParameterSpec();
-
-            // call the initializer with the chosen parameters
-            try
-            {
-                this.initialize(paramSpec);
-            }
-            catch (InvalidAlgorithmParameterException ae)
-            {
-            }
-        }
-
-        public KeyPair generateKeyPair()
-        {
-            AsymmetricCipherKeyPair generateKeyPair = kpg.generateKeyPair();
-            McEliecePrivateKeyParameters sk = (McEliecePrivateKeyParameters)generateKeyPair.getPrivate();
-            McEliecePublicKeyParameters pk = (McEliecePublicKeyParameters)generateKeyPair.getPublic();
-
-            return new KeyPair(new BCMcEliecePublicKey(pk), new BCMcEliecePrivateKey(sk));
-        }
-
-    }
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/provider/mceliece/McElieceKeysToParams.java b/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/provider/mceliece/McElieceKeysToParams.java
deleted file mode 100644
index 23686b8..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/provider/mceliece/McElieceKeysToParams.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package org.bouncycastle.pqc.jcajce.provider.mceliece;
-
-import java.security.InvalidKeyException;
-import java.security.PrivateKey;
-import java.security.PublicKey;
-
-import org.bouncycastle.crypto.params.AsymmetricKeyParameter;
-import org.bouncycastle.pqc.crypto.mceliece.McEliecePrivateKeyParameters;
-import org.bouncycastle.pqc.crypto.mceliece.McEliecePublicKeyParameters;
-
-/**
- * utility class for converting jce/jca McEliece objects
- * objects into their org.bouncycastle.crypto counterparts.
- */
-public class McElieceKeysToParams
-{
-
-
-    static public AsymmetricKeyParameter generatePublicKeyParameter(
-        PublicKey key)
-        throws InvalidKeyException
-    {
-        if (key instanceof BCMcEliecePublicKey)
-        {
-            BCMcEliecePublicKey k = (BCMcEliecePublicKey)key;
-
-            return new McEliecePublicKeyParameters(k.getOIDString(), k.getN(), k.getT(), k.getG(), k.getMcElieceParameters());
-        }
-
-        throw new InvalidKeyException("can't identify McEliece public key: " + key.getClass().getName());
-    }
-
-
-    static public AsymmetricKeyParameter generatePrivateKeyParameter(
-        PrivateKey key)
-        throws InvalidKeyException
-    {
-        if (key instanceof BCMcEliecePrivateKey)
-        {
-            BCMcEliecePrivateKey k = (BCMcEliecePrivateKey)key;
-            return new McEliecePrivateKeyParameters(k.getOIDString(), k.getN(), k.getK(), k.getField(), k.getGoppaPoly(),
-                k.getSInv(), k.getP1(), k.getP2(), k.getH(), k.getQInv(), k.getMcElieceParameters());
-        }
-
-        throw new InvalidKeyException("can't identify McEliece private key.");
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/provider/mceliece/McElieceKobaraImaiCipherSpi.java b/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/provider/mceliece/McElieceKobaraImaiCipherSpi.java
deleted file mode 100644
index 36c6231..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/provider/mceliece/McElieceKobaraImaiCipherSpi.java
+++ /dev/null
@@ -1,307 +0,0 @@
-package org.bouncycastle.pqc.jcajce.provider.mceliece;
-
-import java.io.ByteArrayOutputStream;
-import java.security.InvalidAlgorithmParameterException;
-import java.security.InvalidKeyException;
-import java.security.Key;
-import java.security.NoSuchAlgorithmException;
-import java.security.PrivateKey;
-import java.security.PublicKey;
-import java.security.SecureRandom;
-import java.security.spec.AlgorithmParameterSpec;
-
-import javax.crypto.BadPaddingException;
-import javax.crypto.IllegalBlockSizeException;
-
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.asn1.x509.X509ObjectIdentifiers;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.digests.SHA1Digest;
-import org.bouncycastle.crypto.digests.SHA224Digest;
-import org.bouncycastle.crypto.digests.SHA256Digest;
-import org.bouncycastle.crypto.digests.SHA384Digest;
-import org.bouncycastle.crypto.digests.SHA512Digest;
-import org.bouncycastle.crypto.params.ParametersWithRandom;
-import org.bouncycastle.pqc.crypto.mceliece.McElieceCCA2KeyParameters;
-import org.bouncycastle.pqc.crypto.mceliece.McElieceKobaraImaiCipher;
-import org.bouncycastle.pqc.jcajce.provider.util.AsymmetricHybridCipher;
-
-public class McElieceKobaraImaiCipherSpi
-    extends AsymmetricHybridCipher
-    implements PKCSObjectIdentifiers, X509ObjectIdentifiers
-{
-
-    // TODO digest needed?
-    private Digest digest;
-    private McElieceKobaraImaiCipher cipher;
-
-    /**
-     * buffer to store the input data
-     */
-    private ByteArrayOutputStream buf = new ByteArrayOutputStream();
-
-
-    public McElieceKobaraImaiCipherSpi()
-    {
-        buf = new ByteArrayOutputStream();
-    }
-
-    protected McElieceKobaraImaiCipherSpi(Digest digest, McElieceKobaraImaiCipher cipher)
-    {
-        this.digest = digest;
-        this.cipher = cipher;
-        buf = new ByteArrayOutputStream();
-    }
-
-    /**
-     * Continue a multiple-part encryption or decryption operation.
-     *
-     * @param input byte array containing the next part of the input
-     * @param inOff index in the array where the input starts
-     * @param inLen length of the input
-     * @return the processed byte array.
-     */
-    public byte[] update(byte[] input, int inOff, int inLen)
-    {
-        buf.write(input, inOff, inLen);
-        return new byte[0];
-    }
-
-
-    /**
-     * Encrypts or decrypts data in a single-part operation, or finishes a
-     * multiple-part operation. The data is encrypted or decrypted, depending on
-     * how this cipher was initialized.
-     *
-     * @param input the input buffer
-     * @param inOff the offset in input where the input starts
-     * @param inLen the input length
-     * @return the new buffer with the result
-     * @throws BadPaddingException if this cipher is in decryption mode, and (un)padding has
-     * been requested, but the decrypted data is not bounded by
-     * the appropriate padding bytes
-     */
-    public byte[] doFinal(byte[] input, int inOff, int inLen)
-        throws BadPaddingException
-    {
-        update(input, inOff, inLen);
-        if (opMode == ENCRYPT_MODE)
-        {
-
-            try
-            {
-                return cipher.messageEncrypt(this.pad());
-            }
-            catch (Exception e)
-            {
-                e.printStackTrace();
-            }
-
-        }
-        else if (opMode == DECRYPT_MODE)
-        {
-            byte[] inputOfDecr = buf.toByteArray();
-            buf.reset();
-
-            try
-            {
-                return unpad(cipher.messageDecrypt(inputOfDecr));
-            }
-            catch (Exception e)
-            {
-                e.printStackTrace();
-            }
-
-        }
-        return null;
-    }
-
-    protected int encryptOutputSize(int inLen)
-    {
-        return 0;
-    }
-
-    protected int decryptOutputSize(int inLen)
-    {
-        return 0;
-    }
-
-    protected void initCipherEncrypt(Key key, AlgorithmParameterSpec params,
-                                     SecureRandom sr)
-        throws InvalidKeyException,
-        InvalidAlgorithmParameterException
-    {
-
-        buf.reset();
-        CipherParameters param;
-        param = McElieceCCA2KeysToParams.generatePublicKeyParameter((PublicKey)key);
-
-        param = new ParametersWithRandom(param, sr);
-        digest.reset();
-        cipher.init(true, param);
-    }
-
-    protected void initCipherDecrypt(Key key, AlgorithmParameterSpec params)
-        throws InvalidKeyException, InvalidAlgorithmParameterException
-    {
-
-        buf.reset();
-        CipherParameters param;
-        param = McElieceCCA2KeysToParams.generatePrivateKeyParameter((PrivateKey)key);
-
-        digest.reset();
-        cipher.init(false, param);
-    }
-
-    public String getName()
-    {
-        return "McElieceKobaraImaiCipher";
-    }
-
-    public int getKeySize(Key key)
-        throws InvalidKeyException
-    {
-        McElieceCCA2KeyParameters mcElieceCCA2KeyParameters;
-        if (key instanceof PublicKey)
-        {
-            mcElieceCCA2KeyParameters = (McElieceCCA2KeyParameters)McElieceCCA2KeysToParams.generatePublicKeyParameter((PublicKey)key);
-            return cipher.getKeySize(mcElieceCCA2KeyParameters);
-        }
-        else if (key instanceof PrivateKey)
-        {
-            mcElieceCCA2KeyParameters = (McElieceCCA2KeyParameters)McElieceCCA2KeysToParams.generatePrivateKeyParameter((PrivateKey)key);
-            return cipher.getKeySize(mcElieceCCA2KeyParameters);
-        }
-        else
-        {
-            throw new InvalidKeyException();
-        }
-
-
-    }
-
-    /**
-     * Pad and return the message stored in the message buffer.
-     *
-     * @return the padded message
-     */
-    private byte[] pad()
-    {
-        buf.write(0x01);
-        byte[] result = buf.toByteArray();
-        buf.reset();
-        return result;
-    }
-
-    /**
-     * Unpad a message.
-     *
-     * @param pmBytes the padded message
-     * @return the message
-     * @throws BadPaddingException if the padded message is invalid.
-     */
-    private byte[] unpad(byte[] pmBytes)
-        throws BadPaddingException
-    {
-        // find first non-zero byte
-        int index;
-        for (index = pmBytes.length - 1; index >= 0 && pmBytes[index] == 0; index--)
-        {
-            ;
-        }
-
-        // check if padding byte is valid
-        if (pmBytes[index] != 0x01)
-        {
-            throw new BadPaddingException("invalid ciphertext");
-        }
-
-        // extract and return message
-        byte[] mBytes = new byte[index];
-        System.arraycopy(pmBytes, 0, mBytes, 0, index);
-        return mBytes;
-    }
-
-
-    public byte[] messageEncrypt()
-        throws IllegalBlockSizeException, BadPaddingException, NoSuchAlgorithmException
-    {
-        byte[] output = null;
-        try
-        {
-            output = cipher.messageEncrypt((this.pad()));
-        }
-        catch (Exception e)
-        {
-            e.printStackTrace();
-        }
-        return output;
-    }
-
-
-    public byte[] messageDecrypt()
-        throws IllegalBlockSizeException, BadPaddingException, NoSuchAlgorithmException
-    {
-        byte[] output = null;
-        byte[] inputOfDecr = buf.toByteArray();
-        buf.reset();
-        try
-        {
-            output = unpad(cipher.messageDecrypt(inputOfDecr));
-        }
-        catch (Exception e)
-        {
-            e.printStackTrace();
-        }
-        return output;
-    }
-
-
-    static public class McElieceKobaraImai
-        extends McElieceKobaraImaiCipherSpi
-    {
-        public McElieceKobaraImai()
-        {
-            super(new SHA1Digest(), new McElieceKobaraImaiCipher());
-        }
-    }
-
-    static public class McElieceKobaraImai224
-        extends McElieceKobaraImaiCipherSpi
-    {
-        public McElieceKobaraImai224()
-        {
-            super(new SHA224Digest(), new McElieceKobaraImaiCipher());
-        }
-    }
-
-    static public class McElieceKobaraImai256
-        extends McElieceKobaraImaiCipherSpi
-    {
-        public McElieceKobaraImai256()
-        {
-            super(new SHA256Digest(), new McElieceKobaraImaiCipher());
-        }
-    }
-
-    static public class McElieceKobaraImai384
-        extends McElieceKobaraImaiCipherSpi
-    {
-        public McElieceKobaraImai384()
-        {
-            super(new SHA384Digest(), new McElieceKobaraImaiCipher());
-        }
-    }
-
-    static public class McElieceKobaraImai512
-        extends McElieceKobaraImaiCipherSpi
-    {
-        public McElieceKobaraImai512()
-        {
-            super(new SHA512Digest(), new McElieceKobaraImaiCipher());
-        }
-    }
-
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/provider/mceliece/McEliecePKCSCipherSpi.java b/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/provider/mceliece/McEliecePKCSCipherSpi.java
deleted file mode 100644
index 583acbb..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/provider/mceliece/McEliecePKCSCipherSpi.java
+++ /dev/null
@@ -1,171 +0,0 @@
-package org.bouncycastle.pqc.jcajce.provider.mceliece;
-
-import java.security.InvalidAlgorithmParameterException;
-import java.security.InvalidKeyException;
-import java.security.Key;
-import java.security.PrivateKey;
-import java.security.PublicKey;
-import java.security.SecureRandom;
-import java.security.spec.AlgorithmParameterSpec;
-
-import javax.crypto.BadPaddingException;
-import javax.crypto.IllegalBlockSizeException;
-
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.asn1.x509.X509ObjectIdentifiers;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.digests.SHA1Digest;
-import org.bouncycastle.crypto.digests.SHA224Digest;
-import org.bouncycastle.crypto.digests.SHA256Digest;
-import org.bouncycastle.crypto.digests.SHA384Digest;
-import org.bouncycastle.crypto.digests.SHA512Digest;
-import org.bouncycastle.crypto.params.ParametersWithRandom;
-import org.bouncycastle.pqc.crypto.mceliece.McElieceKeyParameters;
-import org.bouncycastle.pqc.crypto.mceliece.McEliecePKCSCipher;
-import org.bouncycastle.pqc.jcajce.provider.util.AsymmetricBlockCipher;
-
-public class McEliecePKCSCipherSpi
-    extends AsymmetricBlockCipher
-    implements PKCSObjectIdentifiers, X509ObjectIdentifiers
-{
-    // TODO digest needed?
-    private Digest digest;
-    private McEliecePKCSCipher cipher;
-
-    public McEliecePKCSCipherSpi(Digest digest, McEliecePKCSCipher cipher)
-    {
-        this.digest = digest;
-        this.cipher = cipher;
-    }
-
-    protected void initCipherEncrypt(Key key, AlgorithmParameterSpec params,
-                                     SecureRandom sr)
-        throws InvalidKeyException,
-        InvalidAlgorithmParameterException
-    {
-
-        CipherParameters param;
-        param = McElieceKeysToParams.generatePublicKeyParameter((PublicKey)key);
-
-        param = new ParametersWithRandom(param, sr);
-        digest.reset();
-        cipher.init(true, param);
-        this.maxPlainTextSize = cipher.maxPlainTextSize;
-        this.cipherTextSize = cipher.cipherTextSize;
-    }
-
-    protected void initCipherDecrypt(Key key, AlgorithmParameterSpec params)
-        throws InvalidKeyException, InvalidAlgorithmParameterException
-    {
-        CipherParameters param;
-        param = McElieceKeysToParams.generatePrivateKeyParameter((PrivateKey)key);
-
-        digest.reset();
-        cipher.init(false, param);
-        this.maxPlainTextSize = cipher.maxPlainTextSize;
-        this.cipherTextSize = cipher.cipherTextSize;
-    }
-
-    protected byte[] messageEncrypt(byte[] input)
-        throws IllegalBlockSizeException, BadPaddingException
-    {
-        byte[] output = null;
-        try
-        {
-            output = cipher.messageEncrypt(input);
-        }
-        catch (Exception e)
-        {
-            e.printStackTrace();
-        }
-        return output;
-    }
-
-    protected byte[] messageDecrypt(byte[] input)
-        throws IllegalBlockSizeException, BadPaddingException
-    {
-        byte[] output = null;
-        try
-        {
-            output = cipher.messageDecrypt(input);
-        }
-        catch (Exception e)
-        {
-            e.printStackTrace();
-        }
-        return output;
-    }
-
-    public String getName()
-    {
-        return "McEliecePKCS";
-    }
-
-    public int getKeySize(Key key)
-        throws InvalidKeyException
-    {
-        McElieceKeyParameters mcElieceKeyParameters;
-        if (key instanceof PublicKey)
-        {
-            mcElieceKeyParameters = (McElieceKeyParameters)McElieceKeysToParams.generatePublicKeyParameter((PublicKey)key);
-        }
-        else
-        {
-            mcElieceKeyParameters = (McElieceKeyParameters)McElieceKeysToParams.generatePrivateKeyParameter((PrivateKey)key);
-
-        }
-
-
-        return cipher.getKeySize(mcElieceKeyParameters);
-    }
-
-    //////////////////////////////////////////////////////////////////////////////////
-
-    static public class McEliecePKCS
-        extends McEliecePKCSCipherSpi
-    {
-        public McEliecePKCS()
-        {
-            super(new SHA1Digest(), new McEliecePKCSCipher());
-        }
-    }
-
-    static public class McEliecePKCS224
-        extends McEliecePKCSCipherSpi
-    {
-        public McEliecePKCS224()
-        {
-            super(new SHA224Digest(), new McEliecePKCSCipher());
-        }
-    }
-
-    static public class McEliecePKCS256
-        extends McEliecePKCSCipherSpi
-    {
-        public McEliecePKCS256()
-        {
-            super(new SHA256Digest(), new McEliecePKCSCipher());
-        }
-    }
-
-    static public class McEliecePKCS384
-        extends McEliecePKCSCipherSpi
-    {
-        public McEliecePKCS384()
-        {
-            super(new SHA384Digest(), new McEliecePKCSCipher());
-        }
-    }
-
-    static public class McEliecePKCS512
-        extends McEliecePKCSCipherSpi
-    {
-        public McEliecePKCS512()
-        {
-            super(new SHA512Digest(), new McEliecePKCSCipher());
-        }
-    }
-
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/provider/mceliece/McEliecePointchevalCipherSpi.java b/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/provider/mceliece/McEliecePointchevalCipherSpi.java
deleted file mode 100644
index c9c67ea..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/provider/mceliece/McEliecePointchevalCipherSpi.java
+++ /dev/null
@@ -1,247 +0,0 @@
-package org.bouncycastle.pqc.jcajce.provider.mceliece;
-
-import java.io.ByteArrayOutputStream;
-import java.security.InvalidAlgorithmParameterException;
-import java.security.InvalidKeyException;
-import java.security.Key;
-import java.security.NoSuchAlgorithmException;
-import java.security.PrivateKey;
-import java.security.PublicKey;
-import java.security.SecureRandom;
-import java.security.spec.AlgorithmParameterSpec;
-
-import javax.crypto.BadPaddingException;
-import javax.crypto.IllegalBlockSizeException;
-
-import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
-import org.bouncycastle.asn1.x509.X509ObjectIdentifiers;
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.digests.SHA1Digest;
-import org.bouncycastle.crypto.digests.SHA224Digest;
-import org.bouncycastle.crypto.digests.SHA256Digest;
-import org.bouncycastle.crypto.digests.SHA384Digest;
-import org.bouncycastle.crypto.digests.SHA512Digest;
-import org.bouncycastle.crypto.params.ParametersWithRandom;
-import org.bouncycastle.pqc.crypto.mceliece.McElieceCCA2KeyParameters;
-import org.bouncycastle.pqc.crypto.mceliece.McEliecePointchevalCipher;
-import org.bouncycastle.pqc.jcajce.provider.util.AsymmetricHybridCipher;
-
-public class McEliecePointchevalCipherSpi
-    extends AsymmetricHybridCipher
-    implements PKCSObjectIdentifiers, X509ObjectIdentifiers
-{
-    // TODO digest needed?
-    private Digest digest;
-    private McEliecePointchevalCipher cipher;
-
-    /**
-     * buffer to store the input data
-     */
-    private ByteArrayOutputStream buf = new ByteArrayOutputStream();
-
-
-    protected McEliecePointchevalCipherSpi(Digest digest, McEliecePointchevalCipher cipher)
-    {
-        this.digest = digest;
-        this.cipher = cipher;
-        buf = new ByteArrayOutputStream();
-    }
-
-    /**
-     * Continue a multiple-part encryption or decryption operation.
-     *
-     * @param input byte array containing the next part of the input
-     * @param inOff index in the array where the input starts
-     * @param inLen length of the input
-     * @return the processed byte array.
-     */
-    public byte[] update(byte[] input, int inOff, int inLen)
-    {
-        buf.write(input, inOff, inLen);
-        return new byte[0];
-    }
-
-
-    /**
-     * Encrypts or decrypts data in a single-part operation, or finishes a
-     * multiple-part operation. The data is encrypted or decrypted, depending on
-     * how this cipher was initialized.
-     *
-     * @param input the input buffer
-     * @param inOff the offset in input where the input starts
-     * @param inLen the input length
-     * @return the new buffer with the result
-     * @throws BadPaddingException on deryption errors.
-     */
-    public byte[] doFinal(byte[] input, int inOff, int inLen)
-        throws BadPaddingException
-    {
-        update(input, inOff, inLen);
-        byte[] data = buf.toByteArray();
-        buf.reset();
-        if (opMode == ENCRYPT_MODE)
-        {
-
-            try
-            {
-                return cipher.messageEncrypt(data);
-            }
-            catch (Exception e)
-            {
-                e.printStackTrace();
-            }
-
-        }
-        else if (opMode == DECRYPT_MODE)
-        {
-
-            try
-            {
-                return cipher.messageDecrypt(data);
-            }
-            catch (Exception e)
-            {
-                e.printStackTrace();
-            }
-
-        }
-        return null;
-    }
-
-    protected int encryptOutputSize(int inLen)
-    {
-        return 0;
-    }
-
-    protected int decryptOutputSize(int inLen)
-    {
-        return 0;
-    }
-
-    protected void initCipherEncrypt(Key key, AlgorithmParameterSpec params,
-                                     SecureRandom sr)
-        throws InvalidKeyException,
-        InvalidAlgorithmParameterException
-    {
-        CipherParameters param;
-        param = McElieceCCA2KeysToParams.generatePublicKeyParameter((PublicKey)key);
-
-        param = new ParametersWithRandom(param, sr);
-        digest.reset();
-        cipher.init(true, param);
-    }
-
-    protected void initCipherDecrypt(Key key, AlgorithmParameterSpec params)
-        throws InvalidKeyException, InvalidAlgorithmParameterException
-    {
-        CipherParameters param;
-        param = McElieceCCA2KeysToParams.generatePrivateKeyParameter((PrivateKey)key);
-
-        digest.reset();
-        cipher.init(false, param);
-    }
-
-    public String getName()
-    {
-        return "McEliecePointchevalCipher";
-    }
-
-
-    public int getKeySize(Key key)
-        throws InvalidKeyException
-    {
-        McElieceCCA2KeyParameters mcElieceCCA2KeyParameters;
-        if (key instanceof PublicKey)
-        {
-            mcElieceCCA2KeyParameters = (McElieceCCA2KeyParameters)McElieceCCA2KeysToParams.generatePublicKeyParameter((PublicKey)key);
-        }
-        else
-        {
-            mcElieceCCA2KeyParameters = (McElieceCCA2KeyParameters)McElieceCCA2KeysToParams.generatePrivateKeyParameter((PrivateKey)key);
-        }
-
-        return cipher.getKeySize(mcElieceCCA2KeyParameters);
-    }
-
-    public byte[] messageEncrypt(byte[] input)
-        throws IllegalBlockSizeException, BadPaddingException, NoSuchAlgorithmException
-    {
-        byte[] output = null;
-        try
-        {
-            output = cipher.messageEncrypt(input);
-        }
-        catch (Exception e)
-        {
-            e.printStackTrace();
-        }
-        return output;
-    }
-
-
-    public byte[] messageDecrypt(byte[] input)
-        throws IllegalBlockSizeException, BadPaddingException, NoSuchAlgorithmException
-    {
-        byte[] output = null;
-        try
-        {
-            output = cipher.messageDecrypt(input);
-        }
-        catch (Exception e)
-        {
-            e.printStackTrace();
-        }
-        return output;
-    }
-
-
-    //////////////////////////////////////////////////////////////////////////////////77
-
-    static public class McEliecePointcheval
-        extends McEliecePointchevalCipherSpi
-    {
-        public McEliecePointcheval()
-        {
-            super(new SHA1Digest(), new McEliecePointchevalCipher());
-        }
-    }
-
-    static public class McEliecePointcheval224
-        extends McEliecePointchevalCipherSpi
-    {
-        public McEliecePointcheval224()
-        {
-            super(new SHA224Digest(), new McEliecePointchevalCipher());
-        }
-    }
-
-    static public class McEliecePointcheval256
-        extends McEliecePointchevalCipherSpi
-    {
-        public McEliecePointcheval256()
-        {
-            super(new SHA256Digest(), new McEliecePointchevalCipher());
-        }
-    }
-
-    static public class McEliecePointcheval384
-        extends McEliecePointchevalCipherSpi
-    {
-        public McEliecePointcheval384()
-        {
-            super(new SHA384Digest(), new McEliecePointchevalCipher());
-        }
-    }
-
-    static public class McEliecePointcheval512
-        extends McEliecePointchevalCipherSpi
-    {
-        public McEliecePointcheval512()
-        {
-            super(new SHA512Digest(), new McEliecePointchevalCipher());
-        }
-    }
-
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/provider/rainbow/BCRainbowPrivateKey.java b/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/provider/rainbow/BCRainbowPrivateKey.java
deleted file mode 100644
index 93a50cb..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/provider/rainbow/BCRainbowPrivateKey.java
+++ /dev/null
@@ -1,244 +0,0 @@
-package org.bouncycastle.pqc.jcajce.provider.rainbow;
-
-import java.io.IOException;
-import java.security.PrivateKey;
-import java.util.Arrays;
-
-import org.bouncycastle.asn1.DERNull;
-import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.pqc.asn1.PQCObjectIdentifiers;
-import org.bouncycastle.pqc.asn1.RainbowPrivateKey;
-import org.bouncycastle.pqc.crypto.rainbow.Layer;
-import org.bouncycastle.pqc.crypto.rainbow.RainbowPrivateKeyParameters;
-import org.bouncycastle.pqc.crypto.rainbow.util.RainbowUtil;
-import org.bouncycastle.pqc.jcajce.spec.RainbowPrivateKeySpec;
-
-/**
- * The Private key in Rainbow consists of the linear affine maps L1, L2 and the
- * map F, consisting of quadratic polynomials. In this implementation, we
- * denote: L1 = A1*x + b1 L2 = A2*x + b2
- * <p>
- * The coefficients of the polynomials in F are stored in 3-dimensional arrays
- * per layer. The indices of these arrays denote the polynomial, and the
- * variables.
- * </p><p>
- * More detailed information about the private key is to be found in the paper
- * of Jintai Ding, Dieter Schmidt: Rainbow, a New Multivariable Polynomial
- * Signature Scheme. ACNS 2005: 164-175 (http://dx.doi.org/10.1007/11496137_12)
- * </p>
- */
-public class BCRainbowPrivateKey
-    implements PrivateKey
-{
-    private static final long serialVersionUID = 1L;
-
-    // the inverse of L1
-    private short[][] A1inv;
-
-    // translation vector element of L1
-    private short[] b1;
-
-    // the inverse of L2
-    private short[][] A2inv;
-
-    // translation vector of L2
-    private short[] b2;
-
-    /*
-      * components of F
-      */
-    private Layer[] layers;
-
-    // set of vinegar vars per layer.
-    private int[] vi;
-
-
-    /**
-     * Constructor.
-     *
-     * @param A1inv
-     * @param b1
-     * @param A2inv
-     * @param b2
-     * @param layers
-     */
-    public BCRainbowPrivateKey(short[][] A1inv, short[] b1, short[][] A2inv,
-                               short[] b2, int[] vi, Layer[] layers)
-    {
-        this.A1inv = A1inv;
-        this.b1 = b1;
-        this.A2inv = A2inv;
-        this.b2 = b2;
-        this.vi = vi;
-        this.layers = layers;
-    }
-
-    /**
-     * Constructor (used by the {@link RainbowKeyFactorySpi}).
-     *
-     * @param keySpec a {@link RainbowPrivateKeySpec}
-     */
-    public BCRainbowPrivateKey(RainbowPrivateKeySpec keySpec)
-    {
-        this(keySpec.getInvA1(), keySpec.getB1(), keySpec.getInvA2(), keySpec
-            .getB2(), keySpec.getVi(), keySpec.getLayers());
-    }
-
-    public BCRainbowPrivateKey(
-        RainbowPrivateKeyParameters params)
-    {
-        this(params.getInvA1(), params.getB1(), params.getInvA2(), params.getB2(), params.getVi(), params.getLayers());
-    }
-
-    /**
-     * Getter for the inverse matrix of A1.
-     *
-     * @return the A1inv inverse
-     */
-    public short[][] getInvA1()
-    {
-        return this.A1inv;
-    }
-
-    /**
-     * Getter for the translation part of the private quadratic map L1.
-     *
-     * @return b1 the translation part of L1
-     */
-    public short[] getB1()
-    {
-        return this.b1;
-    }
-
-    /**
-     * Getter for the translation part of the private quadratic map L2.
-     *
-     * @return b2 the translation part of L2
-     */
-    public short[] getB2()
-    {
-        return this.b2;
-    }
-
-    /**
-     * Getter for the inverse matrix of A2
-     *
-     * @return the A2inv
-     */
-    public short[][] getInvA2()
-    {
-        return this.A2inv;
-    }
-
-    /**
-     * Returns the layers contained in the private key
-     *
-     * @return layers
-     */
-    public Layer[] getLayers()
-    {
-        return this.layers;
-    }
-
-    /**
-     * Returns the array of vi-s
-     *
-     * @return the vi
-     */
-    public int[] getVi()
-    {
-        return vi;
-    }
-
-    /**
-     * Compare this Rainbow private key with another object.
-     *
-     * @param other the other object
-     * @return the result of the comparison
-     */
-    public boolean equals(Object other)
-    {
-        if (other == null || !(other instanceof BCRainbowPrivateKey))
-        {
-            return false;
-        }
-        BCRainbowPrivateKey otherKey = (BCRainbowPrivateKey)other;
-
-        boolean eq = true;
-        // compare using shortcut rule ( && instead of &)
-        eq = eq && RainbowUtil.equals(A1inv, otherKey.getInvA1());
-        eq = eq && RainbowUtil.equals(A2inv, otherKey.getInvA2());
-        eq = eq && RainbowUtil.equals(b1, otherKey.getB1());
-        eq = eq && RainbowUtil.equals(b2, otherKey.getB2());
-        eq = eq && Arrays.equals(vi, otherKey.getVi());
-        if (layers.length != otherKey.getLayers().length)
-        {
-            return false;
-        }
-        for (int i = layers.length - 1; i >= 0; i--)
-        {
-            eq &= layers[i].equals(otherKey.getLayers()[i]);
-        }
-        return eq;
-    }
-
-    public int hashCode()
-    {
-        int hash = layers.length;
-
-        hash = hash * 37 + org.bouncycastle.util.Arrays.hashCode(A1inv);
-        hash = hash * 37 + org.bouncycastle.util.Arrays.hashCode(b1);
-        hash = hash * 37 + org.bouncycastle.util.Arrays.hashCode(A2inv);
-        hash = hash * 37 + org.bouncycastle.util.Arrays.hashCode(b2);
-        hash = hash * 37 + org.bouncycastle.util.Arrays.hashCode(vi);
-
-        for (int i = layers.length - 1; i >= 0; i--)
-        {
-            hash = hash * 37 + layers[i].hashCode();
-        }
-
-
-        return hash;
-    }
-
-    /**
-     * @return name of the algorithm - "Rainbow"
-     */
-    public final String getAlgorithm()
-    {
-        return "Rainbow";
-    }
-
-    public byte[] getEncoded()
-    {
-        RainbowPrivateKey privateKey = new RainbowPrivateKey(A1inv, b1, A2inv, b2, vi, layers);
-
-        PrivateKeyInfo pki;
-        try
-        {
-            AlgorithmIdentifier algorithmIdentifier = new AlgorithmIdentifier(PQCObjectIdentifiers.rainbow, DERNull.INSTANCE);
-            pki = new PrivateKeyInfo(algorithmIdentifier, privateKey);
-        }
-        catch (IOException e)
-        {
-            e.printStackTrace();
-            return null;
-        }
-        try
-        {
-            byte[] encoded = pki.getEncoded();
-            return encoded;
-        }
-        catch (IOException e)
-        {
-            e.printStackTrace();
-            return null;
-        }
-    }
-
-    public String getFormat()
-    {
-        return "PKCS#8";
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/provider/rainbow/BCRainbowPublicKey.java b/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/provider/rainbow/BCRainbowPublicKey.java
deleted file mode 100644
index 316ac0b..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/provider/rainbow/BCRainbowPublicKey.java
+++ /dev/null
@@ -1,171 +0,0 @@
-package org.bouncycastle.pqc.jcajce.provider.rainbow;
-
-import java.security.PublicKey;
-
-import org.bouncycastle.asn1.DERNull;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.pqc.asn1.PQCObjectIdentifiers;
-import org.bouncycastle.pqc.asn1.RainbowPublicKey;
-import org.bouncycastle.pqc.crypto.rainbow.RainbowParameters;
-import org.bouncycastle.pqc.crypto.rainbow.RainbowPublicKeyParameters;
-import org.bouncycastle.pqc.crypto.rainbow.util.RainbowUtil;
-import org.bouncycastle.pqc.jcajce.provider.util.KeyUtil;
-import org.bouncycastle.pqc.jcajce.spec.RainbowPublicKeySpec;
-import org.bouncycastle.util.Arrays;
-
-/**
- * This class implements CipherParameters and PublicKey.
- * <p>
- * The public key in Rainbow consists of n - v1 polynomial components of the
- * private key's F and the field structure of the finite field k.
- * </p><p>
- * The quadratic (or mixed) coefficients of the polynomials from the public key
- * are stored in the 2-dimensional array in lexicographical order, requiring n *
- * (n + 1) / 2 entries for each polynomial. The singular terms are stored in a
- * 2-dimensional array requiring n entries per polynomial, the scalar term of
- * each polynomial is stored in a 1-dimensional array.
- * </p><p>
- * More detailed information on the public key is to be found in the paper of
- * Jintai Ding, Dieter Schmidt: Rainbow, a New Multivariable Polynomial
- * Signature Scheme. ACNS 2005: 164-175 (http://dx.doi.org/10.1007/11496137_12)
- * </p>
- */
-public class BCRainbowPublicKey
-    implements PublicKey
-{
-    private static final long serialVersionUID = 1L;
-
-    private short[][] coeffquadratic;
-    private short[][] coeffsingular;
-    private short[] coeffscalar;
-    private int docLength; // length of possible document to sign
-
-    private RainbowParameters rainbowParams;
-
-    /**
-     * Constructor
-     *
-     * @param docLength
-     * @param coeffQuadratic
-     * @param coeffSingular
-     * @param coeffScalar
-     */
-    public BCRainbowPublicKey(int docLength,
-                              short[][] coeffQuadratic, short[][] coeffSingular,
-                              short[] coeffScalar)
-    {
-        this.docLength = docLength;
-        this.coeffquadratic = coeffQuadratic;
-        this.coeffsingular = coeffSingular;
-        this.coeffscalar = coeffScalar;
-    }
-
-    /**
-     * Constructor (used by the {@link RainbowKeyFactorySpi}).
-     *
-     * @param keySpec a {@link RainbowPublicKeySpec}
-     */
-    public BCRainbowPublicKey(RainbowPublicKeySpec keySpec)
-    {
-        this(keySpec.getDocLength(), keySpec.getCoeffQuadratic(), keySpec
-            .getCoeffSingular(), keySpec.getCoeffScalar());
-    }
-
-    public BCRainbowPublicKey(
-        RainbowPublicKeyParameters params)
-    {
-        this(params.getDocLength(), params.getCoeffQuadratic(), params.getCoeffSingular(), params.getCoeffScalar());
-    }
-
-    /**
-     * @return the docLength
-     */
-    public int getDocLength()
-    {
-        return this.docLength;
-    }
-
-    /**
-     * @return the coeffQuadratic
-     */
-    public short[][] getCoeffQuadratic()
-    {
-        return coeffquadratic;
-    }
-
-    /**
-     * @return the coeffSingular
-     */
-    public short[][] getCoeffSingular()
-    {
-        short[][] copy = new short[coeffsingular.length][];
-
-        for (int i = 0; i != coeffsingular.length; i++)
-        {
-            copy[i] = Arrays.clone(coeffsingular[i]);
-        }
-
-        return copy;
-    }
-
-
-    /**
-     * @return the coeffScalar
-     */
-    public short[] getCoeffScalar()
-    {
-        return Arrays.clone(coeffscalar);
-    }
-
-    /**
-     * Compare this Rainbow public key with another object.
-     *
-     * @param other the other object
-     * @return the result of the comparison
-     */
-    public boolean equals(Object other)
-    {
-        if (other == null || !(other instanceof BCRainbowPublicKey))
-        {
-            return false;
-        }
-        BCRainbowPublicKey otherKey = (BCRainbowPublicKey)other;
-
-        return docLength == otherKey.getDocLength()
-            && RainbowUtil.equals(coeffquadratic, otherKey.getCoeffQuadratic())
-            && RainbowUtil.equals(coeffsingular, otherKey.getCoeffSingular())
-            && RainbowUtil.equals(coeffscalar, otherKey.getCoeffScalar());
-    }
-
-    public int hashCode()
-    {
-        int hash = docLength;
-
-        hash = hash * 37 + Arrays.hashCode(coeffquadratic);
-        hash = hash * 37 + Arrays.hashCode(coeffsingular);
-        hash = hash * 37 + Arrays.hashCode(coeffscalar);
-
-        return hash;
-    }
-
-    /**
-     * @return name of the algorithm - "Rainbow"
-     */
-    public final String getAlgorithm()
-    {
-        return "Rainbow";
-    }
-
-    public String getFormat()
-    {
-        return "X.509";
-    }
-
-    public byte[] getEncoded()
-    {
-        RainbowPublicKey key = new RainbowPublicKey(docLength, coeffquadratic, coeffsingular, coeffscalar);
-        AlgorithmIdentifier algorithmIdentifier = new AlgorithmIdentifier(PQCObjectIdentifiers.rainbow, DERNull.INSTANCE);
-
-        return KeyUtil.getEncodedSubjectPublicKeyInfo(algorithmIdentifier, key);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/provider/rainbow/RainbowKeyFactorySpi.java b/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/provider/rainbow/RainbowKeyFactorySpi.java
deleted file mode 100644
index 4874dc9..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/provider/rainbow/RainbowKeyFactorySpi.java
+++ /dev/null
@@ -1,228 +0,0 @@
-package org.bouncycastle.pqc.jcajce.provider.rainbow;
-
-import java.io.IOException;
-import java.security.InvalidKeyException;
-import java.security.Key;
-import java.security.KeyFactorySpi;
-import java.security.PrivateKey;
-import java.security.PublicKey;
-import java.security.spec.InvalidKeySpecException;
-import java.security.spec.KeySpec;
-import java.security.spec.PKCS8EncodedKeySpec;
-import java.security.spec.X509EncodedKeySpec;
-
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.bouncycastle.jcajce.provider.util.AsymmetricKeyInfoConverter;
-import org.bouncycastle.pqc.asn1.RainbowPrivateKey;
-import org.bouncycastle.pqc.asn1.RainbowPublicKey;
-import org.bouncycastle.pqc.jcajce.spec.RainbowPrivateKeySpec;
-import org.bouncycastle.pqc.jcajce.spec.RainbowPublicKeySpec;
-
-
-/**
- * This class transforms Rainbow keys and Rainbow key specifications.
- *
- * @see BCRainbowPublicKey
- * @see RainbowPublicKeySpec
- * @see BCRainbowPrivateKey
- * @see RainbowPrivateKeySpec
- */
-public class RainbowKeyFactorySpi
-    extends KeyFactorySpi
-    implements AsymmetricKeyInfoConverter
-{
-    /**
-     * Converts, if possible, a key specification into a
-     * {@link BCRainbowPrivateKey}. Currently, the following key specifications
-     * are supported: {@link RainbowPrivateKeySpec}, {@link PKCS8EncodedKeySpec}.
-     * <p>
-     * The ASN.1 definition of the key structure is
-     * <pre>
-     *   RainbowPrivateKey ::= SEQUENCE {
-     *     oid        OBJECT IDENTIFIER         -- OID identifying the algorithm
-     *     A1inv      SEQUENCE OF OCTET STRING  -- inversed matrix of L1
-     *     b1         OCTET STRING              -- translation vector of L1
-     *     A2inv      SEQUENCE OF OCTET STRING  -- inversed matrix of L2
-     *     b2         OCTET STRING              -- translation vector of L2
-     *     vi         OCTET STRING              -- num of elmts in each Set S
-     *     layers     SEQUENCE OF Layer         -- layers of F
-     *   }
-     *
-     *   Layer             ::= SEQUENCE OF Poly
-     *   Poly              ::= SEQUENCE {
-     *     alpha      SEQUENCE OF OCTET STRING
-     *     beta       SEQUENCE OF OCTET STRING
-     *     gamma      OCTET STRING
-     *     eta        OCTET
-     *   }
-     * </pre>
-     * </p>
-     *
-     * @param keySpec the key specification
-     * @return the Rainbow private key
-     * @throws InvalidKeySpecException if the KeySpec is not supported.
-     */
-    public PrivateKey engineGeneratePrivate(KeySpec keySpec)
-        throws InvalidKeySpecException
-    {
-        if (keySpec instanceof RainbowPrivateKeySpec)
-        {
-            return new BCRainbowPrivateKey((RainbowPrivateKeySpec)keySpec);
-        }
-        else if (keySpec instanceof PKCS8EncodedKeySpec)
-        {
-            // get the DER-encoded Key according to PKCS#8 from the spec
-            byte[] encKey = ((PKCS8EncodedKeySpec)keySpec).getEncoded();
-
-            try
-            {
-                return generatePrivate(PrivateKeyInfo.getInstance(ASN1Primitive.fromByteArray(encKey)));
-            }
-            catch (Exception e)
-            {
-                throw new InvalidKeySpecException(e.toString());
-            }
-        }
-
-        throw new InvalidKeySpecException("Unsupported key specification: "
-            + keySpec.getClass() + ".");
-    }
-
-    /**
-     * Converts, if possible, a key specification into a
-     * {@link BCRainbowPublicKey}. Currently, the following key specifications are
-     * supported:{@link X509EncodedKeySpec}.
-     * <p>
-     * The ASN.1 definition of a public key's structure is
-     * <pre>
-     *    RainbowPublicKey ::= SEQUENCE {
-     *      oid            OBJECT IDENTIFIER        -- OID identifying the algorithm
-     *      docLength      Integer                  -- length of signable msg
-     *      coeffquadratic SEQUENCE OF OCTET STRING -- quadratic (mixed) coefficients
-     *      coeffsingular  SEQUENCE OF OCTET STRING -- singular coefficients
-     *      coeffscalar       OCTET STRING             -- scalar coefficients
-     *       }
-     * </pre>
-     * </p>
-     *
-     * @param keySpec the key specification
-     * @return the Rainbow public key
-     * @throws InvalidKeySpecException if the KeySpec is not supported.
-     */
-    public PublicKey engineGeneratePublic(KeySpec keySpec)
-        throws InvalidKeySpecException
-    {
-        if (keySpec instanceof RainbowPublicKeySpec)
-        {
-            return new BCRainbowPublicKey((RainbowPublicKeySpec)keySpec);
-        }
-        else if (keySpec instanceof X509EncodedKeySpec)
-        {
-            // get the DER-encoded Key according to X.509 from the spec
-            byte[] encKey = ((X509EncodedKeySpec)keySpec).getEncoded();
-
-            // decode the SubjectPublicKeyInfo data structure to the pki object
-            try
-            {
-                return generatePublic(SubjectPublicKeyInfo.getInstance(encKey));
-            }
-            catch (Exception e)
-            {
-                throw new InvalidKeySpecException(e.toString());
-            }
-        }
-
-        throw new InvalidKeySpecException("Unknown key specification: " + keySpec + ".");
-    }
-
-    /**
-     * Converts a given key into a key specification, if possible. Currently the
-     * following specs are supported:
-     * <ul>
-     * <li>for RainbowPublicKey: X509EncodedKeySpec, RainbowPublicKeySpec
-     * <li>for RainbowPrivateKey: PKCS8EncodedKeySpec, RainbowPrivateKeySpec
-     * </ul>
-     *
-     * @param key     the key
-     * @param keySpec the key specification
-     * @return the specification of the CMSS key
-     * @throws InvalidKeySpecException if the key type or key specification is not supported.
-     */
-    public final KeySpec engineGetKeySpec(Key key, Class keySpec)
-        throws InvalidKeySpecException
-    {
-        if (key instanceof BCRainbowPrivateKey)
-        {
-            if (PKCS8EncodedKeySpec.class.isAssignableFrom(keySpec))
-            {
-                return new PKCS8EncodedKeySpec(key.getEncoded());
-            }
-            else if (RainbowPrivateKeySpec.class.isAssignableFrom(keySpec))
-            {
-                BCRainbowPrivateKey privKey = (BCRainbowPrivateKey)key;
-                return new RainbowPrivateKeySpec(privKey.getInvA1(), privKey
-                    .getB1(), privKey.getInvA2(), privKey.getB2(), privKey
-                    .getVi(), privKey.getLayers());
-            }
-        }
-        else if (key instanceof BCRainbowPublicKey)
-        {
-            if (X509EncodedKeySpec.class.isAssignableFrom(keySpec))
-            {
-                return new X509EncodedKeySpec(key.getEncoded());
-            }
-            else if (RainbowPublicKeySpec.class.isAssignableFrom(keySpec))
-            {
-                BCRainbowPublicKey pubKey = (BCRainbowPublicKey)key;
-                return new RainbowPublicKeySpec(pubKey.getDocLength(), pubKey
-                    .getCoeffQuadratic(), pubKey.getCoeffSingular(), pubKey
-                    .getCoeffScalar());
-            }
-        }
-        else
-        {
-            throw new InvalidKeySpecException("Unsupported key type: "
-                + key.getClass() + ".");
-        }
-
-        throw new InvalidKeySpecException("Unknown key specification: "
-            + keySpec + ".");
-    }
-
-    /**
-     * Translates a key into a form known by the FlexiProvider. Currently the
-     * following key types are supported: RainbowPrivateKey, RainbowPublicKey.
-     *
-     * @param key the key
-     * @return a key of a known key type
-     * @throws InvalidKeyException if the key is not supported.
-     */
-    public final Key engineTranslateKey(Key key)
-        throws InvalidKeyException
-    {
-        if (key instanceof BCRainbowPrivateKey || key instanceof BCRainbowPublicKey)
-        {
-            return key;
-        }
-
-        throw new InvalidKeyException("Unsupported key type");
-    }
-
-    public PrivateKey generatePrivate(PrivateKeyInfo keyInfo)
-        throws IOException
-    {
-        RainbowPrivateKey pKey = RainbowPrivateKey.getInstance(keyInfo.parsePrivateKey());
-
-        return new BCRainbowPrivateKey(pKey.getInvA1(), pKey.getB1(), pKey.getInvA2(), pKey.getB2(), pKey.getVi(), pKey.getLayers());
-    }
-
-    public PublicKey generatePublic(SubjectPublicKeyInfo keyInfo)
-        throws IOException
-    {
-        RainbowPublicKey pKey = RainbowPublicKey.getInstance(keyInfo.parsePublicKey());
-
-        return new BCRainbowPublicKey(pKey.getDocLength(), pKey.getCoeffQuadratic(), pKey.getCoeffSingular(), pKey.getCoeffScalar());
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/provider/rainbow/RainbowKeyPairGeneratorSpi.java b/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/provider/rainbow/RainbowKeyPairGeneratorSpi.java
deleted file mode 100644
index e64d53b..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/provider/rainbow/RainbowKeyPairGeneratorSpi.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package org.bouncycastle.pqc.jcajce.provider.rainbow;
-
-import java.security.InvalidAlgorithmParameterException;
-import java.security.KeyPair;
-import java.security.SecureRandom;
-import java.security.spec.AlgorithmParameterSpec;
-
-import org.bouncycastle.crypto.AsymmetricCipherKeyPair;
-import org.bouncycastle.pqc.crypto.rainbow.RainbowKeyGenerationParameters;
-import org.bouncycastle.pqc.crypto.rainbow.RainbowKeyPairGenerator;
-import org.bouncycastle.pqc.crypto.rainbow.RainbowParameters;
-import org.bouncycastle.pqc.crypto.rainbow.RainbowPrivateKeyParameters;
-import org.bouncycastle.pqc.crypto.rainbow.RainbowPublicKeyParameters;
-import org.bouncycastle.pqc.jcajce.spec.RainbowParameterSpec;
-
-public class RainbowKeyPairGeneratorSpi
-    extends java.security.KeyPairGenerator
-{
-    RainbowKeyGenerationParameters param;
-    RainbowKeyPairGenerator engine = new RainbowKeyPairGenerator();
-    int strength = 1024;
-    SecureRandom random = new SecureRandom();
-    boolean initialised = false;
-
-    public RainbowKeyPairGeneratorSpi()
-    {
-        super("Rainbow");
-    }
-
-    public void initialize(
-        int strength,
-        SecureRandom random)
-    {
-        this.strength = strength;
-        this.random = random;
-    }
-
-    public void initialize(
-        AlgorithmParameterSpec params,
-        SecureRandom random)
-        throws InvalidAlgorithmParameterException
-    {
-        if (!(params instanceof RainbowParameterSpec))
-        {
-            throw new InvalidAlgorithmParameterException("parameter object not a RainbowParameterSpec");
-        }
-        RainbowParameterSpec rainbowParams = (RainbowParameterSpec)params;
-
-        param = new RainbowKeyGenerationParameters(random, new RainbowParameters(rainbowParams.getVi()));
-
-        engine.init(param);
-        initialised = true;
-    }
-
-    public KeyPair generateKeyPair()
-    {
-        if (!initialised)
-        {
-            param = new RainbowKeyGenerationParameters(random, new RainbowParameters(new RainbowParameterSpec().getVi()));
-
-            engine.init(param);
-            initialised = true;
-        }
-
-        AsymmetricCipherKeyPair pair = engine.generateKeyPair();
-        RainbowPublicKeyParameters pub = (RainbowPublicKeyParameters)pair.getPublic();
-        RainbowPrivateKeyParameters priv = (RainbowPrivateKeyParameters)pair.getPrivate();
-
-        return new KeyPair(new BCRainbowPublicKey(pub),
-            new BCRainbowPrivateKey(priv));
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/provider/rainbow/RainbowKeysToParams.java b/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/provider/rainbow/RainbowKeysToParams.java
deleted file mode 100644
index f5c573a..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/provider/rainbow/RainbowKeysToParams.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package org.bouncycastle.pqc.jcajce.provider.rainbow;
-
-import java.security.InvalidKeyException;
-import java.security.PrivateKey;
-import java.security.PublicKey;
-
-import org.bouncycastle.crypto.params.AsymmetricKeyParameter;
-import org.bouncycastle.pqc.crypto.rainbow.RainbowPrivateKeyParameters;
-import org.bouncycastle.pqc.crypto.rainbow.RainbowPublicKeyParameters;
-
-
-/**
- * utility class for converting jce/jca Rainbow objects
- * objects into their org.bouncycastle.crypto counterparts.
- */
-
-public class RainbowKeysToParams
-{
-    static public AsymmetricKeyParameter generatePublicKeyParameter(
-        PublicKey key)
-        throws InvalidKeyException
-    {
-        if (key instanceof BCRainbowPublicKey)
-        {
-            BCRainbowPublicKey k = (BCRainbowPublicKey)key;
-
-            return new RainbowPublicKeyParameters(k.getDocLength(), k.getCoeffQuadratic(),
-                k.getCoeffSingular(), k.getCoeffScalar());
-        }
-
-        throw new InvalidKeyException("can't identify Rainbow public key: " + key.getClass().getName());
-    }
-
-    static public AsymmetricKeyParameter generatePrivateKeyParameter(
-        PrivateKey key)
-        throws InvalidKeyException
-    {
-        if (key instanceof BCRainbowPrivateKey)
-        {
-            BCRainbowPrivateKey k = (BCRainbowPrivateKey)key;
-            return new RainbowPrivateKeyParameters(k.getInvA1(), k.getB1(),
-                k.getInvA2(), k.getB2(), k.getVi(), k.getLayers());
-        }
-
-        throw new InvalidKeyException("can't identify Rainbow private key.");
-    }
-}
-
-
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/provider/rainbow/SignatureSpi.java b/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/provider/rainbow/SignatureSpi.java
deleted file mode 100644
index e118ed6..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/provider/rainbow/SignatureSpi.java
+++ /dev/null
@@ -1,164 +0,0 @@
-package org.bouncycastle.pqc.jcajce.provider.rainbow;
-
-import java.security.InvalidKeyException;
-import java.security.PrivateKey;
-import java.security.PublicKey;
-import java.security.SecureRandom;
-import java.security.SignatureException;
-import java.security.spec.AlgorithmParameterSpec;
-
-import org.bouncycastle.crypto.CipherParameters;
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.crypto.digests.SHA224Digest;
-import org.bouncycastle.crypto.digests.SHA256Digest;
-import org.bouncycastle.crypto.digests.SHA384Digest;
-import org.bouncycastle.crypto.digests.SHA512Digest;
-import org.bouncycastle.crypto.params.ParametersWithRandom;
-import org.bouncycastle.pqc.crypto.rainbow.RainbowSigner;
-
-/**
- * Rainbow Signature class, extending the jce SignatureSpi.
- */
-public class SignatureSpi
-    extends java.security.SignatureSpi
-{
-    private Digest digest;
-    private RainbowSigner signer;
-    private SecureRandom random;
-
-    protected SignatureSpi(Digest digest, RainbowSigner signer)
-    {
-        this.digest = digest;
-        this.signer = signer;
-    }
-
-    protected void engineInitVerify(PublicKey publicKey)
-        throws InvalidKeyException
-    {
-        CipherParameters param;
-        param = RainbowKeysToParams.generatePublicKeyParameter(publicKey);
-
-        digest.reset();
-        signer.init(false, param);
-    }
-
-    protected void engineInitSign(PrivateKey privateKey, SecureRandom random)
-        throws InvalidKeyException
-    {
-        this.random = random;
-        engineInitSign(privateKey);
-    }
-
-    protected void engineInitSign(PrivateKey privateKey)
-        throws InvalidKeyException
-    {
-        CipherParameters param;
-        param = RainbowKeysToParams.generatePrivateKeyParameter(privateKey);
-
-        if (random != null)
-        {
-            param = new ParametersWithRandom(param, random);
-        }
-
-        digest.reset();
-        signer.init(true, param);
-
-    }
-
-    protected void engineUpdate(byte b)
-        throws SignatureException
-    {
-        digest.update(b);
-    }
-
-    protected void engineUpdate(byte[] b, int off, int len)
-        throws SignatureException
-    {
-        digest.update(b, off, len);
-    }
-
-    protected byte[] engineSign()
-        throws SignatureException
-    {
-        byte[] hash = new byte[digest.getDigestSize()];
-        digest.doFinal(hash, 0);
-        try
-        {
-            byte[] sig = signer.generateSignature(hash);
-
-            return sig;
-        }
-        catch (Exception e)
-        {
-            throw new SignatureException(e.toString());
-        }
-    }
-
-    protected boolean engineVerify(byte[] sigBytes)
-        throws SignatureException
-    {
-        byte[] hash = new byte[digest.getDigestSize()];
-        digest.doFinal(hash, 0);
-        return signer.verifySignature(hash, sigBytes);
-    }
-
-    protected void engineSetParameter(AlgorithmParameterSpec params)
-    {
-        throw new UnsupportedOperationException("engineSetParameter unsupported");
-    }
-
-    /**
-     * @deprecated replaced with <a href =
-     *             "#engineSetParameter(java.security.spec.AlgorithmParameterSpec)"
-     *             >
-     */
-    protected void engineSetParameter(String param, Object value)
-    {
-        throw new UnsupportedOperationException("engineSetParameter unsupported");
-    }
-
-    /**
-     * @deprecated
-     */
-    protected Object engineGetParameter(String param)
-    {
-        throw new UnsupportedOperationException("engineSetParameter unsupported");
-    }
-
-
-    static public class withSha224
-        extends SignatureSpi
-    {
-        public withSha224()
-        {
-            super(new SHA224Digest(), new RainbowSigner());
-        }
-    }
-
-    static public class withSha256
-        extends SignatureSpi
-    {
-        public withSha256()
-        {
-            super(new SHA256Digest(), new RainbowSigner());
-        }
-    }
-
-    static public class withSha384
-        extends SignatureSpi
-    {
-        public withSha384()
-        {
-            super(new SHA384Digest(), new RainbowSigner());
-        }
-    }
-
-    static public class withSha512
-        extends SignatureSpi
-    {
-        public withSha512()
-        {
-            super(new SHA512Digest(), new RainbowSigner());
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/provider/test/AllTests.java b/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/provider/test/AllTests.java
deleted file mode 100644
index 92332de..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/provider/test/AllTests.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package org.bouncycastle.pqc.jcajce.provider.test;
-
-import java.security.Security;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import org.bouncycastle.pqc.jcajce.provider.BouncyCastlePQCProvider;
-
-public class AllTests
-    extends TestCase
-{
-    public static void main (String[] args)
-    {
-        junit.textui.TestRunner.run(suite());
-    }
-    
-    public static Test suite()
-    {
-        TestSuite suite = new TestSuite("PQC JCE Tests");
-        
-        if (Security.getProvider(BouncyCastlePQCProvider.PROVIDER_NAME) == null)
-        {
-            Security.addProvider(new BouncyCastlePQCProvider());
-        }
-        
-        suite.addTestSuite(RainbowSignatureTest.class);
-        suite.addTestSuite(McElieceFujisakiCipherTest.class);
-        suite.addTestSuite(McElieceKobaraImaiCipherTest.class);
-        suite.addTestSuite(McEliecePointchevalCipherTest.class);
-        suite.addTestSuite(McEliecePKCSCipherTest.class);
-
-        return suite;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/provider/test/AsymmetricBlockCipherTest.java b/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/provider/test/AsymmetricBlockCipherTest.java
deleted file mode 100644
index c67d438..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/provider/test/AsymmetricBlockCipherTest.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package org.bouncycastle.pqc.jcajce.provider.test;
-
-import java.security.KeyPair;
-import java.security.KeyPairGenerator;
-import java.security.PrivateKey;
-import java.security.PublicKey;
-import java.security.spec.AlgorithmParameterSpec;
-
-import javax.crypto.Cipher;
-
-import org.bouncycastle.pqc.math.linearalgebra.ByteUtils;
-
-
-public abstract class AsymmetricBlockCipherTest
-    extends FlexiTest
-{
-
-    protected Cipher cipher;
-
-    protected KeyPair keyPair;
-
-    protected PublicKey pubKey;
-
-    protected PrivateKey privKey;
-
-    protected KeyPairGenerator kpg;
-
-    private byte[] mBytes;
-
-    private byte[] cBytes;
-
-    private byte[] dBytes;
-
-    protected final void performEnDecryptionTest(int numPassesKPG,
-                                                 int numPassesEncDec, AlgorithmParameterSpec params)
-    {
-
-        try
-        {
-            for (int j = 0; j < numPassesKPG; j++)
-            {
-                keyPair = kpg.genKeyPair();
-                pubKey = keyPair.getPublic();
-                privKey = keyPair.getPrivate();
-
-                for (int k = 1; k <= numPassesEncDec; k++)
-                {
-                    // initialize for encryption
-                    cipher.init(Cipher.ENCRYPT_MODE, pubKey, params, sr);
-
-                    // generate random message
-                    final int plainTextSize = cipher.getBlockSize();
-                    int mLength = rand.nextInt(plainTextSize) + 1;
-                    mBytes = new byte[mLength];
-                    rand.nextBytes(mBytes);
-
-                    // encrypt
-                    cBytes = cipher.doFinal(mBytes);
-
-                    // initialize for decryption
-                    cipher.init(Cipher.DECRYPT_MODE, privKey, params);
-
-                    // decrypt
-                    dBytes = cipher.doFinal(cBytes);
-
-                    // compare
-                    assertEquals("Encryption and Decryption test failed:\n"
-                        + " actual decrypted text: "
-                        + ByteUtils.toHexString(dBytes)
-                        + "\n expected plain text: "
-                        + ByteUtils.toHexString(mBytes), mBytes, dBytes);
-                }
-            }
-        }
-        catch (Exception e)
-        {
-            e.printStackTrace();
-            fail(e);
-        }
-    }
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/provider/test/AsymmetricHybridCipherTest.java b/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/provider/test/AsymmetricHybridCipherTest.java
deleted file mode 100644
index f66dc6b..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/provider/test/AsymmetricHybridCipherTest.java
+++ /dev/null
@@ -1,91 +0,0 @@
-package org.bouncycastle.pqc.jcajce.provider.test;
-
-import java.security.KeyPair;
-import java.security.KeyPairGenerator;
-import java.security.PrivateKey;
-import java.security.PublicKey;
-import java.security.spec.AlgorithmParameterSpec;
-
-import javax.crypto.Cipher;
-
-import org.bouncycastle.pqc.jcajce.provider.util.AsymmetricHybridCipher;
-import org.bouncycastle.pqc.math.linearalgebra.ByteUtils;
-
-/**
- * Base class for unit tests of {@link AsymmetricHybridCipher}s.
- */
-public abstract class AsymmetricHybridCipherTest
-    extends FlexiTest
-{
-
-    /**
-     * the {@link KeyPairGenerator} to use for the test
-     */
-    protected KeyPairGenerator kpg;
-
-    /**
-     * the {@link AsymmetricHybridCipher} to use for the test
-     */
-    protected Cipher cipher;
-
-    private KeyPair keyPair;
-
-    private PublicKey pubKey;
-
-    private PrivateKey privKey;
-
-    private byte[] mBytes, cBytes, dBytes;
-
-    protected final void performEnDecryptionTest(int numPassesKPG,
-                                                 int numPassesEncDec, int plainTextSize,
-                                                 AlgorithmParameterSpec params)
-    {
-
-        try
-        {
-            for (int j = 0; j < numPassesKPG; j++)
-            {
-                // generate key pair
-                //kpg.initialize(params);
-                keyPair = kpg.genKeyPair();
-                pubKey = keyPair.getPublic();
-                privKey = keyPair.getPrivate();
-
-                for (int k = 1; k <= numPassesEncDec; k++)
-                {
-                    // initialize for encryption
-                    cipher.init(Cipher.ENCRYPT_MODE, pubKey, params, sr);
-
-                    // generate random message
-                    int mLength = rand.nextInt(plainTextSize) + 1;
-                    mBytes = new byte[mLength];
-                    rand.nextBytes(mBytes);
-
-                    // encrypt
-                    cBytes = cipher.doFinal(mBytes);
-
-
-                    // initialize for decryption
-                    cipher.init(Cipher.DECRYPT_MODE, privKey, params);
-                    // decrypt
-                    dBytes = cipher.doFinal(cBytes);
-                    // compare
-                    assertEquals(
-                        "Encryption/decryption test failed for message \""
-                            + ByteUtils.toHexString(mBytes)
-                            + "\":\n actual decrypted text: "
-                            + ByteUtils.toHexString(dBytes)
-                            + "\n expected plain text: "
-                            + ByteUtils.toHexString(mBytes), mBytes,
-                        dBytes);
-                }
-            }
-        }
-        catch (Exception e)
-        {
-            e.printStackTrace();
-            fail(e);
-        }
-    }
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/provider/test/FlexiTest.java b/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/provider/test/FlexiTest.java
deleted file mode 100644
index 7d8ddd9..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/provider/test/FlexiTest.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package org.bouncycastle.pqc.jcajce.provider.test;
-
-import java.security.SecureRandom;
-import java.security.Security;
-import java.util.Arrays;
-import java.util.Random;
-
-import junit.framework.TestCase;
-import org.bouncycastle.pqc.jcajce.provider.BouncyCastlePQCProvider;
-
-public abstract class FlexiTest
-    extends TestCase
-{
-
-    /**
-     * Source of randomness
-     */
-    protected Random rand;
-
-    /**
-     * Secure source of randomness
-     */
-    protected SecureRandom sr;
-
-    protected void setUp()
-    {
-        Security.addProvider(new BouncyCastlePQCProvider());
-        // initialize sources of randomness
-        rand = new Random();
-        sr = new SecureRandom();
-        // TODO need it?
-        sr.setSeed(sr.generateSeed(20));
-    }
-
-    protected static final void assertEquals(byte[] expected, byte[] actual)
-    {
-        assertTrue(Arrays.equals(expected, actual));
-    }
-
-    protected static final void assertEquals(String message, byte[] expected,
-                                             byte[] actual)
-    {
-        assertTrue(message, Arrays.equals(expected, actual));
-    }
-
-    protected static final void assertEquals(int[] expected, int[] actual)
-    {
-        assertTrue(Arrays.equals(expected, actual));
-    }
-
-    protected static final void assertEquals(String message, int[] expected,
-                                             int[] actual)
-    {
-        assertTrue(message, Arrays.equals(expected, actual));
-    }
-
-    /**
-     * Method used to report test failure when in exception is thrown.
-     *
-     * @param e the exception
-     */
-    protected static final void fail(Exception e)
-    {
-        fail("Exception thrown: " + e.getClass().getName() + ":\n"
-            + e.getMessage());
-    }
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/provider/test/KeyPairGeneratorTest.java b/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/provider/test/KeyPairGeneratorTest.java
deleted file mode 100644
index f1da055..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/provider/test/KeyPairGeneratorTest.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package org.bouncycastle.pqc.jcajce.provider.test;
-
-import java.security.KeyFactory;
-import java.security.KeyPair;
-import java.security.KeyPairGenerator;
-import java.security.PrivateKey;
-import java.security.PublicKey;
-import java.security.spec.PKCS8EncodedKeySpec;
-import java.security.spec.X509EncodedKeySpec;
-
-public abstract class KeyPairGeneratorTest
-    extends FlexiTest
-{
-
-    protected KeyPairGenerator kpg;
-
-    protected KeyFactory kf;
-
-    protected final void performKeyPairEncodingTest()
-    {
-        try
-        {
-            KeyPair keyPair = kpg.genKeyPair();
-            PublicKey pubKey = keyPair.getPublic();
-            PrivateKey privKey = keyPair.getPrivate();
-
-            byte[] encPubKey = pubKey.getEncoded();
-            byte[] encPrivKey = privKey.getEncoded();
-
-            X509EncodedKeySpec pubKeySpec = new X509EncodedKeySpec(encPubKey);
-            PKCS8EncodedKeySpec privKeySpec = new PKCS8EncodedKeySpec(
-                encPrivKey);
-
-            PublicKey decPubKey = kf.generatePublic(pubKeySpec);
-            PrivateKey decPrivKey = kf.generatePrivate(privKeySpec);
-
-            assertEquals(pubKey, decPubKey);
-            assertEquals(privKey, decPrivKey);
-        }
-        catch (Exception e)
-        {
-            e.printStackTrace();
-            fail(e);
-        }
-    }
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/provider/test/McElieceCCA2KeyPairGeneratorTest.java b/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/provider/test/McElieceCCA2KeyPairGeneratorTest.java
deleted file mode 100644
index ccb06ae..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/provider/test/McElieceCCA2KeyPairGeneratorTest.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package org.bouncycastle.pqc.jcajce.provider.test;
-
-import java.security.KeyFactory;
-import java.security.KeyPairGenerator;
-import java.security.NoSuchAlgorithmException;
-
-import org.bouncycastle.pqc.jcajce.spec.ECCKeyGenParameterSpec;
-
-
-public class McElieceCCA2KeyPairGeneratorTest
-    extends KeyPairGeneratorTest
-{
-
-    protected void setUp()
-    {
-        super.setUp();
-        try
-        {
-            kf = KeyFactory.getInstance("McElieceCCA2");
-        }
-        catch (NoSuchAlgorithmException e)
-        {
-            e.printStackTrace();
-        }
-    }
-
-
-    public void testKeyPairEncoding_9_33()
-        throws Exception
-    {
-        kpg = KeyPairGenerator.getInstance("McElieceKobaraImai");
-        ECCKeyGenParameterSpec params = new ECCKeyGenParameterSpec(9, 33);
-        kpg.initialize(params);
-        performKeyPairEncodingTest();
-    }
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/provider/test/McElieceCCA2PrimitivesTest.java b/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/provider/test/McElieceCCA2PrimitivesTest.java
deleted file mode 100644
index 39e16ad..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/provider/test/McElieceCCA2PrimitivesTest.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package org.bouncycastle.pqc.jcajce.provider.test;
-
-import java.security.KeyPair;
-import java.security.KeyPairGenerator;
-import java.security.NoSuchAlgorithmException;
-
-import org.bouncycastle.pqc.jcajce.provider.mceliece.BCMcElieceCCA2PrivateKey;
-import org.bouncycastle.pqc.jcajce.provider.mceliece.BCMcElieceCCA2PublicKey;
-import org.bouncycastle.pqc.jcajce.provider.mceliece.McElieceCCA2Primitives;
-import org.bouncycastle.pqc.jcajce.spec.ECCKeyGenParameterSpec;
-import org.bouncycastle.pqc.math.linearalgebra.GF2Vector;
-
-
-public class McElieceCCA2PrimitivesTest
-    extends FlexiTest
-{
-
-    KeyPairGenerator kpg;
-
-    protected void setUp()
-    {
-        super.setUp();
-        try
-        {
-            kpg = KeyPairGenerator.getInstance("McElieceKobaraImai");
-        }
-        catch (NoSuchAlgorithmException e)
-        {
-            e.printStackTrace();
-        }
-    }
-
-    public void testPrimitives()
-        throws Exception
-    {
-        int m = 11;
-        int t = 50;
-        initKPG(m, t);
-        int n = 1 << m;
-
-        KeyPair pair = kpg.genKeyPair();
-        BCMcElieceCCA2PublicKey pubKey = (BCMcElieceCCA2PublicKey)pair.getPublic();
-        BCMcElieceCCA2PrivateKey privKey = (BCMcElieceCCA2PrivateKey)pair
-            .getPrivate();
-
-        GF2Vector plaintext = new GF2Vector(pubKey.getK(), sr);
-        GF2Vector errors = new GF2Vector(n, t, sr);
-
-        GF2Vector ciphertext = McElieceCCA2Primitives.encryptionPrimitive(
-            pubKey, plaintext, errors);
-
-        GF2Vector[] dec = McElieceCCA2Primitives.decryptionPrimitive(privKey,
-            ciphertext);
-        GF2Vector plaintextAgain = dec[0];
-        GF2Vector errorsAgain = dec[1];
-
-        assertEquals(plaintext, plaintextAgain);
-        assertEquals(errors, errorsAgain);
-    }
-
-    /**
-     * Initialize the key pair generator with the given parameters.
-     */
-    private void initKPG(int m, int t)
-        throws Exception
-    {
-        ECCKeyGenParameterSpec params = new ECCKeyGenParameterSpec(m, t);
-        kpg.initialize(params);
-    }
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/provider/test/McElieceFujisakiCipherTest.java b/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/provider/test/McElieceFujisakiCipherTest.java
deleted file mode 100644
index 2f793a6..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/provider/test/McElieceFujisakiCipherTest.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package org.bouncycastle.pqc.jcajce.provider.test;
-
-import java.security.KeyPairGenerator;
-
-import javax.crypto.Cipher;
-
-import org.bouncycastle.pqc.jcajce.spec.ECCKeyGenParameterSpec;
-
-
-public class McElieceFujisakiCipherTest
-    extends AsymmetricHybridCipherTest
-{
-
-    protected void setUp()
-    {
-        super.setUp();
-        try
-        {
-            kpg = KeyPairGenerator.getInstance("McElieceFujisaki");
-            cipher = Cipher.getInstance("McElieceFujisakiWithSHA256");
-        }
-        catch (Exception e)
-        {
-            e.printStackTrace();
-        }
-
-    }
-
-    /**
-     * Test encryption and decryption performance for SHA256 message digest and parameters
-     * m=11, t=50.
-     */
-    public void testEnDecryption_SHA256_11_50()
-        throws Exception
-    {
-        // initialize key pair generator
-        ECCKeyGenParameterSpec kpgParams = new ECCKeyGenParameterSpec(11, 50);
-        kpg.initialize(kpgParams);
-
-        // perform test
-        performEnDecryptionTest(1, 10, 32, null);
-    }
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/provider/test/McElieceKeyPairGeneratorTest.java b/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/provider/test/McElieceKeyPairGeneratorTest.java
deleted file mode 100644
index 5c68fde..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/provider/test/McElieceKeyPairGeneratorTest.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package org.bouncycastle.pqc.jcajce.provider.test;
-
-import java.security.KeyFactory;
-import java.security.KeyPairGenerator;
-import java.security.NoSuchAlgorithmException;
-
-import org.bouncycastle.pqc.jcajce.spec.ECCKeyGenParameterSpec;
-
-
-public class McElieceKeyPairGeneratorTest
-    extends KeyPairGeneratorTest
-{
-
-    protected void setUp()
-    {
-        super.setUp();
-        try
-        {
-            kf = KeyFactory.getInstance("McEliece");
-        }
-        catch (NoSuchAlgorithmException e)
-        {
-            e.printStackTrace();
-        }
-    }
-
-    public void testKeyPairEncoding_9_33()
-        throws Exception
-    {
-        kpg = KeyPairGenerator.getInstance("McEliecePKCS");
-        ECCKeyGenParameterSpec params = new ECCKeyGenParameterSpec(9, 33);
-        kpg.initialize(params);
-        performKeyPairEncodingTest();
-    }
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/provider/test/McElieceKobaraImaiCipherTest.java b/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/provider/test/McElieceKobaraImaiCipherTest.java
deleted file mode 100644
index c396a87..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/provider/test/McElieceKobaraImaiCipherTest.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package org.bouncycastle.pqc.jcajce.provider.test;
-
-import java.security.KeyPairGenerator;
-import java.security.spec.AlgorithmParameterSpec;
-
-import javax.crypto.Cipher;
-
-import org.bouncycastle.pqc.jcajce.spec.ECCKeyGenParameterSpec;
-
-
-public class McElieceKobaraImaiCipherTest
-    extends AsymmetricHybridCipherTest
-{
-
-    protected void setUp()
-    {
-        super.setUp();
-        try
-        {
-            kpg = KeyPairGenerator.getInstance("McElieceKobaraImai");
-            cipher = Cipher.getInstance("McElieceKobaraImaiWithSHA256");
-        }
-        catch (Exception e)
-        {
-            e.printStackTrace();
-        }
-    }
-
-    /**
-     * Test encryption and decryption performance for SHA256 message digest and parameters
-     * m=11, t=50.
-     */
-    public void testEnDecryption_SHA256_11_50()
-        throws Exception
-    {
-        // initialize key pair generator
-        AlgorithmParameterSpec kpgParams = new ECCKeyGenParameterSpec(11, 50);
-        kpg.initialize(kpgParams);
-
-        performEnDecryptionTest(1, 10, 32, null);
-    }
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/provider/test/McEliecePKCSCipherTest.java b/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/provider/test/McEliecePKCSCipherTest.java
deleted file mode 100644
index 74ab66b..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/provider/test/McEliecePKCSCipherTest.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package org.bouncycastle.pqc.jcajce.provider.test;
-
-import java.security.KeyPairGenerator;
-
-import javax.crypto.Cipher;
-
-import org.bouncycastle.pqc.jcajce.spec.ECCKeyGenParameterSpec;
-
-public class McEliecePKCSCipherTest
-    extends AsymmetricBlockCipherTest
-{
-
-    protected void setUp()
-    {
-        super.setUp();
-
-        try
-        {
-            kpg = KeyPairGenerator.getInstance("McEliecePKCS");
-            cipher = Cipher.getInstance("McEliecePKCSwithSHA256");
-        }
-        catch (Exception e)
-        {
-            e.printStackTrace();
-        }
-
-
-    }
-
-    public void testEnDecryption_9_33()
-        throws Exception
-    {
-        ECCKeyGenParameterSpec params = new ECCKeyGenParameterSpec(9, 33);
-        kpg.initialize(params);
-        performEnDecryptionTest(2, 10, params);
-    }
-
-    public void testEnDecryption_11_50()
-        throws Exception
-    {
-        ECCKeyGenParameterSpec params = new ECCKeyGenParameterSpec(11, 50);
-        kpg.initialize(params);
-        performEnDecryptionTest(2, 10, params);
-    }
-
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/provider/test/McEliecePointchevalCipherTest.java b/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/provider/test/McEliecePointchevalCipherTest.java
deleted file mode 100644
index 791baa1..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/provider/test/McEliecePointchevalCipherTest.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package org.bouncycastle.pqc.jcajce.provider.test;
-
-import java.security.KeyPairGenerator;
-import java.security.spec.AlgorithmParameterSpec;
-
-import javax.crypto.Cipher;
-
-import org.bouncycastle.pqc.jcajce.spec.ECCKeyGenParameterSpec;
-
-public class McEliecePointchevalCipherTest
-    extends AsymmetricHybridCipherTest
-{
-
-    protected void setUp()
-    {
-        super.setUp();
-        try
-        {
-            kpg = KeyPairGenerator.getInstance("McEliecePointcheval");
-            cipher = Cipher.getInstance("McEliecePointchevalWithSHA256");
-        }
-        catch (Exception e)
-        {
-            e.printStackTrace();
-        }
-    }
-
-    /**
-     * Test encryption and decryption performance for SHA256 message digest and parameters
-     * m=11, t=50.
-     */
-    public void testEnDecryption_SHA256_11_50()
-        throws Exception
-    {
-        // initialize key pair generator
-        AlgorithmParameterSpec kpgParams = new ECCKeyGenParameterSpec(11, 50);
-        kpg.initialize(kpgParams);
-
-        // perform test
-        performEnDecryptionTest(1, 10, 32, null);
-    }
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/provider/test/RainbowSignatureTest.java b/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/provider/test/RainbowSignatureTest.java
deleted file mode 100644
index 69f69b6..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/provider/test/RainbowSignatureTest.java
+++ /dev/null
@@ -1,450 +0,0 @@
-package org.bouncycastle.pqc.jcajce.provider.test;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.security.InvalidAlgorithmParameterException;
-import java.security.InvalidKeyException;
-import java.security.Key;
-import java.security.KeyFactory;
-import java.security.KeyPair;
-import java.security.KeyPairGenerator;
-import java.security.PrivateKey;
-import java.security.PublicKey;
-import java.security.SecureRandom;
-import java.security.Security;
-import java.security.Signature;
-import java.security.SignatureException;
-import java.security.spec.AlgorithmParameterSpec;
-import java.security.spec.PKCS8EncodedKeySpec;
-import java.security.spec.X509EncodedKeySpec;
-import java.util.Random;
-
-import junit.framework.TestCase;
-import org.bouncycastle.pqc.jcajce.provider.BouncyCastlePQCProvider;
-import org.bouncycastle.pqc.jcajce.spec.RainbowParameterSpec;
-import org.bouncycastle.util.encoders.Hex;
-
-public class RainbowSignatureTest
-    extends TestCase
-{
-
-    protected KeyPairGenerator kpg;
-
-    protected Signature sig;
-
-    private Signature sigVerify;
-
-    private KeyPair keyPair;
-
-    private PublicKey pubKey;
-
-    private PrivateKey privKey;
-
-    private byte[] mBytes;
-
-    private byte[] sigBytes;
-
-    private boolean valid;
-
-    Random rand = new Random();
-
-    private KeyFactory kf;
-
-
-    public void setUp()
-    {
-        if (Security.getProvider(BouncyCastlePQCProvider.PROVIDER_NAME) == null)
-        {
-            Security.addProvider(new BouncyCastlePQCProvider());
-        }
-    }
-
-    /**
-     * Test signature generation and verification
-     *
-     * @param numPassesKPG    the number of key pair generation passes
-     * @param numPassesSigVer the number of sign/verify passes
-     * @param kpgParams       the parameters for the key pair generator
-     */
-    protected final void performSignVerifyTest(int numPassesKPG,
-                                               int numPassesSigVer, AlgorithmParameterSpec kpgParams)
-        throws Exception
-    {
-        this.performSignVerifyTest(numPassesKPG, numPassesSigVer,
-            kpgParams, 100);
-    }
-
-    /**
-     * Test signature generation and verification
-     *
-     * @param numPassesKPG    the number of key pair generation passes
-     * @param numPassesSigVer the number of sign/verify passes
-     * @param kpgParams       the parameters for the key pair generator
-     * @param messageSize     length of the messages which are signed in bytes
-     */
-    protected final void performSignVerifyTest(int numPassesKPG,
-                                               int numPassesSigVer, AlgorithmParameterSpec kpgParams,
-                                               int messageSize)
-        throws Exception
-    {
-        // generate new signature instance for verification
-        //            sigVerify = (Signature) sig.getClass().newInstance();
-        sigVerify = Signature.getInstance("SHA384WITHRainbow");
-
-        for (int j = 0; j < numPassesKPG; j++)
-        {
-            // generate key pair
-            if (kpgParams != null)
-            {
-                kpg.initialize(kpgParams);
-            }
-            keyPair = kpg.genKeyPair();
-            pubKey = keyPair.getPublic();
-            privKey = keyPair.getPrivate();
-
-            // initialize signature instances
-            sig.initSign(privKey);
-            sigVerify.initVerify(pubKey);
-
-            for (int k = 1; k <= numPassesSigVer; k++)
-            {
-                // generate random message
-                mBytes = new byte[messageSize];
-                rand.nextBytes(mBytes);
-
-                // sign
-                sig.update(mBytes);
-                sigBytes = sig.sign();
-
-                // verify
-                sigVerify.update(mBytes);
-                valid = sigVerify.verify(sigBytes);
-
-                // compare
-                assertTrue(
-                    "Signature generation and verification test failed.\n"
-                        + "Message: \""
-                        + new String(Hex.encode(mBytes)) + "\"\n"
-                        + privKey + "\n" + pubKey, valid);
-            }
-        }
-    }
-
-    /**
-     * Test signature generation and verification
-     *
-     * @param numPassesKPG    the number of key pair generation passes
-     * @param numPassesSigVer the number of sign/verify passes
-     * @param keySize         the key size for the key pair generator
-     */
-    protected final void performSignVerifyTest(int numPassesKPG,
-                                               int numPassesSigVer, int keySize)
-        throws Exception
-    {
-
-        System.out.println("=== TEST ===");
-        System.out.println(numPassesKPG + " Tests");
-        System.out.println("KeySize: " + keySize + "");
-        for (int j = 0; j < numPassesKPG; j++)
-        {
-            // generate key pair
-
-            kpg.initialize(keySize);
-            keyPair = kpg.genKeyPair();
-            pubKey = keyPair.getPublic();
-            //writeKey("RainbowPubKey", pubKey);
-            privKey = keyPair.getPrivate();
-            // it causes errors! cause RainbowParameters will be null
-            //pubKey = getPublicKey("RainbowPubKey");
-
-            // initialize signature instances
-            sig.initSign(privKey, new SecureRandom());
-            sigVerify.initVerify(pubKey);
-
-            for (int k = 1; k <= numPassesSigVer; k++)
-            {
-                // generate random message
-                final int messageSize = 100;
-                mBytes = new byte[messageSize];
-                rand.nextBytes(mBytes);
-
-                sig.update(mBytes, 0, mBytes.length);
-                sigBytes = sig.sign();
-
-                // verify
-                sigVerify.update(mBytes, 0, mBytes.length);
-                valid = sigVerify.verify(sigBytes);
-
-                // compare
-                assertTrue(
-                    "Signature generation and verification test failed.\n"
-                        + "Message: \""
-                        + new String(Hex.encode(mBytes)) + "\"\n"
-                        + privKey + "\n" + pubKey, valid);
-            }
-        }
-
-    }
-
-    protected final void performSignVerifyTest(int numPassesSigVer, PublicKey pubKey, PrivateKey privKey)
-        throws Exception
-    {
-        // initialize signature instances
-        sig.initSign(privKey);
-        sigVerify.initVerify(pubKey);
-
-        for (int k = 1; k <= numPassesSigVer; k++)
-        {
-            // generate random message
-            final int messageSize = 100;
-            mBytes = new byte[messageSize];
-            rand.nextBytes(mBytes);
-
-            // sign
-            sig.update(mBytes);
-            sigBytes = sig.sign();
-
-            // verify
-            sigVerify.update(mBytes);
-            valid = sigVerify.verify(sigBytes);
-
-
-            // compare
-            assertTrue(
-                "Signature generation and verification test failed.\n"
-                    + "Message: \""
-                    + new String(Hex.encode(mBytes)) + "\"\n"
-                    + privKey + "\n" + pubKey, valid);
-        }
-    }
-
-    protected final void performVerifyTest(PublicKey pk, byte[] signature, byte[] message)
-    {
-        try
-        {
-            sig.initVerify(pk);
-            sig.update(message);
-            valid = sig.verify(signature);
-            assertTrue("Signature generation and verification test failed.\n" + "Message: \"" + new String(Hex.encode(mBytes)) + "\"\n" + privKey + "\n" + pubKey, valid);
-        }
-        catch (InvalidKeyException e)
-        {
-            e.printStackTrace();
-        }
-        catch (SignatureException e)
-        {
-            e.printStackTrace();
-        }
-    }
-
-
-    /**
-     * Using ParameterSpecs to initialize the key pair generator without initialization.
-     */
-
-    public void testRainbowWithSHA224()
-        throws Exception
-    {
-        kpg = KeyPairGenerator.getInstance("Rainbow", BouncyCastlePQCProvider.PROVIDER_NAME);
-        sig = Signature.getInstance("SHA224WITHRainbow", BouncyCastlePQCProvider.PROVIDER_NAME);
-        sigVerify = Signature.getInstance("SHA224WITHRainbow", BouncyCastlePQCProvider.PROVIDER_NAME);
-        performSignVerifyTest(1, 1, 28);
-    }
-
-    public void testRainbowithSHA256()
-        throws Exception
-    {
-        kpg = KeyPairGenerator.getInstance("Rainbow");
-        sig = Signature.getInstance("SHA256WITHRainbow");
-        sigVerify = Signature.getInstance("SHA256WITHRainbow");
-        performSignVerifyTest(1, 1, 32);
-    }
-
-    public void testRainbowWithSHA384()
-        throws Exception
-    {
-        kpg = KeyPairGenerator.getInstance("Rainbow");
-        sig = Signature.getInstance("SHA384WITHRainbow");
-        sigVerify = Signature.getInstance("SHA384WITHRainbow");
-        performSignVerifyTest(1, 1, 48);
-    }
-
-    public void testRainbowWithSHA512()
-        throws Exception
-    {
-        kpg = KeyPairGenerator.getInstance("Rainbow");
-        sig = Signature.getInstance("SHA512WITHRainbow");
-        sigVerify = Signature.getInstance("SHA512WITHRainbow");
-        performSignVerifyTest(1, 1, 64);
-    }
-
-    public void test_KeyFactory()
-        throws Exception
-    {
-        kpg = KeyPairGenerator.getInstance("Rainbow");
-
-        KeyFactory kf = KeyFactory.getInstance("Rainbow");
-
-        AlgorithmParameterSpec specs = new RainbowParameterSpec();
-        try
-        {
-            kpg.initialize(specs);
-        }
-        catch (InvalidAlgorithmParameterException e)
-        {
-            e.printStackTrace();
-        }
-        // XXX
-        kpg.initialize(5);
-        keyPair = kpg.genKeyPair();
-        pubKey = keyPair.getPublic();
-        privKey = keyPair.getPrivate();
-
-        byte[] pubKeyBytes = pubKey.getEncoded();
-        X509EncodedKeySpec pubKeySpec = new X509EncodedKeySpec(pubKeyBytes);
-        PKCS8EncodedKeySpec privKeySpec = new PKCS8EncodedKeySpec(privKey.getEncoded());
-
-        PublicKey publicKeyKF = kf.generatePublic(pubKeySpec);
-
-        assertEquals(pubKey, publicKeyKF);
-        assertEquals(pubKey.hashCode(), publicKeyKF.hashCode());
-
-        PrivateKey privKeyKF = kf.generatePrivate(privKeySpec);
-
-        assertEquals(privKey, privKeyKF);
-        assertEquals(privKey.hashCode(), privKeyKF.hashCode());
-    }
-
-    public PrivateKey getPrivateKey(String file)
-        throws Exception
-    {
-        byte[] privKeyBytes = getBytesFromFile(new File(file));
-        PKCS8EncodedKeySpec privKeySpec = new PKCS8EncodedKeySpec(privKeyBytes);
-        return kf.generatePrivate(privKeySpec);
-    }
-
-    public void writeToFile(String filename, String data)
-        throws IOException
-    {
-        FileOutputStream fos = new FileOutputStream(filename);
-        fos.write(data.getBytes());
-        fos.close();
-    }
-
-    public void testSignVerifyWithRandomParams()
-        throws Exception
-    {
-        kpg = KeyPairGenerator.getInstance("Rainbow");
-        sig = Signature.getInstance("SHA384WITHRainbow");
-        int[] vi;
-
-        for (int kgen = 1; kgen <= 10; kgen++)
-        {
-            vi = chooseRandomParams();
-            RainbowParameterSpec rbParams = new RainbowParameterSpec(vi);
-            performSignVerifyTest(1, 100, rbParams);
-        }
-    }
-
-
-    /**
-     * build up the set of vinegars per layer (vi)
-     *
-     * @return parameters vi
-     */
-    private int[] chooseRandomParams()
-    {
-        int n = rand.nextInt(10) + 2;
-        int[] vi = new int[n];
-
-        vi[0] = rand.nextInt(10) + 2;
-        for (int i = 1; i < n; i++)
-        {
-            vi[i] = vi[i - 1];
-            vi[i] += rand.nextInt(10) + 1;
-        }
-        return vi;
-    }
-
-    /*
-     public void testSignVerifyWithSpecialParams() throws Exception {
-         kpg = KeyPairGenerator.getInstance("RainbowWithSHA384");
-         sig = Signature.getInstance("SHA384WITHRainbow");
-         int[] vi = { 3, 20, 25, 30, 40, 60, 80, 100 };
-         performSignVerifyTest(10, 200, new RainbowParameterSpec(vi));
-     }
-     */
-
-    public void testSignVerifyWithDefaultParams()
-        throws Exception
-    {
-        kpg = KeyPairGenerator.getInstance("Rainbow");
-        sig = Signature.getInstance("SHA384WITHRainbow");
-        performSignVerifyTest(15, 100, new RainbowParameterSpec());
-    }
-
-
-    public void writeKey(String file, Key key)
-        throws IOException
-    {
-        byte[] privKeyBytes = key.getEncoded();
-        FileOutputStream fos = new FileOutputStream(file);
-        fos.write(privKeyBytes);
-        fos.close();
-    }
-
-    public PublicKey getPublicKey(String file)
-        throws Exception
-    {
-        kf = KeyFactory.getInstance("Rainbow");
-        byte[] pubKeyBytes = getBytesFromFile(new File(file));
-        X509EncodedKeySpec pubKeySpec = new X509EncodedKeySpec(pubKeyBytes);
-        return kf.generatePublic(pubKeySpec);
-    }
-
-
-    public byte[] getBytesFromFile(File file)
-        throws IOException
-    {
-        InputStream is = new FileInputStream(file);
-
-        // Get the size of the file
-        long length = file.length();
-
-        // You cannot create an array using a long type.
-        // It needs to be an int type.
-        // Before converting to an int type, check
-        // to ensure that file is not larger than Integer.MAX_VALUE.
-        if (length > Integer.MAX_VALUE)
-        {
-            // File is too large
-        }
-
-        // Create the byte array to hold the data
-        byte[] bytes = new byte[(int)length];
-
-        // Read in the bytes
-        int offset = 0;
-        int numRead = 0;
-        while (offset < bytes.length
-            && (numRead = is.read(bytes, offset, bytes.length - offset)) >= 0)
-        {
-            offset += numRead;
-        }
-
-        // Ensure all the bytes have been read in
-        if (offset < bytes.length)
-        {
-            throw new IOException("Could not completely read file " + file.getName());
-        }
-
-        // Close the input stream and return bytes
-        is.close();
-        return bytes;
-    }
-
-}
-
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/provider/util/AsymmetricBlockCipher.java b/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/provider/util/AsymmetricBlockCipher.java
deleted file mode 100644
index 7eb2ac1..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/provider/util/AsymmetricBlockCipher.java
+++ /dev/null
@@ -1,520 +0,0 @@
-package org.bouncycastle.pqc.jcajce.provider.util;
-
-import java.io.ByteArrayOutputStream;
-import java.security.InvalidAlgorithmParameterException;
-import java.security.InvalidKeyException;
-import java.security.InvalidParameterException;
-import java.security.Key;
-import java.security.SecureRandom;
-import java.security.spec.AlgorithmParameterSpec;
-
-import javax.crypto.BadPaddingException;
-import javax.crypto.IllegalBlockSizeException;
-import javax.crypto.ShortBufferException;
-
-
-/**
- * The AsymmetricBlockCipher class extends CipherSpiExt.
- * NOTE: Some Ciphers are using Padding. OneAndZeroesPadding is used as default
- * padding. However padding can still be specified, but mode is not supported;
- * if you try to instantiate the cipher with something else than "NONE" as mode
- * NoSuchAlgorithmException is thrown.
- */
-public abstract class AsymmetricBlockCipher
-    extends CipherSpiExt
-{
-
-    /**
-     * ParameterSpec used with this cipher
-     */
-    protected AlgorithmParameterSpec paramSpec;
-
-    /**
-     * Internal buffer
-     */
-    protected ByteArrayOutputStream buf;
-
-    /**
-     * The maximum number of bytes the cipher can decrypt.
-     */
-    protected int maxPlainTextSize;
-
-    /**
-     * The maximum number of bytes the cipher can encrypt.
-     */
-    protected int cipherTextSize;
-
-    /**
-     * The AsymmetricBlockCipher() constructor
-     */
-    public AsymmetricBlockCipher()
-    {
-        buf = new ByteArrayOutputStream();
-    }
-
-    /**
-     * Return the block size (in bytes). Note: although the ciphers extending
-     * this class are not block ciphers, the method was adopted to return the
-     * maximal plaintext and ciphertext sizes for non hybrid ciphers. If the
-     * cipher is hybrid, it returns 0.
-     *
-     * @return if the cipher is not a hybrid one the max plain/cipher text size
-     *         is returned, otherwise 0 is returned
-     */
-    public final int getBlockSize()
-    {
-        return opMode == ENCRYPT_MODE ? maxPlainTextSize : cipherTextSize;
-    }
-
-    /**
-     * @return <tt>null</tt> since no initialization vector is used.
-     */
-    public final byte[] getIV()
-    {
-        return null;
-    }
-
-    /**
-     * Return the length in bytes that an output buffer would need to be in
-     * order to hold the result of the next update or doFinal operation, given
-     * the input length <tt>inLen</tt> (in bytes). This call takes into
-     * account any unprocessed (buffered) data from a previous update call, and
-     * padding. The actual output length of the next update() or doFinal() call
-     * may be smaller than the length returned by this method.
-     * <p>
-     * If the input length plus the length of the buffered data exceeds the
-     * maximum length, <tt>0</tt> is returned.
-     * </p>
-     * @param inLen the length of the input
-     * @return the length of the ciphertext or <tt>0</tt> if the input is too
-     *         long.
-     */
-    public final int getOutputSize(int inLen)
-    {
-
-        int totalLen = inLen + buf.size();
-
-        int maxLen = getBlockSize();
-
-        if (totalLen > maxLen)
-        {
-            // the length of the input exceeds the maximal supported length
-            return 0;
-        }
-
-        return maxLen;
-    }
-
-    /**
-     * Returns the parameters used with this cipher.
-     * <p>
-     * The returned parameters may be the same that were used to initialize this
-     * cipher, or may contain the default set of parameters or a set of randomly
-     * generated parameters used by the underlying cipher implementation
-     * (provided that the underlying cipher implementation uses a default set of
-     * parameters or creates new parameters if it needs parameters but was not
-     * initialized with any).
-     * </p>
-     *
-     * @return the parameters used with this cipher, or null if this cipher does
-     *         not use any parameters.
-     */
-    public final AlgorithmParameterSpec getParameters()
-    {
-        return paramSpec;
-    }
-
-    /**
-     * Initializes the cipher for encryption by forwarding it to
-     * initEncrypt(Key, FlexiSecureRandom).
-     * <p>
-     * If this cipher requires any algorithm parameters that cannot be derived
-     * from the given key, the underlying cipher implementation is supposed to
-     * generate the required parameters itself (using provider-specific default
-     * or random values) if it is being initialized for encryption, and raise an
-     * InvalidKeyException if it is being initialized for decryption. The
-     * generated parameters can be retrieved using engineGetParameters or
-     * engineGetIV (if the parameter is an IV).
-     * </p>
-     * @param key the encryption or decryption key.
-     * @throws InvalidKeyException if the given key is inappropriate for initializing this
-     * cipher.
-     */
-    public final void initEncrypt(Key key)
-        throws InvalidKeyException
-    {
-        try
-        {
-            initEncrypt(key, null, new SecureRandom());
-        }
-        catch (InvalidAlgorithmParameterException e)
-        {
-            throw new InvalidParameterException(
-                "This cipher needs algorithm parameters for initialization (cannot be null).");
-        }
-    }
-
-    /**
-     * Initialize this cipher for encryption by forwarding it to
-     * initEncrypt(Key, FlexiSecureRandom, AlgorithmParameterSpec).
-     * <p>
-     * If this cipher requires any algorithm parameters that cannot be derived
-     * from the given key, the underlying cipher implementation is supposed to
-     * generate the required parameters itself (using provider-specific default
-     * or random values) if it is being initialized for encryption, and raise an
-     * InvalidKeyException if it is being initialized for decryption. The
-     * generated parameters can be retrieved using engineGetParameters or
-     * engineGetIV (if the parameter is an IV).
-     * </p>
-     * @param key    the encryption or decryption key.
-     * @param random the source of randomness.
-     * @throws InvalidKeyException if the given key is inappropriate for initializing this
-     * cipher.
-     */
-    public final void initEncrypt(Key key, SecureRandom random)
-        throws InvalidKeyException
-    {
-
-        try
-        {
-            initEncrypt(key, null, random);
-        }
-        catch (InvalidAlgorithmParameterException iape)
-        {
-            throw new InvalidParameterException(
-                "This cipher needs algorithm parameters for initialization (cannot be null).");
-        }
-    }
-
-    /**
-     * Initializes the cipher for encryption by forwarding it to
-     * initEncrypt(Key, FlexiSecureRandom, AlgorithmParameterSpec).
-     *
-     * @param key    the encryption or decryption key.
-     * @param params the algorithm parameters.
-     * @throws InvalidKeyException if the given key is inappropriate for initializing this
-     * cipher.
-     * @throws InvalidAlgorithmParameterException if the given algortihm parameters are inappropriate for
-     * this cipher, or if this cipher is being initialized for
-     * decryption and requires algorithm parameters and params
-     * is null.
-     */
-    public final void initEncrypt(Key key, AlgorithmParameterSpec params)
-        throws InvalidKeyException, InvalidAlgorithmParameterException
-    {
-        initEncrypt(key, params, new SecureRandom());
-    }
-
-    /**
-     * This method initializes the AsymmetricBlockCipher with a certain key for
-     * data encryption.
-     * <p>
-     * If this cipher (including its underlying feedback or padding scheme)
-     * requires any random bytes (e.g., for parameter generation), it will get
-     * them from random.
-     * </p><p>
-     * Note that when a Cipher object is initialized, it loses all
-     * previously-acquired state. In other words, initializing a Cipher is
-     * equivalent to creating a new instance of that Cipher and initializing it
-     * </p>
-     *
-     * @param key          the key which has to be used to encrypt data.
-     * @param secureRandom the source of randomness.
-     * @param params       the algorithm parameters.
-     * @throws InvalidKeyException if the given key is inappropriate for initializing this
-     * cipher
-     * @throws InvalidAlgorithmParameterException if the given algorithm parameters are inappropriate for
-     * this cipher, or if this cipher is being initialized for
-     * decryption and requires algorithm parameters and params
-     * is null.
-     */
-    public final void initEncrypt(Key key, AlgorithmParameterSpec params,
-                                  SecureRandom secureRandom)
-        throws InvalidKeyException,
-        InvalidAlgorithmParameterException
-    {
-        opMode = ENCRYPT_MODE;
-        initCipherEncrypt(key, params, secureRandom);
-    }
-
-    /**
-     * Initialize the cipher for decryption by forwarding it to
-     * {@link #initDecrypt(Key, AlgorithmParameterSpec)}.
-     * <p>
-     * If this cipher requires any algorithm parameters that cannot be derived
-     * from the given key, the underlying cipher implementation is supposed to
-     * generate the required parameters itself (using provider-specific default
-     * or random values) if it is being initialized for encryption, and raise an
-     * InvalidKeyException if it is being initialized for decryption. The
-     * generated parameters can be retrieved using engineGetParameters or
-     * engineGetIV (if the parameter is an IV).
-     * </p>
-     * @param key the encryption or decryption key.
-     * @throws InvalidKeyException if the given key is inappropriate for initializing this
-     * cipher.
-     */
-    public final void initDecrypt(Key key)
-        throws InvalidKeyException
-    {
-        try
-        {
-            initDecrypt(key, null);
-        }
-        catch (InvalidAlgorithmParameterException iape)
-        {
-            throw new InvalidParameterException(
-                "This cipher needs algorithm parameters for initialization (cannot be null).");
-        }
-    }
-
-    /**
-     * This method initializes the AsymmetricBlockCipher with a certain key for
-     * data decryption.
-     * <p>
-     * If this cipher (including its underlying feedback or padding scheme)
-     * requires any random bytes (e.g., for parameter generation), it will get
-     * them from random.
-     * </p><p>
-     * Note that when a Cipher object is initialized, it loses all
-     * previously-acquired state. In other words, initializing a Cipher is
-     * equivalent to creating a new instance of that Cipher and initializing it
-     * </p>
-     *
-     * @param key    the key which has to be used to decrypt data.
-     * @param params the algorithm parameters.
-     * @throws InvalidKeyException if the given key is inappropriate for initializing this
-     * cipher
-     * @throws InvalidAlgorithmParameterException if the given algorithm parameters are inappropriate for
-     * this cipher, or if this cipher is being initialized for
-     * decryption and requires algorithm parameters and params
-     * is null.
-     */
-    public final void initDecrypt(Key key, AlgorithmParameterSpec params)
-        throws InvalidKeyException, InvalidAlgorithmParameterException
-    {
-        opMode = DECRYPT_MODE;
-        initCipherDecrypt(key, params);
-    }
-
-    /**
-     * Continue a multiple-part encryption or decryption operation. This method
-     * just writes the input into an internal buffer.
-     *
-     * @param input byte array containing the next part of the input
-     * @param inOff index in the array where the input starts
-     * @param inLen length of the input
-     * @return a new buffer with the result (always empty)
-     */
-    public final byte[] update(byte[] input, int inOff, int inLen)
-    {
-        if (inLen != 0)
-        {
-            buf.write(input, inOff, inLen);
-        }
-        return new byte[0];
-    }
-
-    /**
-     * Continue a multiple-part encryption or decryption operation (depending on
-     * how this cipher was initialized), processing another data part.
-     *
-     * @param input  the input buffer
-     * @param inOff  the offset where the input starts
-     * @param inLen  the input length
-     * @param output the output buffer
-     * @param outOff the offset where the result is stored
-     * @return the length of the output (always 0)
-     */
-    public final int update(byte[] input, int inOff, int inLen, byte[] output,
-                            int outOff)
-    {
-        update(input, inOff, inLen);
-        return 0;
-    }
-
-    /**
-     * Finish a multiple-part encryption or decryption operation (depending on
-     * how this cipher was initialized).
-     *
-     * @param input the input buffer
-     * @param inOff the offset where the input starts
-     * @param inLen the input length
-     * @return a new buffer with the result
-     * @throws IllegalBlockSizeException if the plaintext or ciphertext size is too large.
-     * @throws BadPaddingException if the ciphertext is invalid.
-     */
-    public final byte[] doFinal(byte[] input, int inOff, int inLen)
-        throws IllegalBlockSizeException, BadPaddingException
-    {
-
-        checkLength(inLen);
-        update(input, inOff, inLen);
-        byte[] mBytes = buf.toByteArray();
-        buf.reset();
-
-        switch (opMode)
-        {
-        case ENCRYPT_MODE:
-            return messageEncrypt(mBytes);
-
-        case DECRYPT_MODE:
-            return messageDecrypt(mBytes);
-
-        default:
-            return null;
-
-        }
-    }
-
-    /**
-     * Finish a multiple-part encryption or decryption operation (depending on
-     * how this cipher was initialized).
-     *
-     * @param input  the input buffer
-     * @param inOff  the offset where the input starts
-     * @param inLen  the input length
-     * @param output the buffer for the result
-     * @param outOff the offset where the result is stored
-     * @return the output length
-     * @throws ShortBufferException if the output buffer is too small to hold the result.
-     * @throws IllegalBlockSizeException if the plaintext or ciphertext size is too large.
-     * @throws BadPaddingException if the ciphertext is invalid.
-     */
-    public final int doFinal(byte[] input, int inOff, int inLen, byte[] output,
-                             int outOff)
-        throws ShortBufferException, IllegalBlockSizeException,
-        BadPaddingException
-    {
-
-        if (output.length < getOutputSize(inLen))
-        {
-            throw new ShortBufferException("Output buffer too short.");
-        }
-
-        byte[] out = doFinal(input, inOff, inLen);
-        System.arraycopy(out, 0, output, outOff, out.length);
-        return out.length;
-    }
-
-    /**
-     * Since asymmetric block ciphers do not support modes, this method does
-     * nothing.
-     *
-     * @param modeName the cipher mode (unused)
-     */
-    protected final void setMode(String modeName)
-    {
-        // empty
-    }
-
-    /**
-     * Since asymmetric block ciphers do not support padding, this method does
-     * nothing.
-     *
-     * @param paddingName the name of the padding scheme (not used)
-     */
-    protected final void setPadding(String paddingName)
-    {
-        // empty
-    }
-
-    /**
-     * Check if the message length plus the length of the input length can be
-     * en/decrypted. This method uses the specific values
-     * {@link #maxPlainTextSize} and {@link #cipherTextSize} which are set by
-     * the implementations. If the input length plus the length of the internal
-     * buffer is greater than {@link #maxPlainTextSize} for encryption or not
-     * equal to {@link #cipherTextSize} for decryption, an
-     * {@link IllegalBlockSizeException} will be thrown.
-     *
-     * @param inLen length of the input to check
-     * @throws IllegalBlockSizeException if the input length is invalid.
-     */
-    protected void checkLength(int inLen)
-        throws IllegalBlockSizeException
-    {
-
-        int inLength = inLen + buf.size();
-
-        if (opMode == ENCRYPT_MODE)
-        {
-            if (inLength > maxPlainTextSize)
-            {
-                throw new IllegalBlockSizeException(
-                    "The length of the plaintext (" + inLength
-                        + " bytes) is not supported by "
-                        + "the cipher (max. " + maxPlainTextSize
-                        + " bytes).");
-            }
-        }
-        else if (opMode == DECRYPT_MODE)
-        {
-            if (inLength != cipherTextSize)
-            {
-                throw new IllegalBlockSizeException(
-                    "Illegal ciphertext length (expected " + cipherTextSize
-                        + " bytes, was " + inLength + " bytes).");
-            }
-        }
-
-    }
-
-    /**
-     * Initialize the AsymmetricBlockCipher with a certain key for data
-     * encryption.
-     *
-     * @param key    the key which has to be used to encrypt data
-     * @param params the algorithm parameters
-     * @param sr     the source of randomness
-     * @throws InvalidKeyException if the given key is inappropriate for initializing this
-     * cipher.
-     * @throws InvalidAlgorithmParameterException if the given parameters are inappropriate for
-     * initializing this cipher.
-     */
-    protected abstract void initCipherEncrypt(Key key,
-                                              AlgorithmParameterSpec params, SecureRandom sr)
-        throws InvalidKeyException, InvalidAlgorithmParameterException;
-
-    /**
-     * Initialize the AsymmetricBlockCipher with a certain key for data
-     * encryption.
-     *
-     * @param key    the key which has to be used to decrypt data
-     * @param params the algorithm parameters
-     * @throws InvalidKeyException if the given key is inappropriate for initializing this
-     * cipher
-     * @throws InvalidAlgorithmParameterException if the given parameters are inappropriate for
-     * initializing this cipher.
-     */
-    protected abstract void initCipherDecrypt(Key key,
-                                              AlgorithmParameterSpec params)
-        throws InvalidKeyException,
-        InvalidAlgorithmParameterException;
-
-    /**
-     * Encrypt the message stored in input. The method should also perform an
-     * additional length check.
-     *
-     * @param input the message to be encrypted (usually the message length is
-     *              less than or equal to maxPlainTextSize)
-     * @return the encrypted message (it has length equal to maxCipherTextSize_)
-     * @throws IllegalBlockSizeException if the input is inappropriate for this cipher.
-     * @throws BadPaddingException if the input format is invalid.
-     */
-    protected abstract byte[] messageEncrypt(byte[] input)
-        throws IllegalBlockSizeException, BadPaddingException;
-
-    /**
-     * Decrypt the ciphertext stored in input. The method should also perform an
-     * additional length check.
-     *
-     * @param input the ciphertext to be decrypted (the ciphertext length is
-     *              less than or equal to maxCipherTextSize)
-     * @return the decrypted message
-     * @throws IllegalBlockSizeException if the input is inappropriate for this cipher.
-     * @throws BadPaddingException if the input format is invalid.
-     */
-    protected abstract byte[] messageDecrypt(byte[] input)
-        throws IllegalBlockSizeException, BadPaddingException;
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/provider/util/AsymmetricHybridCipher.java b/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/provider/util/AsymmetricHybridCipher.java
deleted file mode 100644
index 84a5537..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/provider/util/AsymmetricHybridCipher.java
+++ /dev/null
@@ -1,397 +0,0 @@
-package org.bouncycastle.pqc.jcajce.provider.util;
-
-import java.security.InvalidAlgorithmParameterException;
-import java.security.InvalidKeyException;
-import java.security.InvalidParameterException;
-import java.security.Key;
-import java.security.SecureRandom;
-import java.security.spec.AlgorithmParameterSpec;
-
-import javax.crypto.BadPaddingException;
-import javax.crypto.ShortBufferException;
-
-/**
- * The AsymmetricHybridCipher class extends CipherSpiExt.
- * NOTE: Some Ciphers are using Padding. OneAndZeroesPadding is used as default
- * padding. However padding can still be specified, but mode is not supported;
- * if you try to instantiate the cipher with something else than "NONE" as mode,
- * NoSuchAlgorithmException is thrown.
- */
-public abstract class AsymmetricHybridCipher
-    extends CipherSpiExt
-{
-
-    /**
-     * ParameterSpec used with this cipher
-     */
-    protected AlgorithmParameterSpec paramSpec;
-
-    /**
-     * Since asymmetric hybrid ciphers do not support modes, this method does
-     * nothing.
-     *
-     * @param modeName the cipher mode (unused)
-     */
-    protected final void setMode(String modeName)
-    {
-        // empty
-    }
-
-    /**
-     * Since asymmetric hybrid ciphers do not support padding, this method does
-     * nothing.
-     *
-     * @param paddingName the name of the padding scheme (not used)
-     */
-    protected final void setPadding(String paddingName)
-    {
-        // empty
-    }
-
-    /**
-     * @return <tt>null</tt> since no initialization vector is used.
-     */
-    public final byte[] getIV()
-    {
-        return null;
-    }
-
-    /**
-     * @return 0 since the implementing algorithms are not block ciphers
-     */
-    public final int getBlockSize()
-    {
-        return 0;
-    }
-
-    /**
-     * Return the parameters used with this cipher.
-     * <p>
-     * The returned parameters may be the same that were used to initialize this
-     * cipher, or may contain the default set of parameters or a set of randomly
-     * generated parameters used by the underlying cipher implementation
-     * (provided that the underlying cipher implementation uses a default set of
-     * parameters or creates new parameters if it needs parameters but was not
-     * initialized with any).
-     * </p>
-     * @return the parameters used with this cipher, or <tt>null</tt> if this
-     *         cipher does not use any parameters.
-     */
-    public final AlgorithmParameterSpec getParameters()
-    {
-        return paramSpec;
-    }
-
-    /**
-     * Return the length in bytes that an output buffer would need to be in
-     * order to hold the result of the next update or doFinal operation, given
-     * the input length <tt>inLen</tt> (in bytes). This call takes into
-     * account any unprocessed (buffered) data from a previous update call, and
-     * padding. The actual output length of the next update() or doFinal() call
-     * may be smaller than the length returned by this method.
-     *
-     * @param inLen the length of the input
-     * @return the length of the output of the next <tt>update()</tt> or
-     *         <tt>doFinal()</tt> call
-     */
-    public final int getOutputSize(int inLen)
-    {
-        return opMode == ENCRYPT_MODE ? encryptOutputSize(inLen)
-            : decryptOutputSize(inLen);
-    }
-
-    /**
-     * Initialize the cipher for encryption by forwarding it to
-     * {@link #initEncrypt(Key, AlgorithmParameterSpec, SecureRandom)}.
-     * <p>
-     * If this cipher requires any algorithm parameters that cannot be derived
-     * from the given key, the underlying cipher implementation is supposed to
-     * generate the required parameters itself (using provider-specific default
-     * or random values) if it is being initialized for encryption, and raise an
-     * InvalidKeyException if it is being initialized for decryption. The
-     * generated parameters can be retrieved using {@link #getParameters()}.
-     * </p>
-     * @param key the encryption key
-     * @throws InvalidKeyException if the given key is inappropriate for initializing this
-     * cipher.
-     * @throws InvalidParameterException if this cipher needs algorithm parameters for
-     * initialization and cannot generate parameters itself.
-     */
-    public final void initEncrypt(Key key)
-        throws InvalidKeyException
-    {
-        try
-        {
-            initEncrypt(key, null, new SecureRandom());
-        }
-        catch (InvalidAlgorithmParameterException e)
-        {
-            throw new InvalidParameterException(
-                "This cipher needs algorithm parameters for initialization (cannot be null).");
-        }
-    }
-
-    /**
-     * Initialize this cipher for encryption by forwarding it to
-     * {@link #initEncrypt(Key, AlgorithmParameterSpec, SecureRandom)}.
-     * <p>
-     * If this cipher requires any algorithm parameters that cannot be derived
-     * from the given key, the underlying cipher implementation is supposed to
-     * generate the required parameters itself (using provider-specific default
-     * or random values) if it is being initialized for encryption, and raise an
-     * InvalidKeyException if it is being initialized for decryption. The
-     * generated parameters can be retrieved using {@link #getParameters()}.
-     * </p>
-     * @param key    the encryption key
-     * @param random the source of randomness
-     * @throws InvalidKeyException if the given key is inappropriate for initializing this
-     * cipher.
-     * @throws InvalidParameterException if this cipher needs algorithm parameters for
-     * initialization and cannot generate parameters itself.
-     */
-    public final void initEncrypt(Key key, SecureRandom random)
-        throws InvalidKeyException
-    {
-        try
-        {
-            initEncrypt(key, null, random);
-        }
-        catch (InvalidAlgorithmParameterException iape)
-        {
-            throw new InvalidParameterException(
-                "This cipher needs algorithm parameters for initialization (cannot be null).");
-        }
-    }
-
-    /**
-     * Initialize the cipher for encryption by forwarding it to initEncrypt(Key,
-     * FlexiSecureRandom, AlgorithmParameterSpec).
-     *
-     * @param key    the encryption key
-     * @param params the algorithm parameters
-     * @throws InvalidKeyException if the given key is inappropriate for initializing this
-     * cipher.
-     * @throws InvalidAlgorithmParameterException if the given algorithm parameters are inappropriate for
-     * this cipher, or if this cipher is initialized with
-     * <tt>null</tt> parameters and cannot generate parameters
-     * itself.
-     */
-    public final void initEncrypt(Key key, AlgorithmParameterSpec params)
-        throws InvalidKeyException, InvalidAlgorithmParameterException
-    {
-        initEncrypt(key, params, new SecureRandom());
-    }
-
-    /**
-     * Initialize the cipher with a certain key for data encryption.
-     * <p>
-     * If this cipher requires any random bytes (e.g., for parameter
-     * generation), it will get them from <tt>random</tt>.
-     * </p><p>
-     * Note that when a Cipher object is initialized, it loses all
-     * previously-acquired state. In other words, initializing a Cipher is
-     * equivalent to creating a new instance of that Cipher and initializing it.
-     * </p>
-     * @param key    the encryption key
-     * @param random the source of randomness
-     * @param params the algorithm parameters
-     * @throws InvalidKeyException if the given key is inappropriate for initializing this
-     * cipher
-     * @throws InvalidAlgorithmParameterException if the given algorithm parameters are inappropriate for
-     * this cipher, or if this cipher is initialized with
-     * <tt>null</tt> parameters and cannot generate parameters
-     * itself.
-     */
-    public final void initEncrypt(Key key, AlgorithmParameterSpec params,
-                                  SecureRandom random)
-        throws InvalidKeyException,
-        InvalidAlgorithmParameterException
-    {
-        opMode = ENCRYPT_MODE;
-        initCipherEncrypt(key, params, random);
-    }
-
-    /**
-     * Initialize the cipher for decryption by forwarding it to initDecrypt(Key,
-     * FlexiSecureRandom).
-     * <p>
-     * If this cipher requires any algorithm parameters that cannot be derived
-     * from the given key, the underlying cipher implementation is supposed to
-     * generate the required parameters itself (using provider-specific default
-     * or random values) if it is being initialized for encryption, and raise an
-     * InvalidKeyException if it is being initialized for decryption. The
-     * generated parameters can be retrieved using {@link #getParameters()}.
-     * </p>
-     * @param key the decryption key
-     * @throws InvalidKeyException if the given key is inappropriate for initializing this
-     * cipher.
-     */
-    public final void initDecrypt(Key key)
-        throws InvalidKeyException
-    {
-        try
-        {
-            initDecrypt(key, null);
-        }
-        catch (InvalidAlgorithmParameterException iape)
-        {
-            throw new InvalidParameterException(
-                "This cipher needs algorithm parameters for initialization (cannot be null).");
-        }
-    }
-
-    /**
-     * Initialize the cipher with a certain key for data decryption.
-     * <p>
-     * If this cipher requires any random bytes (e.g., for parameter
-     * generation), it will get them from <tt>random</tt>.
-     * </p><p>
-     * Note that when a Cipher object is initialized, it loses all
-     * previously-acquired state. In other words, initializing a Cipher is
-     * equivalent to creating a new instance of that Cipher and initializing it
-     * </p>
-     * @param key    the decryption key
-     * @param params the algorithm parameters
-     * @throws InvalidKeyException if the given key is inappropriate for initializing this
-     * cipher
-     * @throws InvalidAlgorithmParameterException if the given algorithm parameters are inappropriate for
-     * this cipher, or if this cipher is initialized with
-     * <tt>null</tt> parameters and cannot generate parameters
-     * itself.
-     */
-    public final void initDecrypt(Key key, AlgorithmParameterSpec params)
-        throws InvalidKeyException, InvalidAlgorithmParameterException
-    {
-        opMode = DECRYPT_MODE;
-        initCipherDecrypt(key, params);
-    }
-
-    /**
-     * Continue a multiple-part encryption or decryption operation (depending on
-     * how this cipher was initialized), processing another data part.
-     *
-     * @param input the input buffer
-     * @param inOff the offset where the input starts
-     * @param inLen the input length
-     * @return a new buffer with the result (maybe an empty byte array)
-     */
-    public abstract byte[] update(byte[] input, int inOff, int inLen);
-
-    /**
-     * Continue a multiple-part encryption or decryption operation (depending on
-     * how this cipher was initialized), processing another data part.
-     *
-     * @param input  the input buffer
-     * @param inOff  the offset where the input starts
-     * @param inLen  the input length
-     * @param output the output buffer
-     * @param outOff the offset where the result is stored
-     * @return the length of the output
-     * @throws ShortBufferException if the output buffer is too small to hold the result.
-     */
-    public final int update(byte[] input, int inOff, int inLen, byte[] output,
-                            int outOff)
-        throws ShortBufferException
-    {
-        if (output.length < getOutputSize(inLen))
-        {
-            throw new ShortBufferException("output");
-        }
-        byte[] out = update(input, inOff, inLen);
-        System.arraycopy(out, 0, output, outOff, out.length);
-        return out.length;
-    }
-
-    /**
-     * Finish a multiple-part encryption or decryption operation (depending on
-     * how this cipher was initialized).
-     *
-     * @param input the input buffer
-     * @param inOff the offset where the input starts
-     * @param inLen the input length
-     * @return a new buffer with the result
-     * @throws BadPaddingException if the ciphertext is invalid.
-     */
-    public abstract byte[] doFinal(byte[] input, int inOff, int inLen)
-        throws BadPaddingException;
-
-    /**
-     * Finish a multiple-part encryption or decryption operation (depending on
-     * how this cipher was initialized).
-     *
-     * @param input  the input buffer
-     * @param inOff  the offset where the input starts
-     * @param inLen  the input length
-     * @param output the buffer for the result
-     * @param outOff the offset where the result is stored
-     * @return the output length
-     * @throws ShortBufferException if the output buffer is too small to hold the result.
-     * @throws BadPaddingException if the ciphertext is invalid.
-     */
-    public final int doFinal(byte[] input, int inOff, int inLen, byte[] output,
-                             int outOff)
-        throws ShortBufferException, BadPaddingException
-    {
-
-        if (output.length < getOutputSize(inLen))
-        {
-            throw new ShortBufferException("Output buffer too short.");
-        }
-        byte[] out = doFinal(input, inOff, inLen);
-        System.arraycopy(out, 0, output, outOff, out.length);
-        return out.length;
-    }
-
-    /**
-     * Compute the output size of an update() or doFinal() operation of a hybrid
-     * asymmetric cipher in encryption mode when given input of the specified
-     * length.
-     *
-     * @param inLen the length of the input
-     * @return the output size
-     */
-    protected abstract int encryptOutputSize(int inLen);
-
-    /**
-     * Compute the output size of an update() or doFinal() operation of a hybrid
-     * asymmetric cipher in decryption mode when given input of the specified
-     * length.
-     *
-     * @param inLen the length of the input
-     * @return the output size
-     */
-    protected abstract int decryptOutputSize(int inLen);
-
-    /**
-     * Initialize the AsymmetricHybridCipher with a certain key for data
-     * encryption.
-     *
-     * @param key    the key which has to be used to encrypt data
-     * @param params the algorithm parameters
-     * @param sr     the source of randomness
-     * @throws InvalidKeyException if the given key is inappropriate for initializing this
-     * cipher.
-     * @throws InvalidAlgorithmParameterException if the given parameters are inappropriate for
-     * initializing this cipher.
-     */
-    protected abstract void initCipherEncrypt(Key key,
-                                              AlgorithmParameterSpec params, SecureRandom sr)
-        throws InvalidKeyException, InvalidAlgorithmParameterException;
-
-    /**
-     * Initialize the AsymmetricHybridCipher with a certain key for data
-     * encryption.
-     *
-     * @param key    the key which has to be used to decrypt data
-     * @param params the algorithm parameters
-     * @throws InvalidKeyException if the given key is inappropriate for initializing this
-     * cipher
-     * @throws InvalidAlgorithmParameterException if the given parameters are inappropriate for
-     * initializing this cipher.
-     */
-    protected abstract void initCipherDecrypt(Key key,
-                                              AlgorithmParameterSpec params)
-        throws InvalidKeyException,
-        InvalidAlgorithmParameterException;
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/provider/util/CipherSpiExt.java b/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/provider/util/CipherSpiExt.java
deleted file mode 100644
index 748cc55..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/provider/util/CipherSpiExt.java
+++ /dev/null
@@ -1,635 +0,0 @@
-package org.bouncycastle.pqc.jcajce.provider.util;
-
-
-import java.security.InvalidAlgorithmParameterException;
-import java.security.InvalidKeyException;
-import java.security.InvalidParameterException;
-import java.security.Key;
-import java.security.NoSuchAlgorithmException;
-import java.security.SecureRandom;
-import java.security.spec.AlgorithmParameterSpec;
-
-import javax.crypto.BadPaddingException;
-import javax.crypto.CipherSpi;
-import javax.crypto.IllegalBlockSizeException;
-import javax.crypto.NoSuchPaddingException;
-import javax.crypto.ShortBufferException;
-
-/**
- * The CipherSpiExt class extends CipherSpi.
- */
-public abstract class CipherSpiExt
-    extends CipherSpi
-{
-
-    /**
-     * Constant specifying encrypt mode.
-     */
-    public static final int ENCRYPT_MODE = javax.crypto.Cipher.ENCRYPT_MODE;
-
-    /**
-     * Constant specifying decrypt mode.
-     */
-    public static final int DECRYPT_MODE = javax.crypto.Cipher.DECRYPT_MODE;
-
-    /**
-     * The operation mode for this cipher ({@link #ENCRYPT_MODE} or
-     * {@link #DECRYPT_MODE}).
-     */
-    protected int opMode;
-
-    // ****************************************************
-    // JCA adapter methods
-    // ****************************************************
-
-    /**
-     * Initialize this cipher object with a proper key and some random seed.
-     * Before a cipher object is ready for data processing, it has to be
-     * initialized according to the desired cryptographic operation, which is
-     * specified by the <tt>opMode</tt> parameter.
-     * <p>
-     * If this cipher (including its underlying mode or padding scheme) requires
-     * any random bytes, it will obtain them from <tt>random</tt>.
-     * </p><p>
-     * Note: If the mode needs an initialization vector, a blank array is used
-     * in this case.
-     * </p>
-     * @param opMode the operation mode ({@link #ENCRYPT_MODE} or
-     *               {@link #DECRYPT_MODE})
-     * @param key    the key
-     * @param random the random seed
-     * @throws java.security.InvalidKeyException if the key is inappropriate for initializing this cipher.
-     */
-    protected final void engineInit(int opMode, java.security.Key key,
-                                    java.security.SecureRandom random)
-        throws java.security.InvalidKeyException
-    {
-
-        try
-        {
-            engineInit(opMode, key,
-                (java.security.spec.AlgorithmParameterSpec)null, random);
-        }
-        catch (java.security.InvalidAlgorithmParameterException e)
-        {
-            throw new InvalidParameterException(e.getMessage());
-        }
-    }
-
-    /**
-     * Initialize this cipher with a key, a set of algorithm parameters, and a
-     * source of randomness. The cipher is initialized for encryption or
-     * decryption, depending on the value of <tt>opMode</tt>.
-     * <p>
-     * If this cipher (including its underlying mode or padding scheme) requires
-     * any random bytes, it will obtain them from <tt>random</tt>. Note that
-     * when a {@link BlockCipher} object is initialized, it loses all
-     * previously-acquired state. In other words, initializing a Cipher is
-     * equivalent to creating a new instance of that Cipher and initializing it.
-     * </p><p>
-     * Note: If the mode needs an initialization vector, a try to retrieve it
-     * from the AlgorithmParametersSpec is made.
-     * </p>
-     * @param opMode    the operation mode ({@link #ENCRYPT_MODE} or
-     *                  {@link #DECRYPT_MODE})
-     * @param key       the key
-     * @param algParams the algorithm parameters
-     * @param random    the random seed
-     * @throws java.security.InvalidKeyException if the key is inappropriate for initializing this block
-     * cipher.
-     * @throws java.security.InvalidAlgorithmParameterException if the parameters are inappropriate for initializing this
-     * block cipher.
-     */
-    protected final void engineInit(int opMode, java.security.Key key,
-                                    java.security.AlgorithmParameters algParams,
-                                    java.security.SecureRandom random)
-        throws java.security.InvalidKeyException,
-        java.security.InvalidAlgorithmParameterException
-    {
-
-        // if algParams are not specified, initialize without them
-        if (algParams == null)
-        {
-            engineInit(opMode, key, random);
-            return;
-        }
-
-        AlgorithmParameterSpec paramSpec = null;
-        // XXX getting AlgorithmParameterSpec from AlgorithmParameters
-
-        engineInit(opMode, key, paramSpec, random);
-    }
-
-    /**
-     * Initialize this cipher with a key, a set of algorithm parameters, and a
-     * source of randomness. The cipher is initialized for one of the following
-     * four operations: encryption, decryption, key wrapping or key unwrapping,
-     * depending on the value of opMode. If this cipher (including its
-     * underlying feedback or padding scheme) requires any random bytes (e.g.,
-     * for parameter generation), it will get them from random. Note that when a
-     * Cipher object is initialized, it loses all previously-acquired state. In
-     * other words, initializing a Cipher is equivalent to creating a new
-     * instance of that Cipher and initializing it.
-     *
-     * @param opMode   the operation mode ({@link #ENCRYPT_MODE} or
-     *                 {@link #DECRYPT_MODE})
-     * @param key      the encryption key
-     * @param params   the algorithm parameters
-     * @param javaRand the source of randomness
-     * @throws java.security.InvalidKeyException if the given key is inappropriate for initializing this
-     * cipher
-     * @throws java.security.InvalidAlgorithmParameterException if the given algorithm parameters are inappropriate for
-     * this cipher, or if this cipher is being initialized for
-     * decryption and requires algorithm parameters and the
-     * parameters are null.
-     */
-    protected void engineInit(int opMode, java.security.Key key,
-                              java.security.spec.AlgorithmParameterSpec params,
-                              java.security.SecureRandom javaRand)
-        throws java.security.InvalidKeyException,
-        java.security.InvalidAlgorithmParameterException
-    {
-
-        if ((params != null) && !(params instanceof AlgorithmParameterSpec))
-        {
-            throw new java.security.InvalidAlgorithmParameterException();
-        }
-
-        if ((key == null) || !(key instanceof Key))
-        {
-            throw new java.security.InvalidKeyException();
-        }
-
-        this.opMode = opMode;
-
-        if (opMode == ENCRYPT_MODE)
-        {
-            SecureRandom flexiRand = javaRand;
-            initEncrypt((Key)key, (AlgorithmParameterSpec)params, flexiRand);
-
-        }
-        else if (opMode == DECRYPT_MODE)
-        {
-            initDecrypt((Key)key, (AlgorithmParameterSpec)params);
-
-        }
-    }
-
-    /**
-     * Return the result of the last step of a multi-step en-/decryption
-     * operation or the result of a single-step en-/decryption operation by
-     * processing the given input data and any remaining buffered data. The data
-     * to be processed is given in an input byte array. Beginning at
-     * inputOffset, only the first inputLen bytes are en-/decrypted, including
-     * any buffered bytes of a previous update operation. If necessary, padding
-     * is performed. The result is returned as a output byte array.
-     *
-     * @param input the byte array holding the data to be processed
-     * @param inOff the offset indicating the start position within the input
-     *              byte array
-     * @param inLen the number of bytes to be processed
-     * @return the byte array containing the en-/decrypted data
-     * @throws javax.crypto.IllegalBlockSizeException if the ciphertext length is not a multiple of the
-     * blocklength.
-     * @throws javax.crypto.BadPaddingException if unpadding is not possible.
-     */
-    protected final byte[] engineDoFinal(byte[] input, int inOff, int inLen)
-        throws javax.crypto.IllegalBlockSizeException,
-        javax.crypto.BadPaddingException
-    {
-        return doFinal(input, inOff, inLen);
-    }
-
-    /**
-     * Perform the last step of a multi-step en-/decryption operation or a
-     * single-step en-/decryption operation by processing the given input data
-     * and any remaining buffered data. The data to be processed is given in an
-     * input byte array. Beginning at inputOffset, only the first inputLen bytes
-     * are en-/decrypted, including any buffered bytes of a previous update
-     * operation. If necessary, padding is performed. The result is stored in
-     * the given output byte array, beginning at outputOffset. The number of
-     * bytes stored in this byte array are returned.
-     *
-     * @param input  the byte array holding the data to be processed
-     * @param inOff  the offset indicating the start position within the input
-     *               byte array
-     * @param inLen  the number of bytes to be processed
-     * @param output the byte array for holding the result
-     * @param outOff the offset indicating the start position within the output
-     *               byte array to which the en/decrypted data is written
-     * @return the number of bytes stored in the output byte array
-     * @throws javax.crypto.ShortBufferException if the output buffer is too short to hold the output.
-     * @throws javax.crypto.IllegalBlockSizeException if the ciphertext length is not a multiple of the
-     * blocklength.
-     * @throws javax.crypto.BadPaddingException if unpadding is not possible.
-     */
-    protected final int engineDoFinal(byte[] input, int inOff, int inLen,
-                                      byte[] output, int outOff)
-        throws javax.crypto.ShortBufferException,
-        javax.crypto.IllegalBlockSizeException,
-        javax.crypto.BadPaddingException
-    {
-        return doFinal(input, inOff, inLen, output, outOff);
-    }
-
-    /**
-     * @return the block size (in bytes), or 0 if the underlying algorithm is
-     *         not a block cipher
-     */
-    protected final int engineGetBlockSize()
-    {
-        return getBlockSize();
-    }
-
-    /**
-     * Return the key size of the given key object in bits.
-     *
-     * @param key the key object
-     * @return the key size in bits of the given key object
-     * @throws java.security.InvalidKeyException if key is invalid.
-     */
-    protected final int engineGetKeySize(java.security.Key key)
-        throws java.security.InvalidKeyException
-    {
-        if (!(key instanceof Key))
-        {
-            throw new java.security.InvalidKeyException("Unsupported key.");
-        }
-        return getKeySize((Key)key);
-    }
-
-    /**
-     * Return the initialization vector. This is useful in the context of
-     * password-based encryption or decryption, where the IV is derived from a
-     * user-provided passphrase.
-     *
-     * @return the initialization vector in a new buffer, or <tt>null</tt> if
-     *         the underlying algorithm does not use an IV, or if the IV has not
-     *         yet been set.
-     */
-    protected final byte[] engineGetIV()
-    {
-        return getIV();
-    }
-
-    /**
-     * Return the length in bytes that an output buffer would need to be in
-     * order to hold the result of the next update or doFinal operation, given
-     * the input length inputLen (in bytes).
-     * <p>
-     * This call takes into account any unprocessed (buffered) data from a
-     * previous update call, and padding.
-     * </p><p>
-     * The actual output length of the next update or doFinal call may be
-     * smaller than the length returned by this method.
-     * </p>
-     * @param inLen the input length (in bytes)
-     * @return the required output buffer size (in bytes)
-     */
-    protected final int engineGetOutputSize(int inLen)
-    {
-        return getOutputSize(inLen);
-    }
-
-    /**
-     * Returns the parameters used with this cipher.
-     * <p>
-     * The returned parameters may be the same that were used to initialize this
-     * cipher, or may contain the default set of parameters or a set of randomly
-     * generated parameters used by the underlying cipher implementation
-     * (provided that the underlying cipher implementation uses a default set of
-     * parameters or creates new parameters if it needs parameters but was not
-     * initialized with any).
-     * </p>
-     * @return the parameters used with this cipher, or null if this cipher does
-     *         not use any parameters.
-     */
-    protected final java.security.AlgorithmParameters engineGetParameters()
-    {
-        // TODO
-        return null;
-    }
-
-    /**
-     * Set the mode of this cipher.
-     *
-     * @param modeName the cipher mode
-     * @throws java.security.NoSuchAlgorithmException if neither the mode with the given name nor the default
-     * mode can be found
-     */
-    protected final void engineSetMode(String modeName)
-        throws java.security.NoSuchAlgorithmException
-    {
-        setMode(modeName);
-    }
-
-    /**
-     * Set the padding scheme of this cipher.
-     *
-     * @param paddingName the padding scheme
-     * @throws javax.crypto.NoSuchPaddingException if the requested padding scheme cannot be found.
-     */
-    protected final void engineSetPadding(String paddingName)
-        throws javax.crypto.NoSuchPaddingException
-    {
-        setPadding(paddingName);
-    }
-
-    /**
-     * Return the result of the next step of a multi-step en-/decryption
-     * operation. The data to be processed is given in an input byte array.
-     * Beginning at inputOffset, only the first inputLen bytes are
-     * en-/decrypted. The result is returned as a byte array.
-     *
-     * @param input the byte array holding the data to be processed
-     * @param inOff the offset indicating the start position within the input
-     *              byte array
-     * @param inLen the number of bytes to be processed
-     * @return the byte array containing the en-/decrypted data
-     */
-    protected final byte[] engineUpdate(byte[] input, int inOff, int inLen)
-    {
-        return update(input, inOff, inLen);
-    }
-
-    /**
-     * Perform the next step of a multi-step en-/decryption operation. The data
-     * to be processed is given in an input byte array. Beginning at
-     * inputOffset, only the first inputLen bytes are en-/decrypted. The result
-     * is stored in the given output byte array, beginning at outputOffset. The
-     * number of bytes stored in this output byte array are returned.
-     *
-     * @param input  the byte array holding the data to be processed
-     * @param inOff  the offset indicating the start position within the input
-     *               byte array
-     * @param inLen  the number of bytes to be processed
-     * @param output the byte array for holding the result
-     * @param outOff the offset indicating the start position within the output
-     *               byte array to which the en-/decrypted data is written
-     * @return the number of bytes that are stored in the output byte array
-     * @throws javax.crypto.ShortBufferException if the output buffer is too short to hold the output.
-     */
-    protected final int engineUpdate(final byte[] input, final int inOff,
-                                     final int inLen, byte[] output, final int outOff)
-        throws javax.crypto.ShortBufferException
-    {
-        return update(input, inOff, inLen, output, outOff);
-    }
-
-    /**
-     * Initialize this cipher with a key, a set of algorithm parameters, and a
-     * source of randomness for encryption.
-     * </p><p>
-     * If this cipher requires any algorithm parameters and paramSpec is null,
-     * the underlying cipher implementation is supposed to generate the required
-     * parameters itself (using provider-specific default or random values) if
-     * it is being initialized for encryption, and raise an
-     * InvalidAlgorithmParameterException if it is being initialized for
-     * decryption. The generated parameters can be retrieved using
-     * engineGetParameters or engineGetIV (if the parameter is an IV).
-     * </p><p>
-     * If this cipher (including its underlying feedback or padding scheme)
-     * requires any random bytes (e.g., for parameter generation), it will get
-     * them from random.
-     * </p><p>
-     * Note that when a {@link BlockCipher} object is initialized, it loses all
-     * previously-acquired state. In other words, initializing a Cipher is
-     * equivalent to creating a new instance of that Cipher and initializing it.
-     *
-     * @param key          the encryption key
-     * @param cipherParams the cipher parameters
-     * @param random       the source of randomness
-     * @throws InvalidKeyException if the given key is inappropriate for initializing this
-     * block cipher.
-     * @throws InvalidAlgorithmParameterException if the parameters are inappropriate for initializing this
-     * block cipher.
-     */
-    public abstract void initEncrypt(Key key,
-                                     AlgorithmParameterSpec cipherParams, SecureRandom random)
-        throws InvalidKeyException, InvalidAlgorithmParameterException;
-
-    /**
-     * Initialize this cipher with a key, a set of algorithm parameters, and a
-     * source of randomness for decryption.
-     * </p><p>
-     * If this cipher requires any algorithm parameters and paramSpec is null,
-     * the underlying cipher implementation is supposed to generate the required
-     * parameters itself (using provider-specific default or random values) if
-     * it is being initialized for encryption, and throw an
-     * {@link InvalidAlgorithmParameterException} if it is being initialized for
-     * decryption. The generated parameters can be retrieved using
-     * engineGetParameters or engineGetIV (if the parameter is an IV).
-     * </p><p>
-     * If this cipher (including its underlying feedback or padding scheme)
-     * requires any random bytes (e.g., for parameter generation), it will get
-     * them from random.
-     * </p><p>
-     * Note that when a {@link BlockCipher} object is initialized, it loses all
-     * previously-acquired state. In other words, initializing a Cipher is
-     * equivalent to creating a new instance of that Cipher and initializing it.
-     *
-     * @param key          the encryption key
-     * @param cipherParams the cipher parameters
-     * @throws InvalidKeyException if the given key is inappropriate for initializing this
-     * block cipher.
-     * @throws InvalidAlgorithmParameterException if the parameters are inappropriate for initializing this
-     * block cipher.
-     */
-    public abstract void initDecrypt(Key key,
-                                     AlgorithmParameterSpec cipherParams)
-        throws InvalidKeyException,
-        InvalidAlgorithmParameterException;
-
-    /**
-     * @return the name of this cipher
-     */
-    public abstract String getName();
-
-    /**
-     * @return the block size (in bytes), or 0 if the underlying algorithm is
-     *         not a block cipher
-     */
-    public abstract int getBlockSize();
-
-    /**
-     * Returns the length in bytes that an output buffer would need to be in
-     * order to hold the result of the next update or doFinal operation, given
-     * the input length inputLen (in bytes).
-     * </p><p>
-     * This call takes into account any unprocessed (buffered) data from a
-     * previous update call, and padding.
-     * </p><p>
-     * The actual output length of the next update or doFinal call may be
-     * smaller than the length returned by this method.
-     *
-     * @param inputLen the input length (in bytes)
-     * @return the required output buffer size (in bytes)
-     */
-    public abstract int getOutputSize(int inputLen);
-
-    /**
-     * Return the key size of the given key object in bits.
-     *
-     * @param key the key object
-     * @return the key size in bits of the given key object
-     * @throws InvalidKeyException if key is invalid.
-     */
-    public abstract int getKeySize(Key key)
-        throws InvalidKeyException;
-
-    /**
-     * Returns the parameters used with this cipher.
-     * </p><p>
-     * The returned parameters may be the same that were used to initialize this
-     * cipher, or may contain the default set of parameters or a set of randomly
-     * generated parameters used by the underlying cipher implementation
-     * (provided that the underlying cipher implementation uses a default set of
-     * parameters or creates new parameters if it needs parameters but was not
-     * initialized with any).
-     *
-     * @return the parameters used with this cipher, or null if this cipher does
-     *         not use any parameters.
-     */
-    public abstract AlgorithmParameterSpec getParameters();
-
-    /**
-     * Return the initialization vector. This is useful in the context of
-     * password-based encryption or decryption, where the IV is derived from a
-     * user-provided passphrase.
-     *
-     * @return the initialization vector in a new buffer, or <tt>null</tt> if
-     *         the underlying algorithm does not use an IV, or if the IV has not
-     *         yet been set.
-     */
-    public abstract byte[] getIV();
-
-    /**
-     * Set the mode of this cipher.
-     *
-     * @param mode the cipher mode
-     * @throws NoSuchModeException if the requested mode cannot be found.
-     */
-    protected abstract void setMode(String mode)
-        throws NoSuchAlgorithmException;
-
-    /**
-     * Set the padding mechanism of this cipher.
-     *
-     * @param padding the padding mechanism
-     * @throws NoSuchPaddingException if the requested padding scheme cannot be found.
-     */
-    protected abstract void setPadding(String padding)
-        throws NoSuchPaddingException;
-
-    /**
-     * Continue a multiple-part encryption or decryption operation (depending on
-     * how this cipher was initialized), processing another data part.
-     *
-     * @param input the input buffer
-     * @return a new buffer with the result (maybe an empty byte array)
-     */
-    public final byte[] update(byte[] input)
-    {
-        return update(input, 0, input.length);
-    }
-
-    /**
-     * Continue a multiple-part encryption or decryption operation (depending on
-     * how this cipher was initialized), processing another data part.
-     *
-     * @param input the input buffer
-     * @param inOff the offset where the input starts
-     * @param inLen the input length
-     * @return a new buffer with the result (maybe an empty byte array)
-     */
-    public abstract byte[] update(byte[] input, int inOff, int inLen);
-
-    /**
-     * Continue a multiple-part encryption or decryption operation (depending on
-     * how this cipher was initialized), processing another data part.
-     *
-     * @param input  the input buffer
-     * @param inOff  the offset where the input starts
-     * @param inLen  the input length
-     * @param output the output buffer
-     * @param outOff the offset where the result is stored
-     * @return the length of the output
-     * @throws ShortBufferException if the output buffer is too small to hold the result.
-     */
-    public abstract int update(byte[] input, int inOff, int inLen,
-                               byte[] output, int outOff)
-        throws ShortBufferException;
-
-    /**
-     * Finish a multiple-part encryption or decryption operation (depending on
-     * how this cipher was initialized).
-     *
-     * @return a new buffer with the result
-     * @throws IllegalBlockSizeException if this cipher is a block cipher and the total input
-     * length is not a multiple of the block size (for
-     * encryption when no padding is used or for decryption).
-     * @throws BadPaddingException if this cipher is a block cipher and unpadding fails.
-     */
-    public final byte[] doFinal()
-        throws IllegalBlockSizeException,
-        BadPaddingException
-    {
-        return doFinal(null, 0, 0);
-    }
-
-    /**
-     * Finish a multiple-part encryption or decryption operation (depending on
-     * how this cipher was initialized).
-     *
-     * @param input the input buffer
-     * @return a new buffer with the result
-     * @throws IllegalBlockSizeException if this cipher is a block cipher and the total input
-     * length is not a multiple of the block size (for
-     * encryption when no padding is used or for decryption).
-     * @throws BadPaddingException if this cipher is a block cipher and unpadding fails.
-     */
-    public final byte[] doFinal(byte[] input)
-        throws IllegalBlockSizeException,
-        BadPaddingException
-    {
-        return doFinal(input, 0, input.length);
-    }
-
-    /**
-     * Finish a multiple-part encryption or decryption operation (depending on
-     * how this cipher was initialized).
-     *
-     * @param input the input buffer
-     * @param inOff the offset where the input starts
-     * @param inLen the input length
-     * @return a new buffer with the result
-     * @throws IllegalBlockSizeException if this cipher is a block cipher and the total input
-     * length is not a multiple of the block size (for
-     * encryption when no padding is used or for decryption).
-     * @throws BadPaddingException if this cipher is a block cipher and unpadding fails.
-     */
-    public abstract byte[] doFinal(byte[] input, int inOff, int inLen)
-        throws IllegalBlockSizeException, BadPaddingException;
-
-    /**
-     * Finish a multiple-part encryption or decryption operation (depending on
-     * how this cipher was initialized).
-     *
-     * @param input  the input buffer
-     * @param inOff  the offset where the input starts
-     * @param inLen  the input length
-     * @param output the buffer for the result
-     * @param outOff the offset where the result is stored
-     * @return the output length
-     * @throws ShortBufferException if the output buffer is too small to hold the result.
-     * @throws IllegalBlockSizeException if this cipher is a block cipher and the total input
-     * length is not a multiple of the block size (for
-     * encryption when no padding is used or for decryption).
-     * @throws BadPaddingException if this cipher is a block cipher and unpadding fails.
-     */
-    public abstract int doFinal(byte[] input, int inOff, int inLen,
-                                byte[] output, int outOff)
-        throws ShortBufferException,
-        IllegalBlockSizeException, BadPaddingException;
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/provider/util/KeyUtil.java b/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/provider/util/KeyUtil.java
deleted file mode 100644
index ba31e4d..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/provider/util/KeyUtil.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package org.bouncycastle.pqc.jcajce.provider.util;
-
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1Encoding;
-import org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-
-public class KeyUtil
-{
-    public static byte[] getEncodedSubjectPublicKeyInfo(AlgorithmIdentifier algId, ASN1Encodable keyData)
-    {
-        try
-        {
-            return getEncodedSubjectPublicKeyInfo(new SubjectPublicKeyInfo(algId, keyData));
-        }
-        catch (Exception e)
-        {
-            return null;
-        }
-    }
-
-    public static byte[] getEncodedSubjectPublicKeyInfo(AlgorithmIdentifier algId, byte[] keyData)
-    {
-        try
-        {
-            return getEncodedSubjectPublicKeyInfo(new SubjectPublicKeyInfo(algId, keyData));
-        }
-        catch (Exception e)
-        {
-            return null;
-        }
-    }
-
-    public static byte[] getEncodedSubjectPublicKeyInfo(SubjectPublicKeyInfo info)
-    {
-         try
-         {
-             return info.getEncoded(ASN1Encoding.DER);
-         }
-         catch (Exception e)
-         {
-             return null;
-         }
-    }
-
-    public static byte[] getEncodedPrivateKeyInfo(AlgorithmIdentifier algId, ASN1Encodable privKey)
-    {
-         try
-         {
-             PrivateKeyInfo info = new PrivateKeyInfo(algId, privKey.toASN1Primitive());
-
-             return getEncodedPrivateKeyInfo(info);
-         }
-         catch (Exception e)
-         {
-             return null;
-         }
-    }
-
-    public static byte[] getEncodedPrivateKeyInfo(PrivateKeyInfo info)
-    {
-         try
-         {
-             return info.getEncoded(ASN1Encoding.DER);
-         }
-         catch (Exception e)
-         {
-             return null;
-         }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/spec/ECCKeyGenParameterSpec.java b/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/spec/ECCKeyGenParameterSpec.java
deleted file mode 100644
index 517d9a0..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/spec/ECCKeyGenParameterSpec.java
+++ /dev/null
@@ -1,192 +0,0 @@
-package org.bouncycastle.pqc.jcajce.spec;
-
-import java.security.InvalidParameterException;
-import java.security.spec.AlgorithmParameterSpec;
-
-import org.bouncycastle.pqc.math.linearalgebra.PolynomialRingGF2;
-
-/**
- * This class provides a specification for the parameters that are used by the
- * McEliece, McElieceCCA2, and Niederreiter key pair generators.
- *
- * @see org.bouncycastle.pqc.ecc.mceliece.McElieceKeyPairGenerator
- * @see org.bouncycastle.pqc.ecc.mceliece.McElieceCCA2KeyPairGenerator
- * @see org.bouncycastle.pqc.ecc.niederreiter.NiederreiterKeyPairGenerator
- */
-public class ECCKeyGenParameterSpec
-    implements AlgorithmParameterSpec
-{
-
-    /**
-     * The default extension degree
-     */
-    public static final int DEFAULT_M = 11;
-
-    /**
-     * The default error correcting capability.
-     */
-    public static final int DEFAULT_T = 50;
-
-    /**
-     * extension degree of the finite field GF(2^m)
-     */
-    private int m;
-
-    /**
-     * error correction capability of the code
-     */
-    private int t;
-
-    /**
-     * length of the code
-     */
-    private int n;
-
-    /**
-     * the field polynomial
-     */
-    private int fieldPoly;
-
-    /**
-     * Constructor. Set the default parameters: extension degree.
-     */
-    public ECCKeyGenParameterSpec()
-    {
-        this(DEFAULT_M, DEFAULT_T);
-    }
-
-    /**
-     * Constructor.
-     *
-     * @param keysize the length of a Goppa code
-     * @throws InvalidParameterException if <tt>keysize &lt; 1</tt>.
-     */
-    public ECCKeyGenParameterSpec(int keysize)
-        throws InvalidParameterException
-    {
-        if (keysize < 1)
-        {
-            throw new InvalidParameterException("key size must be positive");
-        }
-        m = 0;
-        n = 1;
-        while (n < keysize)
-        {
-            n <<= 1;
-            m++;
-        }
-        t = n >>> 1;
-        t /= m;
-        fieldPoly = PolynomialRingGF2.getIrreduciblePolynomial(m);
-    }
-
-    /**
-     * Constructor.
-     *
-     * @param m degree of the finite field GF(2^m)
-     * @param t error correction capability of the code
-     * @throws InvalidParameterException if <tt>m &lt; 1</tt> or <tt>m &gt; 32</tt> or
-     * <tt>t &lt; 0</tt> or <tt>t &gt; n</tt>.
-     */
-    public ECCKeyGenParameterSpec(int m, int t)
-        throws InvalidParameterException
-    {
-        if (m < 1)
-        {
-            throw new InvalidParameterException("m must be positive");
-        }
-        if (m > 32)
-        {
-            throw new InvalidParameterException("m is too large");
-        }
-        this.m = m;
-        n = 1 << m;
-        if (t < 0)
-        {
-            throw new InvalidParameterException("t must be positive");
-        }
-        if (t > n)
-        {
-            throw new InvalidParameterException("t must be less than n = 2^m");
-        }
-        this.t = t;
-        fieldPoly = PolynomialRingGF2.getIrreduciblePolynomial(m);
-    }
-
-    /**
-     * Constructor.
-     *
-     * @param m    degree of the finite field GF(2^m)
-     * @param t    error correction capability of the code
-     * @param poly the field polynomial
-     * @throws InvalidParameterException if <tt>m &lt; 1</tt> or <tt>m &gt; 32</tt> or
-     * <tt>t &lt; 0</tt> or <tt>t &gt; n</tt> or
-     * <tt>poly</tt> is not an irreducible field polynomial.
-     */
-    public ECCKeyGenParameterSpec(int m, int t, int poly)
-        throws InvalidParameterException
-    {
-        this.m = m;
-        if (m < 1)
-        {
-            throw new InvalidParameterException("m must be positive");
-        }
-        if (m > 32)
-        {
-            throw new InvalidParameterException(" m is too large");
-        }
-        this.n = 1 << m;
-        this.t = t;
-        if (t < 0)
-        {
-            throw new InvalidParameterException("t must be positive");
-        }
-        if (t > n)
-        {
-            throw new InvalidParameterException("t must be less than n = 2^m");
-        }
-        if ((PolynomialRingGF2.degree(poly) == m)
-            && (PolynomialRingGF2.isIrreducible(poly)))
-        {
-            this.fieldPoly = poly;
-        }
-        else
-        {
-            throw new InvalidParameterException(
-                "polynomial is not a field polynomial for GF(2^m)");
-        }
-    }
-
-    /**
-     * @return the extension degree of the finite field GF(2^m)
-     */
-    public int getM()
-    {
-        return m;
-    }
-
-    /**
-     * @return the length of the code
-     */
-    public int getN()
-    {
-        return n;
-    }
-
-    /**
-     * @return the error correction capability of the code
-     */
-    public int getT()
-    {
-        return t;
-    }
-
-    /**
-     * @return the field polynomial
-     */
-    public int getFieldPoly()
-    {
-        return fieldPoly;
-    }
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/spec/GMSSKeySpec.java b/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/spec/GMSSKeySpec.java
deleted file mode 100644
index 7e469f0..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/spec/GMSSKeySpec.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package org.bouncycastle.pqc.jcajce.spec;
-
-import java.security.spec.KeySpec;
-
-import org.bouncycastle.pqc.crypto.gmss.GMSSParameters;
-
-public class GMSSKeySpec
-    implements KeySpec
-{
-    /**
-     * The GMSSParameterSet
-     */
-    private GMSSParameters gmssParameterSet;
-
-    protected GMSSKeySpec(GMSSParameters gmssParameterSet)
-    {
-        this.gmssParameterSet = gmssParameterSet;
-    }
-
-    /**
-     * Returns the GMSS parameter set
-     *
-     * @return The GMSS parameter set
-     */
-    public GMSSParameters getParameters()
-    {
-        return gmssParameterSet;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/spec/GMSSPrivateKeySpec.java b/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/spec/GMSSPrivateKeySpec.java
deleted file mode 100644
index 150e9dc..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/spec/GMSSPrivateKeySpec.java
+++ /dev/null
@@ -1,353 +0,0 @@
-package org.bouncycastle.pqc.jcajce.spec;
-
-import java.security.spec.KeySpec;
-import java.util.Vector;
-
-import org.bouncycastle.crypto.Digest;
-import org.bouncycastle.pqc.crypto.gmss.GMSSLeaf;
-import org.bouncycastle.pqc.crypto.gmss.GMSSParameters;
-import org.bouncycastle.pqc.crypto.gmss.GMSSRootCalc;
-import org.bouncycastle.pqc.crypto.gmss.GMSSRootSig;
-import org.bouncycastle.pqc.crypto.gmss.Treehash;
-import org.bouncycastle.util.Arrays;
-
-
-/**
- * This class provides a specification for a GMSS private key.
- */
-public class GMSSPrivateKeySpec
-    implements KeySpec
-{
-
-    private int[] index;
-
-    private byte[][] currentSeed;
-    private byte[][] nextNextSeed;
-
-    private byte[][][] currentAuthPath;
-    private byte[][][] nextAuthPath;
-
-    private Treehash[][] currentTreehash;
-    private Treehash[][] nextTreehash;
-
-    private Vector[] currentStack;
-    private Vector[] nextStack;
-
-    private Vector[][] currentRetain;
-    private Vector[][] nextRetain;
-
-    private byte[][][] keep;
-
-    private GMSSLeaf[] nextNextLeaf;
-    private GMSSLeaf[] upperLeaf;
-    private GMSSLeaf[] upperTreehashLeaf;
-
-    private int[] minTreehash;
-
-    private GMSSParameters gmssPS;
-
-    private byte[][] nextRoot;
-    private GMSSRootCalc[] nextNextRoot;
-
-    private byte[][] currentRootSig;
-    private GMSSRootSig[] nextRootSig;
-
-    /**
-     * @param index             tree indices
-     * @param currentSeed       seed for the generation of private OTS keys for the
-     *                          current subtrees (TREE)
-     * @param nextNextSeed      seed for the generation of private OTS keys for the
-     *                          subtrees after next (TREE++)
-     * @param currentAuthPath   array of current authentication paths (AUTHPATH)
-     * @param nextAuthPath      array of next authentication paths (AUTHPATH+)
-     * @param keep              keep array for the authPath algorithm
-     * @param currentTreehash   treehash for authPath algorithm of current tree
-     * @param nextTreehash      treehash for authPath algorithm of next tree (TREE+)
-     * @param currentStack      shared stack for authPath algorithm of current tree
-     * @param nextStack         shared stack for authPath algorithm of next tree (TREE+)
-     * @param currentRetain     retain stack for authPath algorithm of current tree
-     * @param nextRetain        retain stack for authPath algorithm of next tree (TREE+)
-     * @param nextNextLeaf      array of upcoming leafs of the tree after next (LEAF++) of
-     *                          each layer
-     * @param upperLeaf         needed for precomputation of upper nodes
-     * @param upperTreehashLeaf needed for precomputation of upper treehash nodes
-     * @param minTreehash       index of next treehash instance to receive an update
-     * @param nextRoot          the roots of the next trees (ROOT+)
-     * @param nextNextRoot      the roots of the tree after next (ROOT++)
-     * @param currentRootSig    array of signatures of the roots of the current subtrees
-     *                          (SIG)
-     * @param nextRootSig       array of signatures of the roots of the next subtree
-     *                          (SIG+)
-     * @param gmssParameterset  the GMSS Parameterset
-     */
-    public GMSSPrivateKeySpec(int[] index, byte[][] currentSeed,
-                              byte[][] nextNextSeed, byte[][][] currentAuthPath,
-                              byte[][][] nextAuthPath, Treehash[][] currentTreehash,
-                              Treehash[][] nextTreehash, Vector[] currentStack,
-                              Vector[] nextStack, Vector[][] currentRetain,
-                              Vector[][] nextRetain, byte[][][] keep, GMSSLeaf[] nextNextLeaf,
-                              GMSSLeaf[] upperLeaf, GMSSLeaf[] upperTreehashLeaf,
-                              int[] minTreehash, byte[][] nextRoot, GMSSRootCalc[] nextNextRoot,
-                              byte[][] currentRootSig, GMSSRootSig[] nextRootSig,
-                              GMSSParameters gmssParameterset)
-    {
-        this.index = index;
-        this.currentSeed = currentSeed;
-        this.nextNextSeed = nextNextSeed;
-        this.currentAuthPath = currentAuthPath;
-        this.nextAuthPath = nextAuthPath;
-        this.currentTreehash = currentTreehash;
-        this.nextTreehash = nextTreehash;
-        this.currentStack = currentStack;
-        this.nextStack = nextStack;
-        this.currentRetain = currentRetain;
-        this.nextRetain = nextRetain;
-        this.keep = keep;
-        this.nextNextLeaf = nextNextLeaf;
-        this.upperLeaf = upperLeaf;
-        this.upperTreehashLeaf = upperTreehashLeaf;
-        this.minTreehash = minTreehash;
-        this.nextRoot = nextRoot;
-        this.nextNextRoot = nextNextRoot;
-        this.currentRootSig = currentRootSig;
-        this.nextRootSig = nextRootSig;
-        this.gmssPS = gmssParameterset;
-    }
-
-    public int[] getIndex()
-    {
-        return Arrays.clone(index);
-    }
-
-    public byte[][] getCurrentSeed()
-    {
-        return clone(currentSeed);
-    }
-
-    public byte[][] getNextNextSeed()
-    {
-        return clone(nextNextSeed);
-    }
-
-    public byte[][][] getCurrentAuthPath()
-    {
-        return clone(currentAuthPath);
-    }
-
-    public byte[][][] getNextAuthPath()
-    {
-        return clone(nextAuthPath);
-    }
-
-    public Treehash[][] getCurrentTreehash()
-    {
-        return clone(currentTreehash);
-    }
-
-    public Treehash[][] getNextTreehash()
-    {
-        return clone(nextTreehash);
-    }
-
-    public byte[][][] getKeep()
-    {
-        return clone(keep);
-    }
-
-    public Vector[] getCurrentStack()
-    {
-        return clone(currentStack);
-    }
-
-    public Vector[] getNextStack()
-    {
-        return clone(nextStack);
-    }
-
-    public Vector[][] getCurrentRetain()
-    {
-        return clone(currentRetain);
-    }
-
-    public Vector[][] getNextRetain()
-    {
-        return clone(nextRetain);
-    }
-
-    public GMSSLeaf[] getNextNextLeaf()
-    {
-        return clone(nextNextLeaf);
-    }
-
-    public GMSSLeaf[] getUpperLeaf()
-    {
-        return clone(upperLeaf);
-    }
-
-    public GMSSLeaf[] getUpperTreehashLeaf()
-    {
-        return clone(upperTreehashLeaf);
-    }
-
-    public int[] getMinTreehash()
-    {
-        return Arrays.clone(minTreehash);
-    }
-
-    public GMSSRootSig[] getNextRootSig()
-    {
-        return clone(nextRootSig);
-    }
-
-    public GMSSParameters getGmssPS()
-    {
-        return gmssPS;
-    }
-
-    public byte[][] getNextRoot()
-    {
-        return clone(nextRoot);
-    }
-
-    public GMSSRootCalc[] getNextNextRoot()
-    {
-        return clone(nextNextRoot);
-    }
-
-    public byte[][] getCurrentRootSig()
-    {
-        return clone(currentRootSig);
-    }
-
-    private static GMSSLeaf[] clone(GMSSLeaf[] data)
-    {
-        if (data == null)
-        {
-            return null;
-        }
-        GMSSLeaf[] copy = new GMSSLeaf[data.length];
-
-        System.arraycopy(data, 0, copy, 0, data.length);
-
-        return copy;
-    }
-
-    private static GMSSRootCalc[] clone(GMSSRootCalc[] data)
-    {
-        if (data == null)
-        {
-            return null;
-        }
-        GMSSRootCalc[] copy = new GMSSRootCalc[data.length];
-
-        System.arraycopy(data, 0, copy, 0, data.length);
-
-        return copy;
-    }
-
-    private static GMSSRootSig[] clone(GMSSRootSig[] data)
-    {
-        if (data == null)
-        {
-            return null;
-        }
-        GMSSRootSig[] copy = new GMSSRootSig[data.length];
-
-        System.arraycopy(data, 0, copy, 0, data.length);
-
-        return copy;
-    }
-
-    private static byte[][] clone(byte[][] data)
-    {
-        if (data == null)
-        {
-            return null;
-        }
-        byte[][] copy = new byte[data.length][];
-
-        for (int i = 0; i != data.length; i++)
-        {
-            copy[i] = Arrays.clone(data[i]);
-        }
-
-        return copy;
-    }
-
-    private static byte[][][] clone(byte[][][] data)
-    {
-        if (data == null)
-        {
-            return null;
-        }
-        byte[][][] copy = new byte[data.length][][];
-
-        for (int i = 0; i != data.length; i++)
-        {
-            copy[i] = clone(data[i]);
-        }
-
-        return copy;
-    }
-
-    private static Treehash[] clone(Treehash[] data)
-    {
-        if (data == null)
-        {
-            return null;
-        }
-        Treehash[] copy = new Treehash[data.length];
-
-        System.arraycopy(data, 0, copy, 0, data.length);
-
-        return copy;
-    }
-
-    private static Treehash[][] clone(Treehash[][] data)
-    {
-        if (data == null)
-        {
-            return null;
-        }
-        Treehash[][] copy = new Treehash[data.length][];
-
-        for (int i = 0; i != data.length; i++)
-        {
-            copy[i] = clone(data[i]);
-        }
-
-        return copy;
-    }
-
-    private static Vector[] clone(Vector[] data)
-    {
-        if (data == null)
-        {
-            return null;
-        }
-        Vector[] copy = new Vector[data.length];
-
-        for (int i = 0; i != data.length; i++)
-        {
-            copy[i] = new Vector(data[i]);
-        }
-
-        return copy;
-    }
-
-    private static Vector[][] clone(Vector[][] data)
-    {
-        if (data == null)
-        {
-            return null;
-        }
-        Vector[][] copy = new Vector[data.length][];
-
-        for (int i = 0; i != data.length; i++)
-        {
-            copy[i] = clone(data[i]);
-        }
-
-        return copy;
-    }
-}
\ No newline at end of file
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/spec/GMSSPublicKeySpec.java b/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/spec/GMSSPublicKeySpec.java
deleted file mode 100644
index 441febd..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/spec/GMSSPublicKeySpec.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package org.bouncycastle.pqc.jcajce.spec;
-
-import org.bouncycastle.pqc.crypto.gmss.GMSSParameters;
-
-/**
- * This class provides a specification for a GMSS public key.
- *
- * @see org.bouncycastle.pqc.jcajce.provider.gmss.BCGMSSPublicKey
- */
-public class GMSSPublicKeySpec
-    extends GMSSKeySpec
-{
-    /**
-     * The GMSS public key
-     */
-    private byte[] gmssPublicKey;
-
-    /**
-     * The constructor.
-     *
-     * @param key              a raw GMSS public key
-     * @param gmssParameterSet an instance of GMSSParameterSet
-     */
-    public GMSSPublicKeySpec(byte[] key, GMSSParameters gmssParameterSet)
-    {
-        super(gmssParameterSet);
-
-        this.gmssPublicKey = key;
-    }
-
-    /**
-     * Returns the GMSS public key
-     *
-     * @return The GMSS public key
-     */
-    public byte[] getPublicKey()
-    {
-        return gmssPublicKey;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/spec/McElieceCCA2ParameterSpec.java b/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/spec/McElieceCCA2ParameterSpec.java
deleted file mode 100644
index d98a8f5..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/spec/McElieceCCA2ParameterSpec.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package org.bouncycastle.pqc.jcajce.spec;
-
-
-import java.security.spec.AlgorithmParameterSpec;
-
-/**
- * This class provides a specification for the parameters of the CCA2-secure
- * variants of the McEliece PKCS that are used with
- * {@link McElieceFujisakiCipher}, {@link McElieceKobaraImaiCipher}, and
- * {@link McEliecePointchevalCipher}.
- *
- * @see McElieceFujisakiCipher
- * @see McElieceKobaraImaiCipher
- * @see McEliecePointchevalCipher
- */
-public class McElieceCCA2ParameterSpec
-    implements AlgorithmParameterSpec
-{
-
-    /**
-     * The default message digest ("SHA256").
-     */
-    public static final String DEFAULT_MD = "SHA256";
-
-    private String mdName;
-
-    /**
-     * Construct the default parameters. Choose the
-     */
-    public McElieceCCA2ParameterSpec()
-    {
-        this(DEFAULT_MD);
-    }
-
-    /**
-     * Constructor.
-     *
-     * @param mdName the name of the hash function
-     */
-    public McElieceCCA2ParameterSpec(String mdName)
-    {
-        // check whether message digest is available
-        // TODO: this method not used!
-//        try {
-//            Registry.getMessageDigest(mdName);
-//        } catch (NoSuchAlgorithmException nsae) {
-//            throw new InvalidParameterException("Message digest '" + mdName
-//                    + "' not found'.");
-//        }
-
-        // assign message digest name
-        this.mdName = mdName;
-    }
-
-    /**
-     * @return the name of the hash function
-     */
-    public String getMDName()
-    {
-        return mdName;
-    }
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/spec/McElieceCCA2PrivateKeySpec.java b/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/spec/McElieceCCA2PrivateKeySpec.java
deleted file mode 100644
index efb27b5..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/spec/McElieceCCA2PrivateKeySpec.java
+++ /dev/null
@@ -1,161 +0,0 @@
-package org.bouncycastle.pqc.jcajce.spec;
-
-import java.security.spec.KeySpec;
-
-import org.bouncycastle.pqc.math.linearalgebra.GF2Matrix;
-import org.bouncycastle.pqc.math.linearalgebra.GF2mField;
-import org.bouncycastle.pqc.math.linearalgebra.Permutation;
-import org.bouncycastle.pqc.math.linearalgebra.PolynomialGF2mSmallM;
-
-/**
- * This class provides a specification for a McEliece CCA2 private key.
- *
- * @see JDKMcElieceCCA2PrivateKey
- */
-public class McElieceCCA2PrivateKeySpec
-    implements KeySpec
-{
-
-    // the OID of the algorithm
-    private String oid;
-
-    // the length of the code
-    private int n;
-
-    // the dimension of the code
-    private int k;
-
-    // the finte field GF(2^m)
-    private GF2mField field;
-
-    // the irreducible Goppa polynomial
-    private PolynomialGF2mSmallM goppaPoly;
-
-    // the permutation
-    private Permutation p;
-
-    // the canonical check matrix
-    private GF2Matrix h;
-
-    // the matrix used to compute square roots in (GF(2^m))^t
-    private PolynomialGF2mSmallM[] qInv;
-
-    /**
-     * Constructor.
-     *
-     * @param n     the length of the code
-     * @param k     the dimension of the code
-     * @param field the finite field <tt>GF(2<sup>m</sup>)</tt>
-     * @param gp    the irreducible Goppa polynomial
-     * @param p     the permutation
-     * @param h     the canonical check matrix
-     * @param qInv  the matrix used to compute square roots in
-     *              <tt>(GF(2^m))^t</tt>
-     */
-    public McElieceCCA2PrivateKeySpec(String oid, int n, int k, GF2mField field,
-                                      PolynomialGF2mSmallM gp, Permutation p, GF2Matrix h,
-                                      PolynomialGF2mSmallM[] qInv)
-    {
-        this.oid = oid;
-        this.n = n;
-        this.k = k;
-        this.field = field;
-        this.goppaPoly = gp;
-        this.p = p;
-        this.h = h;
-        this.qInv = qInv;
-    }
-
-    /**
-     * Constructor used by the {@link McElieceKeyFactory}.
-     *
-     * @param n            the length of the code
-     * @param k            the dimension of the code
-     * @param encFieldPoly the encoded field polynomial defining the finite field
-     *                     <tt>GF(2<sup>m</sup>)</tt>
-     * @param encGoppaPoly the encoded irreducible Goppa polynomial
-     * @param encP         the encoded permutation
-     * @param encH         the encoded canonical check matrix
-     * @param encQInv      the encoded matrix used to compute square roots in
-     *                     <tt>(GF(2^m))^t</tt>
-     */
-    public McElieceCCA2PrivateKeySpec(String oid, int n, int k, byte[] encFieldPoly,
-                                      byte[] encGoppaPoly, byte[] encP, byte[] encH, byte[][] encQInv)
-    {
-        this.oid = oid;
-        this.n = n;
-        this.k = k;
-        field = new GF2mField(encFieldPoly);
-        goppaPoly = new PolynomialGF2mSmallM(field, encGoppaPoly);
-        p = new Permutation(encP);
-        h = new GF2Matrix(encH);
-        qInv = new PolynomialGF2mSmallM[encQInv.length];
-        for (int i = 0; i < encQInv.length; i++)
-        {
-            qInv[i] = new PolynomialGF2mSmallM(field, encQInv[i]);
-        }
-    }
-
-    /**
-     * @return the length of the code
-     */
-    public int getN()
-    {
-        return n;
-    }
-
-    /**
-     * @return the dimension of the code
-     */
-    public int getK()
-    {
-        return k;
-    }
-
-    /**
-     * @return the finite field
-     */
-    public GF2mField getField()
-    {
-        return field;
-    }
-
-    /**
-     * @return the irreducible Goppa polynomial
-     */
-    public PolynomialGF2mSmallM getGoppaPoly()
-    {
-        return goppaPoly;
-    }
-
-    /**
-     * @return the permutation P
-     */
-    public Permutation getP()
-    {
-        return p;
-    }
-
-    /**
-     * @return the canonical check matrix H
-     */
-    public GF2Matrix getH()
-    {
-        return h;
-    }
-
-    /**
-     * @return the matrix used to compute square roots in <tt>(GF(2^m))^t</tt>
-     */
-    public PolynomialGF2mSmallM[] getQInv()
-    {
-        return qInv;
-    }
-
-    public String getOIDString()
-    {
-        return oid;
-
-    }
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/spec/McElieceCCA2PublicKeySpec.java b/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/spec/McElieceCCA2PublicKeySpec.java
deleted file mode 100644
index 88a60b9..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/spec/McElieceCCA2PublicKeySpec.java
+++ /dev/null
@@ -1,88 +0,0 @@
-package org.bouncycastle.pqc.jcajce.spec;
-
-import java.security.spec.KeySpec;
-
-import org.bouncycastle.pqc.math.linearalgebra.GF2Matrix;
-
-
-/**
- * This class provides a specification for a McEliece CCA2 public key.
- *
- * @see org.bouncycastle.pqc.jcajce.provider.mceliece.BCMcElieceCCA2PublicKey
- */
-public class McElieceCCA2PublicKeySpec
-    implements KeySpec
-{
-
-    // the OID of the algorithm
-    private String oid;
-
-    // the length of the code
-    private int n;
-
-    // the error correction capability of the code
-    private int t;
-
-    // the generator matrix
-    private GF2Matrix matrixG;
-
-    /**
-     * Constructor.
-     *
-     * @param n      length of the code
-     * @param t      error correction capability
-     * @param matrix generator matrix
-     */
-    public McElieceCCA2PublicKeySpec(String oid, int n, int t, GF2Matrix matrix)
-    {
-        this.oid = oid;
-        this.n = n;
-        this.t = t;
-        this.matrixG = new GF2Matrix(matrix);
-    }
-
-    /**
-     * Constructor (used by {@link org.bouncycastle.pqc.jcajce.provider.mceliece.McElieceKeyFactorySpi}).
-     *
-     * @param n         length of the code
-     * @param t         error correction capability of the code
-     * @param encMatrix encoded generator matrix
-     */
-    public McElieceCCA2PublicKeySpec(String oid, int n, int t, byte[] encMatrix)
-    {
-        this.oid = oid;
-        this.n = n;
-        this.t = t;
-        this.matrixG = new GF2Matrix(encMatrix);
-    }
-
-    /**
-     * @return the length of the code
-     */
-    public int getN()
-    {
-        return n;
-    }
-
-    /**
-     * @return the error correction capability of the code
-     */
-    public int getT()
-    {
-        return t;
-    }
-
-    /**
-     * @return the generator matrix
-     */
-    public GF2Matrix getMatrixG()
-    {
-        return matrixG;
-    }
-
-    public String getOIDString()
-    {
-        return oid;
-
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/spec/McEliecePrivateKeySpec.java b/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/spec/McEliecePrivateKeySpec.java
deleted file mode 100644
index 099fc2b..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/spec/McEliecePrivateKeySpec.java
+++ /dev/null
@@ -1,201 +0,0 @@
-package org.bouncycastle.pqc.jcajce.spec;
-
-
-import java.security.spec.KeySpec;
-
-import org.bouncycastle.pqc.math.linearalgebra.GF2Matrix;
-import org.bouncycastle.pqc.math.linearalgebra.GF2mField;
-import org.bouncycastle.pqc.math.linearalgebra.Permutation;
-import org.bouncycastle.pqc.math.linearalgebra.PolynomialGF2mSmallM;
-
-/**
- * This class provides a specification for a McEliece private key.
- *
- * @see org.bouncycastle.pqc.ecc.JDKMcEliecePrivateKey.McEliecePrivateKey
- * @see KeySpec
- */
-public class McEliecePrivateKeySpec
-    implements KeySpec
-{
-
-    // the OID of the algorithm
-    private String oid;
-
-    // the length of the code
-    private int n;
-
-    // the dimension of the code, where <tt>k &gt;= n - mt</tt>
-    private int k;
-
-    // the underlying finite field
-    private GF2mField field;
-
-    // the irreducible Goppa polynomial
-    private PolynomialGF2mSmallM goppaPoly;
-
-    // a k x k random binary non-singular matrix
-    private GF2Matrix sInv;
-
-    // the permutation used to generate the systematic check matrix
-    private Permutation p1;
-
-    // the permutation used to compute the public generator matrix
-    private Permutation p2;
-
-    // the canonical check matrix of the code
-    private GF2Matrix h;
-
-    // the matrix used to compute square roots in <tt>(GF(2^m))^t</tt>
-    private PolynomialGF2mSmallM[] qInv;
-
-    /**
-     * Constructor.
-     *
-     * @param oid
-     * @param n         the length of the code
-     * @param k         the dimension of the code
-     * @param field     the field polynomial defining the finite field
-     *                  <tt>GF(2<sup>m</sup>)</tt>
-     * @param goppaPoly the irreducible Goppa polynomial
-     * @param sInv      the matrix <tt>S<sup>-1</sup></tt>
-     * @param p1        the permutation used to generate the systematic check
-     *                  matrix
-     * @param p2        the permutation used to compute the public generator
-     *                  matrix
-     * @param h         the canonical check matrix
-     * @param qInv      the matrix used to compute square roots in
-     *                  <tt>(GF(2<sup>m</sup>))<sup>t</sup></tt>
-     */
-    public McEliecePrivateKeySpec(String oid, int n, int k, GF2mField field,
-                                  PolynomialGF2mSmallM goppaPoly, GF2Matrix sInv, Permutation p1,
-                                  Permutation p2, GF2Matrix h, PolynomialGF2mSmallM[] qInv)
-    {
-        this.oid = oid;
-        this.k = k;
-        this.n = n;
-        this.field = field;
-        this.goppaPoly = goppaPoly;
-        this.sInv = sInv;
-        this.p1 = p1;
-        this.p2 = p2;
-        this.h = h;
-        this.qInv = qInv;
-    }
-
-    /**
-     * Constructor (used by the {@link McElieceKeyFactory}).
-     *
-     * @param oid
-     * @param n            the length of the code
-     * @param k            the dimension of the code
-     * @param encField     the encoded field polynomial defining the finite field
-     *                     <tt>GF(2<sup>m</sup>)</tt>
-     * @param encGoppaPoly the encoded irreducible Goppa polynomial
-     * @param encSInv      the encoded matrix <tt>S<sup>-1</sup></tt>
-     * @param encP1        the encoded permutation used to generate the systematic
-     *                     check matrix
-     * @param encP2        the encoded permutation used to compute the public
-     *                     generator matrix
-     * @param encH         the encoded canonical check matrix
-     * @param encQInv      the encoded matrix used to compute square roots in
-     *                     <tt>(GF(2<sup>m</sup>))<sup>t</sup></tt>
-     */
-    public McEliecePrivateKeySpec(String oid, int n, int k, byte[] encField,
-                                  byte[] encGoppaPoly, byte[] encSInv, byte[] encP1, byte[] encP2,
-                                  byte[] encH, byte[][] encQInv)
-    {
-        this.oid = oid;
-        this.n = n;
-        this.k = k;
-        field = new GF2mField(encField);
-        goppaPoly = new PolynomialGF2mSmallM(field, encGoppaPoly);
-        sInv = new GF2Matrix(encSInv);
-        p1 = new Permutation(encP1);
-        p2 = new Permutation(encP2);
-        h = new GF2Matrix(encH);
-        qInv = new PolynomialGF2mSmallM[encQInv.length];
-        for (int i = 0; i < encQInv.length; i++)
-        {
-            qInv[i] = new PolynomialGF2mSmallM(field, encQInv[i]);
-        }
-    }
-
-    /**
-     * @return the length of the code
-     */
-    public int getN()
-    {
-        return n;
-    }
-
-    /**
-     * @return the dimension of the code
-     */
-    public int getK()
-    {
-        return k;
-    }
-
-    /**
-     * @return the finite field <tt>GF(2<sup>m</sup>)</tt>
-     */
-    public GF2mField getField()
-    {
-        return field;
-    }
-
-    /**
-     * @return the irreducible Goppa polynomial
-     */
-    public PolynomialGF2mSmallM getGoppaPoly()
-    {
-        return goppaPoly;
-    }
-
-    /**
-     * @return the k x k random binary non-singular matrix S^-1
-     */
-    public GF2Matrix getSInv()
-    {
-        return sInv;
-    }
-
-    /**
-     * @return the permutation used to generate the systematic check matrix
-     */
-    public Permutation getP1()
-    {
-        return p1;
-    }
-
-    /**
-     * @return the permutation used to compute the public generator matrix
-     */
-    public Permutation getP2()
-    {
-        return p2;
-    }
-
-    /**
-     * @return the canonical check matrix H
-     */
-    public GF2Matrix getH()
-    {
-        return h;
-    }
-
-    /**
-     * @return the matrix used to compute square roots in
-     *         <tt>(GF(2<sup>m</sup>))<sup>t</sup></tt>
-     */
-    public PolynomialGF2mSmallM[] getQInv()
-    {
-        return qInv;
-    }
-
-    public String getOIDString()
-    {
-        return oid;
-    }
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/spec/McEliecePublicKeySpec.java b/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/spec/McEliecePublicKeySpec.java
deleted file mode 100644
index f5f1876..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/spec/McEliecePublicKeySpec.java
+++ /dev/null
@@ -1,91 +0,0 @@
-package org.bouncycastle.pqc.jcajce.spec;
-
-
-import java.security.spec.KeySpec;
-
-import org.bouncycastle.pqc.math.linearalgebra.GF2Matrix;
-
-/**
- * This class provides a specification for a McEliece public key.
- *
- * @see org.bouncycastle.pqc.jcajce.provider.mceliece.BCMcEliecePublicKey
- */
-public class McEliecePublicKeySpec
-    implements KeySpec
-{
-
-    // the OID of the algorithm
-    private String oid;
-
-    // the length of the code
-    private int n;
-
-    // the error correction capability of the code
-    private int t;
-
-    // the generator matrix
-    private GF2Matrix g;
-
-    /**
-     * Constructor (used by {@link org.bouncycastle.pqc.jcajce.provider.mceliece.McElieceKeyFactorySpi}).
-     *
-     * @param oid
-     * @param n   the length of the code
-     * @param t   the error correction capability of the code
-     * @param g   the generator matrix
-     */
-    public McEliecePublicKeySpec(String oid, int n, int t, GF2Matrix g)
-    {
-        this.oid = oid;
-        this.n = n;
-        this.t = t;
-        this.g = new GF2Matrix(g);
-    }
-
-    /**
-     * Constructor (used by {@link org.bouncycastle.pqc.jcajce.provider.mceliece.McElieceKeyFactorySpi}).
-     *
-     * @param oid
-     * @param n    the length of the code
-     * @param t    the error correction capability of the code
-     * @param encG the encoded generator matrix
-     */
-    public McEliecePublicKeySpec(String oid, int t, int n, byte[] encG)
-    {
-        this.oid = oid;
-        this.n = n;
-        this.t = t;
-        this.g = new GF2Matrix(encG);
-    }
-
-    /**
-     * @return the length of the code
-     */
-    public int getN()
-    {
-        return n;
-    }
-
-    /**
-     * @return the error correction capability of the code
-     */
-    public int getT()
-    {
-        return t;
-    }
-
-    /**
-     * @return the generator matrix
-     */
-    public GF2Matrix getG()
-    {
-        return g;
-    }
-
-    public String getOIDString()
-    {
-        return oid;
-
-    }
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/spec/RainbowParameterSpec.java b/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/spec/RainbowParameterSpec.java
deleted file mode 100644
index 9da1e45..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/spec/RainbowParameterSpec.java
+++ /dev/null
@@ -1,124 +0,0 @@
-package org.bouncycastle.pqc.jcajce.spec;
-
-import java.security.spec.AlgorithmParameterSpec;
-
-import org.bouncycastle.util.Arrays;
-
-/**
- * This class provides methods for setting and getting the Rainbow-parameters
- * like number of Vinegar-variables in the layers, number of layers and so on.
- * <p>
- * More detailed information about the needed parameters for the Rainbow
- * Signature Scheme is to be found in the paper of Jintai Ding, Dieter Schmidt:
- * Rainbow, a New Multivariable Polynomial Signature Scheme. ACNS 2005: 164-175
- * (http://dx.doi.org/10.1007/11496137_12)
- * </p>
- */
-public class RainbowParameterSpec
-    implements AlgorithmParameterSpec
-{
-
-    /**
-     * DEFAULT PARAMS
-     */
-    /*
-      * Vi = vinegars per layer whereas n is vu (vu = 33 = n) such that
-      *
-      * v1 = 6; o1 = 12-6 = 6
-      *
-      * v2 = 12; o2 = 17-12 = 5
-      *
-      * v3 = 17; o3 = 22-17 = 5
-      *
-      * v4 = 22; o4 = 33-22 = 11
-      *
-      * v5 = 33; (o5 = 0)
-      */
-    private static final int[] DEFAULT_VI = {6, 12, 17, 22, 33};
-
-    private int[] vi;// set of vinegar vars per layer.
-
-    /**
-     * Default Constructor The elements of the array containing the number of
-     * Vinegar variables in each layer are set to the default values here.
-     */
-    public RainbowParameterSpec()
-    {
-        this.vi = DEFAULT_VI;
-    }
-
-    /**
-     * Constructor with parameters
-     *
-     * @param vi The elements of the array containing the number of Vinegar
-     *           variables per layer are set to the values of the input array.
-     * @throws IllegalArgumentException if the variables are invalid.
-     */
-    public RainbowParameterSpec(int[] vi)
-    {
-        this.vi = vi;
-        try
-        {
-            checkParams();
-        }
-        catch (Exception e)
-        {
-            e.printStackTrace();
-        }
-    }
-
-    private void checkParams()
-        throws Exception
-    {
-        if (vi == null)
-        {
-            throw new IllegalArgumentException("no layers defined.");
-        }
-        if (vi.length > 1)
-        {
-            for (int i = 0; i < vi.length - 1; i++)
-            {
-                if (vi[i] >= vi[i + 1])
-                {
-                    throw new IllegalArgumentException(
-                        "v[i] has to be smaller than v[i+1]");
-                }
-            }
-        }
-        else
-        {
-            throw new IllegalArgumentException(
-                "Rainbow needs at least 1 layer, such that v1 < v2.");
-        }
-    }
-
-    /**
-     * Getter for the number of layers
-     *
-     * @return the number of layers
-     */
-    public int getNumOfLayers()
-    {
-        return this.vi.length - 1;
-    }
-
-    /**
-     * Getter for the number of all the polynomials in Rainbow
-     *
-     * @return the number of the polynomials
-     */
-    public int getDocumentLength()
-    {
-        return vi[vi.length - 1] - vi[0];
-    }
-
-    /**
-     * Getter for the array containing the number of Vinegar-variables per layer
-     *
-     * @return the numbers of vinegars per layer
-     */
-    public int[] getVi()
-    {
-        return Arrays.clone(this.vi);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/spec/RainbowPrivateKeySpec.java b/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/spec/RainbowPrivateKeySpec.java
deleted file mode 100644
index 5a10199..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/spec/RainbowPrivateKeySpec.java
+++ /dev/null
@@ -1,125 +0,0 @@
-package org.bouncycastle.pqc.jcajce.spec;
-
-import java.security.spec.KeySpec;
-
-import org.bouncycastle.pqc.crypto.rainbow.Layer;
-
-/**
- * This class provides a specification for a RainbowSignature private key.
- *
- * @see KeySpec
- */
-public class RainbowPrivateKeySpec
-    implements KeySpec
-{
-    /*
-      * invertible affine linear map L1
-      */
-    // the inverse of A1, (n-v1 x n-v1 matrix)
-    private short[][] A1inv;
-
-    // translation vector of L1
-    private short[] b1;
-
-    /*
-      * invertible affine linear map L2
-      */
-    // the inverse of A2, (n x n matrix)
-    private short[][] A2inv;
-
-    // translation vector of L2
-    private short[] b2;
-
-    /*
-      * components of F
-      */
-    // the number of Vinegar-variables per layer.
-    private int[] vi;
-
-    // contains the polynomials with their coefficients of private map F
-    private Layer[] layers;
-
-    /**
-     * Constructor
-     *
-     * @param A1inv  the inverse of A1(the matrix part of the affine linear map L1)
-     *               (n-v1 x n-v1 matrix)
-     * @param b1     translation vector, part of the linear affine map L1
-     * @param A2inv  the inverse of A2(the matrix part of the affine linear map L2)
-     *               (n x n matrix)
-     * @param b2     translation vector, part of the linear affine map L2
-     * @param vi     the number of Vinegar-variables per layer
-     * @param layers the polynomials with their coefficients of private map F
-     */
-    public RainbowPrivateKeySpec(short[][] A1inv, short[] b1,
-                                 short[][] A2inv, short[] b2, int[] vi, Layer[] layers)
-    {
-        this.A1inv = A1inv;
-        this.b1 = b1;
-        this.A2inv = A2inv;
-        this.b2 = b2;
-        this.vi = vi;
-        this.layers = layers;
-    }
-
-    /**
-     * Getter for the translation part of the private quadratic map L1.
-     *
-     * @return b1 the translation part of L1
-     */
-    public short[] getB1()
-    {
-        return this.b1;
-    }
-
-    /**
-     * Getter for the inverse matrix of A1.
-     *
-     * @return the A1inv inverse
-     */
-    public short[][] getInvA1()
-    {
-        return this.A1inv;
-    }
-
-    /**
-     * Getter for the translation part of the private quadratic map L2.
-     *
-     * @return b2 the translation part of L2
-     */
-    public short[] getB2()
-    {
-        return this.b2;
-    }
-
-    /**
-     * Getter for the inverse matrix of A2
-     *
-     * @return the A2inv
-     */
-    public short[][] getInvA2()
-    {
-        return this.A2inv;
-    }
-
-    /**
-     * Returns the layers contained in the private key
-     *
-     * @return layers
-     */
-    public Layer[] getLayers()
-    {
-        return this.layers;
-    }
-
-    /**
-     * /** Returns the array of vi-s
-     *
-     * @return the vi
-     */
-    public int[] getVi()
-    {
-        return vi;
-    }
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/spec/RainbowPublicKeySpec.java b/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/spec/RainbowPublicKeySpec.java
deleted file mode 100644
index dbcf3e7..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/jcajce/spec/RainbowPublicKeySpec.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package org.bouncycastle.pqc.jcajce.spec;
-
-
-import java.security.spec.KeySpec;
-
-/**
- * This class provides a specification for a RainbowSignature public key.
- *
- * @see KeySpec
- */
-public class RainbowPublicKeySpec
-    implements KeySpec
-{
-    private short[][] coeffquadratic;
-    private short[][] coeffsingular;
-    private short[] coeffscalar;
-    private int docLength; // length of possible document to sign
-
-    /**
-     * Constructor
-     *
-     * @param docLength
-     * @param coeffquadratic
-     * @param coeffSingular
-     * @param coeffScalar
-     */
-    public RainbowPublicKeySpec(int docLength,
-                                short[][] coeffquadratic, short[][] coeffSingular,
-                                short[] coeffScalar)
-    {
-        this.docLength = docLength;
-        this.coeffquadratic = coeffquadratic;
-        this.coeffsingular = coeffSingular;
-        this.coeffscalar = coeffScalar;
-    }
-
-    /**
-     * @return the docLength
-     */
-    public int getDocLength()
-    {
-        return this.docLength;
-    }
-
-    /**
-     * @return the coeffquadratic
-     */
-    public short[][] getCoeffQuadratic()
-    {
-        return coeffquadratic;
-    }
-
-    /**
-     * @return the coeffsingular
-     */
-    public short[][] getCoeffSingular()
-    {
-        return coeffsingular;
-    }
-
-    /**
-     * @return the coeffscalar
-     */
-    public short[] getCoeffScalar()
-    {
-        return coeffscalar;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/math/linearalgebra/BigEndianConversions.java b/bcprov/src/main/java/org/bouncycastle/pqc/math/linearalgebra/BigEndianConversions.java
deleted file mode 100644
index 90926f6..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/math/linearalgebra/BigEndianConversions.java
+++ /dev/null
@@ -1,306 +0,0 @@
-package org.bouncycastle.pqc.math.linearalgebra;
-
-
-/**
- * This is a utility class containing data type conversions using big-endian
- * byte order.
- *
- * @see LittleEndianConversions
- */
-public final class BigEndianConversions
-{
-
-    /**
-     * Default constructor (private).
-     */
-    private BigEndianConversions()
-    {
-        // empty
-    }
-
-    /**
-     * Convert an integer to an octet string of length 4 according to IEEE 1363,
-     * Section 5.5.3.
-     *
-     * @param x the integer to convert
-     * @return the converted integer
-     */
-    public static byte[] I2OSP(int x)
-    {
-        byte[] result = new byte[4];
-        result[0] = (byte)(x >>> 24);
-        result[1] = (byte)(x >>> 16);
-        result[2] = (byte)(x >>> 8);
-        result[3] = (byte)x;
-        return result;
-    }
-
-    /**
-     * Convert an integer to an octet string according to IEEE 1363, Section
-     * 5.5.3. Length checking is performed.
-     *
-     * @param x    the integer to convert
-     * @param oLen the desired length of the octet string
-     * @return an octet string of length <tt>oLen</tt> representing the
-     *         integer <tt>x</tt>, or <tt>null</tt> if the integer is
-     *         negative
-     * @throws ArithmeticException if <tt>x</tt> can't be encoded into <tt>oLen</tt>
-     * octets.
-     */
-    public static byte[] I2OSP(int x, int oLen)
-        throws ArithmeticException
-    {
-        if (x < 0)
-        {
-            return null;
-        }
-        int octL = IntegerFunctions.ceilLog256(x);
-        if (octL > oLen)
-        {
-            throw new ArithmeticException(
-                "Cannot encode given integer into specified number of octets.");
-        }
-        byte[] result = new byte[oLen];
-        for (int i = oLen - 1; i >= oLen - octL; i--)
-        {
-            result[i] = (byte)(x >>> (8 * (oLen - 1 - i)));
-        }
-        return result;
-    }
-
-    /**
-     * Convert an integer to an octet string of length 4 according to IEEE 1363,
-     * Section 5.5.3.
-     *
-     * @param input  the integer to convert
-     * @param output byte array holding the output
-     * @param outOff offset in output array where the result is stored
-     */
-    public static void I2OSP(int input, byte[] output, int outOff)
-    {
-        output[outOff++] = (byte)(input >>> 24);
-        output[outOff++] = (byte)(input >>> 16);
-        output[outOff++] = (byte)(input >>> 8);
-        output[outOff] = (byte)input;
-    }
-
-    /**
-     * Convert an integer to an octet string of length 8 according to IEEE 1363,
-     * Section 5.5.3.
-     *
-     * @param input the integer to convert
-     * @return the converted integer
-     */
-    public static byte[] I2OSP(long input)
-    {
-        byte[] output = new byte[8];
-        output[0] = (byte)(input >>> 56);
-        output[1] = (byte)(input >>> 48);
-        output[2] = (byte)(input >>> 40);
-        output[3] = (byte)(input >>> 32);
-        output[4] = (byte)(input >>> 24);
-        output[5] = (byte)(input >>> 16);
-        output[6] = (byte)(input >>> 8);
-        output[7] = (byte)input;
-        return output;
-    }
-
-    /**
-     * Convert an integer to an octet string of length 8 according to IEEE 1363,
-     * Section 5.5.3.
-     *
-     * @param input  the integer to convert
-     * @param output byte array holding the output
-     * @param outOff offset in output array where the result is stored
-     */
-    public static void I2OSP(long input, byte[] output, int outOff)
-    {
-        output[outOff++] = (byte)(input >>> 56);
-        output[outOff++] = (byte)(input >>> 48);
-        output[outOff++] = (byte)(input >>> 40);
-        output[outOff++] = (byte)(input >>> 32);
-        output[outOff++] = (byte)(input >>> 24);
-        output[outOff++] = (byte)(input >>> 16);
-        output[outOff++] = (byte)(input >>> 8);
-        output[outOff] = (byte)input;
-    }
-
-    /**
-     * Convert an integer to an octet string of the specified length according
-     * to IEEE 1363, Section 5.5.3. No length checking is performed (i.e., if
-     * the integer cannot be encoded into <tt>length</tt> octets, it is
-     * truncated).
-     *
-     * @param input  the integer to convert
-     * @param output byte array holding the output
-     * @param outOff offset in output array where the result is stored
-     * @param length the length of the encoding
-     */
-    public static void I2OSP(int input, byte[] output, int outOff, int length)
-    {
-        for (int i = length - 1; i >= 0; i--)
-        {
-            output[outOff + i] = (byte)(input >>> (8 * (length - 1 - i)));
-        }
-    }
-
-    /**
-     * Convert an octet string to an integer according to IEEE 1363, Section
-     * 5.5.3.
-     *
-     * @param input the byte array holding the octet string
-     * @return an integer representing the octet string <tt>input</tt>, or
-     *         <tt>0</tt> if the represented integer is negative or too large
-     *         or the byte array is empty
-     * @throws ArithmeticException if the length of the given octet string is larger than 4.
-     */
-    public static int OS2IP(byte[] input)
-    {
-        if (input.length > 4)
-        {
-            throw new ArithmeticException("invalid input length");
-        }
-        if (input.length == 0)
-        {
-            return 0;
-        }
-        int result = 0;
-        for (int j = 0; j < input.length; j++)
-        {
-            result |= (input[j] & 0xff) << (8 * (input.length - 1 - j));
-        }
-        return result;
-    }
-
-    /**
-     * Convert a byte array of length 4 beginning at <tt>offset</tt> into an
-     * integer.
-     *
-     * @param input the byte array
-     * @param inOff the offset into the byte array
-     * @return the resulting integer
-     */
-    public static int OS2IP(byte[] input, int inOff)
-    {
-        int result = (input[inOff++] & 0xff) << 24;
-        result |= (input[inOff++] & 0xff) << 16;
-        result |= (input[inOff++] & 0xff) << 8;
-        result |= input[inOff] & 0xff;
-        return result;
-    }
-
-    /**
-     * Convert an octet string to an integer according to IEEE 1363, Section
-     * 5.5.3.
-     *
-     * @param input the byte array holding the octet string
-     * @param inOff the offset in the input byte array where the octet string
-     *              starts
-     * @param inLen the length of the encoded integer
-     * @return an integer representing the octet string <tt>bytes</tt>, or
-     *         <tt>0</tt> if the represented integer is negative or too large
-     *         or the byte array is empty
-     */
-    public static int OS2IP(byte[] input, int inOff, int inLen)
-    {
-        if ((input.length == 0) || input.length < inOff + inLen - 1)
-        {
-            return 0;
-        }
-        int result = 0;
-        for (int j = 0; j < inLen; j++)
-        {
-            result |= (input[inOff + j] & 0xff) << (8 * (inLen - j - 1));
-        }
-        return result;
-    }
-
-    /**
-     * Convert a byte array of length 8 beginning at <tt>inOff</tt> into a
-     * long integer.
-     *
-     * @param input the byte array
-     * @param inOff the offset into the byte array
-     * @return the resulting long integer
-     */
-    public static long OS2LIP(byte[] input, int inOff)
-    {
-        long result = ((long)input[inOff++] & 0xff) << 56;
-        result |= ((long)input[inOff++] & 0xff) << 48;
-        result |= ((long)input[inOff++] & 0xff) << 40;
-        result |= ((long)input[inOff++] & 0xff) << 32;
-        result |= ((long)input[inOff++] & 0xff) << 24;
-        result |= (input[inOff++] & 0xff) << 16;
-        result |= (input[inOff++] & 0xff) << 8;
-        result |= input[inOff] & 0xff;
-        return result;
-    }
-
-    /**
-     * Convert an int array into a byte array.
-     *
-     * @param input the int array
-     * @return the converted array
-     */
-    public static byte[] toByteArray(final int[] input)
-    {
-        byte[] result = new byte[input.length << 2];
-        for (int i = 0; i < input.length; i++)
-        {
-            I2OSP(input[i], result, i << 2);
-        }
-        return result;
-    }
-
-    /**
-     * Convert an int array into a byte array of the specified length. No length
-     * checking is performed (i.e., if the last integer cannot be encoded into
-     * <tt>length % 4</tt> octets, it is truncated).
-     *
-     * @param input  the int array
-     * @param length the length of the converted array
-     * @return the converted array
-     */
-    public static byte[] toByteArray(final int[] input, int length)
-    {
-        final int intLen = input.length;
-        byte[] result = new byte[length];
-        int index = 0;
-        for (int i = 0; i <= intLen - 2; i++, index += 4)
-        {
-            I2OSP(input[i], result, index);
-        }
-        I2OSP(input[intLen - 1], result, index, length - index);
-        return result;
-    }
-
-    /**
-     * Convert a byte array into an int array.
-     *
-     * @param input the byte array
-     * @return the converted array
-     */
-    public static int[] toIntArray(byte[] input)
-    {
-        final int intLen = (input.length + 3) / 4;
-        final int lastLen = input.length & 0x03;
-        int[] result = new int[intLen];
-
-        int index = 0;
-        for (int i = 0; i <= intLen - 2; i++, index += 4)
-        {
-            result[i] = OS2IP(input, index);
-        }
-        if (lastLen != 0)
-        {
-            result[intLen - 1] = OS2IP(input, index, lastLen);
-        }
-        else
-        {
-            result[intLen - 1] = OS2IP(input, index);
-        }
-
-        return result;
-    }
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/math/linearalgebra/BigIntUtils.java b/bcprov/src/main/java/org/bouncycastle/pqc/math/linearalgebra/BigIntUtils.java
deleted file mode 100644
index b99ed41..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/math/linearalgebra/BigIntUtils.java
+++ /dev/null
@@ -1,138 +0,0 @@
-package org.bouncycastle.pqc.math.linearalgebra;
-
-import java.math.BigInteger;
-
-/**
- * FIXME: is this really necessary?!
- */
-public final class BigIntUtils
-{
-
-    /**
-     * Default constructor (private).
-     */
-    private BigIntUtils()
-    {
-        // empty
-    }
-
-    /**
-     * Checks if two BigInteger arrays contain the same entries
-     *
-     * @param a first BigInteger array
-     * @param b second BigInteger array
-     * @return true or false
-     */
-    public static boolean equals(BigInteger[] a, BigInteger[] b)
-    {
-        int flag = 0;
-
-        if (a.length != b.length)
-        {
-            return false;
-        }
-        for (int i = 0; i < a.length; i++)
-        {
-            // avoid branches here!
-            // problem: compareTo on BigIntegers is not
-            // guaranteed constant-time!
-            flag |= a[i].compareTo(b[i]);
-        }
-        return flag == 0;
-    }
-
-    /**
-     * Fill the given BigInteger array with the given value.
-     *
-     * @param array the array
-     * @param value the value
-     */
-    public static void fill(BigInteger[] array, BigInteger value)
-    {
-        for (int i = array.length - 1; i >= 0; i--)
-        {
-            array[i] = value;
-        }
-    }
-
-    /**
-     * Generates a subarray of a given BigInteger array.
-     *
-     * @param input -
-     *              the input BigInteger array
-     * @param start -
-     *              the start index
-     * @param end   -
-     *              the end index
-     * @return a subarray of <tt>input</tt>, ranging from <tt>start</tt> to
-     *         <tt>end</tt>
-     */
-    public static BigInteger[] subArray(BigInteger[] input, int start, int end)
-    {
-        BigInteger[] result = new BigInteger[end - start];
-        System.arraycopy(input, start, result, 0, end - start);
-        return result;
-    }
-
-    /**
-     * Converts a BigInteger array into an integer array
-     *
-     * @param input -
-     *              the BigInteger array
-     * @return the integer array
-     */
-    public static int[] toIntArray(BigInteger[] input)
-    {
-        int[] result = new int[input.length];
-        for (int i = 0; i < input.length; i++)
-        {
-            result[i] = input[i].intValue();
-        }
-        return result;
-    }
-
-    /**
-     * Converts a BigInteger array into an integer array, reducing all
-     * BigIntegers mod q.
-     *
-     * @param q     -
-     *              the modulus
-     * @param input -
-     *              the BigInteger array
-     * @return the integer array
-     */
-    public static int[] toIntArrayModQ(int q, BigInteger[] input)
-    {
-        BigInteger bq = BigInteger.valueOf(q);
-        int[] result = new int[input.length];
-        for (int i = 0; i < input.length; i++)
-        {
-            result[i] = input[i].mod(bq).intValue();
-        }
-        return result;
-    }
-
-    /**
-     * Return the value of <tt>big</tt> as a byte array. Although BigInteger
-     * has such a method, it uses an extra bit to indicate the sign of the
-     * number. For elliptic curve cryptography, the numbers usually are
-     * positive. Thus, this helper method returns a byte array of minimal
-     * length, ignoring the sign of the number.
-     *
-     * @param value the <tt>BigInteger</tt> value to be converted to a byte
-     *              array
-     * @return the value <tt>big</tt> as byte array
-     */
-    public static byte[] toMinimalByteArray(BigInteger value)
-    {
-        byte[] valBytes = value.toByteArray();
-        if ((valBytes.length == 1) || (value.bitLength() & 0x07) != 0)
-        {
-            return valBytes;
-        }
-        byte[] result = new byte[value.bitLength() >> 3];
-        System.arraycopy(valBytes, 1, result, 0, result.length);
-        return result;
-    }
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/math/linearalgebra/ByteUtils.java b/bcprov/src/main/java/org/bouncycastle/pqc/math/linearalgebra/ByteUtils.java
deleted file mode 100644
index 5ad91f4..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/math/linearalgebra/ByteUtils.java
+++ /dev/null
@@ -1,414 +0,0 @@
-package org.bouncycastle.pqc.math.linearalgebra;
-
-/**
- * This class is a utility class for manipulating byte arrays.
- */
-public final class ByteUtils
-{
-
-    private static final char[] HEX_CHARS = {'0', '1', '2', '3', '4', '5',
-        '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'};
-
-    /**
-     * Default constructor (private)
-     */
-    private ByteUtils()
-    {
-        // empty
-    }
-
-    /**
-     * Compare two byte arrays (perform null checks beforehand).
-     *
-     * @param left  the first byte array
-     * @param right the second byte array
-     * @return the result of the comparison
-     */
-    public static boolean equals(byte[] left, byte[] right)
-    {
-        if (left == null)
-        {
-            return right == null;
-        }
-        if (right == null)
-        {
-            return false;
-        }
-
-        if (left.length != right.length)
-        {
-            return false;
-        }
-        boolean result = true;
-        for (int i = left.length - 1; i >= 0; i--)
-        {
-            result &= left[i] == right[i];
-        }
-        return result;
-    }
-
-    /**
-     * Compare two two-dimensional byte arrays. No null checks are performed.
-     *
-     * @param left  the first byte array
-     * @param right the second byte array
-     * @return the result of the comparison
-     */
-    public static boolean equals(byte[][] left, byte[][] right)
-    {
-        if (left.length != right.length)
-        {
-            return false;
-        }
-
-        boolean result = true;
-        for (int i = left.length - 1; i >= 0; i--)
-        {
-            result &= ByteUtils.equals(left[i], right[i]);
-        }
-
-        return result;
-    }
-
-    /**
-     * Compare two three-dimensional byte arrays. No null checks are performed.
-     *
-     * @param left  the first byte array
-     * @param right the second byte array
-     * @return the result of the comparison
-     */
-    public static boolean equals(byte[][][] left, byte[][][] right)
-    {
-        if (left.length != right.length)
-        {
-            return false;
-        }
-
-        boolean result = true;
-        for (int i = left.length - 1; i >= 0; i--)
-        {
-            if (left[i].length != right[i].length)
-            {
-                return false;
-            }
-            for (int j = left[i].length - 1; j >= 0; j--)
-            {
-                result &= ByteUtils.equals(left[i][j], right[i][j]);
-            }
-        }
-
-        return result;
-    }
-
-    /**
-     * Computes a hashcode based on the contents of a one-dimensional byte array
-     * rather than its identity.
-     *
-     * @param array the array to compute the hashcode of
-     * @return the hashcode
-     */
-    public static int deepHashCode(byte[] array)
-    {
-        int result = 1;
-        for (int i = 0; i < array.length; i++)
-        {
-            result = 31 * result + array[i];
-        }
-        return result;
-    }
-
-    /**
-     * Computes a hashcode based on the contents of a two-dimensional byte array
-     * rather than its identity.
-     *
-     * @param array the array to compute the hashcode of
-     * @return the hashcode
-     */
-    public static int deepHashCode(byte[][] array)
-    {
-        int result = 1;
-        for (int i = 0; i < array.length; i++)
-        {
-            result = 31 * result + deepHashCode(array[i]);
-        }
-        return result;
-    }
-
-    /**
-     * Computes a hashcode based on the contents of a three-dimensional byte
-     * array rather than its identity.
-     *
-     * @param array the array to compute the hashcode of
-     * @return the hashcode
-     */
-    public static int deepHashCode(byte[][][] array)
-    {
-        int result = 1;
-        for (int i = 0; i < array.length; i++)
-        {
-            result = 31 * result + deepHashCode(array[i]);
-        }
-        return result;
-    }
-
-
-    /**
-     * Return a clone of the given byte array (performs null check beforehand).
-     *
-     * @param array the array to clone
-     * @return the clone of the given array, or <tt>null</tt> if the array is
-     *         <tt>null</tt>
-     */
-    public static byte[] clone(byte[] array)
-    {
-        if (array == null)
-        {
-            return null;
-        }
-        byte[] result = new byte[array.length];
-        System.arraycopy(array, 0, result, 0, array.length);
-        return result;
-    }
-
-    /**
-     * Convert a string containing hexadecimal characters to a byte-array.
-     *
-     * @param s a hex string
-     * @return a byte array with the corresponding value
-     */
-    public static byte[] fromHexString(String s)
-    {
-        char[] rawChars = s.toUpperCase().toCharArray();
-
-        int hexChars = 0;
-        for (int i = 0; i < rawChars.length; i++)
-        {
-            if ((rawChars[i] >= '0' && rawChars[i] <= '9')
-                || (rawChars[i] >= 'A' && rawChars[i] <= 'F'))
-            {
-                hexChars++;
-            }
-        }
-
-        byte[] byteString = new byte[(hexChars + 1) >> 1];
-
-        int pos = hexChars & 1;
-
-        for (int i = 0; i < rawChars.length; i++)
-        {
-            if (rawChars[i] >= '0' && rawChars[i] <= '9')
-            {
-                byteString[pos >> 1] <<= 4;
-                byteString[pos >> 1] |= rawChars[i] - '0';
-            }
-            else if (rawChars[i] >= 'A' && rawChars[i] <= 'F')
-            {
-                byteString[pos >> 1] <<= 4;
-                byteString[pos >> 1] |= rawChars[i] - 'A' + 10;
-            }
-            else
-            {
-                continue;
-            }
-            pos++;
-        }
-
-        return byteString;
-    }
-
-    /**
-     * Convert a byte array to the corresponding hexstring.
-     *
-     * @param input the byte array to be converted
-     * @return the corresponding hexstring
-     */
-    public static String toHexString(byte[] input)
-    {
-        String result = "";
-        for (int i = 0; i < input.length; i++)
-        {
-            result += HEX_CHARS[(input[i] >>> 4) & 0x0f];
-            result += HEX_CHARS[(input[i]) & 0x0f];
-        }
-        return result;
-    }
-
-    /**
-     * Convert a byte array to the corresponding hex string.
-     *
-     * @param input     the byte array to be converted
-     * @param prefix    the prefix to put at the beginning of the hex string
-     * @param seperator a separator string
-     * @return the corresponding hex string
-     */
-    public static String toHexString(byte[] input, String prefix,
-                                     String seperator)
-    {
-        String result = new String(prefix);
-        for (int i = 0; i < input.length; i++)
-        {
-            result += HEX_CHARS[(input[i] >>> 4) & 0x0f];
-            result += HEX_CHARS[(input[i]) & 0x0f];
-            if (i < input.length - 1)
-            {
-                result += seperator;
-            }
-        }
-        return result;
-    }
-
-    /**
-     * Convert a byte array to the corresponding bit string.
-     *
-     * @param input the byte array to be converted
-     * @return the corresponding bit string
-     */
-    public static String toBinaryString(byte[] input)
-    {
-        String result = "";
-        int i;
-        for (i = 0; i < input.length; i++)
-        {
-            int e = input[i];
-            for (int ii = 0; ii < 8; ii++)
-            {
-                int b = (e >>> ii) & 1;
-                result += b;
-            }
-            if (i != input.length - 1)
-            {
-                result += " ";
-            }
-        }
-        return result;
-    }
-
-    /**
-     * Compute the bitwise XOR of two arrays of bytes. The arrays have to be of
-     * same length. No length checking is performed.
-     *
-     * @param x1 the first array
-     * @param x2 the second array
-     * @return x1 XOR x2
-     */
-    public static byte[] xor(byte[] x1, byte[] x2)
-    {
-        byte[] out = new byte[x1.length];
-
-        for (int i = x1.length - 1; i >= 0; i--)
-        {
-            out[i] = (byte)(x1[i] ^ x2[i]);
-        }
-        return out;
-    }
-
-    /**
-     * Concatenate two byte arrays. No null checks are performed.
-     *
-     * @param x1 the first array
-     * @param x2 the second array
-     * @return (x2||x1) (little-endian order, i.e. x1 is at lower memory
-     *         addresses)
-     */
-    public static byte[] concatenate(byte[] x1, byte[] x2)
-    {
-        byte[] result = new byte[x1.length + x2.length];
-
-        System.arraycopy(x1, 0, result, 0, x1.length);
-        System.arraycopy(x2, 0, result, x1.length, x2.length);
-
-        return result;
-    }
-
-    /**
-     * Convert a 2-dimensional byte array into a 1-dimensional byte array by
-     * concatenating all entries.
-     *
-     * @param array a 2-dimensional byte array
-     * @return the concatenated input array
-     */
-    public static byte[] concatenate(byte[][] array)
-    {
-        int rowLength = array[0].length;
-        byte[] result = new byte[array.length * rowLength];
-        int index = 0;
-        for (int i = 0; i < array.length; i++)
-        {
-            System.arraycopy(array[i], 0, result, index, rowLength);
-            index += rowLength;
-        }
-        return result;
-    }
-
-    /**
-     * Split a byte array <tt>input</tt> into two arrays at <tt>index</tt>,
-     * i.e. the first array will have the lower <tt>index</tt> bytes, the
-     * second one the higher <tt>input.length - index</tt> bytes.
-     *
-     * @param input the byte array to be split
-     * @param index the index where the byte array is split
-     * @return the splitted input array as an array of two byte arrays
-     * @throws ArrayIndexOutOfBoundsException if <tt>index</tt> is out of bounds
-     */
-    public static byte[][] split(byte[] input, int index)
-        throws ArrayIndexOutOfBoundsException
-    {
-        if (index > input.length)
-        {
-            throw new ArrayIndexOutOfBoundsException();
-        }
-        byte[][] result = new byte[2][];
-        result[0] = new byte[index];
-        result[1] = new byte[input.length - index];
-        System.arraycopy(input, 0, result[0], 0, index);
-        System.arraycopy(input, index, result[1], 0, input.length - index);
-        return result;
-    }
-
-    /**
-     * Generate a subarray of a given byte array.
-     *
-     * @param input the input byte array
-     * @param start the start index
-     * @param end   the end index
-     * @return a subarray of <tt>input</tt>, ranging from <tt>start</tt>
-     *         (inclusively) to <tt>end</tt> (exclusively)
-     */
-    public static byte[] subArray(byte[] input, int start, int end)
-    {
-        byte[] result = new byte[end - start];
-        System.arraycopy(input, start, result, 0, end - start);
-        return result;
-    }
-
-    /**
-     * Generate a subarray of a given byte array.
-     *
-     * @param input the input byte array
-     * @param start the start index
-     * @return a subarray of <tt>input</tt>, ranging from <tt>start</tt> to
-     *         the end of the array
-     */
-    public static byte[] subArray(byte[] input, int start)
-    {
-        return subArray(input, start, input.length);
-    }
-
-    /**
-     * Rewrite a byte array as a char array
-     *
-     * @param input -
-     *              the byte array
-     * @return char array
-     */
-    public static char[] toCharArray(byte[] input)
-    {
-        char[] result = new char[input.length];
-        for (int i = 0; i < input.length; i++)
-        {
-            result[i] = (char)input[i];
-        }
-        return result;
-    }
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/math/linearalgebra/CharUtils.java b/bcprov/src/main/java/org/bouncycastle/pqc/math/linearalgebra/CharUtils.java
deleted file mode 100644
index 1800685..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/math/linearalgebra/CharUtils.java
+++ /dev/null
@@ -1,98 +0,0 @@
-package org.bouncycastle.pqc.math.linearalgebra;
-
-public final class CharUtils
-{
-
-    /**
-     * Default constructor (private)
-     */
-    private CharUtils()
-    {
-        // empty
-    }
-
-    /**
-     * Return a clone of the given char array. No null checks are performed.
-     *
-     * @param array the array to clone
-     * @return the clone of the given array
-     */
-    public static char[] clone(char[] array)
-    {
-        char[] result = new char[array.length];
-        System.arraycopy(array, 0, result, 0, array.length);
-        return result;
-    }
-
-    /**
-     * Convert the given char array into a byte array.
-     *
-     * @param chars the char array
-     * @return the converted array
-     */
-    public static byte[] toByteArray(char[] chars)
-    {
-        byte[] result = new byte[chars.length];
-        for (int i = chars.length - 1; i >= 0; i--)
-        {
-            result[i] = (byte)chars[i];
-        }
-        return result;
-    }
-
-    /**
-     * Convert the given char array into a
-     * byte array for use with PBE encryption.
-     *
-     * @param chars the char array
-     * @return the converted array
-     */
-    public static byte[] toByteArrayForPBE(char[] chars)
-    {
-
-        byte[] out = new byte[chars.length];
-
-        for (int i = 0; i < chars.length; i++)
-        {
-            out[i] = (byte)chars[i];
-        }
-
-        int length = out.length * 2;
-        byte[] ret = new byte[length + 2];
-
-        int j = 0;
-        for (int i = 0; i < out.length; i++)
-        {
-            j = i * 2;
-            ret[j] = 0;
-            ret[j + 1] = out[i];
-        }
-
-        ret[length] = 0;
-        ret[length + 1] = 0;
-
-        return ret;
-    }
-
-    /**
-     * Compare two char arrays. No null checks are performed.
-     *
-     * @param left  the char byte array
-     * @param right the second char array
-     * @return the result of the comparison
-     */
-    public static boolean equals(char[] left, char[] right)
-    {
-        if (left.length != right.length)
-        {
-            return false;
-        }
-        boolean result = true;
-        for (int i = left.length - 1; i >= 0; i--)
-        {
-            result &= left[i] == right[i];
-        }
-        return result;
-    }
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/math/linearalgebra/GF2Matrix.java b/bcprov/src/main/java/org/bouncycastle/pqc/math/linearalgebra/GF2Matrix.java
deleted file mode 100644
index a61f950..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/math/linearalgebra/GF2Matrix.java
+++ /dev/null
@@ -1,1323 +0,0 @@
-package org.bouncycastle.pqc.math.linearalgebra;
-
-import java.security.SecureRandom;
-
-/**
- * This class describes some operations with matrices over finite field GF(2)
- * and is used in ecc and MQ-PKC (also has some specific methods and
- * implementation)
- */
-public class GF2Matrix
-    extends Matrix
-{
-
-    /**
-     * For the matrix representation the array of type int[][] is used, thus one
-     * element of the array keeps 32 elements of the matrix (from one row and 32
-     * columns)
-     */
-    private int[][] matrix;
-
-    /**
-     * the length of each array representing a row of this matrix, computed as
-     * <tt>(numColumns + 31) / 32</tt>
-     */
-    private int length;
-
-    /**
-     * Create the matrix from encoded form.
-     *
-     * @param enc the encoded matrix
-     */
-    public GF2Matrix(byte[] enc)
-    {
-        if (enc.length < 9)
-        {
-            throw new ArithmeticException(
-                "given array is not an encoded matrix over GF(2)");
-        }
-
-        numRows = LittleEndianConversions.OS2IP(enc, 0);
-        numColumns = LittleEndianConversions.OS2IP(enc, 4);
-
-        int n = ((numColumns + 7) >>> 3) * numRows;
-
-        if ((numRows <= 0) || (n != (enc.length - 8)))
-        {
-            throw new ArithmeticException(
-                "given array is not an encoded matrix over GF(2)");
-        }
-
-        length = (numColumns + 31) >>> 5;
-        matrix = new int[numRows][length];
-
-        // number of "full" integer
-        int q = numColumns >> 5;
-        // number of bits in non-full integer
-        int r = numColumns & 0x1f;
-
-        int count = 8;
-        for (int i = 0; i < numRows; i++)
-        {
-            for (int j = 0; j < q; j++, count += 4)
-            {
-                matrix[i][j] = LittleEndianConversions.OS2IP(enc, count);
-            }
-            for (int j = 0; j < r; j += 8)
-            {
-                matrix[i][q] ^= (enc[count++] & 0xff) << j;
-            }
-        }
-    }
-
-    /**
-     * Create the matrix with the contents of the given array. The matrix is not
-     * copied. Unused coefficients are masked out.
-     *
-     * @param numColumns the number of columns
-     * @param matrix     the element array
-     */
-    public GF2Matrix(int numColumns, int[][] matrix)
-    {
-        if (matrix[0].length != (numColumns + 31) >> 5)
-        {
-            throw new ArithmeticException(
-                "Int array does not match given number of columns.");
-        }
-        this.numColumns = numColumns;
-        numRows = matrix.length;
-        length = matrix[0].length;
-        int rest = numColumns & 0x1f;
-        int bitMask;
-        if (rest == 0)
-        {
-            bitMask = 0xffffffff;
-        }
-        else
-        {
-            bitMask = (1 << rest) - 1;
-        }
-        for (int i = 0; i < numRows; i++)
-        {
-            matrix[i][length - 1] &= bitMask;
-        }
-        this.matrix = matrix;
-    }
-
-    /**
-     * Create an nxn matrix of the given type.
-     *
-     * @param n            the number of rows (and columns)
-     * @param typeOfMatrix the martix type (see {@link Matrix} for predefined
-     *                     constants)
-     */
-    public GF2Matrix(int n, char typeOfMatrix)
-    {
-        this(n, typeOfMatrix, new java.security.SecureRandom());
-    }
-
-    /**
-     * Create an nxn matrix of the given type.
-     *
-     * @param n            the matrix size
-     * @param typeOfMatrix the matrix type
-     * @param sr           the source of randomness
-     */
-    public GF2Matrix(int n, char typeOfMatrix, SecureRandom sr)
-    {
-        if (n <= 0)
-        {
-            throw new ArithmeticException("Size of matrix is non-positive.");
-        }
-
-        switch (typeOfMatrix)
-        {
-
-        case Matrix.MATRIX_TYPE_ZERO:
-            assignZeroMatrix(n, n);
-            break;
-
-        case Matrix.MATRIX_TYPE_UNIT:
-            assignUnitMatrix(n);
-            break;
-
-        case Matrix.MATRIX_TYPE_RANDOM_LT:
-            assignRandomLowerTriangularMatrix(n, sr);
-            break;
-
-        case Matrix.MATRIX_TYPE_RANDOM_UT:
-            assignRandomUpperTriangularMatrix(n, sr);
-            break;
-
-        case Matrix.MATRIX_TYPE_RANDOM_REGULAR:
-            assignRandomRegularMatrix(n, sr);
-            break;
-
-        default:
-            throw new ArithmeticException("Unknown matrix type.");
-        }
-    }
-
-    /**
-     * Copy constructor.
-     *
-     * @param a another {@link GF2Matrix}
-     */
-    public GF2Matrix(GF2Matrix a)
-    {
-        numColumns = a.getNumColumns();
-        numRows = a.getNumRows();
-        length = a.length;
-        matrix = new int[a.matrix.length][];
-        for (int i = 0; i < matrix.length; i++)
-        {
-            matrix[i] = IntUtils.clone(a.matrix[i]);
-        }
-
-    }
-
-    /**
-     * create the mxn zero matrix
-     */
-    private GF2Matrix(int m, int n)
-    {
-        if ((n <= 0) || (m <= 0))
-        {
-            throw new ArithmeticException("size of matrix is non-positive");
-        }
-
-        assignZeroMatrix(m, n);
-    }
-
-    /**
-     * Create the mxn zero matrix.
-     *
-     * @param m number of rows
-     * @param n number of columns
-     */
-    private void assignZeroMatrix(int m, int n)
-    {
-        numRows = m;
-        numColumns = n;
-        length = (n + 31) >>> 5;
-        matrix = new int[numRows][length];
-        for (int i = 0; i < numRows; i++)
-        {
-            for (int j = 0; j < length; j++)
-            {
-                matrix[i][j] = 0;
-            }
-        }
-    }
-
-    /**
-     * Create the mxn unit matrix.
-     *
-     * @param n number of rows (and columns)
-     */
-    private void assignUnitMatrix(int n)
-    {
-        numRows = n;
-        numColumns = n;
-        length = (n + 31) >>> 5;
-        matrix = new int[numRows][length];
-        for (int i = 0; i < numRows; i++)
-        {
-            for (int j = 0; j < length; j++)
-            {
-                matrix[i][j] = 0;
-            }
-        }
-        for (int i = 0; i < numRows; i++)
-        {
-            int rest = i & 0x1f;
-            matrix[i][i >>> 5] = 1 << rest;
-        }
-    }
-
-    /**
-     * Create a nxn random lower triangular matrix.
-     *
-     * @param n  number of rows (and columns)
-     * @param sr source of randomness
-     */
-    private void assignRandomLowerTriangularMatrix(int n, SecureRandom sr)
-    {
-        numRows = n;
-        numColumns = n;
-        length = (n + 31) >>> 5;
-        matrix = new int[numRows][length];
-        for (int i = 0; i < numRows; i++)
-        {
-            int q = i >>> 5;
-            int r = i & 0x1f;
-            int s = 31 - r;
-            r = 1 << r;
-            for (int j = 0; j < q; j++)
-            {
-                matrix[i][j] = sr.nextInt();
-            }
-            matrix[i][q] = (sr.nextInt() >>> s) | r;
-            for (int j = q + 1; j < length; j++)
-            {
-                matrix[i][j] = 0;
-            }
-
-        }
-
-    }
-
-    /**
-     * Create a nxn random upper triangular matrix.
-     *
-     * @param n  number of rows (and columns)
-     * @param sr source of randomness
-     */
-    private void assignRandomUpperTriangularMatrix(int n, SecureRandom sr)
-    {
-        numRows = n;
-        numColumns = n;
-        length = (n + 31) >>> 5;
-        matrix = new int[numRows][length];
-        int rest = n & 0x1f;
-        int help;
-        if (rest == 0)
-        {
-            help = 0xffffffff;
-        }
-        else
-        {
-            help = (1 << rest) - 1;
-        }
-        for (int i = 0; i < numRows; i++)
-        {
-            int q = i >>> 5;
-            int r = i & 0x1f;
-            int s = r;
-            r = 1 << r;
-            for (int j = 0; j < q; j++)
-            {
-                matrix[i][j] = 0;
-            }
-            matrix[i][q] = (sr.nextInt() << s) | r;
-            for (int j = q + 1; j < length; j++)
-            {
-                matrix[i][j] = sr.nextInt();
-            }
-            matrix[i][length - 1] &= help;
-        }
-
-    }
-
-    /**
-     * Create an nxn random regular matrix.
-     *
-     * @param n  number of rows (and columns)
-     * @param sr source of randomness
-     */
-    private void assignRandomRegularMatrix(int n, SecureRandom sr)
-    {
-        numRows = n;
-        numColumns = n;
-        length = (n + 31) >>> 5;
-        matrix = new int[numRows][length];
-        GF2Matrix lm = new GF2Matrix(n, Matrix.MATRIX_TYPE_RANDOM_LT, sr);
-        GF2Matrix um = new GF2Matrix(n, Matrix.MATRIX_TYPE_RANDOM_UT, sr);
-        GF2Matrix rm = (GF2Matrix)lm.rightMultiply(um);
-        Permutation perm = new Permutation(n, sr);
-        int[] p = perm.getVector();
-        for (int i = 0; i < n; i++)
-        {
-            System.arraycopy(rm.matrix[i], 0, matrix[p[i]], 0, length);
-        }
-    }
-
-    /**
-     * Create a nxn random regular matrix and its inverse.
-     *
-     * @param n  number of rows (and columns)
-     * @param sr source of randomness
-     * @return the created random regular matrix and its inverse
-     */
-    public static GF2Matrix[] createRandomRegularMatrixAndItsInverse(int n,
-                                                                     SecureRandom sr)
-    {
-
-        GF2Matrix[] result = new GF2Matrix[2];
-
-        // ------------------------------------
-        // First part: create regular matrix
-        // ------------------------------------
-
-        // ------
-        int length = (n + 31) >> 5;
-        GF2Matrix lm = new GF2Matrix(n, Matrix.MATRIX_TYPE_RANDOM_LT, sr);
-        GF2Matrix um = new GF2Matrix(n, Matrix.MATRIX_TYPE_RANDOM_UT, sr);
-        GF2Matrix rm = (GF2Matrix)lm.rightMultiply(um);
-        Permutation p = new Permutation(n, sr);
-        int[] pVec = p.getVector();
-
-        int[][] matrix = new int[n][length];
-        for (int i = 0; i < n; i++)
-        {
-            System.arraycopy(rm.matrix[pVec[i]], 0, matrix[i], 0, length);
-        }
-
-        result[0] = new GF2Matrix(n, matrix);
-
-        // ------------------------------------
-        // Second part: create inverse matrix
-        // ------------------------------------
-
-        // inverse to lm
-        GF2Matrix invLm = new GF2Matrix(n, Matrix.MATRIX_TYPE_UNIT);
-        for (int i = 0; i < n; i++)
-        {
-            int rest = i & 0x1f;
-            int q = i >>> 5;
-            int r = 1 << rest;
-            for (int j = i + 1; j < n; j++)
-            {
-                int b = (lm.matrix[j][q]) & r;
-                if (b != 0)
-                {
-                    for (int k = 0; k <= q; k++)
-                    {
-                        invLm.matrix[j][k] ^= invLm.matrix[i][k];
-                    }
-                }
-            }
-        }
-        // inverse to um
-        GF2Matrix invUm = new GF2Matrix(n, Matrix.MATRIX_TYPE_UNIT);
-        for (int i = n - 1; i >= 0; i--)
-        {
-            int rest = i & 0x1f;
-            int q = i >>> 5;
-            int r = 1 << rest;
-            for (int j = i - 1; j >= 0; j--)
-            {
-                int b = (um.matrix[j][q]) & r;
-                if (b != 0)
-                {
-                    for (int k = q; k < length; k++)
-                    {
-                        invUm.matrix[j][k] ^= invUm.matrix[i][k];
-                    }
-                }
-            }
-        }
-
-        // inverse matrix
-        result[1] = (GF2Matrix)invUm.rightMultiply(invLm.rightMultiply(p));
-
-        return result;
-    }
-
-    /**
-     * @return the array keeping the matrix elements
-     */
-    public int[][] getIntArray()
-    {
-        return matrix;
-    }
-
-    /**
-     * @return the length of each array representing a row of this matrix
-     */
-    public int getLength()
-    {
-        return length;
-    }
-
-    /**
-     * Return the row of this matrix with the given index.
-     *
-     * @param index the index
-     * @return the row of this matrix with the given index
-     */
-    public int[] getRow(int index)
-    {
-        return matrix[index];
-    }
-
-    /**
-     * Returns encoded matrix, i.e., this matrix in byte array form
-     *
-     * @return the encoded matrix
-     */
-    public byte[] getEncoded()
-    {
-        int n = (numColumns + 7) >>> 3;
-        n *= numRows;
-        n += 8;
-        byte[] enc = new byte[n];
-
-        LittleEndianConversions.I2OSP(numRows, enc, 0);
-        LittleEndianConversions.I2OSP(numColumns, enc, 4);
-
-        // number of "full" integer
-        int q = numColumns >>> 5;
-        // number of bits in non-full integer
-        int r = numColumns & 0x1f;
-
-        int count = 8;
-        for (int i = 0; i < numRows; i++)
-        {
-            for (int j = 0; j < q; j++, count += 4)
-            {
-                LittleEndianConversions.I2OSP(matrix[i][j], enc, count);
-            }
-            for (int j = 0; j < r; j += 8)
-            {
-                enc[count++] = (byte)((matrix[i][q] >>> j) & 0xff);
-            }
-
-        }
-        return enc;
-    }
-
-
-    /**
-     * Returns the percentage of the number of "ones" in this matrix.
-     *
-     * @return the Hamming weight of this matrix (as a ratio).
-     */
-    public double getHammingWeight()
-    {
-        double counter = 0.0;
-        double elementCounter = 0.0;
-        int rest = numColumns & 0x1f;
-        int d;
-        if (rest == 0)
-        {
-            d = length;
-        }
-        else
-        {
-            d = length - 1;
-        }
-
-        for (int i = 0; i < numRows; i++)
-        {
-
-            for (int j = 0; j < d; j++)
-            {
-                int a = matrix[i][j];
-                for (int k = 0; k < 32; k++)
-                {
-                    int b = (a >>> k) & 1;
-                    counter = counter + b;
-                    elementCounter = elementCounter + 1;
-                }
-            }
-            int a = matrix[i][length - 1];
-            for (int k = 0; k < rest; k++)
-            {
-                int b = (a >>> k) & 1;
-                counter = counter + b;
-                elementCounter = elementCounter + 1;
-            }
-        }
-
-        return counter / elementCounter;
-    }
-
-    /**
-     * Check if this is the zero matrix (i.e., all entries are zero).
-     *
-     * @return <tt>true</tt> if this is the zero matrix
-     */
-    public boolean isZero()
-    {
-        for (int i = 0; i < numRows; i++)
-        {
-            for (int j = 0; j < length; j++)
-            {
-                if (matrix[i][j] != 0)
-                {
-                    return false;
-                }
-            }
-        }
-        return true;
-    }
-
-    /**
-     * Get the quadratic submatrix of this matrix consisting of the leftmost
-     * <tt>numRows</tt> columns.
-     *
-     * @return the <tt>(numRows x numRows)</tt> submatrix
-     */
-    public GF2Matrix getLeftSubMatrix()
-    {
-        if (numColumns <= numRows)
-        {
-            throw new ArithmeticException("empty submatrix");
-        }
-        int length = (numRows + 31) >> 5;
-        int[][] result = new int[numRows][length];
-        int bitMask = (1 << (numRows & 0x1f)) - 1;
-        if (bitMask == 0)
-        {
-            bitMask = -1;
-        }
-        for (int i = numRows - 1; i >= 0; i--)
-        {
-            System.arraycopy(matrix[i], 0, result[i], 0, length);
-            result[i][length - 1] &= bitMask;
-        }
-        return new GF2Matrix(numRows, result);
-    }
-
-    /**
-     * Compute the full form matrix <tt>(this | Id)</tt> from this matrix in
-     * left compact form, where <tt>Id</tt> is the <tt>k x k</tt> identity
-     * matrix and <tt>k</tt> is the number of rows of this matrix.
-     *
-     * @return <tt>(this | Id)</tt>
-     */
-    public GF2Matrix extendLeftCompactForm()
-    {
-        int newNumColumns = numColumns + numRows;
-        GF2Matrix result = new GF2Matrix(numRows, newNumColumns);
-
-        int ind = numRows - 1 + numColumns;
-        for (int i = numRows - 1; i >= 0; i--, ind--)
-        {
-            // copy this matrix to first columns
-            System.arraycopy(matrix[i], 0, result.matrix[i], 0, length);
-            // store the identity in last columns
-            result.matrix[i][ind >> 5] |= 1 << (ind & 0x1f);
-        }
-
-        return result;
-    }
-
-    /**
-     * Get the submatrix of this matrix consisting of the rightmost
-     * <tt>numColumns-numRows</tt> columns.
-     *
-     * @return the <tt>(numRows x (numColumns-numRows))</tt> submatrix
-     */
-    public GF2Matrix getRightSubMatrix()
-    {
-        if (numColumns <= numRows)
-        {
-            throw new ArithmeticException("empty submatrix");
-        }
-
-        int q = numRows >> 5;
-        int r = numRows & 0x1f;
-
-        GF2Matrix result = new GF2Matrix(numRows, numColumns - numRows);
-
-        for (int i = numRows - 1; i >= 0; i--)
-        {
-            // if words have to be shifted
-            if (r != 0)
-            {
-                int ind = q;
-                // process all but last word
-                for (int j = 0; j < result.length - 1; j++)
-                {
-                    // shift to correct position
-                    result.matrix[i][j] = (matrix[i][ind++] >>> r)
-                        | (matrix[i][ind] << (32 - r));
-                }
-                // process last word
-                result.matrix[i][result.length - 1] = matrix[i][ind++] >>> r;
-                if (ind < length)
-                {
-                    result.matrix[i][result.length - 1] |= matrix[i][ind] << (32 - r);
-                }
-            }
-            else
-            {
-                // no shifting necessary
-                System.arraycopy(matrix[i], q, result.matrix[i], 0,
-                    result.length);
-            }
-        }
-        return result;
-    }
-
-    /**
-     * Compute the full form matrix <tt>(Id | this)</tt> from this matrix in
-     * right compact form, where <tt>Id</tt> is the <tt>k x k</tt> identity
-     * matrix and <tt>k</tt> is the number of rows of this matrix.
-     *
-     * @return <tt>(Id | this)</tt>
-     */
-    public GF2Matrix extendRightCompactForm()
-    {
-        GF2Matrix result = new GF2Matrix(numRows, numRows + numColumns);
-
-        int q = numRows >> 5;
-        int r = numRows & 0x1f;
-
-        for (int i = numRows - 1; i >= 0; i--)
-        {
-            // store the identity in first columns
-            result.matrix[i][i >> 5] |= 1 << (i & 0x1f);
-
-            // copy this matrix to last columns
-
-            // if words have to be shifted
-            if (r != 0)
-            {
-                int ind = q;
-                // process all but last word
-                for (int j = 0; j < length - 1; j++)
-                {
-                    // obtain matrix word
-                    int mw = matrix[i][j];
-                    // shift to correct position
-                    result.matrix[i][ind++] |= mw << r;
-                    result.matrix[i][ind] |= mw >>> (32 - r);
-                }
-                // process last word
-                int mw = matrix[i][length - 1];
-                result.matrix[i][ind++] |= mw << r;
-                if (ind < result.length)
-                {
-                    result.matrix[i][ind] |= mw >>> (32 - r);
-                }
-            }
-            else
-            {
-                // no shifting necessary
-                System.arraycopy(matrix[i], 0, result.matrix[i], q, length);
-            }
-        }
-
-        return result;
-    }
-
-    /**
-     * Compute the transpose of this matrix.
-     *
-     * @return <tt>(this)<sup>T</sup></tt>
-     */
-    public Matrix computeTranspose()
-    {
-        int[][] result = new int[numColumns][(numRows + 31) >>> 5];
-        for (int i = 0; i < numRows; i++)
-        {
-            for (int j = 0; j < numColumns; j++)
-            {
-                int qs = j >>> 5;
-                int rs = j & 0x1f;
-                int b = (matrix[i][qs] >>> rs) & 1;
-                int qt = i >>> 5;
-                int rt = i & 0x1f;
-                if (b == 1)
-                {
-                    result[j][qt] |= 1 << rt;
-                }
-            }
-        }
-
-        return new GF2Matrix(numRows, result);
-    }
-
-    /**
-     * Compute the inverse of this matrix.
-     *
-     * @return the inverse of this matrix (newly created).
-     * @throws ArithmeticException if this matrix is not invertible.
-     */
-    public Matrix computeInverse()
-    {
-        if (numRows != numColumns)
-        {
-            throw new ArithmeticException("Matrix is not invertible.");
-        }
-
-        // clone this matrix
-        int[][] tmpMatrix = new int[numRows][length];
-        for (int i = numRows - 1; i >= 0; i--)
-        {
-            tmpMatrix[i] = IntUtils.clone(matrix[i]);
-        }
-
-        // initialize inverse matrix as unit matrix
-        int[][] invMatrix = new int[numRows][length];
-        for (int i = numRows - 1; i >= 0; i--)
-        {
-            int q = i >> 5;
-            int r = i & 0x1f;
-            invMatrix[i][q] = 1 << r;
-        }
-
-        // simultaneously compute Gaussian reduction of tmpMatrix and unit
-        // matrix
-        for (int i = 0; i < numRows; i++)
-        {
-            // i = q * 32 + (i mod 32)
-            int q = i >> 5;
-            int bitMask = 1 << (i & 0x1f);
-            // if diagonal element is zero
-            if ((tmpMatrix[i][q] & bitMask) == 0)
-            {
-                boolean foundNonZero = false;
-                // find a non-zero element in the same column
-                for (int j = i + 1; j < numRows; j++)
-                {
-                    if ((tmpMatrix[j][q] & bitMask) != 0)
-                    {
-                        // found it, swap rows ...
-                        foundNonZero = true;
-                        swapRows(tmpMatrix, i, j);
-                        swapRows(invMatrix, i, j);
-                        // ... and quit searching
-                        j = numRows;
-                        continue;
-                    }
-                }
-                // if no non-zero element was found ...
-                if (!foundNonZero)
-                {
-                    // ... the matrix is not invertible
-                    throw new ArithmeticException("Matrix is not invertible.");
-                }
-            }
-
-            // normalize all but i-th row
-            for (int j = numRows - 1; j >= 0; j--)
-            {
-                if ((j != i) && ((tmpMatrix[j][q] & bitMask) != 0))
-                {
-                    addToRow(tmpMatrix[i], tmpMatrix[j], q);
-                    addToRow(invMatrix[i], invMatrix[j], 0);
-                }
-            }
-        }
-
-        return new GF2Matrix(numColumns, invMatrix);
-    }
-
-    /**
-     * Compute the product of a permutation matrix (which is generated from an
-     * n-permutation) and this matrix.
-     *
-     * @param p the permutation
-     * @return {@link GF2Matrix} <tt>P*this</tt>
-     */
-    public Matrix leftMultiply(Permutation p)
-    {
-        int[] pVec = p.getVector();
-        if (pVec.length != numRows)
-        {
-            throw new ArithmeticException("length mismatch");
-        }
-
-        int[][] result = new int[numRows][];
-
-        for (int i = numRows - 1; i >= 0; i--)
-        {
-            result[i] = IntUtils.clone(matrix[pVec[i]]);
-        }
-
-        return new GF2Matrix(numRows, result);
-    }
-
-    /**
-     * compute product a row vector and this matrix
-     *
-     * @param vec a vector over GF(2)
-     * @return Vector product a*matrix
-     */
-    public Vector leftMultiply(Vector vec)
-    {
-
-        if (!(vec instanceof GF2Vector))
-        {
-            throw new ArithmeticException("vector is not defined over GF(2)");
-        }
-
-        if (vec.length != numRows)
-        {
-            throw new ArithmeticException("length mismatch");
-        }
-
-        int[] v = ((GF2Vector)vec).getVecArray();
-        int[] res = new int[length];
-
-        int q = numRows >> 5;
-        int r = 1 << (numRows & 0x1f);
-
-        // compute scalar products with full words of vector
-        int row = 0;
-        for (int i = 0; i < q; i++)
-        {
-            int bitMask = 1;
-            do
-            {
-                int b = v[i] & bitMask;
-                if (b != 0)
-                {
-                    for (int j = 0; j < length; j++)
-                    {
-                        res[j] ^= matrix[row][j];
-                    }
-                }
-                row++;
-                bitMask <<= 1;
-            }
-            while (bitMask != 0);
-        }
-
-        // compute scalar products with last word of vector
-        int bitMask = 1;
-        while (bitMask != r)
-        {
-            int b = v[q] & bitMask;
-            if (b != 0)
-            {
-                for (int j = 0; j < length; j++)
-                {
-                    res[j] ^= matrix[row][j];
-                }
-            }
-            row++;
-            bitMask <<= 1;
-        }
-
-        return new GF2Vector(res, numColumns);
-    }
-
-    /**
-     * Compute the product of the matrix <tt>(this | Id)</tt> and a column
-     * vector, where <tt>Id</tt> is a <tt>(numRows x numRows)</tt> unit
-     * matrix.
-     *
-     * @param vec the vector over GF(2)
-     * @return <tt>(this | Id)*vector</tt>
-     */
-    public Vector leftMultiplyLeftCompactForm(Vector vec)
-    {
-        if (!(vec instanceof GF2Vector))
-        {
-            throw new ArithmeticException("vector is not defined over GF(2)");
-        }
-
-        if (vec.length != numRows)
-        {
-            throw new ArithmeticException("length mismatch");
-        }
-
-        int[] v = ((GF2Vector)vec).getVecArray();
-        int[] res = new int[(numRows + numColumns + 31) >>> 5];
-
-        // process full words of vector
-        int words = numRows >>> 5;
-        int row = 0;
-        for (int i = 0; i < words; i++)
-        {
-            int bitMask = 1;
-            do
-            {
-                int b = v[i] & bitMask;
-                if (b != 0)
-                {
-                    // compute scalar product part
-                    for (int j = 0; j < length; j++)
-                    {
-                        res[j] ^= matrix[row][j];
-                    }
-                    // set last bit
-                    int q = (numColumns + row) >>> 5;
-                    int r = (numColumns + row) & 0x1f;
-                    res[q] |= 1 << r;
-                }
-                row++;
-                bitMask <<= 1;
-            }
-            while (bitMask != 0);
-        }
-
-        // process last word of vector
-        int rem = 1 << (numRows & 0x1f);
-        int bitMask = 1;
-        while (bitMask != rem)
-        {
-            int b = v[words] & bitMask;
-            if (b != 0)
-            {
-                // compute scalar product part
-                for (int j = 0; j < length; j++)
-                {
-                    res[j] ^= matrix[row][j];
-                }
-                // set last bit
-                int q = (numColumns + row) >>> 5;
-                int r = (numColumns + row) & 0x1f;
-                res[q] |= 1 << r;
-            }
-            row++;
-            bitMask <<= 1;
-        }
-
-        return new GF2Vector(res, numRows + numColumns);
-    }
-
-    /**
-     * Compute the product of this matrix and a matrix A over GF(2).
-     *
-     * @param mat a matrix A over GF(2)
-     * @return matrix product <tt>this*matrixA</tt>
-     */
-    public Matrix rightMultiply(Matrix mat)
-    {
-        if (!(mat instanceof GF2Matrix))
-        {
-            throw new ArithmeticException("matrix is not defined over GF(2)");
-        }
-
-        if (mat.numRows != numColumns)
-        {
-            throw new ArithmeticException("length mismatch");
-        }
-
-        GF2Matrix a = (GF2Matrix)mat;
-        GF2Matrix result = new GF2Matrix(numRows, mat.numColumns);
-
-        int d;
-        int rest = numColumns & 0x1f;
-        if (rest == 0)
-        {
-            d = length;
-        }
-        else
-        {
-            d = length - 1;
-        }
-        for (int i = 0; i < numRows; i++)
-        {
-            int count = 0;
-            for (int j = 0; j < d; j++)
-            {
-                int e = matrix[i][j];
-                for (int h = 0; h < 32; h++)
-                {
-                    int b = e & (1 << h);
-                    if (b != 0)
-                    {
-                        for (int g = 0; g < a.length; g++)
-                        {
-                            result.matrix[i][g] ^= a.matrix[count][g];
-                        }
-                    }
-                    count++;
-                }
-            }
-            int e = matrix[i][length - 1];
-            for (int h = 0; h < rest; h++)
-            {
-                int b = e & (1 << h);
-                if (b != 0)
-                {
-                    for (int g = 0; g < a.length; g++)
-                    {
-                        result.matrix[i][g] ^= a.matrix[count][g];
-                    }
-                }
-                count++;
-            }
-
-        }
-
-        return result;
-    }
-
-    /**
-     * Compute the product of this matrix and a permutation matrix which is
-     * generated from an n-permutation.
-     *
-     * @param p the permutation
-     * @return {@link GF2Matrix} <tt>this*P</tt>
-     */
-    public Matrix rightMultiply(Permutation p)
-    {
-
-        int[] pVec = p.getVector();
-        if (pVec.length != numColumns)
-        {
-            throw new ArithmeticException("length mismatch");
-        }
-
-        GF2Matrix result = new GF2Matrix(numRows, numColumns);
-
-        for (int i = numColumns - 1; i >= 0; i--)
-        {
-            int q = i >>> 5;
-            int r = i & 0x1f;
-            int pq = pVec[i] >>> 5;
-            int pr = pVec[i] & 0x1f;
-            for (int j = numRows - 1; j >= 0; j--)
-            {
-                result.matrix[j][q] |= ((matrix[j][pq] >>> pr) & 1) << r;
-            }
-        }
-
-        return result;
-    }
-
-    /**
-     * Compute the product of this matrix and the given column vector.
-     *
-     * @param vec the vector over GF(2)
-     * @return <tt>this*vector</tt>
-     */
-    public Vector rightMultiply(Vector vec)
-    {
-        if (!(vec instanceof GF2Vector))
-        {
-            throw new ArithmeticException("vector is not defined over GF(2)");
-        }
-
-        if (vec.length != numColumns)
-        {
-            throw new ArithmeticException("length mismatch");
-        }
-
-        int[] v = ((GF2Vector)vec).getVecArray();
-        int[] res = new int[(numRows + 31) >>> 5];
-
-        for (int i = 0; i < numRows; i++)
-        {
-            // compute full word scalar products
-            int help = 0;
-            for (int j = 0; j < length; j++)
-            {
-                help ^= matrix[i][j] & v[j];
-            }
-            // compute single word scalar product
-            int bitValue = 0;
-            for (int j = 0; j < 32; j++)
-            {
-                bitValue ^= (help >>> j) & 1;
-            }
-            // set result bit
-            if (bitValue == 1)
-            {
-                res[i >>> 5] |= 1 << (i & 0x1f);
-            }
-        }
-
-        return new GF2Vector(res, numRows);
-    }
-
-    /**
-     * Compute the product of the matrix <tt>(Id | this)</tt> and a column
-     * vector, where <tt>Id</tt> is a <tt>(numRows x numRows)</tt> unit
-     * matrix.
-     *
-     * @param vec the vector over GF(2)
-     * @return <tt>(Id | this)*vector</tt>
-     */
-    public Vector rightMultiplyRightCompactForm(Vector vec)
-    {
-        if (!(vec instanceof GF2Vector))
-        {
-            throw new ArithmeticException("vector is not defined over GF(2)");
-        }
-
-        if (vec.length != numColumns + numRows)
-        {
-            throw new ArithmeticException("length mismatch");
-        }
-
-        int[] v = ((GF2Vector)vec).getVecArray();
-        int[] res = new int[(numRows + 31) >>> 5];
-
-        int q = numRows >> 5;
-        int r = numRows & 0x1f;
-
-        // for all rows
-        for (int i = 0; i < numRows; i++)
-        {
-            // get vector bit
-            int help = (v[i >> 5] >>> (i & 0x1f)) & 1;
-
-            // compute full word scalar products
-            int vInd = q;
-            // if words have to be shifted
-            if (r != 0)
-            {
-                int vw = 0;
-                // process all but last word
-                for (int j = 0; j < length - 1; j++)
-                {
-                    // shift to correct position
-                    vw = (v[vInd++] >>> r) | (v[vInd] << (32 - r));
-                    help ^= matrix[i][j] & vw;
-                }
-                // process last word
-                vw = v[vInd++] >>> r;
-                if (vInd < v.length)
-                {
-                    vw |= v[vInd] << (32 - r);
-                }
-                help ^= matrix[i][length - 1] & vw;
-            }
-            else
-            {
-                // no shifting necessary
-                for (int j = 0; j < length; j++)
-                {
-                    help ^= matrix[i][j] & v[vInd++];
-                }
-            }
-
-            // compute single word scalar product
-            int bitValue = 0;
-            for (int j = 0; j < 32; j++)
-            {
-                bitValue ^= help & 1;
-                help >>>= 1;
-            }
-
-            // set result bit
-            if (bitValue == 1)
-            {
-                res[i >> 5] |= 1 << (i & 0x1f);
-            }
-        }
-
-        return new GF2Vector(res, numRows);
-    }
-
-    /**
-     * Compare this matrix with another object.
-     *
-     * @param other another object
-     * @return the result of the comparison
-     */
-    public boolean equals(Object other)
-    {
-
-        if (!(other instanceof GF2Matrix))
-        {
-            return false;
-        }
-        GF2Matrix otherMatrix = (GF2Matrix)other;
-
-        if ((numRows != otherMatrix.numRows)
-            || (numColumns != otherMatrix.numColumns)
-            || (length != otherMatrix.length))
-        {
-            return false;
-        }
-
-        for (int i = 0; i < numRows; i++)
-        {
-            if (!IntUtils.equals(matrix[i], otherMatrix.matrix[i]))
-            {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    /**
-     * @return the hash code of this matrix
-     */
-    public int hashCode()
-    {
-        int hash = (numRows * 31 + numColumns) * 31 + length;
-        for (int i = 0; i < numRows; i++)
-        {
-            hash = hash * 31 + matrix[i].hashCode();
-        }
-        return hash;
-    }
-
-    /**
-     * @return a human readable form of the matrix
-     */
-    public String toString()
-    {
-        int rest = numColumns & 0x1f;
-        int d;
-        if (rest == 0)
-        {
-            d = length;
-        }
-        else
-        {
-            d = length - 1;
-        }
-
-        StringBuffer buf = new StringBuffer();
-        for (int i = 0; i < numRows; i++)
-        {
-            buf.append(i + ": ");
-            for (int j = 0; j < d; j++)
-            {
-                int a = matrix[i][j];
-                for (int k = 0; k < 32; k++)
-                {
-                    int b = (a >>> k) & 1;
-                    if (b == 0)
-                    {
-                        buf.append('0');
-                    }
-                    else
-                    {
-                        buf.append('1');
-                    }
-                }
-                buf.append(' ');
-            }
-            int a = matrix[i][length - 1];
-            for (int k = 0; k < rest; k++)
-            {
-                int b = (a >>> k) & 1;
-                if (b == 0)
-                {
-                    buf.append('0');
-                }
-                else
-                {
-                    buf.append('1');
-                }
-            }
-            buf.append('\n');
-        }
-
-        return buf.toString();
-    }
-
-    /**
-     * Swap two rows of the given matrix.
-     *
-     * @param matrix the matrix
-     * @param first  the index of the first row
-     * @param second the index of the second row
-     */
-    private static void swapRows(int[][] matrix, int first, int second)
-    {
-        int[] tmp = matrix[first];
-        matrix[first] = matrix[second];
-        matrix[second] = tmp;
-    }
-
-    /**
-     * Partially add one row to another.
-     *
-     * @param fromRow    the addend
-     * @param toRow      the row to add to
-     * @param startIndex the array index to start from
-     */
-    private static void addToRow(int[] fromRow, int[] toRow, int startIndex)
-    {
-        for (int i = toRow.length - 1; i >= startIndex; i--)
-        {
-            toRow[i] = fromRow[i] ^ toRow[i];
-        }
-    }
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/math/linearalgebra/GF2Polynomial.java b/bcprov/src/main/java/org/bouncycastle/pqc/math/linearalgebra/GF2Polynomial.java
deleted file mode 100644
index 445a9ea..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/math/linearalgebra/GF2Polynomial.java
+++ /dev/null
@@ -1,2039 +0,0 @@
-package org.bouncycastle.pqc.math.linearalgebra;
-
-
-import java.math.BigInteger;
-import java.util.Random;
-
-
-/**
- * This class stores very long strings of bits and does some basic arithmetics.
- * It is used by <tt>GF2nField</tt>, <tt>GF2nPolynomialField</tt> and
- * <tt>GFnPolynomialElement</tt>.
- *
- * @see GF2nPolynomialElement
- * @see GF2nField
- */
-public class GF2Polynomial
-{
-
-    // number of bits stored in this GF2Polynomial
-    private int len;
-
-    // number of int used in value
-    private int blocks;
-
-    // storage
-    private int[] value;
-
-    // Random source
-    private static Random rand = new Random();
-
-    // Lookup-Table for vectorMult: parity[a]= #1(a) mod 2 == 1
-    private static final boolean[] parity = {false, true, true, false, true,
-        false, false, true, true, false, false, true, false, true, true,
-        false, true, false, false, true, false, true, true, false, false,
-        true, true, false, true, false, false, true, true, false, false,
-        true, false, true, true, false, false, true, true, false, true,
-        false, false, true, false, true, true, false, true, false, false,
-        true, true, false, false, true, false, true, true, false, true,
-        false, false, true, false, true, true, false, false, true, true,
-        false, true, false, false, true, false, true, true, false, true,
-        false, false, true, true, false, false, true, false, true, true,
-        false, false, true, true, false, true, false, false, true, true,
-        false, false, true, false, true, true, false, true, false, false,
-        true, false, true, true, false, false, true, true, false, true,
-        false, false, true, true, false, false, true, false, true, true,
-        false, false, true, true, false, true, false, false, true, false,
-        true, true, false, true, false, false, true, true, false, false,
-        true, false, true, true, false, false, true, true, false, true,
-        false, false, true, true, false, false, true, false, true, true,
-        false, true, false, false, true, false, true, true, false, false,
-        true, true, false, true, false, false, true, false, true, true,
-        false, true, false, false, true, true, false, false, true, false,
-        true, true, false, true, false, false, true, false, true, true,
-        false, false, true, true, false, true, false, false, true, true,
-        false, false, true, false, true, true, false, false, true, true,
-        false, true, false, false, true, false, true, true, false, true,
-        false, false, true, true, false, false, true, false, true, true,
-        false};
-
-    // Lookup-Table for Squaring: squaringTable[a]=a^2
-    private static final short[] squaringTable = {0x0000, 0x0001, 0x0004,
-        0x0005, 0x0010, 0x0011, 0x0014, 0x0015, 0x0040, 0x0041, 0x0044,
-        0x0045, 0x0050, 0x0051, 0x0054, 0x0055, 0x0100, 0x0101, 0x0104,
-        0x0105, 0x0110, 0x0111, 0x0114, 0x0115, 0x0140, 0x0141, 0x0144,
-        0x0145, 0x0150, 0x0151, 0x0154, 0x0155, 0x0400, 0x0401, 0x0404,
-        0x0405, 0x0410, 0x0411, 0x0414, 0x0415, 0x0440, 0x0441, 0x0444,
-        0x0445, 0x0450, 0x0451, 0x0454, 0x0455, 0x0500, 0x0501, 0x0504,
-        0x0505, 0x0510, 0x0511, 0x0514, 0x0515, 0x0540, 0x0541, 0x0544,
-        0x0545, 0x0550, 0x0551, 0x0554, 0x0555, 0x1000, 0x1001, 0x1004,
-        0x1005, 0x1010, 0x1011, 0x1014, 0x1015, 0x1040, 0x1041, 0x1044,
-        0x1045, 0x1050, 0x1051, 0x1054, 0x1055, 0x1100, 0x1101, 0x1104,
-        0x1105, 0x1110, 0x1111, 0x1114, 0x1115, 0x1140, 0x1141, 0x1144,
-        0x1145, 0x1150, 0x1151, 0x1154, 0x1155, 0x1400, 0x1401, 0x1404,
-        0x1405, 0x1410, 0x1411, 0x1414, 0x1415, 0x1440, 0x1441, 0x1444,
-        0x1445, 0x1450, 0x1451, 0x1454, 0x1455, 0x1500, 0x1501, 0x1504,
-        0x1505, 0x1510, 0x1511, 0x1514, 0x1515, 0x1540, 0x1541, 0x1544,
-        0x1545, 0x1550, 0x1551, 0x1554, 0x1555, 0x4000, 0x4001, 0x4004,
-        0x4005, 0x4010, 0x4011, 0x4014, 0x4015, 0x4040, 0x4041, 0x4044,
-        0x4045, 0x4050, 0x4051, 0x4054, 0x4055, 0x4100, 0x4101, 0x4104,
-        0x4105, 0x4110, 0x4111, 0x4114, 0x4115, 0x4140, 0x4141, 0x4144,
-        0x4145, 0x4150, 0x4151, 0x4154, 0x4155, 0x4400, 0x4401, 0x4404,
-        0x4405, 0x4410, 0x4411, 0x4414, 0x4415, 0x4440, 0x4441, 0x4444,
-        0x4445, 0x4450, 0x4451, 0x4454, 0x4455, 0x4500, 0x4501, 0x4504,
-        0x4505, 0x4510, 0x4511, 0x4514, 0x4515, 0x4540, 0x4541, 0x4544,
-        0x4545, 0x4550, 0x4551, 0x4554, 0x4555, 0x5000, 0x5001, 0x5004,
-        0x5005, 0x5010, 0x5011, 0x5014, 0x5015, 0x5040, 0x5041, 0x5044,
-        0x5045, 0x5050, 0x5051, 0x5054, 0x5055, 0x5100, 0x5101, 0x5104,
-        0x5105, 0x5110, 0x5111, 0x5114, 0x5115, 0x5140, 0x5141, 0x5144,
-        0x5145, 0x5150, 0x5151, 0x5154, 0x5155, 0x5400, 0x5401, 0x5404,
-        0x5405, 0x5410, 0x5411, 0x5414, 0x5415, 0x5440, 0x5441, 0x5444,
-        0x5445, 0x5450, 0x5451, 0x5454, 0x5455, 0x5500, 0x5501, 0x5504,
-        0x5505, 0x5510, 0x5511, 0x5514, 0x5515, 0x5540, 0x5541, 0x5544,
-        0x5545, 0x5550, 0x5551, 0x5554, 0x5555};
-
-    // pre-computed Bitmask for fast masking, bitMask[a]=0x1 << a
-    private static final int[] bitMask = {0x00000001, 0x00000002, 0x00000004,
-        0x00000008, 0x00000010, 0x00000020, 0x00000040, 0x00000080,
-        0x00000100, 0x00000200, 0x00000400, 0x00000800, 0x00001000,
-        0x00002000, 0x00004000, 0x00008000, 0x00010000, 0x00020000,
-        0x00040000, 0x00080000, 0x00100000, 0x00200000, 0x00400000,
-        0x00800000, 0x01000000, 0x02000000, 0x04000000, 0x08000000,
-        0x10000000, 0x20000000, 0x40000000, 0x80000000, 0x00000000};
-
-    // pre-computed Bitmask for fast masking, rightMask[a]=0xffffffff >>> (32-a)
-    private static final int[] reverseRightMask = {0x00000000, 0x00000001,
-        0x00000003, 0x00000007, 0x0000000f, 0x0000001f, 0x0000003f,
-        0x0000007f, 0x000000ff, 0x000001ff, 0x000003ff, 0x000007ff,
-        0x00000fff, 0x00001fff, 0x00003fff, 0x00007fff, 0x0000ffff,
-        0x0001ffff, 0x0003ffff, 0x0007ffff, 0x000fffff, 0x001fffff,
-        0x003fffff, 0x007fffff, 0x00ffffff, 0x01ffffff, 0x03ffffff,
-        0x07ffffff, 0x0fffffff, 0x1fffffff, 0x3fffffff, 0x7fffffff,
-        0xffffffff};
-
-    /**
-     * Creates a new GF2Polynomial of the given <i>length</i> and value zero.
-     *
-     * @param length the desired number of bits to store
-     */
-    public GF2Polynomial(int length)
-    {
-        int l = length;
-        if (l < 1)
-        {
-            l = 1;
-        }
-        blocks = ((l - 1) >> 5) + 1;
-        value = new int[blocks];
-        len = l;
-    }
-
-    /**
-     * Creates a new GF2Polynomial of the given <i>length</i> and random value.
-     *
-     * @param length the desired number of bits to store
-     * @param rand   SecureRandom to use for randomization
-     */
-    public GF2Polynomial(int length, Random rand)
-    {
-        int l = length;
-        if (l < 1)
-        {
-            l = 1;
-        }
-        blocks = ((l - 1) >> 5) + 1;
-        value = new int[blocks];
-        len = l;
-        randomize(rand);
-    }
-
-    /**
-     * Creates a new GF2Polynomial of the given <i>length</i> and value
-     * selected by <i>value</i>:
-     * <UL>
-     * <LI>ZERO</LI>
-     * <LI>ONE</LI>
-     * <LI>RANDOM</LI>
-     * <LI>X</LI>
-     * <LI>ALL</LI>
-     * </UL>
-     *
-     * @param length the desired number of bits to store
-     * @param value  the value described by a String
-     */
-    public GF2Polynomial(int length, String value)
-    {
-        int l = length;
-        if (l < 1)
-        {
-            l = 1;
-        }
-        blocks = ((l - 1) >> 5) + 1;
-        this.value = new int[blocks];
-        len = l;
-        if (value.equalsIgnoreCase("ZERO"))
-        {
-            assignZero();
-        }
-        else if (value.equalsIgnoreCase("ONE"))
-        {
-            assignOne();
-        }
-        else if (value.equalsIgnoreCase("RANDOM"))
-        {
-            randomize();
-        }
-        else if (value.equalsIgnoreCase("X"))
-        {
-            assignX();
-        }
-        else if (value.equalsIgnoreCase("ALL"))
-        {
-            assignAll();
-        }
-        else
-        {
-            throw new IllegalArgumentException(
-                "Error: GF2Polynomial was called using " + value
-                    + " as value!");
-        }
-
-    }
-
-    /**
-     * Creates a new GF2Polynomial of the given <i>length</i> using the given
-     * int[]. LSB is contained in bs[0].
-     *
-     * @param length the desired number of bits to store
-     * @param bs     contains the desired value, LSB in bs[0]
-     */
-    public GF2Polynomial(int length, int[] bs)
-    {
-        int leng = length;
-        if (leng < 1)
-        {
-            leng = 1;
-        }
-        blocks = ((leng - 1) >> 5) + 1;
-        value = new int[blocks];
-        len = leng;
-        int l = Math.min(blocks, bs.length);
-        System.arraycopy(bs, 0, value, 0, l);
-        zeroUnusedBits();
-    }
-
-    /**
-     * Creates a new GF2Polynomial by converting the given byte[] <i>os</i>
-     * according to 1363 and using the given <i>length</i>.
-     *
-     * @param length the intended length of this polynomial
-     * @param os     the octet string to assign to this polynomial
-     * @see "P1363 5.5.2 p22f, OS2BSP"
-     */
-    public GF2Polynomial(int length, byte[] os)
-    {
-        int l = length;
-        if (l < 1)
-        {
-            l = 1;
-        }
-        blocks = ((l - 1) >> 5) + 1;
-        value = new int[blocks];
-        len = l;
-        int i, m;
-        int k = Math.min(((os.length - 1) >> 2) + 1, blocks);
-        for (i = 0; i < k - 1; i++)
-        {
-            m = os.length - (i << 2) - 1;
-            value[i] = (os[m]) & 0x000000ff;
-            value[i] |= (os[m - 1] << 8) & 0x0000ff00;
-            value[i] |= (os[m - 2] << 16) & 0x00ff0000;
-            value[i] |= (os[m - 3] << 24) & 0xff000000;
-        }
-        i = k - 1;
-        m = os.length - (i << 2) - 1;
-        value[i] = os[m] & 0x000000ff;
-        if (m > 0)
-        {
-            value[i] |= (os[m - 1] << 8) & 0x0000ff00;
-        }
-        if (m > 1)
-        {
-            value[i] |= (os[m - 2] << 16) & 0x00ff0000;
-        }
-        if (m > 2)
-        {
-            value[i] |= (os[m - 3] << 24) & 0xff000000;
-        }
-        zeroUnusedBits();
-        reduceN();
-    }
-
-    /**
-     * Creates a new GF2Polynomial by converting the given FlexiBigInt <i>bi</i>
-     * according to 1363 and using the given <i>length</i>.
-     *
-     * @param length the intended length of this polynomial
-     * @param bi     the FlexiBigInt to assign to this polynomial
-     * @see "P1363 5.5.1 p22, I2BSP"
-     */
-    public GF2Polynomial(int length, BigInteger bi)
-    {
-        int l = length;
-        if (l < 1)
-        {
-            l = 1;
-        }
-        blocks = ((l - 1) >> 5) + 1;
-        value = new int[blocks];
-        len = l;
-        int i;
-        byte[] val = bi.toByteArray();
-        if (val[0] == 0)
-        {
-            byte[] dummy = new byte[val.length - 1];
-            System.arraycopy(val, 1, dummy, 0, dummy.length);
-            val = dummy;
-        }
-        int ov = val.length & 0x03;
-        int k = ((val.length - 1) >> 2) + 1;
-        for (i = 0; i < ov; i++)
-        {
-            value[k - 1] |= (val[i] & 0x000000ff) << ((ov - 1 - i) << 3);
-        }
-        int m = 0;
-        for (i = 0; i <= (val.length - 4) >> 2; i++)
-        {
-            m = val.length - 1 - (i << 2);
-            value[i] = (val[m]) & 0x000000ff;
-            value[i] |= ((val[m - 1]) << 8) & 0x0000ff00;
-            value[i] |= ((val[m - 2]) << 16) & 0x00ff0000;
-            value[i] |= ((val[m - 3]) << 24) & 0xff000000;
-        }
-        if ((len & 0x1f) != 0)
-        {
-            value[blocks - 1] &= reverseRightMask[len & 0x1f];
-        }
-        reduceN();
-    }
-
-    /**
-     * Creates a new GF2Polynomial by cloneing the given GF2Polynomial <i>b</i>.
-     *
-     * @param b the GF2Polynomial to clone
-     */
-    public GF2Polynomial(GF2Polynomial b)
-    {
-        len = b.len;
-        blocks = b.blocks;
-        value = IntUtils.clone(b.value);
-    }
-
-    /**
-     * @return a copy of this GF2Polynomial
-     */
-    public Object clone()
-    {
-        return new GF2Polynomial(this);
-    }
-
-    /**
-     * Returns the length of this GF2Polynomial. The length can be greater than
-     * the degree. To get the degree call reduceN() before calling getLength().
-     *
-     * @return the length of this GF2Polynomial
-     */
-    public int getLength()
-    {
-        return len;
-    }
-
-    /**
-     * Returns the value of this GF2Polynomial in an int[].
-     *
-     * @return the value of this GF2Polynomial in a new int[], LSB in int[0]
-     */
-    public int[] toIntegerArray()
-    {
-        int[] result;
-        result = new int[blocks];
-        System.arraycopy(value, 0, result, 0, blocks);
-        return result;
-    }
-
-    /**
-     * Returns a string representing this GF2Polynomials value using hexadecimal
-     * or binary radix in MSB-first order.
-     *
-     * @param radix the radix to use (2 or 16, otherwise 2 is used)
-     * @return a String representing this GF2Polynomials value.
-     */
-    public String toString(int radix)
-    {
-        final char[] HEX_CHARS = {'0', '1', '2', '3', '4', '5', '6', '7', '8',
-            '9', 'a', 'b', 'c', 'd', 'e', 'f'};
-        final String[] BIN_CHARS = {"0000", "0001", "0010", "0011", "0100",
-            "0101", "0110", "0111", "1000", "1001", "1010", "1011", "1100",
-            "1101", "1110", "1111"};
-        String res;
-        int i;
-        res = new String();
-        if (radix == 16)
-        {
-            for (i = blocks - 1; i >= 0; i--)
-            {
-                res += HEX_CHARS[(value[i] >>> 28) & 0x0f];
-                res += HEX_CHARS[(value[i] >>> 24) & 0x0f];
-                res += HEX_CHARS[(value[i] >>> 20) & 0x0f];
-                res += HEX_CHARS[(value[i] >>> 16) & 0x0f];
-                res += HEX_CHARS[(value[i] >>> 12) & 0x0f];
-                res += HEX_CHARS[(value[i] >>> 8) & 0x0f];
-                res += HEX_CHARS[(value[i] >>> 4) & 0x0f];
-                res += HEX_CHARS[(value[i]) & 0x0f];
-                res += " ";
-            }
-        }
-        else
-        {
-            for (i = blocks - 1; i >= 0; i--)
-            {
-                res += BIN_CHARS[(value[i] >>> 28) & 0x0f];
-                res += BIN_CHARS[(value[i] >>> 24) & 0x0f];
-                res += BIN_CHARS[(value[i] >>> 20) & 0x0f];
-                res += BIN_CHARS[(value[i] >>> 16) & 0x0f];
-                res += BIN_CHARS[(value[i] >>> 12) & 0x0f];
-                res += BIN_CHARS[(value[i] >>> 8) & 0x0f];
-                res += BIN_CHARS[(value[i] >>> 4) & 0x0f];
-                res += BIN_CHARS[(value[i]) & 0x0f];
-                res += " ";
-            }
-        }
-        return res;
-    }
-
-    /**
-     * Converts this polynomial to a byte[] (octet string) according to 1363.
-     *
-     * @return a byte[] representing the value of this polynomial
-     * @see "P1363 5.5.2 p22f, BS2OSP"
-     */
-    public byte[] toByteArray()
-    {
-        int k = ((len - 1) >> 3) + 1;
-        int ov = k & 0x03;
-        int m;
-        byte[] res = new byte[k];
-        int i;
-        for (i = 0; i < (k >> 2); i++)
-        {
-            m = k - (i << 2) - 1;
-            res[m] = (byte)((value[i] & 0x000000ff));
-            res[m - 1] = (byte)((value[i] & 0x0000ff00) >>> 8);
-            res[m - 2] = (byte)((value[i] & 0x00ff0000) >>> 16);
-            res[m - 3] = (byte)((value[i] & 0xff000000) >>> 24);
-        }
-        for (i = 0; i < ov; i++)
-        {
-            m = (ov - i - 1) << 3;
-            res[i] = (byte)((value[blocks - 1] & (0x000000ff << m)) >>> m);
-        }
-        return res;
-    }
-
-    /**
-     * Converts this polynomial to an integer according to 1363.
-     *
-     * @return a FlexiBigInt representing the value of this polynomial
-     * @see "P1363 5.5.1 p22, BS2IP"
-     */
-    public BigInteger toFlexiBigInt()
-    {
-        if (len == 0 || isZero())
-        {
-            return new BigInteger(0, new byte[0]);
-        }
-        return new BigInteger(1, toByteArray());
-    }
-
-    /**
-     * Sets the LSB to 1 and all other to 0, assigning 'one' to this
-     * GF2Polynomial.
-     */
-    public void assignOne()
-    {
-        int i;
-        for (i = 1; i < blocks; i++)
-        {
-            value[i] = 0x00;
-        }
-        value[0] = 0x01;
-    }
-
-    /**
-     * Sets Bit 1 to 1 and all other to 0, assigning 'x' to this GF2Polynomial.
-     */
-    public void assignX()
-    {
-        int i;
-        for (i = 1; i < blocks; i++)
-        {
-            value[i] = 0x00;
-        }
-        value[0] = 0x02;
-    }
-
-    /**
-     * Sets all Bits to 1.
-     */
-    public void assignAll()
-    {
-        int i;
-        for (i = 0; i < blocks; i++)
-        {
-            value[i] = 0xffffffff;
-        }
-        zeroUnusedBits();
-    }
-
-    /**
-     * Resets all bits to zero.
-     */
-    public void assignZero()
-    {
-        int i;
-        for (i = 0; i < blocks; i++)
-        {
-            value[i] = 0x00;
-        }
-    }
-
-    /**
-     * Fills all len bits of this GF2Polynomial with random values.
-     */
-    public void randomize()
-    {
-        int i;
-        for (i = 0; i < blocks; i++)
-        {
-            value[i] = rand.nextInt();
-        }
-        zeroUnusedBits();
-    }
-
-    /**
-     * Fills all len bits of this GF2Polynomial with random values using the
-     * specified source of randomness.
-     *
-     * @param rand the source of randomness
-     */
-    public void randomize(Random rand)
-    {
-        int i;
-        for (i = 0; i < blocks; i++)
-        {
-            value[i] = rand.nextInt();
-        }
-        zeroUnusedBits();
-    }
-
-    /**
-     * Returns true if two GF2Polynomials have the same size and value and thus
-     * are equal.
-     *
-     * @param other the other GF2Polynomial
-     * @return true if this GF2Polynomial equals <i>b</i> (<i>this</i> ==
-     *         <i>b</i>)
-     */
-    public boolean equals(Object other)
-    {
-        if (other == null || !(other instanceof GF2Polynomial))
-        {
-            return false;
-        }
-
-        GF2Polynomial otherPol = (GF2Polynomial)other;
-
-        if (len != otherPol.len)
-        {
-            return false;
-        }
-        for (int i = 0; i < blocks; i++)
-        {
-            if (value[i] != otherPol.value[i])
-            {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    /**
-     * @return the hash code of this polynomial
-     */
-    public int hashCode()
-    {
-        return len + value.hashCode();
-    }
-
-    /**
-     * Tests if all bits equal zero.
-     *
-     * @return true if this GF2Polynomial equals 'zero' (<i>this</i> == 0)
-     */
-    public boolean isZero()
-    {
-        int i;
-        if (len == 0)
-        {
-            return true;
-        }
-        for (i = 0; i < blocks; i++)
-        {
-            if (value[i] != 0)
-            {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    /**
-     * Tests if all bits are reset to 0 and LSB is set to 1.
-     *
-     * @return true if this GF2Polynomial equals 'one' (<i>this</i> == 1)
-     */
-    public boolean isOne()
-    {
-        int i;
-        for (i = 1; i < blocks; i++)
-        {
-            if (value[i] != 0)
-            {
-                return false;
-            }
-        }
-        if (value[0] != 0x01)
-        {
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * Adds <i>b</i> to this GF2Polynomial and assigns the result to this
-     * GF2Polynomial. <i>b</i> can be of different size.
-     *
-     * @param b GF2Polynomial to add to this GF2Polynomial
-     */
-    public void addToThis(GF2Polynomial b)
-    {
-        expandN(b.len);
-        xorThisBy(b);
-    }
-
-    /**
-     * Adds two GF2Polynomials, <i>this</i> and <i>b</i>, and returns the
-     * result. <i>this</i> and <i>b</i> can be of different size.
-     *
-     * @param b a GF2Polynomial
-     * @return a new GF2Polynomial (<i>this</i> + <i>b</i>)
-     */
-    public GF2Polynomial add(GF2Polynomial b)
-    {
-        return xor(b);
-    }
-
-    /**
-     * Subtracts <i>b</i> from this GF2Polynomial and assigns the result to
-     * this GF2Polynomial. <i>b</i> can be of different size.
-     *
-     * @param b a GF2Polynomial
-     */
-    public void subtractFromThis(GF2Polynomial b)
-    {
-        expandN(b.len);
-        xorThisBy(b);
-    }
-
-    /**
-     * Subtracts two GF2Polynomials, <i>this</i> and <i>b</i>, and returns the
-     * result in a new GF2Polynomial. <i>this</i> and <i>b</i> can be of
-     * different size.
-     *
-     * @param b a GF2Polynomial
-     * @return a new GF2Polynomial (<i>this</i> - <i>b</i>)
-     */
-    public GF2Polynomial subtract(GF2Polynomial b)
-    {
-        return xor(b);
-    }
-
-    /**
-     * Toggles the LSB of this GF2Polynomial, increasing its value by 'one'.
-     */
-    public void increaseThis()
-    {
-        xorBit(0);
-    }
-
-    /**
-     * Toggles the LSB of this GF2Polynomial, increasing the value by 'one' and
-     * returns the result in a new GF2Polynomial.
-     *
-     * @return <tt>this + 1</tt>
-     */
-    public GF2Polynomial increase()
-    {
-        GF2Polynomial result = new GF2Polynomial(this);
-        result.increaseThis();
-        return result;
-    }
-
-    /**
-     * Multiplies this GF2Polynomial with <i>b</i> and returns the result in a
-     * new GF2Polynomial. This method does not reduce the result in GF(2^N).
-     * This method uses classic multiplication (schoolbook).
-     *
-     * @param b a GF2Polynomial
-     * @return a new GF2Polynomial (<i>this</i> * <i>b</i>)
-     */
-    public GF2Polynomial multiplyClassic(GF2Polynomial b)
-    {
-        GF2Polynomial result = new GF2Polynomial(Math.max(len, b.len) << 1);
-        GF2Polynomial[] m = new GF2Polynomial[32];
-        int i, j;
-        m[0] = new GF2Polynomial(this);
-        for (i = 1; i <= 31; i++)
-        {
-            m[i] = m[i - 1].shiftLeft();
-        }
-        for (i = 0; i < b.blocks; i++)
-        {
-            for (j = 0; j <= 31; j++)
-            {
-                if ((b.value[i] & bitMask[j]) != 0)
-                {
-                    result.xorThisBy(m[j]);
-                }
-            }
-            for (j = 0; j <= 31; j++)
-            {
-                m[j].shiftBlocksLeft();
-            }
-        }
-        return result;
-    }
-
-    /**
-     * Multiplies this GF2Polynomial with <i>b</i> and returns the result in a
-     * new GF2Polynomial. This method does not reduce the result in GF(2^N).
-     * This method uses Karatzuba multiplication.
-     *
-     * @param b a GF2Polynomial
-     * @return a new GF2Polynomial (<i>this</i> * <i>b</i>)
-     */
-    public GF2Polynomial multiply(GF2Polynomial b)
-    {
-        int n = Math.max(len, b.len);
-        expandN(n);
-        b.expandN(n);
-        return karaMult(b);
-    }
-
-    /**
-     * Does the recursion for Karatzuba multiplication.
-     */
-    private GF2Polynomial karaMult(GF2Polynomial b)
-    {
-        GF2Polynomial result = new GF2Polynomial(len << 1);
-        if (len <= 32)
-        {
-            result.value = mult32(value[0], b.value[0]);
-            return result;
-        }
-        if (len <= 64)
-        {
-            result.value = mult64(value, b.value);
-            return result;
-        }
-        if (len <= 128)
-        {
-            result.value = mult128(value, b.value);
-            return result;
-        }
-        if (len <= 256)
-        {
-            result.value = mult256(value, b.value);
-            return result;
-        }
-        if (len <= 512)
-        {
-            result.value = mult512(value, b.value);
-            return result;
-        }
-
-        int n = IntegerFunctions.floorLog(len - 1);
-        n = bitMask[n];
-
-        GF2Polynomial a0 = lower(((n - 1) >> 5) + 1);
-        GF2Polynomial a1 = upper(((n - 1) >> 5) + 1);
-        GF2Polynomial b0 = b.lower(((n - 1) >> 5) + 1);
-        GF2Polynomial b1 = b.upper(((n - 1) >> 5) + 1);
-
-        GF2Polynomial c = a1.karaMult(b1); // c = a1*b1
-        GF2Polynomial e = a0.karaMult(b0); // e = a0*b0
-        a0.addToThis(a1); // a0 = a0 + a1
-        b0.addToThis(b1); // b0 = b0 + b1
-        GF2Polynomial d = a0.karaMult(b0); // d = (a0+a1)*(b0+b1)
-
-        result.shiftLeftAddThis(c, n << 1);
-        result.shiftLeftAddThis(c, n);
-        result.shiftLeftAddThis(d, n);
-        result.shiftLeftAddThis(e, n);
-        result.addToThis(e);
-        return result;
-    }
-
-    /**
-     * 16-Integer Version of Karatzuba multiplication.
-     */
-    private static int[] mult512(int[] a, int[] b)
-    {
-        int[] result = new int[32];
-        int[] a0 = new int[8];
-        System.arraycopy(a, 0, a0, 0, Math.min(8, a.length));
-        int[] a1 = new int[8];
-        if (a.length > 8)
-        {
-            System.arraycopy(a, 8, a1, 0, Math.min(8, a.length - 8));
-        }
-        int[] b0 = new int[8];
-        System.arraycopy(b, 0, b0, 0, Math.min(8, b.length));
-        int[] b1 = new int[8];
-        if (b.length > 8)
-        {
-            System.arraycopy(b, 8, b1, 0, Math.min(8, b.length - 8));
-        }
-        int[] c = mult256(a1, b1);
-        result[31] ^= c[15];
-        result[30] ^= c[14];
-        result[29] ^= c[13];
-        result[28] ^= c[12];
-        result[27] ^= c[11];
-        result[26] ^= c[10];
-        result[25] ^= c[9];
-        result[24] ^= c[8];
-        result[23] ^= c[7] ^ c[15];
-        result[22] ^= c[6] ^ c[14];
-        result[21] ^= c[5] ^ c[13];
-        result[20] ^= c[4] ^ c[12];
-        result[19] ^= c[3] ^ c[11];
-        result[18] ^= c[2] ^ c[10];
-        result[17] ^= c[1] ^ c[9];
-        result[16] ^= c[0] ^ c[8];
-        result[15] ^= c[7];
-        result[14] ^= c[6];
-        result[13] ^= c[5];
-        result[12] ^= c[4];
-        result[11] ^= c[3];
-        result[10] ^= c[2];
-        result[9] ^= c[1];
-        result[8] ^= c[0];
-        a1[0] ^= a0[0];
-        a1[1] ^= a0[1];
-        a1[2] ^= a0[2];
-        a1[3] ^= a0[3];
-        a1[4] ^= a0[4];
-        a1[5] ^= a0[5];
-        a1[6] ^= a0[6];
-        a1[7] ^= a0[7];
-        b1[0] ^= b0[0];
-        b1[1] ^= b0[1];
-        b1[2] ^= b0[2];
-        b1[3] ^= b0[3];
-        b1[4] ^= b0[4];
-        b1[5] ^= b0[5];
-        b1[6] ^= b0[6];
-        b1[7] ^= b0[7];
-        int[] d = mult256(a1, b1);
-        result[23] ^= d[15];
-        result[22] ^= d[14];
-        result[21] ^= d[13];
-        result[20] ^= d[12];
-        result[19] ^= d[11];
-        result[18] ^= d[10];
-        result[17] ^= d[9];
-        result[16] ^= d[8];
-        result[15] ^= d[7];
-        result[14] ^= d[6];
-        result[13] ^= d[5];
-        result[12] ^= d[4];
-        result[11] ^= d[3];
-        result[10] ^= d[2];
-        result[9] ^= d[1];
-        result[8] ^= d[0];
-        int[] e = mult256(a0, b0);
-        result[23] ^= e[15];
-        result[22] ^= e[14];
-        result[21] ^= e[13];
-        result[20] ^= e[12];
-        result[19] ^= e[11];
-        result[18] ^= e[10];
-        result[17] ^= e[9];
-        result[16] ^= e[8];
-        result[15] ^= e[7] ^ e[15];
-        result[14] ^= e[6] ^ e[14];
-        result[13] ^= e[5] ^ e[13];
-        result[12] ^= e[4] ^ e[12];
-        result[11] ^= e[3] ^ e[11];
-        result[10] ^= e[2] ^ e[10];
-        result[9] ^= e[1] ^ e[9];
-        result[8] ^= e[0] ^ e[8];
-        result[7] ^= e[7];
-        result[6] ^= e[6];
-        result[5] ^= e[5];
-        result[4] ^= e[4];
-        result[3] ^= e[3];
-        result[2] ^= e[2];
-        result[1] ^= e[1];
-        result[0] ^= e[0];
-        return result;
-    }
-
-    /**
-     * 8-Integer Version of Karatzuba multiplication.
-     */
-    private static int[] mult256(int[] a, int[] b)
-    {
-        int[] result = new int[16];
-        int[] a0 = new int[4];
-        System.arraycopy(a, 0, a0, 0, Math.min(4, a.length));
-        int[] a1 = new int[4];
-        if (a.length > 4)
-        {
-            System.arraycopy(a, 4, a1, 0, Math.min(4, a.length - 4));
-        }
-        int[] b0 = new int[4];
-        System.arraycopy(b, 0, b0, 0, Math.min(4, b.length));
-        int[] b1 = new int[4];
-        if (b.length > 4)
-        {
-            System.arraycopy(b, 4, b1, 0, Math.min(4, b.length - 4));
-        }
-        if (a1[3] == 0 && a1[2] == 0 && b1[3] == 0 && b1[2] == 0)
-        {
-            if (a1[1] == 0 && b1[1] == 0)
-            {
-                if (a1[0] != 0 || b1[0] != 0)
-                { // [3]=[2]=[1]=0, [0]!=0
-                    int[] c = mult32(a1[0], b1[0]);
-                    result[9] ^= c[1];
-                    result[8] ^= c[0];
-                    result[5] ^= c[1];
-                    result[4] ^= c[0];
-                }
-            }
-            else
-            { // [3]=[2]=0 [1]!=0, [0]!=0
-                int[] c = mult64(a1, b1);
-                result[11] ^= c[3];
-                result[10] ^= c[2];
-                result[9] ^= c[1];
-                result[8] ^= c[0];
-                result[7] ^= c[3];
-                result[6] ^= c[2];
-                result[5] ^= c[1];
-                result[4] ^= c[0];
-            }
-        }
-        else
-        { // [3]!=0 [2]!=0 [1]!=0, [0]!=0
-            int[] c = mult128(a1, b1);
-            result[15] ^= c[7];
-            result[14] ^= c[6];
-            result[13] ^= c[5];
-            result[12] ^= c[4];
-            result[11] ^= c[3] ^ c[7];
-            result[10] ^= c[2] ^ c[6];
-            result[9] ^= c[1] ^ c[5];
-            result[8] ^= c[0] ^ c[4];
-            result[7] ^= c[3];
-            result[6] ^= c[2];
-            result[5] ^= c[1];
-            result[4] ^= c[0];
-        }
-        a1[0] ^= a0[0];
-        a1[1] ^= a0[1];
-        a1[2] ^= a0[2];
-        a1[3] ^= a0[3];
-        b1[0] ^= b0[0];
-        b1[1] ^= b0[1];
-        b1[2] ^= b0[2];
-        b1[3] ^= b0[3];
-        int[] d = mult128(a1, b1);
-        result[11] ^= d[7];
-        result[10] ^= d[6];
-        result[9] ^= d[5];
-        result[8] ^= d[4];
-        result[7] ^= d[3];
-        result[6] ^= d[2];
-        result[5] ^= d[1];
-        result[4] ^= d[0];
-        int[] e = mult128(a0, b0);
-        result[11] ^= e[7];
-        result[10] ^= e[6];
-        result[9] ^= e[5];
-        result[8] ^= e[4];
-        result[7] ^= e[3] ^ e[7];
-        result[6] ^= e[2] ^ e[6];
-        result[5] ^= e[1] ^ e[5];
-        result[4] ^= e[0] ^ e[4];
-        result[3] ^= e[3];
-        result[2] ^= e[2];
-        result[1] ^= e[1];
-        result[0] ^= e[0];
-        return result;
-    }
-
-    /**
-     * 4-Integer Version of Karatzuba multiplication.
-     */
-    private static int[] mult128(int[] a, int[] b)
-    {
-        int[] result = new int[8];
-        int[] a0 = new int[2];
-        System.arraycopy(a, 0, a0, 0, Math.min(2, a.length));
-        int[] a1 = new int[2];
-        if (a.length > 2)
-        {
-            System.arraycopy(a, 2, a1, 0, Math.min(2, a.length - 2));
-        }
-        int[] b0 = new int[2];
-        System.arraycopy(b, 0, b0, 0, Math.min(2, b.length));
-        int[] b1 = new int[2];
-        if (b.length > 2)
-        {
-            System.arraycopy(b, 2, b1, 0, Math.min(2, b.length - 2));
-        }
-        if (a1[1] == 0 && b1[1] == 0)
-        {
-            if (a1[0] != 0 || b1[0] != 0)
-            {
-                int[] c = mult32(a1[0], b1[0]);
-                result[5] ^= c[1];
-                result[4] ^= c[0];
-                result[3] ^= c[1];
-                result[2] ^= c[0];
-            }
-        }
-        else
-        {
-            int[] c = mult64(a1, b1);
-            result[7] ^= c[3];
-            result[6] ^= c[2];
-            result[5] ^= c[1] ^ c[3];
-            result[4] ^= c[0] ^ c[2];
-            result[3] ^= c[1];
-            result[2] ^= c[0];
-        }
-        a1[0] ^= a0[0];
-        a1[1] ^= a0[1];
-        b1[0] ^= b0[0];
-        b1[1] ^= b0[1];
-        if (a1[1] == 0 && b1[1] == 0)
-        {
-            int[] d = mult32(a1[0], b1[0]);
-            result[3] ^= d[1];
-            result[2] ^= d[0];
-        }
-        else
-        {
-            int[] d = mult64(a1, b1);
-            result[5] ^= d[3];
-            result[4] ^= d[2];
-            result[3] ^= d[1];
-            result[2] ^= d[0];
-        }
-        if (a0[1] == 0 && b0[1] == 0)
-        {
-            int[] e = mult32(a0[0], b0[0]);
-            result[3] ^= e[1];
-            result[2] ^= e[0];
-            result[1] ^= e[1];
-            result[0] ^= e[0];
-        }
-        else
-        {
-            int[] e = mult64(a0, b0);
-            result[5] ^= e[3];
-            result[4] ^= e[2];
-            result[3] ^= e[1] ^ e[3];
-            result[2] ^= e[0] ^ e[2];
-            result[1] ^= e[1];
-            result[0] ^= e[0];
-        }
-        return result;
-    }
-
-    /**
-     * 2-Integer Version of Karatzuba multiplication.
-     */
-    private static int[] mult64(int[] a, int[] b)
-    {
-        int[] result = new int[4];
-        int a0 = a[0];
-        int a1 = 0;
-        if (a.length > 1)
-        {
-            a1 = a[1];
-        }
-        int b0 = b[0];
-        int b1 = 0;
-        if (b.length > 1)
-        {
-            b1 = b[1];
-        }
-        if (a1 != 0 || b1 != 0)
-        {
-            int[] c = mult32(a1, b1);
-            result[3] ^= c[1];
-            result[2] ^= c[0] ^ c[1];
-            result[1] ^= c[0];
-        }
-        int[] d = mult32(a0 ^ a1, b0 ^ b1);
-        result[2] ^= d[1];
-        result[1] ^= d[0];
-        int[] e = mult32(a0, b0);
-        result[2] ^= e[1];
-        result[1] ^= e[0] ^ e[1];
-        result[0] ^= e[0];
-        return result;
-    }
-
-    /**
-     * 4-Byte Version of Karatzuba multiplication. Here the actual work is done.
-     */
-    private static int[] mult32(int a, int b)
-    {
-        int[] result = new int[2];
-        if (a == 0 || b == 0)
-        {
-            return result;
-        }
-        long b2 = b;
-        b2 &= 0x00000000ffffffffL;
-        int i;
-        long h = 0;
-        for (i = 1; i <= 32; i++)
-        {
-            if ((a & bitMask[i - 1]) != 0)
-            {
-                h ^= b2;
-            }
-            b2 <<= 1;
-        }
-        result[1] = (int)(h >>> 32);
-        result[0] = (int)(h & 0x00000000ffffffffL);
-        return result;
-    }
-
-    /**
-     * Returns a new GF2Polynomial containing the upper <i>k</i> bytes of this
-     * GF2Polynomial.
-     *
-     * @param k
-     * @return a new GF2Polynomial containing the upper <i>k</i> bytes of this
-     *         GF2Polynomial
-     * @see GF2Polynomial#karaMult
-     */
-    private GF2Polynomial upper(int k)
-    {
-        int j = Math.min(k, blocks - k);
-        GF2Polynomial result = new GF2Polynomial(j << 5);
-        if (blocks >= k)
-        {
-            System.arraycopy(value, k, result.value, 0, j);
-        }
-        return result;
-    }
-
-    /**
-     * Returns a new GF2Polynomial containing the lower <i>k</i> bytes of this
-     * GF2Polynomial.
-     *
-     * @param k
-     * @return a new GF2Polynomial containing the lower <i>k</i> bytes of this
-     *         GF2Polynomial
-     * @see GF2Polynomial#karaMult
-     */
-    private GF2Polynomial lower(int k)
-    {
-        GF2Polynomial result = new GF2Polynomial(k << 5);
-        System.arraycopy(value, 0, result.value, 0, Math.min(k, blocks));
-        return result;
-    }
-
-    /**
-     * Returns the remainder of <i>this</i> divided by <i>g</i> in a new
-     * GF2Polynomial.
-     *
-     * @param g GF2Polynomial != 0
-     * @return a new GF2Polynomial (<i>this</i> % <i>g</i>)
-     * @throws PolynomialIsZeroException if <i>g</i> equals zero
-     */
-    public GF2Polynomial remainder(GF2Polynomial g)
-        throws RuntimeException
-    {
-        /* a div b = q / r */
-        GF2Polynomial a = new GF2Polynomial(this);
-        GF2Polynomial b = new GF2Polynomial(g);
-        GF2Polynomial j;
-        int i;
-        if (b.isZero())
-        {
-            throw new RuntimeException();
-        }
-        a.reduceN();
-        b.reduceN();
-        if (a.len < b.len)
-        {
-            return a;
-        }
-        i = a.len - b.len;
-        while (i >= 0)
-        {
-            j = b.shiftLeft(i);
-            a.subtractFromThis(j);
-            a.reduceN();
-            i = a.len - b.len;
-        }
-        return a;
-    }
-
-    /**
-     * Returns the absolute quotient of <i>this</i> divided by <i>g</i> in a
-     * new GF2Polynomial.
-     *
-     * @param g GF2Polynomial != 0
-     * @return a new GF2Polynomial |_ <i>this</i> / <i>g</i> _|
-     * @throws PolynomialIsZeroException if <i>g</i> equals zero
-     */
-    public GF2Polynomial quotient(GF2Polynomial g)
-        throws RuntimeException
-    {
-        /* a div b = q / r */
-        GF2Polynomial q = new GF2Polynomial(len);
-        GF2Polynomial a = new GF2Polynomial(this);
-        GF2Polynomial b = new GF2Polynomial(g);
-        GF2Polynomial j;
-        int i;
-        if (b.isZero())
-        {
-            throw new RuntimeException();
-        }
-        a.reduceN();
-        b.reduceN();
-        if (a.len < b.len)
-        {
-            return new GF2Polynomial(0);
-        }
-        i = a.len - b.len;
-        q.expandN(i + 1);
-
-        while (i >= 0)
-        {
-            j = b.shiftLeft(i);
-            a.subtractFromThis(j);
-            a.reduceN();
-            q.xorBit(i);
-            i = a.len - b.len;
-        }
-
-        return q;
-    }
-
-    /**
-     * Divides <i>this</i> by <i>g</i> and returns the quotient and remainder
-     * in a new GF2Polynomial[2], quotient in [0], remainder in [1].
-     *
-     * @param g GF2Polynomial != 0
-     * @return a new GF2Polynomial[2] containing quotient and remainder
-     * @throws PolynomialIsZeroException if <i>g</i> equals zero
-     */
-    public GF2Polynomial[] divide(GF2Polynomial g)
-        throws RuntimeException
-    {
-        /* a div b = q / r */
-        GF2Polynomial[] result = new GF2Polynomial[2];
-        GF2Polynomial q = new GF2Polynomial(len);
-        GF2Polynomial a = new GF2Polynomial(this);
-        GF2Polynomial b = new GF2Polynomial(g);
-        GF2Polynomial j;
-        int i;
-        if (b.isZero())
-        {
-            throw new RuntimeException();
-        }
-        a.reduceN();
-        b.reduceN();
-        if (a.len < b.len)
-        {
-            result[0] = new GF2Polynomial(0);
-            result[1] = a;
-            return result;
-        }
-        i = a.len - b.len;
-        q.expandN(i + 1);
-
-        while (i >= 0)
-        {
-            j = b.shiftLeft(i);
-            a.subtractFromThis(j);
-            a.reduceN();
-            q.xorBit(i);
-            i = a.len - b.len;
-        }
-
-        result[0] = q;
-        result[1] = a;
-        return result;
-    }
-
-    /**
-     * Returns the greatest common divisor of <i>this</i> and <i>g</i> in a
-     * new GF2Polynomial.
-     *
-     * @param g GF2Polynomial != 0
-     * @return a new GF2Polynomial gcd(<i>this</i>,<i>g</i>)
-     * @throws ArithmeticException if <i>this</i> and <i>g</i> both are equal to zero
-     * @throws PolynomialIsZeroException to be API-compliant (should never be thrown).
-     */
-    public GF2Polynomial gcd(GF2Polynomial g)
-        throws RuntimeException
-    {
-        if (isZero() && g.isZero())
-        {
-            throw new ArithmeticException("Both operands of gcd equal zero.");
-        }
-        if (isZero())
-        {
-            return new GF2Polynomial(g);
-        }
-        if (g.isZero())
-        {
-            return new GF2Polynomial(this);
-        }
-        GF2Polynomial a = new GF2Polynomial(this);
-        GF2Polynomial b = new GF2Polynomial(g);
-        GF2Polynomial c;
-
-        while (!b.isZero())
-        {
-            c = a.remainder(b);
-            a = b;
-            b = c;
-        }
-
-        return a;
-    }
-
-    /**
-     * Checks if <i>this</i> is irreducible, according to IEEE P1363, A.5.5,
-     * p103.<br>
-     * Note: The algorithm from IEEE P1363, A5.5 can be used to check a
-     * polynomial with coefficients in GF(2^r) for irreducibility. As this class
-     * only represents polynomials with coefficients in GF(2), the algorithm is
-     * adapted to the case r=1.
-     *
-     * @return true if <i>this</i> is irreducible
-     * @see "P1363, A.5.5, p103"
-     */
-    public boolean isIrreducible()
-    {
-        if (isZero())
-        {
-            return false;
-        }
-        GF2Polynomial f = new GF2Polynomial(this);
-        int d, i;
-        GF2Polynomial u, g;
-        GF2Polynomial dummy;
-        f.reduceN();
-        d = f.len - 1;
-        u = new GF2Polynomial(f.len, "X");
-
-        for (i = 1; i <= (d >> 1); i++)
-        {
-            u.squareThisPreCalc();
-            u = u.remainder(f);
-            dummy = u.add(new GF2Polynomial(32, "X"));
-            if (!dummy.isZero())
-            {
-                g = f.gcd(dummy);
-                if (!g.isOne())
-                {
-                    return false;
-                }
-            }
-            else
-            {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    /**
-     * Reduces this GF2Polynomial using the trinomial x^<i>m</i> + x^<i>tc</i> +
-     * 1.
-     *
-     * @param m  the degree of the used field
-     * @param tc degree of the middle x in the trinomial
-     */
-    void reduceTrinomial(int m, int tc)
-    {
-        int i;
-        int p0, p1;
-        int q0, q1;
-        long t;
-        p0 = m >>> 5; // block which contains 2^m
-        q0 = 32 - (m & 0x1f); // (32-index) of 2^m within block p0
-        p1 = (m - tc) >>> 5; // block which contains 2^tc
-        q1 = 32 - ((m - tc) & 0x1f); // (32-index) of 2^tc within block q1
-        int max = ((m << 1) - 2) >>> 5; // block which contains 2^(2m-2)
-        int min = p0; // block which contains 2^m
-        for (i = max; i > min; i--)
-        { // for i = maxBlock to minBlock
-            // reduce coefficients contained in t
-            // t = block[i]
-            t = value[i] & 0x00000000ffffffffL;
-            // block[i-p0-1] ^= t << q0
-            value[i - p0 - 1] ^= (int)(t << q0);
-            // block[i-p0] ^= t >>> (32-q0)
-            value[i - p0] ^= t >>> (32 - q0);
-            // block[i-p1-1] ^= << q1
-            value[i - p1 - 1] ^= (int)(t << q1);
-            // block[i-p1] ^= t >>> (32-q1)
-            value[i - p1] ^= t >>> (32 - q1);
-            value[i] = 0x00;
-        }
-        // reduce last coefficients in block containing 2^m
-        t = value[min] & 0x00000000ffffffffL & (0xffffffffL << (m & 0x1f)); // t
-        // contains the last coefficients > m
-        value[0] ^= t >>> (32 - q0);
-        if (min - p1 - 1 >= 0)
-        {
-            value[min - p1 - 1] ^= (int)(t << q1);
-        }
-        value[min - p1] ^= t >>> (32 - q1);
-
-        value[min] &= reverseRightMask[m & 0x1f];
-        blocks = ((m - 1) >>> 5) + 1;
-        len = m;
-    }
-
-    /**
-     * Reduces this GF2Polynomial using the pentanomial x^<i>m</i> + x^<i>pc[2]</i> +
-     * x^<i>pc[1]</i> + x^<i>pc[0]</i> + 1.
-     *
-     * @param m  the degree of the used field
-     * @param pc degrees of the middle x's in the pentanomial
-     */
-    void reducePentanomial(int m, int[] pc)
-    {
-        int i;
-        int p0, p1, p2, p3;
-        int q0, q1, q2, q3;
-        long t;
-        p0 = m >>> 5;
-        q0 = 32 - (m & 0x1f);
-        p1 = (m - pc[0]) >>> 5;
-        q1 = 32 - ((m - pc[0]) & 0x1f);
-        p2 = (m - pc[1]) >>> 5;
-        q2 = 32 - ((m - pc[1]) & 0x1f);
-        p3 = (m - pc[2]) >>> 5;
-        q3 = 32 - ((m - pc[2]) & 0x1f);
-        int max = ((m << 1) - 2) >>> 5;
-        int min = p0;
-        for (i = max; i > min; i--)
-        {
-            t = value[i] & 0x00000000ffffffffL;
-            value[i - p0 - 1] ^= (int)(t << q0);
-            value[i - p0] ^= t >>> (32 - q0);
-            value[i - p1 - 1] ^= (int)(t << q1);
-            value[i - p1] ^= t >>> (32 - q1);
-            value[i - p2 - 1] ^= (int)(t << q2);
-            value[i - p2] ^= t >>> (32 - q2);
-            value[i - p3 - 1] ^= (int)(t << q3);
-            value[i - p3] ^= t >>> (32 - q3);
-            value[i] = 0;
-        }
-        t = value[min] & 0x00000000ffffffffL & (0xffffffffL << (m & 0x1f));
-        value[0] ^= t >>> (32 - q0);
-        if (min - p1 - 1 >= 0)
-        {
-            value[min - p1 - 1] ^= (int)(t << q1);
-        }
-        value[min - p1] ^= t >>> (32 - q1);
-        if (min - p2 - 1 >= 0)
-        {
-            value[min - p2 - 1] ^= (int)(t << q2);
-        }
-        value[min - p2] ^= t >>> (32 - q2);
-        if (min - p3 - 1 >= 0)
-        {
-            value[min - p3 - 1] ^= (int)(t << q3);
-        }
-        value[min - p3] ^= t >>> (32 - q3);
-        value[min] &= reverseRightMask[m & 0x1f];
-
-        blocks = ((m - 1) >>> 5) + 1;
-        len = m;
-    }
-
-    /**
-     * Reduces len by finding the most significant bit set to one and reducing
-     * len and blocks.
-     */
-    public void reduceN()
-    {
-        int i, j, h;
-        i = blocks - 1;
-        while ((value[i] == 0) && (i > 0))
-        {
-            i--;
-        }
-        h = value[i];
-        j = 0;
-        while (h != 0)
-        {
-            h >>>= 1;
-            j++;
-        }
-        len = (i << 5) + j;
-        blocks = i + 1;
-    }
-
-    /**
-     * Expands len and int[] value to <i>i</i>. This is useful before adding
-     * two GF2Polynomials of different size.
-     *
-     * @param i the intended length
-     */
-    public void expandN(int i)
-    {
-        int k;
-        int[] bs;
-        if (len >= i)
-        {
-            return;
-        }
-        len = i;
-        k = ((i - 1) >>> 5) + 1;
-        if (blocks >= k)
-        {
-            return;
-        }
-        if (value.length >= k)
-        {
-            int j;
-            for (j = blocks; j < k; j++)
-            {
-                value[j] = 0;
-            }
-            blocks = k;
-            return;
-        }
-        bs = new int[k];
-        System.arraycopy(value, 0, bs, 0, blocks);
-        blocks = k;
-        value = null;
-        value = bs;
-    }
-
-    /**
-     * Squares this GF2Polynomial and expands it accordingly. This method does
-     * not reduce the result in GF(2^N). There exists a faster method for
-     * squaring in GF(2^N).
-     *
-     * @see GF2nPolynomialElement#square
-     */
-    public void squareThisBitwise()
-    {
-        int i, h, j, k;
-        if (isZero())
-        {
-            return;
-        }
-        int[] result = new int[blocks << 1];
-        for (i = blocks - 1; i >= 0; i--)
-        {
-            h = value[i];
-            j = 0x00000001;
-            for (k = 0; k < 16; k++)
-            {
-                if ((h & 0x01) != 0)
-                {
-                    result[i << 1] |= j;
-                }
-                if ((h & 0x00010000) != 0)
-                {
-                    result[(i << 1) + 1] |= j;
-                }
-                j <<= 2;
-                h >>>= 1;
-            }
-        }
-        value = null;
-        value = result;
-        blocks = result.length;
-        len = (len << 1) - 1;
-    }
-
-    /**
-     * Squares this GF2Polynomial by using precomputed values of squaringTable.
-     * This method does not reduce the result in GF(2^N).
-     */
-    public void squareThisPreCalc()
-    {
-        int i;
-        if (isZero())
-        {
-            return;
-        }
-        if (value.length >= (blocks << 1))
-        {
-            for (i = blocks - 1; i >= 0; i--)
-            {
-                value[(i << 1) + 1] = GF2Polynomial.squaringTable[(value[i] & 0x00ff0000) >>> 16]
-                    | (GF2Polynomial.squaringTable[(value[i] & 0xff000000) >>> 24] << 16);
-                value[i << 1] = GF2Polynomial.squaringTable[value[i] & 0x000000ff]
-                    | (GF2Polynomial.squaringTable[(value[i] & 0x0000ff00) >>> 8] << 16);
-            }
-            blocks <<= 1;
-            len = (len << 1) - 1;
-        }
-        else
-        {
-            int[] result = new int[blocks << 1];
-            for (i = 0; i < blocks; i++)
-            {
-                result[i << 1] = GF2Polynomial.squaringTable[value[i] & 0x000000ff]
-                    | (GF2Polynomial.squaringTable[(value[i] & 0x0000ff00) >>> 8] << 16);
-                result[(i << 1) + 1] = GF2Polynomial.squaringTable[(value[i] & 0x00ff0000) >>> 16]
-                    | (GF2Polynomial.squaringTable[(value[i] & 0xff000000) >>> 24] << 16);
-            }
-            value = null;
-            value = result;
-            blocks <<= 1;
-            len = (len << 1) - 1;
-        }
-    }
-
-    /**
-     * Does a vector-multiplication modulo 2 and returns the result as boolean.
-     *
-     * @param b GF2Polynomial
-     * @return this x <i>b</i> as boolean (1-&gt;true, 0-&gt;false)
-     * @throws PolynomialsHaveDifferentLengthException if <i>this</i> and <i>b</i> have a different length and
-     * thus cannot be vector-multiplied
-     */
-    public boolean vectorMult(GF2Polynomial b)
-        throws RuntimeException
-    {
-        int i;
-        int h;
-        boolean result = false;
-        if (len != b.len)
-        {
-            throw new RuntimeException();
-        }
-        for (i = 0; i < blocks; i++)
-        {
-            h = value[i] & b.value[i];
-            result ^= parity[h & 0x000000ff];
-            result ^= parity[(h >>> 8) & 0x000000ff];
-            result ^= parity[(h >>> 16) & 0x000000ff];
-            result ^= parity[(h >>> 24) & 0x000000ff];
-        }
-        return result;
-    }
-
-    /**
-     * Returns the bitwise exclusive-or of <i>this</i> and <i>b</i> in a new
-     * GF2Polynomial. <i>this</i> and <i>b</i> can be of different size.
-     *
-     * @param b GF2Polynomial
-     * @return a new GF2Polynomial (<i>this</i> ^ <i>b</i>)
-     */
-    public GF2Polynomial xor(GF2Polynomial b)
-    {
-        int i;
-        GF2Polynomial result;
-        int k = Math.min(blocks, b.blocks);
-        if (len >= b.len)
-        {
-            result = new GF2Polynomial(this);
-            for (i = 0; i < k; i++)
-            {
-                result.value[i] ^= b.value[i];
-            }
-        }
-        else
-        {
-            result = new GF2Polynomial(b);
-            for (i = 0; i < k; i++)
-            {
-                result.value[i] ^= value[i];
-            }
-        }
-        // If we xor'ed some bits too many by proceeding blockwise,
-        // restore them to zero:
-        result.zeroUnusedBits();
-        return result;
-    }
-
-    /**
-     * Computes the bitwise exclusive-or of this GF2Polynomial and <i>b</i> and
-     * stores the result in this GF2Polynomial. <i>b</i> can be of different
-     * size.
-     *
-     * @param b GF2Polynomial
-     */
-    public void xorThisBy(GF2Polynomial b)
-    {
-        int i;
-        for (i = 0; i < Math.min(blocks, b.blocks); i++)
-        {
-            value[i] ^= b.value[i];
-        }
-        // If we xor'ed some bits too many by proceeding blockwise,
-        // restore them to zero:
-        zeroUnusedBits();
-    }
-
-    /**
-     * If {@link #len} is not a multiple of the block size (32), some extra bits
-     * of the last block might have been modified during a blockwise operation.
-     * This method compensates for that by restoring these "extra" bits to zero.
-     */
-    private void zeroUnusedBits()
-    {
-        if ((len & 0x1f) != 0)
-        {
-            value[blocks - 1] &= reverseRightMask[len & 0x1f];
-        }
-    }
-
-    /**
-     * Sets the bit at position <i>i</i>.
-     *
-     * @param i int
-     * @throws RuntimeException if (<i>i</i> &lt; 0) || (<i>i</i> &gt; (len - 1))
-     */
-    public void setBit(int i)
-        throws RuntimeException
-    {
-        if (i < 0 || i > (len - 1))
-        {
-            throw new RuntimeException();
-        }
-        value[i >>> 5] |= bitMask[i & 0x1f];
-        return;
-    }
-
-    /**
-     * Returns the bit at position <i>i</i>.
-     *
-     * @param i int
-     * @return the bit at position <i>i</i> if <i>i</i> is a valid position, 0
-     *         otherwise.
-     */
-    public int getBit(int i)
-    {
-        if (i < 0)
-        {
-            throw new RuntimeException();
-        }
-        if (i > (len - 1))
-        {
-            return 0;
-        }
-        return ((value[i >>> 5] & bitMask[i & 0x1f]) != 0) ? 1 : 0;
-    }
-
-    /**
-     * Resets the bit at position <i>i</i>.
-     *
-     * @param i int
-     * @throws RuntimeException if (<i>i</i> &lt; 0) || (<i>i</i> &gt; (len - 1))
-     */
-    public void resetBit(int i)
-        throws RuntimeException
-    {
-        if (i < 0)
-        {
-            throw new RuntimeException();
-        }
-        if (i > (len - 1))
-        {
-            return;
-        }
-        value[i >>> 5] &= ~bitMask[i & 0x1f];
-    }
-
-    /**
-     * Xors the bit at position <i>i</i>.
-     *
-     * @param i int
-     * @throws RuntimeException if (<i>i</i> &lt; 0) || (<i>i</i> &gt; (len - 1))
-     */
-    public void xorBit(int i)
-        throws RuntimeException
-    {
-        if (i < 0 || i > (len - 1))
-        {
-            throw new RuntimeException();
-        }
-        value[i >>> 5] ^= bitMask[i & 0x1f];
-    }
-
-    /**
-     * Tests the bit at position <i>i</i>.
-     *
-     * @param i the position of the bit to be tested
-     * @return true if the bit at position <i>i</i> is set (a(<i>i</i>) ==
-     *         1). False if (<i>i</i> &lt; 0) || (<i>i</i> &gt; (len - 1))
-     */
-    public boolean testBit(int i)
-    {
-        if (i < 0)
-        {
-            throw new RuntimeException();
-        }
-        if (i > (len - 1))
-        {
-            return false;
-        }
-        return (value[i >>> 5] & bitMask[i & 0x1f]) != 0;
-    }
-
-    /**
-     * Returns this GF2Polynomial shift-left by 1 in a new GF2Polynomial.
-     *
-     * @return a new GF2Polynomial (this &lt;&lt; 1)
-     */
-    public GF2Polynomial shiftLeft()
-    {
-        GF2Polynomial result = new GF2Polynomial(len + 1, value);
-        int i;
-        for (i = result.blocks - 1; i >= 1; i--)
-        {
-            result.value[i] <<= 1;
-            result.value[i] |= result.value[i - 1] >>> 31;
-        }
-        result.value[0] <<= 1;
-        return result;
-    }
-
-    /**
-     * Shifts-left this by one and enlarges the size of value if necesary.
-     */
-    public void shiftLeftThis()
-    {
-        /** @todo This is untested. */
-        int i;
-        if ((len & 0x1f) == 0)
-        { // check if blocks increases
-            len += 1;
-            blocks += 1;
-            if (blocks > value.length)
-            { // enlarge value
-                int[] bs = new int[blocks];
-                System.arraycopy(value, 0, bs, 0, value.length);
-                value = null;
-                value = bs;
-            }
-            for (i = blocks - 1; i >= 1; i--)
-            {
-                value[i] |= value[i - 1] >>> 31;
-                value[i - 1] <<= 1;
-            }
-        }
-        else
-        {
-            len += 1;
-            for (i = blocks - 1; i >= 1; i--)
-            {
-                value[i] <<= 1;
-                value[i] |= value[i - 1] >>> 31;
-            }
-            value[0] <<= 1;
-        }
-    }
-
-    /**
-     * Returns this GF2Polynomial shift-left by <i>k</i> in a new
-     * GF2Polynomial.
-     *
-     * @param k int
-     * @return a new GF2Polynomial (this &lt;&lt; <i>k</i>)
-     */
-    public GF2Polynomial shiftLeft(int k)
-    {
-        // Variant 2, requiring a modified shiftBlocksLeft(k)
-        // In case of modification, consider a rename to doShiftBlocksLeft()
-        // with an explicit note that this method assumes that the polynomial
-        // has already been resized. Or consider doing things inline.
-        // Construct the resulting polynomial of appropriate length:
-        GF2Polynomial result = new GF2Polynomial(len + k, value);
-        // Shift left as many multiples of the block size as possible:
-        if (k >= 32)
-        {
-            result.doShiftBlocksLeft(k >>> 5);
-        }
-        // Shift left by the remaining (<32) amount:
-        final int remaining = k & 0x1f;
-        if (remaining != 0)
-        {
-            for (int i = result.blocks - 1; i >= 1; i--)
-            {
-                result.value[i] <<= remaining;
-                result.value[i] |= result.value[i - 1] >>> (32 - remaining);
-            }
-            result.value[0] <<= remaining;
-        }
-        return result;
-    }
-
-    /**
-     * Shifts left b and adds the result to Its a fast version of
-     * <tt>this = add(b.shl(k));</tt>
-     *
-     * @param b GF2Polynomial to shift and add to this
-     * @param k the amount to shift
-     * @see GF2nPolynomialElement#invertEEA
-     */
-    public void shiftLeftAddThis(GF2Polynomial b, int k)
-    {
-        if (k == 0)
-        {
-            addToThis(b);
-            return;
-        }
-        int i;
-        expandN(b.len + k);
-        int d = k >>> 5;
-        for (i = b.blocks - 1; i >= 0; i--)
-        {
-            if ((i + d + 1 < blocks) && ((k & 0x1f) != 0))
-            {
-                value[i + d + 1] ^= b.value[i] >>> (32 - (k & 0x1f));
-            }
-            value[i + d] ^= b.value[i] << (k & 0x1f);
-        }
-    }
-
-    /**
-     * Shifts-left this GF2Polynomial's value blockwise 1 block resulting in a
-     * shift-left by 32.
-     *
-     * @see GF2Polynomial#multiply
-     */
-    void shiftBlocksLeft()
-    {
-        blocks += 1;
-        len += 32;
-        if (blocks <= value.length)
-        {
-            int i;
-            for (i = blocks - 1; i >= 1; i--)
-            {
-                value[i] = value[i - 1];
-            }
-            value[0] = 0x00;
-        }
-        else
-        {
-            int[] result = new int[blocks];
-            System.arraycopy(value, 0, result, 1, blocks - 1);
-            value = null;
-            value = result;
-        }
-    }
-
-    /**
-     * Shifts left this GF2Polynomial's value blockwise <i>b</i> blocks
-     * resulting in a shift-left by b*32. This method assumes that {@link #len}
-     * and {@link #blocks} have already been updated to reflect the final state.
-     *
-     * @param b shift amount (in blocks)
-     */
-    private void doShiftBlocksLeft(int b)
-    {
-        if (blocks <= value.length)
-        {
-            int i;
-            for (i = blocks - 1; i >= b; i--)
-            {
-                value[i] = value[i - b];
-            }
-            for (i = 0; i < b; i++)
-            {
-                value[i] = 0x00;
-            }
-        }
-        else
-        {
-            int[] result = new int[blocks];
-            System.arraycopy(value, 0, result, b, blocks - b);
-            value = null;
-            value = result;
-        }
-    }
-
-    /**
-     * Returns this GF2Polynomial shift-right by 1 in a new GF2Polynomial.
-     *
-     * @return a new GF2Polynomial (this &lt;&lt; 1)
-     */
-    public GF2Polynomial shiftRight()
-    {
-        GF2Polynomial result = new GF2Polynomial(len - 1);
-        int i;
-        System.arraycopy(value, 0, result.value, 0, result.blocks);
-        for (i = 0; i <= result.blocks - 2; i++)
-        {
-            result.value[i] >>>= 1;
-            result.value[i] |= result.value[i + 1] << 31;
-        }
-        result.value[result.blocks - 1] >>>= 1;
-        if (result.blocks < blocks)
-        {
-            result.value[result.blocks - 1] |= value[result.blocks] << 31;
-        }
-        return result;
-    }
-
-    /**
-     * Shifts-right this GF2Polynomial by 1.
-     */
-    public void shiftRightThis()
-    {
-        int i;
-        len -= 1;
-        blocks = ((len - 1) >>> 5) + 1;
-        for (i = 0; i <= blocks - 2; i++)
-        {
-            value[i] >>>= 1;
-            value[i] |= value[i + 1] << 31;
-        }
-        value[blocks - 1] >>>= 1;
-        if ((len & 0x1f) == 0)
-        {
-            value[blocks - 1] |= value[blocks] << 31;
-        }
-    }
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/math/linearalgebra/GF2Vector.java b/bcprov/src/main/java/org/bouncycastle/pqc/math/linearalgebra/GF2Vector.java
deleted file mode 100644
index ec35b68..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/math/linearalgebra/GF2Vector.java
+++ /dev/null
@@ -1,539 +0,0 @@
-package org.bouncycastle.pqc.math.linearalgebra;
-
-import java.security.SecureRandom;
-
-/**
- * This class implements the abstract class <tt>Vector</tt> for the case of
- * vectors over the finite field GF(2). <br>
- * For the vector representation the array of type int[] is used, thus one
- * element of the array holds 32 elements of the vector.
- *
- * @see Vector
- */
-public class GF2Vector
-    extends Vector
-{
-
-    /**
-     * holds the elements of this vector
-     */
-    private int[] v;
-
-    /**
-     * Construct the zero vector of the given length.
-     *
-     * @param length the length of the vector
-     */
-    public GF2Vector(int length)
-    {
-        if (length < 0)
-        {
-            throw new ArithmeticException("Negative length.");
-        }
-        this.length = length;
-        v = new int[(length + 31) >> 5];
-    }
-
-    /**
-     * Construct a random GF2Vector of the given length.
-     *
-     * @param length the length of the vector
-     * @param sr     the source of randomness
-     */
-    public GF2Vector(int length, SecureRandom sr)
-    {
-        this.length = length;
-
-        int size = (length + 31) >> 5;
-        v = new int[size];
-
-        // generate random elements
-        for (int i = size - 1; i >= 0; i--)
-        {
-            v[i] = sr.nextInt();
-        }
-
-        // erase unused bits
-        int r = length & 0x1f;
-        if (r != 0)
-        {
-            // erase unused bits
-            v[size - 1] &= (1 << r) - 1;
-        }
-    }
-
-    /**
-     * Construct a random GF2Vector of the given length with the specified
-     * number of non-zero coefficients.
-     *
-     * @param length the length of the vector
-     * @param t      the number of non-zero coefficients
-     * @param sr     the source of randomness
-     */
-    public GF2Vector(int length, int t, SecureRandom sr)
-    {
-        if (t > length)
-        {
-            throw new ArithmeticException(
-                "The hamming weight is greater than the length of vector.");
-        }
-        this.length = length;
-
-        int size = (length + 31) >> 5;
-        v = new int[size];
-
-        int[] help = new int[length];
-        for (int i = 0; i < length; i++)
-        {
-            help[i] = i;
-        }
-
-        int m = length;
-        for (int i = 0; i < t; i++)
-        {
-            int j = RandUtils.nextInt(sr, m);
-            setBit(help[j]);
-            m--;
-            help[j] = help[m];
-        }
-    }
-
-    /**
-     * Construct a GF2Vector of the given length and with elements from the
-     * given array. The array is copied and unused bits are masked out.
-     *
-     * @param length the length of the vector
-     * @param v      the element array
-     */
-    public GF2Vector(int length, int[] v)
-    {
-        if (length < 0)
-        {
-            throw new ArithmeticException("negative length");
-        }
-        this.length = length;
-
-        int size = (length + 31) >> 5;
-
-        if (v.length != size)
-        {
-            throw new ArithmeticException("length mismatch");
-        }
-
-        this.v = IntUtils.clone(v);
-
-        int r = length & 0x1f;
-        if (r != 0)
-        {
-            // erase unused bits
-            this.v[size - 1] &= (1 << r) - 1;
-        }
-    }
-
-    /**
-     * Copy constructor.
-     *
-     * @param other another {@link GF2Vector}
-     */
-    public GF2Vector(GF2Vector other)
-    {
-        this.length = other.length;
-        this.v = IntUtils.clone(other.v);
-    }
-
-    /**
-     * Construct a new {@link GF2Vector} of the given length and with the given
-     * element array. The array is not changed and only a reference to the array
-     * is stored. No length checking is performed either.
-     *
-     * @param v      the element array
-     * @param length the length of the vector
-     */
-    protected GF2Vector(int[] v, int length)
-    {
-        this.v = v;
-        this.length = length;
-    }
-
-    /**
-     * Construct a new GF2Vector with the given length out of the encoded
-     * vector.
-     *
-     * @param length the length of the vector
-     * @param encVec the encoded vector
-     * @return the decoded vector
-     */
-    public static GF2Vector OS2VP(int length, byte[] encVec)
-    {
-        if (length < 0)
-        {
-            throw new ArithmeticException("negative length");
-        }
-
-        int byteLen = (length + 7) >> 3;
-
-        if (encVec.length > byteLen)
-        {
-            throw new ArithmeticException("length mismatch");
-        }
-
-        return new GF2Vector(length, LittleEndianConversions.toIntArray(encVec));
-    }
-
-    /**
-     * Encode this vector as byte array.
-     *
-     * @return the encoded vector
-     */
-    public byte[] getEncoded()
-    {
-        int byteLen = (length + 7) >> 3;
-        return LittleEndianConversions.toByteArray(v, byteLen);
-    }
-
-    /**
-     * @return the int array representation of this vector
-     */
-    public int[] getVecArray()
-    {
-        return v;
-    }
-
-    /**
-     * Return the Hamming weight of this vector, i.e., compute the number of
-     * units of this vector.
-     *
-     * @return the Hamming weight of this vector
-     */
-    public int getHammingWeight()
-    {
-        int weight = 0;
-        for (int i = 0; i < v.length; i++)
-        {
-            int e = v[i];
-            for (int j = 0; j < 32; j++)
-            {
-                int b = e & 1;
-                if (b != 0)
-                {
-                    weight++;
-                }
-                e >>>= 1;
-            }
-        }
-        return weight;
-    }
-
-    /**
-     * @return whether this is the zero vector (i.e., all elements are zero)
-     */
-    public boolean isZero()
-    {
-        for (int i = v.length - 1; i >= 0; i--)
-        {
-            if (v[i] != 0)
-            {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    /**
-     * Return the value of the bit of this vector at the specified index.
-     *
-     * @param index the index
-     * @return the value of the bit (0 or 1)
-     */
-    public int getBit(int index)
-    {
-        if (index >= length)
-        {
-            throw new IndexOutOfBoundsException();
-        }
-        int q = index >> 5;
-        int r = index & 0x1f;
-        return (v[q] & (1 << r)) >>> r;
-    }
-
-    /**
-     * Set the coefficient at the given index to 1. If the index is out of
-     * bounds, do nothing.
-     *
-     * @param index the index of the coefficient to set
-     */
-    public void setBit(int index)
-    {
-        if (index >= length)
-        {
-            throw new IndexOutOfBoundsException();
-        }
-        v[index >> 5] |= 1 << (index & 0x1f);
-    }
-
-    /**
-     * Adds another GF2Vector to this vector.
-     *
-     * @param other another GF2Vector
-     * @return <tt>this + other</tt>
-     * @throws ArithmeticException if the other vector is not a GF2Vector or has another
-     * length.
-     */
-    public Vector add(Vector other)
-    {
-        if (!(other instanceof GF2Vector))
-        {
-            throw new ArithmeticException("vector is not defined over GF(2)");
-        }
-
-        GF2Vector otherVec = (GF2Vector)other;
-        if (length != otherVec.length)
-        {
-            throw new ArithmeticException("length mismatch");
-        }
-
-        int[] vec = IntUtils.clone(((GF2Vector)other).v);
-
-        for (int i = vec.length - 1; i >= 0; i--)
-        {
-            vec[i] ^= v[i];
-        }
-
-        return new GF2Vector(length, vec);
-    }
-
-    /**
-     * Multiply this vector with a permutation.
-     *
-     * @param p the permutation
-     * @return <tt>this*p = p*this</tt>
-     */
-    public Vector multiply(Permutation p)
-    {
-        int[] pVec = p.getVector();
-        if (length != pVec.length)
-        {
-            throw new ArithmeticException("length mismatch");
-        }
-
-        GF2Vector result = new GF2Vector(length);
-
-        for (int i = 0; i < pVec.length; i++)
-        {
-            int e = v[pVec[i] >> 5] & (1 << (pVec[i] & 0x1f));
-            if (e != 0)
-            {
-                result.v[i >> 5] |= 1 << (i & 0x1f);
-            }
-        }
-
-        return result;
-    }
-
-    /**
-     * Return a new vector consisting of the elements of this vector with the
-     * indices given by the set <tt>setJ</tt>.
-     *
-     * @param setJ the set of indices of elements to extract
-     * @return the new {@link GF2Vector}
-     *         <tt>[this_setJ[0], this_setJ[1], ..., this_setJ[#setJ-1]]</tt>
-     */
-    public GF2Vector extractVector(int[] setJ)
-    {
-        int k = setJ.length;
-        if (setJ[k - 1] > length)
-        {
-            throw new ArithmeticException("invalid index set");
-        }
-
-        GF2Vector result = new GF2Vector(k);
-
-        for (int i = 0; i < k; i++)
-        {
-            int e = v[setJ[i] >> 5] & (1 << (setJ[i] & 0x1f));
-            if (e != 0)
-            {
-                result.v[i >> 5] |= 1 << (i & 0x1f);
-            }
-        }
-
-        return result;
-    }
-
-    /**
-     * Return a new vector consisting of the first <tt>k</tt> elements of this
-     * vector.
-     *
-     * @param k the number of elements to extract
-     * @return a new {@link GF2Vector} consisting of the first <tt>k</tt>
-     *         elements of this vector
-     */
-    public GF2Vector extractLeftVector(int k)
-    {
-        if (k > length)
-        {
-            throw new ArithmeticException("invalid length");
-        }
-
-        if (k == length)
-        {
-            return new GF2Vector(this);
-        }
-
-        GF2Vector result = new GF2Vector(k);
-
-        int q = k >> 5;
-        int r = k & 0x1f;
-
-        System.arraycopy(v, 0, result.v, 0, q);
-        if (r != 0)
-        {
-            result.v[q] = v[q] & ((1 << r) - 1);
-        }
-
-        return result;
-    }
-
-    /**
-     * Return a new vector consisting of the last <tt>k</tt> elements of this
-     * vector.
-     *
-     * @param k the number of elements to extract
-     * @return a new {@link GF2Vector} consisting of the last <tt>k</tt>
-     *         elements of this vector
-     */
-    public GF2Vector extractRightVector(int k)
-    {
-        if (k > length)
-        {
-            throw new ArithmeticException("invalid length");
-        }
-
-        if (k == length)
-        {
-            return new GF2Vector(this);
-        }
-
-        GF2Vector result = new GF2Vector(k);
-
-        int q = (length - k) >> 5;
-        int r = (length - k) & 0x1f;
-        int length = (k + 31) >> 5;
-
-        int ind = q;
-        // if words have to be shifted
-        if (r != 0)
-        {
-            // process all but last word
-            for (int i = 0; i < length - 1; i++)
-            {
-                result.v[i] = (v[ind++] >>> r) | (v[ind] << (32 - r));
-            }
-            // process last word
-            result.v[length - 1] = v[ind++] >>> r;
-            if (ind < v.length)
-            {
-                result.v[length - 1] |= v[ind] << (32 - r);
-            }
-        }
-        else
-        {
-            // no shift necessary
-            System.arraycopy(v, q, result.v, 0, length);
-        }
-
-        return result;
-    }
-
-    /**
-     * Rewrite this vector as a vector over <tt>GF(2<sup>m</sup>)</tt> with
-     * <tt>t</tt> elements.
-     *
-     * @param field the finite field <tt>GF(2<sup>m</sup>)</tt>
-     * @return the converted vector over <tt>GF(2<sup>m</sup>)</tt>
-     */
-    public GF2mVector toExtensionFieldVector(GF2mField field)
-    {
-        int m = field.getDegree();
-        if ((length % m) != 0)
-        {
-            throw new ArithmeticException("conversion is impossible");
-        }
-
-        int t = length / m;
-        int[] result = new int[t];
-        int count = 0;
-        for (int i = t - 1; i >= 0; i--)
-        {
-            for (int j = field.getDegree() - 1; j >= 0; j--)
-            {
-                int q = count >>> 5;
-                int r = count & 0x1f;
-
-                int e = (v[q] >>> r) & 1;
-                if (e == 1)
-                {
-                    result[i] ^= 1 << j;
-                }
-                count++;
-            }
-        }
-        return new GF2mVector(field, result);
-    }
-
-    /**
-     * Check if the given object is equal to this vector.
-     *
-     * @param other vector
-     * @return the result of the comparison
-     */
-    public boolean equals(Object other)
-    {
-
-        if (!(other instanceof GF2Vector))
-        {
-            return false;
-        }
-        GF2Vector otherVec = (GF2Vector)other;
-
-        return (length == otherVec.length) && IntUtils.equals(v, otherVec.v);
-    }
-
-    /**
-     * @return the hash code of this vector
-     */
-    public int hashCode()
-    {
-        int hash = length;
-        hash = hash * 31 + v.hashCode();
-        return hash;
-    }
-
-    /**
-     * @return a human readable form of this vector
-     */
-    public String toString()
-    {
-        StringBuffer buf = new StringBuffer();
-        for (int i = 0; i < length; i++)
-        {
-            if ((i != 0) && ((i & 0x1f) == 0))
-            {
-                buf.append(' ');
-            }
-            int q = i >> 5;
-            int r = i & 0x1f;
-            int bit = v[q] & (1 << r);
-            if (bit == 0)
-            {
-                buf.append('0');
-            }
-            else
-            {
-                buf.append('1');
-            }
-        }
-        return buf.toString();
-    }
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/math/linearalgebra/GF2mField.java b/bcprov/src/main/java/org/bouncycastle/pqc/math/linearalgebra/GF2mField.java
deleted file mode 100644
index f5f7b64..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/math/linearalgebra/GF2mField.java
+++ /dev/null
@@ -1,369 +0,0 @@
-package org.bouncycastle.pqc.math.linearalgebra;
-
-import java.security.SecureRandom;
-
-/**
- * This class describes operations with elements from the finite field F =
- * GF(2^m). ( GF(2^m)= GF(2)[A] where A is a root of irreducible polynomial with
- * degree m, each field element B has a polynomial basis representation, i.e. it
- * is represented by a different binary polynomial of degree less than m, B =
- * poly(A) ) All operations are defined only for field with 1&lt; m &lt;32. For the
- * representation of field elements the map f: F-&gt;Z, poly(A)-&gt;poly(2) is used,
- * where integers have the binary representation. For example: A^7+A^3+A+1 -&gt;
- * (00...0010001011)=139 Also for elements type Integer is used.
- *
- * @see PolynomialRingGF2
- */
-public class GF2mField
-{
-
-    /*
-      * degree - degree of the field polynomial - the field polynomial ring -
-      * polynomial ring over the finite field GF(2)
-      */
-
-    private int degree = 0;
-
-    private int polynomial;
-
-    /**
-     * create a finite field GF(2^m)
-     *
-     * @param degree the degree of the field
-     */
-    public GF2mField(int degree)
-    {
-        if (degree >= 32)
-        {
-            throw new IllegalArgumentException(
-                " Error: the degree of field is too large ");
-        }
-        if (degree < 1)
-        {
-            throw new IllegalArgumentException(
-                " Error: the degree of field is non-positive ");
-        }
-        this.degree = degree;
-        polynomial = PolynomialRingGF2.getIrreduciblePolynomial(degree);
-    }
-
-    /**
-     * create a finite field GF(2^m) with the fixed field polynomial
-     *
-     * @param degree the degree of the field
-     * @param poly   the field polynomial
-     */
-    public GF2mField(int degree, int poly)
-    {
-        if (degree != PolynomialRingGF2.degree(poly))
-        {
-            throw new IllegalArgumentException(
-                " Error: the degree is not correct");
-        }
-        if (!PolynomialRingGF2.isIrreducible(poly))
-        {
-            throw new IllegalArgumentException(
-                " Error: given polynomial is reducible");
-        }
-        this.degree = degree;
-        polynomial = poly;
-
-    }
-
-    public GF2mField(byte[] enc)
-    {
-        if (enc.length != 4)
-        {
-            throw new IllegalArgumentException(
-                "byte array is not an encoded finite field");
-        }
-        polynomial = LittleEndianConversions.OS2IP(enc);
-        if (!PolynomialRingGF2.isIrreducible(polynomial))
-        {
-            throw new IllegalArgumentException(
-                "byte array is not an encoded finite field");
-        }
-
-        degree = PolynomialRingGF2.degree(polynomial);
-    }
-
-    public GF2mField(GF2mField field)
-    {
-        degree = field.degree;
-        polynomial = field.polynomial;
-    }
-
-    /**
-     * return degree of the field
-     *
-     * @return degree of the field
-     */
-    public int getDegree()
-    {
-        return degree;
-    }
-
-    /**
-     * return the field polynomial
-     *
-     * @return the field polynomial
-     */
-    public int getPolynomial()
-    {
-        return polynomial;
-    }
-
-    /**
-     * return the encoded form of this field
-     *
-     * @return the field in byte array form
-     */
-    public byte[] getEncoded()
-    {
-        return LittleEndianConversions.I2OSP(polynomial);
-    }
-
-    /**
-     * Return sum of two elements
-     *
-     * @param a
-     * @param b
-     * @return a+b
-     */
-    public int add(int a, int b)
-    {
-        return a ^ b;
-    }
-
-    /**
-     * Return product of two elements
-     *
-     * @param a
-     * @param b
-     * @return a*b
-     */
-    public int mult(int a, int b)
-    {
-        return PolynomialRingGF2.modMultiply(a, b, polynomial);
-    }
-
-    /**
-     * compute exponentiation a^k
-     *
-     * @param a a field element a
-     * @param k k degree
-     * @return a^k
-     */
-    public int exp(int a, int k)
-    {
-        if (k == 0)
-        {
-            return 1;
-        }
-        if (a == 0)
-        {
-            return 0;
-        }
-        if (a == 1)
-        {
-            return 1;
-        }
-        int result = 1;
-        if (k < 0)
-        {
-            a = inverse(a);
-            k = -k;
-        }
-        while (k != 0)
-        {
-            if ((k & 1) == 1)
-            {
-                result = mult(result, a);
-            }
-            a = mult(a, a);
-            k >>>= 1;
-        }
-        return result;
-    }
-
-    /**
-     * compute the multiplicative inverse of a
-     *
-     * @param a a field element a
-     * @return a<sup>-1</sup>
-     */
-    public int inverse(int a)
-    {
-        int d = (1 << degree) - 2;
-
-        return exp(a, d);
-    }
-
-    /**
-     * compute the square root of an integer
-     *
-     * @param a a field element a
-     * @return a<sup>1/2</sup>
-     */
-    public int sqRoot(int a)
-    {
-        for (int i = 1; i < degree; i++)
-        {
-            a = mult(a, a);
-        }
-        return a;
-    }
-
-    /**
-     * create a random field element using PRNG sr
-     *
-     * @param sr SecureRandom
-     * @return a random element
-     */
-    public int getRandomElement(SecureRandom sr)
-    {
-        int result = RandUtils.nextInt(sr, 1 << degree);
-        return result;
-    }
-
-    /**
-     * create a random non-zero field element
-     *
-     * @return a random element
-     */
-    public int getRandomNonZeroElement()
-    {
-        return getRandomNonZeroElement(new SecureRandom());
-    }
-
-    /**
-     * create a random non-zero field element using PRNG sr
-     *
-     * @param sr SecureRandom
-     * @return a random non-zero element
-     */
-    public int getRandomNonZeroElement(SecureRandom sr)
-    {
-        int controltime = 1 << 20;
-        int count = 0;
-        int result = RandUtils.nextInt(sr, 1 << degree);
-        while ((result == 0) && (count < controltime))
-        {
-            result = RandUtils.nextInt(sr, 1 << degree);
-            count++;
-        }
-        if (count == controltime)
-        {
-            result = 1;
-        }
-        return result;
-    }
-
-    /**
-     * @return true if e is encoded element of this field and false otherwise
-     */
-    public boolean isElementOfThisField(int e)
-    {
-        // e is encoded element of this field iff 0<= e < |2^m|
-        if (degree == 31)
-        {
-            return e >= 0;
-        }
-        return e >= 0 && e < (1 << degree);
-    }
-
-    /*
-      * help method for visual control
-      */
-    public String elementToStr(int a)
-    {
-        String s = "";
-        for (int i = 0; i < degree; i++)
-        {
-            if (((byte)a & 0x01) == 0)
-            {
-                s = "0" + s;
-            }
-            else
-            {
-                s = "1" + s;
-            }
-            a >>>= 1;
-        }
-        return s;
-    }
-
-    /**
-     * checks if given object is equal to this field.
-     * <p>
-     * The method returns false whenever the given object is not GF2m.
-     *
-     * @param other object
-     * @return true or false
-     */
-    public boolean equals(Object other)
-    {
-        if ((other == null) || !(other instanceof GF2mField))
-        {
-            return false;
-        }
-
-        GF2mField otherField = (GF2mField)other;
-
-        if ((degree == otherField.degree)
-            && (polynomial == otherField.polynomial))
-        {
-            return true;
-        }
-
-        return false;
-    }
-
-    public int hashCode()
-    {
-        return polynomial;
-    }
-
-    /**
-     * Returns a human readable form of this field.
-     *
-     * @return a human readable form of this field.
-     */
-    public String toString()
-    {
-        String str = "Finite Field GF(2^" + degree + ") = " + "GF(2)[X]/<"
-            + polyToString(polynomial) + "> ";
-        return str;
-    }
-
-    private static String polyToString(int p)
-    {
-        String str = "";
-        if (p == 0)
-        {
-            str = "0";
-        }
-        else
-        {
-            byte b = (byte)(p & 0x01);
-            if (b == 1)
-            {
-                str = "1";
-            }
-            p >>>= 1;
-            int i = 1;
-            while (p != 0)
-            {
-                b = (byte)(p & 0x01);
-                if (b == 1)
-                {
-                    str = str + "+x^" + i;
-                }
-                p >>>= 1;
-                i++;
-            }
-        }
-        return str;
-    }
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/math/linearalgebra/GF2mMatrix.java b/bcprov/src/main/java/org/bouncycastle/pqc/math/linearalgebra/GF2mMatrix.java
deleted file mode 100644
index 8dfdb9b..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/math/linearalgebra/GF2mMatrix.java
+++ /dev/null
@@ -1,377 +0,0 @@
-package org.bouncycastle.pqc.math.linearalgebra;
-
-/**
- * This class describes some operations with matrices over finite field <i>GF(2<sup>m</sup>)</i>
- * with small <i>m</i> (1&lt; m &lt;32).
- *
- * @see Matrix
- */
-public class GF2mMatrix
-    extends Matrix
-{
-
-    /**
-     * finite field GF(2^m)
-     */
-    protected GF2mField field;
-
-    /**
-     * For the matrix representation the array of type int[][] is used, thus
-     * every element of the array keeps one element of the matrix (element from
-     * finite field GF(2^m))
-     */
-    protected int[][] matrix;
-
-    /**
-     * Constructor.
-     *
-     * @param field a finite field GF(2^m)
-     * @param enc   byte[] matrix in byte array form
-     */
-    public GF2mMatrix(GF2mField field, byte[] enc)
-    {
-
-        this.field = field;
-
-        // decode matrix
-        int d = 8;
-        int count = 1;
-        while (field.getDegree() > d)
-        {
-            count++;
-            d += 8;
-        }
-
-        if (enc.length < 5)
-        {
-            throw new IllegalArgumentException(
-                " Error: given array is not encoded matrix over GF(2^m)");
-        }
-
-        this.numRows = ((enc[3] & 0xff) << 24) ^ ((enc[2] & 0xff) << 16)
-            ^ ((enc[1] & 0xff) << 8) ^ (enc[0] & 0xff);
-
-        int n = count * this.numRows;
-
-        if ((this.numRows <= 0) || (((enc.length - 4) % n) != 0))
-        {
-            throw new IllegalArgumentException(
-                " Error: given array is not encoded matrix over GF(2^m)");
-        }
-
-        this.numColumns = (enc.length - 4) / n;
-
-        matrix = new int[this.numRows][this.numColumns];
-        count = 4;
-        for (int i = 0; i < this.numRows; i++)
-        {
-            for (int j = 0; j < this.numColumns; j++)
-            {
-                for (int jj = 0; jj < d; jj += 8)
-                {
-                    matrix[i][j] ^= (enc[count++] & 0x000000ff) << jj;
-                }
-                if (!this.field.isElementOfThisField(matrix[i][j]))
-                {
-                    throw new IllegalArgumentException(
-                        " Error: given array is not encoded matrix over GF(2^m)");
-                }
-            }
-        }
-    }
-
-    /**
-     * Copy constructor.
-     *
-     * @param other another {@link GF2mMatrix}
-     */
-    public GF2mMatrix(GF2mMatrix other)
-    {
-        numRows = other.numRows;
-        numColumns = other.numColumns;
-        field = other.field;
-        matrix = new int[numRows][];
-        for (int i = 0; i < numRows; i++)
-        {
-            matrix[i] = IntUtils.clone(other.matrix[i]);
-        }
-    }
-
-    /**
-     * Constructor.
-     *
-     * @param field  a finite field GF(2^m)
-     * @param matrix the matrix as int array. Only the reference is copied.
-     */
-    protected GF2mMatrix(GF2mField field, int[][] matrix)
-    {
-        this.field = field;
-        this.matrix = matrix;
-        numRows = matrix.length;
-        numColumns = matrix[0].length;
-    }
-
-    /**
-     * @return a byte array encoding of this matrix
-     */
-    public byte[] getEncoded()
-    {
-        int d = 8;
-        int count = 1;
-        while (field.getDegree() > d)
-        {
-            count++;
-            d += 8;
-        }
-
-        byte[] bf = new byte[this.numRows * this.numColumns * count + 4];
-        bf[0] = (byte)(this.numRows & 0xff);
-        bf[1] = (byte)((this.numRows >>> 8) & 0xff);
-        bf[2] = (byte)((this.numRows >>> 16) & 0xff);
-        bf[3] = (byte)((this.numRows >>> 24) & 0xff);
-
-        count = 4;
-        for (int i = 0; i < this.numRows; i++)
-        {
-            for (int j = 0; j < this.numColumns; j++)
-            {
-                for (int jj = 0; jj < d; jj += 8)
-                {
-                    bf[count++] = (byte)(matrix[i][j] >>> jj);
-                }
-            }
-        }
-
-        return bf;
-    }
-
-    /**
-     * Check if this is the zero matrix (i.e., all entries are zero).
-     *
-     * @return <tt>true</tt> if this is the zero matrix
-     */
-    public boolean isZero()
-    {
-        for (int i = 0; i < numRows; i++)
-        {
-            for (int j = 0; j < numColumns; j++)
-            {
-                if (matrix[i][j] != 0)
-                {
-                    return false;
-                }
-            }
-        }
-        return true;
-    }
-
-    /**
-     * Compute the inverse of this matrix.
-     *
-     * @return the inverse of this matrix (newly created).
-     */
-    public Matrix computeInverse()
-    {
-        if (numRows != numColumns)
-        {
-            throw new ArithmeticException("Matrix is not invertible.");
-        }
-
-        // clone this matrix
-        int[][] tmpMatrix = new int[numRows][numRows];
-        for (int i = numRows - 1; i >= 0; i--)
-        {
-            tmpMatrix[i] = IntUtils.clone(matrix[i]);
-        }
-
-        // initialize inverse matrix as unit matrix
-        int[][] invMatrix = new int[numRows][numRows];
-        for (int i = numRows - 1; i >= 0; i--)
-        {
-            invMatrix[i][i] = 1;
-        }
-
-        // simultaneously compute Gaussian reduction of tmpMatrix and unit
-        // matrix
-        for (int i = 0; i < numRows; i++)
-        {
-            // if diagonal element is zero
-            if (tmpMatrix[i][i] == 0)
-            {
-                boolean foundNonZero = false;
-                // find a non-zero element in the same column
-                for (int j = i + 1; j < numRows; j++)
-                {
-                    if (tmpMatrix[j][i] != 0)
-                    {
-                        // found it, swap rows ...
-                        foundNonZero = true;
-                        swapColumns(tmpMatrix, i, j);
-                        swapColumns(invMatrix, i, j);
-                        // ... and quit searching
-                        j = numRows;
-                        continue;
-                    }
-                }
-                // if no non-zero element was found
-                if (!foundNonZero)
-                {
-                    // the matrix is not invertible
-                    throw new ArithmeticException("Matrix is not invertible.");
-                }
-            }
-
-            // normalize i-th row
-            int coef = tmpMatrix[i][i];
-            int invCoef = field.inverse(coef);
-            multRowWithElementThis(tmpMatrix[i], invCoef);
-            multRowWithElementThis(invMatrix[i], invCoef);
-
-            // normalize all other rows
-            for (int j = 0; j < numRows; j++)
-            {
-                if (j != i)
-                {
-                    coef = tmpMatrix[j][i];
-                    if (coef != 0)
-                    {
-                        int[] tmpRow = multRowWithElement(tmpMatrix[i], coef);
-                        int[] tmpInvRow = multRowWithElement(invMatrix[i], coef);
-                        addToRow(tmpRow, tmpMatrix[j]);
-                        addToRow(tmpInvRow, invMatrix[j]);
-                    }
-                }
-            }
-        }
-
-        return new GF2mMatrix(field, invMatrix);
-    }
-
-    private static void swapColumns(int[][] matrix, int first, int second)
-    {
-        int[] tmp = matrix[first];
-        matrix[first] = matrix[second];
-        matrix[second] = tmp;
-    }
-
-    private void multRowWithElementThis(int[] row, int element)
-    {
-        for (int i = row.length - 1; i >= 0; i--)
-        {
-            row[i] = field.mult(row[i], element);
-        }
-    }
-
-    private int[] multRowWithElement(int[] row, int element)
-    {
-        int[] result = new int[row.length];
-        for (int i = row.length - 1; i >= 0; i--)
-        {
-            result[i] = field.mult(row[i], element);
-        }
-        return result;
-    }
-
-    /**
-     * Add one row to another.
-     *
-     * @param fromRow the addend
-     * @param toRow   the row to add to
-     */
-    private void addToRow(int[] fromRow, int[] toRow)
-    {
-        for (int i = toRow.length - 1; i >= 0; i--)
-        {
-            toRow[i] = field.add(fromRow[i], toRow[i]);
-        }
-    }
-
-    public Matrix rightMultiply(Matrix a)
-    {
-        throw new RuntimeException("Not implemented.");
-    }
-
-    public Matrix rightMultiply(Permutation perm)
-    {
-        throw new RuntimeException("Not implemented.");
-    }
-
-    public Vector leftMultiply(Vector vector)
-    {
-        throw new RuntimeException("Not implemented.");
-    }
-
-    public Vector rightMultiply(Vector vector)
-    {
-        throw new RuntimeException("Not implemented.");
-    }
-
-    /**
-     * Checks if given object is equal to this matrix. The method returns false
-     * whenever the given object is not a matrix over GF(2^m).
-     *
-     * @param other object
-     * @return true or false
-     */
-    public boolean equals(Object other)
-    {
-
-        if (other == null || !(other instanceof GF2mMatrix))
-        {
-            return false;
-        }
-
-        GF2mMatrix otherMatrix = (GF2mMatrix)other;
-
-        if ((!this.field.equals(otherMatrix.field))
-            || (otherMatrix.numRows != this.numColumns)
-            || (otherMatrix.numColumns != this.numColumns))
-        {
-            return false;
-        }
-
-        for (int i = 0; i < this.numRows; i++)
-        {
-            for (int j = 0; j < this.numColumns; j++)
-            {
-                if (this.matrix[i][j] != otherMatrix.matrix[i][j])
-                {
-                    return false;
-                }
-            }
-        }
-
-        return true;
-    }
-
-    public int hashCode()
-    {
-        int hash = (this.field.hashCode() * 31 + numRows) * 31 + numColumns;
-        for (int i = 0; i < this.numRows; i++)
-        {
-            for (int j = 0; j < this.numColumns; j++)
-            {
-                hash = hash * 31 + matrix[i][j];
-            }
-        }
-        return hash;
-    }
-
-    public String toString()
-    {
-        String str = this.numRows + " x " + this.numColumns + " Matrix over "
-            + this.field.toString() + ": \n";
-
-        for (int i = 0; i < this.numRows; i++)
-        {
-            for (int j = 0; j < this.numColumns; j++)
-            {
-                str = str + this.field.elementToStr(matrix[i][j]) + " : ";
-            }
-            str = str + "\n";
-        }
-
-        return str;
-    }
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/math/linearalgebra/GF2mVector.java b/bcprov/src/main/java/org/bouncycastle/pqc/math/linearalgebra/GF2mVector.java
deleted file mode 100644
index f2527f6..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/math/linearalgebra/GF2mVector.java
+++ /dev/null
@@ -1,256 +0,0 @@
-package org.bouncycastle.pqc.math.linearalgebra;
-
-
-/**
- * This class implements vectors over the finite field
- * <tt>GF(2<sup>m</sup>)</tt> for small <tt>m</tt> (i.e.,
- * <tt>1&lt;m&lt;32</tt>). It extends the abstract class {@link Vector}.
- */
-public class GF2mVector
-    extends Vector
-{
-
-    /**
-     * the finite field this vector is defined over
-     */
-    private GF2mField field;
-
-    /**
-     * the element array
-     */
-    private int[] vector;
-
-    /**
-     * creates the vector over GF(2^m) of given length and with elements from
-     * array v (beginning at the first bit)
-     *
-     * @param field finite field
-     * @param v     array with elements of vector
-     */
-    public GF2mVector(GF2mField field, byte[] v)
-    {
-        this.field = new GF2mField(field);
-
-        // decode vector
-        int d = 8;
-        int count = 1;
-        while (field.getDegree() > d)
-        {
-            count++;
-            d += 8;
-        }
-
-        if ((v.length % count) != 0)
-        {
-            throw new IllegalArgumentException(
-                "Byte array is not an encoded vector over the given finite field.");
-        }
-
-        length = v.length / count;
-        vector = new int[length];
-        count = 0;
-        for (int i = 0; i < vector.length; i++)
-        {
-            for (int j = 0; j < d; j += 8)
-            {
-                vector[i] |= (v[count++] & 0xff) << j;
-            }
-            if (!field.isElementOfThisField(vector[i]))
-            {
-                throw new IllegalArgumentException(
-                    "Byte array is not an encoded vector over the given finite field.");
-            }
-        }
-    }
-
-    /**
-     * Create a new vector over <tt>GF(2<sup>m</sup>)</tt> of the given
-     * length and element array.
-     *
-     * @param field  the finite field <tt>GF(2<sup>m</sup>)</tt>
-     * @param vector the element array
-     */
-    public GF2mVector(GF2mField field, int[] vector)
-    {
-        this.field = field;
-        length = vector.length;
-        for (int i = vector.length - 1; i >= 0; i--)
-        {
-            if (!field.isElementOfThisField(vector[i]))
-            {
-                throw new ArithmeticException(
-                    "Element array is not specified over the given finite field.");
-            }
-        }
-        this.vector = IntUtils.clone(vector);
-    }
-
-    /**
-     * Copy constructor.
-     *
-     * @param other another {@link GF2mVector}
-     */
-    public GF2mVector(GF2mVector other)
-    {
-        field = new GF2mField(other.field);
-        length = other.length;
-        vector = IntUtils.clone(other.vector);
-    }
-
-    /**
-     * @return the finite field this vector is defined over
-     */
-    public GF2mField getField()
-    {
-        return field;
-    }
-
-    /**
-     * @return int[] form of this vector
-     */
-    public int[] getIntArrayForm()
-    {
-        return IntUtils.clone(vector);
-    }
-
-    /**
-     * @return a byte array encoding of this vector
-     */
-    public byte[] getEncoded()
-    {
-        int d = 8;
-        int count = 1;
-        while (field.getDegree() > d)
-        {
-            count++;
-            d += 8;
-        }
-
-        byte[] res = new byte[vector.length * count];
-        count = 0;
-        for (int i = 0; i < vector.length; i++)
-        {
-            for (int j = 0; j < d; j += 8)
-            {
-                res[count++] = (byte)(vector[i] >>> j);
-            }
-        }
-
-        return res;
-    }
-
-    /**
-     * @return whether this is the zero vector (i.e., all elements are zero)
-     */
-    public boolean isZero()
-    {
-        for (int i = vector.length - 1; i >= 0; i--)
-        {
-            if (vector[i] != 0)
-            {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    /**
-     * Add another vector to this vector. Method is not yet implemented.
-     *
-     * @param addend the other vector
-     * @return <tt>this + addend</tt>
-     * @throws ArithmeticException if the other vector is not defined over the same field as
-     * this vector.
-     * <p>
-     * TODO: implement this method
-     */
-    public Vector add(Vector addend)
-    {
-        throw new RuntimeException("not implemented");
-    }
-
-    /**
-     * Multiply this vector with a permutation.
-     *
-     * @param p the permutation
-     * @return <tt>this*p = p*this</tt>
-     */
-    public Vector multiply(Permutation p)
-    {
-        int[] pVec = p.getVector();
-        if (length != pVec.length)
-        {
-            throw new ArithmeticException(
-                "permutation size and vector size mismatch");
-        }
-
-        int[] result = new int[length];
-        for (int i = 0; i < pVec.length; i++)
-        {
-            result[i] = vector[pVec[i]];
-        }
-
-        return new GF2mVector(field, result);
-    }
-
-    /**
-     * Compare this vector with another object.
-     *
-     * @param other the other object
-     * @return the result of the comparison
-     */
-    public boolean equals(Object other)
-    {
-
-        if (!(other instanceof GF2mVector))
-        {
-            return false;
-        }
-        GF2mVector otherVec = (GF2mVector)other;
-
-        if (!field.equals(otherVec.field))
-        {
-            return false;
-        }
-
-        return IntUtils.equals(vector, otherVec.vector);
-    }
-
-    /**
-     * @return the hash code of this vector
-     */
-    public int hashCode()
-    {
-        int hash = this.field.hashCode();
-        hash = hash * 31 + vector.hashCode();
-        return hash;
-    }
-
-    /**
-     * @return a human readable form of this vector
-     */
-    public String toString()
-    {
-        StringBuffer buf = new StringBuffer();
-        for (int i = 0; i < vector.length; i++)
-        {
-            for (int j = 0; j < field.getDegree(); j++)
-            {
-                int r = j & 0x1f;
-                int bitMask = 1 << r;
-                int coeff = vector[i] & bitMask;
-                if (coeff != 0)
-                {
-                    buf.append('1');
-                }
-                else
-                {
-                    buf.append('0');
-                }
-            }
-            buf.append(' ');
-        }
-        return buf.toString();
-    }
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/math/linearalgebra/GF2nElement.java b/bcprov/src/main/java/org/bouncycastle/pqc/math/linearalgebra/GF2nElement.java
deleted file mode 100644
index faa99dc..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/math/linearalgebra/GF2nElement.java
+++ /dev/null
@@ -1,186 +0,0 @@
-package org.bouncycastle.pqc.math.linearalgebra;
-
-
-/**
- * This abstract class implements an element of the finite field <i>GF(2)<sup>n
- * </sup></i> in either <i>optimal normal basis</i> representation (<i>ONB</i>)
- * or in <i>polynomial</i> representation. It is extended by the classes <a
- * href = GF2nONBElement.html><tt> GF2nONBElement</tt></a> and <a href =
- * GF2nPolynomialElement.html> <tt>GF2nPolynomialElement</tt> </a>.
- *
- * @see GF2nPolynomialElement
- * @see GF2nONBElement
- * @see GF2nONBField
- */
-public abstract class GF2nElement
-    implements GFElement
-{
-
-    // /////////////////////////////////////////////////////////////////////
-    // member variables
-    // /////////////////////////////////////////////////////////////////////
-
-    /**
-     * holds a pointer to this element's corresponding field.
-     */
-    protected GF2nField mField;
-
-    /**
-     * holds the extension degree <i>n</i> of this element's corresponding
-     * field.
-     */
-    protected int mDegree;
-
-    // /////////////////////////////////////////////////////////////////////
-    // pseudo-constructors
-    // /////////////////////////////////////////////////////////////////////
-
-    /**
-     * @return a copy of this GF2nElement
-     */
-    public abstract Object clone();
-
-    // /////////////////////////////////////////////////////////////////////
-    // assignments
-    // /////////////////////////////////////////////////////////////////////
-
-    /**
-     * Assign the value 0 to this element.
-     */
-    abstract void assignZero();
-
-    /**
-     * Assigns the value 1 to this element.
-     */
-    abstract void assignOne();
-
-    // /////////////////////////////////////////////////////////////////////
-    // access
-    // /////////////////////////////////////////////////////////////////////
-
-    /**
-     * Returns whether the rightmost bit of the bit representation is set. This
-     * is needed for data conversion according to 1363.
-     *
-     * @return true if the rightmost bit of this element is set
-     */
-    public abstract boolean testRightmostBit();
-
-    /**
-     * Checks whether the indexed bit of the bit representation is set
-     *
-     * @param index the index of the bit to test
-     * @return <tt>true</tt> if the indexed bit is set
-     */
-    abstract boolean testBit(int index);
-
-    /**
-     * Returns the field of this element.
-     *
-     * @return the field of this element
-     */
-    public final GF2nField getField()
-    {
-        return mField;
-    }
-
-    // /////////////////////////////////////////////////////////////////////
-    // arithmetic
-    // /////////////////////////////////////////////////////////////////////
-
-    /**
-     * Returns <tt>this</tt> element + 1.
-     *
-     * @return <tt>this</tt> + 1
-     */
-    public abstract GF2nElement increase();
-
-    /**
-     * Increases this element by one.
-     */
-    public abstract void increaseThis();
-
-    /**
-     * Compute the difference of this element and <tt>minuend</tt>.
-     *
-     * @param minuend the minuend
-     * @return <tt>this - minuend</tt> (newly created)
-     * @throws DifferentFieldsException if the elements are of different fields.
-     */
-    public final GFElement subtract(GFElement minuend)
-        throws RuntimeException
-    {
-        return add(minuend);
-    }
-
-    /**
-     * Compute the difference of this element and <tt>minuend</tt>,
-     * overwriting this element.
-     *
-     * @param minuend the minuend
-     * @throws DifferentFieldsException if the elements are of different fields.
-     */
-    public final void subtractFromThis(GFElement minuend)
-    {
-        addToThis(minuend);
-    }
-
-    /**
-     * Returns <tt>this</tt> element to the power of 2.
-     *
-     * @return <tt>this</tt><sup>2</sup>
-     */
-    public abstract GF2nElement square();
-
-    /**
-     * Squares <tt>this</tt> element.
-     */
-    public abstract void squareThis();
-
-    /**
-     * Compute the square root of this element and return the result in a new
-     * {@link GF2nElement}.
-     *
-     * @return <tt>this<sup>1/2</sup></tt> (newly created)
-     */
-    public abstract GF2nElement squareRoot();
-
-    /**
-     * Compute the square root of this element.
-     */
-    public abstract void squareRootThis();
-
-    /**
-     * Performs a basis transformation of this element to the given GF2nField
-     * <tt>basis</tt>.
-     *
-     * @param basis the GF2nField representation to transform this element to
-     * @return this element in the representation of <tt>basis</tt>
-     * @throws DifferentFieldsException if <tt>this</tt> cannot be converted according to
-     * <tt>basis</tt>.
-     */
-    public final GF2nElement convert(GF2nField basis)
-        throws RuntimeException
-    {
-        return mField.convert(this, basis);
-    }
-
-    /**
-     * Returns the trace of this element.
-     *
-     * @return the trace of this element
-     */
-    public abstract int trace();
-
-    /**
-     * Solves a quadratic equation.<br>
-     * Let z<sup>2</sup> + z = <tt>this</tt>. Then this method returns z.
-     *
-     * @return z with z<sup>2</sup> + z = <tt>this</tt>
-     * @throws NoSolutionException if z<sup>2</sup> + z = <tt>this</tt> does not have a
-     * solution
-     */
-    public abstract GF2nElement solveQuadraticEquation()
-        throws RuntimeException;
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/math/linearalgebra/GF2nField.java b/bcprov/src/main/java/org/bouncycastle/pqc/math/linearalgebra/GF2nField.java
deleted file mode 100644
index 907afd7..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/math/linearalgebra/GF2nField.java
+++ /dev/null
@@ -1,292 +0,0 @@
-package org.bouncycastle.pqc.math.linearalgebra;
-
-
-import java.util.Vector;
-
-
-/**
- * This abstract class defines the finite field <i>GF(2<sup>n</sup>)</i>. It
- * holds the extension degree <i>n</i>, the characteristic, the irreducible
- * fieldpolynomial and conversion matrices. GF2nField is implemented by the
- * classes GF2nPolynomialField and GF2nONBField.
- *
- * @see GF2nONBField
- * @see GF2nPolynomialField
- */
-public abstract class GF2nField
-{
-
-    /**
-     * the degree of this field
-     */
-    protected int mDegree;
-
-    /**
-     * the irreducible fieldPolynomial stored in normal order (also for ONB)
-     */
-    protected GF2Polynomial fieldPolynomial;
-
-    /**
-     * holds a list of GF2nFields to which elements have been converted and thus
-     * a COB-Matrix exists
-     */
-    protected Vector fields;
-
-    /**
-     * the COB matrices
-     */
-    protected Vector matrices;
-
-    /**
-     * Returns the degree <i>n</i> of this field.
-     *
-     * @return the degree <i>n</i> of this field
-     */
-    public final int getDegree()
-    {
-        return mDegree;
-    }
-
-    /**
-     * Returns the fieldpolynomial as a new Bitstring.
-     *
-     * @return a copy of the fieldpolynomial as a new Bitstring
-     */
-    public final GF2Polynomial getFieldPolynomial()
-    {
-        if (fieldPolynomial == null)
-        {
-            computeFieldPolynomial();
-        }
-        return new GF2Polynomial(fieldPolynomial);
-    }
-
-    /**
-     * Decides whether the given object <tt>other</tt> is the same as this
-     * field.
-     *
-     * @param other another object
-     * @return (this == other)
-     */
-    public final boolean equals(Object other)
-    {
-        if (other == null || !(other instanceof GF2nField))
-        {
-            return false;
-        }
-
-        GF2nField otherField = (GF2nField)other;
-
-        if (otherField.mDegree != mDegree)
-        {
-            return false;
-        }
-        if (!fieldPolynomial.equals(otherField.fieldPolynomial))
-        {
-            return false;
-        }
-        if ((this instanceof GF2nPolynomialField)
-            && !(otherField instanceof GF2nPolynomialField))
-        {
-            return false;
-        }
-        if ((this instanceof GF2nONBField)
-            && !(otherField instanceof GF2nONBField))
-        {
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * @return the hash code of this field
-     */
-    public int hashCode()
-    {
-        return mDegree + fieldPolynomial.hashCode();
-    }
-
-    /**
-     * Computes a random root from the given irreducible fieldpolynomial
-     * according to IEEE 1363 algorithm A.5.6. This cal take very long for big
-     * degrees.
-     *
-     * @param B0FieldPolynomial the fieldpolynomial if the other basis as a Bitstring
-     * @return a random root of BOFieldPolynomial in representation according to
-     *         this field
-     * @see "P1363 A.5.6, p103f"
-     */
-    protected abstract GF2nElement getRandomRoot(GF2Polynomial B0FieldPolynomial);
-
-    /**
-     * Computes the change-of-basis matrix for basis conversion according to
-     * 1363. The result is stored in the lists fields and matrices.
-     *
-     * @param B1 the GF2nField to convert to
-     * @see "P1363 A.7.3, p111ff"
-     */
-    protected abstract void computeCOBMatrix(GF2nField B1);
-
-    /**
-     * Computes the fieldpolynomial. This can take a long time for big degrees.
-     */
-    protected abstract void computeFieldPolynomial();
-
-    /**
-     * Inverts the given matrix represented as bitstrings.
-     *
-     * @param matrix the matrix to invert as a Bitstring[]
-     * @return matrix^(-1)
-     */
-    protected final GF2Polynomial[] invertMatrix(GF2Polynomial[] matrix)
-    {
-        GF2Polynomial[] a = new GF2Polynomial[matrix.length];
-        GF2Polynomial[] inv = new GF2Polynomial[matrix.length];
-        GF2Polynomial dummy;
-        int i, j;
-        // initialize a as a copy of matrix and inv as E(inheitsmatrix)
-        for (i = 0; i < mDegree; i++)
-        {
-            try
-            {
-                a[i] = new GF2Polynomial(matrix[i]);
-                inv[i] = new GF2Polynomial(mDegree);
-                inv[i].setBit(mDegree - 1 - i);
-            }
-            catch (RuntimeException BDNEExc)
-            {
-                BDNEExc.printStackTrace();
-            }
-        }
-        // construct triangle matrix so that for each a[i] the first i bits are
-        // zero
-        for (i = 0; i < mDegree - 1; i++)
-        {
-            // find column where bit i is set
-            j = i;
-            while ((j < mDegree) && !a[j].testBit(mDegree - 1 - i))
-            {
-                j++;
-            }
-            if (j >= mDegree)
-            {
-                throw new RuntimeException(
-                    "GF2nField.invertMatrix: Matrix cannot be inverted!");
-            }
-            if (i != j)
-            { // swap a[i]/a[j] and inv[i]/inv[j]
-                dummy = a[i];
-                a[i] = a[j];
-                a[j] = dummy;
-                dummy = inv[i];
-                inv[i] = inv[j];
-                inv[j] = dummy;
-            }
-            for (j = i + 1; j < mDegree; j++)
-            { // add column i to all columns>i
-                // having their i-th bit set
-                if (a[j].testBit(mDegree - 1 - i))
-                {
-                    a[j].addToThis(a[i]);
-                    inv[j].addToThis(inv[i]);
-                }
-            }
-        }
-        // construct Einheitsmatrix from a
-        for (i = mDegree - 1; i > 0; i--)
-        {
-            for (j = i - 1; j >= 0; j--)
-            { // eliminate the i-th bit in all
-                // columns < i
-                if (a[j].testBit(mDegree - 1 - i))
-                {
-                    a[j].addToThis(a[i]);
-                    inv[j].addToThis(inv[i]);
-                }
-            }
-        }
-        return inv;
-    }
-
-    /**
-     * Converts the given element in representation according to this field to a
-     * new element in representation according to B1 using the change-of-basis
-     * matrix calculated by computeCOBMatrix.
-     *
-     * @param elem  the GF2nElement to convert
-     * @param basis the basis to convert <tt>elem</tt> to
-     * @return <tt>elem</tt> converted to a new element representation
-     *         according to <tt>basis</tt>
-     * @throws DifferentFieldsException if <tt>elem</tt> cannot be converted according to
-     * <tt>basis</tt>.
-     * @see GF2nField#computeCOBMatrix
-     * @see GF2nField#getRandomRoot
-     * @see GF2nPolynomial
-     * @see "P1363 A.7 p109ff"
-     */
-    public final GF2nElement convert(GF2nElement elem, GF2nField basis)
-        throws RuntimeException
-    {
-        if (basis == this)
-        {
-            return (GF2nElement)elem.clone();
-        }
-        if (fieldPolynomial.equals(basis.fieldPolynomial))
-        {
-            return (GF2nElement)elem.clone();
-        }
-        if (mDegree != basis.mDegree)
-        {
-            throw new RuntimeException("GF2nField.convert: B1 has a"
-                + " different degree and thus cannot be coverted to!");
-        }
-
-        int i;
-        GF2Polynomial[] COBMatrix;
-        i = fields.indexOf(basis);
-        if (i == -1)
-        {
-            computeCOBMatrix(basis);
-            i = fields.indexOf(basis);
-        }
-        COBMatrix = (GF2Polynomial[])matrices.elementAt(i);
-
-        GF2nElement elemCopy = (GF2nElement)elem.clone();
-        if (elemCopy instanceof GF2nONBElement)
-        {
-            // remember: ONB treats its bits in reverse order
-            ((GF2nONBElement)elemCopy).reverseOrder();
-        }
-        GF2Polynomial bs = new GF2Polynomial(mDegree, elemCopy.toFlexiBigInt());
-        bs.expandN(mDegree);
-        GF2Polynomial result = new GF2Polynomial(mDegree);
-        for (i = 0; i < mDegree; i++)
-        {
-            if (bs.vectorMult(COBMatrix[i]))
-            {
-                result.setBit(mDegree - 1 - i);
-            }
-        }
-        if (basis instanceof GF2nPolynomialField)
-        {
-            return new GF2nPolynomialElement((GF2nPolynomialField)basis,
-                result);
-        }
-        else if (basis instanceof GF2nONBField)
-        {
-            GF2nONBElement res = new GF2nONBElement((GF2nONBField)basis,
-                result.toFlexiBigInt());
-            // TODO Remember: ONB treats its Bits in reverse order !!!
-            res.reverseOrder();
-            return res;
-        }
-        else
-        {
-            throw new RuntimeException(
-                "GF2nField.convert: B1 must be an instance of "
-                    + "GF2nPolynomialField or GF2nONBField!");
-        }
-
-    }
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/math/linearalgebra/GF2nONBElement.java b/bcprov/src/main/java/org/bouncycastle/pqc/math/linearalgebra/GF2nONBElement.java
deleted file mode 100644
index 8b4b473..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/math/linearalgebra/GF2nONBElement.java
+++ /dev/null
@@ -1,1154 +0,0 @@
-package org.bouncycastle.pqc.math.linearalgebra;
-
-
-import java.math.BigInteger;
-import java.util.Random;
-
-/**
- * This class implements an element of the finite field <i>GF(2<sup>n </sup>)</i>.
- * It is represented in an optimal normal basis representation and holds the
- * pointer <tt>mField</tt> to its corresponding field.
- *
- * @see GF2nField
- * @see GF2nElement
- */
-public class GF2nONBElement
-    extends GF2nElement
-{
-
-    // /////////////////////////////////////////////////////////////////////
-    // member variables
-    // /////////////////////////////////////////////////////////////////////
-
-    private static final long[] mBitmask = new long[]{0x0000000000000001L,
-        0x0000000000000002L, 0x0000000000000004L, 0x0000000000000008L,
-        0x0000000000000010L, 0x0000000000000020L, 0x0000000000000040L,
-        0x0000000000000080L, 0x0000000000000100L, 0x0000000000000200L,
-        0x0000000000000400L, 0x0000000000000800L, 0x0000000000001000L,
-        0x0000000000002000L, 0x0000000000004000L, 0x0000000000008000L,
-        0x0000000000010000L, 0x0000000000020000L, 0x0000000000040000L,
-        0x0000000000080000L, 0x0000000000100000L, 0x0000000000200000L,
-        0x0000000000400000L, 0x0000000000800000L, 0x0000000001000000L,
-        0x0000000002000000L, 0x0000000004000000L, 0x0000000008000000L,
-        0x0000000010000000L, 0x0000000020000000L, 0x0000000040000000L,
-        0x0000000080000000L, 0x0000000100000000L, 0x0000000200000000L,
-        0x0000000400000000L, 0x0000000800000000L, 0x0000001000000000L,
-        0x0000002000000000L, 0x0000004000000000L, 0x0000008000000000L,
-        0x0000010000000000L, 0x0000020000000000L, 0x0000040000000000L,
-        0x0000080000000000L, 0x0000100000000000L, 0x0000200000000000L,
-        0x0000400000000000L, 0x0000800000000000L, 0x0001000000000000L,
-        0x0002000000000000L, 0x0004000000000000L, 0x0008000000000000L,
-        0x0010000000000000L, 0x0020000000000000L, 0x0040000000000000L,
-        0x0080000000000000L, 0x0100000000000000L, 0x0200000000000000L,
-        0x0400000000000000L, 0x0800000000000000L, 0x1000000000000000L,
-        0x2000000000000000L, 0x4000000000000000L, 0x8000000000000000L};
-
-    private static final long[] mMaxmask = new long[]{0x0000000000000001L,
-        0x0000000000000003L, 0x0000000000000007L, 0x000000000000000FL,
-        0x000000000000001FL, 0x000000000000003FL, 0x000000000000007FL,
-        0x00000000000000FFL, 0x00000000000001FFL, 0x00000000000003FFL,
-        0x00000000000007FFL, 0x0000000000000FFFL, 0x0000000000001FFFL,
-        0x0000000000003FFFL, 0x0000000000007FFFL, 0x000000000000FFFFL,
-        0x000000000001FFFFL, 0x000000000003FFFFL, 0x000000000007FFFFL,
-        0x00000000000FFFFFL, 0x00000000001FFFFFL, 0x00000000003FFFFFL,
-        0x00000000007FFFFFL, 0x0000000000FFFFFFL, 0x0000000001FFFFFFL,
-        0x0000000003FFFFFFL, 0x0000000007FFFFFFL, 0x000000000FFFFFFFL,
-        0x000000001FFFFFFFL, 0x000000003FFFFFFFL, 0x000000007FFFFFFFL,
-        0x00000000FFFFFFFFL, 0x00000001FFFFFFFFL, 0x00000003FFFFFFFFL,
-        0x00000007FFFFFFFFL, 0x0000000FFFFFFFFFL, 0x0000001FFFFFFFFFL,
-        0x0000003FFFFFFFFFL, 0x0000007FFFFFFFFFL, 0x000000FFFFFFFFFFL,
-        0x000001FFFFFFFFFFL, 0x000003FFFFFFFFFFL, 0x000007FFFFFFFFFFL,
-        0x00000FFFFFFFFFFFL, 0x00001FFFFFFFFFFFL, 0x00003FFFFFFFFFFFL,
-        0x00007FFFFFFFFFFFL, 0x0000FFFFFFFFFFFFL, 0x0001FFFFFFFFFFFFL,
-        0x0003FFFFFFFFFFFFL, 0x0007FFFFFFFFFFFFL, 0x000FFFFFFFFFFFFFL,
-        0x001FFFFFFFFFFFFFL, 0x003FFFFFFFFFFFFFL, 0x007FFFFFFFFFFFFFL,
-        0x00FFFFFFFFFFFFFFL, 0x01FFFFFFFFFFFFFFL, 0x03FFFFFFFFFFFFFFL,
-        0x07FFFFFFFFFFFFFFL, 0x0FFFFFFFFFFFFFFFL, 0x1FFFFFFFFFFFFFFFL,
-        0x3FFFFFFFFFFFFFFFL, 0x7FFFFFFFFFFFFFFFL, 0xFFFFFFFFFFFFFFFFL};
-
-    // mIBy64[j * 16 + i] = (j * 16 + i)/64
-    // i =
-    // 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15
-    //
-    private static final int[] mIBY64 = new int[]{
-        // j =
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 1
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 2
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 3
-        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 4
-        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 5
-        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 6
-        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 7
-        2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, // 8
-        2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, // 9
-        2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, // 10
-        2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, // 11
-        3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // 12
-        3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // 13
-        3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // 14
-        3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // 15
-        4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, // 16
-        4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, // 17
-        4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, // 18
-        4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, // 19
-        5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, // 20
-        5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, // 21
-        5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, // 22
-        5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5 // 23
-    };
-
-    private static final int MAXLONG = 64;
-
-    /**
-     * holds the lenght of the polynomial with 64 bit sized fields.
-     */
-    private int mLength;
-
-    /**
-     * holds the value of mDeg % MAXLONG.
-     */
-    private int mBit;
-
-    /**
-     * holds this element in ONB representation.
-     */
-    private long[] mPol;
-
-    // /////////////////////////////////////////////////////////////////////
-    // constructors
-    // /////////////////////////////////////////////////////////////////////
-
-    /**
-     * Construct a random element over the field <tt>gf2n</tt>, using the
-     * specified source of randomness.
-     *
-     * @param gf2n the field
-     * @param rand the source of randomness
-     */
-    public GF2nONBElement(GF2nONBField gf2n, Random rand)
-    {
-        mField = gf2n;
-        mDegree = mField.getDegree();
-        mLength = gf2n.getONBLength();
-        mBit = gf2n.getONBBit();
-        mPol = new long[mLength];
-        if (mLength > 1)
-        {
-            for (int j = 0; j < mLength - 1; j++)
-            {
-                mPol[j] = rand.nextLong();
-            }
-            long last = rand.nextLong();
-            mPol[mLength - 1] = last >>> (MAXLONG - mBit);
-        }
-        else
-        {
-            mPol[0] = rand.nextLong();
-            mPol[0] = mPol[0] >>> (MAXLONG - mBit);
-        }
-    }
-
-    /**
-     * Construct a new GF2nONBElement from its encoding.
-     *
-     * @param gf2n the field
-     * @param e    the encoded element
-     */
-    public GF2nONBElement(GF2nONBField gf2n, byte[] e)
-    {
-        mField = gf2n;
-        mDegree = mField.getDegree();
-        mLength = gf2n.getONBLength();
-        mBit = gf2n.getONBBit();
-        mPol = new long[mLength];
-        assign(e);
-    }
-
-    /**
-     * Construct the element of the field <tt>gf2n</tt> with the specified
-     * value <tt>val</tt>.
-     *
-     * @param gf2n the field
-     * @param val  the value represented by a BigInteger
-     */
-    public GF2nONBElement(GF2nONBField gf2n, BigInteger val)
-    {
-        mField = gf2n;
-        mDegree = mField.getDegree();
-        mLength = gf2n.getONBLength();
-        mBit = gf2n.getONBBit();
-        mPol = new long[mLength];
-        assign(val);
-    }
-
-    /**
-     * Construct the element of the field <tt>gf2n</tt> with the specified
-     * value <tt>val</tt>.
-     *
-     * @param gf2n the field
-     * @param val  the value in ONB representation
-     */
-    private GF2nONBElement(GF2nONBField gf2n, long[] val)
-    {
-        mField = gf2n;
-        mDegree = mField.getDegree();
-        mLength = gf2n.getONBLength();
-        mBit = gf2n.getONBBit();
-        mPol = val;
-    }
-
-    // /////////////////////////////////////////////////////////////////////
-    // pseudo-constructors
-    // /////////////////////////////////////////////////////////////////////
-
-    /**
-     * Copy constructor.
-     *
-     * @param gf2n the field
-     */
-    public GF2nONBElement(GF2nONBElement gf2n)
-    {
-
-        mField = gf2n.mField;
-        mDegree = mField.getDegree();
-        mLength = ((GF2nONBField)mField).getONBLength();
-        mBit = ((GF2nONBField)mField).getONBBit();
-        mPol = new long[mLength];
-        assign(gf2n.getElement());
-    }
-
-    /**
-     * Create a new GF2nONBElement by cloning this GF2nPolynomialElement.
-     *
-     * @return a copy of this element
-     */
-    public Object clone()
-    {
-        return new GF2nONBElement(this);
-    }
-
-    /**
-     * Create the zero element.
-     *
-     * @param gf2n the finite field
-     * @return the zero element in the given finite field
-     */
-    public static GF2nONBElement ZERO(GF2nONBField gf2n)
-    {
-        long[] polynomial = new long[gf2n.getONBLength()];
-        return new GF2nONBElement(gf2n, polynomial);
-    }
-
-    /**
-     * Create the one element.
-     *
-     * @param gf2n the finite field
-     * @return the one element in the given finite field
-     */
-    public static GF2nONBElement ONE(GF2nONBField gf2n)
-    {
-        int mLength = gf2n.getONBLength();
-        long[] polynomial = new long[mLength];
-
-        // fill mDegree coefficients with one's
-        for (int i = 0; i < mLength - 1; i++)
-        {
-            polynomial[i] = 0xffffffffffffffffL;
-        }
-        polynomial[mLength - 1] = mMaxmask[gf2n.getONBBit() - 1];
-
-        return new GF2nONBElement(gf2n, polynomial);
-    }
-
-    // /////////////////////////////////////////////////////////////////////
-    // assignments
-    // /////////////////////////////////////////////////////////////////////
-
-    /**
-     * assigns to this element the zero element
-     */
-    void assignZero()
-    {
-        mPol = new long[mLength];
-    }
-
-    /**
-     * assigns to this element the one element
-     */
-    void assignOne()
-    {
-        // fill mDegree coefficients with one's
-        for (int i = 0; i < mLength - 1; i++)
-        {
-            mPol[i] = 0xffffffffffffffffL;
-        }
-        mPol[mLength - 1] = mMaxmask[mBit - 1];
-    }
-
-    /**
-     * assigns to this element the value <tt>val</tt>.
-     *
-     * @param val the value represented by a BigInteger
-     */
-    private void assign(BigInteger val)
-    {
-        assign(val.toByteArray());
-    }
-
-    /**
-     * assigns to this element the value <tt>val</tt>.
-     *
-     * @param val the value in ONB representation
-     */
-    private void assign(long[] val)
-    {
-        System.arraycopy(val, 0, mPol, 0, mLength);
-    }
-
-    /**
-     * assigns to this element the value <tt>val</tt>. First: inverting the
-     * order of val into reversed[]. That means: reversed[0] = val[length - 1],
-     * ..., reversed[reversed.length - 1] = val[0]. Second: mPol[0] = sum{i = 0,
-     * ... 7} (val[i]<<(i*8)) .... mPol[1] = sum{i = 8, ... 15} (val[i]<<(i*8))
-     *
-     * @param val the value in ONB representation
-     */
-    private void assign(byte[] val)
-    {
-        int j;
-        mPol = new long[mLength];
-        for (j = 0; j < val.length; j++)
-        {
-            mPol[j >>> 3] |= (val[val.length - 1 - j] & 0x00000000000000ffL) << ((j & 0x07) << 3);
-        }
-    }
-
-    // /////////////////////////////////////////////////////////////////
-    // comparison
-    // /////////////////////////////////////////////////////////////////
-
-    /**
-     * Checks whether this element is zero.
-     *
-     * @return <tt>true</tt> if <tt>this</tt> is the zero element
-     */
-    public boolean isZero()
-    {
-
-        boolean result = true;
-
-        for (int i = 0; i < mLength && result; i++)
-        {
-            result = result && ((mPol[i] & 0xFFFFFFFFFFFFFFFFL) == 0);
-        }
-
-        return result;
-    }
-
-    /**
-     * Checks whether this element is one.
-     *
-     * @return <tt>true</tt> if <tt>this</tt> is the one element
-     */
-    public boolean isOne()
-    {
-
-        boolean result = true;
-
-        for (int i = 0; i < mLength - 1 && result; i++)
-        {
-            result = result
-                && ((mPol[i] & 0xFFFFFFFFFFFFFFFFL) == 0xFFFFFFFFFFFFFFFFL);
-        }
-
-        if (result)
-        {
-            result = result
-                && ((mPol[mLength - 1] & mMaxmask[mBit - 1]) == mMaxmask[mBit - 1]);
-        }
-
-        return result;
-    }
-
-    /**
-     * Compare this element with another object.
-     *
-     * @param other the other object
-     * @return <tt>true</tt> if the two objects are equal, <tt>false</tt>
-     *         otherwise
-     */
-    public boolean equals(Object other)
-    {
-        if (other == null || !(other instanceof GF2nONBElement))
-        {
-            return false;
-        }
-
-        GF2nONBElement otherElem = (GF2nONBElement)other;
-
-        for (int i = 0; i < mLength; i++)
-        {
-            if (mPol[i] != otherElem.mPol[i])
-            {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    /**
-     * @return the hash code of this element
-     */
-    public int hashCode()
-    {
-        return mPol.hashCode();
-    }
-
-    // /////////////////////////////////////////////////////////////////////
-    // access
-    // /////////////////////////////////////////////////////////////////////
-
-    /**
-     * Returns whether the highest bit of the bit representation is set
-     *
-     * @return true, if the highest bit of mPol is set, false, otherwise
-     */
-    public boolean testRightmostBit()
-    {
-        // due to the reverse bit order (compared to 1363) this method returns
-        // the value of the leftmost bit
-        return (mPol[mLength - 1] & mBitmask[mBit - 1]) != 0L;
-    }
-
-    /**
-     * Checks whether the indexed bit of the bit representation is set. Warning:
-     * GF2nONBElement currently stores its bits in reverse order (compared to
-     * 1363) !!!
-     *
-     * @param index the index of the bit to test
-     * @return <tt>true</tt> if the indexed bit of mPol is set, <tt>false</tt>
-     *         otherwise.
-     */
-    boolean testBit(int index)
-    {
-        if (index < 0 || index > mDegree)
-        {
-            return false;
-        }
-        long test = mPol[index >>> 6] & mBitmask[index & 0x3f];
-        return test != 0x0L;
-    }
-
-    /**
-     * @return this element in its ONB representation
-     */
-    private long[] getElement()
-    {
-
-        long[] result = new long[mPol.length];
-        System.arraycopy(mPol, 0, result, 0, mPol.length);
-
-        return result;
-    }
-
-    /**
-     * Returns the ONB representation of this element. The Bit-Order is
-     * exchanged (according to 1363)!
-     *
-     * @return this element in its representation and reverse bit-order
-     */
-    private long[] getElementReverseOrder()
-    {
-        long[] result = new long[mPol.length];
-        for (int i = 0; i < mDegree; i++)
-        {
-            if (testBit(mDegree - i - 1))
-            {
-                result[i >>> 6] |= mBitmask[i & 0x3f];
-            }
-        }
-        return result;
-    }
-
-    /**
-     * Reverses the bit-order in this element(according to 1363). This is a
-     * hack!
-     */
-    void reverseOrder()
-    {
-        mPol = getElementReverseOrder();
-    }
-
-    // /////////////////////////////////////////////////////////////////////
-    // arithmetic
-    // /////////////////////////////////////////////////////////////////////
-
-    /**
-     * Compute the sum of this element and <tt>addend</tt>.
-     *
-     * @param addend the addend
-     * @return <tt>this + other</tt> (newly created)
-     * @throws DifferentFieldsException if the elements are of different fields.
-     */
-    public GFElement add(GFElement addend)
-        throws RuntimeException
-    {
-        GF2nONBElement result = new GF2nONBElement(this);
-        result.addToThis(addend);
-        return result;
-    }
-
-    /**
-     * Compute <tt>this + addend</tt> (overwrite <tt>this</tt>).
-     *
-     * @param addend the addend
-     * @throws DifferentFieldsException if the elements are of different fields.
-     */
-    public void addToThis(GFElement addend)
-        throws RuntimeException
-    {
-        if (!(addend instanceof GF2nONBElement))
-        {
-            throw new RuntimeException();
-        }
-        if (!mField.equals(((GF2nONBElement)addend).mField))
-        {
-            throw new RuntimeException();
-        }
-
-        for (int i = 0; i < mLength; i++)
-        {
-            mPol[i] ^= ((GF2nONBElement)addend).mPol[i];
-        }
-    }
-
-    /**
-     * returns <tt>this</tt> element + 1.
-     *
-     * @return <tt>this</tt> + 1
-     */
-    public GF2nElement increase()
-    {
-        GF2nONBElement result = new GF2nONBElement(this);
-        result.increaseThis();
-        return result;
-    }
-
-    /**
-     * increases <tt>this</tt> element.
-     */
-    public void increaseThis()
-    {
-        addToThis(ONE((GF2nONBField)mField));
-    }
-
-    /**
-     * Compute the product of this element and <tt>factor</tt>.
-     *
-     * @param factor the factor
-     * @return <tt>this * factor</tt> (newly created)
-     * @throws DifferentFieldsException if the elements are of different fields.
-     */
-    public GFElement multiply(GFElement factor)
-        throws RuntimeException
-    {
-        GF2nONBElement result = new GF2nONBElement(this);
-        result.multiplyThisBy(factor);
-        return result;
-    }
-
-    /**
-     * Compute <tt>this * factor</tt> (overwrite <tt>this</tt>).
-     *
-     * @param factor the factor
-     * @throws DifferentFieldsException if the elements are of different fields.
-     */
-    public void multiplyThisBy(GFElement factor)
-        throws RuntimeException
-    {
-
-        if (!(factor instanceof GF2nONBElement))
-        {
-            throw new RuntimeException("The elements have different"
-                + " representation: not yet" + " implemented");
-        }
-        if (!mField.equals(((GF2nONBElement)factor).mField))
-        {
-            throw new RuntimeException();
-        }
-
-        if (equals(factor))
-        {
-            squareThis();
-        }
-        else
-        {
-
-            long[] a = mPol;
-            long[] b = ((GF2nONBElement)factor).mPol;
-            long[] c = new long[mLength];
-
-            int[][] m = ((GF2nONBField)mField).mMult;
-
-            int degf, degb, s, fielda, fieldb, bita, bitb;
-            degf = mLength - 1;
-            degb = mBit - 1;
-            s = 0;
-
-            long TWOTOMAXLONGM1 = mBitmask[MAXLONG - 1];
-            long TWOTODEGB = mBitmask[degb];
-
-            boolean old, now;
-
-            // the product c of a and b (a*b = c) is calculated in mDegree
-            // cicles
-            // in every cicle one coefficient of c is calculated and stored
-            // k indicates the coefficient
-            //
-            for (int k = 0; k < mDegree; k++)
-            {
-
-                s = 0;
-
-                for (int i = 0; i < mDegree; i++)
-                {
-
-                    // fielda = i / MAXLONG
-                    //
-                    fielda = mIBY64[i];
-
-                    // bita = i % MAXLONG
-                    //
-                    bita = i & (MAXLONG - 1);
-
-                    // fieldb = m[i][0] / MAXLONG
-                    //
-                    fieldb = mIBY64[m[i][0]];
-
-                    // bitb = m[i][0] % MAXLONG
-                    //
-                    bitb = m[i][0] & (MAXLONG - 1);
-
-                    if ((a[fielda] & mBitmask[bita]) != 0)
-                    {
-
-                        if ((b[fieldb] & mBitmask[bitb]) != 0)
-                        {
-                            s ^= 1;
-                        }
-
-                        if (m[i][1] != -1)
-                        {
-
-                            // fieldb = m[i][1] / MAXLONG
-                            //
-                            fieldb = mIBY64[m[i][1]];
-
-                            // bitb = m[i][1] % MAXLONG
-                            //
-                            bitb = m[i][1] & (MAXLONG - 1);
-
-                            if ((b[fieldb] & mBitmask[bitb]) != 0)
-                            {
-                                s ^= 1;
-                            }
-
-                        }
-                    }
-                }
-                fielda = mIBY64[k];
-                bita = k & (MAXLONG - 1);
-
-                if (s != 0)
-                {
-                    c[fielda] ^= mBitmask[bita];
-                }
-
-                // Circular shift of x and y one bit to the right,
-                // respectively.
-
-                if (mLength > 1)
-                {
-
-                    // Shift x.
-                    //
-                    old = (a[degf] & 1) == 1;
-
-                    for (int i = degf - 1; i >= 0; i--)
-                    {
-                        now = (a[i] & 1) != 0;
-
-                        a[i] = a[i] >>> 1;
-
-                        if (old)
-                        {
-                            a[i] ^= TWOTOMAXLONGM1;
-                        }
-
-                        old = now;
-                    }
-                    a[degf] = a[degf] >>> 1;
-
-                    if (old)
-                    {
-                        a[degf] ^= TWOTODEGB;
-                    }
-
-                    // Shift y.
-                    //
-                    old = (b[degf] & 1) == 1;
-
-                    for (int i = degf - 1; i >= 0; i--)
-                    {
-                        now = (b[i] & 1) != 0;
-
-                        b[i] = b[i] >>> 1;
-
-                        if (old)
-                        {
-                            b[i] ^= TWOTOMAXLONGM1;
-                        }
-
-                        old = now;
-                    }
-
-                    b[degf] = b[degf] >>> 1;
-
-                    if (old)
-                    {
-                        b[degf] ^= TWOTODEGB;
-                    }
-                }
-                else
-                {
-                    old = (a[0] & 1) == 1;
-                    a[0] = a[0] >>> 1;
-
-                    if (old)
-                    {
-                        a[0] ^= TWOTODEGB;
-                    }
-
-                    old = (b[0] & 1) == 1;
-                    b[0] = b[0] >>> 1;
-
-                    if (old)
-                    {
-                        b[0] ^= TWOTODEGB;
-                    }
-                }
-            }
-            assign(c);
-        }
-    }
-
-    /**
-     * returns <tt>this</tt> element to the power of 2.
-     *
-     * @return <tt>this</tt><sup>2</sup>
-     */
-    public GF2nElement square()
-    {
-        GF2nONBElement result = new GF2nONBElement(this);
-        result.squareThis();
-        return result;
-    }
-
-    /**
-     * squares <tt>this</tt> element.
-     */
-    public void squareThis()
-    {
-
-        long[] pol = getElement();
-
-        int f = mLength - 1;
-        int b = mBit - 1;
-
-        // Shift the coefficients one bit to the left.
-        //
-        long TWOTOMAXLONGM1 = mBitmask[MAXLONG - 1];
-        boolean old, now;
-
-        old = (pol[f] & mBitmask[b]) != 0;
-
-        for (int i = 0; i < f; i++)
-        {
-
-            now = (pol[i] & TWOTOMAXLONGM1) != 0;
-
-            pol[i] = pol[i] << 1;
-
-            if (old)
-            {
-                pol[i] ^= 1;
-            }
-
-            old = now;
-        }
-        now = (pol[f] & mBitmask[b]) != 0;
-
-        pol[f] = pol[f] << 1;
-
-        if (old)
-        {
-            pol[f] ^= 1;
-        }
-
-        // Set the bit with index mDegree to zero.
-        //
-        if (now)
-        {
-            pol[f] ^= mBitmask[b + 1];
-        }
-
-        assign(pol);
-    }
-
-    /**
-     * Compute the multiplicative inverse of this element.
-     *
-     * @return <tt>this<sup>-1</sup></tt> (newly created)
-     * @throws ArithmeticException if <tt>this</tt> is the zero element.
-     */
-    public GFElement invert()
-        throws ArithmeticException
-    {
-        GF2nONBElement result = new GF2nONBElement(this);
-        result.invertThis();
-        return result;
-    }
-
-    /**
-     * Multiplicatively invert of this element (overwrite <tt>this</tt>).
-     *
-     * @throws ArithmeticException if <tt>this</tt> is the zero element.
-     */
-    public void invertThis()
-        throws ArithmeticException
-    {
-
-        if (isZero())
-        {
-            throw new ArithmeticException();
-        }
-        int r = 31; // mDegree kann nur 31 Bits lang sein!!!
-
-        // Bitlaenge von mDegree:
-        for (boolean found = false; !found && r >= 0; r--)
-        {
-
-            if (((mDegree - 1) & mBitmask[r]) != 0)
-            {
-                found = true;
-            }
-        }
-        r++;
-
-        GF2nElement m = ZERO((GF2nONBField)mField);
-        GF2nElement n = new GF2nONBElement(this);
-
-        int k = 1;
-
-        for (int i = r - 1; i >= 0; i--)
-        {
-            m = (GF2nElement)n.clone();
-            for (int j = 1; j <= k; j++)
-            {
-                m.squareThis();
-            }
-
-            n.multiplyThisBy(m);
-
-            k <<= 1;
-            if (((mDegree - 1) & mBitmask[i]) != 0)
-            {
-                n.squareThis();
-
-                n.multiplyThisBy(this);
-
-                k++;
-            }
-        }
-        n.squareThis();
-    }
-
-    /**
-     * returns the root of<tt>this</tt> element.
-     *
-     * @return <tt>this</tt><sup>1/2</sup>
-     */
-    public GF2nElement squareRoot()
-    {
-        GF2nONBElement result = new GF2nONBElement(this);
-        result.squareRootThis();
-        return result;
-    }
-
-    /**
-     * square roots <tt>this</tt> element.
-     */
-    public void squareRootThis()
-    {
-
-        long[] pol = getElement();
-
-        int f = mLength - 1;
-        int b = mBit - 1;
-
-        // Shift the coefficients one bit to the right.
-        //
-        long TWOTOMAXLONGM1 = mBitmask[MAXLONG - 1];
-        boolean old, now;
-
-        old = (pol[0] & 1) != 0;
-
-        for (int i = f; i >= 0; i--)
-        {
-            now = (pol[i] & 1) != 0;
-            pol[i] = pol[i] >>> 1;
-
-            if (old)
-            {
-                if (i == f)
-                {
-                    pol[i] ^= mBitmask[b];
-                }
-                else
-                {
-                    pol[i] ^= TWOTOMAXLONGM1;
-                }
-            }
-            old = now;
-        }
-        assign(pol);
-    }
-
-    /**
-     * Returns the trace of this element.
-     *
-     * @return the trace of this element
-     */
-    public int trace()
-    {
-
-        // trace = sum of coefficients
-        //
-
-        int result = 0;
-
-        int max = mLength - 1;
-
-        for (int i = 0; i < max; i++)
-        {
-
-            for (int j = 0; j < MAXLONG; j++)
-            {
-
-                if ((mPol[i] & mBitmask[j]) != 0)
-                {
-                    result ^= 1;
-                }
-            }
-        }
-
-        int b = mBit;
-
-        for (int j = 0; j < b; j++)
-        {
-
-            if ((mPol[max] & mBitmask[j]) != 0)
-            {
-                result ^= 1;
-            }
-        }
-        return result;
-    }
-
-    /**
-     * Solves a quadratic equation.<br>
-     * Let z<sup>2</sup> + z = <tt>this</tt>. Then this method returns z.
-     *
-     * @return z with z<sup>2</sup> + z = <tt>this</tt>
-     * @throws NoSolutionException if z<sup>2</sup> + z = <tt>this</tt> does not have a
-     * solution
-     */
-    public GF2nElement solveQuadraticEquation()
-        throws RuntimeException
-    {
-
-        if (trace() == 1)
-        {
-            throw new RuntimeException();
-        }
-
-        long TWOTOMAXLONGM1 = mBitmask[MAXLONG - 1];
-        long ZERO = 0L;
-        long ONE = 1L;
-
-        long[] p = new long[mLength];
-        long z = 0L;
-        int j = 1;
-        for (int i = 0; i < mLength - 1; i++)
-        {
-
-            for (j = 1; j < MAXLONG; j++)
-            {
-
-                //
-                if (!((((mBitmask[j] & mPol[i]) != ZERO) && ((z & mBitmask[j - 1]) != ZERO)) || (((mPol[i] & mBitmask[j]) == ZERO) && ((z & mBitmask[j - 1]) == ZERO))))
-                {
-                    z ^= mBitmask[j];
-                }
-            }
-            p[i] = z;
-
-            if (((TWOTOMAXLONGM1 & z) != ZERO && (ONE & mPol[i + 1]) == ONE)
-                || ((TWOTOMAXLONGM1 & z) == ZERO && (ONE & mPol[i + 1]) == ZERO))
-            {
-                z = ZERO;
-            }
-            else
-            {
-                z = ONE;
-            }
-        }
-
-        int b = mDegree & (MAXLONG - 1);
-
-        long LASTLONG = mPol[mLength - 1];
-
-        for (j = 1; j < b; j++)
-        {
-            if (!((((mBitmask[j] & LASTLONG) != ZERO) && ((mBitmask[j - 1] & z) != ZERO)) || (((mBitmask[j] & LASTLONG) == ZERO) && ((mBitmask[j - 1] & z) == ZERO))))
-            {
-                z ^= mBitmask[j];
-            }
-        }
-        p[mLength - 1] = z;
-        return new GF2nONBElement((GF2nONBField)mField, p);
-    }
-
-    // /////////////////////////////////////////////////////////////////
-    // conversion
-    // /////////////////////////////////////////////////////////////////
-
-    /**
-     * Returns a String representation of this element.
-     *
-     * @return String representation of this element with the specified radix
-     */
-    public String toString()
-    {
-        return toString(16);
-    }
-
-    /**
-     * Returns a String representation of this element. <tt>radix</tt>
-     * specifies the radix of the String representation.<br>
-     * NOTE: ONLY <tt>radix = 2</tt> or <tt>radix = 16</tt> IS IMPLEMENTED
-     *
-     * @param radix specifies the radix of the String representation
-     * @return String representation of this element with the specified radix
-     */
-    public String toString(int radix)
-    {
-        String s = "";
-
-        long[] a = getElement();
-        int b = mBit;
-
-        if (radix == 2)
-        {
-
-            for (int j = b - 1; j >= 0; j--)
-            {
-                if ((a[a.length - 1] & ((long)1 << j)) == 0)
-                {
-                    s += "0";
-                }
-                else
-                {
-                    s += "1";
-                }
-            }
-
-            for (int i = a.length - 2; i >= 0; i--)
-            {
-                for (int j = MAXLONG - 1; j >= 0; j--)
-                {
-                    if ((a[i] & mBitmask[j]) == 0)
-                    {
-                        s += "0";
-                    }
-                    else
-                    {
-                        s += "1";
-                    }
-                }
-            }
-        }
-        else if (radix == 16)
-        {
-            final char[] HEX_CHARS = {'0', '1', '2', '3', '4', '5', '6', '7',
-                '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'};
-            for (int i = a.length - 1; i >= 0; i--)
-            {
-                s += HEX_CHARS[(int)(a[i] >>> 60) & 0x0f];
-                s += HEX_CHARS[(int)(a[i] >>> 56) & 0x0f];
-                s += HEX_CHARS[(int)(a[i] >>> 52) & 0x0f];
-                s += HEX_CHARS[(int)(a[i] >>> 48) & 0x0f];
-                s += HEX_CHARS[(int)(a[i] >>> 44) & 0x0f];
-                s += HEX_CHARS[(int)(a[i] >>> 40) & 0x0f];
-                s += HEX_CHARS[(int)(a[i] >>> 36) & 0x0f];
-                s += HEX_CHARS[(int)(a[i] >>> 32) & 0x0f];
-                s += HEX_CHARS[(int)(a[i] >>> 28) & 0x0f];
-                s += HEX_CHARS[(int)(a[i] >>> 24) & 0x0f];
-                s += HEX_CHARS[(int)(a[i] >>> 20) & 0x0f];
-                s += HEX_CHARS[(int)(a[i] >>> 16) & 0x0f];
-                s += HEX_CHARS[(int)(a[i] >>> 12) & 0x0f];
-                s += HEX_CHARS[(int)(a[i] >>> 8) & 0x0f];
-                s += HEX_CHARS[(int)(a[i] >>> 4) & 0x0f];
-                s += HEX_CHARS[(int)(a[i]) & 0x0f];
-                s += " ";
-            }
-        }
-        return s;
-    }
-
-    /**
-     * Returns this element as FlexiBigInt. The conversion is <a href =
-     * "http://grouper.ieee.org/groups/1363/">P1363</a>-conform.
-     *
-     * @return this element as BigInteger
-     */
-    public BigInteger toFlexiBigInt()
-    {
-        /** @todo this method does not reverse the bit-order as it should!!! */
-
-        return new BigInteger(1, toByteArray());
-    }
-
-    /**
-     * Returns this element as byte array. The conversion is <a href =
-     * "http://grouper.ieee.org/groups/1363/">P1363</a>-conform.
-     *
-     * @return this element as byte array
-     */
-    public byte[] toByteArray()
-    {
-        /** @todo this method does not reverse the bit-order as it should!!! */
-
-        int k = ((mDegree - 1) >> 3) + 1;
-        byte[] result = new byte[k];
-        int i;
-        for (i = 0; i < k; i++)
-        {
-            result[k - i - 1] = (byte)((mPol[i >>> 3] & (0x00000000000000ffL << ((i & 0x07) << 3))) >>> ((i & 0x07) << 3));
-        }
-        return result;
-    }
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/math/linearalgebra/GF2nONBField.java b/bcprov/src/main/java/org/bouncycastle/pqc/math/linearalgebra/GF2nONBField.java
deleted file mode 100644
index 1e4c8b2..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/math/linearalgebra/GF2nONBField.java
+++ /dev/null
@@ -1,546 +0,0 @@
-package org.bouncycastle.pqc.math.linearalgebra;
-
-
-import java.util.Random;
-import java.util.Vector;
-
-
-/**
- * This class implements the abstract class <tt>GF2nField</tt> for ONB
- * representation. It computes the fieldpolynomial, multiplication matrix and
- * one of its roots mONBRoot, (see for example <a
- * href=http://www2.certicom.com/ecc/intro.htm>Certicoms Whitepapers</a>).
- * GF2nField is used by GF2nONBElement which implements the elements of this
- * field.
- *
- * @see GF2nField
- * @see GF2nONBElement
- */
-public class GF2nONBField
-    extends GF2nField
-{
-
-    // ///////////////////////////////////////////////////////////////////
-    // Hashtable for irreducible normal polynomials //
-    // ///////////////////////////////////////////////////////////////////
-
-    // i*5 + 0 i*5 + 1 i*5 + 2 i*5 + 3 i*5 + 4
-    /*
-     * private static int[][] mNB = {{0, 0, 0}, {0, 0, 0}, {1, 0, 0}, {1, 0, 0},
-     * {1, 0, 0}, // i = 0 {2, 0, 0}, {1, 0, 0}, {1, 0, 0}, {4, 3, 1}, {1, 0,
-     * 0}, // i = 1 {3, 0, 0}, {2, 0, 0}, {3, 0, 0}, {4, 3, 1}, {5, 0, 0}, // i =
-     * 2 {1, 0, 0}, {5, 3, 1}, {3, 0, 0}, {3, 0, 0}, {5, 2, 1}, // i = 3 {3, 0,
-     * 0}, {2, 0, 0}, {1, 0, 0}, {5, 0, 0}, {4, 3, 1}, // i = 4 {3, 0, 0}, {4,
-     * 3, 1}, {5, 2, 1}, {1, 0, 0}, {2, 0, 0}, // i = 5 {1, 0, 0}, {3, 0, 0},
-     * {7, 3, 2}, {10, 0, 0}, {7, 0, 0}, // i = 6 {2, 0, 0}, {9, 0, 0}, {6, 4,
-     * 1}, {6, 5, 1}, {4, 0, 0}, // i = 7 {5, 4, 3}, {3, 0, 0}, {7, 0, 0}, {6,
-     * 4, 3}, {5, 0, 0}, // i = 8 {4, 3, 1}, {1, 0, 0}, {5, 0, 0}, {5, 3, 2},
-     * {9, 0, 0}, // i = 9 {4, 3, 2}, {6, 3, 1}, {3, 0, 0}, {6, 2, 1}, {9, 0,
-     * 0}, // i = 10 {7, 0, 0}, {7, 4, 2}, {4, 0, 0}, {19, 0, 0}, {7, 4, 2}, //
-     * i = 11 {1, 0, 0}, {5, 2, 1}, {29, 0, 0}, {1, 0, 0}, {4, 3, 1}, // i = 12
-     * {18, 0, 0}, {3, 0, 0}, {5, 2, 1}, {9, 0, 0}, {6, 5, 2}, // i = 13 {5, 3,
-     * 1}, {6, 0, 0}, {10, 9, 3}, {25, 0, 0}, {35, 0, 0}, // i = 14 {6, 3, 1},
-     * {21, 0, 0}, {6, 5, 2}, {6, 5, 3}, {9, 0, 0}, // i = 15 {9, 4, 2}, {4, 0,
-     * 0}, {8, 3, 1}, {7, 4, 2}, {5, 0, 0}, // i = 16 {8, 2, 1}, {21, 0, 0},
-     * {13, 0, 0}, {7, 6, 2}, {38, 0, 0}, // i = 17 {27, 0, 0}, {8, 5, 1}, {21,
-     * 0, 0}, {2, 0, 0}, {21, 0, 0}, // i = 18 {11, 0, 0}, {10, 9, 6}, {6, 0,
-     * 0}, {11, 0, 0}, {6, 3, 1}, // i = 19 {15, 0, 0}, {7, 6, 1}, {29, 0, 0},
-     * {9, 0, 0}, {4, 3, 1}, // i = 20 {4, 0, 0}, {15, 0, 0}, {9, 7, 4}, {17, 0,
-     * 0}, {5, 4, 2}, // i = 21 {33, 0, 0}, {10, 0, 0}, {5, 4, 3}, {9, 0, 0},
-     * {5, 3, 2}, // i = 22 {8, 7, 5}, {4, 2, 1}, {5, 2, 1}, {33, 0, 0}, {8, 0,
-     * 0}, // i = 23 {4, 3, 1}, {18, 0, 0}, {6, 2, 1}, {2, 0, 0}, {19, 0, 0}, //
-     * i = 24 {7, 6, 5}, {21, 0, 0}, {1, 0, 0}, {7, 2, 1}, {5, 0, 0}, // i = 25
-     * {3, 0, 0}, {8, 3, 2}, {17, 0, 0}, {9, 8, 2}, {57, 0, 0}, // i = 26 {11,
-     * 0, 0}, {5, 3, 2}, {21, 0, 0}, {8, 7, 1}, {8, 5, 3}, // i = 27 {15, 0, 0},
-     * {10, 4, 1}, {21, 0, 0}, {5, 3, 2}, {7, 4, 2}, // i = 28 {52, 0, 0}, {71,
-     * 0, 0}, {14, 0, 0}, {27, 0, 0}, {10, 9, 7}, // i = 29 {53, 0, 0}, {3, 0,
-     * 0}, {6, 3, 2}, {1, 0, 0}, {15, 0, 0}, // i = 30 {62, 0, 0}, {9, 0, 0},
-     * {6, 5, 2}, {8, 6, 5}, {31, 0, 0}, // i = 31 {5, 3, 2}, {18, 0, 0 }, {27,
-     * 0, 0}, {7, 6, 3}, {10, 8, 7}, // i = 32 {9, 8, 3}, {37, 0, 0}, {6, 0, 0},
-     * {15, 3, 2}, {34, 0, 0}, // i = 33 {11, 0, 0}, {6, 5, 2}, {1, 0, 0}, {8,
-     * 5, 2}, {13, 0, 0}, // i = 34 {6, 0, 0}, {11, 3, 2}, {8, 0, 0}, {31, 0,
-     * 0}, {4, 2, 1}, // i = 35 {3, 0, 0}, {7, 6, 1}, {81, 0, 0}, {56, 0, 0},
-     * {9, 8, 7}, // i = 36 {24, 0, 0}, {11, 0, 0}, {7, 6, 5}, {6, 5, 2}, {6, 5,
-     * 2}, // i = 37 {8, 7, 6}, {9, 0, 0}, {7, 2, 1}, {15, 0, 0}, {87, 0, 0}, //
-     * i = 38 {8, 3, 2}, {3, 0, 0}, {9, 4, 2}, {9, 0, 0}, {34, 0, 0}, // i = 39
-     * {5, 3, 2}, {14, 0, 0}, {55, 0, 0}, {8, 7, 1}, {27, 0, 0}, // i = 40 {9,
-     * 5, 2}, {10, 9, 5}, {43, 0, 0}, {8, 6, 2}, {6, 0, 0}, // i = 41 {7, 0, 0},
-     * {11, 10, 8}, {105, 0, 0}, {6, 5, 2}, {73, 0, 0}}; // i = 42
-     */
-    // /////////////////////////////////////////////////////////////////////
-    // member variables
-    // /////////////////////////////////////////////////////////////////////
-    private static final int MAXLONG = 64;
-
-    /**
-     * holds the length of the array-representation of degree mDegree.
-     */
-    private int mLength;
-
-    /**
-     * holds the number of relevant bits in mONBPol[mLength-1].
-     */
-    private int mBit;
-
-    /**
-     * holds the type of mONB
-     */
-    private int mType;
-
-    /**
-     * holds the multiplication matrix
-     */
-    int[][] mMult;
-
-    // /////////////////////////////////////////////////////////////////////
-    // constructors
-    // /////////////////////////////////////////////////////////////////////
-
-    /**
-     * constructs an instance of the finite field with 2<sup>deg</sup>
-     * elements and characteristic 2.
-     *
-     * @param deg -
-     *            the extention degree of this field
-     * @throws NoSuchBasisException if an ONB-implementation other than type 1 or type 2 is
-     * requested.
-     */
-    public GF2nONBField(int deg)
-        throws RuntimeException
-    {
-        if (deg < 3)
-        {
-            throw new IllegalArgumentException("k must be at least 3");
-        }
-
-        mDegree = deg;
-        mLength = mDegree / MAXLONG;
-        mBit = mDegree & (MAXLONG - 1);
-        if (mBit == 0)
-        {
-            mBit = MAXLONG;
-        }
-        else
-        {
-            mLength++;
-        }
-
-        computeType();
-
-        // only ONB-implementations for type 1 and type 2
-        //
-        if (mType < 3)
-        {
-            mMult = new int[mDegree][2];
-            for (int i = 0; i < mDegree; i++)
-            {
-                mMult[i][0] = -1;
-                mMult[i][1] = -1;
-            }
-            computeMultMatrix();
-        }
-        else
-        {
-            throw new RuntimeException("\nThe type of this field is "
-                + mType);
-        }
-        computeFieldPolynomial();
-        fields = new Vector();
-        matrices = new Vector();
-    }
-
-    // /////////////////////////////////////////////////////////////////////
-    // access
-    // /////////////////////////////////////////////////////////////////////
-
-    int getONBLength()
-    {
-        return mLength;
-    }
-
-    int getONBBit()
-    {
-        return mBit;
-    }
-
-    // /////////////////////////////////////////////////////////////////////
-    // arithmetic
-    // /////////////////////////////////////////////////////////////////////
-
-    /**
-     * Computes a random root of the given polynomial.
-     *
-     * @param polynomial a polynomial
-     * @return a random root of the polynomial
-     * @see "P1363 A.5.6, p103f"
-     */
-    protected GF2nElement getRandomRoot(GF2Polynomial polynomial)
-    {
-        // We are in B1!!!
-        GF2nPolynomial c;
-        GF2nPolynomial ut;
-        GF2nElement u;
-        GF2nPolynomial h;
-        int hDegree;
-        // 1. Set g(t) <- f(t)
-        GF2nPolynomial g = new GF2nPolynomial(polynomial, this);
-        int gDegree = g.getDegree();
-        int i;
-
-        // 2. while deg(g) > 1
-        while (gDegree > 1)
-        {
-            do
-            {
-                // 2.1 choose random u (element of) GF(2^m)
-                u = new GF2nONBElement(this, new Random());
-                ut = new GF2nPolynomial(2, GF2nONBElement.ZERO(this));
-                // 2.2 Set c(t) <- ut
-                ut.set(1, u);
-                c = new GF2nPolynomial(ut);
-                // 2.3 For i from 1 to m-1 do
-                for (i = 1; i <= mDegree - 1; i++)
-                {
-                    // 2.3.1 c(t) <- (c(t)^2 + ut) mod g(t)
-                    c = c.multiplyAndReduce(c, g);
-                    c = c.add(ut);
-                }
-                // 2.4 set h(t) <- GCD(c(t), g(t))
-                h = c.gcd(g);
-                // 2.5 if h(t) is constant or deg(g) = deg(h) then go to
-                // step 2.1
-                hDegree = h.getDegree();
-                gDegree = g.getDegree();
-            }
-            while ((hDegree == 0) || (hDegree == gDegree));
-            // 2.6 If 2deg(h) > deg(g) then set g(t) <- g(t)/h(t) ...
-            if ((hDegree << 1) > gDegree)
-            {
-                g = g.quotient(h);
-            }
-            else
-            {
-                // ... else g(t) <- h(t)
-                g = new GF2nPolynomial(h);
-            }
-            gDegree = g.getDegree();
-        }
-        // 3. Output g(0)
-        return g.at(0);
-
-    }
-
-    /**
-     * Computes the change-of-basis matrix for basis conversion according to
-     * 1363. The result is stored in the lists fields and matrices.
-     *
-     * @param B1 the GF2nField to convert to
-     * @see "P1363 A.7.3, p111ff"
-     */
-    protected void computeCOBMatrix(GF2nField B1)
-    {
-        // we are in B0 here!
-        if (mDegree != B1.mDegree)
-        {
-            throw new IllegalArgumentException(
-                "GF2nField.computeCOBMatrix: B1 has a "
-                    + "different degree and thus cannot be coverted to!");
-        }
-        int i, j;
-        GF2nElement[] gamma;
-        GF2nElement u;
-        GF2Polynomial[] COBMatrix = new GF2Polynomial[mDegree];
-        for (i = 0; i < mDegree; i++)
-        {
-            COBMatrix[i] = new GF2Polynomial(mDegree);
-        }
-
-        // find Random Root
-        do
-        {
-            // u is in representation according to B1
-            u = B1.getRandomRoot(fieldPolynomial);
-        }
-        while (u.isZero());
-
-        gamma = new GF2nPolynomialElement[mDegree];
-        // build gamma matrix by squaring
-        gamma[0] = (GF2nElement)u.clone();
-        for (i = 1; i < mDegree; i++)
-        {
-            gamma[i] = gamma[i - 1].square();
-        }
-        // convert horizontal gamma matrix by vertical Bitstrings
-        for (i = 0; i < mDegree; i++)
-        {
-            for (j = 0; j < mDegree; j++)
-            {
-                if (gamma[i].testBit(j))
-                {
-                    COBMatrix[mDegree - j - 1].setBit(mDegree - i - 1);
-                }
-            }
-        }
-
-        fields.addElement(B1);
-        matrices.addElement(COBMatrix);
-        B1.fields.addElement(this);
-        B1.matrices.addElement(invertMatrix(COBMatrix));
-    }
-
-    /**
-     * Computes the field polynomial for a ONB according to IEEE 1363 A.7.2
-     * (p110f).
-     *
-     * @see "P1363 A.7.2, p110f"
-     */
-    protected void computeFieldPolynomial()
-    {
-        if (mType == 1)
-        {
-            fieldPolynomial = new GF2Polynomial(mDegree + 1, "ALL");
-        }
-        else if (mType == 2)
-        {
-            // 1. q = 1
-            GF2Polynomial q = new GF2Polynomial(mDegree + 1, "ONE");
-            // 2. p = t+1
-            GF2Polynomial p = new GF2Polynomial(mDegree + 1, "X");
-            p.addToThis(q);
-            GF2Polynomial r;
-            int i;
-            // 3. for i = 1 to (m-1) do
-            for (i = 1; i < mDegree; i++)
-            {
-                // r <- q
-                r = q;
-                // q <- p
-                q = p;
-                // p = tq+r
-                p = q.shiftLeft();
-                p.addToThis(r);
-            }
-            fieldPolynomial = p;
-        }
-    }
-
-    /**
-     * Compute the inverse of a matrix <tt>a</tt>.
-     *
-     * @param a the matrix
-     * @return <tt>a<sup>-1</sup></tt>
-     */
-    int[][] invMatrix(int[][] a)
-    {
-
-        int[][] A = new int[mDegree][mDegree];
-        A = a;
-        int[][] inv = new int[mDegree][mDegree];
-
-        for (int i = 0; i < mDegree; i++)
-        {
-            inv[i][i] = 1;
-        }
-
-        for (int i = 0; i < mDegree; i++)
-        {
-            for (int j = i; j < mDegree; j++)
-            {
-                A[mDegree - 1 - i][j] = A[i][i];
-            }
-        }
-        return null;
-    }
-
-    private void computeType()
-        throws RuntimeException
-    {
-        if ((mDegree & 7) == 0)
-        {
-            throw new RuntimeException(
-                "The extension degree is divisible by 8!");
-        }
-        // checking for the type
-        int s = 0;
-        int k = 0;
-        mType = 1;
-        for (int d = 0; d != 1; mType++)
-        {
-            s = mType * mDegree + 1;
-            if (IntegerFunctions.isPrime(s))
-            {
-                k = IntegerFunctions.order(2, s);
-                d = IntegerFunctions.gcd(mType * mDegree / k, mDegree);
-            }
-        }
-        mType--;
-        if (mType == 1)
-        {
-            s = (mDegree << 1) + 1;
-            if (IntegerFunctions.isPrime(s))
-            {
-                k = IntegerFunctions.order(2, s);
-                int d = IntegerFunctions.gcd((mDegree << 1) / k, mDegree);
-                if (d == 1)
-                {
-                    mType++;
-                }
-            }
-        }
-    }
-
-    private void computeMultMatrix()
-    {
-
-        if ((mType & 7) != 0)
-        {
-            int p = mType * mDegree + 1;
-
-            // compute sequence F[1] ... F[p-1] via A.3.7. of 1363.
-            // F[0] will not be filled!
-            //
-            int[] F = new int[p];
-
-            int u;
-            if (mType == 1)
-            {
-                u = 1;
-            }
-            else if (mType == 2)
-            {
-                u = p - 1;
-            }
-            else
-            {
-                u = elementOfOrder(mType, p);
-            }
-
-            int w = 1;
-            int n;
-            for (int j = 0; j < mType; j++)
-            {
-                n = w;
-
-                for (int i = 0; i < mDegree; i++)
-                {
-                    F[n] = i;
-                    n = (n << 1) % p;
-                    if (n < 0)
-                    {
-                        n += p;
-                    }
-                }
-                w = u * w % p;
-                if (w < 0)
-                {
-                    w += p;
-                }
-            }
-
-            // building the matrix (mDegree * 2)
-            //
-            if (mType == 1)
-            {
-                for (int k = 1; k < p - 1; k++)
-                {
-                    if (mMult[F[k + 1]][0] == -1)
-                    {
-                        mMult[F[k + 1]][0] = F[p - k];
-                    }
-                    else
-                    {
-                        mMult[F[k + 1]][1] = F[p - k];
-                    }
-                }
-
-                int m_2 = mDegree >> 1;
-                for (int k = 1; k <= m_2; k++)
-                {
-
-                    if (mMult[k - 1][0] == -1)
-                    {
-                        mMult[k - 1][0] = m_2 + k - 1;
-                    }
-                    else
-                    {
-                        mMult[k - 1][1] = m_2 + k - 1;
-                    }
-
-                    if (mMult[m_2 + k - 1][0] == -1)
-                    {
-                        mMult[m_2 + k - 1][0] = k - 1;
-                    }
-                    else
-                    {
-                        mMult[m_2 + k - 1][1] = k - 1;
-                    }
-                }
-            }
-            else if (mType == 2)
-            {
-                for (int k = 1; k < p - 1; k++)
-                {
-                    if (mMult[F[k + 1]][0] == -1)
-                    {
-                        mMult[F[k + 1]][0] = F[p - k];
-                    }
-                    else
-                    {
-                        mMult[F[k + 1]][1] = F[p - k];
-                    }
-                }
-            }
-            else
-            {
-                throw new RuntimeException("only type 1 or type 2 implemented");
-            }
-        }
-        else
-        {
-            throw new RuntimeException("bisher nur fuer Gausssche Normalbasen"
-                + " implementiert");
-        }
-    }
-
-    private int elementOfOrder(int k, int p)
-    {
-        Random random = new Random();
-        int m = 0;
-        while (m == 0)
-        {
-            m = random.nextInt();
-            m %= p - 1;
-            if (m < 0)
-            {
-                m += p - 1;
-            }
-        }
-
-        int l = IntegerFunctions.order(m, p);
-
-        while (l % k != 0 || l == 0)
-        {
-            while (m == 0)
-            {
-                m = random.nextInt();
-                m %= p - 1;
-                if (m < 0)
-                {
-                    m += p - 1;
-                }
-            }
-            l = IntegerFunctions.order(m, p);
-        }
-        int r = m;
-
-        l = k / l;
-
-        for (int i = 2; i <= l; i++)
-        {
-            r *= m;
-        }
-
-        return r;
-    }
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/math/linearalgebra/GF2nPolynomial.java b/bcprov/src/main/java/org/bouncycastle/pqc/math/linearalgebra/GF2nPolynomial.java
deleted file mode 100644
index f122be0..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/math/linearalgebra/GF2nPolynomial.java
+++ /dev/null
@@ -1,587 +0,0 @@
-package org.bouncycastle.pqc.math.linearalgebra;
-
-
-/**
- * This class implements polynomials over GF2nElements.
- *
- * @see GF2nElement
- */
-
-public class GF2nPolynomial
-{
-
-    private GF2nElement[] coeff; // keeps the coefficients of this polynomial
-
-    private int size; // the size of this polynomial
-
-    /**
-     * Creates a new PolynomialGF2n of size <i>deg</i> and elem as
-     * coefficients.
-     *
-     * @param deg  -
-     *             the maximum degree + 1
-     * @param elem -
-     *             a GF2nElement
-     */
-    public GF2nPolynomial(int deg, GF2nElement elem)
-    {
-        size = deg;
-        coeff = new GF2nElement[size];
-        for (int i = 0; i < size; i++)
-        {
-            coeff[i] = (GF2nElement)elem.clone();
-        }
-    }
-
-    /**
-     * Creates a new PolynomialGF2n of size <i>deg</i>.
-     *
-     * @param deg the maximum degree + 1
-     */
-    private GF2nPolynomial(int deg)
-    {
-        size = deg;
-        coeff = new GF2nElement[size];
-    }
-
-    /**
-     * Creates a new PolynomialGF2n by cloning the given PolynomialGF2n <i>a</i>.
-     *
-     * @param a the PolynomialGF2n to clone
-     */
-    public GF2nPolynomial(GF2nPolynomial a)
-    {
-        int i;
-        coeff = new GF2nElement[a.size];
-        size = a.size;
-        for (i = 0; i < size; i++)
-        {
-            coeff[i] = (GF2nElement)a.coeff[i].clone();
-        }
-    }
-
-    /**
-     * Creates a new PolynomialGF2n from the given Bitstring <i>polynomial</i>
-     * over the GF2nField <i>B1</i>.
-     *
-     * @param polynomial the Bitstring to use
-     * @param B1         the field
-     */
-    public GF2nPolynomial(GF2Polynomial polynomial, GF2nField B1)
-    {
-        size = B1.getDegree() + 1;
-        coeff = new GF2nElement[size];
-        int i;
-        if (B1 instanceof GF2nONBField)
-        {
-            for (i = 0; i < size; i++)
-            {
-                if (polynomial.testBit(i))
-                {
-                    coeff[i] = GF2nONBElement.ONE((GF2nONBField)B1);
-                }
-                else
-                {
-                    coeff[i] = GF2nONBElement.ZERO((GF2nONBField)B1);
-                }
-            }
-        }
-        else if (B1 instanceof GF2nPolynomialField)
-        {
-            for (i = 0; i < size; i++)
-            {
-                if (polynomial.testBit(i))
-                {
-                    coeff[i] = GF2nPolynomialElement
-                        .ONE((GF2nPolynomialField)B1);
-                }
-                else
-                {
-                    coeff[i] = GF2nPolynomialElement
-                        .ZERO((GF2nPolynomialField)B1);
-                }
-            }
-        }
-        else
-        {
-            throw new IllegalArgumentException(
-                "PolynomialGF2n(Bitstring, GF2nField): B1 must be "
-                    + "an instance of GF2nONBField or GF2nPolynomialField!");
-        }
-    }
-
-    public final void assignZeroToElements()
-    {
-        int i;
-        for (i = 0; i < size; i++)
-        {
-            coeff[i].assignZero();
-        }
-    }
-
-    /**
-     * Returns the size (=maximum degree + 1) of this PolynomialGF2n. This is
-     * not the degree, use getDegree instead.
-     *
-     * @return the size (=maximum degree + 1) of this PolynomialGF2n.
-     */
-    public final int size()
-    {
-        return size;
-    }
-
-    /**
-     * Returns the degree of this PolynomialGF2n.
-     *
-     * @return the degree of this PolynomialGF2n.
-     */
-    public final int getDegree()
-    {
-        int i;
-        for (i = size - 1; i >= 0; i--)
-        {
-            if (!coeff[i].isZero())
-            {
-                return i;
-            }
-        }
-        return -1;
-    }
-
-    /**
-     * Enlarges the size of this PolynomialGF2n to <i>k</i> + 1.
-     *
-     * @param k the new maximum degree
-     */
-    public final void enlarge(int k)
-    {
-        if (k <= size)
-        {
-            return;
-        }
-        int i;
-        GF2nElement[] res = new GF2nElement[k];
-        System.arraycopy(coeff, 0, res, 0, size);
-        GF2nField f = coeff[0].getField();
-        if (coeff[0] instanceof GF2nPolynomialElement)
-        {
-            for (i = size; i < k; i++)
-            {
-                res[i] = GF2nPolynomialElement.ZERO((GF2nPolynomialField)f);
-            }
-        }
-        else if (coeff[0] instanceof GF2nONBElement)
-        {
-            for (i = size; i < k; i++)
-            {
-                res[i] = GF2nONBElement.ZERO((GF2nONBField)f);
-            }
-        }
-        size = k;
-        coeff = res;
-    }
-
-    public final void shrink()
-    {
-        int i = size - 1;
-        while (coeff[i].isZero() && (i > 0))
-        {
-            i--;
-        }
-        i++;
-        if (i < size)
-        {
-            GF2nElement[] res = new GF2nElement[i];
-            System.arraycopy(coeff, 0, res, 0, i);
-            coeff = res;
-            size = i;
-        }
-    }
-
-    /**
-     * Sets the coefficient at <i>index</i> to <i>elem</i>.
-     *
-     * @param index the index
-     * @param elem  the GF2nElement to store as coefficient <i>index</i>
-     */
-    public final void set(int index, GF2nElement elem)
-    {
-        if (!(elem instanceof GF2nPolynomialElement)
-            && !(elem instanceof GF2nONBElement))
-        {
-            throw new IllegalArgumentException(
-                "PolynomialGF2n.set f must be an "
-                    + "instance of either GF2nPolynomialElement or GF2nONBElement!");
-        }
-        coeff[index] = (GF2nElement)elem.clone();
-    }
-
-    /**
-     * Returns the coefficient at <i>index</i>.
-     *
-     * @param index the index
-     * @return the GF2nElement stored as coefficient <i>index</i>
-     */
-    public final GF2nElement at(int index)
-    {
-        return coeff[index];
-    }
-
-    /**
-     * Returns true if all coefficients equal zero.
-     *
-     * @return true if all coefficients equal zero.
-     */
-    public final boolean isZero()
-    {
-        int i;
-        for (i = 0; i < size; i++)
-        {
-            if (coeff[i] != null)
-            {
-                if (!coeff[i].isZero())
-                {
-                    return false;
-                }
-            }
-        }
-        return true;
-    }
-
-    public final boolean equals(Object other)
-    {
-        if (other == null || !(other instanceof GF2nPolynomial))
-        {
-            return false;
-        }
-
-        GF2nPolynomial otherPol = (GF2nPolynomial)other;
-
-        if (getDegree() != otherPol.getDegree())
-        {
-            return false;
-        }
-        int i;
-        for (i = 0; i < size; i++)
-        {
-            if (!coeff[i].equals(otherPol.coeff[i]))
-            {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    /**
-     * @return the hash code of this polynomial
-     */
-    public int hashCode()
-    {
-        return getDegree() + coeff.hashCode();
-    }
-
-    /**
-     * Adds the PolynomialGF2n <tt>b</tt> to <tt>this</tt> and returns the
-     * result in a new <tt>PolynomialGF2n</tt>.
-     *
-     * @param b -
-     *          the <tt>PolynomialGF2n</tt> to add
-     * @return <tt>this + b</tt>
-     * @throws DifferentFieldsException if <tt>this</tt> and <tt>b</tt> are not defined over
-     * the same field.
-     */
-    public final GF2nPolynomial add(GF2nPolynomial b)
-        throws RuntimeException
-    {
-        GF2nPolynomial result;
-        if (size() >= b.size())
-        {
-            result = new GF2nPolynomial(size());
-            int i;
-            for (i = 0; i < b.size(); i++)
-            {
-                result.coeff[i] = (GF2nElement)coeff[i].add(b.coeff[i]);
-            }
-            for (; i < size(); i++)
-            {
-                result.coeff[i] = coeff[i];
-            }
-        }
-        else
-        {
-            result = new GF2nPolynomial(b.size());
-            int i;
-            for (i = 0; i < size(); i++)
-            {
-                result.coeff[i] = (GF2nElement)coeff[i].add(b.coeff[i]);
-            }
-            for (; i < b.size(); i++)
-            {
-                result.coeff[i] = b.coeff[i];
-            }
-        }
-        return result;
-    }
-
-    /**
-     * Multiplies the scalar <i>s</i> to each coefficient of this
-     * PolynomialGF2n and returns the result in a new PolynomialGF2n.
-     *
-     * @param s the scalar to multiply
-     * @return <i>this</i> x <i>s</i>
-     * @throws DifferentFieldsException if <tt>this</tt> and <tt>s</tt> are not defined over
-     * the same field.
-     */
-    public final GF2nPolynomial scalarMultiply(GF2nElement s)
-        throws RuntimeException
-    {
-        GF2nPolynomial result = new GF2nPolynomial(size());
-        int i;
-        for (i = 0; i < size(); i++)
-        {
-            result.coeff[i] = (GF2nElement)coeff[i].multiply(s); // result[i]
-            // =
-            // a[i]*s
-        }
-        return result;
-    }
-
-    /**
-     * Multiplies <i>this</i> by <i>b</i> and returns the result in a new
-     * PolynomialGF2n.
-     *
-     * @param b the PolynomialGF2n to multiply
-     * @return <i>this</i> * <i>b</i>
-     * @throws DifferentFieldsException if <tt>this</tt> and <tt>b</tt> are not defined over
-     * the same field.
-     */
-    public final GF2nPolynomial multiply(GF2nPolynomial b)
-        throws RuntimeException
-    {
-        int i, j;
-        int aDegree = size();
-        int bDegree = b.size();
-        if (aDegree != bDegree)
-        {
-            throw new IllegalArgumentException(
-                "PolynomialGF2n.multiply: this and b must "
-                    + "have the same size!");
-        }
-        GF2nPolynomial result = new GF2nPolynomial((aDegree << 1) - 1);
-        for (i = 0; i < size(); i++)
-        {
-            for (j = 0; j < b.size(); j++)
-            {
-                if (result.coeff[i + j] == null)
-                {
-                    result.coeff[i + j] = (GF2nElement)coeff[i]
-                        .multiply(b.coeff[j]);
-                }
-                else
-                {
-                    result.coeff[i + j] = (GF2nElement)result.coeff[i + j]
-                        .add(coeff[i].multiply(b.coeff[j]));
-                }
-            }
-        }
-        return result;
-    }
-
-    /**
-     * Multiplies <i>this</i> by <i>b</i>, reduces the result by <i>g</i> and
-     * returns it in a new PolynomialGF2n.
-     *
-     * @param b the PolynomialGF2n to multiply
-     * @param g the modul
-     * @return <i>this</i> * <i>b</i> mod <i>g</i>
-     * @throws DifferentFieldsException if <tt>this</tt>, <tt>b</tt> and <tt>g</tt> are
-     * not all defined over the same field.
-     */
-    public final GF2nPolynomial multiplyAndReduce(GF2nPolynomial b,
-                                                  GF2nPolynomial g)
-        throws RuntimeException,
-        ArithmeticException
-    {
-        return multiply(b).reduce(g);
-    }
-
-    /**
-     * Reduces <i>this</i> by <i>g</i> and returns the result in a new
-     * PolynomialGF2n.
-     *
-     * @param g -
-     *          the modulus
-     * @return <i>this</i> % <i>g</i>
-     * @throws DifferentFieldsException if <tt>this</tt> and <tt>g</tt> are not defined over
-     * the same field.
-     */
-    public final GF2nPolynomial reduce(GF2nPolynomial g)
-        throws RuntimeException, ArithmeticException
-    {
-        return remainder(g); // return this % g
-    }
-
-    /**
-     * Shifts left <i>this</i> by <i>amount</i> and stores the result in
-     * <i>this</i> PolynomialGF2n.
-     *
-     * @param amount the amount to shift the coefficients
-     */
-    public final void shiftThisLeft(int amount)
-    {
-        if (amount > 0)
-        {
-            int i;
-            int oldSize = size;
-            GF2nField f = coeff[0].getField();
-            enlarge(size + amount);
-            for (i = oldSize - 1; i >= 0; i--)
-            {
-                coeff[i + amount] = coeff[i];
-            }
-            if (coeff[0] instanceof GF2nPolynomialElement)
-            {
-                for (i = amount - 1; i >= 0; i--)
-                {
-                    coeff[i] = GF2nPolynomialElement
-                        .ZERO((GF2nPolynomialField)f);
-                }
-            }
-            else if (coeff[0] instanceof GF2nONBElement)
-            {
-                for (i = amount - 1; i >= 0; i--)
-                {
-                    coeff[i] = GF2nONBElement.ZERO((GF2nONBField)f);
-                }
-            }
-        }
-    }
-
-    public final GF2nPolynomial shiftLeft(int amount)
-    {
-        if (amount <= 0)
-        {
-            return new GF2nPolynomial(this);
-        }
-        GF2nPolynomial result = new GF2nPolynomial(size + amount, coeff[0]);
-        result.assignZeroToElements();
-        for (int i = 0; i < size; i++)
-        {
-            result.coeff[i + amount] = coeff[i];
-        }
-        return result;
-    }
-
-    /**
-     * Divides <i>this</i> by <i>b</i> and stores the result in a new
-     * PolynomialGF2n[2], quotient in result[0] and remainder in result[1].
-     *
-     * @param b the divisor
-     * @return the quotient and remainder of <i>this</i> / <i>b</i>
-     * @throws DifferentFieldsException if <tt>this</tt> and <tt>b</tt> are not defined over
-     * the same field.
-     */
-    public final GF2nPolynomial[] divide(GF2nPolynomial b)
-        throws RuntimeException, ArithmeticException
-    {
-        GF2nPolynomial[] result = new GF2nPolynomial[2];
-        GF2nPolynomial a = new GF2nPolynomial(this);
-        a.shrink();
-        GF2nPolynomial shift;
-        GF2nElement factor;
-        int bDegree = b.getDegree();
-        GF2nElement inv = (GF2nElement)b.coeff[bDegree].invert();
-        if (a.getDegree() < bDegree)
-        {
-            result[0] = new GF2nPolynomial(this);
-            result[0].assignZeroToElements();
-            result[0].shrink();
-            result[1] = new GF2nPolynomial(this);
-            result[1].shrink();
-            return result;
-        }
-        result[0] = new GF2nPolynomial(this);
-        result[0].assignZeroToElements();
-        int i = a.getDegree() - bDegree;
-        while (i >= 0)
-        {
-            factor = (GF2nElement)a.coeff[a.getDegree()].multiply(inv);
-            shift = b.scalarMultiply(factor);
-            shift.shiftThisLeft(i);
-            a = a.add(shift);
-            a.shrink();
-            result[0].coeff[i] = (GF2nElement)factor.clone();
-            i = a.getDegree() - bDegree;
-        }
-        result[1] = a;
-        result[0].shrink();
-        return result;
-    }
-
-    /**
-     * Divides <i>this</i> by <i>b</i> and stores the remainder in a new
-     * PolynomialGF2n.
-     *
-     * @param b the divisor
-     * @return the remainder <i>this</i> % <i>b</i>
-     * @throws DifferentFieldsException if <tt>this</tt> and <tt>b</tt> are not defined over
-     * the same field.
-     */
-    public final GF2nPolynomial remainder(GF2nPolynomial b)
-        throws RuntimeException, ArithmeticException
-    {
-        GF2nPolynomial[] result = new GF2nPolynomial[2];
-        result = divide(b);
-        return result[1];
-    }
-
-    /**
-     * Divides <i>this</i> by <i>b</i> and stores the quotient in a new
-     * PolynomialGF2n.
-     *
-     * @param b the divisor
-     * @return the quotient <i>this</i> / <i>b</i>
-     * @throws DifferentFieldsException if <tt>this</tt> and <tt>b</tt> are not defined over
-     * the same field.
-     */
-    public final GF2nPolynomial quotient(GF2nPolynomial b)
-        throws RuntimeException, ArithmeticException
-    {
-        GF2nPolynomial[] result = new GF2nPolynomial[2];
-        result = divide(b);
-        return result[0];
-    }
-
-    /**
-     * Computes the greatest common divisor of <i>this</i> and <i>g</i> and
-     * returns the result in a new PolynomialGF2n.
-     *
-     * @param g -
-     *          a GF2nPolynomial
-     * @return gcd(<i>this</i>, <i>g</i>)
-     * @throws DifferentFieldsException if the coefficients of <i>this</i> and <i>g</i> use
-     * different fields
-     * @throws ArithmeticException if coefficients are zero.
-     */
-    public final GF2nPolynomial gcd(GF2nPolynomial g)
-        throws RuntimeException, ArithmeticException
-    {
-        GF2nPolynomial a = new GF2nPolynomial(this);
-        GF2nPolynomial b = new GF2nPolynomial(g);
-        a.shrink();
-        b.shrink();
-        GF2nPolynomial c;
-        GF2nPolynomial result;
-        GF2nElement alpha;
-        while (!b.isZero())
-        {
-            c = a.remainder(b);
-            a = b;
-            b = c;
-        }
-        alpha = a.coeff[a.getDegree()];
-        result = a.scalarMultiply((GF2nElement)alpha.invert());
-        return result;
-    }
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/math/linearalgebra/GF2nPolynomialElement.java b/bcprov/src/main/java/org/bouncycastle/pqc/math/linearalgebra/GF2nPolynomialElement.java
deleted file mode 100644
index f175365..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/math/linearalgebra/GF2nPolynomialElement.java
+++ /dev/null
@@ -1,1021 +0,0 @@
-package org.bouncycastle.pqc.math.linearalgebra;
-
-
-import java.math.BigInteger;
-import java.util.Random;
-
-
-/**
- * This class implements elements of finite binary fields <i>GF(2<sup>n</sup>)</i>
- * using polynomial representation. For more information on the arithmetic see
- * for example IEEE Standard 1363 or <a
- * href=http://www.certicom.com/research/online.html> Certicom online-tutorial</a>.
- *
- * @see "GF2nField"
- * @see GF2nPolynomialField
- * @see GF2nONBElement
- * @see GF2Polynomial
- */
-public class GF2nPolynomialElement
-    extends GF2nElement
-{
-
-    // pre-computed Bitmask for fast masking, bitMask[a]=0x1 << a
-    private static final int[] bitMask = {0x00000001, 0x00000002, 0x00000004,
-        0x00000008, 0x00000010, 0x00000020, 0x00000040, 0x00000080,
-        0x00000100, 0x00000200, 0x00000400, 0x00000800, 0x00001000,
-        0x00002000, 0x00004000, 0x00008000, 0x00010000, 0x00020000,
-        0x00040000, 0x00080000, 0x00100000, 0x00200000, 0x00400000,
-        0x00800000, 0x01000000, 0x02000000, 0x04000000, 0x08000000,
-        0x10000000, 0x20000000, 0x40000000, 0x80000000, 0x00000000};
-
-    // the used GF2Polynomial which stores the coefficients
-    private GF2Polynomial polynomial;
-
-    /**
-     * Create a new random GF2nPolynomialElement using the given field and
-     * source of randomness.
-     *
-     * @param f    the GF2nField to use
-     * @param rand the source of randomness
-     */
-    public GF2nPolynomialElement(GF2nPolynomialField f, Random rand)
-    {
-        mField = f;
-        mDegree = mField.getDegree();
-        polynomial = new GF2Polynomial(mDegree);
-        randomize(rand);
-    }
-
-    /**
-     * Creates a new GF2nPolynomialElement using the given field and Bitstring.
-     *
-     * @param f  the GF2nPolynomialField to use
-     * @param bs the desired value as Bitstring
-     */
-    public GF2nPolynomialElement(GF2nPolynomialField f, GF2Polynomial bs)
-    {
-        mField = f;
-        mDegree = mField.getDegree();
-        polynomial = new GF2Polynomial(bs);
-        polynomial.expandN(mDegree);
-    }
-
-    /**
-     * Creates a new GF2nPolynomialElement using the given field <i>f</i> and
-     * byte[] <i>os</i> as value. The conversion is done according to 1363.
-     *
-     * @param f  the GF2nField to use
-     * @param os the octet string to assign to this GF2nPolynomialElement
-     * @see "P1363 5.5.5 p23, OS2FEP/OS2BSP"
-     */
-    public GF2nPolynomialElement(GF2nPolynomialField f, byte[] os)
-    {
-        mField = f;
-        mDegree = mField.getDegree();
-        polynomial = new GF2Polynomial(mDegree, os);
-        polynomial.expandN(mDegree);
-    }
-
-    /**
-     * Creates a new GF2nPolynomialElement using the given field <i>f</i> and
-     * int[] <i>is</i> as value.
-     *
-     * @param f  the GF2nField to use
-     * @param is the integer string to assign to this GF2nPolynomialElement
-     */
-    public GF2nPolynomialElement(GF2nPolynomialField f, int[] is)
-    {
-        mField = f;
-        mDegree = mField.getDegree();
-        polynomial = new GF2Polynomial(mDegree, is);
-        polynomial.expandN(f.mDegree);
-    }
-
-    /**
-     * Creates a new GF2nPolynomialElement by cloning the given
-     * GF2nPolynomialElement <i>b</i>.
-     *
-     * @param other the GF2nPolynomialElement to clone
-     */
-    public GF2nPolynomialElement(GF2nPolynomialElement other)
-    {
-        mField = other.mField;
-        mDegree = other.mDegree;
-        polynomial = new GF2Polynomial(other.polynomial);
-    }
-
-    // /////////////////////////////////////////////////////////////////////
-    // pseudo-constructors
-    // /////////////////////////////////////////////////////////////////////
-
-    /**
-     * Creates a new GF2nPolynomialElement by cloning this
-     * GF2nPolynomialElement.
-     *
-     * @return a copy of this element
-     */
-    public Object clone()
-    {
-        return new GF2nPolynomialElement(this);
-    }
-
-    // /////////////////////////////////////////////////////////////////////
-    // assignments
-    // /////////////////////////////////////////////////////////////////////
-
-    /**
-     * Assigns the value 'zero' to this Polynomial.
-     */
-    void assignZero()
-    {
-        polynomial.assignZero();
-    }
-
-    /**
-     * Create the zero element.
-     *
-     * @param f the finite field
-     * @return the zero element in the given finite field
-     */
-    public static GF2nPolynomialElement ZERO(GF2nPolynomialField f)
-    {
-        GF2Polynomial polynomial = new GF2Polynomial(f.getDegree());
-        return new GF2nPolynomialElement(f, polynomial);
-    }
-
-    /**
-     * Create the one element.
-     *
-     * @param f the finite field
-     * @return the one element in the given finite field
-     */
-    public static GF2nPolynomialElement ONE(GF2nPolynomialField f)
-    {
-        GF2Polynomial polynomial = new GF2Polynomial(f.getDegree(),
-            new int[]{1});
-        return new GF2nPolynomialElement(f, polynomial);
-    }
-
-    /**
-     * Assigns the value 'one' to this Polynomial.
-     */
-    void assignOne()
-    {
-        polynomial.assignOne();
-    }
-
-    /**
-     * Assign a random value to this GF2nPolynomialElement using the specified
-     * source of randomness.
-     *
-     * @param rand the source of randomness
-     */
-    private void randomize(Random rand)
-    {
-        polynomial.expandN(mDegree);
-        polynomial.randomize(rand);
-    }
-
-    // /////////////////////////////////////////////////////////////////////
-    // comparison
-    // /////////////////////////////////////////////////////////////////////
-
-    /**
-     * Checks whether this element is zero.
-     *
-     * @return <tt>true</tt> if <tt>this</tt> is the zero element
-     */
-    public boolean isZero()
-    {
-        return polynomial.isZero();
-    }
-
-    /**
-     * Tests if the GF2nPolynomialElement has 'one' as value.
-     *
-     * @return true if <i>this</i> equals one (this == 1)
-     */
-    public boolean isOne()
-    {
-        return polynomial.isOne();
-    }
-
-    /**
-     * Compare this element with another object.
-     *
-     * @param other the other object
-     * @return <tt>true</tt> if the two objects are equal, <tt>false</tt>
-     *         otherwise
-     */
-    public boolean equals(Object other)
-    {
-        if (other == null || !(other instanceof GF2nPolynomialElement))
-        {
-            return false;
-        }
-        GF2nPolynomialElement otherElem = (GF2nPolynomialElement)other;
-
-        if (mField != otherElem.mField)
-        {
-            if (!mField.getFieldPolynomial().equals(
-                otherElem.mField.getFieldPolynomial()))
-            {
-                return false;
-            }
-        }
-
-        return polynomial.equals(otherElem.polynomial);
-    }
-
-    /**
-     * @return the hash code of this element
-     */
-    public int hashCode()
-    {
-        return mField.hashCode() + polynomial.hashCode();
-    }
-
-    // /////////////////////////////////////////////////////////////////////
-    // access
-    // /////////////////////////////////////////////////////////////////////
-
-    /**
-     * Returns the value of this GF2nPolynomialElement in a new Bitstring.
-     *
-     * @return the value of this GF2nPolynomialElement in a new Bitstring
-     */
-    private GF2Polynomial getGF2Polynomial()
-    {
-        return new GF2Polynomial(polynomial);
-    }
-
-    /**
-     * Checks whether the indexed bit of the bit representation is set.
-     *
-     * @param index the index of the bit to test
-     * @return <tt>true</tt> if the indexed bit is set
-     */
-    boolean testBit(int index)
-    {
-        return polynomial.testBit(index);
-    }
-
-    /**
-     * Returns whether the rightmost bit of the bit representation is set. This
-     * is needed for data conversion according to 1363.
-     *
-     * @return true if the rightmost bit of this element is set
-     */
-    public boolean testRightmostBit()
-    {
-        return polynomial.testBit(0);
-    }
-
-    /**
-     * Compute the sum of this element and <tt>addend</tt>.
-     *
-     * @param addend the addend
-     * @return <tt>this + other</tt> (newly created)
-     * @throws DifferentFieldsException if the elements are of different fields.
-     */
-    public GFElement add(GFElement addend)
-        throws RuntimeException
-    {
-        GF2nPolynomialElement result = new GF2nPolynomialElement(this);
-        result.addToThis(addend);
-        return result;
-    }
-
-    /**
-     * Compute <tt>this + addend</tt> (overwrite <tt>this</tt>).
-     *
-     * @param addend the addend
-     * @throws DifferentFieldsException if the elements are of different fields.
-     */
-    public void addToThis(GFElement addend)
-        throws RuntimeException
-    {
-        if (!(addend instanceof GF2nPolynomialElement))
-        {
-            throw new RuntimeException();
-        }
-        if (!mField.equals(((GF2nPolynomialElement)addend).mField))
-        {
-            throw new RuntimeException();
-        }
-        polynomial.addToThis(((GF2nPolynomialElement)addend).polynomial);
-    }
-
-    /**
-     * Returns <tt>this</tt> element + 'one".
-     *
-     * @return <tt>this</tt> + 'one'
-     */
-    public GF2nElement increase()
-    {
-        GF2nPolynomialElement result = new GF2nPolynomialElement(this);
-        result.increaseThis();
-        return result;
-    }
-
-    /**
-     * Increases this element by 'one'.
-     */
-    public void increaseThis()
-    {
-        polynomial.increaseThis();
-    }
-
-    /**
-     * Compute the product of this element and <tt>factor</tt>.
-     *
-     * @param factor the factor
-     * @return <tt>this * factor</tt> (newly created)
-     * @throws DifferentFieldsException if the elements are of different fields.
-     */
-    public GFElement multiply(GFElement factor)
-        throws RuntimeException
-    {
-        GF2nPolynomialElement result = new GF2nPolynomialElement(this);
-        result.multiplyThisBy(factor);
-        return result;
-    }
-
-    /**
-     * Compute <tt>this * factor</tt> (overwrite <tt>this</tt>).
-     *
-     * @param factor the factor
-     * @throws DifferentFieldsException if the elements are of different fields.
-     */
-    public void multiplyThisBy(GFElement factor)
-        throws RuntimeException
-    {
-        if (!(factor instanceof GF2nPolynomialElement))
-        {
-            throw new RuntimeException();
-        }
-        if (!mField.equals(((GF2nPolynomialElement)factor).mField))
-        {
-            throw new RuntimeException();
-        }
-        if (equals(factor))
-        {
-            squareThis();
-            return;
-        }
-        polynomial = polynomial
-            .multiply(((GF2nPolynomialElement)factor).polynomial);
-        reduceThis();
-    }
-
-    /**
-     * Compute the multiplicative inverse of this element.
-     *
-     * @return <tt>this<sup>-1</sup></tt> (newly created)
-     * @throws ArithmeticException if <tt>this</tt> is the zero element.
-     * @see GF2nPolynomialElement#invertMAIA
-     * @see GF2nPolynomialElement#invertEEA
-     * @see GF2nPolynomialElement#invertSquare
-     */
-    public GFElement invert()
-        throws ArithmeticException
-    {
-        return invertMAIA();
-    }
-
-    /**
-     * Calculates the multiplicative inverse of <i>this</i> and returns the
-     * result in a new GF2nPolynomialElement.
-     *
-     * @return <i>this</i>^(-1)
-     * @throws ArithmeticException if <i>this</i> equals zero
-     */
-    public GF2nPolynomialElement invertEEA()
-        throws ArithmeticException
-    {
-        if (isZero())
-        {
-            throw new ArithmeticException();
-        }
-        GF2Polynomial b = new GF2Polynomial(mDegree + 32, "ONE");
-        b.reduceN();
-        GF2Polynomial c = new GF2Polynomial(mDegree + 32);
-        c.reduceN();
-        GF2Polynomial u = getGF2Polynomial();
-        GF2Polynomial v = mField.getFieldPolynomial();
-        GF2Polynomial h;
-        int j;
-        u.reduceN();
-        while (!u.isOne())
-        {
-            u.reduceN();
-            v.reduceN();
-            j = u.getLength() - v.getLength();
-            if (j < 0)
-            {
-                h = u;
-                u = v;
-                v = h;
-                h = b;
-                b = c;
-                c = h;
-                j = -j;
-                c.reduceN(); // this increases the performance
-            }
-            u.shiftLeftAddThis(v, j);
-            b.shiftLeftAddThis(c, j);
-        }
-        b.reduceN();
-        return new GF2nPolynomialElement((GF2nPolynomialField)mField, b);
-    }
-
-    /**
-     * Calculates the multiplicative inverse of <i>this</i> and returns the
-     * result in a new GF2nPolynomialElement.
-     *
-     * @return <i>this</i>^(-1)
-     * @throws ArithmeticException if <i>this</i> equals zero
-     */
-    public GF2nPolynomialElement invertSquare()
-        throws ArithmeticException
-    {
-        GF2nPolynomialElement n;
-        GF2nPolynomialElement u;
-        int i, j, k, b;
-
-        if (isZero())
-        {
-            throw new ArithmeticException();
-        }
-        // b = (n-1)
-        b = mField.getDegree() - 1;
-        // n = a
-        n = new GF2nPolynomialElement(this);
-        n.polynomial.expandN((mDegree << 1) + 32); // increase performance
-        n.polynomial.reduceN();
-        // k = 1
-        k = 1;
-
-        // for i = (r-1) downto 0 do, r=bitlength(b)
-        for (i = IntegerFunctions.floorLog(b) - 1; i >= 0; i--)
-        {
-            // u = n
-            u = new GF2nPolynomialElement(n);
-            // for j = 1 to k do
-            for (j = 1; j <= k; j++)
-            {
-                // u = u^2
-                u.squareThisPreCalc();
-            }
-            // n = nu
-            n.multiplyThisBy(u);
-            // k = 2k
-            k <<= 1;
-            // if b(i)==1
-            if ((b & bitMask[i]) != 0)
-            {
-                // n = n^2 * b
-                n.squareThisPreCalc();
-                n.multiplyThisBy(this);
-                // k = k+1
-                k += 1;
-            }
-        }
-
-        // outpur n^2
-        n.squareThisPreCalc();
-        return n;
-    }
-
-    /**
-     * Calculates the multiplicative inverse of <i>this</i> using the modified
-     * almost inverse algorithm and returns the result in a new
-     * GF2nPolynomialElement.
-     *
-     * @return <i>this</i>^(-1)
-     * @throws ArithmeticException if <i>this</i> equals zero
-     */
-    public GF2nPolynomialElement invertMAIA()
-        throws ArithmeticException
-    {
-        if (isZero())
-        {
-            throw new ArithmeticException();
-        }
-        GF2Polynomial b = new GF2Polynomial(mDegree, "ONE");
-        GF2Polynomial c = new GF2Polynomial(mDegree);
-        GF2Polynomial u = getGF2Polynomial();
-        GF2Polynomial v = mField.getFieldPolynomial();
-        GF2Polynomial h;
-        while (true)
-        {
-            while (!u.testBit(0))
-            { // x|u (x divides u)
-                u.shiftRightThis(); // u = u / x
-                if (!b.testBit(0))
-                {
-                    b.shiftRightThis();
-                }
-                else
-                {
-                    b.addToThis(mField.getFieldPolynomial());
-                    b.shiftRightThis();
-                }
-            }
-            if (u.isOne())
-            {
-                return new GF2nPolynomialElement((GF2nPolynomialField)mField,
-                    b);
-            }
-            u.reduceN();
-            v.reduceN();
-            if (u.getLength() < v.getLength())
-            {
-                h = u;
-                u = v;
-                v = h;
-                h = b;
-                b = c;
-                c = h;
-            }
-            u.addToThis(v);
-            b.addToThis(c);
-        }
-    }
-
-    /**
-     * This method is used internally to map the square()-calls within
-     * GF2nPolynomialElement to one of the possible squaring methods.
-     *
-     * @return <tt>this<sup>2</sup></tt> (newly created)
-     * @see GF2nPolynomialElement#squarePreCalc
-     */
-    public GF2nElement square()
-    {
-        return squarePreCalc();
-    }
-
-    /**
-     * This method is used internally to map the square()-calls within
-     * GF2nPolynomialElement to one of the possible squaring methods.
-     */
-    public void squareThis()
-    {
-        squareThisPreCalc();
-    }
-
-    /**
-     * Squares this GF2nPolynomialElement using GF2nField's squaring matrix.
-     * This is supposed to be fast when using a polynomial (no tri- or
-     * pentanomial) as fieldpolynomial. Use squarePreCalc when using a tri- or
-     * pentanomial as fieldpolynomial instead.
-     *
-     * @return <tt>this<sup>2</sup></tt> (newly created)
-     * @see GF2Polynomial#vectorMult
-     * @see GF2nPolynomialElement#squarePreCalc
-     * @see GF2nPolynomialElement#squareBitwise
-     */
-    public GF2nPolynomialElement squareMatrix()
-    {
-        GF2nPolynomialElement result = new GF2nPolynomialElement(this);
-        result.squareThisMatrix();
-        result.reduceThis();
-        return result;
-    }
-
-    /**
-     * Squares this GF2nPolynomialElement using GF2nFields squaring matrix. This
-     * is supposed to be fast when using a polynomial (no tri- or pentanomial)
-     * as fieldpolynomial. Use squarePreCalc when using a tri- or pentanomial as
-     * fieldpolynomial instead.
-     *
-     * @see GF2Polynomial#vectorMult
-     * @see GF2nPolynomialElement#squarePreCalc
-     * @see GF2nPolynomialElement#squareBitwise
-     */
-    public void squareThisMatrix()
-    {
-        GF2Polynomial result = new GF2Polynomial(mDegree);
-        for (int i = 0; i < mDegree; i++)
-        {
-            if (polynomial
-                .vectorMult(((GF2nPolynomialField)mField).squaringMatrix[mDegree
-                    - i - 1]))
-            {
-                result.setBit(i);
-
-            }
-        }
-        polynomial = result;
-    }
-
-    /**
-     * Squares this GF2nPolynomialElement by shifting left its Bitstring and
-     * reducing. This is supposed to be the slowest method. Use squarePreCalc or
-     * squareMatrix instead.
-     *
-     * @return <tt>this<sup>2</sup></tt> (newly created)
-     * @see GF2nPolynomialElement#squareMatrix
-     * @see GF2nPolynomialElement#squarePreCalc
-     * @see GF2Polynomial#squareThisBitwise
-     */
-    public GF2nPolynomialElement squareBitwise()
-    {
-        GF2nPolynomialElement result = new GF2nPolynomialElement(this);
-        result.squareThisBitwise();
-        result.reduceThis();
-        return result;
-    }
-
-    /**
-     * Squares this GF2nPolynomialElement by shifting left its Bitstring and
-     * reducing. This is supposed to be the slowest method. Use squarePreCalc or
-     * squareMatrix instead.
-     *
-     * @see GF2nPolynomialElement#squareMatrix
-     * @see GF2nPolynomialElement#squarePreCalc
-     * @see GF2Polynomial#squareThisBitwise
-     */
-    public void squareThisBitwise()
-    {
-        polynomial.squareThisBitwise();
-        reduceThis();
-    }
-
-    /**
-     * Squares this GF2nPolynomialElement by using precalculated values and
-     * reducing. This is supposed to de fastest when using a trinomial or
-     * pentanomial as field polynomial. Use squareMatrix when using a ordinary
-     * polynomial as field polynomial.
-     *
-     * @return <tt>this<sup>2</sup></tt> (newly created)
-     * @see GF2nPolynomialElement#squareMatrix
-     * @see GF2Polynomial#squareThisPreCalc
-     */
-    public GF2nPolynomialElement squarePreCalc()
-    {
-        GF2nPolynomialElement result = new GF2nPolynomialElement(this);
-        result.squareThisPreCalc();
-        result.reduceThis();
-        return result;
-    }
-
-    /**
-     * Squares this GF2nPolynomialElement by using precalculated values and
-     * reducing. This is supposed to de fastest when using a tri- or pentanomial
-     * as fieldpolynomial. Use squareMatrix when using a ordinary polynomial as
-     * fieldpolynomial.
-     *
-     * @see GF2nPolynomialElement#squareMatrix
-     * @see GF2Polynomial#squareThisPreCalc
-     */
-    public void squareThisPreCalc()
-    {
-        polynomial.squareThisPreCalc();
-        reduceThis();
-    }
-
-    /**
-     * Calculates <i>this</i> to the power of <i>k</i> and returns the result
-     * in a new GF2nPolynomialElement.
-     *
-     * @param k the power
-     * @return <i>this</i>^<i>k</i> in a new GF2nPolynomialElement
-     */
-    public GF2nPolynomialElement power(int k)
-    {
-        if (k == 1)
-        {
-            return new GF2nPolynomialElement(this);
-        }
-
-        GF2nPolynomialElement result = GF2nPolynomialElement
-            .ONE((GF2nPolynomialField)mField);
-        if (k == 0)
-        {
-            return result;
-        }
-
-        GF2nPolynomialElement x = new GF2nPolynomialElement(this);
-        x.polynomial.expandN((x.mDegree << 1) + 32); // increase performance
-        x.polynomial.reduceN();
-
-        for (int i = 0; i < mDegree; i++)
-        {
-            if ((k & (1 << i)) != 0)
-            {
-                result.multiplyThisBy(x);
-            }
-            x.square();
-        }
-
-        return result;
-    }
-
-    /**
-     * Compute the square root of this element and return the result in a new
-     * {@link GF2nPolynomialElement}.
-     *
-     * @return <tt>this<sup>1/2</sup></tt> (newly created)
-     */
-    public GF2nElement squareRoot()
-    {
-        GF2nPolynomialElement result = new GF2nPolynomialElement(this);
-        result.squareRootThis();
-        return result;
-    }
-
-    /**
-     * Compute the square root of this element.
-     */
-    public void squareRootThis()
-    {
-        // increase performance
-        polynomial.expandN((mDegree << 1) + 32);
-        polynomial.reduceN();
-        for (int i = 0; i < mField.getDegree() - 1; i++)
-        {
-            squareThis();
-        }
-    }
-
-    /**
-     * Solves the quadratic equation <tt>z<sup>2</sup> + z = this</tt> if
-     * such a solution exists. This method returns one of the two possible
-     * solutions. The other solution is <tt>z + 1</tt>. Use z.increase() to
-     * compute this solution.
-     *
-     * @return a GF2nPolynomialElement representing one z satisfying the
-     *         equation <tt>z<sup>2</sup> + z = this</tt>
-     * @throws NoSolutionException if no solution exists
-     * @see "IEEE 1363, Annex A.4.7"
-     */
-    public GF2nElement solveQuadraticEquation()
-        throws RuntimeException
-    {
-        if (isZero())
-        {
-            return ZERO((GF2nPolynomialField)mField);
-        }
-
-        if ((mDegree & 1) == 1)
-        {
-            return halfTrace();
-        }
-
-        // TODO this can be sped-up by precomputation of p and w's
-        GF2nPolynomialElement z, w;
-        do
-        {
-            // step 1.
-            GF2nPolynomialElement p = new GF2nPolynomialElement(
-                (GF2nPolynomialField)mField, new Random());
-            // step 2.
-            z = ZERO((GF2nPolynomialField)mField);
-            w = (GF2nPolynomialElement)p.clone();
-            // step 3.
-            for (int i = 1; i < mDegree; i++)
-            {
-                // compute z = z^2 + w^2 * this
-                // and w = w^2 + p
-                z.squareThis();
-                w.squareThis();
-                z.addToThis(w.multiply(this));
-                w.addToThis(p);
-            }
-        }
-        while (w.isZero()); // step 4.
-
-        if (!equals(z.square().add(z)))
-        {
-            throw new RuntimeException();
-        }
-
-        // step 5.
-        return z;
-    }
-
-    /**
-     * Returns the trace of this GF2nPolynomialElement.
-     *
-     * @return the trace of this GF2nPolynomialElement
-     */
-    public int trace()
-    {
-        GF2nPolynomialElement t = new GF2nPolynomialElement(this);
-        int i;
-
-        for (i = 1; i < mDegree; i++)
-        {
-            t.squareThis();
-            t.addToThis(this);
-        }
-
-        if (t.isOne())
-        {
-            return 1;
-        }
-        return 0;
-    }
-
-    /**
-     * Returns the half-trace of this GF2nPolynomialElement.
-     *
-     * @return a GF2nPolynomialElement representing the half-trace of this
-     *         GF2nPolynomialElement.
-     * @throws DegreeIsEvenException if the degree of this GF2nPolynomialElement is even.
-     */
-    private GF2nPolynomialElement halfTrace()
-        throws RuntimeException
-    {
-        if ((mDegree & 0x01) == 0)
-        {
-            throw new RuntimeException();
-        }
-        int i;
-        GF2nPolynomialElement h = new GF2nPolynomialElement(this);
-
-        for (i = 1; i <= ((mDegree - 1) >> 1); i++)
-        {
-            h.squareThis();
-            h.squareThis();
-            h.addToThis(this);
-        }
-
-        return h;
-    }
-
-    /**
-     * Reduces this GF2nPolynomialElement modulo the field-polynomial.
-     *
-     * @see GF2Polynomial#reduceTrinomial
-     * @see GF2Polynomial#reducePentanomial
-     */
-    private void reduceThis()
-    {
-        if (polynomial.getLength() > mDegree)
-        { // really reduce ?
-            if (((GF2nPolynomialField)mField).isTrinomial())
-            { // fieldpolonomial
-                // is trinomial
-                int tc;
-                try
-                {
-                    tc = ((GF2nPolynomialField)mField).getTc();
-                }
-                catch (RuntimeException NATExc)
-                {
-                    throw new RuntimeException(
-                        "GF2nPolynomialElement.reduce: the field"
-                            + " polynomial is not a trinomial");
-                }
-                if (((mDegree - tc) <= 32) // do we have to use slow
-                    // bitwise reduction ?
-                    || (polynomial.getLength() > (mDegree << 1)))
-                {
-                    reduceTrinomialBitwise(tc);
-                    return;
-                }
-                polynomial.reduceTrinomial(mDegree, tc);
-                return;
-            }
-            else if (((GF2nPolynomialField)mField).isPentanomial())
-            { // fieldpolynomial
-                // is
-                // pentanomial
-                int[] pc;
-                try
-                {
-                    pc = ((GF2nPolynomialField)mField).getPc();
-                }
-                catch (RuntimeException NATExc)
-                {
-                    throw new RuntimeException(
-                        "GF2nPolynomialElement.reduce: the field"
-                            + " polynomial is not a pentanomial");
-                }
-                if (((mDegree - pc[2]) <= 32) // do we have to use slow
-                    // bitwise reduction ?
-                    || (polynomial.getLength() > (mDegree << 1)))
-                {
-                    reducePentanomialBitwise(pc);
-                    return;
-                }
-                polynomial.reducePentanomial(mDegree, pc);
-                return;
-            }
-            else
-            { // fieldpolynomial is something else
-                polynomial = polynomial.remainder(mField.getFieldPolynomial());
-                polynomial.expandN(mDegree);
-                return;
-            }
-        }
-        if (polynomial.getLength() < mDegree)
-        {
-            polynomial.expandN(mDegree);
-        }
-    }
-
-    /**
-     * Reduce this GF2nPolynomialElement using the trinomial x^n + x^tc + 1 as
-     * fieldpolynomial. The coefficients are reduced bit by bit.
-     */
-    private void reduceTrinomialBitwise(int tc)
-    {
-        int i;
-        int k = mDegree - tc;
-        for (i = polynomial.getLength() - 1; i >= mDegree; i--)
-        {
-            if (polynomial.testBit(i))
-            {
-
-                polynomial.xorBit(i);
-                polynomial.xorBit(i - k);
-                polynomial.xorBit(i - mDegree);
-
-            }
-        }
-        polynomial.reduceN();
-        polynomial.expandN(mDegree);
-    }
-
-    /**
-     * Reduce this GF2nPolynomialElement using the pentanomial x^n + x^pc[2] +
-     * x^pc[1] + x^pc[0] + 1 as fieldpolynomial. The coefficients are reduced
-     * bit by bit.
-     */
-    private void reducePentanomialBitwise(int[] pc)
-    {
-        int i;
-        int k = mDegree - pc[2];
-        int l = mDegree - pc[1];
-        int m = mDegree - pc[0];
-        for (i = polynomial.getLength() - 1; i >= mDegree; i--)
-        {
-            if (polynomial.testBit(i))
-            {
-                polynomial.xorBit(i);
-                polynomial.xorBit(i - k);
-                polynomial.xorBit(i - l);
-                polynomial.xorBit(i - m);
-                polynomial.xorBit(i - mDegree);
-
-            }
-        }
-        polynomial.reduceN();
-        polynomial.expandN(mDegree);
-    }
-
-    // /////////////////////////////////////////////////////////////////////
-    // conversion
-    // /////////////////////////////////////////////////////////////////////
-
-    /**
-     * Returns a string representing this Bitstrings value using hexadecimal
-     * radix in MSB-first order.
-     *
-     * @return a String representing this Bitstrings value.
-     */
-    public String toString()
-    {
-        return polynomial.toString(16);
-    }
-
-    /**
-     * Returns a string representing this Bitstrings value using hexadecimal or
-     * binary radix in MSB-first order.
-     *
-     * @param radix the radix to use (2 or 16, otherwise 2 is used)
-     * @return a String representing this Bitstrings value.
-     */
-    public String toString(int radix)
-    {
-        return polynomial.toString(radix);
-    }
-
-    /**
-     * Converts this GF2nPolynomialElement to a byte[] according to 1363.
-     *
-     * @return a byte[] representing the value of this GF2nPolynomialElement
-     * @see "P1363 5.5.2 p22f BS2OSP, FE2OSP"
-     */
-    public byte[] toByteArray()
-    {
-        return polynomial.toByteArray();
-    }
-
-    /**
-     * Converts this GF2nPolynomialElement to an integer according to 1363.
-     *
-     * @return a BigInteger representing the value of this
-     *         GF2nPolynomialElement
-     * @see "P1363 5.5.1 p22 BS2IP"
-     */
-    public BigInteger toFlexiBigInt()
-    {
-        return polynomial.toFlexiBigInt();
-    }
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/math/linearalgebra/GF2nPolynomialField.java b/bcprov/src/main/java/org/bouncycastle/pqc/math/linearalgebra/GF2nPolynomialField.java
deleted file mode 100644
index f66ec20..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/math/linearalgebra/GF2nPolynomialField.java
+++ /dev/null
@@ -1,553 +0,0 @@
-package org.bouncycastle.pqc.math.linearalgebra;
-
-
-import java.util.Random;
-import java.util.Vector;
-
-
-/**
- * This class implements the abstract class <tt>GF2nField</tt> for polynomial
- * representation. It computes the field polynomial and the squaring matrix.
- * GF2nField is used by GF2nPolynomialElement which implements the elements of
- * this field.
- *
- * @see GF2nField
- * @see GF2nPolynomialElement
- */
-public class GF2nPolynomialField
-    extends GF2nField
-{
-
-    /**
-     * Matrix used for fast squaring
-     */
-    GF2Polynomial[] squaringMatrix;
-
-    // field polynomial is a trinomial
-    private boolean isTrinomial = false;
-
-    // field polynomial is a pentanomial
-    private boolean isPentanomial = false;
-
-    // middle coefficient of the field polynomial in case it is a trinomial
-    private int tc;
-
-    // middle 3 coefficients of the field polynomial in case it is a pentanomial
-    private int[] pc = new int[3];
-
-    /**
-     * constructs an instance of the finite field with 2<sup>deg</sup>
-     * elements and characteristic 2.
-     *
-     * @param deg the extention degree of this field
-     */
-    public GF2nPolynomialField(int deg)
-    {
-        if (deg < 3)
-        {
-            throw new IllegalArgumentException("k must be at least 3");
-        }
-        mDegree = deg;
-        computeFieldPolynomial();
-        computeSquaringMatrix();
-        fields = new Vector();
-        matrices = new Vector();
-    }
-
-    /**
-     * constructs an instance of the finite field with 2<sup>deg</sup>
-     * elements and characteristic 2.
-     *
-     * @param deg  the degree of this field
-     * @param file true if you want to read the field polynomial from the
-     *             file false if you want to use a random fielpolynomial
-     *             (this can take very long for huge degrees)
-     */
-    public GF2nPolynomialField(int deg, boolean file)
-    {
-        if (deg < 3)
-        {
-            throw new IllegalArgumentException("k must be at least 3");
-        }
-        mDegree = deg;
-        if (file)
-        {
-            computeFieldPolynomial();
-        }
-        else
-        {
-            computeFieldPolynomial2();
-        }
-        computeSquaringMatrix();
-        fields = new Vector();
-        matrices = new Vector();
-    }
-
-    /**
-     * Creates a new GF2nField of degree <i>i</i> and uses the given
-     * <i>polynomial</i> as field polynomial. The <i>polynomial</i> is checked
-     * whether it is irreducible. This can take some time if <i>i</i> is huge!
-     *
-     * @param deg        degree of the GF2nField
-     * @param polynomial the field polynomial to use
-     * @throws PolynomialIsNotIrreducibleException if the given polynomial is not irreducible in GF(2^<i>i</i>)
-     */
-    public GF2nPolynomialField(int deg, GF2Polynomial polynomial)
-        throws RuntimeException
-    {
-        if (deg < 3)
-        {
-            throw new IllegalArgumentException("degree must be at least 3");
-        }
-        if (polynomial.getLength() != deg + 1)
-        {
-            throw new RuntimeException();
-        }
-        if (!polynomial.isIrreducible())
-        {
-            throw new RuntimeException();
-        }
-        mDegree = deg;
-        // fieldPolynomial = new Bitstring(polynomial);
-        fieldPolynomial = polynomial;
-        computeSquaringMatrix();
-        int k = 2; // check if the polynomial is a trinomial or pentanomial
-        for (int j = 1; j < fieldPolynomial.getLength() - 1; j++)
-        {
-            if (fieldPolynomial.testBit(j))
-            {
-                k++;
-                if (k == 3)
-                {
-                    tc = j;
-                }
-                if (k <= 5)
-                {
-                    pc[k - 3] = j;
-                }
-            }
-        }
-        if (k == 3)
-        {
-            isTrinomial = true;
-        }
-        if (k == 5)
-        {
-            isPentanomial = true;
-        }
-        fields = new Vector();
-        matrices = new Vector();
-    }
-
-    /**
-     * Returns true if the field polynomial is a trinomial. The coefficient can
-     * be retrieved using getTc().
-     *
-     * @return true if the field polynomial is a trinomial
-     */
-    public boolean isTrinomial()
-    {
-        return isTrinomial;
-    }
-
-    /**
-     * Returns true if the field polynomial is a pentanomial. The coefficients
-     * can be retrieved using getPc().
-     *
-     * @return true if the field polynomial is a pentanomial
-     */
-    public boolean isPentanomial()
-    {
-        return isPentanomial;
-    }
-
-    /**
-     * Returns the degree of the middle coefficient of the used field trinomial
-     * (x^n + x^(getTc()) + 1).
-     *
-     * @return the middle coefficient of the used field trinomial
-     * @throws GFException if the field polynomial is not a trinomial
-     */
-    public int getTc()
-        throws RuntimeException
-    {
-        if (!isTrinomial)
-        {
-            throw new RuntimeException();
-        }
-        return tc;
-    }
-
-    /**
-     * Returns the degree of the middle coefficients of the used field
-     * pentanomial (x^n + x^(getPc()[2]) + x^(getPc()[1]) + x^(getPc()[0]) + 1).
-     *
-     * @return the middle coefficients of the used field pentanomial
-     * @throws GFException if the field polynomial is not a pentanomial
-     */
-    public int[] getPc()
-        throws RuntimeException
-    {
-        if (!isPentanomial)
-        {
-            throw new RuntimeException();
-        }
-        int[] result = new int[3];
-        System.arraycopy(pc, 0, result, 0, 3);
-        return result;
-    }
-
-    /**
-     * Return row vector i of the squaring matrix.
-     *
-     * @param i the index of the row vector to return
-     * @return a copy of squaringMatrix[i]
-     * @see GF2nPolynomialElement#squareMatrix
-     */
-    public GF2Polynomial getSquaringVector(int i)
-    {
-        return new GF2Polynomial(squaringMatrix[i]);
-    }
-
-    /**
-     * Compute a random root of the given GF2Polynomial.
-     *
-     * @param polynomial the polynomial
-     * @return a random root of <tt>polynomial</tt>
-     */
-    protected GF2nElement getRandomRoot(GF2Polynomial polynomial)
-    {
-        // We are in B1!!!
-        GF2nPolynomial c;
-        GF2nPolynomial ut;
-        GF2nElement u;
-        GF2nPolynomial h;
-        int hDegree;
-        // 1. Set g(t) <- f(t)
-        GF2nPolynomial g = new GF2nPolynomial(polynomial, this);
-        int gDegree = g.getDegree();
-        int i;
-
-        // 2. while deg(g) > 1
-        while (gDegree > 1)
-        {
-            do
-            {
-                // 2.1 choose random u (element of) GF(2^m)
-                u = new GF2nPolynomialElement(this, new Random());
-                ut = new GF2nPolynomial(2, GF2nPolynomialElement.ZERO(this));
-                // 2.2 Set c(t) <- ut
-                ut.set(1, u);
-                c = new GF2nPolynomial(ut);
-                // 2.3 For i from 1 to m-1 do
-                for (i = 1; i <= mDegree - 1; i++)
-                {
-                    // 2.3.1 c(t) <- (c(t)^2 + ut) mod g(t)
-                    c = c.multiplyAndReduce(c, g);
-                    c = c.add(ut);
-                }
-                // 2.4 set h(t) <- GCD(c(t), g(t))
-                h = c.gcd(g);
-                // 2.5 if h(t) is constant or deg(g) = deg(h) then go to
-                // step 2.1
-                hDegree = h.getDegree();
-                gDegree = g.getDegree();
-            }
-            while ((hDegree == 0) || (hDegree == gDegree));
-            // 2.6 If 2deg(h) > deg(g) then set g(t) <- g(t)/h(t) ...
-            if ((hDegree << 1) > gDegree)
-            {
-                g = g.quotient(h);
-            }
-            else
-            {
-                // ... else g(t) <- h(t)
-                g = new GF2nPolynomial(h);
-            }
-            gDegree = g.getDegree();
-        }
-        // 3. Output g(0)
-        return g.at(0);
-
-    }
-
-    /**
-     * Computes the change-of-basis matrix for basis conversion according to
-     * 1363. The result is stored in the lists fields and matrices.
-     *
-     * @param B1 the GF2nField to convert to
-     * @see "P1363 A.7.3, p111ff"
-     */
-    protected void computeCOBMatrix(GF2nField B1)
-    {
-        // we are in B0 here!
-        if (mDegree != B1.mDegree)
-        {
-            throw new IllegalArgumentException(
-                "GF2nPolynomialField.computeCOBMatrix: B1 has a different "
-                    + "degree and thus cannot be coverted to!");
-        }
-        if (B1 instanceof GF2nONBField)
-        {
-            // speedup (calculation is done in PolynomialElements instead of
-            // ONB)
-            B1.computeCOBMatrix(this);
-            return;
-        }
-        int i, j;
-        GF2nElement[] gamma;
-        GF2nElement u;
-        GF2Polynomial[] COBMatrix = new GF2Polynomial[mDegree];
-        for (i = 0; i < mDegree; i++)
-        {
-            COBMatrix[i] = new GF2Polynomial(mDegree);
-        }
-
-        // find Random Root
-        do
-        {
-            // u is in representation according to B1
-            u = B1.getRandomRoot(fieldPolynomial);
-        }
-        while (u.isZero());
-
-        // build gamma matrix by multiplying by u
-        if (u instanceof GF2nONBElement)
-        {
-            gamma = new GF2nONBElement[mDegree];
-            gamma[mDegree - 1] = GF2nONBElement.ONE((GF2nONBField)B1);
-        }
-        else
-        {
-            gamma = new GF2nPolynomialElement[mDegree];
-            gamma[mDegree - 1] = GF2nPolynomialElement
-                .ONE((GF2nPolynomialField)B1);
-        }
-        gamma[mDegree - 2] = u;
-        for (i = mDegree - 3; i >= 0; i--)
-        {
-            gamma[i] = (GF2nElement)gamma[i + 1].multiply(u);
-        }
-        if (B1 instanceof GF2nONBField)
-        {
-            // convert horizontal gamma matrix by vertical Bitstrings
-            for (i = 0; i < mDegree; i++)
-            {
-                for (j = 0; j < mDegree; j++)
-                {
-                    // TODO remember: ONB treats its Bits in reverse order !!!
-                    if (gamma[i].testBit(mDegree - j - 1))
-                    {
-                        COBMatrix[mDegree - j - 1].setBit(mDegree - i - 1);
-                    }
-                }
-            }
-        }
-        else
-        {
-            // convert horizontal gamma matrix by vertical Bitstrings
-            for (i = 0; i < mDegree; i++)
-            {
-                for (j = 0; j < mDegree; j++)
-                {
-                    if (gamma[i].testBit(j))
-                    {
-                        COBMatrix[mDegree - j - 1].setBit(mDegree - i - 1);
-                    }
-                }
-            }
-        }
-
-        // store field and matrix for further use
-        fields.addElement(B1);
-        matrices.addElement(COBMatrix);
-        // store field and inverse matrix for further use in B1
-        B1.fields.addElement(this);
-        B1.matrices.addElement(invertMatrix(COBMatrix));
-    }
-
-    /**
-     * Computes a new squaring matrix used for fast squaring.
-     *
-     * @see GF2nPolynomialElement#square
-     */
-    private void computeSquaringMatrix()
-    {
-        GF2Polynomial[] d = new GF2Polynomial[mDegree - 1];
-        int i, j;
-        squaringMatrix = new GF2Polynomial[mDegree];
-        for (i = 0; i < squaringMatrix.length; i++)
-        {
-            squaringMatrix[i] = new GF2Polynomial(mDegree, "ZERO");
-        }
-
-        for (i = 0; i < mDegree - 1; i++)
-        {
-            d[i] = new GF2Polynomial(1, "ONE").shiftLeft(mDegree + i)
-                .remainder(fieldPolynomial);
-        }
-        for (i = 1; i <= Math.abs(mDegree >> 1); i++)
-        {
-            for (j = 1; j <= mDegree; j++)
-            {
-                if (d[mDegree - (i << 1)].testBit(mDegree - j))
-                {
-                    squaringMatrix[j - 1].setBit(mDegree - i);
-                }
-            }
-        }
-        for (i = Math.abs(mDegree >> 1) + 1; i <= mDegree; i++)
-        {
-            squaringMatrix[(i << 1) - mDegree - 1].setBit(mDegree - i);
-        }
-
-    }
-
-    /**
-     * Computes the field polynomial. This can take a long time for big degrees.
-     */
-    protected void computeFieldPolynomial()
-    {
-        if (testTrinomials())
-        {
-            return;
-        }
-        if (testPentanomials())
-        {
-            return;
-        }
-        testRandom();
-    }
-
-    /**
-     * Computes the field polynomial. This can take a long time for big degrees.
-     */
-    protected void computeFieldPolynomial2()
-    {
-        if (testTrinomials())
-        {
-            return;
-        }
-        if (testPentanomials())
-        {
-            return;
-        }
-        testRandom();
-    }
-
-    /**
-     * Tests all trinomials of degree (n+1) until a irreducible is found and
-     * stores the result in <i>field polynomial</i>. Returns false if no
-     * irreducible trinomial exists in GF(2^n). This can take very long for huge
-     * degrees.
-     *
-     * @return true if an irreducible trinomial is found
-     */
-    private boolean testTrinomials()
-    {
-        int i, l;
-        boolean done = false;
-        l = 0;
-
-        fieldPolynomial = new GF2Polynomial(mDegree + 1);
-        fieldPolynomial.setBit(0);
-        fieldPolynomial.setBit(mDegree);
-        for (i = 1; (i < mDegree) && !done; i++)
-        {
-            fieldPolynomial.setBit(i);
-            done = fieldPolynomial.isIrreducible();
-            l++;
-            if (done)
-            {
-                isTrinomial = true;
-                tc = i;
-                return done;
-            }
-            fieldPolynomial.resetBit(i);
-            done = fieldPolynomial.isIrreducible();
-        }
-
-        return done;
-    }
-
-    /**
-     * Tests all pentanomials of degree (n+1) until a irreducible is found and
-     * stores the result in <i>field polynomial</i>. Returns false if no
-     * irreducible pentanomial exists in GF(2^n). This can take very long for
-     * huge degrees.
-     *
-     * @return true if an irreducible pentanomial is found
-     */
-    private boolean testPentanomials()
-    {
-        int i, j, k, l;
-        boolean done = false;
-        l = 0;
-
-        fieldPolynomial = new GF2Polynomial(mDegree + 1);
-        fieldPolynomial.setBit(0);
-        fieldPolynomial.setBit(mDegree);
-        for (i = 1; (i <= (mDegree - 3)) && !done; i++)
-        {
-            fieldPolynomial.setBit(i);
-            for (j = i + 1; (j <= (mDegree - 2)) && !done; j++)
-            {
-                fieldPolynomial.setBit(j);
-                for (k = j + 1; (k <= (mDegree - 1)) && !done; k++)
-                {
-                    fieldPolynomial.setBit(k);
-                    if (((mDegree & 1) != 0) | ((i & 1) != 0) | ((j & 1) != 0)
-                        | ((k & 1) != 0))
-                    {
-                        done = fieldPolynomial.isIrreducible();
-                        l++;
-                        if (done)
-                        {
-                            isPentanomial = true;
-                            pc[0] = i;
-                            pc[1] = j;
-                            pc[2] = k;
-                            return done;
-                        }
-                    }
-                    fieldPolynomial.resetBit(k);
-                }
-                fieldPolynomial.resetBit(j);
-            }
-            fieldPolynomial.resetBit(i);
-        }
-
-        return done;
-    }
-
-    /**
-     * Tests random polynomials of degree (n+1) until an irreducible is found
-     * and stores the result in <i>field polynomial</i>. This can take very
-     * long for huge degrees.
-     *
-     * @return true
-     */
-    private boolean testRandom()
-    {
-        int l;
-        boolean done = false;
-
-        fieldPolynomial = new GF2Polynomial(mDegree + 1);
-        l = 0;
-        while (!done)
-        {
-            l++;
-            fieldPolynomial.randomize();
-            fieldPolynomial.setBit(mDegree);
-            fieldPolynomial.setBit(0);
-            if (fieldPolynomial.isIrreducible())
-            {
-                done = true;
-                return done;
-            }
-        }
-
-        return done;
-    }
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/math/linearalgebra/GFElement.java b/bcprov/src/main/java/org/bouncycastle/pqc/math/linearalgebra/GFElement.java
deleted file mode 100644
index 1e93e15..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/math/linearalgebra/GFElement.java
+++ /dev/null
@@ -1,158 +0,0 @@
-package org.bouncycastle.pqc.math.linearalgebra;
-
-import java.math.BigInteger;
-
-
-/**
- * This interface defines a finite field element. It is implemented by the
- * classes {@link GFPElement} and {@link GF2nElement}.
- *
- * @see GFPElement
- * @see GF2nElement
- */
-public interface GFElement
-{
-
-    /**
-     * @return a copy of this GFElement
-     */
-    Object clone();
-
-    // /////////////////////////////////////////////////////////////////
-    // comparison
-    // /////////////////////////////////////////////////////////////////
-
-    /**
-     * Compare this curve with another object.
-     *
-     * @param other the other object
-     * @return the result of the comparison
-     */
-    boolean equals(Object other);
-
-    /**
-     * @return the hash code of this element
-     */
-    int hashCode();
-
-    /**
-     * Checks whether this element is zero.
-     *
-     * @return <tt>true</tt> if <tt>this</tt> is the zero element
-     */
-    boolean isZero();
-
-    /**
-     * Checks whether this element is one.
-     *
-     * @return <tt>true</tt> if <tt>this</tt> is the one element
-     */
-    boolean isOne();
-
-    // /////////////////////////////////////////////////////////////////////
-    // arithmetic
-    // /////////////////////////////////////////////////////////////////////
-
-    /**
-     * Compute the sum of this element and the addend.
-     *
-     * @param addend the addend
-     * @return <tt>this + other</tt> (newly created)
-     * @throws DifferentFieldsException if the elements are of different fields.
-     */
-    GFElement add(GFElement addend)
-        throws RuntimeException;
-
-    /**
-     * Compute the sum of this element and the addend, overwriting this element.
-     *
-     * @param addend the addend
-     * @throws DifferentFieldsException if the elements are of different fields.
-     */
-    void addToThis(GFElement addend)
-        throws RuntimeException;
-
-    /**
-     * Compute the difference of this element and <tt>minuend</tt>.
-     *
-     * @param minuend the minuend
-     * @return <tt>this - minuend</tt> (newly created)
-     * @throws DifferentFieldsException if the elements are of different fields.
-     */
-    GFElement subtract(GFElement minuend)
-        throws RuntimeException;
-
-    /**
-     * Compute the difference of this element and <tt>minuend</tt>,
-     * overwriting this element.
-     *
-     * @param minuend the minuend
-     * @throws DifferentFieldsException if the elements are of different fields.
-     */
-    void subtractFromThis(GFElement minuend);
-
-    /**
-     * Compute the product of this element and <tt>factor</tt>.
-     *
-     * @param factor the factor
-     * @return <tt>this * factor</tt> (newly created)
-     * @throws DifferentFieldsException if the elements are of different fields.
-     */
-    GFElement multiply(GFElement factor)
-        throws RuntimeException;
-
-    /**
-     * Compute <tt>this * factor</tt> (overwrite <tt>this</tt>).
-     *
-     * @param factor the factor
-     * @throws DifferentFieldsException if the elements are of different fields.
-     */
-    void multiplyThisBy(GFElement factor)
-        throws RuntimeException;
-
-    /**
-     * Compute the multiplicative inverse of this element.
-     *
-     * @return <tt>this<sup>-1</sup></tt> (newly created)
-     * @throws ArithmeticException if <tt>this</tt> is the zero element.
-     */
-    GFElement invert()
-        throws ArithmeticException;
-
-    // /////////////////////////////////////////////////////////////////////
-    // conversion
-    // /////////////////////////////////////////////////////////////////////
-
-    /**
-     * Returns this element as FlexiBigInt. The conversion is <a
-     * href="http://grouper.ieee.org/groups/1363/">P1363</a>-conform.
-     *
-     * @return this element as BigInt
-     */
-    BigInteger toFlexiBigInt();
-
-    /**
-     * Returns this element as byte array. The conversion is <a href =
-     * "http://grouper.ieee.org/groups/1363/">P1363</a>-conform.
-     *
-     * @return this element as byte array
-     */
-    byte[] toByteArray();
-
-    /**
-     * Return a String representation of this element.
-     *
-     * @return String representation of this element
-     */
-    String toString();
-
-    /**
-     * Return a String representation of this element. <tt>radix</tt>
-     * specifies the radix of the String representation.
-     *
-     * @param radix specifies the radix of the String representation
-     * @return String representation of this element with the specified radix
-     */
-    String toString(int radix);
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/math/linearalgebra/GoppaCode.java b/bcprov/src/main/java/org/bouncycastle/pqc/math/linearalgebra/GoppaCode.java
deleted file mode 100644
index cf82eae..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/math/linearalgebra/GoppaCode.java
+++ /dev/null
@@ -1,310 +0,0 @@
-package org.bouncycastle.pqc.math.linearalgebra;
-
-import java.security.SecureRandom;
-
-/**
- * This class describes decoding operations of an irreducible binary Goppa code.
- * A check matrix H of the Goppa code and an irreducible Goppa polynomial are
- * used the operations are worked over a finite field GF(2^m)
- *
- * @see GF2mField
- * @see PolynomialGF2mSmallM
- */
-public final class GoppaCode
-{
-
-    /**
-     * Default constructor (private).
-     */
-    private GoppaCode()
-    {
-        // empty
-    }
-
-    /**
-     * This class is a container for two instances of {@link GF2Matrix} and one
-     * instance of {@link Permutation}. It is used to hold the systematic form
-     * <tt>S*H*P = (Id|M)</tt> of the check matrix <tt>H</tt> as returned by
-     * {@link GoppaCode#computeSystematicForm(GF2Matrix, SecureRandom)}.
-     *
-     * @see GF2Matrix
-     * @see Permutation
-     */
-    public static class MaMaPe
-    {
-
-        private GF2Matrix s, h;
-
-        private Permutation p;
-
-        /**
-         * Construct a new {@link MaMaPe} container with the given parameters.
-         *
-         * @param s the first matrix
-         * @param h the second matrix
-         * @param p the permutation
-         */
-        public MaMaPe(GF2Matrix s, GF2Matrix h, Permutation p)
-        {
-            this.s = s;
-            this.h = h;
-            this.p = p;
-        }
-
-        /**
-         * @return the first matrix
-         */
-        public GF2Matrix getFirstMatrix()
-        {
-            return s;
-        }
-
-        /**
-         * @return the second matrix
-         */
-        public GF2Matrix getSecondMatrix()
-        {
-            return h;
-        }
-
-        /**
-         * @return the permutation
-         */
-        public Permutation getPermutation()
-        {
-            return p;
-        }
-    }
-
-    /**
-     * This class is a container for an instance of {@link GF2Matrix} and one
-     * int[]. It is used to hold a generator matrix and the set of indices such
-     * that the submatrix of the generator matrix consisting of the specified
-     * columns is the identity.
-     *
-     * @see GF2Matrix
-     * @see Permutation
-     */
-    public static class MatrixSet
-    {
-
-        private GF2Matrix g;
-
-        private int[] setJ;
-
-        /**
-         * Construct a new {@link MatrixSet} container with the given
-         * parameters.
-         *
-         * @param g    the generator matrix
-         * @param setJ the set of indices such that the submatrix of the
-         *             generator matrix consisting of the specified columns
-         *             is the identity
-         */
-        public MatrixSet(GF2Matrix g, int[] setJ)
-        {
-            this.g = g;
-            this.setJ = setJ;
-        }
-
-        /**
-         * @return the generator matrix
-         */
-        public GF2Matrix getG()
-        {
-            return g;
-        }
-
-        /**
-         * @return the set of indices such that the submatrix of the generator
-         *         matrix consisting of the specified columns is the identity
-         */
-        public int[] getSetJ()
-        {
-            return setJ;
-        }
-    }
-
-    /**
-     * Construct the check matrix of a Goppa code in canonical form from the
-     * irreducible Goppa polynomial over the finite field
-     * <tt>GF(2<sup>m</sup>)</tt>.
-     *
-     * @param field the finite field
-     * @param gp    the irreducible Goppa polynomial
-     */
-    public static GF2Matrix createCanonicalCheckMatrix(GF2mField field,
-                                                       PolynomialGF2mSmallM gp)
-    {
-        int m = field.getDegree();
-        int n = 1 << m;
-        int t = gp.getDegree();
-
-        /* create matrix H over GF(2^m) */
-
-        int[][] hArray = new int[t][n];
-
-        // create matrix YZ
-        int[][] yz = new int[t][n];
-        for (int j = 0; j < n; j++)
-        {
-            // here j is used as index and as element of field GF(2^m)
-            yz[0][j] = field.inverse(gp.evaluateAt(j));
-        }
-
-        for (int i = 1; i < t; i++)
-        {
-            for (int j = 0; j < n; j++)
-            {
-                // here j is used as index and as element of field GF(2^m)
-                yz[i][j] = field.mult(yz[i - 1][j], j);
-            }
-        }
-
-        // create matrix H = XYZ
-        for (int i = 0; i < t; i++)
-        {
-            for (int j = 0; j < n; j++)
-            {
-                for (int k = 0; k <= i; k++)
-                {
-                    hArray[i][j] = field.add(hArray[i][j], field.mult(yz[k][j],
-                        gp.getCoefficient(t + k - i)));
-                }
-            }
-        }
-
-        /* convert to matrix over GF(2) */
-
-        int[][] result = new int[t * m][(n + 31) >>> 5];
-
-        for (int j = 0; j < n; j++)
-        {
-            int q = j >>> 5;
-            int r = 1 << (j & 0x1f);
-            for (int i = 0; i < t; i++)
-            {
-                int e = hArray[i][j];
-                for (int u = 0; u < m; u++)
-                {
-                    int b = (e >>> u) & 1;
-                    if (b != 0)
-                    {
-                        int ind = (i + 1) * m - u - 1;
-                        result[ind][q] ^= r;
-                    }
-                }
-            }
-        }
-
-        return new GF2Matrix(n, result);
-    }
-
-    /**
-     * Given a check matrix <tt>H</tt>, compute matrices <tt>S</tt>,
-     * <tt>M</tt>, and a random permutation <tt>P</tt> such that
-     * <tt>S*H*P = (Id|M)</tt>. Return <tt>S^-1</tt>, <tt>M</tt>, and
-     * <tt>P</tt> as {@link MaMaPe}. The matrix <tt>(Id | M)</tt> is called
-     * the systematic form of H.
-     *
-     * @param h  the check matrix
-     * @param sr a source of randomness
-     * @return the tuple <tt>(S^-1, M, P)</tt>
-     */
-    public static MaMaPe computeSystematicForm(GF2Matrix h, SecureRandom sr)
-    {
-        int n = h.getNumColumns();
-        GF2Matrix hp, sInv;
-        GF2Matrix s = null;
-        Permutation p;
-        boolean found = false;
-
-        do
-        {
-            p = new Permutation(n, sr);
-            hp = (GF2Matrix)h.rightMultiply(p);
-            sInv = hp.getLeftSubMatrix();
-            try
-            {
-                found = true;
-                s = (GF2Matrix)sInv.computeInverse();
-            }
-            catch (ArithmeticException ae)
-            {
-                found = false;
-            }
-        }
-        while (!found);
-
-        GF2Matrix shp = (GF2Matrix)s.rightMultiply(hp);
-        GF2Matrix m = shp.getRightSubMatrix();
-
-        return new MaMaPe(sInv, m, p);
-    }
-
-    /**
-     * Find an error vector <tt>e</tt> over <tt>GF(2)</tt> from an input
-     * syndrome <tt>s</tt> over <tt>GF(2<sup>m</sup>)</tt>.
-     *
-     * @param syndVec      the syndrome
-     * @param field        the finite field
-     * @param gp           the irreducible Goppa polynomial
-     * @param sqRootMatrix the matrix for computing square roots in
-     *                     <tt>(GF(2<sup>m</sup>))<sup>t</sup></tt>
-     * @return the error vector
-     */
-    public static GF2Vector syndromeDecode(GF2Vector syndVec, GF2mField field,
-                                           PolynomialGF2mSmallM gp, PolynomialGF2mSmallM[] sqRootMatrix)
-    {
-
-        int n = 1 << field.getDegree();
-
-        // the error vector
-        GF2Vector errors = new GF2Vector(n);
-
-        // if the syndrome vector is zero, the error vector is also zero
-        if (!syndVec.isZero())
-        {
-            // convert syndrome vector to polynomial over GF(2^m)
-            PolynomialGF2mSmallM syndrome = new PolynomialGF2mSmallM(syndVec
-                .toExtensionFieldVector(field));
-
-            // compute T = syndrome^-1 mod gp
-            PolynomialGF2mSmallM t = syndrome.modInverse(gp);
-
-            // compute tau = sqRoot(T + X) mod gp
-            PolynomialGF2mSmallM tau = t.addMonomial(1);
-            tau = tau.modSquareRootMatrix(sqRootMatrix);
-
-            // compute polynomials a and b satisfying a + b*tau = 0 mod gp
-            PolynomialGF2mSmallM[] ab = tau.modPolynomialToFracton(gp);
-
-            // compute the polynomial a^2 + X*b^2
-            PolynomialGF2mSmallM a2 = ab[0].multiply(ab[0]);
-            PolynomialGF2mSmallM b2 = ab[1].multiply(ab[1]);
-            PolynomialGF2mSmallM xb2 = b2.multWithMonomial(1);
-            PolynomialGF2mSmallM a2plusXb2 = a2.add(xb2);
-
-            // normalize a^2 + X*b^2 to obtain the error locator polynomial
-            int headCoeff = a2plusXb2.getHeadCoefficient();
-            int invHeadCoeff = field.inverse(headCoeff);
-            PolynomialGF2mSmallM elp = a2plusXb2.multWithElement(invHeadCoeff);
-
-            // for all elements i of GF(2^m)
-            for (int i = 0; i < n; i++)
-            {
-                // evaluate the error locator polynomial at i
-                int z = elp.evaluateAt(i);
-                // if polynomial evaluates to zero
-                if (z == 0)
-                {
-                    // set the i-th coefficient of the error vector
-                    errors.setBit(i);
-                }
-            }
-        }
-
-        return errors;
-    }
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/math/linearalgebra/IntUtils.java b/bcprov/src/main/java/org/bouncycastle/pqc/math/linearalgebra/IntUtils.java
deleted file mode 100644
index 90a3c60..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/math/linearalgebra/IntUtils.java
+++ /dev/null
@@ -1,202 +0,0 @@
-package org.bouncycastle.pqc.math.linearalgebra;
-
-import java.math.BigInteger;
-
-/**
- *
- *
- *
- */
-public final class IntUtils
-{
-
-    /**
-     * Default constructor (private).
-     */
-    private IntUtils()
-    {
-        // empty
-    }
-
-    /**
-     * Compare two int arrays. No null checks are performed.
-     *
-     * @param left  the first int array
-     * @param right the second int array
-     * @return the result of the comparison
-     */
-    public static boolean equals(int[] left, int[] right)
-    {
-        if (left.length != right.length)
-        {
-            return false;
-        }
-        boolean result = true;
-        for (int i = left.length - 1; i >= 0; i--)
-        {
-            result &= left[i] == right[i];
-        }
-        return result;
-    }
-
-    /**
-     * Return a clone of the given int array. No null checks are performed.
-     *
-     * @param array the array to clone
-     * @return the clone of the given array
-     */
-    public static int[] clone(int[] array)
-    {
-        int[] result = new int[array.length];
-        System.arraycopy(array, 0, result, 0, array.length);
-        return result;
-    }
-
-    /**
-     * Fill the given int array with the given value.
-     *
-     * @param array the array
-     * @param value the value
-     */
-    public static void fill(int[] array, int value)
-    {
-        for (int i = array.length - 1; i >= 0; i--)
-        {
-            array[i] = value;
-        }
-    }
-
-    /**
-     * Sorts this array of integers according to the Quicksort algorithm. After
-     * calling this method this array is sorted in ascending order with the
-     * smallest integer taking position 0 in the array.
-     * <p>
-     * This implementation is based on the quicksort algorithm as described in
-     * <code>Data Structures In Java</code> by Thomas A. Standish, Chapter 10,
-     * ISBN 0-201-30564-X.
-     *
-     * @param source the array of integers that needs to be sorted.
-     */
-    public static void quicksort(int[] source)
-    {
-        quicksort(source, 0, source.length - 1);
-    }
-
-    /**
-     * Sort a subarray of a source array. The subarray is specified by its start
-     * and end index.
-     *
-     * @param source the int array to be sorted
-     * @param left   the start index of the subarray
-     * @param right  the end index of the subarray
-     */
-    public static void quicksort(int[] source, int left, int right)
-    {
-        if (right > left)
-        {
-            int index = partition(source, left, right, right);
-            quicksort(source, left, index - 1);
-            quicksort(source, index + 1, right);
-        }
-    }
-
-    /**
-     * Split a subarray of a source array into two partitions. The left
-     * partition contains elements that have value less than or equal to the
-     * pivot element, the right partition contains the elements that have larger
-     * value.
-     *
-     * @param source     the int array whose subarray will be splitted
-     * @param left       the start position of the subarray
-     * @param right      the end position of the subarray
-     * @param pivotIndex the index of the pivot element inside the array
-     * @return the new index of the pivot element inside the array
-     */
-    private static int partition(int[] source, int left, int right,
-                                 int pivotIndex)
-    {
-
-        int pivot = source[pivotIndex];
-        source[pivotIndex] = source[right];
-        source[right] = pivot;
-
-        int index = left;
-
-        for (int i = left; i < right; i++)
-        {
-            if (source[i] <= pivot)
-            {
-                int tmp = source[index];
-                source[index] = source[i];
-                source[i] = tmp;
-                index++;
-            }
-        }
-
-        int tmp = source[index];
-        source[index] = source[right];
-        source[right] = tmp;
-
-        return index;
-    }
-
-    /**
-     * Generates a subarray of a given int array.
-     *
-     * @param input -
-     *              the input int array
-     * @param start -
-     *              the start index
-     * @param end   -
-     *              the end index
-     * @return a subarray of <tt>input</tt>, ranging from <tt>start</tt> to
-     *         <tt>end</tt>
-     */
-    public static int[] subArray(final int[] input, final int start,
-                                 final int end)
-    {
-        int[] result = new int[end - start];
-        System.arraycopy(input, start, result, 0, end - start);
-        return result;
-    }
-
-    /**
-     * Convert an int array to a {@link FlexiBigInt} array.
-     *
-     * @param input the int array
-     * @return the {@link FlexiBigInt} array
-     */
-    public static BigInteger[] toFlexiBigIntArray(int[] input)
-    {
-        BigInteger[] result = new BigInteger[input.length];
-        for (int i = 0; i < input.length; i++)
-        {
-            result[i] = BigInteger.valueOf(input[i]);
-        }
-        return result;
-    }
-
-    /**
-     * @param input an int array
-     * @return a human readable form of the given int array
-     */
-    public static String toString(int[] input)
-    {
-        String result = "";
-        for (int i = 0; i < input.length; i++)
-        {
-            result += input[i] + " ";
-        }
-        return result;
-    }
-
-    /**
-     * @param input an int arary
-     * @return the int array as hex string
-     */
-    public static String toHexString(int[] input)
-    {
-        return ByteUtils.toHexString(BigEndianConversions.toByteArray(input));
-    }
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/math/linearalgebra/IntegerFunctions.java b/bcprov/src/main/java/org/bouncycastle/pqc/math/linearalgebra/IntegerFunctions.java
deleted file mode 100644
index 779f384..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/math/linearalgebra/IntegerFunctions.java
+++ /dev/null
@@ -1,1423 +0,0 @@
-package org.bouncycastle.pqc.math.linearalgebra;
-
-import java.math.BigInteger;
-import java.security.SecureRandom;
-
-/**
- * Class of number-theory related functions for use with integers represented as
- * <tt>int</tt>'s or <tt>BigInteger</tt> objects.
- */
-public final class IntegerFunctions
-{
-
-    private static final BigInteger ZERO = BigInteger.valueOf(0);
-
-    private static final BigInteger ONE = BigInteger.valueOf(1);
-
-    private static final BigInteger TWO = BigInteger.valueOf(2);
-
-    private static final BigInteger FOUR = BigInteger.valueOf(4);
-
-    private static final int[] SMALL_PRIMES = {3, 5, 7, 11, 13, 17, 19, 23,
-        29, 31, 37, 41};
-
-    private static final long SMALL_PRIME_PRODUCT = 3L * 5 * 7 * 11 * 13 * 17
-        * 19 * 23 * 29 * 31 * 37 * 41;
-
-    private static SecureRandom sr = null;
-
-    // the jacobi function uses this lookup table
-    private static final int[] jacobiTable = {0, 1, 0, -1, 0, -1, 0, 1};
-
-    private IntegerFunctions()
-    {
-        // empty
-    }
-
-    /**
-     * Computes the value of the Jacobi symbol (A|B). The following properties
-     * hold for the Jacobi symbol which makes it a very efficient way to
-     * evaluate the Legendre symbol
-     * <p>
-     * (A|B) = 0 IF gcd(A,B) &gt; 1<br>
-     * (-1|B) = 1 IF n = 1 (mod 1)<br>
-     * (-1|B) = -1 IF n = 3 (mod 4)<br>
-     * (A|B) (C|B) = (AC|B)<br>
-     * (A|B) (A|C) = (A|CB)<br>
-     * (A|B) = (C|B) IF A = C (mod B)<br>
-     * (2|B) = 1 IF N = 1 OR 7 (mod 8)<br>
-     * (2|B) = 1 IF N = 3 OR 5 (mod 8)
-     *
-     * @param A integer value
-     * @param B integer value
-     * @return value of the jacobi symbol (A|B)
-     */
-    public static int jacobi(BigInteger A, BigInteger B)
-    {
-        BigInteger a, b, v;
-        long k = 1;
-
-        k = 1;
-
-        // test trivial cases
-        if (B.equals(ZERO))
-        {
-            a = A.abs();
-            return a.equals(ONE) ? 1 : 0;
-        }
-
-        if (!A.testBit(0) && !B.testBit(0))
-        {
-            return 0;
-        }
-
-        a = A;
-        b = B;
-
-        if (b.signum() == -1)
-        { // b < 0
-            b = b.negate(); // b = -b
-            if (a.signum() == -1)
-            {
-                k = -1;
-            }
-        }
-
-        v = ZERO;
-        while (!b.testBit(0))
-        {
-            v = v.add(ONE); // v = v + 1
-            b = b.divide(TWO); // b = b/2
-        }
-
-        if (v.testBit(0))
-        {
-            k = k * jacobiTable[a.intValue() & 7];
-        }
-
-        if (a.signum() < 0)
-        { // a < 0
-            if (b.testBit(1))
-            {
-                k = -k; // k = -k
-            }
-            a = a.negate(); // a = -a
-        }
-
-        // main loop
-        while (a.signum() != 0)
-        {
-            v = ZERO;
-            while (!a.testBit(0))
-            { // a is even
-                v = v.add(ONE);
-                a = a.divide(TWO);
-            }
-            if (v.testBit(0))
-            {
-                k = k * jacobiTable[b.intValue() & 7];
-            }
-
-            if (a.compareTo(b) < 0)
-            { // a < b
-                // swap and correct intermediate result
-                BigInteger x = a;
-                a = b;
-                b = x;
-                if (a.testBit(1) && b.testBit(1))
-                {
-                    k = -k;
-                }
-            }
-            a = a.subtract(b);
-        }
-
-        return b.equals(ONE) ? (int)k : 0;
-    }
-
-    /**
-     * Computes the square root of a BigInteger modulo a prime employing the
-     * Shanks-Tonelli algorithm.
-     *
-     * @param a value out of which we extract the square root
-     * @param p prime modulus that determines the underlying field
-     * @return a number <tt>b</tt> such that b<sup>2</sup> = a (mod p) if
-     *         <tt>a</tt> is a quadratic residue modulo <tt>p</tt>.
-     * @throws NoQuadraticResidueException if <tt>a</tt> is a quadratic non-residue modulo <tt>p</tt>
-     */
-    public static BigInteger ressol(BigInteger a, BigInteger p)
-        throws IllegalArgumentException
-    {
-
-        BigInteger v = null;
-
-        if (a.compareTo(ZERO) < 0)
-        {
-            a = a.add(p);
-        }
-
-        if (a.equals(ZERO))
-        {
-            return ZERO;
-        }
-
-        if (p.equals(TWO))
-        {
-            return a;
-        }
-
-        // p = 3 mod 4
-        if (p.testBit(0) && p.testBit(1))
-        {
-            if (jacobi(a, p) == 1)
-            { // a quadr. residue mod p
-                v = p.add(ONE); // v = p+1
-                v = v.shiftRight(2); // v = v/4
-                return a.modPow(v, p); // return a^v mod p
-                // return --> a^((p+1)/4) mod p
-            }
-            throw new IllegalArgumentException("No quadratic residue: " + a + ", " + p);
-        }
-
-        long t = 0;
-
-        // initialization
-        // compute k and s, where p = 2^s (2k+1) +1
-
-        BigInteger k = p.subtract(ONE); // k = p-1
-        long s = 0;
-        while (!k.testBit(0))
-        { // while k is even
-            s++; // s = s+1
-            k = k.shiftRight(1); // k = k/2
-        }
-
-        k = k.subtract(ONE); // k = k - 1
-        k = k.shiftRight(1); // k = k/2
-
-        // initial values
-        BigInteger r = a.modPow(k, p); // r = a^k mod p
-
-        BigInteger n = r.multiply(r).remainder(p); // n = r^2 % p
-        n = n.multiply(a).remainder(p); // n = n * a % p
-        r = r.multiply(a).remainder(p); // r = r * a %p
-
-        if (n.equals(ONE))
-        {
-            return r;
-        }
-
-        // non-quadratic residue
-        BigInteger z = TWO; // z = 2
-        while (jacobi(z, p) == 1)
-        {
-            // while z quadratic residue
-            z = z.add(ONE); // z = z + 1
-        }
-
-        v = k;
-        v = v.multiply(TWO); // v = 2k
-        v = v.add(ONE); // v = 2k + 1
-        BigInteger c = z.modPow(v, p); // c = z^v mod p
-
-        // iteration
-        while (n.compareTo(ONE) == 1)
-        { // n > 1
-            k = n; // k = n
-            t = s; // t = s
-            s = 0;
-
-            while (!k.equals(ONE))
-            { // k != 1
-                k = k.multiply(k).mod(p); // k = k^2 % p
-                s++; // s = s + 1
-            }
-
-            t -= s; // t = t - s
-            if (t == 0)
-            {
-                throw new IllegalArgumentException("No quadratic residue: " + a + ", " + p);
-            }
-
-            v = ONE;
-            for (long i = 0; i < t - 1; i++)
-            {
-                v = v.shiftLeft(1); // v = 1 * 2^(t - 1)
-            }
-            c = c.modPow(v, p); // c = c^v mod p
-            r = r.multiply(c).remainder(p); // r = r * c % p
-            c = c.multiply(c).remainder(p); // c = c^2 % p
-            n = n.multiply(c).mod(p); // n = n * c % p
-        }
-        return r;
-    }
-
-    /**
-     * Computes the greatest common divisor of the two specified integers
-     *
-     * @param u - first integer
-     * @param v - second integer
-     * @return gcd(a, b)
-     */
-    public static int gcd(int u, int v)
-    {
-        return BigInteger.valueOf(u).gcd(BigInteger.valueOf(v)).intValue();
-    }
-
-    /**
-     * Extended euclidian algorithm (computes gcd and representation).
-     *
-     * @param a the first integer
-     * @param b the second integer
-     * @return <tt>(g,u,v)</tt>, where <tt>g = gcd(abs(a),abs(b)) = ua + vb</tt>
-     */
-    public static int[] extGCD(int a, int b)
-    {
-        BigInteger ba = BigInteger.valueOf(a);
-        BigInteger bb = BigInteger.valueOf(b);
-        BigInteger[] bresult = extgcd(ba, bb);
-        int[] result = new int[3];
-        result[0] = bresult[0].intValue();
-        result[1] = bresult[1].intValue();
-        result[2] = bresult[2].intValue();
-        return result;
-    }
-
-    public static BigInteger divideAndRound(BigInteger a, BigInteger b)
-    {
-        if (a.signum() < 0)
-        {
-            return divideAndRound(a.negate(), b).negate();
-        }
-        if (b.signum() < 0)
-        {
-            return divideAndRound(a, b.negate()).negate();
-        }
-        return a.shiftLeft(1).add(b).divide(b.shiftLeft(1));
-    }
-
-    public static BigInteger[] divideAndRound(BigInteger[] a, BigInteger b)
-    {
-        BigInteger[] out = new BigInteger[a.length];
-        for (int i = 0; i < a.length; i++)
-        {
-            out[i] = divideAndRound(a[i], b);
-        }
-        return out;
-    }
-
-    /**
-     * Compute the smallest integer that is greater than or equal to the
-     * logarithm to the base 2 of the given BigInteger.
-     *
-     * @param a the integer
-     * @return ceil[log(a)]
-     */
-    public static int ceilLog(BigInteger a)
-    {
-        int result = 0;
-        BigInteger p = ONE;
-        while (p.compareTo(a) < 0)
-        {
-            result++;
-            p = p.shiftLeft(1);
-        }
-        return result;
-    }
-
-    /**
-     * Compute the smallest integer that is greater than or equal to the
-     * logarithm to the base 2 of the given integer.
-     *
-     * @param a the integer
-     * @return ceil[log(a)]
-     */
-    public static int ceilLog(int a)
-    {
-        int log = 0;
-        int i = 1;
-        while (i < a)
-        {
-            i <<= 1;
-            log++;
-        }
-        return log;
-    }
-
-    /**
-     * Compute <tt>ceil(log_256 n)</tt>, the number of bytes needed to encode
-     * the integer <tt>n</tt>.
-     *
-     * @param n the integer
-     * @return the number of bytes needed to encode <tt>n</tt>
-     */
-    public static int ceilLog256(int n)
-    {
-        if (n == 0)
-        {
-            return 1;
-        }
-        int m;
-        if (n < 0)
-        {
-            m = -n;
-        }
-        else
-        {
-            m = n;
-        }
-
-        int d = 0;
-        while (m > 0)
-        {
-            d++;
-            m >>>= 8;
-        }
-        return d;
-    }
-
-    /**
-     * Compute <tt>ceil(log_256 n)</tt>, the number of bytes needed to encode
-     * the long integer <tt>n</tt>.
-     *
-     * @param n the long integer
-     * @return the number of bytes needed to encode <tt>n</tt>
-     */
-    public static int ceilLog256(long n)
-    {
-        if (n == 0)
-        {
-            return 1;
-        }
-        long m;
-        if (n < 0)
-        {
-            m = -n;
-        }
-        else
-        {
-            m = n;
-        }
-
-        int d = 0;
-        while (m > 0)
-        {
-            d++;
-            m >>>= 8;
-        }
-        return d;
-    }
-
-    /**
-     * Compute the integer part of the logarithm to the base 2 of the given
-     * integer.
-     *
-     * @param a the integer
-     * @return floor[log(a)]
-     */
-    public static int floorLog(BigInteger a)
-    {
-        int result = -1;
-        BigInteger p = ONE;
-        while (p.compareTo(a) <= 0)
-        {
-            result++;
-            p = p.shiftLeft(1);
-        }
-        return result;
-    }
-
-    /**
-     * Compute the integer part of the logarithm to the base 2 of the given
-     * integer.
-     *
-     * @param a the integer
-     * @return floor[log(a)]
-     */
-    public static int floorLog(int a)
-    {
-        int h = 0;
-        if (a <= 0)
-        {
-            return -1;
-        }
-        int p = a >>> 1;
-        while (p > 0)
-        {
-            h++;
-            p >>>= 1;
-        }
-
-        return h;
-    }
-
-    /**
-     * Compute the largest <tt>h</tt> with <tt>2^h | a</tt> if <tt>a!=0</tt>.
-     *
-     * @param a an integer
-     * @return the largest <tt>h</tt> with <tt>2^h | a</tt> if <tt>a!=0</tt>,
-     *         <tt>0</tt> otherwise
-     */
-    public static int maxPower(int a)
-    {
-        int h = 0;
-        if (a != 0)
-        {
-            int p = 1;
-            while ((a & p) == 0)
-            {
-                h++;
-                p <<= 1;
-            }
-        }
-
-        return h;
-    }
-
-    /**
-     * @param a an integer
-     * @return the number of ones in the binary representation of an integer
-     *         <tt>a</tt>
-     */
-    public static int bitCount(int a)
-    {
-        int h = 0;
-        while (a != 0)
-        {
-            h += a & 1;
-            a >>>= 1;
-        }
-
-        return h;
-    }
-
-    /**
-     * determines the order of g modulo p, p prime and 1 &lt; g &lt; p. This algorithm
-     * is only efficient for small p (see X9.62-1998, p. 68).
-     *
-     * @param g an integer with 1 &lt; g &lt; p
-     * @param p a prime
-     * @return the order k of g (that is k is the smallest integer with
-     *         g<sup>k</sup> = 1 mod p
-     */
-    public static int order(int g, int p)
-    {
-        int b, j;
-
-        b = g % p; // Reduce g mod p first.
-        j = 1;
-
-        // Check whether g == 0 mod p (avoiding endless loop).
-        if (b == 0)
-        {
-            throw new IllegalArgumentException(g + " is not an element of Z/("
-                + p + "Z)^*; it is not meaningful to compute its order.");
-        }
-
-        // Compute the order of g mod p:
-        while (b != 1)
-        {
-            b *= g;
-            b %= p;
-            if (b < 0)
-            {
-                b += p;
-            }
-            j++;
-        }
-
-        return j;
-    }
-
-    /**
-     * Reduces an integer into a given interval
-     *
-     * @param n     - the integer
-     * @param begin - left bound of the interval
-     * @param end   - right bound of the interval
-     * @return <tt>n</tt> reduced into <tt>[begin,end]</tt>
-     */
-    public static BigInteger reduceInto(BigInteger n, BigInteger begin,
-                                        BigInteger end)
-    {
-        return n.subtract(begin).mod(end.subtract(begin)).add(begin);
-    }
-
-    /**
-     * Compute <tt>a<sup>e</sup></tt>.
-     *
-     * @param a the base
-     * @param e the exponent
-     * @return <tt>a<sup>e</sup></tt>
-     */
-    public static int pow(int a, int e)
-    {
-        int result = 1;
-        while (e > 0)
-        {
-            if ((e & 1) == 1)
-            {
-                result *= a;
-            }
-            a *= a;
-            e >>>= 1;
-        }
-        return result;
-    }
-
-    /**
-     * Compute <tt>a<sup>e</sup></tt>.
-     *
-     * @param a the base
-     * @param e the exponent
-     * @return <tt>a<sup>e</sup></tt>
-     */
-    public static long pow(long a, int e)
-    {
-        long result = 1;
-        while (e > 0)
-        {
-            if ((e & 1) == 1)
-            {
-                result *= a;
-            }
-            a *= a;
-            e >>>= 1;
-        }
-        return result;
-    }
-
-    /**
-     * Compute <tt>a<sup>e</sup> mod n</tt>.
-     *
-     * @param a the base
-     * @param e the exponent
-     * @param n the modulus
-     * @return <tt>a<sup>e</sup> mod n</tt>
-     */
-    public static int modPow(int a, int e, int n)
-    {
-        if (n <= 0 || (n * n) > Integer.MAX_VALUE || e < 0)
-        {
-            return 0;
-        }
-        int result = 1;
-        a = (a % n + n) % n;
-        while (e > 0)
-        {
-            if ((e & 1) == 1)
-            {
-                result = (result * a) % n;
-            }
-            a = (a * a) % n;
-            e >>>= 1;
-        }
-        return result;
-    }
-
-    /**
-     * Extended euclidian algorithm (computes gcd and representation).
-     *
-     * @param a - the first integer
-     * @param b - the second integer
-     * @return <tt>(d,u,v)</tt>, where <tt>d = gcd(a,b) = ua + vb</tt>
-     */
-    public static BigInteger[] extgcd(BigInteger a, BigInteger b)
-    {
-        BigInteger u = ONE;
-        BigInteger v = ZERO;
-        BigInteger d = a;
-        if (b.signum() != 0)
-        {
-            BigInteger v1 = ZERO;
-            BigInteger v3 = b;
-            while (v3.signum() != 0)
-            {
-                BigInteger[] tmp = d.divideAndRemainder(v3);
-                BigInteger q = tmp[0];
-                BigInteger t3 = tmp[1];
-                BigInteger t1 = u.subtract(q.multiply(v1));
-                u = v1;
-                d = v3;
-                v1 = t1;
-                v3 = t3;
-            }
-            v = d.subtract(a.multiply(u)).divide(b);
-        }
-        return new BigInteger[]{d, u, v};
-    }
-
-    /**
-     * Computation of the least common multiple of a set of BigIntegers.
-     *
-     * @param numbers - the set of numbers
-     * @return the lcm(numbers)
-     */
-    public static BigInteger leastCommonMultiple(BigInteger[] numbers)
-    {
-        int n = numbers.length;
-        BigInteger result = numbers[0];
-        for (int i = 1; i < n; i++)
-        {
-            BigInteger gcd = result.gcd(numbers[i]);
-            result = result.multiply(numbers[i]).divide(gcd);
-        }
-        return result;
-    }
-
-    /**
-     * Returns a long integer whose value is <tt>(a mod m</tt>). This method
-     * differs from <tt>%</tt> in that it always returns a <i>non-negative</i>
-     * integer.
-     *
-     * @param a value on which the modulo operation has to be performed.
-     * @param m the modulus.
-     * @return <tt>a mod m</tt>
-     */
-    public static long mod(long a, long m)
-    {
-        long result = a % m;
-        if (result < 0)
-        {
-            result += m;
-        }
-        return result;
-    }
-
-    /**
-     * Computes the modular inverse of an integer a
-     *
-     * @param a   - the integer to invert
-     * @param mod - the modulus
-     * @return <tt>a<sup>-1</sup> mod n</tt>
-     */
-    public static int modInverse(int a, int mod)
-    {
-        return BigInteger.valueOf(a).modInverse(BigInteger.valueOf(mod))
-            .intValue();
-    }
-
-    /**
-     * Computes the modular inverse of an integer a
-     *
-     * @param a   - the integer to invert
-     * @param mod - the modulus
-     * @return <tt>a<sup>-1</sup> mod n</tt>
-     */
-    public static long modInverse(long a, long mod)
-    {
-        return BigInteger.valueOf(a).modInverse(BigInteger.valueOf(mod))
-            .longValue();
-    }
-
-    /**
-     * Tests whether an integer <tt>a</tt> is power of another integer
-     * <tt>p</tt>.
-     *
-     * @param a - the first integer
-     * @param p - the second integer
-     * @return n if a = p^n or -1 otherwise
-     */
-    public static int isPower(int a, int p)
-    {
-        if (a <= 0)
-        {
-            return -1;
-        }
-        int n = 0;
-        int d = a;
-        while (d > 1)
-        {
-            if (d % p != 0)
-            {
-                return -1;
-            }
-            d /= p;
-            n++;
-        }
-        return n;
-    }
-
-    /**
-     * Find and return the least non-trivial divisor of an integer <tt>a</tt>.
-     *
-     * @param a - the integer
-     * @return divisor p &gt;1 or 1 if a = -1,0,1
-     */
-    public static int leastDiv(int a)
-    {
-        if (a < 0)
-        {
-            a = -a;
-        }
-        if (a == 0)
-        {
-            return 1;
-        }
-        if ((a & 1) == 0)
-        {
-            return 2;
-        }
-        int p = 3;
-        while (p <= (a / p))
-        {
-            if ((a % p) == 0)
-            {
-                return p;
-            }
-            p += 2;
-        }
-
-        return a;
-    }
-
-    /**
-     * Miller-Rabin-Test, determines wether the given integer is probably prime
-     * or composite. This method returns <tt>true</tt> if the given integer is
-     * prime with probability <tt>1 - 2<sup>-20</sup></tt>.
-     *
-     * @param n the integer to test for primality
-     * @return <tt>true</tt> if the given integer is prime with probability
-     *         2<sup>-100</sup>, <tt>false</tt> otherwise
-     */
-    public static boolean isPrime(int n)
-    {
-        if (n < 2)
-        {
-            return false;
-        }
-        if (n == 2)
-        {
-            return true;
-        }
-        if ((n & 1) == 0)
-        {
-            return false;
-        }
-        if (n < 42)
-        {
-            for (int i = 0; i < SMALL_PRIMES.length; i++)
-            {
-                if (n == SMALL_PRIMES[i])
-                {
-                    return true;
-                }
-            }
-        }
-
-        if ((n % 3 == 0) || (n % 5 == 0) || (n % 7 == 0) || (n % 11 == 0)
-            || (n % 13 == 0) || (n % 17 == 0) || (n % 19 == 0)
-            || (n % 23 == 0) || (n % 29 == 0) || (n % 31 == 0)
-            || (n % 37 == 0) || (n % 41 == 0))
-        {
-            return false;
-        }
-
-        return BigInteger.valueOf(n).isProbablePrime(20);
-    }
-
-    /**
-     * Short trial-division test to find out whether a number is not prime. This
-     * test is usually used before a Miller-Rabin primality test.
-     *
-     * @param candidate the number to test
-     * @return <tt>true</tt> if the number has no factor of the tested primes,
-     *         <tt>false</tt> if the number is definitely composite
-     */
-    public static boolean passesSmallPrimeTest(BigInteger candidate)
-    {
-        final int[] smallPrime = {2, 3, 5, 7, 11, 13, 17, 19, 23, 29, 31, 37,
-            41, 43, 47, 53, 59, 61, 67, 71, 73, 79, 83, 89, 97, 101, 103,
-            107, 109, 113, 127, 131, 137, 139, 149, 151, 157, 163, 167,
-            173, 179, 181, 191, 193, 197, 199, 211, 223, 227, 229, 233,
-            239, 241, 251, 257, 263, 269, 271, 277, 281, 283, 293, 307,
-            311, 313, 317, 331, 337, 347, 349, 353, 359, 367, 373, 379,
-            383, 389, 397, 401, 409, 419, 421, 431, 433, 439, 443, 449,
-            457, 461, 463, 467, 479, 487, 491, 499, 503, 509, 521, 523,
-            541, 547, 557, 563, 569, 571, 577, 587, 593, 599, 601, 607,
-            613, 617, 619, 631, 641, 643, 647, 653, 659, 661, 673, 677,
-            683, 691, 701, 709, 719, 727, 733, 739, 743, 751, 757, 761,
-            769, 773, 787, 797, 809, 811, 821, 823, 827, 829, 839, 853,
-            857, 859, 863, 877, 881, 883, 887, 907, 911, 919, 929, 937,
-            941, 947, 953, 967, 971, 977, 983, 991, 997, 1009, 1013, 1019,
-            1021, 1031, 1033, 1039, 1049, 1051, 1061, 1063, 1069, 1087,
-            1091, 1093, 1097, 1103, 1109, 1117, 1123, 1129, 1151, 1153,
-            1163, 1171, 1181, 1187, 1193, 1201, 1213, 1217, 1223, 1229,
-            1231, 1237, 1249, 1259, 1277, 1279, 1283, 1289, 1291, 1297,
-            1301, 1303, 1307, 1319, 1321, 1327, 1361, 1367, 1373, 1381,
-            1399, 1409, 1423, 1427, 1429, 1433, 1439, 1447, 1451, 1453,
-            1459, 1471, 1481, 1483, 1487, 1489, 1493, 1499};
-
-        for (int i = 0; i < smallPrime.length; i++)
-        {
-            if (candidate.mod(BigInteger.valueOf(smallPrime[i])).equals(
-                ZERO))
-            {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    /**
-     * Returns the largest prime smaller than the given integer
-     *
-     * @param n - upper bound
-     * @return the largest prime smaller than <tt>n</tt>, or <tt>1</tt> if
-     *         <tt>n &lt;= 2</tt>
-     */
-    public static int nextSmallerPrime(int n)
-    {
-        if (n <= 2)
-        {
-            return 1;
-        }
-
-        if (n == 3)
-        {
-            return 2;
-        }
-
-        if ((n & 1) == 0)
-        {
-            n--;
-        }
-        else
-        {
-            n -= 2;
-        }
-
-        while (n > 3 & !isPrime(n))
-        {
-            n -= 2;
-        }
-        return n;
-    }
-
-    /**
-     * Compute the next probable prime greater than <tt>n</tt> with the
-     * specified certainty.
-     *
-     * @param n         a integer number
-     * @param certainty the certainty that the generated number is prime
-     * @return the next prime greater than <tt>n</tt>
-     */
-    public static BigInteger nextProbablePrime(BigInteger n, int certainty)
-    {
-
-        if (n.signum() < 0 || n.signum() == 0 || n.equals(ONE))
-        {
-            return TWO;
-        }
-
-        BigInteger result = n.add(ONE);
-
-        // Ensure an odd number
-        if (!result.testBit(0))
-        {
-            result = result.add(ONE);
-        }
-
-        while (true)
-        {
-            // Do cheap "pre-test" if applicable
-            if (result.bitLength() > 6)
-            {
-                long r = result.remainder(
-                    BigInteger.valueOf(SMALL_PRIME_PRODUCT)).longValue();
-                if ((r % 3 == 0) || (r % 5 == 0) || (r % 7 == 0)
-                    || (r % 11 == 0) || (r % 13 == 0) || (r % 17 == 0)
-                    || (r % 19 == 0) || (r % 23 == 0) || (r % 29 == 0)
-                    || (r % 31 == 0) || (r % 37 == 0) || (r % 41 == 0))
-                {
-                    result = result.add(TWO);
-                    continue; // Candidate is composite; try another
-                }
-            }
-
-            // All candidates of bitLength 2 and 3 are prime by this point
-            if (result.bitLength() < 4)
-            {
-                return result;
-            }
-
-            // The expensive test
-            if (result.isProbablePrime(certainty))
-            {
-                return result;
-            }
-
-            result = result.add(TWO);
-        }
-    }
-
-    /**
-     * Compute the next probable prime greater than <tt>n</tt> with the default
-     * certainty (20).
-     *
-     * @param n a integer number
-     * @return the next prime greater than <tt>n</tt>
-     */
-    public static BigInteger nextProbablePrime(BigInteger n)
-    {
-        return nextProbablePrime(n, 20);
-    }
-
-    /**
-     * Computes the next prime greater than n.
-     *
-     * @param n a integer number
-     * @return the next prime greater than n
-     */
-    public static BigInteger nextPrime(long n)
-    {
-        long i;
-        boolean found = false;
-        long result = 0;
-
-        if (n <= 1)
-        {
-            return BigInteger.valueOf(2);
-        }
-        if (n == 2)
-        {
-            return BigInteger.valueOf(3);
-        }
-
-        for (i = n + 1 + (n & 1); (i <= n << 1) && !found; i += 2)
-        {
-            for (long j = 3; (j <= i >> 1) && !found; j += 2)
-            {
-                if (i % j == 0)
-                {
-                    found = true;
-                }
-            }
-            if (found)
-            {
-                found = false;
-            }
-            else
-            {
-                result = i;
-                found = true;
-            }
-        }
-        return BigInteger.valueOf(result);
-    }
-
-    /**
-     * Computes the binomial coefficient (n|t) ("n over t"). Formula:
-     * <ul>
-     * <li>if n !=0 and t != 0 then (n|t) = Mult(i=1, t): (n-(i-1))/i</li>
-     * <li>if t = 0 then (n|t) = 1</li>
-     * <li>if n = 0 and t &gt; 0 then (n|t) = 0</li>
-     * </ul>
-     *
-     * @param n - the "upper" integer
-     * @param t - the "lower" integer
-     * @return the binomialcoefficient "n over t" as BigInteger
-     */
-    public static BigInteger binomial(int n, int t)
-    {
-
-        BigInteger result = ONE;
-
-        if (n == 0)
-        {
-            if (t == 0)
-            {
-                return result;
-            }
-            return ZERO;
-        }
-
-        // the property (n|t) = (n|n-t) be used to reduce numbers of operations
-        if (t > (n >>> 1))
-        {
-            t = n - t;
-        }
-
-        for (int i = 1; i <= t; i++)
-        {
-            result = (result.multiply(BigInteger.valueOf(n - (i - 1))))
-                .divide(BigInteger.valueOf(i));
-        }
-
-        return result;
-    }
-
-    public static BigInteger randomize(BigInteger upperBound)
-    {
-        if (sr == null)
-        {
-            sr = new SecureRandom();
-        }
-        return randomize(upperBound, sr);
-    }
-
-    public static BigInteger randomize(BigInteger upperBound,
-                                       SecureRandom prng)
-    {
-        int blen = upperBound.bitLength();
-        BigInteger randomNum = BigInteger.valueOf(0);
-
-        if (prng == null)
-        {
-            prng = sr != null ? sr : new SecureRandom();
-        }
-
-        for (int i = 0; i < 20; i++)
-        {
-            randomNum = new BigInteger(blen, prng);
-            if (randomNum.compareTo(upperBound) < 0)
-            {
-                return randomNum;
-            }
-        }
-        return randomNum.mod(upperBound);
-    }
-
-    /**
-     * Extract the truncated square root of a BigInteger.
-     *
-     * @param a - value out of which we extract the square root
-     * @return the truncated square root of <tt>a</tt>
-     */
-    public static BigInteger squareRoot(BigInteger a)
-    {
-        int bl;
-        BigInteger result, remainder, b;
-
-        if (a.compareTo(ZERO) < 0)
-        {
-            throw new ArithmeticException(
-                "cannot extract root of negative number" + a + ".");
-        }
-
-        bl = a.bitLength();
-        result = ZERO;
-        remainder = ZERO;
-
-        // if the bit length is odd then extra step
-        if ((bl & 1) != 0)
-        {
-            result = result.add(ONE);
-            bl--;
-        }
-
-        while (bl > 0)
-        {
-            remainder = remainder.multiply(FOUR);
-            remainder = remainder.add(BigInteger.valueOf((a.testBit(--bl) ? 2
-                : 0)
-                + (a.testBit(--bl) ? 1 : 0)));
-            b = result.multiply(FOUR).add(ONE);
-            result = result.multiply(TWO);
-            if (remainder.compareTo(b) != -1)
-            {
-                result = result.add(ONE);
-                remainder = remainder.subtract(b);
-            }
-        }
-
-        return result;
-    }
-
-    /**
-     * Takes an approximation of the root from an integer base, using newton's
-     * algorithm
-     *
-     * @param base the base to take the root from
-     * @param root the root, for example 2 for a square root
-     */
-    public static float intRoot(int base, int root)
-    {
-        float gNew = base / root;
-        float gOld = 0;
-        int counter = 0;
-        while (Math.abs(gOld - gNew) > 0.0001)
-        {
-            float gPow = floatPow(gNew, root);
-            while (Float.isInfinite(gPow))
-            {
-                gNew = (gNew + gOld) / 2;
-                gPow = floatPow(gNew, root);
-            }
-            counter += 1;
-            gOld = gNew;
-            gNew = gOld - (gPow - base) / (root * floatPow(gOld, root - 1));
-        }
-        return gNew;
-    }
-
-    /**
-     * Calculation of a logarithmus of a float param
-     *
-     * @param param
-     * @return
-     */
-    public static float floatLog(float param)
-    {
-        double arg = (param - 1) / (param + 1);
-        double arg2 = arg;
-        int counter = 1;
-        float result = (float)arg;
-
-        while (arg2 > 0.001)
-        {
-            counter += 2;
-            arg2 *= arg * arg;
-            result += (1. / counter) * arg2;
-        }
-        return 2 * result;
-    }
-
-    /**
-     * int power of a base float, only use for small ints
-     *
-     * @param f
-     * @param i
-     * @return
-     */
-    public static float floatPow(float f, int i)
-    {
-        float g = 1;
-        for (; i > 0; i--)
-        {
-            g *= f;
-        }
-        return g;
-    }
-
-    /**
-     * calculate the logarithm to the base 2.
-     *
-     * @param x any double value
-     * @return log_2(x)
-     * @deprecated use MathFunctions.log(double) instead
-     */
-    public static double log(double x)
-    {
-        if (x > 0 && x < 1)
-        {
-            double d = 1 / x;
-            double result = -log(d);
-            return result;
-        }
-
-        int tmp = 0;
-        double tmp2 = 1;
-        double d = x;
-
-        while (d > 2)
-        {
-            d = d / 2;
-            tmp += 1;
-            tmp2 *= 2;
-        }
-        double rem = x / tmp2;
-        rem = logBKM(rem);
-        return tmp + rem;
-    }
-
-    /**
-     * calculate the logarithm to the base 2.
-     *
-     * @param x any long value &gt;=1
-     * @return log_2(x)
-     * @deprecated use MathFunctions.log(long) instead
-     */
-    public static double log(long x)
-    {
-        int tmp = floorLog(BigInteger.valueOf(x));
-        long tmp2 = 1 << tmp;
-        double rem = (double)x / (double)tmp2;
-        rem = logBKM(rem);
-        return tmp + rem;
-    }
-
-    /**
-     * BKM Algorithm to calculate logarithms to the base 2.
-     *
-     * @param arg a double value with 1<= arg<= 4.768462058
-     * @return log_2(arg)
-     * @deprecated use MathFunctions.logBKM(double) instead
-     */
-    private static double logBKM(double arg)
-    {
-        double ae[] = // A_e[k] = log_2 (1 + 0.5^k)
-            {
-                1.0000000000000000000000000000000000000000000000000000000000000000000000000000,
-                0.5849625007211561814537389439478165087598144076924810604557526545410982276485,
-                0.3219280948873623478703194294893901758648313930245806120547563958159347765589,
-                0.1699250014423123629074778878956330175196288153849621209115053090821964552970,
-                0.0874628412503394082540660108104043540112672823448206881266090643866965081686,
-                0.0443941193584534376531019906736094674630459333742491317685543002674288465967,
-                0.0223678130284545082671320837460849094932677948156179815932199216587899627785,
-                0.0112272554232541203378805844158839407281095943600297940811823651462712311786,
-                0.0056245491938781069198591026740666017211096815383520359072957784732489771013,
-                0.0028150156070540381547362547502839489729507927389771959487826944878598909400,
-                0.0014081943928083889066101665016890524233311715793462235597709051792834906001,
-                0.0007042690112466432585379340422201964456668872087249334581924550139514213168,
-                0.0003521774803010272377989609925281744988670304302127133979341729842842377649,
-                0.0001760994864425060348637509459678580940163670081839283659942864068257522373,
-                0.0000880524301221769086378699983597183301490534085738474534831071719854721939,
-                0.0000440268868273167176441087067175806394819146645511899503059774914593663365,
-                0.0000220136113603404964890728830697555571275493801909791504158295359319433723,
-                0.0000110068476674814423006223021573490183469930819844945565597452748333526464,
-                0.0000055034343306486037230640321058826431606183125807276574241540303833251704,
-                0.0000027517197895612831123023958331509538486493412831626219340570294203116559,
-                0.0000013758605508411382010566802834037147561973553922354232704569052932922954,
-                0.0000006879304394358496786728937442939160483304056131990916985043387874690617,
-                0.0000003439652607217645360118314743718005315334062644619363447395987584138324,
-                0.0000001719826406118446361936972479533123619972434705828085978955697643547921,
-                0.0000000859913228686632156462565208266682841603921494181830811515318381744650,
-                0.0000000429956620750168703982940244684787907148132725669106053076409624949917,
-                0.0000000214978311976797556164155504126645192380395989504741781512309853438587,
-                0.0000000107489156388827085092095702361647949603617203979413516082280717515504,
-                0.0000000053744578294520620044408178949217773318785601260677517784797554422804,
-                0.0000000026872289172287079490026152352638891824761667284401180026908031182361,
-                0.0000000013436144592400232123622589569799954658536700992739887706412976115422,
-                0.0000000006718072297764289157920422846078078155859484240808550018085324187007,
-                0.0000000003359036149273187853169587152657145221968468364663464125722491530858,
-                0.0000000001679518074734354745159899223037458278711244127245990591908996412262,
-                0.0000000000839759037391617577226571237484864917411614198675604731728132152582,
-                0.0000000000419879518701918839775296677020135040214077417929807824842667285938,
-                0.0000000000209939759352486932678195559552767641474249812845414125580747434389,
-                0.0000000000104969879676625344536740142096218372850561859495065136990936290929,
-                0.0000000000052484939838408141817781356260462777942148580518406975851213868092,
-                0.0000000000026242469919227938296243586262369156865545638305682553644113887909,
-                0.0000000000013121234959619935994960031017850191710121890821178731821983105443,
-                0.0000000000006560617479811459709189576337295395590603644549624717910616347038,
-                0.0000000000003280308739906102782522178545328259781415615142931952662153623493,
-                0.0000000000001640154369953144623242936888032768768777422997704541618141646683,
-                0.0000000000000820077184976595619616930350508356401599552034612281802599177300,
-                0.0000000000000410038592488303636807330652208397742314215159774270270147020117,
-                0.0000000000000205019296244153275153381695384157073687186580546938331088730952,
-                0.0000000000000102509648122077001764119940017243502120046885379813510430378661,
-                0.0000000000000051254824061038591928917243090559919209628584150482483994782302,
-                0.0000000000000025627412030519318726172939815845367496027046030028595094737777,
-                0.0000000000000012813706015259665053515049475574143952543145124550608158430592,
-                0.0000000000000006406853007629833949364669629701200556369782295210193569318434,
-                0.0000000000000003203426503814917330334121037829290364330169106716787999052925,
-                0.0000000000000001601713251907458754080007074659337446341494733882570243497196,
-                0.0000000000000000800856625953729399268240176265844257044861248416330071223615,
-                0.0000000000000000400428312976864705191179247866966320469710511619971334577509,
-                0.0000000000000000200214156488432353984854413866994246781519154793320684126179,
-                0.0000000000000000100107078244216177339743404416874899847406043033792202127070,
-                0.0000000000000000050053539122108088756700751579281894640362199287591340285355,
-                0.0000000000000000025026769561054044400057638132352058574658089256646014899499,
-                0.0000000000000000012513384780527022205455634651853807110362316427807660551208,
-                0.0000000000000000006256692390263511104084521222346348012116229213309001913762,
-                0.0000000000000000003128346195131755552381436585278035120438976487697544916191,
-                0.0000000000000000001564173097565877776275512286165232838833090480508502328437,
-                0.0000000000000000000782086548782938888158954641464170239072244145219054734086,
-                0.0000000000000000000391043274391469444084776945327473574450334092075712154016,
-                0.0000000000000000000195521637195734722043713378812583900953755962557525252782,
-                0.0000000000000000000097760818597867361022187915943503728909029699365320287407,
-                0.0000000000000000000048880409298933680511176764606054809062553340323879609794,
-                0.0000000000000000000024440204649466840255609083961603140683286362962192177597,
-                0.0000000000000000000012220102324733420127809717395445504379645613448652614939,
-                0.0000000000000000000006110051162366710063906152551383735699323415812152114058,
-                0.0000000000000000000003055025581183355031953399739107113727036860315024588989,
-                0.0000000000000000000001527512790591677515976780735407368332862218276873443537,
-                0.0000000000000000000000763756395295838757988410584167137033767056170417508383,
-                0.0000000000000000000000381878197647919378994210346199431733717514843471513618,
-                0.0000000000000000000000190939098823959689497106436628681671067254111334889005,
-                0.0000000000000000000000095469549411979844748553534196582286585751228071408728,
-                0.0000000000000000000000047734774705989922374276846068851506055906657137209047,
-                0.0000000000000000000000023867387352994961187138442777065843718711089344045782,
-                0.0000000000000000000000011933693676497480593569226324192944532044984865894525,
-                0.0000000000000000000000005966846838248740296784614396011477934194852481410926,
-                0.0000000000000000000000002983423419124370148392307506484490384140516252814304,
-                0.0000000000000000000000001491711709562185074196153830361933046331030629430117,
-                0.0000000000000000000000000745855854781092537098076934460888486730708440475045,
-                0.0000000000000000000000000372927927390546268549038472050424734256652501673274,
-                0.0000000000000000000000000186463963695273134274519237230207489851150821191330,
-                0.0000000000000000000000000093231981847636567137259618916352525606281553180093,
-                0.0000000000000000000000000046615990923818283568629809533488457973317312233323,
-                0.0000000000000000000000000023307995461909141784314904785572277779202790023236,
-                0.0000000000000000000000000011653997730954570892157452397493151087737428485431,
-                0.0000000000000000000000000005826998865477285446078726199923328593402722606924,
-                0.0000000000000000000000000002913499432738642723039363100255852559084863397344,
-                0.0000000000000000000000000001456749716369321361519681550201473345138307215067,
-                0.0000000000000000000000000000728374858184660680759840775119123438968122488047,
-                0.0000000000000000000000000000364187429092330340379920387564158411083803465567,
-                0.0000000000000000000000000000182093714546165170189960193783228378441837282509,
-                0.0000000000000000000000000000091046857273082585094980096891901482445902524441,
-                0.0000000000000000000000000000045523428636541292547490048446022564529197237262,
-                0.0000000000000000000000000000022761714318270646273745024223029238091160103901};
-        int n = 53;
-        double x = 1;
-        double y = 0;
-        double z;
-        double s = 1;
-        int k;
-
-        for (k = 0; k < n; k++)
-        {
-            z = x + x * s;
-            if (z <= arg)
-            {
-                x = z;
-                y += ae[k];
-            }
-            s *= 0.5;
-        }
-        return y;
-    }
-
-    public static boolean isIncreasing(int[] a)
-    {
-        for (int i = 1; i < a.length; i++)
-        {
-            if (a[i - 1] >= a[i])
-            {
-                System.out.println("a[" + (i - 1) + "] = " + a[i - 1] + " >= "
-                    + a[i] + " = a[" + i + "]");
-                return false;
-            }
-        }
-        return true;
-    }
-
-    public static byte[] integerToOctets(BigInteger val)
-    {
-        byte[] valBytes = val.abs().toByteArray();
-
-        // check whether the array includes a sign bit
-        if ((val.bitLength() & 7) != 0)
-        {
-            return valBytes;
-        }
-        // get rid of the sign bit (first byte)
-        byte[] tmp = new byte[val.bitLength() >> 3];
-        System.arraycopy(valBytes, 1, tmp, 0, tmp.length);
-        return tmp;
-    }
-
-    public static BigInteger octetsToInteger(byte[] data, int offset,
-                                             int length)
-    {
-        byte[] val = new byte[length + 1];
-
-        val[0] = 0;
-        System.arraycopy(data, offset, val, 1, length);
-        return new BigInteger(val);
-    }
-
-    public static BigInteger octetsToInteger(byte[] data)
-    {
-        return octetsToInteger(data, 0, data.length);
-    }
-
-    public static void main(String[] args)
-    {
-        System.out.println("test");
-        // System.out.println(intRoot(37, 5));
-        // System.out.println(floatPow((float)2.5, 4));
-        System.out.println(floatLog(10));
-        System.out.println("test2");
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/math/linearalgebra/LittleEndianConversions.java b/bcprov/src/main/java/org/bouncycastle/pqc/math/linearalgebra/LittleEndianConversions.java
deleted file mode 100644
index c97fdc5..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/math/linearalgebra/LittleEndianConversions.java
+++ /dev/null
@@ -1,230 +0,0 @@
-package org.bouncycastle.pqc.math.linearalgebra;
-
-/**
- * This is a utility class containing data type conversions using little-endian
- * byte order.
- *
- * @see BigEndianConversions
- */
-public final class LittleEndianConversions
-{
-
-    /**
-     * Default constructor (private).
-     */
-    private LittleEndianConversions()
-    {
-        // empty
-    }
-
-    /**
-     * Convert an octet string of length 4 to an integer. No length checking is
-     * performed.
-     *
-     * @param input the byte array holding the octet string
-     * @return an integer representing the octet string <tt>input</tt>
-     * @throws ArithmeticException if the length of the given octet string is larger than 4.
-     */
-    public static int OS2IP(byte[] input)
-    {
-        return ((input[0] & 0xff)) | ((input[1] & 0xff) << 8)
-            | ((input[2] & 0xff) << 16) | ((input[3] & 0xff)) << 24;
-    }
-
-    /**
-     * Convert an byte array of length 4 beginning at <tt>offset</tt> into an
-     * integer.
-     *
-     * @param input the byte array
-     * @param inOff the offset into the byte array
-     * @return the resulting integer
-     */
-    public static int OS2IP(byte[] input, int inOff)
-    {
-        int result = input[inOff++] & 0xff;
-        result |= (input[inOff++] & 0xff) << 8;
-        result |= (input[inOff++] & 0xff) << 16;
-        result |= (input[inOff] & 0xff) << 24;
-        return result;
-    }
-
-    /**
-     * Convert a byte array of the given length beginning at <tt>offset</tt>
-     * into an integer.
-     *
-     * @param input the byte array
-     * @param inOff the offset into the byte array
-     * @param inLen the length of the encoding
-     * @return the resulting integer
-     */
-    public static int OS2IP(byte[] input, int inOff, int inLen)
-    {
-        int result = 0;
-        for (int i = inLen - 1; i >= 0; i--)
-        {
-            result |= (input[inOff + i] & 0xff) << (8 * i);
-        }
-        return result;
-    }
-
-    /**
-     * Convert a byte array of length 8 beginning at <tt>inOff</tt> into a
-     * long integer.
-     *
-     * @param input the byte array
-     * @param inOff the offset into the byte array
-     * @return the resulting long integer
-     */
-    public static long OS2LIP(byte[] input, int inOff)
-    {
-        long result = input[inOff++] & 0xff;
-        result |= (input[inOff++] & 0xff) << 8;
-        result |= (input[inOff++] & 0xff) << 16;
-        result |= ((long)input[inOff++] & 0xff) << 24;
-        result |= ((long)input[inOff++] & 0xff) << 32;
-        result |= ((long)input[inOff++] & 0xff) << 40;
-        result |= ((long)input[inOff++] & 0xff) << 48;
-        result |= ((long)input[inOff++] & 0xff) << 56;
-        return result;
-    }
-
-    /**
-     * Convert an integer to an octet string of length 4.
-     *
-     * @param x the integer to convert
-     * @return the converted integer
-     */
-    public static byte[] I2OSP(int x)
-    {
-        byte[] result = new byte[4];
-        result[0] = (byte)x;
-        result[1] = (byte)(x >>> 8);
-        result[2] = (byte)(x >>> 16);
-        result[3] = (byte)(x >>> 24);
-        return result;
-    }
-
-    /**
-     * Convert an integer into a byte array beginning at the specified offset.
-     *
-     * @param value  the integer to convert
-     * @param output the byte array to hold the result
-     * @param outOff the integer offset into the byte array
-     */
-    public static void I2OSP(int value, byte[] output, int outOff)
-    {
-        output[outOff++] = (byte)value;
-        output[outOff++] = (byte)(value >>> 8);
-        output[outOff++] = (byte)(value >>> 16);
-        output[outOff++] = (byte)(value >>> 24);
-    }
-
-    /**
-     * Convert an integer to a byte array beginning at the specified offset. No
-     * length checking is performed (i.e., if the integer cannot be encoded with
-     * <tt>length</tt> octets, it is truncated).
-     *
-     * @param value  the integer to convert
-     * @param output the byte array to hold the result
-     * @param outOff the integer offset into the byte array
-     * @param outLen the length of the encoding
-     */
-    public static void I2OSP(int value, byte[] output, int outOff, int outLen)
-    {
-        for (int i = outLen - 1; i >= 0; i--)
-        {
-            output[outOff + i] = (byte)(value >>> (8 * i));
-        }
-    }
-
-    /**
-     * Convert an integer to a byte array of length 8.
-     *
-     * @param input the integer to convert
-     * @return the converted integer
-     */
-    public static byte[] I2OSP(long input)
-    {
-        byte[] output = new byte[8];
-        output[0] = (byte)input;
-        output[1] = (byte)(input >>> 8);
-        output[2] = (byte)(input >>> 16);
-        output[3] = (byte)(input >>> 24);
-        output[4] = (byte)(input >>> 32);
-        output[5] = (byte)(input >>> 40);
-        output[6] = (byte)(input >>> 48);
-        output[7] = (byte)(input >>> 56);
-        return output;
-    }
-
-    /**
-     * Convert an integer to a byte array of length 8.
-     *
-     * @param input  the integer to convert
-     * @param output byte array holding the output
-     * @param outOff offset in output array where the result is stored
-     */
-    public static void I2OSP(long input, byte[] output, int outOff)
-    {
-        output[outOff++] = (byte)input;
-        output[outOff++] = (byte)(input >>> 8);
-        output[outOff++] = (byte)(input >>> 16);
-        output[outOff++] = (byte)(input >>> 24);
-        output[outOff++] = (byte)(input >>> 32);
-        output[outOff++] = (byte)(input >>> 40);
-        output[outOff++] = (byte)(input >>> 48);
-        output[outOff] = (byte)(input >>> 56);
-    }
-
-    /**
-     * Convert an int array to a byte array of the specified length. No length
-     * checking is performed (i.e., if the last integer cannot be encoded with
-     * <tt>length % 4</tt> octets, it is truncated).
-     *
-     * @param input  the int array
-     * @param outLen the length of the converted array
-     * @return the converted array
-     */
-    public static byte[] toByteArray(int[] input, int outLen)
-    {
-        int intLen = input.length;
-        byte[] result = new byte[outLen];
-        int index = 0;
-        for (int i = 0; i <= intLen - 2; i++, index += 4)
-        {
-            I2OSP(input[i], result, index);
-        }
-        I2OSP(input[intLen - 1], result, index, outLen - index);
-        return result;
-    }
-
-    /**
-     * Convert a byte array to an int array.
-     *
-     * @param input the byte array
-     * @return the converted array
-     */
-    public static int[] toIntArray(byte[] input)
-    {
-        int intLen = (input.length + 3) / 4;
-        int lastLen = input.length & 0x03;
-        int[] result = new int[intLen];
-
-        int index = 0;
-        for (int i = 0; i <= intLen - 2; i++, index += 4)
-        {
-            result[i] = OS2IP(input, index);
-        }
-        if (lastLen != 0)
-        {
-            result[intLen - 1] = OS2IP(input, index, lastLen);
-        }
-        else
-        {
-            result[intLen - 1] = OS2IP(input, index);
-        }
-
-        return result;
-    }
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/math/linearalgebra/Matrix.java b/bcprov/src/main/java/org/bouncycastle/pqc/math/linearalgebra/Matrix.java
deleted file mode 100644
index 2c9a0eb..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/math/linearalgebra/Matrix.java
+++ /dev/null
@@ -1,131 +0,0 @@
-package org.bouncycastle.pqc.math.linearalgebra;
-
-/**
- * This abstract class defines matrices. It holds the number of rows and the
- * number of columns of the matrix and defines some basic methods.
- */
-public abstract class Matrix
-{
-
-    /**
-     * number of rows
-     */
-    protected int numRows;
-
-    /**
-     * number of columns
-     */
-    protected int numColumns;
-
-    // ----------------------------------------------------
-    // some constants (matrix types)
-    // ----------------------------------------------------
-
-    /**
-     * zero matrix
-     */
-    public static final char MATRIX_TYPE_ZERO = 'Z';
-
-    /**
-     * unit matrix
-     */
-    public static final char MATRIX_TYPE_UNIT = 'I';
-
-    /**
-     * random lower triangular matrix
-     */
-    public static final char MATRIX_TYPE_RANDOM_LT = 'L';
-
-    /**
-     * random upper triangular matrix
-     */
-    public static final char MATRIX_TYPE_RANDOM_UT = 'U';
-
-    /**
-     * random regular matrix
-     */
-    public static final char MATRIX_TYPE_RANDOM_REGULAR = 'R';
-
-    // ----------------------------------------------------
-    // getters
-    // ----------------------------------------------------
-
-    /**
-     * @return the number of rows in the matrix
-     */
-    public int getNumRows()
-    {
-        return numRows;
-    }
-
-    /**
-     * @return the number of columns in the binary matrix
-     */
-    public int getNumColumns()
-    {
-        return numColumns;
-    }
-
-    /**
-     * @return the encoded matrix, i.e., this matrix in byte array form.
-     */
-    public abstract byte[] getEncoded();
-
-    // ----------------------------------------------------
-    // arithmetic
-    // ----------------------------------------------------
-
-    /**
-     * Compute the inverse of this matrix.
-     *
-     * @return the inverse of this matrix (newly created).
-     */
-    public abstract Matrix computeInverse();
-
-    /**
-     * Check if this is the zero matrix (i.e., all entries are zero).
-     *
-     * @return <tt>true</tt> if this is the zero matrix
-     */
-    public abstract boolean isZero();
-
-    /**
-     * Compute the product of this matrix and another matrix.
-     *
-     * @param a the other matrix
-     * @return <tt>this * a</tt> (newly created)
-     */
-    public abstract Matrix rightMultiply(Matrix a);
-
-    /**
-     * Compute the product of this matrix and a permutation.
-     *
-     * @param p the permutation
-     * @return <tt>this * p</tt> (newly created)
-     */
-    public abstract Matrix rightMultiply(Permutation p);
-
-    /**
-     * Compute the product of a vector and this matrix. If the length of the
-     * vector is greater than the number of rows of this matrix, the matrix is
-     * multiplied by each m-bit part of the vector.
-     *
-     * @param vector a vector
-     * @return <tt>vector * this</tt> (newly created)
-     */
-    public abstract Vector leftMultiply(Vector vector);
-
-    /**
-     * Compute the product of this matrix and a vector.
-     *
-     * @param vector a vector
-     * @return <tt>this * vector</tt> (newly created)
-     */
-    public abstract Vector rightMultiply(Vector vector);
-
-    /**
-     * @return a human readable form of the matrix.
-     */
-    public abstract String toString();
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/math/linearalgebra/Permutation.java b/bcprov/src/main/java/org/bouncycastle/pqc/math/linearalgebra/Permutation.java
deleted file mode 100644
index 28b58d3..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/math/linearalgebra/Permutation.java
+++ /dev/null
@@ -1,247 +0,0 @@
-package org.bouncycastle.pqc.math.linearalgebra;
-
-import java.security.SecureRandom;
-
-/**
- * This class implements permutations of the set {0,1,...,n-1} for some given n
- * &gt; 0, i.e., ordered sequences containing each number <tt>m</tt> (<tt>0 &lt;=
- * m &lt; n</tt>)
- * once and only once.
- */
-public class Permutation
-{
-
-    /**
-     * perm holds the elements of the permutation vector, i.e. <tt>[perm(0),
-     * perm(1), ..., perm(n-1)]</tt>
-     */
-    private int[] perm;
-
-    /**
-     * Create the identity permutation of the given size.
-     *
-     * @param n the size of the permutation
-     */
-    public Permutation(int n)
-    {
-        if (n <= 0)
-        {
-            throw new IllegalArgumentException("invalid length");
-        }
-
-        perm = new int[n];
-        for (int i = n - 1; i >= 0; i--)
-        {
-            perm[i] = i;
-        }
-    }
-
-    /**
-     * Create a permutation using the given permutation vector.
-     *
-     * @param perm the permutation vector
-     */
-    public Permutation(int[] perm)
-    {
-        if (!isPermutation(perm))
-        {
-            throw new IllegalArgumentException(
-                "array is not a permutation vector");
-        }
-
-        this.perm = IntUtils.clone(perm);
-    }
-
-    /**
-     * Create a permutation from an encoded permutation.
-     *
-     * @param enc the encoded permutation
-     */
-    public Permutation(byte[] enc)
-    {
-        if (enc.length <= 4)
-        {
-            throw new IllegalArgumentException("invalid encoding");
-        }
-
-        int n = LittleEndianConversions.OS2IP(enc, 0);
-        int size = IntegerFunctions.ceilLog256(n - 1);
-
-        if (enc.length != 4 + n * size)
-        {
-            throw new IllegalArgumentException("invalid encoding");
-        }
-
-        perm = new int[n];
-        for (int i = 0; i < n; i++)
-        {
-            perm[i] = LittleEndianConversions.OS2IP(enc, 4 + i * size, size);
-        }
-
-        if (!isPermutation(perm))
-        {
-            throw new IllegalArgumentException("invalid encoding");
-        }
-
-    }
-
-    /**
-     * Create a random permutation of the given size.
-     *
-     * @param n  the size of the permutation
-     * @param sr the source of randomness
-     */
-    public Permutation(int n, SecureRandom sr)
-    {
-        if (n <= 0)
-        {
-            throw new IllegalArgumentException("invalid length");
-        }
-
-        perm = new int[n];
-
-        int[] help = new int[n];
-        for (int i = 0; i < n; i++)
-        {
-            help[i] = i;
-        }
-
-        int k = n;
-        for (int j = 0; j < n; j++)
-        {
-            int i = RandUtils.nextInt(sr, k);
-            k--;
-            perm[j] = help[i];
-            help[i] = help[k];
-        }
-    }
-
-    /**
-     * Encode this permutation as byte array.
-     *
-     * @return the encoded permutation
-     */
-    public byte[] getEncoded()
-    {
-        int n = perm.length;
-        int size = IntegerFunctions.ceilLog256(n - 1);
-        byte[] result = new byte[4 + n * size];
-        LittleEndianConversions.I2OSP(n, result, 0);
-        for (int i = 0; i < n; i++)
-        {
-            LittleEndianConversions.I2OSP(perm[i], result, 4 + i * size, size);
-        }
-        return result;
-    }
-
-    /**
-     * @return the permutation vector <tt>(perm(0),perm(1),...,perm(n-1))</tt>
-     */
-    public int[] getVector()
-    {
-        return IntUtils.clone(perm);
-    }
-
-    /**
-     * Compute the inverse permutation <tt>P<sup>-1</sup></tt>.
-     *
-     * @return <tt>this<sup>-1</sup></tt>
-     */
-    public Permutation computeInverse()
-    {
-        Permutation result = new Permutation(perm.length);
-        for (int i = perm.length - 1; i >= 0; i--)
-        {
-            result.perm[perm[i]] = i;
-        }
-        return result;
-    }
-
-    /**
-     * Compute the product of this permutation and another permutation.
-     *
-     * @param p the other permutation
-     * @return <tt>this * p</tt>
-     */
-    public Permutation rightMultiply(Permutation p)
-    {
-        if (p.perm.length != perm.length)
-        {
-            throw new IllegalArgumentException("length mismatch");
-        }
-        Permutation result = new Permutation(perm.length);
-        for (int i = perm.length - 1; i >= 0; i--)
-        {
-            result.perm[i] = perm[p.perm[i]];
-        }
-        return result;
-    }
-
-    /**
-     * checks if given object is equal to this permutation.
-     * <p>
-     * The method returns false whenever the given object is not permutation.
-     *
-     * @param other -
-     *              permutation
-     * @return true or false
-     */
-    public boolean equals(Object other)
-    {
-
-        if (!(other instanceof Permutation))
-        {
-            return false;
-        }
-        Permutation otherPerm = (Permutation)other;
-
-        return IntUtils.equals(perm, otherPerm.perm);
-    }
-
-    /**
-     * @return a human readable form of the permutation
-     */
-    public String toString()
-    {
-        String result = "[" + perm[0];
-        for (int i = 1; i < perm.length; i++)
-        {
-            result += ", " + perm[i];
-        }
-        result += "]";
-        return result;
-    }
-
-    /**
-     * @return the hash code of this permutation
-     */
-    public int hashCode()
-    {
-        return perm.hashCode();
-    }
-
-    /**
-     * Check that the given array corresponds to a permutation of the set
-     * <tt>{0, 1, ..., n-1}</tt>.
-     *
-     * @param perm permutation vector
-     * @return true if perm represents an n-permutation and false otherwise
-     */
-    private boolean isPermutation(int[] perm)
-    {
-        int n = perm.length;
-        boolean[] onlyOnce = new boolean[n];
-
-        for (int i = 0; i < n; i++)
-        {
-            if ((perm[i] < 0) || (perm[i] >= n) || onlyOnce[perm[i]])
-            {
-                return false;
-            }
-            onlyOnce[perm[i]] = true;
-        }
-
-        return true;
-    }
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/math/linearalgebra/PolynomialGF2mSmallM.java b/bcprov/src/main/java/org/bouncycastle/pqc/math/linearalgebra/PolynomialGF2mSmallM.java
deleted file mode 100644
index 866b6f7..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/math/linearalgebra/PolynomialGF2mSmallM.java
+++ /dev/null
@@ -1,1124 +0,0 @@
-package org.bouncycastle.pqc.math.linearalgebra;
-
-import java.security.SecureRandom;
-
-/**
- * This class describes operations with polynomials from the ring R =
- * GF(2^m)[X], where 2 &lt;= m &lt;=31.
- *
- * @see GF2mField
- * @see PolynomialRingGF2m
- */
-public class PolynomialGF2mSmallM
-{
-
-    /**
-     * the finite field GF(2^m)
-     */
-    private GF2mField field;
-
-    /**
-     * the degree of this polynomial
-     */
-    private int degree;
-
-    /**
-     * For the polynomial representation the map f: R->Z*,
-     * <tt>poly(X) -> [coef_0, coef_1, ...]</tt> is used, where
-     * <tt>coef_i</tt> is the <tt>i</tt>th coefficient of the polynomial
-     * represented as int (see {@link GF2mField}). The polynomials are stored
-     * as int arrays.
-     */
-    private int[] coefficients;
-
-    /*
-      * some types of polynomials
-      */
-
-    /**
-     * Constant used for polynomial construction (see constructor
-     * {@link #PolynomialGF2mSmallM(GF2mField, int, char, SecureRandom)}).
-     */
-    public static final char RANDOM_IRREDUCIBLE_POLYNOMIAL = 'I';
-
-    /**
-     * Construct the zero polynomial over the finite field GF(2^m).
-     *
-     * @param field the finite field GF(2^m)
-     */
-    public PolynomialGF2mSmallM(GF2mField field)
-    {
-        this.field = field;
-        degree = -1;
-        coefficients = new int[1];
-    }
-
-    /**
-     * Construct a polynomial over the finite field GF(2^m).
-     *
-     * @param field            the finite field GF(2^m)
-     * @param deg              degree of polynomial
-     * @param typeOfPolynomial type of polynomial
-     * @param sr               PRNG
-     */
-    public PolynomialGF2mSmallM(GF2mField field, int deg,
-                                char typeOfPolynomial, SecureRandom sr)
-    {
-        this.field = field;
-
-        switch (typeOfPolynomial)
-        {
-        case PolynomialGF2mSmallM.RANDOM_IRREDUCIBLE_POLYNOMIAL:
-            coefficients = createRandomIrreduciblePolynomial(deg, sr);
-            break;
-        default:
-            throw new IllegalArgumentException(" Error: type "
-                + typeOfPolynomial
-                + " is not defined for GF2smallmPolynomial");
-        }
-        computeDegree();
-    }
-
-    /**
-     * Create an irreducible polynomial with the given degree over the field
-     * <tt>GF(2^m)</tt>.
-     *
-     * @param deg polynomial degree
-     * @param sr  source of randomness
-     * @return the generated irreducible polynomial
-     */
-    private int[] createRandomIrreduciblePolynomial(int deg, SecureRandom sr)
-    {
-        int[] resCoeff = new int[deg + 1];
-        resCoeff[deg] = 1;
-        resCoeff[0] = field.getRandomNonZeroElement(sr);
-        for (int i = 1; i < deg; i++)
-        {
-            resCoeff[i] = field.getRandomElement(sr);
-        }
-        while (!isIrreducible(resCoeff))
-        {
-            int n = RandUtils.nextInt(sr, deg);
-            if (n == 0)
-            {
-                resCoeff[0] = field.getRandomNonZeroElement(sr);
-            }
-            else
-            {
-                resCoeff[n] = field.getRandomElement(sr);
-            }
-        }
-        return resCoeff;
-    }
-
-    /**
-     * Construct a monomial of the given degree over the finite field GF(2^m).
-     *
-     * @param field  the finite field GF(2^m)
-     * @param degree the degree of the monomial
-     */
-    public PolynomialGF2mSmallM(GF2mField field, int degree)
-    {
-        this.field = field;
-        this.degree = degree;
-        coefficients = new int[degree + 1];
-        coefficients[degree] = 1;
-    }
-
-    /**
-     * Construct the polynomial over the given finite field GF(2^m) from the
-     * given coefficient vector.
-     *
-     * @param field  finite field GF2m
-     * @param coeffs the coefficient vector
-     */
-    public PolynomialGF2mSmallM(GF2mField field, int[] coeffs)
-    {
-        this.field = field;
-        coefficients = normalForm(coeffs);
-        computeDegree();
-    }
-
-    /**
-     * Create a polynomial over the finite field GF(2^m).
-     *
-     * @param field the finite field GF(2^m)
-     * @param enc   byte[] polynomial in byte array form
-     */
-    public PolynomialGF2mSmallM(GF2mField field, byte[] enc)
-    {
-        this.field = field;
-
-        // decodes polynomial
-        int d = 8;
-        int count = 1;
-        while (field.getDegree() > d)
-        {
-            count++;
-            d += 8;
-        }
-
-        if ((enc.length % count) != 0)
-        {
-            throw new IllegalArgumentException(
-                " Error: byte array is not encoded polynomial over given finite field GF2m");
-        }
-
-        coefficients = new int[enc.length / count];
-        count = 0;
-        for (int i = 0; i < coefficients.length; i++)
-        {
-            for (int j = 0; j < d; j += 8)
-            {
-                coefficients[i] ^= (enc[count++] & 0x000000ff) << j;
-            }
-            if (!this.field.isElementOfThisField(coefficients[i]))
-            {
-                throw new IllegalArgumentException(
-                    " Error: byte array is not encoded polynomial over given finite field GF2m");
-            }
-        }
-        // if HC = 0 for non-zero polynomial, returns error
-        if ((coefficients.length != 1)
-            && (coefficients[coefficients.length - 1] == 0))
-        {
-            throw new IllegalArgumentException(
-                " Error: byte array is not encoded polynomial over given finite field GF2m");
-        }
-        computeDegree();
-    }
-
-    /**
-     * Copy constructor.
-     *
-     * @param other another {@link PolynomialGF2mSmallM}
-     */
-    public PolynomialGF2mSmallM(PolynomialGF2mSmallM other)
-    {
-        // field needs not to be cloned since it is immutable
-        field = other.field;
-        degree = other.degree;
-        coefficients = IntUtils.clone(other.coefficients);
-    }
-
-    /**
-     * Create a polynomial over the finite field GF(2^m) out of the given
-     * coefficient vector. The finite field is also obtained from the
-     * {@link GF2mVector}.
-     *
-     * @param vect the coefficient vector
-     */
-    public PolynomialGF2mSmallM(GF2mVector vect)
-    {
-        this(vect.getField(), vect.getIntArrayForm());
-    }
-
-    /*
-      * ------------------------
-      */
-
-    /**
-     * Return the degree of this polynomial
-     *
-     * @return int degree of this polynomial if this is zero polynomial return
-     *         -1
-     */
-    public int getDegree()
-    {
-        int d = coefficients.length - 1;
-        if (coefficients[d] == 0)
-        {
-            return -1;
-        }
-        return d;
-    }
-
-    /**
-     * @return the head coefficient of this polynomial
-     */
-    public int getHeadCoefficient()
-    {
-        if (degree == -1)
-        {
-            return 0;
-        }
-        return coefficients[degree];
-    }
-
-    /**
-     * Return the head coefficient of a polynomial.
-     *
-     * @param a the polynomial
-     * @return the head coefficient of <tt>a</tt>
-     */
-    private static int headCoefficient(int[] a)
-    {
-        int degree = computeDegree(a);
-        if (degree == -1)
-        {
-            return 0;
-        }
-        return a[degree];
-    }
-
-    /**
-     * Return the coefficient with the given index.
-     *
-     * @param index the index
-     * @return the coefficient with the given index
-     */
-    public int getCoefficient(int index)
-    {
-        if ((index < 0) || (index > degree))
-        {
-            return 0;
-        }
-        return coefficients[index];
-    }
-
-    /**
-     * Returns encoded polynomial, i.e., this polynomial in byte array form
-     *
-     * @return the encoded polynomial
-     */
-    public byte[] getEncoded()
-    {
-        int d = 8;
-        int count = 1;
-        while (field.getDegree() > d)
-        {
-            count++;
-            d += 8;
-        }
-
-        byte[] res = new byte[coefficients.length * count];
-        count = 0;
-        for (int i = 0; i < coefficients.length; i++)
-        {
-            for (int j = 0; j < d; j += 8)
-            {
-                res[count++] = (byte)(coefficients[i] >>> j);
-            }
-        }
-
-        return res;
-    }
-
-    /**
-     * Evaluate this polynomial <tt>p</tt> at a value <tt>e</tt> (in
-     * <tt>GF(2^m)</tt>) with the Horner scheme.
-     *
-     * @param e the element of the finite field GF(2^m)
-     * @return <tt>this(e)</tt>
-     */
-    public int evaluateAt(int e)
-    {
-        int result = coefficients[degree];
-        for (int i = degree - 1; i >= 0; i--)
-        {
-            result = field.mult(result, e) ^ coefficients[i];
-        }
-        return result;
-    }
-
-    /**
-     * Compute the sum of this polynomial and the given polynomial.
-     *
-     * @param addend the addend
-     * @return <tt>this + a</tt> (newly created)
-     */
-    public PolynomialGF2mSmallM add(PolynomialGF2mSmallM addend)
-    {
-        int[] resultCoeff = add(coefficients, addend.coefficients);
-        return new PolynomialGF2mSmallM(field, resultCoeff);
-    }
-
-    /**
-     * Add the given polynomial to this polynomial (overwrite this).
-     *
-     * @param addend the addend
-     */
-    public void addToThis(PolynomialGF2mSmallM addend)
-    {
-        coefficients = add(coefficients, addend.coefficients);
-        computeDegree();
-    }
-
-    /**
-     * Compute the sum of two polynomials a and b over the finite field
-     * <tt>GF(2^m)</tt>.
-     *
-     * @param a the first polynomial
-     * @param b the second polynomial
-     * @return a + b
-     */
-    private int[] add(int[] a, int[] b)
-    {
-        int[] result, addend;
-        if (a.length < b.length)
-        {
-            result = new int[b.length];
-            System.arraycopy(b, 0, result, 0, b.length);
-            addend = a;
-        }
-        else
-        {
-            result = new int[a.length];
-            System.arraycopy(a, 0, result, 0, a.length);
-            addend = b;
-        }
-
-        for (int i = addend.length - 1; i >= 0; i--)
-        {
-            result[i] = field.add(result[i], addend[i]);
-        }
-
-        return result;
-    }
-
-    /**
-     * Compute the sum of this polynomial and the monomial of the given degree.
-     *
-     * @param degree the degree of the monomial
-     * @return <tt>this + X^k</tt>
-     */
-    public PolynomialGF2mSmallM addMonomial(int degree)
-    {
-        int[] monomial = new int[degree + 1];
-        monomial[degree] = 1;
-        int[] resultCoeff = add(coefficients, monomial);
-        return new PolynomialGF2mSmallM(field, resultCoeff);
-    }
-
-    /**
-     * Compute the product of this polynomial with an element from GF(2^m).
-     *
-     * @param element an element of the finite field GF(2^m)
-     * @return <tt>this * element</tt> (newly created)
-     * @throws ArithmeticException if <tt>element</tt> is not an element of the finite
-     * field this polynomial is defined over.
-     */
-    public PolynomialGF2mSmallM multWithElement(int element)
-    {
-        if (!field.isElementOfThisField(element))
-        {
-            throw new ArithmeticException(
-                "Not an element of the finite field this polynomial is defined over.");
-        }
-        int[] resultCoeff = multWithElement(coefficients, element);
-        return new PolynomialGF2mSmallM(field, resultCoeff);
-    }
-
-    /**
-     * Multiply this polynomial with an element from GF(2^m).
-     *
-     * @param element an element of the finite field GF(2^m)
-     * @throws ArithmeticException if <tt>element</tt> is not an element of the finite
-     * field this polynomial is defined over.
-     */
-    public void multThisWithElement(int element)
-    {
-        if (!field.isElementOfThisField(element))
-        {
-            throw new ArithmeticException(
-                "Not an element of the finite field this polynomial is defined over.");
-        }
-        coefficients = multWithElement(coefficients, element);
-        computeDegree();
-    }
-
-    /**
-     * Compute the product of a polynomial a with an element from the finite
-     * field <tt>GF(2^m)</tt>.
-     *
-     * @param a       the polynomial
-     * @param element an element of the finite field GF(2^m)
-     * @return <tt>a * element</tt>
-     */
-    private int[] multWithElement(int[] a, int element)
-    {
-        int degree = computeDegree(a);
-        if (degree == -1 || element == 0)
-        {
-            return new int[1];
-        }
-
-        if (element == 1)
-        {
-            return IntUtils.clone(a);
-        }
-
-        int[] result = new int[degree + 1];
-        for (int i = degree; i >= 0; i--)
-        {
-            result[i] = field.mult(a[i], element);
-        }
-
-        return result;
-    }
-
-    /**
-     * Compute the product of this polynomial with a monomial X^k.
-     *
-     * @param k the degree of the monomial
-     * @return <tt>this * X^k</tt>
-     */
-    public PolynomialGF2mSmallM multWithMonomial(int k)
-    {
-        int[] resultCoeff = multWithMonomial(coefficients, k);
-        return new PolynomialGF2mSmallM(field, resultCoeff);
-    }
-
-    /**
-     * Compute the product of a polynomial with a monomial X^k.
-     *
-     * @param a the polynomial
-     * @param k the degree of the monomial
-     * @return <tt>a * X^k</tt>
-     */
-    private static int[] multWithMonomial(int[] a, int k)
-    {
-        int d = computeDegree(a);
-        if (d == -1)
-        {
-            return new int[1];
-        }
-        int[] result = new int[d + k + 1];
-        System.arraycopy(a, 0, result, k, d + 1);
-        return result;
-    }
-
-    /**
-     * Divide this polynomial by the given polynomial.
-     *
-     * @param f a polynomial
-     * @return polynomial pair = {q,r} where this = q*f+r and deg(r) &lt;
-     *         deg(f);
-     */
-    public PolynomialGF2mSmallM[] div(PolynomialGF2mSmallM f)
-    {
-        int[][] resultCoeffs = div(coefficients, f.coefficients);
-        return new PolynomialGF2mSmallM[]{
-            new PolynomialGF2mSmallM(field, resultCoeffs[0]),
-            new PolynomialGF2mSmallM(field, resultCoeffs[1])};
-    }
-
-    /**
-     * Compute the result of the division of two polynomials over the field
-     * <tt>GF(2^m)</tt>.
-     *
-     * @param a the first polynomial
-     * @param f the second polynomial
-     * @return int[][] {q,r}, where a = q*f+r and deg(r) &lt; deg(f);
-     */
-    private int[][] div(int[] a, int[] f)
-    {
-        int df = computeDegree(f);
-        int da = computeDegree(a) + 1;
-        if (df == -1)
-        {
-            throw new ArithmeticException("Division by zero.");
-        }
-        int[][] result = new int[2][];
-        result[0] = new int[1];
-        result[1] = new int[da];
-        int hc = headCoefficient(f);
-        hc = field.inverse(hc);
-        result[0][0] = 0;
-        System.arraycopy(a, 0, result[1], 0, result[1].length);
-        while (df <= computeDegree(result[1]))
-        {
-            int[] q;
-            int[] coeff = new int[1];
-            coeff[0] = field.mult(headCoefficient(result[1]), hc);
-            q = multWithElement(f, coeff[0]);
-            int n = computeDegree(result[1]) - df;
-            q = multWithMonomial(q, n);
-            coeff = multWithMonomial(coeff, n);
-            result[0] = add(coeff, result[0]);
-            result[1] = add(q, result[1]);
-        }
-        return result;
-    }
-
-    /**
-     * Return the greatest common divisor of this and a polynomial <i>f</i>
-     *
-     * @param f polynomial
-     * @return GCD(this, f)
-     */
-    public PolynomialGF2mSmallM gcd(PolynomialGF2mSmallM f)
-    {
-        int[] resultCoeff = gcd(coefficients, f.coefficients);
-        return new PolynomialGF2mSmallM(field, resultCoeff);
-    }
-
-    /**
-     * Return the greatest common divisor of two polynomials over the field
-     * <tt>GF(2^m)</tt>.
-     *
-     * @param f the first polynomial
-     * @param g the second polynomial
-     * @return <tt>gcd(f, g)</tt>
-     */
-    private int[] gcd(int[] f, int[] g)
-    {
-        int[] a = f;
-        int[] b = g;
-        if (computeDegree(a) == -1)
-        {
-            return b;
-        }
-        while (computeDegree(b) != -1)
-        {
-            int[] c = mod(a, b);
-            a = new int[b.length];
-            System.arraycopy(b, 0, a, 0, a.length);
-            b = new int[c.length];
-            System.arraycopy(c, 0, b, 0, b.length);
-        }
-        int coeff = field.inverse(headCoefficient(a));
-        return multWithElement(a, coeff);
-    }
-
-    /**
-     * Compute the product of this polynomial and the given factor using a
-     * Karatzuba like scheme.
-     *
-     * @param factor the polynomial
-     * @return <tt>this * factor</tt>
-     */
-    public PolynomialGF2mSmallM multiply(PolynomialGF2mSmallM factor)
-    {
-        int[] resultCoeff = multiply(coefficients, factor.coefficients);
-        return new PolynomialGF2mSmallM(field, resultCoeff);
-    }
-
-    /**
-     * Compute the product of two polynomials over the field <tt>GF(2^m)</tt>
-     * using a Karatzuba like multiplication.
-     *
-     * @param a the first polynomial
-     * @param b the second polynomial
-     * @return a * b
-     */
-    private int[] multiply(int[] a, int[] b)
-    {
-        int[] mult1, mult2;
-        if (computeDegree(a) < computeDegree(b))
-        {
-            mult1 = b;
-            mult2 = a;
-        }
-        else
-        {
-            mult1 = a;
-            mult2 = b;
-        }
-
-        mult1 = normalForm(mult1);
-        mult2 = normalForm(mult2);
-
-        if (mult2.length == 1)
-        {
-            return multWithElement(mult1, mult2[0]);
-        }
-
-        int d1 = mult1.length;
-        int d2 = mult2.length;
-        int[] result = new int[d1 + d2 - 1];
-
-        if (d2 != d1)
-        {
-            int[] res1 = new int[d2];
-            int[] res2 = new int[d1 - d2];
-            System.arraycopy(mult1, 0, res1, 0, res1.length);
-            System.arraycopy(mult1, d2, res2, 0, res2.length);
-            res1 = multiply(res1, mult2);
-            res2 = multiply(res2, mult2);
-            res2 = multWithMonomial(res2, d2);
-            result = add(res1, res2);
-        }
-        else
-        {
-            d2 = (d1 + 1) >>> 1;
-            int d = d1 - d2;
-            int[] firstPartMult1 = new int[d2];
-            int[] firstPartMult2 = new int[d2];
-            int[] secondPartMult1 = new int[d];
-            int[] secondPartMult2 = new int[d];
-            System
-                .arraycopy(mult1, 0, firstPartMult1, 0,
-                    firstPartMult1.length);
-            System.arraycopy(mult1, d2, secondPartMult1, 0,
-                secondPartMult1.length);
-            System
-                .arraycopy(mult2, 0, firstPartMult2, 0,
-                    firstPartMult2.length);
-            System.arraycopy(mult2, d2, secondPartMult2, 0,
-                secondPartMult2.length);
-            int[] helpPoly1 = add(firstPartMult1, secondPartMult1);
-            int[] helpPoly2 = add(firstPartMult2, secondPartMult2);
-            int[] res1 = multiply(firstPartMult1, firstPartMult2);
-            int[] res2 = multiply(helpPoly1, helpPoly2);
-            int[] res3 = multiply(secondPartMult1, secondPartMult2);
-            res2 = add(res2, res1);
-            res2 = add(res2, res3);
-            res3 = multWithMonomial(res3, d2);
-            result = add(res2, res3);
-            result = multWithMonomial(result, d2);
-            result = add(result, res1);
-        }
-
-        return result;
-    }
-
-    /*
-      * ---------------- PART II ----------------
-      *
-      */
-
-    /**
-     * Check a polynomial for irreducibility over the field <tt>GF(2^m)</tt>.
-     *
-     * @param a the polynomial to check
-     * @return true if a is irreducible, false otherwise
-     */
-    private boolean isIrreducible(int[] a)
-    {
-        if (a[0] == 0)
-        {
-            return false;
-        }
-        int d = computeDegree(a) >> 1;
-        int[] u = {0, 1};
-        final int[] Y = {0, 1};
-        int fieldDegree = field.getDegree();
-        for (int i = 0; i < d; i++)
-        {
-            for (int j = fieldDegree - 1; j >= 0; j--)
-            {
-                u = modMultiply(u, u, a);
-            }
-            u = normalForm(u);
-            int[] g = gcd(add(u, Y), a);
-            if (computeDegree(g) != 0)
-            {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    /**
-     * Reduce this polynomial modulo another polynomial.
-     *
-     * @param f the reduction polynomial
-     * @return <tt>this mod f</tt>
-     */
-    public PolynomialGF2mSmallM mod(PolynomialGF2mSmallM f)
-    {
-        int[] resultCoeff = mod(coefficients, f.coefficients);
-        return new PolynomialGF2mSmallM(field, resultCoeff);
-    }
-
-    /**
-     * Reduce a polynomial modulo another polynomial.
-     *
-     * @param a the polynomial
-     * @param f the reduction polynomial
-     * @return <tt>a mod f</tt>
-     */
-    private int[] mod(int[] a, int[] f)
-    {
-        int df = computeDegree(f);
-        if (df == -1)
-        {
-            throw new ArithmeticException("Division by zero");
-        }
-        int[] result = new int[a.length];
-        int hc = headCoefficient(f);
-        hc = field.inverse(hc);
-        System.arraycopy(a, 0, result, 0, result.length);
-        while (df <= computeDegree(result))
-        {
-            int[] q;
-            int coeff = field.mult(headCoefficient(result), hc);
-            q = multWithMonomial(f, computeDegree(result) - df);
-            q = multWithElement(q, coeff);
-            result = add(q, result);
-        }
-        return result;
-    }
-
-    /**
-     * Compute the product of this polynomial and another polynomial modulo a
-     * third polynomial.
-     *
-     * @param a another polynomial
-     * @param b the reduction polynomial
-     * @return <tt>this * a mod b</tt>
-     */
-    public PolynomialGF2mSmallM modMultiply(PolynomialGF2mSmallM a,
-                                            PolynomialGF2mSmallM b)
-    {
-        int[] resultCoeff = modMultiply(coefficients, a.coefficients,
-            b.coefficients);
-        return new PolynomialGF2mSmallM(field, resultCoeff);
-    }
-
-    /**
-     * Square this polynomial using a squaring matrix.
-     *
-     * @param matrix the squaring matrix
-     * @return <tt>this^2</tt> modulo the reduction polynomial implicitly
-     *         given via the squaring matrix
-     */
-    public PolynomialGF2mSmallM modSquareMatrix(PolynomialGF2mSmallM[] matrix)
-    {
-
-        int length = matrix.length;
-
-        int[] resultCoeff = new int[length];
-        int[] thisSquare = new int[length];
-
-        // square each entry of this polynomial
-        for (int i = 0; i < coefficients.length; i++)
-        {
-            thisSquare[i] = field.mult(coefficients[i], coefficients[i]);
-        }
-
-        // do matrix-vector multiplication
-        for (int i = 0; i < length; i++)
-        {
-            // compute scalar product of i-th row and coefficient vector
-            for (int j = 0; j < length; j++)
-            {
-                if (i >= matrix[j].coefficients.length)
-                {
-                    continue;
-                }
-                int scalarTerm = field.mult(matrix[j].coefficients[i],
-                    thisSquare[j]);
-                resultCoeff[i] = field.add(resultCoeff[i], scalarTerm);
-            }
-        }
-
-        return new PolynomialGF2mSmallM(field, resultCoeff);
-    }
-
-    /**
-     * Compute the product of two polynomials modulo a third polynomial over the
-     * finite field <tt>GF(2^m)</tt>.
-     *
-     * @param a the first polynomial
-     * @param b the second polynomial
-     * @param g the reduction polynomial
-     * @return <tt>a * b mod g</tt>
-     */
-    private int[] modMultiply(int[] a, int[] b, int[] g)
-    {
-        return mod(multiply(a, b), g);
-    }
-
-    /**
-     * Compute the square root of this polynomial modulo the given polynomial.
-     *
-     * @param a the reduction polynomial
-     * @return <tt>this^(1/2) mod a</tt>
-     */
-    public PolynomialGF2mSmallM modSquareRoot(PolynomialGF2mSmallM a)
-    {
-        int[] resultCoeff = IntUtils.clone(coefficients);
-        int[] help = modMultiply(resultCoeff, resultCoeff, a.coefficients);
-        while (!isEqual(help, coefficients))
-        {
-            resultCoeff = normalForm(help);
-            help = modMultiply(resultCoeff, resultCoeff, a.coefficients);
-        }
-
-        return new PolynomialGF2mSmallM(field, resultCoeff);
-    }
-
-    /**
-     * Compute the square root of this polynomial using a square root matrix.
-     *
-     * @param matrix the matrix for computing square roots in
-     *               <tt>(GF(2^m))^t</tt> the polynomial ring defining the
-     *               square root matrix
-     * @return <tt>this^(1/2)</tt> modulo the reduction polynomial implicitly
-     *         given via the square root matrix
-     */
-    public PolynomialGF2mSmallM modSquareRootMatrix(
-        PolynomialGF2mSmallM[] matrix)
-    {
-
-        int length = matrix.length;
-
-        int[] resultCoeff = new int[length];
-
-        // do matrix multiplication
-        for (int i = 0; i < length; i++)
-        {
-            // compute scalar product of i-th row and j-th column
-            for (int j = 0; j < length; j++)
-            {
-                if (i >= matrix[j].coefficients.length)
-                {
-                    continue;
-                }
-                if (j < coefficients.length)
-                {
-                    int scalarTerm = field.mult(matrix[j].coefficients[i],
-                        coefficients[j]);
-                    resultCoeff[i] = field.add(resultCoeff[i], scalarTerm);
-                }
-            }
-        }
-
-        // compute the square root of each entry of the result coefficients
-        for (int i = 0; i < length; i++)
-        {
-            resultCoeff[i] = field.sqRoot(resultCoeff[i]);
-        }
-
-        return new PolynomialGF2mSmallM(field, resultCoeff);
-    }
-
-    /**
-     * Compute the result of the division of this polynomial by another
-     * polynomial modulo a third polynomial.
-     *
-     * @param divisor the divisor
-     * @param modulus the reduction polynomial
-     * @return <tt>this * divisor^(-1) mod modulus</tt>
-     */
-    public PolynomialGF2mSmallM modDiv(PolynomialGF2mSmallM divisor,
-                                       PolynomialGF2mSmallM modulus)
-    {
-        int[] resultCoeff = modDiv(coefficients, divisor.coefficients,
-            modulus.coefficients);
-        return new PolynomialGF2mSmallM(field, resultCoeff);
-    }
-
-    /**
-     * Compute the result of the division of two polynomials modulo a third
-     * polynomial over the field <tt>GF(2^m)</tt>.
-     *
-     * @param a the first polynomial
-     * @param b the second polynomial
-     * @param g the reduction polynomial
-     * @return <tt>a * b^(-1) mod g</tt>
-     */
-    private int[] modDiv(int[] a, int[] b, int[] g)
-    {
-        int[] r0 = normalForm(g);
-        int[] r1 = mod(b, g);
-        int[] s0 = {0};
-        int[] s1 = mod(a, g);
-        int[] s2;
-        int[][] q;
-        while (computeDegree(r1) != -1)
-        {
-            q = div(r0, r1);
-            r0 = normalForm(r1);
-            r1 = normalForm(q[1]);
-            s2 = add(s0, modMultiply(q[0], s1, g));
-            s0 = normalForm(s1);
-            s1 = normalForm(s2);
-
-        }
-        int hc = headCoefficient(r0);
-        s0 = multWithElement(s0, field.inverse(hc));
-        return s0;
-    }
-
-    /**
-     * Compute the inverse of this polynomial modulo the given polynomial.
-     *
-     * @param a the reduction polynomial
-     * @return <tt>this^(-1) mod a</tt>
-     */
-    public PolynomialGF2mSmallM modInverse(PolynomialGF2mSmallM a)
-    {
-        int[] unit = {1};
-        int[] resultCoeff = modDiv(unit, coefficients, a.coefficients);
-        return new PolynomialGF2mSmallM(field, resultCoeff);
-    }
-
-    /**
-     * Compute a polynomial pair (a,b) from this polynomial and the given
-     * polynomial g with the property b*this = a mod g and deg(a)&lt;=deg(g)/2.
-     *
-     * @param g the reduction polynomial
-     * @return PolynomialGF2mSmallM[] {a,b} with b*this = a mod g and deg(a)&lt;=
-     *         deg(g)/2
-     */
-    public PolynomialGF2mSmallM[] modPolynomialToFracton(PolynomialGF2mSmallM g)
-    {
-        int dg = g.degree >> 1;
-        int[] a0 = normalForm(g.coefficients);
-        int[] a1 = mod(coefficients, g.coefficients);
-        int[] b0 = {0};
-        int[] b1 = {1};
-        while (computeDegree(a1) > dg)
-        {
-            int[][] q = div(a0, a1);
-            a0 = a1;
-            a1 = q[1];
-            int[] b2 = add(b0, modMultiply(q[0], b1, g.coefficients));
-            b0 = b1;
-            b1 = b2;
-        }
-
-        return new PolynomialGF2mSmallM[]{
-            new PolynomialGF2mSmallM(field, a1),
-            new PolynomialGF2mSmallM(field, b1)};
-    }
-
-    /**
-     * checks if given object is equal to this polynomial.
-     * <p>
-     * The method returns false whenever the given object is not polynomial over
-     * GF(2^m).
-     *
-     * @param other object
-     * @return true or false
-     */
-    public boolean equals(Object other)
-    {
-
-        if (other == null || !(other instanceof PolynomialGF2mSmallM))
-        {
-            return false;
-        }
-
-        PolynomialGF2mSmallM p = (PolynomialGF2mSmallM)other;
-
-        if ((field.equals(p.field)) && (degree == p.degree)
-            && (isEqual(coefficients, p.coefficients)))
-        {
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Compare two polynomials given as int arrays.
-     *
-     * @param a the first polynomial
-     * @param b the second polynomial
-     * @return <tt>true</tt> if <tt>a</tt> and <tt>b</tt> represent the
-     *         same polynomials, <tt>false</tt> otherwise
-     */
-    private static boolean isEqual(int[] a, int[] b)
-    {
-        int da = computeDegree(a);
-        int db = computeDegree(b);
-        if (da != db)
-        {
-            return false;
-        }
-        for (int i = 0; i <= da; i++)
-        {
-            if (a[i] != b[i])
-            {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    /**
-     * @return the hash code of this polynomial
-     */
-    public int hashCode()
-    {
-        int hash = field.hashCode();
-        for (int j = 0; j < coefficients.length; j++)
-        {
-            hash = hash * 31 + coefficients[j];
-        }
-        return hash;
-    }
-
-    /**
-     * Returns a human readable form of the polynomial.
-     *
-     * @return a human readable form of the polynomial.
-     */
-    public String toString()
-    {
-        String str = " Polynomial over " + field.toString() + ": \n";
-
-        for (int i = 0; i < coefficients.length; i++)
-        {
-            str = str + field.elementToStr(coefficients[i]) + "Y^" + i + "+";
-        }
-        str = str + ";";
-
-        return str;
-    }
-
-    /**
-     * Compute the degree of this polynomial. If this is the zero polynomial,
-     * the degree is -1.
-     */
-    private void computeDegree()
-    {
-        for (degree = coefficients.length - 1; degree >= 0
-            && coefficients[degree] == 0; degree--)
-        {
-            ;
-        }
-    }
-
-    /**
-     * Compute the degree of a polynomial.
-     *
-     * @param a the polynomial
-     * @return the degree of the polynomial <tt>a</tt>. If <tt>a</tt> is
-     *         the zero polynomial, return -1.
-     */
-    private static int computeDegree(int[] a)
-    {
-        int degree;
-        for (degree = a.length - 1; degree >= 0 && a[degree] == 0; degree--)
-        {
-            ;
-        }
-        return degree;
-    }
-
-    /**
-     * Strip leading zero coefficients from the given polynomial.
-     *
-     * @param a the polynomial
-     * @return the reduced polynomial
-     */
-    private static int[] normalForm(int[] a)
-    {
-        int d = computeDegree(a);
-
-        // if a is the zero polynomial
-        if (d == -1)
-        {
-            // return new zero polynomial
-            return new int[1];
-        }
-
-        // if a already is in normal form
-        if (a.length == d + 1)
-        {
-            // return a clone of a
-            return IntUtils.clone(a);
-        }
-
-        // else, reduce a
-        int[] result = new int[d + 1];
-        System.arraycopy(a, 0, result, 0, d + 1);
-        return result;
-    }
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/math/linearalgebra/PolynomialRingGF2.java b/bcprov/src/main/java/org/bouncycastle/pqc/math/linearalgebra/PolynomialRingGF2.java
deleted file mode 100644
index a0e2bac..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/math/linearalgebra/PolynomialRingGF2.java
+++ /dev/null
@@ -1,278 +0,0 @@
-package org.bouncycastle.pqc.math.linearalgebra;
-
-/**
- * This class describes operations with polynomials over finite field GF(2), i e
- * polynomial ring R = GF(2)[X]. All operations are defined only for polynomials
- * with degree &lt;=32. For the polynomial representation the map f: R-&gt;Z,
- * poly(X)-&gt;poly(2) is used, where integers have the binary representation. For
- * example: X^7+X^3+X+1 -&gt; (00...0010001011)=139 Also for polynomials type
- * Integer is used.
- *
- * @see GF2mField
- */
-public final class PolynomialRingGF2
-{
-
-    /**
-     * Default constructor (private).
-     */
-    private PolynomialRingGF2()
-    {
-        // empty
-    }
-
-    /**
-     * Return sum of two polyomials
-     *
-     * @param p polynomial
-     * @param q polynomial
-     * @return p+q
-     */
-
-    public static int add(int p, int q)
-    {
-        return p ^ q;
-    }
-
-    /**
-     * Return product of two polynomials
-     *
-     * @param p polynomial
-     * @param q polynomial
-     * @return p*q
-     */
-
-    public static long multiply(int p, int q)
-    {
-        long result = 0;
-        if (q != 0)
-        {
-            long q1 = q & 0x00000000ffffffffL;
-
-            while (p != 0)
-            {
-                byte b = (byte)(p & 0x01);
-                if (b == 1)
-                {
-                    result ^= q1;
-                }
-                p >>>= 1;
-                q1 <<= 1;
-
-            }
-        }
-        return result;
-    }
-
-    /**
-     * Compute the product of two polynomials modulo a third polynomial.
-     *
-     * @param a the first polynomial
-     * @param b the second polynomial
-     * @param r the reduction polynomial
-     * @return <tt>a * b mod r</tt>
-     */
-    public static int modMultiply(int a, int b, int r)
-    {
-        int result = 0;
-        int p = remainder(a, r);
-        int q = remainder(b, r);
-        if (q != 0)
-        {
-            int d = 1 << degree(r);
-
-            while (p != 0)
-            {
-                byte pMod2 = (byte)(p & 0x01);
-                if (pMod2 == 1)
-                {
-                    result ^= q;
-                }
-                p >>>= 1;
-                q <<= 1;
-                if (q >= d)
-                {
-                    q ^= r;
-                }
-            }
-        }
-        return result;
-    }
-
-    /**
-     * Return the degree of a polynomial
-     *
-     * @param p polynomial p
-     * @return degree(p)
-     */
-
-    public static int degree(int p)
-    {
-        int result = -1;
-        while (p != 0)
-        {
-            result++;
-            p >>>= 1;
-        }
-        return result;
-    }
-
-    /**
-     * Return the degree of a polynomial
-     *
-     * @param p polynomial p
-     * @return degree(p)
-     */
-
-    public static int degree(long p)
-    {
-        int result = 0;
-        while (p != 0)
-        {
-            result++;
-            p >>>= 1;
-        }
-        return result - 1;
-    }
-
-    /**
-     * Return the remainder of a polynomial division of two polynomials.
-     *
-     * @param p dividend
-     * @param q divisor
-     * @return <tt>p mod q</tt>
-     */
-    public static int remainder(int p, int q)
-    {
-        int result = p;
-
-        if (q == 0)
-        {
-            System.err.println("Error: to be divided by 0");
-            return 0;
-        }
-
-        while (degree(result) >= degree(q))
-        {
-            result ^= q << (degree(result) - degree(q));
-        }
-
-        return result;
-    }
-
-    /**
-     * Return the rest of devision two polynomials
-     *
-     * @param p polinomial
-     * @param q polinomial
-     * @return p mod q
-     */
-
-    public static int rest(long p, int q)
-    {
-        long p1 = p;
-        if (q == 0)
-        {
-            System.err.println("Error: to be divided by 0");
-            return 0;
-        }
-        long q1 = q & 0x00000000ffffffffL;
-        while ((p1 >>> 32) != 0)
-        {
-            p1 ^= q1 << (degree(p1) - degree(q1));
-        }
-
-        int result = (int)(p1 & 0xffffffff);
-        while (degree(result) >= degree(q))
-        {
-            result ^= q << (degree(result) - degree(q));
-        }
-
-        return result;
-    }
-
-    /**
-     * Return the greatest common divisor of two polynomials
-     *
-     * @param p polinomial
-     * @param q polinomial
-     * @return GCD(p, q)
-     */
-
-    public static int gcd(int p, int q)
-    {
-        int a, b, c;
-        a = p;
-        b = q;
-        while (b != 0)
-        {
-            c = remainder(a, b);
-            a = b;
-            b = c;
-
-        }
-        return a;
-    }
-
-    /**
-     * Checking polynomial for irreducibility
-     *
-     * @param p polinomial
-     * @return true if p is irreducible and false otherwise
-     */
-
-    public static boolean isIrreducible(int p)
-    {
-        if (p == 0)
-        {
-            return false;
-        }
-        int d = degree(p) >>> 1;
-        int u = 2;
-        for (int i = 0; i < d; i++)
-        {
-            u = modMultiply(u, u, p);
-            if (gcd(u ^ 2, p) != 1)
-            {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    /**
-     * Creates irreducible polynomial with degree d
-     *
-     * @param deg polynomial degree
-     * @return irreducible polynomial p
-     */
-    public static int getIrreduciblePolynomial(int deg)
-    {
-        if (deg < 0)
-        {
-            System.err.println("The Degree is negative");
-            return 0;
-        }
-        if (deg > 31)
-        {
-            System.err.println("The Degree is more then 31");
-            return 0;
-        }
-        if (deg == 0)
-        {
-            return 1;
-        }
-        int a = 1 << deg;
-        a++;
-        int b = 1 << (deg + 1);
-        for (int i = a; i < b; i += 2)
-        {
-            if (isIrreducible(i))
-            {
-                return i;
-            }
-        }
-        return 0;
-    }
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/math/linearalgebra/PolynomialRingGF2m.java b/bcprov/src/main/java/org/bouncycastle/pqc/math/linearalgebra/PolynomialRingGF2m.java
deleted file mode 100644
index 9e5d413..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/math/linearalgebra/PolynomialRingGF2m.java
+++ /dev/null
@@ -1,175 +0,0 @@
-package org.bouncycastle.pqc.math.linearalgebra;
-
-/**
- * This class represents polynomial rings <tt>GF(2^m)[X]/p(X)</tt> for
- * <tt>m&lt;32</tt>. If <tt>p(X)</tt> is irreducible, the polynomial ring
- * is in fact an extension field of <tt>GF(2^m)</tt>.
- */
-public class PolynomialRingGF2m
-{
-
-    /**
-     * the finite field this polynomial ring is defined over
-     */
-    private GF2mField field;
-
-    /**
-     * the reduction polynomial
-     */
-    private PolynomialGF2mSmallM p;
-
-    /**
-     * the squaring matrix for this polynomial ring (given as the array of its
-     * row vectors)
-     */
-    protected PolynomialGF2mSmallM[] sqMatrix;
-
-    /**
-     * the matrix for computing square roots in this polynomial ring (given as
-     * the array of its row vectors). This matrix is computed as the inverse of
-     * the squaring matrix.
-     */
-    protected PolynomialGF2mSmallM[] sqRootMatrix;
-
-    /**
-     * Constructor.
-     *
-     * @param field the finite field
-     * @param p     the reduction polynomial
-     */
-    public PolynomialRingGF2m(GF2mField field, PolynomialGF2mSmallM p)
-    {
-        this.field = field;
-        this.p = p;
-        computeSquaringMatrix();
-        computeSquareRootMatrix();
-    }
-
-    /**
-     * @return the squaring matrix for this polynomial ring
-     */
-    public PolynomialGF2mSmallM[] getSquaringMatrix()
-    {
-        return sqMatrix;
-    }
-
-    /**
-     * @return the matrix for computing square roots for this polynomial ring
-     */
-    public PolynomialGF2mSmallM[] getSquareRootMatrix()
-    {
-        return sqRootMatrix;
-    }
-
-    /**
-     * Compute the squaring matrix for this polynomial ring, using the base
-     * field and the reduction polynomial.
-     */
-    private void computeSquaringMatrix()
-    {
-        int numColumns = p.getDegree();
-        sqMatrix = new PolynomialGF2mSmallM[numColumns];
-        for (int i = 0; i < numColumns >> 1; i++)
-        {
-            int[] monomCoeffs = new int[(i << 1) + 1];
-            monomCoeffs[i << 1] = 1;
-            sqMatrix[i] = new PolynomialGF2mSmallM(field, monomCoeffs);
-        }
-        for (int i = numColumns >> 1; i < numColumns; i++)
-        {
-            int[] monomCoeffs = new int[(i << 1) + 1];
-            monomCoeffs[i << 1] = 1;
-            PolynomialGF2mSmallM monomial = new PolynomialGF2mSmallM(field,
-                monomCoeffs);
-            sqMatrix[i] = monomial.mod(p);
-        }
-    }
-
-    /**
-     * Compute the matrix for computing square roots in this polynomial ring by
-     * inverting the squaring matrix.
-     */
-    private void computeSquareRootMatrix()
-    {
-        int numColumns = p.getDegree();
-
-        // clone squaring matrix
-        PolynomialGF2mSmallM[] tmpMatrix = new PolynomialGF2mSmallM[numColumns];
-        for (int i = numColumns - 1; i >= 0; i--)
-        {
-            tmpMatrix[i] = new PolynomialGF2mSmallM(sqMatrix[i]);
-        }
-
-        // initialize square root matrix as unit matrix
-        sqRootMatrix = new PolynomialGF2mSmallM[numColumns];
-        for (int i = numColumns - 1; i >= 0; i--)
-        {
-            sqRootMatrix[i] = new PolynomialGF2mSmallM(field, i);
-        }
-
-        // simultaneously compute Gaussian reduction of squaring matrix and unit
-        // matrix
-        for (int i = 0; i < numColumns; i++)
-        {
-            // if diagonal element is zero
-            if (tmpMatrix[i].getCoefficient(i) == 0)
-            {
-                boolean foundNonZero = false;
-                // find a non-zero element in the same row
-                for (int j = i + 1; j < numColumns; j++)
-                {
-                    if (tmpMatrix[j].getCoefficient(i) != 0)
-                    {
-                        // found it, swap columns ...
-                        foundNonZero = true;
-                        swapColumns(tmpMatrix, i, j);
-                        swapColumns(sqRootMatrix, i, j);
-                        // ... and quit searching
-                        j = numColumns;
-                        continue;
-                    }
-                }
-                // if no non-zero element was found
-                if (!foundNonZero)
-                {
-                    // the matrix is not invertible
-                    throw new ArithmeticException(
-                        "Squaring matrix is not invertible.");
-                }
-            }
-
-            // normalize i-th column
-            int coef = tmpMatrix[i].getCoefficient(i);
-            int invCoef = field.inverse(coef);
-            tmpMatrix[i].multThisWithElement(invCoef);
-            sqRootMatrix[i].multThisWithElement(invCoef);
-
-            // normalize all other columns
-            for (int j = 0; j < numColumns; j++)
-            {
-                if (j != i)
-                {
-                    coef = tmpMatrix[j].getCoefficient(i);
-                    if (coef != 0)
-                    {
-                        PolynomialGF2mSmallM tmpSqColumn = tmpMatrix[i]
-                            .multWithElement(coef);
-                        PolynomialGF2mSmallM tmpInvColumn = sqRootMatrix[i]
-                            .multWithElement(coef);
-                        tmpMatrix[j].addToThis(tmpSqColumn);
-                        sqRootMatrix[j].addToThis(tmpInvColumn);
-                    }
-                }
-            }
-        }
-    }
-
-    private static void swapColumns(PolynomialGF2mSmallM[] matrix, int first,
-                                    int second)
-    {
-        PolynomialGF2mSmallM tmp = matrix[first];
-        matrix[first] = matrix[second];
-        matrix[second] = tmp;
-    }
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/math/linearalgebra/RandUtils.java b/bcprov/src/main/java/org/bouncycastle/pqc/math/linearalgebra/RandUtils.java
deleted file mode 100644
index dbb1d4a..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/math/linearalgebra/RandUtils.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package org.bouncycastle.pqc.math.linearalgebra;
-
-import java.security.SecureRandom;
-
-public class RandUtils
-{
-    static int nextInt(SecureRandom rand, int n)
-    {
-
-        if ((n & -n) == n)  // i.e., n is a power of 2
-        {
-            return (int)((n * (long)(rand.nextInt() >>> 1)) >> 31);
-        }
-
-        int bits, value;
-        do
-        {
-            bits = rand.nextInt() >>> 1;
-            value = bits % n;
-        }
-        while (bits - value + (n - 1) < 0);
-
-        return value;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/math/linearalgebra/Vector.java b/bcprov/src/main/java/org/bouncycastle/pqc/math/linearalgebra/Vector.java
deleted file mode 100644
index 7e17164..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/math/linearalgebra/Vector.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package org.bouncycastle.pqc.math.linearalgebra;
-
-/**
- * This abstract class defines vectors. It holds the length of vector.
- */
-public abstract class Vector
-{
-
-    /**
-     * the length of this vector
-     */
-    protected int length;
-
-    /**
-     * @return the length of this vector
-     */
-    public final int getLength()
-    {
-        return length;
-    }
-
-    /**
-     * @return this vector as byte array
-     */
-    public abstract byte[] getEncoded();
-
-    /**
-     * Return whether this is the zero vector (i.e., all elements are zero).
-     *
-     * @return <tt>true</tt> if this is the zero vector, <tt>false</tt>
-     *         otherwise
-     */
-    public abstract boolean isZero();
-
-    /**
-     * Add another vector to this vector.
-     *
-     * @param addend the other vector
-     * @return <tt>this + addend</tt>
-     */
-    public abstract Vector add(Vector addend);
-
-    /**
-     * Multiply this vector with a permutation.
-     *
-     * @param p the permutation
-     * @return <tt>this*p = p*this</tt>
-     */
-    public abstract Vector multiply(Permutation p);
-
-    /**
-     * Check if the given object is equal to this vector.
-     *
-     * @param other vector
-     * @return the result of the comparison
-     */
-    public abstract boolean equals(Object other);
-
-    /**
-     * @return the hash code of this vector
-     */
-    public abstract int hashCode();
-
-    /**
-     * @return a human readable form of this vector
-     */
-    public abstract String toString();
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/math/ntru/euclid/BigIntEuclidean.java b/bcprov/src/main/java/org/bouncycastle/pqc/math/ntru/euclid/BigIntEuclidean.java
deleted file mode 100644
index 5fb3058..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/math/ntru/euclid/BigIntEuclidean.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package org.bouncycastle.pqc.math.ntru.euclid;
-
-import java.math.BigInteger;
-
-/**
- * Extended Euclidean Algorithm in <code>BigInteger</code>s
- */
-public class BigIntEuclidean
-{
-    public BigInteger x, y, gcd;
-
-    private BigIntEuclidean()
-    {
-    }
-
-    /**
-     * Runs the EEA on two <code>BigInteger</code>s<br>
-     * Implemented from pseudocode on <a href="http://en.wikipedia.org/wiki/Extended_Euclidean_algorithm">Wikipedia</a>.
-     *
-     * @param a
-     * @param b
-     * @return a <code>BigIntEuclidean</code> object that contains the result in the variables <code>x</code>, <code>y</code>, and <code>gcd</code>
-     */
-    public static BigIntEuclidean calculate(BigInteger a, BigInteger b)
-    {
-        BigInteger x = BigInteger.ZERO;
-        BigInteger lastx = BigInteger.ONE;
-        BigInteger y = BigInteger.ONE;
-        BigInteger lasty = BigInteger.ZERO;
-        while (!b.equals(BigInteger.ZERO))
-        {
-            BigInteger[] quotientAndRemainder = a.divideAndRemainder(b);
-            BigInteger quotient = quotientAndRemainder[0];
-
-            BigInteger temp = a;
-            a = b;
-            b = quotientAndRemainder[1];
-
-            temp = x;
-            x = lastx.subtract(quotient.multiply(x));
-            lastx = temp;
-
-            temp = y;
-            y = lasty.subtract(quotient.multiply(y));
-            lasty = temp;
-        }
-
-        BigIntEuclidean result = new BigIntEuclidean();
-        result.x = lastx;
-        result.y = lasty;
-        result.gcd = a;
-        return result;
-    }
-}
\ No newline at end of file
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/math/ntru/euclid/IntEuclidean.java b/bcprov/src/main/java/org/bouncycastle/pqc/math/ntru/euclid/IntEuclidean.java
deleted file mode 100644
index c959a26..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/math/ntru/euclid/IntEuclidean.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package org.bouncycastle.pqc.math.ntru.euclid;
-
-/**
- * Extended Euclidean Algorithm in <code>int</code>s
- */
-public class IntEuclidean
-{
-    public int x, y, gcd;
-
-    private IntEuclidean()
-    {
-    }
-
-    /**
-     * Runs the EEA on two <code>int</code>s<br>
-     * Implemented from pseudocode on <a href="http://en.wikipedia.org/wiki/Extended_Euclidean_algorithm">Wikipedia</a>.
-     *
-     * @param a
-     * @param b
-     * @return a <code>IntEuclidean</code> object that contains the result in the variables <code>x</code>, <code>y</code>, and <code>gcd</code>
-     */
-    public static IntEuclidean calculate(int a, int b)
-    {
-        int x = 0;
-        int lastx = 1;
-        int y = 1;
-        int lasty = 0;
-        while (b != 0)
-        {
-            int quotient = a / b;
-
-            int temp = a;
-            a = b;
-            b = temp % b;
-
-            temp = x;
-            x = lastx - quotient * x;
-            lastx = temp;
-
-            temp = y;
-            y = lasty - quotient * y;
-            lasty = temp;
-        }
-
-        IntEuclidean result = new IntEuclidean();
-        result.x = lastx;
-        result.y = lasty;
-        result.gcd = a;
-        return result;
-    }
-}
\ No newline at end of file
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/math/ntru/euclid/test/AllTests.java b/bcprov/src/main/java/org/bouncycastle/pqc/math/ntru/euclid/test/AllTests.java
deleted file mode 100644
index 6302e05..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/math/ntru/euclid/test/AllTests.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.bouncycastle.pqc.math.ntru.euclid.test;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-public class AllTests
-    extends TestCase
-{
-    public static void main (String[] args)
-    {
-        junit.textui.TestRunner.run(suite());
-    }
-    
-    public static Test suite()
-    {
-        TestSuite suite = new TestSuite("NTRU Euclid Tests");
-        
-        suite.addTestSuite(BigIntEuclideanTest.class);
-        suite.addTestSuite(IntEuclideanTest.class);
-
-        return suite;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/math/ntru/euclid/test/BigIntEuclideanTest.java b/bcprov/src/main/java/org/bouncycastle/pqc/math/ntru/euclid/test/BigIntEuclideanTest.java
deleted file mode 100644
index 2cb9467..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/math/ntru/euclid/test/BigIntEuclideanTest.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package org.bouncycastle.pqc.math.ntru.euclid.test;
-
-import java.math.BigInteger;
-
-import junit.framework.TestCase;
-import org.bouncycastle.pqc.math.ntru.euclid.BigIntEuclidean;
-
-public class BigIntEuclideanTest
-    extends TestCase
-{
-    public void testCalculate()
-    {
-        BigIntEuclidean r = BigIntEuclidean.calculate(BigInteger.valueOf(120), BigInteger.valueOf(23));
-        assertEquals(BigInteger.valueOf(-9), r.x);
-        assertEquals(BigInteger.valueOf(47), r.y);
-        assertEquals(BigInteger.valueOf(1), r.gcd);
-
-        r = BigIntEuclidean.calculate(BigInteger.valueOf(126), BigInteger.valueOf(231));
-        assertEquals(BigInteger.valueOf(2), r.x);
-        assertEquals(BigInteger.valueOf(-1), r.y);
-        assertEquals(BigInteger.valueOf(21), r.gcd);
-    }
-}
\ No newline at end of file
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/math/ntru/euclid/test/IntEuclideanTest.java b/bcprov/src/main/java/org/bouncycastle/pqc/math/ntru/euclid/test/IntEuclideanTest.java
deleted file mode 100644
index ab2ba25..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/math/ntru/euclid/test/IntEuclideanTest.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/**
- * Copyright (c) 2011 Tim Buktu (tbuktu@hotmail.com)
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- */
-
-package org.bouncycastle.pqc.math.ntru.euclid.test;
-
-import junit.framework.TestCase;
-import org.bouncycastle.pqc.math.ntru.euclid.IntEuclidean;
-
-public class IntEuclideanTest
-    extends TestCase
-{
-    public void testCalculate()
-    {
-        IntEuclidean r = IntEuclidean.calculate(120, 23);
-        assertEquals(-9, r.x);
-        assertEquals(47, r.y);
-        assertEquals(1, r.gcd);
-
-        r = IntEuclidean.calculate(126, 231);
-        assertEquals(2, r.x);
-        assertEquals(-1, r.y);
-        assertEquals(21, r.gcd);
-    }
-}
\ No newline at end of file
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/math/ntru/polynomial/BigDecimalPolynomial.java b/bcprov/src/main/java/org/bouncycastle/pqc/math/ntru/polynomial/BigDecimalPolynomial.java
deleted file mode 100644
index 697f51a..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/math/ntru/polynomial/BigDecimalPolynomial.java
+++ /dev/null
@@ -1,258 +0,0 @@
-package org.bouncycastle.pqc.math.ntru.polynomial;
-
-import java.math.BigDecimal;
-
-/**
- * A polynomial with {@link BigDecimal} coefficients.
- * Some methods (like <code>add</code>) change the polynomial, others (like <code>mult</code>) do
- * not but return the result as a new polynomial.
- */
-public class BigDecimalPolynomial
-{
-    private static final BigDecimal ZERO = new BigDecimal("0");
-    private static final BigDecimal ONE_HALF = new BigDecimal("0.5");
-
-    BigDecimal[] coeffs;
-
-    /**
-     * Constructs a new polynomial with <code>N</code> coefficients initialized to 0.
-     *
-     * @param N the number of coefficients
-     */
-    BigDecimalPolynomial(int N)
-    {
-        coeffs = new BigDecimal[N];
-        for (int i = 0; i < N; i++)
-        {
-            coeffs[i] = ZERO;
-        }
-    }
-
-    /**
-     * Constructs a new polynomial with a given set of coefficients.
-     *
-     * @param coeffs the coefficients
-     */
-    BigDecimalPolynomial(BigDecimal[] coeffs)
-    {
-        this.coeffs = coeffs;
-    }
-
-    /**
-     * Constructs a <code>BigDecimalPolynomial</code> from a <code>BigIntPolynomial</code>. The two polynomials are independent of each other.
-     *
-     * @param p the original polynomial
-     */
-    public BigDecimalPolynomial(BigIntPolynomial p)
-    {
-        int N = p.coeffs.length;
-        coeffs = new BigDecimal[N];
-        for (int i = 0; i < N; i++)
-        {
-            coeffs[i] = new BigDecimal(p.coeffs[i]);
-        }
-    }
-
-    /**
-     * Divides all coefficients by 2.
-     */
-    public void halve()
-    {
-        for (int i = 0; i < coeffs.length; i++)
-        {
-            coeffs[i] = coeffs[i].multiply(ONE_HALF);
-        }
-    }
-
-    /**
-     * Multiplies the polynomial by another. Does not change this polynomial
-     * but returns the result as a new polynomial.
-     *
-     * @param poly2 the polynomial to multiply by
-     * @return a new polynomial
-     */
-    public BigDecimalPolynomial mult(BigIntPolynomial poly2)
-    {
-        return mult(new BigDecimalPolynomial(poly2));
-    }
-
-    /**
-     * Multiplies the polynomial by another, taking the indices mod N. Does not
-     * change this polynomial but returns the result as a new polynomial.
-     *
-     * @param poly2 the polynomial to multiply by
-     * @return a new polynomial
-     */
-    public BigDecimalPolynomial mult(BigDecimalPolynomial poly2)
-    {
-        int N = coeffs.length;
-        if (poly2.coeffs.length != N)
-        {
-            throw new IllegalArgumentException("Number of coefficients must be the same");
-        }
-
-        BigDecimalPolynomial c = multRecursive(poly2);
-
-        if (c.coeffs.length > N)
-        {
-            for (int k = N; k < c.coeffs.length; k++)
-            {
-                c.coeffs[k - N] = c.coeffs[k - N].add(c.coeffs[k]);
-            }
-            c.coeffs = copyOf(c.coeffs, N);
-        }
-        return c;
-    }
-
-    /**
-     * Karazuba multiplication
-     */
-    private BigDecimalPolynomial multRecursive(BigDecimalPolynomial poly2)
-    {
-        BigDecimal[] a = coeffs;
-        BigDecimal[] b = poly2.coeffs;
-
-        int n = poly2.coeffs.length;
-        if (n <= 1)
-        {
-            BigDecimal[] c = coeffs.clone();
-            for (int i = 0; i < coeffs.length; i++)
-            {
-                c[i] = c[i].multiply(poly2.coeffs[0]);
-            }
-            return new BigDecimalPolynomial(c);
-        }
-        else
-        {
-            int n1 = n / 2;
-
-            BigDecimalPolynomial a1 = new BigDecimalPolynomial(copyOf(a, n1));
-            BigDecimalPolynomial a2 = new BigDecimalPolynomial(copyOfRange(a, n1, n));
-            BigDecimalPolynomial b1 = new BigDecimalPolynomial(copyOf(b, n1));
-            BigDecimalPolynomial b2 = new BigDecimalPolynomial(copyOfRange(b, n1, n));
-
-            BigDecimalPolynomial A = (BigDecimalPolynomial)a1.clone();
-            A.add(a2);
-            BigDecimalPolynomial B = (BigDecimalPolynomial)b1.clone();
-            B.add(b2);
-
-            BigDecimalPolynomial c1 = a1.multRecursive(b1);
-            BigDecimalPolynomial c2 = a2.multRecursive(b2);
-            BigDecimalPolynomial c3 = A.multRecursive(B);
-            c3.sub(c1);
-            c3.sub(c2);
-
-            BigDecimalPolynomial c = new BigDecimalPolynomial(2 * n - 1);
-            for (int i = 0; i < c1.coeffs.length; i++)
-            {
-                c.coeffs[i] = c1.coeffs[i];
-            }
-            for (int i = 0; i < c3.coeffs.length; i++)
-            {
-                c.coeffs[n1 + i] = c.coeffs[n1 + i].add(c3.coeffs[i]);
-            }
-            for (int i = 0; i < c2.coeffs.length; i++)
-            {
-                c.coeffs[2 * n1 + i] = c.coeffs[2 * n1 + i].add(c2.coeffs[i]);
-            }
-            return c;
-        }
-    }
-
-    /**
-     * Adds another polynomial which can have a different number of coefficients.
-     *
-     * @param b another polynomial
-     */
-    public void add(BigDecimalPolynomial b)
-    {
-        if (b.coeffs.length > coeffs.length)
-        {
-            int N = coeffs.length;
-            coeffs = copyOf(coeffs, b.coeffs.length);
-            for (int i = N; i < coeffs.length; i++)
-            {
-                coeffs[i] = ZERO;
-            }
-        }
-        for (int i = 0; i < b.coeffs.length; i++)
-        {
-            coeffs[i] = coeffs[i].add(b.coeffs[i]);
-        }
-    }
-
-    /**
-     * Subtracts another polynomial which can have a different number of coefficients.
-     *
-     * @param b
-     */
-    void sub(BigDecimalPolynomial b)
-    {
-        if (b.coeffs.length > coeffs.length)
-        {
-            int N = coeffs.length;
-            coeffs = copyOf(coeffs, b.coeffs.length);
-            for (int i = N; i < coeffs.length; i++)
-            {
-                coeffs[i] = ZERO;
-            }
-        }
-        for (int i = 0; i < b.coeffs.length; i++)
-        {
-            coeffs[i] = coeffs[i].subtract(b.coeffs[i]);
-        }
-    }
-
-    /**
-     * Rounds all coefficients to the nearest integer.
-     *
-     * @return a new polynomial with <code>BigInteger</code> coefficients
-     */
-    public BigIntPolynomial round()
-    {
-        int N = coeffs.length;
-        BigIntPolynomial p = new BigIntPolynomial(N);
-        for (int i = 0; i < N; i++)
-        {
-            p.coeffs[i] = coeffs[i].setScale(0, BigDecimal.ROUND_HALF_EVEN).toBigInteger();
-        }
-        return p;
-    }
-
-    /**
-     * Makes a copy of the polynomial that is independent of the original.
-     */
-    public Object clone()
-    {
-        return new BigDecimalPolynomial(coeffs.clone());
-    }
-
-    private BigDecimal[] copyOf(BigDecimal[] a, int length)
-    {
-        BigDecimal[] tmp = new BigDecimal[length];
-
-        System.arraycopy(a, 0, tmp, 0, a.length < length ? a.length : length);
-
-        return tmp;
-    }
-
-    private BigDecimal[] copyOfRange(BigDecimal[] a, int from, int to)
-    {
-        int          newLength = to - from;
-        BigDecimal[] tmp = new BigDecimal[to - from];
-
-        System.arraycopy(a, from, tmp, 0, (a.length - from) < newLength ? (a.length - from) : newLength);
-
-        return tmp;
-    }
-
-    public BigDecimal[] getCoeffs()
-    {
-        BigDecimal[] tmp = new BigDecimal[coeffs.length];
-
-        System.arraycopy(coeffs, 0, tmp, 0, coeffs.length);
-
-        return tmp;
-    }
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/math/ntru/polynomial/BigIntPolynomial.java b/bcprov/src/main/java/org/bouncycastle/pqc/math/ntru/polynomial/BigIntPolynomial.java
deleted file mode 100644
index 3c79b2e..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/math/ntru/polynomial/BigIntPolynomial.java
+++ /dev/null
@@ -1,394 +0,0 @@
-package org.bouncycastle.pqc.math.ntru.polynomial;
-
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.security.SecureRandom;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import org.bouncycastle.util.Arrays;
-
-/**
- * A polynomial with {@link BigInteger} coefficients.<br>
- * Some methods (like <code>add</code>) change the polynomial, others (like <code>mult</code>) do
- * not but return the result as a new polynomial.
- */
-public class BigIntPolynomial
-{
-    private final static double LOG_10_2 = Math.log10(2);
-
-    BigInteger[] coeffs;
-
-    /**
-     * Constructs a new polynomial with <code>N</code> coefficients initialized to 0.
-     *
-     * @param N the number of coefficients
-     */
-    BigIntPolynomial(int N)
-    {
-        coeffs = new BigInteger[N];
-        for (int i = 0; i < N; i++)
-        {
-            coeffs[i] = Constants.BIGINT_ZERO;
-        }
-    }
-
-    /**
-     * Constructs a new polynomial with a given set of coefficients.
-     *
-     * @param coeffs the coefficients
-     */
-    BigIntPolynomial(BigInteger[] coeffs)
-    {
-        this.coeffs = coeffs;
-    }
-
-    /**
-     * Constructs a <code>BigIntPolynomial</code> from a <code>IntegerPolynomial</code>. The two polynomials are
-     * independent of each other.
-     *
-     * @param p the original polynomial
-     */
-    public BigIntPolynomial(IntegerPolynomial p)
-    {
-        coeffs = new BigInteger[p.coeffs.length];
-        for (int i = 0; i < coeffs.length; i++)
-        {
-            coeffs[i] = BigInteger.valueOf(p.coeffs[i]);
-        }
-    }
-
-    /**
-     * Generates a random polynomial with <code>numOnes</code> coefficients equal to 1,
-     * <code>numNegOnes</code> coefficients equal to -1, and the rest equal to 0.
-     *
-     * @param N          number of coefficients
-     * @param numOnes    number of 1's
-     * @param numNegOnes number of -1's
-     * @return
-     */
-    static BigIntPolynomial generateRandomSmall(int N, int numOnes, int numNegOnes)
-    {
-        List coeffs = new ArrayList();
-        for (int i = 0; i < numOnes; i++)
-        {
-            coeffs.add(Constants.BIGINT_ONE);
-        }
-        for (int i = 0; i < numNegOnes; i++)
-        {
-            coeffs.add(BigInteger.valueOf(-1));
-        }
-        while (coeffs.size() < N)
-        {
-            coeffs.add(Constants.BIGINT_ZERO);
-        }
-        Collections.shuffle(coeffs, new SecureRandom());
-
-        BigIntPolynomial poly = new BigIntPolynomial(N);
-        for (int i = 0; i < coeffs.size(); i++)
-        {
-            poly.coeffs[i] = (BigInteger)coeffs.get(i);
-        }
-        return poly;
-    }
-
-    /**
-     * Multiplies the polynomial by another, taking the indices mod N. Does not
-     * change this polynomial but returns the result as a new polynomial.<br>
-     * Both polynomials must have the same number of coefficients.
-     *
-     * @param poly2 the polynomial to multiply by
-     * @return a new polynomial
-     */
-    public BigIntPolynomial mult(BigIntPolynomial poly2)
-    {
-        int N = coeffs.length;
-        if (poly2.coeffs.length != N)
-        {
-            throw new IllegalArgumentException("Number of coefficients must be the same");
-        }
-
-        BigIntPolynomial c = multRecursive(poly2);
-
-        if (c.coeffs.length > N)
-        {
-            for (int k = N; k < c.coeffs.length; k++)
-            {
-                c.coeffs[k - N] = c.coeffs[k - N].add(c.coeffs[k]);
-            }
-            c.coeffs = Arrays.copyOf(c.coeffs, N);
-        }
-        return c;
-    }
-
-    /**
-     * Karazuba multiplication
-     */
-    private BigIntPolynomial multRecursive(BigIntPolynomial poly2)
-    {
-        BigInteger[] a = coeffs;
-        BigInteger[] b = poly2.coeffs;
-
-        int n = poly2.coeffs.length;
-        if (n <= 1)
-        {
-            BigInteger[] c = Arrays.clone(coeffs);
-            for (int i = 0; i < coeffs.length; i++)
-            {
-                c[i] = c[i].multiply(poly2.coeffs[0]);
-            }
-            return new BigIntPolynomial(c);
-        }
-        else
-        {
-            int n1 = n / 2;
-
-            BigIntPolynomial a1 = new BigIntPolynomial(Arrays.copyOf(a, n1));
-            BigIntPolynomial a2 = new BigIntPolynomial(Arrays.copyOfRange(a, n1, n));
-            BigIntPolynomial b1 = new BigIntPolynomial(Arrays.copyOf(b, n1));
-            BigIntPolynomial b2 = new BigIntPolynomial(Arrays.copyOfRange(b, n1, n));
-
-            BigIntPolynomial A = (BigIntPolynomial)a1.clone();
-            A.add(a2);
-            BigIntPolynomial B = (BigIntPolynomial)b1.clone();
-            B.add(b2);
-
-            BigIntPolynomial c1 = a1.multRecursive(b1);
-            BigIntPolynomial c2 = a2.multRecursive(b2);
-            BigIntPolynomial c3 = A.multRecursive(B);
-            c3.sub(c1);
-            c3.sub(c2);
-
-            BigIntPolynomial c = new BigIntPolynomial(2 * n - 1);
-            for (int i = 0; i < c1.coeffs.length; i++)
-            {
-                c.coeffs[i] = c1.coeffs[i];
-            }
-            for (int i = 0; i < c3.coeffs.length; i++)
-            {
-                c.coeffs[n1 + i] = c.coeffs[n1 + i].add(c3.coeffs[i]);
-            }
-            for (int i = 0; i < c2.coeffs.length; i++)
-            {
-                c.coeffs[2 * n1 + i] = c.coeffs[2 * n1 + i].add(c2.coeffs[i]);
-            }
-            return c;
-        }
-    }
-
-    /**
-     * Adds another polynomial which can have a different number of coefficients,
-     * and takes the coefficient values mod <code>modulus</code>.
-     *
-     * @param b another polynomial
-     */
-    void add(BigIntPolynomial b, BigInteger modulus)
-    {
-        add(b);
-        mod(modulus);
-    }
-
-    /**
-     * Adds another polynomial which can have a different number of coefficients.
-     *
-     * @param b another polynomial
-     */
-    public void add(BigIntPolynomial b)
-    {
-        if (b.coeffs.length > coeffs.length)
-        {
-            int N = coeffs.length;
-            coeffs = Arrays.copyOf(coeffs, b.coeffs.length);
-            for (int i = N; i < coeffs.length; i++)
-            {
-                coeffs[i] = Constants.BIGINT_ZERO;
-            }
-        }
-        for (int i = 0; i < b.coeffs.length; i++)
-        {
-            coeffs[i] = coeffs[i].add(b.coeffs[i]);
-        }
-    }
-
-    /**
-     * Subtracts another polynomial which can have a different number of coefficients.
-     *
-     * @param b another polynomial
-     */
-    public void sub(BigIntPolynomial b)
-    {
-        if (b.coeffs.length > coeffs.length)
-        {
-            int N = coeffs.length;
-            coeffs = Arrays.copyOf(coeffs, b.coeffs.length);
-            for (int i = N; i < coeffs.length; i++)
-            {
-                coeffs[i] = Constants.BIGINT_ZERO;
-            }
-        }
-        for (int i = 0; i < b.coeffs.length; i++)
-        {
-            coeffs[i] = coeffs[i].subtract(b.coeffs[i]);
-        }
-    }
-
-    /**
-     * Multiplies each coefficient by a <code>BigInteger</code>. Does not return a new polynomial but modifies this polynomial.
-     *
-     * @param factor
-     */
-    public void mult(BigInteger factor)
-    {
-        for (int i = 0; i < coeffs.length; i++)
-        {
-            coeffs[i] = coeffs[i].multiply(factor);
-        }
-    }
-
-    /**
-     * Multiplies each coefficient by a <code>int</code>. Does not return a new polynomial but modifies this polynomial.
-     *
-     * @param factor
-     */
-    void mult(int factor)
-    {
-        mult(BigInteger.valueOf(factor));
-    }
-
-    /**
-     * Divides each coefficient by a <code>BigInteger</code> and rounds the result to the nearest whole number.<br>
-     * Does not return a new polynomial but modifies this polynomial.
-     *
-     * @param divisor the number to divide by
-     */
-    public void div(BigInteger divisor)
-    {
-        BigInteger d = divisor.add(Constants.BIGINT_ONE).divide(BigInteger.valueOf(2));
-        for (int i = 0; i < coeffs.length; i++)
-        {
-            coeffs[i] = coeffs[i].compareTo(Constants.BIGINT_ZERO) > 0 ? coeffs[i].add(d) : coeffs[i].add(d.negate());
-            coeffs[i] = coeffs[i].divide(divisor);
-        }
-    }
-
-    /**
-     * Divides each coefficient by a <code>BigDecimal</code> and rounds the result to <code>decimalPlaces</code> places.
-     *
-     * @param divisor       the number to divide by
-     * @param decimalPlaces the number of fractional digits to round the result to
-     * @return a new <code>BigDecimalPolynomial</code>
-     */
-    public BigDecimalPolynomial div(BigDecimal divisor, int decimalPlaces)
-    {
-        BigInteger max = maxCoeffAbs();
-        int coeffLength = (int)(max.bitLength() * LOG_10_2) + 1;
-        // factor = 1/divisor
-        BigDecimal factor = Constants.BIGDEC_ONE.divide(divisor, coeffLength + decimalPlaces + 1, BigDecimal.ROUND_HALF_EVEN);
-
-        // multiply each coefficient by factor
-        BigDecimalPolynomial p = new BigDecimalPolynomial(coeffs.length);
-        for (int i = 0; i < coeffs.length; i++)
-        // multiply, then truncate after decimalPlaces so subsequent operations aren't slowed down
-        {
-            p.coeffs[i] = new BigDecimal(coeffs[i]).multiply(factor).setScale(decimalPlaces, BigDecimal.ROUND_HALF_EVEN);
-        }
-
-        return p;
-    }
-
-    /**
-     * Returns the base10 length of the largest coefficient.
-     *
-     * @return length of the longest coefficient
-     */
-    public int getMaxCoeffLength()
-    {
-        return (int)(maxCoeffAbs().bitLength() * LOG_10_2) + 1;
-    }
-
-    private BigInteger maxCoeffAbs()
-    {
-        BigInteger max = coeffs[0].abs();
-        for (int i = 1; i < coeffs.length; i++)
-        {
-            BigInteger coeff = coeffs[i].abs();
-            if (coeff.compareTo(max) > 0)
-            {
-                max = coeff;
-            }
-        }
-        return max;
-    }
-
-    /**
-     * Takes each coefficient modulo a number.
-     *
-     * @param modulus
-     */
-    public void mod(BigInteger modulus)
-    {
-        for (int i = 0; i < coeffs.length; i++)
-        {
-            coeffs[i] = coeffs[i].mod(modulus);
-        }
-    }
-
-    /**
-     * Returns the sum of all coefficients, i.e. evaluates the polynomial at 0.
-     *
-     * @return the sum of all coefficients
-     */
-    BigInteger sumCoeffs()
-    {
-        BigInteger sum = Constants.BIGINT_ZERO;
-        for (int i = 0; i < coeffs.length; i++)
-        {
-            sum = sum.add(coeffs[i]);
-        }
-        return sum;
-    }
-
-    /**
-     * Makes a copy of the polynomial that is independent of the original.
-     */
-    public Object clone()
-    {
-        return new BigIntPolynomial(coeffs.clone());
-    }
-
-    public int hashCode()
-    {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + Arrays.hashCode(coeffs);
-        return result;
-    }
-
-    public boolean equals(Object obj)
-    {
-        if (this == obj)
-        {
-            return true;
-        }
-        if (obj == null)
-        {
-            return false;
-        }
-        if (getClass() != obj.getClass())
-        {
-            return false;
-        }
-        BigIntPolynomial other = (BigIntPolynomial)obj;
-        if (!Arrays.areEqual(coeffs, other.coeffs))
-        {
-            return false;
-        }
-        return true;
-    }
-
-    public BigInteger[] getCoeffs()
-    {
-        return Arrays.clone(coeffs);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/math/ntru/polynomial/Constants.java b/bcprov/src/main/java/org/bouncycastle/pqc/math/ntru/polynomial/Constants.java
deleted file mode 100644
index 2b41b19..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/math/ntru/polynomial/Constants.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.bouncycastle.pqc.math.ntru.polynomial;
-
-import java.math.BigDecimal;
-import java.math.BigInteger;
-
-public class Constants
-{
-    static final BigInteger BIGINT_ZERO = BigInteger.valueOf(0);
-    static final BigInteger BIGINT_ONE = BigInteger.valueOf(1);
-
-    static final BigDecimal BIGDEC_ONE = BigDecimal.valueOf(1);
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/math/ntru/polynomial/DenseTernaryPolynomial.java b/bcprov/src/main/java/org/bouncycastle/pqc/math/ntru/polynomial/DenseTernaryPolynomial.java
deleted file mode 100644
index 85730da..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/math/ntru/polynomial/DenseTernaryPolynomial.java
+++ /dev/null
@@ -1,142 +0,0 @@
-package org.bouncycastle.pqc.math.ntru.polynomial;
-
-import java.security.SecureRandom;
-
-import org.bouncycastle.pqc.math.ntru.util.Util;
-import org.bouncycastle.util.Arrays;
-
-/**
- * A <code>TernaryPolynomial</code> with a "high" number of nonzero coefficients.
- */
-public class DenseTernaryPolynomial
-    extends IntegerPolynomial
-    implements TernaryPolynomial
-{
-
-    /**
-     * Constructs a new <code>DenseTernaryPolynomial</code> with <code>N</code> coefficients.
-     *
-     * @param N the number of coefficients
-     */
-    DenseTernaryPolynomial(int N)
-    {
-        super(N);
-        checkTernarity();
-    }
-
-    /**
-     * Constructs a <code>DenseTernaryPolynomial</code> from a <code>IntegerPolynomial</code>. The two polynomials are
-     * independent of each other.
-     *
-     * @param intPoly the original polynomial
-     */
-    public DenseTernaryPolynomial(IntegerPolynomial intPoly)
-    {
-        this(intPoly.coeffs);
-    }
-
-    /**
-     * Constructs a new <code>DenseTernaryPolynomial</code> with a given set of coefficients.
-     *
-     * @param coeffs the coefficients
-     */
-    public DenseTernaryPolynomial(int[] coeffs)
-    {
-        super(coeffs);
-        checkTernarity();
-    }
-
-    private void checkTernarity()
-    {
-        for (int i = 0; i != coeffs.length; i++)
-        {
-            int c = coeffs[i];
-            if (c < -1 || c > 1)
-            {
-                throw new IllegalStateException("Illegal value: " + c + ", must be one of {-1, 0, 1}");
-            }
-        }
-    }
-
-    /**
-     * Generates a random polynomial with <code>numOnes</code> coefficients equal to 1,
-     * <code>numNegOnes</code> coefficients equal to -1, and the rest equal to 0.
-     *
-     * @param N          number of coefficients
-     * @param numOnes    number of 1's
-     * @param numNegOnes number of -1's
-     */
-    public static DenseTernaryPolynomial generateRandom(int N, int numOnes, int numNegOnes, SecureRandom random)
-    {
-        int[] coeffs = Util.generateRandomTernary(N, numOnes, numNegOnes, random);
-        return new DenseTernaryPolynomial(coeffs);
-    }
-
-    /**
-     * Generates a polynomial with coefficients randomly selected from <code>{-1, 0, 1}</code>.
-     *
-     * @param N number of coefficients
-     */
-    public static DenseTernaryPolynomial generateRandom(int N, SecureRandom random)
-    {
-        DenseTernaryPolynomial poly = new DenseTernaryPolynomial(N);
-        for (int i = 0; i < N; i++)
-        {
-            poly.coeffs[i] = random.nextInt(3) - 1;
-        }
-        return poly;
-    }
-
-    public IntegerPolynomial mult(IntegerPolynomial poly2, int modulus)
-    {
-        // even on 32-bit systems, LongPolynomial5 multiplies faster than IntegerPolynomial
-        if (modulus == 2048)
-        {
-            IntegerPolynomial poly2Pos = (IntegerPolynomial)poly2.clone();
-            poly2Pos.modPositive(2048);
-            LongPolynomial5 poly5 = new LongPolynomial5(poly2Pos);
-            return poly5.mult(this).toIntegerPolynomial();
-        }
-        else
-        {
-            return super.mult(poly2, modulus);
-        }
-    }
-
-    public int[] getOnes()
-    {
-        int N = coeffs.length;
-        int[] ones = new int[N];
-        int onesIdx = 0;
-        for (int i = 0; i < N; i++)
-        {
-            int c = coeffs[i];
-            if (c == 1)
-            {
-                ones[onesIdx++] = i;
-            }
-        }
-        return Arrays.copyOf(ones, onesIdx);
-    }
-
-    public int[] getNegOnes()
-    {
-        int N = coeffs.length;
-        int[] negOnes = new int[N];
-        int negOnesIdx = 0;
-        for (int i = 0; i < N; i++)
-        {
-            int c = coeffs[i];
-            if (c == -1)
-            {
-                negOnes[negOnesIdx++] = i;
-            }
-        }
-        return Arrays.copyOf(negOnes, negOnesIdx);
-    }
-
-    public int size()
-    {
-        return coeffs.length;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/math/ntru/polynomial/IntegerPolynomial.java b/bcprov/src/main/java/org/bouncycastle/pqc/math/ntru/polynomial/IntegerPolynomial.java
deleted file mode 100644
index c6bd7fb..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/math/ntru/polynomial/IntegerPolynomial.java
+++ /dev/null
@@ -1,1358 +0,0 @@
-package org.bouncycastle.pqc.math.ntru.polynomial;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.math.BigInteger;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-import java.util.concurrent.LinkedBlockingQueue;
-
-import org.bouncycastle.pqc.math.ntru.euclid.BigIntEuclidean;
-import org.bouncycastle.pqc.math.ntru.util.ArrayEncoder;
-import org.bouncycastle.pqc.math.ntru.util.Util;
-import org.bouncycastle.util.Arrays;
-
-/**
- * A polynomial with <code>int</code> coefficients.<br>
- * Some methods (like <code>add</code>) change the polynomial, others (like <code>mult</code>) do
- * not but return the result as a new polynomial.
- */
-public class IntegerPolynomial
-    implements Polynomial
-{
-    private static final int NUM_EQUAL_RESULTANTS = 3;
-    /**
-     * Prime numbers &gt; 4500 for resultant computation. Starting them below ~4400 causes incorrect results occasionally.
-     * Fortunately, 4500 is about the optimum number for performance.<br/>
-     * This array contains enough prime numbers so primes never have to be computed on-line for any standard {@link org.bouncycastle.pqc.crypto.ntru.NTRUSigningParameters}.
-     */
-    private static final int[] PRIMES = new int[]{
-        4507, 4513, 4517, 4519, 4523, 4547, 4549, 4561, 4567, 4583,
-        4591, 4597, 4603, 4621, 4637, 4639, 4643, 4649, 4651, 4657,
-        4663, 4673, 4679, 4691, 4703, 4721, 4723, 4729, 4733, 4751,
-        4759, 4783, 4787, 4789, 4793, 4799, 4801, 4813, 4817, 4831,
-        4861, 4871, 4877, 4889, 4903, 4909, 4919, 4931, 4933, 4937,
-        4943, 4951, 4957, 4967, 4969, 4973, 4987, 4993, 4999, 5003,
-        5009, 5011, 5021, 5023, 5039, 5051, 5059, 5077, 5081, 5087,
-        5099, 5101, 5107, 5113, 5119, 5147, 5153, 5167, 5171, 5179,
-        5189, 5197, 5209, 5227, 5231, 5233, 5237, 5261, 5273, 5279,
-        5281, 5297, 5303, 5309, 5323, 5333, 5347, 5351, 5381, 5387,
-        5393, 5399, 5407, 5413, 5417, 5419, 5431, 5437, 5441, 5443,
-        5449, 5471, 5477, 5479, 5483, 5501, 5503, 5507, 5519, 5521,
-        5527, 5531, 5557, 5563, 5569, 5573, 5581, 5591, 5623, 5639,
-        5641, 5647, 5651, 5653, 5657, 5659, 5669, 5683, 5689, 5693,
-        5701, 5711, 5717, 5737, 5741, 5743, 5749, 5779, 5783, 5791,
-        5801, 5807, 5813, 5821, 5827, 5839, 5843, 5849, 5851, 5857,
-        5861, 5867, 5869, 5879, 5881, 5897, 5903, 5923, 5927, 5939,
-        5953, 5981, 5987, 6007, 6011, 6029, 6037, 6043, 6047, 6053,
-        6067, 6073, 6079, 6089, 6091, 6101, 6113, 6121, 6131, 6133,
-        6143, 6151, 6163, 6173, 6197, 6199, 6203, 6211, 6217, 6221,
-        6229, 6247, 6257, 6263, 6269, 6271, 6277, 6287, 6299, 6301,
-        6311, 6317, 6323, 6329, 6337, 6343, 6353, 6359, 6361, 6367,
-        6373, 6379, 6389, 6397, 6421, 6427, 6449, 6451, 6469, 6473,
-        6481, 6491, 6521, 6529, 6547, 6551, 6553, 6563, 6569, 6571,
-        6577, 6581, 6599, 6607, 6619, 6637, 6653, 6659, 6661, 6673,
-        6679, 6689, 6691, 6701, 6703, 6709, 6719, 6733, 6737, 6761,
-        6763, 6779, 6781, 6791, 6793, 6803, 6823, 6827, 6829, 6833,
-        6841, 6857, 6863, 6869, 6871, 6883, 6899, 6907, 6911, 6917,
-        6947, 6949, 6959, 6961, 6967, 6971, 6977, 6983, 6991, 6997,
-        7001, 7013, 7019, 7027, 7039, 7043, 7057, 7069, 7079, 7103,
-        7109, 7121, 7127, 7129, 7151, 7159, 7177, 7187, 7193, 7207,
-        7211, 7213, 7219, 7229, 7237, 7243, 7247, 7253, 7283, 7297,
-        7307, 7309, 7321, 7331, 7333, 7349, 7351, 7369, 7393, 7411,
-        7417, 7433, 7451, 7457, 7459, 7477, 7481, 7487, 7489, 7499,
-        7507, 7517, 7523, 7529, 7537, 7541, 7547, 7549, 7559, 7561,
-        7573, 7577, 7583, 7589, 7591, 7603, 7607, 7621, 7639, 7643,
-        7649, 7669, 7673, 7681, 7687, 7691, 7699, 7703, 7717, 7723,
-        7727, 7741, 7753, 7757, 7759, 7789, 7793, 7817, 7823, 7829,
-        7841, 7853, 7867, 7873, 7877, 7879, 7883, 7901, 7907, 7919,
-        7927, 7933, 7937, 7949, 7951, 7963, 7993, 8009, 8011, 8017,
-        8039, 8053, 8059, 8069, 8081, 8087, 8089, 8093, 8101, 8111,
-        8117, 8123, 8147, 8161, 8167, 8171, 8179, 8191, 8209, 8219,
-        8221, 8231, 8233, 8237, 8243, 8263, 8269, 8273, 8287, 8291,
-        8293, 8297, 8311, 8317, 8329, 8353, 8363, 8369, 8377, 8387,
-        8389, 8419, 8423, 8429, 8431, 8443, 8447, 8461, 8467, 8501,
-        8513, 8521, 8527, 8537, 8539, 8543, 8563, 8573, 8581, 8597,
-        8599, 8609, 8623, 8627, 8629, 8641, 8647, 8663, 8669, 8677,
-        8681, 8689, 8693, 8699, 8707, 8713, 8719, 8731, 8737, 8741,
-        8747, 8753, 8761, 8779, 8783, 8803, 8807, 8819, 8821, 8831,
-        8837, 8839, 8849, 8861, 8863, 8867, 8887, 8893, 8923, 8929,
-        8933, 8941, 8951, 8963, 8969, 8971, 8999, 9001, 9007, 9011,
-        9013, 9029, 9041, 9043, 9049, 9059, 9067, 9091, 9103, 9109,
-        9127, 9133, 9137, 9151, 9157, 9161, 9173, 9181, 9187, 9199,
-        9203, 9209, 9221, 9227, 9239, 9241, 9257, 9277, 9281, 9283,
-        9293, 9311, 9319, 9323, 9337, 9341, 9343, 9349, 9371, 9377,
-        9391, 9397, 9403, 9413, 9419, 9421, 9431, 9433, 9437, 9439,
-        9461, 9463, 9467, 9473, 9479, 9491, 9497, 9511, 9521, 9533,
-        9539, 9547, 9551, 9587, 9601, 9613, 9619, 9623, 9629, 9631,
-        9643, 9649, 9661, 9677, 9679, 9689, 9697, 9719, 9721, 9733,
-        9739, 9743, 9749, 9767, 9769, 9781, 9787, 9791, 9803, 9811,
-        9817, 9829, 9833, 9839, 9851, 9857, 9859, 9871, 9883, 9887,
-        9901, 9907, 9923, 9929, 9931, 9941, 9949, 9967, 9973};
-    private static final List BIGINT_PRIMES;
-
-    static
-    {
-        BIGINT_PRIMES = new ArrayList();
-        for (int i = 0; i != PRIMES.length; i++)
-        {
-            BIGINT_PRIMES.add(BigInteger.valueOf(PRIMES[i]));
-        }
-    }
-
-    public int[] coeffs;
-
-    /**
-     * Constructs a new polynomial with <code>N</code> coefficients initialized to 0.
-     *
-     * @param N the number of coefficients
-     */
-    public IntegerPolynomial(int N)
-    {
-        coeffs = new int[N];
-    }
-
-    /**
-     * Constructs a new polynomial with a given set of coefficients.
-     *
-     * @param coeffs the coefficients
-     */
-    public IntegerPolynomial(int[] coeffs)
-    {
-        this.coeffs = coeffs;
-    }
-
-    /**
-     * Constructs a <code>IntegerPolynomial</code> from a <code>BigIntPolynomial</code>. The two polynomials are independent of each other.
-     *
-     * @param p the original polynomial
-     */
-    public IntegerPolynomial(BigIntPolynomial p)
-    {
-        coeffs = new int[p.coeffs.length];
-        for (int i = 0; i < p.coeffs.length; i++)
-        {
-            coeffs[i] = p.coeffs[i].intValue();
-        }
-    }
-
-    /**
-     * Decodes a byte array to a polynomial with <code>N</code> ternary coefficients<br>
-     * Ignores any excess bytes.
-     *
-     * @param data an encoded ternary polynomial
-     * @param N    number of coefficients
-     * @return the decoded polynomial
-     */
-    public static IntegerPolynomial fromBinary3Sves(byte[] data, int N)
-    {
-        return new IntegerPolynomial(ArrayEncoder.decodeMod3Sves(data, N));
-    }
-
-    /**
-     * Converts a byte array produced by {@link #toBinary3Tight()} to a polynomial.
-     *
-     * @param b a byte array
-     * @param N number of coefficients
-     * @return the decoded polynomial
-     */
-    public static IntegerPolynomial fromBinary3Tight(byte[] b, int N)
-    {
-        return new IntegerPolynomial(ArrayEncoder.decodeMod3Tight(b, N));
-    }
-
-    /**
-     * Reads data produced by {@link #toBinary3Tight()} from an input stream and converts it to a polynomial.
-     *
-     * @param is an input stream
-     * @param N  number of coefficients
-     * @return the decoded polynomial
-     */
-    public static IntegerPolynomial fromBinary3Tight(InputStream is, int N)
-        throws IOException
-    {
-        return new IntegerPolynomial(ArrayEncoder.decodeMod3Tight(is, N));
-    }
-
-    /**
-     * Returns a polynomial with N coefficients between <code>0</code> and <code>q-1</code>.<br>
-     * <code>q</code> must be a power of 2.<br>
-     * Ignores any excess bytes.
-     *
-     * @param data an encoded ternary polynomial
-     * @param N    number of coefficients
-     * @param q
-     * @return the decoded polynomial
-     */
-    public static IntegerPolynomial fromBinary(byte[] data, int N, int q)
-    {
-        return new IntegerPolynomial(ArrayEncoder.decodeModQ(data, N, q));
-    }
-
-    /**
-     * Returns a polynomial with N coefficients between <code>0</code> and <code>q-1</code>.<br>
-     * <code>q</code> must be a power of 2.<br>
-     * Ignores any excess bytes.
-     *
-     * @param is an encoded ternary polynomial
-     * @param N  number of coefficients
-     * @param q
-     * @return the decoded polynomial
-     */
-    public static IntegerPolynomial fromBinary(InputStream is, int N, int q)
-        throws IOException
-    {
-        return new IntegerPolynomial(ArrayEncoder.decodeModQ(is, N, q));
-    }
-
-    /**
-     * Encodes a polynomial with ternary coefficients to binary.
-     * <code>coeffs[2*i]</code> and <code>coeffs[2*i+1]</code> must not both equal -1 for any integer <code>i</code>,
-     * so this method is only safe to use with polynomials produced by <code>fromBinary3Sves()</code>.
-     *
-     * @return the encoded polynomial
-     */
-    public byte[] toBinary3Sves()
-    {
-        return ArrayEncoder.encodeMod3Sves(coeffs);
-    }
-
-    /**
-     * Converts a polynomial with ternary coefficients to binary.
-     *
-     * @return the encoded polynomial
-     */
-    public byte[] toBinary3Tight()
-    {
-        BigInteger sum = Constants.BIGINT_ZERO;
-        for (int i = coeffs.length - 1; i >= 0; i--)
-        {
-            sum = sum.multiply(BigInteger.valueOf(3));
-            sum = sum.add(BigInteger.valueOf(coeffs[i] + 1));
-        }
-
-        int size = (BigInteger.valueOf(3).pow(coeffs.length).bitLength() + 7) / 8;
-        byte[] arr = sum.toByteArray();
-
-        if (arr.length < size)
-        {
-            // pad with leading zeros so arr.length==size
-            byte[] arr2 = new byte[size];
-            System.arraycopy(arr, 0, arr2, size - arr.length, arr.length);
-            return arr2;
-        }
-
-        if (arr.length > size)
-        // drop sign bit
-        {
-            arr = Arrays.copyOfRange(arr, 1, arr.length);
-        }
-        return arr;
-    }
-
-    /**
-     * Encodes a polynomial whose coefficients are between 0 and q, to binary. q must be a power of 2.
-     *
-     * @param q
-     * @return the encoded polynomial
-     */
-    public byte[] toBinary(int q)
-    {
-        return ArrayEncoder.encodeModQ(coeffs, q);
-    }
-
-    /**
-     * Multiplies the polynomial with another, taking the values mod modulus and the indices mod N
-     */
-    public IntegerPolynomial mult(IntegerPolynomial poly2, int modulus)
-    {
-        IntegerPolynomial c = mult(poly2);
-        c.mod(modulus);
-        return c;
-    }
-
-    /**
-     * Multiplies the polynomial with another, taking the indices mod N
-     */
-    public IntegerPolynomial mult(IntegerPolynomial poly2)
-    {
-        int N = coeffs.length;
-        if (poly2.coeffs.length != N)
-        {
-            throw new IllegalArgumentException("Number of coefficients must be the same");
-        }
-
-        IntegerPolynomial c = multRecursive(poly2);
-
-        if (c.coeffs.length > N)
-        {
-            for (int k = N; k < c.coeffs.length; k++)
-            {
-                c.coeffs[k - N] += c.coeffs[k];
-            }
-            c.coeffs = Arrays.copyOf(c.coeffs, N);
-        }
-        return c;
-    }
-
-    public BigIntPolynomial mult(BigIntPolynomial poly2)
-    {
-        return new BigIntPolynomial(this).mult(poly2);
-    }
-
-    /**
-     * Karazuba multiplication
-     */
-    private IntegerPolynomial multRecursive(IntegerPolynomial poly2)
-    {
-        int[] a = coeffs;
-        int[] b = poly2.coeffs;
-
-        int n = poly2.coeffs.length;
-        if (n <= 32)
-        {
-            int cn = 2 * n - 1;
-            IntegerPolynomial c = new IntegerPolynomial(new int[cn]);
-            for (int k = 0; k < cn; k++)
-            {
-                for (int i = Math.max(0, k - n + 1); i <= Math.min(k, n - 1); i++)
-                {
-                    c.coeffs[k] += b[i] * a[k - i];
-                }
-            }
-            return c;
-        }
-        else
-        {
-            int n1 = n / 2;
-
-            IntegerPolynomial a1 = new IntegerPolynomial(Arrays.copyOf(a, n1));
-            IntegerPolynomial a2 = new IntegerPolynomial(Arrays.copyOfRange(a, n1, n));
-            IntegerPolynomial b1 = new IntegerPolynomial(Arrays.copyOf(b, n1));
-            IntegerPolynomial b2 = new IntegerPolynomial(Arrays.copyOfRange(b, n1, n));
-
-            IntegerPolynomial A = (IntegerPolynomial)a1.clone();
-            A.add(a2);
-            IntegerPolynomial B = (IntegerPolynomial)b1.clone();
-            B.add(b2);
-
-            IntegerPolynomial c1 = a1.multRecursive(b1);
-            IntegerPolynomial c2 = a2.multRecursive(b2);
-            IntegerPolynomial c3 = A.multRecursive(B);
-            c3.sub(c1);
-            c3.sub(c2);
-
-            IntegerPolynomial c = new IntegerPolynomial(2 * n - 1);
-            for (int i = 0; i < c1.coeffs.length; i++)
-            {
-                c.coeffs[i] = c1.coeffs[i];
-            }
-            for (int i = 0; i < c3.coeffs.length; i++)
-            {
-                c.coeffs[n1 + i] += c3.coeffs[i];
-            }
-            for (int i = 0; i < c2.coeffs.length; i++)
-            {
-                c.coeffs[2 * n1 + i] += c2.coeffs[i];
-            }
-            return c;
-        }
-    }
-
-    /**
-     * Computes the inverse mod <code>q; q</code> must be a power of 2.<br>
-     * Returns <code>null</code> if the polynomial is not invertible.
-     *
-     * @param q the modulus
-     * @return a new polynomial
-     */
-    public IntegerPolynomial invertFq(int q)
-    {
-        int N = coeffs.length;
-        int k = 0;
-        IntegerPolynomial b = new IntegerPolynomial(N + 1);
-        b.coeffs[0] = 1;
-        IntegerPolynomial c = new IntegerPolynomial(N + 1);
-        IntegerPolynomial f = new IntegerPolynomial(N + 1);
-        f.coeffs = Arrays.copyOf(coeffs, N + 1);
-        f.modPositive(2);
-        // set g(x) = x^N − 1
-        IntegerPolynomial g = new IntegerPolynomial(N + 1);
-        g.coeffs[0] = 1;
-        g.coeffs[N] = 1;
-        while (true)
-        {
-            while (f.coeffs[0] == 0)
-            {
-                for (int i = 1; i <= N; i++)
-                {
-                    f.coeffs[i - 1] = f.coeffs[i];   // f(x) = f(x) / x
-                    c.coeffs[N + 1 - i] = c.coeffs[N - i];   // c(x) = c(x) * x
-                }
-                f.coeffs[N] = 0;
-                c.coeffs[0] = 0;
-                k++;
-                if (f.equalsZero())
-                {
-                    return null;   // not invertible
-                }
-            }
-            if (f.equalsOne())
-            {
-                break;
-            }
-            if (f.degree() < g.degree())
-            {
-                // exchange f and g
-                IntegerPolynomial temp = f;
-                f = g;
-                g = temp;
-                // exchange b and c
-                temp = b;
-                b = c;
-                c = temp;
-            }
-            f.add(g, 2);
-            b.add(c, 2);
-        }
-
-        if (b.coeffs[N] != 0)
-        {
-            return null;
-        }
-        // Fq(x) = x^(N-k) * b(x)
-        IntegerPolynomial Fq = new IntegerPolynomial(N);
-        int j = 0;
-        k %= N;
-        for (int i = N - 1; i >= 0; i--)
-        {
-            j = i - k;
-            if (j < 0)
-            {
-                j += N;
-            }
-            Fq.coeffs[j] = b.coeffs[i];
-        }
-
-        return mod2ToModq(Fq, q);
-    }
-
-    /**
-     * Computes the inverse mod q from the inverse mod 2
-     *
-     * @param Fq
-     * @param q
-     * @return The inverse of this polynomial mod q
-     */
-    private IntegerPolynomial mod2ToModq(IntegerPolynomial Fq, int q)
-    {
-        if (Util.is64BitJVM() && q == 2048)
-        {
-            LongPolynomial2 thisLong = new LongPolynomial2(this);
-            LongPolynomial2 FqLong = new LongPolynomial2(Fq);
-            int v = 2;
-            while (v < q)
-            {
-                v *= 2;
-                LongPolynomial2 temp = (LongPolynomial2)FqLong.clone();
-                temp.mult2And(v - 1);
-                FqLong = thisLong.mult(FqLong).mult(FqLong);
-                temp.subAnd(FqLong, v - 1);
-                FqLong = temp;
-            }
-            return FqLong.toIntegerPolynomial();
-        }
-        else
-        {
-            int v = 2;
-            while (v < q)
-            {
-                v *= 2;
-                IntegerPolynomial temp = new IntegerPolynomial(Arrays.copyOf(Fq.coeffs, Fq.coeffs.length));
-                temp.mult2(v);
-                Fq = mult(Fq, v).mult(Fq, v);
-                temp.sub(Fq, v);
-                Fq = temp;
-            }
-            return Fq;
-        }
-    }
-
-    /**
-     * Computes the inverse mod 3.
-     * Returns <code>null</code> if the polynomial is not invertible.
-     *
-     * @return a new polynomial
-     */
-    public IntegerPolynomial invertF3()
-    {
-        int N = coeffs.length;
-        int k = 0;
-        IntegerPolynomial b = new IntegerPolynomial(N + 1);
-        b.coeffs[0] = 1;
-        IntegerPolynomial c = new IntegerPolynomial(N + 1);
-        IntegerPolynomial f = new IntegerPolynomial(N + 1);
-        f.coeffs = Arrays.copyOf(coeffs, N + 1);
-        f.modPositive(3);
-        // set g(x) = x^N − 1
-        IntegerPolynomial g = new IntegerPolynomial(N + 1);
-        g.coeffs[0] = -1;
-        g.coeffs[N] = 1;
-        while (true)
-        {
-            while (f.coeffs[0] == 0)
-            {
-                for (int i = 1; i <= N; i++)
-                {
-                    f.coeffs[i - 1] = f.coeffs[i];   // f(x) = f(x) / x
-                    c.coeffs[N + 1 - i] = c.coeffs[N - i];   // c(x) = c(x) * x
-                }
-                f.coeffs[N] = 0;
-                c.coeffs[0] = 0;
-                k++;
-                if (f.equalsZero())
-                {
-                    return null;   // not invertible
-                }
-            }
-            if (f.equalsAbsOne())
-            {
-                break;
-            }
-            if (f.degree() < g.degree())
-            {
-                // exchange f and g
-                IntegerPolynomial temp = f;
-                f = g;
-                g = temp;
-                // exchange b and c
-                temp = b;
-                b = c;
-                c = temp;
-            }
-            if (f.coeffs[0] == g.coeffs[0])
-            {
-                f.sub(g, 3);
-                b.sub(c, 3);
-            }
-            else
-            {
-                f.add(g, 3);
-                b.add(c, 3);
-            }
-        }
-
-        if (b.coeffs[N] != 0)
-        {
-            return null;
-        }
-        // Fp(x) = [+-] x^(N-k) * b(x)
-        IntegerPolynomial Fp = new IntegerPolynomial(N);
-        int j = 0;
-        k %= N;
-        for (int i = N - 1; i >= 0; i--)
-        {
-            j = i - k;
-            if (j < 0)
-            {
-                j += N;
-            }
-            Fp.coeffs[j] = f.coeffs[0] * b.coeffs[i];
-        }
-
-        Fp.ensurePositive(3);
-        return Fp;
-    }
-
-    /**
-     * Resultant of this polynomial with <code>x^n-1</code> using a probabilistic algorithm.
-     * <p>
-     * Unlike EESS, this implementation does not compute all resultants modulo primes
-     * such that their product exceeds the maximum possible resultant, but rather stops
-     * when <code>NUM_EQUAL_RESULTANTS</code> consecutive modular resultants are equal.<br>
-     * This means the return value may be incorrect. Experiments show this happens in
-     * about 1 out of 100 cases when <code>N=439</code> and <code>NUM_EQUAL_RESULTANTS=2</code>,
-     * so the likelyhood of leaving the loop too early is <code>(1/100)^(NUM_EQUAL_RESULTANTS-1)</code>.
-     * <p>
-     * Because of the above, callers must verify the output and try a different polynomial if necessary.
-     *
-     * @return <code>(rho, res)</code> satisfying <code>res = rho*this + t*(x^n-1)</code> for some integer <code>t</code>.
-     */
-    public Resultant resultant()
-    {
-        int N = coeffs.length;
-
-        // Compute resultants modulo prime numbers. Continue until NUM_EQUAL_RESULTANTS consecutive modular resultants are equal.
-        LinkedList<ModularResultant> modResultants = new LinkedList<ModularResultant>();
-        BigInteger prime = null;
-        BigInteger pProd = Constants.BIGINT_ONE;
-        BigInteger res = Constants.BIGINT_ONE;
-        int numEqual = 1;   // number of consecutive modular resultants equal to each other
-        Iterator<BigInteger> primes = BIGINT_PRIMES.iterator();
-        while (true)
-        {
-            prime = primes.hasNext() ? primes.next() : prime.nextProbablePrime();
-            ModularResultant crr = resultant(prime.intValue());
-            modResultants.add(crr);
-
-            BigInteger temp = pProd.multiply(prime);
-            BigIntEuclidean er = BigIntEuclidean.calculate(prime, pProd);
-            BigInteger resPrev = res;
-            res = res.multiply(er.x.multiply(prime));
-            BigInteger res2 = crr.res.multiply(er.y.multiply(pProd));
-            res = res.add(res2).mod(temp);
-            pProd = temp;
-
-            BigInteger pProd2 = pProd.divide(BigInteger.valueOf(2));
-            BigInteger pProd2n = pProd2.negate();
-            if (res.compareTo(pProd2) > 0)
-            {
-                res = res.subtract(pProd);
-            }
-            else if (res.compareTo(pProd2n) < 0)
-            {
-                res = res.add(pProd);
-            }
-
-            if (res.equals(resPrev))
-            {
-                numEqual++;
-                if (numEqual >= NUM_EQUAL_RESULTANTS)
-                {
-                    break;
-                }
-            }
-            else
-            {
-                numEqual = 1;
-            }
-        }
-
-        // Combine modular rho's to obtain the final rho.
-        // For efficiency, first combine all pairs of small resultants to bigger resultants,
-        // then combine pairs of those, etc. until only one is left.
-        while (modResultants.size() > 1)
-        {
-            ModularResultant modRes1 = modResultants.removeFirst();
-            ModularResultant modRes2 = modResultants.removeFirst();
-            ModularResultant modRes3 = ModularResultant.combineRho(modRes1, modRes2);
-            modResultants.addLast(modRes3);
-        }
-        BigIntPolynomial rhoP = modResultants.getFirst().rho;
-
-        BigInteger pProd2 = pProd.divide(BigInteger.valueOf(2));
-        BigInteger pProd2n = pProd2.negate();
-        if (res.compareTo(pProd2) > 0)
-        {
-            res = res.subtract(pProd);
-        }
-        if (res.compareTo(pProd2n) < 0)
-        {
-            res = res.add(pProd);
-        }
-
-        for (int i = 0; i < N; i++)
-        {
-            BigInteger c = rhoP.coeffs[i];
-            if (c.compareTo(pProd2) > 0)
-            {
-                rhoP.coeffs[i] = c.subtract(pProd);
-            }
-            if (c.compareTo(pProd2n) < 0)
-            {
-                rhoP.coeffs[i] = c.add(pProd);
-            }
-        }
-
-        return new Resultant(rhoP, res);
-    }
-
-    /**
-     * Multithreaded version of {@link #resultant()}.
-     *
-     * @return <code>(rho, res)</code> satisfying <code>res = rho*this + t*(x^n-1)</code> for some integer <code>t</code>.
-     */
-    public Resultant resultantMultiThread()
-    {
-        int N = coeffs.length;
-
-        // upper bound for resultant(f, g) = ||f, 2||^deg(g) * ||g, 2||^deg(f) = squaresum(f)^(N/2) * 2^(deg(f)/2) because g(x)=x^N-1
-        // see http://jondalon.mathematik.uni-osnabrueck.de/staff/phpages/brunsw/CompAlg.pdf chapter 3
-        BigInteger max = squareSum().pow((N + 1) / 2);
-        max = max.multiply(BigInteger.valueOf(2).pow((degree() + 1) / 2));
-        BigInteger max2 = max.multiply(BigInteger.valueOf(2));
-
-        // compute resultants modulo prime numbers
-        BigInteger prime = BigInteger.valueOf(10000);
-        BigInteger pProd = Constants.BIGINT_ONE;
-        LinkedBlockingQueue<Future<ModularResultant>> resultantTasks = new LinkedBlockingQueue<Future<ModularResultant>>();
-        Iterator<BigInteger> primes = BIGINT_PRIMES.iterator();
-        ExecutorService executor = Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors());
-        while (pProd.compareTo(max2) < 0)
-        {
-            if (primes.hasNext())
-            {
-                prime = primes.next();
-            }
-            else
-            {
-                prime = prime.nextProbablePrime();
-            }
-            Future<ModularResultant> task = executor.submit(new ModResultantTask(prime.intValue()));
-            resultantTasks.add(task);
-            pProd = pProd.multiply(prime);
-        }
-
-        // Combine modular resultants to obtain the resultant.
-        // For efficiency, first combine all pairs of small resultants to bigger resultants,
-        // then combine pairs of those, etc. until only one is left.
-        ModularResultant overallResultant = null;
-        while (!resultantTasks.isEmpty())
-        {
-            try
-            {
-                Future<ModularResultant> modRes1 = resultantTasks.take();
-                Future<ModularResultant> modRes2 = resultantTasks.poll();
-                if (modRes2 == null)
-                {
-                    // modRes1 is the only one left
-                    overallResultant = modRes1.get();
-                    break;
-                }
-                Future<ModularResultant> newTask = executor.submit(new CombineTask(modRes1.get(), modRes2.get()));
-                resultantTasks.add(newTask);
-            }
-            catch (Exception e)
-            {
-                throw new IllegalStateException(e.toString());
-            }
-        }
-        executor.shutdown();
-        BigInteger res = overallResultant.res;
-        BigIntPolynomial rhoP = overallResultant.rho;
-
-        BigInteger pProd2 = pProd.divide(BigInteger.valueOf(2));
-        BigInteger pProd2n = pProd2.negate();
-
-        if (res.compareTo(pProd2) > 0)
-        {
-            res = res.subtract(pProd);
-        }
-        if (res.compareTo(pProd2n) < 0)
-        {
-            res = res.add(pProd);
-        }
-
-        for (int i = 0; i < N; i++)
-        {
-            BigInteger c = rhoP.coeffs[i];
-            if (c.compareTo(pProd2) > 0)
-            {
-                rhoP.coeffs[i] = c.subtract(pProd);
-            }
-            if (c.compareTo(pProd2n) < 0)
-            {
-                rhoP.coeffs[i] = c.add(pProd);
-            }
-        }
-
-        return new Resultant(rhoP, res);
-    }
-
-    /**
-     * Resultant of this polynomial with <code>x^n-1 mod p</code>.
-     *
-     * @return <code>(rho, res)</code> satisfying <code>res = rho*this + t*(x^n-1) mod p</code> for some integer <code>t</code>.
-     */
-    public ModularResultant resultant(int p)
-    {
-        // Add a coefficient as the following operations involve polynomials of degree deg(f)+1
-        int[] fcoeffs = Arrays.copyOf(coeffs, coeffs.length + 1);
-        IntegerPolynomial f = new IntegerPolynomial(fcoeffs);
-        int N = fcoeffs.length;
-
-        IntegerPolynomial a = new IntegerPolynomial(N);
-        a.coeffs[0] = -1;
-        a.coeffs[N - 1] = 1;
-        IntegerPolynomial b = new IntegerPolynomial(f.coeffs);
-        IntegerPolynomial v1 = new IntegerPolynomial(N);
-        IntegerPolynomial v2 = new IntegerPolynomial(N);
-        v2.coeffs[0] = 1;
-        int da = N - 1;
-        int db = b.degree();
-        int ta = da;
-        int c = 0;
-        int r = 1;
-        while (db > 0)
-        {
-            c = Util.invert(b.coeffs[db], p);
-            c = (c * a.coeffs[da]) % p;
-            a.multShiftSub(b, c, da - db, p);
-            v1.multShiftSub(v2, c, da - db, p);
-
-            da = a.degree();
-            if (da < db)
-            {
-                r *= Util.pow(b.coeffs[db], ta - da, p);
-                r %= p;
-                if (ta % 2 == 1 && db % 2 == 1)
-                {
-                    r = (-r) % p;
-                }
-                IntegerPolynomial temp = a;
-                a = b;
-                b = temp;
-                int tempdeg = da;
-                da = db;
-                temp = v1;
-                v1 = v2;
-                v2 = temp;
-                ta = db;
-                db = tempdeg;
-            }
-        }
-        r *= Util.pow(b.coeffs[0], da, p);
-        r %= p;
-        c = Util.invert(b.coeffs[0], p);
-        v2.mult(c);
-        v2.mod(p);
-        v2.mult(r);
-        v2.mod(p);
-
-        // drop the highest coefficient so #coeffs matches the original input
-        v2.coeffs = Arrays.copyOf(v2.coeffs, v2.coeffs.length - 1);
-        return new ModularResultant(new BigIntPolynomial(v2), BigInteger.valueOf(r), BigInteger.valueOf(p));
-    }
-
-    /**
-     * Computes <code>this-b*c*(x^k) mod p</code> and stores the result in this polynomial.<br/>
-     * See steps 4a,4b in EESS algorithm 2.2.7.1.
-     *
-     * @param b
-     * @param c
-     * @param k
-     * @param p
-     */
-    private void multShiftSub(IntegerPolynomial b, int c, int k, int p)
-    {
-        int N = coeffs.length;
-        for (int i = k; i < N; i++)
-        {
-            coeffs[i] = (coeffs[i] - b.coeffs[i - k] * c) % p;
-        }
-    }
-
-    /**
-     * Adds the squares of all coefficients.
-     *
-     * @return the sum of squares
-     */
-    private BigInteger squareSum()
-    {
-        BigInteger sum = Constants.BIGINT_ZERO;
-        for (int i = 0; i < coeffs.length; i++)
-        {
-            sum = sum.add(BigInteger.valueOf(coeffs[i] * coeffs[i]));
-        }
-        return sum;
-    }
-
-    /**
-     * Returns the degree of the polynomial
-     *
-     * @return the degree
-     */
-    int degree()
-    {
-        int degree = coeffs.length - 1;
-        while (degree > 0 && coeffs[degree] == 0)
-        {
-            degree--;
-        }
-        return degree;
-    }
-
-    /**
-     * Adds another polynomial which can have a different number of coefficients,
-     * and takes the coefficient values mod <code>modulus</code>.
-     *
-     * @param b another polynomial
-     */
-    public void add(IntegerPolynomial b, int modulus)
-    {
-        add(b);
-        mod(modulus);
-    }
-
-    /**
-     * Adds another polynomial which can have a different number of coefficients.
-     *
-     * @param b another polynomial
-     */
-    public void add(IntegerPolynomial b)
-    {
-        if (b.coeffs.length > coeffs.length)
-        {
-            coeffs = Arrays.copyOf(coeffs, b.coeffs.length);
-        }
-        for (int i = 0; i < b.coeffs.length; i++)
-        {
-            coeffs[i] += b.coeffs[i];
-        }
-    }
-
-    /**
-     * Subtracts another polynomial which can have a different number of coefficients,
-     * and takes the coefficient values mod <code>modulus</code>.
-     *
-     * @param b another polynomial
-     */
-    public void sub(IntegerPolynomial b, int modulus)
-    {
-        sub(b);
-        mod(modulus);
-    }
-
-    /**
-     * Subtracts another polynomial which can have a different number of coefficients.
-     *
-     * @param b another polynomial
-     */
-    public void sub(IntegerPolynomial b)
-    {
-        if (b.coeffs.length > coeffs.length)
-        {
-            coeffs = Arrays.copyOf(coeffs, b.coeffs.length);
-        }
-        for (int i = 0; i < b.coeffs.length; i++)
-        {
-            coeffs[i] -= b.coeffs[i];
-        }
-    }
-
-    /**
-     * Subtracts a <code>int</code> from each coefficient. Does not return a new polynomial but modifies this polynomial.
-     *
-     * @param b
-     */
-    void sub(int b)
-    {
-        for (int i = 0; i < coeffs.length; i++)
-        {
-            coeffs[i] -= b;
-        }
-    }
-
-    /**
-     * Multiplies each coefficient by a <code>int</code>. Does not return a new polynomial but modifies this polynomial.
-     *
-     * @param factor
-     */
-    public void mult(int factor)
-    {
-        for (int i = 0; i < coeffs.length; i++)
-        {
-            coeffs[i] *= factor;
-        }
-    }
-
-    /**
-     * Multiplies each coefficient by a 2 and applies a modulus. Does not return a new polynomial but modifies this polynomial.
-     *
-     * @param modulus a modulus
-     */
-    private void mult2(int modulus)
-    {
-        for (int i = 0; i < coeffs.length; i++)
-        {
-            coeffs[i] *= 2;
-            coeffs[i] %= modulus;
-        }
-    }
-
-    /**
-     * Multiplies each coefficient by a 2 and applies a modulus. Does not return a new polynomial but modifies this polynomial.
-     *
-     * @param modulus a modulus
-     */
-    public void mult3(int modulus)
-    {
-        for (int i = 0; i < coeffs.length; i++)
-        {
-            coeffs[i] *= 3;
-            coeffs[i] %= modulus;
-        }
-    }
-
-    /**
-     * Divides each coefficient by <code>k</code> and rounds to the nearest integer. Does not return a new polynomial but modifies this polynomial.
-     *
-     * @param k the divisor
-     */
-    public void div(int k)
-    {
-        int k2 = (k + 1) / 2;
-        for (int i = 0; i < coeffs.length; i++)
-        {
-            coeffs[i] += coeffs[i] > 0 ? k2 : -k2;
-            coeffs[i] /= k;
-        }
-    }
-
-    /**
-     * Takes each coefficient modulo 3 such that all coefficients are ternary.
-     */
-    public void mod3()
-    {
-        for (int i = 0; i < coeffs.length; i++)
-        {
-            coeffs[i] %= 3;
-            if (coeffs[i] > 1)
-            {
-                coeffs[i] -= 3;
-            }
-            if (coeffs[i] < -1)
-            {
-                coeffs[i] += 3;
-            }
-        }
-    }
-
-    /**
-     * Ensures all coefficients are between 0 and <code>modulus-1</code>
-     *
-     * @param modulus a modulus
-     */
-    public void modPositive(int modulus)
-    {
-        mod(modulus);
-        ensurePositive(modulus);
-    }
-
-    /**
-     * Reduces all coefficients to the interval [-modulus/2, modulus/2)
-     */
-    void modCenter(int modulus)
-    {
-        mod(modulus);
-        for (int j = 0; j < coeffs.length; j++)
-        {
-            while (coeffs[j] < modulus / 2)
-            {
-                coeffs[j] += modulus;
-            }
-            while (coeffs[j] >= modulus / 2)
-            {
-                coeffs[j] -= modulus;
-            }
-        }
-    }
-
-    /**
-     * Takes each coefficient modulo <code>modulus</code>.
-     */
-    public void mod(int modulus)
-    {
-        for (int i = 0; i < coeffs.length; i++)
-        {
-            coeffs[i] %= modulus;
-        }
-    }
-
-    /**
-     * Adds <code>modulus</code> until all coefficients are above 0.
-     *
-     * @param modulus a modulus
-     */
-    public void ensurePositive(int modulus)
-    {
-        for (int i = 0; i < coeffs.length; i++)
-        {
-            while (coeffs[i] < 0)
-            {
-                coeffs[i] += modulus;
-            }
-        }
-    }
-
-    /**
-     * Computes the centered euclidean norm of the polynomial.
-     *
-     * @param q a modulus
-     * @return the centered norm
-     */
-    public long centeredNormSq(int q)
-    {
-        int N = coeffs.length;
-        IntegerPolynomial p = (IntegerPolynomial)clone();
-        p.shiftGap(q);
-
-        long sum = 0;
-        long sqSum = 0;
-        for (int i = 0; i != p.coeffs.length; i++)
-        {
-            int c = p.coeffs[i];
-            sum += c;
-            sqSum += c * c;
-        }
-
-        long centeredNormSq = sqSum - sum * sum / N;
-        return centeredNormSq;
-    }
-
-    /**
-     * Shifts all coefficients so the largest gap is centered around <code>-q/2</code>.
-     *
-     * @param q a modulus
-     */
-    void shiftGap(int q)
-    {
-        modCenter(q);
-
-        int[] sorted = Arrays.clone(coeffs);
-
-        sort(sorted);
-
-        int maxrange = 0;
-        int maxrangeStart = 0;
-        for (int i = 0; i < sorted.length - 1; i++)
-        {
-            int range = sorted[i + 1] - sorted[i];
-            if (range > maxrange)
-            {
-                maxrange = range;
-                maxrangeStart = sorted[i];
-            }
-        }
-
-        int pmin = sorted[0];
-        int pmax = sorted[sorted.length - 1];
-
-        int j = q - pmax + pmin;
-        int shift;
-        if (j > maxrange)
-        {
-            shift = (pmax + pmin) / 2;
-        }
-        else
-        {
-            shift = maxrangeStart + maxrange / 2 + q / 2;
-        }
-
-        sub(shift);
-    }
-
-    private void sort(int[] ints)
-    {
-        boolean swap = true;
-
-        while (swap)
-        {
-            swap = false;
-            for (int i = 0; i != ints.length - 1; i++)
-            {
-                if (ints[i] > ints[i+1])
-                {
-                    int tmp = ints[i];
-                    ints[i] = ints[i+1];
-                    ints[i+1] = tmp;
-                    swap = true;
-                }
-            }
-        }
-    }
-
-    /**
-     * Shifts the values of all coefficients to the interval <code>[-q/2, q/2]</code>.
-     *
-     * @param q a modulus
-     */
-    public void center0(int q)
-    {
-        for (int i = 0; i < coeffs.length; i++)
-        {
-            while (coeffs[i] < -q / 2)
-            {
-                coeffs[i] += q;
-            }
-            while (coeffs[i] > q / 2)
-            {
-                coeffs[i] -= q;
-            }
-        }
-    }
-
-    /**
-     * Returns the sum of all coefficients, i.e. evaluates the polynomial at 0.
-     *
-     * @return the sum of all coefficients
-     */
-    public int sumCoeffs()
-    {
-        int sum = 0;
-        for (int i = 0; i < coeffs.length; i++)
-        {
-            sum += coeffs[i];
-        }
-        return sum;
-    }
-
-    /**
-     * Tests if <code>p(x) = 0</code>.
-     *
-     * @return true iff all coefficients are zeros
-     */
-    private boolean equalsZero()
-    {
-        for (int i = 0; i < coeffs.length; i++)
-        {
-            if (coeffs[i] != 0)
-            {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    /**
-     * Tests if <code>p(x) = 1</code>.
-     *
-     * @return true iff all coefficients are equal to zero, except for the lowest coefficient which must equal 1
-     */
-    public boolean equalsOne()
-    {
-        for (int i = 1; i < coeffs.length; i++)
-        {
-            if (coeffs[i] != 0)
-            {
-                return false;
-            }
-        }
-        return coeffs[0] == 1;
-    }
-
-    /**
-     * Tests if <code>|p(x)| = 1</code>.
-     *
-     * @return true iff all coefficients are equal to zero, except for the lowest coefficient which must equal 1 or -1
-     */
-    private boolean equalsAbsOne()
-    {
-        for (int i = 1; i < coeffs.length; i++)
-        {
-            if (coeffs[i] != 0)
-            {
-                return false;
-            }
-        }
-        return Math.abs(coeffs[0]) == 1;
-    }
-
-    /**
-     * Counts the number of coefficients equal to an integer
-     *
-     * @param value an integer
-     * @return the number of coefficients equal to <code>value</code>
-     */
-    public int count(int value)
-    {
-        int count = 0;
-        for (int i = 0; i != coeffs.length; i++)
-        {
-            if (coeffs[i] == value)
-            {
-                count++;
-            }
-        }
-        return count;
-    }
-
-    /**
-     * Multiplication by <code>X</code> in <code>Z[X]/Z[X^n-1]</code>.
-     */
-    public void rotate1()
-    {
-        int clast = coeffs[coeffs.length - 1];
-        for (int i = coeffs.length - 1; i > 0; i--)
-        {
-            coeffs[i] = coeffs[i - 1];
-        }
-        coeffs[0] = clast;
-    }
-
-    public void clear()
-    {
-        for (int i = 0; i < coeffs.length; i++)
-        {
-            coeffs[i] = 0;
-        }
-    }
-
-    public IntegerPolynomial toIntegerPolynomial()
-    {
-        return (IntegerPolynomial)clone();
-    }
-
-    public Object clone()
-    {
-        return new IntegerPolynomial(coeffs.clone());
-    }
-
-    public boolean equals(Object obj)
-    {
-        if (obj instanceof IntegerPolynomial)
-        {
-            return Arrays.areEqual(coeffs, ((IntegerPolynomial)obj).coeffs);
-        }
-        else
-        {
-            return false;
-        }
-    }
-
-    /**
-     * Calls {@link IntegerPolynomial#resultant(int)
-     */
-    private class ModResultantTask
-        implements Callable<ModularResultant>
-    {
-        private int modulus;
-
-        private ModResultantTask(int modulus)
-        {
-            this.modulus = modulus;
-        }
-
-        public ModularResultant call()
-        {
-            return resultant(modulus);
-        }
-    }
-
-    /**
-     * Calls {@link ModularResultant#combineRho(ModularResultant, ModularResultant)
-     */
-    private class CombineTask
-        implements Callable<ModularResultant>
-    {
-        private ModularResultant modRes1;
-        private ModularResultant modRes2;
-
-        private CombineTask(ModularResultant modRes1, ModularResultant modRes2)
-        {
-            this.modRes1 = modRes1;
-            this.modRes2 = modRes2;
-        }
-
-        public ModularResultant call()
-        {
-            return ModularResultant.combineRho(modRes1, modRes2);
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/math/ntru/polynomial/LongPolynomial2.java b/bcprov/src/main/java/org/bouncycastle/pqc/math/ntru/polynomial/LongPolynomial2.java
deleted file mode 100644
index d71615a..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/math/ntru/polynomial/LongPolynomial2.java
+++ /dev/null
@@ -1,255 +0,0 @@
-package org.bouncycastle.pqc.math.ntru.polynomial;
-
-import org.bouncycastle.util.Arrays;
-
-/**
- * A polynomial class that combines two coefficients into one <code>long</code> value for
- * faster multiplication in 64 bit environments.<br>
- * Coefficients can be between 0 and 2047 and are stored in pairs in the bits 0..10 and 24..34 of a <code>long</code> number.
- */
-public class LongPolynomial2
-{
-    private long[] coeffs;   // each representing two coefficients in the original IntegerPolynomial
-    private int numCoeffs;
-
-    /**
-     * Constructs a <code>LongPolynomial2</code> from a <code>IntegerPolynomial</code>. The two polynomials are independent of each other.
-     *
-     * @param p the original polynomial. Coefficients must be between 0 and 2047.
-     */
-    public LongPolynomial2(IntegerPolynomial p)
-    {
-        numCoeffs = p.coeffs.length;
-        coeffs = new long[(numCoeffs + 1) / 2];
-        int idx = 0;
-        for (int pIdx = 0; pIdx < numCoeffs; )
-        {
-            int c0 = p.coeffs[pIdx++];
-            while (c0 < 0)
-            {
-                c0 += 2048;
-            }
-            long c1 = pIdx < numCoeffs ? p.coeffs[pIdx++] : 0;
-            while (c1 < 0)
-            {
-                c1 += 2048;
-            }
-            coeffs[idx] = c0 + (c1 << 24);
-            idx++;
-        }
-    }
-
-    private LongPolynomial2(long[] coeffs)
-    {
-        this.coeffs = coeffs;
-    }
-
-    private LongPolynomial2(int N)
-    {
-        coeffs = new long[N];
-    }
-
-    /**
-     * Multiplies the polynomial with another, taking the indices mod N and the values mod 2048.
-     */
-    public LongPolynomial2 mult(LongPolynomial2 poly2)
-    {
-        int N = coeffs.length;
-        if (poly2.coeffs.length != N || numCoeffs != poly2.numCoeffs)
-        {
-            throw new IllegalArgumentException("Number of coefficients must be the same");
-        }
-
-        LongPolynomial2 c = multRecursive(poly2);
-
-        if (c.coeffs.length > N)
-        {
-            if (numCoeffs % 2 == 0)
-            {
-                for (int k = N; k < c.coeffs.length; k++)
-                {
-                    c.coeffs[k - N] = (c.coeffs[k - N] + c.coeffs[k]) & 0x7FF0007FFL;
-                }
-                c.coeffs = Arrays.copyOf(c.coeffs, N);
-            }
-            else
-            {
-                for (int k = N; k < c.coeffs.length; k++)
-                {
-                    c.coeffs[k - N] = c.coeffs[k - N] + (c.coeffs[k - 1] >> 24);
-                    c.coeffs[k - N] = c.coeffs[k - N] + ((c.coeffs[k] & 2047) << 24);
-                    c.coeffs[k - N] &= 0x7FF0007FFL;
-                }
-                c.coeffs = Arrays.copyOf(c.coeffs, N);
-                c.coeffs[c.coeffs.length - 1] &= 2047;
-            }
-        }
-
-        c = new LongPolynomial2(c.coeffs);
-        c.numCoeffs = numCoeffs;
-        return c;
-    }
-
-    public IntegerPolynomial toIntegerPolynomial()
-    {
-        int[] intCoeffs = new int[numCoeffs];
-        int uIdx = 0;
-        for (int i = 0; i < coeffs.length; i++)
-        {
-            intCoeffs[uIdx++] = (int)(coeffs[i] & 2047);
-            if (uIdx < numCoeffs)
-            {
-                intCoeffs[uIdx++] = (int)((coeffs[i] >> 24) & 2047);
-            }
-        }
-        return new IntegerPolynomial(intCoeffs);
-    }
-
-    /**
-     * Karazuba multiplication
-     */
-    private LongPolynomial2 multRecursive(LongPolynomial2 poly2)
-    {
-        long[] a = coeffs;
-        long[] b = poly2.coeffs;
-
-        int n = poly2.coeffs.length;
-        if (n <= 32)
-        {
-            int cn = 2 * n;
-            LongPolynomial2 c = new LongPolynomial2(new long[cn]);
-            for (int k = 0; k < cn; k++)
-            {
-                for (int i = Math.max(0, k - n + 1); i <= Math.min(k, n - 1); i++)
-                {
-                    long c0 = a[k - i] * b[i];
-                    long cu = c0 & 0x7FF000000L + (c0 & 2047);
-                    long co = (c0 >>> 48) & 2047;
-
-                    c.coeffs[k] = (c.coeffs[k] + cu) & 0x7FF0007FFL;
-                    c.coeffs[k + 1] = (c.coeffs[k + 1] + co) & 0x7FF0007FFL;
-                }
-            }
-            return c;
-        }
-        else
-        {
-            int n1 = n / 2;
-
-            LongPolynomial2 a1 = new LongPolynomial2(Arrays.copyOf(a, n1));
-            LongPolynomial2 a2 = new LongPolynomial2(Arrays.copyOfRange(a, n1, n));
-            LongPolynomial2 b1 = new LongPolynomial2(Arrays.copyOf(b, n1));
-            LongPolynomial2 b2 = new LongPolynomial2(Arrays.copyOfRange(b, n1, n));
-
-            LongPolynomial2 A = (LongPolynomial2)a1.clone();
-            A.add(a2);
-            LongPolynomial2 B = (LongPolynomial2)b1.clone();
-            B.add(b2);
-
-            LongPolynomial2 c1 = a1.multRecursive(b1);
-            LongPolynomial2 c2 = a2.multRecursive(b2);
-            LongPolynomial2 c3 = A.multRecursive(B);
-            c3.sub(c1);
-            c3.sub(c2);
-
-            LongPolynomial2 c = new LongPolynomial2(2 * n);
-            for (int i = 0; i < c1.coeffs.length; i++)
-            {
-                c.coeffs[i] = c1.coeffs[i] & 0x7FF0007FFL;
-            }
-            for (int i = 0; i < c3.coeffs.length; i++)
-            {
-                c.coeffs[n1 + i] = (c.coeffs[n1 + i] + c3.coeffs[i]) & 0x7FF0007FFL;
-            }
-            for (int i = 0; i < c2.coeffs.length; i++)
-            {
-                c.coeffs[2 * n1 + i] = (c.coeffs[2 * n1 + i] + c2.coeffs[i]) & 0x7FF0007FFL;
-            }
-            return c;
-        }
-    }
-
-    /**
-     * Adds another polynomial which can have a different number of coefficients.
-     *
-     * @param b another polynomial
-     */
-    private void add(LongPolynomial2 b)
-    {
-        if (b.coeffs.length > coeffs.length)
-        {
-            coeffs = Arrays.copyOf(coeffs, b.coeffs.length);
-        }
-        for (int i = 0; i < b.coeffs.length; i++)
-        {
-            coeffs[i] = (coeffs[i] + b.coeffs[i]) & 0x7FF0007FFL;
-        }
-    }
-
-    /**
-     * Subtracts another polynomial which can have a different number of coefficients.
-     *
-     * @param b another polynomial
-     */
-    private void sub(LongPolynomial2 b)
-    {
-        if (b.coeffs.length > coeffs.length)
-        {
-            coeffs = Arrays.copyOf(coeffs, b.coeffs.length);
-        }
-        for (int i = 0; i < b.coeffs.length; i++)
-        {
-            coeffs[i] = (0x0800000800000L + coeffs[i] - b.coeffs[i]) & 0x7FF0007FFL;
-        }
-    }
-
-    /**
-     * Subtracts another polynomial which must have the same number of coefficients,
-     * and applies an AND mask to the upper and lower halves of each coefficients.
-     *
-     * @param b    another polynomial
-     * @param mask a bit mask less than 2048 to apply to each 11-bit coefficient
-     */
-    public void subAnd(LongPolynomial2 b, int mask)
-    {
-        long longMask = (((long)mask) << 24) + mask;
-        for (int i = 0; i < b.coeffs.length; i++)
-        {
-            coeffs[i] = (0x0800000800000L + coeffs[i] - b.coeffs[i]) & longMask;
-        }
-    }
-
-    /**
-     * Multiplies this polynomial by 2 and applies an AND mask to the upper and
-     * lower halves of each coefficients.
-     *
-     * @param mask a bit mask less than 2048 to apply to each 11-bit coefficient
-     */
-    public void mult2And(int mask)
-    {
-        long longMask = (((long)mask) << 24) + mask;
-        for (int i = 0; i < coeffs.length; i++)
-        {
-            coeffs[i] = (coeffs[i] << 1) & longMask;
-        }
-    }
-
-    public Object clone()
-    {
-        LongPolynomial2 p = new LongPolynomial2(coeffs.clone());
-        p.numCoeffs = numCoeffs;
-        return p;
-    }
-
-    public boolean equals(Object obj)
-    {
-        if (obj instanceof LongPolynomial2)
-        {
-            return Arrays.areEqual(coeffs, ((LongPolynomial2)obj).coeffs);
-        }
-        else
-        {
-            return false;
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/math/ntru/polynomial/LongPolynomial5.java b/bcprov/src/main/java/org/bouncycastle/pqc/math/ntru/polynomial/LongPolynomial5.java
deleted file mode 100644
index c804cc8..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/math/ntru/polynomial/LongPolynomial5.java
+++ /dev/null
@@ -1,149 +0,0 @@
-package org.bouncycastle.pqc.math.ntru.polynomial;
-
-import org.bouncycastle.util.Arrays;
-
-/**
- * A polynomial class that combines five coefficients into one <code>long</code> value for
- * faster multiplication by a ternary polynomial.<br>
- * Coefficients can be between 0 and 2047 and are stored in bits 0..11, 12..23, ..., 48..59 of a <code>long</code> number.
- */
-public class LongPolynomial5
-{
-    private long[] coeffs;   // groups of 5 coefficients
-    private int numCoeffs;
-
-    /**
-     * Constructs a <code>LongPolynomial5</code> from a <code>IntegerPolynomial</code>. The two polynomials are independent of each other.
-     *
-     * @param p the original polynomial. Coefficients must be between 0 and 2047.
-     */
-    public LongPolynomial5(IntegerPolynomial p)
-    {
-        numCoeffs = p.coeffs.length;
-
-        coeffs = new long[(numCoeffs + 4) / 5];
-        int cIdx = 0;
-        int shift = 0;
-        for (int i = 0; i < numCoeffs; i++)
-        {
-            coeffs[cIdx] |= ((long)p.coeffs[i]) << shift;
-            shift += 12;
-            if (shift >= 60)
-            {
-                shift = 0;
-                cIdx++;
-            }
-        }
-    }
-
-    private LongPolynomial5(long[] coeffs, int numCoeffs)
-    {
-        this.coeffs = coeffs;
-        this.numCoeffs = numCoeffs;
-    }
-
-    /**
-     * Multiplies the polynomial with a <code>TernaryPolynomial</code>, taking the indices mod N and the values mod 2048.
-     */
-    public LongPolynomial5 mult(TernaryPolynomial poly2)
-    {
-        long[][] prod = new long[5][coeffs.length + (poly2.size() + 4) / 5 - 1];   // intermediate results, the subarrays are shifted by 0,...,4 coefficients
-
-        // multiply ones
-        int[] ones = poly2.getOnes();
-        for (int idx = 0; idx != ones.length; idx++)
-        {
-            int pIdx = ones[idx];
-            int cIdx = pIdx / 5;
-            int m = pIdx - cIdx * 5;   // m = pIdx % 5
-            for (int i = 0; i < coeffs.length; i++)
-            {
-                prod[m][cIdx] = (prod[m][cIdx] + coeffs[i]) & 0x7FF7FF7FF7FF7FFL;
-                cIdx++;
-            }
-        }
-
-        // multiply negative ones
-        int[] negOnes = poly2.getNegOnes();
-        for (int idx = 0; idx != negOnes.length; idx++)
-        {
-            int pIdx = negOnes[idx];
-            int cIdx = pIdx / 5;
-            int m = pIdx - cIdx * 5;   // m = pIdx % 5
-            for (int i = 0; i < coeffs.length; i++)
-            {
-                prod[m][cIdx] = (0x800800800800800L + prod[m][cIdx] - coeffs[i]) & 0x7FF7FF7FF7FF7FFL;
-                cIdx++;
-            }
-        }
-
-        // combine shifted coefficients (5 arrays) into a single array of length prod[*].length+1
-        long[] cCoeffs = Arrays.copyOf(prod[0], prod[0].length + 1);
-        for (int m = 1; m <= 4; m++)
-        {
-            int shift = m * 12;
-            int shift60 = 60 - shift;
-            long mask = (1L << shift60) - 1;
-            int pLen = prod[m].length;
-            for (int i = 0; i < pLen; i++)
-            {
-                long upper, lower;
-                upper = prod[m][i] >> shift60;
-                lower = prod[m][i] & mask;
-
-                cCoeffs[i] = (cCoeffs[i] + (lower << shift)) & 0x7FF7FF7FF7FF7FFL;
-                int nextIdx = i + 1;
-                cCoeffs[nextIdx] = (cCoeffs[nextIdx] + upper) & 0x7FF7FF7FF7FF7FFL;
-            }
-        }
-
-        // reduce indices of cCoeffs modulo numCoeffs
-        int shift = 12 * (numCoeffs % 5);
-        for (int cIdx = coeffs.length - 1; cIdx < cCoeffs.length; cIdx++)
-        {
-            long iCoeff;   // coefficient to shift into the [0..numCoeffs-1] range
-            int newIdx;
-            if (cIdx == coeffs.length - 1)
-            {
-                iCoeff = numCoeffs == 5 ? 0 : cCoeffs[cIdx] >> shift;
-                newIdx = 0;
-            }
-            else
-            {
-                iCoeff = cCoeffs[cIdx];
-                newIdx = cIdx * 5 - numCoeffs;
-            }
-
-            int base = newIdx / 5;
-            int m = newIdx - base * 5;   // m = newIdx % 5
-            long lower = iCoeff << (12 * m);
-            long upper = iCoeff >> (12 * (5 - m));
-            cCoeffs[base] = (cCoeffs[base] + lower) & 0x7FF7FF7FF7FF7FFL;
-            int base1 = base + 1;
-            if (base1 < coeffs.length)
-            {
-                cCoeffs[base1] = (cCoeffs[base1] + upper) & 0x7FF7FF7FF7FF7FFL;
-            }
-        }
-
-        return new LongPolynomial5(cCoeffs, numCoeffs);
-    }
-
-    public IntegerPolynomial toIntegerPolynomial()
-    {
-        int[] intCoeffs = new int[numCoeffs];
-        int cIdx = 0;
-        int shift = 0;
-        for (int i = 0; i < numCoeffs; i++)
-        {
-            intCoeffs[i] = (int)((coeffs[cIdx] >> shift) & 2047);
-            shift += 12;
-            if (shift >= 60)
-            {
-                shift = 0;
-                cIdx++;
-            }
-        }
-        return new IntegerPolynomial(intCoeffs);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/math/ntru/polynomial/ModularResultant.java b/bcprov/src/main/java/org/bouncycastle/pqc/math/ntru/polynomial/ModularResultant.java
deleted file mode 100644
index 5f77192..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/math/ntru/polynomial/ModularResultant.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package org.bouncycastle.pqc.math.ntru.polynomial;
-
-import java.math.BigInteger;
-
-import org.bouncycastle.pqc.math.ntru.euclid.BigIntEuclidean;
-
-/**
- * A resultant modulo a <code>BigInteger</code>
- */
-public class ModularResultant
-    extends Resultant
-{
-    BigInteger modulus;
-
-    ModularResultant(BigIntPolynomial rho, BigInteger res, BigInteger modulus)
-    {
-        super(rho, res);
-        this.modulus = modulus;
-    }
-
-    /**
-     * Calculates a <code>rho</code> modulo <code>m1*m2</code> from
-     * two resultants whose <code>rho</code>s are modulo <code>m1</code> and <code>m2</code>.<br/>
-     * </code>res</code> is set to <code>null</code>.
-     *
-     * @param modRes1
-     * @param modRes2
-     * @return <code>rho</code> modulo <code>modRes1.modulus * modRes2.modulus</code>, and <code>null</code> for </code>res</code>.
-     */
-    static ModularResultant combineRho(ModularResultant modRes1, ModularResultant modRes2)
-    {
-        BigInteger mod1 = modRes1.modulus;
-        BigInteger mod2 = modRes2.modulus;
-        BigInteger prod = mod1.multiply(mod2);
-        BigIntEuclidean er = BigIntEuclidean.calculate(mod2, mod1);
-
-        BigIntPolynomial rho1 = (BigIntPolynomial)modRes1.rho.clone();
-        rho1.mult(er.x.multiply(mod2));
-        BigIntPolynomial rho2 = (BigIntPolynomial)modRes2.rho.clone();
-        rho2.mult(er.y.multiply(mod1));
-        rho1.add(rho2);
-        rho1.mod(prod);
-
-        return new ModularResultant(rho1, null, prod);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/math/ntru/polynomial/Polynomial.java b/bcprov/src/main/java/org/bouncycastle/pqc/math/ntru/polynomial/Polynomial.java
deleted file mode 100644
index 69193e3..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/math/ntru/polynomial/Polynomial.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package org.bouncycastle.pqc.math.ntru.polynomial;
-
-public interface Polynomial
-{
-
-    /**
-     * Multiplies the polynomial by an <code>IntegerPolynomial</code>,
-     * taking the indices mod <code>N</code>.
-     *
-     * @param poly2 a polynomial
-     * @return the product of the two polynomials
-     */
-    IntegerPolynomial mult(IntegerPolynomial poly2);
-
-    /**
-     * Multiplies the polynomial by an <code>IntegerPolynomial</code>,
-     * taking the coefficient values mod <code>modulus</code> and the indices mod <code>N</code>.
-     *
-     * @param poly2   a polynomial
-     * @param modulus a modulus to apply
-     * @return the product of the two polynomials
-     */
-    IntegerPolynomial mult(IntegerPolynomial poly2, int modulus);
-
-    /**
-     * Returns a polynomial that is equal to this polynomial (in the sense that {@link #mult(IntegerPolynomial, int)}
-     * returns equal <code>IntegerPolynomial</code>s). The new polynomial is guaranteed to be independent of the original.
-     *
-     * @return a new <code>IntegerPolynomial</code>.
-     */
-    IntegerPolynomial toIntegerPolynomial();
-
-    /**
-     * Multiplies the polynomial by a <code>BigIntPolynomial</code>, taking the indices mod N. Does not
-     * change this polynomial but returns the result as a new polynomial.<br>
-     * Both polynomials must have the same number of coefficients.
-     *
-     * @param poly2 the polynomial to multiply by
-     * @return a new polynomial
-     */
-    BigIntPolynomial mult(BigIntPolynomial poly2);
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/math/ntru/polynomial/ProductFormPolynomial.java b/bcprov/src/main/java/org/bouncycastle/pqc/math/ntru/polynomial/ProductFormPolynomial.java
deleted file mode 100644
index dd18902..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/math/ntru/polynomial/ProductFormPolynomial.java
+++ /dev/null
@@ -1,153 +0,0 @@
-package org.bouncycastle.pqc.math.ntru.polynomial;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.security.SecureRandom;
-
-import org.bouncycastle.util.Arrays;
-
-/**
- * A polynomial of the form <code>f1*f2+f3</code>, where
- * <code>f1,f2,f3</code> are very sparsely populated ternary polynomials.
- */
-public class ProductFormPolynomial
-    implements Polynomial
-{
-    private SparseTernaryPolynomial f1, f2, f3;
-
-    public ProductFormPolynomial(SparseTernaryPolynomial f1, SparseTernaryPolynomial f2, SparseTernaryPolynomial f3)
-    {
-        this.f1 = f1;
-        this.f2 = f2;
-        this.f3 = f3;
-    }
-
-    public static ProductFormPolynomial generateRandom(int N, int df1, int df2, int df3Ones, int df3NegOnes, SecureRandom random)
-    {
-        SparseTernaryPolynomial f1 = SparseTernaryPolynomial.generateRandom(N, df1, df1, random);
-        SparseTernaryPolynomial f2 = SparseTernaryPolynomial.generateRandom(N, df2, df2, random);
-        SparseTernaryPolynomial f3 = SparseTernaryPolynomial.generateRandom(N, df3Ones, df3NegOnes, random);
-        return new ProductFormPolynomial(f1, f2, f3);
-    }
-
-    public static ProductFormPolynomial fromBinary(byte[] data, int N, int df1, int df2, int df3Ones, int df3NegOnes)
-        throws IOException
-    {
-        return fromBinary(new ByteArrayInputStream(data), N, df1, df2, df3Ones, df3NegOnes);
-    }
-
-    public static ProductFormPolynomial fromBinary(InputStream is, int N, int df1, int df2, int df3Ones, int df3NegOnes)
-        throws IOException
-    {
-        SparseTernaryPolynomial f1;
-
-        f1 = SparseTernaryPolynomial.fromBinary(is, N, df1, df1);
-        SparseTernaryPolynomial f2 = SparseTernaryPolynomial.fromBinary(is, N, df2, df2);
-        SparseTernaryPolynomial f3 = SparseTernaryPolynomial.fromBinary(is, N, df3Ones, df3NegOnes);
-        return new ProductFormPolynomial(f1, f2, f3);
-    }
-
-    public byte[] toBinary()
-    {
-        byte[] f1Bin = f1.toBinary();
-        byte[] f2Bin = f2.toBinary();
-        byte[] f3Bin = f3.toBinary();
-
-        byte[] all = Arrays.copyOf(f1Bin, f1Bin.length + f2Bin.length + f3Bin.length);
-        System.arraycopy(f2Bin, 0, all, f1Bin.length, f2Bin.length);
-        System.arraycopy(f3Bin, 0, all, f1Bin.length + f2Bin.length, f3Bin.length);
-        return all;
-    }
-
-    public IntegerPolynomial mult(IntegerPolynomial b)
-    {
-        IntegerPolynomial c = f1.mult(b);
-        c = f2.mult(c);
-        c.add(f3.mult(b));
-        return c;
-    }
-
-    public BigIntPolynomial mult(BigIntPolynomial b)
-    {
-        BigIntPolynomial c = f1.mult(b);
-        c = f2.mult(c);
-        c.add(f3.mult(b));
-        return c;
-    }
-
-    public IntegerPolynomial toIntegerPolynomial()
-    {
-        IntegerPolynomial i = f1.mult(f2.toIntegerPolynomial());
-        i.add(f3.toIntegerPolynomial());
-        return i;
-    }
-
-    public IntegerPolynomial mult(IntegerPolynomial poly2, int modulus)
-    {
-        IntegerPolynomial c = mult(poly2);
-        c.mod(modulus);
-        return c;
-    }
-
-    public int hashCode()
-    {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + ((f1 == null) ? 0 : f1.hashCode());
-        result = prime * result + ((f2 == null) ? 0 : f2.hashCode());
-        result = prime * result + ((f3 == null) ? 0 : f3.hashCode());
-        return result;
-    }
-
-    public boolean equals(Object obj)
-    {
-        if (this == obj)
-        {
-            return true;
-        }
-        if (obj == null)
-        {
-            return false;
-        }
-        if (getClass() != obj.getClass())
-        {
-            return false;
-        }
-        ProductFormPolynomial other = (ProductFormPolynomial)obj;
-        if (f1 == null)
-        {
-            if (other.f1 != null)
-            {
-                return false;
-            }
-        }
-        else if (!f1.equals(other.f1))
-        {
-            return false;
-        }
-        if (f2 == null)
-        {
-            if (other.f2 != null)
-            {
-                return false;
-            }
-        }
-        else if (!f2.equals(other.f2))
-        {
-            return false;
-        }
-        if (f3 == null)
-        {
-            if (other.f3 != null)
-            {
-                return false;
-            }
-        }
-        else if (!f3.equals(other.f3))
-        {
-            return false;
-        }
-        return true;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/math/ntru/polynomial/Resultant.java b/bcprov/src/main/java/org/bouncycastle/pqc/math/ntru/polynomial/Resultant.java
deleted file mode 100644
index ec58577..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/math/ntru/polynomial/Resultant.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package org.bouncycastle.pqc.math.ntru.polynomial;
-
-import java.math.BigInteger;
-
-/**
- * Contains a resultant and a polynomial <code>rho</code> such that
- * <code>res = rho*this + t*(x^n-1) for some integer t</code>.
- *
- * @see IntegerPolynomial#resultant()
- * @see IntegerPolynomial#resultant(int)
- */
-public class Resultant
-{
-    /**
-     * A polynomial such that <code>res = rho*this + t*(x^n-1) for some integer t</code>
-     */
-    public BigIntPolynomial rho;
-    /**
-     * Resultant of a polynomial with <code>x^n-1</code>
-     */
-    public BigInteger res;
-
-    Resultant(BigIntPolynomial rho, BigInteger res)
-    {
-        this.rho = rho;
-        this.res = res;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/math/ntru/polynomial/SparseTernaryPolynomial.java b/bcprov/src/main/java/org/bouncycastle/pqc/math/ntru/polynomial/SparseTernaryPolynomial.java
deleted file mode 100644
index 3c91339..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/math/ntru/polynomial/SparseTernaryPolynomial.java
+++ /dev/null
@@ -1,320 +0,0 @@
-package org.bouncycastle.pqc.math.ntru.polynomial;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.math.BigInteger;
-import java.security.SecureRandom;
-
-import org.bouncycastle.pqc.math.ntru.util.ArrayEncoder;
-import org.bouncycastle.pqc.math.ntru.util.Util;
-import org.bouncycastle.util.Arrays;
-
-/**
- * A <code>TernaryPolynomial</code> with a "low" number of nonzero coefficients.
- */
-public class SparseTernaryPolynomial
-    implements TernaryPolynomial
-{
-    /**
-     * Number of bits to use for each coefficient. Determines the upper bound for <code>N</code>.
-     */
-    private static final int BITS_PER_INDEX = 11;
-
-    private int N;
-    private int[] ones;
-    private int[] negOnes;
-
-    /**
-     * Constructs a new polynomial.
-     *
-     * @param N       total number of coefficients including zeros
-     * @param ones    indices of coefficients equal to 1
-     * @param negOnes indices of coefficients equal to -1
-     */
-    SparseTernaryPolynomial(int N, int[] ones, int[] negOnes)
-    {
-        this.N = N;
-        this.ones = ones;
-        this.negOnes = negOnes;
-    }
-
-    /**
-     * Constructs a <code>DenseTernaryPolynomial</code> from a <code>IntegerPolynomial</code>. The two polynomials are
-     * independent of each other.
-     *
-     * @param intPoly the original polynomial
-     */
-    public SparseTernaryPolynomial(IntegerPolynomial intPoly)
-    {
-        this(intPoly.coeffs);
-    }
-
-    /**
-     * Constructs a new <code>SparseTernaryPolynomial</code> with a given set of coefficients.
-     *
-     * @param coeffs the coefficients
-     */
-    public SparseTernaryPolynomial(int[] coeffs)
-    {
-        N = coeffs.length;
-        ones = new int[N];
-        negOnes = new int[N];
-        int onesIdx = 0;
-        int negOnesIdx = 0;
-        for (int i = 0; i < N; i++)
-        {
-            int c = coeffs[i];
-            switch (c)
-            {
-            case 1:
-                ones[onesIdx++] = i;
-                break;
-            case -1:
-                negOnes[negOnesIdx++] = i;
-                break;
-            case 0:
-                break;
-            default:
-                throw new IllegalArgumentException("Illegal value: " + c + ", must be one of {-1, 0, 1}");
-            }
-        }
-        ones = Arrays.copyOf(ones, onesIdx);
-        negOnes = Arrays.copyOf(negOnes, negOnesIdx);
-    }
-
-    /**
-     * Decodes a byte array encoded with {@link #toBinary()} to a ploynomial.
-     *
-     * @param is         an input stream containing an encoded polynomial
-     * @param N          number of coefficients including zeros
-     * @param numOnes    number of coefficients equal to 1
-     * @param numNegOnes number of coefficients equal to -1
-     * @return the decoded polynomial
-     * @throws IOException
-     */
-    public static SparseTernaryPolynomial fromBinary(InputStream is, int N, int numOnes, int numNegOnes)
-        throws IOException
-    {
-        int maxIndex = 1 << BITS_PER_INDEX;
-        int bitsPerIndex = 32 - Integer.numberOfLeadingZeros(maxIndex - 1);
-
-        int data1Len = (numOnes * bitsPerIndex + 7) / 8;
-        byte[] data1 = Util.readFullLength(is, data1Len);
-        int[] ones = ArrayEncoder.decodeModQ(data1, numOnes, maxIndex);
-
-        int data2Len = (numNegOnes * bitsPerIndex + 7) / 8;
-        byte[] data2 = Util.readFullLength(is, data2Len);
-        int[] negOnes = ArrayEncoder.decodeModQ(data2, numNegOnes, maxIndex);
-
-        return new SparseTernaryPolynomial(N, ones, negOnes);
-    }
-
-    /**
-     * Generates a random polynomial with <code>numOnes</code> coefficients equal to 1,
-     * <code>numNegOnes</code> coefficients equal to -1, and the rest equal to 0.
-     *
-     * @param N          number of coefficients
-     * @param numOnes    number of 1's
-     * @param numNegOnes number of -1's
-     */
-    public static SparseTernaryPolynomial generateRandom(int N, int numOnes, int numNegOnes, SecureRandom random)
-    {
-        int[] coeffs = Util.generateRandomTernary(N, numOnes, numNegOnes, random);
-        return new SparseTernaryPolynomial(coeffs);
-    }
-
-    public IntegerPolynomial mult(IntegerPolynomial poly2)
-    {
-        int[] b = poly2.coeffs;
-        if (b.length != N)
-        {
-            throw new IllegalArgumentException("Number of coefficients must be the same");
-        }
-
-        int[] c = new int[N];
-        for (int idx = 0; idx != ones.length; idx++)
-        {
-            int i = ones[idx];
-            int j = N - 1 - i;
-            for (int k = N - 1; k >= 0; k--)
-            {
-                c[k] += b[j];
-                j--;
-                if (j < 0)
-                {
-                    j = N - 1;
-                }
-            }
-        }
-
-        for (int idx = 0; idx != negOnes.length; idx++)
-        {
-            int i = negOnes[idx];
-            int j = N - 1 - i;
-            for (int k = N - 1; k >= 0; k--)
-            {
-                c[k] -= b[j];
-                j--;
-                if (j < 0)
-                {
-                    j = N - 1;
-                }
-            }
-        }
-
-        return new IntegerPolynomial(c);
-    }
-
-    public IntegerPolynomial mult(IntegerPolynomial poly2, int modulus)
-    {
-        IntegerPolynomial c = mult(poly2);
-        c.mod(modulus);
-        return c;
-    }
-
-    public BigIntPolynomial mult(BigIntPolynomial poly2)
-    {
-        BigInteger[] b = poly2.coeffs;
-        if (b.length != N)
-        {
-            throw new IllegalArgumentException("Number of coefficients must be the same");
-        }
-
-        BigInteger[] c = new BigInteger[N];
-        for (int i = 0; i < N; i++)
-        {
-            c[i] = BigInteger.ZERO;
-        }
-
-        for (int idx = 0; idx != ones.length; idx++)
-        {
-            int i = ones[idx];
-            int j = N - 1 - i;
-            for (int k = N - 1; k >= 0; k--)
-            {
-                c[k] = c[k].add(b[j]);
-                j--;
-                if (j < 0)
-                {
-                    j = N - 1;
-                }
-            }
-        }
-
-        for (int idx = 0; idx != negOnes.length; idx++)
-        {
-            int i = negOnes[idx];
-            int j = N - 1 - i;
-            for (int k = N - 1; k >= 0; k--)
-            {
-                c[k] = c[k].subtract(b[j]);
-                j--;
-                if (j < 0)
-                {
-                    j = N - 1;
-                }
-            }
-        }
-
-        return new BigIntPolynomial(c);
-    }
-
-    public int[] getOnes()
-    {
-        return ones;
-    }
-
-    public int[] getNegOnes()
-    {
-        return negOnes;
-    }
-
-    /**
-     * Encodes the polynomial to a byte array writing <code>BITS_PER_INDEX</code> bits for each coefficient.
-     *
-     * @return the encoded polynomial
-     */
-    public byte[] toBinary()
-    {
-        int maxIndex = 1 << BITS_PER_INDEX;
-        byte[] bin1 = ArrayEncoder.encodeModQ(ones, maxIndex);
-        byte[] bin2 = ArrayEncoder.encodeModQ(negOnes, maxIndex);
-
-        byte[] bin = Arrays.copyOf(bin1, bin1.length + bin2.length);
-        System.arraycopy(bin2, 0, bin, bin1.length, bin2.length);
-        return bin;
-    }
-
-    public IntegerPolynomial toIntegerPolynomial()
-    {
-        int[] coeffs = new int[N];
-        for (int idx = 0; idx != ones.length; idx++)
-        {
-            int i = ones[idx];
-            coeffs[i] = 1;
-        }
-        for (int idx = 0; idx != negOnes.length; idx++)
-        {
-            int i = negOnes[idx];
-            coeffs[i] = -1;
-        }
-        return new IntegerPolynomial(coeffs);
-    }
-
-    public int size()
-    {
-        return N;
-    }
-
-    public void clear()
-    {
-        for (int i = 0; i < ones.length; i++)
-        {
-            ones[i] = 0;
-        }
-        for (int i = 0; i < negOnes.length; i++)
-        {
-            negOnes[i] = 0;
-        }
-    }
-
-    public int hashCode()
-    {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + N;
-        result = prime * result + Arrays.hashCode(negOnes);
-        result = prime * result + Arrays.hashCode(ones);
-        return result;
-    }
-
-    public boolean equals(Object obj)
-    {
-        if (this == obj)
-        {
-            return true;
-        }
-        if (obj == null)
-        {
-            return false;
-        }
-        if (getClass() != obj.getClass())
-        {
-            return false;
-        }
-        SparseTernaryPolynomial other = (SparseTernaryPolynomial)obj;
-        if (N != other.N)
-        {
-            return false;
-        }
-        if (!Arrays.areEqual(negOnes, other.negOnes))
-        {
-            return false;
-        }
-        if (!Arrays.areEqual(ones, other.ones))
-        {
-            return false;
-        }
-        return true;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/math/ntru/polynomial/TernaryPolynomial.java b/bcprov/src/main/java/org/bouncycastle/pqc/math/ntru/polynomial/TernaryPolynomial.java
deleted file mode 100644
index 822b64b..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/math/ntru/polynomial/TernaryPolynomial.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package org.bouncycastle.pqc.math.ntru.polynomial;
-
-/**
- * A polynomial whose coefficients are all equal to -1, 0, or 1
- */
-public interface TernaryPolynomial
-    extends Polynomial
-{
-
-    /**
-     * Multiplies the polynomial by an <code>IntegerPolynomial</code>, taking the indices mod N
-     */
-    IntegerPolynomial mult(IntegerPolynomial poly2);
-
-    int[] getOnes();
-
-    int[] getNegOnes();
-
-    /**
-     * Returns the maximum number of coefficients the polynomial can have
-     */
-    int size();
-
-    void clear();
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/math/ntru/polynomial/test/AllTests.java b/bcprov/src/main/java/org/bouncycastle/pqc/math/ntru/polynomial/test/AllTests.java
deleted file mode 100644
index 296a66e..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/math/ntru/polynomial/test/AllTests.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package org.bouncycastle.pqc.math.ntru.polynomial.test;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-public class AllTests
-    extends TestCase
-{
-    public static void main (String[] args)
-    {
-        junit.textui.TestRunner.run(suite());
-    }
-    
-    public static Test suite()
-    {
-        TestSuite suite = new TestSuite("NTRU Polynomial Tests");
-        
-        suite.addTestSuite(BigDecimalPolynomialTest.class);
-        suite.addTestSuite(BigIntPolynomialTest.class);
-        suite.addTestSuite(IntegerPolynomialTest.class);
-        suite.addTestSuite(LongPolynomial2Test.class);
-        suite.addTestSuite(LongPolynomial5Test.class);
-        suite.addTestSuite(ProductFormPolynomialTest.class);
-        suite.addTestSuite(SparseTernaryPolynomialTest.class);
-
-        return suite;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/math/ntru/polynomial/test/BigDecimalPolynomialTest.java b/bcprov/src/main/java/org/bouncycastle/pqc/math/ntru/polynomial/test/BigDecimalPolynomialTest.java
deleted file mode 100644
index 06e9e04..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/math/ntru/polynomial/test/BigDecimalPolynomialTest.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package org.bouncycastle.pqc.math.ntru.polynomial.test;
-
-import java.math.BigDecimal;
-import java.security.SecureRandom;
-
-import junit.framework.TestCase;
-import org.bouncycastle.pqc.math.ntru.polynomial.BigDecimalPolynomial;
-import org.bouncycastle.pqc.math.ntru.polynomial.BigIntPolynomial;
-import org.bouncycastle.pqc.math.ntru.polynomial.DenseTernaryPolynomial;
-import org.bouncycastle.pqc.math.ntru.polynomial.IntegerPolynomial;
-
-public class BigDecimalPolynomialTest
-    extends TestCase
-{
-    public void testMult()
-    {
-        BigDecimalPolynomial a = new BigDecimalPolynomial(new BigIntPolynomial(new IntegerPolynomial(new int[]{4, -1, 9, 2, 1, -5, 12, -7, 0, -9, 5})));
-        BigDecimalPolynomial b = new BigDecimalPolynomial(new BigIntPolynomial(new IntegerPolynomial(new int[]{-6, 0, 0, 13, 3, -2, -4, 10, 11, 2, -1})));
-        BigDecimalPolynomial c = a.mult(b);
-        BigDecimal[] expectedCoeffs = new BigDecimalPolynomial(new BigIntPolynomial(new IntegerPolynomial(new int[]{2, -189, 77, 124, -29, 0, -75, 124, -49, 267, 34}))).getCoeffs();
-
-        BigDecimal[] cCoeffs = c.getCoeffs();
-
-        assertEquals(expectedCoeffs.length, cCoeffs.length);
-        for (int i = 0; i != cCoeffs.length; i++)
-        {
-            assertEquals(expectedCoeffs[i], cCoeffs[i]);
-        }
-
-        // multiply a polynomial by its inverse modulo 2048 and check that the result is 1
-        SecureRandom random = new SecureRandom();
-        IntegerPolynomial d, dInv;
-        do
-        {
-            d = DenseTernaryPolynomial.generateRandom(1001, 333, 334, random);
-            dInv = d.invertFq(2048);
-        }
-        while (dInv == null);
-
-        d.mod(2048);
-        BigDecimalPolynomial e = new BigDecimalPolynomial(new BigIntPolynomial(d));
-        BigIntPolynomial f = new BigIntPolynomial(dInv);
-        IntegerPolynomial g = new IntegerPolynomial(e.mult(f).round());
-        g.modPositive(2048);
-        assertTrue(g.equalsOne());
-    }
-}
\ No newline at end of file
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/math/ntru/polynomial/test/BigIntPolynomialTest.java b/bcprov/src/main/java/org/bouncycastle/pqc/math/ntru/polynomial/test/BigIntPolynomialTest.java
deleted file mode 100644
index a6ad36e..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/math/ntru/polynomial/test/BigIntPolynomialTest.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package org.bouncycastle.pqc.math.ntru.polynomial.test;
-
-import java.math.BigInteger;
-
-import junit.framework.TestCase;
-import org.bouncycastle.pqc.math.ntru.polynomial.BigIntPolynomial;
-import org.bouncycastle.pqc.math.ntru.polynomial.IntegerPolynomial;
-
-public class BigIntPolynomialTest
-    extends TestCase
-{
-    public void testMult()
-    {
-        BigIntPolynomial a = new BigIntPolynomial(new IntegerPolynomial(new int[]{4, -1, 9, 2, 1, -5, 12, -7, 0, -9, 5}));
-        BigIntPolynomial b = new BigIntPolynomial(new IntegerPolynomial(new int[]{-6, 0, 0, 13, 3, -2, -4, 10, 11, 2, -1}));
-        BigIntPolynomial c = a.mult(b);
-        BigInteger[] expectedCoeffs = new BigIntPolynomial(new IntegerPolynomial(new int[]{2, -189, 77, 124, -29, 0, -75, 124, -49, 267, 34})).getCoeffs();
-        BigInteger[] cCoeffs = c.getCoeffs();
-
-        assertEquals(expectedCoeffs.length, cCoeffs.length);
-        for (int i = 0; i != cCoeffs.length; i++)
-        {
-            assertEquals(expectedCoeffs[i], cCoeffs[i]);
-        }
-    }
-}
\ No newline at end of file
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/math/ntru/polynomial/test/IntegerPolynomialTest.java b/bcprov/src/main/java/org/bouncycastle/pqc/math/ntru/polynomial/test/IntegerPolynomialTest.java
deleted file mode 100644
index 8f6e489..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/math/ntru/polynomial/test/IntegerPolynomialTest.java
+++ /dev/null
@@ -1,230 +0,0 @@
-package org.bouncycastle.pqc.math.ntru.polynomial.test;
-
-import java.math.BigInteger;
-import java.security.SecureRandom;
-
-import junit.framework.TestCase;
-import org.bouncycastle.pqc.crypto.ntru.NTRUSigningKeyGenerationParameters;
-import org.bouncycastle.pqc.math.ntru.polynomial.BigIntPolynomial;
-import org.bouncycastle.pqc.math.ntru.polynomial.DenseTernaryPolynomial;
-import org.bouncycastle.pqc.math.ntru.polynomial.IntegerPolynomial;
-import org.bouncycastle.pqc.math.ntru.polynomial.Resultant;
-import org.bouncycastle.util.Arrays;
-
-
-public class IntegerPolynomialTest
-    extends TestCase
-{
-    public void testMult()
-    {
-        // multiplication modulo q
-        IntegerPolynomial a = new IntegerPolynomial(new int[]{-1, 1, 1, 0, -1, 0, 1, 0, 0, 1, -1});
-        IntegerPolynomial b = new IntegerPolynomial(new int[]{14, 11, 26, 24, 14, 16, 30, 7, 25, 6, 19});
-        IntegerPolynomial c = a.mult(b, 32);
-        assertEqualsMod(new int[]{3, -7, -10, -11, 10, 7, 6, 7, 5, -3, -7}, c.coeffs, 32);
-
-        a = new IntegerPolynomial(new int[]{15, 27, 18, 16, 12, 13, 16, 2, 28, 22, 26});
-        b = new IntegerPolynomial(new int[]{-1, 0, 1, 1, 0, 1, 0, 0, -1, 0, -1});
-        c = a.mult(b, 32);
-        assertEqualsMod(new int[]{8, 25, 22, 20, 12, 24, 15, 19, 12, 19, 16}, c.coeffs, 32);
-
-        // multiplication without a modulus
-        a = new IntegerPolynomial(new int[]{1, 1, 0, 0, -1, -1, 0, 0, -1, 0, 1});
-        b = new IntegerPolynomial(new int[]{704, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0});
-        c = a.mult(b);
-
-        // mult(p, modulus) should give the same result as mult(p) followed by modulus
-        a = new IntegerPolynomial(new int[]{1, 0, -1, 1, 0, 1, 1, 1, -1, 1, -1});
-        b = new IntegerPolynomial(new int[]{0, 1, 1, 0, 0, -1, -1, 1, 1, -1, 1});
-        c = a.mult(b);
-        c.modPositive(20);
-        IntegerPolynomial d = a.mult(b, 20);
-        d.modPositive(20);
-        assertTrue(Arrays.areEqual(c.coeffs, d.coeffs));
-    }
-
-    void assertEqualsMod(int[] arr1, int[] arr2, int m)
-    {
-        assertEquals(arr1.length, arr2.length);
-        for (int i = 0; i < arr1.length; i++)
-        {
-            assertEquals((arr1[i] + m) % m, (arr2[i] + m) % m);
-        }
-    }
-
-    public void testInvertFq()
-    {
-        SecureRandom random = new SecureRandom();
-        // Verify an example from the NTRU tutorial
-        IntegerPolynomial a = new IntegerPolynomial(new int[]{-1, 1, 1, 0, -1, 0, 1, 0, 0, 1, -1});
-        IntegerPolynomial b = a.invertFq(32);
-        assertEqualsMod(new int[]{5, 9, 6, 16, 4, 15, 16, 22, 20, 18, 30}, b.coeffs, 32);
-        verifyInverse(a, b, 32);
-
-        // test 3 random polynomials
-        int numInvertible = 0;
-        while (numInvertible < 3)
-        {
-            a = DenseTernaryPolynomial.generateRandom(853, random);
-            b = a.invertFq(2048);
-            if (b != null)
-            {
-                numInvertible++;
-                verifyInverse(a, b, 2048);
-            }
-        }
-
-        // test a non-invertible polynomial
-        a = new IntegerPolynomial(new int[]{-1, 0, 1, 1, 0, 0, -1, 0, -1, 0, 1});
-        b = a.invertFq(32);
-        assertNull(b);
-    }
-
-    public void testInvertF3()
-    {
-        IntegerPolynomial a = new IntegerPolynomial(new int[]{-1, 1, 1, 0, -1, 0, 1, 0, 0, 1, -1});
-        IntegerPolynomial b = a.invertF3();
-        assertEqualsMod(new int[]{1, 2, 0, 2, 2, 1, 0, 2, 1, 2, 0}, b.coeffs, 3);
-        verifyInverse(a, b, 3);
-
-        // test a non-invertible polynomial
-        a = new IntegerPolynomial(new int[]{0, 1, -1, 1, 0, 0, 0, 0, -1, 0, 0});
-        b = a.invertF3();
-        assertNull(b);
-    }
-
-    // tests if a*b=1 (mod modulus)
-    private void verifyInverse(IntegerPolynomial a, IntegerPolynomial b, int modulus)
-    {
-        IntegerPolynomial c = a.mult(b, modulus);
-        for (int i = 1; i < c.coeffs.length; i++)
-        {
-            c.coeffs[i] %= modulus;
-        }
-        c.ensurePositive(modulus);
-        assertTrue(c.equalsOne());
-    }
-
-    public void testFromToBinary()
-    {
-        byte[] a = new byte[]{-44, -33, 30, -109, 101, -28, -6, -105, -45, 113, -72, 99, 101, 15, 9, 49, -80, -76, 58, 42, -57, -113, -89, -14, -125, 24, 125, -16, 37, -58, 10, -49, -77, -31, 120, 103, -29, 105, -56, -126, -92, 36, 125, 127, -90, 38, 9, 4, 104, 10, -78, -106, -88, -1, -1, -43, -19, 90, 41, 0, -43, 102, 118, -72, -122, 19, -76, 57, -59, -2, 35, 47, 83, 114, 86, -115, -125, 58, 75, 115, -29, -6, 108, 6, -77, -51, 127, -8, -8, -58, -30, -126, 110, -5, -35, -41, -37, 69, 22, -48, 26, 4, -120, -19, -32, -81, -77, 124, -7, -2, -46, -96, 38, -35, 88, 4, -5, 16, 101, 29, 7, 2, 88, 35, -64, 31, -66, -70, 120, -97, 76, -74, -97, -61, 52, -56, 87, -35, 5, 95, -93, -30, 10, 38, 17, -102, -25, 86, 7, -43, 44, -52, -108, 33, -18, -110, -9, -115, 66, -71, 66, 1, -90, -72, 90, -88, -38, 75, 47, -124, -120, -15, -49, -8, 85, 5, 17, -88, 76, 99, -4, 83, 16, -91, 82, 116, 112, -83, 56, -45, -26, 125, 13, -75, -115, 92, -12, -59, 3, -12, 14, -6, 43, -17, 121, 122, 22, 92, -74, 99, -59, -103, 113, 8, -103, 114, 99, -48, 92, -88, 77, 81, 5, 31, -4, -69, -24, 23, 94, 126, 71, 93, 20, 77, 82, -54, -14, 86, 45, -81, 0, 52, -63, -66, 48, 104, -54, 15, -73, -2, -52, 115, 76, 28, -5, -94, -63, 117, -69, 0, 61, 22, -1, 71, -115, 9, -73, -100, -128, -31, 106, -74, -61, -37, 98, -6, 11, -5, 6, -18, -53, -6, 11, -49, 62, 23, 6, -128, 38, -91, 89, -34, 18, -38, -110, -101, 43, 36, 62, 101, 112, 59, -91, 78, -81, 61, 126, -21, -42, -110, -38, -27, 69, 57, 9, 24, -50, -118, 31, -17, 42, 87, -54, 122, -16, 42, -47, -19, -80, 16, 54, -97, -89, 81, -22, -35, 45, 54, -46, 22, -122, -95, -17, 7, -127, 105, -100, -56, -98, -105, 101, -81, 104, 121, -7, 33, 126, 110, -125, -85, 111, -52, 123, -98, 41, -42, 88, -68, -17, 39, -19, -96, -10, -117, 13, -88, -75, -101, -16, -7, 73, 23, -12, 41, -116, -105, -64, -4, 103, 49, -15, -49, 60, 88, -25, -21, 42, 26, 95, -90, -83, -69, 64, -2, 50, -116, -64, 26, -29, -93, -120, -70, 32, -38, 39, -126, -19, 103, 127, 65, 54, 110, 94, 126, -82, -80, -18, 43, 45, 56, -118, 109, 36, -8, 10, 113, 69, 53, -122, -127, 92, -127, -73, 70, -19, -105, -80, -15, -5, 99, -109, -27, 119, -76, -57, -48, 42, -35, 23, 39, -126, 44, -107, -100, -125, 117, -50, 115, -79, -16, 104, 8, -102, 83, -73, 21, -85, 113, -87, -54, 93, 63, -108, -64, 109, -74, 15, 14, -119, -6, -68, 45, 37, -15, -97, -95, -55, 89, 25, -63, -92, -80, -27, -8, 55, 50, 96, -91, 40, -74, 110, -96, 94, 6, 85, 92, 0, 34, -122, 5, -126, 123, 37, -90, -94, 60, 14, 36, 49, -98, -23, 57, 75, 63, 106, -7, -36, -89, 84, 71, 60, -21, 104, -47, 90, -52, -66, 88, -91, -81, -3, 116, 23, 62, -47, -84, -118, 65, 31, 7, -103, 37, -29, 115, -114, 73, 12, -121, 96, -91, -7, 56, 10, -72, 27, -45, 122, -27, -38, 74, 64, 30, -60, 64, -21, 48, 101, 113, 126, -60, -103, 71, 100, -117, 124, -125, 116, 78, 114, -74, 42, -81, -54, 34, 33, -10, 19, 23, 24, 40, 0, -8, 78, 100, 73, -88, -95, -62, -115, -18, 47, 10, -14, -39, 82, 27, -9, -115, -70, 92, -6, 39, 45, -71, -109, -41, 94, -88, -63, 19, -58, -37, -31, 1, 127, -42, 125, -120, -57, 120, -86, -6, 17, -27, -37, 47, 55, -22, -11, -31, 38, -1, 29, 56, -34, -104, -66, -62, 72, -11, -30, -30, 61, -31, 10, -63, 116, -84, 118, -127, 6, 17, -36, 91, 123, 77, 35, 22, 110, 114, 107, -3, 52, 11, 86, 68, -56, 0, 119, -43, -73, 112, 89, -4, -122, -71, -26, 103, -118, -61, -112, -108, -44, -25, -22, 4, 24, 53, -5, -71, 9, -41, 84, -28, 22, 99, 39, -26, -2, -51, 68, 63, -15, 99, 66, -78, 46, -89, 21, -38, -114, -51, 100, -59, 84, -76, -105, 51, 28, 19, 74, 42, 91, -73, 12, -89, -128, 34, 38, -100, 121, -78, 114, -28, 127, -29, 50, 105, -6, 36, 98, -35, 79, -58, 5, -13, -86, -101, -108, -99, -70, 25, 103, 63, 57, 79, -12, -63, 125, -54, 61, 15, 6, -79, 90, 76, 103, -45, 7, 39, 93, 107, 58, 76, 80, 56, -108, 55, -22, 36, 125, -91, -65, 11, 69, 10, -19, -14, -4, -26, -36, 114, 124, 63, -31, 88, 92, 108, 33, -52, -22, 80, -65, 57, 126, 43, -13, 122, -8, 68, 72, 92, -50, 100, -91, 1, -81, 75, 95, -11, -99, 38, 121, -20, -70, 82, -125, -94, -18, 16, 59, 89, 18, -96, 91, -97, 62, -96, 127, 45, 70, 16, 84, -43, -75, -118, 81, 58, 84, -115, -120, -3, 41, -103, -70, 123, 26, 101, 33, 58, 13, -11, -73, -84, -47, -7, 81, -63, 60, -45, 30, 100, -51, -15, 73, 58, -119, -3, 62, -63, -17, -69, -44, 60, -54, -115, -59, 23, -59, 98, -89, -72, 20, -96, 27, 53, -89, 59, -85, -29, 120, 23, 62, 8, -86, 113, 87, -15, 102, 106, -104, 57, -57, 37, 110, 118, 109, 25, 64, 26, -20, -86, -2, 60, -70, -33, 67, 13, -28, -29, -63, -37, 67, 99, 84, 121, -126, -38, 45, 24, 122, 51, 11, -19, -80, 26, -106, -95, 82, 69, -2, -75, 62, 106, -120, 87, -107, 87, 17, 102, -52, -16, 22, 12, -86, -48, -95, -61, 109, 64, -29, 111, 40, -90, -35, 49, 88, -15, 122, 127, 87, 113, 116, 93, 100, 28, -70, -87, -40, -1, -126, -114, 7, 79, 16, 2, -47, -98, -102, 49, 58, 61, -32, 44, 18, -26, 37, 27, -123, -76, 56, 91, 51, -21, -48, -122, -33, 40, -8, -62, -56, -126, 91, -51, 76, -29, 127, -22, -18, -110, 27, 13, -111, 81, 51, -104, 70, 98, 12, 120, -7, 15, 104, -43, -104, 124, 46, 116, 7, -26, 21, 33, 105, 17, -99, -42, -106, 8, -85, 39, 8, 79, -54, -81, 109, 40, 25, 29, -18, -90, 22, 85, -12, -16, 61, 49, -31, 127, 64, 5, 25, 39, -65, -42, 13, -97, -92, 36, -126, -18, -4, -22, -14, 109, -93, -76, -5, 13, 74, 44, 103, 79, 110, 85, 58, 39, -24, 119, 120, 122, 120, 43, 110, 67, 21, 47, 39, -48, 7, 91, -51, 126, 100, -38, -124, 0, -97, 99, -123, 118, -27, 8, 102, -106, -23, -53, -4, -56, -9, -126, -85, 93, -4, -5, 4, 49, 29, 2, 63, 78, -32, -106, 118, 111, 52, 54, 74, 53, 106, 39, -95, -38, -18, 118, -5, 94, -83, -97, -27, 62, -56, -90, -36, 43, 43, -113, 119, -89, 44, -108, -46, 66, 28, 66, -38, 3, -62, -83, -35, -127, -2, 51, 104, 105, 40, 76, -10, -124, -95, 52, 11, 101, -32, -122, -73, -17, 37, -126, 68, -126, 55, 112, -126, 38, 99, -63, 123, -74, -31, 58, 8, 93, -68, 111, -22, -24, -23, 9, -87, -25, -115, 81, -116, -91, 60, 96, -102, -1, -7, 73, 99, 46, -78, 62, 48, -116, -52, -44, -5, 82, -45, 5, -55, -101, 101, 65, -109, -108, 26, 98, -55, 11, -86, 57, 30, 92, -58, 20, 82, 65, 103, 27, -64, 76, 123, -56, -16, -111, -83, 125, 65, 111, 9, 123, 14, 119, 126, -80, 79, 94, -19, 66, -25, 35, 112, -64, 10, -66, -86, 51, 56, -78, 103, 92, -116, 8, 75, 41, -49, -79, -53, 125, -32, -76, -27, 59, -8, -4, -94, -104, -15, 79, -7, -124, 32, -87, -104, 85, -118, -36, 125, 65, 111, -105, 5, -105, 40, -50, 2, 118, 123, -54, 59, -22, 94, 20, 99, -87, -27, 28, -30, -109, 72, -19, 92, 60, 19, 115, 47, 96, -96, 10, -74, 60, 96, -86, 101, 101, 68, -44, -72, 9, -36, 126, 96, -45, -12, 9, 14, -15, 79, -79, -48, 8, -107, -81, 47, 35, -36, -107, -120, -36, -124, 37, 103, -60, -35, -74, 100, -38, -88, -99, -99, -94, -107, 79, 115, 108, 54, 119, 73, 84, 110, -74, 92, 57, 108, 80, 47, -36, -119, -115, 58, -62, -4, -97, 43, -98, 5, 112, 47, 59, -89, 82, -69, -103, 39, -29, 75, -9, -94, -72, 99, -64, 22, -10, 21, 89, 101, 21, 94, -30, -17, 73, -36, -68, -89, -91, -94, 99, -106, 119, -116, 123, -19, 54, -99, 64, -119, 82, 120, -106, -99, 80, 69, 29, -48, 77, 28, 13, 92, -107, -77, 94, -116, 108, 89, -115, 96, -41, 25, 99, -65, 118, -5, -16, 48, -122, 5, 50, -123, -115, 13, 24, 7, 15, -103, -62, -71, 92, -82, -5, -70, 49, -6, -51, -17, -47, 12, 46, -86, 30, 93, 84, -101, 43, -92, -87, -118, -110, -32, 52, 115, -4, 36, -2, -79, -69, -46, -110, 70, -82, 6, 21, -27, -11, 94, 42, -81, -96, 116, -102, -38, 36, 32, 91, 28, 80, -45, 116, -94, -33, -5, -102, 64, -96, 27, -2, 100, -126, 59, -71, 33, -36, -124, 123, 99, -76, 108, 127, -11, -24, -19, 84, -6, 19, 105, -19, -18, 120, -14, 23, 39, 54, 87, 105, 58, -95, -15, 127, -65, 114, 49, 4, -66, 32, -7, 84, 43, -103, 76, 11, 36, -68, -3, -98, -5, -43, 35, -48, 20, -40, -33, -123, 1, -54, -44, 99, -68, 8, -100, 97, -49, -10, 110, 49, 84, 46, -85, 98, -103, -58, -4, 104, -100, -40, -79, 67, -20, -95, 85, 51, 73, 10, -25, 102, 68, -97, -83, -39, 35, 2, -111, 71, 62, -89, 20, 25, -126, 17, -81, -29, 39, -27, -55, 55, -122, 97, 23, -99, 55, 86, 33, -9, 8, 55, -40, -84, 39, 38, 37, -29, 87, 113, -118, -26, 123, -95, 24, -126, 119, -94, 17, 83, -43, 10, 63, -98, 72, 8, 16, -95, -96, 119, -91, 6, 71, -60, 1, -77, 4, 53, -121, 55, 7, 36, -86, -49, -118, -121, 56, 84, -49, -57, -99, 3, -68, 37, -108, -72, 114, -74, 120, 3, 121, -28, -106, 54, -20, 63, -121, -85, -59, -111, 32, 13, -69, 122, 90, 5, 40, 88, 15, -90, 125, -28, 89, 95, 73, 96, 60, -60, -51, 102, 7, 57, 91, 59, 15, 92, -76, -34, -23, -77, 90, 45, 91, 77, -63, 94, -127, 74, -97, -44, 50, -87, -94, -25, -71, 112, 127, -117, 6, 32, -113, 54, 83, -31, 111, -73, 53, 34, -32, -98, 125, -39, 63, 15, 72, -69, 87, -118, 108, 17, 84, 15, 61, -47, 54, -24, -79, 91, 28, -28, 66, 53, 22, 9, -28, -12, 38, 64, 75, -122, 96, -59, -45, 4, -19, 47, -30, 75, -94, 62, -64, 76, -49, 19, -66, -34, 3, 84, -2, -54, 13, -84, 86, -117, 94, -27, 89, 16, 96, 52, -77, -36, -116, 27, -52, -33, -50, 14, -59, 77, 93, -109, 8, -89, 81, -114, -29, -94, 73, -119, -56, -19, 88, -17, -33, 125, -18, -68, 113, 40, -128, -112, -119, -106, -106, -30, 23, -77, 49, 3, 98, -101, 99, -107, -121, -12, -112, 24, -74, -74, 79, -17, 96, 65, -52, 86, -63, 45, 84, 119, -42, 61, -91, 29, -87, 65, -85, 99, -14, 71, 33, -41, -48, -2, -121, 78, -38, 41, -7, -37, 48, 122, 61, -124, 42, -22, 24, 2, -49, 74, -81, -88, -89, -107, 109, 53, -68, 90, -117, 123, -109, -28, 12, 80, 120, 26, -104, 73, 70, -36, 34, -80, -104, 23, 16, 14, -96, -5, 27, 71, 25, -8, -125, 58, 88, -52, -97, -97, -93, 11, -44, 116, 42, -102, -100, -31, -86, 71, 84, 70, 27, 117, -67, 92, -84, -13, 54, -102, 34, 5, 19, -76, 71, 89, 22, -49, -34, -29};
-        IntegerPolynomial poly = IntegerPolynomial.fromBinary(a, 1499, 2048);
-        byte[] b = poly.toBinary(2048);
-        // verify that bytes 0..2047 match, ignore non-relevant bits of byte 2048
-        assertTrue(Arrays.areEqual(copyOf(a, 2047), copyOf(b, 2047)));
-        assertEquals((a[a.length - 1] & 1) >> (7 - (1499 * 11) % 8), (b[b.length - 1] & 1) >> (7 - (1499 * 11) % 8));
-    }
-
-    public void testFromToBinary3Sves()
-    {
-        byte[] a = new byte[]{-112, -78, 19, 15, 99, -65, -56, -90, 44, -93, -109, 104, 40, 90, -84, -21, -124, 51, -33, 4, -51, -106, 33, 86, -76, 42, 41, -17, 47, 79, 81, -29, 15, 116, 101, 120, 116, 32, 116, 111, 32, 101, 110, 99, 114, 121, 112, 116, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
-        IntegerPolynomial poly = IntegerPolynomial.fromBinary3Sves(a, 1499);
-        byte[] b = poly.toBinary3Sves();
-        assertTrue(Arrays.areEqual(a, b));
-    }
-
-    public void testFromToBinary3Tight()
-    {
-        int[] c = new int[]{0, 0, 0, 0, 0, 0, 0, 1, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, -1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, -1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 1, -1, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1, 0, 1, 0, 0, 0, -1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1, 1, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1, 0, 1, 0, 1, 0, 1, 0, -1, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, -1, -1, 0, 1, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, -1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1, 1, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, -1, 0, 1, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1, 0, -1, -1, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, -1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, -1, 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1, 0, 0, 0, -1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, -1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1, 0, 1, 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1, 0, 0, 0, -1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, 1, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 1, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0};
-        IntegerPolynomial poly1 = new IntegerPolynomial(c);
-        IntegerPolynomial poly2 = IntegerPolynomial.fromBinary3Tight(poly1.toBinary3Tight(), c.length);
-        assertTrue(Arrays.areEqual(poly1.coeffs, poly2.coeffs));
-
-        IntegerPolynomial poly3 = new IntegerPolynomial(new int[]{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, -1, -1, 0, 0, 0, 1, 0, -1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, -1, 1, 0, 0, 0, 1, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 1, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1, -1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1, 0, -1, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, -1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, -1, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, 1, 0, -1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1, 0, 0, 0, -1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1, 0, 1, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, -1, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1, 0, -1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1, 0, -1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0});
-        byte[] arr = poly3.toBinary3Tight();
-        IntegerPolynomial poly4 = IntegerPolynomial.fromBinary3Tight(arr, 1499);
-        assertTrue(Arrays.areEqual(poly3.coeffs, poly4.coeffs));
-
-        IntegerPolynomial poly5 = new IntegerPolynomial(new int[]{0, 0, 0, 1, -1, -1, -1});
-        arr = poly5.toBinary3Tight();
-        IntegerPolynomial poly6 = IntegerPolynomial.fromBinary3Tight(arr, 7);
-        assertTrue(Arrays.areEqual(poly5.coeffs, poly6.coeffs));
-
-        SecureRandom random = new SecureRandom();
-
-        for (int i = 0; i < 100; i++)
-        {
-            IntegerPolynomial poly7 = DenseTernaryPolynomial.generateRandom(157, random);
-            arr = poly7.toBinary3Tight();
-            IntegerPolynomial poly8 = IntegerPolynomial.fromBinary3Tight(arr, 157);
-            assertTrue(Arrays.areEqual(poly7.coeffs, poly8.coeffs));
-        }
-    }
-
-    public void testResultant()
-    {
-        SecureRandom random = new SecureRandom();
-        NTRUSigningKeyGenerationParameters params = NTRUSigningKeyGenerationParameters.APR2011_439;
-        IntegerPolynomial a = DenseTernaryPolynomial.generateRandom(params.N, params.d, params.d, random);
-        verifyResultant(a, a.resultant());
-
-        a = new IntegerPolynomial(new int[]{0, 0, 0, 0, 0, 0, 0, 0, -1, 0, 1, 0, 0, 0, 0, 0, 1, -1, 0, 0, -1, 0, 0, 0, 1, 0, 0, 0, -1, -1, 0, -1, 1, -1, 0, -1, 0, -1, -1, -1, 0, 0, 0, 1, 1, -1, -1, -1, 0, -1, -1, 0, 0, 1, 0, 0, 0, 0, 0, -1, 0, 0, 1, 0, 0, 1, 1, -1, 0, 1, -1, 0, 1, 0, 1, 0, -1, -1, 0, 1, 0, -1, 1, 1, 1, 1, 0, 0, -1, -1, 1, 0, 0, -1, -1, 0, -1, 0, 0, 0, 1, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, -1, 0, 0, 0, 0, -1, 0, 0, 0, 1, 0, 1, 0, 1, -1, 0, 0, 1, 1, 1, 0, 0, 0, -1, 0, 0, 0, 0, 1, 0, 1, 0, -1, -1, 0, -1, -1, -1, 0, -1, -1, 0, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 1, -1, 0, 1, 0, -1, 0, 0, 0, 0, 0, 0, -1, -1, 0, -1, -1, 1, 1, 0, 0, -1, 1, 0, 0, 0, -1, 1, -1, 0, -1, 0, 0, 0, -1, 0, 0, 0, 0, 0, -1, 1, 1, 0, 0, -1, 1, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 1, -1, 0, 1, 0, -1, -1, 0, 0, 0, 0, 0, 1, -1, 0, 0, 0, 1, -1, 1, -1, -1, 1, -1, 0, 1, 0, 0, 0, 1, 0, 0, 1, -1, 0, 0, 0, 0, 0, 0, 0, -1, 0, 1, 0, -1, 0, 1, -1, 0, 0, 1, 1, 0, 0, 1, 1, 0, -1, 0, -1, 1, -1, -1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 1, -1, 0, 0, 1, -1, 1, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, -1, 1, 0, -1, -1, 0, 0, -1, 0, 1, 1, -1, 1, -1, 0, 0, 0, 1});
-        verifyResultant(a, a.resultant());
-    }
-
-    // verifies that res=rho*a mod x^n-1
-    private void verifyResultant(IntegerPolynomial a, Resultant r)
-    {
-        BigIntPolynomial b = new BigIntPolynomial(a).mult(r.rho);
-        BigInteger[]     bCoeffs = b.getCoeffs();
-
-        for (int j = 1; j < bCoeffs.length - 1; j++)
-        {
-            assertEquals(BigInteger.ZERO, bCoeffs[j]);
-        }
-        if (r.res.equals(BigInteger.ZERO))
-        {
-            assertEquals(BigInteger.ZERO, bCoeffs[0].subtract(bCoeffs[bCoeffs.length - 1]));
-        }
-        else
-        {
-            assertEquals(BigInteger.ZERO, (bCoeffs[0].subtract(bCoeffs[bCoeffs.length - 1]).mod(r.res)));
-        }
-        assertEquals(bCoeffs[0].subtract(r.res), bCoeffs[bCoeffs.length - 1].negate());
-    }
-
-    public void testResultantMod()
-    {
-        int p = 46337;   // prime; must be less than sqrt(2^31) or integer overflows will occur
-
-        IntegerPolynomial a = new IntegerPolynomial(new int[]{0, 0, 0, 0, 0, 0, 0, 0, -1, 0, 1, 0, 0, 0, 0, 0, 1, -1, 0, 0, -1, 0, 0, 0, 1, 0, 0, 0, -1, -1, 0, -1, 1, -1, 0, -1, 0, -1, -1, -1, 0, 0, 0, 1, 1, -1, -1, -1, 0, -1, -1, 0, 0, 1, 0, 0, 0, 0, 0, -1, 0, 0, 1, 0, 0, 1, 1, -1, 0, 1, -1, 0, 1, 0, 1, 0, -1, -1, 0, 1, 0, -1, 1, 1, 1, 1, 0, 0, -1, -1, 1, 0, 0, -1, -1, 0, -1, 0, 0, 0, 1, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, -1, 0, 0, 0, 0, -1, 0, 0, 0, 1, 0, 1, 0, 1, -1, 0, 0, 1, 1, 1, 0, 0, 0, -1, 0, 0, 0, 0, 1, 0, 1, 0, -1, -1, 0, -1, -1, -1, 0, -1, -1, 0, 0, 0, 1, 1, 0, 0, 0, 1, 0, 0, 1, -1, 0, 1, 0, -1, 0, 0, 0, 0, 0, 0, -1, -1, 0, -1, -1, 1, 1, 0, 0, -1, 1, 0, 0, 0, -1, 1, -1, 0, -1, 0, 0, 0, -1, 0, 0, 0, 0, 0, -1, 1, 1, 0, 0, -1, 1, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 1, -1, 0, 1, 0, -1, -1, 0, 0, 0, 0, 0, 1, -1, 0, 0, 0, 1, -1, 1, -1, -1, 1, -1, 0, 1, 0, 0, 0, 1, 0, 0, 1, -1, 0, 0, 0, 0, 0, 0, 0, -1, 0, 1, 0, -1, 0, 1, -1, 0, 0, 1, 1, 0, 0, 1, 1, 0, -1, 0, -1, 1, -1, -1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 1, -1, 0, 0, 1, -1, 1, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, -1, 1, 0, -1, -1, 0, 0, -1, 0, 1, 1, -1, 1, -1, 0, 0, 0, 1});
-        verifyResultant(a, a.resultant(p), p);
-
-        SecureRandom random = new SecureRandom();
-
-        for (int i = 0; i < 10; i++)
-        {
-            a = DenseTernaryPolynomial.generateRandom(853, random);
-            verifyResultant(a, a.resultant(p), p);
-        }
-    }
-
-    // verifies that res=rho*a mod x^n-1 mod p
-    private void verifyResultant(IntegerPolynomial a, Resultant r, int p)
-    {
-        BigIntPolynomial b = new BigIntPolynomial(a).mult(r.rho);
-        b.mod(BigInteger.valueOf(p));
-        BigInteger[]     bCoeffs = b.getCoeffs();
-
-        for (int j = 1; j < bCoeffs.length - 1; j++)
-        {
-            assertEquals(BigInteger.ZERO, bCoeffs[j]);
-        }
-        if (r.res.equals(BigInteger.ZERO))
-        {
-            assertEquals(BigInteger.ZERO, bCoeffs[0].subtract(bCoeffs[bCoeffs.length - 1]));
-        }
-        else
-        {
-            assertEquals(BigInteger.ZERO, (bCoeffs[0].subtract(bCoeffs[bCoeffs.length - 1]).subtract(r.res).mod(BigInteger.valueOf(p))));
-        }
-        assertEquals(BigInteger.ZERO, bCoeffs[0].subtract(r.res).subtract(bCoeffs[bCoeffs.length - 1].negate()).mod(BigInteger.valueOf(p)));
-    }
-
-    private byte[] copyOf(byte[] src, int length)
-    {
-        byte[] tmp = new byte[length];
-        System.arraycopy(src, 0, tmp, 0, tmp.length);
-        return tmp;
-    }
-}
\ No newline at end of file
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/math/ntru/polynomial/test/LongPolynomial2Test.java b/bcprov/src/main/java/org/bouncycastle/pqc/math/ntru/polynomial/test/LongPolynomial2Test.java
deleted file mode 100644
index c842064..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/math/ntru/polynomial/test/LongPolynomial2Test.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package org.bouncycastle.pqc.math.ntru.polynomial.test;
-
-import java.util.Random;
-
-import junit.framework.TestCase;
-import org.bouncycastle.pqc.math.ntru.polynomial.IntegerPolynomial;
-import org.bouncycastle.pqc.math.ntru.polynomial.LongPolynomial2;
-import org.bouncycastle.util.Arrays;
-
-public class LongPolynomial2Test
-    extends TestCase
-{
-    public void testMult()
-    {
-        IntegerPolynomial i1 = new IntegerPolynomial(new int[]{1368, 2047, 672, 871, 1662, 1352, 1099, 1608});
-        IntegerPolynomial i2 = new IntegerPolynomial(new int[]{1729, 1924, 806, 179, 1530, 1381, 1695, 60});
-        LongPolynomial2 a = new LongPolynomial2(i1);
-        LongPolynomial2 b = new LongPolynomial2(i2);
-        IntegerPolynomial c1 = i1.mult(i2, 2048);
-        IntegerPolynomial c2 = a.mult(b).toIntegerPolynomial();
-        assertTrue(Arrays.areEqual(c1.coeffs, c2.coeffs));
-
-        // test 10 random polynomials
-        Random rng = new Random();
-        for (int i = 0; i < 10; i++)
-        {
-            int N = 2 + rng.nextInt(2000);
-            i1 = PolynomialGenerator.generateRandom(N, 2048);
-            i2 = PolynomialGenerator.generateRandom(N, 2048);
-            a = new LongPolynomial2(i1);
-            b = new LongPolynomial2(i2);
-            c1 = i1.mult(i2);
-            c1.modPositive(2048);
-            c2 = a.mult(b).toIntegerPolynomial();
-            assertTrue(Arrays.areEqual(c1.coeffs, c2.coeffs));
-        }
-    }
-
-    public void testSubAnd()
-    {
-        IntegerPolynomial i1 = new IntegerPolynomial(new int[]{1368, 2047, 672, 871, 1662, 1352, 1099, 1608});
-        IntegerPolynomial i2 = new IntegerPolynomial(new int[]{1729, 1924, 806, 179, 1530, 1381, 1695, 60});
-        LongPolynomial2 a = new LongPolynomial2(i1);
-        LongPolynomial2 b = new LongPolynomial2(i2);
-        a.subAnd(b, 2047);
-        i1.sub(i2);
-        i1.modPositive(2048);
-        assertTrue(Arrays.areEqual(a.toIntegerPolynomial().coeffs, i1.coeffs));
-    }
-
-    public void testMult2And()
-    {
-        IntegerPolynomial i1 = new IntegerPolynomial(new int[]{1368, 2047, 672, 871, 1662, 1352, 1099, 1608});
-        LongPolynomial2 i2 = new LongPolynomial2(i1);
-        i2.mult2And(2047);
-        i1.mult(2);
-        i1.modPositive(2048);
-        assertTrue(Arrays.areEqual(i1.coeffs, i2.toIntegerPolynomial().coeffs));
-    }
-}
\ No newline at end of file
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/math/ntru/polynomial/test/LongPolynomial5Test.java b/bcprov/src/main/java/org/bouncycastle/pqc/math/ntru/polynomial/test/LongPolynomial5Test.java
deleted file mode 100644
index cf91ac2..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/math/ntru/polynomial/test/LongPolynomial5Test.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package org.bouncycastle.pqc.math.ntru.polynomial.test;
-
-import java.security.SecureRandom;
-
-import junit.framework.TestCase;
-import org.bouncycastle.pqc.math.ntru.polynomial.DenseTernaryPolynomial;
-import org.bouncycastle.pqc.math.ntru.polynomial.IntegerPolynomial;
-import org.bouncycastle.pqc.math.ntru.polynomial.LongPolynomial5;
-import org.bouncycastle.util.Arrays;
-
-public class LongPolynomial5Test
-    extends TestCase
-{
-    public void testMult()
-    {
-        testMult(new int[]{2}, new int[]{-1});
-        testMult(new int[]{2, 0}, new int[]{-1, 0});
-        testMult(new int[]{2, 0, 3}, new int[]{-1, 0, 1});
-        testMult(new int[]{2, 0, 3, 1}, new int[]{-1, 0, 1, 1});
-        testMult(new int[]{2, 0, 3, 1, 2}, new int[]{-1, 0, 1, 1, 0});
-        testMult(new int[]{2, 0, 3, 1, 1, 5}, new int[]{1, -1, 1, 1, 0, 1});
-        testMult(new int[]{2, 0, 3, 1, 1, 5, 1, 4}, new int[]{1, 0, 1, 1, -1, 1, 0, -1});
-        testMult(new int[]{1368, 2047, 672, 871, 1662, 1352, 1099, 1608}, new int[]{1, 0, 1, 1, -1, 1, 0, -1});
-
-        // test random polynomials
-        SecureRandom rng = new SecureRandom();
-        for (int i = 0; i < 10; i++)
-        {
-            int[] coeffs1 = new int[rng.nextInt(2000) + 1];
-            int[] coeffs2 = DenseTernaryPolynomial.generateRandom(coeffs1.length, rng).coeffs;
-            testMult(coeffs1, coeffs2);
-        }
-    }
-
-    private void testMult(int[] coeffs1, int[] coeffs2)
-    {
-        IntegerPolynomial i1 = new IntegerPolynomial(coeffs1);
-        IntegerPolynomial i2 = new IntegerPolynomial(coeffs2);
-
-        LongPolynomial5 a = new LongPolynomial5(i1);
-        DenseTernaryPolynomial b = new DenseTernaryPolynomial(i2);
-        IntegerPolynomial c1 = i1.mult(i2, 2048);
-        IntegerPolynomial c2 = a.mult(b).toIntegerPolynomial();
-        assertEqualsMod(c1.coeffs, c2.coeffs, 2048);
-    }
-
-    private void assertEqualsMod(int[] arr1, int[] arr2, int m)
-    {
-        assertEquals(arr1.length, arr2.length);
-        for (int i = 0; i < arr1.length; i++)
-        {
-            assertEquals((arr1[i] + m) % m, (arr2[i] + m) % m);
-        }
-    }
-
-    public void testToIntegerPolynomial()
-    {
-        int[] coeffs = new int[]{2, 0, 3, 1, 1, 5, 1, 4};
-        LongPolynomial5 p = new LongPolynomial5(new IntegerPolynomial(coeffs));
-        assertTrue(Arrays.areEqual(coeffs, p.toIntegerPolynomial().coeffs));
-    }
-}
\ No newline at end of file
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/math/ntru/polynomial/test/PolynomialGenerator.java b/bcprov/src/main/java/org/bouncycastle/pqc/math/ntru/polynomial/test/PolynomialGenerator.java
deleted file mode 100644
index 8f931d7..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/math/ntru/polynomial/test/PolynomialGenerator.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package org.bouncycastle.pqc.math.ntru.polynomial.test;
-
-import java.util.Random;
-
-import org.bouncycastle.pqc.math.ntru.polynomial.IntegerPolynomial;
-
-public class PolynomialGenerator
-{
-    /**
-     * Creates a random polynomial with <code>N</code> coefficients
-     * between <code>0</code> and <code>q-1</code>.
-     *
-     * @param N length of the polynomial
-     * @param q coefficients will all be below this number
-     * @return a random polynomial
-     */
-    public static IntegerPolynomial generateRandom(int N, int q)
-    {
-        Random rng = new Random();
-        int[] coeffs = new int[N];
-        for (int i = 0; i < N; i++)
-        {
-            coeffs[i] = rng.nextInt(q);
-        }
-        return new IntegerPolynomial(coeffs);
-    }
-}
\ No newline at end of file
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/math/ntru/polynomial/test/ProductFormPolynomialTest.java b/bcprov/src/main/java/org/bouncycastle/pqc/math/ntru/polynomial/test/ProductFormPolynomialTest.java
deleted file mode 100644
index 9fbbb98..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/math/ntru/polynomial/test/ProductFormPolynomialTest.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package org.bouncycastle.pqc.math.ntru.polynomial.test;
-
-import java.security.SecureRandom;
-
-import junit.framework.TestCase;
-import org.bouncycastle.pqc.crypto.ntru.NTRUEncryptionKeyGenerationParameters;
-import org.bouncycastle.pqc.math.ntru.polynomial.IntegerPolynomial;
-import org.bouncycastle.pqc.math.ntru.polynomial.ProductFormPolynomial;
-
-public class ProductFormPolynomialTest
-    extends TestCase
-{
-    private NTRUEncryptionKeyGenerationParameters params;
-    private int N;
-    private int df1;
-    private int df2;
-    private int df3;
-    private int q;
-
-    public void setUp()
-    {
-        params = NTRUEncryptionKeyGenerationParameters.APR2011_439_FAST;
-        N = params.N;
-        df1 = params.df1;
-        df2 = params.df2;
-        df3 = params.df3;
-        q = params.q;
-    }
-
-    public void testFromToBinary()
-        throws Exception
-    {
-        ProductFormPolynomial p1 = ProductFormPolynomial.generateRandom(N, df1, df2, df3, df3 - 1, new SecureRandom());
-        byte[] bin1 = p1.toBinary();
-        ProductFormPolynomial p2 = ProductFormPolynomial.fromBinary(bin1, N, df1, df2, df3, df3 - 1);
-        assertEquals(p1, p2);
-    }
-
-    public void testMult()
-    {
-        ProductFormPolynomial p1 = ProductFormPolynomial.generateRandom(N, df1, df2, df3, df3 - 1, new SecureRandom());
-        IntegerPolynomial p2 = PolynomialGenerator.generateRandom(N, q);
-        IntegerPolynomial p3 = p1.mult(p2);
-        IntegerPolynomial p4 = p1.toIntegerPolynomial().mult(p2);
-        assertEquals(p3, p4);
-    }
-}
\ No newline at end of file
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/math/ntru/polynomial/test/SparseTernaryPolynomialTest.java b/bcprov/src/main/java/org/bouncycastle/pqc/math/ntru/polynomial/test/SparseTernaryPolynomialTest.java
deleted file mode 100644
index 3d434c6..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/math/ntru/polynomial/test/SparseTernaryPolynomialTest.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package org.bouncycastle.pqc.math.ntru.polynomial.test;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.security.SecureRandom;
-
-import junit.framework.TestCase;
-import org.bouncycastle.pqc.math.ntru.polynomial.BigIntPolynomial;
-import org.bouncycastle.pqc.math.ntru.polynomial.DenseTernaryPolynomial;
-import org.bouncycastle.pqc.math.ntru.polynomial.IntegerPolynomial;
-import org.bouncycastle.pqc.math.ntru.polynomial.SparseTernaryPolynomial;
-
-public class SparseTernaryPolynomialTest
-    extends TestCase
-{
-
-    /**
-     * tests mult(IntegerPolynomial) and mult(BigIntPolynomial)
-     */
-    public void testMult()
-    {
-        SecureRandom random = new SecureRandom();
-        SparseTernaryPolynomial p1 = SparseTernaryPolynomial.generateRandom(1000, 500, 500, random);
-        IntegerPolynomial p2 = DenseTernaryPolynomial.generateRandom(1000, random);
-
-        IntegerPolynomial prod1 = p1.mult(p2);
-        IntegerPolynomial prod2 = p1.mult(p2);
-        assertEquals(prod1, prod2);
-
-        BigIntPolynomial p3 = new BigIntPolynomial(p2);
-        BigIntPolynomial prod3 = p1.mult(p3);
-
-        assertEquals(new BigIntPolynomial(prod1), prod3);
-    }
-
-    public void testFromToBinary()
-        throws IOException
-    {
-        SecureRandom random = new SecureRandom();
-        SparseTernaryPolynomial poly1 = SparseTernaryPolynomial.generateRandom(1000, 100, 101, random);
-        ByteArrayInputStream poly1Stream = new ByteArrayInputStream(poly1.toBinary());
-        SparseTernaryPolynomial poly2 = SparseTernaryPolynomial.fromBinary(poly1Stream, 1000, 100, 101);
-        assertEquals(poly1, poly2);
-    }
-}
\ No newline at end of file
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/math/ntru/util/ArrayEncoder.java b/bcprov/src/main/java/org/bouncycastle/pqc/math/ntru/util/ArrayEncoder.java
deleted file mode 100644
index 017e104..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/math/ntru/util/ArrayEncoder.java
+++ /dev/null
@@ -1,294 +0,0 @@
-package org.bouncycastle.pqc.math.ntru.util;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.math.BigInteger;
-
-import org.bouncycastle.util.Arrays;
-
-/**
- * Converts a coefficient array to a compact byte array and vice versa.
- */
-public class ArrayEncoder
-{
-    /**
-     * Bit string to coefficient conversion table from P1363.1. Also found at
-     * {@link http://stackoverflow.com/questions/1562548/how-to-make-a-message-into-a-polynomial}
-     * <p>
-     * Convert each three-bit quantity to two ternary coefficients as follows, and concatenate the resulting
-     * ternary quantities to obtain [the output].
-     * </p><p>
-     * <code>
-     * {0, 0, 0} -> {0, 0}<br/>
-     * {0, 0, 1} -> {0, 1}<br/>
-     * {0, 1, 0} -> {0, -1}<br/>
-     * {0, 1, 1} -> {1, 0}<br/>
-     * {1, 0, 0} -> {1, 1}<br/>
-     * {1, 0, 1} -> {1, -1}<br/>
-     * {1, 1, 0} -> {-1, 0}<br/>
-     * {1, 1, 1} -> {-1, 1}<br/>
-     * </code>
-     * </p>
-     */
-    private static final int[] COEFF1_TABLE = {0, 0, 0, 1, 1, 1, -1, -1};
-    private static final int[] COEFF2_TABLE = {0, 1, -1, 0, 1, -1, 0, 1};
-    /**
-     * Coefficient to bit string conversion table from P1363.1. Also found at
-     * {@link http://stackoverflow.com/questions/1562548/how-to-make-a-message-into-a-polynomial}
-     * <p>
-     * Convert each set of two ternary coefficients to three bits as follows, and concatenate the resulting bit
-     * quantities to obtain [the output]:
-     * </p><p>
-     * <code>
-     * {-1, -1} -> set "fail" to 1 and set bit string to {1, 1, 1}
-     * {-1, 0} -> {1, 1, 0}<br/>
-     * {-1, 1} -> {1, 1, 1}<br/>
-     * {0, -1} -> {0, 1, 0}<br/>
-     * {0, 0} -> {0, 0, 0}<br/>
-     * {0, 1} -> {0, 0, 1}<br/>
-     * {1, -1} -> {1, 0, 1}<br/>
-     * {1, 0} -> {0, 1, 1}<br/>
-     * {1, 1} -> {1, 0, 0}<br/>
-     * </code>   \
-     * </p>
-     */
-    private static final int[] BIT1_TABLE = {1, 1, 1, 0, 0, 0, 1, 0, 1};
-    private static final int[] BIT2_TABLE = {1, 1, 1, 1, 0, 0, 0, 1, 0};
-    private static final int[] BIT3_TABLE = {1, 0, 1, 0, 0, 1, 1, 1, 0};
-
-    /**
-     * Encodes an int array whose elements are between 0 and <code>q</code>,
-     * to a byte array leaving no gaps between bits.<br>
-     * <code>q</code> must be a power of 2.
-     *
-     * @param a the input array
-     * @param q the modulus
-     * @return the encoded array
-     */
-    public static byte[] encodeModQ(int[] a, int q)
-    {
-        int bitsPerCoeff = 31 - Integer.numberOfLeadingZeros(q);
-        int numBits = a.length * bitsPerCoeff;
-        int numBytes = (numBits + 7) / 8;
-        byte[] data = new byte[numBytes];
-        int bitIndex = 0;
-        int byteIndex = 0;
-        for (int i = 0; i < a.length; i++)
-        {
-            for (int j = 0; j < bitsPerCoeff; j++)
-            {
-                int currentBit = (a[i] >> j) & 1;
-                data[byteIndex] |= currentBit << bitIndex;
-                if (bitIndex == 7)
-                {
-                    bitIndex = 0;
-                    byteIndex++;
-                }
-                else
-                {
-                    bitIndex++;
-                }
-            }
-        }
-        return data;
-    }
-
-    /**
-     * Decodes a <code>byte</code> array encoded with {@link #encodeModQ(int[], int)} back to an <code>int</code> array.<br>
-     * <code>N</code> is the number of coefficients. <code>q</code> must be a power of <code>2</code>.<br>
-     * Ignores any excess bytes.
-     *
-     * @param data an encoded ternary polynomial
-     * @param N    number of coefficients
-     * @param q
-     * @return an array containing <code>N</code> coefficients between <code>0</code> and <code>q-1</code>
-     */
-    public static int[] decodeModQ(byte[] data, int N, int q)
-    {
-        int[] coeffs = new int[N];
-        int bitsPerCoeff = 31 - Integer.numberOfLeadingZeros(q);
-        int numBits = N * bitsPerCoeff;
-        int coeffIndex = 0;
-        for (int bitIndex = 0; bitIndex < numBits; bitIndex++)
-        {
-            if (bitIndex > 0 && bitIndex % bitsPerCoeff == 0)
-            {
-                coeffIndex++;
-            }
-            int bit = getBit(data, bitIndex);
-            coeffs[coeffIndex] += bit << (bitIndex % bitsPerCoeff);
-        }
-        return coeffs;
-    }
-
-    /**
-     * Decodes data encoded with {@link #encodeModQ(int[], int)} back to an <code>int</code> array.<br>
-     * <code>N</code> is the number of coefficients. <code>q</code> must be a power of <code>2</code>.<br>
-     * Ignores any excess bytes.
-     *
-     * @param is an encoded ternary polynomial
-     * @param N  number of coefficients
-     * @param q
-     * @return the decoded polynomial
-     */
-    public static int[] decodeModQ(InputStream is, int N, int q)
-        throws IOException
-    {
-        int qBits = 31 - Integer.numberOfLeadingZeros(q);
-        int size = (N * qBits + 7) / 8;
-        byte[] arr = Util.readFullLength(is, size);
-        return decodeModQ(arr, N, q);
-    }
-
-    /**
-     * Decodes a <code>byte</code> array encoded with {@link #encodeMod3Sves(int[])} back to an <code>int</code> array
-     * with <code>N</code> coefficients between <code>-1</code> and <code>1</code>.<br>
-     * Ignores any excess bytes.<br>
-     * See P1363.1 section 9.2.2.
-     *
-     * @param data an encoded ternary polynomial
-     * @param N    number of coefficients
-     * @return the decoded coefficients
-     */
-    public static int[] decodeMod3Sves(byte[] data, int N)
-    {
-        int[] coeffs = new int[N];
-        int coeffIndex = 0;
-        for (int bitIndex = 0; bitIndex < data.length * 8; )
-        {
-            int bit1 = getBit(data, bitIndex++);
-            int bit2 = getBit(data, bitIndex++);
-            int bit3 = getBit(data, bitIndex++);
-            int coeffTableIndex = bit1 * 4 + bit2 * 2 + bit3;
-            coeffs[coeffIndex++] = COEFF1_TABLE[coeffTableIndex];
-            coeffs[coeffIndex++] = COEFF2_TABLE[coeffTableIndex];
-            // ignore bytes that can't fit
-            if (coeffIndex > N - 2)
-            {
-                break;
-            }
-        }
-        return coeffs;
-    }
-
-    /**
-     * Encodes an <code>int</code> array whose elements are between <code>-1</code> and <code>1</code>, to a byte array.
-     * <code>coeffs[2*i]</code> and <code>coeffs[2*i+1]</code> must not both equal -1 for any integer <code>i</code>,
-     * so this method is only safe to use with arrays produced by {@link #decodeMod3Sves(byte[], int)}.<br>
-     * See P1363.1 section 9.2.3.
-     *
-     * @param arr
-     * @return the encoded array
-     */
-    public static byte[] encodeMod3Sves(int[] arr)
-    {
-        int numBits = (arr.length * 3 + 1) / 2;
-        int numBytes = (numBits + 7) / 8;
-        byte[] data = new byte[numBytes];
-        int bitIndex = 0;
-        int byteIndex = 0;
-        for (int i = 0; i < arr.length / 2 * 2; )
-        {   // if length is an odd number, throw away the highest coeff
-            int coeff1 = arr[i++] + 1;
-            int coeff2 = arr[i++] + 1;
-            if (coeff1 == 0 && coeff2 == 0)
-            {
-                throw new IllegalStateException("Illegal encoding!");
-            }
-            int bitTableIndex = coeff1 * 3 + coeff2;
-            int[] bits = new int[]{BIT1_TABLE[bitTableIndex], BIT2_TABLE[bitTableIndex], BIT3_TABLE[bitTableIndex]};
-            for (int j = 0; j < 3; j++)
-            {
-                data[byteIndex] |= bits[j] << bitIndex;
-                if (bitIndex == 7)
-                {
-                    bitIndex = 0;
-                    byteIndex++;
-                }
-                else
-                {
-                    bitIndex++;
-                }
-            }
-        }
-        return data;
-    }
-
-    /**
-     * Encodes an <code>int</code> array whose elements are between <code>-1</code> and <code>1</code>, to a byte array.
-     *
-     * @return the encoded array
-     */
-    public static byte[] encodeMod3Tight(int[] intArray)
-    {
-        BigInteger sum = BigInteger.ZERO;
-        for (int i = intArray.length - 1; i >= 0; i--)
-        {
-            sum = sum.multiply(BigInteger.valueOf(3));
-            sum = sum.add(BigInteger.valueOf(intArray[i] + 1));
-        }
-
-        int size = (BigInteger.valueOf(3).pow(intArray.length).bitLength() + 7) / 8;
-        byte[] arr = sum.toByteArray();
-
-        if (arr.length < size)
-        {
-            // pad with leading zeros so arr.length==size
-            byte[] arr2 = new byte[size];
-            System.arraycopy(arr, 0, arr2, size - arr.length, arr.length);
-            return arr2;
-        }
-
-        if (arr.length > size)
-        // drop sign bit
-        {
-            arr = Arrays.copyOfRange(arr, 1, arr.length);
-        }
-        return arr;
-    }
-
-    /**
-     * Converts a byte array produced by {@link #encodeMod3Tight(int[])} back to an <code>int</code> array.
-     *
-     * @param b a byte array
-     * @param N number of coefficients
-     * @return the decoded array
-     */
-    public static int[] decodeMod3Tight(byte[] b, int N)
-    {
-        BigInteger sum = new BigInteger(1, b);
-        int[] coeffs = new int[N];
-        for (int i = 0; i < N; i++)
-        {
-            coeffs[i] = sum.mod(BigInteger.valueOf(3)).intValue() - 1;
-            if (coeffs[i] > 1)
-            {
-                coeffs[i] -= 3;
-            }
-            sum = sum.divide(BigInteger.valueOf(3));
-        }
-        return coeffs;
-    }
-
-    /**
-     * Converts data produced by {@link #encodeMod3Tight(int[])} back to an <code>int</code> array.
-     *
-     * @param is an input stream containing the data to decode
-     * @param N  number of coefficients
-     * @return the decoded array
-     */
-    public static int[] decodeMod3Tight(InputStream is, int N)
-        throws IOException
-    {
-        int size = (int)Math.ceil(N * Math.log(3) / Math.log(2) / 8);
-        byte[] arr = Util.readFullLength(is, size);
-        return decodeMod3Tight(arr, N);
-    }
-
-    private static int getBit(byte[] arr, int bitIndex)
-    {
-        int byteIndex = bitIndex / 8;
-        int arrElem = arr[byteIndex] & 0xFF;
-        return (arrElem >> (bitIndex % 8)) & 1;
-    }
-}
\ No newline at end of file
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/math/ntru/util/Util.java b/bcprov/src/main/java/org/bouncycastle/pqc/math/ntru/util/Util.java
deleted file mode 100644
index 92c2ed4..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/math/ntru/util/Util.java
+++ /dev/null
@@ -1,158 +0,0 @@
-package org.bouncycastle.pqc.math.ntru.util;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.security.SecureRandom;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import org.bouncycastle.pqc.math.ntru.euclid.IntEuclidean;
-import org.bouncycastle.pqc.math.ntru.polynomial.DenseTernaryPolynomial;
-import org.bouncycastle.pqc.math.ntru.polynomial.SparseTernaryPolynomial;
-import org.bouncycastle.pqc.math.ntru.polynomial.TernaryPolynomial;
-import org.bouncycastle.util.Integers;
-
-public class Util
-{
-    private static volatile boolean IS_64_BITNESS_KNOWN;
-    private static volatile boolean IS_64_BIT_JVM;
-
-    /**
-     * Calculates the inverse of n mod modulus
-     */
-    public static int invert(int n, int modulus)
-    {
-        n %= modulus;
-        if (n < 0)
-        {
-            n += modulus;
-        }
-        return IntEuclidean.calculate(n, modulus).x;
-    }
-
-    /**
-     * Calculates a^b mod modulus
-     */
-    public static int pow(int a, int b, int modulus)
-    {
-        int p = 1;
-        for (int i = 0; i < b; i++)
-        {
-            p = (p * a) % modulus;
-        }
-        return p;
-    }
-
-    /**
-     * Calculates a^b mod modulus
-     */
-    public static long pow(long a, int b, long modulus)
-    {
-        long p = 1;
-        for (int i = 0; i < b; i++)
-        {
-            p = (p * a) % modulus;
-        }
-        return p;
-    }
-
-    /**
-     * Generates a "sparse" or "dense" polynomial containing numOnes ints equal to 1,
-     * numNegOnes int equal to -1, and the rest equal to 0.
-     *
-     * @param N
-     * @param numOnes
-     * @param numNegOnes
-     * @param sparse     whether to create a {@link SparseTernaryPolynomial} or {@link DenseTernaryPolynomial}
-     * @return a ternary polynomial
-     */
-    public static TernaryPolynomial generateRandomTernary(int N, int numOnes, int numNegOnes, boolean sparse, SecureRandom random)
-    {
-        if (sparse)
-        {
-            return SparseTernaryPolynomial.generateRandom(N, numOnes, numNegOnes, random);
-        }
-        else
-        {
-            return DenseTernaryPolynomial.generateRandom(N, numOnes, numNegOnes, random);
-        }
-    }
-
-    /**
-     * Generates an array containing numOnes ints equal to 1,
-     * numNegOnes int equal to -1, and the rest equal to 0.
-     *
-     * @param N
-     * @param numOnes
-     * @param numNegOnes
-     * @return an array of integers
-     */
-    public static int[] generateRandomTernary(int N, int numOnes, int numNegOnes, SecureRandom random)
-    {
-        Integer one = Integers.valueOf(1);
-        Integer minusOne = Integers.valueOf(-1);
-        Integer zero = Integers.valueOf(0);
-
-        List list = new ArrayList();
-        for (int i = 0; i < numOnes; i++)
-        {
-            list.add(one);
-        }
-        for (int i = 0; i < numNegOnes; i++)
-        {
-            list.add(minusOne);
-        }
-        while (list.size() < N)
-        {
-            list.add(zero);
-        }
-
-        Collections.shuffle(list, random);
-
-        int[] arr = new int[N];
-        for (int i = 0; i < N; i++)
-        {
-            arr[i] = ((Integer)list.get(i)).intValue();
-        }
-        return arr;
-    }
-
-    /**
-     * Takes an educated guess as to whether 64 bits are supported by the JVM.
-     *
-     * @return <code>true</code> if 64-bit support detected, <code>false</code> otherwise
-     */
-    public static boolean is64BitJVM()
-    {
-        if (!IS_64_BITNESS_KNOWN)
-        {
-            String arch = System.getProperty("os.arch");
-            String sunModel = System.getProperty("sun.arch.data.model");
-            IS_64_BIT_JVM = "amd64".equals(arch) || "x86_64".equals(arch) || "ppc64".equals(arch) || "64".equals(sunModel);
-            IS_64_BITNESS_KNOWN = true;
-        }
-        return IS_64_BIT_JVM;
-    }
-
-    /**
-     * Reads a given number of bytes from an <code>InputStream</code>.
-     * If there are not enough bytes in the stream, an <code>IOException</code>
-     * is thrown.
-     *
-     * @param is
-     * @param length
-     * @return an array of length <code>length</code>
-     * @throws IOException
-     */
-    public static byte[] readFullLength(InputStream is, int length)
-        throws IOException
-    {
-        byte[] arr = new byte[length];
-        if (is.read(arr) != arr.length)
-        {
-            throw new IOException("Not enough bytes to read.");
-        }
-        return arr;
-    }
-}
\ No newline at end of file
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/math/ntru/util/test/AllTests.java b/bcprov/src/main/java/org/bouncycastle/pqc/math/ntru/util/test/AllTests.java
deleted file mode 100644
index 55fc973..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/math/ntru/util/test/AllTests.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package org.bouncycastle.pqc.math.ntru.util.test;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-public class AllTests
-    extends TestCase
-{
-    public static void main (String[] args)
-    {
-        junit.textui.TestRunner.run(suite());
-    }
-    
-    public static Test suite()
-    {
-        TestSuite suite = new TestSuite("NTRU ArrayEncoder Tests");
-        
-        suite.addTestSuite(ArrayEncoderTest.class);
-        
-        return suite;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/pqc/math/ntru/util/test/ArrayEncoderTest.java b/bcprov/src/main/java/org/bouncycastle/pqc/math/ntru/util/test/ArrayEncoderTest.java
deleted file mode 100644
index 6dbdea3..0000000
--- a/bcprov/src/main/java/org/bouncycastle/pqc/math/ntru/util/test/ArrayEncoderTest.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package org.bouncycastle.pqc.math.ntru.util.test;
-
-import java.security.SecureRandom;
-import java.util.Random;
-
-import junit.framework.TestCase;
-import org.bouncycastle.pqc.math.ntru.polynomial.DenseTernaryPolynomial;
-import org.bouncycastle.pqc.math.ntru.polynomial.test.PolynomialGenerator;
-import org.bouncycastle.pqc.math.ntru.util.ArrayEncoder;
-import org.bouncycastle.util.Arrays;
-
-public class ArrayEncoderTest
-    extends TestCase
-{
-    public void testEncodeDecodeModQ()
-    {
-        int[] coeffs = PolynomialGenerator.generateRandom(1000, 2048).coeffs;
-        byte[] data = ArrayEncoder.encodeModQ(coeffs, 2048);
-        int[] coeffs2 = ArrayEncoder.decodeModQ(data, 1000, 2048);
-        assertTrue(Arrays.areEqual(coeffs, coeffs2));
-    }
-
-    public void testEncodeDecodeMod3Sves()
-    {
-        Random rng = new Random();
-        byte[] data = new byte[180];
-        rng.nextBytes(data);
-        int[] coeffs = ArrayEncoder.decodeMod3Sves(data, 960);
-        byte[] data2 = ArrayEncoder.encodeMod3Sves(coeffs);
-        assertTrue(Arrays.areEqual(data, data2));
-    }
-
-    public void testEncodeDecodeMod3Tight()
-    {
-        SecureRandom random = new SecureRandom();
-
-        int[] coeffs = DenseTernaryPolynomial.generateRandom(1000, random).coeffs;
-        byte[] data = ArrayEncoder.encodeMod3Tight(coeffs);
-        int[] coeffs2 = ArrayEncoder.decodeMod3Tight(data, 1000);
-        assertTrue(Arrays.areEqual(coeffs, coeffs2));
-    }
-}
\ No newline at end of file
diff --git a/bcprov/src/main/java/org/bouncycastle/util/MemoableResetException.java b/bcprov/src/main/java/org/bouncycastle/util/MemoableResetException.java
deleted file mode 100644
index 6552bd4..0000000
--- a/bcprov/src/main/java/org/bouncycastle/util/MemoableResetException.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package org.bouncycastle.util;
-
-/**
- * Exception to be thrown on a failure to reset an object implementing Memoable.
- * <p>
- * The exception extends ClassCastException to enable users to have a single handling case,
- * only introducing specific handling of this one if required.
- * </p>
- */
-public class MemoableResetException
-    extends ClassCastException
-{
-    /**
-     * Basic Constructor.
-     *
-     * @param msg message to be associated with this exception.
-     */
-    public MemoableResetException(String msg)
-    {
-        super(msg);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/util/Shorts.java b/bcprov/src/main/java/org/bouncycastle/util/Shorts.java
deleted file mode 100644
index 258e01e..0000000
--- a/bcprov/src/main/java/org/bouncycastle/util/Shorts.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package org.bouncycastle.util;
-
-public class Shorts
-{
-    public static Short valueOf(short value)
-    {
-        return Short.valueOf(value);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/util/StreamParser.java b/bcprov/src/main/java/org/bouncycastle/util/StreamParser.java
deleted file mode 100644
index 13f2b16..0000000
--- a/bcprov/src/main/java/org/bouncycastle/util/StreamParser.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package org.bouncycastle.util;
-
-import java.util.Collection;
-
-public interface StreamParser
-{
-    Object read() throws StreamParsingException;
-
-    Collection readAll() throws StreamParsingException;
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/util/StreamParsingException.java b/bcprov/src/main/java/org/bouncycastle/util/StreamParsingException.java
deleted file mode 100644
index 0a76378..0000000
--- a/bcprov/src/main/java/org/bouncycastle/util/StreamParsingException.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package org.bouncycastle.util;
-
-public class StreamParsingException 
-    extends Exception
-{
-    Throwable _e;
-
-    public StreamParsingException(String message, Throwable e)
-    {
-        super(message);
-        _e = e;
-    }
-
-    public Throwable getCause()
-    {
-        return _e;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/util/Times.java b/bcprov/src/main/java/org/bouncycastle/util/Times.java
deleted file mode 100644
index 617d00b..0000000
--- a/bcprov/src/main/java/org/bouncycastle/util/Times.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package org.bouncycastle.util;
-
-public final class Times
-{
-    public static long nanoTime()
-    {
-        return System.nanoTime();
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/util/encoders/BufferedDecoder.java b/bcprov/src/main/java/org/bouncycastle/util/encoders/BufferedDecoder.java
deleted file mode 100644
index eea85b9..0000000
--- a/bcprov/src/main/java/org/bouncycastle/util/encoders/BufferedDecoder.java
+++ /dev/null
@@ -1,96 +0,0 @@
-package org.bouncycastle.util.encoders;
-
-
-/**
- * A buffering class to allow translation from one format to another to
- * be done in discrete chunks.
- */
-public class BufferedDecoder
-{
-    protected byte[]        buf;
-    protected int           bufOff;
-
-    protected Translator    translator;
-
-    /**
-     * @param translator the translator to use.
-     * @param bufSize amount of input to buffer for each chunk.
-     */
-    public BufferedDecoder(
-        Translator  translator,
-        int         bufSize)
-    {
-        this.translator = translator;
-
-        if ((bufSize % translator.getEncodedBlockSize()) != 0)
-        {
-            throw new IllegalArgumentException("buffer size not multiple of input block size");
-        }
-
-        buf = new byte[bufSize];
-        bufOff = 0;
-    }
-
-    public int processByte(
-        byte        in,
-        byte[]      out,
-        int         outOff)
-    {
-        int         resultLen = 0;
-
-        buf[bufOff++] = in;
-
-        if (bufOff == buf.length)
-        {
-            resultLen = translator.decode(buf, 0, buf.length, out, outOff);
-            bufOff = 0;
-        }
-
-        return resultLen;
-    }
-
-    public int processBytes(
-        byte[]      in,
-        int         inOff,
-        int         len,
-        byte[]      out,
-        int         outOff)
-    {
-        if (len < 0)
-        {
-            throw new IllegalArgumentException("Can't have a negative input length!");
-        }
-
-        int resultLen = 0;
-        int gapLen = buf.length - bufOff;
-
-        if (len > gapLen)
-        {
-            System.arraycopy(in, inOff, buf, bufOff, gapLen);
-
-            resultLen += translator.decode(buf, 0, buf.length, out, outOff);
-
-            bufOff = 0;
-
-            len -= gapLen;
-            inOff += gapLen;
-            outOff += resultLen;
-
-            int chunkSize = len - (len % buf.length);
-
-            resultLen += translator.decode(in, inOff, chunkSize, out, outOff);
-
-            len -= chunkSize;
-            inOff += chunkSize;
-        }
-
-        if (len != 0)
-        {
-            System.arraycopy(in, inOff, buf, bufOff, len);
-
-            bufOff += len;
-        }
-
-        return resultLen;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/util/encoders/BufferedEncoder.java b/bcprov/src/main/java/org/bouncycastle/util/encoders/BufferedEncoder.java
deleted file mode 100644
index 60a098d..0000000
--- a/bcprov/src/main/java/org/bouncycastle/util/encoders/BufferedEncoder.java
+++ /dev/null
@@ -1,96 +0,0 @@
-package org.bouncycastle.util.encoders;
-
-
-/**
- * A buffering class to allow translation from one format to another to
- * be done in discrete chunks.
- */
-public class BufferedEncoder
-{
-    protected byte[]        buf;
-    protected int           bufOff;
-
-    protected Translator    translator;
-
-    /**
-     * @param translator the translator to use.
-     * @param bufSize amount of input to buffer for each chunk.
-     */
-    public BufferedEncoder(
-        Translator  translator,
-        int         bufSize)
-    {
-        this.translator = translator;
-
-        if ((bufSize % translator.getEncodedBlockSize()) != 0)
-        {
-            throw new IllegalArgumentException("buffer size not multiple of input block size");
-        }
-
-        buf = new byte[bufSize];
-        bufOff = 0;
-    }
-
-    public int processByte(
-        byte        in,
-        byte[]      out,
-        int         outOff)
-    {
-        int         resultLen = 0;
-
-        buf[bufOff++] = in;
-
-        if (bufOff == buf.length)
-        {
-            resultLen = translator.encode(buf, 0, buf.length, out, outOff);
-            bufOff = 0;
-        }
-
-        return resultLen;
-    }
-
-    public int processBytes(
-        byte[]      in,
-        int         inOff,
-        int         len,
-        byte[]      out,
-        int         outOff)
-    {
-        if (len < 0)
-        {
-            throw new IllegalArgumentException("Can't have a negative input length!");
-        }
-
-        int resultLen = 0;
-        int gapLen = buf.length - bufOff;
-
-        if (len > gapLen)
-        {
-            System.arraycopy(in, inOff, buf, bufOff, gapLen);
-
-            resultLen += translator.encode(buf, 0, buf.length, out, outOff);
-
-            bufOff = 0;
-
-            len -= gapLen;
-            inOff += gapLen;
-            outOff += resultLen;
-
-            int chunkSize = len - (len % buf.length);
-
-            resultLen += translator.encode(in, inOff, chunkSize, out, outOff);
-
-            len -= chunkSize;
-            inOff += chunkSize;
-        }
-
-        if (len != 0)
-        {
-            System.arraycopy(in, inOff, buf, bufOff, len);
-
-            bufOff += len;
-        }
-
-        return resultLen;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/util/encoders/HexTranslator.java b/bcprov/src/main/java/org/bouncycastle/util/encoders/HexTranslator.java
deleted file mode 100644
index 3fff65a..0000000
--- a/bcprov/src/main/java/org/bouncycastle/util/encoders/HexTranslator.java
+++ /dev/null
@@ -1,87 +0,0 @@
-package org.bouncycastle.util.encoders;
-
-/**
- * Converters for going from hex to binary and back. Note: this class assumes ASCII processing.
- */
-public class HexTranslator
-    implements Translator
-{
-    private static final byte[]   hexTable = 
-        { 
-            (byte)'0', (byte)'1', (byte)'2', (byte)'3', (byte)'4', (byte)'5', (byte)'6', (byte)'7',
-            (byte)'8', (byte)'9', (byte)'a', (byte)'b', (byte)'c', (byte)'d', (byte)'e', (byte)'f'
-        };
-
-    /**
-     * size of the output block on encoding produced by getDecodedBlockSize()
-     * bytes.
-     */
-    public int getEncodedBlockSize()
-    {
-        return 2;
-    }
-
-    public int encode(
-        byte[]  in,
-        int     inOff,
-        int     length,
-        byte[]  out,
-        int     outOff)
-    {
-        for (int i = 0, j = 0; i < length; i++, j += 2)
-        {
-            out[outOff + j] = hexTable[(in[inOff] >> 4) & 0x0f];
-            out[outOff + j + 1] = hexTable[in[inOff] & 0x0f];
-
-            inOff++;
-        }
-
-        return length * 2;
-    }
-
-    /**
-     * size of the output block on decoding produced by getEncodedBlockSize()
-     * bytes.
-     */
-    public int getDecodedBlockSize()
-    {
-        return 1;
-    }
-
-    public int decode(
-        byte[]  in,
-        int     inOff,
-        int     length,
-        byte[]  out,
-        int     outOff)
-    {
-        int halfLength = length / 2;
-        byte left, right;
-        for (int i = 0; i < halfLength; i++)
-        {
-            left  = in[inOff + i * 2];
-            right = in[inOff + i * 2 + 1];
-            
-            if (left < (byte)'a')
-            {
-                out[outOff] = (byte)((left - '0') << 4);
-            }
-            else
-            {
-                out[outOff] = (byte)((left - 'a' + 10) << 4);
-            }
-            if (right < (byte)'a')
-            {
-                out[outOff] += (byte)(right - '0');
-            }
-            else
-            {
-                out[outOff] += (byte)(right - 'a' + 10);
-            }
-
-            outOff++;
-        }
-
-        return halfLength;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/util/encoders/Translator.java b/bcprov/src/main/java/org/bouncycastle/util/encoders/Translator.java
deleted file mode 100644
index 96381bc..0000000
--- a/bcprov/src/main/java/org/bouncycastle/util/encoders/Translator.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package org.bouncycastle.util.encoders;
-
-/**
- * General interface for an translator.
- */
-public interface Translator
-{
-    /**
-     * size of the output block on encoding produced by getDecodedBlockSize()
-     * bytes.
-     */
-    public int getEncodedBlockSize();
-
-    public int encode(byte[] in, int inOff, int length, byte[] out, int outOff);
-
-    /**
-     * size of the output block on decoding produced by getEncodedBlockSize()
-     * bytes.
-     */
-    public int getDecodedBlockSize();
-
-    public int decode(byte[] in, int inOff, int length, byte[] out, int outOff);
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/util/encoders/UrlBase64.java b/bcprov/src/main/java/org/bouncycastle/util/encoders/UrlBase64.java
deleted file mode 100644
index 3b83e95..0000000
--- a/bcprov/src/main/java/org/bouncycastle/util/encoders/UrlBase64.java
+++ /dev/null
@@ -1,129 +0,0 @@
-package org.bouncycastle.util.encoders;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-
-/**
- * Convert binary data to and from UrlBase64 encoding.  This is identical to
- * Base64 encoding, except that the padding character is "." and the other 
- * non-alphanumeric characters are "-" and "_" instead of "+" and "/".
- * <p>
- * The purpose of UrlBase64 encoding is to provide a compact encoding of binary
- * data that is safe for use as an URL parameter. Base64 encoding does not
- * produce encoded values that are safe for use in URLs, since "/" can be 
- * interpreted as a path delimiter; "+" is the encoded form of a space; and
- * "=" is used to separate a name from the corresponding value in an URL 
- * parameter.
- */
-public class UrlBase64
-{
-    private static final Encoder encoder = new UrlBase64Encoder();
-    
-    /**
-     * Encode the input data producing a URL safe base 64 encoded byte array.
-     *
-     * @return a byte array containing the URL safe base 64 encoded data.
-     */
-    public static byte[] encode(
-        byte[]    data)
-    {
-        ByteArrayOutputStream    bOut = new ByteArrayOutputStream();
-        
-        try
-        {
-            encoder.encode(data, 0, data.length, bOut);
-        }
-        catch (Exception e)
-        {
-            throw new EncoderException("exception encoding URL safe base64 data: " + e.getMessage(), e);
-        }
-        
-        return bOut.toByteArray();
-    }
-
-    /**
-     * Encode the byte data writing it to the given output stream.
-     *
-     * @return the number of bytes produced.
-     */
-    public static int encode(
-        byte[]                data,
-        OutputStream    out)
-        throws IOException
-    {
-        return encoder.encode(data, 0, data.length, out);
-    }
-    
-    /**
-     * Decode the URL safe base 64 encoded input data - white space will be ignored.
-     *
-     * @return a byte array representing the decoded data.
-     */
-    public static byte[] decode(
-        byte[]    data)
-    {
-        ByteArrayOutputStream    bOut = new ByteArrayOutputStream();
-        
-        try
-        {
-            encoder.decode(data, 0, data.length, bOut);
-        }
-        catch (Exception e)
-        {
-            throw new DecoderException("exception decoding URL safe base64 string: " + e.getMessage(), e);
-        }
-        
-        return bOut.toByteArray();
-    }
-    
-    /**
-     * decode the URL safe base 64 encoded byte data writing it to the given output stream,
-     * whitespace characters will be ignored.
-     *
-     * @return the number of bytes produced.
-     */
-    public static int decode(
-        byte[]                data,
-        OutputStream    out)
-        throws IOException
-    {
-        return encoder.decode(data, 0, data.length, out);
-    }
-    
-    /**
-     * decode the URL safe base 64 encoded String data - whitespace will be ignored.
-     *
-     * @return a byte array representing the decoded data.
-     */
-    public static byte[] decode(
-        String    data)
-    {
-        ByteArrayOutputStream    bOut = new ByteArrayOutputStream();
-        
-        try
-        {
-            encoder.decode(data, bOut);
-        }
-        catch (Exception e)
-        {
-            throw new DecoderException("exception decoding URL safe base64 string: " + e.getMessage(), e);
-        }
-        
-        return bOut.toByteArray();
-    }
-    
-    /**
-     * Decode the URL safe base 64 encoded String data writing it to the given output stream,
-     * whitespace characters will be ignored.
-     *
-     * @return the number of bytes produced.
-     */
-    public static int decode(
-        String                data,
-        OutputStream    out)
-        throws IOException
-    {
-        return encoder.decode(data, out);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/util/encoders/UrlBase64Encoder.java b/bcprov/src/main/java/org/bouncycastle/util/encoders/UrlBase64Encoder.java
deleted file mode 100644
index a5fff5e..0000000
--- a/bcprov/src/main/java/org/bouncycastle/util/encoders/UrlBase64Encoder.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package org.bouncycastle.util.encoders;
-
-/**
- * Convert binary data to and from UrlBase64 encoding.  This is identical to
- * Base64 encoding, except that the padding character is "." and the other 
- * non-alphanumeric characters are "-" and "_" instead of "+" and "/".
- * <p>
- * The purpose of UrlBase64 encoding is to provide a compact encoding of binary
- * data that is safe for use as an URL parameter. Base64 encoding does not
- * produce encoded values that are safe for use in URLs, since "/" can be 
- * interpreted as a path delimiter; "+" is the encoded form of a space; and
- * "=" is used to separate a name from the corresponding value in an URL 
- * parameter.
- */
-public class UrlBase64Encoder extends Base64Encoder
-{
-    public UrlBase64Encoder()
-    {
-        encodingTable[encodingTable.length - 2] = (byte) '-';
-        encodingTable[encodingTable.length - 1] = (byte) '_';
-        padding = (byte) '.';
-        // we must re-create the decoding table with the new encoded values.
-        initialiseDecodingTable();
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/util/encoders/package.html b/bcprov/src/main/java/org/bouncycastle/util/encoders/package.html
deleted file mode 100644
index 3be222b..0000000
--- a/bcprov/src/main/java/org/bouncycastle/util/encoders/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body bgcolor="#ffffff">
-Classes for producing and reading Base64 and Hex strings.
-</body>
-</html>
diff --git a/bcprov/src/main/java/org/bouncycastle/util/io/BufferingOutputStream.java b/bcprov/src/main/java/org/bouncycastle/util/io/BufferingOutputStream.java
deleted file mode 100644
index 9d5fe14..0000000
--- a/bcprov/src/main/java/org/bouncycastle/util/io/BufferingOutputStream.java
+++ /dev/null
@@ -1,108 +0,0 @@
-package org.bouncycastle.util.io;
-
-import java.io.IOException;
-import java.io.OutputStream;
-
-import org.bouncycastle.util.Arrays;
-
-/**
- * An output stream that buffers data to be feed into an encapsulated output stream.
- * <p>
- * The stream zeroes out the internal buffer on each flush.
- * </p>
- */
-public class BufferingOutputStream
-    extends OutputStream
-{
-    private final OutputStream other;
-    private final byte[] buf;
-
-    private int   bufOff;
-
-    /**
-     * Create a buffering stream with the default buffer size (4096).
-     *
-     * @param other output stream to be wrapped.
-     */
-    public BufferingOutputStream(OutputStream other)
-    {
-        this.other = other;
-        this.buf = new byte[4096];
-    }
-
-    /**
-     * Create a buffering stream with a specified buffer size.
-     *
-     * @param other output stream to be wrapped.
-     * @param bufferSize size in bytes for internal buffer.
-     */
-    public BufferingOutputStream(OutputStream other, int bufferSize)
-    {
-        this.other = other;
-        this.buf = new byte[bufferSize];
-    }
-
-    public void write(byte[] bytes, int offset, int len)
-        throws IOException
-    {
-        if (len < buf.length - bufOff)
-        {
-            System.arraycopy(bytes, offset, buf, bufOff, len);
-            bufOff += len;
-        }
-        else
-        {
-            int gap = buf.length - bufOff;
-
-            System.arraycopy(bytes, offset, buf, bufOff, gap);
-            bufOff += gap;
-
-            flush();
-
-            offset += gap;
-            len -= gap;
-            while (len >= buf.length)
-            {
-                other.write(bytes, offset, buf.length);
-                offset += buf.length;
-                len -= buf.length;
-            }
-
-            if (len > 0)
-            {
-                System.arraycopy(bytes, offset, buf, bufOff, len);
-                bufOff += len;
-            }
-        }
-    }
-
-    public void write(int b)
-        throws IOException
-    {
-        buf[bufOff++] = (byte)b;
-        if (bufOff == buf.length)
-        {
-            flush();
-        }
-    }
-
-    /**
-     * Flush the internal buffer to the encapsulated output stream. Zero the buffer contents when done.
-     *
-     * @throws IOException on error.
-     */
-    public void flush()
-        throws IOException
-    {
-        other.write(buf, 0, bufOff);
-        bufOff = 0;
-        Arrays.fill(buf, (byte)0);
-    }
-
-    public void close()
-        throws IOException
-    {
-        flush();
-        other.close();
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/util/io/package.html b/bcprov/src/main/java/org/bouncycastle/util/io/package.html
deleted file mode 100644
index e987cca..0000000
--- a/bcprov/src/main/java/org/bouncycastle/util/io/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body bgcolor="#ffffff">
-General purpose I/O helper classes and wrappers.
-</body>
-</html>
diff --git a/bcprov/src/main/java/org/bouncycastle/util/io/pem/package.html b/bcprov/src/main/java/org/bouncycastle/util/io/pem/package.html
deleted file mode 100644
index c5cc4a5..0000000
--- a/bcprov/src/main/java/org/bouncycastle/util/io/pem/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body bgcolor="#ffffff">
-Classes for reading and writing raw PEM objects.
-</body>
-</html>
diff --git a/bcprov/src/main/java/org/bouncycastle/util/package.html b/bcprov/src/main/java/org/bouncycastle/util/package.html
deleted file mode 100644
index c9247ea..0000000
--- a/bcprov/src/main/java/org/bouncycastle/util/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body bgcolor="#ffffff">
-General purpose utility classes used throughout the APIs.
-</body>
-</html>
diff --git a/bcprov/src/main/java/org/bouncycastle/util/test/FixedSecureRandom.java b/bcprov/src/main/java/org/bouncycastle/util/test/FixedSecureRandom.java
deleted file mode 100644
index 49bd730..0000000
--- a/bcprov/src/main/java/org/bouncycastle/util/test/FixedSecureRandom.java
+++ /dev/null
@@ -1,135 +0,0 @@
-package org.bouncycastle.util.test;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.security.SecureRandom;
-
-public class FixedSecureRandom
-    extends SecureRandom
-{
-    private byte[]       _data;
-    
-    private int          _index;
-    private int          _intPad;
-    
-    public FixedSecureRandom(byte[] value)
-    {
-        this(false, new byte[][] { value });
-    }
-    
-    public FixedSecureRandom(
-        byte[][] values)
-    {
-        this(false, values);
-    }
-    
-    /**
-     * Pad the data on integer boundaries. This is necessary for the classpath project's BigInteger
-     * implementation.
-     */
-    public FixedSecureRandom(
-        boolean intPad,
-        byte[] value)
-    {
-        this(intPad, new byte[][] { value });
-    }
-    
-    /**
-     * Pad the data on integer boundaries. This is necessary for the classpath project's BigInteger
-     * implementation.
-     */
-    public FixedSecureRandom(
-        boolean intPad,
-        byte[][] values)
-    {
-        ByteArrayOutputStream bOut = new ByteArrayOutputStream();
-        
-        for (int i = 0; i != values.length; i++)
-        {
-            try
-            {
-                bOut.write(values[i]);
-            }
-            catch (IOException e)
-            {
-                throw new IllegalArgumentException("can't save value array.");
-            }
-        }
-        
-        _data = bOut.toByteArray();
-        
-        if (intPad)
-        {
-            _intPad = _data.length % 4;
-        }
-    }
-
-    public void nextBytes(byte[] bytes)
-    {
-        System.arraycopy(_data, _index, bytes, 0, bytes.length);
-        
-        _index += bytes.length;
-    }
-    
-    //
-    // classpath's implementation of SecureRandom doesn't currently go back to nextBytes
-    // when next is called. We can't override next as it's a final method.
-    //
-    public int nextInt()
-    {
-        int val = 0;
-        
-        val |= nextValue() << 24;
-        val |= nextValue() << 16;
-        
-        if (_intPad == 2)
-        {
-            _intPad--;
-        }
-        else
-        {
-            val |= nextValue() << 8;
-        }
-        
-        if (_intPad == 1)
-        {
-            _intPad--;
-        }
-        else
-        {
-            val |= nextValue();
-        }
-        
-        return val;
-    }
-    
-    //
-    // classpath's implementation of SecureRandom doesn't currently go back to nextBytes
-    // when next is called. We can't override next as it's a final method.
-    //
-    public long nextLong()
-    {
-        long val = 0;
-        
-        val |= (long)nextValue() << 56;
-        val |= (long)nextValue() << 48;
-        val |= (long)nextValue() << 40;
-        val |= (long)nextValue() << 32;
-        val |= (long)nextValue() << 24;
-        val |= (long)nextValue() << 16;
-        val |= (long)nextValue() << 8;
-        val |= (long)nextValue();
-        
-        return val;
-    }
-
-    public boolean isExhausted()
-    {
-        return _index == _data.length;
-    }
-
-    private int nextValue()
-    {
-        return _data[_index++] & 0xff;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/util/test/NumberParsing.java b/bcprov/src/main/java/org/bouncycastle/util/test/NumberParsing.java
deleted file mode 100644
index a060dd8..0000000
--- a/bcprov/src/main/java/org/bouncycastle/util/test/NumberParsing.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package org.bouncycastle.util.test;
-
-/**
- * Parsing
- */
-public final class NumberParsing
-{
-    private NumberParsing() 
-    {
-        // Hide constructor
-    }
-    
-    public static long decodeLongFromHex(String longAsString) 
-    {
-        if ((longAsString.charAt(1) == 'x')
-            || (longAsString.charAt(1) == 'X'))
-        {
-            return Long.parseLong(longAsString.substring(2), 16);
-        }
-
-        return Long.parseLong(longAsString, 16);
-    }
-    
-    public static int decodeIntFromHex(String intAsString)
-    {
-        if ((intAsString.charAt(1) == 'x')
-            || (intAsString.charAt(1) == 'X'))
-        {
-            return Integer.parseInt(intAsString.substring(2), 16);
-        }
-
-        return Integer.parseInt(intAsString, 16);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/util/test/SimpleTest.java b/bcprov/src/main/java/org/bouncycastle/util/test/SimpleTest.java
deleted file mode 100644
index ef8ee61..0000000
--- a/bcprov/src/main/java/org/bouncycastle/util/test/SimpleTest.java
+++ /dev/null
@@ -1,84 +0,0 @@
-package org.bouncycastle.util.test;
-
-import java.io.PrintStream;
-
-import org.bouncycastle.util.Arrays;
-
-public abstract class SimpleTest
-    implements Test
-{
-    public abstract String getName();
-
-    private TestResult success()
-    {
-        return SimpleTestResult.successful(this, "Okay");
-    }
-    
-    protected void fail(
-        String message)
-    {
-        throw new TestFailedException(SimpleTestResult.failed(this, message));
-    }
-    
-    protected void fail(
-        String    message,
-        Throwable throwable)
-    {
-        throw new TestFailedException(SimpleTestResult.failed(this, message, throwable));
-    }
-    
-    protected void fail(
-        String message,
-        Object expected,
-        Object found)
-    {
-        throw new TestFailedException(SimpleTestResult.failed(this, message, expected, found));
-    }
-        
-    protected boolean areEqual(
-        byte[] a,
-        byte[] b)
-    {
-        return Arrays.areEqual(a, b);
-    }
-    
-    public TestResult perform()
-    {
-        try
-        {
-            performTest();
-            
-            return success();
-        }
-        catch (TestFailedException e)
-        {
-            return e.getResult();
-        }
-        catch (Exception e)
-        {
-            return SimpleTestResult.failed(this, "Exception: " +  e, e);
-        }
-    }
-    
-    protected static void runTest(
-        Test        test)
-    {
-        runTest(test, System.out);
-    }
-    
-    protected static void runTest(
-        Test        test,
-        PrintStream out)
-    {
-        TestResult      result = test.perform();
-
-        out.println(result.toString());
-        if (result.getException() != null)
-        {
-            result.getException().printStackTrace(out);
-        }
-    }
-
-    public abstract void performTest()
-        throws Exception;
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/util/test/SimpleTestResult.java b/bcprov/src/main/java/org/bouncycastle/util/test/SimpleTestResult.java
deleted file mode 100644
index bd69fe8..0000000
--- a/bcprov/src/main/java/org/bouncycastle/util/test/SimpleTestResult.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package org.bouncycastle.util.test;
-
-public class SimpleTestResult implements TestResult
-{
-    private static final String SEPARATOR = System.getProperty("line.separator");
-
-    private boolean             success;
-    private String              message;
-    private Throwable           exception;
-
-    public SimpleTestResult(boolean success, String message)
-    {
-        this.success = success;
-        this.message = message;
-    }
-
-    public SimpleTestResult(boolean success, String message, Throwable exception)
-    {
-        this.success = success;
-        this.message = message;
-        this.exception = exception;
-    }
-
-    public static TestResult successful(
-        Test test, 
-        String message)
-    {
-        return new SimpleTestResult(true, test.getName() + ": " + message);
-    }
-
-    public static TestResult failed(
-        Test test, 
-        String message)
-    {
-        return new SimpleTestResult(false, test.getName() + ": " + message);
-    }
-    
-    public static TestResult failed(
-        Test test, 
-        String message, 
-        Throwable t)
-    {
-        return new SimpleTestResult(false, test.getName() + ": " + message, t);
-    }
-    
-    public static TestResult failed(
-        Test test, 
-        String message, 
-        Object expected, 
-        Object found)
-    {
-        return failed(test, message + SEPARATOR + "Expected: " + expected + SEPARATOR + "Found   : " + found);
-    }
-    
-    public static String failedMessage(String algorithm, String testName, String expected,
-            String actual)
-    {
-        StringBuffer sb = new StringBuffer(algorithm);
-        sb.append(" failing ").append(testName);
-        sb.append(SEPARATOR).append("    expected: ").append(expected);
-        sb.append(SEPARATOR).append("    got     : ").append(actual);
-
-        return sb.toString();
-    }
-
-    public boolean isSuccessful()
-    {
-        return success;
-    }
-
-    public String toString()
-    {
-        return message;
-    }
-
-    public Throwable getException()
-    {
-        return exception;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/util/test/Test.java b/bcprov/src/main/java/org/bouncycastle/util/test/Test.java
deleted file mode 100644
index e631cd0..0000000
--- a/bcprov/src/main/java/org/bouncycastle/util/test/Test.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package org.bouncycastle.util.test;
-
-public interface Test
-{
-    String getName();
-
-    TestResult perform();
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/util/test/TestFailedException.java b/bcprov/src/main/java/org/bouncycastle/util/test/TestFailedException.java
deleted file mode 100644
index 21e95d3..0000000
--- a/bcprov/src/main/java/org/bouncycastle/util/test/TestFailedException.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package org.bouncycastle.util.test;
-
-public class TestFailedException 
-    extends RuntimeException
-{
-    private TestResult _result;
-    
-    public TestFailedException(
-        TestResult result)
-    {
-        _result = result;
-    }
-    
-    public TestResult getResult()
-    {
-        return _result;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/util/test/TestResult.java b/bcprov/src/main/java/org/bouncycastle/util/test/TestResult.java
deleted file mode 100644
index 0a1885f..0000000
--- a/bcprov/src/main/java/org/bouncycastle/util/test/TestResult.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package org.bouncycastle.util.test;
-
-public interface TestResult
-{
-    public boolean isSuccessful();
-    
-    public Throwable getException();
-    
-    public String toString();
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/util/test/UncloseableOutputStream.java b/bcprov/src/main/java/org/bouncycastle/util/test/UncloseableOutputStream.java
deleted file mode 100644
index 89073d7..0000000
--- a/bcprov/src/main/java/org/bouncycastle/util/test/UncloseableOutputStream.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package org.bouncycastle.util.test;
-
-import java.io.FilterOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-
-public class UncloseableOutputStream extends FilterOutputStream
-{
-    public UncloseableOutputStream(OutputStream s)
-    {
-        super(s);
-    }
-
-    public void close()
-    {
-        throw new RuntimeException("close() called on UncloseableOutputStream");
-    }
-
-    public void write(byte[] b, int off, int len) throws IOException
-    {
-        out.write(b, off, len);
-    }
- }
diff --git a/bcprov/src/main/java/org/bouncycastle/util/test/package.html b/bcprov/src/main/java/org/bouncycastle/util/test/package.html
deleted file mode 100644
index e723fd1..0000000
--- a/bcprov/src/main/java/org/bouncycastle/util/test/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body bgcolor="#ffffff">
-Light weight test API. If you can use Junit!
-</body>
-</html>
diff --git a/bcprov/src/main/java/org/bouncycastle/x509/CertPathReviewerException.java b/bcprov/src/main/java/org/bouncycastle/x509/CertPathReviewerException.java
deleted file mode 100644
index 173d478..0000000
--- a/bcprov/src/main/java/org/bouncycastle/x509/CertPathReviewerException.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package org.bouncycastle.x509;
-
-import java.security.cert.CertPath;
-
-import org.bouncycastle.i18n.ErrorBundle;
-import org.bouncycastle.i18n.LocalizedException;
-
-public class CertPathReviewerException extends LocalizedException
-{
-
-    private int index = -1;
-    
-    private CertPath certPath = null;
-    
-    public CertPathReviewerException(ErrorBundle errorMessage, Throwable throwable)
-    {
-        super(errorMessage, throwable);
-    }
-
-    public CertPathReviewerException(ErrorBundle errorMessage)
-    {
-        super(errorMessage);
-    }
-
-    public CertPathReviewerException(
-            ErrorBundle errorMessage, 
-            Throwable throwable,
-            CertPath certPath,
-            int index)
-    {
-        super(errorMessage, throwable);
-        if (certPath == null || index == -1)
-        {
-            throw new IllegalArgumentException();
-        }
-        if (index < -1 || (certPath != null && index >= certPath.getCertificates().size()))
-        {
-            throw new IndexOutOfBoundsException();
-        }
-        this.certPath = certPath;
-        this.index = index;
-    }
-    
-    public CertPathReviewerException(
-            ErrorBundle errorMessage, 
-            CertPath certPath,
-            int index)
-    {
-        super(errorMessage);
-        if (certPath == null || index == -1)
-        {
-            throw new IllegalArgumentException();
-        }
-        if (index < -1 || (certPath != null && index >= certPath.getCertificates().size()))
-        {
-            throw new IndexOutOfBoundsException();
-        }
-        this.certPath = certPath;
-        this.index = index;
-    }
-    
-    public CertPath getCertPath()
-    {
-        return certPath;
-    }
-    
-    public int getIndex()
-    {
-        return index;
-    }
-
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/x509/CertPathReviewerMessages_de.properties b/bcprov/src/main/java/org/bouncycastle/x509/CertPathReviewerMessages_de.properties
deleted file mode 100644
index b9398ea..0000000
--- a/bcprov/src/main/java/org/bouncycastle/x509/CertPathReviewerMessages_de.properties
+++ /dev/null
@@ -1,621 +0,0 @@
-
-## constructor exceptions 
-
-# cert path is empty
-CertPathReviewer.emptyCertPath.title = Zertifizierungspfad ist leer
-CertPathReviewer.emptyCertPath.text = PKIXCertPathReviewer: der Zertifizierungspfad ist leer.
-CertPathReviewer.emptyCertPath.summary = PKIXCertPathReviewer: der Zertifizierungspfad ist leer.
-CertPathReviewer.emptyCertPath.details = PKIXCertPathReviewer: der Zertifizierungspfad ist leer.
-
-## name constraints processing errors
-
-# cert DN is not in the permitted tree
-# {0} DN as String 
-CertPathReviewer.notPermittedDN.title = Fehler bei der Namensbeschränkung: Zertifikats DN ist nicht erlaubt
-CertPathReviewer.notPermittedDN.text = Fehler bei der Namensbeschränkung: Der Zertifikats DN {0} ist nicht erlaubt.
-CertPathReviewer.notPermittedDN.summary = Fehler bei der Namensbeschränkung: Der Zertifikats DN ist nicht erlaubt.
-CertPathReviewer.notPermittedDN.details = Fehler bei der Namensbeschränkung: Der Zertifikats DN {0} ist nicht im Set der erlaubten DNs.
-
-# cert DN is in the excluded tree
-# {0} DN as String
-CertPathReviewer.excludedDN.title = Fehler bei der Namensbeschränkung: Zertifikats DN ist ausgeschlossen
-CertPathReviewer.excludedDN.text = Fehler bei der Namensbeschränkung: Der Zertifikats DN {0} ist ausgeschlossen.
-CertPathReviewer.excludedDN.summary = Fehler bei der Namensbeschränkung: Der Zertifikats DN ist ausgeschlossen
-CertPathReviewer.excludedDN.details = Fehler bei der Namensbeschränkung: Der Zertifikats DN ist {0} is innerhalb des Sets von ausgeschlossenen DNs.
-
-# cert email is not in the permitted tree
-# {0} email address as String
-CertPathReviewer.notPermittedEmail.title = Fehler bei der Namensbeschränkung: nicht erlaubte Email Addresse
-CertPathReviewer.notPermittedEmail.text = Fehler bei der Namensbeschränkung: Das Zertifikat enthält die nicht erlaubte Email Addresse {0}.
-CertPathReviewer.notPermittedEmail.summary = Fehler bei der Namensbeschränkung: Die Email Addresse ist nicht erlaubt.
-CertPathReviewer.notPermittedEmail.details = Fehler bei der Namensbeschränkung: Das Zertifikat enthält die Email Addresse {0}, welche nicht im Set der erlaubten Email Addressen ist.
-
-# cert email is in the excluded tree
-# {0} email as String
-CertPathReviewer.excludedEmail.title = Fehler bei der Namensbeschränkung: Email Addresse ausgeschlossen
-CertPathReviewer.excludedEmail.text = Fehler bei der Namensbeschränkung: Die Email Addresse {0} im Zertifikat ist ausgeschlossen. 
-CertPathReviewer.excludedEmail.summary = Fehler bei der Namensbeschränkung: Die Email Addresse ist ausgeschlossen.
-CertPathReviewer.excludedEmail.details = Fehler bei der Namensbeschränkung: Das Zertifikat enthält die Email Addresse {0}, welche im Set der ausgeschlossenen Email Addressen ist.
-
-# cert IP is not in the permitted tree
-# {0} ip address as String
-CertPathReviewer.notPermittedIP.title = Fehler bei der Namensbeschränkung: nicht erlaubte IP Addresse
-CertPathReviewer.notPermittedIP.text = Fehler bei der Namensbeschränkung: Das Zertifikat enthält die nicht erlaubte IP Addresse {0}.
-CertPathReviewer.notPermittedIP.summary = Fehler bei der Namensbeschränkung: Die IP Addresse ist nicht erlaubt.
-CertPathReviewer.notPermittedIP.details = Fehler bei der Namensbeschränkung: Das Zertifikat enthält die IP Addresse {0}, welche nicht im Set der erlaubten IP Addressen ist.
-
-# cert ip is in the excluded tree
-# {0} ip address as String
-CertPathReviewer.excludedIP.title = Fehler bei der Namensbeschränkung: Ausgeschlossene IP Addresse
-CertPathReviewer.excludedIP.text = Fehler bei der Namensbeschränkung: Das Zertifikat enhält die ausgeschlossene IP Addresse {0}.
-CertPathReviewer.excludedIP.summary = Fehler bei der Namensbeschränkung: Die IP Addresse im Zertifikat ist ausgeschlossen.
-CertPathReviewer.excludedIP.details = Fehler bei der Namensbeschränkung: Das Zertifikat enthält die IP Addresse {0}, welche im Set der ausgeschlossenen IP Addressen ist.
-
-# error processing the name constraints extension
-CertPathReviewer.ncExtError.title = Prüfen der Namensbeschränkungen fehlgeschlagen
-CertPathReviewer.ncExtError.text = Prüfen der Namensbeschränkungen fehlgeschlagen: Es gab Fehler bei der Verarbeitung der Name Constraints Erweiterung des Zertifikats.
-CertPathReviewer.ncExtError.summary = Prüfen der Namensbeschränkungen fehlgeschlagen: Fehler bei der Verarbeitung der Name Constraints Erweiterung.
-CertPathReviewer.ncExtError.details = Prüfen der Namensbeschränkungen fehlgeschlagen: Es gab Fehler bei der Verarbeitung der Name Constraints Erweiterung des Zertifikats.
-
-# error processing the subject alternative name extension
-CertPathReviewer.subjAltNameExtError.title = Prüfen der Namensbeschränkungen fehlgeschlagen
-CertPathReviewer.subjAltNameExtError.text = Prüfen der Namensbeschränkungen fehlgeschlagen: Es gab Fehler bei der Verarbeitung der Subject Alternative Name Erweiterung des Zertifikats.
-CertPathReviewer.subjAltNameExtError.summary = Prüfen der Namensbeschränkungen fehlgeschlagen: Fehler bei der Verarbeitung der Subject Alternative Name Erweiterung.
-CertPathReviewer.subjAltNameExtError.details = Prüfen der Namensbeschränkungen fehlgeschlagen: Es gab Fehler bei der Verarbeitung der Subject Alternative Name Erweiterung des Zertifikats.
-
-# exception extracting subject name when checking subtrees
-# {0} subject Principal
-CertPathReviewer.ncSubjectNameError.title = Prüfen der Namensbeschränkungen fehlgeschlagen
-CertPathReviewer.ncSubjectNameError.text = Prüfen der Namensbeschränkungen fehlgeschlagen: Es gab einen Fehler beim auslesen des DN des Zertifikats.
-CertPathReviewer.ncSubjectNameError.summary = Prüfen der Namensbeschränkungen fehlgeschlagen: Fehler beim auslesen des DNs.
-CertPathReviewer.ncSubjectNameError.details = Prüfen der Namensbeschränkungen fehlgeschlagen: Es gab einen Fehler beim auslesen des DN des Zertifikats.
-
-
-## path length errors
-
-# max path length extended
-CertPathReviewer.pathLenghtExtended.title = Maximale Pfadlänge überschritten 
-CertPathReviewer.pathLenghtExtended.text = Zertifizierungspfad ungültig: die Maximale Pfadlänge ist überschritten.
-CertPathReviewer.pathLenghtExtended.summary = Zertifizierungspfad ungültig: die Maximale Pfadlänge ist überschritten.
-CertPathReviewer.pathLenghtExtended.details = Zertifizierungspfad ungültig: die Maximale Pfadlänge ist überschritten.
-
-# error reading length constraint from basic constraint extension
-CertPathReviewer.processLengthConstError.title = Prüfen der Pfadlänge fehlgeschlagen
-CertPathReviewer.processLengthConstError.text = Prüfen der Pfadlänge fehlgeschlagen: Es gab einen Fehler bei der Verarbeitung der subject alternative name Erweiterung des Zertifikats. 
-CertPathReviewer.processLengthConstError.summary = Fehler bei der Verarbeitung der subject alternative name Erweiterung.
-CertPathReviewer.processLengthConstError.details = Prüfen der Pfadlänge fehlgeschlagen: Es gab einen Fehler bei der Verarbeitung der subject alternative name Erweiterung des Zertifikats.
-
-
-## path length notifications
-
-# total path length as defined in rfc 3280
-# {0} the path length as Integer
-CertPathReviewer.totalPathLength.title = Totale Pfadlänge
-CertPathReviewer.totalPathLength.text = Die totale Pfadlänge ohne self-signed Zertifikate ist {0}.
-CertPathReviewer.totalPathLength.summary = Die totale Pfadlänge ohne self-signed Zertifikate ist {0}.
-CertPathReviewer.totalPathLength.details = Die totale Pfadlänge ohne self-signed Zertifikate, wie beschrieben in RFC 3280, ist {0}.
-
-
-## critical extensions errors
-
-# one unknown critical extension
-# {0} extension as String
-CertPathReviewer.unknownCriticalExt.title = Unbekannte kritische Erweiterung
-CertPathReviewer.unknownCriticalExt.text = Das Zertifikat enhält eine unbekannte kritische Erweiterung mit der OID {0}.
-CertPathReviewer.unknownCriticalExt.summary = Unbekannte kritische Erweiterung: {0}.
-CertPathReviewer.unknownCriticalExt.details = Das Zertifikat enhält eine unbekannte kritische Erweiterung mit der OID {0}.
-
-# more unknown critical extensions
-# {0} extensions as Set of Strings
-CertPathReviewer.unknownCriticalExts.title = Unbekannte kritische Erweiterung
-CertPathReviewer.unknownCriticalExts.text = Das Zertifikat enhält zwei oder mehr unbekannte kritische Erweiterungen mit den OIDs {0}.
-CertPathReviewer.unknownCriticalExts.summary = Unbekannte kritische Erweiterungen: {0}.
-CertPathReviewer.unknownCriticalExts.details = Das Zertifikat enhält zwei oder mehr unbekannte kritische Erweiterungen mit den OIDs {0}.
-
-# error processing critical extension
-# {0} the message of the underlying exception
-# {1} the underlying exception
-# {2} the name of the exception
-CertPathReviewer.criticalExtensionError.title = Fehler bei der Verarbeitung einer kritischen Erweiterung
-CertPathReviewer.criticalExtensionError.text = Fehler bei der Verarbeitung einer kritischen Erweiterung. Es gab eine {2}.
-CertPathReviewer.criticalExtensionError.summary = Fehler bei der Verarbeitung einer kritischen Erweiterung. Es gab eine {2}.
-CertPathReviewer.criticalExtensionError.details = Fehler bei der Verarbeitung einer kritischen Erweiterung. Es gab eine {2}. Grund: {0}.
-
-# error initializing the certpath checkers
-# {0} the message of the underlying exception
-# {1} the underlying exception
-# {2} the name of the exception
-CertPathReviewer.certPathCheckerError.title = Prüfen der kritischen Erweiterungen fehlgeschlagen
-CertPathReviewer.certPathCheckerError.text = Prüfen der kritischen Erweiterungen fehlgeschlagen: Es gab eine {2} bei der Initialisierung eines CertPathChecker.
-CertPathReviewer.certPathCheckerError.summary = Prüfen der kritischen Erweiterungen fehlgeschlagen: {2} bei der Initialisierung eines CertPathChecker.
-CertPathReviewer.certPathCheckerError.details = Prüfen der kritischen Erweiterungen fehlgeschlagen: Es gab eine {2} bei der Initialisierung eines CertPathChecker. Grund: {0}
-
-
-## check signature errors
-
-CertPathReviewer.rootKeyIsValidButNotATrustAnchor.title = rootKeyIsValidButNotATrustAnchor
-CertPathReviewer.rootKeyIsValidButNotATrustAnchor.text = Das Zertifikat hat eine gültige Signatur, ist aber kein vertrauenswürdiges Root Zertifikat.
-CertPathReviewer.rootKeyIsValidButNotATrustAnchor.summary = Das Zertifikat hat eine gültige Signatur, ist aber kein vertrauenswürdiges Root Zertifikat.
-CertPathReviewer.rootKeyIsValidButNotATrustAnchor.details = Das Zertifikat hat eine gültige Signatur, ist aber kein vertrauenswürdiges Root Zertifikat.
-
-# trustanchor found, but certificate validation failed
-CertPathReviewer.trustButInvalidCert.title = Vertrauenswürdiges Root Zertifikat invalid
-CertPathReviewer.trustButInvalidCert.text = Ein Root Zertifikat wurde gefunden. Es hat aber einen anderen öffentlichen Schlüssel als verwendet wurde um das erste Zertifikat des Zertifizierungspfades zu signieren.
-CertPathReviewer.trustButInvalidCert.summary = Ein Root Zertifikat wurde gefunden. Es hat aber einen anderen öffentlichen Schlüssel als verwendet wurde um das erste Zertifikat des Zertifizierungspfades zu signieren.
-CertPathReviewer.trustButInvalidCert.details = Ein Root Zertifikat wurde gefunden. Es hat aber einen anderen öffentlichen Schlüssel als verwendet wurde um das erste Zertifikat des Zertifizierungspfades zu signieren.
-
-# trustanchor - cannot extract issuer
-CertPathReviewer.trustAnchorIssuerError.title = Kann kein vertrauenswürdiges Root Zertifikat finden
-CertPathReviewer.trustAnchorIssuerError.text = Kann kein vertrauenswürdiges Root Zertifikat finden: Der Herausgeber vom Zertifikat kann nicht auslesen werden.
-CertPathReviewer.trustAnchorIssuerError.summary = Kann kein vertrauenswürdiges Root Zertifikat finden: Der Herausgeber vom Zertifikat kann nicht auslesen werden.
-CertPathReviewer.trustAnchorIssuerError.details = Kann kein vertrauenswürdiges Root Zertifikat finden: Der Herausgeber vom Zertifikat kann nicht auslesen werden.
-
-# no trustanchor was found for the certificate path
-# {0} issuer of the root certificate of the path
-# {1} number of trusted root certificates (trustanchors) provided
-CertPathReviewer.noTrustAnchorFound.title = Kein vertrauenswürdiges Root Zertifikat gefunden
-CertPathReviewer.noTrustAnchorFound.text = Das Root Zertifikat der Zertifizierungspfads wurde nicht von einer vertrauenswürdigen CA ausgestellt. Der Name der CA ist "{0}".
-CertPathReviewer.noTrustAnchorFound.summary = Das Root Zertifikat der Zertifizierungspfads wurde nicht von einer vertrauenswürdigen CA ausgestellt.
-CertPathReviewer.noTrustAnchorFound.details = Das Root Zertifikat der Zertifizierungspfads wurde nicht von einer vertrauenswürdigen CA ausgestellt. Der Name der CA ist "{0}". Der Root-Zertifikat-Speicher enthält {1} CA(s).
-
-# conflicting trust anchors
-# {0} number of trustanchors found (Integer)
-# {1} the ca name
-CertPathReviewer.conflictingTrustAnchors.title = Korrupter Root-Zertifikat-Speicher
-CertPathReviewer.conflictingTrustAnchors.text = Warnung: Es sind {0} öffentliche Schlüssel für die CA "{1}" im Root-Zertifikat-Speicher vorhanden - bitte prüfen Sie mit der CA welches der richtige Schlüssel ist.
-CertPathReviewer.conflictingTrustAnchors.summary = Warnung: Es sind {0} öffentliche Schlüssel für die CA "{1}" im Root-Zertifikat-Speicher vorhanden - bitte prüfen Sie mit der CA welches der richtige Schlüssel ist.
-CertPathReviewer.conflictingTrustAnchors.details = Warnung: Es sind {0} öffentliche Schlüssel für die CA "{1}" im Root-Zertifikat-Speicher vorhanden - bitte prüfen Sie mit der CA welches der richtige Schlüssel ist.
-
-# trustanchor DN is invalid
-# {0} DN of the Trustanchor
-CertPathReviewer.trustDNInvalid.title = DN des vertrauenswürdigen Root Zertifikats mit falschem Format.
-CertPathReviewer.trustDNInvalid.text = Der DN des vertrauenswürdigen Root Zertifikats hat ein falsches Format: {0}.
-CertPathReviewer.trustDNInvalid.summary = Der DN des vertrauenswürdigen Root Zertifikats hat ein falsches Format: {0}.
-CertPathReviewer.trustDNInvalid.details = Der DN des vertrauenswürdigen Root Zertifikats hat ein falsches Format: {0}. Es ist kein gültiger X.500 Name. Siehe RFC 1779 oder RFC 2253. 
-
-# trustanchor public key algorithm error
-CertPathReviewer.trustPubKeyError.title = Fehler bei der Verarbeitung des öffentlichen Schlüssels der vertrauenswürdigen Root Zertifikats
-CertPathReviewer.trustPubKeyError.text = Fehler bei der Verarbeitung des öffentlichen Schlüssels der vertrauenswürdigen Root Zertifikats.
-CertPathReviewer.trustPubKeyError.summary = Fehler bei der Verarbeitung des öffentlichen Schlüssels der vertrauenswürdigen Root Zertifikats.
-CertPathReviewer.trustPubKeyError.details = Fehler bei der Verarbeitung des öffentlichen Schlüssels der vertrauenswürdigen Root Zertifikats. Der AlorithmIdentifier vom Schlüssel kann nicht ausgelesen werden.
-
-# can not verifiy signature: issuer public key unknown
-CertPathReviewer.NoIssuerPublicKey.title = Zertifikats Signatur kann nicht geprüft werden 
-CertPathReviewer.NoIssuerPublicKey.text = Die Zertifikats Signatur kann nicht geprüft werden: Der öffentliche Schlüssel des Herausgebers ist unbekannt.
-CertPathReviewer.NoIssuerPublicKey.summary = Die Zertifikats Signatur kann nicht geprüft werden: Der öffentliche Schlüssel des Herausgebers ist unbekannt.
-CertPathReviewer.NoIssuerPublicKey.details = Die Zertifikats Signatur kann nicht geprüft werden: Der öffentliche Schlüssel des Herausgebers ist unbekannt.
-
-# signature can not be verified
-# {0} message of the underlying exception (english)
-# {1} the underlying exception
-# {2} the name of the exception
-CertPathReviewer.signatureNotVerified.title = Zertifikats Signatur ist ungültig
-CertPathReviewer.signatureNotVerified.text = Die Zertifikats Signatur ist ungültig. Es gab eine {2}.
-CertPathReviewer.signatureNotVerified.summary = Die Zertifikats Signatur ist ungültig.
-CertPathReviewer.signatureNotVerified.details = Die Zertifikats Signatur ist ungültig. Es gab eine {2}. Grund: {0}
-
-# certificate expired
-# {0} the date the certificate expired 
-CertPathReviewer.certificateExpired.title = Zertifikat ist abgelaufen
-CertPathReviewer.certificateExpired.text = Das Zertifikat ist ungültig. Es ist am {0,date} {0,time,full} abgelaufen.
-CertPathReviewer.certificateExpired.summary = Das Zertifikat ist abgelaufen am {0,date} {0,time,full}.
-CertPathReviewer.certificateExpired.details = Das Zertifikat ist ungültig. Es ist am {0,date} {0,time,full} abgelaufen. 
-
-# certificate not yet valid
-# {0} the date from which on the certificate is valid
-CertPathReviewer.certificateNotYetValid.title = Das Zertifikat ist noch nicht gültig
-CertPathReviewer.certificateNotYetValid.text = Das Zertifikat ist ungültig. Es ist erst gültig ab {0,date} {0,time,full}.
-CertPathReviewer.certificateNotYetValid.summary = Das Zertifikat ist nicht gültig bis {0,date} {0,time,full}.
-CertPathReviewer.certificateNotYetValid.details = Das Zertifikat ist ungültig. Es ist erst gültig ab {0,date} {0,time,full}. 
-
-# certificate invalid issuer DN
-# {0} expected issuer DN as String
-# {1} found issuer DN as String
-CertPathReviewer.certWrongIssuer.title = Falscher Herausgeber
-CertPathReviewer.certWrongIssuer.text = Das Herausgeber des Zertifikats ist ungültig. Erwartet {0}, gefunden {1}. 
-CertPathReviewer.certWrongIssuer.summary = Das Herausgeber des Zertifikats ist ungültig. 
-CertPathReviewer.certWrongIssuer.details = Das Herausgeber des Zertifikats ist ungültig. Erwartet {0}, gefunden {1}.
-
-# intermediate certificate is no ca cert
-CertPathReviewer.noCACert.title = Zertifikat ist kein CA Zertifikat
-CertPathReviewer.noCACert.text = Das Zertifikat ist kein CA Zertifikat.
-CertPathReviewer.noCACert.summary = Das Zertifikat ist kein CA Zertifikat.
-CertPathReviewer.noCACert.details = Das Zertifikat ist kein CA Zertifikat, wird aber wie eines gebraucht.
-
-# cert laks basic constraints
-CertPathReviewer.noBasicConstraints.title = Zertifikat hat keine Basiseinschränkungen
-CertPathReviewer.noBasicConstraints.text = Das Zertifikat hat keine Basiseinschränkungen.
-CertPathReviewer.noBasicConstraints.summary = Das Zertifikat hat keine Basiseinschränkungen.
-CertPathReviewer.noBasicConstraints.details = Das Zertifikat hat keine Basiseinschränkungen.
-
-# error processing basic constraints
-CertPathReviewer.errorProcesingBC.title = Fehler bei der Verarbeitung der Basiseinschränkungen
-CertPathReviewer.errorProcesingBC.text = Es gab einen Fehler bei der Verarbeitung der Basiseinschränkungen des Zertifikats.
-CertPathReviewer.errorProcesingBC.summary = Fehler bei der Verarbeitung der Basiseinschränkungen 
-CertPathReviewer.errorProcesingBC.details = Es gab einen Fehler bei der Verarbeitung der Basiseinschränkungen des Zertifikats.
-
-# certificate not usable for signing certs
-CertPathReviewer.noCertSign.title = Schlüssel nicht nutzbar für Zertifikatssignaturen
-CertPathReviewer.noCertSign.text = Der Schlüssel kann nicht zum Signieren von Zertifikaten verwendet werden.
-CertPathReviewer.noCertSign.summary = Der Schlüssel kann nicht zum Signieren von Zertifikaten verwendet werden.
-CertPathReviewer.noCertSign.details = Der Schlüssel kann nicht zum Signieren von Zertifikaten verwendet werden.
-
-# error processing public key
-CertPathReviewer.pubKeyError.title = Fehler bei der Verarbeitung des öffentlichen Schlüssels
-CertPathReviewer.pubKeyError.text = Fehler bei der Verarbeitung des öffentlichen Schlüssels des Zertifikats.
-CertPathReviewer.pubKeyError.summary = Fehler bei der Verarbeitung des öffentlichen Schlüssels des Zertifikats.
-CertPathReviewer.pubKeyError.details = Fehler bei der Verarbeitung des öffentlichen Schlüssels des Zertifikats. Der AlorithmIdentifier konnte nicht extrahiert werden.
-
-
-## check signatures notifications
-
-#
-# trust anchor has no keyusage certSign
-CertPathReviewer.trustKeyUsage.title = Root-Zertifikat Schlüsselverwendung
-CertPathReviewer.trustKeyUsage.text = Das Root-Zertifikat darf nicht zum Signieren von Zertifikaten verwendet werden.
-CertPathReviewer.trustKeyUsage.summary = Das Root-Zertifikat darf nicht zum Signieren von Zertifikaten verwendet werden.
-CertPathReviewer.trustKeyUsage.details = Das Root-Zertifikat darf nicht zum Signieren von Zertifikaten verwendet werden.
-
-# certificate path validation date
-# {0} date for which the cert path is validated
-# {1} current date
-CertPathReviewer.certPathValidDate.title = Datum der Zertifikatspfad Validierung
-CertPathReviewer.certPathValidDate.text = Der Zertifikatspfad wurde am {0,date} {0,time,full} angewendet. Er wurde am {1,date} {1,time,full} geprüft.
-CertPathReviewer.certPathValidDate.summary = Der Zertifikatspfad wurde am {0,date} {0,time,full} angewendet. Er wurde am {1,date} {1,time,full} geprüft.
-CertPathReviewer.certPathValidDate.details = Der Zertifikatspfad wurde am {0,date} {0,time,full} angewendet. Er wurde am {1,date} {1,time,full} geprüft.
-
-
-## check policy errors
-
-# error processing certificate policy extension
-CertPathReviewer.policyExtError.title = Prüfen der Policy fehlgeschlagen
-CertPathReviewer.policyExtError.text = Prüfen der Policy fehlgeschlagen: Es gab einen Fehler bei der Verarbeitung der Policy Erweiterung. 
-CertPathReviewer.policyExtError.summary = Fehler bei der Verarbeitung der Policy Erweiterung.
-CertPathReviewer.policyExtError.details = Prüfen der Policy fehlgeschlagen: Es gab einen Fehler bei der Verarbeitung der Policy Erweiterung. 
-
-# error processing policy constraints extension
-CertPathReviewer.policyConstExtError.title = Prüfen der Policy fehlgeschlagen
-CertPathReviewer.policyConstExtError.text = Prüfen der Policy fehlgeschlagen: Es gab einen Fehler bei der Verarbeitung der Policy Constraints Erweiterung.
-CertPathReviewer.policyConstExtError.summary = Fehler bei der Verarbeitung der Policy Constraints Erweiterung.
-CertPathReviewer.policyConstExtError.details = Prüfen der Policy fehlgeschlagen: Es gab einen Fehler bei der Verarbeitung der Policy Constraints Erweiterung.
-
-# error processing policy mapping extension
-CertPathReviewer.policyMapExtError.title = Prüfen der Policy fehlgeschlagen
-CertPathReviewer.policyMapExtError.text = Prüfen der Policy fehlgeschlagen: Es gab einen Fehler bei der Verarbeitung der Policy Mapping Erweiterung.
-CertPathReviewer.policyMapExtError.summary = Fehler bei der Verarbeitung der Policy Mapping Erweiterung.
-CertPathReviewer.policyMapExtError.details = Prüfen der Policy fehlgeschlagen: Es gab einen Fehler bei der Verarbeitung der Policy Mapping Erweiterung.
-
-# error processing inhibit any policy extension
-CertPathReviewer.policyInhibitExtError.title = Prüfen der Policy fehlgeschlagen
-CertPathReviewer.policyInhibitExtError.text = Prüfen der Policy fehlgeschlagen: Es gab einen Fehler bei der Verarbeitung der Inhibit Any Policy Erweiterung.
-CertPathReviewer.policyInhibitExtError.summary = Fehler bei der Verarbeitung der Inhibit Any Policy Erweiterung.
-CertPathReviewer.policyInhibitExtError.details = Prüfen der Policy fehlgeschlagen: Es gab einen Fehler bei der Verarbeitung der Inhibit Any Policy Erweiterung.
-
-# error building qualifier set
-CertPathReviewer.policyQualifierError.title = Prüfen der Policy fehlgeschlagen
-CertPathReviewer.policyQualifierError.text = Prüfen der Policy fehlgeschlagen: Fehler beim erstellen des Policy Qualifier Set.
-CertPathReviewer.policyQualifierError.summary = Prüfen der Policy fehlgeschlagen: Fehler beim erstellen des Policy Qualifier Set.
-CertPathReviewer.policyQualifierError.details = Prüfen der Policy fehlgeschlagen: Fehler beim erstellen des Policy Qualifier Set.
-
-# no valid policy tree - explicit policy required
-CertPathReviewer.noValidPolicyTree.title = Prüfen der Policy fehlgeschlagen
-CertPathReviewer.noValidPolicyTree.text = Prüfen der Policy fehlgeschlagen: Kein gültiger Policy Baum gefunden, als einer erwartet wurde.
-CertPathReviewer.noValidPolicyTree.summary = Prüfen der Policy fehlgeschlagen: Kein gültiger Policy Baum gefunden, als einer erwartet wurde.
-CertPathReviewer.noValidPolicyTree.details = Prüfen der Policy fehlgeschlagen: Kein gültiger Policy Baum gefunden, als einer erwartet wurde.
-
-# expicit policy requested, but no policy available
-CertPathReviewer.explicitPolicy.title = Prüfen der Policy fehlgeschlagen
-CertPathReviewer.explicitPolicy.text = Prüfen der Policy fehlgeschlagen: Policy verlang, aber keine Policy vorhanden.
-CertPathReviewer.explicitPolicy.summary = Prüfen der Policy fehlgeschlagen: Policy verlang, aber keine Policy vorhanden.
-CertPathReviewer.explicitPolicy.details = Prüfen der Policy fehlgeschlagen: Policy verlang, aber keine Policy vorhanden.
-
-# path processing failed on policy
-CertPathReviewer.invalidPolicy.title = Pfad Validierung wegen der Policy fehlgeschlagen
-CertPathReviewer.invalidPolicy.text = Pfad Validierung wegen der Policy fehlgeschlagen.
-CertPathReviewer.invalidPolicy.summary = Pfad Validierung wegen der Policy fehlgeschlagen.
-CertPathReviewer.invalidPolicy.details = Pfad Validierung wegen der Policy fehlgeschlagen.
-
-# invalid policy mapping
-CertPathReviewer.invalidPolicyMapping.title = Ungültiges Policy Mapping 
-CertPathReviewer.invalidPolicyMapping.text = Das Zertifikat enthält ein Ungültiges Policy Mapping.
-CertPathReviewer.invalidPolicyMapping.summary = Das Zertifikat enthält ein Ungültiges Policy Mapping. 
-CertPathReviewer.invalidPolicyMapping.details = Das Zertifikat enthält ein Ungültiges Policy Mapping, das den Wert Any Policy enthält.
-
-## check CRL notifications
-
-# found local valid CRL
-# {0} thisUpdate of the CRL
-# {1} nextUpdate of the CRL
-CertPathReviewer.localValidCRL.title = Gültige Zertifikatssperrliste (CRL) gefunden
-CertPathReviewer.localValidCRL.text = Gültige Zertifikatssperrliste (CRL) im lokalen Speicher gefunden. Herausgegeben am {0,date}, nächstes Update am {1,date}.
-CertPathReviewer.localValidCRL.summary = Gültige Zertifikatssperrliste (CRL) im lokalen Speicher gefunden. Herausgegeben am {0,date}, nächstes Update am {1,date}.
-CertPathReviewer.localValidCRL.details = Gültige Zertifikatssperrliste (CRL) im lokalen Speicher gefunden. Herausgegeben am {0,date}, nächstes Update am {1,date}.
-
-
-# found matching CRL, but not valid
-# {0} thisUpdate of the CRL
-# {1} nextUpdate of the CRL
-CertPathReviewer.localInvalidCRL.title = Lokale Zertifikatssperrliste (CRL) veraltet
-CertPathReviewer.localInvalidCRL.text = Eine lokale Zertifikatssperrliste (CRL) wurde nicht genutzt, da sie veraltet ist. Herausgegeben am {0,date}, nächstes Update am {1,date}.
-CertPathReviewer.localInvalidCRL.summary = Eine lokale Zertifikatssperrliste (CRL) wurde nicht genutzt, da sie veraltet ist. Herausgegeben am {0,date}, nächstes Update am {1,date}.
-CertPathReviewer.localInvalidCRL.details = Eine lokale Zertifikatssperrliste (CRL) wurde nicht genutzt, da sie veraltet ist. Herausgegeben am {0,date}, nächstes Update am {1,date}.
-
-# found a valid crl at crl distribution point
-# {0} thisUpdate of the CRL
-# {1} nextUpdate of the CRL
-# {2} the url of the distribution point
-CertPathReviewer.onlineValidCRL.title = Gültige Zertifikatssperrliste (CRL) von einem CDP
-CertPathReviewer.onlineValidCRL.text = Gültige Zertifikatssperrliste (CRL) gefunden von: {2}. Herausgegeben am {0,date}, nächstes Update am {1,date}.
-CertPathReviewer.onlineValidCRL.summary = Gültige Zertifikatssperrliste (CRL) gefunden von: {2}. Herausgegeben am {0,date}, nächstes Update am {1,date}.
-CertPathReviewer.onlineValidCRL.details = Gültige Zertifikatssperrliste (CRL) gefunden von: {2}. Herausgegeben am {0,date}, nächstes Update am {1,date}.
-
-# found an invalid CRL at crl distribution point
-# {0} thisUpdate of the CRL
-# {1} nextUpdate of the CRL
-# {2} the url of the distribution point
-CertPathReviewer.onlineInvalidCRL.title = Veraltete Zertifikatssperrliste (CRL) von einem CDP
-CertPathReviewer.onlineInvalidCRL.text = Die Zertifikatssperrliste (CRL) von {2} ist veraltet. Herausgegeben am {0,date}, nächstes Update am {1,date}.
-CertPathReviewer.onlineInvalidCRL.summary = Die Zertifikatssperrliste (CRL) von {2} ist veraltet. Herausgegeben am {0,date}, nächstes Update am {1,date}.
-CertPathReviewer.onlineInvalidCRL.details = Die Zertifikatssperrliste (CRL) von {2} ist veraltet. Herausgegeben am {0,date}, nächstes Update am {1,date}.
-
-#found a CRL at a crl distribution point, but issued by another CA
-# {0} issuer of the CRL
-# {1} expected issuer
-# {2} the url of the distribution point
-CertPathReviewer.onlineCRLWrongCA.title = Zertifikatssperrliste (CRL) von CDP mit falschem Herausgeber
-CertPathReviewer.onlineCRLWrongCA.text = Die Zertifikatssperrliste (CRL) von {2} wurde von {0} herausgegeben, erwartet wurde {1}.
-CertPathReviewer.onlineCRLWrongCA.summary = Die Zertifikatssperrliste (CRL) von {2} hat einen falschen Herausgeber.
-CertPathReviewer.onlineCRLWrongCA.details = Die Zertifikatssperrliste (CRL) von {2} wurde von {0} herausgegeben, erwartet wurde {1}.
-
-# Certificate not revoked
-CertPathReviewer.notRevoked.title = Zertifikat nicht revoziert
-CertPathReviewer.notRevoked.text = Das Zertifikat ist nicht revoziert.
-CertPathReviewer.notRevoked.summary = Das Zertifikat ist nicht revoziert.
-CertPathReviewer.notRevoked.details = Das Zertifikat ist nicht revoziert.
-
-# CRL found: certificate was revoked, but after the validationDate
-# {0} the date the certificate was revoked
-# {1} the reason for revoking the certificate
-CertPathReviewer.revokedAfterValidation.title = Zertifikat revoziert nach dem Validierungdatum
-CertPathReviewer.revokedAfterValidation.text = Das Zertifikat wurde nach dem Validierungdatum am {0,date} {0,time,full} revoziert. Grund: {1}.
-CertPathReviewer.revokedAfterValidation.summary = Das Zertifikat wurde nach dem Validierungdatum am {0,date} {0,time,full} revoziert.
-CertPathReviewer.revokedAfterValidation.details = Das Zertifikat wurde nach dem Validierungdatum am {0,date} {0,time,full} revoziert. Grund: {1}.
-
-# updated crl available
-# {0} date since when the update is available
-CertPathReviewer.crlUpdateAvailable.title = Zertifikatssperrlisten (CRL) Update erhältlich
-CertPathReviewer.crlUpdateAvailable.text = Ein Update für die Zertifikatssperrliste (CRL) für dieses Zertifikat ist erhältlich seit {0,date} {0,time,full}.
-CertPathReviewer.crlUpdateAvailable.summary = Ein Update für die Zertifikatssperrliste (CRL) für dieses Zertifikat ist erhältlich seit {0,date} {0,time,full}.
-CertPathReviewer.crlUpdateAvailable.details = Ein Update für die Zertifikatssperrliste (CRL) für dieses Zertifikat ist erhältlich seit {0,date} {0,time,full}.
-
-# crl distribution point url
-# {0} the crl distribution point url as String
-CertPathReviewer.crlDistPoint.title = CDP
-CertPathReviewer.crlDistPoint.text = Eine Zertifikatssperrliste (CRL) kann von {0} geladen werden.
-CertPathReviewer.crlDistPoint.summary = Eine Zertifikatssperrliste (CRL) kann von {0} geladen werden.
-CertPathReviewer.crlDistPoint.details = Eine Zertifikatssperrliste (CRL) kann von {0} geladen werden.
-
-# ocsp location
-# {0} the url on which the ocsp service can be found
-CertPathReviewer.ocspLocation.title = OCSP Server 
-CertPathReviewer.ocspLocation.text = OCSP Server: {0}.
-CertPathReviewer.ocspLocation.summary = OCSP Server: {0}.
-CertPathReviewer.ocspLocation.details = OCSP Server: {0}.
-
-# unable to get crl from crl distribution point
-# {0} the url of the distribution point
-# {1} the message of the occurred exception
-# {2} the occurred exception
-# {3} the name of the exception
-CertPathReviewer.loadCrlDistPointError.title = Kann Zertifikatssperrliste (CRL) nicht von CDP laden
-CertPathReviewer.loadCrlDistPointError.text = Kann die Zertifikatssperrliste (CRL) von {0} nicht laden. Es gab eine {2}.
-CertPathReviewer.loadCrlDistPointError.summary = Kann die Zertifikatssperrliste (CRL) von {0} nicht laden. Es gab eine {2}.
-CertPathReviewer.loadCrlDistPointError.details = Kann die Zertifikatssperrliste (CRL) von {0} nicht laden. Es gab eine {2}. Grund: {1}.
-
-# no crl found in certstores
-# {0} the issuers which we searched for
-# {1} list of crl issuer names that are found in the certstores
-# {2} number of crls in the certstores
-CertPathReviewer.noCrlInCertstore.title = Keine Zertifikatssperrliste (CRL) im lokalen Speicher
-CertPathReviewer.noCrlInCertstore.text = Es wurde keine Zertifikatssperrliste (CRL) im lokalen Speicher gefunden.
-CertPathReviewer.noCrlInCertstore.summary = Es wurde keine Zertifikatssperrliste (CRL) im lokalen Speicher gefunden.
-CertPathReviewer.noCrlInCertstore.details = Es wurde keine Zertifikatssperrliste (CRL) für den Herausgeber {0} im lokalen Speicher gefunden. \
-Die {2} Zertifikatssperrlisten im lokalen Speicher wurden hearusgegeben von {1}.
-
-
-## check CRL exceptions
-
-# cannot extract issuer from certificate
-CertPathReviewer.crlIssuerException.title = Prüfung der Zertifikatssperrliste (CRL) fehlgeschlagen
-CertPathReviewer.crlIssuerException.text = Prüfung der Zertifikatssperrliste (CRL) fehlgeschlagen: Kann den Herausgeber vom Zertifikat nicht extrahieren.
-CertPathReviewer.crlIssuerException.summary = Prüfung der Zertifikatssperrliste (CRL) fehlgeschlagen: Kann den Herausgeber vom Zertifikat nicht extrahieren.
-CertPathReviewer.crlIssuerException.details = Prüfung der Zertifikatssperrliste (CRL) fehlgeschlagen: Kann den Herausgeber vom Zertifikat nicht extrahieren.
-
-# cannot extract crls
-# {0} message from the underlying exception
-# {1} the underlying exception
-# {2} the name of the exception
-CertPathReviewer.crlExtractionError.title = Prüfung der Zertifikatssperrliste (CRL) fehlgeschlagen
-CertPathReviewer.crlExtractionError.text = Prüfung der Zertifikatssperrliste (CRL) fehlgeschlagen: Es gab eine {2} beim laden der Zertifikatssperrliste (CRL) aus dem lokalen Speicher.
-CertPathReviewer.crlExtractionError.summary = Prüfung der Zertifikatssperrliste (CRL) fehlgeschlagen: Es gab eine {2} beim laden der Zertifikatssperrliste (CRL) aus dem lokalen Speicher.
-CertPathReviewer.crlExtractionError.details = Prüfung der Zertifikatssperrliste (CRL) fehlgeschlagen: Es gab eine {2} beim laden der Zertifikatssperrliste (CRL) aus dem lokalen Speicher. Grund: {0}.
-
-# Issuer certificate key usage extension does not permit crl signing
-CertPathReviewer.noCrlSigningPermited.title = Prüfung der Zertifikatssperrliste (CRL) fehlgeschlagen
-CertPathReviewer.noCrlSigningPermited.text = Prüfung der Zertifikatssperrliste (CRL) fehlgeschlagen: Das Herausgeber Zertifikat erlaubt keine Signieren von Zertifikatssperrlisten (CRL).
-CertPathReviewer.noCrlSigningPermited.summary = Prüfung der Zertifikatssperrliste (CRL) fehlgeschlagen: Das Herausgeber Zertifikat erlaubt keine Signieren von Zertifikatssperrlisten (CRL).
-CertPathReviewer.noCrlSigningPermited.details = Prüfung der Zertifikatssperrliste (CRL) fehlgeschlagen: Das Herausgeber Zertifikat erlaubt keine Signieren von Zertifikatssperrlisten (CRL).
-
-# can not verify crl: issuer public key unknown
-CertPathReviewer.crlNoIssuerPublicKey.title = Prüfung der Zertifikatssperrliste (CRL) fehlgeschlagen
-CertPathReviewer.crlNoIssuerPublicKey.text = Prüfung der Zertifikatssperrliste (CRL) fehlgeschlagen: Kann die Zertifikatssperrliste (CRL) nicht verifizieren. Der öffentliche Schlüssel des Herausgebers ist unbekannt.
-CertPathReviewer.crlNoIssuerPublicKey.summary = Prüfung der Zertifikatssperrliste (CRL) fehlgeschlagen: Kann die Zertifikatssperrliste (CRL) nicht verifizieren. Der öffentliche Schlüssel des Herausgebers ist unbekannt.
-CertPathReviewer.crlNoIssuerPublicKey.details = Prüfung der Zertifikatssperrliste (CRL) fehlgeschlagen: Kann die Zertifikatssperrliste (CRL) nicht verifizieren. Der öffentliche Schlüssel des Herausgebers ist unbekannt.
-
-# crl verification failed
-CertPathReviewer.crlVerifyFailed.title = Prüfung der Zertifikatssperrliste (CRL) fehlgeschlagen
-CertPathReviewer.crlVerifyFailed.text = Prüfung der Zertifikatssperrliste (CRL) fehlgeschlagen: Die Signatur der Zertifikatssperrliste (CRL) ist ungültig.
-CertPathReviewer.crlVerifyFailed.summary = Prüfung der Zertifikatssperrliste (CRL) fehlgeschlagen: Die Signatur der Zertifikatssperrliste (CRL) ist ungültig.
-CertPathReviewer.crlVerifyFailed.details = Prüfung der Zertifikatssperrliste (CRL) fehlgeschlagen: Die Signatur der Zertifikatssperrliste (CRL) ist ungültig.
-
-# no valid CRL found
-CertPathReviewer.noValidCrlFound.title = Prüfung der Zertifikatssperrliste (CRL) fehlgeschlagen
-CertPathReviewer.noValidCrlFound.text = Prüfung der Zertifikatssperrliste (CRL) fehlgeschlagen: keine gültige Zertifikatssperrliste (CRL) gefunden.
-CertPathReviewer.noValidCrlFound.summary = Prüfung der Zertifikatssperrliste (CRL) fehlgeschlagen: keine gültige Zertifikatssperrliste (CRL) gefunden.
-CertPathReviewer.noValidCrlFound.details = Prüfung der Zertifikatssperrliste (CRL) fehlgeschlagen: keine gültige Zertifikatssperrliste (CRL) gefunden.
-
-# No base CRL for delta CRL
-CertPathReviewer.noBaseCRL.title = Prüfung der Zertifikatssperrliste (CRL) fehlgeschlagen
-CertPathReviewer.noBaseCRL.text = Prüfung der Zertifikatssperrliste (CRL) fehlgeschlagen: keine Basis CRL für die Delta CRL gefunden.
-CertPathReviewer.noBaseCRL.summary = Prüfung der Zertifikatssperrliste (CRL) fehlgeschlagen: keine Basis CRL für die Delta CRL gefunden.
-CertPathReviewer.noBaseCRL.details = Prüfung der Zertifikatssperrliste (CRL) fehlgeschlagen: keine Basis CRL für die Delta CRL gefunden.
-
-# certificate revoked
-# {0} the date the certificate was revoked
-# {1} the reason for revoking the certificate
-CertPathReviewer.certRevoked.title = Zertifikat wurde revoziert
-CertPathReviewer.certRevoked.text = Das Zertifikat wurde am {0,date} {0,time,full} revoziert. Grund: {1}.
-CertPathReviewer.certRevoked.summary = Das Zertifikat wurde am {0,date} {0,time,full} revoziert.
-CertPathReviewer.certRevoked.details = Das Zertifikat wurde am {0,date} {0,time,full} revoziert. Grund: {1}.
-
-# error processing issuing distribution point extension
-CertPathReviewer.distrPtExtError.title = Prüfung der Zertifikatssperrliste (CRL) fehlgeschlagen
-CertPathReviewer.distrPtExtError.text = Prüfung der Zertifikatssperrliste (CRL) fehlgeschlagen: Es gab einen Fehler bei der Verarbeitung der Issuing Distribution Point Erweiterung. 
-CertPathReviewer.distrPtExtError.summary = Fehler bei der Verarbeitung der Issuing Distribution Point Erweiterung.
-CertPathReviewer.distrPtExtError.details = Prüfung der Zertifikatssperrliste (CRL) fehlgeschlagen: Es gab einen Fehler bei der Verarbeitung der Issuing Distribution Point Erweiterung.
-
-# error processing crl distribution points extension
-CertPathReviewer.crlDistPtExtError.title = Prüfung der Zertifikatssperrliste (CRL) fehlgeschlagen
-CertPathReviewer.crlDistPtExtError.text = Prüfung der Zertifikatssperrliste (CRL) fehlgeschlagen: Es gab einen Fehler bei der Verarbeitung der CRL Distribution Points Erweiterung.
-CertPathReviewer.crlDistPtExtError.summary = Fehler bei der Verarbeitung der CRL Distribution Points Erweiterung.
-CertPathReviewer.crlDistPtExtError.details = Prüfung der Zertifikatssperrliste (CRL) fehlgeschlagen: Es gab einen Fehler bei der Verarbeitung der CRL Distribution Points Erweiterung.
-
-# error processing the authority info access extension
-CertPathReviewer.crlAuthInfoAccError.title = Prüfung der Zertifikatssperrliste (CRL) fehlgeschlagen
-CertPathReviewer.crlAuthInfoAccError.text = Prüfung der Zertifikatssperrliste (CRL) fehlgeschlagen: Es gab einen Fehler bei der Verarbeitung der Authority Info Access Erweiterung.
-CertPathReviewer.crlAuthInfoAccError.summary = Fehler bei der Verarbeitung der Authority Info Access Erweiterung.
-CertPathReviewer.crlAuthInfoAccError.details = Prüfung der Zertifikatssperrliste (CRL) fehlgeschlagen: Es gab einen Fehler bei der Verarbeitung der Authority Info Access Erweiterung.
-
-# error processing delta crl indicator extension
-CertPathReviewer.deltaCrlExtError.title = Prüfung der Zertifikatssperrliste (CRL) fehlgeschlagen
-CertPathReviewer.deltaCrlExtError.text = Prüfung der Zertifikatssperrliste (CRL) fehlgeschlagen: Es gab einen Fehler bei der Verarbeitung der Delta CRL Indicator Erweiterung. 
-CertPathReviewer.deltaCrlExtError.summary = Fehler bei der Verarbeitung der Delta CRL Indicator Erweiterung.
-CertPathReviewer.deltaCrlExtError.details = Prüfung der Zertifikatssperrliste (CRL) fehlgeschlagen: Es gab einen Fehler bei der Verarbeitung der Delta CRL Indicator Erweiterung.
-
-# error porcessing crl number extension
-CertPathReviewer.crlNbrExtError.title = Prüfung der Zertifikatssperrliste (CRL) fehlgeschlagen
-CertPathReviewer.crlNbrExtError.text = Prüfung der Zertifikatssperrliste (CRL) fehlgeschlagen: Es gab einen Fehler bei der Verarbeitung der CRL Number Erweiterung.
-CertPathReviewer.crlNbrExtError.summary = Fehler bei der Verarbeitung der CRL Number Erweiterung.
-CertPathReviewer.crlNbrExtError.details = Prüfung der Zertifikatssperrliste (CRL) fehlgeschlagen: Es gab einen Fehler bei der Verarbeitung der CRL Number Erweiterung.
-
-# error processing crl reason code extension
-CertPathReviewer.crlReasonExtError.title = Prüfung der Zertifikatssperrliste (CRL) fehlgeschlagen
-CertPathReviewer.crlReasonExtError.text = Prüfung der Zertifikatssperrliste (CRL) fehlgeschlagen: Es gab einen Fehler bei der Verarbeitung der CRL Reason Code Erweiterung.
-CertPathReviewer.crlReasonExtError.summary = Fehler bei der Verarbeitung der CRL Reason Code Erweiterung.
-CertPathReviewer.crlReasonExtError.details = Prüfung der Zertifikatssperrliste (CRL) fehlgeschlagen: Es gab einen Fehler bei der Verarbeitung der CRL Reason Code Erweiterung.
-
-# error processing basic constraints extension
-CertPathReviewer.crlBCExtError.title = Prüfung der Zertifikatssperrliste (CRL) fehlgeschlagen
-CertPathReviewer.crlBCExtError.text = Prüfung der Zertifikatssperrliste (CRL) fehlgeschlagen: Es gab einen Fehler bei der Verarbeitung der CRL Reason Code Erweiterung.
-CertPathReviewer.crlBCExtError.summary = Fehler bei der Verarbeitung der CRL Reason Code Erweiterung.
-CertPathReviewer.crlBCExtError.details = Prüfung der Zertifikatssperrliste (CRL) fehlgeschlagen: Es gab einen Fehler bei der Verarbeitung der CRL Reason Code Erweiterung.
-
-# CA Cert CRL only contains user certificates
-CertPathReviewer.crlOnlyUserCert.title = Prüfung der Zertifikatssperrliste (CRL) fehlgeschlagen
-CertPathReviewer.crlOnlyUserCert.text = Prüfung der Zertifikatssperrliste (CRL) fehlgeschlagen: Die Zertifikatssperrliste (CRL) enthält nur User Zertifikate.
-CertPathReviewer.crlOnlyUserCert.summary = Prüfung der Zertifikatssperrliste (CRL) fehlgeschlagen: Die Zertifikatssperrliste (CRL) enthält nur User Zertifikate.
-CertPathReviewer.crlOnlyUserCert.details = Prüfung der Zertifikatssperrliste (CRL) fehlgeschlagen: Die Zertifikatssperrliste (CRL) enthält nur User Zertifikate.
-
-# End CRL only contains CA certificates
-CertPathReviewer.crlOnlyCaCert.title = Prüfung der Zertifikatssperrliste (CRL) fehlgeschlagen
-CertPathReviewer.crlOnlyCaCert.text = Prüfung der Zertifikatssperrliste (CRL) fehlgeschlagen: Die Zertifikatssperrliste (CRL) enthält nur CA Zertifikate.
-CertPathReviewer.crlOnlyCaCert.summary = Prüfung der Zertifikatssperrliste (CRL) fehlgeschlagen: Die Zertifikatssperrliste (CRL) enthält nur CA Zertifikate.
-CertPathReviewer.crlOnlyCaCert.details = Prüfung der Zertifikatssperrliste (CRL) fehlgeschlagen: Die Zertifikatssperrliste (CRL) enthält nur CA Zertifikate.
-
-# onlyContainsAttributeCerts boolean is asserted
-CertPathReviewer.crlOnlyAttrCert.title = Prüfung der Zertifikatssperrliste (CRL) fehlgeschlagen
-CertPathReviewer.crlOnlyAttrCert.text = Prüfung der Zertifikatssperrliste (CRL) fehlgeschlagen: Die Zertifikatssperrliste (CRL) enthält nur Attribut Zertifikate.
-CertPathReviewer.crlOnlyAttrCert.summary = Prüfung der Zertifikatssperrliste (CRL) fehlgeschlagen: Die Zertifikatssperrliste (CRL) enthält nur Attribut Zertifikate.
-CertPathReviewer.crlOnlyAttrCert.details = Prüfung der Zertifikatssperrliste (CRL) fehlgeschlagen: Die Zertifikatssperrliste (CRL) enthält nur Attribut Zertifikate.
-
-
-## QcStatement notifications
-
-# unkown statement
-# {0} statement OID
-# {1} statement as ANS1Sequence
-CertPathReviewer.QcUnknownStatement.title = Unbekanntes Statement in der QcStatement Erweiterung 
-CertPathReviewer.QcUnknownStatement.text = Unbekanntes Statement in der QcStatement Erweiterung: OID = {0}
-CertPathReviewer.QcUnknownStatement.summary = Unbekanntes Statement in der QcStatement Erweiterung: OID = {0}
-CertPathReviewer.QcUnknownStatement.details = Unbekanntes Statement in der QcStatement Erweiterung: OID = {0}, statement = {1}
-
-# QcLimitValue Alpha currency code
-# {0} currency code
-# {1} limit value
-# {2} monetary value as MonetaryValue
-CertPathReviewer.QcLimitValueAlpha.title = Transaction Value Limit
-CertPathReviewer.QcLimitValueAlpha.text = Dieses Zertifikat hat ein Wertlimite von {1,number, ###,###,###,##0.00#} {0} für Transaktionen.
-CertPathReviewer.QcLimitValueAlpha.summary = Wertlimite von {1,number, ###,###,###,##0.00#} {0} für Transaktionen.
-CertPathReviewer.QcLimitValueAlpha.details = Dieses Zertifikat hat eine Wertlimite für Transaktionen für welche\
- das Zertifikat genutzt werden kann, gemäss der Richtlinie 1999/93/EG des Europäischen Parlaments und\
- des Rates über gemeinschaftliche Rahmenbedingungen für elektronische Signaturen und gemäss der Umsetzung der\
- Richtlinie im Land, das im Herausgeber dieses Zertifikats angegeben ist. Die Limite für diese Zertifikat ist {1,number, ###,###,###,##0.00#} {0}.
-
-# QcLimitValue Numeric currency code
-# {0} currency code
-# {1} limit value
-# {2} monetary value as MonetaryValue
-CertPathReviewer.QcLimitValueNum.title = Transaction Value Limit
-CertPathReviewer.QcLimitValueNum.text = Dieses Zertifikat hat eine Wertlimite für Transaktionen von {1,number, ###,###,###,##0.00#} der Währung {0} (Siehe RFC 4217 für Währungscodes).
-CertPathReviewer.QcLimitValueNum.summary = Wertlimite für Transaktionen von {1,number, ###,###,###,##0.00#} der Währung {0} (Siehe RFC 4217 für Währungscodes).
-CertPathReviewer.QcLimitValueNum.details = Dieses Zertifikat hat eine Wertlimite für Transaktionen für welche\
- das Zertifikat genutzt werden kann, gemäss der Richtlinie 1999/93/EG des Europäischen Parlaments und\
- des Rates über gemeinschaftliche Rahmenbedingungen für elektronische Signaturen und gemäss der Umsetzung der\
- Richtlinie im Land, das im Herausgeber dieses Zertifikats angegeben ist. Die Limite für diese Zertifikat ist {1,number, ###,###,###,##0.00#} der Währung {0} (Siehe RFC 4217 für Währungscodes).
-
-# QcSSCD
-CertPathReviewer.QcSSCD.title = QcSSCD Statement
-CertPathReviewer.QcSSCD.text = (SSCD) Der Herausgeber macht geltend, dass der Private Schlüssel, der mit diesem Zertifikat verbunden ist, nach den Anforderungen die im Anhang III der Richtlinie 1999/93/EG des Europäischen Parlaments und des Rates über gemeinschaftliche Rahmenbedingungen für elektronische Signaturen geschützt ist.
-CertPathReviewer.QcSSCD.summary = (SSCD) Der Herausgeber macht geltend, dass der Private Schlüssel, der mit diesem Zertifikat verbunden ist, nach den Anforderungen die im Anhang III der Richtlinie 1999/93/EG des Europäischen Parlaments und des Rates über gemeinschaftliche Rahmenbedingungen für elektronische Signaturen geschützt ist.
-CertPathReviewer.QcSSCD.details = (SSCD) Der Herausgeber macht geltend, dass der Private Schlüssel, der mit diesem Zertifikat verbunden ist, nach den Anforderungen die im Anhang III der Richtlinie 1999/93/EG des Europäischen Parlaments und des Rates über gemeinschaftliche Rahmenbedingungen für elektronische Signaturen geschützt ist.
-
-# QcEuCompliance
-CertPathReviewer.QcEuCompliance.title = Qualifiziertes Zertifikat
-CertPathReviewer.QcEuCompliance.text = Dieses Zertifikat wurde als Qualifiziertes Zertifikat herausgegeben gemäss Anhang I und II der Richtlinie 1999/93/EG des Europäischen Parlaments und des Rates über gemeinschaftliche Rahmenbedingungen für elektronische Signaturen und gemäss der Umsetzung der Richtlinie im Land, das im Herausgeber dieses Zertifikats angegeben ist.
-CertPathReviewer.QcEuCompliance.summary = Dieses Zertifikat wurde als Qualifiziertes Zertifikat herausgegeben gemäss Anhang I und II der Richtlinie 1999/93/EG des Europäischen Parlaments und des Rates über gemeinschaftliche Rahmenbedingungen für elektronische Signaturen und gemäss der Umsetzung der Richtlinie in dem Land, das im Herausgeber dieses Zertifikats angegeben ist.
-CertPathReviewer.QcEuCompliance.details = Dieses Zertifikat wurde als Qualifiziertes Zertifikat herausgegeben gemäss Anhang I und II der Richtlinie 1999/93/EG des Europäischen Parlaments und des Rates über gemeinschaftliche Rahmenbedingungen für elektronische Signaturen und gemäss der Umsetzung der Richtlinie in dem Land, das im Herausgeber dieses Zertifikats angegeben ist.
-
-## QcStatement errors
-
-# error processing the QcStatement extension
-CertPathReviewer.QcStatementExtError.title = Fehler bei der Verarbeitung der QcStatement Erweiterung
-CertPathReviewer.QcStatementExtError.text = Fehler bei der Verarbeitung der QcStatement Erweiterung.
-CertPathReviewer.QcStatementExtError.summary = Fehler bei der Verarbeitung der QcStatement Erweiterung.
-CertPathReviewer.QcStatementExtError.details = Fehler bei der Verarbeitung der QcStatement Erweiterung.
-
-## unknown/generic errors
-CertPathReviewer.unknown.title = Unbekannter Fehler 
-CertPathReviewer.unknown.text = Unbekannter Fehler {0}
-CertPathReviewer.unknown.summary = Unbekannter Fehler 
-CertPathReviewer.unknown.details = Unbekannter Fehler {0}
-
-#
-# crl reasons
-#
-unspecified = Nicht spezifiziert
-keyCompromise = Schlüssel Kompromittierung
-cACompromise = CA Kompromittierung
-affiliationChanged = Veränderte Zugehörigkeit
-superseded = Ersetzt
-cessationOfOperation = Einstellen der Tätigkeiten
-certificateHold = Zertifikat vorübergehend gesperrt
-unknown = Unbekannt
-removeFromCRL = Entferne von der CRL
-privilegeWithdrawn = Zurückgezogene Rechte
-aACompromise = AA Kompromittierung
-
-#
-#
-#
-missingIssuer = The missing certificate was issued by
-missingSerial = with the serial number
diff --git a/bcprov/src/main/java/org/bouncycastle/x509/CertPathValidatorUtilities.java b/bcprov/src/main/java/org/bouncycastle/x509/CertPathValidatorUtilities.java
deleted file mode 100644
index ca8769c..0000000
--- a/bcprov/src/main/java/org/bouncycastle/x509/CertPathValidatorUtilities.java
+++ /dev/null
@@ -1,1517 +0,0 @@
-package org.bouncycastle.x509;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.math.BigInteger;
-import java.security.GeneralSecurityException;
-import java.security.KeyFactory;
-import java.security.PublicKey;
-import java.security.cert.CRLException;
-import java.security.cert.CertPath;
-import java.security.cert.CertPathValidatorException;
-import java.security.cert.CertStore;
-import java.security.cert.CertStoreException;
-import java.security.cert.Certificate;
-import java.security.cert.CertificateException;
-import java.security.cert.CertificateParsingException;
-import java.security.cert.PKIXParameters;
-import java.security.cert.PolicyQualifierInfo;
-import java.security.cert.TrustAnchor;
-import java.security.cert.X509CRL;
-import java.security.cert.X509CRLEntry;
-import java.security.cert.X509CRLSelector;
-import java.security.cert.X509CertSelector;
-import java.security.cert.X509Certificate;
-import java.security.interfaces.DSAParams;
-import java.security.interfaces.DSAPublicKey;
-import java.security.spec.DSAPublicKeySpec;
-import java.text.ParseException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Date;
-import java.util.Enumeration;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import javax.security.auth.x500.X500Principal;
-
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1Enumerated;
-import org.bouncycastle.asn1.ASN1GeneralizedTime;
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.ASN1OutputStream;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DERIA5String;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.isismtt.ISISMTTObjectIdentifiers;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.asn1.x509.CRLDistPoint;
-import org.bouncycastle.asn1.x509.CRLReason;
-import org.bouncycastle.asn1.x509.DistributionPoint;
-import org.bouncycastle.asn1.x509.DistributionPointName;
-import org.bouncycastle.asn1.x509.Extension;
-import org.bouncycastle.asn1.x509.GeneralName;
-import org.bouncycastle.asn1.x509.GeneralNames;
-import org.bouncycastle.asn1.x509.IssuingDistributionPoint;
-import org.bouncycastle.asn1.x509.PolicyInformation;
-import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
-import org.bouncycastle.asn1.x509.X509Extension;
-import org.bouncycastle.jcajce.PKIXCertStoreSelector;
-import org.bouncycastle.jce.X509LDAPCertStoreParameters;
-import org.bouncycastle.jce.exception.ExtCertPathValidatorException;
-import org.bouncycastle.jce.provider.AnnotatedException;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.jce.provider.PKIXPolicyNode;
-import org.bouncycastle.util.Encodable;
-import org.bouncycastle.util.Integers;
-import org.bouncycastle.util.Selector;
-import org.bouncycastle.util.Store;
-import org.bouncycastle.util.StoreException;
-
-class CertPathValidatorUtilities
-{
-    protected static final PKIXCRLUtil CRL_UTIL = new PKIXCRLUtil();
-
-    protected static final String CERTIFICATE_POLICIES = Extension.certificatePolicies.getId();
-    protected static final String BASIC_CONSTRAINTS = Extension.basicConstraints.getId();
-    protected static final String POLICY_MAPPINGS = Extension.policyMappings.getId();
-    protected static final String SUBJECT_ALTERNATIVE_NAME = Extension.subjectAlternativeName.getId();
-    protected static final String NAME_CONSTRAINTS = Extension.nameConstraints.getId();
-    protected static final String KEY_USAGE = Extension.keyUsage.getId();
-    protected static final String INHIBIT_ANY_POLICY = Extension.inhibitAnyPolicy.getId();
-    protected static final String ISSUING_DISTRIBUTION_POINT = Extension.issuingDistributionPoint.getId();
-    protected static final String DELTA_CRL_INDICATOR = Extension.deltaCRLIndicator.getId();
-    protected static final String POLICY_CONSTRAINTS = Extension.policyConstraints.getId();
-    protected static final String FRESHEST_CRL = Extension.freshestCRL.getId();
-    protected static final String CRL_DISTRIBUTION_POINTS = Extension.cRLDistributionPoints.getId();
-    protected static final String AUTHORITY_KEY_IDENTIFIER = Extension.authorityKeyIdentifier.getId();
-
-    protected static final String ANY_POLICY = "2.5.29.32.0";
-
-    protected static final String CRL_NUMBER = Extension.cRLNumber.getId();
-
-    /*
-    * key usage bits
-    */
-    protected static final int KEY_CERT_SIGN = 5;
-    protected static final int CRL_SIGN = 6;
-
-    protected static final String[] crlReasons = new String[]{
-        "unspecified",
-        "keyCompromise",
-        "cACompromise",
-        "affiliationChanged",
-        "superseded",
-        "cessationOfOperation",
-        "certificateHold",
-        "unknown",
-        "removeFromCRL",
-        "privilegeWithdrawn",
-        "aACompromise"};
-
-    /**
-     * Search the given Set of TrustAnchor's for one that is the
-     * issuer of the given X509 certificate. Uses the default provider
-     * for signature verification.
-     *
-     * @param cert         the X509 certificate
-     * @param trustAnchors a Set of TrustAnchor's
-     * @return the <code>TrustAnchor</code> object if found or
-     *         <code>null</code> if not.
-     * @throws AnnotatedException if a TrustAnchor was found but the signature verification
-     * on the given certificate has thrown an exception.
-     */
-    protected static TrustAnchor findTrustAnchor(
-        X509Certificate cert,
-        Set trustAnchors)
-        throws AnnotatedException
-    {
-        return findTrustAnchor(cert, trustAnchors, null);
-    }
-
-    /**
-     * Search the given Set of TrustAnchor's for one that is the
-     * issuer of the given X509 certificate. Uses the specified
-     * provider for signature verification, or the default provider
-     * if null.
-     *
-     * @param cert         the X509 certificate
-     * @param trustAnchors a Set of TrustAnchor's
-     * @param sigProvider  the provider to use for signature verification
-     * @return the <code>TrustAnchor</code> object if found or
-     *         <code>null</code> if not.
-     * @throws AnnotatedException if a TrustAnchor was found but the signature verification
-     * on the given certificate has thrown an exception.
-     */
-    protected static TrustAnchor findTrustAnchor(
-        X509Certificate cert,
-        Set trustAnchors,
-        String sigProvider)
-        throws AnnotatedException
-    {
-        TrustAnchor trust = null;
-        PublicKey trustPublicKey = null;
-        Exception invalidKeyEx = null;
-
-        X509CertSelector certSelectX509 = new X509CertSelector();
-        X500Principal certIssuer = getEncodedIssuerPrincipal(cert);
-
-        try
-        {
-            certSelectX509.setSubject(certIssuer.getEncoded());
-        }
-        catch (IOException ex)
-        {
-            throw new AnnotatedException("Cannot set subject search criteria for trust anchor.", ex);
-        }
-
-        Iterator iter = trustAnchors.iterator();
-        while (iter.hasNext() && trust == null)
-        {
-            trust = (TrustAnchor)iter.next();
-            if (trust.getTrustedCert() != null)
-            {
-                if (certSelectX509.match(trust.getTrustedCert()))
-                {
-                    trustPublicKey = trust.getTrustedCert().getPublicKey();
-                }
-                else
-                {
-                    trust = null;
-                }
-            }
-            else if (trust.getCAName() != null
-                && trust.getCAPublicKey() != null)
-            {
-                try
-                {
-                    X500Principal caName = new X500Principal(trust.getCAName());
-                    if (certIssuer.equals(caName))
-                    {
-                        trustPublicKey = trust.getCAPublicKey();
-                    }
-                    else
-                    {
-                        trust = null;
-                    }
-                }
-                catch (IllegalArgumentException ex)
-                {
-                    trust = null;
-                }
-            }
-            else
-            {
-                trust = null;
-            }
-
-            if (trustPublicKey != null)
-            {
-                try
-                {
-                    verifyX509Certificate(cert, trustPublicKey, sigProvider);
-                }
-                catch (Exception ex)
-                {
-                    invalidKeyEx = ex;
-                    trust = null;
-                    trustPublicKey = null;
-                }
-            }
-        }
-
-        if (trust == null && invalidKeyEx != null)
-        {
-            throw new AnnotatedException("TrustAnchor found but certificate validation failed.", invalidKeyEx);
-        }
-
-        return trust;
-    }
-
-    protected static void addAdditionalStoresFromAltNames(
-        X509Certificate cert,
-        ExtendedPKIXParameters pkixParams)
-        throws CertificateParsingException
-    {
-        // if in the IssuerAltName extension an URI
-        // is given, add an additional X.509 store
-        if (cert.getIssuerAlternativeNames() != null)
-        {
-            Iterator it = cert.getIssuerAlternativeNames().iterator();
-            while (it.hasNext())
-            {
-                // look for URI
-                List list = (List)it.next();
-                if (list.get(0).equals(Integers.valueOf(GeneralName.uniformResourceIdentifier)))
-                {
-                    // found
-                    String temp = (String)list.get(1);
-                    CertPathValidatorUtilities.addAdditionalStoreFromLocation(temp, pkixParams);
-                }
-            }
-        }
-    }
-
-    /**
-     * Returns the issuer of an attribute certificate or certificate.
-     *
-     * @param cert The attribute certificate or certificate.
-     * @return The issuer as <code>X500Principal</code>.
-     */
-    protected static X500Principal getEncodedIssuerPrincipal(
-        Object cert)
-    {
-        if (cert instanceof X509Certificate)
-        {
-            return ((X509Certificate)cert).getIssuerX500Principal();
-        }
-        else
-        {
-            return (X500Principal)((X509AttributeCertificate)cert).getIssuer().getPrincipals()[0];
-        }
-    }
-
-    protected static Date getValidDate(PKIXParameters paramsPKIX)
-    {
-        Date validDate = paramsPKIX.getDate();
-
-        if (validDate == null)
-        {
-            validDate = new Date();
-        }
-
-        return validDate;
-    }
-
-    protected static X500Principal getSubjectPrincipal(X509Certificate cert)
-    {
-        return cert.getSubjectX500Principal();
-    }
-
-    protected static boolean isSelfIssued(X509Certificate cert)
-    {
-        return cert.getSubjectDN().equals(cert.getIssuerDN());
-    }
-
-
-    /**
-     * Extract the value of the given extension, if it exists.
-     *
-     * @param ext The extension object.
-     * @param oid The object identifier to obtain.
-     * @throws AnnotatedException if the extension cannot be read.
-     */
-    protected static ASN1Primitive getExtensionValue(
-        java.security.cert.X509Extension ext,
-        String oid)
-        throws AnnotatedException
-    {
-        byte[] bytes = ext.getExtensionValue(oid);
-        if (bytes == null)
-        {
-            return null;
-        }
-
-        return getObject(oid, bytes);
-    }
-
-    private static ASN1Primitive getObject(
-        String oid,
-        byte[] ext)
-        throws AnnotatedException
-    {
-        try
-        {
-            ASN1InputStream aIn = new ASN1InputStream(ext);
-            ASN1OctetString octs = (ASN1OctetString)aIn.readObject();
-
-            aIn = new ASN1InputStream(octs.getOctets());
-            return aIn.readObject();
-        }
-        catch (Exception e)
-        {
-            throw new AnnotatedException("exception processing extension " + oid, e);
-        }
-    }
-
-    protected static X500Principal getIssuerPrincipal(X509CRL crl)
-    {
-        return crl.getIssuerX500Principal();
-    }
-
-    protected static AlgorithmIdentifier getAlgorithmIdentifier(
-        PublicKey key)
-        throws CertPathValidatorException
-    {
-        try
-        {
-            ASN1InputStream aIn = new ASN1InputStream(key.getEncoded());
-
-            SubjectPublicKeyInfo info = SubjectPublicKeyInfo.getInstance(aIn.readObject());
-
-            return info.getAlgorithmId();
-        }
-        catch (Exception e)
-        {
-            throw new ExtCertPathValidatorException("Subject public key cannot be decoded.", e);
-        }
-    }
-
-    // crl checking
-
-
-    //
-    // policy checking
-    //
-
-    protected static final Set getQualifierSet(ASN1Sequence qualifiers)
-        throws CertPathValidatorException
-    {
-        Set pq = new HashSet();
-
-        if (qualifiers == null)
-        {
-            return pq;
-        }
-
-        ByteArrayOutputStream bOut = new ByteArrayOutputStream();
-        ASN1OutputStream aOut = new ASN1OutputStream(bOut);
-
-        Enumeration e = qualifiers.getObjects();
-
-        while (e.hasMoreElements())
-        {
-            try
-            {
-                aOut.writeObject((ASN1Encodable)e.nextElement());
-
-                pq.add(new PolicyQualifierInfo(bOut.toByteArray()));
-            }
-            catch (IOException ex)
-            {
-                throw new ExtCertPathValidatorException("Policy qualifier info cannot be decoded.", ex);
-            }
-
-            bOut.reset();
-        }
-
-        return pq;
-    }
-
-    protected static PKIXPolicyNode removePolicyNode(
-        PKIXPolicyNode validPolicyTree,
-        List[] policyNodes,
-        PKIXPolicyNode _node)
-    {
-        PKIXPolicyNode _parent = (PKIXPolicyNode)_node.getParent();
-
-        if (validPolicyTree == null)
-        {
-            return null;
-        }
-
-        if (_parent == null)
-        {
-            for (int j = 0; j < policyNodes.length; j++)
-            {
-                policyNodes[j] = new ArrayList();
-            }
-
-            return null;
-        }
-        else
-        {
-            _parent.removeChild(_node);
-            removePolicyNodeRecurse(policyNodes, _node);
-
-            return validPolicyTree;
-        }
-    }
-
-    private static void removePolicyNodeRecurse(
-        List[] policyNodes,
-        PKIXPolicyNode _node)
-    {
-        policyNodes[_node.getDepth()].remove(_node);
-
-        if (_node.hasChildren())
-        {
-            Iterator _iter = _node.getChildren();
-            while (_iter.hasNext())
-            {
-                PKIXPolicyNode _child = (PKIXPolicyNode)_iter.next();
-                removePolicyNodeRecurse(policyNodes, _child);
-            }
-        }
-    }
-
-
-    protected static boolean processCertD1i(
-        int index,
-        List[] policyNodes,
-        ASN1ObjectIdentifier pOid,
-        Set pq)
-    {
-        List policyNodeVec = policyNodes[index - 1];
-
-        for (int j = 0; j < policyNodeVec.size(); j++)
-        {
-            PKIXPolicyNode node = (PKIXPolicyNode)policyNodeVec.get(j);
-            Set expectedPolicies = node.getExpectedPolicies();
-
-            if (expectedPolicies.contains(pOid.getId()))
-            {
-                Set childExpectedPolicies = new HashSet();
-                childExpectedPolicies.add(pOid.getId());
-
-                PKIXPolicyNode child = new PKIXPolicyNode(new ArrayList(),
-                    index,
-                    childExpectedPolicies,
-                    node,
-                    pq,
-                    pOid.getId(),
-                    false);
-                node.addChild(child);
-                policyNodes[index].add(child);
-
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    protected static void processCertD1ii(
-        int index,
-        List[] policyNodes,
-        ASN1ObjectIdentifier _poid,
-        Set _pq)
-    {
-        List policyNodeVec = policyNodes[index - 1];
-
-        for (int j = 0; j < policyNodeVec.size(); j++)
-        {
-            PKIXPolicyNode _node = (PKIXPolicyNode)policyNodeVec.get(j);
-
-            if (ANY_POLICY.equals(_node.getValidPolicy()))
-            {
-                Set _childExpectedPolicies = new HashSet();
-                _childExpectedPolicies.add(_poid.getId());
-
-                PKIXPolicyNode _child = new PKIXPolicyNode(new ArrayList(),
-                    index,
-                    _childExpectedPolicies,
-                    _node,
-                    _pq,
-                    _poid.getId(),
-                    false);
-                _node.addChild(_child);
-                policyNodes[index].add(_child);
-                return;
-            }
-        }
-    }
-
-    protected static void prepareNextCertB1(
-        int i,
-        List[] policyNodes,
-        String id_p,
-        Map m_idp,
-        X509Certificate cert
-    )
-        throws AnnotatedException, CertPathValidatorException
-    {
-        boolean idp_found = false;
-        Iterator nodes_i = policyNodes[i].iterator();
-        while (nodes_i.hasNext())
-        {
-            PKIXPolicyNode node = (PKIXPolicyNode)nodes_i.next();
-            if (node.getValidPolicy().equals(id_p))
-            {
-                idp_found = true;
-                node.setExpectedPolicies((Set)m_idp.get(id_p));
-                break;
-            }
-        }
-
-        if (!idp_found)
-        {
-            nodes_i = policyNodes[i].iterator();
-            while (nodes_i.hasNext())
-            {
-                PKIXPolicyNode node = (PKIXPolicyNode)nodes_i.next();
-                if (ANY_POLICY.equals(node.getValidPolicy()))
-                {
-                    Set pq = null;
-                    ASN1Sequence policies = null;
-                    try
-                    {
-                        policies = DERSequence.getInstance(getExtensionValue(cert, CERTIFICATE_POLICIES));
-                    }
-                    catch (Exception e)
-                    {
-                        throw new AnnotatedException("Certificate policies cannot be decoded.", e);
-                    }
-                    Enumeration e = policies.getObjects();
-                    while (e.hasMoreElements())
-                    {
-                        PolicyInformation pinfo = null;
-
-                        try
-                        {
-                            pinfo = PolicyInformation.getInstance(e.nextElement());
-                        }
-                        catch (Exception ex)
-                        {
-                            throw new AnnotatedException("Policy information cannot be decoded.", ex);
-                        }
-                        if (ANY_POLICY.equals(pinfo.getPolicyIdentifier().getId()))
-                        {
-                            try
-                            {
-                                pq = getQualifierSet(pinfo.getPolicyQualifiers());
-                            }
-                            catch (CertPathValidatorException ex)
-                            {
-                                throw new ExtCertPathValidatorException(
-                                    "Policy qualifier info set could not be built.", ex);
-                            }
-                            break;
-                        }
-                    }
-                    boolean ci = false;
-                    if (cert.getCriticalExtensionOIDs() != null)
-                    {
-                        ci = cert.getCriticalExtensionOIDs().contains(CERTIFICATE_POLICIES);
-                    }
-
-                    PKIXPolicyNode p_node = (PKIXPolicyNode)node.getParent();
-                    if (ANY_POLICY.equals(p_node.getValidPolicy()))
-                    {
-                        PKIXPolicyNode c_node = new PKIXPolicyNode(
-                            new ArrayList(), i,
-                            (Set)m_idp.get(id_p),
-                            p_node, pq, id_p, ci);
-                        p_node.addChild(c_node);
-                        policyNodes[i].add(c_node);
-                    }
-                    break;
-                }
-            }
-        }
-    }
-
-    protected static PKIXPolicyNode prepareNextCertB2(
-        int i,
-        List[] policyNodes,
-        String id_p,
-        PKIXPolicyNode validPolicyTree)
-    {
-        Iterator nodes_i = policyNodes[i].iterator();
-        while (nodes_i.hasNext())
-        {
-            PKIXPolicyNode node = (PKIXPolicyNode)nodes_i.next();
-            if (node.getValidPolicy().equals(id_p))
-            {
-                PKIXPolicyNode p_node = (PKIXPolicyNode)node.getParent();
-                p_node.removeChild(node);
-                nodes_i.remove();
-                for (int k = (i - 1); k >= 0; k--)
-                {
-                    List nodes = policyNodes[k];
-                    for (int l = 0; l < nodes.size(); l++)
-                    {
-                        PKIXPolicyNode node2 = (PKIXPolicyNode)nodes.get(l);
-                        if (!node2.hasChildren())
-                        {
-                            validPolicyTree = removePolicyNode(validPolicyTree, policyNodes, node2);
-                            if (validPolicyTree == null)
-                            {
-                                break;
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        return validPolicyTree;
-    }
-
-    protected static boolean isAnyPolicy(
-        Set policySet)
-    {
-        return policySet == null || policySet.contains(ANY_POLICY) || policySet.isEmpty();
-    }
-
-    protected static void addAdditionalStoreFromLocation(String location,
-                                                         ExtendedPKIXParameters pkixParams)
-    {
-        if (pkixParams.isAdditionalLocationsEnabled())
-        {
-            try
-            {
-                if (location.startsWith("ldap://"))
-                {
-                    // ldap://directory.d-trust.net/CN=D-TRUST
-                    // Qualified CA 2003 1:PN,O=D-Trust GmbH,C=DE
-                    // skip "ldap://"
-                    location = location.substring(7);
-                    // after first / baseDN starts
-                    String base = null;
-                    String url = null;
-                    if (location.indexOf("/") != -1)
-                    {
-                        base = location.substring(location.indexOf("/"));
-                        // URL
-                        url = "ldap://"
-                            + location.substring(0, location.indexOf("/"));
-                    }
-                    else
-                    {
-                        url = "ldap://" + location;
-                    }
-                    // use all purpose parameters
-                    X509LDAPCertStoreParameters params = new X509LDAPCertStoreParameters.Builder(
-                        url, base).build();
-                    pkixParams.addAdditionalStore(X509Store.getInstance(
-                        "CERTIFICATE/LDAP", params, BouncyCastleProvider.PROVIDER_NAME));
-                    pkixParams.addAdditionalStore(X509Store.getInstance(
-                        "CRL/LDAP", params, BouncyCastleProvider.PROVIDER_NAME));
-                    pkixParams.addAdditionalStore(X509Store.getInstance(
-                        "ATTRIBUTECERTIFICATE/LDAP", params, BouncyCastleProvider.PROVIDER_NAME));
-                    pkixParams.addAdditionalStore(X509Store.getInstance(
-                        "CERTIFICATEPAIR/LDAP", params, BouncyCastleProvider.PROVIDER_NAME));
-                }
-            }
-            catch (Exception e)
-            {
-                // cannot happen
-                throw new RuntimeException("Exception adding X.509 stores.");
-            }
-        }
-    }
-
-    /**
-     * Return a Collection of all certificates or attribute certificates found
-     * in the X509Store's that are matching the certSelect criteriums.
-     *
-     * @param certSelect a {@link Selector} object that will be used to select
-     *                   the certificates
-     * @param certStores a List containing only {@link X509Store} objects. These
-     *                   are used to search for certificates.
-     * @return a Collection of all found {@link X509Certificate} or
-     *         {@link org.bouncycastle.x509.X509AttributeCertificate} objects.
-     *         May be empty but never <code>null</code>.
-     */
-    protected static Collection findCertificates(X509CertStoreSelector certSelect,
-                                                 List certStores)
-        throws AnnotatedException
-    {
-        Set certs = new HashSet();
-        Iterator iter = certStores.iterator();
-        org.bouncycastle.jcajce.provider.asymmetric.x509.CertificateFactory certFact = new org.bouncycastle.jcajce.provider.asymmetric.x509.CertificateFactory();
-
-        while (iter.hasNext())
-        {
-            Object obj = iter.next();
-
-            if (obj instanceof Store)
-            {
-                Store certStore = (Store)obj;
-                try
-                {
-                    for (Iterator it = certStore.getMatches(certSelect).iterator(); it.hasNext();)
-                    {
-                        Object cert = it.next();
-
-                        if (cert instanceof Encodable)
-                        {
-                            certs.add(certFact.engineGenerateCertificate(new ByteArrayInputStream(((Encodable)cert).getEncoded())));
-                        }
-                        else if (cert instanceof Certificate)
-                        {
-                             certs.add(cert);
-                        }
-                        else
-                        {
-                            throw new AnnotatedException(
-                                    "Unknown object found in certificate store.");
-                        }
-                    }
-                }
-                catch (StoreException e)
-                {
-                    throw new AnnotatedException(
-                            "Problem while picking certificates from X.509 store.", e);
-                }
-                catch (IOException e)
-                {
-                    throw new AnnotatedException(
-                            "Problem while extracting certificates from X.509 store.", e);
-                }
-                catch (CertificateException e)
-                {
-                    throw new AnnotatedException(
-                            "Problem while extracting certificates from X.509 store.", e);
-                }
-            }
-            else
-            {
-                CertStore certStore = (CertStore)obj;
-
-                try
-                {
-                    certs.addAll(certStore.getCertificates(certSelect));
-                }
-                catch (CertStoreException e)
-                {
-                    throw new AnnotatedException(
-                        "Problem while picking certificates from certificate store.",
-                        e);
-                }
-            }
-        }
-        return certs;
-    }
-
-    protected static Collection findCertificates(PKIXCertStoreSelector certSelect,
-                                                 List certStores)
-        throws AnnotatedException
-    {
-        Set certs = new HashSet();
-        Iterator iter = certStores.iterator();
-
-        while (iter.hasNext())
-        {
-            Object obj = iter.next();
-
-            if (obj instanceof Store)
-            {
-                Store certStore = (Store)obj;
-                try
-                {
-                    certs.addAll(certStore.getMatches(certSelect));
-                }
-                catch (StoreException e)
-                {
-                    throw new AnnotatedException(
-                            "Problem while picking certificates from X.509 store.", e);
-                }
-            }
-            else
-            {
-                CertStore certStore = (CertStore)obj;
-
-                try
-                {
-                    certs.addAll(PKIXCertStoreSelector.getCertificates(certSelect, certStore));
-                }
-                catch (CertStoreException e)
-                {
-                    throw new AnnotatedException(
-                        "Problem while picking certificates from certificate store.",
-                        e);
-                }
-            }
-        }
-        return certs;
-    }
-
-    protected static Collection findCertificates(X509AttributeCertStoreSelector certSelect,
-                                                 List certStores)
-        throws AnnotatedException
-    {
-        Set certs = new HashSet();
-        Iterator iter = certStores.iterator();
-
-        while (iter.hasNext())
-        {
-            Object obj = iter.next();
-
-            if (obj instanceof X509Store)
-            {
-                X509Store certStore = (X509Store)obj;
-                try
-                {
-                    certs.addAll(certStore.getMatches(certSelect));
-                }
-                catch (StoreException e)
-                {
-                    throw new AnnotatedException(
-                            "Problem while picking certificates from X.509 store.", e);
-                }
-            }
-        }
-        return certs;
-    }
-
-    protected static void addAdditionalStoresFromCRLDistributionPoint(
-        CRLDistPoint crldp, ExtendedPKIXParameters pkixParams)
-        throws AnnotatedException
-    {
-        if (crldp != null)
-        {
-            DistributionPoint dps[] = null;
-            try
-            {
-                dps = crldp.getDistributionPoints();
-            }
-            catch (Exception e)
-            {
-                throw new AnnotatedException(
-                    "Distribution points could not be read.", e);
-            }
-            for (int i = 0; i < dps.length; i++)
-            {
-                DistributionPointName dpn = dps[i].getDistributionPoint();
-                // look for URIs in fullName
-                if (dpn != null)
-                {
-                    if (dpn.getType() == DistributionPointName.FULL_NAME)
-                    {
-                        GeneralName[] genNames = GeneralNames.getInstance(
-                            dpn.getName()).getNames();
-                        // look for an URI
-                        for (int j = 0; j < genNames.length; j++)
-                        {
-                            if (genNames[j].getTagNo() == GeneralName.uniformResourceIdentifier)
-                            {
-                                String location = DERIA5String.getInstance(
-                                    genNames[j].getName()).getString();
-                                CertPathValidatorUtilities
-                                    .addAdditionalStoreFromLocation(location,
-                                        pkixParams);
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * Add the CRL issuers from the cRLIssuer field of the distribution point or
-     * from the certificate if not given to the issuer criterion of the
-     * <code>selector</code>.
-     * <p>
-     * The <code>issuerPrincipals</code> are a collection with a single
-     * <code>X500Principal</code> for <code>X509Certificate</code>s. For
-     * {@link X509AttributeCertificate}s the issuer may contain more than one
-     * <code>X500Principal</code>.
-     * </p>
-     * @param dp               The distribution point.
-     * @param issuerPrincipals The issuers of the certificate or attribute
-     *                         certificate which contains the distribution point.
-     * @param selector         The CRL selector.
-     * @param pkixParams       The PKIX parameters containing the cert stores.
-     * @throws AnnotatedException if an exception occurs while processing.
-     * @throws ClassCastException if <code>issuerPrincipals</code> does not
-     * contain only <code>X500Principal</code>s.
-     */
-    protected static void getCRLIssuersFromDistributionPoint(
-        DistributionPoint dp,
-        Collection issuerPrincipals,
-        X509CRLSelector selector,
-        ExtendedPKIXParameters pkixParams)
-        throws AnnotatedException
-    {
-        List issuers = new ArrayList();
-        // indirect CRL
-        if (dp.getCRLIssuer() != null)
-        {
-            GeneralName genNames[] = dp.getCRLIssuer().getNames();
-            // look for a DN
-            for (int j = 0; j < genNames.length; j++)
-            {
-                if (genNames[j].getTagNo() == GeneralName.directoryName)
-                {
-                    try
-                    {
-                        issuers.add(new X500Principal(genNames[j].getName()
-                            .toASN1Primitive().getEncoded()));
-                    }
-                    catch (IOException e)
-                    {
-                        throw new AnnotatedException(
-                            "CRL issuer information from distribution point cannot be decoded.",
-                            e);
-                    }
-                }
-            }
-        }
-        else
-        {
-            /*
-             * certificate issuer is CRL issuer, distributionPoint field MUST be
-             * present.
-             */
-            if (dp.getDistributionPoint() == null)
-            {
-                throw new AnnotatedException(
-                    "CRL issuer is omitted from distribution point but no distributionPoint field present.");
-            }
-            // add and check issuer principals
-            for (Iterator it = issuerPrincipals.iterator(); it.hasNext(); )
-            {
-                issuers.add((X500Principal)it.next());
-            }
-        }
-        // TODO: is not found although this should correctly add the rel name. selector of Sun is buggy here or PKI test case is invalid
-        // distributionPoint
-//        if (dp.getDistributionPoint() != null)
-//        {
-//            // look for nameRelativeToCRLIssuer
-//            if (dp.getDistributionPoint().getType() == DistributionPointName.NAME_RELATIVE_TO_CRL_ISSUER)
-//            {
-//                // append fragment to issuer, only one
-//                // issuer can be there, if this is given
-//                if (issuers.size() != 1)
-//                {
-//                    throw new AnnotatedException(
-//                        "nameRelativeToCRLIssuer field is given but more than one CRL issuer is given.");
-//                }
-//                ASN1Encodable relName = dp.getDistributionPoint().getName();
-//                Iterator it = issuers.iterator();
-//                List issuersTemp = new ArrayList(issuers.size());
-//                while (it.hasNext())
-//                {
-//                    Enumeration e = null;
-//                    try
-//                    {
-//                        e = ASN1Sequence.getInstance(
-//                            new ASN1InputStream(((X500Principal) it.next())
-//                                .getEncoded()).readObject()).getObjects();
-//                    }
-//                    catch (IOException ex)
-//                    {
-//                        throw new AnnotatedException(
-//                            "Cannot decode CRL issuer information.", ex);
-//                    }
-//                    ASN1EncodableVector v = new ASN1EncodableVector();
-//                    while (e.hasMoreElements())
-//                    {
-//                        v.add((ASN1Encodable) e.nextElement());
-//                    }
-//                    v.add(relName);
-//                    issuersTemp.add(new X500Principal(new DERSequence(v)
-//                        .getDEREncoded()));
-//                }
-//                issuers.clear();
-//                issuers.addAll(issuersTemp);
-//            }
-//        }
-        Iterator it = issuers.iterator();
-        while (it.hasNext())
-        {
-            try
-            {
-                selector.addIssuerName(((X500Principal)it.next()).getEncoded());
-            }
-            catch (IOException ex)
-            {
-                throw new AnnotatedException(
-                    "Cannot decode CRL issuer information.", ex);
-            }
-        }
-    }
-
-    private static BigInteger getSerialNumber(
-        Object cert)
-    {
-        if (cert instanceof X509Certificate)
-        {
-            return ((X509Certificate)cert).getSerialNumber();
-        }
-        else
-        {
-            return ((X509AttributeCertificate)cert).getSerialNumber();
-        }
-    }
-
-    protected static void getCertStatus(
-        Date validDate,
-        X509CRL crl,
-        Object cert,
-        CertStatus certStatus)
-        throws AnnotatedException
-    {
-        X509CRLEntry crl_entry = null;
-
-        boolean isIndirect;
-        try
-        {
-            isIndirect = isIndirectCRL(crl);
-        }
-        catch (CRLException exception)
-        {
-            throw new AnnotatedException("Failed check for indirect CRL.", exception);
-        }
-
-        if (isIndirect)
-        {
-            crl_entry = crl.getRevokedCertificate(getSerialNumber(cert));
-
-            if (crl_entry == null)
-            {
-                return;
-            }
-
-            X500Principal certIssuer = crl_entry.getCertificateIssuer();
-
-            if (certIssuer == null)
-            {
-                certIssuer = getIssuerPrincipal(crl);
-            }
-
-            if (!getEncodedIssuerPrincipal(cert).equals(certIssuer))
-            {
-                return;
-            }
-        }
-        else if (!getEncodedIssuerPrincipal(cert).equals(getIssuerPrincipal(crl)))
-        {
-            return;  // not for our issuer, ignore
-        }
-        else
-        {
-            crl_entry = crl.getRevokedCertificate(getSerialNumber(cert));
-
-            if (crl_entry == null)
-            {
-                return;
-            }
-        }
-
-        ASN1Enumerated reasonCode = null;
-        if (crl_entry.hasExtensions())
-        {
-            try
-            {
-                reasonCode = ASN1Enumerated
-                    .getInstance(CertPathValidatorUtilities
-                        .getExtensionValue(crl_entry,
-                            X509Extension.reasonCode.getId()));
-            }
-            catch (Exception e)
-            {
-                throw new AnnotatedException(
-                    "Reason code CRL entry extension could not be decoded.",
-                    e);
-            }
-        }
-
-        // for reason keyCompromise, caCompromise, aACompromise or
-        // unspecified
-        if (!(validDate.getTime() < crl_entry.getRevocationDate().getTime())
-            || reasonCode == null
-            || reasonCode.getValue().intValue() == 0
-            || reasonCode.getValue().intValue() == 1
-            || reasonCode.getValue().intValue() == 2
-            || reasonCode.getValue().intValue() == 8)
-        {
-
-            // (i) or (j) (1)
-            if (reasonCode != null)
-            {
-                certStatus.setCertStatus(reasonCode.getValue().intValue());
-            }
-            // (i) or (j) (2)
-            else
-            {
-                certStatus.setCertStatus(CRLReason.unspecified);
-            }
-            certStatus.setRevocationDate(crl_entry.getRevocationDate());
-        }
-    }
-
-    /**
-     * Fetches delta CRLs according to RFC 3280 section 5.2.4.
-     *
-     * @param currentDate The date for which the delta CRLs must be valid.
-     * @param paramsPKIX  The extended PKIX parameters.
-     * @param completeCRL The complete CRL the delta CRL is for.
-     * @return A <code>Set</code> of <code>X509CRL</code>s with delta CRLs.
-     * @throws AnnotatedException if an exception occurs while picking the delta
-     * CRLs.
-     */
-    protected static Set getDeltaCRLs(Date currentDate,
-                                      ExtendedPKIXParameters paramsPKIX, X509CRL completeCRL)
-        throws AnnotatedException
-    {
-
-        X509CRLStoreSelector deltaSelect = new X509CRLStoreSelector();
-
-        // 5.2.4 (a)
-        try
-        {
-            deltaSelect.addIssuerName(CertPathValidatorUtilities
-                .getIssuerPrincipal(completeCRL).getEncoded());
-        }
-        catch (IOException e)
-        {
-            throw new AnnotatedException("Cannot extract issuer from CRL.", e);
-        }
-
-        BigInteger completeCRLNumber = null;
-        try
-        {
-            ASN1Primitive derObject = CertPathValidatorUtilities.getExtensionValue(completeCRL,
-                CRL_NUMBER);
-            if (derObject != null)
-            {
-                completeCRLNumber = ASN1Integer.getInstance(derObject).getPositiveValue();
-            }
-        }
-        catch (Exception e)
-        {
-            throw new AnnotatedException(
-                "CRL number extension could not be extracted from CRL.", e);
-        }
-
-        // 5.2.4 (b)
-        byte[] idp = null;
-        try
-        {
-            idp = completeCRL.getExtensionValue(ISSUING_DISTRIBUTION_POINT);
-        }
-        catch (Exception e)
-        {
-            throw new AnnotatedException(
-                "Issuing distribution point extension value could not be read.",
-                e);
-        }
-
-        // 5.2.4 (d)
-
-        deltaSelect.setMinCRLNumber(completeCRLNumber == null ? null : completeCRLNumber
-            .add(BigInteger.valueOf(1)));
-
-        deltaSelect.setIssuingDistributionPoint(idp);
-        deltaSelect.setIssuingDistributionPointEnabled(true);
-
-        // 5.2.4 (c)
-        deltaSelect.setMaxBaseCRLNumber(completeCRLNumber);
-
-        // find delta CRLs
-        Set temp = CRL_UTIL.findCRLs(deltaSelect, paramsPKIX, currentDate);
-
-        Set result = new HashSet();
-
-        for (Iterator it = temp.iterator(); it.hasNext(); )
-        {
-            X509CRL crl = (X509CRL)it.next();
-
-            if (isDeltaCRL(crl))
-            {
-                result.add(crl);
-            }
-        }
-
-        return result;
-    }
-
-    private static boolean isDeltaCRL(X509CRL crl)
-    {
-        Set critical = crl.getCriticalExtensionOIDs();
-
-        if (critical == null)
-        {
-            return false;
-        }
-
-        return critical.contains(Extension.deltaCRLIndicator.getId());
-    }
-
-    /**
-     * Fetches complete CRLs according to RFC 3280.
-     *
-     * @param dp          The distribution point for which the complete CRL
-     * @param cert        The <code>X509Certificate</code> or
-     *                    {@link org.bouncycastle.x509.X509AttributeCertificate} for
-     *                    which the CRL should be searched.
-     * @param currentDate The date for which the delta CRLs must be valid.
-     * @param paramsPKIX  The extended PKIX parameters.
-     * @return A <code>Set</code> of <code>X509CRL</code>s with complete
-     *         CRLs.
-     * @throws AnnotatedException if an exception occurs while picking the CRLs
-     * or no CRLs are found.
-     */
-    protected static Set getCompleteCRLs(DistributionPoint dp, Object cert,
-                                         Date currentDate, ExtendedPKIXParameters paramsPKIX)
-        throws AnnotatedException
-    {
-        X509CRLStoreSelector crlselect = new X509CRLStoreSelector();
-        try
-        {
-            Set issuers = new HashSet();
-            if (cert instanceof X509AttributeCertificate)
-            {
-                issuers.add(((X509AttributeCertificate)cert)
-                    .getIssuer().getPrincipals()[0]);
-            }
-            else
-            {
-                issuers.add(getEncodedIssuerPrincipal(cert));
-            }
-            CertPathValidatorUtilities.getCRLIssuersFromDistributionPoint(dp, issuers, crlselect, paramsPKIX);
-        }
-        catch (AnnotatedException e)
-        {
-            throw new AnnotatedException(
-                "Could not get issuer information from distribution point.", e);
-        }
-        if (cert instanceof X509Certificate)
-        {
-            crlselect.setCertificateChecking((X509Certificate)cert);
-        }
-        else if (cert instanceof X509AttributeCertificate)
-        {
-            crlselect.setAttrCertificateChecking((X509AttributeCertificate)cert);
-        }
-
-
-        crlselect.setCompleteCRLEnabled(true);
-
-        Set crls = CRL_UTIL.findCRLs(crlselect, paramsPKIX, currentDate);
-
-        if (crls.isEmpty())
-        {
-            if (cert instanceof X509AttributeCertificate)
-            {
-                X509AttributeCertificate aCert = (X509AttributeCertificate)cert;
-
-                throw new AnnotatedException("No CRLs found for issuer \"" + aCert.getIssuer().getPrincipals()[0] + "\"");
-            }
-            else
-            {
-                X509Certificate xCert = (X509Certificate)cert;
-
-                throw new AnnotatedException("No CRLs found for issuer \"" + xCert.getIssuerX500Principal() + "\"");
-            }
-        }
-        return crls;
-    }
-
-    protected static Date getValidCertDateFromValidityModel(
-        ExtendedPKIXParameters paramsPKIX, CertPath certPath, int index)
-        throws AnnotatedException
-    {
-        if (paramsPKIX.getValidityModel() == ExtendedPKIXParameters.CHAIN_VALIDITY_MODEL)
-        {
-            // if end cert use given signing/encryption/... time
-            if (index <= 0)
-            {
-                return CertPathValidatorUtilities.getValidDate(paramsPKIX);
-                // else use time when previous cert was created
-            }
-            else
-            {
-                if (index - 1 == 0)
-                {
-                    ASN1GeneralizedTime dateOfCertgen = null;
-                    try
-                    {
-                        byte[] extBytes = ((X509Certificate)certPath.getCertificates().get(index - 1)).getExtensionValue(ISISMTTObjectIdentifiers.id_isismtt_at_dateOfCertGen.getId());
-                        if (extBytes != null)
-                        {
-                            dateOfCertgen = ASN1GeneralizedTime.getInstance(ASN1Primitive.fromByteArray(extBytes));
-                        }
-                    }
-                    catch (IOException e)
-                    {
-                        throw new AnnotatedException(
-                            "Date of cert gen extension could not be read.");
-                    }
-                    catch (IllegalArgumentException e)
-                    {
-                        throw new AnnotatedException(
-                            "Date of cert gen extension could not be read.");
-                    }
-                    if (dateOfCertgen != null)
-                    {
-                        try
-                        {
-                            return dateOfCertgen.getDate();
-                        }
-                        catch (ParseException e)
-                        {
-                            throw new AnnotatedException(
-                                "Date from date of cert gen extension could not be parsed.",
-                                e);
-                        }
-                    }
-                    return ((X509Certificate)certPath.getCertificates().get(
-                        index - 1)).getNotBefore();
-                }
-                else
-                {
-                    return ((X509Certificate)certPath.getCertificates().get(
-                        index - 1)).getNotBefore();
-                }
-            }
-        }
-        else
-        {
-            return getValidDate(paramsPKIX);
-        }
-    }
-
-    /**
-     * Return the next working key inheriting DSA parameters if necessary.
-     * <p>
-     * This methods inherits DSA parameters from the indexed certificate or
-     * previous certificates in the certificate chain to the returned
-     * <code>PublicKey</code>. The list is searched upwards, meaning the end
-     * certificate is at position 0 and previous certificates are following.
-     * </p>
-     * <p>
-     * If the indexed certificate does not contain a DSA key this method simply
-     * returns the public key. If the DSA key already contains DSA parameters
-     * the key is also only returned.
-     * </p>
-     *
-     * @param certs The certification path.
-     * @param index The index of the certificate which contains the public key
-     *              which should be extended with DSA parameters.
-     * @return The public key of the certificate in list position
-     *         <code>index</code> extended with DSA parameters if applicable.
-     * @throws AnnotatedException if DSA parameters cannot be inherited.
-     */
-    protected static PublicKey getNextWorkingKey(List certs, int index)
-        throws CertPathValidatorException
-    {
-        Certificate cert = (Certificate)certs.get(index);
-        PublicKey pubKey = cert.getPublicKey();
-        if (!(pubKey instanceof DSAPublicKey))
-        {
-            return pubKey;
-        }
-        DSAPublicKey dsaPubKey = (DSAPublicKey)pubKey;
-        if (dsaPubKey.getParams() != null)
-        {
-            return dsaPubKey;
-        }
-        for (int i = index + 1; i < certs.size(); i++)
-        {
-            X509Certificate parentCert = (X509Certificate)certs.get(i);
-            pubKey = parentCert.getPublicKey();
-            if (!(pubKey instanceof DSAPublicKey))
-            {
-                throw new CertPathValidatorException(
-                    "DSA parameters cannot be inherited from previous certificate.");
-            }
-            DSAPublicKey prevDSAPubKey = (DSAPublicKey)pubKey;
-            if (prevDSAPubKey.getParams() == null)
-            {
-                continue;
-            }
-            DSAParams dsaParams = prevDSAPubKey.getParams();
-            DSAPublicKeySpec dsaPubKeySpec = new DSAPublicKeySpec(
-                dsaPubKey.getY(), dsaParams.getP(), dsaParams.getQ(), dsaParams.getG());
-            try
-            {
-                KeyFactory keyFactory = KeyFactory.getInstance("DSA", BouncyCastleProvider.PROVIDER_NAME);
-                return keyFactory.generatePublic(dsaPubKeySpec);
-            }
-            catch (Exception exception)
-            {
-                throw new RuntimeException(exception.getMessage());
-            }
-        }
-        throw new CertPathValidatorException("DSA parameters cannot be inherited from previous certificate.");
-    }
-
-    /**
-     * Find the issuer certificates of a given certificate.
-     *
-     * @param cert       The certificate for which an issuer should be found.
-     * @return A <code>Collection</code> object containing the issuer
-     *         <code>X509Certificate</code>s. Never <code>null</code>.
-     * @throws AnnotatedException if an error occurs.
-     */
-    static Collection findIssuerCerts(
-        X509Certificate cert,
-        List            certStores,
-        List            pkixCertStores)
-        throws AnnotatedException
-    {
-        X509CertSelector selector = new X509CertSelector();
-
-        try
-        {
-            selector.setSubject(cert.getIssuerX500Principal().getEncoded());
-        }
-        catch (IOException e)
-        {
-            throw new AnnotatedException(
-                           "Subject criteria for certificate selector to find issuer certificate could not be set.", e);
-        }
-
-        PKIXCertStoreSelector certSelect = new PKIXCertStoreSelector.Builder(selector).build();
-        Set certs = new HashSet();
-
-        Iterator iter;
-
-        try
-        {
-            List matches = new ArrayList();
-
-            matches.addAll(CertPathValidatorUtilities.findCertificates(certSelect, certStores));
-            matches.addAll(CertPathValidatorUtilities.findCertificates(certSelect, pkixCertStores));
-
-            iter = matches.iterator();
-        }
-        catch (AnnotatedException e)
-        {
-            throw new AnnotatedException("Issuer certificate cannot be searched.", e);
-        }
-
-        X509Certificate issuer = null;
-        while (iter.hasNext())
-        {
-            issuer = (X509Certificate)iter.next();
-            // issuer cannot be verified because possible DSA inheritance
-            // parameters are missing
-            certs.add(issuer);
-        }
-        return certs;
-    }
-
-    protected static void verifyX509Certificate(X509Certificate cert, PublicKey publicKey,
-                                                String sigProvider)
-        throws GeneralSecurityException
-    {
-        if (sigProvider == null)
-        {
-            cert.verify(publicKey);
-        }
-        else
-        {
-            cert.verify(publicKey, sigProvider);
-        }
-    }
-
-    static boolean isIndirectCRL(X509CRL crl)
-        throws CRLException
-    {
-        try
-        {
-            byte[] idp = crl.getExtensionValue(Extension.issuingDistributionPoint.getId());
-            return idp != null
-                && IssuingDistributionPoint.getInstance(ASN1OctetString.getInstance(idp).getOctets()).isIndirectCRL();
-        }
-        catch (Exception e)
-        {
-            throw new CRLException(
-                    "Exception reading IssuingDistributionPoint: " + e);
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/x509/CertStatus.java b/bcprov/src/main/java/org/bouncycastle/x509/CertStatus.java
deleted file mode 100644
index f12910d..0000000
--- a/bcprov/src/main/java/org/bouncycastle/x509/CertStatus.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package org.bouncycastle.x509;
-
-import java.util.Date;
-
-class CertStatus
-{
-    public static final int UNREVOKED = 11;
-
-    public static final int UNDETERMINED = 12;
-
-    int certStatus = UNREVOKED;
-
-    Date revocationDate = null;
-
-    /**
-     * @return Returns the revocationDate.
-     */
-    public Date getRevocationDate()
-    {
-        return revocationDate;
-    }
-
-    /**
-     * @param revocationDate The revocationDate to set.
-     */
-    public void setRevocationDate(Date revocationDate)
-    {
-        this.revocationDate = revocationDate;
-    }
-
-    /**
-     * @return Returns the certStatus.
-     */
-    public int getCertStatus()
-    {
-        return certStatus;
-    }
-
-    /**
-     * @param certStatus The certStatus to set.
-     */
-    public void setCertStatus(int certStatus)
-    {
-        this.certStatus = certStatus;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/x509/NoSuchParserException.java b/bcprov/src/main/java/org/bouncycastle/x509/NoSuchParserException.java
deleted file mode 100644
index c25b9dd..0000000
--- a/bcprov/src/main/java/org/bouncycastle/x509/NoSuchParserException.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package org.bouncycastle.x509;
-
-public class NoSuchParserException
-    extends Exception
-{
-    public NoSuchParserException(String message)
-    {
-        super(message);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/x509/PKIXCRLUtil.java b/bcprov/src/main/java/org/bouncycastle/x509/PKIXCRLUtil.java
deleted file mode 100644
index bfa9f2d..0000000
--- a/bcprov/src/main/java/org/bouncycastle/x509/PKIXCRLUtil.java
+++ /dev/null
@@ -1,153 +0,0 @@
-package org.bouncycastle.x509;
-
-import java.security.cert.CertStore;
-import java.security.cert.CertStoreException;
-import java.security.cert.PKIXParameters;
-import java.security.cert.X509CRL;
-import java.security.cert.X509Certificate;
-import java.util.Collection;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import org.bouncycastle.jce.provider.AnnotatedException;
-import org.bouncycastle.util.StoreException;
-
-class PKIXCRLUtil
-{
-    public Set findCRLs(X509CRLStoreSelector crlselect, ExtendedPKIXParameters paramsPKIX, Date currentDate)
-        throws AnnotatedException
-    {
-        Set initialSet = new HashSet();
-
-        // get complete CRL(s)
-        try
-        {
-            initialSet.addAll(findCRLs(crlselect, paramsPKIX.getAdditionalStores()));
-            initialSet.addAll(findCRLs(crlselect, paramsPKIX.getStores()));
-            initialSet.addAll(findCRLs(crlselect, paramsPKIX.getCertStores()));
-        }
-        catch (AnnotatedException e)
-        {
-            throw new AnnotatedException("Exception obtaining complete CRLs.", e);
-        }
-
-        Set finalSet = new HashSet();
-        Date validityDate = currentDate;
-
-        if (paramsPKIX.getDate() != null)
-        {
-            validityDate = paramsPKIX.getDate();
-        }
-
-        // based on RFC 5280 6.3.3
-        for (Iterator it = initialSet.iterator(); it.hasNext();)
-        {
-            X509CRL crl = (X509CRL)it.next();
-
-            if (crl.getNextUpdate().after(validityDate))
-            {
-                X509Certificate cert = crlselect.getCertificateChecking();
-
-                if (cert != null)
-                {
-                    if (crl.getThisUpdate().before(cert.getNotAfter()))
-                    {
-                        finalSet.add(crl);
-                    }
-                }
-                else
-                {
-                    finalSet.add(crl);
-                }
-            }
-        }
-
-        return finalSet;
-    }
-
-    public Set findCRLs(X509CRLStoreSelector crlselect, PKIXParameters paramsPKIX)
-        throws AnnotatedException
-    {
-        Set completeSet = new HashSet();
-
-        // get complete CRL(s)
-        try
-        {
-            completeSet.addAll(findCRLs(crlselect, paramsPKIX.getCertStores()));
-        }
-        catch (AnnotatedException e)
-        {
-            throw new AnnotatedException("Exception obtaining complete CRLs.", e);
-        }
-
-        return completeSet;
-    }
-
-/**
-     * Return a Collection of all CRLs found in the X509Store's that are
-     * matching the crlSelect criteriums.
-     *
-     * @param crlSelect a {@link X509CRLStoreSelector} object that will be used
-     *            to select the CRLs
-     * @param crlStores a List containing only
-     *            {@link org.bouncycastle.x509.X509Store  X509Store} objects.
-     *            These are used to search for CRLs
-     *
-     * @return a Collection of all found {@link java.security.cert.X509CRL X509CRL} objects. May be
-     *         empty but never <code>null</code>.
-     */
-    private final Collection findCRLs(X509CRLStoreSelector crlSelect,
-        List crlStores) throws AnnotatedException
-    {
-        Set crls = new HashSet();
-        Iterator iter = crlStores.iterator();
-
-        AnnotatedException lastException = null;
-        boolean foundValidStore = false;
-
-        while (iter.hasNext())
-        {
-            Object obj = iter.next();
-
-            if (obj instanceof X509Store)
-            {
-                X509Store store = (X509Store)obj;
-
-                try
-                {
-                    crls.addAll(store.getMatches(crlSelect));
-                    foundValidStore = true;
-                }
-                catch (StoreException e)
-                {
-                    lastException = new AnnotatedException(
-                        "Exception searching in X.509 CRL store.", e);
-                }
-            }
-            else
-            {
-                CertStore store = (CertStore)obj;
-
-                try
-                {
-                    crls.addAll(store.getCRLs(crlSelect));
-                    foundValidStore = true;
-                }
-                catch (CertStoreException e)
-                {
-                    lastException = new AnnotatedException(
-                        "Exception searching in X.509 CRL store.", e);
-                }
-            }
-        }
-        if (!foundValidStore && lastException != null)
-        {
-            throw lastException;
-        }
-        return crls;
-    }
-
-}
\ No newline at end of file
diff --git a/bcprov/src/main/java/org/bouncycastle/x509/PKIXCertPathReviewer.java b/bcprov/src/main/java/org/bouncycastle/x509/PKIXCertPathReviewer.java
deleted file mode 100644
index 3271aa9..0000000
--- a/bcprov/src/main/java/org/bouncycastle/x509/PKIXCertPathReviewer.java
+++ /dev/null
@@ -1,2543 +0,0 @@
-package org.bouncycastle.x509;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.math.BigInteger;
-import java.net.HttpURLConnection;
-import java.net.InetAddress;
-import java.net.URL;
-import java.security.GeneralSecurityException;
-import java.security.PublicKey;
-import java.security.SignatureException;
-import java.security.cert.CertPath;
-import java.security.cert.CertPathValidatorException;
-import java.security.cert.CertificateExpiredException;
-import java.security.cert.CertificateFactory;
-import java.security.cert.CertificateNotYetValidException;
-import java.security.cert.PKIXCertPathChecker;
-import java.security.cert.PKIXParameters;
-import java.security.cert.PolicyNode;
-import java.security.cert.TrustAnchor;
-import java.security.cert.X509CRL;
-import java.security.cert.X509CRLEntry;
-import java.security.cert.X509CertSelector;
-import java.security.cert.X509Certificate;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Date;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.Vector;
-
-import javax.security.auth.x500.X500Principal;
-
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1Enumerated;
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1OctetString;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.ASN1TaggedObject;
-import org.bouncycastle.asn1.DERIA5String;
-import org.bouncycastle.asn1.DEROctetString;
-import org.bouncycastle.asn1.x509.AccessDescription;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.asn1.x509.AuthorityInformationAccess;
-import org.bouncycastle.asn1.x509.AuthorityKeyIdentifier;
-import org.bouncycastle.asn1.x509.BasicConstraints;
-import org.bouncycastle.asn1.x509.CRLDistPoint;
-import org.bouncycastle.asn1.x509.DistributionPoint;
-import org.bouncycastle.asn1.x509.DistributionPointName;
-import org.bouncycastle.asn1.x509.GeneralName;
-import org.bouncycastle.asn1.x509.GeneralNames;
-import org.bouncycastle.asn1.x509.GeneralSubtree;
-import org.bouncycastle.asn1.x509.IssuingDistributionPoint;
-import org.bouncycastle.asn1.x509.NameConstraints;
-import org.bouncycastle.asn1.x509.PolicyInformation;
-import org.bouncycastle.asn1.x509.X509Extensions;
-import org.bouncycastle.asn1.x509.qualified.Iso4217CurrencyCode;
-import org.bouncycastle.asn1.x509.qualified.MonetaryValue;
-import org.bouncycastle.asn1.x509.qualified.QCStatement;
-import org.bouncycastle.i18n.ErrorBundle;
-import org.bouncycastle.i18n.LocaleString;
-import org.bouncycastle.i18n.filter.TrustedInput;
-import org.bouncycastle.i18n.filter.UntrustedInput;
-import org.bouncycastle.i18n.filter.UntrustedUrlInput;
-import org.bouncycastle.jce.provider.AnnotatedException;
-import org.bouncycastle.jce.provider.PKIXNameConstraintValidator;
-import org.bouncycastle.jce.provider.PKIXNameConstraintValidatorException;
-import org.bouncycastle.jce.provider.PKIXPolicyNode;
-import org.bouncycastle.util.Integers;
-import org.bouncycastle.x509.extension.X509ExtensionUtil;
-
-/**
- * PKIXCertPathReviewer<br>
- * Validation of X.509 Certificate Paths. Tries to find as much errors in the Path as possible.
- */
-public class PKIXCertPathReviewer extends CertPathValidatorUtilities
-{
-    
-    private static final String QC_STATEMENT = X509Extensions.QCStatements.getId();
-    private static final String CRL_DIST_POINTS = X509Extensions.CRLDistributionPoints.getId();
-    private static final String AUTH_INFO_ACCESS = X509Extensions.AuthorityInfoAccess.getId();
-    
-    private static final String RESOURCE_NAME = "org.bouncycastle.x509.CertPathReviewerMessages";
-    
-    // input parameters
-    
-    protected CertPath certPath;
-
-    protected PKIXParameters pkixParams;
-
-    protected Date validDate;
-
-    // state variables
-    
-    protected List certs;
-
-    protected int n;
-    
-    // output variables
-    
-    protected List[] notifications;
-    protected List[] errors;
-    protected TrustAnchor trustAnchor;
-    protected PublicKey subjectPublicKey;
-    protected PolicyNode policyTree;
-    
-    private boolean initialized;
-    
-    /** 
-     * Initializes the PKIXCertPathReviewer with the given {@link CertPath} and {@link PKIXParameters} params
-     * @param certPath the {@link CertPath} to validate
-     * @param params the {@link PKIXParameters} to use
-     * @throws CertPathReviewerException if the certPath is empty
-     * @throws IllegalStateException if the {@link PKIXCertPathReviewer} is already initialized
-     */
-    public void init(CertPath certPath, PKIXParameters params)
-            throws CertPathReviewerException
-    {
-        if (initialized)
-        {
-            throw new IllegalStateException("object is already initialized!");
-        }
-        initialized = true;
-        
-        // check input parameters
-        if (certPath == null)
-        {
-            throw new NullPointerException("certPath was null");
-        }
-        this.certPath = certPath;
-
-        certs = certPath.getCertificates();
-        n = certs.size();
-        if (certs.isEmpty())
-        {
-            throw new CertPathReviewerException(
-                    new ErrorBundle(RESOURCE_NAME,"CertPathReviewer.emptyCertPath"));
-        }
-
-        pkixParams = (PKIXParameters) params.clone();
-
-        // 6.1.1 - Inputs
-
-        // a) done
-
-        // b)
-
-        validDate = getValidDate(pkixParams);
-
-        // c) part of pkixParams
-
-        // d) done at the beginning of checkSignatures
-
-        // e) f) g) part of pkixParams
-        
-        // initialize output parameters
-        
-        notifications = null;
-        errors = null;
-        trustAnchor = null;
-        subjectPublicKey = null;
-        policyTree = null;
-    }
-    
-    /**
-     * Creates a PKIXCertPathReviewer and initializes it with the given {@link CertPath} and {@link PKIXParameters} params
-     * @param certPath the {@link CertPath} to validate
-     * @param params the {@link PKIXParameters} to use
-     * @throws CertPathReviewerException if the certPath is empty
-     */
-    public PKIXCertPathReviewer(CertPath certPath, PKIXParameters params)
-            throws CertPathReviewerException
-    {
-        init(certPath, params);
-    }
-    
-    /**
-     * Creates an empty PKIXCertPathReviewer. Don't forget to call init() to initialize the object.
-     */
-    public PKIXCertPathReviewer()
-    {
-        // do nothing
-    }
-    
-    /**
-     * 
-     * @return the CertPath that was validated
-     */
-    public CertPath getCertPath()
-    {
-        return certPath;
-    }
-    
-    /**
-     * 
-     * @return the size of the CertPath
-     */
-    public int getCertPathSize()
-    {
-        return n;
-    }
-
-    /**
-     * Returns an Array of Lists which contains a List of global error messages 
-     * and a List of error messages for each certificate in the path.
-     * The global error List is at index 0. The error lists for each certificate at index 1 to n. 
-     * The error messages are of type.
-     * @return the Array of Lists which contain the error messages
-     * @throws IllegalStateException if the {@link PKIXCertPathReviewer} was not initialized
-     */
-    public List[] getErrors()
-    {
-        doChecks();
-        return errors;
-    }
-    
-    /**
-     * Returns an List of error messages for the certificate at the given index in the CertPath.
-     * If index == -1 then the list of global errors is returned with errors not specific to a certificate. 
-     * @param index the index of the certificate in the CertPath
-     * @return List of error messages for the certificate
-     * @throws IllegalStateException if the {@link PKIXCertPathReviewer} was not initialized
-     */
-    public List getErrors(int index)
-    {
-        doChecks();
-        return errors[index + 1];
-    }
-
-    /**
-     * Returns an Array of Lists which contains a List of global notification messages 
-     * and a List of botification messages for each certificate in the path.
-     * The global notificatio List is at index 0. The notification lists for each certificate at index 1 to n. 
-     * The error messages are of type.
-     * @return the Array of Lists which contain the notification messages
-     * @throws IllegalStateException if the {@link PKIXCertPathReviewer} was not initialized
-     */
-    public List[] getNotifications()
-    {
-        doChecks();
-        return notifications;
-    }
-    
-    /**
-     * Returns an List of notification messages for the certificate at the given index in the CertPath.
-     * If index == -1 then the list of global notifications is returned with notifications not specific to a certificate. 
-     * @param index the index of the certificate in the CertPath
-     * @return List of notification messages for the certificate
-     * @throws IllegalStateException if the {@link PKIXCertPathReviewer} was not initialized
-     */
-    public List getNotifications(int index)
-    {
-        doChecks();
-        return notifications[index + 1];
-    }
-
-    /**
-     * 
-     * @return the valid policy tree, <b>null</b> if no valid policy exists.
-     * @throws IllegalStateException if the {@link PKIXCertPathReviewer} was not initialized
-     */
-    public PolicyNode getPolicyTree()
-    {
-        doChecks();
-        return policyTree;
-    }
-
-    /**
-     * 
-     * @return the PublicKey if the last certificate in the CertPath
-     * @throws IllegalStateException if the {@link PKIXCertPathReviewer} was not initialized
-     */
-    public PublicKey getSubjectPublicKey()
-    {
-        doChecks();
-        return subjectPublicKey;
-    }
-
-    /**
-     * 
-     * @return the TrustAnchor for the CertPath, <b>null</b> if no valid TrustAnchor was found.
-     * @throws IllegalStateException if the {@link PKIXCertPathReviewer} was not initialized
-     */
-    public TrustAnchor getTrustAnchor()
-    {
-        doChecks();
-        return trustAnchor;
-    }
-    
-    /**
-     * 
-     * @return if the CertPath is valid
-     * @throws IllegalStateException if the {@link PKIXCertPathReviewer} was not initialized
-     */
-    public boolean isValidCertPath()
-    {
-        doChecks();
-        boolean valid = true;
-        for (int i = 0; i < errors.length; i++)
-        {
-            if (!errors[i].isEmpty())
-            {
-                valid = false;
-                break;
-            }
-        }
-        return valid;
-    }
-    
-    protected void addNotification(ErrorBundle msg)
-    {
-        notifications[0].add(msg);
-    }
-    
-    protected void addNotification(ErrorBundle msg, int index)
-    {
-        if (index < -1 || index >= n)
-        {
-            throw new IndexOutOfBoundsException();
-        }
-        notifications[index + 1].add(msg);
-    }
-
-    protected void addError(ErrorBundle msg) 
-    {
-        errors[0].add(msg);
-    }
-    
-    protected void addError(ErrorBundle msg, int index)
-    {
-        if (index < -1 || index >= n)
-        {
-            throw new IndexOutOfBoundsException();
-        }
-        errors[index + 1].add(msg);
-    }
-    
-    protected void doChecks()
-    {
-        if (!initialized)
-        {
-            throw new IllegalStateException("Object not initialized. Call init() first.");
-        }
-        if (notifications == null)
-        {
-            // initialize lists
-            notifications = new List[n+1];
-            errors = new List[n+1];
-            
-            for (int i = 0; i < notifications.length; i++)
-            {
-                notifications[i] = new ArrayList();
-                errors[i] = new ArrayList();
-            }
-            
-            // check Signatures
-            checkSignatures();
-            
-            // check Name Constraints
-            checkNameConstraints();
-            
-            // check Path Length
-            checkPathLength();
-            
-            // check Policy
-            checkPolicy();
-            
-            // check other critical extensions
-            checkCriticalExtensions();
-            
-        }
-    }
-
-    private void checkNameConstraints()
-    {
-        X509Certificate cert = null;
-        
-        //
-        // Setup
-        //
-        
-        // (b)  and (c)
-        PKIXNameConstraintValidator nameConstraintValidator = new PKIXNameConstraintValidator();
-
-        //
-        // process each certificate except the last in the path
-        //
-        int index;
-        int i;
-        
-        try 
-        {
-            for (index = certs.size()-1; index>0; index--) 
-            {
-                i = n - index;
-                
-                //
-                // certificate processing
-                //    
-                
-                cert = (X509Certificate) certs.get(index);
-                
-                // b),c)
-                
-                if (!isSelfIssued(cert))
-                {
-                    X500Principal principal = getSubjectPrincipal(cert);
-                    ASN1InputStream aIn = new ASN1InputStream(new ByteArrayInputStream(principal.getEncoded()));
-                    ASN1Sequence    dns;
-    
-                    try
-                    {
-                        dns = (ASN1Sequence)aIn.readObject();
-                    }
-                    catch (IOException e)
-                    {
-                        ErrorBundle msg = new ErrorBundle(RESOURCE_NAME,"CertPathReviewer.ncSubjectNameError", 
-                                new Object[] {new UntrustedInput(principal)});
-                        throw new CertPathReviewerException(msg,e,certPath,index);
-                    }
-    
-                    try
-                    {
-                        nameConstraintValidator.checkPermittedDN(dns);
-                    }
-                    catch (PKIXNameConstraintValidatorException cpve)
-                    {
-                        ErrorBundle msg = new ErrorBundle(RESOURCE_NAME,"CertPathReviewer.notPermittedDN", 
-                                new Object[] {new UntrustedInput(principal.getName())});
-                        throw new CertPathReviewerException(msg,cpve,certPath,index);
-                    }
-                    
-                    try
-                    {
-                        nameConstraintValidator.checkExcludedDN(dns);
-                    }
-                    catch (PKIXNameConstraintValidatorException cpve)
-                    {
-                        ErrorBundle msg = new ErrorBundle(RESOURCE_NAME,"CertPathReviewer.excludedDN",
-                                new Object[] {new UntrustedInput(principal.getName())});
-                        throw new CertPathReviewerException(msg,cpve,certPath,index);
-                    }
-            
-                    ASN1Sequence altName;
-                    try 
-                    {
-                        altName = (ASN1Sequence)getExtensionValue(cert, SUBJECT_ALTERNATIVE_NAME);
-                    }
-                    catch (AnnotatedException ae)
-                    {
-                        ErrorBundle msg = new ErrorBundle(RESOURCE_NAME,"CertPathReviewer.subjAltNameExtError");
-                        throw new CertPathReviewerException(msg,ae,certPath,index);
-                    }
-                    
-                    if (altName != null)
-                    {
-                        for (int j = 0; j < altName.size(); j++)
-                        {
-                            GeneralName name = GeneralName.getInstance(altName.getObjectAt(j));
-
-                            try
-                            {
-                                nameConstraintValidator.checkPermitted(name);
-                                nameConstraintValidator.checkExcluded(name);
-                            }
-                            catch (PKIXNameConstraintValidatorException cpve)
-                            {
-                                ErrorBundle msg = new ErrorBundle(RESOURCE_NAME,"CertPathReviewer.notPermittedEmail",
-                                        new Object[] {new UntrustedInput(name)});
-                                throw new CertPathReviewerException(msg,cpve,certPath,index);
-                            }
-//                            switch(o.getTagNo())            TODO - move resources to PKIXNameConstraints
-//                            {
-//                            case 1:
-//                                String email = DERIA5String.getInstance(o, true).getString();
-//
-//                                try
-//                                {
-//                                    checkPermittedEmail(permittedSubtreesEmail, email);
-//                                }
-//                                catch (CertPathValidatorException cpve)
-//                                {
-//                                    ErrorBundle msg = new ErrorBundle(RESOURCE_NAME,"CertPathReviewer.notPermittedEmail",
-//                                            new Object[] {new UntrustedInput(email)});
-//                                    throw new CertPathReviewerException(msg,cpve,certPath,index);
-//                                }
-//
-//                                try
-//                                {
-//                                    checkExcludedEmail(excludedSubtreesEmail, email);
-//                                }
-//                                catch (CertPathValidatorException cpve)
-//                                {
-//                                    ErrorBundle msg = new ErrorBundle(RESOURCE_NAME,"CertPathReviewer.excludedEmail",
-//                                            new Object[] {new UntrustedInput(email)});
-//                                    throw new CertPathReviewerException(msg,cpve,certPath,index);
-//                                }
-//
-//                                break;
-//                            case 4:
-//                                ASN1Sequence altDN = ASN1Sequence.getInstance(o, true);
-//
-//                                try
-//                                {
-//                                    checkPermittedDN(permittedSubtreesDN, altDN);
-//                                }
-//                                catch (CertPathValidatorException cpve)
-//                                {
-//                                    X509Name altDNName = new X509Name(altDN);
-//                                    ErrorBundle msg = new ErrorBundle(RESOURCE_NAME,"CertPathReviewer.notPermittedDN",
-//                                            new Object[] {new UntrustedInput(altDNName)});
-//                                    throw new CertPathReviewerException(msg,cpve,certPath,index);
-//                                }
-//
-//                                try
-//                                {
-//                                    checkExcludedDN(excludedSubtreesDN, altDN);
-//                                }
-//                                catch (CertPathValidatorException cpve)
-//                                {
-//                                    X509Name altDNName = new X509Name(altDN);
-//                                    ErrorBundle msg = new ErrorBundle(RESOURCE_NAME,"CertPathReviewer.excludedDN",
-//                                            new Object[] {new UntrustedInput(altDNName)});
-//                                    throw new CertPathReviewerException(msg,cpve,certPath,index);
-//                                }
-//
-//                                break;
-//                            case 7:
-//                                byte[] ip = ASN1OctetString.getInstance(o, true).getOctets();
-//
-//                                try
-//                                {
-//                                    checkPermittedIP(permittedSubtreesIP, ip);
-//                                }
-//                                catch (CertPathValidatorException cpve)
-//                                {
-//                                    ErrorBundle msg = new ErrorBundle(RESOURCE_NAME,"CertPathReviewer.notPermittedIP",
-//                                            new Object[] {IPtoString(ip)});
-//                                    throw new CertPathReviewerException(msg,cpve,certPath,index);
-//                                }
-//
-//                                try
-//                                {
-//                                    checkExcludedIP(excludedSubtreesIP, ip);
-//                                }
-//                                catch (CertPathValidatorException cpve)
-//                                {
-//                                    ErrorBundle msg = new ErrorBundle(RESOURCE_NAME,"CertPathReviewer.excludedIP",
-//                                            new Object[] {IPtoString(ip)});
-//                                    throw new CertPathReviewerException(msg,cpve,certPath,index);
-//                                }
-//                            }
-                        }
-                    }
-                }
-                
-                //
-                // prepare for next certificate
-                //
-                
-                //
-                // (g) handle the name constraints extension
-                //
-                ASN1Sequence ncSeq;
-                try 
-                {
-                    ncSeq = (ASN1Sequence)getExtensionValue(cert, NAME_CONSTRAINTS);
-                }
-                catch (AnnotatedException ae)
-                {
-                    ErrorBundle msg = new ErrorBundle(RESOURCE_NAME,"CertPathReviewer.ncExtError");
-                    throw new CertPathReviewerException(msg,ae,certPath,index);
-                }
-                
-                if (ncSeq != null)
-                {
-                    NameConstraints nc = NameConstraints.getInstance(ncSeq);
-
-                    //
-                    // (g) (1) permitted subtrees
-                    //
-                    GeneralSubtree[] permitted = nc.getPermittedSubtrees();
-                    if (permitted != null)
-                    {
-                        nameConstraintValidator.intersectPermittedSubtree(permitted);
-                    }
-                
-                    //
-                    // (g) (2) excluded subtrees
-                    //
-                    GeneralSubtree[] excluded = nc.getExcludedSubtrees();
-                    if (excluded != null)
-                    {
-                        for (int c = 0; c != excluded.length; c++)
-                        {
-                             nameConstraintValidator.addExcludedSubtree(excluded[c]);
-                        }
-                    }
-                }
-                
-            } // for
-        }
-        catch (CertPathReviewerException cpre)
-        {
-            addError(cpre.getErrorMessage(),cpre.getIndex());
-        }
-        
-    }
-
-    /*
-     * checks: - path length constraints and reports - total path length
-     */
-    private void checkPathLength()
-    {
-        // init
-        int maxPathLength = n;
-        int totalPathLength = 0;
-
-        X509Certificate cert = null;
-
-        int i;
-        for (int index = certs.size() - 1; index > 0; index--)
-        {
-            i = n - index;
-
-            cert = (X509Certificate) certs.get(index);
-
-            // l)
-
-            if (!isSelfIssued(cert))
-            {
-                if (maxPathLength <= 0)
-                {
-                    ErrorBundle msg = new ErrorBundle(RESOURCE_NAME,"CertPathReviewer.pathLenghtExtended");
-                    addError(msg);
-                }
-                maxPathLength--;
-                totalPathLength++;
-            }
-
-            // m)
-
-            BasicConstraints bc;
-            try
-            {
-                bc = BasicConstraints.getInstance(getExtensionValue(cert,
-                        BASIC_CONSTRAINTS));
-            }
-            catch (AnnotatedException ae)
-            {
-                ErrorBundle msg = new ErrorBundle(RESOURCE_NAME,"CertPathReviewer.processLengthConstError");
-                addError(msg,index);
-                bc = null;
-            }
-
-            if (bc != null)
-            {
-                BigInteger _pathLengthConstraint = bc.getPathLenConstraint();
-
-                if (_pathLengthConstraint != null)
-                {
-                    int _plc = _pathLengthConstraint.intValue();
-
-                    if (_plc < maxPathLength)
-                    {
-                        maxPathLength = _plc;
-                    }
-                }
-            }
-
-        }
-
-        ErrorBundle msg = new ErrorBundle(RESOURCE_NAME,"CertPathReviewer.totalPathLength",
-                new Object[]{Integers.valueOf(totalPathLength)});
-        
-        addNotification(msg);
-    }
-
-    /*
-     * checks: - signatures - name chaining - validity of certificates - todo:
-     * if certificate revoked (if specified in the parameters)
-     */
-    private void checkSignatures()
-    {
-        // 1.6.1 - Inputs
-        
-        // d)
-        
-        TrustAnchor trust = null;
-        X500Principal trustPrincipal = null;
-        
-        // validation date
-        {
-            ErrorBundle msg = new ErrorBundle(RESOURCE_NAME,"CertPathReviewer.certPathValidDate",
-                    new Object[] {new TrustedInput(validDate), new TrustedInput(new Date())});
-            addNotification(msg);
-        }
-        
-        // find trust anchors
-        try
-        {
-            X509Certificate cert = (X509Certificate) certs.get(certs.size() - 1);
-            Collection trustColl = getTrustAnchors(cert,pkixParams.getTrustAnchors());
-            if (trustColl.size() > 1)
-            {
-                // conflicting trust anchors                
-                ErrorBundle msg = new ErrorBundle(RESOURCE_NAME,
-                        "CertPathReviewer.conflictingTrustAnchors",
-                        new Object[]{Integers.valueOf(trustColl.size()),
-                            new UntrustedInput(cert.getIssuerX500Principal())});
-                addError(msg);
-            }
-            else if (trustColl.isEmpty())
-            {
-                ErrorBundle msg = new ErrorBundle(RESOURCE_NAME,
-                        "CertPathReviewer.noTrustAnchorFound",
-                        new Object[]{new UntrustedInput(cert.getIssuerX500Principal()),
-                            Integers.valueOf(pkixParams.getTrustAnchors().size())});
-                addError(msg);
-            }
-            else
-            {
-                PublicKey trustPublicKey;
-                trust = (TrustAnchor) trustColl.iterator().next();
-                if (trust.getTrustedCert() != null)
-                {
-                    trustPublicKey = trust.getTrustedCert().getPublicKey();
-                }
-                else
-                {
-                    trustPublicKey = trust.getCAPublicKey();
-                }
-                try
-                {
-                    CertPathValidatorUtilities.verifyX509Certificate(cert, trustPublicKey,
-                        pkixParams.getSigProvider());
-                }
-                catch (SignatureException e)
-                {
-                    ErrorBundle msg = new ErrorBundle(RESOURCE_NAME,"CertPathReviewer.trustButInvalidCert");
-                    addError(msg);
-                }
-                catch (Exception e)
-                {
-                    // do nothing, error occurs again later
-                }
-            }
-        }
-        catch (CertPathReviewerException cpre)
-        {
-            addError(cpre.getErrorMessage());
-        }
-        catch (Throwable t)
-        {
-            ErrorBundle msg = new ErrorBundle(RESOURCE_NAME,
-                    "CertPathReviewer.unknown",
-                    new Object[] {new UntrustedInput(t.getMessage()), new UntrustedInput(t)});
-            addError(msg);
-        }
-        
-        if (trust != null)
-        {
-            // get the name of the trustAnchor
-            X509Certificate sign = trust.getTrustedCert();
-            try
-            {
-                if (sign != null)
-                {
-                    trustPrincipal = getSubjectPrincipal(sign);
-                }
-                else
-                {
-                    trustPrincipal = new X500Principal(trust.getCAName());
-                }
-            }
-            catch (IllegalArgumentException ex)
-            {
-                ErrorBundle msg = new ErrorBundle(RESOURCE_NAME,"CertPathReviewer.trustDNInvalid",
-                        new Object[] {new UntrustedInput(trust.getCAName())});
-                addError(msg);
-            }
-            
-            // test key usages of the trust anchor
-            if (sign != null)
-            {
-                boolean[] ku = sign.getKeyUsage(); 
-                if (ku != null && !ku[5])
-                {
-                    ErrorBundle msg = new ErrorBundle(RESOURCE_NAME, "CertPathReviewer.trustKeyUsage");
-                    addNotification(msg);
-                }
-            }
-        }
-        
-        // 1.6.2 - Initialization
-        
-        PublicKey workingPublicKey = null;
-        X500Principal workingIssuerName = trustPrincipal;
-        
-        X509Certificate sign = null;
-
-        AlgorithmIdentifier workingAlgId = null;
-        ASN1ObjectIdentifier workingPublicKeyAlgorithm = null;
-        ASN1Encodable workingPublicKeyParameters = null;
-        
-        if (trust != null)
-        {
-            sign = trust.getTrustedCert();
-            
-            if (sign != null)
-            {
-                workingPublicKey = sign.getPublicKey();
-            }
-            else
-            {
-                workingPublicKey = trust.getCAPublicKey();
-            }
-        
-            try
-            {
-                workingAlgId = getAlgorithmIdentifier(workingPublicKey);
-                workingPublicKeyAlgorithm = workingAlgId.getObjectId();
-                workingPublicKeyParameters = workingAlgId.getParameters();
-            }
-            catch (CertPathValidatorException ex)
-            {
-                ErrorBundle msg = new ErrorBundle(RESOURCE_NAME,"CertPathReviewer.trustPubKeyError");
-                addError(msg);
-                workingAlgId = null;
-            }
-            
-        }
-
-        // Basic cert checks
-
-        X509Certificate cert = null;
-        int i;
-
-        for (int index = certs.size() - 1; index >= 0; index--)
-        {
-            //
-            // i as defined in the algorithm description
-            //
-            i = n - index;
-
-            //
-            // set certificate to be checked in this round
-            // sign and workingPublicKey and workingIssuerName are set
-            // at the end of the for loop and initialied the
-            // first time from the TrustAnchor
-            //
-            cert = (X509Certificate) certs.get(index);
-
-            // verify signature
-            if (workingPublicKey != null)
-            {
-                try
-                {
-                    CertPathValidatorUtilities.verifyX509Certificate(cert, workingPublicKey,
-                        pkixParams.getSigProvider());
-                }
-                catch (GeneralSecurityException ex)
-                {
-                    ErrorBundle msg = new ErrorBundle(RESOURCE_NAME,"CertPathReviewer.signatureNotVerified",
-                            new Object[] {ex.getMessage(),ex,ex.getClass().getName()}); 
-                    addError(msg,index);
-                }
-            }
-            else if (isSelfIssued(cert))
-            {
-                try
-                {
-                    CertPathValidatorUtilities.verifyX509Certificate(cert, cert.getPublicKey(),
-                        pkixParams.getSigProvider());
-                    ErrorBundle msg = new ErrorBundle(RESOURCE_NAME,"CertPathReviewer.rootKeyIsValidButNotATrustAnchor");
-                    addError(msg, index);
-                }
-                catch (GeneralSecurityException ex)
-                {
-                    ErrorBundle msg = new ErrorBundle(RESOURCE_NAME,"CertPathReviewer.signatureNotVerified",
-                            new Object[] {ex.getMessage(),ex,ex.getClass().getName()}); 
-                    addError(msg,index);
-                }
-            }
-            else
-            {
-                ErrorBundle msg = new ErrorBundle(RESOURCE_NAME,"CertPathReviewer.NoIssuerPublicKey");
-                // if there is an authority key extension add the serial and issuer of the missing certificate
-                byte[] akiBytes = cert.getExtensionValue(X509Extensions.AuthorityKeyIdentifier.getId());
-                if (akiBytes != null)
-                {
-                    try
-                    {
-                        AuthorityKeyIdentifier aki = AuthorityKeyIdentifier.getInstance(
-                            X509ExtensionUtil.fromExtensionValue(akiBytes));
-                        GeneralNames issuerNames = aki.getAuthorityCertIssuer();
-                        if (issuerNames != null)
-                        {
-                            GeneralName name = issuerNames.getNames()[0];
-                            BigInteger serial = aki.getAuthorityCertSerialNumber(); 
-                            if (serial != null)
-                            {
-                                Object[] extraArgs = {new LocaleString(RESOURCE_NAME, "missingIssuer"), " \"", name , 
-                                        "\" ", new LocaleString(RESOURCE_NAME, "missingSerial") , " ", serial};
-                                msg.setExtraArguments(extraArgs);
-                            }
-                        }
-                    }
-                    catch (IOException e)
-                    {
-                        // ignore
-                    }
-                }
-                addError(msg,index);
-            }
-
-            // certificate valid?
-            try
-            {
-                cert.checkValidity(validDate);
-            }
-            catch (CertificateNotYetValidException cnve)
-            {
-                ErrorBundle msg = new ErrorBundle(RESOURCE_NAME,"CertPathReviewer.certificateNotYetValid",
-                        new Object[] {new TrustedInput(cert.getNotBefore())});
-                addError(msg,index);
-            }
-            catch (CertificateExpiredException cee)
-            {
-                ErrorBundle msg = new ErrorBundle(RESOURCE_NAME,"CertPathReviewer.certificateExpired",
-                        new Object[] {new TrustedInput(cert.getNotAfter())});
-                addError(msg,index);
-            }
-
-            // certificate revoked?
-            if (pkixParams.isRevocationEnabled())
-            {
-                // read crl distribution points extension
-                CRLDistPoint crlDistPoints = null;
-                try
-                {
-                    ASN1Primitive crl_dp = getExtensionValue(cert,CRL_DIST_POINTS);
-                    if (crl_dp != null)
-                    {
-                        crlDistPoints = CRLDistPoint.getInstance(crl_dp);
-                    }
-                }
-                catch (AnnotatedException ae)
-                {
-                    ErrorBundle msg = new ErrorBundle(RESOURCE_NAME,"CertPathReviewer.crlDistPtExtError");
-                    addError(msg,index);
-                }
-
-                // read authority information access extension
-                AuthorityInformationAccess authInfoAcc = null;
-                try
-                {
-                    ASN1Primitive auth_info_acc = getExtensionValue(cert,AUTH_INFO_ACCESS);
-                    if (auth_info_acc != null)
-                    {
-                        authInfoAcc = AuthorityInformationAccess.getInstance(auth_info_acc);
-                    }
-                }
-                catch (AnnotatedException ae)
-                {
-                    ErrorBundle msg = new ErrorBundle(RESOURCE_NAME,"CertPathReviewer.crlAuthInfoAccError");
-                    addError(msg,index);
-                }
-                
-                Vector crlDistPointUrls = getCRLDistUrls(crlDistPoints);
-                Vector ocspUrls = getOCSPUrls(authInfoAcc);
-                
-                // add notifications with the crl distribution points
-                
-                // output crl distribution points
-                Iterator urlIt = crlDistPointUrls.iterator();
-                while (urlIt.hasNext())
-                {
-                    ErrorBundle msg = new ErrorBundle(RESOURCE_NAME,"CertPathReviewer.crlDistPoint",
-                                new Object[] {new UntrustedUrlInput(urlIt.next())});
-                    addNotification(msg,index);
-                }
-                
-                // output ocsp urls
-                urlIt = ocspUrls.iterator();
-                while (urlIt.hasNext())
-                {
-                    ErrorBundle msg = new ErrorBundle(RESOURCE_NAME,"CertPathReviewer.ocspLocation",
-                            new Object[] {new UntrustedUrlInput(urlIt.next())});
-                    addNotification(msg,index);
-                }
-                
-                // TODO also support Netscapes revocation-url and/or OCSP instead of CRLs for revocation checking
-                // check CRLs
-                try 
-                {
-                    checkRevocation(pkixParams, cert, validDate, sign, workingPublicKey, crlDistPointUrls, ocspUrls, index);
-                }
-                catch (CertPathReviewerException cpre)
-                {
-                    addError(cpre.getErrorMessage(),index);
-                }
-            }
-
-            // certificate issuer correct
-            if (workingIssuerName != null && !cert.getIssuerX500Principal().equals(workingIssuerName))
-            {
-                ErrorBundle msg = new ErrorBundle(RESOURCE_NAME,"CertPathReviewer.certWrongIssuer",
-                            new Object[] {workingIssuerName.getName(),
-                            cert.getIssuerX500Principal().getName()});
-                addError(msg,index);
-            }
-
-            //
-            // prepare for next certificate
-            //
-            if (i != n)
-            {
-
-                if (cert != null && cert.getVersion() == 1)
-                {
-                    ErrorBundle msg = new ErrorBundle(RESOURCE_NAME,"CertPathReviewer.noCACert");
-                    addError(msg,index);
-                }
-
-                // k)
-
-                BasicConstraints bc;
-                try
-                {
-                    bc = BasicConstraints.getInstance(getExtensionValue(cert,
-                            BASIC_CONSTRAINTS));
-                    if (bc != null)
-                    {
-                        if (!bc.isCA())
-                        {
-                            ErrorBundle msg = new ErrorBundle(RESOURCE_NAME,"CertPathReviewer.noCACert");
-                            addError(msg,index);
-                        }
-                    }
-                    else
-                    {
-                        ErrorBundle msg = new ErrorBundle(RESOURCE_NAME,"CertPathReviewer.noBasicConstraints");
-                        addError(msg,index);
-                    }
-                }
-                catch (AnnotatedException ae)
-                {
-                    ErrorBundle msg = new ErrorBundle(RESOURCE_NAME,"CertPathReviewer.errorProcesingBC");
-                    addError(msg,index);
-                }
-
-                // n)
-
-                boolean[] _usage = cert.getKeyUsage();
-
-                if ((_usage != null) && !_usage[KEY_CERT_SIGN])
-                {
-                    ErrorBundle msg = new ErrorBundle(RESOURCE_NAME,"CertPathReviewer.noCertSign");
-                    addError(msg,index);
-                }
-
-            } // if
-
-            // set signing certificate for next round
-            sign = cert;
-            
-            // c)
-
-            workingIssuerName = cert.getSubjectX500Principal();
-
-            // d) e) f)
-
-            try
-            {
-                workingPublicKey = getNextWorkingKey(certs, index);
-                workingAlgId = getAlgorithmIdentifier(workingPublicKey);
-                workingPublicKeyAlgorithm = workingAlgId.getObjectId();
-                workingPublicKeyParameters = workingAlgId.getParameters();
-            }
-            catch (CertPathValidatorException ex)
-            {
-                ErrorBundle msg = new ErrorBundle(RESOURCE_NAME,"CertPathReviewer.pubKeyError");
-                addError(msg,index);
-                workingAlgId = null;
-                workingPublicKeyAlgorithm = null;
-                workingPublicKeyParameters = null;
-            }
-
-        } // for
-
-        trustAnchor = trust;
-        subjectPublicKey = workingPublicKey;
-    }
-
-    private void checkPolicy()
-    {
-        //
-        // 6.1.1 Inputs
-        //
-
-        // c) Initial Policy Set
-
-        Set userInitialPolicySet = pkixParams.getInitialPolicies();
-
-        // e) f) g) are part of pkixParams
-
-        //
-        // 6.1.2 Initialization
-        //
-
-        // a) valid policy tree
-
-        List[] policyNodes = new ArrayList[n + 1];
-        for (int j = 0; j < policyNodes.length; j++)
-        {
-            policyNodes[j] = new ArrayList();
-        }
-
-        Set policySet = new HashSet();
-
-        policySet.add(ANY_POLICY);
-
-        PKIXPolicyNode validPolicyTree = new PKIXPolicyNode(new ArrayList(), 0,
-                policySet, null, new HashSet(), ANY_POLICY, false);
-
-        policyNodes[0].add(validPolicyTree);
-
-        // d) explicit policy
-
-        int explicitPolicy;
-        if (pkixParams.isExplicitPolicyRequired())
-        {
-            explicitPolicy = 0;
-        }
-        else
-        {
-            explicitPolicy = n + 1;
-        }
-
-        // e) inhibit any policy
-
-        int inhibitAnyPolicy;
-        if (pkixParams.isAnyPolicyInhibited())
-        {
-            inhibitAnyPolicy = 0;
-        }
-        else
-        {
-            inhibitAnyPolicy = n + 1;
-        }
-
-        // f) policy mapping
-
-        int policyMapping;
-        if (pkixParams.isPolicyMappingInhibited())
-        {
-            policyMapping = 0;
-        }
-        else
-        {
-            policyMapping = n + 1;
-        }
-
-        Set acceptablePolicies = null;
-
-        //
-        // 6.1.3 Basic Certificate processing
-        //
-
-        X509Certificate cert = null;
-        int index;
-        int i;
-
-        try 
-        {
-            for (index = certs.size() - 1; index >= 0; index--)
-            {
-                // i as defined in the algorithm description
-                i = n - index;
-    
-                // set certificate to be checked in this round
-                cert = (X509Certificate) certs.get(index);
-    
-                // d) process policy information
-    
-                ASN1Sequence certPolicies;
-                try 
-                {
-                    certPolicies = (ASN1Sequence) getExtensionValue(
-                        cert, CERTIFICATE_POLICIES);
-                }
-                catch (AnnotatedException ae)
-                {
-                    ErrorBundle msg = new ErrorBundle(RESOURCE_NAME,"CertPathReviewer.policyExtError");
-                    throw new CertPathReviewerException(msg,ae,certPath,index);
-                }
-                if (certPolicies != null && validPolicyTree != null)
-                {
-
-                    // d) 1)
-
-                    Enumeration e = certPolicies.getObjects();
-                    Set pols = new HashSet();
-
-                    while (e.hasMoreElements())
-                    {
-                        PolicyInformation pInfo = PolicyInformation.getInstance(e.nextElement());
-                        ASN1ObjectIdentifier pOid = pInfo.getPolicyIdentifier();
-
-                        pols.add(pOid.getId());
-
-                        if (!ANY_POLICY.equals(pOid.getId()))
-                        {
-                            Set pq;
-                            try
-                            {
-                                pq = getQualifierSet(pInfo.getPolicyQualifiers());
-                            }
-                            catch (CertPathValidatorException cpve)
-                            {
-                                ErrorBundle msg = new ErrorBundle(RESOURCE_NAME,"CertPathReviewer.policyQualifierError");
-                                throw new CertPathReviewerException(msg,cpve,certPath,index);
-                            }
-
-                            boolean match = processCertD1i(i, policyNodes, pOid, pq);
-
-                            if (!match)
-                            {
-                                processCertD1ii(i, policyNodes, pOid, pq);
-                            }
-                        }
-                    }
-
-                    if (acceptablePolicies == null || acceptablePolicies.contains(ANY_POLICY))
-                    {
-                        acceptablePolicies = pols;
-                    }
-                    else
-                    {
-                        Iterator it = acceptablePolicies.iterator();
-                        Set t1 = new HashSet();
-
-                        while (it.hasNext())
-                        {
-                            Object o = it.next();
-
-                            if (pols.contains(o))
-                            {
-                                t1.add(o);
-                            }
-                        }
-
-                        acceptablePolicies = t1;
-                    }
-
-                    // d) 2)
-
-                    if ((inhibitAnyPolicy > 0) || ((i < n) && isSelfIssued(cert)))
-                    {
-                        e = certPolicies.getObjects();
-
-                        while (e.hasMoreElements())
-                        {
-                            PolicyInformation pInfo = PolicyInformation.getInstance(e.nextElement());
-
-                            if (ANY_POLICY.equals(pInfo.getPolicyIdentifier().getId()))
-                            {
-                                Set _apq;
-                                try
-                                {
-                                    _apq = getQualifierSet(pInfo.getPolicyQualifiers());
-                                }
-                                catch (CertPathValidatorException cpve)
-                                {
-                                    ErrorBundle msg = new ErrorBundle(RESOURCE_NAME,"CertPathReviewer.policyQualifierError");
-                                    throw new CertPathReviewerException(msg,cpve,certPath,index);
-                                }
-                                List _nodes = policyNodes[i - 1];
-
-                                for (int k = 0; k < _nodes.size(); k++)
-                                {
-                                    PKIXPolicyNode _node = (PKIXPolicyNode) _nodes.get(k);
-
-                                    Iterator _policySetIter = _node.getExpectedPolicies().iterator();
-                                    while (_policySetIter.hasNext())
-                                    {
-                                        Object _tmp = _policySetIter.next();
-
-                                        String _policy;
-                                        if (_tmp instanceof String)
-                                        {
-                                            _policy = (String) _tmp;
-                                        }
-                                        else if (_tmp instanceof ASN1ObjectIdentifier)
-                                        {
-                                            _policy = ((ASN1ObjectIdentifier) _tmp).getId();
-                                        }
-                                        else
-                                        {
-                                            continue;
-                                        }
-
-                                        boolean _found = false;
-                                        Iterator _childrenIter = _node
-                                                .getChildren();
-
-                                        while (_childrenIter.hasNext())
-                                        {
-                                            PKIXPolicyNode _child = (PKIXPolicyNode) _childrenIter.next();
-
-                                            if (_policy.equals(_child.getValidPolicy()))
-                                            {
-                                                _found = true;
-                                            }
-                                        }
-
-                                        if (!_found)
-                                        {
-                                            Set _newChildExpectedPolicies = new HashSet();
-                                            _newChildExpectedPolicies.add(_policy);
-
-                                            PKIXPolicyNode _newChild = new PKIXPolicyNode(
-                                                    new ArrayList(), i,
-                                                    _newChildExpectedPolicies,
-                                                    _node, _apq, _policy, false);
-                                            _node.addChild(_newChild);
-                                            policyNodes[i].add(_newChild);
-                                        }
-                                    }
-                                }
-                                break;
-                            }
-                        }
-                    }
-
-                    //
-                    // (d) (3)
-                    //
-                    for (int j = (i - 1); j >= 0; j--)
-                    {
-                        List nodes = policyNodes[j];
-
-                        for (int k = 0; k < nodes.size(); k++)
-                        {
-                            PKIXPolicyNode node = (PKIXPolicyNode) nodes.get(k);
-                            if (!node.hasChildren())
-                            {
-                                validPolicyTree = removePolicyNode(
-                                        validPolicyTree, policyNodes, node);
-                                if (validPolicyTree == null)
-                                {
-                                    break;
-                                }
-                            }
-                        }
-                    }
-
-                    //
-                    // d (4)
-                    //
-                    Set criticalExtensionOids = cert.getCriticalExtensionOIDs();
-
-                    if (criticalExtensionOids != null)
-                    {
-                        boolean critical = criticalExtensionOids.contains(CERTIFICATE_POLICIES);
-
-                        List nodes = policyNodes[i];
-                        for (int j = 0; j < nodes.size(); j++)
-                        {
-                            PKIXPolicyNode node = (PKIXPolicyNode) nodes.get(j);
-                            node.setCritical(critical);
-                        }
-                    }
-
-                }
-                
-                // e)
-                
-                if (certPolicies == null) 
-                {
-                    validPolicyTree = null;
-                }
-                
-                // f)
-                
-                if (explicitPolicy <= 0 && validPolicyTree == null)
-                {
-                    ErrorBundle msg = new ErrorBundle(RESOURCE_NAME,"CertPathReviewer.noValidPolicyTree");
-                    throw new CertPathReviewerException(msg);
-                }
-    
-                //
-                // 6.1.4 preparation for next Certificate
-                //
-    
-                if (i != n)
-                {
-                    
-                    // a)
-                    
-                    ASN1Primitive pm;
-                    try
-                    {
-                        pm = getExtensionValue(cert, POLICY_MAPPINGS);
-                    }
-                    catch (AnnotatedException ae)
-                    {
-                        ErrorBundle msg = new ErrorBundle(RESOURCE_NAME,"CertPathReviewer.policyMapExtError");
-                        throw new CertPathReviewerException(msg,ae,certPath,index);
-                    }
-                    
-                    if (pm != null) 
-                    {
-                        ASN1Sequence mappings = (ASN1Sequence) pm;
-                        for (int j = 0; j < mappings.size(); j++) 
-                        {
-                            ASN1Sequence mapping = (ASN1Sequence) mappings.getObjectAt(j);
-                            ASN1ObjectIdentifier ip_id = (ASN1ObjectIdentifier) mapping.getObjectAt(0);
-                            ASN1ObjectIdentifier sp_id = (ASN1ObjectIdentifier) mapping.getObjectAt(1);
-                            if (ANY_POLICY.equals(ip_id.getId())) 
-                            {
-                                ErrorBundle msg = new ErrorBundle(RESOURCE_NAME,"CertPathReviewer.invalidPolicyMapping");
-                                throw new CertPathReviewerException(msg,certPath,index);
-                            }
-                            if (ANY_POLICY.equals(sp_id.getId()))
-                            {
-                                ErrorBundle msg = new ErrorBundle(RESOURCE_NAME,"CertPathReviewer.invalidPolicyMapping");
-                                throw new CertPathReviewerException(msg,certPath,index);
-                            }
-                        }
-                    }
-                    
-                    // b)
-                    
-                    if (pm != null)
-                    {
-                        ASN1Sequence mappings = (ASN1Sequence)pm;
-                        Map m_idp = new HashMap();
-                        Set s_idp = new HashSet();
-                        
-                        for (int j = 0; j < mappings.size(); j++)
-                        {
-                            ASN1Sequence mapping = (ASN1Sequence)mappings.getObjectAt(j);
-                            String id_p = ((ASN1ObjectIdentifier)mapping.getObjectAt(0)).getId();
-                            String sd_p = ((ASN1ObjectIdentifier)mapping.getObjectAt(1)).getId();
-                            Set tmp;
-                            
-                            if (!m_idp.containsKey(id_p))
-                            {
-                                tmp = new HashSet();
-                                tmp.add(sd_p);
-                                m_idp.put(id_p, tmp);
-                                s_idp.add(id_p);
-                            }
-                            else
-                            {
-                                tmp = (Set)m_idp.get(id_p);
-                                tmp.add(sd_p);
-                            }
-                        }
-    
-                        Iterator it_idp = s_idp.iterator();
-                        while (it_idp.hasNext())
-                        {
-                            String id_p = (String)it_idp.next();
-                            
-                            //
-                            // (1)
-                            //
-                            if (policyMapping > 0)
-                            {
-                                try
-                                {
-                                    prepareNextCertB1(i,policyNodes,id_p,m_idp,cert);
-                                }
-                                catch (AnnotatedException ae)
-                                {
-                                    // error processing certificate policies extension
-                                    ErrorBundle msg = new ErrorBundle(RESOURCE_NAME,"CertPathReviewer.policyExtError");
-                                    throw new CertPathReviewerException(msg,ae,certPath,index);
-                                }
-                                catch (CertPathValidatorException cpve)
-                                {
-                                    // error building qualifier set
-                                    ErrorBundle msg = new ErrorBundle(RESOURCE_NAME,"CertPathReviewer.policyQualifierError");
-                                    throw new CertPathReviewerException(msg,cpve,certPath,index);
-                                }
-                                
-                                //
-                                // (2)
-                                // 
-                            }
-                            else if (policyMapping <= 0)
-                            {
-                                validPolicyTree = prepareNextCertB2(i,policyNodes,id_p,validPolicyTree);
-                            }
-                            
-                        }
-                    }
-                    
-                    //
-                    // h)
-                    //
-                    
-                    if (!isSelfIssued(cert)) 
-                    {
-                        
-                        // (1)
-                        if (explicitPolicy != 0)
-                        {
-                            explicitPolicy--;
-                        }
-                        
-                        // (2)
-                        if (policyMapping != 0)
-                        {
-                            policyMapping--;
-                        }
-                        
-                        // (3)
-                        if (inhibitAnyPolicy != 0)
-                        {
-                            inhibitAnyPolicy--;
-                        }
-                        
-                    }
-    
-                    //
-                    // i)
-                    //
-                    
-                    try
-                    {
-                        ASN1Sequence pc = (ASN1Sequence) getExtensionValue(cert,POLICY_CONSTRAINTS);
-                        if (pc != null)
-                        {
-                            Enumeration policyConstraints = pc.getObjects();
-                            
-                            while (policyConstraints.hasMoreElements())
-                            {
-                                ASN1TaggedObject constraint = (ASN1TaggedObject) policyConstraints.nextElement();
-                                int tmpInt; 
-                                
-                                switch (constraint.getTagNo())
-                                {
-                                case 0:
-                                    tmpInt = ASN1Integer.getInstance(constraint, false).getValue().intValue();
-                                    if (tmpInt < explicitPolicy)
-                                    {
-                                        explicitPolicy = tmpInt;
-                                    }
-                                    break;
-                                case 1:
-                                    tmpInt = ASN1Integer.getInstance(constraint, false).getValue().intValue();
-                                    if (tmpInt < policyMapping)
-                                    {
-                                        policyMapping = tmpInt;
-                                    }
-                                break;
-                                }
-                            }
-                        }
-                    }
-                    catch (AnnotatedException ae)
-                    {
-                        ErrorBundle msg = new ErrorBundle(RESOURCE_NAME,"CertPathReviewer.policyConstExtError");
-                        throw new CertPathReviewerException(msg,certPath,index);
-                    }
-    
-                    //
-                    // j)
-                    //
-                    
-                    try 
-                    {
-                        ASN1Integer iap = (ASN1Integer)getExtensionValue(cert, INHIBIT_ANY_POLICY);
-                        
-                        if (iap != null)
-                        {
-                            int _inhibitAnyPolicy = iap.getValue().intValue();
-                        
-                            if (_inhibitAnyPolicy < inhibitAnyPolicy)
-                            {
-                                inhibitAnyPolicy = _inhibitAnyPolicy;
-                            }
-                        }
-                    }
-                    catch (AnnotatedException ae)
-                    {
-                        ErrorBundle msg = new ErrorBundle(RESOURCE_NAME,"CertPathReviewer.policyInhibitExtError");
-                        throw new CertPathReviewerException(msg,certPath,index);
-                    }
-                }
-    
-            }
-    
-            //
-            // 6.1.5 Wrap up
-            //
-    
-            //
-            // a)
-            //
-            
-            if (!isSelfIssued(cert) && explicitPolicy > 0) 
-            {
-                explicitPolicy--;
-            }
-    
-            //
-            // b)
-            //
-            
-            try
-            {
-                ASN1Sequence pc = (ASN1Sequence) getExtensionValue(cert, POLICY_CONSTRAINTS);
-                if (pc != null)
-                {
-                    Enumeration policyConstraints = pc.getObjects();
-        
-                    while (policyConstraints.hasMoreElements())
-                    {
-                        ASN1TaggedObject    constraint = (ASN1TaggedObject)policyConstraints.nextElement();
-                        switch (constraint.getTagNo())
-                        {
-                        case 0:
-                            int tmpInt = ASN1Integer.getInstance(constraint, false).getValue().intValue();
-                            if (tmpInt == 0)
-                            {
-                                explicitPolicy = 0;
-                            }
-                            break;
-                        }
-                    }
-                }
-            }
-            catch (AnnotatedException e)
-            {
-                ErrorBundle msg = new ErrorBundle(RESOURCE_NAME,"CertPathReviewer.policyConstExtError");
-                throw new CertPathReviewerException(msg,certPath,index);
-            }
-            
-            
-            //
-            // (g)
-            //
-            PKIXPolicyNode intersection;
-            
-    
-            //
-            // (g) (i)
-            //
-            if (validPolicyTree == null)
-            { 
-                if (pkixParams.isExplicitPolicyRequired())
-                {
-                    ErrorBundle msg = new ErrorBundle(RESOURCE_NAME,"CertPathReviewer.explicitPolicy");
-                    throw new CertPathReviewerException(msg,certPath,index);
-                }
-                intersection = null;
-            }
-            else if (isAnyPolicy(userInitialPolicySet)) // (g) (ii)
-            {
-                if (pkixParams.isExplicitPolicyRequired())
-                {
-                    if (acceptablePolicies.isEmpty())
-                    {
-                        ErrorBundle msg = new ErrorBundle(RESOURCE_NAME,"CertPathReviewer.explicitPolicy");
-                        throw new CertPathReviewerException(msg,certPath,index);
-                    }
-                    else
-                    {
-                        Set _validPolicyNodeSet = new HashSet();
-                        
-                        for (int j = 0; j < policyNodes.length; j++)
-                        {
-                            List      _nodeDepth = policyNodes[j];
-                            
-                            for (int k = 0; k < _nodeDepth.size(); k++)
-                            {
-                                PKIXPolicyNode _node = (PKIXPolicyNode)_nodeDepth.get(k);
-                                
-                                if (ANY_POLICY.equals(_node.getValidPolicy()))
-                                {
-                                    Iterator _iter = _node.getChildren();
-                                    while (_iter.hasNext())
-                                    {
-                                        _validPolicyNodeSet.add(_iter.next());
-                                    }
-                                }
-                            }
-                        }
-                        
-                        Iterator _vpnsIter = _validPolicyNodeSet.iterator();
-                        while (_vpnsIter.hasNext())
-                        {
-                            PKIXPolicyNode _node = (PKIXPolicyNode)_vpnsIter.next();
-                            String _validPolicy = _node.getValidPolicy();
-                            
-                            if (!acceptablePolicies.contains(_validPolicy))
-                            {
-                                //validPolicyTree = removePolicyNode(validPolicyTree, policyNodes, _node);
-                            }
-                        }
-                        if (validPolicyTree != null)
-                        {
-                            for (int j = (n - 1); j >= 0; j--)
-                            {
-                                List      nodes = policyNodes[j];
-                                
-                                for (int k = 0; k < nodes.size(); k++)
-                                {
-                                    PKIXPolicyNode node = (PKIXPolicyNode)nodes.get(k);
-                                    if (!node.hasChildren())
-                                    {
-                                        validPolicyTree = removePolicyNode(validPolicyTree, policyNodes, node);
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-    
-                intersection = validPolicyTree;
-            }
-            else
-            {
-                //
-                // (g) (iii)
-                //
-                // This implementation is not exactly same as the one described in RFC3280.
-                // However, as far as the validation result is concerned, both produce 
-                // adequate result. The only difference is whether AnyPolicy is remain 
-                // in the policy tree or not. 
-                //
-                // (g) (iii) 1
-                //
-                Set _validPolicyNodeSet = new HashSet();
-                
-                for (int j = 0; j < policyNodes.length; j++)
-                {
-                    List      _nodeDepth = policyNodes[j];
-                    
-                    for (int k = 0; k < _nodeDepth.size(); k++)
-                    {
-                        PKIXPolicyNode _node = (PKIXPolicyNode)_nodeDepth.get(k);
-                        
-                        if (ANY_POLICY.equals(_node.getValidPolicy()))
-                        {
-                            Iterator _iter = _node.getChildren();
-                            while (_iter.hasNext())
-                            {
-                                PKIXPolicyNode _c_node = (PKIXPolicyNode)_iter.next();
-                                if (!ANY_POLICY.equals(_c_node.getValidPolicy()))
-                                {
-                                    _validPolicyNodeSet.add(_c_node);
-                                }
-                            }
-                        }
-                    }
-                }
-                
-                //
-                // (g) (iii) 2
-                //
-                Iterator _vpnsIter = _validPolicyNodeSet.iterator();
-                while (_vpnsIter.hasNext())
-                {
-                    PKIXPolicyNode _node = (PKIXPolicyNode)_vpnsIter.next();
-                    String _validPolicy = _node.getValidPolicy();
-    
-                    if (!userInitialPolicySet.contains(_validPolicy))
-                    {
-                        validPolicyTree = removePolicyNode(validPolicyTree, policyNodes, _node);
-                    }
-                }
-                
-                //
-                // (g) (iii) 4
-                //
-                if (validPolicyTree != null)
-                {
-                    for (int j = (n - 1); j >= 0; j--)
-                    {
-                        List      nodes = policyNodes[j];
-                        
-                        for (int k = 0; k < nodes.size(); k++)
-                        {
-                            PKIXPolicyNode node = (PKIXPolicyNode)nodes.get(k);
-                            if (!node.hasChildren())
-                            {
-                                validPolicyTree = removePolicyNode(validPolicyTree, policyNodes, node);
-                            }
-                        }
-                    }
-                }
-                
-                intersection = validPolicyTree;
-            }
-     
-            if ((explicitPolicy <= 0) && (intersection == null))
-            {
-                ErrorBundle msg = new ErrorBundle(RESOURCE_NAME,"CertPathReviewer.invalidPolicy");
-                throw new CertPathReviewerException(msg);
-            }
-            
-            validPolicyTree = intersection;
-        }
-        catch (CertPathReviewerException cpre)
-        {
-            addError(cpre.getErrorMessage(),cpre.getIndex());
-            validPolicyTree = null;
-        }
-    }
-
-    private void checkCriticalExtensions()
-    {
-        //      
-        // initialise CertPathChecker's
-        //
-        List  pathCheckers = pkixParams.getCertPathCheckers();
-        Iterator certIter = pathCheckers.iterator();
-        
-        try
-        {
-            try
-            {
-                while (certIter.hasNext())
-                {
-                    ((PKIXCertPathChecker)certIter.next()).init(false);
-                }
-            }
-            catch (CertPathValidatorException cpve)
-            {
-                ErrorBundle msg = new ErrorBundle(RESOURCE_NAME,"CertPathReviewer.certPathCheckerError",
-                        new Object[] {cpve.getMessage(),cpve,cpve.getClass().getName()});
-                throw new CertPathReviewerException(msg,cpve);
-            }
-            
-            //
-            // process critical extesions for each certificate
-            //
-            
-            X509Certificate cert = null;
-            
-            int index;
-            
-            for (index = certs.size()-1; index >= 0; index--)
-            {
-                cert = (X509Certificate) certs.get(index);
-                
-                Set criticalExtensions = cert.getCriticalExtensionOIDs();
-                if (criticalExtensions == null || criticalExtensions.isEmpty())
-                {
-                    continue;
-                }
-                // remove already processed extensions
-                criticalExtensions.remove(KEY_USAGE);
-                criticalExtensions.remove(CERTIFICATE_POLICIES);
-                criticalExtensions.remove(POLICY_MAPPINGS);
-                criticalExtensions.remove(INHIBIT_ANY_POLICY);
-                criticalExtensions.remove(ISSUING_DISTRIBUTION_POINT);
-                criticalExtensions.remove(DELTA_CRL_INDICATOR);
-                criticalExtensions.remove(POLICY_CONSTRAINTS);
-                criticalExtensions.remove(BASIC_CONSTRAINTS);
-                criticalExtensions.remove(SUBJECT_ALTERNATIVE_NAME);
-                criticalExtensions.remove(NAME_CONSTRAINTS);
-                
-                // process qcStatements extension
-                if (criticalExtensions.contains(QC_STATEMENT))
-                {
-                    if (processQcStatements(cert,index)) 
-                    {
-                        criticalExtensions.remove(QC_STATEMENT);
-                    }
-                }
-                
-                Iterator tmpIter = pathCheckers.iterator();
-                while (tmpIter.hasNext())
-                {
-                    try
-                    {
-                        ((PKIXCertPathChecker)tmpIter.next()).check(cert, criticalExtensions);
-                    }
-                    catch (CertPathValidatorException e)
-                    {
-                        ErrorBundle msg = new ErrorBundle(RESOURCE_NAME,"CertPathReviewer.criticalExtensionError",
-                                new Object[] {e.getMessage(),e,e.getClass().getName()});
-                        throw new CertPathReviewerException(msg,e.getCause(),certPath,index);
-                    }
-                }
-                if (!criticalExtensions.isEmpty())
-                {
-                    ErrorBundle msg;
-                    Iterator it = criticalExtensions.iterator();
-                    while (it.hasNext())
-                    {
-                        msg = new ErrorBundle(RESOURCE_NAME,"CertPathReviewer.unknownCriticalExt",
-                                new Object[] {new ASN1ObjectIdentifier((String) it.next())});
-                        addError(msg, index);
-                    }
-                }
-            }
-        }
-        catch (CertPathReviewerException cpre)
-        {
-            addError(cpre.getErrorMessage(),cpre.getIndex());
-        }
-    }
-    
-    private boolean processQcStatements(
-            X509Certificate cert,
-            int index)
-    {   
-        try
-        {
-            boolean unknownStatement = false;
-            
-            ASN1Sequence qcSt = (ASN1Sequence) getExtensionValue(cert,QC_STATEMENT);
-            for (int j = 0; j < qcSt.size(); j++)
-            {
-                QCStatement stmt = QCStatement.getInstance(qcSt.getObjectAt(j));
-                if (QCStatement.id_etsi_qcs_QcCompliance.equals(stmt.getStatementId()))
-                {
-                    // process statement - just write a notification that the certificate contains this statement
-                    ErrorBundle msg = new ErrorBundle(RESOURCE_NAME,"CertPathReviewer.QcEuCompliance");
-                    addNotification(msg,index);
-                }
-                else if (QCStatement.id_qcs_pkixQCSyntax_v1.equals(stmt.getStatementId()))
-                {
-                    // process statement - just recognize the statement
-                }
-                else if (QCStatement.id_etsi_qcs_QcSSCD.equals(stmt.getStatementId()))
-                {
-                    // process statement - just write a notification that the certificate contains this statement
-                    ErrorBundle msg = new ErrorBundle(RESOURCE_NAME,"CertPathReviewer.QcSSCD");
-                    addNotification(msg,index);
-                }
-                else if (QCStatement.id_etsi_qcs_LimiteValue.equals(stmt.getStatementId()))
-                {
-                    // process statement - write a notification containing the limit value
-                    MonetaryValue limit = MonetaryValue.getInstance(stmt.getStatementInfo());
-                    Iso4217CurrencyCode currency = limit.getCurrency();
-                    double value = limit.getAmount().doubleValue() * Math.pow(10,limit.getExponent().doubleValue());
-                    ErrorBundle msg;
-                    if (limit.getCurrency().isAlphabetic())
-                    {
-                        msg = new ErrorBundle(RESOURCE_NAME,"CertPathReviewer.QcLimitValueAlpha",
-                                new Object[] {limit.getCurrency().getAlphabetic(),
-                                              new TrustedInput(new Double(value)),
-                                              limit});
-                    }
-                    else
-                    {
-                        msg = new ErrorBundle(RESOURCE_NAME,"CertPathReviewer.QcLimitValueNum",
-                                new Object[]{Integers.valueOf(limit.getCurrency().getNumeric()),
-                                    new TrustedInput(new Double(value)),
-                                    limit});
-                    }
-                    addNotification(msg,index);
-                }
-                else
-                {
-                    ErrorBundle msg = new ErrorBundle(RESOURCE_NAME,"CertPathReviewer.QcUnknownStatement",
-                            new Object[] {stmt.getStatementId(),new UntrustedInput(stmt)});
-                    addNotification(msg,index);
-                    unknownStatement = true;
-                }
-            }
-            
-            return !unknownStatement;
-        }
-        catch (AnnotatedException ae)
-        {
-            ErrorBundle msg = new ErrorBundle(RESOURCE_NAME,"CertPathReviewer.QcStatementExtError");
-            addError(msg,index);
-        }
-        
-        return false;
-    }
-    
-    private String IPtoString(byte[] ip)
-    {
-        String result;
-        try
-        {
-            result = InetAddress.getByAddress(ip).getHostAddress();
-        }
-        catch (Exception e)
-        {
-            StringBuffer b = new StringBuffer();
-            
-            for (int i = 0; i != ip.length; i++)
-            {
-                b.append(Integer.toHexString(ip[i] & 0xff));
-                b.append(' ');
-            }
-            
-            result = b.toString();
-        }
-        
-        return result;
-    }
-    
-    protected void checkRevocation(PKIXParameters paramsPKIX,
-            X509Certificate cert,
-            Date validDate,
-            X509Certificate sign,
-            PublicKey workingPublicKey,
-            Vector crlDistPointUrls,
-            Vector ocspUrls,
-            int index)
-        throws CertPathReviewerException
-    {
-        checkCRLs(paramsPKIX, cert, validDate, sign, workingPublicKey, crlDistPointUrls, index);
-    }
-    
-    protected void checkCRLs(
-            PKIXParameters paramsPKIX,
-            X509Certificate cert,
-            Date validDate,
-            X509Certificate sign,
-            PublicKey workingPublicKey,
-            Vector crlDistPointUrls,
-            int index) 
-        throws CertPathReviewerException
-    {
-        X509CRLStoreSelector crlselect;
-        crlselect = new X509CRLStoreSelector();
-        
-        try
-        {
-            crlselect.addIssuerName(getEncodedIssuerPrincipal(cert).getEncoded());
-        }
-        catch (IOException e)
-        {
-            ErrorBundle msg = new ErrorBundle(RESOURCE_NAME,"CertPathReviewer.crlIssuerException");
-            throw new CertPathReviewerException(msg,e);
-        }
-    
-        crlselect.setCertificateChecking(cert);
-    
-        Iterator crl_iter;
-        try 
-        {
-            Collection crl_coll = CRL_UTIL.findCRLs(crlselect, paramsPKIX);
-            crl_iter = crl_coll.iterator();
-            
-            if (crl_coll.isEmpty())
-            {
-                // notifcation - no local crls found
-                crl_coll = CRL_UTIL.findCRLs(new X509CRLStoreSelector(),paramsPKIX);
-                Iterator it = crl_coll.iterator();
-                List nonMatchingCrlNames = new ArrayList();
-                while (it.hasNext())
-                {
-                    nonMatchingCrlNames.add(((X509CRL) it.next()).getIssuerX500Principal());
-                }
-                int numbOfCrls = nonMatchingCrlNames.size();
-                ErrorBundle msg = new ErrorBundle(RESOURCE_NAME,
-                        "CertPathReviewer.noCrlInCertstore",
-                        new Object[]{new UntrustedInput(crlselect.getIssuerNames()),
-                            new UntrustedInput(nonMatchingCrlNames),
-                            Integers.valueOf(numbOfCrls)});
-                addNotification(msg,index);
-            }
-
-        }
-        catch (AnnotatedException ae)
-        {
-            ErrorBundle msg = new ErrorBundle(RESOURCE_NAME,"CertPathReviewer.crlExtractionError",
-                    new Object[] {ae.getCause().getMessage(),ae.getCause(),ae.getCause().getClass().getName()});
-            addError(msg,index);
-            crl_iter = new ArrayList().iterator();
-        }
-        boolean validCrlFound = false;
-        X509CRL crl = null;
-        while (crl_iter.hasNext())
-        {
-            crl = (X509CRL)crl_iter.next();
-            
-            if (crl.getNextUpdate() == null
-                || paramsPKIX.getDate().before(crl.getNextUpdate()))
-            {
-                validCrlFound = true;
-                ErrorBundle msg = new ErrorBundle(RESOURCE_NAME,
-                        "CertPathReviewer.localValidCRL",
-                        new Object[] {new TrustedInput(crl.getThisUpdate()), new TrustedInput(crl.getNextUpdate())});
-                addNotification(msg,index);
-                break;
-            }
-            else
-            {
-                ErrorBundle msg = new ErrorBundle(RESOURCE_NAME,
-                        "CertPathReviewer.localInvalidCRL",
-                        new Object[] {new TrustedInput(crl.getThisUpdate()), new TrustedInput(crl.getNextUpdate())});
-                addNotification(msg,index);
-            }
-        }
-        
-        // if no valid crl was found in the CertStores try to get one from a
-        // crl distribution point
-        if (!validCrlFound)
-        {
-            X509CRL onlineCRL = null;
-            Iterator urlIt = crlDistPointUrls.iterator();
-            while (urlIt.hasNext())
-            {
-                try
-                {
-                    String location = (String) urlIt.next();
-                    onlineCRL = getCRL(location);
-                    if (onlineCRL != null)
-                    {
-                        // check if crl issuer is correct
-                        if (!cert.getIssuerX500Principal().equals(onlineCRL.getIssuerX500Principal()))
-                        {
-                            ErrorBundle msg = new ErrorBundle(RESOURCE_NAME,
-                                        "CertPathReviewer.onlineCRLWrongCA",
-                                        new Object[] {new UntrustedInput(onlineCRL.getIssuerX500Principal().getName()),
-                                                      new UntrustedInput(cert.getIssuerX500Principal().getName()),
-                                                      new UntrustedUrlInput(location)});
-                            addNotification(msg,index);
-                            continue;
-                        }
-                        
-                        if (onlineCRL.getNextUpdate() == null
-                            || pkixParams.getDate().before(onlineCRL.getNextUpdate()))
-                        {
-                            validCrlFound = true;
-                            ErrorBundle msg = new ErrorBundle(RESOURCE_NAME,
-                                    "CertPathReviewer.onlineValidCRL",
-                                    new Object[] {new TrustedInput(onlineCRL.getThisUpdate()),
-                                                  new TrustedInput(onlineCRL.getNextUpdate()),
-                                                  new UntrustedUrlInput(location)});
-                            addNotification(msg,index);
-                            crl = onlineCRL;
-                            break;
-                        }
-                        else
-                        {
-                            ErrorBundle msg = new ErrorBundle(RESOURCE_NAME,
-                                    "CertPathReviewer.onlineInvalidCRL",
-                                    new Object[] {new TrustedInput(onlineCRL.getThisUpdate()),
-                                                  new TrustedInput(onlineCRL.getNextUpdate()),
-                                                  new UntrustedUrlInput(location)});
-                            addNotification(msg,index);
-                        }
-                    }
-                }
-                catch (CertPathReviewerException cpre)
-                {
-                    addNotification(cpre.getErrorMessage(),index);
-                }
-            }
-        }
-        
-        // check the crl
-        X509CRLEntry crl_entry;
-        if (crl != null)
-        {
-            if (sign != null)
-            {
-                boolean[] keyusage = sign.getKeyUsage();
-
-                if (keyusage != null
-                    && (keyusage.length < 7 || !keyusage[CRL_SIGN]))
-                {
-                    ErrorBundle msg = new ErrorBundle(RESOURCE_NAME,"CertPathReviewer.noCrlSigningPermited");
-                    throw new CertPathReviewerException(msg);
-                }
-            }
-
-            if (workingPublicKey != null)
-            {
-                try
-                {
-                    crl.verify(workingPublicKey, "BC");
-                }
-                catch (Exception e)
-                {
-                    ErrorBundle msg = new ErrorBundle(RESOURCE_NAME,"CertPathReviewer.crlVerifyFailed");
-                    throw new CertPathReviewerException(msg,e);
-                }
-            }
-            else // issuer public key not known
-            {
-                ErrorBundle msg = new ErrorBundle(RESOURCE_NAME,"CertPathReviewer.crlNoIssuerPublicKey");
-                throw new CertPathReviewerException(msg);
-            }
-
-            crl_entry = crl.getRevokedCertificate(cert.getSerialNumber());
-            if (crl_entry != null)
-            {
-                String reason = null;
-                
-                if (crl_entry.hasExtensions())
-                {
-                    ASN1Enumerated reasonCode;
-                    try
-                    {
-                        reasonCode = ASN1Enumerated.getInstance(getExtensionValue(crl_entry, X509Extensions.ReasonCode.getId()));
-                    }
-                    catch (AnnotatedException ae)
-                    {
-                        ErrorBundle msg = new ErrorBundle(RESOURCE_NAME,"CertPathReviewer.crlReasonExtError");
-                        throw new CertPathReviewerException(msg,ae);
-                    }
-                    if (reasonCode != null)
-                    {
-                        reason = crlReasons[reasonCode.getValue().intValue()];
-                    }
-                }
-
-                if (reason == null)
-                {
-                    reason = crlReasons[7]; // unknown
-                }
-
-                // i18n reason
-                LocaleString ls = new LocaleString(RESOURCE_NAME, reason);
-                
-                if (!validDate.before(crl_entry.getRevocationDate()))
-                {
-                    ErrorBundle msg = new ErrorBundle(RESOURCE_NAME,"CertPathReviewer.certRevoked",
-                            new Object[] {new TrustedInput(crl_entry.getRevocationDate()),ls});
-                    throw new CertPathReviewerException(msg);
-                }
-                else // cert was revoked after validation date
-                {
-                    ErrorBundle msg = new ErrorBundle(RESOURCE_NAME,"CertPathReviewer.revokedAfterValidation",
-                            new Object[] {new TrustedInput(crl_entry.getRevocationDate()),ls});
-                    addNotification(msg,index);
-                }
-            }
-            else // cert is not revoked
-            {
-                ErrorBundle msg = new ErrorBundle(RESOURCE_NAME,"CertPathReviewer.notRevoked");
-                addNotification(msg,index);
-            }
-            
-            //
-            // warn if a new crl is available
-            //
-            if (crl.getNextUpdate() != null && crl.getNextUpdate().before(pkixParams.getDate()))
-            {
-                ErrorBundle msg = new ErrorBundle(RESOURCE_NAME,"CertPathReviewer.crlUpdateAvailable",
-                        new Object[] {new TrustedInput(crl.getNextUpdate())});
-                addNotification(msg,index);
-            }
-            
-            //
-            // check the DeltaCRL indicator, base point and the issuing distribution point
-            //
-            ASN1Primitive idp;
-            try
-            {
-                idp = getExtensionValue(crl, ISSUING_DISTRIBUTION_POINT);
-            }
-            catch (AnnotatedException ae)
-            {
-                ErrorBundle msg = new ErrorBundle(RESOURCE_NAME,"CertPathReviewer.distrPtExtError");
-                throw new CertPathReviewerException(msg);
-            }
-            ASN1Primitive dci;
-            try
-            {
-                dci = getExtensionValue(crl, DELTA_CRL_INDICATOR);
-            }
-            catch (AnnotatedException ae)
-            {
-                ErrorBundle msg = new ErrorBundle(RESOURCE_NAME,"CertPathReviewer.deltaCrlExtError");
-                throw new CertPathReviewerException(msg);
-            }
-
-            if (dci != null)
-            {
-                X509CRLStoreSelector baseSelect = new X509CRLStoreSelector();
-
-                try
-                {
-                    baseSelect.addIssuerName(getIssuerPrincipal(crl).getEncoded());
-                }
-                catch (IOException e)
-                {
-                    ErrorBundle msg = new ErrorBundle(RESOURCE_NAME,"CertPathReviewer.crlIssuerException");
-                    throw new CertPathReviewerException(msg,e);
-                }
-
-                baseSelect.setMinCRLNumber(((ASN1Integer)dci).getPositiveValue());
-                try
-                {
-                    baseSelect.setMaxCRLNumber(((ASN1Integer)getExtensionValue(crl, CRL_NUMBER)).getPositiveValue().subtract(BigInteger.valueOf(1)));
-                }
-                catch (AnnotatedException ae)
-                {
-                    ErrorBundle msg = new ErrorBundle(RESOURCE_NAME,"CertPathReviewer.crlNbrExtError");
-                    throw new CertPathReviewerException(msg,ae);
-                }
-                
-                boolean  foundBase = false;
-                Iterator it;
-                try 
-                {
-                    it  = CRL_UTIL.findCRLs(baseSelect, paramsPKIX).iterator();
-                }
-                catch (AnnotatedException ae)
-                {
-                    ErrorBundle msg = new ErrorBundle(RESOURCE_NAME,"CertPathReviewer.crlExtractionError");
-                    throw new CertPathReviewerException(msg,ae);
-                }
-                while (it.hasNext())
-                {
-                    X509CRL base = (X509CRL)it.next();
-
-                    ASN1Primitive baseIdp;
-                    try
-                    {
-                        baseIdp = getExtensionValue(base, ISSUING_DISTRIBUTION_POINT);
-                    }
-                    catch (AnnotatedException ae)
-                    {
-                        ErrorBundle msg = new ErrorBundle(RESOURCE_NAME,"CertPathReviewer.distrPtExtError");
-                        throw new CertPathReviewerException(msg,ae);
-                    }
-                    
-                    if (idp == null)
-                    {
-                        if (baseIdp == null)
-                        {
-                            foundBase = true;
-                            break;
-                        }
-                    }
-                    else
-                    {
-                        if (idp.equals(baseIdp))
-                        {
-                            foundBase = true;
-                            break;
-                        }
-                    }
-                }
-                
-                if (!foundBase)
-                {
-                    ErrorBundle msg = new ErrorBundle(RESOURCE_NAME,"CertPathReviewer.noBaseCRL");
-                    throw new CertPathReviewerException(msg);
-                }
-            }
-
-            if (idp != null)
-            {
-                IssuingDistributionPoint    p = IssuingDistributionPoint.getInstance(idp);
-                BasicConstraints bc = null;
-                try
-                {
-                    bc = BasicConstraints.getInstance(getExtensionValue(cert, BASIC_CONSTRAINTS));
-                }
-                catch (AnnotatedException ae)
-                {
-                    ErrorBundle msg = new ErrorBundle(RESOURCE_NAME,"CertPathReviewer.crlBCExtError");
-                    throw new CertPathReviewerException(msg,ae);
-                }
-                
-                if (p.onlyContainsUserCerts() && (bc != null && bc.isCA()))
-                {
-                    ErrorBundle msg = new ErrorBundle(RESOURCE_NAME,"CertPathReviewer.crlOnlyUserCert");
-                    throw new CertPathReviewerException(msg);
-                }
-                
-                if (p.onlyContainsCACerts() && (bc == null || !bc.isCA()))
-                {
-                    ErrorBundle msg = new ErrorBundle(RESOURCE_NAME,"CertPathReviewer.crlOnlyCaCert");
-                    throw new CertPathReviewerException(msg);
-                }
-                
-                if (p.onlyContainsAttributeCerts())
-                {
-                    ErrorBundle msg = new ErrorBundle(RESOURCE_NAME,"CertPathReviewer.crlOnlyAttrCert");
-                    throw new CertPathReviewerException(msg);
-                }
-            }
-        }
-        
-        if (!validCrlFound)
-        {
-            ErrorBundle msg = new ErrorBundle(RESOURCE_NAME,"CertPathReviewer.noValidCrlFound");
-            throw new CertPathReviewerException(msg);
-        }
-    
-    }
-    
-    protected Vector getCRLDistUrls(CRLDistPoint crlDistPoints)
-    {
-        Vector urls = new Vector();
-        
-        if (crlDistPoints != null)
-        {
-            DistributionPoint[] distPoints = crlDistPoints.getDistributionPoints();
-            for (int i = 0; i < distPoints.length; i++)
-            {
-                DistributionPointName dp_name = distPoints[i].getDistributionPoint();
-                if (dp_name.getType() == DistributionPointName.FULL_NAME)
-                {
-                    GeneralName[] generalNames = GeneralNames.getInstance(dp_name.getName()).getNames();
-                    for (int j = 0; j < generalNames.length; j++)
-                    {
-                        if (generalNames[j].getTagNo() == GeneralName.uniformResourceIdentifier)
-                        {
-                            String url = ((DERIA5String) generalNames[j].getName()).getString();
-                            urls.add(url);
-                        }
-                    }
-                }
-            }
-        }
-        return urls;
-    }
-    
-    protected Vector getOCSPUrls(AuthorityInformationAccess authInfoAccess)
-    {
-        Vector urls = new Vector();
-        
-        if (authInfoAccess != null)
-        {
-            AccessDescription[] ads = authInfoAccess.getAccessDescriptions();
-            for (int i = 0; i < ads.length; i++)
-            {
-                if (ads[i].getAccessMethod().equals(AccessDescription.id_ad_ocsp))
-                {
-                    GeneralName name = ads[i].getAccessLocation();
-                    if (name.getTagNo() == GeneralName.uniformResourceIdentifier)
-                    {
-                        String url = ((DERIA5String) name.getName()).getString();
-                        urls.add(url);
-                    }
-                }
-            }
-        }
-        
-        return urls;
-    }
-    
-    private X509CRL getCRL(String location) throws CertPathReviewerException
-    {
-        X509CRL result = null;
-        try
-        {
-            URL url = new URL(location);
-            
-            if (url.getProtocol().equals("http") || url.getProtocol().equals("https"))
-            {
-                HttpURLConnection conn = (HttpURLConnection) url.openConnection();
-                conn.setUseCaches(false);
-                //conn.setConnectTimeout(2000);
-                conn.setDoInput(true);
-                conn.connect();
-                if (conn.getResponseCode() == HttpURLConnection.HTTP_OK)
-                {
-                    CertificateFactory cf = CertificateFactory.getInstance("X.509","BC");
-                    result = (X509CRL) cf.generateCRL(conn.getInputStream());
-                }
-                else
-                {
-                    throw new Exception(conn.getResponseMessage());
-                }
-            }
-        }
-        catch (Exception e)
-        {
-            ErrorBundle msg = new ErrorBundle(RESOURCE_NAME,
-                    "CertPathReviewer.loadCrlDistPointError",
-                    new Object[] {new UntrustedInput(location),
-                                  e.getMessage(),e,e.getClass().getName()});
-            throw new CertPathReviewerException(msg);
-        }
-        return result;
-    }
-    
-    protected Collection getTrustAnchors(X509Certificate cert, Set trustanchors) throws CertPathReviewerException
-    {
-        Collection trustColl = new ArrayList();
-        Iterator it = trustanchors.iterator();
-        
-        X509CertSelector certSelectX509 = new X509CertSelector();
-
-        try
-        {
-            certSelectX509.setSubject(getEncodedIssuerPrincipal(cert).getEncoded());
-            byte[] ext = cert.getExtensionValue(X509Extensions.AuthorityKeyIdentifier.getId());
-
-            if (ext != null)
-            {
-                ASN1OctetString oct = (ASN1OctetString)ASN1Primitive.fromByteArray(ext);
-                AuthorityKeyIdentifier authID = AuthorityKeyIdentifier.getInstance(ASN1Primitive.fromByteArray(oct.getOctets()));
-
-                certSelectX509.setSerialNumber(authID.getAuthorityCertSerialNumber());
-                byte[] keyID = authID.getKeyIdentifier();
-                if (keyID != null)
-                {
-                    certSelectX509.setSubjectKeyIdentifier(new DEROctetString(keyID).getEncoded());
-                }
-            }
-        }
-        catch (IOException ex)
-        {
-            ErrorBundle msg = new ErrorBundle(RESOURCE_NAME,"CertPathReviewer.trustAnchorIssuerError");
-            throw new CertPathReviewerException(msg);
-        }
-
-        while (it.hasNext())
-        {
-            TrustAnchor trust = (TrustAnchor) it.next();
-            if (trust.getTrustedCert() != null)
-            {
-                if (certSelectX509.match(trust.getTrustedCert()))
-                {
-                    trustColl.add(trust);
-                }
-            }
-            else if (trust.getCAName() != null && trust.getCAPublicKey() != null)
-            {
-                X500Principal certIssuer = getEncodedIssuerPrincipal(cert);
-                X500Principal caName = new X500Principal(trust.getCAName());
-                if (certIssuer.equals(caName))
-                {
-                    trustColl.add(trust);
-                }
-            }
-        }
-        return trustColl;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/x509/X509AttributeCertStoreSelector.java b/bcprov/src/main/java/org/bouncycastle/x509/X509AttributeCertStoreSelector.java
deleted file mode 100644
index bd474fd..0000000
--- a/bcprov/src/main/java/org/bouncycastle/x509/X509AttributeCertStoreSelector.java
+++ /dev/null
@@ -1,484 +0,0 @@
-package org.bouncycastle.x509;
-
-import java.io.IOException;
-import java.math.BigInteger;
-import java.security.cert.CertificateExpiredException;
-import java.security.cert.CertificateNotYetValidException;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Set;
-
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1Primitive;
-import org.bouncycastle.asn1.DEROctetString;
-import org.bouncycastle.asn1.x509.GeneralName;
-import org.bouncycastle.asn1.x509.Target;
-import org.bouncycastle.asn1.x509.TargetInformation;
-import org.bouncycastle.asn1.x509.Targets;
-import org.bouncycastle.asn1.x509.X509Extensions;
-import org.bouncycastle.util.Selector;
-
-/**
- * This class is an <code>Selector</code> like implementation to select
- * attribute certificates from a given set of criteria.
- * 
- * @see org.bouncycastle.x509.X509AttributeCertificate
- * @see org.bouncycastle.x509.X509Store
- *  @deprecated use org.bouncycastle.cert.X509AttributeCertificateSelector and org.bouncycastle.cert.X509AttributeCertificateSelectorBuilder.
- */
-public class X509AttributeCertStoreSelector
-    implements Selector
-{
-
-    // TODO: name constraints???
-
-    private AttributeCertificateHolder holder;
-
-    private AttributeCertificateIssuer issuer;
-
-    private BigInteger serialNumber;
-
-    private Date attributeCertificateValid;
-
-    private X509AttributeCertificate attributeCert;
-
-    private Collection targetNames = new HashSet();
-
-    private Collection targetGroups = new HashSet();
-
-    public X509AttributeCertStoreSelector()
-    {
-        super();
-    }
-
-    /**
-     * Decides if the given attribute certificate should be selected.
-     * 
-     * @param obj The attribute certificate which should be checked.
-     * @return <code>true</code> if the attribute certificate can be selected,
-     *         <code>false</code> otherwise.
-     */
-    public boolean match(Object obj)
-    {
-        if (!(obj instanceof X509AttributeCertificate))
-        {
-            return false;
-        }
-
-        X509AttributeCertificate attrCert = (X509AttributeCertificate) obj;
-
-        if (this.attributeCert != null)
-        {
-            if (!this.attributeCert.equals(attrCert))
-            {
-                return false;
-            }
-        }
-        if (serialNumber != null)
-        {
-            if (!attrCert.getSerialNumber().equals(serialNumber))
-            {
-                return false;
-            }
-        }
-        if (holder != null)
-        {
-            if (!attrCert.getHolder().equals(holder))
-            {
-                return false;
-            }
-        }
-        if (issuer != null)
-        {
-            if (!attrCert.getIssuer().equals(issuer))
-            {
-                return false;
-            }
-        }
-
-        if (attributeCertificateValid != null)
-        {
-            try
-            {
-                attrCert.checkValidity(attributeCertificateValid);
-            }
-            catch (CertificateExpiredException e)
-            {
-                return false;
-            }
-            catch (CertificateNotYetValidException e)
-            {
-                return false;
-            }
-        }
-        if (!targetNames.isEmpty() || !targetGroups.isEmpty())
-        {
-
-            byte[] targetInfoExt = attrCert
-                .getExtensionValue(X509Extensions.TargetInformation.getId());
-            if (targetInfoExt != null)
-            {
-                TargetInformation targetinfo;
-                try
-                {
-                    targetinfo = TargetInformation
-                        .getInstance(new ASN1InputStream(
-                            ((DEROctetString) DEROctetString
-                                .fromByteArray(targetInfoExt)).getOctets())
-                            .readObject());
-                }
-                catch (IOException e)
-                {
-                    return false;
-                }
-                catch (IllegalArgumentException e)
-                {
-                    return false;
-                }
-                Targets[] targetss = targetinfo.getTargetsObjects();
-                if (!targetNames.isEmpty())
-                {
-                    boolean found = false;
-
-                    for (int i=0; i<targetss.length; i++)
-                    {
-                        Targets t = targetss[i];
-                        Target[] targets = t.getTargets();
-                        for (int j=0; j<targets.length; j++)
-                        {
-                            if (targetNames.contains(GeneralName.getInstance(targets[j]
-                                                       .getTargetName())))
-                            {
-                                found = true;
-                                break;
-                            }
-                        }
-                    }
-                    if (!found)
-                    {
-                        return false;
-                    }
-                }
-                if (!targetGroups.isEmpty())
-                {
-                    boolean found = false;
-
-                    for (int i=0; i<targetss.length; i++)
-                    {
-                        Targets t = targetss[i];
-                        Target[] targets = t.getTargets();
-                        for (int j=0; j<targets.length; j++)
-                        {
-                            if (targetGroups.contains(GeneralName.getInstance(targets[j]
-                                                        .getTargetGroup())))
-                            {
-                                found = true;
-                                break;
-                            }
-                        }
-                    }
-                    if (!found)
-                    {
-                        return false;
-                    }
-                }
-            }
-        }
-        return true;
-    }
-
-    /**
-     * Returns a clone of this object.
-     * 
-     * @return the clone.
-     */
-    public Object clone()
-    {
-        X509AttributeCertStoreSelector sel = new X509AttributeCertStoreSelector();
-        sel.attributeCert = attributeCert;
-        sel.attributeCertificateValid = getAttributeCertificateValid();
-        sel.holder = holder;
-        sel.issuer = issuer;
-        sel.serialNumber = serialNumber;
-        sel.targetGroups = getTargetGroups();
-        sel.targetNames = getTargetNames();
-        return sel;
-    }
-
-    /**
-     * Returns the attribute certificate which must be matched.
-     * 
-     * @return Returns the attribute certificate.
-     */
-    public X509AttributeCertificate getAttributeCert()
-    {
-        return attributeCert;
-    }
-
-    /**
-     * Set the attribute certificate to be matched. If <code>null</code> is
-     * given any will do.
-     * 
-     * @param attributeCert The attribute certificate to set.
-     */
-    public void setAttributeCert(X509AttributeCertificate attributeCert)
-    {
-        this.attributeCert = attributeCert;
-    }
-
-    /**
-     * Get the criteria for the validity.
-     * 
-     * @return Returns the attributeCertificateValid.
-     */
-    public Date getAttributeCertificateValid()
-    {
-        if (attributeCertificateValid != null)
-        {
-            return new Date(attributeCertificateValid.getTime());
-        }
-
-        return null;
-    }
-
-    /**
-     * Set the time, when the certificate must be valid. If <code>null</code>
-     * is given any will do.
-     * 
-     * @param attributeCertificateValid The attribute certificate validation
-     *            time to set.
-     */
-    public void setAttributeCertificateValid(Date attributeCertificateValid)
-    {
-        if (attributeCertificateValid != null)
-        {
-            this.attributeCertificateValid = new Date(attributeCertificateValid
-                .getTime());
-        }
-        else
-        {
-            this.attributeCertificateValid = null;
-        }
-    }
-
-    /**
-     * Gets the holder.
-     * 
-     * @return Returns the holder.
-     */
-    public AttributeCertificateHolder getHolder()
-    {
-        return holder;
-    }
-
-    /**
-     * Sets the holder. If <code>null</code> is given any will do.
-     * 
-     * @param holder The holder to set.
-     */
-    public void setHolder(AttributeCertificateHolder holder)
-    {
-        this.holder = holder;
-    }
-
-    /**
-     * Returns the issuer criterion.
-     * 
-     * @return Returns the issuer.
-     */
-    public AttributeCertificateIssuer getIssuer()
-    {
-        return issuer;
-    }
-
-    /**
-     * Sets the issuer the attribute certificate must have. If <code>null</code>
-     * is given any will do.
-     * 
-     * @param issuer The issuer to set.
-     */
-    public void setIssuer(AttributeCertificateIssuer issuer)
-    {
-        this.issuer = issuer;
-    }
-
-    /**
-     * Gets the serial number the attribute certificate must have.
-     * 
-     * @return Returns the serialNumber.
-     */
-    public BigInteger getSerialNumber()
-    {
-        return serialNumber;
-    }
-
-    /**
-     * Sets the serial number the attribute certificate must have. If
-     * <code>null</code> is given any will do.
-     * 
-     * @param serialNumber The serialNumber to set.
-     */
-    public void setSerialNumber(BigInteger serialNumber)
-    {
-        this.serialNumber = serialNumber;
-    }
-
-    /**
-     * Adds a target name criterion for the attribute certificate to the target
-     * information extension criteria. The <code>X509AttributeCertificate</code>
-     * must contain at least one of the specified target names.
-     * <p>
-     * Each attribute certificate may contain a target information extension
-     * limiting the servers where this attribute certificate can be used. If
-     * this extension is not present, the attribute certificate is not targeted
-     * and may be accepted by any server.
-     *
-     * @param name The name as a GeneralName (not <code>null</code>)
-     */
-    public void addTargetName(GeneralName name)
-    {
-        targetNames.add(name);
-    }
-
-    /**
-     * Adds a target name criterion for the attribute certificate to the target
-     * information extension criteria. The <code>X509AttributeCertificate</code>
-     * must contain at least one of the specified target names.
-     * <p>
-     * Each attribute certificate may contain a target information extension
-     * limiting the servers where this attribute certificate can be used. If
-     * this extension is not present, the attribute certificate is not targeted
-     * and may be accepted by any server.
-     *
-     * @param name a byte array containing the name in ASN.1 DER encoded form of a GeneralName
-     * @throws IOException if a parsing error occurs.
-     */
-    public void addTargetName(byte[] name) throws IOException
-    {
-        addTargetName(GeneralName.getInstance(ASN1Primitive.fromByteArray(name)));
-    }
-
-    /**
-     * Adds a collection with target names criteria. If <code>null</code> is
-     * given any will do.
-     * <p>
-     * The collection consists of either GeneralName objects or byte[] arrays representing
-     * DER encoded GeneralName structures.
-     * 
-     * @param names A collection of target names.
-     * @throws IOException if a parsing error occurs.
-     * @see #addTargetName(byte[])
-     * @see #addTargetName(GeneralName)
-     */
-    public void setTargetNames(Collection names) throws IOException
-    {
-        targetNames = extractGeneralNames(names);
-    }
-
-    /**
-     * Gets the target names. The collection consists of <code>GeneralName</code>
-     * objects.
-     * <p>
-     * The returned collection is immutable.
-     * 
-     * @return The collection of target names
-     * @see #setTargetNames(Collection)
-     */
-    public Collection getTargetNames()
-    {
-        return Collections.unmodifiableCollection(targetNames);
-    }
-
-    /**
-     * Adds a target group criterion for the attribute certificate to the target
-     * information extension criteria. The <code>X509AttributeCertificate</code>
-     * must contain at least one of the specified target groups.
-     * <p>
-     * Each attribute certificate may contain a target information extension
-     * limiting the servers where this attribute certificate can be used. If
-     * this extension is not present, the attribute certificate is not targeted
-     * and may be accepted by any server.
-     *
-     * @param group The group as GeneralName form (not <code>null</code>)
-     */
-    public void addTargetGroup(GeneralName group)
-    {
-        targetGroups.add(group);
-    }
-
-    /**
-     * Adds a target group criterion for the attribute certificate to the target
-     * information extension criteria. The <code>X509AttributeCertificate</code>
-     * must contain at least one of the specified target groups.
-     * <p>
-     * Each attribute certificate may contain a target information extension
-     * limiting the servers where this attribute certificate can be used. If
-     * this extension is not present, the attribute certificate is not targeted
-     * and may be accepted by any server.
-     *
-     * @param name a byte array containing the group in ASN.1 DER encoded form of a GeneralName
-     * @throws IOException if a parsing error occurs.
-     */
-    public void addTargetGroup(byte[] name) throws IOException
-    {
-        addTargetGroup(GeneralName.getInstance(ASN1Primitive.fromByteArray(name)));
-    }
-
-    /**
-     * Adds a collection with target groups criteria. If <code>null</code> is
-     * given any will do.
-     * <p>
-     * The collection consists of <code>GeneralName</code> objects or <code>byte[]</code representing DER
-     * encoded GeneralNames.
-     * 
-     * @param names A collection of target groups.
-     * @throws IOException if a parsing error occurs.
-     * @see #addTargetGroup(byte[])
-     * @see #addTargetGroup(GeneralName)
-     */
-    public void setTargetGroups(Collection names) throws IOException
-    {
-        targetGroups = extractGeneralNames(names);
-    }
-
-
-
-    /**
-     * Gets the target groups. The collection consists of <code>GeneralName</code> objects.
-     * <p>
-     * The returned collection is immutable.
-     *
-     * @return The collection of target groups.
-     * @see #setTargetGroups(Collection)
-     */
-    public Collection getTargetGroups()
-    {
-        return Collections.unmodifiableCollection(targetGroups);
-    }
-
-    private Set extractGeneralNames(Collection names)
-        throws IOException
-    {
-        if (names == null || names.isEmpty())
-        {
-            return new HashSet();
-        }
-        Set temp = new HashSet();
-        for (Iterator it = names.iterator(); it.hasNext();)
-        {
-            Object o = it.next();
-            if (o instanceof GeneralName)
-            {
-                temp.add(o);
-            }
-            else
-            {
-                temp.add(GeneralName.getInstance(ASN1Primitive.fromByteArray((byte[])o)));
-            }
-        }
-        return temp;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/x509/X509CertPairStoreSelector.java b/bcprov/src/main/java/org/bouncycastle/x509/X509CertPairStoreSelector.java
deleted file mode 100644
index 187b098..0000000
--- a/bcprov/src/main/java/org/bouncycastle/x509/X509CertPairStoreSelector.java
+++ /dev/null
@@ -1,155 +0,0 @@
-package org.bouncycastle.x509;
-
-import org.bouncycastle.util.Selector;
-
-/**
- * This class is an <code>Selector</code> like implementation to select
- * certificates pairs, which are e.g. used for cross certificates. The set of
- * criteria is given from two
- * {@link org.bouncycastle.x509.X509CertStoreSelector}s which must be both
- * matched.
- * 
- * @see org.bouncycastle.x509.X509AttributeCertificate
- * @see org.bouncycastle.x509.X509Store
- */
-public class X509CertPairStoreSelector implements Selector
-{
-
-    private X509CertStoreSelector forwardSelector;
-
-    private X509CertStoreSelector reverseSelector;
-
-    private X509CertificatePair certPair;
-
-    public X509CertPairStoreSelector()
-    {
-    }
-
-    /**
-     * Returns the certificate pair which is used for testing on equality.
-     * 
-     * @return Returns the certificate pair which is checked.
-     */
-    public X509CertificatePair getCertPair()
-    {
-        return certPair;
-    }
-
-    /**
-     * Set the certificate pair which is used for testing on equality.
-     * 
-     * @param certPair The certPairChecking to set.
-     */
-    public void setCertPair(X509CertificatePair certPair)
-    {
-        this.certPair = certPair;
-    }
-
-    /**
-     * @param forwardSelector The certificate selector for the forward part in
-     *            the pair.
-     */
-    public void setForwardSelector(X509CertStoreSelector forwardSelector)
-    {
-        this.forwardSelector = forwardSelector;
-    }
-
-    /**
-     * @param reverseSelector The certificate selector for the reverse part in
-     *            the pair.
-     */
-    public void setReverseSelector(X509CertStoreSelector reverseSelector)
-    {
-        this.reverseSelector = reverseSelector;
-    }
-
-    /**
-     * Returns a clone of this selector.
-     * 
-     * @return A clone of this selector.
-     * @see java.lang.Object#clone()
-     */
-    public Object clone()
-    {
-        X509CertPairStoreSelector cln = new X509CertPairStoreSelector();
-
-        cln.certPair = certPair;
-        
-        if (forwardSelector != null)
-        {
-            cln.setForwardSelector((X509CertStoreSelector) forwardSelector
-                    .clone());
-        }
-
-        if (reverseSelector != null)
-        {
-            cln.setReverseSelector((X509CertStoreSelector) reverseSelector
-                    .clone());
-        }
-
-        return cln;
-    }
-
-    /**
-     * Decides if the given certificate pair should be selected. If
-     * <code>obj</code> is not a {@link X509CertificatePair} this method
-     * returns <code>false</code>.
-     * 
-     * @param obj The {@link X509CertificatePair} which should be tested.
-     * @return <code>true</code> if the object matches this selector.
-     */
-    public boolean match(Object obj)
-    {
-        try
-        {
-            if (!(obj instanceof X509CertificatePair))
-            {
-                return false;
-            }
-            X509CertificatePair pair = (X509CertificatePair)obj;
-
-            if (forwardSelector != null
-                    && !forwardSelector.match((Object)pair.getForward()))
-            {
-                return false;
-            }
-
-            if (reverseSelector != null
-                    && !reverseSelector.match((Object)pair.getReverse()))
-            {
-                return false;
-            }
-
-            if (certPair != null)
-            {
-                return certPair.equals(obj);
-            }
-
-            return true;
-        }
-        catch (Exception e)
-        {
-            return false;
-        }
-    }
-
-    /**
-     * Returns the certicate selector for the forward part.
-     * 
-     * @return Returns the certicate selector for the forward part.
-     */
-    public X509CertStoreSelector getForwardSelector()
-    {
-        return forwardSelector;
-    }
-
-    /**
-     * Returns the certicate selector for the reverse part.
-     * 
-     * @return Returns the reverse selector for teh reverse part.
-     */
-    public X509CertStoreSelector getReverseSelector()
-    {
-        return reverseSelector;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/x509/X509CertificatePair.java b/bcprov/src/main/java/org/bouncycastle/x509/X509CertificatePair.java
deleted file mode 100644
index 73e5ba3..0000000
--- a/bcprov/src/main/java/org/bouncycastle/x509/X509CertificatePair.java
+++ /dev/null
@@ -1,167 +0,0 @@
-package org.bouncycastle.x509;
-
-import java.io.IOException;
-import java.security.cert.CertificateEncodingException;
-import java.security.cert.CertificateParsingException;
-import java.security.cert.X509Certificate;
-
-import org.bouncycastle.asn1.ASN1Encoding;
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.x509.Certificate;
-import org.bouncycastle.asn1.x509.CertificatePair;
-import org.bouncycastle.jce.provider.X509CertificateObject;
-
-/**
- * This class contains a cross certificate pair. Cross certificates pairs may
- * contain two cross signed certificates from two CAs. A certificate from the
- * other CA to this CA is contained in the forward certificate, the certificate
- * from this CA to the other CA is contained in the reverse certificate.
- */
-public class X509CertificatePair
-{
-    private X509Certificate forward;
-    private X509Certificate reverse;
-
-    /**
-     * Constructor.
-     *
-     * @param forward Certificate from the other CA to this CA.
-     * @param reverse Certificate from this CA to the other CA.
-     */
-    public X509CertificatePair(
-        X509Certificate forward,
-        X509Certificate reverse)
-    {
-        this.forward = forward;
-        this.reverse = reverse;
-    }
-
-    /**
-     * Constructor from a ASN.1 CertificatePair structure.
-     *
-     * @param pair The <code>CertificatePair</code> ASN.1 object.
-     */
-    public X509CertificatePair(
-        CertificatePair pair)
-        throws CertificateParsingException
-    {
-        if (pair.getForward() != null)
-        {
-            this.forward = new X509CertificateObject(pair.getForward());
-        }
-        if (pair.getReverse() != null)
-        {
-            this.reverse = new X509CertificateObject(pair.getReverse());
-        }
-    }
-    
-    public byte[] getEncoded()
-        throws CertificateEncodingException
-    {
-        Certificate f = null;
-        Certificate r = null;
-        try
-        {
-            if (forward != null)
-            {
-                f = Certificate.getInstance(new ASN1InputStream(
-                    forward.getEncoded()).readObject());
-                if (f == null)
-                {
-                    throw new CertificateEncodingException("unable to get encoding for forward");
-                }
-            }
-            if (reverse != null)
-            {
-                r = Certificate.getInstance(new ASN1InputStream(
-                    reverse.getEncoded()).readObject());
-                if (r == null)
-                {
-                    throw new CertificateEncodingException("unable to get encoding for reverse");
-                }
-            }
-            return new CertificatePair(f, r).getEncoded(ASN1Encoding.DER);
-        }
-        catch (IllegalArgumentException e)
-        {
-            throw new ExtCertificateEncodingException(e.toString(), e);
-        }
-        catch (IOException e)
-        {
-            throw new ExtCertificateEncodingException(e.toString(), e);
-        }
-    }
-
-    /**
-     * Returns the certificate from the other CA to this CA.
-     *
-     * @return Returns the forward certificate.
-     */
-    public X509Certificate getForward()
-    {
-        return forward;
-    }
-
-    /**
-     * Return the certificate from this CA to the other CA.
-     *
-     * @return Returns the reverse certificate.
-     */
-    public X509Certificate getReverse()
-    {
-        return reverse;
-    }
-
-    public boolean equals(Object o)
-    {
-        if (o == null)
-        {
-            return false;
-        }
-        if (!(o instanceof X509CertificatePair))
-        {
-            return false;
-        }
-        X509CertificatePair pair = (X509CertificatePair)o;
-        boolean equalReverse = true;
-        boolean equalForward = true;
-        if (forward != null)
-        {
-            equalForward = this.forward.equals(pair.forward);
-        }
-        else
-        {
-            if (pair.forward != null)
-            {
-                equalForward = false;
-            }
-        }
-        if (reverse != null)
-        {
-            equalReverse = this.reverse.equals(pair.reverse);
-        }
-        else
-        {
-            if (pair.reverse != null)
-            {
-                equalReverse = false;
-            }
-        }
-        return equalForward && equalReverse;
-    }
-
-    public int hashCode()
-    {
-        int hash = -1;
-        if (forward != null)
-        {
-            hash ^= forward.hashCode();
-        }
-        if (reverse != null)
-        {
-            hash *= 17;
-            hash ^= reverse.hashCode();
-        }
-        return hash;
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/x509/X509Store.java b/bcprov/src/main/java/org/bouncycastle/x509/X509Store.java
deleted file mode 100644
index 61d921c..0000000
--- a/bcprov/src/main/java/org/bouncycastle/x509/X509Store.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package org.bouncycastle.x509;
-
-import java.security.NoSuchAlgorithmException;
-import java.security.NoSuchProviderException;
-import java.security.Provider;
-import java.util.Collection;
-
-import org.bouncycastle.util.Selector;
-import org.bouncycastle.util.Store;
-
-/**
- * @deprecated use CollectionStore - this class will be removed.
- */
-public class X509Store
-    implements Store
-{
-    public static X509Store getInstance(String type, X509StoreParameters parameters)
-        throws NoSuchStoreException
-    {
-        try
-        {
-            X509Util.Implementation impl = X509Util.getImplementation("X509Store", type);
-
-            return createStore(impl, parameters);
-        }
-        catch (NoSuchAlgorithmException e)
-        {
-            throw new NoSuchStoreException(e.getMessage());
-        }
-    }
-
-    public static X509Store getInstance(String type, X509StoreParameters parameters, String provider)
-        throws NoSuchStoreException, NoSuchProviderException
-    {
-        return getInstance(type, parameters, X509Util.getProvider(provider));
-    }
-
-    public static X509Store getInstance(String type, X509StoreParameters parameters, Provider provider)
-        throws NoSuchStoreException
-    {
-        try
-        {
-            X509Util.Implementation impl = X509Util.getImplementation("X509Store", type, provider);
-
-            return createStore(impl, parameters);
-        }
-        catch (NoSuchAlgorithmException e)
-        {
-            throw new NoSuchStoreException(e.getMessage());
-        }
-    }
-
-    private static X509Store createStore(X509Util.Implementation impl, X509StoreParameters parameters)
-    {
-        X509StoreSpi spi = (X509StoreSpi)impl.getEngine();
-
-        spi.engineInit(parameters);
-
-        return new X509Store(impl.getProvider(), spi);
-    }
-
-    private Provider     _provider;
-    private X509StoreSpi _spi;
-
-    private X509Store(
-        Provider provider,
-        X509StoreSpi spi)
-    {
-        _provider = provider;
-        _spi = spi;
-    }
-
-    public Provider getProvider()
-    {
-       return _provider;
-    }
-
-    public Collection getMatches(Selector selector)
-    {
-        return _spi.engineGetMatches(selector);
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/x509/X509StreamParser.java b/bcprov/src/main/java/org/bouncycastle/x509/X509StreamParser.java
deleted file mode 100644
index 3ad2846..0000000
--- a/bcprov/src/main/java/org/bouncycastle/x509/X509StreamParser.java
+++ /dev/null
@@ -1,161 +0,0 @@
-package org.bouncycastle.x509;
-
-import org.bouncycastle.x509.util.StreamParser;
-import org.bouncycastle.x509.util.StreamParsingException;
-
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-import java.security.NoSuchAlgorithmException;
-import java.security.NoSuchProviderException;
-import java.security.Provider;
-import java.util.Collection;
-
-/**
- *
- * This class allows access to different implementations for reading X.509
- * objects from streams.
- * <p>
- * A X509StreamParser is used to read a collection of objects or a single object
- * of a certain X.509 object structure. E.g. one X509StreamParser can read
- * certificates, another one CRLs, certification paths, attribute certificates
- * and so on. The kind of object structure is specified with the
- * <code>algorithm</code> parameter to the <code>getInstance</code> methods.
- * <p>
- * Implementations must implement the
- * {@link org.bouncycastle.x509.X509StreamParserSpi}.
- */
-public class X509StreamParser
-    implements StreamParser
-{
-    /**
-     * Generates a StreamParser object that implements the specified type. If
-     * the default provider package provides an implementation of the requested
-     * type, an instance of StreamParser containing that implementation is
-     * returned. If the type is not available in the default package, other
-     * packages are searched.
-     *
-     * @param type
-     *            The name of the requested X.509 object type.
-     * @return a StreamParser object for the specified type.
-     *
-     * @exception NoSuchParserException
-     *                if the requested type is not available in the default
-     *                provider package or any of the other provider packages
-     *                that were searched.
-     */
-    public static X509StreamParser getInstance(String type)
-        throws NoSuchParserException
-    {
-        try
-        {
-            X509Util.Implementation impl = X509Util.getImplementation("X509StreamParser", type);
-
-            return createParser(impl);
-        }
-        catch (NoSuchAlgorithmException e)
-        {
-            throw new NoSuchParserException(e.getMessage());
-        }
-    }
-
-    /**
-     * Generates a X509StreamParser object for the specified type from the
-     * specified provider.
-     *
-     * @param type
-     *            the name of the requested X.509 object type.
-     * @param provider
-     *            the name of the provider.
-     *
-     * @return a X509StreamParser object for the specified type.
-     *
-     * @exception NoSuchParserException
-     *                if the type is not available from the specified provider.
-     *
-     * @exception NoSuchProviderException
-     *                if the provider can not be found.
-     *
-     * @see Provider
-     */
-    public static X509StreamParser getInstance(String type, String provider)
-        throws NoSuchParserException, NoSuchProviderException
-    {
-        return getInstance(type, X509Util.getProvider(provider));
-    }
-
-    /**
-     * Generates a X509StreamParser object for the specified type from the
-     * specified provider.
-     *
-     * @param type
-     *            the name of the requested X.509 object type.
-     * @param provider
-     *            the Provider to use.
-     *
-     * @return a X509StreamParser object for the specified type.
-     *
-     * @exception NoSuchParserException
-     *                if the type is not available from the specified provider.
-     *
-     * @see Provider
-     */
-    public static X509StreamParser getInstance(String type, Provider provider)
-        throws NoSuchParserException
-    {
-        try
-        {
-            X509Util.Implementation impl = X509Util.getImplementation("X509StreamParser", type, provider);
-
-            return createParser(impl);
-        }
-        catch (NoSuchAlgorithmException e)
-        {
-            throw new NoSuchParserException(e.getMessage());
-        }
-    }
-
-    private static X509StreamParser createParser(X509Util.Implementation impl)
-    {
-        X509StreamParserSpi spi = (X509StreamParserSpi)impl.getEngine();
-
-        return new X509StreamParser(impl.getProvider(), spi);
-    }
-
-    private Provider            _provider;
-    private X509StreamParserSpi _spi;
-
-    private X509StreamParser(
-        Provider provider,
-        X509StreamParserSpi spi)
-    {
-        _provider = provider;
-        _spi = spi;
-    }
-
-    public Provider getProvider()
-    {
-        return _provider;
-    }
-
-    public void init(InputStream stream)
-    {
-        _spi.engineInit(stream);
-    }
-
-    public void init(byte[] data)
-    {
-        _spi.engineInit(new ByteArrayInputStream(data));
-    }
-
-    public Object read()
-        throws StreamParsingException
-    {
-        return _spi.engineRead();
-    }
-
-    public Collection readAll()
-        throws StreamParsingException
-    {
-        return _spi.engineReadAll();
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/x509/X509StreamParserSpi.java b/bcprov/src/main/java/org/bouncycastle/x509/X509StreamParserSpi.java
deleted file mode 100644
index 6929eb1..0000000
--- a/bcprov/src/main/java/org/bouncycastle/x509/X509StreamParserSpi.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package org.bouncycastle.x509;
-
-import org.bouncycastle.x509.util.StreamParsingException;
-
-import java.io.InputStream;
-import java.util.Collection;
-
-/**
- * This abstract class defines the service provider interface (SPI) for
- * X509StreamParser.
- *
- * @see org.bouncycastle.x509.X509StreamParser
- *
- */
-public abstract class X509StreamParserSpi
-{
-    /**
-     * Initializes this stream parser with the input stream.
-     *
-     * @param in The input stream.
-     */
-    public abstract void engineInit(InputStream in);
-
-    /**
-     * Returns the next X.509 object of the type of this SPI from the given
-     * input stream.
-     *
-     * @return the next X.509 object in the stream or <code>null</code> if the
-     *         end of the stream is reached.
-     * @exception StreamParsingException
-     *                if the object cannot be created from input stream.
-     */
-    public abstract Object engineRead() throws StreamParsingException;
-
-    /**
-     * Returns all X.509 objects of the type of this SPI from
-     * the given input stream.
-     *
-     * @return A collection of all X.509 objects in the input stream or
-     *         <code>null</code> if the end of the stream is reached.
-     * @exception StreamParsingException
-     *                if an object cannot be created from input stream.
-     */
-    public abstract Collection engineReadAll() throws StreamParsingException;
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/x509/X509Util.java b/bcprov/src/main/java/org/bouncycastle/x509/X509Util.java
index d002111..ecf910f 100644
--- a/bcprov/src/main/java/org/bouncycastle/x509/X509Util.java
+++ b/bcprov/src/main/java/org/bouncycastle/x509/X509Util.java
@@ -25,12 +25,16 @@ import org.bouncycastle.asn1.ASN1Encoding;
 import org.bouncycastle.asn1.ASN1Integer;
 import org.bouncycastle.asn1.ASN1ObjectIdentifier;
 import org.bouncycastle.asn1.DERNull;
-import org.bouncycastle.asn1.cryptopro.CryptoProObjectIdentifiers;
+// BEGIN android-removed
+// import org.bouncycastle.asn1.cryptopro.CryptoProObjectIdentifiers;
+// END android-removed
 import org.bouncycastle.asn1.nist.NISTObjectIdentifiers;
 import org.bouncycastle.asn1.oiw.OIWObjectIdentifiers;
 import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
 import org.bouncycastle.asn1.pkcs.RSASSAPSSparams;
-import org.bouncycastle.asn1.teletrust.TeleTrusTObjectIdentifiers;
+// BEGIN android-removed
+// import org.bouncycastle.asn1.teletrust.TeleTrusTObjectIdentifiers;
+// END android-removed
 import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
 import org.bouncycastle.asn1.x9.X9ObjectIdentifiers;
 import org.bouncycastle.jce.X509Principal;
@@ -44,8 +48,10 @@ class X509Util
     
     static
     {   
-        algorithms.put("MD2WITHRSAENCRYPTION", PKCSObjectIdentifiers.md2WithRSAEncryption);
-        algorithms.put("MD2WITHRSA", PKCSObjectIdentifiers.md2WithRSAEncryption);
+        // BEGIN android-removed
+        // algorithms.put("MD2WITHRSAENCRYPTION", PKCSObjectIdentifiers.md2WithRSAEncryption);
+        // algorithms.put("MD2WITHRSA", PKCSObjectIdentifiers.md2WithRSAEncryption);
+        // END android-removed
         algorithms.put("MD5WITHRSAENCRYPTION", PKCSObjectIdentifiers.md5WithRSAEncryption);
         algorithms.put("MD5WITHRSA", PKCSObjectIdentifiers.md5WithRSAEncryption);
         algorithms.put("SHA1WITHRSAENCRYPTION", PKCSObjectIdentifiers.sha1WithRSAEncryption);
@@ -63,12 +69,14 @@ class X509Util
         algorithms.put("SHA256WITHRSAANDMGF1", PKCSObjectIdentifiers.id_RSASSA_PSS);
         algorithms.put("SHA384WITHRSAANDMGF1", PKCSObjectIdentifiers.id_RSASSA_PSS);
         algorithms.put("SHA512WITHRSAANDMGF1", PKCSObjectIdentifiers.id_RSASSA_PSS);
-        algorithms.put("RIPEMD160WITHRSAENCRYPTION", TeleTrusTObjectIdentifiers.rsaSignatureWithripemd160);
-        algorithms.put("RIPEMD160WITHRSA", TeleTrusTObjectIdentifiers.rsaSignatureWithripemd160);
-        algorithms.put("RIPEMD128WITHRSAENCRYPTION", TeleTrusTObjectIdentifiers.rsaSignatureWithripemd128);
-        algorithms.put("RIPEMD128WITHRSA", TeleTrusTObjectIdentifiers.rsaSignatureWithripemd128);
-        algorithms.put("RIPEMD256WITHRSAENCRYPTION", TeleTrusTObjectIdentifiers.rsaSignatureWithripemd256);
-        algorithms.put("RIPEMD256WITHRSA", TeleTrusTObjectIdentifiers.rsaSignatureWithripemd256);
+        // BEGIN android-removed
+        // algorithms.put("RIPEMD160WITHRSAENCRYPTION", TeleTrusTObjectIdentifiers.rsaSignatureWithripemd160);
+        // algorithms.put("RIPEMD160WITHRSA", TeleTrusTObjectIdentifiers.rsaSignatureWithripemd160);
+        // algorithms.put("RIPEMD128WITHRSAENCRYPTION", TeleTrusTObjectIdentifiers.rsaSignatureWithripemd128);
+        // algorithms.put("RIPEMD128WITHRSA", TeleTrusTObjectIdentifiers.rsaSignatureWithripemd128);
+        // algorithms.put("RIPEMD256WITHRSAENCRYPTION", TeleTrusTObjectIdentifiers.rsaSignatureWithripemd256);
+        // algorithms.put("RIPEMD256WITHRSA", TeleTrusTObjectIdentifiers.rsaSignatureWithripemd256);
+        // END android-removed
         algorithms.put("SHA1WITHDSA", X9ObjectIdentifiers.id_dsa_with_sha1);
         algorithms.put("DSAWITHSHA1", X9ObjectIdentifiers.id_dsa_with_sha1);
         algorithms.put("SHA224WITHDSA", NISTObjectIdentifiers.dsa_with_sha224);
@@ -81,11 +89,13 @@ class X509Util
         algorithms.put("SHA256WITHECDSA", X9ObjectIdentifiers.ecdsa_with_SHA256);
         algorithms.put("SHA384WITHECDSA", X9ObjectIdentifiers.ecdsa_with_SHA384);
         algorithms.put("SHA512WITHECDSA", X9ObjectIdentifiers.ecdsa_with_SHA512);
-        algorithms.put("GOST3411WITHGOST3410", CryptoProObjectIdentifiers.gostR3411_94_with_gostR3410_94);
-        algorithms.put("GOST3411WITHGOST3410-94", CryptoProObjectIdentifiers.gostR3411_94_with_gostR3410_94);
-        algorithms.put("GOST3411WITHECGOST3410", CryptoProObjectIdentifiers.gostR3411_94_with_gostR3410_2001);
-        algorithms.put("GOST3411WITHECGOST3410-2001", CryptoProObjectIdentifiers.gostR3411_94_with_gostR3410_2001);
-        algorithms.put("GOST3411WITHGOST3410-2001", CryptoProObjectIdentifiers.gostR3411_94_with_gostR3410_2001);
+        // BEGIN android-removed
+        // algorithms.put("GOST3411WITHGOST3410", CryptoProObjectIdentifiers.gostR3411_94_with_gostR3410_94);
+        // algorithms.put("GOST3411WITHGOST3410-94", CryptoProObjectIdentifiers.gostR3411_94_with_gostR3410_94);
+        // algorithms.put("GOST3411WITHECGOST3410", CryptoProObjectIdentifiers.gostR3411_94_with_gostR3410_2001);
+        // algorithms.put("GOST3411WITHECGOST3410-2001", CryptoProObjectIdentifiers.gostR3411_94_with_gostR3410_2001);
+        // algorithms.put("GOST3411WITHGOST3410-2001", CryptoProObjectIdentifiers.gostR3411_94_with_gostR3410_2001);
+        // END android-removed
 
         //
         // According to RFC 3279, the ASN.1 encoding SHALL (id-dsa-with-sha1) or MUST (ecdsa-with-SHA*) omit the parameters field. 
@@ -105,8 +115,10 @@ class X509Util
         //
         // RFC 4491
         //
-        noParams.add(CryptoProObjectIdentifiers.gostR3411_94_with_gostR3410_94);
-        noParams.add(CryptoProObjectIdentifiers.gostR3411_94_with_gostR3410_2001);
+        // BEGIN android-removed
+        // noParams.add(CryptoProObjectIdentifiers.gostR3411_94_with_gostR3410_94);
+        // noParams.add(CryptoProObjectIdentifiers.gostR3411_94_with_gostR3410_2001);
+        // END android-removed
 
         //
         // explicit params
diff --git a/bcprov/src/main/java/org/bouncycastle/x509/X509V2CRLGenerator.java b/bcprov/src/main/java/org/bouncycastle/x509/X509V2CRLGenerator.java
deleted file mode 100644
index 8773d0e..0000000
--- a/bcprov/src/main/java/org/bouncycastle/x509/X509V2CRLGenerator.java
+++ /dev/null
@@ -1,450 +0,0 @@
-package org.bouncycastle.x509;
-
-import java.io.IOException;
-import java.math.BigInteger;
-import java.security.GeneralSecurityException;
-import java.security.InvalidKeyException;
-import java.security.NoSuchAlgorithmException;
-import java.security.NoSuchProviderException;
-import java.security.PrivateKey;
-import java.security.SecureRandom;
-import java.security.SignatureException;
-import java.security.cert.CRLException;
-import java.security.cert.X509CRL;
-import java.security.cert.X509CRLEntry;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.Set;
-
-import javax.security.auth.x500.X500Principal;
-
-import org.bouncycastle.asn1.ASN1Encodable;
-import org.bouncycastle.asn1.ASN1EncodableVector;
-import org.bouncycastle.asn1.ASN1GeneralizedTime;
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.ASN1Integer;
-import org.bouncycastle.asn1.ASN1ObjectIdentifier;
-import org.bouncycastle.asn1.ASN1Sequence;
-import org.bouncycastle.asn1.DERBitString;
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.x509.AlgorithmIdentifier;
-import org.bouncycastle.asn1.x509.CertificateList;
-import org.bouncycastle.asn1.x509.Extensions;
-import org.bouncycastle.asn1.x509.TBSCertList;
-import org.bouncycastle.asn1.x509.Time;
-import org.bouncycastle.asn1.x509.V2TBSCertListGenerator;
-import org.bouncycastle.asn1.x509.X509Extensions;
-import org.bouncycastle.asn1.x509.X509ExtensionsGenerator;
-import org.bouncycastle.asn1.x509.X509Name;
-import org.bouncycastle.jce.X509Principal;
-import org.bouncycastle.jce.provider.X509CRLObject;
-
-/**
- * class to produce an X.509 Version 2 CRL.
- *  @deprecated use org.bouncycastle.cert.X509v2CRLBuilder.
- */
-public class X509V2CRLGenerator
-{
-    private V2TBSCertListGenerator      tbsGen;
-    private ASN1ObjectIdentifier         sigOID;
-    private AlgorithmIdentifier         sigAlgId;
-    private String                      signatureAlgorithm;
-    private X509ExtensionsGenerator     extGenerator;
-
-    public X509V2CRLGenerator()
-    {
-        tbsGen = new V2TBSCertListGenerator();
-        extGenerator = new X509ExtensionsGenerator();
-    }
-
-    /**
-     * reset the generator
-     */
-    public void reset()
-    {
-        tbsGen = new V2TBSCertListGenerator();
-        extGenerator.reset();
-    }
-
-    /**
-     * Set the issuer distinguished name - the issuer is the entity whose private key is used to sign the
-     * certificate.
-     */
-    public void setIssuerDN(
-        X500Principal   issuer)
-    {
-        try
-        {
-            tbsGen.setIssuer(new X509Principal(issuer.getEncoded()));
-        }
-        catch (IOException e)
-        {
-            throw new IllegalArgumentException("can't process principal: " + e);
-        }
-    }
-
-    /**
-     * Set the issuer distinguished name - the issuer is the entity whose private key is used to sign the
-     * certificate.
-     */
-    public void setIssuerDN(
-        X509Name   issuer)
-    {
-        tbsGen.setIssuer(issuer);
-    }
-
-    public void setThisUpdate(
-        Date    date)
-    {
-        tbsGen.setThisUpdate(new Time(date));
-    }
-
-    public void setNextUpdate(
-        Date    date)
-    {
-        tbsGen.setNextUpdate(new Time(date));
-    }
-
-    /**
-     * Reason being as indicated by CRLReason, i.e. CRLReason.keyCompromise
-     * or 0 if CRLReason is not to be used
-     **/
-    public void addCRLEntry(BigInteger userCertificate, Date revocationDate, int reason)
-    {
-        tbsGen.addCRLEntry(new ASN1Integer(userCertificate), new Time(revocationDate), reason);
-    }
-
-    /**
-     * Add a CRL entry with an Invalidity Date extension as well as a CRLReason extension.
-     * Reason being as indicated by CRLReason, i.e. CRLReason.keyCompromise
-     * or 0 if CRLReason is not to be used
-     **/
-    public void addCRLEntry(BigInteger userCertificate, Date revocationDate, int reason, Date invalidityDate)
-    {
-        tbsGen.addCRLEntry(new ASN1Integer(userCertificate), new Time(revocationDate), reason, new ASN1GeneralizedTime(invalidityDate));
-    }
-   
-    /**
-     * Add a CRL entry with extensions.
-     **/
-    public void addCRLEntry(BigInteger userCertificate, Date revocationDate, X509Extensions extensions)
-    {
-        tbsGen.addCRLEntry(new ASN1Integer(userCertificate), new Time(revocationDate), Extensions.getInstance(extensions));
-    }
-    
-    /**
-     * Add the CRLEntry objects contained in a previous CRL.
-     * 
-     * @param other the X509CRL to source the other entries from. 
-     */
-    public void addCRL(X509CRL other)
-        throws CRLException
-    {
-        Set revocations = other.getRevokedCertificates();
-
-        if (revocations != null)
-        {
-            Iterator it = revocations.iterator();
-            while (it.hasNext())
-            {
-                X509CRLEntry entry = (X509CRLEntry)it.next();
-
-                ASN1InputStream aIn = new ASN1InputStream(entry.getEncoded());
-
-                try
-                {
-                    tbsGen.addCRLEntry(ASN1Sequence.getInstance(aIn.readObject()));
-                }
-                catch (IOException e)
-                {
-                    throw new CRLException("exception processing encoding of CRL: " + e.toString());
-                }
-            }
-        }
-    }
-    
-    /**
-     * Set the signature algorithm. This can be either a name or an OID, names
-     * are treated as case insensitive.
-     * 
-     * @param signatureAlgorithm string representation of the algorithm name.
-     */
-    public void setSignatureAlgorithm(
-        String  signatureAlgorithm)
-    {
-        this.signatureAlgorithm = signatureAlgorithm;
-
-        try
-        {
-            sigOID = X509Util.getAlgorithmOID(signatureAlgorithm);
-        }
-        catch (Exception e)
-        {
-            throw new IllegalArgumentException("Unknown signature type requested");
-        }
-
-        sigAlgId = X509Util.getSigAlgID(sigOID, signatureAlgorithm);
-
-        tbsGen.setSignature(sigAlgId);
-    }
-
-    /**
-     * add a given extension field for the standard extensions tag (tag 0)
-     */
-    public void addExtension(
-        String          oid,
-        boolean         critical,
-        ASN1Encodable    value)
-    {
-        this.addExtension(new ASN1ObjectIdentifier(oid), critical, value);
-    }
-
-    /**
-     * add a given extension field for the standard extensions tag (tag 0)
-     */
-    public void addExtension(
-        ASN1ObjectIdentifier oid,
-        boolean             critical,
-        ASN1Encodable value)
-    {
-        extGenerator.addExtension(new ASN1ObjectIdentifier(oid.getId()), critical, value);
-    }
-
-    /**
-     * add a given extension field for the standard extensions tag (tag 0)
-     */
-    public void addExtension(
-        String          oid,
-        boolean         critical,
-        byte[]          value)
-    {
-        this.addExtension(new ASN1ObjectIdentifier(oid), critical, value);
-    }
-
-    /**
-     * add a given extension field for the standard extensions tag (tag 0)
-     */
-    public void addExtension(
-        ASN1ObjectIdentifier oid,
-        boolean             critical,
-        byte[]              value)
-    {
-        extGenerator.addExtension(new ASN1ObjectIdentifier(oid.getId()), critical, value);
-    }
-
-    /**
-     * generate an X509 CRL, based on the current issuer and subject
-     * using the default provider "BC".
-     * @deprecated use generate(key, "BC")
-     */
-    public X509CRL generateX509CRL(
-        PrivateKey      key)
-        throws SecurityException, SignatureException, InvalidKeyException
-    {
-        try
-        {
-            return generateX509CRL(key, "BC", null);
-        }
-        catch (NoSuchProviderException e)
-        {
-            throw new SecurityException("BC provider not installed!");
-        }
-    }
-
-    /**
-     * generate an X509 CRL, based on the current issuer and subject
-     * using the default provider "BC" and an user defined SecureRandom object as
-     * source of randomness.
-     * @deprecated use generate(key, random, "BC")
-     */
-    public X509CRL generateX509CRL(
-        PrivateKey      key,
-        SecureRandom    random)
-        throws SecurityException, SignatureException, InvalidKeyException
-    {
-        try
-        {
-            return generateX509CRL(key, "BC", random);
-        }
-        catch (NoSuchProviderException e)
-        {
-            throw new SecurityException("BC provider not installed!");
-        }
-    }
-
-    /**
-     * generate an X509 certificate, based on the current issuer and subject
-     * using the passed in provider for the signing.
-     * @deprecated use generate()
-     */
-    public X509CRL generateX509CRL(
-        PrivateKey      key,
-        String          provider)
-        throws NoSuchProviderException, SecurityException, SignatureException, InvalidKeyException
-    {
-        return generateX509CRL(key, provider, null);
-    }
-
-    /**
-     * generate an X509 CRL, based on the current issuer and subject,
-     * using the passed in provider for the signing.
-     * @deprecated use generate()
-     */
-    public X509CRL generateX509CRL(
-        PrivateKey      key,
-        String          provider,
-        SecureRandom    random)
-        throws NoSuchProviderException, SecurityException, SignatureException, InvalidKeyException
-    {
-        try
-        {
-            return generate(key, provider, random);
-        }
-        catch (NoSuchProviderException e)
-        {
-            throw e;
-        }
-        catch (SignatureException e)
-        {
-            throw e;
-        }
-        catch (InvalidKeyException e)
-        {
-            throw e;
-        }
-        catch (GeneralSecurityException e)
-        {
-            throw new SecurityException("exception: " + e);
-        }
-    }
-    
-    /**
-     * generate an X509 CRL, based on the current issuer and subject
-     * using the default provider.
-     * <p>
-     * <b>Note:</b> this differs from the deprecated method in that the default provider is
-     * used - not "BC".
-     * </p>
-     */
-    public X509CRL generate(
-        PrivateKey      key)
-        throws CRLException, IllegalStateException, NoSuchAlgorithmException, SignatureException, InvalidKeyException
-    {
-        return generate(key, (SecureRandom)null);
-    }
-
-    /**
-     * generate an X509 CRL, based on the current issuer and subject
-     * using the default provider and an user defined SecureRandom object as
-     * source of randomness.
-     * <p>
-     * <b>Note:</b> this differs from the deprecated method in that the default provider is
-     * used - not "BC".
-     * </p>
-     */
-    public X509CRL generate(
-        PrivateKey      key,
-        SecureRandom    random)
-        throws CRLException, IllegalStateException, NoSuchAlgorithmException, SignatureException, InvalidKeyException
-    {
-        TBSCertList tbsCrl = generateCertList();
-        byte[] signature;
-
-        try
-        {
-            signature = X509Util.calculateSignature(sigOID, signatureAlgorithm, key, random, tbsCrl);
-        }
-        catch (IOException e)
-        {
-            throw new ExtCRLException("cannot generate CRL encoding", e);
-        }
-
-        return generateJcaObject(tbsCrl, signature);
-    }
-
-    /**
-     * generate an X509 certificate, based on the current issuer and subject
-     * using the passed in provider for the signing.
-     */
-    public X509CRL generate(
-        PrivateKey      key,
-        String          provider)
-        throws CRLException, IllegalStateException, NoSuchProviderException, NoSuchAlgorithmException, SignatureException, InvalidKeyException
-    {
-        return generate(key, provider, null);
-    }
-
-    /**
-     * generate an X509 CRL, based on the current issuer and subject,
-     * using the passed in provider for the signing.
-     */
-    public X509CRL generate(
-        PrivateKey      key,
-        String          provider,
-        SecureRandom    random)
-        throws CRLException, IllegalStateException, NoSuchProviderException, NoSuchAlgorithmException, SignatureException, InvalidKeyException
-    {
-        TBSCertList tbsCrl = generateCertList();
-        byte[] signature;
-
-        try
-        {
-            signature = X509Util.calculateSignature(sigOID, signatureAlgorithm, provider, key, random, tbsCrl);
-        }
-        catch (IOException e)
-        {
-            throw new ExtCRLException("cannot generate CRL encoding", e);
-        }
-
-        return generateJcaObject(tbsCrl, signature);
-    }
-
-    private TBSCertList generateCertList()
-    {
-        if (!extGenerator.isEmpty())
-        {
-            tbsGen.setExtensions(extGenerator.generate());
-        }
-
-        return tbsGen.generateTBSCertList();
-    }
-
-    private X509CRL generateJcaObject(TBSCertList tbsCrl, byte[] signature)
-        throws CRLException
-    {
-        ASN1EncodableVector v = new ASN1EncodableVector();
-
-        v.add(tbsCrl);
-        v.add(sigAlgId);
-        v.add(new DERBitString(signature));
-
-        return new X509CRLObject(new CertificateList(new DERSequence(v)));
-    }
-
-    /**
-     * Return an iterator of the signature names supported by the generator.
-     * 
-     * @return an iterator containing recognised names.
-     */
-    public Iterator getSignatureAlgNames()
-    {
-        return X509Util.getAlgNames();
-    }
-
-    private static class ExtCRLException
-        extends CRLException
-    {
-        Throwable cause;
-
-        ExtCRLException(String message, Throwable cause)
-        {
-            super(message);
-            this.cause = cause;
-        }
-
-        public Throwable getCause()
-        {
-            return cause;
-        }
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/x509/examples/package.html b/bcprov/src/main/java/org/bouncycastle/x509/examples/package.html
deleted file mode 100644
index 6262157..0000000
--- a/bcprov/src/main/java/org/bouncycastle/x509/examples/package.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<html>
-<body bgcolor="#ffffff">
-<p>
-Examples for X.509 attribute certificates.
-<p>
-</body>
-</html>
diff --git a/bcprov/src/main/java/org/bouncycastle/x509/extension/package.html b/bcprov/src/main/java/org/bouncycastle/x509/extension/package.html
deleted file mode 100644
index abc2da5..0000000
--- a/bcprov/src/main/java/org/bouncycastle/x509/extension/package.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body bgcolor="#ffffff">
-Helper classes for dealing with common X.509 extensions.
-</body>
-</html>
diff --git a/bcprov/src/main/java/org/bouncycastle/x509/package.html b/bcprov/src/main/java/org/bouncycastle/x509/package.html
deleted file mode 100644
index b6b5298..0000000
--- a/bcprov/src/main/java/org/bouncycastle/x509/package.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<html>
-<body bgcolor="#ffffff">
-<p>
-Classes for supporting the generation of X.509 certificates and X.509 attribute certificates.
-<p>
-</body>
-</html>
diff --git a/bcprov/src/main/java/org/bouncycastle/x509/util/LDAPStoreHelper.java b/bcprov/src/main/java/org/bouncycastle/x509/util/LDAPStoreHelper.java
deleted file mode 100644
index 128c1c8..0000000
--- a/bcprov/src/main/java/org/bouncycastle/x509/util/LDAPStoreHelper.java
+++ /dev/null
@@ -1,1117 +0,0 @@
-package org.bouncycastle.x509.util;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.security.Principal;
-import java.security.cert.CertificateParsingException;
-import java.security.cert.X509CRL;
-import java.security.cert.X509Certificate;
-import java.sql.Date;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
-
-import javax.naming.Context;
-import javax.naming.NamingEnumeration;
-import javax.naming.NamingException;
-import javax.naming.directory.Attribute;
-import javax.naming.directory.DirContext;
-import javax.naming.directory.InitialDirContext;
-import javax.naming.directory.SearchControls;
-import javax.naming.directory.SearchResult;
-import javax.security.auth.x500.X500Principal;
-
-import org.bouncycastle.asn1.ASN1InputStream;
-import org.bouncycastle.asn1.x509.Certificate;
-import org.bouncycastle.asn1.x509.CertificatePair;
-import org.bouncycastle.jce.X509LDAPCertStoreParameters;
-import org.bouncycastle.jce.provider.X509AttrCertParser;
-import org.bouncycastle.jce.provider.X509CRLParser;
-import org.bouncycastle.jce.provider.X509CertPairParser;
-import org.bouncycastle.jce.provider.X509CertParser;
-import org.bouncycastle.util.StoreException;
-import org.bouncycastle.x509.X509AttributeCertStoreSelector;
-import org.bouncycastle.x509.X509AttributeCertificate;
-import org.bouncycastle.x509.X509CRLStoreSelector;
-import org.bouncycastle.x509.X509CertPairStoreSelector;
-import org.bouncycastle.x509.X509CertStoreSelector;
-import org.bouncycastle.x509.X509CertificatePair;
-
-/**
- * This is a general purpose implementation to get X.509 certificates, CRLs,
- * attribute certificates and cross certificates from a LDAP location.
- * <p>
- * At first a search is performed in the ldap*AttributeNames of the
- * {@link org.bouncycastle.jce.X509LDAPCertStoreParameters} with the given
- * information of the subject (for all kind of certificates) or issuer (for
- * CRLs), respectively, if a {@link org.bouncycastle.x509.X509CertStoreSelector} or
- * {@link org.bouncycastle.x509.X509AttributeCertificate} is given with that
- * details.
- * </p><p>
- * For the used schemes see:
- * <ul>
- * <li><a href="http://www.ietf.org/rfc/rfc2587.txt">RFC 2587</a>
- * <li><a
- * href="http://www3.ietf.org/proceedings/01mar/I-D/pkix-ldap-schema-01.txt">Internet
- * X.509 Public Key Infrastructure Additional LDAP Schema for PKIs and PMIs</a>
- * </ul>
- * </p>
- */
-public class LDAPStoreHelper
-{
-
-    // TODO: cache results
-
-    private X509LDAPCertStoreParameters params;
-
-    public LDAPStoreHelper(X509LDAPCertStoreParameters params)
-    {
-        this.params = params;
-    }
-
-    /**
-     * Initial Context Factory.
-     */
-    private static String LDAP_PROVIDER = "com.sun.jndi.ldap.LdapCtxFactory";
-
-    /**
-     * Processing referrals..
-     */
-    private static String REFERRALS_IGNORE = "ignore";
-
-    /**
-     * Security level to be used for LDAP connections.
-     */
-    private static final String SEARCH_SECURITY_LEVEL = "none";
-
-    /**
-     * Package Prefix for loading URL context factories.
-     */
-    private static final String URL_CONTEXT_PREFIX = "com.sun.jndi.url";
-
-    private DirContext connectLDAP() throws NamingException
-    {
-        Properties props = new Properties();
-        props.setProperty(Context.INITIAL_CONTEXT_FACTORY, LDAP_PROVIDER);
-        props.setProperty(Context.BATCHSIZE, "0");
-
-        props.setProperty(Context.PROVIDER_URL, params.getLdapURL());
-        props.setProperty(Context.URL_PKG_PREFIXES, URL_CONTEXT_PREFIX);
-        props.setProperty(Context.REFERRAL, REFERRALS_IGNORE);
-        props.setProperty(Context.SECURITY_AUTHENTICATION,
-            SEARCH_SECURITY_LEVEL);
-
-        DirContext ctx = new InitialDirContext(props);
-        return ctx;
-    }
-
-    private String parseDN(String subject, String dNAttributeName)
-    {
-        String temp = subject;
-        int begin = temp.toLowerCase().indexOf(
-            dNAttributeName.toLowerCase() + "=");
-        if (begin == -1)
-        {
-            return "";
-        }
-        temp = temp.substring(begin + dNAttributeName.length());
-        int end = temp.indexOf(',');
-        if (end == -1)
-        {
-            end = temp.length();
-        }
-        while (temp.charAt(end - 1) == '\\')
-        {
-            end = temp.indexOf(',', end + 1);
-            if (end == -1)
-            {
-                end = temp.length();
-            }
-        }
-        temp = temp.substring(0, end);
-        begin = temp.indexOf('=');
-        temp = temp.substring(begin + 1);
-        if (temp.charAt(0) == ' ')
-        {
-            temp = temp.substring(1);
-        }
-        if (temp.startsWith("\""))
-        {
-            temp = temp.substring(1);
-        }
-        if (temp.endsWith("\""))
-        {
-            temp = temp.substring(0, temp.length() - 1);
-        }
-        return temp;
-    }
-
-    private Set createCerts(List list, X509CertStoreSelector xselector)
-        throws StoreException
-    {
-        Set certSet = new HashSet();
-
-        Iterator it = list.iterator();
-        X509CertParser parser = new X509CertParser();
-        while (it.hasNext())
-        {
-            try
-            {
-                parser.engineInit(new ByteArrayInputStream((byte[])it
-                    .next()));
-                X509Certificate cert = (X509Certificate)parser
-                    .engineRead();
-                if (xselector.match((Object)cert))
-                {
-                    certSet.add(cert);
-                }
-
-            }
-            catch (Exception e)
-            {
-
-            }
-        }
-
-        return certSet;
-    }
-
-    /**
-     * Can use the subject and serial and the subject and serialNumber of the
-     * certificate of the given of the X509CertStoreSelector. If a certificate
-     * for checking is given this has higher precedence.
-     *
-     * @param xselector             The selector with the search criteria.
-     * @param attrs                 Attributes which contain the certificates in the LDAP
-     *                              directory.
-     * @param attrNames             Attribute names in teh LDAP directory which correspond to the
-     *                              subjectAttributeNames.
-     * @param subjectAttributeNames Subject attribute names (like "CN", "O", "OU") to use to
-     *                              search in the LDAP directory
-     * @return A list of found DER encoded certificates.
-     * @throws StoreException if an error occurs while searching.
-     */
-    private List certSubjectSerialSearch(X509CertStoreSelector xselector,
-                                         String[] attrs, String attrNames[], String subjectAttributeNames[])
-        throws StoreException
-    {
-        // TODO: support also subjectAltNames?
-        List list = new ArrayList();
-
-        String subject = null;
-        String serial = null;
-
-        subject = getSubjectAsString(xselector);
-
-        if (xselector.getSerialNumber() != null)
-        {
-            serial = xselector.getSerialNumber().toString();
-        }
-        if (xselector.getCertificate() != null)
-        {
-            subject = xselector.getCertificate().getSubjectX500Principal().getName("RFC1779");
-            serial = xselector.getCertificate().getSerialNumber().toString();
-        }
-
-        String attrValue = null;
-        if (subject != null)
-        {
-            for (int i = 0; i < subjectAttributeNames.length; i++)
-            {
-                attrValue = parseDN(subject, subjectAttributeNames[i]);
-                list
-                    .addAll(search(attrNames, "*" + attrValue + "*",
-                        attrs));
-            }
-        }
-        if (serial != null && params.getSearchForSerialNumberIn() != null)
-        {
-            attrValue = serial;
-            list.addAll(search(
-                splitString(params.getSearchForSerialNumberIn()),
-                                                  attrValue, attrs));
-        }
-        if (serial == null && subject == null)
-        {
-            list.addAll(search(attrNames, "*", attrs));
-        }
-
-        return list;
-    }
-
-
-
-    /**
-     * Can use the subject of the forward certificate of the set certificate
-     * pair or the subject of the forward
-     * {@link org.bouncycastle.x509.X509CertStoreSelector} of the given
-     * selector.
-     *
-     * @param xselector             The selector with the search criteria.
-     * @param attrs                 Attributes which contain the attribute certificates in the
-     *                              LDAP directory.
-     * @param attrNames             Attribute names in the LDAP directory which correspond to the
-     *                              subjectAttributeNames.
-     * @param subjectAttributeNames Subject attribute names (like "CN", "O", "OU") to use to
-     *                              search in the LDAP directory
-     * @return A list of found DER encoded certificate pairs.
-     * @throws StoreException if an error occurs while searching.
-     */
-    private List crossCertificatePairSubjectSearch(
-        X509CertPairStoreSelector xselector, String[] attrs,
-        String attrNames[], String subjectAttributeNames[])
-        throws StoreException
-    {
-        List list = new ArrayList();
-
-        // search for subject
-        String subject = null;
-
-        if (xselector.getForwardSelector() != null)
-        {
-            subject = getSubjectAsString(xselector.getForwardSelector());
-        }
-        if (xselector.getCertPair() != null)
-        {
-            if (xselector.getCertPair().getForward() != null)
-            {
-                subject = xselector.getCertPair().getForward()
-                    .getSubjectX500Principal().getName("RFC1779");
-            }
-        }
-        String attrValue = null;
-        if (subject != null)
-        {
-            for (int i = 0; i < subjectAttributeNames.length; i++)
-            {
-                attrValue = parseDN(subject, subjectAttributeNames[i]);
-                list
-                    .addAll(search(attrNames, "*" + attrValue + "*",
-                        attrs));
-            }
-        }
-        if (subject == null)
-        {
-            list.addAll(search(attrNames, "*", attrs));
-        }
-
-        return list;
-    }
-
-    /**
-     * Can use the entityName of the holder of the attribute certificate, the
-     * serialNumber of attribute certificate and the serialNumber of the
-     * associated certificate of the given of the X509AttributeCertSelector.
-     *
-     * @param xselector             The selector with the search criteria.
-     * @param attrs                 Attributes which contain the attribute certificates in the
-     *                              LDAP directory.
-     * @param attrNames             Attribute names in the LDAP directory which correspond to the
-     *                              subjectAttributeNames.
-     * @param subjectAttributeNames Subject attribute names (like "CN", "O", "OU") to use to
-     *                              search in the LDAP directory
-     * @return A list of found DER encoded attribute certificates.
-     * @throws StoreException if an error occurs while searching.
-     */
-    private List attrCertSubjectSerialSearch(
-        X509AttributeCertStoreSelector xselector, String[] attrs,
-        String attrNames[], String subjectAttributeNames[])
-        throws StoreException
-    {
-        List list = new ArrayList();
-
-        // search for serialNumber of associated cert,
-        // serialNumber of the attribute certificate or DN in the entityName
-        // of the holder
-
-        String subject = null;
-        String serial = null;
-
-        Collection serials = new HashSet();
-        Principal principals[] = null;
-        if (xselector.getHolder() != null)
-        {
-            // serialNumber of associated cert
-            if (xselector.getHolder().getSerialNumber() != null)
-            {
-                serials.add(xselector.getHolder().getSerialNumber()
-                    .toString());
-            }
-            // DN in the entityName of the holder
-            if (xselector.getHolder().getEntityNames() != null)
-            {
-                principals = xselector.getHolder().getEntityNames();
-            }
-        }
-
-        if (xselector.getAttributeCert() != null)
-        {
-            if (xselector.getAttributeCert().getHolder().getEntityNames() != null)
-            {
-                principals = xselector.getAttributeCert().getHolder()
-                    .getEntityNames();
-            }
-            // serialNumber of the attribute certificate
-            serials.add(xselector.getAttributeCert().getSerialNumber()
-                .toString());
-        }
-        if (principals != null)
-        {
-            // only first should be relevant
-            if (principals[0] instanceof X500Principal)
-            {
-                subject = ((X500Principal)principals[0])
-                    .getName("RFC1779");
-            }
-            else
-            {
-                // strange ...
-                subject = principals[0].getName();
-            }
-        }
-        if (xselector.getSerialNumber() != null)
-        {
-            serials.add(xselector.getSerialNumber().toString());
-        }
-
-        String attrValue = null;
-        if (subject != null)
-        {
-            for (int i = 0; i < subjectAttributeNames.length; i++)
-            {
-                attrValue = parseDN(subject, subjectAttributeNames[i]);
-                list
-                    .addAll(search(attrNames, "*" + attrValue + "*",
-                        attrs));
-            }
-        }
-        if (serials.size() > 0
-            && params.getSearchForSerialNumberIn() != null)
-        {
-            Iterator it = serials.iterator();
-            while (it.hasNext())
-            {
-                serial = (String)it.next();
-                list.addAll(search(splitString(params.getSearchForSerialNumberIn()), serial, attrs));
-            }
-        }
-        if (serials.size() == 0 && subject == null)
-        {
-            list.addAll(search(attrNames, "*", attrs));
-        }
-
-        return list;
-    }
-
-    /**
-     * Can use the issuer of the given of the X509CRLStoreSelector.
-     *
-     * @param xselector            The selector with the search criteria.
-     * @param attrs                Attributes which contain the attribute certificates in the
-     *                             LDAP directory.
-     * @param attrNames            Attribute names in the LDAP directory which correspond to the
-     *                             subjectAttributeNames.
-     * @param issuerAttributeNames Issuer attribute names (like "CN", "O", "OU") to use to search
-     *                             in the LDAP directory
-     * @return A list of found DER encoded CRLs.
-     * @throws StoreException if an error occurs while searching.
-     */
-    private List cRLIssuerSearch(X509CRLStoreSelector xselector,
-                                 String[] attrs, String attrNames[], String issuerAttributeNames[])
-        throws StoreException
-    {
-        List list = new ArrayList();
-
-        String issuer = null;
-        Collection issuers = new HashSet();
-        if (xselector.getIssuers() != null)
-        {
-            issuers.addAll(xselector.getIssuers());
-        }
-        if (xselector.getCertificateChecking() != null)
-        {
-            issuers.add(getCertificateIssuer(xselector.getCertificateChecking()));
-        }
-        if (xselector.getAttrCertificateChecking() != null)
-        {
-            Principal principals[] = xselector.getAttrCertificateChecking().getIssuer().getPrincipals();
-            for (int i=0; i<principals.length; i++)
-            {
-                if (principals[i] instanceof X500Principal)
-                {
-                    issuers.add(principals[i]);        
-                }
-            }
-        }
-        Iterator it = issuers.iterator();
-        while (it.hasNext())
-        {
-            issuer = ((X500Principal)it.next()).getName("RFC1779");
-            String attrValue = null;
-
-            for (int i = 0; i < issuerAttributeNames.length; i++)
-            {
-                attrValue = parseDN(issuer, issuerAttributeNames[i]);
-                list
-                    .addAll(search(attrNames, "*" + attrValue + "*",
-                        attrs));
-            }
-        }
-        if (issuer == null)
-        {
-            list.addAll(search(attrNames, "*", attrs));
-        }
-
-        return list;
-    }
-
-    /**
-     * Returns a <code>List</code> of encodings of the certificates, attribute
-     * certificates, CRL or certificate pairs.
-     *
-     * @param attributeNames The attribute names to look for in the LDAP.
-     * @param attributeValue The value the attribute name must have.
-     * @param attrs          The attributes in the LDAP which hold the certificate,
-     *                       attribute certificate, certificate pair or CRL in a found
-     *                       entry.
-     * @return A <code>List</code> of byte arrays with the encodings.
-     * @throws StoreException if an error occurs getting the results from the LDAP
-     *                        directory.
-     */
-    private List search(String attributeNames[], String attributeValue,
-                        String[] attrs) throws StoreException
-    {
-        String filter = null;
-        if (attributeNames == null)
-        {
-            filter = null;
-        }
-        else
-        {
-            filter = "";
-            if (attributeValue.equals("**"))
-            {
-                attributeValue = "*";
-            }
-            for (int i = 0; i < attributeNames.length; i++)
-            {
-                filter += "(" + attributeNames[i] + "=" + attributeValue + ")";
-            }
-            filter = "(|" + filter + ")";
-        }
-        String filter2 = "";
-        for (int i = 0; i < attrs.length; i++)
-        {
-            filter2 += "(" + attrs[i] + "=*)";
-        }
-        filter2 = "(|" + filter2 + ")";
-
-        String filter3 = "(&" + filter + "" + filter2 + ")";
-        if (filter == null)
-        {
-            filter3 = filter2;
-        }
-        List list;
-        list = getFromCache(filter3);
-        if (list != null)
-        {
-            return list;
-        }
-        DirContext ctx = null;
-        list = new ArrayList();
-        try
-        {
-
-            ctx = connectLDAP();
-
-            SearchControls constraints = new SearchControls();
-            constraints.setSearchScope(SearchControls.SUBTREE_SCOPE);
-            constraints.setCountLimit(0);
-            constraints.setReturningAttributes(attrs);
-            NamingEnumeration results = ctx.search(params.getBaseDN(), filter3,
-                constraints);
-            while (results.hasMoreElements())
-            {
-                SearchResult sr = (SearchResult)results.next();
-                NamingEnumeration enumeration = ((Attribute)(sr
-                    .getAttributes().getAll().next())).getAll();
-                while (enumeration.hasMore())
-                {
-                    list.add(enumeration.next());
-                }
-            }
-            addToCache(filter3, list);
-        }
-        catch (NamingException e)
-        {
-            // skip exception, unfortunately if an attribute type is not
-            // supported an exception is thrown
-
-        }
-        finally
-        {
-            try
-            {
-                if (null != ctx)
-                {
-                    ctx.close();
-                }
-            }
-            catch (Exception e)
-            {
-            }
-        }
-        return list;
-    }
-
-    private Set createCRLs(List list, X509CRLStoreSelector xselector)
-        throws StoreException
-    {
-        Set crlSet = new HashSet();
-
-        X509CRLParser parser = new X509CRLParser();
-        Iterator it = list.iterator();
-        while (it.hasNext())
-        {
-            try
-            {
-                parser.engineInit(new ByteArrayInputStream((byte[])it
-                    .next()));
-                X509CRL crl = (X509CRL)parser.engineRead();
-                if (xselector.match((Object)crl))
-                {
-                    crlSet.add(crl);
-                }
-            }
-            catch (StreamParsingException e)
-            {
-
-            }
-        }
-
-        return crlSet;
-    }
-
-    private Set createCrossCertificatePairs(List list,
-                                            X509CertPairStoreSelector xselector) throws StoreException
-    {
-        Set certPairSet = new HashSet();
-
-        int i = 0;
-        while (i < list.size())
-        {
-            X509CertificatePair pair;
-            try
-            {
-                // first try to decode it as certificate pair
-                try
-                {
-                    X509CertPairParser parser = new X509CertPairParser();
-                    parser.engineInit(new ByteArrayInputStream(
-                        (byte[])list.get(i)));
-                    pair = (X509CertificatePair)parser.engineRead();
-                }
-                catch (StreamParsingException e)
-                {
-                    // now try it to construct it the forward and reverse
-                    // certificate
-                    byte[] forward = (byte[])list.get(i);
-                    byte[] reverse = (byte[])list.get(i + 1);
-                    pair = new X509CertificatePair(new CertificatePair(
-                        Certificate
-                            .getInstance(new ASN1InputStream(
-                            forward).readObject()),
-                        Certificate
-                            .getInstance(new ASN1InputStream(
-                                reverse).readObject())));
-                    i++;
-                }
-                if (xselector.match((Object)pair))
-                {
-                    certPairSet.add(pair);
-                }
-            }
-            catch (CertificateParsingException e)
-            {
-                // try next
-            }
-            catch (IOException e)
-            {
-                // try next
-            }
-            i++;
-        }
-
-        return certPairSet;
-    }
-
-    private Set createAttributeCertificates(List list,
-                                            X509AttributeCertStoreSelector xselector) throws StoreException
-    {
-        Set certSet = new HashSet();
-
-        Iterator it = list.iterator();
-        X509AttrCertParser parser = new X509AttrCertParser();
-        while (it.hasNext())
-        {
-            try
-            {
-                parser.engineInit(new ByteArrayInputStream((byte[])it
-                    .next()));
-                X509AttributeCertificate cert = (X509AttributeCertificate)parser
-                    .engineRead();
-                if (xselector.match((Object)cert))
-                {
-                    certSet.add(cert);
-                }
-            }
-            catch (StreamParsingException e)
-            {
-
-            }
-        }
-
-        return certSet;
-    }
-
-    /**
-     * Returns the CRLs for issued certificates for other CAs matching the given
-     * selector. <br>
-     * The authorityRevocationList attribute includes revocation information
-     * regarding certificates issued to other CAs.
-     *
-     * @param selector The CRL selector to use to find the CRLs.
-     * @return A possible empty collection with CRLs
-     * @throws StoreException
-     */
-    public Collection getAuthorityRevocationLists(X509CRLStoreSelector selector)
-        throws StoreException
-    {
-        String[] attrs = splitString(params.getAuthorityRevocationListAttribute());
-        String attrNames[] = splitString(params
-            .getLdapAuthorityRevocationListAttributeName());
-        String issuerAttributeNames[] = splitString(params
-            .getAuthorityRevocationListIssuerAttributeName());
-
-        List list = cRLIssuerSearch(selector, attrs, attrNames,
-            issuerAttributeNames);
-        Set resultSet = createCRLs(list, selector);
-        if (resultSet.size() == 0)
-        {
-            X509CRLStoreSelector emptySelector = new X509CRLStoreSelector();
-            list = cRLIssuerSearch(emptySelector, attrs, attrNames,
-                issuerAttributeNames);
-
-            resultSet.addAll(createCRLs(list, selector));
-        }
-        return resultSet;
-    }
-
-    /**
-     * Returns the revocation list for revoked attribute certificates.
-     * <p>
-     * The attributeCertificateRevocationList holds a list of attribute
-     * certificates that have been revoked.
-     * </p>
-     * @param selector The CRL selector to use to find the CRLs.
-     * @return A possible empty collection with CRLs.
-     * @throws StoreException
-     */
-    public Collection getAttributeCertificateRevocationLists(
-        X509CRLStoreSelector selector) throws StoreException
-    {
-        String[] attrs = splitString(params
-            .getAttributeCertificateRevocationListAttribute());
-        String attrNames[] = splitString(params
-            .getLdapAttributeCertificateRevocationListAttributeName());
-        String issuerAttributeNames[] = splitString(params
-            .getAttributeCertificateRevocationListIssuerAttributeName());
-
-        List list = cRLIssuerSearch(selector, attrs, attrNames,
-            issuerAttributeNames);
-        Set resultSet = createCRLs(list, selector);
-        if (resultSet.size() == 0)
-        {
-            X509CRLStoreSelector emptySelector = new X509CRLStoreSelector();
-            list = cRLIssuerSearch(emptySelector, attrs, attrNames,
-                issuerAttributeNames);
-
-            resultSet.addAll(createCRLs(list, selector));
-        }
-        return resultSet;
-    }
-
-    /**
-     * Returns the revocation list for revoked attribute certificates for an
-     * attribute authority
-     * <p>
-     * The attributeAuthorityList holds a list of AA certificates that have been
-     * revoked.
-     * </p>
-     * @param selector The CRL selector to use to find the CRLs.
-     * @return A possible empty collection with CRLs
-     * @throws StoreException
-     */
-    public Collection getAttributeAuthorityRevocationLists(
-        X509CRLStoreSelector selector) throws StoreException
-    {
-        String[] attrs = splitString(params.getAttributeAuthorityRevocationListAttribute());
-        String attrNames[] = splitString(params
-            .getLdapAttributeAuthorityRevocationListAttributeName());
-        String issuerAttributeNames[] = splitString(params
-            .getAttributeAuthorityRevocationListIssuerAttributeName());
-
-        List list = cRLIssuerSearch(selector, attrs, attrNames,
-            issuerAttributeNames);
-        Set resultSet = createCRLs(list, selector);
-        if (resultSet.size() == 0)
-        {
-            X509CRLStoreSelector emptySelector = new X509CRLStoreSelector();
-            list = cRLIssuerSearch(emptySelector, attrs, attrNames,
-                issuerAttributeNames);
-
-            resultSet.addAll(createCRLs(list, selector));
-        }
-        return resultSet;
-    }
-
-    /**
-     * Returns cross certificate pairs.
-     *
-     * @param selector The selector to use to find the cross certificates.
-     * @return A possible empty collection with {@link X509CertificatePair}s
-     * @throws StoreException
-     */
-    public Collection getCrossCertificatePairs(
-        X509CertPairStoreSelector selector) throws StoreException
-    {
-        String[] attrs = splitString(params.getCrossCertificateAttribute());
-        String attrNames[] = splitString(params.getLdapCrossCertificateAttributeName());
-        String subjectAttributeNames[] = splitString(params
-            .getCrossCertificateSubjectAttributeName());
-        List list = crossCertificatePairSubjectSearch(selector, attrs,
-            attrNames, subjectAttributeNames);
-        Set resultSet = createCrossCertificatePairs(list, selector);
-        if (resultSet.size() == 0)
-        {
-            X509CertStoreSelector emptyCertselector = new X509CertStoreSelector();
-            X509CertPairStoreSelector emptySelector = new X509CertPairStoreSelector();
-
-            emptySelector.setForwardSelector(emptyCertselector);
-            emptySelector.setReverseSelector(emptyCertselector);
-            list = crossCertificatePairSubjectSearch(emptySelector, attrs,
-                attrNames, subjectAttributeNames);
-            resultSet.addAll(createCrossCertificatePairs(list, selector));
-        }
-        return resultSet;
-    }
-
-    /**
-     * Returns end certificates.
-     * <p/>
-     * The attributeDescriptorCertificate is self signed by a source of
-     * authority and holds a description of the privilege and its delegation
-     * rules.
-     *
-     * @param selector The selector to find the certificates.
-     * @return A possible empty collection with certificates.
-     * @throws StoreException
-     */
-    public Collection getUserCertificates(X509CertStoreSelector selector)
-        throws StoreException
-    {
-        String[] attrs = splitString(params.getUserCertificateAttribute());
-        String attrNames[] = splitString(params.getLdapUserCertificateAttributeName());
-        String subjectAttributeNames[] = splitString(params
-            .getUserCertificateSubjectAttributeName());
-
-        List list = certSubjectSerialSearch(selector, attrs, attrNames,
-            subjectAttributeNames);
-        Set resultSet = createCerts(list, selector);
-        if (resultSet.size() == 0)
-        {
-            X509CertStoreSelector emptySelector = new X509CertStoreSelector();
-            list = certSubjectSerialSearch(emptySelector, attrs, attrNames,
-                subjectAttributeNames);
-            resultSet.addAll(createCerts(list, selector));
-        }
-
-        return resultSet;
-    }
-
-    /**
-     * Returns attribute certificates for an attribute authority
-     * <p>
-     * The aAcertificate holds the privileges of an attribute authority.
-     * </p>
-     * @param selector The selector to find the attribute certificates.
-     * @return A possible empty collection with attribute certificates.
-     * @throws StoreException
-     */
-    public Collection getAACertificates(X509AttributeCertStoreSelector selector)
-        throws StoreException
-    {
-        String[] attrs = splitString(params.getAACertificateAttribute());
-        String attrNames[] = splitString(params.getLdapAACertificateAttributeName());
-        String subjectAttributeNames[] = splitString(params.getAACertificateSubjectAttributeName());
-
-        List list = attrCertSubjectSerialSearch(selector, attrs, attrNames,
-            subjectAttributeNames);
-        Set resultSet = createAttributeCertificates(list, selector);
-        if (resultSet.size() == 0)
-        {
-            X509AttributeCertStoreSelector emptySelector = new X509AttributeCertStoreSelector();
-            list = attrCertSubjectSerialSearch(emptySelector, attrs, attrNames,
-                subjectAttributeNames);
-            resultSet.addAll(createAttributeCertificates(list, selector));
-        }
-
-        return resultSet;
-    }
-
-    /**
-     * Returns an attribute certificate for an authority
-     * <p>
-     * The attributeDescriptorCertificate is self signed by a source of
-     * authority and holds a description of the privilege and its delegation
-     * rules.
-     * </p>
-     * @param selector The selector to find the attribute certificates.
-     * @return A possible empty collection with attribute certificates.
-     * @throws StoreException
-     */
-    public Collection getAttributeDescriptorCertificates(
-        X509AttributeCertStoreSelector selector) throws StoreException
-    {
-        String[] attrs = splitString(params.getAttributeDescriptorCertificateAttribute());
-        String attrNames[] = splitString(params
-            .getLdapAttributeDescriptorCertificateAttributeName());
-        String subjectAttributeNames[] = splitString(params
-            .getAttributeDescriptorCertificateSubjectAttributeName());
-
-        List list = attrCertSubjectSerialSearch(selector, attrs, attrNames,
-            subjectAttributeNames);
-        Set resultSet = createAttributeCertificates(list, selector);
-        if (resultSet.size() == 0)
-        {
-            X509AttributeCertStoreSelector emptySelector = new X509AttributeCertStoreSelector();
-            list = attrCertSubjectSerialSearch(emptySelector, attrs, attrNames,
-                subjectAttributeNames);
-            resultSet.addAll(createAttributeCertificates(list, selector));
-        }
-
-        return resultSet;
-    }
-
-    /**
-     * Returns CA certificates.
-     * <p>
-     * The cACertificate attribute of a CA's directory entry shall be used to
-     * store self-issued certificates (if any) and certificates issued to this
-     * CA by CAs in the same realm as this CA.
-     * </p>
-     * @param selector The selector to find the certificates.
-     * @return A possible empty collection with certificates.
-     * @throws StoreException
-     */
-    public Collection getCACertificates(X509CertStoreSelector selector)
-        throws StoreException
-    {
-        String[] attrs = splitString(params.getCACertificateAttribute());
-        String attrNames[] = splitString(params.getLdapCACertificateAttributeName());
-        String subjectAttributeNames[] = splitString(params
-            .getCACertificateSubjectAttributeName());
-        List list = certSubjectSerialSearch(selector, attrs, attrNames,
-            subjectAttributeNames);
-        Set resultSet = createCerts(list, selector);
-        if (resultSet.size() == 0)
-        {
-            X509CertStoreSelector emptySelector = new X509CertStoreSelector();
-            list = certSubjectSerialSearch(emptySelector, attrs, attrNames,
-                subjectAttributeNames);
-            resultSet.addAll(createCerts(list, selector));
-        }
-        return resultSet;
-    }
-
-    /**
-     * Returns the delta revocation list for revoked certificates.
-     *
-     * @param selector The CRL selector to use to find the CRLs.
-     * @return A possible empty collection with CRLs.
-     * @throws StoreException
-     */
-    public Collection getDeltaCertificateRevocationLists(
-        X509CRLStoreSelector selector) throws StoreException
-    {
-        String[] attrs = splitString(params.getDeltaRevocationListAttribute());
-        String attrNames[] = splitString(params.getLdapDeltaRevocationListAttributeName());
-        String issuerAttributeNames[] = splitString(params
-            .getDeltaRevocationListIssuerAttributeName());
-        List list = cRLIssuerSearch(selector, attrs, attrNames,
-            issuerAttributeNames);
-        Set resultSet = createCRLs(list, selector);
-        if (resultSet.size() == 0)
-        {
-            X509CRLStoreSelector emptySelector = new X509CRLStoreSelector();
-            list = cRLIssuerSearch(emptySelector, attrs, attrNames,
-                issuerAttributeNames);
-
-            resultSet.addAll(createCRLs(list, selector));
-        }
-        return resultSet;
-    }
-
-    /**
-     * Returns an attribute certificate for an user.
-     * <p>
-     * The attributeCertificateAttribute holds the privileges of a user
-     * </p>
-     * @param selector The selector to find the attribute certificates.
-     * @return A possible empty collection with attribute certificates.
-     * @throws StoreException
-     */
-    public Collection getAttributeCertificateAttributes(
-        X509AttributeCertStoreSelector selector) throws StoreException
-    {
-        String[] attrs = splitString(params.getAttributeCertificateAttributeAttribute());
-        String attrNames[] = splitString(params
-            .getLdapAttributeCertificateAttributeAttributeName());
-        String subjectAttributeNames[] = splitString(params
-            .getAttributeCertificateAttributeSubjectAttributeName());
-        List list = attrCertSubjectSerialSearch(selector, attrs, attrNames,
-            subjectAttributeNames);
-        Set resultSet = createAttributeCertificates(list, selector);
-        if (resultSet.size() == 0)
-        {
-            X509AttributeCertStoreSelector emptySelector = new X509AttributeCertStoreSelector();
-            list = attrCertSubjectSerialSearch(emptySelector, attrs, attrNames,
-                subjectAttributeNames);
-            resultSet.addAll(createAttributeCertificates(list, selector));
-        }
-
-        return resultSet;
-    }
-
-    /**
-     * Returns the certificate revocation lists for revoked certificates.
-     *
-     * @param selector The CRL selector to use to find the CRLs.
-     * @return A possible empty collection with CRLs.
-     * @throws StoreException
-     */
-    public Collection getCertificateRevocationLists(
-        X509CRLStoreSelector selector) throws StoreException
-    {
-        String[] attrs = splitString(params.getCertificateRevocationListAttribute());
-        String attrNames[] = splitString(params
-            .getLdapCertificateRevocationListAttributeName());
-        String issuerAttributeNames[] = splitString(params
-            .getCertificateRevocationListIssuerAttributeName());
-        List list = cRLIssuerSearch(selector, attrs, attrNames,
-            issuerAttributeNames);
-        Set resultSet = createCRLs(list, selector);
-        if (resultSet.size() == 0)
-        {
-            X509CRLStoreSelector emptySelector = new X509CRLStoreSelector();
-            list = cRLIssuerSearch(emptySelector, attrs, attrNames,
-                issuerAttributeNames);
-
-            resultSet.addAll(createCRLs(list, selector));
-        }
-        return resultSet;
-    }
-
-    private Map cacheMap = new HashMap(cacheSize);
-
-    private static int cacheSize = 32;
-
-    private static long lifeTime = 60 * 1000;
-
-    private synchronized void addToCache(String searchCriteria, List list)
-    {
-        Date now = new Date(System.currentTimeMillis());
-        List cacheEntry = new ArrayList();
-        cacheEntry.add(now);
-        cacheEntry.add(list);
-        if (cacheMap.containsKey(searchCriteria))
-        {
-            cacheMap.put(searchCriteria, cacheEntry);
-        }
-        else
-        {
-            if (cacheMap.size() >= cacheSize)
-            {
-                // replace oldest
-                Iterator it = cacheMap.entrySet().iterator();
-                long oldest = now.getTime();
-                Object replace = null;
-                while (it.hasNext())
-                {
-                    Map.Entry entry = (Map.Entry)it.next();
-                    long current = ((Date)((List)entry.getValue()).get(0))
-                        .getTime();
-                    if (current < oldest)
-                    {
-                        oldest = current;
-                        replace = entry.getKey();
-                    }
-                }
-                cacheMap.remove(replace);
-            }
-            cacheMap.put(searchCriteria, cacheEntry);
-        }
-    }
-
-    private List getFromCache(String searchCriteria)
-    {
-        List entry = (List)cacheMap.get(searchCriteria);
-        long now = System.currentTimeMillis();
-        if (entry != null)
-        {
-            // too old
-            if (((Date)entry.get(0)).getTime() < (now - lifeTime))
-            {
-                return null;
-            }
-            return (List)entry.get(1);
-        }
-        return null;
-    }
-
-    /*
-     * spilt string based on spaces
-     */
-    private String[] splitString(String str)
-    {
-        return str.split("\\s+");
-    }
-
-    private String getSubjectAsString(X509CertStoreSelector xselector)
-    {
-        try
-        {
-            byte[] encSubject = xselector.getSubjectAsBytes();
-            if (encSubject != null)
-            {
-                return new X500Principal(encSubject).getName("RFC1779");
-            }
-        }
-        catch (IOException e)
-        {
-            throw new StoreException("exception processing name: " + e.getMessage(), e);
-        }
-        return null;
-    }
-
-    private X500Principal getCertificateIssuer(X509Certificate cert)
-    {
-        return cert.getIssuerX500Principal();
-    }
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/x509/util/StreamParser.java b/bcprov/src/main/java/org/bouncycastle/x509/util/StreamParser.java
deleted file mode 100644
index 2604894..0000000
--- a/bcprov/src/main/java/org/bouncycastle/x509/util/StreamParser.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package org.bouncycastle.x509.util;
-
-import java.util.Collection;
-
-public interface StreamParser
-{
-    Object read() throws StreamParsingException;
-
-    Collection readAll() throws StreamParsingException;
-}
diff --git a/bcprov/src/main/java/org/bouncycastle/x509/util/StreamParsingException.java b/bcprov/src/main/java/org/bouncycastle/x509/util/StreamParsingException.java
deleted file mode 100644
index 8f69ff6..0000000
--- a/bcprov/src/main/java/org/bouncycastle/x509/util/StreamParsingException.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package org.bouncycastle.x509.util;
-
-public class StreamParsingException 
-    extends Exception
-{
-    Throwable _e;
-
-    public StreamParsingException(String message, Throwable e)
-    {
-        super(message);
-        _e = e;
-    }
-
-    public Throwable getCause()
-    {
-        return _e;
-    }
-}